diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 02b2f9f0273d..dfcfce92d1bd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,17 +5,24 @@ "ghcr.io/devcontainers/features/nix:1": { // fails in the devcontainer sandbox, enable sandbox via config instead "multiUser": false, - "packages": "nixd,nixfmt-unstable", + "packages": "nixpkgs.nixd,nixpkgs.nixfmt-rfc-style", + "useAttributePath": true, "extraNixConfig": "experimental-features = nix-command flakes,sandbox = true" } }, + // Fixup permissions inside container. + // https://github.com/NixOS/nix/issues/6680#issuecomment-1230902525 + "postCreateCommand": "sudo apt-get install -y acl", + "postStartCommand": "sudo setfacl -k /tmp; if [ -e /dev/kvm ]; then sudo chgrp $(id -g) /dev/kvm; fi", "customizations": { "vscode": { "extensions": [ "jnoortheen.nix-ide" ], "settings": { - "nix.formatterPath": "nixfmt-rfc-style", + "[nix]": { + "editor.formatOnSave": true + }, "nix.enableLanguageServer": true, "nix.serverPath": "nixd" } diff --git a/.editorconfig b/.editorconfig index 3e6d1711e421..020db105c04a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -35,8 +35,12 @@ indent_size = 1 [*.{json,lock,md,nix,rb}] indent_size = 2 -# Match perl/python/shell scripts, set indent width of four -[*.{bash,pl,pm,py,sh}] +# Match all the Bash code in Nix files, set indent width of two +[*.{bash,sh}] +indent_size = 2 + +# Match Perl and Python scripts, set indent width of four +[*.{pl,pm,py}] indent_size = 4 # Match gemfiles, set indent to spaces with width of two @@ -44,9 +48,10 @@ indent_size = 4 indent_size = 2 indent_style = space -# Match package.json, which are generally pulled from upstream and accept them as they are -[package.json] +# Match package.json and package-lock.json, which are generally pulled from upstream and accept them as they are +[package{,-lock}.json] indent_style = unset +insert_final_newline = unset # Disable file types or individual files # some of these files may be auto-generated and/or require significant changes @@ -81,47 +86,10 @@ charset = unset [eggs.nix] trim_trailing_whitespace = unset -[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] -trim_trailing_whitespace = unset - -[pkgs/build-support/dotnetenv/Wrapper/**] -end_of_line = unset -indent_style = unset -insert_final_newline = unset -trim_trailing_whitespace = unset - [registry.dat] end_of_line = unset insert_final_newline = unset -[pkgs/development/haskell-modules/hackage-packages.nix] -indent_style = unset -trim_trailing_whitespace = unset - -[pkgs/misc/documentation-highlighter/**] -insert_final_newline = unset - -[pkgs/servers/dict/wordnet_structures.py] -trim_trailing_whitespace = unset - -[pkgs/tools/misc/timidity/timidity.cfg] -trim_trailing_whitespace = unset - -[pkgs/tools/security/qdigidoc/vendor/*] -end_of_line = unset -insert_final_newline = unset -trim_trailing_whitespace = unset - -[pkgs/tools/virtualization/ovftool/*.ova] -end_of_line = unset -insert_final_newline = unset -trim_trailing_whitespace = unset -charset = unset - -[lib/tests/*.plist] -indent_style = tab -insert_final_newline = unset - -[pkgs/kde/generated/**] -insert_final_newline = unset -end_of_line = unset +# Keep this hint at the bottom: +# Please don't add entries for subfolders here. +# Create /.editorconfig instead. diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index bfd399101269..1e37e6f68ffe 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -251,3 +251,18 @@ fd14c067813572afc03ddbf7cdedc3eab5a59954 # treewide format of all Nix files 374e6bcc403e02a35e07b650463c01a52b13a7c8 # !autorebase nix-shell --run treefmt + +# nix: nixfmt-rfc-style +a4f7e161b380b35b2f7bc432659a95fd71254ad8 +0812c9a321003c924868051d2b2e1934e8880f3f +34f269c14ac18d89ddee9a8f54b1ca92a85bbcc6 +062c34cdace499aa44f0fa6ca6f2ca71769f6c43 + +# haskellPackages.hercules-ci-agent (cabal2nix -> nixfmt-rfc-style) +9314da7ee8d2aedfb15193b8c489da51efe52bb5 + +# nix-builder-vm: nixfmt-rfc-style +a034fb50f79816c6738fb48b48503b09ea3b0132 + +# treewide: switch instances of lib.teams.*.members to the new meta.teams attribute +05580f4b4433fda48fff30f60dfd303d6ee05d21 diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml index c672361dd56a..2dfa1b779a6d 100644 --- a/.github/ISSUE_TEMPLATE/04_build_failure.yml +++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml @@ -61,12 +61,14 @@ body: You can still open a build failure report, but please say '**No, Hydra cannot reproduce this build failure.**' below. - If there's a Gray Question Mark icon near the package entry, say '**Hydra is currently rebuilding this package.**' - If there's a Red Stop Sign icon near the package entry, then the build job was stopped manually. If this occurs, please coordinate with the [Infrastructure Team](https://matrix.to/#/#infra:nixos.org), and say '**The last build job was manually cancelled.**' + - If Hydra isn't supposed to build the package at all, say '**Hydra doesn’t try to build the package.**' options: - "Please select the Hydra Status." - "Yes, Hydra can reproduce this build failure." - "No, Hydra cannot reproduce this build failure." - "Hydra is currently rebuilding this package." - "The last build job was manually cancelled." + - "Hydra doesn’t try to build the package." default: 0 validations: required: true diff --git a/.github/ISSUE_TEMPLATE/05_package_request.yml b/.github/ISSUE_TEMPLATE/05_package_request.yml deleted file mode 100644 index b73360a91cb4..000000000000 --- a/.github/ISSUE_TEMPLATE/05_package_request.yml +++ /dev/null @@ -1,108 +0,0 @@ -name: "Request: new package" -description: "Create a package request for software that is not yet included in Nixpkgs." -title: "Package request: PACKAGENAME" -labels: ["0.kind: enhancement", "0.kind: packaging request", "9.needs: package (new)"] -body: - - type: "markdown" - attributes: - value: | -

- - - - - NixOS logo - - -

- - Welcome to Nixpkgs. Please replace the **`Package request: PACKAGENAME`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)). - - > [!TIP] - > For instance, if you were filing a request against the missing `hello` package, your title would be as follows: - > `Package request: hello` - - --- - - type: "textarea" - id: "description" - attributes: - label: "Describe the package" - description: "Please include a clear and concise description of what the package is." - validations: - required: true - - type: "input" - id: "homepage" - attributes: - label: "Upstream homepage" - description: "Please copy and paste a link to the package's homepage." - validations: - required: true - - type: "input" - id: "source" - attributes: - label: "Source URL" - description: "Please copy and paste a link to the package's source code or binary download page." - validations: - required: true - - type: "input" - id: "license" - attributes: - label: "License" - description: "Please indicate the package's license. If the package has no license, or the source code is not public, please indicate the package is `unfree`." - validations: - required: true - - type: "dropdown" - id: "platforms" - attributes: - label: "Platforms" - description: "Please indicate the platforms this package compiles for. `darwin` refers to macOS. `Exotic` refers to uncommon platforms like RISC-V or 32-bit ARM; please mention in the 'Additional Context' section below if this package is supposed to compile for such exotic platforms." - multiple: true - options: - - "x86_64-linux" - - "aarch64-linux" - - "x86_64-darwin" - - "aarch64-darwin" - - "Exotic" - - type: "textarea" - id: "additional-context" - attributes: - label: "Additional context" - description: "Add any other context about the proposed module here." - validations: - required: false - - type: "checkboxes" - id: "sanity-check" - attributes: - label: "I assert that this issue is relevant for Nixpkgs" - options: - - label: "I assert that this package does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+package+%28new%29%22) or in [Nixpkgs Unstable](https://search.nixos.org/packages?channel=unstable)." - required: true - - label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%220.kind%3A+packaging+request%22)." - required: true - - label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it." - required: true - - type: "markdown" - attributes: - value: | - # Thank you for helping improve Nixpkgs! - - --- - - type: "textarea" - id: "prioritisation" - attributes: - label: "For this package's maintainers:" - description: | - **Please do not modify this text area!** - - This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction and also reminds them to tag this issue in their pull requests. - This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important. - value: | - - Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.) - - --- - - 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/05_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml new file mode 100644 index 000000000000..91944dbd9cf5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/05_update_request.yml @@ -0,0 +1,125 @@ +name: "Request: package update" +description: "Create an update request for an existing, but outdated package." +title: "Update Request: PACKAGENAME OLDVERSION → NEWVERSION" +labels: ["0.kind: enhancement", "9.needs: package (update)"] +body: + - type: "markdown" + attributes: + value: | +

+ + + + + NixOS logo + + +

+ + Welcome to Nixpkgs. Please replace the **`Update Request: PACKAGENAME OLDVERSION → NEWVERSION`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)), the current version of the package, and the latest version of the package. + + > [!TIP] + > For instance, if you were filing a request against the out of date `hello` package, where the current version in Nixpkgs is 1.0.0, but the latest version upstream is 1.0.1, your title would be as follows: + > `Update Request: hello 1.0.0 → 1.0.1` + + --- + - type: "dropdown" + id: "version" + attributes: + label: "Nixpkgs version" + description: | + What version of Nixpkgs are you using? + + > [!IMPORTANT] + > If you are using an older or stable version, please update to the latest **unstable** version and check if the package is still out of date. + > If the package has been updated in unstable, but you believe the update should be backported to the stable release of Nixpkgs, please file the '**Request: backport to stable**' form instead. + options: + - "Please select a version." + - "- Unstable (25.05)" + - "- Stable (24.11)" + - "- Previous Stable (24.05)" + default: 0 + validations: + required: true + - type: "input" + id: "name" + attributes: + label: "Package name" + description: "Please indicate the name of the package." + validations: + required: true + - type: "input" + id: "upstream-version" + attributes: + label: "Upstream version" + description: "Please indicate the latest version of the package." + validations: + required: true + - type: "input" + id: "nixpkgs-version" + attributes: + label: "Nixpkgs version" + description: | + Please indicate the current version number in Nixpkgs' **unstable** channel. You can check this by setting the [NixOS Package Search](https://search.nixos.org/packages?channel=unstable) channel to 'unstable' and searching for the package. + If you meant to request an upgrade in the stable channel, please file the '**Request: backport to stable**' form instead. + validations: + required: true + - type: "input" + id: "changelog" + attributes: + label: "Changelog" + description: "If applicable, please link the upstream changelog for the latest version." + validations: + required: false + - type: "textarea" + id: "additional-context" + attributes: + label: "Additional context" + description: "Add any other context about the update here." + validations: + required: false + - type: "textarea" + id: "maintainers" + attributes: + label: "Notify maintainers" + description: | + Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below. + value: | + + + --- + + **Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.) + validations: + required: false + - type: "checkboxes" + id: "sanity-check" + attributes: + label: "I assert that this issue is relevant for Nixpkgs" + options: + - label: "I assert that this package update does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+package+%28update%29%22) or in [Nixpkgs Unstable](https://search.nixos.org/packages?channel=unstable)." + required: true + - label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%229.needs%3A+package+%28update%29%22)." + required: true + - label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it." + required: true + - type: "markdown" + attributes: + value: | + # Thank you for helping improve Nixpkgs! + + --- + - type: "textarea" + id: "prioritisation" + attributes: + label: "Is this issue important to you?" + description: | + **Please do not modify this text area!** + + This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction. + This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important. + value: | + 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/07_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/07_module_request.yml rename to .github/ISSUE_TEMPLATE/06_module_request.yml diff --git a/.github/ISSUE_TEMPLATE/06_update_request.yml b/.github/ISSUE_TEMPLATE/06_update_request.yml deleted file mode 100644 index 4b29a2af0126..000000000000 --- a/.github/ISSUE_TEMPLATE/06_update_request.yml +++ /dev/null @@ -1,121 +0,0 @@ -name: "Request: package update" -description: "Create an update request for an existing, but outdated package." -title: "Update Request: PACKAGENAME OLDVERSION → NEWVERSION" -labels: ["0.kind: enhancement", "9.needs: package (update)"] -body: - - type: "markdown" - attributes: - value: | -

- - - - - NixOS logo - - -

- - Welcome to Nixpkgs. Please replace the **`Update Request: PACKAGENAME OLDVERSION → NEWVERSION`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)), the current version of the package, and the latest version of the package. - - > [!TIP] - > For instance, if you were filing a request against the out of date `hello` package, where the current version in Nixpkgs is 1.0.0, but the latest version upstream is 1.0.1, your title would be as follows: - > `Update Request: hello 1.0.0 → 1.0.1` - - > [!NOTE] - > If you are filing an update request to change a package's source to a fork, please file a new package request instead. Even if the original upstream is outdated, the fork should be considered a new package. - - --- - - type: "dropdown" - id: "version" - attributes: - label: "Nixpkgs version" - description: | - What version of Nixpkgs are you using? - - > [!IMPORTANT] - > If you are using an older or stable version, please update to the latest **unstable** version and check if the package is still out of date. - > If the package has been updated in unstable, but you believe the update should be backported to the stable release of Nixpkgs, please file the '**Request: backport to stable**' form instead. - options: - - "Please select a version." - - "- Unstable (25.05)" - - "- Stable (24.11)" - - "- Previous Stable (24.05)" - default: 0 - validations: - required: true - - type: "input" - id: "name" - attributes: - label: "Package name" - description: "Please indicate the name of the package." - validations: - required: true - - type: "input" - id: "upstream-version" - attributes: - label: "Upstream version" - description: "Please indicate the latest version of the package." - validations: - required: true - - type: "input" - id: "nixpkgs-version" - attributes: - label: "Nixpkgs version" - description: | - Please indicate the current version number in Nixpkgs' **unstable** channel. You can check this by setting the [NixOS Package Search](https://search.nixos.org/packages?channel=unstable) channel to 'unstable' and searching for the package. - If you meant to request an upgrade in the stable channel, please file the '**Request: backport to stable**' form instead. - validations: - required: true - - type: "input" - id: "changelog" - attributes: - label: "Changelog" - description: "If applicable, please link the upstream changelog for the latest version." - validations: - required: false - - type: "textarea" - id: "maintainers" - attributes: - label: "Notify maintainers" - description: | - Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below. - value: | - - - --- - - **Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.) - validations: - required: false - - type: "checkboxes" - id: "sanity-check" - attributes: - label: "I assert that this issue is relevant for Nixpkgs" - options: - - label: "I assert that this package update does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+package+%28update%29%22) or in [Nixpkgs Unstable](https://search.nixos.org/packages?channel=unstable)." - required: true - - label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%229.needs%3A+package+%28update%29%22)." - required: true - - label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it." - required: true - - type: "markdown" - attributes: - value: | - # Thank you for helping improve Nixpkgs! - - --- - - type: "textarea" - id: "prioritisation" - attributes: - label: "Is this issue important to you?" - description: | - **Please do not modify this text area!** - - This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction. - This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important. - value: | - 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/08_backport_request.yml b/.github/ISSUE_TEMPLATE/07_backport_request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/08_backport_request.yml rename to .github/ISSUE_TEMPLATE/07_backport_request.yml diff --git a/.github/ISSUE_TEMPLATE/09_documentation_request.yml b/.github/ISSUE_TEMPLATE/08_documentation_request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/09_documentation_request.yml rename to .github/ISSUE_TEMPLATE/08_documentation_request.yml diff --git a/.github/ISSUE_TEMPLATE/10_unreproducible_package.yml b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/10_unreproducible_package.yml rename to .github/ISSUE_TEMPLATE/09_unreproducible_package.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 16481ee4c513..27635498f54d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -25,8 +25,9 @@ For new packages please briefly describe the package or provide a link to its ho - made sure NixOS tests are [linked](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#linking-nixos-module-tests-to-a-package) to the relevant packages - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) -- [25.05 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) Release notes) +- [Nixpkgs 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/doc/release-notes/rl-2511.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/doc/manual/release-notes/rl-2505.section.md) Nixpkgs Release notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking +- [NixOS 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2511.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) NixOS Release notes) - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5ace4600a1f2..a909ff0fdde0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,3 +4,4 @@ updates: directory: "/" schedule: interval: "weekly" + labels: [ ] diff --git a/.github/labeler-development-branches.yml b/.github/labeler-development-branches.yml new file mode 100644 index 000000000000..e0b855a07cde --- /dev/null +++ b/.github/labeler-development-branches.yml @@ -0,0 +1,23 @@ +# This file is used by .github/workflows/labels.yml +# This version is only run for Pull Requests from development branches like staging-next, haskell-updates or python-updates. + +"4.workflow: package set update": + - any: + - head-branch: + - '-updates$' + +"4.workflow: staging": + - any: + - head-branch: + - '^staging-next$' + - '^staging-next-' + +"6.topic: haskell": + - any: + - head-branch: + - '^haskell-updates$' + +"6.topic: python": + - any: + - head-branch: + - '^python-updates$' diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml index a64a5d3cf730..2d4836c58b7b 100644 --- a/.github/labeler-no-sync.yml +++ b/.github/labeler-no-sync.yml @@ -1,12 +1,7 @@ # This file is used by .github/workflows/labels.yml # This version uses `sync-labels: false`, meaning that a non-match will NOT remove the label -"backport release-24.11": - - any: - - changed-files: - - any-glob-to-any-file: - - .github/workflows/* - - ci/**/*.* +# keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1 "6.topic: policy discussion": - any: @@ -26,3 +21,12 @@ - any-glob-to-any-file: - doc/**/* - nixos/doc/**/* + +"backport release-25.05": + - any: + - changed-files: + - any-glob-to-any-file: + - .github/workflows/* + - ci/**/*.* + +# keep-sorted end diff --git a/.github/labeler.yml b/.github/labeler.yml index 0d1a59489084..7f1ac6d2ea32 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,6 +1,15 @@ # This file is used by .github/workflows/labels.yml # This version uses `sync-labels: true`, meaning that a non-match will remove the label +# keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1 + +"4.workflow: backport": + - any: + - base-branch: + - '^release-' + - '^staging-\d' + - '^staging-next-\d' + # NOTE: bsd, darwin and cross-compilation labels are handled by ofborg "6.topic: agda": - any: @@ -30,7 +39,7 @@ - changed-files: - any-glob-to-any-file: - .github/**/* - - ci/**/* + - ci/**/*.* "6.topic: coq": - any: @@ -40,6 +49,16 @@ - pkgs/development/coq-modules/**/* - pkgs/top-level/coq-packages.nix +"6.topic: COSMIC": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/desktop-managers/cosmic.nix + - nixos/modules/services/display-managers/cosmic-greeter.nix + - nixos/tests/cosmic.nix + - pkgs/by-name/co/cosmic-*/**/* + - pkgs/by-name/xd/xdg-desktop-portal-cosmic/* + "6.topic: crystal": - any: - changed-files: @@ -310,6 +329,16 @@ - any-glob-to-any-file: - pkgs/os-specific/linux/musl/**/* +"6.topic: nim": + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/nim.section.md + - pkgs/build-support/build-nim-package.nix + - pkgs/build-support/build-nim-sbom.nix + - pkgs/by-name/ni/nim* + - pkgs/top-level/nim-overrides.nix + "6.topic: nixos": - any: - changed-files: @@ -326,16 +355,6 @@ - nixos/modules/virtualisation/nixos-containers.nix - pkgs/tools/virtualization/nixos-container/**/* -"6.topic: nim": - - any: - - changed-files: - - any-glob-to-any-file: - - doc/languages-frameworks/nim.section.md - - pkgs/build-support/build-nim-package.nix - - pkgs/build-support/build-nim-sbom.nix - - pkgs/by-name/ni/nim* - - pkgs/top-level/nim-overrides.nix - "6.topic: nodejs": - any: - changed-files: @@ -482,14 +501,6 @@ - any-glob-to-any-file: - maintainers/team-list.nix -"6.topic: TeX": - - any: - - changed-files: - - any-glob-to-any-file: - - doc/languages-frameworks/texlive.section.md - - pkgs/test/texlive/** - - pkgs/tools/typesetting/tex/**/* - "6.topic: testing": - any: - changed-files: @@ -506,6 +517,14 @@ - nixos/tests/make-test-python.nix # legacy # lib/debug.nix has a test framework (runTests) but it's not the main focus +"6.topic: TeX": + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/texlive.section.md + - pkgs/test/texlive/** + - pkgs/tools/typesetting/tex/**/* + "6.topic: updaters": - any: - changed-files: @@ -569,13 +588,16 @@ - any-glob-to-any-file: - nixos/doc/manual/release-notes/**/* -"8.has: module (update)": - - any: - - changed-files: - - any-glob-to-any-file: - - nixos/modules/**/* "8.has: maintainer-list (update)": - any: - changed-files: - any-glob-to-any-file: - maintainers/maintainer-list.nix + +"8.has: module (update)": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/**/* + +# keep-sorted end diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index d27bec04f26f..aee4258f7bb7 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,16 +14,18 @@ permissions: {} jobs: backport: name: Backport Pull Request - if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) - runs-on: ubuntu-24.04 + if: vars.NIXPKGS_CI_APP_ID && github.event.pull_request.merged == true && (github.event.action != 'labeled' || startsWith(github.event.label.name, 'backport')) + runs-on: ubuntu-24.04-arm steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7 + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} + permission-contents: write + permission-pull-requests: write - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: @@ -31,6 +33,7 @@ jobs: token: ${{ steps.app-token.outputs.token }} - name: Create backport PRs + id: backport uses: korthout/backport-action@436145e922f9561fc5ea157ff406f21af2d6b363 # v3.2.0 with: # Config README: https://github.com/korthout/backport-action#backport-action @@ -40,4 +43,16 @@ jobs: Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}. * [ ] Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases). - * Even as a non-commiter, if you find that it is not acceptable, leave a comment. + * Even as a non-committer, if you find that it is not acceptable, leave a comment. + + - name: "Add 'has: port to stable' label" + if: steps.backport.outputs.created_pull_numbers != '' + env: + GH_TOKEN: ${{ steps.app-token.outputs.token }} + REPOSITORY: ${{ github.repository }} + NUMBER: ${{ github.event.number }} + run: | + gh api \ + --method POST \ + /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \ + -f "labels[]=8.has: port to stable" diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml index 1759aa5833b2..70dfdfba1e5f 100644 --- a/.github/workflows/check-cherry-picks.yml +++ b/.github/workflows/check-cherry-picks.yml @@ -1,6 +1,9 @@ name: "Check cherry-picks" on: + pull_request: + paths: + - .github/workflows/check-cherry-picks.yml pull_request_target: branches: - 'release-**' @@ -12,8 +15,7 @@ permissions: {} jobs: check: name: cherry-pick-check - runs-on: ubuntu-24.04 - if: github.repository_owner == 'NixOS' + runs-on: ubuntu-24.04-arm steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml new file mode 100644 index 000000000000..01312cd8f170 --- /dev/null +++ b/.github/workflows/check-format.yml @@ -0,0 +1,44 @@ +name: Check that files are formatted + +on: + pull_request: + paths: + - .github/workflows/check-format.yml + pull_request_target: + types: [opened, synchronize, reopened, edited] + +permissions: {} + +jobs: + get-merge-commit: + uses: ./.github/workflows/get-merge-commit.yml + + nixos: + name: fmt-check + runs-on: ubuntu-24.04-arm + needs: get-merge-commit + if: needs.get-merge-commit.outputs.mergedSha + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: ${{ needs.get-merge-commit.outputs.mergedSha }} + + - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 + with: + extra_nix_config: sandbox = true + + - name: Check that files are formatted + run: | + # Note that it's fine to run this on untrusted code because: + # - There's no secrets accessible here + # - The build is sandboxed + if ! nix-build ci -A fmt.check; then + echo "Some files are not properly formatted" + echo "Please format them by going to the Nixpkgs root directory and running one of:" + echo " nix-shell --run treefmt" + echo " nix develop --command treefmt" + echo " nix fmt" + echo "Make sure your branch is up to date with master; rebase if not." + echo "If you're having trouble, please ping @NixOS/nix-formatting" + exit 1 + fi diff --git a/.github/workflows/check-maintainers-sorted.yml b/.github/workflows/check-maintainers-sorted.yml deleted file mode 100644 index d69813c62c97..000000000000 --- a/.github/workflows/check-maintainers-sorted.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: "Check that maintainer list is sorted" - -on: - pull_request_target: - paths: - - 'maintainers/maintainer-list.nix' - -permissions: {} - -jobs: - nixos: - name: maintainer-list-check - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: refs/pull/${{ github.event.pull_request.number }}/merge - # Only these directories to perform the check - sparse-checkout: | - lib - maintainers - - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 - with: - extra_nix_config: sandbox = true - - - name: Check that maintainer-list.nix is sorted - run: nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml deleted file mode 100644 index 37c32dfcc224..000000000000 --- a/.github/workflows/check-nix-format.yml +++ /dev/null @@ -1,44 +0,0 @@ -# NOTE: Formatting with the RFC-style nixfmt command is not yet stable. -# See https://github.com/NixOS/rfcs/pull/166. - -name: Check that Nix files are formatted - -on: - pull_request_target: - types: [opened, synchronize, reopened, edited] - -permissions: {} - -jobs: - get-merge-commit: - uses: ./.github/workflows/get-merge-commit.yml - - nixos: - name: nixfmt-check - runs-on: ubuntu-24.04 - needs: get-merge-commit - if: needs.get-merge-commit.outputs.mergedSha - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 - with: - extra_nix_config: sandbox = true - - - name: Check that Nix files are formatted - run: | - # Note that it's fine to run this on untrusted code because: - # - There's no secrets accessible here - # - The build is sandboxed - if ! nix-build ci -A fmt.check; then - echo "Some Nix files are not properly formatted" - echo "Please format them by going to the Nixpkgs root directory and running one of:" - echo " nix-shell --run treefmt" - echo " nix develop --command treefmt" - echo " nix fmt" - echo "Make sure your branch is up to date with master; rebase if not." - echo "If you're having trouble, please ping @NixOS/nix-formatting" - exit 1 - fi diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml deleted file mode 100644 index 546ae1351fbc..000000000000 --- a/.github/workflows/check-nixf-tidy.yml +++ /dev/null @@ -1,132 +0,0 @@ -name: Check changed Nix files with nixf-tidy (experimental) - -on: - pull_request_target: - types: [opened, synchronize, reopened, edited] - -permissions: {} - -jobs: - nixos: - name: exp-nixf-tidy-check - runs-on: ubuntu-24.04 - if: "!contains(github.event.pull_request.title, '[skip treewide]')" - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: refs/pull/${{ github.event.pull_request.number }}/merge - # Fetches the merge commit and its parents - fetch-depth: 2 - - - name: Checking out target branch - run: | - target=$(mktemp -d) - targetRev=$(git rev-parse HEAD^1) - git worktree add "$target" "$targetRev" - echo "targetRev=$targetRev" >> "$GITHUB_ENV" - echo "target=$target" >> "$GITHUB_ENV" - - - name: Get Nixpkgs revision for nixf - run: | - # pin to a commit from nixpkgs-unstable to avoid e.g. building nixf - # from staging - # This should not be a URL, because it would allow PRs to run arbitrary code in CI! - rev=$(jq -r .rev ci/pinned-nixpkgs.json) - echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 - with: - extra_nix_config: sandbox = true - nix_path: nixpkgs=${{ env.url }} - - - name: Install nixf and jq - # provided jq is incompatible with our expression - run: "nix-env -f '' -iAP nixf jq" - - - name: Check that Nix files pass nixf-tidy - run: | - # Filtering error messages we don't like - nixf_wrapper(){ - nixf-tidy --variable-lookup < "$1" | jq -r ' - [ - "sema-escaping-with" - ] - as $ignored_errors|[.[]|select(.sname as $s|$ignored_errors|index($s)|not)] - ' - } - - failedFiles=() - - # Don't report errors to file overview - # to avoid duplicates when editing title and description - if [[ "${{ github.event.action }}" == 'edited' ]] && [[ -z "${{ github.event.edited.changes.base }}" ]]; then - DONT_REPORT_ERROR=1 - else - DONT_REPORT_ERROR= - fi - # TODO: Make this more parallel - - # Loop through all Nix files touched by the PR - while readarray -d '' -n 2 entry && (( ${#entry[@]} != 0 )); do - type=${entry[0]} - file=${entry[1]} - case $type in - A*) - source="" - dest=$file - ;; - M*) - source=$file - dest=$file - ;; - C*|R*) - source=$file - read -r -d '' dest - ;; - *) - echo "Ignoring file $file with type $type" - continue - esac - - if [[ -n "$source" ]] && [[ "$(nixf_wrapper ${{ env.target }}/"$source")" != '[]' ]] 2>/dev/null; then - echo "Ignoring file $file because it doesn't pass nixf-tidy in the target commit" - echo # insert blank line - else - nixf_report="$(nixf_wrapper "$dest")" - if [[ "$nixf_report" != '[]' ]]; then - echo "$dest doesn't pass nixf-tidy. Reported by nixf-tidy:" - errors=$(echo "$nixf_report" | jq -r --arg dest "$dest" ' - def getLCur: "line=" + (.line+1|tostring) + ",col=" + (.column|tostring); - def getRCur: "endLine=" + (.line+1|tostring) + ",endColumn=" + (.column|tostring); - def getRange: "file=\($dest)," + (.lCur|getLCur) + "," + (.rCur|getRCur); - def getBody: . as $top|(.range|getRange) + ",title="+ .sname + "::" + - (.message|sub("{}" ; ($top.args.[]|tostring))); - def getNote: "\n::notice " + (.|getBody); - def getMessage: "::error " + (.|getBody) + (if (.notes|length)>0 then - ([.notes.[]|getNote]|add) else "" end); - .[]|getMessage - ') - if [[ -z "$DONT_REPORT_ERROR" ]]; then - echo "$errors" - else - # just print in plain text - echo "${errors/::/}" - echo # add one empty line - fi - failedFiles+=("$dest") - fi - fi - done < <(git diff -z --name-status ${{ env.targetRev }} -- '*.nix') - - if [[ -n "$DONT_REPORT_ERROR" ]]; then - echo "Edited the PR but didn't change the base branch, only the description/title." - echo "Not reporting errors again to avoid duplication." - echo # add one empty line - fi - - if (( "${#failedFiles[@]}" > 0 )); then - echo "Some new/changed Nix files don't pass nixf-tidy." - echo "See ${{ github.event.pull_request.html_url }}/files for reported errors." - echo "If you believe this is a false positive, ping @Aleksanaa and @inclyc in this PR." - exit 1 - fi diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index 2ba1ec405d71..c26bea7761bc 100644 --- a/.github/workflows/check-shell.yml +++ b/.github/workflows/check-shell.yml @@ -1,6 +1,9 @@ name: "Check shell" on: + pull_request: + paths: + - .github/workflows/check-shell.yml pull_request_target: paths: - 'shell.nix' @@ -16,6 +19,10 @@ jobs: include: - runner: ubuntu-24.04 system: x86_64-linux + - runner: ubuntu-24.04-arm + system: aarch64-linux + - runner: macos-13 + system: x86_64-darwin - runner: macos-14 system: aarch64-darwin @@ -27,7 +34,7 @@ jobs: with: ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - name: Build shell - run: nix-build shell.nix + run: nix-build ci -A shell diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index cb9a090bf73a..28b0ef43d5ac 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -23,6 +23,9 @@ name: Codeowners v2 on: + pull_request: + paths: + - .github/workflows/codeowners-v2.yml pull_request_target: types: [opened, ready_for_review, synchronize, reopened, edited] @@ -41,11 +44,11 @@ jobs: # Check that code owners is valid check: name: Check - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm needs: get-merge-commit if: github.repository_owner == 'NixOS' && needs.get-merge-commit.outputs.mergedSha steps: - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 with: @@ -63,11 +66,14 @@ jobs: - name: Build codeowners validator run: nix-build base/ci -A codeownersValidator - - uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7 + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 + if: vars.OWNER_RO_APP_ID id: app-token with: app-id: ${{ vars.OWNER_RO_APP_ID }} private-key: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }} + permission-administration: read + permission-members: read - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: @@ -75,6 +81,7 @@ jobs: path: pr - name: Validate codeowners + if: steps.app-token.outputs.token run: result/bin/codeowners-validator env: OWNERS_FILE: pr/${{ env.OWNERS_FILE }} @@ -87,25 +94,30 @@ jobs: # Request reviews from code owners request: name: Request - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm if: github.repository_owner == 'NixOS' steps: - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head. # This is intentional, because we need to request the review of owners as declared in the base branch. - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7 + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 + if: vars.OWNER_APP_ID id: app-token with: app-id: ${{ vars.OWNER_APP_ID }} private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} + permission-administration: read + permission-members: read + permission-pull-requests: write - name: Build review request package run: nix-build ci -A requestReviews - name: Request reviews + if: steps.app-token.outputs.token run: result/bin/request-code-owner-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE" env: GH_TOKEN: ${{ steps.app-token.outputs.token }} diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml deleted file mode 100644 index 9046b25032cd..000000000000 --- a/.github/workflows/editorconfig-v2.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: "Checking EditorConfig v2" - -on: - pull_request_target: - -permissions: {} - -jobs: - get-merge-commit: - uses: ./.github/workflows/get-merge-commit.yml - - tests: - name: editorconfig-check - runs-on: ubuntu-24.04 - needs: get-merge-commit - if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')" - steps: - - name: Get list of changed files from PR - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - gh api \ - repos/${{ github.repository }}/pulls/${{ github.event.number }}/files --paginate \ - | jq '.[] | select(.status != "removed") | .filename' \ - > "$HOME/changed_files" - - - name: print list of changed files - run: | - cat "$HOME/changed_files" - - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 - with: - # nixpkgs commit is pinned so that it doesn't break - # editorconfig-checker 2.4.0 - nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz - - - name: Checking EditorConfig - run: | - < "$HOME/changed_files" nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' - - - if: ${{ failure() }} - run: | - echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml new file mode 100644 index 000000000000..7f9b658081f1 --- /dev/null +++ b/.github/workflows/eval-aliases.yml @@ -0,0 +1,36 @@ +name: Eval aliases + +on: + pull_request: + paths: + - .github/workflows/eval-aliases.yml + pull_request_target: + +permissions: {} + +jobs: + get-merge-commit: + uses: ./.github/workflows/get-merge-commit.yml + + eval-aliases: + name: Eval nixpkgs with aliases enabled + runs-on: ubuntu-24.04-arm + needs: [ get-merge-commit ] + steps: + - name: Check out the PR at the test merge commit + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: ${{ needs.get-merge-commit.outputs.mergedSha }} + path: nixpkgs + + - name: Install Nix + uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 + with: + extra_nix_config: sandbox = true + + - name: Ensure flake outputs on all systems still evaluate + run: nix flake check --all-systems --no-build ./nixpkgs + + - name: Query nixpkgs with aliases enabled to check for basic syntax errors + run: | + time nix-env -I ./nixpkgs -f ./nixpkgs -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml deleted file mode 100644 index 47bfa61d4c9c..000000000000 --- a/.github/workflows/eval-lib-tests.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: "Building Nixpkgs lib-tests" - -on: - pull_request_target: - paths: - - 'lib/**' - - 'maintainers/**' - -permissions: {} - -jobs: - get-merge-commit: - uses: ./.github/workflows/get-merge-commit.yml - - nixpkgs-lib-tests: - name: nixpkgs-lib-tests - runs-on: ubuntu-24.04 - needs: get-merge-commit - if: needs.get-merge-commit.outputs.mergedSha - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 - with: - extra_nix_config: sandbox = true - - - name: Building Nixpkgs lib-tests - run: | - nix-build --arg pkgs "(import ./ci/. {}).pkgs" ./lib/tests/release.nix diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 82781f96c736..ecb763043425 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -1,6 +1,9 @@ name: Eval on: + pull_request: + paths: + - .github/workflows/eval.yml pull_request_target: types: [opened, ready_for_review, synchronize, reopened] push: @@ -19,87 +22,21 @@ jobs: get-merge-commit: uses: ./.github/workflows/get-merge-commit.yml - attrs: - name: Attributes - runs-on: ubuntu-24.04 - needs: get-merge-commit - if: needs.get-merge-commit.outputs.mergedSha - outputs: - targetSha: ${{ steps.targetSha.outputs.targetSha }} - systems: ${{ steps.systems.outputs.systems }} - steps: - - name: Check out the PR at the test merge commit - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - fetch-depth: 2 - path: nixpkgs - - - name: Determine target commit - if: github.event_name == 'pull_request_target' - id: targetSha - run: | - targetSha=$(git -C nixpkgs rev-parse HEAD^1) - echo "targetSha=$targetSha" >> "$GITHUB_OUTPUT" - - - name: Install Nix - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 - with: - extra_nix_config: sandbox = true - - - name: Evaluate the list of all attributes and get the systems matrix - id: systems - run: | - nix-build nixpkgs/ci -A eval.attrpathsSuperset - echo "systems=$(> "$GITHUB_OUTPUT" - - - name: Upload the list of all attributes - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 - with: - name: paths - path: result/* - - eval-aliases: - name: Eval nixpkgs with aliases enabled - runs-on: ubuntu-24.04 - needs: [ get-merge-commit ] - steps: - - name: Check out the PR at the test merge commit - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - path: nixpkgs - - - name: Install Nix - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 - with: - extra_nix_config: sandbox = true - - - name: Query nixpkgs with aliases enabled to check for basic syntax errors - run: | - time nix-env -I ./nixpkgs -f ./nixpkgs -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null - outpaths: name: Outpaths - runs-on: ubuntu-24.04 - needs: [ attrs, get-merge-commit ] + runs-on: ubuntu-24.04-arm + needs: [ get-merge-commit ] strategy: fail-fast: false matrix: - system: ${{ fromJSON(needs.attrs.outputs.systems) }} + system: ${{ fromJSON(needs.get-merge-commit.outputs.systems) }} steps: - name: Enable swap run: | - sudo fallocate -l 10G /swapfile - sudo chmod 600 /swapfile - sudo mkswap /swapfile - sudo swapon /swapfile - - - name: Download the list of all attributes - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - with: - name: paths - path: paths + sudo fallocate -l 10G /swap + sudo chmod 600 /swap + sudo mkswap /swap + sudo swapon /swap - name: Check out the PR at the test merge commit uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -108,7 +45,7 @@ jobs: path: nixpkgs - name: Install Nix - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: extra_nix_config: sandbox = true @@ -118,7 +55,6 @@ jobs: run: | nix-build nixpkgs/ci -A eval.singleSystem \ --argstr evalSystem "$MATRIX_SYSTEM" \ - --arg attrpathFile ./paths/paths.json \ --arg chunkSize 10000 # If it uses too much memory, slightly decrease chunkSize @@ -130,8 +66,8 @@ jobs: process: name: Process - runs-on: ubuntu-24.04 - needs: [ outpaths, attrs, get-merge-commit ] + runs-on: ubuntu-24.04-arm + needs: [ outpaths, get-merge-commit ] outputs: targetRunId: ${{ steps.targetRunId.outputs.targetRunId }} steps: @@ -149,7 +85,7 @@ jobs: path: nixpkgs - name: Install Nix - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: extra_nix_config: sandbox = true @@ -166,7 +102,7 @@ jobs: path: prResult/* - name: Get target run id - if: needs.attrs.outputs.targetSha + if: needs.get-merge-commit.outputs.targetSha id: targetRunId run: | # Get the latest eval.yml workflow run for the PR's target commit @@ -195,7 +131,7 @@ jobs: echo "targetRunId=$runId" >> "$GITHUB_OUTPUT" env: REPOSITORY: ${{ github.repository }} - TARGET_SHA: ${{ needs.attrs.outputs.targetSha }} + TARGET_SHA: ${{ needs.get-merge-commit.outputs.targetSha }} GH_TOKEN: ${{ github.token }} - uses: actions/download-artifact@v4 @@ -209,18 +145,21 @@ jobs: - name: Compare against the target branch if: steps.targetRunId.outputs.targetRunId run: | - git -C nixpkgs worktree add ../target ${{ needs.attrs.outputs.targetSha }} - git -C nixpkgs diff --name-only ${{ needs.attrs.outputs.targetSha }} \ + git -C nixpkgs worktree add ../target ${{ needs.get-merge-commit.outputs.targetSha }} + git -C nixpkgs diff --name-only ${{ needs.get-merge-commit.outputs.targetSha }} \ | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json # Use the target branch to get accurate maintainer info nix-build target/ci -A eval.compare \ --arg beforeResultDir ./targetResult \ - --arg afterResultDir ./prResult \ + --arg afterResultDir "$(realpath prResult)" \ --arg touchedFilesJson ./touched-files.json \ + --argstr githubAuthorId "$AUTHOR_ID" \ -o comparison cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY" + env: + AUTHOR_ID: ${{ github.event.pull_request.user.id }} - name: Upload the combined results if: steps.targetRunId.outputs.targetRunId @@ -232,8 +171,8 @@ jobs: # Separate job to have a very tightly scoped PR write token tag: name: Tag - runs-on: ubuntu-24.04 - needs: [ attrs, process ] + runs-on: ubuntu-24.04-arm + needs: [ get-merge-commit, process ] if: needs.process.outputs.targetRunId permissions: pull-requests: write @@ -241,11 +180,15 @@ jobs: steps: # See ./codeowners-v2.yml, reuse the same App because we need the same permissions # Can't use the token received from permissions above, because it can't get enough permissions - - uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7 + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 + if: vars.OWNER_APP_ID id: app-token with: app-id: ${{ vars.OWNER_APP_ID }} private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} + permission-administration: read + permission-members: read + permission-pull-requests: write - name: Download process result uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 @@ -254,14 +197,14 @@ jobs: path: comparison - name: Install Nix - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 # Important: This workflow job runs with extra permissions, # so we need to make sure to not run untrusted code from PRs - name: Check out Nixpkgs at the base commit uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - ref: ${{ needs.attrs.outputs.targetSha }} + ref: ${{ needs.get-merge-commit.outputs.targetSha }} path: base sparse-checkout: ci @@ -269,11 +212,12 @@ jobs: run: nix-build base/ci -A requestReviews - name: Labelling pull request + if: ${{ github.event_name == 'pull_request_target' && github.repository_owner == 'NixOS' }} run: | - # Get all currently set rebuild labels + # Get all currently set labels that we manage gh api \ /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \ - --jq '.[].name | select(startswith("10.rebuild"))' \ + --jq '.[].name | select(startswith("10.rebuild") or . == "11.by: package-maintainer")' \ | sort > before # And the labels that should be there @@ -303,7 +247,7 @@ jobs: NUMBER: ${{ github.event.number }} - name: Add eval summary to commit statuses - if: ${{ github.event_name == 'pull_request_target' }} + if: ${{ github.event_name == 'pull_request_target' && github.repository_owner == 'NixOS' }} run: | description=$(jq -r ' "Package: added " + (.attrdiff.added | length | tostring) + @@ -323,6 +267,7 @@ jobs: NUMBER: ${{ github.event.number }} - name: Requesting maintainer reviews + if: ${{ steps.app-token.outputs.token && github.repository_owner == 'NixOS' }} run: | # maintainers.json contains GitHub IDs. Look up handles to request reviews from. # There appears to be no API to request reviews based on GitHub IDs diff --git a/.github/workflows/get-merge-commit.yml b/.github/workflows/get-merge-commit.yml index a32595ae1ad4..edbda3e040eb 100644 --- a/.github/workflows/get-merge-commit.yml +++ b/.github/workflows/get-merge-commit.yml @@ -1,19 +1,30 @@ name: Get merge commit on: + pull_request: + paths: + - .github/workflows/get-merge-commit.yml workflow_call: outputs: mergedSha: description: "The merge commit SHA" value: ${{ jobs.resolve-merge-commit.outputs.mergedSha }} + targetSha: + description: "The target commit SHA" + value: ${{ jobs.resolve-merge-commit.outputs.targetSha }} + systems: + description: "The supported systems" + value: ${{ jobs.resolve-merge-commit.outputs.systems }} permissions: {} jobs: resolve-merge-commit: - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm outputs: mergedSha: ${{ steps.merged.outputs.mergedSha }} + targetSha: ${{ steps.merged.outputs.targetSha }} + systems: ${{ steps.systems.outputs.systems }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: @@ -30,14 +41,18 @@ jobs: push) echo "mergedSha=${{ github.sha }}" >> "$GITHUB_OUTPUT" ;; - pull_request_target) - if mergedSha=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then - echo "Checking the merge commit $mergedSha" - echo "mergedSha=$mergedSha" >> "$GITHUB_OUTPUT" + pull_request*) + if commits=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then + echo -e "Checking the commits:\n$commits" + echo "$commits" >> "$GITHUB_OUTPUT" else # Skipping so that no notifications are sent echo "Skipping the rest..." fi ;; esac - rm -rf base + + - name: Load supported systems + id: systems + run: | + echo "systems=$(jq -c > "$GITHUB_OUTPUT" diff --git a/.github/workflows/keep-sorted.yml b/.github/workflows/keep-sorted.yml deleted file mode 100644 index 2433c7b57264..000000000000 --- a/.github/workflows/keep-sorted.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Check that files are sorted - -on: - pull_request_target: - types: [opened, synchronize, reopened] - -permissions: {} - -jobs: - get-merge-commit: - uses: ./.github/workflows/get-merge-commit.yml - - nixos: - name: keep-sorted - runs-on: ubuntu-24.04 - needs: get-merge-commit - if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')" - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - - name: Get Nixpkgs revision for keep-sorted - run: | - # Pin to a commit from nixpkgs-unstable to avoid e.g. building nixfmt from staging. - # This should not be a URL, because it would allow PRs to run arbitrary code in CI! - rev=$(jq -r .rev ci/pinned-nixpkgs.json) - echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 - with: - extra_nix_config: sandbox = true - nix_path: nixpkgs=${{ env.url }} - - - name: Install keep-sorted - run: "nix-env -f '' -iAP keep-sorted jq" - - - name: Check that Nix files are sorted - run: | - git ls-files | xargs keep-sorted --mode lint | jq --raw-output '.[] | "Please make sure any new entries in \(.path) are sorted alphabetically."' diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 0ae4ee09d5ca..d183985f0708 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -16,16 +16,45 @@ permissions: jobs: labels: name: label-pr - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 + if: | + github.event.pull_request.head.repo.owner.login != 'NixOS' || !( + github.head_ref == 'haskell-updates' || + github.head_ref == 'python-updates' || + github.head_ref == 'staging-next' || + startsWith(github.head_ref, 'staging-next-') + ) with: repo-token: ${{ secrets.GITHUB_TOKEN }} configuration-path: .github/labeler.yml # default sync-labels: true - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 + if: | + github.event.pull_request.head.repo.owner.login != 'NixOS' || !( + github.head_ref == 'haskell-updates' || + github.head_ref == 'python-updates' || + github.head_ref == 'staging-next' || + startsWith(github.head_ref, 'staging-next-') + ) with: repo-token: ${{ secrets.GITHUB_TOKEN }} configuration-path: .github/labeler-no-sync.yml sync-labels: false + - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 + # Development branches like staging-next, haskell-updates and python-updates get special labels. + # This is to avoid the mass of labels there, which is mostly useless - and really annoying for + # the backport labels. + if: | + github.event.pull_request.head.repo.owner.login == 'NixOS' && ( + github.head_ref == 'haskell-updates' || + github.head_ref == 'python-updates' || + github.head_ref == 'staging-next' || + startsWith(github.head_ref, 'staging-next-') + ) + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + configuration-path: .github/labeler-development-branches.yml + sync-labels: true diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml new file mode 100644 index 000000000000..d55a109aa9f5 --- /dev/null +++ b/.github/workflows/lib-tests.yml @@ -0,0 +1,34 @@ +name: "Building Nixpkgs lib-tests" + +on: + pull_request: + paths: + - .github/workflows/lib-tests.yml + pull_request_target: + paths: + - 'lib/**' + - 'maintainers/**' + +permissions: {} + +jobs: + get-merge-commit: + uses: ./.github/workflows/get-merge-commit.yml + + nixpkgs-lib-tests: + name: nixpkgs-lib-tests + runs-on: ubuntu-24.04 + needs: get-merge-commit + if: needs.get-merge-commit.outputs.mergedSha + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: ${{ needs.get-merge-commit.outputs.mergedSha }} + + - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 + with: + extra_nix_config: sandbox = true + + - name: Building Nixpkgs lib-tests + run: | + nix-build ci -A lib-tests diff --git a/.github/workflows/lint-actions.sh b/.github/workflows/lint-actions.sh deleted file mode 100755 index 43d6e801caf6..000000000000 --- a/.github/workflows/lint-actions.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash actionlint shellcheck -I nixpkgs=../.. -set -euo pipefail - -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -cd "$SCRIPT_DIR/../.." -actionlint diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml index 2369f3b251f3..a8eadf63057e 100644 --- a/.github/workflows/manual-nixos-v2.yml +++ b/.github/workflows/manual-nixos-v2.yml @@ -1,6 +1,9 @@ name: "Build NixOS manual v2" on: + pull_request: + paths: + - .github/workflows/manual-nixos-v2.yml pull_request_target: branches: - master @@ -22,23 +25,22 @@ jobs: strategy: fail-fast: false matrix: - system: - - x86_64-linux - - aarch64-linux - runs-on: >- - ${{ (matrix.system == 'x86_64-linux' && 'ubuntu-24.04') - || (matrix.system == 'aarch64-linux' && 'ubuntu-24.04-arm') }} + include: + - runner: ubuntu-24.04 + system: x86_64-linux + - runner: ubuntu-24.04-arm + system: aarch64-linux + runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: extra_nix_config: sandbox = true - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 - if: github.repository_owner == 'NixOS' with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci @@ -46,7 +48,7 @@ jobs: - name: Build NixOS manual id: build-manual - run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.${{ matrix.system }} + run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true ci -A manual-nixos --argstr system ${{ matrix.system }} - name: Upload NixOS manual uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml index 874f6c3ef58e..f9a5f8aa30b1 100644 --- a/.github/workflows/manual-nixpkgs-v2.yml +++ b/.github/workflows/manual-nixpkgs-v2.yml @@ -1,35 +1,37 @@ name: "Build Nixpkgs manual v2" on: + pull_request: + paths: + - .github/workflows/manual-nixpkgs-v2.yml pull_request_target: branches: - master paths: - 'doc/**' - 'lib/**' - - 'pkgs/tools/nix/nixdoc/**' + - 'pkgs/by-name/ni/nixdoc/**' permissions: {} jobs: nixpkgs: name: nixpkgs-manual-build - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: extra_nix_config: sandbox = true - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 - if: github.repository_owner == 'NixOS' with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Building Nixpkgs manual - run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true pkgs/top-level/release.nix -A manual -A manual.tests + run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true ci -A manual-nixpkgs -A manual-nixpkgs-tests diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml index 497bba08ae97..4b670331308e 100644 --- a/.github/workflows/nix-parse-v2.yml +++ b/.github/workflows/nix-parse-v2.yml @@ -1,6 +1,9 @@ name: "Check whether nix files are parseable v2" on: + pull_request: + paths: + - .github/workflows/nix-parse-v2.yml pull_request_target: permissions: {} @@ -11,37 +14,20 @@ jobs: tests: name: nix-files-parseable-check - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm needs: get-merge-commit if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - - name: Get list of changed files from PR - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - gh api \ - repos/${{ github.repository }}/pulls/${{github.event.number}}/files --paginate \ - | jq --raw-output '.[] | select(.status != "removed" and (.filename | endswith(".nix"))) | .filename' \ - > "$HOME/changed_files" - if [[ -s "$HOME/changed_files" ]]; then - echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV" - fi - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }} - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: extra_nix_config: sandbox = true nix_path: nixpkgs=channel:nixpkgs-unstable - - name: Parse all changed or added nix files + - name: Parse all nix files run: | - ret=0 - while IFS= read -r file; do - out="$(nix-instantiate --parse "$file")" || { echo "$out" && ret=1; } - done < "$HOME/changed_files" - exit "$ret" - if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }} + # Tests multiple versions at once, let's make sure all of them run, so keep-going. + nix-build ci -A parse --keep-going diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index dd4a8c2b7ab8..b9f9fd2c56f6 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -6,6 +6,9 @@ name: Vet nixpkgs on: + pull_request: + paths: + - .github/workflows/nixpkgs-vet.yml pull_request_target: # This workflow depends on the base branch of the PR, but changing the base branch is not included in the default trigger events, which would be `opened`, `synchronize` or `reopened`. # Instead it causes an `edited` event, so we need to add it explicitly here. @@ -43,7 +46,7 @@ jobs: git worktree add "$target" "$(git rev-parse HEAD^1)" echo "target=$target" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - name: Fetching the pinned tool # Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml index acaa937ad936..ee305a12d61b 100644 --- a/.github/workflows/no-channel.yml +++ b/.github/workflows/no-channel.yml @@ -1,19 +1,22 @@ name: "No channel PR" on: + pull_request: + paths: + - .github/workflows/no-channel.yml pull_request_target: # Re-run should be triggered when the base branch is updated, instead of silently failing types: [opened, synchronize, reopened, edited] - branches: - - 'nixos-**' - - 'nixpkgs-**' permissions: {} jobs: fail: - name: "This PR is is targeting a channel branch" - runs-on: ubuntu-24.04 + if: | + startsWith(github.event.pull_request.base.ref, 'nixos-') || + startsWith(github.event.pull_request.base.ref, 'nixpkgs-') + name: "This PR is targeting a channel branch" + runs-on: ubuntu-24.04-arm steps: - run: | cat < Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7 + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} + permission-contents: write + permission-pull-requests: write - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d4a573f5bb3c..8636219cc9ad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -345,7 +345,7 @@ See [Nix Channel Status](https://status.nixos.org/) for the current channels and Here's a brief overview of the main Git branches and what channels they're used for: - `master`: The main branch, used for the unstable channels such as `nixpkgs-unstable`, `nixos-unstable` and `nixos-unstable-small`. -- `release-YY.MM` (e.g. `release-25.05`): The NixOS release branches, used for the stable channels such as `nixos-25.05`, `nixos-25.05-small` and `nixpkgs-25.05-darwin`. +- `release-YY.MM` (e.g. `release-25.11`): The NixOS release branches, used for the stable channels such as `nixos-25.11`, `nixos-25.11-small` and `nixpkgs-25.11-darwin`. When a channel is updated, a corresponding Git branch is also updated to point to the corresponding commit. So e.g. the [`nixpkgs-unstable` branch](https://github.com/nixos/nixpkgs/tree/nixpkgs-unstable) corresponds to the Git commit from the [`nixpkgs-unstable` channel](https://channels.nixos.org/nixpkgs-unstable). @@ -533,7 +533,7 @@ Names of files and directories should be in lowercase, with dashes between words ### Formatting -CI [enforces](./.github/workflows/check-nix-format.yml) all Nix files to be +CI [enforces](./.github/workflows/check-format.yml) all Nix files to be formatted using the [official Nix formatter](https://github.com/NixOS/nixfmt). You can ensure this locally using either of these commands: diff --git a/README.md b/README.md index 92184fbf1145..fc275f69e4f4 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@

- + - NixOS logo + NixOS logo

@@ -14,7 +14,7 @@

[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over -100,000 software packages that can be installed with the +120,000 software packages that can be installed with the [Nix](https://nixos.org/nix/) package manager. It also implements [NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution. diff --git a/ci/OWNERS b/ci/OWNERS index 30b5c90ba2b4..cad846ee537e 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -16,7 +16,7 @@ # CI /.github/*_TEMPLATE* @SigmaSquadron /.github/workflows @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther -/.github/workflows/check-nix-format.yml @infinisil @wolfgangwalther +/.github/workflows/check-format.yml @infinisil @wolfgangwalther /.github/workflows/codeowners-v2.yml @infinisil @wolfgangwalther /.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron @wolfgangwalther /ci @infinisil @philiptaron @NixOS/Security @wolfgangwalther @@ -171,14 +171,19 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /pkgs/top-level/python-packages.nix @natsukium /pkgs/top-level/release-python.nix @natsukium +# CUDA +/pkgs/top-level/cuda-packages.nix @NixOS/cuda-maintainers +/pkgs/top-level/release-cuda.nix @NixOS/cuda-maintainers +/pkgs/development/cuda-modules @NixOS/cuda-maintainers + # Haskell -/doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn -/maintainers/scripts/haskell @sternenseemann @maralorn -/pkgs/development/compilers/ghc @sternenseemann @maralorn -/pkgs/development/haskell-modules @sternenseemann @maralorn -/pkgs/test/haskell @sternenseemann @maralorn -/pkgs/top-level/release-haskell.nix @sternenseemann @maralorn -/pkgs/top-level/haskell-packages.nix @sternenseemann @maralorn +/doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @wolfgangwalther +/maintainers/scripts/haskell @sternenseemann @maralorn @wolfgangwalther +/pkgs/development/compilers/ghc @sternenseemann @maralorn @wolfgangwalther +/pkgs/development/haskell-modules @sternenseemann @maralorn @wolfgangwalther +/pkgs/test/haskell @sternenseemann @maralorn @wolfgangwalther +/pkgs/top-level/release-haskell.nix @sternenseemann @maralorn @wolfgangwalther +/pkgs/top-level/haskell-packages.nix @sternenseemann @maralorn @wolfgangwalther # Perl /pkgs/development/interpreters/perl @stigtsp @zakame @marcusramberg @@ -206,6 +211,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /pkgs/development/compilers/gcc /pkgs/development/compilers/llvm @alyssais @RossComputerGuy @NixOS/llvm /pkgs/development/compilers/emscripten @raitobezarius +/doc/toolchains/llvm.chapter.md @alyssais @RossComputerGuy @NixOS/llvm /doc/languages-frameworks/emscripten.section.md @raitobezarius # Audio @@ -251,6 +257,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel # PostgreSQL and related stuff +/pkgs/by-name/po/postgresqlTestHook @NixOS/postgres /pkgs/by-name/ps/psqlodbc @NixOS/postgres /pkgs/servers/sql/postgresql @NixOS/postgres /pkgs/development/tools/rust/cargo-pgrx @NixOS/postgres @@ -299,9 +306,12 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/servers/http/nginx/ @raitobezarius /nixos/modules/services/web-servers/nginx/ @raitobezarius +# D +/pkgs/build-support/dlang @jtbx @TomaSajt + # Dhall -/pkgs/development/dhall-modules @Gabriella439 @Profpatsch @ehmry -/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry +/pkgs/development/dhall-modules @Gabriella439 @Profpatsch +/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch # Idris /pkgs/development/idris-modules @Infinisil @@ -326,6 +336,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # Kakoune /pkgs/applications/editors/kakoune @philiptaron +# LuaPackages +/pkgs/development/lua-modules @NixOS/lua + # Neovim /pkgs/applications/editors/neovim @NixOS/neovim @@ -372,12 +385,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # Xfce /doc/hooks/xfce4-dev-tools.section.md @NixOS/xfce -# nim -/doc/languages-frameworks/nim.section.md @ehmry -/pkgs/build-support/build-nim-package.nix @ehmry -/pkgs/build-support/build-nim-sbom.nix @ehmry -/pkgs/top-level/nim-overrides.nix @ehmry - # terraform providers /pkgs/applications/networking/cluster/terraform-providers @zowoq @@ -460,3 +467,12 @@ pkgs/development/beam-modules/ @NixOS/beam pkgs/development/interpreters/erlang/ @NixOS/beam pkgs/development/interpreters/elixir/ @NixOS/beam pkgs/development/interpreters/lfe/ @NixOS/beam + +# OctoDNS +pkgs/by-name/oc/octodns/ @anthonyroussel + +# Teleport +pkgs/by-name/te/teleport* @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger + +# Warp-terminal +pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @donteatoreo @johnrtitor diff --git a/ci/README.md b/ci/README.md index a1b327de4e5d..6ef665e8b099 100644 --- a/ci/README.md +++ b/ci/README.md @@ -44,14 +44,14 @@ Why not just build the tooling right from the PRs Nixpkgs version? ## `get-merge-commit.sh GITHUB_REPO PR_NUMBER` Check whether a PR is mergeable and return the test merge commit as -[computed by GitHub](https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests). +[computed by GitHub](https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests) and its parent. Arguments: - `GITHUB_REPO`: The repository of the PR, e.g. `NixOS/nixpkgs` - `PR_NUMBER`: The PR number, e.g. `1234` Exit codes: -- 0: The PR can be merged, the test merge commit hash is returned on stdout +- 0: The PR can be merged, the hashes of the test merge commit and the target commit are returned on stdout - 1: The PR cannot be merged because it's not open anymore - 2: The PR cannot be merged because it has a merge conflict - 3: The merge commit isn't being computed, GitHub is likely having internal issues, unknown if the PR is mergeable diff --git a/ci/default.nix b/ci/default.nix index 67f59d61bfd4..dd39e082a6fb 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -44,18 +44,26 @@ let # By default it's info, which is too noisy since we have many unmatched files settings.on-unmatched = "debug"; + programs.actionlint.enable = true; + + programs.keep-sorted.enable = true; + # This uses nixfmt-rfc-style underneath, # the default formatter for Nix code. # See https://github.com/NixOS/nixfmt programs.nixfmt.enable = true; + + settings.formatter.editorconfig-checker = { + command = "${pkgs.lib.getExe pkgs.editorconfig-checker}"; + options = [ "-disable-indent-size" ]; + includes = [ "*" ]; + priority = 1; + }; }; fs = pkgs.lib.fileset; nixFilesSrc = fs.toSource { root = ../.; - fileset = fs.difference (fs.unions [ - (fs.fileFilter (file: file.hasExt "nix") ../.) - ../.git-blame-ignore-revs - ]) (fs.maybeMissing ../.git); + fileset = fs.difference ../. (fs.maybeMissing ../.git); }; in { @@ -70,4 +78,16 @@ in requestReviews = pkgs.callPackage ./request-reviews { }; codeownersValidator = pkgs.callPackage ./codeowners-validator { }; eval = pkgs.callPackage ./eval { }; + + # CI jobs + lib-tests = import ../lib/tests/release.nix { inherit pkgs; }; + manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null; + manual-nixpkgs = (import ../pkgs/top-level/release.nix { }).manual; + manual-nixpkgs-tests = (import ../pkgs/top-level/release.nix { }).manual.tests; + parse = pkgs.lib.recurseIntoAttrs { + latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; }; + lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; }; + minimum = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.minimum; }; + }; + shell = import ../shell.nix { inherit nixpkgs system; }; } diff --git a/ci/eval/README.md b/ci/eval/README.md index 0436a028ed69..011f3dd74ed0 100644 --- a/ci/eval/README.md +++ b/ci/eval/README.md @@ -11,7 +11,7 @@ nix-build ci -A eval.full \ --arg evalSystems '["x86_64-linux" "aarch64-darwin"]' ``` -- `--max-jobs`: The maximum number of derivations to run at the same time. Only each [supported system](../supportedSystems.nix) gets a separate derivation, so it doesn't make sense to set this higher than that number. +- `--max-jobs`: The maximum number of derivations to run at the same time. Only each [supported system](../supportedSystems.json) gets a separate derivation, so it doesn't make sense to set this higher than that number. - `--cores`: The number of cores to use for each job. Recommended to set this to the amount of cores on your system divided by `--max-jobs`. - `chunkSize`: The number of attributes that are evaluated simultaneously on a single core. Lowering this decreases memory usage at the cost of increased evaluation time. If this is too high, there won't be enough chunks to process them in parallel, and will also increase evaluation time. - `evalSystems`: The set of systems for which `nixpkgs` should be evaluated. Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`). diff --git a/ci/eval/compare/cmp-stats.py b/ci/eval/compare/cmp-stats.py new file mode 100644 index 000000000000..0ef9c773163a --- /dev/null +++ b/ci/eval/compare/cmp-stats.py @@ -0,0 +1,154 @@ +import json +import os +from scipy.stats import ttest_rel +import pandas as pd +import numpy as np +from pathlib import Path + +# Define metrics of interest (can be expanded as needed) +METRIC_PREFIXES = ("nr", "gc") + +def flatten_data(json_data: dict) -> dict: + """ + Extracts and flattens metrics from JSON data. + This is needed because the JSON data can be nested. + For example, the JSON data entry might look like this: + + "gc":{"cycles":13,"heapSize":5404549120,"totalBytes":9545876464} + + Flattened: + + "gc.cycles": 13 + "gc.heapSize": 5404549120 + ... + + Args: + json_data (dict): JSON data containing metrics. + Returns: + dict: Flattened metrics with keys as metric names. + """ + flat_metrics = {} + for k, v in json_data.items(): + if isinstance(v, (int, float)): + flat_metrics[k] = v + elif isinstance(v, dict): + for sub_k, sub_v in v.items(): + flat_metrics[f"{k}.{sub_k}"] = sub_v + return flat_metrics + + + + +def load_all_metrics(directory: Path) -> dict: + """ + Loads all stats JSON files in the specified directory and extracts metrics. + + Args: + directory (Path): Directory containing JSON files. + Returns: + dict: Dictionary with filenames as keys and extracted metrics as values. + """ + metrics = {} + for system_dir in directory.iterdir(): + assert system_dir.is_dir() + + for chunk_output in system_dir.iterdir(): + with chunk_output.open() as f: + data = json.load(f) + metrics[f"{system_dir.name}/${chunk_output.name}"] = flatten_data(data) + + return metrics + +def dataframe_to_markdown(df: pd.DataFrame) -> str: + df = df.sort_values(by=df.columns[0], ascending=True) + markdown_lines = [] + + # Header (get column names and format them) + header = '\n| ' + ' | '.join(df.columns) + ' |' + markdown_lines.append(header) + markdown_lines.append("| - " * (len(df.columns)) + "|") # Separator line + + # Iterate over rows to build Markdown rows + for _, row in df.iterrows(): + # TODO: define threshold for highlighting + highlight = False + + fmt = lambda x: f"**{x}**" if highlight else f"{x}" + + # Check for no change and NaN in p_value/t_stat + row_values = [] + for val in row: + if isinstance(val, float) and np.isnan(val): # For NaN values in p-value or t-stat + row_values.append("-") # Custom symbol for NaN + elif isinstance(val, float) and val == 0: # For no change (mean_diff == 0) + row_values.append("-") # Custom symbol for no change + else: + row_values.append(fmt(f"{val:.4f}" if isinstance(val, float) else str(val))) + + markdown_lines.append('| ' + ' | '.join(row_values) + ' |') + + return '\n'.join(markdown_lines) + + +def perform_pairwise_tests(before_metrics: dict, after_metrics: dict) -> pd.DataFrame: + common_files = sorted(set(before_metrics) & set(after_metrics)) + all_keys = sorted({ metric_keys for file_metrics in before_metrics.values() for metric_keys in file_metrics.keys() }) + + results = [] + + for key in all_keys: + before_vals, after_vals = [], [] + + for fname in common_files: + if key in before_metrics[fname] and key in after_metrics[fname]: + before_vals.append(before_metrics[fname][key]) + after_vals.append(after_metrics[fname][key]) + + if len(before_vals) >= 2: + before_arr = np.array(before_vals) + after_arr = np.array(after_vals) + + diff = after_arr - before_arr + pct_change = 100 * diff / before_arr + t_stat, p_val = ttest_rel(after_arr, before_arr) + + results.append({ + "metric": key, + "mean_before": np.mean(before_arr), + "mean_after": np.mean(after_arr), + "mean_diff": np.mean(diff), + "mean_%_change": np.mean(pct_change), + "p_value": p_val, + "t_stat": t_stat + }) + + df = pd.DataFrame(results).sort_values("p_value") + return df + + +if __name__ == "__main__": + before_dir = os.environ.get("BEFORE_DIR") + after_dir = os.environ.get("AFTER_DIR") + + if not before_dir or not after_dir: + print("Error: Environment variables 'BEFORE_DIR' and 'AFTER_DIR' must be set.") + exit(1) + + before_stats = Path(before_dir) / "stats" + after_stats = Path(after_dir) / "stats" + + # This may happen if the pull request target does not include PR#399720 yet. + if not before_stats.exists(): + print("⚠️ Skipping comparison: stats directory is missing in the target commit.") + exit(0) + + # This should never happen, but we're exiting gracefully anyways + if not after_stats.exists(): + print("⚠️ Skipping comparison: stats directory missing in current PR evaluation.") + exit(0) + + before_metrics = load_all_metrics(before_stats) + after_metrics = load_all_metrics(after_stats) + df1 = perform_pairwise_tests(before_metrics, after_metrics) + markdown_table = dataframe_to_markdown(df1) + print(markdown_table) diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix index 9b71c6656914..267cab8c0986 100644 --- a/ci/eval/compare/default.nix +++ b/ci/eval/compare/default.nix @@ -3,12 +3,15 @@ jq, runCommand, writeText, + python3, ... }: { beforeResultDir, afterResultDir, touchedFilesJson, + githubAuthorId, + byName ? false, }: let /* @@ -112,29 +115,79 @@ let # Adds "10.rebuild-*-stdenv" label if the "stdenv" attribute was changed ++ lib.mapAttrsToList (kernel: _: "10.rebuild-${kernel}-stdenv") ( lib.filterAttrs (_: kernelRebuilds: kernelRebuilds ? "stdenv") rebuildsByKernel - ); + ) + # Adds the "11.by: package-maintainer" label if all of the packages directly + # changed are maintained by the PR's author. (https://github.com/NixOS/ofborg/blob/df400f44502d4a4a80fa283d33f2e55a4e43ee90/ofborg/src/tagger.rs#L83-L88) + ++ lib.optional ( + maintainers ? ${githubAuthorId} + && lib.all (lib.flip lib.elem maintainers.${githubAuthorId}) ( + lib.flatten (lib.attrValues maintainers) + ) + ) "11.by: package-maintainer"; } ); maintainers = import ./maintainers.nix { changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs); changedpathsjson = touchedFilesJson; + inherit byName; }; in runCommand "compare" { - nativeBuildInputs = [ jq ]; + nativeBuildInputs = [ + jq + (python3.withPackages ( + ps: with ps; [ + numpy + pandas + scipy + ] + )) + + ]; maintainers = builtins.toJSON maintainers; passAsFile = [ "maintainers" ]; + env = { + BEFORE_DIR = "${beforeResultDir}"; + AFTER_DIR = "${afterResultDir}"; + }; } '' mkdir $out cp ${changed-paths} $out/changed-paths.json - jq -r -f ${./generate-step-summary.jq} < ${changed-paths} > $out/step-summary.md + + if jq -e '(.attrdiff.added | length == 0) and (.attrdiff.removed | length == 0)' "${changed-paths}" > /dev/null; then + # Chunks have changed between revisions + # We cannot generate a performance comparison + { + echo + echo "# Performance comparison" + echo + echo "This compares the performance of this branch against its pull request base branch (e.g., 'master')" + echo + echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)" + echo + } >> $out/step-summary.md + + python3 ${./cmp-stats.py} >> $out/step-summary.md + + else + # Package chunks are the same in both revisions + # We can use the to generate a performance comparison + { + echo + echo "# Performance Comparison" + echo + echo "Performance stats were skipped because the package sets differ between the two revisions." + echo + echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)" + } >> $out/step-summary.md + fi + + jq -r -f ${./generate-step-summary.jq} < ${changed-paths} >> $out/step-summary.md cp "$maintainersPath" "$out/maintainers.json" - - # TODO: Compare eval stats '' diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 69748a629cff..9b641d6ec60f 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -1,5 +1,9 @@ # Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix -{ changedattrs, changedpathsjson }: +{ + changedattrs, + changedpathsjson, + byName ? false, +}: let pkgs = import ../../.. { system = "x86_64-linux"; @@ -41,7 +45,16 @@ let ) validPackageAttributes; attrsWithMaintainers = builtins.map ( - pkg: pkg // { maintainers = (pkg.package.meta or { }).maintainers or [ ]; } + pkg: + let + meta = pkg.package.meta or { }; + in + pkg + // { + # TODO: Refactor this so we can ping entire teams instead of the individual members. + # Note that this will require keeping track of GH team IDs in "maintainers/teams.nix". + maintainers = meta.maintainers or [ ]; + } ) attrsWithPackages; relevantFilenames = @@ -49,7 +62,8 @@ let (lib.lists.unique ( builtins.map (pos: lib.strings.removePrefix (toString ../..) pos.file) ( builtins.filter (x: x != null) [ - (builtins.unsafeGetAttrPos "maintainers" (drv.meta or { })) + ((drv.meta or { }).maintainersPosition or null) + ((drv.meta or { }).teamsPosition or null) (builtins.unsafeGetAttrPos "src" drv) # broken because name is always set by stdenv: # # A hack to make `nix-env -qa` and `nix search` ignore broken packages. @@ -83,12 +97,13 @@ let pkg: builtins.map (maintainer: { id = maintainer.githubId; + inherit (maintainer) github; packageName = pkg.name; dueToFiles = pkg.filenames; }) pkg.maintainers ) attrsWithModifiedFiles; - byMaintainer = lib.groupBy (ping: toString ping.id) listToPing; + byMaintainer = lib.groupBy (ping: toString ping.${if byName then "github" else "id"}) listToPing; packagesPerMaintainer = lib.attrsets.mapAttrs ( maintainer: packages: builtins.map (pkg: pkg.packageName) packages diff --git a/ci/eval/default.nix b/ci/eval/default.nix index 6115feddfba8..d46d0f9a759d 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -9,6 +9,7 @@ nixVersions, jq, sta, + python3, }: let @@ -25,16 +26,19 @@ let "nixos" "pkgs" ".version" - "ci/supportedSystems.nix" + "ci/supportedSystems.json" ] ); }; - nix = nixVersions.nix_2_24; + nix = nixVersions.latest; - supportedSystems = import ../supportedSystems.nix; + supportedSystems = builtins.fromJSON (builtins.readFile ../supportedSystems.json); attrpathsSuperset = + { + evalSystem, + }: runCommand "attrpaths-superset.json" { src = nixpkgs; @@ -42,8 +46,6 @@ let nix time ]; - env.supportedSystems = builtins.toJSON supportedSystems; - passAsFile = [ "supportedSystems" ]; } '' export NIX_STATE_DIR=$(mktemp -d) @@ -56,8 +58,8 @@ let -I "$src" \ --option restrict-eval true \ --option allow-import-from-derivation false \ + --option eval-system "${evalSystem}" \ --arg enableWarnings false > $out/paths.json - mv "$supportedSystemsPath" $out/systems.json ''; singleSystem = @@ -67,7 +69,7 @@ let # because `--argstr system` would only be passed to the ci/default.nix file! evalSystem, # The path to the `paths.json` file from `attrpathsSuperset` - attrpathFile, + attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json", # The number of attributes per chunk, see ./README.md for more info. chunkSize, checkMeta ? true, @@ -179,6 +181,8 @@ let xargs -I{} -P"$cores" \ ${singleChunk} "$chunkSize" {} "$evalSystem" "$chunkOutputDir" + cp -r "$chunkOutputDir"/stats $out/stats-by-chunk + if (( chunkSize * chunkCount != attrCount )); then # A final incomplete chunk would mess up the stats, don't include it rm "$chunkOutputDir"/stats/"$seq_end" @@ -253,6 +257,12 @@ let done } | jq -s from_entries > $out/stats.json + + mkdir -p $out/stats + + for d in ${resultsDir}/*; do + cp -r "$d"/stats-by-chunk $out/stats/$(basename "$d") + done ''; compare = import ./compare { @@ -262,6 +272,7 @@ let runCommand writeText supportedSystems + python3 ; }; @@ -279,7 +290,6 @@ let name = evalSystem; path = singleSystem { inherit quickTest evalSystem chunkSize; - attrpathFile = attrpathsSuperset + "/paths.json"; }; }) evalSystems ); diff --git a/ci/get-merge-commit.sh b/ci/get-merge-commit.sh index c62bb56dd993..c233f7f91691 100755 --- a/ci/get-merge-commit.sh +++ b/ci/get-merge-commit.sh @@ -55,7 +55,10 @@ done if [[ "$mergeable" == "true" ]]; then log "The PR can be merged" - jq -r .merge_commit_sha <<< "$prInfo" + mergedSha="$(jq -r .merge_commit_sha <<< "$prInfo")" + echo "mergedSha=$mergedSha" + targetSha="$(gh api "/repos/$repo/commits/$mergedSha" --jq '.parents[0].sha')" + echo "targetSha=$targetSha" else log "The PR has a merge conflict" exit 2 diff --git a/ci/parse.nix b/ci/parse.nix new file mode 100644 index 000000000000..26ac0f785fd4 --- /dev/null +++ b/ci/parse.nix @@ -0,0 +1,43 @@ +{ + lib, + nix, + runCommand, +}: +let + nixpkgs = + with lib.fileset; + toSource { + root = ../.; + fileset = (fileFilter (file: file.hasExt "nix") ../.); + }; +in +runCommand "nix-parse-${nix.name}" + { + nativeBuildInputs = [ + nix + ]; + } + '' + export NIX_STORE_DIR=$TMPDIR/store + export NIX_STATE_DIR=$TMPDIR/state + + cd "${nixpkgs}" + + # Passes all files to nix-instantiate at once. + # Much faster, but will only show first error. + parse-all() { + find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null 2>/dev/null + } + + # Passes each file separately to nix-instantiate with -n1. + # Much slower, but will show all errors. + parse-each() { + find . -type f -iname '*.nix' | xargs -n1 -P $(nproc) nix-instantiate --parse >/dev/null + } + + if ! parse-all; then + parse-each + fi + + touch $out + '' diff --git a/ci/pinned-nixpkgs.json b/ci/pinned-nixpkgs.json index c5c558dc61bc..f5efff109e8c 100644 --- a/ci/pinned-nixpkgs.json +++ b/ci/pinned-nixpkgs.json @@ -1,4 +1,4 @@ { - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", - "sha256": "0qg99zj0gb0pc6sjlkmwhk1c1xz14qxmk6gamgfmcxpsfdp5vn72" + "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", + "sha256": "132nimgi1g88fbhddk4b8b1qk68jly494x2mnphyk3xa1d2wy9q7" } diff --git a/ci/supportedSystems.json b/ci/supportedSystems.json new file mode 100644 index 000000000000..44c18f1abf0e --- /dev/null +++ b/ci/supportedSystems.json @@ -0,0 +1,6 @@ +[ + "aarch64-linux", + "aarch64-darwin", + "x86_64-linux", + "x86_64-darwin" +] diff --git a/ci/supportedSystems.nix b/ci/supportedSystems.nix deleted file mode 100644 index 471f84b92fc2..000000000000 --- a/ci/supportedSystems.nix +++ /dev/null @@ -1,6 +0,0 @@ -[ - "aarch64-linux" - "aarch64-darwin" - "x86_64-linux" - "x86_64-darwin" -] diff --git a/doc/README.md b/doc/README.md index 531c38acdfa5..029db7eabc7f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -34,7 +34,27 @@ $ nix-build doc If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`. -### devmode +### Development environment + +In order to reduce repetition, consider using tools from the provided development environment: + +Load it from the Nixpkgs documentation directory with + +```ShellSession +$ cd /path/to/nixpkgs/doc +$ nix-shell +``` + +To load the development utilities automatically when entering that directory, [set up `nix-direnv`](https://nix.dev/guides/recipes/direnv). + +Make sure that your local files aren't added to Git history by adding the following lines to `.git/info/exclude` at the root of the Nixpkgs repository: + +``` +/**/.envrc +/**/.direnv +``` + +#### `devmode` The shell in the manual source directory makes available a command, `devmode`. It is a daemon, that: diff --git a/doc/build-helpers/dev-shell-tools.chapter.md b/doc/build-helpers/dev-shell-tools.chapter.md index 0168ea39f7aa..12018cd76cee 100644 --- a/doc/build-helpers/dev-shell-tools.chapter.md +++ b/doc/build-helpers/dev-shell-tools.chapter.md @@ -20,12 +20,12 @@ Converts Nix values to strings in the way the [`derivation` built-in function](h ```nix devShellTools.valueToString (builtins.toFile "foo" "bar") -=> "/nix/store/...-foo" +# => "/nix/store/...-foo" ``` ```nix devShellTools.valueToString false -=> "" +# => "" ``` ::: @@ -42,16 +42,22 @@ This function does not support `__structuredAttrs`, but does support `passAsFile devShellTools.unstructuredDerivationInputEnv { drvAttrs = { name = "foo"; - buildInputs = [ hello figlet ]; + buildInputs = [ + hello + figlet + ]; builder = bash; - args = [ "-c" "${./builder.sh}" ]; + args = [ + "-c" + "${./builder.sh}" + ]; }; } -=> { - name = "foo"; - buildInputs = "/nix/store/...-hello /nix/store/...-figlet"; - builder = "/nix/store/...-bash"; -} +# => { +# name = "foo"; +# buildInputs = "/nix/store/...-hello /nix/store/...-figlet"; +# builder = "/nix/store/...-bash"; +#} ``` Note that `args` is not included, because Nix does not added it to the builder process environment. @@ -69,7 +75,10 @@ Takes the relevant parts of a derivation and returns a set of environment variab let pkg = hello; in -devShellTools.derivationOutputEnv { outputList = pkg.outputs; outputMap = pkg; } +devShellTools.derivationOutputEnv { + outputList = pkg.outputs; + outputMap = pkg; +} ``` ::: diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index fd7b41f64c70..997f97f81bdb 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -491,7 +491,11 @@ It might be useful to manipulate the content downloaded by `fetchurl` directly i In this example, we'll adapt [](#ex-fetchers-fetchurl-nixpkgs-version) to append the result of running the `hello` package to the contents we download, purely to illustrate how to manipulate the content. ```nix -{ fetchurl, hello, lib }: +{ + fetchurl, + hello, + lib, +}: fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/.version"; @@ -714,9 +718,10 @@ A wrapper around `fetchpatch`, which takes: Here is an example of `fetchDebianPatch` in action: ```nix -{ lib -, fetchDebianPatch -, buildPythonPackage +{ + lib, + fetchDebianPatch, + buildPythonPackage, }: buildPythonPackage rec { @@ -768,9 +773,14 @@ Additionally, the following optional arguments can be given: : Whether to fetch LFS objects. +*`preFetch`* (String) + +: Shell code to be executed before the repository has been fetched, to allow + changing the environment the fetcher runs in. + *`postFetch`* (String) -: Shell code executed after the file has been fetched successfully. +: Shell code executed after the repository has been fetched successfully. This can do things like check or transform the file. *`leaveDotGit`* (Boolean) @@ -914,7 +924,9 @@ It produces packages that cannot be built automatically. { fetchtorrent }: fetchtorrent { - config = { peer-limit-global = 100; }; + config = { + peer-limit-global = 100; + }; url = "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c"; hash = ""; } diff --git a/doc/build-helpers/images/appimagetools.section.md b/doc/build-helpers/images/appimagetools.section.md index cbd40ab6c35f..7bfc45287d1f 100644 --- a/doc/build-helpers/images/appimagetools.section.md +++ b/doc/build-helpers/images/appimagetools.section.md @@ -33,7 +33,7 @@ let version = "0.6.30"; src = fetchurl { - url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}.AppImage"; + url = "https://github.com/nukeop/nuclear/releases/download/v${version}/nuclear-v${version}.AppImage"; hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw="; }; in @@ -66,7 +66,8 @@ let url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage"; hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI="; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraPkgs = pkgs: [ pkgs.at-spi2-core ]; } @@ -106,7 +107,8 @@ let appimageContents = appimageTools.extract { inherit pname version src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraPkgs = pkgs: [ pkgs.at-spi2-core ]; @@ -150,7 +152,8 @@ let substituteInPlace $out/irccloud.desktop --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraPkgs = pkgs: [ pkgs.at-spi2-core ]; diff --git a/doc/build-helpers/images/binarycache.section.md b/doc/build-helpers/images/binarycache.section.md index 954f07e93213..46b43bd4f65a 100644 --- a/doc/build-helpers/images/binarycache.section.md +++ b/doc/build-helpers/images/binarycache.section.md @@ -35,7 +35,7 @@ The following derivation will construct a flat-file binary cache containing the ```nix { mkBinaryCache, hello }: mkBinaryCache { - rootPaths = [hello]; + rootPaths = [ hello ]; } ``` diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md index 04d477bdc506..fbb0df85d647 100644 --- a/doc/build-helpers/images/dockertools.section.md +++ b/doc/build-helpers/images/dockertools.section.md @@ -235,7 +235,11 @@ The following package builds a Docker image that runs the `redis-server` executa The Docker image will have name `redis` and tag `latest`. ```nix -{ dockerTools, buildEnv, redis }: +{ + dockerTools, + buildEnv, + redis, +}: dockerTools.buildImage { name = "redis"; tag = "latest"; @@ -253,7 +257,9 @@ dockerTools.buildImage { config = { Cmd = [ "/bin/redis-server" ]; WorkingDir = "/data"; - Volumes = { "/data" = { }; }; + Volumes = { + "/data" = { }; + }; }; } ``` @@ -286,7 +292,11 @@ It uses `runAsRoot` to create a directory and a file inside the image. This works the same as [](#ex-dockerTools-buildImage-extraCommands), but uses `runAsRoot` instead of `extraCommands`. ```nix -{ dockerTools, buildEnv, hello }: +{ + dockerTools, + buildEnv, + hello, +}: dockerTools.buildImage { name = "hello"; tag = "latest"; @@ -320,7 +330,11 @@ This works the same as [](#ex-dockerTools-buildImage-runAsRoot), but uses `extra Note that with `extraCommands`, we can't directly reference `/` and must create files and directories as if we were already on `/`. ```nix -{ dockerTools, buildEnv, hello }: +{ + dockerTools, + buildEnv, + hello, +}: dockerTools.buildImage { name = "hello"; tag = "latest"; @@ -350,7 +364,11 @@ dockerTools.buildImage { Note that using a value of `"now"` in the `created` attribute will break reproducibility. ```nix -{ dockerTools, buildEnv, hello }: +{ + dockerTools, + buildEnv, + hello, +}: dockerTools.buildImage { name = "hello"; tag = "latest"; @@ -766,7 +784,11 @@ The closure of `config` is automatically included in the generated image. The following package shows a more compact way to create the same output generated in [](#ex-dockerTools-streamLayeredImage-hello). ```nix -{ dockerTools, hello, lib }: +{ + dockerTools, + hello, + lib, +}: dockerTools.streamLayeredImage { name = "hello"; tag = "latest"; @@ -1547,11 +1569,15 @@ The Docker image generated will have a name like `hello--env` and tag ` This example uses [](#ex-dockerTools-streamNixShellImage-hello) as a starting point. ```nix -{ dockerTools, cowsay, hello }: +{ + dockerTools, + cowsay, + hello, +}: dockerTools.streamNixShellImage { tag = "latest"; drv = hello.overrideAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs or [] ++ [ + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ cowsay ]; }); diff --git a/doc/build-helpers/images/makediskimage.section.md b/doc/build-helpers/images/makediskimage.section.md index 3edfa906aa6a..6d9afccdbae5 100644 --- a/doc/build-helpers/images/makediskimage.section.md +++ b/doc/build-helpers/images/makediskimage.section.md @@ -52,23 +52,23 @@ A `deterministic` flag is available for best efforts determinism. To produce a Nix-store only image: ```nix let - pkgs = import {}; + pkgs = import { }; lib = pkgs.lib; make-disk-image = import ; in - make-disk-image { - inherit pkgs lib; - config = {}; - additionalPaths = [ ]; - format = "qcow2"; - onlyNixStore = true; - partitionTableType = "none"; - installBootLoader = false; - touchEFIVars = false; - diskSize = "auto"; - additionalSpace = "0M"; # Defaults to 512M. - copyChannel = false; - } +make-disk-image { + inherit pkgs lib; + config = { }; + additionalPaths = [ ]; + format = "qcow2"; + onlyNixStore = true; + partitionTableType = "none"; + installBootLoader = false; + touchEFIVars = false; + diskSize = "auto"; + additionalSpace = "0M"; # Defaults to 512M. + copyChannel = false; +} ``` Some arguments can be left out, they are shown explicitly for the sake of the example. @@ -78,29 +78,36 @@ Building this derivation will provide a QCOW2 disk image containing only the Nix To produce a NixOS installation image disk with UEFI and bootloader installed: ```nix let - pkgs = import {}; + pkgs = import { }; lib = pkgs.lib; make-disk-image = import ; evalConfig = import ; in - make-disk-image { - inherit pkgs lib; - inherit (evalConfig { +make-disk-image { + inherit pkgs lib; + inherit + (evalConfig { modules = [ { - fileSystems."/" = { device = "/dev/vda"; fsType = "ext4"; autoFormat = true; }; + fileSystems."/" = { + device = "/dev/vda"; + fsType = "ext4"; + autoFormat = true; + }; boot.grub.device = "/dev/vda"; } ]; - }) config; - format = "qcow2"; - onlyNixStore = false; - partitionTableType = "legacy+gpt"; - installBootLoader = true; - touchEFIVars = true; - diskSize = "auto"; - additionalSpace = "0M"; # Defaults to 512M. - copyChannel = false; - memSize = 2048; # Qemu VM memory size in megabytes. Defaults to 1024M. - } + }) + config + ; + format = "qcow2"; + onlyNixStore = false; + partitionTableType = "legacy+gpt"; + installBootLoader = true; + touchEFIVars = true; + diskSize = "auto"; + additionalSpace = "0M"; # Defaults to 512M. + copyChannel = false; + memSize = 2048; # Qemu VM memory size in megabytes. Defaults to 1024M. +} ``` diff --git a/doc/build-helpers/images/ocitools.section.md b/doc/build-helpers/images/ocitools.section.md index 96627615ffb5..5101dd81715b 100644 --- a/doc/build-helpers/images/ocitools.section.md +++ b/doc/build-helpers/images/ocitools.section.md @@ -76,7 +76,11 @@ Note that no user namespace is created, which means that you won't be able to ru This example uses `ociTools.buildContainer` to create a simple container that runs `bash`. ```nix -{ ociTools, lib, bash }: +{ + ociTools, + lib, + bash, +}: ociTools.buildContainer { args = [ (lib.getExe bash) diff --git a/doc/build-helpers/images/portableservice.section.md b/doc/build-helpers/images/portableservice.section.md index c271bc775dba..43e44fe33aec 100644 --- a/doc/build-helpers/images/portableservice.section.md +++ b/doc/build-helpers/images/portableservice.section.md @@ -91,7 +91,12 @@ See [](#ex-portableService-hello) to understand how to use the output of `portab The following example builds a Portable Service image with the `hello` package, along with a service unit that runs it. ```nix -{ lib, writeText, portableService, hello }: +{ + lib, + writeText, + portableService, + hello, +}: let hello-service = writeText "hello.service" '' [Unit] @@ -151,7 +156,13 @@ To make things available globally, you must specify the `symlinks` attribute whe The following package builds on the package from [](#ex-portableService-hello) to make `/etc/ssl` available globally (this is only for illustrative purposes, because `hello` doesn't use `/etc/ssl`). ```nix -{ lib, writeText, portableService, hello, cacert }: +{ + lib, + writeText, + portableService, + hello, + cacert, +}: let hello-service = writeText "hello.service" '' [Unit] @@ -167,7 +178,10 @@ portableService { inherit (hello) version; units = [ hello-service ]; symlinks = [ - { object = "${cacert}/etc/ssl"; symlink = "/etc/ssl"; } + { + object = "${cacert}/etc/ssl"; + symlink = "/etc/ssl"; + } ]; } ``` diff --git a/doc/build-helpers/special/checkpoint-build.section.md b/doc/build-helpers/special/checkpoint-build.section.md index a1ce5608f246..036fee286a99 100644 --- a/doc/build-helpers/special/checkpoint-build.section.md +++ b/doc/build-helpers/special/checkpoint-build.section.md @@ -26,7 +26,9 @@ To change a normal derivation to a checkpoint based build, these steps must be t ## Example {#sec-checkpoint-build-example} ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: let inherit (pkgs.checkpointBuildTools) prepareCheckpointBuild @@ -39,5 +41,6 @@ let sed -i 's/Hello, world!/Hello, Nix!/g' src/hello.c ''; }); -in mkCheckpointBuild changedHello helloCheckpoint +in +mkCheckpointBuild changedHello helloCheckpoint ``` diff --git a/doc/build-helpers/special/fakenss.section.md b/doc/build-helpers/special/fakenss.section.md index c890752c0653..7b1b6f2576f2 100644 --- a/doc/build-helpers/special/fakenss.section.md +++ b/doc/build-helpers/special/fakenss.section.md @@ -48,12 +48,19 @@ It is useful with functions in `dockerTools` to allow building Docker images tha This example includes the `hello` binary in the image so it can do something besides just have the extra files. ```nix -{ dockerTools, fakeNss, hello }: +{ + dockerTools, + fakeNss, + hello, +}: dockerTools.buildImage { name = "image-with-passwd"; tag = "latest"; - copyToRoot = [ fakeNss hello ]; + copyToRoot = [ + fakeNss + hello + ]; config = { Cmd = [ "/bin/hello" ]; @@ -70,8 +77,8 @@ The following code uses `override` to add extra lines to `/etc/passwd` and `/etc ```nix { fakeNss }: fakeNss.override { - extraPasswdLines = ["newuser:x:9001:9001:new user:/var/empty:/bin/sh"]; - extraGroupLines = ["newuser:x:9001:"]; + extraPasswdLines = [ "newuser:x:9001:9001:new user:/var/empty:/bin/sh" ]; + extraGroupLines = [ "newuser:x:9001:" ]; } ``` ::: diff --git a/doc/build-helpers/special/fhs-environments.section.md b/doc/build-helpers/special/fhs-environments.section.md index 815f6cac1126..e81dbdfdc641 100644 --- a/doc/build-helpers/special/fhs-environments.section.md +++ b/doc/build-helpers/special/fhs-environments.section.md @@ -36,22 +36,29 @@ Accepted arguments are: You can create a simple environment using a `shell.nix` like this: ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: (pkgs.buildFHSEnv { name = "simple-x11-env"; - targetPkgs = pkgs: (with pkgs; [ - udev - alsa-lib - ]) ++ (with pkgs.xorg; [ - libX11 - libXcursor - libXrandr - ]); - multiPkgs = pkgs: (with pkgs; [ - udev - alsa-lib - ]); + targetPkgs = + pkgs: + (with pkgs; [ + udev + alsa-lib + ]) + ++ (with pkgs.xorg; [ + libX11 + libXcursor + libXrandr + ]); + multiPkgs = + pkgs: + (with pkgs; [ + udev + alsa-lib + ]); runScript = "bash"; }).env ``` diff --git a/doc/build-helpers/special/makesetuphook.section.md b/doc/build-helpers/special/makesetuphook.section.md index 179d8d456372..7b83653296eb 100644 --- a/doc/build-helpers/special/makesetuphook.section.md +++ b/doc/build-helpers/special/makesetuphook.section.md @@ -9,7 +9,7 @@ pkgs.makeSetupHook { name = "something-hook"; propagatedBuildInputs = [ pkgs.commandsomething ]; depsTargetTargetPropagated = [ pkgs.libsomething ]; -} ./script.sh; +} ./script.sh ``` ### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash {#sec-pkgs.makeSetupHook-usage-example} @@ -42,7 +42,7 @@ pkgs.makeSetupHook } preConfigureHooks+=(_printHelloHook) '' - ); + ) ``` ## Attributes {#sec-pkgs.makeSetupHook-attributes} diff --git a/doc/build-helpers/special/mkshell.section.md b/doc/build-helpers/special/mkshell.section.md index e39bef7468e3..15443660c9ff 100644 --- a/doc/build-helpers/special/mkshell.section.md +++ b/doc/build-helpers/special/mkshell.section.md @@ -8,11 +8,16 @@ repetition when using it with `nix-shell` (or `nix develop`). Here is a common usage example: ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: pkgs.mkShell { packages = [ pkgs.gnumake ]; - inputsFrom = [ pkgs.hello pkgs.gnutar ]; + inputsFrom = [ + pkgs.hello + pkgs.gnutar + ]; shellHook = '' export DEBUG=1 diff --git a/doc/build-helpers/special/vm-tools.section.md b/doc/build-helpers/special/vm-tools.section.md index 46ced7cd9990..7591f62eb462 100644 --- a/doc/build-helpers/special/vm-tools.section.md +++ b/doc/build-helpers/special/vm-tools.section.md @@ -31,25 +31,34 @@ If the build fails and Nix is run with the `-K/--keep-failed` option, a script ` Build the derivation hello inside a VM: ```nix -{ pkgs }: with pkgs; with vmTools; -runInLinuxVM hello +{ pkgs }: with pkgs; with vmTools; runInLinuxVM hello ``` Build inside a VM with extra memory: ```nix -{ pkgs }: with pkgs; with vmTools; -runInLinuxVM (hello.overrideAttrs (_: { memSize = 1024; })) +{ pkgs }: +with pkgs; +with vmTools; +runInLinuxVM ( + hello.overrideAttrs (_: { + memSize = 1024; + }) +) ``` Use VM with a disk image (implicitly sets `diskImage`, see [`vmTools.createEmptyImage`](#vm-tools-createEmptyImage)): ```nix -{ pkgs }: with pkgs; with vmTools; -runInLinuxVM (hello.overrideAttrs (_: { - preVM = createEmptyImage { - size = 1024; - fullName = "vm-image"; - }; -})) +{ pkgs }: +with pkgs; +with vmTools; +runInLinuxVM ( + hello.overrideAttrs (_: { + preVM = createEmptyImage { + size = 1024; + fullName = "vm-image"; + }; + }) +) ``` ## `vmTools.extractFs` {#vm-tools-extractFs} @@ -66,8 +75,7 @@ Takes a file, such as an ISO, and extracts its contents into the store. Extract the contents of an ISO file: ```nix -{ pkgs }: with pkgs; with vmTools; -extractFs { file = ./image.iso; } +{ pkgs }: with pkgs; with vmTools; extractFs { file = ./image.iso; } ``` ## `vmTools.extractMTDfs` {#vm-tools-extractMTDfs} @@ -86,14 +94,12 @@ Generate a script that can be used to run an interactive session in the given im Create a script for running a Fedora 27 VM: ```nix -{ pkgs }: with pkgs; with vmTools; -makeImageTestScript diskImages.fedora27x86_64 +{ pkgs }: with pkgs; with vmTools; makeImageTestScript diskImages.fedora27x86_64 ``` Create a script for running an Ubuntu 20.04 VM: ```nix -{ pkgs }: with pkgs; with vmTools; -makeImageTestScript diskImages.ubuntu2004x86_64 +{ pkgs }: with pkgs; with vmTools; makeImageTestScript diskImages.ubuntu2004x86_64 ``` ## `vmTools.diskImageFuns` {#vm-tools-diskImageFuns} @@ -137,8 +143,13 @@ A set of functions that build a predefined set of minimal Linux distributions im 8GiB image containing Firefox in addition to the default packages: ```nix -{ pkgs }: with pkgs; with vmTools; -diskImageFuns.ubuntu2004x86_64 { extraPackages = [ "firefox" ]; size = 8192; } +{ pkgs }: +with pkgs; +with vmTools; +diskImageFuns.ubuntu2004x86_64 { + extraPackages = [ "firefox" ]; + size = 8192; +} ``` ## `vmTools.diskImageExtraFuns` {#vm-tools-diskImageExtraFuns} diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md index fe1a0954348d..9e46635c600c 100644 --- a/doc/build-helpers/testers.chapter.md +++ b/doc/build-helpers/testers.chapter.md @@ -98,7 +98,8 @@ It has two modes: ```nix { "https://nix\\.dev/manual/nix/[a-z0-9.-]*" = "${nix.doc}/share/doc/nix/manual"; - "https://nixos\\.org/manual/nix/(un)?stable" = "${emptyDirectory}/placeholder-to-disallow-old-nix-docs-urls"; + "https://nixos\\.org/manual/nix/(un)?stable" = + "${emptyDirectory}/placeholder-to-disallow-old-nix-docs-urls"; } ``` @@ -302,18 +303,22 @@ While `testBuildFailure` is designed to keep changes to the original builder's e # Check that a build fails, and verify the changes made during build ```nix -runCommand "example" { - failed = testers.testBuildFailure (runCommand "fail" {} '' - echo ok-ish >$out - echo failing though - exit 3 - ''); -} '' - grep -F 'ok-ish' $failed/result - grep -F 'failing though' $failed/testBuildFailure.log - [[ 3 = $(cat $failed/testBuildFailure.exit) ]] - touch $out -'' +runCommand "example" + { + failed = testers.testBuildFailure ( + runCommand "fail" { } '' + echo ok-ish >$out + echo failing though + exit 3 + '' + ); + } + '' + grep -F 'ok-ish' $failed/result + grep -F 'failing though' $failed/testBuildFailure.log + [[ 3 = $(cat $failed/testBuildFailure.exit) ]] + touch $out + '' ``` ::: @@ -396,15 +401,18 @@ testers.testEqualContents { expected = writeText "expected" '' foo baz baz ''; - actual = runCommand "actual" { - # not really necessary for a package that's in stdenv - nativeBuildInputs = [ gnused ]; - base = writeText "base" '' - foo bar baz - ''; - } '' - sed -e 's/bar/baz/g' $base >$out - ''; + actual = + runCommand "actual" + { + # not really necessary for a package that's in stdenv + nativeBuildInputs = [ gnused ]; + base = writeText "base" '' + foo bar baz + ''; + } + '' + sed -e 's/bar/baz/g' $base >$out + ''; } ``` @@ -515,10 +523,11 @@ Otherwise, the build log explains the difference via `nix-diff`. # Check that two packages produce the same derivation ```nix -testers.testEqualDerivation - "The hello package must stay the same when enabling checks." - hello - (hello.overrideAttrs(o: { doCheck = true; })) +testers.testEqualDerivation "The hello package must stay the same when enabling checks." hello ( + hello.overrideAttrs (o: { + doCheck = true; + }) +) ``` ::: @@ -586,7 +595,10 @@ testers.runCommand { curl -o /dev/null https://example.com touch $out ''; - nativeBuildInputs = with pkgs; [ cacert curl ]; + nativeBuildInputs = with pkgs; [ + cacert + curl + ]; } ``` @@ -603,15 +615,20 @@ If your test is part of the Nixpkgs repository, or if you need a more general en # Run a NixOS test using `runNixOSTest` ```nix -pkgs.testers.runNixOSTest ({ lib, ... }: { - name = "hello"; - nodes.machine = { pkgs, ... }: { - environment.systemPackages = [ pkgs.hello ]; - }; - testScript = '' - machine.succeed("hello") - ''; -}) +pkgs.testers.runNixOSTest ( + { lib, ... }: + { + name = "hello"; + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.hello ]; + }; + testScript = '' + machine.succeed("hello") + ''; + } +) ``` ::: @@ -634,10 +651,17 @@ A [NixOS VM test network](https://nixos.org/nixos/manual/index.html#sec-nixos-te { name = "my-test"; nodes = { - machine1 = { lib, pkgs, nodes, ... }: { - environment.systemPackages = [ pkgs.hello ]; - services.foo.enable = true; - }; + machine1 = + { + lib, + pkgs, + nodes, + ... + }: + { + environment.systemPackages = [ pkgs.hello ]; + services.foo.enable = true; + }; # machine2 = ...; }; testScript = '' diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md index 9e818be674b4..48ed99b2fa36 100644 --- a/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/doc/build-helpers/trivial-build-helpers.chapter.md @@ -66,15 +66,17 @@ runCommandWith :: { # Invocation of `runCommandWith` ```nix -runCommandWith { - name = "example"; - derivationArgs.nativeBuildInputs = [ cowsay ]; -} '' - cowsay > $out < $out </my-program.desktop` to the Nix store. ```nix -{makeDesktopItem}: +{ makeDesktopItem }: makeDesktopItem { name = "my-program"; desktopName = "My Program"; @@ -260,7 +262,10 @@ makeDesktopItem { mimeTypes = [ "video/mp4" ]; categories = [ "Utility" ]; implements = [ "org.my-program" ]; - keywords = [ "Video" "Player" ]; + keywords = [ + "Video" + "Player" + ]; startupNotify = false; startupWMClass = "MyProgram"; prefersNonDefaultGPU = false; @@ -276,18 +281,22 @@ makeDesktopItem { Override the `hello` package to add a desktop item. ```nix -{ copyDesktopItems -, hello -, makeDesktopItem }: +{ + copyDesktopItems, + hello, + makeDesktopItem, +}: hello.overrideAttrs { nativeBuildInputs = [ copyDesktopItems ]; - desktopItems = [(makeDesktopItem { - name = "hello"; - desktopName = "Hello"; - exec = "hello"; - })]; + desktopItems = [ + (makeDesktopItem { + name = "hello"; + desktopName = "Hello"; + exec = "hello"; + }) + ]; } ``` @@ -446,10 +455,9 @@ The store path will include the name, and it will be a file. Write the string `Contents of File` to `/nix/store/`: ```nix -writeText "my-file" - '' +writeText "my-file" '' Contents of File - '' +'' ``` ::: @@ -486,10 +494,9 @@ The store path will be a directory. Write the string `Contents of File` to `/nix/store//share/my-file`: ```nix -writeTextDir "share/my-file" - '' +writeTextDir "share/my-file" '' Contents of File - '' +'' ``` ::: @@ -528,10 +535,9 @@ The store path will include the name, and it will be a file. Write the string `Contents of File` to `/nix/store/` and make the file executable. ```nix -writeScript "my-file" - '' +writeScript "my-file" '' Contents of File - '' +'' ``` This is equivalent to: @@ -570,10 +576,9 @@ The store path will include the name, and it will be a directory. # Usage of `writeScriptBin` ```nix -writeScriptBin "my-script" - '' +writeScriptBin "my-script" '' echo "hi" - '' +'' ``` ::: @@ -614,10 +619,9 @@ This function is almost exactly like [](#trivial-builder-writeScript), except th # Usage of `writeShellScript` ```nix -writeShellScript "my-script" - '' +writeShellScript "my-script" '' echo "hi" - '' +'' ``` ::: @@ -657,10 +661,9 @@ This function is a combination of [](#trivial-builder-writeShellScript) and [](# # Usage of `writeShellScriptBin` ```nix -writeShellScriptBin "my-script" - '' +writeShellScriptBin "my-script" '' echo "hi" - '' +'' ``` ::: @@ -685,26 +688,40 @@ These functions concatenate `files` to the Nix store in a single file. This is u Here are a few examples: ```nix - # Writes my-file to /nix/store/ -concatTextFile { - name = "my-file"; - files = [ drv1 "${drv2}/path/to/file" ]; -} -# See also the `concatText` helper function below. +concatTextFile + { + name = "my-file"; + files = [ + drv1 + "${drv2}/path/to/file" + ]; + } + # See also the `concatText` helper function below. -# Writes executable my-file to /nix/store//bin/my-file -concatTextFile { - name = "my-file"; - files = [ drv1 "${drv2}/path/to/file" ]; - executable = true; - destination = "/bin/my-file"; -} -# Writes contents of files to /nix/store/ -concatText "my-file" [ file1 file2 ] + # Writes executable my-file to /nix/store//bin/my-file + concatTextFile + { + name = "my-file"; + files = [ + drv1 + "${drv2}/path/to/file" + ]; + executable = true; + destination = "/bin/my-file"; + } + # Writes contents of files to /nix/store/ + concatText + "my-file" + [ file1 file2 ] -# Writes contents of files to /nix/store/ -concatScript "my-file" [ file1 file2 ] + # Writes contents of files to /nix/store/ + concatScript + "my-file" + [ + file1 + file2 + ] ``` ## `writeShellApplication` {#trivial-builder-writeShellApplication} @@ -722,7 +739,10 @@ For example, the following shell application can refer to `curl` directly, rathe writeShellApplication { name = "show-nixos-org"; - runtimeInputs = [ curl w3m ]; + runtimeInputs = [ + curl + w3m + ]; text = '' curl -s 'https://nixos.org' | w3m -dump -T text/html @@ -736,7 +756,14 @@ This can be used to put many derivations into the same directory structure. It w Here is an example: ```nix # adds symlinks of hello and stack to current build and prints "links added" -symlinkJoin { name = "myexample"; paths = [ pkgs.hello pkgs.stack ]; postBuild = "echo links added"; } +symlinkJoin { + name = "myexample"; + paths = [ + pkgs.hello + pkgs.stack + ]; + postBuild = "echo links added"; +} ``` This creates a derivation with a directory structure like the following: ``` diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index f316656a585c..023be3a3a116 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -12,8 +12,10 @@ nixos-render-docs-redirects, writeShellScriptBin, nixpkgs ? { }, + markdown-code-runner, + roboto, + treefmt, }: - stdenvNoCC.mkDerivation ( finalAttrs: let @@ -45,9 +47,13 @@ stdenvNoCC.mkDerivation ( postPatch = '' ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json + ln -s ${treefmt.functionsDoc.markdown} ./packages/treefmt-functions.section.md + ln -s ${treefmt.optionsDoc.optionsJSON}/share/doc/nixos/options.json ./treefmt-options.json ''; buildPhase = '' + runHook preBuild + substituteInPlace ./languages-frameworks/python.section.md \ --subst-var-by python-interpreter-table "$(<"${pythonInterpreterTable}")" @@ -83,19 +89,27 @@ stdenvNoCC.mkDerivation ( --section-toc-depth 1 \ manual.md \ out/index.html + + runHook postBuild ''; installPhase = '' + runHook preInstall + dest="$out/share/doc/nixpkgs" mkdir -p "$(dirname "$dest")" mv out "$dest" - mv "$dest/index.html" "$dest/manual.html" + cp "$dest/index.html" "$dest/manual.html" + + cp ${roboto.src}/web/Roboto\[ital\,wdth\,wght\].ttf "$dest/Roboto.ttf" cp ${epub} "$dest/nixpkgs-manual.epub" mkdir -p $out/nix-support/ - echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products + echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products + + runHook postInstall ''; passthru = { @@ -111,7 +125,7 @@ stdenvNoCC.mkDerivation ( let devmode' = devmode.override { buildArgs = toString ../.; - open = "/share/doc/nixpkgs/manual.html"; + open = "/share/doc/nixpkgs/index.html"; }; nixos-render-docs-redirects' = writeShellScriptBin "redirects" "${lib.getExe nixos-render-docs-redirects} --file ${toString ../redirects.json} $@"; in @@ -119,10 +133,14 @@ stdenvNoCC.mkDerivation ( packages = [ devmode' nixos-render-docs-redirects' + markdown-code-runner ]; }; - tests.manpage-urls = callPackage ../tests/manpage-urls.nix { }; + tests = { + manpage-urls = callPackage ../tests/manpage-urls.nix { }; + check-nix-code-blocks = callPackage ../tests/check-nix-code-blocks.nix { }; + }; }; } ) diff --git a/doc/functions/generators.section.md b/doc/functions/generators.section.md index 9d71a0240108..0b073c641e53 100644 --- a/doc/functions/generators.section.md +++ b/doc/functions/generators.section.md @@ -13,17 +13,23 @@ let # specifies how to format a key/value pair mkKeyValue = generators.mkKeyValueDefault { # specifies the generated string for a subset of nix values - mkValueString = v: - if v == true then ''"yes"'' - else if v == false then ''"no"'' - else if isString v then ''"${v}"'' + mkValueString = + v: + if v == true then + ''"yes"'' + else if v == false then + ''"no"'' + else if isString v then + ''"${v}"'' # and delegates all other values to the default generator - else generators.mkValueStringDefault {} v; + else + generators.mkValueStringDefault { } v; } ":"; }; +in # the INI file can now be given as plain old nix values -in customToINI { +customToINI { main = { pushinfo = true; autopush = false; diff --git a/doc/functions/nix-gitignore.section.md b/doc/functions/nix-gitignore.section.md index 8532ab68ac04..416b5435fa58 100644 --- a/doc/functions/nix-gitignore.section.md +++ b/doc/functions/nix-gitignore.section.md @@ -7,20 +7,23 @@ `pkgs.nix-gitignore` exports a number of functions, but you'll most likely need either `gitignoreSource` or `gitignoreSourcePure`. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string. ```nix -{ pkgs ? import {} }: { +{ + pkgs ? import { }, +}: +{ - src = nix-gitignore.gitignoreSource [] ./source; - # Simplest version + src = nix-gitignore.gitignoreSource [ ] ./source; + # Simplest version - src = nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source; - # This one reads the ./source/.gitignore and concats the auxiliary ignores + src = nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source; + # This one reads the ./source/.gitignore and concats the auxiliary ignores - src = nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source; - # Use this string as gitignore, don't read ./source/.gitignore. + src = nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source; + # Use this string as gitignore, don't read ./source/.gitignore. - src = nix-gitignore.gitignoreSourcePure ["ignore-this\nignore-that\n" ~/.gitignore] ./source; - # It also accepts a list (of strings and paths) that will be concatenated - # once the paths are turned to strings via readFile. + src = nix-gitignore.gitignoreSourcePure [ "ignore-this\nignore-that\n" ~/.gitignore ] ./source; + # It also accepts a list (of strings and paths) that will be concatenated + # once the paths are turned to strings via readFile. } ``` diff --git a/doc/functions/prefer-remote-fetch.section.md b/doc/functions/prefer-remote-fetch.section.md index 8760c100224a..b3d4a84eb4fd 100644 --- a/doc/functions/prefer-remote-fetch.section.md +++ b/doc/functions/prefer-remote-fetch.section.md @@ -3,8 +3,7 @@ `prefer-remote-fetch` is an overlay that download sources on remote builder. This is useful when the evaluating machine has a slow upload while the builder can fetch faster directly from the source. To use it, put the following snippet as a new overlay: ```nix -self: super: - (super.prefer-remote-fetch self super) +self: super: (super.prefer-remote-fetch self super) ``` A full configuration example for that sets the overlay up for your own account, could look like this diff --git a/doc/hooks/autopatchcil.section.md b/doc/hooks/autopatchcil.section.md new file mode 100644 index 000000000000..f7ed8cb6835f --- /dev/null +++ b/doc/hooks/autopatchcil.section.md @@ -0,0 +1,17 @@ +# autoPatchcilHook {#setup-hook-autopatchcilhook} + +This is a special setup hook which helps in packaging .NET assemblies/programs in that it automatically tries to find missing shared library dependencies of .NET assemblies based on the given `buildInputs` and `nativeBuildInputs`. + +As the hook needs information for the host where the package will be run on, there's a required environment variable called `autoPatchcilRuntimeId` which should be filled in with the RID (Runtime Identifier) of the machine where the output will be run on. If you're using `buildDotnetModule`, it will fall back to `dotnetRuntimeIds` (which is set to `lib.singleton (if runtimeId != null then runtimeId else systemToDotnetRid stdenvNoCC.hostPlatform.system)`) for you if not provided. + +In certain situations you may want to run the main command (`autoPatchcil`) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the `dontAutoPatchcil` environment variable to a non-empty value. + +By default, `autoPatchcil` will fail as soon as any .NET assembly requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchcilIgnoreMissingDeps` environment variable to a non-empty value. `autoPatchcilIgnoreMissingDeps` can be set to a list like `autoPatchcilIgnoreMissingDeps = [ "libcuda.so.1" "libcudart.so.1" ];` or to `[ "*" ]` to ignore all missing dependencies. + +The `autoPatchcil` command requires the `--rid` command line flag, informing the RID (Runtime Identifier) it should assume the assemblies will be executed on, and also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories. + +::: {.note} +Since, unlike most native binaries, .NET assemblies are compiled once to run on any platform, many assemblies may have PInvoke stubs for libraries that might not be available on the platform that the package will effectively run on. A few examples are assemblies that call native Windows APIs through PInvoke targeting `kernel32`, `gdi32`, `user32`, `shell32` or `ntdll`. + +`autoPatchcil` does its best to ignore dependencies from other platforms by checking the requested file extensions, however not all PInvoke stubs provide an extension so in those cases it will be necessary to list those in `autoPatchcilIgnoreMissingDeps` manually. +::: diff --git a/doc/hooks/cmake.section.md b/doc/hooks/cmake.section.md index 5bcc3c980fc5..4aecc8440c64 100644 --- a/doc/hooks/cmake.section.md +++ b/doc/hooks/cmake.section.md @@ -33,3 +33,21 @@ The default value is `build`. #### `dontUseCmakeConfigure` {#dont-use-cmake-configure} When set to true, don't use the predefined `cmakeConfigurePhase`. + +## Controlling CTest invocation {#cmake-ctest} + +By default tests are run by make in [`checkPhase`](#ssec-check-phase) or by [ninja](#ninja) if `ninja` is +available in `nativeBuildInputs`. Makefile and Ninja generators produce the `test` target, which invokes `ctest` under the hood. +This makes passing additional arguments to `ctest` difficult, so it's possible to invoke it directly in `checkPhase` +by adding `ctestCheckHook` to `nativeCheckInputs`. + +### CTest Variables {#cmake-ctest-variables} + +#### `disabledTests` {#cmake-ctest-disabled-tests} + +Allows to disable running a list of tests. Note that regular expressions are not supported by `disabledTests`, but +it can be combined with `--exclude-regex` option. + +#### `ctestFlags` {#cmake-ctest-flags} + +Additional options passed to `ctest` together with `checkFlags`. diff --git a/doc/hooks/index.md b/doc/hooks/index.md index e4b744056c5e..574b7eea8de3 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -7,6 +7,7 @@ The stdenv built-in hooks are documented in [](#ssec-setup-hooks). ```{=include=} sections autoconf.section.md automake.section.md +autopatchcil.section.md autopatchelf.section.md aws-c-common.section.md bmake.section.md diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md index f33545477c6d..edaea5895a3b 100644 --- a/doc/hooks/installShellFiles.section.md +++ b/doc/hooks/installShellFiles.section.md @@ -99,17 +99,12 @@ failure. To prevent this, guard the completion generation commands. ```nix { nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( - let - emulator = stdenv.hostPlatform.emulator buildPackages; - in - '' - # using named fd - installShellCompletion --cmd foobar \ - --bash <(${emulator} $out/bin/foobar --bash-completion) \ - --fish <(${emulator} $out/bin/foobar --fish-completion) \ - --zsh <(${emulator} $out/bin/foobar --zsh-completion) - '' - ); + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # using named fd + installShellCompletion --cmd foobar \ + --bash <($out/bin/foobar --bash-completion) \ + --fish <($out/bin/foobar --fish-completion) \ + --zsh <($out/bin/foobar --zsh-completion) + ''; } ``` diff --git a/doc/hooks/memcached-test-hook.section.md b/doc/hooks/memcached-test-hook.section.md new file mode 100644 index 000000000000..03fc91ab4bf0 --- /dev/null +++ b/doc/hooks/memcached-test-hook.section.md @@ -0,0 +1,55 @@ + +# `memcachedTestHook` {#sec-memcachedTestHook} + +This hook starts a Memcached server during `checkPhase`. Example: + +```nix +{ + stdenv, + memcachedTestHook, +}: +stdenv.mkDerivation { + + # ... + + nativeCheckInputs = [ + memcachedTestHook + ]; +} +``` + +If you use a custom `checkPhase`, remember to add the `runHook` calls: +```nix +{ + checkPhase = '' + runHook preCheck + + # ... your tests + + runHook postCheck + ''; +} +``` + +## Variables {#sec-memcachedTestHook-variables} + +Bash-only variables: + + - `memcachedTestPort`: Port to use by Memcached. Defaults to `11211` + +Example usage: + +```nix +{ stdenv, memcachedTestHook }: +stdenv.mkDerivation { + + # ... + + nativeCheckInputs = [ + memcachedTestHook + ]; + + preCheck = '' + memcachedTestPort=1234; + ''; +} diff --git a/doc/hooks/mpi-check-hook.section.md b/doc/hooks/mpi-check-hook.section.md index c182c4cc6195..299069fc89ba 100644 --- a/doc/hooks/mpi-check-hook.section.md +++ b/doc/hooks/mpi-check-hook.section.md @@ -11,15 +11,15 @@ the neceesary environment variables to use Example: ```nix - { mpiCheckPhaseHook, mpi, ... }: - { - # ... +{ mpiCheckPhaseHook, mpi, ... }: +{ + # ... - nativeCheckInputs = [ - openssh - mpiCheckPhaseHook - ]; - } + nativeCheckInputs = [ + openssh + mpiCheckPhaseHook + ]; +} ``` diff --git a/doc/hooks/patch-rc-path-hooks.section.md b/doc/hooks/patch-rc-path-hooks.section.md index 5c870dc782c2..080a03da72d6 100644 --- a/doc/hooks/patch-rc-path-hooks.section.md +++ b/doc/hooks/patch-rc-path-hooks.section.md @@ -29,7 +29,11 @@ Given a package `foo` containing an init script `this-foo.fish` that depends on patch the init script for users to source without having the above dependencies in their `PATH`: ```nix -{ lib, stdenv, patchRcPathFish}: +{ + lib, + stdenv, + patchRcPathFish, +}: stdenv.mkDerivation { # ... @@ -39,7 +43,13 @@ stdenv.mkDerivation { ]; postFixup = '' - patchRcPathFish $out/bin/this-foo.fish ${lib.makeBinPath [ coreutils man which ]} + patchRcPathFish $out/bin/this-foo.fish ${ + lib.makeBinPath [ + coreutils + man + which + ] + } ''; } ``` diff --git a/doc/hooks/postgresql-test-hook.section.md b/doc/hooks/postgresql-test-hook.section.md index 59d7f7a644c9..8b3cc5f03f3e 100644 --- a/doc/hooks/postgresql-test-hook.section.md +++ b/doc/hooks/postgresql-test-hook.section.md @@ -4,7 +4,11 @@ This hook starts a PostgreSQL server during the `checkPhase`. Example: ```nix -{ stdenv, postgresql, postgresqlTestHook }: +{ + stdenv, + postgresql, + postgresqlTestHook, +}: stdenv.mkDerivation { # ... @@ -18,13 +22,13 @@ stdenv.mkDerivation { If you use a custom `checkPhase`, remember to add the `runHook` calls: ```nix - checkPhase '' - runHook preCheck +checkPhase '' + runHook preCheck - # ... your tests + # ... your tests - runHook postCheck - '' + runHook postCheck +'' ``` ## Variables {#sec-postgresqlTestHook-variables} diff --git a/doc/hooks/redis-test-hook.section.md b/doc/hooks/redis-test-hook.section.md new file mode 100644 index 000000000000..7971b29fa10a --- /dev/null +++ b/doc/hooks/redis-test-hook.section.md @@ -0,0 +1,67 @@ + +# `redisTestHook` {#sec-redisTestHook} + +This hook starts a Redis server during `checkPhase`. Example: + +```nix +{ + stdenv, + redis, + redisTestHook, +}: +stdenv.mkDerivation { + + # ... + + nativeCheckInputs = [ + redisTestHook + ]; +} +``` + +If you use a custom `checkPhase`, remember to add the `runHook` calls: +```nix +{ + checkPhase = '' + runHook preCheck + + # ... your tests + + runHook postCheck + ''; +} +``` + +## Variables {#sec-redisTestHook-variables} + +The hook logic will read the following variables and set them to a default value if unset or empty. + +Exported variables: + +- `REDIS_SOCKET`: UNIX domain socket path + +Bash-only variables: + + - `redisTestPort`: Port to use by Redis. Defaults to `6379` + +Example usage: + +```nix +{ + stdenv, + redis, + redisTestHook, +}: +stdenv.mkDerivation { + + # ... + + nativeCheckInputs = [ + redisTestHook + ]; + + preCheck = '' + redisTestPort=6390; + ''; +} +``` diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md index 400e493d7fee..290bc3a1d781 100644 --- a/doc/hooks/tauri.section.md +++ b/doc/hooks/tauri.section.md @@ -23,46 +23,47 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. wrapGAppsHook4, }: -rustPlatform.buildRustPackage rec { - # . . . +rustPlatform.buildRustPackage (finalAttrs: { + # ... - useFetchCargoVendor = true; cargoHash = "..."; # Assuming our app's frontend uses `npm` as a package manager npmDeps = fetchNpmDeps { - name = "${pname}-npm-deps-${version}"; - inherit src; + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src; hash = "..."; }; - nativeBuildInputs = [ - # Pull in our main hook - cargo-tauri.hook + nativeBuildInputs = + [ + # Pull in our main hook + cargo-tauri.hook - # Setup npm - nodejs - npmHooks.npmConfigHook + # Setup npm + nodejs + npmHooks.npmConfigHook - # Make sure we can find our libraries - pkg-config - wrapGAppsHook4 - ]; - - buildInputs = - [ openssl ] + # Make sure we can find our libraries + pkg-config + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - glib-networking # Most Tauri apps need networking - webkitgtk_4_1 + wrapGAppsHook4 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + glib-networking # Most Tauri apps need networking + openssl + webkitgtk_4_1 + ]; + # Set our Tauri source directory cargoRoot = "src-tauri"; # And make sure we build there too - buildAndTestSubdir = cargoRoot; + buildAndTestSubdir = finalAttrs.cargoRoot; - # . . . -} + # ... +}) ``` ## Variables controlling cargo-tauri {#tauri-hook-variables-controlling} diff --git a/doc/hooks/versionCheckHook.section.md b/doc/hooks/versionCheckHook.section.md index 6c45b37cd17b..16b1ee97e890 100644 --- a/doc/hooks/versionCheckHook.section.md +++ b/doc/hooks/versionCheckHook.section.md @@ -9,7 +9,7 @@ You use it like this: lib, stdenv, versionCheckHook, - # ... +# ... }: stdenv.mkDerivation (finalAttrs: { diff --git a/doc/hooks/waf.section.md b/doc/hooks/waf.section.md index b58887b6b647..437a98920790 100644 --- a/doc/hooks/waf.section.md +++ b/doc/hooks/waf.section.md @@ -14,7 +14,7 @@ The variables below are exclusive of `wafHook`. Location of the `waf` tool. It defaults to `./waf`, to honor software projects that include it directly inside their source trees. -If `wafPath` doesn't exist, then `wafHook` will copy the `waf` provided from Nixpkgs to it. +If the file pointed by `wafPath` doesn't exist, then `waf` provided by Nixpkgs will be used. #### `wafFlags` {#waf-flags} diff --git a/doc/hooks/zig.section.md b/doc/hooks/zig.section.md index 8bef293769e5..1c52e9827b41 100644 --- a/doc/hooks/zig.section.md +++ b/doc/hooks/zig.section.md @@ -7,9 +7,10 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases. ## Example code snippet {#zig-hook-example-code-snippet} ```nix -{ lib -, stdenv -, zig +{ + lib, + stdenv, + zig, }: stdenv.mkDerivation { diff --git a/doc/interoperability/cyclonedx.md b/doc/interoperability/cyclonedx.md index 7a3dea3dbc2f..3c141b86d9f9 100644 --- a/doc/interoperability/cyclonedx.md +++ b/doc/interoperability/cyclonedx.md @@ -63,17 +63,27 @@ For example, the `fetchFromGitHub` is commonly used within Nixpkgs but should be `nix:fod` properties may be extracted and evaluated to a derivation using code similar to the following, assuming a fictitious function `filterPropertiesToAttrs`: ```nix -{ pkgs, filterPropertiesToAttrs, properties }: +{ + pkgs, + filterPropertiesToAttrs, + properties, +}: let fodProps = filterPropertiesToAttrs "nix:fod:" properties; methods = { fetchzip = - { name, url, sha256, ... }: + { + name, + url, + sha256, + ... + }: pkgs.fetchzip { inherit name url sha256; }; }; -in methods.${fodProps.method} fodProps +in +methods.${fodProps.method} fodProps ``` diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 33fffc60c8db..6b9e577f8119 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -48,7 +48,7 @@ You can also reference a GitHub repository agda.withPackages (p: [ (p.standard-library.overrideAttrs (oldAttrs: { version = "1.5"; - src = fetchFromGitHub { + src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v1.5"; @@ -114,7 +114,9 @@ This can be overridden by a different version of `ghc` as follows: ```nix agda.withPackages { - pkgs = [ /* ... */ ]; + pkgs = [ + # ... + ]; ghc = haskell.compiler.ghcHEAD; } ``` @@ -132,8 +134,10 @@ A derivation can then be written using `agdaPackages.mkDerivation`. This has sim Here is an example `default.nix` ```nix -{ nixpkgs ? }: -with (import nixpkgs {}); +{ + nixpkgs ? , +}: +with (import nixpkgs { }); agdaPackages.mkDerivation { version = "1.0"; pname = "my-agda-lib"; @@ -179,8 +183,12 @@ the Agda package set is small and can (still) be maintained by hand. To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the top line of the `default.nix` can look like: ```nix -{ mkDerivation, standard-library, fetchFromGitHub }: -{} +{ + mkDerivation, + standard-library, + fetchFromGitHub, +}: +{ } ``` Note that the derivation function is called with `mkDerivation` set to `agdaPackages.mkDerivation`, therefore you @@ -200,8 +208,12 @@ mkDerivation { libraryName = "IAL-1.3"; buildPhase = '' + runHook preBuild + patchShebangs find-deps.sh make + + runHook postBuild ''; } ``` diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index b640ba8d5011..9e93d4eda36d 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -8,23 +8,31 @@ supporting features. Use the `android-studio-full` attribute for a very complete Android SDK, including system images: ```nix -buildInputs = [ android-studio-full ]; +{ + buildInputs = [ android-studio-full ]; +} ``` This is identical to: ```nix -buildInputs = [ androidStudioPackages.stable.full ]; +{ + buildInputs = [ androidStudioPackages.stable.full ]; +} ``` Alternatively, you can pass composeAndroidPackages to the `withSdk` passthru: ```nix -buildInputs = [ - (android-studio.withSdk (androidenv.composeAndroidPackages { - includeNDK = true; - }).androidsdk) -]; +{ + buildInputs = [ + (android-studio.withSdk + (androidenv.composeAndroidPackages { + includeNDK = true; + }).androidsdk + ) + ]; +} ``` These will export `ANDROID_SDK_ROOT` and `ANDROID_NDK_ROOT` to the SDK and NDK directories @@ -35,13 +43,20 @@ in the specified Android build environment. Alternatively, you can deploy the SDK separately with a desired set of plugins, or subsets of an SDK. ```nix -with import {}; +with import { }; let androidComposition = androidenv.composeAndroidPackages { - platformVersions = [ "34" "35" ]; + platformVersions = [ + "34" + "35" + "latest" + ]; systemImageTypes = [ "google_apis_playstore" ]; - abiVersions = [ "armeabi-v7a" "arm64-v8a" ]; + abiVersions = [ + "armeabi-v7a" + "arm64-v8a" + ]; includeNDK = true; includeExtras = [ "extras;google;auto" @@ -116,7 +131,8 @@ For each requested system image we can specify the following options: be included. Defaults to `armeabi-v7a` and `arm64-v8a`. Most of the function arguments have reasonable default settings, preferring the latest -versions of tools when possible. +versions of tools when possible. You can additionally specify "latest" for any plugin version +that you do not care about, and just want the latest of. You can specify license names: @@ -165,7 +181,7 @@ We can also deploy subsets of the Android SDK. For example, to only the `platform-tools` package, you can evaluate the following expression: ```nix -with import {}; +with import { }; let androidComposition = androidenv.composeAndroidPackages { @@ -183,7 +199,7 @@ to use a predefined composition that contains a fairly complete set of Android p The following Nix expression can be used to deploy the entire SDK: ```nix -with import {}; +with import { }; androidenv.androidPkgs.androidsdk ``` @@ -191,7 +207,7 @@ androidenv.androidPkgs.androidsdk It is also possible to use one plugin only: ```nix -with import {}; +with import { }; androidenv.androidPkgs.platform-tools ``` @@ -205,7 +221,7 @@ An emulator spawn script can be configured by invoking the `emulateApp {}` function: ```nix -with import {}; +with import { }; androidenv.emulateApp { name = "emulate-MyAndroidApp"; @@ -221,7 +237,7 @@ It is also possible to specify an APK to deploy inside the emulator and the package and activity names to launch it: ```nix -with import {}; +with import { }; androidenv.emulateApp { name = "emulate-MyAndroidApp"; @@ -344,7 +360,7 @@ requires. Most newer Android projects use Gradle, and this is included for histo purposes. ```nix -with import {}; +with import { }; androidenv.buildApp { name = "MyAndroidApp"; diff --git a/doc/languages-frameworks/astal.section.md b/doc/languages-frameworks/astal.section.md index 34022b9c5850..9b2d59a1c009 100644 --- a/doc/languages-frameworks/astal.section.md +++ b/doc/languages-frameworks/astal.section.md @@ -11,7 +11,9 @@ ags.bundle { pname = "hyprpanel"; version = "1.0.0"; - src = fetchFromGitHub { ... }; + src = fetchFromGitHub { + #... + }; # change your entry file (default is `app.ts`) entry = "app.ts"; @@ -32,7 +34,9 @@ ags.bundle { # GTK 4 support is opt-in enableGtk4 = true; - meta = { ... }; + meta = { + #... + }; } ``` diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 6c88278def19..ada05b0ddc22 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -60,7 +60,10 @@ $ nix-shell -p beamPackages.rebar3 ```nix let - pkgs = import { config = {}; overlays = []; }; + pkgs = import { + config = { }; + overlays = [ ]; + }; in pkgs.mkShell { packages = [ pkgs.beamPackages.rebar3 ]; @@ -120,26 +123,28 @@ If there are git dependencies. { mixNixDeps = import ./mix.nix { inherit beamPackages lib; - overrides = (final: prev: { - # mix2nix does not support git dependencies yet, - # so we need to add them manually - prometheus_ex = beamPackages.buildMix rec { - name = "prometheus_ex"; - version = "3.0.5"; + overrides = ( + final: prev: { + # mix2nix does not support git dependencies yet, + # so we need to add them manually + prometheus_ex = beamPackages.buildMix rec { + name = "prometheus_ex"; + version = "3.0.5"; - # Change the argument src with the git src that you actually need - src = fetchFromGitLab { - domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; - repo = "prometheus.ex"; - rev = "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5"; - hash = "sha256-U17LlN6aGUKUFnT4XyYXppRN+TvUBIBRHEUsfeIiGOw="; + # Change the argument src with the git src that you actually need + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "prometheus.ex"; + rev = "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5"; + hash = "sha256-U17LlN6aGUKUFnT4XyYXppRN+TvUBIBRHEUsfeIiGOw="; + }; + # you can re-use the same beamDeps argument as generated + beamDeps = with final; [ prometheus ]; }; - # you can re-use the same beamDeps argument as generated - beamDeps = with final; [ prometheus ]; - }; - }); + } + ); }; } ``` @@ -195,15 +200,21 @@ let hash = lib.fakeHash; mixEnv = ""; # default is "prod", when empty includes all dependencies, such as "dev", "test". # if you have build time environment variables add them here - MY_ENV_VAR="my_value"; + MY_ENV_VAR = "my_value"; }; nodeDependencies = (pkgs.callPackage ./assets/default.nix { }).shell.nodeDependencies; -in packages.mixRelease { - inherit src pname version mixFodDeps; +in +packages.mixRelease { + inherit + src + pname + version + mixFodDeps + ; # if you have build time environment variables add them here - MY_ENV_VAR="my_value"; + MY_ENV_VAR = "my_value"; postBuild = '' ln -sf ${nodeDependencies}/lib/node_modules assets/node_modules @@ -231,7 +242,12 @@ In order to create a service with your release, you could add a `service.nix` in your project with the following ```nix -{config, pkgs, lib, ...}: +{ + config, + pkgs, + lib, + ... +}: let release = pkgs.callPackage ./default.nix; @@ -241,10 +257,16 @@ in { systemd.services.${release_name} = { wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "postgresql.service" ]; + after = [ + "network.target" + "postgresql.service" + ]; # note that if you are connecting to a postgres instance on a different host # postgresql.service should not be included in the requires. - requires = [ "network-online.target" "postgresql.service" ]; + requires = [ + "network-online.target" + "postgresql.service" + ]; description = "my app"; environment = { # RELEASE_TMP is used to write the state of the @@ -292,7 +314,9 @@ in Usually, we need to create a `shell.nix` file and do our development inside of the environment specified therein. Just install your version of Erlang and any other interpreters, and then use your normal build tools. As an example with Elixir: ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: with pkgs; let @@ -311,12 +335,14 @@ If you need to use an overlay to change some attributes of a derivation, e.g. if ```nix let - elixir_1_18_1_overlay = (self: super: { + elixir_1_18_1_overlay = ( + self: super: { elixir_1_18 = super.elixir_1_18.override { version = "1.18.1"; sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; }; - }); + } + ); pkgs = import { overlays = [ elixir_1_18_1_overlay ]; }; in with pkgs; @@ -349,9 +375,7 @@ let nodePackages.prettier ]; - inputs = basePackages ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ] - ++ lib.optionals stdenv.hostPlatform.isDarwin - (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices ]); + inputs = basePackages ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]; # define shell startup command hooks = '' @@ -380,7 +404,8 @@ let export ENV_VAR="your_env_var" ''; -in mkShell { +in +mkShell { buildInputs = inputs; shellHook = hooks; } diff --git a/doc/languages-frameworks/bower.section.md b/doc/languages-frameworks/bower.section.md index 346852c49426..3783773e2bf2 100644 --- a/doc/languages-frameworks/bower.section.md +++ b/doc/languages-frameworks/bower.section.md @@ -24,11 +24,15 @@ Running `bower2nix` will produce something like the following output: ```nix { fetchbower, buildEnv }: -buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "angular" "1.5.3" "~1.5.0" "1749xb0firxdra4rzadm4q9x90v6pzkbd7xmcyjk6qfza09ykk9y") - (fetchbower "bootstrap" "3.3.6" "~3.3.6" "1vvqlpbfcy0k5pncfjaiskj3y6scwifxygfqnw393sjfxiviwmbv") - (fetchbower "jquery" "2.2.2" "1.9.1 - 2" "10sp5h98sqwk90y4k6hbdviwqzvzwqf47r3r51pakch5ii2y7js1") -]; } +buildEnv { + name = "bower-env"; + ignoreCollisions = true; + paths = [ + (fetchbower "angular" "1.5.3" "~1.5.0" "1749xb0firxdra4rzadm4q9x90v6pzkbd7xmcyjk6qfza09ykk9y") + (fetchbower "bootstrap" "3.3.6" "~3.3.6" "1vvqlpbfcy0k5pncfjaiskj3y6scwifxygfqnw393sjfxiviwmbv") + (fetchbower "jquery" "2.2.2" "1.9.1 - 2" "10sp5h98sqwk90y4k6hbdviwqzvzwqf47r3r51pakch5ii2y7js1") + ]; +} ``` Using the `bower2nix` command line arguments, the output can be redirected to a file. A name like `bower-packages.nix` would be fine. @@ -80,8 +84,12 @@ gulp.task('build', [], function () { ### Example Full example — default.nix {#ex-buildBowerComponentsDefaultNix} ```nix -{ myWebApp ? { outPath = ./.; name = "myWebApp"; } -, pkgs ? import {} +{ + myWebApp ? { + outPath = ./.; + name = "myWebApp"; + }, + pkgs ? import { }, }: pkgs.stdenv.mkDerivation { @@ -90,16 +98,24 @@ pkgs.stdenv.mkDerivation { buildInputs = [ pkgs.nodePackages.gulp ]; - bowerComponents = pkgs.buildBowerComponents { # note 1 + bowerComponents = pkgs.buildBowerComponents { + # note 1 name = "my-web-app"; generated = ./bower-packages.nix; src = myWebApp; }; + nativeBuildInputs = [ + writableTmpDirAsHomeHook # note 3 + ]; + buildPhase = '' + runHook preBuild + cp --reflink=auto --no-preserve=mode -R $bowerComponents/bower_components . # note 2 - export HOME=$PWD # note 3 ${pkgs.nodePackages.gulp}/bin/gulp build # note 4 + + runHook postBuild ''; installPhase = "mv gulpdist $out"; diff --git a/doc/languages-frameworks/chicken.section.md b/doc/languages-frameworks/chicken.section.md index d1e12e2cccbc..78a4469a8e1d 100644 --- a/doc/languages-frameworks/chicken.section.md +++ b/doc/languages-frameworks/chicken.section.md @@ -60,19 +60,23 @@ all the other eggs: ```nix let - myChickenPackages = pkgs.chickenPackages.overrideScope (self: super: { + myChickenPackages = pkgs.chickenPackages.overrideScope ( + self: super: { # The chicken package itself can be overridden to effect the whole ecosystem. # chicken = super.chicken.overrideAttrs { # src = ... # }; - chickenEggs = super.chickenEggs.overrideScope (eggself: eggsuper: { - srfi-180 = eggsuper.srfi-180.overrideAttrs { - # path to a local copy of srfi-180 - src = <...>; - }; - }); - }); + chickenEggs = super.chickenEggs.overrideScope ( + eggself: eggsuper: { + srfi-180 = eggsuper.srfi-180.overrideAttrs { + # path to a local copy of srfi-180 + src = <...>; + }; + } + ); + } + ); in # Here, `myChickenPackages.chickenEggs.json-rpc`, which depends on `srfi-180` will use # the local copy of `srfi-180`. diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index ca983eec4f0d..c08ed2bc6f43 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -54,35 +54,78 @@ It also takes other standard `mkDerivation` attributes, they are added as such, Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes some `mathcomp` derivations as `extraBuildInputs`. ```nix -{ lib, mkCoqDerivation, version ? null -, coq, mathcomp, mathcomp-finmap, mathcomp-bigenough }: +{ + lib, + mkCoqDerivation, + version ? null, + coq, + mathcomp, + mathcomp-finmap, + mathcomp-bigenough, +}: mkCoqDerivation { - /* namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` */ - namePrefix = [ "coq" "mathcomp" ]; + # namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` + namePrefix = [ + "coq" + "mathcomp" + ]; pname = "multinomials"; owner = "math-comp"; inherit version; - defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.7" "8.12") (isEq "1.11") ]; out = "1.5.2"; } - { cases = [ (range "8.7" "8.11") (range "1.8" "1.10") ]; out = "1.5.0"; } - { cases = [ (range "8.7" "8.10") (range "1.8" "1.10") ]; out = "1.4"; } - { cases = [ (isEq "8.6") (range "1.6" "1.7") ]; out = "1.1"; } - ] null; + defaultVersion = + with lib.versions; + lib.switch + [ coq.version mathcomp.version ] + [ + { + cases = [ + (range "8.7" "8.12") + (isEq "1.11") + ]; + out = "1.5.2"; + } + { + cases = [ + (range "8.7" "8.11") + (range "1.8" "1.10") + ]; + out = "1.5.0"; + } + { + cases = [ + (range "8.7" "8.10") + (range "1.8" "1.10") + ]; + out = "1.4"; + } + { + cases = [ + (isEq "8.6") + (range "1.6" "1.7") + ]; + out = "1.1"; + } + ] + null; release = { "1.5.2".hash = "sha256-mjCx9XKa38Nz9E6wNK7YSqHdJ7YTua5fD3d6J4e7WpU="; "1.5.1".hash = "sha256-Q8tm0y2FQAt2V1kZYkDlHWRia/lTvXAMVjdmzEV11I4="; "1.5.0".hash = "sha256-HIK0f21G69oEW8JG46gSBde/Q2LR3GiBCv680gHbmRg="; - "1.5.0".rev = "1.5"; - "1.4".hash = "sha256-F9g3MSIr3B6UZ3p8QWjz3/Jpw9sudJ+KRlvjiHSO024="; - "1.3".hash = "sha256-BPJTlAL0ETHvLMBslE0KFVt3DNoaGuMrHt2SBGyJe1A="; - "1.2".hash = "sha256-mHXBXSLYO4BN+jfN50y/+XCx0Qq5g4Ac2Y/qlsbgAdY="; - "1.1".hash = "sha256-ejAsMQbB/LtU9j+g160VdGXULrCe9s0gBWzyhKqmCuE="; - "1.0".hash = "sha256-tZTOltEBBKWciDxDMs/Ye4Jnq/33CANrHJ4FBMPtq+I="; + "1.5.0".rev = "1.5"; + "1.4".hash = "sha256-F9g3MSIr3B6UZ3p8QWjz3/Jpw9sudJ+KRlvjiHSO024="; + "1.3".hash = "sha256-BPJTlAL0ETHvLMBslE0KFVt3DNoaGuMrHt2SBGyJe1A="; + "1.2".hash = "sha256-mHXBXSLYO4BN+jfN50y/+XCx0Qq5g4Ac2Y/qlsbgAdY="; + "1.1".hash = "sha256-ejAsMQbB/LtU9j+g160VdGXULrCe9s0gBWzyhKqmCuE="; + "1.0".hash = "sha256-tZTOltEBBKWciDxDMs/Ye4Jnq/33CANrHJ4FBMPtq+I="; }; - propagatedBuildInputs = - [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; + propagatedBuildInputs = [ + mathcomp.ssreflect + mathcomp.algebra + mathcomp-finmap + mathcomp-bigenough + ]; meta = { description = "Coq/SSReflect Library for Monoidal Rings and Multinomials"; @@ -124,12 +167,10 @@ The `overrideCoqDerivation` function lets you easily change arguments to `mkCoqD For example, here is how you could locally add a new release of the `multinomials` library, and set the `defaultVersion` to use this release: ```nix -coqPackages.lib.overrideCoqDerivation - { - defaultVersion = "2.0"; - release."2.0".hash = "sha256-czoP11rtrIM7+OLdMisv2EF7n/IbGuwFxHiPtg3qCNM="; - } - coqPackages.multinomials +coqPackages.lib.overrideCoqDerivation { + defaultVersion = "2.0"; + release."2.0".hash = "sha256-czoP11rtrIM7+OLdMisv2EF7n/IbGuwFxHiPtg3qCNM="; +} coqPackages.multinomials ``` ### `.overrideAttrs` {#coq-overrideAttrs} @@ -140,8 +181,10 @@ For instance, here is how you could add some code to be performed in the derivat ```nix coqPackages.multinomials.overrideAttrs (oldAttrs: { - postInstall = oldAttrs.postInstall or "" + '' - echo "you can do anything you want here" - ''; + postInstall = + oldAttrs.postInstall or "" + + '' + echo "you can do anything you want here" + ''; }) ``` diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md index 9953f357048a..5ea70319dd49 100644 --- a/doc/languages-frameworks/crystal.section.md +++ b/doc/languages-frameworks/crystal.section.md @@ -18,7 +18,7 @@ This should have generated a `shards.nix` file. Next create a Nix file for your derivation and use `pkgs.crystal.buildCrystalPackage` as follows: ```nix -with import {}; +with import { }; crystal.buildCrystalPackage rec { pname = "mint"; version = "0.5.0"; @@ -51,14 +51,17 @@ Additionally you can override the default `crystal build` options (which are cur ```nix { - crystalBinaries.mint.options = [ "--release" "--verbose" ]; + crystalBinaries.mint.options = [ + "--release" + "--verbose" + ]; } ``` Depending on the project, you might need additional steps to get it to compile successfully. In Mint's case, we need to link against openssl, so in the end the Nix file looks as follows: ```nix -with import {}; +with import { }; crystal.buildCrystalPackage rec { version = "0.5.0"; pname = "mint"; diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md index bb394a243b79..091fc57a53a0 100644 --- a/doc/languages-frameworks/cuda.section.md +++ b/doc/languages-frameworks/cuda.section.md @@ -12,11 +12,13 @@ compatible are available as well. For example, there can be a To use one or more CUDA packages in an expression, give the expression a `cudaPackages` parameter, and in case CUDA is optional ```nix -{ config -, cudaSupport ? config.cudaSupport -, cudaPackages ? { } -, ... -}: {} +{ + config, + cudaSupport ? config.cudaSupport, + cudaPackages ? { }, + ... +}: +{ } ``` When using `callPackage`, you can choose to pass in a different variant, e.g. @@ -32,11 +34,15 @@ package set to make it the default. This guarantees you get a consistent package set. ```nix { - mypkg = let - cudaPackages = cudaPackages_11_5.overrideScope (final: prev: { - cudnn = prev.cudnn_8_3; - }); - in callPackage { inherit cudaPackages; }; + mypkg = + let + cudaPackages = cudaPackages_11_5.overrideScope ( + final: prev: { + cudnn = prev.cudnn_8_3; + } + ); + in + callPackage { inherit cudaPackages; }; } ``` diff --git a/doc/languages-frameworks/cuelang.section.md b/doc/languages-frameworks/cuelang.section.md index 70329b15fd7d..bbef29ee78a8 100644 --- a/doc/languages-frameworks/cuelang.section.md +++ b/doc/languages-frameworks/cuelang.section.md @@ -27,13 +27,11 @@ Nixpkgs provides a `pkgs.writeCueValidator` helper, which will write a validatio Here is an example: ```nix -pkgs.writeCueValidator - (pkgs.writeText "schema.cue" '' - #Def1: { - field1: string - } - '') - { document = "#Def1"; } +pkgs.writeCueValidator (pkgs.writeText "schema.cue" '' + #Def1: { + field1: string + } +'') { document = "#Def1"; } ``` - The first parameter is the Cue schema file. @@ -43,19 +41,19 @@ pkgs.writeCueValidator Another example, given the following `validator.nix` : ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: let - genericValidator = version: - pkgs.writeCueValidator - (pkgs.writeText "schema.cue" '' + genericValidator = + version: + pkgs.writeCueValidator (pkgs.writeText "schema.cue" '' #Version1: { field1: string } #Version2: #Version1 & { field1: "unused" - }'' - ) - { document = "#Version${toString version}"; }; + }'') { document = "#Version${toString version}"; }; in { validateV1 = genericValidator 1; diff --git a/doc/languages-frameworks/dart.section.md b/doc/languages-frameworks/dart.section.md index dfb456ba1941..32a9a0b6f653 100644 --- a/doc/languages-frameworks/dart.section.md +++ b/doc/languages-frameworks/dart.section.md @@ -30,7 +30,11 @@ The `dart` commands run can be overridden through `pubGetScript` and `dartCompil Dart supports multiple [outputs types](https://dart.dev/tools/dart-compile#types-of-output), you can choose between them using `dartOutputType` (defaults to `exe`). If you want to override the binaries path or the source path they come from, you can use `dartEntryPoints`. Outputs that require a runtime will automatically be wrapped with the relevant runtime (`dartaotruntime` for `aot-snapshot`, `dart run` for `jit-snapshot` and `kernel`, `node` for `js`), this can be overridden through `dartRuntimeCommand`. ```nix -{ lib, buildDartApplication, fetchFromGitHub }: +{ + lib, + buildDartApplication, + fetchFromGitHub, +}: buildDartApplication rec { pname = "dart-sass"; @@ -38,8 +42,8 @@ buildDartApplication rec { src = fetchFromGitHub { owner = "sass"; - repo = pname; - rev = version; + repo = "dart-sass"; + tag = version; hash = "sha256-U6enz8yJcc4Wf8m54eYIAnVg/jsGi247Wy8lp1r1wg4="; }; @@ -101,7 +105,7 @@ See the [Dart documentation](#ssec-dart-applications) for more details on requir `flutter` in Nixpkgs always points to `flutterPackages.stable`, which is the latest packaged version. To avoid unforeseen breakage during upgrade, packages in Nixpkgs should use a specific flutter version, such as `flutter319` and `flutter322`, instead of using `flutter` directly. ```nix -{ flutter322, fetchFromGitHub }: +{ flutter322, fetchFromGitHub }: flutter322.buildFlutterApplication { pname = "firmware-updater"; diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md index 8d85c9f1daf7..469f1a4fe3d1 100644 --- a/doc/languages-frameworks/dhall.section.md +++ b/doc/languages-frameworks/dhall.section.md @@ -90,7 +90,7 @@ buildDhallPackage { let nixpkgs = builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/94b2848559b12a8ed1fe433084686b2a81123c99.tar.gz"; + url = "https://github.com/NixOS/nixpkgs/archive/94b2848559b12a8ed1fe433084686b2a81123c99.tar.gz"; hash = "sha256-B4Q3c6IvTLg3Q92qYa8y+i4uTaphtFdjp+Ir3QQjdN0="; }; @@ -100,15 +100,17 @@ let overlay = self: super: { dhallPackages = super.dhallPackages.override (old: { - overrides = - self.lib.composeExtensions (old.overrides or (_: _: {})) dhallOverlay; + overrides = self.lib.composeExtensions (old.overrides or (_: _: { })) dhallOverlay; }); }; - pkgs = import nixpkgs { config = {}; overlays = [ overlay ]; }; + pkgs = import nixpkgs { + config = { }; + overlays = [ overlay ]; + }; in - pkgs +pkgs ``` … which we can then build using this command: @@ -190,8 +192,7 @@ Dhall overlay like this: { dhallOverrides = self: super: { # Enable source for all Dhall packages - buildDhallPackage = - args: super.buildDhallPackage (args // { source = true; }); + buildDhallPackage = args: super.buildDhallPackage (args // { source = true; }); true = self.callPackage ./true.nix { }; }; diff --git a/doc/languages-frameworks/dlang.section.md b/doc/languages-frameworks/dlang.section.md index 6e9edefc5e0f..fa211dc6a43d 100644 --- a/doc/languages-frameworks/dlang.section.md +++ b/doc/languages-frameworks/dlang.section.md @@ -22,7 +22,7 @@ buildDubPackage rec { src = fetchFromGitHub { owner = "CyberShadow"; repo = "btdu"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-3sSZq+5UJH02IO0Y1yL3BLHDb4lk8k6awb5ZysBQciE="; }; diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 23e3be414573..ea3448542f5d 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -6,7 +6,7 @@ For local development, it's recommended to use nix-shell to create a dotnet envi ```nix # shell.nix -with import {}; +with import { }; mkShell { name = "dotnet-env"; @@ -21,15 +21,18 @@ mkShell { It's very likely that more than one sdk will be needed on a given project. Dotnet provides several different frameworks (E.g dotnetcore, aspnetcore, etc.) as well as many versions for a given framework. Normally, dotnet is able to fetch a framework and install it relative to the executable. However, this would mean writing to the nix store in nixpkgs, which is read-only. To support the many-sdk use case, one can compose an environment using `dotnetCorePackages.combinePackages`: ```nix -with import {}; +with import { }; mkShell { name = "dotnet-env"; packages = [ - (with dotnetCorePackages; combinePackages [ - sdk_8_0 - sdk_9_0 - ]) + ( + with dotnetCorePackages; + combinePackages [ + sdk_8_0 + sdk_9_0 + ] + ) ]; } ``` @@ -137,11 +140,19 @@ When packaging a new application, you need to fetch its dependencies. Create an Here is an example `default.nix`, using some of the previously discussed arguments: ```nix -{ lib, buildDotnetModule, dotnetCorePackages, ffmpeg }: +{ + lib, + buildDotnetModule, + dotnetCorePackages, + ffmpeg, +}: let - referencedProject = import ../../bar { /* ... */ }; -in buildDotnetModule rec { + referencedProject = import ../../bar { + # ... + }; +in +buildDotnetModule rec { pname = "someDotnetApplication"; version = "0.1"; @@ -156,7 +167,7 @@ in buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.runtime_8_0; executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. - executables = []; # Don't install any executables. + executables = [ ]; # Don't install any executables. packNupkg = true; # This packs the project as "foo-0.1.nupkg" at `$out/share`. diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index d1ed62d0503f..0fca82f70aed 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -41,56 +41,75 @@ One advantage is that when `pkgs.zlib` is updated, it will automatically update (pkgs.zlib.override { stdenv = pkgs.emscriptenStdenv; }).overrideAttrs -(old: rec { - buildInputs = old.buildInputs ++ [ pkg-config ]; - # we need to reset this setting! - env = (old.env or { }) // { NIX_CFLAGS_COMPILE = ""; }; - configurePhase = '' - # FIXME: Some tests require writing at $HOME - HOME=$TMPDIR - runHook preConfigure + (old: { + buildInputs = old.buildInputs ++ [ pkg-config ]; + # we need to reset this setting! + env = (old.env or { }) // { + NIX_CFLAGS_COMPILE = ""; + }; - #export EMCC_DEBUG=2 - emconfigure ./configure --prefix=$out --shared + configurePhase = '' + # FIXME: Some tests require writing at $HOME + HOME=$TMPDIR + runHook preConfigure - runHook postConfigure - ''; - dontStrip = true; - outputs = [ "out" ]; - buildPhase = '' - emmake make - ''; - installPhase = '' - emmake make install - ''; - checkPhase = '' - echo "================= testing zlib using node =================" + #export EMCC_DEBUG=2 + emconfigure ./configure --prefix=$out --shared - echo "Compiling a custom test" - set -x - emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \ - libz.so.${old.version} -I . -o example.js + runHook postConfigure + ''; - echo "Using node to execute the test" - ${pkgs.nodejs}/bin/node ./example.js + dontStrip = true; + outputs = [ "out" ]; - set +x - if [ $? -ne 0 ]; then - echo "test failed for some reason" - exit 1; - else - echo "it seems to work! very good." - fi - echo "================= /testing zlib using node =================" - ''; + buildPhase = '' + runHook preBuild - postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin '' - substituteInPlace configure \ - --replace-fail '/usr/bin/libtool' 'ar' \ - --replace-fail 'AR="libtool"' 'AR="ar"' \ - --replace-fail 'ARFLAGS="-o"' 'ARFLAGS="-r"' - ''; -}) + emmake make + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + emmake make install + + runHook postInstall + ''; + + checkPhase = '' + runHook preCheck + + echo "================= testing zlib using node =================" + + echo "Compiling a custom test" + set -x + emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \ + libz.so.${old.version} -I . -o example.js + + echo "Using node to execute the test" + ${pkgs.nodejs}/bin/node ./example.js + + set +x + if [ $? -ne 0 ]; then + echo "test failed for some reason" + exit 1; + else + echo "it seems to work! very good." + fi + echo "================= /testing zlib using node =================" + + runHook postCheck + ''; + + postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin '' + substituteInPlace configure \ + --replace-fail '/usr/bin/libtool' 'ar' \ + --replace-fail 'AR="libtool"' 'AR="ar"' \ + --replace-fail 'ARFLAGS="-o"' 'ARFLAGS="-r"' + ''; + }) ``` :::{.example #usage-2-pkgs.buildemscriptenpackage} @@ -100,11 +119,27 @@ One advantage is that when `pkgs.zlib` is updated, it will automatically update This `xmlmirror` example features an Emscripten package that is defined completely from this context and no `pkgs.zlib.override` is used. ```nix -pkgs.buildEmscriptenPackage rec { - name = "xmlmirror"; +pkgs.buildEmscriptenPackage { + pname = "xmlmirror"; + version = "1.2.3"; - buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; - nativeBuildInputs = [ pkg-config zlib ]; + buildInputs = [ + pkg-config + autoconf + automake + libtool + gnumake + libxml2 + nodejs + openjdk + json_c + ]; + + nativeBuildInputs = [ + pkg-config + writableTmpDirAsHomeHook + zlib + ]; src = pkgs.fetchgit { url = "https://gitlab.com/odfplugfest/xmlmirror.git"; @@ -113,6 +148,8 @@ pkgs.buildEmscriptenPackage rec { }; configurePhase = '' + runHook preConfigure + rm -f fastXmlLint.js* # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728 # https://gitlab.com/odfplugfest/xmlmirror/issues/8 @@ -122,16 +159,26 @@ pkgs.buildEmscriptenPackage rec { sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv # https://gitlab.com/odfplugfest/xmlmirror/issues/11 sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv + + runHook postConfigure ''; buildPhase = '' - HOME=$TMPDIR + runHook preBuild + make -f Makefile.emEnv + + runHook postBuild ''; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; installPhase = '' + runHook preInstall + mkdir -p $out/share mkdir -p $doc/share/${name} @@ -145,9 +192,13 @@ pkgs.buildEmscriptenPackage rec { cp *.json $out/share cp *.rng $out/share cp README.md $doc/share/${name} + runHook postInstall ''; - checkPhase = '' + checkPhase = '' + runHook preCheck + + runHook postCheck ''; } ``` diff --git a/doc/languages-frameworks/factor.section.md b/doc/languages-frameworks/factor.section.md index 62db50e1ff6a..0d67eede4d34 100644 --- a/doc/languages-frameworks/factor.section.md +++ b/doc/languages-frameworks/factor.section.md @@ -125,7 +125,7 @@ factorPackages.buildFactorApplication (finalAttrs: { version = "1.0"; src = fetchurl { - url = "https://some-forge.org/foo-${finalAttrs.version}.tar.gz" + url = "https://some-forge.org/foo-${finalAttrs.version}.tar.gz"; }; }) ``` diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 8374d55ac2f7..718c296bce80 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -96,7 +96,12 @@ Given the requirements above, the package expression would become messy quickly: --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \ --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ - --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ pango json-glib ]}" + --prefix GI_TYPELIB_PATH : "${ + lib.makeSearchPath "lib/girepository-1.0" [ + pango + json-glib + ] + }" done ''; } @@ -209,7 +214,7 @@ stdenv.mkDerivation { You can rely on applications depending on the library setting the necessary environment variables but that is often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples: -- []{#ssec-gnome-common-issues-unwrappable-package-gnome-shell-ext} [Replacing a `GI_TYPELIB_PATH` in GNOME Shell extension](https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix#L21-L24) – we are using `substituteAll` to include the path to a typelib into a patch. +- []{#ssec-gnome-common-issues-unwrappable-package-gnome-shell-ext} [Replacing a `GI_TYPELIB_PATH` in GNOME Shell extension](https://github.com/NixOS/nixpkgs/blob/e981466fbb08e6231a1377539ff17fbba3270fda/pkgs/by-name/gn/gnome-shell-extensions/package.nix#L25-L32) – we are using `replaceVars` to include the path to a typelib into a patch. - []{#ssec-gnome-common-issues-unwrappable-package-gsettings} The following examples are hardcoding GSettings schema paths. To get the schema paths we use the functions @@ -217,7 +222,7 @@ You can rely on applications depending on the library setting the necessary envi * `glib.makeSchemaPath` Takes a package output like `$out` and a derivation name. You should use this if the schemas you need to hardcode are in the same derivation. - []{#ssec-gnome-common-issues-unwrappable-package-gsettings-vala} [Hard-coding GSettings schema path in Vala plug-in (dynamically loaded library)](https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/pantheon/apps/elementary-files/default.nix#L78-L86) – here, `substituteAll` cannot be used since the schema comes from the same package preventing us from pass its path to the function, probably due to a [Nix bug](https://github.com/NixOS/nix/issues/1846). + []{#ssec-gnome-common-issues-unwrappable-package-gsettings-vala} [Hard-coding GSettings schema path in Vala plug-in (dynamically loaded library)](https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/pantheon/apps/elementary-files/default.nix#L78-L86) – here, `replaceVars` cannot be used since the schema comes from the same package preventing us from pass its path to the function, probably due to a [Nix bug](https://github.com/NixOS/nix/issues/1846). []{#ssec-gnome-common-issues-unwrappable-package-gsettings-c} [Hard-coding GSettings schema path in C library](https://github.com/NixOS/nixpkgs/blob/29c120c065d03b000224872251bed93932d42412/pkgs/development/libraries/glib-networking/default.nix#L31-L34) – nothing special other than using [Coccinelle patch](https://github.com/NixOS/nixpkgs/pull/67957#issuecomment-527717467) to generate the patch itself. diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 34bf913ef1e8..172bf2ca8f37 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -13,14 +13,14 @@ The following is an example expression using `buildGoModule`: ```nix { - pet = buildGoModule rec { + pet = buildGoModule (finalAttrs: { pname = "pet"; version = "0.3.4"; src = fetchFromGitHub { owner = "knqyf263"; repo = "pet"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Gjw1dRrgM8D3G7v6WIM2+50r4HmTXvx0Xxme2fH9TlQ="; }; @@ -32,7 +32,7 @@ The following is an example expression using `buildGoModule`: license = lib.licenses.mit; maintainers = with lib.maintainers; [ kalbasit ]; }; - }; + }); } ``` @@ -188,6 +188,13 @@ Whether the build result should be allowed to contain references to the Go tool Defaults to `false` +### `goSum` {#var-go-goSum} + +Specifies the contents of the `go.sum` file and triggers rebuilds when it changes. This helps combat inconsistent dependency errors on `go.sum` changes. + +Defaults to `null` + + ## Overriding `goModules` {#buildGoModule-goModules-override} Overriding `.goModules` by calling `goModules.overrideAttrs` is unsupported. Still, it is possible to override the `vendorHash` (`goModules`'s `outputHash`) and the `pre`/`post` hooks for both the build and patch phases of the primary and `goModules` derivation. diff --git a/doc/languages-frameworks/gradle.section.md b/doc/languages-frameworks/gradle.section.md index 762c8003a7a7..3d648ec0ae0b 100644 --- a/doc/languages-frameworks/gradle.section.md +++ b/doc/languages-frameworks/gradle.section.md @@ -21,7 +21,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ciKotTHSEcITfQYKFZ6sY2LZnXGChBJy0+eno8B3YHY="; }; - nativeBuildInputs = [ gradle makeWrapper ]; + nativeBuildInputs = [ + gradle + makeWrapper + ]; # if the package has dependencies, mitmCache must be set mitmCache = gradle.fetchDeps { @@ -72,11 +75,12 @@ The first is to add the derivation arguments required for getting the package. Using the pdftk example above: ```nix -{ lib -, stdenv -, gradle -# ... -, pdftk +{ + lib, + stdenv, + gradle, + # ... + pdftk, }: stdenv.mkDerivation (finalAttrs: { diff --git a/doc/languages-frameworks/hare.section.md b/doc/languages-frameworks/hare.section.md index 0ae8abeba45c..7dfa42311480 100644 --- a/doc/languages-frameworks/hare.section.md +++ b/doc/languages-frameworks/hare.section.md @@ -25,7 +25,8 @@ The following attributes are accepted by `hareHook`: hareHook, lib, stdenv, -}: stdenv.mkDerivation { +}: +stdenv.mkDerivation { pname = ""; version = ""; src = ""; diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 9ad32a3d20fb..0e0d44114971 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -58,7 +58,7 @@ Each of those compiler versions has a corresponding attribute set `packages` bui it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC 9.4.8 is `haskell.packages.ghc948`. In fact `haskellPackages` (at the time of writing) is just an alias -for `haskell.packages.ghc966`: +for `haskell.packages.ghc984`: Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. @@ -297,8 +297,8 @@ Defaults to `false`. : Whether to build (HTML) documentation using [haddock][haddock]. Defaults to `true` if supported. -`testTarget` -: Name of the test suite to build and run. If unset, all test suites will be executed. +`testTargets` +: Names of the test suites to build and run. If unset, all test suites will be executed. `preCompileBuildDriver` : Shell code to run before compiling `Setup.hs`. @@ -487,7 +487,7 @@ so: ```nix let - pkgs = import {}; + pkgs = import { }; inherit (pkgs) haskell; inherit (haskell.lib.compose) overrideCabal; @@ -511,7 +511,7 @@ let previousIntermediates = turtle-full-build-with-incremental-output.intermediates; }) turtle; in - turtle-incremental-build +turtle-incremental-build ``` ## Development environments {#haskell-development-environments} @@ -590,7 +590,9 @@ that: ```nix # Retrieve nixpkgs impurely from NIX_PATH for now, you can pin it instead, of course. -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: # use the nixpkgs default haskell package set pkgs.haskellPackages.callPackage ./my-project.nix { } @@ -619,6 +621,12 @@ environment. This means you can reuse Nix expressions of packages included in nixpkgs, but also use local Nix expressions like this: `hpkgs: [ (hpkgs.callPackage ./my-project.nix { }) ]`. +`extraDependencies` +: Extra dependencies, in the form of cabal2nix build attributes. An example use +case is when you have Haskell scripts that use libraries that don't occur in +your packages' dependencies. Example: `hpkgs: {libraryHaskellDepends = +[ hpkgs.releaser ]}`. Defaults to `hpkgs: { }`. + `nativeBuildInputs` : Expects a list of derivations to add as build tools to the build environment. This is the place to add packages like `cabal-install`, `doctest` or `hlint`. @@ -654,7 +662,9 @@ Say our example above depends on `distribution-nixpkgs` and we have a project file set up for both, we can add the following `shell.nix` expression: ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: pkgs.haskellPackages.shellFor { packages = hpkgs: [ @@ -703,7 +713,12 @@ linked to work reliably. You can override the list of supported GHC versions with e.g. ```nix -pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "94" ]; } +pkgs.haskell-language-server.override { + supportedGhcVersions = [ + "90" + "94" + ]; +} ``` Where all strings `version` are allowed such that `haskell.packages.ghc${version}` is an existing package set. @@ -764,7 +779,7 @@ that depend on that library, you may want to use: ```nix haskellPackages.haskell-ci.overrideScope (self: super: { - Cabal = self.Cabal_3_14_1_0; + Cabal = self.Cabal_3_14_2_0; }) ``` @@ -886,11 +901,9 @@ for this to work. derivation: ```nix - pkgs.haskell.lib.overrideCabal - (pkgs.haskell.lib.justStaticExecutables my-haskell-package) - (drv: { - disallowGhcReference = false; - }) + pkgs.haskell.lib.overrideCabal (pkgs.haskell.lib.justStaticExecutables my-haskell-package) (drv: { + disallowGhcReference = false; + }) ``` Then use `strings` to determine which libraries are responsible: @@ -906,14 +919,12 @@ for this to work. Finally, use `remove-references-to` to delete those store paths from the produced output: ```nix - pkgs.haskell.lib.overrideCabal - (pkgs.haskell.lib.justStaticExecutables my-haskell-package) - (drv: { - postInstall = '' - ${drv.postInstall or ""} - remove-references-to -t ${pkgs.haskellPackages.hs-opentelemetry-sdk} - ''; - }) + pkgs.haskell.lib.overrideCabal (pkgs.haskell.lib.justStaticExecutables my-haskell-package) (drv: { + postInstall = '' + ${drv.postInstall or ""} + remove-references-to -t ${pkgs.haskellPackages.hs-opentelemetry-sdk} + ''; + }) ``` [164630]: https://github.com/NixOS/nixpkgs/issues/164630 @@ -1122,12 +1133,20 @@ Haskell packages using [import from derivation][import-from-derivation]. ```nix # cabal get mtl-2.2.1 && cd mtl-2.2.1 && cabal2nix . -{ mkDerivation, base, lib, transformers }: +{ + mkDerivation, + base, + lib, + transformers, +}: mkDerivation { pname = "mtl"; version = "2.2.1"; src = ./.; - libraryHaskellDepends = [ base transformers ]; + libraryHaskellDepends = [ + base + transformers + ]; homepage = "http://github.com/ekmett/mtl"; description = "Monad classes, using functional dependencies"; license = lib.licenses.bsd3; @@ -1274,60 +1293,69 @@ in # recommended to only use such an overlay if you are enabling profiling on a # platform that doesn't by default, because compiling GHC from scratch is # quite expensive. - (final: prev: - let - inherit (final) lib; - in + ( + final: prev: + let + inherit (final) lib; + in - { - haskell = prev.haskell // { - compiler = prev.haskell.compiler // { - ${ghcName} = prev.haskell.compiler.${ghcName}.override { - # Unfortunately, the GHC setting is named differently for historical reasons - enableProfiledLibs = enableProfiling; - }; - }; - }; - }) - - (final: prev: - let - inherit (final) lib; - haskellLib = final.haskell.lib.compose; - in - - { - haskell = prev.haskell // { - packages = prev.haskell.packages // { - ${ghcName} = prev.haskell.packages.${ghcName}.override { - overrides = hfinal: hprev: { - mkDerivation = args: hprev.mkDerivation (args // { - # Since we are forcing our ideas upon mkDerivation, this change will - # affect every package in the package set. - enableLibraryProfiling = enableProfiling; - - # To actually use profiling on an executable, executable profiling - # needs to be enabled for the executable you want to profile. You - # can either do this globally or… - enableExecutableProfiling = enableProfiling; - }); - - # …only for the package that contains an executable you want to profile. - # That saves on unnecessary rebuilds for packages that you only depend - # on for their library, but also contain executables (e.g. pandoc). - my-executable = haskellLib.enableExecutableProfiling hprev.my-executable; - - # If you are disabling profiling to save on build time, but want to - # retain the ability to substitute from the binary cache. Drop the - # override for mkDerivation above and instead have an override like - # this for the specific packages you are building locally and want - # to make cheaper to build. - my-library = haskellLib.disableLibraryProfiling hprev.my-library; + { + haskell = prev.haskell // { + compiler = prev.haskell.compiler // { + ${ghcName} = prev.haskell.compiler.${ghcName}.override { + # Unfortunately, the GHC setting is named differently for historical reasons + enableProfiledLibs = enableProfiling; }; }; }; - }; - }) + } + ) + + ( + final: prev: + let + inherit (final) lib; + haskellLib = final.haskell.lib.compose; + in + + { + haskell = prev.haskell // { + packages = prev.haskell.packages // { + ${ghcName} = prev.haskell.packages.${ghcName}.override { + overrides = hfinal: hprev: { + mkDerivation = + args: + hprev.mkDerivation ( + args + // { + # Since we are forcing our ideas upon mkDerivation, this change will + # affect every package in the package set. + enableLibraryProfiling = enableProfiling; + + # To actually use profiling on an executable, executable profiling + # needs to be enabled for the executable you want to profile. You + # can either do this globally or… + enableExecutableProfiling = enableProfiling; + } + ); + + # …only for the package that contains an executable you want to profile. + # That saves on unnecessary rebuilds for packages that you only depend + # on for their library, but also contain executables (e.g. pandoc). + my-executable = haskellLib.enableExecutableProfiling hprev.my-executable; + + # If you are disabling profiling to save on build time, but want to + # retain the ability to substitute from the binary cache. Drop the + # override for mkDerivation above and instead have an override like + # this for the specific packages you are building locally and want + # to make cheaper to build. + my-library = haskellLib.disableLibraryProfiling hprev.my-library; + }; + }; + }; + }; + } + ) ] ``` diff --git a/doc/languages-frameworks/hy.section.md b/doc/languages-frameworks/hy.section.md index 49309e4819f5..9eaa7a39fa1e 100644 --- a/doc/languages-frameworks/hy.section.md +++ b/doc/languages-frameworks/hy.section.md @@ -22,10 +22,16 @@ $ nix-shell -p "hy.withPackages (ps: with ps; [ numpy matplotlib ])" Or if you want to extend your `configuration.nix`: ```nix -{ # ... +{ + # ... environment.systemPackages = with pkgs; [ - (hy.withPackages (py-packages: with py-packages; [ numpy matplotlib ])) + (hy.withPackages ( + py-packages: with py-packages; [ + numpy + matplotlib + ] + )) ]; } ``` diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index 0fa828825749..692a6b64d69d 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -12,7 +12,12 @@ This however only provides the `prelude` and `base` libraries. To install idris ```nix self: super: { - myIdris = with self.idrisPackages; with-packages [ contrib pruviloj ]; + myIdris = + with self.idrisPackages; + with-packages [ + contrib + pruviloj + ]; } ``` @@ -68,13 +73,14 @@ prelude As an example of how a Nix expression for an Idris package can be created, here is the one for `idrisPackages.yaml`: ```nix -{ lib -, build-idris-package -, fetchFromGitHub -, contrib -, lightyear +{ + lib, + build-idris-package, + fetchFromGitHub, + contrib, + lightyear, }: -build-idris-package { +build-idris-package { name = "yaml"; version = "2018-01-25"; @@ -84,7 +90,10 @@ build-idris-package { # different from its package name here. ipkgName = "Yaml"; # Idris dependencies to provide for the build - idrisDeps = [ contrib lightyear ]; + idrisDeps = [ + contrib + lightyear + ]; src = fetchFromGitHub { owner = "Heather"; @@ -111,10 +120,10 @@ $ nix-build -E '(import {}).idrisPackages.callPackage ./yaml.nix {}' Or it's possible to use ```nix -with import {}; +with import { }; { - yaml = idrisPackages.callPackage ./yaml.nix {}; + yaml = idrisPackages.callPackage ./yaml.nix { }; } ``` @@ -134,7 +143,11 @@ For example you could set ```nix build-idris-package { - idrisBuildOptions = [ "--log" "1" "--verbose" ]; + idrisBuildOptions = [ + "--log" + "1" + "--verbose" + ]; # ... } diff --git a/doc/languages-frameworks/idris2.section.md b/doc/languages-frameworks/idris2.section.md index 3ea9b4f988f7..6350f44c8c74 100644 --- a/doc/languages-frameworks/idris2.section.md +++ b/doc/languages-frameworks/idris2.section.md @@ -9,39 +9,50 @@ Importantly, `buildIdris` does not create a single derivation but rather an attr A simple example of a fully packaged library would be the [`LSP-lib`](https://github.com/idris-community/LSP-lib) found in the `idris-community` GitHub organization. ```nix { fetchFromGitHub, idris2Packages }: -let lspLibPkg = idris2Packages.buildIdris { - ipkgName = "lsp-lib"; - src = fetchFromGitHub { - owner = "idris-community"; - repo = "LSP-lib"; - rev = "main"; - hash = "sha256-EvSyMCVyiy9jDZMkXQmtwwMoLaem1GsKVFqSGNNHHmY="; +let + lspLibPkg = idris2Packages.buildIdris { + ipkgName = "lsp-lib"; + src = fetchFromGitHub { + owner = "idris-community"; + repo = "LSP-lib"; + rev = "main"; + hash = "sha256-EvSyMCVyiy9jDZMkXQmtwwMoLaem1GsKVFqSGNNHHmY="; + }; + idrisLibraries = [ ]; }; - idrisLibraries = [ ]; -}; -in lspLibPkg.library { withSource = true; } +in +lspLibPkg.library { withSource = true; } ``` The above results in a derivation with the installed library results (with sourcecode). A slightly more involved example of a fully packaged executable would be the [`idris2-lsp`](https://github.com/idris-community/idris2-lsp) which is an Idris2 language server that uses the `LSP-lib` found above. ```nix -{ callPackage, fetchFromGitHub, idris2Packages }: +{ + callPackage, + fetchFromGitHub, + idris2Packages, +}: # Assuming the previous example lives in `lsp-lib.nix`: -let lspLib = callPackage ./lsp-lib.nix { }; - inherit (idris2Packages) idris2Api; - lspPkg = idris2Packages.buildIdris { - ipkgName = "idris2-lsp"; - src = fetchFromGitHub { - owner = "idris-community"; - repo = "idris2-lsp"; - rev = "main"; - hash = "sha256-vQTzEltkx7uelDtXOHc6QRWZ4cSlhhm5ziOqWA+aujk="; - }; - idrisLibraries = [idris2Api lspLib]; +let + lspLib = callPackage ./lsp-lib.nix { }; + inherit (idris2Packages) idris2Api; + lspPkg = idris2Packages.buildIdris { + ipkgName = "idris2-lsp"; + src = fetchFromGitHub { + owner = "idris-community"; + repo = "idris2-lsp"; + rev = "main"; + hash = "sha256-vQTzEltkx7uelDtXOHc6QRWZ4cSlhhm5ziOqWA+aujk="; }; -in lspPkg.executable + idrisLibraries = [ + idris2Api + lspLib + ]; + }; +in +lspPkg.executable ``` The above uses the default value of `withSource = false` for the `idris2Api` but could be modified to include that library's source by passing `(idris2Api { withSource = true; })` to `idrisLibraries` instead. `idris2Api` in the above derivation comes built in with `idris2Packages`. This library exposes many of the otherwise internal APIs of the Idris2 compiler. diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md index 12e54e2a76ab..2624b9afc5e4 100644 --- a/doc/languages-frameworks/index.md +++ b/doc/languages-frameworks/index.md @@ -98,6 +98,7 @@ scheme.section.md swift.section.md tcl.section.md texlive.section.md +typst.section.md vim.section.md neovim.section.md ``` diff --git a/doc/languages-frameworks/ios.section.md b/doc/languages-frameworks/ios.section.md index eb8e2ca55326..3823b097d7a2 100644 --- a/doc/languages-frameworks/ios.section.md +++ b/doc/languages-frameworks/ios.section.md @@ -29,7 +29,7 @@ Xcode. ```nix let - pkgs = import {}; + pkgs = import { }; xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; @@ -63,7 +63,7 @@ executing the `xcodeenv.buildApp {}` function: ```nix let - pkgs = import {}; + pkgs = import { }; xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; @@ -159,7 +159,7 @@ instances: ```nix let - pkgs = import {}; + pkgs = import { }; xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; @@ -193,7 +193,7 @@ app in the requested simulator instance: ```nix let - pkgs = import {}; + pkgs = import { }; xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; diff --git a/doc/languages-frameworks/java.section.md b/doc/languages-frameworks/java.section.md index 5208a6388a32..05203c378ae9 100644 --- a/doc/languages-frameworks/java.section.md +++ b/doc/languages-frameworks/java.section.md @@ -7,7 +7,9 @@ stdenv.mkDerivation { pname = "..."; version = "..."; - src = fetchurl { /* ... */ }; + src = fetchurl { + # ... + }; nativeBuildInputs = [ ant @@ -95,7 +97,7 @@ let something = (pkgs.something.override { jre = my_jre; }); other = (pkgs.other.override { jre = my_jre; }); in - <...> +<...> ``` You can also specify what JDK your JRE should be based on, for example @@ -122,7 +124,10 @@ OpenJDK. For instance, to use the GNU Java Compiler: ```nix { - nativeBuildInputs = [ gcj ant ]; + nativeBuildInputs = [ + gcj + ant + ]; } ``` diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 9acfd4181108..e076984db000 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -117,12 +117,19 @@ After you have identified the correct system, you need to override your package For example, `dat` requires `node-gyp-build`, so we override its expression in [pkgs/development/node-packages/overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/overrides.nix): ```nix - { - dat = prev.dat.override (oldAttrs: { - buildInputs = [ final.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; - meta = oldAttrs.meta // { broken = since "12"; }; - }); - } +{ + dat = prev.dat.override (oldAttrs: { + buildInputs = [ + final.node-gyp-build + pkgs.libtool + pkgs.autoconf + pkgs.automake + ]; + meta = oldAttrs.meta // { + broken = since "12"; + }; + }); +} ``` ### Adding and Updating Javascript packages in nixpkgs {#javascript-adding-or-updating-packages} @@ -185,16 +192,20 @@ It works by utilizing npm's cache functionality -- creating a reproducible cache Here's an example: ```nix -{ lib, buildNpmPackage, fetchFromGitHub }: +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "flood"; version = "4.7.0"; src = fetchFromGitHub { owner = "jesec"; - repo = pname; - rev = "v${version}"; + repo = "flood"; + tag = "v${finalAttrs.version}"; hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM="; }; @@ -211,7 +222,7 @@ buildNpmPackage rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ winter ]; }; -} +}) ``` In the default `installPhase` set by `buildNpmPackage`, it uses `npm pack --json --dry-run` to decide what files to install in `$out/lib/node_modules/$name/`, where `$name` is the `name` string defined in the package's `package.json`. @@ -323,7 +334,9 @@ buildNpmPackage { npmRoot = ./.; fetcherOpts = { # Pass 'curlOptsList' to 'pkgs.fetchurl' while fetching 'axios' - { "node_modules/axios" = { curlOptsList = [ "--verbose" ]; }; } + "node_modules/axios" = { + curlOptsList = [ "--verbose" ]; + }; }; }; @@ -369,6 +382,15 @@ pkgs.mkShell { ``` will create a development shell where a `node_modules` directory is created & packages symlinked to the Nix store when activated. +:::{.note} +Commands like `npm install` & `npm add` that writes packages & executables needs to be used with `--package-lock-only`. + +This means `npm` installs dependencies by writing into `package-lock.json` without modifying the `node_modules` folder. Installation happens through reloading the devShell. +This might be best practice since it gives the `nix shell` virtually exclusive ownership over your `node_modules` folder. + +It's recommended to set `package-lock-only = true` in your project-local [`.npmrc`](https://docs.npmjs.com/cli/v11/configuring-npm/npmrc). +::: + ### corepack {#javascript-corepack} This package puts the corepack wrappers for pnpm and yarn in your PATH, and they will honor the `packageManager` setting in the `package.json`. @@ -403,14 +425,16 @@ When packaging an application that includes a `pnpm-lock.yaml`, you need to fetc stdenv, nodejs, # This is pinned as { pnpm = pnpm_9; } - pnpm + pnpm, }: stdenv.mkDerivation (finalAttrs: { pname = "foo"; version = "0-unstable-1980-01-01"; - src = ...; + src = { + #... + }; nativeBuildInputs = [ nodejs @@ -439,7 +463,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "foo"; version = "0-unstable-1980-01-01"; - src = ...; + src = { + # ... + }; pnpmInstallFlags = [ "--shamefully-hoist" ]; @@ -466,14 +492,16 @@ Assuming the following directory structure, we can define `sourceRoot` and `pnpm ``` ```nix - ... +{ + # ... pnpmDeps = pnpm.fetchDeps { - ... + # ... sourceRoot = "${finalAttrs.src.name}/frontend"; }; # by default the working directory is the extracted source pnpmRoot = "frontend"; +} ``` #### PNPM Workspaces {#javascript-pnpm-workspaces} @@ -484,11 +512,13 @@ which will make PNPM only install dependencies for those workspace packages. For example: ```nix -... -pnpmWorkspaces = [ "@astrojs/language-server" ]; -pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pnpmWorkspaces; - ... +{ + # ... + pnpmWorkspaces = [ "@astrojs/language-server" ]; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pnpmWorkspaces; + #... + }; } ``` @@ -498,13 +528,15 @@ Note that you do not need to set `sourceRoot` to make this work. Usually in such cases, you'd want to use `pnpm --filter= build` to build your project, as `npmHooks.npmBuildHook` probably won't work. A `buildPhase` based on the following example will probably fit most workspace projects: ```nix -buildPhase = '' - runHook preBuild +{ + buildPhase = '' + runHook preBuild - pnpm --filter=@astrojs/language-server build + pnpm --filter=@astrojs/language-server build - runHook postBuild -''; + runHook postBuild + ''; +} ``` #### Additional PNPM Commands and settings {#javascript-pnpm-extraCommands} @@ -513,13 +545,15 @@ If you require setting an additional PNPM configuration setting (such as `dedupe set `prePnpmInstall` to the right commands to run. For example: ```nix -prePnpmInstall = '' - pnpm config set dedupe-peer-dependants false -''; -pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) prePnpmInstall; - ... -}; +{ + prePnpmInstall = '' + pnpm config set dedupe-peer-dependants false + ''; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) prePnpmInstall; + # ... + }; +} ``` In this example, `prePnpmInstall` will be run by both `pnpm.configHook` and by the `pnpm.fetchDeps` builder. @@ -527,7 +561,15 @@ In this example, `prePnpmInstall` will be run by both `pnpm.configHook` and by t ### Yarn {#javascript-yarn} -Yarn based projects use a `yarn.lock` file instead of a `package-lock.json` to pin dependencies. Nixpkgs provides the Nix function `fetchYarnDeps` which fetches an offline cache suitable for running `yarn install` before building the project. In addition, Nixpkgs provides the hooks: +Yarn based projects use a `yarn.lock` file instead of a `package-lock.json` to pin dependencies. + +To package yarn-based applications, you need to distinguish by the version pointers in the `yarn.lock` file. See the following sections. + +#### Yarn v1 {#javascript-yarn-v1} + +Yarn v1 lockfiles contain a comment `# yarn lockfile v1` at the beginning of the file. + +Nixpkgs provides the Nix function `fetchYarnDeps` which fetches an offline cache suitable for running `yarn install` before building the project. In addition, Nixpkgs provides the hooks: - `yarnConfigHook`: Fetches the dependencies from the offline cache and installs them into `node_modules`. - `yarnBuildHook`: Runs `yarn build` or a specified `yarn` command that builds the project. @@ -577,28 +619,28 @@ stdenv.mkDerivation (finalAttrs: { }) ``` -#### `yarnConfigHook` arguments {#javascript-yarnconfighook} +##### `yarnConfigHook` arguments {#javascript-yarnconfighook} By default, `yarnConfigHook` relies upon the attribute `${yarnOfflineCache}` (or `${offlineCache}` if the former is not set) to find the location of the offline cache produced by `fetchYarnDeps`. To disable this phase, you can set `dontYarnInstallDeps = true` or override the `configurePhase`. -#### `yarnBuildHook` arguments {#javascript-yarnbuildhook} +##### `yarnBuildHook` arguments {#javascript-yarnbuildhook} This script by default runs `yarn --offline build`, and it relies upon the project's dependencies installed at `node_modules`. Below is a list of additional `mkDerivation` arguments read by this hook: - `yarnBuildScript`: Sets a different `yarn --offline` subcommand (defaults to `build`). - `yarnBuildFlags`: Single string list of additional flags to pass the above command, or a Nix list of such additional flags. -#### `yarnInstallHook` arguments {#javascript-yarninstallhook} +##### `yarnInstallHook` arguments {#javascript-yarninstallhook} To install the package `yarnInstallHook` uses both `npm` and `yarn` to cleanup project files and dependencies. To disable this phase, you can set `dontYarnInstall = true` or override the `installPhase`. Below is a list of additional `mkDerivation` arguments read by this hook: - `yarnKeepDevDeps`: Disables the removal of devDependencies from `node_modules` before installation. -### yarn2nix {#javascript-yarn2nix} +#### yarn2nix {#javascript-yarn2nix} -WARNING: The `yarn2nix` functions have been deprecated in favor of the new `yarnConfigHook`, `yarnBuildHook` and `yarnInstallHook`. Documentation for them still appears here for the sake of the packages that still use them. See also a tracking issue [#324246](https://github.com/NixOS/nixpkgs/issues/324246). +WARNING: The `yarn2nix` functions have been deprecated in favor of `yarnConfigHook`, `yarnBuildHook` and `yarnInstallHook` (for Yarn v1) and `yarn-berry_*.*` tooling (Yarn v3 and v4). Documentation for `yarn2nix` functions still appears here for the sake of the packages that still use them. See also a tracking issue [#324246](https://github.com/NixOS/nixpkgs/issues/324246). -#### Preparation {#javascript-yarn2nix-preparation} +##### Preparation {#javascript-yarn2nix-preparation} You will need at least a `yarn.lock` file. If upstream does not have one you need to generate it and reference it in your package definition. @@ -613,7 +655,7 @@ If the downloaded files contain the `package.json` and `yarn.lock` files they ca } ``` -#### mkYarnPackage {#javascript-yarn2nix-mkYarnPackage} +##### mkYarnPackage {#javascript-yarn2nix-mkYarnPackage} `mkYarnPackage` will by default try to generate a binary. For package only generating static assets (Svelte, Vue, React, WebPack, ...), you will need to explicitly override the build step with your instructions. @@ -621,9 +663,16 @@ It's important to use the `--offline` flag. For example if you script is `"build ```nix { + nativeBuildInputs = [ + writableTmpDirAsHomeHook + ]; + buildPhase = '' - export HOME=$(mktemp -d) + runHook preBuild + yarn --offline build + + runHook postBuild ''; } ``` @@ -657,7 +706,7 @@ or if you need a writeable node_modules directory: } ``` -#### mkYarnModules {#javascript-yarn2nix-mkYarnModules} +##### mkYarnModules {#javascript-yarn2nix-mkYarnModules} This will generate a derivation including the `node_modules` directory. If you have to build a derivation for an integrated web framework (rails, phoenix..), this is probably the easiest way. @@ -678,7 +727,11 @@ To fix this we will specify different versions of build inputs to use, as well a mkYarnPackage rec { pkgConfig = { node-sass = { - buildInputs = with final;[ python libsass pkg-config ]; + buildInputs = with final; [ + python + libsass + pkg-config + ]; postInstall = '' LIBSASS_EXT=auto yarn --offline run build rm build/config.gypi @@ -688,7 +741,7 @@ mkYarnPackage rec { } ``` -#### Pitfalls {#javascript-yarn2nix-pitfalls} +##### Pitfalls {#javascript-yarn2nix-pitfalls} - If version is missing from upstream package.json, yarn will silently install nothing. In that case, you will need to override package.json as shown in the [package.json section](#javascript-upstream-package-json) - Having trouble with `node-gyp`? Try adding these lines to the `yarnPreBuild` steps: @@ -708,6 +761,116 @@ mkYarnPackage rec { - Exporting the headers in `npm_config_nodedir` comes from this issue: - `offlineCache` (described [above](#javascript-yarn2nix-preparation)) must be specified to avoid [Import From Derivation](#ssec-import-from-derivation) (IFD) when used inside Nixpkgs. +#### Yarn Berry v3/v4 {#javascript-yarn-v3-v4} +Yarn Berry (v3 / v4) have similar formats, they start with blocks like these: + +```yaml +__metadata: + version: 6 + cacheKey: 8[cX] +``` + +```yaml +__metadata: + version: 8 + cacheKey: 10[cX] +``` + +For these packages, we have some helpers exposed under the respective `yarn-berry_3` and `yarn-berry_4` packages: + +- `yarn-berry-fetcher` +- `fetchYarnBerryDeps` +- `yarnBerryConfigHook` + +It's recommended to ensure you're explicitly pinning the major version used, for example by capturing the `yarn-berry_Xn` argument and then re-defining it as a `yarn-berry` `let` binding. + +```nix +{ + stdenv, + nodejs, + yarn-berry_4, +}: + +let + yarn-berry = yarn-berry_4; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "foo"; + version = "0-unstable-1980-01-01"; + + src = { + #... + }; + + nativeBuildInputs = [ + nodejs + yarn-berry.yarnBerryConfigHook + ]; + + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src; + hash = "..."; + }; +}) +``` + +##### `yarn-berry_X.fetchYarnBerryDeps` {#javascript-fetchYarnBerryDeps} +`fetchYarnBerryDeps` runs `yarn-berry-fetcher fetch` in a fixed-output-derivation. It is a custom fetcher designed to reproducibly download all files in the `yarn.lock` file, validating their hashes in the process. For git dependencies, it creates a checkout at `${offlineCache}/checkouts/<40-character-commit-hash>` (relying on the git commit hash to describe the contents of the checkout). + +To produce the `hash` argument for `fetchYarnBerryDeps` function call, the `yarn-berry-fetcher prefetch` command can be used: + +```console +$ yarn-berry-fetcher prefetch [/path/to/missing-hashes.json] +``` + +This prints the hash to stdout and can be used in update scripts to recalculate the hash for a new version of `yarn.lock`. + +##### `yarn-berry_X.yarnBerryConfigHook` {#javascript-yarnBerryConfigHook} +`yarnBerryConfigHook` uses the store path `offlineCache` points to, to run a `yarn install` during the build, producing a usable `node_modules` directory from the downloaded dependencies. + +Internally, this uses a patched version of Yarn to ensure git dependencies are re-packed and any attempted downloads fail immediately. + +##### Patching upstream `package.json` or `yarn.lock` files {#javascript-yarnBerry-patching} +In case patching the upstream `package.json` or `yarn.lock` is needed, it's important to pass `finalAttrs.patches` to `fetchYarnBerryDeps` as well, so the patched variants are picked up (i.e. `inherit (finalAttrs) patches`. + +##### Missing hashes in the `yarn.lock` file {#javascript-yarnBerry-missing-hashes} +Unfortunately, `yarn.lock` files do not include hashes for optional/platform-specific dependencies. This is [by design](https://github.com/yarnpkg/berry/issues/6759). + +To compensate for this, the `yarn-berry-fetcher missing-hashes` subcommand can be used to produce all missing hashes. These are usually stored in a `missing-hashes.json` file, which needs to be passed to both the build itself, as well as the `fetchYarnBerryDeps` helper: + +```nix +{ + stdenv, + nodejs, + yarn-berry_4, +}: + +let + yarn-berry = yarn-berry_4; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "foo"; + version = "0-unstable-1980-01-01"; + + src = { + #... + }; + + nativeBuildInputs = [ + nodejs + yarn-berry.yarnBerryConfigHook + ]; + + missingHashes = ./missing-hashes.json; + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src missingHashes; + hash = "..."; + }; +}) +``` + ## Outside Nixpkgs {#javascript-outside-nixpkgs} There are some other tools available, which are written in the Nix language. diff --git a/doc/languages-frameworks/julia.section.md b/doc/languages-frameworks/julia.section.md index 4e7d9d365a39..c0b7fd8d6618 100644 --- a/doc/languages-frameworks/julia.section.md +++ b/doc/languages-frameworks/julia.section.md @@ -19,7 +19,7 @@ This function accepts a list of strings representing Julia package names. For example, you can build a Julia environment with the `Plots` package as follows. ```nix -julia.withPackages ["Plots"] +julia.withPackages [ "Plots" ] ``` Arguments can be passed using `.override`. @@ -28,7 +28,8 @@ For example: ```nix (julia.withPackages.override { precompile = false; # Turn off precompilation -}) ["Plots"] +}) + [ "Plots" ] ``` Here's a nice way to run a Julia environment with a shell one-liner: diff --git a/doc/languages-frameworks/lisp.section.md b/doc/languages-frameworks/lisp.section.md index 73f20436c76f..7f6fe99419bd 100644 --- a/doc/languages-frameworks/lisp.section.md +++ b/doc/languages-frameworks/lisp.section.md @@ -48,7 +48,8 @@ Also one can create a `pkgs.mkShell` environment in `shell.nix`/`flake.nix`: ```nix let sbcl' = sbcl.withPackages (ps: [ ps.alexandria ]); -in mkShell { +in +mkShell { packages = [ sbcl' ]; } ``` @@ -134,7 +135,6 @@ During Quicklisp import: - names starting with a number have a `_` prepended (`3d-vectors`->`_3d-vectors`) - `_` in names is converted to `__` for reversibility - ## Defining packages manually inside Nixpkgs {#lisp-defining-packages-inside} Packages that for some reason are not in Quicklisp, and so cannot be @@ -184,14 +184,17 @@ let domain = "gitlab.common-lisp.net"; owner = "alexandria"; repo = "alexandria"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-1Hzxt65dZvgOFIljjjlSGgKYkj+YBLwJCACi5DZsKmQ="; }; }; - sbcl' = sbcl.withOverrides (self: super: { - inherit alexandria; - }); -in sbcl'.pkgs.alexandria + sbcl' = sbcl.withOverrides ( + self: super: { + inherit alexandria; + } + ); +in +sbcl'.pkgs.alexandria ``` ## Overriding package attributes {#lisp-overriding-package-attributes} @@ -208,7 +211,7 @@ sbcl.pkgs.alexandria.overrideLispAttrs (oldAttrs: rec { domain = "gitlab.common-lisp.net"; owner = "alexandria"; repo = "alexandria"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-1Hzxt65dZvgOFIljjjlSGgKYkj+YBLwJCACi5DZsKmQ="; }; }) @@ -296,6 +299,9 @@ This example wraps CLISP: wrapLisp { pkg = clisp; faslExt = "fas"; - flags = ["-E" "UTF8"]; + flags = [ + "-E" + "UTF8" + ]; } ``` diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index 87bf7ce885bc..84af997df860 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -27,9 +27,14 @@ Note that nixpkgs patches the non-luajit interpreters to avoid referring to Create a file, e.g. `build.nix`, with the following expression ```nix -with import {}; +with import { }; -lua5_2.withPackages (ps: with ps; [ busted luafilesystem ]) +lua5_2.withPackages ( + ps: with ps; [ + busted + luafilesystem + ] +) ``` and install it in your profile with @@ -46,11 +51,18 @@ If you prefer to, you could also add the environment as a package override to th using `config.nix`, ```nix -{ # ... +{ + # ... - packageOverrides = pkgs: with pkgs; { - myLuaEnv = lua5_2.withPackages (ps: with ps; [ busted luafilesystem ]); - }; + packageOverrides = + pkgs: with pkgs; { + myLuaEnv = lua5_2.withPackages ( + ps: with ps; [ + busted + luafilesystem + ] + ); + }; } ``` @@ -67,10 +79,16 @@ the `nixpkgs` channel was used. For the sake of completeness, here's another example how to install the environment system-wide. ```nix -{ # ... +{ + # ... environment.systemPackages = with pkgs; [ - (lua.withPackages(ps: with ps; [ busted luafilesystem ])) + (lua.withPackages ( + ps: with ps; [ + busted + luafilesystem + ] + )) ]; } ``` @@ -80,13 +98,12 @@ For the sake of completeness, here's another example how to install the environm Use the following overlay template: ```nix -final: prev: -{ +final: prev: { lua = prev.lua.override { packageOverrides = luaself: luaprev: { - luarocks-nix = luaprev.luarocks-nix.overrideAttrs(oa: { + luarocks-nix = luaprev.luarocks-nix.overrideAttrs (oa: { pname = "luarocks-nix"; src = /home/my_luarocks/repository; }); @@ -159,7 +176,11 @@ within a `toLuaModule` call, for instance ```nix { - mynewlib = toLuaModule ( stdenv.mkDerivation { /* ... */ }); + mynewlib = toLuaModule ( + stdenv.mkDerivation { + # ... + } + ); } ``` @@ -194,16 +215,23 @@ The following is an example: version = "34.0.4-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock"; hash = "sha256-4mLJG8n4m6y4Fqd0meUDfsOb9RHSR0qa/KD5KCwrNXs="; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ bit32 lua std_normalize ]; + propagatedBuildInputs = [ + bit32 + lua + std_normalize + ]; meta = { homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; - maintainers = with lib.maintainers; [ vyp lblasc ]; + maintainers = with lib.maintainers; [ + vyp + lblasc + ]; license.fullName = "MIT/X11"; }; }; @@ -242,14 +270,14 @@ The `lua.withPackages` takes a function as an argument that is passed the set of Using the `withPackages` function, the previous example for the luafilesystem environment can be written like this: ```nix -lua.withPackages (ps: [ps.luafilesystem]) +lua.withPackages (ps: [ ps.luafilesystem ]) ``` `withPackages` passes the correct package set for the specific interpreter version as an argument to the function. In the above example, `ps` equals `luaPackages`. But you can also easily switch to using `lua5_1`: ```nix -lua5_1.withPackages (ps: [ps.lua]) +lua5_1.withPackages (ps: [ ps.lua ]) ``` Now, `ps` is set to `lua5_1.pkgs`, matching the version of the interpreter. diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index 88fe4d0c9224..d70501651f26 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -9,7 +9,13 @@ The following provides a list of common patterns with how to package a Maven pro Consider the following package: ```nix -{ lib, fetchFromGitHub, jre, makeWrapper, maven }: +{ + lib, + fetchFromGitHub, + jre, + makeWrapper, + maven, +}: maven.buildMavenPackage rec { pname = "jd-cli"; @@ -17,8 +23,8 @@ maven.buildMavenPackage rec { src = fetchFromGitHub { owner = "intoolswetrust"; - repo = pname; - rev = "${pname}-${version}"; + repo = "jd-cli"; + tag = "jd-cli-${version}"; hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q="; }; @@ -27,11 +33,15 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/jd-cli install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli makeWrapper ${jre}/bin/java $out/bin/jd-cli \ --add-flags "-jar $out/share/jd-cli/jd-cli.jar" + + runHook postInstall ''; meta = { @@ -91,7 +101,7 @@ jd-cli.overrideMavenAttrs (old: rec { # old mvnHash of 1.2.0 maven dependencies mvnHash = "sha256-N9XC1pg6Y4sUiBWIQUf16QSXCuiAPpXEHGlgApviF4I="; -}); +}) ``` ::: @@ -129,7 +139,7 @@ maven.buildMavenPackage rec { "org.apache.maven.surefire:surefire-junit-platform:3.1.2" "org.junit.platform:junit-platform-launcher:1.10.0" ]; -}; +} ``` ::: @@ -246,7 +256,9 @@ This file is then given to the `buildMaven` function, and it returns 2 attribute Here is an [example](https://github.com/fzakaria/nixos-maven-example/blob/main/build-maven-repository.nix) of building the Maven repository ```nix -{ pkgs ? import { } }: +{ + pkgs ? import { }, +}: with pkgs; (buildMaven ./project-info.json).repo ``` @@ -283,22 +295,34 @@ Traditionally the Maven repository is at `~/.m2/repository`. We will override th ::: ```nix -{ lib, stdenv, maven }: +{ + lib, + stdenv, + maven, +}: stdenv.mkDerivation { name = "maven-repository"; buildInputs = [ maven ]; src = ./.; # or fetchFromGitHub, cleanSourceWith, etc buildPhase = '' + runHook preBuild + mvn package -Dmaven.repo.local=$out + + runHook postBuild ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside installPhase = '' + runHook preInstall + find $out -type f \ -name \*.lastUpdated -or \ -name resolver-status.properties -or \ -name _remote.repositories \ -delete + + runHook postInstall ''; # don't do any fixup @@ -337,10 +361,16 @@ If your package uses _SNAPSHOT_ dependencies or _version ranges_; there is a str Regardless of which strategy is chosen above, the step to build the derivation is the same. ```nix -{ stdenv, maven, callPackage }: -# pick a repository derivation, here we will use buildMaven -let repository = callPackage ./build-maven-repository.nix { }; -in stdenv.mkDerivation rec { +{ + stdenv, + maven, + callPackage, +}: +let + # pick a repository derivation, here we will use buildMaven + repository = callPackage ./build-maven-repository.nix { }; +in +stdenv.mkDerivation (finalAttrs: { pname = "maven-demo"; version = "1.0"; @@ -348,14 +378,22 @@ in stdenv.mkDerivation rec { buildInputs = [ maven ]; buildPhase = '' + runHook preBuild + echo "Using repository ${repository}" mvn --offline -Dmaven.repo.local=${repository} package; + + runHook postBuild ''; installPhase = '' - install -Dm644 target/${pname}-${version}.jar $out/share/java + runHook preInstall + + install -Dm644 target/${finalAttrs.pname}-${finalAttrs.version}.jar $out/share/java + + runHook postInstall ''; -} +}) ``` ::: {.tip} @@ -393,35 +431,49 @@ We will read the Maven repository and flatten it to a single list. This list wil We make sure to provide this classpath to the `makeWrapper`. ```nix -{ stdenv, maven, callPackage, makeWrapper, jre }: +{ + stdenv, + maven, + callPackage, + makeWrapper, + jre, +}: let repository = callPackage ./build-maven-repository.nix { }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation (finalAttrs: { pname = "maven-demo"; version = "1.0"; - src = builtins.fetchTarball - "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; + src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ maven ]; buildPhase = '' + runHook preBuild + echo "Using repository ${repository}" mvn --offline -Dmaven.repo.local=${repository} package; + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin classpath=$(find ${repository} -name "*.jar" -printf ':%h/%f'); - install -Dm644 target/${pname}-${version}.jar $out/share/java + install -Dm644 target/maven-demo-${finalAttrs.version}.jar $out/share/java # create a wrapper that will automatically set the classpath # this should be the paths from the dependency derivation - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \ + makeWrapper ${jre}/bin/java $out/bin/maven-demo \ + --add-flags "-classpath $out/share/java/maven-demo-${finalAttrs.version}.jar:''${classpath#:}" \ --add-flags "Main" + + runHook postInstall ''; -} +}) ``` #### MANIFEST file via Maven Plugin {#manifest-file-via-maven-plugin} @@ -471,36 +523,51 @@ Main-Class: Main We will modify the derivation above to add a symlink to our repository so that it's accessible to our JAR during the `installPhase`. ```nix -{ stdenv, maven, callPackage, makeWrapper, jre }: -# pick a repository derivation, here we will use buildMaven -let repository = callPackage ./build-maven-repository.nix { }; -in stdenv.mkDerivation rec { +{ + stdenv, + maven, + callPackage, + makeWrapper, + jre, +}: +let + # pick a repository derivation, here we will use buildMaven + repository = callPackage ./build-maven-repository.nix { }; +in +stdenv.mkDerivation (finalAttrs: { pname = "maven-demo"; version = "1.0"; - src = builtins.fetchTarball - "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; + src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ maven ]; buildPhase = '' + runHook preBuild + echo "Using repository ${repository}" mvn --offline -Dmaven.repo.local=${repository} package; + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin # create a symbolic link for the repository directory ln -s ${repository} $out/repository - install -Dm644 target/${pname}-${version}.jar $out/share/java + install -Dm644 target/maven-demo-${finalAttrs.version}.jar $out/share/java # create a wrapper that will automatically set the classpath # this should be the paths from the dependency derivation - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-jar $out/share/java/${pname}-${version}.jar" + makeWrapper ${jre}/bin/java $out/bin/maven-demo \ + --add-flags "-jar $out/share/java/maven-demo-${finalAttrs.version}.jar" + + runHook postInstall ''; -} +}) ``` ::: {.note} Our script produces a dependency on `jre` rather than `jdk` to restrict the runtime closure necessary to run the application. diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md index 111fb77c8bd2..b7c77b91734c 100644 --- a/doc/languages-frameworks/neovim.section.md +++ b/doc/languages-frameworks/neovim.section.md @@ -63,7 +63,7 @@ For instance, `sqlite-lua` needs `g:sqlite_clib_path` to be set to work. Nixpkgs - `plugins`: A list of plugins to add to the wrapper. ``` -wrapNeovimUnstable { +wrapNeovimUnstable neovim-unwrapped { autoconfigure = true; autowrapRuntimeDeps = true; luaRcContent = '' @@ -91,8 +91,8 @@ wrapNeovimUnstable { You can explore the configuration with`nix repl` to discover these options and override them. For instance: ```nix -neovim.overrideAttrs(oldAttrs: { - autowrapRuntimeDeps = false; +neovim.overrideAttrs (oldAttrs: { + autowrapRuntimeDeps = false; }) ``` @@ -105,10 +105,10 @@ patch those plugins but expose the necessary configuration under `PLUGIN.passthru.initLua` for neovim plugins. For instance, the `unicode-vim` plugin needs the path towards a unicode database so we expose the following snippet `vim.g.Unicode_data_directory="${self.unicode-vim}/autoload/unicode"` under `vimPlugins.unicode-vim.passthru.initLua`. -#### {#neovim-luarocks-based-plugins} +#### LuaRocks based plugins {#neovim-luarocks-based-plugins} In order to automatically handle plugin dependencies, several neovim plugins -upload their package to [](www.luarocks.org). This means less work for nixpkgs maintainers in the long term as dependencies get updated automatically. +upload their package to [LuaRocks](https://www.luarocks.org). This means less work for nixpkgs maintainers in the long term as dependencies get updated automatically. This means several neovim plugins are first packaged as nixpkgs [lua packages](#packaging-a-library-on-luarocks), and converted via `buildNeovimPlugin` in a vim plugin. This conversion is necessary because neovim expects lua folders to be @@ -116,9 +116,11 @@ top-level while luarocks installs them in various subfolders by default. For instance: ```nix -rtp-nvim = neovimUtils.buildNeovimPlugin { +{ + rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rtp-nvim; -}; + }; +} ``` To update these packages, you should use the lua updater rather than vim's. @@ -164,16 +166,19 @@ The check hook will fail the build if any modules cannot be loaded. This encoura To only check a specific module, add it manually to the plugin definition [overrides](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). ```nix +{ gitsigns-nvim = super.gitsigns-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; nvimRequireCheck = "gitsigns"; }; +} ``` Some plugins will have lua modules that require a user configuration to function properly or can contain optional lua modules that we dont want to test requiring. We can skip specific modules using `nvimSkipModules`. Similar to `nvimRequireCheck`, it accepts a list of strings. - `nvimSkipModules = [ MODULE1 MODULE2 ];` ```nix +{ asyncrun-vim = super.asyncrun-vim.overrideAttrs { nvimSkipModules = [ # vim plugin with optional toggleterm integration @@ -181,14 +186,17 @@ We can skip specific modules using `nvimSkipModules`. Similar to `nvimRequireChe "asyncrun.toggleterm2" ]; }; +} ``` In rare cases, we might not want to actually test loading lua modules for a plugin. In those cases, we can disable `neovimRequireCheck` with `doCheck = false;`. This can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). ```nix +{ vim-test = super.vim-test.overrideAttrs { # Vim plugin with a test lua file doCheck = false; }; +} ``` diff --git a/doc/languages-frameworks/nim.section.md b/doc/languages-frameworks/nim.section.md index f0196c9d116f..ef3ecbba7d74 100644 --- a/doc/languages-frameworks/nim.section.md +++ b/doc/languages-frameworks/nim.section.md @@ -7,7 +7,11 @@ Nim programs are built using a lockfile and either `buildNimPackage` or `buildNi The following example shows a Nim program that depends only on Nim libraries: ```nix -{ lib, buildNimPackage, fetchFromGitHub }: +{ + lib, + buildNimPackage, + fetchFromGitHub, +}: buildNimPackage (finalAttrs: { pname = "ttop"; @@ -91,7 +95,9 @@ The `buildNimPackage` and `buildNimSbom` functions generate flags and additional ```nix pkgs.nitter.overrideNimAttrs { # using a different source which has different dependencies from the standard package - src = pkgs.fetchFromGithub { /* … */ }; + src = pkgs.fetchFromGithub { + # … + }; # new lock file generated from the source lockFile = ./custom-lock.json; } @@ -104,21 +110,25 @@ The default overrides are maintained as the top-level `nimOverrides` attrset at For example, to propagate a dependency on SDL2 for lockfiles that select the Nim `sdl2` library, an overlay is added to the set in the `nim-overrides.nix` file: ```nix -{ lib -/* … */ -, SDL2 -/* … */ +{ + lib, + # … + SDL2, +# … }: { - /* … */ + # … sdl2 = lockAttrs: - { buildInputs ? [ ], ... }: + { + buildInputs ? [ ], + ... + }: { buildInputs = buildInputs ++ [ SDL2 ]; }; - /* … */ + # … } ``` @@ -132,22 +142,28 @@ The `nimOverrides` attrset makes it possible to modify overrides in a few differ Override a package internal to its definition: ```nix -{ lib, buildNimPackage, nimOverrides, libressl }: +{ + lib, + buildNimPackage, + nimOverrides, + libressl, +}: let buildNimPackage' = buildNimPackage.override { nimOverrides = nimOverrides.override { openssl = libressl; }; }; -in buildNimPackage' (finalAttrs: { +in +buildNimPackage' (finalAttrs: { pname = "foo"; # … }) - ``` Override a package externally: ```nix -{ pkgs }: { +{ pkgs }: +{ foo = pkgs.foo.override { buildNimPackage = pkgs.buildNimPackage.override { nimOverrides = pkgs.nimOverrides.override { openssl = libressl; }; diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 7f2c2a63a00b..62a54640b2fb 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -12,13 +12,18 @@ To open a shell able to build a typical OCaml project, put the dependencies in ` For example: ```nix let - pkgs = import {}; - # choose the ocaml version you want to use - ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_12; + pkgs = import { }; + # choose the ocaml version you want to use + ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_12; in pkgs.mkShell { # build tools - nativeBuildInputs = with ocamlPackages; [ ocaml findlib dune_2 ocaml-lsp ]; + nativeBuildInputs = with ocamlPackages; [ + ocaml + findlib + dune_2 + ocaml-lsp + ]; # dependencies buildInputs = with ocamlPackages; [ ocamlgraph ]; } @@ -58,7 +63,8 @@ Here is a simple package example. generates. ```nix -{ lib, +{ + lib, fetchFromGitHub, buildDunePackage, ocaml, @@ -66,7 +72,8 @@ Here is a simple package example. alcotest, result, bigstringaf, - ppx_let }: + ppx_let, +}: buildDunePackage rec { pname = "angstrom"; @@ -75,15 +82,21 @@ buildDunePackage rec { minimalOCamlVersion = "4.04"; src = fetchFromGitHub { - owner = "inhabitedtype"; - repo = pname; - rev = version; - hash = "sha256-MK8o+iPGANEhrrTc1Kz9LBilx2bDPQt7Pp5P2libucI="; + owner = "inhabitedtype"; + repo = "angstrom"; + tag = version; + hash = "sha256-MK8o+iPGANEhrrTc1Kz9LBilx2bDPQt7Pp5P2libucI="; }; - checkInputs = [ alcotest ppx_let ]; + checkInputs = [ + alcotest + ppx_let + ]; buildInputs = [ ocaml-syntax-shims ]; - propagatedBuildInputs = [ bigstringaf result ]; + propagatedBuildInputs = [ + bigstringaf + result + ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { @@ -98,7 +111,11 @@ buildDunePackage rec { Here is a second example, this time using a source archive generated with `dune-release`. It is a good idea to use this archive when it is available as it will usually contain substituted variables such as a `%%VERSION%%` field. This library does not depend on any other OCaml library and no tests are run after building it. ```nix -{ lib, fetchurl, buildDunePackage }: +{ + lib, + fetchurl, + buildDunePackage, +}: buildDunePackage rec { pname = "wtf8"; @@ -107,7 +124,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.02"; src = fetchurl { - url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + url = "https://github.com/flowtype/ocaml-wtf8/releases/download/v${version}/wtf8-v${version}.tbz"; hash = "sha256-d5/3KUBAWRj8tntr4RkJ74KWW7wvn/B/m1nx0npnzyc="; }; diff --git a/doc/languages-frameworks/octave.section.md b/doc/languages-frameworks/octave.section.md index 4ad2cb0d5fbf..858dd611198f 100644 --- a/doc/languages-frameworks/octave.section.md +++ b/doc/languages-frameworks/octave.section.md @@ -3,7 +3,7 @@ ## Introduction {#ssec-octave-introduction} Octave is a modular scientific programming language and environment. -A majority of the packages supported by Octave from their [website](https://octave.sourceforge.io/packages.php) are packaged in nixpkgs. +A majority of the packages supported by Octave from their [website](https://gnu-octave.github.io/packages/) are packaged in nixpkgs. ## Structure {#ssec-octave-structure} @@ -39,7 +39,9 @@ $ nix-shell -p 'octave.withPackages (ps: with ps; [ symbolic ])' This will also work in a `shell.nix` file. ```nix -{ pkgs ? import { }}: +{ + pkgs ? import { }, +}: pkgs.mkShell { nativeBuildInputs = with pkgs; [ diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md index 843d46584cdd..50fc4945ff76 100644 --- a/doc/languages-frameworks/perl.section.md +++ b/doc/languages-frameworks/perl.section.md @@ -39,7 +39,7 @@ Perl packages from CPAN are defined in [pkgs/top-level/perl-packages.nix](https: pname = "Class-C3"; version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/F/FL/FLORA/Class-C3-${version}.tar.gz"; hash = "sha256-/5GE5xHT0uYGOQxroqj6LMU7CtKn2s6vMVoSXxL4iK4="; }; }; @@ -51,7 +51,10 @@ Note the use of `mirror://cpan/`, and the `pname` and `version` in the URL defin ```nix { foo = import ../path/to/foo.nix { - inherit stdenv fetchurl /* ... */; + inherit + stdenv + fetchurl # ... + ; inherit (perlPackages) ClassC3; }; } @@ -74,14 +77,18 @@ So what does `buildPerlPackage` do? It does the following: `buildPerlPackage` is built on top of `stdenv`, so everything can be customised in the usual way. For instance, the `BerkeleyDB` module has a `preConfigure` hook to generate a configuration file used by `Makefile.PL`: ```nix -{ buildPerlPackage, fetchurl, db }: +{ + buildPerlPackage, + fetchurl, + db, +}: buildPerlPackage rec { pname = "BerkeleyDB"; version = "0.36"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-${version}.tar.gz"; hash = "sha256-4Y+HGgGQqcOfdiKcFIyMrWBEccVNVAMDBWZlFTMorh8="; }; @@ -100,11 +107,14 @@ Dependencies on other Perl packages can be specified in the `buildInputs` and `p pname = "Class-C3-Componentised"; version = "1.0004"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AS/ASH/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/A/AS/ASH/Class-C3-Componentised-${version}.tar.gz"; hash = "sha256-ASO9rV/FzJYZ0BH572Fxm2ZrFLMZLFATJng1NuU4FHc="; }; propagatedBuildInputs = [ - ClassC3 ClassInspector TestException MROCompat + ClassC3 + ClassInspector + TestException + MROCompat ]; }; } @@ -113,7 +123,13 @@ Dependencies on other Perl packages can be specified in the `buildInputs` and `p On Darwin, if a script has too many `-Idir` flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the `shortenPerlShebang` function from the `postInstall` phase: ```nix -{ lib, stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: +{ + lib, + stdenv, + buildPerlPackage, + fetchurl, + shortenPerlShebang, +}: { ImageExifTool = buildPerlPackage { @@ -121,7 +137,7 @@ On Darwin, if a script has too many `-Idir` flags in its first line (its “sheb version = "12.50"; src = fetchurl { - url = "https://exiftool.org/${pname}-${version}.tar.gz"; + url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; hash = "sha256-vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg="; }; diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 1bcb4ee727a5..ce97da872677 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -45,24 +45,30 @@ extensions. For example, a PHP package with all default extensions and ImageMagick enabled: ```nix -php.withExtensions ({ enabled, all }: - enabled ++ [ all.imagick ]) +php.withExtensions ({ enabled, all }: enabled ++ [ all.imagick ]) ``` To exclude some, but not all, of the default extensions, you can filter the `enabled` list like this: ```nix -php.withExtensions ({ enabled, all }: - (lib.filter (e: e != php.extensions.opcache) enabled) - ++ [ all.imagick ]) +php.withExtensions ( + { enabled, all }: (lib.filter (e: e != php.extensions.opcache) enabled) ++ [ all.imagick ] +) ``` To build your list of extensions from the ground up, you can ignore `enabled`: ```nix -php.withExtensions ({ all, ... }: with all; [ imagick opcache ]) +php.withExtensions ( + { all, ... }: + with all; + [ + imagick + opcache + ] +) ``` `php.withExtensions` provides extensions by wrapping a minimal php @@ -82,7 +88,13 @@ and ImageMagick extensions enabled, and `memory_limit` set to `256M`: ```nix php.buildEnv { - extensions = { all, ... }: with all; [ imagick opcache ]; + extensions = + { all, ... }: + with all; + [ + imagick + opcache + ]; extraConfig = "memory_limit=256M"; } ``` @@ -94,8 +106,16 @@ follows: ```nix let - myPhp = php.withExtensions ({ all, ... }: with all; [ imagick opcache ]); -in { + myPhp = php.withExtensions ( + { all, ... }: + with all; + [ + imagick + opcache + ] + ); +in +{ services.phpfpm.pools."foo".phpPackage = myPhp; } ``` @@ -103,10 +123,17 @@ in { ```nix let myPhp = php.buildEnv { - extensions = { all, ... }: with all; [ imagick opcache ]; + extensions = + { all, ... }: + with all; + [ + imagick + opcache + ]; extraConfig = "memory_limit=256M"; }; -in { +in +{ services.phpfpm.pools."foo".phpPackage = myPhp; } ``` @@ -132,9 +159,14 @@ won't work with that project unless those extensions are loaded. Example of building `composer` with additional extensions: ```nix -(php.withExtensions ({ all, enabled }: - enabled ++ (with all; [ imagick redis ])) -).packages.composer +(php.withExtensions ( + { all, enabled }: + enabled + ++ (with all; [ + imagick + redis + ]) +)).packages.composer ``` ### Overriding PHP packages {#ssec-php-user-guide-overriding-packages} @@ -148,7 +180,7 @@ php.override { packageOverrides = final: prev: { extensions = prev.extensions // { mysqlnd = prev.extensions.mysqlnd.overrideAttrs (attrs: { - patches = attrs.patches or [] ++ [ + patches = attrs.patches or [ ] ++ [ # ... ]; }); @@ -182,7 +214,7 @@ code, while others choose not to. In Nix, there are multiple approaches to building a Composer-based project. -One such method is the `php.buildComposerProject` helper function, which serves +One such method is the `php.buildComposerProject2` helper function, which serves as a wrapper around `mkDerivation`. Using this function, you can build a PHP project that includes both a @@ -217,27 +249,31 @@ To customize the PHP version, you can specify the `php` attribute. Similarly, if you wish to modify the Composer version, use the `composer` attribute. It is important to note that both attributes should be of the `derivation` type. -Here's an example of working code example using `php.buildComposerProject`: +Here's an example of working code example using `php.buildComposerProject2`: ```nix { php, fetchFromGitHub }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "php-app"; version = "1.0.0"; src = fetchFromGitHub { owner = "git-owner"; repo = "git-repo"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-VcQRSss2dssfkJ+iUb5qT+FJ10GHiFDzySigcmuVI+8="; }; # PHP version containing the `ast` extension enabled php = php.buildEnv { - extensions = ({ enabled, all }: enabled ++ (with all; [ - ast - ])); + extensions = ( + { enabled, all }: + enabled + ++ (with all; [ + ast + ]) + ); }; # The composer vendor hash @@ -259,38 +295,45 @@ Here's a working code example to build a PHP library using `mkDerivation` and separate functions and hooks: ```nix -{ stdenvNoCC, fetchFromGitHub, php }: +{ + stdenvNoCC, + fetchFromGitHub, + php, +}: -stdenvNoCC.mkDerivation (finalAttrs: -let - src = fetchFromGitHub { - owner = "git-owner"; - repo = "git-repo"; - rev = finalAttrs.version; - hash = "sha256-VcQRSss2dssfkJ+iUb5qT+FJ10GHiFDzySigcmuVI+8="; - }; -in { - inherit src; - pname = "php-app"; - version = "1.0.0"; +stdenvNoCC.mkDerivation ( + finalAttrs: + let + src = fetchFromGitHub { + owner = "git-owner"; + repo = "git-repo"; + rev = finalAttrs.version; + hash = "sha256-VcQRSss2dssfkJ+iUb5qT+FJ10GHiFDzySigcmuVI+8="; + }; + in + { + inherit src; + pname = "php-app"; + version = "1.0.0"; - buildInputs = [ php ]; + buildInputs = [ php ]; - nativeBuildInputs = [ - php.packages.composer - # This hook will use the attribute `composerRepository` - php.composerHooks.composerInstallHook - ]; + nativeBuildInputs = [ + php.packages.composer + # This hook will use the attribute `composerRepository` + php.composerHooks.composerInstallHook + ]; - composerRepository = php.mkComposerRepository { - inherit (finalAttrs) pname version src; - composerNoDev = true; - composerNoPlugins = true; - composerNoScripts = true; - # Specifying a custom composer.lock since it is not present in the sources. - composerLock = ./composer.lock; - # The composer vendor hash - vendorHash = "sha256-86s/F+/5cBAwBqZ2yaGRM5rTGLmou5//aLRK5SA0WiQ="; - }; -}) + composerRepository = php.mkComposerRepository { + inherit (finalAttrs) pname version src; + composerNoDev = true; + composerNoPlugins = true; + composerNoScripts = true; + # Specifying a custom composer.lock since it is not present in the sources. + composerLock = ./composer.lock; + # The composer vendor hash + vendorHash = "sha256-86s/F+/5cBAwBqZ2yaGRM5rTGLmou5//aLRK5SA0WiQ="; + }; + } +) ``` diff --git a/doc/languages-frameworks/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md index 0b25396314cb..f788d5500c0d 100644 --- a/doc/languages-frameworks/pkg-config.section.md +++ b/doc/languages-frameworks/pkg-config.section.md @@ -17,9 +17,12 @@ A good example of all these things is miniz: { pkg-config, testers, ... }: stdenv.mkDerivation (finalAttrs: { - /* ... */ + # ... - nativeBuildInputs = [ pkg-config validatePkgConfig ]; + nativeBuildInputs = [ + pkg-config + validatePkgConfig + ]; passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; @@ -27,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - /* ... */ + # ... pkgConfigModules = [ "miniz" ]; }; }) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index bbc5da116a6a..af951cc3e805 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -50,7 +50,6 @@ sets are * `pkgs.python27Packages` * `pkgs.python3Packages` -* `pkgs.python39Packages` * `pkgs.python310Packages` * `pkgs.python311Packages` * `pkgs.python312Packages` @@ -79,24 +78,25 @@ using setup hooks. The following is an example: ```nix -{ lib -, buildPythonPackage -, fetchPypi +{ + lib, + buildPythonPackage, + fetchPypi, -# build-system -, setuptools -, setuptools-scm + # build-system + setuptools, + setuptools-scm, -# dependencies -, attrs -, pluggy -, py -, setuptools -, six + # dependencies + attrs, + pluggy, + py, + setuptools, + six, -# tests -, hypothesis - }: + # tests + hypothesis, +}: buildPythonPackage rec { pname = "pytest"; @@ -135,7 +135,12 @@ buildPythonPackage rec { description = "Framework for writing tests"; homepage = "https://github.com/pytest-dev/pytest"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ domenkozar lovek323 madjar lsix ]; + maintainers = with lib.maintainers; [ + domenkozar + lovek323 + madjar + lsix + ]; }; } ``` @@ -232,23 +237,31 @@ override first the Python interpreter and pass `packageOverrides` which contains the overrides for packages in the package set. ```nix -with import {}; +with import { }; -(let - python = let - packageOverrides = self: super: { - pandas = super.pandas.overridePythonAttrs(old: rec { - version = "0.19.1"; - src = fetchPypi { - pname = "pandas"; - inherit version; - hash = "sha256-JQn+rtpy/OA2deLszSKEuxyttqBzcAil50H+JDHUdCE="; +( + let + python = + let + packageOverrides = self: super: { + pandas = super.pandas.overridePythonAttrs (old: rec { + version = "0.19.1"; + src = fetchPypi { + pname = "pandas"; + inherit version; + hash = "sha256-JQn+rtpy/OA2deLszSKEuxyttqBzcAil50H+JDHUdCE="; + }; + }); }; - }); - }; - in pkgs.python3.override {inherit packageOverrides; self = python;}; + in + pkgs.python3.override { + inherit packageOverrides; + self = python; + }; -in python.withPackages(ps: [ ps.blaze ])).env + in + python.withPackages (ps: [ ps.blaze ]) +).env ``` The next example shows a non trivial overriding of the `blas` implementation to @@ -259,12 +272,16 @@ be used through out all of the Python package set: python3MyBlas = pkgs.python3.override { packageOverrides = self: super: { # We need toPythonModule for the package set to evaluate this - blas = super.toPythonModule(super.pkgs.blas.override { - blasProvider = super.pkgs.mkl; - }); - lapack = super.toPythonModule(super.pkgs.lapack.override { - lapackProvider = super.pkgs.mkl; - }); + blas = super.toPythonModule ( + super.pkgs.blas.override { + blasProvider = super.pkgs.mkl; + } + ); + lapack = super.toPythonModule ( + super.pkgs.lapack.override { + lapackProvider = super.pkgs.mkl; + } + ); }; }; } @@ -291,9 +308,10 @@ called with `callPackage` and passed `python3` or `python3Packages` (possibly specifying an interpreter version), like this: ```nix -{ lib -, python3Packages -, fetchPypi +{ + lib, + python3Packages, + fetchPypi, }: python3Packages.buildPythonApplication rec { @@ -303,7 +321,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; + hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; }; build-system = with python3Packages; [ @@ -357,10 +375,12 @@ modifications. ```nix { - opencv = toPythonModule (pkgs.opencv.override { - enablePython = true; - pythonPackages = self; - }); + opencv = toPythonModule ( + pkgs.opencv.override { + enablePython = true; + pythonPackages = self; + } + ); } ``` @@ -395,8 +415,10 @@ The `build-system`'s provided will instead become runtime dependencies of the ed Note that overriding packages deeper in the dependency graph _can_ work, but it's not the primary use case and overriding existing packages can make others break in unexpected ways. -``` nix -{ pkgs ? import { } }: +```nix +{ + pkgs ? import { }, +}: let pyproject = pkgs.lib.importTOML ./pyproject.toml; @@ -419,9 +441,10 @@ let }; }; - pythonEnv = myPython.withPackages (ps: [ ps.my-editable ]); + pythonEnv = myPython.withPackages (ps: [ ps.my-editable ]); -in pkgs.mkShell { +in +pkgs.mkShell { packages = [ pythonEnv ]; } ``` @@ -433,7 +456,7 @@ This example shows how to create an environment that has the Pyramid Web Framewo Saving the following as `default.nix` ```nix -with import {}; +with import { }; python3.buildEnv.override { extraLibs = [ python3Packages.pyramid ]; @@ -454,7 +477,7 @@ packages installed. This is somewhat comparable to `virtualenv`. For example, running `nix-shell` with the following `shell.nix` ```nix -with import {}; +with import { }; (python3.buildEnv.override { extraLibs = with python3Packages; [ @@ -484,7 +507,7 @@ of the packages to be included in the environment. Using the [`withPackages`](#p example for the Pyramid Web Framework environment can be written like this: ```nix -with import {}; +with import { }; python.withPackages (ps: [ ps.pyramid ]) ``` @@ -494,7 +517,7 @@ version as an argument to the function. In the above example, `ps` equals `pythonPackages`. But you can also easily switch to using python3: ```nix -with import {}; +with import { }; python3.withPackages (ps: [ ps.pyramid ]) ``` @@ -506,12 +529,14 @@ supports the `env` attribute. The `shell.nix` file from the previous section can thus be also written like this: ```nix -with import {}; +with import { }; -(python3.withPackages (ps: with ps; [ - numpy - requests -])).env +(python3.withPackages ( + ps: with ps; [ + numpy + requests + ] +)).env ``` In contrast to [`python.buildEnv`](#python.buildenv-function), [`python.withPackages`](#python.withpackages-function) does not support the @@ -759,11 +784,13 @@ Say we want to have Python 3.12, `numpy` and `toolz`, like before, in an environment. We can add a `shell.nix` file describing our dependencies: ```nix -with import {}; -(python312.withPackages (ps: with ps; [ - numpy - toolz -])).env +with import { }; +(python312.withPackages ( + ps: with ps; [ + numpy + toolz + ] +)).env ``` And then at the command line, just typing `nix-shell` produces the same @@ -786,13 +813,14 @@ What's happening here? To combine this with `mkShell` you can: ```nix -with import {}; +with import { }; let pythonEnv = python312.withPackages (ps: [ ps.numpy ps.toolz ]); -in mkShell { +in +mkShell { packages = [ pythonEnv @@ -869,10 +897,16 @@ For the sake of completeness, here's how to install the environment system-wide on NixOS. ```nix -{ # ... +{ + # ... environment.systemPackages = with pkgs; [ - (python310.withPackages(ps: with ps; [ numpy toolz ])) + (python310.withPackages ( + ps: with ps; [ + numpy + toolz + ] + )) ]; } ``` @@ -892,10 +926,11 @@ building Python libraries is [`buildPythonPackage`](#buildpythonpackage-function `toolz` package. ```nix -{ lib -, buildPythonPackage -, fetchPypi -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, }: buildPythonPackage rec { @@ -953,9 +988,10 @@ The following expression creates a derivation for the `toolz` package, and adds it along with a `numpy` package to a Python environment. ```nix -with import {}; +with import { }; -( let +( + let my_toolz = python312.pkgs.buildPythonPackage rec { pname = "toolz"; version = "0.10.0"; @@ -980,10 +1016,13 @@ with import {}; }; }; - in python312.withPackages (ps: with ps; [ - numpy - my_toolz - ]) + in + python312.withPackages ( + ps: with ps; [ + numpy + my_toolz + ] + ) ).env ``` @@ -1015,18 +1054,21 @@ The following example shows which arguments are given to [`buildPythonPackage`]( order to build [`datashape`](https://github.com/blaze/datashape). ```nix -{ lib -, buildPythonPackage -, fetchPypi +{ + lib, + buildPythonPackage, + fetchPypi, -# build dependencies -, setuptools + # build dependencies + setuptools, -# dependencies -, numpy, multipledispatch, python-dateutil + # dependencies + numpy, + multipledispatch, + python-dateutil, -# tests -, pytestCheckHook + # tests + pytestCheckHook, }: buildPythonPackage rec { @@ -1073,12 +1115,13 @@ Python bindings to `libxml2` and `libxslt`. These libraries are only required when building the bindings and are therefore added as [`buildInputs`](#var-stdenv-buildInputs). ```nix -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, libxml2 -, libxslt +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + libxml2, + libxslt, }: buildPythonPackage rec { @@ -1129,19 +1172,20 @@ The bindings don't expect to find each of them in a different folder, and therefore we have to set `LDFLAGS` and `CFLAGS`. ```nix -{ lib -, buildPythonPackage -, fetchPypi +{ + lib, + buildPythonPackage, + fetchPypi, -# build dependencies -, setuptools + # build dependencies + setuptools, -# dependencies -, fftw -, fftwFloat -, fftwLongDouble -, numpy -, scipy + # dependencies + fftw, + fftwFloat, + fftwLongDouble, + numpy, + scipy, }: buildPythonPackage rec { @@ -1183,7 +1227,10 @@ buildPythonPackage rec { changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}"; description = "Pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = "http://hgomersall.github.com/pyFFTW"; - license = with lib.licenses; [ bsd2 bsd3 ]; + license = with lib.licenses; [ + bsd2 + bsd3 + ]; }; } ``` @@ -1233,36 +1280,14 @@ test run would be: However, many repositories' test suites do not translate well to nix's build sandbox, and will generally need many tests to be disabled. -To filter tests using pytest, one can do the following: +This is achievable by +- Including paths or test items (`path/to/file.py::MyClass` or `path/to/file.py::MyClass::test_method`) with positional arguments. +- Excluding paths with `--ignore` or globbed paths with `--ignore-glob`. +- Excluding test items using the `--deselect` flag. +- Including or excluding classes or test methods by their name using the `-k` flag. +- Including or excluding test by their marks using the `-m` flag. -```nix -{ - nativeCheckInputs = [ pytest ]; - # avoid tests which need additional data or touch network - checkPhase = '' - runHook preCheck - - pytest tests/ --ignore=tests/integration -k 'not download and not update' --ignore=tests/test_failing.py - - runHook postCheck - ''; -} -``` - -`--ignore` will tell pytest to ignore that file or directory from being -collected as part of a test run. This is useful is a file uses a package -which is not available in nixpkgs, thus skipping that test file is much -easier than having to create a new package. - -`-k` is used to define a predicate for test names. In this example, we are -filtering out tests which contain `download` or `update` in their test case name. -Only one `-k` argument is allowed, and thus a long predicate should be concatenated -with “\\” and wrapped to the next line. - -::: {.note} -In pytest==6.0.1, the use of “\\” to continue a line (e.g. `-k 'not download \'`) has -been removed, in this case, it's recommended to use `pytestCheckHook`. -::: +We highly recommend `pytestCheckHook` for an easier and more structural setup. #### Using pytestCheckHook {#using-pytestcheckhook} @@ -1272,7 +1297,40 @@ when a package may need many items disabled to run the test suite. Most packages use `pytest` or `unittest`, which is compatible with `pytest`, so you will most likely use `pytestCheckHook`. -Using the example above, the analogous `pytestCheckHook` usage would be: +To use `pytestCheckHook`, add it to `nativeCheckInputs`. +Adding `pytest` is not required, since it is included with `pytestCheckHook`. + +```nix +{ + nativeCheckInputs = [ + pytestCheckHook + ]; +} +``` + +`pytestCheckHook` recognizes the following attributes: + +`enabledTestPaths` and `disabledTestPaths` + +: To specify path globs (files or directories) or test items. + +`enabledTests` and `disabledTests` + +: To specify keywords for class names or test method names. + +`enabledTestMarks` and `disabledTestMarks` + +: To specify test marks. + +`pytestFlags` + +: To append additional command-line arguments to `pytest`. + +By default, `pytest` automatically discovers which tests to run. +If tests are explicitly enabled, only those tests will run. +A test, that is both enabled and disabled, will not run. + +The following example demonstrates usage of various `pytestCheckHook` attributes: ```nix { @@ -1280,46 +1338,92 @@ Using the example above, the analogous `pytestCheckHook` usage would be: pytestCheckHook ]; - # requires additional data - pytestFlags = [ + # Allow running the following test paths and test objects. + enabledTestPaths = [ + # Find tests under the tests directory. + # The trailing slash is not necessary. "tests/" - "--ignore=tests/integration" - ]; - - disabledTests = [ - # touches network - "download" - "update" + + # Additionally run test_foo + "other-tests/test_foo.py::Foo::test_foo" ]; + # Override the above-enabled test paths and test objects. disabledTestPaths = [ - "tests/test_failing.py" + # Tests under tests/integration requires additional data. + "tests/integration" + ]; + + # Allow tests by keywords matching their class names or method names. + enabledTests = [ + # pytest by default only runs test methods begin with "test_" or end with "_test". + # This includes all functions whose name contains "test". + "test" + ]; + + # Override the above-enabled tests by keywords matching their class names or method names. + disabledTests = [ + # Tests touching networks. + "upload" + "download" + ]; + + # Additional pytest flags + pytestFlags = [ + # Disable benchmarks and run benchmarking tests only once. + "--benchmark-disable" ]; } ``` -This is especially useful when tests need to be conditionally disabled, -for example: +These attributes are all passed into the derivation directly +and added to the `pytest` command without additional Bash expansion. +It requires `__structuredAttrs = true` to pass list elements containing spaces. + +The `TestsPaths` attributes expand Unix-style globs. +If a test path contains characters like `*`, `?`, `[`, or `]`, you can +quote them with square brackets (`[*]`, `[?]`, `[[]`, and `[]]`) to match literally. + +The `Tests` and `TestMarks` attribute pairs +form a logical expression `((included_element1) or (included_element2)) and not (excluded_element1) and not (excluded_element2)` +which will be passed to pytest's `-k` and `-m` flags respectively. +With `__structuredAttrs = true` enabled, they additionally support sub-expressions. + +For example, you could disable test items like `TestFoo::test_bar_functionality` +by disabling tests that match both `"Foo"` **and** `"bar"`: ```nix { + __structuredAttrs = true; + disabledTests = [ - # touches network - "download" - "update" - ] ++ lib.optionals (pythonAtLeast "3.8") [ - # broken due to python3.8 async changes - "async" - ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ - # can fail when building with other packages - "socket" + "Foo and bar" ]; } ``` -Trying to concatenate the related strings to disable tests in a regular -[`checkPhase`](#ssec-check-phase) would be much harder to read. This also enables us to comment on -why specific tests are disabled. +The main benefits of using `pytestCheckHook` to construct `pytest` commands +is structuralization and eval-time accessibility. +This is especially helpful to select tests or specify flags conditionally: + +```nix +{ + disabledTests = + [ + # touches network + "download" + "update" + ] + ++ lib.optionals (pythonAtLeast "3.8") [ + # broken due to python3.8 async changes + "async" + ] + ++ lib.optionals stdenv.buildPlatform.isDarwin [ + # can fail when building with other packages + "socket" + ]; +} +``` #### Using pythonImportsCheck {#using-pythonimportscheck} @@ -1442,7 +1546,9 @@ automatically add `pythonRelaxDepsHook` if either `pythonRelaxDeps` or ]; unittestFlags = [ - "-s" "tests" "-v" + "-s" + "tests" + "-v" ]; } ``` @@ -1523,10 +1629,11 @@ Let's split the package definition from the environment definition. We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` ```nix -{ lib -, buildPythonPackage -, fetchPypi -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, }: buildPythonPackage rec { @@ -1556,13 +1663,15 @@ It takes an argument [`buildPythonPackage`](#buildpythonpackage-function). We no `callPackage` in the definition of our environment ```nix -with import {}; +with import { }; -( let +( + let toolz = callPackage /path/to/toolz/release.nix { buildPythonPackage = python3Packages.buildPythonPackage; }; - in python3.withPackages (ps: [ + in + python3.withPackages (ps: [ ps.numpy toolz ]) @@ -1590,20 +1699,27 @@ We can override the interpreter and pass `packageOverrides`. In the following example we rename the `pandas` package and build it. ```nix -with import {}; +with import { }; -(let - python = let - packageOverrides = self: super: { - pandas = super.pandas.overridePythonAttrs(old: {name="foo";}); - }; - in pkgs.python310.override { - inherit packageOverrides; - }; +( + let + python = + let + packageOverrides = self: super: { + pandas = super.pandas.overridePythonAttrs (old: { + name = "foo"; + }); + }; + in + pkgs.python310.override { + inherit packageOverrides; + }; -in python.withPackages (ps: [ - ps.pandas -])).env + in + python.withPackages (ps: [ + ps.pandas + ]) +).env ``` Using `nix-build` on this expression will build an environment that contains the @@ -1617,17 +1733,20 @@ environment that uses it. All packages in the Python package set will now use the updated `scipy` version. ```nix -with import {}; +with import { }; -( let +( + let packageOverrides = self: super: { scipy = super.scipy_0_17; }; - in (pkgs.python310.override { + in + (pkgs.python310.override { inherit packageOverrides; - }).withPackages (ps: [ - ps.blaze - ]) + }).withPackages + (ps: [ + ps.blaze + ]) ).env ``` @@ -1639,15 +1758,22 @@ If you want the whole of Nixpkgs to use your modifications, then you can use ```nix let - pkgs = import {}; - newpkgs = import pkgs.path { overlays = [ (self: super: { - python310 = let - packageOverrides = python-self: python-super: { - numpy = python-super.numpy_1_18; - }; - in super.python310.override {inherit packageOverrides;}; - } ) ]; }; -in newpkgs.inkscape + pkgs = import { }; + newpkgs = import pkgs.path { + overlays = [ + (self: super: { + python310 = + let + packageOverrides = python-self: python-super: { + numpy = python-super.numpy_1_18; + }; + in + super.python310.override { inherit packageOverrides; }; + }) + ]; + }; +in +newpkgs.inkscape ``` ### `python setup.py bdist_wheel` cannot create .whl {#python-setup.py-bdist_wheel-cannot-create-.whl} @@ -1737,7 +1863,8 @@ with import { }; let pythonPackages = python3Packages; -in pkgs.mkShell rec { +in +pkgs.mkShell rec { name = "impurePythonEnv"; venvDir = "./.venv"; buildInputs = [ @@ -1792,7 +1919,8 @@ with import { }; let venvDir = "./.venv"; pythonPackages = python3Packages; -in pkgs.mkShell rec { +in +pkgs.mkShell rec { name = "impurePythonEnv"; buildInputs = [ pythonPackages.python @@ -1904,13 +2032,11 @@ The following overlay overrides the call to [`buildPythonPackage`](#buildpythonp ```nix final: prev: { pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ - ( - python-final: python-prev: { - foo = python-prev.foo.overridePythonAttrs (oldAttrs: { - # ... - }); - } - ) + (python-final: python-prev: { + foo = python-prev.foo.overridePythonAttrs (oldAttrs: { + # ... + }); + }) ]; } ``` @@ -1936,13 +2062,14 @@ interpreter of interest, e.g using ```nix let - pkgs = import ./. {}; + pkgs = import ./. { }; mypython = pkgs.python3.override { enableOptimizations = true; reproducibleBuild = false; self = mypython; }; -in mypython +in +mypython ``` ### How to add optional dependencies? {#python-optional-dependencies} @@ -1975,6 +2102,14 @@ Note this method is preferred over adding parameters to builders, as that can result in packages depending on different variants and thereby causing collisions. +::: {.note} +The `optional-dependencies` attribute should only be used for dependency groups +as defined in package metadata. If a package gracefully handles missing +dependencies in runtime but doesn't advertise it through package metadata, then +these dependencies should not be listed at all. (One may still have to list +them in `nativeCheckInputs` to pass test suite.) +::: + ### How to contribute a Python package to nixpkgs? {#tools} Packages inside nixpkgs must use the [`buildPythonPackage`](#buildpythonpackage-function) or [`buildPythonApplication`](#buildpythonapplication-function) function directly, @@ -1982,6 +2117,7 @@ because we can only provide security support for non-vendored dependencies. We recommend [nix-init](https://github.com/nix-community/nix-init) for creating new python packages within nixpkgs, as it already prefetches the source, parses dependencies for common formats and prefills most things in `meta`. +When using the tool, pull from the original source repository instead of PyPI, if possible. See also [contributing section](#contributing). @@ -2008,38 +2144,9 @@ Occasionally packages don't make use of a common test framework, which may then #### Common issues {#common-issues} -* Non-working tests can often be deselected. Most Python modules - do follow the standard test protocol where the pytest runner can be used. - `pytest` supports the `-k` and `--ignore-glob` parameters to ignore test - methods or classes as well as whole files. For `pytestCheckHook` these are - conveniently exposed as `disabledTests` and `disabledTestPaths` respectively. - - ```nix - buildPythonPackage { - # ... - nativeCheckInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - "function_name" - "other_function" - ]; - - disabledTestPaths = [ - "path/to/performance.py" - "path/to/connect-*.py" - ]; - } - ``` - - ::: {.note} - If the test path to disable contains characters like `*`, `?`, `[`, and `]`, - quote them with square brackets (`[*]`, `[?]`, `[[]`, and `[]]`) to match literally. - ::: - -* Tests that attempt to access `$HOME` can be fixed by using the following - work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)` +* Tests that attempt to access `$HOME` can be fixed by using `writableTmpDirAsHomeHook` in + `nativeCheckInputs`, which sets up a writable temporary directory as the home directory. Alternatively, + you can achieve the same effect manually (e.g. in `preCheck`) with: `export HOME=$(mktemp -d)`. * Compiling with Cython causes tests to fail with a `ModuleNotLoadedError`. This can be fixed with two changes in the derivation: 1) replacing `pytest` with `pytestCheckHook` and 2) adding a `preCheck` containing `cd $out` to run @@ -2084,12 +2191,17 @@ The following rules are desired to be respected: that characters should be converted to lowercase and `.` and `_` should be replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz). If necessary, `pname` has to be given a different value within `fetchPypi`. +* It's generally preferable to fetch `src` directly from the repo and not from + PyPI. Use `fetchPypi` when there's a clear technical reason to do so. * Packages from sources such as GitHub and GitLab that do not exist on PyPI should not use a name that is already used on PyPI. When possible, they should use the package repository name prefixed with the owner (e.g. organization) name and using a `-` as delimiter. * Attribute names in `python-packages.nix` should be sorted alphanumerically to avoid merge conflicts and ease locating attributes. +* Non-python runtime dependencies should be added via explicit wrapping or + patching (using e.g. `substituteInPlace`), rather than through propagation via + `dependencies`/`propagatedBuildInputs`, to reduce clutter in `$PATH`. This list is useful for reviewers as well as for self-checking when submitting packages. diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index 9b3d1e054a62..cdbcb3aefb7c 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -64,14 +64,18 @@ and then create wrappers manually in `fixupPhase`, using `wrapQtApp`, which itse The `makeWrapper` arguments required for Qt are also exposed in the environment as `$qtWrapperArgs`. ```nix -{ stdenv, lib, wrapQtAppsHook }: +{ + stdenv, + lib, + wrapQtAppsHook, +}: stdenv.mkDerivation { # ... nativeBuildInputs = [ wrapQtAppsHook ]; dontWrapQtApps = true; preFixup = '' - wrapQtApp "$out/bin/myapp" --prefix PATH : /path/to/bin + wrapQtApp "$out/bin/myapp" --prefix PATH : /path/to/bin ''; } ``` diff --git a/doc/languages-frameworks/r.section.md b/doc/languages-frameworks/r.section.md index d25c5e848232..efbd170cd034 100644 --- a/doc/languages-frameworks/r.section.md +++ b/doc/languages-frameworks/r.section.md @@ -7,18 +7,22 @@ use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix fil ```nix { - packageOverrides = super: let self = super.pkgs; in + packageOverrides = + super: + let + self = super.pkgs; + in { - rEnv = super.rWrapper.override { - packages = with self.rPackages; [ - devtools - ggplot2 - reshape2 - yaml - optparse - ]; - }; + rEnv = super.rWrapper.override { + packages = with self.rPackages; [ + devtools + ggplot2 + reshape2 + yaml + optparse + ]; + }; }; } ``` @@ -33,7 +37,7 @@ environment available for other contributors, you can create a `default.nix` file like so: ```nix -with import {}; +with import { }; { myProject = stdenv.mkDerivation { name = "myProject"; @@ -60,16 +64,20 @@ environment, see `rstudioWrapper`, which functions similarly to ```nix { - packageOverrides = super: let self = super.pkgs; in + packageOverrides = + super: + let + self = super.pkgs; + in { - rstudioEnv = super.rstudioWrapper.override { - packages = with self.rPackages; [ - dplyr - ggplot2 - reshape2 - ]; - }; + rstudioEnv = super.rstudioWrapper.override { + packages = with self.rPackages; [ + dplyr + ggplot2 + reshape2 + ]; + }; }; } ``` @@ -81,13 +89,17 @@ Alternatively, you can create a self-contained `shell.nix` without the need to modify any configuration files: ```nix -{ pkgs ? import {} +{ + pkgs ? import { }, }: pkgs.rstudioWrapper.override { - packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ]; + packages = with pkgs.rPackages; [ + dplyr + ggplot2 + reshape2 + ]; } - ``` Executing `nix-shell` will then drop you into an environment equivalent to the diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index 31f696bd6427..d11078aacaf2 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -36,8 +36,13 @@ As explained [in the `nix-shell` section](https://nixos.org/manual/nix/stable/co Say we want to have Ruby, `nokogori`, and `pry`. Consider a `shell.nix` file with: ```nix -with import {}; -ruby.withPackages (ps: with ps; [ nokogiri pry ]) +with import { }; +ruby.withPackages ( + ps: with ps; [ + nokogiri + pry + ] +) ``` What's happening here? @@ -107,7 +112,13 @@ let name = "gems-for-some-project"; gemdir = ./.; }; -in mkShell { packages = [ gems gems.wrappedRuby ]; } +in +mkShell { + packages = [ + gems + gems.wrappedRuby + ]; +} ``` With this file in your directory, you can run `nix-shell` to build and use the gems. The important parts here are `bundlerEnv` and `wrappedRuby`. @@ -118,7 +129,12 @@ One common issue that you might have is that you have Ruby, but also `bundler` i ```nix # ... -mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; } +mkShell { + buildInputs = [ + gems + (lowPrio gems.wrappedRuby) + ]; +} ``` Sometimes a Gemfile references other files. Such as `.ruby-version` or vendored gems. When copying the Gemfile to the nix store we need to copy those files alongside. This can be done using `extraConfigPaths`. For example: @@ -148,41 +164,54 @@ Two places that allow this modification are the `ruby` derivation, or `bundlerEn Here's the `ruby` one: ```nix -{ pg_version ? "10", pkgs ? import { } }: +{ + pg_version ? "10", + pkgs ? import { }, +}: let myRuby = pkgs.ruby.override { defaultGemConfig = pkgs.defaultGemConfig // { pg = attrs: { - buildFlags = - [ "--with-pg-config=${lib.getDev pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; + buildFlags = [ "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config" ]; }; }; }; -in myRuby.withPackages (ps: with ps; [ pg ]) +in +myRuby.withPackages (ps: with ps; [ pg ]) ``` And an example with `bundlerEnv`: ```nix -{ pg_version ? "10", pkgs ? import { } }: +{ + pg_version ? "10", + pkgs ? import { }, +}: let gems = pkgs.bundlerEnv { name = "gems-for-some-project"; gemdir = ./.; gemConfig = pkgs.defaultGemConfig // { pg = attrs: { - buildFlags = - [ "--with-pg-config=${lib.getDev pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; + buildFlags = [ "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config" ]; }; }; }; -in mkShell { buildInputs = [ gems gems.wrappedRuby ]; } +in +mkShell { + buildInputs = [ + gems + gems.wrappedRuby + ]; +} ``` And finally via overlays: ```nix -{ pg_version ? "10" }: +{ + pg_version ? "10", +}: let pkgs = import { overlays = [ @@ -190,14 +219,15 @@ let defaultGemConfig = super.defaultGemConfig // { pg = attrs: { buildFlags = [ - "--with-pg-config=${lib.getDev pkgs."postgresql_${pg_version}"}/bin/pg_config" + "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config" ]; }; }; }) ]; }; -in pkgs.ruby.withPackages (ps: with ps; [ pg ]) +in +pkgs.ruby.withPackages (ps: with ps; [ pg ]) ``` Then we can get whichever postgresql version we desire and the `pg` gem will always reference it correctly: @@ -278,7 +308,14 @@ Of course you could also make a custom `gemConfig` if you know exactly how to pa Here's another example: ```nix -{ lib, bundlerApp, makeWrapper, git, gnutar, gzip }: +{ + lib, + bundlerApp, + makeWrapper, + git, + gnutar, + gzip, +}: bundlerApp { pname = "r10k"; @@ -288,7 +325,13 @@ bundlerApp { nativeBuildInputs = [ makeWrapper ]; postBuild = '' - wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]} + wrapProgram $out/bin/r10k --prefix PATH : ${ + lib.makeBinPath [ + git + gnutar + gzip + ] + } ''; } ``` diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 34ac80cac998..5078de14d80f 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -22,20 +22,23 @@ or use [community maintained Rust toolchains](#using-community-maintained-rust-t Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: ```nix -{ lib, fetchFromGitHub, rustPlatform }: +{ + lib, + fetchFromGitHub, + rustPlatform, +}: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ripgrep"; version = "14.1.1"; src = fetchFromGitHub { owner = "BurntSushi"; - repo = pname; - rev = version; + repo = "ripgrep"; + tag = finalAttrs.version; hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg="; }; - useFetchCargoVendor = true; cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4="; meta = { @@ -44,7 +47,7 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.unlicense; maintainers = [ ]; }; -} +}) ``` `buildRustPackage` requires a `cargoHash` attribute, computed over all crate sources of this package. @@ -100,21 +103,20 @@ be made invariant to the version by setting `cargoDepsName` to `pname`: ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "broot"; version = "1.2.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aDQA4A5mScX9or3Lyiv/5GyAehidnpKKE0grhbP1Ctc="; }; - useFetchCargoVendor = true; cargoHash = "sha256-iDYh52rj1M5Uupvbx2WeDd/jvQZ+2A50V5rp5e2t7q4="; - cargoDepsName = pname; + cargoDepsName = finalAttrs.pname; # ... -} +}) ``` ### Importing a `Cargo.lock` file {#importing-a-cargo.lock-file} @@ -151,11 +153,13 @@ rustPlatform.buildRustPackage { pname = "myproject"; version = "1.0.0"; - cargoLock = let - fixupLockFile = path: f (builtins.readFile path); - in { - lockFileContents = fixupLockFile ./Cargo.lock; - }; + cargoLock = + let + fixupLockFile = path: f (builtins.readFile path); + in + { + lockFileContents = fixupLockFile ./Cargo.lock; + }; # ... } @@ -178,7 +182,7 @@ The output hash of each dependency that uses a git source must be specified in the `outputHashes` attribute. For example: ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "myproject"; version = "1.0.0"; @@ -203,7 +207,7 @@ For usage outside nixpkgs, `allowBuiltinFetchGit` could be used to avoid having to specify `outputHashes`. For example: ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "myproject"; version = "1.0.0"; @@ -229,12 +233,15 @@ If you want to use different features for check phase, you can use For example: ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "myproject"; version = "1.0.0"; buildNoDefaultFeatures = true; - buildFeatures = [ "color" "net" ]; + buildFeatures = [ + "color" + "net" + ]; # disable network features in tests checkFeatures = [ "color" ]; @@ -283,7 +290,10 @@ where they are known to differ. But there are ways to customize the argument: import { crossSystem = (import ).systems.examples.armhf-embedded // { rust.rustcTarget = "thumb-crazy"; - rust.platform = { foo = ""; bar = ""; }; + rust.platform = { + foo = ""; + bar = ""; + }; }; } ``` @@ -310,7 +320,7 @@ so: ```nix rustPlatform.buildRustPackage { - /* ... */ + # ... checkType = "debug"; } ``` @@ -353,7 +363,7 @@ This can be achieved with `--skip` in `checkFlags`: ```nix rustPlatform.buildRustPackage { - /* ... */ + # ... checkFlags = [ # reason for disabling test "--skip=example::tests:example_test" @@ -370,7 +380,7 @@ adapted to be compatible with cargo-nextest. ```nix rustPlatform.buildRustPackage { - /* ... */ + # ... useNextest = true; } ``` @@ -382,7 +392,7 @@ sometimes it may be necessary to disable this so the tests run consecutively. ```nix rustPlatform.buildRustPackage { - /* ... */ + # ... dontUseCargoParallelTests = true; } ``` @@ -394,7 +404,7 @@ should be built in `debug` mode, it can be configured like so: ```nix rustPlatform.buildRustPackage { - /* ... */ + # ... buildType = "debug"; } ``` @@ -415,7 +425,7 @@ source code in a reproducible way. If it is missing or out-of-date one can use the `cargoPatches` attribute to update or add it. ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { # ... cargoPatches = [ # a patch file to add/update Cargo.lock in the source code @@ -548,12 +558,13 @@ directory of the `tokenizers` project's source archive, we use `sourceRoot` to point the tooling to this directory: ```nix -{ fetchFromGitHub -, buildPythonPackage -, cargo -, rustPlatform -, rustc -, setuptools-rust +{ + fetchFromGitHub, + buildPythonPackage, + cargo, + rustPlatform, + rustc, + setuptools-rust, }: buildPythonPackage rec { @@ -562,13 +573,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "huggingface"; - repo = pname; - rev = "python-v${version}"; + repo = "tokenizers"; + tag = "python-v${version}"; hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src sourceRoot; + inherit + pname + version + src + sourceRoot + ; hash = "sha256-RO1m8wEd5Ic2M9q+zFHeCJWhCr4Sv3CEWd08mkxsBec="; }; @@ -593,12 +609,12 @@ following example, the crate is in `src/rust`, as specified in the path for `fetchCargoVendor`. ```nix - -{ buildPythonPackage -, fetchPypi -, rustPlatform -, setuptools-rust -, openssl +{ + buildPythonPackage, + fetchPypi, + rustPlatform, + setuptools-rust, + openssl, }: buildPythonPackage rec { @@ -632,10 +648,11 @@ builds the `retworkx` Python package. `fetchCargoVendor` and `maturinBuildHook` is used to perform the build. ```nix -{ lib -, buildPythonPackage -, rustPlatform -, fetchFromGitHub +{ + lib, + buildPythonPackage, + rustPlatform, + fetchFromGitHub, }: buildPythonPackage rec { @@ -646,7 +663,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Qiskit"; repo = "retworkx"; - rev = version; + tag = version; hash = "sha256-11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20="; }; @@ -655,7 +672,10 @@ buildPythonPackage rec { hash = "sha256-QsPCQhNZKYCAogQriQX6pBYQUDAIUsEdRX/63dAqTzg="; }; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; # ... } @@ -666,23 +686,24 @@ buildPythonPackage rec { Some projects, especially GNOME applications, are built with the Meson Build System instead of calling Cargo directly. Using `rustPlatform.buildRustPackage` may successfully build the main program, but related files will be missing. Instead, you need to set up Cargo dependencies with `fetchCargoVendor` and `cargoSetupHook` and leave the rest to Meson. `rust` and `cargo` are still needed in `nativeBuildInputs` for Meson to use. ```nix -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, rustPlatform -, rustc -, cargo -, wrapGAppsHook4 -, blueprint-compiler -, libadwaita -, libsecret -, tinysparql +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + rustPlatform, + rustc, + cargo, + wrapGAppsHook4, + blueprint-compiler, + libadwaita, + libsecret, + tinysparql, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "health"; version = "0.95.0"; @@ -690,12 +711,12 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "health"; - rev = version; + tag = finalAttrs.version; hash = "sha256-PrNPprSS98yN8b8yw2G6hzTSaoE65VbsM3q7FVB4mds="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-eR1ZGtTZQNhofFUEjI7IX16sMKPJmAl7aIFfPJukecg="; }; @@ -717,7 +738,7 @@ stdenv.mkDerivation rec { ]; # ... -} +}) ``` ## `buildRustCrate`: Compiling Rust crates using Nix instead of Cargo {#compiling-rust-crates-using-nix-instead-of-cargo} @@ -744,8 +765,8 @@ Starting from that file, one can add more overrides, to add features or build inputs by overriding the hello crate in a separate file. ```nix -with import {}; -((import ./hello.nix).hello {}).override { +with import { }; +((import ./hello.nix).hello { }).override { crateOverrides = defaultCrateOverrides // { hello = attrs: { buildInputs = [ openssl ]; }; }; @@ -764,15 +785,17 @@ the override above can be read, as in the following example, which patches the derivation: ```nix -with import {}; -((import ./hello.nix).hello {}).override { +with import { }; +((import ./hello.nix).hello { }).override { crateOverrides = defaultCrateOverrides // { - hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { - postPatch = '' - substituteInPlace lib/zoneinfo.rs \ - --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - ''; - }; + hello = + attrs: + lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { + postPatch = '' + substituteInPlace lib/zoneinfo.rs \ + --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; + }; }; } ``` @@ -785,10 +808,10 @@ dependencies. For instance, to override the build inputs for crate crate, we could do: ```nix -with import {}; -((import hello.nix).hello {}).override { +with import { }; +((import hello.nix).hello { }).override { crateOverrides = defaultCrateOverrides // { - libc = attrs: { buildInputs = []; }; + libc = attrs: { buildInputs = [ ]; }; }; } ``` @@ -801,27 +824,27 @@ general. A number of other parameters can be overridden: - The version of `rustc` used to compile the crate: ```nix - (hello {}).override { rust = pkgs.rust; } + (hello { }).override { rust = pkgs.rust; } ``` - Whether to build in release mode or debug mode (release mode by default): ```nix - (hello {}).override { release = false; } + (hello { }).override { release = false; } ``` - Whether to print the commands sent to `rustc` when building (equivalent to `--verbose` in cargo: ```nix - (hello {}).override { verbose = false; } + (hello { }).override { verbose = false; } ``` - Extra arguments to be passed to `rustc`: ```nix - (hello {}).override { extraRustcOpts = "-Z debuginfo=2"; } + (hello { }).override { extraRustcOpts = "-Z debuginfo=2"; } ``` - Phases, just like in any other derivation, can be specified using @@ -833,9 +856,9 @@ general. A number of other parameters can be overridden: before running the build script: ```nix - (hello {}).override { + (hello { }).override { preConfigure = '' - echo "pub const PATH=\"${hi.out}\";" >> src/path.rs" + echo "pub const PATH=\"${hi.out}\";" >> src/path.rs" ''; } ``` @@ -856,12 +879,13 @@ Using the example `hello` project above, we want to do the following: A typical `shell.nix` might look like: ```nix -with import {}; +with import { }; stdenv.mkDerivation { name = "rust-env"; nativeBuildInputs = [ - rustc cargo + rustc + cargo # Example Build-time Additional Dependencies pkg-config @@ -917,15 +941,13 @@ Here is a simple `shell.nix` that provides Rust nightly (default profile) using ```nix with import { }; let - fenix = callPackage - (fetchFromGitHub { - owner = "nix-community"; - repo = "fenix"; - # commit from: 2023-03-03 - rev = "e2ea04982b892263c4d939f1cc3bf60a9c4deaa1"; - hash = "sha256-AsOim1A8KKtMWIxG+lXh5Q4P2bhOZjoUhFWJ1EuZNNk="; - }) - { }; + fenix = callPackage (fetchFromGitHub { + owner = "nix-community"; + repo = "fenix"; + # commit from: 2023-03-03 + rev = "e2ea04982b892263c4d939f1cc3bf60a9c4deaa1"; + hash = "sha256-AsOim1A8KKtMWIxG+lXh5Q4P2bhOZjoUhFWJ1EuZNNk="; + }) { }; in mkShell { name = "rust-env"; @@ -964,8 +986,7 @@ You can also use Rust nightly to build rust packages using `makeRustPlatform`. The below snippet demonstrates invoking `buildRustPackage` with a Rust toolchain from oxalica's overlay: ```nix -with import -{ +with import { overlays = [ (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) ]; @@ -977,29 +998,32 @@ let }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ripgrep"; version = "14.1.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; - rev = version; + tag = finalAttrs.version; hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg="; }; - useFetchCargoVendor = true; cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4="; + # Tests require network access. Skipping. doCheck = false; meta = { description = "Fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; - license = with lib.licenses; [ mit unlicense ]; - maintainers = with lib.maintainers; []; + license = with lib.licenses; [ + mit + unlicense + ]; + maintainers = with lib.maintainers; [ ]; }; -} +}) ``` Follow the below steps to try that snippet. @@ -1029,19 +1053,28 @@ with the path into which you have `git clone`d the `rustc` git repository: ```nix - (final: prev: /*lib.optionalAttrs prev.stdenv.targetPlatform.isAarch64*/ { - rust_1_72 = - lib.updateManyAttrsByPath [{ - path = [ "packages" "stable" ]; - update = old: old.overrideScope(final: prev: { - rustc-unwrapped = prev.rustc-unwrapped.overrideAttrs (_: { - src = lib.cleanSource /git/scratch/rust; - # do *not* put passthru.isReleaseTarball=true here - }); - }); - }] - prev.rust_1_72; - }) +( + final: prev: # lib.optionalAttrs prev.stdenv.targetPlatform.isAarch64 + { + rust_1_72 = lib.updateManyAttrsByPath [ + { + path = [ + "packages" + "stable" + ]; + update = + old: + old.overrideScope ( + final: prev: { + rustc-unwrapped = prev.rustc-unwrapped.overrideAttrs (_: { + src = lib.cleanSource /git/scratch/rust; + # do *not* put passthru.isReleaseTarball=true here + }); + } + ); + } + ] prev.rust_1_72; + }) ``` If the problem you're troubleshooting only manifests when diff --git a/doc/languages-frameworks/swift.section.md b/doc/languages-frameworks/swift.section.md index 88d98deeb2dd..b9d4b5a7cba8 100644 --- a/doc/languages-frameworks/swift.section.md +++ b/doc/languages-frameworks/swift.section.md @@ -69,42 +69,55 @@ This produces some files in a directory `nix`, which will be part of your Nix expression. The next step is to write that expression: ```nix -{ stdenv, swift, swiftpm, swiftpm2nix, fetchFromGitHub }: +{ + stdenv, + swift, + swiftpm, + swiftpm2nix, + fetchFromGitHub, +}: let # Pass the generated files to the helper. generated = swiftpm2nix.helpers ./nix; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "myproject"; version = "0.0.0"; src = fetchFromGitHub { owner = "nixos"; - repo = pname; - rev = version; - hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + repo = "myproject"; + tag = finalAttrs.version; + hash = ""; }; # Including SwiftPM as a nativeBuildInput provides a buildPhase for you. # This by default performs a release build using SwiftPM, essentially: # swift build -c release - nativeBuildInputs = [ swift swiftpm ]; + nativeBuildInputs = [ + swift + swiftpm + ]; # The helper provides a configure snippet that will prepare all dependencies # in the correct place, where SwiftPM expects them. configurePhase = generated.configure; installPhase = '' + runHook preInstall + # This is a special function that invokes swiftpm to find the location # of the binaries it produced. binPath="$(swiftpmBinPath)" # Now perform any installation steps. mkdir -p $out/bin cp $binPath/myproject $out/bin/ + + runHook postInstall ''; -} +}) ``` ### Custom build flags {#ssec-swiftpm-custom-build-flags} diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index a31a4357a22f..b3a13dc8b8d2 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -10,7 +10,13 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c - Packages cannot be used directly but must be assembled in an environment. To create or add packages to an environment, use ```nix - texliveSmall.withPackages (ps: with ps; [ collection-langkorean algorithms cm-super ]) + texliveSmall.withPackages ( + ps: with ps; [ + collection-langkorean + algorithms + cm-super + ] + ) ``` The function `withPackages` can be called multiple times to add more packages. @@ -18,12 +24,14 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c - `texlive.withPackages` uses the same logic as `buildEnv`. Only parts of a package are installed in an environment: its 'runtime' files (`tex` output), binaries (`out` output), and support files (`tlpkg` output). Moreover, man and info pages are assembled into separate `man` and `info` outputs. To add only the TeX files of a package, or its documentation (`texdoc` output), just specify the outputs: ```nix - texlive.withPackages (ps: with ps; [ - texdoc # recommended package to navigate the documentation - perlPackages.LaTeXML.tex # tex files of LaTeXML, omit binaries - cm-super - cm-super.texdoc # documentation of cm-super - ]) + texlive.withPackages ( + ps: with ps; [ + texdoc # recommended package to navigate the documentation + perlPackages.LaTeXML.tex # tex files of LaTeXML, omit binaries + cm-super + cm-super.texdoc # documentation of cm-super + ] + ) ``` - All packages distributed by TeX Live, which contains most of CTAN, are available and can be found under `texlive.pkgs`: @@ -50,7 +58,12 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c ```nix texlive.combine { - inherit (texlive) scheme-small collection-langkorean algorithms cm-super; + inherit (texlive) + scheme-small + collection-langkorean + algorithms + cm-super + ; } ``` @@ -61,8 +74,8 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c ```nix texlive.combine { # inherit (texlive) whatever-you-want; - pkgFilter = pkg: - pkg.tlType == "run" || pkg.tlType == "bin" || pkg.hasManpages || pkg.pname == "cm-super"; + pkgFilter = + pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.hasManpages || pkg.pname == "cm-super"; # elem tlType [ "run" "bin" "doc" "source" ] # there are also other attributes: version, name } @@ -81,18 +94,18 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c - TeX Live packages are also available under `texlive.pkgs` as derivations with outputs `out`, `tex`, `texdoc`, `texsource`, `tlpkg`, `man`, `info`. They cannot be installed outside of `texlive.combine` but are available for other uses. To repackage a font, for instance, use ```nix - stdenvNoCC.mkDerivation rec { + stdenvNoCC.mkDerivation (finalAttrs: { src = texlive.pkgs.iwona; dontUnpack = true; - inherit (src) pname version; + inherit (finalAttrs.src) pname version; installPhase = '' runHook preInstall install -Dm644 $src/fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype runHook postInstall ''; - } + }) ``` See `biber`, `iwona` for complete examples. @@ -114,14 +127,17 @@ When using `pkgFilter`, `texlive.combine` will assign `tlType` respectively `"bi Here is a (very verbose) example. See also the packages `auctex`, `eukleides`, `mftrace` for more examples. ```nix -with import {}; +with import { }; let foiltex = stdenvNoCC.mkDerivation { pname = "latex-foiltex"; version = "2.1.4b"; - outputs = [ "tex" "texdoc" ]; + outputs = [ + "tex" + "texdoc" + ]; passthru.tlDeps = with texlive; [ latex ]; srcs = [ @@ -146,11 +162,18 @@ let ''; nativeBuildInputs = [ - (texliveSmall.withPackages (ps: with ps; [ cm-super hypdoc latexmk ])) + (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-}" '') + writableTmpDirAsHomeHook # Need a writable $HOME for latexmk ]; dontConfigure = true; @@ -162,7 +185,6 @@ let latex foiltex.ins # Generate the documentation - export HOME=. latexmk -pdf foiltex.dtx runHook postBuild @@ -192,22 +214,24 @@ let latex_with_foiltex = texliveSmall.withPackages (_: [ foiltex ]); in - runCommand "test.pdf" { +runCommand "test.pdf" + { nativeBuildInputs = [ latex_with_foiltex ]; - } '' -cat >test.tex <test.tex < main.tex - env HOME=$(mktemp -d) lualatex -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex -'' +runCommandNoCC "lualatex-hello-world" + { + buildInputs = [ texliveFull ]; + } + '' + mkdir $out + echo '\documentclass{article} \begin{document} Hello world \end{document}' > main.tex + env HOME=$(mktemp -d) lualatex -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex + '' ``` Additionally, [the cache of a user can diverge from the nix store](https://github.com/NixOS/nixpkgs/issues/278718). diff --git a/doc/languages-frameworks/typst.section.md b/doc/languages-frameworks/typst.section.md new file mode 100644 index 000000000000..3a4910ad8489 --- /dev/null +++ b/doc/languages-frameworks/typst.section.md @@ -0,0 +1,73 @@ +# Typst {#typst} + +Typst can be configured to include packages from [Typst Universe](https://typst.app/universe/) or custom packages. + +## Custom Environment {#typst-custom-environment} + +You can create a custom Typst environment with a selected set of packages from **Typst Universe** using the following code. It is also possible to specify a Typst package with a specific version (e.g., `cetz_0_3_0`). A package without a version number will always refer to its latest version. + +```nix +typst.withPackages ( + p: with p; [ + polylux_0_4_0 + cetz_0_3_0 + ] +) +``` + +### Handling Outdated Package Hashes {#typst-handling-outdated-package-hashes} + +Since **Typst Universe** does not provide a way to fetch a package with a specific hash, the package hashes in `nixpkgs` can sometimes be outdated. To resolve this issue, you can manually override the package source using the following approach: + +```nix +typst.withPackages.override + (old: { + typstPackages = old.typstPackages.extend ( + _: previous: { + polylux_0_4_0 = previous.polylux_0_4_0.overrideAttrs (oldPolylux: { + src = oldPolylux.src.overrideAttrs { + outputHash = YourUpToDatePolyluxHash; + }; + }); + } + ); + }) + ( + p: with p; [ + polylux_0_4_0 + cetz_0_3_0 + ] + ) +``` + +## Custom Packages {#typst-custom-packages} + +`Nixpkgs` provides a helper function, `buildTypstPackage`, to build custom Typst packages that can be used within the Typst environment. However, all dependencies of the custom package must be explicitly specified in `typstDeps`. + +Here's how to define a custom Typst package: + +```nix +{ + buildTypstPackage, + typstPackages, +}: + +buildTypstPackage (finalAttrs: { + pname = "my-typst-package"; + version = "0.0.1"; + src = ./.; + typstDeps = with typstPackages; [ cetz_0_3_0 ]; +}) +``` + +### Package Scope and Usage {#typst-package-scope-and-usage} + +By default, every custom package is scoped under `@preview`, as shown below: + +```typst +#import "@preview/my-typst-package:0.0.1": * +``` + +Since `@preview` is intended for packages from **Typst Universe**, it is recommended to use this approach **only for temporary or experimental modifications over existing packages** from **Typst Universe**. + +On the other hand, **local packages**, packages scoped under `@local`, are **not** considered part of the Typst environment. This means that local packages must be manually linked to the Typst compiler if needed. diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index da139623a25c..9c8c3faaecf0 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -47,11 +47,17 @@ To store your plugins in Vim packages (the native Vim plugin manager, see `:help vim-full.customize { vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { # loaded on launch - start = [ youcompleteme fugitive ]; + start = [ + youcompleteme + fugitive + ]; # manually loadable by calling `:packadd $plugin-name` # however, if a Vim plugin has a dependency that is not explicitly listed in # opt that dependency will always be added to start to avoid confusion. - opt = [ phpCompletion elm-vim ]; + opt = [ + phpCompletion + elm-vim + ]; # To automatically load a plugin when opening a filetype, add vimrc lines like: # autocmd FileType php :packadd phpCompletion }; @@ -63,18 +69,19 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n ```nix { - packageOverrides = pkgs: with pkgs; { - myVim = vim-full.customize { - # `name` specifies the name of the executable and package - name = "vim-with-plugins"; - # add here code from the example section - }; - myNeovim = neovim.override { - configure = { - # add code from the example section here + packageOverrides = + pkgs: with pkgs; { + myVim = vim-full.customize { + # `name` specifies the name of the executable and package + name = "vim-with-plugins"; + # add here code from the example section + }; + myNeovim = neovim.override { + configure = { + # add code from the example section here + }; }; }; - }; } ``` @@ -100,20 +107,18 @@ let in { environment.systemPackages = [ - ( - pkgs.neovim.override { - configure = { - packages.myPlugins = with pkgs.vimPlugins; { + (pkgs.neovim.override { + configure = { + packages.myPlugins = with pkgs.vimPlugins; { start = [ vim-go # already packaged plugin easygrep # custom package ]; - opt = []; + opt = [ ]; }; # ... }; - } - ) + }) ]; } ``` @@ -129,7 +134,12 @@ plugins the following example can be used: vim-full.customize { vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { # loaded on launch - plug.plugins = [ youcompleteme fugitive phpCompletion elm-vim ]; + plug.plugins = [ + youcompleteme + fugitive + phpCompletion + elm-vim + ]; }; } ``` @@ -147,8 +157,11 @@ Some plugins require overrides in order to function properly. Overrides are plac ```nix { - deoplete-fish = super.deoplete-fish.overrideAttrs(old: { - dependencies = with super; [ deoplete-nvim vim-fish ]; + deoplete-fish = super.deoplete-fish.overrideAttrs (old: { + dependencies = with super; [ + deoplete-nvim + vim-fish + ]; }); } ``` @@ -164,7 +177,7 @@ Finally, there are some plugins that are also packaged in nodePackages because t Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token). ```sh -nix-shell -p vimPluginsUpdater --run 'vim-plugins-updater --github-token=mytoken' # or set GITHUB_API_TOKEN environment variable +nix-shell -p vimPluginsUpdater --run 'vim-plugins-updater --github-token=mytoken' # or set GITHUB_TOKEN environment variable ``` Alternatively, set the number of processes to a lower count to avoid rate-limiting. @@ -199,9 +212,7 @@ You can then reference the generated vim plugins via: ```nix { - myVimPlugins = pkgs.vimPlugins.extend ( - (pkgs.callPackage ./generated.nix {}) - ); + myVimPlugins = pkgs.vimPlugins.extend ((pkgs.callPackage ./generated.nix { })); } ``` diff --git a/doc/manpage-urls.json b/doc/manpage-urls.json index 63f877dcb660..8b3b58c15125 100644 --- a/doc/manpage-urls.json +++ b/doc/manpage-urls.json @@ -228,6 +228,8 @@ "systemd-socket-activate(1)": "https://www.freedesktop.org/software/systemd/man/systemd-socket-activate.html", "systemd-socket-proxyd(8)": "https://www.freedesktop.org/software/systemd/man/systemd-socket-proxyd.html", "systemd-soft-reboot.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-soft-reboot.service.html", + "systemd-ssh-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-ssh-generator.html", + "systemd-ssh-proxy(1)": "https://www.freedesktop.org/software/systemd/man/systemd-ssh-proxy.html", "systemd-stdio-bridge(1)": "https://www.freedesktop.org/software/systemd/man/systemd-stdio-bridge.html", "systemd-stub(7)": "https://www.freedesktop.org/software/systemd/man/systemd-stub.html", "systemd-suspend-then-hibernate.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-suspend-then-hibernate.service.html", diff --git a/doc/manual.md.in b/doc/manual.md.in index 07e587190d84..160c6eaead3c 100644 --- a/doc/manual.md.in +++ b/doc/manual.md.in @@ -9,6 +9,7 @@ preface.chapter.md using-nixpkgs.md lib.md stdenv.md +toolchains.md build-helpers.md development.md contributing.md diff --git a/doc/packages/build-support.md b/doc/packages/build-support.md index 80392f4d121e..1e4756d7f258 100644 --- a/doc/packages/build-support.md +++ b/doc/packages/build-support.md @@ -30,13 +30,12 @@ substitute { ``` ::: -## `pkgs.substituteAll` {#pkgs-substituteall} +## `pkgs.replaceVars` {#pkgs-replacevars} -`pkgs.substituteAll` substitutes all instances of `@varName@` (`@`s included) in file `src` with the value of the corresponding environment variable. -As this uses the [`substituteAll`] (#fun-substitute) function, its limitations regarding variable names that will or will not be replaced also apply here. +`pkgs.replaceVars ` replaces all instances of `@varName@` (`@`s included) in file `src` with the respective value in the attribute set `replacements`. -:::{.example #ex-pkgs-substituteAll} -# Usage of `pkgs.substituteAll` +:::{.example #ex-pkgs-replace-vars} +# Usage of `pkgs.replaceVars` If `say-goodbye.sh` contains the following: @@ -51,16 +50,14 @@ the following derivation will make substitutions to `@bash@`, `@hello@`, and `@g ```nix { - substituteAll, + replaceVars, bash, hello, }: -substituteAll { - src = ./say-goodbye.sh; - env = { - inherit bash hello; - greeting = "goodbye"; - }; +replaceVars ./say-goodbye.sh { + inherit bash hello; + greeting = "goodbye"; + unchanged = null; } ``` @@ -72,31 +69,37 @@ such that `$out` will result in something like the following: echo @unchanged@ /nix/store/566f5isbvw014h7knmzmxa5l6hshx43k-hello-2.12.1/bin/hello --greeting goodbye ``` + +Note that, in contrast to the old `substituteAll`, `unchanged = null` must explicitly be set. +Any unreferenced `@...@` pattern in the source file will throw an error. ::: -## `pkgs.substituteAllFiles` {#pkgs-substituteallfiles} +## `pkgs.replaceVarsWith` {#pkgs-replacevarswith} -`pkgs.substituteAllFiles` replaces `@varName@` with the value of the environment variable `varName`. -It expects `src` to be a directory and requires a `files` argument that specifies which files will be subject to replacements; only these files will be placed in `$out`. +`pkgs.replaceVarsWith` works the same way as [pkgs.replaceVars](#pkgs-replacevars), but additionally allows more options. -As it also uses the `substituteAll` function, it is subject to the same limitations on environment variables as discussed in [pkgs.substituteAll](#pkgs-substituteall). +:::{.example #ex-pkgs-replace-vars-with} +# Usage of `pkgs.replaceVarsWith` -:::{.example #ex-pkgs-substitute-all-files} -# Usage of `pkgs.substituteAllFiles` - -If the current directory contains `{foo,bar,baz}.txt` and the following `default.nix` +With the example file `say-goodbye.sh`, consider: ```nix -{ substituteAllFiles }: -substituteAllFiles { - src = ./.; - files = [ - "foo.txt" - "bar.txt" - ]; - hello = "there"; +{ replaceVarsWith }: +replaceVarsWith { + src = ./say-goodbye.sh; + + replacements = { + inherit bash hello; + greeting = "goodbye"; + unchanged = null; + }; + + name = "say-goodbye"; + dir = "bin"; + isExecutable = true; + meta.mainProgram = "say-goodbye"; } ``` -in the resulting derivation, every instance of `@hello@` will be replaced with `there` in `$out/foo.txt` and `$out/bar.txt`; `baz.txt` will not be processed nor will it appear in `$out`. +This will make the resulting file executable, put it in `bin/say-goodbye` and set `meta` attributes respectively. ::: diff --git a/doc/packages/cataclysm-dda.section.md b/doc/packages/cataclysm-dda.section.md index f401e9b9efa5..2e7d86f951b8 100644 --- a/doc/packages/cataclysm-dda.section.md +++ b/doc/packages/cataclysm-dda.section.md @@ -48,7 +48,7 @@ let # Unfortunately, this refers to the package before overriding and # parallel building is still disabled. - badExample = myCDDA.withMods (_: []); + badExample = myCDDA.withMods (_: [ ]); inherit (cataclysmDDA) attachPkgs pkgs wrapCDDA; @@ -66,7 +66,7 @@ in # badExample # parallel building disabled # goodExample1.withMods (_: []) # parallel building enabled -goodExample2.withMods (_: []) # parallel building enabled +goodExample2.withMods (_: [ ]) # parallel building enabled ``` ## Customizing with mods {#customizing-with-mods} @@ -75,9 +75,11 @@ To install Cataclysm DDA with mods of your choice, you can use `withMods` attribute: ```nix -cataclysm-dda.withMods (mods: with mods; [ - tileset.UndeadPeople -]) +cataclysm-dda.withMods ( + mods: with mods; [ + tileset.UndeadPeople + ] +) ``` All mods, soundpacks, and tilesets available in nixpkgs are found in @@ -88,42 +90,46 @@ in nixpkgs: ```nix let - customMods = self: super: lib.recursiveUpdate super { - # Modify existing mod - tileset.UndeadPeople = super.tileset.UndeadPeople.overrideAttrs (old: { - # If you like to apply a patch to the tileset for example - patches = [ ./path/to/your.patch ]; - }); + customMods = + self: super: + lib.recursiveUpdate super { + # Modify existing mod + tileset.UndeadPeople = super.tileset.UndeadPeople.overrideAttrs (old: { + # If you like to apply a patch to the tileset for example + patches = [ ./path/to/your.patch ]; + }); - # Add another mod - mod.Awesome = cataclysmDDA.buildMod { - modName = "Awesome"; - version = "0.x"; - src = fetchFromGitHub { - owner = "Someone"; - repo = "AwesomeMod"; - rev = "..."; - hash = "..."; + # Add another mod + mod.Awesome = cataclysmDDA.buildMod { + modName = "Awesome"; + version = "0.x"; + src = fetchFromGitHub { + owner = "Someone"; + repo = "AwesomeMod"; + rev = "..."; + hash = "..."; + }; + # Path to be installed in the unpacked source (default: ".") + modRoot = "contents/under/this/path/will/be/installed"; }; - # Path to be installed in the unpacked source (default: ".") - modRoot = "contents/under/this/path/will/be/installed"; - }; - # Add another soundpack - soundpack.Fantastic = cataclysmDDA.buildSoundPack { - # ditto - }; + # Add another soundpack + soundpack.Fantastic = cataclysmDDA.buildSoundPack { + # ditto + }; - # Add another tileset - tileset.SuperDuper = cataclysmDDA.buildTileSet { - # ditto + # Add another tileset + tileset.SuperDuper = cataclysmDDA.buildTileSet { + # ditto + }; }; - }; in -cataclysm-dda.withMods (mods: with mods.extend customMods; [ - tileset.UndeadPeople - mod.Awesome - soundpack.Fantastic - tileset.SuperDuper -]) +cataclysm-dda.withMods ( + mods: with mods.extend customMods; [ + tileset.UndeadPeople + mod.Awesome + soundpack.Fantastic + tileset.SuperDuper + ] +) ``` diff --git a/doc/packages/citrix.section.md b/doc/packages/citrix.section.md index bcf0924249bc..9b680759f461 100644 --- a/doc/packages/citrix.section.md +++ b/doc/packages/citrix.section.md @@ -28,5 +28,6 @@ let ./custom-cert-1.pem ./custom-cert-2.pem # ... ]; -in citrix_workspace.override { inherit extraCerts; } +in +citrix_workspace.override { inherit extraCerts; } ``` diff --git a/doc/packages/darwin-builder.section.md b/doc/packages/darwin-builder.section.md index 06358c790165..fb71a78d6eb3 100644 --- a/doc/packages/darwin-builder.section.md +++ b/doc/packages/darwin-builder.section.md @@ -89,58 +89,72 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon darwin.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, darwin, nixpkgs, ... }@inputs: - let + outputs = + { + self, + darwin, + nixpkgs, + ... + }@inputs: + let - inherit (darwin.lib) darwinSystem; - system = "aarch64-darwin"; - pkgs = nixpkgs.legacyPackages."${system}"; - linuxSystem = builtins.replaceStrings [ "darwin" ] [ "linux" ] system; + inherit (darwin.lib) darwinSystem; + system = "aarch64-darwin"; + pkgs = nixpkgs.legacyPackages."${system}"; + linuxSystem = builtins.replaceStrings [ "darwin" ] [ "linux" ] system; - darwin-builder = nixpkgs.lib.nixosSystem { - system = linuxSystem; - modules = [ - "${nixpkgs}/nixos/modules/profiles/nix-builder-vm.nix" - { virtualisation = { - host.pkgs = pkgs; - darwin-builder.workingDirectory = "/var/lib/darwin-builder"; - darwin-builder.hostPort = 22; - }; - } - ]; - }; - in { - - darwinConfigurations = { - machine1 = darwinSystem { - inherit system; + darwin-builder = nixpkgs.lib.nixosSystem { + system = linuxSystem; modules = [ + "${nixpkgs}/nixos/modules/profiles/nix-builder-vm.nix" { - nix.distributedBuilds = true; - nix.buildMachines = [{ - hostName = "localhost"; - sshUser = "builder"; - sshKey = "/etc/nix/builder_ed25519"; - system = linuxSystem; - maxJobs = 4; - supportedFeatures = [ "kvm" "benchmark" "big-parallel" ]; - }]; - - launchd.daemons.darwin-builder = { - command = "${darwin-builder.config.system.build.macos-builder-installer}/bin/create-builder"; - serviceConfig = { - KeepAlive = true; - RunAtLoad = true; - StandardOutPath = "/var/log/darwin-builder.log"; - StandardErrorPath = "/var/log/darwin-builder.log"; - }; + virtualisation = { + host.pkgs = pkgs; + darwin-builder.workingDirectory = "/var/lib/darwin-builder"; + darwin-builder.hostPort = 22; }; } ]; }; - }; + in + { - }; + darwinConfigurations = { + machine1 = darwinSystem { + inherit system; + modules = [ + { + nix.distributedBuilds = true; + nix.buildMachines = [ + { + hostName = "localhost"; + sshUser = "builder"; + sshKey = "/etc/nix/builder_ed25519"; + system = linuxSystem; + maxJobs = 4; + supportedFeatures = [ + "kvm" + "benchmark" + "big-parallel" + ]; + } + ]; + + launchd.daemons.darwin-builder = { + command = "${darwin-builder.config.system.build.macos-builder-installer}/bin/create-builder"; + serviceConfig = { + KeepAlive = true; + RunAtLoad = true; + StandardOutPath = "/var/log/darwin-builder.log"; + StandardErrorPath = "/var/log/darwin-builder.log"; + }; + }; + } + ]; + }; + }; + + }; } ``` @@ -154,21 +168,21 @@ To do this, you just need to set the `virtualisation.darwin-builder.*` parameter in the example below and rebuild. ```nix - { - darwin-builder = nixpkgs.lib.nixosSystem { - system = linuxSystem; - modules = [ - "${nixpkgs}/nixos/modules/profiles/nix-builder-vm.nix" - { - virtualisation.host.pkgs = pkgs; - virtualisation.darwin-builder.diskSize = 5120; - virtualisation.darwin-builder.memorySize = 1024; - virtualisation.darwin-builder.hostPort = 33022; - virtualisation.darwin-builder.workingDirectory = "/var/lib/darwin-builder"; - } - ]; - }; - } +{ + darwin-builder = nixpkgs.lib.nixosSystem { + system = linuxSystem; + modules = [ + "${nixpkgs}/nixos/modules/profiles/nix-builder-vm.nix" + { + virtualisation.host.pkgs = pkgs; + virtualisation.darwin-builder.diskSize = 5120; + virtualisation.darwin-builder.memorySize = 1024; + virtualisation.darwin-builder.hostPort = 33022; + virtualisation.darwin-builder.workingDirectory = "/var/lib/darwin-builder"; + } + ]; + }; +} ``` You may make any other changes to your VM in this attribute set. For example, diff --git a/doc/packages/eclipse.section.md b/doc/packages/eclipse.section.md index acf34b57571a..be554de6520b 100644 --- a/doc/packages/eclipse.section.md +++ b/doc/packages/eclipse.section.md @@ -15,11 +15,13 @@ If you prefer to install plugins in a more declarative manner, then Nixpkgs also ```nix { packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ plugins.color-theme ]; - }; + myEclipse = + with pkgs.eclipses; + eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ plugins.color-theme ]; + }; }; } ``` @@ -37,32 +39,34 @@ Expanding the previous example with two plugins using the above functions, we ha ```nix { packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ - plugins.color-theme - (plugins.buildEclipsePlugin { - name = "myplugin1-1.0"; - srcFeature = fetchurl { - url = "http://…/features/myplugin1.jar"; - hash = "sha256-123…"; - }; - srcPlugin = fetchurl { - url = "http://…/plugins/myplugin1.jar"; - hash = "sha256-123…"; - }; - }) - (plugins.buildEclipseUpdateSite { - name = "myplugin2-1.0"; - src = fetchurl { - stripRoot = false; - url = "http://…/myplugin2.zip"; - hash = "sha256-123…"; - }; - }) - ]; - }; + myEclipse = + with pkgs.eclipses; + eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ + plugins.color-theme + (plugins.buildEclipsePlugin { + name = "myplugin1-1.0"; + srcFeature = fetchurl { + url = "http://…/features/myplugin1.jar"; + hash = "sha256-123…"; + }; + srcPlugin = fetchurl { + url = "http://…/plugins/myplugin1.jar"; + hash = "sha256-123…"; + }; + }) + (plugins.buildEclipseUpdateSite { + name = "myplugin2-1.0"; + src = fetchurl { + stripRoot = false; + url = "http://…/myplugin2.zip"; + hash = "sha256-123…"; + }; + }) + ]; + }; }; } ``` diff --git a/doc/packages/emacs.section.md b/doc/packages/emacs.section.md index 2ced251f3e46..322ece4a348f 100644 --- a/doc/packages/emacs.section.md +++ b/doc/packages/emacs.section.md @@ -6,17 +6,21 @@ The Emacs package comes with some extra helpers to make it easier to configure. ```nix { - packageOverrides = pkgs: with pkgs; { - myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [ - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); - }; + packageOverrides = + pkgs: with pkgs; { + myEmacs = emacs.pkgs.withPackages ( + epkgs: + (with epkgs.melpaStablePackages; [ + company + counsel + flycheck + ivy + magit + projectile + use-package + ]) + ); + }; } ``` @@ -24,8 +28,8 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t ```nix { - packageOverrides = pkgs: with pkgs; rec { - myEmacsConfig = writeText "default.el" '' + packageOverrides = pkgs: { + myEmacsConfig = pkgs.writeText "default.el" '' (eval-when-compile (require 'use-package)) @@ -80,19 +84,22 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t (projectile-global-mode)) ''; - myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [ - (runCommand "default.el" {} '' - mkdir -p $out/share/emacs/site-lisp - cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el - '') - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); + myEmacs = emacs.pkgs.withPackages ( + epkgs: + (with epkgs.melpaStablePackages; [ + (runCommand "default.el" { } '' + mkdir -p $out/share/emacs/site-lisp + cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el + '') + company + counsel + flycheck + ivy + magit + projectile + use-package + ]) + ); }; } ``` @@ -108,11 +115,12 @@ let # ... }; in -((emacsPackagesFor emacs).overrideScope overrides).withPackages - (p: with p; [ +((emacsPackagesFor emacs).overrideScope overrides).withPackages ( + p: with p; [ # here both these package will use haskell-mode of our own choice ghc-mod dante - ]) + ] +) ``` } diff --git a/doc/packages/fish.section.md b/doc/packages/fish.section.md index 85b57acd1090..510d406b1ba1 100644 --- a/doc/packages/fish.section.md +++ b/doc/packages/fish.section.md @@ -42,9 +42,12 @@ way to test Fish plugins and scripts without having to alter the environment. ```nix wrapFish { - pluginPkgs = with fishPlugins; [ pure foreign-env ]; - completionDirs = []; - functionDirs = []; + pluginPkgs = with fishPlugins; [ + pure + foreign-env + ]; + completionDirs = [ ]; + functionDirs = [ ]; confDirs = [ "/path/to/some/fish/init/dir/" ]; } ``` diff --git a/doc/packages/ibus.section.md b/doc/packages/ibus.section.md index 0e379723da12..4f298db35943 100644 --- a/doc/packages/ibus.section.md +++ b/doc/packages/ibus.section.md @@ -9,7 +9,8 @@ IBus needs to be configured accordingly to activate `typing-booster`. The config On NixOS, you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module: ```nix -{ pkgs, ... }: { +{ pkgs, ... }: +{ i18n.inputMethod = { enable = true; type = "ibus"; @@ -23,7 +24,12 @@ On NixOS, you need to explicitly enable `ibus` with given engines before customi The IBus engine is based on `hunspell` to support completion in many languages. By default, the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this: ```nix -ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; } +ibus-engines.typing-booster.override { + langs = [ + "de-at" + "en-gb" + ]; +} ``` _Note: each language passed to `langs` must be an attribute name in `pkgs.hunspellDicts`._ @@ -35,7 +41,8 @@ The `ibus-engines.typing-booster` package contains a program named `emoji-picker On NixOS, it can be installed using the following expression: ```nix -{ pkgs, ... }: { +{ pkgs, ... }: +{ fonts.packages = with pkgs; [ noto-fonts-color-emoji ]; } ``` diff --git a/doc/packages/index.md b/doc/packages/index.md index 35bb6c1fe4ff..35e2656ab670 100644 --- a/doc/packages/index.md +++ b/doc/packages/index.md @@ -24,6 +24,8 @@ etc-files.section.md nginx.section.md opengl.section.md shell-helpers.section.md +python-tree-sitter.section.md +treefmt.section.md steam.section.md cataclysm-dda.section.md urxvt.section.md diff --git a/doc/packages/krita.section.md b/doc/packages/krita.section.md index ba427bd62ba1..f81068d73211 100644 --- a/doc/packages/krita.section.md +++ b/doc/packages/krita.section.md @@ -23,7 +23,7 @@ list of previous plugins via `pkgs.krita.binaryPlugins`: ```nix (pkgs.krita.override (old: { - binaryPlugins = old.binaryPlugins ++ [ your-plugin ]; + binaryPlugins = old.binaryPlugins ++ [ your-plugin ]; })) ``` diff --git a/doc/packages/python-tree-sitter.section.md b/doc/packages/python-tree-sitter.section.md new file mode 100644 index 000000000000..6ccaa31a6283 --- /dev/null +++ b/doc/packages/python-tree-sitter.section.md @@ -0,0 +1,56 @@ +# Python Tree Sitter {#python-tree-sitter} + +[Tree Sitter](https://tree-sitter.github.io/tree-sitter/) is a framework for building grammars for programming languages. It generates and uses syntax trees from source files, which are useful for code analysis, tooling, and syntax highlighting. + +Python bindings for Tree Sitter grammars are provided through the [py-tree-sitter](https://github.com/tree-sitter/py-tree-sitter) module. The Nix package `python3Packages.tree-sitter-grammars` provides pre-built grammars for various languages. + +For example, to experiment with the Rust grammar, you can create a shell environment with the following configuration: + +```nix +{ + pkgs ? { }, +}: + +pkgs.mkShell { + name = "py-tree-sitter-dev-shell"; + + buildInputs = with pkgs; [ + (python3.withPackages ( + ps: with ps; [ + tree-sitter + tree-sitter-grammars.tree-sitter-rust + ] + )) + ]; +} +``` + +Once inside the shell, the following Python code demonstrates how to parse a Rust code snippet: + +```python +# Import the Tree Sitter library and Rust grammar +import tree_sitter +import tree_sitter_rust + +# Load the Rust grammar and initialize the parser +rust = tree_sitter.Language(tree_sitter_rust.language()) +parser = tree_sitter.Parser(rust) + +# Parse a Rust snippet +tree = parser.parse( + bytes( + """ + fn main() { + println!("Hello, world!"); + } + """, + "utf8" + ) +) + +# Display the resulting syntax tree +print(tree.root_node) +``` + +The `tree_sitter_rust.language()` function references the Rust grammar loaded in the Nix shell. The resulting tree allows you to inspect the structure of the code programmatically. + diff --git a/doc/packages/treefmt.section.md b/doc/packages/treefmt.section.md new file mode 100644 index 000000000000..fbf38f5eb821 --- /dev/null +++ b/doc/packages/treefmt.section.md @@ -0,0 +1,23 @@ +# treefmt {#treefmt} + +[treefmt](https://github.com/numtide/treefmt) streamlines the process of applying formatters to your project, making it a breeze with just one command line. + +The [`treefmt` package](https://search.nixos.org/packages?channel=unstable&show=treefmt) +provides functions for configuring treefmt using the module system, which are [documented below](#sec-functions-library-treefmt), along with [their options](#sec-treefmt-options-reference). + +Alternatively, treefmt can be configured using [treefmt-nix](https://github.com/numtide/treefmt-nix). + +```{=include=} sections auto-id-prefix=auto-generated-treefmt-functions +treefmt-functions.section.md +``` + +## Options Reference {#sec-treefmt-options-reference} + +The following attributes can be passed to [`withConfig`](#pkgs.treefmt.withConfig) or [`evalConfig`](#pkgs.treefmt.evalConfig): + +```{=include=} options +id-prefix: opt-treefmt- +list-id: configuration-variable-list +source: ../treefmt-options.json +``` + diff --git a/doc/packages/urxvt.section.md b/doc/packages/urxvt.section.md index 1d40c92ed73f..e31f0756eb19 100644 --- a/doc/packages/urxvt.section.md +++ b/doc/packages/urxvt.section.md @@ -8,9 +8,15 @@ In `nixpkgs`, urxvt is provided by the package `rxvt-unicode`. It can be configu ```nix rxvt-unicode.override { - configure = { availablePlugins, ... }: { - plugins = with availablePlugins; [ perls resize-font vtwheel ]; - }; + configure = + { availablePlugins, ... }: + { + plugins = with availablePlugins; [ + perls + resize-font + vtwheel + ]; + }; } ``` @@ -20,9 +26,11 @@ In order to add plugins but also keep all default plugins installed, it is possi ```nix rxvt-unicode.override { - configure = { availablePlugins, ... }: { - plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ]; - }; + configure = + { availablePlugins, ... }: + { + plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ]; + }; } ``` @@ -40,9 +48,11 @@ In addition to `plugins` the options `extraDeps` and `perlDeps` can be used to i ```nix rxvt-unicode.override { - configure = { availablePlugins, ... }: { - pluginsDeps = [ xsel ]; - }; + configure = + { availablePlugins, ... }: + { + pluginsDeps = [ xsel ]; + }; } ``` @@ -50,9 +60,11 @@ rxvt-unicode.override { ```nix rxvt-unicode.override { - configure = { availablePlugins, ... }: { - perlDeps = with perlPackages; [ AnyEvent ]; - }; + configure = + { availablePlugins, ... }: + { + perlDeps = with perlPackages; [ AnyEvent ]; + }; } ``` diff --git a/doc/packages/weechat.section.md b/doc/packages/weechat.section.md index 295397f476b0..f175547de825 100644 --- a/doc/packages/weechat.section.md +++ b/doc/packages/weechat.section.md @@ -3,9 +3,16 @@ WeeChat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration, such as: ```nix -weechat.override {configure = ({availablePlugins, ...}: { - plugins = with availablePlugins; [ python perl ]; - }); +weechat.override { + configure = ( + { availablePlugins, ... }: + { + plugins = with availablePlugins; [ + python + perl + ]; + } + ); } ``` @@ -16,10 +23,18 @@ The plugins currently available are `python`, `perl`, `ruby`, `guile`, `tcl` and The Python and Perl plugins allows the addition of extra libraries. For instance, the `inotify.py` script in `weechat-scripts` requires D-Bus or libnotify, and the `fish.py` script requires `pycrypto`. To use these scripts, use the plugin's `withPackages` attribute: ```nix -weechat.override { configure = {availablePlugins, ...}: { - plugins = with availablePlugins; [ - (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) - ]; +weechat.override { + configure = + { availablePlugins, ... }: + { + plugins = with availablePlugins; [ + (python.withPackages ( + ps: with ps; [ + pycrypto + python-dbus + ] + )) + ]; }; } ``` @@ -27,23 +42,37 @@ weechat.override { configure = {availablePlugins, ...}: { In order to also keep all default plugins installed, it is possible to use the following method: ```nix -weechat.override { configure = { availablePlugins, ... }: { - plugins = builtins.attrValues (availablePlugins // { - python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]); - }); -}; } +weechat.override { + configure = + { availablePlugins, ... }: + { + plugins = builtins.attrValues ( + availablePlugins + // { + python = availablePlugins.python.withPackages ( + ps: with ps; [ + pycrypto + python-dbus + ] + ); + } + ); + }; +} ``` WeeChat allows to set defaults on startup using the `--run-command`. The `configure` method can be used to pass commands to the program: ```nix weechat.override { - configure = { availablePlugins, ... }: { - init = '' - /set foo bar - /server add libera irc.libera.chat - ''; - }; + configure = + { availablePlugins, ... }: + { + init = '' + /set foo bar + /server add libera irc.libera.chat + ''; + }; } ``` @@ -53,14 +82,18 @@ Additionally, it's possible to specify scripts to be loaded when starting `weech ```nix weechat.override { - configure = { availablePlugins, ... }: { - scripts = with pkgs.weechatScripts; [ - weechat-xmpp weechat-matrix-bridge wee-slack - ]; - init = '' - /set plugins.var.python.jabber.key "val" - ''; - }; + configure = + { availablePlugins, ... }: + { + scripts = with pkgs.weechatScripts; [ + weechat-xmpp + weechat-matrix-bridge + wee-slack + ]; + init = '' + /set plugins.var.python.jabber.key "val" + ''; + }; } ``` @@ -75,7 +108,10 @@ stdenv.mkDerivation { url = "https://scripts.tld/your-scripts.tar.gz"; hash = "..."; }; - passthru.scripts = [ "foo.py" "bar.lua" ]; + passthru.scripts = [ + "foo.py" + "bar.lua" + ]; installPhase = '' mkdir $out/share cp foo.py $out/share diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index e6a0905c5a95..56f089703021 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -42,7 +42,7 @@ shows the status of tests for the `nixpkgs-unstable` channel. The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/), which also builds binary packages from the Nix expressions in Nixpkgs for -`x86_64-linux`, `i686-linux` and `x86_64-darwin`. +`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`. The binaries are made available via a [binary cache](https://cache.nixos.org). The current Nix expressions of the channels are available in the diff --git a/doc/redirects.json b/doc/redirects.json index 2a8069a490bb..1bcf2a8bf52c 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -5,9 +5,32 @@ "chap-release-notes": [ "release-notes.html#chap-release-notes" ], + "chap-toolchains": [ + "index.html#chap-toolchains" + ], + "cmake-ctest": [ + "index.html#cmake-ctest" + ], + "cmake-ctest-disabled-tests": [ + "index.html#cmake-ctest-disabled-tests" + ], + "cmake-ctest-flags": [ + "index.html#cmake-ctest-flags" + ], + "cmake-ctest-variables": [ + "index.html#cmake-ctest-variables" + ], "ex-build-helpers-extendMkDerivation": [ "index.html#ex-build-helpers-extendMkDerivation" ], + "ex-pkgs-replace-vars": [ + "index.html#ex-pkgs-replace-vars", + "index.html#ex-pkgs-substituteAll", + "index.html#ex-pkgs-substitute-all-files" + ], + "ex-pkgs-replace-vars-with": [ + "index.html#ex-pkgs-replace-vars-with" + ], "ex-shfmt": [ "index.html#ex-shfmt" ], @@ -35,6 +58,29 @@ "no-broken-symlinks.sh": [ "index.html#no-broken-symlinks.sh" ], + "nostrictaliasing": [ + "index.html#nostrictaliasing" + ], + "pkgs-replacevars": [ + "index.html#pkgs-replacevars", + "index.html#pkgs-substituteall", + "index.html#pkgs-substituteallfiles" + ], + "pkgs-replacevarswith": [ + "index.html#pkgs-replacevarswith" + ], + "part-toolchains": [ + "index.html#part-toolchains" + ], + "pkgs.treefmt.buildConfig": [ + "index.html#pkgs.treefmt.buildConfig" + ], + "pkgs.treefmt.evalConfig": [ + "index.html#pkgs.treefmt.evalConfig" + ], + "pkgs.treefmt.withConfig": [ + "index.html#pkgs.treefmt.withConfig" + ], "preface": [ "index.html#preface" ], @@ -50,6 +96,9 @@ "chap-packageconfig": [ "index.html#chap-packageconfig" ], + "python-tree-sitter": [ + "index.html#python-tree-sitter" + ], "sec-allow-broken": [ "index.html#sec-allow-broken" ], @@ -65,6 +114,15 @@ "sec-build-helper-extendMkDerivation": [ "index.html#sec-build-helper-extendMkDerivation" ], + "sec-building-packages-with-llvm": [ + "index.html#sec-building-packages-with-llvm" + ], + "sec-building-packages-with-llvm-using-clang-stdenv": [ + "index.html#sec-building-packages-with-llvm-using-clang-stdenv" + ], + "sec-functions-library-treefmt": [ + "index.html#sec-functions-library-treefmt" + ], "sec-inkscape": [ "index.html#sec-inkscape" ], @@ -92,6 +150,30 @@ "chap-overlays": [ "index.html#chap-overlays" ], + "sec-nixpkgs-release-25.11": [ + "release-notes.html#sec-nixpkgs-release-25.11" + ], + "sec-nixpkgs-release-25.11-highlights": [ + "release-notes.html#sec-nixpkgs-release-25.11-highlights" + ], + "sec-nixpkgs-release-25.11-incompatibilities": [ + "release-notes.html#sec-nixpkgs-release-25.11-incompatibilities" + ], + "sec-nixpkgs-release-25.11-lib": [ + "release-notes.html#sec-nixpkgs-release-25.11-lib" + ], + "sec-nixpkgs-release-25.11-lib-breaking": [ + "release-notes.html#sec-nixpkgs-release-25.11-lib-breaking" + ], + "sec-nixpkgs-release-25.11-lib-deprecations": [ + "release-notes.html#sec-nixpkgs-release-25.11-lib-deprecations" + ], + "sec-nixpkgs-release-25.11-lib-additions-improvements": [ + "release-notes.html#sec-nixpkgs-release-25.11-lib-additions-improvements" + ], + "sec-nixpkgs-release-25.11-notable-changes": [ + "release-notes.html#sec-nixpkgs-release-25.11-notable-changes" + ], "sec-nixpkgs-release-25.05": [ "release-notes.html#sec-nixpkgs-release-25.05" ], @@ -326,6 +408,9 @@ "chap-stdenv": [ "index.html#chap-stdenv" ], + "sec-using-llvm": [ + "index.html#sec-using-llvm" + ], "sec-using-stdenv": [ "index.html#sec-using-stdenv" ], @@ -335,6 +420,9 @@ "sec-tools-of-stdenv": [ "index.html#sec-tools-of-stdenv" ], + "sec-treefmt-options-reference": [ + "index.html#sec-treefmt-options-reference" + ], "ssec-cosmic-common-issues": [ "index.html#ssec-cosmic-common-issues" ], @@ -410,6 +498,33 @@ "tester-testEqualArrayOrMap-return": [ "index.html#tester-testEqualArrayOrMap-return" ], + "treefmt": [ + "index.html#treefmt" + ], + "typst": [ + "index.html#typst", + "doc/languages-frameworks/typst.section.md#typst" + ], + "typst-custom-environment": [ + "index.html#typst-custom-environment", + "doc/languages-frameworks/typst.section.md#typst-custom-environment" + ], + "typst-custom-packages": [ + "index.html#typst-custom-packages", + "doc/languages-frameworks/typst.section.md#typst-custom-packages" + ], + "typst-handling-outdated-package-hashes": [ + "index.html#typst-handling-outdated-package-hashes" + ], + "typst-package-scope-and-usage": [ + "index.html#typst-package-scope-and-usage" + ], + "var-meta-teams": [ + "index.html#var-meta-teams" + ], + "var-go-goSum": [ + "index.html#var-go-goSum" + ], "variables-specifying-dependencies": [ "index.html#variables-specifying-dependencies" ], @@ -1058,6 +1173,9 @@ "var-meta-broken": [ "index.html#var-meta-broken" ], + "var-meta-knownVulnerabilities": [ + "index.html#var-meta-knownVulnerabilities" + ], "sec-meta-license": [ "index.html#sec-meta-license" ], @@ -2064,6 +2182,9 @@ "setup-hook-automake": [ "index.html#setup-hook-automake" ], + "setup-hook-autopatchcilhook": [ + "index.html#setup-hook-autopatchcilhook" + ], "setup-hook-autopatchelfhook": [ "index.html#setup-hook-autopatchelfhook" ], @@ -3184,6 +3305,12 @@ "javascript-yarn": [ "index.html#javascript-yarn" ], + "javascript-yarn-v1": [ + "index.html#javascript-yarn-v1" + ], + "javascript-yarn-v3-v4": [ + "index.html#javascript-yarn-v3-v4" + ], "javascript-yarnconfighook": [ "index.html#javascript-yarnconfighook" ], @@ -3211,6 +3338,18 @@ "javascript-yarn2nix-pitfalls": [ "index.html#javascript-yarn2nix-pitfalls" ], + "javascript-yarnBerry-missing-hashes": [ + "index.html#javascript-yarnBerry-missing-hashes" + ], + "javascript-yarnBerryConfigHook": [ + "index.html#javascript-yarnBerryConfigHook" + ], + "javascript-yarnBerry-patching": [ + "index.html#javascript-yarnBerry-patching" + ], + "javascript-fetchYarnBerryDeps": [ + "index.html#javascript-fetchYarnBerryDeps" + ], "javascript-outside-nixpkgs": [ "index.html#javascript-outside-nixpkgs" ], @@ -4166,18 +4305,6 @@ "ex-pkgs-substitute": [ "index.html#ex-pkgs-substitute" ], - "pkgs-substituteall": [ - "index.html#pkgs-substituteall" - ], - "ex-pkgs-substituteAll": [ - "index.html#ex-pkgs-substituteAll" - ], - "pkgs-substituteallfiles": [ - "index.html#pkgs-substituteallfiles" - ], - "ex-pkgs-substitute-all-files": [ - "index.html#ex-pkgs-substitute-all-files" - ], "part-development": [ "index.html#part-development" ], diff --git a/doc/release-notes/release-notes.md b/doc/release-notes/release-notes.md index 454ea7c50a9e..0f4df3086f43 100644 --- a/doc/release-notes/release-notes.md +++ b/doc/release-notes/release-notes.md @@ -3,5 +3,6 @@ This section lists the release notes for each stable version of Nixpkgs and current unstable revision. ```{=include=} sections +rl-2511.section.md rl-2505.section.md ``` diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 6a6a797269c6..8ae1797aaf1a 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -15,6 +15,9 @@ - GCC has been updated from GCC 13 to GCC 14. This introduces some backwards‐incompatible changes; see the [upstream porting guide](https://gcc.gnu.org/gcc-14/porting_to.html) for details. +- The default GHC version has been updated from 9.6 to 9.8. + `haskellPackages` also uses Stackage LTS 23 (instead of LTS 22) as a baseline. + - LLVM has been updated from LLVM 16 (on Darwin) and LLVM 18 (on other platforms) to LLVM 19. This introduces some backwards‐incompatible changes; see the [upstream release notes](https://releases.llvm.org/) for details. @@ -25,14 +28,14 @@ NEWS can been viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar. It can also be browsed [online](https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30). +- The default openexr version has been updated to 3.2.4. + - The default PHP version has been updated to 8.4. - The default Erlang OTP version has been updated to 27. - The default Elixir version has been updated to 1.18. -- `buildPythonPackage`, `buildPythonApplication` and the Python building setup hooks now support both `__structuredAttrs = true` and `__structuredAttrs = false`. - ## Backward Incompatibilities {#sec-nixpkgs-release-25.05-incompatibilities} @@ -46,16 +49,36 @@ - `squid` has been updated to version 7, this release includes multiple breaking changes, like ESI removal. For more information, [check the release notes](https://github.com/squid-cache/squid/releases/tag/SQUID_7_0_1). +- `postgresql` and `libpq` don't provide `pg_config` by default anymore. Instead, `pg_config` is available via `postgresql.pg_config` or `libpq.pg_config`. This allowed implementing it as a shell script, which can be built for both the build and host systems when cross-compiling. If your build fails to find `pg_config`, add `postgresql.pg_config` or `libpq.pg_config` to `nativeBuildInputs`. + - The [`no-broken-symlinks` hook](https://nixos.org/manual/nixpkgs/unstable/#no-broken-symlinks.sh) was added to catch builds containing dangling or reflexive symlinks, as these are indicative of problems with packaging. The hook can be disabled by providing `dontCheckForBrokenSymlinks = true;` as an argument to `mkDerivation`. For more information, [check the docs](https://nixos.org/manual/nixpkgs/unstable/#no-broken-symlinks.sh) or [see this PR](https://github.com/NixOS/nixpkgs/pull/370750). +- `opensmtpd-extras` has been deprecated by upstream and is not compatible with + OpenSMTPD 7.6.0 or later. The package has been removed in favor of a set of new + `opensmtpd-table-*` packages. + +- `postsrsd` upgraded to `>= 2.0.0`, with some different behaviors and + configuration settings. Notably, it now defaults to listening on a socket + rather than a port. See [Migrating from version 1.x](https://github.com/roehling/postsrsd/blob/2.0.10/README.rst#migrating-from-version-1x) and [Postfix Setup](https://github.com/roehling/postsrsd?tab=readme-ov-file#postfix-setup) for details. + - The hand written `perlPackages.SearchXapian` bindings have been dropped in favor of the (mostly compatible) `perlPackages.Xapian`. +- The `config` triple for `aarch64-darwin` has been changed from `aarch64-apple-darwin` to `arm64-apple-darwin` to match the Apple toolchain and LLVM’s expectations. + +- The `electron` packages will now provide their headers (available via `electron.headers`) in extracted form instead of in a tarball. + +- The `ephemeral` package was removed due to upstream archival in early 2022. + +- The `vocal` package was removed due to upstream archival. The upstream developer suggests using `gnome-podcasts` or `kasts` instead. + - [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided. The `name` argument will become mandatory in a future release. +- [GIMP 3.0](https://www.gimp.org/news/2025/03/16/gimp-3-0-released/) available as `gimp3`. + - `grafana-agent` and `services.grafana-agent` have been removed in favor of Grafana Alloy (`grafana-alloy` and `services.alloy`), as they depend on an EOL compiler version and will become EOL during the 25.05 lifecycle. @@ -70,6 +93,8 @@ The `nixLog` function, which logs unconditionally, was also re-introduced and modified to prefix messages with the function name of the caller. For more information, [see this PR](https://github.com/NixOS/nixpkgs/pull/370742). +- `postgresql`'s `pythonSupport` argument has been changed. It is now enabled by default, but to use PL/Python the extension needs to be added explicitly with `postgresql.withPackages`. If you were using `postgresql.override { pythonSupport = true; }` before, change it to `postgresql.withPackages (ps: [ ps.plpython3 ])`. The same applies to `perlSupport`/`plperl` and `tclSupport`/`pltcl` respectively. + - Rust packages will need to regenerate their `cargoHash`. Cargo 1.84.0 changed the format of `cargo vendor` output, which invalidated all existing `rustPlatform.fetchCargoTarball` hashes. To preserve Nix’s invariants, it has been replaced with `rustPlatform.fetchCargoVendor`, an independent implementation prioritizing format stability. @@ -77,6 +102,10 @@ Packages wishing to maintain compatibility with Nixpkgs 24.11 must set `useFetchCargoVendor` to `true` explicitly. `rustPlatform.importCargoLock` may also be appropriate in some circumstances. +- `cassandra_3_0` and `cassandra_3_11` have been removed as they have reached end-of-life. Please update to `cassandra_4`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-4.0.17/NEWS.txt) for more information about the upgrade process. + +- `mariadb_105` has been removed as it has reached end-of-life in 2025-06. Please update to `mariadb_106`. + - NetBox was updated to `>= 4.2.0`. Have a look at the breaking changes of the [4.1 release](https://github.com/netbox-community/netbox/releases/tag/v4.1.0) and the [4.2 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0), @@ -90,8 +119,14 @@ - `ocis-bin` has been renamed to `ocis_5-bin`. Future versions will have the major version suffix. +- All support for 32‐bit Darwin systems has been dropped. + +- `substituteAll` and `substituteAllFiles` have been deprecated in favor of `replaceVars` and will be removed in the next release. + - Default ICU version updated from 74 to 76 +- The packages `signald`, `signaldctl` and `purple-signald` have been dropped as they are unmaintained upstream and have been incompatible with the official Signal servers for a long while. + - Apache Kafka was updated to `>= 4.0.0`. Please note that this is the first release which operates entirely without Apache ZooKeeper support, and all clusters need to be migrated to KRaft mode. See the [release announcement](https://kafka.apache.org/blog#apache_kafka_400_release_announcement) @@ -108,7 +143,9 @@ - `binwalk` was updated to 3.1.0, which has been rewritten in rust. The python module is no longer available. See the release notes of [3.1.0](https://github.com/ReFirmLabs/binwalk/releases/tag/v3.1.0) for more information. -- `pkgs.nextcloud28` has been removed since it's out of support upstream. +- `pkgs.nextcloud28` and `pkgs.nextcloud29` have been removed since they are out of support upstream. + +- `centrifugo` was updated to v6, which uses a new config format. See [upstream documentation](https://centrifugal.dev/docs/getting-started/migration_v6) for migration. - `teleport` has been upgraded from major version 16 to major version 17. Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/) @@ -125,6 +162,8 @@ - `buildGoPackage` has been removed. Use `buildGoModule` instead. See the [Go section in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-language-go) for details. +- `buildGoModule` now supports a `goSum` attribute (`null` by default) to optionally provide a path to `go.sum` and correctly enabling rebuilds when the file changes. + - top-level `playwright` now refers to the github Microsoft/playwright package instead of the python tester launcher. You can still refer to the python launcher via `python3Packages.toPythonApplication python3Packages.playwright` @@ -141,6 +180,8 @@ - The `haka` package and module has been removed because the package was broken and unmaintained for 9 years. +- The `gsignond` package, plugins and module have been removed because they were unmaintained for 6 years. + - `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package and `withGstreamer`/`withVlc` override options have been removed due to this. @@ -165,6 +206,10 @@ - `mkBinaryCache` now defaults to using `zstd` compression for the binary caches it creates. The previous `xz` compression method can be used by passing `compression = "xz";`. +- `nodejs_latest` was updated from 23.x to 24.x. `nodejs_23` has been removed in favor of `nodejs_24`. + +- `nodejs_18` package was removed due to upstream End-of-Life in April 2025. + - `nodePackages."@commitlint/config-conventional"` has been removed, as it is a library, and projects should depend on it instead. - zigbee2mqtt is now available in version 2.x as `zigbee2mqtt_2`. In NixOS 25.11 we'll remove `zigbee2mqtt_1` and default to `zigbee2mqtt_2`. See the [breaking changes](https://github.com/Koenkk/zigbee2mqtt/discussions/24198) announcement for 2.0.0. @@ -185,6 +230,10 @@ - `pnpm` was updated to version 10. If your project is incompatible, you can install the previous version from the package attribute `pnpm_9`. +- `dwarf-fortress-packages` now only contains one minor version for each major version since version 0.44. Saves should still be compatible, but you may have to change which minor version you were using if it was one other than the newest. + +- `tpm2-pkcs11` now is compiled without abrmd (Access Broker and Resource Manager Daemon) support by default, preferring the kernel resource manager. Use `tpm2-pkcs11.abrmd` if you would like a version with abrmd support. Note that the NixOS module picks the correct one automatically based on `security.tpm2.abrmd`. + - `zig_0_9` and `zig_0_10` have been removed, you should upgrade to `zig_0_13` (also available as just `zig`), `zig_0_12` or `zig_0_11` instead. - `webpack-cli` was updated to major version 6, which has breaking changes from the previous version 5.1.4. See the [upstream release notes](https://github.com/webpack/webpack-cli/releases/tag/webpack-cli%406.0.0) for details on these changes. @@ -205,6 +254,9 @@ - `fluxus` has been removed, as it depends on `racket_7_9` and had no updates in 9 years. +- `meilisearch` has been upgraded from 1.11.3 to 1.14.0, which requires manually dumping and importing the data. + See Meilisearch's [upgrade guide](https://www.meilisearch.com/docs/learn/update_and_migration/updating) for more information. + - `sm64ex-coop` has been removed as it was archived upstream. Consider migrating to `sm64coopdx`. - `tldr` now uses [`tldr-python-client`](https://github.com/tldr-pages/tldr-python-client) instead of [`tldr-c-client`](https://github.com/tldr-pages/tldr-c-client) which is unmaintained. @@ -220,7 +272,7 @@ - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. -- The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific older versions; those will continue to be maintained as long as other packages depend on them but may be removed in the future. +- The default version of `z3` has been updated from 4.8 to 4.14, and all old versions have been dropped. Note that `fstar` still depends on specific versions, and maintains them as overrides. - `prometheus` has been updated from 2.55.0 to 3.1.0. Read the [release blog post](https://prometheus.io/blog/2024/11/14/prometheus-3-0/) and @@ -252,6 +304,11 @@ For those unable to upgrade yet, there is a [v0 compatibility mode](https://www.openpolicyagent.org/docs/v1.0.1/v0-compatibility/) available too. +- `helmfile` was updated to v1.0.0, which introduces several breaking changes. + See the release notes of + [v1.0.0](https://github.com/helmfile/helmfile/releases/v1.0.0) for more + information. + - `vscode-utils.buildVscodeExtension` now requires pname as an argument - `nerdfonts` has been separated into individual font packages under the namespace `nerd-fonts`. The directories for font @@ -273,6 +330,7 @@ - `docker_24` has been removed, as it was EOL with vulnerabilities since June 08, 2024. - Emacs 28 and 29 have been removed. +- Emacs 28 Macport has been removed, while CVEs of Emacs 29 Macport are patched. - `containerd` has been updated to v2, which contains breaking changes. See the [containerd 2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more @@ -287,12 +345,12 @@ add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the vim plugin. -- `prisma` and `prisma-engines` have been updated to version 6.3.0, which +- `prisma` and `prisma-engines` have been updated to version 6.7.0, which introduces several breaking changes. See the [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6) for more information. -- `depdendency-track` no longer bundes the UI inside the jar. This bundling +- `dependency-track` no longer bundes the UI inside the jar. This bundling functionality is deprecated by upstream and causes UI assets not being served after weeks of runtime. @@ -314,21 +372,38 @@ ## Other Notable Changes {#sec-nixpkgs-release-25.05-notable-changes} +- `i18n` module improvements: + - `i18n.extraLocales` should now be the preferred way to install additional locales. + - `i18n.supportedLocales` is now considered an implementation detail and will be hidden from the documentation. But the option will still continue to work. + - `i18n.supportedLocales` will now trigger a warning when it omits any locale set in `i18n.defaultLocale`, `i18n.extraLocales` or `i18n.extraLocaleSettings`. + - The options `i18n.defaultCharset` & `i18n.localeCharsets` were added, and they complement `i18n.defaultLocale` & `i18n.extraLocaleSettings` respectively - allowing to control the character set used per locale setting. + - `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs []{#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}. +- androidenv has been improved: + - All versions specified in composeAndroidPackages now track the latest. Android packages are automatically updated on unstable, and run the androidenv test suite on every update. + - Many androidenv packages are now searchable on [search.nixos.org](https://search.nixos.org). + - We now use the latest Google repositories, which should improve aarch64-darwin compatibility. The SDK now additionally evaluates on aarch64-linux, though not all packages are functional. + +- `dwarf-fortress` audio now works again. Additionally, the `dfhack` and `dwarf-fortress-full` packages are now exposed at toplevel, making it easier to install and play Dwarf Fortress. Note that `dwarf-fortress-full` is the Nixpkgs equivalent of the Dwarf Fortress Lazy Pack. + - `gerbera` now has wavpack support. - GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details. +- `tpm2-pkcs11` now has the variant `tpm2-pkcs11-fapi`, which has been patched to default to the Feature API backend. It has also been split into `tpm2-pkcs11-esapi`, which _only_ supports the older Enhanced System API backend. Note the [differences](https://github.com/tpm2-software/tpm2-pkcs11/blob/1.9.1/docs/FAPI.md), and that `tpm2-pkcs11` itself still needs `TPM2_PKCS11_BACKEND=fapi` exported in order to use the Feature API, whereas `tpm2-pkcs11-fapi` does not, and `tpm2-pkcs11-esapi` just does not support fapi entirely. + - For matrix homeserver Synapse we are now following the upstream recommendation to enable jemalloc as the memory allocator by default. - In `dovecot` package removed hard coding path to module directory. +- `signal-desktop` has been migrated to a from source build. No state migration is necessary. In case there's no working source build available (like on Darwin), the the binary build is still available at `signal-desktop-bin`. + - `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0) ### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded} -- `nexusmods-app` has been upgraded from version 0.6.3 to 0.8.3. +- `nexusmods-app` has been upgraded from version 0.6.3 to 0.10.2. - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present. @@ -352,6 +427,8 @@ - [`lib.packagesFromDirectoryRecursive`] now rejects unknown arguments. [`lib.packagesFromDirectoryRecursive`]: https://nixos.org/manual/nixpkgs/stable/#function-library-lib.filesystem.packagesFromDirectoryRecursive +- The `godot-export-templates` package now has its content at `share/godot/export_templates/$version` instead of the output root. This makes it more convenient for for symlinking into `~/.local`, but scripts expecting the old layout will need to be changed. + ### Deprecations {#sec-nixpkgs-release-25.05-lib-deprecations} - `functor` is an implementation detail and should not be relied upon, but since its status wasn't clear and it has had some use cases without alternatives, changes are being handled as gracefully as possible. Deprecations within functor: @@ -364,6 +441,10 @@ - `lib.types.coercedTo` - `lib.types.either` +- The `testTarget` argument of `haskellPackages.mkDerivation` has been deprecated in favour of `testTargets`. + `testTarget` took a space separated string of targets, whereas the new `testTargets` argument takes a list of targets. + For instance, `testTarget = "foo bar baz"` should become `testTargets = [ "foo" "bar" "baz" ]`. + - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6. - `rustPlatform.buildRustPackage` stops handling the deprecated argument `cargoSha256`. Out-of-tree packages that haven't migrated from `cargoSha256` to `cargoHash` now receive errors. diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md new file mode 100644 index 000000000000..da42ae4326de --- /dev/null +++ b/doc/release-notes/rl-2511.section.md @@ -0,0 +1,36 @@ +# Nixpkgs 25.11 ("Xantusia", 2025.11/??) {#sec-nixpkgs-release-25.11} + +## Highlights {#sec-nixpkgs-release-25.11-highlights} + + +- Added `allowVariants` to gate availability of package sets like `pkgsLLVM`, `pkgsMusl`, `pkgsZig`, etc. + +## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities} + + + +- Create the first release note entry in this section! + +## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes} + + + +- Create the first release note entry in this section! + +## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib} + + + +### Breaking changes {#sec-nixpkgs-release-25.11-lib-breaking} + +- Create the first release note entry in this section! + + +### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations} + +- Create the first release note entry in this section! + + +### Additions and Improvements {#sec-nixpkgs-release-25.11-lib-additions-improvements} + +- Create the first release note entry in this section! diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index b06a8ab93a70..e115d9d103ae 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -15,7 +15,13 @@ Nixpkgs follows the [conventions of GNU autoconf](https://gcc.gnu.org/onlinedocs In Nixpkgs, these three platforms are defined as attribute sets under the names `buildPlatform`, `hostPlatform`, and `targetPlatform`. They are always defined as attributes in the standard environment. That means one can access them like: ```nix -{ stdenv, fooDep, barDep, ... }: { +{ + stdenv, + fooDep, + barDep, + ... +}: +{ # ...stdenv.buildPlatform... } ``` @@ -169,11 +175,13 @@ e.g. ```nix { - nativeBuildInputs = [ - meson - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; + nativeBuildInputs = + [ + meson + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; } ``` diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index ddd5eb45441a..18cf5be10d45 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -91,6 +91,10 @@ For details, see [Source provenance](#sec-meta-sourceProvenance). A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice” in the same pull request, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`. +### `teams` {#var-meta-teams} + +A list of the teams of this Nix expression. Teams are defined in [`nixpkgs/maintainers/team-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/team-list.nix), and can be defined in a package with `meta.teams = with lib.teams; [ team1 team2 ]`. + ### `mainProgram` {#var-meta-mainProgram} The name of the main binary for the package. This affects the binary `nix run` executes. Example: `"rg"` @@ -145,7 +149,7 @@ The list of Nix platform types for which the [Hydra](https://github.com/nixos/hy ```nix { meta.platforms = lib.platforms.linux; - meta.hydraPlatforms = []; + meta.hydraPlatforms = [ ]; } ``` @@ -169,13 +173,34 @@ This means that `broken` can be used to express constraints, for example: ```nix { - meta.broken = lib.all (map (p: p.meta.broken) [ glibc musl ]); + meta.broken = lib.all ( + map (p: p.meta.broken) [ + glibc + musl + ] + ); } ``` This makes `broken` strictly more powerful than `meta.badPlatforms`. However `meta.availableOn` currently examines only `meta.platforms` and `meta.badPlatforms`, so `meta.broken` does not influence the default values for optional dependencies. +## `knownVulnerabilities` {#var-meta-knownVulnerabilities} + +A list of known vulnerabilities affecting the package, usually identified by CVE identifiers. + +This metadata allows users and tools to be aware of unresolved security issues before using the package, for example: + +```nix +{ + meta.knownVulnerabilities = [ + "CVE-2024-3094: Malicious backdoor allowing unauthorized remote code execution" + ]; +} +``` + +If this list is not empty, the package is marked as "insecure", meaning that it cannot be built or installed unless the environment variable [`NIXPKGS_ALLOW_INSECURE`](#sec-allow-insecure) is set. + ## Licenses {#sec-meta-license} The `meta.license` attribute should preferably contain a value from `lib.licenses` defined in [`nixpkgs/lib/licenses.nix`](https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix), or in-place license description of the same format if the license is unlikely to be useful in another expression. diff --git a/doc/stdenv/multiple-output.chapter.md b/doc/stdenv/multiple-output.chapter.md index 09fdba01c44a..9140f5a952b7 100644 --- a/doc/stdenv/multiple-output.chapter.md +++ b/doc/stdenv/multiple-output.chapter.md @@ -31,7 +31,12 @@ In nixpkgs there is a framework supporting multiple-output derivations. It tries ```nix { - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ + "bin" + "dev" + "out" + "doc" + ]; } ``` diff --git a/doc/stdenv/passthru.chapter.md b/doc/stdenv/passthru.chapter.md index 0c0b03fd0dc2..db40d4bbe054 100644 --- a/doc/stdenv/passthru.chapter.md +++ b/doc/stdenv/passthru.chapter.md @@ -18,7 +18,9 @@ Its value can be accessed as if it was set inside a derivation. let hello = stdenv.mkDerivation { pname = "hello"; - src = fetchGit { /* ... */ }; + src = fetchGit { + # ... + }; passthru = { foo = "bar"; diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 80059a78733c..6851294ddf96 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -20,14 +20,14 @@ stdenv.mkDerivation { **Since [RFC 0035](https://github.com/NixOS/rfcs/pull/35), this is preferred for packages in Nixpkgs**, as it allows us to reuse the version easily: ```nix -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfoo"; version = "1.2.3"; src = fetchurl { - url = "http://example.org/libfoo-source-${version}.tar.bz2"; + url = "http://example.org/libfoo-source-${finalAttrs.version}.tar.bz2"; hash = "sha256-tWxU/LANbQE32my+9AXyt3nCT7NBVfJ45CX757EMT3Q="; }; -} +}) ``` Many packages have dependencies that are not provided in the standard environment. It’s usually sufficient to specify those dependencies in the `buildInputs` attribute: @@ -37,7 +37,11 @@ stdenv.mkDerivation { pname = "libfoo"; version = "1.2.3"; # ... - buildInputs = [libbar perl ncurses]; + buildInputs = [ + libbar + perl + ncurses + ]; } ``` @@ -49,13 +53,24 @@ Often it is necessary to override or modify some aspect of the build. To make th stdenv.mkDerivation { pname = "fnord"; version = "4.5"; + # ... + buildPhase = '' + runHook preBuild + gcc foo.c -o foo + + runHook postBuild ''; + installPhase = '' + runHook preInstall + mkdir -p $out/bin cp foo $out/bin + + runHook postInstall ''; } ``` @@ -208,16 +223,20 @@ These dependencies are only injected when [`doCheck`](#var-stdenv-doCheck) is se Consider for example this simplified derivation for `solo5`, a sandboxing tool: ```nix -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "solo5"; version = "0.7.5"; src = fetchurl { - url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; + url = "https://github.com/Solo5/solo5/releases/download/v${finalAttrs.version}/solo5-v${finalAttrs.version}.tar.gz"; hash = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; }; - nativeBuildInputs = [ makeWrapper pkg-config ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + buildInputs = [ libseccomp ]; postInstall = '' @@ -227,13 +246,23 @@ stdenv.mkDerivation rec { --replace-fail "cp " "cp --no-preserve=mode " wrapProgram $out/bin/solo5-virtio-mkimage \ - --prefix PATH : ${lib.makeBinPath [ dosfstools mtools parted syslinux ]} + --prefix PATH : ${ + lib.makeBinPath [ + dosfstools + mtools + parted + syslinux + ] + } ''; doCheck = true; - nativeCheckInputs = [ util-linux qemu ]; - checkPhase = '' [elided] ''; -} + nativeCheckInputs = [ + util-linux + qemu + ]; + checkPhase = ''[elided]''; +}) ``` - `makeWrapper` is a setup hook, i.e., a shell script sourced by the generic builder of `stdenv`. @@ -272,7 +301,7 @@ This can lead to conflicting dependencies that cannot easily be resolved. # A propagated dependency ```nix -with import {}; +with import { }; let bar = stdenv.mkDerivation { name = "bar"; @@ -442,8 +471,7 @@ If you pass a function to `mkDerivation`, it will receive as its argument the fi mkDerivation (finalAttrs: { pname = "hello"; withFeature = true; - configureFlags = - lib.optionals finalAttrs.withFeature ["--with-feature"]; + configureFlags = lib.optionals finalAttrs.withFeature [ "--with-feature" ]; }) ``` @@ -460,28 +488,32 @@ various bindings: ```nix # `pkg` is the _original_ definition (for illustration purposes) -let pkg = - mkDerivation (finalAttrs: { +let + pkg = mkDerivation (finalAttrs: { # ... # An example attribute - packages = []; + packages = [ ]; # `passthru.tests` is a commonly defined attribute. passthru.tests.simple = f finalAttrs.finalPackage; # An example of an attribute containing a function - passthru.appendPackages = packages': - finalAttrs.finalPackage.overrideAttrs (newSelf: super: { - packages = super.packages ++ packages'; - }); + passthru.appendPackages = + packages': + finalAttrs.finalPackage.overrideAttrs ( + newSelf: super: { + packages = super.packages ++ packages'; + } + ); # For illustration purposes; referenced as # `(pkg.overrideAttrs(x)).finalAttrs` etc in the text below. passthru.finalAttrs = finalAttrs; passthru.original = pkg; }); -in pkg +in +pkg ``` Unlike the `pkg` binding in the above example, the `finalAttrs` parameter always references the final attributes. For instance `(pkg.overrideAttrs(x)).finalAttrs.finalPackage` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as the original `pkg`. @@ -955,7 +987,7 @@ To make GDB find debug information for the `socat` package and its dependencies, ```nix let pkgs = import ./. { - config = {}; + config = { }; overlays = [ (final: prev: { ncurses = prev.ncurses.overrideAttrs { separateDebugInfo = true; }; @@ -974,19 +1006,19 @@ let ]; }; in - pkgs.mkShell { +pkgs.mkShell { - NIX_DEBUG_INFO_DIRS = "${pkgs.lib.getLib myDebugInfoDirs}/lib/debug"; + NIX_DEBUG_INFO_DIRS = "${pkgs.lib.getLib myDebugInfoDirs}/lib/debug"; - packages = [ - pkgs.gdb - pkgs.socat - ]; + packages = [ + pkgs.gdb + pkgs.socat + ]; - shellHook = '' - ${pkgs.lib.getBin pkgs.gdb}/bin/gdb ${pkgs.lib.getBin pkgs.socat}/bin/socat - ''; - } + shellHook = '' + ${pkgs.lib.getBin pkgs.gdb}/bin/gdb ${pkgs.lib.getBin pkgs.socat}/bin/socat + ''; +} ``` This setup works as follows: @@ -1109,12 +1141,15 @@ They cannot be overridden without rebuilding the package. If dependencies should be resolved at runtime, use `--suffix` to append fallback values to `PATH`. -There’s many more kinds of arguments, they are documented in `nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh` for the `makeWrapper` implementation and in `nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh` for the `makeBinaryWrapper` implementation. +There’s many more kinds of arguments, they are documented in `nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh` for the `makeWrapper` implementation and in `nixpkgs/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh` for the `makeBinaryWrapper` implementation. `wrapProgram` is a convenience function you probably want to use most of the time, implemented by both `makeWrapper` and `makeBinaryWrapper`. Using the `makeBinaryWrapper` implementation is usually preferred, as it creates a tiny _compiled_ wrapper executable, that can be used as a shebang interpreter. This is needed mostly on Darwin, where shebangs cannot point to scripts, [due to a limitation with the `execve`-syscall](https://stackoverflow.com/questions/67100831/macos-shebang-with-absolute-path-not-working). Compiled wrappers generated by `makeBinaryWrapper` can be inspected with `less ` - by scrolling past the binary data you should be able to see the shell command that generated the executable and there see the environment variables that were injected into the wrapper. +However, `makeWrapper` is more flexible and implements more arguments. +Use `makeWrapper` if you need the wrapper to use shell features (e.g. look up environment variables) at runtime. + ### `remove-references-to -t` \ [ `-t` \ ... ] \ ... {#fun-remove-references-to} Removes the references of the specified files to the specified store files. This is done without changing the size of the file by replacing the hash by `eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee`, and should work on compiled executables. This is meant to be used to remove the dependency of the output on inputs that are known to be unnecessary at runtime. Of course, reckless usage will break the patched programs. @@ -1568,6 +1603,10 @@ This flag adds the `-fstack-clash-protection` compiler option, which causes grow The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services. +#### `nostrictaliasing` {#nostrictaliasing} + +This flag adds the `-fno-strict-aliasing` compiler option, which prevents the compiler from assuming code has been written strictly following the standard in regards to pointer aliasing and therefore performing optimizations that may be unsafe for code that has not followed these rules. + #### `pie` {#pie} This flag is disabled by default for normal `glibc` based NixOS package builds, but enabled by default for @@ -1593,7 +1632,7 @@ This breaks some code that does advanced stack management or exception handling. #### `trivialautovarinit` {#trivialautovarinit} -Adds the `-ftrivial-auto-var-init=pattern` compiler option. This causes "trivially-initializable" uninitialized stack variables to be forcibly initialized with a nonzero value that is likely to cause a crash (and therefore be noticed). Uninitialized variables generally take on their values based on fragments of previous program state, and attackers can carefully manipulate that state to craft malicious initial values for these variables. +Adds the `-ftrivial-auto-var-init=pattern` compiler option. Uninitialized variables generally take on their values based on fragments of previous program state, and attackers can carefully manipulate that state to craft malicious initial values for these variables. This flag causes "trivially-initializable" uninitialized stack variables to be forcibly initialized with a nonzero value that is likely to cause a crash (and therefore be noticed). Use of this flag is controversial as it can prevent tools that detect uninitialized variable use (such as valgrind) from operating correctly. diff --git a/doc/style.css b/doc/style.css index f517733be972..4ba76cc39114 100644 --- a/doc/style.css +++ b/doc/style.css @@ -7,25 +7,29 @@ body { margin: 0; } -.book { +.book, +.appendix { margin: auto; width: 100%; } @media screen and (min-width: 768px) { - .book { + .book, + .appendix { max-width: 46rem; } } @media screen and (min-width: 992px) { - .book { + .book, + .appendix { max-width: 60rem; } } @media screen and (min-width: 1200px) { - .book { + .book, + .appendix { max-width: 73rem; } } @@ -113,10 +117,10 @@ html { body { font-size: 1rem; - font-family: 'Roboto', sans-serif; + font-family: "Roboto", sans-serif; font-weight: 300; - color: #000000; - background-color: #ffffff; + color: var(--main-text-color); + background-color: var(--background); min-height: 100vh; display: flex; flex-direction: column; @@ -132,7 +136,7 @@ body { a { text-decoration: none; border-bottom: 1px solid; - color: #405d99; + color: var(--link-color); } ul { @@ -163,7 +167,7 @@ h1 { line-height: 110%; font-size: 200%; margin-bottom: 1rem; - color: #6586c8; + color: var(--heading-color); } h2 { @@ -171,7 +175,7 @@ h2 { line-height: 110%; font-size: 170%; margin-bottom: 0.625rem; - color: #6586c8; + color: var(--heading-color); } h2:not(:first-child) { @@ -183,7 +187,7 @@ h3 { line-height: 110%; margin-bottom: 1rem; font-size: 150%; - color: #6586c8; + color: var(--heading-color); } .note h3, @@ -199,7 +203,7 @@ h4 { line-height: 110%; margin-bottom: 1rem; font-size: 140%; - color: #6586c8; + color: var(--heading-color); } h5 { @@ -207,14 +211,14 @@ h5 { line-height: 110%; margin-bottom: 1rem; font-size: 130%; - color: #6a6a6a; + color: var(--small-heading-color); } h6 { font-weight: 800; line-height: 110%; margin-bottom: 1rem; - font-size: 120% + font-size: 120%; } strong { @@ -226,13 +230,13 @@ p { margin-bottom: 1rem; } -dt>*:first-child, -dd>*:first-child { +dt > *:first-child, +dd > *:first-child { margin-top: 0; } -dt>*:last-child, -dd>*:last-child { +dt > *:last-child, +dd > *:last-child { margin-bottom: 0; } @@ -256,8 +260,8 @@ div.appendix .programlisting { border-radius: 0.5rem; padding: 1rem; overflow: auto; - background: #f2f8fd; - color: #000000; + background: var(--codeblock-background); + color: var(--codeblock-text-color); } div.book .note, @@ -277,47 +281,46 @@ div.appendix .important { background: #f4f4f4; } -div.book .note>.title, -div.book .tip>.title, -div.book .warning>.title, -div.book .caution>.title, -div.book .important>.title, -div.appendix .note>.title, -div.appendix .tip>.title, -div.appendix .warning>.title, -div.appendix .caution>.title, -div.appendix .important>.title { +div.book .note > .title, +div.book .tip > .title, +div.book .warning > .title, +div.book .caution > .title, +div.book .important > .title, +div.appendix .note > .title, +div.appendix .tip > .title, +div.appendix .warning > .title, +div.appendix .caution > .title, +div.appendix .important > .title { font-weight: 800; - /* font-family: 'Overpass', serif; */ line-height: 110%; margin-bottom: 1rem; color: inherit; margin-bottom: 0; } -div.book .note> :first-child, -div.book .tip> :first-child, -div.book .warning> :first-child, -div.book .caution> :first-child, -div.book .important> :first-child, -div.appendix .note> :first-child, -div.appendix .tip> :first-child, -div.appendix .warning> :first-child, -div.appendix .caution> :first-child, -div.appendix .important> :first-child { +div.book .note > :first-child, +div.book .tip > :first-child, +div.book .warning > :first-child, +div.book .caution > :first-child, +div.book .important > :first-child, +div.appendix .note > :first-child, +div.appendix .tip > :first-child, +div.appendix .warning > :first-child, +div.appendix .caution > :first-child, +div.appendix .important > :first-child { margin-top: 0; } -div.book .note> :last-child, -div.book .tip> :last-child, -div.book .warning> :last-child, -div.book .caution> :last-child, -div.book .important> :last-child, -div.appendix .note> :last-child, -div.appendix .tip> :last-child, -div.appendix .warning> :last-child, -div.appendix .caution> :last-child, -div.appendix .important> :last-child { +div.book .note > :last-child, +div.book .tip > :last-child, +div.book .warning > :last-child, +div.book .caution > :last-child, +div.book .important > :last-child, +div.appendix .note > :last-child, +div.appendix .tip > :last-child, +div.appendix .warning > :last-child, +div.appendix .caution > :last-child, +div.appendix .important > :last-child { margin-bottom: 0; } @@ -325,16 +328,16 @@ div.book .note, div.book .tip, div.appendix .note, div.appendix .tip { - color: #5277c3; - background: #f2f8fd; + color: var(--note-text-color); + background: var(--note-background); } div.book .warning, div.book .caution, div.appendix .warning, div.appendix .caution { - color: #cc3900; - background-color: #fff5e1; + color: var(--warning-text-color); + background-color: var(--warning-background); } div.book .section, @@ -358,8 +361,8 @@ div.appendix div.example details[open] { border-radius: 4px; } -div.book div.example details>summary, -div.appendix div.example details>summary { +div.book div.example details > summary, +div.appendix div.example details > summary { cursor: pointer; } @@ -368,13 +371,13 @@ div.appendix br.example-break { display: none; } -div.book div.footnotes>hr, -div.appendix div.footnotes>hr { +div.book div.footnotes > hr, +div.appendix div.footnotes > hr { border-color: #d8d8d8; } -div.book div.footnotes>br, -div.appendix div.footnotes>br { +div.book div.footnotes > br, +div.appendix div.footnotes > br { display: none; } @@ -444,3 +447,47 @@ div.appendix .variablelist .term { user-select: none; -webkit-user-select: none; } + +:root { + --background: #fff; + --main-text-color: #000; + --link-color: #405d99; + --heading-color: #6586c8; + --small-heading-color: #6a6a6a; + --note-text-color: #5277c3; + --note-background: #f2f8fd; + --warning-text-color: #cc3900; + --warning-background: #fff5e1; + --codeblock-background: #f2f8fd; + --codeblock-text-color: #000; +} + +@media (prefers-color-scheme: dark) { + :root { + --background: #242424; + --main-text-color: #fff; + --link-color: #6586c8; + --small-heading-color: #fff; + --note-background: none; + --warning-background: none; + --codeblock-background: #393939; + --codeblock-text-color: #fff; + } + + div.book .note, + div.book .tip, + div.appendix .note, + div.appendix .tip, + div.book .warning, + div.book .caution, + div.appendix .warning, + div.appendix .caution { + border: 2px solid; + font-weight: 400; + } +} + +@font-face { + font-family: Roboto; + src: url(Roboto.ttf); +} diff --git a/doc/tests/check-nix-code-blocks.nix b/doc/tests/check-nix-code-blocks.nix new file mode 100644 index 000000000000..5ec934f6bba8 --- /dev/null +++ b/doc/tests/check-nix-code-blocks.nix @@ -0,0 +1,32 @@ +{ + runCommand, + markdown-code-runner, + nixfmt-rfc-style, +}: + +runCommand "manual_check-nix-code-blocks" + { + nativeBuildInputs = [ + markdown-code-runner + nixfmt-rfc-style + ]; + } + '' + set +e + + mdcr --check --config ${./mdcr-config.toml} ${./..} + + if [ $? -ne 0 ]; then + cat < { + localSystem = { + system = "x86_64-linux"; + }; + crossSystem = { + useLLVM = true; + linker = "lld"; + }; +} +``` + +Note that we set `linker` to `lld`. This is because LLVM has its own linker called "lld". By setting it, we utilize Clang and lld within this new instance of Nixpkgs. There is a shorthand method for building everything with LLVM: `pkgsLLVM`. This is easier to use with `nix-build` (or `nix build`): + +```bash +nix-build -A pkgsLLVM.hello +``` + +This will compile the GNU hello package with LLVM and the lld linker like previously mentioned. + +#### Using `clangStdenv` {#sec-building-packages-with-llvm-using-clang-stdenv} + +Another simple way is to override the stdenv with `clangStdenv`. This causes a single package to be built with Clang. However, this `stdenv` does not override platform defaults to use compiler-rt, libc++, and libunwind. This is the preferred way to make a single package in Nixpkgs build with Clang. There are cases where just Clang isn't enough. For these situations, there is `libcxxStdenv`, which uses Clang with libc++ and compiler-rt. diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md index cea9532d6a7b..3467021715e6 100644 --- a/doc/using/configuration.chapter.md +++ b/doc/using/configuration.chapter.md @@ -99,10 +99,12 @@ There are several ways to tweak how Nix handles a package which has been marked ```nix { - allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "roon-server" - "vscode" - ]; + allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "roon-server" + "vscode" + ]; } ``` @@ -112,7 +114,10 @@ There are several ways to tweak how Nix handles a package which has been marked ```nix { - allowlistedLicenses = with lib.licenses; [ amd wtfpl ]; + allowlistedLicenses = with lib.licenses; [ + amd + wtfpl + ]; } ``` @@ -120,7 +125,10 @@ There are several ways to tweak how Nix handles a package which has been marked ```nix { - blocklistedLicenses = with lib.licenses; [ agpl3Only gpl3Only ]; + blocklistedLicenses = with lib.licenses; [ + agpl3Only + gpl3Only + ]; } ``` @@ -158,9 +166,11 @@ There are several ways to tweak how Nix handles a package which has been marked ```nix { - allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) [ - "ovftool" - ]; + allowInsecurePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "ovftool" + ]; } ``` @@ -173,7 +183,9 @@ You can define a function called `packageOverrides` in your local `~/.config/nix ```nix { packageOverrides = pkgs: rec { - foo = pkgs.foo.override { /* ... */ }; + foo = pkgs.foo.override { + # ... + }; }; } ``` @@ -197,23 +209,24 @@ Using `packageOverrides`, it is possible to manage packages declaratively. This ```nix { - packageOverrides = pkgs: with pkgs; { - myPackages = pkgs.buildEnv { - name = "my-packages"; - paths = [ - aspell - bc - coreutils - gdb - ffmpeg - nix - emscripten - jq - nox - silver-searcher - ]; + packageOverrides = + pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + aspell + bc + coreutils + gdb + ffmpeg + nix + emscripten + jq + nox + silver-searcher + ]; + }; }; - }; } ``` @@ -221,24 +234,28 @@ To install it into our environment, you can just run `nix-env -iA nixpkgs.myPack ```nix { - packageOverrides = pkgs: with pkgs; { - myPackages = pkgs.buildEnv { - name = "my-packages"; - paths = [ - aspell - bc - coreutils - gdb - ffmpeg - nix - emscripten - jq - nox - silver-searcher - ]; - pathsToLink = [ "/share" "/bin" ]; + packageOverrides = + pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + aspell + bc + coreutils + gdb + ffmpeg + nix + emscripten + jq + nox + silver-searcher + ]; + pathsToLink = [ + "/share" + "/bin" + ]; + }; }; - }; } ``` @@ -250,24 +267,32 @@ After building that new environment, look through `~/.nix-profile` to make sure ```nix { - packageOverrides = pkgs: with pkgs; { - myPackages = pkgs.buildEnv { - name = "my-packages"; - paths = [ - aspell - bc - coreutils - ffmpeg - nix - emscripten - jq - nox - silver-searcher - ]; - pathsToLink = [ "/share/man" "/share/doc" "/bin" ]; - extraOutputsToInstall = [ "man" "doc" ]; + packageOverrides = + pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + aspell + bc + coreutils + ffmpeg + nix + emscripten + jq + nox + silver-searcher + ]; + pathsToLink = [ + "/share/man" + "/share/doc" + "/bin" + ]; + extraOutputsToInstall = [ + "man" + "doc" + ]; + }; }; - }; } ``` @@ -275,15 +300,15 @@ This provides us with some useful documentation for using our packages. However ```nix { - packageOverrides = pkgs: with pkgs; rec { - myProfile = writeText "my-profile" '' + packageOverrides = pkgs: { + myProfile = pkgs.writeText "my-profile" '' export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man ''; myPackages = pkgs.buildEnv { name = "my-packages"; - paths = [ - (runCommand "profile" {} '' + paths = with pkgs; [ + (runCommand "profile" { } '' mkdir -p $out/etc/profile.d cp ${myProfile} $out/etc/profile.d/my-profile.sh '') @@ -298,8 +323,16 @@ This provides us with some useful documentation for using our packages. However nox silver-searcher ]; - pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ]; - extraOutputsToInstall = [ "man" "doc" ]; + pathsToLink = [ + "/share/man" + "/share/doc" + "/bin" + "/etc" + ]; + extraOutputsToInstall = [ + "man" + "doc" + ]; }; }; } @@ -326,16 +359,16 @@ Configuring GNU info is a little bit trickier than man pages. To work correctly, ```nix { - packageOverrides = pkgs: with pkgs; rec { - myProfile = writeText "my-profile" '' + packageOverrides = pkgs: { + myProfile = pkgs.writeText "my-profile" '' export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info ''; myPackages = pkgs.buildEnv { name = "my-packages"; - paths = [ - (runCommand "profile" {} '' + paths = with pkgs; [ + (runCommand "profile" { } '' mkdir -p $out/etc/profile.d cp ${myProfile} $out/etc/profile.d/my-profile.sh '') @@ -351,8 +384,18 @@ Configuring GNU info is a little bit trickier than man pages. To work correctly, silver-searcher texinfoInteractive ]; - pathsToLink = [ "/share/man" "/share/doc" "/share/info" "/bin" "/etc" ]; - extraOutputsToInstall = [ "man" "doc" "info" ]; + pathsToLink = [ + "/share/man" + "/share/doc" + "/share/info" + "/bin" + "/etc" + ]; + extraOutputsToInstall = [ + "man" + "doc" + "info" + ]; postBuild = '' if [ -x $out/bin/install-info -a -w $out/share/info ]; then shopt -s nullglob diff --git a/doc/using/overlays.chapter.md b/doc/using/overlays.chapter.md index 46200730f0b2..e1803786a9a7 100644 --- a/doc/using/overlays.chapter.md +++ b/doc/using/overlays.chapter.md @@ -136,7 +136,12 @@ self: super: For BLAS/LAPACK switching to work correctly, all packages must depend on `blas` or `lapack`. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, `LP64` (integer size = 32 bits) and `ILP64` (integer size = 64 bits). The attributes `blas` and `lapack` are `LP64` by default. Their `ILP64` version are provided through the attributes `blas-ilp64` and `lapack-ilp64`. Some software needs special flags or patches to work with `ILP64`. You can check if `ILP64` is used in Nixpkgs with `blas.isILP64` and `lapack.isILP64`. Some software does NOT work with `ILP64`, and derivations need to specify an assertion to prevent this. You can prevent `ILP64` from being used with the following: ```nix -{ stdenv, blas, lapack, ... }: +{ + stdenv, + blas, + lapack, + ... +}: assert (!blas.isILP64) && (!lapack.isILP64); diff --git a/doc/using/overrides.chapter.md b/doc/using/overrides.chapter.md index 27a042963dd6..95190b44a500 100644 --- a/doc/using/overrides.chapter.md +++ b/doc/using/overrides.chapter.md @@ -13,27 +13,38 @@ It is used to override the arguments passed to a function. Example usages: ```nix -pkgs.foo.override { arg1 = val1; arg2 = val2; /* ... */ } +pkgs.foo.override { + arg1 = val1; + arg2 = val2; # ... +} ``` It's also possible to access the previous arguments. ```nix -pkgs.foo.override (previous: { arg1 = previous.arg1; /* ... */ }) +pkgs.foo.override (previous: { + arg1 = previous.arg1; # ... +}) ``` ```nix -import pkgs.path { overlays = [ (self: super: { - foo = super.foo.override { barSupport = true ; }; - })];} +import pkgs.path { + overlays = [ + (self: super: { + foo = super.foo.override { barSupport = true; }; + }) + ]; +} ``` ```nix { mypkg = pkgs.callPackage ./mypkg.nix { - mydep = pkgs.mydep.override { /* ... */ }; + mydep = pkgs.mydep.override { + # ... + }; }; } ``` @@ -55,9 +66,11 @@ Example usages: ```nix { - helloBar = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: { - pname = previousAttrs.pname + "-bar"; - }); + helloBar = pkgs.hello.overrideAttrs ( + finalAttrs: previousAttrs: { + pname = previousAttrs.pname + "-bar"; + } + ); } ``` @@ -107,7 +120,7 @@ Example usage: url = "ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2"; hash = "sha256-MxBJRcM2rYzQYwJ5XKxhXTQByvSg5jZc5cSHEZoB2IY="; }; - patches = []; + patches = [ ]; }); } ``` @@ -128,8 +141,15 @@ Example usage: ```nix { - f = { a, b }: { result = a+b; }; - c = lib.makeOverridable f { a = 1; b = 2; }; + f = + { a, b }: + { + result = a + b; + }; + c = lib.makeOverridable f { + a = 1; + b = 2; + }; } ``` diff --git a/flake.nix b/flake.nix index a82bb383c062..3bd0a48a5cce 100644 --- a/flake.nix +++ b/flake.nix @@ -98,15 +98,26 @@ checks = forAllSystems ( system: - { - tarball = jobs.${system}.tarball; - } + { } + // + lib.optionalAttrs + ( + # Exclude x86_64-freebsd because "Failed to evaluate rustc-wrapper-1.85.0: «broken»: is marked as broken" + system != "x86_64-freebsd" + ) + { + tarball = jobs.${system}.tarball; + } // lib.optionalAttrs ( self.legacyPackages.${system}.stdenv.hostPlatform.isLinux # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64 && !self.legacyPackages.${system}.targetPlatform.isPower64 + # Exclude armv6l-linux because "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')" + && system != "armv6l-linux" + # Exclude riscv64-linux because "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')" + && system != "riscv64-linux" ) { # Test that ensures that the nixosSystem function can accept a lib argument @@ -156,8 +167,8 @@ system != "armv6l-linux" # Exclude riscv64-linux because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" && system != "riscv64-linux" - # Exclude FreeBSD because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" - && !self.legacyPackages.${system}.stdenv.hostPlatform.isFreeBSD + # Exclude x86_64-freebsd because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform" + && system != "x86_64-freebsd" ) { /** @@ -167,7 +178,15 @@ } ); - formatter = forAllSystems (system: (import ./ci { inherit system; }).fmt.pkg); + formatter = lib.filterAttrs ( + system: _: + # Exclude armv6l-linux because "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')" + system != "armv6l-linux" + # Exclude riscv64-linux because "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')" + && system != "riscv64-linux" + # Exclude x86_64-freebsd because "Package ‘go-1.22.12-freebsd-amd64-bootstrap’ in /nix/store/0yw40qnrar3lvc5hax5n49abl57apjbn-source/pkgs/development/compilers/go/binary.nix:50 is not available on the requested hostPlatform" + && system != "x86_64-freebsd" + ) (forAllSystems (system: (import ./ci { inherit system; }).fmt.pkg)); /** A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values. diff --git a/lib/.version b/lib/.version index 5d540763cfb4..115ab7a6a9ae 100644 --- a/lib/.version +++ b/lib/.version @@ -1 +1 @@ -25.05 \ No newline at end of file +25.11 \ No newline at end of file diff --git a/lib/asserts.nix b/lib/asserts.nix index b22252a7654b..41908d00a812 100644 --- a/lib/asserts.nix +++ b/lib/asserts.nix @@ -1,5 +1,16 @@ { lib }: +let + inherit (lib.strings) + concatStringsSep + ; + inherit (lib.lists) + filter + ; + inherit (lib.trivial) + showWarnings + ; +in rec { /** @@ -131,4 +142,61 @@ rec { "each element in ${name} must be one of ${lib.generators.toPretty { } xs}, but is: ${ lib.generators.toPretty { } vals }"; + + /** + Wrap a value with logic that throws an error when assertions + fail and emits any warnings. + + # Inputs + + `assertions` + + : A list of assertions. If any of their `assertion` attrs is `false`, their `message` attrs will be emitted in a `throw`. + + `warnings` + + : A list of strings to emit as warnings. This function does no filtering on this list. + + `val` + + : A value to return, wrapped in `warn`, if a `throw` is not necessary. + + # Type + + ``` + checkAssertWarn :: [ { assertion :: Bool; message :: String } ] -> [ String ] -> Any -> Any + ``` + + # Examples + :::{.example} + ## `lib.asserts.checkAssertWarn` usage example + ```nix + checkAssertWarn + [ { assertion = false; message = "Will fail"; } ] + [ ] + null + stderr> error: + stderr> Failed assertions: + stderr> - Will fail + + checkAssertWarn + [ { assertion = true; message = "Will not fail"; } ] + [ "Will warn" ] + null + stderr> evaluation warning: Will warn + null + ``` + + ::: + */ + checkAssertWarn = + assertions: warnings: val: + let + failedAssertions = map (x: x.message) (filter (x: !x.assertion) assertions); + in + if failedAssertions != [ ] then + throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}" + else + showWarnings warnings val; + } diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 8482887023f7..fc6bf84415b8 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -301,9 +301,9 @@ rec { Nix has an [attribute selection operator](https://nixos.org/manual/nix/stable/language/operators#attribute-selection) which is sufficient for such queries, as long as the number of attributes is static. For example: ```nix - x.a.b == getAttrByPath ["a" "b"] x + x.a.b == getAttrFromPath ["a" "b"] x # and - x.${f p}."example.com" == getAttrByPath [ (f p) "example.com" ] x + x.${f p}."example.com" == getAttrFromPath [ (f p) "example.com" ] x ``` # Inputs @@ -1042,7 +1042,7 @@ rec { ::: */ - mapAttrs' = f: set: listToAttrs (map (attr: f attr set.${attr}) (attrNames set)); + mapAttrs' = f: set: listToAttrs (mapAttrsToList f set); /** Call a function for each attribute in the given set and return @@ -1076,7 +1076,7 @@ rec { ::: */ - mapAttrsToList = f: attrs: map (name: f name attrs.${name}) (attrNames attrs); + mapAttrsToList = f: attrs: attrValues (mapAttrs f attrs); /** Deconstruct an attrset to a list of name-value pairs as expected by [`builtins.listToAttrs`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-listToAttrs). diff --git a/lib/default.nix b/lib/default.nix index e671fcf9546d..63e02882e2c3 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -279,6 +279,7 @@ let naturalSort compareLists take + takeEnd drop dropEnd sublist @@ -344,9 +345,11 @@ let upperChars toLower toUpper + toCamelCase toSentenceCase addContextFrom splitString + splitStringBy removePrefix removeSuffix versionOlder @@ -446,6 +449,7 @@ let fixupOptionType mkIf mkAssert + mkDefinition mkMerge mkOverride mkOptionDefault diff --git a/lib/licenses.nix b/lib/licenses.nix index c202d8d07180..38fb12d2a887 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -257,6 +257,11 @@ lib.mapAttrs mkLicense ( fullName = "BSD Protection License"; }; + bsdSourceCode = { + spdxId = "BSD-Source-Code"; + fullName = "BSD Source Code Attribution"; + }; + bsl11 = { spdxId = "BUSL-1.1"; fullName = "Business Source License 1.1"; @@ -452,6 +457,11 @@ lib.mapAttrs mkLicense ( fullName = "Common Public License 1.0"; }; + cronyx = { + spdxId = "Cronyx"; + fullName = "Cronyx License"; + }; + curl = { spdxId = "curl"; fullName = "curl License"; @@ -641,6 +651,11 @@ lib.mapAttrs mkLicense ( url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception"; }; + gpl2UBDLPlus = { + fullName = "GNU General Public License v3.0 or later (with UBDL exception)"; + url = "https://spdx.org/licenses/UBDL-exception.html"; + }; + gpl2Oss = { fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)"; url = "https://www.mysql.com/about/legal/licensing/foss-exception"; @@ -937,6 +952,11 @@ lib.mapAttrs mkLicense ( fullName = "MIT No Attribution"; }; + mitOpenGroup = { + spdxId = "MIT-open-group"; + fullName = "MIT Open Group variant"; + }; + mpl10 = { spdxId = "MPL-1.0"; fullName = "Mozilla Public License 1.0"; @@ -1164,6 +1184,13 @@ lib.mapAttrs mkLicense ( fullName = "Sendmail License"; }; + sfl = { + fullName = "Source First License 1.1"; + url = "https://gitlab.futo.org/videostreaming/grayjay/-/blob/master/LICENSE.md"; + free = false; + redistributable = true; + }; + sgi-b-20 = { spdxId = "SGI-B-2.0"; fullName = "SGI Free Software License B v2.0"; @@ -1321,6 +1348,11 @@ lib.mapAttrs mkLicense ( fullName = "Unicode License Agreement - Data Files and Software (2016)"; }; + unicodeTOU = { + spdxId = "Unicode-TOU"; + fullName = "Unicode Terms of Use"; + }; + unlicense = { spdxId = "Unlicense"; fullName = "The Unlicense"; diff --git a/lib/lists.nix b/lib/lists.nix index e119606dd5e7..ec0fe22d2afa 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -1462,6 +1462,40 @@ rec { */ take = count: sublist 0 count; + /** + Return the last (at most) N elements of a list. + + # Inputs + + `count` + + : Maximum number of elements to pick + + `list` + + : Input list + + # Type + + ``` + takeEnd :: int -> [a] -> [a] + ``` + + # Examples + :::{.example} + ## `lib.lists.takeEnd` usage example + + ```nix + takeEnd 2 [ "a" "b" "c" "d" ] + => [ "c" "d" ] + takeEnd 2 [ ] + => [ ] + ``` + + ::: + */ + takeEnd = n: xs: drop (max 0 (length xs - n)) xs; + /** Remove the first (at most) N elements of a list. diff --git a/lib/meta.nix b/lib/meta.nix index ee234d94489b..ad4f770806dd 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -289,7 +289,8 @@ rec { */ availableOn = platform: pkg: - ((!pkg ? meta.platforms) || any (platformMatch platform) pkg.meta.platforms) + pkg != null + && ((!pkg ? meta.platforms) || any (platformMatch platform) pkg.meta.platforms) && all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or [ ]); /** diff --git a/lib/modules.nix b/lib/modules.nix index a9ddaf7bda02..d6061ec6d039 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -257,6 +257,7 @@ let config specialArgs ; + _class = class; } // specialArgs ); @@ -1097,10 +1098,16 @@ let # Process mkMerge and mkIf properties. defs' = concatMap ( m: - map (value: { - inherit (m) file; - inherit value; - }) (addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value)) + map ( + value: + if value._type or null == "definition" then + value + else + { + inherit (m) file; + inherit value; + } + ) (addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value)) ) defs; # Process mkOverride properties. @@ -1365,6 +1372,11 @@ let inherit contents; }; + /** + Return a definition with file location information. + */ + mkDefinition = args@{ file, value, ... }: args // { _type = "definition"; }; + mkOverride = priority: content: { _type = "override"; inherit priority content; @@ -1869,7 +1881,7 @@ let This function does not add support for deduplication and `disabledModules`, although that could be achieved by wrapping the returned module and setting - the `_key` module attribute. + the `key` module attribute. The reason for this omission is that the file path is not guaranteed to be a unique identifier for the module, as two instances of the module may reference different `arg`s in their closures. @@ -2095,6 +2107,7 @@ private mkBefore mkChangedOptionModule mkDefault + mkDefinition mkDerivedConfig mkFixStrictness mkForce diff --git a/lib/options.nix b/lib/options.nix index 85ce6ca77e92..007a14f15b67 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -30,6 +30,7 @@ let inherit (lib.attrsets) attrByPath optionalAttrs + showAttrPath ; inherit (lib.strings) concatMapStrings @@ -40,6 +41,7 @@ let ; inherit (lib.lists) last + toList ; prioritySuggestion = '' Use `lib.mkForce value` or `lib.mkDefault value` to change the priority on any of these definitions. @@ -310,14 +312,14 @@ rec { }: let name' = if isList name then last name else name; - default' = if isList default then default else [ default ]; - defaultText = concatStringsSep "." default'; + default' = toList default; + defaultText = showAttrPath default'; defaultValue = attrByPath default' (throw "${defaultText} cannot be found in ${pkgsText}") pkgs; defaults = if default != null then { default = defaultValue; - defaultText = literalExpression ("${pkgsText}." + defaultText); + defaultText = literalExpression "${pkgsText}.${defaultText}"; } else optionalAttrs nullable { @@ -333,7 +335,7 @@ rec { } // optionalAttrs (example != null) { example = literalExpression ( - if isList example then "${pkgsText}." + concatStringsSep "." example else example + if isList example then "${pkgsText}.${showAttrPath example}" else example ); } ); diff --git a/lib/path/default.nix b/lib/path/default.nix index be559eadf182..a03f6a04cafd 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -165,7 +165,7 @@ let # This is a workaround for https://github.com/NixOS/nix/issues/12361 which # was needed during the experimental phase of ca-derivations and should be # removed once the issue has been resolved. - || match "[0-9a-z]{52}" (head components) != null; + || components != [ ] && match "[0-9a-z]{52}" (head components) != null; in # No rec! Add dependencies on this file at the top. @@ -382,7 +382,7 @@ in (splitRoot p).root (splitRoot p).subpath - - Trying to get the parent directory of `root` using [`readDir`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readDir) returns `root` itself: + - Trying to get the parent directory of `root` using [`dirOf`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-dirOf) returns `root` itself: dirOf (splitRoot p).root == (splitRoot p).root diff --git a/lib/path/tests/unit.nix b/lib/path/tests/unit.nix index a52b4f44e51d..fa2e004e9c3a 100644 --- a/lib/path/tests/unit.nix +++ b/lib/path/tests/unit.nix @@ -110,6 +110,12 @@ let expected = false; }; + # Root path (empty path components list) + testHasStorePathPrefixRoot = { + expr = hasStorePathPrefix /.; + expected = false; + }; + testHasStorePathPrefixExample1 = { expr = hasStorePathPrefix (storeDirPath + "/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo/bar/baz"); expected = true; diff --git a/lib/strings.nix b/lib/strings.nix index d281120cad7f..ba8c47b69037 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -998,7 +998,11 @@ rec { ::: */ - escapeC = list: replaceStrings list (map (c: "\\x${toLower (lib.toHexString (charToInt c))}") list); + escapeC = + list: + replaceStrings list ( + map (c: "\\x${fixedWidthString 2 "0" (toLower (lib.toHexString (charToInt c)))}") list + ); /** Escape the `string` so it can be safely placed inside a URL @@ -1496,6 +1500,63 @@ rec { addContextFrom str (toUpper firstChar + toLower rest) ); + /** + Converts a string to camelCase. Handles snake_case, PascalCase, + kebab-case strings as well as strings delimited by spaces. + + # Inputs + + `string` + : The string to convert to camelCase + + # Type + + ``` + toCamelCase :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.toCamelCase` usage example + + ```nix + toCamelCase "hello-world" + => "helloWorld" + toCamelCase "hello_world" + => "helloWorld" + toCamelCase "hello world" + => "helloWorld" + toCamelCase "HelloWorld" + => "helloWorld" + ``` + + ::: + */ + toCamelCase = + str: + lib.throwIfNot (isString str) "toCamelCase does only accepts string values, but got ${typeOf str}" ( + let + separators = splitStringBy ( + prev: curr: + elem curr [ + "-" + "_" + " " + ] + ) false str; + + parts = lib.flatten ( + map (splitStringBy ( + prev: curr: match "[a-z]" prev != null && match "[A-Z]" curr != null + ) true) separators + ); + + first = if length parts > 0 then toLower (head parts) else ""; + rest = if length parts > 1 then map toSentenceCase (tail parts) else [ ]; + in + concatStrings (map (addContextFrom str) ([ first ] ++ rest)) + ); + /** Appends string context from string like object `src` to `target`. @@ -1588,6 +1649,97 @@ rec { in map (addContextFrom s) splits; + /** + Splits a string into substrings based on a predicate that examines adjacent characters. + + This function provides a flexible way to split strings by checking pairs of characters + against a custom predicate function. Unlike simpler splitting functions, this allows + for context-aware splitting based on character transitions and patterns. + + # Inputs + + `predicate` + : Function that takes two arguments (previous character and current character) + and returns true when the string should be split at the current position. + For the first character, previous will be "" (empty string). + + `keepSplit` + : Boolean that determines whether the splitting character should be kept as + part of the result. If true, the character will be included at the beginning + of the next substring; if false, it will be discarded. + + `str` + : The input string to split. + + # Return + + A list of substrings from the original string, split according to the predicate. + + # Type + + ``` + splitStringBy :: (string -> string -> bool) -> bool -> string -> [string] + ``` + + # Examples + :::{.example} + ## `lib.strings.splitStringBy` usage example + + Split on periods and hyphens, discarding the separators: + ```nix + splitStringBy (prev: curr: builtins.elem curr [ "." "-" ]) false "foo.bar-baz" + => [ "foo" "bar" "baz" ] + ``` + + Split on transitions from lowercase to uppercase, keeping the uppercase characters: + ```nix + splitStringBy (prev: curr: builtins.match "[a-z]" prev != null && builtins.match "[A-Z]" curr != null) true "fooBarBaz" + => [ "foo" "Bar" "Baz" ] + ``` + + Handle leading separators correctly: + ```nix + splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ".foo.bar.baz" + => [ "" "foo" "bar" "baz" ] + ``` + + Handle trailing separators correctly: + ```nix + splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo.bar.baz." + => [ "foo" "bar" "baz" "" ] + ``` + ::: + */ + splitStringBy = + predicate: keepSplit: str: + let + len = stringLength str; + + # Helper function that processes the string character by character + go = + pos: currentPart: result: + # Base case: reached end of string + if pos == len then + result ++ [ currentPart ] + else + let + currChar = substring pos 1 str; + prevChar = if pos > 0 then substring (pos - 1) 1 str else ""; + isSplit = predicate prevChar currChar; + in + if isSplit then + # Split here - add current part to results and start a new one + let + newResult = result ++ [ currentPart ]; + newCurrentPart = if keepSplit then currChar else ""; + in + go (pos + 1) newCurrentPart newResult + else + # Keep building current part + go (pos + 1) (currentPart + currChar) result; + in + if len == 0 then [ (addContextFrom str "") ] else map (addContextFrom str) (go 0 "" [ ]); + /** Return a string without the specified prefix, if the prefix matches. @@ -1881,7 +2033,7 @@ rec { : The type of the feature to be set, as described in https://cmake.org/cmake/help/latest/command/set.html the possible values (case insensitive) are: - BOOL FILEPATH PATH STRING INTERNAL + BOOL FILEPATH PATH STRING INTERNAL LIST `value` : The desired value @@ -1911,6 +2063,7 @@ rec { "PATH" "STRING" "INTERNAL" + "LIST" ]; in type: feature: value: diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 67bd9826465c..cf3f335eb7d4 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -121,8 +121,6 @@ let "uclibc" else if final.isAndroid then "bionic" - else if final.isLLVMLibc then - "llvm" else if final.isLinux # default then @@ -209,6 +207,8 @@ let "ppc${optionalString final.isLittleEndian "le"}" else if final.isMips64 then "mips64" # endianness is *not* included on mips64 + else if final.isDarwin then + final.darwinArch else final.parsed.cpu.name; @@ -303,6 +303,8 @@ let qemuArch = if final.isAarch32 then "arm" + else if final.isAarch64 then + "aarch64" else if final.isS390 && !final.isS390x then null else if final.isx86_64 then @@ -329,12 +331,7 @@ let else final.parsed.cpu.name; - darwinArch = - { - armv7a = "armv7"; - aarch64 = "arm64"; - } - .${final.parsed.cpu.name} or final.parsed.cpu.name; + darwinArch = parse.darwinArch final.parsed.cpu; darwinPlatform = if final.isMacOS then @@ -355,21 +352,9 @@ let else null; - # Remove before 25.05 - androidSdkVersion = - if (args ? sdkVer && !args ? androidSdkVersion) then - throw "For android `sdkVer` has been renamed to `androidSdkVersion`" - else if (args ? androidSdkVersion) then - args.androidSdkVersion - else - null; - androidNdkVersion = - if (args ? ndkVer && !args ? androidNdkVersion) then - throw "For android `ndkVer` has been renamed to `androidNdkVersion`" - else if (args ? androidSdkVersion) then - args.androidNdkVersion - else - null; + # Handle Android SDK and NDK versions. + androidSdkVersion = args.androidSdkVersion or null; + androidNdkVersion = args.androidNdkVersion or null; } // ( let @@ -488,8 +473,8 @@ let } .${cpu.name} or cpu.name; vendor_ = final.rust.platform.vendor; - # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL. in + # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL. args.rust.rustcTarget or args.rustc.config or ( # Rust uses `wasm32-wasip?` rather than `wasm32-unknown-wasi`. # We cannot know which subversion does the user want, and @@ -534,6 +519,35 @@ let "-uefi" ]; }; + } + // { + go = { + # See https://pkg.go.dev/internal/platform for a list of known platforms + GOARCH = + { + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "i686" = "386"; + "loongarch64" = "loong64"; + "mips" = "mips"; + "mips64el" = "mips64le"; + "mipsel" = "mipsle"; + "powerpc64" = "ppc64"; + "powerpc64le" = "ppc64le"; + "riscv64" = "riscv64"; + "s390x" = "s390x"; + "x86_64" = "amd64"; + "wasm32" = "wasm"; + } + .${final.parsed.cpu.name} or (throw "Unknown CPU variant ${final.parsed.cpu.name} by Go"); + GOOS = if final.isWasi then "wasip1" else final.parsed.kernel.name; + + # See https://go.dev/wiki/GoArm + GOARM = toString (lib.intersectLists [ (final.parsed.cpu.version or "") ] [ "5" "6" "7" ]); + }; }; in assert final.useAndroidPrebuilt -> final.isAndroid; diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index b2a66021dfc9..90f67b3916fb 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -12,9 +12,7 @@ let # Darwin "x86_64-darwin" - "i686-darwin" "aarch64-darwin" - "armv7a-darwin" # FreeBSD "i686-freebsd" diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index cb54d8fd631a..7378b3bc5ecb 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -146,6 +146,10 @@ rec { riscv64 = riscv "64"; riscv32 = riscv "32"; + riscv64-musl = { + config = "riscv64-unknown-linux-musl"; + }; + riscv64-embedded = { config = "riscv64-none-elf"; libc = "newlib"; @@ -215,6 +219,10 @@ rec { config = "arm-none-eabi"; libc = "newlib"; }; + arm-embedded-nano = { + config = "arm-none-eabi"; + libc = "newlib-nano"; + }; armhf-embedded = { config = "arm-none-eabihf"; libc = "newlib"; @@ -276,7 +284,7 @@ rec { # iphone64 = { - config = "aarch64-apple-ios"; + config = "arm64-apple-ios"; # config = "aarch64-apple-darwin14"; darwinSdkVersion = "14.3"; xcodeVer = "12.3"; @@ -284,15 +292,6 @@ rec { useiOSPrebuilt = true; }; - iphone32 = { - config = "armv7a-apple-ios"; - # config = "arm-apple-darwin10"; - darwinSdkVersion = "14.3"; - xcodeVer = "12.3"; - xcodePlatform = "iPhoneOS"; - useiOSPrebuilt = true; - }; - iphone64-simulator = { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; @@ -303,18 +302,8 @@ rec { useiOSPrebuilt = true; }; - iphone32-simulator = { - config = "i686-apple-ios"; - # config = "i386-apple-darwin11"; - darwinSdkVersion = "14.3"; - xcodeVer = "12.3"; - xcodePlatform = "iPhoneSimulator"; - darwinPlatform = "ios-simulator"; - useiOSPrebuilt = true; - }; - aarch64-darwin = { - config = "aarch64-apple-darwin"; + config = "arm64-apple-darwin"; xcodePlatform = "MacOSX"; platform = { }; }; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index c330d5473bc5..82fd289e075c 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -386,7 +386,6 @@ rec { uclibceabi uclibceabihf ]; - isLLVMLibc = [ { abi = abis.llvm; } ]; isEfi = [ { @@ -417,6 +416,11 @@ rec { family = "x86"; }; } + { + cpu = { + family = "loongarch"; + }; + } ]; isElf = { diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index a7f65e69bf4c..0dfd91b7bb76 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -396,6 +396,12 @@ rec { significantByte = littleEndian; family = "javascript"; }; + } + // { + # aliases + # Apple architecture name, as used by `darwinArch`; required by + # LLVM ≥ 20. + arm64 = cpuTypes.aarch64; }; # GNU build systems assume that older NetBSD architectures are using a.out. @@ -734,9 +740,6 @@ rec { }; uclibc = { }; - # LLVM libc - llvm = { }; - unknown = { }; }; @@ -921,6 +924,8 @@ rec { kernelName = kernel: kernel.name + toString (kernel.version or ""); + darwinArch = cpu: if cpu.name == "aarch64" then "arm64" else cpu.name; + doubleFromSystem = { cpu, @@ -949,8 +954,9 @@ rec { kernel.name == "netbsd" && gnuNetBSDDefaultExecFormat cpu != kernel.execFormat ) kernel.execFormat.name; optAbi = optionalString (abi != abis.unknown) "-${abi.name}"; + cpuName = if kernel.families ? darwin then darwinArch cpu else cpu.name; in - "${cpu.name}-${vendor.name}-${kernelName kernel}${optExecFormat}${optAbi}"; + "${cpuName}-${vendor.name}-${kernelName kernel}${optExecFormat}${optAbi}"; ################################################################################ diff --git a/lib/tests/.editorconfig b/lib/tests/.editorconfig new file mode 100644 index 000000000000..7853c13cecf3 --- /dev/null +++ b/lib/tests/.editorconfig @@ -0,0 +1,3 @@ +[*.plist] +indent_style = tab +insert_final_newline = unset diff --git a/lib/tests/maintainers.nix b/lib/tests/maintainers.nix index d04bb07ea2c8..1d3fd5630c26 100644 --- a/lib/tests/maintainers.nix +++ b/lib/tests/maintainers.nix @@ -1,6 +1,6 @@ # to run these tests (and the others) # nix-build nixpkgs/lib/tests/release.nix -# These tests should stay in sync with the comment in maintainers/maintainers-list.nix +# These tests should stay in sync with the comment in maintainers/maintainer-list.nix { # The pkgs used for dependencies for the testing itself pkgs ? import ../.. { }, diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index f5f1fb5e7c2d..0d8377ec6006 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -631,6 +631,101 @@ runTests { ]; }; + testSplitStringBySimpleDelimiter = { + expr = strings.splitStringBy ( + prev: curr: + builtins.elem curr [ + "." + "-" + ] + ) false "foo.bar-baz"; + expected = [ + "foo" + "bar" + "baz" + ]; + }; + + testSplitStringByLeadingDelimiter = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ".foo.bar.baz"; + expected = [ + "" + "foo" + "bar" + "baz" + ]; + }; + + testSplitStringByTrailingDelimiter = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo.bar.baz."; + expected = [ + "foo" + "bar" + "baz" + "" + ]; + }; + + testSplitStringByMultipleConsecutiveDelimiters = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo...bar"; + expected = [ + "foo" + "" + "" + "bar" + ]; + }; + + testSplitStringByKeepingSplitChar = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) true "foo.bar.baz"; + expected = [ + "foo" + ".bar" + ".baz" + ]; + }; + + testSplitStringByCaseTransition = { + expr = strings.splitStringBy ( + prev: curr: builtins.match "[a-z]" prev != null && builtins.match "[A-Z]" curr != null + ) true "fooBarBaz"; + expected = [ + "foo" + "Bar" + "Baz" + ]; + }; + + testSplitStringByEmptyString = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ""; + expected = [ "" ]; + }; + + testSplitStringByComplexPredicate = { + expr = strings.splitStringBy ( + prev: curr: + prev != "" + && curr != "" + && builtins.match "[0-9]" prev != null + && builtins.match "[a-z]" curr != null + ) true "123abc456def"; + expected = [ + "123" + "abc456" + "def" + ]; + }; + + testSplitStringByUpperCaseStart = { + expr = strings.splitStringBy (prev: curr: builtins.match "[A-Z]" curr != null) true "FooBarBaz"; + expected = [ + "" + "Foo" + "Bar" + "Baz" + ]; + }; + testEscapeShellArg = { expr = strings.escapeShellArg "esc'ape\nme"; expected = "'esc'\\''ape\nme'"; @@ -851,8 +946,8 @@ runTests { }; testEscapeC = { - expr = strings.escapeC [ " " ] "Hello World"; - expected = "Hello\\x20World"; + expr = strings.escapeC [ "\n" " " ] "Hello World\n"; + expected = "Hello\\x20World\\x0a"; }; testEscapeURL = testAllTrue [ @@ -874,6 +969,28 @@ runTests { testToSentenceCasePath = testingThrow (strings.toSentenceCase ./.); + testToCamelCase = { + expr = strings.toCamelCase "hello world"; + expected = "helloWorld"; + }; + + testToCamelCaseFromKebab = { + expr = strings.toCamelCase "hello-world"; + expected = "helloWorld"; + }; + + testToCamelCaseFromSnake = { + expr = strings.toCamelCase "hello_world"; + expected = "helloWorld"; + }; + + testToCamelCaseFromPascal = { + expr = strings.toCamelCase "HelloWorld"; + expected = "helloWorld"; + }; + + testToCamelCasePath = testingThrow (strings.toCamelCase ./.); + testToInt = testAllTrue [ # Naive (123 == toInt "123") @@ -1262,6 +1379,69 @@ runTests { ) ]; + testTakeEnd = + let + inherit (lib) takeEnd; + in + testAllTrue [ + ( + takeEnd 0 [ + 1 + 2 + 3 + ] == [ ] + ) + ( + takeEnd 1 [ + 1 + 2 + 3 + ] == [ 3 ] + ) + ( + takeEnd 2 [ + 1 + 2 + 3 + ] == [ + 2 + 3 + ] + ) + ( + takeEnd 3 [ + 1 + 2 + 3 + ] == [ + 1 + 2 + 3 + ] + ) + ( + takeEnd 4 [ + 1 + 2 + 3 + ] == [ + 1 + 2 + 3 + ] + ) + (takeEnd 0 [ ] == [ ]) + (takeEnd 1 [ ] == [ ]) + ( + takeEnd (-1) [ + 1 + 2 + 3 + ] == [ ] + ) + (takeEnd (-1) [ ] == [ ]) + ]; + testDrop = let inherit (lib) drop; @@ -2830,6 +3010,42 @@ runTests { expected = "unknown"; }; + # https://github.com/NixOS/nixpkgs/issues/396849 + "test: submodule definitions aren't unchecked when evaluating submodule documentation" = { + expr = + let + module = + { lib, ... }: + { + options.foo = lib.mkOption { type = lib.types.submodule submodule; }; + }; + + submodule = { + options.bar = lib.mkOption { type = lib.types.int; }; + config.submoduleWrong = throw "yikes"; + }; + + options = (evalModules { modules = [ module ]; }).options; + + renderableOpts = filter (o: !o.internal) (optionAttrSetToDocList options); + # Evaluate the whole docs + in + builtins.deepSeq renderableOpts + # Return the locations + (map (o: o.loc) renderableOpts); + expected = [ + [ + "_module" + "args" + ] + [ "foo" ] + [ + "foo" + "bar" + ] + ]; + }; + testFreeformOptions = { expr = let diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index e623c0fb55b8..3b19c8c63f26 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -315,14 +315,26 @@ checkConfigOutput '^false$' config.enableAlias ./alias-with-priority-can-overrid checkConfigOutput '^"hello"$' config.package.pname ./declare-mkPackageOption.nix checkConfigOutput '^"hello"$' config.namedPackage.pname ./declare-mkPackageOption.nix checkConfigOutput '^".*Hello.*"$' options.namedPackage.description ./declare-mkPackageOption.nix +checkConfigOutput '^"literalExpression"$' options.namedPackage.defaultText._type ./declare-mkPackageOption.nix +checkConfigOutput '^"pkgs\.hello"$' options.namedPackage.defaultText.text ./declare-mkPackageOption.nix +checkConfigOutput '^"hello"$' config.namedPackageSingletonDefault.pname ./declare-mkPackageOption.nix +checkConfigOutput '^".*Hello.*"$' options.namedPackageSingletonDefault.description ./declare-mkPackageOption.nix +checkConfigOutput '^"pkgs\.hello"$' options.namedPackageSingletonDefault.defaultText.text ./declare-mkPackageOption.nix checkConfigOutput '^"hello"$' config.pathPackage.pname ./declare-mkPackageOption.nix +checkConfigOutput '^"literalExpression"$' options.packageWithExample.example._type ./declare-mkPackageOption.nix checkConfigOutput '^"pkgs\.hello\.override \{ stdenv = pkgs\.clangStdenv; \}"$' options.packageWithExample.example.text ./declare-mkPackageOption.nix +checkConfigOutput '^"literalExpression"$' options.packageWithPathExample.example._type ./declare-mkPackageOption.nix +checkConfigOutput '^"pkgs\.hello"$' options.packageWithPathExample.example.text ./declare-mkPackageOption.nix checkConfigOutput '^".*Example extra description\..*"$' options.packageWithExtraDescription.description ./declare-mkPackageOption.nix checkConfigError 'The option .undefinedPackage. was accessed but has no value defined. Try setting the option.' config.undefinedPackage ./declare-mkPackageOption.nix checkConfigOutput '^null$' config.nullablePackage ./declare-mkPackageOption.nix -checkConfigOutput '^"null or package"$' options.nullablePackageWithDefault.type.description ./declare-mkPackageOption.nix +checkConfigOutput '^"null or package"$' options.nullablePackage.type.description ./declare-mkPackageOption.nix +checkConfigOutput '^"hello"$' config.nullablePackageWithDefault.pname ./declare-mkPackageOption.nix checkConfigOutput '^"myPkgs\.hello"$' options.packageWithPkgsText.defaultText.text ./declare-mkPackageOption.nix checkConfigOutput '^"hello-other"$' options.packageFromOtherSet.default.pname ./declare-mkPackageOption.nix +checkConfigOutput '^"hello"$' config.packageInvalidIdentifier.pname ./declare-mkPackageOption.nix +checkConfigOutput '^"pkgs\.\\"123\\"\.\\"with\\\\\\"quote\\"\.hello"$' options.packageInvalidIdentifier.defaultText.text ./declare-mkPackageOption.nix +checkConfigOutput '^"pkgs\.\\"123\\"\.\\"with\\\\\\"quote\\"\.hello"$' options.packageInvalidIdentifierExample.example.text ./declare-mkPackageOption.nix # submoduleWith @@ -673,6 +685,26 @@ checkConfigError 'The option .conflictingPathOptionType. in .*/pathWith.nix. is # types.pathWith { inStore = true; absolute = false; } checkConfigError 'In pathWith, inStore means the path must be absolute' config.impossiblePathOptionType ./pathWith.nix +# mkDefinition +# check that mkDefinition 'file' is printed in the error message +checkConfigError 'Cannot merge definitions.*\n\s*- In .file.*\n\s*- In .other.*' config.conflict ./mkDefinition.nix +checkConfigError 'A definition for option .viaOptionDefault. is not of type .boolean.*' config.viaOptionDefault ./mkDefinition.nix +checkConfigOutput '^true$' config.viaConfig ./mkDefinition.nix +checkConfigOutput '^true$' config.mkMerge ./mkDefinition.nix +checkConfigOutput '^true$' config.mkForce ./mkDefinition.nix + +# specialArgs._class +checkConfigOutput '"nixos"' config.nixos.config.foo ./specialArgs-class.nix +checkConfigOutput '"bar"' config.conditionalImportAsNixos.config.foo ./specialArgs-class.nix +checkConfigError 'attribute .*bar.* not found' config.conditionalImportAsNixos.config.bar ./specialArgs-class.nix +checkConfigError 'attribute .*foo.* not found' config.conditionalImportAsDarwin.config.foo ./specialArgs-class.nix +checkConfigOutput '"foo"' config.conditionalImportAsDarwin.config.bar ./specialArgs-class.nix +checkConfigOutput '"nixos"' config.sub.nixos.foo ./specialArgs-class.nix +checkConfigOutput '"bar"' config.sub.conditionalImportAsNixos.foo ./specialArgs-class.nix +checkConfigError 'attribute .*bar.* not found' config.sub.conditionalImportAsNixos.bar ./specialArgs-class.nix +checkConfigError 'attribute .*foo.* not found' config.sub.conditionalImportAsDarwin.foo ./specialArgs-class.nix +checkConfigOutput '"foo"' config.sub.conditionalImportAsDarwin.bar ./specialArgs-class.nix + cat < { + $attr = import { url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname"; hash = "${sri}";$( [[ -n ${executable_nix} ]] && printf "\n %s" "${executable_nix}" [[ -n ${name_nix} ]] && printf "\n %s" "${name_nix}" [[ -n ${unpack_nix} ]] && printf "\n %s" "${unpack_nix}" ) -}; + }; EOF done # footer diff --git a/maintainers/scripts/check-maintainers-sorted.nix b/maintainers/scripts/check-maintainers-sorted.nix deleted file mode 100644 index 606a72c0aa9b..000000000000 --- a/maintainers/scripts/check-maintainers-sorted.nix +++ /dev/null @@ -1,87 +0,0 @@ -let - lib = import ../../lib; - inherit (lib) - add - attrNames - elemAt - foldl' - genList - length - replaceStrings - sort - toLower - trace - ; - - maintainers = import ../maintainer-list.nix; - simplify = replaceStrings [ "-" "_" ] [ "" "" ]; - compare = a: b: simplify (toLower a) < simplify (toLower b); - namesSorted = sort (a: b: a.key < b.key) ( - map ( - n: - let - pos = builtins.unsafeGetAttrPos n maintainers; - in - assert pos == null -> throw "maintainers entry ${n} is malformed"; - { - name = n; - line = pos.line; - key = toLower (simplify n); - } - ) (attrNames maintainers) - ); - before = - { - name, - line, - key, - }: - foldl' ( - acc: n: if n.key < key && (acc == null || n.key > acc.key) then n else acc - ) null namesSorted; - errors = foldl' add 0 ( - map ( - i: - let - a = elemAt namesSorted i; - b = elemAt namesSorted (i + 1); - lim = - let - t = before a; - in - if t == null then "the initial {" else t.name; - in - if a.line >= b.line then - trace ( - "maintainer ${a.name} (line ${toString a.line}) should be listed " - + "after ${lim}, not after ${b.name} (line ${toString b.line})" - ) 1 - else - 0 - ) (genList (i: i) (length namesSorted - 1)) - ); -in -assert errors == 0; -"all good!" - -# generate edit commands to sort the list. -# may everything following the last current entry (closing } ff) in the wrong place -# with lib; -# concatStringsSep -# "\n" -# (let first = foldl' (acc: n: if n.line < acc then n.line else acc) 999999999 namesSorted; -# commands = map -# (i: let e = elemAt namesSorted i; -# begin = foldl' -# (acc: n: if n.line < e.line && n.line > acc then n.line else acc) -# 1 -# namesSorted; -# end = -# foldl' (acc: n: if n.line > e.line && n.line < acc then n.line else acc) -# 999999999 -# namesSorted; -# in "${toString e.line},${toString (end - 1)} p") -# (genList (i: i) (length namesSorted)); -# in map -# (c: "sed -ne '${c}' maintainers/maintainer-list.nix") -# ([ "1,${toString (first - 1)} p" ] ++ commands)) diff --git a/maintainers/scripts/get-maintainer-pings-between.sh b/maintainers/scripts/get-maintainer-pings-between.sh new file mode 100755 index 000000000000..4b6d7ff78052 --- /dev/null +++ b/maintainers/scripts/get-maintainer-pings-between.sh @@ -0,0 +1,78 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p git jq + +# Outputs a list of maintainers that would be pinged across two nixpkgs revisions. +# Authors: +# Morgan Jones (@numinit) +# Tristan Ross (@RossComputerGuy) + +set -euo pipefail + +if [ $# -lt 2 ]; then + echo "Usage: $0 " >&2 + exit 1 +fi + +repo="$(git rev-parse --show-toplevel)" +system="$(nix-instantiate --eval --expr builtins.currentSystem)" +rev1="$(git -C "$repo" rev-parse "$1")" +rev2="$(git -C "$repo" rev-parse "$2")" + +echo "Touched files:" >&2 +git -C "$repo" diff --name-only "$rev1" "$rev2" \ + | jq --raw-input --slurp 'split("\n")[:-1]' | tee "$TMPDIR/touched-files.json" >&2 + +# Runs an eval in the given worktree, outputting the path to $TMPDIR/$1.path. +# $1: The revision SHA. +eval_in_worktree() ( + mkdir -p .worktree + local rev="$1" + local tree=".worktree/$rev" + if [ ! -d "$tree" ]; then + git -C "$repo" worktree add -f -d "$tree" "$rev" >&2 + fi + cd "$tree" + + local workdir="$TMPDIR/$rev" + rm -rf "$workdir" + mkdir -p "$workdir" + + nix-build ci -A eval.attrpathsSuperset -o "$workdir/paths" >&2 + mkdir -p "$workdir/intermediates" + nix-build ci -A eval.singleSystem \ + --arg evalSystem "$system" \ + --arg attrpathFile "$workdir/paths/paths.json" \ + --arg chunkSize ${CHUNK_SIZE:-10000} \ + -o "$workdir/intermediates/.intermediate-1" >&2 + + # eval.combine nix-build needs a directory, not a symlink + cp -RL "$workdir/intermediates/.intermediate-1" "$workdir/intermediates/intermediate-1" + chmod -R +w "$workdir/intermediates/intermediate-1" + rm -rf "$workdir/intermediates/.intermediate-1" + + nix-build ci -A eval.combine \ + --arg resultsDir "$workdir/intermediates" \ + -o "$workdir/result" >&2 +) + +eval_in_worktree "$rev1" & +pid1=$! +eval_in_worktree "$rev2" & +pid2=$! + +wait $pid1 +wait $pid2 + +path1="$TMPDIR/$rev1" +path2="$TMPDIR/$rev2" + +# Use the repo this script was executed in to get accurate maintainer info +nix-build "$repo/ci" -A eval.compare \ + --arg beforeResultDir "$path1/result" \ + --arg afterResultDir "$path2/result" \ + --arg touchedFilesJson "$TMPDIR/touched-files.json" \ + --arg byName true \ + -o comparison + +echo "Pinged maintainers (check $repo/comparison for more details)" >&2 +jq < comparison/maintainers.json diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index 62565d24d623..ea985acfc9a0 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -1,8 +1,8 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p git gh -I nixpkgs=. # -# Script to merge the currently open haskell-updates PR into master, bump the -# Stackage version and Hackage versions, and open the next haskell-updates PR. +# Script to merge the currently open haskell-updates PR , bump the Stackage +# version and Hackage versions, and open the next haskell-updates PR. set -eu -o pipefail @@ -79,10 +79,6 @@ fi echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_num}..." gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num" -# Update the list of Haskell package versions in NixOS on Hackage. -echo "Updating list of Haskell package versions in NixOS on Hackage..." -./maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh - # Update stackage, Hackage hashes, and regenerate Haskell package set echo "Updating Stackage..." ./maintainers/scripts/haskell/update-stackage.sh --do-commit @@ -100,7 +96,7 @@ git push "$push_remote" haskell-updates new_pr_body=$(cat < bool { + let res = with-env { NIXPKGS_ALLOW_BROKEN: "1" } { + # rather high timeout of half an hour, just to prevent never-ending builds + ^nix-build --no-out-link -j 1 --cores 1 --timeout 1800 -A $"haskellPackages.($package)" | complete + } + if $res.exit_code == 0 { + log warning $"($package) is not broken anymore!" + return false + } else { + log info $"($package) is still broken." + log debug $"($package) build log:\n($res.stderr)" + return true + } +} + +def main [] { + $broken_config | open | get broken-packages + | par-each {|package| if not (is-broken $package) { ^flock -x $broken_config -c $"sed -i -e '/^ - ($package) /d' ($broken_config)" }} +} diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index e72b77ccd349..2430edbdd420 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -8,7 +8,7 @@ set -eu -o pipefail # (should be capitalized like the display name) SOLVER=LTS # Stackage solver verson, if any. Use latest if empty -VERSION=22 +VERSION= TMP_TEMPLATE=update-stackage.XXXXXXX readonly SOLVER readonly VERSION diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index e4241cced120..f251a737efd1 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -1,10 +1,10 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.packaging ps.pyyaml ])" +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.packaging ps.pyyaml ])" nix-update import base64 import binascii import json import pathlib -from typing import Optional +import subprocess from urllib.parse import urljoin, urlparse import bs4 @@ -30,7 +30,13 @@ ROOT_TEMPLATE = jinja2.Template(''' {{ p }} = callPackage ./{{ p }} { }; {%- endfor %} } -'''.strip()); +'''.strip()) + +PROJECTS_WITH_RUST = { + "akonadi-search", + "angelfish", + "kdepim-addons", +} def to_sri(hash): raw = binascii.unhexlify(hash) @@ -40,7 +46,7 @@ def to_sri(hash): @click.command @click.argument( - "set", + "pkgset", type=click.Choice(["frameworks", "gear", "plasma"]), required=True ) @@ -65,9 +71,9 @@ def to_sri(hash): type=str, default=None, ) -def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[str]): +def main(pkgset: str, version: str, nixpkgs: pathlib.Path, sources_url: str | None): root_dir = nixpkgs / "pkgs/kde" - set_dir = root_dir / set + set_dir = root_dir / pkgset generated_dir = root_dir / "generated" metadata = utils.KDERepoMetadata.from_json(generated_dir) @@ -76,7 +82,7 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st "frameworks": f"frameworks/{version}/", "gear": f"release-service/{version}/src/", "plasma": f"plasma/{version}/", - }[set] + }[pkgset] sources_url = f"https://download.kde.org/stable/{set_url}" client = httpx.Client() @@ -85,6 +91,7 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st bs = bs4.BeautifulSoup(sources.text, features="html.parser") results = {} + projects_to_update_rust = set() for item in bs.select("tr")[3:]: link = item.select_one("td:nth-child(2) a") if not link: @@ -95,6 +102,9 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st if project_name not in metadata.projects_by_name: print(f"Warning: unknown tarball: {project_name}") + if project_name in PROJECTS_WITH_RUST: + projects_to_update_rust.add(project_name) + if version_and_ext.endswith(".sig"): continue @@ -119,8 +129,9 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st pkg_dir = set_dir / project_name pkg_file = pkg_dir / "default.nix" + if not pkg_file.exists(): - print(f"Generated new package: {set}/{project_name}") + print(f"Generated new package: {pkgset}/{project_name}") pkg_dir.mkdir(parents=True, exist_ok=True) with pkg_file.open("w") as fd: fd.write(LEAF_TEMPLATE.render(pname=project_name) + "\n") @@ -131,9 +142,20 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st sources_dir = generated_dir / "sources" sources_dir.mkdir(parents=True, exist_ok=True) - with (sources_dir / f"{set}.json").open("w") as fd: + with (sources_dir / f"{pkgset}.json").open("w") as fd: json.dump(results, fd, indent=2) + for project_name in projects_to_update_rust: + print(f"Updating cargoDeps hash for {pkgset}/{project_name}...") + subprocess.run([ + "nix-update", + f"kdePackages.{project_name}", + "--version", + "skip", + "--override-filename", + pkg_file + ]) + if __name__ == "__main__": main() # type: ignore diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 5beef16bf14b..2b9c13e5071d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -4,7 +4,7 @@ ansicolors,,,,,,Freed-Wu argparse,,,,,, basexx,,,,,, binaryheap,,,,,,vcunat -bit32,,,,5.3.0-1,5.1,lblasc +bit32,,,,,5.1,lblasc busted,,,,,, busted-htest,,,,,,mrcjkb cassowary,,,,,,alerque @@ -26,8 +26,9 @@ funnyfiles.nvim,,,,,,mrcjkb fzf-lua,,,,,,mrcjkb fzy,,,,,,mrcjkb gitsigns.nvim,https://raw.githubusercontent.com/lewis6991/gitsigns.nvim/main/gitsigns.nvim-scm-1.rockspec,,,,5.1, +grug-far.nvim,,,,,,teto haskell-tools.nvim,,,,,,mrcjkb -http,,,,0.3-0,,vcunat +http,,,,0.4-0,,vcunat image.nvim,,,,,,teto inspect,,,,,, jsregexp,,,,,, @@ -105,7 +106,6 @@ luazip,,,,,, lusc_luv,,,,,, lush.nvim,,,https://luarocks.org/dev,,,teto luuid,,,,20120509-2,, -luv,,,,1.48.0-2,, lyaml,,,,,,lblasc lz.n,,,,,,mrcjkb lze,,,,,,birdee diff --git a/maintainers/scripts/pluginupdate-py/pluginupdate.py b/maintainers/scripts/pluginupdate-py/pluginupdate.py index 2f55c1359de7..e3a4c44ede7e 100644 --- a/maintainers/scripts/pluginupdate-py/pluginupdate.py +++ b/maintainers/scripts/pluginupdate-py/pluginupdate.py @@ -558,7 +558,16 @@ class Editor: } for plugin_desc, plugin, redirect in fetched: - result[plugin.normalized_name] = (plugin_desc, plugin, redirect) + # Check if plugin is a Plugin object and has normalized_name attribute + if isinstance(plugin, Plugin) and hasattr(plugin, 'normalized_name'): + result[plugin.normalized_name] = (plugin_desc, plugin, redirect) + elif isinstance(plugin, Exception): + # For exceptions, we can't determine the normalized_name + # Just log the error and continue + log.error(f"Error fetching plugin {plugin_desc.name}: {plugin!r}") + else: + # For unexpected types, log the issue + log.error(f"Unexpected plugin type for {plugin_desc.name}: {type(plugin)}") return list(result.values()) @@ -615,9 +624,9 @@ class Editor: "--github-token", "-t", type=str, - default=os.getenv("GITHUB_API_TOKEN"), + default=os.getenv("GITHUB_TOKEN"), help="""Allows to set --proc to higher values. - Uses GITHUB_API_TOKEN environment variables as the default value.""", + Uses GITHUB_TOKEN environment variables as the default value.""", ) common.add_argument( "--no-commit", diff --git a/maintainers/scripts/update-typst-packages.py b/maintainers/scripts/update-typst-packages.py new file mode 100755 index 000000000000..2264f97d7706 --- /dev/null +++ b/maintainers/scripts/update-typst-packages.py @@ -0,0 +1,226 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p "python3.withPackages (p: with p; [ tomli tomli-w packaging license-expression])" -i python3 + +# This file is formatted with `ruff format`. + +import os +import re +import tomli +import tomli_w +import subprocess +import concurrent.futures +import argparse +import tempfile +import tarfile +from string import punctuation +from packaging.version import Version +from urllib import request +from collections import OrderedDict + + +class TypstPackage: + def __init__(self, **kwargs): + self.pname = kwargs["pname"] + self.version = kwargs["version"] + self.meta = kwargs["meta"] + self.path = kwargs["path"] + self.repo = ( + None + if "repository" not in self.meta["package"] + else self.meta["package"]["repository"] + ) + self.description = self.meta["package"]["description"].rstrip(punctuation) + self.license = self.meta["package"]["license"] + self.params = "" if "params" not in kwargs else kwargs["params"] + self.deps = [] if "deps" not in kwargs else kwargs["deps"] + + @classmethod + def package_name_full(cls, package_name, version): + version_number = map(lambda x: int(x), version.split(".")) + version_nix = "_".join(map(lambda x: str(x), version_number)) + return "_".join((package_name, version_nix)) + + def license_tokens(self): + import license_expression as le + + try: + # FIXME: ad hoc conversion + exception_list = [("EUPL-1.2+", "EUPL-1.2")] + + def sanitize_license_string(license_string, lookups): + if not lookups: + return license_string + return sanitize_license_string( + license_string.replace(lookups[0][0], lookups[0][1]), lookups[1:] + ) + + sanitized = sanitize_license_string(self.license, exception_list) + licensing = le.get_spdx_licensing() + parsed = licensing.parse(sanitized, validate=True) + return [s.key for s in licensing.license_symbols(parsed)] + except le.ExpressionError as e: + print( + f'Failed to parse license string "{self.license}" because of {str(e)}' + ) + exit(1) + + def source(self): + url = f"https://packages.typst.org/preview/{self.pname}-{self.version}.tar.gz" + cmd = [ + "nix", + "store", + "prefetch-file", + "--unpack", + "--hash-type", + "sha256", + "--refresh", + "--extra-experimental-features", + "nix-command", + ] + result = subprocess.run(cmd + [url], capture_output=True, text=True) + hash = re.search(r"hash\s+\'(sha256-.{44})\'", result.stderr).groups()[0] + return url, hash + + def to_name_full(self): + return self.package_name_full(self.pname, self.version) + + def to_attrs(self): + deps = set() + excludes = list(map( + lambda e: os.path.join(self.path, e), + self.meta["package"]["exclude"] if "exclude" in self.meta["package"] else [], + )) + for root, _, files in os.walk(self.path): + for file in filter(lambda f: f.split(".")[-1] == "typ", files): + file_path = os.path.join(root, file) + if file_path in excludes: + continue + with open(file_path, "r") as f: + deps.update( + set( + re.findall( + r"^\s*#import\s+\"@preview/([\w|-]+):(\d+.\d+.\d+)\"", + f.read(), + re.MULTILINE, + ) + ) + ) + self.deps = list( + filter(lambda p: p[0] != self.pname or p[1] != self.version, deps) + ) + source_url, source_hash = self.source() + + return dict( + url=source_url, + hash=source_hash, + typstDeps=[ + self.package_name_full(p, v) + for p, v in sorted(self.deps, key=lambda x: (x[0], Version(x[1]))) + ], + description=self.description, + license=self.license_tokens(), + ) | (dict(homepage=self.repo) if self.repo else dict()) + + +def generate_typst_packages(preview_dir, output_file): + package_tree = dict() + + print("Parsing metadata... from", preview_dir) + for p in os.listdir(preview_dir): + package_dir = os.path.join(preview_dir, p) + for v in os.listdir(package_dir): + package_version_dir = os.path.join(package_dir, v) + with open( + os.path.join(package_version_dir, "typst.toml"), "rb" + ) as meta_file: + try: + package = TypstPackage( + pname=p, + version=v, + meta=tomli.load(meta_file), + path=package_version_dir, + ) + if package.pname in package_tree: + package_tree[package.pname][v] = package + else: + package_tree[package.pname] = dict({v: package}) + except tomli.TOMLDecodeError: + print("Invalid typst.toml:", package_version_dir) + + with open(output_file, "wb") as typst_packages: + + def generate_package(pname, package_subtree): + sorted_keys = sorted(package_subtree.keys(), key=Version, reverse=True) + print(f"Generating metadata for {pname}") + return { + pname: OrderedDict( + (k, package_subtree[k].to_attrs()) for k in sorted_keys + ) + } + + with concurrent.futures.ThreadPoolExecutor(max_workers=100) as executor: + sorted_packages = sorted(package_tree.items(), key=lambda x: x[0]) + futures = list() + for pname, psubtree in sorted_packages: + futures.append(executor.submit(generate_package, pname, psubtree)) + packages = OrderedDict( + (package, subtree) + for future in futures + for package, subtree in future.result().items() + ) + print(f"Writing metadata... to {output_file}") + tomli_w.dump(packages, typst_packages) + + +def main(args): + PREVIEW_DIR = "packages/preview" + TYPST_PACKAGE_TARBALL_URL = ( + "https://github.com/typst/packages/archive/refs/heads/main.tar.gz" + ) + + directory = args.directory + if not directory: + tempdir = tempfile.mkdtemp() + print(tempdir) + typst_tarball = os.path.join(tempdir, "main.tar.gz") + + print( + "Downloading Typst packages source from {} to {}".format( + TYPST_PACKAGE_TARBALL_URL, typst_tarball + ) + ) + with request.urlopen( + request.Request(TYPST_PACKAGE_TARBALL_URL), timeout=15.0 + ) as response: + if response.status == 200: + with open(typst_tarball, "wb+") as f: + f.write(response.read()) + else: + print("Download failed") + exit(1) + with tarfile.open(typst_tarball) as tar: + tar.extractall(path=tempdir, filter="data") + directory = os.path.join(tempdir, "packages-main") + directory = os.path.abspath(directory) + + generate_typst_packages( + os.path.join(directory, PREVIEW_DIR), + args.output, + ) + + exit(0) + + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument( + "-d", "--directory", help="Local Typst Universe repository", default=None + ) + parser.add_argument( + "-o", + "--output", + help="Output file", + default=os.path.join(os.path.abspath("."), "typst-packages-from-universe.toml"), + ) + args = parser.parse_args() + main(args) diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index cfa051087ae5..576332b76607 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -1,6 +1,6 @@ from graphlib import TopologicalSorter from pathlib import Path -from typing import Any, Generator, Literal +from typing import Any, Final, Generator, Literal import argparse import asyncio import contextlib @@ -15,6 +15,11 @@ import tempfile Order = Literal["arbitrary", "reverse-topological", "topological"] +FAKE_DEPENDENCY_FOR_INDEPENDENT_PACKAGES: Final[str] = ( + "::fake_dependency_for_independent_packages" +) + + class CalledProcessError(Exception): process: asyncio.subprocess.Process stderr: bytes | None @@ -116,10 +121,14 @@ def requisites_to_attrs( def reverse_edges(graph: dict[str, set[str]]) -> dict[str, set[str]]: """ Flips the edges of a directed graph. + + Packages without any dependency relation in the updated set + will be added to `FAKE_DEPENDENCY_FOR_INDEPENDENT_PACKAGES` node. """ reversed_graph: dict[str, set[str]] = {} for dependent, dependencies in graph.items(): + dependencies = dependencies or {FAKE_DEPENDENCY_FOR_INDEPENDENT_PACKAGES} for dependency in dependencies: reversed_graph.setdefault(dependency, set()).add(dependent) @@ -413,6 +422,8 @@ async def populate_queue( ready_packages = list(sorter.get_ready()) eprint(f"Enqueuing group of {len(ready_packages)} packages") for package in ready_packages: + if package == FAKE_DEPENDENCY_FOR_INDEPENDENT_PACKAGES: + continue await packages_to_update.put(attr_packages[package]) await packages_to_update.join() sorter.done(*ready_packages) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index e1df0e2714d7..fbd079df3460 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -68,6 +68,16 @@ with lib.maintainers; ]; }; + apparmor = { + scope = "AppArmor-related modules, userspace tool packages and profiles"; + shortName = "apparmor"; + members = [ + julm + thoughtpolice + grimmauld + ]; + }; + bazel = { members = [ mboes @@ -216,6 +226,25 @@ with lib.maintainers; enableFeatureFreezePing = true; }; + cosmic = { + members = [ + a-kenji + ahoneybun + drakon64 + griffi-gh + HeitorAugustoLN + nyabinary + pandapip1 + qyliss + thefossguy + michaelBelsanti + ]; + githubTeams = [ "cosmic" ]; + shortName = "cosmic"; + scope = "Maintain the COSMIC DE and related packages."; + enableFeatureFreezePing = true; + }; + cuda = { members = [ connorbaker @@ -380,7 +409,6 @@ with lib.maintainers; leona osnyx ma27 - laalsaas ]; scope = "Team for Flying Circus employees who collectively maintain packages."; shortName = "Flying Circus employees"; @@ -509,6 +537,7 @@ with lib.maintainers; cdepillabout maralorn sternenseemann + wolfgangwalther ]; githubTeams = [ "haskell" ]; scope = "Maintain Haskell packages and infrastructure."; @@ -814,6 +843,7 @@ with lib.maintainers; Gabriella439 curran lf- + jkachmar ]; scope = "Group registry for packages maintained by Mercury"; shortName = "Mercury Employees"; @@ -839,6 +869,7 @@ with lib.maintainers; qyriad _9999years lf- + alois31 ]; scope = "Maintain the Lix package manager inside of Nixpkgs."; shortName = "Lix ecosystem"; @@ -905,6 +936,12 @@ with lib.maintainers; enableFeatureFreezePing = true; }; + octodns = { + members = [ anthonyroussel ]; + scope = "Maintain the ecosystem around OctoDNS"; + shortName = "OctoDNS"; + }; + openstack = { members = [ SuperSandro2000 @@ -1083,9 +1120,17 @@ with lib.maintainers; }; sdl = { - members = [ ]; - scope = "Maintain SDL libraries."; + members = [ + evythedemon + grimmauld + jansol + marcin-serwin + pbsds + ]; + githubTeams = [ "SDL" ]; + scope = "Maintain core SDL libraries."; shortName = "SDL"; + enableFeatureFreezePing = true; }; sphinx = { @@ -1147,7 +1192,12 @@ with lib.maintainers; }; systemd = { - members = [ ]; + members = [ + flokli + arianvp + elvishjerricco + aanderse + ]; githubTeams = [ "systemd" ]; scope = "Maintain systemd for NixOS."; shortName = "systemd"; @@ -1183,6 +1233,7 @@ with lib.maintainers; hehongbo lach sigmasquadron + rane ]; scope = "Maintain the Xen Project Hypervisor and the related tooling ecosystem."; shortName = "Xen Project Hypervisor"; diff --git a/nixos/doc/manual/configuration/luks-file-systems.section.md b/nixos/doc/manual/configuration/luks-file-systems.section.md index b20957b40b89..a1d22f34e920 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.section.md +++ b/nixos/doc/manual/configuration/luks-file-systems.section.md @@ -117,7 +117,7 @@ added to the LUKS volume. ``` Existing key slots are left intact, unless `--wipe-slot=` is specified. It is -recommened to add a recovery key that should be stored in a secure physical +recommended to add a recovery key that should be stored in a secure physical location and can be entered wherever a password would be entered. ```ShellSession diff --git a/nixos/doc/manual/configuration/profiles/minimal.section.md b/nixos/doc/manual/configuration/profiles/minimal.section.md index 5b72112477f7..cfbd7ae6067b 100644 --- a/nixos/doc/manual/configuration/profiles/minimal.section.md +++ b/nixos/doc/manual/configuration/profiles/minimal.section.md @@ -1,6 +1,6 @@ # Minimal {#sec-profile-minimal} This profile defines a small NixOS configuration. It does not contain any -graphical stuff. It's a very short file that sets [](#opt-i18n.supportedLocales) +graphical stuff. It's a very short file that sets the supported locales to only support the user-selected locale, and [disables packages' documentation](#opt-documentation.enable). diff --git a/nixos/doc/manual/contributing-to-this-manual.chapter.md b/nixos/doc/manual/contributing-to-this-manual.chapter.md index 7515bef44b10..a78a136becca 100644 --- a/nixos/doc/manual/contributing-to-this-manual.chapter.md +++ b/nixos/doc/manual/contributing-to-this-manual.chapter.md @@ -17,6 +17,28 @@ There's also [a convenient development daemon](https://nixos.org/manual/nixpkgs/ The above instructions don't deal with the appendix of available `configuration.nix` options, and the manual pages related to NixOS. These are built, and written in a different location and in a different format, as explained in the next sections. +## Development environment {#sec-contributing-development-env} + +In order to reduce repetition, consider using tools from the provided development environment: + +Load it from the NixOS documentation directory with + +```ShellSession +$ cd /path/to/nixpkgs/nixos/doc/manual +$ nix-shell +``` + +To load the development utilities automatically when entering that directory, [set up `nix-direnv`](https://nix.dev/guides/recipes/direnv). + +Make sure that your local files aren't added to Git history by adding the following lines to `.git/info/exclude` at the root of the Nixpkgs repository: + +``` +/**/.envrc +/**/.direnv +``` + +You might want to also use [`devmode`](https://github.com/NixOS/nixpkgs/blob/master/doc/README.md#devmode) while editing the manual. + ## Testing redirects {#sec-contributing-redirects} Once you have a successful build, you can open the relevant HTML (path mentioned above) in a browser along with the anchor, and observe the redirection. diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 824b5eabb965..fd9f6761ac17 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -160,6 +160,8 @@ rec { ./manual.md \ $dst/${common.indexPath} + cp ${pkgs.roboto.src}/web/Roboto\[ital\,wdth\,wght\].ttf "$dst/Roboto.ttf" + mkdir -p $out/nix-support echo "nix-build out $out" >> $out/nix-support/hydra-build-products echo "doc manual $dst" >> $out/nix-support/hydra-build-products diff --git a/nixos/doc/manual/development/meta-attributes.section.md b/nixos/doc/manual/development/meta-attributes.section.md index fc0f7ae268de..c1795ba89696 100644 --- a/nixos/doc/manual/development/meta-attributes.section.md +++ b/nixos/doc/manual/development/meta-attributes.section.md @@ -22,7 +22,7 @@ file. }; meta = { - maintainers = with lib.maintainers; [ ericsagnes ]; + maintainers = with lib.maintainers; [ ]; doc = ./default.md; buildDocsInSandbox = true; }; diff --git a/nixos/doc/manual/development/nixos-tests.chapter.md b/nixos/doc/manual/development/nixos-tests.chapter.md index ec0e4b9f076a..889a90bae68b 100644 --- a/nixos/doc/manual/development/nixos-tests.chapter.md +++ b/nixos/doc/manual/development/nixos-tests.chapter.md @@ -10,4 +10,5 @@ writing-nixos-tests.section.md running-nixos-tests.section.md running-nixos-tests-interactively.section.md linking-nixos-tests-to-packages.section.md +testing-hardware-features.section.md ``` diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index 112c4f054f2a..efccba3da37c 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -158,14 +158,14 @@ lib.mkOption { ::: {#ex-options-declarations-util-mkPackageOption-extraDescription .example} ### `mkPackageOption` with additional description text ```nix -mkPackageOption pkgs [ "python39Packages" "pytorch" ] { +mkPackageOption pkgs [ "python312Packages" "torch" ] { extraDescription = "This is an example and doesn't actually do anything."; } # is like lib.mkOption { type = lib.types.package; - default = pkgs.python39Packages.pytorch; - defaultText = lib.literalExpression "pkgs.python39Packages.pytorch"; + default = pkgs.python312Packages.torch; + defaultText = lib.literalExpression "pkgs.python312Packages.torch"; description = "The pytorch package to use. This is an example and doesn't actually do anything."; } ``` diff --git a/nixos/doc/manual/development/option-def.section.md b/nixos/doc/manual/development/option-def.section.md index 227f41d812ff..fddcfef393ae 100644 --- a/nixos/doc/manual/development/option-def.section.md +++ b/nixos/doc/manual/development/option-def.section.md @@ -123,3 +123,65 @@ they were declared in separate modules. This can be done using ]; } ``` + +## Free-floating definitions {#sec-option-definitions-definitions} + +:::{.note} +The module system internally transforms module syntax into definitions. This always happens internally. +::: + +It is possible to create first class definitions which are not transformed _again_ into definitions by the module system. + +Usually the file location of a definition is implicit and equal to the file it came from. +However, when manipulating definitions, it may be useful for them to be completely self-contained (or "free-floating"). + +A free-floating definition is created with `mkDefinition { file = ...; value = ...; }`. + +Preserving the file location creates better error messages, for example when copying definitions from one option to another. + +Other properties like `mkOverride` `mkMerge` `mkAfter` can be used in the `value` attribute but not on the entire definition. + +This is what would work + +```nix +mkDefinition { + value = mkForce 42; + file = "somefile.nix"; +} +``` + +While this would NOT work. + +```nix +mkForce (mkDefinition { + value = 42; + file = "somefile.nix"; +}) +``` + +The following shows an example configuration that yields an error with the custom position information: + +```nix +{ + _file = "file.nix"; + options.foo = mkOption { + default = 13; + }; + config.foo = lib.mkDefinition { + file = "custom place"; + # mkOptionDefault creates a conflict with the option foo's `default = 1` on purpose + # So we see the error message below contains the conflicting values and different positions + value = lib.mkOptionDefault 42; + }; +} +``` + +evaluating the module yields the following error: + +``` +error: Cannot merge definitions of `foo'. Definition values: +- In `file.nix': 13 +- In `custom place': 42 +``` + +To set the file location for all definitions in a module, you may add the `_file` module syntax attribute, which has a similar effect to using `mkDefinition` on all definitions in the module, without the hassle. diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md index b65cab992253..38d1e5916072 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md @@ -63,6 +63,66 @@ using: Once the connection is established, you can enter commands in the socat terminal where socat is running. +## SSH Access for test machines {#sec-nixos-test-ssh-access} + +An SSH-based backdoor to log into machines can be enabled with + +```nix +{ + name = "…"; + nodes.machines = { /* … */ }; + interactive.sshBackdoor.enable = true; +} +``` + +::: {.warning} +Make sure to only enable the backdoor for interactive tests +(i.e. by using `interactive.sshBackdoor.enable`)! This is the only +supported configuration. + +Running a test in a sandbox with this will fail because `/dev/vhost-vsock` isn't available +in the sandbox. +::: + +This creates a [vsock socket](https://man7.org/linux/man-pages/man7/vsock.7.html) +for each VM to log in with SSH. This configures root login with an empty password. + +When the VMs get started interactively with the test-driver, it's possible to +connect to `machine` with + +``` +$ ssh vsock/3 -o User=root +``` + +The socket numbers correspond to the node number of the test VM, but start +at three instead of one because that's the lowest possible +vsock number. The exact SSH commands are also printed out when starting +`nixos-test-driver`. + +On non-NixOS systems you'll probably need to enable +the SSH config from {manpage}`systemd-ssh-proxy(1)` yourself. + +If starting VM fails with an error like + +``` +qemu-system-x86_64: -device vhost-vsock-pci,guest-cid=3: vhost-vsock: unable to set guest cid: Address already in use +``` + +it means that the vsock numbers for the VMs are already in use. This can happen +if another interactive test with SSH backdoor enabled is running on the machine. + +In that case, you need to assign another range of vsock numbers. You can pick another +offset with + +```nix +{ + sshBackdoor = { + enable = true; + vsockOffset = 23542; + }; +} +``` + ## Port forwarding to NixOS test VMs {#sec-nixos-test-port-forwarding} If your test has only a single VM, you may use e.g. diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 4b49a1e82090..736662ad7ed9 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -412,7 +412,7 @@ have a predefined type and string generator already declared under `multiline` (default `true`) - : Whether to procude a multiline output. The output may still wrap across + : Whether to produce a multiline output. The output may still wrap across multiple lines if it would otherwise exceed `columnWidth`. `columnWidth` (default `100`) diff --git a/nixos/doc/manual/development/testing-hardware-features.section.md b/nixos/doc/manual/development/testing-hardware-features.section.md new file mode 100644 index 000000000000..aaf652d731f7 --- /dev/null +++ b/nixos/doc/manual/development/testing-hardware-features.section.md @@ -0,0 +1,152 @@ +# Testing Hardware Features {#sec-nixos-test-testing-hardware-features} + +This section covers how to test various features using NixOS tests that would +normally only be possible with hardware. It is designed to showcase the NixOS test +framework's flexibility when combined with various hardware simulation libraries +or kernel modules. + +## Wi-Fi {#sec-nixos-test-wifi} + +Use `services.vwifi` to set up a virtual Wi-Fi physical layer. Create at least two nodes +for this kind of test: one with vwifi active, and either a station or an access point. +Give each a static IP address on the test network so they will never collide. +This module likely supports other topologies too; document them if you make one. + +This NixOS module leverages [vwifi](https://github.com/Raizo62/vwifi). Read the +upstream repository's documentation for more information. + +### vwifi server {#sec-nixos-test-wifi-vwifi-server} + +This node runs the vwifi server, and otherwise does not interact with the network. +You can run `vwifi-ctrl` on this node to control characteristics of the simulated +physical layer. + +```nix +airgap = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = "192.168.1.2"; + prefixLength = 24; + } + ]; + services.vwifi = { + server = { + enable = true; + ports.tcp = 8212; + # uncomment if you want to enable monitor mode on another node + # ports.spy = 8213; + openFirewall = true; + }; + }; + }; +``` + +### AP {#sec-nixos-test-wifi-ap} + +A node like this will act as a wireless access point in infrastructure mode. + +```nix +ap = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = "192.168.1.3"; + prefixLength = 24; + } + ]; + services.hostapd = { + enable = true; + radios.wlan0 = { + channel = 1; + networks.wlan0 = { + ssid = "NixOS Test Wi-Fi Network"; + authentication = { + mode = "wpa3-sae"; + saePasswords = [ { password = "supersecret"; } ]; + enableRecommendedPairwiseCiphers = true; + }; + }; + }; + }; + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:01"; + }; + client = { + enable = true; + serverAddress = "192.168.1.2"; + }; + }; + }; +``` + +### Station {#sec-nixos-test-wifi-station} + +A node like this acts as a wireless client. + +```nix +station = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = "192.168.1.3"; + prefixLength = 24; + } + ]; + networking.wireless = { + # No, really, we want it enabled! + enable = lib.mkOverride 0 true; + interfaces = [ "wlan0" ]; + networks = { + "NixOS Test Wi-Fi Network" = { + psk = "supersecret"; + authProtocols = [ "SAE" ]; + }; + }; + }; + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:02"; + }; + client = { + enable = true; + serverAddress = "192.168.1.2"; + }; + }; + }; +``` + +### Monitor {#sec-nixos-test-wifi-monitor} + +When the monitor mode interface is enabled, this node will receive +all packets broadcast by all other nodes through the spy interface. + +```nix +monitor = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = "192.168.1.4"; + prefixLength = 24; + } + ]; + + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:03"; + }; + client = { + enable = true; + spy = true; + serverAddress = "192.168.1.2"; + }; + }; +``` diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index bd588e2ba80b..5b08975e5ea4 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -121,8 +121,7 @@ and checks that the output is more-or-less correct: ```py machine.start() machine.wait_for_unit("default.target") -if not "Linux" in machine.succeed("uname"): - raise Exception("Wrong OS") +t.assertIn("Linux", machine.succeed("uname"), "Wrong OS") ``` The first line is technically unnecessary; machines are implicitly started @@ -134,6 +133,8 @@ starting them in parallel: start_all() ``` +Under the variable `t`, all assertions from [`unittest.TestCase`](https://docs.python.org/3/library/unittest.html) are available. + If the hostname of a node contains characters that can't be used in a Python variable name, those characters will be replaced with underscores in the variable name, so `nodes.machine-a` will be exposed diff --git a/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md b/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md index 378b1163a6e3..075a8fca3bbb 100644 --- a/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md +++ b/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md @@ -2,15 +2,30 @@ Nixpkgs contains a variety of modules to build custom images for different virtualization platforms and cloud providers, such as e.g. `amazon-image.nix` and `proxmox-lxc.nix`. -While those can be imported individually, `system.build.images` provides an attribute set mapping variant names to image derivations. Available variants are defined - end extendable - in `image.modules`, an attribute set mapping variant names to a list of NixOS modules. +While those can be imported directly, `system.build.images` provides an attribute set mapping variant names to image derivations. Available variants are defined - end extendable - in `image.modules`, an attribute set mapping variant names to NixOS modules. -All of those images can be built via both, their `system.build.image` attribute, and the CLI `nixos-rebuild build-image`. To build i.e. an Amazon image from your existing NixOS configuration: +All of those images can be built via both, their `system.build.image` attribute and the `nixos-rebuild build-image` command. + +For example, to build an Amazon image from your existing NixOS configuration, run: ```ShellSession $ nixos-rebuild build-image --image-variant amazon -$ ls result -nixos-image-amazon-25.05pre-git-x86_64-linux.vhd nix-support +[...] +Done. The disk image can be found in /nix/store/[hash]-nixos-image-amazon-25.05pre-git-x86_64-linux/nixos-image-amazon-25.05pre-git-x86_64-linux.vpc ``` To get a list of all variants available, run `nixos-rebuild build-image` without arguments. +::: {.example #ex-nixos-rebuild-build-image-customize} + +## Customize specific image variants {#sec-image-nixos-rebuild-build-image-customize} + +The `image.modules` option can be used to set specific options per image variant, in a similar fashion as [specialisations](options.html#opt-specialisation) for generic NixOS configurations. + +E.g. images for the cloud provider Linode use `grub2` as a bootloader by default. If you are using `systemd-boot` on other platforms and want to disable it for Linode only, you could use the following options: + +``` nix + image.modules.linode = { + boot.loader.systemd-boot.enable = lib.mkForce false; + }; +``` diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md index a887a923e57f..19713761e9a0 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md @@ -8,7 +8,7 @@ up a VirtualBox guest, follow these instructions: 1. Base Memory Size: 768 MB or higher. -1. New Hard Disk of 8 GB or higher. +1. New Hard Disk of 10 GB or higher. 1. Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM) diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 65520e2afb7d..6f5bbe8b01b5 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -2,6 +2,15 @@ "book-nixos-manual": [ "index.html#book-nixos-manual" ], + "module-services-anubis": [ + "index.html#module-services-anubis" + ], + "module-services-anubis-configuration": [ + "index.html#module-services-anubis-configuration" + ], + "module-services-anubis-quickstart": [ + "index.html#module-services-anubis-quickstart" + ], "module-services-crab-hole": [ "index.html#module-services-crab-hole" ], @@ -41,6 +50,12 @@ "module-services-crab-hole-upstream-options": [ "index.html#module-services-crab-hole-upstream-options" ], + "module-services-opencloud": [ + "index.html#module-services-opencloud" + ], + "module-services-opencloud-basic-usage": [ + "index.html#module-services-opencloud-basic-usage" + ], "module-services-strfry": [ "index.html#module-services-strfry" ], @@ -50,12 +65,21 @@ "module-services-strfry-reverse-proxy": [ "index.html#module-services-strfry-reverse-proxy" ], + "module-services-dump1090-fa": [ + "index.html#module-services-dump1090-fa" + ], + "module-services-dump1090-fa-configuration": [ + "index.html#module-services-dump1090-fa-configuration" + ], "preface": [ "index.html#preface" ], "ch-installation": [ "index.html#ch-installation" ], + "sec-contributing-development-env": [ + "index.html#sec-contributing-development-env" + ], "sec-mattermost": [ "index.html#sec-mattermost" ], @@ -68,6 +92,21 @@ "sec-mattermost-plugins-build": [ "index.html#sec-mattermost-plugins-build" ], + "sec-nixos-test-wifi": [ + "index.html#sec-nixos-test-wifi" + ], + "sec-nixos-test-wifi-ap": [ + "index.html#sec-nixos-test-wifi-ap" + ], + "sec-nixos-test-wifi-monitor": [ + "index.html#sec-nixos-test-wifi-monitor" + ], + "sec-nixos-test-wifi-station": [ + "index.html#sec-nixos-test-wifi-station" + ], + "sec-nixos-test-wifi-vwifi-server": [ + "index.html#sec-nixos-test-wifi-vwifi-server" + ], "sec-obtaining": [ "index.html#sec-obtaining" ], @@ -137,6 +176,9 @@ "ex-config": [ "index.html#ex-config" ], + "ex-nixos-rebuild-build-image-customize": [ + "index.html#ex-nixos-rebuild-build-image-customize" + ], "sec-installation-additional-notes": [ "index.html#sec-installation-additional-notes" ], @@ -191,6 +233,9 @@ "sec-image-nixos-rebuild-build-image": [ "index.html#sec-image-nixos-rebuild-build-image" ], + "sec-image-nixos-rebuild-build-image-customize": [ + "index.html#sec-image-nixos-rebuild-build-image-customize" + ], "sec-image-repart": [ "index.html#sec-image-repart" ], @@ -1250,6 +1295,12 @@ "module-services-postgres-initializing-extra-permissions-service-user-oneshot": [ "index.html#module-services-postgres-initializing-extra-permissions-service-user-oneshot" ], + "module-services-postgres-authentication": [ + "index.html#module-services-postgres-authentication" + ], + "module-services-postgres-authentication-user-mapping": [ + "index.html#module-services-postgres-authentication-user-mapping" + ], "module-services-postgres-upgrading": [ "index.html#module-services-postgres-upgrading" ], @@ -1262,6 +1313,9 @@ "module-services-postgres-plugins": [ "index.html#module-services-postgres-plugins" ], + "module-services-postgres-pls": [ + "index.html#module-services-postgres-pls" + ], "module-services-postgres-jit": [ "index.html#module-services-postgres-jit" ], @@ -1664,6 +1718,9 @@ "sec-option-definitions-merging": [ "index.html#sec-option-definitions-merging" ], + "sec-option-definitions-definitions": [ + "index.html#sec-option-definitions-definitions" + ], "sec-assertions": [ "index.html#sec-assertions" ], @@ -1781,6 +1838,12 @@ "sec-test-options-reference": [ "index.html#sec-test-options-reference" ], + "test-opt-sshBackdoor.enable": [ + "index.html#test-opt-sshBackdoor.enable" + ], + "test-opt-sshBackdoor.vsockOffset": [ + "index.html#test-opt-sshBackdoor.vsockOffset" + ], "test-opt-defaults": [ "index.html#test-opt-defaults" ], @@ -1820,6 +1883,9 @@ "test-opt-meta.platforms": [ "index.html#test-opt-meta.platforms" ], + "test-opt-meta.hydraPlatforms": [ + "index.html#test-opt-meta.hydraPlatforms" + ], "test-opt-meta.timeout": [ "index.html#test-opt-meta.timeout" ], @@ -1868,6 +1934,9 @@ "sec-nixos-test-shell-access": [ "index.html#sec-nixos-test-shell-access" ], + "sec-nixos-test-ssh-access": [ + "index.html#sec-nixos-test-ssh-access" + ], "sec-nixos-test-port-forwarding": [ "index.html#sec-nixos-test-port-forwarding" ], @@ -1880,6 +1949,9 @@ "sec-linking-nixos-tests-to-packages": [ "index.html#sec-linking-nixos-tests-to-packages" ], + "sec-nixos-test-testing-hardware-features": [ + "index.html#sec-nixos-test-testing-hardware-features" + ], "chap-developing-the-test-driver": [ "index.html#chap-developing-the-test-driver" ], @@ -1916,6 +1988,21 @@ "ch-release-notes": [ "release-notes.html#ch-release-notes" ], + "sec-release-25.11": [ + "release-notes.html#sec-release-25.11" + ], + "sec-release-25.11-highlights": [ + "release-notes.html#sec-release-25.11-highlights" + ], + "sec-release-25.11-new-modules": [ + "release-notes.html#sec-release-25.11-new-modules" + ], + "sec-release-25.11-incompatibilities": [ + "release-notes.html#sec-release-25.11-incompatibilities" + ], + "sec-release-25.11-notable-changes": [ + "release-notes.html#sec-release-25.11-notable-changes" + ], "sec-release-25.05": [ "release-notes.html#sec-release-25.05" ], @@ -1931,6 +2018,9 @@ "sec-release-25.05-notable-changes": [ "release-notes.html#sec-release-25.05-notable-changes" ], + "sec-release-25.05-wiki": [ + "release-notes.html#sec-release-25.05-wiki" + ], "sec-nixpkgs-release-25.05": [ "release-notes.html#sec-nixpkgs-release-25.05" ], diff --git a/nixos/doc/manual/release-notes/release-notes.md b/nixos/doc/manual/release-notes/release-notes.md index 7110603c44bc..3889f4890f66 100644 --- a/nixos/doc/manual/release-notes/release-notes.md +++ b/nixos/doc/manual/release-notes/release-notes.md @@ -3,6 +3,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. ```{=include=} sections +rl-2511.section.md rl-2505.section.md rl-2411.section.md rl-2405.section.md diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 486b5f542ff4..c21e36403161 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -101,7 +101,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [InvoicePlane](https://invoiceplane.com), web application for managing and creating invoices. Available at [services.invoiceplane](#opt-services.invoiceplane.sites._name_.enable). -- [k3b](https://userbase.kde.org/K3b), the KDE disk burning application. Available as programs.k3b. +- [k3b](https://userbase.kde.org/K3b), the KDE disk burning application. Available as [programs.k3b](#opt-programs.k3b.enable). - [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](#opt-programs.k40-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device. diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 0a4aedba87fc..b11f36719035 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -139,7 +139,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro - [Netbird](https://netbird.io), an open-source VPN management platform, now has a self-hosted management server. Available as [services.netbird.server](#opt-services.netbird.server.enable). -- [nh](https://github.com/viperML/nh), yet another Nix CLI helper. Available as [programs.nh](#opt-programs.nh.enable). +- [nh](https://github.com/nix-community/nh), yet another Nix CLI helper. Available as [programs.nh](#opt-programs.nh.enable). - [oink](https://github.com/rlado/oink), a dynamic DNS client for Porkbun. Available as [services.oink](#opt-services.oink.enable). diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index f531ff61af86..b70490d0de93 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -1,42 +1,41 @@ -# Nixos 25.05 (“Warbler”, 2025.05/??) {#sec-release-25.05} +# NixOS 25.05 (“Warbler”, 2025.05/??) {#sec-release-25.05} ## Highlights {#sec-release-25.05-highlights} -- Initial support for the [COSMIC DE](https://system76.com/cosmic), a Rust-based desktop environment by System76, makers of Pop!_OS. Toggle the greeter (login manager) using `services.displayManager.cosmic-greeter.enable` and the DE itself with `services.desktopManager.cosmic.enable`. Mostly stable but still experimental. Please report any issues to the [COSMIC DE tracker in Nixpkgs](https://github.com/NixOS/nixpkgs/issues/259641) instead of upstream. +Alongside many enhancements to NixOS modules and general system improvements, this release features the following highlights: -- `services.dex` now restarts upon changes to the `.environmentFile` or entries in `.settings.staticClients[].secretFile` when the entry is a `path` type. +- NixOS now has initial support for the [**COSMIC DE**](https://system76.com/cosmic) which is currently at **Alpha 7**. COSMIC is a Rust-based Desktop Environment by System76, makers of Pop!_OS. You can use COSMIC by enabling the greeter (login manager) with [](#opt-services.displayManager.cosmic-greeter.enable), and the DE itself by enabling [](#opt-services.desktopManager.cosmic.enable). The support in NixOS/Nixpkgs is stable but still considered experimental because of the recent the addition. The COSMIC maintainers will be waiting for one more release of NixOS to determine if the experimental tag should be removed or not. Until then, please report any issues to the [COSMIC DE tracker in Nixpkgs](https://github.com/NixOS/nixpkgs/issues/259641) instead of upstream. -- `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default. - -- The `nixos-generate-config` command now supports a optional `--flake` option, which will generate a flake.nix file alongside the `configuration.nix` and `hardware-configuration.nix`, providing an easy instroduction into flake-based system configurations. +- `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [](#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default. - A `nixos-rebuild build-image` sub-command has been added. - It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the NixOS manual](https://nixos.org/manual/nixos/unstable/#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`. + It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the NixOS manual](#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`. - `nixos-option` has been rewritten to a Nix expression called by a simple bash script. This lowers our maintenance threshold, makes eval errors less verbose, adds support for flake-based configurations, descending into `attrsOf` and `listOf` submodule options, and `--show-trace`. -- The `intel` video driver for X.org (from the xf86-video-intel package) which was previously removed because it was non-functional has been fixed and the driver has been re-introduced. +- The packaging of Mesa graphics drivers has been significantly reworked, in particular: + - Applications linked against different Mesa versions than installed on the system should now work correctly going forward (however, applications against older Mesa, e.g. from Nixpkgs releases before 25.05, remain broken) + - The global Mesa version can now be managed without a mass rebuild by setting [](#opt-hardware.graphics.package) + - Packages that used to depend on Mesa for libgbm or libdri should use `libgbm` or `dri-pkgconfig-stub` as inputs, respectively -- The Mattermost module ({option}`services.mattermost`) and packages (`mattermost` and `mmctl`) have been substantially updated: - - {option}`services.mattermost.preferNixConfig` now defaults to true if you advance {option}`system.stateVersion` to 25.05. This means that if you have {option}`services.mattermost.mutableConfig` set, NixOS will override your settings to those that you define in the module. It is recommended to leave this at the default, even if you used a mutable config before, because it will ensure that your Mattermost data directories are correct. If you moved your data directories, you may want to review the module changes before upgrading. - - Mattermost telemetry reporting is now disabled by default, though security update notifications are enabled. Look at {option}`services.mattermost.telemetry` for options to control this behavior. - - `pkgs.mattermostLatest` is now an option to track the latest (non-prerelease) Mattermost release. We test upgrade migrations from ESR releases (`pkgs.mattermost`) to `pkgs.mattermostLatest`. - - The Mattermost frontend is now built from source and can be overridden. - - Note that the Mattermost derivation containing both the webapp and server is now wrapped to allow them to be built independently, so overrides to both webapp and server look like `mattermost.overrideAttrs (prev: { webapp = prev.webapp.override { ... }; server = prev.server.override { ... }; })` now. - - `services.mattermost.listenAddress` has been split into {option}`services.mattermost.host` and {option}`services.mattermost.port`. If your `listenAddress` contained a port, you will need to edit your configuration. - - Mattermost now supports peer authentication on both MySQL and Postgres database backends. Updating {option}`system.stateVersion` to 25.05 or later will result in peer authentication being used by default if the Mattermost server would otherwise be connecting to localhost. This is the recommended configuration. - - The Mattermost module will produce eval warnings if a database password would end up in the Nix store, and recommend alternatives such as peer authentication or using the environment file. - - Mattermost's entire test suite is now enabled by default, which will extend build time from sources by up to an hour. A `withoutTests` passthru has been added in case you want to skip it. - - We now support `mmctl` for Mattermost administration if both {option}`services.mattermost.socket.enable` and {option}`services.mattermost.socket.export` are set, which export the Mattermost control socket path into the system environment. - - A new `pkgs.mattermost.buildPlugin` function has been added, which allows plugins to be built from source, including webapp frontends with a supported package-lock.json. See the Mattermost NixOS test and [manual](https://nixos.org/manual/nixpkgs/unstable/#sec-mattermost-plugins-build) for an example. - - Note that the Mattermost module will create an account _without_ a well-known UID if the username differs from the default (`mattermost`). If you used Mattermost with a nonstandard username, you may want to review the module changes before upgrading. +- OpenSSH has been updated from 9.9p2 to 10.0p2, dropping support for DSA keys and adding a new `ssh-auth` binary to handle user authentication in a different address space from unauthenticated sessions. Additionally, we now enable a configure option by default that attempts to lock sshd into RAM to prevent it from being swapped out, which may improve performance if the system is under memory pressure. See the [full changelog](https://www.openwall.com/lists/oss-security/2025/04/09/1) for more details. -- androidenv has been updated: - - All versions specified in composeAndroidPackages now track latest. Android packages are automatically updated on unstable, and run the androidenv test suite on every update. - - Some androidenv packages are now searchable on [search.nixos.org](https://search.nixos.org). - - We now use the latest Google repositories, which should improve aarch64-darwin compatibility. The SDK now additionally evaluates on aarch64-linux, though not all packages are functional. +- GNOME has been updated to version 48. + + - `decibels` music player is now installed by default. You can disable it using [](#opt-environment.gnome.excludePackages). + - `gnome-shell-extensions` extension collection (which included GNOME Classic extensions, Apps Menu, and User Themes, among others) are no longer installed by default. You can install them again with [](#opt-services.xserver.desktopManager.gnome.sessionPath). + - Option [](#opt-services.gnome.core-developer-tools.enable) now also installs `sysprof` and `d-spy`. + - Option `services.gnome.core-utilities.enable` has been renamed to [](#opt-services.gnome.core-apps.enable). + - `cantarell-fonts`, `source-code-pro` and `source-sans` fonts are no longer installed by default. They have been replaced by `adwaita-fonts`. + + Refer to the [GNOME release notes](https://release.gnome.org/48/) for more details. + +- [channels.nixos.org](https://channels.nixos.org) now supports the Lockable HTTP Tarball Protocol. This allows using the channel `nixexprs.tar` as Nix Flake input, e.g.: + ``` + inputs.nixpkgs.url = "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"; + ``` @@ -44,18 +43,25 @@ -- [AmneziaVPN](https://amnezia.org/en), an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server. Available as [programs.amnezia-vpn](#opt-programs.amnezia-vpn.enable). +- [AmneziaVPN](https://amnezia.org/en), a self-hostable open-source VPN client, is available in two variants: + - [programs.amnezia-vpn](#opt-programs.amnezia-vpn.enable): a GUI client which can also deploy a VPN endpoint to a remote server + - {option}`networking.wireguard` adds support for the [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) variant of the protocol, featuring better masking against Deep Packet Inspection. The variant to be used is set per interface as `networking.wireguard.interfaces..type`, defaulting to wireguard. + - [Bazecor](https://github.com/Dygmalab/Bazecor), the graphical configurator for Dygma Products. - [Bonsai](https://git.sr.ht/~stacyharper/bonsai), a general-purpose event mapper/state machine primarily used to create complex key shortcuts, and as part of the [SXMO](https://sxmo.org/) desktop environment. Available as [services.bonsaid](#opt-services.bonsaid.enable). -- [archtika](https://github.com/archtika/archtika), a FLOSS, modern, performant, lightweight and self‑hosted CMS. Available as [services.archtika](#opt-services.archtika.enable). - - [scanservjs](https://github.com/sbs20/scanservjs/), a web UI for SANE scanners. Available at [services.scanservjs](#opt-services.scanservjs.enable). - [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](options.html#opt-services.kimai). +- [Kismet](https://www.kismetwireless.net/), a Wi-Fi, Bluetooth, and RF monitoring application supporting a wide range of hardware. Available as {option}`services.kismet`. + +- [vwifi](https://github.com/Raizo62/vwifi), a Wi-Fi simulator daemon leveraging the `mac80211_hwsim` and `vhost_vsock` kernel modules for efficient simulation of multi-node Wi-Fi networks. Available as {option}`services.vwifi`. + +- [Oncall](https://oncall.tools), a web-based calendar tool designed for scheduling and managing on-call shifts. Available as [services.oncall](options.html#opt-services.oncall). + - [Homer](https://homer-demo.netlify.app/), a very simple static homepage for your server. Available as [services.homer](options.html#opt-services.homer). - [Ghidra](https://ghidra-sre.org/), a software reverse engineering (SRE) suite of tools. Available as [programs.ghidra](options.html#opt-programs.ghidra). @@ -74,6 +80,10 @@ - [MaryTTS](https://github.com/marytts/marytts), an open-source, multilingual text-to-speech synthesis system written in pure Java. Available as [services.marytts](options.html#opt-services.marytts). +- [Continuwuity](https://continuwuity.org/), a federated chat server implementing the Matrix protocol, forked from Conduwuit. Available as [services.matrix-continuwuity](#opt-services.matrix-continuwuity.enable). + +- [Reposilite](https://reposilite.com), a lightweight and easy-to-use repository manager for Maven-based artifacts in the JVM ecosystem. Available as [services.reposilite](options.html#opt-services.reposilite). + - [networking.modemmanager](options.html#opt-networking.modemmanager) has been split out of [networking.networkmanager](options.html#opt-networking.networkmanager). NetworkManager still enables ModemManager by default, but options exist now to run NetworkManager without ModemManager. - [Routinator 3000](https://nlnetlabs.nl/projects/routing/routinator/), a full-featured RPKI Relying Party software package that runs as a service which periodically downloads and verifies RPKI data. @@ -82,8 +92,6 @@ - [ncps](https://github.com/kalbasit/ncps), a Nix binary cache proxy service implemented in Go using [go-nix](https://github.com/nix-community/go-nix). Available as [services.ncps](options.html#opt-services.ncps.enable). -- [Conduwuit](https://conduwuit.puppyirl.gay/), a federated chat server implementing the Matrix protocol, forked from Conduit. Available as [services.conduwuit](#opt-services.conduwuit.enable). - - [Readeck](https://readeck.org/), a read-it later web-application. Available as [services.readeck](#opt-services.readeck.enable). - [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable). @@ -108,6 +116,8 @@ - [PostgREST](https://postgrest.org), a standalone web server that turns your PostgreSQL database directly into a RESTful API. Available as [services.postgrest](options.html#opt-services.postgrest.enable). +- [postgres-websockets](https://github.com/diogob/postgres-websockets), a middleware that adds websockets capabilities on top of PostgreSQL's asynchronous notifications using LISTEN and NOTIFY commands. Available as [services.postgres-websockets](options.html#opt-services.postgres-websockets.enable). + - [µStreamer](https://github.com/pikvm/ustreamer), a lightweight MJPEG-HTTP streamer. Available as [services.ustreamer](options.html#opt-services.ustreamer). - [Whoogle Search](https://github.com/benbusby/whoogle-search), a self-hosted, ad-free, privacy-respecting metasearch engine. Available as [services.whoogle-search](options.html#opt-services.whoogle-search.enable). @@ -134,7 +144,7 @@ - [Zoxide](https://github.com/ajeetdsouza/zoxide), a smarter cd command, inspired by z and autojump. Available as [programs.zoxide](options.html#opt-programs.zoxide.enable) -- [victorialogs][https://docs.victoriametrics.com/victorialogs/], log database from VictoriaMetrics. Available as [services.victorialogs](#opt-services.victorialogs.enable) +- [victorialogs](https://docs.victoriametrics.com/victorialogs/), log database from VictoriaMetrics. Available as [services.victorialogs](#opt-services.victorialogs.enable) - [gokapi](https://github.com/Forceu/Gokapi), Lightweight selfhosted Firefox Send alternative without public upload. AWS S3 supported. Available with [services.gokapi](options.html#opt-services.gokapi.enable) @@ -154,6 +164,12 @@ - [GlitchTip](https://glitchtip.com/), an open source Sentry API compatible error tracking platform. Available as [services.glitchtip](#opt-services.glitchtip.enable). +- [`yarr`](https://github.com/nkanaev/yarr), a small, web-based feed aggregator and RSS reader. Available as [services.yarr](#opt-services.yarr.enable). + +- [OliveTin](https://www.olivetin.app/), gives safe and simple access to predefined shell commands from a web interface. Available as [services.olivetin](#opt-services.olivetin.enable). + +- [alertmanager-ntfy](https://github.com/alexbakker/alertmanager-ntfy), forwards Prometheus Alertmanager notifications to ntfy.sh. Available as [services.prometheus.alertmanager-ntfy](#opt-services.prometheus.alertmanager-ntfy.enable). + - [Stash](https://github.com/stashapp/stash), An organizer for your adult videos/images, written in Go. Available as [services.stash](#opt-services.stash.enable). - [vsmartcard-vpcd](https://frankmorgner.github.io/vsmartcard/virtualsmartcard/README.html), a virtual smart card driver. Available as [services.vsmartcard-vpcd](#opt-services.vsmartcard-vpcd.enable). @@ -162,22 +178,34 @@ - [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](option.html#opt-services.pds). +- [Anubis](https://github.com/TecharoHQ/anubis), a scraper defense software. Available as [services.anubis](options.html#opt-services.anubis). + - [synapse-auto-compressor](https://github.com/matrix-org/rust-synapse-compress-state?tab=readme-ov-file#automated-tool-synapse_auto_compressor), a rust-based matrix-synapse state compressor for postgresql. Available as [services.synapse-auto-compressor](#opt-services.synapse-auto-compressor.enable). - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable). +- [pocket-id](https://pocket-id.org/), an OIDC provider with passkeys support. Available as [services.pocket-id](#opt-services.pocket-id.enable). + - [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable). +- [Lavalink](https://github.com/lavalink-devs/Lavalink), a standalone audio sending node based on Lavaplayer and Koe. Available as [services.lavalink](#opt-services.lavalink.enable). + - [OpenGamepadUI](https://github.com/ShadowBlip/OpenGamepadUI/), an open source gamepad-native game launcher and overlay for Linux. Available as [programs.opengamepadui](#opt-programs.opengamepadui.enable). - [InputPlumber](https://github.com/ShadowBlip/InputPlumber/), an open source input router and remapper daemon for Linux. Available as [services.inputplumber](#opt-services.inputplumber.enable). +- [`dump1090-fa`](https://github.com/flightaware/dump1090), a simple Mode S decoder for RTLSDR devices with a web interface. Available as [services.dump1090-fa](#opt-services.dump1090-fa.enable). + - [PowerStation](https://github.com/ShadowBlip/PowerStation/), an open source TDP control and performance daemon with DBus interface for Linux. Available as [services.powerstation](#opt-services.powerstation.enable). - [`g3proxy`](https://github.com/bytedance/g3), an open source enterprise forward proxy from ByteDance, similar to Squid or tinyproxy. Available as [services.g3proxy](#opt-services.g3proxy.enable). +- [OpenCloud](https://opencloud.eu/), an open-source, modern file-sync and sharing platform. It is a fork of oCIS, a ground-up rewrite of the well-known PHP-based NextCloud server. Available as [services.opencloud](#opt-services.opencloud.enable). + - [echoip](https://github.com/mpolden/echoip), a simple service for looking up your IP address. Available as [services.echoip](#opt-services.echoip.enable). +- [whoami](https://github.com/traefik/whoami), a tiny Go server that prints OS information and HTTP request to output. Available as [services.whoami](#opt-services.whoami.enable). + - [LiteLLM](https://github.com/BerriAI/litellm), a LLM Gateway to provide model access, fallbacks and spend tracking across 100+ LLMs. All in the OpenAI format. Available as [services.litellm](#opt-services.litellm.enable). - [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](option.html#opt-services.buffyboard). @@ -188,6 +216,8 @@ - [GLPI-Agent](https://github.com/glpi-project/glpi-agent), GLPI Agent. Available as [services.glpiAgent](options.html#opt-services.glpiAgent.enable). +- [pgBackRest](https://pgbackrest.org), a reliable backup and restore solution for PostgreSQL. Available as [services.pgbackrest](options.html#opt-services.pgbackrest.enable). + - [Recyclarr](https://github.com/recyclarr/recyclarr) a TRaSH Guides synchronizer for Sonarr and Radarr. Available as [services.recyclarr](#opt-services.recyclarr.enable). - [Rebuilderd](https://github.com/kpcyrd/rebuilderd) an independent verification of binary packages - Reproducible Builds. Available as [services.rebuilderd](#opt-services.rebuilderd.enable). @@ -200,9 +230,22 @@ - [Pareto Security](https://paretosecurity.com/) is an alternative to corporate compliance solutions for companies that care about security but know it doesn't have to be invasive. Available as [services.paretosecurity](#opt-services.paretosecurity.enable) +- [Cursor](https://cursor.com/) is a vscode-based editor that uses AI to help you write code faster. + +- [GNU Rush](https://gnu.org/software/rush/) is a Restricted User Shell, designed for systems providing limited remote access to their resources. Available as [programs.rush](#opt-programs.rush.enable). + - [ipfs-cluster](https://ipfscluster.io/), Pinset orchestration for IPFS. Available as [services.ipfs-cluster](#opt-services.ipfs-cluster.enable) - [bitbox-bridge](https://github.com/BitBoxSwiss/bitbox-bridge), a bridge software that connects BitBox hardware wallets to computers & web wallets like [Rabby](https://rabby.io/). Allows one to interact & transact with smart contracts, Web3 websites & financial services without storing private keys anywhere other than the hardware wallet. Available as [services.bitbox-bridge](#opt-services.bitbox-bridge.enable). + +- [GoDNS](https://github.com/TimothyYe/godns), a dynamic DNS client written in Go, which supports multiple DNS providers. Available as [services.godns](option.html#opt-services.godns.enable). + +- [CookCLI](https://cooklang.org/cli/) Server, a web UI for cooklang recipes. + +- [Prometheus eBPF Exporter](https://github.com/cloudflare/ebpf_exporter), + Prometheus exporter for custom eBPF metrics. Available as + [services.prometheus.exporters.ebpf](#opt-services.prometheus.exporters.ebpf.enable). + ## Backward Incompatibilities {#sec-release-25.05-incompatibilities} @@ -232,16 +275,31 @@ [not recommended by upstream](https://docs.nextcloud.com/server/30/admin_manual/installation/system_requirements.html) and thus doesn't qualify as default. +- PowerDNS Recursor has been updated to version 5.1.2, which comes with a new YAML configuration format (`recursor.yml`) + and deprecates the previous format (`recursor.conf`). Accordingly, the NixOS option `services.pdns-recursor.settings` + has been renamed to [old-settings](#opt-services.pdns-recursor.old-settings) and will be provided for backward compatibility + until the next NixOS release. Users are asked to migrate their settings to the new [yaml-settings](#opt-services.pdns-recursor.old-settings) + option following this [guide](https://doc.powerdns.com/recursor/appendices/yamlconversion.html). + Note that options other than `services.pdns-recursor.settings` are unaffacted by this change. + - Nextcloud's default FPM pool settings have been increased according to upstream recommentations. It's advised to review the new defaults and description of [](#opt-services.nextcloud.poolSettings). +- In `users.users` subuid allocation on systems with multiple users it could happen that some users' allocated subuid ranges collided with others. Now these users get new subuid ranges assigned. When this happens, a warning is issued on the first activation. If the subuids were used (e.g. with rootless container managers like podman), please change the ownership of affected files accordingly. + - The `services.locate` module does no longer support findutil's `locate` due to its inferior performance compared to `mlocate` and `plocate`. The new default is `plocate`. As the `service.locate.localuser` option only applied when using findutil's `locate`, it has also been removed. - `services.paperless` now installs `paperless-manage` as a normal system package instead of creating a symlink in `/var/lib/paperless`. `paperless-manage` now also changes to the appropriate user when being executed. +- The `gotenberg` package has been updated to 8.16.0, which brings breaking changes to the configuration from version 8.13.0. See the [upstream release notes](https://github.com/gotenberg/gotenberg/releases/tag/v8.13.0) + for that release to get all the details. The `services.gotenberg` module has been updated appropriately to ensure your configuration is valid with this new release. + +- `varnish` was updated from 7.5.0 to 7.7.0, see [Varnish 7.6.0 upgrade guide](https://varnish-cache.org/docs/7.6/whats-new/upgrading-7.6.html) and +[Varnish 7.7.0 upgrade guide](https://varnish-cache.org/docs/7.7/whats-new/upgrading-7.7.html#whatsnew-upgrading-7-7). + - `asusd` has been upgraded to version 6 which supports multiple aura devices. To account for this, the single `auraConfig` configuration option has been replaced with `auraConfigs` which is an attribute set of config options per each device. The config files may also be now specified as either source files or text strings; to account for this you will need to specify that `text` is used for your existing configs, e.g.: ```diff -services.asusd.asusdConfig = '''file contents''' @@ -250,16 +308,24 @@ - `linuxPackages.nvidiaPackages.stable` now defaults to the `production` variant instead of `latest`. +- `paperless-ngx` has been updated to minor version 2.15 which switched the web server from Gunicorn to Granian. If you set Gunicorn specific envs (usually contain GUNICORN) they must be updated. Also `services.paperless.address` no longer accepts a domain name and Granian also does not support listening on unix domain sockets. + - `timescaledb` requires manual upgrade steps. After you run ALTER EXTENSION, you must run [this SQL script](https://github.com/timescale/timescaledb-extras/blob/master/utils/2.15.X-fix_hypertable_foreign_keys.sql). For more details, see the following pull requests [#6797](https://github.com/timescale/timescaledb/pull/6797). PostgreSQL 13 is no longer supported in TimescaleDB v2.16. +- `networking.wireguard.enable = true` does not always add `wireguard-tools` to system packages anymore. Only when wireguard interfaces are configured, the backing implementation packages are added to system PATH. + - `virtualisation/azure-common.nix`'s filesystem and grub configurations have been moved to `virtualisation/azure-image.nix`. This makes `azure-common.nix` more generic so it could be used for users who generate Azure image using other methods (e.g. nixos-generators and disko). For existing users depending on these configurations, please also import `azure-image.nix`. - `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL. +- `services.signald` has been removed as `signald` is unmaintained upstream and has been incompatible to official Signal servers for a long while. + - `tauon` 7.9.0+ when launched for the first time, migrates its database to a new schema that is not backwards compatible. Older versions will refuse to start at all with that database afterwards. If you need to still use older tauon versions, make sure to back up `~/.local/share/TauonMusicBox`. +- `aws-workspaces` has dropped support for PCoiP networking. + - The `earlyoom` service is now using upstream systemd service, which enables hardening and filesystem isolation by default. If you need filesystem write access or want to access home directory via `killHook`, hardening setting can @@ -279,6 +345,60 @@ - `services.bird2` has been renamed to `services.bird` and the default bird package has been switched to `bird3`. `bird2` can still be chosen via the `services.bird.package` option. +- `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes. + Like upstream's docker images, renovate now runs on NodeJS 22. + +- The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses. + +- `gitlab` has been updated from 17.x to 18.x and requires `postgresql` >= 16, as stated in the [documentation](https://docs.gitlab.com/18.0/install/requirements/#postgresql). Check the [upgrade guide](#module-services-postgres-upgrading) in the NixOS manual on how to upgrade your PostgreSQL installation. + +- `services.gitlab` now requires the setting of `activeRecordPrimaryKeyFile`, `activeRecordDeterministicKeyFile`, `activeRecordSaltFile` as GitLab introduced Rails ActiveRecord encryption. + +- `python3Packages.bpycv` has been removed due to being incompatible with Blender 4 and unmaintained. + +- `python3Packages.jaeger-client` was removed because it was deprecated upstream. [OpenTelemetry](https://opentelemetry.io) is the recommended replacement. + +- `rocmPackages_6` has been updated to ROCm 6.3. + +- `rocmPackages_5` has been removed. + +- `rocmPackages.rocm-thunk` has been removed and its functionality has been integrated with the ROCm CLR. Use `rocmPackages.clr` instead. + +- `rocmPackages.clang-ocl` has been removed. [It was deprecated by AMD in 2023.](https://github.com/ROCm/clang-ocl) + +- `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. + +- The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific older versions; those will continue to be maintained as long as other packages depend on them but may be removed in the future. + +- `prometheus` has been updated from 2.55.0 to 3.1.0. + Read the [release blog post](https://prometheus.io/blog/2024/11/14/prometheus-3-0/) and + [migration guide](https://prometheus.io/docs/prometheus/3.1/migration/). + +- The Mattermost module ([`services.mattermost`](#opt-services.mattermost.enable)) and packages (`mattermost` and `mmctl`) have been substantially updated: + - `services.mattermost.listenAddress` has been split into [](#opt-services.mattermost.host) and [](#opt-services.mattermost.port). If your `listenAddress` contained a port, you will need to edit your configuration. This will be the only truly breaking change in this release for most configurations. + - [](#opt-services.mattermost.preferNixConfig) now defaults to true if you advance [](#opt-system.stateVersion) to 25.05. This means that if you have [](#opt-services.mattermost.mutableConfig) set, NixOS will override settings set in the Admin Console to those that you define in the module configuration. It is recommended to leave this at the default, even if you used a fully mutable configuration before, because it will ensure that your Mattermost data directories are correct. If you moved your data directories, you may want to review the module changes before upgrading. + - Mattermost now supports peer authentication on both MySQL and Postgres database backends. Updating [](#opt-system.stateVersion) to 25.05 or later will result in peer authentication being used by default if the Mattermost server would otherwise be connecting to localhost. This is the recommended configuration. + - Note that the Mattermost module will create an account _without_ a well-known UID if the username differs from the default (`mattermost`). If you used Mattermost with a nonstandard username, you may want to review the module changes before upgrading. + +- `kanata` was updated to v1.8.0, which introduces several breaking changes. + See the release notes of + [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0) and + [v1.8.0](https://github.com/jtroo/kanata/releases/tag/v1.8.0) + for more information. + +- `authelia` version 4.39.0 has made changes on the default claims for ID Tokens, to mirror the standard claims from the specification. + This change may affect some clients in unexpected ways, so manual intervention may be required. + Read the [release notes](https://www.authelia.com/blog/4.39-release-notes/), along with [the guide](https://www.authelia.com/integration/openid-connect/openid-connect-1.0-claims/#restore-functionality-prior-to-claims-parameter) to work around issues that may be encountered. + +- `ags` was updated to v2, which is just a CLI for Astal now. Components are available as a different package set `astal.*`. + If you want to use v1, it is available as `ags_1` package. + + See the release notes of + [v2.0.0](https://github.com/Aylur/ags/releases/tag/v2.0.0) + for more information. + +- `nodePackages.expo-cli` has been removed, as it was deprecated by upstream. The suggested replacement is the `npx expo` command. + - DokuWiki with the Caddy webserver (`services.dokuwiki.webserver = "caddy"`) now sets up sites with Caddy's automatic HTTPS instead of HTTP-only. To keep the old behavior for a site `example.com`, set `services.caddy.virtualHosts."example.com".hostName = "http://example.com"`. If you set custom Caddy options for a DokuWiki site, migrate these options by removing `http://` from `services.caddy.virtualHosts."http://example.com"`. @@ -287,9 +407,20 @@ Given a site example.com, http://example.com now 301 redirects to https://example.com. To keep the old behavior for a site `example.com`, set `services.caddy.virtualHosts."example.com".hostName = "http://example.com"`. +- `slskd` has been updated to v0.22.3, which includes breaking changes to `script` integrations. Please review the [changelog](https://github.com/slskd/slskd/releases/tag/0.22.3) + and the accompanying [pull request](https://github.com/slskd/slskd/pull/1292). + +- `forgejo` and `forgejo-lts` have been updated to v11. + See upstreams [release blog post](https://forgejo.org/2025-04-release-v11-0/) for more information. + +- `unifi` has been updated to v9.1. + This version should be backward compatible with v8.x, however as a result, `unifi8` package has been removed. + - The behavior of `services.hostapd.radios..networks..authentication.enableRecommendedPairwiseCiphers` was changed to not include `CCMP-256` anymore. Since all configured pairwise ciphers have to be supported by the radio, this caused startup failures on many devices which is hard to debug in hostapd. +- The `conduwuit` matrix server implementation has officially been discontinued by upstream and the package has thus been marked as vulnerable, as it is a security-sensitive package that has reached EOL. + - `gkraken` software and `hardware.gkraken.enable` option have been removed, use `coolercontrol` via `programs.coolercontrol.enable` option instead. - To avoid delaying user logins unnecessarily the `multi-user.target` is no longer ordered after `network-online.target`. @@ -308,7 +439,7 @@ +extraCreateArgs+=("--exclude" "/some/path") ``` -- `programs.xonsh.package` now gets overrided internally with `extraPackages` to support `programs.xonsh.extraPackages`. See `programs.xonsh.extraPackages` for more details. +- `programs.xonsh.package` now gets overridden internally with `extraPackages` to support `programs.xonsh.extraPackages`. See `programs.xonsh.extraPackages` for more details. - `services.nitter.guestAccounts` has been renamed to `services.nitter.sessionsFile`, for consistency with upstream. The file format is unchanged. @@ -349,10 +480,19 @@ - `programs.clash-verge.tunMode` was deprecated and removed because now service mode is necessary to start program. Without `programs.clash-verge.enable`, clash-verge-rev will refuse to start. +- `services.discourse` now requires PostgreSQL 15 per default. Please update before upgrading. + +- `services.homepage-dashboard` now requires the `allowedHosts` option to be set in accordance with the [documentation](https://gethomepage.dev/installation/#homepage_allowed_hosts). + +- `luakit` has been updated to 2.4.0. If you use any website which uses IndexedDB or local storage and wish to retain the saved information, [some manual intervention may be required](https://luakit.github.io/news/luakit-2.4.0.html) - `services.netbird.tunnels` was renamed to [`services.netbird.clients`](#opt-services.netbird.clients), hardened (using dedicated less-privileged users) and significantly extended. +- `services.rsyncd.settings` now supports only two attributes `sections` and `globalSection`. + As a result, all sections previously defined under `services.rsyncd.settings` must now be put in `services.rsyncd.settings.sections`. + Global settings must now be placed in `services.rsyncd.settings.globalSection` instead of `services.rsyncd.settings.global`. + ## Other Notable Changes {#sec-release-25.05-notable-changes} @@ -375,8 +515,46 @@ - Overriding Wayland compositor is possible using `waylandSessionCompositor` option, but you might need to take care [`xfce4-session`](https://gitlab.xfce.org/xfce/xfce4-session/-/merge_requests/49), [`dbus-update-activation-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L234) and [`systemctl --user import-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L239) on startup. - For new Xfce installations, default panel layout has [changed](https://gitlab.xfce.org/xfce/xfce4-panel/-/merge_requests/158/diffs) to not include external panel plugins by default. You can still add them yourself using the "Panel Preferences" dialog. +- PAM services for `i3lock`/`i3lock-color`, `vlock`, `xlock`, and `xscreensaver` now default to disabled unless other corresponding NixOS options are set (`programs.i3lock.enable`, `console.enable`, `services.xserver.enable`, and `services.xscreensaver.enable`, respectively). If for some reason you want one of them back without setting the corresponding option, set, e.g., `security.pam.services.xlock.enable = true`. + +- The `nixos-generate-config` command now supports a optional `--flake` option, which will generate a flake.nix file alongside the `configuration.nix` and `hardware-configuration.nix`, providing an easy introduction into flake-based system configurations. + - [`system.stateVersion`](#opt-system.stateVersion) is now validated and must be in the `"YY.MM"` format, ideally corresponding to a prior NixOS release. +- [`hardware.xone`](options.html#opt-hardware.xone.enable) will also enable [`hardware.xpad-noone`](options.html#opt-hardware.xpad-noone.enable) to provide Xbox 360 driver by default. + +- `services.mysql` now supports easy cluster setup via [`services.mysql.galeraCluster`](#opt-services.mysql.galeraCluster.enable) option. + + Example: + + ```nix + services.mysql = { + enable = true; + galeraCluster = { + enable = true; + localName = "Node 1"; + localAddress = "galera_01"; + nodeAddresses = [ "galera_01" "galera_02" "galera_03"]; + }; + }; + ``` + +- The `intel` video driver for X.org (from the xf86-video-intel package, which was previously removed because it was non-functional) has been fixed and the driver has been re-introduced. + +- systemd's {manpage}`systemd-ssh-generator(8)` now works out of the box on NixOS. + - You can ssh into VMs without any networking configuration if your hypervisor configures the vm to support AF_VSOCK. + It still requires the usual ssh authentication methods. + - An SSH key for the root user can be provisioned using the `ssh.authorized_keys.root` systemd credential. + This can be useful for booting an installation image and providing the SSH key with an smbios string. + - SSH can be used for suid-less privilege escalation on the local system without having to rely on networking: + ```shell + ssh root@.host + ``` + - systemd's {manpage}`systemd-ssh-proxy(1)` is enabled by default. It can be disabled using [`programs.ssh.systemd-ssh-proxy.enable`](#opt-programs.ssh.systemd-ssh-proxy.enable). + +- SSH host key generation has been separated into the dedicated systemd service sshd-keygen.service. + +- [`services.dex`](#opt-services.dex.enable) now restarts upon changes to the [`.environmentFile`](#opt-services.dex.environmentFile) option or `path` type entries in `.settings.staticClients[].secretFile`. - [`services.geoclue2`](#opt-services.geoclue2.enable) now has an `enableStatic` option, which allows the NixOS configuration to specify a fixed location for GeoClue to use. @@ -392,11 +570,13 @@ - `services.avahi.ipv6` now defaults to true. +- A new hardening flag, `nostrictaliasing` was made available, corresponding to the gcc/clang option `-fno-strict-aliasing`. + - In the `services.xserver.displayManager.startx` module, two new options [generateScript](#opt-services.xserver.displayManager.startx.generateScript) and [extraCommands](#opt-services.xserver.displayManager.startx.extraCommands) have been added to to declaratively configure the .xinitrc script. - All services that require a root certificate bundle now use the value of a new read-only option, `security.pki.caBundle`. -- hddfancontrol has been updated to major release 2. See the [migration guide](https://github.com/desbma/hddfancontrol/tree/master?tab=readme-ov-file#migrating-from-v1x), as there are breaking changes. +- hddfancontrol has been updated to major release 2. See the [migration guide](https://github.com/desbma/hddfancontrol/tree/master?tab=readme-ov-file#migrating-from-v1x), as there are breaking changes. The settings options have been modified to use an attrset, enabling configurations with multiple instances of the daemon running at once, eg, for two separate drive bays. - `nextcloud-news-updater` is unmaintained and was removed from nixpkgs. @@ -420,8 +600,11 @@ - [`services.mongodb.enableAuth`](#opt-services.mongodb.enableAuth) now uses the newer [mongosh](https://github.com/mongodb-js/mongosh) shell instead of the legacy shell to configure the initial superuser. You can configure the mongosh package to use through the [`services.mongodb.mongoshPackage`](#opt-services.mongodb.mongoshPackage) option. -- The paperless module now has an option for regular automatic export of - documents data using the integrated document exporter. +- There is a new set of NixOS test tools for testing virtual Wi-Fi networks in many different topologies. See the {option}`services.vwifi` module, {option}`services.kismet` NixOS test, and [manual](https://nixos.org/manual/nixpkgs/unstable/#sec-nixos-test-wifi) for documentation and examples. + +- The paperless module now has an option for regular automatic export of documents data using the integrated document exporter. + +- Exposed the `paperless-manage` script package via the `services.paperless.manage` read-only option. - New options for the declarative configuration of the user space part of ALSA have been introduced under [hardware.alsa](options.html#opt-hardware.alsa.enable), including setting the default capture and playback device, defining sound card aliases and volume controls. Note: these are intended for users not running a sound server like PulseAudio or PipeWire, but having ALSA as their only sound system. @@ -451,21 +634,52 @@ Note that all provided plugins must have versions/tags (string after `@`), even if upstream repo does not tag each release. For untagged plugins, you can either create an empty Go project and run `go get ` and see changes in `go.mod` to get the pseudo-version number, or provide a commit hash in place of version/tag for the first run, and update the plugin string based on the error output. +- `buildGoModule` now supports a self-referencing `finalAttrs:` parameter + containing the final arguments including overrides. + This allows packaging configuration to be overridden in a consistent manner by + providing an alternative to `rec {}` syntax. + +- [Mattermost](#opt-services.mattermost.enable), a self-hosted chat collaboration platform supporting calls, playbooks, and boards, has been updated. It now has multiple versions, disabled telemetry, and a native frontend build in nixpkgs, removing all upstream prebuilt blobs. + - A new `pkgs.mattermost.buildPlugin` function has been added, which allows plugins to be built from source, including webapp frontends with a supported package-lock.json. See the Mattermost NixOS test and [manual](https://nixos.org/manual/nixpkgs/unstable/#sec-mattermost-plugins-build) for an example. + - Mattermost telemetry reporting is now disabled by default, though security update notifications are enabled. Look at [`services.mattermost.telemetry`](#opt-services.mattermost.telemetry.enableDiagnostics) for options to control this behavior. + - The Mattermost frontend is now built from source and can be overridden. Note that the Mattermost derivation containing both the webapp and server is now wrapped to allow them to be built independently, so overrides to both webapp and server look like `mattermost.overrideAttrs (prev: { webapp = prev.webapp.override { ... }; server = prev.server.override { ... }; })` now. + - `pkgs.mattermost` has been updated from 9.11 to 10.5 to track the latest extended support release, since 9.11 will become end-of-life during the lifetime of NixOS 25.05. + - `pkgs.mattermostLatest` is now an option to track the latest (non-prerelease) Mattermost release. We test upgrade migrations from ESR releases (`pkgs.mattermost`) to `pkgs.mattermostLatest`. + - The Mattermost module will produce eval warnings if a database password would end up in the Nix store, and recommend alternatives such as peer authentication or using the environment file. + - We now support `mmctl` for Mattermost administration if both [](#opt-services.mattermost.socket.enable) and [](#opt-services.mattermost.socket.export) are set, which export the Mattermost control socket path into the system environment. + - KDE Partition Manager `partitionmanager`'s support for ReiserFS is removed. ReiserFS has not been actively maintained for many years. It has been marked as obsolete since Linux 6.6, and [is removed](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c01f664e4ca210823b7594b50669bbd9b0a3c3b0) in Linux 6.13. +- `services.geoclue2` now uses [beaconDB](https://beacondb.net/) as a default geolocation service, replacing Mozilla Location Services which was [retired in June 2024](https://github.com/mozilla/ichnaea/issues/2065). + - `authelia` version 4.39.0 has made some changes which deprecate older configurations. They are still expected to be working until future version 5.0.0, but will generate warnings in logs. Read the [release notes](https://www.authelia.com/blog/4.39-release-notes/) for human readable summaries of the changes. +- `security.acme` now supports renewal using CSRs (Certificate Signing Request) through the options `security.acme.*.csr` and `security.acme.*.csrKey`. + - `programs.fzf.keybindings` now supports the fish shell. +- `gerbera` now has wavpack support. + +- `octave` (and `octaveFull`) was updated to version `10.x`. The update broke a few `octavePackages`, and `librsb`. See [the PR's commits](https://github.com/NixOS/nixpkgs/pull/394495/commits) for more details. + - A toggle has been added under `users.users..enable` to allow toggling individual users conditionally. If set to false, the user account will not be created. +- New hooks were added: + - `writableTmpDirAsHomeHook`: This setup hook ensures that the directory specified by the `HOME` environment variable is writable. + - `addBinToPathHook`: This setup hook checks if the `bin/` directory exists in the `$out` output path and, if so, adds it to the `PATH` environment variable. + - `gitSetupHook`: This setup hook sets up a valid Git configuration, including the `user.name` and `user.email` fields. + +## NixOS Wiki {#sec-release-25.05-wiki} + +The official NixOS Wiki at [wiki.nixos.org](https://wiki.nixos.org) has new and improved articles, new contributors and some improvements in its dark theme and mobile readability. + ```{=include=} sections ../release-notes-nixpkgs/rl-2505.section.md ``` diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md new file mode 100644 index 000000000000..65bac7327ed9 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -0,0 +1,27 @@ +# Release 25.11 ("Xantusia", 2025.11/??) {#sec-release-25.11} + +## Highlights {#sec-release-25.11-highlights} + + + +- Secure boot support can now be enabled for the Limine bootloader through {option}`boot.loader.limine.secureBoot.enable`. Bootloader install script signs the bootloader, then kernels are hashed during system rebuild and written to a config. This allows Limine to boot only the kernels installed through NixOS system. + +## New Modules {#sec-release-25.11-new-modules} + + + +- [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable). + +## Backward Incompatibilities {#sec-release-25.11-incompatibilities} + + + +- The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream. + +- `renovate` was updated to v40. See the [upstream release notes](https://github.com/renovatebot/renovate/releases/tag/40.0.0) for breaking changes. + +## Other Notable Changes {#sec-release-25.11-notable-changes} + + + +- `services.clamsmtp` is unmaintained and was removed from Nixpkgs. diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 1866d8095a2b..015d7e4dbe53 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -1,7 +1,7 @@ /* Technical details - `make-disk-image` has a bit of magic to minimize the amount of work to do in a virtual machine. + `make-disk-image` has a bit of magic to minimize the amount of work to do in a virtual machine. It also might arguably have too much, or at least too specific magic, so please consider to work towards the effort of unifying our image builders, as outlined in https://github.com/NixOS/nixpkgs/issues/324817 before adding more. It relies on the [LKL (Linux Kernel Library) project](https://github.com/lkl/linux) which provides Linux kernel as userspace library. @@ -447,8 +447,7 @@ let mkdir -p $root # Copy arbitrary other files into the image - # Semi-shamelessly copied from make-etc.sh. I (@copumpkin) shall factor this stuff out as part of - # https://github.com/NixOS/nixpkgs/issues/23052. + # Semi-shamelessly copied from make-etc.sh. set -f sources_=(${lib.concatStringsSep " " sources}) targets_=(${lib.concatStringsSep " " targets}) diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index 6c93bfddfa52..0ddae4e20198 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -99,7 +99,7 @@ rec { Defines how unit configuration is provided for systemd: `asDropinIfExists` creates a unit file when no unit file is provided by the package - otherwise a drop-in file name `overrides.conf`. + otherwise it creates a drop-in file named `overrides.conf`. `asDropin` creates a drop-in file named `overrides.conf`. Mainly needed to define instances for systemd template units (e.g. `systemd-nspawn@mycontainer.service`). @@ -398,9 +398,21 @@ rec { enableStrictShellChecks = mkOption { type = types.bool; - description = "Enable running shellcheck on the generated scripts for this unit."; - # The default gets set in systemd-lib.nix because we don't have access to - # the full NixOS config here. + description = '' + Enable running `shellcheck` on the generated scripts for this unit. + + When enabled, scripts generated by the unit will be checked with + `shellcheck` and any errors or warnings will cause the build to + fail. + + This affects all scripts that have been created through the + `script`, `reload`, `preStart`, `postStart`, `preStop` and + `postStop` options for systemd services. This does not affect + command lines passed directly to `ExecStart`, `ExecReload`, + `ExecStartPre`, `ExecStartPost`, `ExecStop` or `ExecStopPost`. + ''; + # The default gets set in systemd-lib.nix because we don't have + # access to the full NixOS config here. defaultText = literalExpression "config.systemd.enableStrictShellChecks"; }; diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix index f22744806d48..91db5d8be3c2 100644 --- a/nixos/lib/test-driver/default.nix +++ b/nixos/lib/test-driver/default.nix @@ -31,6 +31,7 @@ python3Packages.buildPythonApplication { colorama junit-xml ptpython + ipython ] ++ extraPythonPackages python3Packages; diff --git a/nixos/lib/test-driver/src/pyproject.toml b/nixos/lib/test-driver/src/pyproject.toml index ac83eed268d9..fa4e6a2de127 100644 --- a/nixos/lib/test-driver/src/pyproject.toml +++ b/nixos/lib/test-driver/src/pyproject.toml @@ -21,7 +21,7 @@ target-version = "py312" line-length = 88 lint.select = ["E", "F", "I", "U", "N"] -lint.ignore = ["E501"] +lint.ignore = ["E501", "N818"] # xxx: we can import https://pypi.org/project/types-colorama/ here [[tool.mypy.overrides]] diff --git a/nixos/lib/test-driver/src/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py index 1c0793aa75a5..86e663da9b7d 100755 --- a/nixos/lib/test-driver/src/test_driver/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/__init__.py @@ -3,7 +3,7 @@ import os import time from pathlib import Path -import ptpython.repl +import ptpython.ipython from test_driver.driver import Driver from test_driver.logger import ( @@ -109,6 +109,11 @@ def main() -> None: help="the test script to run", type=Path, ) + arg_parser.add_argument( + "--dump-vsocks", + help="indicates that the interactive SSH backdoor is active and dumps information about it on start", + type=int, + ) args = arg_parser.parse_args() @@ -136,11 +141,12 @@ def main() -> None: if args.interactive: history_dir = os.getcwd() history_path = os.path.join(history_dir, ".nixos-test-history") - ptpython.repl.embed( - driver.test_symbols(), - {}, + if offset := args.dump_vsocks: + driver.dump_machine_ssh(offset) + ptpython.ipython.embed( + user_ns=driver.test_symbols(), history_filename=history_path, - ) + ) # type:ignore else: tic = time.time() driver.run_tests() diff --git a/nixos/lib/test-driver/src/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py index 6061c1bc09b8..bf3dda06a617 100644 --- a/nixos/lib/test-driver/src/test_driver/driver.py +++ b/nixos/lib/test-driver/src/test_driver/driver.py @@ -1,13 +1,19 @@ import os import re import signal +import sys import tempfile import threading +import traceback from collections.abc import Callable, Iterator from contextlib import AbstractContextManager, contextmanager from pathlib import Path from typing import Any +from unittest import TestCase +from colorama import Style + +from test_driver.errors import MachineError, RequestedAssertionFailed from test_driver.logger import AbstractLogger from test_driver.machine import Machine, NixStartScript, retry from test_driver.polling_condition import PollingCondition @@ -16,6 +22,18 @@ from test_driver.vlan import VLan SENTINEL = object() +class AssertionTester(TestCase): + """ + Subclass of `unittest.TestCase` which is used in the + `testScript` to perform assertions. + + It throws a custom exception whose parent class + gets special treatment in the logs. + """ + + failureException = RequestedAssertionFailed + + def get_tmp_dir() -> Path: """Returns a temporary directory that is defined by TMPDIR, TEMP, TMP or CWD Raises an exception in case the retrieved temporary directory is not writeable @@ -115,7 +133,7 @@ class Driver: try: yield except Exception as e: - self.logger.error(f'Test "{name}" failed with error: "{e}"') + self.logger.log_test_error(f'Test "{name}" failed with error: "{e}"') raise e def test_symbols(self) -> dict[str, Any]: @@ -140,6 +158,7 @@ class Driver: serial_stdout_on=self.serial_stdout_on, polling_condition=self.polling_condition, Machine=Machine, # for typing + t=AssertionTester(), ) machine_symbols = {pythonize_name(m.name): m for m in self.machines} # If there's exactly one machine, make it available under the name @@ -159,11 +178,53 @@ class Driver: ) return {**general_symbols, **machine_symbols, **vlan_symbols} + def dump_machine_ssh(self, offset: int) -> None: + print("SSH backdoor enabled, the machines can be accessed like this:") + print( + f"{Style.BRIGHT}Note:{Style.RESET_ALL} this requires {Style.BRIGHT}systemd-ssh-proxy(1){Style.RESET_ALL} to be enabled (default on NixOS 25.05 and newer)." + ) + names = [machine.name for machine in self.machines] + longest_name = len(max(names, key=len)) + for num, name in enumerate(names, start=offset + 1): + spaces = " " * (longest_name - len(name) + 2) + print( + f" {name}:{spaces}{Style.BRIGHT}ssh -o User=root vsock/{num}{Style.RESET_ALL}" + ) + def test_script(self) -> None: """Run the test script""" with self.logger.nested("run the VM test script"): symbols = self.test_symbols() # call eagerly - exec(self.tests, symbols, None) + try: + exec(self.tests, symbols, None) + except MachineError: + for line in traceback.format_exc().splitlines(): + self.logger.log_test_error(line) + sys.exit(1) + except RequestedAssertionFailed: + exc_type, exc, tb = sys.exc_info() + # We manually print the stack frames, keeping only the ones from the test script + # (note: because the script is not a real file, the frame filename is ``) + filtered = [ + frame + for frame in traceback.extract_tb(tb) + if frame.filename == "" + ] + + self.logger.log_test_error("Traceback (most recent call last):") + + code = self.tests.splitlines() + for frame, line in zip(filtered, traceback.format_list(filtered)): + self.logger.log_test_error(line.rstrip()) + if lineno := frame.lineno: + self.logger.log_test_error(f" {code[lineno - 1].strip()}") + + self.logger.log_test_error("") # blank line for readability + exc_prefix = exc_type.__name__ if exc_type is not None else "Error" + for line in f"{exc_prefix}: {exc}".splitlines(): + self.logger.log_test_error(line) + + sys.exit(1) def run_tests(self) -> None: """Run the test script (for non-interactive test runs)""" diff --git a/nixos/lib/test-driver/src/test_driver/errors.py b/nixos/lib/test-driver/src/test_driver/errors.py new file mode 100644 index 000000000000..fe072b5185c9 --- /dev/null +++ b/nixos/lib/test-driver/src/test_driver/errors.py @@ -0,0 +1,20 @@ +class MachineError(Exception): + """ + Exception that indicates an error that is NOT the user's fault, + i.e. something went wrong without the test being necessarily invalid, + such as failing OCR. + + To make it easier to spot, this exception (and its subclasses) + get a `!!!` prefix in the log output. + """ + + +class RequestedAssertionFailed(AssertionError): + """ + Special assertion that gets thrown on an assertion error, + e.g. a failing `t.assertEqual(...)` or `machine.succeed(...)`. + + This gets special treatment in error reporting: i.e. it gets + `!!!` as prefix just as `MachineError`, but only stack frames coming + from `testScript` will show up in logs. + """ diff --git a/nixos/lib/test-driver/src/test_driver/logger.py b/nixos/lib/test-driver/src/test_driver/logger.py index 564d39f4f055..a218d234fe3f 100644 --- a/nixos/lib/test-driver/src/test_driver/logger.py +++ b/nixos/lib/test-driver/src/test_driver/logger.py @@ -44,6 +44,10 @@ class AbstractLogger(ABC): def error(self, *args, **kwargs) -> None: # type: ignore pass + @abstractmethod + def log_test_error(self, *args, **kwargs) -> None: # type:ignore + pass + @abstractmethod def log_serial(self, message: str, machine: str) -> None: pass @@ -97,6 +101,9 @@ class JunitXMLLogger(AbstractLogger): self.tests[self.currentSubtest].stderr += args[0] + os.linesep self.tests[self.currentSubtest].failure = True + def log_test_error(self, *args, **kwargs) -> None: # type: ignore + self.error(*args, **kwargs) + def log_serial(self, message: str, machine: str) -> None: if not self._print_serial_logs: return @@ -156,6 +163,10 @@ class CompositeLogger(AbstractLogger): for logger in self.logger_list: logger.warning(*args, **kwargs) + def log_test_error(self, *args, **kwargs) -> None: # type: ignore + for logger in self.logger_list: + logger.log_test_error(*args, **kwargs) + def error(self, *args, **kwargs) -> None: # type: ignore for logger in self.logger_list: logger.error(*args, **kwargs) @@ -202,7 +213,7 @@ class TerminalLogger(AbstractLogger): tic = time.time() yield toc = time.time() - self.log(f"(finished: {message}, in {toc - tic:.2f} seconds)") + self.log(f"(finished: {message}, in {toc - tic:.2f} seconds)", attributes) def info(self, *args, **kwargs) -> None: # type: ignore self.log(*args, **kwargs) @@ -222,6 +233,11 @@ class TerminalLogger(AbstractLogger): self._eprint(Style.DIM + f"{machine} # {message}" + Style.RESET_ALL) + def log_test_error(self, *args, **kwargs) -> None: # type: ignore + prefix = Fore.RED + "!!! " + Style.RESET_ALL + # NOTE: using `warning` instead of `error` to ensure it does not exit after printing the first log + self.warning(f"{prefix}{args[0]}", *args[1:], **kwargs) + class XMLLogger(AbstractLogger): def __init__(self, outfile: str) -> None: @@ -261,6 +277,9 @@ class XMLLogger(AbstractLogger): def error(self, *args, **kwargs) -> None: # type: ignore self.log(*args, **kwargs) + def log_test_error(self, *args, **kwargs) -> None: # type: ignore + self.log(*args, **kwargs) + def log(self, message: str, attributes: dict[str, str] = {}) -> None: self.drain_log_queue() self.log_line(message, attributes) diff --git a/nixos/lib/test-driver/src/test_driver/machine.py b/nixos/lib/test-driver/src/test_driver/machine.py index cba386ae86b4..1b9dd1262ce6 100644 --- a/nixos/lib/test-driver/src/test_driver/machine.py +++ b/nixos/lib/test-driver/src/test_driver/machine.py @@ -19,6 +19,7 @@ from pathlib import Path from queue import Queue from typing import Any +from test_driver.errors import MachineError, RequestedAssertionFailed from test_driver.logger import AbstractLogger from .qmp import QMPSession @@ -129,7 +130,7 @@ def _preprocess_screenshot(screenshot_path: str, negate: bool = False) -> str: ) if ret.returncode != 0: - raise Exception( + raise MachineError( f"Image processing failed with exit code {ret.returncode}, stdout: {ret.stdout.decode()}, stderr: {ret.stderr.decode()}" ) @@ -140,7 +141,7 @@ def _perform_ocr_on_screenshot( screenshot_path: str, model_ids: Iterable[int] ) -> list[str]: if shutil.which("tesseract") is None: - raise Exception("OCR requested but enableOCR is false") + raise MachineError("OCR requested but enableOCR is false") processed_image = _preprocess_screenshot(screenshot_path, negate=False) processed_negative = _preprocess_screenshot(screenshot_path, negate=True) @@ -163,7 +164,7 @@ def _perform_ocr_on_screenshot( capture_output=True, ) if ret.returncode != 0: - raise Exception(f"OCR failed with exit code {ret.returncode}") + raise MachineError(f"OCR failed with exit code {ret.returncode}") model_results.append(ret.stdout.decode("utf-8")) return model_results @@ -180,7 +181,9 @@ def retry(fn: Callable, timeout: int = 900) -> None: time.sleep(1) if not fn(True): - raise Exception(f"action timed out after {timeout} seconds") + raise RequestedAssertionFailed( + f"action timed out after {timeout} tries with one-second pause in-between" + ) class StartCommand: @@ -409,14 +412,14 @@ class Machine: def check_active(_last_try: bool) -> bool: state = self.get_unit_property(unit, "ActiveState", user) if state == "failed": - raise Exception(f'unit "{unit}" reached state "{state}"') + raise RequestedAssertionFailed(f'unit "{unit}" reached state "{state}"') if state == "inactive": status, jobs = self.systemctl("list-jobs --full 2>&1", user) if "No jobs" in jobs: info = self.get_unit_info(unit, user) if info["ActiveState"] == state: - raise Exception( + raise RequestedAssertionFailed( f'unit "{unit}" is inactive and there are no pending jobs' ) @@ -431,7 +434,7 @@ class Machine: def get_unit_info(self, unit: str, user: str | None = None) -> dict[str, str]: status, lines = self.systemctl(f'--no-pager show "{unit}"', user) if status != 0: - raise Exception( + raise RequestedAssertionFailed( f'retrieving systemctl info for unit "{unit}"' + ("" if user is None else f' under user "{user}"') + f" failed with exit code {status}" @@ -461,7 +464,7 @@ class Machine: user, ) if status != 0: - raise Exception( + raise RequestedAssertionFailed( f'retrieving systemctl property "{property}" for unit "{unit}"' + ("" if user is None else f' under user "{user}"') + f" failed with exit code {status}" @@ -509,7 +512,7 @@ class Machine: info = self.get_unit_info(unit) state = info["ActiveState"] if state != require_state: - raise Exception( + raise RequestedAssertionFailed( f"Expected unit '{unit}' to to be in state " f"'{require_state}' but it is in state '{state}'" ) @@ -663,7 +666,9 @@ class Machine: (status, out) = self.execute(command, timeout=timeout) if status != 0: self.log(f"output: {out}") - raise Exception(f"command `{command}` failed (exit code {status})") + raise RequestedAssertionFailed( + f"command `{command}` failed (exit code {status})" + ) output += out return output @@ -677,7 +682,9 @@ class Machine: with self.nested(f"must fail: {command}"): (status, out) = self.execute(command, timeout=timeout) if status == 0: - raise Exception(f"command `{command}` unexpectedly succeeded") + raise RequestedAssertionFailed( + f"command `{command}` unexpectedly succeeded" + ) output += out return output @@ -922,7 +929,7 @@ class Machine: ret = subprocess.run(f"pnmtopng '{tmp}' > '{filename}'", shell=True) os.unlink(tmp) if ret.returncode != 0: - raise Exception("Cannot convert screenshot") + raise MachineError("Cannot convert screenshot") def copy_from_host_via_shell(self, source: str, target: str) -> None: """Copy a file from the host into the guest by piping it over the diff --git a/nixos/lib/test-script-prepend.py b/nixos/lib/test-script-prepend.py index 9d2efdf97303..31dad14ef8dd 100644 --- a/nixos/lib/test-script-prepend.py +++ b/nixos/lib/test-script-prepend.py @@ -8,6 +8,7 @@ from test_driver.logger import AbstractLogger from typing import Callable, Iterator, ContextManager, Optional, List, Dict, Any, Union from typing_extensions import Protocol from pathlib import Path +from unittest import TestCase class RetryProtocol(Protocol): @@ -51,3 +52,4 @@ join_all: Callable[[], None] serial_stdout_off: Callable[[], None] serial_stdout_on: Callable[[], None] polling_condition: PollingConditionProtocol +t: TestCase diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index d01c1d9b5e09..878f9669321a 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -75,6 +75,7 @@ pkgs.lib.throwIf (args ? specialArgs) ), extraPythonPackages ? (_: [ ]), interactive ? { }, + sshBackdoor ? { }, }@t: let testConfig = diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix index 0a4c89ed4b06..1e8f37cf9b51 100644 --- a/nixos/lib/testing/meta.nix +++ b/nixos/lib/testing/meta.nix @@ -1,48 +1,61 @@ { lib, ... }: let - inherit (lib) types mkOption; + inherit (lib) types mkOption literalMD; in { options = { - meta = lib.mkOption { + meta = mkOption { description = '' The [`meta`](https://nixos.org/manual/nixpkgs/stable/#chap-meta) attributes that will be set on the returned derivations. Not all [`meta`](https://nixos.org/manual/nixpkgs/stable/#chap-meta) attributes are supported, but more can be added as desired. ''; apply = lib.filterAttrs (k: v: v != null); - type = types.submodule { - options = { - maintainers = lib.mkOption { - type = types.listOf types.raw; - default = [ ]; - description = '' - The [list of maintainers](https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers) for this test. - ''; + type = types.submodule ( + { config, ... }: + { + options = { + maintainers = mkOption { + type = types.listOf types.raw; + default = [ ]; + description = '' + The [list of maintainers](https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers) for this test. + ''; + }; + timeout = mkOption { + type = types.nullOr types.int; + default = 3600; # 1 hour + description = '' + The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds. + ''; + }; + broken = mkOption { + type = types.bool; + default = false; + description = '' + Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation. + ''; + }; + platforms = mkOption { + type = types.listOf types.raw; + default = lib.platforms.linux ++ lib.platforms.darwin; + description = '' + Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation. + ''; + }; + hydraPlatforms = mkOption { + type = types.listOf types.raw; + # Ideally this would default to `platforms` again: + # default = config.platforms; + default = lib.platforms.linux; + defaultText = literalMD "`lib.platforms.linux` only, as the `hydra.nixos.org` build farm does not currently support virtualisation on Darwin."; + description = '' + Sets the [`meta.hydraPlatforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-hydraPlatforms) attribute on the [{option}`test`](#test-opt-test) derivation. + ''; + }; }; - timeout = lib.mkOption { - type = types.nullOr types.int; - default = 3600; # 1 hour - description = '' - The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds. - ''; - }; - broken = lib.mkOption { - type = types.bool; - default = false; - description = '' - Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation. - ''; - }; - platforms = lib.mkOption { - type = types.listOf types.raw; - default = lib.platforms.linux ++ lib.platforms.darwin; - description = '' - Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation. - ''; - }; - }; - }; + } + ); default = { }; }; }; diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index caefac6c748c..b2352c478110 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -13,6 +13,7 @@ let mapAttrs mkDefault mkIf + mkMerge mkOption mkForce optional @@ -77,6 +78,30 @@ in { options = { + sshBackdoor = { + enable = mkOption { + default = false; + type = types.bool; + description = "Whether to turn on the VSOCK-based access to all VMs. This provides an unauthenticated access intended for debugging."; + }; + vsockOffset = mkOption { + default = 2; + type = types.ints.between 2 4294967296; + description = '' + This field is only relevant when multiple users run the (interactive) + driver outside the sandbox and with the SSH backdoor activated. + The typical symptom for this being a problem are error messages like this: + `vhost-vsock: unable to set guest cid: Address already in use` + + This option allows to assign an offset to each vsock number to + resolve this. + + This is a 32bit number. The lowest possible vsock number is `3` + (i.e. with the lowest node number being `1`, this is 2+1). + ''; + }; + }; + node.type = mkOption { type = types.raw; default = baseOS.type; @@ -172,10 +197,41 @@ in passthru.nodes = config.nodesCompat; - defaults = mkIf config.node.pkgsReadOnly { - nixpkgs.pkgs = config.node.pkgs; - imports = [ ../../modules/misc/nixpkgs/read-only.nix ]; - }; + extraDriverArgs = mkIf config.sshBackdoor.enable [ + "--dump-vsocks=${toString config.sshBackdoor.vsockOffset}" + ]; + + defaults = mkMerge [ + (mkIf config.node.pkgsReadOnly { + nixpkgs.pkgs = config.node.pkgs; + imports = [ ../../modules/misc/nixpkgs/read-only.nix ]; + }) + (mkIf config.sshBackdoor.enable ( + let + inherit (config.sshBackdoor) vsockOffset; + in + { config, ... }: + { + services.openssh = { + enable = true; + settings = { + PermitRootLogin = "yes"; + PermitEmptyPasswords = "yes"; + }; + }; + + security.pam.services.sshd = { + allowNullPassword = true; + }; + + virtualisation.qemu.options = [ + "-device vhost-vsock-pci,guest-cid=${ + toString (config.virtualisation.test.nodeNumber + vsockOffset) + }" + ]; + } + )) + ]; }; } diff --git a/nixos/lib/testing/run.nix b/nixos/lib/testing/run.nix index 4ea0b1e9a034..f37aa1bcd0e5 100644 --- a/nixos/lib/testing/run.nix +++ b/nixos/lib/testing/run.nix @@ -43,27 +43,30 @@ in }; config = { - rawTestDerivation = hostPkgs.stdenv.mkDerivation { - name = "vm-test-run-${config.name}"; + rawTestDerivation = + assert lib.assertMsg (!config.sshBackdoor.enable) + "The SSH backdoor is currently not supported for non-interactive testing! Please make sure to only set `interactive.sshBackdoor.enable = true;`!"; + hostPkgs.stdenv.mkDerivation { + name = "vm-test-run-${config.name}"; - requiredSystemFeatures = - [ "nixos-test" ] - ++ lib.optionals hostPkgs.stdenv.hostPlatform.isLinux [ "kvm" ] - ++ lib.optionals hostPkgs.stdenv.hostPlatform.isDarwin [ "apple-virt" ]; + requiredSystemFeatures = + [ "nixos-test" ] + ++ lib.optionals hostPkgs.stdenv.hostPlatform.isLinux [ "kvm" ] + ++ lib.optionals hostPkgs.stdenv.hostPlatform.isDarwin [ "apple-virt" ]; - buildCommand = '' - mkdir -p $out + buildCommand = '' + mkdir -p $out - # effectively mute the XMLLogger - export LOGFILE=/dev/null + # effectively mute the XMLLogger + export LOGFILE=/dev/null - ${config.driver}/bin/nixos-test-driver -o $out - ''; + ${config.driver}/bin/nixos-test-driver -o $out + ''; - passthru = config.passthru; + passthru = config.passthru; - meta = config.meta; - }; + meta = config.meta; + }; test = lib.lazyDerivation { # lazyDerivation improves performance when only passthru items and/or meta are used. derivation = config.rawTestDerivation; diff --git a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix index 724c220abaf8..4b966bd431ef 100644 --- a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix +++ b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix @@ -8,10 +8,19 @@ }: { - imports = [ ../../../modules/virtualisation/cloudstack-config.nix ]; + imports = [ + ../../../modules/virtualisation/cloudstack-config.nix + ../../../modules/image/file-options.nix + ]; + + system.nixos.tags = [ "cloudstack" ]; + image.extension = "qcow2"; + system.build.image = config.system.build.cloudstackImage; system.build.cloudstackImage = import ../../../lib/make-disk-image.nix { inherit lib config pkgs; + inherit (config.virtualisation) diskSize; + baseName = config.image.baseName; format = "qcow2"; configFile = pkgs.writeText "configuration.nix" '' { diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index d5b23d8a65f6..a192b91196de 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -83,7 +83,7 @@ in # Use a priority just below mkOptionDefault (1500) instead of lib.mkDefault # to avoid breaking existing configs using that. - config.virtualisation.diskSize = lib.mkOverride 1490 (3 * 1024); + config.virtualisation.diskSize = lib.mkOverride 1490 (4 * 1024); config.virtualisation.diskSizeAutoSupported = !config.ec2.zfs.enable; config.system.nixos.tags = [ "amazon" ]; @@ -140,7 +140,7 @@ in echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products ${pkgs.jq}/bin/jq -n \ - --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system_version ${lib.escapeShellArg config.system.nixos.version} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ @@ -148,7 +148,7 @@ in --arg root "$rootDisk" \ --arg boot "$bootDisk" \ '{} - | .label = $system_label + | .label = $system_version | .boot_mode = $boot_mode | .system = $system | .disks.boot.logical_bytes = $boot_logical_bytes @@ -181,13 +181,13 @@ in echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products ${pkgs.jq}/bin/jq -n \ - --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system_version ${lib.escapeShellArg config.system.nixos.version} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_mode "${amiBootMode}" \ --arg file "$diskImage" \ '{} - | .label = $system_label + | .label = $system_version | .boot_mode = $boot_mode | .system = $system | .logical_bytes = $logical_bytes diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index d36d4c3ecdfd..22a47d5bdffa 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -4,6 +4,22 @@ pkgs, ... }: +let + sanitizeUTF8Capitalization = + lang: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] lang); + aggregatedLocales = + [ + "${config.i18n.defaultLocale}/${config.i18n.defaultCharset}" + ] + ++ lib.pipe config.i18n.extraLocaleSettings [ + (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v))) + (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8"))) + ] + ++ (builtins.map sanitizeUTF8Capitalization ( + lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales + )) + ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales); +in { ###### interface @@ -36,9 +52,29 @@ default = "en_US.UTF-8"; example = "nl_NL.UTF-8"; description = '' - The default locale. It determines the language for program - messages, the format for dates and times, sort order, and so on. - It also determines the character set, such as UTF-8. + The default locale. It determines the language for program messages, + the format for dates and times, sort order, and so on. Setting the + default character set is done via {option}`i18n.defaultCharset`. + ''; + }; + defaultCharset = lib.mkOption { + type = lib.types.str; + default = "UTF-8"; + example = "ISO-8859-8"; + description = '' + The default locale character set. + ''; + }; + + extraLocales = lib.mkOption { + type = lib.types.either (lib.types.listOf lib.types.str) (lib.types.enum [ "all" ]); + default = [ ]; + example = [ "nl_NL.UTF-8/UTF-8" ]; + description = '' + Additional locales that the system should support, besides the ones + configured with {option}`i18n.defaultLocale` and + {option}`i18n.extraLocaleSettings`. + Set this to `"all"` to install all available locales. ''; }; @@ -50,36 +86,37 @@ LC_TIME = "de_DE.UTF-8"; }; description = '' - A set of additional system-wide locale settings other than - `LANG` which can be configured with - {option}`i18n.defaultLocale`. + A set of additional system-wide locale settings other than `LANG` + which can be configured with {option}`i18n.defaultLocale`. Note that + the `/UTF-8` suffix used in {option}`i18n.extraLocales` indicates a + character set, and it must not be added manually here. To use a + non-`UTF-8` character set such as ISO-XXXX-8, the + {option}`i18n.localeCharsets` can be used. + ''; + }; + localeCharsets = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + example = { + LC_MESSAGES = "ISO-8859-15"; + LC_TIME = "ISO-8859-1"; + }; + description = '' + Per each {option}`i18n.extraLocaleSettings`, choose the character set + to use for it. Essentially defaults to UTF-8 for all of them. ''; }; supportedLocales = lib.mkOption { type = lib.types.listOf lib.types.str; + visible = false; default = lib.unique ( - builtins.map - (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") - ( - [ - "C.UTF-8" - "en_US.UTF-8" - config.i18n.defaultLocale - ] - ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) - ) + [ + "C.UTF-8/UTF-8" + "en_US.UTF-8/UTF-8" + ] + ++ aggregatedLocales ); - defaultText = lib.literalExpression '' - lib.unique - (builtins.map (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") ( - [ - "C.UTF-8" - "en_US.UTF-8" - config.i18n.defaultLocale - ] ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) - )) - ''; example = [ "en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" @@ -100,6 +137,24 @@ ###### implementation config = { + warnings = + lib.optional + ( + !( + (lib.subtractLists config.i18n.supportedLocales aggregatedLocales) == [ ] + || lib.any (x: x == "all") config.i18n.supportedLocales + ) + ) + '' + `i18n.supportedLocales` is deprecated in favor of `i18n.extraLocales`, + and it seems you are using `i18n.supportedLocales` and forgot to + include some locales specified in `i18n.defaultLocale`, + `i18n.extraLocales` or `i18n.extraLocaleSettings`. + + If you're trying to install additional locales not specified in + `i18n.defaultLocale` or `i18n.extraLocaleSettings`, consider adding + only those locales to `i18n.extraLocales`. + ''; environment.systemPackages = # We increase the priority a little, so that plain glibc in systemPackages can't win. diff --git a/nixos/modules/config/nix-flakes.nix b/nixos/modules/config/nix-flakes.nix index 69388e791154..1a7b2724b486 100644 --- a/nixos/modules/config/nix-flakes.nix +++ b/nixos/modules/config/nix-flakes.nix @@ -19,6 +19,10 @@ let cfg = config.nix; + flakeRefFormat = '' + The format of flake references is described in {manpage}`nix3-flake(1)`. + ''; + in { options = { @@ -46,7 +50,11 @@ in type = "indirect"; id = "nixpkgs"; }; - description = "The flake reference to be rewritten."; + description = '' + The flake reference to be rewritten. + + ${flakeRefFormat} + ''; }; to = mkOption { type = referenceAttrs; @@ -55,7 +63,11 @@ in owner = "my-org"; repo = "my-nixpkgs"; }; - description = "The flake reference {option}`from` is rewritten to."; + description = '' + The flake reference {option}`from` is rewritten to. + + ${flakeRefFormat} + ''; }; flake = mkOption { type = types.nullOr types.attrs; @@ -96,6 +108,8 @@ in default = { }; description = '' A system-wide flake registry. + + See {manpage}`nix3-registry(1)` for more information. ''; }; }; diff --git a/nixos/modules/config/stub-ld.nix b/nixos/modules/config/stub-ld.nix index 836cd129e22f..277ed7594566 100644 --- a/nixos/modules/config/stub-ld.nix +++ b/nixos/modules/config/stub-ld.nix @@ -42,10 +42,7 @@ let $CC -Os main.c -o $out ''; - pkgs32 = pkgs.pkgsi686Linux; - stub-ld = stub-ld-for pkgs message; - stub-ld32 = stub-ld-for pkgs32 message; in { options = { @@ -65,7 +62,6 @@ in config = mkIf cfg.enable { environment.ldso = mkDefault stub-ld; - environment.ldso32 = mkIf pkgs.stdenv.hostPlatform.isx86_64 (mkDefault stub-ld32); }; meta.maintainers = with lib.maintainers; [ tejing ]; diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index a2be448d625b..0d192ae04073 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -54,15 +54,14 @@ sub dry_print { # Functions for allocating free GIDs/UIDs. FIXME: respect ID ranges in # /etc/login.defs. sub allocId { - my ($used, $prevUsed, $idMin, $idMax, $up, $getid) = @_; - my $id = $up ? $idMin : $idMax; + my ($used, $prevUsed, $idMin, $idMax, $delta, $getid) = @_; + my $id = $delta > 0 ? $idMin : $idMax; while ($id >= $idMin && $id <= $idMax) { if (!$used->{$id} && !$prevUsed->{$id} && !defined &$getid($id)) { $used->{$id} = 1; return $id; } - $used->{$id} = 1; - if ($up) { $id++; } else { $id--; } + $id += $delta; } die "$0: out of free UIDs or GIDs\n"; } @@ -77,19 +76,19 @@ sub allocGid { $gidsUsed{$prevGid} = 1; return $prevGid; } - return allocId(\%gidsUsed, \%gidsPrevUsed, 400, 999, 0, sub { my ($gid) = @_; getgrgid($gid) }); + return allocId(\%gidsUsed, \%gidsPrevUsed, 400, 999, -1, sub { my ($gid) = @_; getgrgid($gid) }); } sub allocUid { my ($name, $isSystemUser) = @_; - my ($min, $max, $up) = $isSystemUser ? (400, 999, 0) : (1000, 29999, 1); + my ($min, $max, $delta) = $isSystemUser ? (400, 999, -1) : (1000, 29999, 1); my $prevUid = $uidMap->{$name}; if (defined $prevUid && $prevUid >= $min && $prevUid <= $max && !defined $uidsUsed{$prevUid}) { dry_print("reviving", "would revive", "user '$name' with UID $prevUid"); $uidsUsed{$prevUid} = 1; return $prevUid; } - return allocId(\%uidsUsed, \%uidsPrevUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) }); + return allocId(\%uidsUsed, \%uidsPrevUsed, $min, $max, $delta, sub { my ($uid) = @_; getpwuid($uid) }); } # Read the declared users/groups @@ -336,18 +335,14 @@ sub allocSubUid { my ($name, @rest) = @_; # TODO: No upper bounds? - my ($min, $max, $up) = (100000, 100000 * 100, 1); + my ($min, $max, $delta) = (100000, 100000 + 100 * 65536, 65536); my $prevId = $subUidMap->{$name}; if (defined $prevId && !defined $subUidsUsed{$prevId}) { $subUidsUsed{$prevId} = 1; return $prevId; } - my $id = allocId(\%subUidsUsed, \%subUidsPrevUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) }); - my $offset = $id - 100000; - my $count = $offset * 65536; - my $subordinate = 100000 + $count; - return $subordinate; + return allocId(\%subUidsUsed, \%subUidsPrevUsed, $min, $max, $delta, sub { undef }); } my @subGids; @@ -367,6 +362,14 @@ foreach my $u (values %usersOut) { if($u->{autoSubUidGidRange}) { my $subordinate = allocSubUid($name); + if (defined $subUidMap->{$name} && $subUidMap->{$name} != $subordinate) { + print STDERR "warning: The subuids for '$name' changed, as they coincided with the subuids of a different user (see /etc/subuid). " + . "The range now starts with $subordinate instead of $subUidMap->{$name}. " + . "If the subuids were used (e.g. with rootless container managers like podman), please change the ownership of affected files accordingly. " + . "Alternatively, to keep the old overlapping ranges, add this to the system configuration: " + . "users.users.$name.subUidRanges = [{startUid = $subUidMap->{$name}; count = 65536;}]; " + . "users.users.$name.subGidRanges = [{startGid = $subUidMap->{$name}; count = 65536;}];\n"; + } $subUidMap->{$name} = $subordinate; my $value = join(":", ($name, $subordinate, 65536)); push @subUids, $value; diff --git a/nixos/modules/hardware/graphics.nix b/nixos/modules/hardware/graphics.nix index 60e73f7eef65..627cf19333bf 100644 --- a/nixos/modules/hardware/graphics.nix +++ b/nixos/modules/hardware/graphics.nix @@ -80,16 +80,13 @@ in The package that provides the default driver set. ''; type = lib.types.package; - internal = true; }; package32 = lib.mkOption { description = '' The package that provides the 32-bit driver set. Used when {option}`enable32Bit` is enabled. - set. ''; type = lib.types.package; - internal = true; }; extraPackages = lib.mkOption { diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 068e23aa3347..48f8ded73c64 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -343,14 +343,23 @@ in ]; # Don't add `nvidia-uvm` to `kernelModules`, because we want - # `nvidia-uvm` be loaded only after `udev` rules for `nvidia` kernel - # module are applied. + # `nvidia-uvm` be loaded only after the GPU device is available, i.e. after `udev` rules + # for `nvidia` kernel module are applied. + # This matters on Azure GPU instances: https://github.com/NixOS/nixpkgs/pull/267335 # # Instead, we use `softdep` to lazily load `nvidia-uvm` kernel module # after `nvidia` kernel module is loaded and `udev` rules are applied. extraModprobeConfig = '' softdep nvidia post: nvidia-uvm ''; + + # Exception is the open-source kernel module failing to load nvidia-uvm using softdep + # for unknown reasons. + # It affects CUDA: https://github.com/NixOS/nixpkgs/issues/334180 + # Previously nvidia-uvm was explicitly loaded only when xserver was enabled: + # https://github.com/NixOS/nixpkgs/pull/334340/commits/4548c392862115359e50860bcf658cfa8715bde9 + # We are now loading the module eagerly for all users of the open driver (including headless). + kernelModules = lib.optionals useOpenModules [ "nvidia_uvm" ]; }; systemd.tmpfiles.rules = lib.mkIf config.virtualisation.docker.enableNvidia [ "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin" @@ -639,16 +648,11 @@ in boot = { extraModulePackages = if useOpenModules then [ nvidia_x11.open ] else [ nvidia_x11.bin ]; # nvidia-uvm is required by CUDA applications. - kernelModules = - lib.optionals config.services.xserver.enable [ - "nvidia" - "nvidia_modeset" - "nvidia_drm" - ] - # With the open driver, nvidia-uvm does not automatically load as - # a softdep of the nvidia module, so we explicitly load it for now. - # See https://github.com/NixOS/nixpkgs/issues/334180 - ++ lib.optionals (config.services.xserver.enable && useOpenModules) [ "nvidia_uvm" ]; + kernelModules = lib.optionals config.services.xserver.enable [ + "nvidia" + "nvidia_modeset" + "nvidia_drm" + ]; # If requested enable modesetting via kernel parameters. kernelParams = diff --git a/nixos/modules/hardware/xone.nix b/nixos/modules/hardware/xone.nix index 04216e8260a7..f2b2bf668d1d 100644 --- a/nixos/modules/hardware/xone.nix +++ b/nixos/modules/hardware/xone.nix @@ -21,6 +21,7 @@ in extraModulePackages = with config.boot.kernelPackages; [ xone ]; }; hardware.firmware = [ pkgs.xow_dongle-firmware ]; + hardware.xpad-noone.enable = lib.mkDefault true; }; meta = { diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix index d84be512b39f..810abe127af4 100644 --- a/nixos/modules/i18n/input-method/default.nix +++ b/nixos/modules/i18n/input-method/default.nix @@ -91,6 +91,12 @@ in The input method method package. ''; }; + + enableGtk2 = lib.mkEnableOption "Gtk2 support"; + + enableGtk3 = lib.mkEnableOption "Gtk3 support" // { + default = true; + }; }; }; @@ -98,15 +104,16 @@ in warnings = lib.optional (cfg.enabled != null) "i18n.inputMethod.enabled will be removed in a future release. Please use .type, and .enable = true instead"; - environment.systemPackages = [ - cfg.package - gtk2_cache - gtk3_cache - ]; + environment.systemPackages = + [ + cfg.package + ] + ++ lib.optional cfg.enableGtk2 gtk2_cache + ++ lib.optional cfg.enableGtk3 gtk3_cache; }; meta = { - maintainers = with lib.maintainers; [ ericsagnes ]; + maintainers = with lib.maintainers; [ ]; doc = ./default.md; }; diff --git a/nixos/modules/image/file-options.nix b/nixos/modules/image/file-options.nix index dff30e7408af..4a6b377111a0 100644 --- a/nixos/modules/image/file-options.nix +++ b/nixos/modules/image/file-options.nix @@ -9,6 +9,7 @@ baseName = lib.mkOption { type = lib.types.str; default = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}"; + defaultText = lib.literalExpression "nixos-image-\${config.system.nixos.label}-\${pkgs.stdenv.hostPlatform.system}"; description = '' Basename of the image filename without any extension (e.g. `image_1`). ''; @@ -29,6 +30,7 @@ fileName = lib.mkOption { type = lib.types.str; default = "${config.image.baseName}.${config.image.extension}"; + defaultText = lib.literalExpression "\${config.image.baseName}.\${config.image.extension}"; description = '' Filename of the image including all extensions (e.g `image_1.raw` or `image_1.raw.zst`). @@ -38,6 +40,7 @@ filePath = lib.mkOption { type = lib.types.str; default = config.image.fileName; + defaultText = lib.literalExpression "config.image.fileName"; description = '' Path of the image, relative to `$out` in `system.build.image`. While it defaults to `config.image.fileName`, it can be different for builders where diff --git a/nixos/modules/image/images.nix b/nixos/modules/image/images.nix index f3cdde327d36..b0f86ed5c455 100644 --- a/nixos/modules/image/images.nix +++ b/nixos/modules/image/images.nix @@ -11,6 +11,7 @@ let imageModules = { amazon = ../../maintainers/scripts/ec2/amazon-image.nix; azure = ../virtualisation/azure-image.nix; + cloudstack = ../../maintainers/scripts/cloudstack/cloudstack-image.nix; digital-ocean = ../virtualisation/digital-ocean-image.nix; google-compute = ../virtualisation/google-compute-image.nix; hyperv = ../virtualisation/hyperv-image.nix; diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index 3f8188ff44e8..13c90aa9ab7a 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -3,6 +3,7 @@ { config, + options, pkgs, lib, utils, @@ -88,6 +89,31 @@ in { imports = [ ./repart-verity-store.nix + ./file-options.nix + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "image" + "repart" + "imageFileBasename" + ]; + to = [ + "image" + "baseName" + ]; + }) + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "image" + "repart" + "imageFile" + ]; + to = [ + "image" + "fileName" + ]; + }) ]; options.image.repart = { @@ -95,7 +121,7 @@ in name = lib.mkOption { type = lib.types.str; description = '' - Name of the image. + Name of the image. If this option is unset but config.system.image.id is set, config.system.image.id is used as the default value. @@ -109,23 +135,6 @@ in description = "Version of the image"; }; - imageFileBasename = lib.mkOption { - type = lib.types.str; - readOnly = true; - description = '' - Basename of the image filename without any extension (e.g. `image_1`). - ''; - }; - - imageFile = lib.mkOption { - type = lib.types.str; - readOnly = true; - description = '' - Filename of the image including all extensions (e.g `image_1.raw` or - `image_1.raw.zst`). - ''; - }; - compression = { enable = lib.mkEnableOption "Image compression"; @@ -250,55 +259,37 @@ in ''; }; + assertions = lib.mkOption { + type = options.assertions.type; + default = [ ]; + internal = true; + visible = false; + description = '' + Assertions only evaluated by the repart image, not by the system toplevel. + ''; + }; + + warnings = lib.mkOption { + type = options.warnings.type; + default = [ ]; + internal = true; + visible = false; + description = '' + Warnings only evaluated by the repart image, not by the system toplevel. + ''; + }; + }; config = { - - assertions = lib.mapAttrsToList ( - fileName: partitionConfig: - let - inherit (partitionConfig) repartConfig; - labelLength = builtins.stringLength repartConfig.Label; - in - { - assertion = repartConfig ? Label -> GPTMaxLabelLength >= labelLength; - message = '' - The partition label '${repartConfig.Label}' - defined for '${fileName}' is ${toString labelLength} characters long, - but the maximum label length supported by UEFI is ${toString GPTMaxLabelLength}. - ''; - } - ) cfg.partitions; - - warnings = lib.filter (v: v != null) ( - lib.mapAttrsToList ( - fileName: partitionConfig: - let - inherit (partitionConfig) repartConfig; - suggestedMaxLabelLength = GPTMaxLabelLength - 2; - labelLength = builtins.stringLength repartConfig.Label; - in - if (repartConfig ? Label && labelLength >= suggestedMaxLabelLength) then - '' - The partition label '${repartConfig.Label}' - defined for '${fileName}' is ${toString labelLength} characters long. - The suggested maximum label length is ${toString suggestedMaxLabelLength}. - - If you use sytemd-sysupdate style A/B updates, this might - not leave enough space to increment the version number included in - the label in a future release. For example, if your label is - ${toString GPTMaxLabelLength} characters long (the maximum enforced by UEFI) and - you're at version 9, you cannot increment this to 10. - '' - else - null - ) cfg.partitions - ); - - image.repart = + image.baseName = let version = config.image.repart.version; versionInfix = if version != null then "_${version}" else ""; + in + cfg.name + versionInfix; + image.extension = + let compressionSuffix = lib.optionalString cfg.compression.enable { @@ -308,6 +299,11 @@ in } ."${cfg.compression.algorithm}"; + in + "raw" + compressionSuffix; + + image.repart = + let makeClosure = paths: pkgs.closureInfo { rootPaths = paths; }; # Add the closure of the provided Nix store paths to cfg.partitions so @@ -321,9 +317,6 @@ in in { name = lib.mkIf (config.system.image.id != null) (lib.mkOptionDefault config.system.image.id); - imageFileBasename = cfg.name + versionInfix; - imageFile = cfg.imageFileBasename + ".raw" + compressionSuffix; - compression = { # Generally default to slightly faster than default compression # levels under the assumption that most of the building will be done @@ -339,6 +332,47 @@ in }; finalPartitions = lib.mapAttrs addClosure cfg.partitions; + + assertions = lib.mapAttrsToList ( + fileName: partitionConfig: + let + inherit (partitionConfig) repartConfig; + labelLength = builtins.stringLength repartConfig.Label; + in + { + assertion = repartConfig ? Label -> GPTMaxLabelLength >= labelLength; + message = '' + The partition label '${repartConfig.Label}' + defined for '${fileName}' is ${toString labelLength} characters long, + but the maximum label length supported by UEFI is ${toString GPTMaxLabelLength}. + ''; + } + ) cfg.partitions; + + warnings = lib.filter (v: v != null) ( + lib.mapAttrsToList ( + fileName: partitionConfig: + let + inherit (partitionConfig) repartConfig; + suggestedMaxLabelLength = GPTMaxLabelLength - 2; + labelLength = builtins.stringLength repartConfig.Label; + in + if (repartConfig ? Label && labelLength >= suggestedMaxLabelLength) then + '' + The partition label '${repartConfig.Label}' + defined for '${fileName}' is ${toString labelLength} characters long. + The suggested maximum label length is ${toString suggestedMaxLabelLength}. + + If you use sytemd-sysupdate style A/B updates, this might + not leave enough space to increment the version number included in + the label in a future release. For example, if your label is + ${toString GPTMaxLabelLength} characters long (the maximum enforced by UEFI) and + you're at version 9, you cannot increment this to 10. + '' + else + null + ) cfg.partitions + ); }; system.build.image = @@ -354,26 +388,26 @@ in ); mkfsEnv = mkfsOptionsToEnv cfg.mkfsOptions; + val = pkgs.callPackage ./repart-image.nix { + systemd = cfg.package; + imageFileBasename = config.image.baseName; + inherit (cfg) + name + version + compression + split + seed + sectorSize + finalPartitions + ; + inherit fileSystems definitionsDirectory mkfsEnv; + }; in - pkgs.callPackage ./repart-image.nix { - systemd = cfg.package; - inherit (cfg) - name - version - imageFileBasename - compression - split - seed - sectorSize - finalPartitions - ; - inherit fileSystems definitionsDirectory mkfsEnv; - }; - - meta.maintainers = with lib.maintainers; [ - nikstur - willibutz - ]; - + lib.asserts.checkAssertWarn cfg.assertions cfg.warnings val; }; + + meta.maintainers = with lib.maintainers; [ + nikstur + willibutz + ]; } diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 93c52da399ff..55a0c46237ed 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/00a7rdfwhm6avqkgj68grddbzyz3h6ql-nix-2.24.13"; - i686-linux = "/nix/store/s6c620v60hfishzi1lbfpryk65lbvg8g-nix-2.24.13"; - aarch64-linux = "/nix/store/7yg9is1shh3383iwi6qynz3vh91l1f9d-nix-2.24.13"; - riscv64-linux = "/nix/store/fagjkrx5r6p52xp8qb5581bmnlgp01sn-nix-riscv64-unknown-linux-gnu-2.24.13"; - x86_64-darwin = "/nix/store/ifby7rrgkkly5pzjnyac90lzvrak3i9y-nix-2.24.13"; - aarch64-darwin = "/nix/store/b0rbdp6ba2fprprpgsw1a8pplzg0j324-nix-2.24.13"; + x86_64-linux = "/nix/store/pfh6bq2wxbpp3xz5sinymmp44n505zh8-nix-2.28.3"; + i686-linux = "/nix/store/nfxdfb9zcrm9sqkw8xhdqs7vcvrwp1k2-nix-2.28.3"; + aarch64-linux = "/nix/store/7w6fj8s7h4pcmx38m1f51xd93ywizm4i-nix-2.28.3"; + riscv64-linux = "/nix/store/nnynd5vfd6pf9jkp13bmj44rlrd61l3h-nix-riscv64-unknown-linux-gnu-2.28.3"; + x86_64-darwin = "/nix/store/rdxbh5m09c9i2s7zkh7b8g6mnrpmaa19-nix-2.28.3"; + aarch64-darwin = "/nix/store/wjrdsqbaial7pl9vfhqc7cpzd9lqcr6a-nix-2.28.3"; } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 74a22b1b6b36..bbbe0a7ed4a9 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -159,8 +159,8 @@ let # programs.firefox.enable = true; - # List packages installed in system profile. To search, run: - # \$ nix search wget + # List packages installed in system profile. + # You can use https://search.nixos.org/ to find more packages (and options). # environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget @@ -274,7 +274,7 @@ in description = '' Disable nixos-rebuild, nixos-generate-config, nixos-installer and other NixOS tools. This is useful to shrink embedded, - read-only systems which are not expected to be rebuild or + read-only systems which are not expected to rebuild or reconfigure themselves. Use at your own risk! ''; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index fcdffc520967..ebd53cb17ea5 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -167,7 +167,7 @@ in nsd = 126; gitolite = 127; znc = 128; - polipo = 129; + # polipo = 129; removed 2025-05-18 mopidy = 130; #docker = 131; # unused gdm = 132; @@ -507,7 +507,7 @@ in nsd = 126; gitolite = 127; znc = 128; - polipo = 129; + # polipo = 129; removed 2025-05-18 mopidy = 130; docker = 131; gdm = 132; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0a23a0d0d653..ff65ce2125f1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1,4 +1,5 @@ [ + # keep-sorted start case=no numeric=yes ./config/appstream.nix ./config/console.nix ./config/debug-info.nix @@ -16,10 +17,10 @@ ./config/malloc.nix ./config/mysql.nix ./config/networking.nix - ./config/nix.nix ./config/nix-channel.nix ./config/nix-flakes.nix ./config/nix-remote-build.nix + ./config/nix.nix ./config/nsswitch.nix ./config/power-management.nix ./config/qt.nix @@ -55,8 +56,8 @@ ./hardware/coral.nix ./hardware/corectrl.nix ./hardware/cpu/amd-microcode.nix - ./hardware/cpu/amd-sev.nix ./hardware/cpu/amd-ryzen-smu.nix + ./hardware/cpu/amd-sev.nix ./hardware/cpu/intel-microcode.nix ./hardware/cpu/intel-sgx.nix ./hardware/cpu/x86-msr.nix @@ -121,8 +122,8 @@ ./hardware/video/webcam/ipu6.nix ./hardware/wooting.nix ./hardware/xone.nix - ./hardware/xpadneo.nix ./hardware/xpad-noone.nix + ./hardware/xpadneo.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx5.nix ./i18n/input-method/hime.nix @@ -144,8 +145,8 @@ ./misc/mandoc.nix ./misc/meta.nix ./misc/nixops-autoluks.nix - ./misc/nixpkgs.nix ./misc/nixpkgs-flake.nix + ./misc/nixpkgs.nix ./misc/passthru.nix ./misc/version.nix ./misc/wordlist.nix @@ -159,6 +160,7 @@ ./programs/arp-scan.nix ./programs/atop.nix ./programs/ausweisapp.nix + ./programs/autoenv.nix ./programs/autojump.nix ./programs/bandwhich.nix ./programs/bash-my-aws.nix @@ -167,8 +169,8 @@ ./programs/bash/blesh.nix ./programs/bash/ls-colors.nix ./programs/bash/undistract-me.nix - ./programs/bazecor.nix ./programs/bat.nix + ./programs/bazecor.nix ./programs/bcc.nix ./programs/benchexec.nix ./programs/browserpass.nix @@ -180,12 +182,11 @@ ./programs/chromium.nix ./programs/clash-verge.nix ./programs/cnping.nix - ./programs/cpu-energy-meter.nix ./programs/command-not-found/command-not-found.nix ./programs/coolercontrol.nix ./programs/corefreq.nix + ./programs/cpu-energy-meter.nix ./programs/criu.nix - ./programs/darling.nix ./programs/dconf.nix ./programs/digitalbitbox/default.nix ./programs/direnv.nix @@ -215,8 +216,8 @@ ./programs/gdk-pixbuf.nix ./programs/geary.nix ./programs/ghidra.nix - ./programs/git.nix ./programs/git-worktree-switcher.nix + ./programs/git.nix ./programs/gnome-disks.nix ./programs/gnome-terminal.nix ./programs/gnupg.nix @@ -227,23 +228,23 @@ ./programs/haguichi.nix ./programs/hamster.nix ./programs/htop.nix + ./programs/i3lock.nix ./programs/iay.nix ./programs/iftop.nix - ./programs/i3lock.nix ./programs/iio-hyprland.nix ./programs/immersed.nix ./programs/iotop.nix ./programs/java.nix ./programs/joycond-cemuhook.nix ./programs/k3b.nix - ./programs/kde-pim.nix ./programs/k40-whisperer.nix ./programs/kbdlight.nix ./programs/kclock.nix + ./programs/kde-pim.nix ./programs/kdeconnect.nix + ./programs/kubeswitch.nix ./programs/ladybird.nix ./programs/lazygit.nix - ./programs/kubeswitch.nix ./programs/less.nix ./programs/liboping.nix ./programs/light.nix @@ -273,10 +274,10 @@ ./programs/npm.nix ./programs/ns-usbloader.nix ./programs/oblogout.nix + ./programs/obs-studio.nix ./programs/oddjobd.nix ./programs/opengamepadui.nix ./programs/openvpn3.nix - ./programs/obs-studio.nix ./programs/partition-manager.nix ./programs/pay-respects.nix ./programs/plotinus.nix @@ -290,10 +291,11 @@ ./programs/quark-goldleaf.nix ./programs/regreet.nix ./programs/rog-control-center.nix + ./programs/rush.nix ./programs/rust-motd.nix ./programs/ryzen-monitor-ng.nix - ./programs/screen.nix ./programs/schroot.nix + ./programs/screen.nix ./programs/seahorse.nix ./programs/sedutil.nix ./programs/shadow.nix @@ -313,6 +315,7 @@ ./programs/system-config-printer.nix ./programs/systemtap.nix ./programs/tcpdump.nix + ./programs/television.nix ./programs/thefuck.nix ./programs/thunar.nix ./programs/thunderbird.nix @@ -328,8 +331,9 @@ ./programs/vivid.nix ./programs/wavemon.nix ./programs/wayland/cardboard.nix - ./programs/wayland/hyprlock.nix + ./programs/wayland/gtklock.nix ./programs/wayland/hyprland.nix + ./programs/wayland/hyprlock.nix ./programs/wayland/labwc.nix ./programs/wayland/miracle-wm.nix ./programs/wayland/niri.nix @@ -341,8 +345,8 @@ ./programs/weylus.nix ./programs/winbox.nix ./programs/wireshark.nix - ./programs/xastir.nix ./programs/wshowkeys.nix + ./programs/xastir.nix ./programs/xfconf.nix ./programs/xfs_quota.nix ./programs/xonsh.nix @@ -361,11 +365,13 @@ ./programs/zsh/zsh.nix ./rename.nix ./security/acme + ./security/agnos.nix ./security/apparmor.nix ./security/audit.nix ./security/auditd.nix ./security/ca.nix ./security/chromium-suid-sandbox.nix + ./security/default.nix ./security/dhparams.nix ./security/doas.nix ./security/duosec.nix @@ -383,8 +389,8 @@ ./security/rngd.nix ./security/rtkit.nix ./security/soteria.nix - ./security/sudo.nix ./security/sudo-rs.nix + ./security/sudo.nix ./security/systemd-confinement.nix ./security/tpm2.nix ./security/wrappers/default.nix @@ -407,6 +413,7 @@ ./services/audio/icecast.nix ./services/audio/jack.nix ./services/audio/jmusicbot.nix + ./services/audio/lavalink.nix ./services/audio/liquidsoap.nix ./services/audio/marytts.nix ./services/audio/mopidy.nix @@ -434,13 +441,14 @@ ./services/backup/duplicati.nix ./services/backup/duplicity.nix ./services/backup/mysql-backup.nix + ./services/backup/pgbackrest.nix ./services/backup/postgresql-backup.nix ./services/backup/postgresql-wal-receiver.nix - ./services/backup/snapraid.nix ./services/backup/restic-rest-server.nix ./services/backup/restic.nix ./services/backup/rsnapshot.nix ./services/backup/sanoid.nix + ./services/backup/snapraid.nix ./services/backup/syncoid.nix ./services/backup/tarsnap.nix ./services/backup/tsm.nix @@ -501,8 +509,8 @@ ./services/databases/firebird.nix ./services/databases/foundationdb.nix ./services/databases/hbase-standalone.nix - ./services/databases/influxdb.nix ./services/databases/influxdb2.nix + ./services/databases/influxdb.nix ./services/databases/lldap.nix ./services/databases/memcached.nix ./services/databases/monetdb.nix @@ -513,6 +521,7 @@ ./services/databases/opentsdb.nix ./services/databases/pgbouncer.nix ./services/databases/pgmanage.nix + ./services/databases/postgres-websockets.nix ./services/databases/postgresql.nix ./services/databases/postgrest.nix ./services/databases/redis.nix @@ -526,16 +535,14 @@ ./services/desktops/blueman.nix ./services/desktops/bonsaid.nix ./services/desktops/cpupower-gui.nix - ./services/desktops/deepin/deepin-anything.nix - ./services/desktops/deepin/dde-api.nix ./services/desktops/deepin/app-services.nix + ./services/desktops/deepin/dde-api.nix ./services/desktops/deepin/dde-daemon.nix - ./services/desktops/dleyna-renderer.nix - ./services/desktops/dleyna-server.nix + ./services/desktops/deepin/deepin-anything.nix + ./services/desktops/dleyna.nix ./services/desktops/espanso.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix - ./services/desktops/playerctld.nix ./services/desktops/gnome/at-spi2-core.nix ./services/desktops/gnome/evolution-data-server.nix ./services/desktops/gnome/glib-networking.nix @@ -551,16 +558,16 @@ ./services/desktops/gnome/rygel.nix ./services/desktops/gnome/sushi.nix ./services/desktops/gnome/tinysparql.nix - ./services/desktops/gsignond.nix ./services/desktops/gvfs.nix ./services/desktops/malcontent.nix ./services/desktops/neard.nix ./services/desktops/pipewire/pipewire.nix ./services/desktops/pipewire/wireplumber.nix + ./services/desktops/playerctld.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/seatd.nix - ./services/desktops/system-config-printer.nix ./services/desktops/system76-scheduler.nix + ./services/desktops/system-config-printer.nix ./services/desktops/telepathy.nix ./services/desktops/tumbler.nix ./services/desktops/wlock.nix @@ -579,11 +586,11 @@ ./services/development/rstudio-server/default.nix ./services/development/vsmartcard-vpcd.nix ./services/development/zammad.nix - ./services/display-managers/default.nix ./services/display-managers/cosmic-greeter.nix + ./services/display-managers/default.nix ./services/display-managers/greetd.nix - ./services/display-managers/sddm.nix ./services/display-managers/ly.nix + ./services/display-managers/sddm.nix ./services/editors/emacs.nix ./services/editors/haste.nix ./services/editors/infinoted.nix @@ -597,7 +604,6 @@ ./services/games/archisteamfarm.nix ./services/games/armagetronad.nix ./services/games/crossfire-server.nix - ./services/games/deliantra-server.nix ./services/games/factorio.nix ./services/games/freeciv.nix ./services/games/mchprs.nix @@ -636,15 +642,17 @@ ./services/hardware/irqbalance.nix ./services/hardware/joycond.nix ./services/hardware/kanata.nix + ./services/hardware/keyd.nix ./services/hardware/kmonad.nix ./services/hardware/lcd.nix ./services/hardware/libinput.nix ./services/hardware/lirc.nix - ./services/hardware/nvidia-container-toolkit ./services/hardware/monado.nix + ./services/hardware/nvidia-container-toolkit ./services/hardware/nvidia-optimus.nix ./services/hardware/openrgb.nix ./services/hardware/pcscd.nix + ./services/hardware/pid-fan-controller.nix ./services/hardware/pommed.nix ./services/hardware/power-profiles-daemon.nix ./services/hardware/powerstation.nix @@ -672,7 +680,6 @@ ./services/hardware/usbmuxd.nix ./services/hardware/usbrelayd.nix ./services/hardware/vdr.nix - ./services/hardware/keyd.nix ./services/home-automation/ebusd.nix ./services/home-automation/esphome.nix ./services/home-automation/evcc.nix @@ -684,9 +691,8 @@ ./services/home-automation/wyoming/piper.nix ./services/home-automation/wyoming/satellite.nix ./services/home-automation/zigbee2mqtt.nix - ./services/home-automation/zwave-js.nix ./services/home-automation/zwave-js-ui.nix - ./services/logging/SystemdJournal2Gelf.nix + ./services/home-automation/zwave-js.nix ./services/logging/awstats.nix ./services/logging/filebeat.nix ./services/logging/fluentd.nix @@ -703,10 +709,10 @@ ./services/logging/rsyslogd.nix ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix - ./services/logging/vector.nix + ./services/logging/SystemdJournal2Gelf.nix ./services/logging/ulogd.nix + ./services/logging/vector.nix ./services/mail/automx2.nix - ./services/mail/clamsmtp.nix ./services/mail/cyrus-imap.nix ./services/mail/davmail.nix ./services/mail/dkimproxy-out.nix @@ -734,8 +740,8 @@ ./services/mail/protonmail-bridge.nix ./services/mail/public-inbox.nix ./services/mail/roundcube.nix - ./services/mail/rspamd.nix ./services/mail/rspamd-trainer.nix + ./services/mail/rspamd.nix ./services/mail/rss2email.nix ./services/mail/schleuder.nix ./services/mail/spamassassin.nix @@ -745,10 +751,11 @@ ./services/matrix/appservice-discord.nix ./services/matrix/appservice-irc.nix ./services/matrix/conduit.nix - ./services/matrix/conduwuit.nix + ./services/matrix/continuwuity.nix ./services/matrix/dendrite.nix ./services/matrix/hebbot.nix ./services/matrix/hookshot.nix + ./services/matrix/lk-jwt-service.nix ./services/matrix/matrix-alertmanager.nix ./services/matrix/maubot.nix ./services/matrix/mautrix-meta.nix @@ -758,8 +765,8 @@ ./services/matrix/mjolnir.nix ./services/matrix/mx-puppet-discord.nix ./services/matrix/pantalaimon.nix - ./services/matrix/synapse.nix ./services/matrix/synapse-auto-compressor.nix + ./services/matrix/synapse.nix ./services/misc/airsonic.nix ./services/misc/amazon-ssm-agent.nix ./services/misc/ananicy.nix @@ -794,6 +801,7 @@ ./services/misc/domoticz.nix ./services/misc/duckdns.nix ./services/misc/duckling.nix + ./services/misc/dump1090-fa.nix ./services/misc/dwm-status.nix ./services/misc/dysnomia.nix ./services/misc/errbot.nix @@ -882,8 +890,8 @@ ./services/misc/redlib.nix ./services/misc/redmine.nix ./services/misc/renovate.nix - ./services/misc/rmfakecloud.nix ./services/misc/rkvm.nix + ./services/misc/rmfakecloud.nix ./services/misc/rshim.nix ./services/misc/safeeyes.nix ./services/misc/sdrplay.nix @@ -895,7 +903,6 @@ ./services/misc/servarr/whisparr.nix ./services/misc/serviio.nix ./services/misc/sickbeard.nix - ./services/misc/signald.nix ./services/misc/siproxd.nix ./services/misc/snapper.nix ./services/misc/soft-serve.nix @@ -911,20 +918,21 @@ ./services/misc/sysprof.nix ./services/misc/tabby.nix ./services/misc/tandoor-recipes.nix - ./services/misc/taskserver ./services/misc/taskchampion-sync-server.nix + ./services/misc/taskserver ./services/misc/tautulli.nix ./services/misc/tiddlywiki.nix ./services/misc/tp-auto-kbbl.nix + ./services/misc/transfer-sh.nix ./services/misc/turn-rs.nix ./services/misc/tuxclocker.nix - ./services/misc/transfer-sh.nix ./services/misc/tzupdate.nix ./services/misc/uhub.nix ./services/misc/wastebin.nix ./services/misc/weechat.nix ./services/misc/workout-tracker.nix ./services/misc/xmrig.nix + ./services/misc/yarr.nix ./services/misc/ytdl-sub.nix ./services/misc/zoneminder.nix ./services/misc/zookeeper.nix @@ -978,6 +986,7 @@ ./services/monitoring/pgscv.nix ./services/monitoring/prometheus/alertmanager-gotify-bridge.nix ./services/monitoring/prometheus/alertmanager-irc-relay.nix + ./services/monitoring/prometheus/alertmanager-ntfy.nix ./services/monitoring/prometheus/alertmanager-webhook-logger.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/default.nix @@ -1020,11 +1029,11 @@ ./services/network-filesystems/drbd.nix ./services/network-filesystems/eris-server.nix ./services/network-filesystems/glusterfs.nix + ./services/network-filesystems/ipfs-cluster.nix ./services/network-filesystems/kbfs.nix ./services/network-filesystems/kubo.nix ./services/network-filesystems/litestream/default.nix ./services/network-filesystems/moosefs.nix - ./services/network-filesystems/ipfs-cluster.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix ./services/network-filesystems/openafs/client.nix @@ -1046,12 +1055,15 @@ ./services/networking/adguardhome.nix ./services/networking/alice-lg.nix ./services/networking/amuled.nix + ./services/networking/anubis.nix ./services/networking/aria2.nix ./services/networking/asterisk.nix ./services/networking/atftpd.nix ./services/networking/atticd.nix ./services/networking/autossh.nix ./services/networking/avahi-daemon.nix + ./services/networking/ax25/axlisten.nix + ./services/networking/ax25/axports.nix ./services/networking/babeld.nix ./services/networking/bee.nix ./services/networking/biboumi.nix @@ -1063,6 +1075,7 @@ ./services/networking/bitlbee.nix ./services/networking/blockbook-frontend.nix ./services/networking/blocky.nix + ./services/networking/cato-client.nix ./services/networking/centrifugo.nix ./services/networking/cgit.nix ./services/networking/charybdis.nix @@ -1070,8 +1083,8 @@ ./services/networking/cjdns.nix ./services/networking/clatd.nix ./services/networking/cloudflare-dyndns.nix - ./services/networking/cloudflared.nix ./services/networking/cloudflare-warp.nix + ./services/networking/cloudflared.nix ./services/networking/cntlm.nix ./services/networking/connman.nix ./services/networking/consul.nix @@ -1083,9 +1096,9 @@ ./services/networking/croc.nix ./services/networking/dae.nix ./services/networking/dante.nix - ./services/networking/deconz.nix ./services/networking/ddclient.nix ./services/networking/ddns-updater.nix + ./services/networking/deconz.nix ./services/networking/dhcpcd.nix ./services/networking/dnscache.nix ./services/networking/dnscrypt-proxy2.nix @@ -1107,9 +1120,9 @@ ./services/networking/ferm.nix ./services/networking/firefox-syncserver.nix ./services/networking/fireqos.nix - ./services/networking/firewall.nix ./services/networking/firewall-iptables.nix ./services/networking/firewall-nftables.nix + ./services/networking/firewall.nix ./services/networking/firezone/gateway.nix ./services/networking/firezone/gui-client.nix ./services/networking/firezone/headless-client.nix @@ -1120,6 +1133,7 @@ ./services/networking/freeradius.nix ./services/networking/frp.nix ./services/networking/frr.nix + ./services/networking/g3proxy.nix ./services/networking/gateone.nix ./services/networking/gdomap.nix ./services/networking/ghostunnel.nix @@ -1132,11 +1146,12 @@ ./services/networking/go-neb.nix ./services/networking/go-shadowsocks2.nix ./services/networking/gobgpd.nix + ./services/networking/godns.nix ./services/networking/gokapi.nix ./services/networking/gvpe.nix ./services/networking/hans.nix - ./services/networking/harmonia.nix ./services/networking/haproxy.nix + ./services/networking/harmonia.nix ./services/networking/headscale.nix ./services/networking/hickory-dns.nix ./services/networking/hostapd.nix @@ -1167,18 +1182,19 @@ ./services/networking/kea.nix ./services/networking/keepalived/default.nix ./services/networking/keybase.nix + ./services/networking/kismet.nix ./services/networking/knot.nix ./services/networking/kresd.nix ./services/networking/lambdabot.nix ./services/networking/legit.nix ./services/networking/libreswan.nix + ./services/networking/livekit.nix ./services/networking/lldpd.nix ./services/networking/logmein-hamachi.nix ./services/networking/lokinet.nix ./services/networking/lxd-image-server.nix ./services/networking/magic-wormhole-mailbox-server.nix ./services/networking/matterbridge.nix - ./services/networking/mptcpd.nix ./services/networking/microsocks.nix ./services/networking/mihomo.nix ./services/networking/minidlna.nix @@ -1191,6 +1207,7 @@ ./services/networking/morty.nix ./services/networking/mosquitto.nix ./services/networking/mozillavpn.nix + ./services/networking/mptcpd.nix ./services/networking/mstpd.nix ./services/networking/mtprotoproxy.nix ./services/networking/mtr-exporter.nix @@ -1200,9 +1217,9 @@ ./services/networking/mycelium.nix ./services/networking/namecoind.nix ./services/networking/nar-serve.nix - ./services/networking/nat.nix ./services/networking/nat-iptables.nix ./services/networking/nat-nftables.nix + ./services/networking/nat.nix ./services/networking/nats.nix ./services/networking/nbd.nix ./services/networking/ncdns.nix @@ -1221,15 +1238,15 @@ ./services/networking/nix-serve.nix ./services/networking/nix-store-gcs-proxy.nix ./services/networking/nixops-dns.nix + ./services/networking/nm-file-secret-agent.nix ./services/networking/nncp.nix ./services/networking/nntp-proxy.nix - ./services/networking/nm-file-secret-agent.nix ./services/networking/nomad.nix ./services/networking/nsd.nix ./services/networking/ntopng.nix ./services/networking/ntp/chrony.nix - ./services/networking/ntp/ntpd.nix ./services/networking/ntp/ntpd-rs.nix + ./services/networking/ntp/ntpd.nix ./services/networking/ntp/openntpd.nix ./services/networking/nullidentdmod.nix ./services/networking/nylon.nix @@ -1243,19 +1260,18 @@ ./services/networking/openvpn.nix ./services/networking/ostinato.nix ./services/networking/owamp.nix - ./services/networking/pyload.nix ./services/networking/pdns-recursor.nix ./services/networking/pdnsd.nix ./services/networking/peroxide.nix ./services/networking/picosnitch.nix ./services/networking/pixiecore.nix ./services/networking/pleroma.nix - ./services/networking/polipo.nix ./services/networking/powerdns.nix ./services/networking/pppd.nix ./services/networking/pptpd.nix ./services/networking/privoxy.nix ./services/networking/prosody.nix + ./services/networking/pyload.nix ./services/networking/quassel.nix ./services/networking/quicktun.nix ./services/networking/quorum.nix @@ -1274,19 +1290,19 @@ ./services/networking/rpcbind.nix ./services/networking/rxe.nix ./services/networking/sabnzbd.nix - ./services/networking/scion/scion.nix ./services/networking/scion/scion-control.nix ./services/networking/scion/scion-daemon.nix ./services/networking/scion/scion-dispatcher.nix - ./services/networking/scion/scion-router.nix ./services/networking/scion/scion-ip-gateway.nix + ./services/networking/scion/scion-router.nix + ./services/networking/scion/scion.nix ./services/networking/seafile.nix ./services/networking/searx.nix ./services/networking/shadowsocks.nix ./services/networking/shairport-sync.nix ./services/networking/shellhub-agent.nix - ./services/networking/shorewall.nix ./services/networking/shorewall6.nix + ./services/networking/shorewall.nix ./services/networking/sing-box.nix ./services/networking/sitespeed-io.nix ./services/networking/skydns.nix @@ -1300,7 +1316,6 @@ ./services/networking/spacecookie.nix ./services/networking/spiped.nix ./services/networking/squid.nix - ./services/networking/g3proxy.nix ./services/networking/ssh/sshd.nix ./services/networking/sslh.nix ./services/networking/strongswan-swanctl/module.nix @@ -1314,9 +1329,9 @@ ./services/networking/syncplay.nix ./services/networking/syncthing-relay.nix ./services/networking/syncthing.nix - ./services/networking/tailscale.nix ./services/networking/tailscale-auth.nix ./services/networking/tailscale-derper.nix + ./services/networking/tailscale.nix ./services/networking/tayga.nix ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix @@ -1341,40 +1356,41 @@ ./services/networking/uptermd.nix ./services/networking/v2ray.nix ./services/networking/v2raya.nix - ./services/networking/veilid.nix ./services/networking/vdirsyncer.nix + ./services/networking/veilid.nix ./services/networking/vsftpd.nix + ./services/networking/vwifi.nix ./services/networking/wasabibackend.nix + ./services/networking/webhook.nix ./services/networking/websockify.nix ./services/networking/wg-access-server.nix ./services/networking/wg-netmanager.nix - ./services/networking/whoogle-search.nix - ./services/networking/wvdial.nix - ./services/networking/webhook.nix ./services/networking/wg-quick.nix ./services/networking/wgautomesh.nix - ./services/networking/wireguard.nix + ./services/networking/whoogle-search.nix ./services/networking/wireguard-networkd.nix + ./services/networking/wireguard.nix ./services/networking/wpa_supplicant.nix ./services/networking/wstunnel.nix + ./services/networking/wvdial.nix ./services/networking/x2goserver.nix ./services/networking/xandikos.nix ./services/networking/xinetd.nix ./services/networking/xl2tpd.nix ./services/networking/xray.nix ./services/networking/xrdp.nix + ./services/networking/yggdrasil-jumper.nix ./services/networking/yggdrasil.nix ./services/networking/zapret.nix - ./services/networking/yggdrasil-jumper.nix - ./services/networking/zerobin.nix ./services/networking/zenohd.nix + ./services/networking/zerobin.nix ./services/networking/zeronet.nix - ./services/networking/zerotierone.nix ./services/networking/zeronsd.nix + ./services/networking/zerotierone.nix ./services/networking/znc/default.nix + ./services/printing/cups-pdf.nix ./services/printing/cupsd.nix ./services/printing/ipp-usb.nix - ./services/printing/cups-pdf.nix ./services/scheduling/atd.nix ./services/scheduling/cron.nix ./services/scheduling/fcron.nix @@ -1398,6 +1414,7 @@ ./services/security/certmgr.nix ./services/security/cfssl.nix ./services/security/clamav.nix + ./services/security/e-imzo.nix ./services/security/endlessh-go.nix ./services/security/endlessh.nix ./services/security/esdm.nix @@ -1413,12 +1430,14 @@ ./services/security/kanidm.nix ./services/security/munge.nix ./services/security/nginx-sso.nix - ./services/security/oauth2-proxy.nix ./services/security/oauth2-proxy-nginx.nix + ./services/security/oauth2-proxy.nix + ./services/security/openbao.nix ./services/security/opensnitch.nix ./services/security/paretosecurity.nix ./services/security/pass-secret-service.nix ./services/security/physlock.nix + ./services/security/pocket-id.nix ./services/security/shibboleth-sp.nix ./services/security/sks.nix ./services/security/sshguard.nix @@ -1429,8 +1448,8 @@ ./services/security/torify.nix ./services/security/torsocks.nix ./services/security/usbguard.nix - ./services/security/vault.nix ./services/security/vault-agent.nix + ./services/security/vault.nix ./services/security/vaultwarden/default.nix ./services/security/yubikey-agent.nix ./services/system/automatic-timezoned.nix @@ -1461,48 +1480,49 @@ ./services/torrent/opentracker.nix ./services/torrent/peerflix.nix ./services/torrent/rtorrent.nix - ./services/torrent/transmission.nix ./services/torrent/torrentstream.nix + ./services/torrent/transmission.nix ./services/tracing/tempo.nix ./services/ttys/getty.nix ./services/ttys/gpm.nix ./services/ttys/kmscon.nix ./services/video/epgstation/default.nix - ./services/video/go2rtc/default.nix ./services/video/frigate.nix + ./services/video/go2rtc/default.nix + ./services/video/mediamtx.nix ./services/video/mirakurun.nix ./services/video/photonvision.nix - ./services/video/mediamtx.nix ./services/video/ustreamer.nix ./services/video/v4l2-relayd.nix ./services/video/wivrn.nix ./services/wayland/cage.nix ./services/wayland/hypridle.nix ./services/web-apps/actual.nix - ./services/web-apps/akkoma.nix ./services/web-apps/agorakit.nix + ./services/web-apps/akkoma.nix ./services/web-apps/alps.nix ./services/web-apps/anuko-time-tracker.nix - ./services/web-apps/archtika.nix ./services/web-apps/artalk.nix ./services/web-apps/audiobookshelf.nix + ./services/web-apps/baikal.nix ./services/web-apps/bluemap.nix ./services/web-apps/bookstack.nix ./services/web-apps/c2fmzq-server.nix ./services/web-apps/calibre-web.nix ./services/web-apps/castopod.nix - ./services/web-apps/coder.nix ./services/web-apps/changedetection-io.nix ./services/web-apps/chatgpt-retrieval-plugin.nix ./services/web-apps/cloudlog.nix ./services/web-apps/code-server.nix + ./services/web-apps/coder.nix ./services/web-apps/collabora-online.nix ./services/web-apps/commafeed.nix ./services/web-apps/convos.nix + ./services/web-apps/cook-cli.nix ./services/web-apps/crabfit.nix - ./services/web-apps/davis.nix ./services/web-apps/cryptpad.nix ./services/web-apps/dashy.nix + ./services/web-apps/davis.nix ./services/web-apps/dependency-track.nix ./services/web-apps/dex.nix ./services/web-apps/discourse.nix @@ -1515,8 +1535,8 @@ ./services/web-apps/ethercalc.nix ./services/web-apps/fider.nix ./services/web-apps/filesender.nix - ./services/web-apps/firefly-iii.nix ./services/web-apps/firefly-iii-data-importer.nix + ./services/web-apps/firefly-iii.nix ./services/web-apps/flarum.nix ./services/web-apps/fluidd.nix ./services/web-apps/freshrss.nix @@ -1526,13 +1546,11 @@ ./services/web-apps/gerrit.nix ./services/web-apps/glance.nix ./services/web-apps/glitchtip.nix + ./services/web-apps/goatcounter.nix ./services/web-apps/gotify-server.nix ./services/web-apps/gotosocial.nix ./services/web-apps/grav.nix ./services/web-apps/grocy.nix - ./services/web-apps/part-db.nix - ./services/web-apps/pixelfed.nix - ./services/web-apps/goatcounter.nix ./services/web-apps/guacamole-client.nix ./services/web-apps/guacamole-server.nix ./services/web-apps/hatsu.nix @@ -1546,15 +1564,16 @@ ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ifm.nix - ./services/web-apps/immich.nix ./services/web-apps/immich-public-proxy.nix + ./services/web-apps/immich.nix ./services/web-apps/invidious.nix ./services/web-apps/invoiceplane.nix ./services/web-apps/isso.nix ./services/web-apps/jirafeau.nix ./services/web-apps/jitsi-meet.nix - ./services/web-apps/kasmweb/default.nix ./services/web-apps/kanboard.nix + ./services/web-apps/karakeep.nix + ./services/web-apps/kasmweb/default.nix ./services/web-apps/kavita.nix ./services/web-apps/keycloak.nix ./services/web-apps/kimai.nix @@ -1567,39 +1586,44 @@ ./services/web-apps/matomo.nix ./services/web-apps/mattermost.nix ./services/web-apps/mealie.nix + ./services/web-apps/mediagoblin.nix ./services/web-apps/mediawiki.nix ./services/web-apps/meme-bingo-web.nix ./services/web-apps/microbin.nix ./services/web-apps/miniflux.nix ./services/web-apps/misskey.nix + ./services/web-apps/mobilizon.nix ./services/web-apps/monica.nix ./services/web-apps/moodle.nix ./services/web-apps/movim.nix ./services/web-apps/netbox.nix - ./services/web-apps/nextcloud.nix ./services/web-apps/nextcloud-notify_push.nix ./services/web-apps/nextcloud-whiteboard-server.nix + ./services/web-apps/nextcloud.nix ./services/web-apps/nextjs-ollama-llm-ui.nix ./services/web-apps/nexus.nix ./services/web-apps/nifi.nix ./services/web-apps/node-red.nix ./services/web-apps/nostr-rs-relay.nix ./services/web-apps/ocis.nix + ./services/web-apps/olivetin.nix + ./services/web-apps/oncall.nix ./services/web-apps/onlyoffice.nix - ./services/web-apps/openvscode-server.nix - ./services/web-apps/mediagoblin.nix ./services/web-apps/open-web-calendar.nix - ./services/web-apps/mobilizon.nix + ./services/web-apps/opencloud.nix + ./services/web-apps/openvscode-server.nix ./services/web-apps/openwebrx.nix ./services/web-apps/outline.nix + ./services/web-apps/part-db.nix ./services/web-apps/pds.nix ./services/web-apps/peering-manager.nix ./services/web-apps/peertube.nix ./services/web-apps/pgpkeyserver-lite.nix - ./services/web-apps/phylactery.nix ./services/web-apps/photoprism.nix + ./services/web-apps/phylactery.nix ./services/web-apps/pict-rs.nix ./services/web-apps/pingvin-share.nix + ./services/web-apps/pixelfed.nix ./services/web-apps/plantuml-server.nix ./services/web-apps/plausible.nix ./services/web-apps/porn-vault/default.nix @@ -1608,29 +1632,31 @@ ./services/web-apps/pretix.nix ./services/web-apps/privatebin.nix ./services/web-apps/prosody-filer.nix + ./services/web-apps/readeck.nix + ./services/web-apps/reposilite.nix ./services/web-apps/rimgo.nix + ./services/web-apps/rss-bridge.nix ./services/web-apps/rutorrent.nix ./services/web-apps/screego.nix - ./services/web-apps/sftpgo.nix - ./services/web-apps/strfry.nix - ./services/web-apps/suwayomi-server.nix - ./services/web-apps/readeck.nix - ./services/web-apps/rss-bridge.nix ./services/web-apps/selfoss.nix + ./services/web-apps/sftpgo.nix ./services/web-apps/shiori.nix ./services/web-apps/silverbullet.nix ./services/web-apps/simplesamlphp.nix ./services/web-apps/slskd.nix ./services/web-apps/snipe-it.nix ./services/web-apps/sogo.nix - ./services/web-apps/stirling-pdf.nix ./services/web-apps/stash.nix + ./services/web-apps/stirling-pdf.nix + ./services/web-apps/strfry.nix + ./services/web-apps/suwayomi-server.nix ./services/web-apps/trilium.nix ./services/web-apps/tt-rss.nix ./services/web-apps/vikunja.nix ./services/web-apps/wakapi.nix ./services/web-apps/weblate.nix ./services/web-apps/whitebophir.nix + ./services/web-apps/whoami.nix ./services/web-apps/wiki-js.nix ./services/web-apps/windmill.nix ./services/web-apps/wordpress.nix @@ -1719,10 +1745,10 @@ ./services/x11/xserver.nix ./system/activation/activatable-system.nix ./system/activation/activation-script.nix + ./system/activation/bootspec.nix ./system/activation/pre-switch-check.nix ./system/activation/specialisation.nix ./system/activation/switchable-system.nix - ./system/activation/bootspec.nix ./system/activation/top-level.nix ./system/boot/binfmt.nix ./system/boot/clevis.nix @@ -1734,37 +1760,36 @@ ./system/boot/kernel.nix ./system/boot/kexec.nix ./system/boot/loader/efi.nix + ./system/boot/loader/external/external.nix ./system/boot/loader/generations-dir/generations-dir.nix ./system/boot/loader/generic-extlinux-compatible ./system/boot/loader/grub/grub.nix ./system/boot/loader/grub/ipxe.nix ./system/boot/loader/grub/memtest.nix - ./system/boot/loader/external/external.nix ./system/boot/loader/init-script/init-script.nix ./system/boot/loader/limine/limine.nix ./system/boot/loader/loader.nix ./system/boot/loader/systemd-boot/systemd-boot.nix ./system/boot/luksroot.nix - ./system/boot/stratisroot.nix ./system/boot/modprobe.nix ./system/boot/networkd.nix - ./system/boot/uki.nix - ./system/boot/unl0kr.nix ./system/boot/plymouth.nix ./system/boot/resolved.nix ./system/boot/shutdown.nix ./system/boot/stage-1.nix ./system/boot/stage-2.nix + ./system/boot/stratisroot.nix ./system/boot/systemd.nix ./system/boot/systemd/coredump.nix ./system/boot/systemd/dm-verity.nix ./system/boot/systemd/fido2.nix + ./system/boot/systemd/homed.nix ./system/boot/systemd/initrd-secrets.nix ./system/boot/systemd/initrd.nix - ./system/boot/systemd/journald.nix ./system/boot/systemd/journald-gateway.nix ./system/boot/systemd/journald-remote.nix ./system/boot/systemd/journald-upload.nix + ./system/boot/systemd/journald.nix ./system/boot/systemd/logind.nix ./system/boot/systemd/nspawn.nix ./system/boot/systemd/oomd.nix @@ -1776,9 +1801,10 @@ ./system/boot/systemd/tpm2.nix ./system/boot/systemd/user.nix ./system/boot/systemd/userdbd.nix - ./system/boot/systemd/homed.nix ./system/boot/timesyncd.nix ./system/boot/tmp.nix + ./system/boot/uki.nix + ./system/boot/unl0kr.nix ./system/boot/uvesafb.nix ./system/etc/etc-activation.nix ./tasks/auto-upgrade.nix @@ -1802,8 +1828,8 @@ ./tasks/filesystems/ntfs.nix ./tasks/filesystems/overlayfs.nix ./tasks/filesystems/reiserfs.nix - ./tasks/filesystems/sshfs.nix ./tasks/filesystems/squashfs.nix + ./tasks/filesystems/sshfs.nix ./tasks/filesystems/unionfs-fuse.nix ./tasks/filesystems/vboxsf.nix ./tasks/filesystems/vfat.nix @@ -1830,19 +1856,19 @@ ./virtualisation/docker.nix ./virtualisation/ecs-agent.nix ./virtualisation/hyperv-guest.nix - ./virtualisation/incus.nix ./virtualisation/incus-agent.nix + ./virtualisation/incus.nix ./virtualisation/kvmgt.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix ./virtualisation/lxcfs.nix - ./virtualisation/lxd.nix ./virtualisation/lxd-agent.nix + ./virtualisation/lxd.nix ./virtualisation/multipass.nix ./virtualisation/nixos-containers.nix ./virtualisation/oci-containers.nix - ./virtualisation/openstack-options.nix ./virtualisation/oci-options.nix + ./virtualisation/openstack-options.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/podman/default.nix @@ -1857,6 +1883,7 @@ ./virtualisation/waydroid.nix ./virtualisation/xe-guest-utilities.nix ./virtualisation/xen-dom0.nix + # keep-sorted end { documentation.nixos.extraModules = [ ./virtualisation/qemu-vm.nix diff --git a/nixos/modules/profiles/nix-builder-vm.nix b/nixos/modules/profiles/nix-builder-vm.nix index 1f5eff8f133f..50dde02eef64 100644 --- a/nixos/modules/profiles/nix-builder-vm.nix +++ b/nixos/modules/profiles/nix-builder-vm.nix @@ -126,6 +126,20 @@ in # TODO system.switch.enable = false;? system.disableInstallerTools = true; + # Allow the system derivation to be substituted, so that + # users are less likely to run into a state where they need + # the builder running to build the builder if they just want + # to make a tweak that only affects the macOS side of things, + # like changing the QEMU args. + # + # TODO(winter): Move to qemu-vm? Trying it here for now as a + # low impact change that'll probably improve people's experience. + # + # (I have no clue what is going on in https://github.com/nix-darwin/nix-darwin/issues/1081 + # though, as this fix would only apply to one person in that thread... hopefully someone + # comes across with a reproducer if this doesn't do it.) + system.systemBuilderArgs.allowSubstitutes = true; + nix.settings = { min-free = cfg.min-free; @@ -163,7 +177,7 @@ in hostPkgs = config.virtualisation.host.pkgs; - script = hostPkgs.writeShellScriptBin "create-builder" ( + add-keys = hostPkgs.writeShellScriptBin "add-keys" ( '' set -euo pipefail '' @@ -191,10 +205,22 @@ in if ! ${hostPkgs.diffutils}/bin/cmp "''${PUBLIC_KEY}" ${publicKey}; then (set -x; sudo --reset-timestamp ${installCredentials} "''${KEYS}") fi - KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm} '' ); + run-builder = hostPkgs.writeShellScriptBin "run-builder" ('' + set -euo pipefail + KEYS="''${KEYS:-./keys}" + KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm} + ''); + + script = hostPkgs.writeShellScriptBin "create-builder" ('' + set -euo pipefail + export KEYS="''${KEYS:-./keys}" + ${lib.getExe add-keys} + ${lib.getExe run-builder} + ''); + in script.overrideAttrs (old: { pos = __curPos; # sets meta.position to point here; see script binding above for package definition @@ -205,6 +231,8 @@ in # Let users in the repl inspect the config nixosConfig = config; nixosOptions = options; + + inherit add-keys run-builder; }; }); diff --git a/nixos/modules/programs/amnezia-vpn.nix b/nixos/modules/programs/amnezia-vpn.nix index e2b49ebb6e7b..22db93bde51c 100644 --- a/nixos/modules/programs/amnezia-vpn.nix +++ b/nixos/modules/programs/amnezia-vpn.nix @@ -10,16 +10,24 @@ in { options.programs.amnezia-vpn = { enable = lib.mkEnableOption "The AmneziaVPN client"; + package = lib.mkPackageOption pkgs "amnezia-vpn" { }; }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.amnezia-vpn ]; - services.dbus.packages = [ pkgs.amnezia-vpn ]; + environment.systemPackages = [ cfg.package ]; + services.dbus.packages = [ cfg.package ]; services.resolved.enable = true; systemd = { - packages = [ pkgs.amnezia-vpn ]; - services."AmneziaVPN".wantedBy = [ "multi-user.target" ]; + packages = [ cfg.package ]; + services."AmneziaVPN" = { + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ + procps + iproute2 + sudo + ]; + }; }; }; diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 213f0d2698ae..05b41ae619fc 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -111,6 +111,20 @@ in internal = true; }; + logout = lib.mkOption { + # Reset the title bar when logging out. This protects against a remote + # NixOS system clobbering your local terminal's title bar when you SSH + # into the remote NixOS system and then log out. + # + # For more details, see: https://superuser.com/a/339946 + default = '' + printf '\e]0;\a' + ''; + description = '' + Shell script code called during login bash shell logout. + ''; + type = lib.types.lines; + }; }; }; @@ -197,6 +211,21 @@ in fi ''; + environment.etc.bash_logout.text = '' + # /etc/bash_logout: DO NOT EDIT -- this file has been generated automatically. + + # Only execute this file once per shell. + if [ -n "$__ETC_BASHLOGOUT_SOURCED" ] || [ -n "$NOSYSBASHLOGOUT" ]; then return; fi + __ETC_BASHLOGOUT_SOURCED=1 + + ${cfg.logout} + + # Read system-wide modifications. + if test -f /etc/bash_logout.local; then + . /etc/bash_logout.local + fi + ''; + # Configuration for readline in bash. We use "option default" # priority to allow user override using both .text and .source. environment.etc.inputrc.source = lib.mkOptionDefault ./inputrc; diff --git a/nixos/modules/programs/darling.nix b/nixos/modules/programs/darling.nix deleted file mode 100644 index fc9a56e1165b..000000000000 --- a/nixos/modules/programs/darling.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.programs.darling; -in -{ - options = { - programs.darling = { - enable = lib.mkEnableOption "Darling, a Darwin/macOS compatibility layer for Linux"; - package = lib.mkPackageOption pkgs "darling" { }; - }; - }; - - config = lib.mkIf cfg.enable { - security.wrappers.darling = { - source = lib.getExe cfg.package; - owner = "root"; - group = "root"; - setuid = true; - }; - }; -} diff --git a/nixos/modules/programs/direnv.nix b/nixos/modules/programs/direnv.nix index 751e279b47bc..2be2059bcca3 100644 --- a/nixos/modules/programs/direnv.nix +++ b/nixos/modules/programs/direnv.nix @@ -13,6 +13,7 @@ let default = true; example = false; }; + format = pkgs.formats.toml { }; in { options.programs.direnv = { @@ -25,6 +26,12 @@ in package = lib.mkPackageOption pkgs "direnv" { }; + finalPackage = lib.mkOption { + type = lib.types.package; + readOnly = true; + description = "The wrapped direnv package."; + }; + enableBashIntegration = enabledOption '' Bash integration ''; @@ -72,14 +79,47 @@ in ''; }; }; + + settings = lib.mkOption { + inherit (format) type; + default = { }; + example = lib.literalExpression '' + { + global = { + log_format = "-"; + log_filter = "^$"; + }; + } + ''; + description = '' + Direnv configuration. Refer to {manpage}`direnv.toml(1)`. + ''; + }; }; config = lib.mkIf cfg.enable { - programs = { + direnv = { + finalPackage = pkgs.symlinkJoin { + inherit (cfg.package) name; + paths = [ cfg.package ]; + # direnv has a fish library which automatically sources direnv for some reason + postBuild = '' + rm -rf "$out/share/fish" + ''; + meta.mainProgram = "direnv"; + }; + settings = lib.mkIf cfg.silent { + global = { + log_format = lib.mkDefault "-"; + log_filter = lib.mkDefault "^$"; + }; + }; + }; + zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration '' if ${lib.boolToString cfg.loadInNixShell} || printenv PATH | grep -vqc '/nix/store'; then - eval "$(${lib.getExe cfg.package} hook zsh)" + eval "$(${lib.getExe cfg.finalPackage} hook zsh)" fi ''; @@ -87,14 +127,13 @@ in #$IN_NIX_SHELL for "nix-shell" bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration '' if ${lib.boolToString cfg.loadInNixShell} || [ -z "$IN_NIX_SHELL$NIX_GCROOT$(printenv PATH | grep '/nix/store')" ] ; then - eval "$(${lib.getExe cfg.package} hook bash)" + eval "$(${lib.getExe cfg.finalPackage} hook bash)" fi ''; fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration '' - if ${lib.boolToString cfg.loadInNixShell}; - or printenv PATH | grep -vqc '/nix/store'; - ${lib.getExe cfg.package} hook fish | source + if ${lib.boolToString cfg.loadInNixShell}; or printenv PATH | grep -vqc '/nix/store'; + ${lib.getExe cfg.finalPackage} hook fish | source end ''; @@ -114,41 +153,33 @@ in environment = { systemPackages = [ - # direnv has a fish library which automatically sources direnv for some reason - # I don't see any harm in doing this if we're sourcing it with fish.interactiveShellInit - (pkgs.symlinkJoin { - inherit (cfg.package) name; - paths = [ cfg.package ]; - postBuild = '' - rm -rf $out/share/fish - ''; - }) + cfg.finalPackage ]; - variables = { - DIRENV_CONFIG = "/etc/direnv"; - DIRENV_LOG_FORMAT = lib.mkIf cfg.silent ""; - }; + variables.DIRENV_CONFIG = "/etc/direnv"; etc = { + "direnv/direnv.toml" = lib.mkIf (cfg.settings != { }) { + source = format.generate "direnv.toml" cfg.settings; + }; "direnv/direnvrc".text = '' ${lib.optionalString cfg.nix-direnv.enable '' #Load nix-direnv source ${cfg.nix-direnv.package}/share/nix-direnv/direnvrc ''} - #Load direnvrcExtra - ${cfg.direnvrcExtra} + #Load direnvrcExtra + ${cfg.direnvrcExtra} - #Load user-configuration if present (~/.direnvrc or ~/.config/direnv/direnvrc) - direnv_config_dir_home="''${DIRENV_CONFIG_HOME:-''${XDG_CONFIG_HOME:-$HOME/.config}/direnv}" - if [[ -f $direnv_config_dir_home/direnvrc ]]; then - source "$direnv_config_dir_home/direnvrc" >&2 - elif [[ -f $HOME/.direnvrc ]]; then - source "$HOME/.direnvrc" >&2 - fi + #Load user-configuration if present (~/.direnvrc or ~/.config/direnv/direnvrc) + direnv_config_dir_home="''${DIRENV_CONFIG_HOME:-''${XDG_CONFIG_HOME:-$HOME/.config}/direnv}" + if [[ -f $direnv_config_dir_home/direnvrc ]]; then + source "$direnv_config_dir_home/direnvrc" >&2 + elif [[ -f $HOME/.direnvrc ]]; then + source "$HOME/.direnvrc" >&2 + fi - unset direnv_config_dir_home + unset direnv_config_dir_home ''; "direnv/lib/zz-user.sh".text = '' diff --git a/nixos/modules/programs/flashprog.nix b/nixos/modules/programs/flashprog.nix index d7529575a3d3..89671fba08f3 100644 --- a/nixos/modules/programs/flashprog.nix +++ b/nixos/modules/programs/flashprog.nix @@ -20,6 +20,8 @@ in config = lib.mkIf cfg.enable { services.udev.packages = [ cfg.package ]; environment.systemPackages = [ cfg.package ]; + hardware.libjaylink.enable = true; + hardware.libftdi.enable = true; }; meta.maintainers = with lib.maintainers; [ felixsinger ]; diff --git a/nixos/modules/programs/iotop.nix b/nixos/modules/programs/iotop.nix index 39284e960923..1d18edf3d9f8 100644 --- a/nixos/modules/programs/iotop.nix +++ b/nixos/modules/programs/iotop.nix @@ -10,14 +10,17 @@ let in { options = { - programs.iotop.enable = lib.mkEnableOption "iotop + setcap wrapper"; + programs.iotop = { + enable = lib.mkEnableOption "iotop + setcap wrapper"; + package = lib.mkPackageOption pkgs "iotop" { example = "iotop-c"; }; + }; }; config = lib.mkIf cfg.enable { security.wrappers.iotop = { owner = "root"; group = "root"; capabilities = "cap_net_admin+p"; - source = "${pkgs.iotop}/bin/iotop"; + source = lib.getExe cfg.package; }; }; } diff --git a/nixos/modules/programs/k3b.nix b/nixos/modules/programs/k3b.nix index 6e39f18b6794..1352c88111ec 100644 --- a/nixos/modules/programs/k3b.nix +++ b/nixos/modules/programs/k3b.nix @@ -1,11 +1,53 @@ -{ lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { - imports = [ - (lib.mkRemovedOptionModule [ - "programs" - "k3b" - "enable" - ] "Please add kdePackages.k3b to environment.systemPackages instead") - ]; + options.programs.k3b = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable k3b, the KDE disk burning application. + + Additionally to installing `k3b` enabling this will + add `setuid` wrappers in `/run/wrappers/bin` + for both `cdrdao` and `cdrecord`. On first + run you must manually configure the path of `cdrdae` and + `cdrecord` to correspond to the appropriate paths under + `/run/wrappers/bin` in the "Setup External Programs" menu. + ''; + }; + }; + + config = lib.mkIf config.programs.k3b.enable { + + environment.systemPackages = with pkgs; [ + kdePackages.k3b + dvdplusrwtools + cdrdao + cdrtools + ]; + + security.wrappers = { + cdrdao = { + setuid = true; + owner = "root"; + group = "cdrom"; + permissions = "u+wrx,g+x"; + source = "${pkgs.cdrdao}/bin/cdrdao"; + }; + cdrecord = { + setuid = true; + owner = "root"; + group = "cdrom"; + permissions = "u+wrx,g+x"; + source = "${pkgs.cdrtools}/bin/cdrecord"; + }; + }; + + }; } diff --git a/nixos/modules/programs/kde-pim.nix b/nixos/modules/programs/kde-pim.nix index d0acaddd4b87..f00a316f20ff 100644 --- a/nixos/modules/programs/kde-pim.nix +++ b/nixos/modules/programs/kde-pim.nix @@ -33,8 +33,14 @@ in ++ lib.optionals cfg.kontact [ kontact ] - ++ lib.optionals cfg.merkuro [ - merkuro - ]; + ++ lib.optionals cfg.merkuro ( + [ + merkuro + ] + # Only needed when using the Merkuro Contacts widget in Plasma. + ++ lib.optionals config.services.desktopManager.plasma6.enable [ + kcontacts + ] + ); }; } diff --git a/nixos/modules/programs/nh.nix b/nixos/modules/programs/nh.nix index 21ffa5cc17d2..321893f4bd23 100644 --- a/nixos/modules/programs/nh.nix +++ b/nixos/modules/programs/nh.nix @@ -8,7 +8,10 @@ let cfg = config.programs.nh; in { - meta.maintainers = [ lib.maintainers.viperML ]; + meta.maintainers = with lib.maintainers; [ + NotAShelf + viperML + ]; options.programs.nh = { enable = lib.mkEnableOption "nh, yet another Nix CLI helper"; @@ -19,9 +22,18 @@ in type = lib.types.nullOr lib.types.path; default = null; description = '' - The path that will be used for the `FLAKE` environment variable. + The path that will be used for the `NH_FLAKE` environment variable. - `FLAKE` is used by nh as the default flake for performing actions, like `nh os switch`. + `NH_FLAKE` is used by nh as the default flake for performing actions, such as + `nh os switch`. This behaviour can be overriden per-command with environment + variables that will take priority. + + - `NH_OS_FLAKE`: will take priority for `nh os` commands. + - `NH_HOME_FLAKE`: will take priority for `nh home` commands. + - `NH_DARWIN_FLAKE`: will take priority for `nh darwin` commands. + + The formerly valid `FLAKE` is now deprecated by nh, and will cause hard errors + in future releases if `NH_FLAKE` is not set. ''; }; @@ -77,7 +89,7 @@ in environment = lib.mkIf cfg.enable { systemPackages = [ cfg.package ]; variables = lib.mkIf (cfg.flake != null) { - FLAKE = cfg.flake; + NH_FLAKE = cfg.flake; }; }; diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix index 84e17c65db82..e41742ac7e0d 100644 --- a/nixos/modules/programs/nix-ld.nix +++ b/nixos/modules/programs/nix-ld.nix @@ -22,7 +22,7 @@ in { meta.maintainers = [ lib.maintainers.mic92 ]; options.programs.nix-ld = { - enable = lib.mkEnableOption ''nix-ld, Documentation: ''; + enable = lib.mkEnableOption ''nix-ld, Documentation: ''; package = lib.mkPackageOption pkgs "nix-ld" { }; libraries = lib.mkOption { type = lib.types.listOf lib.types.package; diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix index 27a95dea57e2..285e0a896280 100644 --- a/nixos/modules/programs/nm-applet.nix +++ b/nixos/modules/programs/nm-applet.nix @@ -28,6 +28,7 @@ description = "Network manager applet"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}"; }; diff --git a/nixos/modules/programs/regreet.nix b/nixos/modules/programs/regreet.nix index d865b1008b45..d3990a9fbf49 100644 --- a/nixos/modules/programs/regreet.nix +++ b/nixos/modules/programs/regreet.nix @@ -7,6 +7,7 @@ let cfg = config.programs.regreet; settingsFormat = pkgs.formats.toml { }; + user = config.services.greetd.settings.default_session.user; in { options.programs.regreet = { @@ -25,7 +26,10 @@ in ''; }; - package = lib.mkPackageOption pkgs [ "greetd" "regreet" ] { }; + package = lib.mkPackageOption pkgs [ + "greetd" + "regreet" + ] { }; settings = lib.mkOption { type = settingsFormat.type; @@ -157,14 +161,19 @@ in "greetd/regreet.css" = if lib.isPath cfg.extraCss then { source = cfg.extraCss; } else { text = cfg.extraCss; }; - "greetd/regreet.toml".source = settingsFormat.generate "regreet.toml" cfg.settings; + "greetd/regreet.toml".source = + if lib.isPath cfg.settings then + cfg.settings + else + settingsFormat.generate "regreet.toml" cfg.settings; }; systemd.tmpfiles.settings."10-regreet" = let defaultConfig = { - user = "greeter"; - group = config.users.users.${config.services.greetd.settings.default_session.user}.group; + inherit user; + group = + if config.users.users.${user}.group != "" then config.users.users.${user}.group else "greeter"; mode = "0755"; }; dataDir = @@ -177,5 +186,12 @@ in "/var/log/regreet".d = defaultConfig; } // dataDir; + + assertions = [ + { + assertion = (config.users.users.${user} or { }) != { }; + message = "regreet: user ${user} does not exist. Please create it before referencing it."; + } + ]; }; } diff --git a/nixos/modules/programs/rush.nix b/nixos/modules/programs/rush.nix new file mode 100644 index 000000000000..782e6da2c2a3 --- /dev/null +++ b/nixos/modules/programs/rush.nix @@ -0,0 +1,109 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.rush; + + indent = + lines: + lib.pipe lines [ + (lib.splitString "\n") + (builtins.filter (line: line != "")) + (map (line: " " + line)) + (builtins.concatStringsSep "\n") + ]; +in +{ + meta.maintainers = pkgs.rush.meta.maintainers; + + options.programs.rush = with lib.types; { + enable = lib.mkEnableOption "Restricted User Shell."; + + package = lib.mkPackageOption pkgs "rush" { } // { + type = shellPackage; + }; + + global = lib.mkOption { + type = lines; + description = "The `global` statement defines global settings."; + default = ""; + }; + + rules = lib.mkOption { + type = attrsOf lines; + default = { }; + + description = '' + The rule statement configures a GNU Rush rule. This is a block statement, which means that all + statements located between it and the next rule statement (or end of file, whichever occurs first) + modify the definition of that rule. + ''; + }; + + shell = lib.mkOption { + readOnly = true; + type = either shellPackage path; + + description = '' + The resolved shell path that users can inherit to set `rush` as their login shell. + This is a convenience option for use in user definitions. Example: + `users.users.alice = { inherit (config.programs.rush) shell; ... };` + ''; + }; + + wrap = lib.mkOption { + type = bool; + default = config.security.enableWrappers; + defaultText = lib.literalExpression "config.security.enableWrappers"; + + description = '' + Whether to wrap the `rush` binary with a SUID-enabled wrapper. + This is required if {option}`security.enableWrappers` is enabled in your configuration. + ''; + }; + }; + + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + (lib.mkIf cfg.wrap { + security.wrappers.rush = lib.mkDefault { + group = "root"; + owner = "root"; + permissions = "u+rx,g+x,o+x"; + setgid = false; + setuid = true; + source = lib.getExe cfg.package; + }; + }) + + { + programs.rush.shell = if cfg.wrap then config.security.wrapperDir + "/rush" else cfg.package; + + environment = { + shells = [ cfg.shell ]; + systemPackages = [ cfg.package ]; + + etc."rush.rc".text = + lib.pipe + [ + "# This file was created by the module `programs.rush`;" + "rush 2.0" + (lib.optionalString (cfg.global != "") "global\n${indent cfg.global}") + (lib.optionals (cfg.rules != { }) ( + lib.mapAttrsToList (name: content: "rule ${name}\n${indent content}") cfg.rules + )) + ] + [ + (lib.flatten) + (builtins.filter (line: line != "")) + (builtins.concatStringsSep "\n\n") + (lib.mkDefault) + ]; + }; + } + ] + ); +} diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index fbc59c09a68f..27a56034d86c 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -49,6 +49,15 @@ in description = "Whether to configure SSH_ASKPASS in the environment."; }; + systemd-ssh-proxy.enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to enable systemd's ssh proxy plugin. + See {manpage}`systemd-ssh-proxy(1)`. + ''; + }; + askPassword = lib.mkOption { type = lib.types.str; default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; @@ -334,6 +343,11 @@ in # Generated options from other settings Host * + ${lib.optionalString cfg.systemd-ssh-proxy.enable '' + # See systemd-ssh-proxy(1) + Include ${config.systemd.package}/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf + ''} + GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles} ${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"} diff --git a/nixos/modules/programs/starship.nix b/nixos/modules/programs/starship.nix index 17a2cf9b8666..044054c5452f 100644 --- a/nixos/modules/programs/starship.nix +++ b/nixos/modules/programs/starship.nix @@ -65,6 +65,47 @@ in See https://starship.rs/config/#prompt for documentation. ''; }; + + transientPrompt = + let + mkTransientPromptOption = + side: + lib.mkOption { + type = + with lib.types; + nullOr (str // { description = "Fish shell code concatenated with \"\\n\""; }); + description = + let + function = "`starship_transient_${lib.optionalString (side == "right") "r"}prompt_func` function"; + in + '' + Fish code composing the body of the ${function}. The output of + this code will become the ${side} side of the transient prompt. + + Not setting this option (or setting it to `null`) will prevent + the ${function} from being generated. By default, the ${side} + prompt is ${if (side == "right") then "empty" else "a bold-green '❯' character"}. + ''; + example = "starship module ${if (side == "right") then "time" else "character"}"; + default = null; + }; + in + { + enable = lib.mkEnableOption '' + Starship's [transient prompt](https://starship.rs/advanced-config/#transientprompt-and-transientrightprompt-in-fish) + feature in `fish` shells. After a command has been entered, Starship + replaces the usual prompt with the terminal output of the commands + defined in the `programs.starship.transientPrompt.left` + and `programs.starship.transientPrompt.right` options. + + This option only works with `fish`, as `bash` requires a + [custom configuration](https://starship.rs/advanced-config/#transientprompt-and-transientrightprompt-in-bash) + involving [Ble.sh](https://github.com/akinomyoga/ble.sh), which can be + enabled with `programs.bash.blesh.enable`, but not configured using NixOS + ''; + left = mkTransientPromptOption "left"; + right = mkTransientPromptOption "right"; + }; }; config = lib.mkIf cfg.enable { @@ -90,7 +131,18 @@ in if not test -f "$HOME/.config/starship.toml"; set -x STARSHIP_CONFIG ${settingsFile} end + ${lib.optionalString (!isNull cfg.transientPrompt.left) '' + function starship_transient_prompt_func + ${cfg.transientPrompt.left} + end + ''} + ${lib.optionalString (!isNull cfg.transientPrompt.right) '' + function starship_transient_rprompt_func + ${cfg.transientPrompt.right} + end + ''} eval (${cfg.package}/bin/starship init fish) + ${lib.optionalString cfg.transientPrompt.enable "enable_transience"} end ''; diff --git a/nixos/modules/programs/television.nix b/nixos/modules/programs/television.nix new file mode 100644 index 000000000000..1989df2b925b --- /dev/null +++ b/nixos/modules/programs/television.nix @@ -0,0 +1,42 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib.options) mkEnableOption mkPackageOption; + inherit (lib.modules) mkIf; + inherit (lib.meta) getExe; + + cfg = config.programs.television; +in +{ + options.programs.television = { + enable = mkEnableOption "Blazingly fast general purpose fuzzy finder TUI"; + package = mkPackageOption pkgs "television" { }; + + enableBashIntegration = mkEnableOption "Bash integration"; + enableZshIntegration = mkEnableOption "Zsh integration"; + enableFishIntegration = mkEnableOption "Fish integration"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + programs = { + zsh.interactiveShellInit = mkIf cfg.enableZshIntegration '' + eval "$(${getExe cfg.package} init zsh)" + ''; + bash.interactiveShellInit = mkIf cfg.enableBashIntegration '' + eval "$(${getExe cfg.package} init bash)" + ''; + fish.interactiveShellInit = mkIf cfg.enableFishIntegration '' + ${getExe cfg.package} init fish | source + ''; + }; + + }; + + meta.maintainers = with lib.maintainers; [ pbek ]; +} diff --git a/nixos/modules/programs/wayland/gtklock.nix b/nixos/modules/programs/wayland/gtklock.nix new file mode 100644 index 000000000000..a3cef937ca83 --- /dev/null +++ b/nixos/modules/programs/wayland/gtklock.nix @@ -0,0 +1,78 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.gtklock; + configFormat = pkgs.formats.ini { + listToValue = builtins.concatStringsSep ";"; + }; + + inherit (lib) + types + mkOption + mkEnableOption + mkPackageOption + ; +in +{ + options.programs.gtklock = { + enable = mkEnableOption "gtklock, a GTK-based lockscreen for Wayland"; + + package = mkPackageOption pkgs "gtklock" { }; + + config = mkOption { + type = configFormat.type; + example = lib.literalExpression '' + { + main = { + idle-hide = true; + idle-timeout = 10; + }; + }''; + description = '' + Configuration for gtklock. + See [`gtklock(1)`](https://github.com/jovanlanik/gtklock/blob/master/man/gtklock.1.scd) man page for details. + ''; + }; + + style = mkOption { + type = with types; nullOr str; + default = null; + description = '' + CSS Stylesheet for gtklock. + See [gtklock's wiki](https://github.com/jovanlanik/gtklock/wiki#Styling) for details. + ''; + }; + + modules = mkOption { + type = with types; listOf package; + default = [ ]; + example = lib.literalExpression '' + with pkgs; [ + gtklock-playerctl-module + gtklock-powerbar-module + gtklock-userinfo-module + ]''; + description = "gtklock modules to load."; + }; + }; + + config = lib.mkIf cfg.enable { + programs.gtklock.config.main = { + style = lib.mkIf (cfg.style != null) "${pkgs.writeText "style.css" cfg.style}"; + + modules = lib.mkIf (cfg.modules != [ ]) ( + map (pkg: "${pkg}/lib/gtklock/${lib.removePrefix "gtklock-" pkg.pname}.so") cfg.modules + ); + }; + + environment.etc."xdg/gtklock/config.ini".source = configFormat.generate "config.ini" cfg.config; + + environment.systemPackages = [ cfg.package ]; + + security.pam.services.gtklock = { }; + }; +} diff --git a/nixos/modules/programs/wayland/waybar.nix b/nixos/modules/programs/wayland/waybar.nix index 074537ea9ed3..6e7199dbf425 100644 --- a/nixos/modules/programs/wayland/waybar.nix +++ b/nixos/modules/programs/wayland/waybar.nix @@ -16,13 +16,20 @@ in // lib.mkOption { apply = pkg: pkg.override { systemdSupport = true; }; }; + systemd.target = lib.mkOption { + type = lib.types.str; + description = '' + The systemd target that will automatically start the Waybar service. + ''; + default = "graphical-session.target"; + }; }; config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; systemd = { packages = [ cfg.package ]; - user.services.waybar.wantedBy = [ "graphical-session.target" ]; + user.services.waybar.wantedBy = [ cfg.systemd.target ]; }; }; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 49872bc7a96b..94e868dad32c 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -102,6 +102,10 @@ in "services" "chronos" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ + "services" + "clamsmtp" + ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "confluence" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements" ) @@ -193,6 +197,9 @@ in (mkRemovedOptionModule [ "services" "pantheon" "files" ] '' This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly. '') + (mkRemovedOptionModule [ "services" "polipo" ] '' + The polipo project is unmaintained and archived upstream. + '') (mkRemovedOptionModule [ "services" "prey" ] '' prey-bash-client is deprecated upstream '') @@ -299,6 +306,9 @@ in See https://www.isc.org/blogs/isc-dhcp-eol/ for details. Please switch to a different implementation like kea or dnsmasq. '') + (mkRemovedOptionModule [ "services" "gsignond" ] '' + The corresponding package was unmaintained, abandoned upstream, used outdated library and thus removed from nixpkgs. + '') (mkRemovedOptionModule [ "services" "haka" ] '' The corresponding package was broken and removed from nixpkgs. '') @@ -311,6 +321,14 @@ in (mkRemovedOptionModule [ "services" "rippleDataApi" ] '' The corresponding package was broken, abandoned upstream and thus removed from nixpkgs. '') + (mkRemovedOptionModule [ "services" "conduwuit" ] '' + The conduwuit project has been discontinued by upstream. + See https://github.com/NixOS/nixpkgs/pull/397902 for more information. + '') + (mkRemovedOptionModule [ "services" "signald" ] '' + The signald project is unmaintained and has long been incompatible with the + official Signal servers. + '') # Do NOT add any option renames here, see top of the file ]; diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 286814eaba8e..58ab3623223d 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -236,13 +236,16 @@ let # Create hashes for cert data directories based on configuration # Flags are separated to avoid collisions - hashData = with builtins; '' - ${lib.concatStringsSep " " data.extraLegoFlags} - - ${lib.concatStringsSep " " data.extraLegoRunFlags} - - ${lib.concatStringsSep " " data.extraLegoRenewFlags} - - ${toString acmeServer} ${toString data.dnsProvider} - ${toString data.ocspMustStaple} ${data.keyType} - ''; + hashData = + with builtins; + '' + ${lib.concatStringsSep " " data.extraLegoFlags} - + ${lib.concatStringsSep " " data.extraLegoRunFlags} - + ${lib.concatStringsSep " " data.extraLegoRenewFlags} - + ${toString acmeServer} ${toString data.dnsProvider} + ${toString data.ocspMustStaple} ${data.keyType} + '' + + (lib.optionalString (data.csr != null) (" - " + data.csr)); certDir = mkHash hashData; # TODO remove domainHash usage entirely. Waiting on go-acme/lego#1532 domainHash = mkHash "${lib.concatStringsSep " " extraDomains} ${data.domain}"; @@ -286,18 +289,24 @@ let "--accept-tos" # Checking the option is covered by the assertions "--path" "." - "-d" - data.domain "--email" data.email - "--key-type" - data.keyType ] ++ protocolOpts ++ lib.optionals (acmeServer != null) [ "--server" acmeServer ] + ++ lib.optionals (data.csr != null) [ + "--csr" + data.csr + ] + ++ lib.optionals (data.csr == null) [ + "--key-type" + data.keyType + "-d" + data.domain + ] ++ lib.concatMap (name: [ "-d" name @@ -327,6 +336,8 @@ let webroots = lib.remove null ( lib.unique (builtins.map (certAttrs: certAttrs.webroot) (lib.attrValues config.security.acme.certs)) ); + + certificateKey = if data.csrKey != null then "${data.csrKey}" else "certificates/${keyName}.key"; in { inherit accountHash cert selfsignedDeps; @@ -529,7 +540,7 @@ let # Check if we can renew. # We can only renew if the list of domains has not changed. # We also need an account key. Avoids #190493 - if cmp -s domainhash.txt certificates/domainhash.txt && [ -e 'certificates/${keyName}.key' ] && [ -e 'certificates/${keyName}.crt' ] && [ -n "$(find accounts -name '${data.email}.key')" ]; then + if cmp -s domainhash.txt certificates/domainhash.txt && [ -e '${certificateKey}' ] && [ -e 'certificates/${keyName}.crt' ] && [ -n "$(find accounts -name '${data.email}.key')" ]; then # Even if a cert is not expired, it may be revoked by the CA. # Try to renew, and silently fail if the cert is not expired. @@ -564,7 +575,7 @@ let touch out/renewed echo Installing new certificate cp -vp 'certificates/${keyName}.crt' out/fullchain.pem - cp -vp 'certificates/${keyName}.key' out/key.pem + cp -vp '${certificateKey}' out/key.pem cp -vp 'certificates/${keyName}.issuer.crt' out/chain.pem ln -sf fullchain.pem out/cert.pem cat out/key.pem out/fullchain.pem > out/full.pem @@ -845,6 +856,18 @@ let description = "Domain to fetch certificate for (defaults to the entry name)."; }; + csr = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "Path to a certificate signing request to apply when fetching the certificate."; + }; + + csrKey = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "Path to the private key to the matching certificate signing request."; + }; + extraDomainNames = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ ]; @@ -1113,6 +1136,17 @@ in used for variables suffixed by "_FILE". ''; } + + { + assertion = lib.all ( + certOpts: + (certOpts.csr == null && certOpts.csrKey == null) + || (certOpts.csr != null && certOpts.csrKey != null) + ) certs; + message = '' + When passing a certificate signing request both `security.acme.certs.${cert}.csr` and `security.acme.certs.${cert}.csrKey` need to be set. + ''; + } ]) cfg.certs )); diff --git a/nixos/modules/security/agnos.nix b/nixos/modules/security/agnos.nix new file mode 100644 index 000000000000..dbd93afdb263 --- /dev/null +++ b/nixos/modules/security/agnos.nix @@ -0,0 +1,314 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.security.agnos; + format = pkgs.formats.toml { }; + name = "agnos"; + stateDir = "/var/lib/${name}"; + + accountType = + let + inherit (lib) types mkOption; + in + types.submodule { + freeformType = format.type; + + options = { + email = mkOption { + type = types.str; + description = '' + Email associated with this account. + ''; + }; + private_key_path = mkOption { + type = types.str; + description = '' + Path of the PEM-encoded private key for this account. + Currently, only RSA keys are supported. + + If this path does not exist, then the behavior depends on `generateKeys.enable`. + When this option is `true`, + the key will be automatically generated and saved to this path. + When it is `false`, agnos will fail. + + If a relative path is specified, + the key will be looked up (or generated and saved to) under `${stateDir}`. + ''; + }; + certificates = mkOption { + type = types.listOf certificateType; + description = '' + Certificates for agnos to issue or renew. + ''; + }; + }; + }; + + certificateType = + let + inherit (lib) types literalExpression mkOption; + in + types.submodule { + freeformType = format.type; + + options = { + domains = mkOption { + type = types.listOf types.str; + description = '' + Domains the certificate represents + ''; + example = literalExpression ''["a.example.com", "b.example.com", "*b.example.com"]''; + }; + fullchain_output_file = mkOption { + type = types.str; + description = '' + Output path for the full chain including the acquired certificate. + If a relative path is specified, the file will be created in `${stateDir}`. + ''; + }; + key_output_file = mkOption { + type = types.str; + description = '' + Output path for the certificate private key. + If a relative path is specified, the file will be created in `${stateDir}`. + ''; + }; + }; + }; +in +{ + options.security.agnos = + let + inherit (lib) types mkEnableOption mkOption; + in + { + enable = mkEnableOption name; + + settings = mkOption { + description = "Settings"; + type = types.submodule { + freeformType = format.type; + + options = { + dns_listen_addr = mkOption { + type = types.str; + default = "0.0.0.0:53"; + description = '' + Address for agnos to listen on. + Note that this needs to be reachable by the outside world, + and 53 is required in most situations + since `NS` records do not allow specifying the port. + ''; + }; + + accounts = mkOption { + type = types.listOf accountType; + description = '' + A list of ACME accounts. + Each account is associated with an email address + and can be used to obtain an arbitrary amount of certificate + (subject to provider's rate limits, + see e.g. [Let's Encrypt Rate Limits](https://letsencrypt.org/docs/rate-limits/)). + ''; + }; + }; + }; + }; + + generateKeys = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable automatic generation of account keys. + + When this is `true`, a key will be generated for each account where + the file referred to by the `private_key` path does not exist yet. + + Currently, only RSA keys can be generated. + ''; + }; + + keySize = mkOption { + type = types.int; + default = 4096; + description = '' + Key size in bits to use when generating new keys. + ''; + }; + }; + + server = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + ACME Directory Resource URI. Defaults to Let's Encrypt's production endpoint, + `https://acme-v02.api.letsencrypt.org/directory`, if unset. + ''; + }; + + serverCa = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + The root certificate (in PEM format) of the ACME server's HTTPS interface. + ''; + }; + + persistent = mkOption { + type = types.bool; + default = true; + description = '' + When `true`, use a persistent systemd timer. + ''; + }; + + startAt = mkOption { + type = types.either types.str (types.listOf types.str); + default = "daily"; + example = "02:00"; + description = '' + How often or when to run agnos. + + The format is described in + {manpage}`systemd.time(7)`. + ''; + }; + + temporarilyOpenFirewall = mkOption { + type = types.bool; + default = false; + description = '' + When `true`, will open the port specified in `settings.dns_listen_addr` + before running the agnos service, and close it when agnos finishes running. + ''; + }; + + group = mkOption { + type = types.str; + default = name; + description = '' + Group to run Agnos as. The acquired certificates will be owned by this group. + ''; + }; + + user = mkOption { + type = types.str; + default = name; + description = '' + User to run Agnos as. The acquired certificates will be owned by this user. + ''; + }; + }; + + config = + let + configFile = format.generate "agnos.toml" cfg.settings; + port = lib.toInt (lib.last (builtins.split ":" cfg.settings.dns_listen_addr)); + + useNftables = config.networking.nftables.enable; + + # nftables implementation for temporarilyOpenFirewall + nftablesSetup = pkgs.writeShellScript "agnos-fw-setup" '' + ${lib.getExe pkgs.nftables} add element inet nixos-fw temp-ports "{ tcp . ${toString port} }" + ${lib.getExe pkgs.nftables} add element inet nixos-fw temp-ports "{ udp . ${toString port} }" + ''; + nftablesTeardown = pkgs.writeShellScript "agnos-fw-teardown" '' + ${lib.getExe pkgs.nftables} delete element inet nixos-fw temp-ports "{ tcp . ${toString port} }" + ${lib.getExe pkgs.nftables} delete element inet nixos-fw temp-ports "{ udp . ${toString port} }" + ''; + + # iptables implementation for temporarilyOpenFirewall + helpers = '' + function ip46tables() { + ${lib.getExe' pkgs.iptables "iptables"} -w "$@" + ${lib.getExe' pkgs.iptables "ip6tables"} -w "$@" + } + ''; + fwFilter = ''--dport ${toString port} -j ACCEPT -m comment --comment "agnos"''; + iptablesSetup = pkgs.writeShellScript "agnos-fw-setup" '' + ${helpers} + ip46tables -I INPUT 1 -p tcp ${fwFilter} + ip46tables -I INPUT 1 -p udp ${fwFilter} + ''; + iptablesTeardown = pkgs.writeShellScript "agnos-fw-setup" '' + ${helpers} + ip46tables -D INPUT -p tcp ${fwFilter} + ip46tables -D INPUT -p udp ${fwFilter} + ''; + in + lib.mkIf cfg.enable { + assertions = [ + { + assertion = !cfg.temporarilyOpenFirewall || config.networking.firewall.enable; + message = "temporarilyOpenFirewall is only useful when firewall is enabled"; + } + ]; + + systemd.services.agnos = { + serviceConfig = { + ExecStartPre = + lib.optional cfg.generateKeys.enable '' + ${pkgs.agnos}/bin/agnos-generate-accounts-keys \ + --no-confirm \ + --key-size ${toString cfg.generateKeys.keySize} \ + ${configFile} + '' + ++ lib.optional cfg.temporarilyOpenFirewall ( + "+" + (if useNftables then nftablesSetup else iptablesSetup) + ); + ExecStopPost = lib.optional cfg.temporarilyOpenFirewall ( + "+" + (if useNftables then nftablesTeardown else iptablesTeardown) + ); + ExecStart = '' + ${pkgs.agnos}/bin/agnos \ + ${if cfg.server != null then "--acme-url=${cfg.server}" else "--no-staging"} \ + ${lib.optionalString (cfg.serverCa != null) "--acme-serv-ca=${cfg.serverCa}"} \ + ${configFile} + ''; + Type = "oneshot"; + User = cfg.user; + Group = cfg.group; + StateDirectory = name; + StateDirectoryMode = "0750"; + WorkingDirectory = "${stateDir}"; + + # Allow binding privileged ports if necessary + CapabilityBoundingSet = lib.mkIf (port < 1024) [ "CAP_NET_BIND_SERVICE" ]; + AmbientCapabilities = lib.mkIf (port < 1024) [ "CAP_NET_BIND_SERVICE" ]; + }; + + after = [ + "firewall.target" + "network-online.target" + "nftables.service" + ]; + wants = [ "network-online.target" ]; + }; + + systemd.timers.agnos = { + timerConfig = { + OnCalendar = cfg.startAt; + Persistent = cfg.persistent; + Unit = "agnos.service"; + }; + wantedBy = [ "timers.target" ]; + }; + + users.groups = lib.mkIf (cfg.group == name) { + ${cfg.group} = { }; + }; + + users.users = lib.mkIf (cfg.user == name) { + ${cfg.user} = { + isSystemUser = true; + description = "Agnos service user"; + group = cfg.group; + }; + }; + }; +} diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index a4c2f9e29fc3..2a20a673d5af 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -172,7 +172,7 @@ in logfiles = /dev/stdin parser = ${pkgs.apparmor-parser}/bin/apparmor_parser - ldd = ${pkgs.glibc.bin}/bin/ldd + ldd = ${lib.getExe' pkgs.stdenv.cc.libc "ldd"} logger = ${pkgs.util-linux}/bin/logger # customize how file ownership permissions are presented @@ -200,10 +200,8 @@ in sed '1,/\[qualifiers\]/d' $footer >> $out ''; - boot.kernelParams = [ - "apparmor=1" - "security=apparmor" - ]; + boot.kernelParams = [ "apparmor=1" ]; + security.lsm = [ "apparmor" ]; systemd.services.apparmor = { after = [ @@ -277,8 +275,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ - julm - grimmauld - ]; + meta.maintainers = lib.teams.apparmor.members; } diff --git a/nixos/modules/security/default.nix b/nixos/modules/security/default.nix new file mode 100644 index 000000000000..c8baad1a3dd9 --- /dev/null +++ b/nixos/modules/security/default.nix @@ -0,0 +1,28 @@ +{ config, lib, ... }: +let + cfg = config.security; +in +{ + options = { + security.lsm = lib.mkOption { + type = lib.types.uniq (lib.types.listOf lib.types.str); + default = [ ]; + description = '' + A list of the LSMs to initialize in order. + ''; + }; + }; + + config = lib.mkIf (lib.lists.length cfg.lsm > 0) { + assertions = [ + { + assertion = builtins.length (lib.filter (lib.hasPrefix "security=") config.boot.kernelParams) == 0; + message = "security parameter in boot.kernelParams cannot be used when security.lsm is used"; + } + ]; + + boot.kernelParams = [ + "lsm=${lib.concatStringsSep "," cfg.lsm}" + ]; + }; +} diff --git a/nixos/modules/security/isolate.nix b/nixos/modules/security/isolate.nix index c2df90e426a6..9f0060e305ac 100644 --- a/nixos/modules/security/isolate.nix +++ b/nixos/modules/security/isolate.nix @@ -140,7 +140,7 @@ in systemd.slices.isolate = { description = "Isolate Sandbox Slice"; }; - - meta.maintainers = with maintainers; [ virchau13 ]; }; + + meta.maintainers = with maintainers; [ virchau13 ]; } diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index de74e5cda3c5..ad4e32e82561 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -145,6 +145,11 @@ let description = "Name of the PAM service."; }; + enable = lib.mkEnableOption "this PAM service" // { + default = true; + example = false; + }; + rules = lib.mkOption { # This option is experimental and subject to breaking changes without notice. visible = false; @@ -1566,6 +1571,8 @@ let Defaults env_keep+=SSH_AUTH_SOCK ''; + enabledServices = lib.filterAttrs (name: svc: svc.enable) config.security.pam.services; + in { @@ -2282,7 +2289,7 @@ in }; }; - environment.etc = lib.mapAttrs' makePAMService config.security.pam.services; + environment.etc = lib.mapAttrs' makePAMService enabledServices; security.pam.services = { @@ -2298,11 +2305,11 @@ in ''; # Most of these should be moved to specific modules. - i3lock = { }; - i3lock-color = { }; - vlock = { }; - xlock = { }; - xscreensaver = { }; + i3lock.enable = lib.mkDefault config.programs.i3lock.enable; + i3lock-color.enable = lib.mkDefault config.programs.i3lock.enable; + vlock.enable = lib.mkDefault config.console.enable; + xlock.enable = lib.mkDefault config.services.xserver.enable; + xscreensaver.enable = lib.mkDefault config.services.xscreensaver.enable; runuser = { rootOK = true; @@ -2327,11 +2334,11 @@ in security.apparmor.includes."abstractions/pam" = lib.concatMapStrings (name: "r ${config.environment.etc."pam.d/${name}".source},\n") ( - lib.attrNames config.security.pam.services + lib.attrNames enabledServices ) + ( with lib; - pipe config.security.pam.services [ + pipe enabledServices [ lib.attrValues (catAttrs "rules") (lib.concatMap lib.attrValues) diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index d47f2ec05521..fbc5fe1ed2b3 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -15,7 +15,7 @@ let ${pkgs.lsof}/bin/lsof | ${pkgs.gnugrep}/bin/grep $MNTPT | ${pkgs.gawk}/bin/awk '{print $2}' | ${pkgs.findutils}/bin/xargs ${pkgs.util-linux}/bin/kill -$SIGNAL ''; - anyPamMount = lib.any (lib.attrByPath [ "pamMount" ] false) ( + anyPamMount = lib.any (svc: svc.enable && svc.pamMount) ( lib.attrValues config.security.pam.services ); in diff --git a/nixos/modules/security/please.nix b/nixos/modules/security/please.nix index 9c3b6c4bca6a..b67f0945521a 100644 --- a/nixos/modules/security/please.nix +++ b/nixos/modules/security/please.nix @@ -121,7 +121,5 @@ in sshAgentAuth = true; usshAuth = true; }; - - meta.maintainers = with lib.maintainers; [ azahi ]; }; } diff --git a/nixos/modules/security/sudo-rs.nix b/nixos/modules/security/sudo-rs.nix index 14c8929f281a..a157bfebfab7 100644 --- a/nixos/modules/security/sudo-rs.nix +++ b/nixos/modules/security/sudo-rs.nix @@ -286,7 +286,7 @@ in in { sudo = { - source = "${cfg.package.out}/bin/sudo"; + source = "${lib.getExe cfg.package}"; inherit owner group diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix index f60adb24cdbe..bb947cb32a56 100644 --- a/nixos/modules/security/tpm2.nix +++ b/nixos/modules/security/tpm2.nix @@ -75,8 +75,8 @@ in package = lib.mkOption { description = "tpm2-pkcs11 package to use"; type = lib.types.package; - default = pkgs.tpm2-pkcs11; - defaultText = lib.literalExpression "pkgs.tpm2-pkcs11"; + default = if cfg.abrmd.enable then pkgs.tpm2-pkcs11.abrmd else pkgs.tpm2-pkcs11; + defaultText = lib.literalExpression "if config.security.tpm2.abrmd.enable then pkgs.tpm2-pkcs11.abrmd else pkgs.tpm2-pkcs11"; }; }; diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix index 4487afba103c..e624ffa23a33 100644 --- a/nixos/modules/services/accessibility/orca.nix +++ b/nixos/modules/services/accessibility/orca.nix @@ -20,6 +20,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; + systemd.services.display-manager.path = [ cfg.package ]; services.speechd.enable = true; }; } diff --git a/nixos/modules/services/accessibility/speechd.nix b/nixos/modules/services/accessibility/speechd.nix index 165be86346cc..ff98c363fc29 100644 --- a/nixos/modules/services/accessibility/speechd.nix +++ b/nixos/modules/services/accessibility/speechd.nix @@ -7,7 +7,6 @@ let cfg = config.services.speechd; inherit (lib) - getExe mkEnableOption mkIf mkPackageOption @@ -21,12 +20,12 @@ in package = mkPackageOption pkgs "speechd" { }; }; - # FIXME: speechd 0.12 (or whatever the next version is) - # will support socket activation, so switch to that once it's out. config = mkIf cfg.enable { environment = { systemPackages = [ cfg.package ]; - sessionVariables.SPEECHD_CMD = getExe cfg.package; }; + systemd.packages = [ cfg.package ]; + # have to set `wantedBy` since `systemd.packages` ignores `[Install]` + systemd.user.sockets.speech-dispatcher.wantedBy = [ "sockets.target" ]; }; } diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix index ad151c57666c..44b28991feab 100644 --- a/nixos/modules/services/admin/oxidized.nix +++ b/nixos/modules/services/admin/oxidized.nix @@ -11,6 +11,8 @@ in options.services.oxidized = { enable = lib.mkEnableOption "the oxidized configuration backup service"; + package = lib.mkPackageOption pkgs "oxidized" { }; + user = lib.mkOption { type = lib.types.str; default = "oxidized"; @@ -70,7 +72,8 @@ in }; routerDB = lib.mkOption { - type = lib.types.path; + type = lib.types.nullOr lib.types.path; + default = null; example = lib.literalExpression '' pkgs.writeText "oxidized-router.db" ''' hostname-sw1:powerconnect:username1:password2 @@ -94,18 +97,57 @@ in isSystemUser = true; }; + systemd.tmpfiles.settings."10-oxidized" = + { + "${cfg.dataDir}" = { + d = { + mode = "0750"; + user = cfg.user; + group = cfg.group; + }; + }; + + "${cfg.dataDir}/.config" = { + d = { + mode = "0750"; + user = cfg.user; + group = cfg.group; + }; + }; + + "${cfg.dataDir}/.config/oxidized" = { + d = { + mode = "0750"; + user = cfg.user; + group = cfg.group; + }; + }; + + "${cfg.dataDir}/.config/oxidized/config" = { + L = { + argument = "${cfg.configFile}"; + user = cfg.user; + group = cfg.group; + }; + }; + + } + // lib.optionalAttrs (cfg.routerDB != null) { + "${cfg.dataDir}/.config/oxidized/router.db" = { + L = { + argument = "${cfg.routerDB}"; + user = cfg.user; + group = cfg.group; + }; + }; + }; + systemd.services.oxidized = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - preStart = '' - mkdir -p ${cfg.dataDir}/.config/oxidized - ln -f -s ${cfg.routerDB} ${cfg.dataDir}/.config/oxidized/router.db - ln -f -s ${cfg.configFile} ${cfg.dataDir}/.config/oxidized/config - ''; - serviceConfig = { - ExecStart = "${pkgs.oxidized}/bin/oxidized"; + ExecStart = lib.getExe cfg.package; User = cfg.user; Group = cfg.group; UMask = "0077"; diff --git a/nixos/modules/services/audio/lavalink.nix b/nixos/modules/services/audio/lavalink.nix new file mode 100644 index 000000000000..8cb37017bf96 --- /dev/null +++ b/nixos/modules/services/audio/lavalink.nix @@ -0,0 +1,335 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + inherit (lib) + mkOption + mkEnableOption + mkIf + types + ; + + cfg = config.services.lavalink; + + format = pkgs.formats.yaml { }; +in + +{ + options.services.lavalink = { + enable = mkEnableOption "Lavalink"; + + package = lib.mkPackageOption pkgs "lavalink" { }; + + password = mkOption { + type = types.nullOr types.str; + default = null; + example = "s3cRe!p4SsW0rD"; + description = '' + The password for Lavalink's authentication in plain text. + ''; + }; + + port = mkOption { + type = types.port; + default = 2333; + example = 4567; + description = '' + The port that Lavalink will use. + ''; + }; + + address = mkOption { + type = types.str; + default = "0.0.0.0"; + example = "127.0.0.1"; + description = '' + The network address to bind to. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to expose the port to the network. + ''; + }; + + user = mkOption { + type = types.str; + default = "lavalink"; + example = "root"; + description = '' + The user of the service. + ''; + }; + + group = mkOption { + type = types.str; + default = "lavalink"; + example = "medias"; + description = '' + The group of the service. + ''; + }; + + home = mkOption { + type = types.str; + default = "/var/lib/lavalink"; + example = "/home/lavalink"; + description = '' + The home directory for lavalink. + ''; + }; + + enableHttp2 = mkEnableOption "HTTP/2 support"; + + jvmArgs = mkOption { + type = types.str; + default = "-Xmx4G"; + example = "-Djava.io.tmpdir=/var/lib/lavalink/tmp -Xmx6G"; + description = '' + Set custom JVM arguments. + ''; + }; + + environmentFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/run/secrets/lavalink/passwordEnvFile"; + description = '' + Add custom environment variables from a file. + See for the full documentation. + ''; + }; + + plugins = mkOption { + type = types.listOf ( + types.submodule { + options = { + dependency = mkOption { + type = types.str; + example = "dev.lavalink.youtube:youtube-plugin:1.8.0"; + description = '' + The coordinates of the plugin. + ''; + }; + + repository = mkOption { + type = types.str; + example = "https://maven.example.com/releases"; + default = "https://maven.lavalink.dev/releases"; + description = '' + The plugin repository. Defaults to the lavalink releases repository. + + To use the snapshots repository, use instead + ''; + }; + + hash = mkOption { + type = types.str; + example = lib.fakeHash; + description = '' + The hash of the plugin. + ''; + }; + + configName = mkOption { + type = types.nullOr types.str; + example = "youtube"; + default = null; + description = '' + The name of the plugin to use as the key for the plugin configuration. + ''; + }; + + extraConfig = mkOption { + type = types.submodule { freeformType = format.type; }; + default = { }; + description = '' + The configuration for the plugin. + + The {option}`services.lavalink.plugins.*.configName` option must be set. + ''; + }; + }; + } + ); + default = [ ]; + + example = lib.literalExpression '' + [ + { + dependency = "dev.lavalink.youtube:youtube-plugin:1.8.0"; + repository = "https://maven.lavalink.dev/snapshots"; + hash = lib.fakeHash; + configName = "youtube"; + extraConfig = { + enabled = true; + allowSearch = true; + allowDirectVideoIds = true; + allowDirectPlaylistIds = true; + }; + } + ] + ''; + + description = '' + A list of plugins for lavalink. + ''; + }; + + extraConfig = mkOption { + type = types.submodule { freeformType = format.type; }; + + description = '' + Configuration to write to {file}`application.yml`. + See for the full documentation. + + Individual configuration parameters can be overwritten using environment variables. + See for more information. + ''; + + default = { }; + + example = lib.literalExpression '' + { + lavalink.server = { + sources.twitch = true; + + filters.volume = true; + }; + + logging.file.path = "./logs/"; + } + ''; + }; + }; + + config = + let + pluginSymlinks = lib.concatStringsSep "\n" ( + map ( + pluginCfg: + let + pluginParts = lib.match ''^(.*?:(.*?):)([0-9]+\.[0-9]+\.[0-9]+)$'' pluginCfg.dependency; + + pluginWebPath = lib.replaceStrings [ "." ":" ] [ "/" "/" ] (lib.elemAt pluginParts 0); + + pluginFileName = lib.elemAt pluginParts 1; + pluginVersion = lib.elemAt pluginParts 2; + + pluginFile = "${pluginFileName}-${pluginVersion}.jar"; + pluginUrl = "${pluginCfg.repository}/${pluginWebPath}${pluginVersion}/${pluginFile}"; + + plugin = pkgs.fetchurl { + url = pluginUrl; + inherit (pluginCfg) hash; + }; + in + "ln -sf ${plugin} ${cfg.home}/plugins/${pluginFile}" + ) cfg.plugins + ); + + pluginExtraConfigs = builtins.listToAttrs ( + builtins.map ( + pluginConfig: lib.attrsets.nameValuePair pluginConfig.configName pluginConfig.extraConfig + ) (lib.lists.filter (pluginCfg: pluginCfg.configName != null) cfg.plugins) + ); + + config = lib.attrsets.recursiveUpdate cfg.extraConfig { + server = { + inherit (cfg) port address; + http2.enabled = cfg.enableHttp2; + }; + + plugins = pluginExtraConfigs; + lavalink.plugins = ( + builtins.map ( + pluginConfig: + builtins.removeAttrs pluginConfig [ + "name" + "extraConfig" + "hash" + ] + ) cfg.plugins + ); + }; + + configWithPassword = lib.attrsets.recursiveUpdate config ( + lib.attrsets.optionalAttrs (cfg.password != null) { lavalink.server.password = cfg.password; } + ); + + configFile = format.generate "application.yml" configWithPassword; + in + mkIf cfg.enable { + assertions = [ + { + assertion = + !(lib.lists.any ( + pluginCfg: pluginCfg.extraConfig != { } && pluginCfg.configName == null + ) cfg.plugins); + message = "Plugins with extra configuration need to have the `configName` attribute defined"; + } + ]; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + users.groups = mkIf (cfg.group == "lavalink") { lavalink = { }; }; + users.users = mkIf (cfg.user == "lavalink") { + lavalink = { + inherit (cfg) home; + group = "lavalink"; + description = "The user for the Lavalink server"; + isSystemUser = true; + }; + }; + + systemd.tmpfiles.settings."10-lavalink" = + let + dirConfig = { + inherit (cfg) user group; + mode = "0700"; + }; + in + { + "${cfg.home}/plugins".d = mkIf (cfg.plugins != [ ]) dirConfig; + ${cfg.home}.d = dirConfig; + }; + + systemd.services.lavalink = { + description = "Lavalink Service"; + + wantedBy = [ "multi-user.target" ]; + after = [ + "syslog.target" + "network.target" + ]; + + script = '' + ${pluginSymlinks} + + ln -sf ${configFile} ${cfg.home}/application.yml + export _JAVA_OPTIONS="${cfg.jvmArgs}" + + ${lib.getExe cfg.package} + ''; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + + Type = "simple"; + Restart = "on-failure"; + + EnvironmentFile = cfg.environmentFile; + WorkingDirectory = cfg.home; + }; + }; + }; +} diff --git a/nixos/modules/services/audio/music-assistant.nix b/nixos/modules/services/audio/music-assistant.nix index aaabe5c3ac4c..d48bb7f99f84 100644 --- a/nixos/modules/services/audio/music-assistant.nix +++ b/nixos/modules/services/audio/music-assistant.nix @@ -69,6 +69,9 @@ in description = "Music Assistant"; documentation = [ "https://music-assistant.io" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; environment = { diff --git a/nixos/modules/services/audio/navidrome.nix b/nixos/modules/services/audio/navidrome.nix index c3540196c7a3..ab6fc7b6bce4 100644 --- a/nixos/modules/services/audio/navidrome.nix +++ b/nixos/modules/services/audio/navidrome.nix @@ -102,6 +102,11 @@ in mode = "700"; inherit (cfg) user group; }; + "${cfg.settings.MusicFolder or (WorkingDirectory + "/music")}"."d" = { + mode = ":700"; + user = ":${cfg.user}"; + group = ":${cfg.group}"; + }; }; services.navidrome = { description = "Navidrome Media Server"; diff --git a/nixos/modules/services/audio/spotifyd.nix b/nixos/modules/services/audio/spotifyd.nix index 1f6ab0b5f75b..2264d7c39c6b 100644 --- a/nixos/modules/services/audio/spotifyd.nix +++ b/nixos/modules/services/audio/spotifyd.nix @@ -28,7 +28,7 @@ in type = lib.types.lines; description = '' (Deprecated) Configuration for Spotifyd. For syntax and directives, see - . + . ''; }; @@ -40,7 +40,7 @@ in }; description = '' Configuration for Spotifyd. For syntax and directives, see - . + . ''; }; }; diff --git a/nixos/modules/services/backup/borgbackup.md b/nixos/modules/services/backup/borgbackup.md index 8ae869308bb8..23f0e5c934ed 100644 --- a/nixos/modules/services/backup/borgbackup.md +++ b/nixos/modules/services/backup/borgbackup.md @@ -105,7 +105,7 @@ The following few commands (run as root) let you test your backup. > systemctl restart borgbackup-job-backupToLocalServer > sleep 10 > systemctl restart borgbackup-job-backupToLocalServer -> export BORG_PASSPHRASE=topSecrect +> export BORG_PASSPHRASE=topSecret > borg list --rsh='ssh -i /run/keys/id_ed25519_my_borg_repo' borg@nixos:. nixos-backupToLocalServer-2020-03-30T21:46:17 Mon, 2020-03-30 21:46:19 [84feb97710954931ca384182f5f3cb90665f35cef214760abd7350fb064786ac] nixos-backupToLocalServer-2020-03-30T21:46:30 Mon, 2020-03-30 21:46:32 [e77321694ecd160ca2228611747c6ad1be177d6e0d894538898de7a2621b6e68] diff --git a/nixos/modules/services/backup/pgbackrest.nix b/nixos/modules/services/backup/pgbackrest.nix new file mode 100644 index 000000000000..1e1377818097 --- /dev/null +++ b/nixos/modules/services/backup/pgbackrest.nix @@ -0,0 +1,426 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.pgbackrest; + + settingsFormat = pkgs.formats.ini { + listsAsDuplicateKeys = true; + }; + + # pgBackRest "options" + settingsType = + with lib.types; + attrsOf (oneOf [ + bool + ints.unsigned + str + (attrsOf str) + (listOf str) + ]); + + # Applied to both repoNNN-* and pgNNN-* options in global and stanza sections. + flattenWithIndex = + attrs: prefix: + lib.concatMapAttrs ( + name: + let + index = lib.lists.findFirstIndex (n: n == name) null (lib.attrNames attrs); + index1 = index + 1; + in + lib.mapAttrs' (option: lib.nameValuePair "${prefix}${toString index1}-${option}") + ) attrs; + + # Remove nulls, turn attrsets into lists and bools into y/n + normalize = + x: + lib.pipe x [ + (lib.filterAttrs (_: v: v != null)) + (lib.mapAttrs (_: v: if lib.isAttrs v then lib.mapAttrsToList (n': v': "${n'}=${v'}") v else v)) + (lib.mapAttrs ( + _: v: + if v == true then + "y" + else if v == false then + "n" + else + v + )) + ]; + + fullConfig = + { + global = normalize (cfg.settings // flattenWithIndex cfg.repos "repo"); + } + // lib.mapAttrs ( + _: cfg': normalize (cfg'.settings // flattenWithIndex cfg'.instances "pg") + ) cfg.stanzas; + + namedJobs = lib.listToAttrs ( + lib.flatten ( + lib.mapAttrsToList ( + stanza: + { jobs, ... }: + lib.mapAttrsToList ( + job: attrs: lib.nameValuePair "pgbackrest-${stanza}-${job}" (attrs // { inherit stanza job; }) + ) jobs + ) cfg.stanzas + ) + ); + + disabledOption = lib.mkOption { + default = null; + readOnly = true; + internal = true; + }; + + secretPathOption = + with lib.types; + lib.mkOption { + type = nullOr (pathWith { + inStore = false; + absolute = true; + }); + default = null; + internal = true; + }; +in + +{ + meta = { + maintainers = with lib.maintainers; [ wolfgangwalther ]; + }; + + # TODO: Add enableServer option and corresponding pgBackRest TLS server service. + # TODO: Allow command-specific options + # TODO: Write wrapper around pgbackrest to turn --repo= into --repo= + # The following two are dependent on improvements upstream: + # https://github.com/pgbackrest/pgbackrest/issues/2621 + # TODO: Add support for more repository types + # TODO: Support passing encryption key safely + options.services.pgbackrest = { + enable = lib.mkEnableOption "pgBackRest"; + + repos = lib.mkOption { + type = + with lib.types; + attrsOf ( + submodule ( + { config, name, ... }: + let + setHostForType = + type: + if name == "localhost" then + null + # "posix" is the default repo type, which uses the -host option. + # Other types use prefixed options, for example -sftp-host. + else if config.type or "posix" != type then + null + else + name; + in + { + freeformType = settingsType; + + options.host = lib.mkOption { + type = nullOr str; + default = setHostForType "posix"; + defaultText = lib.literalExpression "name"; + description = "Repository host when operating remotely"; + }; + + options.sftp-host = lib.mkOption { + type = nullOr str; + default = setHostForType "sftp"; + defaultText = lib.literalExpression "name"; + description = "SFTP repository host"; + }; + + options.sftp-private-key-file = lib.mkOption { + type = nullOr (pathWith { + inStore = false; + absolute = true; + }); + default = null; + description = '' + SFTP private key file. + + The file must be accessible by both the pgbackrest and the postgres users. + ''; + }; + + # The following options should not be used; they would store secrets in the store. + options.azure-key = disabledOption; + options.cipher-pass = disabledOption; + options.s3-key = disabledOption; + options.s3-key-secret = disabledOption; + options.s3-kms-key-id = disabledOption; # unsure whether that's a secret or not + options.s3-sse-customer-key = disabledOption; # unsure whether that's a secret or not + options.s3-token = disabledOption; + options.sftp-private-key-passphrase = disabledOption; + + # The following options are not fully supported / tested, yet, but point to files with secrets. + # Users can already set those options, but we'll force non-store paths. + options.gcs-key = secretPathOption; + options.host-cert-file = secretPathOption; + options.host-key-file = secretPathOption; + } + ) + ); + default = { }; + description = '' + An attribute set of repositories as described in: + + + Each repository defaults to set `repo-host` to the attribute's name. + The special value "localhost" will unset `repo-host`. + + ::: {.note} + The prefix `repoNNN-` is added automatically. + Example: Use `path` instead of `repo1-path`. + ::: + ''; + example = lib.literalExpression '' + { + localhost.path = "/var/lib/backup"; + "backup.example.com".host-type = "tls"; + } + ''; + }; + + stanzas = lib.mkOption { + type = + with lib.types; + attrsOf (submodule { + options = { + jobs = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.submodule { + options.schedule = lib.mkOption { + type = lib.types.str; + description = '' + When or how often the backup should run. + Must be in the format described in {manpage}`systemd.time(7)`. + ''; + }; + + options.type = lib.mkOption { + type = lib.types.str; + description = '' + Backup type as described in: + + ''; + }; + } + ); + default = { }; + description = '' + Backups jobs to schedule for this stanza as described in: + + ''; + example = lib.literalExpression '' + { + weekly = { schedule = "Sun, 6:30"; type = "full"; }; + daily = { schedule = "Mon..Sat, 6:30"; type = "diff"; }; + } + ''; + }; + + instances = lib.mkOption { + type = + with lib.types; + attrsOf ( + submodule ( + { name, ... }: + { + freeformType = settingsType; + options.host = lib.mkOption { + type = nullOr str; + default = if name == "localhost" then null else name; + defaultText = lib.literalExpression ''if name == "localhost" then null else name''; + description = "PostgreSQL host for operating remotely."; + }; + + # The following options are not fully supported / tested, yet, but point to files with secrets. + # Users can already set those options, but we'll force non-store paths. + options.host-cert-file = secretPathOption; + options.host-key-file = secretPathOption; + } + ) + ); + default = { }; + description = '' + An attribute set of database instances as described in: + + + Each instance defaults to set `pg-host` to the attribute's name. + The special value "localhost" will unset `pg-host`. + + ::: {.note} + The prefix `pgNNN-` is added automatically. + Example: Use `user` instead of `pg1-user`. + ::: + ''; + example = lib.literalExpression '' + { + localhost.database = "app"; + "postgres.example.com".port = "5433"; + } + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsType; + + # The following options are not fully supported / tested, yet, but point to files with secrets. + # Users can already set those options, but we'll force non-store paths. + options.tls-server-cert-file = secretPathOption; + options.tls-server-key-file = secretPathOption; + }; + default = { }; + description = '' + An attribute set of options as described in: + + + All options can be used. + Repository options should be set via [`repos`](#opt-services.pgbackrest.repos) instead. + Stanza options should be set via [`instances`](#opt-services.pgbackrest.stanzas._name_.instances) instead. + ''; + example = lib.literalExpression '' + { + process-max = 2; + } + ''; + }; + }; + }); + default = { }; + description = '' + An attribute set of stanzas as described in: + + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsType; + + # The following options are not fully supported / tested, yet, but point to files with secrets. + # Users can already set those options, but we'll force non-store paths. + options.tls-server-cert-file = secretPathOption; + options.tls-server-key-file = secretPathOption; + }; + default = { }; + description = '' + An attribute set of options as described in: + + + All globally available options, i.e. all except stanza options, can be used. + Repository options should be set via [`repos`](#opt-services.pgbackrest.repos) instead. + ''; + example = lib.literalExpression '' + { + process-max = 2; + } + ''; + }; + }; + + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + services.pgbackrest.settings = { + log-level-console = lib.mkDefault "info"; + log-level-file = lib.mkDefault "off"; + cmd-ssh = lib.getExe pkgs.openssh; + }; + + environment.systemPackages = [ pkgs.pgbackrest ]; + environment.etc."pgbackrest/pgbackrest.conf".source = + settingsFormat.generate "pgbackrest.conf" fullConfig; + + users.users.pgbackrest = { + name = "pgbackrest"; + group = "pgbackrest"; + description = "pgBackRest service user"; + isSystemUser = true; + useDefaultShell = true; + createHome = true; + home = cfg.repos.localhost.path or "/var/lib/pgbackrest"; + }; + users.groups.pgbackrest = { }; + + systemd.services = lib.mapAttrs ( + _: + { + stanza, + job, + type, + ... + }: + { + description = "pgBackRest job ${job} for stanza ${stanza}"; + + serviceConfig = { + User = "pgbackrest"; + Group = "pgbackrest"; + Type = "oneshot"; + # stanza-create is idempotent, so safe to always run + ExecStartPre = "${lib.getExe pkgs.pgbackrest} --stanza='${stanza}' stanza-create"; + ExecStart = "${lib.getExe pkgs.pgbackrest} --stanza='${stanza}' backup --type='${type}'"; + }; + } + ) namedJobs; + + systemd.timers = lib.mapAttrs ( + name: + { + stanza, + job, + schedule, + ... + }: + { + description = "pgBackRest job ${job} for stanza ${stanza}"; + wantedBy = [ "timers.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + timerConfig = { + OnCalendar = schedule; + Persistent = true; + Unit = "${name}.service"; + }; + } + ) namedJobs; + } + + # The default stanza is set up for the local postgresql instance. + # It does not backup automatically, the systemd timer still needs to be set. + (lib.mkIf config.services.postgresql.enable { + services.pgbackrest.stanzas.default = { + settings.cmd = lib.getExe pkgs.pgbackrest; + instances.localhost = { + path = config.services.postgresql.dataDir; + user = "postgres"; + }; + }; + services.postgresql.identMap = '' + postgres pgbackrest postgres + ''; + services.postgresql.initdbArgs = [ "--allow-group-access" ]; + users.users.pgbackrest.extraGroups = [ "postgres" ]; + + services.postgresql.settings = { + archive_command = ''${lib.getExe pkgs.pgbackrest} --stanza=default archive-push "%p"''; + archive_mode = lib.mkDefault "on"; + }; + users.groups.pgbackrest.members = [ "postgres" ]; + }) + ] + ); +} diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix index 5850b17e9cb7..e8d34e879dc5 100644 --- a/nixos/modules/services/backup/restic-rest-server.nix +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -36,6 +36,12 @@ in ''; }; + htpasswd-file = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.path; + description = "The path to the servers .htpasswd file. Defaults to `\${dataDir}/.htpasswd`."; + }; + privateRepos = lib.mkOption { default = false; type = lib.types.bool; @@ -84,6 +90,7 @@ in ExecStart = '' ${cfg.package}/bin/rest-server \ --path ${cfg.dataDir} \ + ${lib.optionalString (cfg.htpasswd-file != null) "--htpasswd-file ${cfg.htpasswd-file}"} \ ${lib.optionalString cfg.appendOnly "--append-only"} \ ${lib.optionalString cfg.privateRepos "--private-repos"} \ ${lib.optionalString cfg.prometheus "--prometheus"} \ @@ -112,6 +119,7 @@ in ProtectControlGroups = true; PrivateDevices = true; ReadWritePaths = [ cfg.dataDir ]; + ReadOnlyPaths = lib.optional (cfg.htpasswd-file != null) cfg.htpasswd-file; RemoveIPC = true; RestrictAddressFamilies = "none"; RestrictNamespaces = true; diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index ce8bcc3994b8..69df4f60d8de 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -465,8 +465,8 @@ in # set same environment variables as the systemd service ${lib.pipe config.systemd.services."restic-backups-${name}".environment [ (lib.filterAttrs (n: v: v != null && n != "PATH")) - (lib.mapAttrsToList (n: v: "${n}=${v}")) - (lib.concatStringsSep "\n") + (lib.mapAttrs (_: v: "${v}")) + (lib.toShellVars) ]} PATH=${config.systemd.services."restic-backups-${name}".environment.PATH}:$PATH diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 0d379f6c915d..8b4c59155f4d 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -106,14 +106,17 @@ in package = lib.mkPackageOption pkgs "sanoid" { }; interval = lib.mkOption { - type = lib.types.str; + type = with lib.types; either str (listOf str); default = "hourly"; example = "*-*-* *:15:00"; description = '' Run syncoid at this interval. The default is to run hourly. - The format is described in - {manpage}`systemd.time(7)`. + Must be in the format described in {manpage}`systemd.time(7)`. This is + equivalent to adding a corresponding timer unit with + {option}`OnCalendar` set to the value given here. + + Set to an empty list to avoid starting syncoid automatically. ''; }; diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 4911d7871412..22e3534ea591 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -46,8 +46,12 @@ let ) ); - # Replace characters that are problematic in file names + # Replace prefixes and characters that are problematic in file names cleanHelmChartName = + name: + let + woPrefix = lib.removePrefix "https://" (lib.removePrefix "oci://" name); + in lib.replaceStrings [ "/" @@ -56,7 +60,8 @@ let [ "-" "-" - ]; + ] + woPrefix; # Fetch a Helm chart from a public registry. This only supports a basic Helm pull. fetchHelm = @@ -66,7 +71,12 @@ let version, hash ? lib.fakeHash, }: - pkgs.runCommand (cleanHelmChartName "${lib.removePrefix "https://" repo}-${name}-${version}.tgz") + let + isOci = lib.hasPrefix "oci://" repo; + pullCmd = if isOci then repo else "--repo ${repo} ${name}"; + name' = if isOci then "${repo}-${version}" else "${repo}-${name}-${version}"; + in + pkgs.runCommand (cleanHelmChartName "${name'}.tgz") { inherit (lib.fetchers.normalizeHash { } { inherit hash; }) outputHash outputHashAlgo; impureEnvVars = lib.fetchers.proxyImpureEnvVars; @@ -76,9 +86,7 @@ let ]; } '' - export HOME="$PWD" - helm repo add repository ${repo} - helm pull repository/${name} --version ${version} + helm pull ${pullCmd} --version ${version} mv ./*.tgz $out ''; @@ -190,6 +198,7 @@ let hash = lib.mkOption { type = lib.types.str; example = "sha256-ej+vpPNdiOoXsaj1jyRpWLisJgWo8EqX+Z5VbpSjsPA="; + default = ""; description = '' The hash of the packaged Helm chart. Only has an effect if `package` is not set. The Helm chart is fetched during build time and placed as a `.tgz` archive on the @@ -723,7 +732,11 @@ in }; }; }; - + nginx = { + repo = "oci://registry-1.docker.io/bitnamicharts/nginx"; + version = "20.0.0"; + hash = "sha256-sy+tzB+i9jIl/tqOMzzuhVhTU4EZVsoSBtPznxF/36c="; + }; custom-chart = { package = ../charts/my-chart.tgz; values = ../values/my-values.yaml; diff --git a/nixos/modules/services/cluster/rke2/default.nix b/nixos/modules/services/cluster/rke2/default.nix index 1c7ef3af1c8a..6e0cfd9df3fe 100644 --- a/nixos/modules/services/cluster/rke2/default.nix +++ b/nixos/modules/services/cluster/rke2/default.nix @@ -228,7 +228,7 @@ in } { assertion = cfg.role == "agent" -> !(cfg.agentTokenFile != null || cfg.agentToken != ""); - message = "agentToken or agentTokenFile should be set if role is 'agent'"; + message = "agentToken or agentTokenFile should NOT be set if role is 'agent'"; } { assertion = cfg.role == "agent" -> !(cfg.disable != [ ]); diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 895ba66e7ea0..f68460c86c91 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -188,6 +188,7 @@ let [ "--docker-image ${service.dockerImage}" ] ++ optional service.dockerDisableCache "--docker-disable-cache" ++ optional service.dockerPrivileged "--docker-privileged" + ++ optional (service.dockerPullPolicy != null) "--docker-pull-policy ${service.dockerPullPolicy}" ++ map (v: "--docker-volumes ${escapeShellArg v}") service.dockerVolumes ++ map (v: "--docker-extra-hosts ${escapeShellArg v}") service.dockerExtraHosts ++ map (v: "--docker-allowed-images ${escapeShellArg v}") service.dockerAllowedImages @@ -482,6 +483,19 @@ in Docker image to be used. ''; }; + dockerPullPolicy = mkOption { + type = types.nullOr ( + types.enum [ + "always" + "never" + "if-not-present" + ] + ); + default = null; + description = '' + Default pull-policy for Docker images + ''; + }; dockerVolumes = mkOption { type = types.listOf types.str; default = [ ]; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index d83db34b9aa3..df586356306a 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -564,16 +564,14 @@ in services.postgresql.enable = lib.mkIf haveLocalDB true; services.postgresql.identMap = lib.optionalString haveLocalDB '' - hydra-users hydra hydra - hydra-users hydra-queue-runner hydra - hydra-users hydra-www hydra - hydra-users root hydra - # The postgres user is used to create the pg_trgm extension for the hydra database - hydra-users postgres postgres + hydra hydra hydra + hydra hydra-queue-runner hydra + hydra hydra-www hydra + hydra root hydra ''; services.postgresql.authentication = lib.optionalString haveLocalDB '' - local hydra all ident map=hydra-users + local all hydra peer map=hydra ''; }; diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 0130564778e6..814f0e99a8a7 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -24,10 +24,6 @@ let cfg = config.services.cassandra; - atLeast3 = versionAtLeast cfg.package.version "3"; - atLeast3_11 = versionAtLeast cfg.package.version "3.11"; - atLeast4 = versionAtLeast cfg.package.version "4"; - defaultUser = "cassandra"; cassandraConfig = flip recursiveUpdate cfg.extraConfig ( @@ -41,6 +37,7 @@ let data_file_directories = [ "${cfg.homeDir}/data" ]; commitlog_directory = "${cfg.homeDir}/commitlog"; saved_caches_directory = "${cfg.homeDir}/saved_caches"; + hints_directory = "${cfg.homeDir}/hints"; } // optionalAttrs (cfg.seedAddresses != [ ]) { seed_provider = [ @@ -50,9 +47,6 @@ let } ]; } - // optionalAttrs atLeast3 { - hints_directory = "${cfg.homeDir}/hints"; - } ); cassandraConfigWithAddresses = @@ -97,9 +91,7 @@ let # Delete default password file sed -i '/-Dcom.sun.management.jmxremote.password.file=\/etc\/cassandra\/jmxremote.password/d' "$out/cassandra-env.sh" - ${lib.optionalString atLeast4 '' - cp $package/conf/jvm*.options $out/ - ''} + cp $package/conf/jvm*.options $out/ ''; }; @@ -109,17 +101,17 @@ let fullJvmOptions = cfg.jvmOpts + ++ [ + # Historically, we don't use a log dir, whereas the upstream scripts do + # expect this. We override those by providing our own -Xlog:gc flag. + "-Xlog:gc=warning,heap*=warning,age*=warning,safepoint=warning,promotion*=warning" + ] ++ optionals (cfg.jmxRoles != [ ]) [ "-Dcom.sun.management.jmxremote.authenticate=true" "-Dcom.sun.management.jmxremote.password.file=${cfg.jmxRolesFile}" ] ++ optionals cfg.remoteJmx [ "-Djava.rmi.server.hostname=${cfg.rpcAddress}" - ] - ++ optionals atLeast4 [ - # Historically, we don't use a log dir, whereas the upstream scripts do - # expect this. We override those by providing our own -Xlog:gc flag. - "-Xlog:gc=warning,heap*=warning,age*=warning,safepoint=warning,promotion*=warning" ]; commonEnv = { @@ -169,7 +161,7 @@ in }; package = mkPackageOption pkgs "cassandra" { - example = "cassandra_3_11"; + example = "cassandra_4"; }; jvmOpts = mkOption { @@ -462,14 +454,11 @@ in jmxRolesFile = mkOption { type = types.nullOr types.path; - default = if atLeast3_11 then pkgs.writeText "jmx-roles-file" defaultJmxRolesFile else null; - defaultText = literalMD ''generated configuration file if version is at least 3.11, otherwise `null`''; + default = pkgs.writeText "jmx-roles-file" defaultJmxRolesFile; + defaultText = "generated configuration file"; example = "/var/lib/cassandra/jmx.password"; description = '' Specify your own jmx roles file. - - Make sure the permissions forbid "others" from reading the file if - you're using Cassandra below version 3.11. ''; }; }; @@ -492,8 +481,7 @@ in assertion = cfg.remoteJmx -> cfg.jmxRolesFile != null; message = '' If you want JMX available remotely you need to set a password using - jmxRoles or jmxRolesFile if - using Cassandra older than v3.11. + jmxRoles. ''; } ]; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index a43482393641..59c868d6628e 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -18,6 +18,22 @@ let format = pkgs.formats.ini { listsAsDuplicateKeys = true; }; configFile = format.generate "my.cnf" cfg.settings; + generateClusterAddressExpr = '' + if (config.services.mysql.galeraCluster.nodeAddresses == [ ]) then + "" + else + "gcomm://''${builtins.concatStringsSep \",\" config.services.mysql.galeraCluster.nodeAddresses}" + + lib.optionalString (config.services.mysql.galeraCluster.clusterPassword != "") + "?gmcast.seg=1:''${config.services.mysql.galeraCluster.clusterPassword}" + ''; + generateClusterAddress = + if (cfg.galeraCluster.nodeAddresses == [ ]) then + "" + else + "gcomm://${builtins.concatStringsSep "," cfg.galeraCluster.nodeAddresses}" + + lib.optionalString ( + cfg.galeraCluster.clusterPassword != "" + ) "?gmcast.seg=1:${cfg.galeraCluster.clusterPassword}"; in { @@ -320,6 +336,69 @@ in description = "Port number on which the MySQL master server runs."; }; }; + + galeraCluster = { + enable = lib.mkEnableOption "MariaDB Galera Cluster"; + + package = lib.mkOption { + type = lib.types.package; + description = "The MariaDB Galera package that provides the shared library 'libgalera_smm.so' required for cluster functionality."; + default = lib.literalExpression "pkgs.mariadb-galera"; + }; + + name = lib.mkOption { + type = lib.types.str; + description = "The logical name of the Galera cluster. All nodes in the same cluster must use the same name."; + default = "galera"; + }; + + sstMethod = lib.mkOption { + type = lib.types.enum [ + "rsync" + "mariabackup" + ]; + description = "Method for the initial state transfer (wsrep_sst_method) when a node joins the cluster. Be aware that rsync needs SSH keys to be generated and authorized on all nodes!"; + default = "rsync"; + example = "mariabackup"; + }; + + localName = lib.mkOption { + type = lib.types.str; + description = "The unique name that identifies this particular node within the cluster. Each node must have a different name."; + example = "node1"; + }; + + localAddress = lib.mkOption { + type = lib.types.str; + description = "IP address or hostname of this node that will be used for cluster communication. Must be reachable by all other nodes."; + example = "1.2.3.4"; + default = cfg.galeraCluster.localName; + defaultText = lib.literalExpression "config.services.mysql.galeraCluster.localName"; + }; + + nodeAddresses = lib.mkOption { + type = lib.types.listOf lib.types.str; + description = "IP addresses or hostnames of all nodes in the cluster, including this node. This is used to construct the default clusterAddress connection string."; + example = lib.literalExpression ''["10.0.0.10" "10.0.0.20" "10.0.0.30"]''; + default = [ ]; + }; + + clusterPassword = lib.mkOption { + type = lib.types.str; + description = "Optional password for securing cluster communications. If provided, it will be used in the clusterAddress for authentication between nodes."; + example = "SomePassword"; + default = ""; + }; + + clusterAddress = lib.mkOption { + type = lib.types.str; + description = "Full Galera cluster connection string. If nodeAddresses is set, this will be auto-generated, but you can override it with a custom value. Format is typically 'gcomm://node1,node2,node3' with optional parameters."; + example = "gcomm://10.0.0.10,10.0.0.20,10.0.0.30?gmcast.seg=1:SomePassword"; + default = ""; # will be evaluate by generateClusterAddress + defaultText = lib.literalExpression generateClusterAddressExpr; + }; + + }; }; }; @@ -327,6 +406,30 @@ in ###### implementation config = lib.mkIf cfg.enable { + assertions = + [ + { + assertion = !cfg.galeraCluster.enable || isMariaDB; + message = "'services.mysql.galeraCluster.enable' expect services.mysql.package to be an mariadb variant"; + } + ] + # galeraCluster options checks + ++ lib.optionals cfg.galeraCluster.enable [ + { + assertion = + cfg.galeraCluster.localAddress != "" + && (cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != ""); + message = "mariadb galera cluster is enabled but the localAddress and (nodeAddresses or clusterAddress) are not set"; + } + { + assertion = cfg.galeraCluster.clusterPassword == "" || cfg.galeraCluster.clusterAddress == ""; + message = "mariadb galera clusterPassword is set but overwritten by clusterAddress"; + } + { + assertion = cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != ""; + message = "When services.mysql.galeraCluster.clusterAddress is set, setting services.mysql.galeraCluster.nodeAddresses is redundant and will be overwritten by clusterAddress. Choose one approach."; + } + ]; services.mysql.dataDir = lib.mkDefault ( if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql" @@ -351,8 +454,42 @@ in (lib.mkIf (!isMariaDB) { plugin-load-add = [ "auth_socket.so" ]; }) + (lib.mkIf cfg.galeraCluster.enable { + # Ensure Only InnoDB is used as galera clusters can only work with them + enforce_storage_engine = "InnoDB"; + default_storage_engine = "InnoDB"; + + # galera only support this binlog format + binlog-format = "ROW"; + + bind_address = lib.mkDefault "0.0.0.0"; + }) ]; + services.mysql.settings.galera = lib.optionalAttrs cfg.galeraCluster.enable { + wsrep_on = "ON"; + wsrep_debug = lib.mkDefault "NONE"; + wsrep_retry_autocommit = lib.mkDefault "3"; + wsrep_provider = "${cfg.galeraCluster.package}/lib/galera/libgalera_smm.so"; + + wsrep_cluster_name = cfg.galeraCluster.name; + wsrep_cluster_address = + if (cfg.galeraCluster.clusterAddress != "") then + cfg.galeraCluster.clusterAddress + else + generateClusterAddress; + + wsrep_node_address = cfg.galeraCluster.localAddress; + wsrep_node_name = "${cfg.galeraCluster.localName}"; + + # SST method using rsync + wsrep_sst_method = lib.mkDefault cfg.galeraCluster.sstMethod; + wsrep_sst_auth = lib.mkDefault "check_repl:check_pass"; + + binlog_format = "ROW"; + innodb_autoinc_lock_mode = 2; + }; + users.users = lib.optionalAttrs (cfg.user == "mysql") { mysql = { description = "MySQL server user"; @@ -384,11 +521,29 @@ in unitConfig.RequiresMountsFor = cfg.dataDir; - path = [ - # Needed for the mysql_install_db command in the preStart script - # which calls the hostname command. - pkgs.nettools - ]; + path = + [ + # Needed for the mysql_install_db command in the preStart script + # which calls the hostname command. + pkgs.nettools + ] + # tools 'wsrep_sst_rsync' needs + ++ lib.optionals cfg.galeraCluster.enable [ + cfg.package + pkgs.bash + pkgs.gawk + pkgs.gnutar + pkgs.gzip + pkgs.inetutils + pkgs.iproute2 + pkgs.netcat + pkgs.procps + pkgs.pv + pkgs.rsync + pkgs.socat + pkgs.stunnel + pkgs.which + ]; preStart = if isMariaDB then @@ -581,6 +736,17 @@ in }) ]; }; + + # Open firewall ports for MySQL (and Galera) + networking.firewall.allowedTCPPorts = lib.optionals cfg.galeraCluster.enable [ + 3306 # MySQL + 4567 # Galera Cluster + 4568 # Galera IST + 4444 # SST + ]; + networking.firewall.allowedUDPPorts = lib.optionals cfg.galeraCluster.enable [ + 4567 # Galera Cluster + ]; }; meta.maintainers = [ lib.maintainers._6543 ]; diff --git a/nixos/modules/services/databases/postgres-websockets.nix b/nixos/modules/services/databases/postgres-websockets.nix new file mode 100644 index 000000000000..a83054a507cb --- /dev/null +++ b/nixos/modules/services/databases/postgres-websockets.nix @@ -0,0 +1,221 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.postgres-websockets; + + # Turns an attrset of libpq connection params: + # { + # dbname = "postgres"; + # user = "authenticator"; + # } + # into a libpq connection string: + # dbname=postgres user=authenticator + PGWS_DB_URI = lib.pipe cfg.environment.PGWS_DB_URI [ + (lib.filterAttrs (_: v: v != null)) + (lib.mapAttrsToList (k: v: "${k}='${lib.escape [ "'" "\\" ] v}'")) + (lib.concatStringsSep " ") + ]; +in + +{ + meta = { + maintainers = with lib.maintainers; [ wolfgangwalther ]; + }; + + options.services.postgres-websockets = { + enable = lib.mkEnableOption "postgres-websockets"; + + pgpassFile = lib.mkOption { + type = + with lib.types; + nullOr (pathWith { + inStore = false; + absolute = true; + }); + default = null; + example = "/run/keys/db_password"; + description = '' + The password to authenticate to PostgreSQL with. + Not needed for peer or trust based authentication. + + The file must be a valid `.pgpass` file as described in: + + + In most cases, the following will be enough: + ``` + *:*:*:*: + ``` + ''; + }; + + jwtSecretFile = lib.mkOption { + type = + with lib.types; + nullOr (pathWith { + inStore = false; + absolute = true; + }); + example = "/run/keys/jwt_secret"; + description = '' + Secret used to sign JWT tokens used to open communications channels. + ''; + }; + + environment = lib.mkOption { + type = lib.types.submodule { + freeformType = with lib.types; attrsOf str; + + options = { + PGWS_DB_URI = lib.mkOption { + type = lib.types.submodule { + freeformType = with lib.types; attrsOf str; + + # This should not be used; use pgpassFile instead. + options.password = lib.mkOption { + default = null; + readOnly = true; + internal = true; + }; + # This should not be used; use pgpassFile instead. + options.passfile = lib.mkOption { + default = null; + readOnly = true; + internal = true; + }; + }; + default = { }; + description = '' + libpq connection parameters as documented in: + + + + ::: {.note} + The `environment.PGWS_DB_URI.password` and `environment.PGWS_DB_URI.passfile` options are blocked. + Use [`pgpassFile`](#opt-services.postgres-websockets.pgpassFile) instead. + ::: + ''; + example = lib.literalExpression '' + { + host = "localhost"; + dbname = "postgres"; + } + ''; + }; + + # This should not be used; use jwtSecretFile instead. + PGWS_JWT_SECRET = lib.mkOption { + default = null; + readOnly = true; + internal = true; + }; + + PGWS_HOST = lib.mkOption { + type = with lib.types; nullOr str; + default = "127.0.0.1"; + description = '' + Address the server will listen for websocket connections. + ''; + }; + }; + }; + default = { }; + description = '' + postgres-websockets configuration as defined in: + + + `PGWS_DB_URI` is represented as an attribute set, see [`environment.PGWS_DB_URI`](#opt-services.postgres-websockets.environment.PGWS_DB_URI) + + ::: {.note} + The `environment.PGWS_JWT_SECRET` option is blocked. + Use [`jwtSecretFile`](#opt-services.postgres-websockets.jwtSecretFile) instead. + ::: + ''; + example = lib.literalExpression '' + { + PGWS_LISTEN_CHANNEL = "my_channel"; + PGWS_DB_URI.dbname = "postgres"; + } + ''; + }; + }; + + config = lib.mkIf cfg.enable { + services.postgres-websockets.environment.PGWS_DB_URI.application_name = + with pkgs.postgres-websockets; + "${pname} ${version}"; + + systemd.services.postgres-websockets = { + description = "postgres-websockets"; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ + "network-online.target" + "postgresql.service" + ]; + + environment = + cfg.environment + // { + inherit PGWS_DB_URI; + PGWS_JWT_SECRET = "@%d/jwt_secret"; + } + // lib.optionalAttrs (cfg.pgpassFile != null) { + PGPASSFILE = "%C/postgres-websockets/pgpass"; + }; + + serviceConfig = { + CacheDirectory = "postgres-websockets"; + CacheDirectoryMode = "0700"; + LoadCredential = [ + "jwt_secret:${cfg.jwtSecretFile}" + ] ++ lib.optional (cfg.pgpassFile != null) "pgpass:${cfg.pgpassFile}"; + Restart = "always"; + User = "postgres-websockets"; + + # Hardening + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + DynamicUser = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateIPC = true; + PrivateMounts = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "" ]; + UMask = "0077"; + }; + + # Copy the pgpass file to different location, to have it report mode 0400. + # Fixes: https://github.com/systemd/systemd/issues/29435 + script = '' + if [ -f "$CREDENTIALS_DIRECTORY/pgpass" ]; then + cp -f "$CREDENTIALS_DIRECTORY/pgpass" "$CACHE_DIRECTORY/pgpass" + fi + exec ${lib.getExe pkgs.postgres-websockets} + ''; + }; + }; +} diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 34eabb1db6a7..e1256c9672f2 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -170,6 +170,38 @@ are already created. } ``` +## Authentication {#module-services-postgres-authentication} + +Local connections are made through unix sockets by default and support [peer authentication](https://www.postgresql.org/docs/current/auth-peer.html). +This allows system users to login with database roles of the same name. +For example, the `postgres` system user is allowed to login with the database role `postgres`. + +System users and database roles might not always match. +In this case, to allow access for a service, you can create a [user name map](https://www.postgresql.org/docs/current/auth-username-maps.html) between system roles and an existing database role. + +### User Mapping {#module-services-postgres-authentication-user-mapping} + +Assume that your app creates a role `admin` and you want the `root` user to be able to login with it. +You can then use [](#opt-services.postgresql.identMap) to define the map and [](#opt-services.postgresql.authentication) to enable it: + +```nix +services.postgresql = { + identMap = '' + admin root admin + ''; + authentication = '' + local all admin peer map=admin + ''; +} +``` + +::: {.warning} +To avoid conflicts with other modules, you should never apply a map to `all` roles. +Because PostgreSQL will stop on the first matching line in `pg_hba.conf`, a line matching all roles would lock out other services. +Each module should only manage user maps for the database roles that belong to this module. +Best practice is to name the map after the database role it manages to avoid name conflicts. +::: + ## Upgrading {#module-services-postgres-upgrading} ::: {.note} @@ -327,6 +359,37 @@ self: super: { } ``` +## Procedural Languages {#module-services-postgres-pls} + +PostgreSQL ships the additional procedural languages PL/Perl, PL/Python and PL/Tcl as extensions. +They are packaged as plugins and can be made available in the same way as external extensions: +```nix +{ + services.postgresql.extensions = ps: with ps; [ + plperl + plpython3 + pltcl + ]; +} +``` + +Each procedural language plugin provides a `.withPackages` helper to make language specific packages available at run-time. + +For example, to make `python3Packages.base58` available: +```nix +{ + services.postgresql.extensions = pgps: with pgps; [ + (plpython3.withPackages (pyps: with pyps; [ base58 ])) + ]; +} +``` + +This currently works for: +- `plperl` by re-using `perl.withPackages` +- `plpython3` by re-using `python3.withPackages` +- `plr` by exposing `rPackages` +- `pltcl` by exposing `tclPackages` + ## JIT (Just-In-Time compilation) {#module-services-postgres-jit} [JIT](https://www.postgresql.org/docs/current/jit-reason.html)-support in the PostgreSQL package diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 99f36d85a943..48ff4c2a48ef 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -90,6 +90,12 @@ in "extraConfig" ] "Use services.postgresql.settings instead.") + (mkRemovedOptionModule [ + "services" + "postgresql" + "recoveryConfig" + ] "PostgreSQL v12+ doesn't support recovery.conf.") + (mkRenamedOptionModule [ "services" "postgresql" "logLinePrefix" ] [ "services" "postgresql" "settings" "log_line_prefix" ] @@ -268,6 +274,14 @@ in Defines the mapping from system users to database users. See the [auth doc](https://postgresql.org/docs/current/auth-username-maps.html). + + There is a default map "postgres" which is used for local peer authentication + as the postgres superuser role. + For example, to allow the root user to login as the postgres superuser, add: + + ``` + postgres root postgres + ``` ''; }; @@ -588,14 +602,6 @@ in ''; }; - recoveryConfig = mkOption { - type = types.nullOr types.lines; - default = null; - description = '' - Contents of the {file}`recovery.conf` file. - ''; - }; - superUser = mkOption { type = types.str; default = "postgres"; @@ -676,12 +682,20 @@ in (mkBefore "# Generated file; do not edit!") (mkAfter '' # default value of services.postgresql.authentication + local all postgres peer map=postgres local all all peer host all all 127.0.0.1/32 md5 host all all ::1/128 md5 '') ]; + # The default allows to login with the same database username as the current system user. + # This is the default for peer authentication without a map, but needs to be made explicit + # once a map is used. + services.postgresql.identMap = mkAfter '' + postgres postgres postgres + ''; + services.postgresql.systemCallFilter = mkMerge [ (mapAttrs (const mkDefault) { "@system-service" = true; @@ -741,10 +755,6 @@ in fi ln -sfn "${configFile}/postgresql.conf" "${cfg.dataDir}/postgresql.conf" - ${optionalString (cfg.recoveryConfig != null) '' - ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \ - "${cfg.dataDir}/recovery.conf" - ''} ''; # Wait for PostgreSQL to be ready to accept connections. diff --git a/nixos/modules/services/databases/postgrest.nix b/nixos/modules/services/databases/postgrest.nix index 34d36bae0bee..e9e03089a8b2 100644 --- a/nixos/modules/services/databases/postgrest.nix +++ b/nixos/modules/services/databases/postgrest.nix @@ -245,6 +245,10 @@ in lib.optional (cfg.settings.admin-server-port != null && cfg.settings.server-host != "127.0.0.1") "The PostgREST admin server is potentially listening on a public host. This may expose sensitive information via the `/config` endpoint."; + # Since we're using DynamicUser, we can't add the e.g. nginx user to + # a postgrest group, so the unix socket must be world-readable to make it useful. + services.postgrest.settings.service-unix-socket-mode = "666"; + systemd.services.postgrest = { description = "PostgREST"; diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index 576cbe1438ec..18ac3f4836f3 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -14,12 +14,7 @@ let cfg = config.services.desktopManager.cosmic; in { - meta.maintainers = with lib.maintainers; [ - thefossguy - HeitorAugustoLN - nyabinary - ahoneybun - ]; + meta.maintainers = lib.teams.cosmic.members; options = { services.desktopManager.cosmic = { @@ -45,7 +40,7 @@ in cosmic-applets cosmic-applibrary cosmic-bg - (cosmic-comp.override { useXWayland = false; }) + cosmic-comp cosmic-edit cosmic-files config.services.displayManager.cosmic-greeter.package diff --git a/nixos/modules/services/desktops/dleyna-renderer.nix b/nixos/modules/services/desktops/dleyna-renderer.nix deleted file mode 100644 index 78375735e6e1..000000000000 --- a/nixos/modules/services/desktops/dleyna-renderer.nix +++ /dev/null @@ -1,29 +0,0 @@ -# dleyna-renderer service. -{ - config, - lib, - pkgs, - ... -}: -{ - ###### interface - options = { - services.dleyna-renderer = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable dleyna-renderer service, a DBus service - for handling DLNA renderers. - ''; - }; - }; - }; - - ###### implementation - config = lib.mkIf config.services.dleyna-renderer.enable { - environment.systemPackages = [ pkgs.dleyna-renderer ]; - - services.dbus.packages = [ pkgs.dleyna-renderer ]; - }; -} diff --git a/nixos/modules/services/desktops/dleyna-server.nix b/nixos/modules/services/desktops/dleyna-server.nix deleted file mode 100644 index e36340405790..000000000000 --- a/nixos/modules/services/desktops/dleyna-server.nix +++ /dev/null @@ -1,29 +0,0 @@ -# dleyna-server service. -{ - config, - lib, - pkgs, - ... -}: -{ - ###### interface - options = { - services.dleyna-server = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable dleyna-server service, a DBus service - for handling DLNA servers. - ''; - }; - }; - }; - - ###### implementation - config = lib.mkIf config.services.dleyna-server.enable { - environment.systemPackages = [ pkgs.dleyna-server ]; - - services.dbus.packages = [ pkgs.dleyna-server ]; - }; -} diff --git a/nixos/modules/services/desktops/dleyna.nix b/nixos/modules/services/desktops/dleyna.nix new file mode 100644 index 000000000000..f34e3250067d --- /dev/null +++ b/nixos/modules/services/desktops/dleyna.nix @@ -0,0 +1,33 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + imports = [ + (lib.mkRenamedOptionModule [ "services" "dleyna-server" ] [ "services" "dleyna" ]) + (lib.mkRenamedOptionModule [ "services" "dleyna-renderer" ] [ "services" "dleyna" ]) + ]; + + ###### interface + options = { + services.dleyna = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable dleyna-renderer and dleyna-server service, + a DBus service for handling DLNA servers and renderers. + ''; + }; + }; + }; + + ###### implementation + config = lib.mkIf config.services.dleyna.enable { + environment.systemPackages = [ pkgs.dleyna ]; + + services.dbus.packages = [ pkgs.dleyna ]; + }; +} diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index bc5d52f9e374..b9d423acf9f3 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -180,7 +180,7 @@ in geoProviderUrl = lib.mkOption { type = lib.types.str; - default = "https://location.services.mozilla.com/v1/geolocate?key=geoclue"; + default = "https://api.beacondb.net/v1/geolocate"; example = "https://www.googleapis.com/geolocation/v1/geolocate?key=YOUR_KEY"; description = '' The url to the wifi GeoLocation Service. @@ -210,7 +210,7 @@ in submissionUrl = lib.mkOption { type = lib.types.str; - default = "https://location.services.mozilla.com/v1/submit?key=geoclue"; + default = "https://api.beacondb.net/v2/geosubmit"; description = '' The url to submit data to a GeoLocation Service. ''; diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix deleted file mode 100644 index 96a54889babf..000000000000 --- a/nixos/modules/services/desktops/gsignond.nix +++ /dev/null @@ -1,46 +0,0 @@ -# Accounts-SSO gSignOn daemon -{ - config, - lib, - pkgs, - ... -}: -let - package = pkgs.gsignond.override { plugins = config.services.gsignond.plugins; }; -in -{ - - meta.maintainers = [ ]; - - ###### interface - - options = { - - services.gsignond = { - - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable gSignOn daemon, a DBus service - which performs user authentication on behalf of its clients. - ''; - }; - - plugins = lib.mkOption { - type = lib.types.listOf lib.types.package; - default = [ ]; - description = '' - What plugins to use with the gSignOn daemon. - ''; - }; - }; - }; - - ###### implementation - config = lib.mkIf config.services.gsignond.enable { - environment.etc."gsignond.conf".source = "${package}/etc/gsignond.conf"; - services.dbus.packages = [ package ]; - }; - -} diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix index d4aac1aa0c26..cfab2c3a413f 100644 --- a/nixos/modules/services/desktops/telepathy.nix +++ b/nixos/modules/services/desktops/telepathy.nix @@ -41,7 +41,6 @@ # Enable runtime optional telepathy in gnome-shell services.xserver.desktopManager.gnome.sessionPath = with pkgs; [ telepathy-glib - telepathy-logger ]; }; diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix index aa4243cfa700..80ca40e23d99 100644 --- a/nixos/modules/services/display-managers/cosmic-greeter.nix +++ b/nixos/modules/services/display-managers/cosmic-greeter.nix @@ -12,15 +12,11 @@ let cfg = config.services.displayManager.cosmic-greeter; + cfgAutoLogin = config.services.displayManager.autoLogin; in { - meta.maintainers = with lib.maintainers; [ - thefossguy - HeitorAugustoLN - nyabinary - ahoneybun - ]; + meta.maintainers = lib.teams.cosmic.members; options.services.displayManager.cosmic-greeter = { enable = lib.mkEnableOption "COSMIC greeter"; @@ -35,6 +31,10 @@ in user = "cosmic-greeter"; command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-greeter ${lib.getExe pkgs.cosmic-comp} ${lib.getExe cfg.package}''; }; + initial_session = lib.mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) { + user = cfgAutoLogin.user; + command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-session ${lib.getExe pkgs.cosmic-session}''; + }; }; }; diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 50bca3596032..65211763e5a2 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -73,7 +73,8 @@ in serviceConfig = { Type = "notify"; ExecStart = "${pkgs.runtimeShell} -c 'source ${config.system.build.setEnvironment}; exec ${cfg.package}/bin/emacs --fg-daemon'"; - ExecStop = "${cfg.package}/bin/emacsclient --eval (kill-emacs)"; + # Emacs exits with exit code 15 (SIGTERM), when stopped by systemd. + SuccessExitStatus = 15; Restart = "always"; }; diff --git a/nixos/modules/services/games/deliantra-server.nix b/nixos/modules/services/games/deliantra-server.nix deleted file mode 100644 index 4854731714f7..000000000000 --- a/nixos/modules/services/games/deliantra-server.nix +++ /dev/null @@ -1,182 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.services.deliantra-server; - serverPort = 13327; -in -{ - options.services.deliantra-server = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - If enabled, the Deliantra game server will be started at boot. - ''; - }; - - package = lib.mkPackageOption pkgs "deliantra-server" { - extraDescription = '' - ::: {.note} - This will also be used for map/arch data, if you don't change {option}`dataDir` - ::: - ''; - }; - - dataDir = lib.mkOption { - type = lib.types.str; - default = "${pkgs.deliantra-data}"; - defaultText = lib.literalExpression ''"''${pkgs.deliantra-data}"''; - description = '' - Where to store readonly data (maps, archetypes, sprites, etc). - Note that if you plan to use the live map editor (rather than editing - the maps offline and then nixos-rebuilding), THIS MUST BE WRITEABLE -- - copy the deliantra-data someplace writeable (say, - /var/lib/deliantra/data) and update this option accordingly. - ''; - }; - - stateDir = lib.mkOption { - type = lib.types.str; - default = "/var/lib/deliantra"; - description = '' - Where to store runtime data (save files, persistent items, etc). - - If left at the default, this will be automatically created on server - startup if it does not already exist. If changed, it is the admin's - responsibility to make sure that the directory exists and is writeable - by the `crossfire` user. - ''; - }; - - openFirewall = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to open ports in the firewall for the server. - ''; - }; - - configFiles = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - description = '' - Contents of the server configuration files. These will be appended to - the example configurations the server comes with and overwrite any - default settings defined therein. - - The example here is not comprehensive. See the files in - /etc/deliantra-server after enabling this module for full documentation. - ''; - example = lib.literalExpression '' - { - dm_file = ''' - admin:secret_password:localhost - alice:xyzzy:* - '''; - motd = "Welcome to Deliantra!"; - settings = ''' - # Settings for game mechanics. - stat_loss_on_death true - armor_max_enchant 7 - '''; - config = ''' - # Settings for the server daemon. - hiscore_url https://deliantra.example.net/scores/ - max_map_reset 86400 - '''; - } - ''; - default = { - motd = ""; - }; - }; - }; - - config = lib.mkIf cfg.enable { - users.users.deliantra = { - description = "Deliantra server daemon user"; - home = cfg.stateDir; - createHome = false; - isSystemUser = true; - group = "deliantra"; - }; - users.groups.deliantra = { }; - - # Merge the cfg.configFiles setting with the default files shipped with - # Deliantra. - # For most files this consists of reading - # ${deliantra}/etc/deliantra-server/${name} and appending the user setting - # to it. - environment.etc = - lib.attrsets.mapAttrs' - ( - name: value: - lib.attrsets.nameValuePair "deliantra-server/${name}" { - mode = "0644"; - text = - # Deliantra doesn't come with a motd file, but respects it if present - # in /etc. - (lib.optionalString (name != "motd") ( - lib.fileContents "${cfg.package}/etc/deliantra-server/${name}" - )) - + "\n${value}"; - } - ) - ( - { - motd = ""; - settings = ""; - config = ""; - dm_file = ""; - } - // cfg.configFiles - ); - - systemd.services.deliantra-server = { - description = "Deliantra Server Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - environment = { - DELIANTRA_DATADIR = "${cfg.dataDir}"; - DELIANTRA_LOCALDIR = "${cfg.stateDir}"; - DELIANTRA_CONFDIR = "/etc/deliantra-server"; - }; - - serviceConfig = lib.mkMerge [ - { - ExecStart = "${cfg.package}/bin/deliantra-server"; - Restart = "always"; - User = "deliantra"; - Group = "deliantra"; - WorkingDirectory = cfg.stateDir; - } - (lib.mkIf (cfg.stateDir == "/var/lib/deliantra") { - StateDirectory = "deliantra"; - }) - ]; - - # The deliantra server needs access to a bunch of files at runtime that - # are not created automatically at server startup; they're meant to be - # installed in $PREFIX/var/deliantra-server by `make install`. And those - # files need to be writeable, so we can't just point at the ones in the - # nix store. Instead we take the approach of copying them out of the store - # on first run. If `bookarch` already exists, we assume the rest of the - # files do as well, and copy nothing -- otherwise we risk ovewriting - # server state information every time the server is upgraded. - preStart = '' - if [ ! -e "${cfg.stateDir}"/bookarch ]; then - ${pkgs.rsync}/bin/rsync -a --chmod=u=rwX,go=rX \ - "${cfg.package}/var/deliantra-server/" "${cfg.stateDir}/" - fi - ''; - }; - - networking.firewall = lib.mkIf cfg.openFirewall { - allowedTCPPorts = [ serverPort ]; - }; - }; -} diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index 55061eeccded..a4d82a6779bf 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -45,7 +45,7 @@ let # To be able to open the firewall, we need to read out port values in the # server properties, but fall back to the defaults when those don't exist. - # These defaults are from https://minecraft.gamepedia.com/Server.properties#Java_Edition_3 + # These defaults are from https://minecraft.wiki/w/Server.properties#Java_Edition defaultServerPort = 25565; serverPort = cfg.serverProperties.server-port or defaultServerPort; @@ -93,10 +93,8 @@ in type = lib.types.bool; default = false; description = '' - Whether you agree to - [ - Mojangs EULA](https://account.mojang.com/documents/minecraft_eula). This option must be set to - `true` to run Minecraft server. + Whether you agree to [Mojangs EULA](https://www.minecraft.net/eula). + This option must be set to `true` to run Minecraft server. ''; }; @@ -167,10 +165,10 @@ in } ''; description = '' - Minecraft server properties for the server.properties file. Only has + Minecraft server properties forthe server.properties file. Only has an effect when {option}`services.minecraft-server.declarative` is set to `true`. See - + for documentation on these values. ''; }; @@ -182,7 +180,7 @@ in jvmOpts = lib.mkOption { type = lib.types.separatedString " "; default = "-Xmx2048M -Xms2048M"; - # Example options from https://minecraft.gamepedia.com/Tutorials/Server_startup_script + # Example options from https://minecraft.wiki/w/Tutorial:Server_startup_script example = "-Xms4092M -Xmx4092M -XX:+UseG1GC -XX:+CMSIncrementalPacing " + "-XX:+CMSClassUnloadingEnabled -XX:ParallelGCThreads=2 " diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index d8907d554d33..47fb322e56d2 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -143,6 +143,8 @@ in { wantedBy = [ "bluetooth.target" ]; aliases = [ "dbus-org.bluez.service" ]; + # restarting can leave people without a mouse/keyboard + restartIfChanged = false; serviceConfig = { ExecStart = [ "" @@ -151,6 +153,7 @@ in CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" # sockets and tethering ]; + ConfigurationDirectoryMode = "0755"; NoNewPrivileges = true; RestrictNamespaces = true; ProtectControlGroups = true; @@ -171,8 +174,6 @@ in PrivateNetwork = false; # tethering }; - # restarting can leave people without a mouse/keyboard - unitConfig.X-RestartIfChanged = false; }; } // (optionalAttrs cfg.hsphfpd.enable { diff --git a/nixos/modules/services/hardware/hddfancontrol.nix b/nixos/modules/services/hardware/hddfancontrol.nix index 942425d63f7e..a1e36012893d 100644 --- a/nixos/modules/services/hardware/hddfancontrol.nix +++ b/nixos/modules/services/hardware/hddfancontrol.nix @@ -18,64 +18,162 @@ in "hddfancontrol" "smartctl" ] "Smartctl is now automatically used when necessary, which makes this option redundant") + (lib.mkRemovedOptionModule [ + "services" + "hddfancontrol" + "disks" + ] "Disks should now be specified per hddfancontrol instance in its attrset") + (lib.mkRemovedOptionModule [ + "services" + "hddfancontrol" + "pwmPaths" + ] "Pwm Paths should now be specified per hddfancontrol instance in its attrset") + (lib.mkRemovedOptionModule [ + "services" + "hddfancontrol" + "logVerbosity" + ] "Log Verbosity should now be specified per hddfancontrol instance in its attrset") + (lib.mkRemovedOptionModule [ + "services" + "hddfancontrol" + "extraArgs" + ] "Extra Args should now be specified per hddfancontrol instance in its attrset") ]; options = { services.hddfancontrol.enable = lib.mkEnableOption "hddfancontrol daemon"; - services.hddfancontrol.disks = lib.mkOption { - type = lib.types.listOf lib.types.path; - default = [ ]; - description = '' - Drive(s) to get temperature from - ''; - example = [ "/dev/sda" ]; - }; + services.hddfancontrol.settings = lib.mkOption { + type = lib.types.attrsWith { + placeholder = "drive-bay-name"; + elemType = ( + lib.types.submodule ( + { ... }: + { + options = { + disks = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = '' + Drive(s) to get temperature from + ''; + example = [ "/dev/sda" ]; + }; - services.hddfancontrol.pwmPaths = lib.mkOption { - type = lib.types.listOf lib.types.path; - default = [ ]; - description = '' - PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values - ''; - example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ]; - }; + pwmPaths = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = '' + PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values + ''; + example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ]; + }; - services.hddfancontrol.logVerbosity = lib.mkOption { - type = lib.types.enum [ - "TRACE" - "DEBUG" - "INFO" - "WARN" - "ERROR" - ]; - default = "INFO"; - description = '' - Verbosity of the log level - ''; - }; + logVerbosity = lib.mkOption { + type = lib.types.enum [ + "TRACE" + "DEBUG" + "INFO" + "WARN" + "ERROR" + ]; + default = "INFO"; + description = '' + Verbosity of the log level + ''; + }; - services.hddfancontrol.extraArgs = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Extra commandline arguments for hddfancontrol + ''; + example = [ + "--min-fan-speed-prct=10" + "--interval=1min" + ]; + }; + }; + } + ) + ); + }; + default = { }; description = '' - Extra commandline arguments for hddfancontrol + Parameter-sets for each instance of hddfancontrol. + ''; + example = lib.literalExpression '' + { + harddrives = { + disks = [ + "/dev/sda" + "/dev/sdb" + "/dev/sdc" + ]; + pwmPaths = [ + "/sys/class/hwmon/hwmon1/pwm1:25:10" + ]; + logVerbosity = "DEBUG"; + }; + ssddrives = { + disks = [ + "/dev/sdd" + "/dev/sde" + "/dev/sdf" + ]; + pwmPaths = [ + "/sys/class/hwmon/hwmon1/pwm2:25:10" + ]; + extraArgs = [ + "--interval=30s" + ]; + }; + } ''; - example = [ - "--min-fan-speed-prct=10" - "--interval=1min" - ]; }; }; config = lib.mkIf cfg.enable ( let - args = lib.concatLists [ - [ "-d" ] - cfg.disks - [ "-p" ] - cfg.pwmPaths - cfg.extraArgs + args = + cnf: + lib.concatLists [ + [ "-d" ] + cnf.disks + [ "-p" ] + cnf.pwmPaths + cnf.extraArgs + ]; + + createService = cnf: { + description = "HDD fan control"; + documentation = [ "man:hddfancontrol(1)" ]; + after = [ "hddtemp.service" ]; + wants = [ "hddtemp.service" ]; + serviceConfig = { + ExecStart = "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${lib.escapeShellArgs (args cnf)}"; + + CPUSchedulingPolicy = "rr"; + CPUSchedulingPriority = 49; + + ProtectSystem = "strict"; + PrivateTmp = true; + ProtectHome = true; + SystemCallArchitectures = "native"; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + }; + wantedBy = [ "multi-user.target" ]; + }; + + services = lib.attrsets.mergeAttrsList [ + (lib.attrsets.mapAttrs' ( + name: cnf: lib.nameValuePair "hddfancontrol-${name}" (createService cnf) + ) cfg.settings) + { + "hddfancontrol".enable = false; + } ]; in { @@ -83,16 +181,10 @@ in hardware.sensor.hddtemp = { enable = true; - drives = cfg.disks; + drives = lib.lists.flatten (lib.attrsets.catAttrs "disks" (lib.attrsets.attrValues cfg.settings)); }; - systemd.services.hddfancontrol = { - wantedBy = [ "multi-user.target" ]; - environment = { - HDDFANCONTROL_LOG_LEVEL = cfg.logVerbosity; - HDDFANCONTROL_DAEMON_ARGS = lib.escapeShellArgs args; - }; - }; + systemd.services = services; } ); } diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix index 78b7ec080289..bf4e5632271a 100644 --- a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix +++ b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix @@ -39,7 +39,7 @@ writeScriptBin "nvidia-cdi-generator" '' --device-name-strategy ${deviceNameStrategy} \ --ldconfig-path ${lib.getExe' glibc "ldconfig"} \ --library-search-path ${lib.getLib nvidia-driver}/lib \ - --nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} + --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"} } function additionalMount { diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix index 8b5c5c95b12e..af94fbe6a45b 100644 --- a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix +++ b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix @@ -50,6 +50,15 @@ ''; }; + suppressNvidiaDriverAssertion = lib.mkOption { + default = false; + type = lib.types.bool; + description = '' + Suppress the assertion for installing Nvidia driver. + Useful in WSL where drivers are mounted from Windows, not provided by NixOS. + ''; + }; + mounts = lib.mkOption { type = lib.types.listOf (lib.types.submodule mountType); default = [ ]; @@ -98,8 +107,10 @@ assertions = [ { assertion = - config.hardware.nvidia.datacenter.enable || lib.elem "nvidia" config.services.xserver.videoDrivers; - message = ''`nvidia-container-toolkit` requires nvidia datacenter or desktop drivers: set `hardware.nvidia.datacenter.enable` or add "nvidia" to `services.xserver.videoDrivers`''; + config.hardware.nvidia.datacenter.enable + || lib.elem "nvidia" config.services.xserver.videoDrivers + || config.hardware.nvidia-container-toolkit.suppressNvidiaDriverAssertion; + message = ''`nvidia-container-toolkit` requires nvidia drivers: set `hardware.nvidia.datacenter.enable`, add "nvidia" to `services.xserver.videoDrivers`, or set `hardware.nvidia-container-toolkit.suppressNvidiaDriverAssertion` if the driver is provided by another NixOS module (e.g. from NixOS-WSL)''; } ]; diff --git a/nixos/modules/services/hardware/pid-fan-controller.nix b/nixos/modules/services/hardware/pid-fan-controller.nix new file mode 100644 index 000000000000..a90e515868d4 --- /dev/null +++ b/nixos/modules/services/hardware/pid-fan-controller.nix @@ -0,0 +1,188 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.services.pid-fan-controller; + heatSource = { + options = { + name = lib.mkOption { + type = lib.types.uniq lib.types.nonEmptyStr; + description = "Name of the heat source."; + }; + wildcardPath = lib.mkOption { + type = lib.types.nonEmptyStr; + description = '' + Path of the heat source's `hwmon` `temp_input` file. + This path can contain multiple wildcards, but has to resolve to + exactly one result. + ''; + }; + pidParams = { + setPoint = lib.mkOption { + type = lib.types.ints.unsigned; + description = "Set point of the controller in °C."; + }; + P = lib.mkOption { + description = "K_p of PID controller."; + type = lib.types.float; + }; + I = lib.mkOption { + description = "K_i of PID controller."; + type = lib.types.float; + }; + D = lib.mkOption { + description = "K_d of PID controller."; + type = lib.types.float; + }; + }; + }; + }; + + fan = { + options = { + wildcardPath = lib.mkOption { + type = lib.types.str; + description = '' + Wildcard path of the `hwmon` `pwm` file. + If the fans are not to be found in `/sys/class/hwmon/hwmon*` the corresponding + kernel module (like `nct6775`) needs to be added to `boot.kernelModules`. + See the [`hwmon` Documentation](https://www.kernel.org/doc/html/latest/hwmon/index.html). + ''; + }; + minPwm = lib.mkOption { + default = 0; + type = lib.types.ints.u8; + description = "Minimum PWM value."; + }; + maxPwm = lib.mkOption { + default = 255; + type = lib.types.ints.u8; + description = "Maximum PWM value."; + }; + cutoff = lib.mkOption { + default = false; + type = lib.types.bool; + description = "Whether to stop the fan when `minPwm` is reached."; + }; + heatPressureSrcs = lib.mkOption { + type = lib.types.nonEmptyListOf lib.types.str; + description = "Heat pressure sources affected by the fan."; + }; + }; + }; +in +{ + options.services.pid-fan-controller = { + enable = lib.mkEnableOption "the PID fan controller, which controls the configured fans by running a closed-loop PID control loop"; + package = lib.mkPackageOption pkgs "pid-fan-controller" { }; + settings = { + interval = lib.mkOption { + default = 500; + type = lib.types.int; + description = "Interval between controller cycles in milliseconds."; + }; + heatSources = lib.mkOption { + type = lib.types.listOf (lib.types.submodule heatSource); + description = "List of heat sources to be monitored."; + example = '' + [ + { + name = "cpu"; + wildcardPath = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon*/temp1_input"; + pidParams = { + setPoint = 60; + P = -5.0e-3; + I = -2.0e-3; + D = -6.0e-3; + }; + } + ]; + ''; + }; + fans = lib.mkOption { + type = lib.types.listOf (lib.types.submodule fan); + description = "List of fans to be controlled."; + example = '' + [ + { + wildcardPath = "/sys/devices/platform/nct6775.2592/hwmon/hwmon*/pwm1"; + minPwm = 60; + maxPwm = 255; + heatPressureSrcs = [ + "cpu" + "gpu" + ]; + } + ]; + ''; + }; + }; + }; + config = lib.mkIf cfg.enable { + #map camel cased attrs into snake case for config + environment.etc."pid-fan-settings.json".text = builtins.toJSON { + interval = cfg.settings.interval; + heat_srcs = map (heatSrc: { + name = heatSrc.name; + wildcard_path = heatSrc.wildcardPath; + PID_params = { + set_point = heatSrc.pidParams.setPoint; + P = heatSrc.pidParams.P; + I = heatSrc.pidParams.I; + D = heatSrc.pidParams.D; + }; + }) cfg.settings.heatSources; + fans = map (fan: { + wildcard_path = fan.wildcardPath; + min_pwm = fan.minPwm; + max_pwm = fan.maxPwm; + cutoff = fan.cutoff; + heat_pressure_srcs = fan.heatPressureSrcs; + }) cfg.settings.fans; + }; + + systemd.services.pid-fan-controller = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = [ (lib.getExe cfg.package) ]; + ExecStopPost = [ "${lib.getExe cfg.package} disable" ]; + Restart = "always"; + #This service needs to run as root to write to /sys. + #therefore it should operate with the least amount of privileges needed + ProtectHome = "yes"; + #strict is not possible as it needs /sys + ProtectSystem = "full"; + ProtectProc = "invisible"; + PrivateNetwork = "yes"; + NoNewPrivileges = "yes"; + MemoryDenyWriteExecute = "yes"; + RestrictNamespaces = "~user pid net uts mnt"; + ProtectKernelModules = "yes"; + RestrictRealtime = "yes"; + SystemCallFilter = "@system-service"; + CapabilityBoundingSet = "~CAP_KILL CAP_WAKE_ALARM CAP_IPC_LOC CAP_BPF CAP_LINUX_IMMUTABLE CAP_BLOCK_SUSPEND CAP_MKNOD"; + }; + # restart unit if config changed + restartTriggers = [ config.environment.etc."pid-fan-settings.json".source ]; + }; + #sleep hook to restart the service as it breaks otherwise + systemd.services.pid-fan-controller-sleep = { + before = [ "sleep.target" ]; + wantedBy = [ "sleep.target" ]; + unitConfig = { + StopWhenUnneeded = "yes"; + }; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = [ "systemctl stop pid-fan-controller.service" ]; + ExecStop = [ "systemctl restart pid-fan-controller.service" ]; + }; + }; + }; + meta.maintainers = with lib.maintainers; [ zimward ]; +} diff --git a/nixos/modules/services/hardware/spacenavd.nix b/nixos/modules/services/hardware/spacenavd.nix index db3ab37dc267..ddc3f1dc1b59 100644 --- a/nixos/modules/services/hardware/spacenavd.nix +++ b/nixos/modules/services/hardware/spacenavd.nix @@ -17,7 +17,10 @@ in config = lib.mkIf cfg.enable { systemd = { packages = [ pkgs.spacenavd ]; - services.spacenavd.enable = true; + services.spacenavd = { + enable = true; + wantedBy = [ "graphical.target" ]; + }; }; }; } diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 1284dc86f0a7..0d5a001c0e59 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -55,6 +55,13 @@ let preferLocalBuild = true; allowSubstitutes = false; packages = lib.unique (map toString udevPackages); + + nativeBuildInputs = [ + # We only include the out output here to avoid needing to include all + # other outputs in the installer tests as well + # We only need the udevadm command anyway + pkgs.systemdMinimal.out + ]; } '' mkdir -p $out @@ -147,6 +154,11 @@ let exit 1 fi + # Verify all the udev rules + echo "Verifying udev rules using udevadm verify..." + udevadm verify --resolve-names=never --no-style $out + echo "OK" + # If auto-configuration is disabled, then remove # udev's 80-drivers.rules file, which contains rules for # automatically calling modprobe. diff --git a/nixos/modules/services/home-automation/evcc.nix b/nixos/modules/services/home-automation/evcc.nix index 32d327da9a84..9708a3ce16f1 100644 --- a/nixos/modules/services/home-automation/evcc.nix +++ b/nixos/modules/services/home-automation/evcc.nix @@ -113,6 +113,7 @@ in "AF_INET" "AF_INET6" "AF_UNIX" + "AF_NETLINK" ]; RestrictNamespaces = true; RestrictRealtime = true; diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index eda79e890193..2887e5754173 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -20,6 +20,7 @@ let filter filterAttrsRecursive flatten + getAttr hasAttrByPath isAttrs isDerivation @@ -111,7 +112,9 @@ let hasAttrByPath (splitString "." component) cfg.config || useComponentPlatform component || useExplicitComponent component - || builtins.elem component (cfg.extraComponents ++ cfg.defaultIntegrations); + || builtins.elem component ( + cfg.extraComponents ++ cfg.defaultIntegrations ++ map (getAttr "domain") cfg.customComponents + ); # Final list of components passed into the package to include required dependencies extraComponents = filter useComponent availableComponents; @@ -842,6 +845,7 @@ in # Custom components, maintained manually. "amshan" + "benqprojector" ]; in { diff --git a/nixos/modules/services/home-automation/wyoming/piper.nix b/nixos/modules/services/home-automation/wyoming/piper.nix index b4029eb631f2..bf14d4ce85c6 100644 --- a/nixos/modules/services/home-automation/wyoming/piper.nix +++ b/nixos/modules/services/home-automation/wyoming/piper.nix @@ -164,7 +164,7 @@ in DeviceAllow = ""; DevicePolicy = "closed"; LockPersonality = true; - MemoryDenyWriteExecute = true; + MemoryDenyWriteExecute = false; # required for onnxruntime PrivateDevices = true; PrivateUsers = true; ProtectHome = true; diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix deleted file mode 100644 index 6def179e5e10..000000000000 --- a/nixos/modules/services/mail/clamsmtp.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.services.clamsmtp; - clamdSocket = "/run/clamav/clamd.ctl"; # See services/security/clamav.nix -in -{ - ##### interface - options = { - services.clamsmtp = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Whether to enable clamsmtp."; - }; - - instances = lib.mkOption { - description = "Instances of clamsmtp to run."; - type = lib.types.listOf ( - lib.types.submodule { - options = { - action = lib.mkOption { - type = lib.types.enum [ - "bounce" - "drop" - "pass" - ]; - default = "drop"; - description = '' - Action to take when a virus is detected. - - Note that viruses often spoof sender addresses, so bouncing is - in most cases not a good idea. - ''; - }; - - header = lib.mkOption { - type = lib.types.str; - default = ""; - example = "X-Virus-Scanned: ClamAV using ClamSMTP"; - description = '' - A header to add to scanned messages. See {manpage}`clamsmtpd.conf(5)` for - more details. Empty means no header. - ''; - }; - - keepAlives = lib.mkOption { - type = lib.types.int; - default = 0; - description = '' - Number of seconds to wait between each NOOP sent to the sending - server. 0 to disable. - - This is meant for slow servers where the sending MTA times out - waiting for clamd to scan the file. - ''; - }; - - listen = lib.mkOption { - type = lib.types.str; - example = "127.0.0.1:10025"; - description = '' - Address to wait for incoming SMTP connections on. See - {manpage}`clamsmtpd.conf(5)` for more details. - ''; - }; - - quarantine = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to quarantine files that contain viruses by leaving them - in the temporary directory. - ''; - }; - - maxConnections = lib.mkOption { - type = lib.types.int; - default = 64; - description = "Maximum number of connections to accept at once."; - }; - - outAddress = lib.mkOption { - type = lib.types.str; - description = '' - Address of the SMTP server to send email to once it has been - scanned. - ''; - }; - - tempDirectory = lib.mkOption { - type = lib.types.str; - default = "/tmp"; - description = '' - Temporary directory that needs to be accessible to both clamd - and clamsmtpd. - ''; - }; - - timeout = lib.mkOption { - type = lib.types.int; - default = 180; - description = "Time-out for network connections."; - }; - - transparentProxy = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable clamsmtp's transparent proxy support."; - }; - - virusAction = lib.mkOption { - type = with lib.types; nullOr path; - default = null; - description = '' - Command to run when a virus is found. Please see VIRUS ACTION in - {manpage}`clamsmtpd(8)` for a discussion of this option and its safe use. - ''; - }; - - xClient = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Send the XCLIENT command to the receiving server, for forwarding - client addresses and connection information if the receiving - server supports this feature. - ''; - }; - }; - } - ); - }; - }; - }; - - ##### implementation - config = - let - configfile = - conf: - pkgs.writeText "clamsmtpd.conf" '' - Action: ${conf.action} - ClamAddress: ${clamdSocket} - Header: ${conf.header} - KeepAlives: ${toString conf.keepAlives} - Listen: ${conf.listen} - Quarantine: ${if conf.quarantine then "on" else "off"} - MaxConnections: ${toString conf.maxConnections} - OutAddress: ${conf.outAddress} - TempDirectory: ${conf.tempDirectory} - TimeOut: ${toString conf.timeout} - TransparentProxy: ${if conf.transparentProxy then "on" else "off"} - User: clamav - ${lib.optionalString (conf.virusAction != null) "VirusAction: ${conf.virusAction}"} - XClient: ${if conf.xClient then "on" else "off"} - ''; - in - lib.mkIf cfg.enable { - assertions = [ - { - assertion = config.services.clamav.daemon.enable; - message = "clamsmtp requires clamav to be enabled"; - } - ]; - - systemd.services = lib.listToAttrs ( - lib.imap1 ( - i: conf: - lib.nameValuePair "clamsmtp-${toString i}" { - description = "ClamSMTP instance ${toString i}"; - wantedBy = [ "multi-user.target" ]; - script = "exec ${pkgs.clamsmtp}/bin/clamsmtpd -f ${configfile conf}"; - after = [ "clamav-daemon.service" ]; - requires = [ "clamav-daemon.service" ]; - serviceConfig.Type = "forking"; - serviceConfig.PrivateTmp = "yes"; - unitConfig.JoinsNamespaceOf = "clamav-daemon.service"; - } - ) cfg.instances - ); - }; - - meta.maintainers = with lib.maintainers; [ ekleog ]; -} diff --git a/nixos/modules/services/mail/cyrus-imap.nix b/nixos/modules/services/mail/cyrus-imap.nix index 12d63431cd73..3ffd74451b6c 100644 --- a/nixos/modules/services/mail/cyrus-imap.nix +++ b/nixos/modules/services/mail/cyrus-imap.nix @@ -72,6 +72,20 @@ let } cfg.imapdSettings; in { + imports = [ + (lib.mkRenamedOptionModule + [ "services" "cyrus-imap" "sslServerCert" ] + [ "services" "cyrus-imap" "imapdSettings" "tls_server_cert" ] + ) + (lib.mkRenamedOptionModule + [ "services" "cyrus-imap" "sslServerKey" ] + [ "services" "cyrus-imap" "imapdSettings" "tls_server_key" ] + ) + (lib.mkRenamedOptionModule + [ "services" "cyrus-imap" "sslCACert" ] + [ "services" "cyrus-imap" "imapdSettings" "tls_client_ca_file" ] + ) + ]; options.services.cyrus-imap = { enable = mkEnableOption "Cyrus IMAP, an email, contacts and calendar server"; debug = mkEnableOption "debugging messages for the Cyrus master process"; @@ -294,24 +308,6 @@ in description = "Path to the configuration file used for Cyrus."; apply = v: if v != null then v else pkgs.writeText "cyrus.conf" cyrusConfig; }; - - sslCACert = mkOption { - type = nullOr str; - default = null; - description = "File path which containing one or more CA certificates to use."; - }; - - sslServerCert = mkOption { - type = nullOr str; - default = null; - description = "File containing the global certificate used for all services (IMAP, POP3, LMTP, Sieve)"; - }; - - sslServerKey = mkOption { - type = nullOr str; - default = null; - description = "File containing the private key belonging to the global server certificate."; - }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix index 41d25eaf7885..b086f319c136 100644 --- a/nixos/modules/services/mail/maddy.nix +++ b/nixos/modules/services/mail/maddy.nix @@ -143,6 +143,8 @@ in enable = lib.mkEnableOption "Maddy, a free an open source mail server"; + package = lib.mkPackageOption pkgs "maddy" { }; + user = lib.mkOption { default = "maddy"; type = with lib.types; uniq str; @@ -386,7 +388,7 @@ in systemd = { - packages = [ pkgs.maddy ]; + packages = [ cfg.package ]; services = { maddy = { serviceConfig = { @@ -402,16 +404,16 @@ in script = '' ${lib.optionalString (cfg.ensureAccounts != [ ]) '' ${lib.concatMapStrings (account: '' - if ! ${pkgs.maddy}/bin/maddyctl imap-acct list | grep "${account}"; then - ${pkgs.maddy}/bin/maddyctl imap-acct create ${account} + if ! ${cfg.package}/bin/maddyctl imap-acct list | grep "${account}"; then + ${cfg.package}/bin/maddyctl imap-acct create ${account} fi '') cfg.ensureAccounts} ''} ${lib.optionalString (cfg.ensureCredentials != { }) '' ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (name: cfg: '' - if ! ${pkgs.maddy}/bin/maddyctl creds list | grep "${name}"; then - ${pkgs.maddy}/bin/maddyctl creds create --password $(cat ${lib.escapeShellArg cfg.passwordFile}) ${name} + lib.mapAttrsToList (name: credentials: '' + if ! ${cfg.package}/bin/maddyctl creds list | grep "${name}"; then + ${cfg.package}/bin/maddyctl creds create --password $(cat ${lib.escapeShellArg credentials.passwordFile}) ${name} fi '') cfg.ensureCredentials )} @@ -486,7 +488,7 @@ in }; environment.systemPackages = [ - pkgs.maddy + cfg.package ]; }; } diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index b19637e5784f..d9940cb4d98f 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -661,8 +661,14 @@ in mailman-web-setup = { description = "Prepare mailman-web files and database"; - before = [ "mailman-uwsgi.service" ]; - requiredBy = [ "mailman-uwsgi.service" ]; + before = [ + "hyperkitty.service" + "mailman-uwsgi.service" + ]; + requiredBy = [ + "hyperkitty.service" + "mailman-uwsgi.service" + ]; restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; script = '' [[ -e "${webSettings.STATIC_ROOT}" ]] && find "${webSettings.STATIC_ROOT}/" -mindepth 1 -delete diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index 2fc628a64aeb..ba5226351a57 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -76,8 +76,8 @@ in description = '' Packages to search for filters, tables, queues, and schedulers. - Add OpenSMTPD-extras here if you want to use the filters, etc. from - that package. + Add packages here if you want to use them as as such, for example + from the opensmtpd-table-* packages. ''; }; }; @@ -121,25 +121,41 @@ in } ); - systemd.tmpfiles.rules = [ - "d /var/spool/smtpd 711 root - - -" - "d /var/spool/smtpd/offline 770 root smtpq - -" - "d /var/spool/smtpd/purge 700 smtpq root - -" - ]; + systemd.tmpfiles.settings.opensmtpd = { + "/var/spool/smtpd".d = { + mode = "0711"; + user = "root"; + }; + "/var/spool/smtpd/offline".d = { + mode = "0770"; + user = "root"; + group = "smtpq"; + }; + "/var/spool/smtpd/purge".d = { + mode = "0700"; + user = "smtpq"; + group = "root"; + }; + "/var/spool/smtpd/queue".d = { + mode = "0700"; + user = "smtpq"; + group = "root"; + }; + }; systemd.services.opensmtpd = let procEnv = pkgs.buildEnv { name = "opensmtpd-procs"; paths = [ cfg.package ] ++ cfg.procPackages; - pathsToLink = [ "/libexec/opensmtpd" ]; + pathsToLink = [ "/libexec/smtpd" ]; }; in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}"; - environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd"; + environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/smtpd"; }; }; } diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index 3f0db2d91c00..bc91edbbe000 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -7,16 +7,52 @@ let cfg = config.services.postsrsd; + runtimeDirectoryName = "postsrsd"; + runtimeDirectory = "/run/${runtimeDirectoryName}"; + # TODO: follow RFC 42, but we need a libconfuse format first: + # https://github.com/NixOS/nixpkgs/issues/401565 + # Arrays in `libconfuse` look like this: {"Life", "Universe", "Everything"} + # See https://www.nongnu.org/confuse/tutorial-html/ar01s03.html. + # + # Note: We're using `builtins.toJSON` to escape strings, but JSON strings + # don't have exactly the same semantics as libconfuse strings. For example, + # "${F}" gets treated as an env var reference, see above issue for details. + libconfuseDomains = "{ " + lib.concatMapStringsSep ", " builtins.toJSON cfg.domains + " }"; + configFile = pkgs.writeText "postsrsd.conf" '' + secrets-file = "''${CREDENTIALS_DIRECTORY}/secrets-file" + domains = ${libconfuseDomains} + separator = "${cfg.separator}" + socketmap = "unix:${cfg.socketPath}" + + # Disable postsrsd's jailing in favor of confinement with systemd. + unprivileged-user = "" + chroot-dir = "" + ''; in { - - ###### interface + imports = + map + ( + name: + lib.mkRemovedOptionModule [ "services" "postsrsd" name ] '' + `postsrsd` was upgraded to `>= 2.0.0`, with some different behaviors and configuration settings: + - NixOS Release Notes: https://nixos.org/manual/nixos/unstable/release-notes#sec-nixpkgs-release-25.05-incompatibilities + - NixOS Options Reference: https://nixos.org/manual/nixos/unstable/options#opt-services.postsrsd.enable + - Migration instructions: https://github.com/roehling/postsrsd/blob/2.0.10/README.rst#migrating-from-version-1x + - Postfix Setup: https://github.com/roehling/postsrsd/blob/2.0.10/README.rst#postfix-setup + '' + ) + [ + "domain" + "forwardPort" + "reversePort" + "timeout" + "excludeDomains" + ]; options = { - services.postsrsd = { - enable = lib.mkOption { type = lib.types.bool; default = false; @@ -29,9 +65,11 @@ in description = "Secret keys used for signing and verification"; }; - domain = lib.mkOption { - type = lib.types.str; - description = "Domain name for rewrite"; + domains = lib.mkOption { + type = lib.types.listOf lib.types.str; + description = "Domain names for rewrite"; + default = [ config.networking.hostName ]; + defaultText = lib.literalExpression "[ config.networking.hostName ]"; }; separator = lib.mkOption { @@ -44,36 +82,6 @@ in description = "First separator character in generated addresses"; }; - # bindAddress = lib.mkOption { # uncomment once 1.5 is released - # type = lib.types.str; - # default = "127.0.0.1"; - # description = "Socket listen address"; - # }; - - forwardPort = lib.mkOption { - type = lib.types.int; - default = 10001; - description = "Port for the forward SRS lookup"; - }; - - reversePort = lib.mkOption { - type = lib.types.int; - default = 10002; - description = "Port for the reverse SRS lookup"; - }; - - timeout = lib.mkOption { - type = lib.types.int; - default = 1800; - description = "Timeout for idle client connections in seconds"; - }; - - excludeDomains = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = "Origin domains to exclude from rewriting in addition to primary domain"; - }; - user = lib.mkOption { type = lib.types.str; default = "postsrsd"; @@ -86,16 +94,18 @@ in description = "Group for the daemon"; }; + socketPath = lib.mkOption { + type = lib.types.path; + default = "${runtimeDirectory}/socket"; + readOnly = true; + description = '' + Path to the Unix socket for connecting to postsrsd. + Read-only, intended for usage when integrating postsrsd into other NixOS config.''; + }; }; - }; - ###### implementation - config = lib.mkIf cfg.enable { - - services.postsrsd.domain = lib.mkDefault config.networking.hostName; - users.users = lib.optionalAttrs (cfg.user == "postsrsd") { postsrsd = { group = cfg.group; @@ -107,30 +117,42 @@ in postsrsd.gid = config.ids.gids.postsrsd; }; - systemd.services.postsrsd = { - description = "PostSRSd SRS rewriting server"; - after = [ "network.target" ]; - before = [ "postfix.service" ]; - wantedBy = [ "multi-user.target" ]; - + systemd.services.postsrsd-generate-secrets = { path = [ pkgs.coreutils ]; - - serviceConfig = { - ExecStart = ''${pkgs.postsrsd}/sbin/postsrsd "-s${cfg.secretsFile}" "-d${cfg.domain}" -a${cfg.separator} -f${toString cfg.forwardPort} -r${toString cfg.reversePort} -t${toString cfg.timeout} "-X${lib.concatStringsSep "," cfg.excludeDomains}"''; - User = cfg.user; - Group = cfg.group; - PermissionsStartOnly = true; - }; - - preStart = '' - if [ ! -e "${cfg.secretsFile}" ]; then + script = '' + if [ -e "${cfg.secretsFile}" ]; then + echo "Secrets file exists. Nothing to do!" + else echo "WARNING: secrets file not found, autogenerating!" DIR="$(dirname "${cfg.secretsFile}")" install -m 750 -o ${cfg.user} -g ${cfg.group} -d "$DIR" install -m 600 -o ${cfg.user} -g ${cfg.group} <(dd if=/dev/random bs=18 count=1 | base64) "${cfg.secretsFile}" fi ''; + serviceConfig = { + Type = "oneshot"; + }; }; + systemd.services.postsrsd = { + description = "PostSRSd SRS rewriting server"; + after = [ + "network.target" + "postsrsd-generate-secrets.service" + ]; + before = [ "postfix.service" ]; + wantedBy = [ "multi-user.target" ]; + requires = [ "postsrsd-generate-secrets.service" ]; + confinement.enable = true; + + serviceConfig = { + ExecStart = "${lib.getExe pkgs.postsrsd} -C ${configFile}"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + RuntimeDirectory = runtimeDirectoryName; + LoadCredential = "secrets-file:${cfg.secretsFile}"; + }; + }; }; } diff --git a/nixos/modules/services/matrix/conduwuit.nix b/nixos/modules/services/matrix/conduwuit.nix deleted file mode 100644 index b4d9fdd1c95e..000000000000 --- a/nixos/modules/services/matrix/conduwuit.nix +++ /dev/null @@ -1,265 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.services.conduwuit; - defaultUser = "conduwuit"; - defaultGroup = "conduwuit"; - - format = pkgs.formats.toml { }; - configFile = format.generate "conduwuit.toml" cfg.settings; -in -{ - meta.maintainers = with lib.maintainers; [ niklaskorz ]; - options.services.conduwuit = { - enable = lib.mkEnableOption "conduwuit"; - - user = lib.mkOption { - type = lib.types.nonEmptyStr; - description = '' - The user {command}`conduwuit` is run as. - ''; - default = defaultUser; - }; - - group = lib.mkOption { - type = lib.types.nonEmptyStr; - description = '' - The group {command}`conduwuit` is run as. - ''; - default = defaultGroup; - }; - - extraEnvironment = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - description = "Extra Environment variables to pass to the conduwuit server."; - default = { }; - example = { - RUST_BACKTRACE = "yes"; - }; - }; - - package = lib.mkPackageOption pkgs "conduwuit" { }; - - settings = lib.mkOption { - type = lib.types.submodule { - freeformType = format.type; - options = { - global.server_name = lib.mkOption { - type = lib.types.nonEmptyStr; - example = "example.com"; - description = "The server_name is the name of this server. It is used as a suffix for user and room ids."; - }; - global.address = lib.mkOption { - type = lib.types.nullOr (lib.types.listOf lib.types.nonEmptyStr); - default = null; - example = [ - "127.0.0.1" - "::1" - ]; - description = '' - Addresses (IPv4 or IPv6) to listen on for connections by the reverse proxy/tls terminator. - If set to `null`, conduwuit will listen on IPv4 and IPv6 localhost. - Must be `null` if `unix_socket_path` is set. - ''; - }; - global.port = lib.mkOption { - type = lib.types.listOf lib.types.port; - default = [ 6167 ]; - description = '' - The port(s) conduwuit will be running on. - You need to set up a reverse proxy in your web server (e.g. apache or nginx), - so all requests to /_matrix on port 443 and 8448 will be forwarded to the conduwuit - instance running on this port. - ''; - }; - global.unix_socket_path = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - description = '' - Listen on a UNIX socket at the specified path. If listening on a UNIX socket, - listening on an address will be disabled. The `address` option must be set to - `null` (the default value). The option {option}`services.conduwuit.group` must - be set to a group your reverse proxy is part of. - - This will automatically add a system user "conduwuit" to your system if - {option}`services.conduwuit.user` is left at the default, and a "conduwuit" - group if {option}`services.conduwuit.group` is left at the default. - ''; - }; - global.unix_socket_perms = lib.mkOption { - type = lib.types.ints.positive; - default = 660; - description = "The default permissions (in octal) to create the UNIX socket with."; - }; - global.max_request_size = lib.mkOption { - type = lib.types.ints.positive; - default = 20000000; - description = "Max request size in bytes. Don't forget to also change it in the proxy."; - }; - global.allow_registration = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether new users can register on this server. - - Registration with token requires `registration_token` or `registration_token_file` to be set. - - If set to true without a token configured, and - `yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse` - is set to true, users can freely register. - ''; - }; - global.allow_encryption = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Whether new encrypted rooms can be created. Note: existing rooms will continue to work."; - }; - global.allow_federation = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether this server federates with other servers. - ''; - }; - global.trusted_servers = lib.mkOption { - type = lib.types.listOf lib.types.nonEmptyStr; - default = [ "matrix.org" ]; - description = '' - Servers listed here will be used to gather public keys of other servers - (notary trusted key servers). - - Currently, conduwuit doesn't support inbound batched key requests, so - this list should only contain other Synapse servers. - - Example: `[ "matrix.org" "constellatory.net" "tchncs.de" ]` - ''; - }; - global.database_path = lib.mkOption { - readOnly = true; - type = lib.types.path; - default = "/var/lib/conduwuit/"; - description = '' - Path to the conduwuit database, the directory where conduwuit will save its data. - Note that database_path cannot be edited because of the service's reliance on systemd StateDir. - ''; - }; - global.allow_check_for_updates = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - If enabled, conduwuit will send a simple GET request periodically to - for any new announcements made. - Despite the name, this is not an update check endpoint, it is simply an announcement check endpoint. - - Disabled by default. - ''; - }; - }; - }; - default = { }; - # TOML does not allow null values, so we use null to omit those fields - apply = lib.filterAttrsRecursive (_: v: v != null); - description = '' - Generates the conduwuit.toml configuration file. Refer to - - for details on supported values. - ''; - }; - }; - - config = lib.mkIf cfg.enable { - assertions = [ - { - assertion = !(cfg.settings ? global.unix_socket_path) || !(cfg.settings ? global.address); - message = '' - In `services.conduwuit.settings.global`, `unix_socket_path` and `address` cannot be set at the - same time. - Leave one of the two options unset or explicitly set them to `null`. - ''; - } - { - assertion = cfg.user != defaultUser -> config ? users.users.${cfg.user}; - message = "If `services.conduwuit.user` is changed, the configured user must already exist."; - } - { - assertion = cfg.group != defaultGroup -> config ? users.groups.${cfg.group}; - message = "If `services.conduwuit.group` is changed, the configured group must already exist."; - } - ]; - - users.users = lib.mkIf (cfg.user == defaultUser) { - ${defaultUser} = { - group = cfg.group; - home = cfg.settings.global.database_path; - isSystemUser = true; - }; - }; - - users.groups = lib.mkIf (cfg.group == defaultGroup) { - ${defaultGroup} = { }; - }; - - systemd.services.conduwuit = { - description = "Conduwuit Matrix Server"; - documentation = [ "https://conduwuit.puppyirl.gay/" ]; - wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; - environment = lib.mkMerge ([ - { CONDUWUIT_CONFIG = configFile; } - cfg.extraEnvironment - ]); - startLimitBurst = 5; - startLimitIntervalSec = 60; - serviceConfig = { - DynamicUser = true; - User = cfg.user; - Group = cfg.group; - - DevicePolicy = "closed"; - LockPersonality = true; - MemoryDenyWriteExecute = true; - NoNewPrivileges = true; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - PrivateDevices = true; - PrivateMounts = true; - PrivateTmp = true; - PrivateUsers = true; - PrivateIPC = true; - RemoveIPC = true; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; - RestrictNamespaces = true; - RestrictRealtime = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service @resources" - "~@clock @debug @module @mount @reboot @swap @cpu-emulation @obsolete @timer @chown @setuid @privileged @keyring @ipc" - ]; - SystemCallErrorNumber = "EPERM"; - - StateDirectory = "conduwuit"; - StateDirectoryMode = "0700"; - RuntimeDirectory = "conduwuit"; - RuntimeDirectoryMode = "0750"; - - ExecStart = lib.getExe cfg.package; - Restart = "on-failure"; - RestartSec = 10; - }; - }; - }; -} diff --git a/nixos/modules/services/matrix/continuwuity.nix b/nixos/modules/services/matrix/continuwuity.nix new file mode 100644 index 000000000000..5170011d3037 --- /dev/null +++ b/nixos/modules/services/matrix/continuwuity.nix @@ -0,0 +1,268 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.matrix-continuwuity; + defaultUser = "continuwuity"; + defaultGroup = "continuwuity"; + + format = pkgs.formats.toml { }; + configFile = format.generate "continuwuity.toml" cfg.settings; +in +{ + meta.maintainers = with lib.maintainers; [ + nyabinary + snaki + ]; + options.services.matrix-continuwuity = { + enable = lib.mkEnableOption "continuwuity"; + + user = lib.mkOption { + type = lib.types.nonEmptyStr; + description = '' + The user {command}`continuwuity` is run as. + ''; + default = defaultUser; + }; + + group = lib.mkOption { + type = lib.types.nonEmptyStr; + description = '' + The group {command}`continuwuity` is run as. + ''; + default = defaultGroup; + }; + + extraEnvironment = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + description = "Extra Environment variables to pass to the continuwuity server."; + default = { }; + example = { + RUST_BACKTRACE = "yes"; + }; + }; + + package = lib.mkPackageOption pkgs "matrix-continuwuity" { }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format.type; + options = { + global.server_name = lib.mkOption { + type = lib.types.nonEmptyStr; + example = "example.com"; + description = "The server_name is the name of this server. It is used as a suffix for user and room ids."; + }; + global.address = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.nonEmptyStr); + default = null; + example = [ + "127.0.0.1" + "::1" + ]; + description = '' + Addresses (IPv4 or IPv6) to listen on for connections by the reverse proxy/tls terminator. + If set to `null`, continuwuity will listen on IPv4 and IPv6 localhost. + Must be `null` if `unix_socket_path` is set. + ''; + }; + global.port = lib.mkOption { + type = lib.types.listOf lib.types.port; + default = [ 6167 ]; + description = '' + The port(s) continuwuity will be running on. + You need to set up a reverse proxy in your web server (e.g. apache or nginx), + so all requests to /_matrix on port 443 and 8448 will be forwarded to the continuwuity + instance running on this port. + ''; + }; + global.unix_socket_path = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + Listen on a UNIX socket at the specified path. If listening on a UNIX socket, + listening on an address will be disabled. The `address` option must be set to + `null` (the default value). The option {option}`services.continuwuity.group` must + be set to a group your reverse proxy is part of. + + This will automatically add a system user "continuwuity" to your system if + {option}`services.continuwuity.user` is left at the default, and a "continuwuity" + group if {option}`services.continuwuity.group` is left at the default. + ''; + }; + global.unix_socket_perms = lib.mkOption { + type = lib.types.ints.positive; + default = 660; + description = "The default permissions (in octal) to create the UNIX socket with."; + }; + global.max_request_size = lib.mkOption { + type = lib.types.ints.positive; + default = 20000000; + description = "Max request size in bytes. Don't forget to also change it in the proxy."; + }; + global.allow_registration = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether new users can register on this server. + + Registration with token requires `registration_token` or `registration_token_file` to be set. + + If set to true without a token configured, and + `yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse` + is set to true, users can freely register. + ''; + }; + global.allow_encryption = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Whether new encrypted rooms can be created. Note: existing rooms will continue to work."; + }; + global.allow_federation = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether this server federates with other servers. + ''; + }; + global.trusted_servers = lib.mkOption { + type = lib.types.listOf lib.types.nonEmptyStr; + default = [ "matrix.org" ]; + description = '' + Servers listed here will be used to gather public keys of other servers + (notary trusted key servers). + + Currently, continuwuity doesn't support inbound batched key requests, so + this list should only contain other Synapse servers. + + Example: `[ "matrix.org" "constellatory.net" "tchncs.de" ]` + ''; + }; + global.database_path = lib.mkOption { + readOnly = true; + type = lib.types.path; + default = "/var/lib/continuwuity/"; + description = '' + Path to the continuwuity database, the directory where continuwuity will save its data. + Note that database_path cannot be edited because of the service's reliance on systemd StateDir. + ''; + }; + global.allow_announcements_check = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + If enabled, continuwuity will send a simple GET request periodically to + for any new announcements made. + ''; + }; + }; + }; + default = { }; + # TOML does not allow null values, so we use null to omit those fields + apply = lib.filterAttrsRecursive (_: v: v != null); + description = '' + Generates the continuwuity.toml configuration file. Refer to + + for details on supported values. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = !(cfg.settings ? global.unix_socket_path) || !(cfg.settings ? global.address); + message = '' + In `services.continuwuity.settings.global`, `unix_socket_path` and `address` cannot be set at the + same time. + Leave one of the two options unset or explicitly set them to `null`. + ''; + } + { + assertion = cfg.user != defaultUser -> config ? users.users.${cfg.user}; + message = "If `services.continuwuity.user` is changed, the configured user must already exist."; + } + { + assertion = cfg.group != defaultGroup -> config ? users.groups.${cfg.group}; + message = "If `services.continuwuity.group` is changed, the configured group must already exist."; + } + ]; + + users.users = lib.mkIf (cfg.user == defaultUser) { + ${defaultUser} = { + group = cfg.group; + home = cfg.settings.global.database_path; + isSystemUser = true; + }; + }; + + users.groups = lib.mkIf (cfg.group == defaultGroup) { + ${defaultGroup} = { }; + }; + + systemd.services.continuwuity = { + description = "Continuwuity Matrix Server"; + documentation = [ "https://continuwuity.org/" ]; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + environment = lib.mkMerge [ + { CONDUWUIT_CONFIG = configFile; } + cfg.extraEnvironment + ]; + startLimitBurst = 5; + startLimitIntervalSec = 60; + serviceConfig = { + DynamicUser = true; + User = cfg.user; + Group = cfg.group; + + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + PrivateIPC = true; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service @resources" + "~@clock @debug @module @mount @reboot @swap @cpu-emulation @obsolete @timer @chown @setuid @privileged @keyring @ipc" + ]; + SystemCallErrorNumber = "EPERM"; + + StateDirectory = "continuwuity"; + StateDirectoryMode = "0700"; + RuntimeDirectory = "continuwuity"; + RuntimeDirectoryMode = "0750"; + + ExecStart = lib.getExe cfg.package; + Restart = "on-failure"; + RestartSec = 10; + }; + }; + }; +} diff --git a/nixos/modules/services/matrix/lk-jwt-service.nix b/nixos/modules/services/matrix/lk-jwt-service.nix new file mode 100644 index 000000000000..2be1fe806d5c --- /dev/null +++ b/nixos/modules/services/matrix/lk-jwt-service.nix @@ -0,0 +1,91 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.lk-jwt-service; +in +{ + meta.maintainers = [ lib.maintainers.quadradical ]; + options.services.lk-jwt-service = { + enable = lib.mkEnableOption "lk-jwt-service"; + package = lib.mkPackageOption pkgs "lk-jwt-service" { }; + + livekitUrl = lib.mkOption { + type = lib.types.strMatching "^wss?://.*"; + example = "wss://example.com/livekit/sfu"; + description = '' + The public websocket URL for livekit. + The proto needs to be either `wss://` (recommended) or `ws://` (insecure). + ''; + }; + + keyFile = lib.mkOption { + type = lib.types.path; + description = '' + Path to a file containing the credential mapping (`: `) to access LiveKit. + + Example: + `lk-jwt-service: f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE` + + For more information, see . + ''; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 8080; + description = "Port that lk-jwt-service should listen on."; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.lk-jwt-service = { + description = "Minimal service to issue LiveKit JWTs for MatrixRTC"; + documentation = [ "https://github.com/element-hq/lk-jwt-service" ]; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + environment = { + LIVEKIT_URL = cfg.livekitUrl; + LIVEKIT_JWT_PORT = toString cfg.port; + LIVEKIT_KEY_FILE = "/run/credentials/lk-jwt-service.service/livekit-secrets"; + }; + + serviceConfig = { + LoadCredential = [ "livekit-secrets:${cfg.keyFile}" ]; + ExecStart = lib.getExe cfg.package; + DynamicUser = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + ProtectHome = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + Restart = "on-failure"; + RestartSec = 5; + UMask = "077"; + }; + }; + }; +} diff --git a/nixos/modules/services/matrix/mautrix-signal.nix b/nixos/modules/services/matrix/mautrix-signal.nix index 9977011e0035..c7ef540b4f59 100644 --- a/nixos/modules/services/matrix/mautrix-signal.nix +++ b/nixos/modules/services/matrix/mautrix-signal.nix @@ -68,6 +68,8 @@ in options.services.mautrix-signal = { enable = lib.mkEnableOption "mautrix-signal, a Matrix-Signal puppeting bridge"; + package = lib.mkPackageOption pkgs "mautrix-signal" { }; + settings = lib.mkOption { apply = lib.recursiveUpdate defaultConfig; type = settingsFormat.type; @@ -206,7 +208,7 @@ in # generate the appservice's registration file if absent if [ ! -f '${registrationFile}' ]; then - ${pkgs.mautrix-signal}/bin/mautrix-signal \ + ${cfg.package}/bin/mautrix-signal \ --generate-registration \ --config='${settingsFile}' \ --registration='${registrationFile}' @@ -234,7 +236,7 @@ in StateDirectory = baseNameOf dataDir; WorkingDirectory = dataDir; ExecStart = '' - ${pkgs.mautrix-signal}/bin/mautrix-signal \ + ${cfg.package}/bin/mautrix-signal \ --config='${settingsFile}' \ --registration='${registrationFile}' ''; @@ -268,7 +270,7 @@ in buildDocsInSandbox = false; doc = ./mautrix-signal.md; maintainers = with lib.maintainers; [ - niklaskorz + alyaeanyx frederictobiasc ]; }; diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index f3adbc26ab58..74f18923d790 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -18,6 +18,8 @@ in services.mautrix-telegram = { enable = lib.mkEnableOption "Mautrix-Telegram, a Matrix-Telegram hybrid puppeting/relaybot bridge"; + package = lib.mkPackageOption pkgs "mautrix-telegram" { }; + settings = lib.mkOption rec { apply = lib.recursiveUpdate default; inherit (settingsFormat) type; @@ -201,7 +203,7 @@ in # generate the appservice's registration file if absent if [ ! -f '${registrationFile}' ]; then - ${pkgs.mautrix-telegram}/bin/mautrix-telegram \ + ${cfg.package}/bin/mautrix-telegram \ --generate-registration \ --config='${settingsFile}' \ --registration='${registrationFile}' @@ -220,9 +222,9 @@ in umask $old_umask '' - + lib.optionalString (pkgs.mautrix-telegram ? alembic) '' + + lib.optionalString (cfg.package ? alembic) '' # run automatic database init and migration scripts - ${pkgs.mautrix-telegram.alembic}/bin/alembic -x config='${settingsFile}' upgrade head + ${cfg.package.alembic}/bin/alembic -x config='${settingsFile}' upgrade head ''; serviceConfig = { @@ -238,13 +240,13 @@ in ProtectControlGroups = true; PrivateTmp = true; - WorkingDirectory = pkgs.mautrix-telegram; # necessary for the database migration scripts to be found + WorkingDirectory = cfg.package; # necessary for the database migration scripts to be found StateDirectory = baseNameOf dataDir; UMask = "0027"; EnvironmentFile = cfg.environmentFile; ExecStart = '' - ${pkgs.mautrix-telegram}/bin/mautrix-telegram \ + ${cfg.package}/bin/mautrix-telegram \ --config='${settingsFile}' ''; }; diff --git a/nixos/modules/services/matrix/mautrix-whatsapp.nix b/nixos/modules/services/matrix/mautrix-whatsapp.nix index 165e614fec48..d43032f9a31d 100644 --- a/nixos/modules/services/matrix/mautrix-whatsapp.nix +++ b/nixos/modules/services/matrix/mautrix-whatsapp.nix @@ -51,6 +51,8 @@ in options.services.mautrix-whatsapp = { enable = lib.mkEnableOption "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp"; + package = lib.mkPackageOption pkgs "mautrix-whatsapp" { }; + settings = lib.mkOption { type = settingsFormat.type; default = defaultConfig; @@ -168,7 +170,7 @@ in # generate the appservice's registration file if absent if [ ! -f '${registrationFile}' ]; then - ${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \ + ${cfg.package}/bin/mautrix-whatsapp \ --generate-registration \ --config='${settingsFile}' \ --registration='${registrationFile}' @@ -196,7 +198,7 @@ in StateDirectory = baseNameOf dataDir; WorkingDirectory = dataDir; ExecStart = '' - ${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \ + ${cfg.package}/bin/mautrix-whatsapp \ --config='${settingsFile}' \ --registration='${registrationFile}' ''; diff --git a/nixos/modules/services/matrix/mjolnir.nix b/nixos/modules/services/matrix/mjolnir.nix index d0160765a357..46007d4e1118 100644 --- a/nixos/modules/services/matrix/mjolnir.nix +++ b/nixos/modules/services/matrix/mjolnir.nix @@ -40,7 +40,7 @@ let # these config files will be merged one after the other to build the final config configFiles = [ - "${pkgs.mjolnir}/libexec/mjolnir/deps/mjolnir/config/default.yaml" + "${pkgs.mjolnir}/lib/node_modules/mjolnir/config/default.yaml" moduleConfigFile ]; diff --git a/nixos/modules/services/misc/bazarr.nix b/nixos/modules/services/misc/bazarr.nix index 493e617a808e..bfd708c8bbd4 100644 --- a/nixos/modules/services/misc/bazarr.nix +++ b/nixos/modules/services/misc/bazarr.nix @@ -14,6 +14,12 @@ in package = lib.mkPackageOption pkgs "bazarr" { }; + dataDir = lib.mkOption { + type = lib.types.str; + default = "/var/lib/bazarr"; + description = "The directory where Bazarr stores its data files."; + }; + openFirewall = lib.mkOption { type = lib.types.bool; default = false; @@ -41,20 +47,24 @@ in }; config = lib.mkIf cfg.enable { + systemd.tmpfiles.settings."10-bazarr".${cfg.dataDir}.d = { + inherit (cfg) user group; + mode = "0700"; + }; + systemd.services.bazarr = { description = "Bazarr"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig = rec { + serviceConfig = { Type = "simple"; User = cfg.user; Group = cfg.group; - StateDirectory = "bazarr"; SyslogIdentifier = "bazarr"; ExecStart = pkgs.writeShellScript "start-bazarr" '' ${cfg.package}/bin/bazarr \ - --config '/var/lib/${StateDirectory}' \ + --config '${cfg.dataDir}' \ --port ${toString cfg.listenPort} \ --no-update True ''; @@ -72,7 +82,7 @@ in bazarr = { isSystemUser = true; group = cfg.group; - home = "/var/lib/${config.systemd.services.bazarr.serviceConfig.StateDirectory}"; + home = cfg.dataDir; }; }; diff --git a/nixos/modules/services/misc/devpi-server.nix b/nixos/modules/services/misc/devpi-server.nix index 309ef8325f9f..16c5fd34ff17 100644 --- a/nixos/modules/services/misc/devpi-server.nix +++ b/nixos/modules/services/misc/devpi-server.nix @@ -125,7 +125,7 @@ in networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; - - meta.maintainers = [ lib.maintainers.cafkafk ]; }; + + meta.maintainers = [ lib.maintainers.cafkafk ]; } diff --git a/nixos/modules/services/misc/dump1090-fa.md b/nixos/modules/services/misc/dump1090-fa.md new file mode 100644 index 000000000000..835d91e61828 --- /dev/null +++ b/nixos/modules/services/misc/dump1090-fa.md @@ -0,0 +1,26 @@ +# Dump1090-fa {#module-services-dump1090-fa} + +[dump1090-fa](https://github.com/flightaware/dump1090) is a demodulator and decoder for ADS-B, Mode S, and Mode 3A/3C aircraft transponder messages. It can receive and decode these messages from an attached software-defined radio or from data received over a network connection. + +## Configuration {#module-services-dump1090-fa-configuration} + +When enabled, this module automatically creates a systemd service to start the `dump1090-fa` application. The application will then write its JSON output files to `/run/dump1090-fa`. + +Exposing the integrated web interface is left to the user's configuration. Below is a minimal example demonstrating how to serve it using Nginx: + +```nix +{ pkgs, ... }: { + services.dump1090-fa.enable = true; + + services.nginx = { + enable = true; + virtualHosts."dump1090-fa" = { + locations = { + "/".alias = "${pkgs.dump1090-fa}/share/dump1090/"; + "/data/".alias = "/run/dump1090-fa/"; + }; + }; + }; +} + +``` diff --git a/nixos/modules/services/misc/dump1090-fa.nix b/nixos/modules/services/misc/dump1090-fa.nix new file mode 100644 index 000000000000..91f60f2d1d1f --- /dev/null +++ b/nixos/modules/services/misc/dump1090-fa.nix @@ -0,0 +1,135 @@ +{ + pkgs, + config, + lib, + ... +}: +let + cfg = config.services.dump1090-fa; + inherit (lib) mkOption types; +in +{ + options.services.dump1090-fa = { + enable = lib.mkEnableOption "dump1090-fa"; + + package = lib.mkPackageOption pkgs "dump1090-fa" { }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Additional passed arguments"; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.dump1090-fa = { + description = "dump1090 ADS-B receiver (FlightAware customization)"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = lib.escapeShellArgs ( + [ + (lib.getExe cfg.package) + "--net" + "--write-json" + "%t/dump1090-fa" + ] + ++ cfg.extraArgs + ); + DynamicUser = true; + SupplementaryGroups = "plugdev"; + RuntimeDirectory = "dump1090-fa"; + WorkingDirectory = "%t/dump1090-fa"; + RuntimeDirectoryMode = 755; + PrivateNetwork = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectHome = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectSystem = "strict"; + ProtectHostname = true; + RestrictSUIDSGID = true; + RestrictNamespaces = + "~" + + (lib.concatStringsSep " " [ + "cgroup" + "ipc" + "net" + "mnt" + "pid" + "user" + "uts" + ]); + CapabilityBoundingSet = [ + "~CAP_AUDIT_CONTROL" + "~CAP_AUDIT_READ" + "~CAP_AUDIT_WRITE" + "~CAP_KILL" + "~CAP_MKNOD" + "~CAP_NET_BIND_SERVICE" + "~CAP_NET_BROADCAST" + "~CAP_NET_ADMIN" + "~CAP_NET_RAW" + "~CAP_SYS_RAWIO" + "~CAP_SYS_MODULE" + "~CAP_SYS_PTRACE" + "~CAP_SYS_TIME" + "~CAP_SYS_NICE" + "~CAP_SYS_RESOURCE" + "~CAP_CHOWN" + "~CAP_FSETID" + "~CAP_SETUID" + "~CAP_SETGID" + "~CAP_SETPCAP" + "~CAP_SETFCAP" + "~CAP_DAC_OVERRIDE" + "~CAP_DAC_READ_SEARCH" + "~CAP_FOWNER" + "~CAP_IPC_OWNER" + "~CAP_IPC_LOCK" + "~CAP_SYS_BOOT" + "~CAP_SYS_ADMIN" + "~CAP_MAC_ADMIN" + "~CAP_MAC_OVERRIDE" + "~CAP_SYS_CHROOT" + "~CAP_BLOCK_SUSPEND" + "~CAP_WAKE_ALARM" + "~CAP_LEASE" + "~CAP_SYS_PACCT" + ]; + SystemCallFilter = [ + "~@clock" + "~@debug" + "~@module" + "~@mount" + "~@raw-io" + "~@reboot" + "~@swap" + "~@privileged" + "~@resources" + "~@cpu-emulation" + "~@obsolete" + ]; + RestrictAddressFamilies = [ "~AF_PACKET" ]; + ProtectControlGroups = true; + UMask = "0022"; + SystemCallArchitectures = "native"; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ aciceri ]; + doc = ./dump1090-fa.md; + }; +} diff --git a/nixos/modules/services/misc/evremap.nix b/nixos/modules/services/misc/evremap.nix index ee433aecbf5f..d02d9726f43a 100644 --- a/nixos/modules/services/misc/evremap.nix +++ b/nixos/modules/services/misc/evremap.nix @@ -131,9 +131,9 @@ in description = "evremap - keyboard input remapper"; wantedBy = [ "multi-user.target" ]; - script = "${lib.getExe pkgs.evremap} remap ${configFile}"; - serviceConfig = { + ExecStart = "${lib.getExe pkgs.evremap} remap ${configFile}"; + DynamicUser = true; User = "evremap"; SupplementaryGroups = [ diff --git a/nixos/modules/services/misc/forgejo.md b/nixos/modules/services/misc/forgejo.md index f234ebf44aef..cca557408639 100644 --- a/nixos/modules/services/misc/forgejo.md +++ b/nixos/modules/services/misc/forgejo.md @@ -24,6 +24,42 @@ Both modules and projects are likely to diverge further with each release. Which might lead to an even more involved migration. ::: +::: {.warning} +The last supported version of Forgejo which supports migration from Gitea is +*10.0.x*. You should *NOT* try to migrate from Gitea to Forgejo `11.x` or +higher without first migrating to `10.0.x`. + +See [upstream migration guide](https://forgejo.org/docs/latest/admin/gitea-migration/) + +The last supported version of *Gitea* for this migration process is *1.22*. Do +*NOT* try to directly migrate from Gitea *1.23* or higher, as it will likely +result in data loss. + +See [upstream news article](https://forgejo.org/2024-12-gitea-compatibility/) +::: + +In order to migrate, the version of Forgejo needs to be pinned to `10.0.x` +*before* using the latest version. This means that nixpkgs commit +[`3bb45b041e7147e2fd2daf689e26a1f970a55d65`](https://github.com/NixOS/nixpkgs/commit/3bb45b041e7147e2fd2daf689e26a1f970a55d65) +or earlier should be used. + +To do this, temporarily add the following to your `configuration.nix`: + +```nix +{ pkgs, ... }: +let + nixpkgs-forgejo-10 = import (pkgs.fetchFromGitHub { + owner = "NixOS"; + repo = "nixpkgs"; + rev = "3bb45b041e7147e2fd2daf689e26a1f970a55d65"; + hash = "sha256-8JL5NI9eUcGzzbR/ARkrG81WLwndoxqI650mA/4rUGI="; + }) {}; +in +{ + services.forgejo.package = nixpkgs-forgejo-10.forgejo; +} +``` + ### Full-Migration {#module-forgejo-migration-gitea-default} This will migrate the state directory (data), rename and chown the database and @@ -49,6 +85,8 @@ chown -R forgejo:forgejo /var/lib/forgejo systemctl restart forgejo ``` +Afterwards, the Forgejo version can be set back to a newer desired version. + ### Alternatively, keeping the gitea user {#module-forgejo-migration-gitea-impersonate} Alternatively, instead of renaming the database, copying the state folder and diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix index 08e1b85a7544..7da42084550d 100644 --- a/nixos/modules/services/misc/forgejo.nix +++ b/nixos/modules/services/misc/forgejo.nix @@ -722,7 +722,7 @@ in ''; serviceConfig = { - Type = "simple"; + Type = "notify"; User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.stateDir; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e22473058d4b..09dafdda600a 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -907,6 +907,50 @@ in ''; }; + secrets.activeRecordPrimaryKeyFile = mkOption { + type = with types; nullOr path; + default = null; + description = '' + A file containing the secret used to encrypt some rails data + in the DB. This should not be the same as `services.gitlab.secrets.activeRecordDeterministicKeyFile`! + + Make sure the secret is at ideally 32 characters and all random, + no regular words or you'll be exposed to dictionary attacks. + + This should be a string, not a nix path, since nix paths are + copied into the world-readable nix store. + ''; + }; + + secrets.activeRecordDeterministicKeyFile = mkOption { + type = with types; nullOr path; + default = null; + description = '' + A file containing the secret used to encrypt some rails data in a deterministic way + in the DB. This should not be the same as `services.gitlab.secrets.activeRecordPrimaryKeyFile`! + + Make sure the secret is at ideally 32 characters and all random, + no regular words or you'll be exposed to dictionary attacks. + + This should be a string, not a nix path, since nix paths are + copied into the world-readable nix store. + ''; + }; + + secrets.activeRecordSaltFile = mkOption { + type = with types; nullOr path; + default = null; + description = '' + A file containing the salt for active record encryption in the DB. + + Make sure the secret is at ideally 32 characters and all random, + no regular words or you'll be exposed to dictionary attacks. + + This should be a string, not a nix path, since nix paths are + copied into the world-readable nix store. + ''; + }; + extraShellConfig = mkOption { type = types.attrs; default = { }; @@ -1181,8 +1225,20 @@ in message = "services.gitlab.secrets.jwsFile must be set!"; } { - assertion = versionAtLeast postgresqlPackage.version "14.9"; - message = "PostgreSQL >= 14.9 is required to run GitLab 17. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading"; + assertion = cfg.secrets.activeRecordPrimaryKeyFile != null; + message = "services.gitlab.secrets.activeRecordPrimaryKeyFile must be set!"; + } + { + assertion = cfg.secrets.activeRecordDeterministicKeyFile != null; + message = "services.gitlab.secrets.activeRecordDeterministicKeyFile must be set!"; + } + { + assertion = cfg.secrets.activeRecordSaltFile != null; + message = "services.gitlab.secrets.activeRecordSaltFile must be set!"; + } + { + assertion = versionAtLeast postgresqlPackage.version "16"; + message = "PostgreSQL >= 16 is required to run GitLab 18. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading"; } ]; @@ -1296,6 +1352,7 @@ in ConditionPathExists = "!${cfg.registry.certFile}"; }; serviceConfig = { + Type = "oneshot"; Slice = "system-gitlab.slice"; }; }; @@ -1479,11 +1536,17 @@ in db="$(<'${cfg.secrets.dbFile}')" otp="$(<'${cfg.secrets.otpFile}')" jws="$(<'${cfg.secrets.jwsFile}')" - export secret db otp jws + arprimary="$(<'${cfg.secrets.activeRecordPrimaryKeyFile}')" + ardeterministic="$(<'${cfg.secrets.activeRecordDeterministicKeyFile}')" + arsalt="$(<'${cfg.secrets.activeRecordSaltFile}')" + export secret db otp jws arprimary ardeterministic arsalt jq -n '{production: {secret_key_base: $ENV.secret, otp_key_base: $ENV.otp, db_key_base: $ENV.db, - openid_connect_signing_key: $ENV.jws}}' \ + openid_connect_signing_key: $ENV.jws, + active_record_encryption_primary_key: $ENV.arprimary, + active_record_encryption_deterministic_key: $ENV.ardeterministic, + active_record_encryption_key_derivation_salt: $ENV.arsalt}}' \ > '${cfg.statePath}/config/secrets.yml' ) diff --git a/nixos/modules/services/misc/gotenberg.nix b/nixos/modules/services/misc/gotenberg.nix index e92e11b50c71..6d59b905dbea 100644 --- a/nixos/modules/services/misc/gotenberg.nix +++ b/nixos/modules/services/misc/gotenberg.nix @@ -16,14 +16,26 @@ let "--chromium-max-queue-size=${toString cfg.chromium.maxQueueSize}" "--libreoffice-restart-after=${toString cfg.libreoffice.restartAfter}" "--libreoffice-max-queue-size=${toString cfg.libreoffice.maxQueueSize}" - "--pdfengines-engines=${lib.concatStringsSep "," cfg.pdfEngines}" + "--pdfengines-merge-engines=${lib.concatStringsSep "," cfg.pdfEngines.merge}" + "--pdfengines-convert-engines=${lib.concatStringsSep "," cfg.pdfEngines.convert}" + "--pdfengines-read-metadata-engines=${lib.concatStringsSep "," cfg.pdfEngines.readMetadata}" + "--pdfengines-write-metadata-engines=${lib.concatStringsSep "," cfg.pdfEngines.writeMetadata}" + "--api-download-from-allow-list=${cfg.downloadFrom.allowList}" + "--api-download-from-max-retry=${toString cfg.downloadFrom.maxRetries}" ] ++ optional cfg.enableBasicAuth "--api-enable-basic-auth" ++ optional cfg.chromium.autoStart "--chromium-auto-start" ++ optional cfg.chromium.disableJavascript "--chromium-disable-javascript" ++ optional cfg.chromium.disableRoutes "--chromium-disable-routes" ++ optional cfg.libreoffice.autoStart "--libreoffice-auto-start" - ++ optional cfg.libreoffice.disableRoutes "--libreoffice-disable-routes"; + ++ optional cfg.libreoffice.disableRoutes "--libreoffice-disable-routes" + ++ optional cfg.pdfEngines.disableRoutes "--pdfengines-disable-routes" + ++ optional ( + cfg.downloadFrom.denyList != null + ) "--api-download-from-deny-list=${cfg.downloadFrom.denyList}" + ++ optional cfg.downloadFrom.disable "--api-disable-download-from" + ++ optional (cfg.bodyLimit != null) "--api-body-limit=${cfg.bodyLimit}" + ++ lib.optionals (cfg.extraArgs != [ ]) cfg.extraArgs; inherit (lib) mkEnableOption @@ -51,6 +63,12 @@ in description = "Port on which the API should listen."; }; + bindIP = mkOption { + type = types.nullOr types.str; + default = "127.0.0.1"; + description = "Port the API listener should bind to. Set to 0.0.0.0 to listen on all available IPs."; + }; + timeout = mkOption { type = types.nullOr types.str; default = "30s"; @@ -74,6 +92,12 @@ in ''; }; + bodyLimit = mkOption { + type = types.nullOr types.str; + default = null; + description = "Sets the max limit for `multipart/form-data` requests. Accepts values like '5M', '20G', etc."; + }; + extraFontPackages = mkOption { type = types.listOf types.package; default = [ ]; @@ -108,6 +132,29 @@ in }; }; + downloadFrom = { + allowList = mkOption { + type = types.nullOr types.str; + default = ".*"; + description = "Allow these URLs to be used in the `downloadFrom` API field. Accepts a regular expression."; + }; + denyList = mkOption { + type = types.nullOr types.str; + default = null; + description = "Deny accepting URLs from these domains in the `downloadFrom` API field. Accepts a regular expression."; + }; + maxRetries = mkOption { + type = types.int; + default = 4; + description = "The maximum amount of times to retry downloading a file specified with `downloadFrom`."; + }; + disable = mkOption { + type = types.bool; + default = false; + description = "Whether to disable the ability to download files for conversion from outside sources."; + }; + }; + libreoffice = { package = mkPackageOption pkgs "libreoffice" { }; @@ -136,28 +183,61 @@ in }; }; - pdfEngines = mkOption { - type = types.listOf ( - types.enum [ - "pdftk" + pdfEngines = { + merge = mkOption { + type = types.listOf ( + types.enum [ + "qpdf" + "pdfcpu" + "pdftk" + ] + ); + default = [ "qpdf" - "libreoffice-pdfengine" - "exiftool" "pdfcpu" - ] - ); - default = [ - "pdftk" - "qpdf" - "libreoffice-pdfengine" - "exiftool" - "pdfcpu" - ]; - description = '' - PDF engines to enable. Each one can be used to perform a specific task. - See [the documentation](https://gotenberg.dev/docs/configuration#pdf-engines) for more details. - Defaults to all possible PDF engines. - ''; + "pdftk" + ]; + description = "PDF Engines to use for merging files."; + }; + convert = mkOption { + type = types.listOf ( + types.enum [ + "libreoffice-pdfengine" + ] + ); + default = [ + "libreoffice-pdfengine" + ]; + description = "PDF Engines to use for converting files."; + }; + readMetadata = mkOption { + type = types.listOf ( + types.enum [ + "exiftool" + ] + ); + default = [ + "exiftool" + ]; + description = "PDF Engines to use for reading metadata from files."; + }; + writeMetadata = mkOption { + type = types.listOf ( + types.enum [ + "exiftool" + ] + ); + default = [ + "exiftool" + ]; + description = "PDF Engines to use for writing metadata to files."; + }; + + disableRoutes = mkOption { + type = types.bool; + default = false; + description = "Disable routes related to PDF engines."; + }; }; logLevel = mkOption { @@ -196,6 +276,15 @@ in See `services.gotenberg.enableBasicAuth` for the names of those variables. ''; } + { + assertion = !(lib.isList cfg.pdfEngines); + message = '' + Setting `services.gotenberg.pdfEngines` to a list is now deprecated. + Use the new `pdfEngines.mergeEngines`, `pdfEngines.convertEngines`, `pdfEngines.readMetadataEngines`, and `pdfEngines.writeMetadataEngines` settings instead. + + The previous option was using a method that is now deprecated by upstream. + ''; + } ]; systemd.services.gotenberg = { @@ -209,12 +298,20 @@ in FONTCONFIG_FILE = pkgs.makeFontsConf { fontDirectories = [ pkgs.liberation_ttf_v2 ] ++ cfg.extraFontPackages; }; + # Needed for LibreOffice to work correctly. + # https://github.com/NixOS/nixpkgs/issues/349123#issuecomment-2418330936 + HOME = "/run/gotenberg"; }; serviceConfig = { Type = "simple"; DynamicUser = true; ExecStart = "${lib.getExe cfg.package} ${lib.escapeShellArgs args}"; + # Needed for LibreOffice to work correctly. + # See above issue comment. + WorkingDirectory = "/run/gotenberg"; + RuntimeDirectory = "gotenberg"; + # Hardening options PrivateDevices = true; PrivateIPC = true; @@ -243,6 +340,7 @@ in SystemCallFilter = [ "@sandbox" "@system-service" + "@chown" ]; SystemCallArchitectures = "native"; diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix index 72861fdbbe87..07ccf7112d05 100644 --- a/nixos/modules/services/misc/homepage-dashboard.nix +++ b/nixos/modules/services/misc/homepage-dashboard.nix @@ -4,7 +4,6 @@ lib, ... }: - let cfg = config.services.homepage-dashboard; # Define the settings format used for this program @@ -29,6 +28,19 @@ in description = "Port for Homepage to bind to."; }; + allowedHosts = lib.mkOption { + type = lib.types.str; + default = "localhost:8082,127.0.0.1:8082"; + example = "example.com"; + description = '' + Hosts that homepage-dashboard will be running under. + You will want to change this in order to acess homepage from anything other than localhost. + see the upsream documentation: + + + ''; + }; + environmentFile = lib.mkOption { type = lib.types.str; description = '' @@ -215,16 +227,55 @@ in NIXPKGS_HOMEPAGE_CACHE_DIR = "/var/cache/homepage-dashboard"; PORT = toString cfg.listenPort; LOG_TARGETS = "stdout"; + HOMEPAGE_ALLOWED_HOSTS = cfg.allowedHosts; }; serviceConfig = { Type = "simple"; - DynamicUser = true; EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; StateDirectory = "homepage-dashboard"; CacheDirectory = "homepage-dashboard"; ExecStart = lib.getExe cfg.package; Restart = "on-failure"; + + # hardening + DynamicUser = true; + DevicePolicy = "closed"; + CapabilityBoundingSet = ""; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + "AF_NETLINK" + ]; + DeviceAllow = ""; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + LockPersonality = true; + RemoveIPC = true; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@resources" + ]; + ProtectProc = "invisible"; + ProtectHostname = true; + UMask = "0077"; + # cpu widget requires access to /proc + ProcSubset = if lib.any (widget: widget.resources.cpu or false) cfg.widgets then "all" else "pid"; }; enableStrictShellChecks = true; diff --git a/nixos/modules/services/misc/moonraker.nix b/nixos/modules/services/misc/moonraker.nix index 43d46a690915..9c6067634209 100644 --- a/nixos/modules/services/misc/moonraker.nix +++ b/nixos/modules/services/misc/moonraker.nix @@ -224,6 +224,8 @@ in platform = "linux"; enable_estimator_updates = false; }; + # suppress PolicyKit warnings if system control is disabled + machine.provider = lib.mkIf (!cfg.allowSystemControl) (lib.mkDefault "none"); }; security.polkit.extraConfig = lib.optionalString cfg.allowSystemControl '' diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 56d176d81d36..034b044fbafe 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -19,8 +19,9 @@ in }; dates = lib.mkOption { - type = lib.types.singleLineStr; - default = "03:15"; + type = with lib.types; either singleLineStr (listOf str); + apply = lib.toList; + default = [ "03:15" ]; example = "weekly"; description = '' How often or when garbage collection is performed. For most desktop and server systems @@ -86,7 +87,7 @@ in description = "Nix Garbage Collector"; script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}"; serviceConfig.Type = "oneshot"; - startAt = lib.optional cfg.automatic cfg.dates; + startAt = lib.optionals cfg.automatic cfg.dates; }; systemd.timers.nix-gc = lib.mkIf cfg.automatic { diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index 42f60b77a5b4..3581b95ce18a 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -15,7 +15,8 @@ in dates = lib.mkOption { default = [ "03:45" ]; - type = with lib.types; listOf str; + apply = lib.toList; + type = with lib.types; either singleLineStr (listOf str); description = '' Specification (in the format described by {manpage}`systemd.time(7)`) of the time at diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index b27ef03dae6f..3b09ca0f1be0 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -26,7 +26,13 @@ in write = lib.mkOption { type = lib.types.bool; default = false; - description = "Whether to enable writing to the Nix store as a remote store via SSH. Note: the sshServe user is named nix-ssh and is not a trusted-user. nix-ssh should be added to the {option}`nix.settings.trusted-users` option in most use cases, such as allowing remote building of derivations."; + description = "Whether to enable writing to the Nix store as a remote store via SSH. Note: by default, the sshServe user is named nix-ssh and is not a trusted-user. nix-ssh should be added to the {option}`nix.sshServe.trusted` option in most use cases, such as allowing remote building of derivations to anonymous people based on ssh key"; + }; + + trusted = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to add nix-ssh to the nix.settings.trusted-users"; }; keys = lib.mkOption { @@ -59,6 +65,8 @@ in }; users.groups.nix-ssh = { }; + nix.settings.trusted-users = lib.mkIf cfg.trusted [ "nix-ssh" ]; + services.openssh.enable = true; services.openssh.extraConfig = '' diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 193e4222a37e..45c631a36dfd 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -18,9 +18,7 @@ let cfgUpdate = pkgs.writeText "octoprint-config.yaml" (builtins.toJSON fullConfig); - pluginsEnv = package.python.withPackages (ps: [ ps.octoprint ] ++ (cfg.plugins ps)); - - package = pkgs.octoprint; + pluginsEnv = cfg.package.python.withPackages (ps: [ ps.octoprint ] ++ (cfg.plugins ps)); in { @@ -30,6 +28,8 @@ in services.octoprint = { + package = lib.mkPackageOption pkgs "octoprint" { }; + enable = lib.mkEnableOption "OctoPrint, web interface for 3D printers"; host = lib.mkOption { diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index 9fd876ec5869..d6de23fe4c40 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -223,6 +223,7 @@ in "char-nvidia-uvm" # ROCm "char-drm" + "char-fb" "char-kfd" # WSL (Windows Subsystem for Linux) "/dev/dxg" diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index db703ce77883..c66a6df50721 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -21,7 +21,9 @@ let PAPERLESS_MEDIA_ROOT = cfg.mediaDir; PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir; PAPERLESS_THUMBNAIL_FONT_NAME = defaultFont; - GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}"; + GRANIAN_HOST = cfg.address; + GRANIAN_PORT = toString cfg.port; + GRANIAN_WORKERS_KILL_TIMEOUT = "60"; } // lib.optionalAttrs (config.time.timeZone != null) { PAPERLESS_TIME_ZONE = config.time.timeZone; @@ -196,7 +198,7 @@ in address = lib.mkOption { type = lib.types.str; - default = "localhost"; + default = "127.0.0.1"; description = "Web interface address."; }; @@ -357,11 +359,29 @@ in description = "Settings to pass to the document exporter as CLI arguments."; }; }; + + configureTika = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to configure Tika and Gotenberg to process Office and e-mail files with OCR. + ''; + }; + + manage = lib.mkOption { + type = lib.types.package; + readOnly = true; + description = '' + The package derivation for the `paperless-manage` wrapper script. + Useful for other modules that need to add this specific script to a service's PATH. + ''; + }; }; config = lib.mkIf cfg.enable ( lib.mkMerge [ { + services.paperless.manage = manage; environment.systemPackages = [ manage ]; services.redis.servers.paperless.enable = lib.mkIf enableRedis true; @@ -377,12 +397,18 @@ in ]; }; - services.paperless.settings = lib.mkIf cfg.database.createLocally { - PAPERLESS_DBENGINE = "postgresql"; - PAPERLESS_DBHOST = "/run/postgresql"; - PAPERLESS_DBNAME = "paperless"; - PAPERLESS_DBUSER = "paperless"; - }; + services.paperless.settings = lib.mkMerge [ + (lib.mkIf cfg.database.createLocally { + PAPERLESS_DBENGINE = "postgresql"; + PAPERLESS_DBHOST = "/run/postgresql"; + PAPERLESS_DBNAME = "paperless"; + PAPERLESS_DBUSER = "paperless"; + }) + (lib.mkIf cfg.configureTika { + PAPERLESS_GOTENBERG_ENABLED = true; + PAPERLESS_TIKA_ENABLED = true; + }) + ]; systemd.slices.system-paperless = { description = "Paperless Document Management System Slice"; @@ -421,8 +447,7 @@ in }; environment = env; - preStart = - '' + preStart = '' # remove old papaerless-manage symlink # TODO: drop with NixOS 25.11 [[ -L '${cfg.dataDir}/paperless-manage' ]] && rm '${cfg.dataDir}/paperless-manage' @@ -448,13 +473,15 @@ in ${cfg.package}/bin/paperless-ngx document_index reindex fi - echo ${cfg.package.version} > "$versionFile" - fi - '' - + lib.optionalString (cfg.passwordFile != null) '' + echo ${cfg.package.version} > "$versionFile" + fi + + if ${lib.boolToString (cfg.passwordFile != null)} || [[ -n $PAPERLESS_ADMIN_PASSWORD ]]; then export PAPERLESS_ADMIN_USER="''${PAPERLESS_ADMIN_USER:-admin}" - PAPERLESS_ADMIN_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD") - export PAPERLESS_ADMIN_PASSWORD + if [[ -e $CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD ]]; then + PAPERLESS_ADMIN_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD") + export PAPERLESS_ADMIN_PASSWORD + fi superuserState="$PAPERLESS_ADMIN_USER:$PAPERLESS_ADMIN_PASSWORD" superuserStateFile="${cfg.dataDir}/superuser-state" @@ -462,7 +489,8 @@ in ${cfg.package}/bin/paperless-ngx manage_superuser echo "$superuserState" > "$superuserStateFile" fi - ''; + fi + ''; requires = lib.optional cfg.database.createLocally "postgresql.service"; after = lib.optional enableRedis "redis-paperless.service" @@ -537,16 +565,15 @@ in echo "PAPERLESS_SECRET_KEY is empty, refusing to start." exit 1 fi - exec ${cfg.package.python.pkgs.gunicorn}/bin/gunicorn \ - -c ${cfg.package}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application + exec ${lib.getExe cfg.package.python.pkgs.granian} --interface asginl --ws "paperless.asgi:application" ''; serviceConfig = defaultServiceConfig // { User = cfg.user; Restart = "on-failure"; LimitNOFILE = 65536; - # gunicorn needs setuid, liblapack needs mbind - SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid mbind" ]; + # liblapack needs mbind + SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ]; # Needs to serve web page PrivateNetwork = false; }; @@ -569,6 +596,18 @@ in gid = config.ids.gids.paperless; }; }; + + services.gotenberg = lib.mkIf cfg.configureTika { + enable = true; + # https://github.com/paperless-ngx/paperless-ngx/blob/v2.15.3/docker/compose/docker-compose.sqlite-tika.yml#L64-L69 + chromium.disableJavascript = true; + extraArgs = [ "--chromium-allow-list=file:///tmp/.*" ]; + }; + + services.tika = lib.mkIf cfg.configureTika { + enable = true; + enableOcr = true; + }; } (lib.mkIf cfg.exporter.enable { diff --git a/nixos/modules/services/misc/servarr/prowlarr.nix b/nixos/modules/services/misc/servarr/prowlarr.nix index dcf5b18005b4..b8d93bd6e8a4 100644 --- a/nixos/modules/services/misc/servarr/prowlarr.nix +++ b/nixos/modules/services/misc/servarr/prowlarr.nix @@ -13,6 +13,12 @@ in services.prowlarr = { enable = lib.mkEnableOption "Prowlarr, an indexer manager/proxy for Torrent trackers and Usenet indexers"; + dataDir = lib.mkOption { + type = lib.types.str; + default = "/var/lib/prowlarr"; + description = "The directory where Prowlarr stores its data files."; + }; + package = lib.mkPackageOption pkgs "prowlarr" { }; openFirewall = lib.mkOption { @@ -24,30 +30,63 @@ in settings = servarr.mkServarrSettingsOptions "prowlarr" 9696; environmentFiles = servarr.mkServarrEnvironmentFiles "prowlarr"; + + user = lib.mkOption { + type = lib.types.str; + default = "prowlarr"; + description = '' + User account under which Prowlarr runs. + ''; + }; + + group = lib.mkOption { + type = lib.types.str; + default = "prowlarr"; + description = '' + Group under which Prowlarr runs. + ''; + }; }; }; config = lib.mkIf cfg.enable { - systemd.services.prowlarr = { - description = "Prowlarr"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - environment = servarr.mkServarrSettingsEnvVars "PROWLARR" cfg.settings // { - HOME = "/var/empty"; + systemd = { + services.prowlarr = { + description = "Prowlarr"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = servarr.mkServarrSettingsEnvVars "PROWLARR" cfg.settings; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + EnvironmentFile = cfg.environmentFiles; + ExecStart = "${lib.getExe cfg.package} -nobrowser -data='${cfg.dataDir}'"; + Restart = "on-failure"; + }; }; - serviceConfig = { - Type = "simple"; - DynamicUser = true; - StateDirectory = "prowlarr"; - EnvironmentFile = cfg.environmentFiles; - ExecStart = "${lib.getExe cfg.package} -nobrowser -data=/var/lib/prowlarr"; - Restart = "on-failure"; + tmpfiles.settings."10-prowlarr".${cfg.dataDir}.d = { + inherit (cfg) user group; + mode = "0700"; }; }; networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.settings.server.port ]; }; + + users.users = lib.mkIf (cfg.user == "prowlarr") { + prowlarr = { + isSystemUser = true; + group = cfg.group; + home = cfg.dataDir; + }; + }; + + users.groups = lib.mkIf (cfg.group == "prowlarr") { + prowlarr = { }; + }; }; } diff --git a/nixos/modules/services/misc/signald.nix b/nixos/modules/services/misc/signald.nix deleted file mode 100644 index 90b184401917..000000000000 --- a/nixos/modules/services/misc/signald.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.services.signald; - dataDir = "/var/lib/signald"; - defaultUser = "signald"; -in -{ - options.services.signald = { - enable = lib.mkEnableOption "signald, the unofficial daemon for interacting with Signal"; - - user = lib.mkOption { - type = lib.types.str; - default = defaultUser; - description = "User under which signald runs."; - }; - - group = lib.mkOption { - type = lib.types.str; - default = defaultUser; - description = "Group under which signald runs."; - }; - - socketPath = lib.mkOption { - type = lib.types.str; - default = "/run/signald/signald.sock"; - description = "Path to the signald socket"; - }; - }; - - config = lib.mkIf cfg.enable { - users.users = lib.optionalAttrs (cfg.user == defaultUser) { - ${defaultUser} = { - group = cfg.group; - isSystemUser = true; - }; - }; - - users.groups = lib.optionalAttrs (cfg.group == defaultUser) { - ${defaultUser} = { }; - }; - - systemd.services.signald = { - description = "A daemon for interacting with the Signal Private Messenger"; - wants = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - ExecStart = "${pkgs.signald}/bin/signald -d ${dataDir} -s ${cfg.socketPath}"; - ExecStartPre = "${pkgs.signald}/bin/signald -d ${dataDir} -s ${cfg.socketPath} --migrate-data"; - Restart = "on-failure"; - StateDirectory = "signald"; - RuntimeDirectory = "signald"; - StateDirectoryMode = "0750"; - RuntimeDirectoryMode = "0750"; - - BindReadOnlyPaths = [ - "/nix/store" - "-/etc/resolv.conf" - "-/etc/nsswitch.conf" - "-/etc/hosts" - "-/etc/localtime" - ]; - CapabilityBoundingSet = ""; - # ProtectClock= adds DeviceAllow=char-rtc r - DeviceAllow = ""; - # Use a static user so other applications can access the files - #DynamicUser = true; - LockPersonality = true; - # Needed for java - #MemoryDenyWriteExecute = true; - NoNewPrivileges = true; - PrivateDevices = true; - PrivateMounts = true; - # Needs network access - #PrivateNetwork = true; - PrivateTmp = true; - PrivateUsers = true; - ProcSubset = "pid"; - ProtectClock = true; - ProtectHome = true; - ProtectHostname = true; - # Would re-mount paths ignored by temporary root - #ProtectSystem = "strict"; - ProtectControlGroups = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectProc = "invisible"; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged @resources @setuid @keyring" - ]; - TemporaryFileSystem = "/:ro"; - # Does not work well with the temporary root - #UMask = "0066"; - }; - }; - }; -} diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index e9178d153b9e..b6e785802206 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/nixos/modules/services/misc/sourcehut/default.nix @@ -97,13 +97,14 @@ let # Those paths are mounted using BindPaths= or BindReadOnlyPaths= # for services needing access to them. "builds.sr.ht::worker".buildlogs = "/var/log/sourcehut/buildsrht-worker"; - "git.sr.ht".post-update-script = "/usr/bin/gitsrht-update-hook"; + "git.sr.ht".post-update-script = "/usr/bin/git.sr.ht-update-hook"; "git.sr.ht".repos = cfg.settings."git.sr.ht".repos; - "hg.sr.ht".changegroup-script = "/usr/bin/hgsrht-hook-changegroup"; + "hg.sr.ht".changegroup-script = "/usr/bin/hg.sr.ht-hook-changegroup"; "hg.sr.ht".repos = cfg.settings."hg.sr.ht".repos; # Making this a per service option despite being in a global section, # so that it uses the redis-server used by the service. "sr.ht".redis-host = cfg.${srv}.redis.host; + "sr.ht".assets = "${cfg.${srv}.package}/share/sourcehut"; } ) ) @@ -376,7 +377,7 @@ in redis = mkOption { description = "The Redis connection used for the Celery worker."; type = types.str; - default = "redis+socket:///run/redis-sourcehut-buildsrht/redis.sock?virtual_host=2"; + default = "redis+socket:///run/redis-sourcehut-builds.sr.ht/redis.sock?virtual_host=2"; }; shell = mkOption { description = '' @@ -436,8 +437,8 @@ in This setting is propagated to newer and existing repositories. ''; type = types.path; - default = "${pkgs.sourcehut.gitsrht}/bin/gitsrht-update-hook"; - defaultText = "\${pkgs.sourcehut.gitsrht}/bin/gitsrht-update-hook"; + default = "${cfg.git.package}/bin/git.sr.ht-update-hook"; + defaultText = "\${pkgs.sourcehut.gitsrht}/bin/git.sr.ht-update-hook"; }; repos = mkOption { description = '' @@ -446,12 +447,12 @@ in the gitsrht's user as read and write access to it. ''; type = types.str; - default = "/var/lib/sourcehut/gitsrht/repos"; + default = "/var/lib/sourcehut/git.sr.ht/repos"; }; webhooks = mkOption { description = "The Redis connection used for the webhooks worker."; type = types.str; - default = "redis+socket:///run/redis-sourcehut-gitsrht/redis.sock?virtual_host=1"; + default = "redis+socket:///run/redis-sourcehut-git.sr.ht/redis.sock?virtual_host=1"; }; }; options."git.sr.ht::api" = { @@ -477,8 +478,8 @@ in This setting is propagated to newer and existing repositories. ''; type = types.str; - default = "${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup"; - defaultText = "\${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup"; + default = "${cfg.hg.package}/bin/hg.sr.ht-hook-changegroup"; + defaultText = "\${pkgs.sourcehut.hgsrht}/bin/hg.sr.ht-hook-changegroup"; }; repos = mkOption { description = '' @@ -487,7 +488,7 @@ in the hgsrht's user as read and write access to it. ''; type = types.str; - default = "/var/lib/sourcehut/hgsrht/repos"; + default = "/var/lib/sourcehut/hg.sr.ht/repos"; }; srhtext = mkOptionNullOrStr '' Path to the srht mercurial extension @@ -507,7 +508,7 @@ in webhooks = mkOption { description = "The Redis connection used for the webhooks worker."; type = types.str; - default = "redis+socket:///run/redis-sourcehut-hgsrht/redis.sock?virtual_host=1"; + default = "redis+socket:///run/redis-sourcehut-hg.sr.ht/redis.sock?virtual_host=1"; }; }; @@ -529,12 +530,12 @@ in redis = mkOption { description = "The Redis connection used for the Celery worker."; type = types.str; - default = "redis+socket:///run/redis-sourcehut-listssrht/redis.sock?virtual_host=2"; + default = "redis+socket:///run/redis-sourcehut-lists.sr.ht/redis.sock?virtual_host=2"; }; webhooks = mkOption { description = "The Redis connection used for the webhooks worker."; type = types.str; - default = "redis+socket:///run/redis-sourcehut-listssrht/redis.sock?virtual_host=1"; + default = "redis+socket:///run/redis-sourcehut-lists.sr.ht/redis.sock?virtual_host=1"; }; }; options."lists.sr.ht::worker" = { @@ -584,7 +585,7 @@ in webhooks = mkOption { description = "The Redis connection used for the webhooks worker."; type = types.str; - default = "redis+socket:///run/redis-sourcehut-metasrht/redis.sock?virtual_host=1"; + default = "redis+socket:///run/redis-sourcehut-meta.sr.ht/redis.sock?virtual_host=1"; }; welcome-emails = mkEnableOption "sending stock sourcehut welcome emails after signup"; }; @@ -691,7 +692,7 @@ in webhooks = mkOption { description = "The Redis connection used for the webhooks worker."; type = types.str; - default = "redis+socket:///run/redis-sourcehut-todosrht/redis.sock?virtual_host=1"; + default = "redis+socket:///run/redis-sourcehut-todo.sr.ht/redis.sock?virtual_host=1"; }; }; options."todo.sr.ht::mail" = { @@ -763,7 +764,7 @@ in }; git = { - package = mkPackageOption pkgs "git" { + gitPackage = mkPackageOption pkgs "git" { example = "gitFull"; }; fcgiwrap.preforkProcess = mkOption { @@ -774,7 +775,7 @@ in }; hg = { - package = mkPackageOption pkgs "mercurial" { }; + mercurialPackage = mkPackageOption pkgs "mercurial" { }; cloneBundles = mkOption { type = types.bool; default = false; @@ -806,6 +807,7 @@ in config = mkIf cfg.enable (mkMerge [ { + # TODO: make configurable environment.systemPackages = [ pkgs.sourcehut.coresrht ]; services.sourcehut.settings = { @@ -875,14 +877,14 @@ in set -e set -x cd /etc/ssh/sourcehut/subdir - ${pkgs.sourcehut.gitsrht}/bin/gitsrht-dispatch "$@" + ${cfg.git.package}/bin/git.sr.ht-dispatch "$@" ''; }; systemd.tmpfiles.settings."10-sourcehut-gitsrht" = mkIf cfg.git.enable (mkMerge [ (builtins.listToAttrs ( map (name: { - name = "/var/log/sourcehut/gitsrht-${name}"; + name = "/var/log/sourcehut/git.sr.ht-${name}"; value.f = { inherit (cfg.git) user group; mode = "0644"; @@ -903,7 +905,7 @@ in ]); systemd.services.sshd = { preStart = mkIf cfg.hg.enable '' - chown ${cfg.hg.user}:${cfg.hg.group} /var/log/sourcehut/hgsrht-keys + chown ${cfg.hg.user}:${cfg.hg.group} /var/log/sourcehut/hg.sr.ht-keys ''; serviceConfig = { LogsDirectory = "sourcehut"; @@ -919,62 +921,62 @@ in "${pkgs.writeShellScript "buildsrht-keys-wrapper" '' set -e cd /run/sourcehut/buildsrht/subdir - exec -a "$0" ${pkgs.sourcehut.buildsrht}/bin/buildsrht-keys "$@" + exec -a "$0" ${cfg.builds.package}/bin/builds.sr.ht-keys "$@" ''}:/usr/bin/buildsrht-keys" - "${pkgs.sourcehut.buildsrht}/bin/master-shell:/usr/bin/master-shell" - "${pkgs.sourcehut.buildsrht}/bin/runner-shell:/usr/bin/runner-shell" + "${cfg.builds.package}/bin/master-shell:/usr/bin/master-shell" + "${cfg.builds.package}/bin/runner-shell:/usr/bin/runner-shell" ] ++ optionals cfg.git.enable [ # /path/to/gitsrht-keys calls /path/to/gitsrht-shell, # or [git.sr.ht] shell= if set. "${pkgs.writeShellScript "gitsrht-keys-wrapper" '' set -e - cd /run/sourcehut/gitsrht/subdir - exec -a "$0" ${pkgs.sourcehut.gitsrht}/bin/gitsrht-keys "$@" - ''}:/usr/bin/gitsrht-keys" + cd /run/sourcehut/git.sr.ht/subdir + exec -a "$0" ${cfg.git.package}/bin/git.sr.ht-keys "$@" + ''}:/usr/bin/git.sr.ht-keys" "${pkgs.writeShellScript "gitsrht-shell-wrapper" '' set -e - cd /run/sourcehut/gitsrht/subdir - export PATH="${cfg.git.package}/bin:$PATH" - export SRHT_CONFIG=/run/sourcehut/gitsrht/config.ini - exec -a "$0" ${pkgs.sourcehut.gitsrht}/bin/gitsrht-shell "$@" - ''}:/usr/bin/gitsrht-shell" + cd /run/sourcehut/git.sr.ht/subdir + export PATH="${cfg.git.gitPackage}/bin:$PATH" + export SRHT_CONFIG=/run/sourcehut/git.sr.ht/config.ini + exec -a "$0" ${cfg.git.package}/bin/git.sr.ht-shell "$@" + ''}:/usr/bin/git.sr.ht-shell" "${pkgs.writeShellScript "gitsrht-update-hook" '' set -e - export SRHT_CONFIG=/run/sourcehut/gitsrht/config.ini + export SRHT_CONFIG=/run/sourcehut/git.sr.ht/config.ini # hooks/post-update calls /usr/bin/gitsrht-update-hook as hooks/stage-3 # but this wrapper being a bash script, it overrides $0 with /usr/bin/gitsrht-update-hook # hence this hack to put hooks/stage-3 back into gitsrht-update-hook's $0 if test "''${STAGE3:+set}" then - exec -a hooks/stage-3 ${pkgs.sourcehut.gitsrht}/bin/gitsrht-update-hook "$@" + exec -a hooks/stage-3 ${cfg.git.package}/bin/git.sr.ht-update-hook "$@" else export STAGE3=set - exec -a "$0" ${pkgs.sourcehut.gitsrht}/bin/gitsrht-update-hook "$@" + exec -a "$0" ${cfg.git.package}/bin/git.sr.ht-update-hook "$@" fi - ''}:/usr/bin/gitsrht-update-hook" + ''}:/usr/bin/git.sr.ht-update-hook" ] ++ optionals cfg.hg.enable [ # /path/to/hgsrht-keys calls /path/to/hgsrht-shell, # or [hg.sr.ht] shell= if set. "${pkgs.writeShellScript "hgsrht-keys-wrapper" '' set -e - cd /run/sourcehut/hgsrht/subdir - exec -a "$0" ${pkgs.sourcehut.hgsrht}/bin/hgsrht-keys "$@" - ''}:/usr/bin/hgsrht-keys" - "${pkgs.writeShellScript "hgsrht-shell-wrapper" '' + cd /run/sourcehut/hg.sr.ht/subdir + exec -a "$0" ${cfg.hg.package}/bin/hg.sr.ht-keys "$@" + ''}:/usr/bin/hg.sr.ht-keys" + "${pkgs.writeShellScript "hg.sr.ht-shell-wrapper" '' set -e - cd /run/sourcehut/hgsrht/subdir - exec -a "$0" ${pkgs.sourcehut.hgsrht}/bin/hgsrht-shell "$@" - ''}:/usr/bin/hgsrht-shell" + cd /run/sourcehut/hg.sr.ht/subdir + exec -a "$0" ${cfg.hg.package}/bin/hg.sr.ht-shell "$@" + ''}:/usr/bin/hg.sr.ht-shell" # Mercurial's changegroup hooks are run relative to their repository's directory, # but hgsrht-hook-changegroup looks up ./config.ini "${pkgs.writeShellScript "hgsrht-hook-changegroup" '' set -e test -e "''$PWD"/config.ini || - ln -s /run/sourcehut/hgsrht/config.ini "''$PWD"/config.ini - exec -a "$0" ${pkgs.sourcehut.hgsrht}/bin/hgsrht-hook-changegroup "$@" - ''}:/usr/bin/hgsrht-hook-changegroup" + ln -s /run/sourcehut/hg.sr.ht/config.ini "''$PWD"/config.ini + exec -a "$0" ${cfg.hg.package}/bin/hg.sr.ht-hook-changegroup "$@" + ''}:/usr/bin/hg.sr.ht-hook-changegroup" ]; }; }; @@ -985,17 +987,17 @@ in (import ./service.nix "builds" { inherit configIniOfService; - srvsrht = "buildsrht"; + pkgname = "buildsrht"; port = 5002; - extraServices.buildsrht-api = { + extraServices."build.sr.ht-api" = { serviceConfig.Restart = "always"; serviceConfig.RestartSec = "5s"; - serviceConfig.ExecStart = "${pkgs.sourcehut.buildsrht}/bin/buildsrht-api -b ${cfg.listenAddress}:${ + serviceConfig.ExecStart = "${cfg.builds.package}/bin/builds.sr.ht-api -b ${cfg.listenAddress}:${ toString (cfg.builds.port + 100) }"; }; # TODO: a celery worker on the master and worker are apparently needed - extraServices.buildsrht-worker = + extraServices."build.sr.ht-worker" = let qemuPackage = pkgs.qemu_kvm; serviceName = "buildsrht-worker"; @@ -1024,7 +1026,7 @@ in fi ''; serviceConfig = { - ExecStart = "${pkgs.sourcehut.buildsrht}/bin/buildsrht-worker"; + ExecStart = "${cfg.builds.package}/bin/builds.sr.ht-worker"; BindPaths = [ cfg.settings."builds.sr.ht::worker".buildlogs ]; LogsDirectory = [ "sourcehut/${serviceName}" ]; RuntimeDirectory = [ "sourcehut/${serviceName}/subdir" ]; @@ -1055,7 +1057,7 @@ in name = "buildsrht-worker-images-pre"; paths = image_dirs; # FIXME: not working, apparently because ubuntu/latest is a broken link - # ++ [ "${pkgs.sourcehut.buildsrht}/lib/images" ]; + # ++ [ "${cfg.builds.package}/lib/images" ]; }; image_dir = pkgs.runCommand "buildsrht-worker-images" { } '' mkdir -p $out/images @@ -1072,7 +1074,7 @@ in { # Note that git.sr.ht::dispatch is not a typo, # gitsrht-dispatch always use this section - "git.sr.ht::dispatch"."/usr/bin/buildsrht-keys" = + "git.sr.ht::dispatch"."/usr/bin/builds.sr.ht-keys" = mkDefault "${cfg.builds.user}:${cfg.builds.group}"; } (mkIf cfg.builds.enableWorker { @@ -1113,8 +1115,10 @@ in (import ./service.nix "git" ( let baseService = { - path = [ cfg.git.package ]; - serviceConfig.BindPaths = [ "${cfg.settings."git.sr.ht".repos}:/var/lib/sourcehut/gitsrht/repos" ]; + path = [ cfg.git.gitPackage ]; + serviceConfig.BindPaths = [ + "${cfg.settings."git.sr.ht".repos}:/var/lib/sourcehut/git.sr.ht/repos" + ]; }; in { @@ -1123,23 +1127,23 @@ in baseService { serviceConfig.StateDirectory = [ - "sourcehut/gitsrht" - "sourcehut/gitsrht/repos" + "sourcehut/git.sr.ht" + "sourcehut/git.sr.ht/repos" ]; preStart = mkIf (versionOlder config.system.stateVersion "22.05") (mkBefore '' # Fix Git hooks of repositories pre-dating https://github.com/NixOS/nixpkgs/pull/133984 ( set +f shopt -s nullglob - for h in /var/lib/sourcehut/gitsrht/repos/~*/*/hooks/{pre-receive,update,post-update} - do ln -fnsv /usr/bin/gitsrht-update-hook "$h"; done + for h in /var/lib/sourcehut/git.sr.ht/repos/~*/*/hooks/{pre-receive,update,post-update} + do ln -fnsv /usr/bin/git.sr.ht-update-hook "$h"; done ) ''); } ]; port = 5001; webhooks = true; - extraTimers.gitsrht-periodic = { + extraTimers."git.sr.ht-periodic" = { service = baseService; timerConfig.OnCalendar = [ "*:0/20" ]; }; @@ -1149,7 +1153,7 @@ in # Probably could use gitsrht-shell if output is restricted to just parameters... users.users.${cfg.git.user}.shell = pkgs.bash; services.sourcehut.settings = { - "git.sr.ht::dispatch"."/usr/bin/gitsrht-keys" = mkDefault "${cfg.git.user}:${cfg.git.group}"; + "git.sr.ht::dispatch"."/usr/bin/git.sr.ht-keys" = mkDefault "${cfg.git.user}:${cfg.git.group}"; }; systemd.services.sshd = baseService; } @@ -1164,49 +1168,50 @@ in ''; }; locations."~ ^/([^/]+)/([^/]+)/(HEAD|info/refs|objects/info/.*|git-upload-pack).*$" = { - root = "/var/lib/sourcehut/gitsrht/repos"; + root = "/var/lib/sourcehut/git.sr.ht/repos"; fastcgiParams = { GIT_HTTP_EXPORT_ALL = ""; GIT_PROJECT_ROOT = "$document_root"; PATH_INFO = "$uri"; - SCRIPT_FILENAME = "${cfg.git.package}/bin/git-http-backend"; + SCRIPT_FILENAME = "${cfg.git.gitPackage}/bin/git-http-backend"; }; extraConfig = '' auth_request /authorize; fastcgi_read_timeout 500s; - fastcgi_pass unix:/run/gitsrht-fcgiwrap.sock; + fastcgi_pass unix:/run/git.sr.ht-fcgiwrap.sock; gzip off; ''; }; }; - systemd.sockets.gitsrht-fcgiwrap = { + systemd.sockets."git.sr.ht-fcgiwrap" = { before = [ "nginx.service" ]; wantedBy = [ "sockets.target" - "gitsrht.service" + "git.sr.ht.service" ]; # This path remains accessible to nginx.service, which has no RootDirectory= - socketConfig.ListenStream = "/run/gitsrht-fcgiwrap.sock"; + socketConfig.ListenStream = "/run/git.sr.ht-fcgiwrap.sock"; socketConfig.SocketUser = nginx.user; socketConfig.SocketMode = "600"; }; }) ]; - extraServices.gitsrht-api.serviceConfig = { + extraServices."git.sr.ht-api".serviceConfig = { Restart = "always"; RestartSec = "5s"; - ExecStart = "${pkgs.sourcehut.gitsrht}/bin/gitsrht-api -b ${cfg.listenAddress}:${toString (cfg.git.port + 100)}"; - BindPaths = [ "${cfg.settings."git.sr.ht".repos}:/var/lib/sourcehut/gitsrht/repos" ]; + ExecStart = "${cfg.git.package}/bin/git.sr.ht-api -b ${cfg.listenAddress}:${toString (cfg.git.port + 100)}"; + BindPaths = [ "${cfg.settings."git.sr.ht".repos}:/var/lib/sourcehut/git.sr.ht/repos" ]; }; - extraServices.gitsrht-fcgiwrap = mkIf cfg.nginx.enable { + extraServices."git.sr.ht-fcgiwrap" = mkIf cfg.nginx.enable { serviceConfig = { # Socket is passed by gitsrht-fcgiwrap.socket - ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${toString cfg.git.fcgiwrap.preforkProcess}"; + ExecStart = "${pkgs.fcgiwrap}/bin/fcgiwrap -c ${toString cfg.git.fcgiwrap.preforkProcess}"; # No need for config.ini ExecStartPre = mkForce [ ]; - User = null; - DynamicUser = true; - BindReadOnlyPaths = [ "${cfg.settings."git.sr.ht".repos}:/var/lib/sourcehut/gitsrht/repos" ]; + # FIXME: Fails to start with dynamic user + # User = null; + # DynamicUser = true; + BindReadOnlyPaths = [ "${cfg.settings."git.sr.ht".repos}:/var/lib/sourcehut/git.sr.ht/repos" ]; IPAddressDeny = "any"; InaccessiblePaths = [ "-+/run/postgresql" @@ -1232,8 +1237,8 @@ in (import ./service.nix "hg" ( let baseService = { - path = [ cfg.hg.package ]; - serviceConfig.BindPaths = [ "${cfg.settings."hg.sr.ht".repos}:/var/lib/sourcehut/hgsrht/repos" ]; + path = [ cfg.hg.mercurialPackage ]; + serviceConfig.BindPaths = [ "${cfg.settings."hg.sr.ht".repos}:/var/lib/sourcehut/hg.sr.ht/repos" ]; }; in { @@ -1242,26 +1247,26 @@ in baseService { serviceConfig.StateDirectory = [ - "sourcehut/hgsrht" - "sourcehut/hgsrht/repos" + "sourcehut/hg.sr.ht" + "sourcehut/hg.sr.ht/repos" ]; } ]; port = 5010; webhooks = true; - extraTimers.hgsrht-periodic = { + extraTimers."hg.sr.ht-periodic" = { service = baseService; timerConfig.OnCalendar = [ "*:0/20" ]; }; - extraTimers.hgsrht-clonebundles = mkIf cfg.hg.cloneBundles { + extraTimers."hg.sr.ht-clonebundles" = mkIf cfg.hg.cloneBundles { service = baseService; timerConfig.OnCalendar = [ "daily" ]; timerConfig.AccuracySec = "1h"; }; - extraServices.hgsrht-api = { + extraServices."hg.sr.ht-api" = { serviceConfig.Restart = "always"; serviceConfig.RestartSec = "5s"; - serviceConfig.ExecStart = "${pkgs.sourcehut.hgsrht}/bin/hgsrht-api -b ${cfg.listenAddress}:${toString (cfg.hg.port + 100)}"; + serviceConfig.ExecStart = "${cfg.hgsrht.package}/bin/hg.sr.ht-api -b ${cfg.listenAddress}:${toString (cfg.hg.port + 100)}"; }; extraConfig = mkMerge [ { @@ -1269,7 +1274,7 @@ in services.sourcehut.settings = { # Note that git.sr.ht::dispatch is not a typo, # gitsrht-dispatch always uses this section. - "git.sr.ht::dispatch"."/usr/bin/hgsrht-keys" = mkDefault "${cfg.hg.user}:${cfg.hg.group}"; + "git.sr.ht::dispatch"."/usr/bin/hg.sr.ht-keys" = mkDefault "${cfg.hg.user}:${cfg.hg.group}"; }; systemd.services.sshd = baseService; } @@ -1290,7 +1295,7 @@ in # so someone would need to know or guess a SHA value to download anything. # TODO: proxyPass to an hg serve service? locations."~ ^/[~^][a-z0-9_]+/[a-zA-Z0-9_.-]+/\\.hg/bundles/.*$" = { - root = "/var/lib/nginx/hgsrht/repos"; + root = "/var/lib/nginx/hg.sr.ht/repos"; extraConfig = '' auth_request /authorize; gzip off; @@ -1299,7 +1304,7 @@ in }; systemd.services.nginx = { serviceConfig.BindReadOnlyPaths = [ - "${cfg.settings."hg.sr.ht".repos}:/var/lib/nginx/hgsrht/repos" + "${cfg.settings."hg.sr.ht".repos}:/var/lib/nginx/hg.sr.ht/repos" ]; }; }) @@ -1330,23 +1335,23 @@ in inherit configIniOfService; port = 5006; webhooks = true; - extraServices.listssrht-api = { + extraServices."lists.sr.ht-api" = { serviceConfig.Restart = "always"; serviceConfig.RestartSec = "5s"; - serviceConfig.ExecStart = "${pkgs.sourcehut.listssrht}/bin/listssrht-api -b ${cfg.listenAddress}:${ + serviceConfig.ExecStart = "${cfg.lists.package}/bin/lists.sr.ht-api -b ${cfg.listenAddress}:${ toString (cfg.lists.port + 100) }"; }; # Receive the mail from Postfix and enqueue them into Redis and PostgreSQL - extraServices.listssrht-lmtp = { + extraServices."lists.sr.ht-lmtp" = { wants = [ "postfix.service" ]; unitConfig.JoinsNamespaceOf = optional cfg.postfix.enable "postfix.service"; - serviceConfig.ExecStart = "${pkgs.sourcehut.listssrht}/bin/listssrht-lmtp"; + serviceConfig.ExecStart = "${cfg.lists.package}/bin/lists.sr.ht-lmtp"; # Avoid crashing: os.chown(sock, os.getuid(), sock_gid) serviceConfig.PrivateUsers = mkForce false; }; # Dequeue the mails from Redis and dispatch them - extraServices.listssrht-process = { + extraServices."lists.sr.ht-process" = { serviceConfig = { preStart = '' cp ${pkgs.writeText "${srvsrht}-webhooks-celeryconfig.py" cfg.lists.process.celeryConfig} \ @@ -1392,7 +1397,7 @@ in OnCalendar = [ "daily" ]; AccuracySec = "1h"; }; - extraServices.metasrht-api = { + extraServices."meta.sr.ht-api" = { serviceConfig.Restart = "always"; serviceConfig.RestartSec = "5s"; preStart = @@ -1414,7 +1419,7 @@ in ) cfg.settings ) ); - serviceConfig.ExecStart = "${pkgs.sourcehut.metasrht}/bin/metasrht-api -b ${cfg.listenAddress}:${toString (cfg.meta.port + 100)}"; + serviceConfig.ExecStart = "${cfg.meta.package}/bin/meta.sr.ht-api -b ${cfg.listenAddress}:${toString (cfg.meta.port + 100)}"; }; extraConfig = { assertions = [ @@ -1428,14 +1433,14 @@ in } ]; environment.systemPackages = optional cfg.meta.enable ( - pkgs.writeShellScriptBin "metasrht-manageuser" '' + pkgs.writeShellScriptBin "meta.sr.ht-manageuser" '' set -eux if test "$(${pkgs.coreutils}/bin/id -n -u)" != '${cfg.meta.user}' then exec sudo -u '${cfg.meta.user}' "$0" "$@" else # In order to load config.ini - if cd /run/sourcehut/metasrht - then exec ${pkgs.sourcehut.metasrht}/bin/metasrht-manageuser "$@" + if cd /run/sourcehut/meta.sr.ht + then exec ${cfg.meta.package}/bin/meta.sr.ht-manageuser "$@" else cat <${stateDir}/db fi ${optionalString cfg.settings.${iniKey}.migrate-on-upgrade '' # Just try all the migrations because they're not linked to the version - for sql in ${pkgs.sourcehut.pagessrht}/share/sql/migrations/*.sql; do + for sql in ${package}/share/sql/migrations/*.sql; do ${postgresql.package}/bin/psql '${cfg.settings.${iniKey}.connection-string}' -f "$sql" || true done ''} @@ -1482,7 +1488,7 @@ in touch ${stateDir}/webhook ''; serviceConfig = { - ExecStart = mkForce "${pkgs.sourcehut.pagessrht}/bin/pages.sr.ht -b ${cfg.listenAddress}:${toString cfg.pages.port}"; + ExecStart = mkForce "${cfg.pages.package}/bin/pages.sr.ht -b ${cfg.listenAddress}:${toString cfg.pages.port}"; }; }; }) @@ -1490,10 +1496,10 @@ in (import ./service.nix "paste" { inherit configIniOfService; port = 5011; - extraServices.pastesrht-api = { + extraServices."paste.sr.ht-api" = { serviceConfig.Restart = "always"; serviceConfig.RestartSec = "5s"; - serviceConfig.ExecStart = "${pkgs.sourcehut.pastesrht}/bin/pastesrht-api -b ${cfg.listenAddress}:${ + serviceConfig.ExecStart = "${cfg.paste.package}/bin/paste.sr.ht-api -b ${cfg.listenAddress}:${ toString (cfg.paste.port + 100) }"; }; @@ -1503,15 +1509,15 @@ in inherit configIniOfService; port = 5003; webhooks = true; - extraServices.todosrht-api = { + extraServices."todo.sr.ht-api" = { serviceConfig.Restart = "always"; serviceConfig.RestartSec = "5s"; - serviceConfig.ExecStart = "${pkgs.sourcehut.todosrht}/bin/todosrht-api -b ${cfg.listenAddress}:${toString (cfg.todo.port + 100)}"; + serviceConfig.ExecStart = "${cfg.todo.package}/bin/todo.sr.ht-api -b ${cfg.listenAddress}:${toString (cfg.todo.port + 100)}"; }; - extraServices.todosrht-lmtp = { + extraServices."todo.sr.ht-lmtp" = { wants = [ "postfix.service" ]; unitConfig.JoinsNamespaceOf = optional cfg.postfix.enable "postfix.service"; - serviceConfig.ExecStart = "${pkgs.sourcehut.todosrht}/bin/todosrht-lmtp"; + serviceConfig.ExecStart = "${cfg.todo.package}/bin/todo.sr.ht-lmtp"; # Avoid crashing: os.chown(sock, os.getuid(), sock_gid) serviceConfig.PrivateUsers = mkForce false; }; diff --git a/nixos/modules/services/misc/sourcehut/service.nix b/nixos/modules/services/misc/sourcehut/service.nix index 37040c5e8661..dce07c6d1182 100644 --- a/nixos/modules/services/misc/sourcehut/service.nix +++ b/nixos/modules/services/misc/sourcehut/service.nix @@ -1,7 +1,8 @@ srv: { configIniOfService, - srvsrht ? "${srv}srht", # Because "buildsrht" does not follow that pattern (missing an "s"). + pkgname ? "${srv}srht", # Because "buildsrht" does not follow that pattern (missing an "s"). + srvsrht ? "${srv}.sr.ht", iniKey ? "${srv}.sr.ht", webhooks ? false, extraTimers ? { }, @@ -28,7 +29,7 @@ let mkIf mkMerge ; - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption mkOption mkPackageOption; inherit (lib.strings) concatStringsSep hasSuffix optionalString; inherit (config.services) postgresql; redis = config.services.redis.servers."sourcehut-${srvsrht}"; @@ -162,6 +163,8 @@ in { enable = mkEnableOption "${srv} service"; + package = mkPackageOption pkgs [ "sourcehut" pkgname ] { }; + user = mkOption { type = types.str; default = srvsrht; @@ -276,7 +279,7 @@ in forceSSL = mkDefault true; locations."/".proxyPass = "http://${cfg.listenAddress}:${toString srvCfg.port}"; locations."/static" = { - root = "${pkgs.sourcehut.${srvsrht}}/${pkgs.sourcehut.python.sitePackages}/${srvsrht}"; + root = "${srvCfg.package}/${pkgs.sourcehut.python.sitePackages}/${srvsrht}"; extraConfig = mkDefault '' expires 30d; ''; @@ -367,12 +370,12 @@ in StateDirectory = [ "sourcehut/${srvsrht}" ]; StateDirectoryMode = "2750"; ExecStart = - "${cfg.python}/bin/gunicorn ${srvsrht}.app:app --name ${srvsrht} --bind ${cfg.listenAddress}:${toString srvCfg.port} " + "${cfg.python}/bin/gunicorn ${pkgname}.app:app --name ${srvsrht} --bind ${cfg.listenAddress}:${toString srvCfg.port} " + concatStringsSep " " srvCfg.gunicorn.extraArgs; }; preStart = let - package = pkgs.sourcehut.${srvsrht}; + package = srvCfg.package; version = package.version; stateDir = "/var/lib/sourcehut/${srvsrht}"; in @@ -385,7 +388,7 @@ in if test ! -e ${stateDir}/db; then # Setup the initial database. # Note that it stamps the alembic head afterward - ${package}/bin/${srvsrht}-initdb + ${postgresql.package}/bin/psql -d ${srvsrht} -f ${package}/share/sourcehut/${srvsrht}-schema.sql echo ${version} >${stateDir}/db fi @@ -401,7 +404,7 @@ in # See https://lists.sr.ht/~sircmpwn/sr.ht-admins/<20190302181207.GA13778%40cirno.my.domain> if test ! -e ${stateDir}/webhook; then # Update ${iniKey}'s users' profile copy to the latest - ${cfg.python}/bin/srht-update-profiles ${iniKey} + ${cfg.python}/bin/sr.ht-update-profiles ${iniKey} touch ${stateDir}/webhook fi ''; @@ -424,7 +427,7 @@ in Type = "simple"; Restart = "always"; ExecStart = - "${cfg.python}/bin/celery --app ${srvsrht}.webhooks worker --hostname ${srvsrht}-webhooks@%%h " + "${cfg.python}/bin/celery --app ${pkgname}.webhooks worker --hostname ${srvsrht}-webhooks@%%h " + concatStringsSep " " srvCfg.webhooks.extraArgs; # Avoid crashing: os.getloadavg() ProcSubset = mkForce "all"; @@ -443,7 +446,7 @@ in ]; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.sourcehut.${srvsrht}}/bin/${timerName}"; + ExecStart = "${srvCfg.package}/bin/${timerName}"; }; } (timer.service or { }) diff --git a/nixos/modules/services/misc/taskchampion-sync-server.nix b/nixos/modules/services/misc/taskchampion-sync-server.nix index bab826829063..272cea170a4f 100644 --- a/nixos/modules/services/misc/taskchampion-sync-server.nix +++ b/nixos/modules/services/misc/taskchampion-sync-server.nix @@ -22,6 +22,12 @@ in type = types.str; default = "taskchampion"; }; + host = lib.mkOption { + description = "Host address on which to serve"; + type = types.str; + default = "127.0.0.1"; + example = "0.0.0.0"; + }; port = lib.mkOption { description = "Port on which to serve"; type = types.port; @@ -79,7 +85,7 @@ in DynamicUser = false; ExecStart = '' ${lib.getExe cfg.package} \ - --port ${builtins.toString cfg.port} \ + --listen "${cfg.host}:${builtins.toString cfg.port}" \ --data-dir ${cfg.dataDir} \ --snapshot-versions ${builtins.toString cfg.snapshot.versions} \ --snapshot-days ${builtins.toString cfg.snapshot.days} \ diff --git a/nixos/modules/services/misc/tp-auto-kbbl.nix b/nixos/modules/services/misc/tp-auto-kbbl.nix index 6db22e5aa840..2af0521b848a 100644 --- a/nixos/modules/services/misc/tp-auto-kbbl.nix +++ b/nixos/modules/services/misc/tp-auto-kbbl.nix @@ -37,6 +37,8 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; + services.upower.enable = true; + systemd.services.tp-auto-kbbl = { serviceConfig = { ExecStart = lib.concatStringsSep " " ( diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix index 18fee37ddd1b..044b1dc44777 100644 --- a/nixos/modules/services/misc/tzupdate.nix +++ b/nixos/modules/services/misc/tzupdate.nix @@ -18,6 +18,25 @@ in update the timezone. ''; }; + + package = lib.mkPackageOption pkgs "tzupdate" { }; + + timer.enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Enable the tzupdate timer to update the timezone automatically. + ''; + }; + + timer.interval = lib.mkOption { + type = lib.types.str; + default = "hourly"; + description = '' + The interval at which the tzupdate timer should run. See + {manpage}`systemd.time(7)` to understand the format. + ''; + }; }; config = lib.mkIf cfg.enable { @@ -26,15 +45,16 @@ in # zone, which is better than silently overriding it. time.timeZone = null; - # We provide a one-shot service which can be manually run. We could - # provide a service that runs on startup, but it's tricky to get - # a service to run after you have *internet* access. + # We provide a one-shot service that runs at startup once network + # interfaces are up, but we can’t ensure we actually have Internet access + # at that point. It can also be run manually with `systemctl start tzupdate`. systemd.services.tzupdate = { description = "tzupdate timezone update service"; + wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; script = '' - timezone="$(${lib.getExe pkgs.tzupdate} --print-only)" + timezone="$(${lib.getExe cfg.package} --print-only)" if [[ -n "$timezone" ]]; then echo "Setting timezone to '$timezone'" timedatectl set-timezone "$timezone" @@ -45,6 +65,16 @@ in Type = "oneshot"; }; }; + + systemd.timers.tzupdate = { + enable = cfg.timer.enable; + timerConfig = { + OnStartupSec = "30s"; + OnCalendar = cfg.timer.interval; + Persistent = true; + }; + wantedBy = [ "timers.target" ]; + }; }; meta.maintainers = with lib.maintainers; [ doronbehar ]; diff --git a/nixos/modules/services/misc/yarr.nix b/nixos/modules/services/misc/yarr.nix new file mode 100644 index 000000000000..62cc54b9de19 --- /dev/null +++ b/nixos/modules/services/misc/yarr.nix @@ -0,0 +1,118 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + types + mkIf + mkOption + mkEnableOption + mkPackageOption + optionalString + ; + + cfg = config.services.yarr; +in +{ + meta.maintainers = with lib.maintainers; [ christoph-heiss ]; + + options.services.yarr = { + enable = mkEnableOption "Yet another rss reader"; + + package = mkPackageOption pkgs "yarr" { }; + + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Environment file for specifying additional settings such as secrets. + + See `yarr -help` for all available options. + ''; + }; + + address = mkOption { + type = types.str; + default = "localhost"; + description = "Address to run server on."; + }; + + port = mkOption { + type = types.port; + default = 7070; + description = "Port to run server on."; + }; + + baseUrl = mkOption { + type = types.nullOr types.str; + default = null; + description = "Base path of the service url."; + }; + + authFilePath = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to a file containing username:password. `null` means no authentication required to use the service."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.yarr = { + description = "Yet another rss reader"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment.XDG_CONFIG_HOME = "/var/lib/yarr/.config"; + + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + + StateDirectory = "yarr"; + StateDirectoryMode = "0700"; + WorkingDirectory = "/var/lib/yarr"; + EnvironmentFile = cfg.environmentFile; + + LoadCredential = mkIf (cfg.authFilePath != null) "authfile:${cfg.authFilePath}"; + + DynamicUser = true; + DevicePolicy = "closed"; + LockPersonality = "yes"; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = "AF_INET AF_INET6"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + UMask = "0077"; + + ExecStart = '' + ${lib.getExe cfg.package} \ + -db storage.db \ + -addr "${cfg.address}:${toString cfg.port}" \ + ${optionalString (cfg.baseUrl != null) "-base ${cfg.baseUrl}"} \ + ${optionalString (cfg.authFilePath != null) "-auth-file /run/credentials/yarr.service/authfile"} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/alloy.nix b/nixos/modules/services/monitoring/alloy.nix index 73f967addc91..fe0ed2cab8b3 100644 --- a/nixos/modules/services/monitoring/alloy.nix +++ b/nixos/modules/services/monitoring/alloy.nix @@ -65,6 +65,7 @@ in config = lib.mkIf cfg.enable { systemd.services.alloy = { + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; reloadTriggers = lib.mapAttrsToList (_: v: v.source or null) ( lib.filterAttrs (n: _: lib.hasPrefix "alloy/" n && lib.hasSuffix ".alloy" n) config.environment.etc diff --git a/nixos/modules/services/monitoring/cockpit.nix b/nixos/modules/services/monitoring/cockpit.nix index 7b5e05bfb55c..7f2f5a6ced1b 100644 --- a/nixos/modules/services/monitoring/cockpit.nix +++ b/nixos/modules/services/monitoring/cockpit.nix @@ -12,7 +12,6 @@ let mkEnableOption mkOption mkIf - literalMD mkPackageOption ; settingsFormat = pkgs.formats.ini { }; @@ -26,6 +25,18 @@ in default = [ "cockpit" ]; }; + allowed-origins = lib.mkOption { + type = types.listOf types.str; + + default = [ ]; + + description = '' + List of allowed origins. + + Maps to the WebService.Origins setting and allows merging from multiple modules. + ''; + }; + settings = lib.mkOption { type = settingsFormat.type; @@ -62,14 +73,16 @@ in # generate cockpit settings environment.etc."cockpit/cockpit.conf".source = settingsFormat.generate "cockpit.conf" cfg.settings; - security.pam.services.cockpit = { }; + security.pam.services.cockpit = { + startSession = true; + }; networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; systemd.packages = [ cfg.package ]; systemd.sockets.cockpit.wantedBy = [ "multi-user.target" ]; systemd.sockets.cockpit.listenStreams = [ - "" + "" # workaround so it doesn't listen on both ports caused by the runtime merging (toString cfg.port) ]; @@ -80,6 +93,13 @@ in "L+ /run/cockpit/motd - - - - inactive.motd" "d /etc/cockpit/ws-certs.d 0600 root root 0" ]; + + services.cockpit.allowed-origins = [ + "https://localhost:${toString config.services.cockpit.port}" + ]; + + services.cockpit.settings.WebService.Origins = + builtins.concatStringsSep " " config.services.cockpit.allowed-origins; }; meta.maintainers = pkgs.cockpit.meta.maintainers; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index d03fd3b72c09..a4156137e3f9 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1220,12 +1220,6 @@ in type = types.bool; }; - editors_can_admin = mkOption { - description = "Editors can administrate dashboards, folders and teams they create."; - default = false; - type = types.bool; - }; - user_invite_max_lifetime_duration = mkOption { description = '' The duration in time a user invitation remains valid before expiring. @@ -1968,6 +1962,12 @@ in environment.systemPackages = [ cfg.package ]; assertions = [ + { + assertion = !(cfg.settings.users ? editors_can_admin); + message = '' + Option `services.grafana.settings.users.editors_can_admin` has been removed in Grafana 12. + ''; + } { assertion = cfg.provision.datasources.settings == null || cfg.provision.datasources.path == null; message = "Cannot set both datasources settings and datasources path"; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 162d9ce679be..fc65c07e5dfa 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -292,7 +292,7 @@ in serviceConfig = { Slice = "system-graphite.slice"; RuntimeDirectory = name; - ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${lib.getExe' pkgs.python3Packages.twisted "twistd"} ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PermissionsStartOnly = true; @@ -319,7 +319,7 @@ in serviceConfig = { Slice = "system-graphite.slice"; RuntimeDirectory = name; - ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${lib.getExe' pkgs.python3Packages.twisted "twistd"} ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile = "/run/${name}/${name}.pid"; @@ -340,7 +340,7 @@ in serviceConfig = { Slice = "system-graphite.slice"; RuntimeDirectory = name; - ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${lib.getExe' pkgs.python3Packages.twisted "twistd"} ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile = "/run/${name}/${name}.pid"; @@ -384,7 +384,7 @@ in }; serviceConfig = { ExecStart = '' - ${pkgs.python3Packages.waitress-django}/bin/waitress-serve-django \ + ${lib.getExe pkgs.python3Packages.waitress-django} \ --host=${cfg.web.listenAddress} --port=${toString cfg.web.port} ''; User = "graphite"; @@ -397,7 +397,7 @@ in mkdir -p ${dataDir}/{whisper/,log/webapp/} chmod 0700 ${dataDir}/{whisper/,log/webapp/} - ${pkgs.python3Packages.django}/bin/django-admin.py migrate --noinput + ${lib.getExe' pkgs.python3Packages.django "django-admin"} migrate --noinput chown -R graphite:graphite ${dataDir} @@ -407,7 +407,7 @@ in # Only collect static files when graphite_web changes. if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python3Packages.graphite-web}" ]; then mkdir -p ${staticDir} - ${pkgs.python3Packages.django}/bin/django-admin.py collectstatic --noinput --clear + ${lib.getExe' pkgs.python3Packages.django "django-admin"} collectstatic --noinput --clear chown -R graphite:graphite ${staticDir} ln -sfT "${pkgs.python3Packages.graphite-web}" "${dataDir}/current_graphite_web" fi @@ -427,7 +427,7 @@ in ]; environment = seyrenConfig; serviceConfig = { - ExecStart = "${pkgs.seyren}/bin/seyren -httpPort ${toString cfg.seyren.port}"; + ExecStart = "${lib.getExe pkgs.seyren} -httpPort ${toString cfg.seyren.port}"; WorkingDirectory = dataDir; User = "graphite"; Group = "graphite"; diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix index 49d76a82a921..06ee43f2a26d 100644 --- a/nixos/modules/services/monitoring/librenms.nix +++ b/nixos/modules/services/monitoring/librenms.nix @@ -596,7 +596,9 @@ in ${pkgs.envsubst}/bin/envsubst -i ${configJson} -o ${cfg.dataDir}/config.json export PHPRC=${phpIni} + INIT=false if [[ ! -s ${cfg.dataDir}/.env ]]; then + INIT=true # init .env file echo "APP_KEY=" > ${cfg.dataDir}/.env ${artisanWrapper}/bin/librenms-artisan key:generate --ansi @@ -655,6 +657,10 @@ in echo "${package.version}" > ${cfg.dataDir}/version fi + if [[ $INIT == "true" ]]; then + ${artisanWrapper}/bin/librenms-artisan db:seed --force --no-interaction + fi + # regenerate cache if package has changed if [[ $OLD_PACKAGE != "${package}" ]]; then ${artisanWrapper}/bin/librenms-artisan view:clear diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager-ntfy.nix b/nixos/modules/services/monitoring/prometheus/alertmanager-ntfy.nix new file mode 100644 index 000000000000..5237a24406b1 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/alertmanager-ntfy.nix @@ -0,0 +1,201 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.prometheus.alertmanager-ntfy; + + settingsFormat = pkgs.formats.yaml { }; + settingsFile = settingsFormat.generate "settings.yml" cfg.settings; + + configsArg = lib.concatStringsSep "," ( + [ settingsFile ] ++ lib.imap0 (i: _: "%d/config-${toString i}.yml") cfg.extraConfigFiles + ); +in + +{ + meta.maintainers = with lib.maintainers; [ defelo ]; + + options.services.prometheus.alertmanager-ntfy = { + enable = lib.mkEnableOption "alertmanager-ntfy"; + + package = lib.mkPackageOption pkgs "alertmanager-ntfy" { }; + + settings = lib.mkOption { + description = '' + Configuration of alertmanager-ntfy. + See for more information. + ''; + default = { }; + + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options = { + http.addr = lib.mkOption { + type = lib.types.str; + description = "The address to listen on."; + default = "127.0.0.1:8000"; + example = ":8000"; + }; + + ntfy = { + baseurl = lib.mkOption { + type = lib.types.str; + description = "The base URL of the ntfy.sh instance."; + example = "https://ntfy.sh"; + }; + + notification = { + topic = lib.mkOption { + type = lib.types.str; + description = '' + The topic to which alerts should be published. + Can either be a hardcoded string or a gval expression that evaluates to a string. + ''; + example = "alertmanager"; + }; + + priority = lib.mkOption { + type = lib.types.str; + description = '' + The ntfy.sh message priority (see for more information). + Can either be a hardcoded string or a gval expression that evaluates to a string. + ''; + default = ''status == "firing" ? "high" : "default"''; + }; + + tags = lib.mkOption { + type = lib.types.listOf ( + lib.types.submodule { + options = { + tag = lib.mkOption { + type = lib.types.str; + description = '' + The tag to add. + See for a list of all supported emojis. + ''; + example = "rotating_light"; + }; + + condition = lib.mkOption { + type = lib.types.nullOr lib.types.str; + description = '' + The condition under which this tag should be added. + Tags with no condition are always included. + ''; + default = null; + example = ''status == "firing"''; + }; + }; + } + ); + description = '' + Tags to add to ntfy.sh messages. + See for more information. + ''; + default = [ + { + tag = "green_circle"; + condition = ''status == "resolved"''; + } + { + tag = "red_circle"; + condition = ''status == "firing"''; + } + ]; + }; + + templates = { + title = lib.mkOption { + type = lib.types.str; + description = "The ntfy.sh message title template."; + default = '' + {{ if eq .Status "resolved" }}Resolved: {{ end }}{{ index .Annotations "summary" }} + ''; + }; + + description = lib.mkOption { + type = lib.types.str; + description = "The ntfy.sh message description template."; + default = '' + {{ index .Annotations "description" }} + ''; + }; + }; + }; + }; + }; + }; + }; + + extraConfigFiles = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + example = [ "/run/secrets/alertmanager-ntfy.yml" ]; + description = '' + Config files to merge into the settings defined in [](#opt-services.prometheus.alertmanager-ntfy.settings). + This is useful to avoid putting secrets into the Nix store. + See for more information. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.alertmanager-ntfy = { + wantedBy = [ "multi-user.target" ]; + + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + + serviceConfig = { + User = "alertmanager-ntfy"; + Group = "alertmanager-ntfy"; + DynamicUser = true; + + LoadCredential = lib.imap0 (i: path: "config-${toString i}.yml:${path}") cfg.extraConfigFiles; + + ExecStart = "${lib.getExe cfg.package} --configs ${configsArg}"; + + Restart = "always"; + RestartSec = 5; + + # Hardening + AmbientCapabilities = ""; + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + UMask = "0077"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 258d13e3c7c7..2adc59eefbef 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -65,6 +65,7 @@ let "dnssec" "domain" "dovecot" + "ebpf" "fastly" "flow" "fritz" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/ebpf.nix b/nixos/modules/services/monitoring/prometheus/exporters/ebpf.nix new file mode 100644 index 000000000000..8ccb6d21623b --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/ebpf.nix @@ -0,0 +1,49 @@ +{ + config, + lib, + pkgs, + options, + ... +}: + +let + cfg = config.services.prometheus.exporters.ebpf; + inherit (lib) + mkOption + types + concatStringsSep + ; +in +{ + port = 9435; + extraOpts = { + names = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "timers" ]; + description = '' + List of eBPF programs to load + ''; + }; + }; + serviceOpts = { + serviceConfig = { + AmbientCapabilities = [ + "CAP_BPF" + "CAP_DAC_READ_SEARCH" + "CAP_PERFMON" + ]; + CapabilityBoundingSet = [ + "CAP_BPF" + "CAP_DAC_READ_SEARCH" + "CAP_PERFMON" + ]; + ExecStart = '' + ${pkgs.prometheus-ebpf-exporter}/bin/ebpf_exporter \ + --config.dir=${pkgs.prometheus-ebpf-exporter}/examples \ + --config.names=${concatStringsSep "," cfg.names} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index b3b3632385db..a652d41587ee 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -74,9 +74,9 @@ let }; installSecrets = - source: target: secrets: + source: target: owner: secrets: pkgs.writeShellScript "installSecrets.sh" '' - install -m0600 -D ${source} "${target}" + install -m0600 -o${owner} -D ${source} "${target}" ${lib.concatLines ( lib.forEach secrets (name: '' ${pkgs.replace-secret}/bin/replace-secret \ @@ -327,6 +327,23 @@ let description = "Whether to enable `upsmon`."; }; + user = lib.mkOption { + type = lib.types.str; + default = "nutmon"; + description = '' + User to run `upsmon` as. `upsmon.conf` will have its owner set to this + user. If not specified, a default user will be created. + ''; + }; + group = lib.mkOption { + type = lib.types.str; + default = "nutmon"; + description = '' + Group for the default `nutmon` user. If the default user is created + and this is not specified, a default group will be created. + ''; + }; + monitor = lib.mkOption { type = with lib.types; attrsOf (submodule monitorOptions); default = { }; @@ -344,7 +361,6 @@ let MONITOR = NOTIFYCMD = "''${pkgs.nut}/bin/upssched"; POWERDOWNFLAG = "/run/killpower"; - RUN_AS_USER = "root"; SHUTDOWNCMD = "''${pkgs.systemd}/bin/shutdown now"; } ''; @@ -382,7 +398,6 @@ let ); NOTIFYCMD = lib.mkDefault "${pkgs.nut}/bin/upssched"; POWERDOWNFLAG = lib.mkDefault "/run/killpower"; - RUN_AS_USER = "root"; # TODO: replace 'root' by another username. SHUTDOWNCMD = lib.mkDefault "${pkgs.systemd}/bin/shutdown now"; }; }; @@ -581,7 +596,7 @@ in systemd.services.upsmon = let secrets = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}") cfg.upsmon.monitor; - createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" secrets; + createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" cfg.upsmon.user secrets; in { enable = cfg.upsmon.enable; @@ -591,7 +606,7 @@ in serviceConfig = { Type = "forking"; ExecStartPre = "${createUpsmonConf}"; - ExecStart = "${pkgs.nut}/sbin/upsmon"; + ExecStart = "${pkgs.nut}/sbin/upsmon -u ${cfg.upsmon.user}"; ExecReload = "${pkgs.nut}/sbin/upsmon -c reload"; LoadCredential = lib.mapAttrsToList ( name: monitor: "upsmon_password_${name}:${monitor.passwordFile}" @@ -604,7 +619,7 @@ in systemd.services.upsd = let secrets = lib.mapAttrsToList (name: user: "upsdusers_password_${name}") cfg.users; - createUpsdUsers = installSecrets upsdUsers "/run/nut/upsd.users" secrets; + createUpsdUsers = installSecrets upsdUsers "/run/nut/upsd.users" "root" secrets; in { enable = cfg.upsd.enable; @@ -696,18 +711,11 @@ in services.udev.packages = [ pkgs.nut ]; - /* - users.users.nut = - { uid = 84; - home = "/var/lib/nut"; - createHome = true; - group = "nut"; - description = "UPnP A/V Media Server user"; - }; - - users.groups."nut" = - { gid = 84; }; - */ + users.users.nutmon = lib.mkIf (cfg.upsmon.user == "nutmon") { + isSystemUser = true; + group = cfg.upsmon.group; + }; + users.groups.nutmon = lib.mkIf (cfg.upsmon.user == "nutmon" && cfg.upsmon.group == "nutmon") { }; }; } diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index 810ed10b695d..209e826c37c9 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -6,7 +6,7 @@ }: let cfg = config.services.rsyncd; - settingsFormat = pkgs.formats.ini { }; + settingsFormat = pkgs.formats.iniWithGlobalSection { }; configFile = settingsFormat.generate "rsyncd.conf" cfg.settings; in { @@ -25,24 +25,27 @@ in inherit (settingsFormat) type; default = { }; example = { - global = { + globalSection = { uid = "nobody"; gid = "nobody"; "use chroot" = true; "max connections" = 4; + address = "0.0.0.0"; }; - ftp = { - path = "/var/ftp/./pub"; - comment = "whole ftp area"; - }; - cvs = { - path = "/data/cvs"; - comment = "CVS repository (requires authentication)"; - "auth users" = [ - "tridge" - "susan" - ]; - "secrets file" = "/etc/rsyncd.secrets"; + sections = { + ftp = { + path = "/var/ftp/./pub"; + comment = "whole ftp area"; + }; + cvs = { + path = "/data/cvs"; + comment = "CVS repository (requires authentication)"; + "auth users" = [ + "tridge" + "susan" + ]; + "secrets file" = "/etc/rsyncd.secrets"; + }; }; }; description = '' @@ -81,7 +84,7 @@ in config = lib.mkIf cfg.enable { - services.rsyncd.settings.global.port = toString cfg.port; + services.rsyncd.settings.globalSection.port = toString cfg.port; systemd = let diff --git a/nixos/modules/services/networking/anubis.md b/nixos/modules/services/networking/anubis.md new file mode 100644 index 000000000000..8a9a2ea76aa6 --- /dev/null +++ b/nixos/modules/services/networking/anubis.md @@ -0,0 +1,61 @@ +# Anubis {#module-services-anubis} + +[Anubis](https://anubis.techaro.lol) is a scraper defense software that blocks AI scrapers. It is designed to sit +between a reverse proxy and the service to be protected. + +## Quickstart {#module-services-anubis-quickstart} + +This module is designed to use Unix domain sockets as the socket paths can be automatically configured for multiple +instances, but TCP sockets are also supported. + +A minimal configuration with [nginx](#opt-services.nginx.enable) may look like the following: + +```nix +{ config, ... }: { + services.anubis.instances.default.settings.TARGET = "http://localhost:8000"; + + # required due to unix socket permissions + users.users.nginx.extraGroups = [ config.users.groups.anubis.name ]; + services.nginx.virtualHosts."example.com" = { + locations = { + "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; + }; + }; +} +``` + +If Unix domain sockets are not needed or desired, this module supports operating with only TCP sockets. + +```nix +{ + services.anubis = { + instances.default = { + settings = { + TARGET = "http://localhost:8080"; + BIND = ":9000"; + BIND_NETWORK = "tcp"; + METRICS_BIND = "127.0.0.1:9001"; + METRICS_BIND_NETWORK = "tcp"; + }; + }; + }; +} +``` + +## Configuration {#module-services-anubis-configuration} + +It is possible to configure default settings for all instances of Anubis, via {option}`services.anubis.defaultOptions`. + +```nix +{ + services.anubis.defaultOptions = { + botPolicy = { dnsbl = false; }; + settings.DIFFICULTY = 3; + }; +} +``` + +Note that at the moment, a custom bot policy is not merged with the baked-in one. That means to only override a setting +like `dnsbl`, copying the entire bot policy is required. Check +[the upstream repository](https://github.com/TecharoHQ/anubis/blob/1509b06cb921aff842e71fbb6636646be6ed5b46/cmd/anubis/botPolicies.json) +for the policy. diff --git a/nixos/modules/services/networking/anubis.nix b/nixos/modules/services/networking/anubis.nix new file mode 100644 index 000000000000..2d63fa4ecc59 --- /dev/null +++ b/nixos/modules/services/networking/anubis.nix @@ -0,0 +1,334 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) types; + jsonFormat = pkgs.formats.json { }; + + cfg = config.services.anubis; + enabledInstances = lib.filterAttrs (_: conf: conf.enable) cfg.instances; + instanceName = name: if name == "" then "anubis" else "anubis-${name}"; + + commonSubmodule = + isDefault: + let + mkDefaultOption = + path: opts: + lib.mkOption ( + opts + // lib.optionalAttrs (!isDefault && opts ? default) { + default = + lib.attrByPath (lib.splitString "." path) + (throw "This is a bug in the Anubis module. Please report this as an issue.") + cfg.defaultOptions; + defaultText = lib.literalExpression "config.services.anubis.defaultOptions.${path}"; + } + ); + in + { name, ... }: + { + options = { + enable = lib.mkEnableOption "this instance of Anubis" // { + default = true; + }; + user = mkDefaultOption "user" { + default = "anubis"; + description = '' + The user under which Anubis is run. + + This module utilizes systemd's DynamicUser feature. See the corresponding section in + {manpage}`systemd.exec(5)` for more details. + ''; + type = types.str; + }; + group = mkDefaultOption "group" { + default = "anubis"; + description = '' + The group under which Anubis is run. + + This module utilizes systemd's DynamicUser feature. See the corresponding section in + {manpage}`systemd.exec(5)` for more details. + ''; + type = types.str; + }; + + botPolicy = lib.mkOption { + default = null; + description = '' + Anubis policy configuration in Nix syntax. Set to `null` to use the baked-in policy which should be + sufficient for most use-cases. + + This option has no effect if `settings.POLICY_FNAME` is set to a different value, which is useful for + importing an existing configuration. + + See [the documentation](https://anubis.techaro.lol/docs/admin/policies) for details. + ''; + type = types.nullOr jsonFormat.type; + }; + + extraFlags = mkDefaultOption "extraFlags" { + default = [ ]; + description = "A list of extra flags to be passed to Anubis."; + example = [ "-metrics-bind \"\"" ]; + type = types.listOf types.str; + }; + + settings = lib.mkOption { + default = { }; + description = '' + Freeform configuration via environment variables for Anubis. + + See [the documentation](https://anubis.techaro.lol/docs/admin/installation) for a complete list of + available environment variables. + ''; + type = types.submodule [ + { + freeformType = + with types; + attrsOf ( + nullOr (oneOf [ + str + int + bool + ]) + ); + + options = { + # BIND and METRICS_BIND are defined in instance specific options, since global defaults don't make sense + BIND_NETWORK = mkDefaultOption "settings.BIND_NETWORK" { + default = "unix"; + description = '' + The network family that Anubis should bind to. + + Accepts anything supported by Go's [`net.Listen`](https://pkg.go.dev/net#Listen). + + Common values are `tcp` and `unix`. + ''; + example = "tcp"; + type = types.str; + }; + METRICS_BIND_NETWORK = mkDefaultOption "settings.METRICS_BIND_NETWORK" { + default = "unix"; + description = '' + The network family that the metrics server should bind to. + + Accepts anything supported by Go's [`net.Listen`](https://pkg.go.dev/net#Listen). + + Common values are `tcp` and `unix`. + ''; + example = "tcp"; + type = types.str; + }; + DIFFICULTY = mkDefaultOption "settings.DIFFICULTY" { + default = 4; + description = '' + The difficulty required for clients to solve the challenge. + + Currently, this means the amount of leading zeros in a successful response. + ''; + type = types.int; + example = 5; + }; + SERVE_ROBOTS_TXT = mkDefaultOption "settings.SERVE_ROBOTS_TXT" { + default = false; + description = '' + Whether to serve a default robots.txt that denies access to common AI bots by name and all other + bots by wildcard. + ''; + type = types.bool; + }; + OG_PASSTHROUGH = mkDefaultOption "settings.OG_PASSTHROUGH" { + default = false; + description = '' + Whether to enable Open Graph tag passthrough. + + This enables social previews of resources protected by + Anubis without having to exempt each scraper individually. + ''; + type = types.bool; + }; + WEBMASTER_EMAIL = mkDefaultOption "settings.WEBMASTER_EMAIL" { + default = null; + description = '' + If set, shows a contact email address when rendering error pages. + + This email address will be how users can get in contact with administrators. + ''; + example = "alice@example.com"; + type = types.nullOr types.str; + }; + + # generated by default + POLICY_FNAME = mkDefaultOption "settings.POLICY_FNAME" { + default = null; + description = '' + The bot policy file to use. Leave this as `null` to respect the value set in + {option}`services.anubis.instances..botPolicy`. + ''; + type = types.nullOr types.path; + }; + }; + } + (lib.optionalAttrs (!isDefault) (instanceSpecificOptions name)) + ]; + }; + }; + }; + + instanceSpecificOptions = name: { + options = { + # see other options above + BIND = lib.mkOption { + default = "/run/anubis/${instanceName name}.sock"; + description = '' + The address that Anubis listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for syntax. + + Defaults to Unix domain sockets. To use TCP sockets, set this to a TCP address and `BIND_NETWORK` to `"tcp"`. + ''; + example = ":8080"; + type = types.str; + }; + METRICS_BIND = lib.mkOption { + default = "/run/anubis/${instanceName name}-metrics.sock"; + description = '' + The address Anubis' metrics server listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for + syntax. + + The metrics server is enabled by default and may be disabled. However, due to implementation details, this is + only possible by setting a command line flag. See {option}`services.anubis.defaultOptions.extraFlags` for an + example. + + Defaults to Unix domain sockets. To use TCP sockets, set this to a TCP address and `METRICS_BIND_NETWORK` to + `"tcp"`. + ''; + example = "127.0.0.1:8081"; + type = types.str; + }; + TARGET = lib.mkOption { + description = '' + The reverse proxy target that Anubis is protecting. This is a required option. + + The usage of Unix domain sockets is supported by the following syntax: `unix:///path/to/socket.sock`. + ''; + example = "http://127.0.0.1:8000"; + type = types.str; + }; + }; + }; +in +{ + options.services.anubis = { + package = lib.mkPackageOption pkgs "anubis" { }; + + defaultOptions = lib.mkOption { + default = { }; + description = "Default options for all instances of Anubis."; + type = types.submodule (commonSubmodule true); + }; + + instances = lib.mkOption { + default = { }; + description = '' + An attribute set of Anubis instances. + + The attribute name may be an empty string, in which case the `-` suffix is not added to the service name + and socket paths. + ''; + type = types.attrsOf (types.submodule (commonSubmodule false)); + + # Merge defaultOptions into each instance + apply = lib.mapAttrs (_: lib.recursiveUpdate cfg.defaultOptions); + }; + }; + + config = lib.mkIf (enabledInstances != { }) { + users.users = lib.mkIf (cfg.defaultOptions.user == "anubis") { + anubis = { + isSystemUser = true; + group = cfg.defaultOptions.group; + }; + }; + + users.groups = lib.mkIf (cfg.defaultOptions.group == "anubis") { + anubis = { }; + }; + + systemd.services = lib.mapAttrs' ( + name: instance: + lib.nameValuePair "${instanceName name}" { + description = "Anubis (${if name == "" then "default" else name} instance)"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + + environment = lib.mapAttrs (lib.const (lib.generators.mkValueStringDefault { })) ( + lib.filterAttrs (_: v: v != null) instance.settings + ); + + serviceConfig = { + User = instance.user; + Group = instance.group; + DynamicUser = true; + + ExecStart = lib.concatStringsSep " " ( + (lib.singleton (lib.getExe cfg.package)) ++ instance.extraFlags + ); + RuntimeDirectory = + if + lib.any (lib.hasPrefix "/run/anubis") ( + with instance.settings; + [ + BIND + METRICS_BIND + ] + ) + then + "anubis" + else + null; + + # hardening + NoNewPrivileges = true; + CapabilityBoundingSet = null; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + SystemCallArchitectures = "native"; + MemoryDenyWriteExecute = true; + + PrivateUsers = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectHome = true; + ProtectClock = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ProtectControlGroups = "strict"; + LockPersonality = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RestrictNamespaces = true; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; + }; + } + ) enabledInstances; + }; + + meta.maintainers = with lib.maintainers; [ + soopyc + nullcube + ]; + meta.doc = ./anubis.md; +} diff --git a/nixos/modules/services/networking/ax25/axlisten.nix b/nixos/modules/services/networking/ax25/axlisten.nix new file mode 100644 index 000000000000..ad887885c142 --- /dev/null +++ b/nixos/modules/services/networking/ax25/axlisten.nix @@ -0,0 +1,62 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + types + ; + + inherit (lib.modules) + mkIf + ; + + inherit (lib.options) + mkEnableOption + mkOption + literalExpression + ; + + cfg = config.services.ax25.axlisten; +in +{ + options = { + + services.ax25.axlisten = { + + enable = mkEnableOption "AX.25 axlisten daemon"; + + package = mkOption { + type = types.package; + default = pkgs.ax25-apps; + defaultText = literalExpression "pkgs.ax25-apps"; + description = "The ax25-apps package to use."; + }; + + config = mkOption { + type = types.str; + default = "-art"; + description = '' + Options that will be passed to the axlisten daemon. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.axlisten = { + description = "AX.25 traffic monitor"; + wantedBy = [ "multi-user.target" ]; + after = [ "ax25-axports.target" ]; + requires = [ "ax25-axports.target" ]; + serviceConfig = { + Type = "exec"; + ExecStart = "${cfg.package}/bin/axlisten ${cfg.config}"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/ax25/axports.nix b/nixos/modules/services/networking/ax25/axports.nix new file mode 100644 index 000000000000..257d7ee8c1c5 --- /dev/null +++ b/nixos/modules/services/networking/ax25/axports.nix @@ -0,0 +1,149 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + types + ; + + inherit (lib.strings) + concatStringsSep + optionalString + ; + + inherit (lib.attrsets) + filterAttrs + mapAttrsToList + mapAttrs' + ; + + inherit (lib.modules) + mkIf + ; + + inherit (lib.options) + mkEnableOption + mkOption + mkPackageOption + ; + + cfg = config.services.ax25.axports; + + enabledAxports = filterAttrs (ax25Name: cfg: cfg.enable) cfg; + + axportsOpts = { + + options = { + enable = mkEnableOption "Enables the axport interface"; + + package = mkPackageOption pkgs "ax25-tools" { }; + + tty = mkOption { + type = types.str; + example = "/dev/ttyACM0"; + description = '' + Location of hardware kiss tnc for this interface. + ''; + }; + + callsign = mkOption { + type = types.str; + example = "WB6WLV-7"; + description = '' + The callsign of the physical interface to bind to. + ''; + }; + + description = mkOption { + type = types.str; + # This cannot be empty since some ax25 tools cant parse /etc/ax25/axports without it + default = "NixOS managed tnc"; + description = '' + Free format description of this interface. + ''; + }; + + baud = mkOption { + type = types.int; + example = 57600; + description = '' + The serial port speed of this interface. + ''; + }; + + paclen = mkOption { + type = types.int; + default = 255; + description = '' + Default maximum packet size for this interface. + ''; + }; + + window = mkOption { + type = types.int; + default = 7; + description = '' + Default window size for this interface. + ''; + }; + + kissParams = mkOption { + type = types.nullOr types.str; + default = null; + example = "-t 300 -l 10 -s 12 -r 80 -f n"; + description = '' + Kissattach parameters for this interface. + ''; + }; + }; + }; +in +{ + + options = { + + services.ax25.axports = mkOption { + type = types.attrsOf (types.submodule axportsOpts); + default = { }; + description = "Specification of one or more AX.25 ports."; + }; + }; + + config = mkIf (enabledAxports != { }) { + + environment.etc."ax25/axports" = { + text = concatStringsSep "\n" ( + mapAttrsToList ( + portName: portCfg: + "${portName} ${portCfg.callsign} ${toString portCfg.baud} ${toString portCfg.paclen} ${toString portCfg.window} ${portCfg.description}" + ) enabledAxports + ); + mode = "0644"; + }; + + systemd.targets.ax25-axports = { + description = "AX.25 axports group target"; + }; + + systemd.services = mapAttrs' (portName: portCfg: { + name = "ax25-kissattach-${portName}"; + value = { + description = "AX.25 KISS attached interface for ${portName}"; + wantedBy = [ "multi-user.target" ]; + before = [ "ax25-axports.target" ]; + partOf = [ "ax25-axports.target" ]; + serviceConfig = { + Type = "exec"; + ExecStart = "${portCfg.package}/bin/kissattach ${portCfg.tty} ${portName}"; + }; + postStart = optionalString (portCfg.kissParams != null) '' + ${portCfg.package}/bin/kissparms -p ${portName} ${portCfg.kissParams} + ''; + }; + }) enabledAxports; + }; +} diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix index f565c7f505fb..5d7b7c30f04c 100644 --- a/nixos/modules/services/networking/bird-lg.nix +++ b/nixos/modules/services/networking/bird-lg.nix @@ -187,7 +187,7 @@ in }; extraArgs = lib.mkOption { - type = with lib.types; either lines (listOf str); + type = with lib.types; listOf str; default = [ ]; description = '' Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#frontend). @@ -247,14 +247,10 @@ in }; extraArgs = lib.mkOption { - type = with lib.types; either lines (listOf str); + type = with lib.types; listOf str; default = [ ]; description = '' Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#proxy). - - :::{.note} - Passing lines (plain strings) is deprecated in favour of passing lists of strings. - ::: ''; }; }; @@ -264,15 +260,6 @@ in ###### implementation config = { - - warnings = - lib.optional (cfg.frontend.enable && builtins.isString cfg.frontend.extraArgs) '' - Passing strings to `services.bird-lg.frontend.extraOptions' is deprecated. Please pass a list of strings instead. - '' - ++ lib.optional (cfg.proxy.enable && builtins.isString cfg.proxy.extraArgs) '' - Passing strings to `services.bird-lg.proxy.extraOptions' is deprecated. Please pass a list of strings instead. - ''; - systemd.services = { bird-lg-frontend = lib.mkIf cfg.frontend.enable { enable = true; diff --git a/nixos/modules/services/networking/cato-client.nix b/nixos/modules/services/networking/cato-client.nix new file mode 100644 index 000000000000..b9b31e0c5794 --- /dev/null +++ b/nixos/modules/services/networking/cato-client.nix @@ -0,0 +1,75 @@ +{ + config, + pkgs, + lib, + ... +}: +let + inherit (lib) mkIf mkEnableOption mkPackageOption; + + cfg = config.services.cato-client; +in +{ + options.services.cato-client = { + enable = mkEnableOption "cato-client service"; + package = mkPackageOption pkgs "cato-client" { }; + }; + + config = mkIf cfg.enable { + users = { + groups.cato-client = { }; + }; + + environment.systemPackages = [ + cfg.package + ]; + + systemd.services.cato-client = { + enable = true; + description = "Cato Networks Linux client - connects tunnel to Cato cloud"; + after = [ "network.target" ]; + + serviceConfig = { + Type = "simple"; + User = "root"; # Note: daemon runs as root, tools sticky to group + Group = "cato-client"; + ExecStart = "${cfg.package}/bin/cato-clientd systemd"; + WorkingDirectory = "${cfg.package}"; + Restart = "always"; + + # Cato client seems to do the following: + # - Look in each user's ~/.cato/ for configuration and keys + # - Write to /var/log/cato-client.log + # - Create and use sockets /var/run/cato-sdp.i, /var/run/cato-sdp.o + # - Read and Write to /opt/cato/ for runtime settings + # - Read /etc/systemd/resolved.conf (but fine if fails) + # - Restart systemd-resolved (also fine if doesn't exist) + + NoNewPrivileges = true; + PrivateTmp = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectSystem = true; + }; + + wantedBy = [ "multi-user.target" ]; + }; + + # set up Security wrapper Same as inteded in deb post install + security.wrappers.cato-clientd = { + source = "${cfg.package}/bin/cato-clientd"; + owner = "root"; + group = "cato-client"; + permissions = "u+rwx,g+rwx"; # 770 + setgid = true; + }; + + security.wrappers.cato-sdp = { + source = "${cfg.package}/bin/cato-sdp"; + owner = "root"; + group = "cato-client"; + permissions = "u+rwx,g+rx,a+rx"; # 755 + setgid = true; + }; + }; +} diff --git a/nixos/modules/services/networking/centrifugo.nix b/nixos/modules/services/networking/centrifugo.nix index 7b9a05069498..0f2a9f3e5f6a 100644 --- a/nixos/modules/services/networking/centrifugo.nix +++ b/nixos/modules/services/networking/centrifugo.nix @@ -65,6 +65,14 @@ in }; config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = + (lib.versionAtLeast cfg.package.version "6") -> (!(cfg.settings ? name) && !(cfg.settings ? port)); + message = "`services.centrifugo.settings` is v5 config, must be compatible with centrifugo v6 config format"; + } + ]; + systemd.services.centrifugo = { description = "Centrifugo messaging server"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/networking/cloudflare-dyndns.nix b/nixos/modules/services/networking/cloudflare-dyndns.nix index f99935210b06..c8597d28c209 100644 --- a/nixos/modules/services/networking/cloudflare-dyndns.nix +++ b/nixos/modules/services/networking/cloudflare-dyndns.nix @@ -108,13 +108,14 @@ in ++ lib.optional cfg.proxied "--proxied"; in '' - export CLOUDFLARE_API_TOKEN=$(< "''${CREDENTIALS_DIRECTORY}/apiToken") + export CLOUDFLARE_API_TOKEN_FILE=''${CREDENTIALS_DIRECTORY}/apiToken # Added 2025-03-10: `cfg.apiTokenFile` used to be passed as an # `EnvironmentFile` to the service, which required it to be of # the form "CLOUDFLARE_API_TOKEN=" rather than just the secret. # If we detect this legacy usage, error out. - if [[ $CLOUDFLARE_API_TOKEN == CLOUDFLARE_API_TOKEN* ]]; then + token=$(< "''${CLOUDFLARE_API_TOKEN_FILE}") + if [[ $token == CLOUDFLARE_API_TOKEN* ]]; then echo "Error: your api token starts with 'CLOUDFLARE_API_TOKEN='. Remove that, and instead specify just the token." >&2 exit 1 fi diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix index dd03daefe710..0a6a09dabf2b 100644 --- a/nixos/modules/services/networking/cloudflared.nix +++ b/nixos/modules/services/networking/cloudflared.nix @@ -369,7 +369,7 @@ in RuntimeDirectoryMode = "0400"; LoadCredential = [ "credentials.json:${tunnel.credentialsFile}" - ] ++ (lib.optional (certFile != null) "cert.pem:certFile"); + ] ++ (lib.optional (certFile != null) "cert.pem:${certFile}"); ExecStart = "${cfg.package}/bin/cloudflared tunnel --config=${mkConfigFile} --no-autoupdate run"; Restart = "on-failure"; diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index 2c89c3a12fb5..044d3ba0b791 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -363,7 +363,7 @@ in chmod 640 ${runConfig} ''; serviceConfig = rec { - Type = "simple"; + Type = "notify"; ExecStart = utils.escapeSystemdExecArgs [ (lib.getExe' pkgs.coturn "turnserver") "-c" @@ -413,6 +413,7 @@ in [ "AF_INET" "AF_INET6" + "AF_UNIX" ] ++ lib.optionals (cfg.listening-ips == [ ]) [ # only used for interface discovery when no listening ips are configured diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 308ae1278a1b..6aecbec7bd4a 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -69,7 +69,7 @@ let hostname # A list of options to request from the DHCP server. - option domain_name_servers, domain_name, domain_search, host_name + option domain_name_servers, domain_name, domain_search option classless_static_routes, ntp_servers, interface_mtu # A ServerID is required by RFC2131. @@ -112,6 +112,7 @@ let ${lib.optionalString (config.networking.enableIPv6 && cfg.IPv6rs == false) '' noipv6rs ''} + ${lib.optionalString cfg.setHostname "option host_name"} ${cfg.extraConfig} ''; @@ -137,7 +138,7 @@ in type = lib.types.bool; default = false; description = '' - Whenever to leave interfaces configured on dhcpcd daemon + Whether to leave interfaces configured on dhcpcd daemon shutdown. Set to true if you have your root or store mounted over the network or this machine accepts SSH connections through DHCP interfaces and clients should be notified when @@ -145,6 +146,22 @@ in ''; }; + networking.dhcpcd.setHostname = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to set the machine hostname based on the information + received from the DHCP server. + + ::: {.note} + The hostname will be changed only if the current one is + the empty string, `localhost` or `nixos`. + + Polkit ([](#opt-security.polkit.enable)) is also required. + ::: + ''; + }; + networking.dhcpcd.denyInterfaces = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ ]; @@ -185,6 +202,15 @@ in ''; }; + networking.dhcpcd.allowSetuid = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to relax the security sandbox to allow running setuid + binaries (e.g. `sudo`) in the dhcpcd hooks. + ''; + }; + networking.dhcpcd.runHook = lib.mkOption { type = lib.types.lines; default = ""; @@ -196,7 +222,7 @@ in ::: {.note} To use sudo or similar tools in your script you may have to set: - systemd.services.dhcpcd.serviceConfig.NoNewPrivileges = false; + networking.dhcpcd.allowSetuid = true; In addition, as most of the filesystem is inaccessible to dhcpcd by default, you may want to define some exceptions, e.g. @@ -263,11 +289,16 @@ in # dhcpcd. So do a "systemctl restart" instead. stopIfChanged = false; - path = [ - dhcpcd - pkgs.nettools - config.networking.resolvconf.package - ]; + path = + [ + dhcpcd + config.networking.resolvconf.package + ] + ++ lib.optional cfg.setHostname ( + pkgs.writeShellScriptBin "hostname" '' + ${lib.getExe' pkgs.systemd "hostnamectl"} set-hostname --transient $1 + '' + ); unitConfig.ConditionCapability = "CAP_NET_ADMIN"; @@ -299,7 +330,7 @@ in "CAP_NET_RAW" "CAP_NET_BIND_SERVICE" ]; - CapabilityBoundingSet = [ + CapabilityBoundingSet = lib.optionals (!cfg.allowSetuid) [ "CAP_NET_ADMIN" "CAP_NET_RAW" "CAP_NET_BIND_SERVICE" @@ -313,7 +344,7 @@ in DeviceAllow = ""; LockPersonality = true; MemoryDenyWriteExecute = true; - NoNewPrivileges = lib.mkDefault true; # may be disabled for sudo in runHook + NoNewPrivileges = lib.mkDefault (!cfg.allowSetuid); # may be disabled for sudo in runHook PrivateDevices = true; PrivateMounts = true; PrivateTmp = true; @@ -338,15 +369,18 @@ in RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; - SystemCallFilter = [ - "@system-service" - "~@aio" - "~@keyring" - "~@memlock" - "~@mount" - "~@privileged" - "~@resources" - ]; + SystemCallFilter = + [ + "@system-service" + "~@aio" + "~@keyring" + "~@memlock" + "~@mount" + ] + ++ lib.optionals (!cfg.allowSetuid) [ + "~@privileged" + "~@resources" + ]; SystemCallArchitectures = "native"; UMask = "0027"; }; @@ -371,17 +405,27 @@ in /run/current-system/systemd/bin/systemctl reload dhcpcd.service ''; - security.polkit.extraConfig = lib.mkIf config.services.resolved.enable '' - polkit.addRule(function(action, subject) { - if (action.id == 'org.freedesktop.resolve1.revert' || - action.id == 'org.freedesktop.resolve1.set-dns-servers' || - action.id == 'org.freedesktop.resolve1.set-domains') { - if (subject.user == '${config.systemd.services.dhcpcd.serviceConfig.User}') { - return polkit.Result.YES; - } - } - }); - ''; + security.polkit.extraConfig = lib.mkMerge [ + (lib.mkIf config.services.resolved.enable '' + polkit.addRule(function(action, subject) { + if (action.id == 'org.freedesktop.resolve1.revert' || + action.id == 'org.freedesktop.resolve1.set-dns-servers' || + action.id == 'org.freedesktop.resolve1.set-domains') { + if (subject.user == 'dhcpcd') { + return polkit.Result.YES; + } + } + }); + '') + (lib.mkIf cfg.setHostname '' + polkit.addRule(function(action, subject) { + if (action.id == 'org.freedesktop.hostname1.set-hostname' && + subject.user == 'dhcpcd') { + return polkit.Result.YES; + } + }); + '') + ]; }; diff --git a/nixos/modules/services/networking/godns.nix b/nixos/modules/services/networking/godns.nix new file mode 100644 index 000000000000..e69460ba14c8 --- /dev/null +++ b/nixos/modules/services/networking/godns.nix @@ -0,0 +1,84 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) + mkEnableOption + mkIf + mkOption + mkPackageOption + types + ; + + cfg = config.services.godns; + + settingsFormat = pkgs.formats.yaml { }; +in +{ + options.services.godns = { + enable = mkEnableOption "GoDNS service"; + + package = mkPackageOption pkgs "godns" { }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + }; + + description = '' + Configuration for GoDNS. Refer to the [configuration section](1) in the + GoDNS GitHub repository for details. + + [1]: https://github.com/TimothyYe/godns?tab=readme-ov-file#configuration + ''; + + example = { + provider = "Cloudflare"; + login_token_file = "$CREDENTIALS_DIRECTORY/login_token"; + domains = [ + { + domain_name = "example.com"; + sub_domains = [ "foo" ]; + } + ]; + ipv6_urls = [ + "https://api6.ipify.org" + "https://ip2location.io/ip" + "https://v6.ipinfo.io/ip" + ]; + ip_type = "IPv6"; + interval = 300; + }; + }; + + loadCredential = lib.mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "login_token:/path/to/login_token" ]; + description = '' + This can be used to pass secrets to the systemd service without adding + them to the nix store. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.godns = { + description = "GoDNS service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + DynamicUser = true; + ExecStart = "${lib.getExe cfg.package} -c ${settingsFormat.generate "config.yaml" cfg.settings}"; + LoadCredential = cfg.loadCredential; + Restart = "always"; + RestartSec = "2s"; + }; + }; + }; + + meta.maintainers = [ lib.maintainers.michaelvanstraten ]; +} diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix index bd17f005f69b..07924f54e369 100644 --- a/nixos/modules/services/networking/headscale.nix +++ b/nixos/modules/services/networking/headscale.nix @@ -164,7 +164,7 @@ in ''; }; - auto_update_enable = lib.mkOption { + auto_update_enabled = lib.mkOption { type = lib.types.bool; default = true; description = '' @@ -493,7 +493,11 @@ in imports = with lib; [ (mkRenamedOptionModule [ "services" "headscale" "derp" "autoUpdate" ] - [ "services" "headscale" "settings" "derp" "auto_update_enable" ] + [ "services" "headscale" "settings" "derp" "auto_update_enabled" ] + ) + (mkRenamedOptionModule + [ "services" "headscale" "derp" "auto_update_enable" ] + [ "services" "headscale" "settings" "derp" "auto_update_enabled" ] ) (mkRenamedOptionModule [ "services" "headscale" "derp" "paths" ] @@ -629,6 +633,7 @@ in in { Restart = "always"; + RestartSec = "5s"; Type = "simple"; User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/networking/ircd-hybrid/.editorconfig b/nixos/modules/services/networking/ircd-hybrid/.editorconfig new file mode 100644 index 000000000000..de54d884adbd --- /dev/null +++ b/nixos/modules/services/networking/ircd-hybrid/.editorconfig @@ -0,0 +1,2 @@ +[*.{conf,in}] +trim_trailing_whitespace = unset diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index 2209841678b3..e275e7906ad5 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -20,7 +20,7 @@ let defaults = { # without UseDefaultInterface, sometimes wlan0 simply goes AWOL with NetworkManager # https://iwd.wiki.kernel.org/interface_lifecycle#interface_management_in_iwd - General.UseDefaultInterface = + DriverQuirks.UseDefaultInterface = with config.networking.networkmanager; (enable && (wifi.backend == "iwd")); }; @@ -61,6 +61,12 @@ in Only one wireless daemon is allowed at the time: networking.wireless.enable and networking.wireless.iwd.enable are mutually exclusive. ''; } + { + assertion = !(cfg.settings ? General && cfg.settings.General ? UseDefaultInterface); + message = '' + `networking.wireless.iwd.settings.General.UseDefaultInterface` has been deprecated. Use `networking.wireless.iwd.settings.DriverQuirks.UseDefaultInterface` instead. + ''; + } ]; environment.etc."iwd/${configFile.name}".source = configFile; diff --git a/nixos/modules/services/networking/kismet.nix b/nixos/modules/services/networking/kismet.nix new file mode 100644 index 000000000000..4e14e9fd51d4 --- /dev/null +++ b/nixos/modules/services/networking/kismet.nix @@ -0,0 +1,459 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib.trivial) isFloat isInt isBool; + inherit (lib.modules) mkIf; + inherit (lib.options) + literalExpression + mkOption + mkPackageOption + mkEnableOption + ; + inherit (lib.strings) + isString + escapeShellArg + escapeShellArgs + concatMapStringsSep + concatMapAttrsStringSep + replaceStrings + substring + stringLength + hasInfix + hasSuffix + typeOf + match + ; + inherit (lib.lists) all isList flatten; + inherit (lib.attrsets) + attrsToList + filterAttrs + optionalAttrs + mapAttrs' + mapAttrsToList + nameValuePair + ; + inherit (lib.generators) toKeyValue; + inherit (lib) types; + + # Deeply checks types for a given type function. Calls `override` with type and value. + deep = + func: override: type: + let + prev = func type; + in + prev + // { + check = value: prev.check value && (override type value); + }; + + # Deep listOf. + listOf' = deep types.listOf (type: value: all type.check value); + + # Deep attrsOf. + attrsOf' = deep types.attrsOf (type: value: all (item: type.check item.value) (attrsToList value)); + + # Kismet config atoms. + atom = + with types; + oneOf [ + number + bool + str + ]; + + # Composite types. + listOfAtom = listOf' atom; + atomOrList = with types; either atom listOfAtom; + lists = listOf' atomOrList; + kvPair = attrsOf' atomOrList; + kvPairs = listOf' kvPair; + + # Options that eval to a string with a header (foo:key=value) + headerKvPair = attrsOf' (attrsOf' atomOrList); + headerKvPairs = attrsOf' (listOf' (attrsOf' atomOrList)); + + # Toplevel config type. + topLevel = + let + topLevel' = + with types; + oneOf [ + headerKvPairs + headerKvPair + kvPairs + kvPair + listOfAtom + lists + atom + ]; + in + topLevel' + // { + description = "Kismet config stanza"; + }; + + # Throws invalid. + invalid = atom: throw "invalid value '${toString atom}' of type '${typeOf atom}'"; + + # Converts an atom. + mkAtom = + atom: + if isString atom then + if hasInfix "\"" atom || hasInfix "," atom then + ''"${replaceStrings [ ''"'' ] [ ''\"'' ] atom}"'' + else + atom + else if isFloat atom || isInt atom || isBool atom then + toString atom + else + invalid atom; + + # Converts an inline atom or list to a string. + mkAtomOrListInline = + atomOrList: + if isList atomOrList then + mkAtom "${concatMapStringsSep "," mkAtom atomOrList}" + else + mkAtom atomOrList; + + # Converts an out of line atom or list to a string. + mkAtomOrList = + atomOrList: + if isList atomOrList then + "${concatMapStringsSep "," mkAtomOrListInline atomOrList}" + else + mkAtom atomOrList; + + # Throws if the string matches the given regex. + deny = + regex: str: + assert (match regex str) == null; + str; + + # Converts a set of k/v pairs. + convertKv = concatMapAttrsStringSep "," ( + name: value: "${mkAtom (deny "=" name)}=${mkAtomOrListInline value}" + ); + + # Converts k/v pairs with a header. + convertKvWithHeader = header: attrs: "${mkAtom (deny ":" header)}:${convertKv attrs}"; + + # Converts the entire config. + convertConfig = mapAttrs' ( + name: value: + let + # Convert foo' into 'foo+' for support for '+=' syntax. + newName = if hasSuffix "'" name then substring 0 (stringLength name - 1) name + "+" else name; + + # Get the stringified value. + newValue = + if headerKvPairs.check value then + flatten ( + mapAttrsToList (header: values: (map (value: convertKvWithHeader header value) values)) value + ) + else if headerKvPair.check value then + mapAttrsToList convertKvWithHeader value + else if kvPairs.check value then + map convertKv value + else if kvPair.check value then + convertKv value + else if listOfAtom.check value then + mkAtomOrList value + else if lists.check value then + map mkAtomOrList value + else if atom.check value then + mkAtom value + else + invalid value; + in + nameValuePair newName newValue + ); + + mkKismetConf = + options: + (toKeyValue { listsAsDuplicateKeys = true; }) ( + filterAttrs (_: value: value != null) (convertConfig options) + ); + + cfg = config.services.kismet; +in +{ + options.services.kismet = { + enable = mkEnableOption "kismet"; + package = mkPackageOption pkgs "kismet" { }; + user = mkOption { + description = "The user to run Kismet as."; + type = types.str; + default = "kismet"; + }; + group = mkOption { + description = "The group to run Kismet as."; + type = types.str; + default = "kismet"; + }; + serverName = mkOption { + description = "The name of the server."; + type = types.str; + default = "Kismet"; + }; + serverDescription = mkOption { + description = "The description of the server."; + type = types.str; + default = "NixOS Kismet server"; + }; + logTypes = mkOption { + description = "The log types."; + type = with types; listOf str; + default = [ "kismet" ]; + }; + dataDir = mkOption { + description = "The Kismet data directory."; + type = types.path; + default = "/var/lib/kismet"; + }; + httpd = { + enable = mkOption { + description = "True to enable the HTTP server."; + type = types.bool; + default = false; + }; + address = mkOption { + description = "The address to listen on. Note that this cannot be a hostname or Kismet will not start."; + type = types.str; + default = "127.0.0.1"; + }; + port = mkOption { + description = "The port to listen on."; + type = types.port; + default = 2501; + }; + }; + settings = mkOption { + description = '' + Options for Kismet. See: + https://www.kismetwireless.net/docs/readme/configuring/configfiles/ + ''; + default = { }; + type = with types; attrsOf topLevel; + example = literalExpression '' + { + /* Examples for atoms */ + # dot11_link_bssts=false + dot11_link_bssts = false; # Boolean + + # dot11_related_bss_window=10000000 + dot11_related_bss_window = 10000000; # Integer + + # devicefound=00:11:22:33:44:55 + devicefound = "00:11:22:33:44:55"; # String + + # log_types+=wiglecsv + log_types' = "wiglecsv"; + + /* Examples for lists of atoms */ + # wepkey=00:DE:AD:C0:DE:00,FEEDFACE42 + wepkey = [ "00:DE:AD:C0:DE:00" "FEEDFACE42" ]; + + # alert=ADHOCCONFLICT,5/min,1/sec + # alert=ADVCRYPTCHANGE,5/min,1/sec + alert = [ + [ "ADHOCCONFLICT" "5/min" "1/sec" ] + [ "ADVCRYPTCHANGE" "5/min" "1/sec" ] + ]; + + /* Examples for sets of atoms */ + # source=wlan0:name=ath11k + source.wlan0 = { name = "ath11k"; }; + + /* Examples with colon-suffixed headers */ + # gps=gpsd:host=localhost,port=2947 + gps.gpsd = { + host = "localhost"; + port = 2947; + }; + + # apspoof=Foo1:ssid=Bar1,validmacs="00:11:22:33:44:55,aa:bb:cc:dd:ee:ff" + # apspoof=Foo1:ssid=Bar2,validmacs="01:12:23:34:45:56,ab:bc:cd:de:ef:f0" + # apspoof=Foo2:ssid=Baz1,validmacs="11:22:33:44:55:66,bb:cc:dd:ee:ff:00" + apspoof.Foo1 = [ + { ssid = "Bar1"; validmacs = [ "00:11:22:33:44:55" "aa:bb:cc:dd:ee:ff" ]; } + { ssid = "Bar2"; validmacs = [ "01:12:23:34:45:56" "ab:bc:cd:de:ef:f0" ]; } + ]; + + # because Foo1 is a list, Foo2 needs to be as well + apspoof.Foo2 = [ + { + ssid = "Bar2"; + validmacs = [ "00:11:22:33:44:55" "aa:bb:cc:dd:ee:ff" ]; + }; + ]; + } + ''; + }; + extraConfig = mkOption { + description = '' + Literal Kismet config lines appended to the site config. + Note that `services.kismet.settings` allows you to define + all options here using Nix attribute sets. + ''; + default = ""; + type = types.str; + example = '' + # Looks like the following in `services.kismet.settings`: + # wepkey = [ "00:DE:AD:C0:DE:00" "FEEDFACE42" ]; + wepkey=00:DE:AD:C0:DE:00,FEEDFACE42 + ''; + }; + }; + + config = + let + configDir = "${cfg.dataDir}/.kismet"; + settings = + cfg.settings + // { + server_name = cfg.serverName; + server_description = cfg.serverDescription; + logging_enabled = cfg.logTypes != [ ]; + log_types = cfg.logTypes; + } + // optionalAttrs cfg.httpd.enable { + httpd_bind_address = cfg.httpd.address; + httpd_port = cfg.httpd.port; + httpd_auth_file = "${configDir}/kismet_httpd.conf"; + httpd_home = "${cfg.package}/share/kismet/httpd"; + }; + in + mkIf cfg.enable { + systemd.tmpfiles.settings = { + "10-kismet" = { + ${cfg.dataDir} = { + d = { + inherit (cfg) user group; + mode = "0750"; + }; + }; + ${configDir} = { + d = { + inherit (cfg) user group; + mode = "0750"; + }; + }; + }; + }; + systemd.services.kismet = + let + kismetConf = pkgs.writeText "kismet.conf" '' + ${mkKismetConf settings} + ${cfg.extraConfig} + ''; + in + { + description = "Kismet monitoring service"; + wants = [ "basic.target" ]; + after = [ + "basic.target" + "network.target" + ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + let + capabilities = [ + "CAP_NET_ADMIN" + "CAP_NET_RAW" + ]; + kismetPreStart = pkgs.writeShellScript "kismet-pre-start" '' + owner=${escapeShellArg "${cfg.user}:${cfg.group}"} + mkdir -p ~/.kismet + + # Ensure permissions on directories Kismet uses. + chown "$owner" ~/ ~/.kismet + cd ~/.kismet + + package=${cfg.package} + if [ -d "$package/etc" ]; then + for file in "$package/etc"/*.conf; do + # Symlink the config files if they exist or are already a link. + base="''${file##*/}" + if [ ! -f "$base" ] || [ -L "$base" ]; then + ln -sf "$file" "$base" + fi + done + fi + + for file in kismet_httpd.conf; do + # Un-symlink these files. + if [ -L "$file" ]; then + cp "$file" ".$file" + rm -f "$file" + mv ".$file" "$file" + chmod 0640 "$file" + chown "$owner" "$file" + fi + done + + # Link the site config. + ln -sf ${kismetConf} kismet_site.conf + ''; + in + { + Type = "simple"; + ExecStart = escapeShellArgs [ + "${cfg.package}/bin/kismet" + "--homedir" + cfg.dataDir + "--confdir" + configDir + "--datadir" + "${cfg.package}/share" + "--no-ncurses" + "-f" + "${configDir}/kismet.conf" + ]; + WorkingDirectory = cfg.dataDir; + ExecStartPre = "+${kismetPreStart}"; + Restart = "always"; + KillMode = "control-group"; + CapabilityBoundingSet = capabilities; + AmbientCapabilities = capabilities; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = false; + PrivateTmp = true; + PrivateUsers = false; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "full"; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + User = cfg.user; + Group = cfg.group; + UMask = "0007"; + TimeoutStopSec = 30; + }; + + # Allow it to restart if the wifi interface is not up + unitConfig.StartLimitIntervalSec = 5; + }; + users.groups.${cfg.group} = { }; + users.users.${cfg.user} = { + inherit (cfg) group; + description = "User for running Kismet"; + isSystemUser = true; + home = cfg.dataDir; + }; + }; + + meta.maintainers = with lib.maintainers; [ numinit ]; +} diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index c93b591701a7..40440fbd16cc 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -68,8 +68,7 @@ in description = '' Whether to enable knot-resolver domain name server. DNSSEC validation is turned on by default. - You can run `sudo nc -U /run/knot-resolver/control/1` - and give commands interactively to kresd@1.service. + You can run `kresd-cli 1` and give commands interactively to kresd@1.service. ''; }; package = lib.mkPackageOption pkgs "knot-resolver" { @@ -135,7 +134,25 @@ in ###### implementation config = lib.mkIf cfg.enable { - environment.etc."knot-resolver/kresd.conf".source = configFile; # not required + environment = { + etc."knot-resolver/kresd.conf".source = configFile; # not required + systemPackages = [ + (pkgs.writeShellScriptBin "kresd-cli" '' + if [[ ''${1:-} == -h || ''${1:-} == --help ]]; then + echo "Usage: $0 [X]" + echo + echo " X is number of the control socket and corresponds to the number of the template unit." + exit + fi + + exec=exec + if [[ "$USER" != knot-resolver ]]; then + exec='exec /run/wrappers/bin/sudo -u knot-resolver' + fi + $exec ${lib.getExe pkgs.socat} - /run/knot-resolver/control/''${1:-1} + '') + ]; + }; networking.resolvconf.useLocalResolver = lib.mkDefault true; diff --git a/nixos/modules/services/networking/livekit.nix b/nixos/modules/services/networking/livekit.nix new file mode 100644 index 000000000000..523e84094ebd --- /dev/null +++ b/nixos/modules/services/networking/livekit.nix @@ -0,0 +1,140 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: +let + cfg = config.services.livekit; + format = pkgs.formats.json { }; +in +{ + meta.maintainers = with lib.maintainers; [ quadradical ]; + options.services.livekit = { + enable = lib.mkEnableOption "the livekit server"; + package = lib.mkPackageOption pkgs "livekit" { }; + + keyFile = lib.mkOption { + type = lib.types.path; + description = '' + LiveKit key file holding one or multiple application secrets. Use `livekit-server generate-keys` to generate a random key name and secret. + + The file should have the format `: `. + Example: + `lk-jwt-service: f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE` + + Individual key/secret pairs need to be passed to clients to connect to this instance. + ''; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Opens port range for LiveKit on the firewall."; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format.type; + options = { + port = lib.mkOption { + type = lib.types.port; + default = 7880; + description = "Main TCP port for RoomService and RTC endpoint."; + }; + + rtc = { + port_range_start = lib.mkOption { + type = lib.types.int; + default = 50000; + description = "Start of UDP port range for WebRTC"; + }; + + port_range_end = lib.mkOption { + type = lib.types.int; + default = 51000; + description = "End of UDP port range for WebRTC"; + }; + + use_external_ip = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + When set to true, attempts to discover the host's public IP via STUN. + This is useful for cloud environments such as AWS & Google where hosts have an internal IP that maps to an external one. + ''; + }; + }; + }; + }; + default = { }; + description = '' + LiveKit configuration file expressed in nix. + + For an example configuration, see . + For all possible values, see . + ''; + }; + }; + + config = lib.mkIf cfg.enable { + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ + cfg.settings.port + ]; + allowedUDPPortRanges = [ + { + from = cfg.settings.rtc.port_range_start; + to = cfg.settings.rtc.port_range_end; + } + ]; + }; + + systemd.services.livekit = { + description = "LiveKit SFU server"; + documentation = [ "https://docs.livekit.io" ]; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + + serviceConfig = { + LoadCredential = [ "livekit-secrets:${cfg.keyFile}" ]; + ExecStart = utils.escapeSystemdExecArgs [ + (lib.getExe cfg.package) + "--config=${format.generate "livekit.json" cfg.settings}" + "--key-file=/run/credentials/livekit.service/livekit-secrets" + ]; + DynamicUser = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + ProtectHome = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + Restart = "on-failure"; + RestartSec = 5; + UMask = "077"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/mycelium.nix b/nixos/modules/services/networking/mycelium.nix index 26c9be290fed..7ba506ef25eb 100644 --- a/nixos/modules/services/networking/mycelium.nix +++ b/nixos/modules/services/networking/mycelium.nix @@ -73,7 +73,13 @@ in systemd.services.mycelium = { description = "Mycelium network"; - after = [ "network.target" ]; + after = [ + "network.target" + "network-online.target" + ]; + wants = [ + "network-online.target" + ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ cfg.keyFile diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix index 12b51bf05217..d29a24445ae7 100644 --- a/nixos/modules/services/networking/ncps.nix +++ b/nixos/modules/services/networking/ncps.nix @@ -206,11 +206,6 @@ in assertion = cfg.cache.lru.schedule == null || cfg.cache.maxSize != null; message = "You must specify config.ncps.cache.lru.schedule when config.ncps.cache.maxSize is set"; } - - { - assertion = cfg.cache.secretKeyPath == null || (builtins.pathExists cfg.cache.secretKeyPath); - message = "config.ncps.cache.secresecretKeyPath=${cfg.cache.secretKeyPath} must exist but does not"; - } ]; users.users.ncps = { @@ -245,7 +240,8 @@ in systemd.services.ncps = { description = "ncps binary cache proxy service"; - after = [ "network.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' diff --git a/nixos/modules/services/networking/nebula.nix b/nixos/modules/services/networking/nebula.nix index 35d7fafb43b5..36122d45c128 100644 --- a/nixos/modules/services/networking/nebula.nix +++ b/nixos/modules/services/networking/nebula.nix @@ -84,6 +84,28 @@ in description = "Whether this node is a relay."; }; + lighthouse.dns.enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether this lighthouse node should serve DNS."; + }; + + lighthouse.dns.host = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = '' + IP address on which nebula lighthouse should serve DNS. + 'localhost' is a good default to ensure the service does not listen on public interfaces; + use a Nebula address like 10.0.0.5 to make DNS resolution available to nebula hosts only. + ''; + }; + + lighthouse.dns.port = lib.mkOption { + type = lib.types.nullOr lib.types.port; + default = 5353; + description = "UDP port number for lighthouse DNS server."; + }; + lighthouses = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ ]; @@ -172,10 +194,7 @@ in ''; example = lib.literalExpression '' { - lighthouse.dns = { - host = "0.0.0.0"; - port = 53; - }; + lighthouse.interval = 15; } ''; }; @@ -203,6 +222,9 @@ in lighthouse = { am_lighthouse = netCfg.isLighthouse; hosts = netCfg.lighthouses; + serve_dns = netCfg.lighthouse.dns.enable; + dns.host = netCfg.lighthouse.dns.host; + dns.port = netCfg.lighthouse.dns.port; }; relay = { am_relay = netCfg.isRelay; @@ -231,6 +253,19 @@ in '' settings ); + capabilities = + let + nebulaPort = if !settings.tun.disabled then settings.listen.port else 0; + dnsPort = if settings.lighthouse.serve_dns then settings.lighthouse.dns.port else 0; + in + lib.concatStringsSep " " ( + # creation of tunnel interfaces + lib.optional (!settings.tun.disabled) "CAP_NET_ADMIN" + # binding to privileged ports + ++ lib.optional ( + nebulaPort > 0 && nebulaPort < 1024 || dnsPort > 0 && dnsPort < 1024 + ) "CAP_NET_BIND_SERVICE" + ); in { # Create the systemd service for Nebula. @@ -248,8 +283,8 @@ in Restart = "always"; ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}"; UMask = "0027"; - CapabilityBoundingSet = "CAP_NET_ADMIN"; - AmbientCapabilities = "CAP_NET_ADMIN"; + CapabilityBoundingSet = capabilities; + AmbientCapabilities = capabilities; LockPersonality = true; NoNewPrivileges = true; PrivateDevices = false; # needs access to /dev/net/tun (below) @@ -302,5 +337,8 @@ in ); }; - meta.maintainers = with lib.maintainers; [ numinit ]; + meta.maintainers = with lib.maintainers; [ + numinit + siriobalmelli + ]; } diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix index 99b56609a70f..eb874447bb3a 100644 --- a/nixos/modules/services/networking/networkd-dispatcher.nix +++ b/nixos/modules/services/networking/networkd-dispatcher.nix @@ -103,21 +103,29 @@ in services.networkd-dispatcher.extraArgs = let - scriptDir = pkgs.symlinkJoin { - name = "networkd-dispatcher-script-dir"; - paths = lib.mapAttrsToList ( - name: cfg: - (map ( - state: - pkgs.writeTextFile { - inherit name; - text = cfg.script; - destination = "/${state}.d/${name}"; - executable = true; - } - ) cfg.onState) - ) cfg.rules; - }; + scriptDir = pkgs.runCommand "networkd-dispatcher-script-dir" { } ( + '' + mkdir $out + '' + + (lib.concatStrings ( + lib.mapAttrsToList ( + name: cfg: + (lib.concatStrings ( + map (state: '' + mkdir -p $out/${state}.d + ln -s ${ + lib.getExe ( + pkgs.writeShellApplication { + inherit name; + text = cfg.script; + } + ) + } $out/${state}.d/${name} + '') cfg.onState + )) + ) cfg.rules + )) + ); in [ "--verbose" diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index a8c4c3885a71..3a9d911b8048 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -180,12 +180,12 @@ in }; }; - config = mkIf cfg.enable { - meta.maintainers = with lib.maintainers; [ - thoughtpolice - vifino - ]; + meta.maintainers = with lib.maintainers; [ + thoughtpolice + vifino + ]; + config = mkIf cfg.enable { environment.systemPackages = [ chronyPkg ]; users.groups.chrony.gid = config.ids.gids.chrony; diff --git a/nixos/modules/services/networking/ntp/ntpd-rs.nix b/nixos/modules/services/networking/ntp/ntpd-rs.nix index 557bf05fbc42..14287ded9abf 100644 --- a/nixos/modules/services/networking/ntp/ntpd-rs.nix +++ b/nixos/modules/services/networking/ntp/ntpd-rs.nix @@ -63,7 +63,7 @@ in }; source = lib.mkIf cfg.useNetworkingTimeServers ( map (ts: { - mode = "server"; + mode = if lib.strings.hasInfix "pool" ts then "pool" else "server"; address = ts; }) config.networking.timeServers ); diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index 84f79df52b0e..6debe11753f9 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -126,9 +126,9 @@ in ###### implementation - config = mkIf config.services.ntp.enable { - meta.maintainers = with lib.maintainers; [ thoughtpolice ]; + meta.maintainers = with lib.maintainers; [ thoughtpolice ]; + config = mkIf config.services.ntp.enable { # Make tools such as ntpq available in the system path. environment.systemPackages = [ pkgs.ntp ]; services.timesyncd.enable = mkForce false; diff --git a/nixos/modules/services/networking/ntp/openntpd.nix b/nixos/modules/services/networking/ntp/openntpd.nix index c4ad630826b5..8d7eebde8cdc 100644 --- a/nixos/modules/services/networking/ntp/openntpd.nix +++ b/nixos/modules/services/networking/ntp/openntpd.nix @@ -58,8 +58,9 @@ in ###### implementation + meta.maintainers = with lib.maintainers; [ thoughtpolice ]; + config = mkIf cfg.enable { - meta.maintainers = with lib.maintainers; [ thoughtpolice ]; services.timesyncd.enable = mkForce false; # Add ntpctl to the environment for status checking diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index 3b554c7e31a1..42f609128b95 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -38,12 +38,34 @@ let else ""; - configDir = pkgs.writeTextDir "recursor.conf" ( - concatStringsSep "\n" (flip mapAttrsToList cfg.settings (name: val: "${name}=${serialize val}")) - ); + settingsFormat = pkgs.formats.yaml { }; mkDefaultAttrs = mapAttrs (n: v: mkDefault v); + mkForwardZone = mapAttrsToList ( + zone: uri: { + inherit zone; + forwarders = [ uri ]; + } + ); + + configFile = + if cfg.old-settings != { } then + # Convert recursor.conf to recursor.yml and merge it + let + conf = pkgs.writeText "recursor.conf" ( + concatStringsSep "\n" (mapAttrsToList (name: val: "${name}=${serialize val}") cfg.old-settings) + ); + + yaml = settingsFormat.generate "recursor.yml" cfg.yaml-settings; + in + pkgs.runCommand "recursor-merged.yml" { } '' + ${pkgs.pdns-recursor}/bin/rec_control show-yaml --config ${conf} > override.yml + ${pkgs.yq-go}/bin/yq '. *= load("override.yml")' ${yaml} > $out + '' + else + settingsFormat.generate "recursor.yml" cfg.yaml-settings; + in { options.services.pdns-recursor = { @@ -175,7 +197,7 @@ in ''; }; - settings = mkOption { + old-settings = mkOption { type = configType; default = { }; example = literalExpression '' @@ -184,11 +206,34 @@ in log-common-errors = true; } ''; + description = '' + Older PowerDNS Recursor settings. Use this option to configure + Recursor settings not exposed in a NixOS option or to bypass one. + See the full documentation at + + for the available options. + + ::: {.warning} + This option is provided for backward compatibility only + and will be removed in the next release of NixOS. + ::: + ''; + }; + + yaml-settings = mkOption { + type = settingsFormat.type; + default = { }; + example = literalExpression '' + { + loglevel = 8; + log-common-errors = true; + } + ''; description = '' PowerDNS Recursor settings. Use this option to configure Recursor settings not exposed in a NixOS option or to bypass one. See the full documentation at - + for the available options. ''; }; @@ -205,42 +250,44 @@ in config = mkIf cfg.enable { - environment.etc."pdns-recursor".source = configDir; + environment.etc."/pdns-recursor/recursor.yml".source = configFile; - services.pdns-recursor.settings = mkDefaultAttrs { - local-address = cfg.dns.address; - local-port = cfg.dns.port; - allow-from = cfg.dns.allowFrom; + services.pdns-recursor.yaml-settings = { + incoming = mkDefaultAttrs { + listen = cfg.dns.address; + port = cfg.dns.port; + allow_from = cfg.dns.allowFrom; + }; - webserver-address = cfg.api.address; - webserver-port = cfg.api.port; - webserver-allow-from = cfg.api.allowFrom; + webservice = mkDefaultAttrs { + address = cfg.api.address; + port = cfg.api.port; + allow_from = cfg.api.allowFrom; + }; - forward-zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones; - forward-zones-recurse = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZonesRecurse; - export-etc-hosts = cfg.exportHosts; - dnssec = cfg.dnssecValidation; - serve-rfc1918 = cfg.serveRFC1918; - lua-config-file = pkgs.writeText "recursor.lua" cfg.luaConfig; + recursor = mkDefaultAttrs { + forward_zones = mkForwardZone cfg.forwardZones; + forward_zones_recurse = mkForwardZone cfg.forwardZonesRecurse; + export_etc_hosts = cfg.exportHosts; + serve_rfc1918 = cfg.serveRFC1918; + lua_config_file = pkgs.writeText "recursor.lua" cfg.luaConfig; + daemon = false; + write_pid = false; + }; - daemon = false; - write-pid = false; - log-timestamp = false; - disable-syslog = true; + dnssec = mkDefaultAttrs { + validation = cfg.dnssecValidation; + }; + + logging = mkDefaultAttrs { + timestamp = false; + disable_syslog = true; + }; }; systemd.packages = [ pkgs.pdns-recursor ]; - systemd.services.pdns-recursor = { - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - ExecStart = [ - "" - "${pkgs.pdns-recursor}/bin/pdns_recursor --config-dir=${configDir}" - ]; - }; - }; + systemd.services.pdns-recursor.wantedBy = [ "multi-user.target" ]; users.users.pdns-recursor = { isSystemUser = true; @@ -250,6 +297,15 @@ in users.groups.pdns-recursor = { }; + warnings = lib.optional (cfg.old-settings != { }) '' + pdns-recursor has changed its configuration file format from pdns-recursor.conf + (mapped to `services.pdns-recursor.old-settings`) to the newer pdns-recursor.yml + (mapped to `services.pdns-recursor.yaml-settings`). + + Support for the older format will be removed in a future version, so please migrate + your settings over. See . + ''; + }; imports = [ @@ -258,6 +314,19 @@ in "pdns-recursor" "extraConfig" ] "To change extra Recursor settings use services.pdns-recursor.settings instead.") + + (mkRenamedOptionModule + [ + "services" + "pdns-recursor" + "settings" + ] + [ + "services" + "pdns-recursor" + "old-settings" + ] + ) ]; meta.maintainers = with lib.maintainers; [ rnhmjoj ]; diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix deleted file mode 100644 index 67f83358312e..000000000000 --- a/nixos/modules/services/networking/polipo.nix +++ /dev/null @@ -1,124 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - - cfg = config.services.polipo; - - polipoConfig = pkgs.writeText "polipo.conf" '' - proxyAddress = ${cfg.proxyAddress} - proxyPort = ${toString cfg.proxyPort} - allowedClients = ${concatStringsSep ", " cfg.allowedClients} - ${optionalString (cfg.parentProxy != "") "parentProxy = ${cfg.parentProxy}"} - ${optionalString (cfg.socksParentProxy != "") "socksParentProxy = ${cfg.socksParentProxy}"} - ${config.services.polipo.extraConfig} - ''; - -in - -{ - - options = { - - services.polipo = { - - enable = mkEnableOption "polipo caching web proxy"; - - proxyAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "IP address on which Polipo will listen."; - }; - - proxyPort = mkOption { - type = types.port; - default = 8123; - description = "TCP port on which Polipo will listen."; - }; - - allowedClients = mkOption { - type = types.listOf types.str; - default = [ - "127.0.0.1" - "::1" - ]; - example = [ - "127.0.0.1" - "::1" - "134.157.168.0/24" - "2001:660:116::/48" - ]; - description = '' - List of IP addresses or network addresses that may connect to Polipo. - ''; - }; - - parentProxy = mkOption { - type = types.str; - default = ""; - example = "localhost:8124"; - description = '' - Hostname and port number of an HTTP parent proxy; - it should have the form ‘host:port’. - ''; - }; - - socksParentProxy = mkOption { - type = types.str; - default = ""; - example = "localhost:9050"; - description = '' - Hostname and port number of an SOCKS parent proxy; - it should have the form ‘host:port’. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Polio configuration. Contents will be added - verbatim to the configuration file. - ''; - }; - - }; - - }; - - config = mkIf cfg.enable { - - users.users.polipo = { - uid = config.ids.uids.polipo; - description = "Polipo caching proxy user"; - home = "/var/cache/polipo"; - createHome = true; - }; - - users.groups.polipo = { - gid = config.ids.gids.polipo; - members = [ "polipo" ]; - }; - - systemd.services.polipo = { - description = "caching web proxy"; - after = [ - "network.target" - "nss-lookup.target" - ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.polipo}/bin/polipo -c ${polipoConfig}"; - User = "polipo"; - }; - }; - - }; - -} diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 6ff4f9b5a683..b53af1dbdf71 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -693,102 +693,120 @@ in "ssh/sshd_config".source = sshconf; }; - systemd = - let - service = { - description = "SSH Daemon"; - wantedBy = lib.optional (!cfg.startWhenNeeded) "multi-user.target"; - after = [ "network.target" ]; - stopIfChanged = false; - path = [ - cfg.package - pkgs.gawk + systemd.tmpfiles.settings."ssh-root-provision" = { + "/root"."d-" = { + user = "root"; + group = ":root"; + mode = ":700"; + }; + "/root/.ssh"."d-" = { + user = "root"; + group = ":root"; + mode = ":700"; + }; + "/root/.ssh/authorized_keys"."f^" = { + user = "root"; + group = ":root"; + mode = ":600"; + argument = "ssh.authorized_keys.root"; + }; + }; + + systemd = { + sockets.sshd = lib.mkIf cfg.startWhenNeeded { + description = "SSH Socket"; + wantedBy = [ "sockets.target" ]; + socketConfig.ListenStream = + if cfg.listenAddresses != [ ] then + lib.concatMap ( + { addr, port }: + if port != null then [ "${addr}:${toString port}" ] else map (p: "${addr}:${toString p}") cfg.ports + ) cfg.listenAddresses + else + cfg.ports; + socketConfig.Accept = true; + # Prevent brute-force attacks from shutting down socket + socketConfig.TriggerLimitIntervalSec = 0; + }; + + services."sshd@" = { + description = "SSH per-connection Daemon"; + after = [ + "network.target" + "sshd-keygen.service" + ]; + wants = [ "sshd-keygen.service" ]; + stopIfChanged = false; + path = [ cfg.package ]; + environment.LD_LIBRARY_PATH = nssModulesPath; + + serviceConfig = { + ExecStart = lib.concatStringsSep " " [ + "-${lib.getExe' cfg.package "sshd"}" + "-i" + "-D" + "-f /etc/ssh/sshd_config" ]; - environment.LD_LIBRARY_PATH = nssModulesPath; + KillMode = "process"; + StandardInput = "socket"; + StandardError = "journal"; + }; + }; - restartTriggers = lib.optionals (!cfg.startWhenNeeded) [ - config.environment.etc."ssh/sshd_config".source + services.sshd = lib.mkIf (!cfg.startWhenNeeded) { + description = "SSH Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "sshd-keygen.service" + ]; + wants = [ "sshd-keygen.service" ]; + stopIfChanged = false; + path = [ cfg.package ]; + environment.LD_LIBRARY_PATH = nssModulesPath; + + restartTriggers = [ config.environment.etc."ssh/sshd_config".source ]; + + serviceConfig = { + Restart = "always"; + ExecStart = lib.concatStringsSep " " [ + (lib.getExe' cfg.package "sshd") + "-D" + "-f" + "/etc/ssh/sshd_config" ]; + KillMode = "process"; + }; + }; - preStart = '' - # Make sure we don't write to stdout, since in case of - # socket activation, it goes to the remote side (#19589). - exec >&2 - - ${lib.flip lib.concatMapStrings cfg.hostKeys (k: '' - if ! [ -s "${k.path}" ]; then - if ! [ -h "${k.path}" ]; then - rm -f "${k.path}" - fi - mkdir -p "$(dirname '${k.path}')" - chmod 0755 "$(dirname '${k.path}')" - ssh-keygen \ - -t "${k.type}" \ - ${lib.optionalString (k ? bits) "-b ${toString k.bits}"} \ - ${lib.optionalString (k ? rounds) "-a ${toString k.rounds}"} \ - ${lib.optionalString (k ? comment) "-C '${k.comment}'"} \ - ${lib.optionalString (k ? openSSHFormat && k.openSSHFormat) "-o"} \ - -f "${k.path}" \ - -N "" + services.sshd-keygen = { + description = "SSH Host Keys Generation"; + unitConfig = { + ConditionFileNotEmpty = map (k: "|!${k.path}") cfg.hostKeys; + }; + serviceConfig = { + Type = "oneshot"; + }; + path = [ cfg.package ]; + script = lib.flip lib.concatMapStrings cfg.hostKeys (k: '' + if ! [ -s "${k.path}" ]; then + if ! [ -h "${k.path}" ]; then + rm -f "${k.path}" fi - '')} - ''; - - serviceConfig = - { - ExecStart = - (lib.optionalString cfg.startWhenNeeded "-") - + "${cfg.package}/bin/sshd " - + (lib.optionalString cfg.startWhenNeeded "-i ") - + "-D " - # don't detach into a daemon process - + "-f /etc/ssh/sshd_config"; - KillMode = "process"; - } - // ( - if cfg.startWhenNeeded then - { - StandardInput = "socket"; - StandardError = "journal"; - } - else - { - Restart = "always"; - Type = "simple"; - } - ); - - }; - in - - if cfg.startWhenNeeded then - { - - sockets.sshd = { - description = "SSH Socket"; - wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = - if cfg.listenAddresses != [ ] then - lib.concatMap ( - { addr, port }: - if port != null then [ "${addr}:${toString port}" ] else map (p: "${addr}:${toString p}") cfg.ports - ) cfg.listenAddresses - else - cfg.ports; - socketConfig.Accept = true; - # Prevent brute-force attacks from shutting down socket - socketConfig.TriggerLimitIntervalSec = 0; - }; - - services."sshd@" = service; - - } - else - { - - services.sshd = service; - - }; + mkdir -p "$(dirname '${k.path}')" + chmod 0755 "$(dirname '${k.path}')" + ssh-keygen \ + -t "${k.type}" \ + ${lib.optionalString (k ? bits) "-b ${toString k.bits}"} \ + ${lib.optionalString (k ? rounds) "-a ${toString k.rounds}"} \ + ${lib.optionalString (k ? comment) "-C '${k.comment}'"} \ + ${lib.optionalString (k ? openSSHFormat && k.openSSHFormat) "-o"} \ + -f "${k.path}" \ + -N "" + fi + ''); + }; + }; networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall cfg.ports; diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix index 1619cb6cf089..b8a46d5150bc 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix @@ -89,7 +89,7 @@ rec { in recurse [ ] set; - mapAttrs'' = f: set: foldl' (a: b: a // b) { } (map (attr: f attr set.${attr}) (attrNames set)); + mapAttrs'' = f: set: foldl' (a: b: a // b) { } (mapAttrsToList f set); # Extract the options from the given set of parameters. paramsToOptions = ps: mapParamsRecursive (_path: name: param: { ${name} = param.option; }) ps; diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix index 0e02cc74184c..c986fc604a64 100644 --- a/nixos/modules/services/networking/stunnel.nix +++ b/nixos/modules/services/networking/stunnel.nix @@ -222,13 +222,13 @@ in Type = "forking"; }; }; - - meta.maintainers = with lib.maintainers; [ - # Server side - lschuermann - # Client side - das_j - ]; }; + meta.maintainers = with lib.maintainers; [ + # Server side + lschuermann + # Client side + das_j + ]; + } diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index f76509d78b69..0a901148dc9c 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -55,10 +55,19 @@ let were removed. Please use, respectively, {rescanIntervalS,fsWatcherEnabled,fsWatcherDelayS} instead. '' { - devices = map ( - device: - if builtins.isString device then { deviceId = cfg.settings.devices.${device}.id; } else device - ) folder.devices; + devices = + let + folderDevices = folder.devices; + in + map ( + device: + if builtins.isString device then + { deviceId = cfg.settings.devices.${device}.id; } + else if builtins.isAttrs device then + { deviceId = cfg.settings.devices.${device.name}.id; } // device + else + throw "Invalid type for devices in folder '${folderName}'; expected list or attrset." + ) folderDevices; } ) (filterAttrs (_: folder: folder.enable) cfg.settings.folders); @@ -128,9 +137,79 @@ let # don't exist in the array given. That's why we use here `POST`, and # only if s.override == true then we DELETE the relevant folders # afterwards. - (map (new_cfg: '' - curl -d ${lib.escapeShellArg (builtins.toJSON new_cfg)} -X POST ${s.baseAddress} - '')) + (map ( + new_cfg: + let + jsonPreSecretsFile = pkgs.writeTextFile { + name = "${conf_type}-${new_cfg.id}-conf-pre-secrets.json"; + text = builtins.toJSON new_cfg; + }; + injectSecretsJqCmd = + { + # There are no secrets in `devs`, so no massaging needed. + "devs" = "${jq} ."; + "dirs" = + let + folder = new_cfg; + devicesWithSecrets = lib.pipe folder.devices [ + (lib.filter (device: (builtins.isAttrs device) && device ? encryptionPasswordFile)) + (map (device: { + deviceId = device.deviceId; + variableName = "secret_${builtins.hashString "sha256" device.encryptionPasswordFile}"; + secretPath = device.encryptionPasswordFile; + })) + ]; + # At this point, `jsonPreSecretsFile` looks something like this: + # + # { + # ..., + # "devices": [ + # { + # "deviceId": "id1", + # "encryptionPasswordFile": "/etc/bar-encryption-password", + # "name": "..." + # } + # ], + # } + # + # We now generate a `jq` command that can replace those + # `encryptionPasswordFile`s with `encryptionPassword`. + # The `jq` command ends up looking like this: + # + # jq --rawfile secret_DEADBEEF /etc/bar-encryption-password ' + # .devices[] |= ( + # if .deviceId == "id1" then + # del(.encryptionPasswordFile) | + # .encryptionPassword = $secret_DEADBEEF + # else + # . + # end + # ) + # ' + jqUpdates = map (device: '' + .devices[] |= ( + if .deviceId == "${device.deviceId}" then + del(.encryptionPasswordFile) | + .encryptionPassword = ''$${device.variableName} + else + . + end + ) + '') devicesWithSecrets; + jqRawFiles = map ( + device: "--rawfile ${device.variableName} ${lib.escapeShellArg device.secretPath}" + ) devicesWithSecrets; + in + "${jq} ${lib.concatStringsSep " " jqRawFiles} ${ + lib.escapeShellArg (lib.concatStringsSep "|" ([ "." ] ++ jqUpdates)) + }"; + } + .${conf_type}; + in + '' + ${injectSecretsJqCmd} ${jsonPreSecretsFile} | curl --json @- -X POST ${s.baseAddress} + '' + )) (lib.concatStringsSep "\n") ] /* @@ -438,11 +517,48 @@ in }; devices = mkOption { - type = types.listOf types.str; + type = types.listOf ( + types.oneOf [ + types.str + (types.submodule ( + { ... }: + { + freeformType = settingsFormat.type; + options = { + name = mkOption { + type = types.str; + default = null; + description = '' + The name of a device defined in the + [devices](#opt-services.syncthing.settings.devices) + option. + ''; + }; + encryptionPasswordFile = mkOption { + type = types.nullOr ( + types.pathWith { + inStore = false; + absolute = true; + } + ); + default = null; + description = '' + Path to encryption password. If set, the file will be read during + service activation, without being embedded in derivation. + ''; + }; + }; + } + )) + ] + ); default = [ ]; description = '' The devices this folder should be shared with. Each device must be defined in the [devices](#opt-services.syncthing.settings.devices) option. + + A list of either strings or attribute sets, where values + are device names or device configurations. ''; }; diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 8f05634f566b..50f8f844188a 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -47,9 +47,7 @@ in ''; }; - services.unifi.unifiPackage = lib.mkPackageOption pkgs "unifi" { - default = "unifi8"; - }; + services.unifi.unifiPackage = lib.mkPackageOption pkgs "unifi" { }; services.unifi.mongodbPackage = lib.mkPackageOption pkgs "mongodb" { default = "mongodb-7_0"; @@ -116,7 +114,7 @@ in only supports migrating one major version at a time; therefore, you may wish to set `services.unifi.mongodbPackage = pkgs.mongodb-6_0;` and activate your configuration before upgrading again to the default - `mongodb-7_0` supported by `unifi8`. + `mongodb-7_0` supported by `unifi`. For more information, see the MongoDB upgrade notes: diff --git a/nixos/modules/services/networking/vwifi.nix b/nixos/modules/services/networking/vwifi.nix new file mode 100644 index 000000000000..64b7fbdf45a4 --- /dev/null +++ b/nixos/modules/services/networking/vwifi.nix @@ -0,0 +1,200 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib.modules) mkIf mkMerge; + inherit (lib.options) mkOption mkPackageOption mkEnableOption; + inherit (lib.lists) optional optionals; + inherit (lib.strings) + hasSuffix + escapeShellArgs + ; + inherit (lib) types; + cfg = config.services.vwifi; +in +{ + options = { + services.vwifi = + let + mkOptionalPort = + name: + mkOption { + description = '' + The ${name} port. Set to null if we should leave it unset. + ''; + type = with types; nullOr port; + default = null; + }; + in + { + package = mkPackageOption pkgs "vwifi" { }; + module = { + enable = mkEnableOption "mac80211_hwsim module"; + numRadios = mkOption { + description = "The number of virtual radio interfaces to create."; + type = types.int; + default = 1; + }; + macPrefix = mkOption { + description = '' + The prefix for MAC addresses to use, without the trailing ':'. + If one radio is created, you can specify the whole MAC address here. + The default is defined in vwifi/src/config.h. + ''; + type = types.strMatching "^(([0-9A-Fa-f]{2}:){0,5}[0-9A-Fa-f]{2})$"; + default = "74:F8:F6"; + }; + }; + client = { + enable = mkEnableOption "vwifi client"; + spy = mkEnableOption "spy mode, useful for wireless monitors"; + serverAddress = mkOption { + description = '' + The address of the server. If set to null, will try to use the vsock protocol. + Note that this assumes that the server is spawned on the host and passed through to + QEMU, with something like: + + -device vhost-vsock-pci,id=vwifi0,guest-cid=42 + ''; + type = with types; nullOr str; + default = null; + }; + serverPort = mkOptionalPort "server port"; + extraArgs = mkOption { + description = '' + Extra arguments to pass to vwifi-client. You can use this if you want to bring + the radios up using vwifi-client instead of at boot. + ''; + type = with types; listOf str; + default = [ ]; + example = [ + "--number" + "3" + ]; + }; + }; + server = { + enable = mkEnableOption "vwifi server"; + vsock.enable = mkEnableOption "vsock kernel module"; + ports = { + vhost = mkOptionalPort "vhost"; + tcp = mkOptionalPort "TCP server"; + spy = mkOptionalPort "spy interface"; + control = mkOptionalPort "control interface"; + }; + openFirewall = mkEnableOption "opening the firewall for the TCP and spy ports"; + extraArgs = mkOption { + description = '' + Extra arguments to pass to vwifi-server. You can use this for things including + changing the ports or inducing packet loss. + ''; + type = with types; listOf str; + default = [ ]; + example = [ "--lost-packets" ]; + }; + }; + }; + }; + + config = mkMerge [ + (mkIf cfg.module.enable { + boot.kernelModules = [ + "mac80211_hwsim" + ]; + boot.extraModprobeConfig = '' + # We'll add more radios using vwifi-add-interfaces in the systemd unit. + options mac80211_hwsim radios=0 + ''; + systemd.services.vwifi-add-interfaces = mkIf (cfg.module.numRadios > 0) { + description = "vwifi interface bringup"; + wantedBy = [ "network-pre.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = + let + args = [ + (toString cfg.module.numRadios) + cfg.module.macPrefix + ]; + in + "${cfg.package}/bin/vwifi-add-interfaces ${escapeShellArgs args}"; + }; + }; + assertions = [ + { + assertion = !(hasSuffix ":" cfg.module.macPrefix); + message = '' + services.vwifi.module.macPrefix should not have a trailing ":". + ''; + } + ]; + }) + (mkIf cfg.client.enable { + systemd.services.vwifi-client = + let + clientArgs = + optional cfg.client.spy "--spy" + ++ optional (cfg.client.serverAddress != null) cfg.client.serverAddress + ++ optionals (cfg.client.serverPort != null) [ + "--port" + cfg.client.serverPort + ] + ++ cfg.client.extraArgs; + in + rec { + description = "vwifi client"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + requires = after; + serviceConfig = { + ExecStart = "${cfg.package}/bin/vwifi-client ${escapeShellArgs clientArgs}"; + }; + }; + }) + (mkIf cfg.server.enable { + boot.kernelModules = mkIf cfg.server.vsock.enable [ + "vhost_vsock" + ]; + networking.firewall.allowedTCPPorts = mkIf cfg.server.openFirewall ( + optional (cfg.server.ports.tcp != null) cfg.server.ports.tcp + ++ optional (cfg.server.ports.spy != null) cfg.server.ports.spy + ); + systemd.services.vwifi-server = + let + serverArgs = + optionals (cfg.server.ports.vhost != null) [ + "--port-vhost" + (toString cfg.server.ports.vhost) + ] + ++ optionals (cfg.server.ports.tcp != null) [ + "--port-tcp" + (toString cfg.server.ports.tcp) + ] + ++ optionals (cfg.server.ports.spy != null) [ + "--port-spy" + (toString cfg.server.ports.spy) + ] + ++ optionals (cfg.server.ports.control != null) [ + "--port-ctrl" + (toString cfg.server.ports.control) + ] + ++ cfg.server.extraArgs; + in + rec { + description = "vwifi server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + requires = after; + serviceConfig = { + ExecStart = "${cfg.package}/bin/vwifi-server ${escapeShellArgs serverArgs}"; + }; + }; + }) + ]; + + meta.maintainers = with lib.maintainers; [ numinit ]; +} diff --git a/nixos/modules/services/networking/whoogle-search.nix b/nixos/modules/services/networking/whoogle-search.nix index 4665cfc5793d..c0067edce7f0 100644 --- a/nixos/modules/services/networking/whoogle-search.nix +++ b/nixos/modules/services/networking/whoogle-search.nix @@ -64,7 +64,7 @@ in RestartSec = "5s"; }; }; - - meta.maintainers = with lib.maintainers; [ malte-v ]; }; + + meta.maintainers = with lib.maintainers; [ malte-v ]; } diff --git a/nixos/modules/services/networking/xandikos.nix b/nixos/modules/services/networking/xandikos.nix index 1b72cd03ba9c..908107a259a9 100644 --- a/nixos/modules/services/networking/xandikos.nix +++ b/nixos/modules/services/networking/xandikos.nix @@ -87,9 +87,10 @@ in }; + meta.maintainers = with lib.maintainers; [ _0x4A6F ]; + config = mkIf cfg.enable (mkMerge [ { - meta.maintainers = with lib.maintainers; [ _0x4A6F ]; systemd.services.xandikos = { description = "A Simple Calendar and Contact Server"; diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 1a1465b8e222..03b581c4d8cd 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -108,6 +108,21 @@ in type = lib.types.str; }; + # TODO: turn on by default when it stops being experimental + dumplessUpgrade = lib.mkOption { + default = false; + example = true; + description = '' + Whether to enable (experimental) dumpless upgrade. + + Allows upgrading from Meilisearch >=v1.12 to Meilisearch >=v1.13 without manually + dumping and importing the database. + + More information at https://www.meilisearch.com/docs/learn/update_and_migration/updating#dumpless-upgrade + ''; + type = lib.types.bool; + }; + }; ###### implementation @@ -129,6 +144,7 @@ in MEILI_DUMP_DIR = "/var/lib/meilisearch/dumps"; MEILI_LOG_LEVEL = cfg.logLevel; MEILI_MAX_INDEX_SIZE = cfg.maxIndexSize; + MEILI_EXPERIMENTAL_DUMPLESS_UPGRADE = lib.boolToString cfg.dumplessUpgrade; }; serviceConfig = { ExecStart = "${cfg.package}/bin/meilisearch"; diff --git a/nixos/modules/services/search/tika.nix b/nixos/modules/services/search/tika.nix index 94096b6db29f..5ddd1a551e49 100644 --- a/nixos/modules/services/search/tika.nix +++ b/nixos/modules/services/search/tika.nix @@ -79,7 +79,10 @@ in serviceConfig = let - package = cfg.package.override { inherit (cfg) enableOcr; }; + package = cfg.package.override { + inherit (cfg) enableOcr; + enableGui = false; + }; in { Type = "simple"; diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix index 2d0465d6a0b8..514442dbe437 100644 --- a/nixos/modules/services/security/cfssl.nix +++ b/nixos/modules/services/security/cfssl.nix @@ -164,6 +164,12 @@ in ]; description = "Log level (0 = DEBUG, 5 = FATAL)."; }; + + disable = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.commas; + description = "Endpoints to disable (comma-separated list)"; + }; }; config = lib.mkIf cfg.enable { @@ -218,6 +224,7 @@ in (opt "tls-remote-ca" tlsRemoteCa) (opt "db-config" dbConfig) (opt "loglevel" (toString logLevel)) + (opt "disable" disable) ]; } (lib.mkIf (cfg.dataDir == options.services.cfssl.dataDir.default) { diff --git a/nixos/modules/services/security/e-imzo.nix b/nixos/modules/services/security/e-imzo.nix new file mode 100644 index 000000000000..1423f3ec9596 --- /dev/null +++ b/nixos/modules/services/security/e-imzo.nix @@ -0,0 +1,50 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.e-imzo; +in +{ + options = { + services.e-imzo = { + enable = lib.mkEnableOption "E-IMZO"; + + package = lib.mkPackageOption pkgs "e-imzo" { + extraDescription = "Official mirror deletes old versions as soon as they release new one. Feel free to use either unstable or your own custom e-imzo package and ping maintainer."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.user.services.e-imzo = { + enable = true; + description = "E-IMZO, uzbek state web signing service"; + documentation = [ "https://github.com/xinux-org/e-imzo" ]; + + after = [ + "network-online.target" + "graphical.target" + ]; + wants = [ + "network-online.target" + "graphical.target" + ]; + wantedBy = [ "default.target" ]; + + serviceConfig = { + Type = "simple"; + Restart = "always"; + RestartSec = 1; + ExecStart = lib.getExe cfg.package; + + NoNewPrivileges = true; + SystemCallArchitectures = "native"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ orzklv ]; +} diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index b2dc4a57fa44..67b219595458 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -563,6 +563,16 @@ in default = null; }; + imageFile = mkOption { + description = '' + Application image to display in the WebUI. + Kanidm supports "image/jpeg", "image/png", "image/gif", "image/svg+xml", and "image/webp". + The image will be uploaded each time kanidm-provision is run. + ''; + type = types.nullOr types.path; + default = null; + }; + enableLocalhostRedirects = mkOption { description = "Allow localhost redirects. Only for public clients."; type = types.bool; diff --git a/nixos/modules/services/security/openbao.nix b/nixos/modules/services/security/openbao.nix new file mode 100644 index 000000000000..9d75ffbebcb7 --- /dev/null +++ b/nixos/modules/services/security/openbao.nix @@ -0,0 +1,160 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.openbao; + + settingsFormat = pkgs.formats.json { }; +in +{ + options = { + services.openbao = { + enable = lib.mkEnableOption "OpenBao daemon"; + + package = lib.mkPackageOption pkgs "openbao" { + example = "pkgs.openbao.override { withHsm = false; withUi = false; }"; + }; + + settings = lib.mkOption { + description = '' + Settings of OpenBao. + + See [documentation](https://openbao.org/docs/configuration) for more details. + ''; + example = lib.literalExpression '' + { + ui = true; + + listener.default = { + type = "tcp"; + tls_acme_email = config.security.acme.defaults.email; + tls_acme_domains = [ "example.com" ]; + tls_acme_disable_http_challenge = true; + }; + + cluster_addr = "http://127.0.0.1:8201"; + api_addr = "https://example.com"; + + storage.raft.path = "/var/lib/openbao"; + } + ''; + + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + ui = lib.mkEnableOption "the OpenBao web UI"; + + listener = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.submodule ( + { config, ... }: + { + freeformType = settingsFormat.type; + options = { + type = lib.mkOption { + type = lib.types.enum [ + "tcp" + "unix" + ]; + description = '' + The listener type to enable. + ''; + }; + address = lib.mkOption { + type = lib.types.str; + default = if config.type == "unix" then "/run/openbao/openbao.sock" else "127.0.0.1:8200"; + defaultText = lib.literalExpression ''if config.services.openbao.settings.listener..type == "unix" then "/run/openbao/openbao.sock" else "127.0.0.1:8200"''; + description = '' + The TCP address or UNIX socket path to listen on. + ''; + }; + }; + } + ) + ); + description = '' + Configure a listener for responding to requests. + ''; + }; + }; + }; + }; + + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Additional arguments given to OpenBao. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.services.openbao = { + description = "OpenBao - A tool for managing secrets"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + restartIfChanged = false; # do not restart on "nixos-rebuild switch". It would seal the storage and disrupt the clients. + + serviceConfig = { + Type = "notify"; + + ExecStart = lib.escapeShellArgs ( + [ + (lib.getExe cfg.package) + "server" + "-config" + (settingsFormat.generate "openbao.hcl.json" cfg.settings) + ] + ++ cfg.extraArgs + ); + ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -SIGHUP $MAINPID"; + + StateDirectory = "openbao"; + StateDirectoryMode = "0700"; + RuntimeDirectory = "openbao"; + RuntimeDirectoryMode = "0700"; + + CapabilityBoundingSet = ""; + DynamicUser = true; + LimitCORE = 0; + LockPersonality = true; + MemorySwapMax = 0; + MemoryZSwapMax = 0; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + Restart = "on-failure"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "@resources" + "~@privileged" + ]; + UMask = "0077"; + }; + }; + }; +} diff --git a/nixos/modules/services/security/paretosecurity.nix b/nixos/modules/services/security/paretosecurity.nix index 9ec196eee6a0..d942fe67c62a 100644 --- a/nixos/modules/services/security/paretosecurity.nix +++ b/nixos/modules/services/security/paretosecurity.nix @@ -4,17 +4,24 @@ pkgs, ... }: +let + cfg = config.services.paretosecurity; +in { options.services.paretosecurity = { enable = lib.mkEnableOption "[ParetoSecurity](https://paretosecurity.com) [agent](https://github.com/ParetoSecurity/agent) and its root helper"; package = lib.mkPackageOption pkgs "paretosecurity" { }; - trayIcon = lib.mkEnableOption "tray icon for ParetoSecurity"; + trayIcon = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Set to false to disable the tray icon and run as a CLI tool only."; + }; }; - config = lib.mkIf config.services.paretosecurity.enable { - environment.systemPackages = [ config.services.paretosecurity.package ]; - systemd.packages = [ config.services.paretosecurity.package ]; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; # In traditional Linux distributions, systemd would read the [Install] section from # unit files and automatically create the appropriate symlinks to enable services. @@ -24,17 +31,29 @@ # dependencies here. This creates the necessary symlinks in the proper locations. systemd.sockets.paretosecurity.wantedBy = [ "sockets.target" ]; + # In NixOS, systemd services are configured with minimal PATH. However, + # paretosecurity helper looks for installed software to do its job, so + # it needs the full system PATH. For example, it runs `iptables` to see if + # firewall is configured. And it looks for various password managers to see + # if one is installed. + # The `paretosecurity-user` timer service that is configured lower has + # the same need. + systemd.services.paretosecurity.serviceConfig.Environment = [ + "PATH=${config.system.path}/bin:${config.system.path}/sbin" + ]; + # Enable the tray icon and timer services if the trayIcon option is enabled - systemd.user = lib.mkIf config.services.paretosecurity.trayIcon { - services.paretosecurity-trayicon = { - wantedBy = [ "graphical-session.target" ]; - }; - services.paretosecurity-user = { - wantedBy = [ "graphical-session.target" ]; - }; - timers.paretosecurity-user = { - wantedBy = [ "timers.target" ]; + systemd.user = lib.mkIf cfg.trayIcon { + services = { + paretosecurity-trayicon.wantedBy = [ "graphical-session.target" ]; + paretosecurity-user = { + wantedBy = [ "graphical-session.target" ]; + serviceConfig.Environment = [ + "PATH=${config.system.path}/bin:${config.system.path}/sbin" + ]; + }; }; + timers.paretosecurity-user.wantedBy = [ "timers.target" ]; }; }; } diff --git a/nixos/modules/services/security/pocket-id.nix b/nixos/modules/services/security/pocket-id.nix new file mode 100644 index 000000000000..87c13b638dcb --- /dev/null +++ b/nixos/modules/services/security/pocket-id.nix @@ -0,0 +1,278 @@ +{ + lib, + pkgs, + config, + ... +}: + +let + inherit (lib) + mkEnableOption + mkIf + mkOption + optionalAttrs + optional + mkPackageOption + ; + inherit (lib.types) + bool + path + str + submodule + ; + + cfg = config.services.pocket-id; + + format = pkgs.formats.keyValue { }; + settingsFile = format.generate "pocket-id-env-vars" cfg.settings; +in +{ + meta.maintainers = with lib.maintainers; [ + gepbird + ymstnt + ]; + + options.services.pocket-id = { + enable = mkEnableOption "Pocket ID server"; + + package = mkPackageOption pkgs "pocket-id" { }; + + environmentFile = mkOption { + type = path; + description = '' + Path to an environment file loaded for the Pocket ID service. + + This can be used to securely store tokens and secrets outside of the world-readable Nix store. + + Example contents of the file: + MAXMIND_LICENSE_KEY=your-license-key + ''; + default = "/dev/null"; + example = "/var/lib/secrets/pocket-id"; + }; + + settings = mkOption { + type = submodule { + freeformType = format.type; + + options = { + PUBLIC_APP_URL = mkOption { + type = str; + description = '' + The URL where you will access the app. + ''; + default = "http://localhost"; + }; + + TRUST_PROXY = mkOption { + type = bool; + description = '' + Whether the app is behind a reverse proxy. + ''; + default = false; + }; + }; + }; + + default = { }; + + description = '' + Environment variables that will be passed to Pocket ID, see + [configuration options](https://pocket-id.org/docs/configuration/environment-variables) + for supported values. + ''; + }; + + dataDir = mkOption { + type = path; + default = "/var/lib/pocket-id"; + description = '' + The directory where Pocket ID will store its data, such as the database. + ''; + }; + + user = mkOption { + type = str; + default = "pocket-id"; + description = "User account under which Pocket ID runs."; + }; + + group = mkOption { + type = str; + default = "pocket-id"; + description = "Group account under which Pocket ID runs."; + }; + }; + + config = mkIf cfg.enable { + warnings = ( + optional (cfg.settings ? MAXMIND_LICENSE_KEY) + "config.services.pocket-id.settings.MAXMIND_LICENSE_KEY will be stored as plaintext in the Nix store. Use config.services.pocket-id.environmentFile instead." + ); + + systemd.tmpfiles.rules = [ + "d ${cfg.dataDir} 0755 ${cfg.user} ${cfg.group}" + ]; + + systemd.services = { + pocket-id-backend = { + description = "Pocket ID backend"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ + cfg.package + cfg.environmentFile + settingsFile + ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.dataDir; + ExecStart = "${cfg.package}/bin/pocket-id-backend"; + Restart = "always"; + EnvironmentFile = [ + cfg.environmentFile + settingsFile + ]; + + # Hardening + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + DeviceAllow = ""; + DevicePolicy = "closed"; + #IPAddressDeny = "any"; # communicates with the frontend + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateNetwork = false; # communicates with the frontend + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "full"; # needs to write in cfg.dataDir + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = lib.concatStringsSep " " [ + "~" + "@clock" + "@cpu-emulation" + "@debug" + "@module" + "@mount" + "@obsolete" + "@privileged" + "@raw-io" + "@reboot" + #"@resources" # vm test segfaults + "@swap" + ]; + UMask = "0077"; + }; + }; + + pocket-id-frontend = { + description = "Pocket ID frontend"; + after = [ + "network.target" + "pocket-id-backend.service" + ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ + cfg.package + cfg.environmentFile + settingsFile + ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/pocket-id-frontend"; + Restart = "always"; + EnvironmentFile = [ + cfg.environmentFile + settingsFile + ]; + + # Hardening + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + DeviceAllow = ""; + DevicePolicy = "closed"; + #IPAddressDeny = "any"; # communicates with the backend and client + LockPersonality = true; + MemoryDenyWriteExecute = false; # V8_Fatal segfault + NoNewPrivileges = true; + PrivateDevices = true; + PrivateNetwork = false; # communicates with the backend and client + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = lib.concatStringsSep " " [ + "~" + "@clock" + "@cpu-emulation" + "@debug" + "@module" + "@mount" + "@obsolete" + "@privileged" + "@raw-io" + "@reboot" + "@resources" + "@swap" + ]; + UMask = "0077"; + }; + }; + }; + + users.users = optionalAttrs (cfg.user == "pocket-id") { + pocket-id = { + isSystemUser = true; + group = cfg.group; + description = "Pocket ID backend user"; + home = cfg.dataDir; + }; + }; + + users.groups = optionalAttrs (cfg.group == "pocket-id") { + pocket-id = { }; + }; + }; +} diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 285dbc5d7046..613b81b297d2 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -65,6 +65,7 @@ let vaultwarden = cfg.package.override { inherit (cfg) dbBackend; }; + useSendmail = configEnv.USE_SENDMAIL or null == "true"; in { imports = [ @@ -236,10 +237,10 @@ in DevicePolicy = "closed"; LockPersonality = true; MemoryDenyWriteExecute = true; - NoNewPrivileges = true; - PrivateDevices = true; + NoNewPrivileges = !useSendmail; + PrivateDevices = !useSendmail; PrivateTmp = true; - PrivateUsers = true; + PrivateUsers = !useSendmail; ProcSubset = "pid"; ProtectClock = true; ProtectControlGroups = true; @@ -262,10 +263,13 @@ in inherit StateDirectory; StateDirectoryMode = "0700"; SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged" - ]; + SystemCallFilter = + [ + "@system-service" + ] + ++ lib.optionals (!useSendmail) [ + "~@privileged" + ]; Restart = "always"; UMask = "0077"; }; diff --git a/nixos/modules/services/torrent/cross-seed.nix b/nixos/modules/services/torrent/cross-seed.nix index b860a0fff550..3db8b84071c3 100644 --- a/nixos/modules/services/torrent/cross-seed.nix +++ b/nixos/modules/services/torrent/cross-seed.nix @@ -14,6 +14,15 @@ let types ; settingsFormat = pkgs.formats.json { }; + + generatedConfig = + pkgs.runCommand "cross-seed-gen-config" { nativeBuildInputs = [ pkgs.cross-seed ]; } + '' + export HOME=$(mktemp -d) + cross-seed gen-config + mkdir $out + cp -r $HOME/.cross-seed/config.js $out/ + ''; in { options.services.cross-seed = { @@ -40,6 +49,22 @@ in description = "Cross-seed config directory"; }; + useGenConfigDefaults = mkOption { + type = types.bool; + default = false; + description = '' + Whether to use the option defaults from the configuration generated by + {command}`cross-seed gen-config`. + + Those are the settings recommended by the project, and can be inspected + from their [template file](https://github.com/cross-seed/cross-seed/blob/master/src/config.template.cjs). + + Settings set in {option}`services.cross-seed.settings` and + {option}`services.cross-seed.settingsFile` will override the ones from + this option. + ''; + }; + settings = mkOption { default = { }; type = types.submodule { @@ -120,6 +145,13 @@ in let jsonSettingsFile = settingsFormat.generate "settings.json" cfg.settings; + genConfigSegment = + lib.optionalString cfg.useGenConfigDefaults # js + '' + const gen_config_js = "${generatedConfig}/config.js"; + Object.assign(loaded_settings, require(gen_config_js)); + ''; + # Since cross-seed uses a javascript config file, we can use node's # ability to parse JSON directly to avoid having to do any conversion. # This also means we don't need to use any external programs to merge the @@ -138,7 +170,9 @@ in "use strict"; const fs = require("fs"); const settings_json = "${jsonSettingsFile}"; - let loaded_settings = JSON.parse(fs.readFileSync(settings_json, "utf8")); + let loaded_settings = {}; + ${genConfigSegment} + Object.assign(loaded_settings, JSON.parse(fs.readFileSync(settings_json, "utf8"))); ${secretSettingsSegment} module.exports = loaded_settings; ''; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 65501ecf7f4c..adf4a5a24680 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -366,6 +366,7 @@ in }; serviceConfig = { + Type = "notify"; # Use "+" because credentialsFile may not be accessible to User= or Group=. ExecStartPre = [ ( diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index 3a0112d04d4b..7bc277f89b20 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -669,7 +669,11 @@ in # Caches PrivateTmp = true; - CacheDirectory = "frigate"; + CacheDirectory = [ + "frigate" + # https://github.com/blakeblackshear/frigate/discussions/18129 + "frigate/model_cache" + ]; CacheDirectoryMode = "0750"; # Sockets/IPC diff --git a/nixos/modules/services/web-apps/archtika.nix b/nixos/modules/services/web-apps/archtika.nix deleted file mode 100644 index cfd80dfb064f..000000000000 --- a/nixos/modules/services/web-apps/archtika.nix +++ /dev/null @@ -1,307 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - inherit (lib) - mkEnableOption - mkOption - mkIf - mkPackageOption - types - ; - cfg = config.services.archtika; -in -{ - options.services.archtika = { - enable = mkEnableOption "Whether to enable the archtika service"; - - package = mkPackageOption pkgs "archtika" { }; - - user = mkOption { - type = types.str; - default = "archtika"; - description = "User account under which archtika runs."; - }; - - group = mkOption { - type = types.str; - default = "archtika"; - description = "Group under which archtika runs."; - }; - - databaseName = mkOption { - type = types.str; - default = "archtika"; - description = "Name of the PostgreSQL database for archtika."; - }; - - apiPort = mkOption { - type = types.port; - default = 5000; - description = "Port on which the API runs."; - }; - - apiAdminPort = mkOption { - type = types.port; - default = 7500; - description = "Port on which the API admin server runs."; - }; - - webAppPort = mkOption { - type = types.port; - default = 10000; - description = "Port on which the web application runs."; - }; - - domain = mkOption { - type = types.str; - description = "Domain to use for the application."; - }; - - settings = mkOption { - description = "Settings for the running archtika application."; - type = types.submodule { - options = { - disableRegistration = mkOption { - type = types.bool; - default = false; - description = "By default any user can create an account. That behavior can be disabled with this option."; - }; - maxUserWebsites = mkOption { - type = types.ints.positive; - default = 2; - description = "Maximum number of websites allowed per user by default."; - }; - maxWebsiteStorageSize = mkOption { - type = types.ints.positive; - default = 50; - description = "Maximum amount of disk space in MB allowed per user website by default."; - }; - }; - }; - }; - }; - - config = mkIf cfg.enable ( - let - baseHardenedSystemdOptions = { - CapabilityBoundingSet = ""; - LockPersonality = true; - NoNewPrivileges = true; - PrivateDevices = true; - PrivateTmp = true; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectSystem = "strict"; - RemoveIPC = true; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged" - "~@resources" - ]; - ReadWritePaths = [ "/var/www/archtika-websites" ]; - }; - in - { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - }; - - users.groups.${cfg.group} = { - members = [ - "nginx" - "postgres" - ]; - }; - - systemd.tmpfiles.settings."10-archtika" = { - "/var/www" = { - d = { - mode = "0755"; - user = "root"; - group = "root"; - }; - }; - "/var/www/archtika-websites" = { - d = { - mode = "0770"; - user = cfg.user; - group = cfg.group; - }; - }; - }; - - systemd.services.archtika-api = { - description = "archtika API service"; - wantedBy = [ "multi-user.target" ]; - after = [ - "network.target" - "postgresql.service" - ]; - - path = [ config.services.postgresql.package ]; - - serviceConfig = baseHardenedSystemdOptions // { - User = cfg.user; - Group = cfg.group; - Restart = "always"; - WorkingDirectory = "${cfg.package}/rest-api"; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; - }; - - script = - let - dbUrl = user: "postgres://${user}@/${cfg.databaseName}?host=/var/run/postgresql"; - in - '' - JWT_SECRET=$(tr -dc 'A-Za-z0-9' < /dev/urandom | head -c64) - - psql ${dbUrl "postgres"} \ - -c "ALTER DATABASE ${cfg.databaseName} SET \"app.jwt_secret\" TO '$JWT_SECRET'" \ - -c "ALTER DATABASE ${cfg.databaseName} SET \"app.website_max_storage_size\" TO ${toString cfg.settings.maxWebsiteStorageSize}" \ - -c "ALTER DATABASE ${cfg.databaseName} SET \"app.website_max_number_user\" TO ${toString cfg.settings.maxUserWebsites}" - - ${lib.getExe pkgs.dbmate} --url "${dbUrl "postgres"}&sslmode=disable" --migrations-dir ${cfg.package}/rest-api/db/migrations up - - PGRST_SERVER_CORS_ALLOWED_ORIGINS="https://${cfg.domain}" \ - PGRST_ADMIN_SERVER_PORT=${toString cfg.apiAdminPort} \ - PGRST_SERVER_PORT=${toString cfg.apiPort} \ - PGRST_DB_SCHEMAS="api" \ - PGRST_DB_ANON_ROLE="anon" \ - PGRST_OPENAPI_MODE="ignore-privileges" \ - PGRST_DB_URI=${dbUrl "authenticator"} \ - PGRST_JWT_SECRET="$JWT_SECRET" \ - ${lib.getExe pkgs.postgrest} - ''; - }; - - systemd.services.archtika-web = { - description = "archtika Web App service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = baseHardenedSystemdOptions // { - User = cfg.user; - Group = cfg.group; - Restart = "always"; - WorkingDirectory = "${cfg.package}/web-app"; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - ]; - }; - - environment = { - REGISTRATION_IS_DISABLED = toString cfg.settings.disableRegistration; - BODY_SIZE_LIMIT = "10M"; - ORIGIN = "https://${cfg.domain}"; - PORT = toString cfg.webAppPort; - }; - - script = "${lib.getExe pkgs.nodejs} ${cfg.package}/web-app"; - }; - - services.postgresql = { - enable = true; - ensureDatabases = [ cfg.databaseName ]; - extensions = ps: with ps; [ pgjwt ]; - authentication = lib.mkOverride 11 '' - local postgres postgres trust - local ${cfg.databaseName} all trust - ''; - }; - - systemd.services.postgresql = { - path = with pkgs; [ - gnutar - gzip - ]; - serviceConfig = { - ReadWritePaths = [ "/var/www/archtika-websites" ]; - SystemCallFilter = [ "@system-service" ]; - }; - }; - - services.nginx = { - enable = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - recommendedZstdSettings = true; - recommendedOptimisation = true; - - appendHttpConfig = '' - map $http_cookie $archtika_auth_header { - default ""; - "~*session_token=([^;]+)" "Bearer $1"; - } - ''; - - virtualHosts = { - "${cfg.domain}" = { - useACMEHost = cfg.domain; - forceSSL = true; - locations = { - "/" = { - proxyPass = "http://127.0.0.1:${toString cfg.webAppPort}"; - }; - "/previews/" = { - alias = "/var/www/archtika-websites/previews/"; - index = "index.html"; - tryFiles = "$uri $uri/ $uri.html =404"; - }; - "/api/rpc/export_articles_zip" = { - proxyPass = "http://127.0.0.1:${toString cfg.apiPort}/rpc/export_articles_zip"; - extraConfig = '' - default_type application/json; - proxy_set_header Authorization $archtika_auth_header; - ''; - }; - "/api/" = { - proxyPass = "http://127.0.0.1:${toString cfg.apiPort}/"; - extraConfig = '' - default_type application/json; - ''; - }; - "/api/rpc/register" = mkIf cfg.settings.disableRegistration { - extraConfig = '' - deny all; - ''; - }; - }; - }; - "~^(?.+)\\.${cfg.domain}$" = { - useACMEHost = cfg.domain; - forceSSL = true; - locations = { - "/" = { - root = "/var/www/archtika-websites/$subdomain"; - index = "index.html"; - tryFiles = "$uri $uri/ $uri.html =404"; - }; - }; - }; - }; - }; - } - ); - - meta.maintainers = [ lib.maintainers.thiloho ]; -} diff --git a/nixos/modules/services/web-apps/baikal.nix b/nixos/modules/services/web-apps/baikal.nix new file mode 100644 index 000000000000..91a007e6e541 --- /dev/null +++ b/nixos/modules/services/web-apps/baikal.nix @@ -0,0 +1,141 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + common-name = "baikal"; + cfg = config.services.baikal; +in +{ + meta.maintainers = [ lib.maintainers.wrvsrx ]; + options = { + services.baikal = { + enable = lib.mkEnableOption "baikal"; + user = lib.mkOption { + type = lib.types.str; + default = common-name; + description = '' + User account under which the web-application run. + ''; + }; + group = lib.mkOption { + type = lib.types.str; + default = common-name; + description = '' + Group account under which the web-application run. + ''; + }; + pool = lib.mkOption { + type = lib.types.str; + default = common-name; + description = '' + Name of existing phpfpm pool that is used to run web-application. + If not specified a pool will be created automatically with + default values. + ''; + }; + virtualHost = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = common-name; + description = '' + Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost. + ''; + }; + phpPackage = lib.mkOption { + type = lib.types.package; + default = pkgs.php; + defaultText = "pkgs.php"; + description = '' + php package to use for php fpm daemon. + ''; + }; + package = lib.mkOption { + type = lib.types.package; + default = pkgs.baikal; + defaultText = "pkgs.baikal"; + description = '' + Baikal package to use. + ''; + }; + + }; + }; + config = lib.mkIf cfg.enable { + services.phpfpm.pools = lib.mkIf (cfg.pool == "${common-name}") { + ${common-name} = { + inherit (cfg) user phpPackage; + phpEnv = { + "BAIKAL_PATH_CONFIG" = "/var/lib/baikal/config/"; + "BAIKAL_PATH_SPECIFIC" = "/var/lib/baikal/specific/"; + }; + settings = lib.mapAttrs (name: lib.mkDefault) { + "listen.owner" = "nginx"; + "listen.group" = "nginx"; + "listen.mode" = "0600"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 1; + "pm.min_spare_servers" = 1; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + "pm.process_idle_timeout" = 30; + "catch_workers_output" = 1; + }; + }; + }; + services.nginx = lib.mkIf (cfg.virtualHost != null) { + enable = true; + virtualHosts."${cfg.virtualHost}" = { + root = "${cfg.package}/share/php/baikal/html"; + locations = { + "/" = { + index = "index.php"; + }; + "/.well-known/".extraConfig = '' + rewrite ^/.well-known/caldav /dav.php redirect; + rewrite ^/.well-known/carddav /dav.php redirect; + ''; + "~ /(\.ht|Core|Specific|config)".extraConfig = '' + deny all; + return 404; + ''; + "~ ^(.+\.php)(.*)$".extraConfig = '' + try_files $fastcgi_script_name =404; + include ${config.services.nginx.package}/conf/fastcgi.conf; + fastcgi_split_path_info ^(.+\.php)(.*)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + ''; + }; + }; + }; + + users.users.${cfg.user} = lib.mkIf (cfg.user == common-name) { + description = "baikal service user"; + isSystemUser = true; + inherit (cfg) group; + }; + + users.groups.${cfg.group} = lib.mkIf (cfg.group == common-name) { }; + + systemd.tmpfiles.settings."baikal" = builtins.listToAttrs ( + map + (x: { + name = "/var/lib/baikal/${x}"; + value.d = { + mode = "0700"; + inherit (cfg) user group; + }; + }) + [ + "config" + "specific" + "specific/db" + ] + ); + }; +} diff --git a/nixos/modules/services/web-apps/cook-cli.nix b/nixos/modules/services/web-apps/cook-cli.nix new file mode 100644 index 000000000000..e1addb21318e --- /dev/null +++ b/nixos/modules/services/web-apps/cook-cli.nix @@ -0,0 +1,113 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.cook-cli; + inherit (lib) + mkIf + mkEnableOption + mkPackageOption + mkOption + getExe + types + ; +in +{ + options = { + services.cook-cli = { + enable = lib.mkEnableOption "cook-cli"; + + package = lib.mkPackageOption pkgs "cook-cli" { }; + + autoStart = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to start cook-cli server automatically. + ''; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 9080; + description = '' + Which port cook-cli server will use. + ''; + }; + + basePath = lib.mkOption { + type = lib.types.str; + default = "/var/lib/cook-cli"; + description = '' + Path to the directory cook-cli will look for recipes. + ''; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to open the cook-cli server port in the firewall. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.tmpfiles.rules = [ + "d ${cfg.basePath} 0770 cook-cli users" + ]; + + users.users.cook-cli = { + home = "${cfg.basePath}"; + group = "cook-cli"; + isSystemUser = true; + }; + users.groups.cook-cli.members = [ + "cook-cli" + ]; + + systemd.services.cook-cli = { + description = "cook-cli server"; + serviceConfig = { + ExecStart = "${getExe cfg.package} server --host --port ${toString cfg.port} ${cfg.basePath}"; + WorkingDirectory = cfg.basePath; + User = "cook-cli"; + Group = "cook-cli"; + # Hardening options + CapabilityBoundingSet = [ "CAP_SYS_NICE" ]; + AmbientCapabilities = [ "CAP_SYS_NICE" ]; + LockPersonality = true; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + ReadWritePaths = cfg.basePath; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + Restart = "on-failure"; + RestartSec = 5; + }; + wantedBy = mkIf cfg.autoStart [ "multi-user.target" ]; + wants = [ "network.target" ]; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + }; + + meta.maintainers = [ + lib.maintainers.luNeder + lib.maintainers.emilioziniades + ]; +} diff --git a/nixos/modules/services/web-apps/davis.md b/nixos/modules/services/web-apps/davis.md index 9775d8221b5b..d654f2fd7f43 100644 --- a/nixos/modules/services/web-apps/davis.md +++ b/nixos/modules/services/web-apps/davis.md @@ -24,9 +24,10 @@ After that, `davis` can be deployed like this: adminLogin = "admin"; adminPasswordFile = "/run/secrets/davis-admin-password"; appSecretFile = "/run/secrets/davis-app-secret"; - nginx = {}; }; } ``` This deploys Davis using a sqlite database running out of `/var/lib/davis`. + +Logs can be found in `/var/lib/davis/var/log/`. diff --git a/nixos/modules/services/web-apps/davis.nix b/nixos/modules/services/web-apps/davis.nix index 45748c346e2e..23a28ed84fd3 100644 --- a/nixos/modules/services/web-apps/davis.nix +++ b/nixos/modules/services/web-apps/davis.nix @@ -220,10 +220,13 @@ in }; nginx = lib.mkOption { - type = lib.types.submodule ( - lib.recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { } + type = lib.types.nullOr ( + lib.types.submodule ( + lib.recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { + } + ) ); - default = null; + default = { }; example = '' { serverAliases = [ @@ -235,7 +238,7 @@ in } ''; description = '' - With this option, you can customize the nginx virtualHost settings. + Use this option to customize an nginx virtual host. To disable the nginx set this to null. ''; }; @@ -308,18 +311,16 @@ in message = "One of services.davis.database.urlFile or services.davis.database.createLocally must be set."; } { - assertion = (mail.dsn != null) != (mail.dsnFile != null); - message = "One of (and only one of) services.davis.mail.dsn or services.davis.mail.dsnFile must be set."; + assertion = !(mail.dsn != null && mail.dsnFile != null); + message = "services.davis.mail.dsn and services.davis.mail.dsnFile cannot both be set."; } ]; services.davis.config = { APP_ENV = "prod"; APP_CACHE_DIR = "${cfg.dataDir}/var/cache"; - # note: we do not need the log dir (we log to stdout/journald), by davis/symfony will try to create it, and the default value is one in the nix-store - # so we set it to a path under dataDir to avoid something like: Unable to create the "logs" directory (/nix/store/5cfskz0ybbx37s1161gjn5klwb5si1zg-davis-4.4.1/var/log). APP_LOG_DIR = "${cfg.dataDir}/var/log"; - LOG_FILE_PATH = "/dev/stdout"; + LOG_FILE_PATH = "%kernel.logs_dir%/%kernel.environment%.log"; DATABASE_DRIVER = db.driver; INVITE_FROM_ADDRESS = mail.inviteFromAddress; APP_SECRET._secret = cfg.appSecretFile; @@ -330,7 +331,14 @@ in CALDAV_ENABLED = true; CARDDAV_ENABLED = true; } - // (if mail.dsn != null then { MAILER_DSN = mail.dsn; } else { MAILER_DSN._secret = mail.dsnFile; }) + // ( + if mail.dsn != null then + { MAILER_DSN = mail.dsn; } + else if mail.dsnFile != null then + { MAILER_DSN._secret = mail.dsnFile; } + else + { } + ) // ( if db.createLocally then { @@ -381,6 +389,7 @@ in APP_CACHE_DIR = "${cfg.dataDir}/var/cache"; APP_LOG_DIR = "${cfg.dataDir}/var/log"; }; + phpPackage = lib.mkDefault cfg.package.passthru.php; settings = { "listen.mode" = "0660"; diff --git a/nixos/modules/services/web-apps/dependency-track.nix b/nixos/modules/services/web-apps/dependency-track.nix index 129770926222..32f25e81f242 100644 --- a/nixos/modules/services/web-apps/dependency-track.nix +++ b/nixos/modules/services/web-apps/dependency-track.nix @@ -509,9 +509,27 @@ in upstreams.dependency-track.servers."localhost:${toString cfg.port}" = { }; virtualHosts.${cfg.nginx.domain} = { locations = { - "/".alias = "${cfg.package.frontend}/dist/"; + "/" = { + alias = "${cfg.package.frontend}/dist/"; + index = "index.html"; + tryFiles = "$uri $uri/ /index.html"; + extraConfig = '' + location ~ (index\.html)$ { + add_header Cache-Control "max-age=0, no-cache, no-store, must-revalidate"; + add_header Pragma "no-cache"; + add_header Expires 0; + } + ''; + }; "/api".proxyPass = "http://dependency-track"; - "= /static/config.json".alias = frontendConfigFile; + "= /static/config.json" = { + alias = frontendConfigFile; + extraConfig = '' + add_header Cache-Control "max-age=0, no-cache, no-store, must-revalidate"; + add_header Pragma "no-cache"; + add_header Expires 0; + ''; + }; }; }; }; diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 1d7b3c2ff7be..b454ed97744f 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -13,8 +13,8 @@ let cfg = config.services.discourse; opt = options.services.discourse; - # Keep in sync with https://github.com/discourse/discourse_docker/blob/main/image/base/slim.Dockerfile#L5 - upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_13; + # Keep in sync with https://github.com/discourse/discourse_docker/blob/main/image/base/Dockerfile PG_MAJOR + upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_15; postgresqlPackage = if config.services.postgresql.enable then config.services.postgresql.package else pkgs.postgresql; @@ -676,6 +676,8 @@ in dns_query_timeout_secs = null; regex_timeout_seconds = 2; allow_impersonation = true; + log_line_max_chars = 160000; + yjit_enabled = false; }; services.redis.servers.discourse = @@ -901,6 +903,9 @@ in extraConfig + '' proxy_set_header X-Request-Start "t=''${msec}"; + proxy_set_header X-Sendfile-Type ""; + proxy_set_header X-Accel-Mapping ""; + proxy_set_header Client-Ip ""; ''; }; cache = time: '' diff --git a/nixos/modules/services/web-apps/eintopf.nix b/nixos/modules/services/web-apps/eintopf.nix index c814e58f6aca..d9bf612042a0 100644 --- a/nixos/modules/services/web-apps/eintopf.nix +++ b/nixos/modules/services/web-apps/eintopf.nix @@ -15,14 +15,14 @@ in { options.services.eintopf = { - enable = mkEnableOption "Eintopf community event calendar web app"; + enable = mkEnableOption "Lauti (Eintopf) community event calendar web app"; settings = mkOption { type = types.attrsOf types.str; default = { }; description = '' Settings to configure web service. See - + for available options. ''; example = literalExpression '' @@ -54,7 +54,7 @@ in wants = [ "network-online.target" ]; environment = cfg.settings; serviceConfig = { - ExecStart = "${pkgs.eintopf}/bin/eintopf"; + ExecStart = lib.getExe pkgs.lauti; WorkingDirectory = "/var/lib/eintopf"; StateDirectory = "eintopf"; EnvironmentFile = [ cfg.secrets ]; diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix index 230e93737fdb..aec066112132 100644 --- a/nixos/modules/services/web-apps/gancio.nix +++ b/nixos/modules/services/web-apps/gancio.nix @@ -57,7 +57,7 @@ in default = "http${ lib.optionalString config.services.nginx.virtualHosts."${cfg.settings.hostname}".enableACME "s" }://${cfg.settings.hostname}"; - defaultText = lib.literalExpression ''"https://''${cfg.settings.hostname}"''; + defaultText = lib.literalExpression ''"https://''${config.services.gancio.settings.hostname}"''; example = "https://demo.gancio.org/gancio"; description = "The full URL under which the server is reachable."; }; @@ -89,9 +89,7 @@ in readOnly = true; type = types.nullOr types.str; default = if cfg.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null; - defaultText = '' - if cfg.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null - ''; + defaultText = ''if config.services.gancio.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null''; }; host = mkOption { description = '' @@ -100,9 +98,7 @@ in readOnly = true; type = types.nullOr types.str; default = if cfg.settings.db.dialect == "postgres" then "/run/postgresql" else null; - defaultText = '' - if cfg.settings.db.dialect == "postgres" then "/run/postgresql" else null - ''; + defaultText = ''if config.services.gancio.settings.db.dialect == "postgres" then "/run/postgresql" else null''; }; database = mkOption { description = '' @@ -111,9 +107,7 @@ in readOnly = true; type = types.nullOr types.str; default = if cfg.settings.db.dialect == "postgres" then cfg.user else null; - defaultText = '' - if cfg.settings.db.dialect == "postgres" then cfg.user else null - ''; + defaultText = ''if config.services.gancio.settings.db.dialect == "postgres" then cfg.user else null''; }; }; log_level = mkOption { @@ -174,10 +168,14 @@ in environment.systemPackages = [ (pkgs.runCommand "gancio" { } '' mkdir -p $out/bin - echo "#!${pkgs.runtimeShell} - cd /var/lib/gancio/ - exec ${lib.getExe cfg.package} ''${1:---help} - " > $out/bin/gancio + echo '#!${pkgs.runtimeShell} + cd /var/lib/gancio/ + sudo=exec + if [[ "$USER" != ${cfg.user} ]]; then + sudo="exec /run/wrappers/bin/sudo -u ${cfg.user}" + fi + $sudo ${lib.getExe cfg.package} "''${@:--help}" + ' > $out/bin/gancio chmod +x $out/bin/gancio '') ]; diff --git a/nixos/modules/services/web-apps/gerrit.nix b/nixos/modules/services/web-apps/gerrit.nix index d7d19ad84c05..2fc4c349b58c 100644 --- a/nixos/modules/services/web-apps/gerrit.nix +++ b/nixos/modules/services/web-apps/gerrit.nix @@ -261,6 +261,7 @@ in meta.maintainers = with lib.maintainers; [ edef zimbatm + felixsinger ]; # uses attributes of the linked package meta.buildDocsInSandbox = false; diff --git a/nixos/modules/services/web-apps/glance.nix b/nixos/modules/services/web-apps/glance.nix index 69170858f7c8..ff5fd1195639 100644 --- a/nixos/modules/services/web-apps/glance.nix +++ b/nixos/modules/services/web-apps/glance.nix @@ -8,15 +8,27 @@ let cfg = config.services.glance; inherit (lib) - mkEnableOption - mkPackageOption - mkOption - mkIf + catAttrs + concatMapStrings getExe + mkEnableOption + mkIf + mkOption + mkPackageOption types ; + inherit (builtins) + concatLists + isAttrs + isList + attrNames + getAttr + ; + settingsFormat = pkgs.formats.yaml { }; + settingsFile = settingsFormat.generate "glance.yaml" cfg.settings; + mergedSettingsFile = "/run/glance/glance.yaml"; in { options.services.glance = { @@ -69,7 +81,9 @@ in { type = "calendar"; } { type = "weather"; - location = "Nivelles, Belgium"; + location = { + _secret = "/var/lib/secrets/glance/location"; + }; } ]; } @@ -84,6 +98,13 @@ in Configuration written to a yaml file that is read by glance. See for more. + + Settings containing secret data should be set to an + attribute set containing the attribute + _secret - a string pointing to a file + containing the value the option should be set to. See the + example in `services.glance.settings.pages` at the weather widget + with a location secret to get a better picture of this. ''; }; @@ -102,13 +123,41 @@ in description = "Glance feed dashboard server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + path = [ pkgs.replace-secret ]; serviceConfig = { - ExecStart = + ExecStartPre = let - glance-yaml = settingsFormat.generate "glance.yaml" cfg.settings; + findSecrets = + data: + if isAttrs data then + if data ? _secret then + [ data ] + else + concatLists (map (attr: findSecrets (getAttr attr data)) (attrNames data)) + else if isList data then + concatLists (map findSecrets data) + else + [ ]; + secretPaths = catAttrs "_secret" (findSecrets cfg.settings); + mkSecretReplacement = secretPath: '' + replace-secret ${ + lib.escapeShellArgs [ + "_secret: ${secretPath}" + secretPath + mergedSettingsFile + ] + } + ''; + secretReplacements = concatMapStrings mkSecretReplacement secretPaths; in - "${getExe cfg.package} --config ${glance-yaml}"; + # Use "+" to run as root because the secrets may not be accessible to glance + "+" + + pkgs.writeShellScript "glance-start-pre" '' + install -m 600 -o $USER ${settingsFile} ${mergedSettingsFile} + ${secretReplacements} + ''; + ExecStart = "${getExe cfg.package} --config ${mergedSettingsFile}"; WorkingDirectory = "/var/lib/glance"; StateDirectory = "glance"; RuntimeDirectory = "glance"; diff --git a/nixos/modules/services/web-apps/homebox.nix b/nixos/modules/services/web-apps/homebox.nix index f2e17a1b85f0..132cc874d5c1 100644 --- a/nixos/modules/services/web-apps/homebox.nix +++ b/nixos/modules/services/web-apps/homebox.nix @@ -23,7 +23,8 @@ in defaultText = lib.literalExpression '' { HBOX_STORAGE_DATA = "/var/lib/homebox/data"; - HBOX_STORAGE_SQLITE_URL = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1"; + HBOX_DATABASE_DRIVER = "sqlite3"; + HBOX_DATABASE_SQLITE_PATH = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1"; HBOX_OPTIONS_ALLOW_REGISTRATION = "false"; HBOX_OPTIONS_CHECK_GITHUB_RELEASE = "false"; HBOX_MODE = "production"; @@ -34,6 +35,15 @@ in [documentation](https://homebox.software/en/configure-homebox.html). ''; }; + database = { + createLocally = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Configure local PostgreSQL database server for Homebox. + ''; + }; + }; }; config = mkIf cfg.enable { @@ -42,15 +52,37 @@ in group = "homebox"; }; users.groups.homebox = { }; - services.homebox.settings = { - HBOX_STORAGE_DATA = mkDefault "/var/lib/homebox/data"; - HBOX_STORAGE_SQLITE_URL = mkDefault "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1"; - HBOX_OPTIONS_ALLOW_REGISTRATION = mkDefault "false"; - HBOX_OPTIONS_CHECK_GITHUB_RELEASE = mkDefault "false"; - HBOX_MODE = mkDefault "production"; + services.homebox.settings = lib.mkMerge [ + (lib.mapAttrs (_: mkDefault) { + HBOX_STORAGE_DATA = "/var/lib/homebox/data"; + HBOX_DATABASE_DRIVER = "sqlite3"; + HBOX_DATABASE_SQLITE_PATH = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1"; + HBOX_OPTIONS_ALLOW_REGISTRATION = "false"; + HBOX_OPTIONS_CHECK_GITHUB_RELEASE = "false"; + HBOX_MODE = "production"; + }) + + (lib.mkIf cfg.database.createLocally { + HBOX_DATABASE_DRIVER = "postgres"; + HBOX_DATABASE_HOST = "/run/postgresql"; + HBOX_DATABASE_USERNAME = "homebox"; + HBOX_DATABASE_DATABASE = "homebox"; + HBOX_DATABASE_PORT = toString config.services.postgresql.settings.port; + }) + ]; + services.postgresql = lib.mkIf cfg.database.createLocally { + enable = true; + ensureDatabases = [ "homebox" ]; + ensureUsers = [ + { + name = "homebox"; + ensureDBOwnership = true; + } + ]; }; systemd.services.homebox = { - after = [ "network.target" ]; + requires = lib.optional cfg.database.createLocally "postgresql.service"; + after = lib.optional cfg.database.createLocally "postgresql.service"; environment = cfg.settings; serviceConfig = { User = "homebox"; @@ -80,6 +112,7 @@ in ProcSubset = "pid"; ProtectSystem = "strict"; RestrictAddressFamilies = [ + "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" diff --git a/nixos/modules/services/web-apps/immich-public-proxy.nix b/nixos/modules/services/web-apps/immich-public-proxy.nix index 85238e1cbacf..817c79bd534c 100644 --- a/nixos/modules/services/web-apps/immich-public-proxy.nix +++ b/nixos/modules/services/web-apps/immich-public-proxy.nix @@ -92,7 +92,6 @@ in }; networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; - - meta.maintainers = with lib.maintainers; [ jaculabilis ]; }; + meta.maintainers = with lib.maintainers; [ jaculabilis ]; } diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index cc7d5ff6f39e..a647b552678f 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -389,7 +389,6 @@ in }; }; users.groups = mkIf (cfg.group == "immich") { immich = { }; }; - - meta.maintainers = with lib.maintainers; [ jvanbruegge ]; }; + meta.maintainers = with lib.maintainers; [ jvanbruegge ]; } diff --git a/nixos/modules/services/web-apps/karakeep.nix b/nixos/modules/services/web-apps/karakeep.nix new file mode 100644 index 000000000000..14ec552a41d6 --- /dev/null +++ b/nixos/modules/services/web-apps/karakeep.nix @@ -0,0 +1,225 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.karakeep; + + karakeepEnv = lib.mkMerge [ + { DATA_DIR = "/var/lib/karakeep"; } + (lib.mkIf cfg.meilisearch.enable { + MEILI_ADDR = "http://127.0.0.1:${toString config.services.meilisearch.listenPort}"; + }) + (lib.mkIf cfg.browser.enable { + BROWSER_WEB_URL = "http://127.0.0.1:${toString cfg.browser.port}"; + }) + cfg.extraEnvironment + ]; + + environmentFiles = [ + "/var/lib/karakeep/settings.env" + ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile); +in +{ + options = { + services.karakeep = { + enable = lib.mkEnableOption "Enable the Karakeep service"; + package = lib.mkPackageOption pkgs "karakeep" { }; + + extraEnvironment = lib.mkOption { + description = '' + Environment variables to pass to Karakaeep. This is how most settings + can be configured. Changing DATA_DIR is possible but not supported. + + See https://docs.karakeep.app/configuration/ + ''; + type = lib.types.attrsOf lib.types.str; + default = { }; + example = lib.literalExpression '' + { + PORT = "1234"; + DISABLE_SIGNUPS = "true"; + DISABLE_NEW_RELEASE_CHECK = "true"; + } + ''; + }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + An optional path to an environment file that will be used in the web and workers + services. This is useful for loading private keys. + ''; + example = "/var/lib/karakeep/secrets.env"; + }; + + browser = { + enable = lib.mkOption { + description = '' + Enable the karakeep-browser service that runs a chromium instance in + the background with debugging ports exposed. This is necessary for + certain features like screenshots. + ''; + type = lib.types.bool; + default = true; + }; + port = lib.mkOption { + description = "The port the browser should run on."; + type = lib.types.port; + default = 9222; + }; + exe = lib.mkOption { + description = "The browser executable (must be Chrome-like)."; + type = lib.types.str; + default = "${pkgs.chromium}/bin/chromium"; + defaultText = lib.literalExpression "\${pkgs.chromium}/bin/chromium"; + example = lib.literalExpression "\${pkgs.google-chrome}/bin/google-chrome-stable"; + }; + }; + + meilisearch = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Enable Meilisearch and configure Karakeep to use it. Meilisearch is + required for text search. + ''; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + users.groups.karakeep = { }; + users.users.karakeep = { + isSystemUser = true; + group = "karakeep"; + }; + + services.meilisearch = lib.mkIf cfg.meilisearch.enable { + enable = true; + }; + + systemd.services.karakeep-init = { + description = "Initialize Karakeep Data"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + partOf = [ "karakeep.service" ]; + path = [ pkgs.openssl ]; + script = '' + umask 0077 + + if [ ! -f "$STATE_DIRECTORY/settings.env" ]; then + cat <"$STATE_DIRECTORY/settings.env" + # Generated by NixOS Karakeep module + MEILI_MASTER_KEY=$(openssl rand -base64 36) + NEXTAUTH_SECRET=$(openssl rand -base64 36) + EOF + fi + + export DATA_DIR="$STATE_DIRECTORY" + exec "${cfg.package}/lib/karakeep/migrate" + ''; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "karakeep"; + Group = "karakeep"; + StateDirectory = "karakeep"; + PrivateTmp = "yes"; + }; + }; + + systemd.services.karakeep-workers = { + description = "Karakeep Workers"; + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "karakeep-init.service" + ]; + partOf = [ "karakeep.service" ]; + path = [ + pkgs.monolith + pkgs.yt-dlp + ]; + environment = karakeepEnv; + serviceConfig = { + User = "karakeep"; + Group = "karakeep"; + ExecStart = "${cfg.package}/lib/karakeep/start-workers"; + StateDirectory = "karakeep"; + EnvironmentFile = environmentFiles; + PrivateTmp = "yes"; + }; + }; + + systemd.services.karakeep-web = { + description = "Karakeep Web"; + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "karakeep-init.service" + "karakeep-workers.service" + ]; + partOf = [ "karakeep.service" ]; + environment = karakeepEnv; + serviceConfig = { + ExecStart = "${cfg.package}/lib/karakeep/start-web"; + User = "karakeep"; + Group = "karakeep"; + StateDirectory = "karakeep"; + EnvironmentFile = environmentFiles; + PrivateTmp = "yes"; + }; + }; + + systemd.services.karakeep-browser = lib.mkIf cfg.browser.enable { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + partOf = [ "karakeep.service" ]; + script = '' + export HOME="$CACHE_DIRECTORY" + exec ${cfg.browser.exe} \ + --headless --no-sandbox --disable-gpu --disable-dev-shm-usage \ + --remote-debugging-address=127.0.0.1 \ + --remote-debugging-port=${toString cfg.browser.port} \ + --hide-scrollbars \ + --user-data-dir="$STATE_DIRECTORY" + ''; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + + CacheDirectory = "karakeep-browser"; + StateDirectory = "karakeep-browser"; + + DevicePolicy = "closed"; + DynamicUser = true; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RestrictNamespaces = true; + RestrictRealtime = true; + }; + }; + }; + + meta = { + maintainers = [ lib.maintainers.three ]; + }; +} diff --git a/nixos/modules/services/web-apps/kimai.nix b/nixos/modules/services/web-apps/kimai.nix index 47e1dfc20981..4ca464489b47 100644 --- a/nixos/modules/services/web-apps/kimai.nix +++ b/nixos/modules/services/web-apps/kimai.nix @@ -324,12 +324,14 @@ in ${pkg hostName cfg}/bin/console lint:yaml --parse-tags \ ${pkg hostName cfg}/share/php/kimai/config - # Run kimai:install to ensure database is created or updated. + # Before running any further console commands, clear cache. This + # avoids errors due to old cache getting used with new version + # of Kimai. + ${pkg hostName cfg}/bin/console cache:clear --env=prod + # Then, run kimai:install to ensure database is created or updated. # Note that kimai:update is an alias to kimai:install. ${pkg hostName cfg}/bin/console kimai:install --no-cache - # Clear cache and warmup cache separately, to avoid "Cannot declare - # class App\Entity\Timesheet" error on first init after upgrade. - ${pkg hostName cfg}/bin/console cache:clear --env=prod + # Finally, warm up cache. ${pkg hostName cfg}/bin/console cache:warmup --env=prod ''; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 80352fc4c920..da6a09a00101 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -55,6 +55,9 @@ let // 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 && cfg.elasticsearch.prefix != null) { + ES_PREFIX = cfg.elasticsearch.prefix; + } // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PRESET = cfg.elasticsearch.preset; } // lib.optionalAttrs (cfg.elasticsearch.user != null) { ES_USER = cfg.elasticsearch.user; } // cfg.extraConfig; @@ -670,6 +673,16 @@ in default = 9200; }; + prefix = lib.mkOption { + description = '' + If provided, adds a prefix to indexes in Elasticsearch. This allows to use the same + Elasticsearch cluster between different projects or Mastodon servers. + ''; + type = lib.types.nullOr lib.types.str; + default = null; + example = "mastodon"; + }; + preset = lib.mkOption { description = '' It controls the ElasticSearch indices configuration (number of shards and replica). diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index b1352778fee0..dce0774b07ee 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -41,9 +41,15 @@ let # The directory to store mutable data within dataDir. mutableDataDir = "${cfg.dataDir}/data"; - # The plugin directory. Note that this is the *post-unpack* plugin directory, - # since Mattermost unpacks plugins to put them there. (Hence, mutable data.) - pluginDir = "${mutableDataDir}/plugins"; + # The plugin directory. Note that this is the *pre-unpack* plugin directory, + # since Mattermost looks in mutableDataDir for a directory called "plugins". + # If Mattermost is installed with plugins defined in a Nix configuration, the plugins + # are symlinked here. Otherwise, this is a real directory and the tarballs are uploaded here. + pluginTarballDir = "${mutableDataDir}/plugins"; + + # We need a different unpack directory for Mattermost to sync things to at launch, + # since the above may be a symlink to the store. + pluginUnpackDir = "${mutableDataDir}/.plugins"; # Mattermost uses this as a staging directory to unpack plugins, among possibly other things. # Ensure that it's inside mutableDataDir since it can get rather large. @@ -147,34 +153,34 @@ let else throw "Invalid database driver: ${cfg.database.driver}"; - mattermostPluginDerivations = - with pkgs; - map ( - plugin: - stdenv.mkDerivation { - name = "mattermost-plugin"; - installPhase = '' - mkdir -p $out/share - cp ${plugin} $out/share/plugin.tar.gz - ''; - dontUnpack = true; - dontPatch = true; - dontConfigure = true; - dontBuild = true; - preferLocalBuild = true; - } - ) cfg.plugins; + mattermostPluginDerivations = map ( + plugin: + pkgs.stdenvNoCC.mkDerivation { + name = "${cfg.package.name}-plugin"; + installPhase = '' + runHook preInstall + mkdir -p $out/share + ln -sf ${plugin} $out/share/plugin.tar.gz + runHook postInstall + ''; + dontUnpack = true; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + preferLocalBuild = true; + } + ) cfg.plugins; mattermostPlugins = - with pkgs; if mattermostPluginDerivations == [ ] then null else - stdenv.mkDerivation { + pkgs.stdenvNoCC.mkDerivation { name = "${cfg.package.name}-plugins"; - nativeBuildInputs = [ autoPatchelfHook ] ++ mattermostPluginDerivations; + nativeBuildInputs = [ pkgs.autoPatchelfHook ] ++ mattermostPluginDerivations; buildInputs = [ cfg.package ]; installPhase = '' + runHook preInstall mkdir -p $out plugins=(${ escapeShellArgs (map (plugin: "${plugin}/share/plugin.tar.gz") mattermostPluginDerivations) @@ -187,6 +193,7 @@ let GZIP_OPT=-9 tar -C "$hash" -cvzf "$out/$hash.tar.gz" . rm -rf "$hash" done + runHook postInstall ''; dontUnpack = true; @@ -231,9 +238,12 @@ let services.mattermost.environmentFile = ""; services.mattermost.database.fromEnvironment = true; '' database; - FileSettings.Directory = cfg.dataDir; - PluginSettings.Directory = "${pluginDir}/server"; - PluginSettings.ClientDirectory = "${pluginDir}/client"; + + # Note that the plugin tarball directory is not configurable, and is expected to be in FileSettings.Directory/plugins. + FileSettings.Directory = mutableDataDir; + PluginSettings.Directory = "${pluginUnpackDir}/server"; + PluginSettings.ClientDirectory = "${pluginUnpackDir}/client"; + LogSettings = { FileLocation = cfg.logDir; @@ -254,8 +264,8 @@ let } ); - mattermostConfJSON = pkgs.writeText "mattermost-config.json" (builtins.toJSON mattermostConf); - + format = pkgs.formats.json { }; + finalConfig = format.generate "mattermost-config.json" mattermostConf; in { imports = [ @@ -454,9 +464,9 @@ in the options specified in services.mattermost will be generated but won't be overwritten on changes or rebuilds. - If this option is disabled, changes in the system console won't - be possible (default). If an config.json is present, it will be - overwritten! + If this option is disabled, persistent changes in the system + console won't be possible (the default). If a config.json is + present, it will be overwritten at service start! ''; }; @@ -480,7 +490,20 @@ in description = '' Plugins to add to the configuration. Overrides any installed if non-null. This is a list of paths to .tar.gz files or derivations evaluating to - .tar.gz files. + .tar.gz files. You can use `mattermost.buildPlugin` to build plugins; + see the NixOS documentation for more details. + ''; + }; + + pluginsBundle = mkOption { + type = with types; nullOr package; + default = mattermostPlugins; + defaultText = '' + All entries in {config}`services.mattermost.plugins`, repacked + ''; + description = '' + Derivation building to a directory of plugin tarballs. + This overrides {option}`services.mattermost.plugins` if provided. ''; }; @@ -508,7 +531,8 @@ in type = with types; attrsOf (either int str); default = { }; description = '' - Extra environment variables to export to the Mattermost process, in the systemd unit. + Extra environment variables to export to the Mattermost process + from the systemd unit configuration. ''; example = { MM_SERVICESETTINGS_SITEURL = "http://example.com"; @@ -524,11 +548,11 @@ in for mattermost (see [the Mattermost documentation](https://docs.mattermost.com/configure/configuration-settings.html#environment-variables)). Settings defined in the environment file will overwrite settings - set via nix or via the {option}`services.mattermost.extraConfig` + set via Nix or via the {option}`services.mattermost.extraConfig` option. Useful for setting config options without their value ending up in the - (world-readable) nix store, e.g. for a database password. + (world-readable) Nix store, e.g. for a database password. ''; }; @@ -639,13 +663,13 @@ in if cfg.database.driver == "postgres" then { sslmode = "disable"; - connect_timeout = 30; + connect_timeout = 60; } else if cfg.database.driver == "mysql" then { charset = "utf8mb4,utf8"; - writeTimeout = "30s"; - readTimeout = "30s"; + writeTimeout = "60s"; + readTimeout = "60s"; } else throw "Invalid database driver ${cfg.database.driver}"; @@ -653,13 +677,13 @@ in if config.mattermost.database.driver == "postgres" then { sslmode = "disable"; - connect_timeout = 30; + connect_timeout = 60; } else if config.mattermost.database.driver == "mysql" then { charset = "utf8mb4,utf8"; - writeTimeout = "30s"; - readTimeout = "30s"; + writeTimeout = "60s"; + readTimeout = "60s"; } else throw "Invalid database driver"; @@ -687,7 +711,7 @@ in }; settings = mkOption { - type = types.attrs; + inherit (format) type; default = { }; description = '' Additional configuration options as Nix attribute set in config.json schema. @@ -785,9 +809,9 @@ in "R- ${tempDir} - - - - -" "d= ${tempDir} 0750 ${cfg.user} ${cfg.group} - -" - # Ensure that pluginDir is a directory, as it could be a symlink on prior versions. - "r- ${pluginDir} - - - - -" - "d= ${pluginDir} 0750 ${cfg.user} ${cfg.group} - -" + # Ensure that pluginUnpackDir is a directory. + # Don't remove or clean it out since it should be persistent, as this is where plugins are unpacked. + "d= ${pluginUnpackDir} 0750 ${cfg.user} ${cfg.group} - -" # Ensure that the plugin directories exist. "d= ${mattermostConf.PluginSettings.Directory} 0750 ${cfg.user} ${cfg.group} - -" @@ -801,15 +825,14 @@ in "L+ ${cfg.dataDir}/client - - - - ${cfg.package}/client" ] ++ ( - if mattermostPlugins == null then - # Create the plugin tarball directory if it's a symlink. + if cfg.pluginsBundle == null then + # Create the plugin tarball directory to allow plugin uploads. [ - "r- ${cfg.dataDir}/plugins - - - - -" - "d= ${cfg.dataDir}/plugins 0750 ${cfg.user} ${cfg.group} - -" + "d= ${pluginTarballDir} 0750 ${cfg.user} ${cfg.group} - -" ] else - # Symlink the plugin tarball directory, removing anything existing. - [ "L+ ${cfg.dataDir}/plugins - - - - ${mattermostPlugins}" ] + # Symlink the plugin tarball directory, removing anything existing, since it's managed by Nix. + [ "L+ ${pluginTarballDir} - - - - ${cfg.pluginsBundle}" ] ); systemd.services.mattermost = rec { @@ -836,7 +859,7 @@ in configDir=${escapeShellArg cfg.configDir} logDir=${escapeShellArg cfg.logDir} package=${escapeShellArg cfg.package} - nixConfig=${escapeShellArg mattermostConfJSON} + nixConfig=${escapeShellArg finalConfig} '' + optionalString (versionAtLeast config.system.stateVersion "25.05") '' # Migrate configs in the pre-25.05 directory structure. @@ -853,12 +876,13 @@ in # Logs too. oldLogs="$dataDir/logs" newLogs="$logDir" - if [ "$oldLogs" != "$newLogs" ] && [ -d "$oldLogs" ]; then + if [ "$oldLogs" != "$newLogs" ] && [ -d "$oldLogs" ] && [ ! -f "$newLogs/.initial-created" ]; then # Migrate the legacy log location to the new log location. # Allow this to fail if there aren't any logs to move. echo "Moving legacy logs at $oldLogs to $newLogs" >&2 mkdir -p "$newLogs" mv "$oldLogs"/* "$newLogs" || true + touch "$newLogs/.initial-created" fi '' + optionalString (!cfg.mutableConfig) '' diff --git a/nixos/modules/services/web-apps/mealie.nix b/nixos/modules/services/web-apps/mealie.nix index 48b0450eac2d..b8f65b1fb98e 100644 --- a/nixos/modules/services/web-apps/mealie.nix +++ b/nixos/modules/services/web-apps/mealie.nix @@ -50,13 +50,24 @@ in Expects the format of an `EnvironmentFile=`, as described by {manpage}`systemd.exec(5)`. ''; }; + + database = { + createLocally = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Configure local PostgreSQL database server for Mealie. + ''; + }; + }; }; config = lib.mkIf cfg.enable { systemd.services.mealie = { description = "Mealie, a self hosted recipe manager and meal planner"; - after = [ "network-online.target" ]; + after = [ "network-online.target" ] ++ lib.optional cfg.database.createLocally "postgresql.service"; + requires = lib.optional cfg.database.createLocally "postgresql.service"; wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; @@ -65,7 +76,7 @@ in API_PORT = toString cfg.port; BASE_URL = "http://localhost:${toString cfg.port}"; DATA_DIR = "/var/lib/mealie"; - CRF_MODEL_PATH = "/var/lib/mealie/model.crfmodel"; + NLTK_DATA = pkgs.nltk-data.averaged-perceptron-tagger-eng; } // (builtins.mapAttrs (_: val: toString val) cfg.settings); serviceConfig = { @@ -78,5 +89,21 @@ in StandardOutput = "journal"; }; }; + + services.mealie.settings = lib.mkIf cfg.database.createLocally { + DB_ENGINE = "postgres"; + POSTGRES_URL_OVERRIDE = "postgresql://mealie:@/mealie?host=/run/postgresql"; + }; + + services.postgresql = lib.mkIf cfg.database.createLocally { + enable = true; + ensureDatabases = [ "mealie" ]; + ensureUsers = [ + { + name = "mealie"; + ensureDBOwnership = true; + } + ]; + }; }; } diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix index 7890e005f506..e9a00878606a 100644 --- a/nixos/modules/services/web-apps/movim.nix +++ b/nixos/modules/services/web-apps/movim.nix @@ -58,7 +58,7 @@ let // lib.optionalAttrs (cfg.database.type == "postgresql") { withPostgreSQL = true; } - // lib.optionalAttrs (cfg.database.type == "mysql") { + // lib.optionalAttrs (cfg.database.type == "mariadb") { withMySQL = true; } ); @@ -168,7 +168,7 @@ let dbService = { "postgresql" = "postgresql.service"; - "mysql" = "mysql.service"; + "mariadb" = "mysql.service"; } .${cfg.database.type}; @@ -475,10 +475,10 @@ in database = { type = mkOption { type = types.enum [ - "mysql" + "mariadb" "postgresql" ]; - example = "mysql"; + example = "mariadb"; default = "postgresql"; description = "Database engine to use."; }; @@ -621,7 +621,7 @@ in DB_DRIVER = { "postgresql" = "pgsql"; - "mysql" = "mysql"; + "mariadb" = "mysql"; } .${cfg.database.type}; DB_HOST = "localhost"; @@ -791,7 +791,7 @@ in } ); - mysql = mkIf (cfg.database.createLocally && cfg.database.type == "mysql") { + mysql = mkIf (cfg.database.createLocally && cfg.database.type == "mariadb") { enable = mkDefault true; package = mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 4b3be5e9fda3..6f92c0ca5e58 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -9,6 +9,11 @@ with lib; let cfg = config.services.nextcloud; + + overridePackage = cfg.package.override { + inherit (config.security.pki) caBundle; + }; + fpm = config.services.phpfpm.pools.nextcloud; jsonFormat = pkgs.formats.json { }; @@ -51,13 +56,13 @@ let }; webroot = - pkgs.runCommand "${cfg.package.name or "nextcloud"}-with-apps" + pkgs.runCommand "${overridePackage.name or "nextcloud"}-with-apps" { preferLocalBuild = true; } '' mkdir $out - ln -sfv "${cfg.package}"/* "$out" + ln -sfv "${overridePackage}"/* "$out" ${concatStrings ( mapAttrsToList ( name: store: @@ -116,7 +121,8 @@ let ++ (lib.optional (cfg.config.objectstore.s3.enable) "s3_secret:${cfg.config.objectstore.s3.secretFile}") ++ (lib.optional ( cfg.config.objectstore.s3.sseCKeyFile != null - ) "s3_sse_c_key:${cfg.config.objectstore.s3.sseCKeyFile}"); + ) "s3_sse_c_key:${cfg.config.objectstore.s3.sseCKeyFile}") + ++ (lib.optional (cfg.secretFile != null) "secret_file:${cfg.secretFile}"); requiresRuntimeSystemdCredentials = (lib.length runtimeSystemdCredentials) != 0; @@ -184,8 +190,8 @@ let mysqlLocal = cfg.database.createLocally && cfg.config.dbtype == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.config.dbtype == "pgsql"; - nextcloudGreaterOrEqualThan = versionAtLeast cfg.package.version; - nextcloudOlderThan = versionOlder cfg.package.version; + nextcloudGreaterOrEqualThan = versionAtLeast overridePackage.version; + nextcloudOlderThan = versionOlder overridePackage.version; # https://github.com/nextcloud/documentation/pull/11179 ocmProviderIsNotAStaticDirAnymore = @@ -195,7 +201,6 @@ let overrideConfig = let c = cfg.config; - requiresReadSecretFunction = c.dbpassFile != null || c.objectstore.s3.enable; objectstoreConfig = let s3 = c.objectstore.s3; @@ -205,7 +210,7 @@ let 'class' => '\\OC\\Files\\ObjectStore\\S3', 'arguments' => [ 'bucket' => '${s3.bucket}', - 'autocreate' => ${boolToString s3.autocreate}, + 'verify_bucket_exists' => ${boolToString s3.verify_bucket_exists}, 'key' => '${s3.key}', 'secret' => nix_read_secret('s3_secret'), ${optionalString (s3.hostname != null) "'hostname' => '${s3.hostname}',"} @@ -232,7 +237,7 @@ let in pkgs.writeText "nextcloud-config.php" '' for more information. + ''; + default = { }; + + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options = { + ListenAddressSingleHTTPFrontend = lib.mkOption { + type = lib.types.str; + description = '' + The address to listen on for the internal "microproxy" frontend. + ''; + default = "127.0.0.1:8000"; + example = "0.0.0.0:8000"; + }; + }; + }; + }; + + extraConfigFiles = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + example = [ "/run/secrets/olivetin.yaml" ]; + description = '' + Config files to merge into the settings defined in [](#opt-services.olivetin.settings). + This is useful to avoid putting secrets into the nix store. + See for more information. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + services.olivetin = { + path = with pkgs; [ bash ]; + }; + + systemd.services.olivetin = { + description = "OliveTin"; + + wantedBy = [ "multi-user.target" ]; + + wants = [ + "network-online.target" + "local-fs.target" + ]; + after = [ + "network-online.target" + "local-fs.target" + ]; + + inherit (cfg) path; + + preStart = '' + tmp="$(mktemp -d)" + trap 'rm -rf "$tmp"' EXIT + cd "$tmp" + + cp ${settingsFormat.generate "olivetin-config.yaml" cfg.settings} config.yaml + chmod +w config.yaml + for ((i=0; i < ${toString (lib.length cfg.extraConfigFiles)}; i++)); do + ${lib.getExe pkgs.yq} -yi ' + def merge($y): + . as $x | + if ($x | type == "object") and ($y | type == "object") then + $x + $y + with_entries(select(.key | in($y)) | .key as $key | .value |= merge($y[$key])) + elif ($x | type == "array") and ($y | type == "array") then + $x + $y + else + $y + end; + merge($f | fromjson) + ' config.yaml --rawfile f <(${lib.getExe pkgs.yq} -c . "$CREDENTIALS_DIRECTORY/config-$i.yaml") + done + chmod -w config.yaml + + mkdir -p /run/olivetin/config + mv config.yaml /run/olivetin/config/config.yaml + ''; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + RuntimeDirectory = "olivetin"; + Restart = "always"; + + LoadCredential = lib.imap0 (i: path: "config-${toString i}.yaml:${path}") cfg.extraConfigFiles; + + ExecStart = "${lib.getExe cfg.package} -configdir /run/olivetin/config"; + }; + }; + + users.users = lib.mkIf (cfg.user == "olivetin") { + olivetin = { + group = cfg.group; + isSystemUser = true; + }; + }; + + users.groups = lib.mkIf (cfg.group == "olivetin") { olivetin = { }; }; + }; +} diff --git a/nixos/modules/services/web-apps/oncall.nix b/nixos/modules/services/web-apps/oncall.nix new file mode 100644 index 000000000000..cd842606f278 --- /dev/null +++ b/nixos/modules/services/web-apps/oncall.nix @@ -0,0 +1,203 @@ +{ + config, + lib, + pkgs, + ... +}: +let + + cfg = config.services.oncall; + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "oncall_extra_settings.yaml" cfg.settings; + +in +{ + options.services.oncall = { + + enable = lib.mkEnableOption "Oncall web app"; + + package = lib.mkPackageOption pkgs "oncall" { }; + + database.createLocally = lib.mkEnableOption "Create the database and database user locally." // { + default = true; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + oncall_host = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = "FQDN for the Oncall instance."; + }; + db.conn = { + kwargs = { + user = lib.mkOption { + type = lib.types.str; + default = "oncall"; + description = "Database user."; + }; + host = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = "Database host."; + }; + database = lib.mkOption { + type = lib.types.str; + default = "oncall"; + description = "Database name."; + }; + }; + str = lib.mkOption { + type = lib.types.str; + default = "%(scheme)s://%(user)s@%(host)s:%(port)s/%(database)s?charset=%(charset)s&unix_socket=/run/mysqld/mysqld.sock"; + description = '' + Database connection scheme. The default specifies the + connection through a local socket. + ''; + }; + require_auth = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether authentication is required to access the web app. + ''; + }; + }; + }; + }; + default = { }; + description = '' + Extra configuration options to append or override. + For available and default option values see + [upstream configuration file](https://github.com/linkedin/oncall/blob/master/configs/config.yaml) + and the administration part in the + [offical documentation](https://oncall.tools/docs/admin_guide.html). + ''; + }; + + secretFile = lib.mkOption { + type = lib.types.pathWith { + inStore = false; + absolute = true; + }; + example = "/run/keys/oncall-dbpassword"; + description = '' + A YAML file containing secrets such as database or user passwords. + Some variables that can be considered secrets are: + + - db.conn.kwargs.password: + Password used to authenticate to the database. + + - session.encrypt_key: + Key for encrypting/signing session cookies. + Change to random long values in production. + + - session.sign_key: + Key for encrypting/signing session cookies. + Change to random long values in production. + ''; + }; + + }; + + config = lib.mkIf cfg.enable { + + # Disable debug, only needed for development + services.oncall.settings = lib.mkMerge [ + ({ + debug = lib.mkDefault false; + auth.debug = lib.mkDefault false; + }) + ]; + + services.uwsgi = { + enable = true; + plugins = [ "python3" ]; + user = "oncall"; + instance = { + type = "emperor"; + vassals = { + oncall = { + type = "normal"; + env = [ + "PYTHONPATH=${pkgs.oncall.pythonPath}" + ( + "ONCALL_EXTRA_CONFIG=" + + (lib.concatStringsSep "," ( + [ configFile ] ++ lib.optional (cfg.secretFile != null) cfg.secretFile + )) + ) + "STATIC_ROOT=/var/lib/oncall" + ]; + module = "oncall.app:get_wsgi_app()"; + socket = "${config.services.uwsgi.runDir}/oncall.sock"; + socketGroup = "nginx"; + immediate-gid = "nginx"; + chmod-socket = "770"; + pyargv = "${pkgs.oncall}/share/configs/config.yaml"; + buffer-size = 32768; + }; + }; + }; + }; + + services.nginx = { + enable = lib.mkDefault true; + virtualHosts."${cfg.settings.oncall_host}".locations = { + "/".extraConfig = "uwsgi_pass unix://${config.services.uwsgi.runDir}/oncall.sock;"; + }; + }; + + services.mysql = lib.mkIf cfg.database.createLocally { + enable = true; + package = lib.mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.settings.db.conn.kwargs.database ]; + ensureUsers = [ + { + name = cfg.settings.db.conn.kwargs.user; + ensurePermissions = { + "${cfg.settings.db.conn.kwargs.database}.*" = "ALL PRIVILEGES"; + }; + } + ]; + }; + + users.users.oncall = { + group = "nginx"; + isSystemUser = true; + }; + + systemd = { + services = { + uwsgi.serviceConfig.StateDirectory = "oncall"; + oncall-setup-database = lib.mkIf cfg.database.createLocally { + description = "Set up Oncall database"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + requiredBy = [ "uwsgi.service" ]; + after = [ "mysql.service" ]; + script = + let + mysql = "${lib.getExe' config.services.mysql.package "mysql"}"; + in + '' + if [ ! -f /var/lib/oncall/.dbexists ]; then + # Load database schema provided with package + ${mysql} ${cfg.settings.db.conn.kwargs.database} < ${cfg.package}/share/db/schema.v0.sql + ${mysql} ${cfg.settings.db.conn.kwargs.database} < ${cfg.package}/share/db/schema-update.v0-1602184489.sql + touch /var/lib/oncall/.dbexists + fi + ''; + }; + }; + }; + + }; + + meta.maintainers = with lib.maintainers; [ onny ]; + +} diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix index 5d2e03147a68..48e51b13bb39 100644 --- a/nixos/modules/services/web-apps/onlyoffice.nix +++ b/nixos/modules/services/web-apps/onlyoffice.nix @@ -114,7 +114,7 @@ in proxy_pass http://onlyoffice-docservice/$2$3; ''; # /etc/nginx/includes/ds-docservice.conf - #disable caching for api.js + # disable caching for api.js "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(web-apps\\/apps\\/api\\/documents\\/api\\.js)$".extraConfig = '' expires -1; @@ -124,26 +124,23 @@ in "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(document_editor_service_worker\\.js)$".extraConfig = '' expires 365d; - # gzip_static on; - alias ${cfg.package}/var/www/onlyoffice/documentserver/sdkjs/common/serviceworker/$2; + alias ${cfg.package}/var/www/onlyoffice/documentserver/sdkjs/common/serviceworker/$2; ''; - #suppress logging the unsupported locale error in web-apps + # suppress logging the unsupported locale error in web-apps "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(web-apps)(\\/.*\\.json)$".extraConfig = '' expires 365d; error_log /dev/null crit; alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3; ''; - #suppress logging the unsupported locale error in plugins + # suppress logging the unsupported locale error in plugins "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(sdkjs-plugins)(\\/.*\\.json)$".extraConfig = '' expires 365d; error_log /dev/null crit; - # gzip_static on; alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3; ''; "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(web-apps|sdkjs|sdkjs-plugins|fonts|dictionaries)(\\/.*)$".extraConfig = '' expires 365d; - # gzip_static on; alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3; ''; "~* ^(\\/cache\\/files.*)(\\/.*)".extraConfig = '' @@ -302,9 +299,8 @@ in ' /run/onlyoffice/config/default.json | sponge /run/onlyoffice/config/default.json chmod u+w /run/onlyoffice/config/production-linux.json - jq ' - .FileConverter.converter.x2tPath = "${cfg.x2t}/bin/x2t" - ' /run/onlyoffice/config/production-linux.json | sponge /run/onlyoffice/config/production-linux.json + jq '.FileConverter.converter.x2tPath = "${cfg.x2t}/bin/x2t"' \ + /run/onlyoffice/config/production-linux.json | sponge /run/onlyoffice/config/production-linux.json if psql -d onlyoffice -c "SELECT 'task_result'::regclass;" >/dev/null; then psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/removetbl.sql diff --git a/nixos/modules/services/web-apps/opencloud.md b/nixos/modules/services/web-apps/opencloud.md new file mode 100644 index 000000000000..5226e7922955 --- /dev/null +++ b/nixos/modules/services/web-apps/opencloud.md @@ -0,0 +1,64 @@ +# OpenCloud {#module-services-opencloud} + +[OpenCloud](https://opencloud.eu/en) is an open-source, modern file-sync and +sharing platform. It is a fork of oCIS, a ground-up rewrite of the well-known +PHP-based NextCloud server. + +The service can be configured using a combination of [](#opt-services.opencloud.settings), +[](#opt-services.opencloud.environment) and [](#opt-services.opencloud.environmentFile). + +## Basic usage {#module-services-opencloud-basic-usage} + +OpenCloud is configured using a combination of YAML and environment +variables. The full documentation can be found at +[OpenCloud Admin Docs](https://docs.opencloud.eu/docs/admin/intro). + +The general flow of configuring OpenCloud is: +- configure services with `services.opencloud.settings.` when possible +- configure global settings that affect multiple services via `services.opencloud.environment` +- allow NixOS to provision a default `opencloud.yaml` for you, containing default credentials + for communication between the microservices +- provide additional secrets via `environmentFile`, provisioned out of band + +Please note that current NixOS module for OpenCloud is configured to run in +`fullstack` mode, which starts all the services for OpenCloud in a single +instance, in so called supervised mode. This will start multiple OpenCloud +services and listen on multiple other ports. + +Current known services and their ports are as below: + +| Service | Group | Port | +|--------------------|---------|-------| +| gateway | api | 9142 | +| sharing | api | 9150 | +| app-registry | api | 9242 | +| ocdav | web | 45023 | +| auth-machine | api | 9166 | +| storage-system | api | 9215 | +| webdav | web | 9115 | +| webfinger | web | 46871 | +| storage-system | web | 9216 | +| web | web | 9100 | +| eventhistory | api | 33177 | +| ocs | web | 9110 | +| storage-publiclink | api | 9178 | +| settings | web | 9190 | +| ocm | api | 9282 | +| settings | api | 9191 | +| ocm | web | 9280 | +| app-provider | api | 9164 | +| storage-users | api | 9157 | +| auth-service | api | 9199 | +| thumbnails | web | 9186 | +| thumbnails | api | 9185 | +| storage-shares | api | 9154 | +| sse | sse | 46833 | +| userlog | userlog | 45363 | +| search | api | 9220 | +| proxy | web | 9200 | +| idp | web | 9130 | +| frontend | web | 9140 | +| groups | api | 9160 | +| graph | graph | 9120 | +| users | api | 9144 | +| auth-basic | api | 9146 | diff --git a/nixos/modules/services/web-apps/opencloud.nix b/nixos/modules/services/web-apps/opencloud.nix new file mode 100644 index 000000000000..0eded3cc96f9 --- /dev/null +++ b/nixos/modules/services/web-apps/opencloud.nix @@ -0,0 +1,242 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) types; + cfg = config.services.opencloud; + + defaultUser = "opencloud"; + defaultGroup = defaultUser; + + settingsFormat = pkgs.formats.yaml { }; +in +{ + options = { + services.opencloud = { + enable = lib.mkEnableOption "OpenCloud"; + + package = lib.mkPackageOption pkgs "opencloud" { }; + webPackage = lib.mkPackageOption pkgs [ "opencloud" "web" ] { }; + idpWebPackage = lib.mkPackageOption pkgs [ "opencloud" "idp-web" ] { }; + + user = lib.mkOption { + type = types.str; + default = defaultUser; + example = "mycloud"; + description = '' + The user to run OpenCloud as. + By default, a user named `${defaultUser}` will be created whose home + directory is [](#opt-services.opencloud.stateDir). + ''; + }; + + group = lib.mkOption { + type = types.str; + default = defaultGroup; + example = "mycloud"; + description = '' + The group to run OpenCloud under. + By default, a group named `${defaultGroup}` will be created. + ''; + }; + + address = lib.mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Web server bind address."; + }; + + port = lib.mkOption { + type = types.port; + default = 9200; + description = "Web server port."; + }; + + url = lib.mkOption { + type = types.str; + default = "https://localhost:9200"; + example = "https://cloud.example.com"; + description = "Web interface root public URL, including scheme and port (if non-default)."; + }; + + stateDir = lib.mkOption { + default = "/var/lib/opencloud"; + type = types.str; + description = "OpenCloud data directory."; + }; + + settings = lib.mkOption { + type = lib.types.attrsOf settingsFormat.type; + default = { }; + description = '' + Additional YAML configuration for OpenCloud services. + + Every item in this attrset will be mapped to a .yaml file in /etc/opencloud. + + The possible config options are currently not well documented, see source code: + https://github.com/opencloud-eu/opencloud/blob/main/pkg/config/config.go + ''; + }; + + environmentFile = lib.mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/opencloud.env"; + description = '' + An environment file as defined in {manpage}`systemd.exec(5)`. + + Use this to inject secrets, e.g. database or auth credentials out of band. + + Configuration provided here will override `settings` and `environment`. + ''; + }; + + environment = lib.mkOption { + type = types.attrsOf types.str; + default = { + OC_INSECURE = "true"; + }; + description = '' + Extra environment variables to set for the service. + + Use this to set configuration that may affect multiple microservices. + + Configuration provided here will override `settings`. + ''; + example = { + OC_INSECURE = "false"; + OC_LOG_LEVEL = "error"; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + users.users.${defaultUser} = lib.mkIf (cfg.user == defaultUser) { + group = cfg.group; + home = cfg.stateDir; + isSystemUser = true; + createHome = true; + description = "OpenCloud daemon user"; + }; + + users.groups = lib.mkIf (cfg.group == defaultGroup) { ${defaultGroup} = { }; }; + + systemd = { + services = + let + environment = { + PROXY_HTTP_ADDR = "${cfg.address}:${toString cfg.port}"; + OC_URL = cfg.url; + OC_BASE_DATA_PATH = cfg.stateDir; + WEB_ASSET_CORE_PATH = "${cfg.webPackage}"; + IDP_ASSET_PATH = "${cfg.idpWebPackage}/assets"; + OC_CONFIG_DIR = "/etc/opencloud"; + } // cfg.environment; + commonServiceConfig = { + EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectSystem = "strict"; + ProtectHome = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectKernelLogs = true; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + LockPersonality = true; + SystemCallArchitectures = "native"; + }; + in + { + opencloud-init-config = lib.mkIf (cfg.settings.opencloud or { } == { }) { + description = "Provision initial OpenCloud config"; + before = [ "opencloud.service" ]; + wantedBy = [ "multi-user.target" ]; + + inherit environment; + + serviceConfig = { + Type = "oneshot"; + ReadWritePaths = [ "/etc/opencloud" ]; + } // commonServiceConfig; + + path = [ cfg.package ]; + script = '' + set -x + config="''${OC_CONFIG_DIR}/opencloud.yaml" + if [ ! -e "$config" ]; then + echo "Provisioning initial OpenCloud config..." + opencloud init --insecure "''${OC_INSECURE:false}" --config-path "''${OC_CONFIG_DIR}" + chown ${cfg.user}:${cfg.group} "$config" + fi + ''; + }; + + opencloud = { + description = "OpenCloud - a secure and private way to store, access, and share your files"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + inherit environment; + + serviceConfig = { + Type = "simple"; + ExecStart = "${lib.getExe cfg.package} server"; + WorkingDirectory = cfg.stateDir; + User = cfg.user; + Group = cfg.group; + Restart = "always"; + ReadWritePaths = [ cfg.stateDir ]; + } // commonServiceConfig; + + restartTriggers = lib.mapAttrsToList ( + name: _: config.environment.etc."opencloud/${name}.yaml".source + ) cfg.settings; + }; + }; + }; + + systemd.tmpfiles.settings."10-opencloud" = { + ${cfg.stateDir}.d = { + inherit (cfg) user group; + mode = "0750"; + }; + "${cfg.stateDir}/idm".d = { + inherit (cfg) user group; + mode = "0750"; + }; + }; + + environment.etc = + (lib.mapAttrs' (name: value: { + name = "opencloud/${name}.yaml"; + value.source = settingsFormat.generate "${name}.yaml" value; + }) cfg.settings) + // { + # ensure /etc/opencloud gets created, so we can provision the config + "opencloud/.keep".text = ""; + }; + }; + + meta = { + doc = ./opencloud.md; + maintainers = with lib.maintainers; [ + christoph-heiss + k900 + ]; + }; +} diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix index c165969aa620..85adf2d7b7e5 100644 --- a/nixos/modules/services/web-apps/part-db.nix +++ b/nixos/modules/services/web-apps/part-db.nix @@ -27,7 +27,7 @@ in phpPackage = mkPackageOption pkgs "php" { } // { apply = pkg: - pkg.override { + pkg.buildEnv { extraConfig = '' memory_limit = 256M; ''; diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 2fe726e61525..c4b0186a77b4 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -489,7 +489,7 @@ in environment = env; path = with pkgs; [ - nodejs_18 + nodejs_20 yarn ffmpeg-headless openssl @@ -945,7 +945,7 @@ in }) (lib.attrsets.setAttrByPath [ cfg.user "packages" ] - [ peertubeEnv pkgs.nodejs_18 pkgs.yarn pkgs.ffmpeg-headless ] + [ peertubeEnv pkgs.nodejs_20 pkgs.yarn pkgs.ffmpeg-headless ] ) (lib.mkIf cfg.redis.enableUnixSocket { ${config.services.peertube.user}.extraGroups = [ "redis-peertube" ]; diff --git a/nixos/modules/services/web-apps/readeck.nix b/nixos/modules/services/web-apps/readeck.nix index bd529fa488ef..f0e7252f40bd 100644 --- a/nixos/modules/services/web-apps/readeck.nix +++ b/nixos/modules/services/web-apps/readeck.nix @@ -68,7 +68,6 @@ in ExecStart = "${lib.getExe cfg.package} serve -config ${configFile}"; ProtectSystem = "full"; SystemCallArchitectures = "native"; - MemoryDenyWriteExecute = true; NoNewPrivileges = true; PrivateTmp = true; PrivateDevices = true; @@ -89,7 +88,6 @@ in ProtectKernelTunables = true; LockPersonality = true; Restart = "on-failure"; - }; }; }; diff --git a/nixos/modules/services/web-apps/reposilite.nix b/nixos/modules/services/web-apps/reposilite.nix new file mode 100644 index 000000000000..ac9c9937bcfa --- /dev/null +++ b/nixos/modules/services/web-apps/reposilite.nix @@ -0,0 +1,439 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.services.reposilite; + format = pkgs.formats.cdn { }; + configFile = format.generate "reposilite.cdn" cfg.settings; + + useEmbeddedDb = cfg.database.type == "sqlite" || cfg.database.type == "h2"; + useMySQL = cfg.database.type == "mariadb" || cfg.database.type == "mysql"; + usePostgres = cfg.database.type == "postgresql"; + + # db password is appended at runtime by the service script (if needed) + dbString = + if useEmbeddedDb then + "${cfg.database.type} ${cfg.database.path}" + else + "${cfg.database.type} ${cfg.database.host}:${builtins.toString cfg.database.port} ${cfg.database.dbname} ${cfg.database.user} $(<${cfg.database.passwordFile})"; + + certDir = config.security.acme.certs.${cfg.useACMEHost}.directory; + + databaseModule = { + options = { + type = lib.mkOption { + type = lib.types.enum [ + "h2" + "mariadb" + "mysql" + "postgresql" + "sqlite" + ]; + description = '' + Database engine to use. + ''; + default = "sqlite"; + }; + + path = lib.mkOption { + type = lib.types.str; + description = '' + Path to the embedded database file. Set to `--temporary` to use an in-memory database. + ''; + default = "reposilite.db"; + }; + + host = lib.mkOption { + type = lib.types.str; + description = '' + Database host address. + ''; + default = "127.0.0.1"; + }; + + port = lib.mkOption { + type = lib.types.port; + description = '' + Database TCP port. + ''; + defaultText = lib.literalExpression '' + if type == "postgresql" then 5432 else 3306 + ''; + default = if usePostgres then config.services.postgresql.settings.port else 3306; + }; + + dbname = lib.mkOption { + type = lib.types.str; + description = '' + Database name. + ''; + default = "reposilite"; + }; + + user = lib.mkOption { + type = lib.types.str; + description = '' + Database user. + ''; + default = "reposilite"; + }; + + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + description = '' + Path to the file containing the password for the database connection. + This file must be readable by {option}`services.reposilite.user`. + ''; + default = null; + }; + }; + }; + + settingsModule = { + freeformType = format.type; + options = { + hostname = lib.mkOption { + type = lib.types.str; + description = '' + The hostname to bind to. Set to `0.0.0.0` to accept connections from everywhere, or `127.0.0.1` to restrict to localhost." + ''; + default = "0.0.0.0"; + example = "127.0.0.1"; + }; + + port = lib.mkOption { + type = lib.types.port; + description = '' + The TCP port to bind to. + ''; + default = 3000; + }; + + database = lib.mkOption { + type = lib.types.nullOr lib.types.str; + description = '' + Database connection string. Please use {option}`services.reposilite.database` instead. + See https://reposilite.com/guide/general#local-configuration for valid values. + ''; + default = null; + }; + + sslEnabled = lib.mkOption { + type = lib.types.bool; + description = '' + Whether to listen for encrypted connections on {option}`settings.sslPort`. + ''; + default = false; + }; + + sslPort = lib.mkOption { + type = lib.types.port; # cant be null + description = "SSL port to bind to. SSL needs to be enabled explicitly via {option}`settings.enableSsl`."; + default = 443; + }; + + keyPath = lib.mkOption { + type = lib.types.nullOr lib.types.str; + description = '' + Path to the .jsk KeyStore or paths to the PKCS#8 certificate and private key, separated by a space (see example). + You can use `''${WORKING_DIRECTORY}` to refer to paths relative to Reposilite's working directory. + If you are using a Java KeyStore, don't forget to specify the password via the {var}`REPOSILITE_LOCAL_KEYPASSWORD` environment variable. + See https://reposilite.com/guide/ssl for more information on how to set SSL up. + ''; + default = null; + example = "\${WORKING_DIRECTORY}/cert.pem \${WORKING_DIRECTORY}/key.pem"; + }; + + keyPassword = lib.mkOption { + type = lib.types.nullOr lib.types.str; + description = '' + Plaintext password used to unlock the Java KeyStore set in {option}`services.reposilite.settings.keyPath`. + WARNING: this option is insecure and should not be used to store the password. + Consider using {option}`services.reposilite.keyPasswordFile` instead. + ''; + default = null; + }; + + enforceSsl = lib.mkOption { + type = lib.types.bool; + description = '' + Whether to redirect all traffic to SSL. + ''; + default = false; + }; + + webThreadPool = lib.mkOption { + type = lib.types.ints.between 5 65535; + description = '' + Maximum amount of threads used by the core thread pool. (min: 5) + The web thread pool handles the first few steps of incoming HTTP connections, tasks are redirected as soon as possible to the IO thread pool. + ''; + default = 16; + }; + + ioThreadPool = lib.mkOption { + type = lib.types.ints.between 2 65535; + description = '' + The IO thread pool handles all tasks that may benefit from non-blocking IO. (min: 2) + Because most tasks are redirected to IO thread pool, it might be a good idea to keep it at least equal to web thread pool. + ''; + default = 8; + }; + + databaseThreadPool = lib.mkOption { + type = lib.types.ints.positive; + description = '' + Maximum amount of concurrent connections to the database. (one per thread) + Embedded databases (sqlite, h2) do not support truly concurrent connections, so the value will always be `1` if they are used. + ''; + default = 1; + }; + + compressionStrategy = lib.mkOption { + type = lib.types.enum [ + "none" + "gzip" + ]; + description = '' + Compression algorithm used by this instance of Reposilite. + `none` reduces usage of CPU & memory, but requires transfering more data. + ''; + default = "none"; + }; + + idleTimeout = lib.mkOption { + type = lib.types.ints.unsigned; + description = '' + Default idle timeout used by Jetty. + ''; + default = 30000; + }; + + bypassExternalCache = lib.mkOption { + type = lib.types.bool; + description = '' + Add cache bypass headers to responses from /api/* to avoid issues with proxies such as Cloudflare. + ''; + default = true; + }; + + cachedLogSize = lib.mkOption { + type = lib.types.ints.unsigned; + description = '' + Amount of messages stored in the cache logger. + ''; + default = 50; + }; + + defaultFrontend = lib.mkOption { + type = lib.types.bool; + description = '' + Whether to enable the default included frontend with a dashboard. + ''; + default = true; + }; + + basePath = lib.mkOption { + type = lib.types.str; + description = '' + Custom base path for this Reposilite instance. + It is not recommended changing this, you should instead prioritize using a different subdomain. + ''; + default = "/"; + }; + + debugEnabled = lib.mkOption { + type = lib.types.bool; + description = '' + Whether to enable debug mode. + ''; + default = false; + }; + }; + }; +in +{ + options.services.reposilite = { + enable = lib.mkEnableOption "Reposilite"; + package = lib.mkPackageOption pkgs "reposilite" { } // { + apply = + pkg: + pkg.override (old: { + plugins = (old.plugins or [ ]) ++ cfg.plugins; + }); + }; + + plugins = lib.mkOption { + type = lib.types.listOf lib.types.package; + description = '' + List of plugins to add to Reposilite. + ''; + default = [ ]; + example = "with reposilitePlugins; [ checksum groovy ]"; + }; + + database = lib.mkOption { + description = "Database options."; + default = { }; + type = lib.types.submodule databaseModule; + }; + + keyPasswordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + description = '' + Path the the file containing the password used to unlock the Java KeyStore file specified in {option}`services.reposilite.settings.keyPath`. + This file must be readable my {option}`services.reposilite.user`. + ''; + default = null; + }; + + useACMEHost = lib.mkOption { + type = lib.types.nullOr lib.types.str; + description = '' + Host of an existing Let's Encrypt certificate to use for SSL. + Make sure that the certificate directory is readable by the `reposilite` user or group, for example via {option}`security.acme.certs..group`. + *Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using {option}`security.acme.certs`* + ''; + default = null; + }; + + settings = lib.mkOption { + description = "Configuration written to the reposilite.cdn file"; + default = { }; + type = lib.types.submodule settingsModule; + }; + + workingDirectory = lib.mkOption { + type = lib.types.path; + description = '' + Working directory for Reposilite. + ''; + default = "/var/lib/reposilite"; + }; + + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + description = '' + Extra arguments/parameters passed to the Reposilite. Can be used for first token generation. + ''; + default = [ ]; + example = lib.literalExpression ''[ "--token" "name:tempsecrettoken" ]''; + }; + + user = lib.mkOption { + type = lib.types.str; + description = '' + The user to run Reposilite under. + ''; + default = "reposilite"; + }; + + group = lib.mkOption { + type = lib.types.str; + description = '' + The group to run Reposilite under. + ''; + default = "reposilite"; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + description = '' + Whether to open the firewall ports for Reposilite. If SSL is enabled, its port will be opened too. + ''; + default = false; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.settings.sslEnabled -> cfg.settings.keyPath != null; + message = '' + Reposilite was configured to enable SSL, but no valid paths to certificate files were provided via `settings.keyPath`. + Read more about SSL certificates here: https://reposilite.com/guide/ssl + ''; + } + { + assertion = cfg.settings.enforceSsl -> cfg.settings.sslEnabled; + message = "You cannot enforce SSL if SSL is not enabled."; + } + { + assertion = !useEmbeddedDb -> cfg.database.passwordFile != null; + message = "You need to set `services.reposilite.database.passwordFile` when using MySQL or Postgres."; + } + ]; + + services.reposilite.settings.keyPath = lib.mkIf ( + cfg.useACMEHost != null + ) "${certDir}/fullchain.pem ${certDir}/key.pem"; + + environment.systemPackages = [ cfg.package ]; + + users = { + groups.${cfg.group} = lib.mkIf (cfg.group == "reposilite") { }; + users.${cfg.user} = lib.mkIf (cfg.user == "reposilite") { + isSystemUser = true; + group = cfg.group; + }; + }; + + networking.firewall = lib.mkIf cfg.openFirewall ( + lib.mkMerge [ + { + allowedTCPPorts = [ cfg.settings.port ]; + } + (lib.mkIf cfg.settings.sslEnabled { + allowedTCPPorts = [ cfg.settings.sslPort ]; + }) + ] + ); + + systemd.services.reposilite = { + enable = true; + wantedBy = [ "multi-user.target" ]; + after = + [ "network.target" ] + ++ (lib.optional useMySQL "mysql.service") + ++ (lib.optional usePostgres "postgresql.service"); + + script = + lib.optionalString (cfg.keyPasswordFile != null && cfg.settings.keyPassword == null) '' + export REPOSILITE_LOCAL_KEYPASSWORD="$(<${cfg.keyPasswordFile})" + '' + + '' + export REPOSILITE_LOCAL_DATABASE="${dbString}" + + ${lib.getExe cfg.package} --local-configuration ${configFile} --local-configuration-mode none --working-directory ${cfg.workingDirectory} ${lib.escapeShellArgs cfg.extraArgs} + ''; + + serviceConfig = lib.mkMerge [ + (lib.mkIf (builtins.dirOf cfg.workingDirectory == "/var/lib") { + StateDirectory = builtins.baseNameOf cfg.workingDirectory; + StateDirectoryMode = "700"; + }) + { + Type = "exec"; + Restart = "on-failure"; + + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.workingDirectory; + + # TODO better hardening + LimitNOFILE = "1048576"; + PrivateTmp = true; + PrivateDevices = true; + ProtectHome = true; + ProtectSystem = "strict"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + } + ]; + }; + }; + + meta.maintainers = [ lib.maintainers.uku3lig ]; +} diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix index 0b780174068d..66e1e1266881 100644 --- a/nixos/modules/services/web-apps/snipe-it.nix +++ b/nixos/modules/services/web-apps/snipe-it.nix @@ -509,8 +509,9 @@ in sed -i 's/APP_KEY=/APP_KEY=base64:/' "${cfg.dataDir}/.env" fi - # purge cache - rm "${cfg.dataDir}"/bootstrap/cache/*.php || true + # pruge and rebuild caches + ${lib.getExe artisan} optimize:clear + ${lib.getExe artisan} optimize # migrate db ${lib.getExe artisan} migrate --force diff --git a/nixos/modules/services/web-apps/stash.nix b/nixos/modules/services/web-apps/stash.nix index 60c8ad8a8eb4..47f66edb7ddb 100644 --- a/nixos/modules/services/web-apps/stash.nix +++ b/nixos/modules/services/web-apps/stash.nix @@ -225,7 +225,7 @@ let }; gallery_cover_regex = mkOption { type = types.str; - default = "(poster|cover|folder|board)\.[^\.]+$"; + default = "(poster|cover|folder|board)\\.[^.]+$"; description = "Regex used to identify images as gallery covers"; }; no_proxy = mkOption { diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index 2b0af61aa043..83f79589a947 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -108,11 +108,11 @@ in }; }; + meta.maintainers = with lib.maintainers; [ fliegendewurst ]; + config = lib.mkIf cfg.enable ( lib.mkMerge [ { - meta.maintainers = with lib.maintainers; [ fliegendewurst ]; - users.groups.trilium = { }; users.users.trilium = { description = "Trilium User"; diff --git a/nixos/modules/services/web-apps/whoami.nix b/nixos/modules/services/web-apps/whoami.nix new file mode 100644 index 000000000000..a1b50049d4c6 --- /dev/null +++ b/nixos/modules/services/web-apps/whoami.nix @@ -0,0 +1,90 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.whoami; +in + +{ + meta.maintainers = with lib.maintainers; [ defelo ]; + + options.services.whoami = { + enable = lib.mkEnableOption "whoami"; + + package = lib.mkPackageOption pkgs "whoami" { }; + + port = lib.mkOption { + type = lib.types.port; + description = "The port whoami should listen on."; + default = 8000; + }; + + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + description = "Extra command line arguments to pass to whoami. See for details."; + default = [ ]; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.whoami = { + wantedBy = [ "multi-user.target" ]; + + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + + serviceConfig = { + User = "whoami"; + Group = "whoami"; + DynamicUser = true; + ExecStart = lib.escapeShellArgs ( + [ + (lib.getExe cfg.package) + "-port" + cfg.port + ] + ++ cfg.extraArgs + ); + + # Hardening + AmbientCapabilities = ""; + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SocketBindAllow = "tcp:${toString cfg.port}"; + SocketBindDeny = "any"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + UMask = "0077"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/wiki-js.nix b/nixos/modules/services/web-apps/wiki-js.nix index 4c742c26afad..f313804a6d28 100644 --- a/nixos/modules/services/web-apps/wiki-js.nix +++ b/nixos/modules/services/web-apps/wiki-js.nix @@ -151,7 +151,7 @@ in WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}"; DynamicUser = true; PrivateTmp = true; - ExecStart = "${pkgs.nodejs_18}/bin/node ${pkgs.wiki-js}/server"; + ExecStart = "${pkgs.nodejs_20}/bin/node ${pkgs.wiki-js}/server"; }; }; }; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 2ff0c3494e19..bf658564515c 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -339,7 +339,7 @@ let map ( listen: { - port = cfg.defaultSSLListenPort; + port = if (hasPrefix "unix:" listen.addr) then null else cfg.defaultSSLListenPort; ssl = true; } // listen @@ -351,7 +351,7 @@ let map ( listen: { - port = cfg.defaultHTTPListenPort; + port = if (hasPrefix "unix:" listen.addr) then null else cfg.defaultHTTPListenPort; ssl = false; } // listen diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index e278f2f2f87a..6ed2f0d20aae 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -199,13 +199,6 @@ in monospace = mkDefault [ "Hack" ]; }; - # Qt application style. - qt = { - enable = mkDefault true; - style = mkDefault "gtk2"; - platformTheme = mkDefault "gtk2"; - }; - environment.pathsToLink = [ "/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173 ]; @@ -252,8 +245,7 @@ in services.system-config-printer.enable = config.services.printing.enable; # For BCC's Sharing panel. - services.dleyna-renderer.enable = mkDefault true; - services.dleyna-server.enable = mkDefault true; + services.dleyna.enable = mkDefault true; services.gnome.gnome-user-share.enable = mkDefault true; services.gnome.rygel.enable = mkDefault true; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.md b/nixos/modules/services/x11/desktop-managers/gnome.md index f959c0912652..7f7801305e23 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.md +++ b/nixos/modules/services/x11/desktop-managers/gnome.md @@ -19,7 +19,7 @@ To enable the GNOME desktop use: While it is not strictly necessary to use GDM as the display manager with GNOME, it is recommended, as some features such as screen lock [might not work](#sec-gnome-faq-can-i-use-lightdm-with-gnome) without it. ::: -The default applications used in NixOS are very minimal, inspired by the defaults used in [gnome-build-meta](https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/40.0/elements/core/meta-gnome-core-utilities.bst). +The default applications used in NixOS are very minimal, inspired by the defaults used in [gnome-build-meta](https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/48.0/elements/core/meta-gnome-core-apps.bst). ### GNOME without the apps {#sec-gnome-without-the-apps} @@ -27,7 +27,7 @@ If you’d like to only use the GNOME desktop and not the apps, you can disable ```nix { - services.gnome.core-utilities.enable = false; + services.gnome.core-apps.enable = false; } ``` diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index c3a3465f3a45..1f980444e644 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -84,12 +84,19 @@ in maintainers = lib.teams.gnome.members; }; + imports = [ + (lib.mkRenamedOptionModule + [ "services" "gnome" "core-utilities" "enable" ] + [ "services" "gnome" "core-apps" "enable" ] + ) + ]; + options = { services.gnome = { core-os-services.enable = mkEnableOption "essential services for GNOME3"; core-shell.enable = mkEnableOption "GNOME Shell services"; - core-utilities.enable = mkEnableOption "GNOME core utilities"; + core-apps.enable = mkEnableOption "GNOME core apps"; core-developer-tools.enable = mkEnableOption "GNOME core developer tools"; games.enable = mkEnableOption "GNOME games"; }; @@ -213,7 +220,7 @@ in services.gnome.core-os-services.enable = true; services.gnome.core-shell.enable = true; - services.gnome.core-utilities.enable = mkDefault true; + services.gnome.core-apps.enable = mkDefault true; services.displayManager.sessionPackages = [ pkgs.gnome-session.sessions ]; @@ -281,9 +288,9 @@ in hardware.bluetooth.enable = mkDefault true; programs.dconf.enable = true; security.polkit.enable = true; + security.rtkit.enable = mkDefault true; services.accounts-daemon.enable = true; - services.dleyna-renderer.enable = mkDefault true; - services.dleyna-server.enable = mkDefault true; + services.dleyna.enable = mkDefault true; services.power-profiles-daemon.enable = mkDefault true; services.gnome.at-spi2-core.enable = true; services.gnome.evolution-data-server.enable = true; @@ -326,17 +333,9 @@ in }) (lib.mkIf serviceCfg.core-shell.enable { - services.xserver.desktopManager.gnome.sessionPath = - let - mandatoryPackages = [ - pkgs.gnome-shell - ]; - optionalPackages = [ - pkgs.gnome-shell-extensions - ]; - in - mandatoryPackages - ++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages; + services.xserver.desktopManager.gnome.sessionPath = [ + pkgs.gnome-shell + ]; services.colord.enable = mkDefault true; services.gnome.glib-networking.enable = true; @@ -380,14 +379,11 @@ in services.orca.enable = notExcluded pkgs.orca; - fonts.packages = with pkgs; [ - cantarell-fonts - dejavu_fonts - source-code-pro # Default monospace font in 3.32 - source-sans - ]; + fonts.packages = utils.removePackagesByName [ + pkgs.adwaita-fonts + ] config.environment.gnome.excludePackages; - # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst + # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-48/elements/core/meta-gnome-core-shell.bst environment.systemPackages = let mandatoryPackages = [ @@ -400,7 +396,6 @@ in pkgs.gnome-bluetooth pkgs.gnome-color-manager pkgs.gnome-control-center - pkgs.gnome-shell-extensions pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. pkgs.gnome-user-docs pkgs.glib # for gsettings program @@ -414,11 +409,12 @@ in ++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages; }) - # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-45/elements/core/meta-gnome-core-utilities.bst - (lib.mkIf serviceCfg.core-utilities.enable { + # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-48/elements/core/meta-gnome-core-apps.bst + (lib.mkIf serviceCfg.core-apps.enable { environment.systemPackages = utils.removePackagesByName ( [ pkgs.baobab + pkgs.decibels pkgs.epiphany pkgs.gnome-text-editor pkgs.gnome-calculator @@ -500,17 +496,19 @@ in ] config.environment.gnome.excludePackages; }) - # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst + # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-48/elements/core/meta-gnome-core-developer-tools.bst (lib.mkIf serviceCfg.core-developer-tools.enable { environment.systemPackages = utils.removePackagesByName [ pkgs.dconf-editor pkgs.devhelp + pkgs.d-spy pkgs.gnome-builder # boxes would make sense in this option, however # it doesn't function well enough to be included # in default configurations. # https://github.com/NixOS/nixpkgs/issues/60908 # pkgs.gnome-boxes + pkgs.sysprof ] config.environment.gnome.excludePackages; services.sysprof.enable = notExcluded pkgs.sysprof; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index d5bad47e52a4..5973191d6c7c 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -9,7 +9,7 @@ let cfg = config.services.xserver.displayManager; gdm = pkgs.gdm; - pamCfg = config.security.pam.services; + pamLogin = config.security.pam.services.login; settingsFormat = pkgs.formats.ini { }; configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings; @@ -206,12 +206,15 @@ in ]; # Otherwise GDM will not be able to start correctly and display Wayland sessions - systemd.packages = with pkgs.gnome; [ + systemd.packages = [ gdm pkgs.gnome-session pkgs.gnome-shell ]; - environment.systemPackages = [ pkgs.adwaita-icon-theme ]; + environment.systemPackages = [ + pkgs.adwaita-icon-theme + pkgs.gdm # For polkit rules + ]; # We dont use the upstream gdm service # it has to be disabled since the gdm package has it @@ -345,7 +348,7 @@ in gdm-autologin.text = '' auth requisite pam_nologin.so auth required pam_succeed_if.so uid >= 1000 quiet - ${lib.optionalString pamCfg.login.enableGnomeKeyring '' + ${lib.optionalString (pamLogin.enable && pamLogin.enableGnomeKeyring) '' auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so ''} @@ -369,7 +372,7 @@ in auth requisite pam_faillock.so preauth auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so auth required pam_env.so - ${lib.optionalString pamCfg.login.enableGnomeKeyring '' + ${lib.optionalString (pamLogin.enable && pamLogin.enableGnomeKeyring) '' auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so ''} diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix index 301a3c85d9e1..f6a52ea808e3 100644 --- a/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixos/modules/services/x11/window-managers/exwm.nix @@ -13,7 +13,7 @@ let ${cfg.loadScript} ''; packages = epkgs: cfg.extraPackages epkgs ++ [ epkgs.exwm ]; - exwm-emacs = pkgs.emacs.pkgs.withPackages packages; + exwm-emacs = cfg.package.pkgs.withPackages packages; in { @@ -38,6 +38,10 @@ in file. ''; }; + package = mkPackageOption pkgs "Emacs" { + default = "emacs"; + example = [ "emacs-gtk" ]; + }; extraPackages = mkOption { type = types.functionTo (types.listOf types.package); default = epkgs: [ ]; diff --git a/nixos/modules/system/activation/bootspec.nix b/nixos/modules/system/activation/bootspec.nix index 4f534b240e67..99a859f91829 100644 --- a/nixos/modules/system/activation/bootspec.nix +++ b/nixos/modules/system/activation/bootspec.nix @@ -111,6 +111,8 @@ in Enable this option if you want to ascertain that your documents are correct ''; + package = lib.mkPackageOption pkgs "bootspec" { }; + extensions = lib.mkOption { # NOTE(RaitoBezarius): this is not enough to validate: extensions."osRelease" = drv; those are picked up by cue validation. type = lib.types.attrsOf lib.types.anything; # : { ...namespace-specific fields } diff --git a/nixos/modules/system/activation/lib/test.sh b/nixos/modules/system/activation/lib/test.sh index 9b146383ad4b..1f38eddfc231 100755 --- a/nixos/modules/system/activation/lib/test.sh +++ b/nixos/modules/system/activation/lib/test.sh @@ -26,6 +26,7 @@ onerr() { } trap onerr ERR +# shellcheck source-path=SCRIPTDIR source ./lib.sh (warn hi, this works >/dev/null) 2>&1 | grep -E $'.*warning:.* hi, this works' >/dev/null diff --git a/nixos/modules/system/activation/specialisation.nix b/nixos/modules/system/activation/specialisation.nix index 1bc257248539..7acccbd724d5 100644 --- a/nixos/modules/system/activation/specialisation.nix +++ b/nixos/modules/system/activation/specialisation.nix @@ -10,6 +10,8 @@ let inherit (lib) concatStringsSep + escapeShellArg + hasInfix mapAttrs mapAttrsToList mkOption @@ -84,10 +86,18 @@ in }; config = { + assertions = mapAttrsToList (name: _: { + assertion = !hasInfix "/" name; + message = '' + Specialisation names must not contain forward slashes. + Invalid specialisation name: ${name} + ''; + }) config.specialisation; + system.systemBuilderCommands = '' mkdir $out/specialisation ${concatStringsSep "\n" ( - mapAttrsToList (name: path: "ln -s ${path} $out/specialisation/${name}") children + mapAttrsToList (name: path: "ln -s ${path} $out/specialisation/${escapeShellArg name}") children )} ''; }; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 75738bc0f5db..56e97d3fdea9 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -77,14 +77,7 @@ let ); # Handle assertions and warnings - - failedAssertions = map (x: x.message) (filter (x: !x.assertion) config.assertions); - - baseSystemAssertWarn = - if failedAssertions != [ ] then - throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}" - else - showWarnings config.warnings baseSystem; + baseSystemAssertWarn = lib.asserts.checkAssertWarn config.assertions config.warnings baseSystem; # Replace runtime dependencies system = diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 474f89e1ccf3..76d036766101 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -210,6 +210,7 @@ in } ${optionalString (!config.boot.initrd.systemd.enable) '' + SshdAuthPath /bin/sshd-auth SshdSessionPath /bin/sshd-session ''} @@ -239,6 +240,7 @@ in boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${package}/bin/sshd + copy_bin_and_libs ${package}/libexec/sshd-auth copy_bin_and_libs ${package}/libexec/sshd-session cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib ''; @@ -328,6 +330,7 @@ in }; storePaths = [ "${package}/bin/sshd" + "${package}/libexec/sshd-auth" "${package}/libexec/sshd-session" ]; diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index 44dee4645e05..3407d778d62b 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -74,6 +74,7 @@ def is_encrypted(device: str) -> bool: def is_fs_type_supported(fs_type: str) -> bool: return fs_type.startswith('vfat') +paths = {} def get_copied_path_uri(path: str, target: str) -> str: result = '' @@ -85,6 +86,8 @@ def get_copied_path_uri(path: str, target: str) -> str: if not os.path.exists(dest_path): copy_file(path, dest_path) + else: + paths[dest_path] = True path_with_prefix = os.path.join('/limine', target, dest_file) result = f'boot():{path_with_prefix}' @@ -203,7 +206,10 @@ def copy_file(from_path: str, to_path: str): if not os.path.exists(dirname): os.makedirs(dirname) - shutil.copyfile(from_path, to_path) + shutil.copyfile(from_path, to_path + ".tmp") + os.rename(to_path + ".tmp", to_path) + + paths[to_path] = True def option_from_config(name: str, config_path: List[str], conversion: Callable[[str], str] | None = None) -> str: if config(*config_path): @@ -243,14 +249,16 @@ def main(): partition formatted as FAT. ''')) + if config('secureBoot')['enable'] and not config('secureBoot')['createAndEnrollKeys'] and not os.path.exists("/var/lib/sbctl"): + print("There are no sbctl secure boot keys present. Please generate some.") + sys.exit(1) + if not os.path.exists(limine_dir): os.makedirs(limine_dir) - - if os.path.exists(os.path.join(limine_dir, 'kernels')): - print(f'nuking {os.path.join(limine_dir, "kernels")}') - shutil.rmtree(os.path.join(limine_dir, 'kernels')) - - os.makedirs(os.path.join(limine_dir, "kernels")) + else: + for dir, dirs, files in os.walk(limine_dir, topdown=True): + for file in files: + paths[os.path.join(dir, file)] = False profiles = [('system', get_gens())] @@ -270,13 +278,6 @@ def main(): default_entry: 2 ''') - if os.path.exists(os.path.join(limine_dir, 'wallpapers')): - print(f'nuking {os.path.join(limine_dir, "wallpapers")}') - shutil.rmtree(os.path.join(limine_dir, 'wallpapers')) - - if len(config('style', 'wallpapers')) > 0: - os.makedirs(os.path.join(limine_dir, 'wallpapers')) - for wallpaper in config('style', 'wallpapers'): config_file += f'''wallpaper: {get_copied_path_uri(wallpaper, 'wallpapers')}\n''' @@ -318,6 +319,8 @@ def main(): file.truncate() file.write(config_file.strip()) + paths[config_file_path] = True + for dest_path, source_path in config('additionalFiles').items(): dest_path = os.path.join(limine_dir, dest_path) @@ -353,6 +356,28 @@ def main(): print('error: failed to enroll limine config.', file=sys.stderr) sys.exit(1) + if config('secureBoot')['enable']: + sbctl = os.path.join(config('secureBoot')['sbctl'], 'bin', 'sbctl') + if config('secureBoot')['createAndEnrollKeys']: + print("TEST MODE: creating and enrolling keys") + try: + subprocess.run([sbctl, 'create-keys']) + except: + print('error: failed to create keys', file=sys.stderr) + sys.exit(1) + try: + subprocess.run([sbctl, 'enroll-keys', '--yes-this-might-brick-my-machine']) + except: + print('error: failed to enroll keys', file=sys.stderr) + sys.exit(1) + + print('signing limine...') + try: + subprocess.run([sbctl, 'sign', dest_path]) + except: + print('error: failed to sign limine', file=sys.stderr) + sys.exit(1) + if not config('efiRemovable') and not config('canTouchEfiVariables'): print('warning: boot.loader.efi.canTouchEfiVariables is set to false while boot.loader.limine.efiInstallAsRemovable.\n This may render the system unbootable.') @@ -363,9 +388,16 @@ def main(): efibootmgr = os.path.join(config('efiBootMgrPath'), 'bin', 'efibootmgr') efi_partition = find_mounted_device(config('efiMountPoint')) efi_disk = find_disk_device(efi_partition) + + efibootmgr_output = subprocess.check_output([efibootmgr], stderr=subprocess.STDOUT, universal_newlines=True) + create_flag = '-c' + # Check the output of `efibootmgr` to find if limine is already installed and present in the boot record + if matches := re.findall(r'Boot[0-9a-fA-F]{4}\*? Limine', efibootmgr_output): + create_flag = '-C' # if present, keep the same boot order + efibootmgr_output = subprocess.check_output([ efibootmgr, - '-c', + create_flag, '-d', efi_disk, '-p', efi_partition.removeprefix(efi_disk).removeprefix('p'), '-l', f'\\efi\\limine\\{boot_file}', @@ -409,4 +441,9 @@ def main(): 'Failed to deploy BIOS stage 1 Limine bootloader!\n' + 'You might want to try enabling the `boot.loader.limine.forceMbr` option.') + print("removing unused boot files...") + for path in paths: + if not paths[path]: + os.remove(path) + main() diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix index 182868bd6973..50a000380287 100644 --- a/nixos/modules/system/boot/loader/limine/limine.nix +++ b/nixos/modules/system/boot/loader/limine/limine.nix @@ -18,6 +18,7 @@ let canTouchEfiVariables = efi.canTouchEfiVariables; efiSupport = cfg.efiSupport; efiRemovable = cfg.efiInstallAsRemovable; + secureBoot = cfg.secureBoot; biosSupport = cfg.biosSupport; biosDevice = cfg.biosDevice; partitionIndex = cfg.partitionIndex; @@ -177,6 +178,41 @@ in ''; }; + secureBoot = { + enable = lib.mkEnableOption null // { + description = '' + Whether to use sign the limine binary with sbctl. + + ::: {.note} + This requires you to already have generated the keys and enrolled them with {command}`sbctl`. + + To create keys use {command}`sbctl create-keys`. + + To enroll them first reset secure boot to "Setup Mode". This is device specific. + Then enroll them using {command}`sbctl enroll-keys -m -f`. + + You can now rebuild your system with this option enabled. + + Afterwards turn setup mode off and enable secure boot. + ::: + ''; + }; + + createAndEnrollKeys = lib.mkEnableOption null // { + internal = true; + description = '' + Creates secure boot signing keys and enrolls them during bootloader installation. + + ::: {.note} + This is used for automated nixos tests. + NOT INTENDED to be used on a real system. + ::: + ''; + }; + + sbctl = lib.mkPackageOption pkgs "sbctl" { }; + }; + style = { wallpapers = lib.mkOption { default = [ ]; @@ -358,14 +394,67 @@ in system = { boot.loader.id = "limine"; - build.installBootLoader = pkgs.substituteAll { + build.installBootLoader = pkgs.replaceVarsWith { src = ./limine-install.py; isExecutable = true; - - python3 = pkgs.python3.withPackages (python-packages: [ python-packages.psutil ]); - configPath = limineInstallConfig; + replacements = { + python3 = pkgs.python3.withPackages (python-packages: [ python-packages.psutil ]); + configPath = limineInstallConfig; + }; }; }; }) + (lib.mkIf (cfg.enable && cfg.secureBoot.enable) { + assertions = [ + { + assertion = cfg.enrollConfig; + message = "Disabling enrollConfig allows bypassing secure boot."; + } + { + assertion = cfg.validateChecksums; + message = "Disabling validateChecksums allows bypassing secure boot."; + } + { + assertion = cfg.panicOnChecksumMismatch; + message = "Disabling panicOnChecksumMismatch allows bypassing secure boot."; + } + { + assertion = cfg.efiSupport; + message = "Secure boot is only supported on EFI systems."; + } + ]; + + boot.loader.limine.enrollConfig = true; + boot.loader.limine.validateChecksums = true; + boot.loader.limine.panicOnChecksumMismatch = true; + }) + + # Fwupd binary needs to be signed in secure boot mode + (lib.mkIf (cfg.enable && cfg.secureBoot.enable && config.services.fwupd.enable) { + systemd.services.fwupd = { + environment.FWUPD_EFIAPPDIR = "/run/fwupd-efi"; + }; + + systemd.services.fwupd-efi = { + description = "Sign fwupd EFI app for secure boot"; + wantedBy = [ "fwupd.service" ]; + partOf = [ "fwupd.service" ]; + before = [ "fwupd.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + RuntimeDirectory = "fwupd-efi"; + }; + script = '' + cp ${config.services.fwupd.package.fwupd-efi}/libexec/fwupd/efi/fwupd*.efi /run/fwupd-efi/ + chmod +w /run/fwupd-efi/fwupd*.efi + ${lib.getExe pkgs.sbctl} sign /run/fwupd-efi/fwupd*.efi + ''; + }; + + services.fwupd.uefiCapsuleSettings = { + DisableShimForSecureBoot = true; + }; + }) ]; } 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 380ac69bdf7e..bd2a6d43301d 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 @@ -335,7 +335,7 @@ def install_bootloader(args: argparse.Namespace) -> None: available_match = re.search(r"^\((.*)\)$", available_out) if installed_match is None: - raise Exception("could not find any previously installed systemd-boot") + raise Exception("Could not find any previously installed systemd-boot. If you are switching to systemd-boot from a different bootloader, you need to run `nixos-rebuild switch --install-bootloader`") if available_match is None: raise Exception("could not determine systemd-boot version") 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 e5080bd8d191..f0afb3b8f575 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -47,7 +47,7 @@ let systemd = config.systemd.package; - bootspecTools = pkgs.bootspec; + bootspecTools = config.boot.bootspec.package; nix = config.nix.package.out; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 59c5cdb71b00..af7362231ea5 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -408,13 +408,12 @@ let return fi - if [ ! -z "$k_user" ]; then - new_k_luks="$(echo -n $k_user | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response | rbtohex)" + if [ -n "$k_user" ]; then + echo -n $k_user else - new_k_luks="$(echo | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response | rbtohex)" - fi + echo + fi | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response > /crypt-ramfs/new_key - echo -n "$new_k_luks" | hextorb > /crypt-ramfs/new_key echo -n "$k_luks" | hextorb | ${cschange} --key-file=- /crypt-ramfs/new_key if [ $? == 0 ]; then diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 24c317bcc46d..6ac7ff073e78 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -226,7 +226,32 @@ in package = mkPackageOption pkgs "systemd" { }; enableStrictShellChecks = mkEnableOption "" // { - description = "Whether to run shellcheck on the generated scripts for systemd units."; + description = '' + Whether to run `shellcheck` on the generated scripts for systemd + units. + + When enabled, all systemd scripts generated by NixOS will be checked + with `shellcheck` and any errors or warnings will cause the build to + fail. + + This affects all scripts that have been created through the `script`, + `reload`, `preStart`, `postStart`, `preStop` and `postStop` options for + systemd services. This does not affect command lines passed directly + to `ExecStart`, `ExecReload`, `ExecStartPre`, `ExecStartPost`, + `ExecStop` or `ExecStopPost`. + + It therefore also does not affect systemd units that are coming from + packages and that are not defined through the NixOS config. This option + is disabled by default, and although some services have already been + fixed, it is still likely that you will encounter build failures when + enabling this. + + We encourage people to enable this option when they are willing and + able to submit fixes for potential build failures to Nixpkgs. The + option can also be enabled or disabled for individual services using + the `enableStrictShellChecks` option on the service itself, which will + take precedence over the global setting. + ''; }; units = mkOption { @@ -712,7 +737,12 @@ in systemd.managerEnvironment = { # Doesn't contain systemd itself - everything works so it seems to use the compiled-in value for its tools # util-linux is needed for the main fsck utility wrapping the fs-specific ones - PATH = lib.makeBinPath (config.system.fsPackages ++ [ cfg.package.util-linux ]); + PATH = lib.makeBinPath ( + config.system.fsPackages + ++ [ cfg.package.util-linux ] + # systemd-ssh-generator needs sshd in PATH + ++ lib.optional config.services.openssh.enable config.services.openssh.package + ); LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; TZDIR = "/etc/zoneinfo"; # If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 23b9e232c64d..65caee745124 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -132,13 +132,20 @@ let initialRamdisk = pkgs.makeInitrdNG { name = "initrd-${kernel-name}"; inherit (config.boot.initrd) compressor compressorArgs prepend; - inherit (cfg) strip; contents = lib.filter ({ source, ... }: !lib.elem source cfg.suppressedStorePaths) cfg.storePaths; }; in { + imports = [ + (lib.mkRemovedOptionModule [ "boot" "initrd" "systemd" "strip" ] '' + The option to strip ELF files in initrd has been removed. + It only saved ~1MiB of initramfs size, but caused a few issues + like unloadable kernel modules. + '') + ]; + options.boot.initrd.systemd = { enable = mkEnableOption "systemd in initrd" // { description = '' @@ -208,19 +215,6 @@ in default = [ ]; }; - strip = mkOption { - description = '' - Whether to completely strip executables and libraries copied to the initramfs. - - Setting this to false may save on the order of 30MiB on the - machine building the system (by avoiding a binutils - reference), at the cost of ~1MiB of initramfs size. This puts - this option firmly in the territory of micro-optimisation. - ''; - type = types.bool; - default = true; - }; - extraBin = mkOption { description = '' Tools to add to /bin diff --git a/nixos/modules/system/boot/systemd/journald.nix b/nixos/modules/system/boot/systemd/journald.nix index c30630e04e4b..4d2ca7f11f21 100644 --- a/nixos/modules/system/boot/systemd/journald.nix +++ b/nixos/modules/system/boot/systemd/journald.nix @@ -116,22 +116,19 @@ in }; config = { - systemd.additionalUpstreamSystemUnits = - [ - "systemd-journald.socket" - "systemd-journald@.socket" - "systemd-journald-varlink@.socket" - "systemd-journald.service" - "systemd-journald@.service" - "systemd-journal-flush.service" - "systemd-journal-catalog-update.service" - "systemd-journald-sync@.service" - ] - ++ (lib.optional (!config.boot.isContainer) "systemd-journald-audit.socket") - ++ [ - "systemd-journald-dev-log.socket" - "syslog.socket" - ]; + systemd.additionalUpstreamSystemUnits = [ + "systemd-journald.socket" + "systemd-journald@.socket" + "systemd-journald-varlink@.socket" + "systemd-journald.service" + "systemd-journald@.service" + "systemd-journal-flush.service" + "systemd-journal-catalog-update.service" + "systemd-journald-sync@.service" + "systemd-journald-audit.socket" + "systemd-journald-dev-log.socket" + "syslog.socket" + ]; systemd.sockets.systemd-journald-audit.wantedBy = [ "systemd-journald.service" diff --git a/nixos/modules/system/boot/systemd/repart.nix b/nixos/modules/system/boot/systemd/repart.nix index a8dc4745c26b..b7ca00cf6a03 100644 --- a/nixos/modules/system/boot/systemd/repart.nix +++ b/nixos/modules/system/boot/systemd/repart.nix @@ -72,6 +72,19 @@ in example = "require"; default = "refuse"; }; + + discard = lib.mkOption { + type = lib.types.bool; + description = '' + Controls whether to issue the BLKDISCARD I/O control command on the + space taken up by any added partitions or on the space in between them. + Usually, it's a good idea to issue this request since it tells the underlying + hardware that the covered blocks shall be considered empty, improving performance. + + See {manpage}`systemd-repart(8)` for details. + ''; + default = true; + }; }; systemd.repart = { @@ -163,6 +176,7 @@ in --definitions=/etc/repart.d \ --dry-run=no \ --empty=${initrdCfg.empty} \ + --discard=${lib.boolToString initrdCfg.discard} \ ${lib.optionalString (initrdCfg.device != null) initrdCfg.device} '' ]; diff --git a/nixos/modules/system/boot/systemd/shutdown.nix b/nixos/modules/system/boot/systemd/shutdown.nix index 1e8b8c6f863c..242b47cc40b1 100644 --- a/nixos/modules/system/boot/systemd/shutdown.nix +++ b/nixos/modules/system/boot/systemd/shutdown.nix @@ -52,6 +52,7 @@ in what = "tmpfs"; where = "/run/initramfs"; type = "tmpfs"; + options = "mode=0700"; } ]; diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix index 9ec02c594cf0..f927ba1c9c90 100644 --- a/nixos/modules/system/boot/tmp.nix +++ b/nixos/modules/system/boot/tmp.nix @@ -31,6 +31,23 @@ in ''; }; + tmpfsHugeMemoryPages = lib.mkOption { + type = lib.types.enum [ + "never" + "always" + "within_size" + "advise" + ]; + default = "never"; + example = "within_size"; + description = '' + never - Do not allocate huge memory pages. This is the default. + always - Attempt to allocate huge memory page every time a new page is needed. + within_size - Only allocate huge memory pages if it will be fully within i_size. Also respect madvise(2) hints. Recommended. + advise - Only allocate huge memory pages if requested with madvise(2). + ''; + }; + useTmpfs = lib.mkOption { type = lib.types.bool; default = false; @@ -60,6 +77,7 @@ in "nosuid" "nodev" "size=${toString cfg.tmpfsSize}" + "huge=${cfg.tmpfsHugeMemoryPages}" ]; } ]; diff --git a/nixos/modules/system/boot/uki.nix b/nixos/modules/system/boot/uki.nix index fd9f1cadd340..d9f4713b307c 100644 --- a/nixos/modules/system/boot/uki.nix +++ b/nixos/modules/system/boot/uki.nix @@ -111,8 +111,7 @@ in --config=${cfg.configFile} \ --output="$out/${config.system.boot.loader.ukiFile}" ''; - - meta.maintainers = with lib.maintainers; [ nikstur ]; - }; + + meta.maintainers = with lib.maintainers; [ nikstur ]; } diff --git a/nixos/modules/system/boot/unl0kr.nix b/nixos/modules/system/boot/unl0kr.nix index 318090047b3a..7b7197cb0c10 100644 --- a/nixos/modules/system/boot/unl0kr.nix +++ b/nixos/modules/system/boot/unl0kr.nix @@ -75,6 +75,7 @@ in "usbtouchscreen" "evdev" + "psmouse" ] ++ lib.optionals cfg.allowVendorDrivers [ "intel_lpss_pci" diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix index ed08ba928785..355e9695d8b9 100644 --- a/nixos/modules/system/etc/etc-activation.nix +++ b/nixos/modules/system/etc/etc-activation.nix @@ -52,7 +52,7 @@ where = "/run/nixos-etc-metadata"; what = "/etc-metadata-image"; type = "erofs"; - options = "loop,ro"; + options = "loop,ro,nodev,nosuid"; unitConfig = { # Since this unit depends on the nix store being mounted, it cannot # be a dependency of local-fs.target, because if it did, we'd have @@ -81,6 +81,8 @@ type = "overlay"; options = lib.concatStringsSep "," ( [ + "nodev" + "nosuid" "relatime" "redirect_dir=on" "metacopy=on" diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 9fbfda5814d5..0be5a3b9ae82 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -41,8 +41,6 @@ let if [ "$(readlink "$out/etc/$target")" != "$src" ]; then echo "mismatched duplicate entry $(readlink "$out/etc/$target") <-> $src" ret=1 - - continue fi fi @@ -285,23 +283,23 @@ in ''} tmpMetadataMount=$(TMPDIR="/run" mktemp --directory -t nixos-etc-metadata.XXXXXXXXXX) - mount --type erofs -o ro ${config.system.build.etcMetadataImage} $tmpMetadataMount + mount --type erofs --options ro,nodev,nosuid ${config.system.build.etcMetadataImage} $tmpMetadataMount # There was no previous /etc mounted. This happens when we're called # directly without an initrd, like with nixos-enter. if ! mountpoint -q /etc; then - mount --type overlay overlay \ - --options lowerdir=$tmpMetadataMount::${config.system.build.etcBasedir},${etcOverlayOptions} \ - /etc + mount --type overlay \ + --options nodev,nosuid,lowerdir=$tmpMetadataMount::${config.system.build.etcBasedir},${etcOverlayOptions} \ + overlay /etc else # Mount the new /etc overlay to a temporary private mount. # This needs the indirection via a private bind mount because you # cannot move shared mounts. tmpEtcMount=$(TMPDIR="/run" mktemp --directory -t nixos-etc.XXXXXXXXXX) mount --bind --make-private $tmpEtcMount $tmpEtcMount - mount --type overlay overlay \ - --options lowerdir=$tmpMetadataMount::${config.system.build.etcBasedir},${etcOverlayOptions} \ - $tmpEtcMount + mount --type overlay \ + --options nodev,nosuid,lowerdir=$tmpMetadataMount::${config.system.build.etcBasedir},${etcOverlayOptions} \ + overlay $tmpEtcMount # Before moving the new /etc overlay under the old /etc, we have to # move mounts on top of /etc to the new /etc mountpoint. diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index dff0f99bdd29..f8e36eb1646c 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -233,7 +233,7 @@ let tries=3 success=false while [[ $success != true ]] && [[ $tries -gt 0 ]]; do - ${systemd}/bin/systemd-ask-password --timeout=${toString cfgZfs.passwordTimeout} "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" \ + ${systemd}/bin/systemd-ask-password ${lib.optionalString cfgZfs.useKeyringForCredentials ("--keyname=zfs-$ds")} --timeout=${toString cfgZfs.passwordTimeout} "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" \ && success=true \ || tries=$((tries - 1)) done @@ -403,6 +403,8 @@ in ''; }; + useKeyringForCredentials = lib.mkEnableOption "Uses the kernel keyring for encryption credentials with keyname=zfs-"; + passwordTimeout = lib.mkOption { type = lib.types.int; default = 0; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 68e5dc88d4be..fb8dab1c33ff 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -578,21 +578,22 @@ in }; networking.fqdn = mkOption { - readOnly = true; type = types.str; default = if (cfg.hostName != "" && cfg.domain != null) then "${cfg.hostName}.${cfg.domain}" else throw '' - The FQDN is required but cannot be determined. Please make sure that - both networking.hostName and networking.domain are set properly. + The FQDN is required but cannot be determined from `networking.hostName` + and `networking.domain`. Please ensure these options are set properly or + set `networking.fqdn` directly. ''; defaultText = literalExpression ''"''${networking.hostName}.''${networking.domain}"''; description = '' - The fully qualified domain name (FQDN) of this host. It is the result - of combining `networking.hostName` and `networking.domain.` Using this - option will result in an evaluation error if the hostname is empty or + The fully qualified domain name (FQDN) of this host. By default, it is + the result of combining `networking.hostName` and `networking.domain.` + + Using this option will result in an evaluation error if the hostname is empty or no domain is specified. Modules that accept a mere `networking.hostName` but prefer a fully qualified @@ -603,17 +604,21 @@ in networking.fqdnOrHostName = mkOption { readOnly = true; type = types.str; - default = if cfg.domain == null then cfg.hostName else cfg.fqdn; + default = + if (cfg.domain != null || opt.fqdn.highestPrio < (mkOptionDefault { }).priority) then + cfg.fqdn + else + cfg.hostName; defaultText = literalExpression '' - if cfg.domain == null then cfg.hostName else cfg.fqdn + if config.networking.domain != null || config.networking.fqdn is set then config.networking.fqdn else config.networking.hostName ''; description = '' Either the fully qualified domain name (FQDN), or just the host name if - it does not exists. + it does not exist. This is a convenience option for modules to read instead of `fqdn` when a mere `hostName` is also an acceptable value; this option does not - throw an error when `domain` is unset. + throw an error when `domain` or `fqdn` is unset. ''; }; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 49594964ed5f..80852be51f1d 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -86,7 +86,6 @@ in enables commands to be sent to test and debug stage 1. Use machine.switch_root() to leave stage 1 and proceed to stage 2 ''; - }; config = { diff --git a/nixos/modules/virtualisation/cloudstack-config.nix b/nixos/modules/virtualisation/cloudstack-config.nix index 7df3c9c613b4..bb08b68a8d39 100644 --- a/nixos/modules/virtualisation/cloudstack-config.nix +++ b/nixos/modules/virtualisation/cloudstack-config.nix @@ -8,9 +8,10 @@ with lib; ]; config = { - fileSystems."/" = { + fileSystems."/" = lib.mkImageMediaOverride { device = "/dev/disk/by-label/nixos"; autoResize = true; + fsType = "ext4"; }; boot.growPartition = true; diff --git a/nixos/modules/virtualisation/gce-images.nix b/nixos/modules/virtualisation/gce-images.nix deleted file mode 100644 index 79631ed025df..000000000000 --- a/nixos/modules/virtualisation/gce-images.nix +++ /dev/null @@ -1,20 +0,0 @@ -let - self = { - "14.12" = "gs://nixos-cloud-images/nixos-14.12.471.1f09b77-x86_64-linux.raw.tar.gz"; - "15.09" = "gs://nixos-cloud-images/nixos-15.09.425.7870f20-x86_64-linux.raw.tar.gz"; - "16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz"; - "17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz"; - "18.03" = "gs://nixos-cloud-images/nixos-image-18.03.132536.fdb5ba4cdf9-x86_64-linux.raw.tar.gz"; - "18.09" = "gs://nixos-cloud-images/nixos-image-18.09.1228.a4c4cbb613c-x86_64-linux.raw.tar.gz"; - - # This format will be handled by the upcoming NixOPS 2.0 release. - # The old images based on a GS object are deprecated. - "20.09" = { - project = "nixos-cloud"; - name = "nixos-image-20-09-3531-3858fbc08e6-x86-64-linux"; - }; - - latest = self."20.09"; - }; -in -self diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 98190e7e2276..e1021c755aea 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -56,6 +56,33 @@ in GZIP compression level of the resulting disk image (1-9). ''; }; + + virtualisation.googleComputeImage.contents = mkOption { + type = with types; listOf attrs; + default = [ ]; + description = '' + The files and directories to be placed in the image. + This is a list of attribute sets {source, target, mode, user, group} where + `source' is the file system object (regular file or directory) to be + grafted in the file system at path `target', `mode' is a string containing + the permissions that will be set (ex. "755"), `user' and `group' are the + user and group name that will be set as owner of the files. + `mode', `user', and `group' are optional. + When setting one of `user' or `group', the other needs to be set too. + ''; + example = literalExpression '' + [ + { + source = ./default.nix; + target = "/etc/nixos/default.nix"; + mode = "0644"; + user = "root"; + group = "root"; + } + ]; + ''; + }; + virtualisation.googleComputeImage.efi = mkEnableOption "EFI booting"; }; @@ -99,6 +126,7 @@ in ''; format = "raw"; configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile; + inherit (cfg) contents; partitionTableType = if cfg.efi then "efi" else "legacy"; inherit (config.virtualisation) diskSize; inherit config lib pkgs; diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 136cd20eee55..6637141d0330 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -129,6 +129,7 @@ let environment = lib.mkMerge [ { + INCUS_DOCUMENTATION = "${cfg.package.doc}/html"; INCUS_EDK2_PATH = ovmf; INCUS_LXC_HOOK = "${cfg.lxcPackage}/share/lxc/hooks"; INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 2fe7406c8362..6d739cb0fa3d 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -410,7 +410,7 @@ in etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e: "allow ${e}") cfg.allowedBridges; systemPackages = with pkgs; [ libressl.nc - iptables + config.networking.firewall.package cfg.package cfg.qemu.package ]; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 14d25ac76569..e5a0d37d6a9c 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -122,9 +122,12 @@ let NIX_BIND_OPT="" if [ -n "$PRIVATE_USERS" ]; then extraFlags+=("--private-users=$PRIVATE_USERS") - if [ "$PRIVATE_USERS" = "pick" ] || { [ "$PRIVATE_USERS" != "identity" ] && [ "$PRIVATE_USERS" -gt 0 ]; }; then - # when user namespacing is enabled, we use `idmap` mount option - # so that bind mounts under /nix get proper owner (and not nobody/nogroup). + if [[ + "$PRIVATE_USERS" = "pick" + || ("$PRIVATE_USERS" =~ ^[[:digit:]]+$ && "$PRIVATE_USERS" -gt 0) + ]]; then + # when user namespacing is enabled, we use `idmap` mount option so that + # bind mounts under /nix get proper owner (and not nobody/nogroup). NIX_BIND_OPT=":idmap" fi fi diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index d81246e31383..0cd9acd9a042 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -416,7 +416,7 @@ let # try logging in, if it fails, check if image exists locally ${cfg.backend} login \ ${container.login.registry} \ - --username ${container.login.username} \ + --username ${escapeShellArg container.login.username} \ --password-stdin < ${container.login.passwordFile} \ || ${cfg.backend} image inspect ${container.image} >/dev/null \ || { echo "image doesn't exist locally and login failed" >&2 ; exit 1; } @@ -434,6 +434,7 @@ let }; effectiveUser = container.podman.user or "root"; + inherit (config.users.users.${effectiveUser}) uid; dependOnLingerService = cfg.backend == "podman" && effectiveUser != "root" && config.users.users.${effectiveUser}.linger; in @@ -441,7 +442,7 @@ let wantedBy = [ ] ++ optional (container.autoStart) "multi-user.target"; wants = lib.optional (container.imageFile == null && container.imageStream == null) "network-online.target" - ++ lib.optional dependOnLingerService "linger-users.service"; + ++ lib.optionals dependOnLingerService [ "linger-users.service" ]; after = lib.optionals (cfg.backend == "docker") [ "docker.service" @@ -452,8 +453,15 @@ let "network-online.target" ] ++ dependsOn - ++ lib.optional dependOnLingerService "linger-users.service"; - requires = dependsOn; + ++ lib.optionals dependOnLingerService [ "linger-users.service" ] + ++ lib.optionals (effectiveUser != "root" && container.podman.sdnotify == "healthy") [ + "user@${toString uid}.service" + ]; + requires = + dependsOn + ++ lib.optionals (effectiveUser != "root" && container.podman.sdnotify == "healthy") [ + "user@${toString uid}.service" + ]; environment = lib.mkMerge [ proxy_env (mkIf (cfg.backend == "podman" && container.podman.user != "root") { @@ -523,6 +531,10 @@ let else "${cfg.backend} rm -f ${name} || true"; + unitConfig = mkIf (effectiveUser != "root") { + RequiresMountsFor = "/run/user/${toString uid}/containers"; + }; + serviceConfig = { ### There is no generalized way of supporting `reload` for docker @@ -616,6 +628,15 @@ in assertion = cfg.backend == "docker" -> podman == null; message = "virtualisation.oci-containers.containers.${name}: Cannot set `podman` option if backend is `docker`."; } + { + assertion = + cfg.backend == "podman" && podman.sdnotify == "healthy" && podman.user != "root" + -> config.users.users.${podman.user}.uid != null; + message = '' + Rootless container ${name} (with podman and sdnotify=healthy) + requires that its running user ${podman.user} has a statically specified uid. + ''; + } ]; in concatMap (name: toAssertions name cfg.containers.${name}) (lib.attrNames cfg.containers); diff --git a/nixos/modules/virtualisation/qemu-guest-agent.nix b/nixos/modules/virtualisation/qemu-guest-agent.nix index 9f12177922be..aa66f7b682ad 100644 --- a/nixos/modules/virtualisation/qemu-guest-agent.nix +++ b/nixos/modules/virtualisation/qemu-guest-agent.nix @@ -25,7 +25,7 @@ in { services.udev.extraRules = '' - SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", TAG+="systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service" + SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", TAG+="systemd", ENV{SYSTEMD_WANTS}="qemu-guest-agent.service" ''; systemd.services.qemu-guest-agent = { diff --git a/nixos/modules/virtualisation/vmware-host.nix b/nixos/modules/virtualisation/vmware-host.nix index cb7156b74047..eaabc2fea551 100644 --- a/nixos/modules/virtualisation/vmware-host.nix +++ b/nixos/modules/virtualisation/vmware-host.nix @@ -75,10 +75,25 @@ in environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages; services.printing.drivers = [ cfg.package ]; - environment.etc."vmware/config".text = '' - ${builtins.readFile "${cfg.package}/etc/vmware/config"} - ${cfg.extraConfig} - ''; + environment.etc."vmware/config".source = + let + packageConfig = "${cfg.package}/etc/vmware/config"; + in + if cfg.extraConfig == "" then + packageConfig + else + pkgs.runCommandLocal "etc-vmware-config" + { + inherit packageConfig; + inherit (cfg) extraConfig; + } + '' + ( + cat "$packageConfig" + printf "\n" + echo "$extraConfig" + ) >"$out" + ''; environment.etc."vmware/bootstrap".source = "${cfg.package}/etc/vmware/bootstrap"; environment.etc."vmware/icu".source = "${cfg.package}/etc/vmware/icu"; diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix index d09bb99939b6..4929b8435170 100644 --- a/nixos/modules/virtualisation/waagent.nix +++ b/nixos/modules/virtualisation/waagent.nix @@ -228,11 +228,11 @@ let }; }; - AutoUpdate.Enable = lib.mkOption { + AutoUpdate.UpdateToLatestVersion = lib.mkOption { type = types.bool; default = false; description = '' - Whether or not to enable autoupdate for goal state processing. + Whether or not to enable auto-update of the Extension Handler. ''; }; }; diff --git a/nixos/release.nix b/nixos/release.nix index 316b66d9bd4e..b7b550fb4721 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -339,32 +339,6 @@ rec { ); - # Test job for https://github.com/NixOS/nixpkgs/issues/121354 to test - # automatic sizing without blocking the channel. - amazonImageAutomaticSize = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] ( - system: - - with import ./.. { inherit system; }; - - hydraJob ( - (import lib/eval-config.nix { - inherit system; - modules = [ - configuration - versionModule - ./maintainers/scripts/ec2/amazon-image.nix - ( - { ... }: - { - virtualisation.diskSize = "auto"; - } - ) - ]; - }).config.system.build.amazonImage - ) - - ); - # An image that can be imported into incus and used for container creation incusContainerImage = forMatchingSystems diff --git a/nixos/tests/acme/http01-builtin.nix b/nixos/tests/acme/http01-builtin.nix index ddc784128fbd..8589190a2667 100644 --- a/nixos/tests/acme/http01-builtin.nix +++ b/nixos/tests/acme/http01-builtin.nix @@ -99,6 +99,45 @@ in "builtin-3.${domain}".listenHTTP = ":80"; }; }; + + csr.configuration = + let + conf = pkgs.writeText "openssl.csr.conf" '' + [req] + default_bits = 2048 + prompt = no + default_md = sha256 + req_extensions = req_ext + distinguished_name = dn + + [ dn ] + CN = ${config.networking.fqdn} + + [ req_ext ] + subjectAltName = @alt_names + + [ alt_names ] + DNS.1 = ${config.networking.fqdn} + ''; + csrData = + pkgs.runCommandNoCC "csr-and-key" + { + buildInputs = [ pkgs.openssl ]; + } + '' + mkdir -p $out + openssl req -new -newkey rsa:2048 -nodes \ + -keyout $out/key.pem \ + -out $out/request.csr \ + -config ${conf} + ''; + in + { + security.acme.certs."${config.networking.fqdn}" = { + csr = "${csrData}/request.csr"; + csrKey = "${csrData}/key.pem"; + }; + }; }; }; }; @@ -211,5 +250,10 @@ in with subtest("Validate permissions (self-signed)"): check_permissions(builtin, cert, "acme") + + with subtest("Can renew using a CSR"): + builtin.succeed(f"systemctl clean acme-{cert}.service --what=state") + switch_to(builtin, "csr") + check_issuer(builtin, cert, "pebble") ''; } diff --git a/nixos/tests/agnos.nix b/nixos/tests/agnos.nix new file mode 100644 index 000000000000..b73f1c021412 --- /dev/null +++ b/nixos/tests/agnos.nix @@ -0,0 +1,209 @@ +{ + system ? builtins.currentSystem, + pkgs ? import ../.. { inherit system; }, + lib ? pkgs.lib, +}: + +let + inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; + nodeIP = n: n.networking.primaryIPAddress; + dnsZone = + nodes: + pkgs.writeText "agnos.test.zone" '' + $TTL 604800 + @ IN SOA ns1.agnos.test. root.agnos.test. ( + 3 ; Serial + 604800 ; Refresh + 86400 ; Retry + 2419200 ; Expire + 604800 ) ; Negative Cache TTL + ; + ; name servers - NS records + IN NS ns1.agnos.test. + + ; name servers - A records + ns1.agnos.test. IN A ${nodeIP nodes.dnsserver} + + agnos-ns.agnos.test. IN A ${nodeIP nodes.server} + _acme-challenge.a.agnos.test. IN NS agnos-ns.agnos.test. + _acme-challenge.b.agnos.test. IN NS agnos-ns.agnos.test. + _acme-challenge.c.agnos.test. IN NS agnos-ns.agnos.test. + _acme-challenge.d.agnos.test. IN NS agnos-ns.agnos.test. + ''; + + mkTest = + { + name, + extraServerConfig ? { }, + checkFirewallClosed ? true, + }: + makeTest { + inherit name; + meta = { + maintainers = with lib.maintainers; [ justinas ]; + }; + + nodes = { + # The fake ACME server which will respond to client requests + acme = + { nodes, pkgs, ... }: + { + imports = [ ./common/acme/server ]; + environment.systemPackages = [ pkgs.netcat ]; + networking.nameservers = lib.mkForce [ (nodeIP nodes.dnsserver) ]; + }; + + # A fake DNS server which points _acme-challenge subdomains to "server" + dnsserver = + { nodes, ... }: + { + networking.firewall.allowedTCPPorts = [ 53 ]; + networking.firewall.allowedUDPPorts = [ 53 ]; + services.bind = { + cacheNetworks = [ "192.168.1.0/24" ]; + enable = true; + extraOptions = '' + dnssec-validation no; + ''; + zones."agnos.test" = { + file = dnsZone nodes; + master = true; + }; + }; + }; + + # The server using agnos to request certificates + server = + { nodes, ... }: + { + imports = [ extraServerConfig ]; + + networking.extraHosts = '' + ${nodeIP nodes.acme} acme.test + ''; + security.agnos = { + enable = true; + generateKeys.enable = true; + persistent = false; + server = "https://acme.test/dir"; + serverCa = ./common/acme/server/ca.cert.pem; + temporarilyOpenFirewall = true; + + settings.accounts = [ + { + email = "webmaster@agnos.test"; + # account with an existing private key + private_key_path = "${./common/acme/server/acme.test.key.pem}"; + + certificates = [ + { + domains = [ "a.agnos.test" ]; + # Absolute paths + fullchain_output_file = "/tmp/a.agnos.test.crt"; + key_output_file = "/tmp/a.agnos.test.key"; + } + + { + domains = [ + "b.agnos.test" + "*.b.agnos.test" + ]; + # Relative paths + fullchain_output_file = "b.agnos.test.crt"; + key_output_file = "b.agnos.test.key"; + } + ]; + } + + { + email = "webmaster2@agnos.test"; + # account with a missing private key, should get generated + private_key_path = "webmaster2.key"; + + certificates = [ + { + domains = [ "c.agnos.test" ]; + # Absolute paths + fullchain_output_file = "/tmp/c.agnos.test.crt"; + key_output_file = "/tmp/c.agnos.test.key"; + } + + { + domains = [ + "d.agnos.test" + "*.d.agnos.test" + ]; + # Relative paths + fullchain_output_file = "d.agnos.test.crt"; + key_output_file = "d.agnos.test.key"; + } + ]; + } + ]; + }; + }; + }; + + testScript = '' + def check_firewall_closed(caller): + """ + Check that TCP port 53 is closed again. + + Since we do not set `networking.firewall.rejectPackets`, + "timed out" indicates a closed port, + while "connection refused" (after agnos has shut down) indicates an open port. + """ + + out = caller.fail("nc -v -z -w 1 server 53 2>&1") + assert "Connection timed out" in out + + start_all() + acme.wait_for_unit('pebble.service') + server.wait_for_unit('default.target') + + # Test that agnos.timer is scheduled + server.succeed("systemctl status agnos.timer") + server.succeed('systemctl start agnos.service') + + expected_perms = "640 agnos agnos" + outputs = [ + "/tmp/a.agnos.test.crt", + "/tmp/a.agnos.test.key", + "/var/lib/agnos/b.agnos.test.crt", + "/var/lib/agnos/b.agnos.test.key", + "/var/lib/agnos/webmaster2.key", + "/tmp/c.agnos.test.crt", + "/tmp/c.agnos.test.key", + "/var/lib/agnos/d.agnos.test.crt", + "/var/lib/agnos/d.agnos.test.key", + ] + for o in outputs: + out = server.succeed(f"stat -c '%a %U %G' {o}").strip() + assert out == expected_perms, \ + f"Expected mode/owner/group to be '{expected_perms}', but it was '{out}'" + + ${lib.optionalString checkFirewallClosed "check_firewall_closed(acme)"} + ''; + }; +in +{ + iptables = mkTest { + name = "iptables"; + }; + + nftables = mkTest { + name = "nftables"; + extraServerConfig = { + networking.nftables.enable = true; + }; + }; + + no-firewall = mkTest { + name = "no-firewall"; + extraServerConfig = { + networking.firewall.enable = lib.mkForce false; + security.agnos.temporarilyOpenFirewall = lib.mkForce false; + }; + checkFirewallClosed = false; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9ee7f01fef1b..5501ffb8b92b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -8,7 +8,7 @@ }: # The return value of this function will be an attrset with arbitrary depth and -# the `anything` returned by callTest at its test leafs. +# the `anything` returned by callTest at its test leaves. # The tests not supported by `system` will be replaced with `{}`, so that # `passthru.tests` can contain links to those without breaking on architectures # where said tests are unsupported. @@ -177,6 +177,7 @@ in agate = runTest ./web-servers/agate.nix; agda = runTest ./agda.nix; age-plugin-tpm-decrypt = runTest ./age-plugin-tpm-decrypt.nix; + agnos = discoverTests (import ./agnos.nix); agorakit = runTest ./web-apps/agorakit.nix; airsonic = runTest ./airsonic.nix; akkoma = runTestOn [ "x86_64-linux" "aarch64-linux" ] { @@ -197,6 +198,7 @@ in amd-sev = runTest ./amd-sev.nix; angie-api = runTest ./angie-api.nix; anki-sync-server = runTest ./anki-sync-server.nix; + anubis = runTest ./anubis.nix; anuko-time-tracker = runTest ./anuko-time-tracker.nix; apcupsd = runTest ./apcupsd.nix; apfs = runTest ./apfs.nix; @@ -208,9 +210,10 @@ in armagetronad = runTest ./armagetronad.nix; artalk = runTest ./artalk.nix; atd = runTest ./atd.nix; - atop = handleTest ./atop.nix { }; + atop = import ./atop.nix { inherit pkgs runTest; }; atticd = runTest ./atticd.nix; atuin = runTest ./atuin.nix; + ax25 = handleTest ./ax25.nix { }; audiobookshelf = runTest ./audiobookshelf.nix; auth-mysql = runTest ./auth-mysql.nix; authelia = runTest ./authelia.nix; @@ -243,7 +246,7 @@ in imports = [ ./binary-cache.nix ]; _module.args.compression = "xz"; }; - bind = handleTest ./bind.nix { }; + bind = runTest ./bind.nix; bird = handleTest ./bird.nix { }; birdwatcher = handleTest ./birdwatcher.nix { }; bitbox-bridge = runTest ./bitbox-bridge.nix; @@ -274,12 +277,10 @@ in cadvisor = handleTestOn [ "x86_64-linux" ] ./cadvisor.nix { }; cage = handleTest ./cage.nix { }; cagebreak = handleTest ./cagebreak.nix { }; - calibre-web = handleTest ./calibre-web.nix { }; - calibre-server = handleTest ./calibre-server.nix { }; + calibre-web = runTest ./calibre-web.nix; + calibre-server = import ./calibre-server.nix { inherit pkgs runTest; }; canaille = handleTest ./canaille.nix { }; castopod = handleTest ./castopod.nix { }; - 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 { }; @@ -294,7 +295,7 @@ in ] ./ceph-single-node-bluestore-dmcrypt.nix { }; certmgr = handleTest ./certmgr.nix { }; cfssl = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cfssl.nix { }; - cgit = handleTest ./cgit.nix { }; + cgit = runTest ./cgit.nix; charliecloud = handleTest ./charliecloud.nix { }; chromadb = runTest ./chromadb.nix; chromium = (handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./chromium.nix { }).stable or { }; @@ -315,7 +316,6 @@ in coder = handleTest ./coder.nix { }; collectd = handleTest ./collectd.nix { }; commafeed = handleTest ./commafeed.nix { }; - conduwuit = runTest ./matrix/conduwuit.nix; connman = handleTest ./connman.nix { }; consul = handleTest ./consul.nix { }; consul-template = handleTest ./consul-template.nix { }; @@ -338,18 +338,41 @@ in containers-unified-hierarchy = handleTest ./containers-unified-hierarchy.nix { }; convos = handleTest ./convos.nix { }; corerad = handleTest ./corerad.nix { }; + cosmic = runTest { + imports = [ ./cosmic.nix ]; + _module.args.testName = "cosmic"; + _module.args.enableAutologin = false; + _module.args.enableXWayland = true; + }; + cosmic-autologin = runTest { + imports = [ ./cosmic.nix ]; + _module.args.testName = "cosmic-autologin"; + _module.args.enableAutologin = true; + _module.args.enableXWayland = true; + }; + cosmic-noxwayland = runTest { + imports = [ ./cosmic.nix ]; + _module.args.testName = "cosmic-noxwayland"; + _module.args.enableAutologin = false; + _module.args.enableXWayland = false; + }; + cosmic-autologin-noxwayland = runTest { + imports = [ ./cosmic.nix ]; + _module.args.testName = "cosmic-autologin-noxwayland"; + _module.args.enableAutologin = true; + _module.args.enableXWayland = false; + }; coturn = handleTest ./coturn.nix { }; couchdb = handleTest ./couchdb.nix { }; crabfit = handleTest ./crabfit.nix { }; cri-o = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cri-o.nix { }; cryptpad = runTest ./cryptpad.nix; - cups-pdf = handleTest ./cups-pdf.nix { }; + cups-pdf = runTest ./cups-pdf.nix; curl-impersonate = handleTest ./curl-impersonate.nix { }; custom-ca = handleTest ./custom-ca.nix { }; croc = handleTest ./croc.nix { }; cross-seed = runTest ./cross-seed.nix; cyrus-imap = runTest ./cyrus-imap.nix; - darling = handleTest ./darling.nix { }; darling-dmg = runTest ./darling-dmg.nix; dae = handleTest ./dae.nix { }; davis = runTest ./davis.nix; @@ -397,7 +420,7 @@ in ecryptfs = handleTest ./ecryptfs.nix { }; fscrypt = handleTest ./fscrypt.nix { }; fastnetmon-advanced = runTest ./fastnetmon-advanced.nix; - eintopf = handleTest ./eintopf.nix { }; + eintopf = runTest ./eintopf.nix; ejabberd = handleTest ./xmpp/ejabberd.nix { }; elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { }; emacs-daemon = runTest ./emacs-daemon.nix; @@ -434,7 +457,7 @@ in evcc = runTest ./evcc.nix; fail2ban = runTest ./fail2ban.nix; fakeroute = handleTest ./fakeroute.nix { }; - fancontrol = handleTest ./fancontrol.nix { }; + fancontrol = runTest ./fancontrol.nix; fanout = handleTest ./fanout.nix { }; fcitx5 = handleTest ./fcitx5 { }; fedimintd = runTest ./fedimintd.nix; @@ -480,7 +503,7 @@ in imports = [ ./firefox.nix ]; _module.args.firefoxPackage = pkgs.floorp; }; - fluent-bit = handleTest ./fluent-bit.nix { }; + fluent-bit = runTest ./fluent-bit.nix; fluentd = handleTest ./fluentd.nix { }; fluidd = handleTest ./fluidd.nix { }; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix { }; @@ -511,12 +534,12 @@ in gemstash = handleTest ./gemstash.nix { }; geoclue2 = runTest ./geoclue2.nix; geoserver = runTest ./geoserver.nix; - gerrit = handleTest ./gerrit.nix { }; + gerrit = runTest ./gerrit.nix; geth = handleTest ./geth.nix { }; ghostunnel = handleTest ./ghostunnel.nix { }; gitdaemon = handleTest ./gitdaemon.nix { }; gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; }; - github-runner = handleTest ./github-runner.nix { }; + github-runner = runTest ./github-runner.nix; gitlab = runTest ./gitlab.nix; gitolite = handleTest ./gitolite.nix { }; gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix { }; @@ -524,7 +547,7 @@ in glances = runTest ./glances.nix; glitchtip = runTest ./glitchtip.nix; glusterfs = handleTest ./glusterfs.nix { }; - gnome = handleTest ./gnome.nix { }; + gnome = runTest ./gnome.nix; gnome-extensions = handleTest ./gnome-extensions.nix { }; gnome-flashback = handleTest ./gnome-flashback.nix { }; gnome-xorg = handleTest ./gnome-xorg.nix { }; @@ -569,9 +592,8 @@ in inherit handleTestOn; package = pkgs.hadoop2; }; - haka = handleTest ./haka.nix { }; haste-server = handleTest ./haste-server.nix { }; - haproxy = handleTest ./haproxy.nix { }; + haproxy = runTest ./haproxy.nix; hardened = handleTest ./hardened.nix { }; harmonia = runTest ./harmonia.nix; headscale = handleTest ./headscale.nix { }; @@ -584,7 +606,7 @@ in herbstluftwm = handleTest ./herbstluftwm.nix { }; homebox = handleTest ./homebox.nix { }; homer = handleTest ./homer { }; - homepage-dashboard = handleTest ./homepage-dashboard.nix { }; + homepage-dashboard = runTest ./homepage-dashboard.nix; honk = runTest ./honk.nix; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { }); invidious = handleTest ./invidious.nix { }; @@ -596,7 +618,7 @@ in odoo = handleTest ./odoo.nix { }; odoo17 = handleTest ./odoo.nix { package = pkgs.odoo17; }; odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; }; - odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; }; + oncall = runTest ./web-apps/oncall.nix; # 9pnet_virtio used to mount /nix partition doesn't support # hibernation. This test happens to work on x86_64-linux but # not on other platforms. @@ -610,7 +632,7 @@ in home-assistant = runTest ./home-assistant.nix; hostname = handleTest ./hostname.nix { }; hound = handleTest ./hound.nix { }; - hub = handleTest ./git/hub.nix { }; + hub = runTest ./git/hub.nix; hydra = runTest ./hydra; i3wm = handleTest ./i3wm.nix { }; icingaweb2 = runTest ./icingaweb2.nix; @@ -655,7 +677,7 @@ in jool = import ./jool.nix { inherit pkgs runTest; }; jotta-cli = handleTest ./jotta-cli.nix { }; k3s = handleTest ./k3s { }; - kafka = handleTest ./kafka.nix { }; + kafka = handleTest ./kafka { }; kanboard = runTest ./web-apps/kanboard.nix; kanidm = handleTest ./kanidm.nix { }; kanidm-provisioning = handleTest ./kanidm-provisioning.nix { }; @@ -671,11 +693,12 @@ in kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix { }; kernel-rust = handleTest ./kernel-rust.nix { }; keter = handleTest ./keter.nix { }; - kexec = handleTest ./kexec.nix { }; + kexec = runTest ./kexec.nix; keycloak = discoverTests (import ./keycloak.nix); keyd = handleTest ./keyd.nix { }; keymap = handleTest ./keymap.nix { }; - kimai = handleTest ./kimai.nix { }; + kimai = runTest ./kimai.nix; + kismet = runTest ./kismet.nix; kmonad = runTest ./kmonad.nix; knot = runTest ./knot.nix; komga = handleTest ./komga.nix { }; @@ -688,10 +711,11 @@ in languagetool = handleTest ./languagetool.nix { }; lanraragi = handleTest ./lanraragi.nix { }; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; + lavalink = runTest ./lavalink.nix; leaps = handleTest ./leaps.nix { }; lemmy = handleTest ./lemmy.nix { }; libinput = handleTest ./libinput.nix { }; - librenms = handleTest ./librenms.nix { }; + librenms = runTest ./librenms.nix; libresprite = handleTest ./libresprite.nix { }; libreswan = runTest ./libreswan.nix; libreswan-nat = runTest ./libreswan-nat.nix; @@ -703,17 +727,19 @@ in libvirtd = handleTest ./libvirtd.nix { }; lidarr = handleTest ./lidarr.nix { }; lightdm = handleTest ./lightdm.nix { }; - lighttpd = handleTest ./lighttpd.nix { }; + lighttpd = runTest ./lighttpd.nix; + livekit = runTest ./networking/livekit.nix; limesurvey = handleTest ./limesurvey.nix { }; limine = import ./limine { inherit runTest; }; listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { }; litellm = runTest ./litellm.nix; litestream = handleTest ./litestream.nix { }; + lk-jwt-service = runTest ./matrix/lk-jwt-service.nix; lldap = handleTest ./lldap.nix { }; localsend = handleTest ./localsend.nix { }; locate = handleTest ./locate.nix { }; login = handleTest ./login.nix { }; - logrotate = handleTest ./logrotate.nix { }; + logrotate = runTest ./logrotate.nix; loki = handleTest ./loki.nix { }; luks = handleTest ./luks.nix { }; lvm2 = handleTest ./lvm2 { }; @@ -740,10 +766,10 @@ in magic-wormhole-mailbox-server = runTest ./magic-wormhole-mailbox-server.nix; magnetico = handleTest ./magnetico.nix { }; mailcatcher = runTest ./mailcatcher.nix; - mailhog = handleTest ./mailhog.nix { }; - mailpit = handleTest ./mailpit.nix { }; - mailman = handleTest ./mailman.nix { }; - man = handleTest ./man.nix { }; + mailhog = runTest ./mailhog.nix; + mailpit = runTest ./mailpit.nix; + mailman = runTest ./mailman.nix; + man = runTest ./man.nix; mariadb-galera = handleTest ./mysql/mariadb-galera.nix { }; marytts = handleTest ./marytts.nix { }; mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; }); @@ -755,6 +781,7 @@ in matrix-alertmanager = runTest ./matrix/matrix-alertmanager.nix; matrix-appservice-irc = runTest ./matrix/appservice-irc.nix; matrix-conduit = handleTest ./matrix/conduit.nix { }; + matrix-continuwuity = runTest ./matrix/continuwuity.nix; matrix-synapse = handleTest ./matrix/synapse.nix { }; matrix-synapse-workers = handleTest ./matrix/synapse-workers.nix { }; mautrix-meta-postgres = handleTest ./matrix/mautrix-meta-postgres.nix { }; @@ -765,7 +792,7 @@ in mediatomb = handleTest ./mediatomb.nix { }; mediawiki = handleTest ./mediawiki.nix { }; meilisearch = handleTest ./meilisearch.nix { }; - memcached = handleTest ./memcached.nix { }; + memcached = runTest ./memcached.nix; merecat = handleTest ./merecat.nix { }; metabase = handleTest ./metabase.nix { }; mihomo = handleTest ./mihomo.nix { }; @@ -795,7 +822,7 @@ in defaults.services.mongodb.package = config.node.pkgs.mongodb-ce; } ); - moodle = handleTest ./moodle.nix { }; + moodle = runTest ./moodle.nix; moonraker = handleTest ./moonraker.nix { }; mopidy = handleTest ./mopidy.nix { }; morph-browser = runTest ./morph-browser.nix; @@ -803,11 +830,11 @@ in mosquitto = runTest ./mosquitto.nix; moosefs = handleTest ./moosefs.nix { }; movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; }; - mpd = handleTest ./mpd.nix { }; + mpd = runTest ./mpd.nix; mpv = runTest ./mpv.nix; mtp = handleTest ./mtp.nix { }; multipass = handleTest ./multipass.nix { }; - mumble = handleTest ./mumble.nix { }; + mumble = runTest ./mumble.nix; # Fails on aarch64-linux at the PDF creation step - need to debug this on an # aarch64 machine.. musescore = handleTestOn [ "x86_64-linux" ] ./musescore.nix { }; @@ -859,7 +886,7 @@ in # TODO: put in networking.nix after the test becomes more complete networkingProxy = handleTest ./networking-proxy.nix { }; nextcloud = handleTest ./nextcloud { }; - nextflow = handleTestOn [ "x86_64-linux" ] ./nextflow.nix { }; + nextflow = runTestOn [ "x86_64-linux" ] ./nextflow.nix; nextjs-ollama-llm-ui = runTest ./web-apps/nextjs-ollama-llm-ui.nix; nexus = handleTest ./nexus.nix { }; # TODO: Test nfsv3 + Kerberos @@ -887,7 +914,7 @@ in nifi = runTestOn [ "x86_64-linux" ] ./web-apps/nifi.nix; nitter = handleTest ./nitter.nix { }; nix-config = handleTest ./nix-config.nix { }; - nix-ld = handleTest ./nix-ld.nix { }; + nix-ld = runTest ./nix-ld.nix; nix-misc = handleTest ./nix/misc.nix { }; nix-upgrade = handleTest ./nix/upgrade.nix { inherit (pkgs) nixVersions; }; nix-required-mounts = runTest ./nix-required-mounts; @@ -923,7 +950,7 @@ in nomad = runTest ./nomad.nix; non-default-filesystems = handleTest ./non-default-filesystems.nix { }; non-switchable-system = runTest ./non-switchable-system.nix; - noto-fonts = handleTest ./noto-fonts.nix { }; + noto-fonts = runTest ./noto-fonts.nix; noto-fonts-cjk-qt-default-weight = handleTest ./noto-fonts-cjk-qt-default-weight.nix { }; novacomd = handleTestOn [ "x86_64-linux" ] ./novacomd.nix { }; npmrc = handleTest ./npmrc.nix { }; @@ -939,13 +966,16 @@ in nzbhydra2 = handleTest ./nzbhydra2.nix { }; ocis = handleTest ./ocis.nix { }; oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { }; - obs-studio = handleTest ./obs-studio.nix { }; + obs-studio = runTest ./obs-studio.nix; oh-my-zsh = handleTest ./oh-my-zsh.nix { }; + olivetin = runTest ./olivetin.nix; ollama = runTest ./ollama.nix; ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix; ollama-rocm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-rocm.nix; ombi = handleTest ./ombi.nix { }; openarena = handleTest ./openarena.nix { }; + openbao = runTest ./openbao.nix; + opencloud = runTest ./opencloud.nix; openldap = handleTest ./openldap.nix { }; opensearch = discoverTests (import ./opensearch.nix); openresty-lua = handleTest ./openresty-lua.nix { }; @@ -965,6 +995,7 @@ in orthanc = runTest ./orthanc.nix; owncast = handleTest ./owncast.nix { }; outline = handleTest ./outline.nix { }; + i18n = runTest ./i18n.nix; image-contents = handleTest ./image-contents.nix { }; openvscode-server = handleTest ./openvscode-server.nix { }; open-webui = runTest ./open-webui.nix; @@ -990,13 +1021,14 @@ in paperless = handleTest ./paperless.nix { }; parsedmarc = handleTest ./parsedmarc { }; password-option-override-ordering = handleTest ./password-option-override-ordering.nix { }; - pdns-recursor = handleTest ./pdns-recursor.nix { }; + pdns-recursor = runTest ./pdns-recursor.nix; pds = handleTest ./pds.nix { }; peerflix = handleTest ./peerflix.nix { }; peering-manager = handleTest ./web-apps/peering-manager.nix { }; peertube = handleTestOn [ "x86_64-linux" ] ./web-apps/peertube.nix { }; peroxide = handleTest ./peroxide.nix { }; pgadmin4 = runTest ./pgadmin4.nix; + pgbackrest = import ./pgbackrest { inherit runTest; }; pgbouncer = handleTest ./pgbouncer.nix { }; pghero = runTest ./pghero.nix; pgweb = runTest ./pgweb.nix; @@ -1039,6 +1071,7 @@ in pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix { }; plikd = handleTest ./plikd.nix { }; plotinus = handleTest ./plotinus.nix { }; + pocket-id = handleTest ./pocket-id.nix { }; podgrab = handleTest ./podgrab.nix { }; podman = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./podman/default.nix { }; podman-tls-ghostunnel = handleTestOn [ @@ -1053,6 +1086,7 @@ in handleTest ./postfix-raise-smtpd-tls-security-level.nix { }; postfixadmin = handleTest ./postfixadmin.nix { }; + postgres-websockets = runTest ./postgres-websockets.nix; postgresql = handleTest ./postgresql { }; postgrest = runTest ./postgrest.nix; powerdns = handleTest ./powerdns.nix { }; @@ -1063,26 +1097,30 @@ in pretalx = runTest ./web-apps/pretalx.nix; prefect = runTest ./prefect.nix; pretix = runTest ./web-apps/pretix.nix; - printing-socket = handleTest ./printing.nix { - socket = true; - listenTcp = true; + printing-socket = runTest { + imports = [ ./printing.nix ]; + _module.args.socket = true; + _module.args.listenTcp = true; }; - printing-service = handleTest ./printing.nix { - socket = false; - listenTcp = true; + printing-service = runTest { + imports = [ ./printing.nix ]; + _module.args.socket = false; + _module.args.listenTcp = true; }; - printing-socket-notcp = handleTest ./printing.nix { - socket = true; - listenTcp = false; + printing-socket-notcp = runTest { + imports = [ ./printing.nix ]; + _module.args.socket = true; + _module.args.listenTcp = false; }; - printing-service-notcp = handleTest ./printing.nix { - socket = false; - listenTcp = false; + printing-service-notcp = runTest { + imports = [ ./printing.nix ]; + _module.args.socket = false; + _module.args.listenTcp = false; }; private-gpt = handleTest ./private-gpt.nix { }; privatebin = runTest ./privatebin.nix; privoxy = handleTest ./privoxy.nix { }; - prometheus = handleTest ./prometheus { }; + prometheus = import ./prometheus { inherit runTest; }; prometheus-exporters = handleTest ./prometheus-exporters.nix { }; prosody = handleTest ./xmpp/prosody.nix { }; prosody-mysql = handleTest ./xmpp/prosody-mysql.nix { }; @@ -1122,6 +1160,7 @@ in redmine = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./redmine.nix { }; renovate = handleTest ./renovate.nix { }; replace-dependencies = handleTest ./replace-dependencies { }; + reposilite = runTest ./reposilite.nix; restartByActivationScript = handleTest ./restart-by-activation-script.nix { }; restic-rest-server = handleTest ./restic-rest-server.nix { }; restic = handleTest ./restic.nix { }; @@ -1143,10 +1182,11 @@ in rsyslogd = handleTest ./rsyslogd.nix { }; rtkit = runTest ./rtkit.nix; rtorrent = handleTest ./rtorrent.nix { }; + rush = runTest ./rush.nix; rustls-libssl = handleTest ./rustls-libssl.nix { }; rxe = handleTest ./rxe.nix { }; sabnzbd = handleTest ./sabnzbd.nix { }; - samba = handleTest ./samba.nix { }; + samba = runTest ./samba.nix; samba-wsdd = handleTest ./samba-wsdd.nix { }; sane = handleTest ./sane.nix { }; sanoid = handleTest ./sanoid.nix { }; @@ -1155,6 +1195,7 @@ in schleuder = handleTest ./schleuder.nix { }; scion-freestanding-deployment = handleTest ./scion/freestanding-deployment { }; scrutiny = runTest ./scrutiny.nix; + scx = runTest ./scx/default.nix; sddm = handleTest ./sddm.nix { }; sdl3 = handleTest ./sdl3.nix { }; seafile = handleTest ./seafile.nix { }; @@ -1171,7 +1212,7 @@ in shadowsocks = handleTest ./shadowsocks { }; shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix { }; shiori = handleTest ./shiori.nix { }; - signal-desktop = handleTest ./signal-desktop.nix { }; + signal-desktop = runTest ./signal-desktop.nix; silverbullet = handleTest ./silverbullet.nix { }; simple = handleTest ./simple.nix { }; sing-box = handleTest ./sing-box.nix { }; @@ -1202,9 +1243,9 @@ in sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix { }; stalwart-mail = handleTest ./stalwart-mail.nix { }; stargazer = runTest ./web-servers/stargazer.nix; - starship = handleTest ./starship.nix { }; + starship = runTest ./starship.nix; stash = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stash.nix { }; - static-web-server = handleTest ./web-servers/static-web-server.nix { }; + static-web-server = runTest ./web-servers/static-web-server.nix; step-ca = handleTestOn [ "x86_64-linux" ] ./step-ca.nix { }; stratis = handleTest ./stratis { }; strongswan-swanctl = handleTest ./strongswan-swanctl.nix { }; @@ -1235,6 +1276,7 @@ in syncthing-no-settings = handleTest ./syncthing-no-settings.nix { }; syncthing-init = handleTest ./syncthing-init.nix { }; syncthing-many-devices = handleTest ./syncthing-many-devices.nix { }; + syncthing-folders = runTest ./syncthing-folders.nix; syncthing-relay = handleTest ./syncthing-relay.nix { }; sysinit-reactivation = runTest ./sysinit-reactivation.nix; systemd = handleTest ./systemd.nix { }; @@ -1259,7 +1301,7 @@ in systemd-initrd-luks-unl0kr = handleTest ./systemd-initrd-luks-unl0kr.nix { }; systemd-initrd-modprobe = handleTest ./systemd-initrd-modprobe.nix { }; systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; }; - systemd-initrd-simple = handleTest ./systemd-initrd-simple.nix { }; + systemd-initrd-simple = runTest ./systemd-initrd-simple.nix; systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix { }; systemd-initrd-vconsole = handleTest ./systemd-initrd-vconsole.nix { }; systemd-initrd-networkd = handleTest ./systemd-initrd-networkd.nix { }; @@ -1291,6 +1333,7 @@ in systemd-portabled = handleTest ./systemd-portabled.nix { }; systemd-repart = handleTest ./systemd-repart.nix { }; systemd-resolved = handleTest ./systemd-resolved.nix { }; + systemd-ssh-proxy = runTest ./systemd-ssh-proxy.nix; systemd-shutdown = handleTest ./systemd-shutdown.nix { }; systemd-sysupdate = runTest ./systemd-sysupdate.nix; systemd-sysusers-mutable = runTest ./systemd-sysusers-mutable.nix; @@ -1350,15 +1393,17 @@ in tuptime = handleTest ./tuptime.nix { }; turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix { }; turn-rs = handleTest ./turn-rs.nix { }; - tuxguitar = handleTest ./tuxguitar.nix { }; + tusd = runTest ./tusd/default.nix; + tuxguitar = runTest ./tuxguitar.nix; twingate = runTest ./twingate.nix; typesense = handleTest ./typesense.nix { }; + tzupdate = runTest ./tzupdate.nix; ucarp = handleTest ./ucarp.nix { }; udisks2 = handleTest ./udisks2.nix { }; ulogd = handleTest ./ulogd/ulogd.nix { }; umurmur = handleTest ./umurmur.nix { }; unbound = handleTest ./unbound.nix { }; - unifi = handleTest ./unifi.nix { }; + unifi = runTest ./unifi.nix; unit-php = runTest ./web-servers/unit-php.nix; unit-perl = handleTest ./web-servers/unit-perl.nix { }; upnp.iptables = handleTest ./upnp.nix { useNftables = false; }; @@ -1383,13 +1428,9 @@ in imports = [ ./varnish.nix ]; _module.args.package = pkgs.varnish60; }; - varnish75 = runTest { + varnish77 = runTest { imports = [ ./varnish.nix ]; - _module.args.package = pkgs.varnish75; - }; - varnish76 = runTest { - imports = [ ./varnish.nix ]; - _module.args.package = pkgs.varnish76; + _module.args.package = pkgs.varnish77; }; vault = handleTest ./vault.nix { }; vault-agent = handleTest ./vault-agent.nix { }; @@ -1411,11 +1452,12 @@ in wakapi = runTest ./wakapi.nix; warzone2100 = handleTest ./warzone2100.nix { }; wasabibackend = handleTest ./wasabibackend.nix { }; - wastebin = handleTest ./wastebin.nix { }; + wastebin = runTest ./wastebin.nix; watchdogd = handleTest ./watchdogd.nix { }; webhook = runTest ./webhook.nix; weblate = handleTest ./web-apps/weblate.nix { }; whisparr = handleTest ./whisparr.nix { }; + whoami = runTest ./whoami.nix; whoogle-search = handleTest ./whoogle-search.nix { }; wiki-js = runTest ./wiki-js.nix; wine = handleTest ./wine.nix { }; @@ -1427,7 +1469,7 @@ in wpa_supplicant = import ./wpa_supplicant.nix { inherit pkgs runTest; }; wordpress = runTest ./wordpress.nix; wrappers = handleTest ./wrappers.nix { }; - writefreely = handleTest ./web-apps/writefreely.nix { }; + writefreely = import ./web-apps/writefreely.nix { inherit pkgs runTest; }; wstunnel = runTest ./wstunnel.nix; xandikos = runTest ./xandikos.nix; xautolock = runTest ./xautolock.nix; @@ -1443,6 +1485,7 @@ in xterm = runTest ./xterm.nix; xxh = runTest ./xxh.nix; yabar = runTest ./yabar.nix; + yarr = runTest ./yarr.nix; ydotool = handleTest ./ydotool.nix { }; yggdrasil = runTest ./yggdrasil.nix; your_spotify = runTest ./your_spotify.nix; diff --git a/nixos/tests/anubis.nix b/nixos/tests/anubis.nix new file mode 100644 index 000000000000..e5f643ed1cca --- /dev/null +++ b/nixos/tests/anubis.nix @@ -0,0 +1,123 @@ +{ lib, ... }: +{ + name = "anubis"; + meta.maintainers = with lib.maintainers; [ + soopyc + nullcube + ]; + + nodes.machine = + { + config, + pkgs, + ... + }: + { + services.anubis = { + defaultOptions.settings = { + DIFFICULTY = 3; + USER_DEFINED_DEFAULT = true; + }; + instances = { + "".settings = { + TARGET = "http://localhost:8080"; + DIFFICULTY = 5; + USER_DEFINED_INSTANCE = true; + }; + + "tcp" = { + user = "anubis-tcp"; + group = "anubis-tcp"; + settings = { + TARGET = "http://localhost:8080"; + BIND = ":9000"; + BIND_NETWORK = "tcp"; + METRICS_BIND = ":9001"; + METRICS_BIND_NETWORK = "tcp"; + }; + }; + + "unix-upstream" = { + group = "nginx"; + settings.TARGET = "unix:///run/nginx/nginx.sock"; + }; + }; + }; + + # support + users.users.nginx.extraGroups = [ config.users.groups.anubis.name ]; + services.nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts."basic.localhost".locations = { + "/".proxyPass = "http://unix:${config.services.anubis.instances."".settings.BIND}"; + "/metrics".proxyPass = "http://unix:${config.services.anubis.instances."".settings.METRICS_BIND}"; + }; + + virtualHosts."tcp.localhost".locations = { + "/".proxyPass = "http://localhost:9000"; + "/metrics".proxyPass = "http://localhost:9001"; + }; + + virtualHosts."unix.localhost".locations = { + "/".proxyPass = "http://unix:${config.services.anubis.instances.unix-upstream.settings.BIND}"; + }; + + # emulate an upstream with nginx, listening on tcp and unix sockets. + virtualHosts."upstream.localhost" = { + default = true; # make nginx match this vhost for `localhost` + listen = [ + { addr = "unix:/run/nginx/nginx.sock"; } + { + addr = "localhost"; + port = 8080; + } + ]; + locations."/" = { + tryFiles = "$uri $uri/index.html =404"; + root = pkgs.runCommand "anubis-test-upstream" { } '' + mkdir $out + echo "it works" >> $out/index.html + ''; + }; + }; + }; + }; + + testScript = '' + for unit in ["nginx", "anubis", "anubis-tcp", "anubis-unix-upstream"]: + machine.wait_for_unit(unit + ".service") + + for port in [9000, 9001]: + machine.wait_for_open_port(port) + + for instance in ["anubis", "anubis-unix-upstream"]: + machine.wait_for_open_unix_socket(f"/run/anubis/{instance}.sock") + machine.wait_for_open_unix_socket(f"/run/anubis/{instance}-metrics.sock") + + # Default unix socket mode + machine.succeed('curl -f http://basic.localhost | grep "it works"') + machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis') + machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued') + machine.succeed('curl -f -X POST http://basic.localhost/.within.website/x/cmd/anubis/api/make-challenge | grep challenge') + + # TCP mode + machine.succeed('curl -f http://tcp.localhost -H "User-Agent: Mozilla" | grep anubis') + machine.succeed('curl -f http://tcp.localhost/metrics | grep anubis_challenges_issued') + + # Upstream is a unix socket mode + machine.succeed('curl -f http://unix.localhost/index.html | grep "it works"') + + # Default user-defined environment variables + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_DEFAULT"') + machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_DEFAULT"') + + # Instance-specific user-specified environment variables + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_INSTANCE"') + machine.fail('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_INSTANCE"') + + # Make sure defaults don't overwrite themselves + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "DIFFICULTY=5"') + machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "DIFFICULTY=3"') + ''; +} diff --git a/nixos/tests/armagetronad.nix b/nixos/tests/armagetronad.nix index 392cdb0437bb..4e7833b3520b 100644 --- a/nixos/tests/armagetronad.nix +++ b/nixos/tests/armagetronad.nix @@ -115,7 +115,7 @@ in self.node.wait_for_text(text) self.send(*keys) - Server = namedtuple('Server', ('node', 'name', 'address', 'port', 'welcome', 'attacker', 'victim', 'coredump_delay')) + Server = namedtuple('Server', ('node', 'name', 'address', 'port', 'welcome', 'player1', 'player2')) # Clients and their in-game names clients = ( @@ -125,9 +125,9 @@ in # Server configs. servers = ( - Server(server, 'high-rubber', 'server', 4534, 'NixOS Smoke Test Server', 'SmOoThIcE', 'Arduino', 8), - Server(server, 'sty', 'server', 4535, 'NixOS Smoke Test sty+ct+ap Server', 'Arduino', 'SmOoThIcE', 8), - Server(server, 'trunk', 'server', 4536, 'NixOS Smoke Test 0.4 Server', 'Arduino', 'SmOoThIcE', 8) + Server(server, 'high-rubber', 'server', 4534, 'NixOS Smoke Test Server', 'SmOoThIcE', 'Arduino'), + Server(server, 'sty', 'server', 4535, 'NixOS Smoke Test sty+ct+ap Server', 'Arduino', 'SmOoThIcE'), + Server(server, 'trunk', 'server', 4536, 'NixOS Smoke Test 0.4 Server', 'Arduino', 'SmOoThIcE') ) """ @@ -146,8 +146,55 @@ in client.node.screenshot(f"screen_{client.name}_{screenshot_idx}") return screenshot_idx + 1 - # Wait for the servers to come up. + """ + Sets up a client, waiting for the given barrier on completion. + """ + def client_setup(client, servers, barrier): + client.node.wait_for_x() + + # Configure Armagetron so we skip the tutorial. + client.node.succeed( + run("mkdir -p ~/.armagetronad/var"), + run(f"echo 'PLAYER_1 {client.name}' >> ~/.armagetronad/var/autoexec.cfg"), + run("echo 'FIRST_USE 0' >> ~/.armagetronad/var/autoexec.cfg") + ) + for idx, srv in enumerate(servers): + client.node.succeed( + run(f"echo 'BOOKMARK_{idx+1}_ADDRESS {srv.address}' >> ~/.armagetronad/var/autoexec.cfg"), + run(f"echo 'BOOKMARK_{idx+1}_NAME {srv.name}' >> ~/.armagetronad/var/autoexec.cfg"), + run(f"echo 'BOOKMARK_{idx+1}_PORT {srv.port}' >> ~/.armagetronad/var/autoexec.cfg") + ) + + # Start Armagetron. Use the recording mode since it skips the splashscreen. + client.node.succeed(run("cd; ulimit -c unlimited; armagetronad --record test.aarec >&2 & disown")) + client.node.wait_until_succeeds( + run( + "${xdo "create_new_win-select_main_window" '' + search --onlyvisible --name "Armagetron Advanced" + windowfocus --sync + windowactivate --sync + ''}" + ) + ) + + # Get into the multiplayer menu. + client.send_on('Armagetron Advanced', 'ret') + client.send_on('Play Game', 'ret') + + # Online > LAN > Network Setup > Mates > Server Bookmarks + client.send_on('Multiplayer', 'down', 'down', 'down', 'down', 'ret') + + barrier.wait() + + # Start everything. start_all() + + # Get to the Server Bookmarks screen on both clients. This takes a while so do it asynchronously. + barrier = threading.Barrier(len(clients) + 1, timeout=600) + for client in clients: + threading.Thread(target=client_setup, args=(client, servers, barrier)).start() + + # Wait for the servers to come up. for srv in servers: srv.node.wait_for_unit(f"armagetronad-{srv.name}") srv.node.wait_until_succeeds(f"ss --numeric --udp --listening | grep -q {srv.port}") @@ -167,55 +214,7 @@ in f"journalctl -u armagetronad-{srv.name} -e | grep -q 'Admin: Testing again!'" ) - """ - Sets up a client, waiting for the given barrier on completion. - """ - def client_setup(client, servers, barrier): - client.node.wait_for_x() - - # Configure Armagetron. - client.node.succeed( - run("mkdir -p ~/.armagetronad/var"), - run(f"echo 'PLAYER_1 {client.name}' >> ~/.armagetronad/var/autoexec.cfg") - ) - for idx, srv in enumerate(servers): - client.node.succeed( - run(f"echo 'BOOKMARK_{idx+1}_ADDRESS {srv.address}' >> ~/.armagetronad/var/autoexec.cfg"), - run(f"echo 'BOOKMARK_{idx+1}_NAME {srv.name}' >> ~/.armagetronad/var/autoexec.cfg"), - run(f"echo 'BOOKMARK_{idx+1}_PORT {srv.port}' >> ~/.armagetronad/var/autoexec.cfg") - ) - - # Start Armagetron. - client.node.succeed(run("ulimit -c unlimited; armagetronad >&2 & disown")) - client.node.wait_until_succeeds( - run( - "${xdo "create_new_win-select_main_window" '' - search --onlyvisible --name "Armagetron Advanced" - windowfocus --sync - windowactivate --sync - ''}" - ) - ) - - # Get through the tutorial. - client.send_on('Language Settings', 'ret') - client.send_on('First Setup', 'ret') - client.send_on('Welcome to Armagetron Advanced', 'ret') - client.send_on('round 1', 'esc') - client.send_on('Menu', 'up', 'up', 'ret') - client.send_on('We hope you', 'ret') - client.send_on('Armagetron Advanced', 'ret') - client.send_on('Play Game', 'ret') - - # Online > LAN > Network Setup > Mates > Server Bookmarks - client.send_on('Multiplayer', 'down', 'down', 'down', 'down', 'ret') - - barrier.wait() - - # Get to the Server Bookmarks screen on both clients. This takes a while so do it asynchronously. - barrier = threading.Barrier(len(clients) + 1, timeout=240) - for client in clients: - threading.Thread(target=client_setup, args=(client, servers, barrier)).start() + # Wait for the client setup to complete. barrier.wait() # Main testing loop. Iterates through each server bookmark and connects to them in sequence. @@ -245,18 +244,14 @@ in f"journalctl -u armagetronad-{srv.name} -e | grep -q 'Go (round 1 of 10)'" ) - # Wait a bit - srv.node.sleep(srv.coredump_delay) - - # Turn the attacker player's lightcycle left - attacker = next(client for client in clients if client.name == srv.attacker) - victim = next(client for client in clients if client.name == srv.victim) - attacker.send('left') - screenshot_idx = take_screenshots(screenshot_idx) - - # Wait for coredump. + # Wait for the players to die by running into the wall. + player1 = next(client for client in clients if client.name == srv.player1) + player2 = next(client for client in clients if client.name == srv.player2) srv.node.wait_until_succeeds( - f"journalctl -u armagetronad-{srv.name} -e | grep -q '{attacker.name} core dumped {victim.name}'" + f"journalctl -u armagetronad-{srv.name} -e | grep -q '{player1.name}.*lost 4 points'" + ) + srv.node.wait_until_succeeds( + f"journalctl -u armagetronad-{srv.name} -e | grep -q '{player2.name}.*lost 4 points'" ) screenshot_idx = take_screenshots(screenshot_idx) diff --git a/nixos/tests/atop.nix b/nixos/tests/atop.nix index d2372c80c3f9..376c44f9bd88 100644 --- a/nixos/tests/atop.nix +++ b/nixos/tests/atop.nix @@ -1,12 +1,9 @@ { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, + pkgs, + runTest, + ... }: -with import ../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; - let assertions = rec { path = program: path: '' @@ -129,7 +126,7 @@ let }; in { - justThePackage = makeTest { + justThePackage = runTest { name = "atop-justThePackage"; nodes.machine = { environment.systemPackages = [ pkgs.atop ]; @@ -148,7 +145,7 @@ in ]; inherit meta; }; - defaults = makeTest { + defaults = runTest { name = "atop-defaults"; nodes.machine = { programs.atop = { @@ -169,7 +166,7 @@ in ]; inherit meta; }; - minimal = makeTest { + minimal = runTest { name = "atop-minimal"; nodes.machine = { programs.atop = { @@ -193,7 +190,7 @@ in ]; inherit meta; }; - netatop = makeTest { + netatop = runTest { name = "atop-netatop"; nodes.machine = { programs.atop = { @@ -215,7 +212,7 @@ in ]; inherit meta; }; - atopgpu = makeTest { + atopgpu = runTest { name = "atop-atopgpu"; nodes.machine = { programs.atop = { @@ -237,7 +234,7 @@ in ]; inherit meta; }; - everything = makeTest { + everything = runTest { name = "atop-everything"; nodes.machine = { programs.atop = { diff --git a/nixos/tests/ax25.nix b/nixos/tests/ax25.nix new file mode 100644 index 000000000000..f1092d5de101 --- /dev/null +++ b/nixos/tests/ax25.nix @@ -0,0 +1,131 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + let + + baud = 57600; + tty = "/dev/ttyACM0"; + port = "tnc0"; + socatPort = 1234; + + createAX25Node = nodeId: { + + boot.kernelPackages = pkgs.linuxPackages_ham; + boot.kernelModules = [ "ax25" ]; + + networking.firewall.allowedTCPPorts = [ socatPort ]; + + environment.systemPackages = with pkgs; [ + libax25 + ax25-tools + ax25-apps + socat + ]; + + services.ax25.axports."${port}" = { + inherit baud tty; + enable = true; + callsign = "NOCALL-${toString nodeId}"; + description = "mocked tnc"; + }; + + services.ax25.axlisten = { + enable = true; + }; + + # All mocks radios will connect back to socat-broker on node 1 in order to get + # all messages that are "broadcasted over the ether" + systemd.services.ax25-mock-hardware = { + description = "mock AX.25 TNC and Radio"; + wantedBy = [ "default.target" ]; + before = [ + "ax25-kissattach-${port}.service" + "axlisten.service" + ]; + after = [ "network.target" ]; + serviceConfig = { + Type = "exec"; + ExecStart = "${pkgs.socat}/bin/socat -d -d tcp:192.168.1.1:${toString socatPort} pty,link=${tty},b${toString baud},raw"; + }; + }; + }; + in + { + name = "ax25Simple"; + nodes = { + node1 = lib.mkMerge [ + (createAX25Node 1) + # mimicking radios on the same frequency + { + systemd.services.ax25-mock-ether = { + description = "mock radio ether"; + wantedBy = [ "default.target" ]; + requires = [ "network.target" ]; + before = [ "ax25-mock-hardware.service" ]; + # broken needs access to "ss" or "netstat" + path = [ pkgs.iproute2 ]; + serviceConfig = { + Type = "exec"; + ExecStart = "${pkgs.socat}/bin/socat-broker.sh tcp4-listen:${toString socatPort}"; + }; + postStart = "${pkgs.coreutils}/bin/sleep 2"; + }; + } + ]; + node2 = createAX25Node 2; + node3 = createAX25Node 3; + }; + testScript = + { ... }: + '' + def wait_for_machine(m): + m.succeed("lsmod | grep ax25") + m.wait_for_unit("ax25-axports.target") + m.wait_for_unit("axlisten.service") + m.fail("journalctl -o cat -u axlisten.service | grep -i \"no AX.25 port data configured\"") + + # start the first node since the socat-broker needs to be running + node1.start() + node1.wait_for_unit("ax25-mock-ether.service") + wait_for_machine(node1) + + node2.start() + node3.start() + wait_for_machine(node2) + wait_for_machine(node3) + + # Node 1 -> Node 2 + node1.succeed("echo hello | ax25_call ${port} NOCALL-1 NOCALL-2") + node2.sleep(1) + node2.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-1 to NOCALL-2 ctl I00\" | grep hello") + + # Node 1 -> Node 3 + node1.succeed("echo hello | ax25_call ${port} NOCALL-1 NOCALL-3") + node3.sleep(1) + node3.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-1 to NOCALL-3 ctl I00\" | grep hello") + + # Node 2 -> Node 1 + # must sleep due to previous ax25_call lingering + node2.sleep(5) + node2.succeed("echo hello | ax25_call ${port} NOCALL-2 NOCALL-1") + node1.sleep(1) + node1.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-2 to NOCALL-1 ctl I00\" | grep hello") + + # Node 2 -> Node 3 + node2.succeed("echo hello | ax25_call ${port} NOCALL-2 NOCALL-3") + node3.sleep(1) + node3.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-2 to NOCALL-3 ctl I00\" | grep hello") + + # Node 3 -> Node 1 + # must sleep due to previous ax25_call lingering + node3.sleep(5) + node3.succeed("echo hello | ax25_call ${port} NOCALL-3 NOCALL-1") + node1.sleep(1) + node1.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-3 to NOCALL-1 ctl I00\" | grep hello") + + # Node 3 -> Node 2 + node3.succeed("echo hello | ax25_call ${port} NOCALL-3 NOCALL-2") + node2.sleep(1) + node2.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-3 to NOCALL-2 ctl I00\" | grep hello") + ''; + } +) diff --git a/nixos/tests/bind.nix b/nixos/tests/bind.nix index 5eb75392a382..3b2edec9d19e 100644 --- a/nixos/tests/bind.nix +++ b/nixos/tests/bind.nix @@ -1,4 +1,5 @@ -import ./make-test-python.nix { +{ ... }: +{ name = "bind"; nodes.machine = diff --git a/nixos/tests/bitbox-bridge.nix b/nixos/tests/bitbox-bridge.nix index 0fe4ea94acb9..ab1140e2511c 100644 --- a/nixos/tests/bitbox-bridge.nix +++ b/nixos/tests/bitbox-bridge.nix @@ -5,13 +5,10 @@ let in { name = "bitbox-bridge"; - meta = { - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ - izelnakri - tensor5 - ]; - }; + meta.maintainers = with lib.maintainers; [ + izelnakri + tensor5 + ]; nodes.machine = { services.bitbox-bridge = { diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index 11e88bd3d891..e15797765462 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -65,20 +65,24 @@ let iso = (import ../lib/eval-config.nix { - inherit system; + system = null; modules = [ ../modules/installer/cd-dvd/installation-cd-minimal.nix ../modules/testing/test-instrumentation.nix + { nixpkgs.pkgs = pkgs; } ]; }).config.system.build.isoImage; sd = (import ../lib/eval-config.nix { - inherit system; + system = null; modules = [ ../modules/installer/sd-card/sd-image-x86_64.nix ../modules/testing/test-instrumentation.nix - { sdImage.compressImage = false; } + { + sdImage.compressImage = false; + nixpkgs.pkgs = pkgs; + } ]; }).config.system.build.sdImage; @@ -109,7 +113,7 @@ let let config = (import ../lib/eval-config.nix { - inherit system; + system = null; modules = [ ../modules/installer/netboot/netboot.nix ../modules/testing/test-instrumentation.nix @@ -118,6 +122,8 @@ let "serial" "live.nixos.passwordHash=$6$jnwR50SkbLYEq/Vp$wmggwioAkfmwuYqd5hIfatZWS/bO6hewzNIwIrWcgdh7k/fhUzZT29Vil3ioMo94sdji/nipbzwEpxecLZw0d0" # "password" ]; + + nixpkgs.pkgs = pkgs; } { key = "serial"; diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index b7cf6ff10cc9..357ebe77f060 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -74,7 +74,7 @@ services.caddy = { package = pkgs.caddy.withPlugins { plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20241211194404-3865845790a7" ]; - hash = "sha256-WPmJPnyOrAnuJxvn3ywswqvLGV8SZzzn3gU1Tbtpao4="; + hash = "sha256-BJ+//h/bkj6y2Zhxas8oJyrryiTDR2Qpz7+VloqrbwQ="; }; configFile = pkgs.writeText "Caddyfile" '' { diff --git a/nixos/tests/calibre-server.nix b/nixos/tests/calibre-server.nix index 2a04dd8cfba4..059058778526 100644 --- a/nixos/tests/calibre-server.nix +++ b/nixos/tests/calibre-server.nix @@ -1,11 +1,10 @@ { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, + pkgs, + runTest, + ... }: let - inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; inherit (pkgs.lib) concatStringsSep maintainers @@ -74,7 +73,7 @@ let in mapAttrs ( test: testConfig: - (makeTest ( + (runTest ( let nodeName = testConfig.nodeName or test; calibreConfig = { diff --git a/nixos/tests/calibre-web.nix b/nixos/tests/calibre-web.nix index d14f1b540809..cf66ed1f1921 100644 --- a/nixos/tests/calibre-web.nix +++ b/nixos/tests/calibre-web.nix @@ -1,44 +1,42 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: +{ lib, ... }: - let - port = 3142; - defaultPort = 8083; - in - { - name = "calibre-web"; - meta.maintainers = with lib.maintainers; [ pborzenkov ]; +let + port = 3142; + defaultPort = 8083; +in +{ + name = "calibre-web"; + meta.maintainers = with lib.maintainers; [ pborzenkov ]; - nodes = { - customized = - { pkgs, ... }: - { - services.calibre-web = { - enable = true; - listen.port = port; - options = { - calibreLibrary = "/tmp/books"; - reverseProxyAuth = { - enable = true; - header = "X-User"; - }; + nodes = { + customized = + { pkgs, ... }: + { + services.calibre-web = { + enable = true; + listen.port = port; + options = { + calibreLibrary = "/tmp/books"; + reverseProxyAuth = { + enable = true; + header = "X-User"; }; }; - environment.systemPackages = [ pkgs.calibre ]; }; - }; - testScript = '' - start_all() + environment.systemPackages = [ pkgs.calibre ]; + }; + }; + testScript = '' + start_all() - customized.succeed( - "mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book" - ) - customized.succeed("systemctl restart calibre-web") - customized.wait_for_unit("calibre-web.service") - customized.wait_for_open_port(${toString port}) - customized.succeed( - "curl --fail -H X-User:admin 'http://localhost:${toString port}' | grep test-book" - ) - ''; - } -) + customized.succeed( + "mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book" + ) + customized.succeed("systemctl restart calibre-web") + customized.wait_for_unit("calibre-web.service") + customized.wait_for_open_port(${toString port}) + customized.succeed( + "curl --fail -H X-User:admin 'http://localhost:${toString port}' | grep test-book" + ) + ''; +} diff --git a/nixos/tests/canaille.nix b/nixos/tests/canaille.nix index a085f695fd45..58e81e058de0 100644 --- a/nixos/tests/canaille.nix +++ b/nixos/tests/canaille.nix @@ -56,7 +56,7 @@ import ./make-test-python.nix ( server.succeed("sudo -iu canaille -- canaille create user --user-name admin --password adminpass --emails admin@${domain}") json_str = server.succeed("sudo -iu canaille -- canaille get user") assert json.loads(json_str)[0]["user_name"] == "admin" - server.succeed("sudo -iu canaille -- canaille check") + server.succeed("sudo -iu canaille -- canaille config check") ''; } ) diff --git a/nixos/tests/centrifugo.nix b/nixos/tests/centrifugo.nix index 8ad44a011663..5867297c3d30 100644 --- a/nixos/tests/centrifugo.nix +++ b/nixos/tests/centrifugo.nix @@ -10,7 +10,10 @@ in { lib, ... }: { name = "centrifugo"; - meta.maintainers = [ lib.maintainers.tie ]; + meta.maintainers = [ + lib.maintainers.tie + lib.maintainers.valodim + ]; nodes = lib.listToAttrs ( lib.imap0 (index: name: { @@ -21,12 +24,15 @@ in 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 = + node = { + inherit name; + }; + http_server.port = centrifugoPort; + http_api.insecure = true; + usage_stats.disabled = true; + + engine.type = "redis"; + engine.redis.address = let toRedisAddresses = map (name: "${name}:${toString redisPort}"); in @@ -35,8 +41,6 @@ in "unix://${config.services.redis.servers.centrifugo.unixSocket}" ] ++ toRedisAddresses (lib.drop (index + 1) nodes); - usage_stats_disable = true; - api_insecure = true; }; extraGroups = [ config.services.redis.servers.centrifugo.user diff --git a/nixos/tests/cgit.nix b/nixos/tests/cgit.nix index fce3dc16b854..2c48e6bde47d 100644 --- a/nixos/tests/cgit.nix +++ b/nixos/tests/cgit.nix @@ -1,113 +1,111 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - let - robotsTxt = pkgs.writeText "cgit-robots.txt" '' - User-agent: * - Disallow: / - ''; - in - { - name = "cgit"; - meta = with pkgs.lib.maintainers; { - maintainers = [ schnusch ]; - }; +{ pkgs, ... }: +let + robotsTxt = pkgs.writeText "cgit-robots.txt" '' + User-agent: * + Disallow: / + ''; +in +{ + name = "cgit"; + meta = with pkgs.lib.maintainers; { + maintainers = [ schnusch ]; + }; - nodes = { - server = - { ... }: - { - services.cgit."localhost" = { - enable = true; - package = pkgs.cgit.overrideAttrs ( - { postInstall, ... }: - { - postInstall = '' - ${postInstall} - cp ${robotsTxt} "$out/cgit/robots.txt" - ''; - } - ); - nginx.location = "/(c)git/"; - repos = { - some-repo = { - path = "/tmp/git/some-repo"; - desc = "some-repo description"; - }; - }; - settings = { - readme = [ - ":README.md" - ":date.txt" - ]; + nodes = { + server = + { ... }: + { + services.cgit."localhost" = { + enable = true; + package = pkgs.cgit.overrideAttrs ( + { postInstall, ... }: + { + postInstall = '' + ${postInstall} + cp ${robotsTxt} "$out/cgit/robots.txt" + ''; + } + ); + nginx.location = "/(c)git/"; + repos = { + some-repo = { + path = "/tmp/git/some-repo"; + desc = "some-repo description"; }; }; - - environment.systemPackages = [ pkgs.git ]; + settings = { + readme = [ + ":README.md" + ":date.txt" + ]; + }; }; - }; - testScript = - { nodes, ... }: - '' - start_all() + environment.systemPackages = [ pkgs.git ]; + }; + }; - server.wait_for_unit("nginx.service") - server.wait_for_unit("network.target") - server.wait_for_open_port(80) + testScript = + { nodes, ... }: + '' + start_all() - server.succeed("curl -fsS http://localhost/%28c%29git/cgit.css") + server.wait_for_unit("nginx.service") + server.wait_for_unit("network.target") + server.wait_for_open_port(80) - server.succeed("curl -fsS http://localhost/%28c%29git/robots.txt | diff -u - ${robotsTxt}") + server.succeed("curl -fsS http://localhost/%28c%29git/cgit.css") - server.succeed( - "curl -fsS http://localhost/%28c%29git/ | grep -F 'some-repo description'" - ) + server.succeed("curl -fsS http://localhost/%28c%29git/robots.txt | diff -u - ${robotsTxt}") - server.fail("curl -fsS http://localhost/robots.txt") + server.succeed( + "curl -fsS http://localhost/%28c%29git/ | grep -F 'some-repo description'" + ) - server.succeed("sudo -u cgit ${pkgs.writeShellScript "setup-cgit-test-repo" '' - set -e - git init --bare -b master /tmp/git/some-repo - git init -b master reference - cd reference - git remote add origin /tmp/git/some-repo - { echo -n "cgit NixOS Test at "; date; } > date.txt - git add date.txt - git -c user.name=test -c user.email=test@localhost commit -m 'add date' - git push -u origin master - ''}") + server.fail("curl -fsS http://localhost/robots.txt") - # test web download - server.succeed( - "curl -fsS 'http://localhost/%28c%29git/some-repo/plain/date.txt?id=master' | diff -u reference/date.txt -" - ) + server.succeed("sudo -u cgit ${pkgs.writeShellScript "setup-cgit-test-repo" '' + set -e + git init --bare -b master /tmp/git/some-repo + git init -b master reference + cd reference + git remote add origin /tmp/git/some-repo + { echo -n "cgit NixOS Test at "; date; } > date.txt + git add date.txt + git -c user.name=test -c user.email=test@localhost commit -m 'add date' + git push -u origin master + ''}") - # test http clone - server.succeed( - "git clone http://localhost/%28c%29git/some-repo && diff -u reference/date.txt some-repo/date.txt" - ) + # test web download + server.succeed( + "curl -fsS 'http://localhost/%28c%29git/some-repo/plain/date.txt?id=master' | diff -u reference/date.txt -" + ) - # test list settings by greping for the fallback readme - server.succeed( - "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'" - ) + # test http clone + server.succeed( + "git clone http://localhost/%28c%29git/some-repo && diff -u reference/date.txt some-repo/date.txt" + ) - # add real readme - server.succeed("sudo -u cgit ${pkgs.writeShellScript "cgit-commit-readme" '' - set -e - echo '# cgit NixOS test README' > reference/README.md - git -C reference add README.md - git -C reference -c user.name=test -c user.email=test@localhost commit -m 'add readme' - git -C reference push - ''}") + # test list settings by greping for the fallback readme + server.succeed( + "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'" + ) - # test list settings by greping for the real readme - server.succeed( - "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F '# cgit NixOS test README'" - ) - server.fail( - "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'" - ) - ''; - } -) + # add real readme + server.succeed("sudo -u cgit ${pkgs.writeShellScript "cgit-commit-readme" '' + set -e + echo '# cgit NixOS test README' > reference/README.md + git -C reference add README.md + git -C reference -c user.name=test -c user.email=test@localhost commit -m 'add readme' + git -C reference push + ''}") + + # test list settings by greping for the real readme + server.succeed( + "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F '# cgit NixOS test README'" + ) + server.fail( + "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'" + ) + ''; +} diff --git a/nixos/tests/cockpit.nix b/nixos/tests/cockpit.nix index 0433cebf3b56..29692f10aad2 100644 --- a/nixos/tests/cockpit.nix +++ b/nixos/tests/cockpit.nix @@ -23,11 +23,9 @@ import ./make-test-python.nix ( enable = true; port = 7890; openFirewall = true; - settings = { - WebService = { - Origins = "https://server:7890"; - }; - }; + allowed-origins = [ + "https://server:${toString config.services.cockpit.port}" + ]; }; }; client = @@ -123,10 +121,14 @@ import ./make-test-python.nix ( assert "Web console is running in limited access mode" in driver.page_source log("Clicking the sudo button") + for button in driver.find_elements(By.TAG_NAME, "button"): + if 'admin' in button.text: + button.click() driver.switch_to.default_content() - driver.find_element(By.CSS_SELECTOR, 'button.ct-locked').click() + log("Checking that /nonexistent is not a thing") assert '/nonexistent' not in driver.page_source + assert len(driver.find_elements(By.CSS_SELECTOR, '#machine-reconnect')) == 0 driver.close() ''; diff --git a/nixos/tests/common/x11.nix b/nixos/tests/common/x11.nix index b79cedb864de..3d4b2fb71105 100644 --- a/nixos/tests/common/x11.nix +++ b/nixos/tests/common/x11.nix @@ -14,4 +14,9 @@ # Don't use a desktop manager. services.displayManager.defaultSession = lib.mkDefault "none+icewm"; services.xserver.windowManager.icewm.enable = true; + + # Help with OCR + environment.etc."icewm/theme".text = '' + Theme="gtk2/default.theme" + ''; } diff --git a/nixos/tests/cosmic.nix b/nixos/tests/cosmic.nix new file mode 100644 index 000000000000..00b1f478d81e --- /dev/null +++ b/nixos/tests/cosmic.nix @@ -0,0 +1,126 @@ +{ + config, + lib, + testName, + enableAutologin, + enableXWayland, + ... +}: + +{ + name = testName; + + meta.maintainers = lib.teams.cosmic.members; + + nodes.machine = { + imports = [ ./common/user-account.nix ]; + + services = { + # For `cosmic-store` to be added to `environment.systemPackages` + # and for it to work correctly because Flatpak is a runtime + # dependency of `cosmic-store`. + flatpak.enable = true; + + displayManager.cosmic-greeter.enable = true; + desktopManager.cosmic = { + enable = true; + xwayland.enable = enableXWayland; + }; + }; + + services.displayManager.autoLogin = lib.mkIf enableAutologin { + enable = true; + user = "alice"; + }; + + environment.systemPackages = with config.node.pkgs; [ + # These two packages are used to check if a window was opened + # under the COSMIC session or not. Kinda important. + # TODO: Move the check from the test module to + # `nixos/lib/test-driver/src/test_driver/machine.py` so more + # Wayland-only testing can be done using the existing testing + # infrastructure. + jq + lswt + ]; + + # So far, all COSMIC tests launch a few GUI applications. In doing + # so, the default allocated memory to the guest of 1024M quickly + # poses a very high risk of an OOM-shutdown which is worse than an + # OOM-kill. Because now, the test failed, but not for a genuine + # reason, but an OOM-shutdown. That's an inconclusive failure + # which might possibly mask an actual failure. Not enabling + # systemd-oomd because we need said applications running for a + # few seconds. So instead, bump the allocated memory to the guest + # from 1024M to 4x; 4096M. + virtualisation.memorySize = 4096; + }; + + testScript = + { nodes, ... }: + let + cfg = nodes.machine; + user = cfg.users.users.alice; + DISPLAY = lib.strings.optionalString enableXWayland ( + if enableAutologin then "DISPLAY=:0" else "DISPLAY=:1" + ); + in + '' + #testName: ${testName} + '' + + ( + if (enableAutologin) then + '' + with subtest("cosmic-greeter initialisation"): + machine.wait_for_unit("graphical.target", timeout=120) + '' + else + '' + from time import sleep + + machine.wait_for_unit("graphical.target", timeout=120) + machine.wait_until_succeeds("pgrep --uid ${toString cfg.users.users.cosmic-greeter.name} --full cosmic-greeter", timeout=30) + # Sleep for 10 seconds for ensuring that `greetd` loads the + # password prompt for the login screen properly. + sleep(10) + + with subtest("cosmic-session login"): + machine.send_chars("${user.password}\n", delay=0.2) + '' + ) + + '' + # _One_ of the final processes to start as part of the + # `cosmic-session` target is the Workspaces applet. So, wait + # for it to start. The process existing means that COSMIC + # now handles any opened windows from now on. + machine.wait_until_succeeds("pgrep --uid ${toString user.uid} --full 'cosmic-panel-button com.system76.CosmicWorkspaces'", timeout=30) + + # The best way to test for Wayland and XWayland is to launch + # the GUI applications and see the results yourself. + with subtest("Launch applications"): + # key: binary_name + # value: "app-id" as reported by `lswt` + gui_apps_to_launch = {} + + # We want to ensure that the first-party applications + # start/launch properly. + gui_apps_to_launch['cosmic-edit'] = 'com.system76.CosmicEdit' + gui_apps_to_launch['cosmic-files'] = 'com.system76.CosmicFiles' + gui_apps_to_launch['cosmic-player'] = 'com.system76.CosmicPlayer' + gui_apps_to_launch['cosmic-settings'] = 'com.system76.CosmicSettings' + gui_apps_to_launch['cosmic-store'] = 'com.system76.CosmicStore' + gui_apps_to_launch['cosmic-term'] = 'com.system76.CosmicTerm' + + for gui_app, app_id in gui_apps_to_launch.items(): + machine.succeed(f"su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} ${DISPLAY} {gui_app} >&2 &'", timeout=5) + # Nix builds the following non-commented expression to the following: + # `su - alice -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/1000 lswt --json | jq ".toplevels" | grep "^ \\"app-id\\": \\"{app_id}\\"$"' ` + machine.wait_until_succeeds(f''''su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} lswt --json | jq ".toplevels" | grep "^ \\"app-id\\": \\"{app_id}\\"$"' '''', timeout=30) + machine.succeed(f"pkill {gui_app}", timeout=5) + + machine.succeed("echo 'test completed succeessfully' > /${testName}", timeout=5) + machine.copy_from_vm('/${testName}') + + machine.shutdown() + ''; +} diff --git a/nixos/tests/cups-pdf.nix b/nixos/tests/cups-pdf.nix index 917c3d8d4a8c..00623b14a9db 100644 --- a/nixos/tests/cups-pdf.nix +++ b/nixos/tests/cups-pdf.nix @@ -1,47 +1,45 @@ -import ./make-test-python.nix ( - { lib, pkgs, ... }: - { - name = "cups-pdf"; +{ hostPkgs, lib, ... }: +{ + name = "cups-pdf"; - nodes.machine = - { pkgs, ... }: - { - imports = [ ./common/user-account.nix ]; - environment.systemPackages = [ pkgs.poppler-utils ]; - fonts.packages = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf - services.printing.cups-pdf.enable = true; - services.printing.cups-pdf.instances = { - opt = { }; - noopt.installPrinter = false; - }; - hardware.printers.ensurePrinters = [ - { - name = "noopt"; - model = "CUPS-PDF_noopt.ppd"; - deviceUri = "cups-pdf:/noopt"; - } - ]; + nodes.machine = + { pkgs, ... }: + { + imports = [ ./common/user-account.nix ]; + environment.systemPackages = [ pkgs.poppler-utils ]; + fonts.packages = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf + services.printing.cups-pdf.enable = true; + services.printing.cups-pdf.instances = { + opt = { }; + noopt.installPrinter = false; }; + hardware.printers.ensurePrinters = [ + { + name = "noopt"; + model = "CUPS-PDF_noopt.ppd"; + deviceUri = "cups-pdf:/noopt"; + } + ]; + }; - # we cannot check the files with pdftotext, due to - # https://github.com/alexivkin/CUPS-PDF-to-PDF/issues/7 - # we need `imagemagickBig` as it has ghostscript support + # we cannot check the files with pdftotext, due to + # https://github.com/alexivkin/CUPS-PDF-to-PDF/issues/7 + # we need `imagemagickBig` as it has ghostscript support - testScript = '' - from subprocess import run - machine.wait_for_unit("multi-user.target") - for name in ("opt", "noopt"): - text = f"test text {name}".upper() - machine.wait_until_succeeds(f"lpstat -v {name}") - machine.succeed(f"su - alice -c 'echo -e \"\n {text}\" | lp -d {name}'") - # wait until the pdf files are completely produced and readable by alice - machine.wait_until_succeeds(f"su - alice -c 'pdfinfo /var/spool/cups-pdf-{name}/users/alice/*.pdf'") - machine.succeed(f"cp /var/spool/cups-pdf-{name}/users/alice/*.pdf /tmp/{name}.pdf") - machine.copy_from_vm(f"/tmp/{name}.pdf", "") - run(f"${pkgs.imagemagickBig}/bin/convert -density 300 $out/{name}.pdf $out/{name}.jpeg", shell=True, check=True) - assert text.encode() in run(f"${lib.getExe pkgs.tesseract} $out/{name}.jpeg stdout", shell=True, check=True, capture_output=True).stdout - ''; + testScript = '' + from subprocess import run + machine.wait_for_unit("multi-user.target") + for name in ("opt", "noopt"): + text = f"test text {name}".upper() + machine.wait_until_succeeds(f"lpstat -v {name}") + machine.succeed(f"su - alice -c 'echo -e \"\n {text}\" | lp -d {name}'") + # wait until the pdf files are completely produced and readable by alice + machine.wait_until_succeeds(f"su - alice -c 'pdfinfo /var/spool/cups-pdf-{name}/users/alice/*.pdf'") + machine.succeed(f"cp /var/spool/cups-pdf-{name}/users/alice/*.pdf /tmp/{name}.pdf") + machine.copy_from_vm(f"/tmp/{name}.pdf", "") + run(f"${lib.getExe hostPkgs.imagemagickBig} -density 300 $out/{name}.pdf $out/{name}.jpeg", shell=True, check=True) + assert text.encode() in run(f"${lib.getExe hostPkgs.tesseract} $out/{name}.jpeg stdout", shell=True, check=True, capture_output=True).stdout + ''; - meta.maintainers = [ lib.maintainers.yarny ]; - } -) + meta.maintainers = [ lib.maintainers.yarny ]; +} diff --git a/nixos/tests/curl-impersonate.nix b/nixos/tests/curl-impersonate.nix index 0846caeec6cb..28e741a2e19f 100644 --- a/nixos/tests/curl-impersonate.nix +++ b/nixos/tests/curl-impersonate.nix @@ -19,6 +19,9 @@ We do that by creating a trusted CA and issuing a cert that includes all of the test domains as subject-alternative names and then spoofs the hostnames in /etc/hosts. + - We started skipping the test_http2_headers test due to log format differences + between the nghttpd2 version in nixpkgs and the outdated one curl-impersonate + uses upstream for its tests. */ import ./make-test-python.nix ( @@ -125,7 +128,7 @@ import ./make-test-python.nix ( # Run tests cd tests - pytest . --install-dir ../usr --capture-interface eth1 + pytest . --install-dir ../usr --capture-interface eth1 --exitfirst -k 'not test_http2_headers' ''; in { diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix index b246f5b9ba57..e6aa31b5845a 100644 --- a/nixos/tests/custom-ca.nix +++ b/nixos/tests/custom-ca.nix @@ -1,6 +1,6 @@ # Checks that `security.pki` options are working in curl and the main browser -# engines: Gecko (via Firefox), Chromium, QtWebEngine (via qutebrowser) and -# WebKitGTK (via Midori). The test checks that certificates issued by a custom +# engines: Gecko (via Firefox), Chromium, QtWebEngine (via qutebrowser). +# The test checks that certificates issued by a custom # trusted CA are accepted but those from an unknown CA are rejected. { @@ -210,8 +210,4 @@ in args = "-T"; error = "Certificate error"; }; - midori = { - args = "-p"; - error = "Security"; - }; } diff --git a/nixos/tests/darling.nix b/nixos/tests/darling.nix deleted file mode 100644 index 8514aac918ed..000000000000 --- a/nixos/tests/darling.nix +++ /dev/null @@ -1,52 +0,0 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - - let - # Well, we _can_ cross-compile from Linux :) - hello = - pkgs.runCommand "hello" - { - sdk = "${pkgs.darling.sdk}/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"; - nativeBuildInputs = with pkgs.llvmPackages_14; [ - clang-unwrapped - lld - ]; - src = pkgs.writeText "hello.c" '' - #include - int main() { - printf("Hello, Darling!\n"); - return 0; - } - ''; - } - '' - clang \ - -target x86_64-apple-darwin \ - -fuse-ld=lld \ - -nostdinc -nostdlib \ - -mmacosx-version-min=10.15 \ - --sysroot $sdk \ - -isystem $sdk/usr/include \ - -L $sdk/usr/lib -lSystem \ - $src -o $out - ''; - in - { - name = "darling"; - - meta.maintainers = with lib.maintainers; [ zhaofengli ]; - - nodes.machine = { - programs.darling.enable = true; - }; - - testScript = '' - start_all() - - # Darling holds stdout until the server is shutdown - machine.succeed("darling ${hello} >hello.out") - machine.succeed("grep Hello hello.out") - machine.succeed("darling shutdown") - ''; - } -) diff --git a/nixos/tests/davis.nix b/nixos/tests/davis.nix index 480191704e2c..0dfa08342801 100644 --- a/nixos/tests/davis.nix +++ b/nixos/tests/davis.nix @@ -1,10 +1,14 @@ -{ pkgs, ... }: +{ + pkgs, + config, + ... +}: { name = "davis"; meta.maintainers = pkgs.davis.meta.maintainers; - nodes.machine = + nodes.machine1 = { config, ... }: { virtualisation = { @@ -24,33 +28,67 @@ adminLogin = "admin"; appSecretFile = "${pkgs.writeText "davisAppSecret" "52882ef142066e09ab99ce816ba72522e789505caba224"}"; adminPasswordFile = "${pkgs.writeText "davisAdminPass" "nixos"}"; - nginx = { }; + }; + }; + nodes.machine2 = + { nodes, config, ... }: + { + virtualisation = { + memorySize = 512; + }; + environment.systemPackages = [ pkgs.fcgi ]; + + # no nginx, and no mail dsn + services.davis = { + enable = true; + hostname = "davis.example.com"; + database = { + driver = "postgresql"; + }; + adminLogin = "admin"; + appSecretFile = "${pkgs.writeText "davisAppSecret" "52882ef142066e09ab99ce816ba72522e789505caba224"}"; + adminPasswordFile = "${pkgs.writeText "davisAdminPass" "nixos"}"; + nginx = null; }; }; testScript = '' start_all() - machine.wait_for_unit("postgresql.service") - machine.wait_for_unit("davis-env-setup.service") - machine.wait_for_unit("davis-db-migrate.service") - machine.wait_for_unit("nginx.service") - machine.wait_for_unit("phpfpm-davis.service") + + machine1.wait_for_unit("postgresql.service") + machine1.wait_for_unit("davis-env-setup.service") + machine1.wait_for_unit("davis-db-migrate.service") + machine1.wait_for_unit("phpfpm-davis.service") with subtest("welcome screen loads"): - machine.succeed( + machine1.succeed( "curl -sSfL --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/ | grep 'Davis'" ) with subtest("login works"): - csrf_token = machine.succeed( + csrf_token = machine1.succeed( "curl -c /tmp/cookies -sSfL --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login | grep '_csrf_token' | sed -E 's,.*value=\"(.*)\".*,\\1,g'" ) - r = machine.succeed( + r = machine1.succeed( f"curl -b /tmp/cookies --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login -X POST -F _username=admin -F _password=nixos -F _csrf_token={csrf_token.strip()} -D headers" ) print(r) - machine.succeed( + machine1.succeed( "[[ $(grep -i 'location: ' headers | cut -d: -f2- | xargs echo) == /dashboard* ]]" ) + machine2.wait_for_unit("davis-env-setup.service") + machine2.wait_for_unit("davis-db-migrate.service") + machine2.wait_for_unit("phpfpm-davis.service") + r = machine2.succeed( + "find /var/lib/davis/var/log" + ) + print(r) + env = ( + "SCRIPT_NAME=/index.php", + "SCRIPT_FILENAME=${config.nodes.machine2.services.davis.package}/public/index.php", + "REMOTE_ADDR=127.0.0.1", + "REQUEST_METHOD=GET", + ); + page = machine2.succeed(f"{' '.join(env)} ${pkgs.fcgi}/bin/cgi-fcgi -bind -connect ${config.nodes.machine2.services.phpfpm.pools.davis.socket}") ''; } diff --git a/nixos/tests/dependency-track.nix b/nixos/tests/dependency-track.nix index 088ec8df82e3..baa55e779058 100644 --- a/nixos/tests/dependency-track.nix +++ b/nixos/tests/dependency-track.nix @@ -45,22 +45,27 @@ import ./make-test-python.nix ( }; }; - testScript = '' - import json + testScript = + # python + '' + import json - start_all() + start_all() - server.wait_for_unit("dependency-track.service") - server.wait_until_succeeds( - "journalctl -o cat -u dependency-track.service | grep 'Dependency-Track is ready'" - ) - server.wait_for_open_port(${toString dependencyTrackPort}) - - with subtest("version api returns correct version"): - version = json.loads( - server.succeed("curl http://localhost/api/version") + server.wait_for_unit("dependency-track.service") + server.wait_until_succeeds( + "journalctl -o cat -u dependency-track.service | grep 'Dependency-Track is ready'" ) - assert version["version"] == "${pkgs.dependency-track.version}" - ''; + server.wait_for_open_port(${toString dependencyTrackPort}) + + with subtest("version api returns correct version"): + version = json.loads( + server.succeed("curl http://localhost/api/version") + ) + assert version["version"] == "${pkgs.dependency-track.version}" + + with subtest("nginx serves frontend"): + server.succeed("curl http://localhost/ | grep \"Dependency-Track\"") + ''; } ) diff --git a/nixos/tests/discourse.nix b/nixos/tests/discourse.nix index 3accebe8f31f..1f8d1b7bdf4c 100644 --- a/nixos/tests/discourse.nix +++ b/nixos/tests/discourse.nix @@ -59,7 +59,7 @@ import ./make-test-python.nix ( environment.systemPackages = [ pkgs.jq ]; - services.postgresql.package = pkgs.postgresql_13; + services.postgresql.package = pkgs.postgresql_15; services.discourse = { enable = true; @@ -104,7 +104,6 @@ import ./make-test-python.nix ( services.dovecot2 = { enable = true; protocols = [ "imap" ]; - modules = [ pkgs.dovecot_pigeonhole ]; }; services.postfix = { diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 5964ea875088..b83d7e150207 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -12,7 +12,7 @@ with import common/ec2.nix { inherit makeTest pkgs; }; let imageCfg = (import ../lib/eval-config.nix { - inherit system; + system = null; modules = [ ../maintainers/scripts/ec2/amazon-image.nix ../modules/testing/test-instrumentation.nix @@ -54,6 +54,8 @@ let apacheHttpd.man valgrind.doc ]); + + nixpkgs.pkgs = pkgs; } ]; }).config; diff --git a/nixos/tests/eintopf.nix b/nixos/tests/eintopf.nix index 6e3992677da2..11e1158456f1 100644 --- a/nixos/tests/eintopf.nix +++ b/nixos/tests/eintopf.nix @@ -1,26 +1,24 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "eintopf"; - meta = with pkgs.lib.maintainers; { - maintainers = [ onny ]; - }; +{ + lib, + pkgs, + ... +}: - nodes = { - eintopf = - { config, pkgs, ... }: - { - services.eintopf = { - enable = true; - }; - }; - }; +{ + name = "eintopf"; + meta.maintainers = with lib.maintainers; [ onny ]; - testScript = '' - eintopf.start - eintopf.wait_for_unit("eintopf.service") - eintopf.wait_for_open_port(3333) - eintopf.succeed("curl -sSfL http://eintopf:3333 | grep 'Es sind keine Veranstaltungen eingetragen'") - ''; - } -) + nodes = { + eintopf = { + services.eintopf.enable = true; + }; + }; + + testScript = '' + eintopf.start + eintopf.wait_for_unit("eintopf.service") + eintopf.wait_for_open_port(3333) + eintopf.succeed("curl -sSfL http://eintopf:3333 | grep 'No events available'") + ''; + +} diff --git a/nixos/tests/envfs.nix b/nixos/tests/envfs.nix index 9e728698ebc3..b9067467eb2b 100644 --- a/nixos/tests/envfs.nix +++ b/nixos/tests/envfs.nix @@ -25,8 +25,6 @@ import ./make-test-python.nix ( "PATH= /usr/bin/env --version", "PATH= test -e /usr/bin/sh", "PATH= test -e /usr/bin/env", - # no stat - "! test -e /usr/bin/cp", # also picks up PATH that was set after execve "! /usr/bin/hello", "PATH=${pkgs.hello}/bin /usr/bin/hello", diff --git a/nixos/tests/fancontrol.nix b/nixos/tests/fancontrol.nix index da2d5fbd8405..5bfd4b2bd37e 100644 --- a/nixos/tests/fancontrol.nix +++ b/nixos/tests/fancontrol.nix @@ -1,39 +1,37 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "fancontrol"; - meta = with pkgs.lib.maintainers; { - maintainers = [ evils ]; +{ pkgs, ... }: +{ + name = "fancontrol"; + meta = with pkgs.lib.maintainers; { + maintainers = [ evils ]; + }; + + nodes.machine = + { ... }: + { + imports = [ ../modules/profiles/minimal.nix ]; + hardware.fancontrol.enable = true; + hardware.fancontrol.config = '' + INTERVAL=42 + DEVPATH=hwmon1=devices/platform/dummy + DEVNAME=hwmon1=dummy + FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input + FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input + MINTEMP=hwmon1/device/pwm1=25 + MAXTEMP=hwmon1/device/pwm1=65 + MINSTART=hwmon1/device/pwm1=150 + MINSTOP=hwmon1/device/pwm1=0 + ''; }; - nodes.machine = - { ... }: - { - imports = [ ../modules/profiles/minimal.nix ]; - hardware.fancontrol.enable = true; - hardware.fancontrol.config = '' - INTERVAL=42 - DEVPATH=hwmon1=devices/platform/dummy - DEVNAME=hwmon1=dummy - FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input - FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input - MINTEMP=hwmon1/device/pwm1=25 - MAXTEMP=hwmon1/device/pwm1=65 - MINSTART=hwmon1/device/pwm1=150 - MINSTOP=hwmon1/device/pwm1=0 - ''; - }; - - # This configuration cannot be valid for the test VM, so it's expected to get an 'outdated' error. - testScript = '' - start_all() - # can't wait for unit fancontrol.service because it doesn't become active due to invalid config - # fancontrol.service is WantedBy multi-user.target - machine.wait_for_unit("multi-user.target") - machine.succeed( - "journalctl -eu fancontrol | tee /dev/stderr | grep 'Configuration appears to be outdated'" - ) - machine.shutdown() - ''; - } -) + # This configuration cannot be valid for the test VM, so it's expected to get an 'outdated' error. + testScript = '' + start_all() + # can't wait for unit fancontrol.service because it doesn't become active due to invalid config + # fancontrol.service is WantedBy multi-user.target + machine.wait_for_unit("multi-user.target") + machine.succeed( + "journalctl -eu fancontrol | tee /dev/stderr | grep 'Configuration appears to be outdated'" + ) + machine.shutdown() + ''; +} diff --git a/nixos/tests/fluent-bit.nix b/nixos/tests/fluent-bit.nix index 9dc68011ea85..f9923e3ada7e 100644 --- a/nixos/tests/fluent-bit.nix +++ b/nixos/tests/fluent-bit.nix @@ -1,40 +1,56 @@ -import ./make-test-python.nix ( - { lib, pkgs, ... }: - { - name = "fluent-bit"; - - nodes.machine = - { config, pkgs, ... }: - { - services.fluent-bit = { - enable = true; - settings = { - pipeline = { - inputs = [ - { - name = "systemd"; - systemd_filter = "_SYSTEMD_UNIT=fluent-bit.service"; - } - ]; - outputs = [ - { - name = "file"; - path = "/var/log/fluent-bit"; - file = "fluent-bit.out"; - } - ]; - }; - }; +# Regression test for https://github.com/NixOS/nixpkgs/pull/395128 +{ + name = "fluent-bit"; + nodes.machine = { + services.fluent-bit = { + enable = true; + settings = { + pipeline = { + inputs = [ + { + name = "systemd"; + systemd_filter = "_SYSTEMD_UNIT=fluent-bit-regression-395128.service"; + } + ]; + outputs = [ + { + name = "file"; + path = "/var/log/fluent-bit"; + file = "fluent-bit.out"; + } + ]; }; - - systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit"; }; + }; + systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit"; - testScript = '' - start_all() + # Logs get compressed when larger than 1024 bytes + # Lets generate some logs that trigger that + # This causes libzstd to be dlopen'd by systemd which breaks fluent-bit 3.2.7+ + # https://www.freedesktop.org/software/systemd/man/latest/journald.conf.html#Compress= + systemd.services.fluent-bit-regression-395128 = { + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + script = '' + for i in {1..20}; do + (head -c 1200 < /dev/zero | tr '\0' 'A') && echo + sleep 1 + done + ''; + }; + }; - machine.wait_for_unit("fluent-bit.service") - machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out") - ''; - } -) + testScript = '' + start_all() + + machine.wait_for_unit("fluent-bit.service") + + with subtest("fluent-bit handles zstd-compressed journal logs"): + machine.succeed("systemctl start fluent-bit-regression-395128.service") + machine.succeed("systemctl show -p NRestarts fluent-bit.service | grep -q 'NRestarts=0'") + + machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out") + ''; +} diff --git a/nixos/tests/forgejo.nix b/nixos/tests/forgejo.nix index 38ef6cc57ed4..a35ee87ff68c 100644 --- a/nixos/tests/forgejo.nix +++ b/nixos/tests/forgejo.nix @@ -60,7 +60,6 @@ let pkgs.gnupg pkgs.jq pkgs.file - pkgs.htmlq ]; services.openssh.enable = true; @@ -253,27 +252,22 @@ let client.succeed("git -C /tmp/repo push origin main") def poll_workflow_action_status(_) -> bool: - output = server.succeed( - "curl --fail http://localhost:3000/test/repo/actions | " - + 'htmlq ".flex-item-leading span" --attribute "data-tooltip-content"' - ).strip() + try: + response = server.succeed("curl --fail http://localhost:3000/api/v1/repos/test/repo/actions/tasks") + status = json.loads(response).get("workflow_runs")[0].get("status") - # values taken from https://codeberg.org/forgejo/forgejo/src/commit/af47c583b4fb3190fa4c4c414500f9941cc02389/options/locale/locale_en-US.ini#L3649-L3661 - if output in [ "Failure", "Canceled", "Skipped", "Blocked" ]: - raise Exception(f"Workflow status is '{output}', which we consider failed.") - server.log(f"Command returned '{output}', which we consider failed.") + except IndexError: + status = "???" - elif output in [ "Unknown", "Waiting", "Running", "" ]: - server.log(f"Workflow status is '{output}'. Waiting some more...") - return False + server.log(f"Workflow status: {status}") - elif output in [ "Success" ]: - return True + if status == "failure": + raise Exception("Workflow failed") - raise Exception(f"Workflow status is '{output}', which we don't know. Value mappings likely need updating.") + return status == "success" with server.nested("Waiting for the workflow run to be successful"): - retry(poll_workflow_action_status) + retry(poll_workflow_action_status, 60) with subtest("Testing backup service"): server.succeed("${serverSystem}/specialisation/dump/bin/switch-to-configuration test") diff --git a/nixos/tests/gerrit.nix b/nixos/tests/gerrit.nix index 86e4cf90ed73..901187a6c5a5 100644 --- a/nixos/tests/gerrit.nix +++ b/nixos/tests/gerrit.nix @@ -1,57 +1,55 @@ -import ./make-test-python.nix ( - { pkgs, ... }: +{ pkgs, ... }: - { - name = "gerrit"; +{ + name = "gerrit"; - meta = with pkgs.lib.maintainers; { - maintainers = [ - flokli - zimbatm - ]; - }; + meta = with pkgs.lib.maintainers; { + maintainers = [ + flokli + zimbatm + ]; + }; - nodes = { - server = - { config, pkgs, ... }: - { - networking.firewall.allowedTCPPorts = [ - 80 - 2222 + nodes = { + server = + { config, pkgs, ... }: + { + networking.firewall.allowedTCPPorts = [ + 80 + 2222 + ]; + + services.gerrit = { + enable = true; + serverId = "aa76c84b-50b0-4711-a0a0-1ee30e45bbd0"; + listenAddress = "[::]:80"; + jvmHeapLimit = "1g"; + + builtinPlugins = [ + "hooks" + "webhooks" ]; - - services.gerrit = { - enable = true; - serverId = "aa76c84b-50b0-4711-a0a0-1ee30e45bbd0"; - listenAddress = "[::]:80"; - jvmHeapLimit = "1g"; - - builtinPlugins = [ - "hooks" - "webhooks" - ]; - settings = { - gerrit.canonicalWebUrl = "http://server"; - sshd.listenAddress = "[::]:2222"; - sshd.advertisedAddress = "[::]:2222"; - }; + settings = { + gerrit.canonicalWebUrl = "http://server"; + sshd.listenAddress = "[::]:2222"; + sshd.advertisedAddress = "[::]:2222"; }; }; + }; - client = - { ... }: - { - }; - }; + client = + { ... }: + { + }; + }; - testScript = '' - start_all() - server.wait_for_unit("gerrit.service") - server.wait_for_open_port(80) - client.succeed("curl http://server") + testScript = '' + start_all() + server.wait_for_unit("gerrit.service") + server.wait_for_open_port(80) + client.succeed("curl http://server") - server.wait_for_open_port(2222) - client.succeed("nc -z server 2222") - ''; - } -) + server.wait_for_open_port(2222) + client.succeed("nc -z server 2222") + ''; +} diff --git a/nixos/tests/git/hub.nix b/nixos/tests/git/hub.nix index 43ae2b7ab30b..622f4b6dac05 100644 --- a/nixos/tests/git/hub.nix +++ b/nixos/tests/git/hub.nix @@ -1,20 +1,18 @@ -import ../make-test-python.nix ( - { pkgs, ... }: - { - name = "hub"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; +{ pkgs, ... }: +{ + name = "hub"; + meta = with pkgs.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes.hub = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.hub ]; }; - nodes.hub = - { pkgs, ... }: - { - environment.systemPackages = [ pkgs.hub ]; - }; - - testScript = '' - assert "git version ${pkgs.git.version}\nhub version ${pkgs.hub.version}\n" in hub.succeed("hub version") - assert "These GitHub commands are provided by hub" in hub.succeed("hub help") - ''; - } -) + testScript = '' + assert "git version ${pkgs.git.version}\nhub version ${pkgs.hub.version}\n" in hub.succeed("hub version") + assert "These GitHub commands are provided by hub" in hub.succeed("hub help") + ''; +} diff --git a/nixos/tests/github-runner.nix b/nixos/tests/github-runner.nix index ffc0dbcc374b..847da352ca6c 100644 --- a/nixos/tests/github-runner.nix +++ b/nixos/tests/github-runner.nix @@ -1,49 +1,47 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "github-runner"; - meta = with pkgs.lib.maintainers; { - maintainers = [ veehaitch ]; - }; - nodes.machine = - { pkgs, ... }: - { - services.github-runners.test = { - enable = true; - url = "https://github.com/yaxitech"; - tokenFile = builtins.toFile "github-runner.token" "not-so-secret"; - }; - - services.github-runners.test-disabled = { - enable = false; - url = "https://github.com/yaxitech"; - tokenFile = builtins.toFile "github-runner.token" "not-so-secret"; - }; - - systemd.services.dummy-github-com = { - wantedBy = [ "multi-user.target" ]; - before = [ "github-runner-test.service" ]; - script = "${pkgs.netcat}/bin/nc -Fl 443 | true && touch /tmp/registration-connect"; - }; - networking.hosts."127.0.0.1" = [ "api.github.com" ]; +{ pkgs, ... }: +{ + name = "github-runner"; + meta = with pkgs.lib.maintainers; { + maintainers = [ veehaitch ]; + }; + nodes.machine = + { pkgs, ... }: + { + services.github-runners.test = { + enable = true; + url = "https://github.com/yaxitech"; + tokenFile = builtins.toFile "github-runner.token" "not-so-secret"; }; - testScript = '' - start_all() + services.github-runners.test-disabled = { + enable = false; + url = "https://github.com/yaxitech"; + tokenFile = builtins.toFile "github-runner.token" "not-so-secret"; + }; - machine.wait_for_unit("dummy-github-com") + systemd.services.dummy-github-com = { + wantedBy = [ "multi-user.target" ]; + before = [ "github-runner-test.service" ]; + script = "${pkgs.netcat}/bin/nc -Fl 443 | true && touch /tmp/registration-connect"; + }; + networking.hosts."127.0.0.1" = [ "api.github.com" ]; + }; - try: - machine.wait_for_unit("github-runner-test") - except Exception: - pass + testScript = '' + start_all() - out = machine.succeed("journalctl -u github-runner-test") - assert "Self-hosted runner registration" in out, "did not read runner registration header" + machine.wait_for_unit("dummy-github-com") - machine.wait_until_succeeds("test -f /tmp/registration-connect") + try: + machine.wait_for_unit("github-runner-test") + except Exception: + pass - machine.fail("systemctl list-unit-files | grep test-disabled") - ''; - } -) + out = machine.succeed("journalctl -u github-runner-test") + assert "Self-hosted runner registration" in out, "did not read runner registration header" + + machine.wait_until_succeeds("test -f /tmp/registration-connect") + + machine.fail("systemctl list-unit-files | grep test-disabled") + ''; +} diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index da27cfbbc195..cead8f538a86 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -42,6 +42,10 @@ in environment.systemPackages = with pkgs; [ git ]; + networking.hosts."127.0.0.1" = [ + "registry.localhost" + "pages.localhost" + ]; virtualisation.memorySize = 6144; virtualisation.cores = 4; virtualisation.useNixStoreImage = true; @@ -59,6 +63,12 @@ in localhost = { locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; }; + "pages.localhost" = { + locations."/".proxyPass = "http://localhost:8090"; + }; + "registry.localhost" = { + locations."/".proxyPass = "http://localhost:4567"; + }; }; }; @@ -78,7 +88,7 @@ in smtp.enable = true; pages = { enable = true; - settings.pages-domain = "localhost"; + settings.pages-domain = "pages.localhost"; }; extraConfig = { incoming_email = { @@ -96,6 +106,17 @@ in otpFile = pkgs.writeText "otpsecret" "Riew9mue"; dbFile = pkgs.writeText "dbsecret" "we2quaeZ"; jwsFile = pkgs.runCommand "oidcKeyBase" { } "${pkgs.openssl}/bin/openssl genrsa 2048 > $out"; + activeRecordPrimaryKeyFile = pkgs.writeText "arprimary" "vsaYPZjTRxcbG7W6gNr95AwBmzFUd4Eu"; + activeRecordDeterministicKeyFile = pkgs.writeText "ardeterministic" "kQarv9wb2JVP7XzLTh5f6DFcMHms4nEC"; + activeRecordSaltFile = pkgs.writeText "arsalt" "QkgR9CfFU3MXEWGqa7LbP24AntK5ZeYw"; + }; + + registry = { + enable = true; + certFile = "/var/lib/gitlab/registry_auth_cert"; + keyFile = "/var/lib/gitlab/registry_auth_key"; + externalAddress = "registry.localhost"; + externalPort = 443; }; # reduce memory usage @@ -210,6 +231,7 @@ in gitlab.wait_for_unit("gitlab-sidekiq.service") gitlab.wait_for_file("${nodes.gitlab.services.gitlab.statePath}/tmp/sockets/gitlab.socket") gitlab.wait_until_succeeds("curl -sSf http://gitlab/users/sign_in") + gitlab.wait_for_unit("docker-registry.service") ''; # The actual test of GitLab. Only push data to GitLab if @@ -249,7 +271,7 @@ in with subtest("Setup Git and SSH for Alice"): gitlab.succeed("git config --global user.name Alice") gitlab.succeed("git config --global user.email alice@nixos.invalid") - gitlab.succeed("mkdir -m 700 /root/.ssh") + gitlab.succeed("mkdir -p -m 700 /root/.ssh") gitlab.succeed("cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa") gitlab.succeed("chmod 600 /root/.ssh/id_ecdsa") gitlab.succeed( @@ -447,6 +469,10 @@ in """ ) gitlab.succeed("test -s /tmp/archive.tar.bz2") + '' + + '' + with subtest("Test docker registry http is available"): + gitlab.succeed("curl -sSf http://registry.localhost") ''; in @@ -454,6 +480,9 @@ in gitlab.start() '' + waitForServices + + '' + gitlab.succeed("cp /var/gitlab/state/config/secrets.yml /root/gitlab-secrets.yml") + '' + test true + '' gitlab.systemctl("start gitlab-backup.service") @@ -473,5 +502,9 @@ in gitlab.systemctl("start gitlab.target") '' + waitForServices + + '' + with subtest("Check that no secrets were auto-generated as these would be non-persistent"): + gitlab.succeed("diff -u /root/gitlab-secrets.yml /var/gitlab/state/config/secrets.yml") + '' + test false; } diff --git a/nixos/tests/glance.nix b/nixos/tests/glance.nix index 455ef0868513..254173e1eb71 100644 --- a/nixos/tests/glance.nix +++ b/nixos/tests/glance.nix @@ -5,19 +5,47 @@ nodes = { machine_default = - { pkgs, ... }: + { ... }: { services.glance = { enable = true; }; }; - machine_custom_port = + machine_configured = { pkgs, ... }: + let + # Do not use this in production. This will make the secret world-readable + # in the Nix store + secrets.glance-location.path = builtins.toString ( + pkgs.writeText "location-secret" "Nivelles, Belgium" + ); + in { services.glance = { enable = true; - settings.server.port = 5678; + settings = { + server.port = 5678; + pages = [ + { + name = "Home"; + columns = [ + { + size = "full"; + widgets = [ + { type = "calendar"; } + { + type = "weather"; + location = { + _secret = secrets.glance-location.path; + }; + } + ]; + } + ]; + } + ]; + }; }; }; }; @@ -25,23 +53,31 @@ extraPythonPackages = p: with p; [ beautifulsoup4 + pyyaml + types-pyyaml types-beautifulsoup4 ]; testScript = '' from bs4 import BeautifulSoup + import yaml machine_default.start() machine_default.wait_for_unit("glance.service") machine_default.wait_for_open_port(8080) - machine_custom_port.start() - machine_custom_port.wait_for_unit("glance.service") - machine_custom_port.wait_for_open_port(5678) + machine_configured.start() + machine_configured.wait_for_unit("glance.service") + machine_configured.wait_for_open_port(5678) soup = BeautifulSoup(machine_default.succeed("curl http://localhost:8080")) expected_version = "v${config.nodes.machine_default.services.glance.package.version}" assert any(a.text == expected_version for a in soup.select(".footer a")) + + yaml_contents = machine_configured.succeed("cat /run/glance/glance.yaml") + yaml_parsed = yaml.load(yaml_contents, Loader=yaml.FullLoader) + location = yaml_parsed["pages"][0]["columns"][0]["widgets"][1]["location"] + assert location == "Nivelles, Belgium" ''; meta.maintainers = [ lib.maintainers.drupol ]; diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix index 9fb868f82454..d6381a899f3b 100644 --- a/nixos/tests/gnome-extensions.nix +++ b/nixos/tests/gnome-extensions.nix @@ -121,11 +121,14 @@ import ./make-test-python.nix ( # "${run "gsettings set org.gnome.shell disable-extension-version-validation true"}" # ) - # Assert that some extension is in a specific state - def checkState(target, extension): - state = machine.succeed( + def getState(extension): + return machine.succeed( f"${run "gnome-extensions info {extension}"} | grep '^ State: .*$'" ) + + # Assert that some extension is in a specific state + def checkState(target, extension): + state = getState(extension) assert target in state, f"{state} instead of {target}" def checkExtension(extension, disable): @@ -143,6 +146,10 @@ import ./make-test-python.nix ( # Enable and optionally disable machine.succeed(f"${run "gnome-extensions enable {extension}"}") + wait_time = 5 + while getState(extension) == "ACTIVATING" and (wait_time := wait_time - 1) > 0: + machine.log(f"Extension {extension} is still activating, waiting {wait_time} more seconds") + machine.sleep(1) checkState("ACTIVE", extension) if disable: diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index 08213e41f98d..17fdcf550ca3 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -1,103 +1,101 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "gnome"; - meta.maintainers = lib.teams.gnome.members; +{ pkgs, lib, ... }: +{ + name = "gnome"; + meta.maintainers = lib.teams.gnome.members; - nodes.machine = - { ... }: + nodes.machine = + { ... }: - { - imports = [ ./common/user-account.nix ]; + { + imports = [ ./common/user-account.nix ]; - services.xserver.enable = true; - - services.xserver.displayManager = { - gdm.enable = true; - gdm.debug = true; - }; - - services.displayManager.autoLogin = { - enable = true; - user = "alice"; - }; - - services.xserver.desktopManager.gnome.enable = true; - services.xserver.desktopManager.gnome.debug = true; - - systemd.user.services = { - "org.gnome.Shell@wayland" = { - serviceConfig = { - ExecStart = [ - # Clear the list before overriding it. - "" - # Eval API is now internal so Shell needs to run in unsafe mode. - # TODO: improve test driver so that it supports openqa-like manipulation - # that would allow us to drop this mess. - "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode" - ]; - }; - }; - }; + services.xserver.enable = true; + services.xserver.displayManager = { + gdm.enable = true; + gdm.debug = true; }; - testScript = - { nodes, ... }: - let - # Keep line widths somewhat manageable - user = nodes.machine.users.users.alice; - uid = toString user.uid; - bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus"; - # Run a command in the appropriate user environment - run = command: "su - ${user.name} -c '${bus} ${command}'"; + services.displayManager.autoLogin = { + enable = true; + user = "alice"; + }; - # Call javascript in gnome shell, returns a tuple (success, output), where - # `success` is true if the dbus call was successful and output is what the - # javascript evaluates to. - eval = - command: - run "gdbus call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval ${command}"; + services.xserver.desktopManager.gnome.enable = true; + services.xserver.desktopManager.gnome.debug = true; - # False when startup is done - startingUp = eval "Main.layoutManager._startingUp"; + systemd.user.services = { + "org.gnome.Shell@wayland" = { + serviceConfig = { + ExecStart = [ + # Clear the list before overriding it. + "" + # Eval API is now internal so Shell needs to run in unsafe mode. + # TODO: improve test driver so that it supports openqa-like manipulation + # that would allow us to drop this mess. + "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode" + ]; + }; + }; + }; - # Start Console - launchConsole = run "gapplication launch org.gnome.Console"; + }; - # Hopefully Console's wm class - wmClass = eval "global.display.focus_window.wm_class"; - in - '' - with subtest("Login to GNOME with GDM"): - # wait for gdm to start - machine.wait_for_unit("display-manager.service") - # wait for the wayland server - machine.wait_for_file("/run/user/${uid}/wayland-0") - # wait for alice to be logged in - machine.wait_for_unit("default.target", "${user.name}") - # check that logging in has given the user ownership of devices - assert "alice" in machine.succeed("getfacl -p /dev/snd/timer") + testScript = + { nodes, ... }: + let + # Keep line widths somewhat manageable + user = nodes.machine.users.users.alice; + uid = toString user.uid; + bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus"; + # Run a command in the appropriate user environment + run = command: "su - ${user.name} -c '${bus} ${command}'"; - with subtest("Wait for GNOME Shell"): - # correct output should be (true, 'false') - machine.wait_until_succeeds( - "${startingUp} | grep -q 'true,..false'" - ) + # Call javascript in gnome shell, returns a tuple (success, output), where + # `success` is true if the dbus call was successful and output is what the + # javascript evaluates to. + eval = + command: + run "gdbus call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval ${command}"; - with subtest("Open Console"): - # Close the Activities view so that Shell can correctly track the focused window. - machine.send_key("esc") + # False when startup is done + startingUp = eval "Main.layoutManager._startingUp"; - machine.succeed( - "${launchConsole}" - ) - # correct output should be (true, '"org.gnome.Console"') - machine.wait_until_succeeds( - "${wmClass} | grep -q 'true,...org.gnome.Console'" - ) - machine.sleep(20) - machine.screenshot("screen") - ''; - } -) + # Start Console + launchConsole = run "gapplication launch org.gnome.Console"; + + # Hopefully Console's wm class + wmClass = eval "global.display.focus_window.wm_class"; + in + '' + with subtest("Login to GNOME with GDM"): + # wait for gdm to start + machine.wait_for_unit("display-manager.service") + # wait for the wayland server + machine.wait_for_file("/run/user/${uid}/wayland-0") + # wait for alice to be logged in + machine.wait_for_unit("default.target", "${user.name}") + # check that logging in has given the user ownership of devices + assert "alice" in machine.succeed("getfacl -p /dev/snd/timer") + + with subtest("Wait for GNOME Shell"): + # correct output should be (true, 'false') + machine.wait_until_succeeds( + "${startingUp} | grep -q 'true,..false'" + ) + + with subtest("Open Console"): + # Close the Activities view so that Shell can correctly track the focused window. + machine.send_key("esc") + + machine.succeed( + "${launchConsole}" + ) + # correct output should be (true, '"org.gnome.Console"') + machine.wait_until_succeeds( + "${wmClass} | grep -q 'true,...org.gnome.Console'" + ) + machine.sleep(20) + machine.screenshot("screen") + ''; +} diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 3c19aa189375..6eba72fb9501 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -212,37 +212,37 @@ import ../../make-test-python.nix ( machine.wait_for_open_port(3000, addr="::1") with subtest(f"Successful datasource provision with {description}"): - machine.succeed( + machine.wait_until_succeeds( "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/datasources/uid/test_datasource | grep Test\ Datasource" ) with subtest(f"Successful dashboard provision with {description}"): - machine.succeed( + machine.wait_until_succeeds( "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/dashboards/uid/test_dashboard | grep Test\ Dashboard" ) with subtest(f"Successful rule provision with {description}"): - machine.succeed( + machine.wait_until_succeeds( "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/alert-rules/test_rule | grep Test\ Rule" ) with subtest(f"Successful contact point provision with {description}"): - machine.succeed( + machine.wait_until_succeeds( "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/contact-points | grep Test\ Contact\ Point" ) with subtest(f"Successful policy provision with {description}"): - machine.succeed( + machine.wait_until_succeeds( "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/policies | grep Test\ Contact\ Point" ) with subtest(f"Successful template provision with {description}"): - machine.succeed( + machine.wait_until_succeeds( "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/templates | grep Test\ Template" ) with subtest("Successful mute timings provision with {description}"): - machine.succeed( + machine.wait_until_succeeds( "curl -sSfN -u testadmin:snakeoilpwd http://[::1]:3000/api/v1/provisioning/mute-timings | grep Test\ Mute\ Timing" ) ''; diff --git a/nixos/tests/hadoop/hbase.nix b/nixos/tests/hadoop/hbase.nix index efc85c869bf9..f6eb1f7e759a 100644 --- a/nixos/tests/hadoop/hbase.nix +++ b/nixos/tests/hadoop/hbase.nix @@ -116,6 +116,9 @@ import ../make-test-python.nix ( zookeeper.wait_for_unit("zookeeper") zookeeper.wait_for_open_port(2181) + # wait for HDFS cluster to be RW + datanode.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait") + # wait for HBase to start up master.wait_for_unit("hbase-master") regionserver.wait_for_unit("hbase-regionserver") diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix index b3cc19696d7c..bd8b9b288a22 100644 --- a/nixos/tests/haproxy.nix +++ b/nixos/tests/haproxy.nix @@ -1,140 +1,138 @@ -import ./make-test-python.nix ( - { lib, pkgs, ... }: - { - name = "haproxy"; - nodes = { - server = - { ... }: - { - services.haproxy = { - enable = true; - config = '' - global - limited-quic +{ lib, hostPkgs, ... }: +{ + name = "haproxy"; + nodes = { + server = + { pkgs, ... }: + { + services.haproxy = { + enable = true; + config = '' + global + limited-quic - defaults - mode http - timeout connect 10s - timeout client 10s - timeout server 10s + defaults + mode http + timeout connect 10s + timeout client 10s + timeout server 10s - log /dev/log local0 debug err - option logasap - option httplog - option httpslog + log /dev/log local0 debug err + option logasap + option httplog + option httpslog - backend http_server - server httpd [::1]:8000 alpn http/1.1 + backend http_server + server httpd [::1]:8000 alpn http/1.1 - frontend http - bind :80 - bind :443 ssl strict-sni crt /etc/ssl/fullchain.pem alpn h2,http/1.1 - bind quic4@:443 ssl strict-sni crt /etc/ssl/fullchain.pem alpn h3 allow-0rtt + frontend http + bind :80 + bind :443 ssl strict-sni crt /etc/ssl/fullchain.pem alpn h2,http/1.1 + bind quic4@:443 ssl strict-sni crt /etc/ssl/fullchain.pem alpn h3 allow-0rtt - http-after-response add-header alt-svc 'h3=":443"; ma=60' if { ssl_fc } + http-after-response add-header alt-svc 'h3=":443"; ma=60' if { ssl_fc } - http-request use-service prometheus-exporter if { path /metrics } - use_backend http_server + http-request use-service prometheus-exporter if { path /metrics } + use_backend http_server - frontend http-cert-auth - bind :8443 ssl strict-sni crt /etc/ssl/fullchain.pem verify required ca-file /etc/ssl/cacert.crt - bind quic4@:8443 ssl strict-sni crt /etc/ssl/fullchain.pem verify required ca-file /etc/ssl/cacert.crt alpn h3 + frontend http-cert-auth + bind :8443 ssl strict-sni crt /etc/ssl/fullchain.pem verify required ca-file /etc/ssl/cacert.crt + bind quic4@:8443 ssl strict-sni crt /etc/ssl/fullchain.pem verify required ca-file /etc/ssl/cacert.crt alpn h3 - use_backend http_server - ''; - }; - services.httpd = { - enable = true; - virtualHosts.localhost = { - documentRoot = pkgs.writeTextDir "index.txt" "We are all good!"; - adminAddr = "notme@yourhost.local"; - listen = [ - { - ip = "::1"; - port = 8000; - } - ]; - }; - }; - networking.firewall.allowedTCPPorts = [ - 80 - 443 - 8443 - ]; - networking.firewall.allowedUDPPorts = [ - 443 - 8443 - ]; + use_backend http_server + ''; }; - client = - { ... }: - { - environment.systemPackages = [ pkgs.curlHTTP3 ]; + services.httpd = { + enable = true; + virtualHosts.localhost = { + documentRoot = pkgs.writeTextDir "index.txt" "We are all good!"; + adminAddr = "notme@yourhost.local"; + listen = [ + { + ip = "::1"; + port = 8000; + } + ]; + }; }; - }; - testScript = '' - # Helpers - def cmd(command): - print(f"+{command}") - r = os.system(command) - if r != 0: - raise Exception(f"Command {command} failed with exit code {r}") + networking.firewall.allowedTCPPorts = [ + 80 + 443 + 8443 + ]; + networking.firewall.allowedUDPPorts = [ + 443 + 8443 + ]; + }; + client = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.curlHTTP3 ]; + }; + }; + testScript = '' + # Helpers + def cmd(command): + print(f"+{command}") + r = os.system(command) + if r != 0: + raise Exception(f"Command {command} failed with exit code {r}") - def openssl(command): - cmd(f"${pkgs.openssl}/bin/openssl {command}") + def openssl(command): + cmd(f"${lib.getExe hostPkgs.openssl} {command}") - # Generate CA. - openssl("req -new -newkey rsa:4096 -nodes -x509 -days 7 -subj '/C=ZZ/ST=Cloud/L=Unspecified/O=NixOS/OU=Tests/CN=CA Certificate' -keyout cacert.key -out cacert.crt") + # Generate CA. + openssl("req -new -newkey rsa:4096 -nodes -x509 -days 7 -subj '/C=ZZ/ST=Cloud/L=Unspecified/O=NixOS/OU=Tests/CN=CA Certificate' -keyout cacert.key -out cacert.crt") - # Generate and sign Server. - openssl("req -newkey rsa:4096 -nodes -subj '/CN=server/OU=Tests/O=NixOS' -keyout server.key -out server.csr") - openssl("x509 -req -in server.csr -out server.crt -CA cacert.crt -CAkey cacert.key -days 7") - cmd("cat server.crt server.key > fullchain.pem") + # Generate and sign Server. + openssl("req -newkey rsa:4096 -nodes -subj '/CN=server/OU=Tests/O=NixOS' -keyout server.key -out server.csr") + openssl("x509 -req -in server.csr -out server.crt -CA cacert.crt -CAkey cacert.key -days 7") + cmd("cat server.crt server.key > fullchain.pem") - # Generate and sign Client. - openssl("req -newkey rsa:4096 -nodes -subj '/CN=client/OU=Tests/O=NixOS' -keyout client.key -out client.csr") - openssl("x509 -req -in client.csr -out client.crt -CA cacert.crt -CAkey cacert.key -days 7") - cmd("cat client.crt client.key > client.pem") + # Generate and sign Client. + openssl("req -newkey rsa:4096 -nodes -subj '/CN=client/OU=Tests/O=NixOS' -keyout client.key -out client.csr") + openssl("x509 -req -in client.csr -out client.crt -CA cacert.crt -CAkey cacert.key -days 7") + cmd("cat client.crt client.key > client.pem") - # Start the actual test. - start_all() - server.copy_from_host("fullchain.pem", "/etc/ssl/fullchain.pem") - server.copy_from_host("cacert.crt", "/etc/ssl/cacert.crt") - server.succeed("chmod 0644 /etc/ssl/fullchain.pem /etc/ssl/cacert.crt") + # Start the actual test. + start_all() + server.copy_from_host("fullchain.pem", "/etc/ssl/fullchain.pem") + server.copy_from_host("cacert.crt", "/etc/ssl/cacert.crt") + server.succeed("chmod 0644 /etc/ssl/fullchain.pem /etc/ssl/cacert.crt") - client.copy_from_host("cacert.crt", "/etc/ssl/cacert.crt") - client.copy_from_host("client.pem", "/root/client.pem") + client.copy_from_host("cacert.crt", "/etc/ssl/cacert.crt") + client.copy_from_host("client.pem", "/root/client.pem") - server.wait_for_unit("multi-user.target") - server.wait_for_unit("haproxy.service") - server.wait_for_unit("httpd.service") + server.wait_for_unit("multi-user.target") + server.wait_for_unit("haproxy.service") + server.wait_for_unit("httpd.service") - assert "We are all good!" in client.succeed("curl -f http://server/index.txt") - assert "haproxy_process_pool_allocated_bytes" in client.succeed("curl -f http://server/metrics") + assert "We are all good!" in client.succeed("curl -f http://server/index.txt") + assert "haproxy_process_pool_allocated_bytes" in client.succeed("curl -f http://server/metrics") - with subtest("https"): - assert "We are all good!" in client.succeed("curl -f --cacert /etc/ssl/cacert.crt https://server/index.txt") + with subtest("https"): + assert "We are all good!" in client.succeed("curl -f --cacert /etc/ssl/cacert.crt https://server/index.txt") - with subtest("https-cert-auth"): - # Client must succeed in authenticating with the right certificate. - assert "We are all good!" in client.succeed("curl -f --cacert /etc/ssl/cacert.crt --cert-type pem --cert /root/client.pem https://server:8443/index.txt") - # Client must fail without certificate. - client.fail("curl --cacert /etc/ssl/cacert.crt https://server:8443/index.txt") + with subtest("https-cert-auth"): + # Client must succeed in authenticating with the right certificate. + assert "We are all good!" in client.succeed("curl -f --cacert /etc/ssl/cacert.crt --cert-type pem --cert /root/client.pem https://server:8443/index.txt") + # Client must fail without certificate. + client.fail("curl --cacert /etc/ssl/cacert.crt https://server:8443/index.txt") - with subtest("h3"): - assert "We are all good!" in client.succeed("curl -f --http3-only --cacert /etc/ssl/cacert.crt https://server/index.txt") + with subtest("h3"): + assert "We are all good!" in client.succeed("curl -f --http3-only --cacert /etc/ssl/cacert.crt https://server/index.txt") - with subtest("h3-cert-auth"): - # Client must succeed in authenticating with the right certificate. - assert "We are all good!" in client.succeed("curl -f --http3-only --cacert /etc/ssl/cacert.crt --cert-type pem --cert /root/client.pem https://server:8443/index.txt") - # Client must fail without certificate. - client.fail("curl -f --http3-only --cacert /etc/ssl/cacert.crt https://server:8443/index.txt") + with subtest("h3-cert-auth"): + # Client must succeed in authenticating with the right certificate. + assert "We are all good!" in client.succeed("curl -f --http3-only --cacert /etc/ssl/cacert.crt --cert-type pem --cert /root/client.pem https://server:8443/index.txt") + # Client must fail without certificate. + client.fail("curl -f --http3-only --cacert /etc/ssl/cacert.crt https://server:8443/index.txt") - with subtest("reload"): - server.succeed("systemctl reload haproxy") - # wait some time to ensure the following request hits the reloaded haproxy - server.sleep(5) - assert "We are all good!" in client.succeed("curl -f http://server/index.txt") - ''; - } -) + with subtest("reload"): + server.succeed("systemctl reload haproxy") + # wait some time to ensure the following request hits the reloaded haproxy + server.sleep(5) + assert "We are all good!" in client.succeed("curl -f http://server/index.txt") + ''; +} diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 0420eb86d5e8..ce2cf17fab56 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -85,7 +85,6 @@ in # include some popular integrations, that absolutely shouldn't break knx = { }; - shelly = { }; zha = { }; # set up a wake-on-lan switch to test capset capability required @@ -108,7 +107,7 @@ in # https://www.home-assistant.io/integrations/logger/ logger = { - default = "info"; + default = "debug"; }; }; diff --git a/nixos/tests/homebox.nix b/nixos/tests/homebox.nix index 2d14a153c976..aadcd4269774 100644 --- a/nixos/tests/homebox.nix +++ b/nixos/tests/homebox.nix @@ -8,19 +8,36 @@ import ./make-test-python.nix ( meta = with pkgs.lib.maintainers; { maintainers = [ patrickdag ]; }; - nodes.machine = { - services.homebox = { - enable = true; - settings.HBOX_WEB_PORT = port; - }; - }; - testScript = '' - machine.wait_for_unit("homebox.service") - machine.wait_for_open_port(${port}) + nodes = + let + self = { + simple = { + services.homebox = { + enable = true; + settings.HBOX_WEB_PORT = port; + }; + }; - machine.succeed("curl --fail -X GET 'http://localhost:${port}/'") - out = machine.succeed("curl --fail 'http://localhost:${port}/api/v1/status'") - assert '"health":true' in out + postgres = { + imports = [ self.simple ]; + services.homebox.database.createLocally = true; + }; + }; + in + self; + testScript = '' + def test_homebox(node): + node.wait_for_unit("homebox.service") + node.wait_for_open_port(${port}) + + node.succeed("curl --fail -X GET 'http://localhost:${port}/'") + out = node.succeed("curl --fail 'http://localhost:${port}/api/v1/status'") + assert '"health":true' in out + + test_homebox(simple) + simple.send_monitor_command("quit") + simple.wait_for_shutdown() + test_homebox(postgres) ''; } ) diff --git a/nixos/tests/homepage-dashboard.nix b/nixos/tests/homepage-dashboard.nix index ed70ead01820..d654dcaf53df 100644 --- a/nixos/tests/homepage-dashboard.nix +++ b/nixos/tests/homepage-dashboard.nix @@ -1,28 +1,26 @@ -import ./make-test-python.nix ( - { lib, ... }: - { - name = "homepage-dashboard"; - meta.maintainers = with lib.maintainers; [ jnsgruk ]; +{ lib, ... }: +{ + name = "homepage-dashboard"; + meta.maintainers = with lib.maintainers; [ jnsgruk ]; - nodes.machine = _: { - services.homepage-dashboard = { - enable = true; - settings.title = "test title rodUsEagid"; # something random/unique - }; + nodes.machine = _: { + services.homepage-dashboard = { + enable = true; + settings.title = "test title rodUsEagid"; # something random/unique }; + }; - testScript = '' - # Ensure the services are started on managed machine - machine.wait_for_unit("homepage-dashboard.service") - machine.wait_for_open_port(8082) - machine.succeed("curl --fail http://localhost:8082/") + testScript = '' + # Ensure the services are started on managed machine + machine.wait_for_unit("homepage-dashboard.service") + machine.wait_for_open_port(8082) + machine.succeed("curl --fail http://localhost:8082/") - # Ensure /etc/homepage-dashboard is created. - machine.succeed("test -d /etc/homepage-dashboard") + # Ensure /etc/homepage-dashboard is created. + machine.succeed("test -d /etc/homepage-dashboard") - # Ensure that we see the custom title *only in the managed config* - page = machine.succeed("curl --fail http://localhost:8082/") - assert "test title rodUsEagid" in page, "Custom title not found" - ''; - } -) + # Ensure that we see the custom title *only in the managed config* + page = machine.succeed("curl --fail http://localhost:8082/") + assert "test title rodUsEagid" in page, "Custom title not found" + ''; +} diff --git a/nixos/tests/i18n.nix b/nixos/tests/i18n.nix new file mode 100644 index 000000000000..a0493b7c62f5 --- /dev/null +++ b/nixos/tests/i18n.nix @@ -0,0 +1,43 @@ +{ lib, ... }: +{ + name = "glibLocales-custom-builds"; + meta.maintainers = with lib.maintainers; [ doronbehar ]; + + nodes = { + nonUTF8Charset = { + i18n = { + defaultLocale = "en_US"; + defaultCharset = "ISO-8859-1"; + }; + }; + extraLocales1 = { + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocales = [ + "nl_NL.UTF-8/UTF-8" + ]; + }; + }; + extraLocaleSettings = { + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_MESSAGES = "en_US.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + }; + }; + localeCharsets = { + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_TIME = "de_DE"; + }; + localeCharsets = { + LC_TIME = "ISO-8859-1"; + }; + }; + }; + }; + testScript = { nodes, ... }: ""; +} diff --git a/nixos/tests/image-contents.nix b/nixos/tests/image-contents.nix index 473032cec73e..bfa4f08adc40 100644 --- a/nixos/tests/image-contents.nix +++ b/nixos/tests/image-contents.nix @@ -14,7 +14,7 @@ with import common/ec2.nix { inherit makeTest pkgs; }; let config = (import ../lib/eval-config.nix { - inherit system; + system = null; modules = [ ../modules/testing/test-instrumentation.nix ../modules/profiles/qemu-guest.nix @@ -22,6 +22,7 @@ let fileSystems."/".device = "/dev/disk/by-label/nixos"; boot.loader.grub.device = "/dev/vda"; boot.loader.timeout = 0; + nixpkgs.pkgs = pkgs; } ]; }).config; diff --git a/nixos/tests/incus/ui.nix b/nixos/tests/incus/ui.nix index 27b90c218d78..300388a19f93 100644 --- a/nixos/tests/incus/ui.nix +++ b/nixos/tests/incus/ui.nix @@ -66,6 +66,7 @@ import ../make-test-python.nix ( testScript = '' machine.wait_for_unit("incus.service") + machine.wait_for_unit("incus-preseed.service") # Check that the INCUS_UI environment variable is populated in the systemd unit machine.succeed("systemctl cat incus.service | grep 'INCUS_UI'") @@ -73,6 +74,9 @@ import ../make-test-python.nix ( # Ensure the endpoint returns an HTML page with 'Incus UI' in the title machine.succeed("curl -kLs https://localhost:8443/ui | grep 'Incus UI'") + # Ensure the documentation is rendering correctly + machine.succeed("curl -kLs https://localhost:8443/documentation/ | grep 'Incus documentation'") + # Ensure the application is actually rendered by the Javascript machine.succeed("PYTHONUNBUFFERED=1 selenium-script") ''; diff --git a/nixos/tests/installed-tests/geocode-glib.nix b/nixos/tests/installed-tests/geocode-glib.nix index 76a32ee2849a..3fc5dc313a24 100644 --- a/nixos/tests/installed-tests/geocode-glib.nix +++ b/nixos/tests/installed-tests/geocode-glib.nix @@ -11,5 +11,5 @@ makeInstalledTest { ]; }; - tested = pkgs.geocode-glib; + tested = pkgs.geocode-glib_2; } diff --git a/nixos/tests/installed-tests/libxmlb.nix b/nixos/tests/installed-tests/libxmlb.nix index af2bbe9c35e2..f45b97e8341f 100644 --- a/nixos/tests/installed-tests/libxmlb.nix +++ b/nixos/tests/installed-tests/libxmlb.nix @@ -2,4 +2,10 @@ makeInstalledTest { tested = pkgs.libxmlb; + + testConfig = { + environment.variables = { + G_TEST_SRCDIR = "${pkgs.libxmlb.installedTests}/libexec/installed-tests/libxmlb"; + }; + }; } diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 6be3346d9850..6c7b97d055bc 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -632,31 +632,30 @@ let grubUseEfi ? false, enableOCR ? false, meta ? { }, + passthru ? { }, testSpecialisationConfig ? false, testFlakeSwitch ? false, testByAttrSwitch ? false, clevisTest ? false, clevisFallbackTest ? false, disableFileSystems ? false, + selectNixPackage ? pkgs: pkgs.nixVersions.stable, }: let isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi); in makeTest { - inherit enableOCR; + inherit enableOCR passthru; name = "installer-" + name; meta = { # put global maintainers here, individuals go into makeInstallerTest fkt call maintainers = (meta.maintainers or [ ]); # non-EFI tests can only run on x86 - platforms = - if isEfi then - platforms.linux - else - [ - "x86_64-linux" - "i686-linux" - ]; + platforms = mkIf (!isEfi) [ + "x86_64-linux" + "x86_64-darwin" + "i686-linux" + ]; }; nodes = let @@ -679,94 +678,102 @@ let in { # The configuration of the system used to run "nixos-install". - installer = { - imports = [ - commonConfig - ../modules/profiles/installation-device.nix - ../modules/profiles/base.nix - extraInstallerConfig - ./common/auto-format-root-device.nix - ]; + installer = + { config, pkgs, ... }: + { + imports = [ + commonConfig + ../modules/profiles/installation-device.nix + ../modules/profiles/base.nix + extraInstallerConfig + ./common/auto-format-root-device.nix + ]; - # In systemdStage1, also automatically format the device backing the - # root filesystem. - virtualisation.fileSystems."/".autoFormat = systemdStage1; + # In systemdStage1, also automatically format the device backing the + # root filesystem. + virtualisation.fileSystems."/".autoFormat = systemdStage1; - boot.initrd.systemd.enable = systemdStage1; + boot.initrd.systemd.enable = systemdStage1; - # Use a small /dev/vdb as the root disk for the - # installer. This ensures the target disk (/dev/vda) is - # the same during and after installation. - virtualisation.emptyDiskImages = [ 512 ]; - virtualisation.rootDevice = "/dev/vdb"; + # Use a small /dev/vdb as the root disk for the + # installer. This ensures the target disk (/dev/vda) is + # the same during and after installation. + virtualisation.emptyDiskImages = [ 512 ]; + virtualisation.rootDevice = "/dev/vdb"; - hardware.enableAllFirmware = mkForce false; + nix.package = selectNixPackage pkgs; + hardware.enableAllFirmware = mkForce false; - # The test cannot access the network, so any packages we - # need must be included in the VM. - system.extraDependencies = - with pkgs; - [ - bintools - brotli - brotli.dev - brotli.lib - desktop-file-utils - docbook5 - docbook_xsl_ns - kbd.dev - kmod.dev - libarchive.dev - libxml2.bin - libxslt.bin - nixos-artwork.wallpapers.simple-dark-gray-bottom - ntp - perlPackages.ConfigIniFiles - perlPackages.FileSlurp - perlPackages.JSON - perlPackages.ListCompare - perlPackages.XMLLibXML - # make-options-doc/default.nix - (python3.withPackages (p: [ p.mistune ])) - shared-mime-info - sudo - switch-to-configuration-ng - texinfo - unionfs-fuse - xorg.lndir - shellcheck-minimal - - # add curl so that rather than seeing the test attempt to download - # curl's tarball, we see what it's trying to download - curl - ] - ++ optionals (bootLoader == "grub") ( - let - zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false; - in + # The test cannot access the network, so any packages we + # need must be included in the VM. + system.extraDependencies = + with pkgs; [ - (pkgs.grub2.override { inherit zfsSupport; }) - (pkgs.grub2_efi.override { inherit zfsSupport; }) - pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader - pkgs.perlPackages.FileCopyRecursive - pkgs.perlPackages.XMLSAX - pkgs.perlPackages.XMLSAXBase - ] - ) - ++ optionals (bootLoader == "systemd-boot") [ - pkgs.zstd.bin - pkgs.mypy - pkgs.bootspec - ] - ++ optionals clevisTest [ pkgs.klibc ] - ++ optional systemdStage1 pkgs.chroot-realpath; + bintools + brotli + brotli.dev + brotli.lib + desktop-file-utils + docbook5 + docbook_xsl_ns + kbd.dev + kmod.dev + libarchive.dev + libxml2.bin + libxslt.bin + nixos-artwork.wallpapers.simple-dark-gray-bottom + ntp + perlPackages.ConfigIniFiles + perlPackages.FileSlurp + perlPackages.JSON + perlPackages.ListCompare + perlPackages.XMLLibXML + # make-options-doc/default.nix + (python3.withPackages (p: [ p.mistune ])) + shared-mime-info + sudo + switch-to-configuration-ng + texinfo + unionfs-fuse + xorg.lndir + shellcheck-minimal - nix.settings = { - substituters = mkForce [ ]; - hashed-mirrors = null; - connect-timeout = 1; + # Only the out output is included here, which is what is + # required to build the NixOS udev rules + # See the comment in services/hardware/udev.nix + systemdMinimal.out + + # add curl so that rather than seeing the test attempt to download + # curl's tarball, we see what it's trying to download + curl + ] + ++ optionals (bootLoader == "grub") ( + let + zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false; + in + [ + (pkgs.grub2.override { inherit zfsSupport; }) + (pkgs.grub2_efi.override { inherit zfsSupport; }) + pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader + pkgs.perlPackages.FileCopyRecursive + pkgs.perlPackages.XMLSAX + pkgs.perlPackages.XMLSAXBase + ] + ) + ++ optionals (bootLoader == "systemd-boot") [ + pkgs.zstd.bin + pkgs.mypy + config.boot.bootspec.package + ] + ++ optionals clevisTest [ pkgs.klibc ] + ++ optional systemdStage1 pkgs.chroot-realpath; + + nix.settings = { + substituters = mkForce [ ]; + hashed-mirrors = null; + connect-timeout = 1; + }; }; - }; target = { imports = [ commonConfig ]; @@ -1100,7 +1107,12 @@ in # The (almost) simplest partitioning scheme: a swap partition and # one big filesystem partition. - simple = makeInstallerTest "simple" simple-test-config; + simple = makeInstallerTest "simple" ( + simple-test-config + // { + passthru.override = args: makeInstallerTest "simple" simple-test-config // args; + } + ); switchToFlake = makeInstallerTest "switch-to-flake" simple-test-config-flake; diff --git a/nixos/tests/k3s/airgap-images.nix b/nixos/tests/k3s/airgap-images.nix index ade04c99840a..84a535feb7fc 100644 --- a/nixos/tests/k3s/airgap-images.nix +++ b/nixos/tests/k3s/airgap-images.nix @@ -31,7 +31,7 @@ import ../make-test-python.nix ( start_all() machine.wait_for_unit("k3s") - machine.wait_until_succeeds("journalctl -r --no-pager -u k3s | grep \"Imported images from /var/lib/rancher/k3s/agent/images/\"", timeout=120) + machine.wait_until_succeeds("journalctl -r --no-pager -u k3s | grep \"Imported images from /var/lib/rancher/k3s/agent/images/\"") images = json.loads(machine.succeed("crictl img -o json")) image_names = [i["repoTags"][0] for i in images["images"]] with open("${k3s.imagesList}") as expected_images: diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix index 4ee3cb760b39..5240f029139f 100644 --- a/nixos/tests/k3s/default.nix +++ b/nixos/tests/k3s/default.nix @@ -4,9 +4,11 @@ lib ? pkgs.lib, }: let - allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs; + allK3s = lib.filterAttrs ( + n: _: lib.strings.hasPrefix "k3s_" n && (builtins.tryEval pkgs.${n}).success + ) pkgs; in -{ +lib.recurseIntoAttrs { airgap-images = lib.mapAttrs ( _: k3s: import ./airgap-images.nix { inherit system pkgs k3s; } ) allK3s; diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix deleted file mode 100644 index 6bcc03dca95e..000000000000 --- a/nixos/tests/kafka.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, -}: - -with pkgs.lib; - -let - makeKafkaTest = - name: - { - kafkaPackage, - mode ? "kraft", - }: - (import ./make-test-python.nix ({ - inherit name; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - nodes = - { - kafka = - { ... }: - { - services.apache-kafka = mkMerge [ - ({ - enable = true; - package = kafkaPackage; - settings = { - "offsets.topic.replication.factor" = 1; - "log.dirs" = [ - "/var/lib/kafka/logdir1" - "/var/lib/kafka/logdir2" - ]; - }; - }) - (mkIf (mode == "zookeeper") { - settings = { - "zookeeper.session.timeout.ms" = 600000; - "zookeeper.connect" = [ "zookeeper1:2181" ]; - }; - }) - (mkIf (mode == "kraft") { - clusterId = "ak2fIHr4S8WWarOF_ODD0g"; - formatLogDirs = true; - settings = { - "node.id" = 1; - "process.roles" = [ - "broker" - "controller" - ]; - "listeners" = [ - "PLAINTEXT://:9092" - "CONTROLLER://:9093" - ]; - "listener.security.protocol.map" = [ - "PLAINTEXT:PLAINTEXT" - "CONTROLLER:PLAINTEXT" - ]; - "controller.quorum.voters" = [ - "1@kafka:9093" - ]; - "controller.listener.names" = [ "CONTROLLER" ]; - }; - }) - ]; - - networking.firewall.allowedTCPPorts = [ - 9092 - 9093 - ]; - # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048) - virtualisation.memorySize = 2047; - }; - } - // optionalAttrs (mode == "zookeeper") { - zookeeper1 = - { ... }: - { - services.zookeeper = { - enable = true; - }; - - networking.firewall.allowedTCPPorts = [ 2181 ]; - }; - }; - - testScript = '' - start_all() - - ${optionalString (mode == "zookeeper") '' - zookeeper1.wait_for_unit("default.target") - zookeeper1.wait_for_unit("zookeeper.service") - zookeeper1.wait_for_open_port(2181) - ''} - - kafka.wait_for_unit("default.target") - kafka.wait_for_unit("apache-kafka.service") - kafka.wait_for_open_port(9092) - - kafka.wait_until_succeeds( - "${kafkaPackage}/bin/kafka-topics.sh --create " - + "--bootstrap-server localhost:9092 --partitions 1 " - + "--replication-factor 1 --topic testtopic" - ) - kafka.succeed( - "echo 'test 1' | " - + "${kafkaPackage}/bin/kafka-console-producer.sh " - + "--bootstrap-server localhost:9092 --topic testtopic" - ) - assert "test 1" in kafka.succeed( - "${kafkaPackage}/bin/kafka-console-consumer.sh " - + "--bootstrap-server localhost:9092 --topic testtopic " - + "--from-beginning --max-messages 1" - ) - ''; - }) { inherit system; }); - -in -with pkgs; -{ - kafka_3_7 = makeKafkaTest "kafka_3_7" { - kafkaPackage = apacheKafka_3_7; - mode = "zookeeper"; - }; - kafka_3_8 = makeKafkaTest "kafka_3_8" { - kafkaPackage = apacheKafka_3_8; - mode = "zookeeper"; - }; - kafka_3_9 = makeKafkaTest "kafka_3_9" { - kafkaPackage = apacheKafka_3_9; - mode = "zookeeper"; - }; - kafka_4_0 = makeKafkaTest "kafka_4_0" { kafkaPackage = apacheKafka_4_0; }; - kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; }; -} diff --git a/nixos/tests/kafka/base.nix b/nixos/tests/kafka/base.nix new file mode 100644 index 000000000000..80121a722465 --- /dev/null +++ b/nixos/tests/kafka/base.nix @@ -0,0 +1,136 @@ +{ pkgs, ... }: + +with pkgs.lib; + +let + makeKafkaTest = + name: + { + kafkaPackage, + mode ? "kraft", + }: + (import ../make-test-python.nix ({ + inherit name; + meta = with pkgs.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = + { + kafka = + { ... }: + { + services.apache-kafka = mkMerge [ + ({ + enable = true; + package = kafkaPackage; + settings = { + "offsets.topic.replication.factor" = 1; + "log.dirs" = [ + "/var/lib/kafka/logdir1" + "/var/lib/kafka/logdir2" + ]; + }; + }) + (mkIf (mode == "zookeeper") { + settings = { + "zookeeper.session.timeout.ms" = 600000; + "zookeeper.connect" = [ "zookeeper1:2181" ]; + }; + }) + (mkIf (mode == "kraft") { + clusterId = "ak2fIHr4S8WWarOF_ODD0g"; + formatLogDirs = true; + settings = { + "node.id" = 1; + "process.roles" = [ + "broker" + "controller" + ]; + "listeners" = [ + "PLAINTEXT://:9092" + "CONTROLLER://:9093" + ]; + "listener.security.protocol.map" = [ + "PLAINTEXT:PLAINTEXT" + "CONTROLLER:PLAINTEXT" + ]; + "controller.quorum.voters" = [ + "1@kafka:9093" + ]; + "controller.listener.names" = [ "CONTROLLER" ]; + }; + }) + ]; + + networking.firewall.allowedTCPPorts = [ + 9092 + 9093 + ]; + virtualisation.diskSize = 1024; + # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048) + virtualisation.memorySize = 2047; + }; + } + // optionalAttrs (mode == "zookeeper") { + zookeeper1 = + { ... }: + { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + virtualisation.diskSize = 1024; + }; + }; + + testScript = '' + start_all() + + ${optionalString (mode == "zookeeper") '' + zookeeper1.wait_for_unit("default.target") + zookeeper1.wait_for_unit("zookeeper.service") + zookeeper1.wait_for_open_port(2181) + ''} + + kafka.wait_for_unit("default.target") + kafka.wait_for_unit("apache-kafka.service") + kafka.wait_for_open_port(9092) + + kafka.wait_until_succeeds( + "${kafkaPackage}/bin/kafka-topics.sh --create " + + "--bootstrap-server localhost:9092 --partitions 1 " + + "--replication-factor 1 --topic testtopic" + ) + kafka.succeed( + "echo 'test 1' | " + + "${kafkaPackage}/bin/kafka-console-producer.sh " + + "--bootstrap-server localhost:9092 --topic testtopic" + ) + assert "test 1" in kafka.succeed( + "${kafkaPackage}/bin/kafka-console-consumer.sh " + + "--bootstrap-server localhost:9092 --topic testtopic " + + "--from-beginning --max-messages 1" + ) + ''; + })); + +in +with pkgs; +{ + kafka_3_7 = makeKafkaTest "kafka_3_7" { + kafkaPackage = apacheKafka_3_7; + mode = "zookeeper"; + }; + kafka_3_8 = makeKafkaTest "kafka_3_8" { + kafkaPackage = apacheKafka_3_8; + mode = "zookeeper"; + }; + kafka_3_9 = makeKafkaTest "kafka_3_9" { + kafkaPackage = apacheKafka_3_9; + mode = "zookeeper"; + }; + kafka_4_0 = makeKafkaTest "kafka_4_0" { kafkaPackage = apacheKafka_4_0; }; + kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; }; +} diff --git a/nixos/tests/kafka/cluster.nix b/nixos/tests/kafka/cluster.nix new file mode 100644 index 000000000000..ace64a3d3da2 --- /dev/null +++ b/nixos/tests/kafka/cluster.nix @@ -0,0 +1,199 @@ +import ../make-test-python.nix ( + { lib, pkgs, ... }: + + let + inherit (lib) mkMerge; + + # Generate with `kafka-storage.sh random-uuid` + clusterId = "ii5pZE5LRkSeWrnyBhMOYQ"; + + kafkaConfig = { + networking.firewall.allowedTCPPorts = [ + 9092 + 9093 + ]; + + virtualisation.diskSize = 1024; + virtualisation.memorySize = 1024 * 2; + + environment.systemPackages = [ pkgs.apacheKafka ]; + + services.apache-kafka = { + enable = true; + + clusterId = "${clusterId}"; + + formatLogDirs = true; + + settings = { + listeners = [ + "PLAINTEXT://:9092" + "CONTROLLER://:9093" + ]; + "listener.security.protocol.map" = [ + "PLAINTEXT:PLAINTEXT" + "CONTROLLER:PLAINTEXT" + ]; + "controller.quorum.voters" = lib.imap1 (i: name: "${toString i}@${name}:9093") ( + builtins.attrNames kafkaNodes + ); + "controller.listener.names" = [ "CONTROLLER" ]; + + "process.roles" = [ + "broker" + "controller" + ]; + + "log.dirs" = [ "/var/lib/apache-kafka" ]; + "num.partitions" = 6; + "offsets.topic.replication.factor" = 2; + "transaction.state.log.replication.factor" = 2; + "transaction.state.log.min.isr" = 2; + }; + }; + + systemd.services.apache-kafka = { + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; + serviceConfig.StateDirectory = "apache-kafka"; + }; + }; + + extraKafkaConfig = { + kafka1 = { + services.apache-kafka.settings = { + "node.id" = 1; + "broker.rack" = 1; + }; + }; + + kafka2 = { + services.apache-kafka.settings = { + "node.id" = 2; + "broker.rack" = 2; + }; + }; + + kafka3 = { + services.apache-kafka.settings = { + "node.id" = 3; + "broker.rack" = 3; + }; + }; + + kafka4 = { + services.apache-kafka.settings = { + "node.id" = 4; + "broker.rack" = 3; + }; + }; + }; + + kafkaNodes = builtins.mapAttrs ( + _: val: + mkMerge [ + val + kafkaConfig + ] + ) extraKafkaConfig; + in + { + name = "kafka-cluster"; + meta = with pkgs.lib.maintainers; { + maintainers = [ jpds ]; + }; + + nodes = { + inherit (kafkaNodes) + kafka1 + kafka2 + kafka3 + kafka4 + ; + + client = + { config, ... }: + { + environment.systemPackages = [ pkgs.apacheKafka ]; + virtualisation.diskSize = 1024; + }; + }; + + testScript = '' + import json + + for machine in kafka1, kafka2, kafka3, kafka4: + machine.wait_for_unit("apache-kafka") + + for machine in kafka1, kafka2, kafka3, kafka4: + machine.wait_for_open_port(9092) + machine.wait_for_open_port(9093) + + machine.wait_until_succeeds( + "journalctl -o cat -u apache-kafka.service | grep 'Transition from STARTING to STARTED'" + ) + + machine.wait_until_succeeds( + "journalctl -o cat -u apache-kafka.service | grep 'Kafka Server started'" + ) + + machine.wait_until_succeeds( + "journalctl -o cat -u apache-kafka.service | grep 'BrokerLifecycleManager' | grep 'Incarnation [[:graph:]]\+ of broker [[:digit:]] in cluster ${clusterId}'" + ) + + current_voters_json = kafka1.wait_until_succeeds( + "kafka-metadata-quorum.sh --bootstrap-server kafka1:9092,kafka2:9092,kafka3:9092 describe --status | grep CurrentVoters" + ).replace("CurrentVoters:", "") + + voters = json.loads(current_voters_json) + + assert len(voters) == 4 + + kafka1.wait_until_succeeds( + "kafka-topics.sh --bootstrap-server kafka1:9092 --create --topic test-123 --replication-factor 2" + ) + + for machine in kafka1, kafka2, kafka3, kafka4: + machine.wait_until_succeeds( + "journalctl -o cat -u apache-kafka.service | grep -E 'Created log for partition test-123-[[:digit:]] in /var/lib/apache-kafka/test-123-[[:digit:]] with properties'" + ) + + kafka1.wait_until_succeeds( + "kafka-topics.sh --bootstrap-server=kafka1:9092 --describe --topic test-123 | " + + "grep 'PartitionCount: 6'" + ) + + # Should never see a replica on both 3 and 4 as they're in the same rack + kafka1.fail( + "kafka-topics.sh --bootstrap-server=kafka1:9092 --describe --topic test-123 | " + + "grep -E 'Replicas: (3,4|4,3)'" + ) + + client.succeed( + "echo 'test 2' | " + + "kafka-console-producer.sh " + + "--bootstrap-server kafka1:9092 " + + "--topic test-123" + ) + assert "test 2" in client.succeed( + "kafka-console-consumer.sh " + + "--bootstrap-server kafka2:9092 --topic test-123 " + + "--group readtest " + + "--from-beginning --max-messages 1" + ) + + client.succeed( + "echo 'test 3' | " + + "kafka-console-producer.sh " + + "--bootstrap-server kafka2:9092 " + + "--topic test-123" + ) + assert "test 3" in client.succeed( + "kafka-console-consumer.sh " + + "--bootstrap-server kafka3:9092 --topic test-123 " + + "--group readtest " + + "--max-messages 1" + ) + ''; + } +) diff --git a/nixos/tests/kafka/default.nix b/nixos/tests/kafka/default.nix new file mode 100644 index 000000000000..1056117a9a10 --- /dev/null +++ b/nixos/tests/kafka/default.nix @@ -0,0 +1,11 @@ +{ + system ? builtins.currentSystem, + config ? { }, + pkgs ? import ../../.. { inherit system config; }, +}: + +{ + base = import ./base.nix { inherit system pkgs; }; + cluster = import ./cluster.nix { inherit system pkgs; }; + mirrormaker = import ./mirrormaker.nix { inherit system pkgs; }; +} diff --git a/nixos/tests/kafka/mirrormaker.nix b/nixos/tests/kafka/mirrormaker.nix new file mode 100644 index 000000000000..623f729d9fab --- /dev/null +++ b/nixos/tests/kafka/mirrormaker.nix @@ -0,0 +1,240 @@ +import ../make-test-python.nix ( + { lib, pkgs, ... }: + + let + inherit (lib) mkMerge; + + # Generate with `kafka-storage.sh random-uuid` + clusterAId = "ihzlrasUQ9O3Yy0ZWYkd6w"; + + clusterBId = "Bnu_zrzKRH6-7KcK7t3I5Q"; + + kafkaConfig = { + networking.firewall.allowedTCPPorts = [ + 9092 + 9093 + ]; + + virtualisation.diskSize = 1024; + virtualisation.memorySize = 1024 * 2; + + environment.systemPackages = [ pkgs.apacheKafka ]; + + services.apache-kafka = { + enable = true; + + formatLogDirs = true; + + settings = { + listeners = [ + "PLAINTEXT://:9092" + "CONTROLLER://:9093" + ]; + "listener.security.protocol.map" = [ + "PLAINTEXT:PLAINTEXT" + "CONTROLLER:PLAINTEXT" + ]; + "controller.listener.names" = [ "CONTROLLER" ]; + + "process.roles" = [ + "broker" + "controller" + ]; + + "log.dirs" = [ "/var/lib/apache-kafka" ]; + "num.partitions" = 1; + "offsets.topic.replication.factor" = 1; + "transaction.state.log.replication.factor" = 1; + "transaction.state.log.min.isr" = 1; + }; + }; + + systemd.services.apache-kafka = { + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; + serviceConfig.StateDirectory = "apache-kafka"; + }; + }; + + extraKafkaConfig = { + kafkaa1 = { + services.apache-kafka = { + clusterId = "${clusterAId}"; + + settings = { + "node.id" = 1; + "controller.quorum.voters" = [ "1@kafkaa1:9093" ]; + }; + }; + }; + + kafkab1 = { + services.apache-kafka = { + clusterId = "${clusterBId}"; + + settings = { + "node.id" = 1; + "controller.quorum.voters" = [ "1@kafkab1:9093" ]; + }; + }; + }; + }; + + kafkaNodes = builtins.mapAttrs ( + _: val: + mkMerge [ + val + kafkaConfig + ] + ) extraKafkaConfig; + + mirrorMakerProperties = pkgs.writeText "mm2.properties" '' + name = A->B + + clusters = A, B + + A.bootstrap.servers = kafkaa1:9092 + B.bootstrap.servers = kafkab1:9092 + + A->B.enabled = true + A->B.topics = .* + + B->A.enabled = false + B->A.topics = .* + + replication.factor=1 + replication.policy.class=org.apache.kafka.connect.mirror.IdentityReplicationPolicy + + tasks.max = 2 + refresh.topics.enabled = true + refresh.topics.interval.seconds = 5 + sync.topic.configs.enabled = true + + checkpoints.topic.replication.factor=1 + heartbeats.topic.replication.factor=1 + offset-syncs.topic.replication.factor=1 + + offset.storage.replication.factor=1 + status.storage.replication.factor=1 + config.storage.replication.factor=1 + + emit.checkpoints.enabled = true + emit.checkpoints.interval.seconds = 5 + ''; + in + { + name = "kafka-mirrormaker"; + meta = with pkgs.lib.maintainers; { + maintainers = [ jpds ]; + }; + + nodes = { + inherit (kafkaNodes) kafkaa1 kafkab1; + + mirrormaker = + { config, ... }: + { + virtualisation.diskSize = 1024; + virtualisation.memorySize = 1024 * 2; + + # Define a mirrormaker systemd service + systemd.services.kafka-connect-mirror-maker = { + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = '' + ${pkgs.apacheKafka}/bin/connect-mirror-maker.sh ${mirrorMakerProperties} + ''; + Restart = "on-failure"; + RestartSec = "5s"; + }; + }; + }; + }; + + testScript = '' + import json + + for machine in kafkaa1, kafkab1: + machine.wait_for_unit("apache-kafka") + + for machine in kafkaa1, kafkab1: + machine.wait_for_open_port(9092) + machine.wait_for_open_port(9093) + + machine.wait_until_succeeds( + "journalctl -o cat -u apache-kafka.service | grep 'Transition from STARTING to STARTED'" + ) + + machine.wait_until_succeeds( + "journalctl -o cat -u apache-kafka.service | grep 'Kafka Server started'" + ) + + for machine in kafkaa1, kafkab1: + current_voters_json = machine.wait_until_succeeds( + f"kafka-metadata-quorum.sh --bootstrap-server {machine.name}:9092 describe --status | grep CurrentVoters" + ).replace("CurrentVoters:", "") + + voters = json.loads(current_voters_json) + + assert len(voters) == 1 + + mirrormaker.wait_for_unit("kafka-connect-mirror-maker") + + mirrormaker.wait_until_succeeds( + "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'Kafka MirrorMaker initializing'" + ) + mirrormaker.wait_until_succeeds( + "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'Targeting clusters \[A, B\]'" + ) + mirrormaker.wait_until_succeeds( + "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'INFO \[Worker clientId=A->B, groupId=A-mm2\] Finished starting connectors and tasks'" + ) + + mirrormaker.wait_until_succeeds( + """ + journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'INFO \[MirrorSourceConnector\|task-0\] \[Producer clientId=A->B\|A->B-0\|offset-syncs-source-producer\] Cluster ID: ${clusterAId}' + """ + ) + + kafkaa1.wait_until_succeeds( + "journalctl -o cat -u apache-kafka.service | grep 'Stabilized group B-mm2'" + ) + + kafkab1.wait_until_succeeds( + "journalctl -o cat -u apache-kafka.service | grep 'Stabilized group A-mm2'" + ) + + kafkaa1.wait_until_succeeds( + "kafka-topics.sh --bootstrap-server localhost:9092 --create --topic test-mm-1 --partitions 1 --replication-factor 1" + ) + + for machine in kafkaa1, kafkab1: + machine.succeed( + "kafka-topics.sh --bootstrap-server localhost:9092 --list | grep 'test-mm-1'" + ) + + mirrormaker.wait_until_succeeds( + "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'replicating [[:digit:]]\+ topic-partitions A->B: \[test-mm-1-0\]'" + ) + + mirrormaker.wait_until_succeeds( + "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'Found [[:digit:]]\+ new topic-partitions on A'" + ) + + kafkaa1.wait_until_succeeds( + "kafka-verifiable-producer.sh --bootstrap-server kafkaa1:9092 --throughput 10 --max-messages 100 --topic test-mm-1" + ) + + mirrormaker.wait_until_succeeds( + "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'Committing offsets for [[:digit:]]\+ acknowledged messages'" + ) + + kafkab1.wait_until_succeeds( + "kafka-verifiable-consumer.sh --bootstrap-server kafkab1:9092 --topic test-mm-1 --group-id testreplication --max-messages 100" + ) + ''; + } +) diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix index 16e39dba729c..8f0ca0ec0859 100644 --- a/nixos/tests/kanidm-provisioning.nix +++ b/nixos/tests/kanidm-provisioning.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ( { pkgs, lib, ... }: { services.kanidm = { - package = pkgs.kanidmWithSecretProvisioning; + package = pkgs.kanidmWithSecretProvisioning_1_6; enableServer = true; serverSettings = { origin = "https://${serverDomain}"; diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index b3b4e0213cbf..69dac0de6865 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -26,6 +26,7 @@ import ./make-test-python.nix ( { pkgs, ... }: { services.kanidm = { + package = pkgs.kanidm_1_6; enableServer = true; serverSettings = { origin = "https://${serverDomain}"; @@ -55,6 +56,7 @@ import ./make-test-python.nix ( { nodes, ... }: { services.kanidm = { + package = pkgs.kanidm_1_6; enableClient = true; clientSettings = { uri = "https://${serverDomain}"; diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 2a1ab38267a3..34e0597777a6 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -42,6 +42,7 @@ let linux_6_6_hardened linux_6_12_hardened linux_6_13_hardened + linux_6_14_hardened linux_rt_5_4 linux_rt_5_10 linux_rt_5_15 diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix index 06bd65405f6f..e06d39a8d826 100644 --- a/nixos/tests/kexec.nix +++ b/nixos/tests/kexec.nix @@ -1,62 +1,60 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "kexec"; - meta = with lib.maintainers; { - maintainers = [ - flokli - lassulus - ]; - }; +{ pkgs, lib, ... }: +{ + name = "kexec"; + meta = with lib.maintainers; { + maintainers = [ + flokli + lassulus + ]; + }; - nodes = { - node1 = - { ... }: - { - virtualisation.vlans = [ ]; - virtualisation.memorySize = 4 * 1024; - }; + nodes = { + node1 = + { ... }: + { + virtualisation.vlans = [ ]; + virtualisation.memorySize = 4 * 1024; + }; - node2 = - { modulesPath, ... }: - { - virtualisation.vlans = [ ]; - environment.systemPackages = [ pkgs.hello ]; - imports = [ - "${modulesPath}/installer/netboot/netboot-minimal.nix" - "${modulesPath}/testing/test-instrumentation.nix" - "${modulesPath}/profiles/qemu-guest.nix" - ]; - }; - }; + node2 = + { modulesPath, ... }: + { + virtualisation.vlans = [ ]; + environment.systemPackages = [ pkgs.hello ]; + imports = [ + "${modulesPath}/installer/netboot/netboot-minimal.nix" + "${modulesPath}/testing/test-instrumentation.nix" + "${modulesPath}/profiles/qemu-guest.nix" + ]; + }; + }; - testScript = - { nodes, ... }: - '' - # Test whether reboot via kexec works. - node1.wait_for_unit("multi-user.target") - node1.succeed('kexec --load /run/current-system/kernel --initrd /run/current-system/initrd --command-line "$(&2 &", check_return=False) - node1.connected = False - node1.connect() - node1.wait_for_unit("multi-user.target") + testScript = + { nodes, ... }: + '' + # Test whether reboot via kexec works. + node1.wait_for_unit("multi-user.target") + node1.succeed('kexec --load /run/current-system/kernel --initrd /run/current-system/initrd --command-line "$(&2 &", check_return=False) + node1.connected = False + node1.connect() + node1.wait_for_unit("multi-user.target") - # Check if the machine with netboot-minimal.nix profile boots up - node2.wait_for_unit("multi-user.target") - node2.shutdown() + # Check if the machine with netboot-minimal.nix profile boots up + node2.wait_for_unit("multi-user.target") + node2.shutdown() - # Kexec node1 to the toplevel of node2 via the kexec-boot script - node1.succeed('touch /run/foo') - node1.fail('hello') - node1.execute('${nodes.node2.system.build.kexecTree}/kexec-boot', check_output=False) - node1.connected = False - node1.connect() - node1.wait_for_unit("multi-user.target") - node1.succeed('! test -e /run/foo') - node1.succeed('hello') - node1.succeed('[ "$(hostname)" = "node2" ]') + # Kexec node1 to the toplevel of node2 via the kexec-boot script + node1.succeed('touch /run/foo') + node1.fail('hello') + node1.execute('${nodes.node2.system.build.kexecTree}/kexec-boot', check_output=False) + node1.connected = False + node1.connect() + node1.wait_for_unit("multi-user.target") + node1.succeed('! test -e /run/foo') + node1.succeed('hello') + node1.succeed('[ "$(hostname)" = "node2" ]') - node1.shutdown() - ''; - } -) + node1.shutdown() + ''; +} diff --git a/nixos/tests/kimai.nix b/nixos/tests/kimai.nix index dbe9b834edca..967d531f3c54 100644 --- a/nixos/tests/kimai.nix +++ b/nixos/tests/kimai.nix @@ -1,23 +1,21 @@ -import ./make-test-python.nix ( - { lib, ... }: +{ lib, ... }: - { - name = "kimai"; - meta.maintainers = with lib.maintainers; [ peat-psuwit ]; +{ + name = "kimai"; + meta.maintainers = with lib.maintainers; [ peat-psuwit ]; - nodes.machine = - { ... }: - { - services.kimai.sites."localhost" = { - database.createLocally = true; - }; + nodes.machine = + { ... }: + { + services.kimai.sites."localhost" = { + database.createLocally = true; }; + }; - testScript = '' - machine.wait_for_unit("phpfpm-kimai-localhost.service") - machine.wait_for_unit("nginx.service") - machine.wait_for_open_port(80) - machine.succeed("curl -v --location --fail http://localhost/") - ''; - } -) + testScript = '' + machine.wait_for_unit("phpfpm-kimai-localhost.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) + machine.succeed("curl -v --location --fail http://localhost/") + ''; +} diff --git a/nixos/tests/kismet.nix b/nixos/tests/kismet.nix new file mode 100644 index 000000000000..878a341cedea --- /dev/null +++ b/nixos/tests/kismet.nix @@ -0,0 +1,266 @@ +{ pkgs, lib, ... }: + +let + ssid = "Hydra SmokeNet"; + psk = "stayoffmywifi"; + wlanInterface = "wlan0"; +in +{ + name = "kismet"; + + nodes = + let + hostAddress = id: "192.168.1.${toString (id + 1)}"; + serverAddress = hostAddress 1; + in + { + airgap = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = serverAddress; + prefixLength = 24; + } + ]; + services.vwifi = { + server = { + enable = true; + ports.tcp = 8212; + ports.spy = 8213; + openFirewall = true; + }; + }; + }; + + ap = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = hostAddress 2; + prefixLength = 24; + } + ]; + services.hostapd = { + enable = true; + radios.${wlanInterface} = { + channel = 1; + networks.${wlanInterface} = { + inherit ssid; + authentication = { + mode = "wpa3-sae"; + saePasswords = [ { password = psk; } ]; + enableRecommendedPairwiseCiphers = true; + }; + }; + }; + }; + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:01"; + }; + client = { + enable = true; + inherit serverAddress; + }; + }; + }; + + station = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = hostAddress 3; + prefixLength = 24; + } + ]; + networking.wireless = { + # No, really, we want it enabled! + enable = lib.mkOverride 0 true; + interfaces = [ wlanInterface ]; + networks = { + ${ssid} = { + inherit psk; + authProtocols = [ "SAE" ]; + }; + }; + }; + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:02"; + }; + client = { + enable = true; + inherit serverAddress; + }; + }; + }; + + monitor = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = hostAddress 4; + prefixLength = 24; + } + ]; + + services.kismet = { + enable = true; + serverName = "NixOS Kismet Smoke Test"; + serverDescription = "Server testing virtual wifi devices running on Hydra"; + httpd.enable = true; + # Check that the settings all eval correctly + settings = { + # Should append to log_types + log_types' = "wiglecsv"; + + # Should all generate correctly + wepkey = [ + "00:DE:AD:C0:DE:00" + "FEEDFACE42" + ]; + alert = [ + [ + "ADHOCCONFLICT" + "5/min" + "1/sec" + ] + [ + "ADVCRYPTCHANGE" + "5/min" + "1/sec" + ] + ]; + gps.gpsd = { + host = "localhost"; + port = 2947; + }; + apspoof.Foo1 = [ + { + ssid = "Bar1"; + validmacs = [ + "00:11:22:33:44:55" + "aa:bb:cc:dd:ee:ff" + ]; + } + { + ssid = "Bar2"; + validmacs = [ + "01:12:23:34:45:56" + "ab:bc:cd:de:ef:f0" + ]; + } + ]; + apspoof.Foo2 = [ + { + ssid = "Bar2"; + validmacs = [ + "00:11:22:33:44:55" + "aa:bb:cc:dd:ee:ff" + ]; + } + ]; + + # The actual source + source.${wlanInterface} = { + name = "Virtual Wifi"; + }; + }; + extraConfig = '' + # this comment should be ignored + ''; + }; + + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:03"; + }; + client = { + enable = true; + spy = true; + inherit serverAddress; + }; + }; + + environment.systemPackages = with pkgs; [ + config.services.kismet.package + config.services.vwifi.package + jq + ]; + }; + }; + + testScript = + { nodes, ... }: + '' + import shlex + + # Wait for the vwifi server to come up + airgap.start() + airgap.wait_for_unit("vwifi-server.service") + airgap.wait_for_open_port(${toString nodes.airgap.services.vwifi.server.ports.tcp}) + + httpd_port = ${toString nodes.monitor.services.kismet.httpd.port} + server_name = "${nodes.monitor.services.kismet.serverName}" + server_description = "${nodes.monitor.services.kismet.serverDescription}" + wlan_interface = "${wlanInterface}" + ap_essid = "${ssid}" + ap_mac_prefix = "${nodes.ap.services.vwifi.module.macPrefix}" + station_mac_prefix = "${nodes.station.services.vwifi.module.macPrefix}" + + # Spawn the other nodes. + monitor.start() + + # Wait for the monitor to come up + monitor.wait_for_unit("kismet.service") + monitor.wait_for_open_port(httpd_port) + + # Should be up but require authentication. + url = f"http://localhost:{httpd_port}" + monitor.succeed(f"curl {url} | tee /dev/stderr | grep 'Kismet'") + + # Have to set the password now. + monitor.succeed("echo httpd_username=nixos >> ~kismet/.kismet/kismet_httpd.conf") + monitor.succeed("echo httpd_password=hydra >> ~kismet/.kismet/kismet_httpd.conf") + monitor.systemctl("restart kismet.service") + monitor.wait_for_unit("kismet.service") + monitor.wait_for_open_port(httpd_port) + + # Authentication should now work. + url = f"http://nixos:hydra@localhost:{httpd_port}" + monitor.succeed(f"curl {url}/system/status.json | tee /dev/stderr | jq -e --arg serverName {shlex.quote(server_name)} --arg serverDescription {shlex.quote(server_description)} '.\"kismet.system.server_name\" == $serverName and .\"kismet.system.server_description\" == $serverDescription'") + + # Wait for the station to connect to the AP while Kismet is monitoring + ap.start() + station.start() + + unit = f"wpa_supplicant-{wlan_interface}" + + # Generate handshakes until we detect both devices + success = False + for i in range(100): + station.wait_for_unit(f"wpa_supplicant-{wlan_interface}.service") + station.succeed(f"ifconfig {wlan_interface} down && ifconfig {wlan_interface} up") + station.wait_until_succeeds(f"journalctl -u {shlex.quote(unit)} -e | grep -Eqi {shlex.quote(wlan_interface + ': CTRL-EVENT-CONNECTED - Connection to ' + ap_mac_prefix + '[0-9a-f:]* completed')}") + station.succeed(f"journalctl --rotate --unit={shlex.quote(unit)}") + station.succeed(f"sleep 3 && journalctl --vacuum-time=1s --unit={shlex.quote(unit)}") + + # We're connected, make sure Kismet sees both of our devices + status, stdout = monitor.execute(f"curl {url}/devices/views/all/last-time/0/devices.json | tee /dev/stderr | jq -e --arg macPrefix {shlex.quote(ap_mac_prefix)} --arg ssid {shlex.quote(ap_essid)} '. | (map(select((.\"kismet.device.base.macaddr\"? | startswith($macPrefix)) and .\"dot11.device\"?.\"dot11.device.last_beaconed_ssid_record\"?.\"dot11.advertisedssid.ssid\" == $ssid)) | length) == 1'") + if status != 0: + continue + status, stdout = monitor.execute(f"curl {url}/devices/views/all/last-time/0/devices.json | tee /dev/stderr | jq -e --arg macPrefix {shlex.quote(station_mac_prefix)} '. | (map(select((.\"kismet.device.base.macaddr\"? | startswith($macPrefix)))) | length) == 1'") + if status == 0: + success = True + break + + assert success + ''; +} diff --git a/nixos/tests/lavalink.nix b/nixos/tests/lavalink.nix new file mode 100644 index 000000000000..878f05094190 --- /dev/null +++ b/nixos/tests/lavalink.nix @@ -0,0 +1,43 @@ +{ lib, ... }: + +let + password = "s3cRe!p4SsW0rD"; +in + +{ + name = "lavalink"; + meta.maintainers = with lib.maintainers; [ nanoyaki ]; + + nodes = { + machine = { + services.lavalink = { + enable = true; + port = 1234; + inherit password; + }; + }; + machine2 = + { pkgs, ... }: + { + services.lavalink = { + enable = true; + port = 1235; + environmentFile = "${pkgs.writeText "passwordEnvFile" '' + LAVALINK_SERVER_PASSWORD=${password} + ''}"; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("lavalink.service") + machine.wait_for_open_port(1234) + machine.succeed("curl --header \"User-Id: 1204475253028429844\" --header \"Client-Name: shoukaku/4.1.1\" --header \"Authorization: ${password}\" http://localhost:1234/v4/info --fail -v") + + machine2.wait_for_unit("lavalink.service") + machine2.wait_for_open_port(1235) + machine2.succeed("curl --header \"User-Id: 1204475253028429844\" --header \"Client-Name: shoukaku/4.1.1\" --header \"Authorization: ${password}\" http://localhost:1235/v4/info --fail -v") + ''; +} diff --git a/nixos/tests/librenms.nix b/nixos/tests/librenms.nix index 05821dfa1000..d4aff22392cf 100644 --- a/nixos/tests/librenms.nix +++ b/nixos/tests/librenms.nix @@ -1,106 +1,101 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: +{ pkgs, lib, ... }: - let - api_token = "f87f42114e44b63ad1b9e3c3d33d6fbe"; # random md5 hash - wrong_api_token = "e68ba041fcf1eab923a7a6de3af5f726"; # another random md5 hash - in - { - name = "librenms"; - meta.maintainers = lib.teams.wdz.members; +let + api_token = "f87f42114e44b63ad1b9e3c3d33d6fbe"; # random md5 hash + wrong_api_token = "e68ba041fcf1eab923a7a6de3af5f726"; # another random md5 hash +in +{ + name = "librenms"; + meta.maintainers = lib.teams.wdz.members; - nodes.librenms = { - time.timeZone = "Europe/Berlin"; + nodes.librenms = { + time.timeZone = "Europe/Berlin"; - environment.systemPackages = with pkgs; [ - curl - jq - ]; + environment.systemPackages = with pkgs; [ + curl + jq + ]; - services.librenms = { - enable = true; - hostname = "librenms"; - database = { - createLocally = true; - host = "localhost"; - database = "librenms"; - username = "librenms"; - passwordFile = pkgs.writeText "librenms-db-pass" "librenmsdbpass"; - }; - nginx = { - default = true; - }; - enableOneMinutePolling = true; - settings = { - enable_billing = true; - }; + services.librenms = { + enable = true; + hostname = "librenms"; + database = { + createLocally = true; + host = "localhost"; + database = "librenms"; + username = "librenms"; + passwordFile = pkgs.writeText "librenms-db-pass" "librenmsdbpass"; }; - - # systemd oneshot to create a dummy admin user and a API token for testing - systemd.services.lnms-api-init = { - description = "LibreNMS API init"; - after = [ "librenms-setup.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - User = "root"; - Group = "root"; - }; - script = '' - API_USER_NAME=api - API_TOKEN=${api_token} # random md5 hash - - # seeding database to get the admin roles - ${pkgs.librenms}/artisan db:seed --force --no-interaction - - # we don't need to know the password, it just has to exist - API_USER_PASS=$(${pkgs.pwgen}/bin/pwgen -s 64 1) - ${pkgs.librenms}/artisan user:add $API_USER_NAME -r admin -p $API_USER_PASS - API_USER_ID=$(${pkgs.mariadb}/bin/mysql -D librenms -N -B -e "SELECT user_id FROM users WHERE username = '$API_USER_NAME';") - - ${pkgs.mariadb}/bin/mysql -D librenms -e "INSERT INTO api_tokens (user_id, token_hash, description) VALUES ($API_USER_ID, '$API_TOKEN', 'API User')" - ''; + nginx = { + default = true; + }; + enableOneMinutePolling = true; + settings = { + enable_billing = true; }; }; - nodes.snmphost = { - - services.snmpd = { - enable = true; - openFirewall = true; - - configText = '' - com2sec readonly default public - - group MyROGroup v2c readonly - view all included .1 80 - access MyROGroup "" any noauth exact all none none - - syslocation Testcity, Testcountry - syscontact Testi mc Test - ''; - + # systemd oneshot to create a dummy admin user and a API token for testing + systemd.services.lnms-api-init = { + description = "LibreNMS API init"; + after = [ "librenms-setup.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "root"; + Group = "root"; }; + script = '' + API_USER_NAME=api + API_TOKEN=${api_token} # random md5 hash + + # we don't need to know the password, it just has to exist + API_USER_PASS=$(${pkgs.pwgen}/bin/pwgen -s 64 1) + ${pkgs.librenms}/artisan user:add $API_USER_NAME -r admin -p $API_USER_PASS + API_USER_ID=$(${pkgs.mariadb}/bin/mysql -D librenms -N -B -e "SELECT user_id FROM users WHERE username = '$API_USER_NAME';") + + ${pkgs.mariadb}/bin/mysql -D librenms -e "INSERT INTO api_tokens (user_id, token_hash, description) VALUES ($API_USER_ID, '$API_TOKEN', 'API User')" + ''; }; + }; - testScript = '' - start_all() + nodes.snmphost = { - snmphost.wait_for_unit("snmpd.service") + services.snmpd = { + enable = true; + openFirewall = true; - librenms.wait_for_unit("lnms-api-init.service") - librenms.wait_for_open_port(80) + configText = '' + com2sec readonly default public - # Test that we can authenticate against the API - librenms.succeed("curl --fail -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0") - librenms.fail("curl --fail -H 'X-Auth-Token: ${wrong_api_token}' http://localhost/api/v0") + group MyROGroup v2c readonly + view all included .1 80 + access MyROGroup "" any noauth exact all none none - # add snmphost as a device - librenms.succeed("curl --fail -X POST -d '{\"hostname\":\"snmphost\",\"version\":\"v2c\",\"community\":\"public\"}' -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0/devices") + syslocation Testcity, Testcountry + syscontact Testi mc Test + ''; - # wait until snmphost gets polled - librenms.wait_until_succeeds("test $(curl -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0/devices/snmphost | jq -Mr .devices[0].last_polled) != 'null'") - ''; - } -) + }; + }; + + testScript = '' + start_all() + + snmphost.wait_for_unit("snmpd.service") + + librenms.wait_for_unit("lnms-api-init.service") + librenms.wait_for_open_port(80) + + # Test that we can authenticate against the API + librenms.succeed("curl --fail -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0") + librenms.fail("curl --fail -H 'X-Auth-Token: ${wrong_api_token}' http://localhost/api/v0") + + # add snmphost as a device + librenms.succeed("curl --fail -X POST -d '{\"hostname\":\"snmphost\",\"version\":\"v2c\",\"community\":\"public\"}' -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0/devices") + + # wait until snmphost gets polled + librenms.wait_until_succeeds("test $(curl -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0/devices/snmphost | jq -Mr .devices[0].last_polled) != 'null'") + ''; +} diff --git a/nixos/tests/lighttpd.nix b/nixos/tests/lighttpd.nix index 271dc19ef68c..db08fdf3de22 100644 --- a/nixos/tests/lighttpd.nix +++ b/nixos/tests/lighttpd.nix @@ -1,25 +1,23 @@ -import ./make-test-python.nix ( - { lib, pkgs, ... }: - { - name = "lighttpd"; - meta.maintainers = with lib.maintainers; [ bjornfor ]; +{ lib, pkgs, ... }: +{ + name = "lighttpd"; + meta.maintainers = with lib.maintainers; [ bjornfor ]; - nodes = { - server = { - services.lighttpd.enable = true; - services.lighttpd.document-root = pkgs.runCommand "document-root" { } '' - mkdir -p "$out" - echo "hello nixos test" > "$out/file.txt" - ''; - }; + nodes = { + server = { + services.lighttpd.enable = true; + services.lighttpd.document-root = pkgs.runCommand "document-root" { } '' + mkdir -p "$out" + echo "hello nixos test" > "$out/file.txt" + ''; }; + }; - testScript = '' - start_all() - server.wait_for_unit("lighttpd.service") - res = server.succeed("curl --fail http://localhost/file.txt") - assert "hello nixos test" in res, f"bad server response: '{res}'" - server.succeed("systemctl reload lighttpd") - ''; - } -) + testScript = '' + start_all() + server.wait_for_unit("lighttpd.service") + res = server.succeed("curl --fail http://localhost/file.txt") + assert "hello nixos test" in res, f"bad server response: '{res}'" + server.succeed("systemctl reload lighttpd") + ''; +} diff --git a/nixos/tests/limine/checksum.nix b/nixos/tests/limine/checksum.nix index 78352bf5da83..db01f8ccea92 100644 --- a/nixos/tests/limine/checksum.nix +++ b/nixos/tests/limine/checksum.nix @@ -6,11 +6,6 @@ phip1611 programmerlexi ]; - meta.platforms = [ - "aarch64-linux" - "i686-linux" - "x86_64-linux" - ]; nodes.machine = { ... }: { diff --git a/nixos/tests/limine/default.nix b/nixos/tests/limine/default.nix index 7458b9641633..9497e06a18f6 100644 --- a/nixos/tests/limine/default.nix +++ b/nixos/tests/limine/default.nix @@ -4,5 +4,6 @@ }: { checksum = runTest ./checksum.nix; + secureBoot = runTest ./secure-boot.nix; uefi = runTest ./uefi.nix; } diff --git a/nixos/tests/limine/secure-boot.nix b/nixos/tests/limine/secure-boot.nix new file mode 100644 index 000000000000..9f7969e626a0 --- /dev/null +++ b/nixos/tests/limine/secure-boot.nix @@ -0,0 +1,34 @@ +{ lib, ... }: +{ + name = "secureBoot"; + meta.maintainers = with lib.maintainers; [ + programmerlexi + ]; + meta.platforms = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + ]; + nodes.machine = + { pkgs, ... }: + { + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = true; + virtualisation.useSecureBoot = true; + virtualisation.efi.OVMF = pkgs.OVMFFull.fd; + virtualisation.efi.keepVariables = true; + + boot.loader.efi.canTouchEfiVariables = true; + + boot.loader.limine.enable = true; + boot.loader.limine.efiSupport = true; + boot.loader.limine.secureBoot.enable = true; + boot.loader.limine.secureBoot.createAndEnrollKeys = true; + boot.loader.timeout = 0; + }; + + testScript = '' + machine.start() + assert "Secure Boot: enabled (user)" in machine.succeed("bootctl status") + ''; +} diff --git a/nixos/tests/limine/uefi.nix b/nixos/tests/limine/uefi.nix index 12f2f695a865..4c9d0309d25b 100644 --- a/nixos/tests/limine/uefi.nix +++ b/nixos/tests/limine/uefi.nix @@ -6,11 +6,6 @@ phip1611 programmerlexi ]; - meta.platforms = [ - "aarch64-linux" - "i686-linux" - "x86_64-linux" - ]; nodes.machine = { ... }: { diff --git a/nixos/tests/logrotate.nix b/nixos/tests/logrotate.nix index 1efbcc4cfed5..603a0f164c46 100644 --- a/nixos/tests/logrotate.nix +++ b/nixos/tests/logrotate.nix @@ -10,137 +10,134 @@ let }; in +{ pkgs, ... }: +{ + name = "logrotate"; + meta = with pkgs.lib.maintainers; { + maintainers = [ martinetd ]; + }; -import ./make-test-python.nix ( - { pkgs, ... }: - rec { - name = "logrotate"; - meta = with pkgs.lib.maintainers; { - maintainers = [ martinetd ]; - }; - - nodes = { - defaultMachine = - { ... }: - { - services.logrotate.enable = true; + nodes = { + defaultMachine = + { ... }: + { + services.logrotate.enable = true; + }; + failingMachine = + { ... }: + { + services.logrotate = { + enable = true; + configFile = pkgs.writeText "logrotate.conf" '' + # self-written config file + su notarealuser notagroupeither + ''; }; - failingMachine = - { ... }: - { - services.logrotate = { - enable = true; - configFile = pkgs.writeText "logrotate.conf" '' - # self-written config file - su notarealuser notagroupeither - ''; - }; - }; - machine = - { config, ... }: - { - imports = [ importTest ]; + }; + machine = + { config, ... }: + { + imports = [ importTest ]; - services.logrotate = { - enable = true; - settings = { - # remove default frequency header and add another - header = { - frequency = null; - delaycompress = true; - }; - # extra global setting... affecting nothing - last_line = { - global = true; - priority = 2000; - shred = true; - }; - # using mail somewhere should add --mail to logrotate invocation - sendmail = { - mail = "user@domain.tld"; - }; - # postrotate should be suffixed by 'endscript' - postrotate = { - postrotate = "touch /dev/null"; - }; - # check checkConfig works as expected: there is nothing to check here - # except that the file build passes - checkConf = { - su = "root utmp"; - createolddir = "0750 root utmp"; - create = "root utmp"; - "create " = "0750 root utmp"; - }; - # multiple paths should be aggregated - multipath = { - files = [ - "file1" - "file2" - ]; - }; - # overriding imported path should keep existing attributes - # (e.g. olddir is still set) - import = { - notifempty = true; - }; + services.logrotate = { + enable = true; + settings = { + # remove default frequency header and add another + header = { + frequency = null; + delaycompress = true; + }; + # extra global setting... affecting nothing + last_line = { + global = true; + priority = 2000; + shred = true; + }; + # using mail somewhere should add --mail to logrotate invocation + sendmail = { + mail = "user@domain.tld"; + }; + # postrotate should be suffixed by 'endscript' + postrotate = { + postrotate = "touch /dev/null"; + }; + # check checkConfig works as expected: there is nothing to check here + # except that the file build passes + checkConf = { + su = "root utmp"; + createolddir = "0750 root utmp"; + create = "root utmp"; + "create " = "0750 root utmp"; + }; + # multiple paths should be aggregated + multipath = { + files = [ + "file1" + "file2" + ]; + }; + # overriding imported path should keep existing attributes + # (e.g. olddir is still set) + import = { + notifempty = true; }; }; }; - }; + }; + }; - testScript = '' - with subtest("whether logrotate works"): - # we must rotate once first to create logrotate stamp - defaultMachine.succeed("systemctl start logrotate.service") - # we need to wait for console text once here to - # clear console buffer up to this point for next wait - defaultMachine.wait_for_console_text('logrotate.service: Deactivated successfully') + testScript = '' + with subtest("whether logrotate works"): + # we must rotate once first to create logrotate stamp + defaultMachine.succeed("systemctl start logrotate.service") + # we need to wait for console text once here to + # clear console buffer up to this point for next wait + defaultMachine.wait_for_console_text('logrotate.service: Deactivated successfully') - defaultMachine.succeed( - # wtmp is present in default config. - "rm -f /var/log/wtmp*", - # we need to give it at least 1MB - "dd if=/dev/zero of=/var/log/wtmp bs=2M count=1", + defaultMachine.succeed( + # wtmp is present in default config. + "rm -f /var/log/wtmp*", + # we need to give it at least 1MB + "dd if=/dev/zero of=/var/log/wtmp bs=2M count=1", - # move into the future and check rotation. - "date -s 'now + 1 month + 1 day'") - defaultMachine.wait_for_console_text('logrotate.service: Deactivated successfully') - defaultMachine.succeed( - # check rotate worked - "[ -e /var/log/wtmp.1 ]", - ) - with subtest("default config does not have mail"): - defaultMachine.fail("systemctl cat logrotate.service | grep -- --mail") - with subtest("using mails adds mail option"): - machine.succeed("systemctl cat logrotate.service | grep -- --mail") - with subtest("check generated config matches expectation"): - machine.succeed( - # copy conf to /tmp/logrotate.conf for easy grep - "conf=$(systemctl cat logrotate | grep -oE '/nix/store[^ ]*logrotate.conf'); cp $conf /tmp/logrotate.conf", - "! grep weekly /tmp/logrotate.conf", - "grep -E '^delaycompress' /tmp/logrotate.conf", - "tail -n 1 /tmp/logrotate.conf | grep shred", - "sed -ne '/\"sendmail\" {/,/}/p' /tmp/logrotate.conf | grep 'mail user@domain.tld'", - "sed -ne '/\"postrotate\" {/,/}/p' /tmp/logrotate.conf | grep endscript", - "grep '\"file1\"\n\"file2\" {' /tmp/logrotate.conf", - "sed -ne '/\"import\" {/,/}/p' /tmp/logrotate.conf | grep noolddir", - ) - # also check configFile option - failingMachine.succeed( - "conf=$(systemctl cat logrotate | grep -oE '/nix/store[^ ]*logrotate.conf'); cp $conf /tmp/logrotate.conf", - "grep 'self-written config' /tmp/logrotate.conf", - ) - with subtest("Check logrotate-checkconf service"): - machine.wait_for_unit("logrotate-checkconf.service") - # wait_for_unit also asserts for success, so wait for - # parent target instead and check manually. - failingMachine.wait_for_unit("multi-user.target") - info = failingMachine.get_unit_info("logrotate-checkconf.service") - if info["ActiveState"] != "failed": - raise Exception('logrotate-checkconf.service was not failed') + # move into the future and check rotation. + "date -s 'now + 1 month + 1 day'") + defaultMachine.wait_for_console_text('logrotate.service: Deactivated successfully') + defaultMachine.succeed( + # check rotate worked + "[ -e /var/log/wtmp.1 ]", + ) + with subtest("default config does not have mail"): + defaultMachine.fail("systemctl cat logrotate.service | grep -- --mail") + with subtest("using mails adds mail option"): + machine.succeed("systemctl cat logrotate.service | grep -- --mail") + with subtest("check generated config matches expectation"): + machine.succeed( + # copy conf to /tmp/logrotate.conf for easy grep + "conf=$(systemctl cat logrotate | grep -oE '/nix/store[^ ]*logrotate.conf'); cp $conf /tmp/logrotate.conf", + "! grep weekly /tmp/logrotate.conf", + "grep -E '^delaycompress' /tmp/logrotate.conf", + "tail -n 1 /tmp/logrotate.conf | grep shred", + "sed -ne '/\"sendmail\" {/,/}/p' /tmp/logrotate.conf | grep 'mail user@domain.tld'", + "sed -ne '/\"postrotate\" {/,/}/p' /tmp/logrotate.conf | grep endscript", + "grep '\"file1\"\n\"file2\" {' /tmp/logrotate.conf", + "sed -ne '/\"import\" {/,/}/p' /tmp/logrotate.conf | grep noolddir", + ) + # also check configFile option + failingMachine.succeed( + "conf=$(systemctl cat logrotate | grep -oE '/nix/store[^ ]*logrotate.conf'); cp $conf /tmp/logrotate.conf", + "grep 'self-written config' /tmp/logrotate.conf", + ) + with subtest("Check logrotate-checkconf service"): + machine.wait_for_unit("logrotate-checkconf.service") + # wait_for_unit also asserts for success, so wait for + # parent target instead and check manually. + failingMachine.wait_for_unit("multi-user.target") + info = failingMachine.get_unit_info("logrotate-checkconf.service") + if info["ActiveState"] != "failed": + raise Exception('logrotate-checkconf.service was not failed') - machine.log(machine.execute("systemd-analyze security logrotate.service | grep -v ✓")[1]) + machine.log(machine.execute("systemd-analyze security logrotate.service | grep -v ✓")[1]) - ''; - } -) + ''; +} diff --git a/nixos/tests/lomiri-calendar-app.nix b/nixos/tests/lomiri-calendar-app.nix index 5530e9e36075..41061a066638 100644 --- a/nixos/tests/lomiri-calendar-app.nix +++ b/nixos/tests/lomiri-calendar-app.nix @@ -1,11 +1,7 @@ { pkgs, lib, ... }: { name = "lomiri-calendar-app-standalone"; - meta = { - maintainers = lib.teams.lomiri.members; - # This needs a Linux VM - platforms = lib.platforms.linux; - }; + meta.maintainers = lib.teams.lomiri.members; nodes.machine = { config, pkgs, ... }: @@ -44,23 +40,33 @@ with subtest("lomiri calendar launches"): machine.succeed("lomiri-calendar-app >&2 &") - machine.wait_for_text(r"(January|February|March|April|May|June|July|August|September|October|November|December)") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(2) + # Default page is unbearably slow to OCR on, switch to another + machine.succeed("xdotool mousemove 580 50 click 1") + machine.sleep(2) + machine.wait_for_text(r"(January|February|March|April|May|June|July|August|September|October|November|December|Mon|Tue|Wed|Thu|Fri|Sat|Sun)") machine.screenshot("lomiri-calendar") with subtest("lomiri calendar works"): # Switch to Agenda tab, less busy - machine.succeed("xdotool mousemove 300 50 click 1") + machine.succeed("xdotool mousemove 380 50 click 1") + machine.sleep(2) # Still on main page - machine.succeed("xdotool mousemove 500 650 click 1") + machine.succeed("xdotool mousemove 500 720 click 1") + machine.sleep(2) machine.wait_for_text(r"(Date|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday|All day|Name|Details|More)") machine.screenshot("lomiri-calendar_newevent") # On New Event page machine.succeed("xdotool mousemove 500 230 click 1") + machine.sleep(2) machine.send_chars("foobar") machine.sleep(2) # make sure they're actually in there - machine.succeed("xdotool mousemove 780 40 click 1") + machine.succeed("xdotool mousemove 1000 40 click 1") + machine.sleep(2) machine.wait_for_text("Agenda") machine.screenshot("lomiri-calendar_eventadded") @@ -73,6 +79,9 @@ with subtest("lomiri calendar localisation works"): machine.succeed("env LANG=de_DE.UTF-8 lomiri-calendar-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(2) machine.wait_for_text(r"(Montag|Dienstag|Mittwoch|Donnerstag|Freitag|Samstag|Sonntag)") machine.screenshot("lomiri-calendar_localised") ''; diff --git a/nixos/tests/lomiri-camera-app.nix b/nixos/tests/lomiri-camera-app.nix index ccd53a37135b..ec3442966982 100644 --- a/nixos/tests/lomiri-camera-app.nix +++ b/nixos/tests/lomiri-camera-app.nix @@ -47,7 +47,7 @@ testScript = let - qrLabel = "Image"; + qrLabel = "Feed"; qrContent = "Test"; in '' @@ -55,6 +55,10 @@ with subtest("lomiri camera launches"): machine.succeed("lomiri-camera-app >&2 &") + machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("Cannot access") machine.screenshot("lomiri-camera_open") @@ -64,21 +68,26 @@ machine.succeed("modprobe v4l2loopback video_nr=10 card_label=Video-Loopback exclusive_caps=1") machine.succeed("qrtool encode '${qrContent}' -s 20 -m 10 > qr.png") # Horizontal flip, add text, flip back. Camera displays image mirrored, so need reversed text for OCR - machine.succeed("magick qr.png -flop -pointsize 70 -fill black -annotate +100+100 '${qrLabel}' -flop output.png") + machine.succeed("magick qr.png -flop -pointsize 30 -fill black -annotate +100+100 '${qrLabel}' -flop output.png") machine.succeed("ffmpeg -re -loop 1 -i output.png -vf format=yuv420p -f v4l2 /dev/video10 -loglevel fatal >&2 &") with subtest("lomiri camera uses camera"): machine.succeed("lomiri-camera-app >&2 &") + machine.wait_for_console_text("updateViewfinderResolution: For target resolution") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("${qrLabel}") machine.screenshot("lomiri-camera_feed") - machine.succeed("xdotool mousemove 320 610 click 1") # take photo - machine.wait_until_succeeds("find /root/Pictures/camera.ubports -name '*.jpg'") + machine.succeed("xdotool mousemove 510 670 click 1") # take photo + machine.wait_until_succeeds("ls /root/Pictures/camera.ubports | grep '\\.jpg$'") # Check that the image is correct machine.send_key("ctrl-alt-right") machine.succeed("magick /root/Pictures/camera.ubports/IMG_00000001.jpg -flop photo_flip.png") machine.succeed("feh photo_flip.png >&2 &") + machine.sleep(10) machine.wait_for_text("${qrLabel}") machine.screenshot("lomiri-camera_photo") @@ -88,18 +97,25 @@ with subtest("lomiri barcode scanner uses camera"): machine.succeed("lomiri-camera-app --mode=barcode-reader >&2 &") + machine.wait_for_console_text("updateViewfinderResolution: For target resolution") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("${qrLabel}") - machine.succeed("xdotool mousemove 320 610 click 1") # open up QR decode result + machine.succeed("xdotool mousemove 510 670 click 1") # open up QR decode result # OCR is struggling to recognise the text. Click the clipboard button and paste the result somewhere else machine.sleep(5) machine.screenshot("lomiri-barcode_decode") - machine.succeed("xdotool mousemove 350 530 click 1") + machine.succeed("xdotool mousemove 540 590 click 1") machine.sleep(5) # Need to make a new window without closing camera app, otherwise clipboard content gets lost? machine.send_key("ctrl-alt-right") machine.succeed("gnome-text-editor >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("New") # Font size up to help with OCR @@ -129,6 +145,10 @@ with subtest("lomiri camera localisation works"): machine.succeed("env LANG=de_DE.UTF-8 lomiri-camera-app >&2 &") + machine.wait_for_console_text("updateViewfinderResolution: For target resolution") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("Kamera") machine.screenshot("lomiri-camera_localised") ''; diff --git a/nixos/tests/lomiri-clock-app.nix b/nixos/tests/lomiri-clock-app.nix index 9db5cee49cf7..d5cb72394abc 100644 --- a/nixos/tests/lomiri-clock-app.nix +++ b/nixos/tests/lomiri-clock-app.nix @@ -34,14 +34,20 @@ machine.wait_for_x() with subtest("lomiri clock launches"): - machine.execute("lomiri-clock-app >&2 &") + machine.succeed("lomiri-clock-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text(r"(clock.ubports|City|Alarms)") machine.screenshot("lomiri-clock_open") machine.succeed("pkill -f lomiri-clock-app") with subtest("lomiri clock localisation works"): - machine.execute("env LANG=de_DE.UTF-8 lomiri-clock-app >&2 &") + machine.succeed("env LANG=de_DE.UTF-8 lomiri-clock-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text(r"(Stadt|Weckzeiten)") machine.screenshot("lomiri-clock_localised") ''; diff --git a/nixos/tests/lomiri-docviewer-app.nix b/nixos/tests/lomiri-docviewer-app.nix index c21a121f6c02..ad9174e15d30 100644 --- a/nixos/tests/lomiri-docviewer-app.nix +++ b/nixos/tests/lomiri-docviewer-app.nix @@ -46,6 +46,9 @@ in with subtest("lomiri docviewer launches"): machine.succeed("lomiri-docviewer-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("No documents") machine.screenshot("lomiri-docviewer_open") @@ -57,6 +60,9 @@ in with subtest("lomiri docviewer txt works"): machine.succeed("lomiri-docviewer-app /etc/docviewer-sampletext.txt >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("${exampleText}") machine.screenshot("lomiri-docviewer_txt") @@ -64,6 +70,9 @@ in with subtest("lomiri docviewer odt works"): machine.succeed("lomiri-docviewer-app /root/docviewer-sampletext.odt >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("${exampleText}") machine.screenshot("lomiri-docviewer_odt") @@ -71,6 +80,9 @@ in with subtest("lomiri docviewer pdf works"): machine.succeed("lomiri-docviewer-app /root/docviewer-sampletext.pdf >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("${exampleText}") machine.screenshot("lomiri-docviewer_pdf") @@ -78,6 +90,9 @@ in with subtest("lomiri docviewer localisation works"): machine.succeed("env LANG=de_DE.UTF-8 lomiri-docviewer-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("Keine Dokumente") machine.screenshot("lomiri-docviewer_localised") ''; diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix index d8cf7466656a..c7cec10d875c 100644 --- a/nixos/tests/lomiri-gallery-app.nix +++ b/nixos/tests/lomiri-gallery-app.nix @@ -59,8 +59,15 @@ machine.succeed("mkdir /root/Pictures /root/Videos") # Setup example data, OCR-friendly: # - White square, black text + # - Small text for display OCR + # - Big text for gallery preview OCR # - uppercase extension - machine.succeed("magick -size 500x500 -background white -fill black canvas:white -pointsize 70 -annotate +100+300 '${imageLabel}' /root/Pictures/output.PNG") + machine.succeed( + "magick -size 500x500 -background white -fill black canvas:white " + + "-pointsize 20 -annotate +100+100 '${imageLabel}' " + + "-pointsize 50 -annotate +100+300 '${imageLabel}' " + + "/root/Pictures/output.PNG" + ) # Different image formats machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.JPG") diff --git a/nixos/tests/lomiri-mediaplayer-app.nix b/nixos/tests/lomiri-mediaplayer-app.nix index b4ac5dd4ad2a..e1f20a4cc203 100644 --- a/nixos/tests/lomiri-mediaplayer-app.nix +++ b/nixos/tests/lomiri-mediaplayer-app.nix @@ -1,6 +1,6 @@ { lib, ... }: let - ocrContent = "Video Test"; + ocrContent = "Feed"; videoFile = "test.webm"; in { @@ -25,8 +25,8 @@ in ]; } '' - magick -size 400x400 canvas:white -pointsize 40 -fill black -annotate +100+100 '${ocrContent}' output.png - ffmpeg -re -loop 1 -i output.png -c:v libvpx -b:v 100K -t 120 $out -loglevel fatal + magick -size 600x600 canvas:white -pointsize 20 -fill black -annotate +100+100 '${ocrContent}' output.png + ffmpeg -re -loop 1 -i output.png -c:v libvpx -b:v 200K -t 120 $out -loglevel fatal ''; systemPackages = with pkgs.lomiri; [ suru-icon-theme @@ -54,6 +54,8 @@ in with subtest("lomiri mediaplayer launches"): machine.succeed("lomiri-mediaplayer-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") machine.wait_for_text("Choose from") machine.screenshot("lomiri-mediaplayer_open") @@ -61,6 +63,8 @@ in with subtest("lomiri mediaplayer plays video"): machine.succeed("lomiri-mediaplayer-app /etc/${videoFile} >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") machine.wait_for_text("${ocrContent}") machine.screenshot("lomiri-mediaplayer_playback") @@ -71,6 +75,8 @@ in # Cause an error, and look for the error popup machine.succeed("touch invalid.mp4") machine.succeed("env LANG=de_DE.UTF-8 lomiri-mediaplayer-app invalid.mp4 >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") machine.wait_for_text("Fehler") machine.screenshot("lomiri-mediaplayer_localised") ''; diff --git a/nixos/tests/lomiri-music-app.nix b/nixos/tests/lomiri-music-app.nix index 93a3889c9127..87722db239d7 100644 --- a/nixos/tests/lomiri-music-app.nix +++ b/nixos/tests/lomiri-music-app.nix @@ -8,11 +8,7 @@ let in { name = "lomiri-music-app-standalone"; - meta = { - maintainers = lib.teams.lomiri.members; - # This needs a Linux VM - platforms = lib.platforms.linux; - }; + meta.maintainers = lib.teams.lomiri.members; nodes.machine = { config, pkgs, ... }: @@ -140,8 +136,10 @@ in with subtest("lomiri music launches"): machine.succeed("lomiri-music-app >&2 &") - machine.wait_for_text("favorite music") + machine.sleep(10) machine.send_key("alt-f10") + machine.sleep(2) + machine.wait_for_text("favorite music") machine.screenshot("lomiri-music") with subtest("lomiri music plays music"): @@ -187,6 +185,9 @@ in with subtest("lomiri music localisation works"): machine.succeed("env LANG=de_DE.UTF-8 lomiri-music-app .mp4 >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(2) machine.wait_for_text("Titel") machine.screenshot("lomiri-music_localised") ''; diff --git a/nixos/tests/lomiri-system-settings.nix b/nixos/tests/lomiri-system-settings.nix index ab6dfe53630b..8018419f8863 100644 --- a/nixos/tests/lomiri-system-settings.nix +++ b/nixos/tests/lomiri-system-settings.nix @@ -109,7 +109,11 @@ machine.wait_for_x() with subtest("lomiri system settings launches"): - machine.execute("lomiri-system-settings >&2 &") + machine.succeed("lomiri-system-settings >&2 &") + machine.wait_for_console_text("qml: Plugin about does not exist") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("System Settings") machine.screenshot("lss_open") @@ -137,7 +141,11 @@ machine.execute("pkill -f lomiri-system-settings") with subtest("lomiri system settings localisation works"): - machine.execute("env LANG=de_DE.UTF-8 lomiri-system-settings >&2 &") + machine.succeed("env LANG=de_DE.UTF-8 lomiri-system-settings >&2 &") + machine.wait_for_console_text("qml: Plugin about does not exist") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("Systemeinstellungen") machine.screenshot("lss_localised_open") diff --git a/nixos/tests/mailhog.nix b/nixos/tests/mailhog.nix index 5192e3471e35..41d4a97abf3a 100644 --- a/nixos/tests/mailhog.nix +++ b/nixos/tests/mailhog.nix @@ -1,30 +1,26 @@ -import ./make-test-python.nix ( - { lib, ... }: - { - name = "mailhog"; - meta.maintainers = with lib.maintainers; [ - jojosch - RTUnreal - ]; +{ lib, ... }: +{ + name = "mailhog"; + meta.maintainers = with lib.maintainers; [ + jojosch + RTUnreal + ]; - nodes.machine = - { pkgs, ... }: - { - services.mailhog.enable = true; - }; + nodes.machine = _: { + services.mailhog.enable = true; + }; - testScript = '' - start_all() + testScript = '' + start_all() - machine.wait_for_unit("mailhog.service") - machine.wait_for_open_port(1025) - machine.wait_for_open_port(8025) - # Test sendmail wrapper (this uses smtp, which tests the connection) - machine.succeed('printf "To: root@example.com\r\n\r\nthis is the body of the email" | sendmail -t -i -f sender@example.com') - res = machine.succeed( - "curl --fail http://localhost:8025/api/v2/messages" - ) - assert all(msg in res for msg in ["this is the body of the email", "sender@example.com", "root@example.com"]) - ''; - } -) + machine.wait_for_unit("mailhog.service") + machine.wait_for_open_port(1025) + machine.wait_for_open_port(8025) + # Test sendmail wrapper (this uses smtp, which tests the connection) + machine.succeed('printf "To: root@example.com\r\n\r\nthis is the body of the email" | sendmail -t -i -f sender@example.com') + res = machine.succeed( + "curl --fail http://localhost:8025/api/v2/messages" + ) + assert all(msg in res for msg in ["this is the body of the email", "sender@example.com", "root@example.com"]) + ''; +} diff --git a/nixos/tests/mailman.nix b/nixos/tests/mailman.nix index d4e09148a9dd..c513c1ed29d3 100644 --- a/nixos/tests/mailman.nix +++ b/nixos/tests/mailman.nix @@ -1,4 +1,5 @@ -import ./make-test-python.nix { +{ ... }: +{ name = "mailman"; nodes.machine = diff --git a/nixos/tests/mailpit.nix b/nixos/tests/mailpit.nix index 887f700ae684..5f92b5030fda 100644 --- a/nixos/tests/mailpit.nix +++ b/nixos/tests/mailpit.nix @@ -1,35 +1,33 @@ -import ./make-test-python.nix ( - { lib, ... }: - { - name = "mailpit"; - meta.maintainers = lib.teams.flyingcircus.members; +{ lib, ... }: +{ + name = "mailpit"; + meta.maintainers = lib.teams.flyingcircus.members; - nodes.machine = - { pkgs, ... }: - { - services.mailpit.instances.default = { }; + nodes.machine = + { pkgs, ... }: + { + services.mailpit.instances.default = { }; - environment.systemPackages = with pkgs; [ swaks ]; - }; + environment.systemPackages = with pkgs; [ swaks ]; + }; - testScript = '' - start_all() + testScript = '' + start_all() - from json import loads + from json import loads - machine.wait_for_unit("mailpit-default.service") - machine.wait_for_open_port(1025) - machine.wait_for_open_port(8025) - machine.succeed( - 'echo "this is the body of the email" | swaks --to root@example.org --body - --server localhost:1025' - ) + machine.wait_for_unit("mailpit-default.service") + machine.wait_for_open_port(1025) + machine.wait_for_open_port(8025) + machine.succeed( + 'echo "this is the body of the email" | swaks --to root@example.org --body - --server localhost:1025' + ) - received = loads(machine.succeed("curl http://localhost:8025/api/v1/messages")) - assert received['total'] == 1 - message = received["messages"][0] - assert len(message['To']) == 1 - assert message['To'][0]['Address'] == 'root@example.org' - assert "this is the body of the email" in message['Snippet'] - ''; - } -) + received = loads(machine.succeed("curl http://localhost:8025/api/v1/messages")) + assert received['total'] == 1 + message = received["messages"][0] + assert len(message['To']) == 1 + assert message['To'][0]['Address'] == 'root@example.org' + assert "this is the body of the email" in message['Snippet'] + ''; +} diff --git a/nixos/tests/man.nix b/nixos/tests/man.nix index 510a46a46ec9..5155fcbe055a 100644 --- a/nixos/tests/man.nix +++ b/nixos/tests/man.nix @@ -1,111 +1,109 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - let - manImplementations = [ - "mandoc" - "man-db" +{ pkgs, lib, ... }: +let + manImplementations = [ + "mandoc" + "man-db" + ]; + + machineNames = builtins.map machineSafe manImplementations; + + makeConfig = useImpl: { + # Note: mandoc currently can't index symlinked section directories. + # So if a man section comes from one package exclusively (e. g. + # 1p from man-pages-posix and 2 from man-pages), it isn't searchable. + environment.systemPackages = [ + pkgs.man-pages + pkgs.openssl + pkgs.libunwind ]; - machineNames = builtins.map machineSafe manImplementations; - - makeConfig = useImpl: { - # Note: mandoc currently can't index symlinked section directories. - # So if a man section comes from one package exclusively (e. g. - # 1p from man-pages-posix and 2 from man-pages), it isn't searchable. - environment.systemPackages = [ - pkgs.man-pages - pkgs.openssl - pkgs.libunwind - ]; - - documentation = { - enable = true; - nixos.enable = lib.mkForce true; - dev.enable = true; - man = - { - enable = true; - generateCaches = true; - } - // lib.listToAttrs ( - builtins.map (impl: { - name = impl; - value = { - enable = useImpl == impl; - }; - }) manImplementations - ); - }; + documentation = { + enable = true; + nixos.enable = lib.mkForce true; + dev.enable = true; + man = + { + enable = true; + generateCaches = true; + } + // lib.listToAttrs ( + builtins.map (impl: { + name = impl; + value = { + enable = useImpl == impl; + }; + }) manImplementations + ); }; + }; - machineSafe = builtins.replaceStrings [ "-" ] [ "_" ]; - in - { - name = "man"; - meta.maintainers = [ lib.maintainers.sternenseemann ]; + machineSafe = builtins.replaceStrings [ "-" ] [ "_" ]; +in +{ + name = "man"; + meta.maintainers = [ lib.maintainers.sternenseemann ]; - nodes = lib.listToAttrs ( - builtins.map (i: { - name = machineSafe i; - value = makeConfig i; - }) manImplementations - ); + nodes = lib.listToAttrs ( + builtins.map (i: { + name = machineSafe i; + value = makeConfig i; + }) manImplementations + ); - testScript = - '' - import re - start_all() + testScript = + '' + import re + start_all() - def match_man_k(page, section, haystack): - """ - Check if the man page {page}({section}) occurs in - the output of `man -k` given as haystack. Note: - This is not super reliable, e. g. it can't deal - with man pages that are in multiple sections. - """ + def match_man_k(page, section, haystack): + """ + Check if the man page {page}({section}) occurs in + the output of `man -k` given as haystack. Note: + This is not super reliable, e. g. it can't deal + with man pages that are in multiple sections. + """ - for line in haystack.split("\n"): - # man -k can look like this: - # page(3) - bla - # page (3) - bla - # pagea, pageb (3, 3P) - foo - # pagea, pageb, pagec(3) - bar - pages = line.split("(")[0] - sections = re.search("\\([a-zA-Z1-9, ]+\\)", line) - if sections is None: - continue - else: - sections = sections.group(0)[1:-1] + for line in haystack.split("\n"): + # man -k can look like this: + # page(3) - bla + # page (3) - bla + # pagea, pageb (3, 3P) - foo + # pagea, pageb, pagec(3) - bar + pages = line.split("(")[0] + sections = re.search("\\([a-zA-Z1-9, ]+\\)", line) + if sections is None: + continue + else: + sections = sections.group(0)[1:-1] - if page in pages and f'{section}' in sections: - return True + if page in pages and f'{section}' in sections: + return True - return False + return False - '' - + lib.concatMapStrings (machine: '' - with subtest("Test direct man page lookups in ${machine}"): - # man works - ${machine}.succeed("man man > /dev/null") - # devman works - ${machine}.succeed("man 3 libunwind > /dev/null") - # NixOS configuration man page is installed - ${machine}.succeed("man configuration.nix > /dev/null") + '' + + lib.concatMapStrings (machine: '' + with subtest("Test direct man page lookups in ${machine}"): + # man works + ${machine}.succeed("man man > /dev/null") + # devman works + ${machine}.succeed("man 3 libunwind > /dev/null") + # NixOS configuration man page is installed + ${machine}.succeed("man configuration.nix > /dev/null") - with subtest("Test generateCaches via man -k in ${machine}"): - expected = [ - ("openssl", "ssl", 3), - ("unwind", "libunwind", 3), - ("user", "useradd", 8), - ("user", "userdel", 8), - ("mem", "free", 3), - ("mem", "free", 1), - ] + with subtest("Test generateCaches via man -k in ${machine}"): + expected = [ + ("openssl", "ssl", 3), + ("unwind", "libunwind", 3), + ("user", "useradd", 8), + ("user", "userdel", 8), + ("mem", "free", 3), + ("mem", "free", 1), + ] - for (keyword, page, section) in expected: - matches = ${machine}.succeed(f"man -k {keyword}") - if not match_man_k(page, section, matches): - raise Exception(f"{page}({section}) missing in matches: {matches}") - '') machineNames; - } -) + for (keyword, page, section) in expected: + matches = ${machine}.succeed(f"man -k {keyword}") + if not match_man_k(page, section, matches): + raise Exception(f"{page}({section}) missing in matches: {matches}") + '') machineNames; +} diff --git a/nixos/tests/matrix/conduwuit.nix b/nixos/tests/matrix/conduwuit.nix deleted file mode 100644 index 3e1123b692a6..000000000000 --- a/nixos/tests/matrix/conduwuit.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ lib, ... }: -let - name = "conduwuit"; -in -{ - inherit name; - - nodes = { - conduwuit = { - services.conduwuit = { - enable = true; - settings.global = { - server_name = name; - address = [ "0.0.0.0" ]; - allow_registration = true; - yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true; - }; - extraEnvironment.RUST_BACKTRACE = "yes"; - }; - networking.firewall.allowedTCPPorts = [ 6167 ]; - }; - client = - { pkgs, ... }: - { - environment.systemPackages = [ - (pkgs.writers.writePython3Bin "do_test" { libraries = [ pkgs.python3Packages.matrix-nio ]; } '' - import asyncio - import nio - - - async def main() -> None: - # Connect to conduwuit - client = nio.AsyncClient("http://conduwuit:6167", "alice") - - # Register as user alice - response = await client.register("alice", "my-secret-password") - - # Log in as user alice - response = await client.login("my-secret-password") - - # Create a new room - response = await client.room_create(federate=False) - print("Matrix room create response:", response) - assert isinstance(response, nio.RoomCreateResponse) - room_id = response.room_id - - # Join the room - response = await client.join(room_id) - print("Matrix join response:", response) - assert isinstance(response, nio.JoinResponse) - - # Send a message to the room - response = await client.room_send( - room_id=room_id, - message_type="m.room.message", - content={ - "msgtype": "m.text", - "body": "Hello conduwuit!" - } - ) - print("Matrix room send response:", response) - assert isinstance(response, nio.RoomSendResponse) - - # Sync responses - response = await client.sync(timeout=30000) - print("Matrix sync response:", response) - assert isinstance(response, nio.SyncResponse) - - # Check the message was received by conduwuit - last_message = response.rooms.join[room_id].timeline.events[-1].body - assert last_message == "Hello conduwuit!" - - # Leave the room - response = await client.room_leave(room_id) - print("Matrix room leave response:", response) - assert isinstance(response, nio.RoomLeaveResponse) - - # Close the client - await client.close() - - - if __name__ == "__main__": - asyncio.run(main()) - '') - ]; - }; - }; - - testScript = '' - start_all() - - with subtest("start conduwuit"): - conduwuit.wait_for_unit("conduwuit.service") - conduwuit.wait_for_open_port(6167) - - with subtest("ensure messages can be exchanged"): - client.succeed("do_test >&2") - ''; - - meta.maintainers = with lib.maintainers; [ - niklaskorz - ]; -} diff --git a/nixos/tests/matrix/continuwuity.nix b/nixos/tests/matrix/continuwuity.nix new file mode 100644 index 000000000000..308560421c79 --- /dev/null +++ b/nixos/tests/matrix/continuwuity.nix @@ -0,0 +1,104 @@ +{ lib, ... }: +let + name = "continuwuity"; +in +{ + inherit name; + + nodes = { + continuwuity = { + services.matrix-continuwuity = { + enable = true; + settings.global = { + server_name = name; + address = [ "0.0.0.0" ]; + allow_registration = true; + yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true; + }; + extraEnvironment.RUST_BACKTRACE = "yes"; + }; + networking.firewall.allowedTCPPorts = [ 6167 ]; + }; + client = + { pkgs, ... }: + { + environment.systemPackages = [ + (pkgs.writers.writePython3Bin "do_test" { libraries = [ pkgs.python3Packages.matrix-nio ]; } '' + import asyncio + import nio + + + async def main() -> None: + # Connect to continuwuity + client = nio.AsyncClient("http://continuwuity:6167", "alice") + + # Register as user alice + response = await client.register("alice", "my-secret-password") + + # Log in as user alice + response = await client.login("my-secret-password") + + # Create a new room + response = await client.room_create(federate=False) + print("Matrix room create response:", response) + assert isinstance(response, nio.RoomCreateResponse) + room_id = response.room_id + + # Join the room + response = await client.join(room_id) + print("Matrix join response:", response) + assert isinstance(response, nio.JoinResponse) + + # Send a message to the room + response = await client.room_send( + room_id=room_id, + message_type="m.room.message", + content={ + "msgtype": "m.text", + "body": "Hello continuwuity!" + } + ) + print("Matrix room send response:", response) + assert isinstance(response, nio.RoomSendResponse) + + # Sync responses + response = await client.sync(timeout=30000) + print("Matrix sync response:", response) + assert isinstance(response, nio.SyncResponse) + + # Check the message was received by continuwuity + last_message = response.rooms.join[room_id].timeline.events[-1].body + assert last_message == "Hello continuwuity!" + + # Leave the room + response = await client.room_leave(room_id) + print("Matrix room leave response:", response) + assert isinstance(response, nio.RoomLeaveResponse) + + # Close the client + await client.close() + + + if __name__ == "__main__": + asyncio.run(main()) + '') + ]; + }; + }; + + testScript = '' + start_all() + + with subtest("start continuwuity"): + continuwuity.wait_for_unit("continuwuity.service") + continuwuity.wait_for_open_port(6167) + + with subtest("ensure messages can be exchanged"): + client.succeed("do_test >&2") + ''; + + meta.maintainers = with lib.maintainers; [ + nyabinary + snaki + ]; +} diff --git a/nixos/tests/matrix/lk-jwt-service.nix b/nixos/tests/matrix/lk-jwt-service.nix new file mode 100644 index 000000000000..3914200babd6 --- /dev/null +++ b/nixos/tests/matrix/lk-jwt-service.nix @@ -0,0 +1,26 @@ +{ + pkgs, + lib, + ... +}: +{ + name = "lk-jwt-service"; + meta.maintainers = [ lib.maintainers.quadradical ]; + + nodes.machine = { + services.lk-jwt-service = { + enable = true; + keyFile = pkgs.writers.writeYAML "keys.yaml" { + key = "f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE"; + }; + livekitUrl = "wss://127.0.0.1:8100"; + port = 8000; + }; + }; + + testScript = '' + machine.wait_for_unit("lk-jwt-service.service") + machine.wait_for_open_port(8000) + machine.succeed('curl 127.0.0.1:8000/sfu/get -sLX POST -w "%{http_code}" | grep -q "^400"') + ''; +} diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix index eb7b814e3983..4cb9845df880 100644 --- a/nixos/tests/mattermost/default.nix +++ b/nixos/tests/mattermost/default.nix @@ -33,7 +33,7 @@ import ../make-test-python.nix ( ); }; - system.stateVersion = lib.mkDefault "25.05"; + system.stateVersion = lib.mkDefault (lib.versions.majorMinor lib.version); services.mattermost = lib.recursiveUpdate { enable = true; @@ -63,7 +63,7 @@ import ../make-test-python.nix ( # Upgrade to the latest Mattermost. specialisation.latest.configuration = { services.mattermost.package = lib.mkForce pkgs.mattermostLatest; - system.stateVersion = lib.mkVMOverride "25.05"; + system.stateVersion = lib.mkVMOverride (lib.versions.majorMinor lib.version); }; } ) @@ -90,57 +90,60 @@ import ../make-test-python.nix ( name = "mattermost"; nodes = rec { - postgresMutable = + postgresMutable = makeMattermost { + mutableConfig = true; + preferNixConfig = false; + settings.SupportSettings.HelpLink = "https://search.nixos.org"; + } { }; + postgresMostlyMutable = makeMattermost { mutableConfig = true; - preferNixConfig = false; - settings.SupportSettings.HelpLink = "https://search.nixos.org"; + preferNixConfig = true; + plugins = with pkgs; [ + # Build the demo plugin. + (mattermost.buildPlugin { + pname = "mattermost-plugin-starter-template"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "mattermost"; + repo = "mattermost-plugin-starter-template"; + # Newer versions have issues with their dependency lockfile. + rev = "7c98e89ac1a268ce8614bc665571b7bbc9a70df2"; + hash = "sha256-uyfxB0GZ45qL9ssWUord0eKQC6S0TlCTtjTOXWtK4H0="; + }; + vendorHash = "sha256-Jl4F9YkHNqiFP9/yeyi4vTntqxMk/J1zhEP6QLSvJQA="; + npmDepsHash = "sha256-z08nc4XwT+uQjQlZiUydJyh8mqeJoYdPFWuZpw9k99s="; + }) + + # Build the todos plugin. + (mattermost.buildPlugin { + pname = "mattermost-plugin-todo"; + version = "0.8-pre"; + src = fetchFromGitHub { + owner = "mattermost-community"; + repo = "mattermost-plugin-todo"; + # 0.7.1 didn't work, seems to use an older set of node dependencies. + rev = "f25dc91ea401c9f0dcd4abcebaff10eb8b9836e5"; + hash = "sha256-OM+m4rTqVtolvL5tUE8RKfclqzoe0Y38jLU60Pz7+HI="; + }; + vendorHash = "sha256-5KpechSp3z/Nq713PXYruyNxveo6CwrCSKf2JaErbgg="; + npmDepsHash = "sha256-o2UOEkwb8Vx2lDWayNYgng0GXvmS6lp/ExfOq3peyMY="; + extraGoModuleAttrs = { + npmFlags = [ "--legacy-peer-deps" ]; + }; + }) + ]; } { # Last version to support the "old" config layout. system.stateVersion = lib.mkForce "24.11"; - # First version to support the "new" config layout. - specialisation.upgrade.configuration.system.stateVersion = lib.mkVMOverride "25.05"; + # Supports the "new" config layout. + specialisation.upgrade.configuration.system.stateVersion = lib.mkVMOverride ( + lib.versions.majorMinor lib.version + ); }; - postgresMostlyMutable = makeMattermost { - mutableConfig = true; - plugins = with pkgs; [ - # Build the demo plugin. - (mattermost.buildPlugin { - pname = "mattermost-plugin-starter-template"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "mattermost"; - repo = "mattermost-plugin-starter-template"; - # Newer versions have issues with their dependency lockfile. - rev = "7c98e89ac1a268ce8614bc665571b7bbc9a70df2"; - hash = "sha256-uyfxB0GZ45qL9ssWUord0eKQC6S0TlCTtjTOXWtK4H0="; - }; - vendorHash = "sha256-Jl4F9YkHNqiFP9/yeyi4vTntqxMk/J1zhEP6QLSvJQA="; - npmDepsHash = "sha256-z08nc4XwT+uQjQlZiUydJyh8mqeJoYdPFWuZpw9k99s="; - }) - - # Build the todos plugin. - (mattermost.buildPlugin { - pname = "mattermost-plugin-todo"; - version = "0.8-pre"; - src = fetchFromGitHub { - owner = "mattermost-community"; - repo = "mattermost-plugin-todo"; - # 0.7.1 didn't work, seems to use an older set of node dependencies. - rev = "f25dc91ea401c9f0dcd4abcebaff10eb8b9836e5"; - hash = "sha256-OM+m4rTqVtolvL5tUE8RKfclqzoe0Y38jLU60Pz7+HI="; - }; - vendorHash = "sha256-5KpechSp3z/Nq713PXYruyNxveo6CwrCSKf2JaErbgg="; - npmDepsHash = "sha256-o2UOEkwb8Vx2lDWayNYgng0GXvmS6lp/ExfOq3peyMY="; - extraGoModuleAttrs = { - npmFlags = [ "--legacy-peer-deps" ]; - }; - }) - ]; - } { }; postgresImmutable = makeMattermost { package = pkgs.mattermost.overrideAttrs (prev: { webapp = prev.webapp.overrideAttrs (prevWebapp: { @@ -332,9 +335,23 @@ import ../make-test-python.nix ( if [ "$actualPostAttachmentHash" != "$postAttachmentHash" ]; then echo "Post attachment hash mismatched!" >&2 exit 1 - else + fi + + # Make sure it's on the filesystem in the expected place + fsPath="$(find /var/lib/mattermost/data -name "$(basename -- "$postAttachment")" -print -quit)" + if [ -z "$fsPath" ] || [ ! -f "$fsPath" ]; then + echo "Attachment didn't exist on the filesystem!" >&2 + exit 1 + fi + + # And that the hash matches. + actualFsAttachmentHash="$(sha256sum "$fsPath" | awk '{print $1}')" + if [ "$actualFsAttachmentHash" == "$postAttachmentHash" ]; then echo "Post attachment hash was OK!" >&2 exit 0 + else + echo "Attachment hash mismatched on disk!" >&2 + exit 1 fi else echo "Post didn't exist when it should have!" >&2 @@ -343,9 +360,14 @@ import ../make-test-python.nix ( ''; in '' + import sys import shlex + import threading + import queue def wait_mattermost_up(node, site_name="${siteName}"): + print(f"wait_mattermost_up({node.name!r}, site_name={site_name!r})", file=sys.stderr) + node.wait_for_unit("multi-user.target") node.systemctl("start mattermost.service") node.wait_for_unit("mattermost.service") node.wait_for_open_port(8065) @@ -353,20 +375,25 @@ import ../make-test-python.nix ( node.succeed(f"curl {shlex.quote('${url}')}/index.html | grep {shlex.quote(site_name)}") def restart_mattermost(node, site_name="${siteName}"): + print(f"restart_mattermost({node.name!r}, site_name={site_name!r})", file=sys.stderr) node.systemctl("restart mattermost.service") wait_mattermost_up(node, site_name) def expect_config(node, mattermost_version, *configs): + print(f"expect_config({node.name!r}, {mattermost_version!r}, *{configs!r})", file=sys.stderr) for config in configs: node.succeed(f"${expectConfig} {shlex.quote(config)} {shlex.quote(mattermost_version)}") def expect_plugins(node, jq_or_code): + print(f"expect_plugins({node.name!r}, {jq_or_code!r})", file=sys.stderr) node.succeed(f"${expectPlugins} {shlex.quote(str(jq_or_code))}") def ensure_post(node, fail_if_not_found=False): + print(f"ensure_post({node.name!r}, fail_if_not_found={fail_if_not_found!r})", file=sys.stderr) node.succeed(f"${ensurePost} {shlex.quote('${url}')} {1 if fail_if_not_found else 0}") - def set_config(node, *configs, nixos_version='25.05'): + def set_config(node, *configs, nixos_version='${lib.versions.majorMinor lib.version}'): + print(f"set_config({node.name!r}, *{configs!r}, nixos_version={nixos_version!r})", file=sys.stderr) for config in configs: args = [shlex.quote("${setConfig}")] args.append(shlex.quote(config)) @@ -374,8 +401,13 @@ import ../make-test-python.nix ( args.append(shlex.quote(str(nixos_version))) node.succeed(' '.join(args)) - def run_mattermost_tests(mutableToplevel: str, mutable, - mostlyMutableToplevel: str, mostlyMutable, + def switch_to_specialisation(node, toplevel: str, specialisation: str): + print(f"switch_to_specialisation({node.name!r}, {toplevel!r}, {specialisation!r})", file=sys.stderr) + node.succeed(f"{toplevel}/specialisation/{specialisation}/bin/switch-to-configuration switch || true") + + def run_mattermost_tests(shutdown_queue: queue.Queue, + mutableToplevel: str, mutable, + mostlyMutableToplevel: str, mostlyMutablePlugins: str, mostlyMutable, immutableToplevel: str, immutable, environmentFileToplevel: str, environmentFile): esr, latest = '${pkgs.mattermost.version}', '${pkgs.mattermostLatest.version}' @@ -391,8 +423,7 @@ import ../make-test-python.nix ( set_config( mutable, '.SupportSettings.AboutLink = "https://mattermost.com"', - '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual"', - nixos_version='24.11' # Default 'mutable' config is an old version + '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual"' ) ensure_post(mutable) restart_mattermost(mutable) @@ -401,23 +432,14 @@ import ../make-test-python.nix ( expect_config(mutable, esr, '.AboutLink == "https://mattermost.com" and .HelpLink == "https://nixos.org/nixos/manual"') ensure_post(mutable, fail_if_not_found=True) - # Switch to the newer config - mutable.succeed(f"{mutableToplevel}/specialisation/upgrade/bin/switch-to-configuration switch") - wait_mattermost_up(mutable) - - # AboutLink and HelpLink should be changed, still, and the post should still exist - expect_config(mutable, esr, '.AboutLink == "https://mattermost.com" and .HelpLink == "https://nixos.org/nixos/manual"') - ensure_post(mutable, fail_if_not_found=True) - # Switch to the latest Mattermost version - mutable.succeed(f"{mutableToplevel}/specialisation/latest/bin/switch-to-configuration switch") + switch_to_specialisation(mutable, mutableToplevel, "latest") wait_mattermost_up(mutable) # AboutLink and HelpLink should be changed, still, and the post should still exist expect_config(mutable, latest, '.AboutLink == "https://mattermost.com" and .HelpLink == "https://nixos.org/nixos/manual"') ensure_post(mutable, fail_if_not_found=True) - - mutable.shutdown() + shutdown_queue.put(mutable) ## Mostly mutable node tests ## mostlyMutable.start() @@ -434,13 +456,38 @@ import ../make-test-python.nix ( mostlyMutable, '.SupportSettings.AboutLink = "https://mattermost.com"', '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual"', + nixos_version='24.11' # Default 'mostlyMutable' config is an old version + ) + ensure_post(mostlyMutable) + restart_mattermost(mostlyMutable) + + # HelpLink should be changed but AboutLink should not, and the post should exist + expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"') + ensure_post(mostlyMutable, fail_if_not_found=True) + + # Switch to the newer config and make sure the plugins directory is replaced with a directory, + # since it could have been a symlink on previous versions. + mostlyMutable.systemctl("stop mattermost.service") + mostlyMutable.succeed('[ -L /var/lib/mattermost/data/plugins ] && [ -d /var/lib/mattermost/data/plugins ]') + switch_to_specialisation(mostlyMutable, mostlyMutableToplevel, "upgrade") + wait_mattermost_up(mostlyMutable) + + # HelpLink should be changed, still, and the post should still exist + expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"') + ensure_post(mostlyMutable, fail_if_not_found=True) + + # Edit the config and make a post + set_config( + mostlyMutable, + '.SupportSettings.AboutLink = "https://mattermost.com/foo"', + '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual/bar"', '.PluginSettings.PluginStates."com.mattermost.plugin-todo".Enable = true' ) ensure_post(mostlyMutable) restart_mattermost(mostlyMutable) # AboutLink should be overridden by NixOS configuration; HelpLink should be what we set above - expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"') + expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual/bar"') # Single plugin that's now enabled. expect_plugins(mostlyMutable, 'length == 1') @@ -449,14 +496,14 @@ import ../make-test-python.nix ( ensure_post(mostlyMutable, fail_if_not_found=True) # Switch to the latest Mattermost version - mostlyMutable.succeed(f"{mostlyMutableToplevel}/specialisation/latest/bin/switch-to-configuration switch") + switch_to_specialisation(mostlyMutable, mostlyMutableToplevel, "latest") wait_mattermost_up(mostlyMutable) # AboutLink should be overridden and the post should still exist - expect_config(mostlyMutable, latest, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"') + expect_config(mostlyMutable, latest, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual/bar"') ensure_post(mostlyMutable, fail_if_not_found=True) - mostlyMutable.shutdown() + shutdown_queue.put(mostlyMutable) ## Immutable node tests ## immutable.start() @@ -484,14 +531,14 @@ import ../make-test-python.nix ( ensure_post(immutable, fail_if_not_found=True) # Switch to the latest Mattermost version - immutable.succeed(f"{immutableToplevel}/specialisation/latest/bin/switch-to-configuration switch") + switch_to_specialisation(immutable, immutableToplevel, "latest") wait_mattermost_up(immutable) # AboutLink and HelpLink should be changed, still, and the post should still exist expect_config(immutable, latest, '.AboutLink == "https://nixos.org" and .HelpLink == "https://search.nixos.org"') ensure_post(immutable, fail_if_not_found=True) - immutable.shutdown() + shutdown_queue.put(immutable) ## Environment File node tests ## environmentFile.start() @@ -503,36 +550,56 @@ import ../make-test-python.nix ( ensure_post(environmentFile, fail_if_not_found=True) # Switch to the latest Mattermost version - environmentFile.succeed(f"{environmentFileToplevel}/specialisation/latest/bin/switch-to-configuration switch") + switch_to_specialisation(environmentFile, environmentFileToplevel, "latest") wait_mattermost_up(environmentFile) # AboutLink should be changed still, and the post should still exist expect_config(environmentFile, latest, '.AboutLink == "https://nixos.org"') ensure_post(environmentFile, fail_if_not_found=True) - environmentFile.shutdown() - - run_mattermost_tests( - "${nodes.mysqlMutable.system.build.toplevel}", - mysqlMutable, - "${nodes.mysqlMostlyMutable.system.build.toplevel}", - mysqlMostlyMutable, - "${nodes.mysqlImmutable.system.build.toplevel}", - mysqlImmutable, - "${nodes.mysqlEnvironmentFile.system.build.toplevel}", - mysqlEnvironmentFile - ) + shutdown_queue.put(environmentFile) + + # Run shutdowns asynchronously so we can pipeline them. + shutdown_queue: queue.Queue = queue.Queue() + def shutdown_worker(): + while True: + node = shutdown_queue.get() + print(f"Shutting down node {node.name!r} asynchronously", file=sys.stderr) + node.shutdown() + shutdown_queue.task_done() + threading.Thread(target=shutdown_worker, daemon=True).start() + + ${pkgs.lib.optionalString pkgs.stdenv.isx86_64 '' + # Only run the MySQL tests on x86_64 so we don't have to debug MySQL ARM issues. + run_mattermost_tests( + shutdown_queue, + "${nodes.mysqlMutable.system.build.toplevel}", + mysqlMutable, + "${nodes.mysqlMostlyMutable.system.build.toplevel}", + "${nodes.mysqlMostlyMutable.services.mattermost.pluginsBundle}", + mysqlMostlyMutable, + "${nodes.mysqlImmutable.system.build.toplevel}", + mysqlImmutable, + "${nodes.mysqlEnvironmentFile.system.build.toplevel}", + mysqlEnvironmentFile + ) + ''} run_mattermost_tests( + shutdown_queue, "${nodes.postgresMutable.system.build.toplevel}", postgresMutable, "${nodes.postgresMostlyMutable.system.build.toplevel}", + "${nodes.postgresMostlyMutable.services.mattermost.pluginsBundle}", postgresMostlyMutable, "${nodes.postgresImmutable.system.build.toplevel}", postgresImmutable, "${nodes.postgresEnvironmentFile.system.build.toplevel}", postgresEnvironmentFile ) + + # Drain the queue + shutdown_queue.join() ''; } ) diff --git a/nixos/tests/mealie.nix b/nixos/tests/mealie.nix index 57bff29731d8..21e96dea4114 100644 --- a/nixos/tests/mealie.nix +++ b/nixos/tests/mealie.nix @@ -10,20 +10,35 @@ import ./make-test-python.nix ( ]; }; - nodes = { - server = { - services.mealie = { - enable = true; - port = 9001; + nodes = + let + sqlite = { + services.mealie = { + enable = true; + port = 9001; + }; }; + postgres = { + imports = [ sqlite ]; + services.mealie.database.createLocally = true; + }; + in + { + inherit sqlite postgres; }; - }; testScript = '' start_all() - server.wait_for_unit("mealie.service") - server.wait_for_open_port(9001) - server.succeed("curl --fail http://localhost:9001") + + def test_mealie(node): + node.wait_for_unit("mealie.service") + node.wait_for_open_port(9001) + node.succeed("curl --fail http://localhost:9001") + + test_mealie(sqlite) + simple.send_monitor_command("quit") + simple.wait_for_shutdown() + test_mealie(postgres) ''; } ) diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix index c3f8734e320c..de2d7ab421b6 100644 --- a/nixos/tests/memcached.nix +++ b/nixos/tests/memcached.nix @@ -1,32 +1,30 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "memcached"; +{ pkgs, ... }: +{ + name = "memcached"; - nodes.machine = { - imports = [ ../modules/profiles/minimal.nix ]; - services.memcached.enable = true; - }; + nodes.machine = { + imports = [ ../modules/profiles/minimal.nix ]; + services.memcached.enable = true; + }; - testScript = - let - testScript = - pkgs.writers.writePython3 "test_memcache" - { - libraries = with pkgs.python3Packages; [ memcached ]; - } - '' - import memcache - c = memcache.Client(['localhost:11211']) - c.set('key', 'value') - assert 'value' == c.get('key') - ''; - in - '' - machine.start() - machine.wait_for_unit("memcached.service") - machine.wait_for_open_port(11211) - machine.succeed("${testScript}") - ''; - } -) + testScript = + let + testScript = + pkgs.writers.writePython3 "test_memcache" + { + libraries = [ pkgs.python3Packages.python-memcached ]; + } + '' + import memcache + c = memcache.Client(['localhost:11211']) + c.set('key', 'value') + assert 'value' == c.get('key') + ''; + in + '' + machine.start() + machine.wait_for_unit("memcached.service") + machine.wait_for_open_port(11211) + machine.succeed("${testScript}") + ''; +} diff --git a/nixos/tests/moodle.nix b/nixos/tests/moodle.nix index 4bf1c5e6c702..f3eee04b0d62 100644 --- a/nixos/tests/moodle.nix +++ b/nixos/tests/moodle.nix @@ -1,26 +1,24 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "moodle"; - meta.maintainers = [ lib.maintainers.aanderse ]; +{ lib, ... }: +{ + name = "moodle"; + meta.maintainers = [ lib.maintainers.aanderse ]; - nodes.machine = - { ... }: - { - services.moodle.enable = true; - services.moodle.virtualHost.hostName = "localhost"; - services.moodle.virtualHost.adminAddr = "root@example.com"; - services.moodle.initialPassword = "correcthorsebatterystaple"; + nodes.machine = + { ... }: + { + services.moodle.enable = true; + services.moodle.virtualHost.hostName = "localhost"; + services.moodle.virtualHost.adminAddr = "root@example.com"; + services.moodle.initialPassword = "correcthorsebatterystaple"; - # Ensure the virtual machine has enough memory to avoid errors like: - # Fatal error: Out of memory (allocated 152047616) (tried to allocate 33554440 bytes) - virtualisation.memorySize = 2000; - }; + # Ensure the virtual machine has enough memory to avoid errors like: + # Fatal error: Out of memory (allocated 152047616) (tried to allocate 33554440 bytes) + virtualisation.memorySize = 2000; + }; - testScript = '' - start_all() - machine.wait_for_unit("phpfpm-moodle.service", timeout=1800) - machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'") - ''; - } -) + testScript = '' + start_all() + machine.wait_for_unit("phpfpm-moodle.service", timeout=1800) + machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'") + ''; +} diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 36215b780c5d..f80c6658c621 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -1,150 +1,148 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - let - track = pkgs.fetchurl { - # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in +{ pkgs, lib, ... }: +let + track = pkgs.fetchurl { + # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in - name = "Blue_Wave_Theory-Skyhawk_Beach.mp3"; - url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3"; - hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc="; - meta.license = lib.licenses.cc-by-sa-40; - }; + name = "Blue_Wave_Theory-Skyhawk_Beach.mp3"; + url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3"; + hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc="; + meta.license = lib.licenses.cc-by-sa-40; + }; - defaultCfg = rec { - user = "mpd"; - group = "mpd"; - dataDir = "/var/lib/mpd"; - musicDirectory = "${dataDir}/music"; - }; + defaultCfg = rec { + user = "mpd"; + group = "mpd"; + dataDir = "/var/lib/mpd"; + musicDirectory = "${dataDir}/music"; + }; - defaultMpdCfg = { - inherit (defaultCfg) - dataDir - musicDirectory - user - group - ; - enable = true; - }; + defaultMpdCfg = { + inherit (defaultCfg) + dataDir + musicDirectory + user + group + ; + enable = true; + }; - musicService = - { - user, - group, - musicDirectory, - }: - { - description = "Sets up the music file(s) for MPD to use."; - requires = [ "mpd.service" ]; - after = [ "mpd.service" ]; - wantedBy = [ "default.target" ]; - script = '' - cp ${track} ${musicDirectory} - ''; - serviceConfig = { - User = user; - Group = group; - }; + musicService = + { + user, + group, + musicDirectory, + }: + { + description = "Sets up the music file(s) for MPD to use."; + requires = [ "mpd.service" ]; + after = [ "mpd.service" ]; + wantedBy = [ "default.target" ]; + script = '' + cp ${track} ${musicDirectory} + ''; + serviceConfig = { + User = user; + Group = group; }; - - mkServer = - { mpd, musicService }: - { - boot.kernelModules = [ "snd-dummy" ]; - services.mpd = mpd; - systemd.services.musicService = musicService; - }; - in - { - name = "mpd"; - meta = { - maintainers = with lib.maintainers; [ emmanuelrosa ]; }; - nodes = { - client = { ... }: { }; - - serverALSA = - { ... }: - lib.mkMerge [ - (mkServer { - mpd = defaultMpdCfg // { - network.listenAddress = "any"; - extraConfig = '' - audio_output { - type "alsa" - name "ALSA" - mixer_type "null" - } - ''; - }; - musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; - }) - { networking.firewall.allowedTCPPorts = [ 6600 ]; } - ]; - - serverPulseAudio = - { ... }: - lib.mkMerge [ - (mkServer { - mpd = defaultMpdCfg // { - extraConfig = '' - audio_output { - type "pulse" - name "The Pulse" - } - ''; - }; - - musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; - }) - { - services.pulseaudio = { - enable = true; - systemWide = true; - tcp.enable = true; - tcp.anonymousClients.allowAll = true; - }; - systemd.services.mpd.environment.PULSE_SERVER = "localhost"; - } - ]; + mkServer = + { mpd, musicService }: + { + boot.kernelModules = [ "snd-dummy" ]; + services.mpd = mpd; + systemd.services.musicService = musicService; }; +in +{ + name = "mpd"; + meta = { + maintainers = with lib.maintainers; [ emmanuelrosa ]; + }; - testScript = '' - mpc = "${lib.getExe pkgs.mpc} --wait" + nodes = { + client = { ... }: { }; - # Connects to the given server and attempts to play a tune. - def play_some_music(server): - server.wait_for_unit("mpd.service") - server.succeed(f"{mpc} update") - _, tracks = server.execute(f"{mpc} ls") + serverALSA = + { ... }: + lib.mkMerge [ + (mkServer { + mpd = defaultMpdCfg // { + network.listenAddress = "any"; + extraConfig = '' + audio_output { + type "alsa" + name "ALSA" + mixer_type "null" + } + ''; + }; + musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; + }) + { networking.firewall.allowedTCPPorts = [ 6600 ]; } + ]; - for track in tracks.splitlines(): - server.succeed(f"{mpc} add {track}") + serverPulseAudio = + { ... }: + lib.mkMerge [ + (mkServer { + mpd = defaultMpdCfg // { + extraConfig = '' + audio_output { + type "pulse" + name "The Pulse" + } + ''; + }; - _, added_tracks = server.execute(f"{mpc} playlist") + musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; + }) + { + services.pulseaudio = { + enable = true; + systemWide = true; + tcp.enable = true; + tcp.anonymousClients.allowAll = true; + }; + systemd.services.mpd.environment.PULSE_SERVER = "localhost"; + } + ]; + }; - # Check we succeeded adding audio tracks to the playlist - assert len(added_tracks.splitlines()) > 0 + testScript = '' + mpc = "${lib.getExe pkgs.mpc} --wait" - server.succeed(f"{mpc} play") + # Connects to the given server and attempts to play a tune. + def play_some_music(server): + server.wait_for_unit("mpd.service") + server.succeed(f"{mpc} update") + _, tracks = server.execute(f"{mpc} ls") - _, output = server.execute(f"{mpc} status") - # Assure audio track is playing - assert "playing" in output + for track in tracks.splitlines(): + server.succeed(f"{mpc} add {track}") - server.succeed(f"{mpc} stop") + _, added_tracks = server.execute(f"{mpc} playlist") + + # Check we succeeded adding audio tracks to the playlist + assert len(added_tracks.splitlines()) > 0 + + server.succeed(f"{mpc} play") + + _, output = server.execute(f"{mpc} status") + # Assure audio track is playing + assert "playing" in output + + server.succeed(f"{mpc} stop") - play_some_music(serverALSA) - play_some_music(serverPulseAudio) + play_some_music(serverALSA) + play_some_music(serverPulseAudio) - client.wait_for_unit("multi-user.target") - client.succeed(f"{mpc} -h serverALSA status") + client.wait_for_unit("multi-user.target") + client.succeed(f"{mpc} -h serverALSA status") - # The PulseAudio-based server is configured not to accept external client connections - # to perform the following test: - client.fail(f"{mpc} -h serverPulseAudio status") - ''; - } -) + # The PulseAudio-based server is configured not to accept external client connections + # to perform the following test: + client.fail(f"{mpc} -h serverPulseAudio status") + ''; +} diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index c8bbe473c2b1..f4b5405a2e4c 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -1,95 +1,93 @@ -import ./make-test-python.nix ( - { pkgs, ... }: +{ pkgs, ... }: - let - client = - { pkgs, ... }: +let + client = + { pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + environment.systemPackages = [ pkgs.mumble ]; + }; + + # outside of tests, this file should obviously not come from the nix store + envFile = pkgs.writeText "nixos-test-mumble-murmurd.env" '' + MURMURD_PASSWORD=testpassword + ''; + +in +{ + name = "mumble"; + meta = with pkgs.lib.maintainers; { + maintainers = [ thoughtpolice ]; + }; + + nodes = { + server = + { config, ... }: { - imports = [ ./common/x11.nix ]; - environment.systemPackages = [ pkgs.mumble ]; + security.apparmor.enable = true; + services.murmur.enable = true; + services.murmur.registerName = "NixOS tests"; + services.murmur.password = "$MURMURD_PASSWORD"; + services.murmur.environmentFile = envFile; + networking.firewall.allowedTCPPorts = [ config.services.murmur.port ]; }; - # outside of tests, this file should obviously not come from the nix store - envFile = pkgs.writeText "nixos-test-mumble-murmurd.env" '' - MURMURD_PASSWORD=testpassword - ''; + client1 = client; + client2 = client; + }; - in - { - name = "mumble"; - meta = with pkgs.lib.maintainers; { - maintainers = [ thoughtpolice ]; - }; + testScript = '' + start_all() - nodes = { - server = - { config, ... }: - { - security.apparmor.enable = true; - services.murmur.enable = true; - services.murmur.registerName = "NixOS tests"; - services.murmur.password = "$MURMURD_PASSWORD"; - services.murmur.environmentFile = envFile; - networking.firewall.allowedTCPPorts = [ config.services.murmur.port ]; - }; + server.wait_for_unit("murmur.service") + client1.wait_for_x() + client2.wait_for_x() - client1 = client; - client2 = client; - }; + client1.execute("mumble mumble://client1:testpassword\@server/test >&2 &") + client2.execute("mumble mumble://client2:testpassword\@server/test >&2 &") - testScript = '' - start_all() + # cancel client audio configuration + client1.wait_for_window(r"Audio Tuning Wizard") + client2.wait_for_window(r"Audio Tuning Wizard") + server.sleep(5) # wait because mumble is slow to register event handlers + client1.send_key("esc") + client2.send_key("esc") - server.wait_for_unit("murmur.service") - client1.wait_for_x() - client2.wait_for_x() + # cancel client cert configuration + client1.wait_for_window(r"Certificate Management") + client2.wait_for_window(r"Certificate Management") + server.sleep(5) # wait because mumble is slow to register event handlers + client1.send_key("esc") + client2.send_key("esc") - client1.execute("mumble mumble://client1:testpassword\@server/test >&2 &") - client2.execute("mumble mumble://client2:testpassword\@server/test >&2 &") + # accept server certificate + client1.wait_for_window(r"^Mumble$") + client2.wait_for_window(r"^Mumble$") + server.sleep(5) # wait because mumble is slow to register event handlers + client1.send_chars("y") + client2.send_chars("y") + server.sleep(5) # wait because mumble is slow to register event handlers - # cancel client audio configuration - client1.wait_for_window(r"Audio Tuning Wizard") - client2.wait_for_window(r"Audio Tuning Wizard") - server.sleep(5) # wait because mumble is slow to register event handlers - client1.send_key("esc") - client2.send_key("esc") + # sometimes the wrong of the 2 windows is focused, we switch focus and try pressing "y" again + client1.send_key("alt-tab") + client2.send_key("alt-tab") + server.sleep(5) # wait because mumble is slow to register event handlers + client1.send_chars("y") + client2.send_chars("y") - # cancel client cert configuration - client1.wait_for_window(r"Certificate Management") - client2.wait_for_window(r"Certificate Management") - server.sleep(5) # wait because mumble is slow to register event handlers - client1.send_key("esc") - client2.send_key("esc") + # Find clients in logs + server.wait_until_succeeds( + "journalctl -eu murmur -o cat | grep -q 'client1.\+Authenticated'" + ) + server.wait_until_succeeds( + "journalctl -eu murmur -o cat | grep -q 'client2.\+Authenticated'" + ) - # accept server certificate - client1.wait_for_window(r"^Mumble$") - client2.wait_for_window(r"^Mumble$") - server.sleep(5) # wait because mumble is slow to register event handlers - client1.send_chars("y") - client2.send_chars("y") - server.sleep(5) # wait because mumble is slow to register event handlers + server.sleep(5) # wait to get screenshot + client1.screenshot("screen1") + client2.screenshot("screen2") - # sometimes the wrong of the 2 windows is focused, we switch focus and try pressing "y" again - client1.send_key("alt-tab") - client2.send_key("alt-tab") - server.sleep(5) # wait because mumble is slow to register event handlers - client1.send_chars("y") - client2.send_chars("y") - - # Find clients in logs - server.wait_until_succeeds( - "journalctl -eu murmur -o cat | grep -q 'client1.\+Authenticated'" - ) - server.wait_until_succeeds( - "journalctl -eu murmur -o cat | grep -q 'client2.\+Authenticated'" - ) - - server.sleep(5) # wait to get screenshot - client1.screenshot("screen1") - client2.screenshot("screen2") - - # check if apparmor denied anything - server.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') - ''; - } -) + # check if apparmor denied anything + server.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') + ''; +} diff --git a/nixos/tests/mysql/mariadb-galera.nix b/nixos/tests/mysql/mariadb-galera.nix index 65705afbf82c..1f08eb697504 100644 --- a/nixos/tests/mysql/mariadb-galera.nix +++ b/nixos/tests/mysql/mariadb-galera.nix @@ -58,30 +58,6 @@ let extraHosts = lib.concatMapStringsSep "\n" (i: "192.168.1.${toString i} galera_0${toString i}") ( lib.range 1 6 ); - firewall.allowedTCPPorts = [ - 3306 - 4444 - 4567 - 4568 - ]; - firewall.allowedUDPPorts = [ 4567 ]; - }; - systemd.services.mysql = with pkgs; { - path = with pkgs; [ - bash - gawk - gnutar - gzip - inetutils - iproute2 - netcat - procps - pv - rsync - socat - stunnel - which - ]; }; services.mysql = { enable = true; @@ -101,27 +77,24 @@ let FLUSH PRIVILEGES; '' ); + + galeraCluster = { + enable = true; + package = galeraPackage; + sstMethod = method; + + localAddress = address; + localName = "galera_0${toString id}"; + + clusterAddress = + "gcomm://" + + lib.optionalString (id == 2 || id == 3) "galera_01,galera_02,galera_03" + + lib.optionalString (id == 5 || id == 6) "galera_04,galera_05,galera_06"; + }; + settings = { - mysqld = { - bind_address = "0.0.0.0"; - }; galera = { - wsrep_on = "ON"; wsrep_debug = "NONE"; - wsrep_retry_autocommit = "3"; - wsrep_provider = "${galeraPackage}/lib/galera/libgalera_smm.so"; - wsrep_cluster_address = - "gcomm://" - + lib.optionalString (id == 2 || id == 3) "galera_01,galera_02,galera_03" - + lib.optionalString (id == 5 || id == 6) "galera_04,galera_05,galera_06"; - wsrep_cluster_name = "galera"; - wsrep_node_address = address; - wsrep_node_name = "galera_0${toString id}"; - wsrep_sst_method = method; - wsrep_sst_auth = "check_repl:check_pass"; - binlog_format = "ROW"; - enforce_storage_engine = "InnoDB"; - innodb_autoinc_lock_mode = "2"; }; }; }; diff --git a/nixos/tests/nebula.nix b/nixos/tests/nebula.nix index b3096424a614..68a48d4c86a2 100644 --- a/nixos/tests/nebula.nix +++ b/nixos/tests/nebula.nix @@ -14,7 +14,10 @@ import ./make-test-python.nix ( lib.mkMerge [ { # Expose nebula for doing cert signing. - environment.systemPackages = [ pkgs.nebula ]; + environment.systemPackages = [ + pkgs.dig + pkgs.nebula + ]; users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; services.openssh.enable = true; networking.firewall.enable = true; # Implicitly true, but let's make sure. @@ -51,6 +54,7 @@ import ./make-test-python.nix ( lighthouse = { ... }@args: makeNebulaNode args "lighthouse" { + networking.firewall.allowedUDPPorts = [ 53 ]; networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ { address = "192.168.1.1"; @@ -77,6 +81,13 @@ import ./make-test-python.nix ( } ]; }; + lighthouse = { + dns = { + enable = true; + host = "10.0.100.1"; # bind to lighthouse interface + port = 53; # answer on standard DNS port + }; + }; }; }; @@ -338,6 +349,8 @@ import ./make-test-python.nix ( # allowAny can ping the lighthouse, but not allowFromLighthouse because of its inbound firewall allowAny.succeed("ping -c3 10.0.100.1") allowAny.fail("ping -c3 10.0.100.3") + # allowAny can also resolve DNS on lighthouse + allowAny.succeed("dig @10.0.100.1 allowToLighthouse | grep -E 'allowToLighthouse\.\s+[0-9]+\s+IN\s+A\s+10\.0\.100\.4'") # allowFromLighthouse can ping the lighthouse and allowAny allowFromLighthouse.succeed("ping -c3 10.0.100.1") diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index a88bf1a77fa1..77c34e70e7d0 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -22,6 +22,7 @@ import ./make-test-python.nix ( ]; services.netdata = { enable = true; + package = pkgs.netdataCloud; python.recommendedPythonPackages = true; configDir."apps_groups.conf" = pkgs.writeText "apps_groups.conf" '' @@ -40,27 +41,17 @@ import ./make-test-python.nix ( netdata.wait_for_open_port(19999) # check if the netdata main page loads. - netdata.succeed("curl --fail http://localhost:19999/") + netdata.succeed("curl --fail http://127.0.0.1:19999") netdata.succeed("sleep 4") - # check if netdata can read disk ops for root owned processes. - # if > 0, successful. verifies both netdata working and - # apps.plugin has elevated capabilities. - url = "http://localhost:19999/api/v1/data?chart=user.root_disk_physical_io" - filter = '[.data[range(10)][2]] | add | . < 0' + # check if netdata api shows correct os + url = "http://127.0.0.1:19999/api/v3/info" + filter = '.agents[0].application.os.os | . == "NixOS"' cmd = f"curl -s {url} | jq -e '{filter}'" netdata.wait_until_succeeds(cmd) # check if the control socket is available netdata.succeed("sudo netdatacli ping") - - # check that custom groups in apps_groups.conf are used. - # if > 0, successful. verifies that user-specified apps_group.conf - # is used. - url = "http://localhost:19999/api/v1/data?chart=app.netdata_test_cpu_utilization" - filter = '[.data[range(10)][2]] | add | . > 0' - cmd = f"curl -s {url} | jq -e '{filter}'" - netdata.wait_until_succeeds(cmd, timeout=30) ''; } ) diff --git a/nixos/tests/networking/livekit.nix b/nixos/tests/networking/livekit.nix new file mode 100644 index 000000000000..3f72ee5a050c --- /dev/null +++ b/nixos/tests/networking/livekit.nix @@ -0,0 +1,25 @@ +{ + pkgs, + lib, + ... +}: +{ + name = "livekit"; + meta.maintainers = [ lib.maintainers.quadradical ]; + + nodes.machine = { + services.livekit = { + enable = true; + keyFile = pkgs.writers.writeYAML "keys.yaml" { + key = "f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE"; + }; + settings.port = 8000; + }; + }; + + testScript = '' + machine.wait_for_unit("livekit.service") + machine.wait_for_open_port(8000) + machine.succeed("curl 127.0.0.1:8000 -L --fail") + ''; +} diff --git a/nixos/tests/networking/networkd-and-scripted.nix b/nixos/tests/networking/networkd-and-scripted.nix index f2211738db2b..312981317735 100644 --- a/nixos/tests/networking/networkd-and-scripted.nix +++ b/nixos/tests/networking/networkd-and-scripted.nix @@ -178,6 +178,29 @@ let router.wait_until_succeeds("ping -c 1 fd00:1234:5678:2::2") ''; }; + dhcpHostname = { + name = "hostnameDHCP"; + nodes.router = router; + nodes.client = clientConfig { + # use the name given by the DHCP server + system.name = "client"; + networking.hostName = lib.mkForce ""; + security.polkit.enable = true; + virtualisation.interfaces.enp1s0.vlan = 1; + networking.interfaces.enp1s0.useDHCP = true; + }; + testScript = '' + router.start() + router.systemctl("start network-online.target") + router.wait_for_unit("network-online.target") + + client.start() + client.wait_for_unit("network.target") + + with subtest("Wait until we have received the hostname"): + client.wait_until_succeeds("hostname | grep -q 'client1'") + ''; + }; dhcpOneIf = { name = "OneInterfaceDHCP"; nodes.router = router; diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index a5a5e49d3145..dc0bd933f21d 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -139,7 +139,6 @@ let in listToAttrs ( concatMap genTests [ - 29 30 31 ] diff --git a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix index 094732a10fa6..fb1a9c9baba0 100644 --- a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix +++ b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix @@ -84,13 +84,12 @@ runTest ( # This file is meant to contain secret options which should # not go into the nix store. Here it is just used to set the # redis password. - environment.etc."nextcloud-secrets.json".text = '' - { - "redis": { - "password": "secret" - } - } - ''; + environment.etc."nextcloud-secrets.json" = { + mode = "0600"; + text = builtins.toJSON { + redis.password = "secret"; + }; + }; }; }; diff --git a/nixos/tests/nextcloud/with-objectstore.nix b/nixos/tests/nextcloud/with-objectstore.nix index 802c070b879d..53800b8238bc 100644 --- a/nixos/tests/nextcloud/with-objectstore.nix +++ b/nixos/tests/nextcloud/with-objectstore.nix @@ -26,11 +26,13 @@ runTest ( nodes = { nextcloud = - { config, pkgs, ... }: { - networking.firewall.allowedTCPPorts = [ 9000 ]; - environment.systemPackages = [ pkgs.minio-client ]; - + config, + pkgs, + nodes, + ... + }: + { services.nextcloud.config.dbtype = "sqlite"; services.nextcloud.config.objectstore.s3 = { @@ -39,13 +41,66 @@ runTest ( autocreate = true; key = accessKey; secretFile = "${pkgs.writeText "secretKey" secretKey}"; - hostname = "nextcloud"; - useSsl = false; - port = 9000; + hostname = "acme.test"; + useSsl = true; + port = 443; usePathStyle = true; region = "us-east-1"; }; + security.pki.certificates = [ + (builtins.readFile ../common/acme/server/ca.cert.pem) + ]; + + environment.systemPackages = [ pkgs.minio-client ]; + + # The dummy certs are for acme.test, so we pretend that's the FQDN + # of the minio VM. + networking.extraHosts = '' + ${nodes.minio.networking.primaryIPAddress} acme.test + ''; + }; + + client = + { nodes, ... }: + { + security.pki.certificates = [ + (builtins.readFile ../common/acme/server/ca.cert.pem) + ]; + networking.extraHosts = '' + ${nodes.minio.networking.primaryIPAddress} acme.test + ''; + }; + + minio = + { ... }: + { + security.pki.certificates = [ + (builtins.readFile ../common/acme/server/ca.cert.pem) + ]; + + services.nginx = { + enable = true; + recommendedProxySettings = true; + + virtualHosts."acme.test" = { + onlySSL = true; + sslCertificate = ../common/acme/server/acme.test.cert.pem; + sslCertificateKey = ../common/acme/server/acme.test.key.pem; + locations."/".proxyPass = "http://127.0.0.1:9000"; + }; + }; + + networking.extraHosts = '' + 127.0.0.1 acme.test + ''; + + networking.firewall.allowedTCPPorts = [ + 9000 + 80 + 443 + ]; + services.minio = { enable = true; listenAddress = "0.0.0.0:9000"; @@ -56,18 +111,22 @@ runTest ( }; test-helpers.init = '' - nextcloud.wait_for_open_port(9000) + minio.start() + minio.wait_for_open_port(9000) + minio.wait_for_unit("nginx.service") + minio.wait_for_open_port(443) ''; test-helpers.extraTests = { nodes, ... }: '' + with subtest("File is not on the filesystem"): nextcloud.succeed("test ! -e ${nodes.nextcloud.services.nextcloud.home}/data/root/files/test-shared-file") with subtest("Check if file is in S3"): nextcloud.succeed( - "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4" + "mc config host add minio https://acme.test ${accessKey} ${secretKey} --api s3v4" ) files = nextcloud.succeed('mc ls minio/nextcloud|sort').strip().split('\n') @@ -100,8 +159,8 @@ runTest ( with subtest("Test download from S3"): client.succeed( "env AWS_ACCESS_KEY_ID=${accessKey} AWS_SECRET_ACCESS_KEY=${secretKey} " - + f"${lib.getExe pkgs.awscli2} s3 cp s3://nextcloud/{file} test --endpoint-url http://nextcloud:9000 " - + "--region us-east-1" + + f"${lib.getExe pkgs.awscli2} s3 cp s3://nextcloud/{file} test --endpoint-url https://acme.test " + + "--region us-east-1 --ca-bundle /etc/ssl/certs/ca-bundle.crt" ) client.succeed("test hi = $(cat test)") diff --git a/nixos/tests/nextflow.nix b/nixos/tests/nextflow.nix index b4aad98483b9..62ce7d3ea571 100644 --- a/nixos/tests/nextflow.nix +++ b/nixos/tests/nextflow.nix @@ -1,60 +1,58 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - let - bash = pkgs.dockerTools.pullImage { - imageName = "quay.io/nextflow/bash"; - imageDigest = "sha256:bea0e244b7c5367b2b0de687e7d28f692013aa18970941c7dd184450125163ac"; - sha256 = "161s9f24njjx87qrwq0c9nmnwvyc6iblcxka7hirw78lm7i9x4w5"; - finalImageName = "quay.io/nextflow/bash"; - }; +{ pkgs, ... }: +let + bash = pkgs.dockerTools.pullImage { + imageName = "quay.io/nextflow/bash"; + imageDigest = "sha256:bea0e244b7c5367b2b0de687e7d28f692013aa18970941c7dd184450125163ac"; + sha256 = "161s9f24njjx87qrwq0c9nmnwvyc6iblcxka7hirw78lm7i9x4w5"; + finalImageName = "quay.io/nextflow/bash"; + }; - hello = pkgs.stdenv.mkDerivation { - name = "nextflow-hello"; - src = pkgs.fetchFromGitHub { - owner = "nextflow-io"; - repo = "hello"; - rev = "afff16a9b45c8e8a4f5a3743780ac13a541762f8"; - hash = "sha256-c8FirHc+J5Y439g0BdHxRtXVrOAzIrGEKA0m1mp9b/U="; + hello = pkgs.stdenv.mkDerivation { + name = "nextflow-hello"; + src = pkgs.fetchFromGitHub { + owner = "nextflow-io"; + repo = "hello"; + rev = "afff16a9b45c8e8a4f5a3743780ac13a541762f8"; + hash = "sha256-c8FirHc+J5Y439g0BdHxRtXVrOAzIrGEKA0m1mp9b/U="; + }; + installPhase = '' + cp -r $src $out + ''; + }; + run-nextflow-pipeline = pkgs.writeShellApplication { + name = "run-nextflow-pipeline"; + runtimeInputs = [ pkgs.nextflow ]; + text = '' + export NXF_OFFLINE=true + for b in false true; do + echo "docker.enabled = $b" > nextflow.config + cat nextflow.config + nextflow run -ansi-log false ${hello} + done + ''; + }; +in +{ + name = "nextflow"; + + nodes.machine = + { ... }: + { + environment.systemPackages = [ + run-nextflow-pipeline + pkgs.nextflow + ]; + virtualisation = { + docker.enable = true; }; - installPhase = '' - cp -r $src $out - ''; }; - run-nextflow-pipeline = pkgs.writeShellApplication { - name = "run-nextflow-pipeline"; - runtimeInputs = [ pkgs.nextflow ]; - text = '' - export NXF_OFFLINE=true - for b in false true; do - echo "docker.enabled = $b" > nextflow.config - cat nextflow.config - nextflow run -ansi-log false ${hello} - done - ''; - }; - in - { - name = "nextflow"; - nodes.machine = - { ... }: - { - environment.systemPackages = [ - run-nextflow-pipeline - pkgs.nextflow - ]; - virtualisation = { - docker.enable = true; - }; - }; - - testScript = - { nodes, ... }: - '' - start_all() - machine.wait_for_unit("docker.service") - machine.succeed("docker load < ${bash}") - machine.succeed("run-nextflow-pipeline >&2") - ''; - } -) + testScript = + { nodes, ... }: + '' + start_all() + machine.wait_for_unit("docker.service") + machine.succeed("docker load < ${bash}") + machine.succeed("run-nextflow-pipeline >&2") + ''; +} diff --git a/nixos/tests/nginx-unix-socket.nix b/nixos/tests/nginx-unix-socket.nix index 19d9377868ef..d6949227d3be 100644 --- a/nixos/tests/nginx-unix-socket.nix +++ b/nixos/tests/nginx-unix-socket.nix @@ -1,5 +1,6 @@ { ... }: let + defaultNginxSocketPath = "/var/run/nginx/default-test.sock"; nginxSocketPath = "/var/run/nginx/test.sock"; in { @@ -11,6 +12,13 @@ in { services.nginx = { enable = true; + + defaultListen = [ { addr = "unix:${defaultNginxSocketPath}"; } ]; + virtualHosts.defaultLocalhost = { + serverName = "defaultLocalhost"; + locations."/default".return = "200 'bar'"; + }; + virtualHosts.localhost = { serverName = "localhost"; listen = [ { addr = "unix:${nginxSocketPath}"; } ]; @@ -22,8 +30,10 @@ in testScript = '' webserver.wait_for_unit("nginx") - webserver.wait_for_open_unix_socket("${nginxSocketPath}") + webserver.wait_for_open_unix_socket("${defaultNginxSocketPath}", timeout=1) + webserver.wait_for_open_unix_socket("${nginxSocketPath}", timeout=1) + webserver.succeed("curl --fail --silent --unix-socket '${defaultNginxSocketPath}' http://defaultLocalhost/default | grep '^bar$'") webserver.succeed("curl --fail --silent --unix-socket '${nginxSocketPath}' http://localhost/test | grep '^foo$'") ''; } diff --git a/nixos/tests/nix-ld.nix b/nixos/tests/nix-ld.nix index 03f5c5e89fbf..0b89b99a33b5 100644 --- a/nixos/tests/nix-ld.nix +++ b/nixos/tests/nix-ld.nix @@ -1,14 +1,12 @@ +{ ... }: { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, -}: -let - inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; - shared = + name = "nix-ld"; + + nodes.machine = { config, pkgs, ... }: { programs.nix-ld.enable = true; + environment.systemPackages = [ (pkgs.runCommand "patched-hello" { } '' install -D -m755 ${pkgs.hello}/bin/hello $out/bin/hello @@ -16,25 +14,9 @@ let '') ]; }; -in -{ - nix-ld = makeTest { - name = "nix-ld"; - nodes.machine = shared; - testScript = '' - start_all() - machine.succeed("hello") - ''; - }; - nix-ld-rs = makeTest { - name = "nix-ld-rs"; - nodes.machine = { - imports = [ shared ]; - programs.nix-ld.package = pkgs.nix-ld-rs; - }; - testScript = '' - start_all() - machine.succeed("hello") - ''; - }; + + testScript = '' + start_all() + machine.succeed("hello") + ''; } diff --git a/nixos/tests/nix/misc.nix b/nixos/tests/nix/misc.nix index be23d4e450e3..c594f4055cfc 100644 --- a/nixos/tests/nix/misc.nix +++ b/nixos/tests/nix/misc.nix @@ -3,20 +3,16 @@ let inherit (pkgs) lib; - tests = { - default = testsForPackage { nixPackage = pkgs.nix; }; - lix = testsForPackage { nixPackage = pkgs.lix; }; - }; + tests.default = testsForPackage { nixPackage = pkgs.nix; }; - testsForPackage = - args: - lib.recurseIntoAttrs { - # If the attribute is not named 'test' - # You will break all the universe on the release-*.nix side of things. - # `discoverTests` relies on `test` existence to perform a `callTest`. - test = testMiscFeatures args; - passthru.override = args': testsForPackage (args // args'); + testsForPackage = args: { + # If the attribute is not named 'test' + # You will break all the universe on the release-*.nix side of things. + # `discoverTests` relies on `test` existence to perform a `callTest`. + test = testMiscFeatures args // { + passthru.override = args': (testsForPackage (args // args')).test; }; + }; testMiscFeatures = { nixPackage, ... }: diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix index 2d204131dcf9..719ea9f33eac 100644 --- a/nixos/tests/noto-fonts.nix +++ b/nixos/tests/noto-fonts.nix @@ -1,13 +1,14 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "noto-fonts"; - meta.maintainers = with lib.maintainers; [ - nickcao - midchildan - ]; +{ lib, ... }: +{ + name = "noto-fonts"; + meta.maintainers = with lib.maintainers; [ + nickcao + midchildan + ]; - nodes.machine = { + nodes.machine = + { pkgs, ... }: + { imports = [ ./common/x11.nix ]; environment.systemPackages = [ pkgs.gedit ]; fonts = { @@ -36,24 +37,23 @@ import ./make-test-python.nix ( }; }; - testScript = - # extracted from http://www.clagnut.com/blog/2380/ - let - testText = builtins.toFile "test.txt" '' - the quick brown fox jumps over the lazy dog - 視野無限廣，窗外有藍天 - Eĥoŝanĝo ĉiuĵaŭde. - いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす - 다람쥐 헌 쳇바퀴에 타고파 - 中国智造，慧及全球 - ''; - in - '' - machine.wait_for_x() - machine.succeed("gedit ${testText} >&2 &") - machine.wait_for_window(".* - gedit") - machine.sleep(10) - machine.screenshot("screen") + testScript = + # extracted from http://www.clagnut.com/blog/2380/ + let + testText = builtins.toFile "test.txt" '' + the quick brown fox jumps over the lazy dog + 視野無限廣，窗外有藍天 + Eĥoŝanĝo ĉiuĵaŭde. + いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす + 다람쥐 헌 쳇바퀴에 타고파 + 中国智造，慧及全球 ''; - } -) + in + '' + machine.wait_for_x() + machine.succeed("gedit ${testText} >&2 &") + machine.wait_for_window(".* - gedit") + machine.sleep(10) + machine.screenshot("screen") + ''; +} diff --git a/nixos/tests/ntpd-rs.nix b/nixos/tests/ntpd-rs.nix index 2907c7558324..9459a9f4ac51 100644 --- a/nixos/tests/ntpd-rs.nix +++ b/nixos/tests/ntpd-rs.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ( client = { services.ntpd-rs = { enable = true; - metrics.enable = true; + metrics.enable = false; useNetworkingTimeServers = false; settings = { source = [ @@ -27,11 +27,22 @@ import ./make-test-python.nix ( }; }; server = { - networking.firewall.allowedUDPPorts = [ 123 ]; + networking.firewall = { + allowedTCPPorts = [ + 9975 + ]; + allowedUDPPorts = [ + 123 + ]; + }; + services.ntpd-rs = { enable = true; metrics.enable = true; settings = { + observability = { + metrics-exporter-listen = "[::]:9975"; + }; server = [ { listen = "[::]:123"; } ]; @@ -48,8 +59,19 @@ import ./make-test-python.nix ( for machine in (server, client): machine.wait_for_unit('multi-user.target') machine.succeed('systemctl is-active ntpd-rs.service') - machine.succeed('systemctl is-active ntpd-rs-metrics.service') - machine.succeed('curl http://localhost:9975/metrics | grep ntp_uptime_seconds') + + client.fail('systemctl is-active ntpd-rs-metrics.service') + server.succeed('systemctl is-active ntpd-rs-metrics.service') + + server.wait_for_open_port(9975) + client.succeed('curl http://server:9975/metrics | grep ntp_uptime_seconds') + server.fail('curl --fail --connect-timeout 2 http://client:9975/metrics | grep ntp_uptime_seconds') + + client.succeed("ntp-ctl status | grep server:123") + server.succeed("ntp-ctl status | grep '\[::\]:123'") + + client.succeed("grep '^mode = \"server\"' $(systemctl status ntpd-rs | grep -oE '/nix/store[^ ]*ntpd-rs.toml')") + server.succeed("grep '^mode = \"pool\"' $(systemctl status ntpd-rs | grep -oE '/nix/store[^ ]*ntpd-rs.toml')") ''; } ) diff --git a/nixos/tests/nvidia-container-toolkit.nix b/nixos/tests/nvidia-container-toolkit.nix index b22b989c0814..1b894a1cddd9 100644 --- a/nixos/tests/nvidia-container-toolkit.nix +++ b/nixos/tests/nvidia-container-toolkit.nix @@ -90,7 +90,10 @@ in { name = "nvidia-container-toolkit"; meta = with lib.maintainers; { - maintainers = [ ereslibre ]; + maintainers = [ + ereslibre + christoph-heiss + ]; }; defaults = { config, ... }: diff --git a/nixos/tests/obs-studio.nix b/nixos/tests/obs-studio.nix index a1b5bacf0428..7290119a12d7 100644 --- a/nixos/tests/obs-studio.nix +++ b/nixos/tests/obs-studio.nix @@ -1,40 +1,38 @@ -import ./make-test-python.nix ( - { ... }: +{ ... }: - { - name = "obs-studio"; +{ + name = "obs-studio"; - nodes.machine = - { pkgs, ... }: - { - imports = [ - ./common/x11.nix - ./common/user-account.nix + nodes.machine = + { pkgs, ... }: + { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; + + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-vkcapture ]; - - programs.obs-studio = { - enable = true; - plugins = with pkgs.obs-studio-plugins; [ - wlrobs - obs-vkcapture - ]; - enableVirtualCamera = true; - }; + enableVirtualCamera = true; }; + }; - testScript = '' - machine.wait_for_x() - machine.succeed("obs --version") + testScript = '' + machine.wait_for_x() + machine.succeed("obs --version") - # virtual camera tests - machine.succeed("lsmod | grep v4l2loopback") - machine.succeed("ls /dev/video1") - machine.succeed("obs --startvirtualcam >&2 &") - machine.wait_for_window("OBS") - machine.sleep(5) + # virtual camera tests + machine.succeed("lsmod | grep v4l2loopback") + machine.succeed("ls /dev/video1") + machine.succeed("obs --startvirtualcam >&2 &") + machine.wait_for_window("OBS") + machine.sleep(5) - # test plugins - machine.succeed("which obs-vkcapture") - ''; - } -) + # test plugins + machine.succeed("which obs-vkcapture") + ''; +} diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix index 073f62cf5155..a22bd9c6b431 100644 --- a/nixos/tests/oci-containers.nix +++ b/nixos/tests/oci-containers.nix @@ -80,6 +80,7 @@ let home = "/var/lib/redis"; linger = type == "healthy"; createHome = true; + uid = 2342; subUidRanges = [ { count = 65536; diff --git a/nixos/tests/olivetin.nix b/nixos/tests/olivetin.nix new file mode 100644 index 000000000000..f9d9e98610ef --- /dev/null +++ b/nixos/tests/olivetin.nix @@ -0,0 +1,57 @@ +{ lib, ... }: + +{ + name = "olivetin"; + meta.maintainers = with lib.maintainers; [ defelo ]; + + nodes.machine = { + services.olivetin = { + enable = true; + settings = { + actions = [ + { + id = "hello_world"; + title = "Say Hello"; + shell = "echo -n 'Hello World!' | tee /tmp/result"; + } + ]; + }; + extraConfigFiles = [ + (builtins.toFile "secrets.yaml" '' + actions: + - id: secret + title: Secret Action + shell: echo -n secret > /tmp/result2 + '') + ]; + }; + }; + + interactive.nodes.machine = { + services.olivetin.settings.ListenAddressSingleHTTPFrontend = "0.0.0.0:8000"; + networking.firewall.allowedTCPPorts = [ 8000 ]; + virtualisation.forwardPorts = [ + { + from = "host"; + host.port = 8000; + guest.port = 8000; + } + ]; + }; + + testScript = '' + import json + + machine.wait_for_unit("olivetin.service") + machine.wait_for_open_port(8000) + + response = json.loads(machine.succeed("curl http://localhost:8000/api/StartActionByGetAndWait/hello_world")) + assert response["logEntry"]["exitCode"] == 0 + assert response["logEntry"]["output"] == "Hello World!" + assert machine.succeed("cat /tmp/result") == "Hello World!" + + response = json.loads(machine.succeed("curl http://localhost:8000/api/StartActionByGetAndWait/secret")) + assert response["logEntry"]["exitCode"] == 0 + assert machine.succeed("cat /tmp/result2") == "secret" + ''; +} diff --git a/nixos/tests/openbao.nix b/nixos/tests/openbao.nix new file mode 100644 index 000000000000..94e1f0af7ec4 --- /dev/null +++ b/nixos/tests/openbao.nix @@ -0,0 +1,105 @@ +{ lib, ... }: +let + certs = import ./common/acme/server/snakeoil-certs.nix; + domain = certs.domain; +in +{ + name = "openbao"; + + meta.maintainers = with lib.maintainers; [ kranzes ]; + + nodes.machine = + { config, ... }: + { + security.pki.certificateFiles = [ certs.ca.cert ]; + + networking.extraHosts = '' + 127.0.0.1 ${domain} + ''; + + services.openbao = { + enable = true; + + settings = { + ui = true; + + listener = { + default = { + type = "tcp"; + tls_cert_file = certs.${domain}.cert; + tls_key_file = certs.${domain}.key; + }; + + unix = { + type = "unix"; + }; + }; + + cluster_addr = "https://127.0.0.1:8201"; + api_addr = "https://${domain}:8200"; + + storage.raft.path = "/var/lib/openbao"; + }; + }; + + environment.variables = { + BAO_ADDR = config.services.openbao.settings.api_addr; + BAO_FORMAT = "json"; + }; + }; + + testScript = + { nodes, ... }: + '' + import json + + start_all() + + with subtest("Wait for OpenBao to start up"): + machine.wait_for_unit("openbao.service") + machine.wait_for_open_port(8200) + machine.wait_for_open_unix_socket("${nodes.machine.services.openbao.settings.listener.unix.address}") + + with subtest("Check that the web UI is being served"): + machine.succeed("curl -L --fail --show-error --silent $BAO_ADDR | grep 'OpenBao'") + + with subtest("Check that OpenBao is not initialized"): + status_output = json.loads(machine.fail("bao status")) + assert not status_output["initialized"] + + with subtest("Initialize OpenBao"): + init_output = json.loads(machine.succeed("bao operator init")) + + with subtest("Check that OpenBao is initialized and sealed"): + status_output = json.loads(machine.fail("bao status")) + assert status_output["initialized"] + assert status_output["sealed"] + + with subtest("Unseal OpenBao"): + for key in init_output["unseal_keys_b64"][:init_output["unseal_threshold"]]: + machine.succeed(f"bao operator unseal {key}") + + with subtest("Check that OpenBao is not sealed"): + status_output = json.loads(machine.succeed("bao status")) + assert not status_output["sealed"] + + with subtest("Login with root token"): + machine.succeed(f"bao login {init_output["root_token"]}") + + with subtest("Enable userpass auth method"): + machine.succeed("bao auth enable userpass") + + with subtest("Create a user in userpass"): + machine.succeed("bao write auth/userpass/users/testuser password=testpassword") + + with subtest("Login to a user from userpass"): + machine.succeed("bao login -method userpass username=testuser password=testpassword") + + with subtest("Write a secret to cubbyhole"): + machine.succeed("bao write cubbyhole/my-secret my-value=s3cr3t") + + with subtest("Read a secret from cubbyhole"): + read_output = json.loads(machine.succeed("bao read cubbyhole/my-secret")) + assert read_output["data"]["my-value"] == "s3cr3t" + ''; +} diff --git a/nixos/tests/opencloud.nix b/nixos/tests/opencloud.nix new file mode 100644 index 000000000000..1fdac34b6ccd --- /dev/null +++ b/nixos/tests/opencloud.nix @@ -0,0 +1,110 @@ +{ lib, pkgs, ... }: + +let + certs = import ./common/acme/server/snakeoil-certs.nix; + inherit (certs) domain; + + # this is a demo user created by IDM_CREATE_DEMO_USERS=true + demoUser = "alan"; + demoPassword = "demo"; + + adminUser = "admin"; + adminPassword = "hunter2"; + testRunner = + pkgs.writers.writePython3Bin "test-runner" + { + libraries = [ pkgs.python3Packages.selenium ]; + flakeIgnore = [ "E501" ]; + } + '' + import sys + from selenium.webdriver.common.by import By + from selenium.webdriver import Firefox + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + from selenium.webdriver.support import expected_conditions as EC + + options = Options() + options.add_argument('--headless') + driver = Firefox(options=options) + + host = sys.argv[1] + user = sys.argv[2] + password = sys.argv[3] + + driver.get(f"https://{host}/") + wait = WebDriverWait(driver, 60) + wait.until(EC.title_contains("Sign in")) + wait.until(EC.url_contains(f"https://{host}/signin/v1/identifier")) + wait.until(EC.visibility_of_element_located((By.ID, 'oc-login-username'))) + driver.find_element(By.ID, 'oc-login-username').send_keys(user) + driver.find_element(By.ID, 'oc-login-password').send_keys(password) + wait.until(EC.visibility_of_element_located((By.XPATH, '//button[@type="submit"]'))) + driver.find_element(By.XPATH, '//button[@type="submit"]').click() + wait.until(EC.visibility_of_element_located((By.ID, 'new-file-menu-btn'))) + wait.until(EC.title_contains("Personal")) + ''; +in + +{ + name = "opencloud"; + + meta.maintainers = with lib.maintainers; [ + christoph-heiss + k900 + ]; + + nodes.machine = { + virtualisation.memorySize = 2048; + environment.systemPackages = [ + pkgs.firefox-unwrapped + pkgs.geckodriver + testRunner + ]; + + networking.hosts."127.0.0.1" = [ domain ]; + security.pki.certificateFiles = [ certs.ca.cert ]; + + services.opencloud = { + enable = true; + url = "https://${domain}:9200"; + environment = { + ADMIN_PASSWORD = adminPassword; + IDM_CREATE_DEMO_USERS = "true"; + IDM_LDAPS_CERT = "${certs.${domain}.cert}"; + IDM_LDAPS_KEY = "${certs.${domain}.key}"; + OC_INSECURE = "false"; + OC_LDAP_URI = "ldaps://${domain}:9235"; + OC_LDAP_CACERT = "${certs.${domain}.cert}"; + OC_HTTP_TLS_ENABLED = "true"; + OC_HTTP_TLS_CERTIFICATE = "${certs.${domain}.cert}"; + OC_HTTP_TLS_KEY = "${certs.${domain}.key}"; + PROXY_TLS = "true"; + PROXY_TRANSPORT_TLS_CERT = "${certs.${domain}.cert}"; + PROXY_TRANSPORT_TLS_KEY = "${certs.${domain}.key}"; + PROXY_INSECURE_BACKENDS = "true"; + }; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("opencloud.service") + machine.wait_for_open_port(9200) + + # wait for OpenCloud to fully come up + machine.sleep(10) + + with subtest("opencloud bin works"): + machine.succeed("${lib.getExe pkgs.opencloud} version") + + with subtest("web interface presents start page"): + machine.succeed("curl -sSf https://${domain}:9200 | grep 'OpenCloud'") + + with subtest("use the web interface to log in with the provisioned admin user"): + machine.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner ${domain}:9200 ${adminUser} ${adminPassword}") + + with subtest("use the web interface to log in with a demo user"): + machine.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner ${domain}:9200 ${demoUser} ${demoPassword}") + ''; +} diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index e0b95f75dfda..d7ddf478d91a 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -251,7 +251,6 @@ import ./make-test-python.nix ( server_lazy_socket.wait_for_unit("sshd.socket", timeout=30) with subtest("manual-authkey"): - client.succeed("mkdir -m 700 /root/.ssh") client.succeed( '${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f /root/.ssh/id_ed25519 -N ""' ) @@ -261,9 +260,7 @@ import ./make-test-python.nix ( public_key = public_key.strip() client.succeed("chmod 600 /root/.ssh/id_ed25519") - server.succeed("mkdir -m 700 /root/.ssh") server.succeed("echo '{}' > /root/.ssh/authorized_keys".format(public_key)) - server_lazy.succeed("mkdir -m 700 /root/.ssh") server_lazy.succeed("echo '{}' > /root/.ssh/authorized_keys".format(public_key)) client.wait_for_unit("network.target") @@ -354,6 +351,9 @@ import ./make-test-python.nix ( "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-no-pam true", timeout=30 ) + + # None of the per-connection units should have failed. + server_lazy.fail("systemctl is-failed 'sshd@*.service'") ''; } ) diff --git a/nixos/tests/openstack-image.nix b/nixos/tests/openstack-image.nix index 8fcfde974668..83c34fefef1f 100644 --- a/nixos/tests/openstack-image.nix +++ b/nixos/tests/openstack-image.nix @@ -12,7 +12,7 @@ with import common/ec2.nix { inherit makeTest pkgs; }; let image = (import ../lib/eval-config.nix { - inherit system; + system = null; modules = [ ../maintainers/scripts/openstack/openstack-image.nix ../modules/testing/test-instrumentation.nix @@ -22,6 +22,8 @@ let system.extraDependencies = with pkgs; [ stdenv ]; + + nixpkgs.pkgs = pkgs; } ]; }).config.system.build.openstackImage diff --git a/nixos/tests/paretosecurity.nix b/nixos/tests/paretosecurity.nix index a2b9317c678f..5f9562013011 100644 --- a/nixos/tests/paretosecurity.nix +++ b/nixos/tests/paretosecurity.nix @@ -4,58 +4,49 @@ meta.maintainers = [ lib.maintainers.zupo ]; nodes.terminal = - { - config, - pkgs, - lib, - ... - }: - let - # Create a patched version of the package that points to the local dashboard - # for easier testing - patchedPareto = pkgs.paretosecurity.overrideAttrs (oldAttrs: { - postPatch = '' - substituteInPlace team/report.go \ - --replace-warn 'const reportURL = "https://dash.paretosecurity.com"' \ - 'const reportURL = "http://dashboard"' - ''; - }); - in + { pkgs, ... }: { imports = [ ./common/user-account.nix ]; + networking.firewall.enable = true; services.paretosecurity = { enable = true; - package = patchedPareto; + + # Create a patched version of the package that points to the local dashboard + # for easier testing + package = pkgs.paretosecurity.overrideAttrs (oldAttrs: { + postPatch = + oldAttrs.postPatch or "" + + '' + substituteInPlace team/report.go \ + --replace-warn 'const reportURL = "https://dash.paretosecurity.com"' \ + 'const reportURL = "http://dashboard"' + ''; + }); }; }; - nodes.dashboard = - { config, pkgs, ... }: - { - networking.firewall.allowedTCPPorts = [ 80 ]; + nodes.dashboard = { + networking.firewall.allowedTCPPorts = [ 80 ]; - services.nginx = { - enable = true; - virtualHosts."dashboard" = { - locations."/api/v1/team/".extraConfig = '' - add_header Content-Type application/json; - return 200 '{"message": "Linked device."}'; - ''; - }; + services.nginx = { + enable = true; + virtualHosts."dashboard" = { + locations."/api/v1/team/".extraConfig = '' + add_header Content-Type application/json; + return 200 '{"message": "Linked device."}'; + ''; }; }; + }; nodes.xfce = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/user-account.nix ]; - services.paretosecurity = { - enable = true; - trayIcon = true; - }; + services.paretosecurity.enable = true; services.xserver.enable = true; services.xserver.displayManager.lightdm.enable = true; @@ -64,11 +55,16 @@ services.displayManager.autoLogin = { enable = true; user = "alice"; + + }; + + virtualisation.resolution = { + x = 640; + y = 480; }; environment.systemPackages = [ pkgs.xdotool ]; environment.variables.XAUTHORITY = "/home/alice/.Xauthority"; - }; enableOCR = true; @@ -94,7 +90,6 @@ + " --skip 21830a4e-84f1-48fe-9c5b-beab436b2cdb" # Disk encryption + " --skip 44e4754a-0b42-4964-9cc2-b88b2023cb1e" # Pareto Security is up to date + " --skip f962c423-fdf5-428a-a57a-827abc9b253e" # Password manager installed - + " --skip 2e46c89a-5461-4865-a92e-3b799c12034a" # Firewall is enabled + "'" ) @@ -117,9 +112,22 @@ ]: status, out = xfce.systemctl("is-enabled " + unit, "alice") assert status == 0, f"Unit {unit} is not enabled (status: {status}): {out}" - xfce.succeed("xdotool mousemove 850 10") + xfce.succeed("xdotool mousemove 460 10") xfce.wait_for_text("Pareto Security") xfce.succeed("xdotool click 1") xfce.wait_for_text("Run Checks") + + # Test 5: Desktop entry + xfce.succeed("xdotool mousemove 10 10") + xfce.succeed("xdotool click 1") # hide the tray icon window + xfce.succeed("xdotool click 1") # show the Applications menu + xfce.succeed("xdotool mousemove 10 200") + xfce.succeed("xdotool click 1") + xfce.wait_for_text("Pareto Security") + + # Test 6: paretosecurity:// URL handler is registered + xfce.execute("su - alice -c 'xdg-open paretosecurity://foo >/dev/null &'") + xfce.wait_for_text("Failed to add device") + ''; } diff --git a/nixos/tests/pdns-recursor.nix b/nixos/tests/pdns-recursor.nix index 42a227ae8eb5..0c326d7db965 100644 --- a/nixos/tests/pdns-recursor.nix +++ b/nixos/tests/pdns-recursor.nix @@ -1,20 +1,25 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "powerdns-recursor"; +{ lib, pkgs, ... }: - nodes.server = - { ... }: - { - services.pdns-recursor.enable = true; - services.pdns-recursor.exportHosts = true; - networking.hosts."192.0.2.1" = [ "example.com" ]; - }; +{ + name = "powerdns-recursor"; + meta.maintainers = with lib.maintainers; [ rnhmjoj ]; - testScript = '' + nodes.server = { + services.pdns-recursor.enable = true; + services.pdns-recursor.exportHosts = true; + services.pdns-recursor.old-settings.dnssec-log-bogus = true; + networking.hosts."192.0.2.1" = [ "example.com" ]; + }; + + testScript = '' + with subtest("pdns-recursor is running"): server.wait_for_unit("pdns-recursor") server.wait_for_open_port(53) + + with subtest("can resolve names"): assert "192.0.2.1" in server.succeed("host example.com localhost") - ''; - } -) + + with subtest("old-settings have been merged in"): + server.succeed("${lib.getExe pkgs.yq-go} -e .dnssec.log_bogus /etc/pdns-recursor/recursor.yml") + ''; +} diff --git a/nixos/tests/pgbackrest/default.nix b/nixos/tests/pgbackrest/default.nix new file mode 100644 index 000000000000..5f837e5c351c --- /dev/null +++ b/nixos/tests/pgbackrest/default.nix @@ -0,0 +1,5 @@ +{ runTest }: +{ + posix = runTest ./posix.nix; + sftp = runTest ./sftp.nix; +} diff --git a/nixos/tests/pgbackrest/posix.nix b/nixos/tests/pgbackrest/posix.nix new file mode 100644 index 000000000000..d5bfaa6d310c --- /dev/null +++ b/nixos/tests/pgbackrest/posix.nix @@ -0,0 +1,147 @@ +{ lib, pkgs, ... }: +let + inherit (import ../ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; + backupPath = "/var/lib/pgbackrest"; +in +{ + name = "pgbackrest-posix"; + + meta = { + maintainers = with lib.maintainers; [ wolfgangwalther ]; + }; + + nodes.primary = + { + pkgs, + ... + }: + { + services.openssh.enable = true; + users.users.postgres.openssh.authorizedKeys.keys = [ + snakeOilPublicKey + ]; + + services.postgresql = { + enable = true; + initialScript = pkgs.writeText "init.sql" '' + CREATE TABLE t(c text); + INSERT INTO t VALUES ('hello world'); + ''; + }; + + services.pgbackrest = { + enable = true; + repos.backup = { + type = "posix"; + path = backupPath; + host-user = "pgbackrest"; + }; + }; + }; + + nodes.backup = + { + nodes, + ... + }: + { + services.openssh.enable = true; + users.users.pgbackrest.openssh.authorizedKeys.keys = [ + snakeOilPublicKey + ]; + + services.pgbackrest = { + enable = true; + repos.localhost.path = backupPath; + + stanzas.default = { + jobs.future = { + schedule = "3000-01-01"; + type = "full"; + }; + instances.primary = { + path = nodes.primary.services.postgresql.dataDir; + user = "postgres"; + }; + }; + + # Examples from https://pgbackrest.org/configuration.html#introduction + # Not used for the test, except for dumping the config. + stanzas.config-format.settings = { + start-fast = true; + compress-level = 3; + buffer-size = "2MiB"; + db-timeout = 600; + db-exclude = [ + "db1" + "db2" + "db5" + ]; + tablespace-map = { + ts_01 = "/db/ts_01"; + ts_02 = "/db/ts_02"; + }; + }; + }; + }; + + testScript = + { nodes, ... }: + '' + start_all() + + primary.wait_for_unit("multi-user.target") + backup.wait_for_unit("multi-user.target") + + with subtest("config file is written correctly"): + from textwrap import dedent + have = backup.succeed("cat /etc/pgbackrest/pgbackrest.conf") + want = dedent("""\ + [config-format] + buffer-size=2MiB + compress-level=3 + db-exclude=db1 + db-exclude=db2 + db-exclude=db5 + db-timeout=600 + start-fast=y + tablespace-map=ts_01=/db/ts_01 + tablespace-map=ts_02=/db/ts_02 + """) + assert want in have, repr((want, have)) + + primary.log(primary.succeed(""" + HOME="${nodes.primary.services.postgresql.dataDir}" + mkdir -m 700 -p ~/.ssh + cat ${snakeOilPrivateKey} > ~/.ssh/id_ecdsa + chmod 400 ~/.ssh/id_ecdsa + ssh-keyscan backup >> ~/.ssh/known_hosts + chown -R postgres:postgres ~/.ssh + """)) + + backup.log(backup.succeed(""" + HOME="${backupPath}" + mkdir -m 700 -p ~/.ssh + cat ${snakeOilPrivateKey} > ~/.ssh/id_ecdsa + chmod 400 ~/.ssh/id_ecdsa + ssh-keyscan primary >> ~/.ssh/known_hosts + chown -R pgbackrest:pgbackrest ~ + """)) + + with subtest("backup/restore works with remote instance/local repo (SSH)"): + backup.succeed("sudo -u pgbackrest pgbackrest --stanza=default stanza-create") + backup.succeed("sudo -u pgbackrest pgbackrest --stanza=default check") + + backup.systemctl("start pgbackrest-default-future") + + # corrupt cluster + primary.systemctl("stop postgresql") + primary.execute("rm ${nodes.primary.services.postgresql.dataDir}/global/pg_control") + + primary.succeed("sudo -u postgres pgbackrest --stanza=default restore --delta") + + primary.systemctl("start postgresql") + primary.wait_for_unit("postgresql.service") + assert "hello world" in primary.succeed("sudo -u postgres psql -c 'TABLE t;'") + ''; +} diff --git a/nixos/tests/pgbackrest/sftp.nix b/nixos/tests/pgbackrest/sftp.nix new file mode 100644 index 000000000000..8e97fb679980 --- /dev/null +++ b/nixos/tests/pgbackrest/sftp.nix @@ -0,0 +1,95 @@ +{ lib, pkgs, ... }: +let + inherit (import ../ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; + backupPath = "/home/backup"; +in +{ + name = "pgbackrest-sftp"; + + meta = { + maintainers = with lib.maintainers; [ wolfgangwalther ]; + }; + + nodes.primary = + { + pkgs, + ... + }: + { + services.postgresql = { + enable = true; + initialScript = pkgs.writeText "init.sql" '' + CREATE TABLE t(c text); + INSERT INTO t VALUES ('hello world'); + ''; + }; + + services.pgbackrest = { + enable = true; + repos.backup = { + type = "sftp"; + path = "/home/backup"; + sftp-host-key-check-type = "none"; + sftp-host-key-hash-type = "sha256"; + sftp-host-user = "backup"; + sftp-private-key-file = "/var/lib/pgbackrest/sftp_key"; + }; + + stanzas.default.jobs.future = { + schedule = "3000-01-01"; + type = "diff"; + }; + }; + }; + + nodes.backup = + { + nodes, + ... + }: + { + services.openssh.enable = true; + users.users.backup = { + name = "backup"; + group = "backup"; + isNormalUser = true; + createHome = true; + openssh.authorizedKeys.keys = [ + snakeOilPublicKey + ]; + }; + users.groups.backup = { }; + }; + + testScript = + { nodes, ... }: + '' + start_all() + + primary.wait_for_unit("multi-user.target") + backup.wait_for_unit("multi-user.target") + + primary.log(primary.succeed(""" + HOME="/var/lib/pgbackrest" + cat ${snakeOilPrivateKey} > ~/sftp_key + chown -R pgbackrest:pgbackrest ~/sftp_key + chmod 770 ~ + """)) + + with subtest("backup/restore works with local instance/remote repo (SFTP)"): + primary.succeed("sudo -u pgbackrest pgbackrest --stanza=default stanza-create", timeout=10) + primary.succeed("sudo -u pgbackrest pgbackrest --stanza=default check") + + primary.systemctl("start pgbackrest-default-future") + + # corrupt cluster + primary.systemctl("stop postgresql") + primary.execute("rm ${nodes.primary.services.postgresql.dataDir}/global/pg_control") + + primary.succeed("sudo -u postgres pgbackrest --stanza=default restore --delta") + + primary.systemctl("start postgresql") + primary.wait_for_unit("postgresql.service") + assert "hello world" in primary.succeed("sudo -u postgres psql -c 'TABLE t;'") + ''; +} diff --git a/nixos/tests/playwright-python.nix b/nixos/tests/playwright-python.nix index 02d7b1cc5b9d..e479f3a91517 100644 --- a/nixos/tests/playwright-python.nix +++ b/nixos/tests/playwright-python.nix @@ -21,6 +21,7 @@ import ./make-test-python.nix ( } '' import sys + import re from playwright.sync_api import sync_playwright from playwright.sync_api import expect @@ -29,6 +30,7 @@ import ./make-test-python.nix ( "firefox": {}, "webkit": {} } + needle = re.compile("Nix.*Reference Manual") if len(sys.argv) != 3 or sys.argv[1] not in browsers.keys(): print(f"usage: {sys.argv[0]} [{'|'.join(browsers.keys())}] ") sys.exit(1) @@ -42,7 +44,7 @@ import ./make-test-python.nix ( context = browser.new_context() page = context.new_page() page.goto(url) - expect(page.get_by_text("Nix Reference Manual")).to_be_visible() + expect(page.get_by_text(needle)).to_be_visible() '' ) ]; diff --git a/nixos/tests/please.nix b/nixos/tests/please.nix index 9efd9649ec0f..6b461bff4938 100644 --- a/nixos/tests/please.nix +++ b/nixos/tests/please.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ( { lib, ... }: { name = "please"; - meta.maintainers = with lib.maintainers; [ azahi ]; + meta.maintainers = [ ]; nodes.machine = { ... }: diff --git a/nixos/tests/pocket-id.nix b/nixos/tests/pocket-id.nix new file mode 100644 index 000000000000..753fa251473f --- /dev/null +++ b/nixos/tests/pocket-id.nix @@ -0,0 +1,47 @@ +import ./make-test-python.nix ( + { lib, ... }: + + { + name = "pocket-id"; + meta.maintainers = with lib.maintainers; [ + gepbird + ymstnt + ]; + + nodes = { + machine = + { ... }: + { + services.pocket-id = { + enable = true; + settings = { + PORT = 10001; + INTERNAL_BACKEND_URL = "http://localhost:10002"; + BACKEND_PORT = 10002; + }; + }; + }; + }; + + testScript = + { nodes, ... }: + let + inherit (nodes.machine.services.pocket-id) settings; + inherit (builtins) toString; + in + '' + machine.wait_for_unit("pocket-id-backend.service") + machine.wait_for_open_port(${toString settings.BACKEND_PORT}) + machine.wait_for_unit("pocket-id-frontend.service") + machine.wait_for_open_port(${toString settings.PORT}) + + backend_status = machine.succeed("curl -L -o /tmp/backend-output -w '%{http_code}' http://localhost:${toString settings.BACKEND_PORT}/api/users/me") + assert backend_status == "401" + machine.succeed("grep 'You are not signed in' /tmp/backend-output") + + frontend_status = machine.succeed("curl -L -o /tmp/frontend-output -w '%{http_code}' http://localhost:${toString settings.PORT}") + assert frontend_status == "200" + machine.succeed("grep 'Sign in to Pocket ID' /tmp/frontend-output") + ''; + } +) diff --git a/nixos/tests/postgres-websockets.nix b/nixos/tests/postgres-websockets.nix new file mode 100644 index 000000000000..c3badf22383e --- /dev/null +++ b/nixos/tests/postgres-websockets.nix @@ -0,0 +1,84 @@ +{ lib, ... }: +{ + name = "postgres-websockets"; + + meta = { + maintainers = with lib.maintainers; [ wolfgangwalther ]; + }; + + nodes.machine = + { + config, + lib, + pkgs, + ... + }: + { + environment.systemPackages = [ pkgs.websocat ]; + + services.postgresql = { + enable = true; + initialScript = pkgs.writeText "init.sql" '' + CREATE ROLE "postgres-websockets" LOGIN NOINHERIT; + CREATE ROLE "postgres-websockets_with_password" LOGIN NOINHERIT PASSWORD 'password'; + ''; + }; + + services.postgres-websockets = { + enable = true; + jwtSecretFile = "/run/secrets/jwt.secret"; + environment.PGWS_DB_URI.dbname = "postgres"; + environment.PGWS_LISTEN_CHANNEL = "websockets-listener"; + }; + + specialisation.withPassword.configuration = { + services.postgresql.enableTCPIP = true; + services.postgres-websockets = { + pgpassFile = "/run/secrets/.pgpass"; + environment.PGWS_DB_URI.host = "localhost"; + environment.PGWS_DB_URI.user = "postgres-websockets_with_password"; + }; + }; + }; + + extraPythonPackages = p: [ p.pyjwt ]; + + testScript = + { nodes, ... }: + let + withPassword = "${nodes.machine.system.build.toplevel}/specialisation/withPassword"; + in + '' + machine.execute(""" + mkdir -p /run/secrets + echo reallyreallyreallyreallyverysafe > /run/secrets/jwt.secret + """) + + import jwt + token = jwt.encode({ "mode": "rw" }, "reallyreallyreallyreallyverysafe") + + def test(): + machine.wait_for_unit("postgresql.service") + machine.wait_for_unit("postgres-websockets.service") + + machine.succeed(f"echo 'hi there' | websocat --no-close 'ws://localhost:3000/test/{token}' > output &") + machine.sleep(1) + machine.succeed("grep 'hi there' output") + + machine.succeed(""" + sudo -u postgres psql -c "SELECT pg_notify('websockets-listener', json_build_object('channel', 'test', 'event', 'message', 'payload', 'Hello World')::text);" >/dev/null + """) + machine.sleep(1) + machine.succeed("grep 'Hello World' output") + + with subtest("without password"): + test() + + with subtest("with password"): + machine.execute(""" + echo "*:*:*:*:password" > /run/secrets/.pgpass + """) + machine.succeed("${withPassword}/bin/switch-to-configuration test >&2") + test() + ''; +} diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix index d59a26f101e8..77c38f9344ef 100644 --- a/nixos/tests/postgresql/anonymizer.nix +++ b/nixos/tests/postgresql/anonymizer.nix @@ -20,7 +20,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; extensions = ps: [ ps.anonymizer ]; settings.shared_preload_libraries = [ "anon" ]; }; diff --git a/nixos/tests/postgresql/citus.nix b/nixos/tests/postgresql/citus.nix deleted file mode 100644 index 6739b32d5642..000000000000 --- a/nixos/tests/postgresql/citus.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - pkgs, - makeTest, - genTests, -}: - -let - inherit (pkgs) lib; - - test-sql = pkgs.writeText "postgresql-test" '' - CREATE EXTENSION citus; - - CREATE TABLE examples ( - id bigserial, - shard_key int, - PRIMARY KEY (id, shard_key) - ); - - SELECT create_distributed_table('examples', 'shard_key'); - - INSERT INTO examples (shard_key) SELECT shard % 10 FROM generate_series(1,1000) shard; - ''; - - makeTestFor = - package: - makeTest { - name = "citus-${package.name}"; - meta = with lib.maintainers; { - maintainers = [ typetetris ]; - }; - - nodes.machine = - { ... }: - { - services.postgresql = { - inherit package; - enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; - extensions = - ps: with ps; [ - citus - ]; - settings = { - shared_preload_libraries = "citus"; - }; - }; - }; - - testScript = '' - def check_count(statement, lines): - return 'test $(sudo -u postgres psql postgres -tAc "{}") -eq {}'.format( - statement, lines - ) - - - machine.start() - machine.wait_for_unit("postgresql") - - with subtest("Postgresql with extension citus is available just after unit start"): - machine.succeed( - "sudo -u postgres psql -f ${test-sql}" - ) - - machine.succeed(check_count("SELECT count(*) FROM examples;", 1000)) - - machine.shutdown() - ''; - }; -in -genTests { - inherit makeTestFor; - filter = _: p: !p.pkgs.citus.meta.broken; -} diff --git a/nixos/tests/postgresql/default.nix b/nixos/tests/postgresql/default.nix index 474f54a17201..f7266c2e9db2 100644 --- a/nixos/tests/postgresql/default.nix +++ b/nixos/tests/postgresql/default.nix @@ -36,10 +36,6 @@ in # extensions anonymizer = importWithArgs ./anonymizer.nix; - citus = importWithArgs ./citus.nix; pgjwt = importWithArgs ./pgjwt.nix; - pgvecto-rs = importWithArgs ./pgvecto-rs.nix; - timescaledb = importWithArgs ./timescaledb.nix; - tsja = importWithArgs ./tsja.nix; wal2json = importWithArgs ./wal2json.nix; } diff --git a/nixos/tests/postgresql/pgjwt.nix b/nixos/tests/postgresql/pgjwt.nix index f00d9a939d3d..9a5e12bc3d7d 100644 --- a/nixos/tests/postgresql/pgjwt.nix +++ b/nixos/tests/postgresql/pgjwt.nix @@ -24,7 +24,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; extensions = ps: with ps; [ pgjwt diff --git a/nixos/tests/postgresql/pgvecto-rs.nix b/nixos/tests/postgresql/pgvecto-rs.nix deleted file mode 100644 index 506ef921acb7..000000000000 --- a/nixos/tests/postgresql/pgvecto-rs.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - pkgs, - makeTest, - genTests, -}: - -let - inherit (pkgs) lib; - - # Test cases from https://docs.vectorchord.ai/use-case/hybrid-search.html - test-sql = pkgs.writeText "postgresql-test" '' - CREATE EXTENSION vectors; - - CREATE TABLE items ( - id bigserial PRIMARY KEY, - content text NOT NULL, - embedding vectors.vector(3) NOT NULL -- 3 dimensions - ); - - INSERT INTO items (content, embedding) VALUES - ('a fat cat sat on a mat and ate a fat rat', '[1, 2, 3]'), - ('a fat dog sat on a mat and ate a fat rat', '[4, 5, 6]'), - ('a thin cat sat on a mat and ate a thin rat', '[7, 8, 9]'), - ('a thin dog sat on a mat and ate a thin rat', '[10, 11, 12]'); - ''; - - makeTestFor = - package: - makeTest { - name = "pgvecto-rs-${package.name}"; - meta = with lib.maintainers; { - maintainers = [ diogotcorreia ]; - }; - - nodes.machine = - { ... }: - { - services.postgresql = { - inherit package; - enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; - extensions = - ps: with ps; [ - pgvecto-rs - ]; - settings.shared_preload_libraries = "vectors"; - }; - }; - - testScript = - { nodes, ... }: - let - inherit (nodes.machine.services.postgresql.package.pkgs) pgvecto-rs; - in - '' - def check_count(statement, lines): - return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( - statement, lines - ) - - - machine.start() - machine.wait_for_unit("postgresql") - - with subtest("Postgresql with extension vectors is available just after unit start"): - machine.succeed(check_count("SELECT * FROM pg_available_extensions WHERE name = 'vectors' AND default_version = '${pgvecto-rs.version}';", 1)) - - machine.succeed("sudo -u postgres psql -f ${test-sql}") - - machine.succeed(check_count("SELECT content, embedding FROM items WHERE to_tsvector('english', content) @@ 'cat & rat'::tsquery;", 2)) - - machine.shutdown() - ''; - }; -in -genTests { - inherit makeTestFor; - filter = _: p: !p.pkgs.pgvecto-rs.meta.broken; -} diff --git a/nixos/tests/postgresql/postgresql-jit.nix b/nixos/tests/postgresql/postgresql-jit.nix index e082ff141327..53d35b3e9d64 100644 --- a/nixos/tests/postgresql/postgresql-jit.nix +++ b/nixos/tests/postgresql/postgresql-jit.nix @@ -51,5 +51,4 @@ let in genTests { inherit makeTestFor; - filter = n: _: lib.hasSuffix "_jit" n; } diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix index 117b9b0e24a9..6cb86d1ff8fc 100644 --- a/nixos/tests/postgresql/postgresql-tls-client-cert.nix +++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix @@ -51,7 +51,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; enableTCPIP = true; ensureUsers = [ { diff --git a/nixos/tests/postgresql/postgresql-wal-receiver.nix b/nixos/tests/postgresql/postgresql-wal-receiver.nix index c99c3889c027..70f9983700c2 100644 --- a/nixos/tests/postgresql/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql/postgresql-wal-receiver.nix @@ -32,7 +32,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; settings = { max_replication_slots = 10; max_wal_senders = 10; diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix index 7741d14808eb..ecf1b5552804 100644 --- a/nixos/tests/postgresql/postgresql.nix +++ b/nixos/tests/postgresql/postgresql.nix @@ -15,41 +15,33 @@ let postgresql-clauses = makeEnsureTestFor package; }; - test-sql = - enablePLv8Test: - pkgs.writeText "postgresql-test" ( - '' - CREATE EXTENSION pgcrypto; -- just to check if lib loading works - CREATE TABLE sth ( - id int - ); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - CREATE TABLE xmltest ( doc xml ); - INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled - '' - + lib.optionalString enablePLv8Test '' - -- check if hardening gets relaxed - CREATE EXTENSION plv8; - -- try to trigger the V8 JIT, which requires MemoryDenyWriteExecute - DO $$ - let xs = []; - for (let i = 0, n = 400000; i < n; i++) { - xs.push(Math.round(Math.random() * n)) - } - console.log(xs.reduce((acc, x) => acc + x, 0)); - $$ LANGUAGE plv8; - '' + test-sql = pkgs.writeText "postgresql-test" ('' + CREATE EXTENSION pgcrypto; -- just to check if lib loading works + CREATE TABLE sth ( + id int ); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + CREATE TABLE xmltest ( doc xml ); + INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled + + -- check if hardening gets relaxed + CREATE EXTENSION plv8; + -- try to trigger the V8 JIT, which requires MemoryDenyWriteExecute + DO $$ + let xs = []; + for (let i = 0, n = 400000; i < n; i++) { + xs.push(Math.round(Math.random() * n)) + } + console.log(xs.reduce((acc, x) => acc + x, 0)); + $$ LANGUAGE plv8; + ''); makeTestForWithBackupAll = package: backupAll: - let - enablePLv8Check = !package.pkgs.plv8.meta.broken; - in makeTest { name = "postgresql${lib.optionalString backupAll "-backup-all"}-${package.name}"; meta = with lib.maintainers; { @@ -62,12 +54,12 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; - # plv8 doesn't support postgresql with JIT, so we only run the test - # for the non-jit variant. + identMap = '' + postgres root postgres + ''; # TODO(@Ma27) split this off into its own VM test and move a few other # extension tests to use postgresqlTestExtension. - extensions = lib.mkIf enablePLv8Check (ps: with ps; [ plv8 ]); + extensions = ps: with ps; [ plv8 ]; }; services.postgresqlBackup = { @@ -84,7 +76,7 @@ let in '' def check_count(statement, lines): - return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( + return 'test $(psql -U postgres postgres -tAc "{}"|wc -l) -eq {}'.format( statement, lines ) @@ -94,7 +86,7 @@ let with subtest("Postgresql is available just after unit start"): machine.succeed( - "cat ${test-sql enablePLv8Check} | sudo -u postgres psql" + "cat ${test-sql} | sudo -u postgres psql" ) with subtest("Postgresql survives restart (bug #1735)"): @@ -184,7 +176,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; ensureUsers = [ { name = "all-clauses"; diff --git a/nixos/tests/postgresql/timescaledb.nix b/nixos/tests/postgresql/timescaledb.nix deleted file mode 100644 index 7ad8b0fcc972..000000000000 --- a/nixos/tests/postgresql/timescaledb.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - pkgs, - makeTest, - genTests, -}: - -let - inherit (pkgs) lib; - - test-sql = pkgs.writeText "postgresql-test" '' - CREATE EXTENSION timescaledb; - CREATE EXTENSION timescaledb_toolkit; - - CREATE TABLE sth ( - time TIMESTAMPTZ NOT NULL, - value DOUBLE PRECISION - ); - - SELECT create_hypertable('sth', 'time'); - - INSERT INTO sth (time, value) VALUES - ('2003-04-12 04:05:06 America/New_York', 1.0), - ('2003-04-12 04:05:07 America/New_York', 2.0), - ('2003-04-12 04:05:08 America/New_York', 3.0), - ('2003-04-12 04:05:09 America/New_York', 4.0), - ('2003-04-12 04:05:10 America/New_York', 5.0) - ; - - WITH t AS ( - SELECT - time_bucket('1 day'::interval, time) AS dt, - stats_agg(value) AS stats - FROM sth - GROUP BY time_bucket('1 day'::interval, time) - ) - SELECT - average(stats) - FROM t; - - SELECT * FROM sth; - ''; - - makeTestFor = - package: - makeTest { - name = "timescaledb-${package.name}"; - meta = with lib.maintainers; { - maintainers = [ typetetris ]; - }; - - nodes.machine = - { ... }: - { - services.postgresql = { - inherit package; - enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; - extensions = - ps: with ps; [ - timescaledb - timescaledb_toolkit - ]; - settings = { - shared_preload_libraries = "timescaledb, timescaledb_toolkit"; - }; - }; - }; - - testScript = '' - def check_count(statement, lines): - return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( - statement, lines - ) - - - machine.start() - machine.wait_for_unit("postgresql") - - with subtest("Postgresql with extensions timescaledb and timescaledb_toolkit is available just after unit start"): - machine.succeed( - "sudo -u postgres psql -f ${test-sql}" - ) - - machine.fail(check_count("SELECT * FROM sth;", 3)) - machine.succeed(check_count("SELECT * FROM sth;", 5)) - machine.fail(check_count("SELECT * FROM sth;", 4)) - - machine.shutdown() - ''; - }; -in -# Not run by default, because this requires allowUnfree. -# To run these tests: -# NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.postgresql.timescaledb -lib.dontRecurseIntoAttrs (genTests { - inherit makeTestFor; - filter = _: p: !p.pkgs.timescaledb.meta.broken; -}) diff --git a/nixos/tests/postgresql/tsja.nix b/nixos/tests/postgresql/tsja.nix deleted file mode 100644 index 4cc5bd124139..000000000000 --- a/nixos/tests/postgresql/tsja.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - pkgs, - makeTest, - genTests, -}: - -let - inherit (pkgs) lib; - - makeTestFor = - package: - makeTest { - name = "tsja-${package.name}"; - meta = { - maintainers = with lib.maintainers; [ chayleaf ]; - }; - - nodes.master = - { ... }: - { - services.postgresql = { - inherit package; - enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; - extensions = - ps: with ps; [ - tsja - ]; - }; - }; - - testScript = '' - start_all() - master.wait_for_unit("postgresql") - master.succeed("sudo -u postgres psql -f /run/current-system/sw/share/postgresql/extension/libtsja_dbinit.sql") - # make sure "日本語" is parsed as a separate lexeme - master.succeed(""" - sudo -u postgres \\ - psql -c "SELECT * FROM ts_debug('japanese', 'PostgreSQLで日本語のテキスト検索ができます。')" \\ - | grep "{日本語}" - """) - ''; - }; -in -genTests { - inherit makeTestFor; - filter = _: p: !p.pkgs.tsja.meta.broken; -} diff --git a/nixos/tests/postgresql/wal2json.nix b/nixos/tests/postgresql/wal2json.nix index abfe60673753..1252264353f8 100644 --- a/nixos/tests/postgresql/wal2json.nix +++ b/nixos/tests/postgresql/wal2json.nix @@ -17,7 +17,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; extensions = with package.pkgs; [ wal2json ]; settings = { wal_level = "logical"; diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 5fee5c6a4989..890bc207a326 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -1,141 +1,138 @@ # Test printing via CUPS. +{ + pkgs, + socket ? true, # whether to use socket activation + listenTcp ? true, # whether to open port 631 on client + ... +}: -import ./make-test-python.nix ( - { - pkgs, - socket ? true, # whether to use socket activation - listenTcp ? true, # whether to open port 631 on client - ... - }: +let + inherit (pkgs) lib; +in - let - inherit (pkgs) lib; - in +{ + name = "printing"; + meta = with lib.maintainers; { + maintainers = [ + domenkozar + matthewbauer + ]; + }; - { - name = "printing"; - meta = with lib.maintainers; { - maintainers = [ - domenkozar - matthewbauer + nodes.server = + { ... }: + { + services.printing = { + enable = true; + stateless = true; + startWhenNeeded = socket; + listenAddresses = [ "*:631" ]; + defaultShared = true; + openFirewall = true; + extraConf = '' + + Order allow,deny + Allow from all + + ''; + }; + # Add a HP Deskjet printer connected via USB to the server. + hardware.printers.ensurePrinters = [ + { + name = "DeskjetLocal"; + deviceUri = "usb://foobar/printers/foobar"; + model = "drv:///sample.drv/deskjet.ppd"; + } ]; }; - nodes.server = - { ... }: - { - services.printing = { - enable = true; - stateless = true; - startWhenNeeded = socket; - listenAddresses = [ "*:631" ]; - defaultShared = true; - openFirewall = true; - extraConf = '' - - Order allow,deny - Allow from all - - ''; - }; - # Add a HP Deskjet printer connected via USB to the server. - hardware.printers.ensurePrinters = [ - { - name = "DeskjetLocal"; - deviceUri = "usb://foobar/printers/foobar"; - model = "drv:///sample.drv/deskjet.ppd"; - } - ]; - }; + nodes.client = + { lib, ... }: + { + services.printing.enable = true; + services.printing.startWhenNeeded = socket; + services.printing.listenAddresses = lib.mkIf (!listenTcp) [ ]; + # Add printer to the client as well, via IPP. + hardware.printers.ensurePrinters = [ + { + name = "DeskjetRemote"; + deviceUri = "ipp://server/printers/DeskjetLocal"; + model = "drv:///sample.drv/deskjet.ppd"; + } + ]; + hardware.printers.ensureDefaultPrinter = "DeskjetRemote"; + }; - nodes.client = - { lib, ... }: - { - services.printing.enable = true; - services.printing.startWhenNeeded = socket; - services.printing.listenAddresses = lib.mkIf (!listenTcp) [ ]; - # Add printer to the client as well, via IPP. - hardware.printers.ensurePrinters = [ - { - name = "DeskjetRemote"; - deviceUri = "ipp://server/printers/DeskjetLocal"; - model = "drv:///sample.drv/deskjet.ppd"; - } - ]; - hardware.printers.ensureDefaultPrinter = "DeskjetRemote"; - }; + testScript = '' + import os + import re - testScript = '' - import os - import re + start_all() - start_all() + with subtest("Make sure that cups is up on both sides and printers are set up"): + server.wait_for_unit("ensure-printers.service") + client.wait_for_unit("ensure-printers.service") - with subtest("Make sure that cups is up on both sides and printers are set up"): - server.wait_for_unit("ensure-printers.service") - client.wait_for_unit("ensure-printers.service") + assert "scheduler is running" in client.succeed("lpstat -r") - assert "scheduler is running" in client.succeed("lpstat -r") + with subtest("UNIX socket is used for connections"): + assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H") - with subtest("UNIX socket is used for connections"): - assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H") + with subtest("HTTP server is available too"): + ${lib.optionalString listenTcp ''client.succeed("curl --fail http://localhost:631/")''} + client.succeed(f"curl --fail http://{server.name}:631/") + server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/") - with subtest("HTTP server is available too"): - ${lib.optionalString listenTcp ''client.succeed("curl --fail http://localhost:631/")''} - client.succeed(f"curl --fail http://{server.name}:631/") - server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/") + with subtest("LP status checks"): + assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a") + assert "DeskjetLocal accepting requests" in client.succeed( + f"lpstat -h {server.name}:631 -a" + ) + client.succeed("cupsdisable DeskjetRemote") + out = client.succeed("lpq") + print(out) + assert re.search( + "DeskjetRemote is not ready.*no entries", + client.succeed("lpq"), + flags=re.DOTALL, + ) + client.succeed("cupsenable DeskjetRemote") + assert re.match( + "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL + ) - with subtest("LP status checks"): - assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a") - assert "DeskjetLocal accepting requests" in client.succeed( - f"lpstat -h {server.name}:631 -a" - ) - client.succeed("cupsdisable DeskjetRemote") - out = client.succeed("lpq") - print(out) - assert re.search( - "DeskjetRemote is not ready.*no entries", - client.succeed("lpq"), - flags=re.DOTALL, - ) - client.succeed("cupsenable DeskjetRemote") - assert re.match( - "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL - ) + # Test printing various file types. + for file in [ + "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", + "${pkgs.groff.doc}/share/doc/*/meref.ps", + "${pkgs.cups.out}/share/doc/cups/images/cups.png", + "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt", + ]: + file_name = os.path.basename(file) + with subtest(f"print {file_name}"): + # Print the file on the client. + print(client.succeed("lpq")) + client.succeed(f"lp {file}") + client.wait_until_succeeds( + f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'" + ) - # Test printing various file types. - for file in [ - "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", - "${pkgs.groff.doc}/share/doc/*/meref.ps", - "${pkgs.cups.out}/share/doc/cups/images/cups.png", - "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt", - ]: - file_name = os.path.basename(file) - with subtest(f"print {file_name}"): - # Print the file on the client. - print(client.succeed("lpq")) - client.succeed(f"lp {file}") - client.wait_until_succeeds( - f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'" - ) + # Ensure that a raw PCL file appeared in the server's queue + # (showing that the right filters have been applied). Of + # course, since there is no actual USB printer attached, the + # file will stay in the queue forever. + server.wait_for_file("/var/spool/cups/d*-001") + server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'") - # Ensure that a raw PCL file appeared in the server's queue - # (showing that the right filters have been applied). Of - # course, since there is no actual USB printer attached, the - # file will stay in the queue forever. - server.wait_for_file("/var/spool/cups/d*-001") - server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'") + # Delete the job on the client. It should disappear on the + # server as well. + client.succeed("lprm") + client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'") - # Delete the job on the client. It should disappear on the - # server as well. - client.succeed("lprm") - client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'") + retry(lambda _: "no entries" in server.succeed("lpq -a")) - retry(lambda _: "no entries" in server.succeed("lpq -a")) - - # The queue is empty already, so this should be safe. - # Otherwise, pairs of "c*"-"d*-001" files might persist. - server.execute("rm /var/spool/cups/*") - ''; - } -) + # The queue is empty already, so this should be safe. + # Otherwise, pairs of "c*"-"d*-001" files might persist. + server.execute("rm /var/spool/cups/*") + ''; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 46b8d13364c6..ef356dbc7bb1 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -407,6 +407,20 @@ let ''; }; + ebpf = { + exporterConfig = { + enable = true; + names = [ "timers" ]; + }; + exporterTest = '' + wait_for_unit("prometheus-ebpf-exporter.service") + wait_for_open_port(9435) + succeed( + "curl -sSf http://localhost:9435/metrics | grep 'ebpf_exporter_enabled_configs{name=\"timers\"} 1'" + ) + ''; + }; + fastly = { exporterConfig = { enable = true; diff --git a/nixos/tests/prometheus/alertmanager-ntfy.nix b/nixos/tests/prometheus/alertmanager-ntfy.nix new file mode 100644 index 000000000000..8015354cbb57 --- /dev/null +++ b/nixos/tests/prometheus/alertmanager-ntfy.nix @@ -0,0 +1,99 @@ +{ lib, ... }: + +let + ports = { + alertmanager-ntfy = 8000; + ntfy-sh = 8001; + alertmanager = 8002; + }; +in + +{ + name = "alertmanager-ntfy"; + meta.maintainers = with lib.maintainers; [ defelo ]; + + nodes.machine = { + services.prometheus.alertmanager = { + enable = true; + listenAddress = "127.0.0.1"; + port = ports.alertmanager; + + configuration = { + route = { + receiver = "test"; + group_by = [ "..." ]; + group_wait = "0s"; + group_interval = "1s"; + repeat_interval = "2h"; + }; + + receivers = [ + { + name = "test"; + webhook_configs = [ { url = "http://127.0.0.1:${toString ports.alertmanager-ntfy}/hook"; } ]; + } + ]; + }; + }; + + services.prometheus.alertmanager-ntfy = { + enable = true; + settings = { + http.addr = "127.0.0.1:${toString ports.alertmanager-ntfy}"; + ntfy = { + baseurl = "http://127.0.0.1:${toString ports.ntfy-sh}"; + notification.topic = "alertmanager"; + }; + }; + }; + + services.ntfy-sh = { + enable = true; + settings = { + listen-http = "127.0.0.1:${toString ports.ntfy-sh}"; + base-url = "http://127.0.0.1:${toString ports.ntfy-sh}"; + }; + }; + }; + + interactive.nodes.machine = { + services.prometheus.alertmanager.listenAddress = lib.mkForce "0.0.0.0"; + services.prometheus.alertmanager-ntfy.settings.http.addr = + lib.mkForce "0.0.0.0:${toString ports.alertmanager-ntfy}"; + services.ntfy-sh.settings.listen-http = lib.mkForce "0.0.0.0:${toString ports.ntfy-sh}"; + networking.firewall.enable = false; + virtualisation.forwardPorts = lib.mapAttrsToList (_: port: { + from = "host"; + host = { inherit port; }; + guest = { inherit port; }; + }) ports; + }; + + testScript = '' + import json + import time + + machine.wait_for_unit("alertmanager.service") + machine.wait_for_unit("alertmanager-ntfy.service") + machine.wait_for_unit("ntfy-sh.service") + machine.wait_for_open_port(${toString ports.alertmanager}) + machine.wait_for_open_port(${toString ports.alertmanager-ntfy}) + machine.wait_for_open_port(${toString ports.ntfy-sh}) + + machine.succeed("""curl 127.0.0.1:${toString ports.alertmanager}/api/v2/alerts \ + -X POST -H 'Content-Type: application/json' \ + -d '[{ \ + "labels": {"alertname": "test"}, + "annotations": {"summary": "alert summary", "description": "alert description"} \ + }]'""") + + while not (resp := machine.succeed("curl '127.0.0.1:${toString ports.ntfy-sh}/alertmanager/json?poll=1'")): + time.sleep(1) + + msg = json.loads(resp) + assert msg["title"] == "alert summary" + assert msg["message"] == "alert description" + assert msg["priority"] == 4 + assert "red_circle" in msg["tags"] + ''; +} diff --git a/nixos/tests/prometheus/alertmanager.nix b/nixos/tests/prometheus/alertmanager.nix index 51151cbab534..794bbb8aab90 100644 --- a/nixos/tests/prometheus/alertmanager.nix +++ b/nixos/tests/prometheus/alertmanager.nix @@ -1,160 +1,146 @@ -import ../make-test-python.nix ( - { lib, pkgs, ... }: +{ pkgs, ... }: - { - name = "prometheus-alertmanager"; +{ + name = "prometheus-alertmanager"; - nodes = { - prometheus = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; + nodes = { + prometheus = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; - networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; - services.prometheus = { - enable = true; - globalConfig.scrape_interval = "2s"; + services.prometheus = { + enable = true; + globalConfig.scrape_interval = "2s"; - alertmanagers = [ - { - scheme = "http"; - static_configs = [ - { - targets = [ - "alertmanager:${toString config.services.prometheus.alertmanager.port}" - ]; - } - ]; - } - ]; - - rules = [ - '' - groups: - - name: test - rules: - - alert: InstanceDown - expr: up == 0 - for: 5s - labels: - severity: page - annotations: - summary: "Instance {{ $labels.instance }} down" - '' - ]; - - scrapeConfigs = [ - { - job_name = "alertmanager"; - static_configs = [ - { - targets = [ - "alertmanager:${toString config.services.prometheus.alertmanager.port}" - ]; - } - ]; - } - { - job_name = "node"; - static_configs = [ - { - targets = [ - "node:${toString config.services.prometheus.exporters.node.port}" - ]; - } - ]; - } - ]; - }; - }; - - alertmanager = - { config, pkgs, ... }: - { - services.prometheus.alertmanager = { - enable = true; - openFirewall = true; - - configuration = { - global = { - resolve_timeout = "1m"; - }; - - route = { - # Root route node - receiver = "test"; - group_by = [ "..." ]; - continue = false; - group_wait = "1s"; - group_interval = "15s"; - repeat_interval = "24h"; - }; - - receivers = [ - { - name = "test"; - webhook_configs = [ - { - url = "http://logger:6725"; - send_resolved = true; - max_alerts = 0; - } - ]; - } + alertmanagers = [ + { + scheme = "http"; + static_configs = [ + { targets = [ "alertmanager:${toString config.services.prometheus.alertmanager.port}" ]; } ]; + } + ]; + + rules = [ + '' + groups: + - name: test + rules: + - alert: InstanceDown + expr: up == 0 + for: 5s + labels: + severity: page + annotations: + summary: "Instance {{ $labels.instance }} down" + '' + ]; + + scrapeConfigs = [ + { + job_name = "alertmanager"; + static_configs = [ + { targets = [ "alertmanager:${toString config.services.prometheus.alertmanager.port}" ]; } + ]; + } + { + job_name = "node"; + static_configs = [ + { targets = [ "node:${toString config.services.prometheus.exporters.node.port}" ]; } + ]; + } + ]; + }; + }; + + alertmanager = + { config, pkgs, ... }: + { + services.prometheus.alertmanager = { + enable = true; + openFirewall = true; + + configuration = { + global = { + resolve_timeout = "1m"; }; + + route = { + # Root route node + receiver = "test"; + group_by = [ "..." ]; + continue = false; + group_wait = "1s"; + group_interval = "15s"; + repeat_interval = "24h"; + }; + + receivers = [ + { + name = "test"; + webhook_configs = [ + { + url = "http://logger:6725"; + send_resolved = true; + max_alerts = 0; + } + ]; + } + ]; }; }; + }; - logger = - { config, pkgs, ... }: - { - networking.firewall.allowedTCPPorts = [ 6725 ]; + logger = + { config, pkgs, ... }: + { + networking.firewall.allowedTCPPorts = [ 6725 ]; - services.prometheus.alertmanagerWebhookLogger.enable = true; - }; - }; + services.prometheus.alertmanagerWebhookLogger.enable = true; + }; + }; - testScript = '' - alertmanager.wait_for_unit("alertmanager") - alertmanager.wait_for_open_port(9093) - alertmanager.wait_until_succeeds("curl -s http://127.0.0.1:9093/-/ready") - #alertmanager.wait_until_succeeds("journalctl -o cat -u alertmanager.service | grep 'version=${pkgs.prometheus-alertmanager.version}'") + testScript = '' + alertmanager.wait_for_unit("alertmanager") + alertmanager.wait_for_open_port(9093) + alertmanager.wait_until_succeeds("curl -s http://127.0.0.1:9093/-/ready") + #alertmanager.wait_until_succeeds("journalctl -o cat -u alertmanager.service | grep 'version=${pkgs.prometheus-alertmanager.version}'") - logger.wait_for_unit("alertmanager-webhook-logger") - logger.wait_for_open_port(6725) + logger.wait_for_unit("alertmanager-webhook-logger") + logger.wait_for_open_port(6725) - prometheus.wait_for_unit("prometheus") - prometheus.wait_for_open_port(9090) + prometheus.wait_for_unit("prometheus") + prometheus.wait_for_open_port(9090) - prometheus.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(up\{job=\"alertmanager\"\}==1)' | " - + "jq '.data.result[0].value[1]' | grep '\"1\"'" - ) + prometheus.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(up\{job=\"alertmanager\"\}==1)' | " + + "jq '.data.result[0].value[1]' | grep '\"1\"'" + ) - prometheus.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=sum(alertmanager_build_info)%20by%20(version)' | " - + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-alertmanager.version}\"'" - ) + prometheus.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=sum(alertmanager_build_info)%20by%20(version)' | " + + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-alertmanager.version}\"'" + ) - prometheus.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(up\{job=\"node\"\}!=1)' | " - + "jq '.data.result[0].value[1]' | grep '\"1\"'" - ) + prometheus.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(up\{job=\"node\"\}!=1)' | " + + "jq '.data.result[0].value[1]' | grep '\"1\"'" + ) - prometheus.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=alertmanager_notifications_total\{integration=\"webhook\"\}' | " - + "jq '.data.result[0].value[1]' | grep -v '\"0\"'" - ) + prometheus.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=alertmanager_notifications_total\{integration=\"webhook\"\}' | " + + "jq '.data.result[0].value[1]' | grep -v '\"0\"'" + ) - logger.wait_until_succeeds( - "journalctl -o cat -u alertmanager-webhook-logger.service | grep '\"alertname\":\"InstanceDown\"'" - ) + logger.wait_until_succeeds( + "journalctl -o cat -u alertmanager-webhook-logger.service | grep '\"alertname\":\"InstanceDown\"'" + ) - logger.log(logger.succeed("systemd-analyze security alertmanager-webhook-logger.service | grep -v '✓'")) + logger.log(logger.succeed("systemd-analyze security alertmanager-webhook-logger.service | grep -v '✓'")) - alertmanager.log(alertmanager.succeed("systemd-analyze security alertmanager.service | grep -v '✓'")) - ''; - } -) + alertmanager.log(alertmanager.succeed("systemd-analyze security alertmanager.service | grep -v '✓'")) + ''; +} diff --git a/nixos/tests/prometheus/config-reload.nix b/nixos/tests/prometheus/config-reload.nix index 60f5bc6a1d23..bb20d249fe9c 100644 --- a/nixos/tests/prometheus/config-reload.nix +++ b/nixos/tests/prometheus/config-reload.nix @@ -1,120 +1,108 @@ -import ../make-test-python.nix ( - { lib, pkgs, ... }: +{ + name = "prometheus-config-reload"; - { - name = "prometheus-config-reload"; + nodes = { + prometheus = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; - nodes = { - prometheus = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; - networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + services.prometheus = { + enable = true; + enableReload = true; + globalConfig.scrape_interval = "2s"; + scrapeConfigs = [ + { + job_name = "prometheus"; + static_configs = [ { targets = [ "prometheus:${toString config.services.prometheus.port}" ]; } ]; + } + ]; + }; - services.prometheus = { - enable = true; - enableReload = true; - globalConfig.scrape_interval = "2s"; - scrapeConfigs = [ - { - job_name = "prometheus"; - static_configs = [ + specialisation = { + "prometheus-config-change" = { + configuration = { + environment.systemPackages = [ pkgs.yq ]; + + # This configuration just adds a new prometheus job + # to scrape the node_exporter metrics of the s3 machine. + services.prometheus = { + scrapeConfigs = [ { - targets = [ - "prometheus:${toString config.services.prometheus.port}" + job_name = "node"; + static_configs = [ + { targets = [ "node:${toString config.services.prometheus.exporters.node.port}" ]; } ]; } ]; - } - ]; - }; - - specialisation = { - "prometheus-config-change" = { - configuration = { - environment.systemPackages = [ pkgs.yq ]; - - # This configuration just adds a new prometheus job - # to scrape the node_exporter metrics of the s3 machine. - services.prometheus = { - scrapeConfigs = [ - { - job_name = "node"; - static_configs = [ - { - targets = [ "node:${toString config.services.prometheus.exporters.node.port}" ]; - } - ]; - } - ]; - }; }; }; }; }; - }; + }; + }; - testScript = '' - prometheus.wait_for_unit("prometheus") - prometheus.wait_for_open_port(9090) + testScript = '' + prometheus.wait_for_unit("prometheus") + prometheus.wait_for_open_port(9090) - # Check if switching to a NixOS configuration that changes the prometheus - # configuration reloads (instead of restarts) prometheus before the switch - # finishes successfully: - with subtest("config change reloads prometheus"): - import json - # We check if prometheus has finished reloading by looking for the message - # "Completed loading of configuration file" in the journal between the start - # and finish of switching to the new NixOS configuration. - # - # To mark the start we record the journal cursor before starting the switch: - cursor_before_switching = json.loads( - prometheus.succeed("journalctl -n1 -o json --output-fields=__CURSOR") - )["__CURSOR"] + # Check if switching to a NixOS configuration that changes the prometheus + # configuration reloads (instead of restarts) prometheus before the switch + # finishes successfully: + with subtest("config change reloads prometheus"): + import json + # We check if prometheus has finished reloading by looking for the message + # "Completed loading of configuration file" in the journal between the start + # and finish of switching to the new NixOS configuration. + # + # To mark the start we record the journal cursor before starting the switch: + cursor_before_switching = json.loads( + prometheus.succeed("journalctl -n1 -o json --output-fields=__CURSOR") + )["__CURSOR"] - # Now we switch: - prometheus_config_change = prometheus.succeed( - "readlink /run/current-system/specialisation/prometheus-config-change" - ).strip() - prometheus.succeed(prometheus_config_change + "/bin/switch-to-configuration test") + # Now we switch: + prometheus_config_change = prometheus.succeed( + "readlink /run/current-system/specialisation/prometheus-config-change" + ).strip() + prometheus.succeed(prometheus_config_change + "/bin/switch-to-configuration test") - # Next we retrieve all logs since the start of switching: - logs_after_starting_switching = prometheus.succeed( - """ - journalctl --after-cursor='{cursor_before_switching}' -o json --output-fields=MESSAGE - """.format( - cursor_before_switching=cursor_before_switching - ) - ) - - # Finally we check if the message "Completed loading of configuration file" - # occurs before the "finished switching to system configuration" message: - finished_switching_msg = ( - "finished switching to system configuration " + prometheus_config_change - ) - reloaded_before_switching_finished = False - finished_switching = False - for log_line in logs_after_starting_switching.split("\n"): - msg = json.loads(log_line)["MESSAGE"] - if "Completed loading of configuration file" in msg: - reloaded_before_switching_finished = True - if msg == finished_switching_msg: - finished_switching = True - break - - assert reloaded_before_switching_finished - assert finished_switching - - # Check if the reloaded config includes the new node job: - prometheus.succeed( + # Next we retrieve all logs since the start of switching: + logs_after_starting_switching = prometheus.succeed( """ - curl -sf http://127.0.0.1:9090/api/v1/status/config \ - | jq -r .data.yaml \ - | yq '.scrape_configs | any(.job_name == "node")' \ - | grep true - """ - ) - ''; - } -) + journalctl --after-cursor='{cursor_before_switching}' -o json --output-fields=MESSAGE + """.format( + cursor_before_switching=cursor_before_switching + ) + ) + + # Finally we check if the message "Completed loading of configuration file" + # occurs before the "finished switching to system configuration" message: + finished_switching_msg = ( + "finished switching to system configuration " + prometheus_config_change + ) + reloaded_before_switching_finished = False + finished_switching = False + for log_line in logs_after_starting_switching.split("\n"): + msg = json.loads(log_line)["MESSAGE"] + if "Completed loading of configuration file" in msg: + reloaded_before_switching_finished = True + if msg == finished_switching_msg: + finished_switching = True + break + + assert reloaded_before_switching_finished + assert finished_switching + + # Check if the reloaded config includes the new node job: + prometheus.succeed( + """ + curl -sf http://127.0.0.1:9090/api/v1/status/config \ + | jq -r .data.yaml \ + | yq '.scrape_configs | any(.job_name == "node")' \ + | grep true + """ + ) + ''; +} diff --git a/nixos/tests/prometheus/default.nix b/nixos/tests/prometheus/default.nix index ea6c61c85b80..53cfc80e8f64 100644 --- a/nixos/tests/prometheus/default.nix +++ b/nixos/tests/prometheus/default.nix @@ -1,14 +1,11 @@ -{ - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../../.. { inherit system config; }, -}: +{ runTest }: { - alertmanager = import ./alertmanager.nix { inherit system pkgs; }; - config-reload = import ./config-reload.nix { inherit system pkgs; }; - federation = import ./federation.nix { inherit system pkgs; }; - prometheus-pair = import ./prometheus-pair.nix { inherit system pkgs; }; - pushgateway = import ./pushgateway.nix { inherit system pkgs; }; - remote-write = import ./remote-write.nix { inherit system pkgs; }; + alertmanager = runTest ./alertmanager.nix; + alertmanager-ntfy = runTest ./alertmanager-ntfy.nix; + config-reload = runTest ./config-reload.nix; + federation = runTest ./federation.nix; + prometheus-pair = runTest ./prometheus-pair.nix; + pushgateway = runTest ./pushgateway.nix; + remote-write = runTest ./remote-write.nix; } diff --git a/nixos/tests/prometheus/federation.nix b/nixos/tests/prometheus/federation.nix index 15f84b2d88af..e81418dfba93 100644 --- a/nixos/tests/prometheus/federation.nix +++ b/nixos/tests/prometheus/federation.nix @@ -1,227 +1,203 @@ -import ../make-test-python.nix ( - { lib, pkgs, ... }: +{ + name = "prometheus-federation"; - { - name = "prometheus-federation"; + nodes = { + global1 = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; - nodes = { - global1 = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; - networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + services.prometheus = { + enable = true; + globalConfig.scrape_interval = "2s"; - services.prometheus = { - enable = true; - globalConfig.scrape_interval = "2s"; + scrapeConfigs = [ + { + job_name = "federate"; + honor_labels = true; + metrics_path = "/federate"; - scrapeConfigs = [ - { - job_name = "federate"; - honor_labels = true; - metrics_path = "/federate"; + params = { + "match[]" = [ + "{job=\"node\"}" + "{job=\"prometheus\"}" + ]; + }; - params = { - "match[]" = [ - "{job=\"node\"}" - "{job=\"prometheus\"}" + static_configs = [ + { + targets = [ + "prometheus1:${toString config.services.prometheus.port}" + "prometheus2:${toString config.services.prometheus.port}" ]; - }; - - static_configs = [ - { - targets = [ - "prometheus1:${toString config.services.prometheus.port}" - "prometheus2:${toString config.services.prometheus.port}" - ]; - } - ]; - } - { - job_name = "prometheus"; - static_configs = [ - { - targets = [ - "global1:${toString config.services.prometheus.port}" - "global2:${toString config.services.prometheus.port}" - ]; - } - ]; - } - ]; - }; - }; - - global2 = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; - - networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; - - services.prometheus = { - enable = true; - globalConfig.scrape_interval = "2s"; - - scrapeConfigs = [ - { - job_name = "federate"; - honor_labels = true; - metrics_path = "/federate"; - - params = { - "match[]" = [ - "{job=\"node\"}" - "{job=\"prometheus\"}" + } + ]; + } + { + job_name = "prometheus"; + static_configs = [ + { + targets = [ + "global1:${toString config.services.prometheus.port}" + "global2:${toString config.services.prometheus.port}" ]; - }; - - static_configs = [ - { - targets = [ - "prometheus1:${toString config.services.prometheus.port}" - "prometheus2:${toString config.services.prometheus.port}" - ]; - } - ]; - } - { - job_name = "prometheus"; - static_configs = [ - { - targets = [ - "global1:${toString config.services.prometheus.port}" - "global2:${toString config.services.prometheus.port}" - ]; - } - ]; - } - ]; - }; + } + ]; + } + ]; }; + }; - prometheus1 = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; + global2 = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; - networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; - services.prometheus = { - enable = true; - globalConfig.scrape_interval = "2s"; + services.prometheus = { + enable = true; + globalConfig.scrape_interval = "2s"; - scrapeConfigs = [ - { - job_name = "node"; - static_configs = [ - { - targets = [ - "node1:${toString config.services.prometheus.exporters.node.port}" - ]; - } + scrapeConfigs = [ + { + job_name = "federate"; + honor_labels = true; + metrics_path = "/federate"; + + params = { + "match[]" = [ + "{job=\"node\"}" + "{job=\"prometheus\"}" ]; - } - { - job_name = "prometheus"; - static_configs = [ - { - targets = [ - "prometheus1:${toString config.services.prometheus.port}" - ]; - } - ]; - } - ]; - }; + }; + + static_configs = [ + { + targets = [ + "prometheus1:${toString config.services.prometheus.port}" + "prometheus2:${toString config.services.prometheus.port}" + ]; + } + ]; + } + { + job_name = "prometheus"; + static_configs = [ + { + targets = [ + "global1:${toString config.services.prometheus.port}" + "global2:${toString config.services.prometheus.port}" + ]; + } + ]; + } + ]; }; + }; - prometheus2 = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; + prometheus1 = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; - networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; - services.prometheus = { - enable = true; - globalConfig.scrape_interval = "2s"; + services.prometheus = { + enable = true; + globalConfig.scrape_interval = "2s"; - scrapeConfigs = [ - { - job_name = "node"; - static_configs = [ - { - targets = [ - "node2:${toString config.services.prometheus.exporters.node.port}" - ]; - } - ]; - } - { - job_name = "prometheus"; - static_configs = [ - { - targets = [ - "prometheus2:${toString config.services.prometheus.port}" - ]; - } - ]; - } - ]; - }; + scrapeConfigs = [ + { + job_name = "node"; + static_configs = [ + { targets = [ "node1:${toString config.services.prometheus.exporters.node.port}" ]; } + ]; + } + { + job_name = "prometheus"; + static_configs = [ { targets = [ "prometheus1:${toString config.services.prometheus.port}" ]; } ]; + } + ]; }; + }; - node1 = - { config, pkgs, ... }: - { - services.prometheus.exporters.node = { - enable = true; - openFirewall = true; - }; + prometheus2 = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; + + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + + services.prometheus = { + enable = true; + globalConfig.scrape_interval = "2s"; + + scrapeConfigs = [ + { + job_name = "node"; + static_configs = [ + { targets = [ "node2:${toString config.services.prometheus.exporters.node.port}" ]; } + ]; + } + { + job_name = "prometheus"; + static_configs = [ { targets = [ "prometheus2:${toString config.services.prometheus.port}" ]; } ]; + } + ]; }; + }; - node2 = - { config, pkgs, ... }: - { - services.prometheus.exporters.node = { - enable = true; - openFirewall = true; - }; + node1 = + { config, pkgs, ... }: + { + services.prometheus.exporters.node = { + enable = true; + openFirewall = true; }; - }; + }; - testScript = '' - for machine in node1, node2: - machine.wait_for_unit("prometheus-node-exporter") - machine.wait_for_open_port(9100) + node2 = + { config, pkgs, ... }: + { + services.prometheus.exporters.node = { + enable = true; + openFirewall = true; + }; + }; + }; - for machine in prometheus1, prometheus2, global1, global2: - machine.wait_for_unit("prometheus") - machine.wait_for_open_port(9090) + testScript = '' + for machine in node1, node2: + machine.wait_for_unit("prometheus-node-exporter") + machine.wait_for_open_port(9100) - # Verify both servers got the same data from the exporter - for machine in prometheus1, prometheus2: - machine.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(up\{job=\"node\"\})' | " - + "jq '.data.result[0].value[1]' | grep '\"1\"'" - ) - machine.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(prometheus_build_info)' | " - + "jq '.data.result[0].value[1]' | grep '\"1\"'" - ) + for machine in prometheus1, prometheus2, global1, global2: + machine.wait_for_unit("prometheus") + machine.wait_for_open_port(9090) - for machine in global1, global2: - machine.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(up\{job=\"node\"\})' | " - + "jq '.data.result[0].value[1]' | grep '\"2\"'" - ) + # Verify both servers got the same data from the exporter + for machine in prometheus1, prometheus2: + machine.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(up\{job=\"node\"\})' | " + + "jq '.data.result[0].value[1]' | grep '\"1\"'" + ) + machine.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(prometheus_build_info)' | " + + "jq '.data.result[0].value[1]' | grep '\"1\"'" + ) - machine.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(prometheus_build_info)' | " - + "jq '.data.result[0].value[1]' | grep '\"4\"'" - ) - ''; - } -) + for machine in global1, global2: + machine.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(up\{job=\"node\"\})' | " + + "jq '.data.result[0].value[1]' | grep '\"2\"'" + ) + + machine.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(prometheus_build_info)' | " + + "jq '.data.result[0].value[1]' | grep '\"4\"'" + ) + ''; +} diff --git a/nixos/tests/prometheus/prometheus-pair.nix b/nixos/tests/prometheus/prometheus-pair.nix index 98860fa6bf95..6d8d5900480f 100644 --- a/nixos/tests/prometheus/prometheus-pair.nix +++ b/nixos/tests/prometheus/prometheus-pair.nix @@ -1,93 +1,91 @@ -import ../make-test-python.nix ( - { lib, pkgs, ... }: +{ pkgs, ... }: - { - name = "prometheus-pair"; +{ + name = "prometheus-pair"; - nodes = { - prometheus1 = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; + nodes = { + prometheus1 = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; - networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; - services.prometheus = { - enable = true; - globalConfig.scrape_interval = "2s"; - scrapeConfigs = [ - { - job_name = "prometheus"; - static_configs = [ - { - targets = [ - "prometheus1:${toString config.services.prometheus.port}" - "prometheus2:${toString config.services.prometheus.port}" - ]; - } - ]; - } - ]; - }; + services.prometheus = { + enable = true; + globalConfig.scrape_interval = "2s"; + scrapeConfigs = [ + { + job_name = "prometheus"; + static_configs = [ + { + targets = [ + "prometheus1:${toString config.services.prometheus.port}" + "prometheus2:${toString config.services.prometheus.port}" + ]; + } + ]; + } + ]; }; + }; - prometheus2 = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; + prometheus2 = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; - networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; - services.prometheus = { - enable = true; - globalConfig.scrape_interval = "2s"; - scrapeConfigs = [ - { - job_name = "prometheus"; - static_configs = [ - { - targets = [ - "prometheus1:${toString config.services.prometheus.port}" - "prometheus2:${toString config.services.prometheus.port}" - ]; - } - ]; - } - ]; - }; + services.prometheus = { + enable = true; + globalConfig.scrape_interval = "2s"; + scrapeConfigs = [ + { + job_name = "prometheus"; + static_configs = [ + { + targets = [ + "prometheus1:${toString config.services.prometheus.port}" + "prometheus2:${toString config.services.prometheus.port}" + ]; + } + ]; + } + ]; }; - }; + }; + }; - testScript = '' - for machine in prometheus1, prometheus2: - machine.wait_for_unit("prometheus") - machine.wait_for_open_port(9090) - machine.wait_until_succeeds("journalctl -o cat -u prometheus.service | grep 'version=${pkgs.prometheus.version}'") - machine.wait_until_succeeds("curl -sSf http://localhost:9090/-/healthy") + testScript = '' + for machine in prometheus1, prometheus2: + machine.wait_for_unit("prometheus") + machine.wait_for_open_port(9090) + machine.wait_until_succeeds("journalctl -o cat -u prometheus.service | grep 'version=${pkgs.prometheus.version}'") + machine.wait_until_succeeds("curl -sSf http://localhost:9090/-/healthy") - # Prometheii ready - run some queries - for machine in prometheus1, prometheus2: - machine.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=prometheus_build_info\{instance=\"prometheus1:9090\",version=\"${pkgs.prometheus.version}\"\}' | " - + "jq '.data.result[0].value[1]' | grep '\"1\"'" - ) + # Prometheii ready - run some queries + for machine in prometheus1, prometheus2: + machine.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=prometheus_build_info\{instance=\"prometheus1:9090\",version=\"${pkgs.prometheus.version}\"\}' | " + + "jq '.data.result[0].value[1]' | grep '\"1\"'" + ) - machine.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=prometheus_build_info\{instance=\"prometheus1:9090\"\}' | " - + "jq '.data.result[0].value[1]' | grep '\"1\"'" - ) + machine.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=prometheus_build_info\{instance=\"prometheus1:9090\"\}' | " + + "jq '.data.result[0].value[1]' | grep '\"1\"'" + ) - machine.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=sum(prometheus_build_info)%20by%20(version)' | " - + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus.version}\"'" - ) + machine.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=sum(prometheus_build_info)%20by%20(version)' | " + + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus.version}\"'" + ) - machine.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=sum(prometheus_build_info)%20by%20(version)' | " - + "jq '.data.result[0].value[1]' | grep '\"2\"'" - ) + machine.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=sum(prometheus_build_info)%20by%20(version)' | " + + "jq '.data.result[0].value[1]' | grep '\"2\"'" + ) - prometheus1.log(prometheus1.succeed("systemd-analyze security prometheus.service | grep -v '✓'")) - ''; - } -) + prometheus1.log(prometheus1.succeed("systemd-analyze security prometheus.service | grep -v '✓'")) + ''; +} diff --git a/nixos/tests/prometheus/pushgateway.nix b/nixos/tests/prometheus/pushgateway.nix index fb8b6c091aa1..6b13447085d9 100644 --- a/nixos/tests/prometheus/pushgateway.nix +++ b/nixos/tests/prometheus/pushgateway.nix @@ -1,102 +1,91 @@ -import ../make-test-python.nix ( - { lib, pkgs, ... }: +{ pkgs, ... }: - { - name = "prometheus-pushgateway"; +{ + name = "prometheus-pushgateway"; - nodes = { - prometheus = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; + nodes = { + prometheus = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; - networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; - services.prometheus = { - enable = true; - globalConfig.scrape_interval = "2s"; + services.prometheus = { + enable = true; + globalConfig.scrape_interval = "2s"; - scrapeConfigs = [ - { - job_name = "pushgateway"; - static_configs = [ - { - targets = [ - "pushgateway:9091" - ]; - } - ]; - } - ]; - }; + scrapeConfigs = [ + { + job_name = "pushgateway"; + static_configs = [ { targets = [ "pushgateway:9091" ]; } ]; + } + ]; }; + }; - pushgateway = - { config, pkgs, ... }: - { - networking.firewall.allowedTCPPorts = [ 9091 ]; + pushgateway = + { config, pkgs, ... }: + { + networking.firewall.allowedTCPPorts = [ 9091 ]; - services.prometheus.pushgateway = { - enable = true; - }; + services.prometheus.pushgateway = { + enable = true; }; + }; - client = - { config, pkgs, ... }: - { - }; - }; + client = { config, pkgs, ... }: { }; + }; - testScript = '' - pushgateway.wait_for_unit("pushgateway") - pushgateway.wait_for_open_port(9091) - pushgateway.wait_until_succeeds("curl -s http://127.0.0.1:9091/-/ready") - pushgateway.wait_until_succeeds("journalctl -o cat -u pushgateway.service | grep 'version=${pkgs.prometheus-pushgateway.version}'") + testScript = '' + pushgateway.wait_for_unit("pushgateway") + pushgateway.wait_for_open_port(9091) + pushgateway.wait_until_succeeds("curl -s http://127.0.0.1:9091/-/ready") + pushgateway.wait_until_succeeds("journalctl -o cat -u pushgateway.service | grep 'version=${pkgs.prometheus-pushgateway.version}'") - prometheus.wait_for_unit("prometheus") - prometheus.wait_for_open_port(9090) + prometheus.wait_for_unit("prometheus") + prometheus.wait_for_open_port(9090) - prometheus.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(up\{job=\"pushgateway\"\})' | " - + "jq '.data.result[0].value[1]' | grep '\"1\"'" - ) + prometheus.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=count(up\{job=\"pushgateway\"\})' | " + + "jq '.data.result[0].value[1]' | grep '\"1\"'" + ) - prometheus.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=sum(pushgateway_build_info)%20by%20(version)' | " - + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-pushgateway.version}\"'" - ) + prometheus.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=sum(pushgateway_build_info)%20by%20(version)' | " + + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-pushgateway.version}\"'" + ) - # Add a metric and check in Prometheus - client.wait_until_succeeds( - "echo 'some_metric 3.14' | curl --data-binary @- http://pushgateway:9091/metrics/job/some_job" - ) + # Add a metric and check in Prometheus + client.wait_until_succeeds( + "echo 'some_metric 3.14' | curl --data-binary @- http://pushgateway:9091/metrics/job/some_job" + ) - prometheus.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=some_metric' | " - + "jq '.data.result[0].value[1]' | grep '\"3.14\"'" - ) + prometheus.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=some_metric' | " + + "jq '.data.result[0].value[1]' | grep '\"3.14\"'" + ) - prometheus.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=absent(some_metric)' | " - + "jq '.data.result[0].value[1]' | grep 'null'" - ) + prometheus.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=absent(some_metric)' | " + + "jq '.data.result[0].value[1]' | grep 'null'" + ) - # Delete the metric, check not in Prometheus - client.wait_until_succeeds( - "curl -X DELETE http://pushgateway:9091/metrics/job/some_job" - ) + # Delete the metric, check not in Prometheus + client.wait_until_succeeds( + "curl -X DELETE http://pushgateway:9091/metrics/job/some_job" + ) - prometheus.wait_until_fails( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=some_metric' | " - + "jq '.data.result[0].value[1]' | grep '\"3.14\"'" - ) + prometheus.wait_until_fails( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=some_metric' | " + + "jq '.data.result[0].value[1]' | grep '\"3.14\"'" + ) - prometheus.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=absent(some_metric)' | " - + "jq '.data.result[0].value[1]' | grep '\"1\"'" - ) + prometheus.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=absent(some_metric)' | " + + "jq '.data.result[0].value[1]' | grep '\"1\"'" + ) - pushgateway.log(pushgateway.succeed("systemd-analyze security pushgateway.service | grep -v '✓'")) - ''; - } -) + pushgateway.log(pushgateway.succeed("systemd-analyze security pushgateway.service | grep -v '✓'")) + ''; +} diff --git a/nixos/tests/prometheus/remote-write.nix b/nixos/tests/prometheus/remote-write.nix index 86c14901a6b0..23458c737e1a 100644 --- a/nixos/tests/prometheus/remote-write.nix +++ b/nixos/tests/prometheus/remote-write.nix @@ -1,81 +1,69 @@ -import ../make-test-python.nix ( - { lib, pkgs, ... }: +{ + name = "prometheus-remote-write"; - { - name = "prometheus-remote-write"; + nodes = { + receiver = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; - nodes = { - receiver = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; - networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + services.prometheus = { + enable = true; + globalConfig.scrape_interval = "2s"; - services.prometheus = { - enable = true; - globalConfig.scrape_interval = "2s"; - - extraFlags = [ "--web.enable-remote-write-receiver" ]; - }; + extraFlags = [ "--web.enable-remote-write-receiver" ]; }; + }; - prometheus = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; + prometheus = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; - networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; - services.prometheus = { - enable = true; - globalConfig.scrape_interval = "2s"; + services.prometheus = { + enable = true; + globalConfig.scrape_interval = "2s"; - remoteWrite = [ - { - url = "http://receiver:9090/api/v1/write"; - } - ]; + remoteWrite = [ { url = "http://receiver:9090/api/v1/write"; } ]; - scrapeConfigs = [ - { - job_name = "node"; - static_configs = [ - { - targets = [ - "node:${toString config.services.prometheus.exporters.node.port}" - ]; - } - ]; - } - ]; - }; + scrapeConfigs = [ + { + job_name = "node"; + static_configs = [ + { targets = [ "node:${toString config.services.prometheus.exporters.node.port}" ]; } + ]; + } + ]; }; + }; - node = - { config, pkgs, ... }: - { - services.prometheus.exporters.node = { - enable = true; - openFirewall = true; - }; + node = + { config, pkgs, ... }: + { + services.prometheus.exporters.node = { + enable = true; + openFirewall = true; }; - }; + }; + }; - testScript = '' - node.wait_for_unit("prometheus-node-exporter") - node.wait_for_open_port(9100) + testScript = '' + node.wait_for_unit("prometheus-node-exporter") + node.wait_for_open_port(9100) - for machine in prometheus, receiver: - machine.wait_for_unit("prometheus") - machine.wait_for_open_port(9090) + for machine in prometheus, receiver: + machine.wait_for_unit("prometheus") + machine.wait_for_open_port(9090) - # Verify both servers got the same data from the exporter - for machine in prometheus, receiver: - machine.wait_until_succeeds( - "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=node_exporter_build_info\{instance=\"node:9100\"\}' | " - + "jq '.data.result[0].value[1]' | grep '\"1\"'" - ) - ''; - } -) + # Verify both servers got the same data from the exporter + for machine in prometheus, receiver: + machine.wait_until_succeeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=node_exporter_build_info\{instance=\"node:9100\"\}' | " + + "jq '.data.result[0].value[1]' | grep '\"1\"'" + ) + ''; +} diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 52513b424bb4..cb6dba27a64c 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -56,7 +56,7 @@ import ./make-test-python.nix ( # The password is the plaintext that was encrypted with rabbitmqctl encode above. machine.wait_until_succeeds( - '${pkgs.rabbitmq-java-client}/bin/PerfTest --time 10 --uri amqp://alice:dJT8isYu6t0Xb6u56rPglSj1vK51SlNVlXfwsRxw@localhost' + 'echo Hello World | ${pkgs.lib.getExe pkgs.amqpcat} --producer --uri=amqp://alice:dJT8isYu6t0Xb6u56rPglSj1vK51SlNVlXfwsRxw@localhost --queue test' ) ''; } diff --git a/nixos/tests/reposilite.nix b/nixos/tests/reposilite.nix new file mode 100644 index 000000000000..f66a95b47a1d --- /dev/null +++ b/nixos/tests/reposilite.nix @@ -0,0 +1,53 @@ +{ lib, ... }: +{ + name = "reposilite"; + + nodes = { + machine = + { pkgs, ... }: + { + services = { + mysql = { + enable = true; + package = pkgs.mariadb; + ensureDatabases = [ "reposilite" ]; + initialScript = pkgs.writeText "reposilite-test-db-init" '' + CREATE USER 'reposilite'@'localhost' IDENTIFIED BY 'ReposiliteDBPass'; + GRANT ALL PRIVILEGES ON reposilite.* TO 'reposilite'@'localhost'; + FLUSH PRIVILEGES; + ''; + }; + + reposilite = { + enable = true; + plugins = with pkgs.reposilitePlugins; [ + checksum + groovy + ]; + extraArgs = [ + "--token" + "test:SuperSecretTestToken" + ]; + database = { + type = "mariadb"; + passwordFile = "/run/reposiliteDbPass"; + }; + settings.port = 8080; + }; + }; + }; + }; + + testScript = '' + machine.start() + + machine.execute("echo \"ReposiliteDBPass\" > /run/reposiliteDbPass && chmod 600 /run/reposiliteDbPass && chown reposilite:reposilite /run/reposiliteDbPass") + machine.wait_for_unit("reposilite.service") + machine.wait_for_open_port(8080) + + machine.fail("curl -Sf localhost:8080/api/auth/me") + machine.succeed("curl -Sfu test:SuperSecretTestToken localhost:8080/api/auth/me") + ''; + + meta.maintainers = [ lib.maintainers.uku3lig ]; +} diff --git a/nixos/tests/rsyncd.nix b/nixos/tests/rsyncd.nix index b75b3e011143..9935c0e6c6bf 100644 --- a/nixos/tests/rsyncd.nix +++ b/nixos/tests/rsyncd.nix @@ -15,13 +15,15 @@ import ./make-test-python.nix ( enable = true; inherit socketActivated; settings = { - global = { + globalSection = { "reverse lookup" = false; "forward lookup" = false; }; - tmp = { - path = "/nix/store"; - comment = "test module"; + sections = { + tmp = { + path = "/nix/store"; + comment = "test module"; + }; }; }; }; diff --git a/nixos/tests/rush.nix b/nixos/tests/rush.nix new file mode 100644 index 000000000000..0fcd87d15f58 --- /dev/null +++ b/nixos/tests/rush.nix @@ -0,0 +1,88 @@ +{ pkgs, ... }: +let + inherit (import ./ssh-keys.nix pkgs) snakeOilEd25519PrivateKey snakeOilEd25519PublicKey; + username = "nix-remote-builder"; +in +{ + name = "rush"; + meta = { inherit (pkgs.rush.meta) maintainers platforms; }; + + nodes = { + client = + { ... }: + { + nix.settings.extra-experimental-features = [ "nix-command" ]; + }; + + server = + { config, ... }: + { + nix.settings.trusted-users = [ "${username}" ]; + + programs.rush = { + enable = true; + global = "debug 1"; + + rules = { + daemon = '' + match $# == 2 + match $0 == "nix-daemon" + match $1 == "--stdio" + match $user == "${username}" + chdir "${config.nix.package}/bin" + ''; + + whoami = '' + match $# == 1 + match $0 == "whoami" + match $user == "${username}" + chdir "${dirOf config.environment.usrbinenv}" + ''; + }; + }; + + services.openssh = { + enable = true; + + extraConfig = '' + Match User ${username} + AllowAgentForwarding no + AllowTcpForwarding no + PermitTTY no + PermitTunnel no + X11Forwarding no + Match All + ''; + }; + + users = { + groups."${username}" = { }; + + users."${username}" = { + inherit (config.programs.rush) shell; + group = "${username}"; + isSystemUser = true; + openssh.authorizedKeys.keys = [ snakeOilEd25519PublicKey ]; + }; + }; + }; + }; + + testScript = '' + start_all() + + client.succeed("mkdir -m 700 /root/.ssh") + client.succeed("cat '${snakeOilEd25519PrivateKey}' | tee /root/.ssh/id_ed25519") + client.succeed("chmod 600 /root/.ssh/id_ed25519") + + server.wait_for_unit("sshd") + + client.succeed("ssh-keyscan -H server | tee -a /root/.ssh/known_hosts") + + client.succeed("ssh ${username}@server -- whoami") + client.succeed("nix store info --store 'ssh-ng://${username}@server'") + + client.fail("ssh ${username}@server -- date") + client.fail("nix store info --store 'ssh://${username}@server'") + ''; +} diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix index 96f63730b613..b9f2f1384559 100644 --- a/nixos/tests/samba.nix +++ b/nixos/tests/samba.nix @@ -1,50 +1,48 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "samba"; +{ lib, ... }: +{ + name = "samba"; - meta.maintainers = [ lib.maintainers.anthonyroussel ]; + meta.maintainers = [ lib.maintainers.anthonyroussel ]; - nodes = { - client = - { ... }: - { - virtualisation.fileSystems = { - "/public" = { - fsType = "cifs"; - device = "//server/public"; - options = [ "guest" ]; + nodes = { + client = + { ... }: + { + virtualisation.fileSystems = { + "/public" = { + fsType = "cifs"; + device = "//server/public"; + options = [ "guest" ]; + }; + }; + }; + + server = + { ... }: + { + services.samba = { + enable = true; + openFirewall = true; + settings = { + "public" = { + "path" = "/public"; + "read only" = true; + "browseable" = "yes"; + "guest ok" = "yes"; + "comment" = "Public samba share."; }; }; }; + }; + }; - server = - { ... }: - { - services.samba = { - enable = true; - openFirewall = true; - settings = { - "public" = { - "path" = "/public"; - "read only" = true; - "browseable" = "yes"; - "guest ok" = "yes"; - "comment" = "Public samba share."; - }; - }; - }; - }; - }; + testScript = '' + server.start() + server.wait_for_unit("samba.target") + server.succeed("mkdir -p /public; echo bar > /public/foo") - testScript = '' - server.start() - server.wait_for_unit("samba.target") - server.succeed("mkdir -p /public; echo bar > /public/foo") - - client.start() - client.wait_for_unit("remote-fs.target") - client.succeed("[[ $(cat /public/foo) = bar ]]") - ''; - } -) + client.start() + client.wait_for_unit("remote-fs.target") + client.succeed("[[ $(cat /public/foo) = bar ]]") + ''; +} diff --git a/nixos/tests/scion/freestanding-deployment/default.nix b/nixos/tests/scion/freestanding-deployment/default.nix index ca6c7cffc30e..7dbd10c225a5 100644 --- a/nixos/tests/scion/freestanding-deployment/default.nix +++ b/nixos/tests/scion/freestanding-deployment/default.nix @@ -23,7 +23,7 @@ import ../../make-test-python.nix ( networkConfig.Address = "192.168.1.${toString hostId}/24"; }; environment.etc = { - "scion/topology.json".source = ./topology${toString hostId}.json; + "scion/topology.json".source = ./topology + "${toString hostId}.json"; "scion/crypto/as".source = trust-root-configuration-keys + "/AS${toString hostId}"; "scion/certs/ISD42-B1-S1.trc".source = trust-root-configuration-keys + "/ISD42-B1-S1.trc"; "scion/keys/master0.key".text = "U${toString hostId}v4k23ZXjGDwDofg/Eevw=="; diff --git a/nixos/tests/scx/default.nix b/nixos/tests/scx/default.nix new file mode 100644 index 000000000000..67627d0ed3e3 --- /dev/null +++ b/nixos/tests/scx/default.nix @@ -0,0 +1,42 @@ +{ pkgs, ... }: + +{ + name = "scx_full"; + meta = { + inherit (pkgs.scx.full.meta) maintainers; + }; + + nodes.machine = { + boot.kernelPackages = pkgs.linuxPackages_latest; + services.scx.enable = true; + + specialisation = { + bpfland.configuration.services.scx.scheduler = "scx_bpfland"; + central.configuration.services.scx.scheduler = "scx_central"; + lavd.configuration.services.scx.scheduler = "scx_lavd"; + rlfifo.configuration.services.scx.scheduler = "scx_rlfifo"; + rustland.configuration.services.scx.scheduler = "scx_rustland"; + rusty.configuration.services.scx.scheduler = "scx_rusty"; + }; + }; + + testScript = '' + specialisation = [ + "bpfland", + "central", + "lavd", + "rlfifo", + "rustland", + "rusty" + ] + + def activate_specialisation(name: str): + machine.succeed(f"/run/booted-system/specialisation/{name}/bin/switch-to-configuration test >&2") + + for sched in specialisation: + with subtest(f"{sched}"): + activate_specialisation(sched) + machine.succeed("systemctl restart scx.service") + machine.succeed(f"ps -U root -u root u | grep scx_{sched}") + ''; +} diff --git a/nixos/tests/send.nix b/nixos/tests/send.nix index b02f083fef9f..fb0021ce0b78 100644 --- a/nixos/tests/send.nix +++ b/nixos/tests/send.nix @@ -1,9 +1,16 @@ -{ lib, pkgs, ... }: +{ + lib, + pkgs, + ... +}: { name = "send"; meta = { - maintainers = with lib.maintainers; [ moraxyc ]; + maintainers = with lib.maintainers; [ + moraxyc + MrSom3body + ]; }; nodes.machine = diff --git a/nixos/tests/shadps4.nix b/nixos/tests/shadps4.nix index a41f952d6cb8..71d056cf001b 100644 --- a/nixos/tests/shadps4.nix +++ b/nixos/tests/shadps4.nix @@ -3,7 +3,6 @@ name = "shadps4-openorbis-example"; meta = { inherit (pkgs.shadps4.meta) maintainers; - platforms = lib.intersectLists lib.platforms.linux pkgs.shadps4.meta.platforms; }; nodes.machine = diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix index 22b21f4bcecf..eb9f7b4f5b58 100644 --- a/nixos/tests/signal-desktop.nix +++ b/nixos/tests/signal-desktop.nix @@ -1,82 +1,79 @@ -import ./make-test-python.nix ( - { pkgs, ... }: +{ pkgs, ... }: +let + sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" '' + set -eu - let - sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" '' - set -eu + readonly CFG=~/.config/Signal/config.json + readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)" + readonly DB="$1" + readonly SQL="SELECT * FROM sqlite_master where type='table'" + ${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL" + ''; +in +{ + name = "signal-desktop"; + meta = with pkgs.lib.maintainers; { + maintainers = [ + flokli + primeos + ]; + }; - readonly CFG=~/.config/Signal/config.json - readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)" - readonly DB="$1" - readonly SQL="SELECT * FROM sqlite_master where type='table'" - ${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL" - ''; - in - { - name = "signal-desktop"; - meta = with pkgs.lib.maintainers; { - maintainers = [ - flokli - primeos + nodes.machine = + { ... }: + + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + services.xserver.enable = true; + test-support.displayManager.auto.user = "alice"; + environment.systemPackages = with pkgs; [ + signal-desktop + file + sqlite + sqlcipher-signal ]; }; - nodes.machine = - { ... }: + enableOCR = true; - { - imports = [ - ./common/user-account.nix - ./common/x11.nix - ]; + testScript = + { nodes, ... }: + let + user = nodes.machine.config.users.users.alice; + in + '' + start_all() + machine.wait_for_x() - services.xserver.enable = true; - test-support.displayManager.auto.user = "alice"; - environment.systemPackages = with pkgs; [ - signal-desktop - file - sqlite - sqlcipher-signal - ]; - }; + # start signal desktop + machine.execute("su - alice -c signal-desktop >&2 &") - enableOCR = true; + # Wait for the Signal window to appear. Since usually the tests + # are run sandboxed and therefore with no internet, we can not wait + # for the message "Link your phone ...". Nor should we wait for + # the "Failed to connect to server" message, because when manually + # running this test it will be not sandboxed. + machine.wait_for_text("Signal") + machine.wait_for_text("File Edit View Window Help") + machine.screenshot("signal_desktop") - testScript = - { nodes, ... }: - let - user = nodes.machine.config.users.users.alice; - in - '' - start_all() - machine.wait_for_x() - - # start signal desktop - machine.execute("su - alice -c signal-desktop >&2 &") - - # Wait for the Signal window to appear. Since usually the tests - # are run sandboxed and therefore with no internet, we can not wait - # for the message "Link your phone ...". Nor should we wait for - # the "Failed to connect to server" message, because when manually - # running this test it will be not sandboxed. - machine.wait_for_text("Signal") - machine.wait_for_text("File Edit View Window Help") - machine.screenshot("signal_desktop") - - # Test if the database is encrypted to prevent these issues: - # - https://github.com/NixOS/nixpkgs/issues/108772 - # - https://github.com/NixOS/nixpkgs/pull/117555 - print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'")) - machine.fail( - "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database" - ) - # Only SQLCipher should be able to read the encrypted DB: - machine.fail( - "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'" - ) - print(machine.succeed( - "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'" - )) - ''; - } -) + # Test if the database is encrypted to prevent these issues: + # - https://github.com/NixOS/nixpkgs/issues/108772 + # - https://github.com/NixOS/nixpkgs/pull/117555 + print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'")) + machine.fail( + "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database" + ) + # Only SQLCipher should be able to read the encrypted DB: + machine.fail( + "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'" + ) + print(machine.succeed( + "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'" + )) + ''; +} diff --git a/nixos/tests/sourcehut/builds.nix b/nixos/tests/sourcehut/builds.nix index 71d5b3238453..1add972cc13f 100644 --- a/nixos/tests/sourcehut/builds.nix +++ b/nixos/tests/sourcehut/builds.nix @@ -49,15 +49,15 @@ import ../make-test-python.nix ( machine.wait_for_unit("multi-user.target") with subtest("Check whether meta comes up"): - machine.wait_for_unit("metasrht-api.service") - machine.wait_for_unit("metasrht.service") - machine.wait_for_unit("metasrht-webhooks.service") + machine.wait_for_unit("meta.sr.ht-api.service") + machine.wait_for_unit("meta.sr.ht.service") + machine.wait_for_unit("meta.sr.ht-webhooks.service") machine.wait_for_open_port(5000) machine.succeed("curl -sL http://localhost:5000 | grep meta.${domain}") machine.succeed("curl -sL http://meta.${domain} | grep meta.${domain}") with subtest("Check whether builds comes up"): - machine.wait_for_unit("buildsrht.service") + machine.wait_for_unit("builds.sr.ht.service") machine.wait_for_open_port(5002) machine.succeed("curl -sL http://localhost:5002 | grep builds.${domain}") #machine.wait_for_unit("buildsrht-worker.service") diff --git a/nixos/tests/sourcehut/git.nix b/nixos/tests/sourcehut/git.nix index 7f50752c7eb8..a06281aafbb4 100644 --- a/nixos/tests/sourcehut/git.nix +++ b/nixos/tests/sourcehut/git.nix @@ -63,25 +63,26 @@ import ../make-test-python.nix ( machine.wait_for_unit("sshd.service") with subtest("Check whether meta comes up"): - machine.wait_for_unit("metasrht-api.service") - machine.wait_for_unit("metasrht.service") - machine.wait_for_unit("metasrht-webhooks.service") + machine.wait_for_unit("meta.sr.ht-api.service") + machine.wait_for_unit("meta.sr.ht.service") + machine.wait_for_unit("meta.sr.ht-webhooks.service") machine.wait_for_open_port(5000) machine.succeed("curl -sL http://localhost:5000 | grep meta.${domain}") machine.succeed("curl -sL http://meta.${domain} | grep meta.${domain}") with subtest("Create a new user account and OAuth access key"): - machine.succeed("echo ${userPass} | metasrht-manageuser -ps -e ${userName}@${domain}\ - -t active_paying ${userName}"); + machine.succeed("echo ${userPass} | meta.sr.ht-manageuser -ps -e ${userName}@${domain}\ + -t USER ${userName}"); + cmd = "srht-gen-oauth-tok -i ${domain} -q ${userName} ${userPass}" (_, token) = machine.execute("srht-gen-oauth-tok -i ${domain} -q ${userName} ${userPass}") token = token.strip().replace("/", r"\\/") # Escape slashes in token before passing it to sed machine.execute("mkdir -p ~/.config/hut/") machine.execute("sed s/OAUTH-TOKEN/" + token + "/ ${hutConfig} > ~/.config/hut/config") with subtest("Check whether git comes up"): - machine.wait_for_unit("gitsrht-api.service") - machine.wait_for_unit("gitsrht.service") - machine.wait_for_unit("gitsrht-webhooks.service") + machine.wait_for_unit("git.sr.ht-api.service") + machine.wait_for_unit("git.sr.ht.service") + machine.wait_for_unit("git.sr.ht-webhooks.service") machine.succeed("curl -sL http://git.${domain} | grep git.${domain}") with subtest("Add an SSH key for Git access"): @@ -95,7 +96,7 @@ import ../make-test-python.nix ( machine.execute("cd test && git add .") machine.execute("cd test && git commit -m \"Initial commit\"") machine.execute("cd test && git tag v0.1") - machine.succeed("cd test && git remote add origin gitsrht@git.${domain}:~${userName}/test") + machine.succeed("cd test && git remote add origin git.sr.ht@git.${domain}:~${userName}/test") machine.execute("( echo -n 'git.${domain} '; cat /etc/ssh/ssh_host_ed25519_key.pub ) > ~/.ssh/known_hosts") machine.succeed("hut git create test") machine.succeed("cd test && git push --tags --set-upstream origin master") diff --git a/nixos/tests/spiped.nix b/nixos/tests/spiped.nix index a39fc2fd722b..994ec2be02e4 100644 --- a/nixos/tests/spiped.nix +++ b/nixos/tests/spiped.nix @@ -5,7 +5,7 @@ in { name = "spiped"; meta = with pkgs.lib.maintainers; { - maintainers = [ tomfitzhenry ]; + maintainers = [ ]; }; nodes = { diff --git a/nixos/tests/starship.nix b/nixos/tests/starship.nix index 23e103fc000e..382666d8f176 100644 --- a/nixos/tests/starship.nix +++ b/nixos/tests/starship.nix @@ -1,53 +1,51 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "starship"; - meta.maintainers = pkgs.starship.meta.maintainers; +{ pkgs, ... }: +{ + name = "starship"; + meta.maintainers = pkgs.starship.meta.maintainers; - nodes.machine = { - programs = { - fish.enable = true; - zsh.enable = true; + nodes.machine = { + programs = { + fish.enable = true; + zsh.enable = true; - starship = { - enable = true; - settings.format = ""; - }; + starship = { + enable = true; + settings.format = ""; }; - - environment.systemPackages = - map - ( - shell: - pkgs.writeScriptBin "expect-${shell}" '' - #!${pkgs.expect}/bin/expect -f - - spawn env TERM=xterm ${shell} -i - - expect "" { - send "exit\n" - } timeout { - send_user "\n${shell} failed to display Starship\n" - exit 1 - } - - expect eof - '' - ) - [ - "bash" - "fish" - "zsh" - ]; }; - testScript = '' - start_all() - machine.wait_for_unit("default.target") + environment.systemPackages = + map + ( + shell: + pkgs.writeScriptBin "expect-${shell}" '' + #!${pkgs.expect}/bin/expect -f - machine.succeed("expect-bash") - machine.succeed("expect-fish") - machine.succeed("expect-zsh") - ''; - } -) + spawn env TERM=xterm ${shell} -i + + expect "" { + send "exit\n" + } timeout { + send_user "\n${shell} failed to display Starship\n" + exit 1 + } + + expect eof + '' + ) + [ + "bash" + "fish" + "zsh" + ]; + }; + + testScript = '' + start_all() + machine.wait_for_unit("default.target") + + machine.succeed("expect-bash") + machine.succeed("expect-fish") + machine.succeed("expect-zsh") + ''; +} diff --git a/nixos/tests/syncthing-folders.nix b/nixos/tests/syncthing-folders.nix new file mode 100644 index 000000000000..d0623f7194d5 --- /dev/null +++ b/nixos/tests/syncthing-folders.nix @@ -0,0 +1,135 @@ +{ lib, pkgs, ... }: +let + genNodeId = + name: + pkgs.runCommand "syncthing-test-certs-${name}" { } '' + mkdir -p $out + ${pkgs.syncthing}/bin/syncthing generate --config=$out + ${pkgs.libxml2}/bin/xmllint --xpath 'string(configuration/device/@id)' $out/config.xml > $out/id + ''; + idA = genNodeId "a"; + idB = genNodeId "b"; + idC = genNodeId "c"; + testPassword = "it's a secret"; +in +{ + name = "syncthing"; + meta.maintainers = with pkgs.lib.maintainers; [ zarelit ]; + + nodes = { + a = + { config, ... }: + { + environment.etc.bar-encryption-password.text = testPassword; + services.syncthing = { + enable = true; + openDefaultPorts = true; + cert = "${idA}/cert.pem"; + key = "${idA}/key.pem"; + settings = { + devices.b.id = lib.fileContents "${idB}/id"; + devices.c.id = lib.fileContents "${idC}/id"; + folders.foo = { + path = "/var/lib/syncthing/foo"; + devices = [ "b" ]; + }; + folders.bar = { + path = "/var/lib/syncthing/bar"; + devices = [ + { + name = "c"; + encryptionPasswordFile = "/etc/${config.environment.etc.bar-encryption-password.target}"; + } + ]; + }; + }; + }; + }; + b = + { config, ... }: + { + environment.etc.bar-encryption-password.text = testPassword; + services.syncthing = { + enable = true; + openDefaultPorts = true; + cert = "${idB}/cert.pem"; + key = "${idB}/key.pem"; + settings = { + devices.a.id = lib.fileContents "${idA}/id"; + devices.c.id = lib.fileContents "${idC}/id"; + folders.foo = { + path = "/var/lib/syncthing/foo"; + devices = [ "a" ]; + }; + folders.bar = { + path = "/var/lib/syncthing/bar"; + devices = [ + { + name = "c"; + encryptionPasswordFile = "/etc/${config.environment.etc.bar-encryption-password.target}"; + } + ]; + }; + }; + }; + }; + c = { + services.syncthing = { + enable = true; + openDefaultPorts = true; + cert = "${idC}/cert.pem"; + key = "${idC}/key.pem"; + settings = { + devices.a.id = lib.fileContents "${idA}/id"; + devices.b.id = lib.fileContents "${idB}/id"; + folders.bar = { + path = "/var/lib/syncthing/bar"; + devices = [ + "a" + "b" + ]; + type = "receiveencrypted"; + }; + }; + }; + }; + }; + + testScript = '' + start_all() + + a.wait_for_unit("syncthing.service") + b.wait_for_unit("syncthing.service") + c.wait_for_unit("syncthing.service") + a.wait_for_open_port(22000) + b.wait_for_open_port(22000) + c.wait_for_open_port(22000) + + # Test foo + + a.wait_for_file("/var/lib/syncthing/foo") + b.wait_for_file("/var/lib/syncthing/foo") + + a.succeed("echo a2b > /var/lib/syncthing/foo/a2b") + b.succeed("echo b2a > /var/lib/syncthing/foo/b2a") + + a.wait_for_file("/var/lib/syncthing/foo/b2a") + b.wait_for_file("/var/lib/syncthing/foo/a2b") + + # Test bar + + a.wait_for_file("/var/lib/syncthing/bar") + b.wait_for_file("/var/lib/syncthing/bar") + c.wait_for_file("/var/lib/syncthing/bar") + + a.succeed("echo plaincontent > /var/lib/syncthing/bar/plainname") + + # B should be able to decrypt, check that content of file matches + b.wait_for_file("/var/lib/syncthing/bar/plainname") + file_contents = b.succeed("cat /var/lib/syncthing/bar/plainname") + assert "plaincontent\n" == file_contents, f"Unexpected file contents: {file_contents=}" + + # Bar on C is untrusted, check that content is not in cleartext + c.fail("grep -R plaincontent /var/lib/syncthing/bar") + ''; +} diff --git a/nixos/tests/systemd-initrd-simple.nix b/nixos/tests/systemd-initrd-simple.nix index 7a379404bbc2..191a23abb2e4 100644 --- a/nixos/tests/systemd-initrd-simple.nix +++ b/nixos/tests/systemd-initrd-simple.nix @@ -1,17 +1,17 @@ -import ./make-test-python.nix ( - { lib, pkgs, ... }: - { - name = "systemd-initrd-simple"; +{ + name = "systemd-initrd-simple"; - nodes.machine = - { pkgs, ... }: - { - testing.initrdBackdoor = true; - boot.initrd.systemd.enable = true; - virtualisation.fileSystems."/".autoResize = true; - }; + nodes.machine = + { pkgs, ... }: + { + testing.initrdBackdoor = true; + boot.initrd.systemd.enable = true; + virtualisation.fileSystems."/".autoResize = true; + }; - testScript = '' + testScript = + # python + '' import subprocess with subtest("testing initrd backdoor"): @@ -50,6 +50,8 @@ import ./make-test-python.nix ( newAvail = machine.succeed("df --output=avail / | sed 1d") assert int(oldAvail) < int(newAvail), "File system did not grow" + + with subtest("no warnings from systemd about write permissions"): + machine.fail("journalctl -b 0 | grep 'is marked world-writable, which is a security risk as it is executed with privileges'") ''; - } -) +} diff --git a/nixos/tests/systemd-journal.nix b/nixos/tests/systemd-journal.nix index 63ae58970e84..c39fc50e5006 100644 --- a/nixos/tests/systemd-journal.nix +++ b/nixos/tests/systemd-journal.nix @@ -12,11 +12,23 @@ import ./make-test-python.nix ( }; nodes.auditd = { security.auditd.enable = true; + security.audit.enable = true; environment.systemPackages = [ pkgs.audit ]; + boot.kernel.sysctl."kernel.printk_ratelimit" = 0; + boot.kernelParams = [ "audit_backlog_limit=8192" ]; }; nodes.journaldAudit = { services.journald.audit = true; + security.audit.enable = true; environment.systemPackages = [ pkgs.audit ]; + boot.kernel.sysctl."kernel.printk_ratelimit" = 0; + boot.kernelParams = [ "audit_backlog_limit=8192" ]; + }; + nodes.containerCheck = { + containers.c1 = { + autoStart = true; + config = { }; + }; }; testScript = '' @@ -50,6 +62,16 @@ import ./make-test-python.nix ( # logs ideally should NOT end up in kmesg, but they do due to # https://github.com/systemd/systemd/issues/15324 journaldAudit.succeed("journalctl _TRANSPORT=kernel --grep 'unit=systemd-journald'") + + + with subtest("container systemd-journald-audit not running"): + containerCheck.wait_for_unit("multi-user.target"); + containerCheck.wait_until_succeeds("systemctl -M c1 is-active default.target"); + + # systemd-journald-audit.socket should exist but not run due to the upstream unit's `Condition*` settings + (status, output) = containerCheck.execute("systemctl -M c1 is-active systemd-journald-audit.socket") + containerCheck.log(output) + assert status == 3 and output == "inactive\n", f"systemd-journald-audit.socket should exist in a container but remain inactive, was {output}" ''; } ) diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix index 5866c6d7603f..2e35d160f533 100644 --- a/nixos/tests/systemd-machinectl.nix +++ b/nixos/tests/systemd-machinectl.nix @@ -20,11 +20,13 @@ import ./make-test-python.nix ( imports = [ ../modules/profiles/minimal.nix ]; system.stateVersion = config.system.nixos.release; + + nixpkgs.pkgs = pkgs; }; containerSystem = (import ../lib/eval-config.nix { - inherit (pkgs) system; + system = null; modules = [ container ]; }).config.system.build.toplevel; diff --git a/nixos/tests/systemd-shutdown.nix b/nixos/tests/systemd-shutdown.nix index 1f072086bdd1..fa0105cb90cf 100644 --- a/nixos/tests/systemd-shutdown.nix +++ b/nixos/tests/systemd-shutdown.nix @@ -17,12 +17,14 @@ import ./make-test-python.nix ( imports = [ ../modules/profiles/minimal.nix ]; systemd.shutdownRamfs.contents."/etc/systemd/system-shutdown/shutdown-message".source = pkgs.writeShellScript "shutdown-message" '' - echo "${msg}" + echo "${msg}" > /dev/kmsg ''; boot.initrd.systemd.enable = systemdStage1; }; testScript = '' + # Check that 'generate-shutdown-ramfs.service' is started + # automatically and that 'systemd-shutdown' runs our script. machine.wait_for_unit("multi-user.target") # .shutdown() would wait for the machine to power off machine.succeed("systemctl poweroff") @@ -31,6 +33,12 @@ import ./make-test-python.nix ( machine.wait_for_console_text("${msg}") # Don't try to sync filesystems machine.wait_for_shutdown() + + # In a separate boot, start 'generate-shutdown-ramfs.service' + # manually in order to check the permissions on '/run/initramfs'. + machine.systemctl("start generate-shutdown-ramfs.service") + stat = machine.succeed("stat --printf=%a:%u:%g /run/initramfs") + assert stat == "700:0:0", f"Improper permissions on /run/initramfs: {stat}" ''; } ) diff --git a/nixos/tests/systemd-ssh-proxy.nix b/nixos/tests/systemd-ssh-proxy.nix new file mode 100644 index 000000000000..6ccdc0012b4f --- /dev/null +++ b/nixos/tests/systemd-ssh-proxy.nix @@ -0,0 +1,63 @@ +{ + pkgs, + lib, + config, + ... +}: +# This tests that systemd-ssh-proxy and systemd-ssh-generator work correctly with: +# - a local unix socket on the same system +# - a unix socket inside a container +let + inherit (import ./ssh-keys.nix pkgs) + snakeOilEd25519PrivateKey + snakeOilEd25519PublicKey + ; +in +{ + name = "systemd-ssh-proxy"; + meta.maintainers = with pkgs.lib.maintainers; [ marie ]; + + nodes = { + virthost = { + services.openssh = { + enable = true; + settings.PermitRootLogin = "prohibit-password"; + }; + users.users = { + root.openssh.authorizedKeys.keys = [ snakeOilEd25519PublicKey ]; + nixos = { + isNormalUser = true; + }; + }; + containers.guest = { + autoStart = true; + config = { + users.users.root.openssh.authorizedKeys.keys = [ snakeOilEd25519PublicKey ]; + services.openssh = { + enable = true; + settings.PermitRootLogin = "prohibit-password"; + }; + system.stateVersion = lib.trivial.release; + }; + }; + }; + }; + + testScript = '' + virthost.succeed("mkdir -p ~/.ssh") + virthost.succeed("cp '${snakeOilEd25519PrivateKey}' ~/.ssh/id_ed25519") + virthost.succeed("chmod 600 ~/.ssh/id_ed25519") + + with subtest("ssh into a container with AF_UNIX"): + virthost.wait_for_unit("container@guest.service") + virthost.wait_until_succeeds("ssh -i ~/.ssh/id_ed25519 unix/run/systemd/nspawn/unix-export/guest/ssh echo meow | grep meow") + + with subtest("elevate permissions using local ssh socket"): + virthost.wait_for_unit("sshd-unix-local.socket") + virthost.succeed("sudo --user=nixos mkdir -p /home/nixos/.ssh") + virthost.succeed("cp ~/.ssh/id_ed25519 /home/nixos/.ssh/id_ed25519") + virthost.succeed("chmod 600 /home/nixos/.ssh/id_ed25519") + virthost.succeed("chown nixos /home/nixos/.ssh/id_ed25519") + virthost.succeed("sudo --user=nixos ssh -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i /home/nixos/.ssh/id_ed25519 root@.host whoami | grep root") + ''; +} diff --git a/nixos/tests/taskchampion-sync-server.nix b/nixos/tests/taskchampion-sync-server.nix index 42dfb0cbeca3..659a900fd2c2 100644 --- a/nixos/tests/taskchampion-sync-server.nix +++ b/nixos/tests/taskchampion-sync-server.nix @@ -6,6 +6,7 @@ import ./make-test-python.nix ( nodes = { server = { services.taskchampion-sync-server.enable = true; + services.taskchampion-sync-server.host = "0.0.0.0"; services.taskchampion-sync-server.openFirewall = true; }; client = diff --git a/nixos/tests/teleports.nix b/nixos/tests/teleports.nix index a4293f954a45..613ad5a7fc84 100644 --- a/nixos/tests/teleports.nix +++ b/nixos/tests/teleports.nix @@ -34,14 +34,20 @@ machine.wait_for_x() with subtest("teleports launches"): - machine.execute("teleports >&2 &") + machine.succeed("teleports >&2 &") + machine.wait_for_console_text("authorizationStateWaitPhoneNumber") + machine.send_key("alt-f10") + machine.sleep(2) machine.wait_for_text(r"(TELEports|Phone Number)") machine.screenshot("teleports_open") machine.succeed("pkill -f teleports") with subtest("teleports localisation works"): - machine.execute("env LANG=de_DE.UTF-8 teleports >&2 &") + machine.succeed("env LANG=de_DE.UTF-8 teleports >&2 &") + machine.wait_for_console_text("authorizationStateWaitPhoneNumber") + machine.send_key("alt-f10") + machine.sleep(2) machine.wait_for_text("Telefonnummer") machine.screenshot("teleports_localised") ''; diff --git a/nixos/tests/tusd/default.nix b/nixos/tests/tusd/default.nix new file mode 100644 index 000000000000..ec188dee56ca --- /dev/null +++ b/nixos/tests/tusd/default.nix @@ -0,0 +1,51 @@ +{ pkgs, lib, ... }: + +let + port = 1080; + + client = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.curl ]; + }; + + server = + { pkgs, ... }: + { + # tusd does not have a NixOS service yet. + systemd.services.tusd = { + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = ''${pkgs.tusd}/bin/tusd -port "${toString port}" -upload-dir=/data''; + }; + }; + networking.firewall.allowedTCPPorts = [ port ]; + }; +in +{ + name = "tusd"; + meta.maintainers = with lib.maintainers; [ + nh2 + kalbasit + ]; + + nodes = { + inherit server; + inherit client; + }; + + testScript = '' + server.wait_for_unit("tusd.service") + server.wait_for_open_port(${toString port}) + + # Create large file. + client.succeed("${pkgs.coreutils}/bin/truncate --size=100M file-100M.bin") + + # Upload it. + client.wait_for_unit("network.target") + client.succeed("${./tus-curl-upload.sh} file-100M.bin http://server:${toString port}/files/") + + print("Upload succeeded") + ''; +} diff --git a/nixos/tests/tusd/tus-curl-upload.sh b/nixos/tests/tusd/tus-curl-upload.sh new file mode 100755 index 000000000000..a85d163cc25e --- /dev/null +++ b/nixos/tests/tusd/tus-curl-upload.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +# Adapted from: +# - https://github.com/tus/tus.io/issues/96 + +if [ ! -f "${1}" ]; then + echo -e "\n\033[1;31m✘\033[0m First argument needs to be an existing file.\n" + exit 1 +fi + +if [ -z "${2}" ]; then + echo -e "\n\033[1;31m✘\033[0m Second argument needs to be the TUS server's URL.\n" + exit 1 +fi + +file=${1} +TUS_URL=${2} +filename=$(basename "${file}" | base64) +filesize="$(wc -c <"${file}")" + +# Apparently 'Location: ..' is terminated by CRLF. grep and awk faithfully +# preserve the line ending, and the shell's $() substitution strips off the +# final LF leaving you with a string that just ends with a CR. +# +# When the CR is printed, the cursor moves to the beginning of the line and +# whatever gets printed next overwrites what was there. +# ... | tr -d '\015' +location=$(curl \ + --silent --show-error \ + -I \ + -X POST \ + -H "Tus-Resumable: 1.0.0" \ + -H "Content-Length: 0" \ + -H "Upload-Length: ${filesize}" \ + -H "Upload-Metadata: name ${filename}" \ + "${TUS_URL}" | grep 'Location:' | awk '{print $2}' | tr -d '\015') + +if [ -n "${location}" ]; then + curl \ + -X PATCH \ + -H "Tus-Resumable: 1.0.0" \ + -H "Upload-Offset: 0" \ + -H "Content-Length: ${filesize}" \ + -H "Content-Type: application/offset+octet-stream" \ + --data-binary "@${file}" \ + "${location}" -v +else + echo -e "\n\033[1;31m✘\033[0m File creation failed..\n" + exit 1 +fi diff --git a/nixos/tests/tuxguitar.nix b/nixos/tests/tuxguitar.nix index e491f96a89ce..d0df7d5c5bb5 100644 --- a/nixos/tests/tuxguitar.nix +++ b/nixos/tests/tuxguitar.nix @@ -1,29 +1,25 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "tuxguitar"; - meta = with pkgs.lib.maintainers; { - maintainers = [ ]; +{ ... }: +{ + name = "tuxguitar"; + meta.maintainers = [ ]; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + + environment.systemPackages = [ pkgs.tuxguitar ]; }; - nodes.machine = - { config, pkgs, ... }: - { - imports = [ - ./common/x11.nix - ]; - - services.xserver.enable = true; - - environment.systemPackages = [ pkgs.tuxguitar ]; - }; - - testScript = '' - machine.wait_for_x() - machine.succeed("tuxguitar >&2 &") - machine.wait_for_window("TuxGuitar - Untitled.tg") - machine.sleep(1) - machine.screenshot("tuxguitar") - ''; - } -) + testScript = '' + machine.wait_for_x() + machine.succeed("tuxguitar >&2 &") + machine.wait_for_window("TuxGuitar - Untitled.tg") + machine.sleep(1) + machine.screenshot("tuxguitar") + ''; +} diff --git a/nixos/tests/tzupdate.nix b/nixos/tests/tzupdate.nix new file mode 100644 index 000000000000..a6defcfa18ea --- /dev/null +++ b/nixos/tests/tzupdate.nix @@ -0,0 +1,22 @@ +{ lib, ... }: +let + clientNodeName = "client"; +in +{ + name = "tzupdate"; + + # TODO: Test properly: + # - Add server node + # - Add client configuration to talk to the server node + # - Assert that the time zone changes appropriately + nodes.${clientNodeName} = { + services.tzupdate.enable = true; + }; + + testScript = '' + start_all() + ${clientNodeName}.wait_for_unit("multi-user.target") + ''; + + meta.maintainers = [ lib.maintainers.l0b0 ]; +} diff --git a/nixos/tests/unifi.nix b/nixos/tests/unifi.nix index a6ae0ab9fa58..ee3c8e1bdb84 100644 --- a/nixos/tests/unifi.nix +++ b/nixos/tests/unifi.nix @@ -1,45 +1,30 @@ -# Test UniFi controller +{ lib, ... }: { - system ? builtins.currentSystem, - config ? { - allowUnfree = true; - }, - pkgs ? import ../.. { inherit system config; }, -}: + name = "unifi"; -with import ../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; + meta.maintainers = with lib.maintainers; [ + patryk27 + zhaofengli + ]; -let - makeAppTest = - unifi: - makeTest { - name = "unifi-controller-${unifi.version}"; - meta = with pkgs.lib.maintainers; { - maintainers = [ - patryk27 - zhaofengli - ]; - }; + node.pkgsReadOnly = false; - nodes.server = { - nixpkgs.config = config; + nodes.machine = { + nixpkgs.config.allowUnfree = true; - services.unifi = { - enable = true; - unifiPackage = unifi; - openFirewall = false; - }; - }; + services.unifi.enable = true; + }; - testScript = '' - server.wait_for_unit("unifi.service") - server.wait_until_succeeds("curl -Lk https://localhost:8443 >&2", timeout=300) - ''; - }; -in -with pkgs; -{ - unifi8 = makeAppTest unifi8; + testScript = '' + import json + + start_all() + + machine.wait_for_unit("unifi.service") + machine.wait_for_open_port(8880) + + status = json.loads(machine.succeed("curl --silent --show-error --fail-with-body http://localhost:8880/status")) + assert status["meta"]["rc"] == "ok" + ''; } diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix index c656e9ef1a06..ce1e1de21abe 100644 --- a/nixos/tests/vaultwarden.nix +++ b/nixos/tests/vaultwarden.nix @@ -36,6 +36,17 @@ let from selenium.webdriver.firefox.options import Options from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC + from selenium.common.exceptions import ElementClickInterceptedException + + + def click_when_unobstructed(mark): + while True: + try: + wait.until(EC.element_to_be_clickable(mark)).click() + break + except ElementClickInterceptedException: + continue + options = Options() options.add_argument('--headless') @@ -74,7 +85,7 @@ let ) driver.find_element(By.XPATH, "//button[contains(., 'Log in with master password')]").click() - wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, 'button#newItemDropdown'))).click() + click_when_unobstructed((By.CSS_SELECTOR, 'button#newItemDropdown')) driver.find_element(By.XPATH, "//button[contains(., 'Item')]").click() driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys( @@ -178,6 +189,8 @@ let testScript else '' + import json + start_all() server.wait_for_unit("vaultwarden.service") server.wait_for_open_port(8080) @@ -202,11 +215,9 @@ let client.succeed(f"bw --nointeraction --raw --session {key} sync -f") with subtest("get the password with the cli"): - password = client.wait_until_succeeds( - f"bw --nointeraction --raw --session {key} list items | ${pkgs.jq}/bin/jq -r .[].login.password", - timeout=60 - ) - assert password.strip() == "${storedPassword}" + output = json.loads(client.succeed(f"bw --nointeraction --raw --session {key} list items")) + + assert output[0]['login']['password'] == "${storedPassword}" with subtest("Check systemd unit hardening"): server.log(server.succeed("systemd-analyze security vaultwarden.service | grep -v ✓")) diff --git a/nixos/tests/vector/default.nix b/nixos/tests/vector/default.nix index 7ec435bd848c..764689d5cb03 100644 --- a/nixos/tests/vector/default.nix +++ b/nixos/tests/vector/default.nix @@ -8,6 +8,7 @@ file-sink = import ./file-sink.nix { inherit system pkgs; }; api = import ./api.nix { inherit system pkgs; }; dnstap = import ./dnstap.nix { inherit system pkgs; }; + journald-clickhouse = import ./journald-clickhouse.nix { inherit system pkgs; }; nginx-clickhouse = import ./nginx-clickhouse.nix { inherit system pkgs; }; syslog-quickwit = import ./syslog-quickwit.nix { inherit system pkgs; }; } diff --git a/nixos/tests/vector/dnstap.nix b/nixos/tests/vector/dnstap.nix index 935ea757e107..ec20ce1f6a1d 100644 --- a/nixos/tests/vector/dnstap.nix +++ b/nixos/tests/vector/dnstap.nix @@ -114,6 +114,7 @@ import ../make-test-python.nix ( unbound.wait_for_file("${dnstapSocket}") unbound.succeed("test 770 -eq $(stat -c '%a' ${dnstapSocket})") + dnsclient.systemctl("start network-online.target") dnsclient.wait_for_unit("network-online.target") dnsclient.succeed( "dig @unbound test.local" diff --git a/nixos/tests/vector/journald-clickhouse.nix b/nixos/tests/vector/journald-clickhouse.nix new file mode 100644 index 000000000000..6979ed5a9c87 --- /dev/null +++ b/nixos/tests/vector/journald-clickhouse.nix @@ -0,0 +1,157 @@ +import ../make-test-python.nix ( + { lib, pkgs, ... }: + let + # Take the original journald message and create a new payload which only + # contains the relevant fields - these must match the database columns. + journalVrlRemapTransform = { + journald_remap = { + inputs = [ "journald" ]; + type = "remap"; + source = '' + m = {} + m.app = .SYSLOG_IDENTIFIER + m.host = .host + m.severity = to_int(.PRIORITY) ?? 0 + m.level = to_syslog_level(m.severity) ?? "" + m.message = strip_ansi_escape_codes!(.message) + m.timestamp = .timestamp + m.uid = to_int(._UID) ?? 0 + m.pid = to_int(._PID) ?? 0 + . = [m] + ''; + }; + }; + in + { + name = "vector-journald-clickhouse"; + meta.maintainers = [ pkgs.lib.maintainers.happysalada ]; + + nodes = { + clickhouse = + { config, pkgs, ... }: + { + virtualisation.diskSize = 5 * 1024; + virtualisation.memorySize = 4096; + + networking.firewall.allowedTCPPorts = [ 6000 ]; + + services.vector = { + enable = true; + journaldAccess = true; + + settings = { + sources = { + journald = { + type = "journald"; + }; + + vector_source = { + type = "vector"; + address = "[::]:6000"; + }; + }; + + transforms = journalVrlRemapTransform; + + sinks = { + clickhouse = { + type = "clickhouse"; + inputs = [ + "journald_remap" + "vector_source" + ]; + endpoint = "http://localhost:8123"; + database = "journald"; + table = "logs"; + date_time_best_effort = true; + }; + }; + }; + + }; + + services.clickhouse = { + enable = true; + }; + }; + + vector = + { config, pkgs, ... }: + { + services.vector = { + enable = true; + journaldAccess = true; + + settings = { + sources = { + journald = { + type = "journald"; + }; + }; + + transforms = journalVrlRemapTransform; + + sinks = { + vector_sink = { + type = "vector"; + inputs = [ "journald_remap" ]; + address = "clickhouse:6000"; + }; + }; + }; + }; + }; + }; + + testScript = + let + # work around quote/substitution complexity by Nix, Perl, bash and SQL. + databaseDDL = pkgs.writeText "database.sql" "CREATE DATABASE IF NOT EXISTS journald"; + + # https://clickhouse.com/blog/storing-log-data-in-clickhouse-fluent-bit-vector-open-telemetry + tableDDL = pkgs.writeText "table.sql" '' + CREATE TABLE IF NOT EXISTS journald.logs ( + timestamp DateTime64(6), + app LowCardinality(String), + host LowCardinality(String), + level LowCardinality(String), + severity UInt8, + message String, + uid UInt16, + pid UInt32, + ) + ENGINE = MergeTree() + ORDER BY (host, app, timestamp) + PARTITION BY toYYYYMM(timestamp) + ''; + + selectQuery = pkgs.writeText "select.sql" '' + SELECT COUNT(host) FROM journald.logs + WHERE message LIKE '%Vector has started%' + ''; + in + '' + clickhouse.wait_for_unit("clickhouse") + clickhouse.wait_for_open_port(6000) + clickhouse.wait_for_open_port(8123) + + clickhouse.succeed( + "cat ${databaseDDL} | clickhouse-client" + ) + + clickhouse.succeed( + "cat ${tableDDL} | clickhouse-client" + ) + + for machine in clickhouse, vector: + machine.wait_for_unit("vector") + machine.wait_until_succeeds( + "journalctl -o cat -u vector.service | grep 'Vector has started'" + ) + + clickhouse.wait_until_succeeds( + "cat ${selectQuery} | clickhouse-client | grep 2" + ) + ''; + } +) diff --git a/nixos/tests/velocity.nix b/nixos/tests/velocity.nix index 1e701977514d..d9ae4e75d87e 100644 --- a/nixos/tests/velocity.nix +++ b/nixos/tests/velocity.nix @@ -1,13 +1,7 @@ { lib, pkgs, ... }: { name = "velocity"; - meta = { - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; - maintainers = [ lib.maintainers.Tert0 ]; - }; + meta.maintainers = [ lib.maintainers.Tert0 ]; nodes.server = { ... }: diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix index 8600ccb81436..a3efd07bf501 100644 --- a/nixos/tests/vscodium.nix +++ b/nixos/tests/vscodium.nix @@ -62,14 +62,14 @@ let codium_running.wait() # type: ignore[union-attr] with codium_running: # type: ignore[union-attr] # Wait until vscodium is visible. "File" is in the menu bar. - machine.wait_for_text('Get Started with') + machine.wait_for_text('(Get|Started|with|Customize|theme)') machine.screenshot('start_screen') test_string = 'testfile' # Create a new file machine.send_key('ctrl-n') - machine.wait_for_text('Untitled') + machine.wait_for_text('(Untitled|Select|language|template|dismiss)') machine.screenshot('empty_editor') # Type a string diff --git a/nixos/tests/wastebin.nix b/nixos/tests/wastebin.nix index dde1f658b948..79d05229eb7f 100644 --- a/nixos/tests/wastebin.nix +++ b/nixos/tests/wastebin.nix @@ -1,24 +1,22 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "wastebin"; +{ lib, ... }: +{ + name = "wastebin"; - meta = { - maintainers = with lib.maintainers; [ pinpox ]; + meta = { + maintainers = with lib.maintainers; [ pinpox ]; + }; + + nodes.machine = + { pkgs, ... }: + { + services.wastebin = { + enable = true; + }; }; - nodes.machine = - { pkgs, ... }: - { - services.wastebin = { - enable = true; - }; - }; - - testScript = '' - machine.wait_for_unit("wastebin.service") - machine.wait_for_open_port(8088) - machine.succeed("curl --fail http://localhost:8088/") - ''; - } -) + testScript = '' + machine.wait_for_unit("wastebin.service") + machine.wait_for_open_port(8088) + machine.succeed("curl --fail http://localhost:8088/") + ''; +} diff --git a/nixos/tests/web-apps/netbox-upgrade.nix b/nixos/tests/web-apps/netbox-upgrade.nix index cc044b76f0b3..417df2a32af0 100644 --- a/nixos/tests/web-apps/netbox-upgrade.nix +++ b/nixos/tests/web-apps/netbox-upgrade.nix @@ -1,8 +1,18 @@ import ../make-test-python.nix ( { lib, pkgs, ... }: let - oldNetbox = pkgs.netbox_3_7; - newNetbox = pkgs.netbox_4_1; + oldNetbox = "netbox_4_1"; + newNetbox = "netbox_4_2"; + + apiVersion = + version: + lib.pipe version [ + (lib.splitString ".") + (lib.take 2) + (lib.concatStringsSep ".") + ]; + oldApiVersion = apiVersion pkgs."${oldNetbox}".version; + newApiVersion = apiVersion pkgs."${newNetbox}".version; in { name = "netbox-upgrade"; @@ -15,12 +25,14 @@ import ../make-test-python.nix ( }; nodes.machine = - { config, ... }: + { config, pkgs, ... }: { virtualisation.memorySize = 2048; services.netbox = { enable = true; - package = oldNetbox; + # Pick the NetBox package from this config's "pkgs" argument, + # so that `nixpkgs.config.permittedInsecurePackages` works + package = pkgs."${oldNetbox}"; secretKeyFile = pkgs.writeText "secret" '' abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ''; @@ -42,22 +54,13 @@ import ../make-test-python.nix ( networking.firewall.allowedTCPPorts = [ 80 ]; - specialisation.upgrade.configuration.services.netbox.package = lib.mkForce newNetbox; + nixpkgs.config.permittedInsecurePackages = [ pkgs."${oldNetbox}".name ]; + + specialisation.upgrade.configuration.services.netbox.package = lib.mkForce pkgs."${newNetbox}"; }; testScript = { nodes, ... }: - let - apiVersion = - version: - lib.pipe version [ - (lib.splitString ".") - (lib.take 2) - (lib.concatStringsSep ".") - ]; - oldApiVersion = apiVersion oldNetbox.version; - newApiVersion = apiVersion newNetbox.version; - in '' start_all() machine.wait_for_unit("netbox.target") diff --git a/nixos/tests/web-apps/oncall.nix b/nixos/tests/web-apps/oncall.nix new file mode 100644 index 000000000000..5fb765be6806 --- /dev/null +++ b/nixos/tests/web-apps/oncall.nix @@ -0,0 +1,156 @@ +{ + lib, + pkgs, + config, + ... +}: +let + ldapDomain = "example.org"; + ldapSuffix = "dc=example,dc=org"; + + ldapRootUser = "root"; + ldapRootPassword = "foobar23"; + + testUser = "myuser"; + testPassword = "foobar23"; + teamName = "myteam"; +in +{ + name = "oncall"; + meta.maintainers = with lib.maintainers; [ onny ]; + + nodes = { + machine = { + virtualisation.memorySize = 2048; + + environment.etc."oncall-secrets.yml".text = '' + auth: + ldap_bind_password: "${ldapRootPassword}" + ''; + + environment.systemPackages = [ pkgs.jq ]; + + services.oncall = { + enable = true; + settings = { + auth = { + module = "oncall.auth.modules.ldap_import"; + ldap_url = "ldap://localhost"; + ldap_user_suffix = ""; + ldap_bind_user = "cn=${ldapRootUser},${ldapSuffix}"; + ldap_base_dn = "ou=accounts,${ldapSuffix}"; + ldap_search_filter = "(uid=%s)"; + import_user = true; + attrs = { + username = "uid"; + full_name = "cn"; + email = "mail"; + call = "telephoneNumber"; + sms = "mobile"; + }; + }; + }; + secretFile = "/etc/oncall-secrets.yml"; + }; + + services.openldap = { + enable = true; + settings = { + children = { + "cn=schema".includes = [ + "${pkgs.openldap}/etc/schema/core.ldif" + "${pkgs.openldap}/etc/schema/cosine.ldif" + "${pkgs.openldap}/etc/schema/inetorgperson.ldif" + "${pkgs.openldap}/etc/schema/nis.ldif" + ]; + "olcDatabase={1}mdb" = { + attrs = { + objectClass = [ + "olcDatabaseConfig" + "olcMdbConfig" + ]; + olcDatabase = "{1}mdb"; + olcDbDirectory = "/var/lib/openldap/db"; + olcSuffix = ldapSuffix; + olcRootDN = "cn=${ldapRootUser},${ldapSuffix}"; + olcRootPW = ldapRootPassword; + }; + }; + }; + }; + declarativeContents = { + ${ldapSuffix} = '' + dn: ${ldapSuffix} + objectClass: top + objectClass: dcObject + objectClass: organization + o: ${ldapDomain} + + dn: ou=accounts,${ldapSuffix} + objectClass: top + objectClass: organizationalUnit + + dn: uid=${testUser},ou=accounts,${ldapSuffix} + objectClass: top + objectClass: inetOrgPerson + uid: ${testUser} + userPassword: ${testPassword} + cn: Test User + sn: User + mail: test@example.org + telephoneNumber: 012345678910 + mobile: 012345678910 + ''; + }; + }; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("uwsgi.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_file("/run/uwsgi/oncall.sock") + machine.wait_for_unit("oncall-setup-database.service") + + with subtest("Home screen loads"): + machine.succeed( + "curl -sSfL http://[::1]:80 | grep 'Oncall'" + ) + + with subtest("Staticfiles can be fetched"): + machine.wait_until_succeeds( + "curl -sSfL http://[::1]:80/static/bundles/libs.js" + ) + + with subtest("Staticfiles are generated"): + machine.succeed( + "test -e /var/lib/oncall/static/bundles/libs.js" + ) + + with subtest("Create and verify team via REST API"): + import json + + # Log in and store the session cookie + login_response = machine.succeed(""" + curl -sSfL -c cookies -X POST \ + --data-raw 'username=${testUser}&password=${testPassword}' \ + http://[::1]:80/login + """) + + # Parse csrf token + login_response_data = json.loads(login_response) + csrf_token = login_response_data["csrf_token"] + + # Create the team + machine.succeed( + f"""curl -sSfL -b cookies -X POST -H 'Content-Type: application/json' -H 'X-CSRF-Token: {csrf_token}' -d '{{"name": "${teamName}", "email": "test@example.com", "scheduling_timezone": "Europe/Berlin", "iris_enabled": false}}' http://[::1]:80/api/v0/teams/""" + ) + + # Query the created team + machine.succeed(""" + curl -sSfL -b cookies http://[::1]:80/api/v0/teams/${teamName} | jq -e '.name == "${teamName}"' + """) + + ''; +} diff --git a/nixos/tests/web-apps/tt-rss.nix b/nixos/tests/web-apps/tt-rss.nix index 7bd4413d7286..1dc2daf535d7 100644 --- a/nixos/tests/web-apps/tt-rss.nix +++ b/nixos/tests/web-apps/tt-rss.nix @@ -10,13 +10,38 @@ import ../make-test-python.nix ( enable = true; virtualHost = "localhost"; selfUrlPath = "http://localhost/"; + pluginPackages = with pkgs; [ + tt-rss-plugin-auth-ldap + tt-rss-plugin-feediron + ]; + plugins = [ + "auth_internal" + "feediron" + "note" + ]; singleUserMode = true; + themePackages = with pkgs; [ tt-rss-theme-feedly ]; }; }; testScript = '' + import json + import re machine.wait_for_unit("tt-rss.service") - machine.succeed("curl -sSfL http://localhost/ | grep 'Tiny Tiny RSS'") + + matches = re.search('__csrf_token = "([^"]*)"', machine.succeed("curl -sSfL --cookie cjar --cookie-jar cjar -sSfL http://localhost/")) + if matches is None: + assert False, "CSRF token not found" + csrf_token = matches.group(1) + + # Ensure themes are loaded. No API found for these, so it's a crude check. + preference_page = machine.succeed("curl -sSfL --cookie cjar --cookie-jar cjar http://localhost/backend.php?op=Pref_Prefs") + assert "feedly" in preference_page + + plugins = json.loads(machine.succeed(f"curl -sSfL --cookie cjar --cookie-jar cjar 'http://localhost/backend.php' -X POST --data-raw 'op=Pref_Prefs&method=getPluginsList&csrf_token={csrf_token}'"))["plugins"] + expected_plugins = ["auth_internal", "auth_ldap", "feediron", "note"]; + found_plugins = [p["name"] for p in plugins if p["name"] in expected_plugins] + assert len(found_plugins) == len(expected_plugins), f"Expected plugins {expected_plugins}, found {found_plugins}" ''; } ) diff --git a/nixos/tests/web-apps/writefreely.nix b/nixos/tests/web-apps/writefreely.nix index 3f56e1df8ead..fe9889e75332 100644 --- a/nixos/tests/web-apps/writefreely.nix +++ b/nixos/tests/web-apps/writefreely.nix @@ -1,16 +1,12 @@ { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../../.. { inherit system config; }, + runTest, + ... }: -with import ../../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; - let writefreelyTest = { name, type }: - makeTest { + runTest { name = "writefreely-${name}"; nodes.machine = diff --git a/nixos/tests/web-servers/static-web-server.nix b/nixos/tests/web-servers/static-web-server.nix index 1c88e70a0957..0727b5cba021 100644 --- a/nixos/tests/web-servers/static-web-server.nix +++ b/nixos/tests/web-servers/static-web-server.nix @@ -1,41 +1,39 @@ -import ../make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "static-web-server"; - meta = { - maintainers = with lib.maintainers; [ mac-chaffee ]; - }; +{ pkgs, lib, ... }: +{ + name = "static-web-server"; + meta = { + maintainers = with lib.maintainers; [ mac-chaffee ]; + }; - nodes.machine = - { pkgs, ... }: - { - services.static-web-server = { - enable = true; - listen = "[::]:8080"; - root = toString ( - pkgs.writeTextDir "nixos-test.html" '' -

Hello NixOS!

- '' - ); - configuration = { - general = { - directory-listing = true; - }; + nodes.machine = + { pkgs, ... }: + { + services.static-web-server = { + enable = true; + listen = "[::]:8080"; + root = toString ( + pkgs.writeTextDir "nixos-test.html" '' +

Hello NixOS!

+ '' + ); + configuration = { + general = { + directory-listing = true; }; }; }; + }; - testScript = '' - machine.start() - machine.wait_for_unit("static-web-server.socket") - machine.wait_for_open_port(8080) - # We don't use wait_until_succeeds() because we're testing socket - # activation which better work on the first request - response = machine.succeed("curl -fsS localhost:8080") - assert "nixos-test.html" in response, "The directory listing page did not include a link to our nixos-test.html file" - response = machine.succeed("curl -fsS localhost:8080/nixos-test.html") - assert "Hello NixOS!" in response - machine.wait_for_unit("static-web-server.service") - ''; - } -) + testScript = '' + machine.start() + machine.wait_for_unit("static-web-server.socket") + machine.wait_for_open_port(8080) + # We don't use wait_until_succeeds() because we're testing socket + # activation which better work on the first request + response = machine.succeed("curl -fsS localhost:8080") + assert "nixos-test.html" in response, "The directory listing page did not include a link to our nixos-test.html file" + response = machine.succeed("curl -fsS localhost:8080/nixos-test.html") + assert "Hello NixOS!" in response + machine.wait_for_unit("static-web-server.service") + ''; +} diff --git a/nixos/tests/whoami.nix b/nixos/tests/whoami.nix new file mode 100644 index 000000000000..165d8ddb8072 --- /dev/null +++ b/nixos/tests/whoami.nix @@ -0,0 +1,32 @@ +{ lib, ... }: + +{ + name = "echoip"; + meta.maintainers = with lib.maintainers; [ defelo ]; + + nodes.machine = { + services.whoami.enable = true; + }; + + interactive.nodes.machine = { + networking.firewall.allowedTCPPorts = [ 8000 ]; + virtualisation.forwardPorts = [ + { + from = "host"; + host.port = 8000; + guest.port = 8000; + } + ]; + }; + + testScript = '' + import re + + machine.wait_for_unit("whoami.service") + machine.wait_for_open_port(8000) + + response = machine.succeed("curl -H 'X-Test-Header: Hello World!' http://127.0.0.1:8000/test") + assert re.search(r"^GET /test", response, re.M) + assert re.search(r"^X-Test-Header: Hello World!", response, re.M) + ''; +} diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index d639b3d6dfa2..0d789a4ac425 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -89,6 +89,7 @@ rec { { } [ "6_7" + "6_8" ]; testScript = '' diff --git a/nixos/tests/wstunnel.nix b/nixos/tests/wstunnel.nix index 753f78061e7b..12547213f20b 100644 --- a/nixos/tests/wstunnel.nix +++ b/nixos/tests/wstunnel.nix @@ -8,8 +8,6 @@ in { name = "wstunnel"; - meta.platforms = lib.platforms.linux; - nodes = { server = { virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/xmpp/xmpp-sendmessage.nix b/nixos/tests/xmpp/xmpp-sendmessage.nix index 62971d867304..21f471261cc6 100644 --- a/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -15,7 +15,16 @@ let ''; in writeScriptBin "send-message" '' - #!${(python3.withPackages (ps: [ ps.slixmpp ])).interpreter} + #!${ + (python3.withPackages ( + ps: + with ps; + [ + slixmpp + ] + ++ slixmpp.optional-dependencies.xep-0363 + )).interpreter + } import logging import sys import signal @@ -89,7 +98,7 @@ writeScriptBin "send-message" '' # MUC ct.register_plugin('xep_0045') ct.connect(("${connectTo}", 5222)) - ct.process(forever=False) + ct.loop.run_until_complete(ct.disconnected) if not ct.test_succeeded: sys.exit(1) diff --git a/nixos/tests/yarr.nix b/nixos/tests/yarr.nix new file mode 100644 index 000000000000..a35d574a5af1 --- /dev/null +++ b/nixos/tests/yarr.nix @@ -0,0 +1,19 @@ +{ lib, pkgs, ... }: + +{ + name = "yarr"; + meta.maintainers = with lib.maintainers; [ christoph-heiss ]; + + nodes.machine = + { pkgs, ... }: + { + services.yarr.enable = true; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("yarr.service") + machine.wait_for_open_port(7070) + machine.succeed("curl -sSf http://localhost:7070 | grep 'yarr!'") + ''; +} diff --git a/nixos/tests/zram-generator.nix b/nixos/tests/zram-generator.nix index 46414efee4b3..5f6432a78857 100644 --- a/nixos/tests/zram-generator.nix +++ b/nixos/tests/zram-generator.nix @@ -38,9 +38,9 @@ machine.wait_for_unit("systemd-zram-setup@zram0.service") machine.wait_for_unit("systemd-zram-setup@zram1.service") zram = machine.succeed("zramctl --noheadings --raw") - swap = machine.succeed("swapon --show --noheadings") + swap = machine.succeed("swapon --show --noheadings --raw") for i in range(2): assert f"/dev/zram{i} lz4 10M" in zram - assert f"/dev/zram{i} partition 10M" in swap + assert f"/dev/zram{i} partition 10M" in swap ''; } diff --git a/pkgs/README.md b/pkgs/README.md index e6a05c19f834..878db5df8397 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -30,12 +30,32 @@ Before adding a new package, please consider the following questions: * Is the package ready for general use? We don't want to include projects that are too immature or are going to be abandoned immediately. In case of doubt, check with upstream. * Does the project have a clear license statement? Remember that software is unfree by default (all rights reserved), and merely providing access to the source code does not imply its redistribution. In case of doubt, ask upstream. -* How realistic is it that it will be used by other people? It's good that nixpkgs caters to various niches, but if it's a niche of 5 people it's probably too small. +* How realistic is it that it will be used by other people? It's good that nixpkgs caters to various niches, but if it's a niche of 5 people it's probably too small. A good estimate is checking upstream issues and pull requests, or other software repositories. Library packages should have at least one dependent. +* Is the software actively maintained upstream? Especially packages that are security-critical, rely on fast-moving dependencies, or affect data integrity should see regular maintenance. * Are you willing to maintain the package? You should care enough about the package to be willing to keep it up and running for at least one complete Nixpkgs' release life-cycle. * In case you are not able to maintain the package you wrote, you can seek someone to fill that role, effectively adopting the package. If any of these questions' answer is no, then you should probably not add the package. +Special care has to be taken with security-critical software components. Because entries in the Nix store are inert and do nothing by themselves, packages should be considered by their intended use, e.g. when used together with a NixOS module. + +* Any package that immediately would need to be tagged with `meta.knownVulnerabilities` is unlikely to be fit for nixpkgs. +* Any package depending on a known-vulnerable library should be considered carefully. +* Packages typically used with untrusted data should have a maintained and responsible upstream. For example: + * Any package which does not follow upstream security policies should be considered vulnerable. In particular, packages that vendor or fork web engines like Blink, Gecko or Webkit need to keep up with the frequent updates of those projects. + * Any security-critical fast-moving package such as Chrome or Firefox (or their forks) must have at least one active committer among the maintainers. This ensures no critical fixes are delayed unnecessarily, endangering unsuspecting users. + * Services which typically work on web traffic are working on untrusted input. + * Data (such as archives or rich documents) commonly shared over untrusted channels (e.g. email) is untrusted. +* Applications in the Unix authentication stack such as PAM/D-Bus modules or SUID binaries should be considered carefully, and should have a maintained and responsible upstream. +* Encryption libraries should have a maintained and responsible upstream. +* Security-critical components that are part of larger packages should be unvendored (=use the nixpkgs package as dependency, instead of vendored and pinned sources). +* A "responsible upstream" includes various aspects, such as: + * channels to disclose security concerns + * being responsive to security concerns, providing fixes or workarounds + * transparent public disclosure of security issues when they are found or fixed + * These aspects are sometimes hard to verify, in which case an upstream that is not known to be irresponsible should be considered as responsible. +* Source-available software should be built from source where possible. Binary blobs risk supply chain attacks and vendored outdated libraries. + This section describes a general framework of understanding and exceptions might apply. Luckily it's pretty easy to maintain your own package set with Nix, which can then be added to the [Nix User Repository](https://github.com/nix-community/nur) project. @@ -501,28 +521,29 @@ When using the `patches` parameter to `mkDerivation`, make sure the patch name c ### Fetching patches -In the interest of keeping our maintenance burden and the size of Nixpkgs to a minimum, patches already merged upstream or published elsewhere _should_ be retrieved using `fetchpatch`: +In the interest of keeping our maintenance burden and the size of Nixpkgs to a minimum, patches already merged upstream or published elsewhere _should_ be retrieved using `fetchpatch2`: ```nix { patches = [ - (fetchpatch { + (fetchpatch2 { name = "fix-check-for-using-shared-freetype-lib.patch"; - url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=8f5d285"; + url = "https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/patch/?id=8f5d28536e4518716fdfe974e580194c8f57871d"; hash = "sha256-uRcxaCjd+WAuGrXOmGfFeu79cUILwkRdBu48mwcBE7g="; }) ]; } ``` -If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`. Check [the `fetchpatch` reference](https://nixos.org/manual/nixpkgs/unstable/#fetchpatch) for details. +If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch2`. Check [the `fetchpatch` reference](https://nixos.org/manual/nixpkgs/unstable/#fetchpatch) for details. + +When adding patches in this manner you should be reasonably sure that the used URL is stable. Patches referencing open pull requests will change when the PR is updated and code forges (such as GitHub) usually garbage collect commits that are no longer reachable due to rebases/amends. ### Vendoring patches In the following cases, a `.patch` file _should_ be added to Nixpkgs repository, instead of retrieved: - solves problems unique to packaging in Nixpkgs -- is already proposed upstream but not merged yet - cannot be fetched easily - has a high chance to disappear in the future due to unstable or unreliable URLs diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix deleted file mode 100644 index 99dca3fe1716..000000000000 --- a/pkgs/applications/audio/abcde/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - libcdio-paranoia, - cddiscid, - wget, - which, - vorbis-tools, - id3v2, - eyed3, - lame, - flac, - glyr, - perlPackages, - makeWrapper, -}: - -let - version = "2.9.3"; -in -stdenv.mkDerivation { - pname = "abcde"; - inherit version; - src = fetchurl { - url = "https://abcde.einval.com/download/abcde-${version}.tar.gz"; - sha256 = "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04"; - }; - - # FIXME: This package does not support `distmp3', `eject', etc. - - configurePhase = '' - sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; - s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ; - s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \ - "Makefile"; - - echo 'CDPARANOIA=${libcdio-paranoia}/bin/cd-paranoia' >>abcde.conf - echo CDROMREADERSYNTAX=cdparanoia >>abcde.conf - - substituteInPlace "abcde" \ - --replace "/etc/abcde.conf" "$out/etc/abcde.conf" - ''; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = with perlPackages; [ - perl - MusicBrainz - MusicBrainzDiscID - IOSocketSSL - ]; - - installFlags = [ "sysconfdir=$(out)/etc" ]; - - postFixup = '' - for cmd in abcde cddb-tool abcde-musicbrainz-tool; do - wrapProgram "$out/bin/$cmd" \ - --prefix PERL5LIB : "$PERL5LIB" \ - --prefix PATH ":" ${ - lib.makeBinPath [ - "$out" - which - libcdio-paranoia - cddiscid - wget - vorbis-tools - id3v2 - eyed3 - lame - flac - glyr - ] - } - done - ''; - - meta = with lib; { - homepage = "http://abcde.einval.com/wiki/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - description = "Command-line audio CD ripper"; - longDescription = '' - abcde is a front-end command-line utility (actually, a shell - script) that grabs tracks off a CD, encodes them to - Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack) - format, and tags them, all in one go. - ''; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix deleted file mode 100644 index bf1278e42ce8..000000000000 --- a/pkgs/applications/audio/adlplug/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - fmt, - liblo, - alsa-lib, - freetype, - libX11, - libXrandr, - libXinerama, - libXext, - libXcursor, - - # Enabling JACK requires a JACK server at runtime, no fallback mechanism - withJack ? false, - jack, - - type ? "ADL", -}: - -assert lib.assertOneOf "type" type [ - "ADL" - "OPN" -]; -let - chip = - { - ADL = "OPL3"; - OPN = "OPN2"; - } - .${type}; - mainProgram = "${type}plug"; -in -stdenv.mkDerivation rec { - pname = "${lib.strings.toLower type}plug"; - version = "unstable-2021-12-17"; - - src = fetchFromGitHub { - owner = "jpcima"; - repo = "ADLplug"; - rev = "a488abedf1783c61cb4f0caa689f1b01bf9aa17d"; - fetchSubmodules = true; - sha256 = "1a5zw0rglqgc5wq1n0s5bxx7y59dsg6qy02236fakl34bvbk60yz"; - }; - - cmakeFlags = [ - "-DADLplug_CHIP=${chip}" - "-DADLplug_USE_SYSTEM_FMT=ON" - "-DADLplug_Jack=${if withJack then "ON" else "OFF"}" - ]; - - NIX_LDFLAGS = toString ( - lib.optionals stdenv.hostPlatform.isDarwin [ - # Framework that JUCE needs which don't get linked properly - "-framework CoreAudioKit" - "-framework QuartzCore" - "-framework AudioToolbox" - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - # JUCE dlopen's these at runtime - "-lX11" - "-lXext" - "-lXcursor" - "-lXinerama" - "-lXrandr" - ] - ); - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = - [ - fmt - liblo - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - freetype - libX11 - libXrandr - libXinerama - libXext - libXcursor - ] - ++ lib.optional withJack jack; - - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/{Applications,Library/Audio/Plug-Ins/{VST,Components}} - - mv $out/bin/${mainProgram}.app $out/Applications/ - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram} - - mv vst2/${mainProgram}.vst $out/Library/Audio/Plug-Ins/VST/ - mv au/${mainProgram}.component $out/Library/Audio/Plug-Ins/Components/ - ''; - - meta = with lib; { - inherit mainProgram; - description = "${chip} FM Chip Synthesizer"; - homepage = src.meta.homepage; - license = licenses.boost; - platforms = platforms.all; - maintainers = with maintainers; [ OPNA2608 ]; - }; -} diff --git a/pkgs/applications/audio/ardour/7.nix b/pkgs/applications/audio/ardour/7.nix index 0830ff4ddf54..45c6b132d59b 100644 --- a/pkgs/applications/audio/ardour/7.nix +++ b/pkgs/applications/audio/ardour/7.nix @@ -7,7 +7,7 @@ fetchpatch2, alsa-lib, aubio, - boost, + boost186, cairomm, cppunit, curl, @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { [ alsa-lib aubio - boost + boost186 cairomm cppunit curl diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix deleted file mode 100644 index 5bf7445d2682..000000000000 --- a/pkgs/applications/audio/bambootracker/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - gitUpdater, - pkg-config, - qmake, - qt5compat ? null, - qtbase, - qttools, - qtwayland, - rtaudio_6, - rtmidi, - wrapQtAppsHook, -}: - -assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null; - -stdenv.mkDerivation (finalAttrs: { - pname = "bambootracker"; - version = "0.6.4"; - - src = fetchFromGitHub { - owner = "BambooTracker"; - repo = "BambooTracker"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-tFUliKR55iZybNyYIF1FXh8RGf8jKEsGrWBuldB277g="; - }; - - postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") '' - # Work around lrelease finding in qmake being broken by using pre-Qt5.12 code path - # https://github.com/NixOS/nixpkgs/issues/214765 - substituteInPlace BambooTracker/lang/lang.pri \ - --replace 'equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12)' 'if(true)' - ''; - - nativeBuildInputs = [ - pkg-config - qmake - qttools - wrapQtAppsHook - ]; - - buildInputs = - [ - qtbase - rtaudio_6 - rtmidi - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland - ] - ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ - qt5compat - ]; - - qmakeFlags = - [ - "CONFIG+=system_rtaudio" - "CONFIG+=system_rtmidi" - ] - ++ lib.optionals (stdenv.cc.isClang || (lib.versionAtLeast qtbase.version "6.0")) [ - # Clang is extra-strict about some deprecations - # Latest Qt6 deprecated QCheckBox::stateChanged(int) - "CONFIG+=no_warnings_are_errors" - ]; - - postConfigure = "make qmake_all"; - - # Wrapping the inside of the app bundles, avoiding double-wrapping - dontWrapQtApps = stdenv.hostPlatform.isDarwin; - - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - mv $out/{bin,Applications}/BambooTracker.app - ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker - wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker - ''; - - passthru = { - updateScript = gitUpdater { - rev-prefix = "v"; - }; - }; - - meta = with lib; { - description = "Tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; - mainProgram = "BambooTracker"; - homepage = "https://bambootracker.github.io/BambooTracker/"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ OPNA2608 ]; - }; -}) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 510c9b238c2e..38f8f1cac98c 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -16,6 +16,7 @@ libjack2, libjpeg, libnghttp2, + libudev-zero, libxkbcommon, makeWrapper, pango, @@ -30,12 +31,12 @@ stdenv.mkDerivation rec { pname = "bitwig-studio-unwrapped"; - version = "5.3.1"; + version = "5.3.5"; src = fetchurl { name = "bitwig-studio-${version}.deb"; url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/"; - hash = "sha256-mxodFCu4SDzofnoZZZ7TPDUIrRc3UJt8TuEBwDOo2wQ="; + hash = "sha256-dfEWOQTZVMUb6v+u2wQlFgTXupokFTjWgKKA6W/Rrzc="; }; nativeBuildInputs = [ @@ -66,6 +67,7 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXtst libxkbcommon + libudev-zero pango pipewire (lib.getLib stdenv.cc.cc) diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix deleted file mode 100644 index eee2d7f1b2dd..000000000000 --- a/pkgs/applications/audio/calf/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - stdenv, - cairo, - expat, - fftwSinglePrec, - fluidsynth, - glib, - gtk2, - libjack2, - ladspaH, - libglade, - lv2, - pkg-config, - fetchFromGitHub, - cmake, -}: -stdenv.mkDerivation rec { - pname = "calf"; - version = "0.90.4"; - - src = fetchFromGitHub { - owner = "calf-studio-gear"; - repo = "calf"; - tag = version; - hash = "sha256-E9H2YG1HAhIN+zJxDKIJTkJapbNz8h9dfd5YfZp9Zp0="; - }; - - outputs = [ - "out" - "doc" - ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - cairo - expat - fftwSinglePrec - fluidsynth - glib - gtk2 - libjack2 - ladspaH - libglade - lv2 - ]; - - meta = { - homepage = "https://calf-studio-gear.org"; - description = "Set of high quality open source audio plugins for musicians"; - license = lib.licenses.lgpl2; - maintainers = [ ]; - platforms = lib.platforms.linux; - mainProgram = "calfjackhost"; - }; -} diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix deleted file mode 100644 index 25898ef8bd27..000000000000 --- a/pkgs/applications/audio/cd-discid/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - fetchurl, - lib, - stdenv, - IOKit ? null, -}: - -stdenv.mkDerivation rec { - pname = "cd-discid"; - version = "1.4"; - - src = fetchurl { - url = "http://linukz.org/download/${pname}-${version}.tar.gz"; - sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz"; - }; - - installFlags = [ - "PREFIX=$(out)" - "INSTALL=install" - ]; - - buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; - - meta = with lib; { - homepage = "http://linukz.org/cd-discid.shtml"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - description = "Command-line utility to get CDDB discid information from a CD-ROM disc"; - mainProgram = "cd-discid"; - - longDescription = '' - cd-discid is a backend utility to get CDDB discid information - from a CD-ROM disc. It was originally designed for cdgrab (now - abcde), but can be used for any purpose requiring CDDB data. - ''; - }; -} diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 54fe24415840..aa640b573ddd 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -9,13 +9,6 @@ which, DarwinTools, xcbuild, - AppKit, - Carbon, - CoreAudio, - CoreMIDI, - CoreServices, - Kernel, - MultitouchSupport, }: stdenv.mkDerivation rec { @@ -38,18 +31,7 @@ stdenv.mkDerivation rec { xcbuild ]; - buildInputs = - [ libsndfile ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Carbon - CoreAudio - CoreMIDI - CoreServices - Kernel - MultitouchSupport - ]; + buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib; patches = [ ./darwin-limits.patch ]; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index a236c6867994..6d48c703765c 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clementine"; - version = "1.4.1-37-g3369f3085"; + version = "1.4.1-44-g41bcdca7f"; src = fetchFromGitHub { owner = "clementine-player"; repo = "Clementine"; tag = finalAttrs.version; - hash = "sha256-zwt4PkCXVYJn8IsZL0JEJLX1LiAvDrNdhh0s2oDxGgY="; + hash = "sha256-LyYbcr0d0DI5nqNor6sXg7Hc/kYlORU9s8UJnQvSnZs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index d4fef58281d0..167330ef6c6d 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -6,9 +6,6 @@ ncurses, pkg-config, libiconv, - CoreAudio, - AudioUnit, - VideoToolbox, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib ? null, @@ -152,9 +149,6 @@ stdenv.mkDerivation rec { [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreAudio - AudioUnit - VideoToolbox ] ++ lib.flatten (lib.concatMap (a: a.deps) opts); diff --git a/pkgs/applications/audio/codecserver/default.nix b/pkgs/applications/audio/codecserver/default.nix index c055c72c4eaf..2a632dc47319 100644 --- a/pkgs/applications/audio/codecserver/default.nix +++ b/pkgs/applications/audio/codecserver/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Modular audio codec server"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = teams.c3d2.members; + teams = [ teams.c3d2 ]; mainProgram = "codecserver"; }; } diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 430bd1cb9fed..dc8989ef357c 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -9,10 +9,6 @@ bison, boost, gettext, - Accelerate, - AudioUnit, - CoreAudio, - CoreMIDI, portaudio, alsa-lib ? null, libpulseaudio ? null, @@ -61,10 +57,6 @@ stdenv.mkDerivation { boost ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - AudioUnit - CoreAudio - CoreMIDI portaudio ] ++ lib.optionals stdenv.hostPlatform.isLinux ( @@ -93,5 +85,6 @@ stdenv.mkDerivation { license = licenses.lgpl21Plus; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 537ed9880665..222dfa3acb4e 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -70,7 +70,7 @@ assert gtk2Support || gtk3Support; let inherit (lib) optionals; - version = "1.9.6"; + version = "1.10.0"; in clangStdenv.mkDerivation { pname = "deadbeef"; @@ -81,7 +81,7 @@ clangStdenv.mkDerivation { repo = "deadbeef"; fetchSubmodules = true; rev = version; - hash = "sha256-Q6hL4fOFPHn26ZqvrebgTMTgQZrhbXCEhM4ZFzNeyJE="; + hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q="; }; buildInputs = diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 9f2f4e2437b3..f9e224be71fa 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "drumkv1"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/drumkv1/drumkv1-${version}.tar.gz"; - hash = "sha256-WcWhq1Li9dfj0piyW6F0mdfzcK+nvk5Rtl8pQZTYyt8="; + hash = "sha256-CzboTrMRxPr5O6caKrxW9X9uSi5Su5LRSQpwJBMGkGI="; }; buildInputs = [ diff --git a/pkgs/applications/audio/easyabc/default.nix b/pkgs/applications/audio/easyabc/default.nix deleted file mode 100644 index 16026b12750d..000000000000 --- a/pkgs/applications/audio/easyabc/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchPypi, - replaceVars, - python39, - fluidsynth, - soundfont-fluid, - wrapGAppsHook3, - abcmidi, - abcm2ps, - ghostscript, -}: - -let - # requires python39 due to https://stackoverflow.com/a/71902541 https://github.com/jwdj/EasyABC/issues/52 - python = python39.override { - self = python; - packageOverrides = self: super: { - # currently broken with 4.2.1 - # https://github.com/jwdj/EasyABC/issues/75 - wxpython = super.wxpython.overrideAttrs (args: rec { - version = "4.2.0"; - src = fetchPypi { - inherit version; - pname = "wxPython"; - hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc="; - }; - }); - }; - }; -in -python.pkgs.buildPythonApplication { - pname = "easyabc"; - version = "1.3.8.6"; - - src = fetchFromGitHub { - owner = "jwdj"; - repo = "easyabc"; - rev = "6461b2c14280cb64224fc5299c31cfeef9b7d43c"; - hash = "sha256-leC3A4HQMeJNeZXArb3YAYr2mddGPcws618NrRh2Q1Y="; - }; - - nativeBuildInputs = [ wrapGAppsHook3 ]; - - propagatedBuildInputs = with python.pkgs; [ - cx-freeze - wxpython - pygame - ]; - - # apparently setup.py only supports Windows and Darwin - # everything is very non-standard in this project - dontBuild = true; - format = "other"; - - # https://discourse.nixos.org/t/packaging-mcomix3-python-gtk-missing-gsettings-schemas-issue/10190/2 - strictDeps = false; - - patches = [ - (replaceVars ./hardcoded-paths.patch { - fluidsynth = "${fluidsynth}/lib/libfluidsynth.so"; - soundfont = "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2"; - ghostscript = "${ghostscript}/bin/gs"; - }) - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/easyabc - mv * $out/share/easyabc - - ln -s ${abcmidi}/bin/abc2midi $out/share/easyabc/bin/abc2midi - ln -s ${abcmidi}/bin/midi2abc $out/share/easyabc/bin/midi2abc - ln -s ${abcmidi}/bin/abc2abc $out/share/easyabc/bin/abc2abc - ln -s ${abcm2ps}/bin/abcm2ps $out/share/easyabc/bin/abcm2ps - - makeWrapper ${python.interpreter} $out/bin/easyabc \ - --set PYTHONPATH "$PYTHONPATH:$out/share/easyabc" \ - --add-flags "-O $out/share/easyabc/easy_abc.py" - - runHook postInstall - ''; - - meta = { - description = "ABC music notation editor"; - mainProgram = "easyabc"; - homepage = "https://easyabc.sourceforge.net/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ mausch ]; - }; -} diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 14835a9e0b60..19b5dd800b5b 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -17,9 +17,6 @@ pcaudiolib, sonicSupport ? true, sonic, - CoreAudio, - AudioToolbox, - AudioUnit, alsa-plugins, makeWrapper, }: @@ -63,12 +60,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional mbrolaSupport mbrola ++ lib.optional pcaudiolibSupport pcaudiolib - ++ lib.optional sonicSupport sonic - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio - AudioToolbox - AudioUnit - ]; + ++ lib.optional sonicSupport sonic; # touch ChangeLog to avoid below error on darwin: # Makefile.am: error: required file './ChangeLog.md' not found diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix deleted file mode 100644 index 9304f4536e19..000000000000 --- a/pkgs/applications/audio/faust/faust2.nix +++ /dev/null @@ -1,289 +0,0 @@ -{ - lib, - stdenv, - coreutils, - fetchFromGitHub, - makeWrapper, - pkg-config, - cmake, - llvm_18, # does not build with 19+ due to API changes - emscripten, - openssl, - libsndfile, - libmicrohttpd, - gnutls, - libtasn1, - libxml2, - p11-kit, - vim, - which, - ncurses, - fetchpatch, -}: - -with lib.strings; - -let - - version = "2.79.3"; - - src = fetchFromGitHub { - owner = "grame-cncm"; - repo = "faust"; - rev = version; - hash = "sha256-Rn+Cjpk4vttxARrkDSnpKdBdSRtgElsit8zu1BA8Jd4="; - fetchSubmodules = true; - }; - - meta = with lib; { - homepage = "https://faust.grame.fr/"; - downloadPage = "https://github.com/grame-cncm/faust/"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ - magnetophon - pmahoney - ]; - }; - - faust = - let - ncurses_static = ncurses.override { enableStatic = true; }; - in - stdenv.mkDerivation { - - pname = "faust"; - inherit version; - - inherit src; - - nativeBuildInputs = [ - makeWrapper - pkg-config - cmake - vim - which - ]; - buildInputs = [ - llvm_18 - emscripten - openssl - libsndfile - libmicrohttpd - gnutls - libtasn1 - p11-kit - ncurses_static - libxml2 - ]; - - passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; }; - - preConfigure = '' - # include llvm-config in path - export PATH="${lib.getDev llvm_18}/bin:$PATH" - cd build - substituteInPlace Make.llvm.static \ - --replace 'mkdir -p $@ && cd $@ && ar -x ../../$<' 'mkdir -p $@ && cd $@ && ar -x ../source/build/lib/libfaust.a && cd ../source/build/' - substituteInPlace Make.llvm.static \ - --replace 'rm -rf $(TMP)' ' ' \ - --replace-fail "ar" "${stdenv.cc.targetPrefix}ar" - sed -i 's@LIBNCURSES_PATH ?= .*@LIBNCURSES_PATH ?= ${ncurses_static}/lib/libncurses.a@' Make.llvm.static - cd .. - shopt -s globstar - for f in **/Makefile **/Makefile.library **/CMakeLists.txt build/Make.llvm.static embedded/faustjava/faust2engine architecture/autodiff/autodiff.sh source/tools/faust2appls/* **/llvm.cmake tools/benchmark/faust2object; do - echo $f "llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - substituteInPlace $f \ - --replace-quiet "llvm-config" "llvm-config${ - lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native" - }" - done - shopt -u globstar - cd build - ''; - - cmakeFlags = [ - "-C../backends/all.cmake" - "-C../targets/all.cmake" - ]; - - postInstall = '' - # syntax error when eval'd directly - pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" - (shopt -s extglob; rm "$out"/bin/$pattern) - ''; - - postFixup = '' - # The 'faustoptflags' is 'source'd into other faust scripts and - # not used as an executable, so patch 'uname' usage directly - # rather than use makeWrapper. - substituteInPlace "$out"/bin/faustoptflags \ - --replace uname "${coreutils}/bin/uname" - - # wrapper for scripts that don't need faust.wrap* - for script in "$out"/bin/faust2*; do - wrapProgram "$script" \ - --prefix PATH : "$out"/bin - done - ''; - - meta = meta // { - description = "A functional programming language for realtime audio signal processing"; - longDescription = '' - FAUST (Functional Audio Stream) is a functional programming - language specifically designed for real-time signal processing - and synthesis. FAUST targets high-performance signal processing - applications and audio plug-ins for a variety of platforms and - standards. - The Faust compiler translates DSP specifications into very - efficient C++ code. Thanks to the notion of architecture, - FAUST programs can be easily deployed on a large variety of - audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, - puredata, csound, supercollider, pure, vst, coreaudio) without - any change to the FAUST code. - - This package has just the compiler, libraries, and headers. - Install faust2* for specific faust2appl scripts. - ''; - }; - - }; - - # Default values for faust2appl. - faust2ApplBase = - { - baseName, - dir ? "tools/faust2appls", - scripts ? [ baseName ], - ... - }@args: - - args - // { - name = "${baseName}-${version}"; - - inherit src; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/bin" - for script in ${concatStringsSep " " scripts}; do - cp "${dir}/$script" "$out/bin/" - done - - runHook postInstall - ''; - - postInstall = '' - # For the faust2appl script, change 'faustpath' and - # 'faustoptflags' to absolute paths. - for script in "$out"/bin/*; do - substituteInPlace "$script" \ - --replace " error " "echo" - done - ''; - - meta = meta // { - description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing"; - }; - }; - - # Some 'faust2appl' scripts, such as faust2alsa, run faust to - # generate cpp code, then invoke the c++ compiler to build the code. - # This builder wraps these scripts in parts of the stdenv such that - # when the scripts are called outside any nix build, they behave as - # if they were running inside a nix build in terms of compilers and - # paths being configured (e.g. rpath is set so that compiled - # binaries link to the libs inside the nix store) - # - # The function takes two main args: the appl name (e.g. - # 'faust2alsa') and an optional list of propagatedBuildInputs. It - # returns a derivation that contains only the bin/${appl} script, - # wrapped up so that it will run as if it was inside a nix build - # with those build inputs. - # - # The build input 'faust' is automatically added to the - # propagatedBuildInputs. - wrapWithBuildEnv = - { - baseName, - propagatedBuildInputs ? [ ], - ... - }@args: - - stdenv.mkDerivation ( - (faust2ApplBase args) - // { - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - - propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; - - libPath = lib.makeLibraryPath propagatedBuildInputs; - - postFixup = '' - - # export parts of the build environment - for script in "$out"/bin/*; do - # e.g. NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu - nix_cc_wrapper_target_host="$(printenv | grep ^NIX_CC_WRAPPER_TARGET_HOST | sed 's/=.*//')" - - # e.g. NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu - nix_bintools_wrapper_target_host="$(printenv | grep ^NIX_BINTOOLS_WRAPPER_TARGET_HOST | sed 's/=.*//')" - - wrapProgram "$script" \ - --set FAUSTLDDIR "${faust}/lib" \ - --set FAUSTLIB "${faust}/share/faust" \ - --set FAUSTINC "${faust}/include/faust" \ - --set FAUSTARCH "${faust}/share/faust" \ - --prefix PATH : "$PATH" \ - --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ - --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ - --set NIX_LDFLAGS "$NIX_LDFLAGS -lpthread" \ - --set "$nix_cc_wrapper_target_host" "''${!nix_cc_wrapper_target_host}" \ - --set "$nix_bintools_wrapper_target_host" "''${!nix_bintools_wrapper_target_host}" \ - --prefix LIBRARY_PATH "$libPath" - done - ''; - } - ); - - # Builder for 'faust2appl' scripts, such as faust2firefox that - # simply need to be wrapped with some dependencies on PATH. - # - # The build input 'faust' is automatically added to the PATH. - wrap = - { - baseName, - runtimeInputs ? [ ], - ... - }@args: - - let - - runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); - - in - stdenv.mkDerivation ( - (faust2ApplBase args) - // { - - nativeBuildInputs = [ makeWrapper ]; - - postFixup = '' - for script in "$out"/bin/*; do - wrapProgram "$script" --prefix PATH : "${runtimePath}" - done - ''; - - } - ); - -in -faust diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/pkgs/applications/audio/faust/faust2alqt.nix deleted file mode 100644 index 66d394e9d740..000000000000 --- a/pkgs/applications/audio/faust/faust2alqt.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - faust, - alsa-lib, - qtbase, - writeText, - buildPackages, -}: -let - # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH - wrapBinary = writeText "wrapBinary" '' - source ${buildPackages.makeWrapper}/nix-support/setup-hook - for p in $FILES; do - workpath=$PWD - cd -- "$(dirname "$p")" - binary=$(basename --suffix=.dsp "$p") - rm -f .$binary-wrapped - wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" - sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g' - cd $workpath - done - ''; -in -faust.wrapWithBuildEnv { - - baseName = "faust2alqt"; - - propagatedBuildInputs = [ - alsa-lib - qtbase - ]; - - dontWrapQtApps = true; - - preFixup = '' - for script in "$out"/bin/*; do - # append the wrapping code to the compilation script - cat ${wrapBinary} >> $script - # prevent the qmake error when running the script - sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script - done - ''; -} diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix deleted file mode 100644 index 77f9b3910234..000000000000 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - faust, - gtk2, - jack2, - alsa-lib, - opencv, - libsndfile, - which, -}: - -faust.wrapWithBuildEnv { - - baseName = "faust2jack"; - - scripts = [ - "faust2jack" - "faust2jackconsole" - ]; - - propagatedBuildInputs = [ - gtk2 - jack2 - alsa-lib - opencv - libsndfile - which - ]; - -} diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix deleted file mode 100644 index 5429d1bfb45a..000000000000 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - bash, - faust, - jack2, - qtbase, - libsndfile, - alsa-lib, - writeText, - buildPackages, - which, -}: -let - # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH - wrapBinary = writeText "wrapBinary" '' - source ${buildPackages.makeWrapper}/nix-support/setup-hook - for p in $FILES; do - workpath=$PWD - cd -- "$(dirname "$p")" - binary=$(basename --suffix=.dsp "$p") - rm -f .$binary-wrapped - wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" - sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g' - cd $workpath - done - ''; -in -faust.wrapWithBuildEnv { - - baseName = "faust2jaqt"; - - scripts = [ - "faust2jaqt" - "faust2jackserver" - ]; - - buildInputs = [ - bash - ]; - - propagatedBuildInputs = [ - jack2 - qtbase - libsndfile - alsa-lib - which - ]; - - dontWrapQtApps = true; - - preFixup = '' - for script in "$out"/bin/*; do - # append the wrapping code to the compilation script - cat ${wrapBinary} >> $script - # prevent the qmake error when running the script - sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script - done - ''; -} diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/applications/audio/faust/faust2lv2.nix deleted file mode 100644 index 4a310440ad8a..000000000000 --- a/pkgs/applications/audio/faust/faust2lv2.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - bash, - boost, - faust, - lv2, - qtbase, -}: - -faust.wrapWithBuildEnv { - - baseName = "faust2lv2"; - - buildInputs = [ - bash - ]; - - propagatedBuildInputs = [ - boost - lv2 - qtbase - ]; - - dontWrapQtApps = true; - - preFixup = '' - sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" "$out"/bin/faust2lv2; - ''; -} diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix deleted file mode 100644 index 90e3d80ad14d..000000000000 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - nixosTests, - alsa-lib, - SDL2, - libiconv, - CoreAudio, - CoreMIDI, - CoreServices, - Cocoa, -}: - -stdenv.mkDerivation rec { - pname = "ft2-clone"; - version = "1.95"; - - src = fetchFromGitHub { - owner = "8bitbubsy"; - repo = "ft2-clone"; - rev = "v${version}"; - hash = "sha256-Xb4LHoon56P6OmHvd7RkODrOc4MDa0+U8npypGhcyw4="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = - [ SDL2 ] - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - CoreAudio - CoreMIDI - CoreServices - Cocoa - ]; - - passthru.tests = { - ft2-clone-starts = nixosTests.ft2-clone; - }; - - meta = with lib; { - description = "Highly accurate clone of the classic Fasttracker II software for MS-DOS"; - homepage = "https://16-bits.org/ft2.php"; - license = licenses.bsd3; - maintainers = with maintainers; [ fgaz ]; - # From HOW-TO-COMPILE.txt: - # > This code is NOT big-endian compatible - platforms = platforms.littleEndian; - mainProgram = "ft2-clone"; - }; -} diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix deleted file mode 100644 index e31dbbed38b2..000000000000 --- a/pkgs/applications/audio/grandorgue/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - fftwFloat, - alsa-lib, - zlib, - wavpack, - wxGTK32, - udev, - jackaudioSupport ? false, - libjack2, - imagemagick, - libicns, - yaml-cpp, - makeWrapper, - Cocoa, - includeDemo ? true, -}: - -stdenv.mkDerivation rec { - pname = "grandorgue"; - version = "3.15.4-1"; - - src = fetchFromGitHub { - owner = "GrandOrgue"; - repo = "grandorgue"; - rev = version; - fetchSubmodules = true; - hash = "sha256-9H7YpTtv9Y36Nc0WCyRy/ohpOQ3WVUd9gMahnGhANRc="; - }; - - patches = [ ./darwin-fixes.patch ]; - - nativeBuildInputs = [ - cmake - pkg-config - imagemagick - libicns - makeWrapper - ]; - - buildInputs = - [ - fftwFloat - zlib - wavpack - wxGTK32 - yaml-cpp - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - udev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] - ++ lib.optional jackaudioSupport libjack2; - - cmakeFlags = - lib.optionals (!jackaudioSupport) [ - "-DRTAUDIO_USE_JACK=OFF" - "-DRTMIDI_USE_JACK=OFF" - "-DGO_USE_JACK=OFF" - "-DINSTALL_DEPEND=OFF" - ] - ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF"; - - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/{Applications,bin,lib} - mv $out/GrandOrgue.app $out/Applications/ - for lib in $out/Applications/GrandOrgue.app/Contents/Frameworks/lib*; do - ln -s $lib $out/lib/ - done - makeWrapper $out/{Applications/GrandOrgue.app/Contents/MacOS,bin}/GrandOrgue - ''; - - meta = { - description = "Virtual Pipe Organ Software"; - homepage = "https://github.com/GrandOrgue/grandorgue"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.puzzlewolf ]; - mainProgram = "GrandOrgue"; - }; -} diff --git a/pkgs/applications/audio/hushboard/default.nix b/pkgs/applications/audio/hushboard/default.nix index e5953a922e8e..19b072a361e2 100644 --- a/pkgs/applications/audio/hushboard/default.nix +++ b/pkgs/applications/audio/hushboard/default.nix @@ -70,6 +70,6 @@ buildPythonApplication { description = "Mute your microphone while typing"; mainProgram = "hushboard"; platforms = platforms.linux; - maintainers = with maintainers; [ sersorrel ]; + maintainers = with maintainers; [ keysmashes ]; }; } diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index f98bdae72975..1849a8c428a2 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RtVKlw2ca8An4FodeD0RN95z9yHDHBgAxsEwLAmW7co="; name = "fix-build-with-new-pipewire.patch"; }) + ./fix-build-on-qt6_9.diff ]; buildInputs = diff --git a/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff b/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff new file mode 100644 index 000000000000..9706aa8eb614 --- /dev/null +++ b/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff @@ -0,0 +1,22 @@ +diff --git a/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp b/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp +index 01940a1..2ec9c5b 100644 +--- a/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp ++++ b/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp +@@ -133,7 +133,7 @@ QtPromise::QPromise AeqPackageManager::getLocalVersion() + return QtPromise::QPromise{[&]( + const QtPromise::QPromiseResolve& resolve, + const QtPromise::QPromiseReject& reject) { +- QFile versionJson = (databaseDirectory() + "/version.json"); ++ QFile versionJson(databaseDirectory() + "/version.json"); + if(!versionJson.exists()) + { + reject(); +@@ -159,7 +159,7 @@ QtPromise::QPromise> AeqPackageManager::getLocalIndex() + return QtPromise::QPromise>{[&]( + const QtPromise::QPromiseResolve>& resolve, + const QtPromise::QPromiseReject>& reject) { +- QFile indexJson = (databaseDirectory() + "/index.json"); ++ QFile indexJson(databaseDirectory() + "/index.json"); + if(!indexJson.exists()) + { + reject(); diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix deleted file mode 100644 index f7c33347e13e..000000000000 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitea, - pkg-config, - stdenv, - openssl, - libiconv, - sqlite, - Security, - SystemConfiguration, - CoreFoundation, - installShellFiles, - asciidoctor, -}: - -rustPlatform.buildRustPackage rec { - pname = "listenbrainz-mpd"; - version = "2.3.8"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "elomatreb"; - repo = "listenbrainz-mpd"; - rev = "v${version}"; - hash = "sha256-QBc0avci232UIxzTKlS0pjL7cCuvwAFgw6dSwdtYAtU="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-NQXXR6b1XZDihVoRNFJLXtMNjlzOIzkc4rthwx0A7AE="; - - nativeBuildInputs = [ - pkg-config - installShellFiles - asciidoctor - ]; - - buildInputs = - [ sqlite ] - ++ ( - if stdenv.hostPlatform.isDarwin then - [ - libiconv - Security - SystemConfiguration - CoreFoundation - ] - else - [ - openssl - ] - ); - - buildFeatures = - [ - "shell_completion" - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - "systemd" - ]; - - postInstall = '' - installShellCompletion \ - --bash generated_completions/listenbrainz-mpd.bash \ - --fish generated_completions/listenbrainz-mpd.fish \ - --zsh generated_completions/_listenbrainz-mpd - - asciidoctor --backend=manpage listenbrainz-mpd.adoc -o listenbrainz-mpd.1 - installManPage listenbrainz-mpd.1 - ''; - - meta = with lib; { - homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd"; - changelog = "https://codeberg.org/elomatreb/listenbrainz-mpd/src/tag/v${version}/CHANGELOG.md"; - description = "ListenBrainz submission client for MPD"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ DeeUnderscore ]; - mainProgram = "listenbrainz-mpd"; - }; -} diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix deleted file mode 100644 index ef6d8402ce49..000000000000 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - SDL2, - python3, - jack2, - Foundation, - alsa-lib, - pkg-config, -}: -let - python = python3.withPackages (ps: with ps; [ pillow ]); - platform = if stdenv.hostPlatform.isDarwin then "OSX" else "X64"; -in -stdenv.mkDerivation (finalAttrs: { - pname = "littlegptracker"; - version = "1.4.2"; - - src = fetchFromGitHub { - owner = "djdiskmachine"; - repo = "littlegptracker"; - tag = finalAttrs.version; - hash = "sha256-1uXC5nJ63YguQuNIkuK0yx9lmrMBqw0WdlmCV8o11cE="; - }; - - nativeBuildInputs = [ - pkg-config - python - ]; - buildInputs = - [ SDL2 ] - ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib - ++ lib.optional stdenv.hostPlatform.isDarwin Foundation - ++ lib.optional stdenv.hostPlatform.isLinux jack2; - - preBuild = '' - cd projects - ''; - - makeFlags = [ - "CXX=${stdenv.cc.targetPrefix}c++" - "PLATFORM=${platform}" - ]; - - env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework Foundation"; - - installPhase = - let - extension = if stdenv.hostPlatform.isDarwin then "app" else "x64"; - in - '' - runHook preInstall - install -Dm555 lgpt.${extension} $out/lib/lgpt/lgpt - install -Dm444 resources/${platform}/{config,mapping}.xml $out/lib/lgpt/ - mkdir -p $out/bin - ln -s $out/lib/lgpt/lgpt $out/bin/ - runHook postInstall - ''; - - meta = { - description = "Music tracker optimised to run on portable game consoles"; - longDescription = '' - Little Piggy Tracker (f.k.a 'LittleGPTracker') is a music tracker optimised to run on portable game consoles. - It is currently running on Windows, MacOS (intel/arm) & Linux, PSP, Miyoo Mini, and a collection of other retro gaming handhelds. - It implements the user interface of littlesounddj and precedes M8 tracker, two popular trackers greatly loved in the tracker community. - ''; - homepage = "https://github.com/djdiskmachine/LittleGPTracker"; - downloadPage = "https://github.com/djdiskmachine/LittleGPTracker/releases"; - mainProgram = "lgpt"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ fgaz ]; - platforms = lib.platforms.all; - - # https://github.com/NixOS/nixpkgs/pull/352617#issuecomment-2495663097 - broken = stdenv.hostPlatform.isDarwin; - }; -}) diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 983e3924f815..8a2974b8517b 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "VoiceOfFaust"; - version = "1.1.5"; + version = "1.1.7"; src = fetchFromGitHub { owner = "magnetophon"; repo = "VoiceOfFaust"; - rev = version; - sha256 = "sha256-vB8+ymvNuuovFXwOJ3BTIj5mGzCGa1+yhYs4nWMYIxU="; + tag = "V${version}"; + sha256 = "sha256-wsc4yzytK2hPVBQwMhdhjnH1pDtpkNCFJnItyzszEs0="; }; plugins = [ @@ -27,11 +27,15 @@ stdenv.mkDerivation rec { pitchTracker = puredata-with-plugins plugins; - buildInputs = [ + nativeBuildInputs = [ faust2jack faust2lv2 ]; + # ld: crtbegin.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object + # ld: failed to set dynamic section sizes: bad value + hardeningDisable = [ "pie" ]; + enableParallelBuilding = true; dontWrapQtApps = true; @@ -41,15 +45,17 @@ stdenv.mkDerivation rec { ]; patchPhase = '' - sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper sed -i "s@jack_connect@${jack-example-tools}/bin/jack_connect@g" launchers/synthWrapper + sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/pitchTracker sed -i "s@../PureData/OscSendVoc.pd@$out/bin/PureData/OscSendVoc.pd@g" launchers/pitchTracker + sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/pitchTrackerGUI + sed -i "s@../PureData/OscSendVoc.pd@$out/bin/PureData/OscSendVoc.pd@g" launchers/pitchTrackerGUI ''; meta = { description = "Turn your voice into a synthesizer"; homepage = "https://github.com/magnetophon/VoiceOfFaust"; - license = lib.licenses.gpl3; + license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/master_me/default.nix b/pkgs/applications/audio/master_me/default.nix deleted file mode 100644 index 3c766b701cf9..000000000000 --- a/pkgs/applications/audio/master_me/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - libGL, - libX11, - libXext, - libXrandr, - pkg-config, - python3, - Cocoa, -}: -stdenv.mkDerivation rec { - pname = "master_me"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "trummerschlunk"; - repo = "master_me"; - rev = version; - fetchSubmodules = true; - hash = "sha256-FG3X1dOF9KRHHSnd5/zP+GrYCB2O0y+tnI5/l9tNhyE="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libGL - python3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXext - libXrandr - ]; - - enableParallelBuilding = true; - - postPatch = '' - patchShebangs ./dpf/utils/ - ''; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://github.com/trummerschlunk/master_me"; - description = "automatic mastering plugin for live streaming, podcasts and internet radio"; - maintainers = with maintainers; [ magnetophon ]; - platforms = platforms.all; - broken = stdenv.hostPlatform.isDarwin; # error: no type or protocol named 'NSPasteboardType' - license = licenses.gpl3Plus; - mainProgram = "master_me"; - }; -} diff --git a/pkgs/applications/audio/midivisualizer/default.nix b/pkgs/applications/audio/midivisualizer/default.nix deleted file mode 100644 index eb409930a3b2..000000000000 --- a/pkgs/applications/audio/midivisualizer/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - libX11, - glfw, - makeWrapper, - libXrandr, - libXinerama, - libXcursor, - gtk3, - ffmpeg-full, - AppKit, - Carbon, - Cocoa, - CoreAudio, - CoreMIDI, - CoreServices, - Kernel, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "midivisualizer"; - version = "7.0"; - - src = fetchFromGitHub { - owner = "kosua20"; - repo = "MIDIVisualizer"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - ]; - - buildInputs = - [ - glfw - ffmpeg-full - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXrandr - libXinerama - libXcursor - gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Carbon - Cocoa - CoreAudio - CoreMIDI - CoreServices - Kernel - ]; - - installPhase = - if stdenv.hostPlatform.isDarwin then - '' - mkdir -p $out/Applications $out/bin - cp -r MIDIVisualizer.app $out/Applications/ - ln -s ../Applications/MIDIVisualizer.app/Contents/MacOS/MIDIVisualizer $out/bin/ - '' - else - '' - mkdir -p $out/bin - cp MIDIVisualizer $out/bin - - wrapProgram $out/bin/MIDIVisualizer \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" - ''; - - meta = with lib; { - description = "Small MIDI visualizer tool, using OpenGL"; - mainProgram = "MIDIVisualizer"; - homepage = "https://github.com/kosua20/MIDIVisualizer"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = [ maintainers.ericdallo ]; - }; -}) diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix deleted file mode 100644 index 37f87257bdf3..000000000000 --- a/pkgs/applications/audio/minidsp/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - stdenv, - libusb1, - AppKit, - IOKit, - pkg-config, -}: -rustPlatform.buildRustPackage rec { - pname = "minidsp"; - version = "0.1.12"; - - src = fetchFromGitHub { - owner = "mrene"; - repo = "minidsp-rs"; - rev = "v${version}"; - hash = "sha256-8bKP9/byVRKj1P1MP3ZVg8yw0WaNB0BcqarCti7B8CA="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-JIm0XcgqXGPXlkQ1rhG5D38bQkQT9K44F71ZaCT2g8o="; - - cargoBuildFlags = [ "-p minidsp -p minidsp-daemon" ]; - - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - IOKit - ]; - - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - - meta = with lib; { - description = "Control interface for some MiniDSP products"; - homepage = "https://github.com/mrene/minidsp-rs"; - license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ - maintainers.adamcstephens - maintainers.mrene - ]; - }; -} diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 8c9022df6eca..a90f55870d68 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -32,7 +32,6 @@ microsoft-gsl, mp4v2, opusfile, - pcre, pkg-config, portaudio, portmidi, @@ -57,13 +56,13 @@ stdenv.mkDerivation rec { pname = "mixxx"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = version; - hash = "sha256-1ZE2hVwacZve0+IOQs+htK/kl7zFsOWkh/KcrnI6u/M="; + hash = "sha256-s66XrcMGgA8KvBDxljg95nbKW1pIv8rJJ+DyxirHwDo="; }; nativeBuildInputs = [ @@ -102,7 +101,6 @@ stdenv.mkDerivation rec { microsoft-gsl mp4v2 opusfile - pcre portaudio portmidi protobuf @@ -130,6 +128,8 @@ stdenv.mkDerivation rec { # see https://github.com/mixxxdj/mixxx/blob/2.3.5/CMakeLists.txt#L1381-L1392 cmakeFlags = [ "-DINSTALL_USER_UDEV_RULES=OFF" + # "BUILD_TESTING=OFF" must imply "BUILD_BENCH=OFF" + "-DBUILD_BENCH=OFF" ]; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index c8ceef846e1f..24665b7ddc55 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -9,8 +9,6 @@ libX11, libXau, libXdmcp, - Carbon, - Cocoa, cppunit, }: @@ -61,10 +59,6 @@ stdenv.mkDerivation { libX11 libXau libXdmcp - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa ]; checkInputs = [ diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix deleted file mode 100644 index 581ace1d3c3c..000000000000 --- a/pkgs/applications/audio/moc/default.nix +++ /dev/null @@ -1,169 +0,0 @@ -{ - lib, - stdenv, - fetchsvn, - fetchpatch2, - pkg-config, - autoreconfHook, - autoconf-archive, - ncurses, - db, - popt, - libtool, - libiconv, - CoreServices, - # Sound sub-systems - alsaSupport ? (!stdenv.hostPlatform.isDarwin), - alsa-lib, - pulseSupport ? true, - libpulseaudio, - jackSupport ? true, - libjack2, - ossSupport ? true, - # Audio formats - aacSupport ? true, - faad2, - libid3tag, - flacSupport ? true, - flac, - midiSupport ? true, - timidity, - modplugSupport ? true, - libmodplug, - mp3Support ? true, - libmad, - musepackSupport ? true, - libmpc, - libmpcdec, - taglib, - vorbisSupport ? true, - libvorbis, - speexSupport ? true, - speex, - ffmpegSupport ? true, - ffmpeg, - sndfileSupport ? true, - libsndfile, - wavpackSupport ? true, - wavpack, - # Misc - curlSupport ? true, - curl, - samplerateSupport ? true, - libsamplerate, - withDebug ? false, -}: - -stdenv.mkDerivation { - pname = "moc"; - version = "2.6-alpha3-unstable-2019-09-14"; - - src = fetchsvn { - url = "svn://svn.daper.net/moc/trunk"; - rev = "3005"; - hash = "sha256-JksJxHQgQ8hPTFtLvEvZuFh2lflDNrEmDTMWWwVnjZQ="; - }; - - patches = [ - # FFmpeg 6 support - (fetchpatch2 { - url = "https://cygwin.com/cgit/cygwin-packages/moc/plain/Support-for-recent-ffmpeg-change.patch?id=ab70f1306b8416852915be4347003aac3bdc216"; - hash = "sha256-5hLEFBJ+7Nvxn6pNj4bngcg2qJsCzxiuP6yEj+7tvs0="; - stripLen = 1; - }) - - # FFmpeg 7 support - (fetchpatch2 { - url = "https://cygwin.com/cgit/cygwin-packages/moc/plain/ffmpeg-7.0.patch?id=ab70f1306b8416852915be4347003aac3bdc216e"; - hash = "sha256-dYw6DNyw61MGfv+GdBz5Dtrr9fVph1tf7vxexWONwF8="; - stripLen = 1; - }) - - ./use-ax-check-compile-flag.patch - ] ++ lib.optional pulseSupport ./pulseaudio.patch; - - postPatch = '' - rm m4/* - ''; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - autoconf-archive - ]; - - buildInputs = - [ - ncurses - db - popt - libtool - ] - # Sound sub-systems - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional jackSupport libjack2 - # Audio formats - ++ lib.optional (aacSupport || mp3Support) libid3tag - ++ lib.optional aacSupport faad2 - ++ lib.optional flacSupport flac - ++ lib.optional midiSupport timidity - ++ lib.optional modplugSupport libmodplug - ++ lib.optional mp3Support libmad - ++ lib.optionals musepackSupport [ - libmpc - libmpcdec - taglib - ] - ++ lib.optional vorbisSupport libvorbis - ++ lib.optional speexSupport speex - ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional sndfileSupport libsndfile - ++ lib.optional wavpackSupport wavpack - # Misc - ++ lib.optional curlSupport curl - ++ lib.optional samplerateSupport libsamplerate - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - CoreServices - ]; - - configureFlags = [ - # Sound sub-systems - (lib.withFeature alsaSupport "alsa") - (lib.withFeature pulseSupport "pulse") - (lib.withFeature jackSupport "jack") - (lib.withFeature ossSupport "oss") - # Audio formats - (lib.withFeature aacSupport "aac") - (lib.withFeature flacSupport "flac") - (lib.withFeature midiSupport "timidity") - (lib.withFeature modplugSupport "modplug") - (lib.withFeature mp3Support "mp3") - (lib.withFeature musepackSupport "musepack") - (lib.withFeature vorbisSupport "vorbis") - (lib.withFeature speexSupport "speex") - (lib.withFeature ffmpegSupport "ffmpeg") - (lib.withFeature sndfileSupport "sndfile") - (lib.withFeature wavpackSupport "wavpack") - # Misc - (lib.withFeature curlSupport "curl") - (lib.withFeature samplerateSupport "samplerate") - ("--enable-debug=" + (if withDebug then "yes" else "no")) - "--disable-cache" - "--without-rcc" - ]; - - meta = with lib; { - description = "Terminal audio player designed to be powerful and easy to use"; - homepage = "http://moc.daper.net/"; - license = licenses.gpl2; - maintainers = with maintainers; [ - aethelz - pSub - jagajaga - ]; - platforms = platforms.unix; - mainProgram = "mocp"; - }; -} diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 8918d44d3c04..6cb96daea52b 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -36,7 +36,7 @@ pythonPackages.buildPythonApplication rec { cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs': { vendorStaging = oldAttrs'.vendorStaging.overrideAttrs { inherit (newAttrs) patches; - outputHash = "sha256-CegT8h+CJ6axipAD6E9drtrPJ9izRy/UCW14rbva5XA="; + outputHash = "sha256-urRYH5N1laBq1/SUEmwFKAtsHAC+KWYfYp+fmb7Ey7s="; }; }); diff --git a/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch b/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch index 495ffa519304..3f5ccc49ef8b 100644 --- a/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch +++ b/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch @@ -1,54 +1,20 @@ -From a9a05b3b62ba22d841d1e19e23d7fc0bee95ba05 Mon Sep 17 00:00:00 2001 -From: kingosticks -Date: Tue, 22 Oct 2024 23:45:17 +0100 -Subject: [PATCH 1/2] net/quinn: Fix test panic due to unset default crypto - provider - -If another dep in the workspace pulls in a different rustls crypto -provider then we need to explicitly specify our default provider. - -Part-of: -(cherry picked from commit a81b7f380fc11fb58994dc9c7a50dafa58314ccf) ---- - net/quinn/tests/quinnquic.rs | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/net/quinn/tests/quinnquic.rs b/net/quinn/tests/quinnquic.rs -index 911ce520..0e071f37 100644 ---- a/net/quinn/tests/quinnquic.rs -+++ b/net/quinn/tests/quinnquic.rs -@@ -18,6 +18,9 @@ fn init() { - INIT.call_once(|| { - gst::init().unwrap(); - gstquinn::plugin_register_static().expect("QUIC source sink send receive tests"); -+ rustls::crypto::ring::default_provider() -+ .install_default() -+ .expect("Failed to install ring crypto provider"); - }); - } - --- -2.47.0 - - -From ff8190b271d5ae15fb5e91e5440a0766cb968ac7 Mon Sep 17 00:00:00 2001 +From b66aac80f433dc3301be26e379f2ecea6fbbf990 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 15 Dec 2021 17:15:20 +0100 -Subject: [PATCH 2/2] spotify: replace username/password auth with access - token. +Subject: [PATCH] spotify: replace username/password auth with access token. Part-of: --- - Cargo.lock | 1064 +++++++++++++++++----- + Cargo.lock | 1082 +++++++++++++++++----- audio/spotify/Cargo.toml | 6 +- audio/spotify/README.md | 25 +- audio/spotify/src/common.rs | 141 ++- audio/spotify/src/spotifyaudiosrc/imp.rs | 19 +- docs/plugins/gst_plugins_cache.json | 12 + - 6 files changed, 954 insertions(+), 313 deletions(-) + 6 files changed, 973 insertions(+), 312 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 99cec70b..9a81bdb1 100644 +index 244256cd..226254e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,45 +19,13 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" @@ -101,60 +67,37 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -70,7 +38,7 @@ dependencies = [ - "getrandom", - "once_cell", - "version_check", -- "zerocopy 0.7.35", -+ "zerocopy", - ] - - [[package]] -@@ -160,9 +128,9 @@ dependencies = [ - - [[package]] - name = "anyhow" --version = "1.0.92" -+version = "1.0.95" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" -+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" - - [[package]] - name = "arbitrary" -@@ -367,6 +335,31 @@ dependencies = [ +@@ -370,6 +338,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "aws-lc-rs" -+version = "1.12.0" ++version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f409eb70b561706bf8abba8ca9c112729c481595893fd06a2dd9af8ed8441148" ++checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878" +dependencies = [ + "aws-lc-sys", -+ "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" -+version = "0.24.1" ++version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "923ded50f602b3007e5e63e3f094c479d9c8a9b42d7f4034e4afe456aa48bfd2" ++checksum = "b9f7720b74ed28ca77f90769a71fd8c637a0137f6fae4ae947e1050229cff57f" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", -+ "paste", +] + [[package]] name = "aws-runtime" version = "1.2.0" -@@ -458,7 +451,7 @@ dependencies = [ +@@ -461,7 +452,7 @@ dependencies = [ "bytes", "fastrand", "hex", @@ -162,17 +105,17 @@ index 99cec70b..9a81bdb1 100644 + "hmac", "http 0.2.12", "http-body 0.4.6", - "lru", -@@ -600,7 +593,7 @@ dependencies = [ + "lru 0.12.5", +@@ -603,7 +594,7 @@ dependencies = [ "crypto-bigint 0.5.5", "form_urlencoded", "hex", - "hmac 0.12.1", + "hmac", "http 0.2.12", - "http 1.1.0", + "http 1.2.0", "once_cell", -@@ -866,6 +859,29 @@ dependencies = [ +@@ -869,6 +860,29 @@ dependencies = [ "serde", ] @@ -182,7 +125,7 @@ index 99cec70b..9a81bdb1 100644 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +dependencies = [ -+ "bitflags 2.6.0", ++ "bitflags 2.9.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", @@ -195,14 +138,14 @@ index 99cec70b..9a81bdb1 100644 + "regex", + "rustc-hash 1.1.0", + "shlex", -+ "syn 2.0.86", ++ "syn 2.0.99", + "which", +] + [[package]] name = "bitflags" version = "1.3.2" -@@ -884,15 +900,6 @@ version = "2.3.0" +@@ -887,15 +901,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" @@ -218,8 +161,8 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "block-buffer" version = "0.10.4" -@@ -1040,6 +1047,15 @@ dependencies = [ - "thiserror", +@@ -1041,6 +1046,15 @@ dependencies = [ + "thiserror 2.0.12", ] +[[package]] @@ -228,13 +171,13 @@ index 99cec70b..9a81bdb1 100644 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ -+ "nom", ++ "nom 7.1.3", +] + [[package]] name = "cfg-expr" version = "0.15.8" -@@ -1089,11 +1105,23 @@ dependencies = [ +@@ -1090,11 +1104,23 @@ dependencies = [ [[package]] name = "cipher" @@ -261,15 +204,15 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -1142,6 +1170,15 @@ version = "0.4.3" +@@ -1143,6 +1169,15 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" +[[package]] +name = "cmake" -+version = "0.1.52" ++version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" ++checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +dependencies = [ + "cc", +] @@ -277,7 +220,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "color-name" version = "1.1.0" -@@ -1231,6 +1268,16 @@ dependencies = [ +@@ -1233,6 +1268,16 @@ dependencies = [ "libc", ] @@ -294,7 +237,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "core-foundation-sys" version = "0.8.7" -@@ -1330,16 +1377,6 @@ dependencies = [ +@@ -1332,16 +1377,6 @@ dependencies = [ "typenum", ] @@ -311,7 +254,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "csound" version = "0.1.8" -@@ -1364,9 +1401,9 @@ dependencies = [ +@@ -1366,9 +1401,9 @@ dependencies = [ [[package]] name = "ctr" @@ -323,7 +266,16 @@ index 99cec70b..9a81bdb1 100644 dependencies = [ "cipher", ] -@@ -1497,6 +1534,17 @@ dependencies = [ +@@ -1434,7 +1469,7 @@ dependencies = [ + "iso8601", + "lazy_static", + "num-traits", +- "quick-xml", ++ "quick-xml 0.37.2", + "regex", + "serde", + "serde_path_to_error", +@@ -1499,6 +1534,17 @@ dependencies = [ "zeroize", ] @@ -341,7 +293,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "deranged" version = "0.3.11" -@@ -1508,27 +1556,50 @@ dependencies = [ +@@ -1510,27 +1556,50 @@ dependencies = [ ] [[package]] @@ -369,7 +321,7 @@ index 99cec70b..9a81bdb1 100644 + "darling", + "proc-macro2", + "quote", -+ "syn 2.0.86", ++ "syn 2.0.99", +] + +[[package]] @@ -379,7 +331,7 @@ index 99cec70b..9a81bdb1 100644 +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", -+ "syn 2.0.86", ++ "syn 2.0.99", ] +[[package]] @@ -400,7 +352,7 @@ index 99cec70b..9a81bdb1 100644 "crypto-common", "subtle", ] -@@ -1545,6 +1616,12 @@ dependencies = [ +@@ -1567,6 +1636,12 @@ dependencies = [ "rgb", ] @@ -412,8 +364,8 @@ index 99cec70b..9a81bdb1 100644 + [[package]] name = "ebml-iterable" - version = "0.6.2" -@@ -1592,10 +1669,10 @@ version = "0.14.8" + version = "0.6.3" +@@ -1614,10 +1689,10 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ @@ -426,7 +378,7 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -1604,7 +1681,7 @@ version = "1.5.3" +@@ -1626,7 +1701,7 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ @@ -435,7 +387,7 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -1621,12 +1698,12 @@ checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +@@ -1643,12 +1718,12 @@ checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", "crypto-bigint 0.4.9", @@ -448,10 +400,10 @@ index 99cec70b..9a81bdb1 100644 "group", - "pkcs8", + "pkcs8 0.9.0", - "rand_core", + "rand_core 0.6.4", "sec1", "subtle", -@@ -1834,6 +1911,12 @@ dependencies = [ +@@ -1856,6 +1931,12 @@ dependencies = [ "autocfg", ] @@ -464,7 +416,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "fst" version = "0.4.7" -@@ -1911,6 +1994,12 @@ version = "0.3.31" +@@ -1933,6 +2014,12 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" @@ -477,7 +429,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "futures-util" version = "0.3.31" -@@ -2175,6 +2264,24 @@ dependencies = [ +@@ -2209,6 +2296,24 @@ dependencies = [ "system-deps 7.0.3", ] @@ -494,15 +446,33 @@ index 99cec70b..9a81bdb1 100644 + "nonzero_ext", + "parking_lot", + "portable-atomic", -+ "rand", ++ "rand 0.8.5", + "smallvec", + "spinning_top", +] + [[package]] name = "graphene-rs" - version = "0.20.5" -@@ -3725,21 +3832,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + version = "0.20.9" +@@ -2488,7 +2593,7 @@ dependencies = [ + "gstreamer-video", + "m3u8-rs", + "once_cell", +- "quick-xml", ++ "quick-xml 0.37.2", + "serde", + ] + +@@ -2680,7 +2785,7 @@ dependencies = [ + "gstreamer-video", + "libloading", + "once_cell", +- "quick-xml", ++ "quick-xml 0.37.2", + "smallvec", + "thiserror 2.0.12", + ] +@@ -3763,21 +3868,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hmac" @@ -531,7 +501,7 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -3885,18 +3991,24 @@ dependencies = [ +@@ -3923,18 +4027,24 @@ dependencies = [ ] [[package]] @@ -547,11 +517,11 @@ index 99cec70b..9a81bdb1 100644 - "futures", - "headers 0.3.9", - "http 0.2.12", -- "hyper 0.14.31", +- "hyper 0.14.32", + "futures-util", + "headers 0.4.0", -+ "http 1.1.0", -+ "hyper 1.5.0", ++ "http 1.2.0", ++ "hyper 1.6.0", + "hyper-rustls 0.26.0", + "hyper-util", + "pin-project-lite", @@ -563,8 +533,8 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -3910,11 +4022,30 @@ dependencies = [ - "hyper 0.14.31", +@@ -3948,11 +4058,30 @@ dependencies = [ + "hyper 0.14.32", "log", "rustls 0.21.12", - "rustls-native-certs", @@ -580,8 +550,8 @@ index 99cec70b..9a81bdb1 100644 +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", -+ "http 1.1.0", -+ "hyper 1.5.0", ++ "http 1.2.0", ++ "hyper 1.6.0", + "hyper-util", + "log", + "rustls 0.22.4", @@ -594,18 +564,18 @@ index 99cec70b..9a81bdb1 100644 + [[package]] name = "hyper-rustls" - version = "0.27.3" -@@ -3925,7 +4056,9 @@ dependencies = [ - "http 1.1.0", - "hyper 1.5.0", + version = "0.27.5" +@@ -3963,7 +4092,9 @@ dependencies = [ + "http 1.2.0", + "hyper 1.6.0", "hyper-util", + "log", - "rustls 0.23.16", + "rustls 0.23.23", + "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", -@@ -4014,7 +4147,7 @@ dependencies = [ + "tokio-rustls 0.26.2", +@@ -4052,7 +4183,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", @@ -614,15 +584,15 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -4104,6 +4237,15 @@ dependencies = [ +@@ -4261,6 +4392,15 @@ dependencies = [ "serde", ] +[[package]] +name = "inout" -+version = "0.1.3" ++version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" ++checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" +dependencies = [ + "generic-array", +] @@ -630,7 +600,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "interpolate_name" version = "0.2.4" -@@ -4214,6 +4356,15 @@ name = "lazy_static" +@@ -4372,6 +4512,15 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" @@ -646,7 +616,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "lewton" -@@ -4222,7 +4373,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -4380,7 +4529,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" dependencies = [ "byteorder", @@ -654,7 +624,7 @@ index 99cec70b..9a81bdb1 100644 "tinyvec", ] -@@ -4261,86 +4411,119 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" +@@ -4418,108 +4566,141 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "librespot-audio" @@ -671,13 +641,13 @@ index 99cec70b..9a81bdb1 100644 + "ctr", "futures-util", + "http-body-util", -+ "hyper 1.5.0", ++ "hyper 1.6.0", + "hyper-util", "librespot-core", "log", + "parking_lot", "tempfile", -+ "thiserror", ++ "thiserror 1.0.69", "tokio", ] @@ -702,14 +672,14 @@ index 99cec70b..9a81bdb1 100644 - "http 0.2.12", + "governor", + "hmac", -+ "http 1.1.0", ++ "http 1.2.0", + "http-body-util", "httparse", -- "hyper 0.14.31", +- "hyper 0.14.32", - "hyper-proxy", -+ "hyper 1.5.0", ++ "hyper 1.6.0", + "hyper-proxy2", -+ "hyper-rustls 0.27.3", ++ "hyper-rustls 0.27.5", + "hyper-util", + "librespot-oauth", "librespot-protocol", @@ -726,7 +696,7 @@ index 99cec70b..9a81bdb1 100644 "priority-queue", "protobuf", + "quick-xml 0.36.2", - "rand", + "rand 0.8.5", + "rsa", "serde", "serde_json", @@ -734,7 +704,7 @@ index 99cec70b..9a81bdb1 100644 + "sha1", "shannon", + "sysinfo", - "thiserror", + "thiserror 1.0.69", + "time", "tokio", "tokio-stream", @@ -763,7 +733,7 @@ index 99cec70b..9a81bdb1 100644 "protobuf", + "serde", + "serde_json", -+ "thiserror", ++ "thiserror 1.0.69", + "uuid", ] @@ -781,9 +751,12 @@ index 99cec70b..9a81bdb1 100644 - "futures-util", - "lewton", - "librespot-audio", -+ "log", +- "librespot-core", +- "librespot-metadata", + "log", +- "ogg", + "oauth2", -+ "thiserror", ++ "thiserror 1.0.69", + "url", +] + @@ -795,18 +768,19 @@ index 99cec70b..9a81bdb1 100644 +dependencies = [ + "futures-util", + "librespot-audio", - "librespot-core", - "librespot-metadata", - "log", -@@ -4349,20 +4532,20 @@ dependencies = [ - "rand", ++ "librespot-core", ++ "librespot-metadata", ++ "log", ++ "ogg", + "parking_lot", + "rand 0.8.5", "rand_distr", "shell-words", + "symphonia", - "thiserror", + "thiserror 1.0.69", "tokio", - "zerocopy 0.6.6", -+ "zerocopy", ++ "zerocopy 0.7.35", ] [[package]] @@ -824,7 +798,7 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -4496,7 +4679,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -4674,7 +4855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ "cfg-if", @@ -833,7 +807,7 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -4624,7 +4807,7 @@ dependencies = [ +@@ -4801,7 +4982,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", @@ -842,7 +816,7 @@ index 99cec70b..9a81bdb1 100644 "security-framework-sys", "tempfile", ] -@@ -4657,6 +4840,12 @@ dependencies = [ +@@ -4834,6 +5015,12 @@ dependencies = [ "rustfft", ] @@ -855,8 +829,8 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "nom" version = "7.1.3" -@@ -4667,12 +4856,27 @@ dependencies = [ - "minimal-lexical", +@@ -4853,12 +5040,27 @@ dependencies = [ + "memchr", ] +[[package]] @@ -883,8 +857,8 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "nu-ansi-term" version = "0.46.0" -@@ -4694,6 +4898,23 @@ dependencies = [ - "rand", +@@ -4880,6 +5082,23 @@ dependencies = [ + "rand 0.8.5", ] +[[package]] @@ -899,7 +873,7 @@ index 99cec70b..9a81bdb1 100644 + "num-integer", + "num-iter", + "num-traits", -+ "rand", ++ "rand 0.8.5", + "smallvec", + "zeroize", +] @@ -907,7 +881,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "num-complex" version = "0.4.6" -@@ -4729,6 +4950,17 @@ dependencies = [ +@@ -4915,6 +5134,17 @@ dependencies = [ "num-traits", ] @@ -925,7 +899,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "num-rational" version = "0.4.2" -@@ -4761,6 +4993,35 @@ dependencies = [ +@@ -4947,6 +5177,35 @@ dependencies = [ "libc", ] @@ -946,36 +920,36 @@ index 99cec70b..9a81bdb1 100644 +dependencies = [ + "base64 0.13.1", + "chrono", -+ "getrandom", ++ "getrandom 0.2.15", + "http 0.2.12", -+ "rand", ++ "rand 0.8.5", + "reqwest 0.11.27", + "serde", + "serde_json", + "serde_path_to_error", + "sha2", -+ "thiserror", ++ "thiserror 1.0.69", + "url", +] + [[package]] name = "object" - version = "0.36.5" -@@ -4772,9 +5033,9 @@ dependencies = [ + version = "0.36.7" +@@ -4958,9 +5217,9 @@ dependencies = [ [[package]] name = "ogg" -version = "0.8.0" -+version = "0.9.1" ++version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" -+checksum = "5477016638150530ba21dec7caac835b29ef69b20865751d2973fce6be386cf1" ++checksum = "fdab8dcd8d4052eaacaf8fb07a3ccd9a6e26efadb42878a413c68fc4af1dee2b" dependencies = [ "byteorder", ] -@@ -4785,12 +5046,6 @@ version = "1.20.2" +@@ -4971,12 +5230,6 @@ version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" -[[package]] -name = "opaque-debug" @@ -985,8 +959,8 @@ index 99cec70b..9a81bdb1 100644 - [[package]] name = "openssl" - version = "0.10.68" -@@ -5002,12 +5257,12 @@ dependencies = [ + version = "0.10.71" +@@ -5188,12 +5441,12 @@ dependencies = [ [[package]] name = "pbkdf2" @@ -1003,7 +977,7 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -5020,6 +5275,15 @@ dependencies = [ +@@ -5206,6 +5459,15 @@ dependencies = [ "serde", ] @@ -1019,7 +993,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "percent-encoding" version = "2.3.1" -@@ -5068,14 +5332,35 @@ version = "0.1.0" +@@ -5254,14 +5516,35 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" @@ -1057,67 +1031,58 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -5118,6 +5403,12 @@ dependencies = [ +@@ -5304,6 +5587,12 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "portable-atomic" -+version = "1.10.0" ++version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" ++checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" + [[package]] name = "powerfmt" version = "0.2.0" -@@ -5130,7 +5421,7 @@ version = "0.2.20" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" - dependencies = [ -- "zerocopy 0.7.35", -+ "zerocopy", - ] - - [[package]] -@@ -5164,12 +5455,13 @@ dependencies = [ +@@ -5350,12 +5639,13 @@ dependencies = [ [[package]] name = "priority-queue" -version = "1.4.0" -+version = "2.1.1" ++version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bda9164fe05bc9225752d54aae413343c36f684380005398a6a8fde95fe785" -+checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" ++checksum = "ef08705fa1589a1a59aa924ad77d14722cb0cd97b67dd5004ed5f4a4873fce8d" dependencies = [ "autocfg", - "indexmap 1.9.3", + "equivalent", -+ "indexmap 2.6.0", ++ "indexmap 2.7.1", ] [[package]] -@@ -5288,27 +5580,53 @@ dependencies = [ +@@ -5474,27 +5764,53 @@ dependencies = [ [[package]] name = "protobuf" -version = "2.28.0" -+version = "3.7.1" ++version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" -+checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" ++checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4" +dependencies = [ + "once_cell", + "protobuf-support", -+ "thiserror", ++ "thiserror 1.0.69", +] [[package]] name = "protobuf-codegen" -version = "2.28.0" -+version = "3.7.1" ++version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6" -+checksum = "e26b833f144769a30e04b1db0146b2aaa53fd2fd83acf10a6b5f996606c18144" ++checksum = "5d3976825c0014bbd2f3b34f0001876604fe87e0c86cd8fa54251530f1544ace" dependencies = [ + "anyhow", + "once_cell", @@ -1125,66 +1090,83 @@ index 99cec70b..9a81bdb1 100644 + "protobuf-parse", + "regex", + "tempfile", -+ "thiserror", ++ "thiserror 1.0.69", ] [[package]] -name = "protobuf-codegen-pure" -version = "2.28.0" +name = "protobuf-parse" -+version = "3.7.1" ++version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a29399fc94bcd3eeaa951c715f7bea69409b2445356b00519740bcd6ddd865" -+checksum = "322330e133eab455718444b4e033ebfac7c6528972c784fcde28d2cc783c6257" ++checksum = "b4aeaa1f2460f1d348eeaeed86aea999ce98c1bded6f089ff8514c9d9dbdc973" dependencies = [ + "anyhow", -+ "indexmap 2.6.0", ++ "indexmap 2.7.1", + "log", "protobuf", - "protobuf-codegen", + "protobuf-support", + "tempfile", -+ "thiserror", ++ "thiserror 1.0.69", + "which", +] + +[[package]] +name = "protobuf-support" -+version = "3.7.1" ++version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" ++checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6" +dependencies = [ -+ "thiserror", ++ "thiserror 1.0.69", ] [[package]] -@@ -5357,7 +5675,7 @@ dependencies = [ +@@ -5513,6 +5829,16 @@ dependencies = [ + "psl-types", + ] + ++[[package]] ++name = "quick-xml" ++version = "0.36.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" ++dependencies = [ ++ "memchr", ++ "serde", ++] ++ + [[package]] + name = "quick-xml" + version = "0.37.2" +@@ -5533,7 +5859,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", -+ "rustc-hash 2.0.0", - "rustls 0.23.16", ++ "rustc-hash 2.1.1", + "rustls 0.23.23", "socket2", - "thiserror", -@@ -5374,7 +5692,7 @@ dependencies = [ - "bytes", - "rand", + "thiserror 2.0.12", +@@ -5551,7 +5877,7 @@ dependencies = [ + "getrandom 0.2.15", + "rand 0.8.5", "ring", - "rustc-hash", -+ "rustc-hash 2.0.0", - "rustls 0.23.16", ++ "rustc-hash 2.1.1", + "rustls 0.23.23", + "rustls-pki-types", "slab", - "thiserror", -@@ -5603,6 +5921,7 @@ dependencies = [ +@@ -5812,6 +6138,7 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.31", + "hyper 0.14.32", + "hyper-rustls 0.24.2", "hyper-tls 0.5.0", "ipnet", "js-sys", -@@ -5612,6 +5931,7 @@ dependencies = [ +@@ -5821,6 +6148,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", @@ -1192,7 +1174,7 @@ index 99cec70b..9a81bdb1 100644 "rustls-pemfile 1.0.4", "serde", "serde_json", -@@ -5620,11 +5940,13 @@ dependencies = [ +@@ -5829,11 +6157,13 @@ dependencies = [ "system-configuration 0.5.1", "tokio", "tokio-native-tls", @@ -1206,7 +1188,7 @@ index 99cec70b..9a81bdb1 100644 "winreg", ] -@@ -5682,7 +6004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -5892,7 +6222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ "crypto-bigint 0.4.9", @@ -1215,15 +1197,15 @@ index 99cec70b..9a81bdb1 100644 "zeroize", ] -@@ -5710,6 +6032,26 @@ dependencies = [ +@@ -5919,6 +6249,26 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rsa" -+version = "0.9.7" ++version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" ++checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" +dependencies = [ + "const-oid", + "digest", @@ -1232,7 +1214,7 @@ index 99cec70b..9a81bdb1 100644 + "num-traits", + "pkcs1", + "pkcs8 0.10.2", -+ "rand_core", ++ "rand_core 0.6.4", + "signature 2.2.0", + "spki 0.7.3", + "subtle", @@ -1242,7 +1224,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "rtcp-types" version = "0.1.0" -@@ -5759,6 +6101,12 @@ version = "0.1.24" +@@ -5968,6 +6318,12 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" @@ -1254,8 +1236,8 @@ index 99cec70b..9a81bdb1 100644 + [[package]] name = "rustc-hash" - version = "2.0.0" -@@ -5823,12 +6171,28 @@ dependencies = [ + version = "2.1.1" +@@ -6032,12 +6388,28 @@ dependencies = [ "sct", ] @@ -1275,16 +1257,16 @@ index 99cec70b..9a81bdb1 100644 + [[package]] name = "rustls" - version = "0.23.16" + version = "0.23.23" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" + checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395" dependencies = [ + "aws-lc-rs", + "log", "once_cell", "ring", "rustls-pki-types", -@@ -5846,7 +6210,32 @@ dependencies = [ +@@ -6055,7 +6427,32 @@ dependencies = [ "openssl-probe", "rustls-pemfile 1.0.4", "schannel", @@ -1314,11 +1296,11 @@ index 99cec70b..9a81bdb1 100644 + "openssl-probe", + "rustls-pki-types", + "schannel", -+ "security-framework 3.1.0", ++ "security-framework 3.2.0", ] [[package]] -@@ -5889,11 +6278,18 @@ version = "0.102.8" +@@ -6101,6 +6498,7 @@ version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ @@ -1326,18 +1308,7 @@ index 99cec70b..9a81bdb1 100644 "ring", "rustls-pki-types", "untrusted", - ] - -+[[package]] -+name = "rustversion" -+version = "1.0.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" -+ - [[package]] - name = "ryu" - version = "1.0.18" -@@ -5972,9 +6368,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -6190,9 +6588,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct", @@ -1349,10 +1320,10 @@ index 99cec70b..9a81bdb1 100644 "subtle", "zeroize", ] -@@ -5986,7 +6382,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -6204,7 +6602,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", - "core-foundation", + "core-foundation 0.9.4", + "core-foundation-sys", @@ -1362,29 +1333,17 @@ index 99cec70b..9a81bdb1 100644 + +[[package]] +name = "security-framework" -+version = "3.1.0" ++version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "81d3f8c9bfcc3cbb6b0179eb57042d75b1582bdc65c3cb95f3fa999509c03cbc" ++checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" +dependencies = [ -+ "bitflags 2.6.0", ++ "bitflags 2.9.0", + "core-foundation 0.10.0", "core-foundation-sys", "libc", "security-framework-sys", -@@ -5994,9 +6403,9 @@ dependencies = [ - - [[package]] - name = "security-framework-sys" --version = "2.12.0" -+version = "2.13.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" -+checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" - dependencies = [ - "core-foundation-sys", - "libc", -@@ -6135,19 +6544,6 @@ dependencies = [ - "syn 2.0.86", +@@ -6353,19 +6764,6 @@ dependencies = [ + "syn 2.0.99", ] -[[package]] @@ -1403,7 +1362,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "sha1" version = "0.10.6" -@@ -6156,7 +6552,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +@@ -6374,7 +6772,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -1412,7 +1371,7 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -6167,7 +6563,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +@@ -6385,7 +6783,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1421,13 +1380,13 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -6225,7 +6621,17 @@ version = "1.6.4" +@@ -6443,7 +6841,17 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.7", + "digest", -+ "rand_core", ++ "rand_core 0.6.4", +] + +[[package]] @@ -1437,10 +1396,10 @@ index 99cec70b..9a81bdb1 100644 +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", - "rand_core", + "rand_core 0.6.4", ] -@@ -6296,6 +6702,15 @@ dependencies = [ +@@ -6514,6 +6922,15 @@ dependencies = [ "lock_api", ] @@ -1456,7 +1415,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "spki" version = "0.6.0" -@@ -6303,7 +6718,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -6521,7 +6938,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", @@ -1475,7 +1434,7 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -6345,6 +6770,90 @@ version = "2.6.1" +@@ -6569,6 +6996,90 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" @@ -1566,8 +1525,8 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "syn" version = "1.0.109" -@@ -6382,6 +6891,19 @@ dependencies = [ - "futures-core", +@@ -6617,6 +7128,19 @@ dependencies = [ + "syn 2.0.99", ] +[[package]] @@ -1586,7 +1545,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "system-configuration" version = "0.5.1" -@@ -6389,7 +6911,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -6624,7 +7148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", @@ -1595,16 +1554,16 @@ index 99cec70b..9a81bdb1 100644 "system-configuration-sys 0.5.0", ] -@@ -6400,7 +6922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -6635,7 +7159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys 0.6.0", ] -@@ -6563,7 +7085,9 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +@@ -6819,7 +7343,9 @@ checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -1614,7 +1573,7 @@ index 99cec70b..9a81bdb1 100644 "powerfmt", "serde", "time-core", -@@ -6650,6 +7174,17 @@ dependencies = [ +@@ -6916,6 +7442,17 @@ dependencies = [ "tokio", ] @@ -1631,8 +1590,8 @@ index 99cec70b..9a81bdb1 100644 + [[package]] name = "tokio-rustls" - version = "0.26.0" -@@ -6698,6 +7233,22 @@ dependencies = [ + version = "0.26.2" +@@ -6963,6 +7500,22 @@ dependencies = [ "tungstenite 0.21.0", ] @@ -1644,51 +1603,69 @@ index 99cec70b..9a81bdb1 100644 +dependencies = [ + "futures-util", + "log", -+ "rustls 0.23.16", ++ "rustls 0.23.23", + "rustls-native-certs 0.8.1", + "rustls-pki-types", + "tokio", -+ "tokio-rustls 0.26.0", ++ "tokio-rustls 0.26.2", + "tungstenite 0.24.0", +] + [[package]] name = "tokio-util" - version = "0.7.12" -@@ -6882,6 +7433,8 @@ dependencies = [ - "log", - "native-tls", - "rand", -+ "rustls 0.23.16", + version = "0.7.13" +@@ -7154,6 +7707,26 @@ dependencies = [ + "utf-8", + ] + ++[[package]] ++name = "tungstenite" ++version = "0.24.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" ++dependencies = [ ++ "byteorder", ++ "bytes", ++ "data-encoding", ++ "http 1.2.0", ++ "httparse", ++ "log", ++ "rand 0.8.5", ++ "rustls 0.23.23", + "rustls-pki-types", - "sha1", - "thiserror", - "url", -@@ -6948,6 +7501,7 @@ dependencies = [ ++ "sha1", ++ "thiserror 1.0.69", ++ "utf-8", ++] ++ + [[package]] + name = "tungstenite" + version = "0.26.2" +@@ -7218,6 +7791,7 @@ dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", + "serde", ] [[package]] -@@ -6984,6 +7538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +@@ -7266,6 +7840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587" dependencies = [ - "getrandom", -+ "rand", + "getrandom 0.3.1", ++ "rand 0.9.0", ] [[package]] -@@ -7017,13 +7572,40 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +@@ -7299,13 +7874,40 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "3.2.0" -+version = "9.0.2" ++version = "9.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a" -+checksum = "31f25fc8f8f05df455c7941e87f093ad22522a9ff33d7a027774815acf6f0639" ++checksum = "e0d2f179f8075b805a43a2a21728a46f0cc2921b3c58695b28fa8817e103cd9a" dependencies = [ - "bitflags 1.3.2", - "chrono", @@ -1702,9 +1679,9 @@ index 99cec70b..9a81bdb1 100644 + +[[package]] +name = "vergen-gitcl" -+version = "1.0.2" ++version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0227006d09f98ab00ea69e9a5e055e676a813cfbed4232986176c86a6080b997" ++checksum = "b2f89d70a58a4506a6079cedf575c64cf51649ccbb4e02a63dac539b264b7711" +dependencies = [ + "anyhow", + "derive_builder", @@ -1716,9 +1693,9 @@ index 99cec70b..9a81bdb1 100644 + +[[package]] +name = "vergen-lib" -+version = "0.1.5" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0c767e6751c09fc85cde58722cf2f1007e80e4c8d5a4321fc90d83dc54ca147" ++checksum = "9b07e6010c0f3e59fcb164e0163834597da68d1f864e2b8ca49f74de01e9c166" +dependencies = [ + "anyhow", + "derive_builder", @@ -1726,7 +1703,7 @@ index 99cec70b..9a81bdb1 100644 ] [[package]] -@@ -7190,12 +7772,40 @@ dependencies = [ +@@ -7495,12 +8097,40 @@ dependencies = [ "ebml-iterable", ] @@ -1767,7 +1744,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "winapi" version = "0.3.9" -@@ -7227,6 +7837,16 @@ version = "0.4.0" +@@ -7532,6 +8162,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" @@ -1784,7 +1761,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "windows-core" version = "0.52.0" -@@ -7236,17 +7856,60 @@ dependencies = [ +@@ -7541,6 +8181,40 @@ dependencies = [ "windows-targets 0.52.6", ] @@ -1808,7 +1785,7 @@ index 99cec70b..9a81bdb1 100644 +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.86", ++ "syn 2.0.99", +] + +[[package]] @@ -1819,12 +1796,13 @@ index 99cec70b..9a81bdb1 100644 +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.86", ++ "syn 2.0.99", +] + [[package]] - name = "windows-registry" - version = "0.2.0" + name = "windows-link" + version = "0.1.0" +@@ -7553,11 +8227,20 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ @@ -1846,7 +1824,7 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "windows-result" version = "0.2.0" -@@ -7262,7 +7925,7 @@ version = "0.1.0" +@@ -7573,7 +8256,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ @@ -1855,8 +1833,8 @@ index 99cec70b..9a81bdb1 100644 "windows-targets 0.52.6", ] -@@ -7480,16 +8143,6 @@ dependencies = [ - "time", +@@ -7836,16 +8519,6 @@ dependencies = [ + "synstructure", ] -[[package]] @@ -1872,13 +1850,10 @@ index 99cec70b..9a81bdb1 100644 [[package]] name = "zerocopy" version = "0.7.35" -@@ -7497,18 +8150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" - dependencies = [ - "byteorder", -- "zerocopy-derive 0.7.35", --] -- +@@ -7865,17 +8538,6 @@ dependencies = [ + "zerocopy-derive 0.8.21", + ] + -[[package]] -name = "zerocopy-derive" -version = "0.6.6" @@ -1887,13 +1862,14 @@ index 99cec70b..9a81bdb1 100644 -dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.86", -+ "zerocopy-derive", - ] - +- "syn 2.0.99", +-] +- [[package]] + name = "zerocopy-derive" + version = "0.7.35" diff --git a/audio/spotify/Cargo.toml b/audio/spotify/Cargo.toml -index 593115bf..1c635312 100644 +index 387785cd..b063b8ca 100644 --- a/audio/spotify/Cargo.toml +++ b/audio/spotify/Cargo.toml @@ -11,9 +11,9 @@ rust-version.workspace = true @@ -2204,10 +2180,10 @@ index 6f429682..932f5a9f 100644 player.load(track, true, 0); diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json -index ac1f6425..bcc97f78 100644 +index 4e2a1361..73aba5b9 100644 --- a/docs/plugins/gst_plugins_cache.json +++ b/docs/plugins/gst_plugins_cache.json -@@ -11245,6 +11245,18 @@ +@@ -11472,6 +11472,18 @@ } }, "properties": { @@ -2227,5 +2203,5 @@ index ac1f6425..bcc97f78 100644 "blurb": "Spotify audio bitrate in kbit/s", "conditionally-available": false, -- -2.47.0 +2.48.1 diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index d89c9c65838e..a919a0d98c4f 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -10,8 +10,6 @@ withPulse ? stdenv.hostPlatform.isLinux, libpulseaudio, withCoreAudio ? stdenv.hostPlatform.isDarwin, - AudioUnit, - AudioToolbox, withJack ? stdenv.hostPlatform.isUnix, jack, withConplay ? !stdenv.hostPlatform.isWindows, @@ -45,8 +43,6 @@ stdenv.mkDerivation rec { ++ lib.optionals withAlsa [ alsa-lib ] ++ lib.optionals withPulse [ libpulseaudio ] ++ lib.optionals withCoreAudio [ - AudioUnit - AudioToolbox ] ++ lib.optionals withJack [ jack ] ); diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix index 31db8595ca10..7015d978d394 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libmt32emu"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-zY1AFcm8uvFkrKUZHsqtKY2CYTY4bWmkTJ7bZPqXoxk="; + sha256 = "sha256-wXIvdGoup/AOQggkeXvtbi3pXhyKUKWmyt/ZbGzufds="; }; outputs = [ diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 66275bdac495..315ed5932fb5 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, wrapGAppsHook3, wrapQtAppsHook, @@ -35,15 +36,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ha3rBILekycHiPdcaPNsbvlF289NzFs9srP3unOuJRg="; + sha256 = "sha256-9jafh9zyf+tuC+WU6nQIMBVm+Gqqcig8jS2R1h/YnIo="; }; + # Backport + additional patch to fix build on Qt 6.9 + # FIXME: remove when no longer required + patches = [ + (fetchpatch { + url = "https://github.com/musescore/MuseScore/commit/05056ed19520060c3912a09a3adfa0927057f956.patch"; + hash = "sha256-50Hytuu2lQRbAI2JEwlKeMUmJxTUtfqgwru6U760hAY="; + }) + ./qt-6.9.patch + ]; + cmakeFlags = [ "-DMUSE_APP_BUILD_MODE=release" # Disable the build and usage of the `/bin/crashpad_handler` utility - it's diff --git a/pkgs/applications/audio/musescore/qt-6.9.patch b/pkgs/applications/audio/musescore/qt-6.9.patch new file mode 100644 index 000000000000..d4cc3cacb556 --- /dev/null +++ b/pkgs/applications/audio/musescore/qt-6.9.patch @@ -0,0 +1,13 @@ +diff --git a/src/palette/view/widgets/specialcharactersdialog.cpp b/src/palette/view/widgets/specialcharactersdialog.cpp +index 2fe07bdb8f..dfcae1ded7 100644 +--- a/src/palette/view/widgets/specialcharactersdialog.cpp ++++ b/src/palette/view/widgets/specialcharactersdialog.cpp +@@ -712,7 +712,7 @@ void SpecialCharactersDialog::populateUnicode() + std::shared_ptr fs = std::make_shared(gpaletteScore->dummy()); + fs->setCode(code); + fs->setFont(m_font); +- m_pUnicode->appendElement(fs, QString("0x%1").arg(code, 5, 16, QLatin1Char('0'))); ++ m_pUnicode->appendElement(fs, QString("0x%1").arg((uint32_t)code, 5, 16, QLatin1Char('0'))); + } + } + diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix deleted file mode 100644 index ac807528f509..000000000000 --- a/pkgs/applications/audio/muso/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - pkg-config, - wrapGAppsHook3, - CoreServices, -}: - -rustPlatform.buildRustPackage rec { - pname = "muso"; - version = "unstable-2021-09-02"; - - src = fetchFromGitHub { - owner = "quebin31"; - repo = pname; - rev = "6dd1c6d3a82b21d4fb2606accf2f26179eb6eaf9"; - hash = "sha256-09DWUER0ZWQuwfE3sjov2GjJNI7coE3D3E5iUy9mlSE="; - }; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; - - preConfigure = '' - substituteInPlace lib/utils.rs \ - --replace "/usr/share/muso" "$out/share/muso" - ''; - - postInstall = '' - mkdir -p $out/share/muso - cp share/* $out/share/muso/ - ''; - - useFetchCargoVendor = true; - cargoHash = "sha256-L0ZQoz9J5Hxg98puk1RbKuybLboIoOsy5qqGnvEPi1U="; - - meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; - description = "Automatic music sorter (based on ID3 tags)"; - mainProgram = "muso"; - homepage = "https://github.com/quebin31/muso"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ crertel ]; - }; -} diff --git a/pkgs/applications/audio/parrot/default.nix b/pkgs/applications/audio/parrot/default.nix deleted file mode 100644 index 7dee1402f30a..000000000000 --- a/pkgs/applications/audio/parrot/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - cmake, - ffmpeg, - libopus, - makeBinaryWrapper, - unstableGitUpdater, - openssl, - pkg-config, - stdenv, - yt-dlp, - Security, -}: -rustPlatform.buildRustPackage { - pname = "parrot"; - version = "1.6.0-unstable-2024-07-12"; - - src = fetchFromGitHub { - owner = "aquelemiguel"; - repo = "parrot"; - rev = "a6c1e88a1e360d46a91bc536985db87af72245b3"; - hash = "sha256-to1SVLzw2l06cqsVOopk9KH2UyGgJ4CwWagHxaDrf4Y="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-be/gGKCd8/VgcjzhyMKDl5TzAuavm1rPNYBm8RLTP90="; - - nativeBuildInputs = [ - cmake - makeBinaryWrapper - pkg-config - ]; - - buildInputs = [ - libopus - openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - postInstall = '' - wrapProgram $out/bin/parrot \ - --prefix PATH : ${ - lib.makeBinPath [ - ffmpeg - yt-dlp - ] - } - ''; - - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - - meta = { - description = "Hassle-free Discord music bot"; - homepage = "https://github.com/aquelemiguel/parrot"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ gerg-l ]; - mainProgram = "parrot"; - }; -} diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 874936c25042..920d55d25f8e 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -7,12 +7,12 @@ let pname = "plexamp"; - version = "4.11.5"; + version = "4.12.3"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha512-j8fPp6JcTB/PwsGgvEGqETZ83mGee1MwR4T9eFcNuoLRtlnudM7c3WDgxhpUdv5Nx3XkcMVnW1fntZYN2sIfzA=="; + hash = "sha512-gjOjk/JtHbhEDGzWH/bBtNd7qsYS97hBlPbRw7uWH/PCXD4urUWBrlihNWAOgYClVwl7nbrx/y7mhCrI2N6c1w=="; }; appimageContents = appimageTools.extractType2 { @@ -38,7 +38,7 @@ appimageTools.wrapType2 { meta = with lib; { description = "Beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/77"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/80"; license = licenses.unfree; maintainers = with maintainers; [ killercup diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 7f49c31fd38c..7df504767cdb 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -10,15 +10,16 @@ tk, fftw, portaudio, + portmidi, }: stdenv.mkDerivation rec { pname = "puredata"; - version = "0.54-1"; + version = "0.55-2"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI="; + hash = "sha256-EIKX+NHdGQ346LtKSsNIeSrM9wT5ogUtk8uoybi7Wls="; }; patches = [ @@ -41,12 +42,12 @@ stdenv.mkDerivation rec { alsa-lib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + portmidi portaudio ]; configureFlags = [ - "--enable-universal" "--enable-fftw" "--enable-jack" ] @@ -55,13 +56,16 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-portaudio" + "--enable-portmidi" "--without-local-portaudio" + "--without-local-portmidi" "--disable-jack-framework" "--with-wish=${tk}/bin/wish8.6" ]; postInstall = '' wrapProgram $out/bin/pd --prefix PATH : ${lib.makeBinPath [ tk ]} + wrapProgram $out/bin/pd-gui --prefix PATH : ${lib.makeBinPath [ tk ]} ''; meta = with lib; { diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix deleted file mode 100644 index 407d44c785da..000000000000 --- a/pkgs/applications/audio/qmmp/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - pkg-config, - qtbase, - qttools, - qtmultimedia, - wrapQtAppsHook, - # transports - curl, - libmms, - # input plugins - libmad, - taglib, - libvorbis, - libogg, - flac, - libmpcdec, - libmodplug, - libsndfile, - libcdio, - cdparanoia, - libcddb, - faad2, - ffmpeg, - wildmidi, - libbs2b, - game-music-emu, - libarchive, - opusfile, - soxr, - wavpack, - libxmp, - libsidplayfp, - # output plugins - alsa-lib, - libpulseaudio, - pipewire, - libjack2, - # effect plugins - libsamplerate, -}: - -# Additional plugins that can be added: -# ProjectM visualization plugin - -# To make MIDI work we must tell Qmmp what instrument configuration to use (and -# this can unfortunately not be set at configure time): -# Go to settings (ctrl-p), navigate to the WildMidi plugin and click on -# Preferences. In the instrument configuration field, type the path to -# /nix/store/*wildmidi*/etc/wildmidi.cfg (or your own custom cfg file). - -# Qmmp installs working .desktop file(s) all by itself, so we don't need to -# handle that. - -stdenv.mkDerivation rec { - pname = "qmmp"; - version = "2.1.8"; - - src = fetchurl { - url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; - hash = "sha256-hGphQ8epqym47C9doiSOQd3yc28XwV2UsNc7ivhaae4="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - # basic requirements - qtbase - qttools - qtmultimedia - # transports - curl - libmms - # input plugins - libmad - taglib - libvorbis - libogg - flac - libmpcdec - libmodplug - libsndfile - libcdio - cdparanoia - libcddb - faad2 - ffmpeg - wildmidi - libbs2b - game-music-emu - libarchive - opusfile - soxr - wavpack - libxmp - libsidplayfp - # output plugins - alsa-lib - libpulseaudio - pipewire - libjack2 - # effect plugins - libsamplerate - ]; - - meta = with lib; { - description = "Qt-based audio player that looks like Winamp"; - mainProgram = "qmmp"; - homepage = "https://qmmp.ylsoftware.com/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 44f40069bd34..d221a81617ac 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.8.3"; + version = "0.9.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-adgUpX2xfjf61//SUfhUU4NCP048q0WsTM4YkUny0UE="; + sha256 = "sha256-SCco66Czu8dW7iSSX/exhIlOXS+ayCwGUuCfJuUCRjM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 5c7ae53e0bde..2b73e80a1732 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "qsynth"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - hash = "sha256-SHMPmZMAlC9L5EAecaZNB0pWnq0heeD8bcbhKeI+YOo="; + hash = "sha256-z4l+Ku3oEQV3NunkogyxzaSKhFJuYhIxlExJsACcumY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 439fa8e4a0dd..adaf0fc898fb 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -11,7 +11,6 @@ boost, jsoncpp, libbsd, - pcre, # GUI/Desktop dbus, glibmm, @@ -74,7 +73,6 @@ stdenv.mkDerivation rec { boost jsoncpp libbsd - pcre glibmm hicolor-icon-theme gsettings-desktop-schemas diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index db313704dfad..0f7988df1b6c 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -38,17 +38,17 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.35"; + version = "7.38"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = if stdenv.hostPlatform.isDarwin then - "sha256-X3KNESHUmcs3zcwURKvaDqvkf9P/XncO/hpsOGxKMmg=" + "sha256-2DmwbOQ1sNVL3krlG27KOdhuwalZRjafuWzWFYiWpng=" else { - x86_64-linux = "sha256-VD2VUTZUYi+7rDCG1joElajbfxLiramQwwrUgDDpuPI="; - aarch64-linux = "sha256-TFhv4CS7VCysup3Xy/uXHxaWhG4J8WCgxtaooGFj4vw="; + x86_64-linux = "sha256-GiN20Dj+kBNbOI1CASCDJFIUbOYfBc5K/bwf42Pc3Zk="; + aarch64-linux = "sha256-CziepFXytiMJ7eMtCziaYphYgYQJywQ9JtrLHzBU5Cw="; } .${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/audio/samplebrain/default.nix b/pkgs/applications/audio/samplebrain/default.nix index 253aa2b34352..07daf0300c67 100644 --- a/pkgs/applications/audio/samplebrain/default.nix +++ b/pkgs/applications/audio/samplebrain/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch, fftw, liblo, libsndfile, @@ -23,6 +24,14 @@ stdenv.mkDerivation rec { hash = "sha256-/pMHmwly5Dar7w/ZawvR3cWQHw385GQv/Wsl1E2w5p4="; }; + patches = [ + # Fixes build with recent liblo, see https://gitlab.com/then-try-this/samplebrain/-/merge_requests/16 + (fetchpatch { + url = "https://gitlab.com/then-try-this/samplebrain/-/commit/032fd7c03931d1ca2d5c3d5e29901569aa2b2a86.patch"; + hash = "sha256-aaZJh/vx8fOqrJTuFzQ9+1mXvDQQXLy1k/2SwkMkVk4="; + }) + ]; + nativeBuildInputs = [ qmake wrapQtAppsHook diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index cbac2c3ee1d3..d47c5c25a189 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "samplv1"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/samplv1/samplv1-${version}.tar.gz"; - hash = "sha256-ZmRsiFDqJsG28FiFR/RbeXkeeLn2HBfImKQM5PaRF78="; + hash = "sha256-DcMtNGiMJ9YfTKZLns+3mBKHbkG3Ven3IJAU/qSDyh0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix deleted file mode 100644 index 57848bcb2b69..000000000000 --- a/pkgs/applications/audio/schismtracker/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - alsa-lib, - perl, - pkg-config, - SDL2, - libXext, - Cocoa, - utf8proc, - nix-update-script, -}: - -stdenv.mkDerivation rec { - pname = "schismtracker"; - version = "20250313"; - - src = fetchFromGitHub { - owner = "schismtracker"; - repo = "schismtracker"; - tag = version; - hash = "sha256-AiQ5+HTosVOR+Z5+uT6COMLvkGS3zvXtkCkg16MhVf4="; - }; - - # If we let it try to get the version from git, it will fail and fall back - # on running `date`, which will output the epoch, which is considered invalid - # in this assert: https://github.com/schismtracker/schismtracker/blob/a106b57e0f809b95d9e8bcf5a3975d27e0681b5a/schism/version.c#L112 - postPatch = '' - substituteInPlace configure.ac \ - --replace-fail 'git log' 'echo ${version} #' - ''; - - configureFlags = - [ - (lib.enableFeature true "dependency-tracking") - (lib.withFeature true "sdl2") - (lib.enableFeature true "sdl2-linking") - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - (lib.enableFeature true "alsa") - (lib.enableFeature true "alsa-linking") - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - (lib.enableFeature false "sdltest") - ]; - - strictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - perl - pkg-config - ]; - - buildInputs = - [ - SDL2 - utf8proc - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - libXext - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; - - enableParallelBuilding = true; - - # Our Darwin SDL2 doesn't have a SDL2main to link against - preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace configure.ac \ - --replace '-lSDL2main' '-lSDL2' - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Music tracker application, free reimplementation of Impulse Tracker"; - homepage = "https://schismtracker.org/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ftrvxmtrx ]; - mainProgram = "schismtracker"; - }; -} diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index f6cbf58d8954..205f8cd80749 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -13,8 +13,6 @@ libvorbis, libopus, soxr, - IOKit, - AudioToolbox, aixlog, popl, pulseaudioSupport ? false, @@ -55,11 +53,7 @@ stdenv.mkDerivation rec { openssl ] ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - AudioToolbox - ]; + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS"; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 9a45ba77ca6a..221f67badc02 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -17,7 +17,7 @@ crossguid, reproc, platform-folders, - ruby, + ruby_3_2, erlang, elixir, beamPackages, @@ -40,6 +40,11 @@ fmt, }: +# Sonic Pi fails to build with Ruby 3.3. +let + ruby = ruby_3_2; +in + stdenv.mkDerivation rec { pname = "sonic-pi"; version = "4.5.1"; diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/applications/audio/spotify-qt/default.nix index abb40e9ed468..6e86ec681591 100644 --- a/pkgs/applications/audio/spotify-qt/default.nix +++ b/pkgs/applications/audio/spotify-qt/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spotify-qt"; - version = "3.12"; + version = "4.0.0"; src = fetchFromGitHub { owner = "kraxarn"; repo = "spotify-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-j9g2fq12gsue0pc/fLoCAtDlwwlbCVJ65kxPiTJTqvk="; + hash = "sha256-4Qcmb8SYh4wQIosMU9bk22Y7FF3gfYgM3zODMBsD8Iw="; }; postPatch = '' diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 2480587792a9..82ff1403965f 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -32,6 +32,8 @@ taglib, util-linux, wrapQtAppsHook, + sparsehash, + rapidjson, }: let @@ -40,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.2.7"; + version = "1.2.10"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-EJE6GDyXYMjJUQeTRgmjd0HX3hf4ajSRGsv/2s2oItc="; + hash = "sha256-ByZHyHkMlU571QSu1bbYZC7aEX4Jc8N3j05WbXRQaBY="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead @@ -73,6 +75,8 @@ stdenv.mkDerivation rec { qtbase sqlite taglib + sparsehash + rapidjson ] ++ optionals stdenv.hostPlatform.isLinux [ libgpod diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix deleted file mode 100644 index 4c21e137aed1..000000000000 --- a/pkgs/applications/audio/tageditor/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - cmake, - cpp-utilities, - qtutilities, - mp4v2, - libid3tag, - qtbase, - qttools, - qtwebengine, - qtx11extras, - tagparser, - wrapQtAppsHook, -}: - -stdenv.mkDerivation rec { - pname = "tageditor"; - version = "3.9.4"; - - src = fetchFromGitHub { - owner = "martchus"; - repo = pname; - rev = "v${version}"; - hash = "sha256-VRQV4bTPG4VFhRHFJamUnYd04ZCaNpaxU27Jcl6Chc4="; - }; - - nativeBuildInputs = [ - pkg-config - cmake - wrapQtAppsHook - ]; - - buildInputs = [ - mp4v2 - libid3tag - qtbase - qttools - qtx11extras - qtwebengine - cpp-utilities - qtutilities - tagparser - ]; - - meta = with lib; { - homepage = "https://github.com/Martchus/tageditor"; - description = "Tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska"; - license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.linux; - mainProgram = "tageditor"; - }; -} diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix deleted file mode 100644 index a953f5960122..000000000000 --- a/pkgs/applications/audio/tunefish/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - python3, - alsa-lib, - curl, - freetype, - gtk3, - libGL, - libX11, - libXext, - libXinerama, - webkitgtk_4_0, -}: - -stdenv.mkDerivation { - pname = "tunefish"; - version = "unstable-2020-08-13"; - - src = fetchFromGitHub { - owner = "jpcima"; - repo = "tunefish"; - rev = "b3d83cc66201619f6399500f6897fbeb1786d9ed"; - fetchSubmodules = true; - sha256 = "0rjpq3s609fblzkvnc9729glcnfinmxljh0z8ldpzr245h367zxh"; - }; - - nativeBuildInputs = [ - pkg-config - python3 - ]; - buildInputs = [ - alsa-lib - curl - freetype - gtk3 - libGL - libX11 - libXext - libXinerama - webkitgtk_4_0 - ]; - - postPatch = '' - patchShebangs src/tunefish4/generate-lv2-ttl.py - ''; - - makeFlags = [ - "-C" - "src/tunefish4/Builds/LinuxMakefile" - "CONFIG=Release" - ]; - - installPhase = '' - mkdir -p $out/lib/lv2 - cp -r src/tunefish4/Builds/LinuxMakefile/build/Tunefish4.lv2 $out/lib/lv2 - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://tunefish-synth.com/"; - description = "Virtual analog synthesizer LV2 plugin"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ orivej ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index c824ffddde59..2632fafb6751 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, libogg, libvorbis, libao, @@ -16,29 +15,13 @@ stdenv.mkDerivation rec { pname = "vorbis-tools"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${version}.tar.gz"; - sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv"; + hash = "sha256-of493Gd3vc6/a3l+ft/gQ3lUskdW/8yMa4FrY+BGDd4="; }; - patches = [ - # 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="; - }) - ]; - - # ld64 on darwin doesn't support nested archives and as the nested lib - # (libbase64.a) is not required to build so leave it out - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace share/Makefile.am \ - --replace-fail libpicture_a_LIBADD '#libpicture_a_LIBADD' - ''; - nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix deleted file mode 100644 index dace69315ac1..000000000000 --- a/pkgs/applications/audio/xmp/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - pkg-config, - alsa-lib, - libxmp, - AudioUnit, - CoreAudio, -}: - -stdenv.mkDerivation rec { - pname = "xmp"; - version = "4.2.0"; - - src = fetchFromGitHub { - owner = "libxmp"; - repo = "xmp-cli"; - rev = "${pname}-${version}"; - hash = "sha256-037k1rFjGR6XFtr08bzs4zVz+GyUGuuutuWFlNEuATA="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = - [ libxmp ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioUnit - CoreAudio - ]; - - meta = with lib; { - description = "Extended module player"; - homepage = "https://xmp.sourceforge.net/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - mainProgram = "xmp"; - }; -} diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index ef035a500226..871c0ca56807 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.7.4"; + version = "3.9.0"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-qzvfYxM5mxxujWE0SDUapmN+Px9NkP58e1UeLEtZ7bc="; + hash = "sha256-xaHYNfW5ZLYiaeJ0F32NQ87woMh6K4Ea9rjgNOyabck="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-guD1yWFd+uO9H/egHS0PJ9HIIlF+wFS/98YtvjIzZW8="; + hash = "sha256-xIQyTetHU37gTxCcQp4VCqzGdIfVQGy/aORCVba6YQ0="; }; nativeBuildInputs = [ @@ -83,9 +83,14 @@ stdenv.mkDerivation (finalAttrs: { --inherit-argv0 ''; + patches = [ + # MPRIS's DesktopEntry property needs to match the desktop entry basename + ./fix-mpris-desktop-entry.patch + ]; + desktopItems = [ (makeDesktopItem { - name = "youtube-music"; + name = "com.github.th_ch.youtube_music"; exec = "youtube-music %u"; icon = "youtube-music"; desktopName = "YouTube Music"; diff --git a/pkgs/applications/audio/youtube-music/fix-mpris-desktop-entry.patch b/pkgs/applications/audio/youtube-music/fix-mpris-desktop-entry.patch new file mode 100644 index 000000000000..acbd952069eb --- /dev/null +++ b/pkgs/applications/audio/youtube-music/fix-mpris-desktop-entry.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugins/shortcuts/mpris.ts b/src/plugins/shortcuts/mpris.ts +index 93cb40f9..ad0bede3 100644 +--- a/src/plugins/shortcuts/mpris.ts ++++ b/src/plugins/shortcuts/mpris.ts +@@ -79,7 +79,7 @@ function setupMPRIS() { + instance.canQuit = false; + instance.canUsePlayerControls = true; + instance.supportedUriSchemes = ['http', 'https']; +- instance.desktopEntry = 'youtube-music'; ++ instance.desktopEntry = 'com.github.th_ch.youtube_music'; + return instance; + } + diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index fdcfc0a8005e..f6ac1294fc2a 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -45,6 +45,7 @@ # Test dependencies cxxtest, ruby, + ctestCheckHook, }: assert builtins.any (g: guiModule == g) [ @@ -151,28 +152,19 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ cxxtest ruby + ctestCheckHook ]; - # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 - checkPhase = - let - disabledTests = - # PortChecker is non-deterministic. It's fixed in the master - # branch, but backporting would require an update to rtosc, so - # we'll just disable it until the next release. - [ "PortChecker" ] - - # Tests fail on aarch64 - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ - "MessageTest" - "UnisonTest" - ]; - in - '' - runHook preCheck - ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' - runHook postCheck - ''; + disabledTests = + # PortChecker is non-deterministic. It's fixed in the master + # branch, but backporting would require an update to rtosc, so + # we'll just disable it until the next release. + [ "PortChecker" ] + # Tests fail on aarch64 + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + "MessageTest" + "UnisonTest" + ]; # Use Zyn-Fusion logo for zest build # An SVG version of the logo isn't hosted anywhere we can fetch, I diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 90fc8730176c..bb2d649bd099 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -72,7 +72,7 @@ python3Packages.buildPythonApplication rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; preCheck = let diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix deleted file mode 100644 index c644d6662775..000000000000 --- a/pkgs/applications/blockchains/alfis/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - stdenv, - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - makeWrapper, - webkitgtk_4_0, - zenity, - Cocoa, - Security, - WebKit, - withGui ? true, -}: - -rustPlatform.buildRustPackage rec { - pname = "alfis"; - version = "0.8.5"; - - src = fetchFromGitHub { - owner = "Revertron"; - repo = "Alfis"; - rev = "v${version}"; - hash = "sha256-ettStNktSDZnYNN/IWqTB1Ou1g1QEGFabS4EatnDLaE="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-xe0YQCKnDV6M6IKWgljsuJ5ZevkdpxZDnNHAHKJyUec="; - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - buildInputs = - lib.optional stdenv.hostPlatform.isDarwin Security - ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0 - ++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [ - Cocoa - WebKit - ]; - - buildNoDefaultFeatures = true; - buildFeatures = [ "doh" ] ++ lib.optional withGui "webgui"; - - checkFlags = [ - # these want internet access, disable them - "--skip=dns::client::tests::test_tcp_client" - "--skip=dns::client::tests::test_udp_client" - ]; - - postInstall = lib.optionalString (withGui && stdenv.hostPlatform.isLinux) '' - wrapProgram $out/bin/alfis \ - --prefix PATH : ${lib.makeBinPath [ zenity ]} - ''; - - meta = { - description = "Alternative Free Identity System"; - homepage = "https://alfis.name"; - changelog = "https://github.com/Revertron/Alfis/releases/tag/v${version}"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ misuzu ]; - platforms = lib.platforms.unix; - mainProgram = "alfis"; - broken = withGui && stdenv.hostPlatform.isDarwin; - }; -} diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index 984ba370893b..e1410eff679d 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch2, autoreconfHook, pkg-config, util-linux, @@ -26,21 +25,13 @@ stdenv.mkDerivation rec { pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; - version = "26.1.knots20240325"; + version = "28.1.knots20250305"; src = fetchurl { - url = "https://bitcoinknots.org/files/26.x/${version}/bitcoin-${version}.tar.gz"; - hash = "sha256-PqpePDna2gpCzF2K43N4h6cV5Y9w/e5ZcUvaNEaFaIk="; + url = "https://bitcoinknots.org/files/28.x/${version}/bitcoin-${version}.tar.gz"; + hash = "sha256-DKO3+43Tn/BTKQVrLrCkeMtzm8SfbaJD8rPlb6lDA8A="; }; - patches = [ - # upnp: add compatibility for miniupnpc 2.2.8 - (fetchpatch2 { - url = "https://github.com/bitcoinknots/bitcoin/commit/643014424359a4783cf9c73bee3346ac2f04e713.patch?full_index=1"; - hash = "sha256-FdLoNH3+ZZTbqrwRvhbAeJuGz4SgnIvoWUBzRxjfzs8="; - }) - ]; - nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index f5c3683dcbc7..818feda76efa 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -2,21 +2,19 @@ lib, stdenv, fetchurl, - autoreconfHook, + cmake, pkg-config, installShellFiles, - util-linux, - hexdump, autoSignDarwinBinariesHook, wrapQtAppsHook ? null, boost, libevent, - miniupnpc, zeromq, zlib, db48, sqlite, qrencode, + libsystemtap, qtbase ? null, qttools ? null, python3, @@ -24,6 +22,7 @@ nixosTests, withGui, withWallet ? true, + enableTracing ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic, }: let @@ -35,24 +34,22 @@ let in stdenv.mkDerivation (finalAttrs: { pname = if withGui then "bitcoin" else "bitcoind"; - version = "28.1"; + version = "29.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "c5ae2dd041c7f9d9b7c722490ba5a9d624f7e9a089c67090615e1ba4ad0883ba"; + sha256 = "882c782c34a3bf2eacd1fae5cdc58b35b869883512f197f7d6dc8f195decfdaa"; }; nativeBuildInputs = [ - autoreconfHook + cmake pkg-config installShellFiles ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] @@ -62,10 +59,10 @@ stdenv.mkDerivation (finalAttrs: { [ boost libevent - miniupnpc zeromq zlib ] + ++ lib.optionals enableTracing [ libsystemtap ] ++ lib.optionals withWallet [ sqlite ] # building with db48 (for legacy descriptor wallet support) is broken on Darwin ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ] @@ -77,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' + cd .. installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash installShellCompletion --bash contrib/completions/bash/bitcoind.bash installShellCompletion --bash contrib/completions/bash/bitcoin-tx.bash @@ -95,23 +93,30 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png ''; - configureFlags = + cmakeFlags = [ - "--with-boost-libdir=${boost.out}/lib" - "--disable-bench" + (lib.cmakeBool "BUILD_BENCH" false) + (lib.cmakeBool "WITH_ZMQ" true) + # building with db48 (for legacy wallet support) is broken on Darwin + (lib.cmakeBool "WITH_BDB" (withWallet && !stdenv.hostPlatform.isDarwin)) + (lib.cmakeBool "WITH_USDT" enableTracing) ] ++ lib.optionals (!finalAttrs.doCheck) [ - "--disable-tests" - "--disable-gui-tests" + (lib.cmakeBool "BUILD_TESTS" false) + (lib.cmakeBool "BUILD_FUZZ_BINARY" false) + (lib.cmakeBool "BUILD_GUI_TESTS" false) ] ++ lib.optionals (!withWallet) [ - "--disable-wallet" + (lib.cmakeBool "ENABLE_WALLET" false) ] ++ lib.optionals withGui [ - "--with-gui=qt5" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + (lib.cmakeBool "BUILD_GUI" true) ]; + NIX_LDFLAGS = lib.optionals ( + stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic + ) "-levent_core"; + nativeCheckInputs = [ python3 ]; doCheck = true; @@ -130,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bitcoin-cli"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.tests = { diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix deleted file mode 100644 index d06ce837c0a3..000000000000 --- a/pkgs/applications/blockchains/electrs/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, - rocksdb_7_10, - Security, -}: - -let - rocksdb = rocksdb_7_10; -in -rustPlatform.buildRustPackage rec { - pname = "electrs"; - version = "0.10.9"; - - src = fetchFromGitHub { - owner = "romanz"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Xo7aqP4tIh/kYthPucscxnl+ZtVioEja4TTFdH0Q350="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-wDEtVsgkddGv89tTy96wYzNWVicn34Gxi+YAo7yAfQA="; - - # needed for librocksdb-sys - nativeBuildInputs = [ rustPlatform.bindgenHook ]; - - # link rocksdb dynamically - ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; - ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - description = "Efficient re-implementation of Electrum Server in Rust"; - homepage = "https://github.com/romanz/electrs"; - license = licenses.mit; - maintainers = with maintainers; [ prusnak ]; - mainProgram = "electrs"; - }; -} diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index b52c720267e5..5118f7880721 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -8,17 +8,18 @@ qtbase, rocksdb_7_10, zeromq, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fulcrum"; - version = "1.11.1"; + version = "1.12.0.1"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; - rev = "v${version}"; - sha256 = "sha256-+hBc7jW1MVLVjYXNOV7QvFJJpZ5RzW5/c9NdqOXrsj0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/RlvbZ6/f0Jxj6oCeHjGWqlktvtNUNczOXi2/wYw2LQ="; }; nativeBuildInputs = [ @@ -26,8 +27,6 @@ stdenv.mkDerivation rec { qmake ]; - dontWrapQtApps = true; # no GUI - buildInputs = [ python3 qtbase @@ -35,11 +34,15 @@ stdenv.mkDerivation rec { zeromq ]; - meta = with lib; { + dontWrapQtApps = true; # no GUI + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Fast & nimble SPV server for Bitcoin Cash & Bitcoin BTC"; homepage = "https://github.com/cculianu/Fulcrum"; - maintainers = with maintainers; [ prusnak ]; - license = licenses.gpl3Plus; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ prusnak ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix deleted file mode 100644 index 8361c2e23f94..000000000000 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ /dev/null @@ -1,154 +0,0 @@ -{ - cmake, - CoreFoundation, - fetchFromGitHub, - fetchurl, - lib, - lighthouse, - nix-update-script, - openssl, - pkg-config, - protobuf, - rustPlatform, - rust-jemalloc-sys, - Security, - sqlite, - stdenv, - SystemConfiguration, - testers, -}: - -rustPlatform.buildRustPackage rec { - pname = "lighthouse"; - version = "6.0.1"; - - # lighthouse/common/deposit_contract/build.rs - depositContractSpecVersion = "0.12.1"; - testnetDepositContractSpecVersion = "0.9.2.1"; - - src = fetchFromGitHub { - owner = "sigp"; - repo = "lighthouse"; - rev = "v${version}"; - hash = "sha256-8jHNm/MGpHGOt52rLMXLMWIVn8AXqnpAr+Wvk7DH6gc="; - }; - - patches = [ - ./use-system-sqlite.patch - ]; - - cargoHash = "sha256-Opkz3EVKw0M4LeWMsn1NlSw/Fg7cWVqnDJRRTPYYlLo="; - useFetchCargoVendor = true; - - buildFeatures = [ - "modern" - "gnosis" - ]; - - nativeBuildInputs = [ - rustPlatform.bindgenHook - cmake - pkg-config - protobuf - ]; - - buildInputs = - [ - rust-jemalloc-sys - sqlite - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - SystemConfiguration - ]; - - depositContractSpec = fetchurl { - url = "https://raw.githubusercontent.com/ethereum/eth2.0-specs/v${depositContractSpecVersion}/deposit_contract/contracts/validator_registration.json"; - hash = "sha256-ZslAe1wkmkg8Tua/AmmEfBmjqMVcGIiYHwi+WssEwa8="; - }; - - testnetDepositContractSpec = fetchurl { - url = "https://raw.githubusercontent.com/sigp/unsafe-eth2-deposit-contract/v${testnetDepositContractSpecVersion}/unsafe_validator_registration.json"; - hash = "sha256-aeTeHRT3QtxBRSNMCITIWmx89vGtox2OzSff8vZ+RYY="; - }; - - LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}"; - LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}"; - - OPENSSL_NO_VENDOR = true; - - cargoBuildFlags = [ - "--package lighthouse" - ]; - - __darwinAllowLocalNetworking = true; - - checkFeatures = [ ]; - - # All of these tests require network access and/or docker - cargoTestFlags = [ - "--workspace" - "--exclude beacon_chain" - "--exclude beacon_node" - "--exclude http_api" - "--exclude lighthouse" - "--exclude lighthouse_network" - "--exclude network" - "--exclude slashing_protection" - "--exclude watch" - "--exclude web3signer_tests" - ]; - - # All of these tests require network access - checkFlags = - [ - "--skip basic" - "--skip deposit_tree::cache_consistency" - "--skip deposit_tree::double_update" - "--skip deposit_tree::updating" - "--skip eth1_cache::big_skip" - "--skip eth1_cache::double_update" - "--skip eth1_cache::pruning" - "--skip eth1_cache::simple_scenario" - "--skip fast::deposit_cache_query" - "--skip http::incrementing_deposits" - "--skip persist::test_persist_caches" - "--skip service::tests::tests::test_dht_persistence" - "--skip time::test::test_reinsertion_updates_timeout" - ] - ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ - "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart" - "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch" - "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" - ]; - - passthru = { - tests.version = testers.testVersion { - package = lighthouse; - command = "lighthouse --version"; - version = "v${lighthouse.version}"; - }; - updateScript = nix-update-script { }; - }; - - enableParallelBuilding = true; - - # This is needed by the unit tests. - FORK_NAME = "capella"; - - meta = with lib; { - description = "Ethereum consensus client in Rust"; - homepage = "https://lighthouse.sigmaprime.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ - centromere - pmw - ]; - mainProgram = "lighthouse"; - broken = stdenv.hostPlatform.isDarwin; - }; -} diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix deleted file mode 100644 index e39d5374b9ad..000000000000 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch2, - cmake, - pkg-config, - boost186, - libsodium, - miniupnpc, - openssl, - python3, - randomx, - rapidjson, - readline, - unbound, - zeromq, - - # darwin - CoreData, - IOKit, - - trezorSupport ? true, - hidapi, - libusb1, - protobuf, - udev, -}: - -let - # submodules; revs are taken from monero repo's `/external` at the given monero version tag. - supercop = fetchFromGitHub { - owner = "monero-project"; - repo = "supercop"; - rev = "633500ad8c8759995049ccd022107d1fa8a1bbc9"; - hash = "sha256-26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE="; - }; - trezor-common = fetchFromGitHub { - owner = "trezor"; - repo = "trezor-common"; - rev = "bff7fdfe436c727982cc553bdfb29a9021b423b0"; - hash = "sha256-VNypeEz9AV0ts8X3vINwYMOgO8VpNmyUPC4iY3OOuZI="; - }; -in -stdenv.mkDerivation rec { - pname = "monero-cli"; - version = "0.18.3.4"; - - src = fetchFromGitHub { - owner = "monero-project"; - repo = "monero"; - rev = "v${version}"; - hash = "sha256-nDiFJjhsISYM8kTgJUaPYL44iyccnz5+Pd5beBh+lsM="; - }; - - patches = [ - ./use-system-libraries.patch - # https://github.com/monero-project/monero/pull/9462 - (fetchpatch2 { - url = "https://github.com/monero-project/monero/commit/65568d3a884857ce08d1170f5801a6891a5c187c.patch?full_index=1"; - hash = "sha256-Btuy69y02UyVMmsOiCRPZhM7qW5+FRNujOZjNMRdACQ="; - }) - ]; - - postPatch = '' - # manually install submodules - rmdir external/{supercop,trezor-common} - ln -sf ${supercop} external/supercop - ln -sf ${trezor-common} external/trezor-common - # export patched source for monero-gui - cp -r . $source - ''; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = - [ - boost186 # uses boost/asio/io_service.hpp - libsodium - miniupnpc - openssl - randomx - rapidjson - readline - unbound - zeromq - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - CoreData - ] - ++ lib.optionals trezorSupport [ - python3 - hidapi - libusb1 - protobuf - ] - ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ]; - - cmakeFlags = - [ - # skip submodules init - "-DMANUAL_SUBMODULES=ON" - # required by monero-gui - "-DBUILD_GUI_DEPS=ON" - "-DReadline_ROOT_DIR=${readline.dev}" - ] - ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF" - ++ lib.optional trezorSupport [ - "-DUSE_DEVICE_TREZOR=ON" - # fix build on recent gcc versions - "-DCMAKE_CXX_FLAGS=-fpermissive" - ]; - - outputs = [ - "out" - "source" - ]; - - meta = { - description = "Private, secure, untraceable currency"; - homepage = "https://getmonero.org/"; - license = lib.licenses.bsd3; - - platforms = with lib.platforms; linux; - - # macOS/ARM has a working `monerod` (at least), but `monero-wallet-cli` - # segfaults on start after entering the wallet password, when built in release mode. - # Building the same revision in debug mode to root-cause the above problem doesn't work - # because of https://github.com/monero-project/monero/issues/9486 - badPlatforms = [ "aarch64-darwin" ]; - - maintainers = with lib.maintainers; [ - pmw - rnhmjoj - ]; - mainProgram = "monero-wallet-cli"; - # internal build tool generate_translations_header is tricky to compile for the build platform - broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; - }; -} diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix deleted file mode 100644 index 790f691b79b2..000000000000 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ /dev/null @@ -1,157 +0,0 @@ -{ - lib, - fetchFromGitHub, - makeDesktopItem, - boost186, - cmake, - libgcrypt, - libgpg-error, - libsodium, - miniupnpc, - monero-cli, - pkg-config, - qtbase, - qtdeclarative, - qtgraphicaleffects, - qtmacextras, - qtmultimedia, - qtquickcontrols, - qtquickcontrols2, - qttools, - qtxmlpatterns, - quirc, - randomx, - rapidjson, - stdenv, - unbound, - wrapQtAppsHook, - zeromq, - - trezorSupport ? true, - hidapi, - libusb1, - protobuf, - python3, - udev, -}: - -stdenv.mkDerivation rec { - pname = "monero-gui"; - version = "0.18.3.4"; - - src = fetchFromGitHub { - owner = "monero-project"; - repo = "monero-gui"; - rev = "v${version}"; - hash = "sha256-wnU24EmZig2W/psy4OhaQVy2WwR0CgljlyYwOg4bzwM="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - (lib.getDev qttools) - ]; - - buildInputs = - [ - boost186 # uses boost/asio/io_service.hpp - libgcrypt - libgpg-error - libsodium - miniupnpc - qtbase - qtdeclarative - qtgraphicaleffects - qtmultimedia - qtquickcontrols - qtquickcontrols2 - qtxmlpatterns - quirc - randomx - rapidjson - unbound - zeromq - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ] - ++ lib.optionals trezorSupport [ - hidapi - libusb1 - protobuf - python3 - ] - ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ - udev - ]; - - postUnpack = '' - # copy monero sources here - # (needs to be writable) - cp -r ${monero-cli.source}/* source/monero - chmod -R +w source/monero - ''; - - patches = [ - ./move-log-file.patch - ./use-system-libquirc.patch - ]; - - postPatch = '' - # set monero-gui version - substituteInPlace src/version.js.in \ - --replace '@VERSION_TAG_GUI@' '${version}' - - # use monerod from the monero package - substituteInPlace src/daemon/DaemonManager.cpp \ - --replace 'QApplication::applicationDirPath() + "' '"${monero-cli}/bin' - - # 1: only build external deps, *not* the full monero - # 2: use nixpkgs libraries - substituteInPlace CMakeLists.txt \ - --replace 'add_subdirectory(monero)' \ - 'add_subdirectory(monero EXCLUDE_FROM_ALL)' \ - --replace 'add_subdirectory(external)' "" - ''; - - cmakeFlags = - [ "-DARCH=default" ] - ++ lib.optional trezorSupport [ - # fix build on recent gcc versions - "-DCMAKE_CXX_FLAGS=-fpermissive" - ]; - - desktopItem = makeDesktopItem { - name = "monero-wallet-gui"; - exec = "monero-wallet-gui"; - icon = "monero"; - desktopName = "Monero"; - genericName = "Wallet"; - categories = [ - "Network" - "Utility" - ]; - }; - - postInstall = '' - # install desktop entry - install -Dm644 -t $out/share/applications \ - ${desktopItem}/share/applications/* - - # install icons - for n in 16 24 32 48 64 96 128 256; do - size=$n"x"$n - install -Dm644 \ - $src/images/appicons/$size.png \ - $out/share/icons/hicolor/$size/apps/monero.png - done; - ''; - - meta = { - description = "Private, secure, untraceable currency"; - homepage = "https://getmonero.org/"; - license = lib.licenses.bsd3; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ rnhmjoj ]; - mainProgram = "monero-wallet-gui"; - }; -} diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix index e88ce594cd8d..c4b66ebe829b 100644 --- a/pkgs/applications/blockchains/optimism/geth.nix +++ b/pkgs/applications/blockchains/optimism/geth.nix @@ -1,10 +1,7 @@ { - stdenv, lib, buildGoModule, fetchFromGitHub, - libobjc, - IOKit, }: buildGoModule rec { @@ -36,12 +33,6 @@ buildGoModule rec { vendorHash = "sha256-pcIydpKWZt3vwShwzGlPKGq+disdxYFOB8gxHou3mVU="; - # Fix for usb-related segmentation faults on darwin - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - ]; - ldflags = [ "-s" "-w" diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix deleted file mode 100644 index 33fca2cdd01e..000000000000 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ - fetchFromGitHub, - lib, - openssl, - pkg-config, - protobuf, - rocksdb_8_3, - rust-jemalloc-sys-unprefixed, - rustPlatform, - rustc, - stdenv, - Security, - SystemConfiguration, -}: - -let - rocksdb = rocksdb_8_3; -in -rustPlatform.buildRustPackage rec { - pname = "polkadot"; - version = "2412-4"; - - src = fetchFromGitHub { - owner = "paritytech"; - repo = "polkadot-sdk"; - rev = "polkadot-stable${version}"; - hash = "sha256-MYv/3bpERjceBzQxR+NkbaRJZegzkJY0fN6TaF2xn8I="; - - # the build process of polkadot requires a .git folder in order to determine - # the git commit hash that is being built and add it to the version string. - # since having a .git folder introduces reproducibility issues to the nix - # build, we check the git commit hash after fetching the source and save it - # into a .git_commit file, and then delete the .git folder. we can then use - # this file to populate an environment variable with the commit hash, which - # is picked up by polkadot's build process. - leaveDotGit = true; - postFetch = '' - ( cd $out; git rev-parse --short HEAD > .git_commit ) - rm -rf $out/.git - ''; - }; - - preBuild = '' - export SUBSTRATE_CLI_GIT_COMMIT_HASH=$(< .git_commit) - rm .git_commit - ''; - - useFetchCargoVendor = true; - cargoHash = "sha256-pvB507k3eYfz8tpTaVUzJOIKvtWEckaMu3Eux89V0uE="; - - buildType = "production"; - buildAndTestSubdir = "polkadot"; - - # NOTE: tests currently fail to compile due to an issue with cargo-auditable - # and resolution of features flags, potentially related to this: - # https://github.com/rust-secure-code/cargo-auditable/issues/66 - doCheck = false; - - nativeBuildInputs = [ - pkg-config - rustPlatform.bindgenHook - rustc - rustc.llvmPackages.lld - ]; - - # NOTE: jemalloc is used by default on Linux with unprefixed enabled - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; - - # NOTE: currently we can't build the runtimes since it requires rebuilding rust std - # (-Zbuild-std), for which rust-src is required to be available in the sysroot of rustc. - # this should no longer be needed after: https://github.com/paritytech/polkadot-sdk/pull/7008 - # since the new wasmv1-none target won't require rebuilding std. - SKIP_WASM_BUILD = 1; - - OPENSSL_NO_VENDOR = 1; - PROTOC = "${protobuf}/bin/protoc"; - ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - - meta = with lib; { - description = "Implementation of a https://polkadot.network node in Rust based on the Substrate framework"; - homepage = "https://github.com/paritytech/polkadot-sdk"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ - akru - andresilva - FlorianFranzen - RaghavSood - ]; - # See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta. - platforms = intersectLists platforms.unix ( - platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86 - ); - }; -} diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix deleted file mode 100644 index 219e9f530f4c..000000000000 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - stdenv, - fetchFromGitHub, - lib, - rustPlatform, - Security, - curl, - pkg-config, - openssl, -}: -rustPlatform.buildRustPackage rec { - pname = "snarkos"; - version = "2.2.7"; - - src = fetchFromGitHub { - owner = "AleoHQ"; - repo = "snarkOS"; - rev = "v${version}"; - sha256 = "sha256-+z9dgg5HdR+Gomug03gI1zdCU6t4SBHkl1Pxoq69wrc="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-riUOxmuXDP5+BPSPu5+cLBP43bZxAqvVG/k5kvThSAs="; - - # buildAndTestSubdir = "cli"; - - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - rustPlatform.bindgenHook - ]; - - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; - OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; - OPENSSL_DIR = "${lib.getDev openssl}"; - - # TODO check why rust compilation fails by including the rocksdb from nixpkgs - # Used by build.rs in the rocksdb-sys crate. If we don't set these, it would - # try to build RocksDB from source. - # ROCKSDB_INCLUDE_DIR="${rocksdb}/include"; - # ROCKSDB_LIB_DIR="${rocksdb}/lib"; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - curl - ]; - - # some tests are flaky and some need network access - # TODO finish filtering the tests to enable them - doCheck = !stdenv.hostPlatform.isLinux; - # checkFlags = [ - # # tries to make a network access - # "--skip=rpc::rpc::tests::test_send_transaction_large" - # # flaky test - # "--skip=helpers::block_requests::tests::test_block_requests_case_2ca" - # ]; - - meta = with lib; { - description = "Decentralized Operating System for Zero-Knowledge Applications"; - homepage = "https://snarkos.org"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; - platforms = platforms.unix; - mainProgram = "snarkos"; - }; -} diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix index 66d28bd3bac8..ad3cced89007 100644 --- a/pkgs/applications/blockchains/teos/default.nix +++ b/pkgs/applications/blockchains/teos/default.nix @@ -4,8 +4,6 @@ fetchFromGitHub, protobuf, rustfmt, - stdenv, - darwin, pkg-config, openssl, }: @@ -42,10 +40,6 @@ in rustfmt ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - passthru.updateScript = updateScript; __darwinAllowLocalNetworking = true; @@ -70,13 +64,9 @@ in rustfmt ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; passthru.updateScript = updateScript; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 1706bcd888d7..21f7b133f671 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -13,9 +13,9 @@ libevent, libsodium, makeWrapper, + rustc, rustPlatform, pkg-config, - Security, stdenv, testers, tl-expected, @@ -25,7 +25,7 @@ zeromq, }: -rustPlatform.buildRustPackage.override { inherit stdenv; } rec { +stdenv.mkDerivation rec { pname = "zcash"; version = "5.4.2"; @@ -36,14 +36,16 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { hash = "sha256-XGq/cYUo43FcpmRDO2YiNLCuEQLsTFLBFC4M1wM29l8="; }; - prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' - substituteInPlace .cargo/config.offline \ - --replace "[target.aarch64-unknown-linux-gnu]" "" \ - --replace "linker = \"aarch64-linux-gnu-gcc\"" "" - ''; + patches = [ + # upstream has a custom way of specifying a cargo vendor-directory + # we'll remove that logic, since cargoSetupHook from nixpkgs works better + ./dont-use-custom-vendoring-logic.patch + ]; - useFetchCargoVendor = true; - cargoHash = "sha256-VBqasLpxqI4kr73Mr7OVuwb2OIhUwnY9CTyZZOyEElU="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-VBqasLpxqI4kr73Mr7OVuwb2OIhUwnY9CTyZZOyEElU="; + }; nativeBuildInputs = [ autoreconfHook @@ -53,34 +55,19 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { hexdump makeWrapper pkg-config + rustc + rustPlatform.cargoSetupHook ]; - buildInputs = - [ - boost - db62 - libevent - libsodium - tl-expected - utf8cpp - zeromq - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - - # Use the stdenv default phases (./configure; make) instead of the - # ones from buildRustPackage. - configurePhase = "configurePhase"; - dontCargoBuild = true; - dontCargoCheck = true; - dontCargoInstall = true; - - postPatch = '' - # Have to do this here instead of in preConfigure because - # cargoDepsCopy gets unset after postPatch. - configureFlagsArray+=("RUST_VENDORED_SOURCES=$cargoDepsCopy") - ''; + buildInputs = [ + boost + db62 + libevent + libsodium + tl-expected + utf8cpp + zeromq + ]; CXXFLAGS = [ "-I${lib.getDev utf8cpp}/include/utf8cpp" diff --git a/pkgs/applications/blockchains/zcash/dont-use-custom-vendoring-logic.patch b/pkgs/applications/blockchains/zcash/dont-use-custom-vendoring-logic.patch new file mode 100644 index 000000000000..0096b4932293 --- /dev/null +++ b/pkgs/applications/blockchains/zcash/dont-use-custom-vendoring-logic.patch @@ -0,0 +1,16 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 8b14284..e614755 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -121,10 +121,7 @@ else + RUST_BUILD_OPTS += --locked --offline + + CARGO_CONFIGURED = $(top_srcdir)/.cargo/.configured-for-offline +-$(CARGO_CONFIGURED): $(top_srcdir)/.cargo/config.offline +- $(AM_V_at)rm -f $(top_srcdir)/.cargo/.configured-for-online +- $(AM_V_at)cp $< $(top_srcdir)/.cargo/config +- $(AM_V_at)echo "directory = \"$(RUST_VENDORED_SOURCES)\"" >>$(top_srcdir)/.cargo/config ++$(CARGO_CONFIGURED): + $(AM_V_at)touch $@ + endif + if ENABLE_SHANI diff --git a/pkgs/applications/display-managers/greetd/qtgreet.nix b/pkgs/applications/display-managers/greetd/qtgreet.nix new file mode 100644 index 000000000000..dc6d2955ae3e --- /dev/null +++ b/pkgs/applications/display-managers/greetd/qtgreet.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + kdePackages, + qt6, + dfl-ipc, + dfl-utils, + dfl-applications, + dfl-login1, + mpvSupport ? true, + mpv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qtgreet"; + version = "2.0.3.95"; + + src = fetchFromGitLab { + owner = "marcusbritanicus"; + repo = "QtGreet"; + rev = "v${finalAttrs.version}"; + hash = "sha256-5csKvBiffW+yHuNyFqxOE5bcsTWlyoLwFxuPH0WlFAE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + kdePackages.wayqt + qt6.qtbase + dfl-ipc + dfl-utils + dfl-applications + dfl-login1 + ] ++ lib.optionals mpvSupport [ mpv ]; + + mesonFlags = [ + (lib.mesonOption "dynpath" "${placeholder "out"}/var/lib/qtgreet") + ]; + + meta = { + description = "Qt based greeter for greetd, to be run under wayfire or similar wlr-based compositors"; + homepage = "https://gitlab.com/marcusbritanicus/QtGreet"; + changelog = "https://gitlab.com/marcusbritanicus/QtGreet/-/blob/${finalAttrs.src.rev}/Changelog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + mainProgram = "qtgreet"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 45fa03377e69..802f200440dd 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -128,6 +128,6 @@ stdenv.mkDerivation rec { description = "Cross-desktop display manager"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + teams = [ teams.pantheon ]; }; } diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix index 791f4c948e7f..ad7d234c53af 100644 --- a/pkgs/applications/editors/android-studio-for-platform/common.nix +++ b/pkgs/applications/editors/android-studio-for-platform/common.nix @@ -189,6 +189,7 @@ runCommand drvName # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ robbins ]; + teams = [ teams.android ]; mainProgram = pname; }; } diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 5ac252ff941b..00c4934e6c47 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -323,12 +323,19 @@ let # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = - with lib.maintainers; rec { - stable = [ + stable = with lib.maintainers; [ alapshin - johnrtitor - numinit + ]; + beta = stable; + canary = stable; + dev = stable; + } + ."${channel}"; + teams = + rec { + stable = with lib.teams; [ + android ]; beta = stable; canary = stable; @@ -337,6 +344,7 @@ let ."${channel}"; mainProgram = pname; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + position = "pkgs/applications/editors/android-studio/common.nix:303"; }; } '' diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 7353ec00dbe4..244af2428263 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -16,16 +16,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2024.3.1.14"; # "Android Studio Meerkat | 2024.3.1 Patch 1" - sha256Hash = "sha256-VNXErfb4PhljcJwGq863ldh/3i8fMdJirlwolEIk+fI="; + version = "2024.3.2.14"; # "Android Studio Meerkat Feature Drop | 2024.3.2" + sha256Hash = "sha256-LHtPAJe4Zo2FcYwO0j51vt8QUNPQ2Dwf2UT7H72DyKU="; }; betaVersion = { - version = "2024.3.2.9"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Beta 1" - sha256Hash = "sha256-yDxDctlZsUmye+XgWwWIHPnrfI3BCj5wYLQG9l8t6mA="; + version = "2024.3.2.13"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 4" + sha256Hash = "sha256-tPRTDFyKGPR1DKuJRBcwjWjNxylS/8Zv/Nd6vBmcujg="; }; latestVersion = { - version = "2025.1.1.2"; # "Android Studio Narwhal | 2025.1.1 Canary 2" - sha256Hash = "sha256-elWCY/QwBeGIsC4xtQrSV6low5oLH3q1WW2InqQItFM="; + version = "2025.1.1.10"; # "Android Studio Narwhal | 2025.1.1 Canary 10" + sha256Hash = "sha256-GKLOlDkA4hSbKeI3Oob3Pmfxq0ji+q2yTK/z2jPV8FU="; }; in { diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix deleted file mode 100644 index 04f5a97a51ae..000000000000 --- a/pkgs/applications/editors/bluefish/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - wrapGAppsHook3, - pkg-config, - gtk, - libxml2, - enchant, - gucharmap, - python3, - adwaita-icon-theme, -}: - -stdenv.mkDerivation rec { - pname = "bluefish"; - version = "2.2.16"; - - src = fetchurl { - url = "mirror://sourceforge/bluefish/bluefish-${version}.tar.bz2"; - sha256 = "sha256-FOZHb87o+jJvf2Px9pPSUhlfncsWrw/jyRXEmbr13XQ="; - }; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - ]; - buildInputs = [ - adwaita-icon-theme - gtk - libxml2 - enchant - gucharmap - python3 - ]; - - meta = with lib; { - description = "Powerful editor targeted towards programmers and webdevelopers"; - homepage = "https://bluefish.openoffice.nl/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ vbgl ]; - platforms = platforms.all; - mainProgram = "bluefish"; - }; -} diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 829ab15e622c..c6a3fa595a63 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -14,22 +14,22 @@ libXtst, libsecret, gsettings-desktop-schemas, - webkitgtk_4_0, + webkitgtk_4_1, makeWrapper, perl, ... }: { - name, + pname, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, - productVersion, + version, }: stdenv.mkDerivation rec { - inherit name src; + inherit pname version src; desktopItem = makeDesktopItem { name = "Eclipse"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { libXtst libsecret zlib - ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0; + ] ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1; buildCommand = '' # Unpack tarball. @@ -93,12 +93,12 @@ stdenv.mkDerivation rec { libXtst libsecret ] - ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0 + ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1 ) } \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration" + --add-flags "-configuration \$HOME/.eclipse/''${productId}_${version}/configuration" # Create desktop item. mkdir -p $out/share/applications diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index db85c9ccfb4c..1af06cdb0ba8 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -16,7 +16,7 @@ jdk, jdk8, gsettings-desktop-schemas, - webkitgtk_4_0 ? null, # for internal web browser + webkitgtk_4_1 ? null, # for internal web browser buildEnv, runCommand, callPackage, @@ -64,15 +64,13 @@ let gtk libXtst gsettings-desktop-schemas - webkitgtk_4_0 + webkitgtk_4_1 makeWrapper ; }; buildEclipse = eclipseData: - buildEclipseUnversioned ( - eclipseData // { productVersion = "${platform_major}.${platform_minor}"; } - ); + buildEclipseUnversioned (eclipseData // { version = "${platform_major}.${platform_minor}"; }); generateEclipse = id: @@ -85,7 +83,7 @@ let { name = "eclipse-${lib.strings.toLower id}"; value = buildEclipse { - name = "eclipse-${lib.strings.toLower id}-${platform_major}.${platform_minor}"; + pname = "eclipse-${lib.strings.toLower id}"; inherit description; src = fetchurl { url = diff --git a/pkgs/applications/editors/eclipse/eclipses.json b/pkgs/applications/editors/eclipse/eclipses.json index b1bec5fa677f..c8f72f11cc17 100644 --- a/pkgs/applications/editors/eclipse/eclipses.json +++ b/pkgs/applications/editors/eclipse/eclipses.json @@ -1,89 +1,90 @@ { "platform_major": "4", - "platform_minor": "34", - "year": "2024", - "month": "12", - "buildmonth": "11", - "dayHourMinute": "201800", + "platform_minor": "35", + "version": "4.35", + "year": "2025", + "month": "03", + "buildmonth": "02", + "dayHourMinute": "280140", "eclipses": { "cpp": { "description": "Eclipse IDE for C/C++ Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-d3MVeci4jF9adqvgepmZtzoPul+DTMtJlf7v92PMyq0=", - "aarch64": "sha256-gsOmF3bGthd7CEG+HxEQJqACfb+ErWU+fVO2MVR2cz8=" + "x86_64": "sha256-xignTWCuhkcnYIiZn/q8S1oKXpFZKyhpSDqOJEeu75g=", + "aarch64": "sha256-M9XqF2WK9abJwjeV6mxeL6aNXSP+Ey92GkbD5i0Gyzk=" } }, "dsl": { "description": "Eclipse IDE for Java and DSL Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-bJvODmesfkED5yHnaJGLZSeFctfVCQDA3lvH00S/zbk=", - "aarch64": "sha256-e0rWjD19tUyVJMMbb5THVj28o0HnBFssP0yCAQ5wKnA=" + "x86_64": "sha256-zoL+sTnvlJSseC3UPmiJVN8QpEkblRyge3+VzXGmQhU=", + "aarch64": "sha256-l4mNwCYOieeK0FA+ZYpA6hN+L6r1wn2D4+fFpSgZiyc=" } }, "embedcpp": { "description": "Eclipse IDE for Embedded C/C++ Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-+DfoJ+QAlI9Ioz4Wbj2LvtpV3vAXjl0wtZBNS9osOYw=", - "aarch64": "sha256-XCpIKoLhrodOJkLPY6uICpuYu5PBUp96MFQCeuOyOUA=" + "x86_64": "sha256-n7XfIreZkpoWEoQz2GZILpymptyVGlkPEjbCDSA3zps=", + "aarch64": "sha256-tCmqqXQvHDo0cRLu3TUWmtUufeO06rIXdqv54hKRjIM=" } }, "modeling": { "description": "Eclipse Modeling Tools", "dropUrl": false, "hashes": { - "x86_64": "sha256-MUe5DU+3/4lzG1hykpgOX/46Pgp9qtoN9MOYk6EFK6o=", - "aarch64": "sha256-/tv7+RsRAFfV5zfU+uFNNlE1rrJavRFOhLYhSkIX0Ec=" + "x86_64": "sha256-FWlZrGYY7VN+FL5liNTaGNLeiZqw2xquFJFQSD6GpKc=", + "aarch64": "sha256-RbYMgWaTRUdHOKYEyi49F7G1gIUhRMsQrCpXmyOZPtc=" } }, "platform": { "description": "Eclipse Platform ${year}-${month}", "dropUrl": true, "hashes": { - "x86_64": "sha256-ZHJkIOAaz87z6Dz/6X62E7ckQIFDtzqgE5ODZeb/Rss=", - "aarch64": "sha256-dLLwLFTeUXoL9Pri4EB48nZGUH/zF2mCt6anv519aP4=" + "x86_64": "sha256-zZjdG/rWx3+yDoAcMOL/Kyq9TZazUT/3FIISRRha3Ww=", + "aarch64": "sha256-gGygUCGsCS5yW0UNvU/VtbpJ0BBqWmbZWQ0+0a3vnII=" } }, "SDK": { "description": "Eclipse ${year}-${month} Classic", "dropUrl": true, "hashes": { - "x86_64": "sha256-DhrNe9nx4RYAaq+NIHCBLX+bOn+dE13yF07hjuRzHZI=", - "aarch64": "sha256-OHE0vxjV9kp43Os2LCLuZFCMLWy3vnCChMC54TyXO9I=" + "x86_64": "sha256-eazgEk7gPiZpEAN03xEcNIqIObBCrq+jHzWLA1+wZMY=", + "aarch64": "sha256-1bJP/j91NyeSjqJB1ljatEWAz4M5xoAmIU9m9Be7uvg=" } }, "java": { "description": "Eclipse IDE for Java Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-z0hLFqdDSqhUmCiOp0fkTkiybOmCIA118JMBb90yEiY=", - "aarch64": "sha256-JzUgyfPEi9vq497gJhHuobb0TR113hC2suFvNKix7So=" + "x86_64": "sha256-qAYF2EtMP1H3/umZQq0oHKJA4EUFbYJXWgSHw8Xvpw8=", + "aarch64": "sha256-l4QhWyu6dejl2xD/6h/0I4EBpJb6I7aqUbIzLGPdftU=" } }, "jee": { "description": "Eclipse IDE for Enterprise Java and Web Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-PxQ+jGTEs917IeWuTCgyyx7vAodZr4ju/aa4WQmoGQ0=", - "aarch64": "sha256-g4EHYFjoPONiGwreAmENcXWVinPkDAIE6KyVmZokQAo=" + "x86_64": "sha256-JY2ybTEber2WpmXxbP+/XGYcmRuqGWsFYWs/PMv4hI0=", + "aarch64": "sha256-Bs6CMZB5j7CuBGDo1VTTtlSmEUGo47dGS0/5MZfR2EU=" } }, "committers": { "description": "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-g8ILZ9esbXbm+4bImFJkEwE/UNJT2HHCXx/8i+Lvb00=", - "aarch64": "sha256-arV2VgQypj8fSEpqGd8CbJ/FyKE6k+e4x7kXqShDKrw=" + "x86_64": "sha256-uySP2uGSyPOrCwj0X4DUsit3sIlii54GSXl4Y9NDO8Y=", + "aarch64": "sha256-petnMZvKADeHFrcUXk+2xACIaQtdWv0kxuaC7nAtavo=" } }, "rcp": { "description": "Eclipse IDE for RCP and RAP Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-qqOdASLe11FT4Eot7j/Yf02acHgblV77W3fqTOCrNSQ=", - "aarch64": "sha256-9yA2OLOcp3uKJ88OKqz7vCXMzS52om6ohUJkGZpkjE4=" + "x86_64": "sha256-lq+zD97S2gr+62kHsZ3Dv+HTbEiyiqFW+v4DmHliDPA=", + "aarch64": "sha256-VCE21NJtvVSnYxjS9G+iY2YTspmlzZ3Cj7MyD4LpcSI=" } } } diff --git a/pkgs/applications/editors/eclipse/update.sh b/pkgs/applications/editors/eclipse/update.sh index fd3798cd19ea..8d58ee6ad47c 100755 --- a/pkgs/applications/editors/eclipse/update.sh +++ b/pkgs/applications/editors/eclipse/update.sh @@ -41,7 +41,11 @@ esac ECLIPSES_JSON=$(dirname $0)/eclipses.json; t=$(mktemp); -cat $ECLIPSES_JSON | jq ". + {platform_major: \"${platform_major}\",platform_minor: \"${platform_minor}\",year: \"${year}\",month: \"${month}\",buildmonth: \"${buildmonth}\",dayHourMinute: \"${builddaytime}\"}" > $t; +# note: including platform_major, platform_minor, and version may seem redundant +# the first two are needed for the derivation itself; the third is necessary so +# that nixpkgs-update can see that the version changes as a result of this update +# script. +cat $ECLIPSES_JSON | jq ". + {platform_major: \"${platform_major}\",platform_minor: \"${platform_minor}\",version:\"${platform_major}.${platform_minor}\",year: \"${year}\",month: \"${month}\",buildmonth: \"${buildmonth}\",dayHourMinute: \"${builddaytime}\"}" > $t; mv $t $ECLIPSES_JSON; # prefetch new download hashes diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index 167f0fcb86b4..b4e96f6490fb 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -61,8 +61,7 @@ lib.extendMkDerivation { propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; strictDeps = args.strictDeps or true; - # TODO re-enable after #392928 reaches master - # __structuredAttrs = args.__structuredAttrs or true; + __structuredAttrs = args.__structuredAttrs or true; inherit turnCompilationWarningToError ignoreCompilationError; diff --git a/pkgs/applications/editors/emacs/build-support/wrapper-test.nix b/pkgs/applications/editors/emacs/build-support/wrapper-test.nix index f23c8afd8856..e782bc5d50b6 100644 --- a/pkgs/applications/editors/emacs/build-support/wrapper-test.nix +++ b/pkgs/applications/editors/emacs/build-support/wrapper-test.nix @@ -10,6 +10,7 @@ runCommand "test-emacs-withPackages-wrapper" (emacs.pkgs.withPackages ( epkgs: with epkgs; [ magit + flx-ido ] )) git # needed by magit @@ -17,5 +18,10 @@ runCommand "test-emacs-withPackages-wrapper" } '' emacs --batch --eval="(require 'magit)" + + emacs --batch --eval="(require 'flx-ido)" + # transitive dependencies should be made available + # https://github.com/NixOS/nixpkgs/issues/388829 + emacs --batch --eval="(require 'flx)" touch $out '' diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 8640d64786b3..cc604b222f32 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -6,21 +6,6 @@ lib.makeScope pkgs.newScope ( inherit (self) callPackage; inheritedArgs = { inherit (pkgs.darwin) sigtool; - inherit (pkgs.darwin.apple_sdk.frameworks) - Accelerate - AppKit - Carbon - Cocoa - GSS - ImageCaptureCore - ImageIO - IOKit - OSAKit - Quartz - QuartzCore - WebKit - ; - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) UniformTypeIdentifiers; }; in { @@ -46,8 +31,6 @@ lib.makeScope pkgs.newScope ( withPgtk = true; }; - emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs; - emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs; } ) 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 aa4db82bb4a2..fe1c4b5247d2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -9,10 +9,10 @@ elpaBuild { pname = "a68-mode"; ename = "a68-mode"; - version = "1.0.0.20250226.200747"; + version = "1.2.0.20250516.72801"; src = fetchurl { - url = "https://elpa.gnu.org/devel/a68-mode-1.0.0.20250226.200747.tar"; - sha256 = "1h07lgxrrr3838hnl2zzdfm4gj7d6gbdsmnzdbmnzz8h65pk1x93"; + url = "https://elpa.gnu.org/devel/a68-mode-1.2.0.20250516.72801.tar"; + sha256 = "09nxmij8db3ddhl9hyz0khw2crpfxgrhp2rci1v4w4g3y6k6pjxk"; }; packageRequires = [ ]; meta = { @@ -440,10 +440,10 @@ elpaBuild { pname = "async"; ename = "async"; - version = "1.9.9.0.20241126.81020"; + version = "1.9.9.0.20250325.50900"; src = fetchurl { - url = "https://elpa.gnu.org/devel/async-1.9.9.0.20241126.81020.tar"; - sha256 = "0h101k5s68kgki9s50pg2hgwqrbnf21mcvcwxgy9jbrbs64snh4a"; + url = "https://elpa.gnu.org/devel/async-1.9.9.0.20250325.50900.tar"; + sha256 = "094wj61sh7v8qamysmrpdclm93p8w33nq9vs9j2c1jpjskd5m3jh"; }; packageRequires = [ ]; meta = { @@ -461,10 +461,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.9.0.20250312.215110"; + version = "14.0.9.0.20250515.195355"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.0.9.0.20250312.215110.tar"; - sha256 = "1xphcw0p1q9snk420l9x9xy02lgjxdm4m7d3vynwkb3lcwz9hi3s"; + url = "https://elpa.gnu.org/devel/auctex-14.0.9.0.20250515.195355.tar"; + sha256 = "0n39wh9cw1pfjmyjcahxrgsa3b1p0swwkh31wn5wc2c2rfjkl8xk"; }; packageRequires = [ ]; meta = { @@ -548,10 +548,10 @@ elpaBuild { pname = "auth-source-xoauth2-plugin"; ename = "auth-source-xoauth2-plugin"; - version = "0.1.1.0.20250211.151603"; + version = "0.2.0.20250516.15306"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auth-source-xoauth2-plugin-0.1.1.0.20250211.151603.tar"; - sha256 = "1qirlk0wjrhxxy0k01mr2cx3dzp16ns3047j2a3mpfhq83413w43"; + url = "https://elpa.gnu.org/devel/auth-source-xoauth2-plugin-0.2.0.20250516.15306.tar"; + sha256 = "0i205h7fc4gkaa7hn1516bqzffv64bani2v1080kn7cbnrf9kq1b"; }; packageRequires = [ oauth2 ]; meta = { @@ -633,10 +633,10 @@ elpaBuild { pname = "autocrypt"; ename = "autocrypt"; - version = "0.4.2.0.20240410.70023"; + version = "0.4.2.0.20250415.115030"; src = fetchurl { - url = "https://elpa.gnu.org/devel/autocrypt-0.4.2.0.20240410.70023.tar"; - sha256 = "13g6422lcv8bjwcfrkxmw7fi5by1liz2ni6zxf10pr3qcpv6046n"; + url = "https://elpa.gnu.org/devel/autocrypt-0.4.2.0.20250415.115030.tar"; + sha256 = "1lf52r37ik8y8chc047k6mya560q4ybbbq82brdm088rabl81khx"; }; packageRequires = [ ]; meta = { @@ -740,10 +740,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "1.3.0.0.20250124.74505"; + version = "1.3.0.0.20250410.82528"; src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-1.3.0.0.20250124.74505.tar"; - sha256 = "0g99znfyx4zbqacmq5xmkhxzw9rr6l3nmwci6srvdijncvqbmzas"; + url = "https://elpa.gnu.org/devel/beframe-1.3.0.0.20250410.82528.tar"; + sha256 = "1rdq1yrszn22np2maibn54qrq1d5231a34l9xrczi13fv0b6sah2"; }; packageRequires = [ ]; meta = { @@ -761,10 +761,10 @@ elpaBuild { pname = "bicep-ts-mode"; ename = "bicep-ts-mode"; - version = "0.1.4.0.20250312.213251"; + version = "0.1.4.0.20250320.94622"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.4.0.20250312.213251.tar"; - sha256 = "10vzdld0776gsmjg0wfk731vvwlaw7zf0zhccw0crf7hr5rhhfhg"; + url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.4.0.20250320.94622.tar"; + sha256 = "1psvm6g2mklyqfa349ikx78l3hfkw3xr9314schc7j73m9mlbj44"; }; packageRequires = [ ]; meta = { @@ -875,10 +875,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "2.0.0.0.20250104.25705"; + version = "2.0.0.0.20250325.150735"; src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-2.0.0.0.20250104.25705.tar"; - sha256 = "1zy4vwlzm5gqhw2slg6j760b3hd1x989wx5p9xi9gqi2gaa43a1m"; + url = "https://elpa.gnu.org/devel/boxy-2.0.0.0.20250325.150735.tar"; + sha256 = "1qk6z7z9ya9d173c3ic5wmxvjq4gdk3z6817inpq43l2npq15hi6"; }; packageRequires = [ ]; meta = { @@ -971,10 +971,10 @@ elpaBuild { pname = "buffer-env"; ename = "buffer-env"; - version = "0.6.0.20240323.72724"; + version = "0.6.0.20250516.122320"; src = fetchurl { - url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20240323.72724.tar"; - sha256 = "061cbq2pb5wg3jap3l9lbm1axb700aqar9s8vx2zys0hl65klw51"; + url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20250516.122320.tar"; + sha256 = "0m1kb8h2mjjd5hznp86yxjdic0zngq89x67vd7srvikxxbj312d9"; }; packageRequires = [ compat ]; meta = { @@ -1014,10 +1014,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.8.0.20240920.145100"; + version = "1.1.0.20250503.201002"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240920.145100.tar"; - sha256 = "1ai7y5nxjglzbxwq4ln8mlmxw8irh0m005izcrx9qby8i3zs4fwz"; + url = "https://elpa.gnu.org/devel/bufferlo-1.1.0.20250503.201002.tar"; + sha256 = "05bpgfyizzc6364c7jv8l2d8z78ighmswxn2hxgzwsvbyhnfmxpr"; }; packageRequires = [ ]; meta = { @@ -1105,10 +1105,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "2.0.0.20250311.165029"; + version = "2.0.0.20250512.155407"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-2.0.0.20250311.165029.tar"; - sha256 = "1birjf3znacrv82vx8y346xhmzy4ssrd9hmdwp0jjin440lfd7wc"; + url = "https://elpa.gnu.org/devel/cape-2.0.0.20250512.155407.tar"; + sha256 = "13j8wcdj4azmi7gfaqs08wm0b6razj10i8wkh3qa8bqadjyqmhfw"; }; packageRequires = [ compat ]; meta = { @@ -1318,10 +1318,10 @@ elpaBuild { pname = "colorful-mode"; ename = "colorful-mode"; - version = "1.2.3.0.20250310.213131"; + version = "1.2.3.0.20250508.204004"; src = fetchurl { - url = "https://elpa.gnu.org/devel/colorful-mode-1.2.3.0.20250310.213131.tar"; - sha256 = "1k457wzqbyps7wrhk7klpa06jnw9mbf00g2cp52l76911hcmfwbj"; + url = "https://elpa.gnu.org/devel/colorful-mode-1.2.3.0.20250508.204004.tar"; + sha256 = "1zrdxxc115h4zk2a1lhl45is7cjvxq333m1f1lmrmnyahzgg3a46"; }; packageRequires = [ compat ]; meta = { @@ -1386,10 +1386,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "1.0.2.0.20250228.25856"; + version = "1.0.2.0.20250426.131956"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-1.0.2.0.20250228.25856.tar"; - sha256 = "0bjl3i1vxqxinj396f22072z7xpzd9j7cd0mp55v8sa9kb1riiq3"; + url = "https://elpa.gnu.org/devel/company-1.0.2.0.20250426.131956.tar"; + sha256 = "1lkrhb0xc9d2ylb85k49h62w9k3dnm4j2i6438xc2jkjrjids575"; }; packageRequires = [ ]; meta = { @@ -1482,10 +1482,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "30.0.2.0.0.20250308.104508"; + version = "30.1.0.0.0.20250402.70347"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-30.0.2.0.0.20250308.104508.tar"; - sha256 = "1rri9hknrzkm51vq9m6ji6w6zrdglvr3k3345lwd5vl79lfqhv5c"; + url = "https://elpa.gnu.org/devel/compat-30.1.0.0.0.20250402.70347.tar"; + sha256 = "19xc2x70x539dp5c69dn796yq6ya2xjbfsjzs45sh3ikr76ki7w6"; }; packageRequires = [ seq ]; meta = { @@ -1546,10 +1546,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "2.1.0.20250311.165829"; + version = "2.3.0.20250512.141021"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-2.1.0.20250311.165829.tar"; - sha256 = "1j5xz5985dgwkcvw44arxndjyylbzmcz51j8rq48hdb5206jpgfj"; + url = "https://elpa.gnu.org/devel/consult-2.3.0.20250512.141021.tar"; + sha256 = "1k3xhqqrz72zfy92376h8livr938z2kqarkljdri44vh8yqm7j0i"; }; packageRequires = [ compat ]; meta = { @@ -1569,10 +1569,10 @@ elpaBuild { pname = "consult-denote"; ename = "consult-denote"; - version = "0.2.4.0.20250121.61759"; + version = "0.3.1.0.20250501.44152"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-denote-0.2.4.0.20250121.61759.tar"; - sha256 = "0xcwg4zcpzvyjcmways1v41v78myaxv7kasgh3xhwfy17wyh87y9"; + url = "https://elpa.gnu.org/devel/consult-denote-0.3.1.0.20250501.44152.tar"; + sha256 = "1kxk38yi1m9z4j422skn43xyynazwd2n0d9sq78yn7cbnpf050wn"; }; packageRequires = [ consult @@ -1659,10 +1659,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.7.0.20250219.165655"; + version = "2.1.0.20250516.184150"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-1.7.0.20250219.165655.tar"; - sha256 = "0xk3sqba3aii619rv7rjm5pvzaj3mvirk4hv7yijr1cd3qp7jghf"; + url = "https://elpa.gnu.org/devel/corfu-2.1.0.20250516.184150.tar"; + sha256 = "1fnhsn6mvz2cp6cwphrjgr0lizkkfpirp3bxg2vxnj869asyayva"; }; packageRequires = [ compat ]; meta = { @@ -1704,10 +1704,10 @@ elpaBuild { pname = "counsel"; ename = "counsel"; - version = "0.15.0.0.20250304.94445"; + version = "0.15.1.0.20250329.151454"; src = fetchurl { - url = "https://elpa.gnu.org/devel/counsel-0.15.0.0.20250304.94445.tar"; - sha256 = "051nbhrhq92h64cwmjavcljyxy99qn1j4awjlsrf75023r5j3ii3"; + url = "https://elpa.gnu.org/devel/counsel-0.15.1.0.20250329.151454.tar"; + sha256 = "0fnxgf08dkq16d65xcaa822vasdqzixmd7ihw48hncx80jzqk1s6"; }; packageRequires = [ ivy @@ -1940,10 +1940,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.23.0.0.20250310.201518"; + version = "0.24.1.0.20250509.163537"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.23.0.0.20250310.201518.tar"; - sha256 = "1g8nq6bhzh7kg8gw8f45lj5a6x25965qfyrzyzaapif0ndxfvpxc"; + url = "https://elpa.gnu.org/devel/dape-0.24.1.0.20250509.163537.tar"; + sha256 = "0r0kjrzqw0dlj0vw7lgsc2mg2sr0js1aambkwc3qvf57jp875jwb"; }; packageRequires = [ jsonrpc ]; meta = { @@ -2027,10 +2027,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.44.0.20250311.94450"; + version = "0.44.0.20250505.144705"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.44.0.20250311.94450.tar"; - sha256 = "0w1mhj8byz2msn02h0kb95z3y9f4dimb5by03lhr3llpy3ar26hg"; + url = "https://elpa.gnu.org/devel/debbugs-0.44.0.20250505.144705.tar"; + sha256 = "104nk2svlyp7gsr4fpa7q25yi89j29m3c6ydb0zdspbrggw2zfka"; }; packageRequires = [ soap-client ]; meta = { @@ -2074,10 +2074,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "3.1.0.0.20250311.152457"; + version = "4.0.0.0.20250508.42428"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20250311.152457.tar"; - sha256 = "1xvkfzqqnm27dml3l8ldnprwwkh5gkm39rmasvzin89z74aywq2j"; + url = "https://elpa.gnu.org/devel/denote-4.0.0.0.20250508.42428.tar"; + sha256 = "1zi78mfncjpaldvaq4g99ls65vs9qi1rphcwmzhqwnv9ckgdnqv1"; }; packageRequires = [ ]; meta = { @@ -2086,6 +2086,50 @@ }; } ) { }; + denote-journal = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-journal"; + ename = "denote-journal"; + version = "0.1.1.0.20250422.45242"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/denote-journal-0.1.1.0.20250422.45242.tar"; + sha256 = "1hyhahdyxnx6q2lxy8pngj0isscb0wv1946w5bp1qkq6ygjp3chv"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/devel/denote-journal.html"; + license = lib.licenses.free; + }; + } + ) { }; + denote-markdown = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-markdown"; + ename = "denote-markdown"; + version = "0.1.1.0.20250419.74350"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/denote-markdown-0.1.1.0.20250419.74350.tar"; + sha256 = "0q3fc8zyaspd6z0zan40rsjfpgvja72bp0qm93pyr69q6iijshh8"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/devel/denote-markdown.html"; + license = lib.licenses.free; + }; + } + ) { }; denote-menu = callPackage ( { denote, @@ -2096,10 +2140,10 @@ elpaBuild { pname = "denote-menu"; ename = "denote-menu"; - version = "1.3.0.0.20240813.204446"; + version = "1.4.0.0.20250317.132443"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-menu-1.3.0.0.20240813.204446.tar"; - sha256 = "0ifs4f1x9cgz324cj57f86qifwx0pnzvq12ma0b55s3din0xsvcc"; + url = "https://elpa.gnu.org/devel/denote-menu-1.4.0.0.20250317.132443.tar"; + sha256 = "0xrqfc3ik8n6d76s1rmqnh8v7h8plhm8lm3i714kscmpkzkd9wsp"; }; packageRequires = [ denote ]; meta = { @@ -2108,6 +2152,28 @@ }; } ) { }; + denote-org = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-org"; + ename = "denote-org"; + version = "0.1.1.0.20250508.64419"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/denote-org-0.1.1.0.20250508.64419.tar"; + sha256 = "1xnvpdpn55vcws1v5dhkvragiyq1kn40xmylxpxi1xv9rv61z6ml"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/devel/denote-org.html"; + license = lib.licenses.free; + }; + } + ) { }; denote-search = callPackage ( { denote, @@ -2118,10 +2184,10 @@ elpaBuild { pname = "denote-search"; ename = "denote-search"; - version = "1.0.3.0.20250302.121931"; + version = "1.0.3.0.20250501.205109"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-search-1.0.3.0.20250302.121931.tar"; - sha256 = "1di64988dwldzfhbnc12y5czmrfc531lrq5glbny659fz73qimxx"; + url = "https://elpa.gnu.org/devel/denote-search-1.0.3.0.20250501.205109.tar"; + sha256 = "0xpb39936fxldbv9d8i0122yvcapjvxkghv6d3ybxgm4wc8svbrn"; }; packageRequires = [ denote ]; meta = { @@ -2130,6 +2196,50 @@ }; } ) { }; + denote-sequence = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-sequence"; + ename = "denote-sequence"; + version = "0.1.1.0.20250501.102153"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/denote-sequence-0.1.1.0.20250501.102153.tar"; + sha256 = "08aqb3ps1czag73jm6avk4xq3wbxx02gyl0bml8vnxdc0l22skjy"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/devel/denote-sequence.html"; + license = lib.licenses.free; + }; + } + ) { }; + denote-silo = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-silo"; + ename = "denote-silo"; + version = "0.1.1.0.20250419.74326"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/denote-silo-0.1.1.0.20250419.74326.tar"; + sha256 = "1ysbm6mbnr4g4h3yhay1b7d98y1dh11dq5pv2ix2c3ld2952h7sy"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/devel/denote-silo.html"; + license = lib.licenses.free; + }; + } + ) { }; detached = callPackage ( { elpaBuild, @@ -2208,10 +2318,10 @@ elpaBuild { pname = "dicom"; ename = "dicom"; - version = "0.5.0.20250114.192652"; + version = "0.5.0.20250512.155532"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dicom-0.5.0.20250114.192652.tar"; - sha256 = "10rf7adxxpghd1xpww0jaqxpzzq02whp9many1336gfpvcclmxkb"; + url = "https://elpa.gnu.org/devel/dicom-0.5.0.20250512.155532.tar"; + sha256 = "1kbdc8m40z449p1r39ix10fvwq7gzqpg5q3i4xs4fyg6v2769z8d"; }; packageRequires = [ compat ]; meta = { @@ -2258,10 +2368,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.10.0.0.20250223.232014"; + version = "1.10.0.0.20250507.203711"; src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20250223.232014.tar"; - sha256 = "1bcjrkqilzpc116af3gxz8gwb2p7vz57i2bcv7xz8mbsz8yqma8r"; + url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20250507.203711.tar"; + sha256 = "1gv7yn2hynf09sw5r5axg6b0vb79id4jv6n07cmr2wknf0q3di4a"; }; packageRequires = [ cl-lib ]; meta = { @@ -2385,10 +2495,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.4.0.0.20250305.70339"; + version = "0.5.2.0.20250427.44935"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.4.0.0.20250305.70339.tar"; - sha256 = "1xq6qwp90qqacnnr4h0fc66inhn2pf37s8zhi26df8amxpxb7cim"; + url = "https://elpa.gnu.org/devel/dired-preview-0.5.2.0.20250427.44935.tar"; + sha256 = "0zc7kd1apyq0bwxi3qjihxayjb5j6ga9rhmzc3lmm29ysxfz90n5"; }; packageRequires = [ ]; meta = { @@ -2470,10 +2580,10 @@ elpaBuild { pname = "do-at-point"; ename = "do-at-point"; - version = "0.1.2.0.20250131.91127"; + version = "0.1.2.0.20250501.125137"; src = fetchurl { - url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20250131.91127.tar"; - sha256 = "0bjw91hrv4d5vqrgkx9bas3nwgqyfpbar7b5d07m3agw436yafqf"; + url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20250501.125137.tar"; + sha256 = "1sszwgf740yklj2cm47rzc5ia8ygn8vzfagpadcsv38mpcxpdzz0"; }; packageRequires = [ ]; meta = { @@ -2503,6 +2613,27 @@ }; } ) { }; + doc-view-follow = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "doc-view-follow"; + ename = "doc-view-follow"; + version = "0.3.2.0.20250427.143824"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/doc-view-follow-0.3.2.0.20250427.143824.tar"; + sha256 = "04jk93rkv682w6zcfr283gpwgi5fiq5w3xdpv49zkwddx783crfa"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/doc-view-follow.html"; + license = lib.licenses.free; + }; + } + ) { }; docbook = callPackage ( { elpaBuild, @@ -2696,7 +2827,7 @@ version = "2.3.0.20241006.95158"; src = fetchurl { url = "https://elpa.gnu.org/devel/ediprolog-2.3.0.20241006.95158.tar"; - sha256 = "0jbbxyx2xcfqg8jgs63dri1d5cc3x6b3scys8khf6acd4f9grnxd"; + sha256 = "1xwha4xn7hpb57vvlrhcm5z0r59wz82vrcdx13kp46zvmll0zcrd"; }; packageRequires = [ ]; meta = { @@ -2735,10 +2866,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.9.0.0.20250220.64933"; + version = "1.10.0.0.20250429.104336"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.9.0.0.20250220.64933.tar"; - sha256 = "0iq4lc8r1y255r3vphay9fjcphgv176hdp4a4gbwj2xrldsqwwvi"; + url = "https://elpa.gnu.org/devel/ef-themes-1.10.0.0.20250429.104336.tar"; + sha256 = "0a4fpc9i4sjfx4cnngbdddffs6qg03c15fz2znix56b4hp7jl4sv"; }; packageRequires = [ ]; meta = { @@ -2763,10 +2894,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.18.0.20250308.53648"; + version = "1.18.0.20250513.114504"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.18.0.20250308.53648.tar"; - sha256 = "0km41xslg9d1gv6dl7kldzg4aw8fg797nnbr45m91ywgj2cxiicl"; + url = "https://elpa.gnu.org/devel/eglot-1.18.0.20250513.114504.tar"; + sha256 = "0jgma92l0smvm8np78sx924dlvbli1j3pgjrpps8m7av7xjab5v1"; }; packageRequires = [ eldoc @@ -2783,6 +2914,27 @@ }; } ) { }; + el-job = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "el-job"; + ename = "el-job"; + version = "2.4.7.0.20250516.190810"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/el-job-2.4.7.0.20250516.190810.tar"; + sha256 = "14l3xa5xii7xg6006gyap5jcd3z5ramik0q9sd14gaqx7i9s8081"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/el-job.html"; + license = lib.licenses.free; + }; + } + ) { }; el-search = callPackage ( { cl-print ? null, @@ -2818,10 +2970,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.15.0.0.20250304.14245"; + version = "1.15.0.0.20250329.105231"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20250304.14245.tar"; - sha256 = "1spns425l79zjc2p0xvs8i3g6ap30l8fi1shb8gdbfn5blkb1phz"; + url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20250329.105231.tar"; + sha256 = "0jzsa6m4k2wg7frlbc6mn0g3lwlhbgrhg10ik2yp3fcdav5nfkq1"; }; packageRequires = [ ]; meta = { @@ -2890,10 +3042,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.16.0.20250215.101900"; + version = "1.16.0.20250424.171436"; src = fetchurl { - url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20250215.101900.tar"; - sha256 = "1qcr6sss94hy5c79b8n78950y1ybdc8rwxd6sj1q7xb9m9rgwls1"; + url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20250424.171436.tar"; + sha256 = "06ryqghnn904c7qjxdi5qy6fi4b6c73i6mlqh4sal6f7p2624k4i"; }; packageRequires = [ ]; meta = { @@ -2915,10 +3067,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "1.5.4.0.20250312.193157"; + version = "1.8.1.0.20250402.164949"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-1.5.4.0.20250312.193157.tar"; - sha256 = "0sqfkv552ibcyfi8q69xxlfghi46908xk7fb6qhz5c7i0d933r96"; + url = "https://elpa.gnu.org/devel/ellama-1.8.1.0.20250402.164949.tar"; + sha256 = "04ydy4lapx67r6lcg9dardvzznda2wisffzz3g9fxiyxrri5810w"; }; packageRequires = [ compat @@ -2963,10 +3115,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "1.1.0.20250131.230144"; + version = "1.1.0.20250423.105002"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-1.1.0.20250131.230144.tar"; - sha256 = "0ky3cm9dn8hwms3nmzfkm339v859wc6qgchkqn4i7p2206bp4cqj"; + url = "https://elpa.gnu.org/devel/embark-1.1.0.20250423.105002.tar"; + sha256 = "1i01q1imn32sbii0kwz51i41a9f5mql564lmhbifwh4hsgrras2g"; }; packageRequires = [ compat ]; meta = { @@ -2987,10 +3139,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "1.1.0.20250131.230144"; + version = "1.1.0.20250423.105002"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20250131.230144.tar"; - sha256 = "1ggk135338cbxkhvzc4g9wyyvz2sxxqyx5yqwzsffx9yprp618ng"; + url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20250423.105002.tar"; + sha256 = "1qkg36d67fwhijrhkfjs7397rcmjs7cga7l9dj0n9d1634f7q3h4"; }; packageRequires = [ compat @@ -3019,10 +3171,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.17pre0.20241122.210222"; + version = "0.17pre0.20250511.153249"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.17pre0.20241122.210222.tar"; - sha256 = "1gn5hjlggcs7p31mkr8vg398jgzsnhjv04g1hpx4b03j31rxwhxl"; + url = "https://elpa.gnu.org/devel/ement-0.17pre0.20250511.153249.tar"; + sha256 = "0vkkk79z2q73niffjkjbywiqr3ykdvb9ssq3095kxjnrc7k6vzvz"; }; packageRequires = [ map @@ -3051,10 +3203,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "21.0.20250204.152247"; + version = "22.0.20250405.101736"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-21.0.20250204.152247.tar"; - sha256 = "00m56k9j69xh03agj5xsw61brz69r54n2qqkyg0gs1ahaqcf52cc"; + url = "https://elpa.gnu.org/devel/emms-22.0.20250405.101736.tar"; + sha256 = "0vz92gq1hw9p4s24w0vc1finq9bx6is7vsi1izi9b5bghd837rb8"; }; packageRequires = [ cl-lib @@ -3140,10 +3292,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6.1snapshot0.20250312.13833"; + version = "5.6.1snapshot0.20250416.173013"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20250312.13833.tar"; - sha256 = "03352zza9zmv5paha806yj4pbv0p9pmbnr2b574a7xlw6qn5kzn0"; + url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20250416.173013.tar"; + sha256 = "0ii5wh8cg8v0ip57x059hx408bg09d80wz6sm4p5p17nj7klnpm0"; }; packageRequires = [ compat ]; meta = { @@ -3187,10 +3339,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "25.1.0.0.20250110.143746"; + version = "25.1.0.0.20250508.73511"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-25.1.0.0.20250110.143746.tar"; - sha256 = "0mppliby454pm7x0w7mrxk5741gcgzmim6sq36rdq8yh3q0abk77"; + url = "https://elpa.gnu.org/devel/ess-25.1.0.0.20250508.73511.tar"; + sha256 = "126ld8y7qk9z72vrd85mzqc25mbyyc6k0wl0iilbhcl268szy7xi"; }; packageRequires = [ ]; meta = { @@ -3284,10 +3436,10 @@ elpaBuild { pname = "external-completion"; ename = "external-completion"; - version = "0.1.0.20250101.73917"; + version = "0.1.0.20250329.135944"; src = fetchurl { - url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20250101.73917.tar"; - sha256 = "1z3an1r72sxw4l5xlrshxcdmyv3slzqfk42wwg7zi25lq2wf60pg"; + url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20250329.135944.tar"; + sha256 = "00hgqksypn9mr6acbyf2xxzg84z6cfrmldzv3ssg9j5zxg0pf4n4"; }; packageRequires = [ ]; meta = { @@ -3307,10 +3459,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.33.0.20250125.112727"; + version = "0.33.0.20250426.232314"; src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.33.0.20250125.112727.tar"; - sha256 = "12lcqab9ichia738md0rw6xpcl4syy4l5nasryyf46dcjlph5scm"; + url = "https://elpa.gnu.org/devel/exwm-0.33.0.20250426.232314.tar"; + sha256 = "090kdzcayczn0jv3bkcg2kp08f9w2acjdrq9ly87li41rpsbh2gk"; }; packageRequires = [ compat @@ -3375,10 +3527,10 @@ elpaBuild { pname = "filechooser"; ename = "filechooser"; - version = "0.2.1.0.20240707.120050"; + version = "0.2.2.0.20250411.154303"; src = fetchurl { - url = "https://elpa.gnu.org/devel/filechooser-0.2.1.0.20240707.120050.tar"; - sha256 = "0ri460zys97h9q4bqg43vlfdpjrizvv412y3f4hj4cazsvwlr9k1"; + url = "https://elpa.gnu.org/devel/filechooser-0.2.2.0.20250411.154303.tar"; + sha256 = "0xgvwjxsckmdijmrsb4c6ln515an07x84az3x5vd4mjll85mcm86"; }; packageRequires = [ compat ]; meta = { @@ -3462,10 +3614,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.7.0.20250225.2515"; + version = "1.4.1.0.20250508.221328"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20250225.2515.tar"; - sha256 = "0n7ffwfgz6s3rkl1fw0zzaqknzm93xr7vpc92h3grfjgrkl7526a"; + url = "https://elpa.gnu.org/devel/flymake-1.4.1.0.20250508.221328.tar"; + sha256 = "0sc45x3fwxmdbq4pz23kjibk38zwv1zxx8ihfg368syinik883gw"; }; packageRequires = [ eldoc @@ -3477,6 +3629,27 @@ }; } ) { }; + flymake-clippy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flymake-clippy"; + ename = "flymake-clippy"; + version = "1.1.0.0.20250323.141048"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/flymake-clippy-1.1.0.0.20250323.141048.tar"; + sha256 = "04w4z16iny2z22wffzgrkijsxyjcd24p2ip5yx35wvk7np6r3hxk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/flymake-clippy.html"; + license = lib.licenses.free; + }; + } + ) { }; flymake-codespell = callPackage ( { compat, @@ -3529,10 +3702,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "3.0.0.0.20250220.111012"; + version = "3.0.1.0.20250415.152114"; src = fetchurl { - url = "https://elpa.gnu.org/devel/fontaine-3.0.0.0.20250220.111012.tar"; - sha256 = "122a5hapm0jk43gd7sn1qsv9nz9b55rhff9irnqmv78f0wxxy3sy"; + url = "https://elpa.gnu.org/devel/fontaine-3.0.1.0.20250415.152114.tar"; + sha256 = "1cnx5ch9s18lmwslrzi1652xv964zpigcijwf7jpmvxj0cfi0g9b"; }; packageRequires = [ ]; meta = { @@ -3769,10 +3942,10 @@ elpaBuild { pname = "gnome-dark-style"; ename = "gnome-dark-style"; - version = "0.2.2.0.20250309.73232"; + version = "0.2.3.0.20250325.182321"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gnome-dark-style-0.2.2.0.20250309.73232.tar"; - sha256 = "09bplrzfik4hqg041a0992nd64wnr208sr37dd013n992gwj7gqn"; + url = "https://elpa.gnu.org/devel/gnome-dark-style-0.2.3.0.20250325.182321.tar"; + sha256 = "1kk6pgl79zgd2jvnh011177080w7vz2561mqi88s1rpv43lf4qxa"; }; packageRequires = [ ]; meta = { @@ -3999,10 +4172,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.12.6.0.20250304.171535"; + version = "0.12.6.0.20250304.172206"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.12.6.0.20250304.171535.tar"; - sha256 = "0maqbx42xg1zbijdbs354iqxclzkfi0pdy5zjyi1n9pwxgxmc7vd"; + url = "https://elpa.gnu.org/devel/greader-0.12.6.0.20250304.172206.tar"; + sha256 = "1cpvh9pn855q8gjz43alpipbchfbbgg0ds6qbnn7k9s0n38iyzr3"; }; packageRequires = [ compat @@ -4044,10 +4217,10 @@ elpaBuild { pname = "gtags-mode"; ename = "gtags-mode"; - version = "1.8.2.0.20241113.2312"; + version = "1.8.5.0.20250511.220137"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gtags-mode-1.8.2.0.20241113.2312.tar"; - sha256 = "0mxw27kn5f85rprk13171k56q2dq2gfmvgyhfxrbz3zj7ijvrfg1"; + url = "https://elpa.gnu.org/devel/gtags-mode-1.8.5.0.20250511.220137.tar"; + sha256 = "185c583y06lm97hd1nlhsx96byz34m0fg2xlz99vwxzm75ch3s5h"; }; packageRequires = [ ]; meta = { @@ -4208,6 +4381,28 @@ }; } ) { }; + hugoista = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "hugoista"; + ename = "hugoista"; + version = "0.2.1.0.20250324.144142"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/hugoista-0.2.1.0.20250324.144142.tar"; + sha256 = "0kmm5zdy8jw1hzr11f9aahqsbnclr1qlphh6picpyh7x0sc2nl2z"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/devel/hugoista.html"; + license = lib.licenses.free; + }; + } + ) { }; hydra = callPackage ( { elpaBuild, @@ -4218,10 +4413,10 @@ elpaBuild { pname = "hydra"; ename = "hydra"; - version = "0.15.0.0.20221030.224757"; + version = "0.15.0.0.20250316.223951"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hydra-0.15.0.0.20221030.224757.tar"; - sha256 = "1d8xdxv9j3vb0jkq6bx3f6kbjc990lbmdr78yqchai861hhllmdn"; + url = "https://elpa.gnu.org/devel/hydra-0.15.0.0.20250316.223951.tar"; + sha256 = "1zm3d5pcyblsq0r7aapwcankk80xls3821bvjf12cnzmapy9772a"; }; packageRequires = [ lv ]; meta = { @@ -4239,10 +4434,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "9.0.2pre0.20250305.163914"; + version = "9.0.2pre0.20250509.132519"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20250305.163914.tar"; - sha256 = "1w7kql8q62h5fm496bdp6gq7j6f6lbp3bz1h1g3vb7qplbx4mkys"; + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20250509.132519.tar"; + sha256 = "0jmjaa6bj93qw7i62spc4kk117bbc3g3nvdq0lkcwd9900ir1xhb"; }; packageRequires = [ ]; meta = { @@ -4303,10 +4498,10 @@ elpaBuild { pname = "indent-bars"; ename = "indent-bars"; - version = "0.8.2.0.20250306.142956"; + version = "0.8.4.0.20250508.135540"; src = fetchurl { - url = "https://elpa.gnu.org/devel/indent-bars-0.8.2.0.20250306.142956.tar"; - sha256 = "1j2a8jixv1k52dmh57id1l4b70rz79hl3gaydmk6pzpdri38msd5"; + url = "https://elpa.gnu.org/devel/indent-bars-0.8.4.0.20250508.135540.tar"; + sha256 = "0167f1q8snk98j7akns3mg07pxm1221i9vxplc4x55z7qlryvi7c"; }; packageRequires = [ compat ]; meta = { @@ -4409,10 +4604,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.15.0.0.20250225.83943"; + version = "0.15.1.0.20250417.121946"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-0.15.0.0.20250225.83943.tar"; - sha256 = "1h26hx2cvw73nlaryrqhdmxsyagqzcy9iiiglxihq4sp302kcqar"; + url = "https://elpa.gnu.org/devel/ivy-0.15.1.0.20250417.121946.tar"; + sha256 = "13xrixysvh3g358fi91lx2b4ra8npyhl573klfzvwr0w1pkpzc8g"; }; packageRequires = [ ]; meta = { @@ -4432,10 +4627,10 @@ elpaBuild { pname = "ivy-avy"; ename = "ivy-avy"; - version = "0.15.0.0.20250225.84011"; + version = "0.15.1.0.20250329.150930"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-avy-0.15.0.0.20250225.84011.tar"; - sha256 = "0c4azhg0p6b3gbcnmi6v7g4x0x2zkfs1qv0c9nbqpr5cjh0x0bgk"; + url = "https://elpa.gnu.org/devel/ivy-avy-0.15.1.0.20250329.150930.tar"; + sha256 = "0zqjfv86p52nr5vfmnliw5awsrzxalhlqwkninnp9sxgdib59z0k"; }; packageRequires = [ avy @@ -4480,10 +4675,10 @@ elpaBuild { pname = "ivy-hydra"; ename = "ivy-hydra"; - version = "0.15.0.0.20250225.84034"; + version = "0.15.1.0.20250329.151244"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-hydra-0.15.0.0.20250225.84034.tar"; - sha256 = "0ammfla2zvzzy4cy80ki8404qij3766gnwmqjjd4ld102jn606m8"; + url = "https://elpa.gnu.org/devel/ivy-hydra-0.15.1.0.20250329.151244.tar"; + sha256 = "19a9bs0hynz203zw6f1y3khgyd3nv7mf3pp2da5gd6h0012j3k5s"; }; packageRequires = [ hydra @@ -4616,10 +4811,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "2.0.0.20250311.165730"; + version = "2.1.0.20250512.155547"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-2.0.0.20250311.165730.tar"; - sha256 = "0fv0lkqlpsl8fxhsxw772bl83ram252wn6zjvj0ngy99zrh6cvjp"; + url = "https://elpa.gnu.org/devel/jinx-2.1.0.20250512.155547.tar"; + sha256 = "13yi3cv4111px48fzr8rnx70bhcb7b3gy64vcddvpcr2gvwlrzvz"; }; packageRequires = [ compat ]; meta = { @@ -4809,10 +5004,10 @@ elpaBuild { pname = "kubed"; ename = "kubed"; - version = "0.4.3.0.20250211.173738"; + version = "0.4.3.0.20250422.135008"; src = fetchurl { - url = "https://elpa.gnu.org/devel/kubed-0.4.3.0.20250211.173738.tar"; - sha256 = "0fwlhq9l4bcfscyfch83vkxnp14dv24qalrhxrjffh06h3lw96zm"; + url = "https://elpa.gnu.org/devel/kubed-0.4.3.0.20250422.135008.tar"; + sha256 = "1mcx3zah4yifrissa5065gsbkaj90m11rbhz70pk8yl60hyn9d0a"; }; packageRequires = [ ]; meta = { @@ -5043,10 +5238,10 @@ elpaBuild { pname = "literate-scratch"; ename = "literate-scratch"; - version = "1.0.0.20240621.41043"; + version = "2.2.0.20250425.54453"; src = fetchurl { - url = "https://elpa.gnu.org/devel/literate-scratch-1.0.0.20240621.41043.tar"; - sha256 = "0k1vgb1pmrdhq0mlvrpgdsamqfbhvrjwm2jgixla82j7814zzckq"; + url = "https://elpa.gnu.org/devel/literate-scratch-2.2.0.20250425.54453.tar"; + sha256 = "0wv9fmkv37j4gss36rd81wyp37cssmxvxpf98xf4yscj84vv742m"; }; packageRequires = [ ]; meta = { @@ -5057,6 +5252,7 @@ ) { }; llm = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -5067,12 +5263,13 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.24.1.0.20250309.220649"; + version = "0.25.0.0.20250510.105336"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.24.1.0.20250309.220649.tar"; - sha256 = "005b28kl669mzjbns83z5nd0hkq46v8608py1db4vn30941jjc1a"; + url = "https://elpa.gnu.org/devel/llm-0.25.0.0.20250510.105336.tar"; + sha256 = "0mnc820if3jcj909bmsjgcvdg10d7ijzqa4fgc0bw2s92hrzp37n"; }; packageRequires = [ + compat plz plz-event-source plz-media-type @@ -5241,10 +5438,10 @@ elpaBuild { pname = "lv"; ename = "lv"; - version = "0.15.0.0.20221030.224757"; + version = "0.15.0.0.20250316.223951"; src = fetchurl { - url = "https://elpa.gnu.org/devel/lv-0.15.0.0.20221030.224757.tar"; - sha256 = "07m1m2rgwnb7916hzdjccnq4is0z7m5mwmvc0f7mpc4h61sa6cdn"; + url = "https://elpa.gnu.org/devel/lv-0.15.0.0.20250316.223951.tar"; + sha256 = "1risk08xjfnam98fjqwfzki80m8rhdmm71h6xhc0glagzd8i15fk"; }; packageRequires = [ ]; meta = { @@ -5284,10 +5481,10 @@ elpaBuild { pname = "map"; ename = "map"; - version = "3.3.1.0.20250123.102904"; + version = "3.3.1.0.20250329.135944"; src = fetchurl { - url = "https://elpa.gnu.org/devel/map-3.3.1.0.20250123.102904.tar"; - sha256 = "0jjx46m5m81vgnl67njnd3x65sbxhwl065kwn2l63jjrwbk7kzq1"; + url = "https://elpa.gnu.org/devel/map-3.3.1.0.20250329.135944.tar"; + sha256 = "0gsc71i87dx4a9hhs6vp6b8d4nq6lh7d8zqm8nlwdrkqyv0m57bd"; }; packageRequires = [ ]; meta = { @@ -5306,10 +5503,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.8.0.20250203.101833"; + version = "2.0.0.20250512.155419"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.8.0.20250203.101833.tar"; - sha256 = "0yphb9wkg04c6fqb5cbblbk5vmnn15njhp774kivxhxjr7p282n3"; + url = "https://elpa.gnu.org/devel/marginalia-2.0.0.20250512.155419.tar"; + sha256 = "042nay3vr19ldbgqz1hzmacf53gz66dgpazr53xffq6pjxpih5p1"; }; packageRequires = [ compat ]; meta = { @@ -5381,6 +5578,28 @@ }; } ) { }; + mathsheet = callPackage ( + { + elpaBuild, + fetchurl, + lib, + peg, + }: + elpaBuild { + pname = "mathsheet"; + ename = "mathsheet"; + version = "1.1.0.20250513.62537"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/mathsheet-1.1.0.20250513.62537.tar"; + sha256 = "05fghv85j1fddb8y3frdz61xa2x5srm1fv6d1k030arwqqzq7224"; + }; + packageRequires = [ peg ]; + meta = { + homepage = "https://elpa.gnu.org/devel/mathsheet.html"; + license = lib.licenses.free; + }; + } + ) { }; matlab-mode = callPackage ( { elpaBuild, @@ -5390,10 +5609,10 @@ elpaBuild { pname = "matlab-mode"; ename = "matlab-mode"; - version = "6.3.0.20241224.134640"; + version = "6.3.0.20250512.120312"; src = fetchurl { - url = "https://elpa.gnu.org/devel/matlab-mode-6.3.0.20241224.134640.tar"; - sha256 = "02y2ii89safyfj74221rlri99gr7382ir62zq2iqwvy6668srn4r"; + url = "https://elpa.gnu.org/devel/matlab-mode-6.3.0.20250512.120312.tar"; + sha256 = "07lsjj3ch66xl680isn9mrmbiz28n7r85gwgrzqva9gyxilfh1wm"; }; packageRequires = [ ]; meta = { @@ -5572,6 +5791,32 @@ }; } ) { }; + minuet = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + plz, + }: + elpaBuild { + pname = "minuet"; + ename = "minuet"; + version = "0.5.4.0.20250510.3940"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/minuet-0.5.4.0.20250510.3940.tar"; + sha256 = "0akavbg2bl1amwr55ch1m3apkjdwdgiqar1kjnld28rfa027gxj6"; + }; + packageRequires = [ + dash + plz + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/minuet.html"; + license = lib.licenses.free; + }; + } + ) { }; mmm-mode = callPackage ( { cl-lib ? null, @@ -5603,10 +5848,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.6.0.0.20250220.64729"; + version = "4.7.0.0.20250428.45622"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20250220.64729.tar"; - sha256 = "1gr24821rbfj6jb4qnzka5445jq0k11k30a1xr8xjvy6kq62knqc"; + url = "https://elpa.gnu.org/devel/modus-themes-4.7.0.0.20250428.45622.tar"; + sha256 = "0dyicvmcnf99isdrjg8wazxm1hmqdy81s72glnc86pl6xaiikxf9"; }; packageRequires = [ ]; meta = { @@ -5624,10 +5869,10 @@ elpaBuild { pname = "mpdired"; ename = "mpdired"; - version = "2.0.20240614.95804"; + version = "4pre0.20250502.114712"; src = fetchurl { - url = "https://elpa.gnu.org/devel/mpdired-2.0.20240614.95804.tar"; - sha256 = "0xjfabyc3da6270gapx4cnqc71mxx518jnf7xmi2mz9hpq1202n3"; + url = "https://elpa.gnu.org/devel/mpdired-4pre0.20250502.114712.tar"; + sha256 = "1s831xln9vlxcchmxmis8ky751r3xwi5nlnnchdn7sjngkqjkl30"; }; packageRequires = [ ]; meta = { @@ -6034,10 +6279,10 @@ elpaBuild { pname = "ob-asymptote"; ename = "ob-asymptote"; - version = "1.0.1.0.20241018.115612"; + version = "1.0.2.0.20250511.114502"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ob-asymptote-1.0.1.0.20241018.115612.tar"; - sha256 = "0hr0rfj344yshrplcavncphrl16a1n7gx1r906dma53x7nmkhcf7"; + url = "https://elpa.gnu.org/devel/ob-asymptote-1.0.2.0.20250511.114502.tar"; + sha256 = "0hkfqgym36lmlbqq4a5aj031hz14isfsnjn6qhkgxg06pc1wlzcl"; }; packageRequires = [ ]; meta = { @@ -6163,10 +6408,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.3.0.20250201.234121"; + version = "1.4.0.20250316.204648"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.3.0.20250201.234121.tar"; - sha256 = "1skvlpvn49qivvn33c3y9nx0v3mn8ds1cagddd070ykpqyccrihp"; + url = "https://elpa.gnu.org/devel/orderless-1.4.0.20250316.204648.tar"; + sha256 = "1v0rqw8s9zzlbnk6ijc588rp31qlflic9wag8ncv9bkjn150c0sa"; }; packageRequires = [ compat ]; meta = { @@ -6184,10 +6429,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.8pre0.20250312.181832"; + version = "9.8pre0.20250512.165453"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.8pre0.20250312.181832.tar"; - sha256 = "1bp5a6h7f458awla2ywhjj2wjbwj4bqkz891xsfirsj5801bc72i"; + url = "https://elpa.gnu.org/devel/org-9.8pre0.20250512.165453.tar"; + sha256 = "1hdy7zxl1d9hpv02j99r0w0kqrwpw567w6sycx3d1xdz8r93z8c5"; }; packageRequires = [ ]; meta = { @@ -6206,10 +6451,10 @@ elpaBuild { pname = "org-contacts"; ename = "org-contacts"; - version = "1.1.0.20250309.165914"; + version = "1.1.0.20250513.100113"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20250309.165914.tar"; - sha256 = "1nx4b15g7zai76587phi3dy19adywmhmaan2jg62vl11mij2z08b"; + url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20250513.100113.tar"; + sha256 = "03rbhicxw9glwrdhsw364kyjxdzbs4h63h927n5scbn71gkwr3bc"; }; packageRequires = [ org ]; meta = { @@ -6298,16 +6543,20 @@ elpaBuild, fetchurl, lib, + org, }: elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.7.0.20250311.170125"; + version = "1.7.0.20250512.155443"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-1.7.0.20250311.170125.tar"; - sha256 = "0xijjr2y15ghjicflmsq3l5ir2laz6pvsfcr0p7jziiz0ax97fx9"; + url = "https://elpa.gnu.org/devel/org-modern-1.7.0.20250512.155443.tar"; + sha256 = "0pnnwsfamfmg3cm832736kaxjlj9bg62f00bjcdrxkkad0c0gbf6"; }; - packageRequires = [ compat ]; + packageRequires = [ + compat + org + ]; meta = { homepage = "https://elpa.gnu.org/devel/org-modern.html"; license = lib.licenses.free; @@ -6479,10 +6728,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "1.6.0.20250301.161304"; + version = "1.7.0.20250512.155425"; src = fetchurl { - url = "https://elpa.gnu.org/devel/osm-1.6.0.20250301.161304.tar"; - sha256 = "14d10amng3xij0wnj29iz480rsv6z8hkn6ynnh13lfc9kaf5bhh0"; + url = "https://elpa.gnu.org/devel/osm-1.7.0.20250512.155425.tar"; + sha256 = "0x0dxx1zy90lf0bfwhw9va4az6f9z1rlp3j75zd3a1vrh18dh2f4"; }; packageRequires = [ compat ]; meta = { @@ -6564,10 +6813,10 @@ elpaBuild { pname = "package-x"; ename = "package-x"; - version = "1.0.0.20250212.211602"; + version = "1.0.0.20250516.155254"; src = fetchurl { - url = "https://elpa.gnu.org/devel/package-x-1.0.0.20250212.211602.tar"; - sha256 = "0plkkpdf9apjhr60n4j7idbg5brmx3hndfg2lq8d00si6gr5c73b"; + url = "https://elpa.gnu.org/devel/package-x-1.0.0.20250516.155254.tar"; + sha256 = "1lr9g496sm8h6ph8x7w8c2ayhnlh7w30hhl6xwwfdsh0sqp2hy50"; }; packageRequires = [ ]; meta = { @@ -6607,10 +6856,10 @@ elpaBuild { pname = "parser-generator"; ename = "parser-generator"; - version = "0.2.4.0.20241220.142732"; + version = "0.2.5.0.20250505.82351"; src = fetchurl { - url = "https://elpa.gnu.org/devel/parser-generator-0.2.4.0.20241220.142732.tar"; - sha256 = "0q46ywjv4ymjal0jfmrm4i1ck6nkcil06xgzhncqp6j8fbn4mvj5"; + url = "https://elpa.gnu.org/devel/parser-generator-0.2.5.0.20250505.82351.tar"; + sha256 = "1gdaaas4p6xgmp67fwz0l43fyk0akj6q1vbv8gfgmzyaz9glwkaw"; }; packageRequires = [ ]; meta = { @@ -6735,10 +6984,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.50.0.20250303.193108"; + version = "0.4.51.0.20250428.55352"; src = fetchurl { - url = "https://elpa.gnu.org/devel/phps-mode-0.4.50.0.20250303.193108.tar"; - sha256 = "1a7251cn5jiq6322ffs7bzz3bqyfdap2skwb0s1kwxn0zhq1hjcz"; + url = "https://elpa.gnu.org/devel/phps-mode-0.4.51.0.20250428.55352.tar"; + sha256 = "1r0faz9ijidagzcbphz7w2qwbxbdyznxk9ffx2rmrhjbizknrcm9"; }; packageRequires = [ ]; meta = { @@ -6756,10 +7005,10 @@ elpaBuild { pname = "pinentry"; ename = "pinentry"; - version = "0.1.0.20241123.141"; + version = "0.1.0.20250408.22039"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20241123.141.tar"; - sha256 = "14ssm8hrkx70iaww77yrhsbp7k6962bp4k2w7mgj4mj4wkfyrw89"; + url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20250408.22039.tar"; + sha256 = "10372ijcmwz48k03lbfw5s4lh2kmizhzfpd7in61zl12f2qv9rw7"; }; packageRequires = [ ]; meta = { @@ -6777,10 +7026,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.10pre0.20240816.164727"; + version = "0.10pre0.20250318.183534"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-0.10pre0.20240816.164727.tar"; - sha256 = "13rimqccllasx5zvb5hm3mkcnhwzy2b2fp5p3klv4xz0szf1981k"; + url = "https://elpa.gnu.org/devel/plz-0.10pre0.20250318.183534.tar"; + sha256 = "08iyw80d2431k60fkw26i3z8zw0jk9czmxr1vi7z7hdfrqmw7gc0"; }; packageRequires = [ ]; meta = { @@ -6799,10 +7048,10 @@ elpaBuild { pname = "plz-event-source"; ename = "plz-event-source"; - version = "0.1.3pre0.20250228.134816"; + version = "0.1.4pre0.20250413.93107"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-event-source-0.1.3pre0.20250228.134816.tar"; - sha256 = "08dasdzl53rnb29jl023vmcqs0xall1ra2dfpzqsjjzc1a1lz08y"; + url = "https://elpa.gnu.org/devel/plz-event-source-0.1.4pre0.20250413.93107.tar"; + sha256 = "1g4bvdbdg5c0ch62l8314rv44b2wyymkbydyi0fkdjjb3a9ns4b0"; }; packageRequires = [ plz-media-type ]; meta = { @@ -6821,10 +7070,10 @@ elpaBuild { pname = "plz-media-type"; ename = "plz-media-type"; - version = "0.2.4pre0.20250228.133501"; + version = "0.2.5pre0.20250412.100044"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-media-type-0.2.4pre0.20250228.133501.tar"; - sha256 = "1m38fzbcmvqh8nwxsb2wic549af8wicpqxsd18d5631z04910ryb"; + url = "https://elpa.gnu.org/devel/plz-media-type-0.2.5pre0.20250412.100044.tar"; + sha256 = "1w35bdxgsv1wvqwn64miyzplbb6gqry25wnl6l7dyd2n71h2hmxl"; }; packageRequires = [ plz ]; meta = { @@ -6927,10 +7176,10 @@ elpaBuild { pname = "polymode"; ename = "polymode"; - version = "0.2.2.0.20241204.120252"; + version = "0.2.2.0.20250511.135208"; src = fetchurl { - url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20241204.120252.tar"; - sha256 = "1ipdg4byc58gc4jncak5p6w7iyw0y173y4aky2fz88h1ccag2s2g"; + url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20250511.135208.tar"; + sha256 = "1l5x9y6m8la0rlz56s1iqlqfr9v5gq0wfykiv8gir8sk0xgnz315"; }; packageRequires = [ ]; meta = { @@ -6948,10 +7197,10 @@ elpaBuild { pname = "popper"; ename = "popper"; - version = "0.4.8.0.20250222.131836"; + version = "0.4.8.0.20250323.144723"; src = fetchurl { - url = "https://elpa.gnu.org/devel/popper-0.4.8.0.20250222.131836.tar"; - sha256 = "03h7i6z8zm1najw5vz9kflf6l35vlkcb6gkqp9g94q1r6j8s7bl2"; + url = "https://elpa.gnu.org/devel/popper-0.4.8.0.20250323.144723.tar"; + sha256 = "0hfl4krm53blsm9bvki4gf1as43f8i7rszcjivbsiz1r4h99j9v8"; }; packageRequires = [ ]; meta = { @@ -7033,10 +7282,10 @@ elpaBuild { pname = "preview-auto"; ename = "preview-auto"; - version = "0.4.0.20241109.62806"; + version = "0.4.0.20241203.135521"; src = fetchurl { - url = "https://elpa.gnu.org/devel/preview-auto-0.4.0.20241109.62806.tar"; - sha256 = "0vcrwi3pjvp46k1c52l4q774fkq93hn3dbbvrhaz160r6d9b477b"; + url = "https://elpa.gnu.org/devel/preview-auto-0.4.0.20241203.135521.tar"; + sha256 = "0pcncvr4nv251fm0c66c3wqazv89vxqcv9j2jq0kvylx9ks2vzaz"; }; packageRequires = [ auctex ]; meta = { @@ -7077,10 +7326,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.11.1.0.20250311.202651"; + version = "0.11.1.0.20250428.24648"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.11.1.0.20250311.202651.tar"; - sha256 = "12d3v449rk70l71i1hyfy9fkvqv82y4gadcdwn9n4hdgqzknj598"; + url = "https://elpa.gnu.org/devel/project-0.11.1.0.20250428.24648.tar"; + sha256 = "142jsslwxg2s590szngpzm2srw1n7qdvl3gzbqrnngy91wpv7n9a"; }; packageRequires = [ xref ]; meta = { @@ -7213,10 +7462,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.30.0.20250311.1541"; + version = "0.30.0.20250505.74536"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.30.0.20250311.1541.tar"; - sha256 = "0mx17q36rjf2ax1vy0pm79ya35ys5wg0n97flk98x4w1l5wggx6w"; + url = "https://elpa.gnu.org/devel/python-0.30.0.20250505.74536.tar"; + sha256 = "0xcwr1vrcqafc5q9lzi0g3hb7xhv2cqc163mfsbhi7y2a80gylwi"; }; packageRequires = [ compat @@ -8011,10 +8260,10 @@ elpaBuild { pname = "show-font"; ename = "show-font"; - version = "0.2.1.0.20250303.51849"; + version = "0.3.0.0.20250426.112415"; src = fetchurl { - url = "https://elpa.gnu.org/devel/show-font-0.2.1.0.20250303.51849.tar"; - sha256 = "1nbgvb5id2jfjpics0fxmkc6mj343ry1ww6n8l1glk8nchskqx78"; + url = "https://elpa.gnu.org/devel/show-font-0.3.0.0.20250426.112415.tar"; + sha256 = "0ygk5qq98rmbyjnh58c5rpdszrpwvpn9vr55s6lpp94lwl1yhkwq"; }; packageRequires = [ ]; meta = { @@ -8181,10 +8430,10 @@ elpaBuild { pname = "sml-mode"; ename = "sml-mode"; - version = "6.12.0.20230411.5343"; + version = "6.12.0.20250404.173928"; src = fetchurl { - url = "https://elpa.gnu.org/devel/sml-mode-6.12.0.20230411.5343.tar"; - sha256 = "1a7n0lvrjq4xnn0cr6qwgh7l54m95mf2nxwv1rplair4r8si8y0d"; + url = "https://elpa.gnu.org/devel/sml-mode-6.12.0.20250404.173928.tar"; + sha256 = "05cdfdsnphxxww1mb05fzf18gray50s7k96m4nfpqcwlyzmbi947"; }; packageRequires = [ cl-lib ]; meta = { @@ -8202,10 +8451,10 @@ elpaBuild { pname = "so-long"; ename = "so-long"; - version = "1.1.2.0.20250101.73917"; + version = "1.1.2.0.20250315.100518"; src = fetchurl { - url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20250101.73917.tar"; - sha256 = "1z9mf5kac7bsqq0kkd2alcx9vvz87vsgbw753shd23y9m7ayapvx"; + url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20250315.100518.tar"; + sha256 = "0jjf9y2swl23njng62l43avy37s4ca18z8g647mkp50rx02j9q8b"; }; packageRequires = [ ]; meta = { @@ -8288,10 +8537,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.6.0.0.20250106.104943"; + version = "0.6.1.0.20250429.100228"; src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.6.0.0.20250106.104943.tar"; - sha256 = "0z27zcpfsxbkqhdajh42r201yzr2143cgszm3slxa4qalmzpmjsx"; + url = "https://elpa.gnu.org/devel/spacious-padding-0.6.1.0.20250429.100228.tar"; + sha256 = "189fqdm0j1mqpjwsl9jp3nqfr6ngn0y49nvraljakc9q6yxs46a3"; }; packageRequires = [ ]; meta = { @@ -8634,10 +8883,10 @@ elpaBuild { pname = "swiper"; ename = "swiper"; - version = "0.15.0.0.20250225.84058"; + version = "0.15.1.0.20250329.151337"; src = fetchurl { - url = "https://elpa.gnu.org/devel/swiper-0.15.0.0.20250225.84058.tar"; - sha256 = "1j0ys0q804w7yghxvs5mw6qbi8f7vw34fp1ng09ds1ylpsxfsxfa"; + url = "https://elpa.gnu.org/devel/swiper-0.15.1.0.20250329.151337.tar"; + sha256 = "08glyqqvj3m9bph1i53m32wg58xvxzglc44gidmg2b1gf2w3gl82"; }; packageRequires = [ ivy ]; meta = { @@ -8857,10 +9106,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "1.3.0.20250101.92736"; + version = "1.4.0.20250512.155414"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-1.3.0.20250101.92736.tar"; - sha256 = "1jqg7k6pr088jmbvyzqwm5xyzpjlz0a4fk4z5qmrcr6hdzyjlhgi"; + url = "https://elpa.gnu.org/devel/tempel-1.4.0.20250512.155414.tar"; + sha256 = "173jl07yiv0kbb3gdci98dy08acaylmm564i4rgsrl4nyv32ad67"; }; packageRequires = [ compat ]; meta = { @@ -8921,10 +9170,10 @@ elpaBuild { pname = "tex-parens"; ename = "tex-parens"; - version = "0.6.0.20241101.151607"; + version = "0.7.0.20250322.84812"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tex-parens-0.6.0.20241101.151607.tar"; - sha256 = "16b5s137jnjln3l3x97cxxhn4bsxhn6gs6xkbszp4vkx3cww8kzk"; + url = "https://elpa.gnu.org/devel/tex-parens-0.7.0.20250322.84812.tar"; + sha256 = "0q8nv125k863vmgclrbh7v4548pnccwmidgl645wjv89198dh5v0"; }; packageRequires = [ ]; meta = { @@ -9006,10 +9255,10 @@ elpaBuild { pname = "tmr"; ename = "tmr"; - version = "1.0.0.0.20241111.101250"; + version = "1.1.0.0.20250426.50246"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tmr-1.0.0.0.20241111.101250.tar"; - sha256 = "19g5xz0vfxjrfghdl8h4566v6sdr8cf4svm5yx98jijdr5np2a6s"; + url = "https://elpa.gnu.org/devel/tmr-1.1.0.0.20250426.50246.tar"; + sha256 = "01ya6w9fhrj6jmhnkhaxck1a7z9vq1zgm5fq4vv8hs3xbmidzpsv"; }; packageRequires = [ ]; meta = { @@ -9095,10 +9344,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.7.2.2.0.20250227.73653"; + version = "2.7.2.3.1.0.20250408.65900"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.7.2.2.0.20250227.73653.tar"; - sha256 = "19iaj5dzxqjw413j4fawgsi3fia73d28c3v2iy5la9xaxrqxwig5"; + url = "https://elpa.gnu.org/devel/tramp-2.7.2.3.1.0.20250408.65900.tar"; + sha256 = "0fl70dainnhz78bx611x4295ic751d4ranz9zh89xdygaj6hvzz8"; }; packageRequires = [ ]; meta = { @@ -9181,10 +9430,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.8.5.0.20250306.191617"; + version = "0.8.8.0.20250511.180821"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.8.5.0.20250306.191617.tar"; - sha256 = "1yjq58925f4f13ln7i2hzmyknhswmgpwh1n5dc8bnk7pbfnkzcq3"; + url = "https://elpa.gnu.org/devel/transient-0.8.8.0.20250511.180821.tar"; + sha256 = "1lh8d85qfc7yxc6gj33j930bikq3f7j7n87ajmjsd3y3bjayrcw9"; }; packageRequires = [ compat @@ -9275,10 +9524,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.5.0.0.20250126.191724"; + version = "0.6.0.0.20250510.230302"; src = fetchurl { - url = "https://elpa.gnu.org/devel/triples-0.5.0.0.20250126.191724.tar"; - sha256 = "1wc1y1cl0dbyz76ni3xj1sp87i0cv0ixj2cj4sb8pp7i2k4xcqdl"; + url = "https://elpa.gnu.org/devel/triples-0.6.0.0.20250510.230302.tar"; + sha256 = "0xgx32rwxw4cf1c178mfasvpw7ng85mrakqyvzmmmbysj16dkcw8"; }; packageRequires = [ seq ]; meta = { @@ -9404,10 +9653,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.5.2snapshot0.20250304.194036"; + version = "0.5.2snapshot0.20250315.173144"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.5.2snapshot0.20250304.194036.tar"; - sha256 = "0hcskhl9qs9rajv1kxna1xqfkhil5w5mdiyrj0swh7mcaw63fwr1"; + url = "https://elpa.gnu.org/devel/urgrep-0.5.2snapshot0.20250315.173144.tar"; + sha256 = "18rnj1dm8551sqkqjfq9485v455n97ixivbnds6lmwxaafrr8yxr"; }; packageRequires = [ compat @@ -9421,26 +9670,20 @@ ) { }; url-http-ntlm = callPackage ( { - cl-lib ? null, elpaBuild, fetchurl, lib, - nadvice, ntlm ? null, }: elpaBuild { pname = "url-http-ntlm"; ename = "url-http-ntlm"; - version = "2.0.5.0.20231024.31412"; + version = "2.0.5.0.20250314.123040"; src = fetchurl { - url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.5.0.20231024.31412.tar"; - sha256 = "1crjiq72fcpzw4nlrm8nh3q2llvxc7bgjqq6vr6ma055d0m6xrsd"; + url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.5.0.20250314.123040.tar"; + sha256 = "0wqx83prdprlyjs7rvrxhf1kz6pzsmhiin0kqp74dsn407zq4g34"; }; - packageRequires = [ - cl-lib - nadvice - ntlm - ]; + packageRequires = [ ntlm ]; meta = { homepage = "https://elpa.gnu.org/devel/url-http-ntlm.html"; license = lib.licenses.free; @@ -9456,10 +9699,10 @@ elpaBuild { pname = "url-http-oauth"; ename = "url-http-oauth"; - version = "0.8.3.0.20230510.175959"; + version = "0.8.3.0.20250314.122034"; src = fetchurl { - url = "https://elpa.gnu.org/devel/url-http-oauth-0.8.3.0.20230510.175959.tar"; - sha256 = "00shj8zvjvdy7gh29sx08m3cn9lyivjlzmzll0i2zy9389i1l360"; + url = "https://elpa.gnu.org/devel/url-http-oauth-0.8.3.0.20250314.122034.tar"; + sha256 = "0f2ih3827r02alggi0hz6f9fyak2acc04x6gjahjmf65vy51rpbi"; }; packageRequires = [ ]; meta = { @@ -9499,10 +9742,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.6.0.20250302.30748"; + version = "2.4.6.0.20250427.74855"; src = fetchurl { - url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20250302.30748.tar"; - sha256 = "0hd0ii901jr7l0f3yl1kmnplnsj34lbcs7c71ndlkfg2qzgys6kj"; + url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20250427.74855.tar"; + sha256 = "19x0hi00ychc2j18g323rkq7lghfc8p0g9kq3chwhqb46vmqr993"; }; packageRequires = [ bind-key ]; meta = { @@ -9622,6 +9865,28 @@ }; } ) { }; + vc-jj = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vc-jj"; + ename = "vc-jj"; + version = "0.2.0.20250430.120738"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vc-jj-0.2.0.20250430.120738.tar"; + sha256 = "0gmqilpaaalg5sgdd7hcwgwz64k29v0a22zg14492bn7906zr1fs"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vc-jj.html"; + license = lib.licenses.free; + }; + } + ) { }; vcard = callPackage ( { elpaBuild, @@ -9717,10 +9982,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "2.0.0.20250311.165544"; + version = "2.1.0.20250516.184229"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-2.0.0.20250311.165544.tar"; - sha256 = "1vw6qjrbsymx18kpn47p89ni7gpnwb0zs7prbzzpn1p370bb578r"; + url = "https://elpa.gnu.org/devel/vertico-2.1.0.20250516.184229.tar"; + sha256 = "07dmj8p760c13grz45fc1wvpy7li2xvqg6scy7jx3jc9j5gdqdk9"; }; packageRequires = [ compat ]; meta = { @@ -9848,10 +10113,10 @@ elpaBuild { pname = "vundo"; ename = "vundo"; - version = "2.3.0.0.20250114.230321"; + version = "2.4.0.0.20250417.151603"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20250114.230321.tar"; - sha256 = "1bqv7s4z4vkb1w4n2cyjsf181faycm95g7z2ikcb18hhag1q2fi1"; + url = "https://elpa.gnu.org/devel/vundo-2.4.0.0.20250417.151603.tar"; + sha256 = "0rcplghs9pxjpkr658phkp3dfyzxrmjavqwz66i2jzc9lnpfq6rl"; }; packageRequires = [ ]; meta = { @@ -9976,10 +10241,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.6.1.0.20250205.202103"; + version = "3.6.1.0.20250330.141700"; src = fetchurl { - url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20250205.202103.tar"; - sha256 = "0n5f6r1kfiycmd96419yfr7vg65aq3g0hhgafhkwi73n6cbd9209"; + url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20250330.141700.tar"; + sha256 = "0gg43zbsvfkhzbaw3msvd6kvimkdih2j15g63dz3nfq11m9iw70l"; }; packageRequires = [ ]; meta = { @@ -10193,10 +10458,10 @@ elpaBuild { pname = "xeft"; ename = "xeft"; - version = "3.3.0.20230913.220528"; + version = "3.6.0.20250501.222827"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xeft-3.3.0.20230913.220528.tar"; - sha256 = "1zpm678nmnfs7vwirjil35nfwjkhr83f6pmn43lcdzrcz6y7nxn1"; + url = "https://elpa.gnu.org/devel/xeft-3.6.0.20250501.222827.tar"; + sha256 = "157384q5asxxibjz3g537cl0pa39z6scji53c3wnj8w3w1zm6jbm"; }; packageRequires = [ ]; meta = { @@ -10215,10 +10480,10 @@ elpaBuild { pname = "xelb"; ename = "xelb"; - version = "0.20.0.20250101.94850"; + version = "0.20.0.20250426.232241"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xelb-0.20.0.20250101.94850.tar"; - sha256 = "03lma8c203j736kl2pg1vmjd4iw52qg67qlb0617pr6dd7p7jr8j"; + url = "https://elpa.gnu.org/devel/xelb-0.20.0.20250426.232241.tar"; + sha256 = "19w0k5kn7g2254l2hvrs9m368s3rkbxkl9ymdlcilcnzs8z91c66"; }; packageRequires = [ compat ]; meta = { @@ -10283,10 +10548,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.7.0.0.20250304.63233"; + version = "1.7.0.0.20250515.124004"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20250304.63233.tar"; - sha256 = "0zkawnpgh60nqn5nz1vp4w6klw37v3ay5vyp5dsjz7bz4f3vcnvd"; + url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20250515.124004.tar"; + sha256 = "1h93z4dlk7vd2wif93zsypr55mdfnd2yyy6n69wz3d410jf51jf7"; }; packageRequires = [ ]; meta = { @@ -10325,10 +10590,10 @@ elpaBuild { pname = "yaml"; ename = "yaml"; - version = "1.2.0.0.20250208.153456"; + version = "1.2.0.0.20250316.172129"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yaml-1.2.0.0.20250208.153456.tar"; - sha256 = "13awmzwcmgs7ciinhr0crcw70zabj7lpxgk6afizcsdd0fahgg4m"; + url = "https://elpa.gnu.org/devel/yaml-1.2.0.0.20250316.172129.tar"; + sha256 = "0alwrb50napf86jimcnbjbkpd3nizvizskxa8rpglqn5yllj5qlw"; }; packageRequires = [ ]; meta = { @@ -10347,10 +10612,10 @@ elpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "0.14.1.0.20250112.175154"; + version = "0.14.2.0.20250403.152613"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20250112.175154.tar"; - sha256 = "0f6fx935lv1rar7blqprwrcz0vilpgh4k564y801pnlcxh5ssnnh"; + url = "https://elpa.gnu.org/devel/yasnippet-0.14.2.0.20250403.152613.tar"; + sha256 = "0lsd7j5g3fk0gbk5qjr3vrwffyy56pf6hzgkqcsjz7jps0s8jw2v"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 943a50f8ed25..bc2c4a374125 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -9,10 +9,10 @@ elpaBuild { pname = "a68-mode"; ename = "a68-mode"; - version = "1.0"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/a68-mode-1.0.tar"; - sha256 = "1fhmsix14wmysbp3w0zaywlf3m5wqmgydw2377zsgbaz7k3s3y8x"; + url = "https://elpa.gnu.org/packages/a68-mode-1.2.tar"; + sha256 = "1x40j0w6kzjxxrj7qdvll1psackq526cfrihfmacmq97c9g8xwm6"; }; packageRequires = [ ]; meta = { @@ -527,10 +527,10 @@ elpaBuild { pname = "auth-source-xoauth2-plugin"; ename = "auth-source-xoauth2-plugin"; - version = "0.1.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin-0.1.1.tar"; - sha256 = "0wag5iq3bgk3sazlc4a0g67l4517kv4khidkiwrrgv1b1nq0kcrl"; + url = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin-0.2.tar"; + sha256 = "18mmjcyqja46fkggghm45ln6gp1jjb68q4q4q93l3s2vx3hlk60y"; }; packageRequires = [ oauth2 ]; meta = { @@ -993,10 +993,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.8"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bufferlo-0.8.tar"; - sha256 = "0ypd611xmjsir24nv8gr19pq7f1n0gbgq9yzvfy3m6k97gpw2jzq"; + url = "https://elpa.gnu.org/packages/bufferlo-1.1.tar"; + sha256 = "0g72k2y5nfqa6j3y0c4z0x3crn8ynlkgvwysxhgh9vypq7cqldj0"; }; packageRequires = [ ]; meta = { @@ -1462,10 +1462,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "30.0.2.0"; + version = "30.1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-30.0.2.0.tar"; - sha256 = "0pizq8vwfqls04in95rpnfwv4xc1r2qjpf41g6bjy826i53cfdx0"; + url = "https://elpa.gnu.org/packages/compat-30.1.0.0.tar"; + sha256 = "1wmq4sj3kkb4shvsi8djrk9znjxj20lm4v389jyn18q55gqigq6b"; }; packageRequires = [ seq ]; meta = { @@ -1526,10 +1526,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "2.1"; + version = "2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-2.1.tar"; - sha256 = "0w88gpgkqjmllypckrkc54gm42yjsfjp4mj9q9pii8qir49sh8ls"; + url = "https://elpa.gnu.org/packages/consult-2.3.tar"; + sha256 = "0rmb5j0kv36lqy135rknfabbzaa7cpfqsgzkicsyzbq3rh3nmf1p"; }; packageRequires = [ compat ]; meta = { @@ -1549,10 +1549,10 @@ elpaBuild { pname = "consult-denote"; ename = "consult-denote"; - version = "0.2.4"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-denote-0.2.4.tar"; - sha256 = "1a5gxrm8qw638hdplvlizwmyvm84ispm5w751vd7ngmcsiaabvmp"; + url = "https://elpa.gnu.org/packages/consult-denote-0.3.1.tar"; + sha256 = "1rvn90wv6r48129w4s8wcc2gp9wa92zxwc0a4yc70xc5xxm85xi4"; }; packageRequires = [ consult @@ -1639,10 +1639,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.7"; + version = "2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-1.7.tar"; - sha256 = "1jd6vrbsr5h1j8lsvdkhb1z3nrh1m11fi1hcvhh6nbhqnidwsrii"; + url = "https://elpa.gnu.org/packages/corfu-2.1.tar"; + sha256 = "07ffi16b2ay1rcc8bdryg1h901pjbhfaq1qqsm463iis490rzm81"; }; packageRequires = [ compat ]; meta = { @@ -1684,10 +1684,10 @@ elpaBuild { pname = "counsel"; ename = "counsel"; - version = "0.15.0"; + version = "0.15.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/counsel-0.15.0.tar"; - sha256 = "1mw13iw7ygnigjarcfg7lazrdwk7l17clxs2igf75kdkk4l4jgb4"; + url = "https://elpa.gnu.org/packages/counsel-0.15.1.tar"; + sha256 = "1sgaph2wb4mkxlfq6448i1kymaxhs7h37nrn7vzbp9fhik634rhc"; }; packageRequires = [ ivy @@ -1899,10 +1899,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.23.0"; + version = "0.24.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dape-0.23.0.tar"; - sha256 = "0y6snj9cwn1f754bn2smyf8ggjihws7a0rxb3b5s8dsvdkgz5hzy"; + url = "https://elpa.gnu.org/packages/dape-0.24.1.tar"; + sha256 = "01w2sr9cbs1d9zh15gajyac7xcqbz40f5xfwv0c7jmsqkn7rv7aq"; }; packageRequires = [ jsonrpc ]; meta = { @@ -2033,10 +2033,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-3.1.0.tar"; - sha256 = "03l9ya2n0nrj72dpnflxv19k8agzl3lab7hq0aqb7vzxafjfip74"; + url = "https://elpa.gnu.org/packages/denote-4.0.0.tar"; + sha256 = "13a1aynmrj1vzq9xljs2h96pywqhr7iblyag51asxjynkzj2z27g"; }; packageRequires = [ ]; meta = { @@ -2045,6 +2045,50 @@ }; } ) { }; + denote-journal = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-journal"; + ename = "denote-journal"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/denote-journal-0.1.1.tar"; + sha256 = "0922hjzah7nz49z3q3qyq06n77yqxd7mxiw7fmawavjh920dv3fq"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/packages/denote-journal.html"; + license = lib.licenses.free; + }; + } + ) { }; + denote-markdown = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-markdown"; + ename = "denote-markdown"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/denote-markdown-0.1.1.tar"; + sha256 = "0ic8kqfw56xsm9s0rlq7cgnh0dzjsbbcx7kdk55dggpvxv67jj62"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/packages/denote-markdown.html"; + license = lib.licenses.free; + }; + } + ) { }; denote-menu = callPackage ( { denote, @@ -2055,10 +2099,10 @@ elpaBuild { pname = "denote-menu"; ename = "denote-menu"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-menu-1.3.0.tar"; - sha256 = "0flkb3f1zpp3sbjx6h7qb6fnjgg44s53zkv3q3fj6cl7c0f11n02"; + url = "https://elpa.gnu.org/packages/denote-menu-1.4.0.tar"; + sha256 = "1lw8fyf749wmkrcn8ixvrias1a84wcgy9snlmlk0w2h02dqapazi"; }; packageRequires = [ denote ]; meta = { @@ -2067,6 +2111,28 @@ }; } ) { }; + denote-org = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-org"; + ename = "denote-org"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/denote-org-0.1.1.tar"; + sha256 = "0nwyyzx96d5k6dw4jb8bvni9fjr1plip57mdsyabrha19p6n282d"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/packages/denote-org.html"; + license = lib.licenses.free; + }; + } + ) { }; denote-search = callPackage ( { denote, @@ -2089,6 +2155,50 @@ }; } ) { }; + denote-sequence = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-sequence"; + ename = "denote-sequence"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/denote-sequence-0.1.1.tar"; + sha256 = "06s2k555in897rpr2iabzv29dr79lm6fkpjp3yssidr9irxymf0h"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/packages/denote-sequence.html"; + license = lib.licenses.free; + }; + } + ) { }; + denote-silo = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-silo"; + ename = "denote-silo"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/denote-silo-0.1.1.tar"; + sha256 = "1jxr52npjiwisambwav6rasndjdxhll8x278q8cr7giq71am7c8b"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/packages/denote-silo.html"; + license = lib.licenses.free; + }; + } + ) { }; detached = callPackage ( { elpaBuild, @@ -2339,10 +2449,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.4.0"; + version = "0.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-preview-0.4.0.tar"; - sha256 = "1ns0vgg0rmx823rcd4c18xxg6kjj22lklv74bhxf7cj6h50r4z7l"; + url = "https://elpa.gnu.org/packages/dired-preview-0.5.2.tar"; + sha256 = "1zipwb9ydyx6cscpf8p7vf2fl03rd7diivdvq9h73pbz754m0bq9"; }; packageRequires = [ ]; meta = { @@ -2457,6 +2567,27 @@ }; } ) { }; + doc-view-follow = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "doc-view-follow"; + ename = "doc-view-follow"; + version = "0.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/doc-view-follow-0.3.2.tar"; + sha256 = "1lwzcmxsqcbwf42s8yisw3wraka3yphhwf51pznlvdwhwax4h4ph"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/doc-view-follow.html"; + license = lib.licenses.free; + }; + } + ) { }; docbook = callPackage ( { elpaBuild, @@ -2689,10 +2820,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-1.9.0.tar"; - sha256 = "03gi3gwrng9arffypmlnd96404yxac78k59q5yb1y1f8fahy199k"; + url = "https://elpa.gnu.org/packages/ef-themes-1.10.0.tar"; + sha256 = "1mpaw1icvalq1ydxby9zfbjdgkk9wvld31xjrbr684ps5ix8f1f2"; }; packageRequires = [ ]; meta = { @@ -2741,6 +2872,27 @@ }; } ) { }; + el-job = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "el-job"; + ename = "el-job"; + version = "2.4.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/el-job-2.4.7.tar"; + sha256 = "0gh4vwq986jhfld0cibxmy5zcngzq4mxw4j4rpsv8nhwg0wpr84j"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/el-job.html"; + license = lib.licenses.free; + }; + } + ) { }; el-search = callPackage ( { cl-print ? null, @@ -2873,10 +3025,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "1.5.4"; + version = "1.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-1.5.4.tar"; - sha256 = "0kf25znwzc9mdy2adhramzcr30y9f8qa1q9s0swbsa4ilja7ks7w"; + url = "https://elpa.gnu.org/packages/ellama-1.8.1.tar"; + sha256 = "19n8zcgls4jiz7hacj564gb9y0sxdli2yl4j4d35c44pq52g2y6v"; }; packageRequires = [ compat @@ -3009,10 +3161,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "21"; + version = "22"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-21.tar"; - sha256 = "188rij39qqaya7hk0p05ygcw5vlha7qd6pm4ws6nfw7g0nv1rbcc"; + url = "https://elpa.gnu.org/packages/emms-22.tar"; + sha256 = "0jn8si9m8pxd7ni543p8z697297i9dva319dw141zwpbxqhmyvpi"; }; packageRequires = [ cl-lib @@ -3332,10 +3484,10 @@ elpaBuild { pname = "filechooser"; ename = "filechooser"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/filechooser-0.2.1.tar"; - sha256 = "1q9yxq4c6lp1fllcd60mcj4bs0ia03i649jilknkcp7jmjihq07i"; + url = "https://elpa.gnu.org/packages/filechooser-0.2.2.tar"; + sha256 = "1y1f6nihay2xbnywki39kp01x20pmg41jl2r0qhw7s31q4qaxyrv"; }; packageRequires = [ compat ]; meta = { @@ -3418,10 +3570,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.7"; + version = "1.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.3.7.tar"; - sha256 = "15ikzdqyh77cgx94jaigfrrzfvwvpca8s2120gi82i9aaiypr7jl"; + url = "https://elpa.gnu.org/packages/flymake-1.4.1.tar"; + sha256 = "0l20gxzlvpl0d3wvvsam3mda5hdlag4anplx3fd4xksbvfhndzlk"; }; packageRequires = [ eldoc @@ -3433,6 +3585,27 @@ }; } ) { }; + flymake-clippy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flymake-clippy"; + ename = "flymake-clippy"; + version = "1.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/flymake-clippy-1.1.0.tar"; + sha256 = "1sij8qn7q9jvjnnnqqm152hnvkw079m66pwjyhvsqdqivqjvlnrd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-clippy.html"; + license = lib.licenses.free; + }; + } + ) { }; flymake-codespell = callPackage ( { compat, @@ -3485,10 +3658,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fontaine-3.0.0.tar"; - sha256 = "1v2gwry755m3gj6gxrxgcbvw39sdgrmazpw09nkayrvx9ar5fszw"; + url = "https://elpa.gnu.org/packages/fontaine-3.0.1.tar"; + sha256 = "0bgfg6pkw724id1d3igiw4g0204wnjwsbnabfy2rq6nrf99z1qwr"; }; packageRequires = [ ]; meta = { @@ -3725,10 +3898,10 @@ elpaBuild { pname = "gnome-dark-style"; ename = "gnome-dark-style"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnome-dark-style-0.2.2.tar"; - sha256 = "1vf0ka0xg8mvaq3s3b8rgsdv77q7qd73k9mqfvyk7ywhxj7zdb9i"; + url = "https://elpa.gnu.org/packages/gnome-dark-style-0.2.3.tar"; + sha256 = "04cp31252svf5pkkkmx9b6nlcv3v4xffn739bna77jjyrw98mhv5"; }; packageRequires = [ ]; meta = { @@ -4000,10 +4173,10 @@ elpaBuild { pname = "gtags-mode"; ename = "gtags-mode"; - version = "1.8.2"; + version = "1.8.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gtags-mode-1.8.2.tar"; - sha256 = "1lmaaqlklsifjzagi3miplr17vmzqjzglbkxccffj50mi6y5w4cs"; + url = "https://elpa.gnu.org/packages/gtags-mode-1.8.5.tar"; + sha256 = "0pia7ivd11hw9ngdghvcbrapndkpq5ra0jx566f7vgrdxxl73ynm"; }; packageRequires = [ ]; meta = { @@ -4164,6 +4337,28 @@ }; } ) { }; + hugoista = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "hugoista"; + ename = "hugoista"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/hugoista-0.2.1.tar"; + sha256 = "02rv1r2xr6dhkfqwgbrrsdajxv6inbny5biimkb0qcf3i8b43dih"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hugoista.html"; + license = lib.licenses.free; + }; + } + ) { }; hydra = callPackage ( { cl-lib ? null, @@ -4263,10 +4458,10 @@ elpaBuild { pname = "indent-bars"; ename = "indent-bars"; - version = "0.8.2"; + version = "0.8.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/indent-bars-0.8.2.tar"; - sha256 = "1bhdrykkklsscgiz3p29x8kdkw0kbc4mlpnhxghvphx159clhgym"; + url = "https://elpa.gnu.org/packages/indent-bars-0.8.4.tar"; + sha256 = "0k674rzl32zzqgkix6924987rb09bs7f3blakqybvzi59cpz9afz"; }; packageRequires = [ compat ]; meta = { @@ -4369,10 +4564,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.15.0"; + version = "0.15.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.15.0.tar"; - sha256 = "13kikgvrhi2b6dg0py4n51kc881dv7bll71iaxq1bjlzdwvsn20h"; + url = "https://elpa.gnu.org/packages/ivy-0.15.1.tar"; + sha256 = "12ni3n8h7316hv4nrx4kbjah58n8zdxkf1v8fi0w39da1aqn3r0p"; }; packageRequires = [ ]; meta = { @@ -4392,10 +4587,10 @@ elpaBuild { pname = "ivy-avy"; ename = "ivy-avy"; - version = "0.15.0"; + version = "0.15.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-avy-0.15.0.tar"; - sha256 = "0xqykxvsm7q81744qj4w7ma83v6s9a4wx4flywqch4dn7liaiqwj"; + url = "https://elpa.gnu.org/packages/ivy-avy-0.15.1.tar"; + sha256 = "0csysx22sf3bbfh000c2m48rzfn274km0zxbfbcx2871haskwva1"; }; packageRequires = [ avy @@ -4440,10 +4635,10 @@ elpaBuild { pname = "ivy-hydra"; ename = "ivy-hydra"; - version = "0.15.0"; + version = "0.15.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-hydra-0.15.0.tar"; - sha256 = "1crznifig71l6h4zjsr39d2w02blw7vla1vafv0yhhj6ryd4030g"; + url = "https://elpa.gnu.org/packages/ivy-hydra-0.15.1.tar"; + sha256 = "16z3ic50zbx9iaw0w6fv04cxpl6qz81424jdian1br1942pz3kdy"; }; packageRequires = [ hydra @@ -4576,10 +4771,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "2.0"; + version = "2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jinx-2.0.tar"; - sha256 = "1haix1q4rfz18m4bblp4k4gqjd9jbwg9j9zl411b8s2ga268pdkk"; + url = "https://elpa.gnu.org/packages/jinx-2.1.tar"; + sha256 = "1v4a00bgs6qcpim861kky1i2w0qfn2hza9vj0inn7lh1sic82rkm"; }; packageRequires = [ compat ]; meta = { @@ -5003,10 +5198,10 @@ elpaBuild { pname = "literate-scratch"; ename = "literate-scratch"; - version = "1.0"; + version = "2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/literate-scratch-1.0.tar"; - sha256 = "1rby70wfj6g0p4hc6xqzwgqj2g8780qm5mnjn95bl2wrvdi0ds6n"; + url = "https://elpa.gnu.org/packages/literate-scratch-2.2.tar"; + sha256 = "01n27aps7dkydqda89xblmhc82g8y6dkmbhxgfav13vw2ns2r7sc"; }; packageRequires = [ ]; meta = { @@ -5027,10 +5222,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.24.1"; + version = "0.25.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.24.1.tar"; - sha256 = "1vy62pg8hdakw0zbyl1fb8bvbhl2w36z683gbhjb71ikl3bqnav8"; + url = "https://elpa.gnu.org/packages/llm-0.25.0.tar"; + sha256 = "0ykzx0g6w3b9hlxyx41rkbj2n5pjkpf3y0jqiwl012j7zxg1ay6w"; }; packageRequires = [ plz @@ -5264,10 +5459,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.8"; + version = "2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-1.8.tar"; - sha256 = "0q8mflfsl4vj2r2m47jgm5hrg3a4k5pildb53vlgm5k9wb4sd7md"; + url = "https://elpa.gnu.org/packages/marginalia-2.0.tar"; + sha256 = "1qklwzz0swd96vdqymbm91y6h53id6ch1lr1dpdwmz6qknwamrlc"; }; packageRequires = [ compat ]; meta = { @@ -5530,6 +5725,32 @@ }; } ) { }; + minuet = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + plz, + }: + elpaBuild { + pname = "minuet"; + ename = "minuet"; + version = "0.5.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/minuet-0.5.4.tar"; + sha256 = "01mw4sqb7rp9zpxjm590a9qvxiyawwhjyq3k568gv30pj3a9lrxp"; + }; + packageRequires = [ + dash + plz + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/minuet.html"; + license = lib.licenses.free; + }; + } + ) { }; mmm-mode = callPackage ( { cl-lib ? null, @@ -5561,10 +5782,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-4.6.0.tar"; - sha256 = "19hg2gqpa19rnlj0pn7v8sd52q5mkinf39l7rb0a6xqbkfzqvsnd"; + url = "https://elpa.gnu.org/packages/modus-themes-4.7.0.tar"; + sha256 = "1p0lfcc897dxf9f3ylnym1ird4j90sgy2i34yvmbr22ii2pc47sw"; }; packageRequires = [ ]; meta = { @@ -5582,10 +5803,10 @@ elpaBuild { pname = "mpdired"; ename = "mpdired"; - version = "2"; + version = "3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mpdired-2.tar"; - sha256 = "0synpanyqka8nyz9mma69na307vm5pjvn21znbdvz56gka2mbg23"; + url = "https://elpa.gnu.org/packages/mpdired-3.tar"; + sha256 = "19qkg7cjh037l4cw3q0b52hpp3fwmly6alc7z683baiz5fklcjc8"; }; packageRequires = [ ]; meta = { @@ -5989,10 +6210,10 @@ elpaBuild { pname = "ob-asymptote"; ename = "ob-asymptote"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.1.tar"; - sha256 = "0f1vpq691pna1p1lgqw2nzmdw25sjsmpcvgm2lj7n14kg7dizxal"; + url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.2.tar"; + sha256 = "0b9glzj3aq39rksb0bg4qvsnqknwjk7lbixapw9695hfr2l4hv02"; }; packageRequires = [ ]; meta = { @@ -6118,10 +6339,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orderless-1.3.tar"; - sha256 = "1gh2xw34adk5q6v9sz42j5mwyjjp1yix70jvjylnapwsjjsjm5qk"; + url = "https://elpa.gnu.org/packages/orderless-1.4.tar"; + sha256 = "151df7azrhyxaa768bp6mxmc44mmc4h1x180s2a9ns4b3lsfczrv"; }; packageRequires = [ compat ]; meta = { @@ -6139,10 +6360,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7.25"; + version = "9.7.30"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.7.25.tar"; - sha256 = "0isa5mqsmnyw874kh980kal4r45h6qdzizg186lvczmhdqir85bm"; + url = "https://elpa.gnu.org/packages/org-9.7.30.tar"; + sha256 = "1886c5aw050iwqh7k3grp73ghdr70y20nfbpxgcwbzwkhkz2w9xy"; }; packageRequires = [ ]; meta = { @@ -6434,10 +6655,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-1.6.tar"; - sha256 = "09fybkkcjn0c55w0accxgv2581kf3s2nhcn3wvny2zfpysijpw13"; + url = "https://elpa.gnu.org/packages/osm-1.7.tar"; + sha256 = "1iqg0cjqq2fzrimzgxqa7jsvhzajycl4nq1c7fsr3pd5yjp8d4z8"; }; packageRequires = [ compat ]; meta = { @@ -6562,10 +6783,10 @@ elpaBuild { pname = "parser-generator"; ename = "parser-generator"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/parser-generator-0.2.4.tar"; - sha256 = "01b5bwh484fpicv0g2z64694pjkhrcqz9f8jpq6hk41kzhvr23m1"; + url = "https://elpa.gnu.org/packages/parser-generator-0.2.5.tar"; + sha256 = "1bfvhqwv3qapqvl35v6ac1nsl1p9fwzja02vdqif3sdyr30ps340"; }; packageRequires = [ ]; meta = { @@ -6689,10 +6910,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.50"; + version = "0.4.51"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.50.tar"; - sha256 = "1dyxqkyik6cxmqnwmxlxd1v42jcnkh0hl1qqm65nhvmf3ksq59kh"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.51.tar"; + sha256 = "1qiy16gh24sh274sasshxb230r2r2bx1b7awr9php854840p7pvx"; }; packageRequires = [ ]; meta = { @@ -6753,10 +6974,10 @@ elpaBuild { pname = "plz-event-source"; ename = "plz-event-source"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/plz-event-source-0.1.2.tar"; - sha256 = "1gq0w6pkg58066gwc58y3j0w2hbfzmy1r62j02jfiqjb5am1gfjk"; + url = "https://elpa.gnu.org/packages/plz-event-source-0.1.3.tar"; + sha256 = "1ayi272pvbblynrxhh51adq34jdjp6j2wfzwry7ysq0fz8vxs7nj"; }; packageRequires = [ plz-media-type ]; meta = { @@ -6775,10 +6996,10 @@ elpaBuild { pname = "plz-media-type"; ename = "plz-media-type"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/plz-media-type-0.2.3.tar"; - sha256 = "1qb0zag7isnl9hx71jma5yk6rinfdbscmlgwg2489067vshf9x7b"; + url = "https://elpa.gnu.org/packages/plz-media-type-0.2.4.tar"; + sha256 = "1gsq86zb3bsasryafhgxbln2sy1w722iz61pd6fi4j6xszb5pb32"; }; packageRequires = [ plz ]; meta = { @@ -7901,10 +8122,10 @@ elpaBuild { pname = "show-font"; ename = "show-font"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/show-font-0.2.1.tar"; - sha256 = "1nbmzbf6gqzllv025xdbrqpq1j7prmv8vh86h9abaikjradiysmx"; + url = "https://elpa.gnu.org/packages/show-font-0.3.0.tar"; + sha256 = "1xrpzrb1i3593fawqy6bgfjn0fixgpnkq0kad14fk8qibh9iwb0x"; }; packageRequires = [ ]; meta = { @@ -8178,10 +8399,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/spacious-padding-0.6.0.tar"; - sha256 = "0czx4w6vm56blvc26gymmijvcqhvmrlakqwlks1prckgnkgsvcpx"; + url = "https://elpa.gnu.org/packages/spacious-padding-0.6.1.tar"; + sha256 = "0g5f8hagv494773mdzaajmccjzzqgd2ixv2rmwwhjgwck910zwqg"; }; packageRequires = [ ]; meta = { @@ -8503,10 +8724,10 @@ elpaBuild { pname = "swiper"; ename = "swiper"; - version = "0.15.0"; + version = "0.15.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/swiper-0.15.0.tar"; - sha256 = "16vznhb8zqzqvg3i2pkwfani2h19dm08aj7qv334mlyj97rv1ppn"; + url = "https://elpa.gnu.org/packages/swiper-0.15.1.tar"; + sha256 = "0m70jgcdsbrj6i5b1srrdgzkwavzi098532fv6vi2051nl42snvz"; }; packageRequires = [ ivy ]; meta = { @@ -8701,10 +8922,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tempel-1.3.tar"; - sha256 = "0fivsldisk17a1vbzx91kmvsd85vl0dnih77pqnzriyqs8dl1wdm"; + url = "https://elpa.gnu.org/packages/tempel-1.4.tar"; + sha256 = "0gh573np15wdy7vd0zj92ivslaga7kalmnkdjlfiw5pamyy5xsl4"; }; packageRequires = [ compat ]; meta = { @@ -8765,10 +8986,10 @@ elpaBuild { pname = "tex-parens"; ename = "tex-parens"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tex-parens-0.6.tar"; - sha256 = "0pgzs0fw2ijns2xqbyq7whlhjjrhp0axja0381q9v75c7fxrp6ba"; + url = "https://elpa.gnu.org/packages/tex-parens-0.7.tar"; + sha256 = "1h3l4kn154mmzxgz6s7y2qrkpqk4ava3j1iwx07gsgnr5pcpgvfr"; }; packageRequires = [ ]; meta = { @@ -8843,7 +9064,6 @@ ) { }; tmr = callPackage ( { - compat, elpaBuild, fetchurl, lib, @@ -8851,12 +9071,12 @@ elpaBuild { pname = "tmr"; ename = "tmr"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tmr-1.0.0.tar"; - sha256 = "02dj5kh8ayhfy1w9vy77s7izz4495n4jkcbw6xscc8wyfml0j15f"; + url = "https://elpa.gnu.org/packages/tmr-1.1.0.tar"; + sha256 = "1bvysr05007qgzy2z6rxhhxpaq4b648icfmnj6qf8ydn8b5ih5kw"; }; - packageRequires = [ compat ]; + packageRequires = [ ]; meta = { homepage = "https://elpa.gnu.org/packages/tmr.html"; license = lib.licenses.free; @@ -8940,10 +9160,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.7.2.2"; + version = "2.7.2.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.7.2.2.tar"; - sha256 = "0nq441hdr9akpdklplnf4hcza4jgj4vq2718mvf2iznbqqs4b33k"; + url = "https://elpa.gnu.org/packages/tramp-2.7.2.3.1.tar"; + sha256 = "171jmgb9sdj1iqq6a77kxin15yik952vvavhpvdr0wxhdq095mgg"; }; packageRequires = [ ]; meta = { @@ -9026,10 +9246,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.8.5"; + version = "0.8.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.8.5.tar"; - sha256 = "0ydxddlf9aniindgi135rj3c1d1ar5qi5kwh1qkdff9124d6f0kh"; + url = "https://elpa.gnu.org/packages/transient-0.8.8.tar"; + sha256 = "0rirggilwk42ha9lykfca6ma4l1pn0wwkvdh2njviaksidy7jasi"; }; packageRequires = [ compat @@ -9120,10 +9340,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/triples-0.5.0.tar"; - sha256 = "0s2p5zkgp1xavib3yrjwkbyqy6clgafz7ywy65kharapx0cjl4nm"; + url = "https://elpa.gnu.org/packages/triples-0.6.0.tar"; + sha256 = "12qf91ldgkwgkwj3a5g68qy4sbmrqmxq4qcgcnygj570ipjv49q8"; }; packageRequires = [ seq ]; meta = { @@ -9466,6 +9686,28 @@ }; } ) { }; + vc-jj = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vc-jj"; + ename = "vc-jj"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vc-jj-0.2.tar"; + sha256 = "19yhv1jgix49pvclf42xx23fh2zbr32q51664a99dncn8jhy7bdy"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-jj.html"; + license = lib.licenses.free; + }; + } + ) { }; vcard = callPackage ( { elpaBuild, @@ -9561,10 +9803,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "2.0"; + version = "2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-2.0.tar"; - sha256 = "1x34vsrr812wlawb5wy5aq81467xsjxjz0zsjsxq121d4pzam4z3"; + url = "https://elpa.gnu.org/packages/vertico-2.1.tar"; + sha256 = "03xkl8df90gs26cy00qbk0w23192bkaj32fgaf1w3ajq7mdvfd6p"; }; packageRequires = [ compat ]; meta = { @@ -9692,10 +9934,10 @@ elpaBuild { pname = "vundo"; ename = "vundo"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vundo-2.3.0.tar"; - sha256 = "165y277fi0vp9301hy3pqgfnf160k29n8vri0zyq8a3vz3f8lqrl"; + url = "https://elpa.gnu.org/packages/vundo-2.4.0.tar"; + sha256 = "1aj2l6iivgv6mh3rvrj8w8jhznx7cywn5f2b2ivl4hmrxlfbgsjr"; }; packageRequires = [ ]; meta = { @@ -10036,10 +10278,10 @@ elpaBuild { pname = "xeft"; ename = "xeft"; - version = "3.3"; + version = "3.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xeft-3.3.tar"; - sha256 = "00zkhqajkkf979ccbnz076dpav2v52q44li2m4m4c6p3z0c3y255"; + url = "https://elpa.gnu.org/packages/xeft-3.6.tar"; + sha256 = "0vdnl0rp9bkl5gyyacqczbl41vl8hrvah51jbfx4szf4qldmfhsm"; }; packageRequires = [ ]; meta = { @@ -10190,10 +10432,10 @@ elpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/yasnippet-0.14.1.tar"; - sha256 = "0xsq0i9xv9hib5a52rv5vywq1v6gr44gjsyfmqxwffmw1a25x25g"; + url = "https://elpa.gnu.org/packages/yasnippet-0.14.2.tar"; + sha256 = "0cq31r58vxh660bws26yhpnjz89yr5f2ldjw1q5a1gp3hbzd2130"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix index 86109b57a2ac..dd3a6ce44680 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -4,48 +4,36 @@ editorconfig, f, fetchFromGitHub, - replaceVars, + jsonrpc, nodejs, s, melpaBuild, - copilot-node-server, + copilot-language-server-fhs, }: -let - # The Emacs package isn't compatible with the latest - # copilot-node-server so we have to set a specific revision - # https://github.com/copilot-emacs/copilot.el/issues/344 - pinned-copilot-node-server = copilot-node-server.overrideAttrs (old: rec { - version = "1.27.0"; - src = fetchFromGitHub { - owner = "jfcherng"; - repo = "copilot-node-server"; - rev = version; - hash = "sha256-Ds2agoO7LBXI2M1dwvifQyYJ3F9fm9eV2Kmm7WITgyo="; - }; - }); -in -melpaBuild { +melpaBuild (finalAttrs: { pname = "copilot"; - version = "0-unstable-2024-12-28"; + version = "0.2.0"; src = fetchFromGitHub { owner = "copilot-emacs"; repo = "copilot.el"; - rev = "c5dfa99f05878db5e6a6a378dc7ed09f11e803d4"; - sha256 = "sha256-FzI08AW7a7AleEM7kSQ8LsWsDYID8SW1SmSN6/mIB/A="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-hIA+qdWoOJI9/hqBUSHhmh+jjzDnPiZkIzszCPuQxd0="; }; files = ''(:defaults "dist")''; - patches = [ - (replaceVars ./specify-copilot-install-dir.patch { - copilot-node-server = pinned-copilot-node-server; - }) - ]; + postPatch = '' + substituteInPlace copilot.el \ + --replace-fail "defcustom copilot-server-executable \"copilot-language-server\"" \ + "defcustom copilot-server-executable \"${lib.getExe copilot-language-server-fhs}\"" + ''; + packageRequires = [ dash editorconfig f + jsonrpc s ]; @@ -64,4 +52,4 @@ melpaBuild { "x86_64-windows" ]; }; -} +}) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/specify-copilot-install-dir.patch b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/specify-copilot-install-dir.patch deleted file mode 100644 index c10f19133cac..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/specify-copilot-install-dir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/copilot.el b/copilot.el -index f1f5e51..ddf2b5b 100644 ---- a/copilot.el -+++ b/copilot.el -@@ -132,8 +132,7 @@ (defcustom copilot-indentation-alist - (defconst copilot-server-package-name "copilot-node-server" - "The name of the package to install copilot server.") - --(defcustom copilot-install-dir (expand-file-name -- (locate-user-emacs-file (f-join ".cache" "copilot"))) -+(defcustom copilot-install-dir "@copilot-node-server@" - "Directory in which the servers will be installed." - :risky t - :type 'directory diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 54f265d66fe8..e3ef4bd8e9c1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -810,12 +810,6 @@ let osx-dictionary = if pkgs.stdenv.hostPlatform.isDarwin then super.osx-dictionary.overrideAttrs (old: { - buildInputs = - old.buildInputs - ++ (with pkgs.darwin.apple_sdk.frameworks; [ - CoreServices - Foundation - ]); postBuild = (old.postBuild or "") + '' @@ -1045,6 +1039,8 @@ let # depends on distel which is not on any ELPA https://github.com/massemanet/distel/issues/21 company-distel = ignoreCompilationError super.company-distel; + company-forge = buildWithGit super.company-forge; + # qmltypes-table.el causing native-compiler-error-empty-byte company-qml = ignoreCompilationError super.company-qml; @@ -1248,6 +1244,8 @@ let fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error + forge-llm = buildWithGit super.forge-llm; + frontside-javascript = super.frontside-javascript.overrideAttrs ( finalAttrs: previousAttrs: { # https://github.com/melpa/melpa/pull/9182 diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix index 2c4833c44564..f81ad8e37ac3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix @@ -42,6 +42,34 @@ }; } ) { }; + aidermacs = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + markdown-mode, + transient, + }: + elpaBuild { + pname = "aidermacs"; + ename = "aidermacs"; + version = "1.3.0.20250515.132734"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.3.0.20250515.132734.tar"; + sha256 = "010sxd4k7xqkpf2jyyffrkxkgn1cq6wq0mkmmh56xpj3mrrxchyp"; + }; + packageRequires = [ + compat + markdown-mode + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/aidermacs.html"; + license = lib.licenses.free; + }; + } + ) { }; alect-themes = callPackage ( { elpaBuild, @@ -93,10 +121,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "2.3.0.0.20250306.133745"; + version = "2.4.2.0.20250515.142850"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.3.0.0.20250306.133745.tar"; - sha256 = "14p1yaxzns3zmi0d799fn76pca3d0ayl5v73bdssr0fq6rq04q5a"; + url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.4.2.0.20250515.142850.tar"; + sha256 = "0g30jcpb44vdb43msn93w8j4f2zk0zm7n3l2ghndvm31qc3qr1k8"; }; packageRequires = [ ]; meta = { @@ -156,10 +184,10 @@ elpaBuild { pname = "apache-mode"; ename = "apache-mode"; - version = "2.2.0.0.20240327.1751"; + version = "2.2.0.0.20250422.172352"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/apache-mode-2.2.0.0.20240327.1751.tar"; - sha256 = "0yr3m1340327skxln7z2acns6kingaid4wryi9lyfv05fwhfgl5a"; + url = "https://elpa.nongnu.org/nongnu-devel/apache-mode-2.2.0.0.20250422.172352.tar"; + sha256 = "1gqjb98d1wihfryacdyjivsxidydilb6glgivf39l8ca2xk44dbg"; }; packageRequires = [ ]; meta = { @@ -242,10 +270,10 @@ elpaBuild { pname = "autothemer"; ename = "autothemer"; - version = "0.2.18.0.20230907.60046"; + version = "0.2.18.0.20250421.72550"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/autothemer-0.2.18.0.20230907.60046.tar"; - sha256 = "0qay7d5z0p91kzpbp140daqyiclsksql6cnp0bn1602n4f3dn4ii"; + url = "https://elpa.nongnu.org/nongnu-devel/autothemer-0.2.18.0.20250421.72550.tar"; + sha256 = "0y6k0ysy4z7am8zapp1gynr3rjm9vwggi8syc1a19niaqvzm80c4"; }; packageRequires = [ dash ]; meta = { @@ -263,10 +291,10 @@ elpaBuild { pname = "base32"; ename = "base32"; - version = "1.0.0.20250312.191912"; + version = "1.0.0.20250312.200047"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/base32-1.0.0.20250312.191912.tar"; - sha256 = "1aglwd9mm2c53nqm7j6hrh02mag9gg5x5yc25jmaajqy9qrbh54n"; + url = "https://elpa.nongnu.org/nongnu-devel/base32-1.0.0.20250312.200047.tar"; + sha256 = "0l6mshnk25iadh1wymdxzfx4g5pvlh4q1hr1x9xfg5xbimiwfkki"; }; packageRequires = [ ]; meta = { @@ -284,10 +312,10 @@ elpaBuild { pname = "bash-completion"; ename = "bash-completion"; - version = "3.2.1snapshot0.20250101.145820"; + version = "3.2.1snapshot0.20250425.222123"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.2.1snapshot0.20250101.145820.tar"; - sha256 = "11a2fijxi102mnm63vbxgrrw2rr9nf5rhlfal3766m8rv2drwhd7"; + url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.2.1snapshot0.20250425.222123.tar"; + sha256 = "0a9z0r6sj5jyyqhmai5cfkc147aprqzy6kmbix2n3kwnn95vbqkq"; }; packageRequires = [ ]; meta = { @@ -410,10 +438,10 @@ elpaBuild { pname = "blueprint-ts-mode"; ename = "blueprint-ts-mode"; - version = "0.0.3.0.20231031.183012"; + version = "0.0.3.0.20250510.181219"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/blueprint-ts-mode-0.0.3.0.20231031.183012.tar"; - sha256 = "1pa2a2r54pn7lmkgmwrc2lxvnabjbjlqs8rgkmqrfgnq1gkrm6rh"; + url = "https://elpa.nongnu.org/nongnu-devel/blueprint-ts-mode-0.0.3.0.20250510.181219.tar"; + sha256 = "0vz3ds7pm31gkckhhqy69k051x3gl7d1i143q1jb6k1xqvgiz6h4"; }; packageRequires = [ ]; meta = { @@ -544,10 +572,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.18.0snapshot0.20250305.132250"; + version = "1.18.0.0.20250512.132717"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/cider-1.18.0snapshot0.20250305.132250.tar"; - sha256 = "09a7kin91dmhhbyzvlalijiyjnzal2mqjcqbmrzq6nm1lswdrzvx"; + url = "https://elpa.nongnu.org/nongnu-devel/cider-1.18.0.0.20250512.132717.tar"; + sha256 = "0xg81szscjzi8acq96frknpsqqpqwy4lrjs0xjd96smfdz22l47c"; }; packageRequires = [ clojure-mode @@ -573,10 +601,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.20.0snapshot0.20241211.152233"; + version = "5.20.0snapshot0.20250406.154328"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0snapshot0.20241211.152233.tar"; - sha256 = "0m6bafwl3687ccl815q70bw4q8k3w12vkfl24g5x9rn6dn44ppxx"; + url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0snapshot0.20250406.154328.tar"; + sha256 = "16m89nva2wrin5pbn3iskv43clc9vmvvzc3m2ldyy2vl08lkzbbd"; }; packageRequires = [ ]; meta = { @@ -594,10 +622,10 @@ elpaBuild { pname = "clojure-ts-mode"; ename = "clojure-ts-mode"; - version = "0.2.4snapshot0.20250310.123844"; + version = "0.4.0.0.20250516.71256"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.4snapshot0.20250310.123844.tar"; - sha256 = "0nnw6bwcca9nxwhg3a1m25c8n2s4x6frkmi1j7x0dlxiy5hj8ddb"; + url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.4.0.0.20250516.71256.tar"; + sha256 = "1r8r0ym20qc791svcz560m2ir0p4siid7q98y7mn23yfw9kakz81"; }; packageRequires = [ ]; meta = { @@ -638,10 +666,10 @@ elpaBuild { pname = "consult-flycheck"; ename = "consult-flycheck"; - version = "1.0.0.20250101.91433"; + version = "1.0.0.20250512.155519"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20250101.91433.tar"; - sha256 = "05ms0zhswsdlvvrz71md4nsqisshar284xn7idw7z01ddd05rjmb"; + url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20250512.155519.tar"; + sha256 = "09zzr69iais44669bm52ciw3jh55zi98z3kc0nr1v2h656z5yaq4"; }; packageRequires = [ consult @@ -688,10 +716,10 @@ elpaBuild { pname = "crux"; ename = "crux"; - version = "0.6.0snapshot0.20250212.201746"; + version = "0.6.0snapshot0.20250421.93605"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/crux-0.6.0snapshot0.20250212.201746.tar"; - sha256 = "1apz9kfs416l9r47wkbw1a6wpysxn1fvyywpkfwfb4r7j9dlmsdm"; + url = "https://elpa.nongnu.org/nongnu-devel/crux-0.6.0snapshot0.20250421.93605.tar"; + sha256 = "1kzscg15rb237q0y9brl9xbb5z5ygfq6malzhr3axlx2r20xgdi4"; }; packageRequires = [ ]; meta = { @@ -710,10 +738,10 @@ elpaBuild { pname = "csv2ledger"; ename = "csv2ledger"; - version = "1.5.4.0.20250204.233740"; + version = "1.5.4.0.20250417.171625"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/csv2ledger-1.5.4.0.20250204.233740.tar"; - sha256 = "1rx1k7fzlnlxn8crjm21qnq57g5p31zlk6z6zf883sakc2jwal7f"; + url = "https://elpa.nongnu.org/nongnu-devel/csv2ledger-1.5.4.0.20250417.171625.tar"; + sha256 = "1m72znfi5hd9pwavc99g8amxwc0jdyly7gsww2aq0fw4q971kiaf"; }; packageRequires = [ csv-mode ]; meta = { @@ -753,10 +781,10 @@ elpaBuild { pname = "cycle-at-point"; ename = "cycle-at-point"; - version = "0.2.0.20240422.30057"; + version = "0.2.0.20250421.105916"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/cycle-at-point-0.2.0.20240422.30057.tar"; - sha256 = "18nlbg8jwdgvi56qgbvqs0z8yfj9nkw30da45d7anjaln6a8089j"; + url = "https://elpa.nongnu.org/nongnu-devel/cycle-at-point-0.2.0.20250421.105916.tar"; + sha256 = "1k8wx7lvdv6194l1367a3z15qbgx8ypipqwrk99wbq1hjiwqs07q"; }; packageRequires = [ recomplete ]; meta = { @@ -795,10 +823,10 @@ elpaBuild { pname = "dart-mode"; ename = "dart-mode"; - version = "1.0.7.0.20250224.120240"; + version = "1.0.7.0.20250422.170214"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dart-mode-1.0.7.0.20250224.120240.tar"; - sha256 = "0jc4snbk62fi2ksnca8cp7m3jc7xr0yaap9p9hjjv72h1hnnl1rl"; + url = "https://elpa.nongnu.org/nongnu-devel/dart-mode-1.0.7.0.20250422.170214.tar"; + sha256 = "1q0znwlbg9adgp2nis1mzyxn281ddh3jyjwqan7mr116qxjsrxcv"; }; packageRequires = [ ]; meta = { @@ -902,10 +930,10 @@ elpaBuild { pname = "diff-ansi"; ename = "diff-ansi"; - version = "0.2.0.20250224.222628"; + version = "0.2.0.20250408.234444"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20250224.222628.tar"; - sha256 = "03qqmcn0lni4sb0vz25sjspq64f1b2a0nkvy7bfyifsjn8an1kqs"; + url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20250408.234444.tar"; + sha256 = "1wkja7733l5kwj4j2jlfa9c9607059asyvap6xdihqqd1ic1l3w5"; }; packageRequires = [ ]; meta = { @@ -916,6 +944,7 @@ ) { }; dirvish = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -923,12 +952,12 @@ elpaBuild { pname = "dirvish"; ename = "dirvish"; - version = "2.2.7.0.20250312.165153"; + version = "2.3.0.0.20250504.80741"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.2.7.0.20250312.165153.tar"; - sha256 = "1k6y9simcqfszyq5s0vb41s6pjmr9pd3djbnjdk5vvqhqyphig21"; + url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.3.0.0.20250504.80741.tar"; + sha256 = "0h8ap8bnqy2czvgkc71l49ms3kwk8lciz0ydzi2yy5xgh5pvs71k"; }; - packageRequires = [ ]; + packageRequires = [ compat ]; meta = { homepage = "https://elpa.nongnu.org/nongnu-devel/dirvish.html"; license = lib.licenses.free; @@ -965,10 +994,10 @@ elpaBuild { pname = "dockerfile-mode"; ename = "dockerfile-mode"; - version = "1.9.0.20250225.102722"; + version = "1.9.0.20250315.102635"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode-1.9.0.20250225.102722.tar"; - sha256 = "1mmylgvlmx7cdppfsi28hnf2s3v6qnpk5ii2r2qjbyj7vnbnk97g"; + url = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode-1.9.0.20250315.102635.tar"; + sha256 = "057drkn59pq5m68900lxy2nzsf3qnqhc6vglx8zl4yc32vhqa2w4"; }; packageRequires = [ ]; meta = { @@ -986,10 +1015,10 @@ elpaBuild { pname = "dracula-theme"; ename = "dracula-theme"; - version = "1.8.2.0.20241217.214522"; + version = "1.8.2.0.20250407.120528"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20241217.214522.tar"; - sha256 = "0dizqwzgygkim66lxkxpwcidhhi7ppwazi57nqkahyd3n03ka2f9"; + url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20250407.120528.tar"; + sha256 = "04xy1glqxzildh9rbl529mlsvabx5bzwdd8gd12cki5lgx320fn5"; }; packageRequires = [ ]; meta = { @@ -1093,10 +1122,10 @@ elpaBuild { pname = "editorconfig"; ename = "editorconfig"; - version = "0.11.0.0.20250219.152840"; + version = "0.11.0.0.20250426.231051"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20250219.152840.tar"; - sha256 = "1dhb67w0hjh59hbkscw7xs4l5sizdip0xif2s11yx1nxzk86aw8w"; + url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20250426.231051.tar"; + sha256 = "18l7z7qzwyb93pmlmwvp3lbka0i23afs95ql5j5wa9y0nggyxhnp"; }; packageRequires = [ ]; meta = { @@ -1114,10 +1143,10 @@ elpaBuild { pname = "eglot-inactive-regions"; ename = "eglot-inactive-regions"; - version = "0.6.3.0.20250313.74527"; + version = "0.6.5.0.20250326.53650"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/eglot-inactive-regions-0.6.3.0.20250313.74527.tar"; - sha256 = "1vrrngpbfi9gbkx9bn2fqznr8wg8m9msdj438nsysl8175ai0c1d"; + url = "https://elpa.nongnu.org/nongnu-devel/eglot-inactive-regions-0.6.5.0.20250326.53650.tar"; + sha256 = "0xj16f49mjm1i3zdd6cpd9sjir6dwvh3s3lqs6fpp0sknpj0i5in"; }; packageRequires = [ ]; meta = { @@ -1198,10 +1227,10 @@ elpaBuild { pname = "emacsql"; ename = "emacsql"; - version = "4.2.0.0.20250301.163737"; + version = "4.3.0.0.20250509.141847"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.2.0.0.20250301.163737.tar"; - sha256 = "1rzxgfykrckxw6sbgw71dd99s8rnz0jjjpddsf8rsy7ialjzw4w4"; + url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.3.0.0.20250509.141847.tar"; + sha256 = "140mzggvkfjgfx52q4zahbbskcqcbv6vxpw7k9ky9hawr30gbq0a"; }; packageRequires = [ ]; meta = { @@ -1243,10 +1272,10 @@ elpaBuild { pname = "evil"; ename = "evil"; - version = "1.15.0.0.20250302.65539"; + version = "1.15.0.0.20250318.181600"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20250302.65539.tar"; - sha256 = "0xvdcvqimz2vk6hibip8cgn6jxgibxial6awl46vxq4b8g6bbply"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20250318.181600.tar"; + sha256 = "0qbz4gpiychd57370kpj73zcqdjl1gap80zjs4896smyj1pbr9c4"; }; packageRequires = [ cl-lib @@ -1270,10 +1299,10 @@ elpaBuild { pname = "evil-anzu"; ename = "evil-anzu"; - version = "0.2.0.20220911.193944"; + version = "0.2.0.20250316.121704"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-anzu-0.2.0.20220911.193944.tar"; - sha256 = "0ap13nrpcjm9q7pia8jy544sc08gc44bgyqi7yvkh2yk8cw96g8m"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-anzu-0.2.0.20250316.121704.tar"; + sha256 = "0wr47dx4axy2xvnn1y354scvwka2mh8z9kgdclgnfvnhhdqzi2h0"; }; packageRequires = [ anzu @@ -1694,10 +1723,10 @@ elpaBuild { pname = "flycheck"; ename = "flycheck"; - version = "35.0snapshot0.20250226.154115"; + version = "35.0.0.20250424.133949"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20250226.154115.tar"; - sha256 = "1sxlipzvh0sr057zydh1pqdnx6ginh0yrfycbv1ps3bwvpc7g8a5"; + url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0.0.20250424.133949.tar"; + sha256 = "1k54zvcrl3wms2bsza44h56kxbwjqpaym4p70a6dxxw3ac60jlfq"; }; packageRequires = [ ]; meta = { @@ -1831,10 +1860,10 @@ elpaBuild { pname = "free-keys"; ename = "free-keys"; - version = "1.0.0.20211116.150106"; + version = "1.0.0.20250512.152751"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/free-keys-1.0.0.20211116.150106.tar"; - sha256 = "08z5w5xxaz577lnwfmvrbh7485rbra7rl6b77m54vjxi24m75jhv"; + url = "https://elpa.nongnu.org/nongnu-devel/free-keys-1.0.0.20250512.152751.tar"; + sha256 = "0nf29341jhwbpiqqzfi66yn9gw8m7y8cnd6afb0bixci1hnhaz1n"; }; packageRequires = [ cl-lib ]; meta = { @@ -2150,10 +2179,10 @@ elpaBuild { pname = "git-modes"; ename = "git-modes"; - version = "1.4.4.0.20240805.132007"; + version = "1.4.4.0.20250509.145352"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/git-modes-1.4.4.0.20240805.132007.tar"; - sha256 = "0gbgjdk6gi1898nbxj2wbiifbmld42v4s2zsckgqv4r5pxdwc6ai"; + url = "https://elpa.nongnu.org/nongnu-devel/git-modes-1.4.4.0.20250509.145352.tar"; + sha256 = "11ylk079n4zhly3pp3a5b1d7h454dxhwf859r7rvj6njxkc1vwa8"; }; packageRequires = [ compat ]; meta = { @@ -2348,10 +2377,10 @@ elpaBuild { pname = "gptel"; ename = "gptel"; - version = "0.9.7.0.20250312.185844"; + version = "0.9.8.0.20250515.225537"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.7.0.20250312.185844.tar"; - sha256 = "16jrv9aw5h40vfwhv2wmlgngbzgbi68pianx6flfx6fzmlsdxpww"; + url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.8.0.20250515.225537.tar"; + sha256 = "0wcy7qq8d1pnpjf6fqwcff8r4gbl08azlayyxabqsakgr3498p5d"; }; packageRequires = [ compat @@ -2479,10 +2508,10 @@ elpaBuild { pname = "haskell-mode"; ename = "haskell-mode"; - version = "17.5.0.20250305.134904"; + version = "17.5.0.20250401.174200"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250305.134904.tar"; - sha256 = "10pn6b4hml8wzzliynlag1fr7lnc526gzbfqbhs3kzh6qx5rf8zn"; + url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250401.174200.tar"; + sha256 = "1dxfwd4yhwzy59d55hnz0z23dg5vh1fzkrpicdaz93m9yvfzy1aa"; }; packageRequires = [ ]; meta = { @@ -2522,10 +2551,10 @@ elpaBuild { pname = "haskell-ts-mode"; ename = "haskell-ts-mode"; - version = "1.0.20250202.61612"; + version = "1.1.4.0.20250516.134138"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20250202.61612.tar"; - sha256 = "1i3is0js2sjr61bd7w1jz05a9gl4aj5b0ivar5iq1l0kmnhq7w54"; + url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.1.4.0.20250516.134138.tar"; + sha256 = "15d4bc5i7p7r9psqdaljyvhxvzlwigzy8sb4iv0wxhbv7wwgwv37"; }; packageRequires = [ ]; meta = { @@ -2545,10 +2574,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "4.0.2.0.20250228.64018"; + version = "4.0.3.0.20250515.54814"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.2.0.20250228.64018.tar"; - sha256 = "1mjgc22vp68wk1klq7f5i74pqr5wmwb53cc81n04zi6jynv2rimm"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.3.0.20250515.54814.tar"; + sha256 = "0q6scri31v9pjbjkf8sf969aqal228yx66hsahb77gcpvfx0ribg"; }; packageRequires = [ helm-core @@ -2570,10 +2599,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "4.0.2.0.20250228.64018"; + version = "4.0.3.0.20250515.54814"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.2.0.20250228.64018.tar"; - sha256 = "1i7f8n4gk7fppxdlylm1hwp8ab2dqpg9h30ppv46nzp6bp0fywyw"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.3.0.20250515.54814.tar"; + sha256 = "0f66yi42zqccv8i7mlqclvy6c3a5xqc58j54lc4qqr826wmmizbf"; }; packageRequires = [ async ]; meta = { @@ -2703,10 +2732,10 @@ elpaBuild { pname = "hyperdrive"; ename = "hyperdrive"; - version = "0.6pre0.20241222.235250"; + version = "0.6pre0.20250406.152517"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.6pre0.20241222.235250.tar"; - sha256 = "0a9z9kbnlzbv21w62zyw3mpbvjfnl5vhjmlpq65w7cc4d1qd2jp5"; + url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.6pre0.20250406.152517.tar"; + sha256 = "190cj2hflahfg592w6g9h24m5pa62dn7jc38lrf5qabgpbrk5ksb"; }; packageRequires = [ compat @@ -2781,10 +2810,10 @@ elpaBuild { pname = "idris-mode"; ename = "idris-mode"; - version = "1.1.0.0.20240704.133442"; + version = "1.1.0.0.20250424.90824"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/idris-mode-1.1.0.0.20240704.133442.tar"; - sha256 = "0rbgv5gkm6q3a6l8yqmgn3mn6ic9jr1w80vrl4gvkfpklwys9y5f"; + url = "https://elpa.nongnu.org/nongnu-devel/idris-mode-1.1.0.0.20250424.90824.tar"; + sha256 = "0zs0z9p7c1xbsy0fw0q03x9z42d5ac37k4f2aljir0c62r5mckxl"; }; packageRequires = [ cl-lib @@ -2979,10 +3008,10 @@ elpaBuild { pname = "julia-mode"; ename = "julia-mode"; - version = "1.0.2.0.20241213.162017"; + version = "1.0.2.0.20250428.81943"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.0.2.0.20241213.162017.tar"; - sha256 = "09l2awhz4362g03qnpsy4813afjabm2dqh8g3ma354k7ql8rr95h"; + url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.0.2.0.20250428.81943.tar"; + sha256 = "05sx6pwwrvxwrpd1fskhqnr8yvzav7yafk7im5iscxic061xggpv"; }; packageRequires = [ ]; meta = { @@ -3001,10 +3030,10 @@ elpaBuild { pname = "keycast"; ename = "keycast"; - version = "1.4.2.0.20250301.164536"; + version = "1.4.3.0.20250509.122154"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/keycast-1.4.2.0.20250301.164536.tar"; - sha256 = "1zipc2baxzx5ima0r34q9d8v9bfw3a41hv2423gbx8036ndq3h2g"; + url = "https://elpa.nongnu.org/nongnu-devel/keycast-1.4.3.0.20250509.122154.tar"; + sha256 = "07gxsn77m6h6831mk4y8v10yxqzbamvcn9yysfy4hh0iywzqnx4b"; }; packageRequires = [ compat ]; meta = { @@ -3044,10 +3073,10 @@ elpaBuild { pname = "llama"; ename = "llama"; - version = "0.6.1.0.20250312.142844"; + version = "0.6.2.0.20250509.122131"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/llama-0.6.1.0.20250312.142844.tar"; - sha256 = "099m6knzf6rh4r9x6f285mimg8i7znrays1bsi1y22hvik5mmgl2"; + url = "https://elpa.nongnu.org/nongnu-devel/llama-0.6.2.0.20250509.122131.tar"; + sha256 = "0clbp1f4s98yzd7cw4yn4rmg06d6vfj5ik3kx92i57n58za73cdp"; }; packageRequires = [ compat ]; meta = { @@ -3068,10 +3097,10 @@ elpaBuild { pname = "logview"; ename = "logview"; - version = "0.19.3snapshot0.20250306.133154"; + version = "0.19.3snapshot0.20250401.172309"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/logview-0.19.3snapshot0.20250306.133154.tar"; - sha256 = "0lkjp8y7f3npvbd63c2n7jfplp63qschbpq0ngqjs7q6254yfk9i"; + url = "https://elpa.nongnu.org/nongnu-devel/logview-0.19.3snapshot0.20250401.172309.tar"; + sha256 = "0vr34ixpidz1lp6y87axlvi0pac11lfkm5g0d310wphihnjmyssr"; }; packageRequires = [ compat @@ -3223,10 +3252,10 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.3.1.0.20250312.143226"; + version = "4.3.2.0.20250401.175331"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-4.3.1.0.20250312.143226.tar"; - sha256 = "0mba1qf1z6dsbhrzl7d4rz8f6xbqqlwrxa16dbi9gl5ibaf4kx0p"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-4.3.2.0.20250401.175331.tar"; + sha256 = "1way4hifyj0p5ly2p84as1amivv67qr22ph292rgwizrj0d5j60y"; }; packageRequires = [ compat @@ -3254,10 +3283,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.3.1.0.20250312.143226"; + version = "4.3.2.0.20250401.175331"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.3.1.0.20250312.143226.tar"; - sha256 = "1s9dz5bayf852bdmd656zdzsch5w2jj687hnbpbmb2zbj050r45g"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.3.2.0.20250401.175331.tar"; + sha256 = "1wif3d5vb04f39g38w2nbamqcbb89ivh2w5b0w362k3pk0vq2a70"; }; packageRequires = [ compat @@ -3279,10 +3308,10 @@ elpaBuild { pname = "markdown-mode"; ename = "markdown-mode"; - version = "2.8alpha0.20250310.105434"; + version = "2.8alpha0.20250501.55146"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.8alpha0.20250310.105434.tar"; - sha256 = "1hs8kaw22r9fskh6pwchv1343k3phcfk1a1zdk41wvvc622pl11m"; + url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.8alpha0.20250501.55146.tar"; + sha256 = "14fij3h882brdixrw516hhcim9rmkjp2wbxf75rcmgnfvhfq4vx7"; }; packageRequires = [ ]; meta = { @@ -3297,20 +3326,18 @@ fetchurl, lib, persist, - request, tp, }: elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.1.12.0.20250305.210452"; + version = "2.0.0.0.20250330.151927"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.1.12.0.20250305.210452.tar"; - sha256 = "1dnii6hwxjbprm9cskah40vk41hgnbnvxnjykf8hssf2d5g1qsg3"; + url = "https://elpa.nongnu.org/nongnu-devel/mastodon-2.0.0.0.20250330.151927.tar"; + sha256 = "16xfvaacilfd075nln38hijzmx1wr30gmibrksn6zhfl6mj0lhnk"; }; packageRequires = [ persist - request tp ]; meta = { @@ -3379,10 +3406,10 @@ elpaBuild { pname = "meow"; ename = "meow"; - version = "1.5.0.0.20250216.181716"; + version = "1.5.0.0.20250404.143236"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250216.181716.tar"; - sha256 = "0cmn4v9xzw42k98i17mbzh0vd2llw4cf79di2camgkc8gf07g01r"; + url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250404.143236.tar"; + sha256 = "098ca9ypmm5q2wviarqbcabz971ngf53lv8k1idnsvw8n34a0h83"; }; packageRequires = [ ]; meta = { @@ -3506,10 +3533,10 @@ elpaBuild { pname = "nasm-mode"; ename = "nasm-mode"; - version = "1.1.1.0.20240610.150504"; + version = "1.1.1.0.20250320.164627"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/nasm-mode-1.1.1.0.20240610.150504.tar"; - sha256 = "1kkv7r6j02472d6c91xsrg9qlfvl70iyi538w2mh3s2adfkh7ps9"; + url = "https://elpa.nongnu.org/nongnu-devel/nasm-mode-1.1.1.0.20250320.164627.tar"; + sha256 = "0dm1zg15q18v9y4mx2p8hdqvql4dikw8chkj3i3jb1jp9d0v2rf3"; }; packageRequires = [ ]; meta = { @@ -3617,10 +3644,10 @@ elpaBuild { pname = "org-auto-tangle"; ename = "org-auto-tangle"; - version = "0.6.0.0.20230201.195019"; + version = "0.6.0.0.20250429.50000"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/org-auto-tangle-0.6.0.0.20230201.195019.tar"; - sha256 = "1895wp7fajpz4mddp4qr136h30rp3ashn3zdb6zdrb2qfa275rri"; + url = "https://elpa.nongnu.org/nongnu-devel/org-auto-tangle-0.6.0.0.20250429.50000.tar"; + sha256 = "0sbvkj1b8ibjq95ahhbw9qp488da3s3v5m4dfp6l8p4hdlz0xi4h"; }; packageRequires = [ async ]; meta = { @@ -3689,10 +3716,10 @@ elpaBuild { pname = "org-journal"; ename = "org-journal"; - version = "2.2.0.0.20250306.142904"; + version = "2.2.0.0.20250425.93636"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/org-journal-2.2.0.0.20250306.142904.tar"; - sha256 = "1bknrir6g0zw24plizf5gdaa76navb5p913l83zba64m67mi0bwg"; + url = "https://elpa.nongnu.org/nongnu-devel/org-journal-2.2.0.0.20250425.93636.tar"; + sha256 = "0si4zircvmqkh1rk46gs102w0a6kaqx1jc5pr5zk90bgah54jy8f"; }; packageRequires = [ org ]; meta = { @@ -3710,10 +3737,10 @@ elpaBuild { pname = "org-mime"; ename = "org-mime"; - version = "0.3.4.0.20241001.42820"; + version = "0.3.4.0.20250318.215555"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.4.0.20241001.42820.tar"; - sha256 = "1xcdk15z18s073q3hlg7dck8p5ssgap35a6m0f6cbmd5dbd3r05f"; + url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.4.0.20250318.215555.tar"; + sha256 = "0plqmcyszpc1x35v691zlgxmnbga80yxxcjyb5mvxdri45z4458d"; }; packageRequires = [ ]; meta = { @@ -3825,10 +3852,10 @@ elpaBuild { pname = "orgit"; ename = "orgit"; - version = "2.0.1.0.20250301.233925"; + version = "2.0.2.0.20250509.121824"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.0.1.0.20250301.233925.tar"; - sha256 = "0adppm61dn3cfkgdyc5ik42z0byvyc2dkwhjdzvw66nnl3fjb3ch"; + url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.0.2.0.20250509.121824.tar"; + sha256 = "0spqa4zm3k4dnnkns9p9fbji2qryrzlf272a64lhc2l4p5kl5s5d"; }; packageRequires = [ compat @@ -3872,10 +3899,10 @@ elpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "0.25.0.20250307.91203"; + version = "0.26.0.20250418.142545"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.25.0.20250307.91203.tar"; - sha256 = "11yx2k7bsyi4ql8jhyz36s0pcxr0d6ssnnv7w128qfy9k0bklnr7"; + url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.26.0.20250418.142545.tar"; + sha256 = "0qpsyimq3i6p8s03ax2grnzn474ngmx2lcvsvf5db6fryhw9qxj3"; }; packageRequires = [ let-alist ]; meta = { @@ -4072,10 +4099,10 @@ elpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.26.1.0.20250224.145951"; + version = "1.26.1.0.20250422.172013"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20250224.145951.tar"; - sha256 = "0fcfm286x9q8cgqagw4d1n512g2g0bcllwyn2b591fam9nfzx800"; + url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20250422.172013.tar"; + sha256 = "1d2ahw3vd7r9ylwb5cm5rjdd70cvfp7zy82rkx1ix2ddamfmbqya"; }; packageRequires = [ ]; meta = { @@ -4114,10 +4141,10 @@ elpaBuild { pname = "popup"; ename = "popup"; - version = "0.5.9.0.20250224.15605"; + version = "0.5.9.0.20250422.161227"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/popup-0.5.9.0.20250224.15605.tar"; - sha256 = "11l0k9lrh7jhjshag9mclq5qa8vmll98vqf08837svlgpf0nwc4z"; + url = "https://elpa.nongnu.org/nongnu-devel/popup-0.5.9.0.20250422.161227.tar"; + sha256 = "0rj578i7l0hcmb3apch5ld05habq1iw3f3fazlax0n6r85g6phmy"; }; packageRequires = [ ]; meta = { @@ -4135,10 +4162,10 @@ elpaBuild { pname = "projectile"; ename = "projectile"; - version = "2.9.1.0.20250312.165928"; + version = "2.9.1.0.20250402.71553"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.1.0.20250312.165928.tar"; - sha256 = "0wqgzph6vkgq55h5669l0rxqjxz7chbzrrjxb16r6pisxnw4b2dd"; + url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.1.0.20250402.71553.tar"; + sha256 = "0cnidaysnma7bvzzw5vbkggy3z9zq51zlg4k2kd5b1f8dagjlzv7"; }; packageRequires = [ ]; meta = { @@ -4156,10 +4183,10 @@ elpaBuild { pname = "proof-general"; ename = "proof-general"; - version = "4.6snapshot0.20250129.125602"; + version = "4.6snapshot0.20250516.91308"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20250129.125602.tar"; - sha256 = "1w7s5sdxa05m80nicykqagk5y50q76gmr86ivwl09sibmwb6c9kh"; + url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20250516.91308.tar"; + sha256 = "0fkl0zm8wm6snp0baab0hbabzsli7jw8pq13kzvng2mj8djsm8l2"; }; packageRequires = [ ]; meta = { @@ -4192,6 +4219,7 @@ ) { }; racket-mode = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -4199,12 +4227,12 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20250212.102351"; + version = "1.0.20250514.102731"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250212.102351.tar"; - sha256 = "1byfpwv7nk4ncqd1cx3qphs37xllmw8mx9gdxd86l66qr1hyp22j"; + url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250514.102731.tar"; + sha256 = "1da7v2w83kn7q07nb3pili3hsiymxa9h2l7nhf7y8sskq8j1sscc"; }; - packageRequires = [ ]; + packageRequires = [ compat ]; meta = { homepage = "https://elpa.nongnu.org/nongnu-devel/racket-mode.html"; license = lib.licenses.free; @@ -4304,10 +4332,10 @@ elpaBuild { pname = "reformatter"; ename = "reformatter"; - version = "0.8.0.20241204.105138"; + version = "0.8.0.20250324.192239"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20241204.105138.tar"; - sha256 = "1j78naw4jikh7nby67gdbx9banchmf1q5fysal1328gxnyqknmzi"; + url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20250324.192239.tar"; + sha256 = "0kg01an6pf9laaqqdh4h09y508k94l85xjqb038dg9whv2bf0h3a"; }; packageRequires = [ ]; meta = { @@ -4358,6 +4386,27 @@ }; } ) { }; + rpm-spec-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rpm-spec-mode"; + ename = "rpm-spec-mode"; + version = "0.16.0.20250329.13938"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode-0.16.0.20250329.13938.tar"; + sha256 = "1gmqnv1ckypns7aiz4w5kb3l8m66bfxlw8z19i3ag5im8rlpc9lp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; rubocop = callPackage ( { elpaBuild, @@ -4388,10 +4437,10 @@ elpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "1.0.6.0.20250225.10231"; + version = "1.0.6.0.20250423.1515"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20250225.10231.tar"; - sha256 = "1j25kqpwrg898zgs21vad5zzh6i54g48lxgzc2rb8wmifd2zd792"; + url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20250423.1515.tar"; + sha256 = "1vkbg2gg9i1lyz4g7zkqjrixh7867x8py7ay7pcq76srwn01hja3"; }; packageRequires = [ ]; meta = { @@ -4563,10 +4612,10 @@ elpaBuild { pname = "slime"; ename = "slime"; - version = "2.31snapshot0.20250310.203219"; + version = "2.31snapshot0.20250417.201511"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250310.203219.tar"; - sha256 = "0f9j1phl36xnjh4g1263nkfqnjc79jrk1c0yqawykhljal87xyka"; + url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250417.201511.tar"; + sha256 = "0pbm04m0wzr63vs45xs624xgkjskpcvprwgizqmh84bvqg6g4zvh"; }; packageRequires = [ macrostep ]; meta = { @@ -4584,10 +4633,10 @@ elpaBuild { pname = "sly"; ename = "sly"; - version = "1.0.43.0.20250203.154027"; + version = "1.0.43.0.20250501.191827"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20250203.154027.tar"; - sha256 = "1w1h6zh5r1b2q1m01jbw92x5mdnq7g97g282899crqzfbirj4xds"; + url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20250501.191827.tar"; + sha256 = "026z57k7bg8brvgi8pngdxrb0djski7ryj9mlrzbjwr1r5z5c1z4"; }; packageRequires = [ ]; meta = { @@ -4606,10 +4655,10 @@ elpaBuild { pname = "smartparens"; ename = "smartparens"; - version = "1.11.0.0.20241220.125445"; + version = "1.11.0.0.20250511.235418"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/smartparens-1.11.0.0.20241220.125445.tar"; - sha256 = "0ww5m3cj78abbpfrshbszgs21mnd6pfcpwrbnqz81a4qk37q3nny"; + url = "https://elpa.nongnu.org/nongnu-devel/smartparens-1.11.0.0.20250511.235418.tar"; + sha256 = "0ah3jlc4s90xziccf0s2kvbl4cildhf2li572pryps7zh1bn319f"; }; packageRequires = [ dash ]; meta = { @@ -4775,10 +4824,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.27.6.0.20241107.191437"; + version = "0.27.6.0.20250430.125630"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.6.0.20241107.191437.tar"; - sha256 = "0y543svzd7sqqb2izlflvmv0mdyfwwzjgli107ra89w5jl6jxawh"; + url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.6.0.20250430.125630.tar"; + sha256 = "172vzsbiy1xy08isxwn10cqzwh0vbcivj390qhnyzcmw1ncd22hx"; }; packageRequires = [ compat ]; meta = { @@ -4797,10 +4846,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "9.2.0.0.20250111.53952"; + version = "9.3.0.0.20250412.62413"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.2.0.0.20250111.53952.tar"; - sha256 = "0xv6ia7nsk1bq9ybmqlckl8qy3p0cjnxfb2zkd7lr2sal476gnlx"; + url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.3.0.0.20250412.62413.tar"; + sha256 = "0mgjswp1ldqcwicgxa3rr6nv8g2yi6pgqlxi9m2pvzihy9x70b53"; }; packageRequires = [ seq ]; meta = { @@ -5059,10 +5108,10 @@ elpaBuild { pname = "treesit-fold"; ename = "treesit-fold"; - version = "0.2.1.0.20250305.214142"; + version = "0.2.1.0.20250422.155540"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20250305.214142.tar"; - sha256 = "1h3ymlcimrvgm62k2w05xf53fk8n80n3pxz9f4lm6nwpjn8ns8ll"; + url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20250422.155540.tar"; + sha256 = "02svdk7sas6xy2acqsm2d0qmafxp16qhb2p8n2mchg6aa3yldk9b"; }; packageRequires = [ ]; meta = { @@ -5144,10 +5193,10 @@ elpaBuild { pname = "typst-ts-mode"; ename = "typst-ts-mode"; - version = "0.11.0.0.20250221.91757"; + version = "0.12.0.0.20250424.101629"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.11.0.0.20250221.91757.tar"; - sha256 = "0829ah70ib1q0va6f18xlbh13laa1cn196i8xa3jji4ljmcxkfyj"; + url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.12.0.0.20250424.101629.tar"; + sha256 = "1yjiw5l6ni7rvp2ggfhf6jgiqpgb466sq6wwcsm0rqnmvs6y2jdz"; }; packageRequires = [ ]; meta = { @@ -5270,10 +5319,10 @@ elpaBuild { pname = "visual-fill-column"; ename = "visual-fill-column"; - version = "2.6.3.0.20250204.233635"; + version = "2.6.3.0.20250505.230743"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.6.3.0.20250204.233635.tar"; - sha256 = "0516ccjk21bkfdv24mp59xb9pdzc4hwnz4cfyfg0xnrd1kiihggq"; + url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.6.3.0.20250505.230743.tar"; + sha256 = "1cl39911k73cz5qbllyy82jw7hhbd6dly3s4p0kfnmav461b3qcp"; }; packageRequires = [ ]; meta = { @@ -5293,10 +5342,10 @@ elpaBuild { pname = "vm"; ename = "vm"; - version = "8.3.0snapshot0.20250208.60553"; + version = "8.3.0snapshot0.20250504.193215"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20250208.60553.tar"; - sha256 = "0d2m9q8zwpd2i0zvcmkasp59ihsymmqyg8c0a1wp72akffxh3if1"; + url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20250504.193215.tar"; + sha256 = "0r64xnwzhx3h3yw6jac9x357rpbh2scg1zdzbg4aihj4r8d1x6lx"; }; packageRequires = [ cl-lib @@ -5428,10 +5477,10 @@ elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.4.3.0.20241201.141907"; + version = "3.4.3.0.20250509.145538"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.3.0.20241201.141907.tar"; - sha256 = "1srqg86809lb1b0dj421gb6n522cx19snhvhvxb4nxkk98afiywp"; + url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.3.0.20250509.145538.tar"; + sha256 = "1chrmrlxx61q1n2kqghka8vq2mj7rnk2slx8rfp7nkcsja4b6nz7"; }; packageRequires = [ compat ]; meta = { @@ -5538,10 +5587,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "26.10.20250308091402.0.20250308.122854"; + version = "26.12.20250503115607.0.20250503.115753"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.10.20250308091402.0.20250308.122854.tar"; - sha256 = "0c0afwkjp8p445qs2rfg7n9gs842bq46di95q10ab9s8qcg4j7d8"; + url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.12.20250503115607.0.20250503.115753.tar"; + sha256 = "1vn45rxy14ij4w7iswcwlkgvgjnjbgana2v2a34k71xn392gsf32"; }; packageRequires = [ ]; meta = { @@ -5624,10 +5673,10 @@ elpaBuild { pname = "yasnippet-snippets"; ename = "yasnippet-snippets"; - version = "1.0.0.20250225.95035"; + version = "1.0.0.20250507.200229"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20250225.95035.tar"; - sha256 = "1cmf2vg50lhbkcq5wrzgcc8h5idwdywg42dnizv3dbsvv4h5kcpl"; + url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20250507.200229.tar"; + sha256 = "0nq70rc7kgm8ldgja0gyza99xljpcg4qqhfwn1qa7y1rvbvbbgk0"; }; packageRequires = [ yasnippet ]; meta = { @@ -5667,10 +5716,10 @@ elpaBuild { pname = "zig-mode"; ename = "zig-mode"; - version = "0.0.8.0.20250305.223352"; + version = "0.0.8.0.20250426.144319"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20250305.223352.tar"; - sha256 = "1hdmvsnfvqb0ngx3kzv7855c9bmn30bk2zc4nizh98abdh1gk02g"; + url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20250426.144319.tar"; + sha256 = "1aaaarlbn15qmhmq7kxyh7c931h3x2cmxs7cf4c5j7n7qbzjna4w"; }; packageRequires = [ reformatter ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 78ad55af8236..27cf0a8118b4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -42,6 +42,34 @@ }; } ) { }; + aidermacs = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + markdown-mode, + transient, + }: + elpaBuild { + pname = "aidermacs"; + ename = "aidermacs"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/aidermacs-1.3.tar"; + sha256 = "03s08h5xp57l228gn9lay4a7h19zk6wyn777r2icsn1a1ii63l82"; + }; + packageRequires = [ + compat + markdown-mode + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/aidermacs.html"; + license = lib.licenses.free; + }; + } + ) { }; alect-themes = callPackage ( { elpaBuild, @@ -93,10 +121,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-2.3.0.tar"; - sha256 = "0l5pw9z4i1mlf346dg7brha37jmlrq6pyvjdj2mxhdfs6nzddaba"; + url = "https://elpa.nongnu.org/nongnu/annotate-2.4.2.tar"; + sha256 = "12510awgjx14kcz88a66walybvxqf7whbb0gckxj1dxsn0r1spfa"; }; packageRequires = [ ]; meta = { @@ -544,10 +572,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.17.1"; + version = "1.18.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.17.1.tar"; - sha256 = "0h708n6yz4v50843rp5wan9g35zd4f91nia5lryzmdqskah1yrcg"; + url = "https://elpa.nongnu.org/nongnu/cider-1.18.0.tar"; + sha256 = "15k2klm84x0jsglbc398fg9y83xkw6dbcn1jkg0zpw886j32dhxr"; }; packageRequires = [ clojure-mode @@ -594,10 +622,10 @@ elpaBuild { pname = "clojure-ts-mode"; ename = "clojure-ts-mode"; - version = "0.2.3"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.3.tar"; - sha256 = "1gk48s87cryr3xvrjw9l0mv3yb1w6h4xg8zn2wnz5qnrw8cdb1wv"; + url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.4.0.tar"; + sha256 = "177qqqr823mfbj0czm3y30c7bb2jb0cv2kd4799m8d283r77wkgg"; }; packageRequires = [ ]; meta = { @@ -939,6 +967,7 @@ ) { }; dirvish = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -946,12 +975,12 @@ elpaBuild { pname = "dirvish"; ename = "dirvish"; - version = "2.2.7"; + version = "2.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/dirvish-2.2.7.tar"; - sha256 = "1739ghnd6rig5rc0538l9xhm02ag79b33d26mhhrii60q42zkpqg"; + url = "https://elpa.nongnu.org/nongnu/dirvish-2.3.0.tar"; + sha256 = "0am64p4h08isz8al70zz3dchx43szgnl5qa6i81s3mf3bmw8vpn6"; }; - packageRequires = [ ]; + packageRequires = [ compat ]; meta = { homepage = "https://elpa.nongnu.org/nongnu/dirvish.html"; license = lib.licenses.free; @@ -1138,10 +1167,10 @@ elpaBuild { pname = "eglot-inactive-regions"; ename = "eglot-inactive-regions"; - version = "0.6.3"; + version = "0.6.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/eglot-inactive-regions-0.6.3.tar"; - sha256 = "03958dgr48zqak06qjqdz6qgfxn5rs60425qcvb7wdv2jb4400hc"; + url = "https://elpa.nongnu.org/nongnu/eglot-inactive-regions-0.6.5.tar"; + sha256 = "133wbmmzxfhzkjlm3sjllg3wl5r2dyprs2rmwi8r7nq3p831ak0n"; }; packageRequires = [ ]; meta = { @@ -1222,10 +1251,10 @@ elpaBuild { pname = "emacsql"; ename = "emacsql"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/emacsql-4.2.0.tar"; - sha256 = "03nxfdbha7apar6qhjg57pa4cawjjwswlkci2wm9044wps87734c"; + url = "https://elpa.nongnu.org/nongnu/emacsql-4.3.0.tar"; + sha256 = "18nr7fvrdhny59lmr7x3z48y7kjsmrrdwi659dsqjnnlxz0xcl11"; }; packageRequires = [ ]; meta = { @@ -1712,10 +1741,10 @@ elpaBuild { pname = "flycheck"; ename = "flycheck"; - version = "34.1"; + version = "35.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flycheck-34.1.tar"; - sha256 = "1jj1c4gq39ik8fihsz13wp4c26fm2m6kyr7ir22ql0d007zm3173"; + url = "https://elpa.nongnu.org/nongnu/flycheck-35.0.tar"; + sha256 = "1nrsnp5d2jfrg6k9qf55v9mlygkc3ln44j31qmirsp5ad5xrflhm"; }; packageRequires = [ ]; meta = { @@ -2365,10 +2394,10 @@ elpaBuild { pname = "gptel"; ename = "gptel"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gptel-0.9.7.tar"; - sha256 = "0sh8q80q620d6yr4437ddrjrzygd15iwkc9jvwh3pw9sncv2laqn"; + url = "https://elpa.nongnu.org/nongnu/gptel-0.9.8.tar"; + sha256 = "1rym3y1fcwfw9dh51nhw7v8rbap8ixysjlrv39v4hksfwv17gvbr"; }; packageRequires = [ compat @@ -2538,10 +2567,10 @@ elpaBuild { pname = "haskell-ts-mode"; ename = "haskell-ts-mode"; - version = "1"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/haskell-ts-mode-1.tar"; - sha256 = "16x2dr64f6s8837pl7dn7my3xpfc0x11p556r1ds5hwg0c82ikh4"; + url = "https://elpa.nongnu.org/nongnu/haskell-ts-mode-1.1.4.tar"; + sha256 = "1430hddrj9lkfxapxa5d13q800awqxhg84r87abmry9skn35jfs7"; }; packageRequires = [ ]; meta = { @@ -2561,10 +2590,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-4.0.2.tar"; - sha256 = "1gp0gfd5xr2nxis6ss41v5izh5cbgj9j2z2swkfjg0dqngfzl3xs"; + url = "https://elpa.nongnu.org/nongnu/helm-4.0.3.tar"; + sha256 = "0hha3fkdxm6k74a73259la62dis1xp475a8f9a2r1ivs6qblv6b9"; }; packageRequires = [ helm-core @@ -2586,10 +2615,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-4.0.2.tar"; - sha256 = "1mgc89k12lwivj453q3frcwzwag10wngy13jz6jxdl7135gsmywd"; + url = "https://elpa.nongnu.org/nongnu/helm-core-4.0.3.tar"; + sha256 = "16c9fv3xh1rr1fcayvbf09c5jd0xvajlg19b2kfc2z40sryy95ip"; }; packageRequires = [ async ]; meta = { @@ -3017,10 +3046,10 @@ elpaBuild { pname = "keycast"; ename = "keycast"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/keycast-1.4.2.tar"; - sha256 = "0lmqqpqib7gz12m9ckappf3rw8n8x0nridmsf4c48vbn2jh607hy"; + url = "https://elpa.nongnu.org/nongnu/keycast-1.4.3.tar"; + sha256 = "1d0n8jshjblrb7c5finjpnkdil96zbcy0696sqx4si9kak6j4k5i"; }; packageRequires = [ compat ]; meta = { @@ -3060,10 +3089,10 @@ elpaBuild { pname = "llama"; ename = "llama"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/llama-0.6.1.tar"; - sha256 = "0ri0pql710v6yrsnl5hv7xqax6ap1whk4xip9xx732a59fws60cg"; + url = "https://elpa.nongnu.org/nongnu/llama-0.6.2.tar"; + sha256 = "1adafy7klbx2h0pjrbl989czh7yf2m8gmk5s87c26ih01sjiwwwz"; }; packageRequires = [ compat ]; meta = { @@ -3239,10 +3268,10 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-4.3.1.tar"; - sha256 = "1wac8k466pmq79qvh70k7hfr1c5pyh2ignjsh4df46n08y2c67ys"; + url = "https://elpa.nongnu.org/nongnu/magit-4.3.2.tar"; + sha256 = "1pi69z1h5h6qlwmvwl2i2n5gcv9anp9zpgv9knqwrq8j2d5ialgr"; }; packageRequires = [ compat @@ -3270,10 +3299,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-section-4.3.1.tar"; - sha256 = "0rkr6lw1m4mc695k4pqpsfc5fnbp94pgl7j6y6c5f96d4dzvcx24"; + url = "https://elpa.nongnu.org/nongnu/magit-section-4.3.2.tar"; + sha256 = "0dnmwciz26wrsmp48h9axmj6qjgzhz9i7g3bvlpsq3i8y32xwdf6"; }; packageRequires = [ compat @@ -3313,20 +3342,18 @@ fetchurl, lib, persist, - request, tp, }: elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.1.12"; + version = "2.0.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/mastodon-1.1.12.tar"; - sha256 = "1yad0f5qbz3q0h3g4ckmzjha6y1ql954h0p19ibi8rl1kqb6f574"; + url = "https://elpa.nongnu.org/nongnu/mastodon-2.0.0.tar"; + sha256 = "0zn1hr36bm1hqsa78q78c5qqwlwg4l23sqsds4gi8nmkcq7yrjlz"; }; packageRequires = [ persist - request tp ]; meta = { @@ -3848,10 +3875,10 @@ elpaBuild { pname = "orgit"; ename = "orgit"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/orgit-2.0.1.tar"; - sha256 = "0fisk3gkqlkndkv185xffxn75msd26wsv77m0m0a25fr6xlvn2hn"; + url = "https://elpa.nongnu.org/nongnu/orgit-2.0.2.tar"; + sha256 = "1sad3vhmlld60c9lx8hv102d61ihq2ydzb8app97hbk4cs8m3q8j"; }; packageRequires = [ compat @@ -3895,10 +3922,10 @@ elpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "0.25"; + version = "0.26"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/package-lint-0.25.tar"; - sha256 = "0nagz2ynqg0vlh8sz1ss0g78j1qi3ni1x74gzbnk3i67wwkrld8k"; + url = "https://elpa.nongnu.org/nongnu/package-lint-0.26.tar"; + sha256 = "0sgqq19zvnlvf64ash2cig3n2avjrsjn107wfvm222sk2bm0ld1j"; }; packageRequires = [ let-alist ]; meta = { @@ -4215,6 +4242,7 @@ ) { }; racket-mode = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -4222,12 +4250,12 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20250212.102351"; + version = "1.0.20250514.102731"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250212.102351.tar"; - sha256 = "14c7y8n562x7dy03078db4xxvyvvxb5kkw9vgg1296xrcpj7mls2"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250514.102731.tar"; + sha256 = "0d5q08q3bm2ws0g0cys1xzjvznrqxhwxikjrkdri9js8y14z50l3"; }; - packageRequires = [ ]; + packageRequires = [ compat ]; meta = { homepage = "https://elpa.nongnu.org/nongnu/racket-mode.html"; license = lib.licenses.free; @@ -4381,6 +4409,27 @@ }; } ) { }; + rpm-spec-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rpm-spec-mode"; + ename = "rpm-spec-mode"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/rpm-spec-mode-0.16.tar"; + sha256 = "0gc50kn1wmvz6k9afra7zcnsk7z76cc50vkvw3q8i7p911z55rfj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/rpm-spec-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; rubocop = callPackage ( { elpaBuild, @@ -4815,10 +4864,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "9.2.0"; + version = "9.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-9.2.0.tar"; - sha256 = "1mnkwy7cglwrfln8hknbxyzg4z6zb6cmycl19acxslbgrviwh9j3"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-9.3.0.tar"; + sha256 = "04pp8hpqxibzcfyzrls1r18r6v3hyga4f39vxcdzn75lan4qgpqd"; }; packageRequires = [ seq ]; meta = { @@ -5184,10 +5233,10 @@ elpaBuild { pname = "typst-ts-mode"; ename = "typst-ts-mode"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/typst-ts-mode-0.11.0.tar"; - sha256 = "0waf2m5cypfpcbb5g39xf9z5ik84wx83178d8s4npspw1zfhmbh3"; + url = "https://elpa.nongnu.org/nongnu/typst-ts-mode-0.12.0.tar"; + sha256 = "1wks4jqh1bh4gr0m507dqa0a0mka21v10agqpsy7ws4k2sjsyp9h"; }; packageRequires = [ ]; meta = { @@ -5552,10 +5601,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "26.10.20250308091402"; + version = "26.12.20250503115607"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.10.20250308091402.tar"; - sha256 = "1rni5rjz7m4lxjcxhn2h4cds4d67hbd6c8hf731n6ygygarhjp9p"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.12.20250503115607.tar"; + sha256 = "1mh6rssi7g6dfl2glpivfixpdfk0kdlsbilszazmhzc6bh34blj5"; }; packageRequires = [ ]; 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 44e8c80f489b..a3a38ff0c828 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -517,37 +517,6 @@ "sha256": "1gpqxfc83p7gzjrhs95gimwg46v9pq58m81m0fhz6slk7i005mdl" } }, - { - "ename": "ac-emacs-eclim", - "commit": "1e9d3075587fbd9ca188535fd945a7dc451c6d7e", - "sha256": "0bkh7x6zj5drdvm9ji4vwqdxv7limd9a1idy8lsg0lcca3rjq3s5", - "fetcher": "github", - "repo": "emacs-eclim/emacs-eclim", - "unstable": { - "version": [ - 20180911, - 1121 - ], - "deps": [ - "auto-complete", - "eclim" - ], - "commit": "edff7e0e30c87036710d88fb0b7a4644750858e8", - "sha256": "0ywifqdhv7cibgl42m7i15widna9i1dk5kl5rglyql7hy05nk9gj" - }, - "stable": { - "version": [ - 0, - 4 - ], - "deps": [ - "auto-complete", - "eclim" - ], - "commit": "8203fbf8544e65324a948a67718f7a16ba2d52e6", - "sha256": "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3" - } - }, { "ename": "ac-emmet", "commit": "39861b4f0a458c8ccf02f7a3443c54b0e74daa11", @@ -1833,11 +1802,11 @@ "repo": "thierryvolpiatto/addressbook-bookmark", "unstable": { "version": [ - 20240422, - 1801 + 20250412, + 1903 ], - "commit": "a990a6d45a11c0e0dee57410d103fe20a4b00a6e", - "sha256": "1cjxpx15xgf68n9gb8j2w036nbb41g4k50ib31frgc7drlb89aw3" + "commit": "21f19e0f4c1b7d0932e4655db8df200e73cc2f6e", + "sha256": "1wfc26fyf7gvyzrgbqj4vrbq573q09n6hz239gbw6v7kfia0zkah" }, "stable": { "version": [ @@ -2246,6 +2215,42 @@ "sha256": "03xypgq6vy7819r42g23kgn7p775bc0v9blzhi0zp5c61p4cw8v3" } }, + { + "ename": "aider", + "commit": "940c15a73c1fe351cfb296da35c76a66f464a964", + "sha256": "0bkq4ag5zsbjs1ac4rvf2bz8pl0myfz4v43inj96lk0067rgi66b", + "fetcher": "github", + "repo": "tninja/aider.el", + "unstable": { + "version": [ + 20250514, + 1549 + ], + "deps": [ + "magit", + "markdown-mode", + "s", + "transient" + ], + "commit": "0b57024e1bb49e2329d8803e63454a6392499c31", + "sha256": "0wa9ivdbi8gc1cdhy9f8m8vrdc5d3n066gjvx0y5ysk4y175jc21" + }, + "stable": { + "version": [ + 0, + 9, + 0 + ], + "deps": [ + "magit", + "markdown-mode", + "s", + "transient" + ], + "commit": "a86111360cc9d1fd69c7082923feac67ce8743cd", + "sha256": "0r2axp6nx1wrc84z6mby4ixabwcq52n5q4lwfwllzgig85flx56x" + } + }, { "ename": "aidermacs", "commit": "145b2843183e9db03ac1dbd90747e82b2a58e89a", @@ -2254,11 +2259,29 @@ "repo": "MatthewZMD/aidermacs", "unstable": { "version": [ - 20250313, - 353 + 20250515, + 1727 ], - "commit": "58b3fc29f5046c195951a6315651fa0fc14511ae", - "sha256": "1w0c4sxi1q7lfdpsy7dk20xwchx4aypgxl4ygq58s459qhclaiyz" + "deps": [ + "compat", + "markdown-mode", + "transient" + ], + "commit": "e829b9e2964a41aa1b1754c44dd46031fb2d5d0d", + "sha256": "1842wh65b69zabm3vgqwbq9jacz9wnh6klmskk92dayxd6aqdb32" + }, + "stable": { + "version": [ + 1, + 3 + ], + "deps": [ + "compat", + "markdown-mode", + "transient" + ], + "commit": "9eef7a26e50669b5fea16ede7bbf9a11848dba4d", + "sha256": "15p10im3rv0yv33ygq4kzxrqakdq240mazxhj5sms6m361kgr83z" } }, { @@ -2316,14 +2339,14 @@ "repo": "AnthonyDiGirolamo/airline-themes", "unstable": { "version": [ - 20240530, - 1704 + 20250502, + 1915 ], "deps": [ "powerline" ], - "commit": "baaa4f1f0acd339b1efc1058654ea7d9e6e44ead", - "sha256": "0biyna1agxknsg2farj2bi0pnqqxkvdnicmnazl77kcxknhs0r9s" + "commit": "827a2dae106ecf1fb14793c43f13c4a6cd045c9a", + "sha256": "1cw5fa2l43jdhwaw68khjsmmhw87vh35c53y20j00v4085x3ssd8" }, "stable": { "version": [ @@ -2866,11 +2889,11 @@ "repo": "cryon/almost-mono-themes", "unstable": { "version": [ - 20220422, - 1714 + 20250515, + 743 ], - "commit": "0641bf565c113caef8d5c2a93f38cff32ebb62b7", - "sha256": "17r605k8zb30l1sl8zy5w753mvzdppqr9lbkidancasvp1p47rs7" + "commit": "5d70b6860aed9a2ef312bff4ff4101b12561e3de", + "sha256": "1h507l0nwi5w9zms3zhxiwhjfxdlcg5ffx5f9pvzf8d3l1cm49v4" } }, { @@ -3117,8 +3140,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20250310, - 1512 + 20250430, + 227 ], "deps": [ "dash", @@ -3126,8 +3149,8 @@ "pythonic", "s" ], - "commit": "28b3e0088ac7113390aa006bf277c8aa14e561a2", - "sha256": "068rf93nwymajj6l43rbfd0aslyjqp3bswsqkbf0yip87f9vc24h" + "commit": "ee1562c6b443be9208910c700e229824b2f1af7a", + "sha256": "11aqcqv00q8rbj872mr6ggz14wllhmya1llb2rgizqwayrdrrx01" }, "stable": { "version": [ @@ -3322,11 +3345,11 @@ "repo": "lujun9972/anki-connect.el", "unstable": { "version": [ - 20191123, - 1858 + 20250414, + 1301 ], - "commit": "1324f0c248aa2c6e73d6cf93fad6119d699f7dae", - "sha256": "055nzb0dki4fmgmfhq83x7gciyp74r36a233hnl9lyd8wmb2hvqf" + "commit": "e32e611d54a3819f88c5ff58009df70c9ae01934", + "sha256": "0hhvjrl2djkq4i16bmgyf8qj0r9bn4i956f3wg74fd8p5as18i2h" } }, { @@ -3452,11 +3475,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20250306, - 1337 + 20250515, + 1428 ], - "commit": "f29c91db0b0d4e4be0013bfa7222797b2114d2a9", - "sha256": "154v0bljcg2s188sbnnxm56pv3pjzgg51akxjca62s0swqzqh96b" + "commit": "dc6e884265c9de5b0e486b9f6bd9509a14b85c94", + "sha256": "07jbi3ripkmbsx51w57qiwi9pi2bd1a05rd627vg99avv9j00mj5" }, "stable": { "version": [ @@ -3491,11 +3514,11 @@ "repo": "agda/agda", "unstable": { "version": [ - 20200914, - 644 + 20250328, + 1043 ], - "commit": "aa5e3a127bf17a8c80d947f3c286758a36dadc36", - "sha256": "0nwriahnkyg1p0xn50c4h2bxg9idm6d9n8mfl7ddzm98j8gv1vwi" + "commit": "ad8ea74ccefd3507006a7ea9a7d9ff5b7a973603", + "sha256": "0qiqw69h9vpvwisqngkfdpfqibi5w5ddhxhwvbrv0ah2n29saswr" }, "stable": { "version": [ @@ -3623,26 +3646,26 @@ }, { "ename": "ansible-vault", - "commit": "6417ac9acf7f4835d3a36c16cbe12113e46b3d79", - "sha256": "0ihnknkn30rm29k7zpr3558g1njwjm9wmw7q83dvamxsna69nwc1", + "commit": "7a805888f316a6e7d9b3a2a9dbe1e69f420930af", + "sha256": "1rc362a02nhywkccfg5v2sl2p7n9kbw6s96ba76si4ahqfl0b9g5", "fetcher": "github", - "repo": "zellio/ansible-vault-mode", + "repo": "freehck/ansible-vault-mode", "unstable": { "version": [ - 20211119, - 1459 + 20250331, + 2155 ], - "commit": "9b3d82ee49d484a494f2d88927b37fcd6245d51e", - "sha256": "1382ks8nakanv864flk070haibk7841ygb3nm262i7414zqsyfrk" + "commit": "f0fab5d8d56e4c16f9fa85f22635cb0cec3637e1", + "sha256": "15imwyq8zm0s3ccycdrmwfqcb124lz7xrymjmvz67ynsvzh1lcmp" }, "stable": { "version": [ 0, 5, - 2 + 4 ], - "commit": "9b3d82ee49d484a494f2d88927b37fcd6245d51e", - "sha256": "1382ks8nakanv864flk070haibk7841ygb3nm262i7414zqsyfrk" + "commit": "206801defa0058da0ab6ed4d58daff0e3ededcb7", + "sha256": "0xi263bz2jf9fpbmn2n2vplrhxw49xrg8msg1fnxbr8bcl4612z8" } }, { @@ -3832,20 +3855,20 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20211023, - 1831 + 20250508, + 908 ], - "commit": "ba756eaa1d229c9bf6936fb8d2d4126ad073d488", - "sha256": "0vy6sf351i7q21bifi2s8rshkbq504dlwxx1cw1hc4xhpab24ivs" + "commit": "4883ab085811b85cc75c44b5af478ab8f7e98386", + "sha256": "18z0kicrl8hkgihy5w8pm7q5m0hik39p8z7x0p158paf7428hkqr" }, "stable": { "version": [ 20, - 5, + 6, 0 ], - "commit": "ee5f546f6659b9ca3c6895a1959087531b4a016a", - "sha256": "1qpqji2qx4srxk22684gh3sjj8sa87kd5fbr1xh8dscn19h5yvx9" + "commit": "9950b3092933adde85d613410432971071e33263", + "sha256": "0d5flyrcd1286rkfkdw5cqkbmvz2jhwp34i4drrhlx7lfczbn8ak" } }, { @@ -3871,19 +3894,20 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20250308, - 1920 + 20250514, + 109 ], - "commit": "2c8e8229cbe26c7fd264c2ffe3fbeb9435dad3ae", - "sha256": "1g69iiigcscfsa858apk3r7zc6wvjmrqli5n6v6j6fg293gg2696" + "commit": "82cbb665bc6a62de59e00aa76dcef29ef3a6c3a2", + "sha256": "06zbl4syvk05qh57mlzwyw9avyag26yirw99b9l3z0fxcmyn8l39" }, "stable": { "version": [ 4, - 4 + 4, + 1 ], - "commit": "d8ccc0ba0f127c11df39e79313a17bcb740359c0", - "sha256": "1dqx5wjmaxxl3xdj0kh2q157d4x9ygfwn4fschcw9vwm5jrcph51" + "commit": "82cbb665bc6a62de59e00aa76dcef29ef3a6c3a2", + "sha256": "06zbl4syvk05qh57mlzwyw9avyag26yirw99b9l3z0fxcmyn8l39" } }, { @@ -4158,11 +4182,11 @@ "repo": "motform/arduino-cli-mode", "unstable": { "version": [ - 20250303, - 1649 + 20250412, + 2204 ], - "commit": "4286110c98abb4f9d8397207735736dcf05475d7", - "sha256": "05vgrsms110qb027bkfx8hkc4cx2rhfrqii44w252spk8zjkcfnm" + "commit": "15c3e0a7fa766cbb05c7fc4cb3696c18353e1817", + "sha256": "1wvzim8anrxd34ynvp6v7qi0gq27wcp09xywcwfrkbc37f7lmjv2" } }, { @@ -4263,11 +4287,11 @@ "repo": "sachac/artbollocks-mode", "unstable": { "version": [ - 20170524, - 422 + 20250327, + 1744 ], - "commit": "4a907e470bf345b88c3802c1241ce2b8cf4123ee", - "sha256": "1l1dwhdfd5bwx92k84h5v47pv9my4p4wj0wq8hrwvwzwlv8dzn2w" + "commit": "1ef30f2cabaa2054e77d66eb7999381dde26eb18", + "sha256": "07b116cn3gv35pffxcfwn1nadxdh356j8w4n6pc42rvgxycjrxs4" }, "stable": { "version": [ @@ -4553,11 +4577,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20241126, - 810 + 20250325, + 509 ], - "commit": "b99658e831bc7e7d20ed4bb0a85bdb5c7dd74142", - "sha256": "19vszyfvbp3gh73yxq0wzqigfihgk8jzpp27ihirpy3v6kc3bkr7" + "commit": "bb3f31966ed65a76abe6fa4f80a960a2917f554e", + "sha256": "0qlfhilaa97kmcycms1ch5gqcn6i56xrkmm69x6175d2lq36lpq1" }, "stable": { "version": [ @@ -5108,20 +5132,20 @@ "repo": "vaartis/auth-source-kwallet", "unstable": { "version": [ - 20210605, - 1032 + 20250419, + 1330 ], - "commit": "57335d80876a526adb63a5ab57b83f55e8d79953", - "sha256": "0cz36ar7hkp6l2kqgmh348gimlnabz4fd2rc3lv2rmvafn6h669p" + "commit": "1e1bff2403966c3a0683ee65fb28cb8d8ff2c389", + "sha256": "0dv7s3s9hjq1k2lxgabblmplgvqm0fy49y94j2flljcygdnds74r" }, "stable": { "version": [ 0, 0, - 1 + 2 ], - "commit": "1309cfcd00264a2bb8e0d1b435d4d03e3e02f314", - "sha256": "182wks10k0z1h24lkqx2rrs78f33rzarcq4s0r69cc6w67vj0fra" + "commit": "1e1bff2403966c3a0683ee65fb28cb8d8ff2c389", + "sha256": "0dv7s3s9hjq1k2lxgabblmplgvqm0fy49y94j2flljcygdnds74r" } }, { @@ -5189,20 +5213,20 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20250301, - 1627 + 20250414, + 1548 ], - "commit": "5304e2f8a69ed9610b2392b846471f43b28b773b", - "sha256": "1mclnf6ichsjdnjd1b6bg4vqhhjpy6y3458khnxvr1fpn67h6iny" + "commit": "f92ad088e0b280178b8b19b3dcbecb382c014563", + "sha256": "02xi4fx310v9967h9nz4pjpj0ccd4k4vm9kkx8vwhnjjp7i7lyvi" }, "stable": { "version": [ 2, 0, - 5 + 6 ], - "commit": "5304e2f8a69ed9610b2392b846471f43b28b773b", - "sha256": "1mclnf6ichsjdnjd1b6bg4vqhhjpy6y3458khnxvr1fpn67h6iny" + "commit": "f92ad088e0b280178b8b19b3dcbecb382c014563", + "sha256": "02xi4fx310v9967h9nz4pjpj0ccd4k4vm9kkx8vwhnjjp7i7lyvi" } }, { @@ -6155,14 +6179,14 @@ "repo": "nameiwillforget/avy-act", "unstable": { "version": [ - 20250201, - 1311 + 20250420, + 1805 ], "deps": [ "avy" ], - "commit": "eb3be5667b5d1ae024910faf997a12456bca6aa8", - "sha256": "1np3dhv3sik04p7k3qbbnmhz5hx919whxiqdj2i6shiqfmidcygy" + "commit": "b50b6ee3435ed63eea1a6ffff39ecd121ae4d091", + "sha256": "06xqmkv3nah7cw4kzfgz79w1xwqnlh881c517xlibsx9s58zcn2k" } }, { @@ -6341,6 +6365,30 @@ "sha256": "03vw6y4bjfip4ryr265hkkwm66rl3m7gwird7hgrqzilmb9sahia" } }, + { + "ename": "aws-athena-babel", + "commit": "98f54d427d1fbb6fe96b9639a795ab673f85ddfd", + "sha256": "0xz6kjwdl210vrmh4brb0xrngpw8ij1grkk8fcw6gffnl4m22piq", + "fetcher": "github", + "repo": "will-abb/aws-athena-babel", + "unstable": { + "version": [ + 20250420, + 1632 + ], + "commit": "fce1b2d49e0862782405168f37a2dc392f6f8928", + "sha256": "1kkqgybal4b61m5cyilwzq7dndfcpcl5qa2gqwrrb1xi9p2lcyrv" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "commit": "fce1b2d49e0862782405168f37a2dc392f6f8928", + "sha256": "1kkqgybal4b61m5cyilwzq7dndfcpcl5qa2gqwrrb1xi9p2lcyrv" + } + }, { "ename": "aws-ec2", "commit": "90ac00160cbf692baa1f3953122ac828356944e0", @@ -6416,21 +6464,6 @@ "sha256": "1469w6rlnkf1wh5a4ar14snamrx61w6mvq6fwpkfmhpgc0fnwdg7" } }, - { - "ename": "axiom-environment", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "11ldwj88hi7chbbxfkhdfx58w1xybk4ch6xmh99fa2vl8ybk16p1", - "fetcher": "git", - "url": "https://bitbucket.org/pdo/axiom-environment", - "unstable": { - "version": [ - 20220612, - 1535 - ], - "commit": "01d88daa0c864af9918db5a147fbb5e435dec199", - "sha256": "03cxb6zdqmzgjp8r6hcirf8xl772j7xqk2nw17gjkn4xqbwfyn62" - } - }, { "ename": "ayu-theme", "commit": "22bdc35d5c432c5d58d751c0fc3f2e5d0fafe583", @@ -6575,15 +6608,15 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20240805, - 1306 + 20250515, + 1829 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "9c791fb9a4a2e4a09443ec8b0da8f1f10890c0c6", - "sha256": "1gpfg0bvp0333aw9nfaa61nyd01linn9fhishfsyri167k3avihr" + "commit": "2c77490c76bbbc7b8954eaaf1f226567f5e40631", + "sha256": "0vwb99y4nnfrbh0zdwz45m1jlc7g8nbjrxdhcifywlpj7rvrvw8p" }, "stable": { "version": [ @@ -6733,6 +6766,36 @@ "sha256": "1hsjg48jlfi6lc6izp9xcfqvxj7c0ivjrfsr2q3yv3s1iy2fz37l" } }, + { + "ename": "bank-buddy", + "commit": "05deb525362ef480dd3866124d24ef99a455cae0", + "sha256": "1cs0nq7p5l01c3ljg2swl2q9r9mj9airjg9hz218bwmdvsa5drmp", + "fetcher": "github", + "repo": "captainflasmr/bank-buddy", + "unstable": { + "version": [ + 20250509, + 734 + ], + "deps": [ + "async" + ], + "commit": "b30c04b375e71a01430d85146630a514870d4e9b", + "sha256": "1aizbkvs99swig8zr3xinrvfh3ijiaf4ddpw84dn535vxl4v3hj9" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "async" + ], + "commit": "0002826a3f47b908fb6fd2a867193e04cb465273", + "sha256": "060zd4cm8pg67p0sn2nynlcck3ag9r1myibclzb6a6g9p0c1hld2" + } + }, { "ename": "banner-comment", "commit": "4bb69f15cb6be38a86abf4d15450a29c9a819068", @@ -6810,11 +6873,11 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20250223, - 119 + 20250420, + 126 ], - "commit": "9f7188e0b26424d3259cd27bd65e4204303f86ce", - "sha256": "0srnw6dv9sw1s7q62ng8dfqyn5s4ml1mcy25pzh761m3kizv6mvn" + "commit": "71e1ccc7bbc7a12b20b230944d91128f380e82db", + "sha256": "180q3jb1l2gyl2vpygf3vjr87zljmncxkb18gbshbxsbyrzb3cph" }, "stable": { "version": [ @@ -6856,11 +6919,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20250101, - 1458 + 20250425, + 1830 ], - "commit": "a4c8fbc90221b01d5376ad068d3640350d9130a8", - "sha256": "1wxxi3ylmc1k4dbd7lbcr33496lnz7zwxf7l4zfhgci1nfywk3ii" + "commit": "a96525afd9077c06d781c59e78bfc6620e41be8f", + "sha256": "11amjvs5k9jh5sld42sbay2yri32nlygxq3xnnz06hmwdsvqir6x" }, "stable": { "version": [ @@ -7692,14 +7755,14 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20250102, - 1345 + 20250409, + 2132 ], "deps": [ "biblio-core" ], - "commit": "b700f0f2929829b2ca971511c5ebe61c67027e9f", - "sha256": "1wmibsdyfpxi80fyacs6qllcffwdgg1vf7i22a3nr60vciac56f9" + "commit": "0314982c0ca03d0f8e0ddbe9fc20588c35021098", + "sha256": "1m637bnafbmifx2mr7xbijyv5v0dqnx6id6v58gwkyjran2lg4h7" }, "stable": { "version": [ @@ -8048,15 +8111,15 @@ "repo": "waymondo/use-package-chords", "unstable": { "version": [ - 20241115, - 2228 + 20250330, + 1852 ], "deps": [ "bind-key", "key-chord" ], - "commit": "a2b16a1e64b19ae9428a6cd8f3e09b8159707a29", - "sha256": "0krskz087vy4iws01w5wxsn7b0pkncsn6s1vj9ywagn5i1z6a34x" + "commit": "0793b50e2bf1ec8bfc532b10baeef716c5aa947a", + "sha256": "0dkiic5yrdmjkyrahm10ggx0scp4ixqbb184i55f6fpf8yvy6nd8" }, "stable": { "version": [ @@ -8714,11 +8777,11 @@ "repo": "joodland/bm", "unstable": { "version": [ - 20231008, - 2005 + 20250318, + 2308 ], - "commit": "1351e2e15a7666e614c94b41414c8f024dc10a50", - "sha256": "0dv3b0bv4rxvmac388j0qfkdvw7mbd72nfnb9skzkz39is39jp9j" + "commit": "e69e01ec3afdcd8cf2a8d1553b6172a149a34455", + "sha256": "1xzlnp6vfd3kw982qm0gaksnb575xv0xl4fkhp8ma9lv0v32vdf4" }, "stable": { "version": [ @@ -8979,6 +9042,21 @@ "sha256": "14ml1q0n1yh69xrbqfh7pzbmd06kzfvsfbp51p3sq2m9qh4wljyg" } }, + { + "ename": "bookmarks-menu", + "commit": "a3a57de54191b8f222ccab913d66403d5a72cb2d", + "sha256": "06f6vfqzyzrqiyd99hjwfv15l7mr2gvpvc55n9sw808432j2ql5v", + "fetcher": "github", + "repo": "ajrosen/bookmarks-menu", + "unstable": { + "version": [ + 20250508, + 2114 + ], + "commit": "e279bd3c27773e72b23eb698e9b1eed3f7d764c9", + "sha256": "1yqa4gi6bpdrl96b0ddbmsvlg3s54is8vc1fc39sjpqnv7ngli20" + } + }, { "ename": "bool-flip", "commit": "f56377a7c3f4b75206ad9ba570c35dbf752079e9", @@ -9044,28 +9122,28 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20250301, - 2325 + 20250428, + 1247 ], "deps": [ "epkg", "magit" ], - "commit": "581e11718985bc80df66d34beff6b2d08a9abff8", - "sha256": "0vh2mc73jb8brvnq5yanhl0nmn1h8qnl8p0ynhr4bicp1b7gi117" + "commit": "a9a7ad9746a2b759d183e39166739f15da34604b", + "sha256": "12xd36ai6d177m750pn7aflwf3b1n9h0m3gyf0m0fasg2mr6944b" }, "stable": { "version": [ 4, 1, - 3 + 5 ], "deps": [ "epkg", "magit" ], - "commit": "581e11718985bc80df66d34beff6b2d08a9abff8", - "sha256": "0vh2mc73jb8brvnq5yanhl0nmn1h8qnl8p0ynhr4bicp1b7gi117" + "commit": "a9a7ad9746a2b759d183e39166739f15da34604b", + "sha256": "12xd36ai6d177m750pn7aflwf3b1n9h0m3gyf0m0fasg2mr6944b" } }, { @@ -9204,15 +9282,15 @@ "repo": "museoa/bqn-mode", "unstable": { "version": [ - 20241012, - 1136 + 20250410, + 38 ], "deps": [ "compat", "eros" ], - "commit": "c7b71c85e69c8b1bcec2bdd718d7a91929af28d7", - "sha256": "1kzbmmxwm4v05614pqy16fdlh8xs2dnvzk0d90sjq5nfkjr6z472" + "commit": "81eca6e1a6735e738cac3117810db5c9a4762452", + "sha256": "0zl6s0c0nd8m55f83yamgnl8kg1a9jrzl0wrmixrixzn7zmdj6qk" } }, { @@ -9256,11 +9334,11 @@ "repo": "ideasman42/emacs-bray", "unstable": { "version": [ - 20250225, - 2239 + 20250322, + 358 ], - "commit": "99488037cf61cfa6e6694d6a0d9725d23c15add5", - "sha256": "1d23c9vy51jcp5gbssjsr4zwfcwvlz26mb4z8qrczbjaxjhq1m0f" + "commit": "4e335ef8287881a06841bf1d0bf9b0c59dd2469f", + "sha256": "0462mj2c0q2fxfmkcp9wx7d2mpabxphz33k77giwp5sk9xz9psxn" } }, { @@ -9481,11 +9559,11 @@ "repo": "agzam/browser-hist.el", "unstable": { "version": [ - 20240607, - 406 + 20250501, + 1450 ], - "commit": "0372c6d984ca194d9454b14eba6eadec480ec3ff", - "sha256": "0s19gglc9jwapy7a9mf4i97a7r5q9lpm2ivvn0zjhqxcmzj3295j" + "commit": "1cd80081feaab99fef9e8eadd55d68b3cef90144", + "sha256": "12jarw5sca6r171lzba727xbii6xjlv432j8frgkph4r0k0946id" } }, { @@ -9627,14 +9705,14 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20240323, - 727 + 20250516, + 1223 ], "deps": [ "compat" ], - "commit": "3814bdf3585ffffea3014b1d01549894ec1aa897", - "sha256": "1rqr8y3kclds087y09r2l4mrk6x8mm7p84fg2wf2kdvbqmdv7sf0" + "commit": "fc5cab4db55f0b95c4b97fbe3104e394da34b91a", + "sha256": "0a30li0s06qviz44cdnbw1mh0kxlap9zzwa2cfdd79xj8aj5r3z4" } }, { @@ -9741,16 +9819,16 @@ "repo": "countvajhula/buffer-ring", "unstable": { "version": [ - 20220120, - 124 + 20250507, + 1635 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "177d67238c4d126a0270585e21c0f03ae750ca2a", - "sha256": "1li3fq5797hcd2wy5w2vp6hmgf779mrm0pw2nj4a19snwl9ak02j" + "commit": "7359c523d2ae222137602907d37852d102394c5a", + "sha256": "0vvyrbmw5pr1my5m93pm2wh1vg5li0zvcvhddn1km3kywhk5p98p" }, "stable": { "version": [ @@ -9805,11 +9883,11 @@ "repo": "jamescherti/buffer-terminator.el", "unstable": { "version": [ - 20250226, - 1609 + 20250323, + 1828 ], - "commit": "c426fe97b0d994e8a028dc9070880d8dfcd94ac7", - "sha256": "1bz4kxkxgc5095ask59sm5648i05d8p3cdr84yfzvd4qyxhxzj6h" + "commit": "60a6dc3b46eea675eb5822b423f02676b2af032a", + "sha256": "1sidd0i2nf7ssvda0w7xjr7dy0kbwns7j79qm58cfh1rkjlpyn55" }, "stable": { "version": [ @@ -9914,6 +9992,30 @@ "sha256": "0qqajbr3pfpxjjw7bimyqxj7gvmd09313ai581ld4ik9n48izhv1" } }, + { + "ename": "bufferfile", + "commit": "ba54690f2638301f2f0c5eef81e3208126914490", + "sha256": "1jph71didkdclsf6qiq0vz3bb1yjrvzvx2r7k8iy5kfldv36i6xw", + "fetcher": "github", + "repo": "jamescherti/bufferfile.el", + "unstable": { + "version": [ + 20250413, + 1959 + ], + "commit": "39689ccff11fc592b6c83d8b05dcffc02a269df6", + "sha256": "0v00dbr6npnrb57n95sax9ii9qs82qfz88p22qam1hwaiaqw8lgg" + }, + "stable": { + "version": [ + 1, + 0, + 5 + ], + "commit": "39689ccff11fc592b6c83d8b05dcffc02a269df6", + "sha256": "0v00dbr6npnrb57n95sax9ii9qs82qfz88p22qam1hwaiaqw8lgg" + } + }, { "ename": "bufler", "commit": "4ba5657f237eea9073a46a4127be5795be07c687", @@ -9922,8 +10024,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20240312, - 552 + 20250327, + 2246 ], "deps": [ "burly", @@ -9933,8 +10035,8 @@ "map", "pretty-hydra" ], - "commit": "ef3b28bbdcb1e813a1d5b06a91d09774998967c5", - "sha256": "0dl1ji045g8nd8739q28csvjrxwmaq9l7vxlsw1nk1hc7apbv1bx" + "commit": "b96822d2132fda6bd1dd86f017d7e76e3b990c82", + "sha256": "1dbmv6i3yn4kw0bc404nrb3lm72z89cfvdxf18j1sgsj56ykiis0" }, "stable": { "version": [ @@ -10846,8 +10948,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20250224, - 323 + 20250509, + 1401 ], "deps": [ "dash", @@ -10857,8 +10959,8 @@ "s", "transient" ], - "commit": "77b9c491511c7f6f3a37d688097a035b7dc6d794", - "sha256": "0pvczjgnpnqznb8jnmzw0vpmcmk3s1kpxp3vi99klmmrm8ns06zm" + "commit": "689ea5157e62947c149aee32fdee0ae8cad13b44", + "sha256": "180y11p69pvyfy2nvn52cics4knw50gza5njjyzidwb76xpqyc8z" }, "stable": { "version": [ @@ -10921,20 +11023,20 @@ "repo": "kickingvegas/calle24", "unstable": { "version": [ - 20250311, - 1548 + 20250507, + 304 ], - "commit": "aa0e41ea586b0b8a836b267d4e2bfb62e66e8561", - "sha256": "0fc46ia1gri7q9y90c09vqspm5dfqab6alf7b0aam1fjrggawjsj" + "commit": "7a80bfe2c58c3374f29011fd6f824f1011bc5a6a", + "sha256": "1p67pd6scf5v82c69rx5nq2kabhnc0c2pzkkqphk9zcwn3d1qyl2" }, "stable": { "version": [ 1, 0, - 6 + 9 ], - "commit": "aa0e41ea586b0b8a836b267d4e2bfb62e66e8561", - "sha256": "0fc46ia1gri7q9y90c09vqspm5dfqab6alf7b0aam1fjrggawjsj" + "commit": "7a80bfe2c58c3374f29011fd6f824f1011bc5a6a", + "sha256": "1p67pd6scf5v82c69rx5nq2kabhnc0c2pzkkqphk9zcwn3d1qyl2" } }, { @@ -11048,14 +11150,14 @@ "repo": "minad/cape", "unstable": { "version": [ - 20250311, - 1650 + 20250509, + 2032 ], "deps": [ "compat" ], - "commit": "2e86b6deed2844fc1345ff01bc92c3a849a33778", - "sha256": "0wm0y982zrfzzbdizpvr39c55bhp9y7l7w1sp8ps1b4ijbmgd0r9" + "commit": "4b5be758515cf06cf22de2d1b5de459491f7197b", + "sha256": "106b179y26y93zd897dx3clglqnvw2xz2f3k3siv9nb4ggcjsvhj" }, "stable": { "version": [ @@ -11376,26 +11478,26 @@ "repo": "kickingvegas/casual", "unstable": { "version": [ - 20250312, - 2328 + 20250509, + 1838 ], "deps": [ "transient" ], - "commit": "ea0d69f5fd0aeb3530a7fcbd2e356123f4fdbc59", - "sha256": "14kb874xnl2fxzyqbp1r2pl8m1jp0mbcp5pq82ywx9nk4n69p3mv" + "commit": "f478f82a9cf11402688186181ca8e96a60476261", + "sha256": "0ndl3fzdy3352f3vddl26qwqjh5lk492knk0qqd2v1xs40bcwa4f" }, "stable": { "version": [ 2, 4, - 0 + 2 ], "deps": [ "transient" ], - "commit": "ea0d69f5fd0aeb3530a7fcbd2e356123f4fdbc59", - "sha256": "14kb874xnl2fxzyqbp1r2pl8m1jp0mbcp5pq82ywx9nk4n69p3mv" + "commit": "f478f82a9cf11402688186181ca8e96a60476261", + "sha256": "0ndl3fzdy3352f3vddl26qwqjh5lk492knk0qqd2v1xs40bcwa4f" } }, { @@ -12017,16 +12119,16 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20250209, - 904 + 20250504, + 804 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "a7d9a4914ed71ca4e79de37f11176b9fb253b846", - "sha256": "1yr4b206sckqqwpqz9h70i9hfpqhlirhkyzixah8zzm3z3nrg3yd" + "commit": "cea4db0ea7ffeef14cf667ecf0d5fddd1d0340b2", + "sha256": "02wjkaggvcv6sxcvaizn7pndbc4ybsmq33kb742r9v9pyjap5g2z" }, "stable": { "version": [ @@ -12116,20 +12218,20 @@ "repo": "GrammarSoft/cg3", "unstable": { "version": [ - 20250311, - 1539 + 20250430, + 1005 ], - "commit": "51c6f82d7cc686aec96587abd2eabe1b5c1ed9e1", - "sha256": "07jh0nirsij9v311nmff5yzcs2hq9izri7abrrml5k0kk115nnpp" + "commit": "8ab7e26352c615326d74feeec71f531fc7a8855d", + "sha256": "04c85kjhhlixgb96dvqk9bpa3x0px2rzv1jymbg7c1ywianxpcyq" }, "stable": { "version": [ 1, 5, - 0 + 1 ], - "commit": "51c6f82d7cc686aec96587abd2eabe1b5c1ed9e1", - "sha256": "07jh0nirsij9v311nmff5yzcs2hq9izri7abrrml5k0kk115nnpp" + "commit": "0b40c412971037a945d833e2fc9a75954d40f8bc", + "sha256": "1ziyrmcwy1vx765i21j859m0j41dbpsq9pr1ka2nxqib3618yxs7" } }, { @@ -12185,14 +12287,14 @@ "repo": "magnars/change-inner.el", "unstable": { "version": [ - 20231203, - 1021 + 20250320, + 1600 ], "deps": [ "expand-region" ], - "commit": "1394f5c07a95a97e39d616a1d7054d7c9bc49ba3", - "sha256": "1pi5yik2x2vfg9d51hzymzmrcv5ngql5skwa0mz2jgyh7k6c6q3v" + "commit": "675056ff78aa5dc32286e56dd0008d0683ddfc79", + "sha256": "0ljnvr17skq2rp4p3vgfgddm6pjc1cvg8lcqm2gr0qf79my1r5q4" } }, { @@ -12290,26 +12392,26 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20250311, - 2144 + 20250513, + 904 ], "deps": [ "shell-maker" ], - "commit": "fcc18a1534dfdb91e2a11e09b45ae14dc9dd50f3", - "sha256": "04af1f7pkk970x2vrv46x4ipgpyy3hh6v82kxc4gndg0gs78i04y" + "commit": "80c75e0775f171d537ea4fd3d44ce9cdcf6b28a7", + "sha256": "0ir6xvw2l6y1z38dcwbyhpp73k2z7dfgg089a2gpqpf2w5jl1bmn" }, "stable": { "version": [ 2, - 16, + 19, 1 ], "deps": [ "shell-maker" ], - "commit": "50745e34082283f2a3a65a3f314629b29c1a883f", - "sha256": "1xq4hfr3m5sgi9wrr3nrp6fsnnw8d044gz0y50d4h46cvq8c6f2g" + "commit": "3c8d95d9a550d2fb278bdf32e8446fed1974af03", + "sha256": "1fdav9jj06nav696xlqq4shmqshchsxyankmbllz6hlsjyxgfwvm" } }, { @@ -12320,15 +12422,15 @@ "repo": "kimim/chatu", "unstable": { "version": [ - 20250301, - 319 + 20250425, + 645 ], "deps": [ "org", "plantuml-mode" ], - "commit": "b666b53e5a13f722833f856a76b0ce996c1b2bcd", - "sha256": "0b50fqfch1c0s5prg7kq2d2xaa6vgrcscd1danc6l1vaa65wq58a" + "commit": "5324662e8dc3b16cdd7e596c98832f427962c223", + "sha256": "040y0kkz4a094ka29lb988209ihxmrhki8jnbsbcyldmnxhp9l18" } }, { @@ -12666,11 +12768,11 @@ "repo": "gabrielelana/chip8.el", "unstable": { "version": [ - 20240210, - 1459 + 20250405, + 1408 ], - "commit": "69a764f5c1119508dd109a0ba64080f04b5fb702", - "sha256": "1rzn804yl59h75323cvav4fgqax9nj5anv9y3189xpcyhzn1d3ld" + "commit": "e2d0131dc45e65151f9655833807fbe838267dbd", + "sha256": "0wxqyf4hs344300ady75y49s09kcrv0fa2cfyggbw0cb0v2pciq4" } }, { @@ -12728,26 +12830,26 @@ "repo": "breatheoutbreathein/chordpro-mode.el", "unstable": { "version": [ - 20240819, - 649 + 20250410, + 707 ], "deps": [ "compat" ], - "commit": "75b5d36f56ede3af921126ea63bf9639c8dfedb5", - "sha256": "0b6mv3qlkc4cylhynkbzxb1h2qwfcw9jsd3pw331i8cg30rsggqy" + "commit": "9c559886e343fa37ba1524221eb3356adab1b6c7", + "sha256": "1pynhqrrvbkad0bp1n84pak60qzsrknjysvl8rpnm7mqinwgxlj7" }, "stable": { "version": [ 2, - 3, + 6, 0 ], "deps": [ "compat" ], - "commit": "1cff95d5974d1fb13c4e3e76176270a1342ea176", - "sha256": "10vhbjds90pwa2yfna5yfg2h4fvbccrd7fkqw932wc2h4fm84pb5" + "commit": "c4167676831c790240610cfb4b5bbef93b5ddd49", + "sha256": "0x0a1990fip335ajd6zs90wq6lzb89gxaxr28nniyifrix8q8cxb" } }, { @@ -12975,8 +13077,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20250313, - 1410 + 20250505, + 1711 ], "deps": [ "clojure-mode", @@ -12987,14 +13089,14 @@ "spinner", "transient" ], - "commit": "e125d3eaef7718b6975f12b94f7b4ffa4bd20b58", - "sha256": "0lchm6i4zym3swx8hkznnlbxziqn66x9bdkz2dxclrldmw7pf5ks" + "commit": "42e3cbac961a1d5f3b6cc1f8de3ce912ad73a6ee", + "sha256": "1yr19khh7ackr5zlkj4bff9rij53d00n24djkg7cymx355ss4322" }, "stable": { "version": [ 1, - 17, - 1 + 18, + 0 ], "deps": [ "clojure-mode", @@ -13005,8 +13107,8 @@ "spinner", "transient" ], - "commit": "d2f34b60e5c5e569d4b7f4f79b36893f5c4dfa20", - "sha256": "02lilk85a7h9wxxvxr6k69p12wslbl9xp3jkcbdn11078fwhif6j" + "commit": "6d2d09318423f373bdbd546e97dc3e32b21c10e4", + "sha256": "0rcrc5cy0ph56wrpn4mz7wmanndfff032il1di64i3d9y746c0da" } }, { @@ -13209,25 +13311,25 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20250110, - 2210 + 20250421, + 1753 ], "deps": [ "cl-lib" ], - "commit": "892f176c052d010eb66a104497e426b8ea883dc2", - "sha256": "1gz4l74jyx1bz2l9kxgf4dnv3lyngixic2vw3mxc278s9g2jai9f" + "commit": "9d9f63fd7cf8812797eb0ef77d7969e7387a9eb9", + "sha256": "12vq5p3bmqp4gh4s40s8sbz8hs2zczkcl4zfnn7ybr5sc36g1zax" }, "stable": { "version": [ 2, - 13 + 14 ], "deps": [ "cl-lib" ], - "commit": "6f33a481af6bce68f55b9e25d5c14c1ed46fa9d9", - "sha256": "026dvi4v1dghfv3f2g15h8xz69an3l352kn5krcr6cb4s510b5qm" + "commit": "9d9f63fd7cf8812797eb0ef77d7969e7387a9eb9", + "sha256": "12vq5p3bmqp4gh4s40s8sbz8hs2zczkcl4zfnn7ybr5sc36g1zax" } }, { @@ -13279,6 +13381,21 @@ "sha256": "14c5m2cwmcap22371crz4c7204n2p1kb3mf1miznmq7vflm5a01p" } }, + { + "ename": "circom-mode", + "commit": "f385fb5154d52bc79ba1150d669ebcbd1bb2b3b8", + "sha256": "07kln0zbw9l2fmy83inq8kwwhcr67vijd9mki0ci3ys9via8wlb2", + "fetcher": "github", + "repo": "taquangtrung/emacs-circom-mode", + "unstable": { + "version": [ + 20250406, + 1817 + ], + "commit": "6473decb0d89b756fcfc643ea302d476b9147186", + "sha256": "1jwivwy7qlrfakcxmjb9f2ddbic0rn720apxnkd96djmcv27bkl7" + } + }, { "ename": "citar", "commit": "4e6d67c0f8cfd5c1639a441105d0c7b735371fb7", @@ -13379,6 +13496,40 @@ "sha256": "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv" } }, + { + "ename": "citar-org-node", + "commit": "d2aea7e3d7d069b6abd7f6098d43de313768d054", + "sha256": "15f3ljygmxbvyi158xfnk76pnw8a57wyczs09jxfdw1gbb6s6niw", + "fetcher": "github", + "repo": "krisbalintona/citar-org-node", + "unstable": { + "version": [ + 20250422, + 839 + ], + "deps": [ + "citar", + "ht", + "org-node" + ], + "commit": "ba832ea2c5a774d4dc5bcb66f321a030c6380600", + "sha256": "00k4h1qxcpwyglajxvycqafsibck9314bm7a12zq7pm4pa4ikjbz" + }, + "stable": { + "version": [ + 0, + 2, + 5 + ], + "deps": [ + "citar", + "ht", + "org-node" + ], + "commit": "26979a7226e0149167c48e24dc43f72b8d12f798", + "sha256": "11hzn7gyh6vdcpbvy5l3v9b3ja5n4kr8xxd8nq43xvdggp6gj6v4" + } + }, { "ename": "citar-org-roam", "commit": "87aefd56251d20a2a832d27e3170a3e39e39870d", @@ -13387,15 +13538,15 @@ "repo": "emacs-citar/citar-org-roam", "unstable": { "version": [ - 20241203, - 2325 + 20250424, + 1511 ], "deps": [ "citar", "org-roam" ], - "commit": "ff38add0aa40ba2014a6ee28a293fc1b9180cefa", - "sha256": "1zc8hy06dndkgl70z4cw45wifsb4ascq0f566ph6kck4qki73wik" + "commit": "9750cfbbf330ab3d5b15066b65bd0a0fe7c296fb", + "sha256": "0plza72rw2mz0cxg4dj5r8fcg4hslhahrshwpgj0wsb1b776xcm2" }, "stable": { "version": [ @@ -13501,11 +13652,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20241028, - 1548 + 20250411, + 1406 ], - "commit": "9220f430b5588f7e2d9ca82797eb37d1d7752620", - "sha256": "14698vwnsm1q3s3waz2mq5f36amgxyns2ygsg32dnxlssi3yai04" + "commit": "3e3c6e539c41c880f9d10ef7424cd0d2adcf3151", + "sha256": "0p2iifiadxpa2q75zk45gqj8bwa3wx9gcs82p5b303lrzid9mrga" }, "stable": { "version": [ @@ -13632,11 +13783,11 @@ "repo": "arteen1000/clang-format-lite", "unstable": { "version": [ - 20240708, - 223 + 20250509, + 246 ], - "commit": "4e60389129601ac81f8c698c1a6985ad72224b3e", - "sha256": "1hiviarym9ahf3hi0zqf2ja5y14cyvm56z922m11kyapbmwqprka" + "commit": "46681aada7f93170a7e073332a43f8b19ee7b4c5", + "sha256": "0acgncalbdd74abd25max11l1q6vdcxsnr7g49gnq7v55qv0spqw" } }, { @@ -13923,14 +14074,14 @@ "repo": "Fuco1/clippy.el", "unstable": { "version": [ - 20230822, - 1348 + 20250511, + 2020 ], "deps": [ "pos-tip" ], - "commit": "1e764902b3e9dbb11d5f02bc36c3b7ff4275f528", - "sha256": "1bc3a58xxvp9mjna47pcfnzk9h8akjwjn6jjlm2nsllmznzwa3pg" + "commit": "006e0bbe3f695c0e0ebdc0de5095255608eb9e6c", + "sha256": "16kdvf7xh401i3g3z3zlsvv8gbzn2d61pbws1ik1qzanglpq3glz" } }, { @@ -14001,8 +14152,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20240310, - 2054 + 20250514, + 1903 ], "deps": [ "cider", @@ -14015,8 +14166,8 @@ "seq", "yasnippet" ], - "commit": "dc1bbc8cdaa723bdbb6669ea7d280625c370755d", - "sha256": "0mha1wqn5hd9g8y0fp35qkhlnxlrwli62x7mbifman279h16gaml" + "commit": "362cb46bf808dc42d2aaf022afe93048439680c4", + "sha256": "09s9jav8xsgxqj5lkdl9nkbb0bbgz96qjpp7az197wckxsqrs26x" }, "stable": { "version": [ @@ -14447,20 +14598,20 @@ "repo": "clojure-emacs/clojure-ts-mode", "unstable": { "version": [ - 20250310, - 1233 + 20250515, + 732 ], - "commit": "b165c6e8d6040e8701f1e3798c1b33f8549b823f", - "sha256": "1xi610rz8n2brp61mwg25rzd12p8hacba8ykl3vx86gkfx4xxf8b" + "commit": "c2269ea10a9129113a98eb58fc8abd8888a07e94", + "sha256": "0xd2gdny14x43d553bxn63nmscgkcqhy30196fzyn7m7imfv6hkx" }, "stable": { "version": [ 0, - 2, - 3 + 4, + 0 ], - "commit": "9662b6caa86b67b51aa883b35e21645233ca6f68", - "sha256": "01gmv0cm0rirf91qwbbmy78ygmxrcn4swaack8bc2gdaybh2msnf" + "commit": "c2269ea10a9129113a98eb58fc8abd8888a07e94", + "sha256": "0xd2gdny14x43d553bxn63nmscgkcqhy30196fzyn7m7imfv6hkx" } }, { @@ -14708,12 +14859,12 @@ }, "stable": { "version": [ - 3, - 31, - 6 + 4, + 0, + 2 ], - "commit": "859ca5c4d7396a011a462878179bc173e1283731", - "sha256": "1jkp72my1nql39z06ma2ydi78h4rzxca0kakbvyp5b22dadcm37q" + "commit": "a12ed97b5c32a1e8f160ed557e7c97913ecf6ba5", + "sha256": "1c76ws079qd9yb5l9i645sz8prl04fxapdrm3d9yrdh1152b0hcv" } }, { @@ -15358,19 +15509,19 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20250306, - 1440 + 20250401, + 1320 ], - "commit": "5e3ed508e2c0a9a6d9af700212dd7ce96a356da6", - "sha256": "1v4h94swwkvryafv35y77w24aa0wgwqlyjx3228smhxkqn3j8v84" + "commit": "f3a993da26b3b6f778f5943e095e8b2816a6475c", + "sha256": "0r8q6ld2zma1bqq5pv61gpy99a4vx6bwx4v820ijzbymmi62vv3z" }, "stable": { "version": [ 1, - 17 + 18 ], - "commit": "81d8990085960824f700520d08027e6aca58feaa", - "sha256": "1x3aq6hadp158vh8mf9hmj5rikq0qz7a1frv7vbl39xr3wcnjj23" + "commit": "f3a993da26b3b6f778f5943e095e8b2816a6475c", + "sha256": "0r8q6ld2zma1bqq5pv61gpy99a4vx6bwx4v820ijzbymmi62vv3z" } }, { @@ -15530,14 +15681,14 @@ "repo": "NicholasBHubbard/comint-histories", "unstable": { "version": [ - 20250204, - 222 + 20250319, + 1602 ], "deps": [ "f" ], - "commit": "15a2e3c89814927fce0cc01ab01824b09881c652", - "sha256": "0vcpw674gcpn5p0swy9sgwmfn1rsi2cd7nj92y9glc8paky3p3m0" + "commit": "100173efba855e66e0a9596135f88820501125b9", + "sha256": "1kl7wlppy1d6g62xynp5jlj0cdjv13yq453ib2h7yxmma3xb3n6r" } }, { @@ -15846,11 +15997,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20250228, - 258 + 20250426, + 1319 ], - "commit": "8d599ebc8a9aca27c0a6157aeb31c5b7f05ed0a3", - "sha256": "0k1k1rzqi6gc2iirlcg8nw1alv1hs8qf72a1wqcifmkx1ajb7d8i" + "commit": "41f07c7d401c1374a76f3004a3448d3d36bdf347", + "sha256": "16x0ssni2fxahdv292v3zqik12y3zvpqjkdbzsdgpb6z2p0j9ja0" }, "stable": { "version": [ @@ -15973,25 +16124,6 @@ "sha256": "0x8qc63zn126hspcblwlihxfzs8kvcjb6cpj28ahsb0117j2i789" } }, - { - "ename": "company-axiom", - "commit": "8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf", - "sha256": "061n8zn11r5a9m96sqnw8kx252n1m401cmcyqla8n9valjbnvsag", - "fetcher": "git", - "url": "https://bitbucket.org/pdo/axiom-environment", - "unstable": { - "version": [ - 20220612, - 1535 - ], - "deps": [ - "axiom-environment", - "company" - ], - "commit": "01d88daa0c864af9918db5a147fbb5e435dec199", - "sha256": "03cxb6zdqmzgjp8r6hcirf8xl772j7xqk2nw17gjkn4xqbwfyn62" - } - }, { "ename": "company-bibtex", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -16254,39 +16386,6 @@ "sha256": "1736fzbcfm0f774459irxfmgdvjzj6a32ia4y70n3qpx6qwrx4x4" } }, - { - "ename": "company-emacs-eclim", - "commit": "1e9d3075587fbd9ca188535fd945a7dc451c6d7e", - "sha256": "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig", - "fetcher": "github", - "repo": "emacs-eclim/emacs-eclim", - "unstable": { - "version": [ - 20180911, - 1121 - ], - "deps": [ - "cl-lib", - "company", - "eclim" - ], - "commit": "edff7e0e30c87036710d88fb0b7a4644750858e8", - "sha256": "0ywifqdhv7cibgl42m7i15widna9i1dk5kl5rglyql7hy05nk9gj" - }, - "stable": { - "version": [ - 0, - 4 - ], - "deps": [ - "cl-lib", - "company", - "eclim" - ], - "commit": "8203fbf8544e65324a948a67718f7a16ba2d52e6", - "sha256": "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3" - } - }, { "ename": "company-emoji", "commit": "57d010adb43ea1a6adc89bff9741dab6830f199b", @@ -16423,6 +16522,25 @@ "sha256": "12cg8amyk1pg1d2n8fb0mmls14jzwx08hq6s6g7wyd9s7y96hkhb" } }, + { + "ename": "company-forge", + "commit": "8400498d4146c72306f6c658ddaaadf9dbc54798", + "sha256": "05jnglgxf197917hhjg3ybllsa9k75w4f3mmmsidcpnfxnfx8bhj", + "fetcher": "github", + "repo": "pkryger/company-forge.el", + "unstable": { + "version": [ + 20250402, + 735 + ], + "deps": [ + "company", + "forge" + ], + "commit": "535139ed9f0fa92f5e53d9c1b89cb4194e5f2cff", + "sha256": "0prpblvckpxrdlvgsnrlvmr1265mvrnn5pp7xk4c00c91m5nmg5q" + } + }, { "ename": "company-fuzzy", "commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db", @@ -16431,21 +16549,21 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20250207, - 140 + 20250424, + 1433 ], "deps": [ "company", "ht", "s" ], - "commit": "cc144309cecb9d0b913f182a7c9a85ea1089db31", - "sha256": "0dg6l12dg5frh6lg6jmis5rzjj7ibfhs7ar1vjyhs3z8vmz49w05" + "commit": "536067f67281c5cc375bcc0ba1ce6e6a375e84a0", + "sha256": "0vs1spqy5zqhpi7s775cn1j9gqg73g4rh0x3bamv3b1k7qmjj1fa" }, "stable": { "version": [ - 1, - 4, + 2, + 0, 0 ], "deps": [ @@ -16453,8 +16571,8 @@ "ht", "s" ], - "commit": "3aeb0bdcc15e969964b73e695aca8e0df60e3a1a", - "sha256": "1yfl1c92i0xn6imgvvj6h5zpadqp96akm69cmccxs7khfall5lmj" + "commit": "a359f5556ee1c989f6c111e35ab6be81c609f52c", + "sha256": "00gar55lmncf8r1jqxx2c3ddrmq9xqk8hdj40rpj9gb9hrdhcszg" } }, { @@ -17776,20 +17894,20 @@ "repo": "jamescherti/compile-angel.el", "unstable": { "version": [ - 20250313, - 16 + 20250323, + 1331 ], - "commit": "ec2d0beb0668d66de29510980f8112230757a0a6", - "sha256": "108sh6j845pmpj5s6k04z55ylrp6p0jfb70lfbq62bzp5nm2z3xz" + "commit": "3b47285e0d47a792decc1fc42f0faf79e4c7477c", + "sha256": "0qy5dj61vfccy5q1yfanykgv3h356ivqsxfc3fcwwmlhjv20pzyp" }, "stable": { "version": [ 1, 0, - 5 + 6 ], - "commit": "84023838fa67621197ab7ad9a0842887d1e9e323", - "sha256": "0fzcr75i8jklwfgqlp3s2mfbizr6ajibhyfjq73pza6w2dw9ggcj" + "commit": "f5567d4f4ade48e74d24a2b8f3390f7efa18c801", + "sha256": "00i2m042yj883sk4l8zbq62ags3lvpsc21ys92ppbz6ldcbpw4fq" } }, { @@ -17912,8 +18030,8 @@ "repo": "mkcms/compiler-explorer.el", "unstable": { "version": [ - 20250224, - 1232 + 20250417, + 2126 ], "deps": [ "eldoc", @@ -17921,8 +18039,8 @@ "plz", "seq" ], - "commit": "228f562f0a7aa5edbb56ed8da6b6844fd013436e", - "sha256": "0wvd08mz4y0wj1b0gmw7093d8krmx5w520q4x52yn5cn4vr6bbwm" + "commit": "171cbde72993956e46cc478ecc98825997450140", + "sha256": "15w171fhh0khvsr02z2c110w818hmrzjpmpn1lazw7s0nq8a8mf5" }, "stable": { "version": [ @@ -18101,6 +18219,42 @@ "sha256": "1ily4abrn85fwy90hfm1nq9kwazb80amdgx4disaa2s62yx6k62j" } }, + { + "ename": "conda-project", + "commit": "3b5b46f6ecdf05a72be3144c3c28295cf80b466a", + "sha256": "0k3c4z3s5dvwy6l5vi59b4ca187hgpqd5rfqgjs7gc47zns011xd", + "fetcher": "github", + "repo": "gilbertwong96/conda-project.el", + "unstable": { + "version": [ + 20250415, + 1442 + ], + "deps": [ + "pythonic", + "s", + "transient", + "yaml" + ], + "commit": "21becf078e21cc98a5890dff9049928c4712c235", + "sha256": "1qga2l1dx9dp4jhrminhkmk5n9qhwp1c0n5vg7h4s7c42r32piy0" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "pythonic", + "s", + "transient", + "yaml" + ], + "commit": "21becf078e21cc98a5890dff9049928c4712c235", + "sha256": "1qga2l1dx9dp4jhrminhkmk5n9qhwp1c0n5vg7h4s7c42r32piy0" + } + }, { "ename": "config-general-mode", "commit": "35763febad20f29320d459394f810668db6c3353", @@ -18260,25 +18414,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20250311, - 1658 + 20250512, + 1410 ], "deps": [ "compat" ], - "commit": "d557305b730f7666d46bc3eb04c87cfcc493a8e5", - "sha256": "1d04j6psx05cbnsmc78rqnzg1zpcnqd9m1830d276n1jpfszmh10" + "commit": "eae64815fbfa74327dcda9de3cb1b9a725d59b2d", + "sha256": "16cx1qzwylaar3lxi7f6507pv5vz4skjk40ghw0h6njgra13af4j" }, "stable": { "version": [ 2, - 1 + 3 ], "deps": [ "compat" ], - "commit": "d557305b730f7666d46bc3eb04c87cfcc493a8e5", - "sha256": "1d04j6psx05cbnsmc78rqnzg1zpcnqd9m1830d276n1jpfszmh10" + "commit": "48d09c200c683ffb09ad5863d5496e230b9fe3f9", + "sha256": "01aiq5325xpxd0j88kjapryp44c1brifcks2s655w1fyhippmr9w" } }, { @@ -18562,29 +18716,29 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250310, - 350 + 20250415, + 214 ], "deps": [ "consult", "markdown-mode", "ox-gfm" ], - "commit": "e21b9e44c6d241a9a3afc6c45b3e7c37a543a744", - "sha256": "1qxk12ia5p8qhmvxdy6zz5kb2cz2gmcmn3mg8gz3s823zx0fj4j0" + "commit": "3a352593aa1da234c8fb9df335bb1ec6f509fc23", + "sha256": "188ac5vl3mspp8dp78hfizpjj3v4cmqd0i5sjxvavgby244rxmi8" }, "stable": { "version": [ 2, - 3 + 5 ], "deps": [ "consult", "markdown-mode", "ox-gfm" ], - "commit": "a1c307ddd9d022a142030e3e868df05ee30656fa", - "sha256": "1f7i1h5024d2i5nlcf7q9zzyxdwccakjin89zvb2yp32r8m4m7qq" + "commit": "3a352593aa1da234c8fb9df335bb1ec6f509fc23", + "sha256": "188ac5vl3mspp8dp78hfizpjj3v4cmqd0i5sjxvavgby244rxmi8" } }, { @@ -18595,29 +18749,29 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250309, - 2223 + 20250415, + 214 ], "deps": [ "consult", "consult-gh", "embark-consult" ], - "commit": "a1c307ddd9d022a142030e3e868df05ee30656fa", - "sha256": "1f7i1h5024d2i5nlcf7q9zzyxdwccakjin89zvb2yp32r8m4m7qq" + "commit": "3a352593aa1da234c8fb9df335bb1ec6f509fc23", + "sha256": "188ac5vl3mspp8dp78hfizpjj3v4cmqd0i5sjxvavgby244rxmi8" }, "stable": { "version": [ 2, - 3 + 5 ], "deps": [ "consult", "consult-gh", "embark-consult" ], - "commit": "a1c307ddd9d022a142030e3e868df05ee30656fa", - "sha256": "1f7i1h5024d2i5nlcf7q9zzyxdwccakjin89zvb2yp32r8m4m7qq" + "commit": "3a352593aa1da234c8fb9df335bb1ec6f509fc23", + "sha256": "188ac5vl3mspp8dp78hfizpjj3v4cmqd0i5sjxvavgby244rxmi8" } }, { @@ -18628,29 +18782,29 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250309, - 2223 + 20250415, + 214 ], "deps": [ "consult", "consult-gh", "forge" ], - "commit": "a1c307ddd9d022a142030e3e868df05ee30656fa", - "sha256": "1f7i1h5024d2i5nlcf7q9zzyxdwccakjin89zvb2yp32r8m4m7qq" + "commit": "3a352593aa1da234c8fb9df335bb1ec6f509fc23", + "sha256": "188ac5vl3mspp8dp78hfizpjj3v4cmqd0i5sjxvavgby244rxmi8" }, "stable": { "version": [ 2, - 3 + 5 ], "deps": [ "consult", "consult-gh", "forge" ], - "commit": "a1c307ddd9d022a142030e3e868df05ee30656fa", - "sha256": "1f7i1h5024d2i5nlcf7q9zzyxdwccakjin89zvb2yp32r8m4m7qq" + "commit": "3a352593aa1da234c8fb9df335bb1ec6f509fc23", + "sha256": "188ac5vl3mspp8dp78hfizpjj3v4cmqd0i5sjxvavgby244rxmi8" } }, { @@ -18661,29 +18815,29 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250309, - 2223 + 20250415, + 214 ], "deps": [ "consult", "consult-gh", "pr-review" ], - "commit": "a1c307ddd9d022a142030e3e868df05ee30656fa", - "sha256": "1f7i1h5024d2i5nlcf7q9zzyxdwccakjin89zvb2yp32r8m4m7qq" + "commit": "3a352593aa1da234c8fb9df335bb1ec6f509fc23", + "sha256": "188ac5vl3mspp8dp78hfizpjj3v4cmqd0i5sjxvavgby244rxmi8" }, "stable": { "version": [ 2, - 3 + 5 ], "deps": [ "consult", "consult-gh", "pr-review" ], - "commit": "a1c307ddd9d022a142030e3e868df05ee30656fa", - "sha256": "1f7i1h5024d2i5nlcf7q9zzyxdwccakjin89zvb2yp32r8m4m7qq" + "commit": "3a352593aa1da234c8fb9df335bb1ec6f509fc23", + "sha256": "188ac5vl3mspp8dp78hfizpjj3v4cmqd0i5sjxvavgby244rxmi8" } }, { @@ -18724,14 +18878,14 @@ "repo": "ghosty141/consult-git-log-grep", "unstable": { "version": [ - 20250307, - 1159 + 20250317, + 1916 ], "deps": [ "consult" ], - "commit": "e85627bb950f6c4ae296a2623d55e8e659e29ba8", - "sha256": "0xw4nvv5smy77l7d4gxr7qwm98qqv73mmszcgalm5wki88x1g3br" + "commit": "5b1669ebaff9a91000ea185264cfcb850885d21f", + "sha256": "12vbgl90m3jp1m5f9amsqa7aa9kxlayf02rzii30mgfi02y7ypl4" } }, { @@ -18742,28 +18896,26 @@ "repo": "Nyoho/consult-hatena-bookmark", "unstable": { "version": [ - 20221125, - 109 + 20250421, + 1501 ], "deps": [ - "async-await", "consult" ], - "commit": "b85484b11705ebd896878d3ac7fdb12bc8c9637a", - "sha256": "1xvi28wvagcabk1q6ckw4f97knm59rl86jd3pndz2ljv842rzbix" + "commit": "8f2e48688455711df89533a7fe5af1d9cd02c137", + "sha256": "1gyiaid4076ix9jkgl1k6495scgl3vp5474r7dm4gd80hr05hs5v" }, "stable": { "version": [ 0, - 3, + 4, 1 ], "deps": [ - "async-await", "consult" ], - "commit": "b85484b11705ebd896878d3ac7fdb12bc8c9637a", - "sha256": "1xvi28wvagcabk1q6ckw4f97knm59rl86jd3pndz2ljv842rzbix" + "commit": "8f2e48688455711df89533a7fe5af1d9cd02c137", + "sha256": "1gyiaid4076ix9jkgl1k6495scgl3vp5474r7dm4gd80hr05hs5v" } }, { @@ -18774,14 +18926,14 @@ "repo": "rcj/consult-ls-git", "unstable": { "version": [ - 20241023, - 1113 + 20250419, + 1320 ], "deps": [ "consult" ], - "commit": "beb253374e2cee10b8682fb8b377ca1f2caa4e27", - "sha256": "1znlvjplgmkp0zl94xf8z9jlkr9f4r39kv2nfd47ajnqccczkr85" + "commit": "85882e4b7af9ad40160d985e42b36b0fd6400ead", + "sha256": "06byp4d8pyvlvhi6i761zwf2rq2xwmvkjddq2xaycg8f27xlqfjv" } }, { @@ -19024,15 +19176,15 @@ "repo": "eki3z/consult-todo", "unstable": { "version": [ - 20250201, - 1342 + 20250417, + 1903 ], "deps": [ "consult", "hl-todo" ], - "commit": "b50df0da6243d7a91016e1b8c9a208fb167695be", - "sha256": "1cj25n54dglj8frfb23w576yfn7rcv149xf2anjyv7w45mfgspnn" + "commit": "f9ba063a6714cb95ddbd886786ada93771f3c140", + "sha256": "13lfm1kg3llda0w4mwbaai6vrsaymq3yn4kagpvkh9i0iy22a5ii" }, "stable": { "version": [ @@ -19086,15 +19238,15 @@ "repo": "mohkale/consult-yasnippet", "unstable": { "version": [ - 20240314, - 1838 + 20250411, + 1922 ], "deps": [ "consult", "yasnippet" ], - "commit": "834d39acfe8a7d2c304afbe4d649b9372118c756", - "sha256": "0vjsqjhgzxvdhhcis5gx8xc56mjl3drpy1qn1265f6474j7y4frv" + "commit": "a3482dfbdcbe487ba5ff934a1bb6047066ff2194", + "sha256": "0cyzyxmdrk7dcpsw51pv1vz1f6px5yjmbmsa6r74vmshfdmljm3j" } }, { @@ -19233,18 +19385,30 @@ "repo": "copilot-emacs/copilot.el", "unstable": { "version": [ - 20250223, - 139 + 20250506, + 2016 ], "deps": [ - "dash", "editorconfig", "f", - "jsonrpc", - "s" + "jsonrpc" ], - "commit": "7d105d708a23d16cdfd5240500be8bb02f95a46e", - "sha256": "1gc8rnyl60wlxdhqi1a96mq0wfgpnfziyihpvcy9bmnx14s34ch1" + "commit": "fe3f51b636dea1c9ac55a0d5dc5d7df02dcbaa48", + "sha256": "0066zm38fpivz99fd0mam7yiw60pj3ihycgh20znmn7ir0a0ismd" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "editorconfig", + "f", + "jsonrpc" + ], + "commit": "11b0739da1f74285dd661914c0ef92e24f9c4aa7", + "sha256": "1pf5j3xhhcrv4dj2cgp7627s67wsw4hm308szqyr4f58snlkx044" } }, { @@ -19255,11 +19419,11 @@ "repo": "chep/copilot-chat.el", "unstable": { "version": [ - 20250313, - 822 + 20250515, + 514 ], "deps": [ - "magit", + "aio", "markdown-mode", "org", "polymode", @@ -19267,8 +19431,8 @@ "shell-maker", "transient" ], - "commit": "0337869a7d19171133198453985009655a846f75", - "sha256": "1qmaqqwr38d0br5prc2wrq9qcdwwx09v5312ip7ln1lgzd9a1b18" + "commit": "e9c8a480d8a518a1a069afff1f1bc51ff2b0a2fc", + "sha256": "1zs9ypz4b8idfhkrm7laj5fw3hgfxg3ckbl9g40jyckiiajf7w98" }, "stable": { "version": [ @@ -19439,25 +19603,25 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20250128, - 821 + 20250516, + 1841 ], "deps": [ "compat" ], - "commit": "2c476b442ccfda9935e472b26d9cd60d45726560", - "sha256": "0yyc64bfqpsjs5iwgwxm171sg85al4mzj4pv3qd4cpmkgmamrrv3" + "commit": "10e24c8bdbdd4e6d3145878f3ce4357c3753b0a1", + "sha256": "0rqvnmv566ncppm4k2m5pi03llcvrxqs0piax1yp672cp4g77fpk" }, "stable": { "version": [ - 1, - 7 + 2, + 1 ], "deps": [ "compat" ], - "commit": "2c476b442ccfda9935e472b26d9cd60d45726560", - "sha256": "0yyc64bfqpsjs5iwgwxm171sg85al4mzj4pv3qd4cpmkgmamrrv3" + "commit": "6db826974963f8fb5d8b9832e7c09da2fea3296a", + "sha256": "0l6hyj8nywvqrjzy0mnp0g5al9qrcvgrbj3xxx33474s719gk405" } }, { @@ -19616,28 +19780,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20250304, - 939 + 20250329, + 1401 ], "deps": [ "ivy", "swiper" ], - "commit": "db61f55bc281c28beb723ef17cfe74f59580d2f4", - "sha256": "0ypbjjmr1lyyq5azlbx03rpbkhpc1fl4fbm6m2zbv48bzyr49hn5" + "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429", + "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1" }, "stable": { "version": [ 0, 15, - 0 + 1 ], "deps": [ "ivy", "swiper" ], - "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742", - "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64" + "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429", + "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1" } }, { @@ -20504,10 +20668,10 @@ }, { "ename": "crc", - "commit": "75219d010bfe386715b48cccc8c311d69b388873", - "sha256": "067ms2sy3ls1b9067gap5ks322l1akzz7yi4krw69fydanzqgw6b", + "commit": "a0cc4d5be5e123c984b752a37a639cb1fad7602b", + "sha256": "0sifp42fpds3zf4hwgq7lx9g97qbq9szb6lds0f4fs8vz1nfwwk9", "fetcher": "codeberg", - "repo": "Jaft/Emacs-CRC", + "repo": "tomenzgg/Emacs-CRC", "unstable": { "version": [ 20250303, @@ -20761,11 +20925,11 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20250212, - 2017 + 20250421, + 936 ], - "commit": "c83c54d3d746e83861bcb22b0309c66a2d4db17f", - "sha256": "0g8ph4brjsczfzmg0inzm4b1fwvbx0hgakczwnzxmkg1ssd1gigm" + "commit": "e42f5558199576628e827a6e3db29eae56f4126a", + "sha256": "03gjf43lf4pbr3n0i8di8j2sgcy22i9h4g8pzymgwq2s7mcbdn54" }, "stable": { "version": [ @@ -21255,6 +21419,36 @@ "sha256": "1lkf849g6zqkshzj2845n1w58q1bxgqb85lh6w7ssi1m653mxhd1" } }, + { + "ename": "cuckoo-search", + "commit": "2a0b297fe5131c0b670467fc07c8d63465016681", + "sha256": "0v5301fgq8spihjjjjm9qpbrmh5la3iv71wb9v11hfwa7zrjfhqm", + "fetcher": "github", + "repo": "rtrppl/cuckoo-search", + "unstable": { + "version": [ + 20250512, + 821 + ], + "deps": [ + "elfeed" + ], + "commit": "b4688f81942255579b5e5fd2c879b9af1627dd45", + "sha256": "016nmm03g8a1fg99byhcj5zp70jjg8v7cyp7rv6mfqw7b5n276qh" + }, + "stable": { + "version": [ + 0, + 2, + 5 + ], + "deps": [ + "elfeed" + ], + "commit": "b4688f81942255579b5e5fd2c879b9af1627dd45", + "sha256": "016nmm03g8a1fg99byhcj5zp70jjg8v7cyp7rv6mfqw7b5n276qh" + } + }, { "ename": "cucumber-goto-step", "commit": "d78d7abccfd9bcebf6888032639923327ad25309", @@ -21597,14 +21791,14 @@ "repo": "ideasman42/emacs-cycle-at-point", "unstable": { "version": [ - 20240422, - 300 + 20250421, + 1059 ], "deps": [ "recomplete" ], - "commit": "317dd682924f1ddcb61cbcd0008072abe3c5264b", - "sha256": "1m29a15ilhf33as76pmpm28qnymsj28syv5qgjqrih9ncd5khwjr" + "commit": "30cfa6ac1ebf6594e4947b11c9ac95148dcb6f96", + "sha256": "11qnzj27jpirajsh8dx62403daji36b68jvssx7rljipprci2cbs" } }, { @@ -21648,11 +21842,11 @@ "repo": "mrkkrp/cyphejor", "unstable": { "version": [ - 20230606, - 1501 + 20250401, + 1135 ], - "commit": "5444ae370ccdf3991aabe97b12004c987256c9e5", - "sha256": "1p0hs98m366mkfvw8s0p1cngwqkmnrmhs9l40mafh20635gigrzi" + "commit": "78bc40555e05f85d5fc2f7a110bee98b614d4cb7", + "sha256": "0sb0kymca8ccjnwbyvb3891m6mfnsl7x5ikny2ikyhpifgv97yly" }, "stable": { "version": [ @@ -21803,15 +21997,15 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20241223, - 1448 + 20250514, + 1107 ], "deps": [ "compat", "s" ], - "commit": "e1c0f5bb940b8149e0db414cc77c1ce504f5e3eb", - "sha256": "1s91r6zl5c4cbfp6ybz3r8i5kw200nqc92dsidf9wmbzz435m1ds" + "commit": "7b08ce315c0be901d88c1099483f9607c653712e", + "sha256": "1p6vwmqwkl8y5323bb5b3k5mw1r8x9lcc9qzi8wcwq903cndq7ji" }, "stable": { "version": [ @@ -21865,14 +22059,14 @@ "repo": "xenodium/dall-e-shell", "unstable": { "version": [ - 20241118, - 1015 + 20250331, + 1641 ], "deps": [ "shell-maker" ], - "commit": "d7f54f002c9271bc46c7403af898ed12e3abea69", - "sha256": "0cf81h9acc1ql5148y00jsl7v80190s2q71wd0q9j70vdghz8xhv" + "commit": "efec43ab3338e59f12165110e6c6c957345f6257", + "sha256": "1fab097pgqc9by9dhjmsgn3grp905h7pivnz46w9s52pa1pvbrmv" }, "stable": { "version": [ @@ -21991,8 +22185,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20250228, - 2153 + 20250406, + 2127 ], "deps": [ "bui", @@ -22005,8 +22199,8 @@ "posframe", "s" ], - "commit": "56e92dd86b526c191275cf7813208baad14e0c5d", - "sha256": "1qmkxymzyg4rzv9by5z4s3bxpgg2h0szk4632nbm8khq09pkjcjx" + "commit": "68357594a615cb3af833346e869f10b2de260406", + "sha256": "0hq29ia2x62lhd1zz7gnicr10ck1m9cymgc4ii9n35zl6aai382f" }, "stable": { "version": [ @@ -22158,11 +22352,11 @@ "repo": "sjrmanning/darkokai", "unstable": { "version": [ - 20200614, - 1452 + 20250317, + 1704 ], - "commit": "5820aeddfc8c869ba840cc534eba776936656a66", - "sha256": "1bj7l5sh6nzxcw575kjcscjpjqmwlxhvi30qviqg4d6aymzkgr53" + "commit": "2b02bf7687433555fc683d59bb4ff7eb3d9e6858", + "sha256": "07zs8a9q4z02bwrci3l3g23f9h5a30hwiw64x0i04py9bix5kk12" } }, { @@ -22366,11 +22560,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20250227, - 121 + 20250509, + 2153 ], - "commit": "9616e5b5e793c3d8228a8fccf7b9ef7ace365005", - "sha256": "0pwjya3s83krx61rfdbqkc0jlsiv9g1fgk3d1wz7ll23rlqgnsi0" + "commit": "300f87567df7b177bb5a2f2b757983e80c596547", + "sha256": "0kl2pmcfiiflgfhxq7mh5psc4aqrfgaydm4icr0c7s3xpvpvk5nm" }, "stable": { "version": [ @@ -22736,6 +22930,21 @@ "sha256": "08sdhj4gs66dxv5fqpbp3vwm21rasw2qz0853056h19jiqkzz3a1" } }, + { + "ename": "ddp", + "commit": "edf8854cef5979b3a8e39ba84359422365f90ded", + "sha256": "0fnjf031dhkdbxzdlhqhm4jhhrl65ywvinbzy8rdqs7zsjzqxwx6", + "fetcher": "github", + "repo": "eki3z/ddp.el", + "unstable": { + "version": [ + 20250421, + 353 + ], + "commit": "ee02e658f3bf8f26115e2dd61c713137e01227a9", + "sha256": "0xypbghjs5slgv28b5n296x02573gpi3a1rx0i1vf0g063lyzqp6" + } + }, { "ename": "ddskk", "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0", @@ -22839,11 +23048,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20250108, - 2119 + 20250411, + 2043 ], - "commit": "3f7c2b582eb65b47bea081f3c74ae70833c5af7e", - "sha256": "020d9w7nw7fzdpmhijlgp0j4jg9ydll08fkx7n7kllsl01vzvvyi" + "commit": "ce6df85ee3c4220aedbaecdb6d623fb7b0707b21", + "sha256": "1sk82ad5c75kzbg0ym0z7qix7vlld7vxxk4jf4yijnwf5jnj75gj" }, "stable": { "version": [ @@ -23385,14 +23594,15 @@ "repo": "swflint/denote-agenda", "unstable": { "version": [ - 20250302, - 2012 + 20250407, + 2324 ], "deps": [ - "denote" + "denote", + "seq" ], - "commit": "ad03c7f4778552f9aa42ed5eadac067f2fe8a6d0", - "sha256": "1884gwzzz3k2abr4x7j0p5r258njv7q57mlw1im2h4a4danmzjcg" + "commit": "2643a4ebeb7185a2becc287ccfc6de1265c561be", + "sha256": "1y8d8kr5mlv8a9wpdydz4xb6s977xq16alh0y5mf9h87qg996p8x" } }, { @@ -23455,14 +23665,14 @@ "repo": "swflint/denote-journal-capture", "unstable": { "version": [ - 20250302, - 2013 + 20250315, + 1919 ], "deps": [ - "denote" + "denote-journal" ], - "commit": "6c2c81fff472de81b8e7ba9bccf26788f257ffa6", - "sha256": "0kxcdgs2rs0r7a3sahkkg6i00ggiky9lmjjmxjy3picpmjlsm1mc" + "commit": "64ca22073b01b9a3fca15ff300342ce67932cd3d", + "sha256": "0knm1vsrnwykzcps1k608nhhfsmv7j012fdf0k67kar2phz9vzbk" } }, { @@ -23473,14 +23683,32 @@ "repo": "swflint/denote-project-notes", "unstable": { "version": [ - 20250304, - 2322 + 20250421, + 1646 ], "deps": [ "denote" ], - "commit": "f7426374454f43b2846675c72224722422677023", - "sha256": "15divkv2b9ypndyb1j6a6aqkfhwqca6yjmsyrrjhm04qjky465n0" + "commit": "4dfa153659e68296fc4150b8ffd1e89e76406869", + "sha256": "1mnnm7qprbgdz17k44kllnrlnylsya0rba845p9q8835n4al562x" + } + }, + { + "ename": "denote-regexp", + "commit": "b72b9557316707fad9d96a26d30552d547879d72", + "sha256": "0h0f2m06gk135i1b14z5512da65i9zq5vxdsh97mwj2292l1c4b3", + "fetcher": "sourcehut", + "repo": "swflint/denote-regexp", + "unstable": { + "version": [ + 20250415, + 2202 + ], + "deps": [ + "denote" + ], + "commit": "08d62cb5bb2d271eb4e0915b56a9601179f88627", + "sha256": "1xgg2z91iz070iz2095rma5crcwa033wpa0lvmayiar65ycpbvq6" } }, { @@ -23502,6 +23730,24 @@ "sha256": "0cd9207b9gwbxgv1vvlfk9yv9fy51697fwpr6j0s9v2px3jv9ahj" } }, + { + "ename": "departure-times-norway", + "commit": "6fab35ad7b09bdaab751ac1b24f8a51749a17c66", + "sha256": "1cy1b0vrlw3546aiz71dd26hb7dsvs1aaxjmkb7kyy8aqx31wm1l", + "fetcher": "github", + "repo": "hsolg/emacs-departure-times-norway", + "unstable": { + "version": [ + 20250427, + 852 + ], + "deps": [ + "persist" + ], + "commit": "11448dfe9f03c1e839d398a4d406984139bb0c40", + "sha256": "0nps5asnzajv1aayxrz1hr5aqlc9ljnzmilqbrcqvwl4ky96wl5r" + } + }, { "ename": "describe-hash", "commit": "8c6c5cd96acd3deeb86503341dd9cd729e20185e", @@ -23724,11 +23970,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20240909, - 1711 + 20250319, + 240 ], - "commit": "3de7b1f013cbecebedeeeb16d5fec532ef56c2e2", - "sha256": "1sp6r1i2r8ws6l5i2dlb85lszfhwcqh10kx1a1d3gz9r993mb9g3" + "commit": "e6ccbaafc795e8be54762b2e930ada2967cec08b", + "sha256": "09clfa4ngs86chbfmgzv7s896xvw0wgd0ir56b2zmpra8a9hrln9" } }, { @@ -23978,11 +24224,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20250224, - 2226 + 20250408, + 2344 ], - "commit": "c2a402967b4043e104a431ab72c55477805ad2cb", - "sha256": "1sh9lwnwngdlhzg4zv728f3qmi5l7a6mnjf62ml4k8rlx0lcvww7" + "commit": "4cf357a4499a47c82e31fa1bd34485ae2c9eb353", + "sha256": "1nwvm14ag9a37qq9yqvlwiqhz8ly4waj9109pmqgja9sx3bx71kw" } }, { @@ -24008,14 +24254,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20250223, - 2320 + 20250507, + 2037 ], "deps": [ "cl-lib" ], - "commit": "685e99135001da13caecdff71acea1ee20bed373", - "sha256": "0wifczw882r4hl03yvc8m7b9fp06vccffsqji1lfiv4c3szli873" + "commit": "c2852b0e4b9d8b3b499b5df72d1fc549838a646e", + "sha256": "0irx9r5qs04n8m4fprbbdy3azmcjc72hf1qzffai5vi41rk4d2sh" }, "stable": { "version": [ @@ -24131,16 +24377,16 @@ "repo": "pkryger/difftastic.el", "unstable": { "version": [ - 20250219, - 1602 + 20250516, + 1623 ], "deps": [ "compat", "magit", "transient" ], - "commit": "ddc460e2c7da8b0c8308163edbd8a0a6428c891e", - "sha256": "0xczmm39g62275dnlf6jjc5icfwi1gssszabm2j8x1z2k5gf6qkn" + "commit": "77166b5b7230684e1764d0799d0a96ea79fb06cb", + "sha256": "0nvxc8mxi6al5a79z16x3d9fvb14pi9xwxp19kwakwjcy7h0xmah" } }, { @@ -24174,11 +24420,11 @@ "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20250114, - 2244 + 20250429, + 1455 ], - "commit": "40a12b714d7efd9c396415795ae1fe0a2b12dc71", - "sha256": "1qbkhyvr99yy7ccnlnngg04w3z0il7aqzvqwjhw3vny6xh6jy11b" + "commit": "54b38bd570cd52348065b61360d1194a779a5af6", + "sha256": "0y5939bql53mgdjyxjgfkbzj8k9g01rjqs2fbz5wg7rc1rzh15vr" }, "stable": { "version": [ @@ -24307,14 +24553,14 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20240805, - 1309 + 20250509, + 1453 ], "deps": [ "compat" ], - "commit": "dbe0f038c0a7fcc7e0f021947a42db5b0e8f143d", - "sha256": "1mj1h0j6sdb5c7ylcks51xn69003l0j12kifwz7cmwrhv55g54az" + "commit": "f2d5e3f5b272d958423a9eec1fd094b4764c7395", + "sha256": "1gn7zz1c45ijkqay2mw2dwpjqgiyz3alxz20m4kr20h8m0qi9br0" }, "stable": { "version": [ @@ -24478,20 +24724,20 @@ "repo": "jamescherti/dir-config.el", "unstable": { "version": [ - 20250121, - 2019 + 20250330, + 2325 ], - "commit": "97f127fd2dfb36c854e9455ccc5dc7b953286409", - "sha256": "0nin03z7s61aq1yf7rjd9637f2ys02q6f3640m26p0srska95yzg" + "commit": "985e86dd79cd661493f3858d172d7452c6fb440e", + "sha256": "0bj0767ri5bivk8005cdyzw6lwq42l8z2z3ad80scw7myc04s6q2" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "5cbc2655a5ee734a4747a1b580e331e88c720737", - "sha256": "13flkflgbbh41zr0x378hpcnvkbyld5qa2asr76087dd238ygxhz" + "commit": "985e86dd79cd661493f3858d172d7452c6fb440e", + "sha256": "0bj0767ri5bivk8005cdyzw6lwq42l8z2z3ad80scw7myc04s6q2" } }, { @@ -24752,11 +24998,11 @@ "repo": "jixiuf/dired-filetype-face", "unstable": { "version": [ - 20180907, - 1339 + 20250412, + 1344 ], - "commit": "7ade7f7e8c2d7518c65f3f0343a10c272da0f47e", - "sha256": "0s8mqz331iw2bk4xdvj9zljklqj8dxv0yaw100lddg37qmdf7lgl" + "commit": "41288f9f35a7ef830b9e78fe252b367aee078c96", + "sha256": "05x7383s727vz60jpz8maqkjhdhf8gg4137sw2s33gs13zp2qy2m" } }, { @@ -25025,15 +25271,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20240629, - 1953 + 20250511, + 2303 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "e9e408e8571aee5574ca0a431ef15cac5a3585d4", - "sha256": "0lq73f49qd4ld55f3842vdhy8j6yxz2j37qhzy608pcnbraq0408" + "commit": "bb5d1c3c8b0bb6025335dabb4b3639d60acc6a12", + "sha256": "0jvq84gsg3ma2gh3810l2ywzqnxk2vsckxahn4kj0x96dhb0pnjm" } }, { @@ -25426,14 +25672,14 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20240828, - 1536 + 20250318, + 2252 ], "deps": [ "key-assist" ], - "commit": "447cd0a87dc188793e0482ab8289d09ccdea0bee", - "sha256": "0p7pi0qd7np6nd3p4i9dq25d6lrhfqkr688lyh4cn9h3m980ky5k" + "commit": "44c8acfef3701dd358a876c7af62caf5556d414b", + "sha256": "0rha0jsw05nvda5zk608x4p3g1c4nk3w71x1c58jcbqpawn395kj" }, "stable": { "version": [ @@ -25647,20 +25893,26 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20250312, - 1651 + 20250504, + 807 ], - "commit": "a8e3a4ddcfe07dce284acb6276515bb813a57e14", - "sha256": "13y066sj6ax8czlfp6vy2da310q988vij933wvw31frihwd2v200" + "deps": [ + "compat" + ], + "commit": "d877433f957a363ad78b228e13a8e5215f2d6593", + "sha256": "0d9c7i3x4vfl7k4vi29zyrz1d2cx7kfdnir8slqdjbapyacrl4s0" }, "stable": { "version": [ 2, - 2, - 7 + 3, + 0 ], - "commit": "a8e3a4ddcfe07dce284acb6276515bb813a57e14", - "sha256": "13y066sj6ax8czlfp6vy2da310q988vij933wvw31frihwd2v200" + "deps": [ + "compat" + ], + "commit": "cd235f87ecd67c9195e3e857b4ea313f258c8457", + "sha256": "1x79j3xlvhrvigh38vqhfrzqvdnpzaivbxsjzfi0pnx00y8czs5q" } }, { @@ -25914,14 +26166,14 @@ "repo": "aurtzy/disproject", "unstable": { "version": [ - 20250309, - 2015 + 20250327, + 433 ], "deps": [ "transient" ], - "commit": "35a5794fd1cbca11d6070e30a2344f97042e7343", - "sha256": "06vhsf997jdprh9y2z5lhz73fxl1mq99z6767lmmyavm2hxbxscp" + "commit": "a27b70e7beaa74a8fcebfe8fb1ce4b42c065664f", + "sha256": "0k9icpygqkqx0lwncll4spyaw048mkvwhnhfkha0pkn3krnpmbf8" }, "stable": { "version": [ @@ -26036,14 +26288,14 @@ "repo": "unhammer/dix", "unstable": { "version": [ - 20241128, - 1111 + 20250430, + 915 ], "deps": [ "cl-lib" ], - "commit": "9770a2edd1fd0f872cc4ca72fa8f4b1007cb3da8", - "sha256": "050xh28jhk6gqm4psqkgjh3wqh5jrggrp9ky380f05x8v1ijgvhq" + "commit": "c833800623eaeab74b4d578a2d0219882320c0d2", + "sha256": "1xm9fni1sszd4l19aw2sa0hz4rzzpjci0jnl3wr6c5bq0lzg4k6z" }, "stable": { "version": [ @@ -26414,8 +26666,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20250109, - 810 + 20250411, + 709 ], "deps": [ "aio", @@ -26424,8 +26676,8 @@ "tablist", "transient" ], - "commit": "46b597a711492e1c19d1260951f39372450278f5", - "sha256": "04szzbb59dzab2sz0kcc2i7gllv6ydcskp07fnh0sshsczm35dlf" + "commit": "75a5716e26cbab2147df68dd885c28950c89f854", + "sha256": "0fvq6rlqjq7q0b91342m203f3r5903yx5fg8krckba2m6lcl2krb" }, "stable": { "version": [ @@ -26558,11 +26810,11 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20250225, - 1527 + 20250315, + 1426 ], - "commit": "7ce17e054eca4d56ca8bc1e4a6a0dbf58efd8d52", - "sha256": "1ilnfv57d2rinf0np3i675gfdv8n6iv8vlls92m6d45yahykqacw" + "commit": "8135740bfc6ad96ab82d39d9fe68dbce56180f4c", + "sha256": "0flbf53cqwldrpbbbschkacf105bzm42bd0c7pdkjr5bdc37wlai" }, "stable": { "version": [ @@ -26815,16 +27067,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20250313, - 703 + 20250423, + 1614 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "ec27cdb3cf1fec1db63c752b3654c9de28e22089", - "sha256": "0rl1z12749zzvibp0l80q38mw854zzff4yycgmhci8pr5avjwk63" + "commit": "297b57585fe3b3de9e694512170c44c6e104808f", + "sha256": "0psh1k6fnjv9gazcdrqz6yzhcs1iaj45bh74hcz0dakn270c7n6m" }, "stable": { "version": [ @@ -27095,14 +27347,14 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20250108, - 2201 + 20250408, + 635 ], "deps": [ "debian-el" ], - "commit": "f2708f117cf69ff4c42858448b1101a27b5cb2a3", - "sha256": "0n9g3sf7qnj9ixj7p0vsh9km2a2y7hhj49cz85vra3sg9b092bvn" + "commit": "14a47e96b4f0e20ab9008bac6dc554d07335cbd6", + "sha256": "1gm7f1lh6rrqp21p3pzarqdpw0j1bpi39rl1aaydr163k4akh0yy" }, "stable": { "version": [ @@ -27148,11 +27400,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20241217, - 2145 + 20250407, + 1205 ], - "commit": "a3508f702f96ff262f213de4a49d173449e2cf32", - "sha256": "0qzsw6x5d1qpwfr29zkgd5wlafxk9b2x68pm4pyda99bmr9kd0dp" + "commit": "8b3a005db9e8b7ac57e683bc6631cdc7643e8150", + "sha256": "1f0z53ad89cqs9nskinvqnz3286gvjr4ldifcyc5qyb7r58pivz6" }, "stable": { "version": [ @@ -27465,19 +27717,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20250130, - 1702 + 20250409, + 1325 ], - "commit": "22498ca24ac93c051d233abef630aece1ac45dd1", - "sha256": "1j3sqfs791cmxa3mysrl4r4wxg96dqkkcikqs363qfvi3688k4z9" + "commit": "015b26d6d6af9465c1dc48ef721db119ecd78437", + "sha256": "0lf0q4v5rg9bkw0zxbs9ijblwrgxmc8dqnkags1as1yqp6q1lkb7" }, "stable": { "version": [ 1, - 23 + 24 ], - "commit": "4a5c08c9e0d79d56cfe2e39ccb57b10ddb40f9b5", - "sha256": "0qhnjq3dkdsqgpi9vjn4m0lyzx3jg2z5j0nb895x7nh7c1vhikbi" + "commit": "015b26d6d6af9465c1dc48ef721db119ecd78437", + "sha256": "0lf0q4v5rg9bkw0zxbs9ijblwrgxmc8dqnkags1as1yqp6q1lkb7" } }, { @@ -27547,16 +27799,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20250310, - 2014 + 20250516, + 1032 ], "deps": [ "dash", "popup", "s" ], - "commit": "737267a6139a988369cb95ecd365b2db95e05db0", - "sha256": "1mr06xiqqrknalg7a1xp1kgc4m9pm23sanhq1s3pzsqr6zz1p0zi" + "commit": "42f97dea503367bf45c53a69de959177b06b0f59", + "sha256": "1gjl34q1qmdajl5lvsyhjzxciq1gyafspvm5zg5g0haqb2hdnr99" }, "stable": { "version": [ @@ -27624,11 +27876,11 @@ "stable": { "version": [ 3, - 17, + 18, 2 ], - "commit": "fedec664a6ba500f94ba4558112f52d5719bed4d", - "sha256": "08ayi5z171qwny40a2kjm4qmxa7zc39fj7cnjll4s5ji4zy3ps31" + "commit": "7b971c877d1403da3d536cc180cdd384c7b26341", + "sha256": "0i8ihn3wwkkkcd39g5zwk832rgrgwcbn58smdr8nigshf16p6rqh" } }, { @@ -27824,11 +28076,11 @@ "repo": "dylan-lang/dylan-emacs-support", "unstable": { "version": [ - 20250209, - 721 + 20250319, + 1925 ], - "commit": "8cf635979a2233e14a2a72071d44ddb47109edef", - "sha256": "0jghp6b8n27dw62qzqz6afrny2a5gyj7ml2r9z0cazgxx4gbz34j" + "commit": "342d86a58ad307a581fc95c0f271661444dbc13c", + "sha256": "1lpy03lzfpws828wn4f89cqnc0js4d65kk206xrb6rjlx55yv2a9" }, "stable": { "version": [ @@ -28295,20 +28547,20 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20250226, - 2354 + 20250514, + 232 ], - "commit": "8d831ff25d085634e288b35d4774f8c4a48a4d76", - "sha256": "03hafc1q3gfk6pcx4ijrrzk1isljc4jka67wx5gv6h7hgwvkwxh7" + "commit": "db438a5e09a8a026cc66af09ca409d14ef322633", + "sha256": "0lx1ilc6rvfm4bv1dbvmhg93vxps7wx4qph16230fiqdh8j9bkrw" }, "stable": { "version": [ 0, - 10, - 3 + 11, + 4 ], - "commit": "25f7f00ad4d73aacca027d6e1ba6070b8b2019b0", - "sha256": "1i6pck66l45x0p04kayjrsvi0516z730wb68cpshyfrbc409narx" + "commit": "c9942846da64f4f2806eb071239cf6de60e3fd4b", + "sha256": "0g1kzfxy0qn27j3xfcjrggf7vvxic8hxvddfa49165l3w54ibc8b" } }, { @@ -28346,8 +28598,8 @@ "repo": "emacs-eask/easky", "unstable": { "version": [ - 20250101, - 836 + 20250404, + 17 ], "deps": [ "ansi", @@ -28356,8 +28608,8 @@ "lv", "marquee-header" ], - "commit": "fbb64633a690ee1afe8aef873b7be3471e766788", - "sha256": "17xdwfq42mvklikfmpf6q6bsa8rli977rgd56z1z1zjif6p5x5jl" + "commit": "070c734bdc5fafdf0de060f9584b1a037681eac2", + "sha256": "0zcw1575kkabifxcyvw88dh5snp1b265f0s8fmhpvrbb350l24v5" }, "stable": { "version": [ @@ -28561,26 +28813,20 @@ "repo": "jamescherti/easysession.el", "unstable": { "version": [ - 20250308, - 2208 + 20250426, + 1725 ], - "deps": [ - "f" - ], - "commit": "0e7ce6d69945cfc4a0cbbc758048dc3d50ddda71", - "sha256": "1gsd5a9kmmgbkcjyqqvapdgydn2399jgvyl0zng1irl19pkrjjg3" + "commit": "2d478bf264b8f4e8bae9222e67fc69553bee7cc7", + "sha256": "0d5cipvgrxn07plim9af4lp59bfaliim4m63fjgad8ib6hxlfqrf" }, "stable": { "version": [ 1, 1, - 2 + 3 ], - "deps": [ - "f" - ], - "commit": "c2c4fe4da6d11ce8945e20b8d93feb112c05d551", - "sha256": "0qwqbfsccmlrywq0lhwv4vl6x7mnyyl8071s8975ip6rv76zyw0b" + "commit": "1a72f4e0460d81c7b5c43fd5b96aa743b6340bec", + "sha256": "1wrw3x27fvh94bs6sajcfz421q01b1i4kdm3k5m3fd384md5jqr3" } }, { @@ -28656,28 +28902,27 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20250222, - 1322 + 20250508, + 1426 ], "deps": [ "compat", "parsebib" ], - "commit": "aa54f33ee2b1205e651da1153014c128d82f1659", - "sha256": "028b6dpwaidjfc6h79wlfqggxdc4adng72amgsgm0hik70a604v0" + "commit": "95c9b970f0b3e20dcf650726c4928cae6461c776", + "sha256": "0g9cwd9jv9p0m9a488f34fw8vlxhyasdjbcv36hfiyzzls93r2rp" }, "stable": { "version": [ 2, - 49, - 1 + 50 ], "deps": [ "compat", "parsebib" ], - "commit": "afe85e3d048ec602ededc24d241b4d8bd459ea99", - "sha256": "0b2ybyjnw8ig7vjw4x7c1dsvj7d56b7a8nmli7nbsp5ncz6w7jpp" + "commit": "95c9b970f0b3e20dcf650726c4928cae6461c776", + "sha256": "0g9cwd9jv9p0m9a488f34fw8vlxhyasdjbcv36hfiyzzls93r2rp" } }, { @@ -28776,45 +29021,6 @@ "sha256": "1mpq8ha42lffzzwy0ib8vbb2dp9fgqnh112wfa1a6b3vh21wnxm8" } }, - { - "ename": "eclim", - "commit": "1e9d3075587fbd9ca188535fd945a7dc451c6d7e", - "sha256": "1n60ci6kjmzy2khr3gs7s8gf21j1f9zjaj5a1yy2dyygsarbxw7b", - "fetcher": "github", - "repo": "emacs-eclim/emacs-eclim", - "unstable": { - "version": [ - 20181108, - 1134 - ], - "deps": [ - "cl-lib", - "dash", - "json", - "popup", - "s", - "yasnippet" - ], - "commit": "23f5b294f833ce58516d7b9ae08a7792d70022a1", - "sha256": "17q972354nkkynfjmwih4vp7s5dzdvr3nf7ni3ci095lzb0zzf4g" - }, - "stable": { - "version": [ - 0, - 4 - ], - "deps": [ - "cl-lib", - "dash", - "json", - "popup", - "s", - "yasnippet" - ], - "commit": "8203fbf8544e65324a948a67718f7a16ba2d52e6", - "sha256": "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3" - } - }, { "ename": "eclipse-theme", "commit": "81fcf3536ead18a91400f6936b3f789b4b594b9c", @@ -29190,11 +29396,11 @@ "repo": "stsquad/emacs_chrome", "unstable": { "version": [ - 20220908, - 1014 + 20250417, + 1401 ], - "commit": "3ce09c6eb2919d56ef052b1584bba6abb12f7e99", - "sha256": "1yvcwpi5khrzs647nwg0hh8r537xvxjq6ylwq1ss4hd5yg58brsk" + "commit": "e45b213a22bc93ca52962203784e7b5d25a53245", + "sha256": "0cshj27g2zgdi4jm8fqcc0qjfyfgxidrsls32p0ch626wzwdp4wh" }, "stable": { "version": [ @@ -29646,16 +29852,16 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20240514, - 1923 + 20250403, + 1925 ], "deps": [ "eglot", "fsharp-mode", "jsonrpc" ], - "commit": "677d78c4d6cb574086408082dedbcaef04a85359", - "sha256": "0by1ln0raa89dj2jng6kak69b7nzr3ic090wrg4gg6mqky5qbm5n" + "commit": "8d08f057889bcd19812d17d955865428626d8c47", + "sha256": "153zg59gk76zr0cff60zv3a9v529dmj6m9zlkl7fr2l1rvpxvzrv" }, "stable": { "version": [ @@ -30001,28 +30207,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20250313, - 436 + 20250516, + 1438 ], "deps": [ "llm", "triples" ], - "commit": "eb79cc31ec6ee93ef1db97868b6e2d7593321441", - "sha256": "0mp97z5bnz5wnk7pgd432k828wypwiwlv7fwkr21wwrr0181jpr9" + "commit": "d3b7766e524de4b354d8f5dc961b796ac5a282c7", + "sha256": "0byyc6gq99n5kj7q973q8w0xr7qsyz9d9nm5h0sfndjnhf37xnim" }, "stable": { "version": [ 0, - 6, - 4 + 7, + 1 ], "deps": [ "llm", "triples" ], - "commit": "942457bb75574f17058cba1da25e46aeee3fde4b", - "sha256": "0cmridxl0ngvh93lbndpbvzp4wbi5wd3hm30hhh4wp8qw280xygj" + "commit": "3000fa56aa97fffa42b203037e2db6f4fe56bb7d", + "sha256": "19n3ffjydnkj9qrhvyhljih446inah1fggxw5q6168pxzpz6p8yk" } }, { @@ -30188,20 +30394,20 @@ "repo": "meedstrom/el-job", "unstable": { "version": [ - 20250313, - 1138 + 20250516, + 1908 ], - "commit": "33ee1713e1219e4f86c7817cb5491e7532750afa", - "sha256": "0n7gh9awd3fhr0hnwdbk0wsqx8sl01pyaks2jpvzcr532al2mn7b" + "commit": "9258e707ad154170a8beae3f84b25161f42aa200", + "sha256": "0gspy2yvi7pyzvw73p49s42a3w104xlrwwvwykw93rf277kq4i6d" }, "stable": { "version": [ 2, - 2, - 3 + 4, + 7 ], - "commit": "33ee1713e1219e4f86c7817cb5491e7532750afa", - "sha256": "0n7gh9awd3fhr0hnwdbk0wsqx8sl01pyaks2jpvzcr532al2mn7b" + "commit": "9258e707ad154170a8beae3f84b25161f42aa200", + "sha256": "0gspy2yvi7pyzvw73p49s42a3w104xlrwwvwykw93rf277kq4i6d" } }, { @@ -30259,15 +30465,15 @@ "repo": "zetagon/el-secretario", "unstable": { "version": [ - 20220426, - 1905 + 20250407, + 1946 ], "deps": [ "hercules", "org-ql" ], - "commit": "575396ca689065188ad0f90c379d9bcf7ff6fc0b", - "sha256": "07kdwl4wr777ncidlv1v3jllfhimbkkhhimz9zgskmbfgrxw5sxn" + "commit": "0c728c3bdd1d19356c192ba333a945d732bd16b8", + "sha256": "075dvn7mr0wxbbghkz3lhw777wfgp4ppzkjcp46dwcpqmdgy2h4i" } }, { @@ -30278,15 +30484,15 @@ "repo": "zetagon/el-secretario", "unstable": { "version": [ - 20211214, - 1851 + 20250407, + 1946 ], "deps": [ "el-secretario", "elfeed" ], - "commit": "2a5290ad57d9800d4b56896a768e37631bef06b0", - "sha256": "15b2jz0ddvikpfg8m85l1m84ddmj1l9pvai0frw61p6mg5rnwxaj" + "commit": "0c728c3bdd1d19356c192ba333a945d732bd16b8", + "sha256": "075dvn7mr0wxbbghkz3lhw777wfgp4ppzkjcp46dwcpqmdgy2h4i" } }, { @@ -30297,15 +30503,15 @@ "repo": "zetagon/el-secretario", "unstable": { "version": [ - 20220422, - 2006 + 20250407, + 1946 ], "deps": [ "el-secretario", "org-ql" ], - "commit": "78a811f02c7104a39b908f9e4c8436abde4b9620", - "sha256": "0hj7ly33jahpvhlwq1cwc262ymsqf70jf1vq9zaqmsz9wn04nryi" + "commit": "0c728c3bdd1d19356c192ba333a945d732bd16b8", + "sha256": "075dvn7mr0wxbbghkz3lhw777wfgp4ppzkjcp46dwcpqmdgy2h4i" } }, { @@ -30316,15 +30522,15 @@ "repo": "zetagon/el-secretario", "unstable": { "version": [ - 20220428, - 1058 + 20250407, + 1946 ], "deps": [ "el-secretario", "notmuch" ], - "commit": "c4e21ac5a9be2b2ea6cf7c153a6fae48c78a61b9", - "sha256": "0jnr75fzhi2m1b65z72q2m970nk52rkvzwkkv27rzbprd43hxnzd" + "commit": "0c728c3bdd1d19356c192ba333a945d732bd16b8", + "sha256": "075dvn7mr0wxbbghkz3lhw777wfgp4ppzkjcp46dwcpqmdgy2h4i" } }, { @@ -30335,16 +30541,16 @@ "repo": "zetagon/el-secretario", "unstable": { "version": [ - 20220411, - 1419 + 20250407, + 1946 ], "deps": [ "dash", "el-secretario", "org-ql" ], - "commit": "fe6fc69d298368ae24a6aac27a325ee03ad9e64c", - "sha256": "0qwlgjzssaapl6pyxv5zj5z0qqp6pgff9kma7qncq4pyd8w3vqxs" + "commit": "0c728c3bdd1d19356c192ba333a945d732bd16b8", + "sha256": "075dvn7mr0wxbbghkz3lhw777wfgp4ppzkjcp46dwcpqmdgy2h4i" } }, { @@ -30591,11 +30797,11 @@ "repo": "vilij/slurpbarf-elcute", "unstable": { "version": [ - 20241115, - 1459 + 20250326, + 2158 ], - "commit": "c6e7d4b5da6f1116b479c71d9c7fa0aca71d4030", - "sha256": "1xd8nd55dhdf1dx622x2618zj3xk196p2yr4123hk8hlqlb46h2d" + "commit": "47980a15f760d14a7c44a8dbc3e708a47d2f489e", + "sha256": "134ra4cshr3ldqwdaqvrv2iiqkdyfrh66i0kh17lc1yyyssn43fl" } }, { @@ -30606,19 +30812,20 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20250312, - 1010 + 20250314, + 2105 ], - "commit": "0d001f26a7e50e46b342a84eccf92940649bd5fe", - "sha256": "0h1a0k9fljxvll5q71ki74lf5vgdrjbr3js81wyrjshcasn1nwfa" + "commit": "87373ddace0c4b2267d8f45ebd20e4b0eb27f821", + "sha256": "19lapjhhq39ffimgh20l148c456811xrgdxnycjlc6iy6zrbdbda" }, "stable": { "version": [ 1, - 11 + 11, + 1 ], - "commit": "d9b35faade3d361a2a263511c16b8c1fe7614f5b", - "sha256": "144wf5im2fy1fv8jjik1s9zfyicphh2pi4dp6q4airrkiirmmr3m" + "commit": "ff1e8269fca7e2ee2e50774ade3ce88b79e78cfc", + "sha256": "0sf8xyzblc0fs2d65jgcycavnzmrp1wg0sfr29gjkq1kvzyl7phb" } }, { @@ -30629,11 +30836,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20250120, - 502 + 20250510, + 1854 ], - "commit": "ebc0e2c13791f5a22cf81be050b32f0ebf726855", - "sha256": "0l8xrl7p50ixdfg100my71y88m5pvn1arhhfy3dw1b26w1wxh8p0" + "commit": "fb1ae42c37c5f3bb80b441b2fdfada914891a714", + "sha256": "0id77zab8q7pll9akdb0l1akvpl25zc61qyz3lx9wvavg59aby3w" }, "stable": { "version": [ @@ -30653,11 +30860,11 @@ "repo": "ikirill/eldoc-cmake", "unstable": { "version": [ - 20190419, - 2244 + 20250320, + 2017 ], - "commit": "4453c03b5c95ff32842f13db2fc317fb0fe2f79e", - "sha256": "01jhfglj1v4p3qmhiri4k05p0dg10k59pj5608hjls6zsmxf2wbg" + "commit": "8ffe7ef0fc01f487834d6bb2468f2d55d68277f1", + "sha256": "03a0xw4y5r5dklm3kc338ww7c16znfl6d4b3chibz7rn2lj85prd" } }, { @@ -30852,20 +31059,20 @@ "repo": "swflint/electric-ospl-mode", "unstable": { "version": [ - 20240428, - 1829 + 20250502, + 1439 ], - "commit": "deab4493530ab4bb2112c18d8ca6ccc652e24a63", - "sha256": "1l8d2yjg7rq67vwd0mq8lnfbvwvdp707nm856m9ns3j7jbhpzf9a" + "commit": "a17f7312ef48eba1586c7d0637336eb19aee057e", + "sha256": "04mp6pqxr5p01z4wqkj8wy07ys3p1n5fm9h3yzplknvr3n2djvxl" }, "stable": { "version": [ 3, - 2, - 0 + 3, + 1 ], - "commit": "deab4493530ab4bb2112c18d8ca6ccc652e24a63", - "sha256": "1l8d2yjg7rq67vwd0mq8lnfbvwvdp707nm856m9ns3j7jbhpzf9a" + "commit": "a17f7312ef48eba1586c7d0637336eb19aee057e", + "sha256": "04mp6pqxr5p01z4wqkj8wy07ys3p1n5fm9h3yzplknvr3n2djvxl" } }, { @@ -30900,10 +31107,10 @@ }, { "ename": "elein", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "01y5yrmm3biyrfgnl3qjfpn1xvjk2nabwjr8cls53ds697qpz5x2", - "fetcher": "github", - "repo": "remvee/elein", + "commit": "0ddcfbc20264759a22712130c8ccf0825d3d198b", + "sha256": "0nh3kvm3vdbpc48cbs1dlfb9yaxyg25nwr62w2diynqlpgl797d0", + "fetcher": "codeberg", + "repo": "rwv/elein", "unstable": { "version": [ 20120120, @@ -31231,15 +31438,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20240606, - 241 + 20250321, + 1717 ], "deps": [ "aio", "elfeed" ], - "commit": "0c3fbc21259e1fa794f3179a53b410ba610231f2", - "sha256": "0hg2s5yzpd1fsl0fyrfv2cc2m61a67drfg86msfqpqdmkv30pbca" + "commit": "79d5a08d76ea3ae96d7def9a5e2ede2e3562462a", + "sha256": "0pzxama7qyj9i4x74im5r875b7vv1zrkgfncf5j1qxixj96jzfna" }, "stable": { "version": [ @@ -31407,11 +31614,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20250224, - 2229 + 20250421, + 1112 ], - "commit": "5d6d843d2a94aa462c32456e2ec751ce5ca3cab0", - "sha256": "16062wbkxfg39q2c5v2j64vymx9sxvhzkpmrlajgrgas6jxyacc6" + "commit": "30c9895f9cb64ac83a53b9f3e78a27f5abca322a", + "sha256": "192m68jwjplqxjnja4mc32fgrdixrxnr3y4xl64s8v4nwjd1rvs2" } }, { @@ -31721,8 +31928,8 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20250312, - 1931 + 20250402, + 1649 ], "deps": [ "compat", @@ -31730,14 +31937,14 @@ "plz", "transient" ], - "commit": "a97cfc250998efadfc728a1021770294d150d77f", - "sha256": "1lcrfnb9fbc6nb14hjc0v24cq309vd7wsin80gy9v97y22bdmpnv" + "commit": "3b8cb569409ccbef7e9e955aefcd550c4be3e607", + "sha256": "1019vwrm95ck2gi29mvwd7sy753zgwa3addw2x0qbhvb3r53620v" }, "stable": { "version": [ 1, - 5, - 4 + 8, + 1 ], "deps": [ "compat", @@ -31745,8 +31952,8 @@ "plz", "transient" ], - "commit": "a97cfc250998efadfc728a1021770294d150d77f", - "sha256": "1lcrfnb9fbc6nb14hjc0v24cq309vd7wsin80gy9v97y22bdmpnv" + "commit": "3b8cb569409ccbef7e9e955aefcd550c4be3e607", + "sha256": "1019vwrm95ck2gi29mvwd7sy753zgwa3addw2x0qbhvb3r53620v" } }, { @@ -31776,8 +31983,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20230315, - 1122 + 20250401, + 915 ], "deps": [ "f", @@ -31785,8 +31992,8 @@ "s", "seq" ], - "commit": "699841865e1bd5b7f2077baa7121510b6bcad3c7", - "sha256": "1rbl42hv5b41sqr98p9brckn6pa8wx6smnhcv1bmmyb3cxam79c2" + "commit": "90b72cd2c9bc4506f531bcdcd73fa2530d9f4f7c", + "sha256": "1if2myy9gr5xzy9sc9sjgvmpys11q39v673rmyncdzvhfjh8q2r4" }, "stable": { "version": [ @@ -31952,14 +32159,11 @@ "repo": "lujun9972/elog", "unstable": { "version": [ - 20221207, - 643 + 20250413, + 100 ], - "deps": [ - "eieio" - ], - "commit": "e171d0ff0a21011124204d77111e5992b50b7007", - "sha256": "0ikaf8cak6m9rm78hnfd4bh3hx6vrm1307dggxxsz3862kcwj5aw" + "commit": "c65288fd32eb187d3e63d4a7799a69e57da0eab4", + "sha256": "1sv0j59hr9f9qdrxwfzfc7jsbxc9fcbx3amwsq6vv3ckrvhf3hq7" } }, { @@ -32145,8 +32349,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20241227, - 2255 + 20250404, + 2349 ], "deps": [ "company", @@ -32155,8 +32359,8 @@ "s", "yasnippet" ], - "commit": "bcfd5e8c25e5efbcb26cfcf389f1bf01c2e2f44f", - "sha256": "00vvwa7h371fnq687mvccnlv38mjwzlr6h6yrzg0s8bl8vjg85q3" + "commit": "0b381f55969438ab2ccc2d1a1614045fcf7c9545", + "sha256": "0398zwzq5c33fi8icyy2x50q7rs819i5xkpmhbfm1s34m6prv46a" }, "stable": { "version": [ @@ -32231,8 +32435,8 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20230621, - 1005 + 20250316, + 29 ], "deps": [ "ansi", @@ -32244,8 +32448,8 @@ "lsp-mode", "trinary" ], - "commit": "f719e2404ab6f3323df9341751469cb2e413e013", - "sha256": "1098li76wz3g9zdmrl65a93ba39dqd3dqmnazs477bmyjfc6lxyh" + "commit": "4ce89b0cf313143cd6b7614f4f50aa8179354df6", + "sha256": "173933cg5bpqshy9f7kyh4y4mzj6k6i5rnfvrq8r073pcclx71c2" } }, { @@ -32522,14 +32726,14 @@ "repo": "lanceberge/elysium", "unstable": { "version": [ - 20250216, - 2328 + 20250406, + 1638 ], "deps": [ "gptel" ], - "commit": "21276b513f009f291594ba072f5e5fbf9c14d2d8", - "sha256": "0marbjrg3nfdzgpqv1n0151b00kdbvcp2v67b9fwdqhwxm9hmi1b" + "commit": "049ad3091baf3ce578791187c5e5e4f932c26044", + "sha256": "0x1lk24xrd0jq14h4bcmp25x2brfi5rmdxigz0wj5ipf2b57vv2y" }, "stable": { "version": [ @@ -32552,11 +32756,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20240509, - 1715 + 20250325, + 1523 ], - "commit": "0b731ca6da351ba40953d090acf69e81757d437b", - "sha256": "0y5p0lvggjhv37fvr2li16x4kxf8y6nab8l38bdrmws34cip54cz" + "commit": "caeab3948ff02acec4e4bbc2ff17090f56c7040e", + "sha256": "1rh28n44jawmb8zqx8vd2cvg27x4q8jnrbw38l07yhza13zjz26l" } }, { @@ -32606,20 +32810,20 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20250301, - 1637 + 20250401, + 1500 ], - "commit": "f111b0acc79eadeeb3c6c1332d943f11fd6932ff", - "sha256": "08zc3x6cgbn2x67xajz8rnika3bhd86yb6h77q8wg1dxyh1ib2m9" + "commit": "5470adaf5dcabebc80c913ac831258fd47a87cbe", + "sha256": "0bjw4qbm254r51kgl0bg4scblk998p0y3m140k5lmrdb7k4pnxq2" }, "stable": { "version": [ 4, - 2, + 3, 0 ], - "commit": "f111b0acc79eadeeb3c6c1332d943f11fd6932ff", - "sha256": "08zc3x6cgbn2x67xajz8rnika3bhd86yb6h77q8wg1dxyh1ib2m9" + "commit": "5470adaf5dcabebc80c913ac831258fd47a87cbe", + "sha256": "0bjw4qbm254r51kgl0bg4scblk998p0y3m140k5lmrdb7k4pnxq2" } }, { @@ -32726,14 +32930,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20250127, - 1315 + 20250423, + 1650 ], "deps": [ "compat" ], - "commit": "755cb49b59801ff420193cc0e3b1a7aa12bf22e3", - "sha256": "0n8khkgk3mnm48b9426radzmrgda0k6zcc0c0ws8yl2gpnkblkxn" + "commit": "923d0ec52e2e3e0ae44e497c31c7888e87d08a8f", + "sha256": "133fwgaddsm72r7mgk85zbjwii6fs9ld9vsdvyly50mb7zn6bl00" }, "stable": { "version": [ @@ -32979,28 +33183,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20250313, - 1342 + 20250405, + 1417 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "3286ac88bf2c306bd66431205eb80ca3bff3e7ef", - "sha256": "0gczgnkvls5dr69zh9qcdh4m2f5zqgdx8y6z35cdv3lcbrvc4vkh" + "commit": "abb4f614dae6b7e90ee1f275d8a5e40721c39d54", + "sha256": "0xbqgv01say2hidrls6rwy2d902ks28z41h1hkpj73f8s4h0d520" }, "stable": { "version": [ - 21 + 22 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "a01df752e19458c011dc838bc40a4474728f644e", - "sha256": "0dh5iil9liaxmix8g9ha0wyg788zdpmfyabd7z6sn9m7rw48vv22" + "commit": "338462506d7de508f7f74a01d15753f9113cd3cb", + "sha256": "0s89r9fr79kv864zydqgkv2fdwxa0n84w5b40v87rj5hlya0kx6v" } }, { @@ -33129,29 +33333,29 @@ "repo": "sarg/emms-spotify", "unstable": { "version": [ - 20240302, - 2106 + 20250411, + 619 ], "deps": [ "compat", "emms", "s" ], - "commit": "3b1e8e5b5306173940d311191b13e2ace4d048b9", - "sha256": "1z96pwax3igw5sprk48v4wgxp2pb9qjfbp0dm5jqxqrmhza0qici" + "commit": "ca80431b00738e6130b924c64dc1f2cddadcc0b8", + "sha256": "0vv739axlp3hfvmh10ap0n70i4qd6jls9fb5ppczdxjcr5h9bgd7" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "compat", "emms", "s" ], - "commit": "3b1e8e5b5306173940d311191b13e2ace4d048b9", - "sha256": "1z96pwax3igw5sprk48v4wgxp2pb9qjfbp0dm5jqxqrmhza0qici" + "commit": "d9e3e2d639b0cd1333cc180f562d9e228b7ac565", + "sha256": "12vpdb4ziv0ljgvca6c4x9k74z0mxw896xyvv1p2n9gkg5hqi860" } }, { @@ -33390,15 +33594,15 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20250225, - 1652 + 20250406, + 2037 ], "deps": [ "compat", "s" ], - "commit": "4c660fe44f7ea562896924ce9de28cd37ef15a38", - "sha256": "1lb2fcry04rcdyviacfp9s9rz7nsxskyr00md59cm6zflrv6wrgv" + "commit": "f14d4ac96e24368ad4688efc4a71da39804892f0", + "sha256": "06ahark9jin8cfk7d6d82xyhy0pp1yrd03c4lawhyppn1aswkb5z" }, "stable": { "version": [ @@ -33755,15 +33959,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20250110, - 1756 + 20250401, + 1656 ], "deps": [ "inheritenv", "seq" ], - "commit": "2b818ca6e4a2f723e7cab70cd0101c2728581c3a", - "sha256": "0zz51rs45vxhqhlw423haxw360xc1yk8x32p8vy7pxaylngk950p" + "commit": "4ca2166ac72e756d314fc2348ce1c93d807c1a14", + "sha256": "1l10nldvdb1dyikz1ahccbmp09i4dhqynl3w4sma7a29n8sciyyl" }, "stable": { "version": [ @@ -33899,8 +34103,8 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20250302, - 4 + 20250509, + 1442 ], "deps": [ "closql", @@ -33908,14 +34112,14 @@ "emacsql", "llama" ], - "commit": "553550bf285af0f168ce8b58483d70ceb3dee73f", - "sha256": "1a6zw1z318ip4vnqfgv99b2knbm3qq6ji7spqq9g5w3lls40aqvx" + "commit": "327709a01a6eded82016a24c478456b8be31da09", + "sha256": "0rxpcjkgmmishalhvg3lfc3lcq704kssq8w9g5c1v5ppppp36fnk" }, "stable": { "version": [ 4, 0, - 5 + 6 ], "deps": [ "closql", @@ -33923,8 +34127,8 @@ "emacsql", "llama" ], - "commit": "553550bf285af0f168ce8b58483d70ceb3dee73f", - "sha256": "1a6zw1z318ip4vnqfgv99b2knbm3qq6ji7spqq9g5w3lls40aqvx" + "commit": "e66f246ec2df5d62665c0bdcf3f8f5534225b934", + "sha256": "0sl45frbvkfiblbbpa3xlv58bql8p8bms80p7yi2fp4ggipq8k19" } }, { @@ -34402,11 +34606,14 @@ "repo": "leathekd/ercn", "unstable": { "version": [ - 20150523, - 1503 + 20250317, + 2338 ], - "commit": "8f2493fb40753b9c3699322c205f4dcf0a5bd67b", - "sha256": "1hzzfh6fxx03cyb039jbhwdfd0zybfrlaqmcyf14f6dq4d3gvl92" + "deps": [ + "dash" + ], + "commit": "ac063a64b9e04e4f74ba22b95275cec3bd9dfce1", + "sha256": "0i7lrqfj7gryvxi2wkqlnb06gf9391w5s5vmlhkl4lik85jkny64" }, "stable": { "version": [ @@ -34557,11 +34764,11 @@ "repo": "agda/agda", "unstable": { "version": [ - 20240220, - 2129 + 20250328, + 1043 ], - "commit": "d4ac6d038e25bb8d4912da7a4c5df91a856e1c9c", - "sha256": "0sfd2y2h606m5800a978sm2ram4sx1cbx2ng1d2hf37qqa950j85" + "commit": "ad8ea74ccefd3507006a7ea9a7d9ff5b7a973603", + "sha256": "0qiqw69h9vpvwisqngkfdpfqibi5w5ddhxhwvbrv0ah2n29saswr" }, "stable": { "version": [ @@ -34616,19 +34823,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20250115, - 1500 + 20250416, + 708 ], - "commit": "dd160c846e656634a34f4cc4b4aed46cbe5d6744", - "sha256": "17dyf73iaqlifccyjxjvm3yafq4rwkifd7widnpswgdqwhd49fka" + "commit": "a87183f1eb847119b6ecc83054bf13c26b8ccfaa", + "sha256": "1zq43jaw99vdzlj48dbm72aiyimq5gbxvs0amaqn2dal0nry1q5d" }, "stable": { "version": [ 27, - 3 + 3, + 4 ], - "commit": "05737d130706c7189a8e6750d9c2252d2cc7987e", - "sha256": "1g5nhsq26gknz8705k9lk0vgmlwkimzzw90vx1wqswkdm7crsgv5" + "commit": "c388a2d1b3f9918652276d4798692dd4d8ef97fc", + "sha256": "0aadwh3mqn0y2h8wsg18p2hvyb76dh5s0klca4824z9rp7bqv625" } }, { @@ -35206,14 +35414,14 @@ "repo": "mallt/eshell-fixed-prompt-mode", "unstable": { "version": [ - 20220104, - 1535 + 20250414, + 914 ], "deps": [ "s" ], - "commit": "302c241b42764bd6b4ed6d3c6ea360b5a2292fbc", - "sha256": "10igzz5vhjkq4m7mc45ngfi3ahimcn2c0zcqqazk3jgysy1hjgp2" + "commit": "f495a7bdf0f5da87e9eb3021862aa8e2ec578948", + "sha256": "1vxaw2mq80i39lid8c2la14bs6pk3jg87nmfh3gnmjc3sh3ka6cy" } }, { @@ -35371,14 +35579,14 @@ "repo": "4DA/eshell-toggle", "unstable": { "version": [ - 20240417, - 1536 + 20250513, + 1742 ], "deps": [ "dash" ], - "commit": "222e05870c0b3f4a4d96f9bdb7065c53eb43a917", - "sha256": "13j2jgpiqa0y24hv4dw26m6dmfy0apyjbizxrgm63qy4b24lj1i3" + "commit": "04e501e02c475bd9067eebcf8807c951f2316194", + "sha256": "0l26njh99asr9vd40iy5vp03jlzdhm7qzs2jwg2q00qwws3r6zbs" } }, { @@ -35654,11 +35862,11 @@ "repo": "walseb/espy", "unstable": { "version": [ - 20200317, - 2333 + 20250417, + 1352 ], - "commit": "2c01be937a5e5bde62921684a0b27300705fb4e0", - "sha256": "1nnnr184y29g1svxqxlqyg5irzrf1xmay4p78jfv8v07sisl90kp" + "commit": "f58049ed86798b6cb7f462e0a71bf3ecb1f0f9e5", + "sha256": "04q3s7pj55m4h0vdh5kss5yy17gxxsg01pcr0makvhg4yf9gk1h7" } }, { @@ -35706,11 +35914,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20250110, - 1437 + 20250508, + 735 ], - "commit": "0eb240bcb6d0e933615f6cfaa9761b629ddbabdd", - "sha256": "089kvjjrzas0zsv6wjhmcir62mkbscjpzvqifq0cp58m7wmrbxs2" + "commit": "cf5c97bc68432c6d40b85803a5ce32b4f456fab2", + "sha256": "1z440ay4l5k81s8l14ywmnyv6ds02w49fwgnx121c7varijxwm8z" }, "stable": { "version": [ @@ -35851,16 +36059,16 @@ "repo": "GioBo/ess-view", "unstable": { "version": [ - 20181001, - 1730 + 20250409, + 2120 ], "deps": [ "ess", "f", "s" ], - "commit": "d4e5a340b7bcc58c434867b97923094bd0680283", - "sha256": "1yzki5f2k7gmj4m0871h4h46zalv2x71rbpa6glkfx7bm9kyc193" + "commit": "82df032e6e367e7f587e6131925c0a349c685f93", + "sha256": "1irhlh31qjmyp8jb7z7k63bm81baxy1rm9r93d7jlfqw0wh1djc3" } }, { @@ -35871,15 +36079,16 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20240127, - 1701 + 20250516, + 121 ], "deps": [ "csv-mode", - "ess" + "ess", + "transient" ], - "commit": "c077741bc3386a469635ca7438db4cf58b7541b9", - "sha256": "0gbim8hkflj5cxg84wnv32zfwacri3v26azmcfzh6w3mkflfp1bq" + "commit": "5ec1c7206f1431c7b24f0990497ecc7e0fb33939", + "sha256": "1nbwk312rqx1nlqk1cy7nirj8dsjpbwy0rqzybgly5s1rgldfnl5" }, "stable": { "version": [ @@ -35952,28 +36161,26 @@ "repo": "tali713/esxml", "unstable": { "version": [ - 20230308, - 2254 + 20250421, + 1632 ], "deps": [ - "cl-lib", - "kv" + "cl-lib" ], - "commit": "225693096a587492d76bf696d1f0c25c61f7d531", - "sha256": "1cciflr51smahv1x0hr2kwl24ivv54arnqn32s16l77dwy5dvy60" + "commit": "affada143fed7e2da08f2b3d927a027f26ad4a8f", + "sha256": "1yqwx53yzn2izhdzchm3cp8qcln2j0n015xlyg3c020q08sai1ha" }, "stable": { "version": [ 0, 3, - 7 + 8 ], "deps": [ - "cl-lib", - "kv" + "cl-lib" ], - "commit": "9f96449f6059cb75491dc812ddeb1b6200ec6740", - "sha256": "1xzxmgsg0j72sf1vjh9gjswz3c29js0kqhm7r3jrqrh3a5agdnml" + "commit": "affada143fed7e2da08f2b3d927a027f26ad4a8f", + "sha256": "1yqwx53yzn2izhdzchm3cp8qcln2j0n015xlyg3c020q08sai1ha" } }, { @@ -36364,20 +36571,20 @@ "repo": "mekeor/evenok", "unstable": { "version": [ - 20250309, - 138 + 20250506, + 1255 ], - "commit": "9e551dbfb8aea093628ee4f62ba9836c9c437192", - "sha256": "10bqnk1sg2adrynp0qvpnbypr7n26hlynw8s8nhwj7ns62104fd5" + "commit": "f3c875139ae57fcb52f2d7ab2d4238c2af8e204c", + "sha256": "0r5j958zvqzsrmgj71rvwkmx69f8p360f5c26qlx0l0ng5ff12ng" }, "stable": { "version": [ 0, 12, - 0 + 1 ], - "commit": "d6600fc808e54dce44d3f8eb2b4e56a60c946c90", - "sha256": "0q587f56i8wdaj53dx9vyd0bd00skxjsascqirx7j1fc56bcfbrh" + "commit": "5fc6494c4efba2bb0615e3e5c813f5425be21ec7", + "sha256": "0izmcw69wipz1pr2kqs78r9xf71rni90pid9vf0z8c09jw9zjzf7" } }, { @@ -36411,16 +36618,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20250302, - 655 + 20250318, + 1816 ], "deps": [ "cl-lib", "goto-chg", "nadvice" ], - "commit": "ac620beace5f28fbf40cd69765975bf6e915c01c", - "sha256": "1shn64qa3ygxzag657096jijpk4fg246qvc9db1d5648qmfya6fd" + "commit": "682e87fce99f39ea3155f11f87ee56b6e4593304", + "sha256": "17djjfpxnl7a3wmyh0c708w07y05b4d87ii17rnkk9p4w4zimvay" }, "stable": { "version": [ @@ -36444,15 +36651,15 @@ "repo": "emacsorphanage/evil-anzu", "unstable": { "version": [ - 20220911, - 1939 + 20250316, + 1617 ], "deps": [ "anzu", "evil" ], - "commit": "d1e98ee6976437164627542909a25c6946497899", - "sha256": "1i8f360lq5a32knkzbwdw10ql9cxsmgfd4iiwnr7vcwacm34zq88" + "commit": "7309650425797420944075c9c1556c7c1ff960b3", + "sha256": "1hxxy34ax95xi88gqaj04k2hjph30x0c9dkk2gaw3708zidxykmc" }, "stable": { "version": [ @@ -36542,8 +36749,8 @@ "repo": "emacs-evil/evil-cleverparens", "unstable": { "version": [ - 20240529, - 1025 + 20250402, + 1612 ], "deps": [ "dash", @@ -36551,8 +36758,8 @@ "paredit", "smartparens" ], - "commit": "6637717af0bdac55f97eef98433d53a10395cf77", - "sha256": "15vsqm2pgyb1qg2rwnd4b6pny771zyp5x9z4a0p9pc67f11mrwp0" + "commit": "01150d7a70169179969ef257f7ab92a93aee9e05", + "sha256": "124di9wvsv19z9xj5j8m2p12xp6hq20czyx5bdh1fqhi46wmm7fy" } }, { @@ -36613,15 +36820,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20250219, - 1559 + 20250426, + 1557 ], "deps": [ "annalist", "evil" ], - "commit": "cb850ff0d11f644dbd133428cff57e82e655ecd7", - "sha256": "1gqzqwnclg2nh9dnicc9adlzsfpn93r97gnz7ghxir36rl4b8ihd" + "commit": "fca81ddb2ca1ac3838aa7e8969b2313712807a45", + "sha256": "0grp87nb9pxx47rzclhngqn9gvgbn39yfk0szz6a4xh0pf56f100" }, "stable": { "version": [ @@ -37161,14 +37368,14 @@ "repo": "redguardtoo/evil-mark-replace", "unstable": { "version": [ - 20240303, - 1416 + 20250422, + 242 ], "deps": [ "evil" ], - "commit": "217d5b507aa11dd0b334d5c3e1f74ac1fc2f66a4", - "sha256": "17mn7jybnlzhb82h6jkxdhcr76p1p5dk1v7dpb74r3ccd75sqn2b" + "commit": "90ee84748582be05fa8f9a02872321a08b455282", + "sha256": "1w2f2df48hvabb750p3c9lsb2clpif4bv11z67wl9vafci53lahh" }, "stable": { "version": [ @@ -37786,15 +37993,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20230821, - 1602 + 20250505, + 508 ], "deps": [ "cl-lib", "evil" ], - "commit": "c2108d3932fcd2f75ac3e48250d6badd668f5b4f", - "sha256": "1h7vh24fvbbrq6vl2dfamfm20rxx9dx1rjfs639psksy57nj58j1" + "commit": "16317d7e54313490a0fe8642ed9a1a72498e7ad2", + "sha256": "0rg677wdybgjqz8kfr8v7xrcqw53qm1kxcsdsqqq8z0wklb0s29d" }, "stable": { "version": [ @@ -38962,8 +39169,8 @@ "repo": "ananthakumaran/exunit.el", "unstable": { "version": [ - 20240502, - 431 + 20250325, + 256 ], "deps": [ "f", @@ -38971,8 +39178,8 @@ "s", "transient" ], - "commit": "b6134ce920a4bbc561f65fac1d1bf37206d97505", - "sha256": "1r28j6n373g85rrlwbx0z7mmjz76q9a9fs74grsl5rdjrpab57cn" + "commit": "8de56e3fd50832e5f0435bba8eb13c7292cb1ee1", + "sha256": "0i3ghgr7diyckp29zqjsg0rq6amap7iki1jy5gkz3fri99w4l2n6" } }, { @@ -39426,11 +39633,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20250206, - 1617 + 20250416, + 1410 ], - "commit": "b2e7072cd3bcfa47a55a1d45579373c988c1f8a4", - "sha256": "1i2qncwsd2i3zba673sa0vaqxq2mswflqwldjxxca7720yf1k6ng" + "commit": "7936ff70dfcdd919e525b275533612f5f267b4a4", + "sha256": "04zxwlfpf4jljhdaii3v0b6svqwbjwdzk7n3krkpda9dh381lrlk" }, "stable": { "version": [ @@ -39805,8 +40012,8 @@ "repo": "jumper047/fb2-reader", "unstable": { "version": [ - 20230805, - 29 + 20250326, + 2240 ], "deps": [ "async", @@ -39815,8 +40022,8 @@ "s", "visual-fill-column" ], - "commit": "85777f99483b84f02c1abd6fe0ddbbac7f1258af", - "sha256": "0f93s1wssq40z6328klk47zniv2y0x9899xx2wz6z76fxpxssjk5" + "commit": "5244d481ed19fc9c4dff7f6394fd68e400b828a3", + "sha256": "17b1ib3zfz5hnlbs3c9ps461xfijmq2b96bf9aqanv2x47pbb2ib" } }, { @@ -39884,25 +40091,26 @@ }, { "ename": "feature-mode", - "commit": "0a70991695f9ff305f12cfa45e0a597f4a782ba3", - "sha256": "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg", + "commit": "cd38594a46df624a19c8a0100f2ff037d9c4639e", + "sha256": "0gk6b0l5af5gsh2w3qp8dwxvg6vxai92gy64zlwqyz2nynagarwg", "fetcher": "github", - "repo": "michaelklishin/cucumber.el", + "repo": "freesteph/cucumber.el", "unstable": { "version": [ - 20240401, - 242 + 20250401, + 1008 ], - "commit": "afd49b8a8504e5874027fc0a46283adb1fea26c0", - "sha256": "1jlzmd8b03fg0d5hgfvx1czkh5wlw136g34z89cnnmbhi4p4cv3x" + "commit": "b788d49624c7a4eb4a3bce475cd4ce1e08d5193d", + "sha256": "0lb3s4phqfb5w54zy725lz6j4214nl57x8lkbrfs2zhjdiscbbnr" }, "stable": { "version": [ 0, - 4 + 6, + 2 ], - "commit": "4bd8f19da816115094beb4b0e085822eb298ac37", - "sha256": "1cxjygg05v8s96c8z6plk3hl34jaiwg7s7dl7dsk20rj5f54kgw7" + "commit": "76c91c05d15aca7732315b46dd3dcc13ec5235fd", + "sha256": "183w5rab7l782h32p1a3qdcdlkc1ibq4slnlv555myp8246gdgl3" } }, { @@ -39913,14 +40121,14 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20250102, - 1603 + 20250408, + 738 ], "deps": [ "markdown-mode" ], - "commit": "8f0afbb5cd264033f10ba58158a5e1f3737b16d4", - "sha256": "0lmjqwq0nrimcqs3j9cadl2yz0nvg250vy2l6czg2648x6fdvcc6" + "commit": "e53f4d61cab19a4037f8594daaa247db4ca6c116", + "sha256": "02z5nhv1hr9713b2blfymrb8hckss5ghhr07mjz572a8xdy3rqq8" }, "stable": { "version": [ @@ -40010,20 +40218,20 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20250312, - 1613 + 20250419, + 1823 ], - "commit": "ec185c3ca05703fa6734dfb8934c352f34d54572", - "sha256": "1k7pc5ax83ryaphkq36620ddbnr0k70ria6mnbf9ac5y658rq6kj" + "commit": "df8e83d6e2bb1e447dc1b426348883f3dc87cd35", + "sha256": "0jxiiv1v8sl5hj357z9h2lhs6ymygsq135n1ckdpj87wj7nssf28" }, "stable": { "version": [ 0, 9, - 1 + 2 ], - "commit": "1ce807cc664cb209afa0e0331d4d2f0cdbc09f78", - "sha256": "0dh50nkfxfiqyf19lfqnbfdpd8xf23q38axfli60d0vcix9nhxpv" + "commit": "14c853c1bef5da29c5e56830bdd6d2b88fe4be57", + "sha256": "0jkvcq13q4a0r15cn19gyqxg6k2jsm0argykpchac29xhzm4p5v1" } }, { @@ -40394,20 +40602,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20250116, - 128 + 20250501, + 50 ], - "commit": "3ae5d067a8613f2b9a51c3de8a851bdc85323542", - "sha256": "1aqlzx1aibhkmvqasb7vbawj277rbyrk93v6svqs0m3v6n3g996i" + "commit": "f56292e7aba1d012fa51d65ee625e73dcc16dbe9", + "sha256": "07yzr2kxw58w9ab7dn3npalc0ljwx8wa3bs64n1n0ldnxpd7d6pl" }, "stable": { "version": [ 6, 2, - 2 + 3 ], - "commit": "3ae5d067a8613f2b9a51c3de8a851bdc85323542", - "sha256": "1aqlzx1aibhkmvqasb7vbawj277rbyrk93v6svqs0m3v6n3g996i" + "commit": "f56292e7aba1d012fa51d65ee625e73dcc16dbe9", + "sha256": "07yzr2kxw58w9ab7dn3npalc0ljwx8wa3bs64n1n0ldnxpd7d6pl" } }, { @@ -41112,27 +41320,28 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20241018, - 2140 + 20250411, + 2337 ], "deps": [ "buffer-manage", "dash" ], - "commit": "713c07b6be627fc05417d477ec6d1526ab1797fe", - "sha256": "01afnw8hw6k4h2xs23k41aaf3v4aqw4pzias7sy9s82bczx70ya6" + "commit": "00c23361b73f3b3c1656a205ec31943d40867cff", + "sha256": "12g69mcjrvippgvyhjk2z9zc4377sri1kj1v4h6y2fgggkd6gmg7" }, "stable": { "version": [ 1, - 5 + 6, + 0 ], "deps": [ "buffer-manage", "dash" ], - "commit": "713c07b6be627fc05417d477ec6d1526ab1797fe", - "sha256": "01afnw8hw6k4h2xs23k41aaf3v4aqw4pzias7sy9s82bczx70ya6" + "commit": "00c23361b73f3b3c1656a205ec31943d40867cff", + "sha256": "12g69mcjrvippgvyhjk2z9zc4377sri1kj1v4h6y2fgggkd6gmg7" } }, { @@ -41173,15 +41382,15 @@ "repo": "emacsmirror/flim", "unstable": { "version": [ - 20241125, - 2201 + 20250330, + 1802 ], "deps": [ "apel", "oauth2" ], - "commit": "4ee02945854e4dc94327aad5da2e43d85a777420", - "sha256": "04crqqgxwbfkfj1f3rpmbq00w6bakpg1fdv99q2l7dwjksbn35ca" + "commit": "4d715b2c846efffe4eb3e8c53940b86c6e703005", + "sha256": "1607w38s14jixqyn4yg9q0jwxbi33d17ary4zqj5254slx7zw8c2" } }, { @@ -41474,19 +41683,19 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20250226, - 1541 + 20250423, + 1305 ], - "commit": "b9db1379dcc3e59238dc1fdd7db368c66e8734ba", - "sha256": "1ny1lqmh55bwfgsrgr5rg13gbgqp5rdw5sx72hz1nx2vfcwcklvl" + "commit": "2842e237f6abe6602ac3b3bb1ce45bc130e0a1ec", + "sha256": "0j6vqnq4xxbv61k8da3n7rndpvxm3sf7050k5xrc4nyynwxh5522" }, "stable": { "version": [ - 34, - 1 + 35, + 0 ], - "commit": "5a9ff918f91e230ae08a6bdce7ec1f107864a5e2", - "sha256": "1rhsrbbg3y50qc4drbdgwa1z0hw7w84blgr0xl6zi9mqnjnak495" + "commit": "6e43c07e83406cdd3f75952ee988d61d7573ec11", + "sha256": "1jj9w1j1qgpj3cdihwkgaj7nd714a0sgsydh413j9rsv6a3d4cgg" } }, { @@ -41641,15 +41850,15 @@ "repo": "shuxiao9058/flycheck-buf-lint", "unstable": { "version": [ - 20240612, - 1219 + 20250408, + 1011 ], "deps": [ "flycheck", "s" ], - "commit": "6cf7e7a01bfe150f9be45e83f9fc2d0c8b9d8de3", - "sha256": "1lf69gmbh0q9drjxb1h1wz426hxjr4mkzl8grz6ggl56rxwxj2f4" + "commit": "0cf5eec5cf647e3156bc13be67927fa37c167902", + "sha256": "13v81s5n1g9g0k3jgrg73kh5jip3vcksjd7r53kzvw1jzixnx43a" } }, { @@ -42495,14 +42704,14 @@ "repo": "weijiangan/flycheck-golangci-lint", "unstable": { "version": [ - 20250211, - 1910 + 20250407, + 559 ], "deps": [ "flycheck" ], - "commit": "424ba1b3a13f5548c440b7a25822932ad4b51cd6", - "sha256": "1a58anq6vzhwl0z45rrm1y28fl8qh2yhmi6zd8kc9jmsavp4019w" + "commit": "14bf143ea7ae190544326576a156de9c915a4751", + "sha256": "1d61prv2zkss604k51751l26mmrp6rs9li9c62bmddmvdp0jrx7x" } }, { @@ -43067,14 +43276,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20250101, - 852 + 20250407, + 21 ], "deps": [ "flycheck" ], - "commit": "24910498ea5c9588813cc2c602de935aebb06505", - "sha256": "1m0xnq3rynzq6y6zgq6czc8jyz09gn37a13c0fyqxqd0x6x8xikw" + "commit": "e44bd8bf7ec481bf8911435544becc4bef74e9e8", + "sha256": "0ig23x32ihzgcw0h7xx2a66ic31ayxdriq8knf87fwqywms7xgs8" }, "stable": { "version": [ @@ -43444,28 +43653,28 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20241107, - 408 + 20250408, + 1205 ], "deps": [ "flycheck", "phpstan" ], - "commit": "b616f5fa5f8aff9aa220c7fe63b39df6d10588a5", - "sha256": "0xjr6vi158qm6rnrfvpcmh2grrlvixdd44kik333250298vc3nx3" + "commit": "a91ef35cee18141d48f30148018555152cd1e6d1", + "sha256": "10kjszbcafyqs4dv3mpyrchy0zb51l2fnxhnbazcbwr731lm4cnm" }, "stable": { "version": [ 0, - 7, + 8, 2 ], "deps": [ "flycheck", "phpstan" ], - "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b", - "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp" + "commit": "e1aa8b269c0e3281c323bc1fad509edabb668441", + "sha256": "1nqsf9bh8pd3pjmpmsiqazy8639h8938jm37qqcmdn13n69n0pxm" } }, { @@ -44313,20 +44522,20 @@ "repo": "jamescherti/flymake-ansible-lint.el", "unstable": { "version": [ - 20250121, - 2019 + 20250502, + 19 ], - "commit": "4f9a7a8c5777467e8ccc1495afe02e36db75e671", - "sha256": "1qklmvna3rgzdkx85ghnh4l2ahsvc9dczkw4dknxacghimwq1vmi" + "commit": "64cd28ad98aa6c0474dca7100f34098b38d25185", + "sha256": "1h16525z7r6wscn6lc1pwiz7yl3n5l6vkxzwsj4z6dwfdjcwbrad" }, "stable": { "version": [ 1, 0, - 1 + 3 ], - "commit": "0503a9b7ace1d0909ba5d20f9474451621c2011a", - "sha256": "0bfv9mpxdd767gxjgyw56h8z18gbhrjl6rqv57wc30vbc3p5frpv" + "commit": "df15c34ee9c7926fb34278630c92c377e9edc6e0", + "sha256": "1w3dvcc32xbi1cla2wbfhpr638gky978c2ms8vi9x8dy669x11rf" } }, { @@ -44352,26 +44561,26 @@ "repo": "jamescherti/flymake-bashate.el", "unstable": { "version": [ - 20250121, - 2019 + 20250416, + 1624 ], "deps": [ "flymake-quickdef" ], - "commit": "dc5cb9efb73f1e5b0f5504d1abf0ab37822c0b97", - "sha256": "0zkggbppl5akrp8vsz1nw01dmkd1jmdahvi3x4jfkrfn4ll1ghyv" + "commit": "c599d3c15c6f174a54c1f3d0081311758e682089", + "sha256": "1xwngb8i39siw2wb0m4pvgwnd1ax5rl5xq9ny3s40bcxs262grm7" }, "stable": { "version": [ 1, 0, - 1 + 4 ], "deps": [ "flymake-quickdef" ], - "commit": "2339c28cd2aa6e63c5aeb5e904dd5b0060dc264e", - "sha256": "0mf0rqg9fjaiwh43v47kvcybnpzygvzj90qxmxc4kcjfblwi606w" + "commit": "c599d3c15c6f174a54c1f3d0081311758e682089", + "sha256": "1xwngb8i39siw2wb0m4pvgwnd1ax5rl5xq9ny3s40bcxs262grm7" } }, { @@ -44698,11 +44907,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20240925, - 1224 + 20250319, + 1221 ], - "commit": "66a4f7d619ecf9a8e9ce958482c8e814044f607f", - "sha256": "1ygsb7n2hm2d45zjw92c8vk1gg59qa767gwxgfznm4dzkqaa5yyb" + "commit": "69aa89346e663a57579848936a18d795655a485b", + "sha256": "1wpjj1iz2zm53cxqshvs0kwdliy889d16nhfbq8s5vq8vy22xz0x" }, "stable": { "version": [ @@ -45390,26 +45599,26 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20231114, - 1120 + 20250331, + 1920 ], "deps": [ "phpstan" ], - "commit": "495e22f98e3075d0d9a14ebec87771eaf967b996", - "sha256": "1khbknia1vhif6a26mcvx1d1mawvkxb84m16ghhp5vfna6g3sk64" + "commit": "e1aa8b269c0e3281c323bc1fad509edabb668441", + "sha256": "1nqsf9bh8pd3pjmpmsiqazy8639h8938jm37qqcmdn13n69n0pxm" }, "stable": { "version": [ 0, - 7, + 8, 2 ], "deps": [ "phpstan" ], - "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b", - "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp" + "commit": "e1aa8b269c0e3281c323bc1fad509edabb668441", + "sha256": "1nqsf9bh8pd3pjmpmsiqazy8639h8938jm37qqcmdn13n69n0pxm" } }, { @@ -45585,14 +45794,14 @@ "repo": "erickgnavar/flymake-ruff", "unstable": { "version": [ - 20250217, - 2352 + 20250428, + 1558 ], "deps": [ "project" ], - "commit": "7921f331defb1c6e071b4b56d9c61c4c8a7de572", - "sha256": "13fy1pyi2kxjh8f499njpqsj0mf1khh3lzdxsyk9vw34c22263s5" + "commit": "304c23393c5a959884df7595b9392957df1fd74c", + "sha256": "04sk7x2ykxxx68jd5fgq1lzc0knlnl1lwn2g0mlfb38vjh1wga62" } }, { @@ -46536,8 +46745,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20250301, - 2353 + 20250516, + 1009 ], "deps": [ "closql", @@ -46552,14 +46761,14 @@ "transient", "yaml" ], - "commit": "1c904090dfdcd201d9170997052c43846ddce149", - "sha256": "1ps1xwpxhb9vn6bf0wxy8bdba72f973spys0xw1k686swczrb225" + "commit": "8e4dd7ed05212abb3f5318d1f2de5ef880d0d848", + "sha256": "1c5659s0crj0qcp1ibprbapnib0rrmgf37vjjr6fkbz5npw7mgjq" }, "stable": { "version": [ 0, - 4, - 8 + 5, + 0 ], "deps": [ "closql", @@ -46574,8 +46783,27 @@ "transient", "yaml" ], - "commit": "1c904090dfdcd201d9170997052c43846ddce149", - "sha256": "1ps1xwpxhb9vn6bf0wxy8bdba72f973spys0xw1k686swczrb225" + "commit": "9db4d386a1ce32b574e413771996d41d9b2407e8", + "sha256": "02ks8zc3nqqqqfq2picf0pxsw7wygb5hv9abnva1cv44x091w6zw" + } + }, + { + "ename": "forge-llm", + "commit": "7480ca42e2db5db2bc3bb14283cce7078f6959d4", + "sha256": "17gg7iv1caxmb1m08zlmcnvpzgpd960yh2yy4czj2p2wdhwwps8r", + "fetcher": "gitlab", + "repo": "rogs/forge-llm", + "unstable": { + "version": [ + 20250403, + 1333 + ], + "deps": [ + "forge", + "llm" + ], + "commit": "62c925deffcddd30256d6827040fb9faf13119d3", + "sha256": "003m9c05d29m17yzpyms4vf2kw9rjh393hkipjcyvxpdigxzb3nm" } }, { @@ -46586,11 +46814,11 @@ "url": "https://depp.brause.cc/form-feed.git", "unstable": { "version": [ - 20210508, - 1627 + 20250426, + 2028 ], - "commit": "ac1f0ef30a11979f5dfe12d8c05a666739e486ff", - "sha256": "1rrsnc6qwbqk091v1xinfn48fc0gbi3l5fy9hyafgl4zdx5ia2bg" + "commit": "6258fe6390a7bf264a6f02813502bf83a645d872", + "sha256": "1ycxmmzx88a2rg0r4ykx1mj3z1hgyn420ncm97lswgqxmisc97pb" }, "stable": { "version": [ @@ -46803,11 +47031,11 @@ "repo": "gmlarumbe/fpga", "unstable": { "version": [ - 20241224, - 1805 + 20250318, + 1348 ], - "commit": "7ba64134609cbb9b7a5dd3b960985fa46a582cf0", - "sha256": "0sl3s5bfqmicpg4hp2k6qznrgj71dx0lz3dv2jyd48ys67m9x4dx" + "commit": "23969f10928a070a86869f5287df0ebae081e113", + "sha256": "1l73h0yhkgg005zznqx6wg0xjn3nl286nqijfh1bpwx6i97yajs0" }, "stable": { "version": [ @@ -47056,14 +47284,14 @@ "repo": "Fuco1/free-keys", "unstable": { "version": [ - 20211116, - 1501 + 20250512, + 1527 ], "deps": [ "cl-lib" ], - "commit": "7348ce68192871b8a69b687ec124d9f816d493ca", - "sha256": "0f99vykxvvcsdqs03ig5kyd3vdrclk8mcryn7b310ysg840ksrw8" + "commit": "bed8e9c356c889cd98dd7a4a63c69d6c4960cf82", + "sha256": "02f32h6nsfgd6ck54x3rh1zbb1j7cbgbny1d5a464b3ihdwsbywg" }, "stable": { "version": [ @@ -47117,6 +47345,38 @@ "sha256": "0bwd3hw5qdijmvbfm69iyhijjx12yqvsa8n08cawxfa26cs6hi1g" } }, + { + "ename": "fretboard", + "commit": "4144db1e5d57b94cb5b6023a78a65fbbfb7a109f", + "sha256": "1ibx1n76yln7xakv26idv7j2b0p4qg7m1c9p3ci6sm1j0lhawjsq", + "fetcher": "github", + "repo": "skyefreeman/fretboard.el", + "unstable": { + "version": [ + 20250420, + 326 + ], + "deps": [ + "dash", + "s" + ], + "commit": "064aeb7553c9bef86cf3de8d3c124809f1b3b381", + "sha256": "1w3a4acbg1202n9qdjx2f17gsn1fy4yjwlq7ndys0znsq81xw0rp" + }, + "stable": { + "version": [ + 1, + 0, + 3 + ], + "deps": [ + "dash", + "s" + ], + "commit": "064aeb7553c9bef86cf3de8d3c124809f1b3b381", + "sha256": "1w3a4acbg1202n9qdjx2f17gsn1fy4yjwlq7ndys0znsq81xw0rp" + } + }, { "ename": "friendly-remote-shell", "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", @@ -47402,11 +47662,11 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20230622, - 1854 + 20250403, + 1922 ], - "commit": "b4d31c3da018cfbb3d1f9e6fd416d8777f0835bd", - "sha256": "1rhyc7yhpi4bjzq5f6bm3v4ab16prl6fvp9kjif6lq6ihh8xb520" + "commit": "d92a973e59e18d9510adaf9ddc7f0c866f2633a1", + "sha256": "0s2xxzmqxg9a6bql9yg0rpc0s79vvmbg5aibc93jkd0sf79dnz47" }, "stable": { "version": [ @@ -47417,6 +47677,21 @@ "sha256": "1irw05118p835djcvzb2y67avcpryvs6i1p4mp5snygk4n8nl2gc" } }, + { + "ename": "fsrs", + "commit": "a5ea6ecf15fd62aa9ee4c55afe1433a4e67b2c4f", + "sha256": "1g9k9z18b0773fs44lr0spgbn8wd6sxfjwlpxhv28lggaajzwdlg", + "fetcher": "github", + "repo": "open-spaced-repetition/lisp-fsrs", + "unstable": { + "version": [ + 20250330, + 1613 + ], + "commit": "f6a31365d6e298749daea1bb91270fbc7d11cb53", + "sha256": "10fy6dscpin12hm8qsmh1h7ajf0i8a7cyhl8s2d5s3y0y7r7iplg" + } + }, { "ename": "fstar-mode", "commit": "c58ace42342c3d3ff5a56d86a16206f2ecb45f77", @@ -47425,8 +47700,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20250201, - 28 + 20250402, + 820 ], "deps": [ "company", @@ -47436,8 +47711,8 @@ "quick-peek", "yasnippet" ], - "commit": "36ffb46259a7bb67e5bfac977aae57d52a4915de", - "sha256": "1f2s5nm4rr7v793fa46cqkmijb9fzn0fxn3vywj83bsva3hqsf9z" + "commit": "3bbfe93abd077103e9e4417d076d4f4d21e9acab", + "sha256": "0vya68as0y19cinjwjf9x0hpbnjazscyfkg4gw8saj551y6xcxmd" }, "stable": { "version": [ @@ -47718,20 +47993,20 @@ "repo": "10sr/fuzzy-finder-el", "unstable": { "version": [ - 20241219, - 1044 + 20250318, + 632 ], - "commit": "ed3fb35d33b38d5baad49ed5a2ea046085de4498", - "sha256": "0fqdd9mb81mpi24n517rb6bbm3bi6dymnwcz3kpxydkm65cjvmzh" + "commit": "097072165c0ee4a2200229f39851bd85ca0ea92c", + "sha256": "0iaax4qlhkwmmpm1vfk7cbjfks12p2zvk7k9k9j0kgsnwdiijjlz" }, "stable": { "version": [ 0, 0, - 1 + 2 ], - "commit": "f459ee206cbb324c13fe939656b0b9d3a4c3c0b7", - "sha256": "0ziziylcaahq491v5m1a8pbrwrifksaj1374rnfvp9d5d9w02lf7" + "commit": "097072165c0ee4a2200229f39851bd85ca0ea92c", + "sha256": "0iaax4qlhkwmmpm1vfk7cbjfks12p2zvk7k9k9j0kgsnwdiijjlz" } }, { @@ -47766,14 +48041,14 @@ "repo": "tarsius/fwb-cmds", "unstable": { "version": [ - 20240805, - 1318 + 20250509, + 1453 ], "deps": [ "compat" ], - "commit": "973a0033c406ce644ce0fb87de70c2f4046ab1b7", - "sha256": "0dwrmm4hir83xbnhxqjyalb17zk40y62m32i90q7svp32ydw3abg" + "commit": "4001ed8f655a62d7a3974b18aed3471564d3837f", + "sha256": "07qy8p8kv8g7nn92c71qxdjm4kbww396ixiwbjprms39j2ggncp9" }, "stable": { "version": [ @@ -48028,11 +48303,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20241207, - 610 + 20250420, + 1418 ], - "commit": "c3d99889843db92fc6e4c51226c222779eadd7d6", - "sha256": "1bh7icz4k70x62z50lnjgnrxxh0mhlgrj421wm4sqiphk30vmck4" + "commit": "1938aa7e2d1aac1d111b1c3d55e3cf932ae63cc4", + "sha256": "1b7qa01ivj9n3k4hn1qvgr7h0hdc7v3hfjdxr88am1gp6p10amf0" }, "stable": { "version": [ @@ -48992,8 +49267,8 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20250301, - 1641 + 20250509, + 1440 ], "deps": [ "compat", @@ -49001,14 +49276,14 @@ "llama", "treepy" ], - "commit": "af663777c47a3dce64b2144b4409587b35521e47", - "sha256": "1bd8lnhv50brfxqwyk7jmgrig0cahkam7ggwaifaz8vb8m456yar" + "commit": "6bb612e7b7eada22569d84cc529f4ca36e08032d", + "sha256": "1ivv031hsqd7jwlpx8frq9sj1z2nl8vvka569wbfj7l4w85ai12b" }, "stable": { "version": [ 4, - 2, - 2 + 3, + 1 ], "deps": [ "compat", @@ -49016,8 +49291,8 @@ "llama", "treepy" ], - "commit": "af663777c47a3dce64b2144b4409587b35521e47", - "sha256": "1bd8lnhv50brfxqwyk7jmgrig0cahkam7ggwaifaz8vb8m456yar" + "commit": "214a14627f463449e8ad01d1beb172917120e816", + "sha256": "1a2kyiw63fpp2xbmzmc9hp9r73fq3iwvidvcjjhgs0y0hq7x5sqx" } }, { @@ -49718,14 +49993,14 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20240805, - 1320 + 20250509, + 1453 ], "deps": [ "compat" ], - "commit": "f99010bbeb8b6d8a0819fac0195a2ef0159d08f0", - "sha256": "0nvkpy3bv9816hvgm91fv9l8lla4xras4i05579bs7bc8fck1mr3" + "commit": "2b2d02e935ee6aa649afa99e9ebc77054a9974b9", + "sha256": "07s6yz7na4aj5vy3h49m639pf2b3jdypyvyn0spdwqm2dalwl1bi" }, "stable": { "version": [ @@ -50210,6 +50485,24 @@ "sha256": "03lx8ndhikl2frdblbi3fsaz6xzfay6w2ngl1z0ib85wca55lzqp" } }, + { + "ename": "github-topics", + "commit": "9ba499e716a05e2995f14f466e5271a52e8620ae", + "sha256": "1fh0hz15kmgnphiws4hndzcan0yacgjpk570zk3hbivbf2wilw21", + "fetcher": "github", + "repo": "agzam/github-topics", + "unstable": { + "version": [ + 20250416, + 2102 + ], + "deps": [ + "ts" + ], + "commit": "296cb525c5387e5242b89950d2d84d258ff82fd2", + "sha256": "1l5n5wgcnws0iz5ym4znbssin67dzgz3iwq3cp04jf1nssay863h" + } + }, { "ename": "gitignore-snippets", "commit": "b1d03ee45e45fc6ec30936a5f4bd8b756728da31", @@ -50584,11 +50877,11 @@ "repo": "gleam-lang/gleam-mode", "unstable": { "version": [ - 20250223, - 1619 + 20250412, + 1910 ], - "commit": "75b5b1a2eede31969a94322f117b0c82036ff40b", - "sha256": "1225g79kajzicbgswlvygf03ap6kq3l6wc2mpand2qb564vbhld4" + "commit": "8e981614536f0e36fb14721a9fae8bf72c287a40", + "sha256": "0xspx3hpiw21pqcqpp82ngxzsdbc209cbp7yjl5i1j5rwj6d09r7" } }, { @@ -50632,11 +50925,11 @@ "repo": "jimhourihan/glsl-mode", "unstable": { "version": [ - 20241021, - 919 + 20250324, + 1304 ], - "commit": "c5f2c2e7edf8a647eda74abe2cdf73fa6f62ebd2", - "sha256": "1ilx7zgkbnsxlq3np6yli7d6r09hww455kl9lsydpr448mqqifkm" + "commit": "86e6bb6cf28d1053366039683a4498401bab9c47", + "sha256": "03ajf9q2ijgfmmqvk7kmmxba6bsyrb2q49li93fmdj5dwdyjkgqv" } }, { @@ -51771,11 +52064,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20250304, - 814 + 20250318, + 907 ], - "commit": "55efeac0f99f8eff3f9017e62229212e4876f09b", - "sha256": "1zk91s2p2sa9v40zyshn54wbpjfn2g5prxad4zzwqncm0dlcjpab" + "commit": "a924e0bd6b37d424c222377982e6f71a4ddf4452", + "sha256": "0n5w7whg134innyqwrvx86cyqfb2wffm2j0kyddcnbfcmhhr6lrf" }, "stable": { "version": [ @@ -51946,11 +52239,11 @@ "repo": "jixiuf/golden-ratio-scroll-screen", "unstable": { "version": [ - 20221102, - 240 + 20250412, + 358 ], - "commit": "ed82ac7e9129c7be5983b44def0b9239b54d4dcf", - "sha256": "12w5xdpnmpqyf3phl4y822w3sz84x2a0xv2jqkhzz0paywn1abb6" + "commit": "60eb00ed7e51c0875a38cff25c9a87fe79296484", + "sha256": "1j83dz6wclxqviy4cmg2l78jjl9sqk2syj01azpdrys0bfvaqv9k" } }, { @@ -52106,11 +52399,11 @@ "repo": "Malabarba/emacs-google-this", "unstable": { "version": [ - 20170810, - 1215 + 20250407, + 1500 ], - "commit": "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84", - "sha256": "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl" + "commit": "abdcb565503844e2146de42ab5ba898e90a2bb09", + "sha256": "0lk83rgbsqnsdw4l0wsvqqfpqqyzsd7l1j8dqcng0aiqk5zmixv7" }, "stable": { "version": [ @@ -52403,8 +52696,8 @@ "repo": "vmware/govmomi", "unstable": { "version": [ - 20240208, - 2356 + 20250503, + 250 ], "deps": [ "dash", @@ -52412,13 +52705,13 @@ "magit-popup", "s" ], - "commit": "5d7849f71f7080873f4c7d75c999a5bf55d8486d", - "sha256": "1a6xx17v5cnz93kkpi4r5f9xzq0pq43iikz7k5smnyl13m3lrm4y" + "commit": "95320a7de48d30233d7125b01727fb50c1cbc310", + "sha256": "14yrw8ddrpv3c2wq3h3c85brfaxdzzjdjfnp6d74pa7w5c7wwp77" }, "stable": { "version": [ 0, - 49, + 50, 0 ], "deps": [ @@ -52427,8 +52720,8 @@ "magit-popup", "s" ], - "commit": "bd808e86d9a22201072ed0aac198372b8abd95b4", - "sha256": "1w2b3kcjligpp4k5fvl8jyrx7n6ddv8ck99hhh09j31gnikd5nvl" + "commit": "6ed9b22e62347bc66a9d2d1c8d220700f3da4e98", + "sha256": "025lfaafwbxxiyx5lmvf5995kyc6zf3s7z4fs69q5xwvvxgv1lg1" } }, { @@ -52511,11 +52804,11 @@ "repo": "stuhlmueller/gpt.el", "unstable": { "version": [ - 20250301, - 2043 + 20250517, + 149 ], - "commit": "32e234f5243e25fd13ddfad6c8a533072b7a20b8", - "sha256": "1v321yq9bsxazlvmvvd33g8h33na2fdc5fjrjp4qwq0pb1w1i3z4" + "commit": "be8cce1b79c250b661c074f976e02e0c826be151", + "sha256": "05gi42qwy55ac27f94978i3jgb7pfvfp75j26v6b5gci9rpb7k4j" } }, { @@ -52582,28 +52875,28 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20250313, - 158 + 20250516, + 555 ], "deps": [ "compat", "transient" ], - "commit": "10e77396bc78e05c922b04a344818bc8ab72d665", - "sha256": "1cgm6lqn0yn18cisrgn5cllc6kwx63bawzyqxq5hky7mmrvqfd25" + "commit": "fcdbe074140bf7b9c027a3478902edafe8ec76f8", + "sha256": "0079lg68d81j76cm7jr710gdj3b9vrn08ws9cgv6anldvlqqvqkj" }, "stable": { "version": [ 0, 9, - 7 + 8 ], "deps": [ "compat", "transient" ], - "commit": "5a5cddb93d610bd59ec52a070b0f89a9ec842152", - "sha256": "15ny2d04ci04swmxikkyb7lsjr51gvxpr2cj02gwx88bidx34md2" + "commit": "975c3e64eb834b939e0d61dfc39fed8395afcc45", + "sha256": "1wjzv39pcg6lcmlw6yc4fdfln2cnshzaa0dxgkniq9dfznf7hnmd" } }, { @@ -52614,14 +52907,14 @@ "repo": "dolmens/gptel-aibo", "unstable": { "version": [ - 20250311, - 545 + 20250318, + 546 ], "deps": [ "gptel" ], - "commit": "a8b1550812da3606613b054b05f9458b98067a00", - "sha256": "1kw1imwj7ca63d8aszp6rwlj0kih6rv43rbrbsf8r6nifnws5rg7" + "commit": "42be3102de37ec988fde513f6fd0768c164d3b99", + "sha256": "0sd04s44p7zll3axgv8pg064yq4cls7p8xiddvyya5m0y6gcvq6i" } }, { @@ -52632,26 +52925,45 @@ "repo": "mwolson/gptel-fn-complete", "unstable": { "version": [ - 20250313, - 222 + 20250317, + 1805 ], "deps": [ "gptel" ], - "commit": "fc17166bb0e3ef03dabf9b1550284dc3f441dc0f", - "sha256": "0cwlnlwpncysy6qd66j6q1wyqk5r7rgrwjwg66n9s72qfmminbl5" + "commit": "6970dfa5c123f420ab06b99be012a222e792b019", + "sha256": "0ywf9rzszvjrkqmj9anfnj7qass6ra2yn8szfwmkn7xwyiq2pijw" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "gptel" ], - "commit": "1a28af9c6c37db8a92937316fe43042ef01a1186", - "sha256": "18760brg0p4hwphg0wr3hwcv91jizy519fiawr56gv22xvq225sr" + "commit": "6970dfa5c123f420ab06b99be012a222e792b019", + "sha256": "0ywf9rzszvjrkqmj9anfnj7qass6ra2yn8szfwmkn7xwyiq2pijw" + } + }, + { + "ename": "gptel-magit", + "commit": "ff0bfddad842451900e66c345838d7738091f66c", + "sha256": "17q19y38ckgzkl98c8dr087gj88bqzzs89dxyzjgvl5nfvviz1xz", + "fetcher": "github", + "repo": "ragnard/gptel-magit", + "unstable": { + "version": [ + 20250504, + 1238 + ], + "deps": [ + "gptel", + "magit" + ], + "commit": "7f586943040bbb6885adafaf3e61fb5137c64558", + "sha256": "18q32k48syasil6sj829wlk97qhk6pqy9kxqsml1wj5yd94p3ay0" } }, { @@ -52662,11 +52974,11 @@ "repo": "mkcms/gpx-mode", "unstable": { "version": [ - 20240609, - 2200 + 20250417, + 2141 ], - "commit": "88aa5fed1b0987d90f442eb002ab0f2e4731e223", - "sha256": "1gc52avqkwq9l119ckah0qvwml6cc3w02gvl772ncj821ci90d7r" + "commit": "c66bae867160fcf0d18799baedb7087466dcbf0d", + "sha256": "02mqisgdny26y2dybw6izjqvvsfrxscffp427cf0k6m96q9w28xl" }, "stable": { "version": [ @@ -53126,14 +53438,14 @@ "unstable": { "version": [ 20250304, - 1715 + 1722 ], "deps": [ "compat", "seq" ], - "commit": "7d47cf845e0f6116b0748f05c903db6d0b94e495", - "sha256": "19j8fbxyylq5h8w9q6w3vwkqncdm8ljhbwfnw3r92hxmbq9w02si" + "commit": "e78251009a55efec7ef8f4012e3b4ea87768d882", + "sha256": "04i3jl08l32b5pcmjpddjna18qksr8njdnv6y8q2919j6j7aq041" } }, { @@ -53282,20 +53594,20 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20250307, - 1011 + 20250426, + 602 ], - "commit": "e90e3b47d8fcbb7625106e1ea840519a58c2c39c", - "sha256": "04ybyxv2ps7bydb89shhfwhdayhr0kbyzwjxf3a6chmymdvny4wh" + "commit": "96a927dce69d7607b981d7754cf8b415ebf9d6a8", + "sha256": "17srcnhb1hb2ck0gkjni5adxz3hnjwwh3ajmmbp35h9kjl0b2fh8" }, "stable": { "version": [ 2, - 4, + 5, 0 ], - "commit": "ffce7f78ebe48645b93fa162038ac7f678ffd618", - "sha256": "1lndn60xgamxfmca623frqfqv6dvzrmqzw5x805px58838nfdrhd" + "commit": "31c03ec19b4fbef95be00a586171e0c26a330966", + "sha256": "1mrpmzcxgc9hkv55d6kv79f8y6ldqrf5b48f0a4fy30qlgby2wyz" } }, { @@ -53740,24 +54052,24 @@ }, { "ename": "guix", - "commit": "f01c0af156ac4f89ebb706c93085f46f1740f212", - "sha256": "17gd0farvxs38l0a8v20cc1d6h1ri7nmdjl7i1mnwfb410rijvhy", - "fetcher": "git", - "url": "https://git.savannah.gnu.org/git/guix/emacs-guix.git", + "commit": "26b8eeb90e3f190ebd668b650abf5c8bc81dfc7f", + "sha256": "0lagxg0bi7m9vqrf8clh7brxgcann1zfrg6pn8mqfxwrw1j99azh", + "fetcher": "codeberg", + "repo": "guix/emacs-guix", "unstable": { "version": [ - 20250309, - 2106 + 20250513, + 652 ], "deps": [ "bui", "dash", "edit-indirect", "geiser", - "magit-popup" + "transient" ], - "commit": "287fc4fbea0c90efca01af8fd0d64748903253cf", - "sha256": "09dxbl2r8f2l6axqpmfh620mnbs37j9wnaz89pq8hhh7fmfz8xff" + "commit": "cabfa2f3b5a98cdee0fd7c1f334b235b2e54af30", + "sha256": "0cp0m5v7fi95lrl6v5pbavp628zi05cv0511ixwcdm4h9fcazd09" } }, { @@ -53990,20 +54302,20 @@ "repo": "clarete/hackernews.el", "unstable": { "version": [ - 20240405, - 807 + 20250314, + 1759 ], - "commit": "7c1e9de10fd6b299d45b383302d223d7e3285da9", - "sha256": "1006qy4hccjyr056rywnvmc65hypz1fi7j48vlzj2r7c2mqkcns5" + "commit": "1d3ba5faf47a3907e270ed5aa4099f73dadfdf6c", + "sha256": "1kb34jm81jyp2lv0558c6q109pjb38vxrncq4qaq0b8zir8qcr3y" }, "stable": { "version": [ 0, 7, - 0 + 1 ], - "commit": "38ad768e95ca651d836ee2fa2d795ac2e84e8e03", - "sha256": "100aa0vs1gjwpkfdc7avwv5v3sicj2npqfr1y3dsib3pimp21l6w" + "commit": "1d3ba5faf47a3907e270ed5aa4099f73dadfdf6c", + "sha256": "1kb34jm81jyp2lv0558c6q109pjb38vxrncq4qaq0b8zir8qcr3y" } }, { @@ -54527,11 +54839,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20250305, - 1349 + 20250401, + 1742 ], - "commit": "2ada981f2447039c070441d37d28cd32cc2906ca", - "sha256": "1194n50xq85y9ymbv4npi3b47zra0fdr6f5hxgp12s07rnh4gf33" + "commit": "e9c356739310332afe59b10ffa2e6c3e76f124e3", + "sha256": "1mkp9b31ai1z6sccx8cff40viryamw7dm85acig3q82dwlbmxx98" }, "stable": { "version": [ @@ -54654,20 +54966,20 @@ "repo": "ErikPrantare/hatty.el", "unstable": { "version": [ - 20250227, - 2326 + 20250414, + 2155 ], - "commit": "dd95986529fa90e47eaadeedd671986c5ab15aa7", - "sha256": "0gs6gbgaxr1p7j4gqnzx5lq3krnn6nxlmgwfp5d5i8fdkg1c1ka7" + "commit": "20e6a92abd997c655e263cd32d7b5b0550dea409", + "sha256": "1hjs0zx810xkaigqwxjpfrx4b7z0kxdl9ll19i9g3nkg1s9arbxr" }, "stable": { "version": [ 1, - 1, + 3, 0 ], - "commit": "25fcffa9fcc96ef44fbfa7583873deda6a1dda81", - "sha256": "12klhmsqpvbb3arbq8wc1nbhgq218ickvjy9p8j7w3pymiyvkgv0" + "commit": "20e6a92abd997c655e263cd32d7b5b0550dea409", + "sha256": "1hjs0zx810xkaigqwxjpfrx4b7z0kxdl9ll19i9g3nkg1s9arbxr" } }, { @@ -54840,11 +55152,11 @@ "repo": "wkirschbaum/heex-ts-mode", "unstable": { "version": [ - 20240113, - 1104 + 20250511, + 643 ], - "commit": "90142df2929956536dc1eaae3bb5ca04dc4232ab", - "sha256": "0yi3z59sc2ah2173ffpw2l033pmwg5km3id53mpry36pgki02ajn" + "commit": "7496adcad0339978ef462b92160b6d40c3595841", + "sha256": "1aam3h468ci8cpf1hpzlk02wgm3dj5m8rlf6hiy68sl2m6ad08pr" } }, { @@ -54870,28 +55182,28 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20250228, - 640 + 20250515, + 548 ], "deps": [ "helm-core", "wfnames" ], - "commit": "c0b70dbc2697ff361d9d5bb99e11c654317aa00d", - "sha256": "07z3zrdyifsdp91rf0akzxbzxd8ny3rxz49b5j53kppl8l3shxg0" + "commit": "387b8c8c5ae83150151672979d432e9cd790b79a", + "sha256": "0s6sx1akr7pbbj8h944xwbbrb418ybns45ik5v8xdcpi4ak7qz5m" }, "stable": { "version": [ 4, 0, - 2 + 3 ], "deps": [ "helm-core", "wfnames" ], - "commit": "af3a6a3d842c350b469a735b31ee00bd22fedcc9", - "sha256": "0l9p6yiv8w9s0rpa4fyrp9gw1dgwpyr9fmkhs53bhc6v9x7br8ix" + "commit": "e03edf775af41053c8a4de98f370689d4525077b", + "sha256": "1amm4n5v2v5z2ln1qzhf0n2rj4v89flhk9dip3kbngdwy2a8q2h4" } }, { @@ -55760,26 +56072,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20250227, - 1917 + 20250514, + 1025 ], "deps": [ "async" ], - "commit": "04104d2add4806130cdeb3c915e9c09fb1de1046", - "sha256": "0z5v1nbq55hbcjca3p5gq0jpg20jkml08jvdssbk908jxzcgpyfm" + "commit": "e03edf775af41053c8a4de98f370689d4525077b", + "sha256": "1amm4n5v2v5z2ln1qzhf0n2rj4v89flhk9dip3kbngdwy2a8q2h4" }, "stable": { "version": [ 4, 0, - 2 + 3 ], "deps": [ "async" ], - "commit": "af3a6a3d842c350b469a735b31ee00bd22fedcc9", - "sha256": "0l9p6yiv8w9s0rpa4fyrp9gw1dgwpyr9fmkhs53bhc6v9x7br8ix" + "commit": "e03edf775af41053c8a4de98f370689d4525077b", + "sha256": "1amm4n5v2v5z2ln1qzhf0n2rj4v89flhk9dip3kbngdwy2a8q2h4" } }, { @@ -56059,16 +56371,16 @@ "repo": "emacs-helm/helm-emms", "unstable": { "version": [ - 20220314, - 1633 + 20250405, + 1018 ], "deps": [ "cl-lib", "emms", "helm" ], - "commit": "aefa44ab77808626c4951be2df49a2eab7820805", - "sha256": "07ric1lghxdccq30jr3nfzkqa0mpx61kp4mjyi0zsxqcwfyz7zx3" + "commit": "2e8b53a46b32f956efacfda2dbf3f1b0db867472", + "sha256": "0gv4pb6s4jimlddc047vl1pi7r3h56s7ldz3z8c4klf2j30096l9" }, "stable": { "version": [ @@ -57296,14 +57608,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20250227, - 1652 + 20250418, + 356 ], "deps": [ "helm" ], - "commit": "640cc6ccd8720462ac949d75de9bc99883830d92", - "sha256": "19wxmnq7l42kwqdrfvb861z5llm50rz3dbxlckqlmz1cggdzicv3" + "commit": "754c0c27a11a416a1589ea67be7cd57ce5017d02", + "sha256": "0mx9mwgldmky4alyk0rc0908cih2ndpd4lxqrfj7m291dyxik458" }, "stable": { "version": [ @@ -57698,14 +58010,14 @@ "repo": "emacs-helm/helm-org", "unstable": { "version": [ - 20250227, - 1650 + 20250405, + 1720 ], "deps": [ "helm" ], - "commit": "22d60952f8017e154c53b03087619eb269e12339", - "sha256": "1wb8666gkx24lwhc2p6zfgf8brsg5dkj1ivq8mf5jqxyqzlflj46" + "commit": "4744ca7f8b35e17bafce9cb0093deb87a232699d", + "sha256": "1vn9jn8pkrcgi9ayzw0w69a69jygfs6cjxcrd8jcykh907bnq9sp" }, "stable": { "version": [ @@ -59566,8 +59878,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20250227, - 1527 + 20250408, + 334 ], "deps": [ "dash", @@ -59575,8 +59887,8 @@ "f", "s" ], - "commit": "3794389ef685b6a59b3a487d0492c3add3c42c2f", - "sha256": "0343h1zrr2cfnfzcqazsrv6c9cs7c8q7cq5pzj9hjka5yw5n8v7r" + "commit": "03756fa6ad4dcca5e0920622b1ee3f70abfc4e39", + "sha256": "1q4q0x7n1v4jzap3xzjn5ir4skkyz02iw3jvkw0jhjc0w9mm3icq" }, "stable": { "version": [ @@ -60277,11 +60589,11 @@ "repo": "fgeller/highlight-thing.el", "unstable": { "version": [ - 20230217, - 728 + 20250416, + 1107 ], - "commit": "ad788d7a7ee9eb287a8cca3adb21510b89270dca", - "sha256": "1p829ydpc1qhqabwi0xaa9yy4rqz9wbkphq7kdly6qiz59jasdq1" + "commit": "fd0309e72727e5332be3397e15edb035b426dd0b", + "sha256": "1xq18k8mzkp4ggxy2zl5mmc0h5c0y98hi2id78siaw0brwldvp04" } }, { @@ -60686,11 +60998,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20240829, - 101 + 20250427, + 111 ], - "commit": "5e98b3fed32d7d126087129e3efe60dd8e501a83", - "sha256": "1q2iykx85p2lw5jd1yamr6nb1mz494kbp197nidn2z6bv7h0kavj" + "commit": "83624cd4a4bb39d9c62173a9d5edc802d022e3e9", + "sha256": "0s646klgnnvq3mmn8l7kaxid9s800j2q7jzrb4sp4vcp2q8hc1yq" } }, { @@ -61105,16 +61417,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20230928, - 549 + 20250321, + 104 ], "deps": [ "org", "promise", "request" ], - "commit": "10f31a10803c3fd4c304f3a4495d57a0b9cf9ab5", - "sha256": "04rq68czkw4zlsa5mfcb68hzmpj6wr98jylx5hnas4l8hr0hs081" + "commit": "ebecc51c4c1db598d2303d001553ee74fc8fc49a", + "sha256": "0z287pfig27hprb5v7mcp5x2m3dyqiywacwhrp7nh23s49nn4la0" } }, { @@ -61125,26 +61437,26 @@ "repo": "kaorahi/howm", "unstable": { "version": [ - 20250313, - 1131 + 20250512, + 1135 ], "deps": [ "cl-lib" ], - "commit": "347228032d436bd72ec22616ca7cf8f52f32ed17", - "sha256": "122yrlmlndlf3kn60fdlclc0g7ic9ma3kn4lk94w9zx9filbsfza" + "commit": "ad8385817e478f97eeb65d8e13081fede7d6f8a5", + "sha256": "176q6vania09nw1ajz08q9lsciygy3n5ni0l7dkarkrrdx80bsf1" }, "stable": { "version": [ 1, 5, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "7243d124161ad312a6dd115d7b8195593c9bf24f", - "sha256": "1q1srqb852537l4x3acch9k8d5mgmzm35k5jy1kbhjmvmr2kmi09" + "commit": "53bbfe3b9e4677ac58dd838399da93e2b03db356", + "sha256": "1r309zqy7555mrdx51cdhsa8vbyvk71jhx19wqhzmg88ka0fizvc" } }, { @@ -61720,15 +62032,15 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20220910, - 1206 + 20250316, + 1254 ], "deps": [ "cl-lib", "lv" ], - "commit": "317e1de33086637579a7aeb60f77ed0405bf359b", - "sha256": "1nbp0kpxb0m4igyjji1b8zi06am4l5m2m6rmxgz0jvks8cyri6dm" + "commit": "59a2a45a35027948476d1d7751b0f0215b1e61aa", + "sha256": "1mly1mw85n70g6wc68p772a0k1a6w7qsds66jp2qi3xp8179pl9s" }, "stable": { "version": [ @@ -61752,11 +62064,11 @@ "url": "https://git.savannah.gnu.org/git/hyperbole.git", "unstable": { "version": [ - 20250313, - 1508 + 20250509, + 1325 ], - "commit": "f6f319eb4012d6eaaec83bc0351d0bb4d5fd699a", - "sha256": "0rgkq2v28dwkzd0ycbr2mdx9svgkvmwzjalp6c2c052dqh7pxv06" + "commit": "f2220314dd02c8766c436e0dc365957a75f62c7a", + "sha256": "1y169fa35gp7wij5lwkxbm4mvpvjx666gjr77f06hkkypx6i1ifw" }, "stable": { "version": [ @@ -61776,8 +62088,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20241223, - 733 + 20250406, + 2225 ], "deps": [ "compat", @@ -61788,8 +62100,8 @@ "taxy-magit-section", "transient" ], - "commit": "9a25b7acbf1566007addf9396d359cb5c86f606f", - "sha256": "1s49r8cdk1pbc1ryc3h2lrd2zlk3ij7s3rwrl8lp9ckgarb0gxny" + "commit": "42048ef8bc7e568f9f1e1fa82c9f70b06a4d574d", + "sha256": "07fvdzd93836msaxpw9rk0sdrxpm29fn2zk22ln91v7s9aazjd3w" }, "stable": { "version": [ @@ -62788,11 +63100,11 @@ "repo": "creichert/ido-vertical-mode.el", "unstable": { "version": [ - 20210205, - 436 + 20250424, + 1552 ], - "commit": "b1659e967da0687abceca733b389ace24004fa66", - "sha256": "0wihhkbcfsfy3drqhg443vlz931c0nvpr9rdmp8l8m33ca1bbx5i" + "commit": "35c521789bb009a7f4b0df30b68d595fdbe056a9", + "sha256": "1hy8gh9j4q4rfflr84nl8cs3r09f6giyyxw8a9898kh82pg0p78l" }, "stable": { "version": [ @@ -62864,15 +63176,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20240704, - 1334 + 20250424, + 908 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "09de86a8f056c61de72c678386039894779a9375", - "sha256": "1kdsrbh32dr3j0icnplpd4wjyp0n6d0kp7gfgbz1xcvh21gn8rdb" + "commit": "ccf32ed0b509f2173672297f6659b4459446064f", + "sha256": "0m3mpksyw9w3kfzq8yw8i1x9fyh2jcrj6dss6995nzb00zhqhzfa" }, "stable": { "version": [ @@ -63150,14 +63462,14 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20241001, - 1019 + 20250509, + 1454 ], "deps": [ "compat" ], - "commit": "21951b7081e4b36641bf87793b064e06670943d1", - "sha256": "11dykwg2dll66n5yivhmcy7pv5hr2ai05z6phml7lw941qh7nhhb" + "commit": "2cd1b2451fdd91da6f2d9450c202729cc1ef7cf1", + "sha256": "0b0xncspir2yqmg5dnnnndicgghfv1rr3smcfn390p1iqs3c0gcd" }, "stable": { "version": [ @@ -63416,30 +63728,6 @@ "sha256": "1mx9f8pwnbrm6q9ngdyv64aqkw1izj83m0mf7zqlpww7yfhv1q9b" } }, - { - "ename": "immutant-server", - "commit": "d6e906492f9982e2cebd1e4838d7b7c81a295efa", - "sha256": "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i", - "fetcher": "github", - "repo": "leathekd/immutant-server.el", - "unstable": { - "version": [ - 20140311, - 2208 - ], - "commit": "2a21e65588acb6a976f2998e30b21fdabdba4dbb", - "sha256": "0rbamm9qvipgswxng8g1d7rbdbcj7sgwrccg7imcfapwwq7xhj4h" - }, - "stable": { - "version": [ - 1, - 2, - 0 - ], - "commit": "6f3d303354a229780a33e6bae64460a95bfefe60", - "sha256": "1pf7pqh8yzyvh4gzvp5npfq8kcfjcbzra0kkw7zmz769xxc8v84x" - } - }, { "ename": "impatient-mode", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", @@ -63600,11 +63888,11 @@ "repo": "flashcode/impostman", "unstable": { "version": [ - 20240524, - 847 + 20250412, + 1521 ], - "commit": "c0d7b5b0950fd8113f55a02b3ee7e0fc9c431bea", - "sha256": "0iydxmv5kawizfi0ibzlz38ycnacgskj6l1mrx47a2hxd5laz71i" + "commit": "c1e764b16d32930d157e5bf2d2e6ac4dc3a23b8c", + "sha256": "0b0jg4kscd8n9kccqckv9zl14ymd4w4aa6krvb3bh446y7j3i1hl" }, "stable": { "version": [ @@ -64141,6 +64429,30 @@ "sha256": "0bs0z957cs240cacl3bl72dp1sqcpd0j60yrv972w6p1j9v0f3rn" } }, + { + "ename": "inform-mode", + "commit": "6ffe1cd9f7000e37c4ccca56447c00aaca0124e0", + "sha256": "04dxn3jc4mkz9wlf8av4vz8aw9m01fz7mlr4193m7jsf0wswg7kz", + "fetcher": "github", + "repo": "rrthomas/inform-mode", + "unstable": { + "version": [ + 20250422, + 1949 + ], + "commit": "71ae49c060b0cef8deee9fe6361d42ed64980e48", + "sha256": "1dhjpjgd50nihjmxfzapa1278g496cqmkv6xr68g0c42c1vn05kz" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "f24b44dfd623d47a3a83b43bd969dad33435cd09", + "sha256": "1sh2v50x4abf6ni7r8mgss2lxi9q6syj2m7bzciv0f50z8q75jq5" + } + }, { "ename": "inform7", "commit": "5d62f9e9e513103dbebc84bfcb0d18dcf7563211", @@ -64226,20 +64538,20 @@ "repo": "jamescherti/inhibit-mouse.el", "unstable": { "version": [ - 20250312, - 1941 + 20250504, + 336 ], - "commit": "8052a12c07cfdb8d344d35d4fbc0936dda495986", - "sha256": "0s5mrzmayciac8nk3fi83y62w1hc0iapzxw6v2dw6cx177sp8rnx" + "commit": "53c8f3edcc8779bb0f4cafb75fd627becaf2856a", + "sha256": "12kh731vbdn4yp20c3zb8nx8bklh0b4amdnlybb3ww3sjax41h4f" }, "stable": { "version": [ 1, 0, - 0 + 1 ], - "commit": "ce8180dd631d4aadd8b3c434ecbb77c2f5e31012", - "sha256": "0nmwx9nckq4gn3nxsf3gpqmk5cyvgy8lhr89gzvl12070npy8r4z" + "commit": "1c59f2106e7a945291309b2342aebcb87b91117f", + "sha256": "1d2ha86nc9s8rfi6l8m8c97afilnz4vwwsj5ssdph0j215ixvvml" } }, { @@ -64816,11 +65128,11 @@ "repo": "srdja/iodine-theme", "unstable": { "version": [ - 20151031, - 1639 + 20250418, + 2328 ], - "commit": "02fb780e1d8d8a6b9c709bfac399abe1665c6999", - "sha256": "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3" + "commit": "f8f8a446c82e61100519a5ab3f979953b008ce41", + "sha256": "16izpmxxpch06h5imqia9kckjvrsc3ybkkb7b7bpd9dx1a08gp6p" } }, { @@ -65035,8 +65347,8 @@ }, { "ename": "iregister", - "commit": "a12a51873444b84765758e18c9cf24d85a200e44", - "sha256": "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm", + "commit": "d84a59ad044529a705da3022a7f2d14591c54937", + "sha256": "1ii7wkgsjldx4ai0359s25knw9sm2cjk57fnjz1k8xspm0asmksf", "fetcher": "github", "repo": "atykhonov/iregister.el", "unstable": { @@ -65241,10 +65553,10 @@ }, { "ename": "iso-639", - "commit": "75219d010bfe386715b48cccc8c311d69b388873", - "sha256": "1kg4229aw00651p86mfxd7hmdq29vg5srb633xa50caz6zn169y2", + "commit": "228c1a49c6538075e52a0ad673eed6d32b026437", + "sha256": "1whvxvzj2klggvm4iw6436mr162r1jh7ifrnsv56k7bqfmjqndrl", "fetcher": "codeberg", - "repo": "Jaft/emacs-iso-639", + "repo": "tomenzgg/emacs-iso-639", "unstable": { "version": [ 20250303, @@ -65378,14 +65690,14 @@ "repo": "thierryvolpiatto/iterator", "unstable": { "version": [ - 20210109, - 1859 + 20250504, + 1720 ], "deps": [ "cl-lib" ], - "commit": "b514d4d1d0167e5973afbc93a34070d1aa967d82", - "sha256": "1xl64lz45z4s90ja96wy86qyr0xahk96v5rdvbamnfgw32kkxyh5" + "commit": "9cbe0d1153ce03d11c75f1d2b010091092b476ea", + "sha256": "10znb4hrv979zc65wk6d6zz5g6pdbgfxbp5k6zsfcagbmmm660cj" } }, { @@ -65433,20 +65745,20 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20250224, - 2125 + 20250417, + 1209 ], - "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742", - "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64" + "commit": "2529a23f9f510a94efa6c088bd14217aa764dafb", + "sha256": "1y53dg76vrc45z4qljn0cd5ycd4c9q1dwvhhii3j560hp88wkabi" }, "stable": { "version": [ 0, 15, - 0 + 1 ], - "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742", - "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64" + "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429", + "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1" } }, { @@ -65457,28 +65769,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20250224, - 2125 + 20250329, + 1401 ], "deps": [ "avy", "ivy" ], - "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742", - "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64" + "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429", + "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1" }, "stable": { "version": [ 0, 15, - 0 + 1 ], "deps": [ "avy", "ivy" ], - "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742", - "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64" + "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429", + "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1" } }, { @@ -65824,28 +66136,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20250224, - 2125 + 20250329, + 1401 ], "deps": [ "hydra", "ivy" ], - "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742", - "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64" + "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429", + "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1" }, "stable": { "version": [ 0, 15, - 0 + 1 ], "deps": [ "hydra", "ivy" ], - "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742", - "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64" + "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429", + "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1" } }, { @@ -67184,25 +67496,61 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20250311, - 1657 + 20250510, + 1639 ], "deps": [ "compat" ], - "commit": "9c778357ffaac972c86f4acd39d70c547abcaf46", - "sha256": "1xmhfrxbyw9yqxa845m90rikm6zg3fdhsb74i3qg6pgm5fiwpj1f" + "commit": "1c9be6c3293a5f34c205042c326ac3617ccab7fe", + "sha256": "1abdgjh1mfrcq6h4vh7r7bba1p0l62xibzghgv4qmhc039y7kydr" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ "compat" ], - "commit": "9c778357ffaac972c86f4acd39d70c547abcaf46", - "sha256": "1xmhfrxbyw9yqxa845m90rikm6zg3fdhsb74i3qg6pgm5fiwpj1f" + "commit": "84fc35aedddfbf24de144245fe9d1c8a61852f7a", + "sha256": "1kfxx9657zn4sy463gxwsqqh4bcdxxaf3x7jkgasl4v18mrvid1i" + } + }, + { + "ename": "jira", + "commit": "28d4e1bb8b8005577272f419935e8d65fc4c7ad7", + "sha256": "1b45k1psz67bw3lhipqlc106drbj9w8gba6knsr5csncq1p87adc", + "fetcher": "github", + "repo": "unmonoqueteclea/jira.el", + "unstable": { + "version": [ + 20250419, + 1812 + ], + "deps": [ + "magit-section", + "request", + "tablist", + "transient" + ], + "commit": "961ef56406980958f345a9265970b7100b0e92a4", + "sha256": "0nhjs1mmv63gpvmy08bm76vd1n6hy5m2r9ncjiv0xdl0x5vmpna3" + }, + "stable": { + "version": [ + 0, + 9, + 1 + ], + "deps": [ + "magit-section", + "request", + "tablist", + "transient" + ], + "commit": "961ef56406980958f345a9265970b7100b0e92a4", + "sha256": "0nhjs1mmv63gpvmy08bm76vd1n6hy5m2r9ncjiv0xdl0x5vmpna3" } }, { @@ -67300,6 +67648,21 @@ "sha256": "1iiinybr3alh0afmyhb2mz7c1r3c360bxy7x6ha2jhjk8ncz946c" } }, + { + "ename": "jjdescription", + "commit": "5d500f520c2345ff83b75d3e124ca2d2b8fd166f", + "sha256": "1rs95l6s3lkyi8qzgzz4h2arxr2s7vajrk0dzj8jzjz0xvsv7frf", + "fetcher": "github", + "repo": "necaris/jjdescription.el", + "unstable": { + "version": [ + 20250423, + 2333 + ], + "commit": "ef3c337cb82e58b3a9a9b0394e84c883a35ab795", + "sha256": "0r8wr1ddjwiramj48mxmx12h6w78igl48xnskgvavjxc458laxa7" + } + }, { "ename": "jknav", "commit": "3673aebf53a7a3d54aee4e979b9dc7e37842f4db", @@ -67987,13 +68350,13 @@ "unstable": { "version": [ 20240608, - 725 + 737 ], "deps": [ "json-mode" ], - "commit": "c4a9566142de6b0812cf4dfe0b0bf49b3e35f038", - "sha256": "0hhwhlfxrm6qnb99awy3hxm5zdjsz40jifxyp6qjsny5cg418zf9" + "commit": "7b346b0f0db62d65f382ce48a9b2ecd9e180b0d7", + "sha256": "1rppp5yi3v3jf90di9jsil18fl00l4qlgandzb3bdrv0j9z2lfqc" }, "stable": { "version": [ @@ -68016,11 +68379,11 @@ "repo": "DamienCassou/json-process-client", "unstable": { "version": [ - 20230903, - 1305 + 20250330, + 728 ], - "commit": "c4385859ada9b7803698a1f0199fea7fc8880214", - "sha256": "1n4spfyv7g88mkvca0cxc34qvp3x8vc838hmyp7x4ijr87lp8inm" + "commit": "6485953fe6eff62938fd08720811c6fdd09d7d22", + "sha256": "1vqls817hp6x7ydqyn1k7akj2pwdzi7iwp995zas24yk5w04dd5i" }, "stable": { "version": [ @@ -68142,11 +68505,11 @@ "repo": "iwahbe/jsonian", "unstable": { "version": [ - 20231229, - 1444 + 20250507, + 1231 ], - "commit": "f200035b847d6dd10bd7987f4540cff9edd3b881", - "sha256": "0zr49wnvr7r8d5a4przxsfg9gjqkpijnngq9kzjhakhqdmqbwf8q" + "commit": "513219ebb3ccdefc915715e4bf2dd6e718fabccd", + "sha256": "0liyv5lgx8lp7gkkljr7crich03w6w07i0jx1qifpxpq4rxmwpi0" }, "stable": { "version": [ @@ -68203,6 +68566,30 @@ "sha256": "14nxfa91yg2243v4d5kvynp2645x3811ispmhmpgil3x9qbl9jg9" } }, + { + "ename": "jsonp", + "commit": "38c7893aaf22cd4ca6abf739b076bc5a57cff25e", + "sha256": "1n9f2rizkslyjzxcjravkrb9mpbjzx8anb5sdhnga3rshsqipk27", + "fetcher": "github", + "repo": "joshbax189/jsonp-el", + "unstable": { + "version": [ + 20250513, + 23 + ], + "commit": "91c6ef2f998c4a70d3ebe30bf72d99f9c70ff6c7", + "sha256": "0jwa4gdy601z7pckbhjhkh61qrxvdmc5jl5sx8r57h84bs5i12aw" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "commit": "91c6ef2f998c4a70d3ebe30bf72d99f9c70ff6c7", + "sha256": "0jwa4gdy601z7pckbhjhkh61qrxvdmc5jl5sx8r57h84bs5i12aw" + } + }, { "ename": "jss", "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", @@ -68266,11 +68653,11 @@ "repo": "llemaitre19/jtsx", "unstable": { "version": [ - 20250307, - 2319 + 20250414, + 2100 ], - "commit": "4cf3bbbd3b7ca3687494169699140d39b1843d8b", - "sha256": "0m3drmx57mzqahjjxfb7vwz753hhdg45akcpyfaj92miljqds3v8" + "commit": "f715f9b97d504492378a31004c40db3b661b15e1", + "sha256": "19w1ndnc1rivcl0z3frrykrjbq5683cg62mhsp7xjac5hglcd5km" }, "stable": { "version": [ @@ -68290,14 +68677,14 @@ "repo": "FelipeLema/julia-formatter.el", "unstable": { "version": [ - 20231130, - 1512 + 20250320, + 2047 ], "deps": [ "session-async" ], - "commit": "4b40481cc9c0dcb3c9704436e00d613067d44bf5", - "sha256": "06rrkpzrmfc67aiz4wcn5l4s4hvjs7fxvxd97d80afaqc4pzrj6d" + "commit": "a94b9ff00af3d64a08d447c90bcc2a4499eae55d", + "sha256": "0llhazgwjnypdkfy2yipr4k1w3zrpv4xnpsnlmpm6375gw5s7yp4" } }, { @@ -68308,11 +68695,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20241213, - 1620 + 20250407, + 841 ], - "commit": "0f4d74f9049df28e2f522733141bfc5b7a0f69a3", - "sha256": "0vyr48afhlm207hidmahp1rsnjdfxdf2li8bisswjd6l3hhd8wxv" + "commit": "7fc071eb2c383d44be6d61ea6cef73b0cc8ef9b7", + "sha256": "1dfls9ggn192xblfyjrbxi007hg4yd25s2cl8zh0v40akpqclhqc" }, "stable": { "version": [ @@ -68447,25 +68834,25 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20240514, - 724 + 20250502, + 1103 ], "deps": [ "vterm" ], - "commit": "2298cd42d354f069adbb7bb06b3b15222e5f54a2", - "sha256": "0r0anwzar8rwiwzwg637nshj59mssiipbilcc6kvxr73ffviy127" + "commit": "310fa8fc32e86d4e588985b0dd46e2162e42560f", + "sha256": "0anr5jycj9553wq3s9w3kkbj8ww33b2mv2b842x6c1mf57sz1ax0" }, "stable": { "version": [ 0, - 25 + 27 ], "deps": [ "vterm" ], - "commit": "5e94f761be563db1f537ce37508ffa2cc33fc567", - "sha256": "01hvb5b884rv7q3mng8l71iwikzinvbwns41na30l0rqpzljcqs7" + "commit": "310fa8fc32e86d4e588985b0dd46e2162e42560f", + "sha256": "0anr5jycj9553wq3s9w3kkbj8ww33b2mv2b842x6c1mf57sz1ax0" } }, { @@ -68600,8 +68987,8 @@ "repo": "emacs-jupyter/jupyter", "unstable": { "version": [ - 20241203, - 1917 + 20250402, + 1740 ], "deps": [ "cl-lib", @@ -68610,8 +68997,8 @@ "websocket", "zmq" ], - "commit": "db8a9e233a010a61063f34220821ec76157a2d84", - "sha256": "0gjxi84d95sx5fw8q2a8szfhq6kb4xzwq0xr9a3pirkiga9hxymz" + "commit": "3615c2de16988c4dd9d1978bfa10ee3092e85b33", + "sha256": "0kmh0m2qjichd07wf3f9w11hrkpnbiy7vli9ad0ric82k56xsbvj" }, "stable": { "version": [ @@ -68629,6 +69016,21 @@ "sha256": "0rf8d83bzc05v0w7zpqwcd89cdvrxwzpyf55vmmzj5j755bgxvhs" } }, + { + "ename": "jupyter-ascending", + "commit": "a8a92e318a404f62df8f732fe3415e2a22b512e0", + "sha256": "0w52lvb6b5a1gclld4hjj2anvxy6xr08cm19dfvrzvr2hqss5nfa", + "fetcher": "github", + "repo": "Duncan-Britt/jupyter-ascending", + "unstable": { + "version": [ + 20250427, + 2101 + ], + "commit": "dda5bb675ca5f1e0d23e9fcb430f49adcafd2d2e", + "sha256": "0mj3c2a9q6ccv01x128kww4caxlqfxpnyygkxdgvcxaprc1kv12y" + } + }, { "ename": "just-mode", "commit": "4ae56fd7c24a37769aeaba2de086a126d6ff23d3", @@ -68661,11 +69063,11 @@ "repo": "leon-barrett/just-ts-mode.el", "unstable": { "version": [ - 20241014, - 2252 + 20250328, + 2115 ], - "commit": "acb598f1edabae9f679a507c8e22c21b3f2da132", - "sha256": "0v9pgnlz7xm0kigpq3ymalx0jay1553rl3yra0fmggykmqi9gi17" + "commit": "9660d8f7ed48351ca594316d665f9cbbed803388", + "sha256": "1821xdznd1mh30nz5hj889shd0i28h545l2yjwgyiji9rgvdcbwi" } }, { @@ -68765,14 +69167,14 @@ "repo": "TxGVNN/emacs-k8s-mode", "unstable": { "version": [ - 20230305, - 1039 + 20250408, + 844 ], "deps": [ "yaml-mode" ], - "commit": "83266cecd6a39cdf57d124270646047860bfb7ab", - "sha256": "0vnq41dg20nwixcdabjz88pnhdis8c1rpc7g7sxmkzk8gfgcilmv" + "commit": "39a189d1e030aa108e90a82fd40f0042b1e69b21", + "sha256": "0jhll0v7c905jmqkss0kjnbhzlp4f6k9a7sq614gia7c728j5fxp" }, "stable": { "version": [ @@ -69060,11 +69462,11 @@ "url": "https://hg.sr.ht/~arnebab/kanban.el", "unstable": { "version": [ - 20230210, - 1505 + 20250501, + 957 ], - "commit": "d70fa7acab2bfcbb7d3da43c1343073f7eff4998", - "sha256": "0ic1gllj8ffvypn911w9rcw8jjahsqnzp3mk8shim06nw8qjs6af" + "commit": "6bfdc94e4cee0f946fc032a2471898b945e25aea", + "sha256": "1b29mvfvpml7nn9bl0gw200vgz0bh27x11r3yswi7hy0cxbd0adf" } }, { @@ -69323,8 +69725,8 @@ "repo": "jinnovation/kele.el", "unstable": { "version": [ - 20250112, - 2243 + 20250318, + 226 ], "deps": [ "async", @@ -69336,8 +69738,8 @@ "s", "yaml" ], - "commit": "1d23e6a18a031466a2c41f72d0e2f67b5cc45373", - "sha256": "1vhhjy7wz6cazi4qfnraxl6km611cyb9gfynya2hmpmjkhdmg7b2" + "commit": "9ad25a31103c6deea2dbea86f1f5f752cac3d622", + "sha256": "0b04dxzxnvh33zixvba7axdkwrw83688392h69gcn80bcamakj52" }, "stable": { "version": [ @@ -69405,20 +69807,20 @@ "repo": "emacsorphanage/key-chord", "unstable": { "version": [ - 20240910, - 1441 + 20250330, + 2011 ], - "commit": "fc75b1451759121601110da8ddfadcf5156318af", - "sha256": "1ikg1kfyb8rgms5yvvg4117kmzw2jlq8h1wyq2l93my99c5qwm2g" + "commit": "cb646e815c61f253ad9fdfbe058049dda4e2b32b", + "sha256": "1lr5vgkcn13vq0lhyxl4lvwqnmvyf3kk5fs705qrv56l2hl4k2rm" }, "stable": { "version": [ 0, - 7, - 1 + 8, + 2 ], - "commit": "fc75b1451759121601110da8ddfadcf5156318af", - "sha256": "1ikg1kfyb8rgms5yvvg4117kmzw2jlq8h1wyq2l93my99c5qwm2g" + "commit": "cb646e815c61f253ad9fdfbe058049dda4e2b32b", + "sha256": "1lr5vgkcn13vq0lhyxl4lvwqnmvyf3kk5fs705qrv56l2hl4k2rm" } }, { @@ -69527,26 +69929,26 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20250301, - 1645 + 20250505, + 2146 ], "deps": [ "compat" ], - "commit": "df329db48c22a3905d540c4240ac65c7b45f51dd", - "sha256": "130jfvy3pr3syqk6xaz910nignja32bzfnx342rr927jwa1vprfm" + "commit": "965ceb09db7af1d20c2848e7dfdc9d83a2b7dada", + "sha256": "18xvyki6jlq6m2l14rsy32bmhj4n5qyr3314xj2jmb7xmvs05l2v" }, "stable": { "version": [ 1, 4, - 2 + 3 ], "deps": [ "compat" ], - "commit": "df329db48c22a3905d540c4240ac65c7b45f51dd", - "sha256": "130jfvy3pr3syqk6xaz910nignja32bzfnx342rr927jwa1vprfm" + "commit": "83216f97b3dd99dbb1d4dbc781e863f205b6d5d9", + "sha256": "0s6mrz52si6kdd25l0nmv1lbjpkv7qsz049rmmnrsww9kz8jvrdi" } }, { @@ -69630,14 +70032,14 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20240805, - 1326 + 20250511, + 1413 ], "deps": [ "compat" ], - "commit": "a1ea60ce0adfbb4b47cdd7f29943e5ee362b71ce", - "sha256": "1va7dsh0c2xf234lfkkmw63c9p0m9h8aiikrlf361nllrzz77497" + "commit": "0fa24784cbdd48912a95fd88db602a41fdfd3cfd", + "sha256": "0rxfpkgvspcx6kjnz8zfa7xklnn2xknbbmxkfd2jmzvvhif9ldxv" }, "stable": { "version": [ @@ -69660,11 +70062,11 @@ "repo": "Boruch-Baum/emacs-keypress-multi-event", "unstable": { "version": [ - 20190109, - 530 + 20250313, + 1648 ], - "commit": "9de65a27e10d8ae47aa6d28c02c3eb82ee8c0b2e", - "sha256": "1ybbayxfix63rwc8p5kl4wxxlk6vg53abw40fqrlkbc6qrr7nm5c" + "commit": "8c31b75f6ef4d81d5625e91a4130e204bfd02dd3", + "sha256": "1yd23idzczxi0wmbj70qfkypqjzfaq3ibx1y2k9y2hqs411d8nwp" }, "stable": { "version": [ @@ -69876,28 +70278,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20250218, - 1324 + 20250423, + 1331 ], "deps": [ "dash", "transient" ], - "commit": "0016fe06c96c9e09e6d411a9d3219d290bd34757", - "sha256": "02rfmh0mazixzf6i777zpz188c42p79ql74jd72y9gnf9c361b1x" + "commit": "964a784acff6905f3eb7cbf76dff557228513aee", + "sha256": "1pn2srzmy5j5fpmj944lf8kszba1s4pdsbybcwlz84grjz45hi78" }, "stable": { "version": [ 1, - 36, - 6 + 41, + 0 ], "deps": [ "dash", "transient" ], - "commit": "0016fe06c96c9e09e6d411a9d3219d290bd34757", - "sha256": "02rfmh0mazixzf6i777zpz188c42p79ql74jd72y9gnf9c361b1x" + "commit": "964a784acff6905f3eb7cbf76dff557228513aee", + "sha256": "1pn2srzmy5j5fpmj944lf8kszba1s4pdsbybcwlz84grjz45hi78" } }, { @@ -70173,25 +70575,25 @@ }, { "ename": "klere-theme", - "commit": "75219d010bfe386715b48cccc8c311d69b388873", - "sha256": "1kxhdaw2mn4vkdxyx0zdhzy0p7axwg0ayi125pmfbv18y1ypdh6q", + "commit": "6d04c0f70e95329bc897a3a0cf548b58abbcc870", + "sha256": "185rfh3md6psz94nrcvyxa2r82v1szfd35bbfr1qppcnmabg1bhk", "fetcher": "codeberg", - "repo": "Jaft/emacs-klere-theme", + "repo": "tomenzgg/emacs-klere-theme", "unstable": { "version": [ - 20250225, - 2027 + 20250517, + 452 ], - "commit": "4a8e28002b3cd6acd67886aab01d59b21b659dda", - "sha256": "0hq4dnm7aaq39b8kcps3frv4l1xb6qr61cjs0nrfj54sdwnrz2xx" + "commit": "377cc33617184e23acde6707beaf8938915fe093", + "sha256": "15rgq1a6k64ws0fh864awnw22qzpb58z5s2gj2cp1svw4yakr84w" } }, { "ename": "klondike", - "commit": "75219d010bfe386715b48cccc8c311d69b388873", - "sha256": "0g0x1p6mn57fknj1knk2gn325lkchz93jyycfybbg025s1wi0zw0", + "commit": "464dbf70ffc13c99adf6ee7d03215042c80f64dc", + "sha256": "1scbcjcjzz673cbnhjx2hlixqj6f8cijg0rnhi49zc013vg416dd", "fetcher": "codeberg", - "repo": "Jaft/Emacs-Klondike", + "repo": "tomenzgg/Emacs-Klondike", "unstable": { "version": [ 20250301, @@ -70218,11 +70620,11 @@ "repo": "vifon/kmacro-x.el", "unstable": { "version": [ - 20240721, - 1103 + 20250514, + 1246 ], - "commit": "3f58f5421b98b436122dba2514cf559a7359904d", - "sha256": "0l3qrxgb8d67vwny7gpjjwnz367pbrj1qhy29cj9bbl9bbnlnkp8" + "commit": "6250d4d6e49b8708ac640e3d9b5ab4c072993067", + "sha256": "19nk9j8jfgmrxywbc3433sr81mb533n9zkdp3r0qjpplwf2ax48i" } }, { @@ -70532,8 +70934,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20250110, - 1811 + 20250507, + 1654 ], "deps": [ "dash", @@ -70541,8 +70943,8 @@ "transient", "yaml-mode" ], - "commit": "d587d6a09faa4add084847643821ec1aa60882d5", - "sha256": "19s4jc0ml22di47c7fz51bk24b56mzwrfgkba0k3qcpjhjrnv51f" + "commit": "61ec610b817c9ef59b2f25a242b71dee3f2e068a", + "sha256": "0h0k9zz6dvdbg2h96zkjn3gl6k9fk7fddjac81vbs7g8gyj5pfjd" }, "stable": { "version": [ @@ -70598,8 +71000,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20250310, - 1057 + 20250330, + 1936 ], "deps": [ "dash", @@ -70610,8 +71012,8 @@ "transient", "with-editor" ], - "commit": "c8a2cceaf328213faa5fc00af758ba395488384d", - "sha256": "1m8avcjy64qlqrd0qrz8ffbhzn723icshf010isqm99r5404d2ja" + "commit": "938ef502414d093de827bf7f11bdb30843878a37", + "sha256": "1z0cadv3kyw3drd971zqisk4qw5hm1y9lwbs9g4g5626ys13wl5r" }, "stable": { "version": [ @@ -70943,16 +71345,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20250220, - 1613 + 20250418, + 1238 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "17279fb3a820ea2181a8296debcdd4e6dfc72024", - "sha256": "1lj8ifw8cymyxskv4w18pk5magj79rv1q9f0w75mwrs6mbm5fnj6" + "commit": "4f22b700f61665e3d87e7a86774b61d26f0b6efb", + "sha256": "1nk9mvf0y3ya49jlmgpc6zkhn8qxvnh9nwnv61jm8klhvnfc7hlj" }, "stable": { "version": [ @@ -71915,11 +72317,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20250313, - 459 + 20250317, + 529 ], - "commit": "0365501aeaffdd8955f4cad25c9eaf3bee30efe5", - "sha256": "1q4sn6xisgq0pyp26j5fj3r69blh7v5vfazwpfryrrlr78s8ni5y" + "commit": "d9b664820176bf294fbca5ee99c91920862cf37d", + "sha256": "1nvnx28b6xwwqfpswr0hiszc38znr5x56q9aplgnf8n3p3mvash5" }, "stable": { "version": [ @@ -71954,32 +72356,30 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20250312, - 806 + 20250417, + 1453 ], "deps": [ "aio", "log4e", "s" ], - "commit": "b0c466fa58254ee7396ae23310d718fc14a6b3df", - "sha256": "05zk1fwcclk74658m3r9igsada1fjyk681pc3x4jkqlwqijbzxsh" + "commit": "7f1d6804ed3b9de98d2737e1eab275cd9cbcdb16", + "sha256": "0id54jbcva1nnxb84sbg9pfs182fljrm127yw6qz83kmskgw9gas" }, "stable": { "version": [ 0, 1, - 27 + 28 ], "deps": [ "aio", - "dash", - "graphql", "log4e", - "spinner" + "s" ], - "commit": "b95221179bd51b43bb2c5e810e1a2de88ef54d82", - "sha256": "1gmap7472cakcigibydgg0zjd5yha4dp22w0ffqk6zl4qrh7hcdb" + "commit": "02eb6ff9c75ba8f0a7196f34665e9ed43c4d7598", + "sha256": "1hzay0gjykzcp6n59ymbrmla4df79xaga0zhypgflabglmkdnz49" } }, { @@ -72198,20 +72598,20 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20250301, - 1634 + 20250422, + 932 ], - "commit": "43c9836cd3a3b96a56b200a340eb5c92e0766efa", - "sha256": "1qwn8565bpdqs1w1k248i2xg3lr6al5v8bzmj90d8ysqpalhr235" + "commit": "d84b1d8b435a517b7daf70d341784245fde1e8c0", + "sha256": "1y52vgfwy7qqyz1cnm82l9i0nr6658j3cnmwnnrzsj052272lyw6" }, "stable": { "version": [ 2, 5, - 301 + 422 ], - "commit": "43c9836cd3a3b96a56b200a340eb5c92e0766efa", - "sha256": "1qwn8565bpdqs1w1k248i2xg3lr6al5v8bzmj90d8ysqpalhr235" + "commit": "d84b1d8b435a517b7daf70d341784245fde1e8c0", + "sha256": "1y52vgfwy7qqyz1cnm82l9i0nr6658j3cnmwnnrzsj052272lyw6" } }, { @@ -73415,11 +73815,20 @@ "repo": "countvajhula/lithium", "unstable": { "version": [ - 20250305, - 2355 + 20250430, + 2353 ], - "commit": "4618600e9443dabf5f9d3856a78645a2099f5987", - "sha256": "011hfn1y929r6wg1ld4v3vn9i46cis80pzvc98yp62cxd4145ccn" + "commit": "0be5e40a508ed053b0da13ec655b3aa498434cc1", + "sha256": "1fppbhynky3vqw4pg7f229w4grv15s0my3qd4nxxinb53p0x979n" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "8d97cec32fe724750ef5dd85626e49dcf436deaf", + "sha256": "0a2ns44n9daapnzcm0hdlx2445l864hysln46s99jxxxw7ar5nvv" } }, { @@ -73600,26 +74009,26 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20250312, - 1428 + 20250509, + 1221 ], "deps": [ "compat" ], - "commit": "ff77af7c5df678041aebb48497418ff8af0acefc", - "sha256": "1a43lm4i7lppigi9mk9alylm3vganqn8prfx7dxiagxdrifif58k" + "commit": "7de288e79329bfb3e2b4a2f9b574cf834bd371dd", + "sha256": "1cmm0yiv0aq0jq54m5amwb1g9gagfajhblb1m8871gpcfw4f5am0" }, "stable": { "version": [ 0, 6, - 1 + 2 ], "deps": [ "compat" ], - "commit": "c1b320d6308a68d8841116745310cc55ac5ce74b", - "sha256": "0pa7sdj7rxj8hr3r2lcwz3z04b8b9k61d9j9a7qr1n3n9x9krdjd" + "commit": "48e5bc4919a4a29665362832d59ade8e248b0c3e", + "sha256": "0agn4n744fzf1f5i22448p1r7njd0kyxzs763gvml588r2ql2ja5" } }, { @@ -74065,16 +74474,16 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20250306, - 1331 + 20250401, + 1723 ], "deps": [ "compat", "datetime", "extmap" ], - "commit": "cd990bf63785897bfdfa0ec954db986f0361449f", - "sha256": "1zxsyx61nh2x1lx55k1w0w3cj0p541dwc5i5pps7qfwqa0184f22" + "commit": "649d878f7e2aad0f938b2cf0a870f1968b4d5e30", + "sha256": "0jd9ym4hlj699a021xy3fhk2wr2pfkskw72ifzh5q50bz1nmiy3s" }, "stable": { "version": [ @@ -74162,11 +74571,11 @@ "repo": "petermao/look-mode", "unstable": { "version": [ - 20220626, - 641 + 20250511, + 602 ], - "commit": "726c5b9098926278603a83e978b488371c0e9143", - "sha256": "00c9v9jp7bgqr0bi0j6fhl6j2fj2xfk7lxrczxbcsvpx1896il93" + "commit": "6d82a013ede5f9ef5493801c3071bad5f6b283bb", + "sha256": "1hbhvj2z41sdb03srm9q88pl5f7dzvgif9y5p7sw45gpz1bmnhmf" } }, { @@ -74832,14 +75241,14 @@ }, { "ename": "lsp-mode", - "commit": "525ea5927f1c66dc56b49aab40667be15a7ea063", - "sha256": "0vjk60avwydap3zacygmrxsapbkfxb26k89km38633sg3788xqx9", + "commit": "6eb7943a6bc2593130db5f1faef404044714a894", + "sha256": "1sa63rx8x87dndav6galln5p46qh4di7bc60v91wa8qccfn2334y", "fetcher": "github", "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20250312, - 2052 + 20250516, + 1008 ], "deps": [ "dash", @@ -74850,8 +75259,8 @@ "markdown-mode", "spinner" ], - "commit": "d3110e3d7dfcae2340353e30c523153ab9c1f347", - "sha256": "0a73pnm5x1jcx966img8s6w7mps6sgldamjy98j38j7bhimgb6lw" + "commit": "8a266b83ea0fb880ef697771893c41f8745a04de", + "sha256": "15acxx01qk1bijg6j8j3nnjlmxmdxhkjfdlvvgdwc9jflvpnj894" }, "stable": { "version": [ @@ -75053,28 +75462,28 @@ "repo": "rgherdt/emacs-lsp-scheme", "unstable": { "version": [ - 20230606, - 1722 + 20250425, + 1731 ], "deps": [ "f", "lsp-mode" ], - "commit": "99251252005650d6f39cead8b2b9698c83251f01", - "sha256": "1b96ziqf3lx429w7qcbh30n85bzq17yknx04qmvvs9a1zbvicw9n" + "commit": "e50f92618ad34c6d6752cffe12b116f8f9705712", + "sha256": "1vi9wvh2ap0bbalckqa7x0xz9bmr481v1whs5l0bwgw411h7wpaj" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "f", "lsp-mode" ], - "commit": "c18afd39c841201c811583ff449a495d835b4773", - "sha256": "1h46bqpmnig64yhamniyi8wia256jm0diqqql0wxwi1pw25dcwa6" + "commit": "1821cf7ecc089251e08f03cf4ab11b60e9b58dda", + "sha256": "1j34pa2q3viyf03m6a44p2v4k2qyq7l1xh65xvcvgfiwvgni9d64" } }, { @@ -75167,15 +75576,15 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20241018, - 200 + 20250425, + 326 ], "deps": [ "f", "lsp-mode" ], - "commit": "ca5e611d2a38fea8802a365bcdd6fdc73e3d79af", - "sha256": "0632nrmdfcwgzl1cqf83rwsxrk3fckg7y8h3fhcaa3j47zd32q53" + "commit": "294121ada4feb4f4ad4d1a8b2dc69de89d518d31", + "sha256": "18p7kg2sx4vmasapgsq45650yckji7xhvnl9bw571359y31y9hq7" }, "stable": { "version": [ @@ -75197,8 +75606,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20250301, - 131 + 20250328, + 1727 ], "deps": [ "dash", @@ -75207,8 +75616,8 @@ "lsp-mode", "treemacs" ], - "commit": "2495abd9df2f19335b4a280d9db641e02e2ddcfa", - "sha256": "1xnj2kjiwwy4pdaif2yp7n1iirmgpdmi5w9ala0hmqki4yi5rgcc" + "commit": "312dee2b3ab776868c2b367d0ac15259689d981a", + "sha256": "043zqbx1y98bp9n6cq3cmm490rlhcj35mnm7jf52bny17fldchap" }, "stable": { "version": [ @@ -75624,14 +76033,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20250128, - 148 + 20250320, + 2309 ], "deps": [ "transient" ], - "commit": "e80b6a523e49b6e15390ee00745035a4d87aea60", - "sha256": "0chnnjzjz62fdwcjpix142ssw1nv879qwjczkmlxd77sfbcxjknf" + "commit": "e29f7ac8c17cfa04bb81c9f721f4a713709fe865", + "sha256": "13axnbqm2qdcldhz9mhvqfy3b5k6mg31jr0w63h3sxpm41ig8xcy" } }, { @@ -75791,21 +76200,21 @@ }, { "ename": "magik-mode", - "commit": "6f0cac5a5c86d160012cbb19608ad67c97afb9f1", - "sha256": "01zsjzxmax65a89x78cvi4ff0dxk1p9jlil0dhn3z2g8z92zhwvv", + "commit": "0a0a3425d94f48d9804478c0d1a2d77f41c6d6b9", + "sha256": "0i1y6kjsmi5q5jzf51srb1wm544xw8b5glgn48cmyzria277rygg", "fetcher": "github", "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20250312, - 815 + 20250429, + 1530 ], "deps": [ "compat", "yasnippet" ], - "commit": "0c5131285845c7147b41dc5bd04372c71b690684", - "sha256": "0wkvvdnpaa9079sdv0x3l3l56mhisnklp39mngk30hs7833fnpzq" + "commit": "17f1a1a7d3145cebd958fa8bfe786957728a5e18", + "sha256": "1sap5ix4bia1fgkdigk478cjhpdsy5pxmxnmj07sp5m0mhaaiik0" }, "stable": { "version": [ @@ -75828,8 +76237,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20250312, - 1432 + 20250516, + 742 ], "deps": [ "compat", @@ -75839,14 +76248,14 @@ "transient", "with-editor" ], - "commit": "ed4fa09eeeb531c0cfc3c7bf713d3929c2b2107d", - "sha256": "06lshr77f3avgryc1pryiadhayxb3djw8rcvb8qj35g66rpdr6jl" + "commit": "cfe4faaaf6791e6f0aa64108b16b9b0074251fb8", + "sha256": "1wqriq06lkii3sbwjl5y4c12sjf0krfkl82ws0c78nv54p5y4j92" }, "stable": { "version": [ 4, 3, - 1 + 5 ], "deps": [ "compat", @@ -75856,8 +76265,8 @@ "transient", "with-editor" ], - "commit": "28d272ce0bcecc2e312d22ed15a48ad4cea564eb", - "sha256": "07harzpyqrskx4xslj4xa1w1d0sza13zw5z0nam9kagi72cklvjv" + "commit": "04ee83d93fabbfbe202e9e7dc781b0dcd4d5b502", + "sha256": "0g0ji4m39z8mcq1krj8v3kdhb2a8v2w0m00dqq3z925ibq0lv01r" } }, { @@ -76149,16 +76558,48 @@ "repo": "douo/magit-gptcommit", "unstable": { "version": [ - 20250216, - 922 + 20250421, + 1917 ], "deps": [ "dash", "llm", "magit" ], - "commit": "f943440459eebec979defe4161d7505fb76f4675", - "sha256": "1vb361dxjgmh76hryviprvmy3djm2dj723f8sipfbshgrgqwpsl8" + "commit": "97dfcf33777731ba8d8ad0522c2deb0554a143fe", + "sha256": "1nwxkmgg5a5ni365rp23bg6r80j36bjlz0544lhw4k99ydxm0clm" + } + }, + { + "ename": "magit-ido", + "commit": "766d5c6e7f8f3f785c2e6ea81bf12951ad0c52f7", + "sha256": "01vskbslzkqrznnaksrmlmfsij5ac58j6fmnpiaic58cjmbn8b50", + "fetcher": "github", + "repo": "emacsorphanage/magit-ido", + "unstable": { + "version": [ + 20250330, + 1737 + ], + "deps": [ + "ido-completing-read+", + "magit" + ], + "commit": "2b94abf65a208e4c844d046217350efbf77cf582", + "sha256": "094j6k1cr3v4nbmy464mn3hpw58x02zjj835mqb0crl8vvxmgdpg" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "ido-completing-read+", + "magit" + ], + "commit": "2b94abf65a208e4c844d046217350efbf77cf582", + "sha256": "094j6k1cr3v4nbmy464mn3hpw58x02zjj835mqb0crl8vvxmgdpg" } }, { @@ -76261,17 +76702,18 @@ "repo": "emacsorphanage/magit-p4", "unstable": { "version": [ - 20220822, - 2022 + 20250323, + 2202 ], "deps": [ "cl-lib", "magit", - "magit-popup", - "p4" + "p4", + "transient", + "with-editor" ], - "commit": "0fd0f882eb14510714393c15c2ccb8d2c259f01e", - "sha256": "0wdclkkqlfswqbsg8ld1gqji1rnxpl8s00ym7imgqdf1is961qj1" + "commit": "3a26854f60293d85501d2ee99a54d42ae2e16f98", + "sha256": "0kn7l90bwkj3a7jjfwl1wqm3y7008bpagyi98p4q7x2adgybdwwr" }, "stable": { "version": [ @@ -76383,30 +76825,30 @@ "repo": "magit/magit", "unstable": { "version": [ - 20250307, - 1739 + 20250514, + 1738 ], "deps": [ "compat", "llama", "seq" ], - "commit": "3f79700f1b9a6f5f6fd6a77fd1e812c1b8e6463b", - "sha256": "0hm4wcnr9ybsll507xdhmprb2in93pdn2mw9a1zf7cfvr4ygk0yg" + "commit": "04ee83d93fabbfbe202e9e7dc781b0dcd4d5b502", + "sha256": "0g0ji4m39z8mcq1krj8v3kdhb2a8v2w0m00dqq3z925ibq0lv01r" }, "stable": { "version": [ 4, 3, - 1 + 5 ], "deps": [ "compat", "llama", "seq" ], - "commit": "28d272ce0bcecc2e312d22ed15a48ad4cea564eb", - "sha256": "07harzpyqrskx4xslj4xa1w1d0sza13zw5z0nam9kagi72cklvjv" + "commit": "04ee83d93fabbfbe202e9e7dc781b0dcd4d5b502", + "sha256": "0g0ji4m39z8mcq1krj8v3kdhb2a8v2w0m00dqq3z925ibq0lv01r" } }, { @@ -77164,25 +77606,25 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20250203, - 1018 + 20250317, + 1632 ], "deps": [ "compat" ], - "commit": "a527fb03b76a2bce1e360c6e73a095e06922c3f3", - "sha256": "0q6n426yplj6iijsfx11lnlaz4l5iddav2dxml1p2zxvc4k2njy5" + "commit": "c51fd9e4d4258543e0cd8dedda941789163bec5a", + "sha256": "00dzckksfzvwjdy3v1g71nvkxnnpw2bmh8bmhf56qn3nzfj2yr89" }, "stable": { "version": [ - 1, - 8 + 2, + 0 ], "deps": [ "compat" ], - "commit": "006a7cd0a14dd651dcff65ed96c0d52d2067b8c1", - "sha256": "12kg0zd1zw2rc3pxi655gh37bxbbkpmdb05yi77rdccl8gh9jwry" + "commit": "c51fd9e4d4258543e0cd8dedda941789163bec5a", + "sha256": "00dzckksfzvwjdy3v1g71nvkxnnpw2bmh8bmhf56qn3nzfj2yr89" } }, { @@ -77306,11 +77748,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20250310, - 417 + 20250501, + 551 ], - "commit": "dd2cb2cdcd6594c3663cda20b465f09c773fcc90", - "sha256": "16myq0adw6n38qlai7zzmrln5ckdhv668nyg52mkdyr5hamcpwp0" + "commit": "90ad4af79a8bb65a3a5cdd6314be44abd9517cfc", + "sha256": "19c1jza1xkj3dhf23jw7if2qmr26db7qq6xp5d8q5gyc4v2pm11w" }, "stable": { "version": [ @@ -77666,30 +78108,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20250305, - 2104 + 20250330, + 1519 ], "deps": [ "persist", - "request", "tp" ], - "commit": "fd59828c89e808d0a6d0d9abab8e830df494b515", - "sha256": "1wc3y3pwg9xc27fa6xc2bcv809rxcbjy372r998wl95a81apx32g" + "commit": "163ba2b0b89a292b99bff0f574f5584ec888469a", + "sha256": "1j4n6ipiahxk6v84dnsrcpzaqsd4v9q2mviqkznm189cp98h6zxk" }, "stable": { "version": [ - 1, - 1, - 12 + 2, + 0, + 0 ], "deps": [ "persist", - "request", "tp" ], - "commit": "fd59828c89e808d0a6d0d9abab8e830df494b515", - "sha256": "1wc3y3pwg9xc27fa6xc2bcv809rxcbjy372r998wl95a81apx32g" + "commit": "163ba2b0b89a292b99bff0f574f5584ec888469a", + "sha256": "1j4n6ipiahxk6v84dnsrcpzaqsd4v9q2mviqkznm189cp98h6zxk" } }, { @@ -77827,11 +78267,11 @@ "repo": "mathworks/Emacs-MATLAB-Mode", "unstable": { "version": [ - 20241208, - 1657 + 20250512, + 1603 ], - "commit": "935137844e16551a5369f928d2591556be7fb9c2", - "sha256": "0gwr1f5mmzgznpvki9nri6lm4lj3qxlv40hsbsjgvmk1921xs6xd" + "commit": "3bbd36c45f7057b99131352d6d534fdb091b38e9", + "sha256": "12mci2micy2ac4i6czpnkklxx8nfs1mwh5xdfxbaw1ga7wqd784q" }, "stable": { "version": [ @@ -78135,11 +78575,11 @@ "repo": "jumper047/media-progress", "unstable": { "version": [ - 20230805, - 2231 + 20250511, + 1045 ], - "commit": "951742e9e741a71bf527a23bf56deeedb12af7bd", - "sha256": "0f6h1w8nz9038pmlgmabv28qpq3n80fs812a4gz6773gknd50cjz" + "commit": "7055f5830690c9b1330816f899ee05791f35b406", + "sha256": "1i27pm1gg3096pammxdvfl21czs7m2pnn4z32gvq46jfm8d3qx67" } }, { @@ -78168,15 +78608,15 @@ "repo": "jumper047/media-progress", "unstable": { "version": [ - 20230520, - 1547 + 20250511, + 1045 ], "deps": [ "dirvish", "media-progress" ], - "commit": "ec777d2d200ecb85795a225b482808f048c30a1c", - "sha256": "0i3yafqny2n8cha62xxmgg9nssv2qb0njjf218bzp9300c7qkfap" + "commit": "7055f5830690c9b1330816f899ee05791f35b406", + "sha256": "1i27pm1gg3096pammxdvfl21czs7m2pnn4z32gvq46jfm8d3qx67" } }, { @@ -78421,11 +78861,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20250201, - 1911 + 20250404, + 1432 ], - "commit": "0314cd1bc661c8900bae5ef65d55f67a9ddc7193", - "sha256": "0knd02sx26cv76lci2w63fzvmvql30i052y2c15j1c9lhn7nz3pq" + "commit": "e5817f3b5ef82cbcf8a729af205191dc6b142282", + "sha256": "15nic2v054256696r4phfrfgbpa9vyjf2z2shdvx6zp10nkc936x" }, "stable": { "version": [ @@ -78445,14 +78885,14 @@ "repo": "skissue/meow-tree-sitter", "unstable": { "version": [ - 20241124, - 2224 + 20250513, + 1948 ], "deps": [ "meow" ], - "commit": "d8e80d5ab97c85340b21be125f1e17edec2f21dd", - "sha256": "13r4s6nr0p5fj38swrgz5hnd12cazyigligr18ikwc6sxzz9yj9z" + "commit": "b05d54a5e19f8ba0258b0bbf0ffcd4bc7bad112c", + "sha256": "05v3gi29rnl47fnq1l3yrarsdyrfir5bx42rh2kj93f180jjp3z2" }, "stable": { "version": [ @@ -78608,26 +79048,26 @@ "repo": "KeyWeeUsr/mermaid-docker-mode", "unstable": { "version": [ - 20250313, - 652 + 20250424, + 1730 ], "deps": [ "mermaid-mode" ], - "commit": "d40e4a4c031f363b58ef1cef9eefc097d4c4d85a", - "sha256": "0aj9pk0wjx9swza884frk7jgqlm0ggxm9w7yj8z7wmpi55jcfzr8" + "commit": "ce5f941cdb1bb360872bd5f80574a50d23f85531", + "sha256": "1jl0b22i1p8lqmw087pwpfgr49k2xd3g6037apn4k1p0ii22zv76" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "mermaid-mode" ], - "commit": "d40e4a4c031f363b58ef1cef9eefc097d4c4d85a", - "sha256": "0aj9pk0wjx9swza884frk7jgqlm0ggxm9w7yj8z7wmpi55jcfzr8" + "commit": "ce5f941cdb1bb360872bd5f80574a50d23f85531", + "sha256": "1jl0b22i1p8lqmw087pwpfgr49k2xd3g6037apn4k1p0ii22zv76" } }, { @@ -79039,14 +79479,14 @@ "repo": "yoshinari-nomura/mhc", "unstable": { "version": [ - 20240419, - 10 + 20250423, + 342 ], "deps": [ "calfw" ], - "commit": "b527a88748651d06222ad24f7417941088515275", - "sha256": "00wgf4jia9cxjpykzndsgn1jbnm6yqc7l3svfk2hj5j2ga1fax7g" + "commit": "2b22bc6c2041170df40e96b718d4b99a8330e3e3", + "sha256": "1pfv0nx4qisbsfd7pl8fd1rgjfi0p7cin6vjrx5k4fsj9ah29pcm" }, "stable": { "version": [ @@ -79069,20 +79509,20 @@ "repo": "daut/miasma-theme.el", "unstable": { "version": [ - 20250312, - 2221 + 20250513, + 2310 ], - "commit": "6604a9cd76183394447e9b2cec2265d7e62aa26b", - "sha256": "1limia5jnq9fxhvnhws1b5iw3ssdqajnyvrlzvbx3axvbgix1c2c" + "commit": "7eda5d6889716811e7d5fd51edaff9ed7b09ce15", + "sha256": "0ncy7z5gdpvq6l8b81am6czysygfyvqm2lpswgv1536xcs6iilkd" }, "stable": { "version": [ 1, 6, - 0 + 1 ], - "commit": "232e4ea1d8182c53b7ed803e1df3ad687dd22a92", - "sha256": "07fci5vli5d8m607v0v6q535gnmcf4aqyw7020pzq0d7ij4vwacj" + "commit": "7eda5d6889716811e7d5fd51edaff9ed7b09ce15", + "sha256": "0ncy7z5gdpvq6l8b81am6czysygfyvqm2lpswgv1536xcs6iilkd" } }, { @@ -79248,14 +79688,14 @@ "repo": "countvajhula/mindstream", "unstable": { "version": [ - 20250307, - 1736 + 20250330, + 201 ], "deps": [ "magit" ], - "commit": "ccd154e861223378c59b346319498df327301704", - "sha256": "03bnskwaz76f56rzk9j2rn2xh9dbqgkdzfgrx42nrxp24ssry9sl" + "commit": "5ebd1846e67cb7cb8480511825cf76269aa32d00", + "sha256": "10j10wga3yimg9rgn35h1rj04ziyyk8z97ap0xzjq27w1np5d1md" }, "stable": { "version": [ @@ -79310,15 +79750,14 @@ "repo": "eki3z/mini-echo.el", "unstable": { "version": [ - 20250216, - 1955 + 20250517, + 401 ], "deps": [ - "hide-mode-line", - "llama" + "hide-mode-line" ], - "commit": "a604f1c6630452e99a18a61586cc984822550985", - "sha256": "0nrqwyqr38gd0200my1qf8bjnwwi8dk6d2pf3dqnc2w0xgs936ms" + "commit": "94a7747cba5e57169647f2013a95a6868b755fc7", + "sha256": "1lwn18pw0369viyw87fqssxyv2m3ribqyqzlw0g9dw101hmna3s7" }, "stable": { "version": [ @@ -79541,26 +79980,26 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20250101, - 1417 + 20250428, + 1253 ], "deps": [ "compat" ], - "commit": "7ccb5e23a54c10f64880d1f55676f86681ff2f07", - "sha256": "1rinshdxln1wvzf7by8gq9wiqgcqy406k5jl1f86jd17b3wv5bxx" + "commit": "8d5acf28bb332ad75410e1d280d41f5d602c63c9", + "sha256": "1zln984w4bvflxvm922fs052qlri514p68cgxz4rrm56j8cddiqw" }, "stable": { "version": [ 1, - 0, - 3 + 1, + 0 ], "deps": [ "compat" ], - "commit": "7ccb5e23a54c10f64880d1f55676f86681ff2f07", - "sha256": "1rinshdxln1wvzf7by8gq9wiqgcqy406k5jl1f86jd17b3wv5bxx" + "commit": "8d5acf28bb332ad75410e1d280d41f5d602c63c9", + "sha256": "1zln984w4bvflxvm922fs052qlri514p68cgxz4rrm56j8cddiqw" } }, { @@ -79685,28 +80124,28 @@ "repo": "milanglacier/minuet-ai.el", "unstable": { "version": [ - 20250310, - 1934 + 20250510, + 439 ], "deps": [ "dash", "plz" ], - "commit": "fffbb3a39a996fabb65b8f06ab5422bb53c500cd", - "sha256": "0cq06rmm7j3xxfvsnb5s69byna3pwljcgp7bklfqm395h2d39wyr" + "commit": "9ad630acdce77a86eb8e4457f09c1cf547bcb186", + "sha256": "1sv7br0ixzq18m54jrg1gsgqpj373lgia64j56hy2z721q7hgqwj" }, "stable": { "version": [ 0, - 4, + 5, 4 ], "deps": [ "dash", "plz" ], - "commit": "fffbb3a39a996fabb65b8f06ab5422bb53c500cd", - "sha256": "0cq06rmm7j3xxfvsnb5s69byna3pwljcgp7bklfqm395h2d39wyr" + "commit": "8e4075713885f7ec7253936e3e74c7860ce7f77f", + "sha256": "0r8316spbcmv9nsqhmw5df3cwghbra4ncck0dzihjn9agss7zj27" } }, { @@ -79788,19 +80227,19 @@ "repo": "szermatt/mistty", "unstable": { "version": [ - 20250311, - 2051 + 20250509, + 1801 ], - "commit": "d7f0b02575e640a724caf26bad2f076ce0d9614d", - "sha256": "02af8bd0bhz8n1s7amrnwkxyrwavxaf42gwvrdpzdggcrdf2nv9j" + "commit": "248ad94b6285ddf092f9e4156221ac4acc1ff712", + "sha256": "1c2rl9bqql0fh4rcjazzk06lx8kg5gqil7awjhvzq9h1dqnvx21d" }, "stable": { "version": [ 1, - 4 + 5 ], - "commit": "012007eefee8b5dd454c0d4671902e454b0de199", - "sha256": "1garqzcx14mwakbrp5p2vqynlbh819w8gjnf24x4xhv5aa5xy81j" + "commit": "e12c6af9894d6dbfd127047663275c763cab4e89", + "sha256": "1dlb4k7sbjjgyhikbcw0qf9js328vhs964lmhciyh8ahcfb7i9l6" } }, { @@ -79972,9 +80411,9 @@ }, { "ename": "mo-git-blame", - "commit": "a784f931849ca836557390999b179ef9f6e775f3", - "sha256": "14ngwwgzrnnysq1k1k681b5i06ad8r3phhgpvn5alp2fj3il03l3", - "fetcher": "gitlab", + "commit": "2463fcab700b48d3af3afdca26acfbc0451c7be6", + "sha256": "02fyv4dnrkbsflivk30s2zay2asy12zdhr5x2jn7icfyjw8wvn0y", + "fetcher": "codeberg", "repo": "mbunkus/mo-git-blame", "unstable": { "version": [ @@ -80243,14 +80682,14 @@ "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20240805, - 1423 + 20250509, + 1454 ], "deps": [ "compat" ], - "commit": "a88406d1a999107610a765550c3bc4d64850f8a0", - "sha256": "07mbq8psd5mzsqigdvjk5hdc8kbppfghg976p5nqq4xfy3p6n0v9" + "commit": "d7bf6862b97e53d47c4b1841c70d3c776f21e50e", + "sha256": "0jq315crrmni0hvprlrm58k8mcz3i05wi1mvw71yz2a0kf3hnh5x" }, "stable": { "version": [ @@ -80383,15 +80822,15 @@ "repo": "damon-kwok/modern-sh", "unstable": { "version": [ - 20211101, - 1001 + 20250320, + 858 ], "deps": [ "eval-in-repl", "hydra" ], - "commit": "8ebebe77304aa8170f7af809e7564c79d3bd45da", - "sha256": "00ixkd1586xv7707a1gpshml221wmnv92d3dyk1fzzxvws39zvdg" + "commit": "65bc75828f7d13af713f1a728c038e2915944cd3", + "sha256": "0dgsn405dk8lxhzm497visz9n0yyn261zxvk7lj7fyk7i2s983xs" } }, { @@ -80441,20 +80880,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20250220, - 647 + 20250428, + 456 ], - "commit": "f3cd4d6983566dab0ef3bcddf812cfd565d00d08", - "sha256": "1w0hkbpcy08n6czrxmw1v4cr4pfh84brjiiaxl6dnwi525l70b6p" + "commit": "847311bf740a043deff3124492d5c53141e5701c", + "sha256": "0qsy1hf11hzh9abnz4sgnkf5p8am9fyf3mxsy2hfmg20lhdk4wam" }, "stable": { "version": [ 4, - 6, + 7, 0 ], - "commit": "895e10936adac93aa8187c9cc91092dbca898677", - "sha256": "05vzbjhas9a4zapjk2d57a6ljabf2q24d9c1zxncyff8kyimzkq2" + "commit": "d5a0eeb4f0fc5f865862465c6d17482d166b3b3d", + "sha256": "06snn66nb9qs8d8gs1dl2jhmgdris9y6pslpm0lsnq58w3ha71vl" } }, { @@ -80803,14 +81242,14 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20250101, - 1418 + 20250505, + 1556 ], "deps": [ "compat" ], - "commit": "26dd59b300c149a0e2e332023115b280b42ead12", - "sha256": "1byphhdp41cn2qs91la6fvgzrwgbyx4yaajknvwz8qxzgl2c4aq2" + "commit": "bc7d4c2e89fb9e568ad58f5f34d4bb6fc76b8c75", + "sha256": "0baj5pgc9jisw4isz8x9dljggd0dajpws3n93gy250k1rkxk2fni" }, "stable": { "version": [ @@ -80833,11 +81272,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20240802, - 800 + 20250327, + 141 ], - "commit": "b90adeff532b39568a84f04f72a1eb60dbe4b175", - "sha256": "1flsbrw431jd2gqnhw3hddgy5vgp1vm7vqr4617rr6hdiscgx6kd" + "commit": "127563df03abad087b68478bb57ee016dd50bede", + "sha256": "1fpbjywb5bq6b3an0y0vkd2x27ldxlpsf31g8yqf9c8ppwj1lyhi" }, "stable": { "version": [ @@ -80930,20 +81369,20 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20250312, - 1417 + 20250314, + 2018 ], - "commit": "64946a45e9bf02abf9cb39ca3aed98af98e82824", - "sha256": "0rkkx0f3lgk64mc5jmrmqil71nqhmsqiszmw5p6synqpk4gbvqaf" + "commit": "7f60075bd928948a7c6901a52b560d7e05a688ef", + "sha256": "0v8fxlaq95s2hrxi72y3dqcl9nd21jw56lpmdwkmcqjn8rialcas" }, "stable": { "version": [ 2, - 0, - 1 + 1, + 0 ], - "commit": "538ce842358172b97fc5028b6faa6fdf2549f0c3", - "sha256": "1gmnx2s4qjcbfkhpnvhpc9833ibkb2wkj4jgdkw7i4hda63as4d9" + "commit": "7f60075bd928948a7c6901a52b560d7e05a688ef", + "sha256": "0v8fxlaq95s2hrxi72y3dqcl9nd21jw56lpmdwkmcqjn8rialcas" } }, { @@ -81794,11 +82233,11 @@ "repo": "mkcms/mu4e-overview", "unstable": { "version": [ - 20241201, - 1012 + 20250406, + 1225 ], - "commit": "25a1c0c5fbac240e5faa1518b511609b709e3c53", - "sha256": "0q2xc3dpg70j3xk9f6c7wpiznvmscdfggzxkf8c4xxg4jfvbdcxh" + "commit": "527c3d3a4618c6ba7e6dec679ec2eff8854775d2", + "sha256": "1fxxbfn8hgx07rr9rrfr8bmhay576shc1s14smnjakrg51a69sl9" }, "stable": { "version": [ @@ -83043,11 +83482,11 @@ "repo": "skeeto/nasm-mode", "unstable": { "version": [ - 20240610, - 1505 + 20250320, + 1646 ], - "commit": "7079eb4ce14d94830513facf9bf2fca9e030a4d1", - "sha256": "1dacd8yvbl6arvrxwdjws42nnvwflvwxz366y295izf00pl0knaj" + "commit": "4e670f6dededab858251670aa5459c950f78d867", + "sha256": "12ynvw6l1a9n8x1q4fpm0fz15zf2vp3jibsq5z8si1czgkz0cw97" }, "stable": { "version": [ @@ -83193,11 +83632,11 @@ "repo": "nickav/naysayer-theme.el", "unstable": { "version": [ - 20240220, - 2159 + 20250406, + 2017 ], - "commit": "5e0bfaffb5162f3f35690ef3397a5ab63006042f", - "sha256": "1vzl06dgsczmnjl84sc2wzl5icn55c99czfij8mw589vqhzx5fjs" + "commit": "00fe031e38f1111614f088505776b09a5453f4ff", + "sha256": "0w910rkmd22yj2qf6jibqp2ax6vmnnhnh7srscwd6w7172d7671y" } }, { @@ -83362,11 +83801,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20250308, - 1335 + 20250506, + 1721 ], - "commit": "43178575201e3d2ef8c4a507ed4c281b0936f39a", - "sha256": "1hvnl3xpn5d3pg6i1minzv6sjc9dahs2snzlsy76wvwf4kcjf9z5" + "commit": "1cb883d928ec046358d2b65db0bb898a1dfffd0a", + "sha256": "0r3gv9z04asqjsnasjm2avk9gllqkng6ns14l0svrqxac4c2pp70" }, "stable": { "version": [ @@ -83386,15 +83825,15 @@ "repo": "rainstormstudio/nerd-icons-completion", "unstable": { "version": [ - 20241221, - 1846 + 20250509, + 1949 ], "deps": [ "compat", "nerd-icons" ], - "commit": "8e5b995eb2439850ab21ba6062d9e6942c82ab9c", - "sha256": "0nbyrzz5sscycbr1h65ggzrm1m9agfwig2mjg7jljzw8dk1bmmd2" + "commit": "e15e21a263bad06424982c11e8d68ffe1372a4e7", + "sha256": "08ianr8dwxal6dw674ngnaiw6k5kwvsfldmzxhj0fwsqg7ah90l3" } }, { @@ -83405,26 +83844,26 @@ "repo": "LuigiPiucco/nerd-icons-corfu", "unstable": { "version": [ - 20250226, - 1715 + 20250319, + 2322 ], "deps": [ "nerd-icons" ], - "commit": "13166345b290d6c6a2ac6ba94a8d28ec3bb58c67", - "sha256": "0ah215zl9f867n4wlim4f8b1lm33xpr3vz3c06pbaznnp9ym18ka" + "commit": "55b17ee20a5011c6a9be8beed6a9daf644815b5a", + "sha256": "0h2iphhsag77f14nj95fhkz7yv2ql94acj0c835x2ypkprqrs86w" }, "stable": { "version": [ 0, 5, - 0 + 1 ], "deps": [ "nerd-icons" ], - "commit": "13166345b290d6c6a2ac6ba94a8d28ec3bb58c67", - "sha256": "0ah215zl9f867n4wlim4f8b1lm33xpr3vz3c06pbaznnp9ym18ka" + "commit": "55b17ee20a5011c6a9be8beed6a9daf644815b5a", + "sha256": "0h2iphhsag77f14nj95fhkz7yv2ql94acj0c835x2ypkprqrs86w" } }, { @@ -83435,14 +83874,14 @@ "repo": "rainstormstudio/nerd-icons-dired", "unstable": { "version": [ - 20241013, - 212 + 20250506, + 1729 ], "deps": [ "nerd-icons" ], - "commit": "c0b0cda2b92f831d0f764a7e8c0c6728d6a27774", - "sha256": "1iwqzh32j6fsx0nl4y337iqkx6prbdv6j83490riraklzywv126a" + "commit": "69b5d3176b7bb08ac1f477cf7c5a491b9b0b5b54", + "sha256": "1q6zyx2m4h9fnirphrw933w9hrz7s5gk0sqgazgyg57szd99bzc2" } }, { @@ -83966,11 +84405,11 @@ "repo": "mrcnski/nimbus-theme", "unstable": { "version": [ - 20250307, - 659 + 20250327, + 1319 ], - "commit": "6a0b5a9d70a1067df5ada409584952f7e465b947", - "sha256": "1xx1njb7h1y9ixr4dm9kywx1g3db37bn46xg8cg2il475hldk0ax" + "commit": "cb52913a6875df509f3ac8f2302f869abd65f670", + "sha256": "14fiqll57y04qb4phkjvwga2vypla0xs84m0g488hnz7gzlmxhpx" }, "stable": { "version": [ @@ -84433,26 +84872,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20250304, - 1951 + 20250401, + 1510 ], "deps": [ "compat" ], - "commit": "de767a4952b2375a2ce1a2f7fe17a417bfbf512e", - "sha256": "0cxxkc55jd7mzsdk873jyv0pfj9bzvy7mfyas0mg5kn6g35zh968" + "commit": "ea15b1c607d4036ce37326bd5b4b2f4291ddfd60", + "sha256": "0bfyd276v32yflxd1ad3x5rlndmw3fk7z4q0p79ff09m993fsb54" }, "stable": { "version": [ 1, 7, - 5 + 6 ], "deps": [ "compat" ], - "commit": "0c119d46cce5c018e162fae4b36fd95ef26a76ac", - "sha256": "1qr0spndzv03h0lcs2bjajadp9rg7clm506bnwbcqwfqxz9cxnvx" + "commit": "ea15b1c607d4036ce37326bd5b4b2f4291ddfd60", + "sha256": "0bfyd276v32yflxd1ad3x5rlndmw3fk7z4q0p79ff09m993fsb54" } }, { @@ -84626,14 +85065,14 @@ "repo": "lxsameer/noether", "unstable": { "version": [ - 20250309, - 1704 + 20250320, + 1847 ], "deps": [ "posframe" ], - "commit": "0a32429a6cf4c0f3f8157a16f778a7996a85e189", - "sha256": "00mfqph58022ykfakgvs4qfg1ywignprhfpw45lfrjhf5k670xlv" + "commit": "c7b85569181f351ae03c4f4d3f622549332534cd", + "sha256": "0klzd6aykyzglrxq2l4cs2nad8njfwvipr1g729jxy8gq8gr09yk" } }, { @@ -84808,11 +85247,11 @@ "repo": "ashton314/nordic-night", "unstable": { "version": [ - 20250206, - 2258 + 20250508, + 2029 ], - "commit": "7d37878b7e216dc28e4e00f2ecaad413c8712536", - "sha256": "1r2083fcxcf9mrvzxvfsm2j5cyidslvbspgj70lxf23wip5w5d7r" + "commit": "6b274e5d2e6136a5108f0278806e52270c2b12e2", + "sha256": "1g3svq8clyq4kp6kngh4sj42k48sn99iiy3w570lrnsklykyhkns" }, "stable": { "version": [ @@ -84929,20 +85368,19 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20250218, - 1254 + 20250320, + 1017 ], - "commit": "0e10ca3a625c25c0238ecca2767aab7035b88a22", - "sha256": "0h46qgyr5c6g3ylgxcxgjynf0bf51sf6738fpy0bc3n88y87pzph" + "commit": "dfc800c26e7bee1e42a8d96c300508ed9d5a109b", + "sha256": "0fcqddvb168bw3s62f0cbq8macm3fzi225mh5n0q8dwjxw7krx1m" }, "stable": { "version": [ 0, - 38, - 3 + 39 ], - "commit": "d0469c5b4c6ed9188b96b12363fced45291813fd", - "sha256": "0y9fmd8qaybs3i6xndsmq9f5iskdc852i2bq442k7iyjgj3gw8rd" + "commit": "a5214eabb63ba78b84f4563942de1aa8763f0914", + "sha256": "1qq9bwhxrklkjysilmjmhzdwhxprc440krvml15mv8rind9xjll4" } }, { @@ -85727,6 +86165,24 @@ "sha256": "159cjalj49w9kj603lqkxjchpq3zvlqssdi0nijwddsdf9qsd3sy" } }, + { + "ename": "ob-aider", + "commit": "e86bbaabef311af57eb4279d02a1cf56117b71a4", + "sha256": "1p5j7jhcdy479s6n8vydm486f5nv9qilz6fg1id0naqhm581kskx", + "fetcher": "github", + "repo": "localredhead/ob-aider.el", + "unstable": { + "version": [ + 20250325, + 1918 + ], + "deps": [ + "org" + ], + "commit": "f611b0e733323c04bbbcab710a78a87f47e5fc74", + "sha256": "0axzf6cccbpmks62kdw73y000bv1vbz118mxrm4sq1n0sk5c7nxh" + } + }, { "ename": "ob-applescript", "commit": "23b075774be913539c3f057dcb7f24fbc05c37a4", @@ -85776,24 +86232,6 @@ "sha256": "10x4hxrjm4pr6vg42a961h9ilqzyd0l0fv7fsbq9clxi439f1nd6" } }, - { - "ename": "ob-axiom", - "commit": "8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf", - "sha256": "17qh4hsr3aw4d0p81px3qcbax6dv2zjhyn5n9pxqwcp2skm5vff5", - "fetcher": "git", - "url": "https://bitbucket.org/pdo/axiom-environment", - "unstable": { - "version": [ - 20220612, - 1535 - ], - "deps": [ - "axiom-environment" - ], - "commit": "01d88daa0c864af9918db5a147fbb5e435dec199", - "sha256": "03cxb6zdqmzgjp8r6hcirf8xl772j7xqk2nw17gjkn4xqbwfyn62" - } - }, { "ename": "ob-base64", "commit": "d82c7daa606c1c0c2ed4abe7601c16e8b261de12", @@ -85818,6 +86256,24 @@ "sha256": "1dikvwvf9b75fxlav0fwz5nm0xwcp66zqiz1j54dcj2p7z3qxixa" } }, + { + "ename": "ob-bigquery", + "commit": "a4eb76fa0ca7755430450c4987c4f8b5d980d957", + "sha256": "12b8m4arrwlfa2bcxkzs3d3da25szshlcmk9494dfvqsaqzwbadh", + "fetcher": "github", + "repo": "lhernanz/ob-bigquery", + "unstable": { + "version": [ + 20250425, + 651 + ], + "deps": [ + "org" + ], + "commit": "64d1c6f7fb7f04a8d23a38e648d2558513e98cf6", + "sha256": "019q3rwg69ssy4yzcshygkmiwfyj63rm3461lyhck6rxhklksf43" + } + }, { "ename": "ob-bitfield", "commit": "4032df23d0f2fdab9655a386bf5645d30acf5f53", @@ -86494,27 +86950,27 @@ "repo": "shg/ob-julia-vterm.el", "unstable": { "version": [ - 20240514, - 328 + 20250501, + 1404 ], "deps": [ "julia-vterm", "queue" ], - "commit": "e1aae4f54cd06f33c63a16d88df4856947f46201", - "sha256": "04hknkcqkfn5bfbxx9mx1naczjxnk1aalhyqvra6m7p1n832mvqm" + "commit": "bb2eea8a98046c5f63501bca7b4c2df2b3bff087", + "sha256": "18vlmrdargdgxfhz79ybb2hjbjdd8zy3hr43r8cnjsxff23rm609" }, "stable": { "version": [ 0, - 5 + 7 ], "deps": [ "julia-vterm", "queue" ], - "commit": "e1aae4f54cd06f33c63a16d88df4856947f46201", - "sha256": "04hknkcqkfn5bfbxx9mx1naczjxnk1aalhyqvra6m7p1n832mvqm" + "commit": "bb2eea8a98046c5f63501bca7b4c2df2b3bff087", + "sha256": "18vlmrdargdgxfhz79ybb2hjbjdd8zy3hr43r8cnjsxff23rm609" } }, { @@ -87346,20 +87802,21 @@ }, "stable": { "version": [ - 1, - 4, - 4 + 2, + 0, + 0 ], "deps": [ "dash", "elgrep", "f", + "ht", "markdown-mode", "s", "yaml" ], - "commit": "3814b08fb43d633c4a31b17deef1c2b71e5b5420", - "sha256": "0hkwiha8xrw3iila3wny287lwbmwqmraar8xfp53xvhpg8fxkl7c" + "commit": "0b31775d5da1dfd3d1ffcf9fa05908a3ba26ed15", + "sha256": "0djxlkhqm1zrrq2xqjlcc1vygd4a6h4jcivn7iq8ryg2iga15i9z" } }, { @@ -87385,20 +87842,20 @@ "repo": "tarides/ocaml-eglot", "unstable": { "version": [ - 20250310, - 1359 + 20250428, + 129 ], - "commit": "52e59e3dba1f8af1e90166c556e6f3b567cd9857", - "sha256": "1352ckf64dijgpdmsgqs4mbl7hpd942f2px251br986v7k16vscl" + "commit": "90efa3dc9fdef671e142f641a7f9d9556c0215f9", + "sha256": "0hk38rc7qf7v4ga155br5v3d6p5ki974fdqn63f293h880iknsz4" }, "stable": { "version": [ 1, - 0, + 2, 0 ], - "commit": "43e60321cf3b12e7a4137087f8810346e4e1bcfd", - "sha256": "04kcs40mizfm792qjqfmabyiapam54vxvsjcc2yyavwrwiz2m94q" + "commit": "7ce2c083987d14cdefec5c05c5361e2a01607865", + "sha256": "0jlfvcgix7awlv31xwbmacz3a3rzz4lnk5vky1gj9yqw9pp5llr7" } }, { @@ -87463,11 +87920,11 @@ "repo": "dgtized/occur-context-resize.el", "unstable": { "version": [ - 20210121, - 50 + 20250510, + 1447 ], - "commit": "9d62a5b5c39ab7921dfc12dd0ab139b38dd16582", - "sha256": "1s2j0205sp40nz1ljwa2nf2zm5mlkvsp95xfrra6rzbdrvbsfxyi" + "commit": "7a3f039b54274d353ec2f24067666da9edaaa185", + "sha256": "14dw9kvsw1h1prsag9hdcg8ph070k7kk8k76p8r7mxw6qzprigr6" } }, { @@ -87639,26 +88096,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20250220, - 1248 + 20250324, + 1446 ], "deps": [ "org-re-reveal" ], - "commit": "86fb46ae523b1c953af4172fb6b468fd62fa3a71", - "sha256": "1w8ryyh6f1imibyvkzipjhfby0jqh5mvihs0kni4l0wwpbjys21k" + "commit": "c502603057dea68b4e4e96434bb3b6260456fd6e", + "sha256": "0k1h27ach29v5clvfpdgj2q2p5sgcijh0k9ch92zlms197rw57zm" }, "stable": { "version": [ 4, - 28, - 4 + 30, + 2 ], "deps": [ "org-re-reveal" ], - "commit": "414a4627a414f3c499637a4347326b345d0768fb", - "sha256": "1w8ryyh6f1imibyvkzipjhfby0jqh5mvihs0kni4l0wwpbjys21k" + "commit": "c502603057dea68b4e4e96434bb3b6260456fd6e", + "sha256": "0k1h27ach29v5clvfpdgj2q2p5sgcijh0k9ch92zlms197rw57zm" } }, { @@ -87839,20 +88296,20 @@ "repo": "captainflasmr/ollama-buddy", "unstable": { "version": [ - 20250312, - 2035 + 20250515, + 1327 ], - "commit": "b734f1220973bd54a8e96569bddfc6da55f10f56", - "sha256": "1a4ygzn25ghd8997d7l201wz5h6ph2zjchnaaxpfiz14qb64qggf" + "commit": "88f72aa80c59eef3fd85629408e31e252db3e657", + "sha256": "1jmdkc1y3i55lkg8jqafx73p50gdzqhlz2vgcllacycbh3vhkfd4" }, "stable": { "version": [ 0, - 1, + 2, 0 ], - "commit": "2e200f55c893e7b8c24da3c343e753ace7f9df93", - "sha256": "055ffm4ipj85fk1lq31gwbqfnimz44b2b1rns326nqfdgqvsvw4p" + "commit": "4b5f89f765b8e8465d51efe6062b9242122de189", + "sha256": "0mq74zb3jr0i3p9p4qicm31yym0wmq3i846ayg9qb4vdf94amz4l" } }, { @@ -88135,24 +88592,6 @@ "sha256": "1i7xhv2a22n6lq0n1pd494g1a5s7sv52i2gblg6s9h87dnb4r9l6" } }, - { - "ename": "on-screen", - "commit": "628f43fdfdb41174800fb8171e71134c27730f6f", - "sha256": "104jisc2bckzrajxlvj1cfx1drnjj7jhqjblvm89ry32xdnjxmqb", - "fetcher": "github", - "repo": "michael-heerdegen/on-screen.el", - "unstable": { - "version": [ - 20160302, - 950 - ], - "deps": [ - "cl-lib" - ], - "commit": "206468aa4de299ad26c2db12b757f5ad7290912f", - "sha256": "1rrby3mbh24qd43nsb3ymcrjxh1cz6iasf1gv0a8fmivmb4f7dyz" - } - }, { "ename": "one", "commit": "be5e0550ba1eb789cad64ba18528c832128fe47c", @@ -88184,21 +88623,6 @@ "sha256": "1qk7xcca7inkwmdwcai4j43pb2nr8s89c4s0hjmc1bp3grryqrqj" } }, - { - "ename": "one-themes", - "commit": "504fb2fa2fe17eb008f7e9b8f7fb394f4a3ebd28", - "sha256": "11c6py5vani2cv4qjvizlzz9xvr5v57qxy1chcxy2lq3jlz1q5w0", - "fetcher": "github", - "repo": "balajisivaraman/emacs-one-themes", - "unstable": { - "version": [ - 20200720, - 1444 - ], - "commit": "16aa7318490c0f47aca328a8c6cfe3267a80bb76", - "sha256": "1dyfb0c5pf20fs6jdi7vsj47jzbvciqfm5fypa2m7lf0093sc5ig" - } - }, { "ename": "one-time-pad-encrypt", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -88337,11 +88761,11 @@ "repo": "salmanebah/opencl-mode", "unstable": { "version": [ - 20240712, - 1835 + 20250512, + 1753 ], - "commit": "204d5d9e0f5cb2cbe810f2933230eb08fe2c7695", - "sha256": "1x3h187r7waibrx5llsk6irb5afhqsrddb1f9hm3f9saks6n1ldv" + "commit": "0d305f9618ff56eb7e5e35c5bae980bcf957e972", + "sha256": "1pkn0cfv26jljnfsm8k28gjrc0cq48kgq91d4kr2kzrjwbpnc8j7" }, "stable": { "version": [ @@ -88466,20 +88890,26 @@ "repo": "danielfleischer/opensub", "unstable": { "version": [ - 20240501, - 1946 + 20250329, + 717 ], - "commit": "22cc8ef1e119c3cc5f605ca5be4cf680745c503a", - "sha256": "1v7cn4j43xzdwgpn9103bv057n5pmd9yrdvciv3lwz85dqimlp9a" + "deps": [ + "plz" + ], + "commit": "d8b11e979897616a661edd22a759e5cb025af356", + "sha256": "0qjlikmy4rhn3rg0g1cjq9aad9q83xqq9mnlwjkr6a0f3d33imbn" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "22cc8ef1e119c3cc5f605ca5be4cf680745c503a", - "sha256": "1v7cn4j43xzdwgpn9103bv057n5pmd9yrdvciv3lwz85dqimlp9a" + "deps": [ + "plz" + ], + "commit": "d8b11e979897616a661edd22a759e5cb025af356", + "sha256": "0qjlikmy4rhn3rg0g1cjq9aad9q83xqq9mnlwjkr6a0f3d33imbn" } }, { @@ -88577,25 +89007,25 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20250201, - 2341 + 20250316, + 2046 ], "deps": [ "compat" ], - "commit": "c7cb04499d94ee1c17affb29b1cfcd2a45116c97", - "sha256": "1g0qf17fmpabmi7ap057fy1rinqvvb0wa7famnakinhxw96l479d" + "commit": "254f2412489bbbf62700f9d3d5f18e537841dcc3", + "sha256": "1la91fk322n600h4wnavx7a6rdc44mz4v4gg1fb3cpwjsw746sl8" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "compat" ], - "commit": "2b7a1688f24cc8ef5a3c3a6dab8e00d833bcda59", - "sha256": "0w7vrhqg3klr0zxnijmfgfgr5nf6z3cmlrbw3qz9y7z2p2ll5w8m" + "commit": "254f2412489bbbf62700f9d3d5f18e537841dcc3", + "sha256": "1la91fk322n600h4wnavx7a6rdc44mz4v4gg1fb3cpwjsw746sl8" } }, { @@ -88739,14 +89169,14 @@ "repo": "rksm/org-ai", "unstable": { "version": [ - 20250131, - 2236 + 20250418, + 2323 ], "deps": [ "websocket" ], - "commit": "5a906fd4ecc4ff4d8ad561da14346a9d8b1d17db", - "sha256": "0agxq903w35ci144jr378ynaxl20hri3a42xl3m8h08a50x5s87j" + "commit": "cc4a4eb778e4689573ebd2d472b8164f4477e8b8", + "sha256": "00pwgpw2yaxi9rwcs36iv569db506phiw9fby912fh1nav44nh89" }, "stable": { "version": [ @@ -88825,21 +89255,21 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20240630, - 1401 + 20250509, + 1552 ], "deps": [ "dash", "promise", "request" ], - "commit": "8b255bba68ee19c4e8a2704c1197ad963d0eb128", - "sha256": "19y513k1m6na6gvby10icdcl7bkik2694aq55liybp4iz33sw8ys" + "commit": "02832230e514f5d8e001ce8986ae11fca8f7dad0", + "sha256": "0l6vlsf2jhr7l020n8yc9qf0yb7kb9dahf4abcr7dw9kynh8mrwf" }, "stable": { "version": [ 3, - 3, + 5, 2 ], "deps": [ @@ -88847,8 +89277,8 @@ "promise", "request" ], - "commit": "8b255bba68ee19c4e8a2704c1197ad963d0eb128", - "sha256": "19y513k1m6na6gvby10icdcl7bkik2694aq55liybp4iz33sw8ys" + "commit": "02832230e514f5d8e001ce8986ae11fca8f7dad0", + "sha256": "0l6vlsf2jhr7l020n8yc9qf0yb7kb9dahf4abcr7dw9kynh8mrwf" } }, { @@ -89042,14 +89472,14 @@ "repo": "zondo/org-autoexport", "unstable": { "version": [ - 20250302, - 1553 + 20250502, + 1854 ], "deps": [ "org" ], - "commit": "0cd22707014f3ee14da6fa823b3991e2ebddf0dc", - "sha256": "14lmx124ng1jgvgvni0ciik1xgsa9riy2y6nywica7ijxmvyqh6r" + "commit": "90b8646ad1c8d658fcb142b34a3cdecc1f48b469", + "sha256": "1ny8sxd00pwlby88b9wq0jrswjdh0gig8mixlb7sxlyr8mkvd6rc" }, "stable": { "version": [ @@ -89203,14 +89633,14 @@ "url": "https://repo.or.cz/org-bookmarks.git", "unstable": { "version": [ - 20250113, - 647 + 20250428, + 532 ], "deps": [ "nerd-icons" ], - "commit": "7c9387862b3035f4c722706fbe94a59e18d06a96", - "sha256": "1gvmvd5vakvlc6a116ajgzryar5pvzw7v8chzx5801vamg964fz9" + "commit": "ceb22cb1c316462b91e1606b9d89dd9656b1181d", + "sha256": "0kd4c9g2y239xf101awaqg55k9cfag4qm3qi4gf0v6bx2si4alrr" }, "stable": { "version": [ @@ -89699,14 +90129,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20250309, - 1659 + 20250513, + 1001 ], "deps": [ "org" ], - "commit": "b06a59736800865b8a7e8d6d45774169cb31528a", - "sha256": "0kpk62606is9wwigwd8bwna24zz95nbcz3r052x5fg7rq7v5wq0h" + "commit": "3d9ef1d5a9df30c7135d7a4085a450bc2a1a2cf2", + "sha256": "0h32cwbam0z24igj8n2mv0r88zbf1lhbb1m86p4ff87rq4inxhr9" } }, { @@ -90225,6 +90655,21 @@ "sha256": "05y8k7r9yc8x11v344fnnpc3iq4lcanwhpgy5xnczbbxxlc8x3pk" } }, + { + "ename": "org-expose-emphasis-markers", + "commit": "d789e986057b4b2dfbc0b4c6980d248c705d5214", + "sha256": "0p4ms4l6gr9a94vs4yyf9dfc7jgb3jclhcl38mr47w8rmdsn2ww5", + "fetcher": "github", + "repo": "lorniu/org-expose-emphasis-markers", + "unstable": { + "version": [ + 20250512, + 511 + ], + "commit": "ca6b5a1057be8ecf73888345af732ad9dfd0f83c", + "sha256": "0n4s0g5p02ky0hj2m9ps5mzygg87ljkzabrgbih2dmbp0jv1b55w" + } + }, { "ename": "org-fancy-priorities", "commit": "712902ae1cf967ceb2052266ed3244e92998f8a7", @@ -90463,6 +90908,30 @@ "sha256": "0ms7bi4hb13z8srz0a8zfx258846y227dvs884jbxycrgnxzxsi0" } }, + { + "ename": "org-hide-drawers", + "commit": "f33928816a1a869f34da59762974fb66d9894b96", + "sha256": "0aildz0hchs782nc5slh5zw6q4cahyadgp15c9zacgj275qrchv6", + "fetcher": "github", + "repo": "krisbalintona/org-hide-drawers", + "unstable": { + "version": [ + 20250428, + 1637 + ], + "commit": "e6311f1d72027ec701d3a0f88fc0c72ed114e8d0", + "sha256": "1c2vqjm33wmkdw2jp0jfn50lii2shim79r53lbskxjhm80zsa544" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "ce5d12bdfa8629c8d69b689ffa103f7c6207f249", + "sha256": "101gd1f8nf0gm597kvsg92j4205pd3x6p3gja5z5dmvycvl6rasw" + } + }, { "ename": "org-hyperscheduler", "commit": "ecb150e9b5370e6a7a5e5d64a577c2a3b58b8a81", @@ -90699,6 +91168,30 @@ "sha256": "0vjn3n28rwnvgwfd5dcvdyphn0xrbapd45y7mgx8c4dma112r6qj" } }, + { + "ename": "org-invoice-table", + "commit": "7244ee98eea368afe9fe9d09a3a92d46830b1a5c", + "sha256": "160y8ikzx0n623wlwc8wg88qv4ga3fl015wl4dy19lflmf51c4mi", + "fetcher": "codeberg", + "repo": "trevdev/org-invoice-table", + "unstable": { + "version": [ + 20250409, + 402 + ], + "commit": "3fe481f54050bb98493a0e3a1eb2a0693cda36d6", + "sha256": "0srhfw3rcq7k9vrl9wf20a75hzcarcq3ni9nnkrchym66fj76psb" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "commit": "3fe481f54050bb98493a0e3a1eb2a0693cda36d6", + "sha256": "0srhfw3rcq7k9vrl9wf20a75hzcarcq3ni9nnkrchym66fj76psb" + } + }, { "ename": "org-iv", "commit": "66dfdd37cd5e58e25d259c5bf925418eb9cd26d0", @@ -90777,16 +91270,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20250110, - 2220 + 20250424, + 41 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "5d8b291d66fca2bf8bbdaab673400570d1bbc295", - "sha256": "1h722cxfp7s712hfp08wakkqxxzjqqwfxivg7hgvlkjxgs092m5b" + "commit": "dfdc26ab8bfb54f4419d3eb52a17be5361d74b87", + "sha256": "1k2h7f2i9r73rxl4lnd0i9x3z63l54fg9dnav68f15f9pqmnh209" }, "stable": { "version": [ @@ -90811,14 +91304,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20250306, - 1429 + 20250425, + 936 ], "deps": [ "org" ], - "commit": "cf721732332d707de5d5af71e6d9a87599cc84a2", - "sha256": "1clw4dyqh3dqv2d8ky5r1sjk35jx546wrzq8dg6v76aicq3nka7p" + "commit": "e581bf5530054a40f933fdcc41e65aa0eedbd7da", + "sha256": "1gnwb3p4lfn01hp5amwjgbdm57hgksn2nicb26yawjn39isj9018" }, "stable": { "version": [ @@ -90890,28 +91383,28 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20250312, - 2032 + 20250329, + 2201 ], "deps": [ "dash", "s" ], - "commit": "cb96fa3ae526b6b000e279bc8cd650d6d359771b", - "sha256": "1f31496pqxx29xmlysw52092bfcw9zkjrf7ds5wdvjiq60qf443c" + "commit": "bc7864f2140d3ed510ec0ecd60c6d3d8b8589ea4", + "sha256": "0sibmj1phzxa01awb0r32v2s1ysv2nph1zzgkhi3ai5gb47hfqaz" }, "stable": { "version": [ 0, 6, - 13 + 15 ], "deps": [ "dash", "s" ], - "commit": "cb96fa3ae526b6b000e279bc8cd650d6d359771b", - "sha256": "1f31496pqxx29xmlysw52092bfcw9zkjrf7ds5wdvjiq60qf443c" + "commit": "bc7864f2140d3ed510ec0ecd60c6d3d8b8589ea4", + "sha256": "0sibmj1phzxa01awb0r32v2s1ysv2nph1zzgkhi3ai5gb47hfqaz" } }, { @@ -90984,15 +91477,15 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20250314, - 2312 + 20250429, + 353 ], "deps": [ "nerd-icons", "qrencode" ], - "commit": "a8e4c53b5890780b1ce5ddd2b009c80d94c4378a", - "sha256": "1ipv16hcm52ba81rnl9wzvkfsamc1bcv6z0g6x2y9gyl47llvrnr" + "commit": "36a6a376689ce532723229d2a1064c80bb912e15", + "sha256": "1jzlli2pq92a1npjn2c5rzq2fnlqj5ikcvw5gqv8xcyf6rh3a04w" }, "stable": { "version": [ @@ -91145,6 +91638,38 @@ "sha256": "0b3ixh8cqp9id1q1h2l6pl05n7vzk7ffp3ms5kxg8bvbn1l3c77l" } }, + { + "ename": "org-mem", + "commit": "e1b5f0b97b74adccc94abb1b36ffea1f6e81a0b6", + "sha256": "08bzvc0ddk8d8s9csrchdlii2qr8xv5bdk6d3xd0f9mpkh5kbvrf", + "fetcher": "github", + "repo": "meedstrom/org-mem", + "unstable": { + "version": [ + 20250516, + 1743 + ], + "deps": [ + "el-job", + "llama" + ], + "commit": "aa03c1872d49fe285b6fd87c8fbedac8045c72a2", + "sha256": "1sxvgrw6q8nkpzwhl9vhbjcpwl9p3ks79r9b8v79n7slbqb2lcnf" + }, + "stable": { + "version": [ + 0, + 9, + 2 + ], + "deps": [ + "el-job", + "llama" + ], + "commit": "aa03c1872d49fe285b6fd87c8fbedac8045c72a2", + "sha256": "1sxvgrw6q8nkpzwhl9vhbjcpwl9p3ks79r9b8v79n7slbqb2lcnf" + } + }, { "ename": "org-mime", "commit": "521678fa13884dae69c2b4b7a2af718b2eea4b28", @@ -91153,11 +91678,11 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20241001, - 415 + 20250318, + 2155 ], - "commit": "90aa9081ec00a1705552434cb45ff223aa9f8711", - "sha256": "12144hhiygvbx2ws01b47z4wqqd5jfbpxx4cn503mkqwcxzvpvgb" + "commit": "9571c148eed5e86fdd54eb6bf2814947c2c745a6", + "sha256": "0k001ppva1zyb9aahisk5dwqglyxdr0snwnkbhk14qv2hvfjz9x6" }, "stable": { "version": [ @@ -91196,30 +91721,30 @@ "repo": "ndwarshuis/org-ml", "unstable": { "version": [ - 20230410, - 30 + 20250514, + 2314 ], "deps": [ "dash", "org", "s" ], - "commit": "f57336a9126a168ad32ccce017c072474555395a", - "sha256": "16j03fdikha5hwg8ifj0shsn4prbgf7dsggy3ksidpl63w3g05h4" + "commit": "e348f446746bd1699eae05a82dccd4276c6cc9a8", + "sha256": "002ha6lzl7bnv9bnvfmqa6kxamlqy6q9vsi4h0r6kk7b6bhixgnp" }, "stable": { "version": [ - 5, - 8, - 8 + 6, + 0, + 2 ], "deps": [ "dash", "org", "s" ], - "commit": "7a7b1e918e8440f3f6ddb37db9bd1471d0dad37d", - "sha256": "16j03fdikha5hwg8ifj0shsn4prbgf7dsggy3ksidpl63w3g05h4" + "commit": "27ec4c118621ceccf832dd993d17d1ef29a1cb8a", + "sha256": "002ha6lzl7bnv9bnvfmqa6kxamlqy6q9vsi4h0r6kk7b6bhixgnp" } }, { @@ -91248,14 +91773,15 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20250311, - 1701 + 20250427, + 1402 ], "deps": [ - "compat" + "compat", + "org" ], - "commit": "e7a4c5e4a1d309895c60b3a3b3e62ab1f6a926b4", - "sha256": "04bmlwc81d8h8n10xb2nhwmcvn1701nr73hxajl6hasswzqqmh70" + "commit": "032201b5916297f20e254e78993676d8bb41066d", + "sha256": "1zvhwszkhnd9ki118nlwnp4samcn1kmrqk48k0z9qzg0wl49flac" }, "stable": { "version": [ @@ -91482,30 +92008,30 @@ "repo": "meedstrom/org-node", "unstable": { "version": [ - 20250313, - 1124 + 20250516, + 1658 ], "deps": [ - "el-job", "llama", - "magit-section" + "magit-section", + "org-mem" ], - "commit": "983e0ef82598cad83614f88daa259ed0d14e6419", - "sha256": "1ypwwbj8dnjrnvpflv8lfg1dsi5kzrjqgmn1ca2s8naj262dlyw9" + "commit": "219b0f93d7442df865cc4cf5cb64c21c78e106c7", + "sha256": "0z0qapg98wcd3jd9jqphr7550k0l9mpm5vjxyxv03p4jj8gxn43m" }, "stable": { "version": [ - 2, 3, - 2 + 0, + 4 ], "deps": [ - "el-job", "llama", - "magit-section" + "magit-section", + "org-mem" ], - "commit": "983e0ef82598cad83614f88daa259ed0d14e6419", - "sha256": "1ypwwbj8dnjrnvpflv8lfg1dsi5kzrjqgmn1ca2s8naj262dlyw9" + "commit": "5c68e57e39eba38a8a278bf843facb08ba8f2f59", + "sha256": "0yjipjad14f5wf9mjggb0gkl449cw15vqhqvcdcv6i1k7mb4p544" } }, { @@ -91516,32 +92042,30 @@ "repo": "meedstrom/org-node-fakeroam", "unstable": { "version": [ - 20250306, - 2208 + 20250515, + 1314 ], "deps": [ - "compat", - "emacsql", + "org-mem", "org-node", "org-roam" ], - "commit": "9befbb231df050d31fb8b8d01880668bc90f0799", - "sha256": "0m7iijjf58hcx0mz80z6nrwszhqzw8fv0r7q81xg3pfzigc3xr7g" + "commit": "61617d6075923c6191fbac0f107e3abb14395e61", + "sha256": "00pfp1v0rp03xgp9yi5g0hfm38hf7jp0948r48y054nr89iksikw" }, "stable": { "version": [ - 2, + 3, 0, - 0 + 1 ], "deps": [ - "compat", - "emacsql", + "org-mem", "org-node", "org-roam" ], - "commit": "6e0c5afed0f99eebcda6d824c2ef7ec258ad3546", - "sha256": "1gy88r44625vis6md88sh38z8i8viav42sg52x9p48374lhrchdx" + "commit": "61617d6075923c6191fbac0f107e3abb14395e61", + "sha256": "00pfp1v0rp03xgp9yi5g0hfm38hf7jp0948r48y054nr89iksikw" } }, { @@ -92063,8 +92587,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20241107, - 345 + 20250421, + 133 ], "deps": [ "compat", @@ -92079,8 +92603,8 @@ "transient", "ts" ], - "commit": "a5650e2be831ae130af8d9f5419bcb141e36b1d4", - "sha256": "1008hjqrlcc5pm6zw65p42ivf6gljj3mivvkinv8byyqkanrhklb" + "commit": "4b8330a683c43bb4a2c64ccce8cd5a90c8b174ca", + "sha256": "1a1ynnlqrg8wki4925kpjis6f368adv3q9kgmc0xv6yjkk2xpdih" }, "stable": { "version": [ @@ -92196,28 +92720,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20250220, - 1236 + 20250323, + 840 ], "deps": [ "htmlize", "org" ], - "commit": "88e9d9e679e75e40acd93566a27a342437419992", - "sha256": "1i7r7i6r1s3bzw2vnmb5j052461n95bdj0kj0k8l9vbrhgs602v3" + "commit": "53e9be7d89a4ffd96690271bef0d7d5c58b8eae6", + "sha256": "1aj225d59isdpmyzghlb6v6ph54vp4v8cylv0p8wiqrf197fyz58" }, "stable": { "version": [ 3, - 34, - 2 + 35, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "88e9d9e679e75e40acd93566a27a342437419992", - "sha256": "1i7r7i6r1s3bzw2vnmb5j052461n95bdj0kj0k8l9vbrhgs602v3" + "commit": "53e9be7d89a4ffd96690271bef0d7d5c58b8eae6", + "sha256": "1aj225d59isdpmyzghlb6v6ph54vp4v8cylv0p8wiqrf197fyz58" } }, { @@ -92469,29 +92993,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20240802, - 1519 + 20250513, + 848 ], "deps": [ "dash", "org" ], - "commit": "d029e2263de23b19ed89f9757ad69b7cb33bda32", - "sha256": "08fh2qmzig3zw5106hhq55847b5cz9l2pl82cqsqbwf93ndflygk" + "commit": "8466a3566292cf17e70e6ab4e7fb9e1b48831586", + "sha256": "0hivhanj3jz32qp64mppi0wx0zavvvchh5g2g9pjbza90l6alxhy" }, "stable": { "version": [ 0, 4, - 2, - 2 + 4 ], "deps": [ "dash", "org" ], - "commit": "3ac9b35ebe872f5a619f2e6abe281df66ebbcfe0", - "sha256": "0lfr88wb98yh9fi2hnvd5f3xdcb1d480shqrcyg7gyqcvx64shii" + "commit": "8466a3566292cf17e70e6ab4e7fb9e1b48831586", + "sha256": "0hivhanj3jz32qp64mppi0wx0zavvvchh5g2g9pjbza90l6alxhy" } }, { @@ -92502,11 +93025,11 @@ "repo": "brabalan/org-review", "unstable": { "version": [ - 20241115, - 701 + 20250416, + 802 ], - "commit": "2d9c04776a58b94cfff790ed80a471a9e5b4873b", - "sha256": "19q8hw4cr01mfvh5bw4p3zjdc3sjfp0bsjw39l5m77jnkg35gjfn" + "commit": "1f24fa504d58d619bb81a2c16058f685d85c2151", + "sha256": "1va21vgfaxwz19qg378vbq1dnb09l9klc2x31mc0r07p14dqhfy1" } }, { @@ -92541,8 +93064,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20250313, - 134 + 20250324, + 2140 ], "deps": [ "dash", @@ -92550,8 +93073,8 @@ "magit-section", "org" ], - "commit": "db4170a459cba06bd3d36fb6dc748364774ec204", - "sha256": "1dc9z9xpr13iklz47mncrb9ccqbaa30jaxlki0ymr4pcwb5b4sl2" + "commit": "046822b512ffecdee7d110f73dd3a511802ca590", + "sha256": "0jbj48glh0r6fkb0lk1xb9067x2myp3krkw2byycijwdq1nlqzv2" }, "stable": { "version": [ @@ -92610,8 +93133,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20241231, - 1802 + 20250509, + 2337 ], "deps": [ "dash", @@ -92621,8 +93144,8 @@ "s", "transient" ], - "commit": "2b7cf0110c5c13b26c3e1b35c9854263089ba13e", - "sha256": "0gwd4cyhwmnwkzc6ps5pikdf1ak17y1k006sl1b0sc2lwxyr4p4v" + "commit": "27059ae662a75bc0b2c9d2e8f6dcbbd6179d4a45", + "sha256": "1dz33vzhf9lb6pkkm5blsjlgfqy6zii3rgybcwl8gv01sw0wzn07" }, "stable": { "version": [ @@ -92648,8 +93171,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20240721, - 306 + 20250424, + 2227 ], "deps": [ "org-ql", @@ -92658,8 +93181,8 @@ "s", "transient" ], - "commit": "f5c367fea8693491215ac61b211e98aef8dfaeec", - "sha256": "09pj272x1w3fys84xld8v7gpya5syh70irxd98sf0x2bpsrsqfry" + "commit": "72634dadc224786284c7d733f67900f2a514eab2", + "sha256": "00v3rwpbwpyn5vjpga2kaxvj044gvhjpz8bzdlf5cif5sjpvy3zx" }, "stable": { "version": [ @@ -92912,14 +93435,11 @@ "repo": "jcfk/org-sliced-images", "unstable": { "version": [ - 20240624, - 428 + 20250408, + 2114 ], - "deps": [ - "org" - ], - "commit": "b98b88a55eff07e998e7789e0bf7307dd71db050", - "sha256": "0iq03zp3bm1ph5ryhx6zpjm830sliqj6bb7i0h2v0nfn07l0cby2" + "commit": "cbe25ca63bb4c3979396834f279308cf87923f71", + "sha256": "1gmn5gmr74y5gfggmcngkqp2klg7f0fff68ajwi9f351z5iw4fiw" } }, { @@ -93089,20 +93609,20 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20240727, - 718 + 20250320, + 1842 ], - "commit": "34c9a60a00bce7ad70e7c6b28696edec5affcf06", - "sha256": "0g0y8w2i0hs9dywdpxv307gkqnpgyibzmi1sbbqxqj9m8gcib90k" + "commit": "728968e4a84ba28c5acedc54ece17e49d6811ad9", + "sha256": "1b07q89j153i7al78cg9pxaz93yk0qbdf4mwaalrwiqfkdbm5msn" }, "stable": { "version": [ 1, - 6, + 7, 0 ], - "commit": "61a3ab0e2e8e1ac0ef8772e89ae320c07142f7f5", - "sha256": "0p3bhnp91x65xr5d40kdmyj7vgyq62bvq3b1gfwv7881sh8p6hr9" + "commit": "728968e4a84ba28c5acedc54ece17e49d6811ad9", + "sha256": "1b07q89j153i7al78cg9pxaz93yk0qbdf4mwaalrwiqfkdbm5msn" } }, { @@ -93142,8 +93662,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20240916, - 1753 + 20250421, + 130 ], "deps": [ "compat", @@ -93153,8 +93673,8 @@ "s", "ts" ], - "commit": "d0954b8e7780a4efe49ab32fc11941db21c22bfd", - "sha256": "0f1s10sh217lj2z8z79x5z7i2dp4753a1j4db2r3dpwkp5pj15ai" + "commit": "fb20ad9c8a9705aa05d40751682beae2d094e0fe", + "sha256": "04xv8pymlzzgpllg7wbx6fl45ljrzl67qyi80y19a9qpgjlcwbh0" }, "stable": { "version": [ @@ -93331,14 +93851,14 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20250115, - 504 + 20250410, + 1242 ], "deps": [ "nerd-icons" ], - "commit": "bf02185770b56122d3b3d0c685f55676b7453c7f", - "sha256": "05x35dzcwzdhfpb644scw3s8hr241zagf4x8fmfgvpq2mcz928mj" + "commit": "9df9782fc6d68e7271cf164212d0ad37bf6d85f9", + "sha256": "1kcxw9mzlx2pw2p6i6ib4ll6dg6h2h9bdd888ahmxdhkdjah78v3" } }, { @@ -93871,11 +94391,11 @@ "repo": "pinoaffe/org-vcard", "unstable": { "version": [ - 20240309, - 839 + 20250325, + 1512 ], - "commit": "fab5ea81d8a4bb1123cdc0287b9b58c062d5b372", - "sha256": "1p0zx59m2839gpnizn7df1zw57s8i9c35xbw9fbqshbs8lv0ag4j" + "commit": "c15d70fd8cc983f185b86c884dee0e2e0dadaf07", + "sha256": "1lyfiwpqq96qnjygw0m7r91ykikc749g7pz80par5bww2km3ika1" }, "stable": { "version": [ @@ -94410,30 +94930,30 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20250301, - 2339 + 20250401, + 1810 ], "deps": [ "compat", "magit", "org" ], - "commit": "6ad0dc35c8df54fae4ef27e5145760e22fbbf890", - "sha256": "0yi73l7hm6x5pyalfmcv0mnklhc574xij35q8zkh6ahrnfbyv8ks" + "commit": "efd98e5caaac1d08677dae95be40fab65dcda2c8", + "sha256": "0pzcmd4d82nmg98nrnk73qr02k1hy0qyagsbrxyjdpfzrg3ysmp9" }, "stable": { "version": [ 2, 0, - 1 + 2 ], "deps": [ "compat", "magit", "org" ], - "commit": "6ad0dc35c8df54fae4ef27e5145760e22fbbf890", - "sha256": "0yi73l7hm6x5pyalfmcv0mnklhc574xij35q8zkh6ahrnfbyv8ks" + "commit": "efd98e5caaac1d08677dae95be40fab65dcda2c8", + "sha256": "0pzcmd4d82nmg98nrnk73qr02k1hy0qyagsbrxyjdpfzrg3ysmp9" } }, { @@ -94444,8 +94964,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20240808, - 1947 + 20250401, + 1810 ], "deps": [ "compat", @@ -94454,14 +94974,14 @@ "org", "orgit" ], - "commit": "2718a6aaf0f64cb52c64c419053fbc80eb358c8d", - "sha256": "1xcv7kqsrv39rk8fjd2sbl2wrr8mdb6y1xipifki4q7mry1c6v6w" + "commit": "764820769e321a76622aaafe7617b4231985b5f0", + "sha256": "0v79xc4ss9c4wz6spplrlfzzgynfs264c6gxhzjffpa9vqnvbc6g" }, "stable": { "version": [ 1, 0, - 0 + 1 ], "deps": [ "compat", @@ -94470,8 +94990,8 @@ "org", "orgit" ], - "commit": "2718a6aaf0f64cb52c64c419053fbc80eb358c8d", - "sha256": "1xcv7kqsrv39rk8fjd2sbl2wrr8mdb6y1xipifki4q7mry1c6v6w" + "commit": "764820769e321a76622aaafe7617b4231985b5f0", + "sha256": "0v79xc4ss9c4wz6spplrlfzzgynfs264c6gxhzjffpa9vqnvbc6g" } }, { @@ -94613,20 +95133,20 @@ "repo": "tgbugs/orgstrap", "unstable": { "version": [ - 20230408, - 2232 + 20250316, + 1815 ], - "commit": "f35bccde556b0f82515e79ee69f4379469276356", - "sha256": "1z0zwx2ccyzd5rk93xffz3h9c8b8riadkx5n9k38p2agnsq07h52" + "commit": "67f4f61716750b4cf4da715b40a19c5ed4bb505c", + "sha256": "09cqq0wh1fql56rb07lwl8xdb8vz9wsbg8qkdsprjhjrfw6cpdgm" }, "stable": { "version": [ 1, 5, - 5 + 6 ], - "commit": "f35bccde556b0f82515e79ee69f4379469276356", - "sha256": "1z0zwx2ccyzd5rk93xffz3h9c8b8riadkx5n9k38p2agnsq07h52" + "commit": "67f4f61716750b4cf4da715b40a19c5ed4bb505c", + "sha256": "09cqq0wh1fql56rb07lwl8xdb8vz9wsbg8qkdsprjhjrfw6cpdgm" } }, { @@ -94637,11 +95157,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20250303, - 1454 + 20250505, + 729 ], - "commit": "51a95f9322ffa61db5b3f037206085d3e44d59be", - "sha256": "0kr4i8331mjlv6vcs4mcw111xawvcaasnwhc4wp9bkga31brhyxj" + "commit": "04f9b0f895fe2e29d5cb404b348b62ab02032333", + "sha256": "1ghdj1phw4pmi7nbbnkzqz5ni26i7ffda5x3pvzp6gj6ia0vy5py" } }, { @@ -94667,11 +95187,11 @@ "repo": "tbanel/orgtblfit", "unstable": { "version": [ - 20250210, - 1535 + 20250403, + 2031 ], - "commit": "aa4c132d8186e10ddb3c2a336be72123c284eb2c", - "sha256": "09yyp8a7p068kjg2vg27fzv130bkabq6ln32h511wcbfk84ix6fi" + "commit": "5d9a7efd23fdee4c6c79a74770cafba931c16c67", + "sha256": "1cxi469ggl7nmg1v0d55akka6lqsr5s12sm4a0ydyi6r5vbc9nwq" } }, { @@ -94682,11 +95202,11 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20250218, - 903 + 20250505, + 740 ], - "commit": "c0ddfc7f0550918cbb22d5f5cf102caf57275826", - "sha256": "0mqzk2nyp8r731ssicypxs435mvngnv9rmjj3nrkzjynlm4ilsp3" + "commit": "332c7717045e06f6888a9cc1cd20729b6c8d9bf7", + "sha256": "02k6xfmq923vkry4bwdxbj8r64gaxcdlny666fmixalvdavy3nmp" } }, { @@ -94845,25 +95365,25 @@ "repo": "minad/osm", "unstable": { "version": [ - 20250301, - 1613 + 20250404, + 1131 ], "deps": [ "compat" ], - "commit": "7af69f09465219d65ec75ffd4bb44a47d7f56dc9", - "sha256": "0i6n3hf4g286fkry7k25032cm0jg2njcrnws2kh39mml31vp8a4z" + "commit": "72112b358c41d2147122b217d11f272a22f285e4", + "sha256": "0fw0hgi2542ivc05dbq07ybr8c2mf8ja0z3f07lnslvn7vn5xp9i" }, "stable": { "version": [ 1, - 6 + 7 ], "deps": [ "compat" ], - "commit": "308e67cc25c2c2725a32f48fed6e67c87dcc3eed", - "sha256": "078dd89jyz51755adrxm90ka0kvmgmm5h2w2c9f0986g3jmb9daq" + "commit": "72112b358c41d2147122b217d11f272a22f285e4", + "sha256": "0fw0hgi2542ivc05dbq07ybr8c2mf8ja0z3f07lnslvn7vn5xp9i" } }, { @@ -95118,26 +95638,26 @@ "repo": "abougouffa/one-tab-per-project", "unstable": { "version": [ - 20241212, - 2306 + 20250514, + 2103 ], "deps": [ "compat" ], - "commit": "82c49c5c8551d2c0dd33f6b56549e1890d621651", - "sha256": "0dj8mfgzlmvybkg7z4cvaa75v0hq8sbv3fkd2wxs8mhz2hhvmxl2" + "commit": "96ae7c156cd9a78a577942db5d1b12ecdecf519b", + "sha256": "0n64zgxiqshq9b82x9yzdzi1v1mdi65sgpf1w821hwx1knwi84l0" }, "stable": { "version": [ 3, - 1, - 2 + 2, + 1 ], "deps": [ "compat" ], - "commit": "82c49c5c8551d2c0dd33f6b56549e1890d621651", - "sha256": "0dj8mfgzlmvybkg7z4cvaa75v0hq8sbv3fkd2wxs8mhz2hhvmxl2" + "commit": "96ae7c156cd9a78a577942db5d1b12ecdecf519b", + "sha256": "0n64zgxiqshq9b82x9yzdzi1v1mdi65sgpf1w821hwx1knwi84l0" } }, { @@ -95168,11 +95688,11 @@ "repo": "jamescherti/outline-indent.el", "unstable": { "version": [ - 20250227, - 1641 + 20250320, + 1659 ], - "commit": "ff1b6ecf642c673936f3c258d329c76c45e30854", - "sha256": "044qxaczp50bxpdwcyyxi6lqpq2rdm4yfjv7g3867kz44nxvwspq" + "commit": "e844d1e4b34bd3e2d0ccfd4cd289c90972673606", + "sha256": "0p517kmx85c225wqmff6b4s5rw49b4vaq28rmv03s1q26im7q7ip" }, "stable": { "version": [ @@ -95207,26 +95727,26 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20250101, - 1421 + 20250514, + 1243 ], "deps": [ "compat" ], - "commit": "66199fcbd64181f5d74e44ed03bd7bb4502fa547", - "sha256": "1zr0ix28vis4y88h8w6lf4lsp0x24qi5v2y3xsk6vi2am08w613g" + "commit": "a1ef3834f9f643cf1f65c5424691514169f8bf31", + "sha256": "09s7a4jab5w7p9k5hirv6w2r9nqh365r5g2qa5569jjlq12r8bh3" }, "stable": { "version": [ 1, 1, - 1 + 2 ], "deps": [ "compat" ], - "commit": "66199fcbd64181f5d74e44ed03bd7bb4502fa547", - "sha256": "1zr0ix28vis4y88h8w6lf4lsp0x24qi5v2y3xsk6vi2am08w613g" + "commit": "f9be85200c8bba29b0a9df354b4795f186840dfa", + "sha256": "0cbwx9aw37lkzmmxag7y0x7gv25lxrv2w37dycbimh3rj1mh3a3b" } }, { @@ -95527,26 +96047,26 @@ "repo": "mmitch/ox-bb", "unstable": { "version": [ - 20240903, - 2115 + 20240907, + 1042 ], "deps": [ "org" ], - "commit": "129ea37caf6de6f43845bd36f16fd78251a3afe9", - "sha256": "1qbaqfbz43z2acyxgsjbj07xldm04jrf2ncjdzcwbnkz29prflqd" + "commit": "4d0a3ea6c4509ecb73a288da11140b588a902e76", + "sha256": "0fx6wq5wjf6c6qpd5ipr4c801mxw9lfan5kzjsin9nh493yq03sw" }, "stable": { "version": [ 0, 0, - 1 + 2 ], "deps": [ "org" ], - "commit": "37e22316afac9dd73dec072ac6420e5c1c4471b6", - "sha256": "0a2vp4br1s4zjvjz7z7j3kzzlnb4rzmash1425rz55zg2v3zsi0a" + "commit": "4d0a3ea6c4509ecb73a288da11140b588a902e76", + "sha256": "0fx6wq5wjf6c6qpd5ipr4c801mxw9lfan5kzjsin9nh493yq03sw" } }, { @@ -95557,11 +96077,19 @@ "repo": "fjesser/ox-beamer-lecture", "unstable": { "version": [ - 20250306, - 4 + 20250407, + 219 ], - "commit": "647e7ef74c559ca189b46f1e79e9fcf8146a2af3", - "sha256": "0v450b65mixl73sp3iwyv5lkik65575wpynbhy4y9wxcgkyvz98p" + "commit": "77546eaf9ac8f94b6079720f1d93c33dbbcc4108", + "sha256": "1yhmarx2af98ff43h8lrc9r6p85c6xk4k9l26bv2wkcwpvqgkh54" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "77546eaf9ac8f94b6079720f1d93c33dbbcc4108", + "sha256": "1yhmarx2af98ff43h8lrc9r6p85c6xk4k9l26bv2wkcwpvqgkh54" } }, { @@ -96007,16 +96535,16 @@ "repo": "emacsorphanage/ox-pandoc", "unstable": { "version": [ - 20240710, - 1424 + 20250424, + 908 ], "deps": [ "dash", "ht", "org" ], - "commit": "34e6ea97b586e20529d07158a73af3cf33cdd1d5", - "sha256": "0s4d639vfvqb6spnr3b0isrspbl876h22977pkb943ygd93bzx4p" + "commit": "5766c70b6db5a553829ccdcf52fcf3c6244e443d", + "sha256": "1di51izd09x4z5ph3sqrlfllvmbcj77q421wndbs3q8z0w5a74q2" }, "stable": { "version": [ @@ -96172,14 +96700,14 @@ "repo": "msnoigrs/ox-rst", "unstable": { "version": [ - 20200815, - 1511 + 20250428, + 534 ], "deps": [ "org" ], - "commit": "99fa790da55b57a3f2e9aa187493ba434a64250e", - "sha256": "0dxadzbha2fvg42jh4ng8hjb582mv7avlzmpxlzf32qxf6x8r638" + "commit": "b73eff187eebac24b457688bfd27f09eff434860", + "sha256": "0d2i94zhskbdrvhwj38j611dzyiby34l43cnb92zaas6li82cqid" } }, { @@ -96392,14 +96920,14 @@ "repo": "jmpunkt/ox-typst", "unstable": { "version": [ - 20241130, - 1002 + 20250326, + 1817 ], "deps": [ "org" ], - "commit": "d00fc1d21657f925c7bd92e9b9cab51047bbcb2f", - "sha256": "1qqcajy5kssjrd49nf8cl5gg82scl77z341kwrci5kz5jjkpbhhd" + "commit": "0cb0aa7f0c54bb2239516a0a4b02ce5ff7458a84", + "sha256": "0qw2r32d3dld409k3806i56vcny7nnjmlcp11wgqdfx32vy6hz02" } }, { @@ -96577,6 +97105,21 @@ "sha256": "1d61s846r9ncmyx97f44r8i3p1ikgi4bab8k7xk868lja96y2ij7" } }, + { + "ename": "pache-dark-theme", + "commit": "79ce96ad8a2028fc6aff3c77fd5e0a1cfdfbeb3e", + "sha256": "0hkljp23qsq6174mb0jbj9d2zrqmfcwc5j49wmmfh62bj85gs5sn", + "fetcher": "github", + "repo": "0xhenrique/pache-dark-theme", + "unstable": { + "version": [ + 20250330, + 1714 + ], + "commit": "fd6ead16c9f33bebd2cd6fea70c5350d0dd2a6bc", + "sha256": "08bylpwzn7bbzslhzh0qkcgxi0yh31j3rbm6sbdca6pd49cwnfjx" + } + }, { "ename": "pack", "commit": "96f55c1f15ca24134da378a1ea31f7bb31c84ea9", @@ -96681,25 +97224,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20250307, - 912 + 20250418, + 1425 ], "deps": [ "let-alist" ], - "commit": "6170c1e5b79f9b9f606ab17ab4d9ffb9bce3ebde", - "sha256": "1fvi79pwlvvdakcmvf6jv9ba400lqfjsdcshg2q4rnj5v1a797pn" + "commit": "2dc48e5fb9c37390d9290d4f5ab371c39b7a3829", + "sha256": "10d75s3jk16rgd6ghdzcbpl7jak9ch42pgczj2wf4xs3g0z390yz" }, "stable": { "version": [ 0, - 25 + 26 ], "deps": [ "let-alist" ], - "commit": "6170c1e5b79f9b9f606ab17ab4d9ffb9bce3ebde", - "sha256": "1fvi79pwlvvdakcmvf6jv9ba400lqfjsdcshg2q4rnj5v1a797pn" + "commit": "26b27201f1276a71257d328513152494e3edfc5d", + "sha256": "0x1ikwfz1zr8bl8a67kgcbyzrqxnn6bslbz6pdfaczmshy7ry757" } }, { @@ -96710,25 +97253,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20250307, - 912 + 20250418, + 1424 ], "deps": [ "package-lint" ], - "commit": "6170c1e5b79f9b9f606ab17ab4d9ffb9bce3ebde", - "sha256": "1fvi79pwlvvdakcmvf6jv9ba400lqfjsdcshg2q4rnj5v1a797pn" + "commit": "26b27201f1276a71257d328513152494e3edfc5d", + "sha256": "0x1ikwfz1zr8bl8a67kgcbyzrqxnn6bslbz6pdfaczmshy7ry757" }, "stable": { "version": [ 0, - 25 + 26 ], "deps": [ "package-lint" ], - "commit": "6170c1e5b79f9b9f606ab17ab4d9ffb9bce3ebde", - "sha256": "1fvi79pwlvvdakcmvf6jv9ba400lqfjsdcshg2q4rnj5v1a797pn" + "commit": "26b27201f1276a71257d328513152494e3edfc5d", + "sha256": "0x1ikwfz1zr8bl8a67kgcbyzrqxnn6bslbz6pdfaczmshy7ry757" } }, { @@ -97473,19 +98016,19 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20250225, - 840 + 20250316, + 2257 ], - "commit": "735e308fc5b7aaed975764f6c7139d1c4bf28d0c", - "sha256": "0zr4i8gaa6vnkm4ggrgpc7fsdayfxxb8wi59c3dhkyydmvcdzqsp" + "commit": "7bfde4e4679413424a9a9af099203d5c23e32cd2", + "sha256": "180lvlq6xfri1lag85s6478x8cv4iccj6qk2rag9nm19yrhxfh7a" }, "stable": { "version": [ 6, - 6 + 7 ], - "commit": "a25621930e67e267133b08698a72fa80a42edfc8", - "sha256": "0gh8bv6q9041q0b9spw7glj3lfvkj8yl743b4xc1y5mjj8alb466" + "commit": "7bfde4e4679413424a9a9af099203d5c23e32cd2", + "sha256": "180lvlq6xfri1lag85s6478x8cv4iccj6qk2rag9nm19yrhxfh7a" } }, { @@ -98267,14 +98810,14 @@ "repo": "krisbalintona/pdf-meta-edit", "unstable": { "version": [ - 20250114, - 2348 + 20250321, + 2317 ], "deps": [ "compat" ], - "commit": "74af23554ee929c191c734794f322cbb854f880d", - "sha256": "19vk7zvajm99asrm7dai3ip53clfsjs1bfxv6sqqb0d1vlxm056r" + "commit": "8c2690f070d79e7cb495c0d3e04b48db2a2bbc3e", + "sha256": "0nlk2m652jzccy1lcpxmhjhjdcbkikg8nggpdlsscimrf9hid0f6" }, "stable": { "version": [ @@ -98525,11 +99068,11 @@ "repo": "mpwang/perfect-margin", "unstable": { "version": [ - 20241012, - 1900 + 20250421, + 2011 ], - "commit": "2d70e1cab1365fcedfb16cfff38d9fd0da77514a", - "sha256": "19vagkirvmm7xgi02dwwjsvdasadwgls0969vjqh9gygq390ig5m" + "commit": "43d2b02c5ae23f7165cc42be7656174a8f9298ba", + "sha256": "1fcnsjnlp89svbnlqwy8d82r74mqkr8cbir4lh9h1gxvallfjxxs" } }, { @@ -98559,11 +99102,11 @@ "url": "https://hg.sr.ht/~pranshu/perl-ts-mode", "unstable": { "version": [ - 20250128, - 1327 + 20250425, + 953 ], - "commit": "c343d3573e3165f151b93fc7517b22d72bbd5d6d", - "sha256": "0s4cy4i1a3a3sa0vc0vndvv5vrfgabrfci96qiil6dawq7lrmjxa" + "commit": "aa34c2a15aec61febb05afb74926b38f6a77f60e", + "sha256": "0h70wasdzjysk4cj5z5055430jllm6fpb3xshvxldydx2n9kldjm" } }, { @@ -98604,6 +99147,30 @@ "sha256": "1lg1myxb5pqf9m19kza2iwbcdcdghkrcb7fbgk7jghn2ag0naasf" } }, + { + "ename": "persist-text-scale", + "commit": "ed542f20a5bb1628e91e74f5f453cad8474e9a78", + "sha256": "0plr37c9c896iqyw5qixxp7mx7pnc9cdlmqms1pyzq8c2l4hh9cd", + "fetcher": "github", + "repo": "jamescherti/persist-text-scale.el", + "unstable": { + "version": [ + 20250429, + 1936 + ], + "commit": "4a23ae098186d3f193eca86b172050ecdd6db017", + "sha256": "17w7ha59y5mhlimhxrvwqr52lap7kfpfx42iiyx75b9d4m7spbmj" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "commit": "84127d1a54ed55e40038b1f12828f4ad26146dfc", + "sha256": "0gc3v6j9ggh4av29r41zyndn5jzdjab8240jcs4d1x7ifnyiz7w5" + } + }, { "ename": "persistent-overlays", "commit": "d3673c87c5ca883b4f713efeae912c3ad991c667", @@ -98982,25 +99549,25 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20250308, - 1028 + 20250503, + 834 ], "deps": [ "peg" ], - "commit": "e1815943e14b97ff03aa81b4e6bddb2bb582da52", - "sha256": "08sjsgjkzi53xwi8l1vjb48qc6clnsknlrv3pikr81dhbjr986i8" + "commit": "4f2d0cf8e7a0d3b1ffbfe84989f38eabea5589b4", + "sha256": "0q7s0f1clqr57pifs0wz7kcws0i1gb824c0glrdpmjagax87w28v" }, "stable": { "version": [ 0, - 49 + 54 ], "deps": [ "peg" ], - "commit": "f957bb6679dce1a24b06e245f695c04556977752", - "sha256": "0k7fyr7bkmbb2s0w36rachn3qh5xczgla5vps49kzavqfcfhk9fc" + "commit": "4f2d0cf8e7a0d3b1ffbfe84989f38eabea5589b4", + "sha256": "0q7s0f1clqr57pifs0wz7kcws0i1gb824c0glrdpmjagax87w28v" } }, { @@ -99327,11 +99894,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20250109, - 2103 + 20250331, + 1736 ], - "commit": "0f756a8c0782ebdc00557addc68763305c91ca51", - "sha256": "12alin9lfp8lxrd8g9d1nld8cha4zmfbpjz6mjzmi1midv4b0zdc" + "commit": "df830a1894ad9e17f4cd9803c0353942179bfdcb", + "sha256": "0233y6gaqfryv6i91wygf9w67ssn73wwl50gcdsgyl7giw8nrf14" }, "stable": { "version": [ @@ -99439,8 +100006,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20250307, - 1931 + 20250510, + 1951 ], "deps": [ "async", @@ -99448,8 +100015,8 @@ "f", "php-runtime" ], - "commit": "005f5bff81d66ac362a163778fd433eef43dabfc", - "sha256": "0jaccwf00xjm7nhwl51q9v3lwha8rwn7wm511klkc1g7dq0mzzaf" + "commit": "037187f9e204d3ed17017e7fb54236c005725fb7", + "sha256": "0vz9ckpkbqcf30aca7swizc1nx2jaghmyr4b1s64cncwr8z4jg5h" }, "stable": { "version": [ @@ -99473,21 +100040,21 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20241107, - 408 + 20250407, + 1727 ], "deps": [ "compat", "php-mode", "php-runtime" ], - "commit": "b616f5fa5f8aff9aa220c7fe63b39df6d10588a5", - "sha256": "0xjr6vi158qm6rnrfvpcmh2grrlvixdd44kik333250298vc3nx3" + "commit": "e224a90db19ded92d2a440f0654ce3a3ca65a4d9", + "sha256": "0g5vy761s4k0h7wn2k871697nnhp89ragch2hrb8ffc442465yrd" }, "stable": { "version": [ 0, - 7, + 8, 2 ], "deps": [ @@ -99495,8 +100062,8 @@ "php-mode", "php-runtime" ], - "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b", - "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp" + "commit": "e1aa8b269c0e3281c323bc1fad509edabb668441", + "sha256": "1nqsf9bh8pd3pjmpmsiqazy8639h8938jm37qqcmdn13n69n0pxm" } }, { @@ -99827,6 +100394,21 @@ "sha256": "1zxmc2l41h28rl058lrfr8c26hjzqmp37ii8r29mpsm03hsw30fh" } }, + { + "ename": "pink-bliss-uwu-theme", + "commit": "2cebcc2fca87b870b6283e218362f92bcc85282e", + "sha256": "02kfwsm060kx2am7ffqb2jihxwhhgix709n0kbpyfnsyk7vyj365", + "fetcher": "github", + "repo": "themkat/pink-bliss-uwu", + "unstable": { + "version": [ + 20250517, + 645 + ], + "commit": "9c5c39f4509315c69a58f5cffde351dc70613f6a", + "sha256": "0i1krkzwh5l2zba6hpg0l8n3bh9qfmspmhs1b4rfd4c61da56mwi" + } + }, { "ename": "pinot", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", @@ -100274,26 +100856,26 @@ "repo": "skuro/plantuml-mode", "unstable": { "version": [ - 20191102, - 2056 + 20250514, + 1906 ], "deps": [ "dash" ], - "commit": "ea45a13707abd2a70df183f1aec6447197fc9ccc", - "sha256": "0rbmn2964w9kms6ql25dzpnyygj693123xs7gxasylgw5jall9wx" + "commit": "5e6b505c0695f75666a571b9e6fe1d52fa3ec34d", + "sha256": "1gxblp31ihvi51n5ywa68kknzas421zdj8rbl24wz7p0rba6w24y" }, "stable": { "version": [ 1, - 4, - 1 + 5, + 0 ], "deps": [ "dash" ], - "commit": "5889166b6cfe94a37532ea27fc8de13be2ebfd02", - "sha256": "0yp41d2dmf3sx7qnl5x0zdjcr9y71b2wwc9m0q31v22xqn938ipc" + "commit": "5e6b505c0695f75666a571b9e6fe1d52fa3ec34d", + "sha256": "1gxblp31ihvi51n5ywa68kknzas421zdj8rbl24wz7p0rba6w24y" } }, { @@ -100493,11 +101075,11 @@ "repo": "flexibeast/plisp-mode", "unstable": { "version": [ - 20221130, - 524 + 20250328, + 45 ], - "commit": "3a0ec9741ae7ca67852022c6fa85519fcb4b69ba", - "sha256": "1lfn6bylpsam2la8r1k0gb3aik1fbbvpln37zc0hmdj3k0w4clci" + "commit": "062c333343e64427dd70a2739ab9225fd23e550a", + "sha256": "15562wnrw14s9pjrjfwz03jzsppf0l6mrvj88vglsghaayyps3r9" } }, { @@ -100955,16 +101537,17 @@ "repo": "polymode/poly-R", "unstable": { "version": [ - 20230416, - 1454 + 20250502, + 1525 ], "deps": [ + "ess", "poly-markdown", "poly-noweb", "polymode" ], - "commit": "8024e852cfca642dea2045a41b2033baa2f1f9a5", - "sha256": "1r4cbvvg1fjyq18ap1mj7gpvgllpc6hf6g7nf697vgwmahlb7jgf" + "commit": "fee0b6e99943fa49ca5ba8ae1a97cbed5ed51946", + "sha256": "18g462p5yh7fakb1w4mxl5m8kf5ny2xah67dic2qc9ffc6rc7pm2" }, "stable": { "version": [ @@ -100989,8 +101572,8 @@ "repo": "mavit/poly-ansible", "unstable": { "version": [ - 20240803, - 1612 + 20250501, + 1455 ], "deps": [ "ansible", @@ -101000,14 +101583,14 @@ "systemd", "yaml-mode" ], - "commit": "6fcfbb7163f7a74db9da0d54a5ecaec2ac93b315", - "sha256": "17c0c2gsxw892hq1acxsvl3i1cgpwfkk76hszcr9ydw566478972" + "commit": "fc31708bff007a40314c1cfd5a5b9659f39b024a", + "sha256": "1n313pmaifldqsdlvzvwv51fyr06fymhfilzl5z3l15wax7nqfxs" }, "stable": { "version": [ 0, 5, - 1 + 2 ], "deps": [ "ansible", @@ -101017,8 +101600,8 @@ "systemd", "yaml-mode" ], - "commit": "6fcfbb7163f7a74db9da0d54a5ecaec2ac93b315", - "sha256": "17c0c2gsxw892hq1acxsvl3i1cgpwfkk76hszcr9ydw566478972" + "commit": "fc31708bff007a40314c1cfd5a5b9659f39b024a", + "sha256": "1n313pmaifldqsdlvzvwv51fyr06fymhfilzl5z3l15wax7nqfxs" } }, { @@ -101528,11 +102111,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20250222, - 2118 + 20250323, + 2147 ], - "commit": "91b71955db19014d7139191660272c736458d87d", - "sha256": "1x1nnc0li8jd609lnmmax2hl69wmbq84c6b2mdg0wb7zf0k29lba" + "commit": "49f4904480cf4ca5c6db83fcfa9e6ea8d4567d96", + "sha256": "0ylgqail51zzml8b8qc2wirpkvwj8317qp67y68rlz4kzi3zjxj2" }, "stable": { "version": [ @@ -101965,11 +102548,11 @@ "repo": "jschaf/powershell.el", "unstable": { "version": [ - 20240825, - 1440 + 20250417, + 2013 ], - "commit": "38727f1cdaf0c937a62b68ee52ec7196b8149f93", - "sha256": "19nprnwp6cly90dqa98d9h6kgbgg6idpqsjgckrvk1bn2wkx6axv" + "commit": "9efa1b4d0a3cc5c0caae166c144a0f76b1d0e5f4", + "sha256": "0lgvri5frma2pz8aqn9v50dzajdn198jjh7lzs1s8xvmz9q74zg2" } }, { @@ -102083,8 +102666,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20250305, - 1646 + 20250413, + 919 ], "deps": [ "ghub", @@ -102092,13 +102675,13 @@ "magit-section", "markdown-mode" ], - "commit": "47bc3b00fd509a7bfd0bf5697cf9f7cb9cfacdd3", - "sha256": "0c28xbgq837694z9dag24y48mb3r4ffalci1zxp8hgqrijfqmakd" + "commit": "7c2ce9deafe5158b4b0fe7c1e70104d64727c15e", + "sha256": "0ryf2jk54iqg7q494qdghg2pkhw8ky3s53dpj55871x6p2m1387r" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ @@ -102107,8 +102690,8 @@ "magit-section", "markdown-mode" ], - "commit": "9fa4ef4d1922cbd6dd37b631ea05aed0ef358178", - "sha256": "1cm92263jqvq2lg378xqi8ikbqw98lxjpsl29sja2xg2wf6p7gml" + "commit": "7c2ce9deafe5158b4b0fe7c1e70104d64727c15e", + "sha256": "0ryf2jk54iqg7q494qdghg2pkhw8ky3s53dpj55871x6p2m1387r" } }, { @@ -102237,14 +102820,14 @@ "repo": "zonuexe/emacs-presentation-mode", "unstable": { "version": [ - 20180427, - 224 + 20250327, + 202 ], "deps": [ - "cl-lib" + "compat" ], - "commit": "b1948e6d8b37b6df9290d77d181e1b1d58dd33c0", - "sha256": "0wm7rg7gvyngps3b7agpyhhbi2r7z0n5x8wxzahl8l1bm820y8jk" + "commit": "42f13613b0d01ef78c36fc352ae8976cffc50e71", + "sha256": "12v8pcc5ayn26mhm2xbp5pb8269yc0mh0y5j34r54ajpsb9cwl1h" }, "stable": { "version": [ @@ -102696,16 +103279,16 @@ "repo": "rejeep/prodigy.el", "unstable": { "version": [ - 20250130, - 845 + 20250401, + 1948 ], "deps": [ "dash", "f", "s" ], - "commit": "99908d13beeb86cea6c7675af5885133192bf6dd", - "sha256": "174zldzv3id6vgfr1ynximgxbh3alxsr6dypy9v5aly7zlwwclhw" + "commit": "7bd89fdd544209afb28d6abe828728ad62257617", + "sha256": "051mcwyigybrp6vnn6b88jh4y18m54mfi8n776ps42pgijgpmjg8" }, "stable": { "version": [ @@ -103067,11 +103650,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20250312, - 1659 + 20250402, + 715 ], - "commit": "55db082cdf7b849335ccf24b7ba5aa2607d6fe93", - "sha256": "1h0kz0k0vjlw59q6r3vi84agwyqp66qps70bs10g8aag1im0zcx4" + "commit": "4dd84b02c9cd7b04616dc2d01ba7bc87f0d15be8", + "sha256": "1cjq9bdm13j6km1vvl1hsdpq86nlgv9wmf03ylfr85p0lwgy841w" }, "stable": { "version": [ @@ -103566,11 +104149,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20250125, - 1556 + 20250516, + 913 ], - "commit": "3c3a21e4dad205dc17a54e568ed387e59ae2ff69", - "sha256": "1f330abya5cf6gvhfb9l9j2vbhz3ryd473lf98sipmxkw6a06lm1" + "commit": "f5d929ec447f3ad9cddba454e7c2dc6ca43cd732", + "sha256": "0qvvsagl5dicmfzmb7x73lfczbkqibd9zxsm0wps85ky93p8l0m2" }, "stable": { "version": [ @@ -103678,11 +104261,11 @@ }, "stable": { "version": [ - 30, + 31, 0 ], - "commit": "d295af5c3002c08e1bfd9d7f9e175d0a4d015f1e", - "sha256": "1yini3rs17yf122ldzq19rywa4rl11gqayqwrwpvnixj7f3m560c" + "commit": "3d4adad5c4c4e6a6f9f038769b8c90716065b0e4", + "sha256": "1z2k6q0f1sifm1bm4zc8m7a5sbaizrmdwvnf49d8pi3xb4f96nk3" } }, { @@ -104194,20 +104777,20 @@ "url": "https://depp.brause.cc/punpun-themes.git", "unstable": { "version": [ - 20240929, - 2238 + 20250421, + 1819 ], - "commit": "a0b26442293e7afc6fd2ba9be199fc7b4f5138e3", - "sha256": "1bhv92kr5dmqh1v631s9lc2y0i731vmws1ysyrwrjr2alxpnlivz" + "commit": "735cedca649e0576ffba3771a039744c4a70528d", + "sha256": "160ivqmmaxyi4cy694cdgdirlviqyz7fkr84gcf761q5k2jrabwa" }, "stable": { "version": [ 0, 0, - 2 + 3 ], - "commit": "6a7e04de1ad9f7ba9074b7206bffc9241c33349c", - "sha256": "0661rhlh3nbbrjdg118y9nk7kmshb5p0jzgfpnqvqmf7j6p6rpg7" + "commit": "a0b26442293e7afc6fd2ba9be199fc7b4f5138e3", + "sha256": "1bhv92kr5dmqh1v631s9lc2y0i731vmws1ysyrwrjr2alxpnlivz" } }, { @@ -104247,11 +104830,11 @@ "repo": "smoeding/puppet-ts-mode", "unstable": { "version": [ - 20250226, - 723 + 20250503, + 1625 ], - "commit": "459e831ac40e7375864f4d6ae8571421f4e8533b", - "sha256": "0i3z6d255ibpchy3ml3q3wdycw757d28hzqfzgxkr1fyh1bczwfa" + "commit": "8a4a9609bf8a4615c562ab837ade587bb75fef2f", + "sha256": "0lz7qjmifip26bcpjn0vg1nr3rdzn54sn1dakzh0dmqa0rwrbfgz" } }, { @@ -104262,11 +104845,11 @@ "repo": "purescript-emacs/purescript-mode", "unstable": { "version": [ - 20250307, - 416 + 20250513, + 1922 ], - "commit": "a3d6ca4ba5b6ead6f19cf635258f2560c25a6e1f", - "sha256": "1sghd6mi1nm0yyl5wg5gbv3hnyd3gfrsrfkfwh1ks8j31xqqnwyc" + "commit": "023cdf2a81c2f98ec77b4fe4b9c5b501d02ab4e9", + "sha256": "1zkmh44vfsw8h60qskqkgw2b6qdl1qjyrn3dggwsas5f33nzfkg4" } }, { @@ -104387,11 +104970,11 @@ "repo": "ideasman42/emacs-py-autopep8", "unstable": { "version": [ - 20250224, - 2305 + 20250421, + 1116 ], - "commit": "45e46abc8dcf271505de6a75929b704fca663a91", - "sha256": "01zbpjyi7kpxafl9jnhxp0y8xi16a99cjkvrqc3ah3rpxdmww352" + "commit": "69fa9a47c15801172503987237c6043bc92761f5", + "sha256": "0n5d7lfgzg7rfj4kxcfp904h66yh73024bhvcwl0k6r6jc8sbvkh" }, "stable": { "version": [ @@ -105277,11 +105860,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20250224, - 1104 + 20250514, + 727 ], - "commit": "7a4a93e972152ae224e88c25183115fb64ab87d0", - "sha256": "0gmd018zna46p7wbzq8d1ibp3vlskfqngn2amxyg8nkgvbqmahma" + "commit": "413e7b99bb1495aa00df6c84b21558ab81d36cdb", + "sha256": "1d8wfvr8766jfbhmzy6fhqdf6yn5qwddijf61jmd9wp1i891bx08" }, "stable": { "version": [ @@ -105505,11 +106088,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20250119, - 1527 + 20250415, + 154 ], - "commit": "a4a8718605c418c3de0bc48be305dec765151f29", - "sha256": "1kf6afhfm1asqy7hps4wxyda1ssw8h4s3h58m6z05j7yhrgamfq9" + "commit": "7f41e1c62640c1badcb67daaead24dc291cd16ab", + "sha256": "0y7qf3h16xca9dj36d95p0bl6q4nf4ycygzx97jbx98hnlzvdcy2" } }, { @@ -105819,20 +106402,20 @@ "repo": "jamescherti/quick-sdcv.el", "unstable": { "version": [ - 20250304, - 216 + 20250313, + 1703 ], - "commit": "c114a2917845d51942cb893bd819e07580e6dbdc", - "sha256": "03ak9prizffazmv91c7mxpj3ckq786lirjs360pv9n4kxchldcdc" + "commit": "f94099124e4df92b44086c46d59e286f21bfafa8", + "sha256": "19ywfnf5ws40h9iv03xibjfk1hfpnb67zf9702px3yg5j1mhr845" }, "stable": { "version": [ 1, 0, - 0 + 1 ], - "commit": "ef24026f1f03d3df8ed999e5c75f5c3bbc70860e", - "sha256": "0z83fziijw6262i4iq4wd881ps3w1wd9f2x4966bjxgavd0ijfp7" + "commit": "f94099124e4df92b44086c46d59e286f21bfafa8", + "sha256": "19ywfnf5ws40h9iv03xibjfk1hfpnb67zf9702px3yg5j1mhr845" } }, { @@ -105877,14 +106460,14 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20250214, - 813 + 20250503, + 2058 ], "deps": [ "ht" ], - "commit": "7345432cea36d4a6cdfcf5371f76af640cc6d192", - "sha256": "0jjqxcf6x5si095z1aj26hyqjcnrm5m6cy13m361k5gq9cqkb63q" + "commit": "bae8efb8c5bc428e4df731b5c214aae478c707da", + "sha256": "1ci1flsa8c5ydmkrxnync1zkf6d26ld08h9n71ffzpxhkdxgph8v" }, "stable": { "version": [ @@ -106060,11 +106643,14 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20250212, - 1523 + 20250514, + 1427 ], - "commit": "eef5e9ab2c8991e7c73d4232bde28a77124005a5", - "sha256": "1shjcrdqw1fpwlksk7wpr2m1s30lhy144wik2kx8hjdbna4ygl0f" + "deps": [ + "compat" + ], + "commit": "1ec8ac5341ba9f9b70de02a8397fa02297594c16", + "sha256": "19syc0xagsgl44j7lw00k6ma6y4s09ck4x9hynha6hwd1xdrr3np" } }, { @@ -106800,20 +107386,20 @@ "repo": "xenodium/ready-player", "unstable": { "version": [ - 20250211, - 710 + 20250410, + 816 ], - "commit": "7a37e6fe82d74d525d1e0280f68d357a22c1a312", - "sha256": "0c9lgk40p19ji5hcrgz957i70ap3z35jbpaw5paf9ba72x3rn3mk" + "commit": "ea0633f7b8cb4478073b3082e01c3a46b2e888b1", + "sha256": "1qhdmb1rlj7r3nzhv8ajl90yibgmfjb1x9rjyljgqyfmizrp87lv" }, "stable": { "version": [ 0, - 30, - 1 + 31, + 2 ], - "commit": "3bb454a834e7d0f91bf27c957fc52ce15a17b739", - "sha256": "0vmx2bycyvd0a4bmd9whav14kry5dm8kh7fq1khy81y33cbzgnn0" + "commit": "ea0633f7b8cb4478073b3082e01c3a46b2e888b1", + "sha256": "1qhdmb1rlj7r3nzhv8ajl90yibgmfjb1x9rjyljgqyfmizrp87lv" } }, { @@ -107979,11 +108565,26 @@ "repo": "Reagankm/renpy-mode", "unstable": { "version": [ - 20200607, - 135 + 20250509, + 825 ], - "commit": "f2f95a72a8c842f229f80999132e8ea8ee73f6fc", - "sha256": "1jka61j6zrc0yzjcplnyg1kp1d45ikwnkmayjg41v9w0pfrzzim3" + "commit": "fd97f97c12ab7e3fae9590b7f39362d6084d6fc8", + "sha256": "0kclg1mm4i4lrpc0sd0jdfwsvcy8kh5a6ljgflxz65aj3ln05qi0" + } + }, + { + "ename": "repeat-fu", + "commit": "641cd90a1b5507648c6903fc9dc0f198ca41a06a", + "sha256": "1p3ipdsqip7xvwgbvgia4214hw7nw2gc3m0m55ggwi3gcikvx2xp", + "fetcher": "codeberg", + "repo": "ideasman42/emacs-repeat-fu", + "unstable": { + "version": [ + 20250428, + 2323 + ], + "commit": "c7707c98730bb3ffaf84aeed341fae3cf35c314b", + "sha256": "0qfbf8rg9lpdmr4xfy5nmq4130zbjbkaqhk780zp5jin8p71jb5s" } }, { @@ -108507,14 +109108,14 @@ "repo": "swflint/retraction-viewer", "unstable": { "version": [ - 20240509, - 1440 + 20250510, + 1847 ], "deps": [ "plz" ], - "commit": "e8ab96e5a95a93849b912e2684b9776c685ac4bd", - "sha256": "10kyj2jjykbzi2afyqg57w1pkf310155zjb3hzl6nm6h844gnhji" + "commit": "21fc8844a744b28153dff055cec6c6a3859b1529", + "sha256": "0fqsxzj45451sjzb2fhkangb891gzj2ccfbq0gxkr420av422fgv" }, "stable": { "version": [ @@ -108843,6 +109444,21 @@ "sha256": "1adici6hs4ivz7lqhrgdm9g1rz0mgvrsa7pkr2pcx6mg1f0qnlmr" } }, + { + "ename": "rg-themes", + "commit": "f4841296d637d7cf0134bf354cd62c5e448692d3", + "sha256": "1mkwdfvsnczdympffgpr70vxjnkcrdwlhw97rqzmq22ih1v1l8z2", + "fetcher": "github", + "repo": "raegnald/rg-themes", + "unstable": { + "version": [ + 20250324, + 1454 + ], + "commit": "e5bfe9b71587b0c247f433261419eafbf4e2c5a9", + "sha256": "1s2l9mwpgrvzfzznlwmfzi8k0zxdg5q1s78ybh3sc7jb6jpdcbyh" + } + }, { "ename": "rgb", "commit": "a6207f5129ffd2bedbc83aa8a41d83fe4f6e41be", @@ -109277,11 +109893,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20241229, - 1855 + 20250325, + 50 ], - "commit": "38f83b717cf5d5c4ee105c140f4f2341b3d2032b", - "sha256": "02bxccg34dc893hnbw1j9fybkqmlkknp8c3zk959bg643x5ycrvd" + "commit": "05c4795226f859009bc570940139473b6b6f7555", + "sha256": "13hrvq0hsvgnysi474c16s0j3mdxny210pszp5ch9jfk9l98r7zf" } }, { @@ -109520,11 +110136,11 @@ "repo": "marcowahl/rope-read-mode", "unstable": { "version": [ - 20211228, - 1126 + 20250428, + 1236 ], - "commit": "6aad44e006a2999980c138f608d28c8ecab92b35", - "sha256": "1hgkndd5y7hihzyb19pixdx3pnsxspaknq0kvxj8sq1d8iqk0300" + "commit": "7cd80d6c8e4a7e24a5147c06f083d745aef91b55", + "sha256": "1f55x5cwc87jqhxpg7bwgr8mwv544awqf1sn6fnc7qzma8bm02pn" }, "stable": { "version": [ @@ -109632,11 +110248,11 @@ "repo": "Thaodan/rpm-spec-mode", "unstable": { "version": [ - 20241209, - 2001 + 20250329, + 139 ], - "commit": "283d2aac4ede343586a1fb9e9d2a5917f34809a1", - "sha256": "160kkf4jswlnv0prwxws2l93cq7b1x21kkkrics0cg7kfkkyrvrr" + "commit": "8cd329b78c7bc6285b7b9f2c65a58a9e778a59ca", + "sha256": "02ll930smiixlgaf3bxs2g30gc5alc1yd1fv8spx6d4hxrp9jvy5" }, "stable": { "version": [ @@ -110374,11 +110990,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20241112, - 438 + 20250423, + 15 ], - "commit": "542f1755d8929ca83564322d7030d558f3392fe1", - "sha256": "1a6p50hkw2qlgh2v1yivhbifp8l7ffsqs4712sd971scb00yv2r4" + "commit": "25d91cff281909e9b7cb84e31211c4e7b0480f94", + "sha256": "1dhacxmhjgwjyplaqivhv0v9wsk4dclbj2d9slwzib6s4dcgki87" }, "stable": { "version": [ @@ -110421,8 +111037,8 @@ "repo": "emacs-rustic/rustic", "unstable": { "version": [ - 20250310, - 1415 + 20250514, + 156 ], "deps": [ "dash", @@ -110435,8 +111051,8 @@ "spinner", "xterm-color" ], - "commit": "22a5ef8bfd5a34ced945c2722938eb29632371d4", - "sha256": "1lpa887lf1jvyzwpdpa2j8qdzymh60qbdfqgk11xyh0rkh057bjw" + "commit": "194f15c91ace0c3e95a81d315d2a481480d80a3e", + "sha256": "0i0fclbip38wbnnrapbaj0mq991hnjhs6j3wwddc8vmzwgrn29ml" }, "stable": { "version": [ @@ -111083,11 +111699,11 @@ "repo": "KaranAhlawat/scala-ts-mode", "unstable": { "version": [ - 20241027, - 701 + 20250418, + 813 ], - "commit": "039af6d4e353726245e60756667f0b7378840f6c", - "sha256": "0b4f9zax2rgg3zrlsg40mgiz7f5z9dq52adg7xrgwrc1k65mlxlf" + "commit": "c7671e10419261ef70b1820d3b970ad39f6fcfe2", + "sha256": "15skmacj0mv5dmxhwjmk2xgqd2bfamc0fy10arkxwd39g3lgrdwy" } }, { @@ -111543,11 +112159,11 @@ "repo": "precompute/sculpture-themes", "unstable": { "version": [ - 20250303, - 1824 + 20250416, + 1506 ], - "commit": "59e8962f34a33a73be7bfd2d69ae53c14bba6b33", - "sha256": "0a3xq8mjaa4qam0vw4cfp1l7hyqzvrm4bf2a3andaww1yv2fm1sl" + "commit": "33a0309acba6e78f9fe5f5befa12904dd1390630", + "sha256": "15p9gqy425bg4gf2bxrb91gzl5n60ps553qj6jq5h9vibdfixvgw" }, "stable": { "version": [ @@ -111603,15 +112219,15 @@ "repo": "sdm-lang/emacs-sdml-mode", "unstable": { "version": [ - 20241104, - 1705 + 20250424, + 2016 ], "deps": [ "tree-sitter", "tree-sitter-indent" ], - "commit": "ec867931868b0bced385f9b7517a8b48cd146ac4", - "sha256": "0mzbllnpr6kqm7f3yr3yq6wr42k8kps7qrzw7023fb9kh3q1xg6g" + "commit": "36c77e0d5af0165104cf8b7fdb489ae405993d64", + "sha256": "116anp92chdm6nn8fynrl2jnvkisq76c6h0257hq6ixg9l1k1xmh" }, "stable": { "version": [ @@ -111887,14 +112503,14 @@ "repo": "captainflasmr/selected-window-accent-mode", "unstable": { "version": [ - 20250304, - 1623 + 20250423, + 700 ], "deps": [ "transient" ], - "commit": "e51f58ebbe51d17a16912c0c16e402db68013a69", - "sha256": "1rzqz27v45i44h2hpbx2hc26r71gvczcl12z04rai5vw5zzlzfz2" + "commit": "44e43b9706bf0cc09f54f36859b060df53ae5278", + "sha256": "07s5flk5501nwrr77q4d7k7dcwwb5mvapwfphv8ikkhba5yk0d7j" }, "stable": { "version": [ @@ -112239,15 +112855,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20241012, - 125 + 20250506, + 833 ], "deps": [ "dash", "edit-indirect" ], - "commit": "0001d2b4fcc6e5f40ebc82dd3c80ac7ce4031234", - "sha256": "14cs3vjfs077w5v1vnhddi8a7xag2x8b9vam8pdlcn48737bk7mw" + "commit": "5cb46a65fc6e12b753dce8f581fbfa144d011a80", + "sha256": "1cgvj1ii6hfq3z6lq8cb7xiximyaglzwbwyf3aws0hw504q9kf8w" }, "stable": { "version": [ @@ -112340,15 +112956,15 @@ "repo": "MaximeWack/seriestracker", "unstable": { "version": [ - 20230821, - 1858 + 20250315, + 1813 ], "deps": [ "dash", "transient" ], - "commit": "49b1e7a822c973c48007dc6461577ee68124ddc8", - "sha256": "0gfm7ss3bwj3m2y1mb4sdmsv85mjnpkgmzasa3yfj69zbq46glhn" + "commit": "03e5937abe7911fef6286601cbe54e0a6bc9ec3f", + "sha256": "0kdyb3k94ln2nk86kga838kvias1cxzdpmdcprixlsyd1d5yra15" }, "stable": { "version": [ @@ -112573,10 +113189,10 @@ }, { "ename": "sexy-theme", - "commit": "fce1e2e203a53dea0077d0806d1918c4ebe0987d", - "sha256": "118nmw29izb7q6kzkb4swdbz45alp16p203ksi8csfdv79ky3qxw", + "commit": "3c721d77616bda8bc4b7819a24698690c737c07e", + "sha256": "0pfnn880iyjzsr4fcrrpc65d0z5a9s4iy4bgrz7qrrjfygdni6fz", "fetcher": "github", - "repo": "bgcicca/sexy-theme.el", + "repo": "thebigcicca/sexy-theme.el", "unstable": { "version": [ 20250312, @@ -112777,14 +113393,14 @@ "repo": "sebasmonia/sharper", "unstable": { "version": [ - 20230129, - 1827 + 20250403, + 1243 ], "deps": [ "transient" ], - "commit": "496e90e337cb09329d85a6d171c0953a85e918fe", - "sha256": "1a8x6mywxkhcc34lv0s5gq48vnhnq0cir0841zbkdjp1fviyx7j6" + "commit": "5049795848609e6508e4c9718a9f97ee481bf36c", + "sha256": "10w8hnny8grnxhkx1cgsgq74p9cp2ni73n0w233inmids46661ha" } }, { @@ -112864,11 +113480,11 @@ "repo": "xenodium/shell-maker", "unstable": { "version": [ - 20250301, - 2230 + 20250515, + 1649 ], - "commit": "98780ec0a8ac4fe1d6be9e2f8047195cdfad5f70", - "sha256": "0pmk9c2xbbqy3d0q5kjf74d06wxdnxyfpd10qmnzj384nkaqwm8w" + "commit": "9920a316bf59639c5a1a24d40e230100c78cf2ed", + "sha256": "0p6g61yc0nmmc713szwgackx1mnlrzl256infm73dhjcni6qn8bj" }, "stable": { "version": [ @@ -113155,11 +113771,11 @@ "repo": "ideasman42/emacs-shift-number", "unstable": { "version": [ - 20250313, - 1138 + 20250421, + 1057 ], - "commit": "8d910a7f0f42027f6526fc0bb0d145c196c19b52", - "sha256": "17ganlyvb3d7ibpyapnywhj9a1667h66g8hiwajgryciar958mnj" + "commit": "0538161aa693676d6ab662302250995fac3ebdf1", + "sha256": "0wvpiaxg78lxvfazhp4mh6v2dsg87nrkwwy08rym7z5yqfxs9bra" }, "stable": { "version": [ @@ -113374,14 +113990,14 @@ "repo": "xuchunyang/shr-tag-pre-highlight.el", "unstable": { "version": [ - 20240515, - 1420 + 20250501, + 1509 ], "deps": [ "language-detection" ], - "commit": "af8ae8d558d1e26d276130c100e02746278ce037", - "sha256": "1ncmgziclhj3694kzq6qwsrafzcpn6a5r6fwbcjnjk6z9dahisq8" + "commit": "02a93d48f030d71eba460bd09d091baedcad6626", + "sha256": "0c6j0wyinagi28hkq0yxw2l9imxvpx0cd5a8h879w39nax9fd0cz" }, "stable": { "version": [ @@ -113402,15 +114018,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20250308, - 1630 + 20250330, + 1106 ], "deps": [ "language-detection", "org" ], - "commit": "779c94b561177210ae03c042f191a7a6cec663c2", - "sha256": "0jbmp1f9bdv18k9xfkblyv2gxawcj8hwacd76ygr2xrgj3i5d89p" + "commit": "beabf1c7dfc4f1dc69f2cbcc438a74b5497a90ec", + "sha256": "1f1kd0hdhn4536vabvv4kplbwmy0mznhvhzn3pa581h580jzg9hf" }, "stable": { "version": [ @@ -113681,14 +114297,14 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20250311, - 2149 + 20250517, + 508 ], "deps": [ "ht" ], - "commit": "ed0d5ca69104aea2e3de0d9ab62f8709fa07b8e1", - "sha256": "1z39crhdpsn96qxqi66yls3cpgn378nphjcy4sqnxka20dnz4d9p" + "commit": "6c0562c5abfa9eb16320cec755ffe09ebc26c0cc", + "sha256": "1hr5978i7g9px8jy5rmhl7avcxw4agrqrnwwnccak08l945n72fj" }, "stable": { "version": [ @@ -113810,14 +114426,14 @@ "repo": "emacs-sideline/sideline-flymake", "unstable": { "version": [ - 20250201, - 1749 + 20250514, + 2147 ], "deps": [ "sideline" ], - "commit": "87459e2b083674520d7fc4ee36b6b04c990b2e4f", - "sha256": "0cncgf404ckcilhgzyr79wsr0bgkhklcdcd0scbnmfrn72dyzq9p" + "commit": "46f6cdd69bfa6825cf06f71f9417de8364280353", + "sha256": "1hvc0psjmwgf2lavjjzpgjzmnqbmdj5nb3jqlwak72zzrir146j8" }, "stable": { "version": [ @@ -114107,9 +114723,9 @@ }, { "ename": "simple-rtm", - "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", - "sha256": "09m5akqrdn22lxr50z3x2zyldh1m62b8sbwkq6pb428bhanvhky2", - "fetcher": "gitlab", + "commit": "8b4469d549ad280654f3cfd1aa2837dc07b066b7", + "sha256": "1cmcfc0jnvgyq3gb1086brn33zdlb2hm9kv5w5v3gg786wwsrzp4", + "fetcher": "codeberg", "repo": "mbunkus/simple-rtm", "unstable": { "version": [ @@ -114147,11 +114763,11 @@ "repo": "rolandwalker/simpleclip", "unstable": { "version": [ - 20220518, - 1251 + 20250505, + 1710 ], - "commit": "023f239275115169c3a3637ad95fae4a036c005e", - "sha256": "1mvjlcmldcx3vd6xkk3nriy8lghp6nqa6l13a6kax5n8dc0hi4qi" + "commit": "105b7adce212fdc9bbcbe7801531669a658c735b", + "sha256": "1d3gfhmmr7ca812cn9z426b0ki0gfsxx16gcykrnjvqkk6fa14dy" }, "stable": { "version": [ @@ -114309,11 +114925,11 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20250207, - 1321 + 20250426, + 1916 ], - "commit": "e09728891a99a078470cc29a30a6e32f814682fe", - "sha256": "02r8z2dng0ian1qig5c1g5xwfa4azpkja9r5lwi4qyd9mkw5cjzy" + "commit": "a438a90209289fd12156285c06ce98e13e2f5834", + "sha256": "1mwc510kf2s91cm11w0qvk9k2r6l0sv5v0cxax18ji6hgdzq3lwk" } }, { @@ -114324,8 +114940,8 @@ "repo": "magit/sisyphus", "unstable": { "version": [ - 20250302, - 1547 + 20250401, + 1807 ], "deps": [ "compat", @@ -114333,14 +114949,14 @@ "llama", "magit" ], - "commit": "a93f6329efddbd1273f774046904886b6d2f20c3", - "sha256": "1qm9bwbbkypnd5dp8f1ag3hfwsg6f0snggymwhc082bvdifpmxxk" + "commit": "e3f6ea4b720ed384c3ba34fa047bb66280906fad", + "sha256": "1mdslx756828ljhbnmqr1hvcbw0pislqisnlsw1y38c535hwns0f" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "compat", @@ -114348,8 +114964,8 @@ "llama", "magit" ], - "commit": "f04a145396e5534e09d381d218ec051e2137c9e0", - "sha256": "1fq9axf5h3l3qk6pgv2vzz33hbl2fmbv4vsg9l0il7vhwlj7k04a" + "commit": "e3f6ea4b720ed384c3ba34fa047bb66280906fad", + "sha256": "1mdslx756828ljhbnmqr1hvcbw0pislqisnlsw1y38c535hwns0f" } }, { @@ -114592,8 +115208,8 @@ "repo": "emacs-slack/emacs-slack", "unstable": { "version": [ - 20250310, - 2351 + 20250429, + 13 ], "deps": [ "alert", @@ -114605,8 +115221,8 @@ "ts", "websocket" ], - "commit": "7fc183f9deadc7e3d4e0c89776cdc2968bba0164", - "sha256": "1fimrkd4p15pm2vy8g7j9cxv4l5i1n7pgkzhzyd0jlha5g8il8ij" + "commit": "1cd67882054ca2dd22b312577fc4ea5b6af2edf0", + "sha256": "0s555sk2shz5rw5l2rq6rbql6dvv2nlp7h5j9h9w2287xm2n2d1d" } }, { @@ -114664,14 +115280,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20250310, - 2032 + 20250417, + 2015 ], "deps": [ "macrostep" ], - "commit": "9bba7e93105ab4d8517423894eaaa9b097543b1e", - "sha256": "0f2fhiv12jg7pld5zhv14v6hg466bhi7pff8iv91bnfmr1cv0d1c" + "commit": "47c8249d56d6b10d3b680e9ebb18126541afb2af", + "sha256": "0a89k8710alf9a5jrf6p2rp2j6f5wc6rhjbsi119vphyrjpbh6p9" }, "stable": { "version": [ @@ -114916,11 +115532,11 @@ "repo": "vilij/slurpbarf-elcute", "unstable": { "version": [ - 20241115, - 1459 + 20250325, + 1442 ], - "commit": "c6e7d4b5da6f1116b479c71d9c7fa0aca71d4030", - "sha256": "1xd8nd55dhdf1dx622x2618zj3xk196p2yr4123hk8hlqlb46h2d" + "commit": "97b4c3b0bd3e22d4d4b1a9aed3435b5a58b09259", + "sha256": "098wr42lra37f9hy35y8sb6x1zbj0gvvcnchy1f2nb57wh6xy9r2" } }, { @@ -114931,11 +115547,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20250203, - 2040 + 20250501, + 1918 ], - "commit": "c48defcf58596e035d473f3a125fdd1485593146", - "sha256": "0nzbsby7nliq6lfm3pqbqjrd3z51k71dck9alq3kr9mvirp2vw8q" + "commit": "ce17a568efd3673e9d6f41438acc4023379c198e", + "sha256": "17yydln76w4h3c2vwhp980x8r1wrswdj7hvcsf45440q59255ids" }, "stable": { "version": [ @@ -115473,14 +116089,14 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20241220, - 1254 + 20250511, + 2354 ], "deps": [ "dash" ], - "commit": "b0d935c11813bcd40f8d35bae8800e0741334c29", - "sha256": "1j3x0bwvgymgaxi6clasr00gwsh7vwbhysfabqxynb044m1kccq6" + "commit": "603325ab3d1186fb10da5c2a7ec1afb88018d792", + "sha256": "1d242visiid2fcshja4vw6ri94bla3wssc1hz993g3zdjzzcz78f" }, "stable": { "version": [ @@ -116442,16 +117058,16 @@ "repo": "artenator/somafm.el", "unstable": { "version": [ - 20220402, - 2131 + 20250316, + 2337 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "90b661fb1abc652feb6508eb61735919d02e9687", - "sha256": "0n8y8aj42j646vfjarl6w1dxn7wxqx3w6vjwbm8wj4i8nm17a77z" + "commit": "549fea7df8f7bb3c70939275c04f88ff84e0b5a8", + "sha256": "0gwgs4isg9nms6wwk9k509bvcs9mwarhg5182hwrlcxpxhp035fi" } }, { @@ -117081,14 +117697,14 @@ "repo": "ljos/sparql-mode", "unstable": { "version": [ - 20230104, - 1113 + 20250508, + 1044 ], "deps": [ "cl-lib" ], - "commit": "1f6196094ec6626722c6e03a13f6844c68f62703", - "sha256": "031n56bsicrw99ls49rwg4padgbh5adb97lb9gxg852x57hilivr" + "commit": "be606dc08d808e7d996e531d2878ce5a27ad37f4", + "sha256": "0i0agz819qqnrypbzb8fyxr9py3b9npg7mmii2bigksci5az2869" }, "stable": { "version": [ @@ -117191,15 +117807,15 @@ "repo": "dakra/speed-type", "unstable": { "version": [ - 20250302, - 2246 + 20250402, + 1911 ], "deps": [ "compat", "dash" ], - "commit": "9602ac6a794ff16393f6665afe7096b2690e4393", - "sha256": "1iwvv8m8xmyvjwyqs6vjyw17qifx53c7ybwykd802lciqpxiixlw" + "commit": "2bf592aaf2b6d8109cef60c05ba4e5a06f9d0ee7", + "sha256": "1j4iqcgj6dm53lj2pc51qkmpmk149wzd2i81rmy306d6nj6sxh14" }, "stable": { "version": [ @@ -117330,15 +117946,15 @@ "repo": "Fuco1/sphinx-mode", "unstable": { "version": [ - 20220417, - 1552 + 20250511, + 2023 ], "deps": [ "dash", "f" ], - "commit": "77ca51adf9ee877f3a8f43e744f59e650772f121", - "sha256": "0imv3baiy0cq4aj220l8rx4d1drsmiak7vrhbshsg9987026b8ig" + "commit": "038a9195b00636d38aa2fc3cf6cbff5cf84e0561", + "sha256": "0s51lz4v2rwck1q35dkymrzm11iz10srkq7pvzgrpmxyahmqhd97" }, "stable": { "version": [ @@ -117921,11 +118537,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20250208, - 2126 + 20250510, + 121 ], - "commit": "53196f48d35ea745a14573ab5ee4f3725728ebdc", - "sha256": "1ibbv82513za7vd6cm1cynxank78yq423rygrdbycfj8c5h03q4r" + "commit": "f1f8451476fa0cee6b8d06c7a540af5ed469b6b4", + "sha256": "1fcl7hr4q0zwfxfnjsm9rslia0431hkqk8rnwxhbs57h4r6w3jh9" }, "stable": { "version": [ @@ -118395,11 +119011,11 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20250222, - 2041 + 20250412, + 2135 ], - "commit": "a9fd1cb3baf5ea3f7d0edb6c319a16507aa9a64c", - "sha256": "1876366a0vmn90sfwhzx1l7lwyhc2527yvz2lsbzj228wgi5zck2" + "commit": "92abf02d077bcbec00ba39d9b9bf30c089a3b586", + "sha256": "0hnla60x0jhmrwpg5qc0gdxgry73hjzp5cpdhqyv7r6ipn3jd8yx" }, "stable": { "version": [ @@ -118768,6 +119384,30 @@ "sha256": "08gk3z185jhvl8azkn8rccgv72imp14rqw44mlszhrvqjafdd3z0" } }, + { + "ename": "stripspace", + "commit": "4c0930637278ad9ba4efc66e8b7e5574afc73d10", + "sha256": "17j3sdmvhm90nf5s7zic12j6sd1hg67f99xgsc22h5m2is7jx3ni", + "fetcher": "github", + "repo": "jamescherti/stripspace.el", + "unstable": { + "version": [ + 20250513, + 1731 + ], + "commit": "ad553e53dad42c89b8bf7225d1c60f94cba930d5", + "sha256": "0c59cyj2n40sbafn2qv1hfwj3y6hzdbs2whm888jrn692zbxxxvk" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "70eac3a2f99feedcc3fcd03ceb3b2c51b82fb1bf", + "sha256": "1b1v3jkvrgk0fcdwgv1gd4fzdksrzmp69ly58ahj7df6frm4am6n" + } + }, { "ename": "stumpwm-mode", "commit": "270e13913999312a4e8ae16cfb0bb8aad0068043", @@ -119131,21 +119771,21 @@ "repo": "kiyoka/Sumibi", "unstable": { "version": [ - 20231019, - 1246 + 20250516, + 1007 ], "deps": [ "deferred", "popup", "unicode-escape" ], - "commit": "d6bbc65b71f0c59a471fffe13797d1ab6cac80f8", - "sha256": "1fpjm1r1k4idgn6k34v5x4mprh4maa842s19p9b29mnfkslz75kn" + "commit": "0db077ee319340b2ba9f9fdedb503047d84c3a6e", + "sha256": "1aimhfhhn9x0hy2rcfj6vaq0icbqv7smfr5bd7wrgzkdb07n821i" }, "stable": { "version": [ 2, - 0, + 3, 0 ], "deps": [ @@ -119153,8 +119793,8 @@ "popup", "unicode-escape" ], - "commit": "d6bbc65b71f0c59a471fffe13797d1ab6cac80f8", - "sha256": "1fpjm1r1k4idgn6k34v5x4mprh4maa842s19p9b29mnfkslz75kn" + "commit": "0db077ee319340b2ba9f9fdedb503047d84c3a6e", + "sha256": "1aimhfhhn9x0hy2rcfj6vaq0icbqv7smfr5bd7wrgzkdb07n821i" } }, { @@ -119424,8 +120064,8 @@ "repo": "isamert/swagg.el", "unstable": { "version": [ - 20240326, - 737 + 20250413, + 1409 ], "deps": [ "compat", @@ -119434,8 +120074,8 @@ "s", "yaml" ], - "commit": "27d5e7d06c2296cd356ac4a5b97ec84f2dabbb53", - "sha256": "0c7j62rd9yd9ckk28gxbh0lffamm479v1zcl7rsdircfnkixkks3" + "commit": "841159b8db75fd600c929e7d09c87526d94d0756", + "sha256": "1azw1jhnjq0sm7pfyvv74ks7ysz9h32mv6c7wspafczxcp6qwiz7" }, "stable": { "version": [ @@ -119662,26 +120302,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20250111, - 539 + 20250412, + 624 ], "deps": [ "seq" ], - "commit": "2c0b2b72dc908652914b62a1e64b1d30144839ce", - "sha256": "06zhz1rhh2lwj12dmx4qsixwfavg3mxkp65isnxmg2bvvx4q96mi" + "commit": "e30b9d46e031fd25e794f00f23b6427f44f7d221", + "sha256": "0m4w29fhpzraixqlz36z9b0nl5g5mrvq1iasv56gcjsi0g2m1irp" }, "stable": { "version": [ 9, - 2, + 3, 0 ], "deps": [ "seq" ], - "commit": "ab189d6e89ac4c0f776d691a41ddeaf9730260d1", - "sha256": "176p83c5gjm645qdvw0zcgs5l2yr68l6nyy03rs30b170yah14h6" + "commit": "e30b9d46e031fd25e794f00f23b6427f44f7d221", + "sha256": "0m4w29fhpzraixqlz36z9b0nl5g5mrvq1iasv56gcjsi0g2m1irp" } }, { @@ -119731,26 +120371,26 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20250224, - 2125 + 20250329, + 1401 ], "deps": [ "ivy" ], - "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742", - "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64" + "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429", + "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1" }, "stable": { "version": [ 0, 15, - 0 + 1 ], "deps": [ "ivy" ], - "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742", - "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64" + "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429", + "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1" } }, { @@ -119832,11 +120472,11 @@ "repo": "dimitri/switch-window", "unstable": { "version": [ - 20241028, - 314 + 20250401, + 839 ], - "commit": "61e425e703bee66825c33f4be11fabac1a3d992a", - "sha256": "1wj9rm2yvl72irahq486h78caqqmlf7v1r17ysz69l2kwiqfjidv" + "commit": "8f771b571a1e60fac2d2a9845c0a5a52d5b440df", + "sha256": "0q3zhrylla6knyqjrckdwnwfwhk3pp9mr4zjks9rxccldmr8b1b4" }, "stable": { "version": [ @@ -120956,17 +121596,26 @@ }, { "ename": "tangonov-theme", - "commit": "a3645b08cb46e3d91081da7baa982b5283918447", - "sha256": "1nd3aymqi7xz0j48rmvdlhaqyzqa0bdb615yaygji23zj6a3vy1d", - "fetcher": "sourcehut", + "commit": "f86dc9c83daf2ff759a432bfd78d8931b2b11b84", + "sha256": "194gjn4l3667bzvzph5cd4l7aw0dmdc1ky8bbgg7g050k3cl0qa1", + "fetcher": "codeberg", "repo": "trevdev/tangonov-theme", "unstable": { "version": [ - 20230425, - 1456 + 20250416, + 340 ], - "commit": "bfeafe22d38877d4064670adec55ba1e8d09d830", - "sha256": "1m5rvfp1mlcf2rrj79ah2ssy55nxgwp1h96v92zv8fcpdii4qzrx" + "commit": "cb62069f84c5a475b466e2cc1c252f655c673259", + "sha256": "1zg40smhsjnsrap4mq3vxfq8wncm1lvn2iprby2jdibrmsl66jpg" + }, + "stable": { + "version": [ + 1, + 5, + 1 + ], + "commit": "ab5d75805187018fcd0b698bbc05019477afa94a", + "sha256": "139h5nrzdsi8365hpqhfwfn9xh42j29z2d76mdjz841za3d89yc8" } }, { @@ -121361,25 +122010,25 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20250101, - 927 + 20250316, + 1016 ], "deps": [ "compat" ], - "commit": "12a2072ce97d7489296dbb950da946b77d215506", - "sha256": "1yjp2fk0fzvj9xsshvbha9csranqgrwhf8ggx52qmfn4shssxrn7" + "commit": "f52a99ebf6ee52a30d435ef1583dc8df3e5f2ca5", + "sha256": "1dlrcdyj0l4hbk0xhb3yj88naq4m76n5hfd180qqwjpc83g9fqs3" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "compat" ], - "commit": "40a85c3dc9a7f073e36fb05b835814a4e68fa5b3", - "sha256": "0sh477bx437d3lz6v0m418bk1iwr3mjj8xf396qdi7kiiaic0drz" + "commit": "f52a99ebf6ee52a30d435ef1583dc8df3e5f2ca5", + "sha256": "1dlrcdyj0l4hbk0xhb3yj88naq4m76n5hfd180qqwjpc83g9fqs3" } }, { @@ -121390,14 +122039,14 @@ "repo": "Crandel/tempel-collection", "unstable": { "version": [ - 20241229, - 1149 + 20250410, + 1607 ], "deps": [ "tempel" ], - "commit": "b2fd7929bd767db9d31b2782168f91dcdc75af5b", - "sha256": "0m52k8fx88ry9ay6xs5xaq6j56rx2lykb1jgxmia26xyf4h5ykd9" + "commit": "5cb6bc6b5856c70806ff6b2f952814ff702137c6", + "sha256": "0h295rh21v2li8l5ldajh3nb2fvphnr5lw7s0mmhvwzxg7wk8gnl" } }, { @@ -121834,6 +122483,21 @@ "sha256": "150xvmr5vsydg0197m1k62mwy2810mzh1iwqj9yl9fg47fbzbg0i" } }, + { + "ename": "termint", + "commit": "f427e7fc6e81e4b9d776448a42ab2483c34b893d", + "sha256": "0320hfg3smvjvx9yaca2s725q7y7f27lnxnawh4rm9kp9kb2abar", + "fetcher": "github", + "repo": "milanglacier/termint.el", + "unstable": { + "version": [ + 20250428, + 1400 + ], + "commit": "156af0ecd08b7ae26a516a7d20721659621b78dc", + "sha256": "07sqc5c4nq5mp5rhpmp8rymjyazg3m427zdjbgkrckg4snh3jkxq" + } + }, { "ename": "tern", "commit": "eaecd67af24050c72c5df73c3a12e717f95d5059", @@ -122352,11 +123016,11 @@ "repo": "tanrax/thankful-eyes-theme.el", "unstable": { "version": [ - 20250302, - 1920 + 20250319, + 921 ], - "commit": "5d2e4fdf7b9b7206cfcfbf06f2de3211f9b9e630", - "sha256": "1x9mkk90p4pairhwxlgzz2l3ia1rcaqyhfqvn7npc7ln07nm0cwi" + "commit": "71d5528aa7550be16e92eb5f8d2278775dd1fb1f", + "sha256": "0q7wvamgckd2c28wi4q3xfbcarfax1lm68s5jxlpy7saw18aanfh" } }, { @@ -122591,21 +123255,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20250310, - 1351 + 20250512, + 1242 ], - "commit": "772356bade276e39d537812d57f28a2880f5a72a", - "sha256": "1lhs2ss03fbj89ga522l8pin8c3b6jkj4l9aw8xns6llz569ylys" + "commit": "fb526469d6a6cd85fed2fea4a274479eeee1062a", + "sha256": "0n79yh3yh837d5lnj3f98ldg1rzvncqi07z3y7m15kl7361dz86k" }, "stable": { "version": [ 2025, - 3, - 10, + 5, + 12, 0 ], - "commit": "772356bade276e39d537812d57f28a2880f5a72a", - "sha256": "1lhs2ss03fbj89ga522l8pin8c3b6jkj4l9aw8xns6llz569ylys" + "commit": "fb526469d6a6cd85fed2fea4a274479eeee1062a", + "sha256": "0n79yh3yh837d5lnj3f98ldg1rzvncqi07z3y7m15kl7361dz86k" } }, { @@ -122995,11 +123659,11 @@ "repo": "aimebertrand/timu-caribbean-theme", "unstable": { "version": [ - 20250107, - 1439 + 20250411, + 23 ], - "commit": "ef46da7bf6c3f597a49be9e38aa0acecc07fa587", - "sha256": "16ns9f7600nw4aj6cyi2a43kflyrsrxdp5v1f24w5wa527iqp4dv" + "commit": "ae8fbab1c3fbb14ca797b0207c45d723d7d25b22", + "sha256": "0grg522v4d4affk3s4zh4nzh1d7qmhaw9x1sdi3waki9i3zsn7wn" }, "stable": { "version": [ @@ -123018,11 +123682,11 @@ "repo": "aimebertrand/timu-line", "unstable": { "version": [ - 20250226, - 2325 + 20250228, + 2053 ], - "commit": "b2ad1e2353b2b425537ddf5eb5ebedde5cd826b2", - "sha256": "07kh8raxz6kbak091g2m4hrhnmr49jvxk6qskji19spvfmpzrhy9" + "commit": "b57cc4716ca9ced3ebd8df3e689f6b1a21816f7d", + "sha256": "17hvf57f1iy085crpqzzvcx00r9g1h4asblvb43vxl292bngbiql" }, "stable": { "version": [ @@ -123041,19 +123705,19 @@ "repo": "aimebertrand/timu-macos-theme", "unstable": { "version": [ - 20250306, - 1122 + 20250409, + 41 ], - "commit": "f5810cd705ae7e8c82894847fbbce9eb9556b53f", - "sha256": "0m1j8a6pb77l9v03myw6a6lv8vxl2539nmccgz4shjpn63lmw885" + "commit": "48bf3f4f011efaa0392bd93d7e4d0acd0c159bcb", + "sha256": "196rcv3zjpsb5vpwd4rv4dlds9xbx02jrl3hjinqqjx6xs43bpkd" }, "stable": { "version": [ 1, - 6 + 7 ], - "commit": "f5810cd705ae7e8c82894847fbbce9eb9556b53f", - "sha256": "0m1j8a6pb77l9v03myw6a6lv8vxl2539nmccgz4shjpn63lmw885" + "commit": "699df447695f82b576e9ce9ccb633319b6d5bfc3", + "sha256": "196rcv3zjpsb5vpwd4rv4dlds9xbx02jrl3hjinqqjx6xs43bpkd" } }, { @@ -123064,19 +123728,19 @@ "repo": "aimebertrand/timu-rouge-theme", "unstable": { "version": [ - 20250107, - 1435 + 20250411, + 36 ], - "commit": "143dbef14cff70bd111ca4a6d15ad863146eb9b8", - "sha256": "1iypnzgd2f7p6pgs0g321a0s8g69myx262i25jk13vn1x93qci5z" + "commit": "a9f396ee77c18c1df79b52389e203850446fce56", + "sha256": "13xjmklzsa8ls81r6j2r2lf0dpx40jsklz2ljdsh8igv85vz9kp8" }, "stable": { "version": [ - 1, - 9 + 2, + 0 ], - "commit": "87117f15ea5fcfacbbad23ea6f345d18c2ff0009", - "sha256": "1w67jy0vqmdqq1k2jj60nya8jiwy4kadzyyq534ic9iy9gb4rjan" + "commit": "a9f396ee77c18c1df79b52389e203850446fce56", + "sha256": "13xjmklzsa8ls81r6j2r2lf0dpx40jsklz2ljdsh8igv85vz9kp8" } }, { @@ -123087,19 +123751,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20250107, - 1423 + 20250410, + 2248 ], - "commit": "cc5133287bb4949f8b286e98a7f7f034e06cda07", - "sha256": "1ddsn8a3gx28pnj1fs489nq7m5ci6khk73cg5mpkhk3pjvrxab96" + "commit": "a90616ae0b110920c8be134cb7ffacee75552ac7", + "sha256": "1zh40hgw93lssk3f3k8h3jc0jglgsvm19h9a2151y0sv40fpi6as" }, "stable": { "version": [ - 2, - 9 + 3, + 0 ], - "commit": "0505a7c0d306632972f29e584e83e0cd58eba2ce", - "sha256": "0k4jpfc9m6834gng6w4zab8jh0d4i3dh5yvn89mlznsb9r9d6148" + "commit": "a90616ae0b110920c8be134cb7ffacee75552ac7", + "sha256": "1zh40hgw93lssk3f3k8h3jc0jglgsvm19h9a2151y0sv40fpi6as" } }, { @@ -123569,6 +124233,30 @@ "sha256": "05b4ksay85c8y5ncax0qsvnmplwsfiw24z16a58gkarjz938hb57" } }, + { + "ename": "tomlparse", + "commit": "efe3889c591ea409b56945fadce409e4e87e03ef", + "sha256": "1lk99kyah1hj9b7j8dwaik0892pi44mnpx995nxcp3s2f6fsswap", + "fetcher": "github", + "repo": "johannes-mueller/tomlparse.el", + "unstable": { + "version": [ + 20250512, + 1937 + ], + "commit": "637acb0a1e410b4db9ebe91598fb782c8e6c5ee9", + "sha256": "15l6z2xhd7p168plcr0bh16vjq1fz92blgam7zjs90301mq32kay" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "637acb0a1e410b4db9ebe91598fb782c8e6c5ee9", + "sha256": "15l6z2xhd7p168plcr0bh16vjq1fz92blgam7zjs90301mq32kay" + } + }, { "ename": "tommyh-theme", "commit": "da9b40184e1559c33edd5e6dac6447013710cb79", @@ -123592,20 +124280,20 @@ "repo": "jamescherti/tomorrow-night-deepblue-theme.el", "unstable": { "version": [ - 20250307, - 2022 + 20250408, + 1812 ], - "commit": "5263c0a561913b09d21d9c6e9a32703e7f7d48d5", - "sha256": "17l3gvhv3qp1v0blr7daxaw6wfprd6bx0r75nshhrmaxl11y8vlg" + "commit": "f5e18450e1d1f10dcc5a607f0e3fe82339755992", + "sha256": "0sanaq38q5kdpkbaq738izlgqq5rqnf9y4imz0b36vcgfay3qykb" }, "stable": { "version": [ 1, 2, - 0 + 1 ], - "commit": "cebf87c7c19eff0cb7a81225dc052e21861b12ae", - "sha256": "0gmy84p30g16nhx4scwyyjg2jsisrpki577m9hyiyg7wjwq2x85b" + "commit": "6be1f422f2388a8b39945a1823030d080ed10290", + "sha256": "1qzaygdxhnaqbv7impmh4vli8k7nzk2r0giv4yacd0waq3flqmj6" } }, { @@ -123752,6 +124440,21 @@ "sha256": "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3" } }, + { + "ename": "total-recall", + "commit": "3467337b09004515a0c0bf7ab7ba9d0de0a79bcf", + "sha256": "0s853fccyk23b8wp74kdq2b0i34v93mbrhznrl6rpalza8syjwhp", + "fetcher": "github", + "repo": "phf-1/total-recall", + "unstable": { + "version": [ + 20250511, + 614 + ], + "commit": "e37874a7b78d172ad8c777cb11b16b2c134015c4", + "sha256": "0a6pa09s083mcy89lx28drbr22cjbjlj2pn0ziida6y3c28izf4h" + } + }, { "ename": "totd", "commit": "9dc1e001585e1743047108ace180dfd7664ab8f1", @@ -123987,19 +124690,19 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20240225, - 1112 + 20250421, + 1753 ], - "commit": "6f33a481af6bce68f55b9e25d5c14c1ed46fa9d9", - "sha256": "026dvi4v1dghfv3f2g15h8xz69an3l352kn5krcr6cb4s510b5qm" + "commit": "9d9f63fd7cf8812797eb0ef77d7969e7387a9eb9", + "sha256": "12vq5p3bmqp4gh4s40s8sbz8hs2zczkcl4zfnn7ybr5sc36g1zax" }, "stable": { "version": [ 2, - 13 + 14 ], - "commit": "6f33a481af6bce68f55b9e25d5c14c1ed46fa9d9", - "sha256": "026dvi4v1dghfv3f2g15h8xz69an3l352kn5krcr6cb4s510b5qm" + "commit": "9d9f63fd7cf8812797eb0ef77d7969e7387a9eb9", + "sha256": "12vq5p3bmqp4gh4s40s8sbz8hs2zczkcl4zfnn7ybr5sc36g1zax" } }, { @@ -124137,28 +124840,28 @@ "repo": "magit/transient", "unstable": { "version": [ - 20250306, - 1916 + 20250516, + 1031 ], "deps": [ "compat", "seq" ], - "commit": "4030862396130b3dcfedabe509a4fc6cb218c49f", - "sha256": "0qyc1gp6i8hznz7smab7xlxi76sphl6sy49zlciq7rhl4k87hka8" + "commit": "41b6e06cf56c029465fae72dc4c6e16cfd304e47", + "sha256": "0kcpmldszriwlkrlspphnd06bhgmwj205pyzap624wa32g7hkn31" }, "stable": { "version": [ 0, 8, - 5 + 8 ], "deps": [ "compat", "seq" ], - "commit": "b51a52a9c7a6562c19d03de4ce30b9c071bca8d2", - "sha256": "0f1gdxdj7mrmjmqswlj2lwagr6dpfhkm7732gh0jcgc4iy40vac9" + "commit": "25b994a565ce8035330b0a3071ee430c0282349e", + "sha256": "0m780p5g2jgnbkk3yqs6sbr27gpz0pc2xm13k9cpglclssircg86" } }, { @@ -124434,15 +125137,15 @@ "repo": "tarsius/tray", "unstable": { "version": [ - 20240831, - 2205 + 20250509, + 1455 ], "deps": [ "compat", "transient" ], - "commit": "68d6fa2f2cd7d40c82af6c78b7647a585755c1d1", - "sha256": "1cp9fs2ijnjvf2f409i4wabzk062wl3hv9mc6ipkjgrka1rnvp93" + "commit": "e5a3a52d0bc821aca7aaf01e4d6f7adc052d0c32", + "sha256": "159r0ln2zfdsdpnh6cmhjlcfi2i6l15cq6dwmlciqm09dq9w0pyq" }, "stable": { "version": [ @@ -124613,26 +125316,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20250206, - 19 + 20250511, + 737 ], "deps": [ "tree-sitter" ], - "commit": "2ff446b4b813543b7a90015808d38f362f039b10", - "sha256": "0dnm1iph0ysa797npc9flinyh7vc55lqgv7k5k2gsn3bibm85blc" + "commit": "becd29c756a3272bc91d09de642df99a0fca6cee", + "sha256": "1zfzqmrims95zb8idw138m6zra6bqqc8mj8rxs2k25phbw20biy8" }, "stable": { "version": [ 0, 12, - 264 + 277 ], "deps": [ "tree-sitter" ], - "commit": "ca28bd803de0af069a8a931bc4b3295af02633cc", - "sha256": "03hbb94miz2rd11inp3cmwxzchvwxpkbjgd5p8zs4sl3lzq37w7m" + "commit": "becd29c756a3272bc91d09de642df99a0fca6cee", + "sha256": "1zfzqmrims95zb8idw138m6zra6bqqc8mj8rxs2k25phbw20biy8" } }, { @@ -124643,14 +125346,14 @@ "repo": "purplg/treebundel", "unstable": { "version": [ - 20240531, - 2321 + 20250515, + 2241 ], "deps": [ "compat" ], - "commit": "b0a5d1bf924d8cadde5bae50b8d9ac131279b828", - "sha256": "0smcnpmchm6kgxbdirfw6y17ad4innppab4xzpvvnixhnqbnr655" + "commit": "5c98d9aac3b3859bdfb490436dd8225aaa6f5ae9", + "sha256": "1d510k2cydlslb8ws8zhdmca3vvmnawwgaa2dp5ljq04r71aals9" }, "stable": { "version": [ @@ -124709,8 +125412,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20250105, - 1321 + 20250423, + 2024 ], "deps": [ "ace-window", @@ -124722,13 +125425,13 @@ "pfuture", "s" ], - "commit": "32bb3dd02ddfca85661614b3b227e770fab821e2", - "sha256": "0ys4mn9rgx4mc7s701hz2a4z7ymghbd1248yj26ygal89jpar9sq" + "commit": "820b09db106a48db76d95e3a266d1e67ae1b6bdb", + "sha256": "1gmp3dvji3ank0qh0fhygla2iy9pc2pg07d342wzs1mysgcdj2l8" }, "stable": { "version": [ 3, - 1 + 2 ], "deps": [ "ace-window", @@ -124740,8 +125443,8 @@ "pfuture", "s" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" } }, { @@ -124752,27 +125455,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240131, - 2042 + 20250320, + 2145 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4", - "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" }, "stable": { "version": [ 3, - 1 + 2 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" } }, { @@ -124783,27 +125486,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20241222, - 1336 + 20250320, + 2145 ], "deps": [ "evil", "treemacs" ], - "commit": "011f310eeb51db0ccad7b00b7cbd0f1ccddbb588", - "sha256": "1d988i32j4y3c1w4b5sh4962z2j78nyi4x0r6l4rp171g6649k1v" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" }, "stable": { "version": [ 3, - 1 + 2 ], "deps": [ "evil", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" } }, { @@ -124814,25 +125517,25 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20241017, - 2046 + 20250320, + 2145 ], "deps": [ "treemacs" ], - "commit": "63e80d4b96c2a411da0beaee8a1e46f116e05e27", - "sha256": "1bibbphybx0qbc0w8lhr8zpc9fl9pfcn3721vmjmr3qkh0w695rk" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" }, "stable": { "version": [ 3, - 1 + 2 ], "deps": [ "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" } }, { @@ -124843,29 +125546,29 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240131, - 2042 + 20250320, + 2145 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4", - "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" }, "stable": { "version": [ 3, - 1 + 2 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" } }, { @@ -124908,29 +125611,29 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240131, - 2042 + 20250320, + 2145 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4", - "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" }, "stable": { "version": [ 3, - 1 + 2 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" } }, { @@ -124941,29 +125644,29 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240131, - 2042 + 20250320, + 2145 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4", - "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" }, "stable": { "version": [ 3, - 1 + 2 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" } }, { @@ -124974,27 +125677,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240131, - 2042 + 20250320, + 2206 ], "deps": [ "projectile", "treemacs" ], - "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4", - "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7" + "commit": "f80a309319c2374585babcb3e00ea6f3314160f3", + "sha256": "0b7k6nq6nqbw5qbia4srg1ci6c078f3ziwz1jpn2gmiy1w1parcc" }, "stable": { "version": [ 3, - 1 + 2 ], "deps": [ "projectile", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" } }, { @@ -125005,27 +125708,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20241202, - 2117 + 20250320, + 2145 ], "deps": [ "dash", "treemacs" ], - "commit": "4364a660447fa5f322c172f6b310115bbc091d12", - "sha256": "0kaj5yhi9380xhdgkybn6qwlm92d8j53rd00qf516nvwjg1fsnys" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" }, "stable": { "version": [ 3, - 1 + 2 ], "deps": [ "dash", "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d", + "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih" } }, { @@ -125623,26 +126326,26 @@ "repo": "szermatt/turtles", "unstable": { "version": [ - 20250113, - 1249 + 20250315, + 1650 ], "deps": [ "compat" ], - "commit": "3b7a9fdfd5b12decaef86e4988314e5a027959bb", - "sha256": "0rrkbmdjlr26yphfagsbdkl9ndprkm9ag2y9cgmzml6g2m7jpai9" + "commit": "7dca66a67173c63b27d5c6d8aa3e0248fd7f8b83", + "sha256": "1p87ll90v30z62a3wqs0s3zyabz4a38p56zkgqx3pxgfk82drzsf" }, "stable": { "version": [ 2, 0, - 0 + 1 ], "deps": [ "compat" ], - "commit": "08bd2c218f1ab75711c62bfa549beb2094009270", - "sha256": "0gwnsrfiiizcrcccbs3pyx030wydg6xmh7vy9r7lvbh8hmxghbyg" + "commit": "c46eb01d73601449f8ae48786bb8f22d17f137da", + "sha256": "1cipfgzx8ws79lzx7dfqr9lbirxf5fl332y8m5wz46455421avgi" } }, { @@ -125758,15 +126461,15 @@ "repo": "tmalsburg/txl.el", "unstable": { "version": [ - 20240916, - 618 + 20250318, + 726 ], "deps": [ "guess-language", "request" ], - "commit": "b60b2127cd342d54cb4f54984e84f6e39da68678", - "sha256": "101kj77jvdkjlnn64h6k8x3flwi0qxmr3ydagarn8as9dvxxsf6l" + "commit": "95064614df192c563b37e6135f5986c786a6826e", + "sha256": "0rxq13nviz7681ajmlklys87iwv6i940r5jk8z06dxxp8a7a65ri" } }, { @@ -126767,14 +127470,14 @@ "repo": "tbanel/uniline", "unstable": { "version": [ - 20250309, - 1626 + 20250515, + 652 ], "deps": [ "hydra" ], - "commit": "6ee84401a55f446f53cb2785760914dbd85aa36a", - "sha256": "1rb06224xn5zwfw4wm8ih847qg8122g5x53h20ac61pwlpi1hzwr" + "commit": "1d95cda103cdb3eaba18c39598472b88d1792663", + "sha256": "1ab28yhqwp0w635swxl9n6n6bmknkzw49q8nddasyyaydmjslwgv" } }, { @@ -127267,11 +127970,11 @@ "repo": "ursalang/ursa-ts-mode", "unstable": { "version": [ - 20240927, - 1611 + 20250407, + 1303 ], - "commit": "9d2b4059511979fb9d09b3287b8fc64b510adbd1", - "sha256": "115f1caaxgqfngpmpbpkx5hcjpyj3n3h5wvvk4ypaffc2m4k1b7y" + "commit": "25dd8c309ad9433a5bb57b47b947447c420efb77", + "sha256": "02nkfaz8wwb3fywvig21br7m4rd6xk7gz04izv6vya9fsybphd2a" }, "stable": { "version": [ @@ -127330,8 +128033,8 @@ "repo": "waymondo/use-package-chords", "unstable": { "version": [ - 20241115, - 2228 + 20250330, + 1852 ], "deps": [ "bind-chord", @@ -127339,8 +128042,8 @@ "key-chord", "use-package" ], - "commit": "a2b16a1e64b19ae9428a6cd8f3e09b8159707a29", - "sha256": "0krskz087vy4iws01w5wxsn7b0pkncsn6s1vj9ywagn5i1z6a34x" + "commit": "0793b50e2bf1ec8bfc532b10baeef716c5aa947a", + "sha256": "0dkiic5yrdmjkyrahm10ggx0scp4ixqbb184i55f6fpf8yvy6nd8" }, "stable": { "version": [ @@ -127483,11 +128186,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20240421, - 702 + 20250421, + 1055 ], - "commit": "c4df85ac38b270628c4dacd9f6fb1da197f5aedd", - "sha256": "0fjws4y6njbcbz36kv5d85fn71026vw7ywd5vv1b4s39qzlyjqzi" + "commit": "179f50ea3c46ab99d7c8635ef1f8753e485ce689", + "sha256": "0alfr11mldchiwns7s471m7xcpabi5vq7n55pmcyg8r7i5d0qg1k" } }, { @@ -127584,11 +128287,11 @@ "repo": "kborling/uwu-theme", "unstable": { "version": [ - 20250308, - 155 + 20250416, + 117 ], - "commit": "c68f7698ebae174fd72ef7ef88b4b42829e1ee73", - "sha256": "0p0hgp9k92x6fc7sfg8drpzjqrlfz811vfr7grqri9a2zgbrqsbn" + "commit": "13baeac7649762d8d0220d954c177c5aeb1d3b1b", + "sha256": "0xvdax4w28rpzyb9gy7ixpdyzikfiqax8b5n04dc3xdvjrmiyyyq" } }, { @@ -128248,15 +128951,15 @@ "repo": "applied-science/emacs-vega-view", "unstable": { "version": [ - 20210401, - 1115 + 20250327, + 1716 ], "deps": [ "cider", "parseedn" ], - "commit": "3793025a523a86acc6255b4183b12ebfc95e1116", - "sha256": "0w8v0ivwq3i42mxfxk5zvlx1lz4di06dpd93j2j13ns5h46vxhc0" + "commit": "36e7cc84b25e67b50c5ca677d5ca0f7b7c27469f", + "sha256": "18xl1m25v5yp2g5fbsb5vbm5708mdv633a5ad1nj5pak228p6lhk" } }, { @@ -128297,20 +129000,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20250309, - 2043 + 20250318, + 2150 ], - "commit": "151ed6bbfff71939a1481b60b9cfd2d720d56785", - "sha256": "1wh0a7ilgdm76xjpjcj7salxbkgcacyks5rkjdx41kl1r0rbsc63" + "commit": "2e778afd08b8a9872b8273528052f52d53c2bd45", + "sha256": "12y2shqhbl21xj18hldg17n03pq3qcycwmswxdwr0pnac8613pq6" }, "stable": { "version": [ 3, - 0, + 1, 0 ], - "commit": "2c46542a64e79919496f5a8255b7321f6ba00fd1", - "sha256": "0kkdlckbmj8sq1r8if53c6hdqgy92vxvcx5c2dm8byndmjnqqc2n" + "commit": "2e778afd08b8a9872b8273528052f52d53c2bd45", + "sha256": "12y2shqhbl21xj18hldg17n03pq3qcycwmswxdwr0pnac8613pq6" } }, { @@ -128358,8 +129061,8 @@ "repo": "gmlarumbe/verilog-ext", "unstable": { "version": [ - 20250225, - 2258 + 20250318, + 1344 ], "deps": [ "ag", @@ -128374,8 +129077,8 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "f742d531412733b0217147eb862fecfa09fa3753", - "sha256": "04iwmybmgasz12gc2ghqm36q36537srgkz4c6w3s836sg3ahzljm" + "commit": "028bac2b106079c147dddfc361e60b644b449426", + "sha256": "0sfv0ilakg2rgycfw6ab9mp2afcfw7cfirdwlp8pxmjj653sv45v" }, "stable": { "version": [ @@ -128408,14 +129111,14 @@ "repo": "gmlarumbe/verilog-ts-mode", "unstable": { "version": [ - 20250303, - 1538 + 20250320, + 1821 ], "deps": [ "verilog-mode" ], - "commit": "dc26feeff79afb4206723f5b7e0d69f0baec298c", - "sha256": "009kzdkvvpv4r329d03bciz890d2sbcil5b6i2z5s7f4gf861fjn" + "commit": "7f5682603de99ff8922f108ab42066a48ba85b6a", + "sha256": "1plczm4pdivqjxj905z5k8k974p1hxwx6018j1ba3jnqlw3ig4q7" }, "stable": { "version": [ @@ -128498,14 +129201,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20240917, - 1129 + 20250314, + 927 ], "deps": [ "yasnippet" ], - "commit": "1b6f234c81aaf1b0f0e445d1ad91a7580a4c8630", - "sha256": "1rw0j11x8mq8lm9pvp35qhdl217w40i1d16d8bcm69lwrfkx39kf" + "commit": "5a77be72074c196cc419852d58c14703ff5ba55a", + "sha256": "06gla1xi27hwhlj7gw1ryzzjf1mmr4mz304djlrgsp1hgs9q2q7c" } }, { @@ -128516,25 +129219,25 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20250311, - 1655 + 20250516, + 1842 ], "deps": [ "compat" ], - "commit": "026a81a9c893b1d73cdbcb12436a0fad3ebdeb5f", - "sha256": "0qgw0mhfrjylhyznjmjf7wqs5p3xvdv0lq19pql54plbnr6fspqk" + "commit": "54829f61034c9408cf620dac1e6af304f38d79ed", + "sha256": "1qh2hcddkv3cbc0wbynyk8jny43mkr2gwl7vl8dch3276w43iqri" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ "compat" ], - "commit": "026a81a9c893b1d73cdbcb12436a0fad3ebdeb5f", - "sha256": "0qgw0mhfrjylhyznjmjf7wqs5p3xvdv0lq19pql54plbnr6fspqk" + "commit": "3e1e55319fb377a59954ebce4acf772dbb5c9b10", + "sha256": "1cyqk67lxc7c8mzzbj9mxb10afq3ahbgpsyjdzz0hjf03qi8pbzd" } }, { @@ -128623,8 +129326,8 @@ "repo": "gmlarumbe/vhdl-ext", "unstable": { "version": [ - 20241205, - 1630 + 20250318, + 1348 ], "deps": [ "ag", @@ -128636,8 +129339,8 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "3f5f0778e87d9d4272903797a2366e603f9f1641", - "sha256": "0vgmhsgrh8x8br5grnh1jnf01r2q148xxyf028jgaq09wwjkdvkc" + "commit": "277cfaa9a1a4fa051ae94b331c59a02336adbafe", + "sha256": "13rj7ahh6pplpclgdjq1l59lf073s26wwwxp49fk9dwzphb9yq84" }, "stable": { "version": [ @@ -128700,11 +129403,11 @@ "repo": "gmlarumbe/vhdl-ts-mode", "unstable": { "version": [ - 20250110, - 117 + 20250318, + 1346 ], - "commit": "0c0b8f769de13f9e63d84032e50bd4a8578335ed", - "sha256": "0n2x8ghh5n28v5nzlks5yf9wh38cyd9l7kvwad9qmwxga0mm36sr" + "commit": "3fb4af3653323979eb66b4c01f850fa03335046a", + "sha256": "19v3l37qzhkl22ignn5a8j0fw4az1gc185j4cs9rfh6byq8glpi3" }, "stable": { "version": [ @@ -129035,20 +129738,19 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20250204, - 2336 + 20250323, + 1529 ], - "commit": "d4464130a21733671a53f915a697dea65888473f", - "sha256": "1a7xqc4cnpwy8rd4grp539zmb7qaqjvx906qbzdixcb3dq7szj3b" + "commit": "30fc3e4ea9aa415eccc873e5d7c4f1bbc0491495", + "sha256": "0sy01jx8z229ival3y4bj0jrb3w2ys8kiw3bmy6ssjwbl7xlyxxj" }, "stable": { "version": [ 2, - 6, - 3 + 7 ], - "commit": "e04d3521b6dc2435de4c4a4b9cac5feb194f0d5b", - "sha256": "1bsymwzpvp4rqljidrixp3kc7kxjwsy5mkap6jw9rvpm6apy3b0n" + "commit": "30fc3e4ea9aa415eccc873e5d7c4f1bbc0491495", + "sha256": "0sy01jx8z229ival3y4bj0jrb3w2ys8kiw3bmy6ssjwbl7xlyxxj" } }, { @@ -129119,11 +129821,11 @@ "repo": "szermatt/visual-replace", "unstable": { "version": [ - 20250102, - 2043 + 20250324, + 1842 ], - "commit": "a2ae4d0116192d34d5142857cb7c27c8091c4da5", - "sha256": "054z8p1kw698ifigcx5pyb8wnz988h0k2hny89515n84p3d0z0m0" + "commit": "2897c4b323cf38b58a23a78ecb5b081192dea3b7", + "sha256": "0xvdn4y5w5d49cmjkmd2s1jjc8kjm683i96x310k45hp7hvq11px" }, "stable": { "version": [ @@ -129225,11 +129927,11 @@ "repo": "k-talo/volatile-highlights.el", "unstable": { "version": [ - 20240913, - 2206 + 20250402, + 1217 ], - "commit": "afccb5ce83848c3daa937098da83af45b50b71b4", - "sha256": "0rlqwj6whxbvzgkf78d8arjva49aphj4bd2wkpv8djykcmi8nf6m" + "commit": "ca4c7fed9d85d5f5119e9a0f895629804dcb2e99", + "sha256": "1bj0klr1zcbnfrmqld9dync5dh9v6yaaw72xpcyq6cm7sanhfcp3" }, "stable": { "version": [ @@ -129255,6 +129957,21 @@ "sha256": "1vyl13swx82njqlfzmaj9c4vbdpdsj4m9f8v32a9kycdhbm9x90z" } }, + { + "ename": "votd", + "commit": "97bc76fa5779c6be203d9f8f492969ec576771f8", + "sha256": "16yil98znnvryrfihpkyjj02xwwhzm5aj6ykiq7mbp5hdg18b7lz", + "fetcher": "github", + "repo": "kristjoc/votd", + "unstable": { + "version": [ + 20250424, + 1603 + ], + "commit": "2a8e2348714f4aaf3edec20d47bbec12e6603141", + "sha256": "1g0ln9gh22zhc2j13bnw5j12gyahf7myz696nmqn0z7r87ji83hd" + } + }, { "ename": "vs-dark-theme", "commit": "094a9cbc18882daa4f2efd3d72bb0a34e6bd9f63", @@ -129263,11 +129980,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20250211, - 133 + 20250408, + 452 ], - "commit": "8fac750fc562f89c94bfa76ea2032f90a0cb4237", - "sha256": "01qi23f723574jklayig8ngvaf4gc8s24f2zy6wci3177dzgr0vq" + "commit": "12ba997de72db95effae672d9615e7dcba56dd9f", + "sha256": "1rzdvj0br5rjqs1kmvhx6wrp7jpp6nxwh82r4jk3p2qjhqkxlhxs" }, "stable": { "version": [ @@ -129286,11 +130003,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20250211, - 133 + 20250408, + 453 ], - "commit": "3690bb3eea3863bc81e6864b3f34546d9660b86e", - "sha256": "120rar8gpm878jbjngz7w7g2gjap1v31amxg3v00464qkqvqhdyd" + "commit": "a561237f191048e505b72899b4a6c340a8e5e7f1", + "sha256": "0jqan8wg7fbch26ic1r328sjzd3l7w0lqcc9hf77m1qhqfpc64ja" }, "stable": { "version": [ @@ -129494,6 +130211,25 @@ "sha256": "014vx8jkscj1c614v78dqlqlg7n0zc3c2db3dqvxvaz417i5mxq0" } }, + { + "ename": "vue3-mode", + "commit": "56a4bae74ba5f3bd079884cddac745f92768dc00", + "sha256": "0ihwnkx7zb8sf97ayppvylp2hy2m44w6rzvjdznvhy8srj4p6z28", + "fetcher": "github", + "repo": "vsalvino/vue3-mode", + "unstable": { + "version": [ + 20250331, + 1625 + ], + "deps": [ + "polymode", + "vue-html-mode" + ], + "commit": "a1ad84c0cc5ea100dd11aeae9b52669918830730", + "sha256": "109hg79556jfsgb3i23drmsgrfs34ky1jacxwq8mzc18ci2ddv00" + } + }, { "ename": "vuiet", "commit": "4f63056cf2f637fcb3426851501eeff5e6f40bb3", @@ -129655,11 +130391,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20250226, - 28 + 20250503, + 2349 ], - "commit": "dbae2cc7020be1622eb116e6b5b2d79311c1bfd5", - "sha256": "08aglcga9lnzzjcn2vsmdw7cfvmkrnywww00fzi66px32d56xfhb" + "commit": "fc0f30f96a69bae4d4c92f42bceafb8ccf2a72ec", + "sha256": "0imb71q2kv41l8l5kqv16anm2hir447aj5ys1irzq2ygk5h7b01g" } }, { @@ -129747,11 +130483,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20240609, - 1601 + 20250405, + 1416 ], - "commit": "85a96e0476d620add31e6e73481dbcf57cabc13e", - "sha256": "0fr70jmrcnyyl16h0k6kj3gcd50422ggqps688wa7x51dk6f9cvr" + "commit": "07258b0293c9f31ba11bd89298b9f90eb232a94c", + "sha256": "0b3a800165rx58dvvsmlvz3gkxdgnimkxzdpxxzc1msac7dccl7b" }, "stable": { "version": [ @@ -129844,6 +130580,27 @@ "sha256": "1ya91159i58x4mccpnx429kq2k0xc04alikbly549qm8yw1y1hxg" } }, + { + "ename": "wallabag", + "commit": "68fed6e91a9466bed7153e529ec81a5b7c778f16", + "sha256": "0ppndh6f4z08mnj4zzqbwabz6hqirisn7yz0grmlfcp61iingjh5", + "fetcher": "github", + "repo": "chenyanming/wallabag.el", + "unstable": { + "version": [ + 20250421, + 1046 + ], + "deps": [ + "emacsql", + "gptel", + "request", + "s" + ], + "commit": "5f4da856ef31bea112c6d0491ee22339c1acd725", + "sha256": "19h09yklgm05nkv37325whmj7a3zippvhhzq1p5kqmp9dns7q00g" + } + }, { "ename": "wallpaper", "commit": "764c5b8438197d6f24113e7b3a696b8327a8d6d9", @@ -129929,16 +130686,16 @@ "repo": "emacsmirror/wanderlust", "unstable": { "version": [ - 20241125, - 2206 + 20250422, + 1943 ], "deps": [ "apel", "flim", "semi" ], - "commit": "dddd7d64f27747cfa546d6656beee6ec4e5c55cf", - "sha256": "0qd6d6yd2sr3mv8wb22py7yvnib6nk9jpqfj0fkib0x0w9anfxz8" + "commit": "7113fd9a8bf0aa1e9e489e8110e3b0313645e522", + "sha256": "0kh06cf5f6ld8nd869dsv9b58sajb179kwjg30n8vspqymnx51l5" } }, { @@ -130009,11 +130766,11 @@ "repo": "gmlarumbe/wavedrom-mode", "unstable": { "version": [ - 20240329, - 1800 + 20250318, + 1349 ], - "commit": "758a29e975e76ad616bbe18b657a5ce78fd32d32", - "sha256": "091aagn1mi1in4kn94b2cvcw0hfm7zfypgsc7gg5bq8hklg000vq" + "commit": "249aec11fdab12ae6228c2bc2580b581d16e3443", + "sha256": "1anw072va8w3648zdb62437mjg76b098jq6jhy0bc3qpbxb74cai" }, "stable": { "version": [ @@ -130155,6 +130912,24 @@ "sha256": "0qx92jqzsimjk92pql2h8pzhq66mqijwqgjqwp7rmq5b6k0nvx1z" } }, + { + "ename": "weather-scout", + "commit": "dd2f50bb59565270066e25950c044d245d86e2f2", + "sha256": "13r2iv85p823kidllbz24x0lhnhraw46x26178qgqz0b9cqpmcqq", + "fetcher": "github", + "repo": "hsolg/emacs-weather-scout", + "unstable": { + "version": [ + 20250427, + 2030 + ], + "deps": [ + "persist" + ], + "commit": "11c749204d6720a3265fe0a32dcf81777fd18455", + "sha256": "05agfay28bvc30nc0pwh3jvia2fmq6psv2aa5abivppqya396rrs" + } + }, { "ename": "web", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -131525,11 +132300,11 @@ "repo": "dgtized/winnow.el", "unstable": { "version": [ - 20210105, - 1919 + 20250502, + 1745 ], - "commit": "c3beff15688481162d14ae8600f59a366bb4c829", - "sha256": "1clrfdhjx4570bww84iqkh5xqm2rv8ayvz1cqcq6lw1z735nd0rm" + "commit": "858e74314c06c060596d6e6119471deef759be4d", + "sha256": "1klplaqi6q3a4dxjmw19h6g2a92qp6wjj18l49is9rsks3s6rv3j" } }, { @@ -131664,14 +132439,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20241201, - 1419 + 20250509, + 1455 ], "deps": [ "compat" ], - "commit": "ca902ae02972bdd6919a902be2593d8cb6bd991b", - "sha256": "0h21qs60qihv4p72x5wbmc0xly4g74wc25qj8m9slfbc4am9mwys" + "commit": "cc86ac08bdea5bbe2503ac1df3506b5e81330e16", + "sha256": "04sn4xk643q42xr8x6i5d36vh25rrvalsw6gdm1wq2cd4xwd4h7b" }, "stable": { "version": [ @@ -132338,17 +133113,17 @@ }, { "ename": "ws-butler", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1k5nhj37r51i0czrlafra53wir73p0nbq83jjccqmw4p4xk6axl3", - "fetcher": "github", - "repo": "lewang/ws-butler", + "commit": "3b41910f55e0c8e10668c788614cd61c480e860b", + "sha256": "1amzz3xjxf3gp7qfxf33pclk82iwnlcm462iy4fz3ikvck08cbbz", + "fetcher": "git", + "url": "https://git.savannah.gnu.org/git/emacs/nongnu.git", "unstable": { "version": [ - 20241107, - 519 + 20250310, + 205 ], - "commit": "d3927f6131f215e9cd3e1f747be5a91e5be8ca9a", - "sha256": "17f73isx2wdwzjcxparyy7ngl4cha0g69da1d72b3yidzim1kh6h" + "commit": "9ee5a7657a22e836618813c2e2b64a548d27d2ff", + "sha256": "0ivpgib2bxv7x6cp04mj8crc1a60d7c77jcc59sj14scq4jqbmjb" }, "stable": { "version": [ @@ -132512,14 +133287,14 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20250225, - 632 + 20250317, + 1016 ], "deps": [ "compat" ], - "commit": "fe2ebffaf4f1d876108df5c386ae55e0154eed02", - "sha256": "0fgfvr64gbdfgqjvng5bqg2jpg5s5d99di77fn3vfkay2zadpmji" + "commit": "a59a548f087bfad4f81d9410b6facdcf0fdd98f9", + "sha256": "15mypcysz2f4f027j7k9yh6inrj24dllpiqxjc89srw8j6k770qb" } }, { @@ -132642,8 +133417,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20250103, - 1420 + 20250318, + 1613 ], "deps": [ "aio", @@ -132653,8 +133428,8 @@ "f", "s" ], - "commit": "6d9a8d654a6102484ac9087f25931f0664e7dd07", - "sha256": "1sasm6rrhvsqndcwm74cgmlk96g2wx81fk9z32rq095yvim4y5qq" + "commit": "de8bce9af99476b58742679a77ac09bdb7ea0c76", + "sha256": "0jmhfrj0gk9zlgn6d9wkaml3mrk9jzc8awc7q2mi3cwzbw1x94af" }, "stable": { "version": [ @@ -132700,11 +133475,11 @@ "repo": "captainflasmr/xkb-mode", "unstable": { "version": [ - 20240506, - 904 + 20250421, + 840 ], - "commit": "b1de5233dc12749a97ad6a63d86b921bf1e33d3b", - "sha256": "0lhmr10k8vszfmq6s0x2vilxf15chci0lhf3990jwnl0y8x08i33" + "commit": "0e317a08dd665bfa8d1bbfbe23c7ca3ae0975519", + "sha256": "0l2jnqzn219dc7s4arbinhnpv4a4853xzwsvlfhkjkjq9p86vqnw" }, "stable": { "version": [ @@ -133381,11 +134156,11 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20250208, - 1534 + 20250316, + 1721 ], - "commit": "09e46d563f1f3ff948852e08360c7d3c76e2acba", - "sha256": "131g2nv18fjcqgc9v17b0a7zyw2m6ydbhj6riahihd340bci2s6w" + "commit": "f99ef76c80e6fc3fcf650c4fe34e10726594a4c4", + "sha256": "1fpfyrbi8dzbcck0k1whszqr9qmyw4x6rk68sxzz7zr5sqw69172" }, "stable": { "version": [ @@ -133459,26 +134234,26 @@ "repo": "zkry/yaml-pro", "unstable": { "version": [ - 20241223, - 1723 + 20250418, + 447 ], "deps": [ "yaml" ], - "commit": "f7706ea170de98d29b7cdd5a4f189bd038b1e27b", - "sha256": "0gx6sxr68bbmqv6rbs9gd4kfgw0avg2fqgbwq14n35yfgr18xc7l" + "commit": "dd3e14adc0f1bc9483ac32fccedceeefeb3533d9", + "sha256": "0pj5rnj77ia3g9bx2yhhwg971ma880j30gakdg8fx21396wx2h4v" }, "stable": { "version": [ 1, 3, - 1 + 2 ], "deps": [ "yaml" ], - "commit": "f7706ea170de98d29b7cdd5a4f189bd038b1e27b", - "sha256": "0gx6sxr68bbmqv6rbs9gd4kfgw0avg2fqgbwq14n35yfgr18xc7l" + "commit": "dd3e14adc0f1bc9483ac32fccedceeefeb3533d9", + "sha256": "0pj5rnj77ia3g9bx2yhhwg971ma880j30gakdg8fx21396wx2h4v" } }, { @@ -133678,14 +134453,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20250112, - 1504 + 20250403, + 1926 ], "deps": [ "cl-lib" ], - "commit": "03b1b11547eab76851574eadd18e2ad186b2a080", - "sha256": "14rmv13110x9ljj1kf3qji1dl7rgag88chrqkvh21w0q0cil4miz" + "commit": "2384fe1655c60e803521ba59a34c0a7e48a25d06", + "sha256": "118iv62izrdrwvhndhfq5ywgdrv2gsl53623sqw69w1gln17v31h" }, "stable": { "version": [ @@ -133726,14 +134501,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20250225, - 950 + 20250507, + 2002 ], "deps": [ "yasnippet" ], - "commit": "46945ccf63122190dc564af4ec26f828eaa29b43", - "sha256": "0ab7b033lvvh6ijzg9y27wbhzwcqyp0829jzn5fqy63m7a4lwihy" + "commit": "48e968d555afe8bf64829da364d5c8915980cc32", + "sha256": "04w2lk4y7x47b6rc4a2z3rypxy5n2sln6p8hr0wh4msfq11iy4wx" }, "stable": { "version": [ @@ -134548,14 +135323,14 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20230517, - 2020 + 20250405, + 1601 ], "deps": [ "org-roam" ], - "commit": "73f691989c094ec196bb614318ae51b60209a8de", - "sha256": "1p0609v6510miaa7x10va0sa1ggnd9r6i48hrw2i98sv2lnpxpva" + "commit": "0196835c5d6df65d46a4f642b716e6901ad0f4c1", + "sha256": "16s3mllq6l0h04a467k4rb0pp3i17dbmrcy9xhrs2mxxsczpbw1z" }, "stable": { "version": [ @@ -134578,14 +135353,14 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20230517, - 2020 + 20250405, + 1601 ], "deps": [ "zetteldesk" ], - "commit": "73f691989c094ec196bb614318ae51b60209a8de", - "sha256": "1p0609v6510miaa7x10va0sa1ggnd9r6i48hrw2i98sv2lnpxpva" + "commit": "0196835c5d6df65d46a4f642b716e6901ad0f4c1", + "sha256": "16s3mllq6l0h04a467k4rb0pp3i17dbmrcy9xhrs2mxxsczpbw1z" }, "stable": { "version": [ @@ -134608,16 +135383,16 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20230517, - 2020 + 20250405, + 1601 ], "deps": [ "hydra", "major-mode-hydra", "zetteldesk" ], - "commit": "73f691989c094ec196bb614318ae51b60209a8de", - "sha256": "1p0609v6510miaa7x10va0sa1ggnd9r6i48hrw2i98sv2lnpxpva" + "commit": "0196835c5d6df65d46a4f642b716e6901ad0f4c1", + "sha256": "16s3mllq6l0h04a467k4rb0pp3i17dbmrcy9xhrs2mxxsczpbw1z" }, "stable": { "version": [ @@ -134642,15 +135417,15 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20230517, - 2020 + 20250405, + 1601 ], "deps": [ "bibtex-completion", "zetteldesk" ], - "commit": "73f691989c094ec196bb614318ae51b60209a8de", - "sha256": "1p0609v6510miaa7x10va0sa1ggnd9r6i48hrw2i98sv2lnpxpva" + "commit": "0196835c5d6df65d46a4f642b716e6901ad0f4c1", + "sha256": "16s3mllq6l0h04a467k4rb0pp3i17dbmrcy9xhrs2mxxsczpbw1z" }, "stable": { "version": [ @@ -134674,15 +135449,15 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20230517, - 2020 + 20250405, + 1601 ], "deps": [ "org-remark", "zetteldesk" ], - "commit": "73f691989c094ec196bb614318ae51b60209a8de", - "sha256": "1p0609v6510miaa7x10va0sa1ggnd9r6i48hrw2i98sv2lnpxpva" + "commit": "0196835c5d6df65d46a4f642b716e6901ad0f4c1", + "sha256": "16s3mllq6l0h04a467k4rb0pp3i17dbmrcy9xhrs2mxxsczpbw1z" }, "stable": { "version": [ @@ -134801,8 +135576,8 @@ "repo": "WillForan/zim-wiki-mode", "unstable": { "version": [ - 20241020, - 2315 + 20250425, + 2345 ], "deps": [ "dokuwiki-mode", @@ -134811,8 +135586,8 @@ "link-hint", "pretty-hydra" ], - "commit": "8afce06846b9b8c62e7eeb2ac874ee4f68f31616", - "sha256": "09qijra2pfy2lrjlx7pkpqd5z1ba3ck4i6nwbyfb7cq2q0irclpx" + "commit": "a6ddbdfe41ddb1f445d3480801f1db0f000c31a2", + "sha256": "18z3h7vc1wzqlx3byp00jwhp03shs852zi8s0rp2kmrjs61svq3x" } }, { @@ -134841,11 +135616,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20241205, - 926 + 20250405, + 2035 ], - "commit": "2bd80f73485927a081d06a754d7f299b1350c5e7", - "sha256": "14kszbnd0yj5y2q0ba71a0r969b6nwz8sij84h2g3aqdlnnj7f6m" + "commit": "38703add4740e54862e406b44e38269b7d65671d", + "sha256": "01yp2a7nd0v82f37b6c1kiaxfpvscg1s0kgswa5wkz5a1x7q02c9" }, "stable": { "version": [ @@ -134895,14 +135670,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20241006, - 1334 + 20250405, + 2034 ], "deps": [ "zk" ], - "commit": "297ebd0df13c957f4ba9700cafc5466dafacc5cb", - "sha256": "0r6frhdpakzjrh6qhcr913jcf95ncbs0rsfdgkrka5d5gkrdds41" + "commit": "181e2ed7206fd168e8eca315a63e90871bb7562f", + "sha256": "03q344pjycp6nz9sraby5r0iscpv6y8pqps6ym60z920scadyyap" }, "stable": { "version": [ @@ -134924,15 +135699,15 @@ "repo": "localauthor/zk-luhmann", "unstable": { "version": [ - 20240926, - 1827 + 20250406, + 844 ], "deps": [ "zk", "zk-index" ], - "commit": "fef5cace6ac12a86ba9a8d4abc80e87699966f8c", - "sha256": "011mg8wpgw6wzmrqbyfvxsqlm0jw91p2jpr5nw64zpb5dvaq5bxy" + "commit": "1fe0d9053b603037898530ae8aa6361c4e409e46", + "sha256": "1gphp973a4msciy0xcfpkw8nmdvn23d5chg7qjqq7a93rpyx3qir" } }, { diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el b/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el index 9cb6456cd6f9..97343135ef0e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el +++ b/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el @@ -101,7 +101,7 @@ return Promise to resolve in that process." ("gitlab" (list "nix-prefetch-url" "--unpack" (concat "https://gitlab.com/api/v4/projects/" (url-hexify-string repo) - "/repository/archive.tar.gz?ref=" + "/repository/archive.tar.gz?sha=" commit))) ("sourcehut" (list "nix-prefetch-url" "--unpack" (concat "https://git.sr.ht/~" repo "/archive/" commit ".tar.gz"))) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index ef8a5d923822..1a1211d6bf84 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -66,7 +66,11 @@ zlib, # Boolean flags - withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + + # FIXME: Native compilation breaks build and runtime on macOS 15.4; + # see . + withNativeCompilation ? + stdenv.buildPlatform.canExecute stdenv.hostPlatform && !stdenv.hostPlatform.isDarwin, noGui ? false, srcRepo ? true, withAcl ? false, @@ -78,7 +82,8 @@ withGTK3 ? withPgtk && !noGui, withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets), withGpm ? stdenv.hostPlatform.isLinux, - withImageMagick ? lib.versionOlder version "27" && (withX || withNS), + # https://github.com/emacs-mirror/emacs/blob/master/etc/NEWS.27#L140-L142 + withImageMagick ? false, # Emacs 30+ has native JSON support withJansson ? lib.versionOlder version "30", withMailutils ? true, @@ -86,13 +91,13 @@ withNS ? stdenv.hostPlatform.isDarwin && !(variant == "macport" || noGui), withPgtk ? false, withSelinux ? stdenv.hostPlatform.isLinux, - withSQLite3 ? lib.versionAtLeast version "29", + withSQLite3 ? true, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, withToolkitScrollBars ? true, - withTreeSitter ? lib.versionAtLeast version "29", - withWebP ? lib.versionAtLeast version "29", + withTreeSitter ? true, + withWebP ? true, withX ? !(stdenv.hostPlatform.isDarwin || noGui || withPgtk), - withXinput2 ? withX && lib.versionAtLeast version "29", + withXinput2 ? withX, withXwidgets ? !stdenv.hostPlatform.isDarwin && !noGui @@ -114,21 +119,6 @@ "lucid" ), - # macOS dependencies for NS and macPort - Accelerate, - AppKit, - Carbon, - Cocoa, - GSS, - IOKit, - ImageCaptureCore, - ImageIO, - OSAKit, - Quartz, - QuartzCore, - UniformTypeIdentifiers, - WebKit, - # test callPackage, }: @@ -139,6 +129,7 @@ assert noGui -> !(withX || withGTK3 || withNS || variant == "macport"); assert withAcl -> stdenv.hostPlatform.isLinux; assert withAlsaLib -> stdenv.hostPlatform.isLinux; assert withGpm -> stdenv.hostPlatform.isLinux; +assert withImageMagick -> (withX || withNS); assert withNS -> stdenv.hostPlatform.isDarwin && !(withX || variant == "macport"); assert withPgtk -> withGTK3 && !withX; assert withXwidgets -> !noGui && (withGTK3 || withPgtk); @@ -181,9 +172,7 @@ mkDerivation (finalAttrs: { ++ lib.optionals withNativeCompilation [ (replaceVars ( - if lib.versionOlder finalAttrs.version "29" then - ./native-comp-driver-options-28.patch - else if lib.versionOlder finalAttrs.version "30" then + if lib.versionOlder finalAttrs.version "30" then ./native-comp-driver-options.patch else ./native-comp-driver-options-30.patch @@ -372,27 +361,6 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals withNS [ librsvg - AppKit - GSS - ImageIO - ] - ++ lib.optionals (variant == "macport") [ - Accelerate - AppKit - Carbon - Cocoa - IOKit - OSAKit - Quartz - QuartzCore - WebKit - # TODO are these optional? - GSS - ImageCaptureCore - ImageIO - ] - ++ lib.optionals (variant == "macport" && stdenv.hostPlatform.isAarch64) [ - UniformTypeIdentifiers ]; # Emacs needs to find movemail at run time, see info (emacs) Movemail @@ -535,10 +503,10 @@ mkDerivation (finalAttrs: { }; }; - meta = meta // { + meta = { broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [ "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30" ]; - }; + } // meta; }) diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch b/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch deleted file mode 100644 index 98c6da305145..000000000000 --- a/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el -index a5ab12ae38..e33e71cb55 100644 ---- a/lisp/emacs-lisp/comp.el -+++ b/lisp/emacs-lisp/comp.el -@@ -178,7 +178,7 @@ native-comp-compiler-options - :type '(repeat string) - :version "28.1") - --(defcustom native-comp-driver-options nil -+(defcustom native-comp-driver-options '(@backendPath@) - "Options passed verbatim to the native compiler's back-end driver. - Note that not all options are meaningful; typically only the options - affecting the assembler and linker are likely to be useful. --- -2.37.3 - diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 952d8e5aeab7..c8bea20543b1 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -13,6 +13,7 @@ let patches ? _: [ ], rev, hash, + meta ? { }, }: { inherit @@ -98,7 +99,7 @@ let } .${variant}; mainProgram = "emacs"; - }; + } // meta; }; in { @@ -121,40 +122,26 @@ in ]; }); - emacs28-macport = import ./make-emacs.nix (mkArgs { - pname = "emacs-mac"; - version = "28.2"; - variant = "macport"; - rev = "emacs-28.2-mac-9.1"; - hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; - patches = fetchpatch: [ - # CVE-2022-45939 - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51"; - hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs="; - }) - - # https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs="; - }) - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA="; - }) - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek="; - }) - ]; - }); - emacs29-macport = import ./make-emacs.nix (mkArgs { pname = "emacs-mac"; - version = "29.1"; + version = "29.4"; variant = "macport"; - rev = "emacs-29.1-mac-10.0"; - hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU="; + rev = "emacs-29.4-mac-10.1"; + hash = "sha256-8OQ+fon9tclbh/eUJ09uqKfMaz9M77QnLIp2R8QB6Ic="; + patches = fetchpatch: [ + # CVE-2024-53920 + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/07_all_trusted-content.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f"; + hash = "sha256-zUWM2HDO5MHEB5fC5TCUxzmSafMvXO5usRzCyp9Q7P4="; + }) + + # CVE-2025-1244 + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/06_all_man.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f"; + hash = "sha256-Vdf6GF5YmGoHTkxiD9mdYH0hgvfovZwrqYN1NQ++U1w="; + }) + ]; + + meta.knownVulnerabilities = [ ]; }); } diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix deleted file mode 100644 index 72fd7d1dac87..000000000000 --- a/pkgs/applications/editors/featherpad/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - hunspell, - pkg-config, - qttools, - qtbase, - qtsvg, - qtx11extras, - fetchFromGitHub, -}: - -mkDerivation rec { - pname = "featherpad"; - version = "1.4.1"; - - src = fetchFromGitHub { - owner = "tsujan"; - repo = "FeatherPad"; - rev = "V${version}"; - sha256 = "sha256-8IT/PxLz6BsLHzY5pM0bTlAO0xvfC7/aI7+Gbw2LyME="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - qttools - ]; - buildInputs = [ - hunspell - qtbase - qtsvg - qtx11extras - ]; - - meta = with lib; { - description = "Lightweight Qt5 Plain-Text Editor for Linux"; - homepage = "https://github.com/tsujan/FeatherPad"; - platforms = platforms.linux; - maintainers = [ maintainers.flosse ]; - license = licenses.gpl3Plus; - }; -} diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index b4b83ff3a587..4c2e7c090428 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, cmake, hunspell, @@ -24,6 +25,15 @@ stdenv.mkDerivation rec { hash = "sha256-oivhrDF3HikbEtS1cOlHwmQYNYf3IkX+gQGW0V55IWU="; }; + patches = [ + # Fix build, remove at next version bump + # https://github.com/gottcode/focuswriter/pull/208 + (fetchpatch { + url = "https://github.com/gottcode/focuswriter/commit/dd74ed4559a141653a06e7984c1251b992925775.diff"; + hash = "sha256-1bxa91xnkF1MIQlA8JgwPHW/A80ThbVVdVtusmzd22I="; + }) + ]; + nativeBuildInputs = [ pkg-config cmake diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/applications/editors/formiko/default.nix index 8b803b5839ad..672cb738f4a9 100644 --- a/pkgs/applications/editors/formiko/default.nix +++ b/pkgs/applications/editors/formiko/default.nix @@ -10,7 +10,7 @@ gtkspell3, librsvg, pygobject3, - webkitgtk_4_0, + webkitgtk_4_1, }: buildPythonApplication rec { @@ -37,7 +37,7 @@ buildPythonApplication rec { gtkspell3 librsvg pygobject3 - webkitgtk_4_0 + webkitgtk_4_1 ]; # Needs a display diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 1a1b8dcffd17..a88ab68cef87 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { pname = "greenfoot"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. - url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${ + url = "https://www.greenfoot.org/download/files/Greenfoot-linux-arm64-${ builtins.replaceStrings [ "." ] [ "" ] version }.deb"; - hash = "sha256-wpmgWtx2jTDjt+7p6HcjU/uy1PRmnAHpJ1rOYb+hV+U="; + hash = "sha256-d5bkK+teTA4fxFb46ovbZE28l8WILGStv3Vg3nJZfv0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index 9afcb4807d6d..2220a70fe0f6 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -11,123 +11,123 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.3.4", - "sha256": "c23b9aeb1fdd9f88ab977186e9e4558cdb9bdb5e498b7716f4255a845f8880fd", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.4.tar.gz", - "build_number": "243.25659.42" + "version": "2025.1.1", + "sha256": "2f747d7240d70b65ed98d736dbcd6ac2b98ac93aff993a63c5f8bd0f65918ac5", + "url": "https://download.jetbrains.com/cpp/CLion-2025.1.1.tar.gz", + "build_number": "251.25410.104" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "aafe50930e565e4b94dc6af43140d7bb68b937b8f1dc3d3235d2054071397b0f", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.5.tar.gz", - "build_number": "243.24978.79" + "version": "2025.1.2", + "sha256": "47d1c891a34f12f371aeab2364b9280766e1e99b27933f8d11c3c3832ed865ca", + "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2.tar.gz", + "build_number": "251.25410.123" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "2a59cb71f21f43ff05b385352e51c3670a13dcf2f287034185d4af101880c68f", - "url": "https://download.jetbrains.com/python/dataspell-2024.3.2.tar.gz", - "build_number": "243.25659.44" + "version": "2025.1", + "sha256": "d0078ceae9f7ae8cc6b57223874e3a818383aedf10fa8b73b2d34a522c52e53d", + "url": "https://download.jetbrains.com/python/dataspell-2025.1.tar.gz", + "build_number": "251.23774.439" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2024.3.3", - "sha256": "4266bc5bceba9c053d5a3b7b74591bf5bc52f11a4deb4bbe4bab03fc97c5b36c", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3.tar.gz", - "build_number": "243.24978.56" + "version": "2025.1.1", + "sha256": "edccd3d877407dfc628d9ba2a8ee767c11a861532dd4e0b1cb2a4d8787476ea8", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1.tar.gz", + "build_number": "251.25410.139" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "d59f537fb8d9c741a704605ec00c4b4230211301cd0609c73c66d5edb4eb9340", - "url": "https://download.jetbrains.com/go/goland-2024.3.5.tar.gz", - "build_number": "243.26053.20" + "version": "2025.1.1", + "sha256": "fb94d5df43942db47a5506b50e511457cf845b986e70168171b9f5324b7d0d77", + "url": "https://download.jetbrains.com/go/goland-2025.1.1.tar.gz", + "build_number": "251.25410.140" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "8a287528d830e6cdec2ded13c974c39a35b7555243c22d8b83113c96c26630aa", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5.tar.gz", - "build_number": "243.26053.27" + "version": "2025.1.1.1", + "sha256": "36b72ac85e8e1536dfccb300b5a435461b1e2953585a90a5d8f06e1b263b0b5c", + "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1.tar.gz", + "build_number": "251.25410.129" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "f8e8e864f4fedddf1d366a7db23fc4132192c3a6029c614a382186ff564a78a1", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5.tar.gz", - "build_number": "243.26053.27" + "version": "2025.1.1.1", + "sha256": "337d34b20cdaa8da30d71b98e1b36817bdfe2f2245c491ef38f0cee02f0d0316", + "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1.tar.gz", + "build_number": "251.25410.129" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2024.3.1", - "sha256": "b0e1f7bbc56ddf706510a420783418bc61e80bc4ea3c23ae60fb09cee846f01b", - "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.1.tar.gz", - "build_number": "243.24978.546" + "version": "2025.1", + "sha256": "0b6d8c0964dc18785437c14bd2ac7e000e07e39865680227d201cd9cad0ff8a8", + "url": "https://download.jetbrains.com/mps/2025.1/MPS-2025.1.tar.gz", + "build_number": "251.23774.423" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "e12efb584eb9b632703d1bee9986d95ac09aceaf76ca40e9188d82b713ff0fc1", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5.tar.gz", - "build_number": "243.26053.13", + "version": "2025.1.1", + "sha256": "b64722ea715db8566754978af617716016deaa2cda3521cf05e4a049e5bbf6a3", + "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1.tar.gz", + "build_number": "251.25410.148", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "e8d5aa2a05d35e3cb3cd186d446242c191d03b3d0556b160b6875a830c91cc2b", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5.tar.gz", - "build_number": "243.26053.29" + "version": "2025.1.1", + "sha256": "d2df49f8ec2df88039f535e0d8706d35f608db3e58b9411f5e8e726536788237", + "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1.tar.gz", + "build_number": "251.25410.122" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "dbfbdbd2627bcf5de85673151f3d3b79b12fa373d8c0d7942f40bba3aa397ea3", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5.tar.gz", - "build_number": "243.26053.29" + "version": "2025.1.1", + "sha256": "b1e8660b1c947f3bb746d0736e1e9c247635fadedb52f230ef5c64862893ad0b", + "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1.tar.gz", + "build_number": "251.25410.122" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2024.3.6", - "sha256": "1f9db9f3f90c71fe476e3e17ac78be9fcc982e3f017c598f631b5cd600e6da43", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.6.tar.gz", - "build_number": "243.25659.34" + "version": "2025.1.2", + "sha256": "cdf8a824c7daa3247b09d76a29acb31cfa623b90643d3d2a814982cb0a32879d", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.2.tar.gz", + "build_number": "251.25410.119" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "e5fb7daa24307927cfd329340956b4cae1e0f3bb011841834519c4342428d38b", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5.tar.gz", - "build_number": "243.26053.19" + "version": "2025.1.1", + "sha256": "f5014b52770be4d1c743c5a60f0e20d0dd1a1c172018180d05c0a22f1ffd1027", + "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1.tar.gz", + "build_number": "251.25410.120" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.3.7", - "sha256": "aec79e12c16082d364617dab83ec63980fddbd66c5734573499b000733c508ad", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7.tar.gz", - "build_number": "243.26053.17" + "version": "2025.1.2", + "sha256": "b2974feb5406153817797b7dc93baaafe35c7b3687d38091d5d1b5d010a03132", + "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2.tar.gz", + "build_number": "251.25410.115" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "da587d7ca3ebb08f067143e4a6b35f1aa133aa10af7fc365496838006fcd1aed", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5.tar.gz", - "build_number": "243.26053.12" + "version": "2025.1.1", + "sha256": "411b6d93e47d7743aa9189f4a3cab3956c573ce406908da5621f8dee0098ad99", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1.tar.gz", + "build_number": "251.25410.117" }, "writerside": { "update-channel": "Writerside EAP", @@ -150,123 +150,123 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.3.4", - "sha256": "336d19b695392e9a7bf426ae2d93b864ade48216e8df8f96ecfc9b2e9b9afa4f", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.4-aarch64.tar.gz", - "build_number": "243.25659.42" + "version": "2025.1.1", + "sha256": "dcd7373dc9dd941703d18ae602dd384ce6d154a90745c37c3358bf1f6b41ed2e", + "url": "https://download.jetbrains.com/cpp/CLion-2025.1.1-aarch64.tar.gz", + "build_number": "251.25410.104" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "20bae6b26f1aa6c88db1779103c8cceacb690caa776d10ef155ef1c17f25f37c", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.5-aarch64.tar.gz", - "build_number": "243.24978.79" + "version": "2025.1.2", + "sha256": "fb34b6469c96a54018b3c728f96787d03da0ec92c88a80f52e8f89a0eecc8d01", + "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2-aarch64.tar.gz", + "build_number": "251.25410.123" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "708e2037711b6bcb6e155ce24082d4347c07295250feabb9715366c7da4d45ba", - "url": "https://download.jetbrains.com/python/dataspell-2024.3.2-aarch64.tar.gz", - "build_number": "243.25659.44" + "version": "2025.1", + "sha256": "e55cfc4e3327aff6bd3447e2980cd1e5cbd9223c8e0330688d65031b1e95d0fd", + "url": "https://download.jetbrains.com/python/dataspell-2025.1-aarch64.tar.gz", + "build_number": "251.23774.439" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2024.3.3", - "sha256": "e7050cfb1b603c6f0bd0dbb90f32a49b3fe9155fb696f12dd261afc000043b81", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3-aarch64.tar.gz", - "build_number": "243.24978.56" + "version": "2025.1.1", + "sha256": "869882db293640328f5e1ae80c5cf60183ba850f6087ab1b3cf95ec77b3837be", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1-aarch64.tar.gz", + "build_number": "251.25410.139" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "12236e5b82e99ce27925567afe049e3ce298b083b764b75ffb67b5b7b8072e61", - "url": "https://download.jetbrains.com/go/goland-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.20" + "version": "2025.1.1", + "sha256": "949e86c6991e14d90adcaea75c18f679b1ab029ec0c00f00f464a631e999c036", + "url": "https://download.jetbrains.com/go/goland-2025.1.1-aarch64.tar.gz", + "build_number": "251.25410.140" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "43b3ac68c07b611baa12bd70adc188b7be81d79b0b3a232aad582df2ffeb2598", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.27" + "version": "2025.1.1.1", + "sha256": "7860b836a18b82827fdb54a86cc5601fe8ef28aab4253981f238ef975a982915", + "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1-aarch64.tar.gz", + "build_number": "251.25410.129" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "0f072350137540672fd4de19768175164a2497290098321dfefaaaff0097f524", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.27" + "version": "2025.1.1.1", + "sha256": "756baa32d72bd982d9b8c06f86cd42755d2677a9f1ea37bd6ad6a963d17226b2", + "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1-aarch64.tar.gz", + "build_number": "251.25410.129" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2024.3.1", - "sha256": "b0e1f7bbc56ddf706510a420783418bc61e80bc4ea3c23ae60fb09cee846f01b", - "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.1.tar.gz", - "build_number": "243.24978.546" + "version": "2025.1", + "sha256": "0b6d8c0964dc18785437c14bd2ac7e000e07e39865680227d201cd9cad0ff8a8", + "url": "https://download.jetbrains.com/mps/2025.1/MPS-2025.1.tar.gz", + "build_number": "251.23774.423" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "a55b112177db464081139f6b9aec2a7c22b0f069dd70fdb1bfe56fa1a7f33aa4", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.13", + "version": "2025.1.1", + "sha256": "6e479318f5627ec1d6ccd47610a93aa9e9a56c9badd2be4d8f935008d0e71b9e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1-aarch64.tar.gz", + "build_number": "251.25410.148", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "08fbe137d0153b92a639351e866c2218744517b6cfcf412abedfe1d6c9ad1bc4", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.29" + "version": "2025.1.1", + "sha256": "d717e039a91587e5396c69d056ebd91f640ae03ddf398e575c8f8eb3817d8afb", + "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1-aarch64.tar.gz", + "build_number": "251.25410.122" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "53ce650a41fefb260a13cb96462857fc5abd98d7a02adf794cde7248e3cefbbb", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.29" + "version": "2025.1.1", + "sha256": "3f8f8a3773652ec99ea7a05b55dff41b5683548838f009e5e3d132ea644384d9", + "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1-aarch64.tar.gz", + "build_number": "251.25410.122" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2024.3.6", - "sha256": "f8c459c77327e97812507ba4724e6e9911e918425f5a187707cb66efafa47c45", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.6-aarch64.tar.gz", - "build_number": "243.25659.34" + "version": "2025.1.2", + "sha256": "c1ad139252fd3158aa86e9ac4532db5d9dd653807fc9f1dc4458170f3f1c3de6", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.2-aarch64.tar.gz", + "build_number": "251.25410.119" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "72a331a3c04a3d9f8bf30ad0b5009d4634f0fdcf5becd6a9a5cd00a5728cd9d1", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.19" + "version": "2025.1.1", + "sha256": "00b7526795af4e7eba1c65fc5e10a963e717770e68c5bfd28b10163f9fa37f8c", + "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1-aarch64.tar.gz", + "build_number": "251.25410.120" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.3.7", - "sha256": "537cb7c23cf03a467d311ae00c07b9830f8a7e09807366488d75f84c573ac460", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7-aarch64.tar.gz", - "build_number": "243.26053.17" + "version": "2025.1.2", + "sha256": "4660f8f2fd37b166bae904385b863157ab596fac35869de17a39df999efde8ce", + "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2-aarch64.tar.gz", + "build_number": "251.25410.115" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "fce5d5c2b8c5aacfabac60ff93b93d7c9a3239adcf8347b3deabd472ac1c1288", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.12" + "version": "2025.1.1", + "sha256": "0156affae3222afb51cfe8a82e1eabf26f62bd91a74a2822fa821afd1eab9bad", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1-aarch64.tar.gz", + "build_number": "251.25410.117" }, "writerside": { "update-channel": "Writerside EAP", @@ -289,123 +289,123 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.3.4", - "sha256": "e92dc5ba5a2c59d09e3751de60ed31b0af012210f8381ffd1c5c3e254cc11718", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.4.dmg", - "build_number": "243.25659.42" + "version": "2025.1.1", + "sha256": "e7558d0196390c18e2c11143aa59f2ad56c020d43ebd05057f997fa117abb484", + "url": "https://download.jetbrains.com/cpp/CLion-2025.1.1.dmg", + "build_number": "251.25410.104" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2024.3.5", - "sha256": "224a58410ef3e067b0c848607d34f5ac180e76ef95ebd1a9f7a34202d36ea278", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.5.dmg", - "build_number": "243.24978.79" + "version": "2025.1.2", + "sha256": "a6b7dadb262813d867281d700456c7bca82b61bea99e52fd54edec05cd07180e", + "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2.dmg", + "build_number": "251.25410.123" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2024.3.2", - "sha256": "474c8a04a699cd1538b9c1c882d0215a79932ed45baf8f0f3ec3be09e8ec9a1f", - "url": "https://download.jetbrains.com/python/dataspell-2024.3.2.dmg", - "build_number": "243.25659.44" + "version": "2025.1", + "sha256": "dd856c72855b0309ea98774a3b4c38cf899b6e307dbd3ced316cd8cc721faa38", + "url": "https://download.jetbrains.com/python/dataspell-2025.1.dmg", + "build_number": "251.23774.439" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2024.3.3", - "sha256": "75cc932a4d7bd2f28f641e21cfc0667ce645dd38109b37cbe3621321f1eb3a2d", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3.dmg", - "build_number": "243.24978.56" + "version": "2025.1.1", + "sha256": "c849cd16b77b5268ee2e8279bddf02c21a925a25885549d0b1922a785f18120f", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1.dmg", + "build_number": "251.25410.139" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.3.5", - "sha256": "08739696b428ee2964f314884edbabd6614e5b4ce1ec9021e9d336ee947bb944", - "url": "https://download.jetbrains.com/go/goland-2024.3.5.dmg", - "build_number": "243.26053.20" + "version": "2025.1.1", + "sha256": "0b00984d45430b37538bf9c55f8f93f1476f819fba1bdea2588ffd36d7e91cb3", + "url": "https://download.jetbrains.com/go/goland-2025.1.1.dmg", + "build_number": "251.25410.140" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.3.5", - "sha256": "94640287fb84238d766a52681083807a087ef28b5c9b66d31f4a7ae06f2bcb8a", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5.dmg", - "build_number": "243.26053.27" + "version": "2025.1.1.1", + "sha256": "ee1577a44930b94112819b200acd617cbb3efdfa039df7911094051e9a10e465", + "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1.dmg", + "build_number": "251.25410.129" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.3.5", - "sha256": "8b50dd9783c6f8dde229606a4e2d1d0e4ce95f0db33502053ed957fd532bcc35", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5.dmg", - "build_number": "243.26053.27" + "version": "2025.1.1.1", + "sha256": "eccd0ba3f9b1f2f680b946a3658830562fd4369dd11cc618b86671c8e237c375", + "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1.dmg", + "build_number": "251.25410.129" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2024.3.1", - "sha256": "a36d46d6a29f5f86991b1d1e8272bbc27bf00a2c5e562fe7fb3f95075badc85c", - "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.1-macos.dmg", - "build_number": "243.24978.546" + "version": "2025.1", + "sha256": "1ddae8569c8a96beeb5e85d20f1eed9115ace532a1154b5624f526cb49ddeaa8", + "url": "https://download.jetbrains.com/mps/2025.1/MPS-2025.1-macos.dmg", + "build_number": "251.23774.423" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.3.5", - "sha256": "edb7d1ff3aa653f6f73ea2e6f907b026de8613cea3bdc2cb90c79257f387c2a6", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5.dmg", - "build_number": "243.26053.13", + "version": "2025.1.1", + "sha256": "2f7c9b0ec1947c7bb2247fd3a949de9921e82e9a2801e388f6cf9d4421073dbd", + "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1.dmg", + "build_number": "251.25410.148", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.3.5", - "sha256": "25d01d39d7e5f1d658548dadee4cd4972f25d60a8c10da3cb482a99c8e3181d3", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5.dmg", - "build_number": "243.26053.29" + "version": "2025.1.1", + "sha256": "3d439ad29771d8618b03f28497899f09a6eb696c96c789b54aac9ac1bfb4766c", + "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1.dmg", + "build_number": "251.25410.122" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.3.5", - "sha256": "d98e90eccec085c467a547a7ee31ab6611479ea991fe7b99e41e81f491cfeeff", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5.dmg", - "build_number": "243.26053.29" + "version": "2025.1.1", + "sha256": "cd56a7e1072f4562e2d3ef67e70f227606376572634120170f5689d3b970b570", + "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1.dmg", + "build_number": "251.25410.122" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2024.3.6", - "sha256": "1677f8b1274149407799ba025f6a9316749a7b8d86ba142f77c807b52874f9fa", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.6.dmg", - "build_number": "243.25659.34" + "version": "2025.1.2", + "sha256": "23f3479d1cff5ee1726726bea866ff755b08930e9da43b7ad250e6cb620c1dcf", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.2.dmg", + "build_number": "251.25410.119" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.3.5", - "sha256": "fb9f10ef6c0e5741bcd35abf148133002d92865899e4a98a276be64ff88b9688", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5.dmg", - "build_number": "243.26053.19" + "version": "2025.1.1", + "sha256": "97b154079ef326c9a3ce229129d7d220faee30f266954288f74bf6f27ee43942", + "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1.dmg", + "build_number": "251.25410.120" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.3.7", - "sha256": "1326cfb150170e69c2fe62c4f7ff131d90117da3ee07b5e6134e46d44822fba0", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7.dmg", - "build_number": "243.26053.17" + "version": "2025.1.2", + "sha256": "1419d2aac23965838e16c2bedc31851045f8b9d99ccf93594838a4e329059d92", + "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2.dmg", + "build_number": "251.25410.115" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.3.5", - "sha256": "6d7d3c7883f1344a08d39c4060dcd32c28039d7217549c88d703e65517be7898", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5.dmg", - "build_number": "243.26053.12" + "version": "2025.1.1", + "sha256": "44363b71b4ad461c07c2c0ae8424f6efabe356b347a2974765f88549a8ee183c", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1.dmg", + "build_number": "251.25410.117" }, "writerside": { "update-channel": "Writerside EAP", @@ -428,123 +428,123 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.3.4", - "sha256": "e9d601aaed26d8efa82137649acb24c24fdc8d555c42afa9226ed08d3a19fe4d", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.4-aarch64.dmg", - "build_number": "243.25659.42" + "version": "2025.1.1", + "sha256": "475280e277cc94d18de228bf5f81ebd6ff14084c2e1d2b0db5b4612007dc46fe", + "url": "https://download.jetbrains.com/cpp/CLion-2025.1.1-aarch64.dmg", + "build_number": "251.25410.104" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "1ba33de8b5595a7ab3ab683ed21200c6c884c7c9299a9dfe4414ae29b219dc09", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.5-aarch64.dmg", - "build_number": "243.24978.79" + "version": "2025.1.2", + "sha256": "6d12a59053db3dfa33079ac79b1ea263e5b3ec6fde01d1d803f6d27afea033de", + "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2-aarch64.dmg", + "build_number": "251.25410.123" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "172a8641249784afe4f73359adb1419c2eb8b00bddfa4182bf691e44b3c4baa4", - "url": "https://download.jetbrains.com/python/dataspell-2024.3.2-aarch64.dmg", - "build_number": "243.25659.44" + "version": "2025.1", + "sha256": "f6dd63c5458ea2adeb76a9042ab3316b124fd9cbdcccd4d4b08c2d90e17b49b8", + "url": "https://download.jetbrains.com/python/dataspell-2025.1-aarch64.dmg", + "build_number": "251.23774.439" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2024.3.3", - "sha256": "846eb50e707231e34bc9ad467a5237a43a865061b10a1be6b4abe4a0cc08161b", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3-aarch64.dmg", - "build_number": "243.24978.56" + "version": "2025.1.1", + "sha256": "abad0e061896590bea9bd1d4bead2183be3c1e71d6dfcba89ce2408f34af3536", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1-aarch64.dmg", + "build_number": "251.25410.139" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "7f3503352d47551c68818b288938fdb01ebd35d56153f6ed560058b19397796c", - "url": "https://download.jetbrains.com/go/goland-2024.3.5-aarch64.dmg", - "build_number": "243.26053.20" + "version": "2025.1.1", + "sha256": "52e62d5a616b6ab6bf36f0d40d1925e9f477fcf84e187a2a1194d56d5ccae6ec", + "url": "https://download.jetbrains.com/go/goland-2025.1.1-aarch64.dmg", + "build_number": "251.25410.140" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "b96b9fa3de829f0d5e98aa73766b3da4909186a464e3f8e7b8b3c975f1b0978b", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5-aarch64.dmg", - "build_number": "243.26053.27" + "version": "2025.1.1.1", + "sha256": "92ea35ebfcd9e34cd9bda0103ca036fe1f9eb900c005ae33a9295050ad636dae", + "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1-aarch64.dmg", + "build_number": "251.25410.129" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "8cf632fbb89e6dfbd2a536643450e6ae6671001348461260fe0132ed14ef3d0c", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5-aarch64.dmg", - "build_number": "243.26053.27" + "version": "2025.1.1.1", + "sha256": "5207878b28df2a13e4248c1936ee4fff7c89495e3d4ffdaa3b8da3f21548117e", + "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1-aarch64.dmg", + "build_number": "251.25410.129" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2024.3.1", - "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.1-macos-aarch64.dmg", - "sha256": "d5000f7309d36ce65929bcdc85b36f543cadb2a5cc2f0675b35edb69489bde8e", - "build_number": "243.24978.546" + "version": "2025.1", + "url": "https://download.jetbrains.com/mps/2025.1/MPS-2025.1-macos-aarch64.dmg", + "sha256": "cb2aaa6311252a655ef55f813d3dff78890c2a10cf0aeff885018c316390486b", + "build_number": "251.23774.423" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "439aea4e8f919701b058f619dc545ac5207bd2b340b9f1925281a7fe0747fbd6", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5-aarch64.dmg", - "build_number": "243.26053.13", + "version": "2025.1.1", + "sha256": "8bb7acf16076e4a32b522107bc359197bb2ee0eeebe0ed5feb1d25d9110830c1", + "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1-aarch64.dmg", + "build_number": "251.25410.148", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "444edd06334a6b35964995b9af8ba998514eb1355f6035b905ec57e1a0ff7320", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5-aarch64.dmg", - "build_number": "243.26053.29" + "version": "2025.1.1", + "sha256": "4e493ce20dd840402ed040f4447d06cab62e59514b5ab2058e94421877f72270", + "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1-aarch64.dmg", + "build_number": "251.25410.122" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "d92332e6b120669f7f9aded84b82b6c7a64c2512537faf623122e7f2505bbab1", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5-aarch64.dmg", - "build_number": "243.26053.29" + "version": "2025.1.1", + "sha256": "76a97e0d1ca75cbfbcc0acb046154daec1113010c052318077a128ff89fb55a6", + "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1-aarch64.dmg", + "build_number": "251.25410.122" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2024.3.6", - "sha256": "bf3f08040194b1280a857886ac40c6518f83b40f60a6ee990d348a7e14b2c023", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.6-aarch64.dmg", - "build_number": "243.25659.34" + "version": "2025.1.2", + "sha256": "ab6645bba503f0a9d67b2838d1dd88a81ad81dd34e6015ccaea30400c35659e4", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.2-aarch64.dmg", + "build_number": "251.25410.119" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "e7f12eeb72b3421108b8aafb03c4603b74e6ac8922dc192f2a2d5bb5811d4d48", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5-aarch64.dmg", - "build_number": "243.26053.19" + "version": "2025.1.1", + "sha256": "6b8bd9c8ffeec01b0a907604d99cc77ede865aa9abf350e76957d9675ab8a810", + "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1-aarch64.dmg", + "build_number": "251.25410.120" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.3.7", - "sha256": "e7d1f13d54637202dcf7a54a2f273b7d9fdc251ae6573df6316fc23dcc8611f2", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7-aarch64.dmg", - "build_number": "243.26053.17" + "version": "2025.1.2", + "sha256": "3f12ad41285d6b67dcc577526976b5c394b44caa3f243147143968a505144a79", + "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2-aarch64.dmg", + "build_number": "251.25410.115" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "67f1898fcf936f22842a669ebe1cc746d8ae9069086dcf66efa2d86d73e78d5c", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5-aarch64.dmg", - "build_number": "243.26053.12" + "version": "2025.1.1", + "sha256": "7acfa46536b598b576775892ac46bb570dd06bc9461cc58c51b9efd4afd09139", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1-aarch64.dmg", + "build_number": "251.25410.117" }, "writerside": { "update-channel": "Writerside EAP", diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 8e3053497b05..efb86750d905 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -55,7 +55,8 @@ let + lib.optionalString meta.isOpenSource ( if fromSource then " (built from source)" else " (patched binaries from jetbrains)" ); - maintainers = lib.teams.jetbrains.members ++ map (x: lib.maintainers."${x}") meta.maintainers; + maintainers = map (x: lib.maintainers."${x}") meta.maintainers; + teams = [ lib.teams.jetbrains ]; license = if meta.isOpenSource then lib.licenses.asl20 else lib.licenses.unfree; sourceProvenance = if fromSource then @@ -82,9 +83,9 @@ let pname jdk extraWrapperArgs - extraLdPath extraBuildInputs ; + extraLdPath = extraLdPath ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libGL ]; src = if fromSource then communitySources."${pname}" @@ -336,7 +337,6 @@ rec { libICE libSM libX11 - libGL ]; }).overrideAttrs (attrs: { @@ -378,7 +378,6 @@ rec { libxcrypt-legacy fontconfig xorg.libX11 - libGL ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ expat diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 97b2c5d70b99..16b6589f6210 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -9,7 +9,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -18,18 +17,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip" }, "name": "ideavim" }, @@ -38,7 +36,7 @@ "idea-ultimate" ], "builds": { - "243.26053.27": "https://plugins.jetbrains.com/files/631/700118/python-243.26053.27.zip" + "251.25410.129": "https://plugins.jetbrains.com/files/631/737817/python-251.25410.129.zip" }, "name": "python" }, @@ -49,7 +47,7 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/1347/696516/scala-intellij-bin-2024.3.42.zip" + "251.25410.129": "https://plugins.jetbrains.com/files/1347/735853/scala-intellij-bin-2025.1.23.zip" }, "name": "scala" }, @@ -62,7 +60,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -71,18 +68,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip" }, "name": "string-manipulation" }, @@ -95,7 +91,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -104,18 +99,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip" }, "name": "handlebars-mustache" }, @@ -128,7 +122,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -137,18 +130,17 @@ ], "builds": { "243.22562.218": null, - "243.22562.220": null, - "243.24978.546": null, - "243.24978.79": null, - "243.25659.34": null, - "243.25659.42": null, - "243.26053.12": null, - "243.26053.13": null, - "243.26053.17": null, - "243.26053.19": null, - "243.26053.20": null, - "243.26053.27": null, - "243.26053.29": null + "251.23774.423": null, + "251.25410.104": null, + "251.25410.115": null, + "251.25410.117": null, + "251.25410.119": null, + "251.25410.120": null, + "251.25410.122": null, + "251.25410.123": null, + "251.25410.129": null, + "251.25410.140": null, + "251.25410.148": null }, "name": "kotlin" }, @@ -161,7 +153,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -169,19 +160,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip" + "243.22562.218": null, + "251.23774.423": "https://plugins.jetbrains.com/files/6981/724264/ini-251.23774.466.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip" }, "name": "ini" }, @@ -194,7 +184,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -202,19 +191,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip" }, "name": "acejump" }, @@ -227,7 +215,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -236,18 +223,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip" }, "name": "grep-console" }, @@ -260,7 +246,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -269,18 +254,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip" }, "name": "file-watchers" }, @@ -290,10 +274,10 @@ "phpstorm" ], "builds": { - "243.26053.13": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" + "251.25410.129": "https://plugins.jetbrains.com/files/7219/739169/Symfony_Plugin-2025.1.279.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/7219/739169/Symfony_Plugin-2025.1.279.zip" }, - "name": "symfony-support" + "name": "symfony-plugin" }, "7320": { "compatible": [ @@ -301,8 +285,8 @@ "phpstorm" ], "builds": { - "243.26053.13": "https://plugins.jetbrains.com/files/7320/701175/PHP_Annotations-11.2.0.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7320/701175/PHP_Annotations-11.2.0.zip" + "251.25410.129": "https://plugins.jetbrains.com/files/7320/718466/PHP_Annotations-12.0.0.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/7320/718466/PHP_Annotations-12.0.0.zip" }, "name": "php-annotations" }, @@ -313,22 +297,21 @@ "goland", "idea-community", "idea-ultimate", - "pycharm-community", + "pycharm-professional", "rider", "rust-rover", "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip" + "243.22562.218": null, + "251.25410.104": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip" }, "name": "python-community-edition" }, @@ -341,7 +324,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -350,18 +332,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip" }, "name": "asciidoc" }, @@ -374,7 +355,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -383,18 +363,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar" + "251.23774.423": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.25410.104": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.25410.115": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.25410.117": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.25410.119": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.25410.120": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.25410.122": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.25410.123": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.25410.129": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.25410.140": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.25410.148": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar" }, "name": "wakatime" }, @@ -407,7 +386,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -415,19 +393,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip" }, "name": "gittoolbox" }, @@ -440,7 +417,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -449,18 +425,17 @@ ], "builds": { "243.22562.218": null, - "243.22562.220": null, - "243.24978.546": "https://plugins.jetbrains.com/files/7724/680796/clouds-docker-impl-243.24978.54.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7724/680796/clouds-docker-impl-243.24978.54.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/7724/724240/clouds-docker-impl-251.23774.466.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip" }, "name": "docker" }, @@ -473,7 +448,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -482,18 +456,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/8097/636616/graphql-243.22562.13.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/8097/636616/graphql-243.22562.13.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/8097/680200/graphql-243.24978.46.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/8097/680200/graphql-243.24978.46.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip" }, "name": "graphql" }, @@ -506,7 +479,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -514,17 +486,16 @@ ], "builds": { "243.22562.218": null, - "243.22562.220": null, - "243.24978.546": null, - "243.24978.79": null, - "243.25659.34": null, - "243.25659.42": null, - "243.26053.12": null, - "243.26053.13": null, - "243.26053.19": null, - "243.26053.20": null, - "243.26053.27": null, - "243.26053.29": null + "251.23774.423": null, + "251.25410.104": null, + "251.25410.117": null, + "251.25410.119": null, + "251.25410.120": null, + "251.25410.122": null, + "251.25410.123": null, + "251.25410.129": null, + "251.25410.140": null, + "251.25410.148": null }, "name": "-deprecated-rust" }, @@ -537,7 +508,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -545,17 +515,16 @@ ], "builds": { "243.22562.218": null, - "243.22562.220": null, - "243.24978.546": null, - "243.24978.79": null, - "243.25659.34": null, - "243.25659.42": null, - "243.26053.12": null, - "243.26053.13": null, - "243.26053.19": null, - "243.26053.20": null, - "243.26053.27": null, - "243.26053.29": null + "251.23774.423": null, + "251.25410.104": null, + "251.25410.117": null, + "251.25410.119": null, + "251.25410.120": null, + "251.25410.122": null, + "251.25410.123": null, + "251.25410.129": null, + "251.25410.140": null, + "251.25410.148": null }, "name": "-deprecated-rust-beta" }, @@ -568,7 +537,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -576,19 +544,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/8195/630064/toml-243.21565.122.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/8195/630064/toml-243.21565.122.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip" + "243.22562.218": null, + "251.23774.423": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip" }, "name": "toml" }, @@ -599,7 +566,7 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip" + "251.25410.129": "https://plugins.jetbrains.com/files/8327/718480/Minecraft_Development-2025.1-1.8.4.zip" }, "name": "minecraft-development" }, @@ -612,7 +579,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -620,19 +586,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/8554/684425/featuresTrainer-243.24978.79.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/8554/684425/featuresTrainer-243.24978.79.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip" + "243.22562.218": null, + "251.23774.423": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip" }, "name": "ide-features-trainer" }, @@ -645,7 +610,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -654,18 +618,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip" }, "name": "nixidea" }, @@ -678,7 +641,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -687,18 +649,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip" }, "name": "-env-files" }, @@ -708,8 +669,8 @@ "idea-ultimate" ], "builds": { - "243.26053.20": "https://plugins.jetbrains.com/files/9568/700127/go-plugin-243.26053.27.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/9568/700127/go-plugin-243.26053.27.zip" + "251.25410.129": "https://plugins.jetbrains.com/files/9568/728728/go-plugin-251.25410.59.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/9568/728728/go-plugin-251.25410.59.zip" }, "name": "go" }, @@ -722,7 +683,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -730,19 +690,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar" + "243.22562.218": "https://plugins.jetbrains.com/files/9707/702582/ANSI_Highlighter_Premium-24.3.4.jar", + "251.23774.423": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.25410.104": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.25410.115": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.25410.117": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.25410.119": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.25410.120": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.25410.122": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.25410.123": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.25410.129": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.25410.140": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.25410.148": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar" }, "name": "ansi-highlighter-premium" }, @@ -755,7 +714,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -764,18 +722,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip" }, "name": "key-promoter-x" }, @@ -788,7 +745,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -797,18 +753,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip" }, "name": "randomness" }, @@ -821,7 +776,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -830,18 +784,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip" }, "name": "csv-editor" }, @@ -854,7 +807,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -862,19 +814,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip" }, "name": "rainbow-brackets" }, @@ -887,7 +838,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -896,18 +846,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip" }, "name": "dot-language" }, @@ -920,7 +869,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -929,18 +877,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip" }, "name": "hocon" }, @@ -953,7 +900,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -961,19 +907,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip" }, "name": "extra-icons" }, @@ -986,7 +931,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -994,19 +938,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/11349/737408/aws-toolkit-jetbrains-standalone-3.70-243.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip" }, "name": "aws-toolkit" }, @@ -1015,7 +958,7 @@ "rider" ], "builds": { - "243.25659.34": "https://plugins.jetbrains.com/files/12024/622380/ReSharperPlugin.CognitiveComplexity-2024.3.0-eap04.zip" + "251.25410.119": "https://plugins.jetbrains.com/files/12024/667413/ReSharperPlugin.CognitiveComplexity-2025.1.0-eap01.zip" }, "name": "cognitivecomplexity" }, @@ -1028,7 +971,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1037,18 +979,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip" }, "name": "vscode-keymap" }, @@ -1061,7 +1002,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1070,18 +1010,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip" }, "name": "eclipse-keymap" }, @@ -1094,7 +1033,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1103,18 +1041,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip" }, "name": "rainbow-csv" }, @@ -1127,7 +1064,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1136,18 +1072,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip" }, "name": "visual-studio-keymap" }, @@ -1160,7 +1095,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1169,18 +1103,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip" }, "name": "indent-rainbow" }, @@ -1193,7 +1126,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1202,18 +1134,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip" }, "name": "protocol-buffers" }, @@ -1226,7 +1157,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1235,18 +1165,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "251.23774.423": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.25410.104": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.25410.115": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.25410.117": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.25410.119": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.25410.120": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.25410.122": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.25410.123": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.25410.129": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.25410.140": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.25410.148": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -1259,7 +1188,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1268,18 +1196,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar" + "251.23774.423": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.25410.104": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.25410.115": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.25410.117": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.25410.119": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.25410.120": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.25410.122": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.25410.123": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.25410.129": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.25410.140": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.25410.148": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar" }, "name": "mario-progress-bar" }, @@ -1292,7 +1219,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1301,18 +1227,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar" + "251.23774.423": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.25410.104": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.25410.115": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.25410.117": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.25410.119": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.25410.120": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.25410.122": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.25410.123": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.25410.129": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.25410.140": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.25410.148": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar" }, "name": "which-key" }, @@ -1325,7 +1250,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1333,19 +1257,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip" }, "name": "extra-toolwindow-colorful-icons" }, @@ -1358,7 +1281,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1366,19 +1288,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip" }, "name": "github-copilot" }, @@ -1391,7 +1312,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1400,18 +1320,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -1424,7 +1343,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1433,18 +1351,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip" }, "name": "catppuccin-theme" }, @@ -1457,7 +1374,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1466,18 +1382,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip" }, "name": "codeglance-pro" }, @@ -1490,7 +1405,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1498,19 +1412,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar" + "243.22562.218": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar", + "251.23774.423": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar", + "251.25410.104": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar", + "251.25410.115": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar", + "251.25410.117": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar", + "251.25410.119": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar", + "251.25410.120": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar", + "251.25410.122": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar", + "251.25410.123": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar", + "251.25410.129": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar", + "251.25410.140": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar", + "251.25410.148": "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar" }, "name": "gerry-themes" }, @@ -1523,7 +1436,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1532,18 +1444,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip" }, "name": "better-direnv" }, @@ -1556,7 +1467,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1565,18 +1475,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip" }, "name": "mermaid" }, @@ -1589,7 +1498,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1598,18 +1506,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip" }, "name": "ferris" }, @@ -1622,7 +1529,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1631,18 +1537,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip" }, "name": "code-complexity" }, @@ -1655,7 +1560,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1663,19 +1567,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip" }, "name": "developer-tools" }, @@ -1685,22 +1588,20 @@ "goland", "idea-ultimate", "phpstorm", - "pycharm-professional", "rider", "ruby-mine", "rust-rover", "webstorm" ], "builds": { - "243.25659.34": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip" + "251.25410.104": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip" }, "name": "dev-containers" }, @@ -1711,9 +1612,9 @@ "rust-rover" ], "builds": { - "243.25659.42": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip" + "251.25410.104": "https://plugins.jetbrains.com/files/22407/736889/intellij-rust-251.25410.127.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/22407/736889/intellij-rust-251.25410.127.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/22407/736889/intellij-rust-251.25410.127.zip" }, "name": "rust" }, @@ -1726,7 +1627,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1734,19 +1634,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip" }, "name": "continue" }, @@ -1759,7 +1658,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1767,19 +1665,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/22857/640903/vcs-gitlab-243.22562.53.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/22857/640903/vcs-gitlab-243.22562.53.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip" + "243.22562.218": null, + "251.23774.423": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip" }, "name": "gitlab" }, @@ -1792,7 +1689,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1800,19 +1696,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip" }, "name": "catppuccin-icons" }, @@ -1825,7 +1720,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1834,18 +1728,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip" + "251.23774.423": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip" }, "name": "mermaid-chart" }, @@ -1858,7 +1751,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1867,18 +1759,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip" + "251.23774.423": null, + "251.25410.104": null, + "251.25410.115": null, + "251.25410.117": null, + "251.25410.119": null, + "251.25410.120": null, + "251.25410.122": null, + "251.25410.123": null, + "251.25410.129": null, + "251.25410.140": null, + "251.25410.148": null }, "name": "oxocarbon" }, @@ -1891,7 +1782,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1899,19 +1789,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip" }, "name": "extra-ide-tweaks" }, @@ -1924,7 +1813,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1932,19 +1820,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip", + "251.23774.423": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip", + "251.25410.104": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip", + "251.25410.115": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip", + "251.25410.117": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip", + "251.25410.119": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip", + "251.25410.120": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip", + "251.25410.122": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip", + "251.25410.123": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip", + "251.25410.129": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip", + "251.25410.140": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip", + "251.25410.148": "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip" }, "name": "extra-tools-pack" }, @@ -1955,23 +1842,21 @@ "goland", "idea-ultimate", "phpstorm", - "pycharm-professional", "rider", "ruby-mine", "rust-rover", "webstorm" ], "builds": { - "243.24978.79": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip" + "251.25410.104": null, + "251.25410.115": null, + "251.25410.117": null, + "251.25410.119": null, + "251.25410.120": null, + "251.25410.123": null, + "251.25410.129": null, + "251.25410.140": null, + "251.25410.148": null }, "name": "nix-lsp" }, @@ -1983,7 +1868,6 @@ "idea-community", "idea-ultimate", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1992,99 +1876,104 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip" + "251.25410.104": null, + "251.25410.115": null, + "251.25410.117": null, + "251.25410.119": null, + "251.25410.120": null, + "251.25410.122": null, + "251.25410.123": null, + "251.25410.129": null, + "251.25410.140": null, + "251.25410.148": null }, "name": "markdtask" } }, "files": { "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip": "sha256-frvQ+Dm1ueID6+vNlja0HtecGyn+ppq9GTgmU3kQ+58=", - "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip": "sha256-QfJAfpKaHeKo9xQwFd+3pVRxYGTO60puORrZ0rdpaZY=", + "https://plugins.jetbrains.com/files/10080/739688/intellij-rainbow-brackets-2024.2.11-241.zip": "sha256-ekeCyyUhzP32v8nu+U/LS0a/eW6onhBX0qCQmNQ/pgg=", "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip": "sha256-25vtwXuBNiYL9E0pKG4dqJDkwX1FckAErdqRPKXybQA=", "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip": "sha256-Bnnvy+HDNkx2DQM7N+JUa8hQzIA3H/5Y0WpWAjPmhUI=", - "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip": "sha256-suQxHLMgY0x/XHI1EikPI1mBpsTn4bkKO6HgCBb+OmA=", - "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip": "sha256-+CeHk1yCPPGP8Vn9irjDqszprqmDTtjqUGuzKk+rJpI=", - "https://plugins.jetbrains.com/files/12024/622380/ReSharperPlugin.CognitiveComplexity-2024.3.0-eap04.zip": "sha256-X2x7uyWoV4aBI8E5bw35QfzmySWzbEAZ2nvdo5i+t+s=", + "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip": "sha256-GO0bXJsHx9O1A6M9NUCv9m4JwKHs5plwSssgx+InNqE=", + "https://plugins.jetbrains.com/files/11058/734948/Extra_Icons-2025.1.5.zip": "sha256-trVQyV4PcxI1BeLtIg3fP1dOITiFRheIGpxU3GuA83w=", + "https://plugins.jetbrains.com/files/11349/737408/aws-toolkit-jetbrains-standalone-3.70-243.zip": "sha256-KtMvtJjV1Oos3H+bffQX6RTTiLj5BIQbOzbRnOu212s=", + "https://plugins.jetbrains.com/files/11349/737411/aws-toolkit-jetbrains-standalone-3.70-251.zip": "sha256-u55hK8kuHIbdNxj/lCF2J8jy+n8Kben23kjIJ8u9r1g=", + "https://plugins.jetbrains.com/files/12024/667413/ReSharperPlugin.CognitiveComplexity-2025.1.0-eap01.zip": "sha256-SWIXjxnwAf9dju1oOgzePrTY0lPNNX54Afp5OIkGGi4=", "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip": "sha256-phv8MTGKNGzRviKzX+nIVTbkX4WkU82QVO5zXUQLtAo=", + "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip": "sha256-obbLL8n6gK8oFw8NnJbdAylPHfTv4GheBDnVFOUpwL0=", "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip": "sha256-/g1ucT18ywVJnCePH7WyMWKgM9umowBz5wFObmO7cws=", + "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip": "sha256-HC1s5FqSLVgPNKc5Wiw0RFC6KpozxmjKzbh9rS9nFwc=", "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip": "sha256-Q+gqKG/2bHD49Xtn9MNlYJQGtNF/7tIay9F7ndi8uwA=", "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip": "sha256-VQqK0Cm9ddXN63KYIqimuGOh7EB9VvdlErp/VrWx8SA=", + "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip": "sha256-DKkgt0z/ui0bOLSbnKy51RL7+9HIqeriroi2otZ64mQ=", "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip": "sha256-eKwDE+PMtYhrGbDDZPS5cimssH+1xV4GF6RXXg/3urU=", "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip": "sha256-4I75KqXyFl73S63O+00usrg8QBcuBRBgfjRmCQMpNks=", - "https://plugins.jetbrains.com/files/1347/696516/scala-intellij-bin-2024.3.42.zip": "sha256-IEh/wlpfCK+lpUD+xYpeCDwpEA8NVzfirpyf5MUgC7A=", + "https://plugins.jetbrains.com/files/1347/735853/scala-intellij-bin-2025.1.23.zip": "sha256-y81nA9MBa3NA8cilX3EIuhlBrKRf3RHP5VSElhguLg8=", "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip": "sha256-Tgu8CfDhO6KugfuLNhmxe89dMm+Qo3fmAg/8hwjUaoc=", + "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip": "sha256-ZYn365EY8+VP1TKM4wBotMj1hYbSSr4J1K5oIZlE2SE=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar": "sha256-mB09zvUg1hLXl9lgW1NEU+DyVel1utZv6s+mFykckYY=", "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar": "sha256-2FlEaHf2rO6xgG3LnZIPt/XKgRGjpLSiEXCncfAf3bI=", "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip": "sha256-yKpWQZGxfsKwPVTJLHpF4KGJ5ANCd73uxHlfdFE4Qf4=", - "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip": "sha256-ycstNSciTV1LAsvJ3fTXN3NmQ259nkrAeX6MASjdmag=", - "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip": "sha256-lq5JmR8gPsrZ9rT+byit98KZSzFsl4UppwYAaE9Kjiw=", + "https://plugins.jetbrains.com/files/164/736911/IdeaVIM-2.24.0.zip": "sha256-v9GD6SHR1MuhXrqLit/eQm2R9c50aZTjpUJN/UOKCa0=", + "https://plugins.jetbrains.com/files/16604/734947/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.7.zip": "sha256-9DLY2HIyQR2w8xPVVKa2l7OZWqfoTvHkLGZYEnDV7/A=", + "https://plugins.jetbrains.com/files/17718/736879/github-copilot-intellij-1.5.44-243.zip": "sha256-YReboCD5Fy6nM1c0s/azNzip2LTSCDCaur9UmMD0kKQ=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip": "sha256-QOF3nAXOfYhNl3YUK1fc9z5H2uXTPm2X+6fVZ5QP8ZQ=", "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip": "sha256-8RjKjmadd1o/M+WTLtKPn354bbKgEht4nvWnMcRPN9w=", - "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar": "sha256-8Ufa8YuGOG78KRSxo/GiwPFrd/3lwQhLWwAnB6igaGE=", + "https://plugins.jetbrains.com/files/18824/736403/CodeGlancePro-1.9.8-signed.zip": "sha256-/1lyQq7JANhcKmIaaBHZ8ZCR4p23sLjLTTq9/68Fz+c=", + "https://plugins.jetbrains.com/files/18922/734995/GerryThemes.jar": "sha256-bNZQnoCUpAyPzSRNeT1w8WOhILncjxh3ul6nOpglkK4=", "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip": "sha256-hoFfIid7lClHDiT+ZH3H+tFSvWYb1tSRZH1iif+kWrM=", "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip": "sha256-jGWRU0g120qYvvFiUFI10zvprTsemuIq3XmIjYxZGts=", + "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip": "sha256-QqEjnN6lUUtHkDRFWPeV3vqgGB/ZfWGVDqtk8gwJEqY=", "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip": "sha256-N66Bh0AwHmg5N9PNguRAGtpJ/dLMWMp3rxjTgz9poFo=", "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip": "sha256-TZPup3EJ0cBv4i2eVAQwVmmzy0rmt4KptEsk3C7baEM=", "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip": "sha256-2qDeC2Fxp4/IfiLPL1JDquJDCzONCp4m92Ht2fnCn/M=", - "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip": "sha256-TEx5wg3Sf3rkhl6oj0hRrMdBJW9KMjZ/yNDgNYaeP28=", - "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip": "sha256-jmfcGDtizib7wQW88sWuzG095nrT0KHyN98trxqISHE=", - "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip": "sha256-P5PmGUNOJJ5+Z1CYQM1ItwrS/JecBPOb9qU3kZK842w=", - "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip": "sha256-Kf5kHd8tGVIClWcrin9zOFbQkZyOrwHpfMvdznPkNC0=", - "https://plugins.jetbrains.com/files/22857/640903/vcs-gitlab-243.22562.53.zip": "sha256-lDStIaRy9ZtCXZxM2RRrz/5oZeL90aRVS63wC4XkJNw=", - "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip": "sha256-VKGZLlL8ALjr6JEQtjhXiIxNrnTPXIoXMToJkJux2dw=", - "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip": "sha256-qkwfEpC2f4vgVsesSiUvd6kK6XnG9DTN4gXUR+rLlK0=", + "https://plugins.jetbrains.com/files/21904/726853/intellij-developer-tools-plugin-7.0.0-signed.zip": "sha256-8ZxPJoqlCGLaVBJjBp0OLJWeU+WL+B+QKECYB+VueSQ=", + "https://plugins.jetbrains.com/files/21962/732363/clouds-docker-gateway-251.25410.75.zip": "sha256-kfXB36mIOn82pq+22ryztxY9K6CgwwNarNKcLuIH9G4=", + "https://plugins.jetbrains.com/files/22407/736889/intellij-rust-251.25410.127.zip": "sha256-ynht10qwZ9cXWDhNJPuFOdhEAuwdr62ZAI5pRsrn7Rs=", + "https://plugins.jetbrains.com/files/22707/738247/continue-intellij-extension-1.0.16.zip": "sha256-H83yxmkzqwkV5W89xuGogm4n5OSppjZAymtIZdnVXWI=", + "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip": "sha256-zNNFPPPnYLkSzXX3CA1IMA0cjeXMcPY58+v80/KjVkg=", + "https://plugins.jetbrains.com/files/22857/736969/vcs-gitlab-IU-251.25410.123-IU.zip": "sha256-MolxGVW15UD2anFjEw2G3VJzwZn7BjfpZKI3TL6uogQ=", + "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip": "sha256-w2vt4kuGd5T8OA5DcTTik2ksvCu0T3oynvTqYtMsVyo=", "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip": "sha256-ssaSY1I6FopLBgVKHUyjBrqzxHLSuI/swtDfQWJ7gxU=", "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip": "sha256-zF89Q1LE6xwBeDKv4FSQ6H6cbABjz74Z/qGwddRWp7M=", - "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip": "sha256-8Q0S6Iqv880JKscoiNfdYnKHFcwQV0raOpOsNe6tgO4=", - "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip": "sha256-avn3oqi6KgMQ73Q7rj7AUKzytD0dxtW2k772OWtW/mM=", - "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip": "sha256-Uq5RdVQTyqRMsEwDZT6Kldv2alt0EVMCABEt/xQUHow=", + "https://plugins.jetbrains.com/files/23927/734950/Extra_IDE_Tweaks-2025.1.5.zip": "sha256-bwZSaUkfJ2D6XLr0e7EoismsTmvNCyRzGd4OWu6u9n0=", + "https://plugins.jetbrains.com/files/24559/734949/Extra_Tools_Pack-2025.1.6.zip": "sha256-SC8IMca0EYEmZFrMsaK3oadaemM4FQnYiTxOTt1zQGg=", "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip": "sha256-NFHB5zWH8pUwz6OT8F7eIiapeEvHX24fj0Eo1qH45Aw=", - "https://plugins.jetbrains.com/files/631/700118/python-243.26053.27.zip": "sha256-/Ceycp+iCxN7nrSg7L1xNqlOY1hzij/ADEvHUWBwTfE=", + "https://plugins.jetbrains.com/files/631/737817/python-251.25410.129.zip": "sha256-ieQ+ZWowWGwoTj1vxxCnO4hhNeGVE36V12V5Q5MOUr8=", "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip": "sha256-pFKAZ8xFNfUh7/Hi4NYPDQAhRRYm4WKTpCQELqBfb40=", - "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip": "sha256-kL/A2R8j2JKMU61T/xJahPwKPYmwFCFy55NPSoBh/Xc=", - "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip": "sha256-m2iKdm4f1h+k1XdQvJCd8T83jEKip+H1E1p8XMfrGcg=", - "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip": "sha256-TiVoHX56uEAsSWqE7n0jrePiabN3gcNRFNuSeBhvul4=", - "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip": "sha256-s4bSXVqrhy3VMQQd2sT+Xv9v0hQwGGIYk0H+wjonFO4=", - "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", + "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip": "sha256-34s7pOsqMaGoVYhCuAZtylNwplQOtNQJUppepsl4F4Q=", + "https://plugins.jetbrains.com/files/6981/724264/ini-251.23774.466.zip": "sha256-CnoNNfcsbP9IipuqsBV1OZu+l3h7Yrs6MSofriDvI34=", + "https://plugins.jetbrains.com/files/6981/724294/ini-251.25410.24.zip": "sha256-dcFDO0/mzbjkrsgM+RdHBAA5davTqD5is2D7JYQiTxc=", + "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip": "sha256-BW47ZEUINVnhV0RZ1np7Dkf3lfyrtKoZ9ej/SVct2Xs=", "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip": "sha256-KY5VRiLJJwa9OVVog1W3MboZjwVboYwYm+i4eqooo44=", "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip": "sha256-8IHS3kmmbL8uQYnaMW7NgBIpBKT+XDJ4QDiiPZa5pzo=", - "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip": "sha256-mlCow96mI2k7c/oGe064DqjUViOFhNgwNjF6DVyak4E=", - "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip": "sha256-drNmhJMe+kuY2fcHjY+SQmkACvFk0rVI4vAhyZ/bgLc=", - "https://plugins.jetbrains.com/files/7320/701175/PHP_Annotations-11.2.0.zip": "sha256-qUgbbG+S7RVt7zLU8ngnp7NzJUb23AuKM7KLAWYQLUs=", - "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip": "sha256-45UtQRZMtKF6addrrB3A+goeyICMfcZ2FKcJvJSqgg4=", - "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip": "sha256-4KkUOSN9KnBjpo92LvkN/7ZtDG/gSAFHgDf5ESSsgoY=", + "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip": "sha256-jNHP/vaCaolmvNUQRGmIgSR1ykjDtKqyJ69UIn5cz70=", + "https://plugins.jetbrains.com/files/7219/739169/Symfony_Plugin-2025.1.279.zip": "sha256-OiUfPbbSuEFTHTmAdRNev7/StLnz5d1ziebSpuEHCPA=", + "https://plugins.jetbrains.com/files/7320/718466/PHP_Annotations-12.0.0.zip": "sha256-HfTd3zT/7sOrYutEkEzpFAu6AijrFrpHJg1ftP3N87Y=", + "https://plugins.jetbrains.com/files/7322/737802/python-ce-251.25410.129.zip": "sha256-gN9XqO/x41scgJ9dzTdC4i4hIZJpwSeR7OjU2BG8gzU=", "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip": "sha256-3RJ7YVFtynyqeLIzdrirCMbWNZmUkJ+DT/9my71H0Dk=", + "https://plugins.jetbrains.com/files/7391/722116/asciidoctor-intellij-plugin-0.44.5.zip": "sha256-OqjgUctKp9bxVX3zXR48NGGUgZxmwBK6Olcsz0ZWEZ8=", "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar": "sha256-Z7ZWDomXnTdHFKOElMkt53imef6aT7H5XeD6lOOFxfQ=", - "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip": "sha256-ZbjLwXY+AocK1OtlyPd+wcObiArWSOWMXjtWaLWMbDo=", - "https://plugins.jetbrains.com/files/7724/680796/clouds-docker-impl-243.24978.54.zip": "sha256-pGAUljrRizCer076iM1oKrNj54tN3VxSvYldfKAsqRE=", - "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip": "sha256-fJatpg7WzrStvABSeIayeFF4bjv059VW6ZTTKQxLNV8=", - "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip": "sha256-WL6AQuo1zE4x2b3M2rjTa7T9AbGKc2urTZBa6PU1i3w=", + "https://plugins.jetbrains.com/files/7499/721170/gittoolbox-600.1.2_243-signed.zip": "sha256-cnVK5tsExjEAqP3cuh1PgNjrZYt2dVGQ/RL/jr89Zew=", + "https://plugins.jetbrains.com/files/7724/724240/clouds-docker-impl-251.23774.466.zip": "sha256-2o1CaX3Xe86ZksIMW9ZqvnuvfvnqSddDDxEU/SFWER8=", + "https://plugins.jetbrains.com/files/7724/731335/clouds-docker-impl-251.25410.67.zip": "sha256-p+7U17bTsrxGFVR+Kguma43FOHW0d3NQKRjwxONqL1g=", "https://plugins.jetbrains.com/files/8097/636616/graphql-243.22562.13.zip": "sha256-rr2pO0mIsqWXYZgwEhcQJlk0lQabxnIPxqRCGdTFaTw=", - "https://plugins.jetbrains.com/files/8097/680200/graphql-243.24978.46.zip": "sha256-RJELd6KPzlRu+UwWBPW1fN33Zj0PcgQ0hGCJ6+ii/fI=", - "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip": "sha256-p52AGXhfldRiT7FoWeDQuP38+/9J1KuPDyhM4VUwQTc=", - "https://plugins.jetbrains.com/files/8195/630064/toml-243.21565.122.zip": "sha256-vKigewUGi06by9/6a9HbjN51zPAIafdk6w4MFG4kwG8=", - "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip": "sha256-OFoWuz5z0BcZJqWkS+vkcD/Q0e5IUnQRY84/GEQQIb8=", + "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip": "sha256-O+gSW36MwqQqUiZBQl8J4NFNK+jFowtT9k1ykhSraxM=", + "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip": "sha256-cNWs+ycKlqednnqJAm4AkqF3LTdMt8jhwWWiEDdKQE4=", + "https://plugins.jetbrains.com/files/8195/740008/toml-251.25410.140.zip": "sha256-DYgGpnlqpr/d/hJXD6uYsa2tzErM4uCofgok/3WayYs=", "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip": "sha256-4c1nxjbEsNs9twmQnJllk1OIVmm0nnUYZ0R7f/6bJt4=", - "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip": "sha256-JugbJM8Lr2kbhP9hdLE3kUStl2vOMUB5wGTwNLxAZd0=", - "https://plugins.jetbrains.com/files/8554/684425/featuresTrainer-243.24978.79.zip": "sha256-1oI8hw6YYhUzhfv5RjtlBFG0OvucqVs/XUXMioRIuzA=", - "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip": "sha256-xmjPvJVe27gL1DEwtzvKvzEkF80ZGHUCKjLOY2nO+T0=", - "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip": "sha256-LMoWgp7perGOFj6d32cQTfo+TLFeupgn53ZRLVON0JA=", + "https://plugins.jetbrains.com/files/8327/718480/Minecraft_Development-2025.1-1.8.4.zip": "sha256-PNKG9qHZRrPDw95ZWs8gwkcomxFFLl5WEvCk6NR7gSk=", + "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip": "sha256-P6ux6UgbjeJW3lF4w696bZ73zumY8hEm1iM98IsKgTQ=", + "https://plugins.jetbrains.com/files/8554/740850/featuresTrainer-251.25410.148.zip": "sha256-iK3cy0Nf87rLV0m/t3LJv65Klij/9L5l9ad2UW9O00w=", "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip": "sha256-OFisV6Vs/xlbDvchxfrREDVgVh7wcfGnot+zUrgQU6M=", "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip": "sha256-hR7hC2phDJnHXxPy80WlEDFAhZHtMCu7nqYvAb0VeTI=", - "https://plugins.jetbrains.com/files/9568/700127/go-plugin-243.26053.27.zip": "sha256-SqFl1ArPLi/Bc43n0u+pMCAw+8hyqM/D41w4k1DJQcA=", - "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar": "sha256-TEF4rtS04kQ/h+SKXnbqLjrMGm3jHk0MJ7ffe0lvbs4=", + "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip": "sha256-0c/2qbuu+M6z0gvpme+Mkv23JlQKNTUU+9GL9mh2IFw=", + "https://plugins.jetbrains.com/files/9568/728728/go-plugin-251.25410.59.zip": "sha256-hBZozpcXPSsvSH5/8hJ2OhA3ukCsLXvXGlqYMv2GtFA=", + "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar": "sha256-XYCD4kOHDeIKhti0T175xhBHR8uscaFN4c9CNlUaCDs=", + "https://plugins.jetbrains.com/files/9707/702582/ANSI_Highlighter_Premium-24.3.4.jar": "sha256-STDhSOshNJU8YOjd1ZMxNl4WaHEp81t9TimFVQGZgWw=", "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip": "sha256-Mzmmq0RzMKZeKfBSo7FHvzeEtPGIrwqEDLAONQEsR1M=", "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip": "sha256-ArwC2HO2cHlTcFKXQBuKzZTuOiiIDEc/SGDsDQUCZmI=" } diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix deleted file mode 100644 index 2dc71fabd3e2..000000000000 --- a/pkgs/applications/editors/lapce/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - nix-update-script, - rustPlatform, - cmake, - pkg-config, - perl, - python3, - fontconfig, - glib, - gtk3, - openssl, - libGL, - libobjc, - libxkbcommon, - wrapGAppsHook3, - wayland, - gobject-introspection, - xorg, -}: -let - rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ - libGL - libxkbcommon - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libXxf86vm - xorg.libxcb - wayland - ]; -in -rustPlatform.buildRustPackage rec { - pname = "lapce"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "lapce"; - repo = "lapce"; - tag = "v${version}"; - sha256 = "sha256-vBBYNHgZiW5JfGeUG6YZObf4oK0hHxTbsZNTfnIX95Y="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-cgSr1GHQUF4ccVd9w3TT0+EI+lqQpDzfXHdRWr75eDE="; - - env = { - # Get openssl-sys to use pkg-config - OPENSSL_NO_VENDOR = 1; - - # This variable is read by build script, so that Lapce editor knows its version - RELEASE_TAG_NAME = "v${version}"; - }; - - postPatch = '' - substituteInPlace lapce-app/Cargo.toml --replace ", \"updater\"" "" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - perl - python3 - wrapGAppsHook3 # FIX: No GSettings schemas are installed on the system - gobject-introspection - ]; - - buildInputs = - rpathLibs - ++ [ - glib - gtk3 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - ]; - - postInstall = - if stdenv.hostPlatform.isLinux then - '' - install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg - install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop - - $STRIP -S $out/bin/lapce - - patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/lapce - '' - else - '' - mkdir $out/Applications - cp -r extra/macos/Lapce.app $out/Applications - ln -s $out/bin $out/Applications/Lapce.app/Contents/MacOS - ''; - - dontPatchELF = true; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Lightning-fast and Powerful Code Editor written in Rust"; - homepage = "https://github.com/lapce/lapce"; - changelog = "https://github.com/lapce/lapce/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ elliot ]; - mainProgram = "lapce"; - }; -} diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix deleted file mode 100644 index d65389d917e2..000000000000 --- a/pkgs/applications/editors/libresprite/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - - cmake, - pkg-config, - ninja, - gtest, - - curl, - freetype, - giflib, - libjpeg, - libpng, - libwebp, - libarchive, - pixman, - tinyxml-2, - zlib, - SDL2, - SDL2_image, - lua, - AppKit, - Cocoa, - Foundation, - - nixosTests, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libresprite"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "LibreSprite"; - repo = "LibreSprite"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-piA/hLQqdfyVH4GPu5ElXZtowQL9AGaK7GhZOME4L0Q="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ninja - gtest - ]; - - buildInputs = - [ - curl - freetype - giflib - libjpeg - libpng - libwebp - libarchive - pixman - tinyxml-2 - zlib - SDL2 - SDL2_image - lua - # no v8 due to missing libplatform and libbase - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - Foundation - ]; - - cmakeFlags = [ - "-DWITH_DESKTOP_INTEGRATION=ON" - "-DWITH_WEBP_SUPPORT=ON" - ]; - - hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "format"; - - # Install mime icons. Note that the mimetype is still "x-aseprite" - postInstall = '' - src="$out/share/libresprite/data/icons" - for size in 16 32 48 64; do - dst="$out"/share/icons/hicolor/"$size"x"$size" - install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/aseprite.png - done - ''; - - passthru.tests = { - libresprite-can-open-png = nixosTests.libresprite; - }; - - meta = { - homepage = "https://libresprite.github.io/"; - description = "Animated sprite editor & pixel art tool, fork of Aseprite"; - license = lib.licenses.gpl2Only; - longDescription = '' - LibreSprite is a program to create animated sprites. Its main features are: - - - Sprites are composed by layers & frames (as separated concepts). - - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. - - Load/save sequence of PNG files and GIF animations (and FLC, FLI, JPG, BMP, PCX, TGA). - - Export/import animations to/from Sprite Sheets. - - Tiled drawing mode, useful to draw patterns and textures. - - Undo/Redo for every operation. - - Real-time animation preview. - - Multiple editors support. - - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. - - Onion skinning. - ''; - maintainers = with lib.maintainers; [ fgaz ]; - platforms = lib.platforms.all; - # https://github.com/LibreSprite/LibreSprite/issues/308 - broken = stdenv.hostPlatform.isDarwin; - }; -}) diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix deleted file mode 100644 index 8d6d1ac8bc04..000000000000 --- a/pkgs/applications/editors/lite-xl/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - fetchFromGitHub, - Foundation, - freetype, - lib, - lua5_4, - meson, - ninja, - pcre2, - pkg-config, - SDL2, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "lite-xl"; - version = "2.1.7"; - - src = fetchFromGitHub { - owner = "lite-xl"; - repo = "lite-xl"; - rev = "v${version}"; - hash = "sha256-Ig0XDxnll/zruAwWHwuXiqumBXgAPxuK0E1ELupvcXo="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = - [ - freetype - lua5_4 - pcre2 - SDL2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; - - mesonFlags = [ - "-Duse_system_lua=true" - ]; - - meta = with lib; { - description = "Lightweight text editor written in Lua"; - homepage = "https://github.com/lite-xl/lite-xl"; - license = licenses.mit; - maintainers = with maintainers; [ sefidel ]; - platforms = platforms.unix; - mainProgram = "lite-xl"; - }; -} diff --git a/pkgs/applications/editors/neovim/build-neovim-plugin.nix b/pkgs/applications/editors/neovim/build-neovim-plugin.nix index 18e1c550ade5..fece233768af 100644 --- a/pkgs/applications/editors/neovim/build-neovim-plugin.nix +++ b/pkgs/applications/editors/neovim/build-neovim-plugin.nix @@ -26,6 +26,7 @@ let luaDrv = originalLuaDrv.overrideAttrs (oa: { version = attrs.version or oa.version; + __intentionallyOverridingVersion = true; rockspecVersion = oa.rockspecVersion; extraConfig = '' @@ -43,6 +44,7 @@ let lua.pkgs.luarocksMoveDataFolder ]; version = "${originalLuaDrv.version}-unstable-${oa.version}"; + __intentionallyOverridingVersion = true; } ) ); diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index eec889819eab..be75f25172d9 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -365,7 +365,7 @@ let homepage mainProgram license - maintainers + teams platforms ; diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 9a3f9e0bab1e..e371605d341f 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -19,11 +19,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.20"; + version = "0.26.21"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-lKGjIeNxdBqmlsXvZTe8BnRirt+VrxwX/9CCQVVUuow="; + sha256 = "sha256-tuYvcfcxdX1nzTR603rEYIgXLEjnZH3mDRJUD/BVRJs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 1cf917d96dcd..74c2fbe5a527 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -8,7 +8,7 @@ gtk3, gtksourceview, pango, - webkitgtk_4_0, + webkitgtk_4_1, pygobject3, pyyaml, setuptools, @@ -16,14 +16,14 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.38"; + version = "2.39"; pyproject = true; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; tag = "v${version}"; - sha256 = "sha256-7PUBWJhxE4K9GqAAFGrkelynheuALiDRZXM5acZF7uQ="; + sha256 = "sha256-H7Ub4dCJQa4Y3DNBzeIYWlNkpYftezY2MNWokw8ocoA="; }; # We have not packaged tests. @@ -39,7 +39,7 @@ buildPythonApplication rec { gtk3 gtksourceview pango - webkitgtk_4_0 + webkitgtk_4_1 pygobject3 pyyaml ]; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 44548379812e..a5f327e5a5fc 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -33,7 +33,7 @@ zip, git, makeWrapper, - electron_33, + electron_34, server ? false, # build server version pam, nixosTests, @@ -42,13 +42,7 @@ let # Note: we shouldn't use the latest electron here, since the node-abi dependency might # need to be updated every time the latest electron gets a new abi version number - electron = electron_33; - - # unpack tarball containing electron's headers - electron-headers = runCommand "electron-headers" { } '' - mkdir -p $out - tar -C $out --strip-components=1 -xvf ${electron.headers} - ''; + electron = electron_34; mathJaxSrc = fetchzip { url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip"; @@ -241,7 +235,7 @@ stdenv.mkDerivation rec { --replace-fail "npm ci && " "" # use electron's headers to make node-gyp compile against the electron ABI - export npm_config_nodedir="${electron-headers}" + export npm_config_nodedir="${electron.headers}" ### override the detected electron version substituteInPlace node_modules/@electron-forge/core-utils/dist/electron-version.js \ diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix deleted file mode 100644 index 5a398a4af5dd..000000000000 --- a/pkgs/applications/editors/sigil/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - makeWrapper, - boost, - xercesc, - qtbase, - qttools, - qtwebengine, - qtsvg, - python3Packages, -}: - -stdenv.mkDerivation rec { - pname = "sigil"; - version = "2.4.2"; - - src = fetchFromGitHub { - repo = "Sigil"; - owner = "Sigil-Ebook"; - tag = version; - hash = "sha256-/lnSNamLkPLG8tn0w8F0zFyypMUXyMhgxA2WyQFegKw="; - }; - - pythonPath = with python3Packages; [ lxml ]; - - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - ]; - - buildInputs = [ - boost - xercesc - qtbase - qttools - qtwebengine - qtsvg - python3Packages.lxml - ]; - - prePatch = '' - sed -i '/^QTLIB_DIR=/ d' src/Resource_Files/bash/sigil-sh_install - ''; - - dontWrapQtApps = true; - - preFixup = '' - wrapProgram "$out/bin/sigil" \ - --prefix PYTHONPATH : $PYTHONPATH \ - ''${qtWrapperArgs[@]} - ''; - - meta = { - description = "Free, open source, multi-platform ebook (ePub) editor"; - homepage = "https://github.com/Sigil-Ebook/Sigil/"; - license = lib.licenses.gpl3; - # currently unmaintained - platforms = lib.platforms.linux; - mainProgram = "sigil"; - }; -} diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 329c0f5a8893..b5b9026f0140 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -20,6 +20,7 @@ qtbase, qtsvg, qtmacextras, + fetchpatch, ghostscriptX ? null, extraFonts ? false, chineseFonts ? false, @@ -79,6 +80,14 @@ stdenv.mkDerivation { qtmacextras ]; + patches = [ + (fetchpatch { + name = "fix-compile-clang-19.5.patch"; + url = "https://github.com/texmacs/texmacs/commit/e72783b023f22eaa0456d2e4cc76ae509d963672.patch"; + hash = "sha256-oJCiXWTY89BdxwbgtFvfThid0WM83+TAUThSihfr0oA="; + }) + ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "TEXMACS_GUI" "Qt") (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "./TeXmacs.app/Contents/Resources") diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index fada79bc0f8d..10388a6d822d 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "texmaker"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2"; - hash = "sha256-l3zlgOJcGrbgvD2hA74LQ+v2C4zg0nJzEE/df1hhd/w="; + hash = "sha256-uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY="; }; buildInputs = [ diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix deleted file mode 100644 index da5ffb192a3f..000000000000 --- a/pkgs/applications/editors/textadept/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchurl, - cmake, - withQt ? true, - qtbase, - wrapQtAppsHook, - withCurses ? false, - ncurses, -}: -stdenv.mkDerivation rec { - version = "12.4"; - pname = "textadept"; - - src = fetchFromGitHub { - name = "textadept11"; - owner = "orbitalquark"; - repo = "textadept"; - rev = "textadept_${version}"; - sha256 = "sha256-nPgpQeBq5Stv2o0Ke4W2Ltnx6qLe5TIC5a8HSYVkmfI="; - }; - - nativeBuildInputs = [ cmake ] ++ lib.optionals withQt [ wrapQtAppsHook ]; - - buildInputs = lib.optionals withQt [ qtbase ] ++ lib.optionals withCurses ncurses; - - cmakeFlags = - lib.optional withQt [ "-DQT=ON" ] - ++ lib.optional withCurses [ - "-DCURSES=ON" - "-DQT=OFF" - ]; - - preConfigure = - '' - mkdir -p $PWD/build/_deps - - '' - + lib.concatStringsSep "\n" ( - lib.mapAttrsToList ( - name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}" - ) (import ./deps.nix) - ); - - meta = with lib; { - description = "Extensible text editor based on Scintilla with Lua scripting"; - homepage = "http://foicica.com/textadept"; - license = licenses.mit; - maintainers = with maintainers; [ - raskin - mirrexagon - arcuru - ]; - platforms = platforms.linux; - mainProgram = "textadept"; - }; -} diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 95ff14a96bd5..773b149a0b6f 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "tiled"; - version = "1.11.2"; + version = "1.11.90"; src = fetchFromGitHub { owner = "mapeditor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E="; + sha256 = "sha256-gGsozdFEE5c315DF+EsIY9wGv50wwrOBycejTkVwEHA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 68147dd144a1..860249fb6d3d 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.1122"; + version = "9.1.1336"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-Eaxia/FLRCnr8MVDvt+ZUFwIQD5Pqq7SsmWZeQdjuXs="; + hash = "sha256-fF1qRPdVzQiYH/R0PSmKR/zFVVuCtT6lPN1x1Th5SgA="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 837e0b9085a0..ec267de59e44 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -14,9 +14,6 @@ url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/68f6d131750aa778807119e03eed70286a17b1cb/trunk/archlinux.vim"; sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; }, - # apple frameworks - Carbon, - Cocoa, }: let @@ -41,16 +38,11 @@ stdenv.mkDerivation { gettext pkg-config ]; - buildInputs = - [ - ncurses - bash - gawk - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - ]; + buildInputs = [ + ncurses + bash + gawk + ]; strictDeps = true; diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index 34aa8e84721a..9b20629618ae 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -30,13 +30,6 @@ makeWrapper, wrapGAppsHook3, - # apple frameworks - CoreServices, - CoreData, - Cocoa, - Foundation, - libobjc, - features ? "huge", # One of tiny, small, normal, big or huge wrapPythonDrv ? false, guiSupport ? config.vim.gui or (if stdenv.hostPlatform.isDarwin then "gtk2" else "gtk3"), @@ -195,13 +188,6 @@ stdenv.mkDerivation { ] ++ lib.optional (guiSupport == "gtk2") gtk2-x11 ++ lib.optional (guiSupport == "gtk3") gtk3-x11 - ++ lib.optionals darwinSupport [ - CoreServices - CoreData - Cocoa - Foundation - libobjc - ] ++ lib.optional luaSupport lua ++ lib.optional pythonSupport python3 ++ lib.optional tclSupport tcl diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 3d401f553f35..a92d97d57e3d 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -150,7 +150,6 @@ stdenv.mkDerivation (finalAttrs: { postConfigure = '' substituteInPlace src/auto/config.mk \ --replace " -L${stdenv.cc.libc}/lib" "" \ - --replace " -L${darwin.libobjc}/lib" "" \ --replace " -L${darwin.libunwind}/lib" "" \ --replace " -L${libiconv}/lib" "" diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 508f0452724b..5d7496000268 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -1,5 +1,6 @@ { buildVimPlugin, + coc-basedpyright, coc-clangd, coc-css, coc-diagnostic, @@ -7,6 +8,11 @@ coc-toml, }: final: prev: { + coc-basedpyright = buildVimPlugin { + inherit (coc-basedpyright) pname version meta; + src = "${coc-basedpyright}/lib/node_modules/coc-basedpyright"; + }; + coc-clangd = buildVimPlugin { inherit (coc-clangd) pname version meta; src = "${coc-clangd}/lib/node_modules/coc-clangd"; diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index 5a8942deaac6..e67d760c3efe 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -3,6 +3,14 @@ "date": "2022-07-27", "new": "true-zen-nvim" }, + "codeium-nvim": { + "date": "2025-04-09", + "new": "windsurf-nvim" + }, + "codeium-vim": { + "date": "2025-04-09", + "new": "windsurf-vim" + }, "compe-conjure": { "date": "2024-11-19", "new": "cmp-conjure" diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a6bfce69d460..649130a0da6c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -74,12 +74,12 @@ final: prev: { CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2025-03-28"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "cd82b6b9c4cfb254218f5782cc3339e05cbb9989"; - sha256 = "1v9cvhb2gh2b35fmb8bmamjq3bwghrhx59qbx0i6kdwki12sp5l5"; + rev = "16d897fd43d07e3b54478ccdb2f8a16e4df4f45a"; + sha256 = "1mda0maxgr4yqyaixl1x56fsldaj46pnq8xlcz01apvmc8i91yq6"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; meta.hydraPlatforms = [ ]; @@ -87,12 +87,12 @@ final: prev: { Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2025-02-23"; + version = "2025-03-29"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "77ff3fa0b0eb0453ca52467c53004330f010e3f0"; - sha256 = "12vifxvh0hqbccygz8bhcdchw583az74kzkjb86h0dw16f3wdmi2"; + rev = "262e4cf3fe6a6564e536efb631ab9dd6994ebcd9"; + sha256 = "14jhh4b3z6fgs7bxd5a62vb2k4j038v23nq6j8r9l9rcra5i2hik"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; meta.hydraPlatforms = [ ]; @@ -137,6 +137,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + GPTModels-nvim = buildVimPlugin { + pname = "GPTModels.nvim"; + version = "2025-05-15"; + src = fetchFromGitHub { + owner = "Aaronik"; + repo = "GPTModels.nvim"; + rev = "04d91c778d74f762143203ab81e155eec642b5f6"; + sha256 = "06spvkfc1bhckq8w56w6ha4gzk60wfhjlyivrx51awz20sd6hyw0"; + }; + meta.homepage = "https://github.com/Aaronik/GPTModels.nvim/"; + meta.hydraPlatforms = [ ]; + }; + Improved-AnsiEsc = buildVimPlugin { pname = "Improved-AnsiEsc"; version = "2015-08-26"; @@ -152,12 +165,12 @@ final: prev: { Ionide-vim = buildVimPlugin { pname = "Ionide-vim"; - version = "2024-11-03"; + version = "2025-05-11"; src = fetchFromGitHub { owner = "ionide"; repo = "Ionide-vim"; - rev = "c7e8973426431839e9d888a4aa8d6a41251ba16f"; - sha256 = "1gchcwxfaih2anl512zmm7rr7a15jj97lkps7r0r2fqpb9mpdfgv"; + rev = "6d6583e4a23333b3bc6f7af5d2cbffed377c15a9"; + sha256 = "053ay19ykhkd6rrrs9s22i8x431haza21fd5szv824dqzxfgl04a"; }; meta.homepage = "https://github.com/ionide/Ionide-vim/"; meta.hydraPlatforms = [ ]; @@ -191,12 +204,12 @@ final: prev: { LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2025-03-01"; + version = "2025-05-12"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "ec5981dfb1222c3bf246d9bcaa713d5cfa486fbd"; - sha256 = "0vrp2zqhq5ak5yxrf2i9fizkkxfsk7m90qaj91zj2rvv3zvgf14p"; + rev = "25abbf546d564dc484cf903804661ba12de45507"; + sha256 = "0q1jhpij75ps2fkincrq59dsqlzyacm2m0c783b9dgm3vz783xnl"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; meta.hydraPlatforms = [ ]; @@ -204,12 +217,12 @@ final: prev: { LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2025-03-28"; + version = "2025-05-10"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "16484c86c92a7e4b46d3a12da97979d7fba50886"; - sha256 = "0k4wjylvwyhckx74fi7xkvnq4wz7qvs2wx9ia5j3brg06njaphck"; + rev = "f1e194ce84edc21c5658b1238a54efa92ef642f0"; + sha256 = "1b25lnc5pmv2ksggibq5wqfysxhp1mhgzagc5h751r7ydz849xhl"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; meta.hydraPlatforms = [ ]; @@ -373,12 +386,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-03-28"; + version = "2025-05-17"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "e659e0c6ca06727ed898aaaeea3850f528898684"; - sha256 = "0kz3ay9zbpcwc1pkh251qyxb1zkl8v06nb7ifisq2lxllyp4k6ws"; + rev = "386bdbf18abb6ca103495c5bdbab65e46f3c361d"; + sha256 = "1kanvzdfx5mxjc8q52mrjl74wdciskdvba3252bb6y10jcd61k6a"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -595,12 +608,12 @@ final: prev: { actions-preview-nvim = buildVimPlugin { pname = "actions-preview.nvim"; - version = "2025-02-26"; + version = "2025-04-27"; src = fetchFromGitHub { owner = "aznhe21"; repo = "actions-preview.nvim"; - rev = "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2"; - sha256 = "0qh9inc4vjpkihsrr2glp1izdssbyv3gj5mwk5g93n6b22i63z9h"; + rev = "36513ad213855d497b7dd3391a24d1d75d58e36f"; + sha256 = "1fri1rd3fsgqb232bh7wdv8nbx40dszrdxjyqjpw6hb0xsbg025d"; }; meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; meta.hydraPlatforms = [ ]; @@ -634,12 +647,12 @@ final: prev: { aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2025-03-19"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "9ebc13583cff447f5493a63e99dfca526b3c3088"; - sha256 = "17mjs95jnnvsg1ihwbsa3z6hr88rvfh36pv1x4cad7hsaal3dcrg"; + rev = "2e00d1d4248f08dddfceacb8d2996e51e13e00f6"; + sha256 = "18rhmpqs8440hn4g5786znj37fzb01wa3zws33rlq9vm6sfb0grw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -700,12 +713,12 @@ final: prev: { aider-nvim = buildVimPlugin { pname = "aider.nvim"; - version = "2025-01-07"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "joshuavial"; repo = "aider.nvim"; - rev = "a34a03635a130f16a56e6a50b211bb72cc1aff96"; - sha256 = "00zfkqcldrqmlmj30gany0yqmyrc1i88hv7655bc78i0rihkv7di"; + rev = "1e5fc680a764d2b93f342005d7e4415fec469088"; + sha256 = "0f4gn4mwcghpcy5whah230y22wqaa1hxh8aczysh09fwdnigb4r4"; }; meta.homepage = "https://github.com/joshuavial/aider.nvim/"; meta.hydraPlatforms = [ ]; @@ -726,12 +739,12 @@ final: prev: { ale = buildVimPlugin { pname = "ale"; - version = "2025-03-28"; + version = "2025-05-17"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "add538213fe0d326f541fd58fd113b9f64a83378"; - sha256 = "11m1dc972azfijqq8xljkzi4rfy57lkm3fax1a4z14y681pkb33m"; + rev = "5098dfd27edf2b38e5af284f6f440d24cf806b53"; + sha256 = "02wf68p0wn196qbzi01rm0y31xwilyzr4gp786ysq6i5fq0b2n0x"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; meta.hydraPlatforms = [ ]; @@ -856,12 +869,12 @@ final: prev: { arrow-nvim = buildVimPlugin { pname = "arrow.nvim"; - version = "2025-03-19"; + version = "2025-03-31"; src = fetchFromGitHub { owner = "otavioschwanck"; repo = "arrow.nvim"; - rev = "9608ce6d7e6935efd423946a319f7f4041cbde93"; - sha256 = "00xz4wnmllw8pc707py0n8a5avag5wyrk165i9yl0al2y92fw5fn"; + rev = "6e0f726f55f99332dd726a53effd6813786b6d49"; + sha256 = "1mwmjaxb7zr00pmxzx8g8dv1vwsbb1ssjrvmyalyc1g1gvnqm8c8"; }; meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/"; meta.hydraPlatforms = [ ]; @@ -882,12 +895,12 @@ final: prev: { astrocore = buildVimPlugin { pname = "astrocore"; - version = "2025-03-27"; + version = "2025-04-30"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrocore"; - rev = "1cb27c53d1fbe0852f1f368b706631ef4e007630"; - sha256 = "1y8a4dy36l5z0lifbn7bsl1phzpra8rkdqfrb3z09nfl7l1dw3ql"; + rev = "c797dd5a592e2bd154f2503e231b8a4083659534"; + sha256 = "1dmdnk3hggdssbaqz9bdf7h29chc64vw20bnxv5n6qrnrfrsfqx0"; }; meta.homepage = "https://github.com/AstroNvim/astrocore/"; meta.hydraPlatforms = [ ]; @@ -895,12 +908,12 @@ final: prev: { astrolsp = buildVimPlugin { pname = "astrolsp"; - version = "2025-03-28"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrolsp"; - rev = "bb0051597474971b93e1cde2fd960dda978c2378"; - sha256 = "04v1vg0zyp3bjyikxm4qw6agylw4hjv2jg77vspnijvikb2qk6zq"; + rev = "f2604d0de0bfd3c442a2f2a47d9e7be850467883"; + sha256 = "0pgz1ndrksqicdpq5dyqq3a1clwi5d3vd3xfdd6v7ckzndg5gxqb"; }; meta.homepage = "https://github.com/AstroNvim/astrolsp/"; meta.hydraPlatforms = [ ]; @@ -921,12 +934,12 @@ final: prev: { astroui = buildVimPlugin { pname = "astroui"; - version = "2025-03-26"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astroui"; - rev = "7a46b59fc51afb91bcb37f7a2ef3f8811b66bc93"; - sha256 = "1xxzr8pri876csh0cl464lp5rrsgca8vwh4mjp5c5hl7s8cf03ci"; + rev = "fded232ee0001c6bed9b654188e3dd4b0c58317c"; + sha256 = "0vh7qyj0cyd3vq1mv253sd48dcapf7idfnh7wv29qvvpsvwvamxc"; }; meta.homepage = "https://github.com/AstroNvim/astroui/"; meta.hydraPlatforms = [ ]; @@ -1090,12 +1103,12 @@ final: prev: { aurora = buildVimPlugin { pname = "aurora"; - version = "2025-03-03"; + version = "2025-04-07"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "3d38b4adb9da28b717f8e6275c2b4145e30d6d70"; - sha256 = "140vwjyvg2kr4x8i0kmhv14inhnz3glwza5wvlrz0r0qwsywb6c8"; + rev = "8524a501e42636b8697d6630c6076058ab02de49"; + sha256 = "0s0l8vmhb1nl1b0hb44jaf8098gb768kvmpbz4zg5nzjp4pig4mv"; }; meta.homepage = "https://github.com/ray-x/aurora/"; meta.hydraPlatforms = [ ]; @@ -1155,12 +1168,12 @@ final: prev: { auto-session = buildVimPlugin { pname = "auto-session"; - version = "2025-03-16"; + version = "2025-04-23"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "317412742990371f8e4709074da5c378456a27ff"; - sha256 = "06kxf9carklffzar4q62hgdid60v5a38w4d5wrz0864wrdyh9kjd"; + rev = "00334ee24b9a05001ad50221c8daffbeedaa0842"; + sha256 = "0pk8qsnimr2csbwnih5fwc0gvay60443c42r75xhb4sli03k6kjx"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; meta.hydraPlatforms = [ ]; @@ -1325,12 +1338,12 @@ final: prev: { barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2025-02-12"; + version = "2025-04-28"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "807bede7ef1d8e2ac5f108e9ac8123b1e2d321e3"; - sha256 = "04xflw3m9c8dgh91pwxmllc1wqc7vqbvnbg2p7m7x73cbwvswxs5"; + rev = "3a74402bdf04745a762de83d5c5e88e3e9b0e2e0"; + sha256 = "153kk3vh25pprvrwbckb9kqn3j4fjyl8svrfk55gnk71pqjf03s3"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; meta.hydraPlatforms = [ ]; @@ -1351,12 +1364,12 @@ final: prev: { base16-nvim = buildVimPlugin { pname = "base16-nvim"; - version = "2025-02-22"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "RRethy"; repo = "base16-nvim"; - rev = "3f13e15c53ea2aaf79c24ceab725309d87f0619c"; - sha256 = "1z6pdf707r2rpmzi057dhcmd045695v03215asn1hdn8r294zcmg"; + rev = "965160025d0facbe9caa863e5beef2a7a488e9d1"; + sha256 = "02w1mn15gydma9canvqrlwf4l5z76s1vs01zanipwwflvwclsb8f"; }; meta.homepage = "https://github.com/RRethy/base16-nvim/"; meta.hydraPlatforms = [ ]; @@ -1377,12 +1390,12 @@ final: prev: { base46 = buildVimPlugin { pname = "base46"; - version = "2025-02-19"; + version = "2025-04-13"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "59566882e09a8a77dbdb33b678a93680c36ae089"; - sha256 = "1ada1dwx0xgmhs0j9la4sd7m5pl8l72sfxn08rpwl728gsx9njdx"; + rev = "80358ecdb5779b199130ed03031c34c0c2bca3fc"; + sha256 = "01wz6xbmkx31lgqvac86dgd1h5qwr0f1ay99diizri1q9ic1l53q"; }; meta.homepage = "https://github.com/nvchad/base46/"; meta.hydraPlatforms = [ ]; @@ -1429,12 +1442,12 @@ final: prev: { better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; - version = "2024-11-01"; + version = "2025-04-29"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "199dcc2643dec5d8dbdab4ec672cf405224dcb3b"; - sha256 = "074z27g7ac0byna12przi5sqb0ca8c4q12kb3pc7bq1vlhag9f73"; + rev = "19a38aab94961016430905ebec30d272a01e9742"; + sha256 = "107fjwza6570saz7p9kpdm3937x0a0g4ank60s228cbavx09jq1s"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; meta.hydraPlatforms = [ ]; @@ -1468,12 +1481,12 @@ final: prev: { blink-cmp-avante = buildVimPlugin { pname = "blink-cmp-avante"; - version = "2025-02-19"; + version = "2025-04-28"; src = fetchFromGitHub { owner = "Kaiser-Yang"; repo = "blink-cmp-avante"; - rev = "e5a1be4c818520385f95fe2663c04e48f5f0c36a"; - sha256 = "13rkypddzpgz6a36s38a30qfx0n3jspd788yvgjdb7dkn0zrvqdg"; + rev = "ddefb8de3cb1286ab39e0ccec0f32a45d03391f2"; + sha256 = "0rfac6nj3pa45rsjirlmla552pvscw7zspx4g5xl0gz1xxlmh830"; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-avante/"; meta.hydraPlatforms = [ ]; @@ -1507,12 +1520,12 @@ final: prev: { blink-cmp-dictionary = buildVimPlugin { pname = "blink-cmp-dictionary"; - version = "2025-02-28"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "Kaiser-Yang"; repo = "blink-cmp-dictionary"; - rev = "3d49f934059fb59f657b547d90a526d00540634e"; - sha256 = "00bz1pi5hxgj83zdyv1n9ssg99mrdn1nxy36j71q2686pzsa92ga"; + rev = "43e0fbe8d273f92a87c58aa958c51c95557d20c4"; + sha256 = "1a84yda36bmq3v5mzhywykiakqcgnzh5a4xp3rc9pjy95idjr4ql"; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-dictionary/"; meta.hydraPlatforms = [ ]; @@ -1520,17 +1533,30 @@ final: prev: { blink-cmp-git = buildVimPlugin { pname = "blink-cmp-git"; - version = "2025-03-20"; + version = "2025-05-09"; src = fetchFromGitHub { owner = "Kaiser-Yang"; repo = "blink-cmp-git"; - rev = "863e0670217d0dffb9edc6ab41b676a4128f813b"; - sha256 = "0g66rhd5yd3mk2shysliz7k0sh76nr1rbfv0rqxl8kjm7jnc5nh5"; + rev = "2c9fc84fcc440a7f8c89317b3583463cc4815a6a"; + sha256 = "058j6bfjafg4dvbxchlm86xr83n4skik2fbp8njsvlb5ixb84nqj"; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/"; meta.hydraPlatforms = [ ]; }; + blink-cmp-npm-nvim = buildVimPlugin { + pname = "blink-cmp-npm.nvim"; + version = "2025-05-17"; + src = fetchFromGitHub { + owner = "alexandre-abrioux"; + repo = "blink-cmp-npm.nvim"; + rev = "8f4b121b48ce9a97ea513fb6e3a920beb2458a0b"; + sha256 = "15rl1hh1s1cha8hbmvp2z9612v033x81j8mg0a7zialawksyyrdr"; + }; + meta.homepage = "https://github.com/alexandre-abrioux/blink-cmp-npm.nvim/"; + meta.hydraPlatforms = [ ]; + }; + blink-cmp-spell = buildVimPlugin { pname = "blink-cmp-spell"; version = "2025-03-05"; @@ -1546,12 +1572,12 @@ final: prev: { blink-compat = buildVimPlugin { pname = "blink.compat"; - version = "2025-03-17"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.compat"; - rev = "2ed6d9a28b07fa6f3bface818470605f8896408c"; - sha256 = "009475xy41l4dpayswhx65q6a7djzw7rz2ycbrbpyg041y0qynqs"; + rev = "f1836ed7a07f8d082ff6c3fbae1e476ba2adee84"; + sha256 = "0b22c943vbxn8cgfc3m0wmmia9rja6x766ywa798nx7s7x0sd53x"; }; meta.homepage = "https://github.com/Saghen/blink.compat/"; meta.hydraPlatforms = [ ]; @@ -1559,12 +1585,12 @@ final: prev: { blink-copilot = buildVimPlugin { pname = "blink-copilot"; - version = "2025-03-29"; + version = "2025-04-24"; src = fetchFromGitHub { owner = "fang2hou"; repo = "blink-copilot"; - rev = "991b2ebf1c27fa2a6e073b5bc21bdfdec517c0a4"; - sha256 = "11d2v43fiqq8x7kxwnw8qdsay1fb96ql78dydhgl7x3s371s8jh0"; + rev = "bdc45bbbed2ec252b3a29f4adecf031e157b5573"; + sha256 = "0czzypx273zi4cmn8bxy9czh709i8a3zyyfdmlkz9j9b1r905zpc"; }; meta.homepage = "https://github.com/fang2hou/blink-copilot/"; meta.hydraPlatforms = [ ]; @@ -1598,17 +1624,30 @@ final: prev: { blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; - version = "2025-03-29"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "d4af981745ea67b2c29bcd25f9843dbeedc580ed"; - sha256 = "1xjhpp9118bgpp2x3pxv0llngkm69fzxhdqp92civ19s5pxb5h5y"; + rev = "a910b62c896eee2d0e74eb48b3ff5eedd211db69"; + sha256 = "0xinh3rxjrglkzgw9d80x1scl20h2gxzkl3f3cjzpz04rrr6slsm"; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; meta.hydraPlatforms = [ ]; }; + bloat-nvim = buildVimPlugin { + pname = "bloat.nvim"; + version = "2025-04-30"; + src = fetchFromGitHub { + owner = "dundalek"; + repo = "bloat.nvim"; + rev = "f90bef655ac40fecbaae53e10db1cf7894d090b1"; + sha256 = "0ah5c84172wkc75zx5ll2dp9y3r867lik29aw5mm7i3lj530p0ri"; + }; + meta.homepage = "https://github.com/dundalek/bloat.nvim/"; + meta.hydraPlatforms = [ ]; + }; + block-nvim = buildVimPlugin { pname = "block.nvim"; version = "2023-10-10"; @@ -1637,12 +1676,12 @@ final: prev: { bluloco-nvim = buildVimPlugin { pname = "bluloco.nvim"; - version = "2025-03-11"; + version = "2025-04-11"; src = fetchFromGitHub { owner = "uloco"; repo = "bluloco.nvim"; - rev = "917d52614062d8b995a94296de19842edb5c70ce"; - sha256 = "121mz69ydqjrwpnf10v7s24wv71d2nhhwfd99bz21vjli7qpk2z4"; + rev = "29322e83d4e5a1577c20532fee7173a9e7c9bd2b"; + sha256 = "08cmn6dnzx4vq17i3y1npmczc3r2dm20y0wvx3ibr8yxjfw6hp2h"; }; meta.homepage = "https://github.com/uloco/bluloco.nvim/"; meta.hydraPlatforms = [ ]; @@ -1715,12 +1754,12 @@ final: prev: { bufexplorer = buildVimPlugin { pname = "bufexplorer"; - version = "2025-03-26"; + version = "2025-04-11"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "7193d1daa317b958fb84f6dc845e31f917ff87b1"; - sha256 = "13dsfab1jv56l71k0f5d1l01bpjz803rjxnf8f8ir2g15rxyvl4l"; + rev = "3bfc3885bdc0982840c1f0c95545f390c06c8074"; + sha256 = "0n4sgrfna9xfyjv1b2v6ag94vpm687gh24hzxzz7faj6l6rbqxap"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; meta.hydraPlatforms = [ ]; @@ -1819,12 +1858,12 @@ final: prev: { catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2025-02-28"; + version = "2025-05-17"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "5b5e3aef9ad7af84f463d17b5479f06b87d5c429"; - sha256 = "0jmrwag2dx4b1g9x32xwxcr8y0l159hqks09z5miy99wav6dy7z2"; + rev = "8162a4bd9afb42837a655e404d1f937a87ba95e6"; + sha256 = "0kgcjxvc56362pdxv0nfw2skgibhxkv7v12iyzw31qx252zkywdv"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; meta.hydraPlatforms = [ ]; @@ -1858,12 +1897,12 @@ final: prev: { ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2025-01-04"; + version = "2025-05-06"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "b57cbaf8db3ac43c56c9e2c7f3812944638260ed"; - sha256 = "0ixqbsag43pyrvj0i9dkn28j7b2v0c75rljnw57bjl6nwz2aqxg7"; + rev = "9d1a256e006decc574789dfc7d628ca11644d4c2"; + sha256 = "0a2fc4bw88kf1dpp0k07aj8i9qp0xcnz1fvrxdkhz0fxddb7qdnx"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; meta.hydraPlatforms = [ ]; @@ -1884,12 +1923,12 @@ final: prev: { chadtree = buildVimPlugin { pname = "chadtree"; - version = "2025-03-11"; + version = "2025-05-14"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "257b7290c101cf6fd68e20d72dbb0d4c669738b2"; - sha256 = "0ba7fk8jnm6lkjqcjmqgpvjsrv4bf2c0jqcal9mdxi8dxsw92l84"; + rev = "430964664154d9c92116eb6a4eae760d712d95ed"; + sha256 = "0ch51mgq30pl8rqbzdjpyfbrd5nsb5xcng3wpipj2y3ax7kvwxx1"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.hydraPlatforms = [ ]; @@ -1962,12 +2001,12 @@ final: prev: { citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-08-28"; + version = "2025-05-14"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "d12c99f937114b908e935a9cda1953bb8f16bcc8"; - sha256 = "19ng4ig8jjllz8c8ji3b2qljbc53bnkrcilqpyk0rzyfpfcp81i6"; + rev = "fcbe1010ba782f1231cefcbd133c6f06f6f02c75"; + sha256 = "0fa356gw3igp1zm8ngs6y7fdxksk3cyglyilx41hmxy88gfa1vdy"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; meta.hydraPlatforms = [ ]; @@ -1986,6 +2025,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + claude-code-nvim = buildVimPlugin { + pname = "claude-code.nvim"; + version = "2025-05-15"; + src = fetchFromGitHub { + owner = "greggh"; + repo = "claude-code.nvim"; + rev = "a02122579f215e7d50d949b6a25067e5038ee3ea"; + sha256 = "1c24ja74yvfajhhyy3l543cbcd182daig18kvn59ic2rjjnm3nsv"; + }; + meta.homepage = "https://github.com/greggh/claude-code.nvim/"; + meta.hydraPlatforms = [ ]; + }; + clever-f-vim = buildVimPlugin { pname = "clever-f.vim"; version = "2022-10-15"; @@ -2053,12 +2105,12 @@ final: prev: { cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2025-03-06"; + version = "2025-05-17"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "a5d5bf0a93bb96085502334a5036fc054ad9cf33"; - sha256 = "1d8k3m994wdlmbwp6564av5bpx3sw4q05h5ga8x14dcl6qw2zbp3"; + rev = "e8e5baf92ddfb8d540c95e80c72fa49b8148086e"; + sha256 = "00ypibzh647x19fhw1jivhr9sl3myd4r14hd8riii39lz5br69dy"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -2092,12 +2144,12 @@ final: prev: { cmp-ai = buildVimPlugin { pname = "cmp-ai"; - version = "2025-01-06"; + version = "2025-04-21"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-ai"; - rev = "f5e4dcbf763770880d0a01fe2bc139eb47597261"; - sha256 = "093l4cdlmdgrhnv502kkyj4qi4jk656ks90wmfjbkxdffx6xdsrc"; + rev = "5fcc7cf57c7e643c0221ac7f80234a0ff32eb803"; + sha256 = "0fnz2ml0r28jcyy9r0aq718skb6c9c0wsys8w1752j0ijda5w2y7"; }; meta.homepage = "https://github.com/tzachar/cmp-ai/"; meta.hydraPlatforms = [ ]; @@ -2118,11 +2170,11 @@ final: prev: { cmp-buffer = buildVimPlugin { pname = "cmp-buffer"; - version = "2022-08-10"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "3022dbc9166796b644a841a02de8dd1cc1d311fa"; + rev = "b74fab3656eea9de20a9b8116afa3cfc4ec09657"; sha256 = "1cwx8ky74633y0bmqmvq1lqzmphadnhzmhzkddl3hpb7rgn18vkl"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; @@ -2326,12 +2378,12 @@ final: prev: { cmp-git = buildVimPlugin { pname = "cmp-git"; - version = "2025-03-25"; + version = "2025-04-30"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "d9efd00e0b9527ee05031ce7e7e55d6b118f543e"; - sha256 = "1i9crdbah90f2ijy99ssqs67syhx2xm27cp24nzrawcrrflgv1m4"; + rev = "b24309c386c9666c549a1abaedd4956541676d06"; + sha256 = "0yb72yy88azjlanlmd9hdpbwd8bi25ismlv53c93li0wp0nfmxmr"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; meta.hydraPlatforms = [ ]; @@ -2417,11 +2469,11 @@ final: prev: { cmp-nvim-lsp = buildVimPlugin { pname = "cmp-nvim-lsp"; - version = "2024-12-10"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "99290b3ec1322070bcfb9e846450a46f6efa50f0"; + rev = "a8912b88ce488f411177fc8aed358b04dc246d7b"; sha256 = "08q5mf5jrqjjcl1s4h9zj2vd1kcizz0a5a6p65wv1rc5s1fa3a49"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; @@ -2534,11 +2586,11 @@ final: prev: { cmp-path = buildVimPlugin { pname = "cmp-path"; - version = "2022-10-03"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "91ff86cd9c29299a64f968ebb45846c485725f23"; + rev = "c6635aae33a50d6010bf1aa756ac2398a2d54c32"; sha256 = "18ixx14ibc7qrv32nj0ylxrx8w4ggg49l5vhcqd35hkp4n56j6mn"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; @@ -2820,12 +2872,12 @@ final: prev: { coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2025-03-28"; + version = "2025-05-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "4f1199b195b4baabc1cede645c138c14336be604"; - sha256 = "0fyzlr1mm08lfr5lmnnhgd6yh178gb80cv188khhggywrva6944f"; + rev = "5ef1bb5d626fbebf8dec03443cf260412eb6a899"; + sha256 = "12f9jvdg490qnw5l0afhd95rnfq3pbylmbpkcywza386blfa0hdc"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.hydraPlatforms = [ ]; @@ -2870,45 +2922,32 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + codecompanion-history-nvim = buildVimPlugin { + pname = "codecompanion-history.nvim"; + version = "2025-05-16"; + src = fetchFromGitHub { + owner = "ravitemer"; + repo = "codecompanion-history.nvim"; + rev = "b78c1538a4aca50b227da2a4a4402f7be9662749"; + sha256 = "0xijm4484agqy53as6fx843qw9pwrq5yjycy8cby9zximx3q1jfr"; + }; + meta.homepage = "https://github.com/ravitemer/codecompanion-history.nvim/"; + meta.hydraPlatforms = [ ]; + }; + codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2025-03-27"; + version = "2025-05-16"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "51fe5a782dbbd5cad8189420cb8d38fd7c245684"; - sha256 = "09vjvbf5rxmj2fax0ddcinbvx6mhjdy58fw9d1nf8ll7x8dj5j2s"; + rev = "d5a1ebbd3f4679123f685c1ccf740d3765af0325"; + sha256 = "0y9wm68r1j0k6fx3l547b3mnci963khfb3jlkz09shdhcjskhcgr"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; }; - codeium-nvim = buildVimPlugin { - pname = "codeium.nvim"; - version = "2025-03-13"; - src = fetchFromGitHub { - owner = "Exafunction"; - repo = "codeium.nvim"; - rev = "2b10c17c46e43154ebd058f6b3d3842dd8fa7cab"; - sha256 = "0irvjmg6b6sfn9k6xifvr4xpa2kayxxsi7v72sn6ksp7g61v0igi"; - }; - meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; - meta.hydraPlatforms = [ ]; - }; - - codeium-vim = buildVimPlugin { - pname = "codeium.vim"; - version = "2025-01-13"; - src = fetchFromGitHub { - owner = "Exafunction"; - repo = "codeium.vim"; - rev = "000de972de76f357c03da14f4f8dd9a969d4fe8c"; - sha256 = "0birssfqgqi4l654q88znq7nzwfdlw42dkfhk4snnvj496a389rd"; - }; - meta.homepage = "https://github.com/Exafunction/codeium.vim/"; - meta.hydraPlatforms = [ ]; - }; - codewindow-nvim = buildVimPlugin { pname = "codewindow.nvim"; version = "2024-06-05"; @@ -2950,12 +2989,12 @@ final: prev: { colorful-menu-nvim = buildVimPlugin { pname = "colorful-menu.nvim"; - version = "2025-03-28"; + version = "2025-05-11"; src = fetchFromGitHub { owner = "xzbdmw"; repo = "colorful-menu.nvim"; - rev = "271e3a4b564664421e991053aab9d047a1725738"; - sha256 = "1013z3bfqw9vcng4p4scvx32lnvxgylbrrmc97v6klcvmjw8cis0"; + rev = "bc3e82609f2fcf7dad7ca87c20e65e51d5d9d87c"; + sha256 = "0r6q17ldg0npx7d05szimp9ip2jpkx0cbr7rw1kp9vrinw8ppk2x"; }; meta.homepage = "https://github.com/xzbdmw/colorful-menu.nvim/"; meta.hydraPlatforms = [ ]; @@ -3041,12 +3080,12 @@ final: prev: { competitest-nvim = buildVimPlugin { pname = "competitest.nvim"; - version = "2024-11-16"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "xeluxee"; repo = "competitest.nvim"; - rev = "e397635d212605a3fa0e2d06f3e6209085189e3f"; - sha256 = "16wpq64zm2n708lqd2hbrjizd30v2fdazpmaqnjsp3ws5laghyvy"; + rev = "b42c06ca308906f07912ba9aff015ac2c0831f85"; + sha256 = "0ldffdlpiamd4lcrwp3mrskb28z5jhwrwfcz3fl6r637pil0vgh0"; }; meta.homepage = "https://github.com/xeluxee/competitest.nvim/"; meta.hydraPlatforms = [ ]; @@ -3158,12 +3197,12 @@ final: prev: { conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2025-03-20"; + version = "2025-05-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5"; - sha256 = "1942dsg83skxnm3jrqyxx9mvzgiq1v68i9z43hpar4bmqvggviif"; + rev = "a4bb5d6c4ae6f32ab13114e62e70669fa67745b9"; + sha256 = "18x315lb33jm9i0vhz0gyrsri27s9i10351zsxwwyhj387jd71vc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -3172,12 +3211,12 @@ final: prev: { conjure = buildVimPlugin { pname = "conjure"; - version = "2025-03-23"; + version = "2025-05-16"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "980452d93fd6165d3f268f50a181ad7ca4c7b990"; - sha256 = "0pwl2h19rx3cqkn5l8qdyvia09zkg7fsjafd3py65imji9anqzxi"; + rev = "9fec2bd817e2ce9a24b07016141b213cc16befdc"; + sha256 = "1b13mc0nlkg7flziyxh3bcixy3cf3dycn1m8h4vmsmzyap5xzi8p"; }; meta.homepage = "https://github.com/Olical/conjure/"; meta.hydraPlatforms = [ ]; @@ -3222,14 +3261,27 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + copilot-lsp = buildVimPlugin { + pname = "copilot-lsp"; + version = "2025-05-16"; + src = fetchFromGitHub { + owner = "copilotlsp-nvim"; + repo = "copilot-lsp"; + rev = "a45b3d9c0c00cd4271445224de95650090800182"; + sha256 = "035vmvl6w934nyajk2r2c3dq4rd2n3b8pjvbrf4d3072criq800d"; + }; + meta.homepage = "https://github.com/copilotlsp-nvim/copilot-lsp/"; + meta.hydraPlatforms = [ ]; + }; + copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2025-03-29"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "f7e800b83ccbe512f45725aac6639ba036086474"; - sha256 = "09nb5vx3qndhw63qibns1gihx5xnhk3aifdf8vhglxa8125knxg7"; + rev = "0929c92097a49b6ae3565aab157fa2bce398d953"; + sha256 = "1b4a42y9ih6s42n9fqrn21y4r7590jrzb7ypbmlpavfkdzfm6gx7"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; meta.hydraPlatforms = [ ]; @@ -3237,12 +3289,12 @@ final: prev: { copilot-lualine = buildVimPlugin { pname = "copilot-lualine"; - version = "2025-01-21"; + version = "2025-04-05"; src = fetchFromGitHub { owner = "AndreM222"; repo = "copilot-lualine"; - rev = "dc4b8ed0f75bc2557b3158c526624bf04ad233ea"; - sha256 = "062azz55qbrh07md9p610q6p278n9s60f83wwq890lvdm94x4lgc"; + rev = "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333"; + sha256 = "06kshzfzn3av27a1wrgaq93l6vz46a8084dd03addi2zw0rphaqn"; }; meta.homepage = "https://github.com/AndreM222/copilot-lualine/"; meta.hydraPlatforms = [ ]; @@ -3250,12 +3302,12 @@ final: prev: { copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2025-03-24"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "a9228e015528c9307890c48083c925eb98a64a79"; - sha256 = "0957a7y513n34b2bqysnlpnx3z6rphx8mmrsx3r5219hp19h2pyn"; + rev = "d1e8429bef7f7709586886b0a23a46fbecc685c4"; + sha256 = "0cmsmfhna1yx81kbr23br206kicph0fpwqycvnh1mv5cibg26k9g"; }; meta.homepage = "https://github.com/github/copilot.vim/"; meta.hydraPlatforms = [ ]; @@ -3315,12 +3367,12 @@ final: prev: { coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2025-03-24"; + version = "2025-05-14"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "d83bc18d044cfcd65e91dc49740a353546bc143b"; - sha256 = "0nc2qcwh0xz4lwp4q1h7633qpb3v2gpr1kklwsa12w3x6lp3jk8j"; + rev = "666efec5bb8fdb6dbb4bc99a069b3340951d28a0"; + sha256 = "1xlihh5l1gwz8z355n2djhaj0mr6vw1m1id68xcf9nsqj6ccvymn"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; meta.hydraPlatforms = [ ]; @@ -3328,12 +3380,12 @@ final: prev: { cornelis = buildVimPlugin { pname = "cornelis"; - version = "2025-03-28"; + version = "2025-03-31"; src = fetchFromGitHub { owner = "agda"; repo = "cornelis"; - rev = "11731389558ed5ad0d3e9d60148f40c4c1022211"; - sha256 = "0i3x47112nnlrb35grz7z370ksjbz3824i4ag2qky6xj00mpgcwq"; + rev = "deda7eb399efe94cc49c645da7b6f94780fe0c19"; + sha256 = "0fh3pgddhd70w53blnzlmrrls87sq0l320s3h2mkidf4xl6vlr3l"; }; meta.homepage = "https://github.com/agda/cornelis/"; meta.hydraPlatforms = [ ]; @@ -3367,12 +3419,12 @@ final: prev: { crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2025-03-19"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "fd2bbca7aa588f24ffc3517831934b4c4a9588e9"; - sha256 = "1l2z447svf1ldpnsb9sn5b4q1a22g3wx126yw9hj7rcqrv50xw6i"; + rev = "25f31372ab6f504d4fd7cfee836ad459caed8e68"; + sha256 = "0vxgvnm5z9zpriplqq2q17c4v7ccmpc9f5wl02wpslfvwrfc6h2h"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; meta.hydraPlatforms = [ ]; @@ -3393,12 +3445,12 @@ final: prev: { csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; - version = "2025-03-27"; + version = "2025-05-07"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "8420ee6a9fe0bfc9a37920fd572b0ae5a2348967"; - sha256 = "19k5iayhji76q031mzm1vw0n2irh2417mn0gdhf4cmadkrj4ygmg"; + rev = "9cdc993347cfb51d102bf5da1ebf6bf4fc4683e4"; + sha256 = "0ls3m94qk4vjwki7bjrf4di9fiwvh9hhkahav28c3nz14j559gs4"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; meta.hydraPlatforms = [ ]; @@ -3432,12 +3484,12 @@ final: prev: { csvview-nvim = buildVimPlugin { pname = "csvview.nvim"; - version = "2025-03-25"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "hat0uma"; repo = "csvview.nvim"; - rev = "7dcb6aa2965a1d5555d4940ed0c9c2f0e173ecdb"; - sha256 = "1qlw5dlfg93ck398hxv905g3by3avi9fh7v1saxims9j9r7qsm96"; + rev = "6eb9c7293d35c40a71ec1eb9c653d80e8de5a2e9"; + sha256 = "17ax71iyf8n8brxs71ckq218ccwajxqj2ird0pijqdmylm2mcy4z"; }; meta.homepage = "https://github.com/hat0uma/csvview.nvim/"; meta.hydraPlatforms = [ ]; @@ -3510,25 +3562,38 @@ final: prev: { cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2025-03-27"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "f36d7991b6373ebda9cfca20030aa1fca7328ea8"; - sha256 = "051a53i6dcxb5lff4schna36rd2di7rpnlhw31ki2kdk37rw8cqy"; + rev = "8407e80415aebd6b052773d751dda7cd9cfc6835"; + sha256 = "13a3lmf4gmnpfbc1z54x8lv5l5nxd5607zbn3nn2k5lvdd1vr0xm"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; meta.hydraPlatforms = [ ]; }; + dailies-nvim = buildVimPlugin { + pname = "dailies.nvim"; + version = "2025-04-21"; + src = fetchFromGitHub { + owner = "JachymPutta"; + repo = "dailies.nvim"; + rev = "4faf9e3a0c710ab0c2ecc6e59ca68ab1b2c85979"; + sha256 = "1nwhzifnavxx50d2hcabpx2rrbqh8cg9da4khd0x2yijw179s6lb"; + }; + meta.homepage = "https://github.com/JachymPutta/dailies.nvim/"; + meta.hydraPlatforms = [ ]; + }; + darkearth-nvim = buildVimPlugin { pname = "darkearth-nvim"; - version = "2025-03-28"; + version = "2025-04-27"; src = fetchFromGitHub { owner = "ptdewey"; repo = "darkearth-nvim"; - rev = "e5e14fa028512809a4efd2979e07b4225a7c242c"; - sha256 = "1h8jnx7929nyybq5sb0z6galg60xcgj0rr73n14qgbf35v8q3zpj"; + rev = "8f1ce10f90c5655229b7432b10b09c2d090bc4d3"; + sha256 = "07bb2hzk5yypqi720ip8p5nrpnha2w5h78qa5i8whcmp5w36s8vc"; }; meta.homepage = "https://github.com/ptdewey/darkearth-nvim/"; meta.hydraPlatforms = [ ]; @@ -3562,12 +3627,12 @@ final: prev: { dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2025-01-22"; + version = "2025-04-29"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "000448d837f6e7a47f8f342f29526c4d7e49e9ce"; - sha256 = "11kh15qp819dhr2r3q78dv9pzxrswzzpjqmdpa5nlba9mvgjzzy3"; + rev = "591b5b29e2f17b97496ec3179f6ecd08bb8502cc"; + sha256 = "1f9ii3scd3zh4fch6h0mfmnfjx2fk6y4v3qc0cijk1vnyp2fm9qc"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; meta.hydraPlatforms = [ ]; @@ -3627,12 +3692,12 @@ final: prev: { ddc-source-file = buildVimPlugin { pname = "ddc-source-file"; - version = "2025-01-22"; + version = "2025-04-21"; src = fetchFromGitHub { owner = "LumaKernel"; repo = "ddc-source-file"; - rev = "4f3cead1774e4718a91476fe883eccff1137773c"; - sha256 = "17nibc8xgl73p0cvc27v0zjn3mw89nrsch02js32070x21dj6l8v"; + rev = "310851e5696a082d7535d1ece422bd679ac03909"; + sha256 = "09zjph2j3xnbwm30zb85bccchrg3ksc7av2mgqdssa8b2q5dvpld"; }; meta.homepage = "https://github.com/LumaKernel/ddc-source-file/"; meta.hydraPlatforms = [ ]; @@ -3640,12 +3705,12 @@ final: prev: { ddc-source-lsp = buildVimPlugin { pname = "ddc-source-lsp"; - version = "2025-03-23"; + version = "2025-05-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-source-lsp"; - rev = "5b80eeaa196b67337577bcfbe65e5163667ea97a"; - sha256 = "1fnzd1s2l86b790kmk6dwx91257jxa3ms6mgbbbijibjivb13zqk"; + rev = "ba81bccb11d4616af03dce9d3baf9f6de11f45c1"; + sha256 = "0pwh2r5z3g7b06fafmd9zkyrbmj5ypy6wh56d74g6ljf8l44slzx"; }; meta.homepage = "https://github.com/Shougo/ddc-source-lsp/"; meta.hydraPlatforms = [ ]; @@ -3666,12 +3731,12 @@ final: prev: { ddc-ui-pum = buildVimPlugin { pname = "ddc-ui-pum"; - version = "2025-01-09"; + version = "2025-04-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-ui-pum"; - rev = "1e776752c10b4187a76c0543e8ca1aaa64b0b451"; - sha256 = "0ssmlgj495m553hljw8fp0zinxrfpkpfrqb286hczl8inan6kizc"; + rev = "79df4ac4bf16cb69b358b5b2eedfeab2b69d0eb0"; + sha256 = "0vj03zbma1rsr3xm80cfp613xckc3y5y01mbsplr87vqa40r0gz5"; }; meta.homepage = "https://github.com/Shougo/ddc-ui-pum/"; meta.hydraPlatforms = [ ]; @@ -3679,12 +3744,12 @@ final: prev: { ddc-vim = buildVimPlugin { pname = "ddc.vim"; - version = "2025-03-02"; + version = "2025-05-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc.vim"; - rev = "7538d53940542b3769a551b35afee2aa4495b5d8"; - sha256 = "0c0kyb4qn4x8075wfmhjgi8pfihl1a4xj4yr51r7zjzispnsvljk"; + rev = "bdc0254dc5a10029784887dbbb55503ba1bcbe3b"; + sha256 = "0z76m2cbsakq4hxadzk9h7wbfnv782cwj4c47cwcbbvi8wx1lry2"; }; meta.homepage = "https://github.com/Shougo/ddc.vim/"; meta.hydraPlatforms = [ ]; @@ -3692,12 +3757,12 @@ final: prev: { debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2025-02-12"; + version = "2025-04-29"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "541e8f1917bc1c13e879be7c45b55e68231238b0"; - sha256 = "0rkhqx5i9csa869gj0l393p92p1kbarn7w7j876chf3gzs1lnxaz"; + rev = "819e9da6ef5fcdbc17a694f0d61609370f791eb1"; + sha256 = "15cqnxh5c9vr68gml1ww1g95n62igqsiallwl4sbhqbbz647qqig"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; meta.hydraPlatforms = [ ]; @@ -4108,6 +4173,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + diagflow-nvim = buildVimPlugin { + pname = "diagflow.nvim"; + version = "2025-03-04"; + src = fetchFromGitHub { + owner = "dgagn"; + repo = "diagflow.nvim"; + rev = "b13321b517ff64bf42eeac2214085d3c76d83a0d"; + sha256 = "10avjhbs6kn10l5yjp9wk16w6rkvaj540zwrbgk2p6w3v38lr6c0"; + }; + meta.homepage = "https://github.com/dgagn/diagflow.nvim/"; + meta.hydraPlatforms = [ ]; + }; + diaglist-nvim = buildVimPlugin { pname = "diaglist.nvim"; version = "2022-09-01"; @@ -4292,12 +4370,12 @@ final: prev: { dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2025-03-29"; + version = "2025-05-17"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "0bb3f1262fa8bfd8a1c05db29804d1116df32276"; - sha256 = "091m0yjhnl7jw03a90i2fdfy1ni6lyc15xmavpsai70ik03wrcax"; + rev = "38ea1237b32f23e62aaefebf2b0edf771a28b1d5"; + sha256 = "1sw44p72f2izayvy24r88wrhvp306ny6dqfl71gx5dawjp9bh3yq"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; meta.hydraPlatforms = [ ]; @@ -4318,12 +4396,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-03-29"; + version = "2025-05-17"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "86de4c79c65c4ce17a1a95fd05065290397e7c15"; - sha256 = "058xy187nmv9x3d492p49m7wi7rpzffh76cwb1c805ar95x8p9j2"; + rev = "06b0d5656d1b751986f8701f74ff5cdaf6fa6bf3"; + sha256 = "07zwi6vh9y3qn6fqzp4jbm2lzfpzcl7fp82g178pfcahhii16v5h"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -4342,14 +4420,27 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + ecolog-nvim = buildVimPlugin { + pname = "ecolog.nvim"; + version = "2025-05-12"; + src = fetchFromGitHub { + owner = "t3ntxcl3s"; + repo = "ecolog.nvim"; + rev = "611718366d6bcd634511ac5d4308fcb280f36cad"; + sha256 = "1qzm6mi4bd95fsb5az8v6llp0fg3kpiny3j9hw8lvvic6c56v2ii"; + }; + meta.homepage = "https://github.com/t3ntxcl3s/ecolog.nvim/"; + meta.hydraPlatforms = [ ]; + }; + edge = buildVimPlugin { pname = "edge"; - version = "2025-02-24"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "04b2e25fa08b81e071ad512bdec6e5af114b01b3"; - sha256 = "0mz0k0fx27dvnyim22fr48slqdqpzcaxcljfysx07b5ladn0jhzz"; + rev = "8eeab1bc9d93eec3511cb4d3c87d2d599c7ce3d4"; + sha256 = "1d6k3b6z9a4hrhk9ma3my28iga5y1s6srgv9jxwy6yg2wzi0lf9q"; }; meta.homepage = "https://github.com/sainnhe/edge/"; meta.hydraPlatforms = [ ]; @@ -4396,12 +4487,12 @@ final: prev: { editorconfig-vim = buildVimPlugin { pname = "editorconfig-vim"; - version = "2025-02-01"; + version = "2025-04-21"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "91bd0b0a2c6a72a110ab9feae335e1224480c233"; - sha256 = "0rhks5va9z6zsk450l3d1m6rxg16fq0h1nv65jpmmwwcvxm3ar28"; + rev = "6a58b7c11f79c0e1d0f20533b3f42f2a11490cf8"; + sha256 = "1rsifgfdfjs6pmbvl6631xizsrdm1vv8vx63ak8q4rkdwxrc8vnv"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -4410,12 +4501,12 @@ final: prev: { efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2025-02-16"; + version = "2025-03-30"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "f769e051831782732b392da412892cd2eb9c104d"; - sha256 = "0jm6qld1zr1s6ndb0800hzq6ddrnhg9s6dbci62smzqancpgb3k3"; + rev = "e071a098ac1e56e349af649c25e982348f5504e5"; + sha256 = "038s1blvwd5dwc3x4r4x3gimr9s0q4wnh1clq1m8aihdqwqcdham"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; meta.hydraPlatforms = [ ]; @@ -4515,12 +4606,12 @@ final: prev: { eva01-vim = buildVimPlugin { pname = "eva01.vim"; - version = "2024-12-31"; + version = "2025-03-31"; src = fetchFromGitHub { owner = "hachy"; repo = "eva01.vim"; - rev = "2924bd17a70ee29a7b9783c210c9e482e4d54b6d"; - sha256 = "0rha69z9mmqwy19wl54njd6d881bk525vnwzpg1cfbczwykqgacs"; + rev = "bc144393615d2c08f339967386f578b9e22ec549"; + sha256 = "0pjggx9pihqwlyqrir41aissd3c086xm40pfhpnsx54s5z2wmsak"; }; meta.homepage = "https://github.com/hachy/eva01.vim/"; meta.hydraPlatforms = [ ]; @@ -4528,12 +4619,12 @@ final: prev: { everforest = buildVimPlugin { pname = "everforest"; - version = "2025-02-26"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "29d1f4f8b63dc91db277e977068f912939c8cae8"; - sha256 = "1p946h4zq7qvkkb3y74bh3r4hbx4qykg4zzn088hvkki4ln7xaac"; + rev = "ffa5a2032fd41903135fa829bd4b49ba2e1d5d18"; + sha256 = "1s1m9z8061yvdr124hvwdpfhkyx1l46gcp860rz1bxlbk5h02g1z"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; meta.hydraPlatforms = [ ]; @@ -4567,17 +4658,30 @@ final: prev: { falcon = buildVimPlugin { pname = "falcon"; - version = "2024-12-02"; + version = "2025-04-28"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "a7f5d325ebdad20c8b74ebe4f4fede8d451ac1dd"; - sha256 = "1hljin08g22b820lxzqf7x9ygc817sj7iyp5pzp0a5b11n2mf6ca"; + rev = "276cd483c73f5389f0bd99b18e2452bd57b77bf6"; + sha256 = "12jxbl4vicc1z49kzb7x2ki3ywwg0l2zimqvs57w4mkfmnhw2jc9"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; meta.hydraPlatforms = [ ]; }; + famous-quotes-nvim = buildVimPlugin { + pname = "famous-quotes.nvim"; + version = "2025-05-07"; + src = fetchFromGitHub { + owner = "mahyarmirrashed"; + repo = "famous-quotes.nvim"; + rev = "dc493abfb51581b6716986b4311c367c6a100bab"; + sha256 = "179hgxyhzca4g0xmx02kl7gy7c6058kgww4zv7f1dvl2mf59ln67"; + }; + meta.homepage = "https://github.com/mahyarmirrashed/famous-quotes.nvim/"; + meta.hydraPlatforms = [ ]; + }; + far-vim = buildVimPlugin { pname = "far.vim"; version = "2024-05-14"; @@ -4593,12 +4697,12 @@ final: prev: { fastaction-nvim = buildVimPlugin { pname = "fastaction.nvim"; - version = "2025-02-10"; + version = "2025-05-04"; src = fetchFromGitHub { owner = "Chaitanyabsprip"; repo = "fastaction.nvim"; - rev = "c43684448470e732387beccaff12e6667a534800"; - sha256 = "1ihh07j9q4089m4iw7sb33zg106g1m84bd2nk81gixfl76vg3vbi"; + rev = "b62716177731390be1f2131065ace7d7dac4ec99"; + sha256 = "17fhrv2ywhpgrxgzxnyvdqfjarcpwbvhn4gh6jq62vr6h7766wbx"; }; meta.homepage = "https://github.com/Chaitanyabsprip/fastaction.nvim/"; meta.hydraPlatforms = [ ]; @@ -4828,12 +4932,12 @@ final: prev: { flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2025-03-28"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "2d91a86a43a1ae1303e48aac55542f57b5731990"; - sha256 = "1ijwhwmf6f2rrixdpbr0aigjjy7jwl20bi4v5y7rz8cg0lhsmy5x"; + rev = "d5bb1dc3db78d7ab65dd8c5a6f32a38e383b9cb1"; + sha256 = "046fk727prhav2aha62ak50qvc3mmv8sc438hkhhd1ql3ilb7jrr"; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -4841,12 +4945,12 @@ final: prev: { focus-nvim = buildVimPlugin { pname = "focus.nvim"; - version = "2024-11-13"; + version = "2025-04-27"; src = fetchFromGitHub { owner = "nvim-focus"; repo = "focus.nvim"; - rev = "d76338e58e49f844e8f6a7aff16a74a2a55a80ef"; - sha256 = "03c670mcdizg7z9npildynnj65jcb86j6pj030r5js0vcxhj67id"; + rev = "5500e1a9e926eec5a361d910679282fd723c0a96"; + sha256 = "00y7mqv5m4835c9kbkbnwh9ggs2jw7mcdfjpbd3wh2gw7bqga043"; fetchSubmodules = true; }; meta.homepage = "https://github.com/nvim-focus/focus.nvim/"; @@ -4920,12 +5024,12 @@ final: prev: { friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-12-02"; + version = "2025-04-29"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "efff286dd74c22f731cdec26a70b46e5b203c619"; - sha256 = "1vb5l8ipfjwsrqffbq8v2z5p1cpg035b3gk57692wd7835kr3i13"; + rev = "572f5660cf05f8cd8834e096d7b4c921ba18e175"; + sha256 = "08q7vs7p4grav819b6hl5y9zla8bbb461b6m1w0mjz6n6rqjjc0p"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; meta.hydraPlatforms = [ ]; @@ -4946,12 +5050,12 @@ final: prev: { fugit2-nvim = buildVimPlugin { pname = "fugit2.nvim"; - version = "2025-02-04"; + version = "2025-05-04"; src = fetchFromGitHub { owner = "SuperBo"; repo = "fugit2.nvim"; - rev = "ae9f013369306aa2263e8bb4db604896f0fbfc5f"; - sha256 = "1vyr4gfklig7vv0ma8rni21cyrpmdvmz0vxhcnpywg5ibd4q4zfx"; + rev = "bc68dd19bd2f3957a674ccd2da14a922746e93d9"; + sha256 = "0x85ivhs00pami05ss257fjpbqlisz6f7l7nfi7d1920km7v5k3b"; }; meta.homepage = "https://github.com/SuperBo/fugit2.nvim/"; meta.hydraPlatforms = [ ]; @@ -5050,12 +5154,12 @@ final: prev: { fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2025-03-21"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "1fff637559f29d5edbdb05e03327954a8cd9e406"; - sha256 = "13xh17bqnb1k32jm53x9kqc8x6njwcdha9xbwn2zhm0s8dgqikzx"; + rev = "3cb44a8ba588e1ada409af495bdc6a4d2d37d5da"; + sha256 = "0v1svsw4wj4i2rayvksdpz8q65yvkdq9igpa64qq7xyd07jh6g8n"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; meta.hydraPlatforms = [ ]; @@ -5089,12 +5193,12 @@ final: prev: { gen-nvim = buildVimPlugin { pname = "gen.nvim"; - version = "2024-12-29"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "David-Kunz"; repo = "gen.nvim"; - rev = "e09a8dbffa139ad60d5b47998fcc8669ead1ebf4"; - sha256 = "1fl559n01cdckv0mw5d49z72sxxqfqhqhxx1d2025gjix3db4wmk"; + rev = "c8e1f574d4a3a839dde73a87bdc319a62ee1e559"; + sha256 = "0lj265b5r1w1b80axcbix08njdd65zj8q3ziasv46szgvgqsnpdk"; }; meta.homepage = "https://github.com/David-Kunz/gen.nvim/"; meta.hydraPlatforms = [ ]; @@ -5154,12 +5258,12 @@ final: prev: { git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2025-03-24"; + version = "2025-04-12"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "b12da2156ec1c3f53f42c129201ff0bfed69c86e"; - sha256 = "0mmq0v9dqmrm9r5klbxlvbqby51s1n7np79l3z2dg23v7l9s9ysf"; + rev = "8503b199edf9a666fe7b1a989cf14e3c26b2eb03"; + sha256 = "16mba50mjc9hp6jvkxr08z5a0lgigra3qc4xp6b8zwxfbfhz3lwr"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; meta.hydraPlatforms = [ ]; @@ -5297,12 +5401,12 @@ final: prev: { gleam-vim = buildVimPlugin { pname = "gleam.vim"; - version = "2024-07-30"; + version = "2025-04-24"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "gleam.vim"; - rev = "ad6c328d6460763ca6a338183f7f1bd54137ce80"; - sha256 = "1apvzg1l694vd9q9ip0d11yh7wkylz543smcwkwqpz6q8vs4qbb2"; + rev = "7174886f4974629a4427b0c703d6ce77f39422c5"; + sha256 = "0g99zc9x9l5mdh6nmlkwfqh4hk82ncqcgdzjp5b702fiymjhpkf4"; }; meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; meta.hydraPlatforms = [ ]; @@ -5323,12 +5427,12 @@ final: prev: { go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-03-25"; + version = "2025-05-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "0d426e87227dd14584881ecc595c173121456111"; - sha256 = "0k6ia8nhfs9y904f6bnnxyxnqlij7sk23i6px3d0a87dx5vgd4pz"; + rev = "844b66b397edcbac8f941129eb4a57472a582a52"; + sha256 = "170j8123ap85pm28x1mkcv1208zqwzzqnlzd58a6fglkyr0rg2fy"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; meta.hydraPlatforms = [ ]; @@ -5336,12 +5440,12 @@ final: prev: { godbolt-nvim = buildVimPlugin { pname = "godbolt.nvim"; - version = "2024-11-02"; + version = "2025-04-21"; src = fetchFromGitHub { owner = "p00f"; repo = "godbolt.nvim"; - rev = "ffb1b98087daa1e10087a3bf06c30291a17b1310"; - sha256 = "1gg7il6bkib2f2y8r0lmr2jjva3la0kamk755kjn45mywfbz8wsz"; + rev = "e1b53f237f9012c5130d98dbb7a2fe45615e82b8"; + sha256 = "07w2xzxaddh15dlm9zyc9axidppipc8zx72knn5nv3f3p6sg5a4r"; }; meta.homepage = "https://github.com/p00f/godbolt.nvim/"; meta.hydraPlatforms = [ ]; @@ -5375,12 +5479,12 @@ final: prev: { goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2025-03-10"; + version = "2025-04-02"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "cd49bcf6a853512fce46f035fe95469e5b2d26c7"; - sha256 = "1vyblpwy4221rvr573kr20hfyg0pbiwvws9sigilkdp886211bsc"; + rev = "d1faf6ea992b5bcaaaf2c682e1aba3131a01143e"; + sha256 = "1rq2mfvcn0np0n0hmdf6mxmpsj94hvh3i3hnkmk4f20v36ak9xjq"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; meta.hydraPlatforms = [ ]; @@ -5451,27 +5555,14 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - grug-far-nvim = buildVimPlugin { - pname = "grug-far.nvim"; - version = "2025-03-28"; - src = fetchFromGitHub { - owner = "MagicDuck"; - repo = "grug-far.nvim"; - rev = "9411a99390014231753bbb7a2afe6886fda99257"; - sha256 = "1qx7ijy05zn0svnpz4jdxr5z0rl03w36m1rp7gfplprwalbmn7xv"; - }; - meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; - meta.hydraPlatforms = [ ]; - }; - gruvbox = buildVimPlugin { pname = "gruvbox"; - version = "2023-08-14"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "morhetz"; repo = "gruvbox"; - rev = "f1ecde848f0cdba877acb0c740320568252cc482"; - sha256 = "1qqb0a5fscqglii8vh9v2wqk40cka2f2k7h8ylysh89w9ppnx142"; + rev = "697c00291db857ca0af00ec154e5bd514a79191f"; + sha256 = "0gj1bikyz13jgd5rqmkdgxmva2mnmd672hhn4jd1dr7nw1dghrby"; }; meta.homepage = "https://github.com/morhetz/gruvbox/"; meta.hydraPlatforms = [ ]; @@ -5492,12 +5583,12 @@ final: prev: { gruvbox-community = buildVimPlugin { pname = "gruvbox-community"; - version = "2024-01-21"; + version = "2025-04-21"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "143a3b8babcfd2bce6c99d6ba496942647c3e30b"; - sha256 = "00wg2m2591fw3d9almwdg39xvwxzz2xid86n536ygai81cirw351"; + rev = "c2e10b3eff61ae96a27d741150e5fbcb2dd9c5b0"; + sha256 = "1gg1acf6q6rgz0jksk1klxn84ka6qz6kgr3g1ibvfzv604q994g4"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; meta.hydraPlatforms = [ ]; @@ -5518,12 +5609,12 @@ final: prev: { gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2025-02-24"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "146f40fd42cbef30fed69b4ef51329aeeaceb909"; - sha256 = "0bgxfflssqhmlq9v613xw017niyram12vnshd3znlgbsblxa5frx"; + rev = "f5f912fbc7cf2d45da6928b792d554f85c7aa89a"; + sha256 = "0ld6rpmz2r4kjz7i0fhjyr7shq8fgcaw04542g0al4k92izb8xmg"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; meta.hydraPlatforms = [ ]; @@ -5544,12 +5635,12 @@ final: prev: { gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2025-03-26"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "c6f42890551b4827253387e93b035568826a9cb7"; - sha256 = "1ac056i9hs5wbb9qzdijmhjcaz4h67v2c8q0361d17gdm8pdrvnj"; + rev = "00e38a379bab3389e187b3953566d67d494dfddd"; + sha256 = "1qavm9qkx3rwl3dsvs4xzw0ffhf4lmgzdmc51l00rjrb50ia3cpm"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; meta.hydraPlatforms = [ ]; @@ -5557,12 +5648,12 @@ final: prev: { guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2025-03-06"; + version = "2025-04-29"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "376a7bc813dadfd662efffab345d7b7bb306a9c6"; - sha256 = "04b3ggm825ash3fzpj0y8bhr0db36hk1qj34crw62hvz054f0h3l"; + rev = "8e2346d9e67bf91c9c732b6ed5c56f57b73c1d64"; + sha256 = "088p0hmdlfl48wfz5br811bp8hsar8q4ab0ixb57fvxl7gjzdcrc"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; meta.hydraPlatforms = [ ]; @@ -5570,12 +5661,12 @@ final: prev: { guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2025-03-05"; + version = "2025-05-16"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "21556ccd3e615be23753ee33e0ae21c2d3b5318b"; - sha256 = "18hx89hjkbanmk1b79aipwqkq8mhlc2lmxsizzlp8wd2zv0m38f0"; + rev = "37e2a5bcc10169b78537f7279afe6bdca85c3446"; + sha256 = "0kz9mn0x3rsazz8dfgjj8iciqy35g53r8kvkc57sv62b8ykak077"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; meta.hydraPlatforms = [ ]; @@ -5649,12 +5740,12 @@ final: prev: { hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2025-03-08"; + version = "2025-04-07"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "f87c86d1aa1e05dcf3c6ecd97fbfd237e2de0bf5"; - sha256 = "1zkrgszfh5sgnvbpsymp4vpfm8bpqasl8y3p214ww6bjmn00la5n"; + rev = "9aaec65de041bddfc4c0af66919030d2950bcea8"; + sha256 = "1rmcl200a4m3ip3xjzhh7ghhh2961xj2mw7yf0w44jpvs98gqb18"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; meta.hydraPlatforms = [ ]; @@ -5766,12 +5857,12 @@ final: prev: { heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; - version = "2025-01-31"; + version = "2025-04-13"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "af3f441ea10f96105e1af14cd37bf213533812d2"; - sha256 = "1qmjw07da7k6h5wqqm6lqkxli964bdrl5ghbvqmyk18gmpqci3jm"; + rev = "74529ce6a47f3f8dc7546c221c187a2dd025ffee"; + sha256 = "03a50xfr1685l8sfyni0llyc1y721w5jzz7imx4nxk1bp0ygs6ar"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; meta.hydraPlatforms = [ ]; @@ -5779,12 +5870,12 @@ final: prev: { helpview-nvim = buildVimPlugin { pname = "helpview.nvim"; - version = "2025-03-07"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "helpview.nvim"; - rev = "49e8d4782ae73274a35d606fde2844b6e958a0c7"; - sha256 = "1ichkr5f3wcyadjc8n0mbk3x6i128cyl4603h6skdbc17yfm7iw6"; + rev = "8df486915a29483c7955067a7c17bffdf3b1e5f5"; + sha256 = "0gvs61bxzl3mmfvradcsl2wyaamzw8ch8d6yiwhaw9v4a7gspyvl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/helpview.nvim/"; @@ -5845,12 +5936,12 @@ final: prev: { hlchunk-nvim = buildVimPlugin { pname = "hlchunk.nvim"; - version = "2024-11-23"; + version = "2025-04-05"; src = fetchFromGitHub { owner = "shellRaining"; repo = "hlchunk.nvim"; - rev = "5465dd33ade8676d63f6e8493252283060cd72ca"; - sha256 = "0vksi1idliaxk5l3hksfhhbps4sw6d8lk58m5ja4wrnmjxz5b5bz"; + rev = "19bf4090ab8619fffe07b73a4f92348324f35c98"; + sha256 = "0yk33knczksfxx4mq4wncm4r7zvpcyz9hwx94xgwwkdv1lcwd1kp"; }; meta.homepage = "https://github.com/shellRaining/hlchunk.nvim/"; meta.hydraPlatforms = [ ]; @@ -5949,12 +6040,12 @@ final: prev: { hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2024-12-11"; + version = "2025-05-09"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "140c4d0ae9397b76baa46b87c574f5377de09309"; - sha256 = "0z1ff8awna7pk13k56xc4vsdwcn3rbsr5j80p8aq1nkm521j5q5p"; + rev = "07c7269c3a88751f2f36ed0563dc6e7b8b84f7f7"; + sha256 = "1hfz8v58pyvk1m0gxp9wgcmxcszskims5m6q7rmyj1n0rhqz31fj"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; meta.hydraPlatforms = [ ]; @@ -5975,12 +6066,12 @@ final: prev: { hunk-nvim = buildVimPlugin { pname = "hunk.nvim"; - version = "2025-02-08"; + version = "2025-05-14"; src = fetchFromGitHub { owner = "julienvincent"; repo = "hunk.nvim"; - rev = "b475ba0011e4b8ef7d7ddecd9764ee1a5f41366d"; - sha256 = "0d2qa9hqswkh5ii3c0z2r2riyw7pnij5g4is1jspsvgv9gg1x908"; + rev = "48713c5348bb0ba001a6ea781f301dcd74fe88d4"; + sha256 = "0apmix9kya5f3912j6is1ckq9jz757ig79mispv33qvcw5rw3z86"; }; meta.homepage = "https://github.com/julienvincent/hunk.nvim/"; meta.hydraPlatforms = [ ]; @@ -5988,12 +6079,12 @@ final: prev: { hurl-nvim = buildVimPlugin { pname = "hurl.nvim"; - version = "2025-03-04"; + version = "2025-04-06"; src = fetchFromGitHub { owner = "jellydn"; repo = "hurl.nvim"; - rev = "bf00b4ee56dc8026dd7cd068236fb2c01bb1e307"; - sha256 = "1hw8sfx689j8fxwixfdia6rvfncb37j5y3g7f8kgqg1rd6vc3b0z"; + rev = "2c3f2151c39d9752ccf802db6d1104bdb1a5565d"; + sha256 = "1cvaw665gwwrqs03gbhikya2nw3phw52xzdicil3hmzknkmgq4b1"; }; meta.homepage = "https://github.com/jellydn/hurl.nvim/"; meta.hydraPlatforms = [ ]; @@ -6001,12 +6092,12 @@ final: prev: { hydra-nvim = buildVimPlugin { pname = "hydra.nvim"; - version = "2025-03-28"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "nvimtools"; repo = "hydra.nvim"; - rev = "f4ad21b530f4bd4c561e45bec4b53c07c8082dc3"; - sha256 = "0nk4ry73dha815x1ldmyfs8y6xvqz5nbdd6l0c7hkx8y9c6sg9cf"; + rev = "8c4a9f621ec7cdc30411a1f3b6d5eebb12b469dc"; + sha256 = "0a4kll7225ilyi87pygkd82627clnlm0zr2n4nsjmc6m1bijb34m"; }; meta.homepage = "https://github.com/nvimtools/hydra.nvim/"; meta.hydraPlatforms = [ ]; @@ -6053,12 +6144,12 @@ final: prev: { idris2-nvim = buildVimPlugin { pname = "idris2-nvim"; - version = "2024-11-28"; + version = "2025-05-04"; src = fetchFromGitHub { owner = "idris-community"; repo = "idris2-nvim"; - rev = "fd051fa8dde6541a6d345e020a05d2cc8f7a3f8d"; - sha256 = "0pqrnwa3685p9lbfmy09c72nq6d3l54qbi4r9xpk43vl4b6q6j83"; + rev = "bd282b74068e53e94d0c40ccc52f59eed3be909a"; + sha256 = "0z4airqw1cdnrhd0gdgpym981dyjrj40b3ah15wwmnmbgyvmgqjl"; }; meta.homepage = "https://github.com/idris-community/idris2-nvim/"; meta.hydraPlatforms = [ ]; @@ -6079,12 +6170,12 @@ final: prev: { img-clip-nvim = buildVimPlugin { pname = "img-clip.nvim"; - version = "2025-03-04"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "HakonHarnes"; repo = "img-clip.nvim"; - rev = "24c13df08e3fe66624bed5350a2a780f77f1f65b"; - sha256 = "15vrfzv5mbl3iigmc9him829vm7dwlgc6za01dv33x8xh83hca81"; + rev = "08a02e14c8c0d42fa7a92c30a98fd04d6993b35d"; + sha256 = "0ani8z5pkvqmmalzcgyj27rfhqs76ivmpq79xn8rsdyy5a5fy979"; }; meta.homepage = "https://github.com/HakonHarnes/img-clip.nvim/"; meta.hydraPlatforms = [ ]; @@ -6118,12 +6209,12 @@ final: prev: { inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2025-03-23"; + version = "2025-05-06"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "87ebe7bee0b83d3b6e4f1494c74abed21b318175"; - sha256 = "1cra8zz7a1c0w1d7bwvznqlrmjgzc3nap7762qz5mghi3z1yfgak"; + rev = "2eaff20526ff6101337b84f4b0d238c11f47d7f4"; + sha256 = "09h885nl9kiyygfxly762r52bdz9isaz2aamjfj143vihfs70pnf"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; meta.hydraPlatforms = [ ]; @@ -6326,12 +6417,12 @@ final: prev: { iron-nvim = buildVimPlugin { pname = "iron.nvim"; - version = "2025-02-02"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "Vigemus"; repo = "iron.nvim"; - rev = "e2021d242088bc98f7df75bee487a0ae1bfafc5f"; - sha256 = "124m2q9zx5jy7bmm8a90bf8zjgmp98b9i4kiajyz7jxkdypva2hq"; + rev = "c005b01b779f1b6c038e11248db403bb3df6a7f3"; + sha256 = "1nk1aij16akmq7f3s5malzywik0jw6ppd9p2mp7d0p1n8nq9ifnl"; }; meta.homepage = "https://github.com/Vigemus/iron.nvim/"; meta.hydraPlatforms = [ ]; @@ -6405,12 +6496,12 @@ final: prev: { jinja-vim = buildVimPlugin { pname = "jinja.vim"; - version = "2025-02-28"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "HiPhish"; repo = "jinja.vim"; - rev = "a56da59ed3b49f09b4b20e35b80a197bc7f54fe4"; - sha256 = "1k233zaxp4kwkqb74g93jv3w9c9sc4s7ycgadc6knhfy9i3cr4mp"; + rev = "f29c4abc60dae17b2931621748d14d2759e00a6c"; + sha256 = "1f341lg551v72jc0m0c2rbp7nyni0rnfhr66ckggfwnqlskz4xaw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HiPhish/jinja.vim/"; @@ -6498,17 +6589,30 @@ final: prev: { kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2025-03-18"; + version = "2025-03-30"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "709018d5af92d2e5780bfb8a6d36e9cad01a6402"; - sha256 = "0p0bwydhpvjx5fdya10iwqkk2d0ihmkdkc1kkpi6i1cjk4ipkxws"; + rev = "cc3b68b08e6a0cb6e6bf9944932940091e49bb83"; + sha256 = "0mi15a4cxbrqzwb9xl47scar8ald5xm108r35jxcdrmahinw62rz"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; meta.hydraPlatforms = [ ]; }; + kanagawa-paper-nvim = buildVimPlugin { + pname = "kanagawa-paper.nvim"; + version = "2025-05-14"; + src = fetchFromGitHub { + owner = "thesimonho"; + repo = "kanagawa-paper.nvim"; + rev = "a038398036be89002094a40dea656537be64db55"; + sha256 = "00rrh3s0gh71jhbac244y52r0h0h9clk45cw96xfq6zsm877qpzh"; + }; + meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/"; + meta.hydraPlatforms = [ ]; + }; + kdl-vim = buildVimPlugin { pname = "kdl.vim"; version = "2023-02-20"; @@ -6537,12 +6641,12 @@ final: prev: { kitty-scrollback-nvim = buildVimPlugin { pname = "kitty-scrollback.nvim"; - version = "2025-03-26"; + version = "2025-04-12"; src = fetchFromGitHub { owner = "mikesmithgh"; repo = "kitty-scrollback.nvim"; - rev = "68ef4467bc1c30055bb772fb5e7b94db394f5c62"; - sha256 = "08lwinzjxirhrg7p1f3wjqiaqyimjr95jyx4i967m7qvqx1l49ax"; + rev = "6c24f1979afe4c6b0310117b76d59d672224afd7"; + sha256 = "1zfkc9irn9lhr13d8xqgf0bwpycmc8z3fybrvn8fgbfx47609hla"; }; meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/"; meta.hydraPlatforms = [ ]; @@ -6602,12 +6706,13 @@ final: prev: { kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-03-27"; + version = "2025-05-17"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "791b8850e8faf0588955cf531a0817195bcab737"; - sha256 = "13mpk1j0wwkddjp08ig8sbs3y2skpa03xi6yk4j7dcq9nw87ksrm"; + rev = "1c8ff4232ed5a255b004796d18f1c3fd414af328"; + sha256 = "1f7lac288075wld8c12502nm91nz5v7mb71yvpz5snnab65bipvq"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; meta.hydraPlatforms = [ ]; @@ -6615,12 +6720,12 @@ final: prev: { lackluster-nvim = buildVimPlugin { pname = "lackluster.nvim"; - version = "2024-12-29"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "slugbyte"; repo = "lackluster.nvim"; - rev = "662fba7e6719b7afc155076385c00d79290bc347"; - sha256 = "1jp02km6hmryb9g36z239qkv34hmjx0hbwmg2ns1aq7cqzy1m5x1"; + rev = "b247a6f51cb43e49f3f753f4a59553b698bf5438"; + sha256 = "03rasbjila8jdx5g9n6ds2l5600chqv5v3r785zrlvh3g28dg1f4"; }; meta.homepage = "https://github.com/slugbyte/lackluster.nvim/"; meta.hydraPlatforms = [ ]; @@ -6641,12 +6746,12 @@ final: prev: { langmapper-nvim = buildVimPlugin { pname = "langmapper.nvim"; - version = "2024-11-11"; + version = "2025-05-05"; src = fetchFromGitHub { owner = "Wansmer"; repo = "langmapper.nvim"; - rev = "efeffd2a0add17ad04c69beb81b68329cd445eeb"; - sha256 = "057fllakkr82rl8zwkx2h9bza26ibhmab2pml695lnq3xhsd8ml9"; + rev = "57a2fe4d706676aa0386825f27c27a4e3c14e0b0"; + sha256 = "0dxayy62vs9nkfd7vv17qd9fdhhsak7xq9fhzap0wq3klbskp1w0"; }; meta.homepage = "https://github.com/Wansmer/langmapper.nvim/"; meta.hydraPlatforms = [ ]; @@ -6732,12 +6837,12 @@ final: prev: { lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-03-29"; + version = "2025-05-01"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "290150e429866d7500ff38c91ed1c3b33e6a20d9"; - sha256 = "1glh3kn2xs7nm4891qglj5795js87lfv4fq03pzqmwrlwiyg7j1w"; + rev = "fe1f9ec1e38f87294e31443f50aef26e585eff7f"; + sha256 = "1mz02939kfgbl518i0svkbrggzhkil6jsyiw17lmdlj3c9drizcx"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; meta.hydraPlatforms = [ ]; @@ -6771,12 +6876,12 @@ final: prev: { leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2025-02-28"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "346a16ef942635a8ca5ff92e603d07e7e8be6cbe"; - sha256 = "0rq73f7sw1sf8dn6angwgns8jd811aiixmvrndgqz2939dlqaw2l"; + rev = "189102b07cdd24de3bd7132e57da8c9614c385fc"; + sha256 = "0rdvrxdq43szm360rrnmxzmrm5wp6l91xkysnkl4d9p6rlyx01nz"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; meta.hydraPlatforms = [ ]; @@ -6836,12 +6941,12 @@ final: prev: { lexima-vim = buildVimPlugin { pname = "lexima.vim"; - version = "2025-03-26"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "ad09d786d69493a37bd4cd2c383a91b46a42078d"; - sha256 = "1nkl8llnbk28nl8w63bwayxhapa3a7jjm08mqd8sf6v5i01403yq"; + rev = "ab621e4756465c9d354fce88cff2bd1aa7887065"; + sha256 = "1xbsfjx2nvxjjwzva0fgm4mfqz3f83ncgbvpw5daskpnw9zc5l9n"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; meta.hydraPlatforms = [ ]; @@ -7096,12 +7201,12 @@ final: prev: { live-command-nvim = buildVimPlugin { pname = "live-command.nvim"; - version = "2024-09-20"; + version = "2025-04-30"; src = fetchFromGitHub { owner = "smjonas"; repo = "live-command.nvim"; - rev = "b0723697bf60d89ede953c4a5fedce3157784c15"; - sha256 = "08fmcj5r1l80bi6gqsm8g6px4zfqr9sq4kck89y5rfs99j6janyk"; + rev = "05b9f886628f3e9e6122e734c1fac4f13dcb64b4"; + sha256 = "0iyvzjf35c13rggjm8hiwc1x65ch2kv3yv7p8dhk2jf6bml16x8f"; }; meta.homepage = "https://github.com/smjonas/live-command.nvim/"; meta.hydraPlatforms = [ ]; @@ -7148,12 +7253,12 @@ final: prev: { lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; - version = "2025-03-12"; + version = "2025-05-08"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "f336cfd6572bf644d26b5cdec7e5e2c6b8f45135"; - sha256 = "07jmqhprinfi5r4zxsr6ydjvx5lqga468zp8cmwlz65npgmqpvy7"; + rev = "42d1d3e407c846d95f84ea3767e72ed6e08f7495"; + sha256 = "028ngjd8x309k70p5wgw0r0ps5zjsphqzrq07pc5ln1knslv0wis"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; meta.hydraPlatforms = [ ]; @@ -7213,12 +7318,12 @@ final: prev: { lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2025-03-27"; + version = "2025-04-10"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "cd9155f8a4ff33c5c27a2596dd26423b2d57cd7d"; - sha256 = "07xjlpalgl1nnp91646qlf27m6f84pwi20kkf567imxqngg311ic"; + rev = "77550f2f6cbf0959ef1583d845661af075f3442b"; + sha256 = "0cby2k4r5ds145lnv7jhzn3cvnl2x1dav3y9bzzf88paq57a6s2x"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; meta.hydraPlatforms = [ ]; @@ -7239,12 +7344,12 @@ final: prev: { lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2025-03-29"; + version = "2025-05-07"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "b58cca003d1d3311213d6db0352f58d8e57bfff0"; - sha256 = "1jqpjb7xgdm5ikay8hdjz04bdkirhns6zpa68cblsyslpkvk4hk0"; + rev = "a4e3c15dfdce8783c074539b1835edae75fa63d5"; + sha256 = "14478jpwi6bn2l9r0xg9gjqydfcbjwlcmp2jqby76ycs5wbswv21"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; meta.hydraPlatforms = [ ]; @@ -7291,12 +7396,12 @@ final: prev: { lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2025-03-26"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "778d56ff9b387dacd14ae648ed5604394b486f51"; - sha256 = "1rm8ww8krxliwli9m2j6j37xgwgjsrgapvgrcdr6nd4mi6hgmczm"; + rev = "920b1253e1a26732e53fac78412f6da7f674671d"; + sha256 = "0wkcgy2x119sd9xn6k9vs83pvrj0m4ali1ac72pah8pnlzfvkw7i"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; meta.hydraPlatforms = [ ]; @@ -7343,12 +7448,12 @@ final: prev: { luasnip-latex-snippets-nvim = buildVimPlugin { pname = "luasnip-latex-snippets.nvim"; - version = "2024-11-25"; + version = "2025-04-22"; src = fetchFromGitHub { owner = "evesdropper"; repo = "luasnip-latex-snippets.nvim"; - rev = "e72dc5fafb5ec826ab350871c9a0521ba8ecd6a5"; - sha256 = "1550swp7jabxx1asl1jb74965949wg2jvwdl3gq15kxvnbm037pn"; + rev = "53d96674d56f8489288e8db9b24c381d422e16a5"; + sha256 = "0798n89yx7s6pzq09drmaa7h2ba215w74m0wyqgkw6mnl851m7y3"; }; meta.homepage = "https://github.com/evesdropper/luasnip-latex-snippets.nvim/"; meta.hydraPlatforms = [ ]; @@ -7367,6 +7472,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + luau-lsp-nvim = buildVimPlugin { + pname = "luau-lsp.nvim"; + version = "2025-02-01"; + src = fetchFromGitHub { + owner = "lopi-py"; + repo = "luau-lsp.nvim"; + rev = "f81c6c713e4598abc484cbeabca918475d176c54"; + sha256 = "15w51wnyvq8n0xar9az5bxdma0mjcq8lfk4bllarxapzpk84qiz8"; + }; + meta.homepage = "https://github.com/lopi-py/luau-lsp.nvim/"; + meta.hydraPlatforms = [ ]; + }; + lushtags = buildVimPlugin { pname = "lushtags"; version = "2017-04-19"; @@ -7473,12 +7591,12 @@ final: prev: { markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2025-03-29"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "b3c0f3caf78518d33a0b5ad8af944a3c70aa0389"; - sha256 = "065s20b1i6jsvmdk58bhda9rwrrg9vxlfvgp1q8c857wyrignirg"; + rev = "6bbbbf5790cdea622b53fe94b49b9801037e2db9"; + sha256 = "0wfd0xz8jjcd7i1dpxgs0fnzd3ajmdg75ywah6s6lnr2s2fvs2as"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -7487,14 +7605,14 @@ final: prev: { mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2025-02-15"; + version = "2025-05-06"; src = fetchFromGitHub { - owner = "williamboman"; + owner = "mason-org"; repo = "mason-lspconfig.nvim"; - rev = "1a31f824b9cd5bc6f342fc29e9a53b60d74af245"; - sha256 = "0rjhdyip5flkjn0sd67fn30s82d6173q941s00ch9ngp87fy467r"; + rev = "d39a75bbce4b8aad5d627191ea915179c77c100f"; + sha256 = "1dbcr8yma5zy8fa8r10xffsv98kcnmnphiyhr63f07l97z3nw40v"; }; - meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; + meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/"; meta.hydraPlatforms = [ ]; }; @@ -7513,25 +7631,25 @@ final: prev: { mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2025-02-15"; + version = "2025-05-15"; src = fetchFromGitHub { - owner = "williamboman"; + owner = "mason-org"; repo = "mason.nvim"; - rev = "fc98833b6da5de5a9c5b1446ac541577059555be"; - sha256 = "1g71cf5azll92ygvlcw7i08f9fyrxc6s9rx57wfpnb9dvv076yg5"; + rev = "888d6ee499d8089a3a4be4309d239d6be1c1e6c0"; + sha256 = "0kbjs5ri56fsl0jybvmycrnr71997bpa8sxxa33knwpg9h230n8h"; }; - meta.homepage = "https://github.com/williamboman/mason.nvim/"; + meta.homepage = "https://github.com/mason-org/mason.nvim/"; meta.hydraPlatforms = [ ]; }; mason-nvim-dap-nvim = buildVimPlugin { pname = "mason-nvim-dap.nvim"; - version = "2025-03-24"; + version = "2025-04-03"; src = fetchFromGitHub { owner = "jay-babu"; repo = "mason-nvim-dap.nvim"; - rev = "ea387e0819ab189d536bb4067e4d8ece3801a292"; - sha256 = "1hhfamkn80can7mvzhr2vw6w0pwlbmxiqmxnlrhqgkb4ff5azwfp"; + rev = "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea"; + sha256 = "1klj6jvd0scvdr31s9c7hbxd7gkd42ygv1c7mfp74kvlnfjlkx5a"; }; meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/"; meta.hydraPlatforms = [ ]; @@ -7539,12 +7657,12 @@ final: prev: { mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; - version = "2025-03-24"; + version = "2025-05-07"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "98767d37f8e5255a5111fc1e3163232d4dc07bda"; - sha256 = "0bvjq0ygrgf73xybdkfyv4f48b5r51xla63zfpd05i3fhmclzxd8"; + rev = "aafae207d5a2a28c59c9d478d8581c2739135d09"; + sha256 = "1s06hp5x8g8n62gfrg9x4zayqwzz438mc6y3l1h5k6dyhf2m96qg"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; meta.hydraPlatforms = [ ]; @@ -7695,12 +7813,12 @@ final: prev: { mini-ai = buildVimPlugin { pname = "mini.ai"; - version = "2025-03-20"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.ai"; - rev = "978ffc65c6b513fde9ef075326d34d89197f1ea5"; - sha256 = "1kgar55azqq9g6m9y98kr96cldhzipdfp2cjhszvnzw9ad28p3nb"; + rev = "e139eb1101beb0250fea322f8c07a42f0f175688"; + sha256 = "1lc7nwxlm4ndf2d2m4y90dybscig39qh5ijacns5r40w31rfgpmc"; }; meta.homepage = "https://github.com/echasnovski/mini.ai/"; meta.hydraPlatforms = [ ]; @@ -7708,12 +7826,12 @@ final: prev: { mini-align = buildVimPlugin { pname = "mini.align"; - version = "2025-03-20"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.align"; - rev = "0ce67804b0343409c93eb14275b98d53a7b209cc"; - sha256 = "1lq5pzi24ahwfp1jipwl7a1mynnz1ja7c70bs2kilafpa314ymnp"; + rev = "969bdcdf9b88e30bda9cb8ad6f56afed208778ad"; + sha256 = "0yp6flw1xwwb8s74186bi5pm3m0426aixl34g8dm98wl66hh162c"; }; meta.homepage = "https://github.com/echasnovski/mini.align/"; meta.hydraPlatforms = [ ]; @@ -7721,12 +7839,12 @@ final: prev: { mini-animate = buildVimPlugin { pname = "mini.animate"; - version = "2025-03-27"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.animate"; - rev = "33235a02c7dbaf2a5abdb9c584f9bdb6a6fef247"; - sha256 = "1v4xlphp9h1vc48dxwf9hmm2mfr1z1s708knsbyx6gkd282zmzkg"; + rev = "9b518c39c0e25b7b5e4e61db3f1407f7b4889f4e"; + sha256 = "197fgvnh05j5s0bhablgvlz1h6fl4m3n9d1sxzyf6p661dk8chcf"; }; meta.homepage = "https://github.com/echasnovski/mini.animate/"; meta.hydraPlatforms = [ ]; @@ -7734,12 +7852,12 @@ final: prev: { mini-base16 = buildVimPlugin { pname = "mini.base16"; - version = "2025-03-28"; + version = "2025-04-12"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.base16"; - rev = "492b34f496fd1a53126feb1e47ebf55ce9d61e25"; - sha256 = "0srxnxkpi03282zdcbrq13b2m259pchnfvp94awn286zwsc9x23l"; + rev = "2eb2d2b889a8c861d1a66ec651bd0edb417d5c7f"; + sha256 = "0g09bgk7y2j83phckg9wlm82ih1ya5j0sgz6xbscbj6jh0w75lvz"; }; meta.homepage = "https://github.com/echasnovski/mini.base16/"; meta.hydraPlatforms = [ ]; @@ -7747,12 +7865,12 @@ final: prev: { mini-basics = buildVimPlugin { pname = "mini.basics"; - version = "2025-03-27"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.basics"; - rev = "246fc266f3bc3f6ae88c51e011609540b582b196"; - sha256 = "18vadl8zbrwdss5lahdypz0hb9nx9pn26b3xw0wdaw6x7bqgkpv1"; + rev = "9904890cf863a7cbc3f57a1cbac3d298a33e90a4"; + sha256 = "0k9xzdgmyrjvazvi2j1pgy8wsdbm3g3wcq4nnhdxl51i9ib5i3wj"; }; meta.homepage = "https://github.com/echasnovski/mini.basics/"; meta.hydraPlatforms = [ ]; @@ -7760,12 +7878,12 @@ final: prev: { mini-bracketed = buildVimPlugin { pname = "mini.bracketed"; - version = "2025-02-28"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.bracketed"; - rev = "0ec65567ffde0ad4d94d794d55f3b627203b496a"; - sha256 = "05xg63hw83n99al5sylysbq1xpschlj547s3j484jjs7wsbzzp6c"; + rev = "cd77e1e498a561a0f11b41a650caa1ba3a6a3fcc"; + sha256 = "1490iv3j7ks3c04x48xqysq62kya9ygxca84avhah4pg43h1pws9"; }; meta.homepage = "https://github.com/echasnovski/mini.bracketed/"; meta.hydraPlatforms = [ ]; @@ -7773,12 +7891,12 @@ final: prev: { mini-bufremove = buildVimPlugin { pname = "mini.bufremove"; - version = "2025-03-27"; + version = "2025-04-07"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.bufremove"; - rev = "c635c40d06a45450d34695d70c3fb3efe432728f"; - sha256 = "0d5zmn1rldcl37i6v6m2b2ql3nvkdfqjzf3zhdkqfd7pxvvwp12j"; + rev = "66019ecebdc5bc0759e04747586994e2e3f98416"; + sha256 = "0pqwi0ix7zl7sg74p19q61mizv48mjmbijigsssi9fbyk0hwmkww"; }; meta.homepage = "https://github.com/echasnovski/mini.bufremove/"; meta.hydraPlatforms = [ ]; @@ -7786,12 +7904,12 @@ final: prev: { mini-clue = buildVimPlugin { pname = "mini.clue"; - version = "2025-03-27"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.clue"; - rev = "9bfd8ce71ae31460837fcec82a03946008929777"; - sha256 = "1rx2952li3zby1v24asrp9avy6l9f7f6v954a6xf1rl8ijz2aa5j"; + rev = "8b8598afa285f2a25cfd15a67e7eaa210ad405c3"; + sha256 = "12p09p8b9b79fpqw8f9pfbs5l6gra3agbns0zaipm2aja0kkisva"; }; meta.homepage = "https://github.com/echasnovski/mini.clue/"; meta.hydraPlatforms = [ ]; @@ -7799,12 +7917,12 @@ final: prev: { mini-colors = buildVimPlugin { pname = "mini.colors"; - version = "2025-03-27"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.colors"; - rev = "0b13a3f8c7279d31833203b1c15d456047321f28"; - sha256 = "00037f03cmx01y6hd7cdk4bibbzfqmygf851alhnvd2fs7flvxcw"; + rev = "ef76867adda63d6010acdc8732a816c8527d276b"; + sha256 = "0z2cg6fsy5idqp0p3i6rrx9mp48g4z915ylbi5q597d1vmglqffm"; }; meta.homepage = "https://github.com/echasnovski/mini.colors/"; meta.hydraPlatforms = [ ]; @@ -7812,12 +7930,12 @@ final: prev: { mini-comment = buildVimPlugin { pname = "mini.comment"; - version = "2025-02-13"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.comment"; - rev = "264b8a63edd5a9a41d5361a1d52c13131c3c51a2"; - sha256 = "1s4jl8sa7l6kibgsz0d6w2h4xnbpbf3k4rqq90x4l4dmx8if9vkb"; + rev = "fb867a9246f9b892cf51a8c84a3f8479cdf1558c"; + sha256 = "0d3yl412f95alg5rlvq387sbx3gwyqa0nc2f8ivgw5vllnwycj3a"; }; meta.homepage = "https://github.com/echasnovski/mini.comment/"; meta.hydraPlatforms = [ ]; @@ -7825,12 +7943,12 @@ final: prev: { mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "2025-03-27"; + version = "2025-05-10"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.completion"; - rev = "9e6aa17fef2e86d3f33666a7843b942791cc1c1f"; - sha256 = "05z0ghbwh7h2ij8k72sidrpypnzkf57kf058kwpc0wd1jm9ymznm"; + rev = "ea78d31e8164468f0b3a909f863806f2c4cb84c4"; + sha256 = "01zc0kvwiq1h37q4fgwqi0bg875dks8vxw3aqjg3kyjj1v3z0zw9"; }; meta.homepage = "https://github.com/echasnovski/mini.completion/"; meta.hydraPlatforms = [ ]; @@ -7838,12 +7956,12 @@ final: prev: { mini-cursorword = buildVimPlugin { pname = "mini.cursorword"; - version = "2025-01-31"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.cursorword"; - rev = "939ffcc8c57694608ac0896418d4b9a7c5273909"; - sha256 = "0fpa2bin23pp7kw4639a5snzdidr19cry5b86y6xxpql55pj682d"; + rev = "ab63cc74975f4e107dbb490f6d3040eacfc1c023"; + sha256 = "0sgii7m2lfp95vxnchisk3hpbjwwqpky6ivkx2nc5djkmj07b7mj"; }; meta.homepage = "https://github.com/echasnovski/mini.cursorword/"; meta.hydraPlatforms = [ ]; @@ -7851,12 +7969,12 @@ final: prev: { mini-deps = buildVimPlugin { pname = "mini.deps"; - version = "2025-03-27"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.deps"; - rev = "f1ab455876019233c8d23126e6ff91ecc24a02bb"; - sha256 = "022jy13p30nq6k0bl9c8jqj4l49nh2j0ghzgq9dmxj01rff8664c"; + rev = "1807fa0547f0489c2743a356ac76f67bba7c9022"; + sha256 = "10al8achf4lmjhzl37372z107a6pm3splwkjslfl1qfl95hx7zhi"; }; meta.homepage = "https://github.com/echasnovski/mini.deps/"; meta.hydraPlatforms = [ ]; @@ -7864,12 +7982,12 @@ final: prev: { mini-diff = buildVimPlugin { pname = "mini.diff"; - version = "2025-03-28"; + version = "2025-05-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.diff"; - rev = "fcde3f00a32437ffebad23d357564d7c4df9f18e"; - sha256 = "18flq6rvazahgxj2agv3rf8hw27j6rxw87glcs4qq52gcmcd12n2"; + rev = "ec8a5ae365c5d15920721ea42b1351dbc9e61f2d"; + sha256 = "1gb5l58vmyiknk7nhyn2r3d02yd4jsd5kpv3q59ja7pzdi0dyng4"; }; meta.homepage = "https://github.com/echasnovski/mini.diff/"; meta.hydraPlatforms = [ ]; @@ -7877,12 +7995,12 @@ final: prev: { mini-doc = buildVimPlugin { pname = "mini.doc"; - version = "2025-03-23"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.doc"; - rev = "00d626a03e5642c657c58c99d14cc0ea6ed51abd"; - sha256 = "0n920j25rnb66hk3klrni9ji673800dbxyb8j30vd4dymq5051ym"; + rev = "9b3e1b20508c7a6218cadf59b177a79a5df290f6"; + sha256 = "1anxn3lasm1x3yn1i0hd4im7y8fvf0fhyazn3yj6hzpm4vb12p0k"; }; meta.homepage = "https://github.com/echasnovski/mini.doc/"; meta.hydraPlatforms = [ ]; @@ -7890,12 +8008,12 @@ final: prev: { mini-extra = buildVimPlugin { pname = "mini.extra"; - version = "2025-03-27"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.extra"; - rev = "54420de7ee36cf011c6351a1d6290b2555120c7b"; - sha256 = "16kyn5jh6pnpiiahf16r2yk3bck9yz8vy5fbvwlfa847rbl39ybd"; + rev = "87be97ac00a8827e8380156cfef7222afb38f8bd"; + sha256 = "0cicmbxgwzj4fig5xb6sbjndkidrc0x58fxaykybdx237262gaby"; }; meta.homepage = "https://github.com/echasnovski/mini.extra/"; meta.hydraPlatforms = [ ]; @@ -7903,12 +8021,12 @@ final: prev: { mini-files = buildVimPlugin { pname = "mini.files"; - version = "2025-03-27"; + version = "2025-05-05"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.files"; - rev = "3007632477bb9df28b4e32329c63aea1ab2c2b0a"; - sha256 = "1bb0sv766gjnwnqpn7qhcsm6m6c8zj96ippsh1sjlqd3ma09hzwm"; + rev = "49c855977e9f4821d1ed8179ed44fe098b93ea2a"; + sha256 = "12027xb9907zk145hsx6qniq1cjm8bm5405njq4cs9vx992pafsh"; }; meta.homepage = "https://github.com/echasnovski/mini.files/"; meta.hydraPlatforms = [ ]; @@ -7916,12 +8034,12 @@ final: prev: { mini-fuzzy = buildVimPlugin { pname = "mini.fuzzy"; - version = "2025-03-15"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.fuzzy"; - rev = "fb42763285075e316fd4250739af9b8c442503de"; - sha256 = "0hl5ygzlf73g70j7pdd1x4975368sqpynpja1zx7bc5jln698vr4"; + rev = "c33d6a93c4fe395ae8a9bd02fed35315a90b688a"; + sha256 = "0n3rnvhz1hzj32l006il96zf61iv4wc0fy6dqp1lyrqm13skadvp"; }; meta.homepage = "https://github.com/echasnovski/mini.fuzzy/"; meta.hydraPlatforms = [ ]; @@ -7929,12 +8047,12 @@ final: prev: { mini-git = buildVimPlugin { pname = "mini-git"; - version = "2025-03-27"; + version = "2025-04-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini-git"; - rev = "96034bd94220115e49dbf8c38ef4da5508ba29c2"; - sha256 = "0f15bsqrjbifjp0g0fscncyhzsvjd3i4fh0vyagpl08g4as1fqx3"; + rev = "a0ddc6302f654523053c28109e8b6dbbf05c08f8"; + sha256 = "0vf0ys710yf1apalglxj7kcdyrnrd7jkz1ksi9v1vj3h60pvany2"; }; meta.homepage = "https://github.com/echasnovski/mini-git/"; meta.hydraPlatforms = [ ]; @@ -7942,12 +8060,12 @@ final: prev: { mini-hipatterns = buildVimPlugin { pname = "mini.hipatterns"; - version = "2025-01-31"; + version = "2025-04-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.hipatterns"; - rev = "fbf1e2195fdd65cf1bc970316c28098257728868"; - sha256 = "09g9b2jm1hac7pppmmncqpgaddd3yrlw9anhr4jw7lldr2bpwrqa"; + rev = "e5083df391171dc9d8172645606f8496d9443374"; + sha256 = "116vpf4b86qbwrcax7dfhiswb4pwf3nmj2dh4kafj9vnpwyw1c3w"; }; meta.homepage = "https://github.com/echasnovski/mini.hipatterns/"; meta.hydraPlatforms = [ ]; @@ -7955,12 +8073,12 @@ final: prev: { mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "2025-03-28"; + version = "2025-04-12"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.hues"; - rev = "b65cb42ad651ee3543985e333c504bf820bc5a85"; - sha256 = "1yhkvszlw6pp1pxkz0w76fwmmysb2bl2kka0f0ws4jhfcdj6qv1c"; + rev = "f1fa8ad34788eada276f0b8a41d96a15622933de"; + sha256 = "0yap91dqnr4jpwz1krmzay5p89pxb8v6m5457b6sm6f98956zgqq"; }; meta.homepage = "https://github.com/echasnovski/mini.hues/"; meta.hydraPlatforms = [ ]; @@ -7968,12 +8086,12 @@ final: prev: { mini-icons = buildVimPlugin { pname = "mini.icons"; - version = "2025-03-27"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.icons"; - rev = "86a633f0dffcfd80110bac86681dbf4b5c37ba5c"; - sha256 = "1810mvav1k24kxx3kj364v09k26d1s1p2y6dnc2l8mwzw7q70byr"; + rev = "397ed3807e96b59709ef3292f0a3e253d5c1dc0a"; + sha256 = "110bglbbyafjym4md2slgccyjhf90bgg8h9h2ipya6cfqfs4pizy"; }; meta.homepage = "https://github.com/echasnovski/mini.icons/"; meta.hydraPlatforms = [ ]; @@ -7981,12 +8099,12 @@ final: prev: { mini-indentscope = buildVimPlugin { pname = "mini.indentscope"; - version = "2025-01-31"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.indentscope"; - rev = "8ce41a77eed7f4121c83c67fda5e2e86af999e6d"; - sha256 = "0dv4c6yf1s5fzvwy1n0chq553353bsix3g8ysajp9lswnd9lhbh4"; + rev = "8af2569a7d7fd37300dfa760e44e71efbbf322fd"; + sha256 = "1xk31bl9gchc8r1pv6f2z7nfkr6q7f1i4qrrj3h4crxb6nhpxmry"; }; meta.homepage = "https://github.com/echasnovski/mini.indentscope/"; meta.hydraPlatforms = [ ]; @@ -7994,12 +8112,12 @@ final: prev: { mini-jump = buildVimPlugin { pname = "mini.jump"; - version = "2025-01-31"; + version = "2025-05-17"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.jump"; - rev = "1fb371cfdcb314c5faa272976f23514f264bd755"; - sha256 = "1975qyjzcziya2w121cjkqaj17wxp205jl3b7lrl25db6l6ggjcs"; + rev = "8ae04c8c88ebe7b01726b330e7921454b08e5ff6"; + sha256 = "13wdq2ha7dc652mgsc87yh8lkqk245w0ay2k1b3xrrl7q8r9whai"; }; meta.homepage = "https://github.com/echasnovski/mini.jump/"; meta.hydraPlatforms = [ ]; @@ -8007,12 +8125,12 @@ final: prev: { mini-jump2d = buildVimPlugin { pname = "mini.jump2d"; - version = "2025-01-31"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.jump2d"; - rev = "3de91ea974627c4c2645e288bf0a6e6717a4dfa8"; - sha256 = "0n40jmjbqnz1bbgal3j8m9cgzyma59ss8lxsqmi9230mkgd4xsnq"; + rev = "c90f7f8cebf3282d0f0b228015fceefb841375c6"; + sha256 = "04wv8q8g5p1sv6hdaq83rik9x7fq8ki4d617v5gk5d3nv0i6pqq0"; }; meta.homepage = "https://github.com/echasnovski/mini.jump2d/"; meta.hydraPlatforms = [ ]; @@ -8020,12 +8138,12 @@ final: prev: { mini-map = buildVimPlugin { pname = "mini.map"; - version = "2025-03-27"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.map"; - rev = "2fe08148f883d613c825c1c0c6ea8a19901061f0"; - sha256 = "1mqf5bkyp8r05h7ba4drfxx97js2fzmdbjz0xb88xhnpmrikfjnv"; + rev = "f3c156693a9f68a10ae285d537edd36f4cf0e64f"; + sha256 = "1z2rf664z7krs40w66b5fjmq3xffv357mv689425i5nyc1q0gr4n"; }; meta.homepage = "https://github.com/echasnovski/mini.map/"; meta.hydraPlatforms = [ ]; @@ -8033,12 +8151,12 @@ final: prev: { mini-misc = buildVimPlugin { pname = "mini.misc"; - version = "2025-03-22"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.misc"; - rev = "3f0cf62b7e9c545e7e92fe5614f4d6acbe5a8f29"; - sha256 = "04sw3kxx7qa8i2xvagxls78ih7l6fq9mk42xrqjim225657hva5p"; + rev = "f7252c5b8ff27d0856b91a410efe8e528370d919"; + sha256 = "02jrwcmbi74512240p8grlc9awivyihl6s71d60s46nslgqlnsqf"; }; meta.homepage = "https://github.com/echasnovski/mini.misc/"; meta.hydraPlatforms = [ ]; @@ -8046,12 +8164,12 @@ final: prev: { mini-move = buildVimPlugin { pname = "mini.move"; - version = "2025-01-31"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.move"; - rev = "c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d"; - sha256 = "0cnzfn706s90bc0m49jkx3fjghrcv0byqbajdhwbrv8f77c6crg3"; + rev = "4fe4a855fee53c66b0f3255a4b54ddc2ae6b308c"; + sha256 = "0dd29nx1z54ljjz9m4m9ghhv39x7ajjx43hbr4gn7p1lv2kvjv7p"; }; meta.homepage = "https://github.com/echasnovski/mini.move/"; meta.hydraPlatforms = [ ]; @@ -8059,12 +8177,12 @@ final: prev: { mini-notify = buildVimPlugin { pname = "mini.notify"; - version = "2025-03-27"; + version = "2025-04-21"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.notify"; - rev = "be6661ee23f2325841fb087efb8e492b29eccc9a"; - sha256 = "16n36gvk3gz46cs30gh8zd4mcwszniynl2k87rzbfhhcwsj71svx"; + rev = "3a06b21dd0b335b95d125eae813276113b5e9ce7"; + sha256 = "13pa82zmz6w8is4gfh33fqcd2yx3f1bmd5r3q4sp1kfgf2c68c30"; }; meta.homepage = "https://github.com/echasnovski/mini.notify/"; meta.hydraPlatforms = [ ]; @@ -8072,12 +8190,12 @@ final: prev: { mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-03-28"; + version = "2025-05-17"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "4630b9cb783b280fa0fd94e8245d8fb06023f3ba"; - sha256 = "1n0sjygi371b4a43syxs2pljf5gkach1119bswgq3h6cc32wfsll"; + rev = "18889a4993a2c6de64eb07f91e7ad8666793441a"; + sha256 = "0a2lkw7qqix0x8bqhdcn8vyhc585vf3gzdryirqy4lpgxj84af64"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; meta.hydraPlatforms = [ ]; @@ -8085,12 +8203,12 @@ final: prev: { mini-operators = buildVimPlugin { pname = "mini.operators"; - version = "2025-03-06"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.operators"; - rev = "02cfac95919b945c19221f0fcebe883c6dce04f6"; - sha256 = "1b51b3d1qkbzh68yadx3fcx9dgk405cb2ghln999fl5czvc3crmd"; + rev = "2df4df029be367adfc781a8a1b5e8067d2d979df"; + sha256 = "0dijm9cfc62v77kldx1va9aw842snxwd396vq3lryaamcsnvsm3r"; }; meta.homepage = "https://github.com/echasnovski/mini.operators/"; meta.hydraPlatforms = [ ]; @@ -8098,12 +8216,12 @@ final: prev: { mini-pairs = buildVimPlugin { pname = "mini.pairs"; - version = "2025-03-24"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.pairs"; - rev = "b90e36aa5ca5e0d825e77ad67aac22214a4d9096"; - sha256 = "0h35xn8029d74sdv1fyrycpkl10vv0m01fvx2v955v0jfc9cii1n"; + rev = "69864a2efb36c030877421634487fd90db1e4298"; + sha256 = "0avjjikmz3b8676hzcqck3r2lv0zxsdr8hqs65zn2dr12q8zh41r"; }; meta.homepage = "https://github.com/echasnovski/mini.pairs/"; meta.hydraPlatforms = [ ]; @@ -8111,12 +8229,12 @@ final: prev: { mini-pick = buildVimPlugin { pname = "mini.pick"; - version = "2025-03-27"; + version = "2025-05-06"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.pick"; - rev = "4dfc0a21f16d34e9b2429b96d62788ed8a65e6cd"; - sha256 = "0ybfn2mn038mn2bdaf5hyiycimfi785silpcnayh4nj544zhzjc9"; + rev = "fa1e449e1080bf7aa9b2890ee186d23b1b4e1287"; + sha256 = "1wqb0fisg5yd2g4b6zd8668axf8zwqd7a6vyxzzq2rd0qh9jkpa8"; }; meta.homepage = "https://github.com/echasnovski/mini.pick/"; meta.hydraPlatforms = [ ]; @@ -8124,12 +8242,12 @@ final: prev: { mini-sessions = buildVimPlugin { pname = "mini.sessions"; - version = "2025-01-31"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.sessions"; - rev = "f38354b72c11d5bbb2153183fa6ba0cf238147d5"; - sha256 = "1m08i9b235bpgyjgajj85i10z991yigrhp3hg5xji9hajn0d67iw"; + rev = "dd7fe484dfcbf270a788e9291545df509cdb9691"; + sha256 = "0m8l1hw8y3mwhcnyzhxb7j4jvvwmf8i7ybxddy2r2rq89rc7x3ln"; }; meta.homepage = "https://github.com/echasnovski/mini.sessions/"; meta.hydraPlatforms = [ ]; @@ -8137,12 +8255,12 @@ final: prev: { mini-snippets = buildVimPlugin { pname = "mini.snippets"; - version = "2025-02-22"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.snippets"; - rev = "04e1c0f8538a4ee0ddc054e30e92a93cb4c1b568"; - sha256 = "17fqgsr7id11f1wp6wri1zi67m2vh6i9hdrwj9bgjy4528x7gi6f"; + rev = "d005684e620e76eb2a5fbbbd211a1eba7212b4aa"; + sha256 = "19xmqzgx0lv6m6lp6dn4pcr53clgjyrlnh45j795cy9szizw4y0x"; }; meta.homepage = "https://github.com/echasnovski/mini.snippets/"; meta.hydraPlatforms = [ ]; @@ -8150,12 +8268,12 @@ final: prev: { mini-splitjoin = buildVimPlugin { pname = "mini.splitjoin"; - version = "2025-01-31"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.splitjoin"; - rev = "efe24ba54f9623cb05698355981ec05278976788"; - sha256 = "0xnc61cm1zpj8j7j10zgpx4438vmqpdwbqick9rrw9jbmbzcc0p5"; + rev = "70240d5d3881ff1b2b1d7902450f98a6fa303800"; + sha256 = "1sp4p0s4cv888n0nmgy04j5k51ndxpmksy235rg9jkk7j5gg47qb"; }; meta.homepage = "https://github.com/echasnovski/mini.splitjoin/"; meta.hydraPlatforms = [ ]; @@ -8163,12 +8281,12 @@ final: prev: { mini-starter = buildVimPlugin { pname = "mini.starter"; - version = "2025-03-27"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.starter"; - rev = "cf770619b85968bc0f45cace82f5c80b69ca0e96"; - sha256 = "11l7vxhd6sra55aj2xmm79nfhrkisv9r6fssknmcdxrmh47dr3kd"; + rev = "d8038690eadf203a40863c3a9423df880a901d39"; + sha256 = "06rglm7m32lrgba47vb96kaxdsyz8pl2ivbr41m1swy3ihrv69y3"; }; meta.homepage = "https://github.com/echasnovski/mini.starter/"; meta.hydraPlatforms = [ ]; @@ -8176,12 +8294,12 @@ final: prev: { mini-statusline = buildVimPlugin { pname = "mini.statusline"; - version = "2025-03-25"; + version = "2025-04-07"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.statusline"; - rev = "ec3adf7813b7604275dd4a28433e9c9610b70f1b"; - sha256 = "1ny69yjvldl4jpyjpy8z4w4zz6ir976x63nds8z05zgkq8fa2ajd"; + rev = "e331175f10d9f400b42523b3890841aba202ce16"; + sha256 = "1hhd4fln3m04d9v5pwa3mb1n4nifsilrxp8hs14njcgk2rxv6qar"; }; meta.homepage = "https://github.com/echasnovski/mini.statusline/"; meta.hydraPlatforms = [ ]; @@ -8189,12 +8307,12 @@ final: prev: { mini-surround = buildVimPlugin { pname = "mini.surround"; - version = "2025-03-20"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.surround"; - rev = "c92d262deae79545b7674b2069332116461a85f3"; - sha256 = "0pzcbn030c4yvlncqimcy1qjsa3i9k4ss2rhbjnkb3p59h50s036"; + rev = "5aab42fcdcf31fa010f012771eda5631c077840a"; + sha256 = "0hsy7ngqz17a663k4gkj9ambbcn24jvqx7010aiv8g4b0gbmzhky"; }; meta.homepage = "https://github.com/echasnovski/mini.surround/"; meta.hydraPlatforms = [ ]; @@ -8202,12 +8320,12 @@ final: prev: { mini-tabline = buildVimPlugin { pname = "mini.tabline"; - version = "2025-02-11"; + version = "2025-04-08"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.tabline"; - rev = "46108e2d32b0ec8643ee46df14badedb33f3defe"; - sha256 = "19n37b89dxssx3p3lzr9l7pxmbdh0k2mb14ankpq3cy0ax3mi79c"; + rev = "ff7a050721352580184db1ff203286c1032d5b54"; + sha256 = "142vv5nwg3bvia21frmcyps1ycyqqj1l0v5vclrm46cwaz2b2qfb"; }; meta.homepage = "https://github.com/echasnovski/mini.tabline/"; meta.hydraPlatforms = [ ]; @@ -8215,12 +8333,12 @@ final: prev: { mini-trailspace = buildVimPlugin { pname = "mini.trailspace"; - version = "2025-01-31"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.trailspace"; - rev = "9bbbf568c06fe424dc21d2c228fa76098008a5f3"; - sha256 = "1ihd8fbs5imnp5xcllcj6fgpx0y4vclrkfz802q9fl7fqh00dcay"; + rev = "39a0460c025a605519fdd6bea1ce870642429996"; + sha256 = "1d95vcxm7fhav8gz9n8m36q3hkxi6j1p0f6y35qnps1x7yz1wyfg"; }; meta.homepage = "https://github.com/echasnovski/mini.trailspace/"; meta.hydraPlatforms = [ ]; @@ -8228,12 +8346,12 @@ final: prev: { mini-visits = buildVimPlugin { pname = "mini.visits"; - version = "2025-02-28"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.visits"; - rev = "46e7a4074032d0340308c3379bc3650626c85da8"; - sha256 = "1776i3xn9dpccjjamy5ys5acc3nxd3zph4a77sbw2dipfd8zpasi"; + rev = "c0a3b02f5d82080a2aa6cd9185ff16944ce2451a"; + sha256 = "02wr34zzd5x6zn4iwhbv5g4shibpvb8536hr5lk0aw7i55aqg5x8"; }; meta.homepage = "https://github.com/echasnovski/mini.visits/"; meta.hydraPlatforms = [ ]; @@ -8254,12 +8372,12 @@ final: prev: { minuet-ai-nvim = buildVimPlugin { pname = "minuet-ai.nvim"; - version = "2025-03-29"; + version = "2025-05-01"; src = fetchFromGitHub { owner = "milanglacier"; repo = "minuet-ai.nvim"; - rev = "9168232920cc0d00f53f0f5b8f5df04212635912"; - sha256 = "1iigrq7did4mby0h4r1j29fx6p7sgrk19srgka8iyjn7cvnib8cx"; + rev = "ab9cbe8acc1b8a04d57010015619c8e3039e298c"; + sha256 = "0qr864sc1qr0g7kj05syvw48bsk1w4rmdl63vyzd57prq0hs29mv"; }; meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/"; meta.hydraPlatforms = [ ]; @@ -8345,12 +8463,12 @@ final: prev: { molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2025-02-17"; + version = "2025-04-25"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "e6847d01b5540750f39543d30262da5454d373d1"; - sha256 = "0p3xydp03y4agzma1dpyr41lzrnsn41i7q35qps6nl0lrjhwlrk9"; + rev = "ffa2c3b211a3a975919ce3a0b450f4579cde40a6"; + sha256 = "0s6i9c478mng2zb4b70n2dri1pnkv3z4wkrlr90yn9fn3wcykr46"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; meta.hydraPlatforms = [ ]; @@ -8371,12 +8489,12 @@ final: prev: { monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2025-02-24"; + version = "2025-04-21"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "872f774303f79416000e8049630052f4124d9534"; - sha256 = "0j2m7mb17ivc8vznr4f1ykjj85cx0gg2zcxxg0njnslxfd4pj5xa"; + rev = "31bad737610ec211de086d373c73025f39de93cb"; + sha256 = "1i22xkmd8r0bbpi5cviqd1dj4i2p1hgm3d8vdafsmg60jlqkd1nd"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; meta.hydraPlatforms = [ ]; @@ -8436,12 +8554,12 @@ final: prev: { nabla-nvim = buildVimPlugin { pname = "nabla.nvim"; - version = "2023-12-23"; + version = "2025-04-21"; src = fetchFromGitHub { owner = "jbyuki"; repo = "nabla.nvim"; - rev = "27a6ea9ed7452bb9e0b19eb0942b5bcf7d051b2f"; - sha256 = "1dnd6s6abwxihliqqyl1vrds14w502m0x7aadlxrrfh970bqikg0"; + rev = "9b69b709063ccf40ac36fabb4fff7d90b3736475"; + sha256 = "1x2lnr7h3609vj3lfylfppza4rrspsnbj1bsmdk9za30pmn4mrj3"; }; meta.homepage = "https://github.com/jbyuki/nabla.nvim/"; meta.hydraPlatforms = [ ]; @@ -8709,12 +8827,12 @@ final: prev: { neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-03-27"; + version = "2025-04-27"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "69f798bf9493b84df660ac3c6b2fc03e23956d25"; - sha256 = "0yybrcljbfq6xygaqzspjz3bhxa6fb7w0qypky66cvhbpzrl6blz"; + rev = "71bfdeddc90225e281ce34c378dc1b5914f5018d"; + sha256 = "0cm4y2idpmf7i6daa4wl5b6n5ldzqr3pqmh29rc645c1xk2y0b80"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -8735,12 +8853,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-03-29"; + version = "2025-05-09"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "08fb60026a583ac4a798113dcf67a25019e41314"; - sha256 = "09k3lv21l4xjswn5znn2wkdbvvs5135fx0hm1w0smyhk6q92v5f2"; + rev = "e15a3f4e9a748b50c1a02711bd43b057bdee1a13"; + sha256 = "1252s9qp8wwn863vrzkzby6bygzbv953ir97cyvl1jyjz2q15b8r"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.hydraPlatforms = [ ]; @@ -8787,12 +8905,12 @@ final: prev: { neoformat = buildVimPlugin { pname = "neoformat"; - version = "2025-03-17"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "874dcd0995db340278c41860e0209bef29d6ef87"; - sha256 = "1mgs0mgpfirn02z2ffkxv20cpffr5b3vp4np0rya5fv2v991h5x2"; + rev = "33cab6962999ca74824ee6dc6e627f406139d6ee"; + sha256 = "1gw0vxvkwpfawk7ixy8m67hqm0gjyb5b9riy1lx5knjaj198qrjv"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; meta.hydraPlatforms = [ ]; @@ -8813,12 +8931,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "2025-03-28"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "6d1bd94f7fca92a50a892f494920696b5defa8c8"; - sha256 = "0jhlhw88605gjmgs1yz3gcbsgv3yzydz7m1dzy10bvs44d9sx87y"; + rev = "6de4b9f9a92917f9aea3a0dbdc3dbbedc11d26be"; + sha256 = "0z9qri9sp1aicma1yiy2vkdjixjj7pbprd86nmslrhrnchvnqrbh"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.hydraPlatforms = [ ]; @@ -8850,6 +8968,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + neomodern-nvim = buildVimPlugin { + pname = "neomodern.nvim"; + version = "2025-05-09"; + src = fetchFromGitHub { + owner = "cdmill"; + repo = "neomodern.nvim"; + rev = "be2a849828751405c8a10d42fc4ff39125a82c86"; + sha256 = "1dvwbdbl9if4jx0m9vh83ydfhgzd9wyxc9v4i09zsplvjj0bhvv0"; + }; + meta.homepage = "https://github.com/cdmill/neomodern.nvim/"; + meta.hydraPlatforms = [ ]; + }; + neomru-vim = buildVimPlugin { pname = "neomru.vim"; version = "2020-02-05"; @@ -8904,12 +9035,12 @@ final: prev: { neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2024-07-30"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "ddb2556644cae922699a239bbb0fe16e25b084b7"; - sha256 = "0p2s3n22fy1vkqc9n55x6kssqs4n0znwlszfrs532hj8m992wbks"; + rev = "7fb6ca6a632c3c095601d379a664c0c1f802dc6c"; + sha256 = "12pbixkb7175qb9wblq01mbpkccm9h0si7b2jjaf7yip8j8frxmn"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; meta.hydraPlatforms = [ ]; @@ -9009,12 +9140,12 @@ final: prev: { neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2024-12-27"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "5a2fa35c3c6a72cfd3fc6a28b3d1af6e68e6c3a8"; - sha256 = "0nypib3cpbwvjm1qbl4aclqwns0c0p6lrcbppj0ajii0bsiym0yv"; + rev = "b27e6ed8197b232909658322a823b901295b54ec"; + sha256 = "13k2c2lqxcvylglnhzj4q8nra8134nisdkv55381i2rzrjnvsl4c"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; meta.hydraPlatforms = [ ]; @@ -9062,12 +9193,12 @@ final: prev: { neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2025-03-23"; + version = "2025-05-01"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "5650ad9d19d05167ae994a9f63f5c34efdafc246"; - sha256 = "0arc83knnk2n95s6x4zbhdfncify46yp1xajg0r2pciig975z4l7"; + rev = "5d1fdb068914ac23593495e71ecf9b1fad309b45"; + sha256 = "11w4igdvvjfl9xm21h0syb3n9ga9s5lqrc54cgwc0aimh5hi2w31"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; meta.hydraPlatforms = [ ]; @@ -9102,12 +9233,12 @@ final: prev: { neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-03-23"; + version = "2025-04-27"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "faa5e6e62482821e61bcbf552f1bef91c35a597d"; - sha256 = "0njc4x0qk5dm8zyhb65c0mlmibdv5gr9gdwyar8rbv8x54bxi6s5"; + rev = "83a8917ab31ab6ff2886d7b42645099c4a4e7396"; + sha256 = "1n42v20mnwhdbxc249lixplsn23q8j4lgnm16yqxhx45m47qassa"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; meta.hydraPlatforms = [ ]; @@ -9115,12 +9246,12 @@ final: prev: { neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2025-03-24"; + version = "2025-04-27"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "84474f6d29cbd01efa1ca2abad870f4e73018048"; - sha256 = "02q62l45grsmwdbk4q04qxxpagbdplh2pl86xn23q6bldaajpsp3"; + rev = "3cc0bceb0b0957e918939ba95434197e6b3775e7"; + sha256 = "18hgjmmlaqgavd8i6kpni1a022ivrw7j3k093fz6n10bn8s4x49x"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; meta.hydraPlatforms = [ ]; @@ -9284,12 +9415,12 @@ final: prev: { neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2025-01-31"; + version = "2025-04-11"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "9f8f05bee6e5b980a4d1e84adab119a8f9756a77"; - sha256 = "0ayqlxbvffdw31qp96wrqc49vqkm983zma7j0fcp0k0bhgf3ka1v"; + rev = "a6099e1fb55a2c2851da3dd0f4d510af9a234c92"; + sha256 = "0n3vvw666a2r7brnxfsmcvhwh4294svn1hi22h64jdfdhbvg9zys"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; meta.hydraPlatforms = [ ]; @@ -9347,6 +9478,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + neovim-trunk = buildVimPlugin { + pname = "neovim-trunk"; + version = "2024-06-19"; + src = fetchFromGitHub { + owner = "trunk-io"; + repo = "neovim-trunk"; + rev = "835180d0cb2db4aa3a934daf65b1a56549018b94"; + sha256 = "086l7zf2k2p537a13zwivfkamfgpdkrfgq5r23y014s2x2jrh5dw"; + }; + meta.homepage = "https://github.com/trunk-io/neovim-trunk/"; + meta.hydraPlatforms = [ ]; + }; + neoyank-vim = buildVimPlugin { pname = "neoyank.vim"; version = "2020-12-20"; @@ -9362,12 +9506,12 @@ final: prev: { nerdcommenter = buildVimPlugin { pname = "nerdcommenter"; - version = "2024-10-22"; + version = "2025-04-30"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "66c07e4083ab02ed2540ac289cc602c70b858c13"; - sha256 = "1ghfcdz1k3wmi4xbk0ac5zc5karscj85xkb6s2by9h06hd712vi1"; + rev = "02a3b6455fa07b61b9440a78732f1e9b7876c991"; + sha256 = "0sx0xbn6qwm6pj3w9ny9f2ksjxwwlchbkxypk842q21dr146shlb"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; meta.hydraPlatforms = [ ]; @@ -9466,12 +9610,12 @@ final: prev: { nfnl = buildVimPlugin { pname = "nfnl"; - version = "2025-02-20"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "2358f508932d5cc3d22e1999519020eb86956383"; - sha256 = "1a1r10cvnhxjhmcdlqkfa7c4grnc3vmldqdpa9vrnx43hjjbz6dp"; + rev = "6bcfdc4ab9f23c381590d78fa55ee79abebbe9c5"; + sha256 = "1c1gai38cmdiv6yvl55prw0x34h0zq7mys8icx9xy2rpa80sy3ds"; }; meta.homepage = "https://github.com/Olical/nfnl/"; meta.hydraPlatforms = [ ]; @@ -9505,12 +9649,12 @@ final: prev: { nightfly = buildVimPlugin { pname = "nightfly"; - version = "2025-03-29"; + version = "2025-05-04"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "7bc1e8411ba60308cdd4222086582f5f7c057857"; - sha256 = "1dabl6s567aky6xwzj7kvkyiacdygwilg5iaww7s6i8q48cbv6hc"; + rev = "3fee8c331b790e349fc4cac9705d484d68e20f73"; + sha256 = "059i7akda5hdgnvkc4s7khf4wdi2zw3d9vsmddh4rli6rq13085k"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; meta.hydraPlatforms = [ ]; @@ -9570,12 +9714,12 @@ final: prev: { nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-03-26"; + version = "2025-04-29"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "4c12781d7008017a9847d9b61fd1873a9e388e03"; - sha256 = "0a727sxs9i19ffxy1l7n4qkjxzd6wcyddfypg9axzp5s7cmgzfn3"; + rev = "d81598e18bfc14faa4ef9671854d3862dd005447"; + sha256 = "1l740vwz0q3vqlvqxm3ibjk6cc3dzsn86lyj87ggr09nyz0qx5fq"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; meta.hydraPlatforms = [ ]; @@ -9609,12 +9753,12 @@ final: prev: { no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2025-03-07"; + version = "2025-05-14"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "53c8ef094c86e8897be2dcce0259d35914f6cdc0"; - sha256 = "0irbl28jr9h20zyfm5m3wf7saxq1acc48kn3vp4ijc271l0bs97g"; + rev = "c824c54d837160ac32d0f877574ccfa2ecce9947"; + sha256 = "15rjabivbgf7znxs99gkqkr55h86l5a53a5fjxcxg05cp1qidhfy"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; meta.hydraPlatforms = [ ]; @@ -9648,12 +9792,12 @@ final: prev: { none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2025-03-02"; + version = "2025-05-12"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "a117163db44c256d53c3be8717f3e1a2a28e6299"; - sha256 = "1qxi1wq3snhns49sl6rli5hsgjn7zzc43brnwv0b6mfzl55ydzr8"; + rev = "90e4a27ccaa25979a6b732b9f06dfa43b54957b7"; + sha256 = "1nqkvlkdsa90jnrv0znynznynqn9pg58v04pys55015f3rfzvfww"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; meta.hydraPlatforms = [ ]; @@ -9752,12 +9896,12 @@ final: prev: { nvchad = buildVimPlugin { pname = "nvchad"; - version = "2025-01-13"; + version = "2025-04-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "6f25b2739684389ca69ea8229386c098c566c408"; - sha256 = "0pp17n2p6hgkmsii620l2y40j674livr3vbrmc1g2lvfdk2m3xn3"; + rev = "d5ea76925fd5750e5e1ea265d371197a6a393399"; + sha256 = "0d01bd6920xlq75n7w9xphvfczbpj9z89dnf79b2f937i6f6r0ah"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; meta.hydraPlatforms = [ ]; @@ -9765,12 +9909,12 @@ final: prev: { nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2025-03-14"; + version = "2025-04-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "75233833d84b930bc37fecdcd7eb73b5714e92e4"; - sha256 = "02wdpdyjf78wy14ja85ria84mswdwq4fzym88bl00nas36xvli57"; + rev = "4466c87073c811c22b14215ba8a0cfc7d1b8b688"; + sha256 = "0pga1dcc2md4jd8p7hy5cd2b260vkljykzaj0bxsgi8i4hf99l3w"; }; meta.homepage = "https://github.com/nvchad/ui/"; meta.hydraPlatforms = [ ]; @@ -9817,12 +9961,12 @@ final: prev: { nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2025-03-20"; + version = "2025-04-13"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "6522027785b305269fa17088395dfc0f456cedd2"; - sha256 = "1i63wdgm54n3iiiix0y18mjvy2rsswc4iybqppsfpvi8cg2xjpa6"; + rev = "4d74e75913832866aa7de35e4202463ddf6efd1b"; + sha256 = "0q6pv89x05l71nfg2chqf9p0d2ha72agmll2svimq0npp84ymfxz"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; meta.hydraPlatforms = [ ]; @@ -9856,12 +10000,12 @@ final: prev: { nvim-bqf = buildVimPlugin { pname = "nvim-bqf"; - version = "2025-01-04"; + version = "2025-03-29"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "ebb6d2689e4427452180f17c53f29f7e460236f1"; - sha256 = "1zmmzq0xjw3d0vrw3w9hk2i809vvlf65rfccr6kwf2i19zdn4596"; + rev = "e20417d5e589e03eaaaadc4687904528500608be"; + sha256 = "0gxfpld6f60a6679f58m0v2f2m9lar74mmvi0fh4880gbd92kdm6"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; meta.hydraPlatforms = [ ]; @@ -9999,12 +10143,12 @@ final: prev: { nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2025-03-29"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "7aade9e99bef5f0735cf966e715b3ce45515d786"; - sha256 = "0cr2y3lkr6ffxxd9b2pj8hr3fzb5dlj003fcknswqwsdhws75l22"; + rev = "8df427aeba0a06c6577dc3ab82de3076964e3b8d"; + sha256 = "13d04z1dnkrhslq6s1xba5myqkgxar3i3p2lhqvpawicbba8yp22"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.hydraPlatforms = [ ]; @@ -10051,12 +10195,12 @@ final: prev: { nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2024-11-29"; + version = "2025-05-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "34282820bb713b9a5fdb120ae8dd85c2b3f49b51"; - sha256 = "162kr9nkc5cshmsn3lsksc9qj63g6ln9cwhvm2v7mzvjcmj1wga3"; + rev = "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c"; + sha256 = "1rnymif8x0wcy4pdawn3jps9zynajkhwbrm37n4md2hfd7wbb7yl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; meta.hydraPlatforms = [ ]; @@ -10090,12 +10234,12 @@ final: prev: { nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2025-01-23"; + version = "2025-04-25"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "bc81f8d3440aede116f821114547a476b082b319"; - sha256 = "0hk34mfjxqiq82faf3q75ixpxd822vh8zbl1i5pvx6akn4v3mxk7"; + rev = "73a26abf4941aa27da59820fd6b028ebcdbcf932"; + sha256 = "1h71y3pjbbgh8kgghs0sb721bl9pd7l7ak3mj1j27fv6x6kbmgar"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; meta.hydraPlatforms = [ ]; @@ -10103,12 +10247,12 @@ final: prev: { nvim-dap-view = buildVimPlugin { pname = "nvim-dap-view"; - version = "2025-03-28"; + version = "2025-05-01"; src = fetchFromGitHub { owner = "igorlfs"; repo = "nvim-dap-view"; - rev = "afffe27e5eab5b3a540b5303e18fa1d6676909b1"; - sha256 = "0nja1y29nfi6ivnihvy67wwp62mim3dq2lc89vl2w6qr6717g54c"; + rev = "2d68f421fbcf495a5127486bdd5322adf11efe68"; + sha256 = "0bbrzzvzqjz2cgiiypmhgkwxazsrfnnbicwiklhx9b7xdk8kqxkd"; }; meta.homepage = "https://github.com/igorlfs/nvim-dap-view/"; meta.hydraPlatforms = [ ]; @@ -10153,6 +10297,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + nvim-early-retirement = buildVimPlugin { + pname = "nvim-early-retirement"; + version = "2025-05-03"; + src = fetchFromGitHub { + owner = "chrisgrieser"; + repo = "nvim-early-retirement"; + rev = "0a320915970f8b505918f446b538af50c513e97e"; + sha256 = "0044168k95wv1vy3y35462fm0ckpwwb33yyjfrsz1y5fvlzncsy5"; + }; + meta.homepage = "https://github.com/chrisgrieser/nvim-early-retirement/"; + meta.hydraPlatforms = [ ]; + }; + nvim-expand-expr = buildVimPlugin { pname = "nvim-expand-expr"; version = "2021-08-14"; @@ -10207,12 +10364,12 @@ final: prev: { nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2025-03-29"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "466bdbbf64f14e03ea407c8ecec7a98b620e9d62"; - sha256 = "0pfa7f1hjhxb002l1cmv7rwpi6bzpy3k27icn8bv6yjf0qmavfib"; + rev = "53dc967f24e08f4a4defc35bebfd8a3fdf9e340f"; + sha256 = "0d5fccd5biikg0m6qpijyfwamdbs5ls4zsii8xlyaqb1h4vb8rka"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; meta.hydraPlatforms = [ ]; @@ -10246,12 +10403,12 @@ final: prev: { nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2025-03-29"; + version = "2025-04-14"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "832589c1cc118bed0fc46b8b6a0c4a10489d9c2b"; - sha256 = "0bmbi1w22ji5q079lx049pzfyjvhvksll9xcbc05w19z105kvsky"; + rev = "b42a5ccec7457b44e89f7ed3b3afb1b375bb2093"; + sha256 = "0zw59ymsy1vl57akpb273psy93vl49i5zkfkp7r5k3dq67l28f37"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; meta.hydraPlatforms = [ ]; @@ -10259,12 +10416,12 @@ final: prev: { nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2025-03-20"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "3cb6fed3095fcc2a47c9f9843582ec0ab08736fd"; - sha256 = "1hkadfl2prh4v4npk0cyqsjdgh3b529zsvdmnng1gykjwfs06h71"; + rev = "89607b55b321a9d55979e0cc4229223cd0db4cbd"; + sha256 = "09i8fsr47nq78s7gys6cli73savpmmz3b5cw6jp3997vh085nzfq"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.hydraPlatforms = [ ]; @@ -10272,12 +10429,12 @@ final: prev: { nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; - version = "2025-03-28"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "00b9c7359eaaa4804a9be943ea46bc64e6d2e065"; - sha256 = "0hkilzijh6xhscd03pr1khvcza7qy606fj9lw0cranbgkd05nlr4"; + rev = "1e650c136f9f9d5fefe34947ad27c80010d3321f"; + sha256 = "05rxzl519p9wqymbdnz3jrc6k1p7l7sj0mw6cz12snsg5cisn2h7"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; meta.hydraPlatforms = [ ]; @@ -10376,12 +10533,12 @@ final: prev: { nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2025-02-13"; + version = "2025-04-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "2f7bff9b8d2ee1918b36ca55f19547d9d335a268"; - sha256 = "00q4wy2qkr1845y9sf52iphang5cqipqh1b7jzvn4kzbbvi1lg54"; + rev = "c23f200fee469a415c77265ca55b496feb646992"; + sha256 = "0sk1gspldc513fhcicv5sqp5v1gin3nprmanvbd87cbi1l3rkhvh"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; meta.hydraPlatforms = [ ]; @@ -10415,12 +10572,12 @@ final: prev: { nvim-lightbulb = buildVimPlugin { pname = "nvim-lightbulb"; - version = "2025-02-04"; + version = "2025-03-29"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "f7f61c47af5bf701b1f4af127bc565ab6491acbf"; - sha256 = "1wg7yib9qn8ybsk615kw1g8b3g5zbpdldp6bb7ax0jwxsn5nwwfb"; + rev = "aa3a8b0f4305b25cfe368f6c9be9923a7c9d0805"; + sha256 = "0wp8f6yphb28iaxlhg326kvrh3h8xn5fkkcfn1whbacch6562wym"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; meta.hydraPlatforms = [ ]; @@ -10441,12 +10598,12 @@ final: prev: { nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2025-03-26"; + version = "2025-04-10"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "b13794ec2e6984ba12a23e1588f69ed36952ee17"; - sha256 = "1a5bzkfxiq7jcw4zsbb897gdqzv3d3fzw2pnhhnagj745n2cgadx"; + rev = "e60a20d7c586e989f98e798ed9b9d80f0cf3c194"; + sha256 = "1zw350dlvwxk7mn1smyrfgkm0rlmifx0dyjisjqkcg7l055m9yl3"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; meta.hydraPlatforms = [ ]; @@ -10454,12 +10611,12 @@ final: prev: { nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2025-03-26"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "93b8040115c9114dac1047311763bef275e752dc"; - sha256 = "1115rn9npzj2xdj2zr1ayhfy76281zv0avbiyi5vgnvfg7064jmq"; + rev = "fdb04e9285edefbe25a02a31a35e8fbb10fe054d"; + sha256 = "0ijir72a906w70gr80ifh9mds6f3j9hsbmipmg7jyy1nx3rj4nx9"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; meta.hydraPlatforms = [ ]; @@ -10506,12 +10663,12 @@ final: prev: { nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-03-27"; + version = "2025-05-14"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "85e0dd26b710e834a105d679200d01e326a3d2b0"; - sha256 = "1vkk4niflipxac8p8l9plaqmy41lvzk0gvb8i48f2d6qamcc6bix"; + rev = "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57"; + sha256 = "0b79ymc2nzm2y1mshha8djyh32bnakyam16a5b8mdkczlzs6abc8"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -10571,12 +10728,12 @@ final: prev: { nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2025-03-20"; + version = "2025-05-07"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "f763b65fd71cb17d544753194fd91090e611c6e0"; - sha256 = "0ayn8npywhr9j1rlhvq5kij0s3751hh89fd5qqp1iqjqr9mg4ns8"; + rev = "f9cc5e7f7bc129b8056f1e5aef7a91c9b5b83664"; + sha256 = "1gidspg23hx4ja2zs77sz35w6hrpxlc817ppbvz8q93d3jdbk25d"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; meta.hydraPlatforms = [ ]; @@ -10597,12 +10754,12 @@ final: prev: { nvim-navbuddy = buildVimPlugin { pname = "nvim-navbuddy"; - version = "2024-05-19"; + version = "2025-05-01"; src = fetchFromGitHub { owner = "SmiteshP"; repo = "nvim-navbuddy"; - rev = "f22bac988f2dd073601d75ba39ea5636ab6e38cb"; - sha256 = "034pmg403y0y1fxnb1jv291mr016bx1vn68y543v6v4dpbdlr7di"; + rev = "a34786c77a528519f6b8a142db7609f6e387842d"; + sha256 = "0b6bazh531bixskpmmpkidqii4n3m7n2cp9bmzml5wb0wibazcac"; }; meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/"; meta.hydraPlatforms = [ ]; @@ -10610,12 +10767,12 @@ final: prev: { nvim-navic = buildVimPlugin { pname = "nvim-navic"; - version = "2023-11-30"; + version = "2025-04-30"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "8649f694d3e76ee10c19255dece6411c29206a54"; - sha256 = "0964wgwh6i4nm637vx36bshkpd5i63ipwzqmrdbkz5h9bzyng7nj"; + rev = "d0a8c17c4dc721b00bc2ac305c6ffbb036beeb74"; + sha256 = "0mxsnwvrjirpy2ichsilx6207z55xi42syg5d3fdgs2r1p1npggc"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; meta.hydraPlatforms = [ ]; @@ -10649,12 +10806,12 @@ final: prev: { nvim-notify = buildVimPlugin { pname = "nvim-notify"; - version = "2025-01-20"; + version = "2025-04-13"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "22f29093eae7785773ee9d543f8750348b1a195c"; - sha256 = "0nnxmi65ppmn8dzwh38vx2w7w6piq0i28mw0s32wa31xn5rmzwza"; + rev = "b5825cf9ee881dd8e43309c93374ed5b87b7a896"; + sha256 = "13qlkncpmjvmkpcx5sv366i7scsh90wjvcqy8qlv31ccmgq511wv"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; meta.hydraPlatforms = [ ]; @@ -10675,12 +10832,12 @@ final: prev: { nvim-numbertoggle = buildVimPlugin { pname = "nvim-numbertoggle"; - version = "2024-03-29"; + version = "2025-04-25"; src = fetchFromGitHub { owner = "sitiom"; repo = "nvim-numbertoggle"; - rev = "c5827153f8a955886f1b38eaea6998c067d2992f"; - sha256 = "18nxqi3a3xamrjzpsabww411ix6vr44smprqi9prd47238lpshi2"; + rev = "c469e0e588a54895591047f94c9f9ff5a1d658aa"; + sha256 = "1nf74a8ssw23rq3vq0kqkbwpd680pp19pdhl6z4qf11l427jn5n0"; }; meta.homepage = "https://github.com/sitiom/nvim-numbertoggle/"; meta.hydraPlatforms = [ ]; @@ -10688,12 +10845,12 @@ final: prev: { nvim-origami = buildVimPlugin { pname = "nvim-origami"; - version = "2025-03-31"; + version = "2025-05-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-origami"; - rev = "61c0fdec70e82d9a85642234420399372acd636d"; - sha256 = "1ld4bp18b4xi9ppjhj06ii339azrblnqpi3baz48pjjfdc4lxgld"; + rev = "bf49e2ef528d75a5443081fe67011554d93b9acf"; + sha256 = "0dgg8mpn7q3w468fq52wg9cw73arxsjab69xqkbh5p92n70xdfff"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-origami/"; meta.hydraPlatforms = [ ]; @@ -10714,12 +10871,12 @@ final: prev: { nvim-paredit = buildVimPlugin { pname = "nvim-paredit"; - version = "2025-01-13"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "julienvincent"; repo = "nvim-paredit"; - rev = "a7b22f211cd96fc8a4bb2c40eff5eeb04ce332ea"; - sha256 = "1d0lkagjhn2pi5hgm7j9vk2xs1r9ai8ssgzv6ijzw338d217m23v"; + rev = "cfab7ef0b750a8bd1d4daa6ace93a36ebc60f172"; + sha256 = "1hylbqm9s2f4hj3rmkw04ir7y7a1ivzklyrflliqsgnqirb6fjsa"; }; meta.homepage = "https://github.com/julienvincent/nvim-paredit/"; meta.hydraPlatforms = [ ]; @@ -10805,12 +10962,12 @@ final: prev: { nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "2025-03-25"; + version = "2025-04-13"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "1b5d78f3d69fcdf8e734114c665994ffe1672fde"; - sha256 = "1rddfahgyh1n01ba470b82zdk1dk1dhvfx85v6cm441camv5mbz7"; + rev = "fcc4f03f2260208f49ab9b7c374dff477d4698d5"; + sha256 = "0q4sn32s46m5dp5dyizqmx86lbq77dkz4q3mar1sgiswkjvvawj8"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; meta.hydraPlatforms = [ ]; @@ -10818,12 +10975,12 @@ final: prev: { nvim-scissors = buildVimPlugin { pname = "nvim-scissors"; - version = "2025-03-27"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-scissors"; - rev = "3fa6c10af1a4daaeaa3dc3a6a9a76dde48879133"; - sha256 = "0is8szn0z1gkb8ik4c0kzkv20fr1qf5c0n3mssfn27n2mix63wp6"; + rev = "9b0dad5e0a98cc5775077094b0161a21257da5da"; + sha256 = "1r7j7kbjz9b257k68zxfzss3pnv0jc49x91mhq5jc9qzkyn6bskh"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/"; meta.hydraPlatforms = [ ]; @@ -10844,12 +11001,12 @@ final: prev: { nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2025-03-27"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "2e49cb7a9a8e999a26f044029c279052a02f10af"; - sha256 = "185i9xsbyaaqjmhnfzlcgz71sjrl8m5c7rj9dsr50f0b0n1fsk2a"; + rev = "70e88d7248eda2f73e8ea0c6a12aa4748b7a950e"; + sha256 = "1xyh04amj12q1cfdl7b6gz1zhym458faw7lymdgbvyg25pm06ah4"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; meta.hydraPlatforms = [ ]; @@ -10883,12 +11040,12 @@ final: prev: { nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2025-02-14"; + version = "2025-04-02"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "89fe2ebd2fdbe91c7a518da5da1426366322b926"; - sha256 = "1l8853b14z5dpbyb73f15mwlycfpmml2km1cwaahilsk8y4gphyp"; + rev = "93c329f7dad98565ad5db9634ced253d665c1760"; + sha256 = "0n2sp3m8glvwnanqa8yk3d54n9p16rcshqyi7d0manf1iykv9ilh"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; meta.hydraPlatforms = [ ]; @@ -10922,12 +11079,12 @@ final: prev: { nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2025-03-25"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "4bd3221d165da334e57c8e9f38978e0c6f3a1742"; - sha256 = "17wnp793yiy33zj4xi406b5k78rihpjz5abb2yhhmxriznsr2a2j"; + rev = "9228ef94ca4e754ec90bcdeb8a5f552fa15ba8dc"; + sha256 = "1m2pganyz3a2iiybzrf150p2q8sjsj390v12m635y4mniz5klzi1"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; meta.hydraPlatforms = [ ]; @@ -10935,12 +11092,12 @@ final: prev: { nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2025-03-22"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "caf6f633d4d77a29b6e265b560c5a035d171a913"; - sha256 = "130y0b2f69y5rzm64ss34a9zyqkpkybr2d1s4p0pcvvaq1ngq0r0"; + rev = "0e62500b98f4513feaaf7425c135472457ea5b7d"; + sha256 = "0rwzz98n8gyx2bffxg7ga7vxxxcc4crbwimvglx6bxkdg2abwyrn"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; meta.hydraPlatforms = [ ]; @@ -10987,12 +11144,12 @@ final: prev: { nvim-tinygit = buildVimPlugin { pname = "nvim-tinygit"; - version = "2025-03-30"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-tinygit"; - rev = "8332b4a1cd852416a632dda51848a5fae58df48e"; - sha256 = "1sjnc2bgprhjyjcgg3ninskkmh0369jq80i6n3sxr2lxxp64yvjp"; + rev = "57264f4b415782c7d68e710fe07e971dac6958aa"; + sha256 = "14xfa9vs2yji902smfn5wf57c760mvy1b7gp13449y1dpplf9jjw"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-tinygit/"; meta.hydraPlatforms = [ ]; @@ -11000,12 +11157,12 @@ final: prev: { nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2025-03-23"; + version = "2025-05-09"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "44d9b58f11d5a426c297aafd0be1c9d45617a849"; - sha256 = "0gya49yydrbq5jylsk4b9c2cpygy0mxhr6kwdsbg0di0i74pkav0"; + rev = "e7d1b7dadc62fe2eccc17d814354b0a5688621ce"; + sha256 = "1ir61hlybgg0ynws9nn3gld8cvyfwwjwj1drhw9w46h71afcf45j"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; meta.hydraPlatforms = [ ]; @@ -11013,12 +11170,12 @@ final: prev: { nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2025-03-29"; + version = "2025-05-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "aece1062335a9e856636f5da12d8a06c7615ce8a"; - sha256 = "0kh0jjjcvjdzxcg3xk2fav6g2kdws6by3snbzhs9a0fcfdbdrvnw"; + rev = "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79"; + sha256 = "0ial9z35b3918l4q8gqdng50ifal0a4dcgdsr92nrnm2b0hz11kd"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.hydraPlatforms = [ ]; @@ -11026,12 +11183,12 @@ final: prev: { nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2025-03-19"; + version = "2025-05-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "93b29a32d5f4be10e39226c6b796f28d68a8b483"; - sha256 = "12ixiqb4bj7n3kkzqi81hyhn3bjsb93250gvfy12bxya2l5bi20g"; + rev = "5c48b8ba1b0b7b25feb6e34e7eb293ea893aedc4"; + sha256 = "137xmpigfcwf24jg1ww9b6mbmh43f2w2ipvrzhqddxhzy8dcc6w1"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; meta.hydraPlatforms = [ ]; @@ -11039,12 +11196,12 @@ final: prev: { nvim-treesitter-endwise = buildVimPlugin { pname = "nvim-treesitter-endwise"; - version = "2025-03-12"; + version = "2025-04-30"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-endwise"; - rev = "57d52841a966be6ff9a998a6d3dc1ac9cc9d95fc"; - sha256 = "0iapapnmpw9cds94k0k6845hlnxa8x3hzqxp31x5n9qcbhvlqpcz"; + rev = "d6cbb83307d516ec076d17c9a33d704ef626ee8c"; + sha256 = "12rxdbvxi1i0svi4ibczb1a6njng1ida0f7aaxnsmafkssmxy323"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; meta.hydraPlatforms = [ ]; @@ -11104,12 +11261,12 @@ final: prev: { nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2025-03-17"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4"; - sha256 = "1lqxvz39d3xd6rrzazydbfg7gqd6143zz6pvq23ivgy9jan8fbfs"; + rev = "b0debd5c424969b4baeabdc8f54db3036c691732"; + sha256 = "0ddvj8zahs226drqs13fy2pnw0n80759ja3m23rdphb56w0fl9dx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; meta.hydraPlatforms = [ ]; @@ -11169,12 +11326,12 @@ final: prev: { nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2025-02-14"; + version = "2025-04-28"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94"; - sha256 = "1fv3rhny1d8wgxd3h3fy4vv05nb0fz506sk2in8rkmwlzwixl2wn"; + rev = "cac999ec9f6302d2fd4ad8a846bf8f731af6e7cf"; + sha256 = "14lvlv1wmbpw0dpyfz3gq7k760ip1903w5ibajqiaflw06afv4pn"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; meta.hydraPlatforms = [ ]; @@ -11182,12 +11339,12 @@ final: prev: { nvim-unception = buildVimPlugin { pname = "nvim-unception"; - version = "2024-02-06"; + version = "2025-04-04"; src = fetchFromGitHub { owner = "samjwill"; repo = "nvim-unception"; - rev = "a0af21a27e2ba19ce6004d57d34006d18bc6bad4"; - sha256 = "165gg5bgvga5c79hvniryf5d530r4gckahnhaj3xb9cf7m2xsdvy"; + rev = "df0e505f0f1371c49c2bcf993985962edb5a279d"; + sha256 = "15sa9bmn1m3ddkhn1j1c8b3v2nkmb96sbivg6zz6z8kznr1qm1pw"; }; meta.homepage = "https://github.com/samjwill/nvim-unception/"; meta.hydraPlatforms = [ ]; @@ -11195,17 +11352,30 @@ final: prev: { nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "2025-03-29"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "5d9c77cc79a53c168679d36ac66ce2ae44c3e91a"; - sha256 = "045cvck2zqrib8z9dwc4qz6nk2rvly3fpi68kprk1qxwshpnnl7h"; + rev = "d8d501e7395275405606bb3b0d8ca27323dd7808"; + sha256 = "0ha3cqqz7hacw5fpyhha8kzjwcyshn861xbvzfqddws755w84his"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; meta.hydraPlatforms = [ ]; }; + nvim-vtsls = buildVimPlugin { + pname = "nvim-vtsls"; + version = "2025-04-27"; + src = fetchFromGitHub { + owner = "yioneko"; + repo = "nvim-vtsls"; + rev = "60b493e641d3674c030c660cabe7a2a3f7a914be"; + sha256 = "00qj7b70afpgxmb6ml4knjwdwcn29yk8mvsb575b6ww9zsxh34il"; + }; + meta.homepage = "https://github.com/yioneko/nvim-vtsls/"; + meta.hydraPlatforms = [ ]; + }; + nvim-whichkey-setup-lua = buildVimPlugin { pname = "nvim-whichkey-setup.lua"; version = "2021-04-16"; @@ -11286,12 +11456,12 @@ final: prev: { nvzone-menu = buildVimPlugin { pname = "nvzone-menu"; - version = "2025-01-15"; + version = "2025-04-13"; src = fetchFromGitHub { owner = "nvzone"; repo = "menu"; - rev = "7769b17c2a131108c02b10e9f844e504aa605cc2"; - sha256 = "1g81lmhd2vb0dq4am5wbl9q152k5qg6rzyw9z4v6img1im958hal"; + rev = "8adb036ec34c679050913864cbc98cc64eb91f6c"; + sha256 = "0yxs5fmj6swbbwnkwvji5hp553692mnaww87y1ag6xj14g5i96sl"; }; meta.homepage = "https://github.com/nvzone/menu/"; meta.hydraPlatforms = [ ]; @@ -11312,12 +11482,12 @@ final: prev: { nvzone-typr = buildVimPlugin { pname = "nvzone-typr"; - version = "2025-03-05"; + version = "2025-04-24"; src = fetchFromGitHub { owner = "nvzone"; repo = "typr"; - rev = "5ee7b67dc610e8ec2c0c8a6912a8d1fba90160c2"; - sha256 = "1bmhx41rpa16ijf0fcyx2hxiaa6xj8jf4jrm7favkgv45gf7qxh8"; + rev = "ec1abe68229a0c3480ae2df51e1807fd091261ba"; + sha256 = "1n71rcx712cw2yhsiqzmby94j8d7nps9irx0j8bml63h96kkj6wb"; }; meta.homepage = "https://github.com/nvzone/typr/"; meta.hydraPlatforms = [ ]; @@ -11325,12 +11495,12 @@ final: prev: { nvzone-volt = buildVimPlugin { pname = "nvzone-volt"; - version = "2025-02-23"; + version = "2025-04-11"; src = fetchFromGitHub { owner = "nvzone"; repo = "volt"; - rev = "21a2351697abfed26d4469b88d3ab124d55a1b3f"; - sha256 = "0lmmjfvxnkh4bslwm43h70sqpnw0s230wi10360cinxaz8jly4xs"; + rev = "c45d5f48da8e802e608b5c6da471ca4d84276dfb"; + sha256 = "0mx2npsj39y0q11i14kg4brc6nqhk5hjfdbwr197x41m0qjdqdpb"; }; meta.homepage = "https://github.com/nvzone/volt/"; meta.hydraPlatforms = [ ]; @@ -11338,12 +11508,12 @@ final: prev: { obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2025-03-13"; + version = "2025-04-28"; src = fetchFromGitHub { owner = "obsidian-nvim"; repo = "obsidian.nvim"; - rev = "15b8c5fc730625a3f162817b13db144c5bba3a9f"; - sha256 = "00amy1yg76ywic281pq4ycwjz1gxmqs14l35qf0ssp0vl8scq5gf"; + rev = "e0b72752d697142a7140bbf76a7905e7071d224c"; + sha256 = "0f42pac0iza9jrbk6annwxgmqpja3ijkihs9lacdg70a24dlmzrz"; }; meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/"; meta.hydraPlatforms = [ ]; @@ -11377,17 +11547,30 @@ final: prev: { octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2025-03-28"; + version = "2025-05-16"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "97660ea338c3c94e9e367258a322afc1e154cbbd"; - sha256 = "1lhsb52y2skqzvw1l05c27pryqfdkggl6nj0924731r2hlcj8v83"; + rev = "1564c793ce38934368df6dcb7cc767b29a66354a"; + sha256 = "17lralzgf9h4r5zzcvnnfppl6y5jvkiicrqabbhyga9l802hnr0l"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.hydraPlatforms = [ ]; }; + oil-git-status-nvim = buildVimPlugin { + pname = "oil-git-status.nvim"; + version = "2025-04-03"; + src = fetchFromGitHub { + owner = "refractalize"; + repo = "oil-git-status.nvim"; + rev = "4b5cf53842c17a09420919e655a6a559da3112d7"; + sha256 = "1jzw6lkvi9xxzqy8xz056xlb45byr1arklh87zmyf0nj9plm2nsp"; + }; + meta.homepage = "https://github.com/refractalize/oil-git-status.nvim/"; + meta.hydraPlatforms = [ ]; + }; + ollama-nvim = buildVimPlugin { pname = "ollama.nvim"; version = "2024-06-09"; @@ -11442,12 +11625,12 @@ final: prev: { one-small-step-for-vimkind = buildVimPlugin { pname = "one-small-step-for-vimkind"; - version = "2025-01-19"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "jbyuki"; repo = "one-small-step-for-vimkind"; - rev = "b9def31568d20b16f7da9479a4174d165046fe8a"; - sha256 = "1gr44v55hd1gi9hzzfa9fsmb2kmrkp91nvjbsgiczmjqyl3kvrpq"; + rev = "ba909c68fed65e268df8a4684bafef4ec889c8bc"; + sha256 = "0wwzfqzmvfc4pi5na0njalwnm7lhf640ndrcxvzp2izf87cm8l7g"; }; meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/"; meta.hydraPlatforms = [ ]; @@ -11455,12 +11638,12 @@ final: prev: { onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2024-11-09"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "67a74c275d1116d575ab25485d1bfa6b2a9c38a6"; - sha256 = "1pfyz3ascxs3sxl878qcirp9jsz77kpl2ks3wxkcv8ql4psymc9l"; + rev = "11de4da47f3e69cb70c3ae9816bd8af166cbe121"; + sha256 = "1cqpd4yvcd6szbs95kxxr77mhfvgxcpjfybw8chlnnnwxxyh1k54"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; meta.hydraPlatforms = [ ]; @@ -11494,12 +11677,12 @@ final: prev: { onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2025-03-02"; + version = "2025-04-30"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "c96c21800e94630e6871981e75245caaa1b31bb7"; - sha256 = "1gsapapsi8256mkpp8pw1b3jcqjpg6qcg0nngg34wcdvidagcj09"; + rev = "01fd661713d2d1c337576ece5ced1cd2b7293b77"; + sha256 = "097fxq44611pxgkbv31fhkdx8n3rcg2wnyfnxbf7bl16nin24x31"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; meta.hydraPlatforms = [ ]; @@ -11520,12 +11703,12 @@ final: prev: { onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2025-03-25"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "babdcc3da92f0c90703bb612a13a58e5f7669287"; - sha256 = "04pgf4lqm7b81mfw99h0xlhz4s0k9fi4wn2f2jzlwyyc214d2xsc"; + rev = "039f76baf948acfc7c7d987ad9392fdc2a0e8a1c"; + sha256 = "1m6i7jks0pfzml2i3gzr3y20k9dv3hx2fg0a357cps9rg84nx0qd"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; meta.hydraPlatforms = [ ]; @@ -11559,12 +11742,12 @@ final: prev: { openingh-nvim = buildVimPlugin { pname = "openingh.nvim"; - version = "2024-12-02"; + version = "2025-05-01"; src = fetchFromGitHub { owner = "Almo7aya"; repo = "openingh.nvim"; - rev = "9131016c1167e23522a8e874b62217829fd327b8"; - sha256 = "1m5l4cdg4nq2cqgjspkjmj47y19l7d8j3gbl62i79cr0hf1gxz94"; + rev = "7cc8c897cb6b34d8ed28e99d95baccef609ed251"; + sha256 = "029gmakqgzk655ska21b790zzpxvkl1p5h3ci6cb68ljccnlsngw"; }; meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; meta.hydraPlatforms = [ ]; @@ -11572,12 +11755,12 @@ final: prev: { openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; - version = "2024-12-23"; + version = "2025-04-04"; src = fetchFromGitHub { owner = "salkin-mada"; repo = "openscad.nvim"; - rev = "58baf76fd2f9e2fe2ca83ea120d56084edb8871e"; - sha256 = "1rd2ppv5qwfp6ndk0mgizpmh3lhldmvwliifadykrz5vh2a7ix0p"; + rev = "b78108a0a50c254d0964c790a1bd21ec5ec386ef"; + sha256 = "19rzgs859nn02c779r66xkgq1dgshcm04kg035srnjmjqbipm7ps"; }; meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; meta.hydraPlatforms = [ ]; @@ -11585,12 +11768,12 @@ final: prev: { org-roam-nvim = buildVimPlugin { pname = "org-roam.nvim"; - version = "2025-03-12"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "chipsenkbeil"; repo = "org-roam.nvim"; - rev = "f92b54eff931982031d5e164482d5e781bb2cd31"; - sha256 = "sha256-KEmbFGXjOlSPY8wpr5WUzD5+eCUP1hXN2Ty37smLU9M="; + rev = "5ff1c9b0d89ac4a142abe3723e535fb127a516e4"; + sha256 = "0c1vcq4rzilyqb8d21jqh8icdqa22n9xswx919mf8pmhz1smbs2c"; }; meta.homepage = "https://github.com/chipsenkbeil/org-roam.nvim/"; meta.hydraPlatforms = [ ]; @@ -11598,12 +11781,12 @@ final: prev: { other-nvim = buildVimPlugin { pname = "other.nvim"; - version = "2025-03-25"; + version = "2025-05-09"; src = fetchFromGitHub { owner = "rgroli"; repo = "other.nvim"; - rev = "20128ea7158dd12df619283a45f336182b369294"; - sha256 = "165bjqg4yami91mkcpnhskbagk8w3h2qx1hkp6jppn24zfcpam4z"; + rev = "1d48e090f6d1d53dda9fb5094af3f2006ebbb858"; + sha256 = "0vhp986wajk7cdjfam4x9zifqwgz28i88v9vc45rb8qvk05ak6ir"; }; meta.homepage = "https://github.com/rgroli/other.nvim/"; meta.hydraPlatforms = [ ]; @@ -11611,12 +11794,12 @@ final: prev: { otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2025-03-27"; + version = "2025-05-14"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "622816aac66933352e20e4d5d01993cd270d6fb0"; - sha256 = "15ciqkx3hbbccy30dkga17jhra4mslvas0qnqiqrv5qlc09shyrp"; + rev = "fa436071c67233e6cd466268212feaf4ff4ed406"; + sha256 = "0i8bkgyh8zaszm15h8lznd9ik1fh0l0mdcwyam4mnn4q0nhjqznb"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; meta.hydraPlatforms = [ ]; @@ -11624,12 +11807,12 @@ final: prev: { outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2025-02-23"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "ae473fb51b7b6086de0876328c81a63f9c3ecfef"; - sha256 = "12dayhk8m3d34xip6v8hcmb65jvnp5yp2967mk2693i1kakxc8sy"; + rev = "321f89ef79f168a78685f70d70c52d0e7b563abb"; + sha256 = "1rg907hqdgz3h87ba262jqhph3m72g5r40jy9ngnjxmk0d45bcvx"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; meta.hydraPlatforms = [ ]; @@ -11664,12 +11847,12 @@ final: prev: { package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; - version = "2024-11-04"; + version = "2025-04-28"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "3de4f3569ce60e248707df042b72769b3ec343b8"; - sha256 = "03cf6k5wc5bypqacpv1qvbmps2wj5y21h0li987li4m1s8gvm4cq"; + rev = "4f1b8287dde221153ec9f2acd46e8237d2d0881e"; + sha256 = "1fy4za5fcm7psw398b75ji4wb0rhanibxjxysbn30nfz4dcmrd5y"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; meta.hydraPlatforms = [ ]; @@ -11742,12 +11925,12 @@ final: prev: { papercolor-theme-slim = buildVimPlugin { pname = "papercolor-theme-slim"; - version = "2025-03-28"; + version = "2025-05-01"; src = fetchFromGitHub { owner = "pappasam"; repo = "papercolor-theme-slim"; - rev = "4359f1126268674b9a924bea5b6c0e7d1359df78"; - sha256 = "1x2k3pmkx689820chr5zla9dyf83anv0i4xqjwcv3iy80djh1wg9"; + rev = "5cd7cbb10a512e8942b0c942b3de9d39b5830485"; + sha256 = "118lqx9isw1r0z6j3qmg7yr2pdi20j0rvg69igycg6mzzznjbdbj"; }; meta.homepage = "https://github.com/pappasam/papercolor-theme-slim/"; meta.hydraPlatforms = [ ]; @@ -11768,12 +11951,12 @@ final: prev: { parrot-nvim = buildVimPlugin { pname = "parrot.nvim"; - version = "2025-03-30"; + version = "2025-05-09"; src = fetchFromGitHub { owner = "frankroeder"; repo = "parrot.nvim"; - rev = "3158788f52745310bee3ec5a53dd0012f17f34d0"; - sha256 = "1pdxgjbfav223wablhy2gfq1fm3j523dln1rdnpycvbqcm60hm42"; + rev = "0fbef045d86165845d532326e4233739dc0686fb"; + sha256 = "0ycibj77l603s872jymsxggvf2qap4bx16k555xzshfkdayf28qy"; }; meta.homepage = "https://github.com/frankroeder/parrot.nvim/"; meta.hydraPlatforms = [ ]; @@ -11781,12 +11964,12 @@ final: prev: { pckr-nvim = buildVimPlugin { pname = "pckr.nvim"; - version = "2025-03-30"; + version = "2025-05-09"; src = fetchFromGitHub { owner = "lewis6991"; repo = "pckr.nvim"; - rev = "d299abb91f2cf1aa0e4733dfd76ed2f98b915e55"; - sha256 = "17n71x66vpixialjpx8hayknn3f6h2crbcpmn3chxfczsjvqkhhz"; + rev = "a793c6c38e7b54744c4b4658443e2d8fc103d552"; + sha256 = "1796rnacb8wm3bvmqsax78krw6a93yq9865vxm9387088fjd8a8v"; }; meta.homepage = "https://github.com/lewis6991/pckr.nvim/"; meta.hydraPlatforms = [ ]; @@ -11818,14 +12001,27 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + peek-nvim = buildVimPlugin { + pname = "peek.nvim"; + version = "2024-04-09"; + src = fetchFromGitHub { + owner = "toppair"; + repo = "peek.nvim"; + rev = "5820d937d5414baea5f586dc2a3d912a74636e5b"; + sha256 = "01bdrk1h1xaq2bbbgwsrb2h2cc9j2d88kjcx2k3p8j8kgk20yql4"; + }; + meta.homepage = "https://github.com/toppair/peek.nvim/"; + meta.hydraPlatforms = [ ]; + }; + persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2025-03-07"; + version = "2025-03-30"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "b4b7a281307f8b52d47b0fd5b6798a453681d44e"; - sha256 = "06cx8g8ijwfln7kns870aigqa4pi8bm32qqqrcswbsihgx3xv81x"; + rev = "d35a3ed973e17defd8800acd46a0c893498a2671"; + sha256 = "08rlcgyhjp18sbhkw00d48lf81ld77gwdzkii5xd37sijrkjgyf7"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; meta.hydraPlatforms = [ ]; @@ -11844,6 +12040,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + persistent-breakpoints-nvim = buildVimPlugin { + pname = "persistent-breakpoints.nvim"; + version = "2025-03-22"; + src = fetchFromGitHub { + owner = "Weissle"; + repo = "persistent-breakpoints.nvim"; + rev = "d1656221836207787b8a7969cc2dc72668c4742a"; + sha256 = "ed958d4725406d0b8cff2de316e67941f9af23ea53e099a8e645b61f08c34b56"; + }; + meta.homepage = "https://github.com/Weissle/persistent-breakpoints.nvim/"; + meta.hydraPlatforms = [ ]; + }; + pest-vim = buildVimPlugin { pname = "pest.vim"; version = "2024-04-25"; @@ -12003,12 +12212,12 @@ final: prev: { precognition-nvim = buildVimPlugin { pname = "precognition.nvim"; - version = "2025-03-08"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "tris203"; repo = "precognition.nvim"; - rev = "4223fb903cbafc3bd8a87a314dac375bbd1c01ce"; - sha256 = "11ng6p0xmrjky5xr9jdkrrav7is9r090qhs2fsnbg16124bgb0g5"; + rev = "80ac0a99064eba71894dd164e891cc5d7e05827e"; + sha256 = "1v1knpvd3wxvixmfyzrjwg9r7xbixg53n4dvvk7r8d05y5cgbzmc"; }; meta.homepage = "https://github.com/tris203/precognition.nvim/"; meta.hydraPlatforms = [ ]; @@ -12133,12 +12342,12 @@ final: prev: { pum-vim = buildVimPlugin { pname = "pum.vim"; - version = "2025-03-29"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "pum.vim"; - rev = "81189d12df5e02465766e4b182df9fe2fcfac00b"; - sha256 = "16a1n7vm2zajz0jksq8qscxbw9ab82c8n9maca236ihirjq4q8mq"; + rev = "4728300b8c6e0887256362648a0e2a3acf2ea22e"; + sha256 = "1l467rwv42bw6lb7jzfqw83gnwgx5aabm43w1944ddmck7mz6ic3"; }; meta.homepage = "https://github.com/Shougo/pum.vim/"; meta.hydraPlatforms = [ ]; @@ -12225,12 +12434,12 @@ final: prev: { quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2025-03-24"; + version = "2025-04-10"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "3c25bf3e9afff07c4396d98f0b2c39bc994037ad"; - sha256 = "1lms6p9z5k9krz9z8wmd0pz7kpzqx870xq6cpj6rg2dj8ffb956g"; + rev = "5325af3731ac9840b308791f08ad660958d76163"; + sha256 = "1vjam2g4nknqhnzz3x8qp2qbp6km8m7hs72qc459swpz6kvn2csv"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; meta.hydraPlatforms = [ ]; @@ -12251,12 +12460,12 @@ final: prev: { quicker-nvim = buildVimPlugin { pname = "quicker.nvim"; - version = "2025-03-05"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "stevearc"; repo = "quicker.nvim"; - rev = "1798be71cdcb15fb84fa8054148a56e17fd391dc"; - sha256 = "1wh59qd8x7p1pd13f6pqxajjbrjn11rbchmcl9ayi6hygcdkkhll"; + rev = "51d3926f183c2d98fbc237cc237ae0926839af3a"; + sha256 = "0h6i5043g90hnxdf5gibld20bcfvi2sdld6y6bpzja0axkxsc6jm"; }; meta.homepage = "https://github.com/stevearc/quicker.nvim/"; meta.hydraPlatforms = [ ]; @@ -12420,12 +12629,12 @@ final: prev: { refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2025-03-13"; + version = "2025-04-09"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "36bd14ddd7ebf0546c15e6088e8bc93f8a98787d"; - sha256 = "1kvwmkylhgcqh2b02crv0f429m7dhmjfrbjhr3llzr3b005rlmnv"; + rev = "2be7ea3f10b7e59658f5abf6dffc50b5d61964d6"; + sha256 = "1fryhqd6vb3c2pry0p8lnr0nz9kbykh6cnysawrqwlclw3fnjkad"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; meta.hydraPlatforms = [ ]; @@ -12472,12 +12681,12 @@ final: prev: { remote-sshfs-nvim = buildVimPlugin { pname = "remote-sshfs.nvim"; - version = "2025-03-28"; + version = "2025-03-30"; src = fetchFromGitHub { owner = "nosduco"; repo = "remote-sshfs.nvim"; - rev = "e047b6340653538efa57a8164cdcb1f729325689"; - sha256 = "0nyrz45z2gpvcyc14lr5f8n7mh3xc43xh1ra1cy9mqrrvpkwsknc"; + rev = "1ae5784bf0729c8b03cb7fe6561508a673c9adc8"; + sha256 = "181zlgmqi9cxbfw73iwbkl1d8jijm0dzla98mnaqrnnwygba7nk0"; }; meta.homepage = "https://github.com/nosduco/remote-sshfs.nvim/"; meta.hydraPlatforms = [ ]; @@ -12498,12 +12707,12 @@ final: prev: { render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2025-03-28"; + version = "2025-05-12"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "a1fc4e559252baa128c471adadf0be045abd542d"; - sha256 = "0n9zis5jf7khjdmc622g40is5yjsqkxph64mldpd3q8ka64yaib1"; + rev = "a1b0988f5ab26698afb56b9c2f0525a4de1195c1"; + sha256 = "0xv5k4gn6rrvz6nrlfd0da6f6nnzw45irhcixnmmfi9yprzkcy3r"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.hydraPlatforms = [ ]; @@ -12616,12 +12825,12 @@ final: prev: { rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2025-03-12"; + version = "2025-05-05"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3"; - sha256 = "0iy9is76bhgb17v0l7mr95mkhd9b4ah917v9shx74jp1xsgc481q"; + rev = "491a0c77abc7ecb955c27a974091a5968232995f"; + sha256 = "00f48nm3scap86vh0k5zs1vls0hb2qnjpiwsr54c6dpbycxq0yx3"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; meta.hydraPlatforms = [ ]; @@ -12629,12 +12838,12 @@ final: prev: { roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "2025-03-28"; + version = "2025-05-07"; src = fetchFromGitHub { owner = "seblyng"; repo = "roslyn.nvim"; - rev = "02aa30c67a538c00ef197708daf2edba11d50a2b"; - sha256 = "0h6nkivsspkcxgs08ig5yc6yikafh825q2m5sk1y7zfnhm55zdis"; + rev = "8dc729a651ae980088246caf651e5ff24e21077a"; + sha256 = "0vm7l4nf2zvpinmfzmccnziai26f741w8slqy8j09bx8hqib7dcf"; }; meta.homepage = "https://github.com/seblyng/roslyn.nvim/"; meta.hydraPlatforms = [ ]; @@ -12694,12 +12903,12 @@ final: prev: { rzls-nvim = buildVimPlugin { pname = "rzls.nvim"; - version = "2025-03-09"; + version = "2025-05-14"; src = fetchFromGitHub { owner = "tris203"; repo = "rzls.nvim"; - rev = "ebb652a4876c3c6af344333a6fc6bacffd85a27a"; - sha256 = "1pjzvxvmbaj17zx9hh81i98ni2kd1yrr5w83p92a4pdvbwicsck8"; + rev = "db123cecb6bd5e2d97c01e5877865162697d51a6"; + sha256 = "1m0y64zsrcwp3fbzzsjpcdmv2g4k9crnvg45yvzkp1vlgcim7f2y"; }; meta.homepage = "https://github.com/tris203/rzls.nvim/"; meta.hydraPlatforms = [ ]; @@ -12746,12 +12955,12 @@ final: prev: { satellite-nvim = buildVimPlugin { pname = "satellite.nvim"; - version = "2025-03-27"; + version = "2025-05-09"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "3379561c794a93c546c5c45f9d60e78a01a31d31"; - sha256 = "1nmnkcflqmm1x9z1yql43h0ghliw32nwhr2p7f3r6by9xccfmdic"; + rev = "8f3a12bc64fbb3df738bf82f8295219f50c5b59d"; + sha256 = "17pjg92han8mljka0zy23fiq33v960bkkbhva4jrrsmdzrg361fm"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; meta.hydraPlatforms = [ ]; @@ -12772,12 +12981,12 @@ final: prev: { scope-nvim = buildVimPlugin { pname = "scope.nvim"; - version = "2025-02-20"; + version = "2025-05-08"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "3fc963e75f88990a9467ff72b8eea667a69c30a2"; - sha256 = "11pbkrc0jb37sfdpf2bppz702ks3526kzcxyq7s5r23di4q61wlj"; + rev = "6b4208f017da9b122d69ddc5841e040dffe7313c"; + sha256 = "1qfxq9q0jy4nn82faff60vi0zp3xkxyzvdm461vymrcj17csnbsm"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; meta.hydraPlatforms = [ ]; @@ -12915,12 +13124,12 @@ final: prev: { sideways-vim = buildVimPlugin { pname = "sideways.vim"; - version = "2025-02-24"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "1dc47d2e0ba04da0f5e654f6b3bd65ce9ca8ce9f"; - sha256 = "13vykz2j2bimgkx08n0awrpjj039k9ggjjgkar9m3sq2hwkm5j3f"; + rev = "3b353b19972a1138261d939055aff4844b9c472f"; + sha256 = "07jsyq5qa3psv314mvy0a4grbpjp936iqsf7ac22v3rylcvp1dmx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -12955,12 +13164,12 @@ final: prev: { slimv = buildVimPlugin { pname = "slimv"; - version = "2025-02-02"; + version = "2025-04-29"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "7329d3688337591e307426539d9119dcf6988e6e"; - sha256 = "0zl8q8dpjw0fjac19pz9129yxrzkd86vzsni9cw7qnmml4fmnp9f"; + rev = "08f7dba91c3ecd0a62a852eca92258c7ceac4f0a"; + sha256 = "1l97vjqry7y633dh0s0lngys94zm0bb393g1s20w1rfbfy3jf8z1"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; meta.hydraPlatforms = [ ]; @@ -12981,12 +13190,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2025-03-28"; + version = "2025-05-16"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "987b1a29087d38072f86177ccf18bbdcef8660d8"; - sha256 = "0yfah9l4xvas97cywjzg6nqvj2wzbrp0dw1cc4wcdpfri6wyhflj"; + rev = "3af62ec991b972379833022c496abe96d727aa35"; + sha256 = "01mz3y86zb7f17gnay1c4h4l16j6kjscapgyldm3vajrlrq72ds7"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.hydraPlatforms = [ ]; @@ -13020,12 +13229,12 @@ final: prev: { smartyank-nvim = buildVimPlugin { pname = "smartyank.nvim"; - version = "2024-11-10"; + version = "2025-04-27"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "smartyank.nvim"; - rev = "0a4554a4ea4cad73dab0a15e559f2128ca03c7b2"; - sha256 = "15513r85kh0fy6y5lrqvrrafjadfhfh6hrcs4x2pjvh65zsja3y5"; + rev = "c4e53e0d9316ca790a6f5d78aad73206a763873b"; + sha256 = "0xwkrsjhliixsf4pywmcsc8ha0p4wx80008p0bwldm8zr5h7s4qd"; }; meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/"; meta.hydraPlatforms = [ ]; @@ -13033,12 +13242,12 @@ final: prev: { smear-cursor-nvim = buildVimPlugin { pname = "smear-cursor.nvim"; - version = "2025-03-23"; + version = "2025-05-08"; src = fetchFromGitHub { owner = "sphamba"; repo = "smear-cursor.nvim"; - rev = "01570fdc358979678380ff8704184307e87d8a29"; - sha256 = "0vl7cpfsh06mjcr5ysqmqv9yvixpfrn71qk6h368i9knprsdabs2"; + rev = "162703638203060b1d3412e73429d232bbd2627e"; + sha256 = "03clizj8bfv4smkf63n4idq6jijynnqj8p61ck8fg9w4l27n51bc"; }; meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/"; meta.hydraPlatforms = [ ]; @@ -13072,12 +13281,12 @@ final: prev: { snipe-nvim = buildVimPlugin { pname = "snipe.nvim"; - version = "2025-03-01"; + version = "2025-04-14"; src = fetchFromGitHub { owner = "leath-dub"; repo = "snipe.nvim"; - rev = "f43a1f0090de03d48ce5c55df630c1aa4d0b4291"; - sha256 = "151hqvfklncc9ai3cy5gjadg4fbxsl97rg8090fmfm3sb4g6xdi9"; + rev = "2a1b738dfae8502e6162eddfc774da65ed404142"; + sha256 = "0nw7rkld2m955yix1faf197pkrwx4xg6skl3dxis0r4xlcavxx9k"; }; meta.homepage = "https://github.com/leath-dub/snipe.nvim/"; meta.hydraPlatforms = [ ]; @@ -13111,12 +13320,12 @@ final: prev: { sonokai = buildVimPlugin { pname = "sonokai"; - version = "2025-02-24"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "9679341d4141ed81376f2bdf5e69b78dc348d212"; - sha256 = "1jbkfcs3ylsv2xsldjalp9agm4w7c5gda5kaawlrxcfngrh0pvnk"; + rev = "f59c796780655c3b9da442d310ad2f2d735f2e56"; + sha256 = "0sxf6z3yzg4hggad172ljy6vxpnfll9q84pqa7n40m26g2alg29x"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; meta.hydraPlatforms = [ ]; @@ -13254,12 +13463,12 @@ final: prev: { splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2025-03-07"; + version = "2025-04-12"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "9bb338c32bea49fb7f9de47404d65791f6046f31"; - sha256 = "15qh0y3ydwd09fay27lf3qq0p20qrgzlkdm1m2lhj4lppfgxbrl3"; + rev = "6af1cdcae4b46a90dbcd59ce0ca3543f34c7732c"; + sha256 = "026pnf7pvz1qz3f4cqwm086nv2f9apgc8qiyvysygfq8vsr6azpj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -13281,12 +13490,12 @@ final: prev: { srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2025-03-25"; + version = "2025-04-24"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "d8915c0153ed451c975fa20356cb8c254232aa28"; - sha256 = "119g6jhyiqj65n9cm93pxfydsn913yamx6dk1zf24z0gr7vfpp29"; + rev = "fc032d414752a2befcd3eaecfb86fdca87a2437d"; + sha256 = "17qq6y3zg7j43i9frhpkfkazm8jgd9mkx7klq79h4kr10jjylryi"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; meta.hydraPlatforms = [ ]; @@ -13398,12 +13607,12 @@ final: prev: { statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2025-03-03"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "c399884e8f64019ec9bb581251f9710915b7f996"; - sha256 = "0ia3hw4jvh3mlsj372ncp7hj27mw98h9jghvw8q9vk37bghy5455"; + rev = "a2580e009a3b4c51b5978768d907dafae2c919ac"; + sha256 = "0k3wj5mzv38wrmq17pd9xpdcc8p3l1bwx078931ylrga5j1ld3vx"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; meta.hydraPlatforms = [ ]; @@ -13489,12 +13698,12 @@ final: prev: { supertab = buildVimPlugin { pname = "supertab"; - version = "2024-06-07"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "ervandew"; repo = "supertab"; - rev = "8c638fe17b470f4a27554cdf8e641bafa5e2a7a4"; - sha256 = "1l2q1kw37pdqdk9nhr9rmr3c9kh8llwf44qvs7r245gifcjn2n75"; + rev = "8705ae0e43b34339c06328fa6dab24ecaf21aab6"; + sha256 = "0jy020w6mlx7kd8c0v2i0pr2id2rq77994ph3q6jv7hch9gaq9xl"; }; meta.homepage = "https://github.com/ervandew/supertab/"; meta.hydraPlatforms = [ ]; @@ -13554,12 +13763,12 @@ final: prev: { switch-vim = buildVimPlugin { pname = "switch.vim"; - version = "2025-02-13"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "b6bab56113312ebaa53038461c1a61bcb1e4a9d9"; - sha256 = "1n5nlyda1hyvid236i2p74ddf74jwdijsy77j8abwrb4hpsbzblb"; + rev = "f4b831b86e1e65af8c4f8be6434e15bef98d111e"; + sha256 = "1ygv1wj9034r6g2yr9ibb10hnm8z0f1dkf8a3rk5mc59803f3mvs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -13607,12 +13816,12 @@ final: prev: { tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2025-03-19"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "21b01d26627ee5fe94c8ae560bd1b0797dff3c40"; - sha256 = "1qfmlafp7yjby1qmfimrrxy479c0gh4biyxv38pb0ciglwl927gn"; + rev = "0207f9eba073be14688ffdbec68064835066e770"; + sha256 = "0zd3r34lcq2v40xwnpgb97swnv45jxc3k12s91fpm3sib0na3913"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; meta.hydraPlatforms = [ ]; @@ -13751,12 +13960,12 @@ final: prev: { tailwind-tools-nvim = buildVimPlugin { pname = "tailwind-tools.nvim"; - version = "2025-02-15"; + version = "2025-05-12"; src = fetchFromGitHub { owner = "luckasRanarison"; repo = "tailwind-tools.nvim"; - rev = "abe7368392345c53174979c2cf033e832de80ef8"; - sha256 = "0j3na6ijj6s05p31yagryfrhks30idsicgmgm0c2srmkca3p94cw"; + rev = "999d314444073095494f5a36b90fdba3c432a457"; + sha256 = "0sd4h5if7h12227ascchw2zp3ain3dqd2z2vn3chxi9jv76lgnpk"; }; meta.homepage = "https://github.com/luckasRanarison/tailwind-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -13908,12 +14117,12 @@ final: prev: { telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2025-03-27"; + version = "2025-05-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "aa28501258a66b7182a3071064c2d214ca840fbd"; - sha256 = "196kk5lw144jncrnkb5mlfwxx9v0pns31j881xxm8svxqnqg6f92"; + rev = "03a0efd1a8668b902bddef4b82cb7d46cd5ab22c"; + sha256 = "02ngsbw88b6xmra8vrmc3gxnw99cv6b18ja9mg4yn5b07244nm04"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; meta.hydraPlatforms = [ ]; @@ -14039,12 +14248,12 @@ final: prev: { telescope-project-nvim = buildVimPlugin { pname = "telescope-project.nvim"; - version = "2025-02-21"; + version = "2025-04-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "ce2c9fe209a68c7a924acde42d94ed8a2b2a52c5"; - sha256 = "15pw4hc9b0ixchvsps09yk05c88d66xn9ml5cysaip7v9678mivb"; + rev = "8e11df94419e444601c09828dadf70890484e443"; + sha256 = "1x7cd6a4c6cxnbahnmdyjca2wfcx12gl6zb3z6myg6lhzd7xyaj7"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; meta.hydraPlatforms = [ ]; @@ -14196,12 +14405,12 @@ final: prev: { templ-vim = buildVimPlugin { pname = "templ.vim"; - version = "2023-10-30"; + version = "2025-05-07"; src = fetchFromGitHub { owner = "joerdav"; repo = "templ.vim"; - rev = "5cc48b93a4538adca0003c4bc27af844bb16ba24"; - sha256 = "12w1cplgz5f02c61v42acgsf11078xcwp46j2b3lzmq9hj57rmb1"; + rev = "d482ee0bcf0606530725af27edaa320e5aaa4808"; + sha256 = "0irj2bq8r5vwxfzq56pck61z0mws94lykqq6khllqdxnm4z98g7f"; }; meta.homepage = "https://github.com/joerdav/templ.vim/"; meta.hydraPlatforms = [ ]; @@ -14376,6 +14585,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + timerly = buildVimPlugin { + pname = "timerly"; + version = "2025-04-16"; + src = fetchFromGitHub { + owner = "nvzone"; + repo = "timerly"; + rev = "17299a4d332c483ce09052fe8478b41b992f2594"; + sha256 = "0nfyw98nb95df0dpnxlaipgar92b8z2z3rxfih2fc86m6gxv2mm2"; + }; + meta.homepage = "https://github.com/nvzone/timerly/"; + meta.hydraPlatforms = [ ]; + }; + timestamp-vim = buildVimPlugin { pname = "timestamp.vim"; version = "2010-11-06"; @@ -14402,6 +14624,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + tinted-vim = buildVimPlugin { + pname = "tinted-vim"; + version = "2025-04-27"; + src = fetchFromGitHub { + owner = "tinted-theming"; + repo = "tinted-vim"; + rev = "e9b507ef9e88f364777d5982912ada3821e84200"; + sha256 = "1glyhckl36m7a0z1il1r95gfglvyw65ig7vq53kfph6xxvr3hkmk"; + }; + meta.homepage = "https://github.com/tinted-theming/tinted-vim/"; + meta.hydraPlatforms = [ ]; + }; + tiny-devicons-auto-colors-nvim = buildVimPlugin { pname = "tiny-devicons-auto-colors.nvim"; version = "2025-01-03"; @@ -14417,12 +14652,12 @@ final: prev: { tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2025-03-29"; + version = "2025-05-12"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "0a3be9835c6044e8bbc1bdf001e3333519a2bad9"; - sha256 = "05cxy8c8mpjxy115yy71z54mbrjvzy8c0s468pl63ggxp176a3pv"; + rev = "b6ed8038dfd256eb963a2c79cb30f0f4683551a0"; + sha256 = "0na7v97iqsc9416v6qhdnazzmzkx283hxvgihl16lj91cs4z7yh9"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; meta.hydraPlatforms = [ ]; @@ -14587,12 +14822,12 @@ final: prev: { treesj = buildVimPlugin { pname = "treesj"; - version = "2025-01-21"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "48c1a7539f376fd40ceb9cf12d697040fcf90649"; - sha256 = "0yha205ajwqz4y1a5l5qh35mivaz2ql1vqfky2cxy90zndq8g08r"; + rev = "3b4a2bc42738a63de17e7485d4cc5e49970ddbcc"; + sha256 = "0ydl72p2zp4yn50r5fzsdnfpr5ji04vfff7rs37jvb48lmfw2rlh"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; meta.hydraPlatforms = [ ]; @@ -14600,12 +14835,12 @@ final: prev: { treewalker-nvim = buildVimPlugin { pname = "treewalker.nvim"; - version = "2025-03-27"; + version = "2025-05-12"; src = fetchFromGitHub { owner = "aaronik"; repo = "treewalker.nvim"; - rev = "43d3250007d2c5a2ed693c1edebf66d66af33407"; - sha256 = "1ppzk7a5f9qi6r5mxy1xvbkzn3zr3rxbbqmq37l3cqg52h3jy683"; + rev = "c8aaeeaa64bac4afb60d0c253bbcbd765e6529d1"; + sha256 = "13wc5hqg2rwz7iq3kr0iyd47xqg6q2hvc63mfdiag1i6899nmmhf"; }; meta.homepage = "https://github.com/aaronik/treewalker.nvim/"; meta.hydraPlatforms = [ ]; @@ -14639,12 +14874,12 @@ final: prev: { triptych-nvim = buildVimPlugin { pname = "triptych.nvim"; - version = "2024-11-16"; + version = "2025-05-16"; src = fetchFromGitHub { owner = "simonmclean"; repo = "triptych.nvim"; - rev = "4ac0dfbfc2fd2b5d247cde16b323ed0e289c4f22"; - sha256 = "1s6w2zgqz352rq68rycrxjxyq8ssa673xq3fc1sg9rv78b1k1dn9"; + rev = "646f2b53413c8ab5c2b932cffcd968b02f0f3aa4"; + sha256 = "12rhxflcljpd2xlb763yicjpf1gs9l66xl800cx07rb22rd28sml"; fetchSubmodules = true; }; meta.homepage = "https://github.com/simonmclean/triptych.nvim/"; @@ -14783,12 +15018,12 @@ final: prev: { typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2025-03-28"; + version = "2025-04-25"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "3bc72c8597f6137f977032f5c76fcde51e0ef19a"; - sha256 = "1wvlmz7bbsspjxjnn3nqiididnrpz6zldaia3p73qqmzfyvbnw6f"; + rev = "3c501d7c7f79457932a8750a2a1476a004c5c1a9"; + sha256 = "0ks04qa0hgn7a2krk16b8g78hl10njhbs98234la4z06fqrq915f"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -14822,12 +15057,12 @@ final: prev: { typst-preview-nvim = buildVimPlugin { pname = "typst-preview.nvim"; - version = "2025-03-23"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "chomosuke"; repo = "typst-preview.nvim"; - rev = "10e6ec6f00365639e383fa8e95a32058dad53b22"; - sha256 = "1va3yw7iq5170ilfzd0fvpvkbkxn2yqk413j64ymg31aql8amgjc"; + rev = "dea4525d5420b7c32eebda7de15a6beb9d6574fa"; + sha256 = "0y658l2ibq0x4cwa4rl3lab7aw4ba68xcrdnxp81p2rsk0d60qq4"; }; meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/"; meta.hydraPlatforms = [ ]; @@ -14835,12 +15070,12 @@ final: prev: { typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2024-12-07"; + version = "2025-04-27"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "8ce752f1ba1277046429cb469c17ff2e1abc718f"; - sha256 = "04an0d3lmf662lhq14bh2837l7qv5khwj1hdcjljvds63czfnkhr"; + rev = "323539709e29a537ff39dfce6c05f175a8921504"; + sha256 = "0di84i53g1azxr02jlfm9kzzg0fg1dprxn2llrm9in4wglxf9yix"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; meta.hydraPlatforms = [ ]; @@ -14887,12 +15122,12 @@ final: prev: { unicode-vim = buildVimPlugin { pname = "unicode.vim"; - version = "2025-02-01"; + version = "2025-05-05"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "a78a0c7d27f87c2cd9c1d8609330edfaf69f2d4d"; - sha256 = "0aw0al5zxzf43hpbsw3pcb1jqp10mq0icns9cq9nxm697yxj4z08"; + rev = "c7ae86b93e70e816377ad194789bab0f5639dce2"; + sha256 = "01b143d20l1sfgsrfjwhcgzakl26ydkmv7haab4af9daqsbq14c9"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; meta.hydraPlatforms = [ ]; @@ -14911,14 +15146,27 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + unimpaired-which-key-nvim = buildVimPlugin { + pname = "unimpaired-which-key.nvim"; + version = "2024-08-16"; + src = fetchFromGitHub { + owner = "afreakk"; + repo = "unimpaired-which-key.nvim"; + rev = "c35f413a631e2d2a29778cc390e4d2da28fc2727"; + sha256 = "11skr474c9drq25823rx1jxcv5d57si0085zw60nq3wxmx999cg3"; + }; + meta.homepage = "https://github.com/afreakk/unimpaired-which-key.nvim/"; + meta.hydraPlatforms = [ ]; + }; + unison = buildVimPlugin { pname = "unison"; - version = "2025-03-28"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "51d6d80ead4325a5d491a795a413b82d4af6d35a"; - sha256 = "1b7d7mrrfikgfj9f9fm82rpxkh66bsa0az3h4i3350i9xqzmi87x"; + rev = "db315ad5de74159d563570984515cb84962ef662"; + sha256 = "14a0p8fwqjirh61bzq80fhs2i1wp3ch3amwyax5fgyc8rhx4gf9f"; }; meta.homepage = "https://github.com/unisonweb/unison/"; meta.hydraPlatforms = [ ]; @@ -15030,12 +15278,12 @@ final: prev: { vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2025-03-23"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "23358c7f0dda437a3dec3ec902911ee4376c0a56"; - sha256 = "04jjrrcw1y7wss8xzhh8s33l24d2b1whzf4ijqixpdimw29v73d3"; + rev = "c9fe6475abcf58ec03b4950c063adb7578cb308c"; + sha256 = "115qdv45ifscd8clsi03pk9m29dzxzxnm0wzczg2qy4lkc8525ws"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; meta.hydraPlatforms = [ ]; @@ -15082,12 +15330,12 @@ final: prev: { vim-ReplaceWithRegister = buildVimPlugin { pname = "vim-ReplaceWithRegister"; - version = "2024-11-12"; + version = "2025-05-03"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-ReplaceWithRegister"; - rev = "b82bf59e5387b57d0125afb94fd7984061031136"; - sha256 = "0g855rccq51pjbpm72llnv2paw9macwkidr0g6x5fhajd60vzbay"; + rev = "a487af6efd1be3fc6fac8da47d00efc9d1f6f724"; + sha256 = "19937w5xz9g95qk3wmvn592dxi2q81dbz4f8i14jlgndfkzi26i9"; }; meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithRegister/"; meta.hydraPlatforms = [ ]; @@ -15433,12 +15681,12 @@ final: prev: { vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2024-12-05"; + version = "2025-05-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "7a552f415c48aed33bf7eaa3c50e78504d417913"; - sha256 = "1akzrx1wdfgk626vjwym0z3al1df6nwack7wafmp5hb5cc8ypg14"; + rev = "41c5f54507fd865c8c00fe1f4bb390a59b6894ef"; + sha256 = "1dnlymp4kv8d5yr0fpabkrhyar5kg34jnzwgddykiifxhl99yfbi"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; meta.hydraPlatforms = [ ]; @@ -15732,12 +15980,12 @@ final: prev: { vim-better-whitespace = buildVimPlugin { pname = "vim-better-whitespace"; - version = "2024-06-12"; + version = "2025-05-12"; src = fetchFromGitHub { owner = "ntpeters"; repo = "vim-better-whitespace"; - rev = "86a0579b330b133b8181b8e088943e81c26a809e"; - sha256 = "19717vah1j37b2yqyk3wbwv71ffsh6qgvjzxzgvfljnp8ib0zrls"; + rev = "de99b55a6fe8c96a69f9376f16b1d5d627a56e81"; + sha256 = "1m3if862z0lihknhry5frgmxkzm80qpx4i763vw8w1caxv9zdp6v"; }; meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; meta.hydraPlatforms = [ ]; @@ -16239,12 +16487,12 @@ final: prev: { vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2025-01-25"; + version = "2025-05-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "9f0ca8bcef704659820a95c3bbd2c262583a66a1"; - sha256 = "13kwx67r5xl22znrd3i48qvr5dl5ny7qkpwkp455grkdx9y4q2gg"; + rev = "e95afed23712f969f83b4857a24cf9d59114c2e6"; + sha256 = "1b9f8dqzf2rfsfq8ivmwcf8k7yszyhz2axyds3861syxmxmy2cy9"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; meta.hydraPlatforms = [ ]; @@ -16265,12 +16513,12 @@ final: prev: { vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2025-03-26"; + version = "2025-04-14"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "685e75b34ee0e12f92ec4507ea8bb7f1aaa936e5"; - sha256 = "1ir8m3nks2aqh0jkmkyx46qprg7xm0bva72r83hwai79j1q6fk7j"; + rev = "460432301a5cb280ea265ddfa15c9f3dcd1d26b7"; + sha256 = "0adpm2sv0lwcfgn90lka3wj8slzbx0bl3lp201syrc8w6w7jgljr"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; meta.hydraPlatforms = [ ]; @@ -16577,12 +16825,12 @@ final: prev: { vim-endwise = buildVimPlugin { pname = "vim-endwise"; - version = "2025-01-24"; + version = "2025-04-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "f6a32fbe4d4e511d446ac189e926f8e24f69cc1e"; - sha256 = "1yysr1l197p8mkcg739688gi718886spbmmf232r824jw9cladq3"; + rev = "eab530110d7a0d985902a3964894816b50dbf31a"; + sha256 = "1lj12b0qim0n1x6aqvz79wl6415x9yi96yx22v3iycn00s6awpmj"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; meta.hydraPlatforms = [ ]; @@ -16707,12 +16955,12 @@ final: prev: { vim-fern = buildVimPlugin { pname = "vim-fern"; - version = "2025-03-27"; + version = "2025-04-14"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-fern"; - rev = "67a98a1f32706139fa26c6fc1f77a210ade469b3"; - sha256 = "1s1x412w8vjv9wj0p50nqlzqisz9ss6cmmija4gpmdxfmikjnxn9"; + rev = "7a1a31a8a0103e9eefbdc63feec5b1ce7580a7a2"; + sha256 = "1qyy3572dd53s59mqrj07kxn0f31wkg6fx4xvy3jyqfppzz148pb"; }; meta.homepage = "https://github.com/lambdalisue/vim-fern/"; meta.hydraPlatforms = [ ]; @@ -16772,12 +17020,12 @@ final: prev: { vim-flagship = buildVimPlugin { pname = "vim-flagship"; - version = "2025-03-28"; + version = "2025-05-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-flagship"; - rev = "de8da9c5e5fbb061e8ff55c65c510dcc5982c035"; - sha256 = "05gxh2yg8im20x9zsgr89qawhngd1w6gcn0sv69cwn9i2l7z8dhb"; + rev = "0bb6e26c31446b26900e0d38434f33ba13663cff"; + sha256 = "1yg4wrxq3bm7n22av7csl7gd5xj4v0h3rmmb2vljmm9kixhj6ng9"; }; meta.homepage = "https://github.com/tpope/vim-flagship/"; meta.hydraPlatforms = [ ]; @@ -16811,12 +17059,12 @@ final: prev: { vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; - version = "2024-04-08"; + version = "2025-04-28"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160"; - sha256 = "0nkbp4hcpfqj2s85g03rkb3786pa4cdf80mvmbzc89kiqw2ir260"; + rev = "204a01a3868cbe4549640dca857fb3880ee92b17"; + sha256 = "0fvzxbxhi44xflwswdj66q6j6ska83mrbagvscn7j94cfqh584zx"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; meta.hydraPlatforms = [ ]; @@ -17032,12 +17280,12 @@ final: prev: { vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2025-03-07"; + version = "2025-05-05"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "6620e5fbbe6a28de0bfed081f5bd2767023b7eea"; - sha256 = "0mhycx8kmzlymfqpy7ddivj18bbz3r789js9n6kikn9yxf02kqy2"; + rev = "a5ae0a5a18e266f8a62b3e256208afcbb20fe5b5"; + sha256 = "14h991ibkjqsca7z5442nz0vvi28q0bwkmzrd883hr92mrf3qmpi"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; meta.hydraPlatforms = [ ]; @@ -17084,12 +17332,12 @@ final: prev: { vim-go = buildVimPlugin { pname = "vim-go"; - version = "2025-03-10"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "1d641b739624199ab9ab745d220f36fe7b655d65"; - sha256 = "02qfql3c6njqkq7pbzrqknca638f3fczkx651v3wwl94339ln6ky"; + rev = "59e208d5212b86c8afd69d8590f181594f859ddb"; + sha256 = "09n71iy4wfqvrdfzvvc4za0alc5fsbds7xd4ln6zip17z89hkym7"; }; meta.homepage = "https://github.com/fatih/vim-go/"; meta.hydraPlatforms = [ ]; @@ -17123,12 +17371,12 @@ final: prev: { vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2024-12-23"; + version = "2025-04-27"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "cd2667f56f96b9dd376d8e56fe80eb32924971b9"; - sha256 = "0cpcdsymvxq9aklqpsrrjdww1s22ky2wxlk5nwfglzlmbmscpa12"; + rev = "16b462eac626681365dc0b249c248705a9111957"; + sha256 = "0zmqnzslfwzmjfxrc8bmp7g4xjw2xway1qgxw0zi3i6bvvv7sa3h"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; meta.hydraPlatforms = [ ]; @@ -17371,12 +17619,12 @@ final: prev: { vim-horizon = buildVimPlugin { pname = "vim-horizon"; - version = "2023-03-17"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "ntk148v"; repo = "vim-horizon"; - rev = "3864f6281b0b852712d8e9ef86edde512f94c1d2"; - sha256 = "152v4x7sj3nidj0710ick0p7xh020cjvhd8bjd28vfqd8xlv2nqw"; + rev = "32baaaca1337a0df287216b0775404fe913eaecd"; + sha256 = "0gaj44w0iixri82r4999pqd46mlixrvsq326696jb5mv2aczlw7b"; }; meta.homepage = "https://github.com/ntk148v/vim-horizon/"; meta.hydraPlatforms = [ ]; @@ -17462,12 +17710,12 @@ final: prev: { vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "2025-02-26"; + version = "2025-04-27"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "19cb21f513fc2b02f0c66be70107741e837516a1"; - sha256 = "1wfri17br6yqxnci43g69mvbckb7ajhj3c0mlcn1g0s7jkxz4acd"; + rev = "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf"; + sha256 = "072kgd7h7cjq4hskczxl60nsx3jpww9l7ypafcwk833ypahz899i"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; meta.hydraPlatforms = [ ]; @@ -17540,12 +17788,12 @@ final: prev: { vim-isort = buildVimPlugin { pname = "vim-isort"; - version = "2025-03-12"; + version = "2025-05-08"; src = fetchFromGitHub { owner = "fisadev"; repo = "vim-isort"; - rev = "41c7921dc755c5d10afe2e72f97b90ba43905a93"; - sha256 = "0i5kgd08ydqhfl8hxyxwpxgsg92pajn64azz5kp69fi75bbrg7sx"; + rev = "d17f0aa04910654a82ae993e289ba69cbfc37803"; + sha256 = "046l7gkx75mzp647lcg14pkpssmxxk4jzjhi15i0vsshfdc62np0"; }; meta.homepage = "https://github.com/fisadev/vim-isort/"; meta.hydraPlatforms = [ ]; @@ -18074,12 +18322,12 @@ final: prev: { vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2025-03-19"; + version = "2025-04-26"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "82cae9df8f2ffca5f66a2947fee15da575838413"; - sha256 = "06jvs613g5yb2sf2037zj6izjbydxw9r87izl8i4srvrh54v5xda"; + rev = "17cd09f1dc277f8df8f354416cbfc02aa7204e81"; + sha256 = "0yl2hzhwcn6h0pkm2lh0gbn7q35pk7g2pzdxfygpmvfm1p4c4vml"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.hydraPlatforms = [ ]; @@ -18204,12 +18452,12 @@ final: prev: { vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2024-12-18"; + version = "2025-03-30"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "aca23ce53ebfe34e02c4fe07e29e9133a2026481"; - sha256 = "1ishy555bs2r3sr7bjrr70hc25ms5iyq76660y2vhyjrndqfranx"; + rev = "ea2ff43e09e68b63fc6d9268fc5d82d82d433cb3"; + sha256 = "107sav1971bzlzjxj087rsgq1gdrf9vl3yj7yrx5xpbl8afm7pjb"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; meta.hydraPlatforms = [ ]; @@ -18321,12 +18569,12 @@ final: prev: { vim-monokai-tasty = buildVimPlugin { pname = "vim-monokai-tasty"; - version = "2025-03-12"; + version = "2025-04-22"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "36843b3c03eb6965eb5e3ed706f357b5c73ce8d4"; - sha256 = "1v3c7abdjypxyb2dkl56fv3s259m9v7p177ap65r6vdznxrw51cs"; + rev = "ba1f81e04b39d1ffd90c70ea93ba597166272c36"; + sha256 = "1r3js27rjf5y193lx8qgw28nlic8w10n6fzv1308xdm54mz5fg98"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; meta.hydraPlatforms = [ ]; @@ -18347,12 +18595,12 @@ final: prev: { vim-mucomplete = buildVimPlugin { pname = "vim-mucomplete"; - version = "2022-09-28"; + version = "2025-04-05"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "03bcd4a7dfe0a2f6d432e8ce936d35273a15209d"; - sha256 = "04vqya8dsphxia5j080ir7jk61jak2gc6xhg810wwxql4zls3fs1"; + rev = "1b7227b9541c861f7b05b84d523764a9b1de78d8"; + sha256 = "14nqb5p0s89pf1ng3xjpkgarjgblmwnk2m08a4lp471bfjpbrrqx"; }; meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; meta.hydraPlatforms = [ ]; @@ -18685,12 +18933,12 @@ final: prev: { vim-oscyank = buildVimPlugin { pname = "vim-oscyank"; - version = "2025-02-28"; + version = "2025-04-11"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "f0bd4d492503c6615c0804deda8416f7b735f7ed"; - sha256 = "0mv58jxlvirr2k3iby06s0n62fn4j60mjx6vi1wxz668vpqjr5xh"; + rev = "d67d76b2f19b868b70a1cf33a779d71dc092cb30"; + sha256 = "1j796g1zy88qmfr755wfp2r9hydscczbwyxqyf2valmk7wvhy9rj"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; meta.hydraPlatforms = [ ]; @@ -18737,12 +18985,12 @@ final: prev: { vim-pandoc = buildVimPlugin { pname = "vim-pandoc"; - version = "2024-07-22"; + version = "2025-04-30"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "bd11902651edc18076f90ed291581d785be52311"; - sha256 = "0aj0gsn2q5dqx9faky7fpqz93h6yih46dn7mn9gm80sdlv575gix"; + rev = "a9896b7f7c09b7804dd9e200e7b96c18ecb5fa0b"; + sha256 = "01282v4pfjzabixrnwlfrfy84d4xxczzgc38zgk4rz831ani3681"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; meta.hydraPlatforms = [ ]; @@ -18763,12 +19011,12 @@ final: prev: { vim-pandoc-syntax = buildVimPlugin { pname = "vim-pandoc-syntax"; - version = "2025-03-15"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "05ef7f44ebaea37159db8d365058c0a9e2ef14b5"; - sha256 = "0w48hmcs0dfpc28v9bxslxgvizppkcvw0zpj6sxha747bbi715fc"; + rev = "ea3fc415784bdcbae7f0093b80070ca4ff9e44c8"; + sha256 = "0mk33skbybrs4mwrwbsxkj9vcjik7bbrhk0lncxd9pvswnxrw053"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; meta.hydraPlatforms = [ ]; @@ -19283,12 +19531,12 @@ final: prev: { vim-ruby = buildVimPlugin { pname = "vim-ruby"; - version = "2024-12-21"; + version = "2025-04-28"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "9139741a9d786144aae66755df030f8e5fab36df"; - sha256 = "1mabq9a6w0pxm84acmhxk6i4x4dny8c5sw63fwjzwkw0sdxiv2fc"; + rev = "bf3a5994ce63796db7b1b04aea92772271f387aa"; + sha256 = "0h205xspvx89adssmn7bkdzdyrn9npnprrjcy30w305p9hy6z656"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; meta.hydraPlatforms = [ ]; @@ -19530,12 +19778,12 @@ final: prev: { vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2025-02-03"; + version = "2025-04-22"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "9bc2e13f8441b09fd7352a11629a4da0ea4cb058"; - sha256 = "0j4anbhpyyfnb846n7yhx2smr6q7ik11272zyfh7jwdr699c2dcj"; + rev = "507107dd24c9b85721fa589462fd5068e0f70266"; + sha256 = "0vpn8dfxzc5f2scc1ydl25fk4rxbnv849z00h1abzh73ysa3mpaq"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; meta.hydraPlatforms = [ ]; @@ -19712,12 +19960,12 @@ final: prev: { vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2025-03-28"; + version = "2025-05-15"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "fdf42b98bd7bc03dfa018d20aa3436d7f726a0b3"; - sha256 = "1zn5lrgm1bd00ivjyj3d470p0z2kxq3knhbw3327qa53i282n274"; + rev = "2c65832b77195fa78424138553ebc13dba5f2574"; + sha256 = "065r3yq2zl86nn19191hn5ivy63ddndxy51qbkafi3hmifzisav7"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; meta.hydraPlatforms = [ ]; @@ -19933,12 +20181,12 @@ final: prev: { vim-teal = buildVimPlugin { pname = "vim-teal"; - version = "2024-10-11"; + version = "2025-04-03"; src = fetchFromGitHub { owner = "teal-language"; repo = "vim-teal"; - rev = "a82ffa437a6a146d28da1c24356995155ebeb6a5"; - sha256 = "00hh8lqjvbv6rcfb2wlgifk4sznxcxcs3sjqdlpxhk3m9hhl4g10"; + rev = "c87b8931afa68376b88ff721336f31512b9384f1"; + sha256 = "0ymhpzv5sjyyljgk2b69nhcmikrsnl2pdpfs1c3s73s361gk4dn8"; }; meta.homepage = "https://github.com/teal-language/vim-teal/"; meta.hydraPlatforms = [ ]; @@ -19986,12 +20234,12 @@ final: prev: { vim-test = buildVimPlugin { pname = "vim-test"; - version = "2025-02-11"; + version = "2025-04-02"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "0f50a546aef59efe5f1301de8fa9819ecb9fd482"; - sha256 = "17vrvs3ks1dqk4j3sazg5jhsra17pz64ab7v7n359i37d5x1j18y"; + rev = "b0c3e13249699a522c8b472ff79eff40d2935476"; + sha256 = "0qcqg8cklj1lkl7mx0nk49jgdk2vy6l5mlk7ajs7s35bkbk8kmv1"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; meta.hydraPlatforms = [ ]; @@ -20142,12 +20390,12 @@ final: prev: { vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2025-02-25"; + version = "2025-04-25"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "791dacfcfc8ccb7f6eb1c853050883b03e5a22fe"; - sha256 = "1s1wbd52cfbd5ca27lr5gk6dx0xlkm2vfsg8h9r1yf39mqf0m87h"; + rev = "33afa80db65113561dc53fa732b7f5e53d5ecfd0"; + sha256 = "08mwnxaks7gypzcv5ac6gsxbkbc71dyc88xqrn6liqhd5y93jxw7"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; meta.hydraPlatforms = [ ]; @@ -20168,12 +20416,12 @@ final: prev: { vim-toml = buildVimPlugin { pname = "vim-toml"; - version = "2025-03-05"; + version = "2025-04-10"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "31e3005667b495eabdc23c0cf0b0140e284551b3"; - sha256 = "0qwcd5ns70bahii6zhrbfs36q11q9rf9ljk4355xbl0lambscqr9"; + rev = "5455494d15aafb04497c6db58374cd9c742d3ac1"; + sha256 = "06ap4ma2hm37vg5rpl7r032wlcrhinaj4kmz0cggnjla94mvhf4q"; }; meta.homepage = "https://github.com/cespare/vim-toml/"; meta.hydraPlatforms = [ ]; @@ -20181,12 +20429,12 @@ final: prev: { vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2024-09-11"; + version = "2025-05-06"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "72a624f97730059bab359cb0b58a23433bfec308"; - sha256 = "1sz3mqsji14yrrrkvnx00dgaf908zkwq9m2myb5jk2gyj3z1dgib"; + rev = "cbaa8b5130c0c37f3ddafbc703775edbb3edcf78"; + sha256 = "14qswdhw2lnhsjbn8wx1lfmmy652zd8jcgkh56dv3dnql21klx84"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; meta.hydraPlatforms = [ ]; @@ -20389,12 +20637,12 @@ final: prev: { vim-vsnip = buildVimPlugin { pname = "vim-vsnip"; - version = "2025-03-28"; + version = "2025-04-08"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "b7445b3c43acb08c0b74350d046e0088ece88033"; - sha256 = "1gccx6fglhqd5znf2rz7n16wwxx49wgfy6rjlrni5kr1adp047wa"; + rev = "0a4b8419e44f47c57eec4c90df17567ad4b1b36e"; + sha256 = "141abjf19l2srzniyg3xd8bv7r7zb1ns3mnxpzmqhss7id3vh5mx"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; meta.hydraPlatforms = [ ]; @@ -20467,12 +20715,12 @@ final: prev: { vim-wayland-clipboard = buildVimPlugin { pname = "vim-wayland-clipboard"; - version = "2025-03-15"; + version = "2025-04-01"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "f5c1aa97c6f757c958572507ca2a6032f92974e3"; - sha256 = "14b1h18nypa6gq2123mm24adxxq0f9ljljacxg0fmkd98ipv46l6"; + rev = "2fa6178d39925eab6a33dd13583d1bd9b67d3f65"; + sha256 = "1fqb4jwkz5qi3b4fxxz00m6qj8sj8ylblqznwkmq4hqw6r8mj43m"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; meta.hydraPlatforms = [ ]; @@ -20806,12 +21054,12 @@ final: prev: { vimtex = buildVimPlugin { pname = "vimtex"; - version = "2025-03-27"; + version = "2025-04-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "528c0671d4d579e1ce126e8958b388a67586d282"; - sha256 = "0h91bbmdk6b3ds2nfrq8847b0xg622wx6qkyy9k6kx43yhbhg1ni"; + rev = "85cb04f5a9d2289b9d2b62d5d84342fe9675ec08"; + sha256 = "1rxjrfxxmk9afdx0qj6mmpfwylk6yw76ha8mq1xf0j7nl6qc733v"; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.hydraPlatforms = [ ]; @@ -20884,12 +21132,12 @@ final: prev: { vissort-vim = buildVimPlugin { pname = "vissort.vim"; - version = "2014-01-31"; + version = "2025-03-29"; src = fetchFromGitHub { owner = "navicore"; repo = "vissort.vim"; - rev = "75a5b08b64d2f762206bffd294066533891fa03c"; - sha256 = "0a71b22apkhicca9nkd06jlcnqkf583mlpfh2mvl4d474viavqfn"; + rev = "2572491531f824f9761a607807091bd7ec78373b"; + sha256 = "0nd8yx99qbz3lifr9qdc5zx7bbk1nng67skirs1ixixfrki8rxi3"; }; meta.homepage = "https://github.com/navicore/vissort.vim/"; meta.hydraPlatforms = [ ]; @@ -20910,12 +21158,12 @@ final: prev: { visual-whitespace-nvim = buildVimPlugin { pname = "visual-whitespace.nvim"; - version = "2025-03-31"; + version = "2025-04-25"; src = fetchFromGitHub { owner = "mcauley-penney"; repo = "visual-whitespace.nvim"; - rev = "2bdf159a49a8ed4e715b81d6e0f975dcc1751c53"; - sha256 = "1s5iifvwznpf1dflp6y604khrmpkwx49nnv7xmm2c1jbwn0l5nyl"; + rev = "a1410983f8c0264c75c2b9234171de754528b17f"; + sha256 = "0j6jgqmc0ldfhg66gmn6ylvnwhvgpl6krznp75lrz8qx21rfw84g"; }; meta.homepage = "https://github.com/mcauley-penney/visual-whitespace.nvim/"; meta.hydraPlatforms = [ ]; @@ -20923,12 +21171,12 @@ final: prev: { vs-tasks-nvim = buildVimPlugin { pname = "vs-tasks.nvim"; - version = "2025-03-17"; + version = "2025-04-28"; src = fetchFromGitHub { owner = "EthanJWright"; repo = "vs-tasks.nvim"; - rev = "f0a10214ca3856fb4387db4f11acbaafa9ed3515"; - sha256 = "0k00n8p9cy2g98a8g5dg9c67sa0hx1shjj0hhpw8yac4rj5dbgdl"; + rev = "7b5b87b838acfe996c2d71f27d4a7df200a3cc7a"; + sha256 = "0ys3jshy8xpjhi0k6zxb2pbjm3pzdmc79h6lvggpan6w2w0ahmjd"; }; meta.homepage = "https://github.com/EthanJWright/vs-tasks.nvim/"; meta.hydraPlatforms = [ ]; @@ -20936,12 +21184,12 @@ final: prev: { vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2025-03-26"; + version = "2025-05-14"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "49d6014ba151fc6cc585b8d5f057ca7839077bf8"; - sha256 = "1ik0jz4d39jsi117hvcksvzx2b1k3aiqc1x4rgjfd43zg400mi58"; + rev = "57cec1509bfb57dfc3c4d5ba5e8db9a5b5e42be2"; + sha256 = "0w2ibwcxj4i2xa4xs7901mmkyynxs7q0754fmzj4mfhxpb6nqz9q"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; meta.hydraPlatforms = [ ]; @@ -21014,12 +21262,12 @@ final: prev: { whichpy-nvim = buildVimPlugin { pname = "whichpy.nvim"; - version = "2025-03-14"; + version = "2025-05-13"; src = fetchFromGitHub { owner = "neolooong"; repo = "whichpy.nvim"; - rev = "1652a59dce97902c6c77960fba325163764af40f"; - sha256 = "084b5y17069sz3hh312g4v6w4bqlaqmwdszk3yz3s34a386a0qgf"; + rev = "4091361ed224e0e5ae92b2a5c412cb2ca7c26f65"; + sha256 = "1ilq5qh49v3agnbyrmjxzakr54b2fja9f5iy8n8540m33y790dwa"; }; meta.homepage = "https://github.com/neolooong/whichpy.nvim/"; meta.hydraPlatforms = [ ]; @@ -21116,6 +21364,32 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + windsurf-nvim = buildVimPlugin { + pname = "windsurf.nvim"; + version = "2025-04-30"; + src = fetchFromGitHub { + owner = "Exafunction"; + repo = "windsurf.nvim"; + rev = "821b570b526dbb05b57aa4ded578b709a704a38a"; + sha256 = "1klbr2pi1kspzhy53a5wshqwazbxc1smggr5d8rvjpmyxmqv6rsd"; + }; + meta.homepage = "https://github.com/Exafunction/windsurf.nvim/"; + meta.hydraPlatforms = [ ]; + }; + + windsurf-vim = buildVimPlugin { + pname = "windsurf.vim"; + version = "2025-04-04"; + src = fetchFromGitHub { + owner = "Exafunction"; + repo = "windsurf.vim"; + rev = "272c6e2755e8faa90e26bcdcd9fde6b9e61751ea"; + sha256 = "0d2x0sly9wcbb3qrm43rim3995dk3gdr85dp7gc5nh5c9iw8yxsp"; + }; + meta.homepage = "https://github.com/Exafunction/windsurf.vim/"; + meta.hydraPlatforms = [ ]; + }; + winshift-nvim = buildVimPlugin { pname = "winshift.nvim"; version = "2022-09-06"; @@ -21207,6 +21481,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + xmake-nvim = buildVimPlugin { + pname = "xmake.nvim"; + version = "2025-04-28"; + src = fetchFromGitHub { + owner = "Mythos-404"; + repo = "xmake.nvim"; + rev = "ae9bb3ec97cd27cd95f616687096e529363aa80b"; + sha256 = "0jd1pv6a3888phhr3wj44hqgh1vvjma7b79z1hpi0wz5s9w7zmpf"; + }; + meta.homepage = "https://github.com/Mythos-404/xmake.nvim/"; + meta.hydraPlatforms = [ ]; + }; + xptemplate = buildVimPlugin { pname = "xptemplate"; version = "2022-09-08"; @@ -21233,14 +21520,40 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + yaml-companion-nvim = buildVimPlugin { + pname = "yaml-companion.nvim"; + version = "2024-07-14"; + src = fetchFromGitHub { + owner = "someone-stole-my-name"; + repo = "yaml-companion.nvim"; + rev = "131b0d67bd2e0f1a02e0daf2f3460482221ce3c0"; + sha256 = "16115xvzzqmq8d5whjv772x2xnllly1zcql5wzpdhsf7dvqkvpp3"; + }; + meta.homepage = "https://github.com/someone-stole-my-name/yaml-companion.nvim/"; + meta.hydraPlatforms = [ ]; + }; + + yaml-schema-detect-nvim = buildVimPlugin { + pname = "yaml-schema-detect.nvim"; + version = "2025-05-15"; + src = fetchFromGitHub { + owner = "cwrau"; + repo = "yaml-schema-detect.nvim"; + rev = "18b40548cb9a8c70e0d35c362e5f7150d6baef12"; + sha256 = "1kydjk8816b2348yny3ci0dqd96syy7jsf4g577dm7d0rsskimz8"; + }; + meta.homepage = "https://github.com/cwrau/yaml-schema-detect.nvim/"; + meta.hydraPlatforms = [ ]; + }; + yanky-nvim = buildVimPlugin { pname = "yanky.nvim"; - version = "2025-03-19"; + version = "2025-04-14"; src = fetchFromGitHub { owner = "gbprod"; repo = "yanky.nvim"; - rev = "a21a0b4f593e1fb17b17882f1ab3a3c1b943b831"; - sha256 = "1sk3acrwwmx9wfxnfymgvl88bnp0xh8a30pyx040czrj3zl5l920"; + rev = "04775cc6e10ef038c397c407bc17f00a2f52b378"; + sha256 = "024dw52ji4691ndkaz3k12fx6qyvhdpd2r69r9d2isy81fbs2fjm"; }; meta.homepage = "https://github.com/gbprod/yanky.nvim/"; meta.hydraPlatforms = [ ]; @@ -21262,12 +21575,12 @@ final: prev: { yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2025-03-29"; + version = "2025-05-01"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "b5596b981df9cdb219ece29eea60cd52f149c319"; - sha256 = "1hjwwz925cnr26w2z7lmsq5p0zwzwvg3bhr2pibxkah34pdfyj50"; + rev = "64b8a4632dbde89e00303defac770e9f17117479"; + sha256 = "1dxvkvxvrrnrmk6m93aw843pr7njfafq7xndyj6rkmgfw7dmp11l"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.hydraPlatforms = [ ]; @@ -21366,12 +21679,12 @@ final: prev: { zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2025-03-04"; + version = "2025-04-22"; src = fetchFromGitHub { owner = "zenbones-theme"; repo = "zenbones.nvim"; - rev = "dbd485fa5d5230d175e024374d41dab5ad71b119"; - sha256 = "102375anp0b4iygnxcrx173r5cll3x1gwhfm4qnl3xq26691xy9p"; + rev = "9deaa8a38e43e8c587b427095dd43c3511255b21"; + sha256 = "1raj06j4qr0gamvjvpj109dhaxybrkcmdb271f1v42aw7v1mn9w0"; }; meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/"; meta.hydraPlatforms = [ ]; @@ -21405,12 +21718,12 @@ final: prev: { zig-vim = buildVimPlugin { pname = "zig.vim"; - version = "2025-03-24"; + version = "2025-04-27"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "a8ecf6ec3175e64811ceb85b33b746637cf95ad6"; - sha256 = "0ckkila6bgbxnq4k5pmxk2wmcpdsskz2084m38qg8fyhs9mfb41n"; + rev = "e55a7949561d34822b7cd2290819927b79825dcd"; + sha256 = "1a35b2v8w5g90cx1pk8d5mqi3byr3m0bhdhb6zx6fa1sj3j85mvd"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; meta.hydraPlatforms = [ ]; @@ -21418,12 +21731,12 @@ final: prev: { zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2025-03-29"; + version = "2025-05-01"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "8fdd7032633045ece559273370fc0ec75ee8ffce"; - sha256 = "067yvj7q4ylb362ilj1blj7rfnyxgn990aiv9032sx0jbl0jqvb2"; + rev = "d9e7442075d2241b90fc788a149c509ebc45f3cb"; + sha256 = "1zkfgwgm5bcmny7fd9h1sbmql5ka3ffx9n3y1adq4hr6w76myim2"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; meta.hydraPlatforms = [ ]; @@ -21444,12 +21757,12 @@ final: prev: { zotcite = buildVimPlugin { pname = "zotcite"; - version = "2025-03-17"; + version = "2025-04-29"; src = fetchFromGitHub { owner = "jalvesaq"; repo = "zotcite"; - rev = "67d4bef627854c418dfae7ef121e8752e82d7440"; - sha256 = "0f6x1x8bwl54i2294kxcqji6f5kigj4af13gqxgpyl3apmbqxqdm"; + rev = "316aa33a5ab754f9d08687070f8a8e238c4d603f"; + sha256 = "1r2nna6grzh6l6p4ihdhfz3viynj9abncbxcjb29r97qfbcfl5mj"; }; meta.homepage = "https://github.com/jalvesaq/zotcite/"; meta.hydraPlatforms = [ ]; diff --git a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix index b130c56caa88..8a94cc10b390 100644 --- a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix @@ -10,6 +10,7 @@ let luarocksPackageNames = [ "fidget-nvim" "gitsigns-nvim" + "grug-far-nvim" "image-nvim" "lsp-progress-nvim" "lualine-nvim" diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index d0eccec6bd57..f038c61b53b5 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.23"; + version = "0.0.23-unstable-2025-05-12"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - tag = "v${version}"; - hash = "sha256-Ud4NkJH7hze5796KjVe5Nj9DzxwQkDQErCJDDiBzAIY="; + rev = "aae4cc4014149e544fb00e78687bcdef8335dd10"; + hash = "sha256-ixJcD8V2rCLCrqE7hHtHfEtQuHeVyIDgyZ1VOY1jmD0="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; @@ -73,6 +73,7 @@ vimUtils.buildVimPlugin { passthru = { updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; attrPath = "vimPlugins.avante-nvim.avante-nvim-lib"; }; @@ -84,6 +85,10 @@ vimUtils.buildVimPlugin { # Requires setup with corresponding provider "avante.providers.azure" "avante.providers.copilot" + "avante.providers.gemini" + "avante.providers.ollama" + "avante.providers.vertex" + "avante.providers.vertex_claude" ]; meta = { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix index 178e59579256..f43b0557c4d8 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix @@ -1,27 +1,21 @@ { vimUtils, fetchFromGitHub, - nix-update-script, }: vimUtils.buildVimPlugin rec { pname = "bitbake-vim"; - version = "2.8.8"; + version = "2.10.4"; + # The tags are very messy on the upstream repo. We prefer disabling automatic updates for this plugin. + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "openembedded"; repo = "bitbake"; tag = version; - hash = "sha256-ShNMTsDL2N2BxwsHetn9rSQdWUBtF/N1EVAbYHXgBSY="; + hash = "sha256-gdxPnRhd4Hj1PWgCU5A/+639ndJXlkdArOBZt6eiZWA="; }; sourceRoot = "source/contrib/vim"; meta.homepage = "https://github.com/openembedded/bitbake/"; - - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "^(\\d+\\.\\d+\\.\\d+)$" - ]; - }; } diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix index fcce7e0a62b5..26735f7a0be4 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix @@ -8,19 +8,19 @@ gitMinimal, }: let - version = "1.1.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; tag = "v${version}"; - hash = "sha256-Vs34vPQ6BhBcSSlgGpUMOXNzywrwg116xt3MLUwgVVA="; + hash = "sha256-8lyDDrsh3sY7l0i0TPyhL69Oq0l63+/QPnLaU/mhq5A="; }; blink-fuzzy-lib = rustPlatform.buildRustPackage { inherit version src; pname = "blink-fuzzy-lib"; useFetchCargoVendor = true; - cargoHash = "sha256-MWElqh7ENJ6CbLOnvz0DsP5YYu+e+y12GSUOfW1IKGU="; + cargoHash = "sha256-IDoDugtNWQovfSstbVMkKHLBXKa06lxRWmywu4zyS3M="; nativeBuildInputs = [ gitMinimal ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix index 2f5c42d5af2b..89a6d7e91767 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix @@ -7,14 +7,14 @@ }: vimUtils.buildVimPlugin { pname = "cmp-async-path"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2025-04-13"; src = fetchFromGitea { domain = "codeberg.org"; owner = "FelipeLema"; repo = "cmp-async-path"; - rev = "d6d1ffa2075039632a2d71e8fa139818e15ac757"; - hash = "sha256-MZFpNPtSDMZNkfoz+3ZcDxLb8PvDtm9nb1dE0CbYIPQ="; + rev = "0ed1492f59e730c366d261a5ad822fa37e44c325"; + hash = "sha256-J1Iw7yNfvWq7Jul25Eyx4qk9lSiLpZt4TRvTYi1DXtk="; }; checkInputs = [ vimPlugins.nvim-cmp ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix index cffd5943faba..14e3240bf058 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix @@ -9,12 +9,12 @@ libuv, }: let - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; tag = "v${version}"; - hash = "sha256-OmSgrTYDtNb2plMyzjVvxGrfXB/lGKDpUQhpRqKfAMA="; + hash = "sha256-VHH1jQczzNFiH+5YflhU9vVCkEUoKciV/Z/n9DEZwiY="; }; codesnap-lib = rustPlatform.buildRustPackage { pname = "codesnap-lib"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix index 7b48ef9f427d..ac7cf589c82d 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix @@ -51,7 +51,7 @@ vimUtils.buildVimPlugin { substituteInPlace lua/cord/server/fs/init.lua \ --replace-fail \ "or M.get_data_path()" \ - "'${cord-server}'" + "or '${cord-server}'" ''; passthru = { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix index f9a58eddbf33..90f8aabb2a82 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix @@ -21,7 +21,8 @@ let pname = "dbee-bin"; inherit version; - src = "${src}/dbee"; + inherit src; + sourceRoot = "${src.name}/dbee"; vendorHash = "sha256-U/3WZJ/+Bm0ghjeNUILsnlZnjIwk3ySaX3Rd4L9Z62A="; buildInputs = [ @@ -51,7 +52,7 @@ vimUtils.buildVimPlugin { passthru = { updateScript = nix-update-script { - attrPath = "vimPlugins.nvim-dbee.dbee-lib"; + attrPath = "vimPlugins.nvim-dbee.dbee-bin"; }; # needed for the update script diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix index 047c08161334..8e65813f68b8 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix @@ -7,12 +7,12 @@ vimUtils, }: let - version = "0-unstable-2025-01-13"; + version = "0-unstable-2025-05-13"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "ddd7383e856a7c939cb4f5143278fe041bbb8cb9"; - sha256 = "sha256-pZ7AH1U95IWMmhk/uBO0Lsxx78H5H9ygPxk/HIqFFlY="; + rev = "72f56f7585903cd7bf92c665351aa585e150af0f"; + hash = "sha256-WPEizIClDmseDEhomCasLx/zfAMT7lq7ZBnfc/a8CuA="; }; spectre_oxi = rustPlatform.buildRustPackage { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix index 566e22c88a93..1bb6464e8295 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix @@ -18,19 +18,19 @@ nix-update-script, }: let - version = "1.3.17"; + version = "1.3.18"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; tag = "v${version}"; - hash = "sha256-o8U3GXg61dfEzQxrs9zCgRDWonhr628aSPd/l+HxS70="; + hash = "sha256-2Q7Jnt7pVCuNne442KPh2cSjA6V6WSZkgUj99UpmnOM="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; useFetchCargoVendor = true; - cargoHash = "sha256-HLPTt0JCmCM4SRmP8o435ilM1yxoxpAnf8hg3+8C54I="; + cargoHash = "sha256-cu7wn75rQcwPLjFl4v05kVMsiCD0mAlIBt49mvIaPPU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix new file mode 100644 index 000000000000..aa0110d200b7 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix @@ -0,0 +1,28 @@ +{ + lib, + vimUtils, + fetchFromGitLab, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "sonarlint.nvim"; + version = "0-unstable-2025-04-24"; + + src = fetchFromGitLab { + owner = "schrieveslaach"; + repo = "sonarlint.nvim"; + rev = "89d3d3b0dd239dbbdf4c1d728e41759d5378f049"; + hash = "sha256-EOAdSvugcDEDuBuFv/HL35HXWvB/V97UtOJqdRuU7ak="; + }; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + homepage = "https://gitlab.com/schrieveslaach/sonarlint.nvim"; + description = "Extensions for the built-in Language Server Protocol support in Neovim for sonarlint-language-server"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.sinics ]; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index adda29017afb..6cd3aca03402 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -1,4 +1,5 @@ # generated by pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py +# Using parser data from https://github.com/nvim-neorocks/nurr/blob/main/tree-sitter-parsers.json { buildGrammar, @@ -67,12 +68,12 @@ language = "arduino"; version = "0.0.0+rev=017696b"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-arduino"; rev = "017696bdf47ca2b10948c5a511f9ab387722d0f3"; hash = "sha256-zIs3ujkxfgCj6VBkNy/mobsAQ2mcxtjDMHxiQEMlWm8="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino"; }; asm = buildGrammar { language = "asm"; @@ -87,12 +88,12 @@ }; astro = buildGrammar { language = "astro"; - version = "0.0.0+rev=0ad33e3"; + version = "0.0.0+rev=213f6e6"; src = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; - rev = "0ad33e32ae9726e151d16ca20ba3e507ff65e01f"; - hash = "sha256-LhehKOhCDPExEgEiOj3TiuFk8/DohzYhy/9GmUSxaIg="; + rev = "213f6e6973d9b456c6e50e86f19f66877e7ef0ee"; + hash = "sha256-TpXs3jbYn39EHxTdtSfR7wLA1L8v9uyK/ATPp5v4WqE="; }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; @@ -153,12 +154,12 @@ }; bibtex = buildGrammar { language = "bibtex"; - version = "0.0.0+rev=ccfd77d"; + version = "0.0.0+rev=8d04ed2"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-bibtex"; - rev = "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"; - hash = "sha256-wgduSxlpbJy/ITenBLfj5lhziUM1BApX6MjXhWcb7lQ="; + rev = "8d04ed27b3bc7929f14b7df9236797dab9f3fa66"; + hash = "sha256-UOXGWm8k9YP0GUwvNEuIxeiXqJo4Jf9uBt+/oYaYUl4="; }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-bibtex"; }; @@ -166,32 +167,32 @@ language = "bicep"; version = "0.0.0+rev=bff5988"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-bicep"; rev = "bff59884307c0ab009bd5e81afd9324b46a6c0f9"; hash = "sha256-+qvhJgYqs8aj/Kmojr7lmjbXmskwVvbYBn4ia9wOv3k="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-bicep"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-bicep"; }; bitbake = buildGrammar { language = "bitbake"; version = "0.0.0+rev=a5d04fd"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-bitbake"; rev = "a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b"; hash = "sha256-SzHFNIeR6ukWXKkLd2Trg9zuKLMwNAolXGPIDBDaFRg="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-bitbake"; }; blade = buildGrammar { language = "blade"; - version = "0.0.0+rev=bcdc4b0"; + version = "0.0.0+rev=fbe5f81"; src = fetchFromGitHub { owner = "EmranMR"; repo = "tree-sitter-blade"; - rev = "bcdc4b01827cac21205f7453e9be02f906943128"; - hash = "sha256-Svco/cweC311fUlKi34sh0AWfP/VYRWJMXyAuUVRhAw="; + rev = "fbe5f81b54f0f6153961824ce306ffc805134980"; + hash = "sha256-zBdE6yP4DATApkf7UDGFBiQbIAuvQo0EMVf/jiXoCOQ="; }; meta.homepage = "https://github.com/EmranMR/tree-sitter-blade"; }; @@ -204,19 +205,30 @@ rev = "60ba73739c6083c693d86a1a7cf039c07eb4ed59"; hash = "sha256-ojm6OKgriKUqUcRBf8WgHv+BvPjUuYOaabC8VXE+Kwk="; }; - meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint.git"; + meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint"; }; bp = buildGrammar { language = "bp"; - version = "0.0.0+rev=16c4306"; + version = "0.0.0+rev=ee641d1"; src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-bp"; - rev = "16c43068ec30828c5aed11e87262c56f36782595"; - hash = "sha256-hltHcGll7+pPSIfJdCwvNEBrRaFKqfnXD/qKSIdbM6U="; + rev = "ee641d15390183d7535777947ce0f2f1fbcee69f"; + hash = "sha256-sCvz8Bf0nffSyis9rhppD/iCrlTyTLPAeH6WXg0N6+Y="; }; meta.homepage = "https://github.com/ambroisie/tree-sitter-bp"; }; + brightscript = buildGrammar { + language = "brightscript"; + version = "0.0.0+rev=48ce168"; + src = fetchFromGitHub { + owner = "ajdelcimmuto"; + repo = "tree-sitter-brightscript"; + rev = "48ce1687125c6dfefcc7a1bef19fa0f0f00426cc"; + hash = "sha256-eVHAl8qykIS90SpWHvpT6VEqjKuXCX8zIYlRGlhUm7w="; + }; + meta.homepage = "https://github.com/ajdelcimmuto/tree-sitter-brightscript"; + }; c = buildGrammar { language = "c"; version = "0.0.0+rev=2a265d6"; @@ -254,34 +266,34 @@ language = "cairo"; version = "0.0.0+rev=6238f60"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-cairo"; rev = "6238f609bea233040fe927858156dee5515a0745"; hash = "sha256-QjCt3sRINrNbaxtNwj43+g7D3xYmuh0BIAo6wWQ/54g="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-cairo"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-cairo"; }; capnp = buildGrammar { language = "capnp"; version = "0.0.0+rev=7b0883c"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-capnp"; rev = "7b0883c03e5edd34ef7bcf703194204299d7099f"; hash = "sha256-WKrZuOMxmdGlvUI9y8JgwCNMdJ8MULucMhkmW8JCiXM="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-capnp"; }; chatito = buildGrammar { language = "chatito"; version = "0.0.0+rev=b4cbe9a"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-chatito"; rev = "b4cbe9ab7672d5106e9550d8413835395a1be362"; hash = "sha256-te2Eg8J4Zf5H6FKLnCAyyKSjTABESUKzqQWwW/k/Y1c="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-chatito"; }; circom = buildGrammar { language = "circom"; @@ -307,23 +319,23 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=fe48221"; + version = "0.0.0+rev=c2fdefa"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "fe48221d4d9842d916d66b5e71ab3c6307ec28b3"; - hash = "sha256-lU6EU+ikUJ1Q/SzJ2/PzziRLO8PSS3oQ8hCANO4n8Tw="; + rev = "c2fdefaf7ae3b7c5cf11705fe63c516b1c490590"; + hash = "sha256-053MSoEeeSPOVKWR96tZnZjXbR+597ZoqE8ai9CEWKc="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; comment = buildGrammar { language = "comment"; - version = "0.0.0+rev=3555706"; + version = "0.0.0+rev=689be73"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-comment"; - rev = "3555706cef8b98d3e4c7379d7260548ff03ad363"; - hash = "sha256-7iY7D7wz+rYRWhi+429a2pcF0mUMBCnnecIssxlqvt0="; + rev = "689be73775bd2dd57b938b8e12bf50fec35a6ca3"; + hash = "sha256-O9BBcsMfIfDDzvm2eWuOhgLclUNdgZ/GsQd0kuFFFPQ="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-comment"; }; @@ -331,12 +343,12 @@ language = "commonlisp"; version = "0.0.0+rev=3232350"; src = fetchFromGitHub { - owner = "theHamsta"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-commonlisp"; rev = "32323509b3d9fe96607d151c2da2c9009eb13a2f"; hash = "sha256-cNGxZXoxhnXGo4yhMHDSjF/j43JNXg1ClpqN2xJgLQU="; }; - meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-commonlisp"; }; cooklang = buildGrammar { language = "cooklang"; @@ -364,21 +376,21 @@ language = "cpon"; version = "0.0.0+rev=594289e"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-cpon"; rev = "594289eadfec719198e560f9d7fd243c4db678d5"; hash = "sha256-Nr+98yrDkOS5Yh/EFmBWV9Yhv2tPfHGb4pPlLUwc+k8="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-cpon"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-cpon"; }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=e5cea0e"; + version = "0.0.0+rev=56455f4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "e5cea0ec884c5c3d2d1e41a741a66ce13da4d945"; - hash = "sha256-2uVlKVnMKnugJv4Py3PtFI8rmx2RMwUIYfQ8zDNugGw="; + rev = "56455f4245baf4ea4e0881c5169de69d7edd5ae7"; + hash = "sha256-yU1bwDhwcqeKrho0bo4qclqDDm1EuZWHENI2PNYnxVs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -397,24 +409,24 @@ language = "csv"; version = "0.0.0+rev=7eb7297"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-csv"; rev = "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"; hash = "sha256-5VL7uREH0lloAWo9rdJXsjDsWxgL6fngWJSmi4fM7UQ="; }; location = "csv"; - meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv"; }; cuda = buildGrammar { language = "cuda"; version = "0.0.0+rev=014628a"; src = fetchFromGitHub { - owner = "theHamsta"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-cuda"; rev = "014628ae8d2df391b88ddb9fa0260fd97f770829"; hash = "sha256-zlG7/ERVZFLRBqu7q/wjcYG+iBlDY7s/SwKyqzIA0OM="; }; - meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-cuda"; }; cue = buildGrammar { language = "cue"; @@ -429,12 +441,12 @@ }; cylc = buildGrammar { language = "cylc"; - version = "0.0.0+rev=8b895c2"; + version = "0.0.0+rev=1f3cb70"; src = fetchFromGitHub { owner = "elliotfontaine"; repo = "tree-sitter-cylc"; - rev = "8b895c278f98d05e67997f5e3a43fb5531933023"; - hash = "sha256-+Afoxp+1hJZfRsekpz9WAEw/i/7uoXb0wl7/b6tlPro="; + rev = "1f3cb70200b4e238e19652705336e7f2c52b8e2f"; + hash = "sha256-bUyjBY4lunMKYvuD/AnqLJF8Ej0AM7unnEropIcqwFg="; }; meta.homepage = "https://github.com/elliotfontaine/tree-sitter-cylc"; }; @@ -473,23 +485,23 @@ }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=16f640f"; + version = "0.0.0+rev=6557729"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "16f640f3c59117c9e749d581634afdb00e004f4c"; - hash = "sha256-0J1Q25JEWVAlBHAgWRtHAwIIDNoSLYrEdMC45/jf7Uc="; + rev = "6557729f4afaf01dec7481d4e5975515ea8f0edd"; + hash = "sha256-ua+mk++93ooH5nQH/M4vj7VSSvVDis/Uh8S1H34TxKs="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; dhall = buildGrammar { language = "dhall"; - version = "0.0.0+rev=4a6c08a"; + version = "0.0.0+rev=6201325"; src = fetchFromGitHub { owner = "jbellerb"; repo = "tree-sitter-dhall"; - rev = "4a6c08abfb54827db4e722d6cdca81b093898988"; - hash = "sha256-EP6eL04ltnnP2ypNsq6rLrG3F4bVg7QtnK3k0KP2/MY="; + rev = "62013259b26ac210d5de1abf64cf1b047ef88000"; + hash = "sha256-4xbz7DDUlLGgLW5V6Yyvo7dkE9MOk3mCQEBTYyRbNuM="; }; meta.homepage = "https://github.com/jbellerb/tree-sitter-dhall"; }; @@ -552,12 +564,12 @@ language = "doxygen"; version = "0.0.0+rev=ccd998f"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-doxygen"; rev = "ccd998f378c3f9345ea4eeb223f56d7b84d16687"; hash = "sha256-Yh6FaRvWmeqnSnBgOojWbs1wJaeEoNJlvSEqgzjGh7o="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-doxygen"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-doxygen"; }; dtd = buildGrammar { language = "dtd"; @@ -573,12 +585,12 @@ }; earthfile = buildGrammar { language = "earthfile"; - version = "0.0.0+rev=ae378d9"; + version = "0.0.0+rev=a37c5ee"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "ae378d9d1306e9a967698516041f6f8803db5592"; - hash = "sha256-BKosyoT2zv9A1at9N1P018nNlMUB2OPg2vu3sjNiW4Q="; + rev = "a37c5ee95ce401ca311c0ae1369d9cfb953e151d"; + hash = "sha256-lYoS3RtHPYRrkfgo/qqAnT918FXeXnDUhG4l1TMXjb4="; }; meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; }; @@ -596,12 +608,12 @@ }; editorconfig = buildGrammar { language = "editorconfig"; - version = "0.0.0+rev=02f562e"; + version = "0.0.0+rev=3f2b371"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-editorconfig"; - rev = "02f562e71dc28d573187809eecdffaee7c82321c"; - hash = "sha256-HSpBBjsnaGWZYTesEs+W/TgAy66qv/hJbbjNRrygmgQ="; + rev = "3f2b371537355f6e53cc3af37f79ba450efb5132"; + hash = "sha256-z5pTG7EbmEZV+5RtXI8jGxxb0ifb67EJXquWQ0IA1a8="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; }; @@ -629,23 +641,23 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=450a819"; + version = "0.0.0+rev=b848e63"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "450a8194f5a66561135962cfc8d7545a27b61c4c"; - hash = "sha256-4cL8E7if7j5NeuMH/5IEgudHu2kcerpdTj4pVoYM0Ao="; + rev = "b848e63e9f2a68accff0332392f07582c046295a"; + hash = "sha256-kMsGDHFGBclpyk9n01JJsoqInEWLEcyIUSgcWJ2Jpzk="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=e34bdc5"; + version = "0.0.0+rev=6e3c6d5"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "e34bdc5c512918628b05b48e633f711123204e45"; - hash = "sha256-LKXYQk7W/2KUvHGM7DV041IdR7IbpnaaTf3fxIzAlxo="; + rev = "6e3c6d51f13168f9d7794c8e8add7dfdd07d20b8"; + hash = "sha256-xasJsElSw5gqI7cZsj0lq8n4zVd287zWdcnK3skpwCQ="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -684,23 +696,23 @@ }; enforce = buildGrammar { language = "enforce"; - version = "0.0.0+rev=8201c3c"; + version = "0.0.0+rev=36064bd"; src = fetchFromGitHub { owner = "simonvic"; repo = "tree-sitter-enforce"; - rev = "8201c3c354c34b96d5a531c8e63d262209ee06cb"; - hash = "sha256-0js82yv8wShy1bdj3k50nnlOPNpNgKLobd/4aNH//gw="; + rev = "36064bd71ce22e9a8c73b64b1a3448cc600a4312"; + hash = "sha256-Ijt0OSQtyXU1zTqkaudN0c7i0jV6asN1VR/Ip06LLsw="; }; meta.homepage = "https://github.com/simonvic/tree-sitter-enforce"; }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=364e323"; + version = "0.0.0+rev=067d669"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "364e323b32d098ad0e7b29e7adb4005c2bb5cf34"; - hash = "sha256-mMaJCF+xLIN3x+4PWspdJdKWDRbnSWSKH5v0jJ/fs50="; + rev = "067d66937c8eeb6651e349f400c1756c2ea90b2e"; + hash = "sha256-EJJZr193G6O8cTOkqfp1zbWfzp0NBWzAqReGHk0+BQo="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -728,12 +740,12 @@ }; fennel = buildGrammar { language = "fennel"; - version = "0.0.0+rev=cfbfa47"; + version = "0.0.0+rev=de06b9a"; src = fetchFromGitHub { owner = "alexmozaidze"; repo = "tree-sitter-fennel"; - rev = "cfbfa478dc2dbef267ee94ae4323d9c886f45e94"; - hash = "sha256-0LusII7BPGFQTyEkxZi6h9HUDF0eHvGwA4fiQE2h3YQ="; + rev = "de06b9ad366f0186080056109a8c3be980129538"; + hash = "sha256-DLwCJcF+zrBX/cZ8rYU97FpMgZlpVsfqLv1bFdwTj3c="; }; meta.homepage = "https://github.com/alexmozaidze/tree-sitter-fennel"; }; @@ -752,12 +764,12 @@ language = "firrtl"; version = "0.0.0+rev=8503d3a"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-firrtl"; rev = "8503d3a0fe0f9e427863cb0055699ff2d29ae5f5"; hash = "sha256-I2EMcm6bTMRODmxOOOiv+U0fhm6yoNhjCyuINfTUtlY="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-firrtl"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-firrtl"; }; fish = buildGrammar { language = "fish"; @@ -794,12 +806,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=64e1100"; + version = "0.0.0+rev=d738334"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "64e11001d7ef3e8ac18e55a3a2d811fe36430923"; - hash = "sha256-6l+cfLVbs8geKIYhnfuZDac8uzmNHOZf2rFANdl4tDs="; + rev = "d738334e4a21866a1ab81fb3f27f9b0b2ad2e515"; + hash = "sha256-NiGBc8o+WOegHm/2yl5EXAdjpKE+l9Lo5bUvOkCWXqo="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -816,12 +828,12 @@ }; fsharp = buildGrammar { language = "fsharp"; - version = "0.0.0+rev=02929f0"; + version = "0.0.0+rev=f296051"; src = fetchFromGitHub { owner = "ionide"; repo = "tree-sitter-fsharp"; - rev = "02929f084726db969e5b916d144436f248146824"; - hash = "sha256-64MF/777+pY+wcoyg4WMaKUlDRiz8VqwLO55TNotVbE="; + rev = "f29605148f24199cf4d9c4a203a5debc0cbcc648"; + hash = "sha256-xcejOUhJvECH9taGV0BR5TmTVluF6FSaO68Lg9wlTEc="; }; location = "fsharp"; meta.homepage = "https://github.com/ionide/tree-sitter-fsharp"; @@ -830,12 +842,12 @@ language = "func"; version = "0.0.0+rev=f780ca5"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-func"; rev = "f780ca55e65e7d7360d0229331763e16c452fc98"; hash = "sha256-jM0VJZlfhenAZbhabpgsoRIGny3WSDoimZtwogcvaSI="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-func"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-func"; }; fusion = buildGrammar { language = "fusion"; @@ -846,16 +858,16 @@ rev = "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"; hash = "sha256-195q39pZYipT0G08kQlwnDE28ODjAz2/Sq1tzpEGFmU="; }; - meta.homepage = "https://gitlab.com/jirgn/tree-sitter-fusion.git"; + meta.homepage = "https://gitlab.com/jirgn/tree-sitter-fusion"; }; gap = buildGrammar { language = "gap"; - version = "0.0.0+rev=7db7959"; + version = "0.0.0+rev=8dee53c"; src = fetchFromGitHub { owner = "gap-system"; repo = "tree-sitter-gap"; - rev = "7db79590d2f8b0e0246008ecfd569b4bfca587a9"; - hash = "sha256-M/nk1XM9vZe0XoFr6EttWCY4fjzw2r5I/XImJNjUwGk="; + rev = "8dee53cfb962600dd35ca25432f005e7920e89f2"; + hash = "sha256-rSWdxQL0y3ZboEi7SWO4Mbe7ix3epznTOkL+SDXXG9g="; }; meta.homepage = "https://github.com/gap-system/tree-sitter-gap"; }; @@ -894,12 +906,12 @@ }; git_config = buildGrammar { language = "git_config"; - version = "0.0.0+rev=9c2a1b7"; + version = "0.0.0+rev=0fbc9f9"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-config"; - rev = "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"; - hash = "sha256-O0w0BhhPPwhnKfniAFSPMWfBsZUTrijifAsmFiAncWg="; + rev = "0fbc9f99d5a28865f9de8427fb0672d66f9d83a5"; + hash = "sha256-u1NrtCap+CvhSW4q7xrwiUPGuCspjk9sHKkXQcEXc2E="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-config"; }; @@ -918,12 +930,12 @@ language = "gitattributes"; version = "0.0.0+rev=5425944"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-gitattributes"; rev = "5425944fd61bf2b3bad2c17c2dc9f53172b0f01d"; hash = "sha256-X6M9/41xISnkDnXNgQAWexs68h8A0dwOz+aQa86H0pc="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gitattributes"; }; gitcommit = buildGrammar { language = "gitcommit"; @@ -949,12 +961,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=99ec410"; + version = "0.0.0+rev=6ece453"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "99ec4101504452c488b7c835fb65cfef75b090b7"; - hash = "sha256-FEecjw1nYYO8U+qLjOK28qTMCO1pJkwdUDzlDvmle4c="; + rev = "6ece453acf8b14568c10f629f8cd25d3dde3794f"; + hash = "sha256-n3163Rk4Xrrw2NsZNi2u1AakyjkJYZnCAL8GK1lAxAE="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -971,23 +983,23 @@ }; glimmer_javascript = buildGrammar { language = "glimmer_javascript"; - version = "0.0.0+rev=babba3f"; + version = "0.0.0+rev=5cc865a"; src = fetchFromGitHub { owner = "NullVoxPopuli"; repo = "tree-sitter-glimmer-javascript"; - rev = "babba3fc0c822a633261ce9e96a4d7986050eb0c"; - hash = "sha256-dz0vDnOrC41URJs7OqgwaKu7MLe6dffTB66Izv25Asw="; + rev = "5cc865a2a0a77cbfaf5062c8fcf2a9919bd54f87"; + hash = "sha256-4MSBaGdX5lvhvz2LyQb+NuQY9Vc5CFL0C6S3sO3Tz2U="; }; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript"; }; glimmer_typescript = buildGrammar { language = "glimmer_typescript"; - version = "0.0.0+rev=48c6029"; + version = "0.0.0+rev=12d9894"; src = fetchFromGitHub { owner = "NullVoxPopuli"; repo = "tree-sitter-glimmer-typescript"; - rev = "48c60295f1ee34ea4ed6e5177102be6d24bfc9d0"; - hash = "sha256-lW0R/PMCeM5kuNJE9pyj/Gksi90jHyJ6/D49FTqMCSI="; + rev = "12d98944c1d5077b957cbdb90d663a7c4d50118c"; + hash = "sha256-3cJI6vcbU62kUIhphprNeAl9RyY9TThrzVeArdLfxnI="; }; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript"; }; @@ -995,23 +1007,23 @@ language = "glsl"; version = "0.0.0+rev=24a6c8e"; src = fetchFromGitHub { - owner = "theHamsta"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-glsl"; rev = "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4"; hash = "sha256-TjF79WH3bX4nueYr8CbPptkNb2lNkHQNB0VZoMB35Nk="; }; - meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-glsl"; }; gn = buildGrammar { language = "gn"; version = "0.0.0+rev=bc06955"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-gn"; rev = "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"; hash = "sha256-Sn6He4YRrKJe4QvGiaauquYBVQol0lWeIuOwkdUEzkQ="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-gn"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gn"; }; gnuplot = buildGrammar { language = "gnuplot"; @@ -1048,12 +1060,12 @@ }; godot_resource = buildGrammar { language = "godot_resource"; - version = "0.0.0+rev=91c55fd"; + version = "0.0.0+rev=a1a7295"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-godot-resource"; - rev = "91c55fdf325a832659e59cdf4a02bfe8a423f14c"; - hash = "sha256-Hmpc8JsbgCo/iuIxn9E3XL1kJPi8wADlSvH3inlacFc="; + rev = "a1a7295b376fbd2531601f4ffff191b031ffc795"; + hash = "sha256-+tUMLqtak9ToY+UUnIiqngDs6diG8crW8Ac0mbk7FMo="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-godot-resource"; }; @@ -1072,12 +1084,12 @@ language = "gosum"; version = "0.0.0+rev=e2ac513"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-go-sum"; rev = "e2ac513b2240c7ff1069ae33b2df29ce90777c11"; hash = "sha256-2foA2sd5PQpmeX8OhXrW/dxoJaEyxDXzPWh+UD0dgzQ="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-go-sum"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-go-sum"; }; gotmpl = buildGrammar { language = "gotmpl"; @@ -1105,12 +1117,12 @@ language = "gpg"; version = "0.0.0+rev=63e80cf"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-gpg-config"; rev = "63e80cfe1302da9f9c7ee8d9df295f47d7d181bf"; hash = "sha256-W8BglyjX/OytZCACpVi9V/k7A0Q4JaVQV+9NcyqtFsc="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gpg-config"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gpg-config"; }; graphql = buildGrammar { language = "graphql"; @@ -1125,12 +1137,12 @@ }; gren = buildGrammar { language = "gren"; - version = "0.0.0+rev=06389ec"; + version = "0.0.0+rev=c36aac5"; src = fetchFromGitHub { owner = "MaeBrooks"; repo = "tree-sitter-gren"; - rev = "06389ece5bc7344ed3931dc516bb609d8864dd2a"; - hash = "sha256-wh32+efWujW37jpNZbaVJGRKeMIa5NvRAezhG3WhUm4="; + rev = "c36aac51a915fdfcaf178128ba1e9c2205b25930"; + hash = "sha256-XtLP2ncpwAiubHug6k4sJCYRZo5f+Nu02tho/4tVD/k="; }; meta.homepage = "https://github.com/MaeBrooks/tree-sitter-gren"; }; @@ -1149,12 +1161,12 @@ language = "gstlaunch"; version = "0.0.0+rev=549aef2"; src = fetchFromGitHub { - owner = "theHamsta"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-gstlaunch"; rev = "549aef253fd38a53995cda1bf55c501174372bf7"; hash = "sha256-zNUx/9dxEqyqTXCxEiNnYPzplnR7l9b2L4frYpPOA9M="; }; - meta.homepage = "https://github.com/theHamsta/tree-sitter-gstlaunch"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch"; }; hack = buildGrammar { language = "hack"; @@ -1171,12 +1183,12 @@ language = "hare"; version = "0.0.0+rev=4af5d82"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-hare"; rev = "4af5d82cf9ec39f67cb1db5b7a9269d337406592"; hash = "sha256-QEnE5IQJ60PXb6QjgEE5L4p7Fjy0p+N+dyDTMh3YsRg="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-hare"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hare"; }; haskell = buildGrammar { language = "haskell"; @@ -1202,14 +1214,14 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0.0.0+rev=de10d49"; + version = "0.0.0+rev=009def4"; src = fetchFromGitHub { - owner = "MichaHoffmann"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-hcl"; - rev = "de10d494dbd6b71cdf07a678fecbf404dbfe4398"; - hash = "sha256-oRNNxE5AnI0TyJl92pk0E9xGj5xom/+0kpPMUE/O/TY="; + rev = "009def4ae38ec30e5b40beeae26efe93484ab286"; + hash = "sha256-3tM4cggewH2uorO8sgM0E/YFt1//zxBKHAqZVNmZVQU="; }; - meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hcl"; }; heex = buildGrammar { language = "heex"; @@ -1249,12 +1261,12 @@ language = "hlsl"; version = "0.0.0+rev=bab9111"; src = fetchFromGitHub { - owner = "theHamsta"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-hlsl"; rev = "bab9111922d53d43668fabb61869bec51bbcb915"; hash = "sha256-BWjgXtMN6y/0ahD44Cm8a+MxxVMpCNhkf33V/vsCBTU="; }; - meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hlsl"; }; hlsplaylist = buildGrammar { language = "hlsplaylist"; @@ -1302,23 +1314,23 @@ }; htmldjango = buildGrammar { language = "htmldjango"; - version = "0.0.0+rev=ea71012"; + version = "0.0.0+rev=3a64316"; src = fetchFromGitHub { owner = "interdependence"; repo = "tree-sitter-htmldjango"; - rev = "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"; - hash = "sha256-z4PqUbUXOtqOyPYl2h+bWA0maZJqZd5aZB75og+Ye6A="; + rev = "3a643167ad9afac5d61e092f08ff5b054576fadf"; + hash = "sha256-sQV7olTaQ68wixzvKV44myVvDUXXjBZh9N3jvDFUSvE="; }; meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=77ecf63"; + version = "0.0.0+rev=db8b439"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "77ecf6385f1b5d422e0bbd12204374d287d61ad2"; - hash = "sha256-/TzmtXnD6XpPzVB2juGsNgQ8t2k6mLZoUjUwqb76HAU="; + rev = "db8b4398de90b6d0b6c780aba96aaa2cd8e9202c"; + hash = "sha256-T/O4oxPEIg3nLi3CxCwGW+iXC18fWW2xgsY5nrptk/M="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; @@ -1335,14 +1347,14 @@ }; hyprlang = buildGrammar { language = "hyprlang"; - version = "0.0.0+rev=d719158"; + version = "0.0.0+rev=d0441fd"; src = fetchFromGitHub { - owner = "luckasRanarison"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-hyprlang"; - rev = "d719158abe537b1916daaea6fa03287089f0b601"; - hash = "sha256-5iflQ4FDEvVRuaytPl08Q9CYXm2dfZ49qJyvcsOrzuI="; + rev = "d0441fd4b883ecc0e70140723a1cf5907992639a"; + hash = "sha256-pNAN5TF01Bnqfcsoa0IllchCCBph9/SowzIoMyQcN5w="; }; - meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang"; }; idl = buildGrammar { language = "idl"; @@ -1403,12 +1415,12 @@ language = "ispc"; version = "0.0.0+rev=9b2f9ae"; src = fetchFromGitHub { - owner = "fab4100"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-ispc"; rev = "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"; hash = "sha256-vxe+g7o0gXgB4GjhjkxqLqcLL2+8wqMB3tm1xQFSitI="; }; - meta.homepage = "https://github.com/fab4100/tree-sitter-ispc"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ispc"; }; janet_simple = buildGrammar { language = "janet_simple"; @@ -1434,12 +1446,12 @@ }; javadoc = buildGrammar { language = "javadoc"; - version = "0.0.0+rev=db9589e"; + version = "0.0.0+rev=001a8e4"; src = fetchFromGitHub { owner = "rmuir"; repo = "tree-sitter-javadoc"; - rev = "db9589e9c61cff7d7fcc207744c711b10b60a7a3"; - hash = "sha256-yW2gtK7rG0bmyJL6emp4YyfKO0UEgOHLFbjAP+rmQZg="; + rev = "001a8e4f8e839b640201c49046fbf5957fe1ee2c"; + hash = "sha256-8jNosU9jcQ5ffA1asoa6eFBdX/jE+sZPqOj3hufDl+g="; }; meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc"; }; @@ -1456,36 +1468,36 @@ }; jinja = buildGrammar { language = "jinja"; - version = "0.0.0+rev=9af6ce9"; + version = "0.0.0+rev=258d7fb"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-jinja"; - rev = "9af6ce9380fabd3d5b19d0254b8c8936e879c471"; - hash = "sha256-9powNKoE5JpB+5vVtZLE5falMiS6I/ZXp4NrqabiWLs="; + rev = "258d7fb22fa6cd2dc800f201cfdcbe05111a836c"; + hash = "sha256-pf9jYK/Rj/axmQ9GVrMLjcfL6xtv3rDPr+hjTwfOWxU="; }; location = "tree-sitter-jinja"; meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja"; }; jinja_inline = buildGrammar { language = "jinja_inline"; - version = "0.0.0+rev=9af6ce9"; + version = "0.0.0+rev=258d7fb"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-jinja"; - rev = "9af6ce9380fabd3d5b19d0254b8c8936e879c471"; - hash = "sha256-9powNKoE5JpB+5vVtZLE5falMiS6I/ZXp4NrqabiWLs="; + rev = "258d7fb22fa6cd2dc800f201cfdcbe05111a836c"; + hash = "sha256-pf9jYK/Rj/axmQ9GVrMLjcfL6xtv3rDPr+hjTwfOWxU="; }; location = "tree-sitter-jinja_inline"; meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja"; }; jq = buildGrammar { language = "jq"; - version = "0.0.0+rev=13990f5"; + version = "0.0.0+rev=c204e36"; src = fetchFromGitHub { owner = "flurie"; repo = "tree-sitter-jq"; - rev = "13990f530e8e6709b7978503da9bc8701d366791"; - hash = "sha256-pek2Vg1osMYAdx6DfVdZhuIDb26op3i2cfvMrf5v3xY="; + rev = "c204e36d2c3c6fce1f57950b12cabcc24e5cc4d9"; + hash = "sha256-WEsiDsZEFTGC3s0awYE8rN/fsRML7CePKOXUbL+Fujc="; }; meta.homepage = "https://github.com/flurie/tree-sitter-jq"; }; @@ -1531,7 +1543,7 @@ rev = "02b01653c8a1c198ae7287d566efa86a135b30d5"; hash = "sha256-iWc2ePRiQnZ0FEdMAaAwa3iYt/SY0bEjQrZyqE9EhlU="; }; - meta.homepage = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git"; + meta.homepage = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc"; }; jsonnet = buildGrammar { language = "jsonnet"; @@ -1581,43 +1593,43 @@ language = "kconfig"; version = "0.0.0+rev=9ac99fe"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-kconfig"; rev = "9ac99fe4c0c27a35dc6f757cef534c646e944881"; hash = "sha256-8gZZLGL7giVHQIirjUIfsx3scP1L1VTFIZX7QOyjWvk="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-kconfig"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-kconfig"; }; kdl = buildGrammar { language = "kdl"; version = "0.0.0+rev=b37e3d5"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-kdl"; rev = "b37e3d58e5c5cf8d739b315d6114e02d42e66664"; hash = "sha256-irx8aMEdZG2WcQVE2c7ahwLjqEoUAOOjvhDDk69a6lE="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-kdl"; }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=c4ddea3"; + version = "0.0.0+rev=57fb456"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "c4ddea359a7ff4d92360b2efcd6cfce5dc25afe6"; - hash = "sha256-7REd272fpCP/ggzg7wLf5DS6QX9SIO9YGPdvj2c2w58="; + rev = "57fb4560ba8641865bc0baa6b3f413b236112c4c"; + hash = "sha256-CA4bfWE3YkvC4v21EXdjJ2SD7mIWJbuGpnyvRwFgm8M="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; koto = buildGrammar { language = "koto"; - version = "0.0.0+rev=46770ab"; + version = "0.0.0+rev=1e61074"; src = fetchFromGitHub { owner = "koto-lang"; repo = "tree-sitter-koto"; - rev = "46770abba021e2ddd2c51d9fa3087fd1ab6b2aea"; - hash = "sha256-BMBwkWVvW4qBX6DqM29Ne17K116yUiH2njdKkzeXmTY="; + rev = "1e610746f48c24607733fac158d5bae79accd845"; + hash = "sha256-+Qzj4jliz4KyitBln6YyQyxpNrngnZo6KICqdvmIAsk="; }; meta.homepage = "https://github.com/koto-lang/tree-sitter-koto"; }; @@ -1645,24 +1657,24 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=7b06f6e"; + version = "0.0.0+rev=f736d24"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "7b06f6ed394308e7407a1703d2724128c45fc9d7"; - hash = "sha256-HbRjblLBExpBkBBjHyEHfnK0oootjAsqkwjmGH3/UYI="; + rev = "f736d24d89acbd90092d92089e5171e6a449db40"; + hash = "sha256-R2HYfoLL4vEeSRbp3APVw6YsEYSppu7k3g0aN3+ld2Q="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; ledger = buildGrammar { language = "ledger"; - version = "0.0.0+rev=d313153"; + version = "0.0.0+rev=96c92d4"; src = fetchFromGitHub { owner = "cbarrete"; repo = "tree-sitter-ledger"; - rev = "d313153eef68c557ba4538b20de2d0e92f3ef6f8"; - hash = "sha256-/dE3Uqi5zuTWtbjPAm9j7+z6RnTKJeXdS5na+XoGCE0="; + rev = "96c92d4908a836bf8f661166721c98439f8afb80"; + hash = "sha256-L2xUTItnQ/bcieasItrozjAEJLm/fsUUyMex2juCnjw="; }; meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger"; }; @@ -1681,12 +1693,12 @@ language = "linkerscript"; version = "0.0.0+rev=f99011a"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-linkerscript"; rev = "f99011a3554213b654985a4b0a65b3b032ec4621"; hash = "sha256-Do8MIcl5DJo00V4wqIbdVC0to+2YYwfy08QWqSLMkQA="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-linkerscript"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-linkerscript"; }; liquid = buildGrammar { language = "liquid"; @@ -1712,58 +1724,58 @@ }; llvm = buildGrammar { language = "llvm"; - version = "0.0.0+rev=c14cb83"; + version = "0.0.0+rev=1ac8311"; src = fetchFromGitHub { owner = "benwilliamgraham"; repo = "tree-sitter-llvm"; - rev = "c14cb839003348692158b845db9edda201374548"; - hash = "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo="; + rev = "1ac83114e71839fa67f4cce2f864ebbbdf6e2a4f"; + hash = "sha256-2U7T81rVGXWZDBXUR0BEQU0biggqyFrjL4jWccDDWQM="; }; meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm"; }; lua = buildGrammar { language = "lua"; - version = "0.0.0+rev=db16e76"; + version = "0.0.0+rev=e5e4069"; src = fetchFromGitHub { - owner = "MunifTanjim"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-lua"; - rev = "db16e76558122e834ee214c8dc755b4a3edc82a9"; - hash = "sha256-uJdXqlDn8F8mjh/NukpkQA6jdd7YjYOBbugzIrBb6GA="; + rev = "e5e406935ff3e36529545955e2972646ed97f9e2"; + hash = "sha256-anUyN+H9y1VrWGKr6yG4OFY9PGGH3Fsgn5AJZTxYkbQ="; }; - meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-lua"; }; luadoc = buildGrammar { language = "luadoc"; version = "0.0.0+rev=873612a"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-luadoc"; rev = "873612aadd3f684dd4e631bdf42ea8990c57634e"; hash = "sha256-ttGBB9sn+xd9jWzjNAzpo/lwYVYZGSUGEip4K3PfBP0="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-luadoc"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-luadoc"; }; luap = buildGrammar { language = "luap"; version = "0.0.0+rev=c134aae"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-luap"; rev = "c134aaec6acf4fa95fe4aa0dc9aba3eacdbbe55a"; hash = "sha256-4mMUHBsdK4U4uhh8GpKlG3p/s3ZCcLX1qATPyTD4Xhg="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-luap"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-luap"; }; luau = buildGrammar { language = "luau"; version = "0.0.0+rev=a8914d6"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-luau"; rev = "a8914d6c1fc5131f8e1c13f769fa704c9f5eb02f"; hash = "sha256-5qbZA2mxTvrsfUrpgD+4y3oeJsifA91c/hfcVwQBRgI="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-luau"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-luau"; }; m68k = buildGrammar { language = "m68k"; @@ -1789,36 +1801,36 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=4132852"; + version = "0.0.0+rev=efb075c"; src = fetchFromGitHub { - owner = "MDeiml"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-markdown"; - rev = "413285231ce8fa8b11e7074bbe265b48aa7277f9"; - hash = "sha256-Oe2iL5b1Cyv+dK0nQYFNLCCOCe+93nojxt6ukH2lEmU="; + rev = "efb075cbd57ce33f694c2bb264b99cdba0f31789"; + hash = "sha256-Vz5bzIvJ0ZojK61RbU+uV59c5cyLA4M1Vw7H6O8JFrE="; }; location = "tree-sitter-markdown"; - meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=4132852"; + version = "0.0.0+rev=efb075c"; src = fetchFromGitHub { - owner = "MDeiml"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-markdown"; - rev = "413285231ce8fa8b11e7074bbe265b48aa7277f9"; - hash = "sha256-Oe2iL5b1Cyv+dK0nQYFNLCCOCe+93nojxt6ukH2lEmU="; + rev = "efb075cbd57ce33f694c2bb264b99cdba0f31789"; + hash = "sha256-Vz5bzIvJ0ZojK61RbU+uV59c5cyLA4M1Vw7H6O8JFrE="; }; location = "tree-sitter-markdown-inline"; - meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown"; }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=bbf1b3f"; + version = "0.0.0+rev=88ccb5e"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "bbf1b3f0bd7417c1efb8958fe95be3d0d540207a"; - hash = "sha256-dFsHOqleUTJCzidlKv/5kpawYhbn0jmOIpPrpJQJj80="; + rev = "88ccb5ee90711e9961582d421c42bc8c6bd53f59"; + hash = "sha256-iiELNwO4m0lr2Bcowu5zj0VdA2Eg2i5N58MwC7HiGbs="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1846,23 +1858,23 @@ }; meson = buildGrammar { language = "meson"; - version = "0.0.0+rev=a56af66"; + version = "0.0.0+rev=b1ff003"; src = fetchFromGitHub { - owner = "Decodetalkers"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-meson"; - rev = "a56af662e8540412fed5e40cc20435b2b9a20502"; - hash = "sha256-RT/CXsbo+TZeG+6m9kwSoS5RImchTe5P/7tRlgTnPJo="; + rev = "b1ff0037b665e7e84715390820d6ecbe763a9c79"; + hash = "sha256-wO8N5RBZMQ5Bwq8JPHiYldjwOw0qKRv3WfSX5p5Vhpo="; }; - meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-meson"; }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=922cbb9"; + version = "0.0.0+rev=3b2ae4c"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "922cbb97f3d20044e6b4362b3d7af5e530ed8f34"; - hash = "sha256-b36hctcSJoWSCZmuQNoNqZWJ3w28ejyEfmFqdmiwuLc="; + rev = "3b2ae4ce9a8abca997ed3b34625d462248d1bbac"; + hash = "sha256-js25s2JqvhQgbHzFJquBYv1+WRDgUCNby/PMn5CzwBA="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -1902,12 +1914,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=25464b3"; + version = "0.0.0+rev=f77c02d"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "25464b33522c3f609fa512aa9651707c0b66d48b"; - hash = "sha256-dQeUoHQHkPYywYIm3TMnTWPXUlh2xh8M5CVUiXASBu8="; + rev = "f77c02df6dd0845594846beeeedf3715d4b68758"; + hash = "sha256-6Rgxfd1ZVyYvAcgGhiV7/m+aWBGuZf9FzHKsi+2rxn8="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -1955,36 +1967,25 @@ }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; - norg = buildGrammar { - language = "norg"; - version = "0.0.0+rev=d89d95a"; - src = fetchFromGitHub { - owner = "nvim-neorg"; - repo = "tree-sitter-norg"; - rev = "d89d95af13d409f30a6c7676387bde311ec4a2c8"; - hash = "sha256-z3h5qMuNKnpQgV62xZ02F5vWEq4VEnm5lxwEnIFu+Rw="; - }; - meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; - }; nqc = buildGrammar { language = "nqc"; version = "0.0.0+rev=14e6da1"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-nqc"; rev = "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"; hash = "sha256-Gf6410cWLENCgI1uIBVBl4RnRuVCHkWkn6sxusmI6j4="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-nqc"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-nqc"; }; nu = buildGrammar { language = "nu"; - version = "0.0.0+rev=c10340b"; + version = "0.0.0+rev=d5c71a1"; src = fetchFromGitHub { owner = "nushell"; repo = "tree-sitter-nu"; - rev = "c10340b5bb3789f69182acf8f34c3d4fc24d2fe1"; - hash = "sha256-EyaFrO9NE2Ivo8YTXZ6nmC31PB7WFbFdz7AMRw0ooHo="; + rev = "d5c71a10b4d1b02e38967b05f8de70e847448dd1"; + hash = "sha256-7Ny3wXa5iE6s7szqTkPqaXWL/NL5yA2MbhdQHylxwE0="; }; meta.homepage = "https://github.com/nushell/tree-sitter-nu"; }; @@ -1992,12 +1993,12 @@ language = "objc"; version = "0.0.0+rev=181a81b"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-objc"; rev = "181a81b8f23a2d593e7ab4259981f50122909fda"; hash = "sha256-7W8ozhQJL+f+tQYz61EZexk9NkMu1pCAP5IIy1m3qak="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-objc"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-objc"; }; objdump = buildGrammar { language = "objdump"; @@ -2012,36 +2013,36 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=91708de"; + version = "0.0.0+rev=ef6ed4a"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "91708deb10cb4fe68ab3c50891426b9967dbf35a"; - hash = "sha256-HFFvg+4HrUJ12/rbXwCvYthx+yXqxa3OlY3j8/GnYFk="; + rev = "ef6ed4a773a260545f0b03c43d2ca78235e9a488"; + hash = "sha256-mSp6ib5FWSB8iA3HmOEk6CAh0/sPw0a13lcFQNzTSLA="; }; location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=91708de"; + version = "0.0.0+rev=ef6ed4a"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "91708deb10cb4fe68ab3c50891426b9967dbf35a"; - hash = "sha256-HFFvg+4HrUJ12/rbXwCvYthx+yXqxa3OlY3j8/GnYFk="; + rev = "ef6ed4a773a260545f0b03c43d2ca78235e9a488"; + hash = "sha256-mSp6ib5FWSB8iA3HmOEk6CAh0/sPw0a13lcFQNzTSLA="; }; location = "grammars/interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocamllex = buildGrammar { language = "ocamllex"; - version = "0.0.0+rev=5da5bb7"; + version = "0.0.0+rev=ed488aa"; src = fetchFromGitHub { owner = "atom-ocaml"; repo = "tree-sitter-ocamllex"; - rev = "5da5bb7508ac9fd3317561670ef18c126a0fe2aa"; - hash = "sha256-qfmIfcZ3zktYzuNNYP7Z6u6c7XoKsKD86MRMxe/qkpY="; + rev = "ed488aa334d1b4e3235e1efaaf96f00815ebc0e0"; + hash = "sha256-7pmBKXbWnkIcEKsZAr1Wd9NG7cXCVCavBt8p0Xf5s2c="; }; generate = true; meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex"; @@ -2050,21 +2051,21 @@ language = "odin"; version = "0.0.0+rev=d2ca8ef"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-odin"; rev = "d2ca8efb4487e156a60d5bd6db2598b872629403"; hash = "sha256-aPeaGERAP1Fav2QAjZy1zXciCuUTQYrsqXaSQsYG0oU="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-odin"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-odin"; }; pascal = buildGrammar { language = "pascal"; - version = "0.0.0+rev=78426d9"; + version = "0.0.0+rev=5054931"; src = fetchFromGitHub { owner = "Isopod"; repo = "tree-sitter-pascal"; - rev = "78426d96bde7114af979e314283e45d087603428"; - hash = "sha256-KNVrXS7sYMXqZ5+sMnmp87vHr8NYrY+BTVVIdV2wnm0="; + rev = "5054931bcd022860dd5936864f981e359fb63aef"; + hash = "sha256-+5HzlNL54/Wdr7b1vRwZzIU3Z8vqFP9FzmEO1qwxJrk="; }; meta.homepage = "https://github.com/Isopod/tree-sitter-pascal"; }; @@ -2083,12 +2084,12 @@ language = "pem"; version = "0.0.0+rev=1d16b8e"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-pem"; rev = "1d16b8e063fdf4385e389096c4bc4999eaaef05f"; hash = "sha256-NhiSqaLjzEJHj8JimFdcZBVAR00lKf9O5JLtwIUCKhw="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pem"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pem"; }; perl = buildGrammar { language = "perl"; @@ -2103,36 +2104,36 @@ }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=f7cf734"; + version = "0.0.0+rev=eb289f1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "f7cf7348737d8cff1b13407a0bfedce02ee7b046"; - hash = "sha256-UWYKrC0mpWO86V52Phj/gYCdH586ZNdev/zhvUn4EBc="; + rev = "eb289f127fc341ae7129902a2dd1c6c197a4c1e7"; + hash = "sha256-RtUzTFt23b/qA0NHjR/T4L5+JzTUoyBKf7U2zsQPwXs="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=f7cf734"; + version = "0.0.0+rev=eb289f1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "f7cf7348737d8cff1b13407a0bfedce02ee7b046"; - hash = "sha256-UWYKrC0mpWO86V52Phj/gYCdH586ZNdev/zhvUn4EBc="; + rev = "eb289f127fc341ae7129902a2dd1c6c197a4c1e7"; + hash = "sha256-RtUzTFt23b/qA0NHjR/T4L5+JzTUoyBKf7U2zsQPwXs="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; phpdoc = buildGrammar { language = "phpdoc"; - version = "0.0.0+rev=fe3202e"; + version = "0.0.0+rev=03bb103"; src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; - rev = "fe3202e468bc17332bec8969f2b50ff1f1da3a46"; - hash = "sha256-sQ8jmVvZD0fIc9qlfyl6MaXvP/2ljzViKIl9RgVOJqw="; + rev = "03bb10330704b0b371b044e937d5cc7cd40b4999"; + hash = "sha256-EwDrC12hMwlyCff867bmVt7RVZNa8jkDMKkytB7qNLc="; }; meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc"; }; @@ -2151,12 +2152,12 @@ language = "po"; version = "0.0.0+rev=bd860a0"; src = fetchFromGitHub { - owner = "erasin"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-po"; rev = "bd860a0f57f697162bf28e576674be9c1500db5e"; hash = "sha256-/St0VxDTAF872ZlBph1TukRoO0PBIOMT0D11DZ6nSLQ="; }; - meta.homepage = "https://github.com/erasin/tree-sitter-po"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-po"; }; pod = buildGrammar { language = "pod"; @@ -2173,23 +2174,23 @@ language = "poe_filter"; version = "0.0.0+rev=2902dc4"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-poe-filter"; rev = "2902dc45439125b9386812c1089a8e9b5f71c4ab"; hash = "sha256-j/634pLyfgF7Pyjmh4ETuW0U38kH6Seik1w4pJKBmec="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-poe-filter"; }; pony = buildGrammar { language = "pony"; version = "0.0.0+rev=73ff874"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-pony"; rev = "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"; hash = "sha256-/9bTbep2AXLoiijeft9amMeFQ6fHXzItjH+bD/w6pDo="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-pony"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pony"; }; powershell = buildGrammar { language = "powershell"; @@ -2206,12 +2207,12 @@ language = "printf"; version = "0.0.0+rev=df6b699"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-printf"; rev = "df6b69967db7d74ab338a86a9ab45c0966c5ee3c"; hash = "sha256-54yEvxL6u+Mya4INj1AIb1ldYv1WdQV55z8+wgKdthc="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-printf"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-printf"; }; prisma = buildGrammar { language = "prisma"; @@ -2296,13 +2297,13 @@ language = "psv"; version = "0.0.0+rev=7eb7297"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-csv"; rev = "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"; hash = "sha256-5VL7uREH0lloAWo9rdJXsjDsWxgL6fngWJSmi4fM7UQ="; }; location = "psv"; - meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv"; }; pug = buildGrammar { language = "pug"; @@ -2319,21 +2320,21 @@ language = "puppet"; version = "0.0.0+rev=15f1929"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-puppet"; rev = "15f192929b7d317f5914de2b4accd37b349182a6"; hash = "sha256-bO5g5AdhzpB13yHklpAndUHIX7Rvd7OMjH0Ds2ATA6Q="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-puppet"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-puppet"; }; purescript = buildGrammar { language = "purescript"; - version = "0.0.0+rev=daf9b3e"; + version = "0.0.0+rev=4cacfda"; src = fetchFromGitHub { owner = "postsolar"; repo = "tree-sitter-purescript"; - rev = "daf9b3e2be18b0b2996a1281f7783e0d041d8b80"; - hash = "sha256-eY2WF2n0fZUl1zxZZHJVYR8b1FwaAjkCeSeOdSf67m4="; + rev = "4cacfdaa75090bb790965674fe387bb215bab64b"; + hash = "sha256-UPK3PkBLO5c5AokvFfICwBjy1cPUOVx/pwDNuZTW8FA="; }; meta.homepage = "https://github.com/postsolar/tree-sitter-purescript"; }; @@ -2341,12 +2342,12 @@ language = "pymanifest"; version = "0.0.0+rev=be06258"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-pymanifest"; rev = "be062582956165019d3253794b4d712f66dfeaaa"; hash = "sha256-Kud/E67Sh9F4nc8nzW5UXFHW5+kGftLyFzwLOKLcpL8="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pymanifest"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pymanifest"; }; python = buildGrammar { language = "python"; @@ -2374,34 +2375,34 @@ language = "qmldir"; version = "0.0.0+rev=6b2b5e4"; src = fetchFromGitHub { - owner = "Decodetalkers"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-qmldir"; rev = "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"; hash = "sha256-7ic9Xd+1G0JM25bY0f8N5r6YZx5NV5HrJXXHp6pXvo4="; }; - meta.homepage = "https://github.com/Decodetalkers/tree-sitter-qmldir"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-qmldir"; }; qmljs = buildGrammar { language = "qmljs"; - version = "0.0.0+rev=8fef30e"; + version = "0.0.0+rev=0889da4"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "8fef30e231d74b65c713bcbac21956156d8963da"; - hash = "sha256-4OIXOePSu1Pc2BJuXoNNVZnKvjTjOQ6ixqE8NU7tLqg="; + rev = "0889da4632bba3ec6f39ef4102625654890c15c1"; + hash = "sha256-Twj2taG7xFTPXTvzDcWeIqxUAkuhsybwZvtwK/HiruE="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=930202c"; + version = "0.0.0+rev=8bf3112"; src = fetchFromGitHub { - owner = "nvim-treesitter"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-query"; - rev = "930202c2a80965a7a9ca018b5b2a08b25dfa7f12"; - hash = "sha256-uXApakOZy9Gd/fl9C9qFZgptlT6rUlOmT6KW8sWP5Ag="; + rev = "8bf3112db43bdba3002bb1f88b7cda5f6278fc88"; + hash = "sha256-3HnLSe47TQzQwy/ZLO87b6S+fi0CKytsoRkUncy8/+k="; }; - meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-query"; }; r = buildGrammar { language = "r"; @@ -2416,12 +2417,12 @@ }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=5b211bf"; + version = "0.0.0+rev=6d63a20"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "5b211bf93021d1c45f39aa96898be9f794f087e4"; - hash = "sha256-ry9j5nEcXiSD+xJYzT0mY37hGeDlVRYq7egUeuw1PfU="; + rev = "6d63a202602eb350e726b5e7814127ba22ed25fc"; + hash = "sha256-S7LRg3c0zDpT8GlIbsyU/QgXO5aKoKzZ6ajNQwoLwXA="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -2438,12 +2439,12 @@ }; rasi = buildGrammar { language = "rasi"; - version = "0.0.0+rev=6c9bbcf"; + version = "0.0.0+rev=e735c68"; src = fetchFromGitHub { owner = "Fymyte"; repo = "tree-sitter-rasi"; - rev = "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"; - hash = "sha256-sPrIVgGGaBaXeqHNxjcdJ/S2FvxyV6rD9UPKU/tpspw="; + rev = "e735c6881d8b475aaa4ef8f0a2bdfd825b438143"; + hash = "sha256-MERNUroM1ndV6TtXYGg0AmXRtNlNWphVx32TzgMUnac="; }; meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi"; }; @@ -2473,23 +2474,23 @@ language = "re2c"; version = "0.0.0+rev=c18a3c2"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-re2c"; rev = "c18a3c2f4b6665e35b7e50d6048ea3cff770c572"; hash = "sha256-2htX4730fNAO2NKEurDOXH1OIXFd0OfuIbH1ou3a20A="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-re2c"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-re2c"; }; readline = buildGrammar { language = "readline"; version = "0.0.0+rev=74addc9"; src = fetchFromGitHub { - owner = "ribru17"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-readline"; rev = "74addc90fc539d31d413c0c7cf7581997a7fa46e"; hash = "sha256-cbQnAPtgMnA41CTI9OyY8WYvdlJOC9g0ZMbitNSvtmI="; }; - meta.homepage = "https://github.com/ribru17/tree-sitter-readline"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-readline"; }; regex = buildGrammar { language = "regex"; @@ -2517,21 +2518,21 @@ language = "requirements"; version = "0.0.0+rev=7289100"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-requirements"; rev = "728910099ddea7f1f94ea95a35a70d1ea76a1639"; hash = "sha256-IiIvU4iyqlP9px6qCivmQXusp/vuhOJBfWqMfcdKN7s="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-requirements"; }; rescript = buildGrammar { language = "rescript"; - version = "0.0.0+rev=4606cd8"; + version = "0.0.0+rev=d2df8a2"; src = fetchFromGitHub { owner = "rescript-lang"; repo = "tree-sitter-rescript"; - rev = "4606cd81c4c31d1d02390fee530858323410a74c"; - hash = "sha256-md3fgW+h99va2Rwxzub7nrsEe64fC52g6NPCaXGAaxg="; + rev = "d2df8a285fff95de56a91d2f8152aeceb66f40ef"; + hash = "sha256-yNZrihl4BNvLu0Zqr4lSqvdZCeXU3KnCY7ZYC1U42R0="; }; meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript"; }; @@ -2548,12 +2549,12 @@ }; robot = buildGrammar { language = "robot"; - version = "0.0.0+rev=17c2300"; + version = "0.0.0+rev=e34def7"; src = fetchFromGitHub { owner = "Hubro"; repo = "tree-sitter-robot"; - rev = "17c2300e91fc9da4ba14c16558bf4292941dc074"; - hash = "sha256-9f0xFmhEQnETvV2SAZW+jRtsVdl0ZT3CDmGkcd3Fn88="; + rev = "e34def7cb0d8a66a59ec5057fe17bb4e6b17b56a"; + hash = "sha256-fTV45TQp2Z+ivh2YWphlJjyuBh0iMCpaNDyKoHrNAh0="; }; meta.homepage = "https://github.com/Hubro/tree-sitter-robot"; }; @@ -2583,12 +2584,12 @@ language = "ron"; version = "0.0.0+rev=7893855"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-ron"; rev = "78938553b93075e638035f624973083451b29055"; hash = "sha256-Sp0g6AWKHNjyUmL5k3RIU+5KtfICfg3o/DH77XRRyI0="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-ron"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ron"; }; rst = buildGrammar { language = "rst"; @@ -2625,23 +2626,23 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=e86119b"; + version = "0.0.0+rev=3691201"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "e86119bdb4968b9799f6a014ca2401c178d54b5f"; - hash = "sha256-zJHUx5ZQVJ80hWWWh/PlO0jrOcCHDm9EPUTmZChab6g="; + rev = "3691201b01cacb2f96ffca4c632c4e938bfacd88"; + hash = "sha256-a9Te7SXVd7hkinrpvwrWgb6J53PoSL/Irk0DpQ6vS7k="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=160e355"; + version = "0.0.0+rev=c118995"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "160e35520577d91576b08fb677aaee840c591dc2"; - hash = "sha256-lcrS0FHFGnjT54ePM3BsHMdg5mbc65bsW4T0XpqC3XQ="; + rev = "c1189954df854977c3a52003ca8a247c5f4729ba"; + hash = "sha256-aomchVnOjYrgGA3hem/PEumkiUuIiJbb89hnz7uYAwI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2659,12 +2660,12 @@ }; scheme = buildGrammar { language = "scheme"; - version = "0.0.0+rev=63e25a4"; + version = "0.0.0+rev=1e4d38d"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "63e25a4a84142ae7ee0ee01fe3a32c985ca16745"; - hash = "sha256-FK3F7v2LqAtXZM/CKCijWfXTF6TUhLmiVXScZqt46Io="; + rev = "1e4d38d650bf6b53930ec9d41a7000775c134039"; + hash = "sha256-ZBMDnFp5dqVLng5AvdzzJxbF+jZctoAzFmkmvDW4sCA="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -2693,34 +2694,34 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=3ed23c0"; + version = "0.0.0+rev=327b1b8"; src = fetchFromGitHub { - owner = "theHamsta"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-slang"; - rev = "3ed23c04a412a0559162d9cadf96dfff7cb36079"; - hash = "sha256-X/QoG1Gl9zDzA3++FznypgeBuWElMaN4BFFuBKPXohk="; + rev = "327b1b821c255867a4fb724c8eee48887e3d014b"; + hash = "sha256-Oj3Z1Zw1geM2jid7xg0041cYtStV+CRl7anXbIIGE5c="; }; - meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-slang"; }; slim = buildGrammar { language = "slim"; - version = "0.0.0+rev=546e3aa"; + version = "0.0.0+rev=d8a79d1"; src = fetchFromGitHub { owner = "theoo"; repo = "tree-sitter-slim"; - rev = "546e3aa1af8a3b355c7734efccd9a759ffc0b43a"; - hash = "sha256-G9+9TdEDqIDt3HvXWxMrjKixtgey7qkFNNp9fWx7Uec="; + rev = "d8a79d15c7b9a68d2d1616c319d2b04d1999ab9f"; + hash = "sha256-jgED9DCpv3Kz24LvUbUmO1/G+O8hVQTY2K0qI6j+fRA="; }; meta.homepage = "https://github.com/theoo/tree-sitter-slim"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=f11da7e"; + version = "0.0.0+rev=3493309"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "f11da7e62051ba8b9d4faa299c26de8aeedfc1cd"; - hash = "sha256-NTxJwVYq3o+9+BbBi4Lcj++mB4hvKAN3N+dRadXuBNo="; + rev = "3493309534cd08ae176c7b917ec79068dca2c1c9"; + hash = "sha256-GM1h+7IcPXTxoRVjVIRWk+3xSWxS3nhPdGaehq2/1xE="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; @@ -2737,12 +2738,12 @@ }; smithy = buildGrammar { language = "smithy"; - version = "0.0.0+rev=fa898ac"; + version = "0.0.0+rev=ec4fe14"; src = fetchFromGitHub { owner = "indoorvivants"; repo = "tree-sitter-smithy"; - rev = "fa898ac0885d1da9a253695c3e0e91f5efc587cd"; - hash = "sha256-tB+q4RNru4Zi3jU9fBLKdzsXT0uP1PECLfeCCNTyaIo="; + rev = "ec4fe14586f2b0a1bc65d6db17f8d8acd8a90433"; + hash = "sha256-wEm4HSfeZOpn1OKw7ipLhoeNko8aPKDl2abupdQq+ok="; }; meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy"; }; @@ -2816,12 +2817,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=b9d1095"; + version = "0.0.0+rev=b1ec2aa"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "b9d109588d5b5ed986c857464830c2f0bef53f18"; - hash = "sha256-uEiwHIlLC6AyqD3/fH9KmXMdgQUb30MwBGrjPoyAPbc="; + rev = "b1ec2aa5091624e4729f0a771a6d631afebf1ed4"; + hash = "sha256-DSPmzoCO2jGkBeeKp2+pFlTPfrirnmMJEjRsabtDn/E="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2829,34 +2830,34 @@ language = "squirrel"; version = "0.0.0+rev=072c969"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-squirrel"; rev = "072c969749e66f000dba35a33c387650e203e96e"; hash = "sha256-tJBmxTD4hi9zxXMEuAX+uslo45zEawh09+tgv56s/AU="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-squirrel"; }; ssh_config = buildGrammar { language = "ssh_config"; version = "0.0.0+rev=0dd3c7e"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-ssh-config"; rev = "0dd3c7e9f301758f6c69a6efde43d3048deb4d8a"; hash = "sha256-jNB9cHOfHDIRPELm8LedJjNzjx16/ApcPGi8eaaJKZs="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ssh-config"; }; starlark = buildGrammar { language = "starlark"; version = "0.0.0+rev=a453dbf"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-starlark"; rev = "a453dbf3ba433db0e5ec621a38a7e59d72e4dc69"; hash = "sha256-iBchBq9NE4QqHc8MbWs4YgzUH6EB0W7RCIk07I6Zm+I="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-starlark"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-starlark"; }; strace = buildGrammar { language = "strace"; @@ -2893,12 +2894,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=28dcf0e"; + version = "0.0.0+rev=13f5a22"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "28dcf0edf98d491d47bacb65dc49b6fb979b444c"; - hash = "sha256-tKeYqRjysv/RVKdegWSMkcJv3y9xrP8lNEqLEoHw2DI="; + rev = "13f5a2221cb748bbe50ad702e89362afd5b925a7"; + hash = "sha256-kAQ1jxiVUhAVmIsyWAwqK2e0kJOsfN0h3m90VdRwiJ0="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -2938,12 +2939,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=aca5a52"; + version = "0.0.0+rev=99a5241"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "aca5a52aa3cab858944d3c02701ccf5b2d8fd0f9"; - hash = "sha256-F0Fijad6Yry71Xc5b92EiqgtEkvVqRM8WKRt6U07TxY="; + rev = "99a5241ceac351a4af57bcc3571cef5064bde0a3"; + hash = "sha256-JmOIzQ1xRTvttscPXjzDDWjFV0+4R1MusGlQCz11Ydo="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2972,90 +2973,90 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=e5a12f7"; + version = "0.0.0+rev=61607b3"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "e5a12f798f056049642aa03fbb83786e3a5b95d4"; - hash = "sha256-oOykmtAFPQiqK02nia8/m8pg2fi5yKt7dzZOGr9f3dQ="; + rev = "61607b32915fdeda275b2346e6a76a7c9b363251"; + hash = "sha256-tNRYOPUSquxxyazBvgvjRCObf8Z7D98GDtKY5MAExqE="; }; - meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; + meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32"; }; tablegen = buildGrammar { language = "tablegen"; version = "0.0.0+rev=b117088"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-tablegen"; rev = "b1170880c61355aaf38fc06f4af7d3c55abdabc4"; hash = "sha256-uJCn2RdTnOf/guBUhfodgQ8pMshNh+xUJZunoLwNgrM="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-tablegen"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tablegen"; }; tact = buildGrammar { language = "tact"; - version = "0.0.0+rev=47af202"; + version = "0.0.0+rev=a6267c2"; src = fetchFromGitHub { owner = "tact-lang"; repo = "tree-sitter-tact"; - rev = "47af20264abbd24ea282ded0f8ee9cad3cf3bf2f"; - hash = "sha256-Zrnkvm1WjAlxuk2dEojIx0ldWqdv6gxMl/f9w6TsqBE="; + rev = "a6267c2091ed432c248780cec9f8d42c8766d9ad"; + hash = "sha256-2AUN/VYor3K0hkneLYa6+LjE+V8EJogFqBTgdfvOiKM="; }; meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; }; tcl = buildGrammar { language = "tcl"; - version = "0.0.0+rev=98015eb"; + version = "0.0.0+rev=f15e711"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-tcl"; - rev = "98015ebe182d94e5a4439e32ffd91beaac32fcb9"; - hash = "sha256-zpswRch3xYjymQhc69noDTCsPrFzVRm1RN3jjIrUeDE="; + rev = "f15e711167661d1ba541d4f62b9dbfc4ce61ec56"; + hash = "sha256-173xUAc2/LMDQSTEM3l3R4UuF/R5fdUyhEpXv6Eh02s="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tcl"; }; teal = buildGrammar { language = "teal"; - version = "0.0.0+rev=3db6559"; + version = "0.0.0+rev=05d276e"; src = fetchFromGitHub { owner = "euclidianAce"; repo = "tree-sitter-teal"; - rev = "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"; - hash = "sha256-9RX7QMrG8+EZQ5yeYGeAGxRz8wqPP6p1GcSyDY4OvlY="; + rev = "05d276e737055e6f77a21335b7573c9d3c091e2f"; + hash = "sha256-JDqWr895Ob1Jn3Kf44xbkMJqyna0AiMBU5xJpA6ZP7w="; }; generate = true; meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=def9849"; + version = "0.0.0+rev=54367ac"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "def9849184de71a797c4e2b2837df85abeccf92c"; - hash = "sha256-LeCLVE0TxKIwkR1x1p4ZFUC/Q/qpOE64Ycn/GaWrZYA="; + rev = "54367acb2b250879f39f2afee123c917ed0798e0"; + hash = "sha256-LJ1Hu64pDv0gwovp2yrINM+G4aHNUF0Gc1K7QXEwXpo="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; tera = buildGrammar { language = "tera"; - version = "0.0.0+rev=482b475"; + version = "0.0.0+rev=d006172"; src = fetchFromGitHub { owner = "uncenter"; repo = "tree-sitter-tera"; - rev = "482b475b32e6bae67f9d57abc60545399fd9b0a3"; - hash = "sha256-ndauBItrpUTIVjt5Sm0+jUjQtuAcHwLVdmw6IwcNXII="; + rev = "d006172998fa8b81f96b0f2fc7fa2bf25207c46b"; + hash = "sha256-+fq01oAfAsNancT2iOjYVwFu5SVDSAPAQ1OiSn+DkTM="; }; meta.homepage = "https://github.com/uncenter/tree-sitter-tera"; }; terraform = buildGrammar { language = "terraform"; - version = "0.0.0+rev=de10d49"; + version = "0.0.0+rev=009def4"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "de10d494dbd6b71cdf07a678fecbf404dbfe4398"; - hash = "sha256-oRNNxE5AnI0TyJl92pk0E9xGj5xom/+0kpPMUE/O/TY="; + rev = "009def4ae38ec30e5b40beeae26efe93484ab286"; + hash = "sha256-3tM4cggewH2uorO8sgM0E/YFt1//zxBKHAqZVNmZVQU="; }; location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; @@ -3075,12 +3076,12 @@ language = "thrift"; version = "0.0.0+rev=68fd0d8"; src = fetchFromGitHub { - owner = "duskmoon314"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-thrift"; rev = "68fd0d80943a828d9e6f49c58a74be1e9ca142cf"; hash = "sha256-owZbs8ttjKrqTA8fQ/NmBGyIUUItSUvvW4hRv0NPV8Y="; }; - meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-thrift"; }; tiger = buildGrammar { language = "tiger"; @@ -3141,13 +3142,13 @@ language = "tsv"; version = "0.0.0+rev=7eb7297"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-csv"; rev = "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"; hash = "sha256-5VL7uREH0lloAWo9rdJXsjDsWxgL6fngWJSmi4fM7UQ="; }; location = "tsv"; - meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv"; }; tsx = buildGrammar { language = "tsx"; @@ -3197,12 +3198,12 @@ }; typespec = buildGrammar { language = "typespec"; - version = "0.0.0+rev=42fb163"; + version = "0.0.0+rev=b6b6a66"; src = fetchFromGitHub { owner = "happenslol"; repo = "tree-sitter-typespec"; - rev = "42fb163442ef2691b9b720fb4e4e846809415d18"; - hash = "sha256-yWXfDC4etuXn1jV8DsSSL028LUXSnsvCaog6ggtd8ro="; + rev = "b6b6a66a18e98f44cc2f2cdbfd2e1df845b59852"; + hash = "sha256-Hf/7ZQjAevTxvQ2coKUq/FjJQpEds283zfq4kOx4YW0="; }; meta.homepage = "https://github.com/happenslol/tree-sitter-typespec"; }; @@ -3232,23 +3233,23 @@ language = "udev"; version = "0.0.0+rev=18a1d18"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-udev"; rev = "18a1d183c4c0cc40438bae2ebf8191aaf2dee8dc"; hash = "sha256-ySo+vS+il1tmTPZ6OJMduyJxsjjI3eIkYSMYs10Bcnk="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-udev"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-udev"; }; ungrammar = buildGrammar { language = "ungrammar"; version = "0.0.0+rev=debd26f"; src = fetchFromGitHub { - owner = "Philipp-M"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-ungrammar"; rev = "debd26fed283d80456ebafa33a06957b0c52e451"; hash = "sha256-ftvcD8I+hYqH3EGxaRZ0w8FHjBA34OSTTsrUsAOtayU="; }; - meta.homepage = "https://github.com/Philipp-M/tree-sitter-ungrammar"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ungrammar"; }; unison = buildGrammar { language = "unison"; @@ -3277,21 +3278,21 @@ language = "uxntal"; version = "0.0.0+rev=ad9b638"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-uxntal"; rev = "ad9b638b914095320de85d59c49ab271603af048"; hash = "sha256-hR0EaYv1++MJ0pdBl3ZtyEljitnp5hgFWQa9F6b1KE4="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-uxntal"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-uxntal"; }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=26c2c4c"; + version = "0.0.0+rev=59a8889"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "26c2c4c2b3fb4f7a07ae78d298b36998b7ffa956"; - hash = "sha256-sKD4CoClychNS5B6JmnGCPLiNxWbOLt0t2PV30mvjoI="; + rev = "59a8889d84a293d7c0366d14c8dbb0eec24fe889"; + hash = "sha256-I6+4CRwLNFwozNRNE5+cbrOX8hBroCh90H2V7qo2gIo="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3320,12 +3321,12 @@ }; verilog = buildGrammar { language = "verilog"; - version = "0.0.0+rev=15fbf73"; + version = "0.0.0+rev=ba3c1e3"; src = fetchFromGitHub { owner = "gmlarumbe"; repo = "tree-sitter-systemverilog"; - rev = "15fbf73dafaffc89050d247857beb27500ea30e8"; - hash = "sha256-cCnFq2cL2lnTBXSVTVbHiGW/MDJARgqgGUjKmaTpOJI="; + rev = "ba3c1e305caf948f718293c86c6018a82ed5043e"; + hash = "sha256-RuoPx2iSVVrZ37k4Cnj6DIsRZBY6v9C6d6tPhQztAPA="; }; meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog"; }; @@ -3353,23 +3354,23 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=11b688a"; + version = "0.0.0+rev=ccc312e"; src = fetchFromGitHub { - owner = "neovim"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-vim"; - rev = "11b688a1f0e97c0c4e3dbabf4a38016335f4d237"; - hash = "sha256-UvH/k0gWEhrgxG1HnrdmaLHzygkaKk4hx2gK/6TZYNM="; + rev = "ccc312e878aa84f32d180b8528a3585c7b86a545"; + hash = "sha256-JvZFFh00lJFcQAXJag8+Jr3yyo4EdkTdi46pkslTh6E="; }; - meta.homepage = "https://github.com/neovim/tree-sitter-vim"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=2694c3d"; + version = "0.0.0+rev=9f6191a"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "2694c3d27e2ca98a0ccde72f33887394300d524e"; - hash = "sha256-DAHOhNqd9DQ9KNkJdjbUmSV6qhTOmPrIaC/7rBNCqzY="; + rev = "9f6191a98702edc1084245abd5523279d4b681fb"; + hash = "sha256-vAKX9Mx+ZYz7c2dWv01GOJN6Wud7pjddg2luAis0Ib4="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -3410,12 +3411,12 @@ language = "wgsl_bevy"; version = "0.0.0+rev=47c1818"; src = fetchFromGitHub { - owner = "theHamsta"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-wgsl-bevy"; rev = "47c1818d245a6156a488c4c4d06e9336714bae9b"; hash = "sha256-oL9HDMDl6MgDLZw4NWtdX7W775JZKwD2BweAO+9iI/k="; }; - meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy"; }; wing = buildGrammar { language = "wing"; @@ -3430,12 +3431,12 @@ }; wit = buildGrammar { language = "wit"; - version = "0.0.0+rev=81490b4"; + version = "0.0.0+rev=37bf43c"; src = fetchFromGitHub { owner = "liamwh"; repo = "tree-sitter-wit"; - rev = "81490b4e74c792369e005f72b0d46fe082d3fed2"; - hash = "sha256-L8dIOVJ3L2TXg1l4BXMOQeOsNxVkGPZimG619n3kHZE="; + rev = "37bf43c7f11d2b4af7a78d98a19e6d5c2cf04ad2"; + hash = "sha256-8RRffYuw1wmtRgGGMIfzKnZPM4dKGd0h7A5oOVfEk1Y="; }; meta.homepage = "https://github.com/liamwh/tree-sitter-wit"; }; @@ -3443,12 +3444,12 @@ language = "xcompose"; version = "0.0.0+rev=fff3e72"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-xcompose"; rev = "fff3e72242aa110ebba6441946ea4d12d200fa68"; hash = "sha256-PNg1z+7CuvpQdksKJOCQ59dZrv4PORdYo6CSw3GrBtk="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xcompose"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xcompose"; }; xml = buildGrammar { language = "xml"; @@ -3499,12 +3500,12 @@ language = "yuck"; version = "0.0.0+rev=e877f6a"; src = fetchFromGitHub { - owner = "Philipp-M"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-yuck"; rev = "e877f6ade4b77d5ef8787075141053631ba12318"; hash = "sha256-l8c1/7q8S78jGyl+VAVVgs8wq58PrrjycyJfWXsCgAI="; }; - meta.homepage = "https://github.com/Philipp-M/tree-sitter-yuck"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yuck"; }; zathurarc = buildGrammar { language = "zathurarc"; @@ -3530,24 +3531,24 @@ }; ziggy = buildGrammar { language = "ziggy"; - version = "0.0.0+rev=8a29017"; + version = "0.0.0+rev=fe3bf93"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "8a29017169f43dc2c3526817e98142eb9a335087"; - hash = "sha256-w4qq/SBlRQw3r9iIZ2RY3infa/ysopOQX5QDS7+8kt8="; + rev = "fe3bf9389e7ff213cf3548caaf9c6f3d4bb38647"; + hash = "sha256-w2WO2N3+XJWhWnt9swOux2ynKxmePbB4VojXM8K5GAo="; }; location = "tree-sitter-ziggy"; meta.homepage = "https://github.com/kristoff-it/ziggy"; }; ziggy_schema = buildGrammar { language = "ziggy_schema"; - version = "0.0.0+rev=8a29017"; + version = "0.0.0+rev=fe3bf93"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "8a29017169f43dc2c3526817e98142eb9a335087"; - hash = "sha256-w4qq/SBlRQw3r9iIZ2RY3infa/ysopOQX5QDS7+8kt8="; + rev = "fe3bf9389e7ff213cf3548caaf9c6f3d4bb38647"; + hash = "sha256-w2WO2N3+XJWhWnt9swOux2ynKxmePbB4VojXM8K5GAo="; }; location = "tree-sitter-ziggy-schema"; meta.homepage = "https://github.com/kristoff-it/ziggy"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 57bf27cfa5d1..643bab355ea9 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -1,5 +1,6 @@ { lib, + stdenv, callPackage, tree-sitter, neovim, @@ -13,10 +14,29 @@ self: super: let inherit (neovimUtils) grammarToPlugin; - generatedGrammars = callPackage ./generated.nix { - inherit (tree-sitter) buildGrammar; + + overrides = prev: { + ocamllex = + if stdenv.hostPlatform.isDarwin then + # remove after https://github.com/314eter/tree-sitter-ocamllex/issues/10 is resolved + # see https://github.com/NixOS/nixpkgs/pull/394636 + (prev.ocamllex.overrideAttrs { + src = prev.ocamllex.src.override { + hash = "sha256-UBGVc98lrtTCp/kYDEFM/8iG9n7Tekx+xbE7Wdyp2uQ="; + }; + }) + else + prev.ocamllex; }; + generatedGrammars = + let + generated = callPackage ./generated.nix { + inherit (tree-sitter) buildGrammar; + }; + in + lib.overrideExisting generated (overrides generated); + generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars; # add aliases so grammars from `tree-sitter` are overwritten in `withPlugins` diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index fce0910bfc30..486a6d1e56d7 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -17,6 +17,7 @@ python3, # Misc dependencies code-minimap, + dailies, dasht, deno, direnv, @@ -117,6 +118,10 @@ # typst-preview dependencies tinymist, websocat, + # luau-lsp-nvim dependencies + luau-lsp, + # nvim-vstsl dependencies + vtsls, }: self: super: let @@ -291,6 +296,18 @@ in dependencies = [ self.plenary-nvim ]; }; + blink-cmp-npm-nvim = super.blink-cmp-npm-nvim.overrideAttrs { + nvimSkipModules = [ + # Test files + "blink-cmp-npm.utils.compute_meta_spec" + "blink-cmp-npm.utils.generate_doc_spec" + "blink-cmp-npm.utils.ignore_version_spec" + "blink-cmp-npm.utils.is_cursor_in_dependencies_node_spec" + "blink-cmp-npm.utils.semantic_sort_spec" + "minit" + ]; + }; + blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs { dependencies = [ self.blink-cmp ]; }; @@ -374,6 +391,12 @@ in ''; }; + claude-code-nvim = super.claude-code-nvim.overrideAttrs { + dependencies = with self; [ + plenary-nvim + ]; + }; + clighter8 = super.clighter8.overrideAttrs { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${lib.getLib llvmPackages.clang.cc}/lib/libclang.so')|" \ @@ -599,9 +622,10 @@ in dependencies = [ self.plenary-nvim ]; nvimSkipModules = [ # Optional provider dependencies - "codecompanion.providers.diff.mini_diff" - "codecompanion.providers.actions.telescope" "codecompanion.providers.actions.mini_pick" + "codecompanion.providers.actions.snacks" + "codecompanion.providers.actions.telescope" + "codecompanion.providers.diff.mini_diff" # Requires setup call "codecompanion.actions.static" "codecompanion.actions.init" @@ -610,7 +634,16 @@ in ]; }; - codeium-nvim = + codecompanion-history-nvim = super.codecompanion-history-nvim.overrideAttrs { + dependencies = with self; [ + # transitive dependency for codecompanion-nvim + plenary-nvim + + codecompanion-nvim + ]; + }; + + windsurf-nvim = let # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json codeiumVersion = "1.20.9"; @@ -648,7 +681,7 @@ in }; in - super.codeium-nvim.overrideAttrs { + super.windsurf-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; buildPhase = '' cat << EOF > lua/codeium/installation_defaults.lua @@ -884,6 +917,12 @@ in ''; }; + dailies-nvim = super.dailies-nvim.overrideAttrs { + runtimeDeps = [ + dailies + ]; + }; + darkearth-nvim = super.darkearth-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; # Lua module used to build theme @@ -1052,6 +1091,12 @@ in ]; }; + ecolog-nvim = super.ecolog-nvim.overrideAttrs { + nvimSkipModules = [ + "repro" + ]; + }; + efmls-configs-nvim = super.efmls-configs-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; @@ -1204,6 +1249,10 @@ in fzf-lua = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.fzf-lua; runtimeDeps = [ fzf ]; + nvimSkipModules = [ + "fzf-lua.shell_helper" + "fzf-lua.spawn" + ]; }; fzf-vim = super.fzf-vim.overrideAttrs { @@ -1274,6 +1323,13 @@ in ]; }; + GPTModels-nvim = super.GPTModels-nvim.overrideAttrs { + dependencies = with self; [ + nui-nvim + telescope-nvim + ]; + }; + guard-collection = super.guard-collection.overrideAttrs { dependencies = [ self.guard-nvim ]; }; @@ -1440,6 +1496,14 @@ in passthru.python3Dependencies = ps: [ ps.jupytext ]; }; + kanagawa-paper-nvim = super.kanagawa-paper-nvim.overrideAttrs { + nvimSkipModules = [ + # skipping wezterm theme switcher since it relies on a wezterm module + # that does not seem to be available, tried to build setting wezterm-nvim as a dep + "wezterm.theme_switcher" + ]; + }; + kulala-nvim = super.kulala-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter @@ -1447,9 +1511,13 @@ in ]; buildInputs = [ curl ]; postPatch = '' - substituteInPlace lua/kulala/config/init.lua \ + substituteInPlace lua/kulala/config/defaults.lua \ --replace-fail 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"' ''; + nvimSkipModules = [ + # Requires some extra work to get CLI working in nixpkgs + "cli.kulala_cli" + ]; }; LazyVim = super.LazyVim.overrideAttrs { @@ -1663,6 +1731,11 @@ in checkInputs = [ self.luasnip ]; }; + luau-lsp-nvim = super.luau-lsp-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + runtimeDeps = [ luau-lsp ]; + }; + magma-nvim = super.magma-nvim.overrideAttrs { passthru.python3Dependencies = ps: with ps; [ @@ -1734,8 +1807,12 @@ in }; mason-nvim = super.mason-nvim.overrideAttrs { - # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&' - nvimSkipModules = "mason-vendor.zzlib.inflate-bwo"; + nvimSkipModules = [ + # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&' + "mason-vendor.zzlib.inflate-bwo" + # E5108: Error executing lua ...mplugin-mason.nvim-2025-05-06/lua/mason-test/helpers.lua:7: module 'luassert.spy' not found: + "mason-test.helpers" + ]; }; mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs { @@ -2153,6 +2230,13 @@ in ]; }; + neovim-trunk = super.neovim-trunk.overrideAttrs { + dependencies = with self; [ + plenary-nvim + telescope-nvim + ]; + }; + nlsp-settings-nvim = super.nlsp-settings-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; @@ -2214,6 +2298,9 @@ in "nvchad.themes.mappings" "nvchad.cheatsheet.grid" "nvchad.cheatsheet.simple" + "nvchad.blink.config" + # Circular dependency with base46 + "nvchad.utils" ]; }; @@ -2549,10 +2636,21 @@ in nvimSkipModules = "client.client"; }; + nvim-vtsls = super.nvim-vtsls.overrideAttrs { + runtimeDeps = [ vtsls ]; + dependencies = [ self.nvim-lspconfig ]; + }; + nvzone-menu = super.nvzone-menu.overrideAttrs { + checkInputs = with self; [ + # Optional integrations + nvim-tree-lua + neo-tree-nvim + # FIXME: should propagate from neo-tree-nvim + nui-nvim + plenary-nvim + ]; dependencies = [ self.nvzone-volt ]; - # Optional nvimtree integration - nvimSkipModules = "menus.nvimtree"; }; nvzone-minty = super.nvzone-minty.overrideAttrs { @@ -2572,6 +2670,10 @@ in telescope-nvim ]; dependencies = [ self.plenary-nvim ]; + nvimSkipModules = [ + # Issue reproduction file + "minimal" + ]; }; octo-nvim = super.octo-nvim.overrideAttrs { @@ -2579,12 +2681,17 @@ in # Pickers, can use telescope or fzf-lua fzf-lua telescope-nvim + snacks-nvim ]; dependencies = with self; [ plenary-nvim ]; }; + oil-git-status-nvim = super.oil-git-status-nvim.overrideAttrs { + dependencies = [ self.oil-nvim ]; + }; + ollama-nvim = super.ollama-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -2700,9 +2807,22 @@ in checkInputs = [ curl ripgrep + # Optional integrations + self.blink-cmp + self.nvim-cmp ]; }; + peek-nvim = super.peek-nvim.overrideAttrs (old: { + patches = [ + # Patch peek-nvim to run using nixpkgs deno + # This means end-users have to build peek-nvim the first time they use it... + (replaceVars ./patches/peek-nvim/cmd.patch { + deno = lib.getExe deno; + }) + ]; + }); + persisted-nvim = super.persisted-nvim.overrideAttrs { nvimSkipModules = [ # /lua/persisted/init.lua:44: attempt to index upvalue 'config' (a nil value) @@ -2713,6 +2833,12 @@ in ]; }; + persistent-breakpoints-nvim = super.persistent-breakpoints-nvim.overrideAttrs { + dependencies = with self; [ + nvim-dap + ]; + }; + phpactor = buildVimPlugin { inherit (phpactor) pname @@ -3270,6 +3396,10 @@ in ]; }; + timerly = super.timerly.overrideAttrs { + dependencies = [ self.nvzone-volt ]; + }; + tmux-complete-vim = super.tmux-complete-vim.overrideAttrs { # Vim plugin with optional nvim-compe lua module nvimSkipModules = [ "compe_tmux" ]; @@ -3820,6 +3950,29 @@ in dependencies = [ self.nui-nvim ]; }; + xmake-nvim = super.xmake-nvim.overrideAttrs { + nvimSkipModule = [ + # attempt to index upvalue 'options' (a nil value) + "xmake.action" + "xmake.command" + "xmake.runner_wrapper" + ]; + }; + + yaml-companion-nvim = super.yaml-companion-nvim.overrideAttrs { + dependencies = [ + self.nvim-lspconfig + self.plenary-nvim + ]; + }; + + yaml-schema-detect-nvim = super.yaml-schema-detect-nvim.overrideAttrs { + dependencies = with self; [ + plenary-nvim + nvim-lspconfig + ]; + }; + yanky-nvim = super.yanky-nvim.overrideAttrs { nvimSkipModules = [ # Optional telescope integration diff --git a/pkgs/applications/editors/vim/plugins/patches/peek-nvim/cmd.patch b/pkgs/applications/editors/vim/plugins/patches/peek-nvim/cmd.patch new file mode 100644 index 000000000000..3c80e55e285b --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/peek-nvim/cmd.patch @@ -0,0 +1,37 @@ +diff --git a/app/src/main.ts b/app/src/main.ts +index c82d914..e8542f3 100644 +--- a/app/src/main.ts ++++ b/app/src/main.ts +@@ -73,7 +73,7 @@ async function init(socket: WebSocket) { + const onListen: Deno.ServeOptions['onListen'] = ({ hostname, port }) => { + const serverUrl = `${hostname.replace('0.0.0.0', 'localhost')}:${port}`; + logger.info(`listening on ${serverUrl}`); +- const webview = new Deno.Command('deno', { ++ const webview = new Deno.Command('@deno@', { + cwd: dirname(fromFileUrl(Deno.mainModule)), + args: [ + 'run', +diff --git a/lua/peek/app.lua b/lua/peek/app.lua +index af5148e..5e67563 100644 +--- a/lua/peek/app.lua ++++ b/lua/peek/app.lua +@@ -38,10 +38,17 @@ function module.setup() + end + + cmd = vim.list_extend({ +- 'deno', +- 'task', +- '--quiet', ++ '@deno@', + 'run', ++ '--allow-read', ++ '--allow-write', ++ '--allow-net', ++ '--allow-env', ++ '--allow-run', ++ '--no-check', ++ '--allow-import', ++ '--no-lock', ++ '../../app/src/main.ts', + }, args) + end diff --git a/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update-shell.nix b/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update-shell.nix index 573c98993f3a..d811a1b35c35 100644 --- a/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update-shell.nix +++ b/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update-shell.nix @@ -5,19 +5,16 @@ with pkgs; let - inherit (vimPlugins) nvim-treesitter; - - neovim = pkgs.neovim.override { - configure.packages.all.start = [ nvim-treesitter ]; - }; + pythonWithPackages = python3.withPackages ( + ps: with ps; [ + requests + ] + ); in mkShell { packages = [ - neovim nurl - python3 + pythonWithPackages ]; - - NVIM_TREESITTER = nvim-treesitter; } diff --git a/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py index 7e6650ace1d2..6b19eb24ebf6 100755 --- a/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py @@ -5,97 +5,128 @@ import json import logging import os import subprocess -import sys from concurrent.futures import ThreadPoolExecutor +import requests + log = logging.getLogger("vim-updater") +NURR_JSON_URL = "https://raw.githubusercontent.com/nvim-neorocks/nurr/main/tree-sitter-parsers.json" -def generate_grammar(lang, rev, cfg): - """Generate grammar for a language""" - info = cfg["install_info"] - url = info["url"] +def generate_grammar(lang, parser_info): + """Generate grammar for a language based on the parser info""" + try: + if "install_info" not in parser_info: + log.warning(f"Parser {lang} does not have install_info, skipping") + return "" - generated = f""" {lang} = buildGrammar {{ + install_info = parser_info["install_info"] + + url = install_info["url"] + rev = install_info["revision"] + + generated = f""" {lang} = buildGrammar {{ language = "{lang}"; version = "0.0.0+rev={rev[:7]}"; src = """ - generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True) - generated += ";" + generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True) + generated += ";" - location = info.get("location") - if location: - generated += f""" + location = install_info.get("location", "") + if location: + generated += f""" location = "{location}";""" - if info.get("requires_generate_from_grammar"): - generated += """ + if install_info.get("generate", False): + generated += """ generate = true;""" - generated += f""" + generated += f""" meta.homepage = "{url}"; }}; """ - return generated + return generated + except Exception as e: + log.error(f"Error generating grammar for {lang}: {e}") + return "" -def update_grammars(nvim_treesitter_dir: str): - """ - The lockfile contains just revisions so we start neovim to dump the - grammar information in a better format - """ - # the lockfile - cmd = [ - "nvim", - "--headless", - "-u", - "NONE", - "--cmd", - f"set rtp^={nvim_treesitter_dir}", - "+lua io.write(vim.json.encode(require('nvim-treesitter.parsers').get_parser_configs()))", - "+quit!", - ] - log.debug("Running command: %s", ' '.join(cmd)) - configs = json.loads(subprocess.check_output(cmd)) +def fetch_nurr_parsers(): + """Fetch the parser information from nurr repository""" + log.info("Fetching parser data from %s", NURR_JSON_URL) + + headers = {} + github_token = os.environ.get("GITHUB_TOKEN") + if github_token: + log.info("Using GITHUB_TOKEN for authentication") + headers["Authorization"] = f"token {github_token}" + else: + log.warning("No GITHUB_TOKEN found. GitHub API requests may be rate-limited.") + + response = requests.get(NURR_JSON_URL, headers=headers, timeout=30) + response.raise_for_status() + data = response.json() + + try: + parsers = data["parsers"] + except KeyError: + raise ValueError( + "Unexpected response from NURR:\n" + json.dumps(data, indent=2) + ) + log.info(f"Successfully fetched {len(parsers)} parsers") + return parsers + + +def process_parser_info(parser_info): + """Process a single parser info entry and generate grammar for it""" + try: + lang = parser_info["lang"] + return generate_grammar(lang, parser_info) + except Exception as e: + log.error(f"Error processing parser: {e}") + return "" + + +def update_grammars(): + """Update grammar definitions using nurr's parser information""" + parsers_info = fetch_nurr_parsers() generated_file = """# generated by pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py +# Using parser data from https://github.com/nvim-neorocks/nurr/blob/main/tree-sitter-parsers.json -{ buildGrammar, """ +{ + buildGrammar, + """ - generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) - - generated_file += """ }: + nurl_output = subprocess.check_output(["nurl", "-Ls", ","], text=True).strip() + indented_output = nurl_output.replace(",", ",\n ") + generated_file += indented_output + generated_file += """, +}: { """ - lockfile_path = os.path.join(nvim_treesitter_dir, "lockfile.json") - log.debug("Opening %s", lockfile_path) - with open(lockfile_path) as lockfile_fd: - lockfile = json.load(lockfile_fd) - - def _generate_grammar(item): - lang, lock = item - cfg = configs.get(lang) - if not cfg: - return "" - return generate_grammar(lang, lock["revision"], cfg) - - for generated in ThreadPoolExecutor(max_workers=5).map( - _generate_grammar, lockfile.items() - ): + # Process parsers in parallel for better performance + with ThreadPoolExecutor(max_workers=5) as executor: + for generated in executor.map(process_parser_info, parsers_info): generated_file += generated - generated_file += "}\n" + generated_file += "}\n" return generated_file if __name__ == "__main__": - generated = update_grammars(sys.argv[1]) + logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s') + + generated = update_grammars() output_path = os.path.join( os.path.dirname(__file__), "../../nvim-treesitter/generated.nix" ) - open(output_path, "w").write(generated) + log.info("Writing output to %s", output_path) + with open(output_path, "w") as f: + f.write(generated) + log.info("Successfully updated grammar definitions") diff --git a/pkgs/applications/editors/vim/plugins/utils/update.py b/pkgs/applications/editors/vim/plugins/utils/update.py index 369b90de4a3a..9458b8f074d7 100755 --- a/pkgs/applications/editors/vim/plugins/utils/update.py +++ b/pkgs/applications/editors/vim/plugins/utils/update.py @@ -19,10 +19,8 @@ # import inspect -import json import logging import os -import subprocess import textwrap from pathlib import Path from typing import List, Tuple @@ -82,10 +80,14 @@ class VimEditor(pluginupdate.Editor): f.write( textwrap.dedent( """ - { lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub }: - - final: prev: { + lib, + buildVimPlugin, + buildNeovimPlugin, + fetchFromGitHub, + }: + + final: prev: { """ ) ) @@ -97,7 +99,7 @@ class VimEditor(pluginupdate.Editor): and plugin.commit != nvim_treesitter_rev ): self.nvim_treesitter_updated = True - f.write("\n}\n") + f.write("}\n") print(f"updated {outfile}") def plugin2nix( @@ -132,20 +134,7 @@ class VimEditor(pluginupdate.Editor): # TODO this should probably be skipped when running outside a nixpkgs checkout if self.nvim_treesitter_updated: print("updating nvim-treesitter grammars") - cmd = [ - "nix", - "build", - "vimPlugins.nvim-treesitter.src", - "-f", - self.nixpkgs, - "--print-out-paths", - ] - log.debug("Running command: %s", " ".join(cmd)) - nvim_treesitter_dir = subprocess.check_output( - cmd, text=True, timeout=90 - ).strip() - - generated = treesitter.update_grammars(nvim_treesitter_dir) + generated = treesitter.update_grammars() treesitter_generated_nix_path = os.path.join( NIXPKGS_NVIMTREESITTER_FOLDER, "generated.nix" ) diff --git a/pkgs/applications/editors/vim/plugins/utils/updater.nix b/pkgs/applications/editors/vim/plugins/utils/updater.nix index b2dbdf9fca41..9560708fbb0e 100644 --- a/pkgs/applications/editors/vim/plugins/utils/updater.nix +++ b/pkgs/applications/editors/vim/plugins/utils/updater.nix @@ -25,6 +25,7 @@ buildPythonApplication { pythonPath = [ python3Packages.gitpython + python3Packages.requests ]; dontUnpack = true; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2bbafd674a4f..6f39a6589ad6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -9,6 +9,7 @@ https://github.com/whonore/Coqtail/,, https://github.com/vim-scripts/DoxygenToolkit.vim/,, https://github.com/numToStr/FTerm.nvim/,, https://github.com/antoinemadec/FixCursorHold.nvim/,, +https://github.com/Aaronik/GPTModels.nvim/,HEAD, https://github.com/vim-scripts/Improved-AnsiEsc/,, https://github.com/ionide/Ionide-vim/,HEAD, https://github.com/martinda/Jenkinsfile-vim-syntax/,, @@ -116,12 +117,14 @@ https://github.com/disrupted/blink-cmp-conventional-commits/,HEAD, https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD, https://github.com/Kaiser-Yang/blink-cmp-dictionary/,HEAD, https://github.com/Kaiser-Yang/blink-cmp-git/,HEAD, +https://github.com/alexandre-abrioux/blink-cmp-npm.nvim/,HEAD, https://github.com/ribru17/blink-cmp-spell/,HEAD, https://github.com/fang2hou/blink-copilot/,HEAD, https://github.com/moyiz/blink-emoji.nvim/,HEAD, https://github.com/MahanRahmati/blink-nerdfont.nvim/,HEAD, https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD, https://github.com/Saghen/blink.compat/,HEAD, +https://github.com/dundalek/bloat.nvim/,HEAD, https://github.com/HampusHauffman/block.nvim/,HEAD, https://github.com/blueballs-theme/blueballs-neovim/,, https://github.com/uloco/bluloco.nvim/,, @@ -151,6 +154,7 @@ https://github.com/declancm/cinnamon.nvim/,HEAD, https://github.com/projekt0n/circles.nvim/,, https://github.com/zootedb0t/citruszest.nvim/,, https://github.com/xavierd/clang_complete/,, +https://github.com/greggh/claude-code.nvim/,HEAD, https://github.com/rhysd/clever-f.vim/,, https://github.com/bbchung/clighter8/,, https://github.com/ekickx/clipboard-image.nvim/,, @@ -219,9 +223,8 @@ https://github.com/coc-extensions/coc-svelte/,, https://github.com/iamcco/coc-tailwindcss/,, https://github.com/neoclide/coc.nvim/,release, https://github.com/manicmaniac/coconut.vim/,HEAD, +https://github.com/ravitemer/codecompanion-history.nvim/,HEAD, https://github.com/olimorris/codecompanion.nvim/,HEAD, -https://github.com/Exafunction/codeium.nvim/,HEAD, -https://github.com/Exafunction/codeium.vim/,HEAD, https://github.com/gorbit99/codewindow.nvim/,HEAD, https://github.com/metakirby5/codi.vim/,, https://github.com/tjdevries/colorbuddy.nvim/,, @@ -246,6 +249,7 @@ https://github.com/Olical/conjure/,, https://github.com/wellle/context.vim/,, https://github.com/Shougo/context_filetype.vim/,, https://github.com/zbirenbaum/copilot-cmp/,HEAD, +https://github.com/copilotlsp-nvim/copilot-lsp/,HEAD, https://github.com/AndreM222/copilot-lualine/,HEAD, https://github.com/zbirenbaum/copilot.lua/,HEAD, https://github.com/github/copilot.vim/,, @@ -269,6 +273,7 @@ https://github.com/FelikZ/ctrlp-py-matcher/,, https://github.com/amiorin/ctrlp-z/,, https://github.com/ctrlpvim/ctrlp.vim/,, https://github.com/scottmckendry/cyberdream.nvim/,, +https://github.com/JachymPutta/dailies.nvim/,HEAD, https://github.com/ptdewey/darkearth-nvim/,HEAD, https://github.com/dart-lang/dart-vim-plugin/,, https://github.com/rizzatti/dash.vim/,HEAD, @@ -314,6 +319,7 @@ https://github.com/Shougo/deoplete.nvim/,, https://github.com/maskudo/devdocs.nvim/,HEAD, https://github.com/rhysd/devdocs.vim/,, https://github.com/vmchale/dhall-vim/,, +https://github.com/dgagn/diagflow.nvim/,HEAD, https://github.com/onsails/diaglist.nvim/,, https://github.com/nvim-lua/diagnostic-nvim/,, https://github.com/3rd/diagram.nvim/,HEAD, @@ -332,6 +338,7 @@ https://github.com/Bekaboo/dropbar.nvim/,HEAD, https://github.com/earthly/earthly.vim/,HEAD, https://github.com/GustavEikaas/easy-dotnet.nvim/,HEAD, https://github.com/Shougo/echodoc.vim/,, +https://github.com/t3ntxcl3s/ecolog.nvim/,HEAD, https://github.com/sainnhe/edge/,, https://github.com/geldata/edgedb-vim/,, https://github.com/folke/edgy.nvim/,HEAD, @@ -350,6 +357,7 @@ https://github.com/sainnhe/everforest/,, https://github.com/google/executor.nvim/,HEAD, https://github.com/jinh0/eyeliner.nvim/,HEAD, https://github.com/fenetikm/falcon/,, +https://github.com/mahyarmirrashed/famous-quotes.nvim/,HEAD, https://github.com/brooth/far.vim/,, https://github.com/Chaitanyabsprip/fastaction.nvim/,HEAD, https://github.com/pteroctopus/faster.nvim/,HEAD, @@ -417,7 +425,6 @@ https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD, https://github.com/liuchengxu/graphviz.vim/,, https://github.com/cbochs/grapple.nvim/,HEAD, https://github.com/blazkowolf/gruber-darker.nvim/,, -https://github.com/MagicDuck/grug-far.nvim/,, https://github.com/morhetz/gruvbox/,, https://github.com/luisiacc/gruvbox-baby/,HEAD, https://github.com/gruvbox-community/gruvbox/,,gruvbox-community @@ -498,6 +505,7 @@ https://github.com/julelang/jule.nvim/,HEAD, https://github.com/julelang/jule.nvim/,HEAD, https://github.com/JuliaEditorSupport/julia-vim/,, https://github.com/GCBallesteros/jupytext.nvim/,HEAD, +https://github.com/thesimonho/kanagawa-paper.nvim/,HEAD, https://github.com/rebelot/kanagawa.nvim/,, https://github.com/imsnif/kdl.vim/,HEAD, https://github.com/anuvyklack/keymap-layer.nvim/,HEAD, @@ -565,6 +573,7 @@ https://github.com/nvim-java/lua-async/,HEAD, https://github.com/arkav/lualine-lsp-progress/,, https://github.com/evesdropper/luasnip-latex-snippets.nvim/,HEAD, https://github.com/alvarosevilla95/luatab.nvim/,, +https://github.com/lopi-py/luau-lsp.nvim/,HEAD, https://github.com/mkasa/lushtags/,, https://github.com/Bilal2453/luvit-meta/,HEAD, https://github.com/dccsillag/magma-nvim/,HEAD, @@ -574,11 +583,11 @@ https://github.com/tadmccorkle/markdown.nvim/,HEAD, https://github.com/David-Kunz/markid/,HEAD, https://github.com/chentoast/marks.nvim/,, https://github.com/OXY2DEV/markview.nvim/,HEAD, -https://github.com/williamboman/mason-lspconfig.nvim/,HEAD, +https://github.com/mason-org/mason-lspconfig.nvim/,HEAD, https://github.com/jay-babu/mason-null-ls.nvim/,HEAD, https://github.com/jay-babu/mason-nvim-dap.nvim/,HEAD, https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, -https://github.com/williamboman/mason.nvim/,HEAD, +https://github.com/mason-org/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, https://github.com/kaicataldo/material.vim/,HEAD, @@ -679,6 +688,7 @@ https://github.com/danymat/neogen/,HEAD, https://github.com/NeogitOrg/neogit/,, https://github.com/Shougo/neoinclude.vim/,, https://github.com/neomake/neomake/,, +https://github.com/cdmill/neomodern.nvim/,HEAD, https://github.com/Shougo/neomru.vim/,, https://github.com/neomutt/neomutt.vim/,HEAD, https://github.com/rafamadriz/neon/,, @@ -717,6 +727,7 @@ https://github.com/lawrence-laz/neotest-zig/,HEAD, https://github.com/Shatur/neovim-ayu/,, https://github.com/cloudhead/neovim-fuzzy/,, https://github.com/jeffkreeftmeijer/neovim-sensible/,, +https://github.com/trunk-io/neovim-trunk/,HEAD, https://github.com/Shougo/neoyank.vim/,, https://github.com/preservim/nerdcommenter/,, https://github.com/preservim/nerdtree/,, @@ -779,6 +790,7 @@ https://github.com/igorlfs/nvim-dap-view/,HEAD, https://github.com/theHamsta/nvim-dap-virtual-text/,, https://github.com/mxsdev/nvim-dap-vscode-js/,HEAD, https://github.com/amrbashir/nvim-docs-view/,HEAD, +https://github.com/chrisgrieser/nvim-early-retirement/,HEAD, https://github.com/allendang/nvim-expand-expr/,, https://github.com/vijaymarupudi/nvim-fzf/,, https://github.com/vijaymarupudi/nvim-fzf-commands/,, @@ -860,6 +872,7 @@ https://github.com/joosepalviste/nvim-ts-context-commentstring/,, https://github.com/kevinhwang91/nvim-ufo/,HEAD, https://github.com/samjwill/nvim-unception/,HEAD, https://github.com/chrisgrieser/nvim-various-textobjs/,HEAD, +https://github.com/yioneko/nvim-vtsls/,HEAD, https://github.com/AckslD/nvim-whichkey-setup.lua/,, https://github.com/s1n7ax/nvim-window-picker/,HEAD, https://github.com/roxma/nvim-yarp/,, @@ -874,6 +887,7 @@ https://github.com/obsidian-nvim/obsidian.nvim/,HEAD, https://github.com/nvimdev/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, +https://github.com/refractalize/oil-git-status.nvim/,HEAD, https://github.com/nomnivore/ollama.nvim/,HEAD, https://github.com/yonlu/omni.vim/,, https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD, @@ -907,8 +921,10 @@ https://github.com/frankroeder/parrot.nvim/,HEAD, https://github.com/lewis6991/pckr.nvim/,HEAD, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, +https://github.com/toppair/peek.nvim/,HEAD, https://github.com/olimorris/persisted.nvim/,HEAD, https://github.com/folke/persistence.nvim/,, +https://github.com/Weissle/persistent-breakpoints.nvim/,, https://github.com/pest-parser/pest.vim/,HEAD, https://github.com/lifepillar/pgsql.vim/,, https://github.com/phha/zenburn.nvim/,,phha-zenburn @@ -1103,8 +1119,10 @@ https://github.com/johmsalas/text-case.nvim/,HEAD, https://github.com/vhsconnect/themed-tabs.nvim/,HEAD, https://github.com/ron89/thesaurus_query.vim/,, https://github.com/itchyny/thumbnail.vim/,, +https://github.com/nvzone/timerly/,HEAD, https://github.com/vim-scripts/timestamp.vim/,, https://github.com/levouh/tint.nvim/,HEAD, +https://github.com/tinted-theming/tinted-vim/,HEAD, https://github.com/rachartier/tiny-devicons-auto-colors.nvim/,HEAD, https://github.com/rachartier/tiny-inline-diagnostic.nvim/,HEAD, https://github.com/tomtom/tinykeymap_vim/,,tinykeymap @@ -1143,6 +1161,7 @@ https://github.com/altermo/ultimate-autopair.nvim/,HEAD, https://github.com/SirVer/ultisnips/,, https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, +https://github.com/afreakk/unimpaired-which-key.nvim/,HEAD, https://github.com/tummetott/unimpaired.nvim/,HEAD, https://github.com/unisonweb/unison/,, https://github.com/Shougo/unite.vim/,, @@ -1621,6 +1640,8 @@ https://github.com/gelguy/wilder.nvim/,, https://github.com/gcmt/wildfire.vim/,, https://github.com/fgheng/winbar.nvim/,main, https://github.com/anuvyklack/windows.nvim/,, +https://github.com/Exafunction/windsurf.nvim/,HEAD, +https://github.com/Exafunction/windsurf.vim/,HEAD, https://github.com/sindrets/winshift.nvim/,, https://github.com/wannesm/wmgraphviz.vim/,, https://github.com/vim-scripts/wombat256.vim/,, @@ -1628,8 +1649,11 @@ https://github.com/lukaszkorecki/workflowish/,, https://github.com/andrewferrier/wrapping.nvim/,HEAD, https://github.com/tweekmonster/wstrip.vim/,, https://github.com/piersolenski/wtf.nvim/,HEAD, +https://github.com/Mythos-404/xmake.nvim/,HEAD, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, +https://github.com/someone-stole-my-name/yaml-companion.nvim/,HEAD, +https://github.com/cwrau/yaml-schema-detect.nvim/,HEAD, https://github.com/gbprod/yanky.nvim/,HEAD, https://github.com/HerringtonDarkholme/yats.vim/,, https://github.com/mikavilpas/yazi.nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index cb46592d9f04..296b3366339c 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "25.0.0"; - hash = "sha256-n/7y2nbD+ziUCDmNbfuT01GK/ls8rTfghpntj6SmsbA="; + version = "25.0.3"; + hash = "sha256-rD2Uzzt8xfkfgM+Y0NLe7lthfxinv1Zatpr56OjfABM="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix b/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix new file mode 100644 index 000000000000..3164d8dda54a --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix @@ -0,0 +1,20 @@ +{ + lib, + vscode-utils, +}: +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "arepl"; + publisher = "almenon"; + version = "3.0.0"; + hash = "sha256-NadsB/6kUQ7/d9o3rUc7889jO+4MdvBhtyI4UUGpzqk="; + }; + + meta = { + description = "Preferred dark/light themes by John Papa"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=almenon.arepl"; + homepage = "https://github.com/Almenon/AREPL-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.therobot2105 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix new file mode 100644 index 000000000000..a31f8a10bb37 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -0,0 +1,22 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { + mktplcRef = { + name = "amazon-q-vscode"; + publisher = "AmazonWebServices"; + version = "1.67.0"; + hash = "sha256-1GShGk0ulYlpJpcdai7T2n0p2v1qicLE4X2d7Pqx4Zc="; + }; + + meta = { + changelog = "https://github.com/aws/aws-toolkit-vscode/releases/tag/amazonq%2Fv${finalAttrs.version}"; + description = "Amazon Q, CodeCatalyst, Local Lambda debug, SAM/CFN syntax, ECS Terminal, AWS resources"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode"; + homepage = "https://github.com/aws/aws-toolkit-vscode"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drupol ]; + }; +}) diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix index 4fc5c16eb7fd..8029ac7e7c41 100644 --- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -1,27 +1,36 @@ { + lib, clojure-lsp, jq, - lib, moreutils, vscode-utils, + vscode-extension-update-script, }: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; publisher = "betterthantomorrow"; - version = "2.0.374"; - hash = "sha256-VwdHOkduSSIrcOvrcVf7K8DSp3N1u9fvbaCVDCxp+bk="; + version = "2.0.512"; + hash = "sha256-JGk3TXeJhDMoPOVrDgxlNCAX0YCcaU7+ww2m6bPxnwo="; }; + nativeBuildInputs = [ jq moreutils ]; + postInstall = '' cd "$out/$installPrefix" jq '.contributes.configuration[0].properties."calva.clojureLspPath".default = "${clojure-lsp}/bin/clojure-lsp"' package.json | sponge package.json ''; - meta = { - license = lib.licenses.mit; + + passthru.updateScript = vscode-extension-update-script { + extraArgs = [ + "--override-filename" + "pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix" + ]; }; + + meta.license = lib.licenses.mit; } diff --git a/pkgs/applications/editors/vscode/extensions/bodil.blueprint-gtk/default.nix b/pkgs/applications/editors/vscode/extensions/bodil.blueprint-gtk/default.nix new file mode 100644 index 000000000000..40227103c9b2 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/bodil.blueprint-gtk/default.nix @@ -0,0 +1,19 @@ +{ + lib, + vscode-utils, +}: +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "blueprint-gtk"; + publisher = "bodil"; + version = "0.2.0"; + hash = "sha256-A4H/o/HsjQKKee46VZJsjY7EB+1iOm4RWxHKcRLmkEY="; + }; + + meta = { + description = "Gtk Blueprint language support."; + license = lib.licenses.lgpl3; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bodil.blueprint-gtk"; + maintainers = [ lib.maintainers.lyndeno ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/budparr.language-hugo-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/budparr.language-hugo-vscode/default.nix new file mode 100644 index 000000000000..b1fb184bc7d5 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/budparr.language-hugo-vscode/default.nix @@ -0,0 +1,20 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "language-hugo-vscode"; + publisher = "budparr"; + version = "1.3.1"; + hash = "sha256-9dp8/gLAb8OJnmsLVbOAKAYZ5whavPW2Ak+WhLqEbJk="; + }; + + meta = { + description = "Adds syntax highlighting and snippets to Hugo files in VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=budparr.language-hugo-vscode"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ohheyrj ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix b/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix index ad38fb0393ea..0f1084cd9a24 100644 --- a/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix +++ b/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "solargraph"; publisher = "castwide"; - version = "0.24.1"; - hash = "sha256-M96kGuCKo232rIwLovDU+C/rhEgZWT4s/zsR7CUYPnk="; + version = "0.25.0"; + hash = "sha256-5SmCkHGCS8dYfdSm3NRk091jH44m+7kkj+VL84YKM4g="; }; meta = { description = "Ruby language server featuring code completion, intellisense, and inline documentation"; diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix index 4653457b99bb..c92f38180f5f 100644 --- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix +++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix @@ -3,7 +3,7 @@ lib, vscode-utils, ruff, - vscode-extensions-update-script, + vscode-extension-update-script, }: vscode-utils.buildVscodeMarketplaceExtension { @@ -45,7 +45,7 @@ vscode-utils.buildVscodeMarketplaceExtension { ln -sf ${lib.getExe ruff} "$out/$installPrefix/bundled/libs/bin/ruff" ''; - passthru.updateScript = vscode-extensions-update-script { extraArgs = [ "--platforms" ]; }; + passthru.updateScript = vscode-extension-update-script { }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix new file mode 100644 index 000000000000..1e4a7d7069a1 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix @@ -0,0 +1,37 @@ +{ + jq, + lib, + moreutils, + vscode-utils, + eslint, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-eslint"; + publisher = "dbaeumer"; + version = "3.0.13"; + hash = "sha256-l5VvhQPxPaQsPhXUbFW2yGJjaqnNvijn4QkXPjf1WXo="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ eslint ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."eslint.nodePath".default = "${eslint}/lib/node_modules"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; + description = "Integrates ESLint JavaScript into VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; + homepage = "https://github.com/Microsoft/vscode-eslint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index af8b2895dd41..62eed5b9ce84 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -9,7 +9,6 @@ jq, lib, llvmPackages, - llvmPackages_14, moreutils, protobuf, python3Packages, @@ -28,8 +27,8 @@ let mktplcRef = { name = "language-x86-64-assembly"; publisher = "13xforever"; - version = "3.1.4"; - hash = "sha256-FJRDm1H3GLBfSKBSFgVspCjByy9m+j9OStlU+/pMfs8="; + version = "3.1.5"; + hash = "sha256-WIhmAZLR2WOSqQF3ozJ/Vr3Rp6HdSK7L23T3h4AVaGM="; }; meta = { description = "Cutting edge x86 and x86_64 assembly syntax highlighting"; @@ -44,8 +43,8 @@ let mktplcRef = { publisher = "1Password"; name = "op-vscode"; - version = "1.0.4"; - hash = "sha256-s6acue8kgFLf5fs4A7l+IYfhibdY76cLcIwHl+54WVk="; + version = "1.0.5"; + hash = "sha256-J7vAK2t6fSjm5i6y3+88aO84ipFwekQkJMD7W3EIWrc="; }; meta = { changelog = "https://github.com/1Password/op-vscode/releases"; @@ -90,15 +89,15 @@ let mktplcRef = { publisher = "42Crunch"; name = "vscode-openapi"; - version = "4.27.0"; - hash = "sha256-urXGyHpIDWQ0Bc+8LODC0DcEo6jQ5tA/QptyxCej9yU="; + version = "4.33.2"; + hash = "sha256-agCxi2UhJitdQmHIf6rK7WexkfljUQdqK5rLqzV4J6o="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog"; description = "Visual Studio Code extension with rich support for the OpenAPI Specification (OAS)"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=42Crunch.vscode-openapi"; homepage = "https://github.com/42Crunch/vscode-openapi"; - license = lib.licenses.gpl3; + license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.benhiemer ]; }; }; @@ -241,6 +240,8 @@ let }; }; + almenon.arepl = callPackage ./almenon.arepl { }; + alygin.vscode-tlaplus = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tlaplus"; @@ -253,12 +254,14 @@ let }; }; + amazonwebservices.amazon-q-vscode = callPackage ./amazonwebservices.amazon-q-vscode { }; + angular.ng-template = buildVscodeMarketplaceExtension { mktplcRef = { name = "ng-template"; publisher = "Angular"; - version = "19.2.2"; - hash = "sha256-WoNrKcK9Gr9gVWH/pwKyEUHuzcVNKh6zQwwpG4BuVCg="; + version = "20.0.0"; + hash = "sha256-87SImzcGbwvf9xtdbD3etqaWe6fMVeCKc+f8qTyFnUA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; @@ -315,8 +318,8 @@ let mktplcRef = { name = "vscode-apollo"; publisher = "apollographql"; - version = "2.5.5"; - hash = "sha256-KlyDbvTVyAacAzq8I6b8isGt5vMo5Ak9xlD8o0Ksy6A="; + version = "2.5.6"; + hash = "sha256-Uh3iFJXG8d0Ywjyx6sGpkYSD0Iy+y/0Uh0C6xYfQhKM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; @@ -360,8 +363,8 @@ let mktplcRef = { name = "nix-env-selector"; publisher = "arrterian"; - version = "1.0.12"; - hash = "sha256-xykKAEd+/eKMzKdufQ+wzEIhHFRh4qghWVDKgEJMTs0="; + version = "1.1.0"; + hash = "sha256-c5WX5L1hufKwBX64UiaLWOQaZTYma+6AbOphLPEQ9C8="; }; meta = { license = lib.licenses.mit; @@ -408,8 +411,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.18.19"; - hash = "sha256-JGyyvDZQmlVGwEwQHh+82yK7uSrtt/HBaWHzbiGJ614="; + version = "1.18.21"; + hash = "sha256-I5jrp8sGn+M8bJo93jNrx+s4sB0p3sGN4lLLROstkKA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -490,8 +493,8 @@ let mktplcRef = { publisher = "banacorn"; name = "agda-mode"; - version = "0.5.4"; - hash = "sha256-U+J1FxFMK0tfi+YueXohnommHXagoadVYsZLp5lAC3Q="; + version = "0.5.7"; + hash = "sha256-Lif7fvR2fozQDko0G74/+UhTnlbFjGAQj5eb2IIH61I="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog"; @@ -666,8 +669,8 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.27.0"; - hash = "sha256-09w/k1LlGYtyWWbVgoprJG/qB/zCuedF9Cu7kUXcNrE="; + version = "1.28.0"; + hash = "sha256-NAQD6DK1c13nA/O0QHNxFraImE6C0+Jzj9+f06EkiW0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-mermaid/changelog"; @@ -737,8 +740,8 @@ let mktplcRef = { name = "vscode-intelephense-client"; publisher = "bmewburn"; - version = "1.14.3"; - hash = "sha256-YmrE0HQlqtuFqD3CDuU5SHnvDbZsfZWEIAZLTkiNXtE="; + version = "1.14.4"; + hash = "sha256-WBtaRLAdE2Ttlq4fAS2kI3d0dUAVB+CTdksiSILJ4hY="; }; meta = { description = "PHP code intelligence for Visual Studio Code"; @@ -760,6 +763,8 @@ let }; }; + bodil.blueprint-gtk = callPackage ./bodil.blueprint-gtk { }; + bradgashler.htmltagwrap = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "bradgashler"; @@ -781,8 +786,8 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.14.12"; - hash = "sha256-Dn+Z5uZYoWSriNnkYK1rRoHv8sjr7ui70UeTA3e0wIs="; + version = "0.14.16"; + hash = "sha256-U2oZSIsLpqEqYBIEjSnIToEOOnTCUi4vR6XwjnNUDN8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog"; @@ -821,6 +826,8 @@ let }; }; + budparr.language-hugo-vscode = callPackage ./budparr.language-hugo-vscode { }; + bungcip.better-toml = buildVscodeMarketplaceExtension { mktplcRef = { name = "better-toml"; @@ -893,8 +900,8 @@ let mktplcRef = { name = "catppuccin-vsc-icons"; publisher = "catppuccin"; - version = "1.20.0"; - hash = "sha256-jkoa5X5vswJBvA69gstl/GUDHAvk94SVSV4lCy2yyWw="; + version = "1.21.0"; + hash = "sha256-rWExJ9XJ8nKki8TP0UNLCmslw+aCm1hR2h2xxhnY9bg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc-icons/changelog"; @@ -974,8 +981,8 @@ let mktplcRef = { name = "chatgpt-reborn"; publisher = "chris-hayes"; - version = "3.26.0"; - sha256 = "sha256-nRld/tSydasBEE1YJ0oa8217cCBt8iDRquCdSNYeQ3k="; + version = "3.27.0"; + sha256 = "sha256-52SvGb9TsvDQey5cjw+ZIQBP/1dyWcHKNjqCCCyM6k4="; }; }; @@ -1011,8 +1018,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.5.0"; - hash = "sha256-l4F3HZKkqANw9ErCE75IpI3GIWJIkePOW9+4QsKWaVQ="; + version = "1.8.0"; + hash = "sha256-zAe2IFT69oZ/OLVSaaY5lGSiF/7FGiQngz/EXekwQtM="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; @@ -1158,8 +1165,8 @@ let mktplcRef = { name = "dbclient-jdbc"; publisher = "cweijan"; - version = "1.4.2"; - hash = "sha256-ru4c7/6X3HfKyn5wz7I5PRh+A4bntB+FAWEGUzjMlY8="; + version = "1.4.4"; + hash = "sha256-hrymsnprfrRQeS/WRGqdV3MNPw+C+iJCcXF1IfNjGWE="; }; meta = { description = "JDBC Adapter For Database Client"; @@ -1174,8 +1181,8 @@ let mktplcRef = { name = "vscode-database-client2"; publisher = "cweijan"; - version = "8.2.3"; - hash = "sha256-QOYTJSO0kGXSjvLnkbmbXSaKZcvWqO07yvZ/PNe8Fmc="; + version = "8.3.2"; + hash = "sha256-cBFc8F8FwP7rSWyRTZqi19MihwHE6xNpb4I4O+4zhWs="; }; meta = { description = "Database Client For Visual Studio Code"; @@ -1188,8 +1195,8 @@ let mktplcRef = { publisher = "DanielGavin"; name = "ols"; - version = "0.1.33"; - hash = "sha256-6XjNiRmdUMgc/cFrn0SmI/ad7eoBBaCQUsu9lItarMc="; + version = "0.1.35"; + hash = "sha256-Kem8o0gM1+cYohmua17kIlAH1RURgqoc0sPuIFDVU8Q="; }; meta = { description = "Visual Studio Code extension for Odin language"; @@ -1203,8 +1210,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.9.49"; - hash = "sha256-YKeUgQpnH5XrYOiUdU5R2a9PJLj2iLYPXxhGdXAqW8U="; + version = "3.12.3"; + hash = "sha256-9vv/ourveSqLQyHylbWpUuJDwnpsZLihC800qDLI3YY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1220,8 +1227,8 @@ let mktplcRef = { publisher = "daohong-emilio"; name = "yash"; - version = "0.3.0"; - hash = "sha256-vQ0r1/DEfA6ebB4NmUciO5d4zRWS4pZeTXspWVRfe4g="; + version = "0.3.1"; + hash = "sha256-DentLM/XT7b7O4vptVcja9E8pQjiDPOLilo8wjTH0IE="; }; meta = { license = lib.licenses.mit; @@ -1233,8 +1240,8 @@ let mktplcRef = { name = "dart-code"; publisher = "dart-code"; - version = "3.107.20250311"; - hash = "sha256-A66/oodVLCFT2+UAP+DW+Un8T5l396UDACzHYHbe7Hk="; + version = "3.110.0"; + hash = "sha256-YLdhL5xNj8sidZUzMVZgOK6zTXgQnWdKWRrDg0on90s="; }; meta.license = lib.licenses.mit; @@ -1244,8 +1251,8 @@ let mktplcRef = { name = "flutter"; publisher = "dart-code"; - version = "3.107.20250303"; - hash = "sha256-xhhZIZK7ywNxoXHeih/fpR0QoatIkbzcfX+eXOogzJs="; + version = "3.110.0"; + hash = "sha256-Zi+q56XcHZGUKgF3TNpaYSwwdqLT8Q1fxf8dFVAEuQY="; }; meta.license = lib.licenses.mit; @@ -1255,8 +1262,8 @@ let mktplcRef = { name = "databricks"; publisher = "databricks"; - version = "2.9.1"; - hash = "sha256-wbq7XtINlPVUqBdmbl/O3P8f7Y/KqGSR+vbtEUofKk4="; + version = "2.9.4"; + hash = "sha256-6BSwkK6/YbCFci0p8aox8E9KP2M1daj3bu4qBxjybUE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog"; @@ -1301,22 +1308,7 @@ let }; }; - dbaeumer.vscode-eslint = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-eslint"; - publisher = "dbaeumer"; - version = "3.0.13"; - hash = "sha256-l5VvhQPxPaQsPhXUbFW2yGJjaqnNvijn4QkXPjf1WXo="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; - description = "Integrates ESLint JavaScript into VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; - homepage = "https://github.com/Microsoft/vscode-eslint"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; - }; - }; + dbaeumer.vscode-eslint = callPackage ./dbaeumer.vscode-eslint { }; dendron.adjust-heading-level = callPackage ./dendron.adjust-heading-level { }; @@ -1334,8 +1326,8 @@ let mktplcRef = { publisher = "denoland"; name = "vscode-deno"; - version = "3.43.6"; - hash = "sha256-bZsPyffCQ++gvlK7MT1Dsrd7HQWACcViwwcEhu9HQfM="; + version = "3.44.2"; + hash = "sha256-fwQvAqyYXg2oAUXUef9nW/WzZGillx0XRyXd/cMy7Ho="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog"; @@ -1351,8 +1343,8 @@ let mktplcRef = { name = "composer-php-vscode"; publisher = "devsense"; - version = "1.57.17031"; - hash = "sha256-TY7cqUrbxNDS1JT+LgGGgs6mbseoQLq1+BBuybMQsVk="; + version = "1.58.17223"; + hash = "sha256-eobPtePHqW0+2PgMN6ydJWMLQJ14FsevKbhZzaXYxqc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.composer-php-vscode/changelog"; @@ -1424,8 +1416,8 @@ let mktplcRef = { name = "profiler-php-vscode"; publisher = "devsense"; - version = "1.57.17031"; - hash = "sha256-fC+8trGmvgYjsnJA6+L6sxFoE6Cr91Q7xdparE9JKyg="; + version = "1.58.17223"; + hash = "sha256-LC/I/r7ZPOZJ21eGPKLOZEtiKXeIIggAaE8fSKHnTjg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog"; @@ -1482,8 +1474,8 @@ let mktplcRef = { publisher = "discloud"; name = "discloud"; - version = "2.22.36"; - hash = "sha256-SZ9cT5fowDS8NcWpZWU05+VEiDENs/vCikc8K6loRms="; + version = "2.22.50"; + hash = "sha256-O9ourjcg4nwfXZOz9n1vgD6ufTkGYNDZrPLnqPUiCAc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog"; @@ -1511,8 +1503,8 @@ let mktplcRef = { name = "competitive-programming-helper"; publisher = "DivyanshuAgrawal"; - version = "2025.3.1742989763"; - hash = "sha256-e7pRhZOe+6UW7VE63yX+Il2YZToR4cwYqEar+aAPlkc="; + version = "2025.5.1746344159"; + hash = "sha256-gFzuZH5AYfBSdTFfSlz2XkrFR4yUv+DaG5j4MCDYkX8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog"; @@ -1595,8 +1587,8 @@ let # semver scheme, contrary to preview versions which are listed on # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they expire after two weeks. - version = "16.3.3"; - hash = "sha256-nc/EaMhZSdpd3ZaRQLZkSh1p4Ai3CFN4GunI2+o/+ZI="; + version = "17.1.0"; + hash = "sha256-WPSMf1yLXSDqImpMTxn1eXcSrimVSVjjaXDzFMQ/l0E="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -1742,8 +1734,8 @@ let mktplcRef = { name = "vscode-great-icons"; publisher = "emmanuelbeziat"; - version = "2.1.116"; - hash = "sha256-gndGZwHEwFogPsBgzmQUq20dCMHFxgOROWhL6m1E5Aw="; + version = "2.1.118"; + hash = "sha256-nc3MsBnvof9MxFsGLRojlGQ4jUK+ia4k2GPCEBSHpuI="; }; meta = { license = lib.licenses.mit; @@ -1782,22 +1774,7 @@ let }; }; - esbenp.prettier-vscode = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "prettier-vscode"; - publisher = "esbenp"; - version = "11.0.0"; - hash = "sha256-pNjkJhof19cuK0PsXJ/Q/Zb2H7eoIkfXJMLZJ4lDn7k="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; - description = "Code formatter using prettier"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; - homepage = "https://github.com/prettier/prettier-vscode"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; - }; - }; + esbenp.prettier-vscode = callPackage ./esbenp.prettier-vscode { }; ethansk.restore-terminals = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1864,8 +1841,8 @@ let mktplcRef = { name = "dependi"; publisher = "fill-labs"; - version = "0.7.13"; - hash = "sha256-Xn2KEZDQ11LDfUKbIrJtQNQXkcusyrL/grDyQxUmTbc="; + version = "0.7.15"; + hash = "sha256-BXilurHO9WATC0PhT/scpZWEiRhJ9cSlq59opEM6wlE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog"; @@ -1898,8 +1875,8 @@ let mktplcRef = { name = "vscode-jest-runner"; publisher = "firsttris"; - version = "0.4.79"; - hash = "sha256-gcykn/mOvNzFKjKyY4fVhmIWR2kBKCo1ILpp1am0dIw="; + version = "0.4.82"; + hash = "sha256-8sKMxatSaibMESktDJdQ84jINsE05ZVSjLMGjHFw7VI="; }; meta = { description = "Simple way to run or debug a single (or multiple) tests from context-menu"; @@ -1914,8 +1891,8 @@ let mktplcRef = { name = "foam-vscode"; publisher = "foam"; - version = "0.26.10"; - hash = "sha256-vhQtdc0553TyPkQnTHwg7Nr+UbDMf9yR+2jj40ANPdQ="; + version = "0.26.11"; + hash = "sha256-tq4Woc4+vBVWox1ldTmJQJG/NGQPDAVEi+rviFEbVt0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; @@ -2100,40 +2077,9 @@ let }; }; - github.copilot = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "github"; - name = "copilot"; - # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json - version = "1.293.0"; - hash = "sha256-LwgINocPHA9jL6pMw40BgaZ3lOUwWPoOJWTDr+27h5Q="; - }; + github.copilot = callPackage ./github.copilot { }; - meta = { - description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; - homepage = "https://github.com/features/copilot"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.Zimmi48 ]; - }; - }; - - github.copilot-chat = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "github"; - name = "copilot-chat"; - # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot-chat --json - version = "0.26.2025030506"; # latest compatible with vscode ^1.98 - hash = "sha256-mCmZs5xGxcqHyo8NyMjk2mu9LmxFlMb2NGUwjXg27JA="; - }; - meta = { - description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot-chat"; - homepage = "https://github.com/features/copilot"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.laurent-f1z1 ]; - }; - }; + github.copilot-chat = callPackage ./github.copilot-chat { }; github.github-vscode-theme = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2171,8 +2117,8 @@ let mktplcRef = { publisher = "github"; name = "vscode-pull-request-github"; - version = "0.107.2025031304"; - hash = "sha256-BWmcAocEWBE7eeiyMBUcTBmozPWgLkdiDOskhf7drD8="; + version = "0.108.0"; + hash = "sha256-GNNPc8nzNIrPOn+4ujKvhKodeHt9r1QlV8+EgqIz54I="; }; meta = { license = lib.licenses.mit; @@ -2183,8 +2129,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.6.0"; - hash = "sha256-Tf1rsKK1KMBonwBR/2fZv2F6VLkPYXzX7sI3EipZvrQ="; + version = "6.13.1"; + hash = "sha256-v+gnZPemEMtyBNxwQf0OOp1QSy1+uWDNH9tBu4HwGDg="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -2199,8 +2145,8 @@ let mktplcRef = { name = "gleam"; publisher = "gleam"; - version = "2.11.1"; - hash = "sha256-tySY6vPg71QQKeKivCoJzcAH73nML/NWhtr+TgaSKRg="; + version = "2.12.0"; + hash = "sha256-kAs3+ecfMl2IcL+I4TXhbzq55AbHZ9NiQLhK6Eg+iZI="; }; meta = { description = "Support for the Gleam programming language"; @@ -2215,8 +2161,8 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.47.1"; - hash = "sha256-FKbPvXIO7SGt9C2lD7+0Q6yD0QNzrdef1ltsYXPmAi0="; + version = "0.47.2"; + hash = "sha256-d2JXrKd3pMPWshy1pZ0HGmk2ZTVn4W5IrwakkibZTgk="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog"; @@ -2341,8 +2287,8 @@ let mktplcRef = { publisher = "haskell"; name = "haskell"; - version = "2.5.3"; - hash = "sha256-3HbUH5+YCPqypGlsaSDwwyN/PoG9KO0YnZ1Ps7ZLQ48="; + version = "2.6.0"; + hash = "sha256-2lvG7yZ+QAoafwyWQkVwyl2MsP8zWWQkTw8hBtib+C0="; }; meta = { license = lib.licenses.mit; @@ -2425,6 +2371,8 @@ let }; }; + huacnlee.autocorrect = callPackage ./huacnlee.autocorrect { }; + humao.rest-client = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "humao"; @@ -2501,8 +2449,8 @@ let mktplcRef = { name = "vscode-vibrancy-continued"; publisher = "illixion"; - version = "1.1.46"; - hash = "sha256-TcEPr2lpUDsx/G6WXePsS7FUEOKSYSjaapsPEI5xXNU="; + version = "1.1.52"; + hash = "sha256-biSWnICmVPTf/zounQd6IfIPBMVDQzXjcCTgp5J00nA="; }; meta = { downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued"; @@ -2518,7 +2466,7 @@ let mktplcRef = { publisher = "influxdata"; name = "flux"; - version = "1.0.4"; + version = "1.0.5"; hash = "sha256-KIKROyfkosBS1Resgl+s3VENVg4ibaeIgKjermXESoA="; }; meta = { @@ -2550,8 +2498,8 @@ let mktplcRef = { name = "ionic"; publisher = "ionic"; - version = "1.103.0"; - hash = "sha256-TjtMkFCKu30LUvYv7nKav9EZlnmm3iXb9LlRYPPfKB0="; + version = "1.104.0"; + hash = "sha256-E3Hfs7YgZ4+eF0Pg7CI7fPFt6DEtFw0DdLq4BSY7vBQ="; }; meta = { description = "Official VSCode extension for Ionic and Capacitor development"; @@ -2566,8 +2514,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "7.25.5"; - hash = "sha256-Aak4uML3NqMaq4IJzcGHTYbcXlq1y/ZJ6m/f1pQWoQs="; + version = "7.25.10"; + hash = "sha256-2d12itLc9qBZZ7nQNS/80K46dde2RUKpkWgPwFxogIs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; @@ -2622,8 +2570,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "10.9.0"; - sha256 = "sha256-hexky9ZZt+u0H8HVcNiI2Jmx9HL5+uKHLVBNqEbgqLo="; + version = "10.9.1"; + sha256 = "sha256-R+tJ3k71rlzfxtz4Dib6JiU7Sipq/UTP38ERAhojY7c="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -2686,8 +2634,8 @@ let mktplcRef = { name = "gruvbox"; publisher = "jdinhlife"; - version = "1.24.6"; - hash = "sha256-nnQxaHnlgBpZSMigr04yqqO+mmZ+HqYq3WQFIRi3pRg="; + version = "1.26.0"; + hash = "sha256-XSDGwJ8zL1y9EZqk2wixMEV5GRjQngs8Pvu9QppWCNI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jdinhlife.gruvbox/changelog"; @@ -2827,8 +2775,8 @@ let mktplcRef = { name = "lean"; publisher = "jroesch"; - version = "0.16.59"; - hash = "sha256-tXiAM2MBF+Axd0zB7Rlgx8b8FgwlLaZex0++H2DpBls="; + version = "0.16.60"; + hash = "sha256-z0mOnbqpKMH5d78jAMgDIgO+5sk4xHOWAfa4kzXYISs="; }; meta = { changelog = "https://github.com/leanprover/vscode-lean/blob/v${mktplcRef.version}/README.md#release-notes"; @@ -2844,8 +2792,8 @@ let mktplcRef = { name = "language-julia"; publisher = "julialang"; - version = "1.138.1"; - hash = "sha256-r98S0J+9sKlQacUuUakCI1WE6uRJ9zhYc2foLCN8Xzo="; + version = "1.140.2"; + hash = "sha256-YQwJq3QSzb2pAOLyy0w8RtrjAlxudBGN52fQtj+OmOk="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/julialang.language-julia/changelog"; @@ -2951,8 +2899,8 @@ let mktplcRef = { name = "vscode-cfn-lint"; publisher = "kddejong"; - version = "0.26.4"; - hash = "sha256-SeLkZurILFc6qVOgbr9epOhspqfOe8EQ+WerrGfh548="; + version = "0.26.5"; + hash = "sha256-/DSGwHkXu6auCN1KZ3pJnMC6PnCHIhXDkCD5oE2fYdk="; }; nativeBuildInputs = [ @@ -3011,8 +2959,8 @@ let mktplcRef = { name = "asn1js"; publisher = "lapo"; - version = "0.1.4"; - hash = "sha256-utbIKlwNHnJZj/51f8hEDmUA/A26De/gY73iT4tXKRU="; + version = "0.2.2"; + hash = "sha256-U1mvxDqyNbTalKgxtCLxLOMT3ZxVGC2KXWW47khtQKA="; }; meta = { description = "Decode ASN.1 content inside VSCode"; @@ -3074,8 +3022,8 @@ let mktplcRef = { name = "vscode-ltex-plus"; publisher = "ltex-plus"; - version = "15.4.0"; - hash = "sha256-ET7ZnXKiT4IAoySMaZn0O2awsKtWMGgnTT7xOEcSim4="; + version = "15.5.1"; + hash = "sha256-BzIJ7gsjcMimLYeVxcvdP0fyIEmwCXxTxqil5o+810w="; }; meta = { description = "VS Code extension for grammar/spell checking using LanguageTool with support for LaTeX, Markdown, and others"; @@ -3119,8 +3067,8 @@ let mktplcRef = { name = "marp-vscode"; publisher = "marp-team"; - version = "3.1.1"; - hash = "sha256-WRhLd5uTy3F2rBf/9emjm9JB5hvRv+dB66vhuqnedwc="; + version = "3.2.0"; + hash = "sha256-SSkmvm9NJnLw38luZWF6K7g5caaivtP+v+39qPR/oyo="; }; meta = { license = lib.licenses.mit; @@ -3133,8 +3081,8 @@ let mktplcRef = { publisher = "matangover"; name = "mypy"; - version = "0.4.1"; - hash = "sha256-hCgOclEnjhWTLMZPXJkoxgFN4pqZ1MKTzmRtjeHbLeU="; + version = "0.4.2"; + hash = "sha256-T0H2JGr1WgSgXbf3aLvjKK0OOh9O+eg9YLs/ydblb9U="; }; meta.license = lib.licenses.mit; }; @@ -3209,8 +3157,8 @@ let mktplcRef = { name = "rainbow-csv"; publisher = "mechatroner"; - version = "3.18.0"; - hash = "sha256-zmIaGvenFU8jiGHGIk3d6dmXO12t+WMwq76OEUbclgg="; + version = "3.19.0"; + hash = "sha256-el3vcF90RZiXrqlBxAko9mLdeoThnwGb/JzmR1woutc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mechatroner.rainbow-csv/changelog"; @@ -3325,12 +3273,14 @@ let }; }; + ms-azuretools.vscode-bicep = callPackage ./ms-azuretools.vscode-bicep { }; + ms-azuretools.vscode-docker = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-azuretools"; name = "vscode-docker"; - version = "1.29.4"; - hash = "sha256-j2ACz2Ww5hddoDLHGdxnuQIqerP5ogZ80/wS+Aa5Gdo="; + version = "1.29.6"; + hash = "sha256-kHQuS6wxp3Gu5WSjWRXXMLwSrv7LBSsnsNu7VY4H/J0="; }; meta = { description = "Docker Extension for Visual Studio Code"; @@ -3349,8 +3299,8 @@ let mktplcRef = { name = "vscode-dotnet-runtime"; publisher = "ms-dotnettools"; - version = "2.3.0"; - hash = "sha256-KfWQpg+qSxrmL4z05pk239i8bY6EMJpu6F48mJbnK08="; + version = "2.3.3"; + hash = "sha256-l+/r0C+BZr8H8qBKenVP3b4qYGR57Lol+Y1Q2XUGl24="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog"; @@ -3368,26 +3318,26 @@ let sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-oQMwzQuW5vjxtDboRCeiEO5aytsAY6rb14JDTmK3JPg="; + hash = "sha256-pmA7BNwyHiaU93j61/MyrBV5kH0DlW+7BA6HNlKGnso="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-/9+qtLDNYUFvdoehit3BihA38p6RqJ7na5Q27xxpZk0="; + hash = "sha256-E2KRzjIxLFmwArzEKittjejacrCOFFNNzphWw8v5CpE="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-JqLlYMKyTXaEzuTPPxVaO8WJiuCUN+9xBzyA6+aYdSc="; + hash = "sha256-pnQP1OKr3NJgUuXzO1InYqGA49OuMFn2iEf8wpl4PqM="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-dhiUePePkO3MxRQ5UP+lOxRax503JlERe/GWJ8pPUIg="; + hash = "sha256-8XIeK5AIFKQaK5YMNSRqxr5p72zXb7ZLPq6PbeWO864="; }; }; in { name = "vscodeintellicode-csharp"; publisher = "ms-dotnettools"; - version = "2.1.11"; + version = "2.2.3"; } // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -3415,8 +3365,8 @@ let mktplcRef = { name = "vscode-kubernetes-tools"; publisher = "ms-kubernetes-tools"; - version = "1.3.20"; - hash = "sha256-83KcESin+w3Y6jiSrSq6iWF99jformxr7NTnYSkKtKQ="; + version = "1.3.23"; + hash = "sha256-8s1fuuTwUPd1Z32EqZNloD50KaFlPOxlvMmo5D6NaE4="; }; meta = { license = lib.licenses.mit; @@ -3638,8 +3588,8 @@ let mktplcRef = { name = "remote-containers"; publisher = "ms-vscode-remote"; - version = "0.404.0"; - hash = "sha256-7rPJruFk3XbDvipIYqYwwsbhofuViXsdtnKihiwRKok="; + version = "0.413.0"; + hash = "sha256-OLi4gSjoz+TRgkb5UH1u6UTNfEF8ZgawrcXFDkoJtIc="; }; meta = { description = "Open any folder or repository inside a Docker container"; @@ -3672,8 +3622,8 @@ let mktplcRef = { name = "remote-wsl"; publisher = "ms-vscode-remote"; - version = "0.88.5"; - hash = "sha256-zTAGRYaOjO1xpfjh6v/lKFM1emR/OexWc1Yo8O5oUgU="; + version = "0.99.0"; + hash = "sha256-zwM4gj11sM00HjaOUFEZ77Vm07iCDwwPmEqiJ97kXL8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ms-vscode-remote.remote-wsl/changelog"; @@ -3742,8 +3692,8 @@ let mktplcRef = { publisher = "mvllow"; name = "rose-pine"; - version = "2.13.0"; - hash = "sha256-GtQq7eTvb1BuNcA5SJpYRaJo7mhevTAT1uBbqXkRURM="; + version = "2.14.0"; + hash = "sha256-bjYumipeZM5tNl/cTHLcm/EyX4FU1AzQU3W53e0cGfc="; }; meta = { license = lib.licenses.mit; @@ -3866,8 +3816,8 @@ let mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.28.2"; - hash = "sha256-j49r7lhJkHZHkeFXTC/hQNLw4ICQ2JW/ahYUVYwLJd4="; + version = "1.30.0"; + hash = "sha256-pQkMhFjqdsrjfsrXz0IbpgR+vnGy8OVW9BC03Nr6SN8="; }; }; @@ -3952,11 +3902,15 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "5.20.0"; - sha256 = "sha256-Z83FXPf8mXcxmzOdk8IG9ZcP/1OYL8pEHEKPc3pZFdo="; + version = "5.22.0"; + hash = "sha256-E9UCSZe0hXnKwdNv6ua/Kzuy+wTFyeOGGVl7gFF4opY="; }; meta = { + description = "Material Design Icons for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items/?itemName=PKief.material-icon-theme"; + homepage = "https://github.com/material-extensions/vscode-material-icon-theme/blob/main/README.md"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.therobot2105 ]; }; }; @@ -3995,8 +3949,8 @@ let mktplcRef = { name = "prisma"; publisher = "Prisma"; - version = "6.5.0"; - hash = "sha256-1aZW8FYFIHsRC3klVHt/0Pp5RteF8XBseuJZuLnRgJE="; + version = "6.8.2"; + hash = "sha256-jortg6SQId1373+4p3Tbej2Q1oz2UhUf+o8xb4PmOVM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; @@ -4057,8 +4011,8 @@ let mktplcRef = { name = "ansible"; publisher = "redhat"; - version = "25.3.1"; - hash = "sha256-1w4B5+WHDJzU4Fz5x2pXDAssRWjZPl79ykTNbk2rQXo="; + version = "25.4.0"; + hash = "sha256-E/BogNtax4dkv6hlYcaRinTxr4jnVyV9hVCdkIkul9s="; }; meta = { description = "Ansible language support"; @@ -4073,8 +4027,8 @@ let mktplcRef = { publisher = "redhat"; name = "java"; - version = "1.41.2025031208"; - hash = "sha256-0VWLkztB7anIs19QN1yPQvVjNim+DICv43IOMwEaM+E="; + version = "1.42.0"; + hash = "sha256-m6RJm8eleMjDNy5ixfXWtOcPmsjNynCUNuF9lsCB8ho="; }; buildInputs = [ jdk ]; meta = { @@ -4092,8 +4046,8 @@ let mktplcRef = { publisher = "redhat"; name = "vscode-xml"; - version = "0.28.2025031108"; - hash = "sha256-SO/Q27v5rzoA5NBp5WJ8S7KcwbGLUmkK2FoaaSb6nYI="; + version = "0.29.0"; + hash = "sha256-I6ZRtt43Qo3m8OfmjkVfBIaNWWvLULlwnJZqIp/WEuI="; }; meta.license = lib.licenses.epl20; }; @@ -4102,8 +4056,8 @@ let mktplcRef = { publisher = "redhat"; name = "vscode-yaml"; - version = "1.17.0"; - hash = "sha256-u3smLk5yCT9DMtFnrxh5tKbfDQ2XbL6bl2bXGOD38X0="; + version = "1.18.0"; + hash = "sha256-UtxDplORUWqmiW6I8n4ZhK7HAQdSDG4dw7M/cbjkmZY="; }; meta = { description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support"; @@ -4302,8 +4256,8 @@ let mktplcRef = { name = "sas-lsp"; publisher = "SAS"; - version = "1.13.1"; - hash = "sha256-Ol79+z/W4RzAQ0jjDMkxPrg8eOWanOqtIF7ZxNrskOk="; + version = "1.14.0"; + hash = "sha256-layaVQGcIOS8tToHt99yjaFlrw0hsOoiUW66FPJz+AY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog"; @@ -4331,8 +4285,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.48.0"; - hash = "sha256-GtlVj/XvnlsLQb8PwXl6S2OW0mOl8SCR3N76zhZBwxA="; + version = "1.50.0"; + hash = "sha256-vMO1u8w4uQc0mvgB3az4G+QnwRwsz5d1+LpDGEShyDw="; }; meta = { license = lib.licenses.asl20; @@ -4433,8 +4387,8 @@ let mktplcRef = { publisher = "shopify"; name = "ruby-lsp"; - version = "0.9.13"; - hash = "sha256-Lde17QPuaubrvomwZjWA9f34/Dn0qyG5MQxMLJFWBQ8="; + version = "0.9.24"; + hash = "sha256-nlPqdn7tOQhr4Z/8N0aHAnkqKtYrpQCzwRGsseT8K5g="; }; meta = { description = "VS Code plugin for connecting with the Ruby LSP"; @@ -4550,8 +4504,8 @@ let mktplcRef = { publisher = "sonarsource"; name = "sonarlint-vscode"; - version = "4.18.0"; - hash = "sha256-+2aeJhIwH6oiRQcPK714u8IiU3QKwhQOB0xgmsf4DXw="; + version = "4.22.0"; + hash = "sha256-E50BmbYgm9w+jpr8m8BdZcOuCtPhpmhXTBhbx/tsips="; }; meta.license = lib.licenses.lgpl3Only; }; @@ -4607,8 +4561,8 @@ let mktplcRef = { name = "vscode-tmux-keybinding"; publisher = "stephlin"; - version = "0.0.7"; - hash = "sha256-MrW0zInweAhU2spkEEiDLyuT6seV3GFFurWTqYMzqgY="; + version = "1.0.0"; + hash = "sha256-ZV5iyZ8pkTG9RPGObFtGbU5Iq7w/cDlUMuOVskg/39g="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/stephlin.vscode-tmux-keybinding/changelog"; @@ -4641,8 +4595,8 @@ let mktplcRef = { publisher = "streetsidesoftware"; name = "code-spell-checker"; - version = "4.0.41"; - hash = "sha256-M/uqzU64nqSdRtxxQ1H+pg0YdkqYXEHlxmXrVcn/UqA="; + version = "4.0.47"; + hash = "sha256-g9r8I909ge44JfBRm1JBHFluXr9H8zl0ERqkwoxtQaI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -4654,6 +4608,10 @@ let }; }; + streetsidesoftware.code-spell-checker-french = + callPackage ./streetsidesoftware.code-spell-checker-french + { }; + streetsidesoftware.code-spell-checker-german = callPackage ./streetsidesoftware.code-spell-checker-german { }; @@ -4717,8 +4675,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "109.5.3"; - hash = "sha256-wbU1euQmFyHOEHq2y2JvcAZeV4eee9pM0NKZnSgkRKU="; + version = "109.8.0"; + hash = "sha256-T0pNjjeKKX/T1Oc+zvOHu74H4r4F9Ogk5gDV7z0+D9I="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -4751,8 +4709,8 @@ let mktplcRef = { name = "tabnine-vscode"; publisher = "tabnine"; - version = "3.249.0"; - hash = "sha256-Pp1LlVAkozh2kIEvmPxg4LuuT08MeGbMN77M5Mx81qI="; + version = "3.271.0"; + hash = "sha256-+lNWQOfmoxT6+j+oqT4Z2QTYWSJbVwSukxEx4fwXqPc="; }; meta = { license = lib.licenses.mit; @@ -4862,8 +4820,12 @@ let }; }; + tecosaur.latex-utilities = callPackage ./tecosaur.latex-utilities { }; + tekumara.typos-vscode = callPackage ./tekumara.typos-vscode { }; + teros-technology.teroshdl = callPackage ./teros-technology-teroshdl { }; + theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-pascal"; @@ -4923,8 +4885,8 @@ let mktplcRef = { name = "helm-intellisense"; publisher = "Tim-Koehler"; - version = "0.14.3"; - hash = "sha256-TcXn8n6mKEFpnP8dyv+nXBjsyfUfJNgdL9iSZwA5eo0="; + version = "0.15.0"; + hash = "sha256-Tl0X2jtgTsjf2tvyAJLGxEGrmLXACYWWErcDJuQYg+o="; }; meta = { description = "Extension to help writing Helm-Templates by providing intellisense"; @@ -5038,8 +5000,8 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.61"; - hash = "sha256-cKiIva4nzROp+bbwkMxBvguLMXVe/9uGcdhVhLxmae0="; + version = "0.0.64"; + hash = "sha256-mASTMZhXsM8IzaMmHsWRmf+pf1EjXyWsBMFXTcq7Acw="; }; meta = { description = "VSCode language extension for Uiua"; @@ -5076,8 +5038,8 @@ let mktplcRef = { name = "vscode-mdx"; publisher = "unifiedjs"; - version = "1.8.13"; - hash = "sha256-QTIDs+HVnM+zJ3jqhiBhUTsrI44kaHInYDXLXMC1/9E="; + version = "1.8.14"; + hash = "sha256-kIQPvmLkqZa3jPxIfJ3LDyIvr5yXQTsO7uzzvFa9EJM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog"; @@ -5092,8 +5054,8 @@ let mktplcRef = { name = "errorlens"; publisher = "usernamehw"; - version = "3.24.0"; - hash = "sha256-r5xXR4rDbP+2bk66yqPoLod8IZXFrntcKHuWbAiFWwE="; + version = "3.26.0"; + hash = "sha256-pAkk3QURnlLNMZ2cFBks2lAEl/Hk8Z2i/QgvjUv+u2Y="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; @@ -5105,7 +5067,7 @@ let }; }; - vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb { llvmPackages = llvmPackages_14; }; + vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb { }; valentjn.vscode-ltex = vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { @@ -5201,8 +5163,8 @@ let mktplcRef = { name = "vstuc"; publisher = "VisualStudioToolsForUnity"; - version = "1.1.1"; - hash = "sha256-iE/o6hkDwT7jLTVvJbviQZgV+KnhSAGEZ2mf3gsua38="; + version = "1.1.2"; + hash = "sha256-Haai7sTGAreO7cUvSIc12bQl7WwQl+waJumYOvpVJ7M="; }; meta = { description = "Integrates Visual Studio Code for Unity"; @@ -5292,8 +5254,8 @@ let mktplcRef = { publisher = "vscjava"; name = "vscode-java-test"; - version = "0.43.0"; - hash = "sha256-EM0S1Y4cRMBCRbAZgl9m6fIhANPrvdGVZXOLlDLnVWo="; + version = "0.43.1"; + hash = "sha256-yiKBG1A5ahvB6iTqh2yzFzcKJlU1lu4dqd+4cygWVQ4="; }; meta = { license = lib.licenses.mit; @@ -5344,8 +5306,8 @@ let mktplcRef = { name = "vscode-icons"; publisher = "vscode-icons-team"; - version = "12.12.0"; - hash = "sha256-C73ZpmVJ9ltzbfV3LmawV2X/2e+e1F3dxaYZzKMBZdQ="; + version = "12.13.0"; + hash = "sha256-HghVnyYLUcC54PNYgqFypZqiynqWzT6l/ihyClUvH0c="; }; meta = { description = "Bring real icons to your Visual Studio Code"; @@ -5360,8 +5322,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.29.0"; - hash = "sha256-J3V8SZJZ2LSL8QfdoOtHI1ZDmGDVerTRYP4NZU17SeQ="; + version = "1.29.2"; + hash = "sha256-RBh4yQxOoUpwNKedFjEeu6hO0tU9AAPlDrt2LhgZT50="; }; meta = { license = lib.licenses.mit; @@ -5384,8 +5346,8 @@ let mktplcRef = { name = "volar"; publisher = "Vue"; - version = "2.2.8"; - hash = "sha256-efEeTq/y4al38Tdut3bHVdluf3tUYqc6CFPX+ch1gLg="; + version = "2.2.10"; + hash = "sha256-cQxDoKDfzifcGTkhS8rC+JUQofbxMfXmkJF1CwiU1nc="; }; meta = { changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md"; @@ -5492,6 +5454,23 @@ let }; }; + woberg.godot-dotnet-tools = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "woberg"; + name = "godot-dotnet-tools"; + version = "0.5.1"; + hash = "sha256-qZdQiW1RvzUR5+5QlVdMPBY82IOPUPs3GNOl6bOhnWM="; + }; + meta = { + description = "VSCode extension for Godot 4 Mono supporting C# language"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=woberg.godot-dotnet-tools"; + homepage = "https://github.com/williamoberg/godot-dotnet-tools"; + license = lib.licenses.mit; + # For instructions on configuring this extension see: + # https://wiki.nixos.org/wiki/Godot-Mono + }; + }; + xadillax.viml = buildVscodeMarketplaceExtension { mktplcRef = { name = "viml"; @@ -5521,8 +5500,8 @@ let mktplcRef = { name = "php-debug"; publisher = "xdebug"; - version = "1.35.0"; - hash = "sha256-HQYxQPKirPCnje2lrOFprBG3ha7YaV5iytmeI8CTQJU="; + version = "1.36.1"; + hash = "sha256-4r3mf7q6n1b/cVYIGZyRNK5nEAJYzTz4cJrKNH+R01s="; }; meta = { description = "PHP Debug Adapter"; @@ -5562,6 +5541,8 @@ let }; }; + yy0931.vscode-sqlite3-editor = callPackage ./yy0931.vscode-sqlite3-editor { }; + yzane.markdown-pdf = callPackage ./yzane.markdown-pdf { }; yzhang.dictionary-completion = buildVscodeMarketplaceExtension { @@ -5681,8 +5662,8 @@ let mktplcRef = { name = "vscode-zig"; publisher = "ziglang"; - version = "0.6.7"; - hash = "sha256-l8pu348v2JUg/7+Qy5B41eyraPUj9WQ1WuW1aumgM9w="; + version = "0.6.9"; + hash = "sha256-R18NnnsYVLmCNdGU0plIYn2MKrlSedfJoXH/amxKKaY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix new file mode 100644 index 000000000000..8304dd57ee0e --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix @@ -0,0 +1,37 @@ +{ + jq, + lib, + moreutils, + vscode-utils, + nodePackages, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "prettier-vscode"; + publisher = "esbenp"; + version = "11.0.0"; + hash = "sha256-pNjkJhof19cuK0PsXJ/Q/Zb2H7eoIkfXJMLZJ4lDn7k="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ nodePackages.prettier ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."prettier.prettierPath".default = "${nodePackages.prettier}/lib/node_modules/prettier"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; + description = "Code formatter using prettier"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; + homepage = "https://github.com/prettier/prettier-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix index 2390eef07340..d3042ed6447b 100644 --- a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix +++ b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "fstar-vscode-assistant"; publisher = "FStarLang"; - version = "0.17.1"; - hash = "sha256-8Lbb1XPtcd6JHZnlLRQggbVJfynJaK2DQ/XhHy+3joE="; + version = "0.17.2"; + hash = "sha256-xbzjU99j8W8JgGDTEM8oHCrKdex+5vL+Okw6e0Okt7M="; }; meta = { description = "An interactive editing mode VS Code extension for F*"; diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix new file mode 100644 index 000000000000..7453f8f2fc69 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "github"; + name = "copilot-chat"; + version = "0.27.1"; + hash = "sha256-HXzPI8B4wISly2SQNdbFO6CEREfhey+SH4HhutxH7Mg="; + }; + + meta = { + description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot-chat"; + homepage = "https://github.com/features/copilot"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.laurent-f1z1 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix new file mode 100644 index 000000000000..d1f2617f1775 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "github"; + name = "copilot"; + version = "1.322.0"; + hash = "sha256-PekZQeRqpCSSVQe+AA0XLAwC3K0LGtRMbfnN7MxfmGA="; + }; + + meta = { + description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; + homepage = "https://github.com/features/copilot"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.Zimmi48 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix index b2c61f1b0867..d6a72f85ceef 100644 --- a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix +++ b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix @@ -7,14 +7,13 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.19.0"; - hash = "sha256-k/fcEJuELz0xkwivSrP6Nxtz861BLq1wR2ZDMXVrvkY="; + version = "2.34.3"; + hash = "sha256-kE9xH0cp741aCqhrwFDW+lQxOAsdLNzCCOTWMxd+li0="; }; - patches = [ ./fix-terraform-ls.patch ]; - postPatch = '' - substituteInPlace out/serverPath.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls + substituteInPlace dist/extension.js \ + --replace-fail 'this.customBinPath=Ga("terraform").get("languageServer.path")' 'this.customBinPath = Ga("terraform").get("languageServer.path") || '${terraform-ls}/bin/terraform-ls';' ''; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/fix-terraform-ls.patch b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/fix-terraform-ls.patch deleted file mode 100644 index e2dcd0b70aa9..000000000000 --- a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/fix-terraform-ls.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/out/serverPath.js b/out/serverPath.js -index fafa915..2e6d376 100644 ---- a/out/serverPath.js -+++ b/out/serverPath.js -@@ -18,7 +18,13 @@ exports.CUSTOM_BIN_PATH_OPTION_NAME = 'languageServer.pathToBinary'; - class ServerPath { - constructor(context) { - this.context = context; -- this.customBinPath = vscode.workspace.getConfiguration('terraform').get(exports.CUSTOM_BIN_PATH_OPTION_NAME); -+ -+ const customBinPath = vscode.workspace.getConfiguration('terraform').get(exports.CUSTOM_BIN_PATH_OPTION_NAME); -+ if (!customBinPath) { -+ this.customBinPath = 'TERRAFORM-LS-PATH'; -+ } else { -+ this.customBinPath = customBinPath; -+ } - } - installPath() { - return path.join(this.context.globalStorageUri.fsPath, INSTALL_FOLDER_NAME); diff --git a/pkgs/applications/editors/vscode/extensions/huacnlee.autocorrect/default.nix b/pkgs/applications/editors/vscode/extensions/huacnlee.autocorrect/default.nix new file mode 100644 index 000000000000..30f347892bf8 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/huacnlee.autocorrect/default.nix @@ -0,0 +1,20 @@ +{ + lib, + vscode-utils, +}: +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "autocorrect"; + publisher = "huacnlee"; + version = "2.6.4"; + hash = "sha256-1cN36FnslttmH66J4Xah1KohM2nEQckNUXHZD+ps2uY="; + }; + + meta = { + description = "AutoCorrect is a linter and formatter to help you to improve copywriting, correct spaces, words, and punctuations between CJK (Chinese, Japanese, Korean)."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=huacnlee.autocorrect"; + homepage = "https://github.com/huacnlee/autocorrect"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.therobot2105 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix index 6eab196c383f..f620571b6f51 100644 --- a/pkgs/applications/editors/vscode/extensions/language-packs.nix +++ b/pkgs/applications/editors/vscode/extensions/language-packs.nix @@ -3,7 +3,7 @@ vscode-utils, writeShellScript, nix-update, - vscode-extensions-update, + vscode-extension-update, }: with vscode-utils; @@ -13,7 +13,7 @@ let buildVscodeLanguagePack = { language, - version ? "1.98.2025031209", + version ? "1.99.2025041609", hash, }: buildVscodeMarketplaceExtension { @@ -24,8 +24,8 @@ let }; passthru.updateScript = lib.optionalAttrs (language == "fr") ( writeShellScript "vscode-language-packs-update-script" '' - ${lib.getExe vscode-extensions-update} vscode-extensions.ms-ceintl.vscode-language-pack-fr --override-filename "pkgs/applications/editors/vscode/extensions/language-packs.nix" - for lang in cs de es it ja ko pt-br qps-ploc ru tr zh-hans zh-hant; do + ${lib.getExe vscode-extension-update} vscode-extensions.ms-ceintl.vscode-language-pack-fr --override-filename "pkgs/applications/editors/vscode/extensions/language-packs.nix" + for lang in cs de es it ja ko pl pt-br qps-ploc ru tr zh-hans zh-hant; do ${lib.getExe nix-update} --version "skip" "vscode-extensions.ms-ceintl.vscode-language-pack-$lang" --override-filename "pkgs/applications/editors/vscode/extensions/language-packs.nix" done '' @@ -41,66 +41,71 @@ in # French vscode-language-pack-fr = buildVscodeLanguagePack { language = "fr"; - hash = "sha256-ulFnHulIa1T+WdlXa000cYDY/SWGcA9W/uLZrP5l40Q="; + hash = "sha256-c4p/wVQ9GIxEkF/82ZZpRKxem7IVMK3AzCI/YfZKF4U="; }; # Italian vscode-language-pack-it = buildVscodeLanguagePack { language = "it"; - hash = "sha256-o9EwOKuFVqB1gJvCh4S5ArwQDN21a3zhLBsCpeztUhU="; + hash = "sha256-ftAYkS5WRSqc+rB901J7X8IRE+XuqtIdRiBJfEKumQ8="; }; # German vscode-language-pack-de = buildVscodeLanguagePack { language = "de"; - hash = "sha256-x20EJ6YfMT59bk8o8LYDqQgyOmI1NH/Jq2zjtrUHOt8="; + hash = "sha256-37pDfoFi4QPOBP9vYPw/+zOXDOluuEojI6ZSYsiwv64="; }; # Spanish vscode-language-pack-es = buildVscodeLanguagePack { language = "es"; - hash = "sha256-MerP4/WBKj/TauDnQcWv0YCFh9JA1ce0jHiFAvt5NdI="; + hash = "sha256-IASRtQag6wuNmKtes7L6i0coLluo6ryRW4lUEgQAiz4="; }; # Russian vscode-language-pack-ru = buildVscodeLanguagePack { language = "ru"; - hash = "sha256-0Z4jSiP16EDFyHwQAgvFpMh5F8tCu74hUojXH5EK66o="; + hash = "sha256-H8UxMc1FKkfWOcITdwYrI6giD11Sk4YN2er+wnnFvBs="; }; # Chinese (Simplified) vscode-language-pack-zh-hans = buildVscodeLanguagePack { language = "zh-hans"; - hash = "sha256-CQtb7FJGR2JVznbEYVN76IywQopwZ6TzWjxE1as7WWE="; + hash = "sha256-3yvzcJXdTIYbBNBaiuW92UYADSUeYPm3clSpSM3k71w="; }; # Chinese (Traditional) vscode-language-pack-zh-hant = buildVscodeLanguagePack { language = "zh-hant"; - hash = "sha256-LmBcWZlyAVvXoa5sZ4gpWBkBZD+5AKkFZqSs4zXkCwc="; + hash = "sha256-AiZYIoE2wdiRXdJVpOTnj0vFJH5UsYh8k5tf/0lNqVY="; }; # Japanese vscode-language-pack-ja = buildVscodeLanguagePack { language = "ja"; - hash = "sha256-4tj4wTCOnC2KpHWN86EZl5KmNl2QLXb7Co1aYwRZ7uY="; + hash = "sha256-96bavTK4JNYk6tfDxnzujHA5V3a1/AL7PTnrNZsyiXU="; }; # Korean vscode-language-pack-ko = buildVscodeLanguagePack { language = "ko"; - hash = "sha256-NmSSijvWckFiyyQBo+2Lv70YsqOYR/5kHP4iiqaQUZU="; + hash = "sha256-NEkFv+I0TmK9wvfQ9Wc34Q0EnzrHuccQypIAVVYoofY="; }; # Czech vscode-language-pack-cs = buildVscodeLanguagePack { language = "cs"; - hash = "sha256-Q8jSCYzl/DXasi0n228Kd7Ru0z1Bb/ovTySAYCV42pg="; + hash = "sha256-U1loNdDlYC8ahsy2xdeE/zBs/EhAo/DvoUI0rFFCA88="; }; # Portuguese (Brazil) vscode-language-pack-pt-br = buildVscodeLanguagePack { language = "pt-BR"; - hash = "sha256-PJPeTn+0g1s+L7t9d6A/hyrBEF0EE/QKshHa3vuQZxU="; + hash = "sha256-M02Q5HNCkT1Se+AuJXDNz3YfT9+kyuUTvosqor4bZ4k="; }; # Turkish vscode-language-pack-tr = buildVscodeLanguagePack { language = "tr"; - hash = "sha256-+M43EdHHsmw1pJopLi0nMIGwcxk6+LeVvZjkxnxUatI="; + hash = "sha256-ieYvmzK+5QmcwKSXK4X+NQQfd4OCf6IAKuepYByq4b8="; + }; + # Polish + vscode-language-pack-pl = buildVscodeLanguagePack { + language = "pl"; + hash = "sha256-DhhlFKICXWjC+c0POuO9upCD0DSzEJ6shkQoK/oTeM4="; }; # Pseudo Language vscode-language-pack-qps-ploc = buildVscodeLanguagePack { language = "qps-ploc"; - hash = "sha256-2ERwup1z7wGVwoGfakV0oCADxXWfWbYxlkQ6iJYgXkc="; + hash = "sha256-mpKx+rluYIuKmpvJVJH6uBPTk6OHBzCIpE7KpOskuEE="; }; } diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index 531be9bba85e..830d23ef8ddf 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.12.1"; - hash = "sha256-jbR6NGYgDYArCHqMHKPXuht7UViw0Ii3Uc8IqTGTe8k="; + version = "1.13.2"; + hash = "sha256-XgDFiB0LaHNC8Z9+pug6f+x/MGwtkm7a49pyfIBKkwo="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix new file mode 100644 index 000000000000..2b8a3b4a72fa --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix @@ -0,0 +1,59 @@ +{ + azure-cli, + bicep, + bicep-lsp, + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "ms-azuretools"; + name = "vscode-bicep"; + version = "0.35.1"; + hash = "sha256-Ggp3Z3pxPMEDxgzjPYNr830wx+upkBP4YAbKiOivbYs="; + }; + + buildInputs = [ + azure-cli + bicep + bicep-lsp + ]; + + meta = { + description = "Visual Studio Code extension for Bicep language"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-bicep"; + homepage = "https://github.com/Azure/bicep/tree/main/src/vscode-bicep"; + license = lib.licenses.mit; + teams = [ lib.teams.stridtech ]; + }; +} + +# Instructions on Usage +# +# programs.vscode = { +# enable = true; +# package = pkgs.codium; +# profiles.default = { +# "dotnetAcquisitionExtension.sharedExistingDotnetPath" = "${pkgs.dotnet-sdk_8}/bin/dotnet"; +# "dotnetAcquisitionExtension.existingDotnetPath" = [ +# { +# "extensionId" = "ms-dotnettools.csharp"; +# "path" = "${pkgs.dotnet-sdk_8}/bin/dotnet"; +# } +# { +# "extensionId" = "ms-dotnettools.csdevkit"; +# "path" = "${pkgs.dotnet-sdk_8}/bin/dotnet"; +# } +# { +# "extensionId" = "ms-azuretools.vscode-bicep"; +# "path" = "${pkgs.dotnet-sdk_8}/bin/dotnet"; +# } +# ]; +# extensions = with pkgs.vscode-extensions; [ +# ms-azuretools.vscode-bicep +# ms-dotnettools.csdevkit +# ms-dotnettools.csharp +# ms-dotnettools.vscode-dotnet-runtime +# ]; +# }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index 1f5b3bb39bff..c63008ac40e1 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -8,46 +8,53 @@ libz, glibc, libxml2, + libkrb5, + patchelf, }: let - inherit (stdenv.hostPlatform) system; - inherit (vscode-utils) buildVscodeMarketplaceExtension; - - lockfile = lib.importJSON ./lockfile.json; - extInfo = - (arch: { - inherit arch; - inherit (lockfile.${arch}) hash binaries; - }) - ( - { - x86_64-linux = "linux-x64"; - aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; - aarch64-darwin = "darwin-arm64"; - } - .${system} or (throw "Unsupported system: ${system}") - ); + extInfo = ( + { + x86_64-linux = { + arch = "linux-x64"; + hash = "sha256-XHx64V8JJl+/kb+kkTowu7mE7ysBRhUQJqicxjbHM3k="; + }; + aarch64-linux = { + arch = "linux-arm64"; + hash = "sha256-Pm3jUARrH8bksiCpYtUvo0UB3Oq67EjJGYLGLV54rl4="; + }; + x86_64-darwin = { + arch = "darwin-x64"; + hash = "sha256-hgd7tpRn2WP0PL4IOpZLL6Uzw1V9rSqlOTDfgFxwWGk="; + }; + aarch64-darwin = { + arch = "darwin-arm64"; + hash = "sha256-PQPxwwHbLXa5+p/SfH4IFu/OBEa/1CKdfaM+HAegiDA="; + }; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") + ); in -buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csdevkit"; publisher = "ms-dotnettools"; - inherit (lockfile) version; + version = "1.19.63"; inherit (extInfo) hash arch; }; sourceRoot = "extension"; # This has more than one folder. - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - (lib.getLib stdenv.cc.cc) # libstdc++.so.6 - (lib.getLib glibc) # libgcc_s.so.1 - (lib.getLib libxml2) # libxml2.so.2 + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + patchelf ]; - runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ - (lib.getLib openssl) # libopenssl.so.3 + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + (lib.getLib glibc) # libgcc_s.so.1 (lib.getLib icu) # libicui18n.so libicuuc.so + (lib.getLib libkrb5) # libgssapi_krb5.so + (lib.getLib libxml2) # libxml2.so.2 (lib.getLib libz) # libz.so.1 + (lib.getLib openssl) # libopenssl.so.3 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 ]; postPatch = '' @@ -56,12 +63,67 @@ buildVscodeMarketplaceExtension { substituteInPlace dist/extension.js \ --replace-fail 'e.extensionPath,"cache"' 'require("os").tmpdir(),"'"$ext_unique_id"'"' \ - --replace-fail 't.setExecuteBit=async function(e){if("win32"!==process.platform){const t=o.join(e[a.SERVICEHUB_CONTROLLER_COMPONENT_NAME],"Microsoft.ServiceHub.Controller"),r=o.join(e[a.SERVICEHUB_HOST_COMPONENT_NAME],(0,a.getServiceHubHostEntrypointName)()),n=[(0,a.getServerPath)(e),t,r,(0,c.getReliabilityMonitorPath)(e)];await Promise.all(n.map((e=>(0,i.chmod)(e,"0755"))))}}' 't.setExecuteBit=async function(e){}' - - chmod +x ${lib.escapeShellArgs extInfo.binaries} + --replace-fail 't.setExecuteBit=async function(e){if("win32"!==process.platform){const t=i.join(e[a.SERVICEHUB_CONTROLLER_COMPONENT_NAME],"Microsoft.VisualStudio.Code.ServiceController"),r=i.join(e[a.SERVICEHUB_HOST_COMPONENT_NAME],(0,a.getServiceHubHostEntrypointName)()),n=[(0,a.getServerPath)(e),t,r,(0,c.getReliabilityMonitorPath)(e)];await Promise.all(n.map((e=>(0,o.chmod)(e,"0755"))))}}' 't.setExecuteBit=async function(e){}' ''; - passthru.updateScript = ./update.sh; + preFixup = '' + ( + set -euo pipefail + shopt -s globstar + shopt -s dotglob + + # Fix all binaries. + for file in "$out"/**/*; do + if [[ ! -f "$file" || "$file" == *.so || "$file" == *.a || "$file" == *.dylib ]] || + (! isELF "$file" && ! isMachO "$file"); then + continue + fi + + echo Making "$file" executable... + chmod +x "$file" + + ${lib.optionalString stdenv.hostPlatform.isLinux '' + # Add .NET deps if it is an apphost. + if grep 'You must install .NET to run this application.' "$file" > /dev/null; then + echo "Adding .NET needed libraries to: $file" + patchelf \ + --add-needed libicui18n.so \ + --add-needed libicuuc.so \ + --add-needed libgssapi_krb5.so \ + --add-needed libssl.so \ + "$file" + fi + ''} + done + + ${lib.optionalString stdenv.hostPlatform.isLinux '' + # Add the ICU libraries as needed to the globalization DLLs. + for file in "$out"/**/{libcoreclr.so,*System.Globalization.Native.so}; do + echo "Adding ICU libraries to: $file" + patchelf \ + --add-needed libicui18n.so \ + --add-needed libicuuc.so \ + "$file" + done + + # Add the Kerberos libraries as needed to the native security DLL. + for file in "$out"/**/*System.Net.Security.Native.so; do + echo "Adding Kerberos libraries to: $file" + patchelf \ + --add-needed libgssapi_krb5.so \ + "$file" + done + + # Add the OpenSSL libraries as needed to the OpenSSL native security DLL. + for file in "$out"/**/*System.Security.Cryptography.Native.OpenSsl.so; do + echo "Adding OpenSSL libraries to: $file" + patchelf \ + --add-needed libssl.so \ + "$file" + done + ''} + ) + ''; meta = { changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.csdevkit/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json deleted file mode 100644 index 0907b601296f..000000000000 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "version": "1.16.6", - "linux-x64": { - "hash": "sha256-/ONaevRlpGc4xaYr9vV8maZUP3HbjmgUk/AbXAJM4tg=", - "binaries": [ - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller", - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost", - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-x64/Microsoft.VisualStudio.Reliability.Monitor", - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-server.linux-x64/Microsoft.VisualStudio.Code.Server" - ] - }, - "linux-arm64": { - "hash": "sha256-yhzozbnTsAddbx0Hior/DnN+vjRFWtIW8Z4zu1xfrhY=", - "binaries": [ - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller", - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost", - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-arm64/Microsoft.VisualStudio.Reliability.Monitor", - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-server.linux-arm64/Microsoft.VisualStudio.Code.Server" - ] - }, - "darwin-x64": { - "hash": "sha256-PZwhzd9yVAJiVz5g7ogICUIgwJvS2MyGQMZbNN+7QRM=", - "binaries": [ - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller", - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost", - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-x64/Microsoft.VisualStudio.Reliability.Monitor", - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-server.darwin-x64/Microsoft.VisualStudio.Code.Server" - ] - }, - "darwin-arm64": { - "hash": "sha256-iR0jJnkcA12+CJUI0ECrRSR2+j2emtfmLt2Uz4ke7YY=", - "binaries": [ - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller", - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost", - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-arm64/Microsoft.VisualStudio.Reliability.Monitor", - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-server.darwin-arm64/Microsoft.VisualStudio.Code.Server" - ] - } -} diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/update.sh b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/update.sh deleted file mode 100755 index 650381998541..000000000000 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/update.sh +++ /dev/null @@ -1,157 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl coreutils jq nix unzip -# shellcheck shell=bash -set -euo pipefail -shopt -s globstar - -export LC_ALL=C - -PUBLISHER=ms-dotnettools -EXTENSION=csdevkit -LOCKFILE=pkgs/applications/editors/vscode/extensions/$PUBLISHER.$EXTENSION/lockfile.json - -response=$(curl -s 'https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery' \ - -H 'accept: application/json;api-version=3.0-preview.1' \ - -H 'content-type: application/json' \ - --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"'"$PUBLISHER.$EXTENSION"'"}]}],"flags":16}') - -# Find the latest version compatible with stable vscode version -latest_version=$(jq --raw-output ' -.results[0].extensions[0].versions -| map(select(has("properties"))) -| map(select(.properties | map(select(.key == "Microsoft.VisualStudio.Code.Engine")) | .[0].value | test("\\^[0-9.]+$"))) -| map(select(.properties | map(select(.key == "Microsoft.VisualStudio.Code.PreRelease")) | .[0].value != "true")) -| .[0].version' <<<"$response") - -current_version=$(jq '.version' --raw-output <"$LOCKFILE") - -if [[ "$latest_version" == "$current_version" ]]; then - echo "Package is up to date." >&2 - exit 1 -fi - -# Return success if the specified file is an ELF object. -isELF() { - local fn="$1" - local fd - local magic - exec {fd}<"$fn" - read -r -n 4 -u "$fd" magic - exec {fd}<&- - if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi -} - -# Return success if the specified file is a Mach-O object. -isMachO() { - local fn="$1" - local fd - local magic - exec {fd}<"$fn" - read -r -n 4 -u "$fd" magic - exec {fd}<&- - - # nix uses 'declare -F' in get-env.sh to retrieve the loaded functions. - # If we use the $'string' syntax instead of 'echo -ne' then 'declare' will print the raw characters and break nix. - # See https://github.com/NixOS/nixpkgs/pull/138334 and https://github.com/NixOS/nix/issues/5262. - - # https://opensource.apple.com/source/lldb/lldb-310.2.36/examples/python/mach_o.py.auto.html - if [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xcf") || "$magic" = $(echo -ne "\xcf\xfa\xed\xfe") ]]; then - # MH_MAGIC_64 || MH_CIGAM_64 - return 0 - elif [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xce") || "$magic" = $(echo -ne "\xce\xfa\xed\xfe") ]]; then - # MH_MAGIC || MH_CIGAM - return 0 - elif [[ "$magic" = $(echo -ne "\xca\xfe\xba\xbe") || "$magic" = $(echo -ne "\xbe\xba\xfe\xca") ]]; then - # FAT_MAGIC || FAT_CIGAM - return 0 - else - return 1 - fi -} - -getDownloadUrl() { - nix-instantiate \ - --eval \ - --strict \ - --json \ - pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix \ - --attr url \ - --argstr publisher $PUBLISHER \ - --argstr name $EXTENSION \ - --argstr version "$latest_version" \ - --argstr arch "$1" | jq . --raw-output -} - -TEMP=$(mktemp --directory --tmpdir) -OUTPUT="$TEMP/lockfile.json" -trap 'rm -r "$TEMP"' EXIT - -HASH= -BINARIES=() -fetchMarketplace() { - arch="$1" - - echo " Downloading VSIX..." - if ! curl -sLo "$TEMP/$arch".zip "$(getDownloadUrl "$arch")"; then - echo " Failed to download extension for arch $arch" >&2 - exit 1 - fi - - HASH=$(nix hash file --type sha256 --sri "$TEMP/$arch".zip) - BINARIES=() - - echo " Extracting VSIX..." - mkdir "$TEMP/$arch" - if ! unzip "$TEMP/$arch".zip -d "$TEMP/$arch" >/dev/null; then - echo " Failed to unzip extension for arch $arch" >&2 - file "$TEMP/$arch".zip >&2 - exit 1 - fi - - echo " Listing binaries..." - for file in "$TEMP/$arch"/**/*; do - if [[ ! -f "$file" || "$file" == *.so || "$file" == *.dylib ]] || - (! isELF "$file" && ! isMachO "$file"); then - continue - fi - - echo " FOUND: ${file#"$TEMP/$arch/extension/"}" - BINARIES+=("${file#"$TEMP/$arch/extension/"}") - done - rm -r "${TEMP:?}/$arch" -} - -cat >"$OUTPUT" <>"$OUTPUT" - fi - firstArch=false - - echo "Getting data for $arch..." - fetchMarketplace "$arch" - - cat >>"$OUTPUT" <>"$OUTPUT" - fi - firstBin=false - - echo -n " \"$binary\"" >>"$OUTPUT" - done - echo -ne '\n ]\n }' >>"$OUTPUT" -done -echo -e '\n}' >>"$OUTPUT" - -mv "$OUTPUT" "$LOCKFILE" diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 9b4fcddebf1b..9581bd107502 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -7,61 +7,137 @@ openssl, libz, glibc, + libkrb5, coreutils, + jq, + patchelf, }: let - inherit (stdenv.hostPlatform) system; - inherit (vscode-utils) buildVscodeMarketplaceExtension; - - lockfile = lib.importJSON ./lockfile.json; - extInfo = - (arch: { - inherit arch; - inherit (lockfile.${arch}) hash binaries; - }) - ( - { - x86_64-linux = "linux-x64"; - aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; - aarch64-darwin = "darwin-arm64"; - } - .${system} or (throw "Unsupported system: ${system}") - ); + extInfo = ( + { + x86_64-linux = { + arch = "linux-x64"; + hash = "sha256-yJ4bAxIg3yfQJPWJcl6jUMwQ/ssHkstJWuEp3wr0dDA="; + }; + aarch64-linux = { + arch = "linux-arm64"; + hash = "sha256-EpWHwansBwBD0aYoW2ek7iWFbp+s7ZH6ug3ejoSRG5U="; + }; + x86_64-darwin = { + arch = "darwin-x64"; + hash = "sha256-345hK47tyMGMJDKiujwpECDHMbRpLi17x2lH2rMX9Lg="; + }; + aarch64-darwin = { + arch = "darwin-arm64"; + hash = "sha256-u/vflQd285SuZ41ASd8nJgs+lN6892J3x6lPgWqVY+Y="; + }; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") + ); in -buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - inherit (lockfile) version; + version = "2.76.27"; inherit (extInfo) hash arch; }; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - (lib.getLib stdenv.cc.cc) # libstdc++.so.6 - (lib.getLib glibc) # libgcc_s.so.1 - (lib.getLib libz) # libz.so.1 + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + jq + patchelf ]; - runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ - (lib.getLib openssl) # libopenssl.so.3 + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + (lib.getLib glibc) # libgcc_s.so.1 (lib.getLib icu) # libicui18n.so libicuuc.so + (lib.getLib libkrb5) # libgssapi_krb5.so (lib.getLib libz) # libz.so.1 + (lib.getLib openssl) # libopenssl.so.3 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 ]; postPatch = '' substituteInPlace dist/extension.js \ --replace-fail 'uname -m' '${lib.getExe' coreutils "uname"} -m' - - chmod +x ${lib.escapeShellArgs extInfo.binaries} ''; - passthru.updateScript = ./update.sh; + preFixup = '' + ( + set -euo pipefail + shopt -s globstar + shopt -s dotglob + + # Fix all binaries. + for file in "$out"/**/*; do + if [[ ! -f "$file" || "$file" == *.so || "$file" == *.a || "$file" == *.dylib ]] || + (! isELF "$file" && ! isMachO "$file"); then + continue + fi + + echo Making "$file" executable... + chmod +x "$file" + + ${lib.optionalString stdenv.hostPlatform.isLinux '' + # Add .NET deps if it is an apphost. + if grep 'You must install .NET to run this application.' "$file" > /dev/null; then + echo "Adding .NET needed libraries to: $file" + patchelf \ + --add-needed libicui18n.so \ + --add-needed libicuuc.so \ + --add-needed libgssapi_krb5.so \ + --add-needed libssl.so \ + "$file" + fi + ''} + done + + ${lib.optionalString stdenv.hostPlatform.isLinux '' + # Add the ICU libraries as needed to the globalization DLLs. + for file in "$out"/**/{libcoreclr.so,*System.Globalization.Native.so}; do + echo "Adding ICU libraries to: $file" + patchelf \ + --add-needed libicui18n.so \ + --add-needed libicuuc.so \ + "$file" + done + + # Add the Kerberos libraries as needed to the native security DLL. + for file in "$out"/**/*System.Net.Security.Native.so; do + echo "Adding Kerberos libraries to: $file" + patchelf \ + --add-needed libgssapi_krb5.so \ + "$file" + done + + # Add the OpenSSL libraries as needed to the OpenSSL native security DLL. + for file in "$out"/**/*System.Security.Cryptography.Native.OpenSsl.so; do + echo "Adding OpenSSL libraries to: $file" + patchelf \ + --add-needed libssl.so \ + "$file" + done + + # Add the needed binaries to the apphost binaries. + for file in $(jq -r '.runtimeDependencies | map(select(.binaries != null) | .installPath + "/" + .binaries[]) | sort | unique | map(sub("/\\./"; "/")) | .[]' < "$out"/share/vscode/extensions/ms-dotnettools.csharp/package.json); do + [ -f "$out"/share/vscode/extensions/ms-dotnettools.csharp/"$file" ] || continue + + echo "Adding .NET needed libraries to: $out/share/vscode/extensions/ms-dotnettools.csharp/$file" + patchelf \ + --add-needed libicui18n.so \ + --add-needed libicuuc.so \ + --add-needed libgssapi_krb5.so \ + --add-needed libssl.so \ + "$out"/share/vscode/extensions/ms-dotnettools.csharp/"$file" + done + ''} + ) + ''; meta = { description = "Official C# support for Visual Studio Code"; homepage = "https://github.com/dotnet/vscode-csharp"; - license = lib.licenses.mit; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ ggg ]; platforms = [ "x86_64-linux" diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json deleted file mode 100644 index 3015e3ffdcd1..000000000000 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": "2.69.25", - "linux-x64": { - "hash": "sha256-RG3iuQXEePJvn9kh58tkXJeakdh6w8W1D4A6hn7NhQs=", - "binaries": [ - ".debugger/createdump", - ".debugger/vsdbg", - ".debugger/vsdbg-ui", - ".razor/rzls", - ".roslyn/Microsoft.CodeAnalysis.LanguageServer" - ] - }, - "linux-arm64": { - "hash": "sha256-sMUUS90uXEnIc8QyQ7Vk8/bhaUcqgwWIPObl8/qkkYI=", - "binaries": [ - ".debugger/createdump", - ".debugger/vsdbg", - ".debugger/vsdbg-ui", - ".razor/rzls", - ".roslyn/Microsoft.CodeAnalysis.LanguageServer" - ] - }, - "darwin-x64": { - "hash": "sha256-7jdVpzEx1zqvtSbr7Z6g5YnlNJyCK33g2REbx27X5Ls=", - "binaries": [ - ".debugger/x86_64/createdump", - ".debugger/x86_64/vsdbg", - ".debugger/x86_64/vsdbg-ui", - ".razor/rzls", - ".roslyn/Microsoft.CodeAnalysis.LanguageServer" - ] - }, - "darwin-arm64": { - "hash": "sha256-Oz6gGQbZwcAoy8m1mLQxOQypjoo6LQc/j1OcRX94YII=", - "binaries": [ - ".debugger/arm64/createdump", - ".debugger/arm64/vsdbg", - ".debugger/arm64/vsdbg-ui", - ".debugger/x86_64/createdump", - ".debugger/x86_64/vsdbg", - ".debugger/x86_64/vsdbg-ui", - ".razor/rzls", - ".roslyn/Microsoft.CodeAnalysis.LanguageServer" - ] - } -} diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/update.sh b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/update.sh deleted file mode 100755 index 4d45e02b5b1f..000000000000 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/update.sh +++ /dev/null @@ -1,158 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl coreutils jq nix unzip -# shellcheck shell=bash -set -euo pipefail -shopt -s globstar -shopt -s dotglob - -export LC_ALL=C - -PUBLISHER=ms-dotnettools -EXTENSION=csharp -LOCKFILE=pkgs/applications/editors/vscode/extensions/$PUBLISHER.$EXTENSION/lockfile.json - -response=$(curl -s 'https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery' \ - -H 'accept: application/json;api-version=3.0-preview.1' \ - -H 'content-type: application/json' \ - --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"'"$PUBLISHER.$EXTENSION"'"}]}],"flags":16}') - -# Find the latest version compatible with stable vscode version -latest_version=$(jq --raw-output ' -.results[0].extensions[0].versions -| map(select(has("properties"))) -| map(select(.properties | map(select(.key == "Microsoft.VisualStudio.Code.Engine")) | .[0].value | test("\\^[0-9.]+$"))) -| map(select(.properties | map(select(.key == "Microsoft.VisualStudio.Code.PreRelease")) | .[0].value != "true")) -| .[0].version' <<<"$response") - -current_version=$(jq '.version' --raw-output <"$LOCKFILE") - -if [[ "$latest_version" == "$current_version" ]]; then - echo "Package is up to date." >&2 - exit 1 -fi - -# Return success if the specified file is an ELF object. -isELF() { - local fn="$1" - local fd - local magic - exec {fd}<"$fn" - read -r -n 4 -u "$fd" magic - exec {fd}<&- - if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi -} - -# Return success if the specified file is a Mach-O object. -isMachO() { - local fn="$1" - local fd - local magic - exec {fd}<"$fn" - read -r -n 4 -u "$fd" magic - exec {fd}<&- - - # nix uses 'declare -F' in get-env.sh to retrieve the loaded functions. - # If we use the $'string' syntax instead of 'echo -ne' then 'declare' will print the raw characters and break nix. - # See https://github.com/NixOS/nixpkgs/pull/138334 and https://github.com/NixOS/nix/issues/5262. - - # https://opensource.apple.com/source/lldb/lldb-310.2.36/examples/python/mach_o.py.auto.html - if [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xcf") || "$magic" = $(echo -ne "\xcf\xfa\xed\xfe") ]]; then - # MH_MAGIC_64 || MH_CIGAM_64 - return 0 - elif [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xce") || "$magic" = $(echo -ne "\xce\xfa\xed\xfe") ]]; then - # MH_MAGIC || MH_CIGAM - return 0 - elif [[ "$magic" = $(echo -ne "\xca\xfe\xba\xbe") || "$magic" = $(echo -ne "\xbe\xba\xfe\xca") ]]; then - # FAT_MAGIC || FAT_CIGAM - return 0 - else - return 1 - fi -} - -getDownloadUrl() { - nix-instantiate \ - --eval \ - --strict \ - --json \ - pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix \ - --attr url \ - --argstr publisher $PUBLISHER \ - --argstr name $EXTENSION \ - --argstr version "$latest_version" \ - --argstr arch "$1" | jq . --raw-output -} - -TEMP=$(mktemp --directory --tmpdir) -OUTPUT="$TEMP/lockfile.json" -trap 'rm -r "$TEMP"' EXIT - -HASH= -BINARIES=() -fetchMarketplace() { - arch="$1" - - echo " Downloading VSIX..." - if ! curl -sLo "$TEMP/$arch".zip "$(getDownloadUrl "$arch")"; then - echo " Failed to download extension for arch $arch" >&2 - exit 1 - fi - - HASH=$(nix hash file --type sha256 --sri "$TEMP/$arch".zip) - BINARIES=() - - echo " Extracting VSIX..." - mkdir "$TEMP/$arch" - if ! unzip "$TEMP/$arch".zip -d "$TEMP/$arch" >/dev/null; then - echo " Failed to unzip extension for arch $arch" >&2 - file "$TEMP/$arch".zip >&2 - exit 1 - fi - - echo " Listing binaries..." - for file in "$TEMP/$arch"/**/*; do - if [[ ! -f "$file" || "$file" == *.so || "$file" == *.dylib ]] || - (! isELF "$file" && ! isMachO "$file"); then - continue - fi - - echo " FOUND: ${file#"$TEMP/$arch/extension/"}" - BINARIES+=("${file#"$TEMP/$arch/extension/"}") - done - rm -r "${TEMP:?}/$arch" -} - -cat >"$OUTPUT" <>"$OUTPUT" - fi - firstArch=false - - echo "Getting data for $arch..." - fetchMarketplace "$arch" - - cat >>"$OUTPUT" <>"$OUTPUT" - fi - firstBin=false - - echo -n " \"$binary\"" >>"$OUTPUT" - done - echo -ne '\n ]\n }' >>"$OUTPUT" -done -echo -e '\n}' >>"$OUTPUT" - -mv "$OUTPUT" "$LOCKFILE" diff --git a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix index 423e0c23c81f..f2fd32afd155 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-pyright"; name = "pyright"; - version = "1.1.398"; - hash = "sha256-fSBn4c1e1e4atJUV6STmEYB/++WXZFsN2v5+zyfYnZA="; + version = "1.1.400"; + hash = "sha256-Twpsxtr6fUSDgCfMYFJF3asgaKLB/axIvOZRItuFyig="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix index 60ee4ebf8f62..fd8338c2579f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "debugpy"; publisher = "ms-python"; - version = "2025.4.1"; - hash = "sha256-PzO5CA/JaLlyMMQ0wOIIvoL116boSOpqtX9plw9IUgQ="; + version = "2025.8.0"; + hash = "sha256-sfQG5LgGruInheqA7C8YxdC0EhmmmKhbfyXhHUhCaNI="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix index 06b7c1dceab7..599216b831ea 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-python"; name = "isort"; - version = "2023.13.13171013"; - hash = "sha256-UBV9i3LPVv60+toy+kJvESAuJHRmH/uEIwjTidYUXLc="; + version = "2025.0.0"; + hash = "sha256-nwt9Pv084jt9nWvxSXLIWu7981UGSbCgVRTrFfJA6q4="; }; meta = with lib; { description = "Import sorting extension for Visual Studio Code using isort"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 4904c2494e70..0af9a827656f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -8,15 +8,15 @@ # Defaults to `false` as we expect it to be project specific most of the time. pythonUseFixed ? false, # For updateScript - vscode-extensions-update-script, + vscode-extension-update-script, }: vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2025.3.2025031001"; - hash = "sha256-uYz0WgFqbLohCEmT8ewYgvlFrVLuZr9OAiKnrbNup7U="; + version = "2025.6.0"; + hash = "sha256-DtnBFLSQj9y7UiHRhOILuua6c2eeJcFiyMNlIjTor9g="; }; buildInputs = [ icu ]; @@ -45,7 +45,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { --replace-fail "\"default\":\"python\"" "\"default\":\"${python3.interpreter}\"" ''; - passthru.updateScript = vscode-extensions-update-script { }; + passthru.updateScript = vscode-extension-update-script { }; meta = { description = "Visual Studio Code extension with rich support for the Python language"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 78964d9849df..f933b986728e 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2025.4.1"; - hash = "sha256-XZ00HOH+7onP1li6nBwjBIRc1Zy5SNvrT1JhnzJTr1E="; + version = "2025.5.1"; + hash = "sha256-6HnWqD6wTRPjkHYN6HaPHJbbK0wWk/boBtqBhuR7W7U="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix index dd70a4e1527d..ea93d2c11368 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2025.2.0"; - hash = "sha256-YMvu8aEumV3VTdNZKiLK+5jmTL9y5tcMxrEBwEMcTI4="; + version = "2025.4.1"; + hash = "sha256-RLkelWU5chIpGS6dToQ+/jNeEbZYGi2JxeZTqqHAdVA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix index 024c4e5237ed..2a9fe44e1c98 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix @@ -61,7 +61,7 @@ let if ! nodeVersion=$($serverNode -v); then echo "Unable to fix Node binary, quitting" - fail_with_exitcode ''${o.InstallExitCode.ServerTransferFailed} + fail_with_exitcode ''${f.UnifiedStatusCode.ServerTransferFailed} fi ${lib.optionalString useLocalExtensions '' @@ -84,8 +84,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.118.0"; - hash = "sha256-LHsOjl5fIm4/ixlFs/yL/U2VRwRMigRk0Q3MtNdyzVE="; + version = "0.120.0"; + hash = "sha256-D9YmLKGDtIb2wGfLNRbczqL4fzLASbZC/563ewzqGV0="; }; postPatch = '' diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 90aabc32d73f..9c29ea704f01 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -39,15 +39,20 @@ let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; isx86Linux = stdenv.hostPlatform.system == "x86_64-linux"; + isDarwin = stdenv.hostPlatform.isDarwin; supported = { x86_64-linux = { - hash = "sha256-ek4WBr9ZJ87TXlKQowA68YNt3WNOXymLcVfz1g+Be2o="; + hash = "sha256-97eXABltjGg5FOfyl03N8VjmdBcemEe3I+DSV/EpMS4="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-2+JqosgyoMRFnl8fnCrKljkdF3eU72mXy30ZUnaIerA="; + hash = "sha256-yBQFhQS/eh8hMW8wN0sr8wZwWrz8e1gWnVZHUf33gw4="; arch = "linux-arm64"; }; + aarch64-darwin = { + hash = "sha256-HxsZjNTg9nOwkSFy9tPaQjtB0SAQXWw0vwcCOj1ZKuA="; + arch = "darwin-arm64"; + }; }; base = @@ -58,7 +63,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.22.2"; + version = "1.25.3"; }; nativeBuildInputs = [ @@ -68,13 +73,12 @@ vscode-utils.buildVscodeMarketplaceExtension { buildInputs = [ jq - lttng-ust libkrb5 zlib (lib.getLib stdenv.cc.cc) - ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lttng-ust ]; - dontAutoPatchelf = isx86Linux; + dontAutoPatchelf = isx86Linux || isDarwin; postPatch = '' @@ -97,10 +101,15 @@ vscode-utils.buildVscodeMarketplaceExtension { # Patching binaries chmod +x bin/cpptools bin/cpptools-srv bin/cpptools-wordexp debugAdapters/bin/OpenDebugAD7 + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so.1 ./debugAdapters/bin/libcoreclrtraceptprovider.so '' + lib.optionalString isx86Linux '' chmod +x bin/libc.so + '' + + lib.optionalString isDarwin '' + chmod +x debugAdapters/lldb-mi/bin/lldb-mi ''; # On aarch64 the binaries are statically linked @@ -128,6 +137,7 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-linux" + "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix index 180490e60a65..9fa2297a6f13 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix @@ -8,12 +8,12 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.5918"; - hash = "sha256-Tk0mKydUF8M7l7NC9wEA7t2rzJWy/mq4/HvIHI2/ldQ="; + version = "1.0.5948"; + hash = "sha256-KOu9zF5l6MTLU8z/l4xBwRl2X3uIE15YgHEZJrKSHGY="; }; postPatch = '' - substituteInPlace extension.js \ + substituteInPlace vendor.js \ --replace-fail '"xsel"' '"${xsel}/bin/xsel"' ''; diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index cdb13b4c6020..978644ebdb8f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "0.6.1"; - hash = "sha256-BAA7wSfyJ4y8how+NnaGdCf/BCU6aOmI8ew8qpcQCnY="; + version = "0.12.1"; + hash = "sha256-uj+4o5gH6qfYCJjapoas/JDWymFWSl4kHFu5Ys9rTlU="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 5a2806f92f2c..15f7912ff725 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-7GoFmflHaHXpw0ijX7YGBKewV+HmRhcm4eTYVgCYLHY="; + hash = "sha256-1mBzimFM/ntjL/d0YkoCds5MtXKwB52jzcHEWpx3Ggo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/nimlang.nimlang/default.nix b/pkgs/applications/editors/vscode/extensions/nimlang.nimlang/default.nix index 8eeedfafb8ac..0c79e83de0d7 100644 --- a/pkgs/applications/editors/vscode/extensions/nimlang.nimlang/default.nix +++ b/pkgs/applications/editors/vscode/extensions/nimlang.nimlang/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "nimlang"; publisher = "nimlang"; - version = "1.6.0"; - hash = "sha256-tMMD1UfmfG+q+qWUpcxfwVSRGO+rpFF7hhWepuFTrdA="; + version = "1.8.1"; + hash = "sha256-Apfq0VeLEmXnxsaipA+aJr/QX+chAQQGQQ+64hqFIbA="; }; meta = { description = "Nim language support for VS Code"; diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix index 5fc6dfa5071b..86b8bd729f71 100644 --- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix +++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "r"; publisher = "reditorsupport"; - version = "2.8.4"; - hash = "sha256-wVT9/JUuqP8whW99q1gwVMf7PRzgZNLoIdlXsclpbck="; + version = "2.8.5"; + hash = "sha256-cZeZdrViEae9sRb9GyB/LeSQ5NRb/fAp3qQW9mPMbsM="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 47f844424189..530ff6d9706f 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -1,18 +1,18 @@ { lib, vscode-utils, - vscode-extensions-update-script, + vscode-extension-update-script, }: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "RooVeterinaryInc"; name = "roo-cline"; - version = "3.10.5"; - hash = "sha256-7A8BQHUu7CYA28fHv68Zvf6zhlJwwXZaNVLb+/cBAIg="; + version = "3.17.1"; + hash = "sha256-gfzn0KulOHUKcG3LNF7+g7VwkDHR4BYsmq730Uuv2ZU="; }; - passthru.updateScript = vscode-extensions-update-script { }; + passthru.updateScript = vscode-extension-update-script { }; meta = { description = "AI-powered autonomous coding agent that lives in your editor"; diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index 5abec4f2f08c..0c42097b509c 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -10,8 +10,6 @@ esbuild, pkg-config, libsecret, - stdenv, - darwin, setDefaultServerPath ? true, }: @@ -39,18 +37,13 @@ let buildInputs = [ pkgsBuildBuild.libsecret ]; - nativeBuildInputs = - [ - jq - moreutils - esbuild - # Required by `keytar`, which is a dependency of `vsce`. - pkg-config - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + nativeBuildInputs = [ + jq + moreutils + esbuild + # Required by `keytar`, which is a dependency of `vsce`. + pkg-config + ]; # Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 installPhase = '' diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 19686b60827a..1ed6ad4f5301 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.8.6"; - hash = "sha256-JqrzMZoAlBcBfQPWJn+c0PW5ScWclstg5BDPyntN3co="; + version = "3.16.1"; + hash = "sha256-o8sU4daSeaq6x24mGcBW84Z0SwLu76hZWA9ihlYlT1w="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index 979472c9232e..0a1efe2ea845 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -10,16 +10,10 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.28.0"; - hash = "sha256-wQt2T7RhQ5qU4P7J0vQwzc9mL40pDY5tS0HILhy4twg="; + version = "1.36.0"; + hash = "sha256-HbOPoDu0R47US+UtK7i2BLiYgUhnNMD1i6Ibo8h3Auk="; }; - postPatch = '' - pushd sourcery_binaries/install - rm -r win ${if stdenv.hostPlatform.isLinux then "mac" else "linux"} - popd - ''; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-french/default.nix b/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-french/default.nix new file mode 100644 index 000000000000..eeac9b8b2075 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-french/default.nix @@ -0,0 +1,18 @@ +{ lib, vscode-utils }: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "code-spell-checker-french"; + publisher = "streetsidesoftware"; + version = "0.4.3"; + hash = "sha256-FPnS/gU7+Kz3ZgbwiNIs/Rr1uiz5qIWsvpKB5lZGz+s="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker-french/changelog"; + description = "French dictionary extension for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker-french"; + homepage = "https://github.com/streetsidesoftware/vscode-cspell-dict-extensions#readme"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ aduh95 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix b/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix index 260d06879d63..c8e6d5859cfa 100644 --- a/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix +++ b/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "code-spell-checker-german"; publisher = "streetsidesoftware"; - version = "2.3.2"; - hash = "sha256-40Oc6ycNog9cxG4G5gCps2ADrM/wLuKWFrD4lnd91Z4="; + version = "2.3.3"; + hash = "sha256-sEdr8SQDFWgCq77flvbReILgWtT/ao8cJjrgC7RKO80="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker-german/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix index 3f27cb681fe0..74335cb55a40 100644 --- a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix @@ -8,13 +8,16 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "lua"; publisher = "sumneko"; - version = "3.7.3"; - hash = "sha256-JsZrCeT843QvQkebyOVlO9MI2xbEQI8xX0DrPacfGrM="; + version = "3.14.0"; + hash = "sha256-auXQudzWRbq/cXMpFkheqHhJMu7XwacdsaZYAkv1pQs="; }; # Running chmod in runtime will lock up extension # indefinitely if the binary is in nix store. - patches = [ ./remove-chmod.patch ]; + postPatch = '' + substituteInPlace client/out/src/languageserver.js \ + --replace-fail 'await fs.promises.chmod(command, "777");' "" + ''; postInstall = '' ln -sf ${lua-language-server}/bin/lua-language-server \ diff --git a/pkgs/applications/editors/vscode/extensions/sumneko.lua/remove-chmod.patch b/pkgs/applications/editors/vscode/extensions/sumneko.lua/remove-chmod.patch deleted file mode 100644 index bce7a6dae146..000000000000 --- a/pkgs/applications/editors/vscode/extensions/sumneko.lua/remove-chmod.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/client/out/languageserver.js -+++ b/client/out/languageserver.js -@@ -164,11 +164,9 @@ class LuaClient extends vscode_1.Disposable { - break; - case "linux": - command = this.context.asAbsolutePath(path.join("server", binDir ? binDir : "bin-Linux", "lua-language-server")); -- yield fs.promises.chmod(command, "777"); - break; - case "darwin": - command = this.context.asAbsolutePath(path.join("server", binDir ? binDir : "bin-macOS", "lua-language-server")); -- yield fs.promises.chmod(command, "777"); - break; - default: - throw new Error(`Unsupported operating system "${platform}"!`); diff --git a/pkgs/applications/editors/vscode/extensions/tecosaur.latex-utilities/default.nix b/pkgs/applications/editors/vscode/extensions/tecosaur.latex-utilities/default.nix new file mode 100644 index 000000000000..61a582529ba2 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/tecosaur.latex-utilities/default.nix @@ -0,0 +1,38 @@ +{ + lib, + vscode-utils, + jq, + moreutils, + texlivePackages, +}: + +vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { + mktplcRef = { + name = "latex-utilities"; + publisher = "tecosaur"; + version = "0.4.14"; + hash = "sha256-GsbHzFcN56UbcaqFN9s+6u/KjUBn8tmks2ihK0pg3Ds="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ texlivePackages.texcount ]; + + postInstall = '' + cd "$out/$installPrefix" + echo -n ${finalAttrs.version} > VERSION + jq '.contributes.configuration.properties."latex-utilities.countWord.path".default = "${texlivePackages.texcount}/bin/texcount"' package.json | sponge package.json + ''; + + meta = { + description = "Add-on to the Visual Studio Code extension LaTeX Workshop"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=tecosaur.latex-utilities"; + homepage = "https://github.com/tecosaur/LaTeX-Utilities"; + changelog = "https://marketplace.visualstudio.com/items/tecosaur.latex-utilities/changelog"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jeancaspar ]; + }; +}) diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index 1cca4d3cdd03..ee30e36acd11 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -5,6 +5,7 @@ moreutils, typos-lsp, vscode-utils, + vscode-extension-update-script, }: let inherit (stdenv.hostPlatform) system; @@ -13,19 +14,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-M3m3fFsz/LPSmghyKVuLVcMgxtUf3iNvHDLjOptfs6I="; + hash = "sha256-130QnFYclUmvlqWZ62g8/rMZsJF43heXi9thp+RHfLo="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-S3mMOtXYdVp5P8aKlzWyehVKCz7EjcNjYJqgSsNIS3g="; + hash = "sha256-K+ZfHzxOwp4lTC0929am/KOs8RdVk5MXGP8JTYP7pX4="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-lIUM5W+lKL7OgcJVWJTJYsZNqpZ3MhSk7YnKsfWDX4U="; + hash = "sha256-H4N/nKWwv9IdQkjHeb1Q5VXoNguWXHZkB0s3MCfG17Y="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-Lc2W1SNdn1rcxeKgv1YzKRr+DPN39C1J6O1KZBeELWc="; + hash = "sha256-WyO18JIs3FCfcHh6p9YvrCk9SX/vSHQM2uI+AL9zFbo="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -37,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.35"; + version = "0.1.37"; inherit (extInfo) hash arch; }; @@ -53,12 +54,20 @@ vscode-utils.buildVscodeMarketplaceExtension { jq '.contributes.configuration.properties."typos.path".default = "${lib.getExe typos-lsp}"' package.json | sponge package.json ''; + passthru.updateScript = vscode-extension-update-script { }; + meta = { changelog = "https://marketplace.visualstudio.com/items/tekumara.typos-vscode/changelog"; description = "VSCode extension for providing a low false-positive source code spell checker"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=tekumara.typos-vscode"; homepage = "https://github.com/tekumara/typos-lsp"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" + "aarch64-darwin" + "x86_64-linux" + "x86_64-darwin" + ]; maintainers = [ lib.maintainers.drupol ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/teros-technology-teroshdl/default.nix b/pkgs/applications/editors/vscode/extensions/teros-technology-teroshdl/default.nix new file mode 100644 index 000000000000..16dc4647a67a --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/teros-technology-teroshdl/default.nix @@ -0,0 +1,22 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "teroshdl"; + publisher = "teros-technology"; + version = "7.0.3"; + hash = "sha256-Bt31ia0X4sQQfREq8PPVEGt/oGe/Oob0yQbYkwNRSsk="; + }; + + meta = { + changelog = "https://github.com/TerosTechnology/vscode-terosHDL/releases"; + description = "Visual Studio Code extension for HDL developments (SystemVerilog/Verilog/VHDL)"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=teros-technology.teroshdl"; + homepage = "https://github.com/TerosTechnology/vscode-terosHDL"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ lheintzmann1 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix index 884742352743..2acd09bd9248 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix @@ -17,48 +17,47 @@ let if stdenv.hostPlatform.isDarwin then "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver" else - "${lldb.out}/bin/lldb-server"; + "${lib.getBin lldb}/bin/lldb-server"; + LLVM_TRIPLE = stdenv.buildPlatform.rust.rustcTarget; in rustPlatform.buildRustPackage { pname = "${pname}-adapter"; inherit version src; useFetchCargoVendor = true; - cargoHash = "sha256-7tGX8wt2bb1segoWbBEBwZbznOaAiAyh9i/JC5FKUBU="; + cargoHash = "sha256-Nh4YesgWa1JR8tLfrIRps9TBdsAfilXu6G2/kB08co8="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ lldb ]; + # Environment variables, based on + # The LLDB_* variables are used in adapter/lldb/build.rs. + "CC_${LLVM_TRIPLE}" = "${stdenv.cc}/bin/cc"; + "CXX_${LLVM_TRIPLE}" = "${stdenv.cc}/bin/c++"; + LLDB_INCLUDE = "${lib.getDev lldb}/include"; + LLDB_LINK_LIB = "lldb"; + LLDB_LINK_SEARCH = "${lib.getLib lldb}/lib"; nativeBuildInputs = [ makeWrapper ]; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; }; - buildAndTestSubdir = "adapter"; - buildFeatures = [ "weak-linkage" ]; + # There's isn't much point in enabling the `weaklink` feature + # when we provide lldb via Nix. + # buildFeatures = [ "weaklink" ]; cargoBuildFlags = [ - "--lib" "--bin=codelldb" ]; postFixup = '' - mkdir -p $out/share/{adapter,formatters} - # codelldb expects libcodelldb.so to be in the same - # directory as the executable, and can't find it in $out/lib. - # To make codelldb executable as a standalone, - # we put all files in $out/share, and then wrap the binary in $out/bin. + mkdir -p $out/share/{adapter,lang_support} mv $out/bin/* $out/share/adapter - cp $out/lib/* $out/share/adapter cp -r adapter/scripts $out/share/adapter - cp -t $out/share/formatters formatters/*.py + cp -t $out/share/lang_support lang_support/*.py ln -s ${lib.getLib lldb} $out/share/lldb makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \ --set-default LLDB_DEBUGSERVER_PATH "${lldbServer}" ''; - patches = [ ./patches/adapter-output-shared_object.patch ]; - - # Tests are linked to liblldb but it is not available here. + # Tests fail to build (as of version 1.11.4). doCheck = false; passthru = { inherit lldbServer; }; diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 590c03c26115..d3ff70cca2f6 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -1,23 +1,23 @@ { - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - makeWrapper, - llvmPackages, - buildNpmPackage, + callPackage, + cargo, cmake, + fetchFromGitHub, + lib, + llvmPackages_19, + makeRustPlatform, + makeWrapper, nodejs, - unzip, python3, - pkg-config, - libsecret, + rustc, + stdenv, + unzip, }: assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.10.0"; + version = "1.11.4"; vscodeExtUniqueId = "${publisher}.${pname}"; vscodeExtPublisher = publisher; @@ -25,23 +25,25 @@ let src = fetchFromGitHub { owner = "vadimcn"; - repo = "vscode-lldb"; + repo = "codelldb"; rev = "v${version}"; - hash = "sha256-ExSS5HxDmJJtYypRYJNz7nY0D50gjoDBc4CnJMfgVw8="; + hash = "sha256-+Pe7ij5ukF5pLgwvr+HOHjIv1TQDiPOEeJtkpIW9XWI="; }; - # need to build a custom version of lldb and llvm for enhanced rust support - lldb = (import ./lldb.nix { inherit fetchFromGitHub llvmPackages; }); + lldb = llvmPackages_19.lldb; adapter = ( - import ./adapter.nix { - inherit - lib - lldb - makeWrapper - rustPlatform - stdenv + callPackage ./adapter.nix { + # The adapter is meant to be compiled with clang++, + # based on the provided CMake toolchain files. + # + rustPlatform = makeRustPlatform { + stdenv = llvmPackages_19.libcxxStdenv; + inherit cargo rustc; + }; + stdenv = llvmPackages_19.libcxxStdenv; + inherit pname src version @@ -50,13 +52,8 @@ let ); nodeDeps = ( - import ./node_deps.nix { + callPackage ./node_deps.nix { inherit - buildNpmPackage - libsecret - pkg-config - python3 - pname src version @@ -86,10 +83,9 @@ stdenv.mkDerivation { patches = [ ./patches/cmake-build-extension-only.patch ]; - postPatch = '' - # temporary patch for forgotten version updates - substituteInPlace CMakeLists.txt \ - --replace-fail "1.9.2" ${version} + # Make devDependencies available to tools/prep-package.js + preConfigure = '' + cp -r ${nodeDeps}/lib/node_modules . ''; postConfigure = @@ -117,7 +113,7 @@ stdenv.mkDerivation { unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted - mkdir -p $ext/{adapter,formatters} + mkdir -p $ext/adapter mv -t $ext vsix-extracted/extension/* cp -t $ext/ -r ${adapter}/share/* wrapProgram $ext/adapter/codelldb \ diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix deleted file mode 100644 index 5a17141bf933..000000000000 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix +++ /dev/null @@ -1,35 +0,0 @@ -# Patched lldb for Rust language support. -{ - fetchFromGitHub, - llvmPackages, -}: -let - llvmSrc = fetchFromGitHub { - owner = "vadimcn"; - repo = "llvm-project"; - # codelldb/14.x branch - rev = "4c267c83cbb55fedf2e0b89644dc1db320fdfde7"; - hash = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw="; - }; - - lldbDrv = llvmPackages.lldb.overrideAttrs (oldAttrs: { - passthru = (oldAttrs.passthru or { }) // { - inherit llvmSrc; - }; - - doInstallCheck = true; - - # installCheck for lldb_14 currently broken - # https://github.com/NixOS/nixpkgs/issues/166604#issuecomment-1086103692 - # ignore the oldAttrs installCheck - installCheckPhase = '' - versionOutput="$($out/bin/lldb --version)" - echo "'lldb --version' returns: $versionOutput" - echo "$versionOutput" | grep -q 'rust-enabled' - ''; - }); -in -lldbDrv.override { - monorepoSrc = llvmSrc; - libllvm = llvmPackages.libllvm.override { monorepoSrc = llvmSrc; }; -} diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix index 08dd9dc7e558..7e808175ee9c 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix @@ -13,7 +13,7 @@ buildNpmPackage { pname = "${pname}-node-deps"; inherit version src; - npmDepsHash = "sha256-fMKGi+AJTMlWl7SQtZ21hUwOLgqlFYDhwLvEergQLfI="; + npmDepsHash = "sha256-Efeun7AFMAnoNXLbTGH7OWHaBHT2tO9CodfjKrIYw40="; nativeBuildInputs = [ python3 diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/adapter-output-shared_object.patch b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/adapter-output-shared_object.patch deleted file mode 100644 index aedbe59c3677..000000000000 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/adapter-output-shared_object.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4f64ad191ec79b9f40843f88e3ac5910720636da Mon Sep 17 00:00:00 2001 -From: Changsheng Wu -Date: Fri, 9 Jun 2023 15:41:53 -0400 -Subject: [PATCH] Update Cargo.toml - ---- - adapter/Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/adapter/Cargo.toml b/adapter/Cargo.toml -index bc86723..f5f26ce 100644 ---- a/adapter/Cargo.toml -+++ b/adapter/Cargo.toml -@@ -39,7 +39,7 @@ winapi = { version = "0.3.8", features = ["std", "wincon", "namedpipeapi"] } - winreg = "0.6.2" - - [lib] --crate-type = ["staticlib"] -+crate-type = ["dylib", "rlib"] - - [[bin]] - name = "codelldb" diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/cmake-build-extension-only.patch b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/cmake-build-extension-only.patch index 4fc612642a0c..da71f77a45c6 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/cmake-build-extension-only.patch +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/cmake-build-extension-only.patch @@ -1,7 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5cab8b1..0b500d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -16,13 +16,6 @@ +@@ -16,13 +16,6 @@ endif() set(VERSION "${VERSION}${VERSION_SUFFIX}") message("Version ${VERSION}") @@ -15,24 +16,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt if (CMAKE_SYSROOT) set(CMAKE_C_FLAGS "--sysroot=${CMAKE_SYSROOT} ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "--sysroot=${CMAKE_SYSROOT} ${CMAKE_CXX_FLAGS}") -@@ -102,16 +95,6 @@ - configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY) +@@ -116,16 +109,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) + configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -# Install node_modules -execute_process( -- COMMAND ${NPM} ci # like install, but actually respects package-lock file. +- COMMAND ${NPM} --loglevel verbose ci # like install, but actually respects package-lock file. - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE Result -) -if (NOT ${Result} EQUAL 0) -- message(FATAL_ERROR "npm intall failed: ${Result}") +- message(FATAL_ERROR "npm install failed: ${Result}") -endif() - # Resolve $refs execute_process( COMMAND ${WithEnv} NODE_PATH=${CMAKE_CURRENT_BINARY_DIR}/node_modules node ${CMAKE_CURRENT_SOURCE_DIR}/tools/prep-package.js ${CMAKE_CURRENT_BINARY_DIR}/package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json -@@ -169,6 +152,7 @@ +@@ -183,6 +166,7 @@ add_custom_target(adapter_tests add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_BINARY_DIR}/README.md) add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md ${CMAKE_CURRENT_BINARY_DIR}/CHANGELOG.md) @@ -40,7 +41,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/lldb.png ${CMAKE_CURRENT_BINARY_DIR}/images/lldb.png) add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/user.svg ${CMAKE_CURRENT_BINARY_DIR}/images/user.svg) add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/users.svg ${CMAKE_CURRENT_BINARY_DIR}/images/users.svg) -@@ -185,6 +169,7 @@ +@@ -199,6 +183,7 @@ add_custom_target(dev_debugging set(PackagedFilesBootstrap README.md CHANGELOG.md diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update-shell.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update-shell.nix new file mode 100644 index 000000000000..a10cfb9d366e --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update-shell.nix @@ -0,0 +1,17 @@ +{ + pkgs ? import ../../../../../.. { }, +}: + +# Ideally, pkgs points to default.nix file of Nixpkgs official tree +with pkgs; + +mkShell { + inputsFrom = [ + (import ../../update-shell.nix { inherit pkgs; }) + ]; + packages = [ + nix-prefetch-github + nurl + prefetch-npm-deps + ]; +} diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh index c6cce01e6d3a..27269014a6c6 100755 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell ../../update-shell.nix -i bash -p nix-prefetch-github prefetch-npm-deps +#! nix-shell update-shell.nix -i bash set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -12,8 +12,10 @@ of https://github.com/vadimcn/llvm-project and update lldb with correct version # Ideally, nixpkgs points to default.nix file of Nixpkgs official tree nixpkgs=../../../../../.. nixFile=./default.nix +adapterNixFile=./adapter.nix +nodeDepsNixFile=./node_deps.nix owner=vadimcn -repo=vscode-lldb +repo=codelldb version="$1" if [[ $# -ne 1 ]]; then # no version specified, find the newest one @@ -34,14 +36,14 @@ echo "$old_version -> $version" # update hashes sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile" -srcHash=$(nix-prefetch-github vadimcn vscode-lldb --rev "v$version" | jq --raw-output .hash) +srcHash=$(nix-prefetch-github vadimcn codelldb --rev "v$version" | jq --raw-output .hash) sed -E 's#\bhash = ".*?"#hash = "'$srcHash'"#' --in-place "$nixFile" -cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") -sed -E 's#\bcargoHash = ".*?"#cargoHash = "'$cargoHash'"#' --in-place "$nixFile" +cargoHash=$(nurl --expr "(import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.vendorStaging") +sed -E 's#\bcargoHash = ".*?"#cargoHash = "'$cargoHash'"#' --in-place "$adapterNixFile" pushd $TMPDIR curl -LO https://raw.githubusercontent.com/$owner/$repo/v${version}/package-lock.json npmDepsHash=$(prefetch-npm-deps ./package-lock.json) popd -sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'$npmDepsHash'"#' --in-place "$nixFile" +sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'$npmDepsHash'"#' --in-place "$nodeDepsNixFile" diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 88221112cb7b..79aed61d8b0c 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -2,7 +2,7 @@ stdenvNoCC, lib, vscode-utils, - vscode-extensions-update-script, + vscode-extension-update-script, }: vscode-utils.buildVscodeMarketplaceExtension { @@ -11,31 +11,31 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-s3peDZApzSfemXRqRjf5fYQGHVf1DAP7XG4NuOqiGcY="; + hash = "sha256-tnZh8WioZ4EtooQlM5RYQkvWO35PPeNTAyCbMQ4raXE="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-WutwGOcXoREk6oUdFjhsKcrf64CG4GSn9JgGWiQe9l8="; + hash = "sha256-tkZRGO1W0QA/aEW2BqyPhmGt06yTvrsQ4Xp8jmbzPP0="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-377T8cfY4jHX+iJjdDScMP+wX6UZCYLasl16ngwfq6U="; + hash = "sha256-hoZf3ofcPHkqyWwfL79Hnu5pzcLKRHD5PVOBjTXq828="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-fufJ9NV73skhwBFe2vCLjh5ykQagXfO0VAdHGPhfOQ4="; + hash = "sha256-qZnHSdcby7FNb1+EUB4O8dK30xtZWS4m07m8je0/CHI="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.14.2"; + version = "0.15.0"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); - passthru.updateScript = vscode-extensions-update-script { extraArgs = [ "--platforms" ]; }; + passthru.updateScript = vscode-extension-update-script { }; meta = { description = "Jujutsu version control integration, for simpler Git workflow"; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 8d1e2392c0c1..f0e8b1ef6305 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -7,6 +7,7 @@ vscode, unzip, jq, + vscode-extension-update-script, }: let buildVscodeExtension = lib.extendMkDerivation { @@ -40,9 +41,14 @@ let { pname = "vscode-extension-${pname}"; - passthru = passthru // { - inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; - }; + passthru = + { + updateScript = vscode-extension-update-script { }; + } + // passthru + // { + inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; + }; inherit configurePhase diff --git a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix new file mode 100644 index 000000000000..bb3d0be663ad --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix @@ -0,0 +1,20 @@ +{ + lib, + vscode-utils, +}: +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-sqlite3-editor"; + publisher = "yy0931"; + version = "1.0.207"; + hash = "sha256-HToO43MnqJlWcKx4O5C0b7RXyeKY5PzxMY5/3cNOtgE="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/yy0931.vscode-sqlite3-editor/changelog"; + description = "SQLite3 Editor for VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=yy0931.vscode-sqlite3-editor"; + homepage = "https://github.com/yy0931/sqlite3-editor"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.ch4og ]; + }; +} diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 8e2cc8d521ee..0f1ad0aca010 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -23,6 +23,7 @@ wayland, libglvnd, libkrb5, + openssl, # Populate passthru.tests tests, @@ -51,6 +52,7 @@ sourceExecutableName ? executableName, useVSCodeRipgrep ? false, ripgrep, + hasVsceSign ? false, }: stdenv.mkDerivation ( @@ -233,6 +235,11 @@ stdenv.mkDerivation ( dontConfigure = true; noDumpEnvVars = true; + stripExclude = lib.optional hasVsceSign [ + # vsce-sign is a single executable application built with Node.js, and it becomes non-functional if stripped + "lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign" + ]; + installPhase = '' runHook preInstall @@ -324,13 +331,20 @@ stdenv.mkDerivation ( '' ); - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf \ - --add-needed ${libglvnd}/lib/libGLESv2.so.2 \ - --add-needed ${libglvnd}/lib/libGL.so.1 \ - --add-needed ${libglvnd}/lib/libEGL.so.1 \ - $out/lib/${libraryName}/${executableName} - ''; + postFixup = lib.optionalString stdenv.hostPlatform.isLinux ( + '' + patchelf \ + --add-needed ${libglvnd}/lib/libGLESv2.so.2 \ + --add-needed ${libglvnd}/lib/libGL.so.1 \ + --add-needed ${libglvnd}/lib/libEGL.so.1 \ + $out/lib/${libraryName}/${executableName} + '' + + (lib.optionalString hasVsceSign '' + patchelf \ + --add-needed ${lib.getLib openssl}/lib/libssl.so \ + $out/lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign + '') + ); inherit meta; } diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 486744c0ed27..8e20746cce5d 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,22 +36,22 @@ let sha256 = { - x86_64-linux = "0pmjpjjafq36dr5dlf64bbkr6p697d2yc1z7l876i0vnw10g6731"; - x86_64-darwin = "1y32szp9asmchl64wfwz4jvhkr4441aykvy64qc8f4y51wxxxcnv"; - aarch64-linux = "0zbgbhnlg7wcgz8v34rknvblmdrac0l7qy5qfp2rn7jcdrm5qa53"; - aarch64-darwin = "00y6rz2cfz193n3svvsdknk6g38vg1w92yiqk5n14lyv2g8av2dc"; - armv7l-linux = "19q4rip33ma7krwpymp396ip5kwd5g8hp2n6jqcmljv59lw10c9h"; + x86_64-linux = "07q8vym10qz91wxn8g7ysksqraj6dr2csyxiclc514k2ifvjh7rx"; + x86_64-darwin = "068ylhrx4sf7ypynmd17kxrgnjiza7qp5bz63m75vz61vqy655f7"; + aarch64-linux = "1pl30h3vxsms1xdqvcgsqcl7isc5fz4sxvdy3iml45mg78809hj5"; + aarch64-darwin = "05das18ks3m4kjq612vwn50sl7sb1mgfjdvzshh662z2spqs6ncb"; + armv7l-linux = "1xbhkak6gipras6mngsyxnq7k6702dccmqp8az5nig45l54rxfm9"; } .${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.98.2"; + version = "1.100.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "ddc367ed5c8936efe395cffeec279b04ffd7db78"; + rev = "91fa95bccb027ece6a968589bb1d662fa9c8e170"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -75,7 +75,7 @@ callPackage ./generic.nix rec { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "19dc6smiyi8qv79gr95wgx2fjzfjkrv4x3zfvdskms4bw1kn6xck"; + sha256 = "1jwy61nypha77iq8mwp2c8jmfxic61m9rkq3p3sjh2i442n0lnwq"; }; stdenv = stdenvNoCC; }; @@ -89,6 +89,8 @@ callPackage ./generic.nix rec { # See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information. dontFixup = stdenv.hostPlatform.isDarwin; + hasVsceSign = true; + meta = with lib; { description = '' Open source source code editor developed by Microsoft for Windows, diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index d60931d05533..f2c2c072bf92 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -26,11 +26,11 @@ let hash = { - x86_64-linux = "sha256-qiSCrPScPtfoxVXpjapOUqzIAHlNsXwVAZNYN6CeuQo="; - x86_64-darwin = "sha256-2MEBSjiy4Ct4RrlbsD6ZiYO7Fb3hFcQnzZpa1WjMKXY="; - aarch64-linux = "sha256-wax6tTFkaGsKsOrkfcXF1yvBsVmUexNwe7Aex04HS/Q="; - aarch64-darwin = "sha256-ccHrhEVqxKrgQK5iP4nlOROEQWbLBRWXjXrhnkaRpMQ="; - armv7l-linux = "sha256-1+4/QdAi9wLtnZTwutCIpjMwBA3Zzzi4M2746mIu3gE="; + x86_64-linux = "sha256-6/ECgQbl7r4KI66BApOijIdJJP4nlDEgRE1JEMJcSDk="; + x86_64-darwin = "sha256-t68Wkwo6p/S0hTf8BiR95nHC4qOLVtBkU0u3dco+jEc="; + aarch64-linux = "sha256-KJ74qd0xOQV9EkoIdWGLCr57ZYJ9U0F2zyW6y9zWSY4="; + aarch64-darwin = "sha256-CPPIYDxDiF07SdRaOe2Cp8fl4YvbVPeaVqobo0PZyrY="; + armv7l-linux = "sha256-ob2Xlgvsk6KFo9stlmuGTPPRyXQpBUACuq5q48haGxs="; } .${system} or throwSystem; @@ -41,7 +41,7 @@ callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.98.2.25078"; + version = "1.100.23258"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix deleted file mode 100644 index 43c63bb95260..000000000000 --- a/pkgs/applications/editors/zee/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - openssl, - stdenv, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "zee"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "zee-editor"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w="; - }; - - cargoPatches = [ - # fixed upstream but unreleased - ./update-ropey-for-rust-1.65.diff - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; - - # disable downloading and building the tree-sitter grammars at build time - # grammars can be configured in a config file and installed with `zee --build` - # see https://github.com/zee-editor/zee#syntax-highlighting - ZEE_DISABLE_GRAMMAR_BUILD = 1; - - useFetchCargoVendor = true; - cargoHash = "sha256-auwbpavF/WZQIE/htYXJ4di6xoRtXkBBkP/Bj4lFp6U="; - - meta = with lib; { - description = "Modern text editor for the terminal written in Rust"; - homepage = "https://github.com/zee-editor/zee"; - license = licenses.mit; - maintainers = with maintainers; [ booklearner ]; - mainProgram = "zee"; - }; -} diff --git a/pkgs/applications/emulators/blink/default.nix b/pkgs/applications/emulators/blink/default.nix deleted file mode 100644 index a65ebf5886b3..000000000000 --- a/pkgs/applications/emulators/blink/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - stdenv, - fetchFromGitHub, - lib, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "blink"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "jart"; - repo = "blink"; - rev = finalAttrs.version; - hash = "sha256-4wgDftXOYm2fMP+/aTRljDi38EzbbwAJlQkuxjAMl3I="; - }; - - # Do not include --enable-static and --disable-shared flags during static compilation - dontAddStaticConfigureFlags = true; - - # Don't add --build and --host flags as they are not supported - configurePlatforms = lib.optionals stdenv.hostPlatform.isStatic [ ]; - - # ./configure script expects --static not standard --enable-static - configureFlags = lib.optional stdenv.hostPlatform.isStatic "--static"; - - # 'make check' requires internet connection - doCheck = true; - checkTarget = "test"; - - meta = { - description = "Tiniest x86-64-linux emulator"; - longDescription = '' - blink is a virtual machine that runs x86-64-linux programs on different operating systems and hardware architectures. It's designed to do the same thing as the qemu-x86_64 command, except that - - blink is much smaller in size than qemu-x86_64 - - blink will run your Linux binaries on any POSIX platform, whereas qemu-x86_64 only supports Linux - - blink goes 2x faster than qemu-x86_64 on some benchmarks, such as SSE integer / floating point math. Blink is also faster at running ephemeral programs such as compilers - ''; - - homepage = "https://github.com/jart/blink"; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ t4ccer ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix deleted file mode 100644 index b60e9ddd38ad..000000000000 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ /dev/null @@ -1,148 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - alsa-lib, - AudioUnit, - autoreconfHook, - Carbon, - Cocoa, - ffmpeg, - fluidsynth, - freetype, - glib, - libicns, - libpcap, - libpng, - libslirp, - libxkbfile, - libXrandr, - makeWrapper, - ncurses, - pkg-config, - python3, - SDL2, - SDL2_net, - testers, - yad, - zlib, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dosbox-x"; - version = "2025.02.01"; - - src = fetchFromGitHub { - owner = "joncampbell123"; - repo = "dosbox-x"; - rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-X+deR8khmCWnIyqhao122CaPGXuWEoayKTcTaYfLATY="; - }; - - # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants - # iconutil is unavailable, replace with png2icns from libicns - # Patch bad hardcoded compiler - # Don't mess with codesign, doesn't seem to work? - postPatch = - '' - substituteInPlace Makefile.am \ - --replace-fail 'sips' '## sips' \ - --replace-fail 'iconutil -c icns -o contrib/macos/dosbox.icns src/dosbox.iconset' 'png2icns contrib/macos/dosbox.icns contrib/macos/dosbox-x.png' \ - --replace-fail 'g++' "$CXX" \ - --replace-fail 'codesign' '## codesign' - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - patchShebangs appbundledeps.py - ''; - - strictDeps = true; - - nativeBuildInputs = - [ - autoreconfHook - makeWrapper - pkg-config - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libicns - python3 - ]; - - buildInputs = - [ - ffmpeg - fluidsynth - freetype - glib - libpcap - libpng - libslirp - ncurses - SDL2 - SDL2_net - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - libxkbfile - libXrandr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioUnit - Carbon - Cocoa - ]; - - # Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL2 subdirectory - env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_net}/include/SDL2"; - - configureFlags = [ "--enable-sdl2" ]; - - enableParallelBuilding = true; - - hardeningDisable = [ "format" ]; # https://github.com/joncampbell123/dosbox-x/issues/4436 - - # Build optional App Bundle target, which needs at least one arch-suffixed binary - postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - cp src/dosbox-x src/dosbox-x-$(uname -m) - make dosbox-x.app - ''; - - postInstall = - lib.optionalString stdenv.hostPlatform.isLinux '' - wrapProgram $out/bin/dosbox-x \ - --prefix PATH : ${lib.makeBinPath [ yad ]} - '' - # Install App Bundle, wrap regular binary into bundle's binary to get the icon working - + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir $out/Applications - mv dosbox-x.app $out/Applications/ - mv $out/bin/dosbox-x $out/Applications/dosbox-x.app/Contents/MacOS/dosbox-x - makeWrapper $out/Applications/dosbox-x.app/Contents/MacOS/dosbox-x $out/bin/dosbox-x - ''; - - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - # Version output on stderr, program returns status code 1 - command = "${lib.getExe finalAttrs.finalPackage} -version 2>&1 || true"; - }; - - meta = { - homepage = "https://dosbox-x.com"; - description = "Cross-platform DOS emulator based on the DOSBox project"; - longDescription = '' - DOSBox-X is an expanded fork of DOSBox with specific focus on running - Windows 3.x/9x/Me, PC-98 and 3D support via 3dfx. - - The full expanded feature list is available here: - https://dosbox-x.com/wiki/DOSBox%E2%80%90X%E2%80%99s-Feature-Highlights - ''; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - hughobrien - OPNA2608 - ]; - platforms = lib.platforms.unix; - mainProgram = "dosbox-x"; - }; -}) diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index f27d3e06adb5..7026d2f2598f 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -11,8 +11,8 @@ graphicsmagick, libGL, libGLU, - OpenGL, libpng, + binutils, makeDesktopItem, }: @@ -33,10 +33,17 @@ stdenv.mkDerivation rec { }) ]; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook copyDesktopItems graphicsmagick + SDL # for sdl-config during build time + ]; + + depsBuildBuild = [ + binutils # build calls `ar` ]; buildInputs = @@ -46,17 +53,10 @@ stdenv.mkDerivation rec { SDL_sound libpng ] - ++ ( - if stdenv.hostPlatform.isDarwin then - [ - OpenGL - ] - else - [ - libGL - libGLU - ] - ); + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libGL + libGLU + ]; # Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL subdirectory env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL_net}/include/SDL"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix b/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix index dcc3a00d1d2a..6ef4d3d666b1 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-lynx"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2025-05-10"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-lynx-libretro"; - rev = "7fead71b49e0f08be5c4d4224fea73c6174763bf"; - hash = "sha256-fYBx/bjbhRXoVIGnEg4/oMVm705ivL1os+FfVQLRSyI="; + rev = "efd1797c7aa5a83c354507b1b61ac24222ebaa58"; + hash = "sha256-K+VZYqNl3G1eE7dSlfmZFCoS5bKIyGSNNu2i737bKnM="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index 53fa19ff4df0..c731d9bc3535 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-04-18"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "9f2b7943db1fb784daf0948b0b493bc7f76919f8"; - hash = "sha256-fwrfZ0Z/DAtDRuBqxCS11/qNoomAtUgEOf4eOLk9vO0="; + rev = "baa35513545b011faa8b0b5db334d24ba15539ed"; + hash = "sha256-jEvbHCK9AB4u3raWbAivscHqBiH9s+RkgExTVW1yvnk="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index 50679b0bf8c9..746cb598e41f 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2025-03-28"; + version = "0-unstable-2025-04-18"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "e2522914f72291ad7232d996e7eabdf167b1b414"; - hash = "sha256-uxnRNP5BRpabHLjuI4IiLzqCfRobETEMnwJ9mw+ZdaE="; + rev = "4e0cb4ddf0c52ef802cd4f7f2b7d3a187ab9962d"; + hash = "sha256-XjJf/EPgJmbxGPJl2SEoVA47iRzjSKISt/3rmW5Wysg="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix index b2e52fd6202f..d4716778840b 100644 --- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix +++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bluemsx"; - version = "0-unstable-2024-12-04"; + version = "0-unstable-2025-04-15"; src = fetchFromGitHub { owner = "libretro"; repo = "bluemsx-libretro"; - rev = "572c91856a5288b7433c619af651e31f00f3ce7e"; - hash = "sha256-fN5zjQGIyx3yIEgIhC50gD3O2F6WPJ/ssiauQ5Z/t9s="; + rev = "efaaa1052dc427d64534531cf59a6a9a659dc6a6"; + hash = "sha256-oCjIQ78YU5SeeefHHwd7l3U+YhwVMf6R2mbsuHAQUYQ="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix index 539bcef66f52..846b6d9ddb0f 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bsnes"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-04-11"; src = fetchFromGitHub { owner = "libretro"; repo = "bsnes-libretro"; - rev = "ec353ea2502be9b71f3d9830b7a7b66ee69e254c"; - hash = "sha256-9QRKEIi1JHd503KN9+DKxLMJMJWyNu9vomPAmlbb/zw="; + rev = "b102d6d5817b25aa059b573cd3b7675f2e375fa4"; + hash = "sha256-a77SSoz0C189iNHUB2bcO3X76LPbA/V7pAZtUR03u48="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/citra.nix b/pkgs/applications/emulators/libretro/cores/citra.nix index 979e9e78a58c..febf6e8413c6 100644 --- a/pkgs/applications/emulators/libretro/cores/citra.nix +++ b/pkgs/applications/emulators/libretro/cores/citra.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "citra"; - version = "0-unstable-2024-12-03"; + version = "0-unstable-2025-05-07"; src = fetchFromGitHub { owner = "libretro"; repo = "citra"; - rev = "a31aff7e1a3a66f525b9ea61633d2c5e5b0c8b31"; - hash = "sha256-HlhY4AeFQSabrmPQWLygjPGTWkIh0U0Hv1Fv4YFu9xg="; + rev = "b1f9fe0c3d4d6c4e133a710bc172d9adcb40c706"; + hash = "sha256-EI8N+tjA6UsEq7sKIZ/zxeugW/oyCF+cPKX2HTjVqNI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/dolphin.nix b/pkgs/applications/emulators/libretro/cores/dolphin.nix index b645617b4696..4a2599760601 100644 --- a/pkgs/applications/emulators/libretro/cores/dolphin.nix +++ b/pkgs/applications/emulators/libretro/cores/dolphin.nix @@ -17,13 +17,13 @@ }: mkLibretroCore { core = "dolphin"; - version = "0-unstable-2024-04-19"; + version = "0-unstable-2025-05-17"; src = fetchFromGitHub { owner = "libretro"; repo = "dolphin"; - rev = "89a4df725d4eb24537728f7d655cddb1add25c18"; - hash = "sha256-f9O3//EuoCSPQC7GWmf0EzAEpjoKof30kIDBCDw0dbs="; + rev = "a09f78f735f0d2184f64ba5b134abe98ee99c65f"; + hash = "sha256-NUnWNj47FmH8perfRwFFnaXeU58shUXqKFOzHf4ce5c="; }; extraNativeBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index a1f582cda4a9..a921783dc303 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2025-03-18"; + version = "0-unstable-2025-05-09"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "619c575db6f81d1911e36f1ecd618c9dead86859"; - hash = "sha256-Pp3OP69KKrznOl1cY5yiKxMJRA7REe4S51zGDHG883c="; + rev = "7c30b5266a37cee67612b7cab1a714be16f3be4e"; + hash = "sha256-VVswTqlUqW79P9LhEV7epEGT6JknejZnArb3f+qFE40="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index cdb81f37a905..0abcdb69ecab 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2025-03-26"; + version = "0-unstable-2025-05-19"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "ad3b6536f57ec189defabc8aa0fe9d854d167d67"; - hash = "sha256-Nyzzr6XFQmtRVWxATIIONn3tnwwS6jLbbwHxoYXUDGU="; + rev = "d2cf158e9ba82fc7dfec592452e6113121665c19"; + hash = "sha256-dO1R0iIXEo2lrMSOJXlZBw2yXBfyB/1yFfRPYEEAojo="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix index fe7a6f78ed78..756674750c08 100644 --- a/pkgs/applications/emulators/libretro/cores/fceumm.nix +++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fceumm"; - version = "0-unstable-2025-02-12"; + version = "0-unstable-2025-05-02"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-fceumm"; - rev = "26f92531a95a9a74f45a8bf13fc9f3f48cde2976"; - hash = "sha256-XtSuZEfu03dFMQUX4VvpeFLzoWG3TeIBQG4cQkap+t8="; + rev = "3544ff567ecc417c170641587083b976739ef9db"; + hash = "sha256-eNmzWLJVPeqFFEcFIhOQCn9OMrBp0iraTcft5pJVvvE="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index 2cf45fc000e4..23ab23c3a2cd 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2025-03-22"; + version = "0-unstable-2025-05-10"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "305cae496fe009a523e1a43cc6a11141531626ef"; - hash = "sha256-L91RS+GzNA0IpVh1ANkS7V2wWJqdXyioxJuCP+f5SEA="; + rev = "ffc32d2d8676e1ca35b074196afbfb2697ee7d59"; + hash = "sha256-IF16YA8YynAhZ42G17aMwKRvlMG3DojrPqslWY43ww8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index c60d72e1d021..57f1183b4014 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-05-02"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "4b3edb41d33e52b6d70c4e18bf0819a070991b66"; - hash = "sha256-8RmNDvUd64FqEgduNMHgbunu92SqMi+Pn//Ou2EQUFs="; + rev = "a85fe7c20933dbe4680d783d32639a71a85783cb"; + hash = "sha256-YwQQkRshDDQi9CzqNnhKkj7+A0fkvcEZEg6PySaFDRI="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index ea811e7eece3..70efc4c84e23 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-03-08"; + version = "0-unstable-2025-05-02"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "1024afbcd77a7bf7c87972c7c86d3a7759877fc7"; - hash = "sha256-9Y3uzWpiYIRGTFApVGdLIONpBpPaO1sRgaGj1EVI3M4="; + rev = "f64e0a1e04a67a5edf79026c07dc5094f8df74bc"; + hash = "sha256-eG0lzdo/AWVAl+V71X8YNGK1Dk1oLW3jvGY3IS0ekNw="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix index 82855f07f20f..7917b7c55312 100644 --- a/pkgs/applications/emulators/libretro/cores/mame.nix +++ b/pkgs/applications/emulators/libretro/cores/mame.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "mame"; - version = "0-unstable-2025-03-06"; + version = "0-unstable-2025-05-01"; src = fetchFromGitHub { owner = "libretro"; repo = "mame"; - rev = "40edadab2e445bfda9d206def9508b43b11fb96a"; - hash = "sha256-TrDx77VCdtLuihwhlz+sYkUvegTxsG8eAn3h6KYO3z0="; + rev = "ee7155be0735e38f47c555a69217a2b77d6eca13"; + hash = "sha256-g/gl8NFwAAUb9csynpYsxd2WBzKv5kReWDtfOc+qTv4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index 876cc55cc95b..e83c9b162354 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2025-03-27"; + version = "0-unstable-2025-05-16"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "4df08f409666e46a0a2d94c3cebcfbba72975ca9"; - hash = "sha256-Dp4f3j9Zm3BLMftEJSDSYrqPy1zJ8miStiUTI9mFdLw="; + rev = "c478eae7484b76aaacc76659dd4d7b8e1163bc87"; + hash = "sha256-l7GwSj7/A/1ZAAqWz1GtMDCl6F45GJqucDBD89yqcsU="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003.nix b/pkgs/applications/emulators/libretro/cores/mame2003.nix index ddc92524eeac..6c89c1a541e0 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003"; - version = "0-unstable-2025-03-18"; + version = "0-unstable-2025-05-16"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-libretro"; - rev = "8565eec2e963b78f07a5a1f4b74df1271f3ece13"; - hash = "sha256-pChPUwKIOtP4nl9ReqlrgxOJ/qcO6m2SnHhx3Y+hktM="; + rev = "c24237583afcadb1c3c1727532bd4a49ebc5eff1"; + hash = "sha256-zj1mNpfwYCUQAHAeg8+hVUOZ/xvIFhn65AeljjqI1Ss="; }; # Fix build with GCC 14 diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix index 9ec7d0031f50..7ae7303c7cad 100644 --- a/pkgs/applications/emulators/libretro/cores/nestopia.nix +++ b/pkgs/applications/emulators/libretro/cores/nestopia.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "nestopia"; - version = "0-unstable-2025-03-22"; + version = "0-unstable-2025-04-24"; src = fetchFromGitHub { owner = "libretro"; repo = "nestopia"; - rev = "b3eb368603cd519d54bb4886d2934ee4fd188081"; - hash = "sha256-gaMZEP+8vCb/b9lhrXcUK4N7v9uxX/FVgnzK48rxyHQ="; + rev = "d2eefab298b0b9152d2934d6f0227b6803c877b3"; + hash = "sha256-lmfyNi+E2SoCOAtXuJ3F5S3mm1OCta9FHtoqPpLgYk8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix index f107b64f8d5d..7dc31a0a0e86 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "pcsx-rearmed"; - version = "0-unstable-2025-03-26"; + version = "0-unstable-2025-04-13"; src = fetchFromGitHub { owner = "libretro"; repo = "pcsx_rearmed"; - rev = "4b0894f55fb7244b522fb720f41363e86f2085fe"; - hash = "sha256-748TR87fO1BLBWwDAJxkEBr327g64RUTdBvvMu6lSEI="; + rev = "febf2246848efb8937ab24c562bba20107bb46f0"; + hash = "sha256-1mnPYr5A6KmZXXbvkE9XkZiCjx/y0Y9/Ed34LQHDbvE="; }; dontConfigure = true; diff --git a/pkgs/applications/emulators/libretro/cores/picodrive.nix b/pkgs/applications/emulators/libretro/cores/picodrive.nix index f7a8e3bc1bc9..59ab241ed787 100644 --- a/pkgs/applications/emulators/libretro/cores/picodrive.nix +++ b/pkgs/applications/emulators/libretro/cores/picodrive.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "picodrive"; - version = "0-unstable-2025-03-25"; + version = "0-unstable-2025-04-10"; src = fetchFromGitHub { owner = "libretro"; repo = "picodrive"; - rev = "752c266491ae8775dab9a98dbd94472f42b9b16f"; - hash = "sha256-l9qYOUyQzyleWeQv74rEOEwOk6iyH43WVIUHcC6Aw2Y="; + rev = "c4332d608c1005a46ce51236ade9894e0d32e52b"; + hash = "sha256-qu5pnqHHO/k8OO2XXwd/H7AQsutmnMz+RBT6ZZFXZgk="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index a0dd0c6399db..18934eeb20f2 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-03-25"; + version = "0-unstable-2025-05-09"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "01d094c0c3ed723b0747079afddfd319001f01d4"; - hash = "sha256-o8tfYg88spRZBDokc/dkRsVvvfGejYVnDQfvQ1BBRps="; + rev = "96d27505b8332bac1bac7b8f02c049b1cc0ca800"; + hash = "sha256-dX8aH5zGcrCJc/hG/4Yfzv/O2jy8h+HB8pVwI3qPXEY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index 428e7982f5f8..37875157ab64 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2025-03-26"; + version = "0-unstable-2025-05-19"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "e4a492b6a2d72582e0d32ffd05b7f37d3312657c"; - hash = "sha256-2WuKxfOmlNcPIbwVjCbGfvWIwd5/WYb7pFGMnzg3fZQ="; + rev = "48852ed81dbfb4b502a45eb632d4f999a892cc72"; + hash = "sha256-XgYu36byAxXTDsgq4Iz+VPWQNsPxXQP+hx+/MYZkm6k="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix index 3c0cb10e13ca..470a02bbd0cc 100644 --- a/pkgs/applications/emulators/libretro/cores/puae.nix +++ b/pkgs/applications/emulators/libretro/cores/puae.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "puae"; - version = "0-unstable-2025-03-27"; + version = "0-unstable-2025-05-14"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-uae"; - rev = "987ac9bf14b813bf14ee6ab0f9d1f95c9d19ea78"; - hash = "sha256-ONL7KjDMF+syiwBG+ivU7b7D7qFVr2gpw5ulnV3OZU8="; + rev = "fad7beb42c90a1a04829d465bed951a69cd36f8b"; + hash = "sha256-pO45/IvgT2q5k0sBhSNZ6srJx4h2lYSjG/mKFJesGbc="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/scummvm.nix b/pkgs/applications/emulators/libretro/cores/scummvm.nix index 7e545bb3c28a..13082d102542 100644 --- a/pkgs/applications/emulators/libretro/cores/scummvm.nix +++ b/pkgs/applications/emulators/libretro/cores/scummvm.nix @@ -25,13 +25,13 @@ let in mkLibretroCore { core = "scummvm"; - version = "0-unstable-2025-03-09"; + version = "0-unstable-2025-04-05"; src = fetchFromGitHub { owner = "libretro"; repo = "scummvm"; - rev = "8e9d265d81661dcffe0bc326e07e50af5d1d224a"; - hash = "sha256-BdBQoj358uL7VNPZozRA4oEG5KS09rkucd80vQgkaDo="; + rev = "9d31b31c179fd4a43f7cfc383a3435a9070c6aa8"; + hash = "sha256-E5e30Iowwr8pnryncnzlPjBhpIEuKqAHxHk+HwagEnE="; }; extraBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix index 65c90fa00d1b..d2031ec06789 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "snes9x"; - version = "0-unstable-2025-02-24"; + version = "0-unstable-2025-05-03"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = "0525ea043ea173ec6af1c6c8dade820036376430"; - hash = "sha256-BB65aYfkNqM/Lb3/dGMrPBpuR0tjewA45xnIXHaqWsA="; + rev = "97bc6b08b1da511fa449ecb412ca74fa54f4a3fb"; + hash = "sha256-BZTpQACkjFxk9QsDievu8NHYkJiRAQ0jAuD4LlkrZ7A="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index 662ae52655dc..485f488307a5 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "0-unstable-2025-03-17"; + version = "0-unstable-2025-05-17"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "aaa6c154750119905190da49569fa9e2de7bb97b"; - hash = "sha256-QephycS6p6KCAR5ryc8Nhx8jnFGHaY7kObT13RNU42Q="; + rev = "8421af89314bbdcf118d4b3884a9f566e4b1020e"; + hash = "sha256-uffcz8TXb0vEivOEcnL288YT8rspSOGcNdXtGijXX1g="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/tgbdual.nix b/pkgs/applications/emulators/libretro/cores/tgbdual.nix index 5925125cee29..2f54c2ffd9f0 100644 --- a/pkgs/applications/emulators/libretro/cores/tgbdual.nix +++ b/pkgs/applications/emulators/libretro/cores/tgbdual.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "tgbdual"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2025-05-10"; src = fetchFromGitHub { owner = "libretro"; repo = "tgbdual-libretro"; - rev = "8d305769eebd67266c284558f9d3a30498894d3d"; - hash = "sha256-3mlnTgp43qC3yifpr6pvtC4vslddcf6mephKA183vEk="; + rev = "933707c0ba8f12360f6d79712f735a917713709a"; + hash = "sha256-58OLuF14aSJGhmXR0RGgPpuHLXYk9LOz7LX03AEFPr4="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/vecx.nix b/pkgs/applications/emulators/libretro/cores/vecx.nix index e8a21deae253..b33822d8c9ce 100644 --- a/pkgs/applications/emulators/libretro/cores/vecx.nix +++ b/pkgs/applications/emulators/libretro/cores/vecx.nix @@ -7,13 +7,13 @@ }: mkLibretroCore { core = "vecx"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2025-04-12"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-vecx"; - rev = "a103a212ca8644fcb5d76eac7cdec77223c4fb02"; - hash = "sha256-veCGW5mbR1V7cCzZ4BzDSdPZDycw4WNveie/DDVAzw8="; + rev = "841229a6a81a0461d08af6488f252dcec5266c6a"; + hash = "sha256-bWhXXJCf/ax7n/sOfXibGvcFnCnmULcALoBR1uyIN+I="; }; extraBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/vice.nix b/pkgs/applications/emulators/libretro/cores/vice.nix index 936949cc4faf..56567ff86376 100644 --- a/pkgs/applications/emulators/libretro/cores/vice.nix +++ b/pkgs/applications/emulators/libretro/cores/vice.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "vice-${type}"; - version = "0-unstable-2025-02-23"; + version = "0-unstable-2025-05-16"; src = fetchFromGitHub { owner = "libretro"; repo = "vice-libretro"; - rev = "50cd8c29c8abab29e8d55e8fab8e131fadfbe98c"; - hash = "sha256-Vj7clLLkYyesnP9lL0Z4sy2kvxTsatKzuW6XBg21Jrw="; + rev = "86bcfa8c4839236f70e31c656d220c074ff1dfb0"; + hash = "sha256-Dw+dY1IsR5cIzXa61bWO+2GhrYqgC2ASMjxQe2MVeco="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/mkLibretroCore.nix b/pkgs/applications/emulators/libretro/mkLibretroCore.nix index 35ad4776ef89..892f5798c4d9 100644 --- a/pkgs/applications/emulators/libretro/mkLibretroCore.nix +++ b/pkgs/applications/emulators/libretro/mkLibretroCore.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation ( inherit mainProgram; inherit (retroarch-bare.meta) platforms; homepage = "https://www.libretro.com/"; - maintainers = with lib.maintainers; [ ] ++ lib.teams.libretro.members; + teams = [ lib.teams.libretro ]; } // (args.meta or { }); } // extraArgs diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index f8f24628cf4f..0db8ba1d4996 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -30,24 +30,21 @@ utf8proc, versionCheckHook, which, + wrapQtAppsHook, writeScript, zlib, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; -in stdenv.mkDerivation rec { pname = "mame"; - version = "0.276"; + version = "0.277"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-HrEQmeCTwNXcEWcpXfLkBNnZdcZag4nB6ZN+8KKf5AE="; + hash = "sha256-mGKTZ8/gvGQv9oXK4pgbJk580GAAXUS16hRQu4uHhdA="; }; outputs = [ @@ -76,8 +73,6 @@ stdenv.mkDerivation rec { "USE_SYSTEM_LIB_ZLIB=1" ]; - dontWrapQtApps = true; - # https://docs.mamedev.org/initialsetup/compilingmame.html buildInputs = [ @@ -105,8 +100,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libpcap - CoreAudioKit - ForceFeedback ]; nativeBuildInputs = [ @@ -116,6 +109,7 @@ stdenv.mkDerivation rec { pkg-config python3 which + wrapQtAppsHook ]; patches = [ @@ -127,10 +121,27 @@ stdenv.mkDerivation rec { # Since the bug described in https://github.com/NixOS/nixpkgs/issues/135438, # it is not possible to use substituteAll - postPatch = '' - substituteInPlace src/emu/emuopts.cpp \ - --subst-var-by mamePath "$out/opt/mame" - ''; + postPatch = + '' + substituteInPlace src/emu/emuopts.cpp \ + --subst-var-by mamePath "$out/opt/mame" + '' + # MAME's build system uses `sw_vers` to test whether it needs to link with + # the Metal framework or not. However: + # a) that would return the build system's version, not the target's, and + # b) it can't actually find `sw_vers` in $PATH, so it thinks it's on macOS + # version 0, and doesn't link with Metal - causing missing symbol errors + # when it gets to the link step, because other parts of the build system + # _do_ use the correct target version number. + # This replaces the `sw_vers` call with the macOS version actually being + # targeted, so everything gets linked correctly. + + lib.optionalString stdenv.hostPlatform.isDarwin '' + for file in scripts/src/osd/{mac,sdl}.lua; do + substituteInPlace "$file" --replace-fail \ + 'backtick("sw_vers -productVersion")' \ + "os.getenv('MACOSX_DEPLOYMENT_TARGET') or '$darwinMinVersion'" + done + ''; desktopItems = [ (makeDesktopItem { @@ -194,7 +205,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "-h" ]; + versionCheckProgramArg = "-h"; passthru.updateScript = writeScript "mame-update-script" '' #!/usr/bin/env nix-shell diff --git a/pkgs/applications/emulators/punes/default.nix b/pkgs/applications/emulators/punes/default.nix index f1d713e9f008..3bbe186ab360 100644 --- a/pkgs/applications/emulators/punes/default.nix +++ b/pkgs/applications/emulators/punes/default.nix @@ -31,12 +31,20 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Fix FTBFS with Qt 6.7.1 - # Remove when https://github.com/punesemu/puNES/pull/403 merged & in release + # Remove when version > 0.111 (fetchpatch { name = "0001-punes-Fix-compatibility-with-Qt-6.7.1.patch"; - url = "https://github.com/punesemu/puNES/commit/78c72d2dfcd570e7463a78da10904cebae6127f5.patch"; + url = "https://github.com/punesemu/puNES/commit/6e51b1a6107ad3de97edd40ae4ec2d41b32d804f.patch"; hash = "sha256-xRalKIOb1qWgqJsFLcm7uUOblEfHDYbkukmcr4/+4Qc="; }) + + # Fix FTBFS with Qt 6.9 + # Remove when version > 0.111 + (fetchpatch { + name = "0002-punes-Updated-code-for-Qt-6.9.0-compatibility.patch"; + url = "https://github.com/punesemu/puNES/commit/ff906e0a79eeac9a2d16783e0accf65748bb275e.patch"; + hash = "sha256-+s7AdaUBgCseQs6Mxat/cDmQ77s6K6J0fUfyihP82jM="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 355630d9443a..0ca31e9695be 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -265,7 +265,7 @@ stdenv.mkDerivation ( hidden="$(dirname "$prog")/.$(basename "$prog")" mv "$prog" "$hidden" makeWrapper "$hidden" "$prog" \ - --argv0 "" \ + ${lib.optionalString (lib.versionAtLeast version "10.1") "--inherit-argv0"} \ --set WINELOADER "$hidden" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" fi @@ -286,8 +286,8 @@ stdenv.mkDerivation ( passthru = { inherit pkgArches; - inherit (src) updateScript; tests = { inherit (nixosTests) wine; }; + updateScript = src.updateScript or null; }; meta = { inherit version; @@ -301,9 +301,10 @@ stdenv.mkDerivation ( inherit badPlatforms platforms; maintainers = with lib.maintainers; [ avnik - raskin bendlas jmc-figueira + kira-bruneau + raskin reckenrode ]; inherit mainProgram; diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index c39e373587ca..605f327a5f6b 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -90,10 +90,18 @@ let } ); + baseRelease = + { + staging = "unstable"; + yabridge = "yabridge"; + } + .${wineRelease} or null; in -if wineRelease == "staging" then +if baseRelease != null then callPackage ./staging.nix { - wineUnstable = wine-build wineBuild "unstable"; + wineUnstable = (wine-build wineBuild baseRelease).override { + inherit wineRelease; + }; } else wine-build wineBuild wineRelease diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 853dea8f22e6..38bbca910c7a 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -65,6 +65,23 @@ let source ${./update-lib.sh} ''; + # Needed for wine versions < 10.2 to fix compatibility with binutils 2.44 + # https://github.com/NixOS/nixpkgs/issues/399714 + # https://bugs.winehq.org/show_bug.cgi?id=57819 + # https://gitlab.winehq.org/wine/wine/-/merge_requests/7328 + patches-binutils-2_44-fix-wine-older-than-10_2 = [ + (pkgs.fetchpatch { + name = "ntdll-use-signed-type"; + url = "https://gitlab.winehq.org/wine/wine/-/commit/fd59962827a715d321f91c9bdb43f3e61f9ebbc.patch"; + hash = "sha256-PvFom9NJ32XZO1gYor9Cuk8+eaRFvmG572OAtNx1tks="; + }) + (pkgs.fetchpatch { + name = "winebuild-avoid using-idata-section"; + url = "https://gitlab.winehq.org/wine/wine/-/commit/c9519f68ea04915a60704534ab3afec5ec1b8fd7.patch"; + hash = "sha256-vA58SfAgCXoCT+NB4SRHi85AnI4kj9S2deHGp4L36vI="; + }) + ]; + inherit (pkgs) writeShellScript; in rec { @@ -96,7 +113,7 @@ rec { patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE ./cert-path.patch - ]; + ] ++ patches-binutils-2_44-fix-wine-older-than-10_2; updateScript = writeShellScript "update-wine-stable" ('' ${updateScriptPreamble} @@ -115,10 +132,26 @@ rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "10.4"; + version = "10.5"; url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz"; - hash = "sha256-oJAZzlxCuga6kexCPUnY8qmo6sTBqSMMc+HRGWOdXpI="; - inherit (stable) patches; + hash = "sha256-wDbsHvR2dHdKX5lFgwIuni62j+j8GLOox55oWzvsibw="; + + patches = [ + # Also look for root certificates at $NIX_SSL_CERT_FILE + ./cert-path.patch + ]; + + # see https://gitlab.winehq.org/wine/wine-staging + staging = fetchFromGitLab { + inherit version; + hash = "sha256-rXA/55rwQSJR247E4H7cQdTtXRmjomRbls7THV3jfcE="; + domain = "gitlab.winehq.org"; + owner = "wine"; + repo = "wine-staging"; + rev = "v${version}"; + + disabledPatchsets = [ ]; + }; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -147,8 +180,8 @@ rec { latest_mono=$(get_latest_lib_version wine-mono) update_staging() { - staging_url=$(get_source_attr staging.url) - set_source_attr staging hash "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\"" + staging_url=$(get_source_attr unstable.staging.url) + set_source_attr unstable.staging hash "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\"" } autobump unstable "$latest_unstable" "" update_staging @@ -160,16 +193,47 @@ rec { ''; }; - staging = fetchFromGitLab rec { - # https://gitlab.winehq.org/wine/wine-staging - inherit (unstable) version; - hash = "sha256-LteUANxr+w1N9r6LNztjRfr3yXtJnUMi0uayTRtFoSU="; - domain = "gitlab.winehq.org"; - owner = "wine"; - repo = "wine-staging"; - rev = "v${version}"; + yabridge = fetchurl rec { + # NOTE: This is a pinned version with staging patches; don't forget to update them as well + version = "9.21"; + url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; + hash = "sha256-REK0f/2bLqRXEA427V/U5vTYKdnbeaJeYFF1qYjKL/8="; - disabledPatchsets = [ ]; + patches = [ + # Also look for root certificates at $NIX_SSL_CERT_FILE + ./cert-path.patch + ] ++ patches-binutils-2_44-fix-wine-older-than-10_2; + + # see https://gitlab.winehq.org/wine/wine-staging + staging = fetchFromGitLab { + inherit version; + hash = "sha256-FDNszRUvM1ewE9Ij4EkuihaX0Hf0eTb5r7KQHMdCX3U="; + domain = "gitlab.winehq.org"; + owner = "wine"; + repo = "wine-staging"; + rev = "v${version}"; + + disabledPatchsets = [ ]; + }; + + ## see http://wiki.winehq.org/Gecko + gecko32 = fetchurl rec { + version = "2.47.4"; + url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; + hash = "sha256-Js7MR3BrCRkI9/gUvdsHTGG+uAYzGOnvxaf3iYV3k9Y="; + }; + gecko64 = fetchurl rec { + version = "2.47.4"; + url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; + hash = "sha256-5ZC32YijLWqkzx2Ko6o9M3Zv3Uz0yJwtzCCV7LKNBm8="; + }; + + ## see http://wiki.winehq.org/Mono + mono = fetchurl rec { + version = "9.3.0"; + url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; + hash = "sha256-bKLArtCW/57CD69et2xrfX3oLZqIdax92fB5O/nD/TA="; + }; }; wayland = pkgs.lib.warnOnInstantiate "building wine with `wineRelease = \"wayland\"` is deprecated. Wine now builds with the wayland driver by default." stable; # added 2025-01-23 diff --git a/pkgs/applications/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix index ed3fe3125067..981d8f9e54f6 100644 --- a/pkgs/applications/emulators/wine/staging.nix +++ b/pkgs/applications/emulators/wine/staging.nix @@ -13,12 +13,12 @@ with callPackage ./util.nix { }; let - patch = (callPackage ./sources.nix { }).staging; + patch = wineUnstable.src.staging; build-inputs = pkgNames: extra: (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version; -(wineUnstable.override { wineRelease = "staging"; }).overrideAttrs (self: { +wineUnstable.overrideAttrs (self: { buildInputs = build-inputs ( [ "perl" diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/applications/emulators/zsnes/2.x.nix index 94cb5ad8e6e0..cc0ae95a1a27 100644 --- a/pkgs/applications/emulators/zsnes/2.x.nix +++ b/pkgs/applications/emulators/zsnes/2.x.nix @@ -6,6 +6,7 @@ libGL, libGLU, libpng, + libX11, nasm, pkg-config, zlib, @@ -18,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "xyproto"; repo = "zsnes"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-Xz+9YgMpnHyno7vP67aut4tIyG/gTn7SnU2FO2QMND0="; }; @@ -32,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libGLU libpng + libX11 zlib ]; diff --git a/pkgs/applications/file-managers/dfilemanager/default.nix b/pkgs/applications/file-managers/dfilemanager/default.nix deleted file mode 100644 index 44f2675f18d6..000000000000 --- a/pkgs/applications/file-managers/dfilemanager/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - cmake, - file, - qtbase, - qttools, - solid, -}: - -mkDerivation { - pname = "dfilemanager"; - version = "unstable-2021-02-20"; - - src = fetchFromGitHub { - owner = "probonopd"; - repo = "dfilemanager"; - rev = "61179500a92575e05cf9a71d401c388726bfd73d"; - sha256 = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - qtbase - qttools - file - solid - ]; - - cmakeFlags = [ "-DQT5BUILD=true" ]; - - meta = { - homepage = "https://github.com/probonopd/dfilemanager"; - description = "File manager written in Qt/C++"; - mainProgram = "dfm"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix deleted file mode 100644 index cd3dc3be2b47..000000000000 --- a/pkgs/applications/file-managers/krusader/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - extra-cmake-modules, - kdoctools, - karchive, - kconfig, - kcrash, - kguiaddons, - kparts, - kwindowsystem, - cmake, - wrapQtAppsHook, - qt5compat, - kstatusnotifieritem, -}: - -stdenv.mkDerivation rec { - pname = "krusader"; - version = "2.9.0"; - - src = fetchurl { - url = "mirror://kde/stable/krusader/${version}/krusader-${version}.tar.xz"; - hash = "sha256-ybeb+t5sxp/g40Hs75Mvysiv2f6U6MvPvXKf61Q5TgQ="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - kdoctools - wrapQtAppsHook - ]; - - propagatedBuildInputs = [ - karchive - kconfig - kcrash - kguiaddons - kparts - kwindowsystem - qt5compat - kstatusnotifieritem - ]; - - meta = { - homepage = "http://www.krusader.org"; - description = "Norton/Total Commander clone for KDE"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ sander ]; - mainProgram = "krusader"; - }; -} diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix deleted file mode 100644 index 4174e5bc82e7..000000000000 --- a/pkgs/applications/file-managers/mc/default.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - buildPackages, - pkg-config, - glib, - gpm, - file, - e2fsprogs, - libICE, - perl, - zip, - unzip, - gettext, - slang, - libssh2, - openssl, - coreutils, - autoSignDarwinBinariesHook, - x11Support ? true, - libX11, - - # updater only - writeScript, -}: - -stdenv.mkDerivation rec { - pname = "mc"; - version = "4.8.33"; - - src = fetchurl { - url = "https://ftp.osuosl.org/pub/midnightcommander/${pname}-${version}.tar.xz"; - hash = "sha256-yuFJ1C+ETlGF2MgdfbOROo+iFMZfhSIAqdiWtGivFkw="; - }; - - nativeBuildInputs = - [ - pkg-config - unzip - ] - # The preFixup hook rewrites the binary, which invaliates the code - # signature. Add the fixup hook to sign the output. - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - autoSignDarwinBinariesHook - ]; - - buildInputs = - [ - file - gettext - glib - libICE - libssh2 - openssl - slang - zip - ] - ++ lib.optionals x11Support [ libX11 ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - e2fsprogs - gpm - ]; - - enableParallelBuilding = true; - - configureFlags = [ - # used for vfs helpers at run time: - "PERL=${perl}/bin/perl" - # used for .hlp generation at build time: - "PERL_FOR_BUILD=${buildPackages.perl}/bin/perl" - - # configure arguments have a bunch of build-only dependencies. - # Avoid their retention in final closure. - "--disable-configure-args" - ]; - - postPatch = '' - substituteInPlace src/filemanager/ext.c \ - --replace /bin/rm ${coreutils}/bin/rm - ''; - - postFixup = lib.optionalString ((!stdenv.hostPlatform.isDarwin) && x11Support) '' - # libX11.so is loaded dynamically so autopatch doesn't detect it - patchelf \ - --add-needed ${libX11}/lib/libX11.so \ - $out/bin/mc - ''; - - passthru.updateScript = writeScript "update-mc" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl pcre common-updater-scripts - - set -eu -o pipefail - - # Expect the text in format of "Current version is: 4.8.27; ...". - new_version="$(curl -s https://midnight-commander.org/ | pcregrep -o1 'Current version is: (([0-9]+\.?)+);')" - update-source-version mc "$new_version" - ''; - - meta = with lib; { - description = "File Manager and User Shell for the GNU Project, known as Midnight Commander"; - downloadPage = "https://ftp.osuosl.org/pub/midnightcommander/"; - homepage = "https://midnight-commander.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sander ]; - platforms = with platforms; linux ++ darwin; - mainProgram = "mc"; - }; -} diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix deleted file mode 100644 index fb72f76d29a5..000000000000 --- a/pkgs/applications/gis/grass/default.nix +++ /dev/null @@ -1,172 +0,0 @@ -{ - lib, - stdenv, - callPackage, - fetchFromGitHub, - makeWrapper, - wrapGAppsHook3, - - withOpenGL ? !stdenv.hostPlatform.isDarwin, - - bison, - blas, - cairo, - ffmpeg, - fftw, - flex, - freetype, - gdal, - geos, - lapack, - libGLU, - libiconv, - libpng, - libsvm, - libtiff, - libxml2, - llvmPackages, - netcdf, - pdal, - pkg-config, - libpq, - proj, - python3Packages, - readline, - sqlite, - wxGTK32, - zlib, - zstd, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "grass"; - version = "8.4.1"; - - src = fetchFromGitHub { - owner = "OSGeo"; - repo = "grass"; - rev = finalAttrs.version; - hash = "sha256-q1jOimQi+24I1ZBf6Z0cvAyXcBFBpT5aWSNeG6n6y0k="; - }; - - nativeBuildInputs = - [ - makeWrapper - wrapGAppsHook3 - - bison - flex - gdal # for `gdal-config` - geos # for `geos-config` - netcdf # for `nc-config` - pkg-config - ] - ++ (with python3Packages; [ - python-dateutil - numpy - wxpython - ]); - - buildInputs = - [ - blas - cairo - ffmpeg - fftw - freetype - gdal - geos - lapack - libpng - libsvm - libtiff - libxml2 - netcdf - pdal - libpq - proj - readline - sqlite - wxGTK32 - zlib - zstd - ] - ++ lib.optionals withOpenGL [ libGLU ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] - ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; - - strictDeps = true; - - configureFlags = - [ - "--with-blas" - "--with-cairo-ldflags=-lfontconfig" - "--with-cxx" - "--with-fftw" - "--with-freetype" - "--with-geos" - "--with-gdal" - "--with-lapack" - "--with-libsvm" - "--with-nls" - "--with-openmp" - "--with-pdal" - "--with-postgres" - "--with-postgres-libs=${libpq}/lib/" - "--with-proj-includes=${proj.dev}/include" - "--with-proj-libs=${proj}/lib" - "--with-proj-share=${proj}/share/proj" - "--with-sqlite" - "--with-zstd" - "--without-bzlib" - "--without-mysql" - "--without-odbc" - ] - ++ lib.optionals (!withOpenGL) [ - "--without-opengl" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "--without-cairo" - "--without-freetype" - "--without-x" - ]; - - # Otherwise a very confusing "Can't load GDAL library" error - makeFlags = lib.optional stdenv.hostPlatform.isDarwin "GDAL_DYNAMIC="; - - /* - Ensures that the python script run at build time are actually executable; - otherwise, patchShebangs ignores them. - */ - postConfigure = '' - for f in $(find . -name '*.py'); do - chmod +x $f - done - - patchShebangs */ - ''; - - postInstall = '' - wrapProgram $out/bin/grass \ - --set PYTHONPATH $PYTHONPATH \ - --set GRASS_PYTHON ${python3Packages.python.interpreter} \ - --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' - ln -s $out/grass*/lib $out/lib - ln -s $out/grass*/include $out/include - ''; - - enableParallelBuilding = true; - - passthru.tests = { - grass = callPackage ./tests.nix { grass = finalAttrs.finalPackage; }; - }; - - meta = with lib; { - description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; - homepage = "https://grass.osgeo.org/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ mpickering ]; - platforms = platforms.all; - mainProgram = "grass"; - }; -}) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index ef8e21463fa1..a6a9cd67e980 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -82,14 +82,14 @@ let ]; in mkDerivation rec { - version = "3.40.4"; + version = "3.40.6"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-R2/ycRPQVKqleSt+9D/YCpBlqKgJdhLc0BvYT7qFJo8="; + hash = "sha256-pw5XxaGDsyQfeJL582Iic2sg5j8AUPvM+I53YLB4aG4="; }; passthru = { @@ -201,7 +201,8 @@ mkDerivation rec { description = "Free and Open Source Geographic Information System"; homepage = "https://www.qgis.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ lsix ]; + maintainers = with maintainers; [ lsix ]; + teams = [ teams.geospatial ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 4a8ddae9923c..31c9302518a2 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -82,14 +82,14 @@ let ]; in mkDerivation rec { - version = "3.42.0"; + version = "3.42.2"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-vqT6ffqY1M6/2eW08VghysC+v7ZI9Yz0Zhk9UY/izZc="; + hash = "sha256-kWy+FBiqPMt8GLGWSJBQp0uD5l1IE/2KmDGdxKapg78="; }; passthru = { @@ -197,7 +197,8 @@ mkDerivation rec { description = "Free and Open Source Geographic Information System"; homepage = "https://www.qgis.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ lsix ]; + maintainers = with maintainers; [ lsix ]; + teams = [ teams.geospatial ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix deleted file mode 100644 index 24be5ebeb558..000000000000 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - cmake, - rustPlatform, - pkg-config, - fetchFromGitHub, - atk, - gtk3, - glib, - openssl, - Security, - nix-update-script, -}: - -rustPlatform.buildRustPackage rec { - pname = "whitebox_tools"; - version = "2.4.0"; - - src = fetchFromGitHub { - owner = "jblindsay"; - repo = "whitebox-tools"; - rev = "v${version}"; - hash = "sha256-kvtfEEydwonoDux1VbAxqrF/Hf8Qh8mhprYnROGOC6g="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-yQFGuhEGgkaa5N4uUIZ/0GFzP9CsPtiFet0hUppIQzQ="; - - buildInputs = [ - atk - glib - gtk3 - openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - doCheck = false; - - passthru.updateScript = nix-update-script { }; - - meta = { - homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html"; - description = "Advanced geospatial data analysis platform"; - license = lib.licenses.mit; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ mpickering ]); - }; -} diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 3dd69d56b19d..f1ec2668577b 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -45,8 +45,6 @@ libde265Support ? true, libde265, fftw, - ApplicationServices, - Foundation, testers, }: @@ -124,11 +122,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional djvulibreSupport djvulibre ++ lib.optional openexrSupport openexr ++ lib.optional librsvgSupport librsvg - ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Foundation - ]; + ++ lib.optional openjpegSupport openjpeg; propagatedBuildInputs = [ fftw ] diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c04bada3d3ed..1e6f6195c234 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -32,6 +32,8 @@ libpng, liblqr1Support ? true, liblqr1, + libraqmSupport ? true, + libraqm, librawSupport ? true, libraw, librsvgSupport ? !stdenv.hostPlatform.isMinGW, @@ -52,8 +54,6 @@ potrace, coreutils, curl, - ApplicationServices, - Foundation, testers, nixos-icons, perlPackages, @@ -61,6 +61,7 @@ }: assert libXtSupport -> libX11Support; +assert libraqmSupport -> freetypeSupport; let arch = @@ -136,6 +137,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional ghostscriptSupport ghostscript ++ lib.optional liblqr1Support liblqr1 ++ lib.optional libpngSupport libpng + ++ lib.optional libraqmSupport libraqm ++ lib.optional librawSupport libraw ++ lib.optional libtiffSupport libtiff ++ lib.optional libxml2Support libxml2 @@ -147,11 +149,7 @@ stdenv.mkDerivation (finalAttrs: { librsvg pango ] - ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Foundation - ]; + ++ lib.optional openjpegSupport openjpeg; propagatedBuildInputs = [ curl ] diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix deleted file mode 100644 index 52aeb7cfb995..000000000000 --- a/pkgs/applications/graphics/c3d/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - itk, - Cocoa, -}: - -stdenv.mkDerivation { - pname = "c3d"; - version = "1.4.1-unstable-2024-08-07"; - - src = fetchFromGitHub { - owner = "pyushkevich"; - repo = "c3d"; - rev = "9e6174153ab87eae014f5b802413478c8fbc9a1a"; - hash = "sha256-s2/XRyKoiMnF6cRsxxNUSlNtksbOyKSlk8hAGxJELqw="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; - - cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; - - meta = with lib; { - homepage = "https://github.com/pyushkevich/c3d"; - description = "Medical imaging processing tool"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.gpl3; - broken = stdenv.hostPlatform.isAarch64; - # /build/source/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:312:10: fatal error: xmmintrin.h: No such file or directory - }; -} diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 39ca9122d13a..bd6d3f856749 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, makeDesktopItem, copyDesktopItems, @@ -14,15 +14,13 @@ laszip, mpfr, pcl, - qtbase, - qtsvg, - qttools, + libsForQt5, tbb, xercesc, wrapGAppsHook3, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "cloudcompare"; version = "2.13.2"; @@ -39,6 +37,7 @@ mkDerivation rec { eigen # header-only wrapGAppsHook3 copyDesktopItems + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -50,9 +49,9 @@ mkDerivation rec { laszip mpfr pcl - qtbase - qtsvg - qttools + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.qttools tbb xercesc ]; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index e207d3c68373..bf8ccce9fe00 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,21 +1,18 @@ { lib, stdenv, - mkDerivation, fetchurl, autoconf, automake, libtool, pkg-config, djvulibre, - qtbase, - qttools, + libsForQt5, xorg, libtiff, - darwin, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "djview"; version = "4.12"; @@ -34,15 +31,16 @@ mkDerivation rec { automake libtool pkg-config - qttools + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ djvulibre - qtbase + libsForQt5.qtbase xorg.libXt libtiff - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.AGL; + ]; preConfigure = '' NOCONFIGURE=1 ./autogen.sh diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index e3e816116831..d237920dabb8 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "26.0.16"; + version = "26.1.1"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-se3yxIzxeinOnfltv+fSflypwxRHvW/wxKJ43LPsiho="; + hash = "sha256-h9APkOtH7s31r89hqqH12zYqkVMrR2ZxMyc+Zwq21+A="; }; # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-AtrBaN6Pvi5rvncHN64RCHS/fLA0u9WTC+hXsMQe7tU="; + hash = "sha256-kmA0z/vmWH+yD2OQ6VVSE0yPxInTAGjjG+QfcoZHlQ0="; }; nativeBuildInputs = diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 2b51e4cf207b..14674d048d71 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, - mkDerivation, fetchFromGitHub, cargo, extra-cmake-modules, @@ -9,20 +8,16 @@ rustPlatform, # common deps - karchive, - qtwebsockets, + libzip, + qt6Packages, # client deps - qtbase, - qtkeychain, - qtmultimedia, - qtsvg, - qttools, + ffmpeg, libsecret, + libwebp, # optional client deps giflib, - kdnssd, libvpx, miniupnpc, @@ -44,16 +39,17 @@ assert lib.assertMsg ( ) "You must specify at least one of buildClient, buildServer, or buildExtraTools."; let - clientDeps = [ + clientDeps = with qt6Packages; [ qtbase qtkeychain qtmultimedia qtsvg qttools + ffmpeg libsecret + libwebp # optional: giflib # gif animation export support - kdnssd # local server discovery with Zeroconf libvpx # WebM video export miniupnpc # automatic port forwarding ]; @@ -65,20 +61,20 @@ let ] ++ lib.optional withSystemd systemd; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "drawpile"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "drawpile"; repo = "drawpile"; rev = version; - sha256 = "sha256-NS1aQlWpn3f+SW0oUjlYwHtOS9ZgbjFTrE9grjK5REM="; + sha256 = "sha256-xcutcSpbFt+pb7QP1E/RG6iNnZwpfhIZTxr+1usLKHc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-rY4zWSCBfVXvl6p9GvtDg/PFZfLkWTl8FTYdlKTzWYM="; + hash = "sha256-VUX6J7TfxWpa07HPFZ8JzpltIwJUYAl5TABIpBmGYYo="; }; nativeBuildInputs = [ @@ -86,12 +82,18 @@ mkDerivation rec { extra-cmake-modules rustc rustPlatform.cargoSetupHook + ( + if buildClient || buildServerGui then + qt6Packages.wrapQtAppsHook + else + qt6Packages.wrapQtAppsNoGuiHook + ) ]; buildInputs = [ - karchive - qtwebsockets + libzip + qt6Packages.qtwebsockets ] ++ lib.optionals buildClient clientDeps ++ lib.optionals buildServer serverDeps; diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix index 6ea762ded515..5c41a460c099 100644 --- a/pkgs/applications/graphics/eddy/default.nix +++ b/pkgs/applications/graphics/eddy/default.nix @@ -4,7 +4,6 @@ lib, jre, qt5, - wrapQtAppsHook, }: python3Packages.buildPythonApplication rec { @@ -20,7 +19,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = [ qt5.qtbase - wrapQtAppsHook + qt5.wrapQtAppsHook python3Packages.setuptools python3Packages.rfc3987 python3Packages.jpype1 diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix deleted file mode 100644 index 89014afb8eb4..000000000000 --- a/pkgs/applications/graphics/emulsion/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - rustPlatform, - installShellFiles, - makeWrapper, - pkg-config, - python3, - libGL, - libX11, - libXcursor, - libXi, - libXrandr, - libXxf86vm, - libxcb, - libxkbcommon, - wayland, - AppKit, - CoreGraphics, - CoreServices, - Foundation, - OpenGL, -}: -let - rpathLibs = - [ - libGL - libX11 - libXcursor - libXi - libXrandr - libXxf86vm - libxcb - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libxkbcommon - wayland - ]; -in -rustPlatform.buildRustPackage rec { - pname = "emulsion"; - version = "11.0"; - - src = fetchFromGitHub { - owner = "ArturKovacs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-0t+MUZu1cvkJSL9Ly9kblH8fMr05KuRpOo+JDn/VUc8="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-1s5kCUxn4t1A40QHuygGKaqphLmcl+EYfx++RZQmL00="; - - nativeBuildInputs = [ - installShellFiles - makeWrapper - pkg-config - python3 - ]; - - buildInputs = - rpathLibs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreGraphics - CoreServices - Foundation - OpenGL - ]; - - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion - ''; - - meta = with lib; { - description = "Fast and minimalistic image viewer"; - homepage = "https://arturkovacs.github.io/emulsion-website/"; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.unix; - license = licenses.mit; - mainProgram = "emulsion"; - }; -} diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix deleted file mode 100644 index 91731416199b..000000000000 --- a/pkgs/applications/graphics/epick/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - stdenv, - pkg-config, - expat, - fontconfig, - freetype, - libGL, - xorg, - AppKit, -}: - -rustPlatform.buildRustPackage rec { - pname = "epick"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "vv9k"; - repo = pname; - # Upstream has rewritten tags on multiple occasions. - rev = "14ee92e049780406fffdc1e4a83bf1433775663f"; - sha256 = "sha256-gjqAQrGJ9KFdzn2a3fOgu0VJ9zrX5stsbzriOGJaD/4="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-r/0aNzU8jm2AqiZWq4plxXY/H7qKVC8nEI9BwOUKCdA="; - - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - ]; - - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - expat - fontconfig - freetype - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - ]; - - postInstall = '' - install -Dm444 assets/epick.desktop -t $out/share/applications - install -Dm444 assets/icon.svg $out/share/icons/hicolor/scalable/apps/epick.svg - install -Dm444 assets/icon.png $out/share/icons/hicolor/48x48/apps/epick.png - ''; - - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]} - ''; - - meta = with lib; { - description = "Simple color picker that lets the user create harmonic palettes with ease"; - homepage = "https://github.com/vv9k/epick"; - changelog = "https://github.com/vv9k/epick/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "epick"; - }; -} diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index 0c7bb0023cbf..caed9af31c21 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -5,8 +5,7 @@ meson, ninja, pkg-config, - wrapQtAppsHook, - qtbase, + libsForQt5, libpng, giflib, libjpeg, @@ -28,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase libpng giflib libjpeg diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix deleted file mode 100644 index 5f1d20c94fa2..000000000000 --- a/pkgs/applications/graphics/f3d/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - help2man, - gzip, - # There is a f3d overridden with EGL enabled vtk in top-level/all-packages.nix - # compiling with EGL enabled vtk will result in f3d running in headless mode - # See https://github.com/NixOS/nixpkgs/pull/324022. This may change later. - vtk_9, - autoPatchelfHook, - Cocoa, - OpenGL, - python3Packages, - opencascade-occt, - assimp, - fontconfig, - withManual ? !stdenv.hostPlatform.isDarwin, - withPythonBinding ? false, -}: - -stdenv.mkDerivation rec { - pname = "f3d"; - version = "3.0.0"; - - outputs = [ "out" ] ++ lib.optionals withManual [ "man" ]; - - src = fetchFromGitHub { - owner = "f3d-app"; - repo = "f3d"; - tag = "v${version}"; - hash = "sha256-mnDmo5qzdnElhvZwBmHL3xC2o8iLuvYyfZXHoaAUG08="; - }; - - nativeBuildInputs = - [ - cmake - ] - ++ lib.optionals withManual [ - # manpage - help2man - gzip - ] - ++ lib.optionals stdenv.hostPlatform.isElf [ - # https://github.com/f3d-app/f3d/pull/1217 - autoPatchelfHook - ]; - - buildInputs = - [ - vtk_9 - opencascade-occt - assimp - fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - OpenGL - ] - ++ lib.optionals withPythonBinding [ - python3Packages.python - # Using C++ header files, not Python import - python3Packages.pybind11 - ]; - - cmakeFlags = - [ - # conflict between VTK and Nixpkgs; - # see https://github.com/NixOS/nixpkgs/issues/89167 - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_BINDIR=bin" - "-DF3D_MODULE_EXTERNAL_RENDERING=ON" - "-DF3D_PLUGIN_BUILD_ASSIMP=ON" - "-DF3D_PLUGIN_BUILD_OCCT=ON" - ] - ++ lib.optionals withManual [ - "-DF3D_LINUX_GENERATE_MAN=ON" - ] - ++ lib.optionals withPythonBinding [ - "-DF3D_BINDINGS_PYTHON=ON" - ]; - - meta = with lib; { - description = "Fast and minimalist 3D viewer using VTK"; - homepage = "https://f3d-app.github.io/f3d"; - changelog = "https://github.com/f3d-app/f3d/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ - bcdarwin - pbsds - ]; - platforms = with platforms; unix; - mainProgram = "f3d"; - # error: use of undeclared identifier 'NSMenuItem' - # adding AppKit does not solve it - broken = with stdenv.hostPlatform; isDarwin && isx86_64; - }; -} diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index 04f0ff9bf358..81e25a88101d 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,13 +1,12 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, - qttools, - qtwebkit, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "fontmatrix"; version = "0.9.100"; @@ -19,11 +18,14 @@ mkDerivation rec { }; buildInputs = [ - qttools - qtwebkit + libsForQt5.qttools + libsForQt5.qtwebkit ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; meta = with lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix deleted file mode 100644 index f25c1064a7ac..000000000000 --- a/pkgs/applications/graphics/foxotron/default.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - nix-update-script, - cmake, - pkg-config, - makeWrapper, - zlib, - libX11, - libXrandr, - libXinerama, - libXcursor, - libXi, - libXext, - libGLU, - alsa-lib, - fontconfig, - AVFoundation, - Carbon, - Cocoa, - CoreAudio, - Kernel, - OpenGL, -}: - -stdenv.mkDerivation rec { - pname = "foxotron"; - version = "2024-09-23"; - - src = fetchFromGitHub { - owner = "Gargaj"; - repo = "Foxotron"; - rev = version; - fetchSubmodules = true; - hash = "sha256-OnZWoiQ5ASKQV73/W6nl17B2ANwqCy/PlybHbNwrOyQ="; - }; - - patches = [ - (fetchpatch { - name = "0001-assimp-Include-cstdint-for-std-uint32_t.patch"; - url = "https://github.com/assimp/assimp/commit/108e3192a201635e49e99a91ff2044e1851a2953.patch"; - stripLen = 1; - extraPrefix = "externals/assimp/"; - hash = "sha256-rk0EFmgeZVwvx3NJOOob5Jwj9/J+eOtuAzfwp88o+J4="; - }) - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "set(CMAKE_OSX_ARCHITECTURES x86_64)" "" - - # Outdated vendored assimp, many warnings with newer compilers, too old for CMake option to control this - # Note that this -Werror caused issues on darwin, so make sure to re-check builds there before removing this - substituteInPlace externals/assimp/code/CMakeLists.txt \ - --replace 'TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)' "" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - ]; - - buildInputs = - [ zlib ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXrandr - libXinerama - libXcursor - libXi - libXext - alsa-lib - fontconfig - libGLU - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AVFoundation - Carbon - Cocoa - CoreAudio - Kernel - OpenGL - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=array-bounds" - ]; - - # error: writing 1 byte into a region of size 0 - hardeningDisable = [ "fortify3" ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib/foxotron} - cp -R ${lib.optionalString stdenv.hostPlatform.isDarwin "Foxotron.app/Contents/MacOS/"}Foxotron \ - ../{config.json,Shaders,Skyboxes} $out/lib/foxotron/ - wrapProgram $out/lib/foxotron/Foxotron \ - --chdir "$out/lib/foxotron" - ln -s $out/{lib/foxotron,bin}/Foxotron - - runHook postInstall - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "General purpose model viewer"; - longDescription = '' - ASSIMP based general purpose model viewer ("turntable") created for the - Revision 2021 3D Graphics Competition. - ''; - homepage = "https://github.com/Gargaj/Foxotron"; - license = licenses.unlicense; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; - mainProgram = "Foxotron"; - }; -} diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index f58b7b7c6365..e5c9dfdd8e48 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -2,15 +2,18 @@ lib, stdenv, fetchFromGitHub, - mkDerivation, cmake, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "fstl"; version = "0.11.0"; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix new file mode 100644 index 000000000000..d91dd67a1913 --- /dev/null +++ b/pkgs/applications/graphics/gimp/2.0/default.nix @@ -0,0 +1,222 @@ +{ + stdenv, + lib, + fetchurl, + replaceVars, + autoreconfHook, + pkg-config, + intltool, + babl, + gegl, + gtk2, + glib, + gdk-pixbuf, + isocodes, + pango, + cairo, + freetype, + fontconfig, + lcms, + libpng, + libjpeg, + libjxl, + poppler, + poppler_data, + libtiff, + libmng, + librsvg, + libwmf, + zlib, + libzip, + ghostscript, + aalib, + shared-mime-info, + libexif, + gettext, + makeWrapper, + gtk-doc, + xorg, + glib-networking, + libmypaint, + gexiv2, + harfbuzz, + mypaint-brushes1, + libwebp, + libheif, + libxslt, + libgudev, + openexr, + desktopToDarwinBundle, + gtk-mac-integration-gtk2, + withPython ? false, + python2, +}: + +let + python = python2.withPackages (pp: [ pp.pygtk ]); +in +stdenv.mkDerivation (finalAttrs: { + pname = "gimp"; + version = "2.10.38"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchurl { + url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.bz2"; + sha256 = "sha256-UKhF7sEciDH+hmFweVD1uERuNfMO37ms+Y+FwRM/hW4="; + }; + + patches = [ + # to remove compiler from the runtime closure, reference was retained via + # gimp --version --verbose output + (replaceVars ./remove-cc-reference.patch { + cc_version = stdenv.cc.cc.name; + }) + + # Use absolute paths instead of relying on PATH + # to make sure plug-ins are loaded by the correct interpreter. + ./hardcode-plugin-interpreters.patch + + # GIMP queries libheif.pc for builtin encoder/decoder support to determine if AVIF/HEIC files are supported + # (see https://gitlab.gnome.org/GNOME/gimp/-/blob/a8b1173ca441283971ee48f4778e2ffd1cca7284/configure.ac?page=2#L1846-1852) + # These variables have been removed since libheif 1.18.0 + # (see https://github.com/strukturag/libheif/commit/cf0d89c6e0809427427583290547a7757428cf5a) + # This has already been fixed for the upcoming GIMP 3, but the fix has not been backported to 2.x yet + # (see https://gitlab.gnome.org/GNOME/gimp/-/issues/9080) + ./force-enable-libheif.patch + ]; + + nativeBuildInputs = + [ + autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am + pkg-config + intltool + gettext + makeWrapper + gtk-doc + libxslt + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle + ]; + + buildInputs = + [ + babl + gegl + gtk2 + glib + gdk-pixbuf + pango + cairo + gexiv2 + harfbuzz + isocodes + freetype + fontconfig + lcms + libpng + libjpeg + libjxl + poppler + poppler_data + libtiff + openexr + libmng + librsvg + libwmf + zlib + libzip + ghostscript + aalib + shared-mime-info + libwebp + libheif + libexif + xorg.libXpm + glib-networking + libmypaint + mypaint-brushes1 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + gtk-mac-integration-gtk2 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libgudev + ] + ++ lib.optionals withPython [ + python + # Duplicated here because python.withPackages does not expose the dev output with pkg-config files + python2.pkgs.pygtk + ]; + + # needed by gimp-2.0.pc + propagatedBuildInputs = [ + gegl + ]; + + configureFlags = + [ + "--without-webkit" # old version is required + "--disable-check-update" + "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "--with-icc-directory=/run/current-system/sw/share/color/icc" + # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) + "--libdir=\${exec_prefix}/lib" + ] + ++ lib.optionals (!withPython) [ + "--disable-python" # depends on Python2 which was EOLed on 2020-01-01 + ]; + + enableParallelBuilding = true; + + doCheck = true; + + env = { + NIX_CFLAGS_COMPILE = toString ( + [ ] + ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DGDK_OSX_BIG_SUR=16" ] + ); + + # Check if librsvg was built with --disable-pixbuf-loader. + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; + }; + + preConfigure = '' + # The check runs before glib-networking is registered + export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" + ''; + + postFixup = '' + wrapProgram $out/bin/gimp-${lib.versions.majorMinor finalAttrs.version} \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + passthru = { + # The declarations for `gimp-with-plugins` wrapper, + # used for determining plug-in installation paths + majorVersion = "${lib.versions.major finalAttrs.version}.0"; + targetLibDir = "lib/gimp/${finalAttrs.passthru.majorVersion}"; + targetDataDir = "share/gimp/${finalAttrs.passthru.majorVersion}"; + targetPluginDir = "${finalAttrs.passthru.targetLibDir}/plug-ins"; + targetScriptDir = "${finalAttrs.passthru.targetDataDir}/scripts"; + + # probably its a good idea to use the same gtk in plugins ? + gtk = gtk2; + + python2Support = withPython; + }; + + meta = with lib; { + description = "GNU Image Manipulation Program"; + homepage = "https://www.gimp.org/"; + maintainers = with maintainers; [ ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + mainProgram = "gimp"; + }; +}) diff --git a/pkgs/applications/graphics/gimp/force-enable-libheif.patch b/pkgs/applications/graphics/gimp/2.0/force-enable-libheif.patch similarity index 100% rename from pkgs/applications/graphics/gimp/force-enable-libheif.patch rename to pkgs/applications/graphics/gimp/2.0/force-enable-libheif.patch diff --git a/pkgs/applications/graphics/gimp/2.0/hardcode-plugin-interpreters.patch b/pkgs/applications/graphics/gimp/2.0/hardcode-plugin-interpreters.patch new file mode 100644 index 000000000000..1528404c31d2 --- /dev/null +++ b/pkgs/applications/graphics/gimp/2.0/hardcode-plugin-interpreters.patch @@ -0,0 +1,11 @@ +--- a/plug-ins/pygimp/Makefile.am ++++ b/plug-ins/pygimp/Makefile.am +@@ -157,7 +157,7 @@ install-interp-file: + echo 'python=$(PYBIN_PATH)' > '$(DESTDIR)$(pyinterpfile)' + echo 'python2=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' + echo '/usr/bin/python=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' +- echo ":Python:E::py::`basename $(PYTHON)`:" >> '$(DESTDIR)$(pyinterpfile)' ++ echo ":Python:E::py::$(PYTHON):" >> '$(DESTDIR)$(pyinterpfile)' + + install-data-local: install-env-file install-interp-file + diff --git a/pkgs/applications/graphics/gimp/2.0/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/2.0/remove-cc-reference.patch new file mode 100644 index 000000000000..20c350bdaea1 --- /dev/null +++ b/pkgs/applications/graphics/gimp/2.0/remove-cc-reference.patch @@ -0,0 +1,13 @@ +diff --git a/app/gimp-version.c b/app/gimp-version.c +index 3d1894a036..48bb670b64 100644 +--- a/app/gimp-version.c ++++ b/app/gimp-version.c +@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose, + GIMP_BUILD_ID, + gimp_version_get_revision (), + GIMP_BUILD_PLATFORM_FAMILY, +- CC_VERSION, ++ "@cc_version@", + lib_versions); + g_free (lib_versions); + diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index d2b2644a1709..639719d8d32d 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -3,21 +3,27 @@ lib, fetchurl, replaceVars, - autoreconfHook, + meson, + ninja, pkg-config, - intltool, babl, + cfitsio, gegl, - gtk2, + gtk3, glib, gdk-pixbuf, + graphviz, isocodes, pango, cairo, + libarchive, + luajit, freetype, fontconfig, lcms, libpng, + libiff, + libilbm, libjpeg, libjxl, poppler, @@ -31,44 +37,57 @@ ghostscript, aalib, shared-mime-info, + python3, libexif, gettext, - makeWrapper, - gtk-doc, + wrapGAppsHook3, + libxslt, + gobject-introspection, + vala, + gi-docgen, + perl, + appstream-glib, + desktop-file-utils, xorg, glib-networking, + json-glib, libmypaint, + llvmPackages, gexiv2, harfbuzz, mypaint-brushes1, libwebp, libheif, - libxslt, + gjs, libgudev, - openexr_3, + openexr, + xvfb-run, + dbus, + adwaita-icon-theme, + alsa-lib, desktopToDarwinBundle, - AppKit, - Cocoa, - gtk-mac-integration-gtk2, - withPython ? false, - python2, }: let - python = python2.withPackages (pp: [ pp.pygtk ]); + python = python3.withPackages ( + pp: with pp; [ + pygobject3 + ] + ); in stdenv.mkDerivation (finalAttrs: { pname = "gimp"; - version = "2.10.38"; + version = "3.0.2"; outputs = [ "out" "dev" + "devdoc" ]; src = fetchurl { - url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-UKhF7sEciDH+hmFweVD1uERuNfMO37ms+Y+FwRM/hW4="; + url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz"; + hash = "sha256-VG3cMMstDnkSPH/LTXghHh7npqrOkaagrYy8v26lcaI="; }; patches = [ @@ -80,26 +99,40 @@ stdenv.mkDerivation (finalAttrs: { # Use absolute paths instead of relying on PATH # to make sure plug-ins are loaded by the correct interpreter. - ./hardcode-plugin-interpreters.patch + # TODO: This now only appears to be used on Windows. + (replaceVars ./hardcode-plugin-interpreters.patch { + python_interpreter = python.interpreter; + PYTHON_EXE = null; + }) - # GIMP queries libheif.pc for builtin encoder/decoder support to determine if AVIF/HEIC files are supported - # (see https://gitlab.gnome.org/GNOME/gimp/-/blob/a8b1173ca441283971ee48f4778e2ffd1cca7284/configure.ac?page=2#L1846-1852) - # These variables have been removed since libheif 1.18.0 - # (see https://github.com/strukturag/libheif/commit/cf0d89c6e0809427427583290547a7757428cf5a) - # This has already been fixed for the upcoming GIMP 3, but the fix has not been backported to 2.x yet - # (see https://gitlab.gnome.org/GNOME/gimp/-/issues/9080) - ./force-enable-libheif.patch + # D-Bus configuration is not available in the build sandbox + # so we need to pick up the one from the package. + (replaceVars ./tests-dbus-conf.patch { + session_conf = "${dbus.out}/share/dbus-1/session.conf"; + }) ]; nativeBuildInputs = [ - autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am + meson + ninja pkg-config - intltool gettext - makeWrapper - gtk-doc - libxslt + wrapGAppsHook3 + libxslt # for xsltproc + gobject-introspection + perl + vala + + # for docs + gi-docgen + + # for tests + desktop-file-utils + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus + xvfb-run ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle @@ -107,13 +140,16 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ + appstream-glib # for library babl + cfitsio gegl - gtk2 + gtk3 glib gdk-pixbuf pango cairo + libarchive gexiv2 harfbuzz isocodes @@ -121,12 +157,14 @@ stdenv.mkDerivation (finalAttrs: { fontconfig lcms libpng + libiff + libilbm libjpeg libjxl poppler poppler_data libtiff - openexr_3 + openexr libmng librsvg libwmf @@ -135,69 +173,135 @@ stdenv.mkDerivation (finalAttrs: { ghostscript aalib shared-mime-info + json-glib libwebp libheif + python libexif xorg.libXpm + xorg.libXmu glib-networking libmypaint mypaint-brushes1 + + # New file dialogue crashes with “Icon 'image-missing' not present in theme Symbolic” without an icon theme. + adwaita-icon-theme + + # for Lua plug-ins + (luajit.withPackages (pp: [ + pp.lgi + ])) + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + + # for JavaScript plug-ins + gjs ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - gtk-mac-integration-gtk2 + llvmPackages.openmp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libgudev - ] - ++ lib.optionals withPython [ - python - # Duplicated here because python.withPackages does not expose the dev output with pkg-config files - python2.pkgs.pygtk ]; - # needed by gimp-2.0.pc propagatedBuildInputs = [ + # needed by gimp-3.0.pc gegl + cairo + pango + gexiv2 ]; - configureFlags = + mesonFlags = [ - "--without-webkit" # old version is required - "--disable-check-update" - "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" - "--with-icc-directory=/run/current-system/sw/share/color/icc" - # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) - "--libdir=\${exec_prefix}/lib" + "-Dbug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "-Dicc-directory=/run/current-system/sw/share/color/icc" + "-Dcheck-update=no" + (lib.mesonEnable "gudev" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "headless-tests" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "linux-input" stdenv.hostPlatform.isLinux) + # Not very important to do downstream, save a dependency. + "-Dappdata-test=disabled" ] - ++ lib.optionals (!withPython) [ - "--disable-python" # depends on Python2 which was EOLed on 2020-01-01 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-Dalsa=disabled" + "-Djavascript=disabled" ]; - enableParallelBuilding = true; - doCheck = true; env = { - NIX_CFLAGS_COMPILE = toString ( - [ ] - ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DGDK_OSX_BIG_SUR=16" ] - ); + # The check runs before glib-networking is registered + GIO_EXTRA_MODULES = "${glib-networking}/lib/gio/modules"; + + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DGDK_OSX_BIG_SUR=16"; # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; }; - preConfigure = '' - # The check runs before glib-networking is registered - export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" + postPatch = '' + patchShebangs \ + app/tests/create_test_env.sh \ + tools/gimp-mkenums + + # GIMP is executed at build time so we need to fix this. + # TODO: Look into if we can fix the interp thing. + chmod +x plug-ins/python/{colorxhtml,file-openraster,foggify,gradients-save-as-css,histogram-export,palette-offset,palette-sort,palette-to-gradient,python-eval,spyro-plus}.py + patchShebangs \ + plug-ins/python/{colorxhtml,file-openraster,foggify,gradients-save-as-css,histogram-export,palette-offset,palette-sort,palette-to-gradient,python-eval,spyro-plus}.py + ''; + + preBuild = + let + librarySuffix = + if stdenv.hostPlatform.extensions.library == ".so" then + "3.0.so.0" + else if stdenv.hostPlatform.extensions.library == ".dylib" then + "3.0.0.dylib" + else + throw "Unsupported library extension ‘${stdenv.hostPlatform.extensions.library}’"; + in + '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running GIMP in build or check phase, it will try + # to use plug-ins, which import GIMP introspection files which will try + # to load the GIMP libraries which will not be installed yet. + # So we need to replace the absolute path with a local one. + # We are using a symlink that will be overridden during installation. + mkdir -p "$out/lib" + ln -s "$PWD/libgimp/libgimp-${librarySuffix}" \ + "$PWD/libgimpbase/libgimpbase-${librarySuffix}" \ + "$PWD/libgimpcolor/libgimpcolor-${librarySuffix}" \ + "$PWD/libgimpconfig/libgimpconfig-${librarySuffix}" \ + "$PWD/libgimpmath/libgimpmath-${librarySuffix}" \ + "$PWD/libgimpmodule/libgimpmodule-${librarySuffix}" \ + "$out/lib/" + ''; + + preCheck = '' + # Avoid “Error retrieving accessibility bus address” + export NO_AT_BRIDGE=1 + # Fix storing recent file list in tests + export HOME="$TMPDIR" + export XDG_DATA_DIRS="${glib.getSchemaDataDirPath gtk3}:${adwaita-icon-theme}/share:$XDG_DATA_DIRS" + ''; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${ + lib.makeBinPath [ + # for dot for gegl:introspect (Debug » Show Image Graph, hidden by default on stable release) + graphviz + # for gimp-script-fu-interpreter-3.0 invoked by shebang of some plug-ins + "$out" + ] + }") ''; postFixup = '' - wrapProgram $out/bin/gimp-${lib.versions.majorMinor finalAttrs.version} \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { @@ -210,9 +314,7 @@ stdenv.mkDerivation (finalAttrs: { targetScriptDir = "${finalAttrs.passthru.targetDataDir}/scripts"; # probably its a good idea to use the same gtk in plugins ? - gtk = gtk2; - - python2Support = withPython; + gtk = gtk3; }; meta = with lib; { @@ -220,7 +322,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gimp.org/"; maintainers = with maintainers; [ jtojnar ]; license = licenses.gpl3Plus; - platforms = platforms.unix; + platforms = platforms.linux; mainProgram = "gimp"; }; }) diff --git a/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch b/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch index 1528404c31d2..6a0ec0af6262 100644 --- a/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch +++ b/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch @@ -1,11 +1,8 @@ ---- a/plug-ins/pygimp/Makefile.am -+++ b/plug-ins/pygimp/Makefile.am -@@ -157,7 +157,7 @@ install-interp-file: - echo 'python=$(PYBIN_PATH)' > '$(DESTDIR)$(pyinterpfile)' - echo 'python2=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' - echo '/usr/bin/python=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' -- echo ":Python:E::py::`basename $(PYTHON)`:" >> '$(DESTDIR)$(pyinterpfile)' -+ echo ":Python:E::py::$(PYTHON):" >> '$(DESTDIR)$(pyinterpfile)' - - install-data-local: install-env-file install-interp-file - +--- a/plug-ins/python/pygimp.interp.in ++++ b/plug-ins/python/pygimp.interp.in +@@ -2,4 +2,4 @@ python=@PYTHON_EXE@ + python3=@PYTHON_EXE@ + /usr/bin/python=@PYTHON_EXE@ + /usr/bin/python3=@PYTHON_EXE@ +-:Python:E::py::python3: ++:Python:E::py::@python_interpreter@: diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index b237c5f1bcf1..9c86343599b1 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -2,7 +2,11 @@ # If you just want a subset of plug-ins, you can specify them explicitly: # `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`. -{ lib, pkgs }: +{ + lib, + pkgs, + gimp, +}: let inherit (pkgs) @@ -16,6 +20,10 @@ let fetchFromGitHub fetchFromGitLab ; + + # We cannot use gimp from the arguments directly, or it would be shadowed by the one + # from scope when initializing the scope with it, leading to infinite recursion. + gimpArg = gimp; in lib.makeScope pkgs.newScope ( @@ -29,6 +37,7 @@ lib.makeScope pkgs.newScope ( attrs: let name = attrs.name or "${attrs.pname}-${attrs.version}"; + pkgConfigMajorVersion = lib.versions.major gimp.version; in stdenv.mkDerivation ( { @@ -63,8 +72,10 @@ lib.makeScope pkgs.newScope ( # Override installation paths. env = { - PKG_CONFIG_GIMP_2_0_GIMPLIBDIR = "${placeholder "out"}/${gimp.targetLibDir}"; - PKG_CONFIG_GIMP_2_0_GIMPDATADIR = "${placeholder "out"}/${gimp.targetDataDir}"; + "PKG_CONFIG_GIMP_${pkgConfigMajorVersion}_0_GIMPLIBDIR" = + "${placeholder "out"}/${gimp.targetLibDir}"; + "PKG_CONFIG_GIMP_${pkgConfigMajorVersion}_0_GIMPDATADIR" = + "${placeholder "out"}/${gimp.targetDataDir}"; } // attrs.env or { }; } ); @@ -86,7 +97,7 @@ lib.makeScope pkgs.newScope ( in { # Allow overriding GIMP package in the scope. - inherit (pkgs) gimp; + gimp = gimpArg; bimp = pluginDerivation rec { /* @@ -130,6 +141,7 @@ lib.makeScope pkgs.newScope ( installTargets = [ "install-admin" ]; meta = with lib; { + broken = gimp.majorVersion != "2.0"; description = "Batch Image Manipulation Plugin for GIMP"; homepage = "https://github.com/alessandrofrancesconi/gimp-plugin-bimp"; license = licenses.gpl2Plus; @@ -153,6 +165,7 @@ lib.makeScope pkgs.newScope ( ''; meta = { + broken = gimp.majorVersion != "2.0"; description = "Gimp plug-in for the farbfeld image format"; homepage = "https://github.com/ids1024/gimp-farbfeld"; license = lib.licenses.mit; @@ -192,6 +205,7 @@ lib.makeScope pkgs.newScope ( ''; meta = with lib; { + broken = gimp.majorVersion != "2.0"; description = "GIMP plug-in to do the fourier transform"; homepage = "https://people.via.ecp.fr/~remi/soft/gimp/gimp_plugin_en.php3#fourier"; license = with licenses; [ gpl3Plus ]; @@ -222,7 +236,7 @@ lib.makeScope pkgs.newScope ( }; meta = { - broken = !gimp.python2Support; + broken = gimp.majorVersion != "2.0"; }; }; @@ -240,6 +254,10 @@ lib.makeScope pkgs.newScope ( ninja gettext ]; + + meta = { + broken = gimp.majorVersion != "2.0"; + }; }; waveletSharpen = pluginDerivation { @@ -264,6 +282,10 @@ lib.makeScope pkgs.newScope ( }; installPhase = "installPlugin src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? + + meta = { + broken = gimp.majorVersion != "2.0"; + }; }; lqrPlugin = pluginDerivation rec { @@ -289,10 +311,15 @@ lib.makeScope pkgs.newScope ( sha256 = "EdjZWM6U1bhUmsOnLA8iJ4SFKuAXHIfNPzxZqel+JrY="; }) ]; + + meta = { + broken = gimp.majorVersion != "2.0"; + }; }; gmic = pkgs.gmic-qt.override { variant = "gimp"; + inherit (self) gimp; }; gimplensfun = pluginDerivation { @@ -320,6 +347,7 @@ lib.makeScope pkgs.newScope ( "; meta = { + broken = gimp.majorVersion != "2.0"; description = "GIMP plugin to correct lens distortion using the lensfun library and database"; homepage = "http://lensfun.sebastiankraft.net/"; diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch index 20c350bdaea1..8b62b801f02b 100644 --- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch +++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch @@ -1,8 +1,8 @@ diff --git a/app/gimp-version.c b/app/gimp-version.c -index 3d1894a036..48bb670b64 100644 +index 6e311c8252..e6fd9d1d78 100644 --- a/app/gimp-version.c +++ b/app/gimp-version.c -@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose, +@@ -90,7 +90,7 @@ gimp_version (gboolean be_verbose, GIMP_BUILD_ID, gimp_version_get_revision (), GIMP_BUILD_PLATFORM_FAMILY, diff --git a/pkgs/applications/graphics/gimp/tests-dbus-conf.patch b/pkgs/applications/graphics/gimp/tests-dbus-conf.patch new file mode 100644 index 000000000000..da9152eeef01 --- /dev/null +++ b/pkgs/applications/graphics/gimp/tests-dbus-conf.patch @@ -0,0 +1,11 @@ +--- a/build/meson/run_test_env.sh ++++ b/build/meson/run_test_env.sh +@@ -33,7 +33,7 @@ if [ -n "${UI_TEST}" ]; then + OPT="--auto-servernum" + fi + xvfb-run $OPT --server-args="-screen 0 1280x1024x24" \ +- dbus-run-session -- "$@" ++ dbus-run-session --config-file="@session_conf@" -- "$@" + + else + # Run the executable directly, diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 82ff058ba7dc..efac48c2f7e2 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -13,8 +13,14 @@ let lib.attrValues gimpPlugins ); selectedPlugins = lib.filter (pkg: pkg != gimp) (if plugins == null then allPlugins else plugins); - extraArgs = map (x: x.wrapArgs or "") selectedPlugins; - versionBranch = lib.versions.majorMinor gimp.version; + extraArgs = + map (x: x.wrapArgs or "") selectedPlugins + ++ lib.optionals (gimp.majorVersion == "2.0") [ + ''--prefix GTK_PATH : "${gnome-themes-extra}/lib/gtk-2.0"'' + ]; + exeVersion = + if gimp.majorVersion == "2.0" then lib.versions.majorMinor gimp.version else gimp.majorVersion; + majorVersion = lib.versions.major gimp.version; in symlinkJoin { @@ -25,16 +31,15 @@ symlinkJoin { nativeBuildInputs = [ makeWrapper ]; postBuild = '' - for each in gimp-${versionBranch} gimp-console-${versionBranch}; do + for each in gimp-${exeVersion} gimp-console-${exeVersion}; do wrapProgram $out/bin/$each \ - --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ - --set GIMP2_DATADIR "$out/share/gimp/2.0" \ - --prefix GTK_PATH : "${gnome-themes-extra}/lib/gtk-2.0" \ + --set GIMP${majorVersion}_PLUGINDIR "$out/${gimp.targetLibDir}" \ + --set GIMP${majorVersion}_DATADIR "$out/${gimp.targetDataDir}" \ ${toString extraArgs} done set +x for each in gimp gimp-console; do - ln -sf "$each-${versionBranch}" $out/bin/$each + ln -sf "$each-${exeVersion}" $out/bin/$each done ''; diff --git a/pkgs/applications/graphics/glabels-qt/default.nix b/pkgs/applications/graphics/glabels-qt/default.nix index 6865060f2fc2..9ba7740f096d 100644 --- a/pkgs/applications/graphics/glabels-qt/default.nix +++ b/pkgs/applications/graphics/glabels-qt/default.nix @@ -1,12 +1,12 @@ { lib, + stdenv, fetchFromGitHub, cmake, - mkDerivation, - qttools, + libsForQt5, }: -mkDerivation { +stdenv.mkDerivation { pname = "glabels-qt"; version = "unstable-2021-02-06"; @@ -19,7 +19,8 @@ mkDerivation { nativeBuildInputs = [ cmake - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; meta = with lib; { diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index 21d711d8ba42..253c9f54b64b 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -29,20 +29,20 @@ clangStdenv.mkDerivation rec { pname = "gnome-decoder"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "decoder"; rev = version; - hash = "sha256-qSPuEVW+FwC9OJa+dseIy4/2bhVdTryJSJNSpes9tpY="; + hash = "sha256-lLZ8tll/R9cwk3t/MULmrR1KWZ1e+zneXL93035epPE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-xQlzSsvwDNK3Z8xnUQgCU6Q8+ls0Urks778pYwN2X1Y="; + hash = "sha256-USfC7HSL1TtjP1SmBRTKkPyKE4DkSn6xeH4mzfIBQWg="; }; preFixup = '' @@ -92,6 +92,7 @@ clangStdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; mainProgram = "decoder"; - maintainers = with maintainers; [ zendo ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ zendo ]; + teams = [ teams.gnome-circle ]; }; } diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix deleted file mode 100644 index 6e5641cafd2a..000000000000 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - buildPackages, - cargo, - gettext, - meson, - ninja, - pkg-config, - rustPlatform, - rustc, - wrapGAppsHook4, - appstream-glib, - desktop-file-utils, - glib, - gtk4, - gdk-pixbuf, - libadwaita, - Foundation, - nix-update-script, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gnome-obfuscate"; - version = "0.0.10"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = "Obfuscate"; - rev = finalAttrs.version; - hash = "sha256-/Plvvn1tle8t/bsPcsamn5d81CqnyGCyGYPF6j6U5NI="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-Llgn+dYNKZ9Mles9f9Xor+GZoCCQ0cERkXz4MicZglY="; - }; - - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one. - # The vendored gettext does not build with clang 16. - GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin"; - GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; - GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; - }; - - nativeBuildInputs = [ - gettext - meson - ninja - pkg-config - rustPlatform.cargoSetupHook - cargo - rustc - wrapGAppsHook4 - appstream-glib - desktop-file-utils - ]; - - buildInputs = - [ - glib - gtk4 - gdk-pixbuf - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Censor private information"; - homepage = "https://gitlab.gnome.org/World/obfuscate"; - license = licenses.gpl3Plus; - platforms = platforms.all; - mainProgram = "obfuscate"; - maintainers = with maintainers; [ fgaz ] ++ lib.teams.gnome-circle.members; - }; -}) diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix index 5199cfe6c06a..c743ba7196b8 100644 --- a/pkgs/applications/graphics/hdrmerge/default.nix +++ b/pkgs/applications/graphics/hdrmerge/default.nix @@ -1,10 +1,9 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, - qtbase, - wrapQtAppsHook, + libsForQt5, libraw, exiv2, zlib, @@ -14,7 +13,7 @@ copyDesktopItems, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "hdrmerge"; version = "0.5.0-unstable-2024-08-02"; src = fetchFromGitHub { @@ -27,12 +26,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook copyDesktopItems ]; buildInputs = [ - qtbase + libsForQt5.qtbase libraw exiv2 zlib diff --git a/pkgs/applications/graphics/imgp/default.nix b/pkgs/applications/graphics/imgp/default.nix index 3855d3e16ba5..958963cc8766 100644 --- a/pkgs/applications/graphics/imgp/default.nix +++ b/pkgs/applications/graphics/imgp/default.nix @@ -1,15 +1,13 @@ { lib, fetchFromGitHub, - buildPythonApplication, - pythonOlder, - pillow, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "imgp"; version = "2.9"; - disabled = pythonOlder "3.8"; + disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "jarun"; @@ -18,7 +16,7 @@ buildPythonApplication rec { hash = "sha256-yQ2BzOBn6Bl9ieZkREKsj1zLnoPcf0hZhZ90Za5kiKA="; }; - propagatedBuildInputs = [ pillow ]; + propagatedBuildInputs = [ python3Packages.pillow ]; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 475ce0b4897e..2f71bf8d3506 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -74,11 +74,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "inkscape"; - version = "1.4"; + version = "1.4.2"; src = fetchurl { url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-xZqFRTtpmt3rzVHB3AdoTdlqEMiuxxaxlVHbUFYuE/U="; + sha256 = "sha256-IABTDHkX5SYMnoV1pxVP9pJmQ9IAZIfXFOMEqWPwx4I="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -88,12 +88,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; patches = [ - (fetchpatch { - # fix typo in gobjectptr member function. remove on update - name = "gobjectptr-fix-member-name.patch"; - url = "https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch"; - hash = "sha256-FvbJV/YrBwhHg0kFdbhyd/Y9g7YV2nPIrRqZt7yJ50Q="; - }) (replaceVars ./fix-python-paths.patch { # Python is used at run-time to execute scripts, # e.g., those from the "Effects" menu. diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix index 5df0e6fe2ba1..0eeddade1d58 100644 --- a/pkgs/applications/graphics/kcc/default.nix +++ b/pkgs/applications/graphics/kcc/default.nix @@ -1,13 +1,13 @@ { lib, - mkDerivationWith, python3Packages, fetchPypi, + libsForQt5, p7zip, archiveSupport ? true, }: -mkDerivationWith python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "kcc"; version = "5.5.1"; @@ -17,6 +17,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec { sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; }; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ pillow pyqt5 diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index b387a1a8d918..27320c563890 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,24 +1,17 @@ { lib, - mkDerivation, + stdenv, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook3, - kconfig, - kinit, - kdoctools, - kio, - kparts, - kwidgetsaddons, - qtbase, - qtsvg, + libsForQt5, boost, graphviz, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kgraphviewer"; version = "2.4.3"; @@ -28,8 +21,8 @@ mkDerivation rec { }; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg boost graphviz ]; @@ -39,10 +32,11 @@ mkDerivation rec { extra-cmake-modules pkg-config wrapGAppsHook3 - kdoctools + libsForQt5.kdoctools + libsForQt5.wrapQtAppsHook ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with libsForQt5; [ kconfig kinit kio diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 989bdb6fb02e..9b008cfc5d78 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -30,7 +30,7 @@ libkdcraw, lcms2, gsl, - openexr_3, + openexr, giflib, libjxl, mlt, @@ -105,7 +105,7 @@ mkDerivation rec { fribidi lcms2 gsl - openexr_3 + openexr lager libaom libheif diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index c267b563d974..52d43879186f 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -4,12 +4,9 @@ fetchFromGitHub, fetchpatch, pkg-config, - wrapQtAppsHook, + libsForQt5, poppler, gnuplot, - qmake, - qtbase, - qttools, }: # This package only builds ktikz without KDE integration because KDE4 is @@ -54,15 +51,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - qttools - qmake - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; - QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; + QT_PLUGIN_PATH = "${libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix}"; buildInputs = [ - qtbase - poppler + libsForQt5.qtbase + libsForQt5.poppler ]; qmakeFlags = [ diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index d9146852744d..2e664479513d 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -4,12 +4,10 @@ fetchFromGitHub, fetchurl, povray, - qmake, - qttools, + libsForQt5, replaceVars, zlib, testers, - wrapQtAppsHook, nix-update-script, libGL, }: @@ -38,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -80,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ peterhoeg - hetraeus ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index e12bca037461..ad53e38ef7cf 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, cmake, fetchFromGitHub, fetchpatch, @@ -14,14 +14,11 @@ libraw, libtiff, openexr, - qtbase, - qtdeclarative, - qttools, - qtwebengine, + libsForQt5, eigen, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "luminance-hdr"; version = "2.6.1.1"; @@ -43,10 +40,10 @@ mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; buildInputs = [ - qtbase - qtdeclarative - qttools - qtwebengine + libsForQt5.qtbase + libsForQt5.qtdeclarative + libsForQt5.qttools + libsForQt5.qtwebengine eigen boost exiv2 @@ -60,6 +57,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook cmake pkg-config ]; diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index 912e3b963175..e57017bb6a34 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -1,15 +1,12 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, libpng, gsl, libsndfile, lzo, - qmake, - qttools, - qtbase, - qtmultimedia, + libsForQt5, withOpenCL ? true, opencl-clhpp ? null, ocl-icd ? null, @@ -18,7 +15,7 @@ assert withOpenCL -> opencl-clhpp != null; assert withOpenCL -> ocl-icd != null; -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mandelbulber"; version = "2.32"; @@ -30,13 +27,14 @@ mkDerivation rec { }; nativeBuildInputs = [ - qmake - qttools + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; buildInputs = [ - qtbase - qtmultimedia + libsForQt5.qtbase + libsForQt5.qtmultimedia libpng gsl libsndfile diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix deleted file mode 100644 index a0e757cc536f..000000000000 --- a/pkgs/applications/graphics/menyoki/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - fetchFromGitHub, - installShellFiles, - lib, - pkg-config, - rustPlatform, - stdenv, - withSixel ? false, - libsixel, - xorg, - AppKit, - withSki ? true, -}: - -rustPlatform.buildRustPackage rec { - pname = "menyoki"; - version = "1.7.0"; - - src = fetchFromGitHub { - owner = "orhun"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-6FRc/kEhGJXIZ+6GXeYj5j7QVmvZgIQgtDPvt94hlho="; - - nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config; - - buildInputs = - lib.optional withSixel libsixel - ++ lib.optionals stdenv.hostPlatform.isLinux ( - with xorg; - [ - libX11 - libXrandr - ] - ) - ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; - - buildNoDefaultFeatures = !withSki; - buildFeatures = lib.optional withSixel "sixel"; - - checkFlags = [ - # sometimes fails on lower end machines - "--skip=record::fps::tests::test_fps" - ]; - - postInstall = '' - installManPage man/* - installShellCompletion completions/menyoki.{bash,fish,zsh} - ''; - - meta = with lib; { - description = "Screen{shot,cast} and perform ImageOps on the command line"; - homepage = "https://menyoki.cli.rs/"; - changelog = "https://github.com/orhun/menyoki/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "menyoki"; - }; -} diff --git a/pkgs/applications/graphics/meshlab-unstable/default.nix b/pkgs/applications/graphics/meshlab-unstable/default.nix index 714a3c61d67b..23ea4b2c63c9 100644 --- a/pkgs/applications/graphics/meshlab-unstable/default.nix +++ b/pkgs/applications/graphics/meshlab-unstable/default.nix @@ -1,11 +1,9 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, + libsForQt5, libGLU, - qtbase, - qtscript, - qtxmlpatterns, lib3ds, bzip2, muparser, @@ -43,7 +41,7 @@ let hash = "sha256-pKjnN9H6/A2zPvzpFed65J+mnNwG/dkSE2/pW7IlN58="; }; in -mkDerivation { +stdenv.mkDerivation { pname = "meshlab-unstable"; version = "2023.12-unstable-2025-02-21"; @@ -59,9 +57,9 @@ mkDerivation { buildInputs = [ libGLU - qtbase - qtscript - qtxmlpatterns + libsForQt5.qtbase + libsForQt5.qtscript + libsForQt5.qtxmlpatterns lib3ds bzip2 muparser @@ -82,7 +80,10 @@ mkDerivation { structuresynth ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; preConfigure = '' mkdir src/external/downloads diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 710ab40c6dbc..c78afc438302 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,11 +1,9 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, + libsForQt5, libGLU, - qtbase, - qtscript, - qtxmlpatterns, lib3ds, bzip2, muparser, @@ -36,7 +34,7 @@ let hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo="; }; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "meshlab"; version = "2023.12"; @@ -49,9 +47,9 @@ mkDerivation rec { buildInputs = [ libGLU - qtbase - qtscript - qtxmlpatterns + libsForQt5.qtbase + libsForQt5.qtscript + libsForQt5.qtxmlpatterns lib3ds bzip2 muparser @@ -73,7 +71,10 @@ mkDerivation rec { structuresynth ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; preConfigure = '' substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index b07a13beb2b4..31db31a40c4d 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -2,18 +2,13 @@ stdenv, lib, fetchFromGitHub, - copyDesktopItems, - makeDesktopItem, - qmake, - qtbase, - qtxmlpatterns, - qttools, - qtwebengine, + cmake, + pkg-config, + libsForQt5, libGL, fontconfig, openssl, poppler, - wrapQtAppsHook, ffmpeg, libva, alsa-lib, @@ -27,7 +22,6 @@ lame, fdk_aac, libass, - quazip, libXext, libXfixes, }: @@ -44,8 +38,11 @@ let sha256 = "19zhgsimy0f070caikc4vrrqyc8kv2h6rl37sy3iggks8z0g98gf"; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; + buildInputs = [ libsForQt5.qtbase ]; dontWrapQtApps = true; installPhase = '' @@ -65,28 +62,28 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - substituteInPlace OpenBoard.pro \ - --replace-fail '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ - --replace-fail '-lquazip5' '-lquazip1-qt5' \ - --replace-fail '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' - substituteInPlace resources/etc/OpenBoard.config \ --replace-fail 'EnableAutomaticSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ --replace-fail 'EnableSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ --replace-fail 'HideCheckForSoftwareUpdate=false' 'HideCheckForSoftwareUpdate=true' ''; + # Required by Poppler + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=20" + ]; + nativeBuildInputs = [ - qmake - copyDesktopItems - wrapQtAppsHook + cmake + pkg-config + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtxmlpatterns - qttools - qtwebengine + libsForQt5.qtbase + libsForQt5.qtxmlpatterns + libsForQt5.qttools + libsForQt5.qtwebengine libGL fontconfig openssl @@ -104,50 +101,13 @@ stdenv.mkDerivation (finalAttrs: { lame fdk_aac libass - quazip + libsForQt5.quazip libXext libXfixes ]; propagatedBuildInputs = [ importer ]; - makeFlags = [ "release-install" ]; - - desktopItems = [ - (makeDesktopItem { - name = "OpenBoard"; - exec = "OpenBoard %f"; - icon = "OpenBoard"; - comment = "OpenBoard, an interactive white board application"; - desktopName = "OpenBoard"; - mimeTypes = [ "application/ubz" ]; - categories = [ "Education" ]; - startupNotify = true; - }) - ]; - - installPhase = '' - runHook preInstall - - lrelease OpenBoard.pro - - # Replicated release_scripts/linux/package.sh - mkdir -p $out/opt/openboard/i18n - cp -R resources/customizations build/linux/release/product/* $out/opt/openboard/ - cp resources/i18n/*.qm $out/opt/openboard/i18n/ - install -m644 resources/linux/openboard-ubz.xml $out/opt/openboard/etc/ - install -Dm644 resources/images/OpenBoard.png $out/share/icons/hicolor/64x64/apps/OpenBoard.png - - runHook postInstall - ''; - - dontWrapQtApps = true; - - postFixup = '' - makeWrapper $out/opt/openboard/OpenBoard $out/bin/OpenBoard \ - "''${qtWrapperArgs[@]}" - ''; - meta = with lib; { description = "Interactive whiteboard application"; homepage = "https://openboard.ch/"; @@ -157,6 +117,6 @@ stdenv.mkDerivation (finalAttrs: { fufexan ]; platforms = platforms.linux; - mainProgram = "OpenBoard"; + mainProgram = "openboard"; }; }) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 6bac0594b028..f4d8d03de2d3 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -3,9 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - qtbase, - qtmultimedia, - qscintilla, + libsForQt5, bison, flex, eigen, @@ -26,21 +24,17 @@ double-conversion, lib3mf, libzip, - mkDerivation, - qtmacextras, - qmake, spacenavSupport ? stdenv.hostPlatform.isLinux, libspnav, wayland, wayland-protocols, wrapGAppsHook3, - qtwayland, cairo, openscad, runCommand, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "openscad"; version = "2021.01"; @@ -95,7 +89,8 @@ mkDerivation rec { flex pkg-config gettext - qmake + libsForQt5.qmake + libsForQt5.wrapQtAppsHook wrapGAppsHook3 ]; @@ -115,9 +110,9 @@ mkDerivation rec { double-conversion freetype fontconfig - qtbase - qtmultimedia - qscintilla + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.qscintilla cairo ] ++ lib.optionals stdenv.hostPlatform.isLinux [ @@ -125,9 +120,9 @@ mkDerivation rec { libGL wayland wayland-protocols - qtwayland + libsForQt5.qtwayland ] - ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras + ++ lib.optional stdenv.hostPlatform.isDarwin libsForQt5.qtmacextras ++ lib.optional spacenavSupport libspnav; qmakeFlags = diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index c53122f52434..bf02ff0c8914 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -5,6 +5,7 @@ libglut, freetype, glew, + libsForQt5, libjpeg, libmypaint, libpng, @@ -15,14 +16,9 @@ openblas, opencv, pkg-config, - qtbase, - qtmultimedia, - qtscript, - qtserialport, lib, stdenv, superlu, - wrapQtAppsHook, libtiff, zlib, }: @@ -103,7 +99,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -121,10 +117,10 @@ stdenv.mkDerivation { lzo openblas opentoonz-opencv - qtbase - qtmultimedia - qtscript - qtserialport + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.qtscript + libsForQt5.qtserialport superlu ]; diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 209dc697817b..dd2378ce1b75 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -14,56 +14,46 @@ netcdf, openssl, python3, - qscintilla, - qtbase, - qtsvg, - qttools, - VideoDecodeAcceleration, - wrapQtAppsHook, + qt6Packages, copyDesktopItems, - # needed to run natively on wayland - qtwayland, }: stdenv.mkDerivation rec { pname = "ovito"; - version = "3.11.1"; + version = "3.12.2"; src = fetchFromGitLab { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - hash = "sha256-ulzcsFAiZDg8nABQXNB2/MS7lZdK3czGHLKgKDWS15E="; + hash = "sha256-qpKQAO2f1TfspqjbCLA/3ERWdMeknKe0a54yd9PZbsA="; fetchSubmodules = true; }; patches = [ ./zstd.patch ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6Packages.wrapQtAppsHook copyDesktopItems ]; - buildInputs = - [ - boost - bzip2 - ffmpeg - fftwSinglePrec - hdf5 - muparser - netcdf - openssl - python3 - qscintilla - qtbase - qtsvg - qttools - qtwayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - VideoDecodeAcceleration - ]; + buildInputs = [ + boost + bzip2 + ffmpeg + fftwSinglePrec + hdf5 + muparser + netcdf + openssl + python3 + qt6Packages.qscintilla + qt6Packages.qtbase + qt6Packages.qtsvg + qt6Packages.qttools + # needed to run natively on wayland + qt6Packages.qtwayland + ]; # manually create a desktop file desktopItems = [ diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index b41e63e2c2df..d62b20303b21 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,12 +6,7 @@ boost, cmake, ffmpeg, - wrapQtAppsHook, - qtbase, - qtx11extras, - qttools, - qtxmlpatterns, - qtsvg, + libsForQt5, gdal, gfortran, libXt, @@ -62,7 +57,7 @@ stdenv.mkDerivation rec { # Find the Qt platform plugin "minimal" preConfigure = '' - export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; cmakeFlags = [ @@ -88,7 +83,7 @@ stdenv.mkDerivation rec { makeWrapper ninja gfortran - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -100,11 +95,11 @@ stdenv.mkDerivation rec { boost ffmpeg gdal - qtbase - qtx11extras - qttools - qtxmlpatterns - qtsvg + libsForQt5.qtbase + libsForQt5.qtx11extras + libsForQt5.qttools + libsForQt5.qtxmlpatterns + libsForQt5.qtsvg ]; postInstall = diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index 75645349377b..694f486733db 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -1,14 +1,12 @@ { - mkDerivation, lib, - graphicsmagick, + stdenv, fetchFromGitHub, - qmake, - qtbase, - qttools, + libsForQt5, + graphicsmagick, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "photoflare"; version = "1.6.13"; @@ -20,11 +18,12 @@ mkDerivation rec { }; nativeBuildInputs = [ - qmake - qttools + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; buildInputs = [ - qtbase + libsForQt5.qtbase graphicsmagick ]; diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index fca4490d3448..360f76a387e3 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -3,9 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - qmake, - wrapQtAppsHook, - qtbase, + libsForQt5, exiv2, }: @@ -29,11 +27,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase exiv2 ]; diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index b94c0b2d6278..723a5d209833 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -1,16 +1,14 @@ { lib, fetchFromGitHub, - buildPythonPackage, - pygobject3, - pycairo, + python3Packages, glib, gtk3, gobject-introspection, wrapGAppsHook3, }: -buildPythonPackage { +python3Packages.buildPythonPackage { pname = "pick-colour-picker"; version = "unstable-2022-05-08"; @@ -32,7 +30,7 @@ buildPythonPackage { wrapGAppsHook3 ]; - pythonPath = [ + pythonPath = with python3Packages; [ pygobject3 pycairo ]; diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index a5e54f3f9120..b36190b247b7 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -2,32 +2,30 @@ lib, stdenv, fetchFromGitHub, - qtsvg, - qttools, - exiv2, - wrapQtAppsHook, cmake, + qt6Packages, + exiv2, }: stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = finalAttrs.version; - hash = "sha256-NWh0+DEfKT1iZY6tXVGuxgaXF5U+UB9S5BlWyD+1Bko="; + hash = "sha256-6LcfACoDJqB3Y9vJR1/u1yV3bHHVgU4l9cmCJ5KjqUc="; }; nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + qt6Packages.qttools + qt6Packages.wrapQtAppsHook ]; buildInputs = [ - qtsvg + qt6Packages.qtsvg exiv2 ]; diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 3cce7faf76d0..b2edec42104f 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -2,7 +2,6 @@ stdenv, lib, requireFile, - wrapQtAppsHook, autoPatchelfHook, unixtools, fakeroot, @@ -31,20 +30,7 @@ gdk-pixbuf, gtk3, pango, - # Qt 6 subpackages - qtbase, - qtserialport, - qtserialbus, - qtvirtualkeyboard, - qtmultimedia, - qt3d, - mlt, - qtlocation, - qtwebengine, - qtquick3d, - qtwayland, - qtwebview, - qtscxml, + qt6Packages, }: stdenv.mkDerivation (finalAttrs: { @@ -68,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ unixtools.script fakeroot - wrapQtAppsHook + qt6Packages.wrapQtAppsHook autoPatchelfHook mailcap libudev0-shim @@ -102,20 +88,20 @@ stdenv.mkDerivation (finalAttrs: { gtk3 pango # Qt stuff - qt3d - mlt - qtbase + qt6Packages.qt3d + qt6Packages.mlt + qt6Packages.qtbase #qtgamepad - qtserialport - qtserialbus - qtvirtualkeyboard - qtmultimedia - qtlocation - qtwebengine - qtquick3d - qtwayland - qtwebview - qtscxml + qt6Packages.qtserialport + qt6Packages.qtserialbus + qt6Packages.qtvirtualkeyboard + qt6Packages.qtmultimedia + qt6Packages.qtlocation + qt6Packages.qtwebengine + qt6Packages.qtquick3d + qt6Packages.qtwayland + qt6Packages.qtwebview + qt6Packages.qtscxml ] ++ (with xorg; [ libX11 diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index 734a49f02622..80be53583a9c 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,16 +1,13 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, - pkg-config, cmake, - qtbase, - qttools, - qtx11extras, - poppler, + pkg-config, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qcomicbook"; version = "0.9.1"; @@ -24,13 +21,14 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qttools - qtx11extras - poppler + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtx11extras + libsForQt5.poppler ]; postInstall = '' diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 338bd5ff3f14..03b78893bf06 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -1,21 +1,16 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, - cmake, pkg-config, - + libsForQt5, exiv2, mpv, opencv4, - qtbase, - qtimageformats, - qtsvg, - qttools, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qimgv"; version = "1.0.3-unstable-2024-10-11"; @@ -29,6 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; cmakeFlags = [ @@ -39,10 +35,10 @@ mkDerivation rec { exiv2 mpv opencv4 - qtbase - qtimageformats - qtsvg - qttools + libsForQt5.qtbase + libsForQt5.qtimageformats + libsForQt5.qtsvg + libsForQt5.qttools ]; postPatch = '' diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix index 3643a9e7af4f..40e6dbc5330b 100644 --- a/pkgs/applications/graphics/qosmic/default.nix +++ b/pkgs/applications/graphics/qosmic/default.nix @@ -2,9 +2,7 @@ stdenv, fetchFromGitHub, fetchpatch, - qmake, - wrapQtAppsHook, - qtbase, + libsForQt5, pkg-config, lua, flam3, @@ -51,13 +49,13 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook pkg-config ]; buildInputs = [ - qtbase + libsForQt5.qtbase lua flam3 libxml2 diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index fe3b679facf0..9c8beae294a3 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,12 +1,9 @@ { - stdenv, lib, + stdenv, fetchgit, - qtbase, - qttools, - qtx11extras, - wrapQtAppsHook, cmake, + libsForQt5, }: stdenv.mkDerivation { @@ -23,12 +20,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtx11extras + libsForQt5.qtbase + libsForQt5.qtx11extras ]; meta = with lib; { description = "Simple creation and editing of screenshots"; diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix index 688f2f0716d6..28f3f99c4946 100644 --- a/pkgs/applications/graphics/qvge/default.nix +++ b/pkgs/applications/graphics/qvge/default.nix @@ -3,22 +3,20 @@ stdenv, fetchFromGitHub, replaceVars, - wrapQtAppsHook, - qmake, - qtsvg, - qtx11extras, + libsForQt5, graphviz, }: stdenv.mkDerivation rec { pname = "qvge"; - version = "0.6.3"; + version = "0.6.3-unstable-2024-04-08"; src = fetchFromGitHub { owner = "ArsMasiuk"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-rtbUAp3l0VZsu+D9HCHM3q0UkDLflw50rYRq/LP4Wu4="; + repo = "qvge"; + #tag = "v${version}"; + rev = "5751948358d407673cfda10f52892683be143d42"; + hash = "sha256-Rh8ahS/9x2aWu4THjLKoog58+yJoCQ6GETaAQTW4Hq8="; }; sourceRoot = "${src.name}/src"; @@ -30,11 +28,12 @@ stdenv.mkDerivation rec { ); nativeBuildInputs = [ - wrapQtAppsHook - qmake + libsForQt5.wrapQtAppsHook + libsForQt5.qmake ]; - buildInputs = if stdenv.hostPlatform.isDarwin then [ qtsvg ] else [ qtx11extras ]; + buildInputs = + if stdenv.hostPlatform.isDarwin then [ libsForQt5.qtsvg ] else [ libsForQt5.qtx11extras ]; meta = with lib; { description = "Qt Visual Graph Editor"; diff --git a/pkgs/applications/graphics/qvge/set-graphviz-path.patch b/pkgs/applications/graphics/qvge/set-graphviz-path.patch index d18eb81c5d04..3d003c0657c3 100644 --- a/pkgs/applications/graphics/qvge/set-graphviz-path.patch +++ b/pkgs/applications/graphics/qvge/set-graphviz-path.patch @@ -1,7 +1,7 @@ diff --git i/commonui/CNodeEditorUIController.cpp w/commonui/CNodeEditorUIController.cpp index 7dacd48..64983e4 100644 ---- i/commonui/CNodeEditorUIController.cpp -+++ w/commonui/CNodeEditorUIController.cpp +--- i/qvgeui/CNodeEditorUIController.cpp ++++ w/qvgeui/CNodeEditorUIController.cpp @@ -123,7 +123,7 @@ CNodeEditorUIController::CNodeEditorUIController(CMainWindow *parent) : QString pathToGraphviz = QCoreApplication::applicationDirPath() + "/../tools/graphviz"; m_optionsData.graphvizPath = QFileInfo(pathToGraphviz).absoluteFilePath(); diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index eb2f81c93984..a3b29c425fe7 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -1,17 +1,12 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, - qmake, - qtbase, - qttools, - qtimageformats, - qtsvg, - qtx11extras, + libsForQt5, x11Support ? true, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qview"; version = "6.1"; @@ -24,14 +19,17 @@ mkDerivation rec { qmakeFlags = lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; buildInputs = [ - qtbase - qttools - qtimageformats - qtsvg - ] ++ lib.optionals x11Support [ qtx11extras ]; + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtimageformats + libsForQt5.qtsvg + ] ++ lib.optionals x11Support [ libsForQt5.qtx11extras ]; meta = with lib; { description = "Practical and minimal image viewer"; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index f7a2685169ca..8e86020d2354 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,8 +1,8 @@ { lib, - mkDerivationWith, fetchFromGitHub, python3Packages, + libsForQt5, file, intltool, gobject-introspection, @@ -17,19 +17,55 @@ gdk-pixbuf, libmediainfo, vmtouch, + gitUpdater, }: -mkDerivationWith python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.34"; + version = "0.9.36"; + pyproject = true; src = fetchFromGitHub { owner = "damonlynch"; repo = "rapid-photo-downloader"; rev = "v${version}"; - hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw="; + hash = "sha256-fFmIbqymYkg2Z1/x0mNsCNlDCOyqVg65CM4a67t+kPQ="; }; + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = + with python3Packages; + [ + ifuse + libimobiledevice + # Python dependencies + pyqt5 + pygobject3 + gphoto2 + pyzmq + tornado + psutil + pyxdg + arrow + python-dateutil + easygui + babel + colour + pillow + pymediainfo + sortedcontainers + requests + colorlog + pyprind + setuptools + show-in-file-manager + tenacity + ] + ++ lib.optional (pythonOlder "3.8") importlib-metadata; + postPatch = '' # Drop broken version specifier sed -i '/python_requires/d' setup.py @@ -39,6 +75,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { ''; nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook file intltool gobject-introspection @@ -72,36 +109,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec { # "Namespace [Notify / GExiv2 / GUdev] not available" strictDeps = false; - propagatedBuildInputs = - with python3Packages; - [ - ifuse - libimobiledevice - pyqt5 - pygobject3 - gphoto2 - pyzmq - tornado - psutil - pyxdg - arrow - python-dateutil - easygui - babel - colour - pillow - pyheif - pymediainfo - sortedcontainers - requests - colorlog - pyprind - setuptools - show-in-file-manager - tenacity - ] - ++ lib.optional (pythonOlder "3.8") importlib-metadata; - preFixup = '' makeWrapperArgs+=( --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" @@ -118,12 +125,17 @@ mkDerivationWith python3Packages.buildPythonApplication rec { ) ''; - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "a.*"; + }; + + meta = { description = "Photo and video importer for cameras, phones, and memory cards"; mainProgram = "rapid-photo-downloader"; homepage = "https://www.damonlynch.net/rapid/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ philipdb ]; }; } diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 954ddb4f407c..17402ceac1a4 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -1,17 +1,16 @@ { lib, + stdenv, fetchFromGitHub, - mkDerivation, cmake, + libsForQt5, libjpeg, libpng, libtiff, boost, - qtbase, - qttools, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "scantailor-advanced"; version = "1.0.19"; @@ -24,14 +23,15 @@ mkDerivation rec { nativeBuildInputs = [ cmake - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; buildInputs = [ libjpeg libpng libtiff boost - qtbase + libsForQt5.qtbase ]; meta = with lib; { diff --git a/pkgs/applications/graphics/scantailor/universal.nix b/pkgs/applications/graphics/scantailor/universal.nix index b7bdc609f61c..739878f63ccc 100644 --- a/pkgs/applications/graphics/scantailor/universal.nix +++ b/pkgs/applications/graphics/scantailor/universal.nix @@ -1,12 +1,9 @@ { lib, stdenv, - mkDerivation, fetchFromGitHub, cmake, - qtbase, - qttools, - wrapQtAppsHook, + libsForQt5, zlib, openjpeg, libjpeg_turbo, @@ -29,7 +26,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qtbase + libsForQt5.qtbase zlib libjpeg_turbo libpng @@ -40,8 +37,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake - wrapQtAppsHook - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; meta = with lib; { diff --git a/pkgs/applications/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix index 6ef67b39621f..27f2c3627fda 100644 --- a/pkgs/applications/graphics/seamly2d/default.nix +++ b/pkgs/applications/graphics/seamly2d/default.nix @@ -1,46 +1,40 @@ { - stdenv, lib, - qtbase, - wrapQtAppsHook, + stdenv, fetchFromGitHub, + libsForQt5, addDriverRunpath, poppler-utils, - qtxmlpatterns, - qtsvg, libgbm, xvfb-run, fontconfig, freetype, xorg, - qmake, python3, - qttools, git, - qtmultimedia, }: let qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]); in stdenv.mkDerivation rec { pname = "seamly2d"; - version = "2025.3.17.207"; + version = "2025.5.5.213"; src = fetchFromGitHub { owner = "FashionFreedom"; repo = "Seamly2D"; tag = "v${version}"; - hash = "sha256-5Bi+SycUZFOxmP0bWbqSnKRZ+UW6b48Cn4YUVfHi4Js="; + hash = "sha256-jcdk10TcyfPXStM+iRSaOTHczv4K+9JS2h+e/+ArtD0="; }; buildInputs = [ - qtmultimedia + libsForQt5.qtmultimedia git qtPython - qtbase + libsForQt5.qtbase poppler-utils - qtxmlpatterns - qtsvg + libsForQt5.qtxmlpatterns + libsForQt5.qtsvg libgbm freetype xorg.libXi @@ -52,9 +46,9 @@ stdenv.mkDerivation rec { addDriverRunpath xvfb-run fontconfig - wrapQtAppsHook - qmake - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools ]; postPatch = '' diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index a1c7dee5f842..e4991aed629b 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -3,9 +3,7 @@ lib, fetchFromGitHub, fftw, - qtbase, - qmake, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -22,11 +20,11 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase fftw ]; diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 16b15a555172..fe173e376ba5 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,17 +1,12 @@ { callPackage, lowPrio, - Accelerate, - CoreGraphics, - CoreVideo, }: let base3 = callPackage ./tesseract3.nix { }; base4 = callPackage ./tesseract4.nix { }; - base5 = callPackage ./tesseract5.nix { - inherit Accelerate CoreGraphics CoreVideo; - }; + base5 = callPackage ./tesseract5.nix { }; languages = callPackage ./languages.nix { }; in { diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index 22059873e4bb..4c1442b42b96 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -12,9 +12,6 @@ libtiff, icu, pango, - Accelerate, - CoreGraphics, - CoreVideo, }: stdenv.mkDerivation rec { @@ -35,21 +32,15 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = - [ - curl - leptonica - libarchive - libpng - libtiff - icu - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreGraphics - CoreVideo - ]; + buildInputs = [ + curl + leptonica + libarchive + libpng + libtiff + icu + pango + ]; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix deleted file mode 100644 index e0ca7b306f4e..000000000000 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - - cmake, - pkg-config, - ninja, - python3, - makeWrapper, - - backward-cpp, - curl, - enet, - freetype, - glm, - gtest, - libbfd, - libdwarf, - libjpeg, - libuuid, - libuv, - lua5_4, - lzfse, - opencl-headers, - SDL2, - SDL2_mixer, - wayland-protocols, - Carbon, - CoreServices, - OpenCL, - - callPackage, - nixosTests, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "vengi-tools"; - version = "0.0.35"; - - src = fetchFromGitHub { - owner = "vengi-voxel"; - repo = "vengi"; - rev = "v${finalAttrs.version}"; - hash = "sha256-8rGnW+VtqNJYqUqQDp0yOVIQd7w+cq7PIpqqIQPhkbE="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ninja - python3 - makeWrapper - ]; - - buildInputs = - [ - libbfd - libdwarf - backward-cpp - curl - enet - freetype - glm - libjpeg - libuuid - libuv - lua5_4 - lzfse - SDL2 - SDL2_mixer - ] - ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - CoreServices - OpenCL - ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers; - - cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; - - # error: "The plain signature for target_link_libraries has already been used" - doCheck = false; - - checkInputs = [ - gtest - ]; - - # Set the data directory for each executable. We cannot set it at build time - # with the PKGDATADIR cmake variable because each executable needs a specific - # one. - # This is not needed on darwin, since on that platform data files are saved - # in *.app/Contents/Resources/ too, and are picked up automatically. - postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - for prog in $out/bin/*; do - wrapProgram "$prog" \ - --set CORE_PATH $out/share/$(basename "$prog")/ - done - ''; - - passthru.tests = { - voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix { }; - voxconvert-all-formats = callPackage ./test-voxconvert-all-formats.nix { }; - run-voxedit = nixosTests.vengi-tools; - }; - - meta = with lib; { - description = "Tools from the vengi voxel engine, including a thumbnailer, a converter, and the VoxEdit voxel editor"; - longDescription = '' - Tools from the vengi C++ voxel game engine. It includes a voxel editor - with character animation support and loading/saving into a lot of voxel - volume formats. There are other tools like e.g. a thumbnailer for your - filemanager and a command line tool to convert between several voxel - formats. - ''; - homepage = "https://vengi-voxel.github.io/vengi/"; - downloadPage = "https://github.com/vengi-voxel/vengi/releases"; - license = [ - licenses.mit - licenses.cc-by-sa-30 - ]; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - broken = stdenv.hostPlatform.isDarwin; - }; -}) diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/applications/graphics/veusz/default.nix index 4622f87d9312..1974466317f8 100644 --- a/pkgs/applications/graphics/veusz/default.nix +++ b/pkgs/applications/graphics/veusz/default.nix @@ -2,8 +2,7 @@ lib, python3Packages, fetchPypi, - wrapQtAppsHook, - qtbase, + libsForQt5, }: python3Packages.buildPythonApplication rec { @@ -16,12 +15,12 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapQtAppsHook + libsForQt5.wrapQtAppsHook python3Packages.sip python3Packages.tomli ]; - buildInputs = [ qtbase ]; + buildInputs = [ libsForQt5.qtbase ]; # veusz is a script and not an ELF-executable, so wrapQtAppsHook will not wrap # it automatically -> we have to do it explicitly diff --git a/pkgs/applications/graphics/weylus/Cargo.lock b/pkgs/applications/graphics/weylus/Cargo.lock deleted file mode 100644 index 00a843910e0b..000000000000 --- a/pkgs/applications/graphics/weylus/Cargo.lock +++ /dev/null @@ -1,2392 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" - -[[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 = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "autopilot" -version = "0.4.0" -source = "git+https://github.com/H-M-H/autopilot-rs.git?rev=63eed09c715bfb665bb23172a3930a528e11691c#63eed09c715bfb665bb23172a3930a528e11691c" -dependencies = [ - "cocoa", - "core-foundation 0.7.0", - "core-graphics 0.19.2", - "image 0.22.5", - "libc", - "pkg-config", - "rand 0.7.3", - "scopeguard", - "winapi", - "x11", -] - -[[package]] -name = "base64" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -dependencies = [ - "byteorder", - "safemem", -] - -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "bytemuck" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - -[[package]] -name = "cfg-expr" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e068cb2806bbc15b439846dc16c5f89f8599f2c3e4d73d4449d38f9b2f0b6c5" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "checked_int_cast" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "cmake" -version = "0.1.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" -dependencies = [ - "cc", -] - -[[package]] -name = "cocoa" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8" -dependencies = [ - "bitflags", - "block", - "core-foundation 0.7.0", - "core-graphics 0.19.2", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys 0.8.3", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "core-graphics" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" -dependencies = [ - "bitflags", - "core-foundation 0.7.0", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" -dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "foreign-types", - "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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" -dependencies = [ - "autocfg 1.1.0", - "cfg-if", - "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -dependencies = [ - "cfg-if", - "lazy_static", -] - -[[package]] -name = "dbus" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0a745c25b32caa56b82a3950f5fec7893a960f4c10ca3b02060b0c38d8c2ce" -dependencies = [ - "libc", - "libdbus-sys", - "winapi", -] - -[[package]] -name = "deflate" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fltk" -version = "1.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ab2f73e2c40921098e1d6b8e82887b37823dee2412ffab147219562251e0c0" -dependencies = [ - "bitflags", - "crossbeam-channel", - "fltk-sys", - "paste", - "ttf-parser", -] - -[[package]] -name = "fltk-sys" -version = "1.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fef608d4752f3eec2dc30818be069ead5a6f20d173cb3b154776812041e465d" -dependencies = [ - "cmake", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding 2.1.0", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "futures-channel" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" - -[[package]] -name = "futures-executor" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-sink" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" - -[[package]] -name = "futures-task" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" - -[[package]] -name = "futures-util" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" -dependencies = [ - "futures-core", - "futures-task", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.10.2+wasi-snapshot-preview1", -] - -[[package]] -name = "gif" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af" -dependencies = [ - "color_quant", - "lzw", -] - -[[package]] -name = "glib" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124026a2fa8c33a3d17a3fe59c103f2d9fa5bd92c19e029e037736729abeab" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" -dependencies = [ - "anyhow", - "heck 0.4.0", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2 1.0.38", - "quote 1.0.18", - "syn 1.0.94", -] - -[[package]] -name = "glib-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "gobject-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer" -version = "0.18.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66363bacf5e4f6eb281564adc2902e44c52ae5c45082423e7439e9012b75456" -dependencies = [ - "bitflags", - "cfg-if", - "futures-channel", - "futures-core", - "futures-util", - "glib", - "gstreamer-sys", - "libc", - "muldiv", - "num-integer", - "num-rational 0.4.0", - "once_cell", - "option-operations", - "paste", - "pretty-hex", - "thiserror", -] - -[[package]] -name = "gstreamer-app" -version = "0.18.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664adf6abc6546c1ad54492a067dcbc605032c9c789ce8f6f78cb9ddeef4b684" -dependencies = [ - "bitflags", - "futures-core", - "futures-sink", - "glib", - "gstreamer", - "gstreamer-app-sys", - "gstreamer-base", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-app-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b401f21d731b3e5de802487f25507fabd34de2dd007d582f440fb1c66a4fbb" -dependencies = [ - "glib-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-base" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224f35f36582407caf58ded74854526beeecc23d0cf64b8d1c3e00584ed6863f" -dependencies = [ - "bitflags", - "cfg-if", - "glib", - "gstreamer", - "gstreamer-base-sys", - "libc", -] - -[[package]] -name = "gstreamer-base-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a083493c3c340e71fa7c66eebda016e9fafc03eb1b4804cf9b2bad61994b078e" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3517a65d3c2e6f8905b456eba5d53bda158d664863aef960b44f651cb7d33e2" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-video" -version = "0.18.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9418adfc72dafa1ad9eb106527ce4804887d101027c4528ec28c7d29cc899519" -dependencies = [ - "bitflags", - "cfg-if", - "futures-channel", - "glib", - "gstreamer", - "gstreamer-base", - "gstreamer-video-sys", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-video-sys" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33331b1675e73b5b000c796354278eca7fdde9327015971d9f41afe28b96e0dc" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "h2" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "handlebars" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b" -dependencies = [ - "log 0.4.17", - "pest", - "pest_derive", - "quick-error", - "serde", - "serde_json", -] - -[[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 = "http" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "hyper" -version = "0.10.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" -dependencies = [ - "base64 0.9.3", - "httparse", - "language-tags", - "log 0.3.9", - "mime", - "num_cpus", - "time", - "traitobject", - "typeable", - "unicase", - "url 1.7.2", -] - -[[package]] -name = "hyper" -version = "0.14.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ed2ada878397b045454ac7cfb011d73132c59f31a955d230bd1f1c2e68eb4a" -dependencies = [ - "byteorder", - "gif", - "jpeg-decoder", - "num-iter", - "num-rational 0.2.4", - "num-traits", - "png 0.15.3", - "scoped_threadpool", - "tiff", -] - -[[package]] -name = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-iter", - "num-rational 0.3.2", - "num-traits", - "png 0.16.8", -] - -[[package]] -name = "indexmap" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" -dependencies = [ - "autocfg 1.1.0", - "hashbrown", -] - -[[package]] -name = "inflate" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" -dependencies = [ - "adler32", -] - -[[package]] -name = "ipnetwork" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4088d739b183546b239688ddbc79891831df421773df95e236daf7867866d355" -dependencies = [ - "serde", -] - -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - -[[package]] -name = "jpeg-decoder" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" -dependencies = [ - "rayon", -] - -[[package]] -name = "language-tags" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" - -[[package]] -name = "libdbus-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.17", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "lzw" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "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 1.1.0", -] - -[[package]] -name = "mime" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -dependencies = [ - "log 0.3.9", -] - -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "mio" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" -dependencies = [ - "libc", - "log 0.4.17", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", -] - -[[package]] -name = "muldiv" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3" - -[[package]] -name = "num-derive" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg 1.1.0", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" -dependencies = [ - "autocfg 1.1.0", - "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 1.1.0", -] - -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "once_cell" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "option-operations" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95d6113415f41b268f1195907427519769e40ee6f28cbb053795098a2c16f447" -dependencies = [ - "paste", -] - -[[package]] -name = "paste" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" - -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2 1.0.38", - "quote 1.0.18", - "syn 1.0.94", -] - -[[package]] -name = "pest_meta" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" -dependencies = [ - "maplit", - "pest", - "sha-1", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - -[[package]] -name = "pnet" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8750e073f82219c01e771133c64718d7685aef922da8a0d430a46aed05b6341a" -dependencies = [ - "ipnetwork", - "pnet_base", - "pnet_datalink", - "pnet_packet", - "pnet_sys", - "pnet_transport", -] - -[[package]] -name = "pnet_base" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8205fe084bd43a3af79b3155c19feddd62e733640498842e631a2ffe107d1538" - -[[package]] -name = "pnet_datalink" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f85aef5e52e22ff06b1b11f2eb6d52959a9e0ecad3cb3f5cc2d78cadc077f0e" -dependencies = [ - "ipnetwork", - "libc", - "pnet_base", - "pnet_sys", - "winapi", -] - -[[package]] -name = "pnet_macros" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc3af95fed6dc318dfede3e81320f96ad5e237c6f7c4688108b19c8e67432d" -dependencies = [ - "proc-macro2 1.0.38", - "quote 1.0.18", - "regex", - "syn 1.0.94", -] - -[[package]] -name = "pnet_macros_support" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feaba58ba96abb218ec584d6caf0d3ff48922df05dbbeb1560553c197091b29e" -dependencies = [ - "pnet_base", -] - -[[package]] -name = "pnet_packet" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f246edaaf1aaf82072d4cd38ee18bcc5dfc0464093f9ca39e4ac5962d68cf9d4" -dependencies = [ - "glob", - "pnet_base", - "pnet_macros", - "pnet_macros_support", -] - -[[package]] -name = "pnet_sys" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028c87a5e3a48fc07df099a2025f2ef16add5993712e1494ba69a6707ee7ed06" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "pnet_transport" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "950f2a7961e19d22e19e84ff0a6e0955013185fe149673499662633d02b41b7a" -dependencies = [ - "libc", - "pnet_base", - "pnet_packet", - "pnet_sys", -] - -[[package]] -name = "png" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283" -dependencies = [ - "bitflags", - "crc32fast", - "deflate 0.7.20", - "inflate", -] - -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags", - "crc32fast", - "deflate 0.8.6", - "miniz_oxide", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[package]] -name = "pretty-hex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" - -[[package]] -name = "proc-macro-crate" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" -dependencies = [ - "thiserror", - "toml", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2 1.0.38", - "quote 1.0.18", - "syn 1.0.94", - "version_check 0.9.4", -] - -[[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 1.0.38", - "quote 1.0.18", - "version_check 0.9.4", -] - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" -dependencies = [ - "unicode-xid 0.2.3", -] - -[[package]] -name = "qrcode" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" -dependencies = [ - "checked_int_cast", - "image 0.23.14", -] - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" -dependencies = [ - "proc-macro2 1.0.38", -] - -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi", -] - -[[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 0.2.0", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rayon" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" -dependencies = [ - "autocfg 1.1.0", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.6", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" - -[[package]] -name = "ryu" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[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 1.0.38", - "quote 1.0.18", - "syn 1.0.94", -] - -[[package]] -name = "serde_json" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha-1" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "slab" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" - -[[package]] -name = "smallvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - -[[package]] -name = "socket2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2 1.0.38", - "quote 1.0.18", - "syn 1.0.94", -] - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07e33e919ebcd69113d5be0e4d70c5707004ff45188910106854f38b960df4a" -dependencies = [ - "proc-macro2 1.0.38", - "quote 1.0.18", - "unicode-xid 0.2.3", -] - -[[package]] -name = "system-deps" -version = "6.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" -dependencies = [ - "cfg-expr", - "heck 0.4.0", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" -dependencies = [ - "proc-macro2 1.0.38", - "quote 1.0.18", - "syn 1.0.94", -] - -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tiff" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d" -dependencies = [ - "byteorder", - "lzw", - "num-derive", - "num-traits", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" -dependencies = [ - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "once_cell", - "pin-project-lite", - "socket2", - "tokio-macros", - "winapi", -] - -[[package]] -name = "tokio-macros" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" -dependencies = [ - "proc-macro2 1.0.38", - "quote 1.0.18", - "syn 1.0.94", -] - -[[package]] -name = "tokio-util" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "tower-service" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" - -[[package]] -name = "tracing" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" -dependencies = [ - "proc-macro2 1.0.38", - "quote 1.0.18", - "syn 1.0.94", -] - -[[package]] -name = "tracing-core" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" -dependencies = [ - "lazy_static", - "valuable", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" -dependencies = [ - "ansi_term", - "serde", - "serde_json", - "sharded-slab", - "thread_local", - "tracing-core", - "tracing-serde", -] - -[[package]] -name = "traitobject" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "ttf-parser" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74c96594835e10fa545e2a51e8709f30b173a092bfd6036ef2cec53376244f3" - -[[package]] -name = "typeable" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - -[[package]] -name = "unicase" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -dependencies = [ - "version_check 0.1.5", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" - -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna 0.2.3", - "matches", - "percent-encoding 2.1.0", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version-compare" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" - -[[package]] -name = "version_check" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log 0.4.17", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "websocket" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723abe6b75286edc51d8ecabb38a2353f62a9e9b0588998b59111474f1dcd637" -dependencies = [ - "hyper 0.10.16", - "rand 0.6.5", - "unicase", - "url 1.7.2", - "websocket-base", -] - -[[package]] -name = "websocket-base" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403f3fd505ff930da84156389639932955fb09705b3dccd1a3d60c8e7ff62776" -dependencies = [ - "base64 0.10.1", - "bitflags", - "byteorder", - "rand 0.6.5", - "sha-1", -] - -[[package]] -name = "weylus" -version = "0.11.4" -dependencies = [ - "autopilot", - "bitflags", - "cc", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "dbus", - "dirs", - "fltk", - "gstreamer", - "gstreamer-app", - "gstreamer-video", - "handlebars", - "hyper 0.14.18", - "image 0.22.5", - "image 0.23.14", - "num_cpus", - "percent-encoding 2.1.0", - "pnet", - "qrcode", - "serde", - "serde_json", - "structopt", - "tokio", - "toml", - "tracing", - "tracing-subscriber", - "url 2.2.2", - "websocket", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "x11" -version = "2.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd0565fa8bfba8c5efe02725b14dff114c866724eff2cfd44d76cea74bcd87a" -dependencies = [ - "libc", - "pkg-config", -] diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix deleted file mode 100644 index 3aa61ec06d30..000000000000 --- a/pkgs/applications/graphics/weylus/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, - makeWrapper, - dbus, - ffmpeg, - x264, - libva, - gst_all_1, - xorg, - libdrm, - pkg-config, - pango, - pipewire, - cmake, - git, - autoconf, - libtool, - typescript, - ApplicationServices, - Carbon, - Cocoa, - VideoToolbox, -}: - -rustPlatform.buildRustPackage rec { - pname = "weylus"; - version = "unstable-2022-06-07"; - - src = fetchFromGitHub { - owner = "H-M-H"; - repo = pname; - rev = "b169a6be2bf3e8d105273d92f032cca5438de53a"; - sha256 = "sha256-J9eVFIfmyBviVuT1MYKb5yoacbPqOAT3A8jahWv5qw8="; - }; - - buildInputs = - [ - ffmpeg - x264 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Carbon - Cocoa - VideoToolbox - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - dbus - libva - gst_all_1.gst-plugins-base - xorg.libXext - xorg.libXft - xorg.libXinerama - xorg.libXcursor - xorg.libXrender - xorg.libXfixes - xorg.libXtst - xorg.libXrandr - xorg.libXcomposite - xorg.libXi - xorg.libXv - pango - libdrm - ]; - - nativeBuildInputs = - [ - cmake - git - typescript - makeWrapper - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - autoconf - libtool - ]; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "autopilot-0.4.0" = "sha256-1DRuhAAXaIADUmXlDVr8UNbI/Ab2PYdrx9Qh0j9rTX8="; - }; - }; - - cargoBuildFlags = [ "--features=ffmpeg-system" ]; - cargoTestFlags = [ "--features=ffmpeg-system" ]; - - postFixup = - let - GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ - gst_all_1.gst-plugins-base - pipewire - ]; - in - lib.optionalString stdenv.hostPlatform.isLinux '' - wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH} - ''; - - postInstall = '' - install -vDm755 weylus.desktop $out/share/applications/weylus.desktop - ''; - - env = { - NIX_CFLAGS_COMPILE = toString [ - "-Wno-incompatible-pointer-types" - ]; - }; - - meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; - description = "Use your tablet as graphic tablet/touch screen on your computer"; - mainProgram = "weylus"; - homepage = "https://github.com/H-M-H/Weylus"; - license = with licenses; [ agpl3Only ]; - maintainers = with maintainers; [ lom ]; - }; -} diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 333f08aa9d1b..3c1a0f0533a7 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "xournalpp"; repo = "xournalpp"; rev = "v${version}"; - hash = "sha256-VS5f+9daEQpPu5vam8DWhRqU0AWMmJab8KaRzTnRU/M="; + hash = "sha256-Jum9DEbwTtiT0mlrBCBJ0XHhH+DnhXf/AnthZ+qKSZg="; }; postPatch = '' diff --git a/pkgs/applications/graphics/yacreader/darwin-unarr-use-pkg-config.patch b/pkgs/applications/graphics/yacreader/darwin-unarr-use-pkg-config.patch new file mode 100644 index 000000000000..dff2b69df514 --- /dev/null +++ b/pkgs/applications/graphics/yacreader/darwin-unarr-use-pkg-config.patch @@ -0,0 +1,13 @@ +diff --git a/compressed_archive/unarr/unarr-wrapper.pri b/compressed_archive/unarr/unarr-wrapper.pri +index 0115267..5d3d6f5 100644 +--- a/compressed_archive/unarr/unarr-wrapper.pri ++++ b/compressed_archive/unarr/unarr-wrapper.pri +@@ -6,7 +6,7 @@ HEADERS += $$PWD/extract_delegate.h \ + + SOURCES += $$PWD/compressed_archive.cpp + +-if(mingw|unix):!macx:!contains(QT_CONFIG, no-pkg-config):packagesExist(libunarr) { ++if(mingw|unix):!contains(QT_CONFIG, no-pkg-config):packagesExist(libunarr) { + message(Using system provided unarr installation found by pkg-config.) + CONFIG += link_pkgconfig + PKGCONFIG += libunarr diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 692463174da6..f47f5a0a022f 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -1,46 +1,76 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, - qmake, - poppler, - pkg-config, - libunarr, libGLU, - qtdeclarative, - qtgraphicaleffects, - qtmultimedia, - qtquickcontrols2, - qtscript, + libunarr, + libsForQt5, + pkg-config, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "yacreader"; version = "9.15.0"; src = fetchFromGitHub { owner = "YACReader"; - repo = pname; - rev = version; - sha256 = "sha256-5vCjr8WRwa7Q/84Itgg07K1CJKGnWA1z53et2IxxReE="; + repo = "yacreader"; + tag = version; + hash = "sha256-5vCjr8WRwa7Q/84Itgg07K1CJKGnWA1z53et2IxxReE="; }; + patches = [ + # make the unarr backend logic use pkg-config even on Darwin + ./darwin-unarr-use-pkg-config.patch + ]; + + qmakeFlags = [ + # force unarr backend on all platforms + "CONFIG+=unarr" + ]; + nativeBuildInputs = [ - qmake + libsForQt5.qmake + libsForQt5.qttools # for translations + libsForQt5.wrapQtAppsHook pkg-config ]; - buildInputs = [ - poppler - libunarr - libGLU - qtmultimedia - qtscript - ]; - propagatedBuildInputs = [ - qtquickcontrols2 - qtgraphicaleffects - qtdeclarative - ]; + + buildInputs = + [ + libGLU + libsForQt5.poppler + libsForQt5.qtgraphicaleffects # imported, but not declared as a dependency + libsForQt5.qtmultimedia + libsForQt5.qtquickcontrols2 + libunarr + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libsForQt5.qtmacextras # can be removed when using qt6 + ]; + + # custom Darwin install instructions taken from the upsteam compileOSX.sh script + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' + runHook preInstall + + mkdir -p "$out"/Applications + + cp -r YACReader/YACReader.app "$out"/Applications/ + cp -r YACReaderLibrary/YACReaderLibrary.app "$out"/Applications/ + cp -r YACReaderLibraryServer/YACReaderLibraryServer.app "$out"/Applications/ + + cp -r release/server "$out"/Applications/YACReaderLibrary.app/Contents/MacOS/ + cp -r release/server "$out"/Applications/YACReaderLibraryServer.app/Contents/MacOS/ + cp -r release/languages "$out"/Applications/YACReader.app/Contents/MacOS/ + cp -r release/languages "$out"/Applications/YACReaderLibrary.app/Contents/MacOS/ + cp -r release/languages "$out"/Applications/YACReaderLibraryServer.app/Contents/MacOS/ + + makeWrapper "$out"/Applications/YACReader.app/Contents/MacOS/YACReader "$out/bin/YACReader" + makeWrapper "$out"/Applications/YACReaderLibrary.app/Contents/MacOS/YACReaderLibrary "$out/bin/YACReaderLibrary" + makeWrapper "$out"/Applications/YACReaderLibraryServer.app/Contents/MacOS/YACReaderLibraryServer "$out/bin/YACReaderLibraryServer" + + runHook postInstall + ''; meta = { description = "Comic reader for cross-platform reading and managing your digital comic collection"; diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 91d80677bb16..918c74301ad5 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -24,7 +24,7 @@ syntax-highlighting, libmtp, libssh, - openexr_3, + openexr, libtirpc, phonon, qtsvg, @@ -71,7 +71,7 @@ mkDerivation { syntax-highlighting libmtp libssh - openexr_3 + openexr libtirpc phonon qtsvg diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index 0ccc338badb1..d0376e1030f3 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -18,6 +18,7 @@ mkDerivation { meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; + broken = true; # doesn't build with latest Poppler }; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/applications/kde/palapeli.nix b/pkgs/applications/kde/palapeli.nix index 43c5134343a8..b6752063f539 100644 --- a/pkgs/applications/kde/palapeli.nix +++ b/pkgs/applications/kde/palapeli.nix @@ -26,6 +26,6 @@ mkDerivation { description = "Single-player jigsaw puzzle game"; mainProgram = "palapeli"; license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ harrisonthorne ]; + maintainers = with lib.maintainers; [ municorn ]; }; } diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix deleted file mode 100644 index 7e35770fb6c7..000000000000 --- a/pkgs/applications/logging/sosreport/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gettext, - magic, - pexpect, - pyyaml, - setuptools, -}: - -buildPythonPackage rec { - pname = "sosreport"; - version = "4.9.0"; - - src = fetchFromGitHub { - owner = "sosreport"; - repo = "sos"; - tag = version; - sha256 = "sha256-UJzDRse1rjbGRV/+3JLLrXNwYTJtqlDudB1dDB7uslg="; - }; - - nativeBuildInputs = [ - gettext - ]; - - propagatedBuildInputs = [ - magic - pexpect - pyyaml - setuptools - ]; - - # requires avocado-framework 94.0, latest version as of writing is 96.0 - doCheck = false; - - preCheck = '' - export PYTHONPATH=$PWD/tests:$PYTHONPATH - ''; - - pythonImportsCheck = [ "sos" ]; - - meta = with lib; { - description = "Unified tool for collecting system logs and other debug information"; - homepage = "https://github.com/sosreport/sos"; - license = licenses.gpl2Only; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix deleted file mode 100644 index bf705566c2b3..000000000000 --- a/pkgs/applications/misc/1password-gui/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - stdenv, - callPackage, - channel ? "stable", - fetchurl, - lib, - # This is only relevant for Linux, so we need to pass it through - polkitPolicyOwners ? [ ], -}: - -let - pname = "1password"; - - versions = builtins.fromJSON (builtins.readFile ./versions.json); - hostOs = if stdenv.hostPlatform.isLinux then "linux" else "darwin"; - version = versions."${channel}-${hostOs}" or (throw "unknown channel-os ${channel}-${hostOs}"); - - sources = builtins.fromJSON (builtins.readFile ./sources.json); - - src = fetchurl { - inherit - (sources.${channel}.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")) - url - hash - ; - }; - - meta = { - # Requires to be installed in "/Application" which is not possible for now (https://github.com/NixOS/nixpkgs/issues/254944) - broken = stdenv.hostPlatform.isDarwin; - description = "Multi-platform password manager"; - homepage = "https://1password.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ - khaneliman - timstott - savannidgerinel - sebtm - ]; - platforms = builtins.attrNames sources.${channel}; - mainProgram = "1password"; - }; - -in -if stdenv.hostPlatform.isDarwin then - callPackage ./darwin.nix { - inherit - pname - version - src - meta - ; - } -else - callPackage ./linux.nix { - inherit - pname - version - src - meta - polkitPolicyOwners - ; - } diff --git a/pkgs/applications/misc/1password-gui/sources.json b/pkgs/applications/misc/1password-gui/sources.json deleted file mode 100644 index f0dca4321f30..000000000000 --- a/pkgs/applications/misc/1password-gui/sources.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "stable": { - "x86_64-linux": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.70.x64.tar.gz", - "hash": "sha256-QGKeKX7qxu7heJ6T0I8aayI1P2M3KOmU9faS929BCjI=" - }, - "aarch64-linux": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.70.arm64.tar.gz", - "hash": "sha256-Uz8YKlIa6zibRv3ObnVVlyEk3sZP5wX+0E/nX02m6SA=" - }, - "x86_64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.70-x86_64.zip", - "hash": "sha256-s6+LUSHZwCH5PgREt2bkCCR3JeGBj9llQ6rGrOhEPlQ=" - }, - "aarch64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.70-aarch64.zip", - "hash": "sha256-f9b8L4S6CToMukeqrW3EKXAov0rqEMsIpZEGrvDQmg8=" - } - }, - "beta": { - "x86_64-linux": { - "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.10.70-24.BETA.x64.tar.gz", - "hash": "sha256-XNub6kGh2QH2WQKh0Hj6IBVQENfe5YIaOtRV+pkuioc=" - }, - "aarch64-linux": { - "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.10.70-24.BETA.arm64.tar.gz", - "hash": "sha256-wqpSPCGFiDioIzhUyVCEBfRval13mu0dMSs4oIt+RIU=" - }, - "x86_64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.70-24.BETA-x86_64.zip", - "hash": "sha256-jzjXVh9iTua0/0N3lP4xIPVd1hDlsWssbTtDvvzoTZk=" - }, - "aarch64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.70-24.BETA-aarch64.zip", - "hash": "sha256-qb1j9VMhI+tf643HCOz+5dhTuFAgd1ICv8lvRC+um+I=" - } - } -} diff --git a/pkgs/applications/misc/1password-gui/versions.json b/pkgs/applications/misc/1password-gui/versions.json deleted file mode 100644 index 3314aea3f031..000000000000 --- a/pkgs/applications/misc/1password-gui/versions.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "stable-linux": "8.10.70", - "stable-darwin": "8.10.70", - "beta-linux":"8.10.70-24.BETA", - "beta-darwin": "8.10.70-24.BETA" -} diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 356127483fe8..ae52a8f37aa9 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.1.4.3"; + version = "6.1.5.2"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-PTO4x5YKqs4wWonW3N/sMAVlbWJp+eVjLL98G9bNZ4c="; + hash = "sha256-BETlzGL/5IjXajyyvQtYb0Q0sra4BILSL9fX4BNPNSI="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/applications/misc/ArchiSteamFarm/deps.json index ccec2735b33e..c4e14a7559e8 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.json +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.json @@ -1,8 +1,8 @@ [ { "pname": "AngleSharp", - "version": "1.2.0", - "hash": "sha256-l8+Var9o773VL6Ybih3boaFf9sYjS7eqtLGd8DCIPsk=" + "version": "1.3.0", + "hash": "sha256-xq+G2f9FCqS6PjIgfDdZjVRoaxVMiSyOXC7KtMzMpPU=" }, { "pname": "CryptSharpStandard", @@ -276,8 +276,8 @@ }, { "pname": "Markdig.Signed", - "version": "0.40.0", - "hash": "sha256-msd36cVKi3MTkT1QQg/b5yW4oLM3e8hbahPPkvhzRZw=" + "version": "0.41.0", + "hash": "sha256-fFAfiC6UVrirA/I11urHK4z08iF96Rkez/3HtTmleDs=" }, { "pname": "Microsoft.ApplicationInsights", @@ -286,8 +286,8 @@ }, { "pname": "Microsoft.AspNetCore.OpenApi", - "version": "9.0.3", - "hash": "sha256-URV7tlaHv1JPpqeJXQMYRoIZYU7lFGJPyTKbl2p3gqI=" + "version": "9.0.4", + "hash": "sha256-TGyUwcxFsEDYvOTj+GBmhbkkb2vqe3Ver1Y8AqP7/x8=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -296,8 +296,8 @@ }, { "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator", - "version": "3.11.0-beta1.25076.3", - "hash": "sha256-JCyHBJ7BhQFem8vp96ewwFvWaZccOBg1viAHxZwzORg=" + "version": "3.11.0-beta1.25123.3", + "hash": "sha256-FcW0EmA3dJfuV/rStaq47uSUkXV6jlmY1HCbvhpRbL4=" }, { "pname": "Microsoft.CodeCoverage", @@ -441,23 +441,23 @@ }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.7.0", - "hash": "sha256-LqEtksyd06m12yasVQK/9j6Y/giTDqfMJrdUUDxW0WY=" + "version": "8.8.0", + "hash": "sha256-UwRAN/yuGF5vss7vDHIxlLjn0kKGVPmN5ga3GQP2TF0=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.7.0", - "hash": "sha256-P9oPGIyaZrRd1EqhgvuSF5Bt/7fm/dS3nC3HXo4C720=" + "version": "8.8.0", + "hash": "sha256-9eMcoTMyWb+4ZLxGxwa2BSQG1/nYR5TwLvuivXXsOjU=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.7.0", - "hash": "sha256-yXyiQR87kb630Qwu+D0GifWxPj74VN7wtzOincrSdIg=" + "version": "8.8.0", + "hash": "sha256-uKsTmgcGgjxAIIWt03XU0ecL5Zpdu2lcI7cIbyWDxtM=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.7.0", - "hash": "sha256-l4jl4mU3bG433xSKDdCAkEqD0uUGKTOmbthhYAogcRI=" + "version": "8.8.0", + "hash": "sha256-MSChrqqB6LtJzhX5hSvdokHmZhlN05g2aK6CT1By8E8=" }, { "pname": "Microsoft.NET.Test.Sdk", @@ -646,23 +646,23 @@ }, { "pname": "protobuf-net", - "version": "3.2.46", - "hash": "sha256-NirxAUXEIUQz0HHLS+KS4fgOZwJy1zJZYGcjPa5ujTs=" + "version": "3.2.52", + "hash": "sha256-phXeroBt5KbHYkApkkMa0mRCVkDY+dtOOXXNY+i50Ek=" }, { "pname": "protobuf-net.Core", - "version": "3.2.46", - "hash": "sha256-Srg7pP7rleL462idLPFUxgXBLrywWeHFyEvSV+keA4E=" + "version": "3.2.52", + "hash": "sha256-/9Jj26tuSKeYJb9udwew5i5EVvaoeNu/vBCKS0VhSQQ=" }, { "pname": "Scalar.AspNetCore", - "version": "2.1.3", - "hash": "sha256-o0rPXtulpU7y0gfQkUq9MQzud2X6A8DAJ38NPGeP5zs=" + "version": "2.2.1", + "hash": "sha256-dnxwn7KG02ko7QWSXf5xclfQSDg1OhqlnaWD6Le0Yfk=" }, { "pname": "SteamKit2", - "version": "3.0.2", - "hash": "sha256-bRiLFaq/hsr+7BKtSKoD2+pf0VCGhBYe/rO3DgqMZpo=" + "version": "3.1.0", + "hash": "sha256-Lpz0OQrKQW0AMrt9wvK4tO/NjJdHvXvlt+jitKrphVA=" }, { "pname": "System.Buffers", @@ -674,11 +674,6 @@ "version": "1.7.1", "hash": "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo=" }, - { - "pname": "System.Collections.Immutable", - "version": "7.0.0", - "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" - }, { "pname": "System.Collections.Immutable", "version": "8.0.0", @@ -686,33 +681,33 @@ }, { "pname": "System.Composition", - "version": "9.0.3", - "hash": "sha256-WnAxY6yJygMiHhht3/Cu2q6usvbqjy10+dnQhVAOBoc=" + "version": "9.0.4", + "hash": "sha256-Ec1PdqzxQOaNsnonimmpyq5f5+Wa+lvWdR0Je3/a2OI=" }, { "pname": "System.Composition.AttributedModel", - "version": "9.0.3", - "hash": "sha256-wNsQq1oshdAXZYlE3a0V+qdaSY7UAJa6XyjVEKtCzdM=" + "version": "9.0.4", + "hash": "sha256-r71EJF5F5ZjAgkuvcI00tAnnIrK+IQ5Wj7wU8MwwRRQ=" }, { "pname": "System.Composition.Convention", - "version": "9.0.3", - "hash": "sha256-FxDt7YeQ/n3RJbfgqhKnWxZGvAisArsWS6Nl5XN8Cm0=" + "version": "9.0.4", + "hash": "sha256-BfLOq0FSx1QVfT2mqcqU/nfvgIJA+tf3Ng0CxHx1GG4=" }, { "pname": "System.Composition.Hosting", - "version": "9.0.3", - "hash": "sha256-Lshms36a63CFbBKA34tXJON2/fFy6UeAK2EcKFgGHas=" + "version": "9.0.4", + "hash": "sha256-+ep0Y2ptrKsb3JlArfhKndUuoBVrS1f59okbdKRKVYQ=" }, { "pname": "System.Composition.Runtime", - "version": "9.0.3", - "hash": "sha256-YjWG/ugx/aEDND496fYbRVD7+lpOU7cNZFPICkHc4S0=" + "version": "9.0.4", + "hash": "sha256-ztqnugik7Ye70YDQGvgPWfovFbHZ2R2tFSWZf8IGcMM=" }, { "pname": "System.Composition.TypedParts", - "version": "9.0.3", - "hash": "sha256-gMkfMOSVX0YLAtBamdHacmSBTDE+XHR2ocp5/Bwrj0U=" + "version": "9.0.4", + "hash": "sha256-WFw1we/U8o14HNXwwVW4lggCpekb2c/ptpO8LbWYBr8=" }, { "pname": "System.Diagnostics.DiagnosticSource", @@ -726,8 +721,8 @@ }, { "pname": "System.IO.Hashing", - "version": "9.0.1", - "hash": "sha256-IJru9BdFNsNs7FbG+F9djJdkkWdpoz2IxQ+GgvKvUOs=" + "version": "9.0.4", + "hash": "sha256-rbcQzEncB3VuUZIcsE1tq30suf5rvRE4HkE+0lR/skU=" }, { "pname": "System.Linq.Async", @@ -766,8 +761,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "9.0.3", - "hash": "sha256-27A1V1ANw23BZPxSMJQsrrwQ1hruFj48DtWuyavViT4=" + "version": "9.0.4", + "hash": "sha256-VSlwaKi5WU6J0LYVh/hFfZuSkCG4V99MH2iLwspTrYA=" }, { "pname": "System.Security.Principal.Windows", diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 9a185ff1f9f6..a5119a758495 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -7,7 +7,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "c3113782bc4895099b1a07a0e811d1e5af871ddc"; + version = "6f0393c091d04ecb69dff790f6146cc375b71268"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -15,10 +15,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-B2gn40LWVm75pwV5sQpv1gRsNof9tQUDClu7oLSz/VM="; + hash = "sha256-Mj7ubIB84gCE/Y3ZzISQ4coGLGZfg4curuBYQdRWiUY="; }; - npmDepsHash = "sha256-Btf/S3ia8Uo/ChrKoYKRk9sKS+ZuQGtaAnaQeGDTIYI="; + npmDepsHash = "sha256-b5L1Lcmehv8aheFaYp0iPyNhwekOiq8J4rVaE4/Oqj4="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/actiona/default.nix b/pkgs/applications/misc/actiona/default.nix deleted file mode 100644 index 069473ce3c0f..000000000000 --- a/pkgs/applications/misc/actiona/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - wrapQtAppsHook, - - bluez, - libnotify, - libXdmcp, - libXtst, - opencv, - qtbase, - qtmultimedia, - qtscript, - qttools, - qtx11extras, - qtxmlpatterns, - - # Running with TTS support causes the program to freeze for a few seconds every time at startup, - # so it is disabled by default - textToSpeechSupport ? false, - qtspeech, -}: - -let - # For some reason qtscript wants to use the same version of qtbase as itself - # This override makes it think that they are the same version - qtscript' = qtscript.overrideAttrs (oldAttrs: { - inherit (qtbase) version; - postPatch = '' - substituteInPlace .qmake.conf \ - --replace-fail ${oldAttrs.version} ${qtbase.version} - ''; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "actiona"; - version = "3.10.2"; - - src = fetchFromGitHub { - owner = "Jmgr"; - repo = "actiona"; - rev = "v${finalAttrs.version}"; - hash = "sha256-4RKCNEniBBx0kDwdHVZOqXYeGCsH8g6SfVc8JdDV0hI="; - fetchSubmodules = true; - }; - - patches = - [ - # Sets the proper search location for the `.so` files and the translations - ./fix-paths.patch - ] - ++ lib.optionals (!textToSpeechSupport) [ - # Removes TTS support - ./disable-tts.patch - ]; - - postPatch = '' - substituteInPlace gui/src/mainwindow.cpp executer/src/executer.cpp tools/src/languages.cpp \ - --subst-var out - ''; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - bluez - libnotify - libXdmcp - libXtst - opencv - qtbase - qtmultimedia - qtscript' - qttools - qtx11extras - qtxmlpatterns - ] ++ lib.optionals textToSpeechSupport [ qtspeech ]; - - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - cmakeFlags = [ (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) ]; - - # udev is used by the system-actionpack - env.NIX_LDFLAGS = "-ludev"; - - installPhase = '' - runHook preInstall - - install -Dm755 {execution,actiontools,tools}/*.so -t $out/lib - install -Dm755 actions/actionpack*.so -t $out/lib/actions - install -Dm755 actiona actexec -t $out/bin - install -Dm644 translations/*.qm -t $out/share/actiona/translations - install -Dm644 $src/actiona.desktop -t $out/share/applications - install -Dm644 $src/gui/icons/actiona.png -t $out/share/icons/hicolor/48x48/apps - - runHook postInstall - ''; - - meta = { - description = "Cross-platform automation tool"; - homepage = "https://github.com/Jmgr/actiona"; - license = lib.licenses.gpl3Only; - mainProgram = "actiona"; - maintainers = with lib.maintainers; [ tomasajt ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/misc/actiona/disable-tts.patch b/pkgs/applications/misc/actiona/disable-tts.patch deleted file mode 100644 index 977959db254c..000000000000 --- a/pkgs/applications/misc/actiona/disable-tts.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/actions/system/CMakeLists.txt b/actions/system/CMakeLists.txt -index ca861145..3e3d3d3b 100644 ---- a/actions/system/CMakeLists.txt -+++ b/actions/system/CMakeLists.txt -@@ -66,8 +66,6 @@ set(HEADERS - ${HEADERS_PREFIX}/actions/playsoundinstance.hpp - ${HEADERS_PREFIX}/actions/systemdefinition.hpp - ${HEADERS_PREFIX}/actions/systeminstance.hpp -- ${HEADERS_PREFIX}/actions/texttospeechdefinition.hpp -- ${HEADERS_PREFIX}/actions/texttospeechinstance.hpp - ${HEADERS_PREFIX}/code/mediaplaylist.hpp - ${HEADERS_PREFIX}/code/notify.hpp - ${HEADERS_PREFIX}/code/process.hpp -@@ -131,7 +129,6 @@ find_package(Qt5 ${ACT_MINIMUM_QT_VERSION} COMPONENTS - DBus - Multimedia - MultimediaWidgets -- TextToSpeech - REQUIRED) - - target_include_directories(${PROJECT} -@@ -153,7 +150,6 @@ target_link_libraries(${PROJECT} - Qt5::DBus - Qt5::Multimedia - Qt5::MultimediaWidgets -- Qt5::TextToSpeech - ${LIBNOTIFY_LIBRARIES} - ${BLUEZ_LIBRARIES} - ${UDEV_LIBRARIES} -diff --git a/actions/system/src/actionpacksystem.hpp b/actions/system/src/actionpacksystem.hpp -index c5768415..27a899d6 100644 ---- a/actions/system/src/actionpacksystem.hpp -+++ b/actions/system/src/actionpacksystem.hpp -@@ -31,10 +31,6 @@ - #include "actions/playsounddefinition.hpp" - #include "actions/findimagedefinition.hpp" - --#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) --#include "actions/texttospeechdefinition.hpp" --#endif -- - #include "code/system.hpp" - #include "code/mediaplaylist.hpp" - #include "code/notify.hpp" -@@ -67,9 +63,6 @@ public: - addActionDefinition(new Actions::DetachedCommandDefinition(this)); - addActionDefinition(new Actions::PlaySoundDefinition(this)); - addActionDefinition(new Actions::FindImageDefinition(this)); --#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) -- addActionDefinition(new Actions::TextToSpeechDefinition(this)); --#endif - } - - QString id() const override { return QStringLiteral("system"); } diff --git a/pkgs/applications/misc/actiona/fix-paths.patch b/pkgs/applications/misc/actiona/fix-paths.patch deleted file mode 100644 index 1c26159bbfdb..000000000000 --- a/pkgs/applications/misc/actiona/fix-paths.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/executer/src/executer.cpp b/executer/src/executer.cpp -index da848dad..5bd7e986 100644 ---- a/executer/src/executer.cpp -+++ b/executer/src/executer.cpp -@@ -45,7 +45,7 @@ bool Executer::start(QIODevice *device, const QString &filename) - QSettings settings; - QString locale = settings.value(QStringLiteral("gui/locale"), QLocale::system().name()).toString(); - -- mActionFactory->loadActionPacks(QApplication::applicationDirPath() + QStringLiteral("/actions"), locale); -+ mActionFactory->loadActionPacks(QStringLiteral("@out@/lib/actions"), locale); - #ifndef Q_OS_WIN - if(mActionFactory->actionPackCount() == 0) - mActionFactory->loadActionPacks(QStringLiteral("actiona/actions/"), locale); -diff --git a/gui/src/mainwindow.cpp b/gui/src/mainwindow.cpp -index 6052648e..3c802d93 100644 ---- a/gui/src/mainwindow.cpp -+++ b/gui/src/mainwindow.cpp -@@ -322,7 +322,7 @@ void MainWindow::postInit() - if(mSplashScreen) - mSplashScreen->showMessage(tr("Loading actions...")); - -- mActionFactory->loadActionPacks(QApplication::applicationDirPath() + QStringLiteral("/actions"), mUsedLocale); -+ mActionFactory->loadActionPacks(QStringLiteral("@out@/lib/actions"), mUsedLocale); - #ifndef Q_OS_WIN - if(mActionFactory->actionPackCount() == 0) - mActionFactory->loadActionPacks(QStringLiteral("actiona/actions/"), mUsedLocale); -diff --git a/tools/src/languages.cpp b/tools/src/languages.cpp -index 4926936e..18e9aabb 100644 ---- a/tools/src/languages.cpp -+++ b/tools/src/languages.cpp -@@ -79,7 +79,7 @@ namespace Tools - void Languages::installTranslator(const QString &componentName, const QString &locale) - { - auto translator = new QTranslator(QCoreApplication::instance()); -- if(!translator->load(QStringLiteral("%1/translations/%2_%3").arg(QCoreApplication::applicationDirPath()).arg(componentName).arg(locale))) -+ if(!translator->load(QStringLiteral("@out@/share/actiona/translations/%1_%2").arg(componentName).arg(locale))) - { - auto path = QStringLiteral("%1/translations/%2_%3").arg(QDir::currentPath()).arg(componentName).arg(locale); - if(!translator->load(path)) diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix deleted file mode 100644 index 6d6b3b7a1887..000000000000 --- a/pkgs/applications/misc/audio/sox/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - config, - lib, - stdenv, - fetchgit, - autoreconfHook, - autoconf-archive, - pkg-config, - CoreAudio, - enableAlsa ? true, - alsa-lib, - enableLibao ? true, - libao, - enableLame ? config.sox.enableLame or false, - lame, - enableLibmad ? true, - libmad, - enableLibogg ? true, - libogg, - libvorbis, - enableOpusfile ? true, - opusfile, - enableFLAC ? true, - flac, - enablePNG ? true, - libpng, - enableLibsndfile ? true, - libsndfile, - enableWavpack ? true, - wavpack, - # amrnb and amrwb are unfree, disabled by default - enableAMR ? false, - amrnb, - amrwb, - enableLibpulseaudio ? - stdenv.hostPlatform.isLinux && lib.meta.availableOn stdenv.hostPlatform libpulseaudio, - libpulseaudio, -}: - -stdenv.mkDerivation { - pname = "sox"; - version = "unstable-2021-05-09"; - - src = fetchgit { - # not really needed, but when this src was updated from `fetchurl -> - # fetchgit`, we spared the mass rebuild by changing this `name` and - # therefor merge this to `master` and not to `staging`. - name = "source"; - url = "https://git.code.sf.net/p/sox/code"; - rev = "42b3557e13e0fe01a83465b672d89faddbe65f49"; - hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c="; - }; - - outputs = [ - "out" - "dev" - "lib" - "man" - ]; - - nativeBuildInputs = [ - autoreconfHook - autoconf-archive - pkg-config - ]; - - patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; - - buildInputs = - lib.optional (enableAlsa && stdenv.hostPlatform.isLinux) alsa-lib - ++ lib.optional enableLibao libao - ++ lib.optional enableLame lame - ++ lib.optional enableLibmad libmad - ++ lib.optionals enableLibogg [ - libogg - libvorbis - ] - ++ lib.optional enableOpusfile opusfile - ++ lib.optional enableFLAC flac - ++ lib.optional enablePNG libpng - ++ lib.optional enableLibsndfile libsndfile - ++ lib.optional enableWavpack wavpack - ++ lib.optionals enableAMR [ - amrnb - amrwb - ] - ++ lib.optional enableLibpulseaudio libpulseaudio - ++ lib.optional stdenv.hostPlatform.isDarwin CoreAudio; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Sample Rate Converter for audio"; - homepage = "https://sox.sourceforge.net/"; - maintainers = with maintainers; [ marcweber ]; - license = if enableAMR then licenses.unfree else licenses.gpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix index 1522bf516f76..3d66432a50f7 100644 --- a/pkgs/applications/misc/bikeshed/default.nix +++ b/pkgs/applications/misc/bikeshed/default.nix @@ -38,12 +38,12 @@ buildPythonApplication rec { pname = "bikeshed"; - version = "5.1.1"; + version = "5.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ck3Ucv39w+EL1r+IzMbnqVfBqtqBVq4kxdpZVDWpM3U="; + hash = "sha256-QIADVcxgJreH2pvXRVIBE5p6nEEYZtTiSo00RrpFT+E="; }; build-system = [ setuptools ]; diff --git a/pkgs/applications/misc/binocle/default.nix b/pkgs/applications/misc/binocle/default.nix deleted file mode 100644 index e2afd9d91b14..000000000000 --- a/pkgs/applications/misc/binocle/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, - makeWrapper, - AppKit, - CoreFoundation, - CoreGraphics, - CoreVideo, - Foundation, - Metal, - QuartzCore, - xorg, - vulkan-loader, -}: - -rustPlatform.buildRustPackage rec { - pname = "binocle"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "sharkdp"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-WAk7xIrCRfVofn4w+gP5E3wnSZbXm/6MZWlNmtoLm20="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-AUmDubbi6y1SaHZazr2xZc+16SQhI6WBnPg6I7rv3K4="; - - nativeBuildInputs = [ - makeWrapper - ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreFoundation - CoreGraphics - CoreVideo - Foundation - Metal - QuartzCore - ]; - - postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - wrapProgram $out/bin/binocle \ - --suffix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath ( - with xorg; - [ - libX11 - libXcursor - libXi - libXrandr - ] - ++ [ vulkan-loader ] - ) - } - ''; - - meta = with lib; { - description = "Graphical tool to visualize binary data"; - mainProgram = "binocle"; - homepage = "https://github.com/sharkdp/binocle"; - license = with licenses; [ - asl20 # or - mit - ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/applications/misc/brewtarget/default.nix b/pkgs/applications/misc/brewtarget/default.nix deleted file mode 100644 index 72e7df62486a..000000000000 --- a/pkgs/applications/misc/brewtarget/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - bash, - cmake, - boost, - xercesc, - xalanc, - qtbase, - qttools, - qtmultimedia, - qtsvg, -}: - -mkDerivation rec { - pname = "brewtarget"; - version = "3.0.5"; - - src = fetchFromGitHub { - owner = "Brewtarget"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-PqaiZ2eLH8+qRRkIolnQClTL9O9EgHMqFH/nUffosV8="; - }; - - nativeBuildInputs = [ - cmake - boost - xercesc - xalanc - ]; - buildInputs = [ - qtbase - qttools - qtmultimedia - qtsvg - ]; - - preConfigure = '' - chmod +x configure - substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - ''; - - meta = with lib; { - description = "Open source beer recipe creation tool"; - mainProgram = "brewtarget"; - homepage = "http://www.brewtarget.org/"; - license = licenses.gpl3; - maintainers = [ maintainers.mmahut ]; - }; -} diff --git a/pkgs/applications/misc/cambrinary/default.nix b/pkgs/applications/misc/cambrinary/default.nix index f2db2829a3ac..f659a043e09a 100644 --- a/pkgs/applications/misc/cambrinary/default.nix +++ b/pkgs/applications/misc/cambrinary/default.nix @@ -36,6 +36,6 @@ buildPythonApplication { homepage = "https://github.com/xueyuanl/cambrinary"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix deleted file mode 100644 index cc953ba23ec8..000000000000 --- a/pkgs/applications/misc/cardpeek/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - autoreconfHook, - glib, - gtk3, - pcsclite, - lua5_2, - curl, - readline, - PCSC, -}: -let - version = "0.8.4"; -in -stdenv.mkDerivation { - pname = "cardpeek"; - inherit version; - - src = fetchFromGitHub { - owner = "L1L1"; - repo = "cardpeek"; - rev = "cardpeek-${version}"; - sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; - }; - - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - # replace xcode check and hard-coded PCSC framework path - substituteInPlace configure.ac \ - --replace 'if test ! -e "/Applications/Xcode.app/"; then' 'if test yes != yes; then' \ - --replace 'PCSC_HEADERS=`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*.sdk/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers/ | sort | head -1`' 'PCSC_HEADERS=${PCSC}/Library/Frameworks/PCSC.framework/Headers' - ''; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; - buildInputs = - [ - glib - gtk3 - lua5_2 - curl - readline - ] - ++ lib.optional stdenv.hostPlatform.isDarwin PCSC - ++ lib.optional stdenv.hostPlatform.isLinux pcsclite; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://github.com/L1L1/cardpeek"; - description = "Tool to read the contents of ISO7816 smart cards"; - license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ embr ]; - mainProgram = "cardpeek"; - }; -} diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index cb9bdea22067..39d442fab648 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -12,7 +12,6 @@ libusb1, libjpeg, libmodule, - pcre, libXdmcp, util-linux, libpthreadstubs, @@ -23,6 +22,7 @@ enableGamma ? true, libdrm, libXrandr, + libiio, wayland, enableScreen ? true, enableYoctolight ? true, @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.8"; + version = "5.9"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - hash = "sha256-Lmno/TJVCQVNzfpKNZzuDf2OM6w6rbz+zJTr3zVo/CM="; + hash = "sha256-LOhBBd7QL5kH4TzMFgrh70C37WsFdsiKArP+tIEiPWo="; }; # dbus-1.pc has datadir=/etc @@ -81,8 +81,8 @@ stdenv.mkDerivation rec { libusb1 libjpeg libmodule + libiio - pcre libXdmcp util-linux libpthreadstubs diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix deleted file mode 100644 index fb693b1ff66f..000000000000 --- a/pkgs/applications/misc/collision/default.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - crystal, - wrapGAppsHook4, - desktopToDarwinBundle, - gobject-introspection, - nautilus-python, - python3, - libadwaita, - openssl, - libxml2, - pkg-config, - gitUpdater, - _experimental-update-script-combinators, - runCommand, - crystal2nix, - writeShellScript, -}: - -crystal.buildCrystalPackage rec { - pname = "Collision"; - version = "3.9.0"; - - src = fetchFromGitHub { - owner = "GeopJr"; - repo = "Collision"; - rev = "v${version}"; - hash = "sha256-c/74LzDM63w5zW8z2T8o4Efvuzj791/zTSKEDN32uak="; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace-fail 'gtk-update-icon-cache $(PREFIX)/share/icons/hicolor' 'true' - ''; - - shardsFile = ./shards.nix; - copyShardDeps = true; - - preBuild = '' - cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug - cd ../.. && mkdir bin/ && cp lib/gi-crystal/bin/gi-crystal bin/ - ''; - - # Crystal compiler has a strange issue with OpenSSL. The project will not compile due to - # main_module:(.text+0x6f0): undefined reference to `SSL_library_init' - # There is an explanation for this https://danilafe.com/blog/crystal_nix_revisited/ - # Shortly, adding pkg-config to buildInputs along with openssl fixes the issue. - - nativeBuildInputs = [ - wrapGAppsHook4 - pkg-config - gobject-introspection - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; - - buildInputs = [ - libadwaita - openssl - libxml2 - nautilus-python - python3.pkgs.pygobject3 - ]; - - buildTargets = [ - "bindings" - "build" - ]; - - doCheck = false; - doInstallCheck = false; - - installTargets = [ - "desktop" - "install" - ]; - - postInstall = '' - install -Dm555 ./nautilus-extension/collision-extension.py -t $out/share/nautilus-python/extensions - ''; - - passthru = { - updateScript = _experimental-update-script-combinators.sequence [ - (gitUpdater { rev-prefix = "v"; }) - (_experimental-update-script-combinators.copyAttrOutputToFile "collision.shardLock" ./shard.lock) - { - command = [ - (writeShellScript "update-lock" "cd $1; ${lib.getExe crystal2nix}") - ./. - ]; - supportedFeatures = [ "silent" ]; - } - { - command = [ - "rm" - ./shard.lock - ]; - supportedFeatures = [ "silent" ]; - } - ]; - shardLock = runCommand "shard.lock" { inherit src; } '' - cp $src/shard.lock $out - ''; - }; - - meta = with lib; { - description = "Check hashes for your files"; - homepage = "https://github.com/GeopJr/Collision"; - license = licenses.bsd2; - mainProgram = "collision"; - maintainers = with maintainers; [ sund3RRR ] ++ lib.teams.gnome-circle.members; - }; -} diff --git a/pkgs/applications/misc/collision/shards.nix b/pkgs/applications/misc/collision/shards.nix deleted file mode 100644 index 92de6b8655b2..000000000000 --- a/pkgs/applications/misc/collision/shards.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - blake3 = { - url = "https://github.com/geopjr/blake3.cr.git"; - rev = "v1.3.0"; - sha256 = "0pc3h7b5gfkmxlw708qaqjfzjvv5ig3iwxxainq6pwfhpff4a5wd"; - }; - gettext = { - url = "https://github.com/geopjr/gettext.cr.git"; - rev = "v1.0.0"; - sha256 = "1y27m4170rr4532j56grzhwbz8hj6z7j3zfkd0jnfwnsxclks1kc"; - }; - gi-crystal = { - url = "https://github.com/hugopl/gi-crystal.git"; - rev = "v0.24.0"; - sha256 = "0x356xn35008l573qhyl1sdddc9cc5i3bsa4c7865kgq9521ifyh"; - }; - gtk4 = { - url = "https://github.com/hugopl/gtk4.cr.git"; - rev = "v0.17.0"; - sha256 = "0lv3nvsanxi4g2322zvkf1jxx5zgzaapk228vcw2cl0ja1drm06d"; - }; - harfbuzz = { - url = "https://github.com/hugopl/harfbuzz.cr.git"; - rev = "v0.2.0"; - sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694"; - }; - libadwaita = { - url = "https://github.com/geopjr/libadwaita.cr.git"; - rev = "cffabb56e911d2a90c53c2fd14d6bd08bf5ac446"; - sha256 = "0gcq04vgxg0vff9fcalgzq9phq0y76diihkzhlfn91bdxwkx7rl3"; - }; - non-blocking-spawn = { - url = "https://github.com/geopjr/non-blocking-spawn.git"; - rev = "v1.1.0"; - sha256 = "1h43gskannylaai4dz2sjb6rds2h6slm1krg88inan12silhp66c"; - }; - pango = { - url = "https://github.com/hugopl/pango.cr.git"; - rev = "v0.3.1"; - sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv"; - }; -} diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index bb395236a66c..9a3037be3be3 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, ninja, qtbase, @@ -12,19 +13,20 @@ libXtst, qtwayland, wayland, + pkg-config, wrapQtAppsHook, kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "CopyQ"; - version = "9.1.0"; + version = "10.0.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - hash = "sha256-WBJyLfiPPEQ/Cj5uuwy9KhVc1kw4Hv5TeEuRFDydlGk="; + hash = "sha256-lH3WJ6cK2eCnmcLVLnYUypABj73UZjGqqDPp92QE+V4="; }; nativeBuildInputs = [ @@ -32,6 +34,7 @@ stdenv.mkDerivation rec { ninja kdePackages.extra-cmake-modules wrapQtAppsHook + pkg-config ]; buildInputs = [ @@ -48,20 +51,26 @@ stdenv.mkDerivation rec { kdePackages.knotifications ]; - postPatch = '' - substituteInPlace shared/com.github.hluk.copyq.desktop.in \ - --replace copyq "$out/bin/copyq" - ''; + patches = [ + (fetchpatch { + # Can be removed after next release + name = "fix-qchar-construction-for-qt-6.9.patch"; + url = "https://github.com/hluk/CopyQ/commit/f08c0d46a239362c5d3525ef9c3ba943bb00f734.patch"; + hash = "sha256-dsDIUVJHFFqzZ3tFOcYdwol/tm4viHM0CRs6wYfVKbQ="; + }) + ]; - cmakeFlags = [ "-DWITH_QT6=ON" ]; + cmakeFlags = [ + (lib.cmakeBool "WITH_QT6" true) + ]; - meta = with lib; { + meta = { homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ artturin ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "copyq"; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index 944dc109c0e9..16b72bbeb2d8 100644 --- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -1,44 +1,44 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtsvg, - qtbase, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coreaction"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-qhYuLqWXCpOJCqg+JJ8VQQokNEQVwxpHAtYGITxHZ3Y="; + repo = "coreaction"; + tag = "v${finalAttrs.version}"; + hash = "sha256-R/pzudaxs85etbI4hh2NwHNtO7EqI+vgJALY/4rIvrs="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtsvg - qtbase + qt6.qtsvg + qt6.qtbase libcprime libcsys ]; - meta = with lib; { + meta = { description = "Side bar for showing widgets from the C Suite"; mainProgram = "coreaction"; homepage = "https://gitlab.com/cubocore/coreapps/coreaction"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix index d06bea646dc7..c78878dc72c7 100644 --- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -1,8 +1,8 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, libarchive, libarchive-qt, cmake, @@ -11,36 +11,37 @@ libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corearchiver"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-TKBr/CFY4ixQnJuaN+wJB88s6g4lvQz4rwq9YsccRYk="; + repo = "corearchiver"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+XaBe1fNpAQf3cqXV+A1cZ1tPck3bCpgEDmFeF536q4="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libarchive-qt libarchive libcprime libcsys ]; - meta = with lib; { + meta = { description = "Archiver from the C Suite to create and extract archives"; mainProgram = "corearchiver"; homepage = "https://gitlab.com/cubocore/coreapps/corearchiver"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix index 1bdf0f104dee..43407b104869 100644 --- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -1,42 +1,43 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corefm"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-mCFFT/vHzfC4jl1I8SkgaX8qu+AFNNcwUZx4eJeE+i4="; + repo = "corefm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-VsnbWknkMJp/2MDXbJuEQomotGqTXhZcUvu+ODJOjdM="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libcprime libcsys ]; - meta = with lib; { + meta = { description = "Lightwight filemanager from the C Suite"; mainProgram = "corefm"; homepage = "https://gitlab.com/cubocore/coreapps/corefm"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index 32ab1063a04b..279026051549 100644 --- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -1,8 +1,8 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, libarchive, libarchive-qt, cmake, @@ -11,36 +11,37 @@ libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coregarage"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-WCSc3ppYaktj9WnPb4n7SmSNWxT2HiXNmPKS3md3ST4="; + repo = "coregarage"; + tag = "v${finalAttrs.version}"; + hash = "sha256-boe7z8KPnMaoWekBFS4g/Ay98rpREeLMAsHOr2olYws="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libarchive libarchive-qt libcprime libcsys ]; - meta = with lib; { + meta = { description = "Settings manager for the C Suite"; mainProgram = "coregarage"; homepage = "https://gitlab.com/cubocore/coreapps/coregarage"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index 61d585e347fe..bce9d730a27c 100644 --- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -1,42 +1,43 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corehunt"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Xir1RQG7AlO166lZq1TJssiWoSixY6EfLEjxek+9ifo="; + repo = "corehunt"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QJJ+e+5UKka1Hbrtyn+agpJ7FLADHupZt41K8Mq8H4c="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libcprime libcsys ]; - meta = with lib; { + meta = { description = "File finder utility from the C Suite"; mainProgram = "corehunt"; homepage = "https://gitlab.com/cubocore/coreapps/corehunt"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index d0c01f95c0d2..b891e9f132a0 100644 --- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -1,42 +1,43 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coreimage"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-SyGIeoYC4bTBWZ0adOfYJpWkW3/bvFNZg5zK2MN27kA="; + repo = "coreimage"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sgOxDKACb9D/TvjjHz09JwBpFoE8eXA4HixcbN+0FoE="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libcprime libcsys ]; - meta = with lib; { + meta = { description = "Image viewer from the C Suite"; mainProgram = "coreimage"; homepage = "https://gitlab.com/cubocore/coreapps/coreimage"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix index 7d788eea2286..9aba07fcff1d 100644 --- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -1,35 +1,36 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, libzen, libmediainfo, zlib, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coreinfo"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-DmvmFMttEvNnIp1zwCe0BLrMx3Wlw1U9LcJwyb4Mx9U="; + repo = "coreinfo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/L69lrkJZh+SJRoNxvogdJ5KRIorwcBzm7WGxrNpexM="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libzen libmediainfo zlib @@ -37,12 +38,12 @@ mkDerivation rec { libcsys ]; - meta = with lib; { + meta = { description = "File information tool from the C Suite"; mainProgram = "coreinfo"; homepage = "https://gitlab.com/cubocore/coreapps/coreinfo"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index d5df2a0bf830..4c7dffabe200 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -1,9 +1,8 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, - qtx11extras, + qt6, xorg, cmake, ninja, @@ -11,37 +10,37 @@ libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corekeyboard"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg="; + repo = "corekeyboard"; + tag = "v${finalAttrs.version}"; + hash = "sha256-n7QbvRPZFMeUl/P4XiGYZDglZCA8Ftf08s5uzPmSyIQ="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtx11extras + qt6.qtbase xorg.libXtst xorg.libX11 libcprime libcsys ]; - meta = with lib; { + meta = { description = "Virtual keyboard for X11 from the C Suite"; mainProgram = "corekeyboard"; homepage = "https://gitlab.com/cubocore/coreapps/corekeyboard"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix index e3ff6fdf2b36..86c0689979ab 100644 --- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -1,42 +1,43 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corepad"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-qiw6P+I9iAcFcBWiMKAzyxM6waXx/2TPVQHLcLjAnoY="; + repo = "corepad"; + tag = "v${finalAttrs.version}"; + hash = "sha256-oGF2N0bUuvc/ixmh2nefEJKh0kDipvcL/dwaXNxwo84="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libcprime libcsys ]; - meta = with lib; { + meta = { description = "Document editor from the C Suite"; mainProgram = "corepad"; homepage = "https://gitlab.com/cubocore/coreapps/corepad"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix index 2f4e15543a2f..b281a3fd448d 100644 --- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -1,42 +1,43 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corepaint"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-ndknVT/gl2P0s3ADW0txiVtAyI/l/ZFWEgufFleS0A4="; + repo = "corepaint"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ARFyBtkGYFMKnUD1h93GcQiKV6mFXxJvLEVeSXlaHZI="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libcprime libcsys ]; - meta = with lib; { + meta = { description = "Paint app from the C Suite"; mainProgram = "corepaint"; homepage = "https://gitlab.com/cubocore/coreapps/corepaint"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix index b45330fef2ce..fa4e8374b511 100644 --- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -1,46 +1,49 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, - poppler, - qtwebengine, + kdePackages, cmake, ninja, + pkg-config, libcprime, libcsys, + qdocumentview, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corepdf"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-t3r/bF/uKoprdDoRjrmYTND0Jws+jX6tAGnBeqofBF8="; + repo = "corepdf"; + tag = "v${finalAttrs.version}"; + hash = "sha256-fhEuMk15yCA6IUasD9rJPR8sB+h0tz8niOQtXFIe7Uc="; }; nativeBuildInputs = [ cmake ninja + pkg-config + kdePackages.wrapQtAppsHook ]; buildInputs = [ - qtbase - poppler - qtwebengine + kdePackages.qtbase + kdePackages.qtwebengine + kdePackages.poppler + qdocumentview libcprime libcsys ]; - meta = with lib; { + meta = { description = "PDF viewer from the C Suite"; mainProgram = "corepdf"; homepage = "https://gitlab.com/cubocore/coreapps/corepdf"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix index 19e34bfbfea1..d7d49426be56 100644 --- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -1,42 +1,43 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corepins"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-vA2Phs+sEs+Gd73xzj6vb91Krm8q3+koWDM7rCUayTQ="; + repo = "corepins"; + tag = "v${finalAttrs.version}"; + hash = "sha256-noMdI2qk3cYc1FfRWd4rwpZBbeHiD557Z1T0ZxIhaTw="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libcprime libcsys ]; - meta = with lib; { + meta = { description = "Bookmarking app from the C Suite"; mainProgram = "corepins"; homepage = "https://gitlab.com/cubocore/coreapps/corepins"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix index c500ab6fa6a8..c44dc5c41967 100644 --- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -1,42 +1,43 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corerenamer"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-jN1keyo2tDlgUu243173zgChw2nhvbsLPH9af6jDhKs="; + repo = "corerenamer"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9e8Gm7h0zWVQeb7eFcUmp8uTdSboenLa7baZpKc3HEQ="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libcprime libcsys ]; - meta = with lib; { + meta = { description = "Batch file renamer from the C Suite"; mainProgram = "corerenamer"; homepage = "https://gitlab.com/cubocore/coreapps/corerenamer"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix index b283e49237aa..2c75140f7465 100644 --- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -1,44 +1,43 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, - qtx11extras, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coreshot"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-XPECvwZkJIoN/r5oFWJpgl/WASpybgLjCK/F0XVMHyU="; + repo = "coreshot"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5KGaMCL9BCGZwK7HQz87B1qrNvx5SQyMooZw4MwMdCc="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtx11extras + qt6.qtbase libcprime libcsys ]; - meta = with lib; { + meta = { description = "Screen capture utility from the C Suite"; mainProgram = "coreshot"; homepage = "https://gitlab.com/cubocore/coreapps/coreshot"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix index f557f48740f8..dfe7b160d1d2 100644 --- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -1,8 +1,8 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, lm_sensors, cmake, ninja, @@ -10,35 +10,36 @@ libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corestats"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-584dSlXhPfvTBeDjex1o2TZPoG40tl1fNDiIYqjyzOI="; + repo = "corestats"; + tag = "v${finalAttrs.version}"; + hash = "sha256-0d03y3AYWxXh9DZrbPWqk34yq7iy5xUn/oMmJBu5GqQ="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase lm_sensors libcprime libcsys ]; - meta = with lib; { + meta = { description = "System resource viewer from the C Suite"; mainProgram = "corestats"; homepage = "https://gitlab.com/cubocore/coreapps/corestats"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch b/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch index d1db6a0a0a2e..5c8f9557d17a 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch +++ b/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch @@ -1,11 +1,11 @@ --- a/corestuff/CMakeLists.txt 2022-01-29 14:09:02.699700817 +0700 +++ b/CMakeLists.txt 2022-01-29 14:09:23.211754633 +0700 -@@ -120,8 +120,3 @@ - install( FILES org.cubocore.CoreStuff.desktop DESTINATION share/applications ) - install( FILES org.cubocore.CoreStuff.svg DESTINATION share/icons/hicolor/scalable/apps/ ) +@@ -121,7 +121,3 @@ + install( FILES cc.cubocore.CoreStuff.svg DESTINATION share/icons/hicolor/scalable/apps/ ) install( FILES background/default.svg DESTINATION share/coreapps/background ) -- + -if ( DEFINED ADD_AUTOSTART ) -- message("INSTALLING TO AUTOSTART LOCATION") -- install( FILES org.cubocore.CoreStuff.desktop DESTINATION /etc/xdg/autostart ) +- message("INSTALLING TO AUTOSTART LOCATION") +- install( FILES cc.cubocore.CoreStuff.desktop DESTINATION /etc/xdg/autostart ) -endif() + diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index 8ec6080a4c32..55089f533438 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -1,10 +1,8 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, - qtx11extras, - kglobalaccel, + kdePackages, xorg, cmake, ninja, @@ -12,15 +10,15 @@ libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corestuff"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-2tnJMBbROGWZQDWjy/xGBNkv7DXXKLWrHf2XnMjOjWQ="; + repo = "corestuff"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/EI7oM7c7GKEQ+XQSiWwkJ7uNrJkxgLXEXZ6r5Jqh70="; }; patches = [ @@ -31,23 +29,25 @@ mkDerivation rec { nativeBuildInputs = [ cmake ninja + kdePackages.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtx11extras - kglobalaccel + kdePackages.qtbase + kdePackages.kglobalaccel xorg.libXcomposite libcprime libcsys ]; - meta = with lib; { + meta = { description = "Activity viewer from the C Suite"; mainProgram = "corestuff"; homepage = "https://gitlab.com/cubocore/coreapps/corestuff"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; + # Address boundary error + broken = true; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index f2671ab3eff2..59f3c26c31af 100644 --- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -1,9 +1,8 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, - qtserialport, + qt6, qtermwidget, cmake, ninja, @@ -11,36 +10,37 @@ libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coreterminal"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-zMSE1gQ2HJQCqil3MB4slRe0Cojv2XRLd8wLTokF8H0="; + repo = "coreterminal"; + tag = "v${finalAttrs.version}"; + hash = "sha256-CSPZ1mbZ5ylfMQAwzj+hNodhEuyC7klvlKU5bj+HiyE="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtserialport + qt6.qtbase + qt6.qtserialport qtermwidget libcprime libcsys ]; - meta = with lib; { + meta = { description = "Terminal emulator from the C Suite"; mainProgram = "coreterminal"; homepage = "https://gitlab.com/cubocore/coreapps/coreterminal"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix index b210b0ca766c..4a48cf604cd9 100644 --- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -1,44 +1,44 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, - qtmultimedia, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coretime"; - version = "4.5.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-0x3014UG861lXRwIBpYiiYVPmhln9Q20jJ4tIO50Tjs="; + repo = "coretime"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RgaIYZ410/M/PHTJC3ja7wEb3HqPrNkBpEIsUK102qw="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtmultimedia + qt6.qtbase + qt6.qtmultimedia libcprime libcsys ]; - meta = with lib; { + meta = { description = "Time related task manager from the C Suite"; mainProgram = "coretime"; homepage = "https://gitlab.com/cubocore/coreapps/coretime"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch index 3c0c942ee43a..377d0ed90d7f 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch @@ -1,8 +1,8 @@ --- a/corepkit/CMakeLists.txt 2021-12-25 17:52:20.000000000 +0700 +++ b/corepkit/CMakeLists.txt 2021-12-29 17:58:09.298024297 +0700 -@@ -32,4 +32,4 @@ - target_link_libraries( corepkit Qt5::Core ) - +@@ -31,4 +31,4 @@ + target_link_libraries( corepkit Qt6::Core ) + install( TARGETS corepkit DESTINATION libexec/coreapps/ ) --install( FILES org.cubocore.coreapps.policy DESTINATION share/polkit-1/actions/ ) -+install( FILES org.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ ) +-install( FILES cc.cubocore.coreapps.policy DESTINATION share/polkit-1/actions/ ) ++install( FILES cc.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ ) diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index ed5d5fc49fa9..70cb09b4dca3 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -1,13 +1,11 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, + qt6, ffmpeg, cmake, ninja, - qtbase, - qtx11extras, - qtconnectivity, v4l-utils, grim, wf-recorder, @@ -29,15 +27,15 @@ libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coretoppings"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-IYUkPGgFGI6889IyromMBobIoqSZtALVsSswQ7O1Bp0="; + repo = "coretoppings"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wHVdZqXn8DXqLbCdKz2fI8BjNVai5dRq3a45HVCvLa8="; }; patches = [ @@ -48,12 +46,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtx11extras - qtconnectivity + qt6.qtbase + qt6.qtconnectivity libdbusmenu ffmpeg v4l-utils @@ -78,12 +76,12 @@ mkDerivation rec { libcsys ]; - meta = with lib; { + meta = { description = "Additional features,plugins etc for CuboCore Application Suite"; mainProgram = "shareIT"; homepage = "https://gitlab.com/cubocore/coreapps/coretoppings"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix index dfe9e4f1ea89..b5fa399805ac 100644 --- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -1,42 +1,43 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coreuniverse"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-SjD37+uLKJrPvjxK0douNgGCUq9He3EK86takZlrX7Q="; + repo = "coreuniverse"; + tag = "v${finalAttrs.version}"; + hash = "sha256-T5BYHzOqSED40hOc5VwD+oLTwBJ1wARvS8MwiYOWlXM="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libcprime libcsys ]; - meta = with lib; { + meta = { description = "Shows information about apps from the C Suite"; mainProgram = "coreuniverse"; homepage = "https://gitlab.com/cubocore/coreapps/coreuniverse"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch index 08214c30a887..832e27cc9528 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch +++ b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch @@ -11,20 +11,20 @@ diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp index 4c40d4c..5dbb6ff 100644 --- a/cprime/systemxdg.cpp +++ b/cprime/systemxdg.cpp -@@ -372,9 +372,10 @@ void SystemXdgMime::setApplicationAsDefault(QString appFileName, QString mimetyp - +@@ -343,9 +343,10 @@ + SystemXdgMime::SystemXdgMime() { -- appsDirs << QDir::home().filePath(".local/share/applications/"); -- appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/"); -- appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/"); -+ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); -+ appsDirs << "/run/current-system/sw/share/applications/"; -+ appsDirs << "/run/current-system/sw/share/applications/kde4/"; -+ appsDirs << "/run/current-system/sw/share/gnome/applications/"; +- appsDirs << QDir::home().filePath(".local/share/applications/"); +- appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/"); +- appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/"); ++ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); ++ appsDirs << "/run/current-system/sw/share/applications/"; ++ appsDirs << "/run/current-system/sw/share/applications/kde4/"; ++ appsDirs << "/run/current-system/sw/share/gnome/applications/"; } - - + + -- 2.39.0 diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix index 353128b091af..f190c303eae2 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -1,23 +1,22 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, libnotify, cmake, ninja, - qtbase, - qtconnectivity, + qt6, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcprime"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore"; - repo = pname; - rev = "v${version}"; - hash = "sha256-j6WFLcjDMkYl+9HCmhMRttwtjNX05oP5mfdOsoLC7og="; + repo = "libcprime"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3tAbF4CoZJf92Z2/M/Cq7ruPew34Hl5Ojks7fI6kPbU="; }; patches = [ @@ -30,16 +29,18 @@ mkDerivation rec { ]; buildInputs = [ - qtbase - qtconnectivity + qt6.qtbase + qt6.qtconnectivity libnotify ]; - meta = with lib; { + dontWrapQtApps = true; + + meta = { description = "Library for bookmarking, saving recent activites, managing settings of C-Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/libcprime"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + homepage = "https://gitlab.com/cubocore/libcprime"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix index ba9162ed33c8..d48596c9c78f 100644 --- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -1,22 +1,22 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, udisks2, - qtbase, + qt6, cmake, ninja, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcsys"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore"; - repo = pname; - rev = "v${version}"; - hash = "sha256-1MHyx01w+dCeAeumcSXRBStgAec2yu1rLwaZaCXRgTc="; + repo = "libcsys"; + tag = "v${finalAttrs.version}"; + hash = "sha256-53vneIR2uy3VtbnOlEHl1anj3nXA3MU2KQt1PWm7KGI="; }; nativeBuildInputs = [ @@ -25,15 +25,17 @@ mkDerivation rec { ]; buildInputs = [ - qtbase + qt6.qtbase udisks2 ]; - meta = with lib; { + dontWrapQtApps = true; + + meta = { description = "Library for managing drive and getting system resource information in real time"; homepage = "https://gitlab.com/cubocore/libcsys"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix deleted file mode 100644 index 89af855c7862..000000000000 --- a/pkgs/applications/misc/devilspie2/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - intltool, - pkg-config, - glib, - gtk, - lua, - libwnck, -}: - -stdenv.mkDerivation rec { - pname = "devilspie2"; - version = "0.44"; - - src = fetchurl { - url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2-${version}.tar.xz"; - sha256 = "Cp8erdKyKjGBY+QYAGXUlSIboaQ60gIepoZs0RgEJkA="; - }; - - nativeBuildInputs = [ - intltool - pkg-config - ]; - buildInputs = [ - glib - gtk - lua - libwnck - ]; - - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - cp bin/devilspie2 $out/bin - cp devilspie2.1 $out/share/man/man1 - ''; - - meta = with lib; { - description = "Window matching utility"; - longDescription = '' - Devilspie2 is a window matching utility, allowing the user to - perform scripted actions on windows as they are created. For - example you can script a terminal program to always be - positioned at a specific screen position, or position a window - on a specific workspace. - ''; - homepage = "https://www.nongnu.org/devilspie2/"; - license = licenses.gpl3; - maintainers = [ maintainers.ebzzry ]; - platforms = platforms.linux; - mainProgram = "devilspie2"; - }; -} diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 4302d6cde399..0adaf746640f 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -8,7 +8,6 @@ cairo, poppler, wxGTK, - Cocoa, }: stdenv.mkDerivation rec { @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { cairo poppler wxGTK - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix deleted file mode 100644 index e4b4e3f3b385..000000000000 --- a/pkgs/applications/misc/edgetx/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - cmake, - gcc-arm-embedded, - python3Packages, - qtbase, - qtmultimedia, - qttools, - SDL, - gtest, - dfu-util, -}: - -mkDerivation rec { - pname = "edgetx"; - version = "2.7.2"; - - src = fetchFromGitHub { - owner = "EdgeTX"; - repo = pname; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E="; - }; - - nativeBuildInputs = [ - cmake - gcc-arm-embedded - python3Packages.pillow - qttools - ]; - - buildInputs = [ - qtbase - qtmultimedia - SDL - ]; - - postPatch = '' - sed -i companion/src/burnconfigdialog.cpp \ - -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' - ''; - - cmakeFlags = [ - "-DGTEST_ROOT=${gtest.src}/googletest" - "-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" - # file RPATH_CHANGE could not write new RPATH - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - meta = with lib; { - description = "EdgeTX Companion transmitter support software"; - longDescription = '' - EdgeTX Companion is used for many different tasks like loading EdgeTX - firmware to the radio, backing up model settings, editing settings and - running radio simulators. - ''; - mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion version)); - homepage = "https://edgetx.org/"; - license = licenses.gpl2Only; - platforms = [ - "i686-linux" - "x86_64-linux" - "aarch64-linux" - ]; - maintainers = with maintainers; [ - elitak - lopsided98 - wucke13 - ]; - }; - -} diff --git a/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch b/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch index 8c7af75a5406..a726ca678c59 100644 --- a/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch +++ b/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch @@ -23,7 +23,7 @@ index 04b0a77f3..2330ea921 100644 protobuf>=3.12 qdarkstyle>=2.7 -aiorpcx>=0.22.0,<0.23 -+aiorpcx>=0.22.0,<0.24 ++aiorpcx>=0.22.0 aiohttp>=3.3.0,<4.0.0 aiohttp_socks>=0.3 certifi @@ -31,14 +31,12 @@ diff --git a/run_electrum b/run_electrum index a1b30f29e..cb22f8724 100755 --- a/run_electrum +++ b/run_electrum -@@ -67,8 +67,8 @@ def check_imports(): +@@ -67,8 +67,6 @@ def check_imports(): import aiorpcx except ImportError as e: sys.exit(f"Error: {str(e)}. Try 'sudo python3 -m pip install '") - if not ((0, 22, 0) <= aiorpcx._version < (0, 23)): - raise RuntimeError(f'aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.23') -+ if not ((0, 22, 0) <= aiorpcx._version < (0, 24)): -+ raise RuntimeError(f'aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.24') # the following imports are for pyinstaller from google.protobuf import descriptor from google.protobuf import message diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix deleted file mode 100644 index d43afca3250c..000000000000 --- a/pkgs/applications/misc/eureka-ideas/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - libgit2, - openssl, - stdenv, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "eureka-ideas"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "simeg"; - repo = "eureka"; - rev = "v${version}"; - sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-nTYMKJ5OCApqooIF1dsDLriPfYjkZkTdtzpkJya/5ag="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = - [ - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - - useNextest = true; - - meta = with lib; { - description = "CLI tool to input and store your ideas without leaving the terminal"; - homepage = "https://github.com/simeg/eureka"; - changelog = "https://github.com/simeg/eureka/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "eureka"; - }; -} diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix deleted file mode 100644 index e9de83749987..000000000000 --- a/pkgs/applications/misc/far2l/default.nix +++ /dev/null @@ -1,151 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - makeWrapper, - cmake, - ninja, - pkg-config, - m4, - perl, - bash, - xdg-utils, - zip, - unzip, - gzip, - bzip2, - gnutar, - p7zip, - xz, - IOKit, - Carbon, - Cocoa, - AudioToolbox, - OpenGL, - System, - withTTYX ? true, - libX11, - withGUI ? true, - wxGTK32, - withUCD ? true, - libuchardet, - - # Plugins - withColorer ? true, - spdlog, - xercesc, - withMultiArc ? true, - libarchive, - pcre, - withNetRocks ? true, - openssl, - libssh, - samba, - libnfs, - neon, - withPython ? false, - python3Packages, -}: - -stdenv.mkDerivation rec { - pname = "far2l"; - version = "2.6.3"; - - src = fetchFromGitHub { - owner = "elfmz"; - repo = "far2l"; - rev = "v_${version}"; - sha256 = "sha256-iWZQpLe+shdepCVOHZDp7QEQoqelbHGRJh09KWb6aD0="; - }; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - m4 - perl - makeWrapper - ]; - - buildInputs = - lib.optional withTTYX libX11 - ++ lib.optional withGUI wxGTK32 - ++ lib.optional withUCD libuchardet - ++ lib.optionals withColorer [ - spdlog - xercesc - ] - ++ lib.optionals withMultiArc [ - libarchive - pcre - ] - ++ lib.optionals withNetRocks [ - openssl - libssh - libnfs - neon - ] - ++ lib.optional (withNetRocks && !stdenv.hostPlatform.isDarwin) samba # broken on darwin - ++ lib.optionals withPython ( - with python3Packages; - [ - python - cffi - debugpy - pcpp - ] - ) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Carbon - Cocoa - AudioToolbox - OpenGL - System - ]; - - postPatch = '' - patchShebangs python/src/prebuild.sh - patchShebangs far2l/bootstrap/view.sh - ''; - - cmakeFlags = - [ - (lib.cmakeBool "TTYX" withTTYX) - (lib.cmakeBool "USEWX" withGUI) - (lib.cmakeBool "USEUCD" withUCD) - (lib.cmakeBool "COLORER" withColorer) - (lib.cmakeBool "MULTIARC" withMultiArc) - (lib.cmakeBool "NETROCKS" withNetRocks) - (lib.cmakeBool "PYTHON" withPython) - ] - ++ lib.optionals withPython [ - (lib.cmakeFeature "VIRTUAL_PYTHON" "python") - (lib.cmakeFeature "VIRTUAL_PYTHON_VERSION" "python") - ]; - - runtimeDeps = [ - unzip - zip - p7zip - xz - gzip - bzip2 - gnutar - ]; - - postInstall = '' - wrapProgram $out/bin/far2l \ - --argv0 $out/bin/far2l \ - --prefix PATH : ${lib.makeBinPath runtimeDeps} \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - ''; - - meta = with lib; { - description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems"; - homepage = "https://github.com/elfmz/far2l"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ hypersw ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix deleted file mode 100644 index 20c7b060a78e..000000000000 --- a/pkgs/applications/misc/girara/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - meson, - ninja, - pkg-config, - check, - dbus, - xvfb-run, - glib, - gtk, - gettext, - libiconv, - json-glib, - libintl, - zathura, -}: - -stdenv.mkDerivation rec { - pname = "girara"; - version = "0.4.5"; - - outputs = [ - "out" - "dev" - ]; - - src = fetchFromGitHub { - owner = "pwmt"; - repo = "girara"; - tag = version; - hash = "sha256-XjRmGgljlkvxwcbPmA9ZFAPAjbClSQDdmQU/GFeLLxI="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - check - dbus - glib # for glib-compile-resources - ]; - - buildInputs = [ - libintl - libiconv - json-glib - ]; - - propagatedBuildInputs = [ - glib - gtk - ]; - - nativeCheckInputs = [ - xvfb-run - ]; - - doCheck = !stdenv.hostPlatform.isDarwin; - - mesonFlags = [ - "-Ddocs=disabled" # docs do not seem to be installed - (lib.mesonEnable "tests" ( - (stdenv.buildPlatform.canExecute stdenv.hostPlatform) && (!stdenv.hostPlatform.isDarwin) - )) - ]; - - checkPhase = '' - export NO_AT_BRIDGE=1 - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - meson test --print-errorlogs - ''; - - passthru.tests = { - inherit zathura; - }; - - meta = { - homepage = "https://pwmt.org/projects/girara"; - description = "User interface library"; - longDescription = '' - girara is a library that implements a GTK based VIM-like user interface - that focuses on simplicity and minimalism. - ''; - license = lib.licenses.zlib; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix deleted file mode 100644 index d99d9cf44b31..000000000000 --- a/pkgs/applications/misc/gkrellm/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ - lib, - fetchurl, - stdenv, - gettext, - pkg-config, - glib, - gtk2, - libX11, - libSM, - libICE, - which, - IOKit, - copyDesktopItems, - makeDesktopItem, - wrapGAppsHook3, -}: - -stdenv.mkDerivation rec { - pname = "gkrellm"; - version = "2.3.11"; - - src = fetchurl { - url = "http://gkrellm.srcbox.net/releases/gkrellm-${version}.tar.bz2"; - sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; - }; - - nativeBuildInputs = [ - copyDesktopItems - pkg-config - which - wrapGAppsHook3 - ]; - buildInputs = [ - gettext - glib - gtk2 - libX11 - libSM - libICE - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; - - hardeningDisable = [ "format" ]; - - # Makefiles are patched to fix references to `/usr/X11R6' and to add - # `-lX11' to make sure libX11's store path is in the RPATH. - postPatch = '' - echo "patching makefiles..." - for i in Makefile src/Makefile server/Makefile - do - sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" - done - ''; - - makeFlags = [ "STRIP=-s" ]; - installFlags = [ "DESTDIR=$(out)" ]; - - # This icon is used by the desktop file. - postInstall = '' - install -Dm444 -T src/icon.xpm $out/share/pixmaps/gkrellm.xpm - ''; - - desktopItems = [ - (makeDesktopItem { - name = "gkrellm"; - exec = "gkrellm"; - icon = "gkrellm"; - desktopName = "GKrellM"; - genericName = "System monitor"; - comment = "The GNU Krell Monitors"; - categories = [ - "System" - "Monitor" - ]; - }) - ]; - - meta = with lib; { - description = "Themeable process stack of system monitors"; - longDescription = '' - GKrellM is a single process stack of system monitors which - supports applying themes to match its appearance to your window - manager, Gtk, or any other theme. - ''; - - homepage = "http://gkrellm.srcbox.net"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index bd8c911eac89..b99886f953fc 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation { pname = "goldendict-ng"; - version = "25.02.0"; + version = "25.05.0"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; - tag = "v25.02.0-Release.e895b18c"; - hash = "sha256-k8pGzrSFbAUP7DG3lSAYBa5WeeSUbjZMvMqmxPqdT3E="; + tag = "v25.05.0-Release.2a2b0e16"; + hash = "sha256-PBqkVac867xE4ZcvwTysAK6rQSoEZelKrV9USvFsaLk="; }; nativeBuildInputs = [ @@ -92,6 +92,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ slbtty michojel + linsui ]; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 1f48013eb408..54e0893960f8 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.38"; + version = "13.42"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; tag = finalAttrs.version; - hash = "sha256-ftVuFuoseXtpeXzOMZA66O2Z6wxKd7G6l3Kx8WOgor0="; + hash = "sha256-94zCDtja1b85Wgz4slG17ETT/TMPPCyXld3WdtGjBzA="; }; buildInputs = diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix index db9319000752..3761121dabd3 100644 --- a/pkgs/applications/misc/hollywood/default.nix +++ b/pkgs/applications/misc/hollywood/default.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation { pygments moreutils util-linux - jp2a man mplayer openssh diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index ef866eb7b541..c0c18b68af7b 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -12,7 +12,7 @@ gitSupport ? false, git, docutilsSupport ? false, - python, + python3, docutils, monotoneSupport ? false, monotone, @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { CryptSSLeay ]) ++ lib.optionals docutilsSupport [ - (python.withPackages (pp: with pp; [ pygments ])) + (python3.withPackages (pp: with pp; [ pygments ])) docutils ] ++ lib.optionals gitSupport [ git ] diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix deleted file mode 100644 index a05800414a79..000000000000 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - pkg-config, - openssl, - stdenv, - CoreServices, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "inherd-quake"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "phodal"; - repo = "quake"; - rev = "v${version}"; - sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-klxigm3RpTfwbENva2WmOPaiJEV2yujY323xRkAML0I="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; - - meta = with lib; { - description = "Knowledge management meta-framework for geeks"; - homepage = "https://github.com/phodal/quake"; - license = licenses.mit; - maintainers = [ maintainers.elliot ]; - mainProgram = "quake"; - }; -} diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix deleted file mode 100644 index cf0a61e62fbc..000000000000 --- a/pkgs/applications/misc/inkcut/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ - lib, - fetchpatch, - python3, - fetchFromGitHub, - wrapQtAppsHook, - cups, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "inkcut"; - version = "2.1.5"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - tag = "v${version}"; - sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU="; - }; - - patches = [ - # fix opening the extension on inkscape 1.2 - # https://github.com/inkcut/inkcut/pull/340 - (fetchpatch { - url = "https://github.com/inkcut/inkcut/commit/d5d5d0ab3c588c576b668f4c7b07a10609ba2fd0.patch"; - hash = "sha256-szfiOujuV7OOwYK/OU51m9FK6dzkbWds+h0cr5dGIg4="; - }) - # fix loading a document from stdin (as used from the extension) - # https://github.com/inkcut/inkcut/issues/341 - (fetchpatch { - url = "https://github.com/inkcut/inkcut/commit/748ab4157f87afec37dadd715094e87d02c9c739.patch"; - hash = "sha256-ZGiwZru2bUYu749YSz5vxmGwLTAoYIAsafcX6PmdbYo="; - revert = true; - }) - # fix distutils deprecation error - # https://github.com/inkcut/inkcut/pull/343 - (fetchpatch { - url = "https://github.com/inkcut/inkcut/commit/9fb95204981bcc51401a1bc10caa02d1fae0d6cb.patch"; - hash = "sha256-nriys7IWPGykZjVz+DIDsE9Tm40DewkHQlIUaxFwtzM="; - }) - ]; - - postPatch = '' - substituteInPlace inkcut/device/transports/printer/plugin.py \ - --replace ", 'lpr', " ", '${cups}/bin/lpr', " - ''; - - nativeBuildInputs = [ wrapQtAppsHook ]; - - propagatedBuildInputs = with python3.pkgs; [ - enamlx - twisted - lxml - qreactor - jsonpickle - pyserial - pycups - qtconsole - pyqt5 - setuptools - ]; - - # QtApplication.instance() does not work during tests? - doCheck = false; - - pythonImportsCheck = [ - "inkcut" - "inkcut.cli" - "inkcut.console" - "inkcut.core" - "inkcut.device" - "inkcut.job" - "inkcut.joystick" - "inkcut.monitor" - "inkcut.preview" - ]; - - dontWrapQtApps = true; - makeWrapperArgs = [ - "--unset" - "PYTHONPATH" - "\${qtWrapperArgs[@]}" - ]; - - postInstall = '' - mkdir -p $out/share/inkscape/extensions - - cp plugins/inkscape/* $out/share/inkscape/extensions - - sed -i "s|cmd = \['inkcut'\]|cmd = \['$out/bin/inkcut'\]|" $out/share/inkscape/extensions/inkcut_cut.py - sed -i "s|cmd = \['inkcut'\]|cmd = \['$out/bin/inkcut'\]|" $out/share/inkscape/extensions/inkcut_open.py - ''; - - meta = with lib; { - homepage = "https://www.codelv.com/projects/inkcut/"; - description = "Control 2D plotters, cutters, engravers, and CNC machines"; - mainProgram = "inkcut"; - license = licenses.gpl3; - maintainers = with maintainers; [ raboof ]; - }; -} diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix deleted file mode 100644 index f7f302628b8c..000000000000 --- a/pkgs/applications/misc/inlyne/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - installShellFiles, - stdenv, - pkg-config, - fontconfig, - xorg, - libxkbcommon, - wayland, - libGL, - openssl, - darwin, -}: - -rustPlatform.buildRustPackage rec { - pname = "inlyne"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "Inlyne-Project"; - repo = pname; - rev = "v${version}"; - hash = "sha256-ueE1NKbCMBUBrrdsHkwZ5Yv6LD3tQL3ZAk2O4xoYOcw="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-jSUqpryUgOL0qo0gbbH4s24krrPsLOSNc6FQUEUeeUQ="; - - nativeBuildInputs = - [ - installShellFiles - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - ]; - - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - fontconfig - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libxcb - wayland - libxkbcommon - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.AppKit - ]; - - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - # time out on darwin - "--skip=interpreter::tests::centered_image_with_size_align_and_link" - "--skip=watcher::tests::the_gauntlet" - ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd inlyne \ - --bash completions/inlyne.bash \ - --fish completions/inlyne.fish \ - --zsh completions/_inlyne - ''; - - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf $out/bin/inlyne \ - --add-rpath ${ - lib.makeLibraryPath [ - libGL - xorg.libX11 - ] - } - ''; - - meta = with lib; { - description = "GPU powered browserless markdown viewer"; - homepage = "https://github.com/Inlyne-Project/inlyne"; - changelog = "https://github.com/Inlyne-Project/inlyne/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "inlyne"; - }; -} diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix index 0a08ebbaae73..7c9a2d1cecab 100644 --- a/pkgs/applications/misc/inochi2d/generic.nix +++ b/pkgs/applications/misc/inochi2d/generic.nix @@ -16,6 +16,7 @@ zenity, luajit_2_1, libGL, + libX11, builderArgs, }: @@ -56,6 +57,8 @@ buildDubPackage ( dbus freetype SDL2 + libGL + libX11 ]; dontUseCmakeConfigure = true; @@ -128,13 +131,15 @@ buildDubPackage ( postFixup = '' # Add support for `open file` dialog makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \ - --prefix PATH : ${lib.makeBinPath [ zenity ]} \ - --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - libGL - luajit_2_1 - ] - } + --prefix PATH : ${lib.makeBinPath [ zenity ]} + + patchelf $out/share/${pname}/${pname} \ + --add-rpath ${ + lib.makeLibraryPath [ + libGL + luajit_2_1 + ] + } ''; meta = { diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix deleted file mode 100644 index 4e0a53397944..000000000000 --- a/pkgs/applications/misc/keepassxc/default.nix +++ /dev/null @@ -1,167 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - qttools, - - apple-sdk_15, - asciidoctor, - botan3, - curl, - darwinMinVersionHook, - kio, - libXi, - libXtst, - libargon2, - libusb1, - minizip, - pcsclite, - pkg-config, - qrencode, - qtbase, - qtmacextras, - qtsvg, - qtx11extras, - readline, - wrapGAppsHook3, - wrapQtAppsHook, - zlib, - - LocalAuthentication, - - withKeePassBrowser ? true, - withKeePassBrowserPasskeys ? true, - withKeePassFDOSecrets ? true, - withKeePassKeeShare ? true, - withKeePassNetworking ? true, - withKeePassSSHAgent ? true, - withKeePassTouchID ? true, - withKeePassX11 ? true, - withKeePassYubiKey ? true, - - nixosTests, -}: - -stdenv.mkDerivation rec { - pname = "keepassxc"; - version = "2.7.10"; - - src = fetchFromGitHub { - owner = "keepassxreboot"; - repo = "keepassxc"; - rev = version; - hash = "sha256-FBoqCYNM/leN+w4aV0AJMx/G0bjHbI9KVWrnmq3NfaI="; - }; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ - "-Wno-old-style-cast" - "-Wno-error" - "-D__BIG_ENDIAN__=${if stdenv.hostPlatform.isBigEndian then "1" else "0"}" - ]); - - NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-rpath ${libargon2}/lib"; - - patches = [ ./darwin.patch ]; - - cmakeFlags = - [ - "-DKEEPASSXC_BUILD_TYPE=Release" - "-DWITH_GUI_TESTS=ON" - "-DWITH_XC_UPDATECHECK=OFF" - ] - ++ (lib.optional (!withKeePassX11) "-DWITH_XC_X11=OFF") - ++ (lib.optional (withKeePassFDOSecrets && stdenv.hostPlatform.isLinux) "-DWITH_XC_FDOSECRETS=ON") - ++ (lib.optional (withKeePassYubiKey && stdenv.hostPlatform.isLinux) "-DWITH_XC_YUBIKEY=ON") - ++ (lib.optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") - ++ (lib.optional withKeePassBrowserPasskeys "-DWITH_XC_BROWSER_PASSKEYS=ON") - ++ (lib.optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") - ++ (lib.optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") - ++ (lib.optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); - - doCheck = true; - checkPhase = '' - runHook preCheck - - export LC_ALL="en_US.UTF-8" - export QT_QPA_PLATFORM=offscreen - export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" - # testcli, testgui and testkdbx4 are flaky - skip them all - # testautotype on darwin throws "QWidget: Cannot create a QWidget without QApplication" - make test ARGS+="-E 'testcli|testgui${lib.optionalString stdenv.hostPlatform.isDarwin "|testautotype|testkdbx4"}' --output-on-failure" - - runHook postCheck - ''; - - nativeBuildInputs = [ - asciidoctor - cmake - wrapQtAppsHook - qttools - pkg-config - ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) wrapGAppsHook3; - - dontWrapGApps = true; - preFixup = - '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - wrapQtApp "$out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC" - ''; - - # See https://github.com/keepassxreboot/keepassxc/blob/cd7a53abbbb81e468efb33eb56eefc12739969b8/src/browser/NativeMessageInstaller.cpp#L317 - postInstall = lib.optionalString withKeePassBrowser '' - mkdir -p "$out/lib/mozilla/native-messaging-hosts" - substituteAll "${./firefox-native-messaging-host.json}" "$out/lib/mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json" - ''; - - buildInputs = - [ - curl - botan3 - kio - libXi - libXtst - libargon2 - minizip - pcsclite - qrencode - qtbase - qtsvg - readline - zlib - ] - ++ lib.optional (stdenv.hostPlatform.isDarwin && withKeePassTouchID) LocalAuthentication - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - qtmacextras - - apple-sdk_15 - # ScreenCaptureKit, required by livekit, is only available on 12.3 and up: - # https://developer.apple.com/documentation/screencapturekit - (darwinMinVersionHook "12.3") - ] - ++ lib.optional stdenv.hostPlatform.isLinux libusb1 - ++ lib.optional withKeePassX11 qtx11extras; - - passthru.tests = nixosTests.keepassxc; - - meta = with lib; { - description = "Offline password manager with many features"; - longDescription = '' - A community fork of KeePassX, which is itself a port of KeePass Password Safe. - The goal is to extend and improve KeePassX with new features and bugfixes, - to provide a feature-rich, fully cross-platform and modern open-source password manager. - Accessible via native cross-platform GUI, CLI, has browser integration - using the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser) - ''; - homepage = "https://keepassxc.org/"; - license = licenses.gpl2Plus; - mainProgram = "keepassxc"; - maintainers = with maintainers; [ - blankparticle - sigmasquadron - ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix index 3c80d820a129..4a26b3b8a74c 100644 --- a/pkgs/applications/misc/kemai/default.nix +++ b/pkgs/applications/misc/kemai/default.nix @@ -2,55 +2,62 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, - cmake, + + # buildInputs + libXScrnSaver, magic-enum, - range-v3, - spdlog, + + # nativeBuildInputs qtbase, qtconnectivity, - qttools, qtlanguageserver, + qttools, + range-v3, + spdlog, qtwayland, + + # nativeBuildInputs + cmake, wrapQtAppsHook, - libXScrnSaver, + + # passthru nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kemai"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "AlexandrePTJ"; repo = "kemai"; - rev = version; - hash = "sha256-wclBAgeDyAIw/nGF6lzIwbwdoZMBTu+tjxsnIxIkODM="; + tag = finalAttrs.version; + hash = "sha256-2Cyrd0fKaEHkDaKF8lFwuoLvl6553rp3ET2xLUUrTnk="; }; - patches = [ - # Backport the fix for an issue where LICENSE.txt ends up in /bin - # Remove in next release - (fetchpatch { - url = "https://github.com/AlexandrePTJ/kemai/commit/e279679dd7308efebe004252d168d7308f3b99ce.patch"; - hash = "sha256-5cmRRMVATf4ul4HhaQKiE0yTN2qd+MfNFQzGTLLpOyg="; - }) - ]; + postPatch = '' + substituteInPlace \ + src/client/parser.cpp \ + src/client/kimaiCache.cpp \ + --replace-fail \ + "#include " \ + "#include " + ''; buildInputs = [ - qtbase - qtconnectivity - qttools - qtlanguageserver libXScrnSaver magic-enum + qtbase + qtconnectivity + qtlanguageserver + qttools range-v3 spdlog ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + cmakeFlags = [ - "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" - "-DFETCHCONTENT_QUIET=OFF" - "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" + (lib.cmakeBool "KEMAI_ENABLE_UPDATE_CHECK" false) + (lib.cmakeBool "KEMAI_BUILD_LOCAL_DEPENDENCIES" false) ]; nativeBuildInputs = [ @@ -62,13 +69,14 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Kimai desktop client written in QT6"; homepage = "https://github.com/AlexandrePTJ/kemai"; - license = licenses.mit; - maintainers = with maintainers; [ poelzi ]; - platforms = platforms.unix; - broken = stdenv.hostPlatform.isDarwin; + changelog = "https://github.com/AlexandrePTJ/kemai/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ poelzi ]; + platforms = lib.platforms.unix; + badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; mainProgram = "Kemai"; }; -} +}) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 4f3e74c4a1ee..70875941883e 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-i7MQqkVf+NZkmcf589BpLofwqc5KGxRNqdr1Go84M9A="; + hash = "sha256-5e697uEuH2r/k/5qSuluJ2qvgCqM/Z+O0fZ7Lygdvz4="; }; postPatch = '' diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix deleted file mode 100644 index 609414f21d7f..000000000000 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - fetchFromGitHub, - stdenv, - rustPlatform, - pkg-config, - openssl, - libgit2, - Security, - SystemConfiguration, -}: - -rustPlatform.buildRustPackage rec { - pname = "klipper-estimator"; - version = "3.7.3"; - - src = fetchFromGitHub { - owner = "Annex-Engineering"; - repo = "klipper_estimator"; - rev = "v${version}"; - hash = "sha256-EjfW2qeq0ehGhjE2Psz5g/suYMZPvtQi2gaYb+NCa2U="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-wMgFkzgoHjvE+5t+cA5OW2COXbUj/5tWXz0Zp9cd5lw="; - - env.TOOL_VERSION = "v${version}"; - - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libgit2 - Security - SystemConfiguration - ]; - - nativeBuildInputs = [ pkg-config ]; - - meta = with lib; { - description = "Tool for determining the time a print will take using the Klipper firmware"; - homepage = "https://github.com/Annex-Engineering/klipper_estimator"; - changelog = "https://github.com/Annex-Engineering/klipper_estimator/releases/tag/v${version}"; - mainProgram = "klipper_estimator"; - license = licenses.mit; - maintainers = with maintainers; [ tmarkus ]; - }; -} diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index e438351f1906..03938f8aabbc 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -6,6 +6,7 @@ # build inputs atk, file, + glib, gdk-pixbuf, glib-networking, gnome-desktop, @@ -14,8 +15,10 @@ gtk3, libnotify, pango, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, + meson, + ninja, # check inputs xvfb-run, @@ -45,11 +48,15 @@ pulseaudio, p7zip, xgamma, + gettext, libstrangle, fluidsynth, xorgserver, xorg, util-linux, + pkg-config, + desktop-file-utils, + appstream-glib, }: let @@ -83,9 +90,18 @@ buildPythonApplication rec { hash = "sha256-CAXKnx5+60MITRM8enkYgFl5ZKM6HCXhCYNyG7kHhuQ="; }; + format = "other"; + nativeBuildInputs = [ - wrapGAppsHook3 + appstream-glib + desktop-file-utils + gettext + glib gobject-introspection + meson + ninja + wrapGAppsHook3 + pkg-config ]; buildInputs = [ @@ -96,7 +112,7 @@ buildPythonApplication rec { gtk3 libnotify pango - webkitgtk_4_0 + webkitgtk_4_1 ] ++ (with gst_all_1; [ gst-libav @@ -128,20 +144,6 @@ buildPythonApplication rec { --replace '"libmagic.so.1"' "'${lib.getLib file}/lib/libmagic.so.1'" ''; - nativeCheckInputs = [ - xvfb-run - nose2 - flake8 - ] ++ requiredTools; - checkPhase = '' - runHook preCheck - - export HOME=$PWD - xvfb-run -s '-screen 0 800x600x24' make test - - runHook postCheck - ''; - # avoid double wrapping dontWrapGApps = true; makeWrapperArgs = [ diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 05a53714a961..0e3b8efc1b7a 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -21,7 +21,7 @@ let gtksourceview gnome-desktop libgnome-keyring - webkitgtk_4_0 + webkitgtk_4_1 ]; xorgDeps = pkgs: with pkgs.xorg; [ diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix deleted file mode 100644 index ce1897b4aed2..000000000000 --- a/pkgs/applications/misc/mdzk/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - CoreServices, -}: - -rustPlatform.buildRustPackage rec { - pname = "mdzk"; - version = "0.5.2"; - - src = fetchFromGitHub { - owner = "mdzk-rs"; - repo = "mdzk"; - rev = version; - hash = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs="; - }; - - cargoPatches = [ - # Remove when new version of mdzk is released. - ./update-mdbook-for-rust-1.64.patch - ]; - - useFetchCargoVendor = true; - cargoHash = "sha256-+x4pOtszvdzI/zR55ezcxlS52GrWQTuBn7vbnqDTVac="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - - meta = with lib; { - description = "Plain text Zettelkasten based on mdBook"; - homepage = "https://github.com/mdzk-rs/mdzk/"; - changelog = "https://github.com/mdzk-rs/mdzk/blob/main/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ - bryanasdev000 - ratsclub - ]; - mainProgram = "mdzk"; - }; -} diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index e12bd83c6b29..5043e43ddee6 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "MeerK40t"; - version = "0.9.7020"; + version = "0.9.7030"; pyproject = true; src = fetchFromGitHub { owner = "meerk40t"; repo = pname; tag = version; - hash = "sha256-mdl/zW53OM3MtyFoWbTI1yGY2yW72mglO5djHqKx4Fw="; + hash = "sha256-3UO2M4mDzRdzhS+H2gyzJo5W4JWGK+qt1Gg9LHGmdOY="; }; nativeBuildInputs = diff --git a/pkgs/applications/misc/mu-repo/default.nix b/pkgs/applications/misc/mu-repo/default.nix index c2acd018b78e..7b72cf93982c 100644 --- a/pkgs/applications/misc/mu-repo/default.nix +++ b/pkgs/applications/misc/mu-repo/default.nix @@ -1,7 +1,7 @@ { lib, - fetchFromGitHub, buildPythonApplication, + fetchFromGitHub, pytestCheckHook, git, testers, @@ -10,32 +10,34 @@ buildPythonApplication rec { pname = "mu-repo"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "fabioz"; repo = "mu-repo"; - rev = "mu_repo_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-COc7hbu72eA+ikZQkz6zXtFyaa/AKhoF+Zvsr6ZVOuY="; + tag = "mu_repo_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-aSRf0B/skoZLsn4dykWOFKVNtHYCsD9RtZ1frHDrcJU="; }; - propagatedBuildInputs = [ git ]; + dependencies = [ git ]; nativeCheckInputs = [ pytestCheckHook git ]; + disabledTests = [ "test_action_diff" ]; + passthru.tests.version = testers.testVersion { package = mu-repo; }; - meta = with lib; { + meta = { description = "Tool to help in dealing with multiple git repositories"; homepage = "http://fabioz.github.io/mu-repo/"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ sikmir ]; mainProgram = "mu"; }; } diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 2837666d49b1..32b73a4d52f4 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, - AppKit, DarwinTools, alsa-utils, at-spi2-core, @@ -36,8 +35,6 @@ lz4, libmpg123, makeWrapper, - pcre, - pcre2, pkg-config, portaudio, rapidjson, @@ -86,9 +83,6 @@ stdenv.mkDerivation (finalAttrs: { flac gitMinimal ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - AppKit - ] ++ [ glew jasper @@ -107,8 +101,6 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon lz4 libmpg123 - pcre - pcre2 portaudio rapidjson sqlite diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index f166e404ebe2..51109c49051c 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -19,6 +19,7 @@ icu, freetype, pugixml, + xorg, nix-update-script, }: @@ -32,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "organicmaps"; - version = "2025.03.02-7"; + version = "2025.05.20-5"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; tag = "${finalAttrs.version}-android"; - hash = "sha256-5WX+YDgu8Ll5+rZWWxfbNW0pBFz+2XWkw/ahM14Ml08="; + hash = "sha256-cqcFI5cXREOeHusPkXsMwdCopzpea50mZQ/+ogLlemk="; fetchSubmodules = true; }; @@ -78,6 +79,9 @@ stdenv.mkDerivation (finalAttrs: { icu freetype pugixml + xorg.libXrandr + xorg.libXinerama + xorg.libXcursor ]; # Yes, this is PRE configure. The configure phase uses cmake @@ -94,14 +98,14 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { # darwin: "invalid application of 'sizeof' to a function type" broken = stdenv.hostPlatform.isDarwin; homepage = "https://organicmaps.app/"; description = "Detailed Offline Maps for Travellers, Tourists, Hikers and Cyclists"; - license = licenses.asl20; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; mainProgram = "OMaps"; }; }) diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix deleted file mode 100644 index 3265a1b61299..000000000000 --- a/pkgs/applications/misc/pastel/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "pastel"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "sharkdp"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug="; - - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - - meta = with lib; { - description = "Command-line tool to generate, analyze, convert and manipulate colors"; - homepage = "https://github.com/sharkdp/pastel"; - changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}"; - license = with licenses; [ - asl20 # or - mit - ]; - maintainers = [ ]; - mainProgram = "pastel"; - }; -} diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 661117bcaace..67c6052585ce 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -16,21 +16,21 @@ gobject-introspection, wrapGAppsHook3, qrencode, - webkitgtk_4_0, + webkitgtk_4_1, discount, json-glib, - fetchpatch, + nix-update-script, }: stdenv.mkDerivation rec { pname = "pdfpc"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - hash = "sha256-5HFmbVsNajMwo+lBe9kJcJyQGe61N6Oy2CI/WJwmSE4="; + hash = "sha256-fPhCrn1ELC03/II+e021BUNJr1OKCBIcFCM7z+2Oo+s="; }; nativeBuildInputs = [ @@ -52,29 +52,15 @@ stdenv.mkDerivation rec { (gst-plugins-good.override { gtkSupport = true; }) gst-libav qrencode - webkitgtk_4_0 + webkitgtk_4_1 discount json-glib ]; - patches = [ - # needed for compiling pdfpc 4.6.0 with vala 0.56.7, see - # https://github.com/pdfpc/pdfpc/issues/686 - # https://github.com/pdfpc/pdfpc/pull/687 - (fetchpatch { - url = "https://github.com/pdfpc/pdfpc/commit/d38edfac63bec54173b4b31eae5c7fb46cd8f714.diff"; - hash = "sha256-KC2oyzcwU2fUmxaed8qAsKcePwR5KcXgpVdstJg8KmU="; - }) - # Allow compiling with markdown3 - # https://github.com/pdfpc/pdfpc/pull/716 - (fetchpatch { - url = "https://github.com/pdfpc/pdfpc/commit/08e66b9d432e9598c1ee9a78b2355728036ae1a1.patch"; - hash = "sha256-SKH2GQ5/6Is36xOFmSs89Yw/w7Fnma3FrNqwjOlUQKM="; - }) - ]; - cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin (lib.cmakeBool "MOVIES" false); + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Presenter console with multi-monitor support for PDF files"; mainProgram = "pdfpc"; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index a67a1821d554..8276f0cb2993 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -6,15 +6,16 @@ jdk21, wrapGAppsHook3, glib, + nix-update-script, }: stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "5.2.9"; + version = "5.3.1"; src = fetchurl { - url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - hash = "sha256-ZLVO2VD0XUVUG/GSot21c6nJ2N8h39vDzyzAzk1pQ6c="; + url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam-basic_${version}-1_amd64.deb"; + hash = "sha256-Fhj/MJnnm8nsuJmSb6PigJT6Qm+CkGg8lV0NaUMfur0="; }; unpackPhase = '' @@ -47,6 +48,8 @@ stdenv.mkDerivation rec { categories = [ "Office" ]; }; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/torakiki/pdfsam"; description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; @@ -56,7 +59,7 @@ stdenv.mkDerivation rec { binaryNativeCode ]; license = licenses.agpl3Plus; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ _1000101 ]; }; } diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix index c85fc3f9403b..16fc1b48f442 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "pe-bear"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "hasherezade"; repo = "pe-bear"; rev = "v${version}"; - hash = "sha256-jHFH1GAbAtOzUh+Gma89YCU5r/yuwekv/bqiyy8VmRk="; + hash = "sha256-jWRO0vO601IijFo7nu0SMF8inEXWLzv+Ni1nlJfGqhQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix deleted file mode 100644 index 884acd7aaa77..000000000000 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - lib, - stdenv, - copyDesktopItems, - fetchFromGitHub, - makeDesktopItem, - wrapQtAppsHook, - pkg-config, - qmake, - qtwayland, - qtsvg, - libpq, - cups, - libxml2, -}: - -stdenv.mkDerivation rec { - pname = "pgmodeler"; - version = "1.1.6"; - - src = fetchFromGitHub { - owner = "pgmodeler"; - repo = "pgmodeler"; - rev = "v${version}"; - sha256 = "sha256-ZoWCXCRaFQMf/RbcgXZQiF4+TDogdMOtccxOTk1c7Jw="; - }; - - nativeBuildInputs = [ - pkg-config - qmake - wrapQtAppsHook - copyDesktopItems - ]; - qmakeFlags = - [ - "pgmodeler.pro" - "CONFIG+=release" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "PGSQL_INC=${lib.getDev libpq}/include" - "PGSQL_LIB=${lib.getLib libpq}/lib/libpq.dylib" - "XML_INC=${libxml2.dev}/include/libxml2" - "XML_LIB=${libxml2.out}/lib/libxml2.dylib" - "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents" - ]; - - buildInputs = - [ - libpq - qtsvg - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cups - libxml2 - ]; - - desktopItems = [ - (makeDesktopItem { - name = "pgModeler"; - exec = "pgmodeler"; - icon = "pgmodeler"; - desktopName = "PgModeler"; - genericName = "PgModeler"; - comment = meta.description; - categories = [ "Development" ]; - startupWMClass = "pgmodeler"; - }) - ]; - - postInstall = - '' - install -Dm444 apps/pgmodeler/res/windows_ico.ico $out/share/icons/hicolor/256x256/apps/pgmodeler.ico - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/bin - for item in pgmodeler pgmodeler-{cli,se,ch} - do - ln -s $out/Applications/pgModeler.app/Contents/MacOS/$item $out/bin - done - ''; - - dontWrapQtApps = stdenv.hostPlatform.isDarwin; - - meta = with lib; { - description = "Database modeling tool for PostgreSQL"; - homepage = "https://pgmodeler.io/"; - license = licenses.gpl3; - maintainers = [ maintainers.esclear ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 24c14969970f..89c32a27b7ce 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,5 +1,6 @@ { lib, + config, fetchFromGitHub, python3Packages, wmctrl, @@ -8,8 +9,6 @@ }: { - stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05 - dev = with python3Packages; mkDerivationWith buildPythonPackage rec { @@ -58,3 +57,6 @@ ''; }; } +// lib.optionalAttrs config.allowAliases { + stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05 +} diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix deleted file mode 100644 index a5049d253d73..000000000000 --- a/pkgs/applications/misc/pomodoro/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - Foundation, -}: - -rustPlatform.buildRustPackage { - pname = "pomodoro"; - version = "unstable-2021-06-18"; - - src = fetchFromGitHub { - owner = "SanderJSA"; - repo = "Pomodoro"; - rev = "c833b9551ed0b09e311cdb369cc8226c5b9cac6a"; - sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-oXOf9G0BMSbFFAsmRaAZzaquFva1i1gJ4ISqJkqSx4k="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; - - meta = with lib; { - description = "Simple CLI pomodoro timer using desktop notifications written in Rust"; - homepage = "https://github.com/SanderJSA/Pomodoro"; - license = licenses.mit; - maintainers = with maintainers; [ annaaurora ]; - # error: redefinition of module 'ObjectiveC' - broken = stdenv.hostPlatform.isDarwin; - mainProgram = "pomodoro"; - }; -} diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix deleted file mode 100644 index fbb25f30d41b..000000000000 --- a/pkgs/applications/misc/projectlibre/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - ant, - jdk, - stripJavaArchivesHook, - makeWrapper, - jre, - coreutils, - which, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "projectlibre"; - version = "1.9.3"; - - src = fetchgit { - url = "https://git.code.sf.net/p/projectlibre/code"; - rev = "20814e88dc83694f9fc6780c2550ca5c8a87aa16"; # version 1.9.3 was not tagged - hash = "sha256-yXgYyy3jWxYMXKsNCRWdO78gYRmjKpO9U5WWU6PtwMU="; - }; - - nativeBuildInputs = [ - ant - jdk - stripJavaArchivesHook - makeWrapper - ]; - - runtimeDeps = [ - jre - coreutils - which - ]; - - env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8"; - - buildPhase = '' - runHook preBuild - ant -f projectlibre_build/build.xml - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/{projectlibre/samples,doc/projectlibre} - - pushd projectlibre_build - cp -R dist/* $out/share/projectlibre - cp -R license $out/share/doc/projectlibre - cp -R resources/samples/* $out/share/projectlibre/samples - install -Dm644 resources/projectlibre.desktop -t $out/share/applications - install -Dm644 resources/projectlibre.png -t $out/share/pixmaps - install -Dm755 resources/projectlibre -t $out/bin - popd - - substituteInPlace $out/bin/projectlibre \ - --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre" - - wrapProgram $out/bin/projectlibre \ - --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} - - runHook postInstall - ''; - - meta = { - description = "Project-Management Software similar to MS-Project"; - homepage = "https://www.projectlibre.com/"; - license = lib.licenses.cpal10; - mainProgram = "projectlibre"; - maintainers = with lib.maintainers; [ - Mogria - tomasajt - ]; - platforms = jre.meta.platforms; - }; -}) diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix deleted file mode 100644 index 690325519a68..000000000000 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - appimageTools, - fetchurl, - lib, -}: -let - pname = "protonup-qt"; - version = "2.11.1"; - src = fetchurl { - url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; - hash = "sha256-xHkeAqveXF8YLFvKHTZtSvINIIoiqhNbwVuKfnaHcQI="; - }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - mkdir -p $out/share/{applications,pixmaps} - cp ${appimageContents}/net.davidotek.pupgui2.desktop $out/share/applications/${pname}.desktop - cp ${appimageContents}/net.davidotek.pupgui2.png $out/share/pixmaps/${pname}.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=net.davidotek.pupgui2' 'Exec=${pname}' \ - --replace 'Icon=net.davidotek.pupgui2' 'Icon=${pname}' - ''; - - extraPkgs = pkgs: with pkgs; [ zstd ]; - - meta = with lib; { - homepage = "https://davidotek.github.io/protonup-qt/"; - description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface"; - license = licenses.gpl3; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - mainProgram = "protonup-qt"; - changelog = "https://github.com/DavidoTek/ProtonUp-Qt/releases/tag/v${version}"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michaelBelsanti ]; - }; -} diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index da47982cf58b..e075bf766c1f 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -11,7 +11,6 @@ cereal, cgal, curl, - darwin, dbus, eigen, expat, @@ -28,7 +27,6 @@ nlopt, opencascade-occt_7_6_1, openvdb, - pcre, qhull, tbb_2021_11, wxGTK32, @@ -36,27 +34,15 @@ libbgcode, heatshrink, catch2, - webkitgtk_4_0, + webkitgtk_4_1, + ctestCheckHook, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, wxGTK-override ? null, opencascade-override ? null, }: let - wxGTK-prusa = wxGTK32.overrideAttrs (old: { - pname = "wxwidgets-prusa3d-patched"; - version = "3.2.0"; - configureFlags = old.configureFlags ++ [ "--disable-glcanvasegl" ]; - patches = [ ./wxWidgets-Makefile.in-fix.patch ]; - src = fetchFromGitHub { - owner = "prusa3d"; - repo = "wxWidgets"; - rev = "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26"; - hash = "sha256-rYvmNmvv48JSKVT4ph9AS+JdstnLSRmcpWz1IdgBzQo="; - fetchSubmodules = true; - }; - }); - nanosvg-fltk = nanosvg.overrideAttrs (old: rec { + nanosvg-fltk = nanosvg.overrideAttrs (old: { pname = "nanosvg-fltk"; version = "unstable-2022-12-22"; @@ -68,7 +54,7 @@ let }; }); openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_11; }; - wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override; + wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override; opencascade-override' = if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override; in @@ -89,15 +75,20 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/prusa3d/PrusaSlicer/commit/cdc3db58f9002778a0ca74517865527f50ade4c3.patch"; hash = "sha256-zgpGg1jtdnCBaWjR6oUcHo5sGuZx5oEzpux3dpRdMAM="; }) + # https://github.com/prusa3d/PrusaSlicer/pull/11769 + ./fix-ambiguous-constructors.patch ]; - # required for GCC 14 + # Patch required for GCC 14. # (not applicable to super-slicer fork) + # Make Gcode viewer open newer bgcode files. postPatch = lib.optionalString (finalAttrs.pname == "prusa-slicer") '' substituteInPlace src/slic3r-arrange/include/arrange/DataStoreTraits.hpp \ --replace-fail \ "WritableDataStoreTraits::template set" \ "WritableDataStoreTraits::set" + substituteInPlace src/platform/unix/PrusaGcodeviewer.desktop \ + --replace-fail 'MimeType=text/x.gcode;' 'MimeType=application/x-bgcode;text/x.gcode;' ''; nativeBuildInputs = [ @@ -130,7 +121,6 @@ stdenv.mkDerivation (finalAttrs: { nlopt opencascade-override' openvdb_tbb_2021_8 - pcre qhull tbb_2021_11 wxGTK-override' @@ -138,13 +128,10 @@ stdenv.mkDerivation (finalAttrs: { libbgcode heatshrink catch2 - webkitgtk_4_0 + webkitgtk_4_1 ] ++ lib.optionals withSystemd [ systemd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreWLAN ]; strictDeps = true; @@ -202,6 +189,17 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p "$out/share/pixmaps/" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png" + + mkdir -p "$out"/share/mime/packages + cat << EOF > "$out"/share/mime/packages/prusa-gcode-viewer.xml + + + + Binary G-code file + + + + EOF ''; preFixup = '' @@ -211,16 +209,12 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = true; - - checkPhase = '' - runHook preCheck - - ctest \ - --force-new-ctest-process \ - -E 'libslic3r_tests|sla_print_tests' - - runHook postCheck - ''; + nativeCheckInputs = [ ctestCheckHook ]; + checkFlags = [ + "--force-new-ctest-process" + "-E" + "libslic3r_tests|sla_print_tests" + ]; meta = with lib; @@ -231,6 +225,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ tweber tmarkus + fliegendewurst ]; platforms = platforms.unix; } diff --git a/pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch b/pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch new file mode 100644 index 000000000000..209a0d1a08a9 --- /dev/null +++ b/pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch @@ -0,0 +1,37 @@ +From 910328f3131e24e330808f5d4cb814454dbe201d Mon Sep 17 00:00:00 2001 +From: Gregor Riepl +Date: Mon, 27 Nov 2023 13:01:55 +0100 +Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString + overloads + +--- + src/slic3r/GUI/PhysicalPrinterDialog.cpp | 2 +- + src/slic3r/GUI/Plater.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp +index 849e987c731..7d0c628c23f 100644 +--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp ++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp +@@ -607,7 +607,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr + // Always fill in the "printhost_port" combo box from the config and select it. + { + Choice* choice = dynamic_cast(m_optgroup->get_field("printhost_port")); +- choice->set_values({ m_config->opt_string("printhost_port") }); ++ choice->set_values(std::vector({ m_config->opt_string("printhost_port") })); + choice->set_selection(); + } + +diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp +index debfe625fd4..4d61e29a2dc 100644 +--- a/src/slic3r/GUI/Plater.cpp ++++ b/src/slic3r/GUI/Plater.cpp +@@ -4420,7 +4420,7 @@ void Plater::load_project(const wxString& filename) + s_multiple_beds.set_loading_project_flag(true); + ScopeGuard guard([](){ s_multiple_beds.set_loading_project_flag(false);}); + +- if (! load_files({ into_path(filename) }).empty()) { ++ if (! load_files(std::vector({ into_path(filename) })).empty()) { + // At least one file was loaded. + p->set_project_filename(filename); + // Save the names of active presets and project specific config into ProjectDirtyStateManager. diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix deleted file mode 100644 index 8a3717a8eefc..000000000000 --- a/pkgs/applications/misc/pueue/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - Libsystem, - SystemConfiguration, - installShellFiles, - libiconv, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "pueue"; - version = "4.0.0"; - - src = fetchFromGitHub { - owner = "Nukesor"; - repo = "pueue"; - rev = "v${version}"; - hash = "sha256-TDxTj7VGzJzd6RWyVbe2ubpVS57bqq7OVvi23ZHmYDM="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-R94D9/J+Zl86Rb4+5O2Hp9GmcwnRt+0wJ56CHFoy/zg="; - - nativeBuildInputs = - [ - installShellFiles - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - rustPlatform.bindgenHook - ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Libsystem - SystemConfiguration - libiconv - ]; - - checkFlags = [ - "--test client_tests" - "--skip=test_single_huge_payload" - "--skip=test_create_unix_socket" - ]; - - postInstall = '' - for shell in bash fish zsh; do - $out/bin/pueue completions $shell . - done - installShellCompletion pueue.{bash,fish} _pueue - ''; - - meta = with lib; { - homepage = "https://github.com/Nukesor/pueue"; - description = "Daemon for managing long running shell commands"; - longDescription = '' - Pueue is a command-line task management tool for sequential and parallel - execution of long-running tasks. - - Simply put, it's a tool that processes a queue of shell commands. On top - of that, there are a lot of convenient features and abstractions. - - Since Pueue is not bound to any terminal, you can control your tasks from - any terminal on the same machine. The queue will be continuously - processed, even if you no longer have any active ssh sessions. - ''; - changelog = "https://github.com/Nukesor/pueue/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ sarcasticadmin ]; - }; -} diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index 069e5ae7b48a..1e1f92281da8 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "qMasterPassword"; - version = "2.0"; + version = "2.0.3"; src = fetchFromGitHub { owner = "bkueng"; repo = pname; rev = "v${version}"; - hash = "sha256-4qxPjrf6r2S0l/hcs6bqfJm56jdDz+0a0xEkqGBYGBs="; + hash = "sha256-kNVdE42JFzl6HO84b793gseMhcDyiGzQCmhh6zh2epc="; }; buildInputs = diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix deleted file mode 100644 index 435da18f8abe..000000000000 --- a/pkgs/applications/misc/reddsaver/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - openssl, - pkg-config, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "reddsaver"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "manojkarthick"; - repo = "reddsaver"; - rev = "v${version}"; - sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf"; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-xYtdGhuieFudfJz+LxUjP7mV8uItaIvLahCH7vBWTtg="; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; - - # package does not contain tests as of v0.3.3 - docCheck = false; - - meta = with lib; { - description = "CLI tool to download saved media from Reddit"; - homepage = "https://github.com/manojkarthick/reddsaver"; - license = with licenses; [ - mit # or - asl20 - ]; - maintainers = [ maintainers.manojkarthick ]; - mainProgram = "reddsaver"; - }; - -} diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 31e866d0e7c5..3c10b317bf10 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -19,7 +19,6 @@ pyxdg, withQuartz ? stdenv.hostPlatform.isDarwin, - ApplicationServices, withRandr ? stdenv.hostPlatform.isLinux, libxcb, withDrm ? stdenv.hostPlatform.isLinux, @@ -29,9 +28,6 @@ withGeolocation ? true, withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin, - CoreLocation, - Foundation, - Cocoa, withGeoclue ? withGeolocation && stdenv.hostPlatform.isLinux, geoclue, withAppIndicator ? stdenv.hostPlatform.isLinux, @@ -99,12 +95,6 @@ let ++ lib.optional withGeoclue geoclue ++ lib.optional withDrm libdrm ++ lib.optional withVidmode libXxf86vm - ++ lib.optional withQuartz ApplicationServices - ++ lib.optionals withCoreLocation [ - CoreLocation - Foundation - Cocoa - ] ++ lib.optional withAppIndicator ( if (pname != "gammastep") then libappindicator else libayatana-appindicator ); @@ -180,13 +170,13 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.9"; + version = "2.0.11"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - hash = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; + hash = "sha256-c8JpQLHHLYuzSC9bdymzRTF6dNqOLwYqgwUOpKcgAEU="; }; meta = redshift.meta // { diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 95597a6ee411..cb3793b782f4 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "davatorium"; repo = "rofi"; rev = version; fetchSubmodules = true; - hash = "sha256-TEn3LoTUc5mxYcVkckIFTfkqQ9cUJxkXyg/5TFv5TZ0="; + hash = "sha256-YI6ShRRBJ9ExkzDnI31YjtI1mWRWPzVRYQvpTAtLTeI="; }; preConfigure = '' diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 090c0454def1..503c4292713c 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "slstatus"; - version = "1.0"; + version = "1.1"; src = fetchgit { url = "https://git.suckless.org/slstatus"; rev = version; - hash = "sha256-cFah6EgApslLSlJaOy/5W9ZV9Z1lzfKye/rRh9Om3T4="; + hash = "sha256-MRDovZpQsvnLEvsbJNBzprkzQQ4nIs1T9BLT+tSGta8="; }; preBuild = diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix deleted file mode 100644 index 24e160ab3a62..000000000000 --- a/pkgs/applications/misc/stork/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - openssl, - pkg-config, - stdenv, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "stork"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "jameslittle230"; - repo = "stork"; - rev = "v${version}"; - sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-nN2aNNBq2YDOY9H9682hvwrlI5WTg7s1EPi68UuBTBM="; - - checkFlags = [ - # Fails for 1.6.0, but binary works fine - "--skip=pretty_print_search_results::tests::display_pretty_search_results_given_output" - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - meta = with lib; { - description = "Impossibly fast web search, made for static sites"; - homepage = "https://github.com/jameslittle230/stork"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ chuahou ]; - mainProgram = "stork"; - }; -} diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix deleted file mode 100644 index 6fa567357324..000000000000 --- a/pkgs/applications/misc/survex/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - Carbon, - Cocoa, - ffmpeg, - glib, - libGLU, - libICE, - libX11, - libgbm, - perl, - pkg-config, - proj, - gdal, - python3, - wrapGAppsHook3, - wxGTK32, -}: - -stdenv.mkDerivation rec { - pname = "survex"; - version = "1.4.16"; - - src = fetchurl { - url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-kiRXld0FwXU2zPgMPSR/KQSdoZFLTvd9Y/n97/YJlcA="; - }; - - nativeBuildInputs = [ - perl - pkg-config - python3 - wrapGAppsHook3 - ]; - - buildInputs = - [ - ffmpeg - glib - proj - gdal - wxGTK32 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - # TODO: libGLU doesn't build for macOS because of Mesa issues - # (#233265); is it required for anything? - libGLU - libgbm - libICE - libX11 - ]; - - strictDeps = true; - - postPatch = '' - patchShebangs . - ''; - - configureFlags = [ - "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" - ]; - - enableParallelBuilding = true; - doCheck = (!stdenv.hostPlatform.isDarwin); # times out - enableParallelChecking = false; - - meta = with lib; { - description = "Free Software/Open Source software package for mapping caves"; - longDescription = '' - Survex is a Free Software/Open Source software package for mapping caves, - licensed under the GPL. It is designed to be portable and can be run on a - variety of platforms, including Linux/Unix, macOS, and Microsoft Windows. - ''; - homepage = "https://survex.com/"; - changelog = "https://github.com/ojwb/survex/raw/v${version}/NEWS"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.matthewcroughan ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix deleted file mode 100644 index 848e73ff2df3..000000000000 --- a/pkgs/applications/misc/swappy/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - meson, - ninja, - wayland, - cairo, - pango, - gtk, - pkg-config, - scdoc, - libnotify, - glib, - wrapGAppsHook3, - hicolor-icon-theme, -}: - -stdenv.mkDerivation rec { - pname = "swappy"; - version = "1.5.1"; - - src = fetchFromGitHub { - owner = "jtheoof"; - repo = pname; - rev = "v${version}"; - hash = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo="; - }; - - nativeBuildInputs = [ - glib - meson - ninja - pkg-config - scdoc - wrapGAppsHook3 - ]; - - buildInputs = [ - cairo - pango - gtk - libnotify - wayland - glib - hicolor-icon-theme - ]; - - strictDeps = true; - - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - ]; - - meta = with lib; { - description = "Wayland native snapshot editing tool, inspired by Snappy on macOS"; - homepage = "https://github.com/jtheoof/swappy"; - license = licenses.mit; - mainProgram = "swappy"; - maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index caba25669515..0550b42cfaf0 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -38,14 +38,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.7.3"; + version = "1.7.7"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-XmbdLaJzGjgbB4klu8soAV1m2/LjhbWbAczl/mNTMG4="; + hash = "sha256-q7qGL89gPlFLV+lJgO7ruBPI2pBzoHqiF/FD5KP3cnM="; }; buildInputs = diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index df841710a11c..a8c77f1d821b 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -27,13 +27,6 @@ xinput, avahi-compat, - # MacOS / darwin - ApplicationServices, - Carbon, - Cocoa, - CoreServices, - ScreenSaver, - UserNotifications, }: stdenv.mkDerivation rec { @@ -74,14 +67,6 @@ stdenv.mkDerivation rec { openssl pcre ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Carbon - Cocoa - CoreServices - ScreenSaver - UserNotifications - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index 556ce02e0546..b3bc2b42d771 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "tellico"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-eYmLDQfnC0/R7VF+oMBwb5Q56CBl2icusoit/LIIpUs="; + hash = "sha256-sJyOONYSnec+LI5t3FjDXJFhgIo8cPogZeD4057EW4g="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix deleted file mode 100644 index 76013b492330..000000000000 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - rustPlatform, - pkg-config, - libgit2, - openssl, - sqlite, - libiconv, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "terminal-typeracer"; - version = "2.1.3"; - - src = fetchFromGitLab { - owner = "ttyperacer"; - repo = pname; - rev = "v${version}"; - hash = "sha256-S3OW6KihRd6ReTWUXRb1OWC7+YoxehjFRBxcnJVgImU="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-WYqbG0iSVvnRLCy5Qs4wr72LjQ6uPgskVWP62Af0RQ8="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = - [ - libgit2 - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - Security - ]; - - OPENSSL_NO_VENDOR = 1; - LIBGIT2_NO_VENDOR = 1; - - meta = with lib; { - description = "Open source terminal based version of Typeracer written in rust"; - homepage = "https://gitlab.com/ttyperacer/terminal-typeracer"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ yoctocell ]; - mainProgram = "typeracer"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 29f1591b9fc8..fd3f631d6cf1 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "tipp10"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitLab { owner = "tipp10"; repo = "tipp10"; rev = "v${version}"; - hash = "sha256-e0sWH4pT7ej9XGK/Sg9XMX2bMqcXqtSaYI7KBZTXvp4="; + hash = "sha256-OiBtUizN6OjcAb5RLvzfod6tVQo/b8p8Ec4lgKYaifw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 6a55e9ecdcbf..bdf7ec15c384 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -3,21 +3,20 @@ mkDerivation, fetchFromGitHub, qtbase, - qtx11extras, qmake, pkg-config, boost, }: -mkDerivation { +mkDerivation rec { pname = "twmn"; - version = "unstable-2018-10-01"; + version = "2025_03_06"; src = fetchFromGitHub { owner = "sboli"; repo = "twmn"; - rev = "80f48834ef1a07087505b82358308ee2374b6dfb"; - sha256 = "0mpjvp800x07lp9i3hfcc5f4bqj1fj4w3dyr0zwaxc6wqmm0fdqz"; + tag = version; + hash = "sha256-JQhONBcTJUzsKJY6YstC6HB4d/t8vf155/lN4UUv4l4="; }; nativeBuildInputs = [ @@ -26,7 +25,6 @@ mkDerivation { ]; buildInputs = [ qtbase - qtx11extras boost ]; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix deleted file mode 100644 index 0772cd2d01a2..000000000000 --- a/pkgs/applications/misc/wordnet/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - tcl, - tk, - Cocoa, - makeWrapper, -}: - -stdenv.mkDerivation rec { - version = "3.0"; - pname = "wordnet"; - src = fetchurl { - url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2"; - sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - tcl - tk - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; - - hardeningDisable = [ "format" ]; - - patchPhase = '' - sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c - ''; - - # Fails the build on clang-16 and on upcoming gcc-14. - env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; - - # Needs the path to `tclConfig.sh' and `tkConfig.sh'. - configureFlags = [ - "--with-tcl=${tcl}/lib" - "--with-tk=${tk}/lib" - ]; - - postInstall = '' - wrapProgram $out/bin/wnb --prefix PATH : "$out/bin" - ''; - - meta = { - description = "Lexical database for the English language"; - - longDescription = '' - WordNet® is a large lexical database of English. Nouns, verbs, - adjectives and adverbs are grouped into sets of cognitive synonyms - (synsets), each expressing a distinct concept. Synsets are - interlinked by means of conceptual-semantic and lexical relations. - The resulting network of meaningfully related words and concepts can - be navigated with the browser. WordNet is also freely and publicly - available for download. WordNet's structure makes it a useful tool - for computational linguistics and natural language processing. - ''; - - homepage = "https://wordnet.princeton.edu/"; - license = { - fullName = "WordNet 3.0 license"; - url = "https://wordnet.princeton.edu/license-and-commercial-use"; - }; - maintainers = [ ]; - platforms = with lib.platforms; linux ++ darwin; - mainProgram = "wn"; - }; -} diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index bd8227b4c835..9f460221896d 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xca"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "chris2511"; repo = "xca"; rev = "RELEASE.${finalAttrs.version}"; - hash = "sha256-2TqqHTutG+5YU2mJNTS3pvtEqV7qKVB+j/dipdmEkIk="; + hash = "sha256-28K6luMuYcDuNKd/aQG9HX9VN5YkKArl/GQn5spQ+Sg="; }; buildInputs = [ diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 899e1ee92fba..3ca3f6b8655a 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -11,7 +11,7 @@ json-glib, desktop-file-utils, python3, - gtk, + gtk3, girara, gettext, gnome, @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - gtk + gtk3 girara libintl sqlite diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 88241856632d..9290e079d480 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -3,7 +3,6 @@ lib, stdenv, newScope, - gtk3, useMupdf ? true, }: @@ -15,8 +14,6 @@ lib.makeScope newScope ( { inherit useMupdf; - gtk = gtk3; - zathura_core = callPackage ./core { }; zathura_pdf_poppler = callPackage ./pdf-poppler { }; diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 87ac40d1b204..70761922fc6b 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -5,7 +5,7 @@ meson, ninja, pkg-config, - gtk, + gtk3, zathura_core, girara, djvulibre, @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { djvulibre gettext zathura_core - gtk + gtk3 girara ]; diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index e84b1a93af97..1fdbe190ce82 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -2,7 +2,7 @@ builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { zettlr = { - version = "3.4.3"; - hash = "sha256-Xb9zszbkHWAaIcu74EGQH0PVbuXIZXH/dja1F1Hkx1c="; + version = "3.4.4"; + hash = "sha256-ApgmHl9WoAmWl03tqv01D0W8orja25f7KZUFLhlZloQ="; }; } diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix deleted file mode 100644 index 8b5e672d690f..000000000000 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromSourcehut, - pkg-config, - ncurses, - openssl, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "asuka"; - version = "0.8.5"; - - src = fetchFromSourcehut { - owner = "~julienxx"; - repo = pname; - rev = version; - sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-aNHkhcvOdK6sf6nWxCNPxcktYhrnmLdMrLqWb/1QBQ4="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - ncurses - openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; - - meta = with lib; { - description = "Gemini Project client written in Rust with NCurses"; - mainProgram = "asuka"; - homepage = "https://git.sr.ht/~julienxx/asuka"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; - }; -} diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1c43346c1fb9..fe3e5e28cef3 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -446,8 +446,11 @@ let ./patches/cross-compile.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ./patches/no-build-timestamps.patch + ] + ++ lib.optionals (!chromiumVersionAtLeast "136") [ # Fix build with Pipewire 1.4 # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500 + # Got merged, started shipping with M136+. ./patches/webrtc-pipewire-1.4.patch ] ++ lib.optionals (packageName == "chromium") [ @@ -487,7 +490,12 @@ let # allowing us to use our rustc and our clang. ./patches/chromium-129-rust.patch ] - ++ lib.optionals (!ungoogled) [ + ++ lib.optionals (!ungoogled && !chromiumVersionAtLeast "136") [ + # Note: We since use LLVM v19.1+ on unstable *and* release-24.11 for all version and as such + # no longer need this patch. We opt to arbitrarily limit it to versions prior to M136 just + # because that's when this revert stopped applying cleanly and defer fully dropping it for + # the next cleanup to bundle rebuilding all of chromium and electron. + # # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size # and std::hardware_constructive_interference_size. # So let's revert the change for now and hope that our rustc.llvmPackages and @@ -521,13 +529,61 @@ let hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY="; }) ] - ++ lib.optionals (chromiumVersionAtLeast "134" && lib.versionOlder rustcVersion "1.86") [ - ./patches/chromium-134-rust-adler2.patch + ++ lib.optionals (!isElectron && !chromiumVersionAtLeast "137") [ + # Backport "Add more CFI suppressions for inline PipeWire functions" from M137 + # to fix SIGKILL (ud1) when screensharing with PipeWire 1.4+ and is_cfi = true. + # Our chromium builds set is_official_build = true, which in turn enables is_cfi. + # We don't apply this patch to electron, because we build electron with + # is_cfi = false and as such is not affected by this. + # https://chromium-review.googlesource.com/c/chromium/src/+/6421030 + (fetchpatch { + name = "add-more-CFI-suppressions-for-inline-PipeWire-functions.patch"; + url = "https://chromium.googlesource.com/chromium/src/+/0eebf40b9914bca8fe69bef8eea89522c1a5d4ce^!?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-xMqGdu5Q8BGF/OIRdmMzPrrrMGDOSY2xElFfhRsJlDU="; + }) + ] + ++ lib.optionals (!isElectron && !chromiumVersionAtLeast "136") [ + # Backport "Only call format_message when needed" to fix print() crashing with is_cfi = true. + # We build electron is_cfi = false and as such electron is not affected by this. + # Started shipping with M136+. + # https://github.com/NixOS/nixpkgs/issues/401326 + # https://gitlab.archlinux.org/archlinux/packaging/packages/chromium/-/issues/13 + # https://skia-review.googlesource.com/c/skia/+/961356 + (fetchpatch { + name = "only-call-format_message-when-needed.patch"; + url = "https://skia.googlesource.com/skia/+/71685eda67178fa374d473ec1431fc459c83bb21^!?format=TEXT"; + decode = "base64 -d"; + stripLen = 1; + extraPrefix = "third_party/skia/"; + hash = "sha256-aMqDjt/0cowqSm5DqcD3+zX+mtjydk396LD+B5F/3cs="; + }) + ] + ++ lib.optionals (chromiumVersionAtLeast "136") [ + # Modify the nodejs version check added in https://chromium-review.googlesource.com/c/chromium/src/+/6334038 + # to look for the minimal version, not the exact version (major.minor.patch). The linked CL makes a case for + # preventing compilations of chromium with versions below their intended version, not about running the very + # exact version or even running a newer version. + ./patches/chromium-136-nodejs-assert-minimal-version-instead-of-exact-match.patch ]; postPatch = - lib.optionalString (!isElectron) '' - ln -s ${./files/gclient_args.gni} build/config/gclient_args.gni + lib.optionalString (!isElectron) + # TODO: reuse mkGnFlags for this + ( + if (chromiumVersionAtLeast "136") then + '' + cp ${./files/gclient_args.gni} build/config/gclient_args.gni + chmod u+w build/config/gclient_args.gni + echo 'checkout_mutter = false' >> build/config/gclient_args.gni + echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni + '' + else + '' + ln -s ${./files/gclient_args.gni} build/config/gclient_args.gni + '' + ) + + lib.optionalString (!isElectron) '' echo 'LASTCHANGE=${upstream-info.DEPS."src".rev}-refs/tags/${version}@{#0}' > build/util/LASTCHANGE echo "$SOURCE_DATE_EPOCH" > build/util/LASTCHANGE.committime @@ -740,6 +796,10 @@ let use_qt = false; } ) + // lib.optionalAttrs (chromiumVersionAtLeast "136") { + # LLVM < v21 does not support --warning-suppression-mappings yet: + clang_warning_suppression_file = ""; + } // { # To fix the build as we don't provide libffi_pic.a # (ld.lld: error: unable to find library -l:libffi_pic.a): diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index b31c31a7b829..d8c3cf2e3780 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -46,8 +46,10 @@ let min-version: result: let min-supported-version = (lib.head (lib.attrValues electron-source)).unwrapped.info.chromium.version; + # Warning can be toggled by changing the value of enabled: + enabled = false; in - lib.warnIf (lib.versionAtLeast min-supported-version min-version) + lib.warnIf (enabled && lib.versionAtLeast min-supported-version min-version) "chromium: min-supported-version ${min-supported-version} is newer than a conditional bounded at ${min-version}. You can safely delete it." result; chromiumVersionAtLeast = diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index b687e910b4b7..64a68d26f105 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,27 +1,27 @@ { "chromium": { - "version": "135.0.7049.52", + "version": "136.0.7103.113", "chromedriver": { - "version": "135.0.7049.42", - "hash_darwin": "sha256-CixR0TvndAgxvXYbetIqKg6NRu/z3pJe+USCZ0pyQd4=", - "hash_darwin_aarch64": "sha256-WKDi97j1F9+I6RYOsdiXVrgVibZ3ZoVPljo1XAtw0o8=" + "version": "136.0.7103.114", + "hash_darwin": "sha256-RAWarx2vOh23XKvhNwAkCgG9swGxX1dw8LaqIQBPJFo=", + "hash_darwin_aarch64": "sha256-TZcO5RiRW0dN0+jBArclBkIvYSSirhmPgJXswfTufgk=" }, "deps": { "depot_tools": { - "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392", - "hash": "sha256-eWlHnSRfLFcd3OoyCTIFewDf0eC9KQowScQOnphgfg8=" + "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f", + "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=" }, "gn": { - "rev": "4a8016dc391553fa1644c0740cc04eaac844121e", - "hash": "sha256-8NynNvLNCHxy8EYmsnPovKhXu9DcDcYBhg4A6d2QIfY=" + "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444", + "hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg=" }, - "npmHash": "sha256-wNrZaugdKJCyV1WchkKXzr/I1OW1AtjiC2p7qTZZOqU=" + "npmHash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "9ba7e609d28c509a8ce9265c2247065d8d251173", - "hash": "sha256-PjvfckdlaMq9HWefGxFppgBumlqh7xoCoxYFwk/r630=", + "rev": "76fa3c1782406c63308c70b54f228fd39c7aaa71", + "hash": "sha256-U6WsxmGf4eFKVBBgppoHIfMlrT34a1oymZETzEhzkQA=", "recompress": true }, "src/third_party/clang-format/script": { @@ -29,10 +29,15 @@ "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2", "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=" }, + "src/third_party/compiler-rt/src": { + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git", + "rev": "bc2b30185219a2defe3c8a3b45f95a11386a7f6f", + "hash": "sha256-bfDMglQaiExTFwaVBroia+6G+9AHEVy5cQGocaEVOgA=" + }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "7f8b68f91ca8b192375f5e71cd81fb3ed9650ef3", - "hash": "sha256-1P+p5MPXm0WkeYgzIxG2SBKZVPWplUlEo7xYI//Y0uw=" + "rev": "449310fe2e37834a7e62972d2a690cade2ef596b", + "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", @@ -41,13 +46,13 @@ }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "62e217a12ee1133833d9890b2f7adde900e4efbd", - "hash": "sha256-FBMrvCCVwm0mmaQHDvKXljxxLwthpsFqhPE8yqBx5Aw=" + "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874", + "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "a02de4d0d992b110c8b180fdec91258e7b60265f", - "hash": "sha256-LtxaimMmnman7BKLKpSR8rJtbEvHsmGVeHvzEukB4EY=" + "rev": "97989c1bfa112c81f6499487fedc661dcf6d3b2e", + "hash": "sha256-9Ieaxe0PFIIP4RttODd8pTw/zVjQZGZtaYSybwnzTz0=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -66,8 +71,8 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "441c86221443f48e818335d51f84cf1880c35aa4", - "hash": "sha256-nMLn2wTAr+3U1VpqWWq93zJHrlT+f1Yky8ONKk0kWjg=" + "rev": "929dd3e6d02aac1f46653d03b2a644e2873a3bbb", + "hash": "sha256-lY4P2f90/9JwCpxuBFjim7KygczM8zMDQVUaEYaQjnA=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", @@ -76,8 +81,8 @@ }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "25a56e315359eaebb2ff4213771016a4978a346d", - "hash": "sha256-ZkrAaNgCqG09CufQN35wFi09TVxvbf/U4jGNNMRLY0M=" + "rev": "5077431b183c43f10890b865fc9f02a4dcf1dd85", + "hash": "sha256-CLvZTBvtTdOpC8eWUTWkb0ITJ5EViPmc6d5O8cTaKY8=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -91,8 +96,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "079266db445215380befce453b1ab3bbdfeaf73d", - "hash": "sha256-Bcm9wxlLqp/ANg+cPvsuwAlaxVmef6g+12L5ZE4uCGA=" + "rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e", + "hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -106,13 +111,13 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "ba86fb95004331f2cf571dd9adefe2458290ee11", - "hash": "sha256-wl/T/WxVNctM4m4VSFFqqtJ0xkEBiuILYywAylqa0Oo=" + "rev": "b6bb4bab7b4a36bc95566e00cb8f01051089afc3", + "hash": "sha256-L2ewIW6C+PTftbbXf+nlWcFD0y4naBNg7FLXMMxiWac=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "2e328dd4eace9648adcc943cac6a1792b5dcdec5", - "hash": "sha256-mh4s57NonFQzWNaPiKfe9kW4Ow7XAN+hW6Xpvgjvb0w=" + "rev": "d708a2602a5947ee068f784daa1594a673d47c4a", + "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM=" }, "src/third_party/content_analysis_sdk/src": { "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", @@ -121,13 +126,13 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "7d4b789f55389dad1820d6caf6a650038dad06e2", - "hash": "sha256-O6WOm6qTSgRmDR+yY2wH6t+7ob+TtZIA5Gax1ysEZh0=" + "rev": "8d956180934f16244bdb58b39175824775125e55", + "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "bdc68b25b620d7302a955e2c38c548ebfe74ef31", - "hash": "sha256-R9SQiKUjLkLmPJwuWpw7fcibrWxSlXWkDsCra7Ci0UQ=" + "rev": "1cffe7ec763900d104e4df62bc96d93f572157cb", + "hash": "sha256-VK+5saAJlZOluMAYKTKwNcnZALsCYkzgVfQHylt3584=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -136,8 +141,8 @@ }, "src/third_party/dawn/third_party/dxc": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "0a1143572d107c8b6980df092b84a79190ec1fbd", - "hash": "sha256-sUSQTOi0EuIHX9h27RXb5HnbcdfkG/U1K6EbBdjSto8=" + "rev": "206b77577d15fc5798eb7ad52290388539b7146d", + "hash": "sha256-WXgiOlqtczrUkXp46Q/GTaYk0LDqebQSFbyWpD299Xw=" }, "src/third_party/dawn/third_party/dxheaders": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -156,8 +161,8 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "ce91fc1d085136f9c7ddca684d1764689d49b337", - "hash": "sha256-SsxohjLb+uoN5cMXU5DJDrtF1QVk8EWK/qvTLxCleUI=" + "rev": "5fbd82847521cb2d584773facd56c2eb6a4df180", + "hash": "sha256-WTVOc2EVB/DJ4aDeB8XIF/ff6LSeEUMt2Xkvj5Hu4aU=" }, "src/third_party/highway/src": { "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", @@ -171,34 +176,29 @@ }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "673e61fc215b178a90c0e67858bbf162c8158993", - "hash": "sha256-8Dl6Aol33o2FYID3oIw9grB0jY9VJnnnhmiNdyycTlU=" + "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48", + "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "0dfd77492fdb0dcd06027c5842095e2e908adc90", - "hash": "sha256-jOTRgF2WxsX5P0LgUI9zdCc0+NcqSnO310aq15msThY=" + "rev": "657a441e5c1a818d4c10b7bafd431454e6614901", + "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE=" }, "src/third_party/cast_core/public/src": { "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "dcb3d2e87cebe20b6dda06d8b29abb9af27ca422", - "hash": "sha256-e8+rQhEU5+FfwjyEE1TM6emO0cUntuS4GN7y/BuC/U8=" + "rev": "f5ee589bdaea60418f670fa176be15ccb9a34942", + "hash": "sha256-yQxm1GMMne80bLl1P7OAN3bJLz1qRNAvou2/5MKp2ig=" }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "93e56257a5089dc49f1dfd1240c527f5fe1b237f", - "hash": "sha256-K5sOlXx72YmXlm7cc7jWf3lKmHcMdVHTwVueJo5CoHY=" + "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4", + "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=" }, - "src/third_party/chromium-variations": { - "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "270a25f8795caf0a798ebf5a7d69284e3d830d19", - "hash": "sha256-ZkETD+Pka5vItN70nhlGQelycFAEnb1Qfv9k2aDXZSE=" - }, "src/third_party/cld_3/src": { "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", @@ -216,8 +216,8 @@ }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "aaac07ee499895770c89163ce0920ef8bb41ed23", - "hash": "sha256-A86nAbKs7trVwwa1HFUNbV//6O1minvlHTpZR3vabrU=" + "rev": "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea", + "hash": "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -226,23 +226,23 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "b8d797a61689892adb182c9bec457c9bd24b26d2", - "hash": "sha256-44bD1nG7CRrvBcd9NbU4yksn7Ly9WYsWETXat/L3f0I=" + "rev": "62ab80355a8194e051bd1d93a5c09093c7645a32", + "hash": "sha256-pZi6GRu7OGL7jbN4FM2qDsLCsT6cM+RM0a7XtFZVSVE=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "bf8d1d3aaf469343576db89f81df26aeb16bd62b", - "hash": "sha256-XscXxoCUSVGsBCB8xymEsaLc4WgzZPXu6zkRbv8ZQZw=" + "rev": "ce46be2573328fa7b0fd1d23c04b63389f298122", + "hash": "sha256-Q0kdJdEmh+wbO5oeTp98OHKh9luz8u6PDztGToldZjk=" }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392", - "hash": "sha256-eWlHnSRfLFcd3OoyCTIFewDf0eC9KQowScQOnphgfg8=" + "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f", + "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "ad4e2fc82183b1463ac870818c28680bbc3de889", - "hash": "sha256-HS5O+r0GFe3Dfh+86JQlsEC+5Gcs1xmUkDyZ7qixqXw=" + "rev": "4a53cbe7a1270c91ec60903ee792de658453becb", + "hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -251,8 +251,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "4c38131a16803130b66266a912029504f2cf23cd", - "hash": "sha256-dOq8RJ/V8kulSMK0OUWzHruiwJSP3f/86ih5gk2MMWQ=" + "rev": "464c1d097891a1462ab28bf8bb763c1683883892", + "hash": "sha256-OJyfUyiR8PFSaWltx6Ig0RCB+LxPxrPtc0GUfu2dKrk=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -296,8 +296,8 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "5d4e649f740c675426fbe4cdaffc53ee2a4cb954", - "hash": "sha256-DxLHuzIvw7WIKKMCRBz4ne97j9DufoohXQZV6yZ5zfY=" + "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca", + "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA=" }, "src/third_party/freetype-testing/src": { "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", @@ -316,18 +316,18 @@ }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", - "rev": "bf387a71d7def4b48bf24c8e09d412dfb9962746", - "hash": "sha256-OcGUJxKEjeiYJgknpyb/KvDu76GMaddxWO0Lj7l9Eu8=" + "rev": "c542d619a8959415beda5a76fe89ffa2f83df886", + "hash": "sha256-sMqSHYs3lvuHXEov1K9xWRd8tUPG00QBJl6an0zrxwA=" }, "src/third_party/ink_stroke_modeler/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git", - "rev": "0999e4cf816b42c770d07916698bce943b873048", - "hash": "sha256-IQ+n+kHdEq8Q8/qaPGMvgD7cPN3zzaY8dbiokq6r/Vs=" + "rev": "f61f28792a00c9bdcb3489fec81d8fd0ca1cbaba", + "hash": "sha256-XMLW/m+Qx+RVgo1DeYggBLjUYg/M+2eHwgjVWrA/Erw=" }, "src/third_party/instrumented_libs": { "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git", - "rev": "3cc43119a29158bcde39d288a8def4b8ec49baf8", - "hash": "sha256-7w5wMcmPcKLS91buxyRdcgaQjbKGFdmrKClvYVO3iko=" + "rev": "69015643b3f68dbd438c010439c59adc52cac808", + "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=" }, "src/third_party/emoji-segmenter/src": { "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", @@ -346,8 +346,8 @@ }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "24a9e940d481f992ba852599c78bb2217362847b", - "hash": "sha256-oLknxClUh7l72ZAx7sxNDM6dUhMT0vUE2IdDjRLDKtk=" + "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58", + "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE=" }, "src/third_party/hunspell_dictionaries": { "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", @@ -376,8 +376,8 @@ }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "a32ca113e3b050693e4bb379525dfae519ebd0d9", - "hash": "sha256-eoV+g/QVzcI7PqDmAic5Ra9K/ba4IV1wXE4RFecuMuk=" + "rev": "c31f0c0e6df5725c6b03124b579c9cf815fd10f4", + "hash": "sha256-Dz7DqucOxr5HzLNOdGNOG4iMw66bkOj64qOvqeADTic=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -391,18 +391,18 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "99fcd816eeaa7da46688bc4b9f4f9e71be13c2e8", - "hash": "sha256-SOIvGkR3k7TAs9KFA3mFbBSq5h4eJghKo38IVioOK3U=" + "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be", + "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "a75457c637a365910508f3c2c2b986a701b03a2e", - "hash": "sha256-v3+Rj3jS/lCYZNjjAXB6zohdvM45PKayB43jX37ntsU=" + "rev": "02d0fad2c512380b7270d6e704c86521075d7d54", + "hash": "sha256-T9ibgp0glfY5EhwMiwlvXKZat0InDu7PoqE1H8/lS5A=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "45d6317a64aad3d5060b800db267f7cea3f27198", - "hash": "sha256-SmU+c9YveQ4N13bteuhtmo0uvySeCnmZYpC5NYiMJuo=" + "rev": "8acf9249344ea9ff9806d0d7f46e07640fddf550", + "hash": "sha256-qIIyCHay3vkE14GVCq77psm1OyuEYs4guAaQDlEwiMg=" }, "src/third_party/beto-core/src": { "url": "https://beto-core.googlesource.com/beto-core.git", @@ -414,15 +414,25 @@ "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=" }, + "src/third_party/jetstream/main": { + "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", + "rev": "0260caf74b5c115507ee0adb6d9cdf6aefb0965f", + "hash": "sha256-DbRup4tOAYv27plzB2JKi2DBX2FVMDtFR7AzuovXUDU=" + }, + "src/third_party/jetstream/v2.2": { + "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", + "rev": "2145cedef4ca2777b792cb0059d3400ee2a6153c", + "hash": "sha256-zucA2tqNOsvjhwYQKZ5bFUC73ZF/Fu7KpBflSelvixw=" + }, "src/third_party/speedometer/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "d6b5ffea959ad31e231c203d7446bf8b39e987ce", - "hash": "sha256-lCwGk4Q+OXwO8vOlOQrkgygYqLrwpku/PkR03oEdX3Y=" + "rev": "c760d160caa05792d3ed7650e85861c9f9462506", + "hash": "sha256-/nAK2uLjpPem37XCHHx3LGZEpvL/7w4Uw5bVpQ4C6ms=" }, "src/third_party/speedometer/v3.1": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "cc9ee085ae18f05961ff3dfa1ee1a90d67b7f8ee", - "hash": "sha256-28vGPZLaD9xSwursTRRK1xndedeBUZ5TF/4hdy0RjFc=" + "rev": "1386415be8fef2f6b6bbdbe1828872471c5d802a", + "hash": "sha256-G89mrrgRaANT1vqzhKPQKemHbz56YwR+oku7rlRoCHw=" }, "src/third_party/speedometer/v3.0": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", @@ -466,8 +476,8 @@ }, "src/third_party/libjpeg_turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6", - "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=" + "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad", + "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=" }, "src/third_party/liblouis/src": { "url": "https://chromium.googlesource.com/external/liblouis-github.git", @@ -501,13 +511,13 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "2bfb9f9e0a9cca18cd5a0045e931b49dac390c79", - "hash": "sha256-BWid6iU7CDEElh8j13a+S767vwnO8qQg26Vp5nQGEHc=" + "rev": "027bbee30a0103b99d86327b48d29567fed11688", + "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", - "rev": "b4f01ea3ed6fd00923caa383bb2cf6f7a0b7f633", - "hash": "sha256-yQ5MIUKtuWQM5SfD74vPeqGEdLJNss2/RBUZfq5701A=" + "rev": "e79a98159fdf6d1aa37b3500e32c6410a2cbe268", + "hash": "sha256-t7An0vYzukel0poLaU4t2k78k3tTR5didbcV47cGWxQ=" }, "src/third_party/libwebp/src": { "url": "https://chromium.googlesource.com/webm/libwebp.git", @@ -521,8 +531,8 @@ }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", - "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=" + "rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0", + "hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=" }, "src/third_party/material_color_utilities/src": { "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", @@ -536,8 +546,8 @@ }, "src/third_party/nasm": { "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "f477acb1049f5e043904b87b825c5915084a9a29", - "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=" + "rev": "767a169c8811b090df222a458b25dfa137fc637e", + "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU=" }, "src/third_party/neon_2_sse/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", @@ -551,8 +561,8 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "b756f3c04ba53983a94cd12eb29b7f22e472fd58", - "hash": "sha256-P6vAoVF1/geM6MjihcEBQtbf8CxE8sPSKTRLz8/c2yE=" + "rev": "db9e1ea566813606ca055868be13f6ff4a760ab8", + "hash": "sha256-K/frmCf3JMvPVZc6ZKPFAQrq4Pz4io3XBvADS0O5u78=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", @@ -566,23 +576,23 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "9afffebfa895ea6cdcc05516908c50bd7fe72797", - "hash": "sha256-89rJdhwUJtJCMO7FvVoTYO80swFRkoWUB/ZYs1tOLzE=" + "rev": "ca83e69429af8f0bfa34b22dc54f538b9eebf5c5", + "hash": "sha256-6gsur+fx546YJn/PUOOthuj+XrSIruVUeAYl4nRI6xM=" }, "src/third_party/perfetto": { - "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "aa4d8267bafad6782a1f2c8d979104f2aaa622a0", - "hash": "sha256-smVQykQVZdhybEUz7BlRLc+FVNH0UyGh+0eSxP8Jzrc=" + "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", + "rev": "054635b91453895720951f7329619d003a98b3e4", + "hash": "sha256-2jKRhHLitR0m2a4/asvVvTqAOhUlyLsBBSjpQAer4GA=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", - "rev": "426b2e025aa59c23a1b6e19fbacd6b4a11bfad16", - "hash": "sha256-5uieIE6ygM4Ooz9xbu1NVKCHHsPn6Ekz6OzqfWiA7/M=" + "rev": "eb785a9363664a402b6336dfe96aad27fb33ffa8", + "hash": "sha256-zq86SrDASl6aYPFPijRZp03hJqXUFz2Al/KkiNq7i0M=" }, "src/third_party/pthreadpool/src": { "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git", - "rev": "f94ab76fe99754960035d520dce28e15b647e8cf", - "hash": "sha256-NdKKMnXZ6rYOC2wA6a1bPNStxpemzGckN6PPWom6mFA=" + "rev": "4e1831c02c74334a35ead03362f3342b6cea2a86", + "hash": "sha256-mB1QaAuY8vfv8FasPyio1AF75iYH+dM8t1GIr0Ty/+g=" }, "src/third_party/pyelftools": { "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", @@ -591,8 +601,8 @@ }, "src/third_party/quic_trace/src": { "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "413da873d93a03d3662f24b881ea459a79f9c589", - "hash": "sha256-N1uFoNd3mz/LH1z06581Ds7BUyc67SNXUPzqomYREr8=" + "rev": "ed3deb8a056b260c59f2fd42af6dfa3db48a8cad", + "hash": "sha256-vbXqddDgwqetU0bDYn3qo7OBqT5eG926/MbA1hKkCT0=" }, "src/third_party/pywebsocket3/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", @@ -611,13 +621,13 @@ }, "src/third_party/search_engines_data/resources": { "url": "https://chromium.googlesource.com/external/search_engines_data.git", - "rev": "48ba13bfb5488755a5d72aa60ff4a47069be498f", - "hash": "sha256-//z0HlMOkGTcp1IjbS0m+0dmgVYsG7EkfCiK2vvG2wU=" + "rev": "07834ba1e5ebfb333d0b73556b7c4d62a53cb455", + "hash": "sha256-DTz351NpoygQLESm/z+fzFc/KGJyQelLnWpzNMmNT9o=" }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "b99f146a03d3c98049768fd91c2bbe6594b02b2c", - "hash": "sha256-tl1GDmcStkuKMmzzsYuRG6Nrk4xDqgYYBoa1VsQNOwY=" + "rev": "bcce46ca33b67cc302dd53927a63013b8f53bf73", + "hash": "sha256-ei95CJRfNPrsYt8XcDi7Pnl5dGiJu3qs7R4rAcZ24Uc=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -631,13 +641,13 @@ }, "src/third_party/sqlite/src": { "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "567495a62a62dc013888500526e82837d727fe01", - "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=" + "rev": "8a22b25ad7244abaf07e372cc6dc97e041d663a9", + "hash": "sha256-1vAGAF3idxgHGaqb5gT5k3KIGC2H3gqC3RTVU2ZRf4A=" }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "c12c13839d689f411911326b1f72e96eb525686c", - "hash": "sha256-C8y5ShwMffNZpFuILYNw3WOMVJp/jPen/wNbFl1vqBY=" + "rev": "4982425ff1bdcb2ce52a360edde58a379119bfde", + "hash": "sha256-QTGU9Dgc6rgMeFZvhZyYeYj5W+ClJO8Yfa4+K7TmEec=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -646,18 +656,18 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "d120e39920c0e61cc1227bc1abe50fd6ecd3ce66", - "hash": "sha256-9p0/tR3bPvCJn+6eofmQXKbyfzxfbeVexdvuHpn50wk=" + "rev": "c8ed430d092acd485f00e7a9d7a888a0857d0430", + "hash": "sha256-S5zkpQZdhRdnZRUrUfi5FCrF2XFe3y/adAWwfh1OQYE=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "c1c31f4d17a9e4b2af40d85c89d573eb43187e0d", - "hash": "sha256-uEsy4PBhO3EBJF6YdWj32GmMabgKWQJUeW3cWInAinE=" + "rev": "1648e664337ca19a4f8679cbb9547a5b4b926995", + "hash": "sha256-CI0X6zbRV/snGcQZOUKQFn8Zo6D6Out6nN027HGZaa8=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "8b822ee8ac2c3e52926820f46ad858532a895951", - "hash": "sha256-hPd5roeHOgMiz2VUx13bUsKKDSvgQAXRdk7wfdi6e48=" + "rev": "e57f993cff981c8c3ffd38967e030f04d13781a9", + "hash": "sha256-nr7pGPNPMbmL/XnL27M4m5in8qnCDcpNtVsxBAc7zms=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -666,38 +676,38 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "54a521dd130ae1b2f38fef79b09515702d135bdd", - "hash": "sha256-PScDq8HhQPFUs78N75QyL9oEykmjZmAhdxCAqQ0LJds=" + "rev": "8c88e0c4c94a21de825efccba5f99a862b049825", + "hash": "sha256-s0Pe7kg5syKhK8qEZH8b7UCDa87Xk32Lh95cQbpLdAc=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "f289d047f49fb60488301ec62bafab85573668cc", - "hash": "sha256-2Wv0dxVQ8NvuDRTcsXkH1GKmuA6lsIuwTl0j6kbTefo=" + "rev": "2e83ad7e6f2cc51f7eaff3ffeb10e34351b3c157", + "hash": "sha256-u4WDbWywua71yWB1cVIt1IDZRe4NnT5bUq3yHLKBgPo=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "952f776f6573aafbb62ea717d871cd1d6816c387", - "hash": "sha256-LfJ7um+rzc4HdkJerHWkuPWeEc7ZFSBafbP+svAjklk=" + "rev": "78c359741d855213e8685278eb81bb62599f8e56", + "hash": "sha256-VqKQeJd81feSgYnYLqb2sYirCmnHN9Rr19/4cPZ2TzE=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "809941a4ca137df69dc9c6e8eb456bd70309197c", - "hash": "sha256-FPXAofnMfgUkwwRGh8rqtXrmLjouP5A8umXV1pHm1ck=" + "rev": "723d6b4aa35853315c6e021ec86388b3a2559fae", + "hash": "sha256-tDW5ed6gsDKlCKf4gT8MNi1yaafocUTohL1upGKB+Cc=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "fb8f5a5d69f4590ff1f5ecacb5e3957b6d11daee", - "hash": "sha256-fO6fkWOMYbf/um7gKFyjtrFE21g1kYx3lLvPv4gY7qw=" + "rev": "289efccc7560f2b970e2b4e0f50349da87669311", + "hash": "sha256-Cw7LWBPRbDVlfmeMM4CYEC9xbfqT1wV7yuUcpGMLahs=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "2d8f273ebd4b843c402d9ee881616895b854e42f", - "hash": "sha256-nD/WTBTwCnfZdwdNKldDVpcuirSghCIeJRBeX+uQXBk=" + "rev": "0d5b49b80f17bca25e7f9321ad4e671a56f70887", + "hash": "sha256-NdvjtdCrNVKY23B4YDL33KB+/9HsSWTVolZJOto8+pc=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "4e7b0c905b1a0401e24333800937cc8792efa037", - "hash": "sha256-CCpfWpyGki9klgHInjs6gAhw5shPXlzmFgccCHNfGQY=" + "rev": "73d7d74bc979c8a16c823c4eae4ee881153e000a", + "hash": "sha256-2GII+RBRzPZTTib82srUEFDG+CbtPTZ6lX3oDJBC2gU=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", @@ -706,8 +716,8 @@ }, "src/third_party/wasm_tts_engine/src": { "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine", - "rev": "6ab3e63276a2d66ba3e7db4f87c5b7cb00e22130", - "hash": "sha256-ZcnKKnHsN1UyztAXClc2EUwfeX3yuLtMM2Zjwpnh62U=" + "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125", + "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM=" }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", @@ -736,23 +746,23 @@ }, "src/third_party/webgl/src": { "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", - "rev": "450cceb587613ac1469c5a131fac15935c99e0e7", - "hash": "sha256-32r3BdmsNA89mo0k+vK1G3718AOjseE7cJlopZ/0pSw=" + "rev": "c01b768bce4a143e152c1870b6ba99ea6267d2b0", + "hash": "sha256-mSketnpcDtz3NnhPkXMpMpq8MWcFiSviJbK6h06fcnw=" }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "dcfb0d153f1e19905b0af26e640470c9ec5578e7", - "hash": "sha256-726p6OfKAzHtnjz/8WtMcsRxuq4wqyJv3+DHOHDTeYY=" + "rev": "92f4eb4dae0f5439f2cdc7ce467d66b10e165f42", + "hash": "sha256-vXyp0+6eyKOzzQbkRa8f8dO+B9cyUCY2hCZEFc7+7lU=" }, "src/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "d812e180206934eb3b7ae411d82d61bc21c22f70", - "hash": "sha256-KAkkFVxEfQxbSjD+55LO4UZYWWwmGK6B9ENFSPljNu0=" + "rev": "2c5049abfc2cf36ece82f7f84ebdcb786659eaf7", + "hash": "sha256-lMqCZ27TJ4aXKWDuN22VtceXh0jNH4Ll1234xCbEOro=" }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "04413d62f754a7b1a3a2d8c3df23bcde040112b2", - "hash": "sha256-sFoBgpPeMJQNSjNp8dDEUlB/7lJUpIXTpu0eRq94cGk=" + "rev": "2c8f5be6924d507ee74191b1aeadcec07f747f21", + "hash": "sha256-cNONf88oSbsdYuSdPiLxgTI973qOP6fb1OKb2WMQMMg=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -771,8 +781,8 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "7702e723fa25102db8b633ead4e3c221a5121487", - "hash": "sha256-n3FxY4HESzNyccQLENbuisU29v79c2x+7fYOsUrQnFg=" + "rev": "d6fc3be20b0d3e3742157fa26c5359babaa8bc8b", + "hash": "sha256-p5DjGNH9IR0KPWSFmbsdt2PU+kHgWRAnBw7J9sLV/S8=" }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", @@ -781,33 +791,33 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "e2591684c45463aa1e46ebefc3fd35deee63f37c", - "hash": "sha256-tbGzFdqmkoSiVGk1WMRroWC3NR5GaHRuMwGzPhVodxk=" + "rev": "5297e56d91816747d539abca52b578e5832135f0", + "hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go=" } } }, "ungoogled-chromium": { - "version": "134.0.6998.165", + "version": "136.0.7103.113", "deps": { "depot_tools": { - "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688", - "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk=" + "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f", + "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=" }, "gn": { - "rev": "ed1abc107815210dc66ec439542bee2f6cbabc00", - "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U=" + "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444", + "hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg=" }, "ungoogled-patches": { - "rev": "134.0.6998.165-1", - "hash": "sha256-Uia8tI3ZpryD+YVV9duH6sAmB/gKvsFg9RZVKYo/HX0=" + "rev": "136.0.7103.113-1", + "hash": "sha256-+xQvBkwza1QLwWgijoMnih2k2v0I7cBiAjxOeqMf6A0=" }, - "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=" + "npmHash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "fd886e2cb29dd984c13deec032832dee68d8abe3", - "hash": "sha256-xD06hGSrccTGB6fUGw0b7RrGNBQjNmdGKPaRqhXVVOY=", + "rev": "76fa3c1782406c63308c70b54f228fd39c7aaa71", + "hash": "sha256-U6WsxmGf4eFKVBBgppoHIfMlrT34a1oymZETzEhzkQA=", "recompress": true }, "src/third_party/clang-format/script": { @@ -815,25 +825,30 @@ "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2", "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=" }, + "src/third_party/compiler-rt/src": { + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git", + "rev": "bc2b30185219a2defe3c8a3b45f95a11386a7f6f", + "hash": "sha256-bfDMglQaiExTFwaVBroia+6G+9AHEVy5cQGocaEVOgA=" + }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434", - "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U=" + "rev": "449310fe2e37834a7e62972d2a690cade2ef596b", + "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "634228a732a1d9ae1a6d459556e8fc58707cf961", - "hash": "sha256-ln/DCNYJXVksbwdDBnxCfc4VwtjQlJXF7ktl/NxLupg=" + "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d", + "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g=" }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee", - "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY=" + "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874", + "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "6d0c8ee02e2fd44e69ac30e721e13be463035ee5", - "hash": "sha256-bF4hV9fY0GLYAHUnxSXkCxdZLMKR3wYWaqYJaM9aQiE=" + "rev": "97989c1bfa112c81f6499487fedc661dcf6d3b2e", + "hash": "sha256-9Ieaxe0PFIIP4RttODd8pTw/zVjQZGZtaYSybwnzTz0=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -852,8 +867,8 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "600fc3a0b121d5007b4bb97b001e756625e6d418", - "hash": "sha256-f3Tdz0ykxQ2FHbNweJwPdAZHA8eVpjPuxqRpxwhYtRM=" + "rev": "929dd3e6d02aac1f46653d03b2a644e2873a3bbb", + "hash": "sha256-lY4P2f90/9JwCpxuBFjim7KygczM8zMDQVUaEYaQjnA=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", @@ -862,8 +877,8 @@ }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "e7d001c82ee5bead5140481671828d5e156a525a", - "hash": "sha256-5YFqWgkyQ/PUKTkk1j3mAFD8JMbI+E4XRdSq34HFMWA=" + "rev": "5077431b183c43f10890b865fc9f02a4dcf1dd85", + "hash": "sha256-CLvZTBvtTdOpC8eWUTWkb0ITJ5EViPmc6d5O8cTaKY8=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -877,13 +892,13 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "914c97c116e09ef01a99fbbbe9cd28cda56552c7", - "hash": "sha256-Y4eX8YHwVXiXW4U8KGbFd4fTU/v/EAUpfwv6lB127Y4=" + "rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e", + "hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", - "rev": "cb550a25c75a99ae0def91a02e16ae29d73e6d1e", - "hash": "sha256-kqBpWHCxUl1ekmrbdPn6cL2y75nK4FxECJ5mo83Zgf4=" + "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8", + "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw=" }, "src/third_party/angle/third_party/rapidjson/src": { "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", @@ -892,13 +907,13 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "48e7f3020f52ef9adc31aa0f5db01dc42cc487cd", - "hash": "sha256-g59uC7feByGR1Ema8LqUCr5XWKpDMeXXvlS2thOo5Ks=" + "rev": "b6bb4bab7b4a36bc95566e00cb8f01051089afc3", + "hash": "sha256-L2ewIW6C+PTftbbXf+nlWcFD0y4naBNg7FLXMMxiWac=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "2e328dd4eace9648adcc943cac6a1792b5dcdec5", - "hash": "sha256-mh4s57NonFQzWNaPiKfe9kW4Ow7XAN+hW6Xpvgjvb0w=" + "rev": "d708a2602a5947ee068f784daa1594a673d47c4a", + "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM=" }, "src/third_party/content_analysis_sdk/src": { "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", @@ -907,13 +922,13 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "42b2b24fb8819f1ed3643aa9cf2a62f03868e3aa", - "hash": "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g=" + "rev": "8d956180934f16244bdb58b39175824775125e55", + "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "7056f50fdefc6bc46aa442e720d0336e2855b570", - "hash": "sha256-aYlcplXSGjFov9dqql6d+a1PxJWtZJNQaaezof0u9QQ=" + "rev": "1cffe7ec763900d104e4df62bc96d93f572157cb", + "hash": "sha256-VK+5saAJlZOluMAYKTKwNcnZALsCYkzgVfQHylt3584=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -922,8 +937,8 @@ }, "src/third_party/dawn/third_party/dxc": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "c2ed9ad4ee775f3de903ce757c994aecc59a5306", - "hash": "sha256-jecGwARtdSr2OEC68749mpFUAHuYP/IzYUZyj23CwJE=" + "rev": "206b77577d15fc5798eb7ad52290388539b7146d", + "hash": "sha256-WXgiOlqtczrUkXp46Q/GTaYk0LDqebQSFbyWpD299Xw=" }, "src/third_party/dawn/third_party/dxheaders": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -942,8 +957,8 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "24d5dfa7725d6ece31941c3f3343ba6362986d6b", - "hash": "sha256-AEGYE2rSsPcRzJSm97DGsrPVbhCH+lyVI61Z4qavKc8=" + "rev": "5fbd82847521cb2d584773facd56c2eb6a4df180", + "hash": "sha256-WTVOc2EVB/DJ4aDeB8XIF/ff6LSeEUMt2Xkvj5Hu4aU=" }, "src/third_party/highway/src": { "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", @@ -957,34 +972,29 @@ }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "ea42fe28775844ec8fe0444fc421398be42d51fe", - "hash": "sha256-g9i5v11uZy/3Smn8zSCFmC27Gdp5VP2b0ROrj+VmP1k=" + "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48", + "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "0dfd77492fdb0dcd06027c5842095e2e908adc90", - "hash": "sha256-jOTRgF2WxsX5P0LgUI9zdCc0+NcqSnO310aq15msThY=" + "rev": "657a441e5c1a818d4c10b7bafd431454e6614901", + "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE=" }, "src/third_party/cast_core/public/src": { "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05", - "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c=" + "rev": "f5ee589bdaea60418f670fa176be15ccb9a34942", + "hash": "sha256-yQxm1GMMne80bLl1P7OAN3bJLz1qRNAvou2/5MKp2ig=" }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "d5166861902b565df446e15181eba270fe168275", - "hash": "sha256-xkvz743+w0xsI0w4reAo2rfC4J7opl1biA3eNYuRn+o=" + "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4", + "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=" }, - "src/third_party/chromium-variations": { - "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "84c18c7a0205fbd0a27b0214b16ded7fc44dc062", - "hash": "sha256-zXAmoKyj104BaIe4Rug18WbVKkyAsyWPCTPPEerinVo=" - }, "src/third_party/cld_3/src": { "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", @@ -1002,8 +1012,8 @@ }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6", - "hash": "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo=" + "rev": "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea", + "hash": "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -1012,23 +1022,23 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "ea21b22629965105426f3df5e58190513e95a17e", - "hash": "sha256-xUaGf4MaEXg2RHgrGS1Uuz97vq5Vbt4HFV/AXYB4lCA=" + "rev": "62ab80355a8194e051bd1d93a5c09093c7645a32", + "hash": "sha256-pZi6GRu7OGL7jbN4FM2qDsLCsT6cM+RM0a7XtFZVSVE=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "0391f0d11cbf3cf3c5bcf82e19e9d9839b1936ed", - "hash": "sha256-EL+lOTe1Vzg4JW2q7t3UoXzHHiEmLjf7khH9fXdplbo=" + "rev": "ce46be2573328fa7b0fd1d23c04b63389f298122", + "hash": "sha256-Q0kdJdEmh+wbO5oeTp98OHKh9luz8u6PDztGToldZjk=" }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688", - "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk=" + "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f", + "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "65b3f414b81ffe4df49202af6fc75bc26a3cb109", - "hash": "sha256-rdBpJWdQ5VtFnIfbr/Vq1q1euSvkbY8iIqyuTMAS2KM=" + "rev": "4a53cbe7a1270c91ec60903ee792de658453becb", + "hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1037,8 +1047,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "2a35a917be47766a895be610bedd66006980b7e6", - "hash": "sha256-WG7uiduuMnXrvEpXJNGksrYkBsim+l7eiu5N+mx0Yr0=" + "rev": "464c1d097891a1462ab28bf8bb763c1683883892", + "hash": "sha256-OJyfUyiR8PFSaWltx6Ig0RCB+LxPxrPtc0GUfu2dKrk=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -1052,8 +1062,8 @@ }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c", - "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ=" + "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6", + "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", @@ -1080,15 +1090,10 @@ "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=" }, - "src/third_party/grpc/src": { - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", - "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b", - "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg=" - }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "b1f47850878d232eea372ab167e760ccac4c4e32", - "hash": "sha256-YxWz3O9see1dktqZnC551V12yU5jcOERTB1Hn1lwUNM=" + "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca", + "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA=" }, "src/third_party/freetype-testing/src": { "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", @@ -1102,23 +1107,23 @@ }, "src/third_party/harfbuzz-ng/src": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "6d8035a99c279e32183ad063f0de201ef1b2f05c", - "hash": "sha256-isQvwaVdL4cM465A8Gs06VioAu8RvZFrwXDsXhfOoFo=" + "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce", + "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw=" }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", - "rev": "bf387a71d7def4b48bf24c8e09d412dfb9962746", - "hash": "sha256-OcGUJxKEjeiYJgknpyb/KvDu76GMaddxWO0Lj7l9Eu8=" + "rev": "c542d619a8959415beda5a76fe89ffa2f83df886", + "hash": "sha256-sMqSHYs3lvuHXEov1K9xWRd8tUPG00QBJl6an0zrxwA=" }, "src/third_party/ink_stroke_modeler/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git", - "rev": "0999e4cf816b42c770d07916698bce943b873048", - "hash": "sha256-IQ+n+kHdEq8Q8/qaPGMvgD7cPN3zzaY8dbiokq6r/Vs=" + "rev": "f61f28792a00c9bdcb3489fec81d8fd0ca1cbaba", + "hash": "sha256-XMLW/m+Qx+RVgo1DeYggBLjUYg/M+2eHwgjVWrA/Erw=" }, "src/third_party/instrumented_libs": { "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git", - "rev": "3cc43119a29158bcde39d288a8def4b8ec49baf8", - "hash": "sha256-7w5wMcmPcKLS91buxyRdcgaQjbKGFdmrKClvYVO3iko=" + "rev": "69015643b3f68dbd438c010439c59adc52cac808", + "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=" }, "src/third_party/emoji-segmenter/src": { "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", @@ -1137,8 +1142,8 @@ }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "e235eb34c6c4fed790ccdad4b16394301360dcd4", - "hash": "sha256-jpXIcz5Uy6fDEvxTq8rTFx/M+0+SQ6TCDaqnp7nMtng=" + "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58", + "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE=" }, "src/third_party/hunspell_dictionaries": { "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", @@ -1167,8 +1172,8 @@ }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "44ac6c2594a880edbb9cb1e4e197c2b53d078130", - "hash": "sha256-AKXKxXqOMUb3APf5r15NmIMyhJ4ZmW5+t7y5XdgdZkw=" + "rev": "c31f0c0e6df5725c6b03124b579c9cf815fd10f4", + "hash": "sha256-Dz7DqucOxr5HzLNOdGNOG4iMw66bkOj64qOvqeADTic=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -1182,18 +1187,18 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "3990233fc06a35944d6d33797e63931802122a95", - "hash": "sha256-4NOQug0MlWZ18527V3IDuGcxGEJ4b+mZZbdzugWoBgQ=" + "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be", + "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "c5938b119ef52f9ff628436c1e66c9a5322ece83", - "hash": "sha256-+6339vcd0KJj5V11dvJvs0YpQpTxsLmDuBoYVzyn9Ec=" + "rev": "02d0fad2c512380b7270d6e704c86521075d7d54", + "hash": "sha256-T9ibgp0glfY5EhwMiwlvXKZat0InDu7PoqE1H8/lS5A=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "97690c6996f683a6f3e07d75fc4557958c55ac7b", - "hash": "sha256-d1D9/6d7a1+27nD8VijhzRMglE2PqvAMK8+GbMeesSQ=" + "rev": "8acf9249344ea9ff9806d0d7f46e07640fddf550", + "hash": "sha256-qIIyCHay3vkE14GVCq77psm1OyuEYs4guAaQDlEwiMg=" }, "src/third_party/beto-core/src": { "url": "https://beto-core.googlesource.com/beto-core.git", @@ -1205,26 +1210,41 @@ "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=" }, + "src/third_party/jetstream/main": { + "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", + "rev": "0260caf74b5c115507ee0adb6d9cdf6aefb0965f", + "hash": "sha256-DbRup4tOAYv27plzB2JKi2DBX2FVMDtFR7AzuovXUDU=" + }, + "src/third_party/jetstream/v2.2": { + "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", + "rev": "2145cedef4ca2777b792cb0059d3400ee2a6153c", + "hash": "sha256-zucA2tqNOsvjhwYQKZ5bFUC73ZF/Fu7KpBflSelvixw=" + }, "src/third_party/speedometer/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "d6b5ffea959ad31e231c203d7446bf8b39e987ce", - "hash": "sha256-lCwGk4Q+OXwO8vOlOQrkgygYqLrwpku/PkR03oEdX3Y=" + "rev": "c760d160caa05792d3ed7650e85861c9f9462506", + "hash": "sha256-/nAK2uLjpPem37XCHHx3LGZEpvL/7w4Uw5bVpQ4C6ms=" + }, + "src/third_party/speedometer/v3.1": { + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", + "rev": "1386415be8fef2f6b6bbdbe1828872471c5d802a", + "hash": "sha256-G89mrrgRaANT1vqzhKPQKemHbz56YwR+oku7rlRoCHw=" }, "src/third_party/speedometer/v3.0": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=" }, - "src/third_party/speedometer/v2.0": { - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "732af0dfe867f8815e662ac637357e55f285dbbb", - "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=" - }, "src/third_party/speedometer/v2.1": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", "rev": "8bf7946e39e47c875c00767177197aea5727e84a", "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=" }, + "src/third_party/speedometer/v2.0": { + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", + "rev": "732af0dfe867f8815e662ac637357e55f285dbbb", + "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=" + }, "src/third_party/ukey2/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", @@ -1232,8 +1252,8 @@ }, "src/third_party/cros-components/src": { "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "1f1c782f06956a2deb5d33f09c466e4852099c71", - "hash": "sha256-80WqSMP5Vlc4OY+gfpU3SRGavs7fJbTQVW1AIhq6jmE=" + "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a", + "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM=" }, "src/third_party/libdrm/src": { "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", @@ -1252,8 +1272,8 @@ }, "src/third_party/libjpeg_turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6", - "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=" + "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad", + "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=" }, "src/third_party/liblouis/src": { "url": "https://chromium.googlesource.com/external/liblouis-github.git", @@ -1267,8 +1287,8 @@ }, "src/third_party/libprotobuf-mutator/src": { "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", - "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=" + "rev": "7bf98f78a30b067e22420ff699348f084f802e12", + "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE=" }, "src/third_party/libsrtp": { "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", @@ -1287,13 +1307,13 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "7b3fa8114cf8ef23cbf91e50c368c1ca768d95d5", - "hash": "sha256-2FgBb0HzgMihGsWbEtQqyN2EXZs/y5+ToWL1ZXG35W0=" + "rev": "027bbee30a0103b99d86327b48d29567fed11688", + "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", - "rev": "b4f01ea3ed6fd00923caa383bb2cf6f7a0b7f633", - "hash": "sha256-yQ5MIUKtuWQM5SfD74vPeqGEdLJNss2/RBUZfq5701A=" + "rev": "e79a98159fdf6d1aa37b3500e32c6410a2cbe268", + "hash": "sha256-t7An0vYzukel0poLaU4t2k78k3tTR5didbcV47cGWxQ=" }, "src/third_party/libwebp/src": { "url": "https://chromium.googlesource.com/webm/libwebp.git", @@ -1302,13 +1322,13 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "5a9a6ea936085310f3b9fbd4a774868e6a984ec4", - "hash": "sha256-E5ePVHrEXMM8mS1qaUwPTqYO0BdP7TYuUhfX+BCiq/0=" + "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad", + "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", - "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=" + "rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0", + "hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=" }, "src/third_party/material_color_utilities/src": { "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", @@ -1322,8 +1342,8 @@ }, "src/third_party/nasm": { "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "f477acb1049f5e043904b87b825c5915084a9a29", - "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=" + "rev": "767a169c8811b090df222a458b25dfa137fc637e", + "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU=" }, "src/third_party/neon_2_sse/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", @@ -1332,18 +1352,18 @@ }, "src/third_party/openh264/src": { "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", - "rev": "33f7f48613258446decb33b3575fc0a3c9ed14e3", - "hash": "sha256-lZlZjX8GCJOc77VJ9i1fSWn63pfVOEcwwlzh0UpIgy4=" + "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f", + "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=" }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "38d1445b41d1eb597fcd100688dbaff98aa072ed", - "hash": "sha256-KGVFyGp7ItKeapub3Bd+htXH/gMaaBd+k8iC7hLtvl0=" + "rev": "db9e1ea566813606ca055868be13f6ff4a760ab8", + "hash": "sha256-K/frmCf3JMvPVZc6ZKPFAQrq4Pz4io3XBvADS0O5u78=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", - "rev": "56013b77b6c0a650d00bde40e750e7c3b7c6bc3d", - "hash": "sha256-Dz7wMYQHVR7sjCGaQe2nxIxZsAxsK6GGDNpDvypPefo=" + "rev": "00459762409cb29cecf398a23cdb0cae918b7515", + "hash": "sha256-QXGJRGyyuN0EPDAF7CAzcTSbjHkz8FRjhqd1JEFF/1o=" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", @@ -1352,23 +1372,23 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "12f7715a6390050c5cffb7e4c9b2be1c2f2956d0", - "hash": "sha256-/u+HYjmxSIX2GlriEWYZQJ8TDFNfzSufATGq1j9zx9w=" + "rev": "ca83e69429af8f0bfa34b22dc54f538b9eebf5c5", + "hash": "sha256-6gsur+fx546YJn/PUOOthuj+XrSIruVUeAYl4nRI6xM=" }, "src/third_party/perfetto": { - "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "0d78d85c2bfb993ab8dd9a85b6fee6caa6a0f357", - "hash": "sha256-bjgSwq4LPz9qN9rVqIJUTHetRguCx67Uq5oe1ksPqGE=" + "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", + "rev": "054635b91453895720951f7329619d003a98b3e4", + "hash": "sha256-2jKRhHLitR0m2a4/asvVvTqAOhUlyLsBBSjpQAer4GA=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", - "rev": "e34549db516f8712f678fcd4bc411613b5cc5295", - "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=" + "rev": "eb785a9363664a402b6336dfe96aad27fb33ffa8", + "hash": "sha256-zq86SrDASl6aYPFPijRZp03hJqXUFz2Al/KkiNq7i0M=" }, "src/third_party/pthreadpool/src": { "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git", - "rev": "e1469417238e13eebaa001779fa031ed25c59def", - "hash": "sha256-cFRELaRtWspZaqtmdKmVPqM7HVskHlFMAny+Zv/Zflw=" + "rev": "4e1831c02c74334a35ead03362f3342b6cea2a86", + "hash": "sha256-mB1QaAuY8vfv8FasPyio1AF75iYH+dM8t1GIr0Ty/+g=" }, "src/third_party/pyelftools": { "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", @@ -1377,8 +1397,8 @@ }, "src/third_party/quic_trace/src": { "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "413da873d93a03d3662f24b881ea459a79f9c589", - "hash": "sha256-N1uFoNd3mz/LH1z06581Ds7BUyc67SNXUPzqomYREr8=" + "rev": "ed3deb8a056b260c59f2fd42af6dfa3db48a8cad", + "hash": "sha256-vbXqddDgwqetU0bDYn3qo7OBqT5eG926/MbA1hKkCT0=" }, "src/third_party/pywebsocket3/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", @@ -1387,8 +1407,8 @@ }, "src/third_party/re2/src": { "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca", - "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=" + "rev": "c84a140c93352cdabbfb547c531be34515b12228", + "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=" }, "src/third_party/ruy/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", @@ -1397,13 +1417,13 @@ }, "src/third_party/search_engines_data/resources": { "url": "https://chromium.googlesource.com/external/search_engines_data.git", - "rev": "6dc3b54b420e6e03a34ee7259fcd2b1978fac5f3", - "hash": "sha256-8RY3AU2V4iZKEmVwT7Z1Q3QlcTXDIdeyYwnQoyJcAUY=" + "rev": "07834ba1e5ebfb333d0b73556b7c4d62a53cb455", + "hash": "sha256-DTz351NpoygQLESm/z+fzFc/KGJyQelLnWpzNMmNT9o=" }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125", - "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw=" + "rev": "bcce46ca33b67cc302dd53927a63013b8f53bf73", + "hash": "sha256-ei95CJRfNPrsYt8XcDi7Pnl5dGiJu3qs7R4rAcZ24Uc=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1417,13 +1437,13 @@ }, "src/third_party/sqlite/src": { "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "567495a62a62dc013888500526e82837d727fe01", - "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=" + "rev": "8a22b25ad7244abaf07e372cc6dc97e041d663a9", + "hash": "sha256-1vAGAF3idxgHGaqb5gT5k3KIGC2H3gqC3RTVU2ZRf4A=" }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "86cf34f50cbe5a9f35da7eedad0f4d4127fb8342", - "hash": "sha256-PSkIU8zC+4AVcYu0vaYo6I1SSykrHgcgGVMBJanux8o=" + "rev": "4982425ff1bdcb2ce52a360edde58a379119bfde", + "hash": "sha256-QTGU9Dgc6rgMeFZvhZyYeYj5W+ClJO8Yfa4+K7TmEec=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -1432,18 +1452,18 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "51c6eed226abcfeeb46864e837d01563cc5b907b", - "hash": "sha256-qXHENS/6NwHAr1/16eb079XzmwAnpLtVZuva8uGCf+8=" + "rev": "c8ed430d092acd485f00e7a9d7a888a0857d0430", + "hash": "sha256-S5zkpQZdhRdnZRUrUfi5FCrF2XFe3y/adAWwfh1OQYE=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "2e4b45a53a0e2e66bcb6540ae384c53a517218d0", - "hash": "sha256-9ebWETg/fsS4MYZg74XHs/Nz3nX6BXBNVRN2PmyWXWM=" + "rev": "1648e664337ca19a4f8679cbb9547a5b4b926995", + "hash": "sha256-CI0X6zbRV/snGcQZOUKQFn8Zo6D6Out6nN027HGZaa8=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "0549c7127c2fbab2904892c9d6ff491fa1e93751", - "hash": "sha256-LwspMo771iaV5YeEJWgdb8xi37KMa0rsSdvO3uqMOAI=" + "rev": "e57f993cff981c8c3ffd38967e030f04d13781a9", + "hash": "sha256-nr7pGPNPMbmL/XnL27M4m5in8qnCDcpNtVsxBAc7zms=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -1452,38 +1472,38 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "e7294a8ebed84f8c5bd3686c68dbe12a4e65b644", - "hash": "sha256-/p7kBW7mwpG/Uz0goMM7L3zjpOMBzGiuN+0ZBEOpORo=" + "rev": "8c88e0c4c94a21de825efccba5f99a862b049825", + "hash": "sha256-s0Pe7kg5syKhK8qEZH8b7UCDa87Xk32Lh95cQbpLdAc=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "ce37fd67f83cd1e8793b988d2e4126bbf72b19dd", - "hash": "sha256-SJcxmKdzOjg6lOJk/3m8qo7puvtci1YEU6dXKjthx0Q=" + "rev": "2e83ad7e6f2cc51f7eaff3ffeb10e34351b3c157", + "hash": "sha256-u4WDbWywua71yWB1cVIt1IDZRe4NnT5bUq3yHLKBgPo=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "39f924b810e561fd86b2558b6711ca68d4363f68", - "hash": "sha256-twJJVBfnZbH/8Wn273h45K3BOnlAicqL2zJl6OfLm2E=" + "rev": "78c359741d855213e8685278eb81bb62599f8e56", + "hash": "sha256-VqKQeJd81feSgYnYLqb2sYirCmnHN9Rr19/4cPZ2TzE=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "0508dee4ff864f5034ae6b7f68d34cb2822b827d", - "hash": "sha256-QqFC3Iyhw9Pq6TwBHxa0Ss7SW0bHo0Uz5N18oxl2ROg=" + "rev": "723d6b4aa35853315c6e021ec86388b3a2559fae", + "hash": "sha256-tDW5ed6gsDKlCKf4gT8MNi1yaafocUTohL1upGKB+Cc=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "c52931f012cb7b48e42bbf2050a7fb2183b76406", - "hash": "sha256-nIzrishMMxWzOuD3aX8B6Iuq2kPsUF0Uuvz7GijTulY=" + "rev": "289efccc7560f2b970e2b4e0f50349da87669311", + "hash": "sha256-Cw7LWBPRbDVlfmeMM4CYEC9xbfqT1wV7yuUcpGMLahs=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "fe7a09b13899c5c77d956fa310286f7a7eb2c4ed", - "hash": "sha256-zI3y5aoP4QcYp677Oxj5Ef7lJyJwOMdGsaRBe+X9vpI=" + "rev": "0d5b49b80f17bca25e7f9321ad4e671a56f70887", + "hash": "sha256-NdvjtdCrNVKY23B4YDL33KB+/9HsSWTVolZJOto8+pc=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "a30aa23cfaff4f28f039c025c159128a6c336a7e", - "hash": "sha256-foa5hzqf1hPwOj3k57CloCe/j0qXW3zCQ4mwCT4epF4=" + "rev": "73d7d74bc979c8a16c823c4eae4ee881153e000a", + "hash": "sha256-2GII+RBRzPZTTib82srUEFDG+CbtPTZ6lX3oDJBC2gU=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", @@ -1492,8 +1512,8 @@ }, "src/third_party/wasm_tts_engine/src": { "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine", - "rev": "7a91dbfddd93afa096a69fb7d292e22d4afecad2", - "hash": "sha256-bV+1YFEtCyTeZujsZtZiexT/aUTN3MaVerR2UdkUPBY=" + "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125", + "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM=" }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", @@ -1522,23 +1542,23 @@ }, "src/third_party/webgl/src": { "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", - "rev": "450cceb587613ac1469c5a131fac15935c99e0e7", - "hash": "sha256-32r3BdmsNA89mo0k+vK1G3718AOjseE7cJlopZ/0pSw=" + "rev": "c01b768bce4a143e152c1870b6ba99ea6267d2b0", + "hash": "sha256-mSketnpcDtz3NnhPkXMpMpq8MWcFiSviJbK6h06fcnw=" }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "fb2b951ac3c23e453335edf35c9b3bad431d9009", - "hash": "sha256-tjY5ADd5tMFsYHk6xT+TXwsDYV5eI2oOywmyTjjAxYc=" + "rev": "92f4eb4dae0f5439f2cdc7ce467d66b10e165f42", + "hash": "sha256-vXyp0+6eyKOzzQbkRa8f8dO+B9cyUCY2hCZEFc7+7lU=" }, "src/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "d812e180206934eb3b7ae411d82d61bc21c22f70", - "hash": "sha256-KAkkFVxEfQxbSjD+55LO4UZYWWwmGK6B9ENFSPljNu0=" + "rev": "2c5049abfc2cf36ece82f7f84ebdcb786659eaf7", + "hash": "sha256-lMqCZ27TJ4aXKWDuN22VtceXh0jNH4Ll1234xCbEOro=" }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "8d78f5de6c27b2c793039989ea381f1428fb0100", - "hash": "sha256-IsjTrEnxIqINYYjWJmDp7rlubl5dJ2YMpJf/DrG/mRM=" + "rev": "2c8f5be6924d507ee74191b1aeadcec07f747f21", + "hash": "sha256-cNONf88oSbsdYuSdPiLxgTI973qOP6fb1OKb2WMQMMg=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1557,18 +1577,18 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "0824e2965f6edc2297e55c8dff5a8ac4cb12aaad", - "hash": "sha256-eb9B9lXPB2GiC4qehB/HOU36W1e9RZ0N2oEbIifyrHE=" + "rev": "d6fc3be20b0d3e3742157fa26c5359babaa8bc8b", + "hash": "sha256-p5DjGNH9IR0KPWSFmbsdt2PU+kHgWRAnBw7J9sLV/S8=" }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "ea0aa030cdf31f7897c5bfc153f0d36e92768095", - "hash": "sha256-UJsuaSzR4V8alLdtxzpla1v9WYHPKPp13YrgA4Y6/yA=" + "rev": "ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f", + "hash": "sha256-hDDNrUXGxG/o1oZnypAnuLyIeM16Hy6x1KacGu9Hhmw=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6", - "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8=" + "rev": "5297e56d91816747d539abca52b578e5832135f0", + "hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go=" } } } diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-adler2.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-adler2.patch deleted file mode 100644 index 3487954ec998..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-adler2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn -index 6b996aa1fe3865187d02c017e56c0918bcc9b8f4..68b085be200fa4f116aa709b9157c4d2efdf7d6a 100644 ---- a/build/rust/std/BUILD.gn -+++ b/build/rust/std/BUILD.gn -@@ -89,7 +89,7 @@ if (toolchain_has_rust) { - # These are no longer present in the Windows toolchain. - stdlib_files += [ - "addr2line", -- "adler2", -+ "adler", - "gimli", - "libc", - "memchr", diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-136-nodejs-assert-minimal-version-instead-of-exact-match.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-136-nodejs-assert-minimal-version-instead-of-exact-match.patch new file mode 100644 index 000000000000..879acac20469 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-136-nodejs-assert-minimal-version-instead-of-exact-match.patch @@ -0,0 +1,19 @@ +diff --git a/third_party/node/check_version.js b/third_party/node/check_version.js +index 0a037ab449c3b8780e68506993e6281d44cef7dc..e7cba2e457543eb8767c9868d851e5e4f5c32f2a 100644 +--- a/third_party/node/check_version.js ++++ b/third_party/node/check_version.js +@@ -29,11 +29,9 @@ async function main() { + const expectedVersion = extractExpectedVersion(contents); + + const errorMessage = +- `Failed NodeJS version check: Expected version '${expectedVersion}', ` + +- `but found '${process.version}'. Did you run 'gclient sync'? If the ` + +- `problem persists try running 'gclient sync -f' instead, or deleting ` + +- `third_party/node/{linux,win,mac} folders and trying again.`; ++ `Failed NodeJS version check: Expected at least version '${expectedVersion}', ` + ++ `but found '${process.version}'.`; + +- assert.equal(expectedVersion, process.version, errorMessage); ++ assert.ok(expectedVersion <= process.version, errorMessage); + } + main(); diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 7e7217eabe42..f3608e09d4a9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1859 +1,2477 @@ { - version = "137.0b10"; + version = "139.0b4"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ach/firefox-139.0b4.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "d0f0da12027c6e9b798fc8420785809ed5f7208984e585d791846d32ffd1c085"; + sha256 = "709fe8a024c4531f515eb01a6b267a56029a03166ac5d6de413019fe0a8ba45e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/af/firefox-139.0b4.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "6e4620ecb89169e9b1e60dd23969c7649d62d4cac614e7c6a83308402cb67f7a"; + sha256 = "a62c1d62f6e2dfce5225df31b215f1227c7eabb220dc12043c8a5ad4c8f417f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/an/firefox-139.0b4.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "fe2d385e510ee289d174c00349a6429b0b985fd0fabec111a50a58c59471b769"; + sha256 = "63cc13f04ea6f0c77a6855cfad11f4f6f35bdaa3d5fc06edcf030a8ffcad7a6e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ar/firefox-139.0b4.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f87eb7054f34a2c09409c68bfc27f69dda1d6ae01c16347edf3f44e86c9d9862"; + sha256 = "0298c9c247c673847b8154d19b35b7379345409dfb9a5d80f2a6239e972e7cdc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ast/firefox-139.0b4.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "356e3dab406a768b54ec641bfc32b30c503b9608e4b446218243cadc61863b3f"; + sha256 = "f48ab573fdad0eeb69b4c70a99e8cf7af87783f6698c591d01739ed3ea870723"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/az/firefox-139.0b4.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "fdf66de1bb5799d725377e9a2039deee49867f5d799a878db75812fe72c5cbe6"; + sha256 = "add78dfa402bf925f4834c4e0b698b5dbe01d99e1838de9c03272f819404b8d8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/be/firefox-139.0b4.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "4570956b5a82505ee705c4ee0615c98755a2e7e827e741a633387a452ff723f1"; + sha256 = "0500f7ce071b2867a712f32a830ae65a98cfd7b4beb28ea9623361affca11e62"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/bg/firefox-139.0b4.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "14e37e5a57af4ea698fb554e410c366821af7c26e007123fb66373e63641135f"; + sha256 = "a32e773d73f2a10cf17292c65f21e0e3fc1516dd4093111ddbe54d4fd553a26b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/bn/firefox-139.0b4.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "63b78127c286e955a9221a38390c31d9413f92c5c4894952282359cddc91c438"; + sha256 = "dc1386c1677b429980463325db93c9a96c1a4178bd2604adf3e943ae6a5890a1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/br/firefox-139.0b4.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2e63841530a8c265e81a1e34e43f279c34f4f13928a5592931172956db7ba6f5"; + sha256 = "26ec0871ac96b3ce28d7953d4ead1df0d2826b5c2650fe1db2af238753edfc9c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/bs/firefox-139.0b4.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "40c0bd4064c84d0197f2dfee5c77a4a5a0f6bd0eb5505c325091b23ee282174a"; + sha256 = "6a2ab79e63632932b673e7d22a98767b7e923094ead8ecd48511444b46be6dcc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ca-valencia/firefox-139.0b4.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "beba161453814dc95f53074b19218abecfda9bf2d1b4571e8cd1af4376be9b9e"; + sha256 = "fb19289c0f3d03d5f66467ad740d753f43e6fc2601f87d130209ec0c836fe718"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ca/firefox-139.0b4.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "148cfe273854edd64a0841f5a4eed8c08c4e06abaf0198d0617c1b840743fd1c"; + sha256 = "6380ca078dfec8f821f537a685b2b5f7b4ff9e328ef0a5acbf6257069c0b27e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/cak/firefox-139.0b4.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a3250d57ab8d434a71fa48054870df3934dede3ca87ab6227654daa2c478febb"; + sha256 = "4947e4d6c8433efa7379115eb0523f75ec3c00bcdfa8179f97ae97ef662bd8a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/cs/firefox-139.0b4.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a72f95cf2dd349a01769ba8b1f7c73c6553e9de9d406470e40563d302cb2f38e"; + sha256 = "49b157447c444099afa5177aa7179d98f71171fee8a89f0ce14c65fd9af58214"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/cy/firefox-139.0b4.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "a7fc2e0893d921ce6c6bb5d9fb47183b8ea14772cb31b9333bffd48ca7a79eb6"; + sha256 = "f440960100c6685444e6507a4e0f072871b410784967e2f00c04ef9427609a78"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/da/firefox-139.0b4.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "18cf5d0c1da42d49ce885e993a64b1fa39fb124f76627b3d389093efff9e429d"; + sha256 = "ea2cefb990e4bd8f283c45a14bbf7a5ca420b69542692d2bb86093c885a1f627"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/de/firefox-139.0b4.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "78ce80c62a025c6850bb362e026406043a246d99b33096e5449f67f09c19ed60"; + sha256 = "5bacffc6c87f049f865c2a6ad00e5d26a4b4ba879092902165db0a345daaf77e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/dsb/firefox-139.0b4.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b2a0c9b51715afae4e5f6014561abaf1022c9e5e1911e9e147760458542be365"; + sha256 = "f93de9c31f9d63d41fbe7635103500a81144888518bc8c2f698e39d4b0357028"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/el/firefox-139.0b4.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "9bf8a3fa1d05c46c377d7fecb9d1ae4857fa5ab19160f81c0921f5d3721d3baf"; + sha256 = "201f51c2f4f30618d8e9f614cf27b3e07e899f852504becdf46f6a15220309c7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/en-CA/firefox-139.0b4.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7c74368a8aeeac88ad4587428d6dd86de51fa1c4ecab76953e41aad9bb0ccabb"; + sha256 = "ef5403be996abf97e9c58c5ebcd0c74fe9a14122119c33266e30428a60c4c944"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/en-GB/firefox-139.0b4.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6b8f0732d30af5eda5fed8eda112d08fc5500a1c3e02117a22db967546107036"; + sha256 = "64b2ce817ac1cfb314a9f22456716f9e1e5d7893bf46fd6b55d203c718df6c9a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/en-US/firefox-139.0b4.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "319af71913886726333110cc2f365b39cdaa120d90938869985f8967e8f4f4af"; + sha256 = "21bfb99fe445e64ad8fb86822fd6d77c9c0d387530b787f3c3fc99b97723d664"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/eo/firefox-139.0b4.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "fcb0face5526bba1bad5fdf6fc7eba2bb96b7f5ab64df78674ed4c081c8f94a0"; + sha256 = "531b94cf1b0a20de877bbe1cc9e3ab3ae9b7dd8729586a70a43f04576909c99e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/es-AR/firefox-139.0b4.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "90b7fdcc676399b320e9a068d34e00959042286e3ebb40b709c9cde9b8dfbc72"; + sha256 = "f80d18dca3009011d97bb89726d9b09c548e239383412615c4a341537e157165"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/es-CL/firefox-139.0b4.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "eb43c4d52d87873fc58a26d935ef95d9915cb8c14851fc2ea62b5110a2ae5819"; + sha256 = "f2144b0b492eff30dbd95ab92ef9523d3d7d48dbad2efc52e8401a4e4f85d561"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/es-ES/firefox-139.0b4.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "1daa83de45da55f9f2ca238ed3f0a1ec23df7ec74105ecfdddc4cfabc12980e7"; + sha256 = "895b92176b7dc1a492574bb625e6264548377adabd1655c6ba07eb24a786c1a6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/es-MX/firefox-139.0b4.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "83ab68086711114b20f9849efaebd081e19e4e7c33a5dd73d1502cd1228b20f5"; + sha256 = "b770be36d7b93925baf0c85fcccecb73f1c1b8845615e7631f3d83e8fafe10ce"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/et/firefox-139.0b4.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ec34b966424b586f5e384c81d10aab9b29fd684f3560ca449abdc3254add8cc6"; + sha256 = "e88a52d747dc3d6c5a449c5449fb2b412441f41da64c496da22f5880ba5c4752"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/eu/firefox-139.0b4.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "70e64c904b0a65ac0be8ae2bac04ed1af85c4fb1169a0898941e1b956713329d"; + sha256 = "4d7d7fe2f695c79418a746c875cfd9357cb290ad8b6d253774a3ab92fe235210"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/fa/firefox-139.0b4.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "8750c4aff9537b89e76938817dd4f98b3b31c21634f954752b0bf49724672454"; + sha256 = "8cb53568f15e61491f0b3c03a1e71599cac3ce278f145f638830b9d22b789ff4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ff/firefox-139.0b4.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ef428591168086a6b6d2344394aa5fcd4551b119a85f7258d1f35bb8f28232ea"; + sha256 = "2f229d6811bbc2bde175dc9b6fea0b1fdf4221f9f8042cf50d67513074a45a5e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/fi/firefox-139.0b4.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "fc43b3cb736b040790e92b2b4e23bc59360a58d533b167118590cbe102db521a"; + sha256 = "316ac34c897feb1b98f677436d4dbac7b4a5c5fc29cf07bb55341736b156ae0a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/fr/firefox-139.0b4.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "2361aa0991e71f2242e1d6fce3c97beee9dac61d0c02b0f9265cc9da199d502a"; + sha256 = "2b1e4ab91f25e9b95fb894231709d086d9645eb76a64e0db194dd386e8f362ac"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/fur/firefox-139.0b4.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "f32bd5c0c3ae17cd7893139ec20c608ba0e058744e155284a9dc6baf433b3604"; + sha256 = "1a2c3b4e20c5cbbd6531c53516bcd97478cd86f6bc8b2761fd7074cc9e0429d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/fy-NL/firefox-139.0b4.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "bf3354e2e772e827df7bd344bd7e56f958b04cab43f03de229eb724700102870"; + sha256 = "ca55a18278f39416d4982834357d8ee4e9dbb47e129feb3d45b4912f411dcfc6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ga-IE/firefox-139.0b4.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "468751b8fad4eac1b1ac308319912672f8f9fbf4571f8134e734b0d09303b640"; + sha256 = "34594aded12da96b71053623e9bdc09367d8d28281f6ea31be81dc1eab4d76f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/gd/firefox-139.0b4.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ce7e20daa5f1f5b6818f55569a1f68fd5582e971b0e88b2b6bb929838dde7eef"; + sha256 = "a6dffbb23c3b61f25a913933d700ace50954ae6e879a9d7d4b73c1a864954523"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/gl/firefox-139.0b4.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a472ef1726220f89dca3507e22b8c779f49944c38eae90ee67996b4647956403"; + sha256 = "a629a7d61624ade963df689fbee4add6f3eca0f603bd8fcc75563480642e7e97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/gn/firefox-139.0b4.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ad10b1dae8bf121e9a29a5aa52bd2f1dc59b5ec7519e119bccc7f8fe21065568"; + sha256 = "fb827103cafe3179b1b17f8fdc21e2008a5ff24f4502b923c7426ae91fc26c91"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/gu-IN/firefox-139.0b4.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f18813f2ca4e9febeaeb26eb87705f8d7c3ba0092e07035dc381e72a31537c5e"; + sha256 = "e9f4437d6f8959aa9270e6cc8eb7070165a8418f4ed28c2a31e1b955948c7837"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/he/firefox-139.0b4.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "85ae9fec9c97e72bf164b7c0d39b7d6c56243e720e500ced87aae51a92fbbb8a"; + sha256 = "5eedd55e647c494461a013912eaac5b1d40b20acef64a0810e74fdd72083e5df"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/hi-IN/firefox-139.0b4.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "370a23bc3d57b2c2af5835bac73cbc3ddfae78bd63b1a3e2a4e68267a3853c50"; + sha256 = "3a1e543d88f0103776397decc1ae9fa2b5a96b68fddadea56c60e1d76b1120d5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/hr/firefox-139.0b4.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9fc278c697d363b8210b828bcd7688babbdfacc250c15c69c5101dcee9219434"; + sha256 = "4dbfbb04729a97c82b4eb123d1a6623867b6ece4f26777ed12c81a9bc5f4b88e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/hsb/firefox-139.0b4.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "5094b85a8c87181a9aaa18ccfdf2410a910a3b01912c3f29b5735cac009ed475"; + sha256 = "1cca8fe6f46c797b8e03923d9b4a317cab0e011c34a44feabcaea6767a4054b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/hu/firefox-139.0b4.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ca43990b646a281aa3a081f2a0ad29084fa8063d060eb3205c759bce64c65cfd"; + sha256 = "ddbb8a9b6fd89f496c47398f09cb2a56ecf51299138cdf1dff659d027f1f8055"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/hy-AM/firefox-139.0b4.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "443e28421a588229742e0c0cb354e2dc4a4d4a6a34b02849137902c34d4aa7ad"; + sha256 = "e819ccd80cfe1446cd60398e788931d12060766fbd23539932efc6e16a0a59a0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ia/firefox-139.0b4.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "909554909e4ca042879e46421abbe22c7a1a697bad5b7429c73f24fa83d55352"; + sha256 = "bb5dc9c1a4cb919a2f6207fe171fe0e2c9345d038cf7a7d969fc72f6c0d9aa94"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/id/firefox-139.0b4.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "68252135e463181f7769cba5529dcdbddd42f694a3bcb4f77d8813cd54a4cda9"; + sha256 = "04f8e8f738dad42e6c0daca2ada66ea01f7d994c2ef4f2ec329070f740a2bd0d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/is/firefox-139.0b4.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "531ccc2cfcc1d405064b6dfd793443be992f3b1d12635da826805cef2627bd15"; + sha256 = "140e3f7a50a57f415913465372b3c0cb026f648d587eab2e2406361430c1d81e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/it/firefox-139.0b4.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7e43713ef319fb08680fc1ccda216be9d6c0c2fb413630574d321cb28c3d4a3a"; + sha256 = "81eaf1ea39d5792ce31388a3936cc9597f7873eddbb6ab34ed78acf688598272"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ja/firefox-139.0b4.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "07b7a5613e9a36ed773aa400de1fac7b44e180d89b85de9c56583a7a7f3bba28"; + sha256 = "5eb2dad48c1fdd9b869c89009f83433c7c43ecfbb85c6489a46bde89e935b534"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ka/firefox-139.0b4.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0f6e5f1c126816863c34654e2226a672be34dd31cd0c8567435d7c3d7563a56e"; + sha256 = "16cd1d3352195a758bb256d9f201d50934c016f772c4ae01133f7ff25f86f2fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/kab/firefox-139.0b4.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5dd613b222a00d6bc4294e4ac190adcbd8d1af7ea20092716d26ad0002a24673"; + sha256 = "e9390977f31c11d995d3748329da38c45300aa43ac5639c11cc90db9cd5b8d4f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/kk/firefox-139.0b4.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3e94f8b72384e119500a6ddc1d750bc28507bee04bc1604de9a5618b274d3552"; + sha256 = "7d13ee5bf4718468f8ea20a5fc6aceff58ac0be84fa7659932e85dbbaeed867d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/km/firefox-139.0b4.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "3639933713c2291c5771fd21068a4d2fa0770fd6c7764f3e11e58c11c16ccc8c"; + sha256 = "999eff92897c3cb7597abef1e2c86eb962204dfa4ebd0d86842b3f2cbc7fe957"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/kn/firefox-139.0b4.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "9260368ea1474d6611c9f5dbdeb9a7b398a1d465b8a42aed90989b929fb879ca"; + sha256 = "a2d45d1ffe1a46c8178f460ac30c394a7f4177ecc8cdb4c130bf3e5c49bc2ad7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ko/firefox-139.0b4.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "abafa1b3f6de01f1a05af169c6c6b599cef374f9827aa73fbb0ee0bed2f8bd7c"; + sha256 = "f847db77a08952229d6ef998c7157f0c75850f06cc96953ad66fd3a024ad1713"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/lij/firefox-139.0b4.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "98a004987887a49fe244bf3ebb1b6bce5ed97d45a093e81126eb9ed66279f411"; + sha256 = "5e82c700fc49d454496199107a8fcb752847cd46981754a8413af64777ba9d5f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/lt/firefox-139.0b4.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "201855ba80fe1c88eed7eb43ac46ccc29d8db82a563381f9743c1ea798d044b7"; + sha256 = "5d60fd80069d73d12e285b65da1e3af0eca6824c27cb80e946c856f5c3028879"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/lv/firefox-139.0b4.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a36ce7dfa47918d5b963fcaf1d5e9b44aa75c4fc86e46467c64f030d84ef72e1"; + sha256 = "28e9eba64a0662004171f87e2ccf23308d259bc78b2184ffdfec398ef08f89f6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/mk/firefox-139.0b4.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "ba434cb6eb5e9c64eab8fc19ed6b63b37babee8a545823b703cd750a6d24ee75"; + sha256 = "83df7f0457e3ecc36c1a6376ec595f3df04543ba36d80d896cd7d68fdf6d9de5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/mr/firefox-139.0b4.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "576e06215f4c8522924e48f7fdb7078d79cc2cb1b71e8d7bb015c760faf024c1"; + sha256 = "879ae358c38367b634154936a9e8d093813ac8e410f8f533f7c32227845d3bb4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ms/firefox-139.0b4.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3e3e54688b7e8a9b464d9c23e7925b47a6b6f171f816f805bb520e05e3e2f79f"; + sha256 = "ec20aeaf31cd2f4b16b94ab16c62a0ebde70b738b86c739dd4deca7b50feb95b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/my/firefox-139.0b4.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "79138b0eaa972d1c7df403028f53c4b4d6d222f11cf5ecf9468565f1518c6390"; + sha256 = "90468dd5c6db813612f69f2b646be26db909dcaa92e66b3c3250823baea81de6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/nb-NO/firefox-139.0b4.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d33ca66814433c8971b6d37d2812ef3a0e9e9b569afd94031f98762d9f98086e"; + sha256 = "904f3f3760506b6feb246397caab176e6dd884e982dcb07274605bc067113d95"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ne-NP/firefox-139.0b4.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "f6aac9719ec68474b4abb58b9aacdb6122007c95df5b421752e38f124e41f1ca"; + sha256 = "0181214f14fd5e88381952ad07df7a37efa293e8fbe903db0029e773ff1e50f9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/nl/firefox-139.0b4.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "5b8d31d21d06cc4b19ff9bb05d07d53d180820dd1cd86a95ee5c1e7403a1981a"; + sha256 = "cd1f662dcc64190d00c84b0c02d67558626246470c5cdac78fdee1408ec88cac"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/nn-NO/firefox-139.0b4.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "757cef127d50b804479e136ebc58ea5c000254a32f2c09f92f2d43e4a47bd999"; + sha256 = "c20d2ea023e5eb1a60863cadd085db28f616dfa79c79652dc1f38c2efd2e4f49"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/oc/firefox-139.0b4.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "965405d799f1440ac0a33bb12efcf0b9511dd80849b7ca0f2cc89ad0c77e932f"; + sha256 = "6f387a7892a61b623ec1696adec24f5836dce98a4157c59cc47a987f11e8dfec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/pa-IN/firefox-139.0b4.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9aeafc8fae330a3e09ceaaf122dfee8f581f054e5c0e91e10bc308b435a3ada8"; + sha256 = "1973852bbe05fc0207834a6271858a8b6585254635854cc2302b45d0a10f8b07"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/pl/firefox-139.0b4.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "5dc8d09f27776f0f96c0302a81fc2027843a915fee40b09855d80f2692a108f5"; + sha256 = "9919cc6421b35798c2df90729d2d25e200e24d1450003ce30794124fb88ac21d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/pt-BR/firefox-139.0b4.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "fd95ca5be74c5ee2a9ee117e6f08def52b9003d80ca552b5535a6f3272f8a51b"; + sha256 = "0ca06936133a86645d2975acb69fd01d3b80fdfcbc1ab003561ecd9fc85d4467"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/pt-PT/firefox-139.0b4.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1892b62ab2721d8716220c5e88af9c90fec5beb420374c3e603707ff44bc47d1"; + sha256 = "48dfb1081c2bee39a5bb2729d4aa83860d29435c818bef4b80c53e02efafb807"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/rm/firefox-139.0b4.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "51d581629f587de3a2055d8c6799359ecfb7fe5fd13c11b77935f8041c2a295e"; + sha256 = "4cb0f6115a83a9e30d5800f2d7c4709431c3617fba9fa43073bfd169c7a61266"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ro/firefox-139.0b4.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ea978843d609281f73d545e85bd0ba9c57adc91e4645b1f0e8b022dd92f9998b"; + sha256 = "cf18a73a2170ab3fc5934adab6ef6142779f8f3c1fd949b1a1051bf2ea9795b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ru/firefox-139.0b4.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e4ab2d28171a701d63d62cd65d0cad78ff4506b7a497485b06f808037ca7ea21"; + sha256 = "85ea9ba70d407d009aced7ab3d1b8552b0cf1a44cb0df5d3cae35bbefec3bc8a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sat/firefox-139.0b4.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "b160fab29f0fdde16c5ebf99769a7dc4bf00c4ac09f3f7d726a47cd9d69cc936"; + sha256 = "693a3a17e376381dba4439a35eb8b7cf03ea59dbd6c8030b4da15466475f23b1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sc/firefox-139.0b4.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "d8213839c9e3b35db2f743d4a2789ee1ec91759f344879bccc9187c4a5acef5d"; + sha256 = "0d031bb02cef10ec8ee44376f384df868c20a6ae96138011adcfe577a132d788"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sco/firefox-139.0b4.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3916653026146b6f13a98bd3559dfdf38ea2645f93b24b85cc663dee67f1c0d6"; + sha256 = "e38e1b62fdbf65b5893c448a8df763da3e04436ad75db1531023a800bb2fd186"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/si/firefox-139.0b4.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "d1fc184b57cf24b6041731d5f9ab2fa73ae0549a27cb695d8558491e44901210"; + sha256 = "efaac36b3c3a6da5958563d682936413851f76134eff15652cab0260038affca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sk/firefox-139.0b4.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "243da2b019aca664e445a6cf486ee78a399b89da1ca1e67d560c82a9e2e1c13d"; + sha256 = "e60387517f08d43b27179b08a0f9f8280d9e5e1d72ebd200f1794d37ecbb7b42"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/skr/firefox-139.0b4.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "2156ab1d3c5185511c909f8072152649583a45c3f6e43b08ba91b7402b41d1a2"; + sha256 = "834d207793100f06741459b12203ebf73750abeaffb43524564562bbb7160779"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sl/firefox-139.0b4.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "6f5a698c5498603250e91c877c4e1bf021ead850ffb25d707a9fdef45f4bf560"; + sha256 = "9f0f2d2d7b22a2c2eb7ba28974d41d6db63fea0e66491753eea7e009ee7dd23f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/son/firefox-139.0b4.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ba839673b1adb6630233c1daf1ddcc3e905528f60076ceb390b9bf977b86c6da"; + sha256 = "bb57306e0b721a99b3d916ead2ca6c813315d010f51076dd6d415d53dc1e1847"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sq/firefox-139.0b4.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "36f06ea635d64e5fc0497e020def2304651a6fd385fe67844d2878c94ffca122"; + sha256 = "64e95983086221f6f01d19fe37282ebce21f93516a43905dc29d3006d59b7847"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sr/firefox-139.0b4.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "9bb4a103678e526e0797ce4ce6c68e27637917436c431e33f48a06b4a7d5b73a"; + sha256 = "456423a6a6c0c49b643d25bb3d32866c177a7856110c3cc94494f44296a836b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/sv-SE/firefox-139.0b4.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "99b873da9b8bf0a729f3eadee176b3bf5ebbc095ca59f119b8f7775cc96434f2"; + sha256 = "960c1aade2e27b872e648f61944ea5421cfe4f7f09205dac2693cf5d6f3840af"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/szl/firefox-139.0b4.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "b1eb754a9421ef53d1873480938e0d26c9bc4431bc24f21f020e1d0a6ba5038b"; + sha256 = "2966c66c503b0fbdd8cf0fb141549cac9a8f34af9eb107b65aa7ed9409a629e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ta/firefox-139.0b4.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "df7acdf49fb510f12fce7ec99f00119a29e0254dd270ae1c1b52da899d7e23b4"; + sha256 = "afa115d8acfa334d69f8baf6159ffbb02165dcde6593b0b9132086bebd274714"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/te/firefox-139.0b4.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "4d9309859577e18c3b707283ab68112fec2ab61e66ae57ec68dd389be6235519"; + sha256 = "215cf233c79f4d33e0de76e4dd11f270a908b8f1fa55c6744200e86b6c862f9c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/tg/firefox-139.0b4.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "36044388faa92f1d2d06c18aa0fd32cd5311d8a11f5bb0f16cddda5128b0888a"; + sha256 = "e88ab65a2a477f5ad36ec77e334c2bbe9fc39e60fdd44b5ac705ff60f01dd8b9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/th/firefox-139.0b4.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1818a5657f524194b08644ff1fa2444a4d18e224774ce1a0a4d84e2dda8cfa8a"; + sha256 = "ba4f17f2fc2d86486dda6acaea1acfabcf4157f23c2aa39a858c35c78be3b20b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/tl/firefox-139.0b4.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "7f821360c515bb180d5f4de778bc76e96fc32b1ddf3dd7533f79c39c866d6e61"; + sha256 = "e123514d141c959e8f29b2dfc1c8152cb9c978267aca5cfa647ca79fcfd67563"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/tr/firefox-139.0b4.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "788fad9f6ff62df7257095d0ff7f0026e651f5cfa03ca3d72976978be686465f"; + sha256 = "73988d7cc818bfbed084a626727d1bbbbb378daf849fbaa8b23f3f5a76315f63"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/trs/firefox-139.0b4.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "51e5ffbaf0c77708323fad6c82658ebe84f16eb26401b8b252538f49841e2503"; + sha256 = "2b9022ed251f2e72bc0a7f7c319e7169eaddeec9cba230ceb9789ccd6c2a4c20"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/uk/firefox-139.0b4.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b3ea841a43f4d226580dfc9613a457fa7c945b2a638e58906ecfe5da8661f042"; + sha256 = "f721779da0e1c681ae7ef66e789a81a3655ed7be116357c518d4eb0401937fe1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/ur/firefox-139.0b4.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "ee2303f9d69089f292bdc28ac67adaad40a27654e21854c93c6e493f157ea210"; + sha256 = "080b7d053124ec03e821b5db14544de1a76e0b8d1aad4cbf6a5bfe7a721debba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/uz/firefox-139.0b4.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2a2b1bddb030346c7b229153784cfc64d0b9619002cba1ad13d5530cbaecf8c7"; + sha256 = "7fb7b3fd94aabaa611c53c6d8b75e0908c5bb93b0bdaa73a3e6e030a204d0bbc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/vi/firefox-139.0b4.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fb0a54a9c393d1e62ffed1e7864444274ae9e22a3f2f027b225f3f4cdc9952e9"; + sha256 = "27d15b1434b9aae896a3915eb647c1078a1663b1dfd6ce4c05d8e77bc21232f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/xh/firefox-139.0b4.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "74298cd379e0d2bfcd9cd3beeb10c1bad040cba292a09669db0861b88f3f1ef2"; + sha256 = "642d2ce475f6b2662ae13a54775fb4e5a01a1d25a5cec6e95bc341e8505c4856"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/zh-CN/firefox-139.0b4.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "adb07f9499ab8e1b09a6e546653192dc86b7af3878d8f6c9e1a4b94a72c891bc"; + sha256 = "1c07356d7c142aed0c17df737aa7b3e0ad38d9d4897d7df7bfd0a79a367d8ca1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-x86_64/zh-TW/firefox-139.0b4.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "81274c3d1fe8d0cd833821947225637b544cd64973b4456088f18b6d1dfb7cfa"; + sha256 = "d20921bd3d75051a61de3890349bf65280a539824403074f51d14332cb33b3df"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ach/firefox-139.0b4.tar.xz"; locale = "ach"; arch = "linux-i686"; - sha256 = "9df21b1ff9945ff4a8b8152e4bf4a3519e98174a29c2af5ce23e8f67b3abb7bb"; + sha256 = "87a70f57297d5b0c01492da28bc80d74f290682f37b19a43fc6126efd85c6079"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/af/firefox-139.0b4.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "01ba75d77f73b589e44e8bf5367700d6241d32e0ed562da4489af9f8e1ee2a65"; + sha256 = "c14ea82b75e114e01bad4b6e0b405c9611330105659b88bf8455857e181b4913"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/an/firefox-139.0b4.tar.xz"; locale = "an"; arch = "linux-i686"; - sha256 = "f75442c5fad7155bf3e339b612a1b3b024d0ceaf1f7c81e9217998a055a85bc9"; + sha256 = "233822a13e7ddc7eb437a6fa48b95f57c4c1d7da7a6ca54e84015b6d6cc16f8f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ar/firefox-139.0b4.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "aa4a2889b3baa03ceaa18cd53f3601540abe2261277d0650489bc6ac3ab5a060"; + sha256 = "c0cd5c0d31333a5a6ba6af3de586df838adbf7da09b2d85f8310757b3c9c8253"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ast/firefox-139.0b4.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "56c39b1c083063f74819655ff1929e1e3c9c2dc4bb9a1bed43859f2780ef0d72"; + sha256 = "e38ac58bff96c8396df39b1fe090abd67bdf9b3e410f504f25e0d24482a2d1ed"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/az/firefox-139.0b4.tar.xz"; locale = "az"; arch = "linux-i686"; - sha256 = "877596d4171746dd7cdffe3c073c4634b610c396d99cbe5aaee6794a923bf96e"; + sha256 = "2c7a74321548b4d3c3c07e2c0f1127c4f54c55d1af0dabfc6704fa7eaa02b102"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/be/firefox-139.0b4.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "66b4cb0e25fb263614775548c85479fe17d1b98b875d320cf366e8854921b2ca"; + sha256 = "624589d8c29240678a85b5b0978b4de1c43ea7850960bab85f7c7f7a172cb4f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/bg/firefox-139.0b4.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "0a885b0ebef3041360694ab89737dcc9c98b9d749888db1d778a88bb671b587b"; + sha256 = "84b144c5d7ae2cbc95dbb4fa262b6e0653000c645c9a604022aca70ead9282d8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/bn/firefox-139.0b4.tar.xz"; locale = "bn"; arch = "linux-i686"; - sha256 = "af0559b15d9ff6125207d39c4e4c7be1d9127eec85c4844b2ebba56d3b9580bb"; + sha256 = "b7273dc41403f54eff659a67c8a4b70f2a4df61f62a1dd4c562b0bc75c08f909"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/br/firefox-139.0b4.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "fd8ed6377e263f69b258a994c0b6a3c58da9664031be265a0eceb48a1afb73d5"; + sha256 = "0815292d40fb6ebe791d7de8d699ccc0d5096c0999fd498fe30ceb55aeb7292d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/bs/firefox-139.0b4.tar.xz"; locale = "bs"; arch = "linux-i686"; - sha256 = "02ee80372fd1b2994e6b8fca3ad7749f14270bd19f30e0130b1c0bf72a90cb0f"; + sha256 = "24de75d8e893acefc305717a2f8ba2decdb722e2505385d6cddb04ad43d7fe5b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ca-valencia/firefox-139.0b4.tar.xz"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "4e0882dc24784f0fa990d9eca6fa7e41497de82bba12b0685c412b25e6c6563a"; + sha256 = "2ba91787e8af61cb24de5c122a5ff57c6081e9680f7594d02e2b363f28e16a4b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ca/firefox-139.0b4.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "d36a4d9fe0a8a45d75228b10133427a8e7de10470764624849b0c753e4baa48c"; + sha256 = "da9e7f0f9a0730b2a9c4bc467da5f5c2349f98e22f683db02b5651df4a202251"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/cak/firefox-139.0b4.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "c0e952accd97cf53d0ac8dcc309fe3645d265c681e20fcf7ddb18d8b0bf29e56"; + sha256 = "8e77e88d9fc94f819d450ca6c7a78c618d881a97aabae5b997f7a6d69290e29f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/cs/firefox-139.0b4.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "1fa69b2eb220a6abe2e014357160817f805b223ede4cebc69a786a6c253c3354"; + sha256 = "a79b45aaf0e6e8f412e21e746265c1d43e7de9046a050b670ba3667b1462c620"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/cy/firefox-139.0b4.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "6f3d484a3a1e883e0866e5847a94c107a355c6f38350413f9c8e054c82987418"; + sha256 = "2a436e2d6a9eba59a8bcb448cb61c5730772e204665416c4c2e04564c19ac23a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/da/firefox-139.0b4.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "3618ba5f56c810e1a087ffc9cba9f39a9e9682a530b9f65420441c86d6d5fda3"; + sha256 = "c055660cefb5fe09c71ea087de51efbd4d0b8c2a349f78f2ec5d4349116ad694"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/de/firefox-139.0b4.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "7929672a9f2631c78a0a1309a7d8c06ae2e0cd16a4133d64a998a57bdd2402f3"; + sha256 = "e3d546c3a20067ea5c710e6af065bcd11e6ab49a803f730873affa229a1badc8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/dsb/firefox-139.0b4.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c3bab0d523d7657c6be39a21d048a83d070cd4c5ae33d01e5f0cca8733a6c30b"; + sha256 = "50b1be16d8856605e37078f0cb87bce59f621a76c354a8d64d2f9a68e626405a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/el/firefox-139.0b4.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "5433ff937adae7f0c6559c37d6934114b170f71e84c3c2c2e9a3338370139fe5"; + sha256 = "7f85663812934905be421c0bc3bb0ebcf22c5a497db7fbcf91a21b8174bdad0b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/en-CA/firefox-139.0b4.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c45ad41936fc1e9bfa9d59cf737d0e029e08328ac026673b27daf90a0fc8a39a"; + sha256 = "e5304a3d0557d7ec259e41e989ae191c14e7aa72203eea1ea2c180ba8aec1913"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/en-GB/firefox-139.0b4.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "52ea4415837b9c3791d04a5563b9acc7caa6012a295c6880f461303abb65a542"; + sha256 = "393f92153a7935bc161badc7d81b23803f1d6cf9ce69651097cbc383056a30d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/en-US/firefox-139.0b4.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "e428129f2d3cf9cbbf2701317fd222b2ee8c94b76aaf6a54f3a86de540aa3af2"; + sha256 = "8d61639f9b02659fa3486e2f17af815e028e87c373a1770c69e968af3c7c0b74"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/eo/firefox-139.0b4.tar.xz"; locale = "eo"; arch = "linux-i686"; - sha256 = "bc2dee43a7f7d4ccb04dcc233ff1359eb3f45dc272d01e92039fb3bcd0534fc2"; + sha256 = "dcd9df03ad825bd50f3b162ebd5bc6561d09688972d7c80af15b10d1801a3fd3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/es-AR/firefox-139.0b4.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "99c747b138a8481829711c63afe7f5e5eb1b45442203c4eff8e09afb2673d00e"; + sha256 = "cbe7dff319e0cf3d67126565366bf6063536188fb5b2c830e24b2b439d5410a2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/es-CL/firefox-139.0b4.tar.xz"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "eb81bd1bad7debf0a332afbed4eecfdd5765fca6fa05ed9e75ab8c8dd05b5de7"; + sha256 = "225c027d37ea0d6da7f9de2c784ee13db182bc76ea0398ae7dd3ec90b3146b7c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/es-ES/firefox-139.0b4.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "446d7d956bb878a28869a57256d2a08c090c6893276f4ea09cf2116515aaeb48"; + sha256 = "2b349436c1ce8d99138875f11af5d5210210eaeb39f0dbdea381dafb8c5d4404"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/es-MX/firefox-139.0b4.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e2f4db1178e11a43e1d62f21eed61c5e25d4bd75edf91f63401ba384d29080f7"; + sha256 = "016fada5c527dd9c4c95b6549e2cbb7b3616ec6256c9e30c527f995af1029ebb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/et/firefox-139.0b4.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "3d47570c5de25da080f2e9e7ca20641d06878b421147f4ccdbadeccde9bff61e"; + sha256 = "57eecae03d4cb2c2e86f2909e82a8e42113f86b7f30eb8711b3a6262e1157b4e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/eu/firefox-139.0b4.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "f8631ded866eaea8ef7812ecba52958242c95b8e39e69d892f38f1c1a0ea03db"; + sha256 = "af2405d4e1db8662e7cc6f212694ab80f607c854ddc707d5322d4a0565227f04"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/fa/firefox-139.0b4.tar.xz"; locale = "fa"; arch = "linux-i686"; - sha256 = "d55346559f9cc01070bae44b1f53513f2897cbb3deef0fd5a51d692fbda6b4be"; + sha256 = "1170f8ca54cc2eac1a2bdd9a63eee87b29a627d30cd2f06e91e519ac2be2b05c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ff/firefox-139.0b4.tar.xz"; locale = "ff"; arch = "linux-i686"; - sha256 = "05588e3f4b121ff1f042abe8ed9c0a011f0db6cd035d049b9c765ecf107b5bcd"; + sha256 = "bdc3e84a777bba9e664f29cc3e109af18dc40253b0f9b4fba57765b604d4320f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/fi/firefox-139.0b4.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "3cdb70af6f7720e263c4eb9353ea1dffdbe881203227666a589e215318698e1f"; + sha256 = "db78665b7ea38f0f5f054949d3045239f6971b827e781bf740650596e7d91580"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/fr/firefox-139.0b4.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "4c92f507c46acc5bb90849bcedf0a763068fce151cfe3e7b3c886e1a2de45c03"; + sha256 = "9a41a156bf9c002d3f438c2895e3154ac483a67ebe6f80e0eee2b01b7fd7244e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/fur/firefox-139.0b4.tar.xz"; locale = "fur"; arch = "linux-i686"; - sha256 = "9acba01f31b0f61cecfd99432f2e7b9fe7bdce0a8a3b2a1bb3416b5b1b7b81f6"; + sha256 = "56220f6634ea0e7e69a29f07736120b46f2c1911e82df13a842e4101ab0e7cf0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/fy-NL/firefox-139.0b4.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3a3955cc52c5f6b9c14b82cc18ac3668cf5c6afa01c27a037fcad4db82275cb8"; + sha256 = "9334756030f7495ee55780665ba0f8587331364ef4221393106194b9ab938362"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ga-IE/firefox-139.0b4.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "375281860f95bd4c80d9668c1e277540cb7f81d0ebe01fbfc5b207760d706c20"; + sha256 = "96a68363e3a6593f3657da4d5add4af443b2db60d30efdcf23485244472e59eb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/gd/firefox-139.0b4.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "e07c785c5c9873062d9b761c212dac14bdfe88737a8df93a3fe928190b6c28d2"; + sha256 = "2a21ee5ca1acca96a81cbd1c0f6f0ce8c3a52ed88ba787d98d6059bbc097e22f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/gl/firefox-139.0b4.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "ced8304e694cb5a33c1fc4004debddb6a5ab001717e0fa7e70d0635680c1df12"; + sha256 = "bd8a9e005ba534d5ab7436f78b02cc84f380bd36a4044a797085f529b23466eb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/gn/firefox-139.0b4.tar.xz"; locale = "gn"; arch = "linux-i686"; - sha256 = "cfa35eb30a9d4dd075dba1dc83dc1941689c40988839e761919b417b9b1e4555"; + sha256 = "3d6aa78558ec05bfcab9872160c7ee06eda338aacdf78974022dab4fd047adaf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/gu-IN/firefox-139.0b4.tar.xz"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f5efc09dc204f7872f6cda19db0f66733dc536b823f6bbb223beafb5900005d9"; + sha256 = "37a683ae33978ad481ef68f40b3c83f27a85b13aa1b55b905905c2d3ed1ceafb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/he/firefox-139.0b4.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "b4bf8b6bb71f713850da46ca1df1f4aaf7278174c48cbc4f4ebaeca65d9863c0"; + sha256 = "1916e775b875911d87365bfdbbf549ae728ab674814ac222edb955853a224273"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/hi-IN/firefox-139.0b4.tar.xz"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "0f1c4f1f75517c393198cfb944ace2159e3d3f12fb9170eb532ef5edbe241d95"; + sha256 = "72a3b2387777f16e2b5f8232522d4080a276bf60b853a564f5e70c37d9fd2e3b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/hr/firefox-139.0b4.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "4bfbe567206a9c37dcd1dfedd430c6c5cbee015ae11723f654108b1ad1dd07e9"; + sha256 = "4186afabb2595f717bda2555348fc082ea7167e6c83f03755d925ff2c084a31d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/hsb/firefox-139.0b4.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "92cf0ae541ccc4b7609dd70bfbb37f7dc066a926e8c9f14e94d85dd2b2847638"; + sha256 = "6b12f273ce7cb98e913ebe1785e2271813c351fe85203a8e96558bee3d8b802b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/hu/firefox-139.0b4.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "05bae7f6e502256d1b7a9da81a207bdf01d529a6bd2ca85fa557062452aee498"; + sha256 = "f689294ca4226c898df2ebcbfcd60c4b9fb8bf529bc51df60b36896a77b3fb95"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/hy-AM/firefox-139.0b4.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4fbe110d0c790e317c3d052b46550ea1cfbf3d04e836cbd48b6b43c11bdd2ec2"; + sha256 = "c1483077c18d4527053c7d979f9d8abc10710580295056f6fc14ce0034dd0711"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ia/firefox-139.0b4.tar.xz"; locale = "ia"; arch = "linux-i686"; - sha256 = "dcfe829ba81b743e6835b2b8712650f45a9e6ef51e1b5b89fbcc6a8458a6d775"; + sha256 = "11829a72579c847b78622bedf1aa6e5af500bf2eebc04bd10cbf8c7ea7790b3f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/id/firefox-139.0b4.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "d434c3c92da14dd3a75f61e1793f0e81cbaf4271bdb0a2a31db5aa2aadcecdcb"; + sha256 = "2217188bd592ca5c4cc8e2749ea31015861287c59fc14780335e42275b559cae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/is/firefox-139.0b4.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "f08a607f20e20f41d0644a80e0e916a37085d37627dd0e04828a4fd22988e8e2"; + sha256 = "1ffab05f776dc59104a34baa0164d6de764dc8882f4c7ab2748b59c492823c4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/it/firefox-139.0b4.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "65d258db99319900e8ffb23614d70f3f54423399cd822682359bf0f3c7e5abe2"; + sha256 = "3e9965d635107eaf2607463508d0da22906bcac4db645dd43708ad885c037ddb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ja/firefox-139.0b4.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "4ad16c31e3be0c8e9e449c93fc201f2fc093abababdfab2d863115881533d2bd"; + sha256 = "1a971c6f7e1558b6a47ca204a398c5b1b9be44700726b8daf0c0298271b5562c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ka/firefox-139.0b4.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "2361559e34ddd3bdb002f898bb3b5923c4958114992fa6334b057f22f33a5b5a"; + sha256 = "4b7c001d19b96b0254fc3d5760feb2f473014e5ba1602d320fe179d8c8e8e1f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/kab/firefox-139.0b4.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "aafcd78122be357a6fa4c7fbe027f45fed98f0bf3d4eacf06fa8aa24d593c2dd"; + sha256 = "4022280fc975d0fdccfe02ec6ee4159936a9de99ca2eed8d6c496f290a5a6d0a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/kk/firefox-139.0b4.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "e44b1992c70e356c0c5118f2eb31f63ddd98c98ebbd8c5c872118584eb71c400"; + sha256 = "06612dc7f831654df0ca60cf3c2ab4fd1e72b4cba16ec496f02528c0fd4fbfd8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/km/firefox-139.0b4.tar.xz"; locale = "km"; arch = "linux-i686"; - sha256 = "0905dc9e42430fb8299ce8a0eae722b5ec7d24b8db5260612c082415f0979f14"; + sha256 = "91ed4c4b6b6f294b8d47b013393bfa48402a63c6f4d2f986947d51729c624f12"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/kn/firefox-139.0b4.tar.xz"; locale = "kn"; arch = "linux-i686"; - sha256 = "a592fff8c6a6076bc6e4e3631f923c3ac04af775142546e42d580ae5fdc9cead"; + sha256 = "a4a2e2c5759805640ae3080c563fd0e5ca127e8b5067351928b6dfd10e45a761"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ko/firefox-139.0b4.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "bb7bc9712d8f672f30dfafbff4901ebd2c23c68b66bb3800b5a5a9d145ff9202"; + sha256 = "2e09752b2c02315d79185c86e546f66d314a5c158720e1163132c54934c06ebe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/lij/firefox-139.0b4.tar.xz"; locale = "lij"; arch = "linux-i686"; - sha256 = "505d9ec5d3c110593da450ac6b8ae57740f2474fb92e26bfd7e372d168997973"; + sha256 = "ebf2dd79fc7c373feaf517f3030bddec4fb22879452cc3abd6192d5868333fc2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/lt/firefox-139.0b4.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "eca8790d0866a8d694f74db9ceb7f2f913cf1a6ecadd3df77eed217de686b8fc"; + sha256 = "71aa1ff3f47b4be838e06bdb791bfa70b638c09dbddae37128c90ff4b4974998"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/lv/firefox-139.0b4.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "4d81e0900bb7d552a61ccfcab80c68495bbf883047f8d0e928f6ff2c582ad360"; + sha256 = "90b01be8cb7b2ebddbb2966a45f6ca29a86feb1285db233012ef85f301ca4fed"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/mk/firefox-139.0b4.tar.xz"; locale = "mk"; arch = "linux-i686"; - sha256 = "851b8db8097c0f872208ba92ac628b66ab85572f16412351b36faef18f733037"; + sha256 = "f6fa830344486666e46113e5515e1f24a0c32943db3c6bb7f02e5ad3db6de2d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/mr/firefox-139.0b4.tar.xz"; locale = "mr"; arch = "linux-i686"; - sha256 = "8fdb01d7a9299d4f46b8d4fc2622eea7d343fffb8d02139b696a5125a0f525d3"; + sha256 = "2c58107d0ab0cd7c5fa0a4030e047c892808c9d6de05123cd0337ce36e54360d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ms/firefox-139.0b4.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "eb9104fea4231c5096c23b4769ceee5cbfda2d06c43e6248476e5559f415c019"; + sha256 = "8afefb023e6bd415c29f075e484bd0783f5f05f10616d4f191cff8839ce372ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/my/firefox-139.0b4.tar.xz"; locale = "my"; arch = "linux-i686"; - sha256 = "0363c1bba70dd20e047784ee7aee50b97512fa01a498de8611fdcbc424b489ef"; + sha256 = "a713b3d904d5590488141f331d89560b0fe3c163287861b6c709133521aeda99"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/nb-NO/firefox-139.0b4.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1d7421306ccfb6afb43649895bc71eccb9a2ae8da95c941ed5a0538add4c08b7"; + sha256 = "40e037728d2697304965ff04db4e8d8206335a7e52866954241766182d9f150e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ne-NP/firefox-139.0b4.tar.xz"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "a3005348908f842726eebebfd8ed21763cb893e5416021e963b80733df1c2ad1"; + sha256 = "32e752b56699102d5d0e65a5fbb2644b7d95059f12c737944a56c9807fcb5d4b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/nl/firefox-139.0b4.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "8a1b2dc5c61ac95e38de823186e886531482ba75e837e9df6c8bb0b0c3ccf208"; + sha256 = "086f26eb82543f2f536b3546782d9531b2367c090244bb3dd7d7b3766f5e3bdb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/nn-NO/firefox-139.0b4.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "351341647bde6c40e0ba8112e98ca80be4f7af8b74da08892f82b43284a4c9e9"; + sha256 = "8f7faf5cf79fece9aa05dead8931cc51829399c1e77d865fc7a2e90586ffa68d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/oc/firefox-139.0b4.tar.xz"; locale = "oc"; arch = "linux-i686"; - sha256 = "d8fb3dd34388204543e4e4bb8aed424df10b77e2cd2b51f7549f091d3c7ec6c2"; + sha256 = "7a6743d63d6ebd2c8019e5e4431d0251eb1764e5cb4c2bcd2da43489c304e0a0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/pa-IN/firefox-139.0b4.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "839dea66654c3efba3d733bbfba365214189eeb4a61dbbf020daa115eaa7a304"; + sha256 = "25c72f3a21ca5c1e09b4d6c97fe8ccda39c107ee4ac23c447cd7097d0fdd8eef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/pl/firefox-139.0b4.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "20edbddca204268e30efeb2ee20995cbba5f26fdd706ab260ab4e7ae2f1b9ef5"; + sha256 = "f1adf8d5eedd479cc763fefd80306a4f400a0b8838b356d223aab85f305c0b51"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/pt-BR/firefox-139.0b4.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4cf9ab194610b2405e34de6e456993b70fe31f9b04962a9a344250ecf16500aa"; + sha256 = "ca70a854d9930a008fba706f839840408dfd37b7805b1fc686786c7804906c1b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/pt-PT/firefox-139.0b4.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "482fd023b60ce06b25e292c7764dd7069951dd2d88b542b80a24b1b1422a8fff"; + sha256 = "b81b41f9aca42e313941fe69c2a884118144640f5faa53fb16b21e0d19ffc640"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/rm/firefox-139.0b4.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "2cb8a7ad00eab956ecbb001019877476d7aca116e79a0e43b05365ecba41dafb"; + sha256 = "68b07bd5a6f6adf58851980157e1a04f6a0a069d4418fbf74108eb7101e39905"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ro/firefox-139.0b4.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "6db1a0fbb04082c803858ce2cd222ea49965bdc81d35f1ab77bccd69aaffb9cc"; + sha256 = "34962c09e2f96ff552733d3e70363989122e58657d85488d215b12aba6a478de"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ru/firefox-139.0b4.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "7bdb6d708b8f3515549c4047c56e61cd0ed58b784b5ccef7c32ec1e204d46f97"; + sha256 = "631f44ac7908c217df544986041576f22afa37ada0b550ceb4f143b68f6f044d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sat/firefox-139.0b4.tar.xz"; locale = "sat"; arch = "linux-i686"; - sha256 = "1ce9947cdbd094a5e1efe8e6fdda5d4685a9457e222569151a3423661b264dc9"; + sha256 = "f55ed94a407e02de8f519e0db3731c778ae27f53dba62a4d27dea12ee5c69d67"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sc/firefox-139.0b4.tar.xz"; locale = "sc"; arch = "linux-i686"; - sha256 = "6988b13049e6c34ee09868c2b004e7559c39e7931ec246a50643a051c8ec4083"; + sha256 = "ecdeba036f6d3c69377b282fc11b16137ddcc97c55d49f12a6497b3ddd857758"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sco/firefox-139.0b4.tar.xz"; locale = "sco"; arch = "linux-i686"; - sha256 = "f61ee2344d1dc96a6b8fa13b3676376d3f43b9c1fd65dec344ff3781e448f1a4"; + sha256 = "a9c5742f64b9018906b5fabd9373e5fe8805a447a001acbc3106818f081ff09b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/si/firefox-139.0b4.tar.xz"; locale = "si"; arch = "linux-i686"; - sha256 = "8a418e6fecb901bf0fe27ff3717159ae0e9300ed27ee2dfc83ccb54ed9c94980"; + sha256 = "3621682261e1243d64012ae5ef4508458ef088a20c097f22d0d3889b2c0fad00"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sk/firefox-139.0b4.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "5c1fc8793fde16c8bab897210a620b401d2fe2f416c766dad5617bfdc166c097"; + sha256 = "15ee029ae13f93060ceb44bc032e90062fbeb4e7f1cddd4acbdd8c03187441b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/skr/firefox-139.0b4.tar.xz"; locale = "skr"; arch = "linux-i686"; - sha256 = "789acdd8375d1f96a6ea86d0866dc164640d80400bd7d27320b103b7e3f7a210"; + sha256 = "c61dbb39288239c7620c87d799fd745f02f1e2e4320ce8f44f92aeff38e35204"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sl/firefox-139.0b4.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "2429564d5158a8ca350b64041a25d8678a51b4a7947cdefb5f1a006df3a2b1cd"; + sha256 = "701b3105c92bf18dc0baa508008c6a9208ba69a67babe16f7404dc50e5b5c822"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/son/firefox-139.0b4.tar.xz"; locale = "son"; arch = "linux-i686"; - sha256 = "b54c750963d11100b56055bf3be5b4397a80c3b487189cc7ba30fdfcbec4af0b"; + sha256 = "a7b5fb0c9cf055db86b411d5b4d8fe7b154dd79da1e0d23f050bb890e111584a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sq/firefox-139.0b4.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "aa829b9d1490c97656b785e17e6a612114fc3e5f850808f277176eda12a547fb"; + sha256 = "e88c917629b50cc933daed3134bf61bb9a7021db66d5840c00e179afd22af58b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sr/firefox-139.0b4.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "5217c2f43e2cd8a363660ccd992705d96b9f2b7ecb7c5d3d400f70d385d85567"; + sha256 = "c06aa97b94fee81c474784e005ea0b87fb108dbc023697caa036e0c8b394e825"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/sv-SE/firefox-139.0b4.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "74b995cd3793292f1cc2f8e30ee72f059aef55295fc5811e12baa6714ebb8e95"; + sha256 = "972103e2717945e1c7f53e6606bbc6b8939f9030a4bcb2d4fc718e230669eaff"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/szl/firefox-139.0b4.tar.xz"; locale = "szl"; arch = "linux-i686"; - sha256 = "86acd2e307a17b0668e756ef12515ab4d37b3ae4fa9c308d15a58e236ed1597b"; + sha256 = "04adc5b6186a5af52d0e49dfb798bfd7da80553cd284763b5affc471dd1e8328"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ta/firefox-139.0b4.tar.xz"; locale = "ta"; arch = "linux-i686"; - sha256 = "1b1dddbd4dfa2ba4e43b0d97357876925e3a3b4fc103890c36692e4c669551f1"; + sha256 = "44934dc8cc75f9e0d96812ad7f60de98b1fc7f2008926afa61a3ac81d3c43977"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/te/firefox-139.0b4.tar.xz"; locale = "te"; arch = "linux-i686"; - sha256 = "9ff90bbf310a961b3ee5ce81d87815af20a97d317835ae685b02bd11d76e4430"; + sha256 = "a65484fff230858c4f0ce1c8554928e469fe06c5c0eb941217ba770a15cf3762"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/tg/firefox-139.0b4.tar.xz"; locale = "tg"; arch = "linux-i686"; - sha256 = "6f5ad0a96358acbdab8eb6499adbbddfefb19da4d4add4cfdeb374eaf7b474f7"; + sha256 = "78ea45f86204077dafa932bc892159ae11bf1bf8f32a86b9bb79742944115250"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/th/firefox-139.0b4.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "29264ff4976979c5e89ed20ee4d1bf3d1f4fc174e86f1d4713fa470cc5d57e90"; + sha256 = "937d5f0858d4701a739557a54df30dc20ed3dfa0c92d9c08909b64c57ee34dc9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/tl/firefox-139.0b4.tar.xz"; locale = "tl"; arch = "linux-i686"; - sha256 = "5a9edf38ba5b382c63d42c58a578af4b89840ab2996119c8cee7842a230e7161"; + sha256 = "977abd61324f94d41a030ed8affb6d7c99a9f44cd89df35ae5e075ff746e3b45"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/tr/firefox-139.0b4.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "b1592111fc5767078edaabf192e8fa46508479d070714181be7469284df881ed"; + sha256 = "a9de20042a68a2afa8726b31da47e950a5fb1578a9f1c3855fe04700dd3461a5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/trs/firefox-139.0b4.tar.xz"; locale = "trs"; arch = "linux-i686"; - sha256 = "2f535a90613b2243300da5bc35185c793796eb3d5eabbe565818c25ecc910d2f"; + sha256 = "7de7776812f6188e1b88aad5293f1472975356c989bb6dd61b53d634c1595d9e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/uk/firefox-139.0b4.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "6362f8c826d78cc5954816e5bafe40f87b168a61430330e5669163e415c63840"; + sha256 = "ccc2e770e91aed87bf1690dd82e52107ef49efe2062cb08ac4a4e372b097770b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/ur/firefox-139.0b4.tar.xz"; locale = "ur"; arch = "linux-i686"; - sha256 = "b267f2749c8f8395b11ad589ed0605a0c5afd1277286006bbafcf9c34b9e2b7f"; + sha256 = "1e61bbf085a439b6a51add991499e582a58f50453c2018d15548f0ce50f95191"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/uz/firefox-139.0b4.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "14c173874b105b357e2c2db597da5b39974c733df54f8d3be07b341179ce8eee"; + sha256 = "7b4120e694d31a901d7e9224ca42034db85f27f9062463f1fbe7aa8dd7afcfd6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/vi/firefox-139.0b4.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "ca75da7252cf7b070515cb45474df7c2acf247731757163362ebf90bfc2432f1"; + sha256 = "9798b0741ff2e5eb5eadf5234d54fc5c2e473ef3d093079b7b6ac23518e06404"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/xh/firefox-139.0b4.tar.xz"; locale = "xh"; arch = "linux-i686"; - sha256 = "dde72415aa29498cf08a7015b1e9122239705978da0028587ecfc9a125488366"; + sha256 = "17e717b6a62c34d7f0e74b9c6b4af4e04e0bb9e6e0624b5691f1762c8ac734ab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/zh-CN/firefox-139.0b4.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7eaa490631845abe7e20c88f4238de0dfa278ad7d36523898f57d469e2b8da88"; + sha256 = "a32bd1b70bfb1c5fdcf33d0c4413fc1f3d4c7c1b355e06c1e7fa571657078682"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-i686/zh-TW/firefox-139.0b4.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "22667488a77ccf885072a125735c103e7a00473d9bdad07b1cb5d318c3a94f89"; + sha256 = "0ee631ecf8b7de2ffcb9a77aba4e4dd20cb62f2a1aab53650c1c12b39c5b48a2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ach/firefox-139.0b4.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "ce548a0c42c7e1975e5379b7bc7134832757409ce03710ee8a22a6df2d38673e"; + sha256 = "d754b7c77338934ad9c988af0ca76c20b9d0eeb9f63beb9423d48902cf39579c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/af/firefox-139.0b4.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "06da5be60293d3badf10a6b5742bc3cad97023b4a306a0594810f83589268e24"; + sha256 = "9e3893fe70cff031562b1f9b6d1a8651a591d050a02733126d00d24c8d676bf2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/an/firefox-139.0b4.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "c7804abcbc07eb52164ceb2f1db308b12a9df64507e93b29e4786d86ec63c78e"; + sha256 = "01055cd10e6bb1e963a7b7366233faf8d2951318576a02a9f1e81aa7a1c4c50b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ar/firefox-139.0b4.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "0167980e4292272f83029af4cdb1da224b796e3063be21b24483723318541e3e"; + sha256 = "d1cd5710aee5418d9c903f195d96f2fff01bee31875877e737399c9f4479e056"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ast/firefox-139.0b4.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "0f101d8d68702cfb4ce78633b23839b77947193a45b8519367eea3a6b5f4a62c"; + sha256 = "55834b6c054928aa733035366c5b45ad19503f03730001d70a41ba6510d5bd72"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/az/firefox-139.0b4.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "f3e4494e319e051584754307168b0e6b425d7089f645634d3fc09ae5284155b0"; + sha256 = "41c91dba441d06e022af5e90d2d8e77e2051e09e1cb4cec1a5fcb4bbc93dc97d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/be/firefox-139.0b4.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "130aae11edb98a9e33b081f8441015cc63279c346db8d958c643e9f3bd871271"; + sha256 = "be5610c2f38693dd6a1f8c4949bb8df06e201f4e769b986df4b3e404d9a0e494"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/bg/firefox-139.0b4.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "85f71b158f1bc589a78a9d3f4abbcaedd55a1ff4718efde4565a5d749faac35e"; + sha256 = "8bd908287a0c2871839dfc027e0e6279218addfdf0de06a62b4018097375e2cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/bn/firefox-139.0b4.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "0e0d0ed99d2dc1333010b37ab71f74d9b8f5c909c7dfe9836a4c7944165993af"; + sha256 = "f74f9db667a9774b4c3eae709facd5a33b432cbf18fb72365c57ce0ce9e8c1da"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/br/firefox-139.0b4.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "d1e4a8f7cd8fff5fc85759a87794adae6c316df07008f8aa3fa2987598cc2730"; + sha256 = "a00ab0024862e999d7d739722f441b2b63368ba227346fee3e9bc80c31807771"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/bs/firefox-139.0b4.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "8a169af638602d6da03194a40a3ab96c251b3216ba365858e3f2d71a595a1a54"; + sha256 = "39b8da8c52d4fa01498d9684e0f80d2431ac029e72ca39ef431533333b4318a0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ca-valencia/firefox-139.0b4.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "6f29784363b9291b19f92972a48e0de87b679b0f9e0942d92b5ebee675846885"; + sha256 = "de6ec7c3bfffbfb4f0783ab91c708449f0f90dc21d412220044715e56f209469"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ca/firefox-139.0b4.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "7b0d0657930eac7e2fe75e91ed4ca0eba4dde283a5aa8ee17287c779b12eb347"; + sha256 = "43a84887bc56e8e775a1fc77238a9a5b311a3922b342c0b8937a10864a58e1df"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/cak/firefox-139.0b4.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "008110582b519f4b753f2f3fcb7af37fa30225c89687233ebe132b581393231b"; + sha256 = "b781db306b99c87420a371d5504505613258001326341e12d53cad1c6d22eef9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/cs/firefox-139.0b4.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "19ea0006094e57d9ff62a93d46708ccd78cc7ebdd9208fdebcce4ecd27ba471c"; + sha256 = "a0e7e2d60296d59eb438d67e9e6f7e7397cec1ced5b8eda1210e244fa10a0205"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/cy/firefox-139.0b4.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "3f5ec52e6d4fae2b875324320d07160d493eec5172c5ba0b2b8451d761a58aac"; + sha256 = "c985bf38fcb61a264e3e7cefe00ba90bdb935009546533bf018d4bd173b88c60"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/da/firefox-139.0b4.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "1d1d769ce702a698a6d95e5847ed05b3e299e3e4258edc6344d87990279f62c7"; + sha256 = "31b86f8656a3c5a92439457714d2215481e175718dad2e71a0bd12cb9d8d53ab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/de/firefox-139.0b4.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "fc629f70100300da9d040bbe4da67cfa1a734240457245546ba7f50647c66a16"; + sha256 = "2931c7cdfbb9113176130df3551731c1313c06168257a1e1a393a4d8c71fc648"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/dsb/firefox-139.0b4.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "80299a2420fed5bf4bbf4fb8a32f6ac8e4bb0d73c2f78d59f770af02695d6fcf"; + sha256 = "e4970af22566a2c423138dfc68a7d58b58e7d3284e88f4c7f3e9d00940739cf5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/el/firefox-139.0b4.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "cbdbac410aa4734ce40e6afc65001bfdf8662ff923ae31e7b634cdf97875d859"; + sha256 = "b12bf7bbb352c7b34d9bfb11478a0ae7717325f4807c2baef04aa4f250400a90"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/en-CA/firefox-139.0b4.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "a071d131cadfda0a918a0287f1ae7ae3c670fbf54a02679bda7737b420fadc10"; + sha256 = "09e94e0803a321b313a740036171cb59e049a826e737a4151713f072c797953d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/en-GB/firefox-139.0b4.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "28ecc1608fc7b832c1a0a1f72092bdc09fb2e09c6edabe3d55c14dc456662b75"; + sha256 = "cf6922dd5832202593dab94022f82e91af46685f8c16cdf92ee6fd2665ac225c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/en-US/firefox-139.0b4.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "4c028acfa9d519f795fe4033a9fe52ce1a2288be33e9d854cf256c4660c7946f"; + sha256 = "4edba8a869dfe9c906649b5e7989748490665e99599b44c653c2fbe896f268e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/eo/firefox-139.0b4.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "73ef5438bffdbe75076d6830f0521f4cfba73eaf4eb7d8a0a92a5a9c532953e8"; + sha256 = "8ce7a3c2d44ec47d0c76a896005cc485a5e325f5991a50833e244cf69b8a7645"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/es-AR/firefox-139.0b4.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "a2ea925be3b5331a320787a2d01cb5371794131c96c20592b04f324c5d66c8b7"; + sha256 = "d1c49d9227b3d9e27e73f9788171c718c73829c077040520b05dc9b9a02cc839"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/es-CL/firefox-139.0b4.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "ec472157a4b483f5bcd72a9819ec9f8755e8d14b2f697719e43f95eca19af71d"; + sha256 = "79c5b47dc1962faec8ef4db9860698a160b2e724145dbc3520a3b179073d2aaf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/es-ES/firefox-139.0b4.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "1f0fe1aa55012dee2c482309cec2dd894a3f7221e3013ec56c67ea2266b5fd2f"; + sha256 = "c3ea8d8ca383dc7271537b5fb888ea0c155c94b0f1a7988a69359d4930b1624c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/es-MX/firefox-139.0b4.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "24ae6e6dcbd7f5e48547aca74bcd7b46993a23c9672ae7d32f28489367dd13e5"; + sha256 = "fe673d9624ff97fafb5e41d4bbcb0142d24051201fcdd58ddf8863b0a169010c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/et/firefox-139.0b4.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "93700b3435fd867e257c831654eedc35700e175e6b4e766d853fd8b51becda75"; + sha256 = "721727d911c456833e9207f35b5fa574561789eb9d5aef2cf70c07a41996604f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/eu/firefox-139.0b4.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "637a0e3bd45a6e4d73d5394f7f6be9b3b6dfb14e797c8f019ee640d1fe1ea3a1"; + sha256 = "c1d51c11fe6eb6b74a1170e93ceb910aa01b227ff67181a436abd9a272f4006a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/fa/firefox-139.0b4.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "5be4866571ec92021bf0cd764dd4d2112bf0cfff650e69da6cd2cdc1f6b9f9d4"; + sha256 = "d48577e912bc8d9302164ce233c02bb0d1a802bbf6923d2f6e3e40466753e7ef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ff/firefox-139.0b4.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "439df3eb29b13d443466cd585f6c3bb0014391462003860486959233d228a246"; + sha256 = "6397792fe1f9b6cf9e074f6dbdc620d2bb9e5a81cd9203a6b9e19d8ebe4af951"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/fi/firefox-139.0b4.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "c58331db4fe82801630365d5621e1ad8f82a3552a2763c68a965b0ce83180947"; + sha256 = "8f5c2ca086de1cda97c4383b0032cbe134a4af7231def94e19abdcf794d3a858"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/fr/firefox-139.0b4.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "dff4cbf811f7fcaad0259f1b0c297085fcd521f1c76efae62152470966eacf83"; + sha256 = "cea552b5a870c9a0842dfc56bde4d91927fbc40cef6a1f0e36d0399b65ceac7a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/fur/firefox-139.0b4.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "3c356377b02f6f790a84dbbfa8b55d37c84dccc6296f6f8e25f089608fdca44d"; + sha256 = "baa9819189ba1ff16efeeb80052f6d0afc2306a09757630e978c4a92a74147d6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/fy-NL/firefox-139.0b4.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "6421023ee22edcf15f1dcdf6e747edf14852f6dcb30d9750b330fb23d43c213c"; + sha256 = "c1b1b141ced5a635383e2e0066f36c56b852e0e44842e86b684d6ceb8209aa4a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ga-IE/firefox-139.0b4.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "aa506c7b34eaa2195a2653b18bc931772ccea48c30cdb7a99d9d9edee872918c"; + sha256 = "6a9348174c586c70f55d77ac9076c203287590eed6254b3d1eeed9cc8424b076"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/gd/firefox-139.0b4.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "0d6421613741d48342ed67ae9a29c09a4836d38afbef33158cf579469e7cbb8c"; + sha256 = "c6f367eced3add25b7a51b8eb1d55b42d7cd5c674cc934c33fa9de86d6ef5c81"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/gl/firefox-139.0b4.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "f94460f9d1a26d424659363bf7da21b7c12a7e8daa648321ccaf5e812a35d01d"; + sha256 = "30fcda0e983a655e8f0a87f40bf1f7e877569808b4b0e6710e58d446ec3913fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/gn/firefox-139.0b4.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "93eddd6cd208ca63193dec9b51544c210949278495a90c043f3ff4d9cca8acc3"; + sha256 = "9c458bf9d63fec82a51b92391bc7d7b3030cce9e6228f14d5d5cde80c577349b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/gu-IN/firefox-139.0b4.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "5034e3be1d6d382bae34b6d64f2fdadfe92885d4d78db3f8b56ee262e5d6211d"; + sha256 = "92e5e135ac587dd6b7bea7a4df4803eaabf509a55b98ec2a127af3293a10c048"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/he/firefox-139.0b4.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "e80722332526c57f312309aab776b9decf362adcbcb421444559c704a7eae879"; + sha256 = "ec64a5e068e2223c95ac1c90531ef9d857fa72f03a5b4b200242029b661344e3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/hi-IN/firefox-139.0b4.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "7782ba6f9d86029b0ec370e95ccd2e7818a0de2b00a01fdc11fc3c8f337d1cc7"; + sha256 = "434c8bfea7979d256f40f3f3766c1230b8a403678893ad988b54c19188ca82be"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/hr/firefox-139.0b4.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "62f77d473c2aa0f246d256f23a4885efae9582a8fd1b5ed5160f0c085eae0c97"; + sha256 = "59d09b703c2ed3dc3e289310503e505507b345b1c5b2133da6ce59df9f952b06"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/hsb/firefox-139.0b4.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "8cb41909dd42842b5a0415cfb304e2a2b34e8be60db35e7bf9fec93f8b796a44"; + sha256 = "55ac7f1a2a6b00118aae7d3acab31a563cf05a23e4f35389795cdd7afd613b6c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/hu/firefox-139.0b4.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "23a5cce6bf6860851978cfd199e6a843b4ce8c6b810636d7044a58d03d8ae0d2"; + sha256 = "75265bbd21c0c783c373f2ff57dfaebedb3baa8e8f635adb764d00ae340df15b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/hy-AM/firefox-139.0b4.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "671ed7bc013c4be4507fafea2d7bb11105e760a9d0bf262b1fca943cbfc2c31c"; + sha256 = "825bb3ab555455af7204fc3081d4e881bfaad7272b97c7a52d574711ac6fce43"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ia/firefox-139.0b4.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "0c126080ba8c9e1721b98ac8df93a5f3a0d019724cd85c33e3905a42042c5648"; + sha256 = "07b43f7d3dbf12f9d8a9a4b2d393b0cc9fe3ce0d333431b9d8c694abf2948607"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/id/firefox-139.0b4.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "854f96bc809b0687c65d27b6f9241f0f8f628ef436097c7aba587e5fe6441d5e"; + sha256 = "bf34449bee65bd3bf8ca7568683c111e19af99323970f6070bac75ae5d8df14e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/is/firefox-139.0b4.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "089f36c0ae651bbe196078e2d98593c4c612c2b81336f6018ebe54b201cb70b7"; + sha256 = "4b825583d13bf6f4b75cba352d1bf0eba3ab97c92f62da2c16aae79174f6f185"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/it/firefox-139.0b4.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "42f78e343de68b8bc33419a8fe983a2a31d83ebebc2447ddf9db02743b4103ee"; + sha256 = "2dff0bac0c85f40cb21103c48e0489573cd12a21078b8edc5af5cfd6c1c5be9f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ja/firefox-139.0b4.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "2d2c097f0ff0f15d864ec09e7ec74de30935973283ae2decc2929051fd6b4489"; + sha256 = "7012be903c3b748178a4bdd87849251f01bc341bb1d418e43c15adb8a5236697"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ka/firefox-139.0b4.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "6e0b139ad102bfd028dbd752a5488c53e2176d0b5aa59715dfd813bde861a8f3"; + sha256 = "bb7b562895a31c2985e5b57dcd697ea65e0627c3ca92a7a1031de12d88f2d112"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/kab/firefox-139.0b4.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "31a497c03ab41039abc657e7b24b980219e25590958d0219f418a6c8a267b0b7"; + sha256 = "534d152fd21b7206fa1d781167d2d39114224e694cd6e0ce0df0c51f632be8d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/kk/firefox-139.0b4.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "b8b85696af18ea3a53b8b0bb454b96713d194bbb555c081689ab3e2080c5e47f"; + sha256 = "c914ef270be6d93b244e77eae73f0b8dc81ccae98d1e5648c9f36df3534b5b83"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/km/firefox-139.0b4.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "ba9b7db2c6263a2ee3456366d145aa835b20e42828c9665359cbda626608d6d6"; + sha256 = "4c4b716afcad883b4c3d4ef98f256fd3a7383c6f6f9daf004ed57dc66c9cc1d3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/kn/firefox-139.0b4.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "d65d064f102a20f596ca72a87c365d12a446a50e0b5c7bcf90c98d927812335c"; + sha256 = "bf36d322be0eb143d16b3266f468218e4db77edf5752d92d0527737d5699bead"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ko/firefox-139.0b4.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "0150bdbf754a3a5055a6684bfd370982aa80866cc5ef3673acbcacc49004c1ca"; + sha256 = "d306fe18f0afb856b5eca468cadf0661a0f296900aa213693f9dfce7ce01e693"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/lij/firefox-139.0b4.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "7574d4aa6421d61bd76c83ee337a08733531b6e3ed291bf73718562fbea7f913"; + sha256 = "4134c5b66369b7e7baaf9ed18e686aec1f6fba8dabfcea557c8801e271099604"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/lt/firefox-139.0b4.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "259d5841f39910ecbbbcae05647e9b9e45525949e40f56d451677877998bbcdd"; + sha256 = "d02e63dc5244755d70d7c6adf8809e809ad5624b5b2cf7db5d549fe873c8e030"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/lv/firefox-139.0b4.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "7af8df80da1118c9da7611bab1889fa17f25b7a05d5cc65aa1fb676551c56fe6"; + sha256 = "49906a5a4bf59e755de8002436a431adf3a26ae70865a5c14cf2b1148d67be46"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/mk/firefox-139.0b4.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "7fb1dc800a568d59100cdbde3f387279b6d81d19945318d56832776219314f4e"; + sha256 = "d0baccadc36ae94f9038e2c22b0a90d2084c512b71471af4e8f744548c92a79d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/mr/firefox-139.0b4.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "078935be95f22dc8b15cb9e25ada5d96f31d3776333c46c5ce736267169efa04"; + sha256 = "f8015e7594ec2b02914884f5be2d50f2cf0236bbe496fec731592ac81eeeb9a9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ms/firefox-139.0b4.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "3628c6d7f073b1e7dcd224e708da5c14485066e7ba0503ba546cdcb447a5ea98"; + sha256 = "fd820b03aebcfda8057f630f881c49d443f14661a6bf55ddd4b9a26b4cdb9308"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/my/firefox-139.0b4.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "3cf629fa5e4a98377c039d35a150cb66daa9ff556b3a3a8eb6975eb1a73259a7"; + sha256 = "f2286cf08af4be1daf434cfe972049f40ed68b1d59a0073c0f022c9f02dee1ca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/nb-NO/firefox-139.0b4.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "8f2af84577fc72b2b25d2ccbcb9bb3b6a7369385253b9f54428b17667e5570da"; + sha256 = "668569c1fccef37f1398b1ecd9e9974081e6c055edd0577bc464fde69e5e7ada"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ne-NP/firefox-139.0b4.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "684bff075da0925c758b9030a4926adf821da91d800f5d7b084becd800275bf1"; + sha256 = "6ce7d8b5d852ca4abd94fd8505e52a2482b5b1ba207d48fd02dce6f585ef0fd6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/nl/firefox-139.0b4.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "9f0489801ca3b4c5e819f440d25e4eed4ea94c650d87d45ec0070954b6d60dfc"; + sha256 = "b57bac3e8a06c66f93f7c98a77accfe6a21661d6bdfc148cb2d8f3ce83bdbb80"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/nn-NO/firefox-139.0b4.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "3d969df152796d67dc4128f8b5d4caffc27cc163d8a922643d39263228fb8201"; + sha256 = "01ee287813e78d073926bbeaab9cafae2a11e9239f8da1db3c45b5d6168a5f8b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/oc/firefox-139.0b4.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "4170cacefa6b4d6d7569d3fa6133b488a75b53cefc3229b87a556a5da2e11734"; + sha256 = "7af2c95d9d6c9241fb98dc21a4c542f6e038098eca89a72aad53d03d834cf8d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/pa-IN/firefox-139.0b4.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "3e0987701d64d0c6054171b3587d8bc0e1ccbbd4ca2f7907c62a4146428509fa"; + sha256 = "c109cbbfc292aa3ad04656c79ee5fcd0b839032fc156499dadb60aed37d93c13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/pl/firefox-139.0b4.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "e3dd25e8120bfd69aab6a3b67f05aa24453edba986f85393d5e6c6e281bb8819"; + sha256 = "ad2ee57783e372d968b9a76b4b0c5f4cf039e53f6ab8ab5169d556bc9733b04e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/pt-BR/firefox-139.0b4.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "560ef4c0776897f5ccec34b3d8b481bfe6f6d5096cd4d3d984a444c417688e7f"; + sha256 = "c4b649b39622a0cdd8afaffdf531681659ae6c092221786df71ada4f8e5dc81f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/pt-PT/firefox-139.0b4.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "3dfc196e3079bdaac5377e467fdbf195bd93e045553990c3cdc0631feb1c8bfe"; + sha256 = "d84337d337c87390e8ac98f43d8b1199d3b8bf640d55ddd2eda86f3c6c2f9084"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/rm/firefox-139.0b4.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "a4d89476a65d7be5502aac1d85a50110198b23362de3df69d34c66bbe8c51d52"; + sha256 = "a8d422e2ebeb5c76a27e3df7dc8ca4052be628022d3d7df38255aae4b14089d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ro/firefox-139.0b4.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "1723c06b5ad3fa1fe06b6b3d7a2ff18a4a94cec217fc46501e571b69ed4bace3"; + sha256 = "4b222f477c9291a0ed28dd51f57588914e26efd69c0a249cd2f4a3251ef2b3cf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ru/firefox-139.0b4.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "dcc26bb5ad02edf2e3afa0c73b5381be48dcbdc12ffc24d9f6df6d2afb639df8"; + sha256 = "caa6d2698ce1e5508f5fad2bf90563b10a8f9961042c089f2f1a5e4d61822246"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sat/firefox-139.0b4.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "fd686c94a6a9506bbfa6e7a362c39728ecacb59e762467725d78af5dd16a6d03"; + sha256 = "3f17440f5a67e6ac0f7f0a67eea72a4beae7c20627ba97c786f4740563adb4ff"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sc/firefox-139.0b4.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "488066e0a984fa21637b0aab44c7e78481625acf309da28919a4dd1042ab193d"; + sha256 = "3eb57781a60c295918d7f065edc1429bcd2685f01398c3176fbfd097bf88e059"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sco/firefox-139.0b4.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "541a7eef9f6b9cad7498f2166e0b9a99e5eda68956649825fafb8283dd78762f"; + sha256 = "a6c32b5c1d63728429ada5211857a49c056ce93b23d428f26a8d00efbb143e91"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/si/firefox-139.0b4.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "7fbdcaf6588d7aecae6339e85dc50e6884c88462df6dd5789fd36bcb91f264bc"; + sha256 = "dc50c48c50cd0fa013b0754dfcecd15015392d23e0247f33b3ad15cd7aa309a6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sk/firefox-139.0b4.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "8a322025bb0f6b59a1afda171463e200a1021666c9c5a8a013c538d2d8e253bf"; + sha256 = "35906da5afd4bf8a52ddbd2ddeeb9ce01b40d5e93968e4e1f66541d0dcfb1b88"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/skr/firefox-139.0b4.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "1d2d7aba9d3e02d36d578e67a71ada78f85ae10d1b76107b33eb58906c48687c"; + sha256 = "0af03523f3a0987e32c36d182d51c318f62efba1f614d2864e571837ca8eab13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sl/firefox-139.0b4.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "a18a3a73b20bed6a85af824851e27e64ff437eb4fb30b0c2232827f2ea3f5b7d"; + sha256 = "d7b9c75397dddb544fc4287e43f255929f04ba3e5cbd9c8c737f1f47d4d8353f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/son/firefox-139.0b4.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "ce5092715fb13917401b79edc9b6cecfb08b07daf4400d70f7918bf0b5c3b614"; + sha256 = "7ab390ad40c8c7db2029a5ff103e523f2dce8691926e4f3f140c911a862937c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sq/firefox-139.0b4.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "24d2717b7a4c35a4722723c198223829b08490e24c463cd0dc373beec76116f9"; + sha256 = "3fa9746d65d15ebed2d0bef82e16c26c25fe40671ea71651c3ea55f23769a5d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sr/firefox-139.0b4.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "c482b732493da48cb9547e1c8a3159f417560d5c9ea7e1353b70d5534deff6df"; + sha256 = "954194b63497a3c490f819188c7353139af87a0c6ab2a0b87ce5db1a942d8b68"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/sv-SE/firefox-139.0b4.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "02e92e4f7a6cae0b8e7d7af5ddc822740aa11c38f395e164ef1278441f947eee"; + sha256 = "ef30b8f7ba31857b871c4e41d139eee7ac6bfc759a461c0addec73b1e1559695"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/szl/firefox-139.0b4.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "22f68b8e3d2cfef8f8bbc0b62b4f35b2bf731d4ab783597f71453e7b998a1fa0"; + sha256 = "ba038643ce7af49c6e16e6eece4a56b4bbe85a9a14639d534b9cf64884046154"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ta/firefox-139.0b4.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "523c17cc6a6fa98fabcda73f9849ed96aac853af1a22180af19eeaf788810ba4"; + sha256 = "b12d92276744680c57aeabdbd714bf5d3f2ea09030858d6d38d4aae80099989c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/te/firefox-139.0b4.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "80a19adfdf06cbee81fcb7a4d8118a1f7c8928f972ce9aa98e7854b12b2d8728"; + sha256 = "eb5b186241b7fde86cc0f57fbe3712ef1d3831700d741c1955fd89efe84aed96"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/tg/firefox-139.0b4.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "3e2a18dfefd0f14bf92983d195e36d689ade2c5f4e1ab0379a9ebf1d0c526cc8"; + sha256 = "b3f5feef512525cc09d11935cc1fb0b7086756158bd6cc6dffcd22cf3ec9497f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/th/firefox-139.0b4.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "5e301b1865ecd3b08d8862c55b14b6e65af20bb1587214f82dd27f466ae7202c"; + sha256 = "2d187742b7e8a60f0a427b60f41f1d684d19360e562d2fc9d0f968cce4581b21"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/tl/firefox-139.0b4.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "1c05bb2c82fb0e1795d5c9af307c66ea3d8942e922feacf322829c6ccba630a7"; + sha256 = "44c490eccdae6a1c0fd08d7c3b589de398498f4ff705292ff6f72366f27dd768"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/tr/firefox-139.0b4.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "4ee13bfa40a70177d87a5a071c984bcccf004a9496013fa7fdbfa9da5ec6b3b9"; + sha256 = "b784b58007959048c3067a041950813ec8be9ae30a73dc24bd0b5f1b3d702460"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/trs/firefox-139.0b4.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "cca347c702ee2cd6c4e11352b1eea381faa41bd692a9aeda8fbb87d5c570d3c4"; + sha256 = "611991646e94273c6b142f2af670755fe18878f2a5c61a2e9f13a0fea99ce775"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/uk/firefox-139.0b4.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "54246050515f6891d54cdee6f5705b255c9bb73e60de6097d3c96092facd5865"; + sha256 = "90c25ceb18b53030e881e0f44b7d3e23c5b6c9cd380babfdcad957783d0e0c4e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/ur/firefox-139.0b4.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "f06793e672b05ae4b66a0bf2be25faad0ca1ed9bb8e8f654b1e6c07fd4a47c23"; + sha256 = "9be466dcebfd73ff9b5a4b0982a9421034654310ccf077fb812d652b67d6d284"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/uz/firefox-139.0b4.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "0c166ef499c1cc6472f041e02583be6e24dbd81ce18bc30b76766bce419f54ac"; + sha256 = "9d58ea902acb5ad35b19cd87f5423b21fb7772512156198d2fd05f84c08a778f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/vi/firefox-139.0b4.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "3f685557dc53df3df6fdce6d0c20b1cd23de9c80a5d3b78ae0a1c3c3c72d9b61"; + sha256 = "2cfc4c3f5d129a3041096dde196f3e887498a886dac1ab6845fb54b7eeae16d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/xh/firefox-139.0b4.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "70fef2d3a7992942f12c086959162070d3687390c701910cd6cba83e6610c349"; + sha256 = "4eab0c87e4bd3f54d1e77b83a8c82b084c23beb0d0882d542e04bb19e798c98a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/zh-CN/firefox-139.0b4.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "18f6d9ddde4256839fe9fca9d07754b16dc98075844e502a8068a0fa814b59b3"; + sha256 = "e6094469887c77d367ca255d0b461d47f9a352b12602042caaf668846b5f295a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/linux-aarch64/zh-TW/firefox-139.0b4.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "99dc1b10d0de3ac04d2547de7e92f5db72cfd429692212325842ed5349815a17"; + sha256 = "4b5490a70185a206ad337404876cf943bd49681065d87e302a2856d2543b0329"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ach/Firefox%20139.0b4.dmg"; + locale = "ach"; + arch = "mac"; + sha256 = "4a42735641e22b977ec4ac31451ac8e0a17faf7e409a33f0d35a33efe5e033c0"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/af/Firefox%20139.0b4.dmg"; + locale = "af"; + arch = "mac"; + sha256 = "15754862b1b05ac166ae8f157655477aaf008fb7dff4ecb8847bda815dfb74fd"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/an/Firefox%20139.0b4.dmg"; + locale = "an"; + arch = "mac"; + sha256 = "ae9f4fb8eeb5d868a89c2f602d036ce71c199489d704bfbb430ceea99d21ceb9"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ar/Firefox%20139.0b4.dmg"; + locale = "ar"; + arch = "mac"; + sha256 = "b5fa0c0e348e1aa81719979ed2348b36efb77e212e4806bb70131400ef3a3b1c"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ast/Firefox%20139.0b4.dmg"; + locale = "ast"; + arch = "mac"; + sha256 = "97c54f7224b0baf23d2f0c775de23aa3187f7f41de4e2d406634642967fbf797"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/az/Firefox%20139.0b4.dmg"; + locale = "az"; + arch = "mac"; + sha256 = "0166eb8d67ec5cef8efb3c0625e8a4d3b0dd23e1a697ad1b3193e3acf3515b82"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/be/Firefox%20139.0b4.dmg"; + locale = "be"; + arch = "mac"; + sha256 = "995a25f2eb716ece9467a62673e1ad5938b3eca2bee1b8fc0392ecbf08d79c78"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/bg/Firefox%20139.0b4.dmg"; + locale = "bg"; + arch = "mac"; + sha256 = "58eebc470431b310c5012ee22e21051295742cb4cdcc991bfacec025f20f16a8"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/bn/Firefox%20139.0b4.dmg"; + locale = "bn"; + arch = "mac"; + sha256 = "8c019e1b39c963a6c776bec5065440190afea8661a86e098d73a4139ede3438f"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/br/Firefox%20139.0b4.dmg"; + locale = "br"; + arch = "mac"; + sha256 = "c263c604507b44d9eceff1c6a4d88a5d03f6b72a437235902440811b5594fc4c"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/bs/Firefox%20139.0b4.dmg"; + locale = "bs"; + arch = "mac"; + sha256 = "709e3edf72a4927c929eb978611553f1c9c51f4d2b65ad8316ae08e7db5727da"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ca-valencia/Firefox%20139.0b4.dmg"; + locale = "ca-valencia"; + arch = "mac"; + sha256 = "fd21e0c49e8c89479e43a5e8e6eadcc565550ccedae11b48e534875c79858c40"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ca/Firefox%20139.0b4.dmg"; + locale = "ca"; + arch = "mac"; + sha256 = "49945e34d0031cd6d734904449c0cc45bb43a064674ae30d249a69202aa2ffc7"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/cak/Firefox%20139.0b4.dmg"; + locale = "cak"; + arch = "mac"; + sha256 = "9716963c81d5bf84ccc5046a1cc61a3bc4e593f116b390e761f2dba1edf7d1f9"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/cs/Firefox%20139.0b4.dmg"; + locale = "cs"; + arch = "mac"; + sha256 = "239a8caba9b1a23b7c98ab9f507d8718594f353dd27c079efeb8b42bd77ae7ea"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/cy/Firefox%20139.0b4.dmg"; + locale = "cy"; + arch = "mac"; + sha256 = "cecc8f11be8ccaa4b3d98120e86c347510b56a04c9812ba8e98852f331bfe6c5"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/da/Firefox%20139.0b4.dmg"; + locale = "da"; + arch = "mac"; + sha256 = "6edf58c11f2d4ab1ea575bc5b5fc32cf9cdafff197e17aa47450fc940a22ae15"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/de/Firefox%20139.0b4.dmg"; + locale = "de"; + arch = "mac"; + sha256 = "0e0d6110bb40aca8498523b49e48da8fc4e7ae198191aeab5b7f0e9e9baa11f2"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/dsb/Firefox%20139.0b4.dmg"; + locale = "dsb"; + arch = "mac"; + sha256 = "8713f01cea21be9d90e917809b963aacd05d8ca5fb8d311e46c06e693a40ded7"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/el/Firefox%20139.0b4.dmg"; + locale = "el"; + arch = "mac"; + sha256 = "75eb0726b6cbf7e2b5172a282b79069d1580cacfa0f9a1654853195d9976d84f"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/en-CA/Firefox%20139.0b4.dmg"; + locale = "en-CA"; + arch = "mac"; + sha256 = "1cf3f9e0bdd4941243f11a55c3fb4a24dac024a942ad2b89d568b784f174fb1b"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/en-GB/Firefox%20139.0b4.dmg"; + locale = "en-GB"; + arch = "mac"; + sha256 = "b29064c4277036ebca99ea3cbbebf7ef887247e97e34778180c3381da673aae2"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/en-US/Firefox%20139.0b4.dmg"; + locale = "en-US"; + arch = "mac"; + sha256 = "c61d0fe161c6cb778a3e564f4cffa70cc7fb6bb5770586fa66c7db8ab9c31cf1"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/eo/Firefox%20139.0b4.dmg"; + locale = "eo"; + arch = "mac"; + sha256 = "fdf543162489d4165d8b39e01bad6d28addcad942d90c32aa2068e74558def80"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/es-AR/Firefox%20139.0b4.dmg"; + locale = "es-AR"; + arch = "mac"; + sha256 = "13641a204ea5fbce36d1c9661fc149081e90fcd03a2840300a288861bacd5925"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/es-CL/Firefox%20139.0b4.dmg"; + locale = "es-CL"; + arch = "mac"; + sha256 = "1fb4f9f7f01c78188b038a1116b4e19607388947067dbcad3bde3daa115e5f68"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/es-ES/Firefox%20139.0b4.dmg"; + locale = "es-ES"; + arch = "mac"; + sha256 = "13cc2d4179bc10b58253e8a88cabb8228f9fd14fb1e237f002c7220c29c790af"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/es-MX/Firefox%20139.0b4.dmg"; + locale = "es-MX"; + arch = "mac"; + sha256 = "a78061c9a63720610f1a11990199299a66e6c3f805821df80fc994bcab01d2e1"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/et/Firefox%20139.0b4.dmg"; + locale = "et"; + arch = "mac"; + sha256 = "3623ae5b628d82224b39e5506e5f1b604355e932d7a2e320795baeb72e892323"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/eu/Firefox%20139.0b4.dmg"; + locale = "eu"; + arch = "mac"; + sha256 = "ef038ab87151a9ec36b311ab73fab8d5444f8ac9317c94b8ade608a7387f83bb"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/fa/Firefox%20139.0b4.dmg"; + locale = "fa"; + arch = "mac"; + sha256 = "84034c107634a08322974c899956ef02ec725970603d9f73d15833c508089984"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ff/Firefox%20139.0b4.dmg"; + locale = "ff"; + arch = "mac"; + sha256 = "2874b586b9cc2f55fe12a1dda4de3f45f702966359f62276b6009c113193e87d"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/fi/Firefox%20139.0b4.dmg"; + locale = "fi"; + arch = "mac"; + sha256 = "dba286212463e1fcd3052dcaa8a66fa2d5a938052c74b655d634e700522041e3"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/fr/Firefox%20139.0b4.dmg"; + locale = "fr"; + arch = "mac"; + sha256 = "d4ca7c3969f32f2af2f2ca4824d4439228a8e17386c9cf9fe849caba4c271280"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/fur/Firefox%20139.0b4.dmg"; + locale = "fur"; + arch = "mac"; + sha256 = "4accfe0a3721b1ac5ffac33b586e778fe888210b92c4375c80aed95e3daa34db"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/fy-NL/Firefox%20139.0b4.dmg"; + locale = "fy-NL"; + arch = "mac"; + sha256 = "db6751ce87b9e801a1bb72a0f04c7f909fd6aab5c4cb5591b522e798355f9eba"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ga-IE/Firefox%20139.0b4.dmg"; + locale = "ga-IE"; + arch = "mac"; + sha256 = "257dc1d4b56b5e633bdba46ec71469b746f175ebab0463ca3792257e7c6efdf0"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/gd/Firefox%20139.0b4.dmg"; + locale = "gd"; + arch = "mac"; + sha256 = "e2f8d9c9c0a494239472b760687d1bdcaf018a9a3a87882541936ab3c628f974"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/gl/Firefox%20139.0b4.dmg"; + locale = "gl"; + arch = "mac"; + sha256 = "f735a8db8e58deb85c1b2455db1924f3375df450890bd1e0a94990e5744bc831"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/gn/Firefox%20139.0b4.dmg"; + locale = "gn"; + arch = "mac"; + sha256 = "4c859dcd1819e5c53a3adff48d958a8d301a37e72ed0de63abd71889aff02c0d"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/gu-IN/Firefox%20139.0b4.dmg"; + locale = "gu-IN"; + arch = "mac"; + sha256 = "ba0941058959c7cfc06cbe6cab3245499850369f7f31d8428cc1cdb88f1ff673"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/he/Firefox%20139.0b4.dmg"; + locale = "he"; + arch = "mac"; + sha256 = "75e398253677225953a07d1e9e144adc4086968899554b7d57031cc8f5b1b638"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/hi-IN/Firefox%20139.0b4.dmg"; + locale = "hi-IN"; + arch = "mac"; + sha256 = "66872abb8f5eeacdbe8bd6f5c96c9566e72ebfa57b897dc64c46df2ab0fdfc84"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/hr/Firefox%20139.0b4.dmg"; + locale = "hr"; + arch = "mac"; + sha256 = "d8d8e4aea4c86635ee536fa929e12eece775e2abab09956244776a9de308b4bc"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/hsb/Firefox%20139.0b4.dmg"; + locale = "hsb"; + arch = "mac"; + sha256 = "d5c31f2a62960141813d8f0d9120fd9af14a114e418b2f71c4b61760abb0addd"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/hu/Firefox%20139.0b4.dmg"; + locale = "hu"; + arch = "mac"; + sha256 = "aec856b42ff661f07626fe6e7c49fbc09eb09b7e3732e5a4ffd7e2152ba18fdc"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/hy-AM/Firefox%20139.0b4.dmg"; + locale = "hy-AM"; + arch = "mac"; + sha256 = "3757bad209cde3d24c008756be1e1ba03bc86a6567c5f919221b75ca113c70c5"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ia/Firefox%20139.0b4.dmg"; + locale = "ia"; + arch = "mac"; + sha256 = "669117617c58b1048772c519dd9796e25636703d6f1ce29ca4b41a25c9734140"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/id/Firefox%20139.0b4.dmg"; + locale = "id"; + arch = "mac"; + sha256 = "4e7a95a805b4a870201728c6fe267a69751b8d7135210133718b48771b1efd81"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/is/Firefox%20139.0b4.dmg"; + locale = "is"; + arch = "mac"; + sha256 = "1ab46c1a5858000683c0004dc3fdb59d2b2ded4e78b24b1d9ec0daf2945db6e3"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/it/Firefox%20139.0b4.dmg"; + locale = "it"; + arch = "mac"; + sha256 = "e7cc58da37fa5dc49d32b85c226e25214546dab7798458f18db31c3a28420691"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ja-JP-mac/Firefox%20139.0b4.dmg"; + locale = "ja-JP-mac"; + arch = "mac"; + sha256 = "26ee160188fcb0d59bb88e0ae10856b556a01a16254f59b122490714ac3a8cef"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ka/Firefox%20139.0b4.dmg"; + locale = "ka"; + arch = "mac"; + sha256 = "4ceb3e350415425f05ce77abdc582d4f5a8934dae7a987cfa9ab909543f25d1a"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/kab/Firefox%20139.0b4.dmg"; + locale = "kab"; + arch = "mac"; + sha256 = "eb2cd412c94a67415664290b14a08f5bb870b3f25e7fa404dfd68272e33df4fd"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/kk/Firefox%20139.0b4.dmg"; + locale = "kk"; + arch = "mac"; + sha256 = "c2bbf15bd5013388c090b9ba7631ccd6ca803c262b2e3f8ac8f07a8ff22d0bcf"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/km/Firefox%20139.0b4.dmg"; + locale = "km"; + arch = "mac"; + sha256 = "b75cfef561797c1b19f696234e6c5792f0835de469b71dc0736c47087ea43b02"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/kn/Firefox%20139.0b4.dmg"; + locale = "kn"; + arch = "mac"; + sha256 = "383e8dca3ee948a086e4a9bfb16149c443ecb5aab957564ec33e7f32b98f3c61"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ko/Firefox%20139.0b4.dmg"; + locale = "ko"; + arch = "mac"; + sha256 = "e4fd810f240a24a9fa9d7d9a3e3d52d3eb8bcd59704da3777998c4288d8d5634"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/lij/Firefox%20139.0b4.dmg"; + locale = "lij"; + arch = "mac"; + sha256 = "d803bf21f5b2fbd058319b68b86ee3a1ceefa9473fc0ed85cf549065c4040a13"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/lt/Firefox%20139.0b4.dmg"; + locale = "lt"; + arch = "mac"; + sha256 = "3e8a7440f91d017060f4045a2bf99eeaafbffeb114de3a3afde30b71dee77f54"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/lv/Firefox%20139.0b4.dmg"; + locale = "lv"; + arch = "mac"; + sha256 = "cc82e24338955ea73fc488cd2bd4408783e1006d8a4644036de09c2731cc1fa2"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/mk/Firefox%20139.0b4.dmg"; + locale = "mk"; + arch = "mac"; + sha256 = "d12e758204660abeae700ad10b79effb2627486cda0a6123bed191e3d6ff9282"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/mr/Firefox%20139.0b4.dmg"; + locale = "mr"; + arch = "mac"; + sha256 = "8ad6085ae950d89ba4754dd9ea3f9154ecf12252ee47636fd6834ba8dc7ff71f"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ms/Firefox%20139.0b4.dmg"; + locale = "ms"; + arch = "mac"; + sha256 = "c7f082195da9a650df72066d7f4e9004adb59fca30deaed4ecfd2e70514c02fd"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/my/Firefox%20139.0b4.dmg"; + locale = "my"; + arch = "mac"; + sha256 = "639b38b8c6b9e42ae89fbaea360ddfed3be74e9eb3a55456a251d9d22ede241d"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/nb-NO/Firefox%20139.0b4.dmg"; + locale = "nb-NO"; + arch = "mac"; + sha256 = "87a676d880411221b19763c9263024507d41e0c89f6fd818f8efe8563952bd09"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ne-NP/Firefox%20139.0b4.dmg"; + locale = "ne-NP"; + arch = "mac"; + sha256 = "b8018da6989bdb66b02dc386b608ee439718b5ba2f377dc3302710ce7854aa8d"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/nl/Firefox%20139.0b4.dmg"; + locale = "nl"; + arch = "mac"; + sha256 = "9037c896ea9aedd7275c8922f4a61d5ad9e4b41ecf43f808e9e996c7d702ed33"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/nn-NO/Firefox%20139.0b4.dmg"; + locale = "nn-NO"; + arch = "mac"; + sha256 = "06368696dcedd347d62ceb7a1bf3ce6f0d92eab035310aa704b0a09a495448c9"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/oc/Firefox%20139.0b4.dmg"; + locale = "oc"; + arch = "mac"; + sha256 = "9865f0cf11e8baf3b6930617597ba807b1e06d95abc9a8a68525119a0d591e48"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/pa-IN/Firefox%20139.0b4.dmg"; + locale = "pa-IN"; + arch = "mac"; + sha256 = "1bd442dfd70d0da87a4904f25a955323fa15d1551d529e710876c2c4e7cf257a"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/pl/Firefox%20139.0b4.dmg"; + locale = "pl"; + arch = "mac"; + sha256 = "e261443f9dd5160e941378c9c8f0aaef9159ae21172babecd0154b7481081210"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/pt-BR/Firefox%20139.0b4.dmg"; + locale = "pt-BR"; + arch = "mac"; + sha256 = "4140fca76b890df5b79a7accc26bba64f43b31b3818bf5567930451666cfca43"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/pt-PT/Firefox%20139.0b4.dmg"; + locale = "pt-PT"; + arch = "mac"; + sha256 = "8d492cdcc1af5e98bf89039474b1af4e7e4f784e82ad2645351500a2dc22bf23"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/rm/Firefox%20139.0b4.dmg"; + locale = "rm"; + arch = "mac"; + sha256 = "c65018162dfec1f1f1a03be127fb27bbd25a604a4e5d2df53f5bbbd13f02e64c"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ro/Firefox%20139.0b4.dmg"; + locale = "ro"; + arch = "mac"; + sha256 = "396b5d2061bb0df1fa5af0b1b77e92c230e043a853cc0df7bad529c74eec6c1f"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ru/Firefox%20139.0b4.dmg"; + locale = "ru"; + arch = "mac"; + sha256 = "c90e4d1bf9440ab473eeeb6ebbf57051b30d13f5586abe7adb61487f43b15423"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sat/Firefox%20139.0b4.dmg"; + locale = "sat"; + arch = "mac"; + sha256 = "4a02f90828c7bcd302ed8e2689dad6b9186ae230210c0a56b2a8fcfc3001880f"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sc/Firefox%20139.0b4.dmg"; + locale = "sc"; + arch = "mac"; + sha256 = "1ce3f7cb4770771ab928006ccd0c2d855a5c69179efec9e62e8dafbdcffd54f5"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sco/Firefox%20139.0b4.dmg"; + locale = "sco"; + arch = "mac"; + sha256 = "5ac1424837f62ff290017a880b9b816bc7ab79e7a4401a2e8dbab8e3b05478c0"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/si/Firefox%20139.0b4.dmg"; + locale = "si"; + arch = "mac"; + sha256 = "6f0f1b88034a03b3f1c31db951f23555b2e758338b92eb7e9486b38376b0540a"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sk/Firefox%20139.0b4.dmg"; + locale = "sk"; + arch = "mac"; + sha256 = "44d0e95057c74f1e6728ed14aeeb4846f789d5c7770a327a6530c21837bd230d"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/skr/Firefox%20139.0b4.dmg"; + locale = "skr"; + arch = "mac"; + sha256 = "e18e95beecb16f455ff78e9eab622e6df7e80b0461c6beec5e2b68534802653e"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sl/Firefox%20139.0b4.dmg"; + locale = "sl"; + arch = "mac"; + sha256 = "065a5250d0145b713685c045280cca1bf7a2559e10d1c812fc4e1a6108b0b114"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/son/Firefox%20139.0b4.dmg"; + locale = "son"; + arch = "mac"; + sha256 = "e7d1090386a485211cb358bb757a0fa54d0953eac79347eea36dce4808d443a8"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sq/Firefox%20139.0b4.dmg"; + locale = "sq"; + arch = "mac"; + sha256 = "cb5a4f74226b68fafe633f6e39af27948ffe9bfa3c866cb9f935018f0ab01fb4"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sr/Firefox%20139.0b4.dmg"; + locale = "sr"; + arch = "mac"; + sha256 = "676d0da9ee7951a46270b9f47bd33ac5135b4a439a93f61eb260c8f0af2c0d49"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/sv-SE/Firefox%20139.0b4.dmg"; + locale = "sv-SE"; + arch = "mac"; + sha256 = "c4f9814dab5efee3a4a67cc9f8bd703d015b51f4e59947dac56636f0a9325048"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/szl/Firefox%20139.0b4.dmg"; + locale = "szl"; + arch = "mac"; + sha256 = "1d92ef8edb7bb67be228771019f2f1fc9ae72ba3f005998f9f2db60287fc81e2"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ta/Firefox%20139.0b4.dmg"; + locale = "ta"; + arch = "mac"; + sha256 = "f210471b4963521bce9aa29b4526e786cfd615a7dc3c57f6f16c92327ebaed86"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/te/Firefox%20139.0b4.dmg"; + locale = "te"; + arch = "mac"; + sha256 = "0c22ca5d3109cd8ff222906afe4ac7023aad6e983e1c00cb21159e018a2ae52f"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/tg/Firefox%20139.0b4.dmg"; + locale = "tg"; + arch = "mac"; + sha256 = "1d9f2a44adec91d4120228640d6cf73290ca40333109b28f8c6f832e4cbd382b"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/th/Firefox%20139.0b4.dmg"; + locale = "th"; + arch = "mac"; + sha256 = "315c2049ab3f0905cc8e3420cddf90e00e7e0a54b65b60625c1eab2f2e560ef4"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/tl/Firefox%20139.0b4.dmg"; + locale = "tl"; + arch = "mac"; + sha256 = "b8ce0475f332fc463ab40763ef250ae4711591f81f60065a3d66fa39a1c06dfb"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/tr/Firefox%20139.0b4.dmg"; + locale = "tr"; + arch = "mac"; + sha256 = "ba882caba5bec222b61c307d661caf1d2a3bbc8e58de21c6ecec9a0e48a10c64"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/trs/Firefox%20139.0b4.dmg"; + locale = "trs"; + arch = "mac"; + sha256 = "fae309ad38fd0972148effa759d979a43c3233c424fcef036921371a5f5c4355"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/uk/Firefox%20139.0b4.dmg"; + locale = "uk"; + arch = "mac"; + sha256 = "54d8631cc02b44f286cc3716034fa854da91486ac78dae035a1206f1ac00685f"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/ur/Firefox%20139.0b4.dmg"; + locale = "ur"; + arch = "mac"; + sha256 = "e401903f76ef26a3b968a605776428c8b55b54503587644706c2e991f4684932"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/uz/Firefox%20139.0b4.dmg"; + locale = "uz"; + arch = "mac"; + sha256 = "f12af8f8cd8d56742dd2a780842b88649d0914aae5151edd7071643bfd96337d"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/vi/Firefox%20139.0b4.dmg"; + locale = "vi"; + arch = "mac"; + sha256 = "5981392db9d826d35e2a23a0da72664883c57a2e30273912a35cc80dd5e8dba1"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/xh/Firefox%20139.0b4.dmg"; + locale = "xh"; + arch = "mac"; + sha256 = "4d86249d3b3cef3b87f2974199bdc49b5f4116b76595a8c33fc261b7ca6945a8"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/zh-CN/Firefox%20139.0b4.dmg"; + locale = "zh-CN"; + arch = "mac"; + sha256 = "1c1b40f50bc92af90419cf2851e707b815dca48ffd43a550a866c3c09e212f36"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/139.0b4/mac/zh-TW/Firefox%20139.0b4.dmg"; + locale = "zh-TW"; + arch = "mac"; + sha256 = "7b41474db868d1ddf74bbf96486ea51ca8f187075bff0dabed74ef47db3114a5"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 0e353c46130e..885627bbfb7a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -27,18 +27,23 @@ systemLocale ? config.i18n.defaultLocale or "en_US", patchelfUnstable, # have to use patchelfUnstable to support --no-clobber-old-sections applicationName ? "Firefox", + undmg, }: let inherit (generated) version sources; - binaryName = if channel == "release" then "firefox" else "firefox-${channel}"; + binaryName = + if (channel == "release" || stdenv.hostPlatform.isDarwin) then "firefox" else "firefox-${channel}"; mozillaPlatforms = { i686-linux = "linux-i686"; x86_64-linux = "linux-x86_64"; aarch64-linux = "linux-aarch64"; + # bundles are universal and can be re-used for both darwin architectures + aarch64-darwin = "mac"; + x86_64-darwin = "mac"; }; arch = mozillaPlatforms.${stdenv.hostPlatform.system}; @@ -71,40 +76,58 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha256; }; - nativeBuildInputs = [ - wrapGAppsHook3 - autoPatchelfHook - patchelfUnstable - ]; - buildInputs = [ + sourceRoot = lib.optional stdenv.hostPlatform.isDarwin "."; + + nativeBuildInputs = + [ + wrapGAppsHook3 + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + autoPatchelfHook + patchelfUnstable + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + undmg + ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk3 adwaita-icon-theme alsa-lib dbus-glib libXtst ]; - runtimeDependencies = [ - curl - libva.out - pciutils - ]; - appendRunpaths = [ + runtimeDependencies = + [ + curl + pciutils + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libva.out + ]; + appendRunpaths = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "${pipewire}/lib" ]; # Firefox uses "relrhack" to manually process relocations from a fixed offset patchelfFlags = [ "--no-clobber-old-sections" ]; - installPhase = '' - mkdir -p "$prefix/lib/firefox-bin-${version}" - cp -r * "$prefix/lib/firefox-bin-${version}" + installPhase = + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/Applications + mv Firefox*.app "$out/Applications/${applicationName}.app" + '' + else + '' + mkdir -p "$prefix/lib/firefox-bin-${version}" + cp -r * "$prefix/lib/firefox-bin-${version}" - mkdir -p "$out/bin" - ln -s "$prefix/lib/firefox-bin-${version}/firefox" "$out/bin/${binaryName}" + mkdir -p "$out/bin" + ln -s "$prefix/lib/firefox-bin-${version}/firefox" "$out/bin/${binaryName}" - # See: https://github.com/mozilla/policy-templates/blob/master/README.md - mkdir -p "$out/lib/firefox-bin-${version}/distribution"; - ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; - ''; + # See: https://github.com/mozilla/policy-templates/blob/master/README.md + mkdir -p "$out/lib/firefox-bin-${version}/distribution"; + ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; + ''; passthru = { inherit applicationName binaryName; diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index 99f3b34eac18..40ef23e60fdf 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1859 +1,2477 @@ { - version = "137.0b10"; + version = "139.0b3"; sources = [ { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ach/firefox-139.0b3.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "52c3949eca045c95ad334740088139ca3dc3f22ab277cd42b9b7aa002e97a029"; + sha256 = "fd57bc7e6844cedf2c85e685246c42d929d3156a77e1d0ded40b8bca1099d5a7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/af/firefox-139.0b3.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9e49034499c0ec77e06596fb76878ad066dd3ce2825c7c591b4757efd6b00778"; + sha256 = "5fdb91b4dee48d1ca0a4191b6d4be2ea44bc2b1513efa50434b763f1fcd9d69e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/an/firefox-139.0b3.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "23593aa50346f535cb00ff11a801bd172bf819f6fab0f11f963c5b3f8c29c71f"; + sha256 = "ddb7dea1828c4906c5a6126f1d325d4eafade0a247d0f22fcc9c4e212bb79010"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ar/firefox-139.0b3.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "df1ad81eebca06458c61fabca2abd3f6b3760c07607a004f3e4ef6466947be79"; + sha256 = "cf581f622fb37c71e2886fd122bdc826600ab04cb8a2a5725905d29ea087157a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ast/firefox-139.0b3.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0aa09eff372d5ac4071ad705600ff72993b2e697267f3d2fbd1c09261b90c53b"; + sha256 = "436e4ab12e59de6b5cb5cba78d3e68db43e0408460ba46b25b81e03effd71eb0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/az/firefox-139.0b3.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "0814953878e05bc6cff14bded5588e587378dbc7a77c238c6b9d27915f119e86"; + sha256 = "1d62aa36c32b2dc2f4af25ba12679436bcf79e50c2b73db1624e4fd7bf46933b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/be/firefox-139.0b3.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "4f8efad5a43b01f4e843bfb0434f38143cc747deceb88e3c4c6d9e010d3e29bd"; + sha256 = "f054bea6716d06ef8aecbbf147d3c81cb61f514e82ad57f515204aa176abc33d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/bg/firefox-139.0b3.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "9adc3ffdd8e13a83953587fc91d5084c99b250ad3235674aae9e473c74afeb09"; + sha256 = "ffb4c108609792de752947becc51c2e2975e90ea0fe46d44601c186f804eab49"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/bn/firefox-139.0b3.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a154ab4afef7f96f368c1a57a60ed6e7dd3eadd173d1b949df13269d2686765b"; + sha256 = "877a26a16590cde1bcd678b0d419bec76f09cf4be230d0fc93fddf751c08b13e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/br/firefox-139.0b3.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "303410e14fd0f90b83c8cc2f0c01bd1ff14593b9edcfff80bbb2131bf4ada56c"; + sha256 = "55bd564631ecc2614080ce653ad5312ec5d7de98df948b1bbe8dd9e613cc77a5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/bs/firefox-139.0b3.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "ae56507b657255e00785e2a81900aef0227c4bf2697e1f65be06d85e52b3ba00"; + sha256 = "f33fbced526a89acab9fc34a860e4811cb83842a583f6d7871d11152ff1fee4c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ca-valencia/firefox-139.0b3.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "5de065a4123eee581d4cc5e67927bf205d09a7e9af4d4de978d9005328695c59"; + sha256 = "d9c250c770914d018f596cb15ff87c0d009ef0121a040f09c1c2e8c95e415570"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ca/firefox-139.0b3.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6152484711ff0116f45c46002233266d097834044adbcbfe576fa9f553836194"; + sha256 = "1a675352282c3fb2966287a0e763defc6f259ea396ee17c9ba4d71e79ce263ad"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/cak/firefox-139.0b3.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "2ac9e664ad52c7035231533a03d04e66e12a3e1ce39891d4e7369e8285556b2c"; + sha256 = "3a672f2a6b1132d0cc37c9fac289c7029588d585e887a05943e01d2df0059562"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/cs/firefox-139.0b3.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ad6389f4243d06d2fab3565082c5d167ff3c50f0662ac0e3a5bf4a26325ff6e6"; + sha256 = "f83bde54b11b0cb95c49a953d74f5d9dba8351e775ddb53238debeee26ab558b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/cy/firefox-139.0b3.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5dd6b52f212d7b67e8003b7ab5fd351febe2d8fd51864435eada72a1523f95d7"; + sha256 = "6876cb45e012664a3ddeeb8d833a28d97af191b3653a850393ba24c850c1c327"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/da/firefox-139.0b3.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "35bc5a722500ccc4065f8dfae1d78a9cd4575a5a908560e0a0367e54ee945ca3"; + sha256 = "438f790a0a0c8648c9d265a4e3d487d87ffd6b41beb91bddc8b60e538e2a7d40"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/de/firefox-139.0b3.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6a9ca1d0698bc57341a822f344d017464154cf8f9fbeeda01a54c7de2d12ccf9"; + sha256 = "70d4882852da68a7e431de93377cb7b7a1f68b906c2b3332f6b65ec705f5256b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/dsb/firefox-139.0b3.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "1b436ac622a235387386caeef4b603d7ca47c93dca04d58a59c40b17eed0ecc1"; + sha256 = "7e845675e5a334b6080505f62790e6dda22aca0f07af1e1599faa9b2478ac3f0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/el/firefox-139.0b3.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1e91d7f6235221da12bd44bdd50008c79edfff42c60ef2f3cf5dc84a4d29abdc"; + sha256 = "07675440e77b87a0b64a83b28e59be294fc559f7fe4d5d6506cd34fe4dfa69f7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/en-CA/firefox-139.0b3.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "39e59bebfca59b7aa3c6e3ae506870d0ddda67130d0d49340e0029694ae126a7"; + sha256 = "988e4e463a5e3684df5633e11e5e37dace06626bb20e04b1b69e9ef089d962cc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/en-GB/firefox-139.0b3.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "cb83282b8569ed1496737fd1a2f065661050e172b9406f159dd53d527c036663"; + sha256 = "b1c268a2c350a065e37cf259c81b6e535c0597c15e046fbac6dbcc064625bcdf"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/en-US/firefox-139.0b3.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "8ed06e738c2d2106a030c9ea233d1745d1d1190191d5acabfb619343d6600620"; + sha256 = "7a5f6f3816f25442272606ed5e45a9db22c507f0ceaec5858e55d02e4dc10d54"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/eo/firefox-139.0b3.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "cca605f86c6c9973c440fc894b9b43153c38a35d45788815a825b29606602778"; + sha256 = "b36ab4a47cb20b07b1c1ac77c3cd24fb850feb40261d398bc0b1f16d7e1f0e1f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/es-AR/firefox-139.0b3.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "7e609c61e1d8945ecce48dad3e57e8ead8bbfaa1790571e62f906a86792d30f3"; + sha256 = "cd03f278e58beb350683174d9614b78e41f2f0ec1552d50882dc1c405bc37ee6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/es-CL/firefox-139.0b3.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "81844f1afe6f79dfd1cb770d2e4488f384fd715912f21b026b696b39d1212040"; + sha256 = "1ff43a0e99f0f540944209470ae660756cd41a1b9e5fa267a78cdfa1b6ddb287"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/es-ES/firefox-139.0b3.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a462ed0483bcbbdf137d95e8933bfd41e8f3cb8ca18581b2f85b00b7e33c6db5"; + sha256 = "9a8abef988292db0d3e2b7d728770d6e8b397f90493acba75b2910ff348114dc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/es-MX/firefox-139.0b3.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "12cca8014133f1e0e04c6c4d3ee5f5fd3198a8e822044f359ac3764f8ee0595c"; + sha256 = "f76653c3b4a3d7244eef6adb61ea79903f42133deb4ec5c93715cbe06dbaa1e9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/et/firefox-139.0b3.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2938b58027137c182041f07af65f4dafaf118e14cc55545f573b6dc434b109fd"; + sha256 = "3f725c9a2c84f3eb329d321ddd4b3a3ea6a21cf64fb3f18dd0fb681af378b007"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/eu/firefox-139.0b3.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "86de96d98ae2016f853b2fa3f170de2dd48861d5af6b90d045806d897a070e13"; + sha256 = "bec67bfbfae8f1a0969c1bd083d200db25e9d7efadea0192955e2ca5be3a506d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/fa/firefox-139.0b3.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b64cbe106e3345b94fd8c43d2032f9605af5677b77fccdb62a57f42f62455c59"; + sha256 = "c37543777fc3c90368768c730398c1782400f94e05b26601cb6068f0b947284f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ff/firefox-139.0b3.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "bb8aebacba6f713f177307358b0123dd6faf918cd2bef69b935f44913d14412e"; + sha256 = "cd4af2a894a4a6f523aced106bad12f91ec41ae9409d0a5b32a1ee99f09c184a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/fi/firefox-139.0b3.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "f625d663c40c7b7c6d451aad7bea93b0f69ac8b32acb2fd19dba67a87e66c991"; + sha256 = "7e9e1692e2d870375e17d8f91be4808118409088160bc61df8d2ea99fc4879b6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/fr/firefox-139.0b3.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d5bbfc9f508fe02b02007bcdaacd10cb714269caac0a53caf73db22c5f50689b"; + sha256 = "2d1eb3ef8903cf00994a8b0b249cc806f0085b8ac4de11da66cc0611ec9ca62c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/fur/firefox-139.0b3.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "dfb9867876db1711900dd13c3db6328d54c4ccfa2925b49b858f9020b14c0f05"; + sha256 = "1b6a9f6592e3b2d35553c39b8bd59a1d0e7975c16d6e742fb748fc5071e61c8d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/fy-NL/firefox-139.0b3.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c379693f25e0d4f936c93a6a18768213babe061898ee525d4487eed41b7c7642"; + sha256 = "9bea116bfd10e2687fd903fa533642f9380901196a4068a8d19d05176aa9b8df"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ga-IE/firefox-139.0b3.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4ee4f94538d8edcf4a44776e552ef3697a9b36f8a9796958a520776d0d65644a"; + sha256 = "fcc39ffaccfddff75c5b9dff184a7f67df03c24598910dd4d89380e29fc9fbdd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/gd/firefox-139.0b3.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "284428018bc77741976c90f266bb89fc06e5ba3878dce262cdd05737408961e2"; + sha256 = "3bfc75d90fd3c4cc7a271350e7b4474ac5dab71f742aee22bd994c775906fab9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/gl/firefox-139.0b3.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a60105b446c2cc6b21ce379e3e1da6f63de41fbce36c961a5be20bd9cfc75147"; + sha256 = "9a1008adc5c74857777bf8379bfcfd5592c987c36b9495534ae6c5cbd1be740d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/gn/firefox-139.0b3.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "5a1cb2d50405eab2fbd2e0d853aa9017b1eecc1725195156b264ff107f703475"; + sha256 = "46aa366e2df1df9365ff81214b637ab563689d53714f78c4950bca7e78334678"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/gu-IN/firefox-139.0b3.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "48bb35638b57298dc242d5f7a38d0224a760f99ae0e46300e3c58b437407be2c"; + sha256 = "c6a34a993efa290921958cc79bf4a59a9fe66548a7684710a8eaf07f1e62d9ec"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/he/firefox-139.0b3.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "08ec1bc9d4515de6bf470f44b6819aef54c81485f49022f68d6762eff3d859ee"; + sha256 = "86462bfc1e78034b69e106d1c3a728ccdd1f18ded37563fd9d7ee37d2b98fedb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/hi-IN/firefox-139.0b3.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "a78199c3a6f1aecb53b5d62802738b753f1c20d51c49a0d3e8e157fe748aba9b"; + sha256 = "36235be9dc59e2c093a43ad0d7ec6ae8341f8afa9fc939c6d29590acbd384e72"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/hr/firefox-139.0b3.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "34cb684b8324bba852b5a85a3a8f2e74f60fd9330aa10349d76129140b7dfd86"; + sha256 = "20eafa0b16a86da30b39dcda17e232d69b0df3e02f1301d7c52e192768ed52f6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/hsb/firefox-139.0b3.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "cb7a136d2381aa243410d46608eaa87c98c1c046f19445481d1febd15115bfe0"; + sha256 = "e99331dc0ecd3f9be2dfa63dfabb71c2b3d8d84b62fbdbe67faaa6e106cfe2b6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/hu/firefox-139.0b3.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "1ebe76eef892b45bcf479741fb57283ee0cfafd6517b3b8bcb0a86f98ad5c266"; + sha256 = "1d14b5d69e230ef6ec21f2376b07230b64981e66f79c968c47ff109b34fe421a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/hy-AM/firefox-139.0b3.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6f25d3d27e27191314e89cef90c067a50fd327fa302590437b6c74838c44f624"; + sha256 = "cf226323063c8d2786031a888b9001b18f282708e858247f9180a1bea3451282"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ia/firefox-139.0b3.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "7e63be6910e8e772a97fa44f736d798d65e6bcecef85ff56ad5c321ef27999ea"; + sha256 = "b4d61eab8372f1cc20f28c1a3e8c1f72b21d584c0dd45266a715ac116e4e0c04"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/id/firefox-139.0b3.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "fb2c0edd120b9286fd13c7af9cdbece71b5c8621e78628008148997e73d91335"; + sha256 = "7086deb11a567fb9e15a2b301fe4234aff8ba5125cd6a9371700f10e6e89a06f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/is/firefox-139.0b3.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "cb26b7ceadaf3d2c52a2f7ab25ea751a0171176ccb8408a6f759c687f10515ad"; + sha256 = "f37387831ad3722a61a9bdf082e15cdcbdf6f9757be183bf2f4ff44b7e44d1e2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/it/firefox-139.0b3.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "9b7711b39f2ebce0c8e6258f0351f5f15e2c51094802a64c92b283a902981960"; + sha256 = "9957340442c44bbc4ce06897545bb977a290263377ee3eae5b64616e561b1a21"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ja/firefox-139.0b3.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "faeccf9840237b7f8f51934d4f215d7344e3828f9ec2fbb3fab17a912bb4b975"; + sha256 = "8eebb7e6d6351a8269b83fd8095b86bf8b2f4177565cd2fdd323717cef6971ef"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ka/firefox-139.0b3.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1d1967850d1700b30605f4f0b139f05898ab97eeb1e7a2b33e0f79824664675d"; + sha256 = "fafdbba964ad85b38565589118323d1551ac5021e041a00e29b8a629229e2085"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/kab/firefox-139.0b3.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "7d76acdd5f1db3f88da642ce093b05203fe5fbf4098d637e646a2c44f54e8c44"; + sha256 = "ef2f0225bab971c7b6b6237cf2795e9281730b459812209f2d11656ad39e698d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/kk/firefox-139.0b3.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "9c0a9ff355ec8996670b7002338a02e265a18734e1f57dd60ef85c8ca13cae89"; + sha256 = "cdfebcd9afe5c55c6ff84543580e08108f3e362751f09b99cb703c20dc1de3fe"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/km/firefox-139.0b3.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "d845979574a5a63d45d101e7bbe5c69c77fd247bd75e11f1a5e88cb802401d87"; + sha256 = "ea997189f11e283f1d37e7e8a148f45ae0f7557fefc23501d2cf534a4f4d423f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/kn/firefox-139.0b3.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4107fb8bb8dc9a2eca1b00dfaa8e152f55528338136bf47bdfb6405415700387"; + sha256 = "005b89059b12d1369c338f9206e899c76c0d5a97ad94f28564778fc092694814"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ko/firefox-139.0b3.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ee2d1b8802d7b871b231d7876d64bf7dcee35d72189c4400d992a9f489ec57b1"; + sha256 = "56282aec275e94b3a556e3a9b95e107e68cf366f6d2a9dc8ce7fbcea9bc23ddd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/lij/firefox-139.0b3.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b6dbe9a642f842e3b45f55be7fc596f1359ece83a30b5844cb3343a5b2544316"; + sha256 = "8ff69cc72d47d3e212280b8ae004abbb9a34b6e052cfb81f6fed4b1c0d85f8cd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/lt/firefox-139.0b3.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "238910fd4bbe5ed78efb99419154931fd8a8626061942d482dc648b281b1060b"; + sha256 = "353a5ff5baa875628c32f6a0b7cbe5234209616684641032493394c986811cdc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/lv/firefox-139.0b3.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4e395dc08a5cc5d2e75bd1c60da14dc64708e5fa2ab545e3cd33b414d727a99c"; + sha256 = "7eb1a0e3e0441da2df5082693588135b8e7069a29c82c1331d3defdf3e68b837"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/mk/firefox-139.0b3.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "65539afb8178be490a161fba459dedbd511ba79427836df531d2bc4779875e12"; + sha256 = "d7df7d215f440025117d472c7962f10b3db26536d424b633860bd0a2b8634e13"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/mr/firefox-139.0b3.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "f43ab2ca48be65b5f41aae1bb1f8f323a613a487598146bbf1365b7ecb94b48b"; + sha256 = "9d6b1174365423cac77f4066e174ac0e24808cb8147cb0fc4a04f526883f3038"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ms/firefox-139.0b3.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "283e9200a6bfe440e3fa5daeb67107f6907b950a30a17d94d49861cc8f5eec7f"; + sha256 = "1e3eb5e62665157538768e85c30728e1b0916e9637a4d7d5f3fb390c9bba31c1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/my/firefox-139.0b3.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "6ad988b0ba091f329d50cc8a9afceedbfa8ba37bc26a320b87470f69b6014e36"; + sha256 = "76fed1cabb2e1ec137e939d6b0318c32e23e5fa9d5602c08f6a9e56f0a469734"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/nb-NO/firefox-139.0b3.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "2deda34e8c945c8eacf79e5396cd66b8bf5dc68160c60f2a85ba27ee630f5880"; + sha256 = "afb07ebb11a8e3247b8689a7809bb33a83cbe88ded223e5967d4251541f3d55b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ne-NP/firefox-139.0b3.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ac788f59ad095153bba7a7a12902f2990aad942466cc9ef4134ed9dd82b69068"; + sha256 = "a877b86d57e978bb020d9a4447a96ae85f0d8c9bad117373f81561e8379ac051"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/nl/firefox-139.0b3.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b48c11934f715a7b74dc0756ce30e0f9b5ab0e0d6522533e1c7676fa3e184b37"; + sha256 = "5aead7a62bbfa6f765be274d64d6d8a6402b2dd6ee68a571600e64433a871854"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/nn-NO/firefox-139.0b3.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "185c0665b579eefb7c29f70d479d9fec8d1011f1e6e00fd8c506237b3849bdb1"; + sha256 = "d35f50beb12afd6427c615f4faba025e2679289b7eed8772b9c2521c0f096130"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/oc/firefox-139.0b3.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "ba49d5e4aad03b7bcaae9f3c5bfaf6a235d9ea361b77d79fc4672a1f89e090ab"; + sha256 = "a309df62f5d50210dab2d410ddf72cf8ce83124e49250d010a3098d45a519403"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/pa-IN/firefox-139.0b3.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2c71076e95ab6f3bfffbee5cc7a8966dd749f1563ae1685c426b8b566cce3692"; + sha256 = "76fa9af171ca8ef48f2d40dd357dff2f4f434ec5972934d8d5660b975d9ff14e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/pl/firefox-139.0b3.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ab5d3be12d4370090dbb62b66ac9953c95fa60f5411db80f1adb6bee1558415a"; + sha256 = "441c0d7aa570ab16c13da29e1eef27bd58277b0546481dd455af687eed1c3546"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/pt-BR/firefox-139.0b3.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "80eb1c423c323c9d139acd49e46073baf28bd4f49b88fd2849bd7521388f3fb3"; + sha256 = "401cbd05af87d88f8351a6780a200f32d3e5521ddf8dea09f4caceb565eff554"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/pt-PT/firefox-139.0b3.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4a006401f7db4032c8a6f560f050ddc6896f3669f4c09dc9006da0f696e77f71"; + sha256 = "1a64160ff804281709b279c0671be0a378020c3e9cbbafc21c537212af67566d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/rm/firefox-139.0b3.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "fbf4667db9f7d1fed11914a391cdedebb3a5f29885de8ecade4d137c11338bfd"; + sha256 = "d05161f9d5a54db76b46be34c13bd628645f57175e237d691b4607f8bb1ad13c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ro/firefox-139.0b3.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "abaf4c3e563ab8904cd857d8d24d84986a31b8729c211f9a13a070ce9c72ec9c"; + sha256 = "01813e83959f3c51d841d5d5a134b903fdd6908c77f932219f7f2976be33d151"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ru/firefox-139.0b3.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "570c27b473b733e8570f31e0279b41d8ab1c56f79ebde977681e5c808dd091f5"; + sha256 = "60562e6b5bad99bd61b31790993b1af13d66b71888b75680ea2ff2a0a429a682"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sat/firefox-139.0b3.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "88b88fdfaf1244ea2e9089323b8f1abc801c9f3a4ffb313cc0f3212908ce4238"; + sha256 = "363eedd05b26529651905995a75d4fa7cc4a4cb0eabd71223011df8819b2c9e2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sc/firefox-139.0b3.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "192a96825b82b50d99e5335f482d6cdea18930cb4f4313bfda26fb6523ab5bb6"; + sha256 = "d4893587265913d0cdab363809038afd61a0c96f8add8605f8f709d7cf6df1c2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sco/firefox-139.0b3.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "1355de193197a750e67794aab79c97180bfdd86207e7f729c578f9be25bf5886"; + sha256 = "9c56abbb7208a26d8fbf1ebd3dccf42f23da60c73df628eaa44b9293e128f5d7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/si/firefox-139.0b3.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "45b810acd44ad2395e4dbc1eee3f351ffbcc37f5161b0a808236bc886d65c05d"; + sha256 = "f9d59c8e43c249293c844c8e46fe001aaea050fc32a9e06dac0544319b248872"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sk/firefox-139.0b3.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1e8b0cc78dc64ba9ccc6330165eb9ecc4d74556214e9212b1b6e6fe15ee19282"; + sha256 = "d7e396c453b86e7181a0af09f5a608b7b3120d0b2df93fbce472c4935ee1cb25"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/skr/firefox-139.0b3.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "c3b29c21ae9ca49fac32338775a0b3abe232ed8530043112c5cbfa7c49617f92"; + sha256 = "4b120fda51484bcc9e7251ffa267a42dea1328148476252dff33c22aa10da3c2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sl/firefox-139.0b3.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "cf9c33c74a0b2e4e3ef2335c16ba131b1d319879e81e563c2f20a8918d8a829f"; + sha256 = "c145d10b2a5ed42b1e0ec7aac49caf51468f200f361b0d3b576430f14825e0ea"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/son/firefox-139.0b3.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "480a81bfc263fd64f5b21f15f528b17d6c4c08a4e13dc0de01638ceec5bade8a"; + sha256 = "bb0a17d3089ea0fd8809fffc43258b2ea2d98e8a3ce96385ea80fd859f82ba2e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sq/firefox-139.0b3.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e8994f9c47f1c216ae2e50d47a3227fd920e334f9c53e96ce3730cdbf49682b3"; + sha256 = "a013d51f7dfd0ac9da4cb6159034027ef7bc3360de3421211f5ff453912d9065"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sr/firefox-139.0b3.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b34b09cc89b7acc6760b59444deae3118e8a264464c43ed7ae0f661ddde2df80"; + sha256 = "5388d19db672524f2a4d5975070a4e5fe09d9bddba8b9a3a54c2cb3052b3c28f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/sv-SE/firefox-139.0b3.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "4ffbd35d8f2a20a840510d43c68ec31cc5c4e5ac8d1f9638788de7bc475bc3c5"; + sha256 = "49600c47143f89d34657577d1175db5c415d4a4a6766e1c410db58337371004b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/szl/firefox-139.0b3.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "b8bec90756e184c933210f62c4e2781b483770b595b59bc584cbd3019515d010"; + sha256 = "25a6cce7c972c74bb8f8f881200417765ae7deab09405a947a4010002cb5fa82"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ta/firefox-139.0b3.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "90c0fd4575a2420722898fcdb75be47117c4cba4e4134c7dc6160604492d2ab3"; + sha256 = "ca4eb3d2ffcbfdf0e70a42bc358854b99fb9d8b297959530b25db69fff8da6b1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/te/firefox-139.0b3.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "e0e969f4aeb0e3fbede33448f54dbab6152c4cc055f074b1ae72741d471bd289"; + sha256 = "a642f8335f263b9fc58ec32128ac3467c1dd2879ab72b90e74411afa723685eb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/tg/firefox-139.0b3.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "2972258f7c79b91417b685f36725e4124717586742c2e0cb88b125240c8bf932"; + sha256 = "08636c243613e677caf9726e73e640165f90d0fb3b7f5d7a85535a9d20af06e2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/th/firefox-139.0b3.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1668cfca3ce4337d9123eb03fb4cbf066e60acd3e528af2ba82929b25e13b9fc"; + sha256 = "4586b68f7a73cbaa86eab8a2a67b904a3300ae485b85ff878f442e58f2c25a86"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/tl/firefox-139.0b3.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "dd915ce10336b633a2e6fee839042e1bbdfca3be1b2cd33f5d6a60a3b1544313"; + sha256 = "29d943a1e465b089e4b4216bff1343a3b267bc2d0e6757429dfdefe1123c87be"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/tr/firefox-139.0b3.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1b92a4497ad5b6c6138a8e524f97e94414be7722f38c1f16f4a0df00421943d5"; + sha256 = "c0ebd1339d95eff201d85bf549f38ca93907021853a2841dbb48bb7587f84890"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/trs/firefox-139.0b3.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "9f371166943947b7df5e7cc6bc5dcde17ff0eb1e668ef642238390849e516cb7"; + sha256 = "fbdd2bf864b5d2cbb0b633b733c70c71457c04cb405b0aa14c4dc83a5380f4e1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/uk/firefox-139.0b3.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b1d791ade62dee626c53a6537e06ae71c3796b82f85cf41693b557f5d87e65dd"; + sha256 = "9f2af01f2187bc3dece162cd493ffa46bbb7b4af25aed176f81bc1bf99ab8f3e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/ur/firefox-139.0b3.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "7e2f82b259559f1673b65def0469803d1ef84a44bfde11d9d8262c7719ed5a89"; + sha256 = "4d3e57b37ea0d9f498701e768e6a1d3ebed495c83715df9b0623845b9ebf4464"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/uz/firefox-139.0b3.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "fc811f5e0d4cff736c746d0991d4b644e1efb3a2b9e300dccafacc177b9b8016"; + sha256 = "c9419b604b2a6e91cdf9f3c7fcc1a7213eeba095a7ca4950138d4757326a5337"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/vi/firefox-139.0b3.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "2401b130fea83b803c6a7e3b1c9a186dbd4b2f20565c83d79510082f3fb4496e"; + sha256 = "436b6789d5c91955affae937528b38532c09b96f80cca4ff893b593c10720138"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/xh/firefox-139.0b3.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d343dd739ecd7cbb4e1c4c14a273c2598e13ccf7a4a2fe857f374ac068c66b9d"; + sha256 = "ad35a67010effc02db685ab1b05a534e8454a3d7d8d9eac2abb20ea3494440bb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/zh-CN/firefox-139.0b3.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "968a01cfc9b33b5535d711c47940940ae430bd88a7a8fe78ad90226f7c6bd688"; + sha256 = "25efcfc912e9e20d7479ec869afb471d4a4be279500e06f2609bfb5df9d65e21"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-x86_64/zh-TW/firefox-139.0b3.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "18f8f55bc06909aa40d591791275c2909b986353a50dcbb115ce58bbad7819f3"; + sha256 = "a694e1461292c471cbf263f1fca962b27e5bc1dcc655cd9c0f22b6ec868b0196"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ach/firefox-139.0b3.tar.xz"; locale = "ach"; arch = "linux-i686"; - sha256 = "241bfd3fb736c57fccd6ca3d1b8fce2f9b7adca4ca7cd5d2ab6d0fa1306b464c"; + sha256 = "8acea013f0230e45e5dfe7cb2d1495fc31fe8f62e3f0c71021faaeed56f88d90"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/af/firefox-139.0b3.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "626270c7d3806078307ec4c5892aeb0e02a4171ef60b36821d915e46c7368f4d"; + sha256 = "e9cd59e8ecb6f05aa3f71fbdc898e38f5fe16e7366283a899dc918639bbfabe2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/an/firefox-139.0b3.tar.xz"; locale = "an"; arch = "linux-i686"; - sha256 = "2022481eb37f24132f1ee04fb5314ebfec71cfc8fcaf58c9d1684495901966eb"; + sha256 = "06f077e94b604c14d4b23b5c7ca90988a91fd77b4923762880a8ecf6d0d96549"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ar/firefox-139.0b3.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "74153a6b1b0b27887b55e052af28a27ae61c6f5751ed81b262d24cab975a68de"; + sha256 = "d766a8ce6766609052f059d44b324cf67e872eea704095190a00099b472d1312"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ast/firefox-139.0b3.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "424dc8b4dff35ef51800b4f4b52566a79bc405e666966b5a8f1ff558c23e64a3"; + sha256 = "2b4f5ea265d192b4ff27e24ccc60a1b2e70b5e19f5957ab482c6b0d36a4182eb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/az/firefox-139.0b3.tar.xz"; locale = "az"; arch = "linux-i686"; - sha256 = "e645b219739c18101e990cff962d8f33321ca8ae98755d79b148bf5b638eab7e"; + sha256 = "1659ad578e6b9768e3a2bd2dd2ccffcf1b8d8060c08bb2dd9f45a5a8b35ce6fc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/be/firefox-139.0b3.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "ae3821c9736e80c4599edd517c21a36d08dba130603aadcb190d47377ef6de95"; + sha256 = "7959c9e95a1858961a2322ea9ff572c53d08c5f1e855d5115cf68343f1dfce63"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/bg/firefox-139.0b3.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "80436511e1756c5b18683a2f15d381d0dc69dff0a4664a24ec369531d5ecde7f"; + sha256 = "74d7142554e8621b5662d322c5d1eb63a6bb4422365d037212813fc2b1ca17c4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/bn/firefox-139.0b3.tar.xz"; locale = "bn"; arch = "linux-i686"; - sha256 = "cdeefb356baf2d597630fbfd3e0fc72863e465f913ee70a42000e65829263c25"; + sha256 = "5d40f8cdadf7510337271c98350a14b002462dbb58fd89c7f5a5e898d4d96522"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/br/firefox-139.0b3.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "3d29cf00c4a48596291d41a672a4d7778283f79b192994e7e19d548f8e2a3887"; + sha256 = "98606dd41a554c6642b07c7012c8fc0e831cae305c77b17018abd7cf1f835126"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/bs/firefox-139.0b3.tar.xz"; locale = "bs"; arch = "linux-i686"; - sha256 = "13c88efd322ef7000f3410b71b8ca8525e494e31f35cbcb4134f115d5791446a"; + sha256 = "319901c06f9ae63714f5e50def341f7af82446d657a4792f6aa0dacefa6c5aa5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ca-valencia/firefox-139.0b3.tar.xz"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "0cf4e799c720b746cbb3b2ce66d1f31e510ace4af6e8d24b9657c4a2d7954120"; + sha256 = "bdbee33f7f53270a075e45854b42f5879eb081875310285ad4b99dfc2494c766"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ca/firefox-139.0b3.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "ca3e36dbe4356a726aa798578125a8419cec2b498ecf7576ef03a68244633f17"; + sha256 = "9b8af77f7db2bd74065f7b56823ea68db58822db1d55e1a9c98d4654d5178e42"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/cak/firefox-139.0b3.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "3abd810dd4e776abcb0e27c68555fe3a3c3634232e583e332425a8981451391d"; + sha256 = "649a2617e215d8f3610de863ddfc29dc0c2b27fb7d642c1e0c9f2c6aa365ecbc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/cs/firefox-139.0b3.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "b67229b109da0303fa6776d5054c8f09d5e074ace747025dcda51f624d55c950"; + sha256 = "8e8c2e892caa8bc5db5804f42332ad57d1264eda034feb467d6d75827c3a7cd7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/cy/firefox-139.0b3.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "ac10c1d50e9e65d0447bced09ce2f1c7c5cdc1486ea20c21cd5d50fbf60a26e3"; + sha256 = "394bb39242b8631d46d42586611e91b54028fea43d78248af3bb446e6c6834e6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/da/firefox-139.0b3.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "359c8d5d901e5b7f1dbf940b54d1c222386933f9269047b9be1c415bb5bcefb2"; + sha256 = "b42f902cab834a1a177afec0812b118280f3733adba9433d31098df63d184d83"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/de/firefox-139.0b3.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "f499a68e6970a0a8349560a14b433fdc028b8f89a8aed961d174f3ae920d2304"; + sha256 = "420f1853b37b823edbccdb02e19669d5caca76b2ba3f607a81d11b5654f04c1e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/dsb/firefox-139.0b3.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "978dcd560c3053067dc88439a021da3db525233e303812960f13722d8b565486"; + sha256 = "5987303e490b524c31619d18cdbcedff7f24d70a1652bb9bba15120d34befed6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/el/firefox-139.0b3.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "fe13eb1a82217f31ae25989bd101102af4c17f5047d1470001e1983737ddd82e"; + sha256 = "4001d4bce1fff3dba641b7c38c2b26338e40ba28ddad8554c4f7dbbebf1536d6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/en-CA/firefox-139.0b3.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "bbfb5d88f47b04eb531f5ecf503a49f9d53cfdeb3744d5aa5594ffdfdc868a9c"; + sha256 = "35707a5d0e7df572c341da8d4ccb76f560267feeb8df785eec304e6c920da3f8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/en-GB/firefox-139.0b3.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7d17556817693319010bdd9bf625ac28a6a1f76901447cb8c9e5980bbcbfc93a"; + sha256 = "02b5a1f051e02b949e7c8df2d4196e6e45cc02a0ae0178f8500c99b67737042d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/en-US/firefox-139.0b3.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8cf1837253bbbbeef57cc14a858b808b0f465280634ed1f09f6b9a0013e69540"; + sha256 = "ddf19c5fd706f7d20060d009e26e5f98d15707d7ce1130a3e5209a80237c4d45"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/eo/firefox-139.0b3.tar.xz"; locale = "eo"; arch = "linux-i686"; - sha256 = "95cd145e05c6a2b1ff257440f6ef3d959d40a98b63508b817ae1ceef72ca68ef"; + sha256 = "75a9e8c3f3f1a11b22be4501fcc6743f6d7233591df6f1f3eee8243fea27e6a6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/es-AR/firefox-139.0b3.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b678693e411d4216e9864b996444ed9771d981d98bbe9089bf0f54efe9c6a44e"; + sha256 = "5a66e9d13ae53b0e163630f1b9a20c4b68f4e7cdbf88c2d2ca702fcf9846d064"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/es-CL/firefox-139.0b3.tar.xz"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "9832977f32038d256a2294548a397d2e08d9cbfc8eaa2faaca3b1124ce580930"; + sha256 = "79dd1dcc771346f0aadab81fdfcbc6fe1d532001ae17793447b423b1a85a4aae"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/es-ES/firefox-139.0b3.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a985f1574e382ed0c2181da38c8d72a4bd5406af86b7ae5f5133206576479664"; + sha256 = "90054b5ee7292a1df8f0e7688b35fedcb19f2a8945f0bfb440c44913bd123c4e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/es-MX/firefox-139.0b3.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "ec4fb0ea84fb90367c3f3d7ec5503b05ceba3d6f760238fb1633114d32bad8a5"; + sha256 = "f18593686f6a02b0bfb66b364b93fbf1f868365eb96e8152ce1500d6c739b457"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/et/firefox-139.0b3.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "708fece51b9b7d82a3839d5cfd14f37ae42d91a2f5d5d760787a723f3e277c30"; + sha256 = "b6f65d28916d962223af04027a1b5550ef7e6326924f83115a7b86791220bf2c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/eu/firefox-139.0b3.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "d2b9b689f2506f1aa16d695f82fa44ad7e94242415b0218a9d2025020c53c2db"; + sha256 = "410f33a12c705d8ff753b4cbb11942df9aaca3777774e7cb2db5277b7791de1f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/fa/firefox-139.0b3.tar.xz"; locale = "fa"; arch = "linux-i686"; - sha256 = "7ba25ddbd1cd32e2969f71c4642f02be307f5cab4c868f063477606f6bb974a7"; + sha256 = "67728e0982b672da05cf00b46a12e18539a0ce2c3cfbc3f91e0c5b62b6d01408"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ff/firefox-139.0b3.tar.xz"; locale = "ff"; arch = "linux-i686"; - sha256 = "60c5a8f405177af13ccde738d51ea9c652a61ff30d644422e459d6a6016fa107"; + sha256 = "ea729dd3c19b979d00c25b6dfdd2f2d633055a9ca389ad5cde5b5154886d25d3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/fi/firefox-139.0b3.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "eca85eff1de00cf062185e371ef5dc67cc18b284c4406ce75a5b6deb15420de3"; + sha256 = "40b78a9e4cea933865f06a41c8a32d276a59bae2488601afa6d6e936669eef4e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/fr/firefox-139.0b3.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "2c2bf1c002dc301a44b0ff5142b174d57b29e0c85f45510e6f9767a48bc77854"; + sha256 = "5828e6b8ebc7b7508f363f9309554b544205479c22b9632e230340774c46e442"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/fur/firefox-139.0b3.tar.xz"; locale = "fur"; arch = "linux-i686"; - sha256 = "94045f9a29784ea0b212cfd5582c0c6298889c90f368c249a72685563c172970"; + sha256 = "bae0801fdbab156db54f0562f246a59eb5f8c24c79ba17fe2b6c98fc9ed91c58"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/fy-NL/firefox-139.0b3.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6a4bdcdbd00a1be4c02215ec6fa1ff8a6a19c47c95ff1e1f9a77776099f34817"; + sha256 = "0e21ed14bcfc78650f62cffa63d1d9f1a8f21b64b0d258b0e15e346b6f497f93"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ga-IE/firefox-139.0b3.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "3eaa3486fe84f7307ade5735f4bf7cebee2495c736f152e9a18e26fc4ed8ec6c"; + sha256 = "a873d3ce455f8f8c82901d9e2b6795e59515263380443801b2e0c9fd050f03b9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/gd/firefox-139.0b3.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "77ca1a66ff56ab9e9591508da843058985c929bdf03e7e6737740bb203b8d56b"; + sha256 = "13d114359f5c30759febb7bfffe79286f3261477a160a35faa3d5d2e1e236271"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/gl/firefox-139.0b3.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "357b4a0d8dfac5aec19fbaf8988bb10dff0662131fd3e7b4b700c6d01ebb5c66"; + sha256 = "57c6b29e1b05a4e75224085c7a8f13a3948930e92204f882092cc71efc7d4071"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/gn/firefox-139.0b3.tar.xz"; locale = "gn"; arch = "linux-i686"; - sha256 = "46d3446fe26763725b9f3f1c3d4fd2f9dd9e0f203405caeeba1584c807c11080"; + sha256 = "6a197a8c1b138f1eb95f85770e4734fcb400679fe18c0241352dc9d0d025dc5e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/gu-IN/firefox-139.0b3.tar.xz"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "b42afe9344f65c79da178cedf01f2a7de1b5855e55c70d27bbae552207048dd2"; + sha256 = "53bb01d3b87a5a463b993e69ea9472b9b7dce818ffd41a3efc74b0def2880c10"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/he/firefox-139.0b3.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "827c9e607e32da29f9aea0519dc02809eeae780446f28ec6ea56aa550b65c7b4"; + sha256 = "d2f51a83e9f625df054c75b6212c95a2ee98a6ac6912fb37f6dcce151f0d8cc5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/hi-IN/firefox-139.0b3.tar.xz"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "b32e38180719bc9d1b02e598f528b6988f7b7ef12db32b2fcbb6252713f22d7e"; + sha256 = "72b1cb85cf3c3774befbafbec03aa95084356b955b6c86acdc2d12fad9a05d57"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/hr/firefox-139.0b3.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "024c108905d2ce577e4a64c5f0674e6a116bd53f44e20ca22ea72e6f0a24696b"; + sha256 = "9d0b4cfa3f23f962e2784f9a17e8998d2a6ee1a3e54740317473e32c790fb1b4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/hsb/firefox-139.0b3.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "1a61886b7eab21e900a78cab5191062d8ba752a761b664a3910d734f276b6c14"; + sha256 = "6ad41bdaeaa4bba9360ea98787f0c84760f849570452425508f3dbb0472e7349"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/hu/firefox-139.0b3.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "560581c45fc075b80d50eab22926d257243ad11d2f965b08dc70050af6dd36a1"; + sha256 = "583782cc9ee0da5f8ff488643ea6a1573979653130bb6120affc1a7ba57d10c4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/hy-AM/firefox-139.0b3.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "08616b06ac2f8b96e4f912a8404099e5204810cb54b9e766f868676e2ab59959"; + sha256 = "bab8bcfd4374d076023b6e1fccf797fb3d83f26d0fa8df75a0d3c5f69879c5c3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ia/firefox-139.0b3.tar.xz"; locale = "ia"; arch = "linux-i686"; - sha256 = "479426d19d2692e914ecff18bb13274d8bebd0ed7b45800e5a5f687f7fde601c"; + sha256 = "2bd01c27ac6e282be53d72b7993fe9b35847ef5639104924a5d45fc20a42e56e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/id/firefox-139.0b3.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "c817854f19a10bb40c7bbf1bddaad5d2d630b678876b0764bda7d646c6a0636f"; + sha256 = "d110ba5a2d529cc020a476fcaa8781c35f1071224b33814983b83722fcad0078"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/is/firefox-139.0b3.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "601248919378c1502a439df67d210f4a1bcb993aeff55b0603648c8bdecb74a9"; + sha256 = "1bb68a757bb2c9ec9c87522d91733fe55cf5aab0ccfec58cbee67c3a3764df85"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/it/firefox-139.0b3.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "9ff2abd850ac415160302e9f2d4fca4251d276637f336070cc81b6eed96770cd"; + sha256 = "6eeaaa32990d457aaaf37804f54e39fee7fbcf90e024797461c76b7b1522bb84"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ja/firefox-139.0b3.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "9ee6ccaad803abff3c364746a5f251b91a6a8e4495ed3e109ccf9ac430b8748b"; + sha256 = "ad3d2dc245f06c540b7705e4c43b18477f3ef2b6cb21046f2c6aea5ec3343744"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ka/firefox-139.0b3.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "054f669a3f67bdae169a5b85902c2a7e5343a01d2d413a9c0733627673a16c2d"; + sha256 = "5d1c0a0642967fcd4646e2a615c5033634913b4e55b53669de1a27f6de18d39d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/kab/firefox-139.0b3.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "ca4a798458fa494ca7af2b74fbf49d33fb1cd64c029367698c526bb2fc5fc96c"; + sha256 = "fb3636bc0836dc5754a86f40274e3cabb1d32ea1e493cb84bdd0f61b1ce526ae"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/kk/firefox-139.0b3.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "7d231f884f66892bc24e96b9ad89a1c6e967dc8e10b1c71e1cddf1091c97d7b7"; + sha256 = "ff7faeccbc3977063bc69628c64320e0113a6cf0cf487fc0b6253debd7c1da04"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/km/firefox-139.0b3.tar.xz"; locale = "km"; arch = "linux-i686"; - sha256 = "e51c8b4b7bc3a541049be98328deb6473d680c375ca908670f247499e84d1b87"; + sha256 = "fad1f93e314bde16894eb472b2cc2ea41b5227f4d916d15c536b3892fead5587"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/kn/firefox-139.0b3.tar.xz"; locale = "kn"; arch = "linux-i686"; - sha256 = "cdf3ae9d34b92be4a10953e11bc3d6b3a8a9c18b19598fda1472051a83ce4383"; + sha256 = "32891d6d78f97ce1eb3f72751252e8ac15474a67ff3b69e0fe78f21efbe50aea"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ko/firefox-139.0b3.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "c9003ee5bd269b3c5b3cfdfa4281d566a40e60fba32e85477f08e9ffe857e6b3"; + sha256 = "f4f7315ddffe3bd50d927cb29e6a29887f31601c6c062dd349e26920fa1faaa2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/lij/firefox-139.0b3.tar.xz"; locale = "lij"; arch = "linux-i686"; - sha256 = "32cb0e94588c08272d06836c52aa7240c0c5e1df6fc02ab1742ccf3b680a1561"; + sha256 = "ffd066b6b01c2180e8d85ac3c91521b3c2d0a349184bd6c3a5daa220dde51942"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/lt/firefox-139.0b3.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "bb3e37d8a24a664b1df26cac5a3431840ed5d1d2c6ddc3e04a8bcc2221413701"; + sha256 = "6d14d17de1c256b6c2f44dc032a09b99244cf9dc81619c18cb750f9900857f94"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/lv/firefox-139.0b3.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "e216fde84a125a443e5d90291af64dfa1e2997edf0a578bed18b3610b69408ac"; + sha256 = "d9f0720f4d1b663406b14db66f739ff1d0e2dc5e849f88640d0899c3de528f4c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/mk/firefox-139.0b3.tar.xz"; locale = "mk"; arch = "linux-i686"; - sha256 = "c30c9257092237f4e16d1215ba52ba0505040567ca2cf858f724fd881730d2e4"; + sha256 = "e770c64d793af8d63bb33434f427ecc9cdffb49345ef966ee7b27232214a11ad"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/mr/firefox-139.0b3.tar.xz"; locale = "mr"; arch = "linux-i686"; - sha256 = "9087eeb81d0adf624085fd0a7d5b47c1f5465cfe38c9ff735ea646c6da872c59"; + sha256 = "bf0a4fb9bec478a1fa1d48be903509b5f23c45dfa7754afb78aca3962e7fd21e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ms/firefox-139.0b3.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "2e1c6789f701187bd9aa05f4f6e015cc61a233c873dc57f0b9fab40f22a53c49"; + sha256 = "8d09acce703795b35bc04887cb26e4020af5c397fa396c2f2806548b5980b6da"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/my/firefox-139.0b3.tar.xz"; locale = "my"; arch = "linux-i686"; - sha256 = "0bb3121b16fbcaea34f85e04611eb9f0fcff7bcf9b395be60ec59638243a5fe2"; + sha256 = "f0b894a6462f5a80c23cf83a1a011c491a0fcbf61fc04c2b0aad6a0ecf9b6a42"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/nb-NO/firefox-139.0b3.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e615eda12e42f9f766a8fc93730c7e92472d53fe9232709a0a922008610e476e"; + sha256 = "2af8e1f308a6010c3b8523c1e9d12d0e1b5b9724ad1f444394ca58433a2298c0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ne-NP/firefox-139.0b3.tar.xz"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "58d8da2efdfefe4d94f82b999ada785d5710401698884bdd2229ff14815ab54a"; + sha256 = "004f3b52f367a1bbd35aa06d7040035bfaf5da5524370810c789746ed78af888"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/nl/firefox-139.0b3.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "629d72462592af1e08c2b249017d3d369969f0099a8531777e423fcd52b3d356"; + sha256 = "eef545c2a3937500dd825e5e0ba94735246bb2e8750a3b3c2266026f5b1859b6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/nn-NO/firefox-139.0b3.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "6ec906ca83cca0ea031bd150ab26f862f3274e9b9806e7e98dcf7b245cc1e363"; + sha256 = "794b917cedc6dc92964665da249dd018ddf288f837ab2968794b63c2360a8cce"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/oc/firefox-139.0b3.tar.xz"; locale = "oc"; arch = "linux-i686"; - sha256 = "1deda9a423955bc98e41a213a7f2f969c639dab8124fa5a79dee22557a5d8013"; + sha256 = "3b83f2fbbf74b91e44a7f0043940d242b1b736d75394caecbb9401e328e23da6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/pa-IN/firefox-139.0b3.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ba196dc7a74a6991b941dc1c845febccc8bc93ab634fcd668b613baef5dd4397"; + sha256 = "72e016689aa5823d0c1023afa000780e6e60bcf752eaa7f1fd68da107f22f6e3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/pl/firefox-139.0b3.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "3c7fcdbfaffe9c5b4b48e42615df337dfe966564685672c3e8c51f412a8490c6"; + sha256 = "263dbd2d79cbc7a2c0a0b21a3fbff69fa22383f39d7824ffdc31194f03a69327"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/pt-BR/firefox-139.0b3.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f56cafb39c0cef5e1a43b7579ba53cb530ca2a0d3ba83452e13fd76b22ff7686"; + sha256 = "2c9b08173760317cebebe8ab746b8a024db38bc7a7aaf4e9de034bfb50abe5be"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/pt-PT/firefox-139.0b3.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "cd1851ca0c8d0d6b13402985b2916123eebf5d499eb9587aebe0a1c8d1e6cee5"; + sha256 = "df8fdc9ca8a2a16decff55ac6b64775ae2dc7c64d6dbdd8fc15df014a8f8a656"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/rm/firefox-139.0b3.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "26350c6707b1157cd6c53ec9294c4c0d5caad4c95f940e5ee03bbca08353ec83"; + sha256 = "2b6f3c308e293955fd8243fa724dc969d054b7c0d086bc1a243e2c19bef27bed"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ro/firefox-139.0b3.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "c087ab2e61a41d157cc2423894f0080f080cfeb74ceb92ac47afa6abd4780d77"; + sha256 = "81d6fb48b838aeb5e9fbbfaffac8936f376289b162958169a50e8a48bdb4bdbe"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ru/firefox-139.0b3.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "8cbc728b269a14b1c735daebf44d27438721635ffae1b857f3725ee053909009"; + sha256 = "6fbcd6ea92f5e2c81c926dd407ff2523e551f388b56154a3324c1f04f66c80b7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sat/firefox-139.0b3.tar.xz"; locale = "sat"; arch = "linux-i686"; - sha256 = "cf49aba3c05d630c7d0fcd872e85a7e28cf22373124d2cb114dd1f1c1cc46b87"; + sha256 = "77b8647e8702ec7dd982ec622151de4eac6e1873fd632c57bc174d4ebcadb675"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sc/firefox-139.0b3.tar.xz"; locale = "sc"; arch = "linux-i686"; - sha256 = "e8bac5ed8064bb6e8ba29f20cdecd4c40c827cb49cff71ade57550f9058520fe"; + sha256 = "cb23ce760425c17792dfb75fe52d39f4fd377b640f69ba8bb575df6fba3f80d1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sco/firefox-139.0b3.tar.xz"; locale = "sco"; arch = "linux-i686"; - sha256 = "ca868225a4cbb677fbdc97b5cab583784393a4f411997d4b0ba41df6889a9bdd"; + sha256 = "f1f71c42b2626d0dcfc3552a1224db422328f4f312512b3fce292b69b24b7560"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/si/firefox-139.0b3.tar.xz"; locale = "si"; arch = "linux-i686"; - sha256 = "f6525c27f7c561c46b474e88e2bec0f099a49f2a36fa252a6331a2531c2fed3b"; + sha256 = "7600e8c27c2e795f7cc4481badc279b461901aa516bbb0728128874791d6639b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sk/firefox-139.0b3.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "6ef895d29deaf359f6800b07e1fff3bab2a8d98ffe13148051a74723bbd540bc"; + sha256 = "45d7b3b578ead0d40175954f9e65e124853e295a0c528dd6abde891622534e3e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/skr/firefox-139.0b3.tar.xz"; locale = "skr"; arch = "linux-i686"; - sha256 = "75303e5900e977788c6741056e696081a6b230e90e3fc069111109d999ab0a3e"; + sha256 = "187fbb481c64cc981b20de374913b9d17c3b117a80ab1feec58c18c965ef3e4b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sl/firefox-139.0b3.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "a3463d5cb2a93a0c07bedab3f90e5cc9388a8ae743899373f23cb3f3d8acce18"; + sha256 = "17b5faa5a116cc9ab8fa1a322bf6555450f4bcee1a2abf09709645b17bd46ecc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/son/firefox-139.0b3.tar.xz"; locale = "son"; arch = "linux-i686"; - sha256 = "56a0157e7719d92b4809c9c0032ede72c5467f256fab9a8b9836eec1fd1d954a"; + sha256 = "4639c5d5d267896d07214291c468546ff26478c26c435ee4d10cb2e9dc307e65"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sq/firefox-139.0b3.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "7340943d13b1528cbbc9ad679e4b1a83fca9077771819f023148360a1a306a7e"; + sha256 = "a0aa72766d7cee37f9d9a4c3a28ae8b954a2d28810bf553cbf442b30edd623d1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sr/firefox-139.0b3.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "21a866c1d1d5ca34a9757426f2b30e0f2c6f192611f75528053ac8b7a782962c"; + sha256 = "607d5e9a73671eb99735e619a2ee701f31ed6dc55ba016a237618de6fe159933"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/sv-SE/firefox-139.0b3.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f7649b0fe3e21e648cb7a3d919c3afe0d12a2014910c0d18f283a8f4fc20d699"; + sha256 = "dada2e913de21d7ecf323d302fe2b9263ef6820450622b3b06e73963a6d48f9a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/szl/firefox-139.0b3.tar.xz"; locale = "szl"; arch = "linux-i686"; - sha256 = "090ae85a47343f047b944caaff56936eec5475c2e80aec85b0a254b3e699d3e9"; + sha256 = "12526451c0f4c8a8446b0638be2e3c24a52cbd8277928a45e9dafb2c65eb2d03"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ta/firefox-139.0b3.tar.xz"; locale = "ta"; arch = "linux-i686"; - sha256 = "98a40f6d72087cf13b62683548fb652573a306a861209ea6c7128a068ac39e10"; + sha256 = "d3153deeb5951fc6dbff2fac07a51e587d98559042cf1cfea70a55c4c8ad25c7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/te/firefox-139.0b3.tar.xz"; locale = "te"; arch = "linux-i686"; - sha256 = "dac190685a4f1e898923d293fb8ce00bda7fec4a585d313ae763745975edfe96"; + sha256 = "21377ea235bb38c01aa1a21516722e2a91ce679ef7d1b32487c8813f1cdd2aea"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/tg/firefox-139.0b3.tar.xz"; locale = "tg"; arch = "linux-i686"; - sha256 = "15a4e5df389619e4cb4dcc7e677128ef507964a1fab09abcbba5b58d22034845"; + sha256 = "a428becb1a20753379791ae6538b0b1bf0ebad0d55f98d7d8c19af0a7294f7e0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/th/firefox-139.0b3.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "5bab501cd8bf43d425b4b001eecf97d093555ea64f7b4abaffa2d2d9b749e808"; + sha256 = "28a30d8cda25aa1e63fbbcd1bbcdda5a3ae990e1d973f10d4744499a27f13ef8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/tl/firefox-139.0b3.tar.xz"; locale = "tl"; arch = "linux-i686"; - sha256 = "55cce8888edab61cd71eb96c2cbd750b8612155ea552f7269a22b8d317a5c9b2"; + sha256 = "80bd0de1021edfe3178abc43017669dbcfe1885c66b71729372bcdb27d381ab5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/tr/firefox-139.0b3.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "179d90be324596a3b7eba6f0e3ae786a487d2bec0a8103cb8a9c58bcf0ff1dff"; + sha256 = "f9bc32e243c091be454fc5b4356b986cbbd87bb76135e7cb9f9dd44115af2f5d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/trs/firefox-139.0b3.tar.xz"; locale = "trs"; arch = "linux-i686"; - sha256 = "637250195f8b71b705c0468c9098ff3865099b662457aad201af10b6d38f2003"; + sha256 = "fc7e927f0ed152dea1940b6965c79c3f2a21d22c117d52d9f32568d5f80bd48f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/uk/firefox-139.0b3.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "2650614e2f867ef58da5295071ade1ccccab829433c6139766cdfacc600559a2"; + sha256 = "f529c85cd2f12c7b2fb66b1f79268af7ba889c8a6c4cc1accc5b19b74f77301f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/ur/firefox-139.0b3.tar.xz"; locale = "ur"; arch = "linux-i686"; - sha256 = "b9612a871b0b092854b7dcc1421cb0a00c2bf4f053354796ad78697da6b1eef3"; + sha256 = "e677de49b31054981a22dfa36d9b29339cdc2dc230077b48a381edefa1a17271"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/uz/firefox-139.0b3.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "3b102ac2ab5989ec486e7bbd50b2b9693ef62a11e08adb243c126dd917cd7c3f"; + sha256 = "46d1fa8b789e3c4adb313883a438a8dc051b67b3f005541a31967921b4cf280f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/vi/firefox-139.0b3.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "fd8197d70795cc98a4afa2a4c2c87a111ad055c634040cb6c51c0403c6eb57ab"; + sha256 = "65e242430ce65fa104fbb0bdaff6cc53a5c0dc60b2094362f2dcebc9aecabb3a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/xh/firefox-139.0b3.tar.xz"; locale = "xh"; arch = "linux-i686"; - sha256 = "6777cfa8c94aeb02e4a22646538b4cd040d8d6dfe81cc03a6c011c9464c4d4d0"; + sha256 = "979438f443e8c0ab980af19e9bead77f3039c955c46a2c450db7265bbcf6259e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/zh-CN/firefox-139.0b3.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7a8f8ad9dd677bbd021856a60b98aabe85364d4b40668f3d0c0b141389e5c4cb"; + sha256 = "c79ad34593f9ef472d0231fe57082a1d4ec62bb4c7cc870c4e510cee5ba3ff44"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-i686/zh-TW/firefox-139.0b3.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ce9501fa8a8864e91dc03c2fd1678d9d21e9d25aa037547aa8ff766f3f93469b"; + sha256 = "0e169aa02e3102b396e0d721b15138fe39277e4d84935fe6c8931ef69117b4fe"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ach/firefox-139.0b3.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "b14827b02d8033f9b0947d646153d9b0501bc69706615d27c5f2bb3a370658ad"; + sha256 = "bd3e5c69934115d423aa111c257520f9cc5219a29588843ee1c5b61b1a3e3da5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/af/firefox-139.0b3.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "116773d412c066678e715a1a670465a5eda4afd02eca6ac606ca3a82c7014151"; + sha256 = "f3b63934c1632d71f49d9a401dc8bf6073936dcd656fb0462a3d34e352075352"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/an/firefox-139.0b3.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "57fd77977b3d0858421b5489b0776780e61a1c931fd6871eb6e029bbb564a6c7"; + sha256 = "313da7d73bf645cea5125e3909c310f3aa81b1713297fb7b66493b79f16d34cf"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ar/firefox-139.0b3.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "26ba9bd54569b1d8aed27ecdf7bf3303ae2914b7402e39358dcd32259563c5e5"; + sha256 = "9bd0294aec83fb9bdb4164eb8eeeeda22fc3b2d26e8cb8b1a5e036251be3bcdd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ast/firefox-139.0b3.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "4769814dbc43be2d5e1f3ed869629988e3033916496283156d46e26753312d21"; + sha256 = "2a3229c50482cd3b86ba9892985680b6cffe4259503d3efcee1ecd6fad4a6005"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/az/firefox-139.0b3.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "a740ca8fd7bff0663943f85022b3011713b8238b2cc0516567d0aa0874adb342"; + sha256 = "b64a348dab5618276f0102c23d7e74b4e1bc2af38b36e678b3db53fac08e3125"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/be/firefox-139.0b3.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "8a1c6787c7966300551b84b01926488f26ac393dd7c4a502eaa418749fb7749c"; + sha256 = "6e19e16df133ea7b7b796a92c470ddec4ad9db281361210dc249851dd9c05e3b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/bg/firefox-139.0b3.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "7ac0b72a4be4c2c90cef42ae4f6c304cd53d49de19a2665275ee9fb37bfd3b9d"; + sha256 = "c691fcf4ff5aa896b51e12c01b5faddf1ab8d3e990fcb5a37c89450511647335"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/bn/firefox-139.0b3.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "6fae4e0cb0975d4c11f5d3baa57a4fd99e137e1c74ccb875b081397a83fe1b5b"; + sha256 = "b88a34520fbc6cfa328e879478857b10a738dd5ed6c99d6db16d380e1b80b71a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/br/firefox-139.0b3.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "313fd02a196551870f020762ff76921a6589a5f4091d7ff363010bf5718b206a"; + sha256 = "d2a051c03154c151367d01d887dd22d9c029c948c7ff406e5ba975a981e3270d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/bs/firefox-139.0b3.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "f23778ae091b5ecbc2dfd1d9a734c9e8675251257343da0cb224fb942803ff31"; + sha256 = "b7ba2f914aacea218596d2118c001961c1151b9df842b5afb498d7729f4c7efc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ca-valencia/firefox-139.0b3.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "b6e5ef1fc584b3ee82341948f25663a9c8a16990461244529f6da76b0fc2d683"; + sha256 = "3d9cb24a0d049de007c4125efa869119aef50263f70bad64fb8ce328cce6abb0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ca/firefox-139.0b3.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "71e53ffc8921b375ccb66d085cf52df3d48f372d823e7d322beb6532ff087ed0"; + sha256 = "40288f778e9706bb3c2bccd641b7f79a9b96f5129bfb282a88fe891f95d20e9d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/cak/firefox-139.0b3.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "54caa651cb3d7320af7a4bdbe9c6f9cb2385cbe652d23a04414b0e884ceab930"; + sha256 = "79a734a1a83b350d123b7c76dd991e9139d14c84b795486587bac3e001e43fdf"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/cs/firefox-139.0b3.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "39b7d94a01a1a8e306c7874257b36f9d60dcb75ac0b2d2f11cc60ae62a9fcca9"; + sha256 = "3fbf932baa5ecb2c4ba06c6f8f29251d8c33c173df96ceef38250decdef6d73a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/cy/firefox-139.0b3.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "c8feb0f86ddc0b7c9e1339749c4f11104f3fa08a47641cca55f511ad9be7620e"; + sha256 = "4bf4c523a593907dba5ef4ed211d721ce89ca13af52852b61a8a812f7da6473f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/da/firefox-139.0b3.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "268bcc11e17fbceee75bc124b823abca626c2202be449cfc9e69633a8db5fa60"; + sha256 = "f459937cbe98b49931130dc0ff35741600d919afc84226a0907f6b373496090d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/de/firefox-139.0b3.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "cd12af18f53d550f15e53d05053930e487048c2dcfc5c950bc1d8de96dc7d4a7"; + sha256 = "c1cbb2e1a978612c0fa60ba060fcd00f45ab0610a49f42f3ea59a0032c1fdc5c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/dsb/firefox-139.0b3.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "84471a1e3c44dc3089b891b0bc254a3c50bf5b7996ccf564af2b0754f4b68ed8"; + sha256 = "94288aba032c65e197001b10641ae42ea05a9a6c87f8ca6d98b48f5924ccb314"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/el/firefox-139.0b3.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "53216fe70b114e96939fc3dd313d5adff92b04f13a2bb15866a6745a95f05acb"; + sha256 = "143f849d261a87f066952914b466e6737a337cbd412117add91e7731b088c89e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/en-CA/firefox-139.0b3.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "e4daeccc139e265ac87a884c207bf9b94febe626cebe22850cb0e705206a5e88"; + sha256 = "a08ab6a5968ebf60d9c4c082475e1c7cfd840d90e8dc1265d999eab45d0bb26f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/en-GB/firefox-139.0b3.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "b017589a1d99a575d9bd09be2410a7d2c3be1e347af2e569bd46cfb15c02a36b"; + sha256 = "a14d387031ea588bddc104982f11480983a45f2d4e08c814ae91a6f9e8bdc4be"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/en-US/firefox-139.0b3.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "ba85b43e51e320929dc53f40d7526e8bd95a606faca373dccb5c2db710564906"; + sha256 = "a8b95ece65cf5ebc5d5ae2144943c66135a2a32d64d7ca1c2424a621b8ffc152"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/eo/firefox-139.0b3.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "d16d4daf9d036737646acd3b958ea5855ff0029c65160f93ba6d34eb41c05f7e"; + sha256 = "0bf932cdb5b2b672bad8875e4bd59da43fda2fc8293b14f5b6fa5cf58c11dee1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/es-AR/firefox-139.0b3.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "d2c7d9f5fa294897960c8ed08c162094e85b95f4413efdb263aaf9313d520a9b"; + sha256 = "991cd0e2894a4293fe8d8bb78dadc51b7c0527a1d64b1bbad6328e553b65ec7d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/es-CL/firefox-139.0b3.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "f4df84cb23193c2161cd3dd0c1de38a051529edd87052ebfd2dfa0cac50b30ec"; + sha256 = "15f27bd91d2d9f1833a3dff0ebf957bff6ab740bd5de214482e348240968259c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/es-ES/firefox-139.0b3.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "d734abd1a1105fbc10c5bf9baa03a8756501a277701977bb7c3ef677c03bcb71"; + sha256 = "0abd7d09a96262f226564b01633ddf9912ab190e448b57422c965d7ab544bdaa"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/es-MX/firefox-139.0b3.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "2ed8ff03d40e0c3ee6792a4a9724fc27f1f49eb9d6f444ddf851ad7bba1ee6a6"; + sha256 = "651f09eb5e0818805219e57f9e9567fde5ea538e62b0970270547349cdd6bf09"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/et/firefox-139.0b3.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "b9a4fe035ed1225dee0ebf4aa1ab04c16056b622e4ef839d84b3463f3b40a5f7"; + sha256 = "3f970da97eba78efcb840aaa9e7812fc07340ead7b8939648fb8839c743298cd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/eu/firefox-139.0b3.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "7d7224828e0a051cae205043fb9d335ad0646f83c3676c96c57632592fce53bd"; + sha256 = "eb5464b8618eeda6aa507d09e403528ac991f883e4ea6070c01ecf7ccb34a2f9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/fa/firefox-139.0b3.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "47002006a12d86ec80ed31e3e0b9b95d3a3f7fc04344d14afb988833e632df24"; + sha256 = "6f78eb8b602d2b349d564d08e1797f7dd381a818b4f5fc4916e5e2d80a6890d1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ff/firefox-139.0b3.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "02cfd21c1e9f8996746e6c5ad5d2d331d7f17a86805ddc70e9edcebc43599687"; + sha256 = "dd74dfd1b55dc2005764ee2237f4bd0cd841a90dcca88f97f4d7ea1cda57be28"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/fi/firefox-139.0b3.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "b9d0e43833fbc7d3e743b132bf7a01037665dc21429a634d27bc48783bce695e"; + sha256 = "108304dedc88ed30195dc443a62df7f1d579a8540fef911e7ebecc544aeebd2c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/fr/firefox-139.0b3.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "2b631987fa063485d7dba06d90cfc054e278cd4be9b0d38a8452691f817de518"; + sha256 = "c02dfe50d5b405f8fb90868ad317f1020c85d6bd15c6167d4bb8af152af29f29"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/fur/firefox-139.0b3.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "a09f81844bdde33736c9a94ff21245b92766aeefb95df3d0fbb4c8ad622e65d5"; + sha256 = "c110494b901de0d5cf4623bab3fb7aa523c2c8afe14ce1339207a07715c24e0c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/fy-NL/firefox-139.0b3.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "f0cc57889e572a51b1c92b955a5a16e254a97d64a763ef09bc6677845a99e2e0"; + sha256 = "09fefbf594c1c840dc18611d303c8aeae70eb7126e17b5d0e41e96868601acbb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ga-IE/firefox-139.0b3.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "62ed774d6fd81fd79ddf6d8810646bb14c88b9231b3a029ca5cba9286e562733"; + sha256 = "51e4f9ad18f29f46875ce2e146a4300afb0f3b860f0bc9bbab2cd6be9c20a564"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/gd/firefox-139.0b3.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "ab020c5d89a00fb8e25313b0ae10c15c8a9471e88f8fdbcaa701c02b4be97d72"; + sha256 = "cab4cdd9d7b1af933f53863be982d427f59435522f24bdef27a302b9221dac7f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/gl/firefox-139.0b3.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "b51f3e0450e4725b73dc13243dee90a68d980948add5ec8ba9cb2fba07dbe617"; + sha256 = "48b3771b813b62c8ade64e55ca5ea2e39671f2556e6057c49374b089adfbd2c7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/gn/firefox-139.0b3.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "7bdaa29b0efcc4d4d8a4f67a93fce6718d21cca6268500e67f35b4a258e84686"; + sha256 = "63e40c6ee16180e62fa6ef06f0bf1bf04fc9b368940013f2442e034229bbe586"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/gu-IN/firefox-139.0b3.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "dfc02495938df3205cf053b5fa80e481bba1799043714c218bf218fe3f6b4bf5"; + sha256 = "3c3c3847fc36800336e000c7a5ca479edf4832f80b44ca7b4f79151a67119a16"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/he/firefox-139.0b3.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "2e012e78366da7d4136d94b4162089eaf93b62972f418105475e9ed500da6bb3"; + sha256 = "b77b031493a228f911f29ad93d55d9895005c31ba90a99a5b1b4e2d7d7034cbc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/hi-IN/firefox-139.0b3.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "78622250015e7fe7e185e7f0f9fb7ac23222fd6a89a99c17063d2598f4a489fe"; + sha256 = "a0ada0fe2c28f6e0bf6abdfcdf60ceb5cdab896ff1c86a58d33c9bfb4faedeec"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/hr/firefox-139.0b3.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "97664b504a19b2108a42a7efd79466a9221fe1765ebc996abba229ba7d3a9228"; + sha256 = "56fdf616a68d2701b4c505da83e70c14a6c08541ec826c7a187c23a30323c8a2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/hsb/firefox-139.0b3.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "5038938ab909b2c4cf174eb4a196c42ce1bb02dbe99c7c2862845c5e014ab935"; + sha256 = "dc133236dcd7500e46b2bb806212a41b11e906cf66a744dad2ab6aef663ab482"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/hu/firefox-139.0b3.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "20d311f0e5aedaa10797cdd6bf55df067e3dd28716af12ab767f2dea9569ddd0"; + sha256 = "d2c85ea926529b2caea6f3d5a07a954eac9fcb1feb1cd1780a7115fb38f7d03b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/hy-AM/firefox-139.0b3.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "ed0a1216b7b028db0894edf37fd6ab1d1b714127ecbb35b1876be6be209b712c"; + sha256 = "b7e324693725687422ec9ffad3bec53e559fc755d9eb169783a0737edd9b173e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ia/firefox-139.0b3.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "a2a44707da571df52264f6cc488c2e3848c162f765732e848e222ad3d2c484ab"; + sha256 = "1016c382f3add7c82860d4a7f980770ca8d2332e182b1b14a958012378f272f0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/id/firefox-139.0b3.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "a062b0c638c4346aad47290fe391ca1a73989cf306ba5767b05ea00ce4bdd407"; + sha256 = "331b1885e004f602ebc004460ad4780725dbb3829ed04714b21df919e4972661"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/is/firefox-139.0b3.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "a4fda3f61bd2936dbc93a3a5fc80adbb63ef12f58dd7b40338c8d3a7755c48e2"; + sha256 = "4ec80ba6afb69479b2cbc942551cc129aa0d8887ee32a2803b07ae14de800744"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/it/firefox-139.0b3.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "28c665e6924ab2d621ce7b18bfe657baadacb9b9ab70b388f5fcb066fd670e00"; + sha256 = "9d04dfe6d24db792b2091f6726f8ba5edf0ab2d9373f2e0957c951f1a055dce4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ja/firefox-139.0b3.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "1b34aa6d3239d3956225cbc2aab4ac6cbcdb1e1a6dc567c7df0bb104d0b58500"; + sha256 = "7d2b0709f649b8a6b2edb124a2a501f2309b2570b1807efb038c5400cb0216b2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ka/firefox-139.0b3.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "b121c05539387cffaf332f69c59545ee177a7e6f322d8f4eb091e37328225e60"; + sha256 = "06eef2411c405e2a17267bddd6d958c7fb55497478b6213fe259e40fb273dcff"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/kab/firefox-139.0b3.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "1436340a158db39dc55cf1fde411581750fb14547db7dfc53f6d415677bea280"; + sha256 = "eaafc34c8c596602091810cbc2af966e003d870c66a647c0cdd2a2a343f4a068"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/kk/firefox-139.0b3.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "e2b20cd5c6cd4325f79148b6804cd4486794466a444eedc5473f5db1540e6b46"; + sha256 = "dfef47c7d3255b1a711b611afd9adbb53be80eebefdac763da04af2157faece1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/km/firefox-139.0b3.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "59182a3016621019f3559d6ec301face8469c6555f914805bc8b9ef0430246f9"; + sha256 = "9074c6ee90c6582c1202582d35d81f97b43789ebc3f9019261130dabcb01fd46"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/kn/firefox-139.0b3.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "8bfdc4d580120b2ab22a7e5ef59564ea9d56b5998a13f4c2125a997edc1fcbca"; + sha256 = "f8badc895b36bdcb7666510faf5f775470ab90733ac31201f147f3b45dc4ad9e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ko/firefox-139.0b3.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "4385b028d0e1fe5c0cb1c8cef7c926b64c4ac195e81b8eee8bcf19214489e303"; + sha256 = "9d8739e1e382c5b96240a6564219c7b0ce161524386539141f4dcc020cbb5fee"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/lij/firefox-139.0b3.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "d062919de7bccb04a5c9c02a32749ba6ea6a01c3be3a284bb2c7d735b4211636"; + sha256 = "c36fd45434f81e1c20c8793bd52cb85637999206b06ea9b094b2d1b0442f95cb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/lt/firefox-139.0b3.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "1070a54c1c490d6dd81a0195392fd49d8330e3b6b1d2d5d4642989bf17250904"; + sha256 = "24d94d2ef16561bb3750d607fda39f4b39060efb83fd4d435cbef7383bf8f76d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/lv/firefox-139.0b3.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "a0ba18b4d9e1df89550f3c480f95c0836e7c213c434730b8b8f31836dff641cf"; + sha256 = "6eb7553cd275cbf11b387088e52d9f508486d3f737b2482d1f53af1a2c1e0dbb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/mk/firefox-139.0b3.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "5d7e6eb75a610cf7c8d70f35f849f72d1f67bc3e352e9d19ea61efc4b529c95a"; + sha256 = "8a1b20b6be53d68dd1effedc3522fec9b2d8c64a4d8e30c7a7113bf0fdb2317c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/mr/firefox-139.0b3.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "0982f46ce8d49806b7b08f943defe1bdb6ce97dcdea13a1344757dd38f7d2f28"; + sha256 = "4dc0347a86f3e4f784ae32e2324f3d134ce5b4fdec4eec34572f51c13763889b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ms/firefox-139.0b3.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "308e8b51c62f129f2d0ef36961317e60e9392c91c8cb07dec4790baa22a55fe7"; + sha256 = "7b3fbd663639fe8575eaadf01d3a9299f0c132a4b2fbbf25ddc2d18378102cf4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/my/firefox-139.0b3.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "8721ff8b897bd4106f576ca14c33ade7a111d4f0738b370ed135d88dfecdc77d"; + sha256 = "8a039ed198a5b338fd32dd632f05c4de8a9dd61cb09247d5f37a1ffbc640e0fa"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/nb-NO/firefox-139.0b3.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "e22398c03075edc7b0e72a7db7545987f5b8131bfec1e7d5aec40eca4baef5e2"; + sha256 = "70404a9fe3361dff890f344eebb61001bdcb6a3d4356cc06386783d70a163857"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ne-NP/firefox-139.0b3.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "da03ba3b827f2f5a16496b58476256e1b537562afae40e532d9908c08cff53c6"; + sha256 = "e148000a58bd8b834985ad9dee1eb6724ed2550fc70279ab915c06fea148afe1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/nl/firefox-139.0b3.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "a9ca74aa38f493aa447f1d1cd98f02a09af8164a1dadf4871ff6c13d272a32cb"; + sha256 = "b15ebbf39c475a53fc5b01d1c5c6559f74c42e35c1d7b7bbd4cda37366359fee"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/nn-NO/firefox-139.0b3.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "5037a6967c6e0a4ce65ea0d55d42d374a67e30b474d5c4cabbbbbbd8e71f763c"; + sha256 = "90221ff410eca0d1aed97186e45106b7ab826029965e2b4fb54d93c74f743ee0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/oc/firefox-139.0b3.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "45829a8abef7af5cc69a98425514d5283ac7ff0d5a43135116d8f611e0c6d894"; + sha256 = "7cbad01d0adb697bcae6c072bb69cb151e83920f39b67df2a340f7c1dc4faaf2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/pa-IN/firefox-139.0b3.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "6d947501e07f9ccb0ef2d7d2e0fd03a25aac80d689f097576857bfd54ffc86dc"; + sha256 = "1601a8192da0564af21b4cb7e63d87b6015d5533c08e96187a0d895e32bb03fd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/pl/firefox-139.0b3.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "d64964272790495418ae3769c1a06ea6aac6890128788aea3384f9f24ba3432f"; + sha256 = "f62fa06e9e651e7db14cfdbd0af5acac3d6f282a2842e41bed7b6ea323342ff7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/pt-BR/firefox-139.0b3.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "fad049de235b576677d314c41499306475ecfbf32c068eda19260c7bbb7b1888"; + sha256 = "493c505bc795451989d58049e0a16397eb32c6d26f3ff5c285b845b35cf63a53"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/pt-PT/firefox-139.0b3.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "8d8438273bd586706b40e69b629e5025ff36d8e4af8deba6a0690c2352d7cb67"; + sha256 = "ce1caab07d4ca3f93e5be33580e09c1109f3a19176144d7cfa06e97ab04fe7fd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/rm/firefox-139.0b3.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "90f79aaa4583f08c51616b8f18da8d7e0f591646d2aa9bf4334ff7c9d36b9e9c"; + sha256 = "d580649d6aa0f7fc519dbbc7c72943b36a437806020f6a56fb7659befb9dea7a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ro/firefox-139.0b3.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "ec5747d75c65f1635a534f45714d56628d29969c511112434d04bbd5675b8ea2"; + sha256 = "a78d357d761f72d5795608199701c429f2016ad618e2899c10d13b9f7ee8e3ef"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ru/firefox-139.0b3.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "107bd63559ed5ceb1a317f3594a3aee58cb8a3531c29f76168d20ee7413eecec"; + sha256 = "8892c5688612eda284319c1df7c366d529be0d0c96a55d89958d7185a78ab30e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sat/firefox-139.0b3.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "d2f761796294275f5d0b9cd42514b2c0f0a086f7948263a1145c730d95225e4f"; + sha256 = "c6d9eec9c8ebe83c966c904611d6d865328b5a7f401b42b06d72dae32174fec3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sc/firefox-139.0b3.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "341bd37605c0c9182a13cd329f6449a460af43c34b8de8e6a8df88f9cc34c41d"; + sha256 = "d504d52b43598ec3fdcf02949868fa65d6e6a72f78f131c53fce804817de4ee2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sco/firefox-139.0b3.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "eda7138831b8ad021e80cfd249e06e3996edfb83a85eea4afd9c2764b2ca9e91"; + sha256 = "89962ba5d9de002d3f03b4527eb9ef84235d59c19abb46165dfa9c52a085ad2a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/si/firefox-139.0b3.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "e7b7a3fdbdcf12c8f7e2d99990ddf00bdd58e89a0ec83887cf37aacd8775e630"; + sha256 = "247261439dc9594b9ad95fa066431ce1629537b8cfc01df7716c491044a7c72a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sk/firefox-139.0b3.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "fe026c923c57c7a16c1aaaa57befdf40fb97cf4e7885281e9fbc56c7f4d1a7e7"; + sha256 = "29cb232a5339abc4890b306a12b0f55cd2700cfe2521fa745491903ee87a26ad"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/skr/firefox-139.0b3.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "3c5226eabb59eaa03404cfe9d7aab17c1d31136ca58df86546432fe21e345699"; + sha256 = "f606442e9a6f87616a77d2fd392412a8dd61e596ddc8c067e38846331cbfca0f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sl/firefox-139.0b3.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "331c9d1aa95304e729c7b245912e5306d503a807e4616f190cb189e283b78d68"; + sha256 = "43cc2db32879fce3424c1a3ff2f862cca4835b0a4c5df5c3e28def64812ce73c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/son/firefox-139.0b3.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "d30873e50619b8572ebf4c4b8adb35c83b9c1458a7fe31f539daec50a9cde994"; + sha256 = "cfec396b94bcc091927c0884ccddd3969f69acba8c09467609319c54c0bef55e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sq/firefox-139.0b3.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "272a828677668effda1b4eeba469de91fa3e76382b43012c5cac16a3cab9f20b"; + sha256 = "ec827f911bb4553cd7caefbdf2aa3aa6b4521059beab32b23e65e80f9858181c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sr/firefox-139.0b3.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "5e5066a68f1a71da4cdaf0efa8b02fc68a9c91ac4172543442aa116c232d4e15"; + sha256 = "284b34324291ba29a1d1d7b36cff68fff0f00213a7e12fa7f48536fc5a80990a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/sv-SE/firefox-139.0b3.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "23d47b8d7782ed01c531ad3bc928aa45e9c6a94bd8bd3d0ede21e35658a3c44a"; + sha256 = "07e48d548cfbc4c4ab3fb3b4ec630385a125d3c5cbe30526be95d0476b4d8f87"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/szl/firefox-139.0b3.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "c62a0fc9802c5d619e0d84e424af994775da65efa0e47c1860acba756f98ad36"; + sha256 = "84cfbf70da99b4f544193d6d167a2280142f8ae37d8de1e9b4093f7ca6671fea"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ta/firefox-139.0b3.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "aacfdd55a392c3ca576c0ef4b019d4fba3bcc5ffd2f1146ee5b271f3657d3cd8"; + sha256 = "dca3f4fd1b468cae66bdb6ef3817860760a2527b94928359c302e789ca2c04c3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/te/firefox-139.0b3.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "5e8029dcfc510aabfde5b1d923c5fcdc752cf44c600d099c35d12e1d761b4102"; + sha256 = "bfa4f775d02a2b2cf0dfcfbf4ed3d2342f7db943256c2e73bddd7f9a8077484c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/tg/firefox-139.0b3.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "0e451b0fdef31cb180a3f0b6d1b7b44dcf282d07b7e8f93330ef6d2e5f2cb032"; + sha256 = "1515a00b6d53e074bfb60b1bc7e37ac60fd977131a6ac6e772433b1daaaa4efa"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/th/firefox-139.0b3.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "470e07988caf6b7a6719dc97c7a1ad8efa99a05593a5cbe215b5dbb47bddd8c1"; + sha256 = "507d9c041c8874095a52f57e5a46adf8db6d4116d5ccdca0b100d831c41c0422"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/tl/firefox-139.0b3.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "0ad4ddd1eb47201e9db424759ce8145f84f314d23cb578fdc79056f55ad73880"; + sha256 = "cba3d10cee0a09ed530f6e8ec71e1da36fc29c972136bcf6beacd7ccf91bd162"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/tr/firefox-139.0b3.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "189590bd759e39eca2e6e0070c9ffc011f0d08f9588d0db28baf9245ab212cee"; + sha256 = "f5e68e280db29872b7570484dbc841756693b3d00eda2cc0840a77e5600628af"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/trs/firefox-139.0b3.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "5da9c02d3243101c8f13707cec43d9dcb95901269cb8721fbfcc2d3fd7b35d7d"; + sha256 = "028e3728920e5978501773da88c2eb1d5d86927d83e5f51e910692fd4482d9f4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/uk/firefox-139.0b3.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "2cca8fe62ae8b45bc0765eba43ebe3f9741ce37dad821019e4fac68c478f82ce"; + sha256 = "9e63e86af01787ceec6b4776b78cd98db74230287f1c065eeda6b5e5f6133b42"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/ur/firefox-139.0b3.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "6964092fba73da2685acb284c3fae2f5d17e85837ce99325d408cb30db2c2112"; + sha256 = "964b123de671b9f763861d626a444c86d48516cdefe9ab71f866dc564428d119"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/uz/firefox-139.0b3.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "2508e30246bbd0d1c0a3d601e0d3f378dc0b3a6406daad5be8cfac02ac8c5fbc"; + sha256 = "e603da60f6be77a60584bd361f773a5e12612e8fad84f0aecaf33756fa13d9a5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/vi/firefox-139.0b3.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "51c345b731ed0bd644e9de153ec36270e4c0a77486008a2ba4b062faf852f412"; + sha256 = "c8ce7aa8546ecaa76af778e29de3bfb12490c2e9e4f667888449939ac424f122"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/xh/firefox-139.0b3.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "e9560d6625b56671686fbc6e7a8b4fd4d9a539ae362fde18b1444adc135bb723"; + sha256 = "dc9071c3a8553cee661223eadaccb949944d11f4631cef76775e6b3d93f89eaa"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/zh-CN/firefox-139.0b3.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "765a12ed5e48902087564ddd4b401b90a1c372d315788a9385611809c3721d50"; + sha256 = "f8561851a5acce3ba9ea763855464592777d2371d1918d70cce0a01d833ee77c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/linux-aarch64/zh-TW/firefox-139.0b3.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "4a44f1bc531add38c5d46ffd6ed6081ce491baa95c13e300967124c98a8af3bc"; + sha256 = "180c46473119cdbe027f13a26a53234e63e1f2dfd291925b0af2edf68ff05650"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ach/Firefox%20139.0b3.dmg"; + locale = "ach"; + arch = "mac"; + sha256 = "e0a518e46e2f11edca8e5e0ac47449947c3c2777505ef4da832cadcadd093a23"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/af/Firefox%20139.0b3.dmg"; + locale = "af"; + arch = "mac"; + sha256 = "680fd32905798aed50dd4a0bb0bb88817581ac246bf12ad7db49c90809619424"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/an/Firefox%20139.0b3.dmg"; + locale = "an"; + arch = "mac"; + sha256 = "bff5ee309b3f73e65b5de3f40f1a7025a4137e806399c703d20c492ca925585c"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ar/Firefox%20139.0b3.dmg"; + locale = "ar"; + arch = "mac"; + sha256 = "71f47f400126a2729f37bf8947c8577cb012a787b9c37f8dda516f4e765e5b2f"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ast/Firefox%20139.0b3.dmg"; + locale = "ast"; + arch = "mac"; + sha256 = "a614feb3d06e2cf3430bcfc3daa02d53bbff1dca8a5433d43745efa03f0c7e73"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/az/Firefox%20139.0b3.dmg"; + locale = "az"; + arch = "mac"; + sha256 = "07482d9ffdbc3629e9c7c4fe419cbe2824b947cf93b4cc7fa371bf9c1083198a"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/be/Firefox%20139.0b3.dmg"; + locale = "be"; + arch = "mac"; + sha256 = "6163ec17db5b8bbe2e897ee3820334928f18fae85055262561cedf1a1ee8918d"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/bg/Firefox%20139.0b3.dmg"; + locale = "bg"; + arch = "mac"; + sha256 = "575f9b58298f0981566ba826294f80edc45dfd9de69d79e6c82d28d0c884c58c"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/bn/Firefox%20139.0b3.dmg"; + locale = "bn"; + arch = "mac"; + sha256 = "076b89297184b520cce7ffc362b7bca90c4ebade5d64dccf0f7315bd2584f678"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/br/Firefox%20139.0b3.dmg"; + locale = "br"; + arch = "mac"; + sha256 = "1a29076fab57e50c45cd6fcc8f25cbfbd9d6a962705b88a607935c6184ebe2df"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/bs/Firefox%20139.0b3.dmg"; + locale = "bs"; + arch = "mac"; + sha256 = "267526f268fc1deec51cfd16fce9c24fbf7fa9789e1d3d82c42df7bef754787e"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ca-valencia/Firefox%20139.0b3.dmg"; + locale = "ca-valencia"; + arch = "mac"; + sha256 = "713b6a6a73f06e3a6f09bf1ec06fd9914bf0672b5569b51d4a8fce689fa02c67"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ca/Firefox%20139.0b3.dmg"; + locale = "ca"; + arch = "mac"; + sha256 = "1537068f9e353f37f69d39acb852fd25bfee7c9bc6f83af2b2dab2da21737ca9"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/cak/Firefox%20139.0b3.dmg"; + locale = "cak"; + arch = "mac"; + sha256 = "726df556a936dbfd4cf756c7736abbe406c7c774986a745eba460a82f79a2f50"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/cs/Firefox%20139.0b3.dmg"; + locale = "cs"; + arch = "mac"; + sha256 = "ef6701cb85dbc9af3f2e0013c2813e4cc140307b2c7ddf77ed18307b2a3583a9"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/cy/Firefox%20139.0b3.dmg"; + locale = "cy"; + arch = "mac"; + sha256 = "911406e16a06a37be909b298d84fbca827b74a771e13ad7d1921f62c11e8b9dd"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/da/Firefox%20139.0b3.dmg"; + locale = "da"; + arch = "mac"; + sha256 = "4080196890c2a15ef88a55a97e5f4ddbe03cfafb80f536894b3a9c25fb0ee8b1"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/de/Firefox%20139.0b3.dmg"; + locale = "de"; + arch = "mac"; + sha256 = "40eae4dc5ab677b214dc13afd066444b892bd444f6ab09922a73ceb9ea00d4b3"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/dsb/Firefox%20139.0b3.dmg"; + locale = "dsb"; + arch = "mac"; + sha256 = "3ee17df8b247301f376652f938f24464d0809b7fb6b402b9f5083ce2cee9bf34"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/el/Firefox%20139.0b3.dmg"; + locale = "el"; + arch = "mac"; + sha256 = "11fafe77ea6929eff1dcc1da0df306c0f8520d7f522c316518889ef6b4bdd273"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/en-CA/Firefox%20139.0b3.dmg"; + locale = "en-CA"; + arch = "mac"; + sha256 = "a15fcbf8b20e47ec62f8a0421d21f67ae091a3fb29aced137a52ba05247762d6"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/en-GB/Firefox%20139.0b3.dmg"; + locale = "en-GB"; + arch = "mac"; + sha256 = "cdf313854d38f48bc31f30fa4e546d2ea8867f49872b7398005b574d26362548"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/en-US/Firefox%20139.0b3.dmg"; + locale = "en-US"; + arch = "mac"; + sha256 = "bb516b07c4519ae946b79a6fc34e911221e5d83851aab2bafdff87c3e5b74b3c"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/eo/Firefox%20139.0b3.dmg"; + locale = "eo"; + arch = "mac"; + sha256 = "00c505dc9fd5c7e10e424022ce7807a886567b9ef01817e0d86ebd7bcb51e38a"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/es-AR/Firefox%20139.0b3.dmg"; + locale = "es-AR"; + arch = "mac"; + sha256 = "cb8cd92f3762979b88dfc445bf5d71d83fc7eccd138995b1f6f8662a00c06751"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/es-CL/Firefox%20139.0b3.dmg"; + locale = "es-CL"; + arch = "mac"; + sha256 = "4d54031158a87e46f4dd79a2f3835fa2ecafe059160fece167a3eccb213d4ded"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/es-ES/Firefox%20139.0b3.dmg"; + locale = "es-ES"; + arch = "mac"; + sha256 = "2e150d79a2ba9e065128963097289a4ed340473de8a6b5f73a6435ca3bc8ae88"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/es-MX/Firefox%20139.0b3.dmg"; + locale = "es-MX"; + arch = "mac"; + sha256 = "4e22a347506019c216f3d8f3b363677f9677a44816de1b1cb42a11fb3beb62b7"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/et/Firefox%20139.0b3.dmg"; + locale = "et"; + arch = "mac"; + sha256 = "f887cf78873cce42ec474a9bf7e2de793b39087b5d71a86a00ace6543d5f06ed"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/eu/Firefox%20139.0b3.dmg"; + locale = "eu"; + arch = "mac"; + sha256 = "832d8dc7d0d7d011967825e747ffca5697c6a8bbcd0592b60f77bcb602e64b3e"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/fa/Firefox%20139.0b3.dmg"; + locale = "fa"; + arch = "mac"; + sha256 = "bd2fd21b2efddcbad65057b06059c93e4a3ed4535966f71f59b213b9dddcf110"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ff/Firefox%20139.0b3.dmg"; + locale = "ff"; + arch = "mac"; + sha256 = "2268a7857090100091254d57e47d72826965e94d3d2922ae0713d8331c0c3fa7"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/fi/Firefox%20139.0b3.dmg"; + locale = "fi"; + arch = "mac"; + sha256 = "72c7f214ac536cddd3bdd12e14f8e18e82d91e2341622e340691dc119b44b459"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/fr/Firefox%20139.0b3.dmg"; + locale = "fr"; + arch = "mac"; + sha256 = "1392ee9e9ece7c3c0a1034ea3460ce18d4dc09695a6c3872f75b44e2083dd6cf"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/fur/Firefox%20139.0b3.dmg"; + locale = "fur"; + arch = "mac"; + sha256 = "6b37a09f9e0d05747bf71f6bf33bfee5405900a6486b0e327af7958c4848b889"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/fy-NL/Firefox%20139.0b3.dmg"; + locale = "fy-NL"; + arch = "mac"; + sha256 = "c1ba5e0babab78374c0644917a985bd016fc84383e848c0c08e424ae229f33ee"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ga-IE/Firefox%20139.0b3.dmg"; + locale = "ga-IE"; + arch = "mac"; + sha256 = "ab89350cad0a76f3aa3b7958f5e41af7b3f0362ae5716ed764019d86cd55830a"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/gd/Firefox%20139.0b3.dmg"; + locale = "gd"; + arch = "mac"; + sha256 = "4e36e3ca3e6f2336c10bb1c78db21449b0e893b56f8e0220ad783a0481676e2b"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/gl/Firefox%20139.0b3.dmg"; + locale = "gl"; + arch = "mac"; + sha256 = "8834cb809f19bbe04bcb97fa0d231049fb0636d701ed04c2eb5c29cf2bb938cd"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/gn/Firefox%20139.0b3.dmg"; + locale = "gn"; + arch = "mac"; + sha256 = "d14cd07d0fd5b9b0f805b327bcb76966ca52ea1790145e47ae770f6361245727"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/gu-IN/Firefox%20139.0b3.dmg"; + locale = "gu-IN"; + arch = "mac"; + sha256 = "c2c14a42f72894d17751c324b5a372a2141c5f3228e8c2055e302ce5a619b795"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/he/Firefox%20139.0b3.dmg"; + locale = "he"; + arch = "mac"; + sha256 = "36499814455eea5f4b625c332739530bcbe67b884fb3634086c51841043ab861"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/hi-IN/Firefox%20139.0b3.dmg"; + locale = "hi-IN"; + arch = "mac"; + sha256 = "6aaae4c73c81bbff984c8b94dbbc51c403161ce0658e713215167c62b9bd5a26"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/hr/Firefox%20139.0b3.dmg"; + locale = "hr"; + arch = "mac"; + sha256 = "1d05037ef618476b485a1ee5f54fd379978caac33aed2601da1196b531ff9251"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/hsb/Firefox%20139.0b3.dmg"; + locale = "hsb"; + arch = "mac"; + sha256 = "c5dc2bea7cc3035da37e6adbbb7ff5e4c9c8dadb18a0f284aa6480ba0523fa27"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/hu/Firefox%20139.0b3.dmg"; + locale = "hu"; + arch = "mac"; + sha256 = "98747da364f017149e792d392c3799f5817960f84ef0fb291c2dc76bd2acff93"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/hy-AM/Firefox%20139.0b3.dmg"; + locale = "hy-AM"; + arch = "mac"; + sha256 = "caf0feb89b4d2830699d9e6beb4f799269a291a8de1c7792b9ae7ea59cf33c4b"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ia/Firefox%20139.0b3.dmg"; + locale = "ia"; + arch = "mac"; + sha256 = "e07aac3d382089f3b2739427a687f77ba1b4e366988c64dfca24fa7aa154ff41"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/id/Firefox%20139.0b3.dmg"; + locale = "id"; + arch = "mac"; + sha256 = "b080f0e359a540b588f44388fdeb340e73e00eca8183e75d3df34eb0c94e6adc"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/is/Firefox%20139.0b3.dmg"; + locale = "is"; + arch = "mac"; + sha256 = "14ea2fdb726247ff132736ee16abf640a50e2c4626d4128cabf29c92868b9c64"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/it/Firefox%20139.0b3.dmg"; + locale = "it"; + arch = "mac"; + sha256 = "896c2b89b0e74550ffee1b2b64cbabba41a5e966f0a606b1cd1109c82fa7b839"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ja-JP-mac/Firefox%20139.0b3.dmg"; + locale = "ja-JP-mac"; + arch = "mac"; + sha256 = "bce36ac2f32606f1ee92fd9bda765bb7a3956efb4b87827b94ea246779caff51"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ka/Firefox%20139.0b3.dmg"; + locale = "ka"; + arch = "mac"; + sha256 = "15c2a3a3f1b4d4b3602afd3e25774b1ea073b6cc1394c623ebde0d5cb2196d59"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/kab/Firefox%20139.0b3.dmg"; + locale = "kab"; + arch = "mac"; + sha256 = "3647fb09d5c77bb90788aab0329da3e7e562cb455483289d5152bd845162aaef"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/kk/Firefox%20139.0b3.dmg"; + locale = "kk"; + arch = "mac"; + sha256 = "bc253d2686952356ae7b6ee8429fc30b3b67b9c99ce1f8372b7a280172bc340a"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/km/Firefox%20139.0b3.dmg"; + locale = "km"; + arch = "mac"; + sha256 = "62ffcffd64359b8cae0138819e4783678f2a50f9359a4d71a883731117cfc5c1"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/kn/Firefox%20139.0b3.dmg"; + locale = "kn"; + arch = "mac"; + sha256 = "c213cbd3f6d7267f39be082f93dd5d46ead2df09878f31f2c2b472e3c795c718"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ko/Firefox%20139.0b3.dmg"; + locale = "ko"; + arch = "mac"; + sha256 = "257a6db2f9324b4f983ab0bd655096391dc193733ab0a4c3fcd8525f8e0d2e8b"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/lij/Firefox%20139.0b3.dmg"; + locale = "lij"; + arch = "mac"; + sha256 = "13ab3253431ca8903376986973944f50930d81ba5265b20063819e425ccf03be"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/lt/Firefox%20139.0b3.dmg"; + locale = "lt"; + arch = "mac"; + sha256 = "eaf604655b8851623523e07adeb17d3c491a6446483f8ae08a0e3b26ac00537b"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/lv/Firefox%20139.0b3.dmg"; + locale = "lv"; + arch = "mac"; + sha256 = "68a8759f7b87d60a5888bc3e411ff1d96c8fbe2d777d955405c7175a26785947"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/mk/Firefox%20139.0b3.dmg"; + locale = "mk"; + arch = "mac"; + sha256 = "dfaf7648103b53050f8e6bfd9d15a16c91b5c8097ae66dbf29b4816c98585f8d"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/mr/Firefox%20139.0b3.dmg"; + locale = "mr"; + arch = "mac"; + sha256 = "98b55e60b28c26f2d4b64ccc6c2a168eb3778b3eb7f30338c7fe65b93c4947aa"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ms/Firefox%20139.0b3.dmg"; + locale = "ms"; + arch = "mac"; + sha256 = "0f4dfebfe6a49408c9e6f86f08fbeeba1752e2338547414d3f951b54301a0190"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/my/Firefox%20139.0b3.dmg"; + locale = "my"; + arch = "mac"; + sha256 = "69a6343204688fb6917ae3bc8246dbf05aa0d33ba1e3ab1dd63bff15517927eb"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/nb-NO/Firefox%20139.0b3.dmg"; + locale = "nb-NO"; + arch = "mac"; + sha256 = "e53432862824641c579b83b0390c5266fd9acd775774e675b92c85dd0a1f283b"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ne-NP/Firefox%20139.0b3.dmg"; + locale = "ne-NP"; + arch = "mac"; + sha256 = "1ec4db3a6a73d9c89c1abac64c3f21f203a312d03239c634aab1b5fc1e1978f7"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/nl/Firefox%20139.0b3.dmg"; + locale = "nl"; + arch = "mac"; + sha256 = "c4d22c9a149fc3b9fe1026e12463e95e96dd684dba1d6087d295d83b214ee419"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/nn-NO/Firefox%20139.0b3.dmg"; + locale = "nn-NO"; + arch = "mac"; + sha256 = "8ed77e09b7f21288f0afab5eeaa3f37d516d65c98937e6651362d1655be35b27"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/oc/Firefox%20139.0b3.dmg"; + locale = "oc"; + arch = "mac"; + sha256 = "228a5983879f3d71ed5c3f0e3147814889e647a495083a18b99ec0a352620138"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/pa-IN/Firefox%20139.0b3.dmg"; + locale = "pa-IN"; + arch = "mac"; + sha256 = "8b2c24e4396863b73b514035ef1bd950bbdce38a891bfd157e8dce2b47be0ce9"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/pl/Firefox%20139.0b3.dmg"; + locale = "pl"; + arch = "mac"; + sha256 = "54dbd4a9a0ff77c603108afda46ad70d492795dfd1de37e0baa61fc1a1892839"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/pt-BR/Firefox%20139.0b3.dmg"; + locale = "pt-BR"; + arch = "mac"; + sha256 = "67a1c150bf04edc8d4cc15fdb864828feeb3329cdd454be8b25bf455cd64b863"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/pt-PT/Firefox%20139.0b3.dmg"; + locale = "pt-PT"; + arch = "mac"; + sha256 = "8f64369b64b5bdecfd25eabd0efc4ddc1b2ca724e0532f1a79c4d1875217aba8"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/rm/Firefox%20139.0b3.dmg"; + locale = "rm"; + arch = "mac"; + sha256 = "2f2f00063d3bf05c486734567e26cbc9563d699208b180ee969bda9a3e990872"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ro/Firefox%20139.0b3.dmg"; + locale = "ro"; + arch = "mac"; + sha256 = "8c4f64ff21c0fc81559d29958a9f3419680272a8fe3a309e07b2848b3a0756b2"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ru/Firefox%20139.0b3.dmg"; + locale = "ru"; + arch = "mac"; + sha256 = "c0976a0c47d82613fbcbd3054cc92f1239ec8af017b79f9cc3c7e2a46058b085"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sat/Firefox%20139.0b3.dmg"; + locale = "sat"; + arch = "mac"; + sha256 = "ca292c59e2845540369343d79572523e1e4cf383ab27b079e5503ca9b336db40"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sc/Firefox%20139.0b3.dmg"; + locale = "sc"; + arch = "mac"; + sha256 = "bef03d37448cd88fd7d455e263673ad057e51e5e375766c79dc96d10c807904c"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sco/Firefox%20139.0b3.dmg"; + locale = "sco"; + arch = "mac"; + sha256 = "6d303464a114597524152610c4e431a81fae3b9282764874f2a0548bc5d20974"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/si/Firefox%20139.0b3.dmg"; + locale = "si"; + arch = "mac"; + sha256 = "4f4c76296bc4f04ad97cbd35a02987d99ef9c05a3a02b06e8d48860087adbf8d"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sk/Firefox%20139.0b3.dmg"; + locale = "sk"; + arch = "mac"; + sha256 = "07d0440034e2c92c183682ebc9778f32f7549e9e3668a9a012faebf64b66d1b3"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/skr/Firefox%20139.0b3.dmg"; + locale = "skr"; + arch = "mac"; + sha256 = "f8ceb672752e27a354ff54250a182465a718e1d83ccc6d7f3716c36d343b8ff7"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sl/Firefox%20139.0b3.dmg"; + locale = "sl"; + arch = "mac"; + sha256 = "76a258adaadc52b24f596495766cab8ce4344db2d06d291afcc20029627d9ea9"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/son/Firefox%20139.0b3.dmg"; + locale = "son"; + arch = "mac"; + sha256 = "6356d093eafd677b78e76fe1fa7247ec723df4432fe69024fc80de6ebd98a146"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sq/Firefox%20139.0b3.dmg"; + locale = "sq"; + arch = "mac"; + sha256 = "b57ecf837b0930f369a87bac330854dc952ea8fd664bc4d9367a1bc602884543"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sr/Firefox%20139.0b3.dmg"; + locale = "sr"; + arch = "mac"; + sha256 = "608a72824910e43dc62d6c6e856edf886e280fa1499eda3fb15df01aa58475ae"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/sv-SE/Firefox%20139.0b3.dmg"; + locale = "sv-SE"; + arch = "mac"; + sha256 = "64c79d0c96810221692d65cf3830a4dc68c0123e93c15b4e6425825f2a485bc6"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/szl/Firefox%20139.0b3.dmg"; + locale = "szl"; + arch = "mac"; + sha256 = "598d0cedf0037f92e579917de539a72d2bf89963cc09e182dc298912724adc7b"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ta/Firefox%20139.0b3.dmg"; + locale = "ta"; + arch = "mac"; + sha256 = "5046f6a144780b890bd13599b5043b95989838ae021180c08479755411de60a3"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/te/Firefox%20139.0b3.dmg"; + locale = "te"; + arch = "mac"; + sha256 = "e5dd35d5878bf0b397c6b55e4bf03405068e188c655f426160f00a2dee4eda87"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/tg/Firefox%20139.0b3.dmg"; + locale = "tg"; + arch = "mac"; + sha256 = "245f224cb73ea1337c04d839cd10b5d5d67e9d1d278696cc408c7e7d71154124"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/th/Firefox%20139.0b3.dmg"; + locale = "th"; + arch = "mac"; + sha256 = "056638b388bd20f14c6c41662aa0a495600a40ec9393e5d157fa9fcb0649ec78"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/tl/Firefox%20139.0b3.dmg"; + locale = "tl"; + arch = "mac"; + sha256 = "32d4699b72e0e0adbca59d84fc63a3ce5a3780976545d1a3d150cabf0856b78b"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/tr/Firefox%20139.0b3.dmg"; + locale = "tr"; + arch = "mac"; + sha256 = "a8a3028435311d2c4124254372a5d6008ced3fae5cbcadbf25b02d74509c0c7d"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/trs/Firefox%20139.0b3.dmg"; + locale = "trs"; + arch = "mac"; + sha256 = "f1d8039af76a04dca82979c42971d1096456e196f4a1124ec4beed727f2185d3"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/uk/Firefox%20139.0b3.dmg"; + locale = "uk"; + arch = "mac"; + sha256 = "838a1942ea4ca9e163b06df9bc72970e128af87e4a35376f912623ef73b5b52b"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/ur/Firefox%20139.0b3.dmg"; + locale = "ur"; + arch = "mac"; + sha256 = "306d04d7c9965e1c3c5ce1f45574b82437c32316dd5857c066c228d2a22606d2"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/uz/Firefox%20139.0b3.dmg"; + locale = "uz"; + arch = "mac"; + sha256 = "93c61ed4ffb6875756b366f1ffe01682303bdb6ed20c6d2d7e44979305d31254"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/vi/Firefox%20139.0b3.dmg"; + locale = "vi"; + arch = "mac"; + sha256 = "60fad61144cfdeeaad641b714e4e63ca184079d58091dc555975543657d54fcc"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/xh/Firefox%20139.0b3.dmg"; + locale = "xh"; + arch = "mac"; + sha256 = "00f599dfacd33bb98f67e05fab0d9588456de666f9bb78eb52e22d96a4f1e323"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/zh-CN/Firefox%20139.0b3.dmg"; + locale = "zh-CN"; + arch = "mac"; + sha256 = "0ab249304b86ca7ae055291353a4627e507d2699b6346b9ff3dbeba3766ba044"; + } + { + url = "https://archive.mozilla.org/pub/devedition/releases/139.0b3/mac/zh-TW/Firefox%20139.0b3.dmg"; + locale = "zh-TW"; + arch = "mac"; + sha256 = "b9c4765a5aed85cece38efa50fed10fa361ba9ba56d9c40925661885680d8165"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 4794c84a7734..470b3fa414b2 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1859 +1,2477 @@ { - version = "137.0"; + version = "138.0.4"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ach/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ach/firefox-138.0.4.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "646d7021a96a6e5f3cc3fd47df633bd66c4c5641b131811945da22f7ac1577ed"; + sha256 = "8a79f50942fa160efc366622cf668900eec76c0ff189b55df229034a9d028019"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/af/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/af/firefox-138.0.4.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "bcc011dc68d2b62d12f701e082804814267ec0e73204217ac97a2b6cbb490e95"; + sha256 = "9a2d9067e7e2a39b3a8283b8187872507a71eac80a7c193948d1f490f37c1eb0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/an/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/an/firefox-138.0.4.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "55c81296aa63ffbadc72e62c1c9570e2e3979c326bc11d23a1698113d3b97c56"; + sha256 = "494301f8a08bc0a0fdf20f9afbf539f7d3120803d8254d9561f317909bb4e7ee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ar/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ar/firefox-138.0.4.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a57ec6d3f89200a1f482dc5ba9b2706b0e6b6212bf7b753a410ce71cc7800537"; + sha256 = "8438a7b8403bd614b72567c1b72d7131696adea98c5294b2d8bb382a4ee4630e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ast/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ast/firefox-138.0.4.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "cd2c614418fd18d24e47888b7517de6d40e43df2de9fdef8af02c1ae76203893"; + sha256 = "2b704fbc63c97546740146b5078239aa00d9f8f3fe92882ae25b4323d32e515c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/az/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/az/firefox-138.0.4.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "a25cfa698f733ec2fcea70e74513f8f56153345afdee513f3db341ecd9d28723"; + sha256 = "aec76622b41b2a6892ab4c0983a0fb96f7089d066810b2d6d8db2d92753a3dfe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/be/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/be/firefox-138.0.4.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "7123fb625e9e0af22c1019298e61155f1c9ae33400745cd2cfb54443e1e31889"; + sha256 = "bde73f3a3c8d4ab4abe1db3dccc5c30e39b0c4242282bec36047a358ac649789"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/bg/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/bg/firefox-138.0.4.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "bb2cb27370c2b71080bf85134662302a903572d4a5672fe6e123f2b1655f8835"; + sha256 = "9294751c7aa8a25b268049f81d3adf33f59d4afe4ad5ce861afe54e9867ab58d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/bn/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/bn/firefox-138.0.4.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "f56de00c4ac51189f0da134f13b22cc76d62a5362b1d4d8f23b2bb7ea79a678b"; + sha256 = "fa0387eaba1377190a7a4e6b799b61050f5393d0dc850073edfb7e37bd3f7b50"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/br/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/br/firefox-138.0.4.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "282a33e40c24489a231167d5acc9d9d1a1fbdf5e5b9a6ee2faf985905dd7b513"; + sha256 = "e1676536b4ddebbfe75663c11877b4b6ed97c69fdcba31a66bf72a99e7f9212e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/bs/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/bs/firefox-138.0.4.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "efeb6b2ca664f2dbe39431281f9b8abffb5d4baa45374f9608a264f0f491b333"; + sha256 = "52ca6b8863b0d989dd867bd1f0ee6f72049d7226d714b14582f76aed2e9b16f2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ca-valencia/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ca-valencia/firefox-138.0.4.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "d4375aaf07e9f1f2060588a7af70ab12f03d50abfadaafaf34f3a52e69c014db"; + sha256 = "dbb97403d04abd5710d31bdabeca16caca5327f6bd86a5afe2c1792f7db2e53a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ca/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ca/firefox-138.0.4.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "ea7bd2ef151f2b4e0cff963121bae5399d88a967b0429bb028635bdf8e5fd890"; + sha256 = "831d5e632fa66a0a2b2fa5e169bcdeee9fdfd68b68f89e85f3a582342d85a4c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/cak/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/cak/firefox-138.0.4.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ea117e285e78f5c9bd35ed86b2e1a84b8c75f9888fce279469e34a700b901fc5"; + sha256 = "2273c9dfda2ef3cd8f98a86696bbe94dfb6242a047fc8b221e4a1c026d65892a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/cs/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/cs/firefox-138.0.4.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "b1fb778e5497eac9be3c9103e2225edffaaf9a55a32edf7dbc5137a5110f9732"; + sha256 = "2b62d55bd79f803274ce1c4b057c92ce11a74b2c91d3d125aef93bb740d677ef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/cy/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/cy/firefox-138.0.4.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "84a82b39c1cab492dfb7039f29224aae04ec8c8c907eccb8e1165459ce2ec178"; + sha256 = "bb8d822fc92dc25d0cb3237550799a2cc79b798f31b78236c846a81bf5f28a95"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/da/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/da/firefox-138.0.4.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "111e833222512579a5978deb1aa901f184235717d256aafaec54d182d515728b"; + sha256 = "f034afad97afa8a4fca00bd40e24951ba7d3ba39b781b3285b06fb22b4b2fb13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/de/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/de/firefox-138.0.4.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2786d075b670e7895477093a64483c9186c136e31733a53189e1f836212a0b68"; + sha256 = "133440a87be3e0a914e431f511bf4affcd99246f731bfac8e72fa8afbad9182a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/dsb/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/dsb/firefox-138.0.4.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "f2c1c838f960cdc9960617f89a125efba144b42f240f219da2e2974faa174ded"; + sha256 = "0c02797b683185a45f5108b5bf9e00838b3ea18b255725dd81257e579f9436f9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/el/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/el/firefox-138.0.4.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7bc16630f0742d6cc7e26cba1aa3034c063f49488742a2dd30def52083b05faa"; + sha256 = "cab1433d5d146c273466de601463ab607e4df026cea88d66e30279da8194afb2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/en-CA/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/en-CA/firefox-138.0.4.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6ae67a9cba822eff6db6e89220fc04a3a9e445d21d5dbc29f2a6dd511da5e89b"; + sha256 = "ad573c3191be965a733162cf28134da2f702df5660a6fc66a27374a848887ab9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/en-GB/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/en-GB/firefox-138.0.4.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c4e9ce831c5b8a0a4cffbc1636acc691e45f327526dc00544ba5109abe91fd03"; + sha256 = "02aeccd3ee42da245fcedfa6cac2ca9ea90ff025a0ee12992a3ef8f2cd214ec7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/en-US/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/en-US/firefox-138.0.4.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4d2d0a64a11f8aab7a1be583e1e4cddfaf2671967212b369a87489f3c11c3ac9"; + sha256 = "c27d5bf7483eda49aae544d9f8b4f064dbc7341b27d7098378108e52071bf947"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/eo/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/eo/firefox-138.0.4.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "5ff3fa657b17375ae6296c55dbaf4c39f97b85dcc1d3384d24b93ef2e71f41e1"; + sha256 = "f5d9735fc71b8336db3a9d7427b4ddf21143f6692fa73b40820bb15a87bd0182"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/es-AR/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/es-AR/firefox-138.0.4.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "da87078b682aa8a57c7e044e0550d61d6e8ea9838d0f944b6b820d217c623a12"; + sha256 = "fb16b058c74af3243358e046cffe5d43391f188962f86365a64477f71aa643b7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/es-CL/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/es-CL/firefox-138.0.4.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "74176fdedb082c5618e29853f5f20dc7ce8263ecd5d014f6ca03ceff30a5a22f"; + sha256 = "cc53da23b4192b8b1b77f9ca0462ecd5aca3dfc5011d8a6ba433b2efbdb12252"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/es-ES/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/es-ES/firefox-138.0.4.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "83e849e08b32361d56d3bd335bd7ee7c111e36014e39ca157a262d3952c6409a"; + sha256 = "37122bc4e577f0e5b451cd63e55f88b62d33055d13bc298ad6efcafa21b91ba6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/es-MX/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/es-MX/firefox-138.0.4.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "fd3f2a43eada4018d1f6e8a77b48beddc5f9c681c56cd54464f6e83474989d58"; + sha256 = "78da90a67ababdc71a01046e6e72a0aa20661962e054b2340c1ba7163daa437f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/et/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/et/firefox-138.0.4.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "629d0641ae705e59f7cbf35d0e58781bfd32a50d4eeb198a96911218f798656b"; + sha256 = "d2dd22adce2768e58f2565153814a9ae7c2d8d4343a88ab729336908dbb3f25d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/eu/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/eu/firefox-138.0.4.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2c03f8faa784945b16272005f2a85eaf60fc017841562c0d611953e6faf56d22"; + sha256 = "d1937bd1c41e49981f5ff5da77dca89d74cc404e03338310c9375bdcb2e92f79"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/fa/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/fa/firefox-138.0.4.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "a12bde6569b8502084771da0a2f18f7ccf98ca890770894409e1454186b33cb1"; + sha256 = "82d63319db79eb68c1d4f93e0a8a2e6f67569cd881178de6466cd0b62dea96e4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ff/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ff/firefox-138.0.4.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "deee0ae7bd91b10004ef57b3f4407d0ad070a8470360b6ca4dbda02346abcaa2"; + sha256 = "542dd6a9d43f2a7e1472a81804e01f338b4f21e9ddd14443915904ab689000dd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/fi/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/fi/firefox-138.0.4.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ccba0e18a4ad633aa94364738a5fea4751924c77966ff584668f9e924942aa71"; + sha256 = "2419e379b9f4a4bf69f9a81b3f114c5e4bc8461ca423cba2f19dd936a35dfd88"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/fr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/fr/firefox-138.0.4.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "26fbf838c0011a00566e15a97a000f44ecfcb70d822c092b1a665c5bae92c8ce"; + sha256 = "719d79a87cdd6dd716aa4ce1dc867e07eedd9b051fa28f500f1ba483dd5afb48"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/fur/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/fur/firefox-138.0.4.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "c2c4cc2ba62101858048d0b4a066ec96b4d06a9cb88b324150a2769194e5578a"; + sha256 = "ffe6655da019ed4d1e2c3fdcaff32370bfad8462d61343cc1c4ad7c37dac732d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/fy-NL/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/fy-NL/firefox-138.0.4.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "1e1da1efddfc44930d7e2155687198502c6a147ba5babda762ab029a705d07db"; + sha256 = "22afd1d68ae9ec2ff6119930bfd0e36074f7f01e13ad096b0be4090113310e93"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ga-IE/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ga-IE/firefox-138.0.4.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "12172ff7e46a10d7748e8ce98095b8cd2b701167bd94dac3817c63a25c4c3765"; + sha256 = "7fa3186f0b4a632b6f4c410c938d85620e808c57e8997d955f1d88f755d76e4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/gd/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/gd/firefox-138.0.4.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "87ed78295daf53670a9e611d8349b7a5f33bfb113170f4f6f4ee8cafa7a63a50"; + sha256 = "198f5e116e147ad882fc932cd549c2dff29cadd3c604768830716c18e2e25e79"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/gl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/gl/firefox-138.0.4.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "48526e2c9bb277a22a32aabc829de36844fc58da5ffce71312df8d335c50f7fb"; + sha256 = "2a0617ed7e81ffa46e530d68197158f96b92391ad1ff85b7a50c36f84d9190fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/gn/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/gn/firefox-138.0.4.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "fbbb559290c505bdcb1658455bb885b90027e14571d410ae196a5aa85b900012"; + sha256 = "a64e0d51f7940560d311f3d8a38e2315e7a43d4bee72d7d8a16555d7998ac982"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/gu-IN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/gu-IN/firefox-138.0.4.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "cfc6decb3bc1a56ca3a8a69ba5bfb4d644cf18ae8aaccef0b50c28c26884ff6f"; + sha256 = "cb6611e4fa978abdef3749c260b063995b1c107a1851352303770c041c57e937"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/he/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/he/firefox-138.0.4.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "dce47a0acbc6da24c29d45d8e0463b072d32d40c5d3d149fcf0a094aa2f54915"; + sha256 = "9d9a9bef24cbd1beabd933534ce6733de7ffaba76287971206ed822935d1efdd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/hi-IN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/hi-IN/firefox-138.0.4.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "a35d27073cb06c8596245aef25324dd02b1aa77a3ce590747b62cd819787059b"; + sha256 = "fa3e144b30eefe02d027f647a5ceb263b4a32177a226262e3e4ee8698051ec45"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/hr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/hr/firefox-138.0.4.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "09b131169508ed7dff624506ea8b8b4f99e8238ade520423aefbf47715ffdc48"; + sha256 = "7355b2dcfb283ea5f0caa86f1859d97fd8d87df7742163ba2f157b90e519ee70"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/hsb/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/hsb/firefox-138.0.4.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1f7df47d769aac5ba0d2a6b0d917ba71f95959b152c47a64f5eb3c55ef28228c"; + sha256 = "337667220643980cfb334313d6790e875c9e84908fb917b2874cc62750b5ebc3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/hu/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/hu/firefox-138.0.4.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8c9e53fef0b19e28ca9eb66d73d82aa8196031906825a1a3352939d314b69730"; + sha256 = "d7f0172ffdce474b465cbec769d5a16d696a4e350c57b2acaa5ca6b5668db613"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/hy-AM/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/hy-AM/firefox-138.0.4.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "508eff4fab89363d17e5a1b40e1232f78d455f3b8f21fa8037b4eafbb7d04a3c"; + sha256 = "16a40210e24f645685d6c9b7bb49e15ae2637bf8766980c47134e914b391d6c4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ia/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ia/firefox-138.0.4.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "36d2f4cb40444e76b5fe2ae26ed3b7f4de186b9473aa4ca250b2c612d085bd16"; + sha256 = "1c86528c3163a1eefcd307802a203f9c978a83e8b3547bd7cf2f32a72299fc18"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/id/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/id/firefox-138.0.4.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0955a98ff17421cb9cc765eb739ceab99ada1f80754368c98c3f53f4841d0f1a"; + sha256 = "4e6c513d761aa715010ecbef732f0357d62493236e5428df1df25253eaa8f17c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/is/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/is/firefox-138.0.4.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "2104b093ccf47769de9b508cac463f5f51bd3f1114f870fc9594ff05924a9669"; + sha256 = "061744d3ef7a2399c4d2c34685b995794a926d1ad6fc747619adb510b8a394b3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/it/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/it/firefox-138.0.4.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "8973925b0a746f9cc6f3197c57a6231d0527098bb117fe23db6d3ab0f5faa610"; + sha256 = "197423e145866987678da3d064f2341cf4c21c6bced709494f17f57a95d7b478"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ja/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ja/firefox-138.0.4.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9f6d78377ae72f7b467ccfdfb04b5c37fc4b8900618358a4d033b106c285c147"; + sha256 = "e4187d067fb167ad407bf5f88d9a0d78ff1b7cc13138d803dc240c2c1fd5b40c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ka/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ka/firefox-138.0.4.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d92c5aaad8a8ce1da8967701078f9407c37c73da74e8e3b28c2eb0e662d98425"; + sha256 = "0b33daa993219264fc7b188a68f7e5db5ae29c0bd03e994e6f4bc76058fc7ee9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/kab/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/kab/firefox-138.0.4.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8c542d5bc8dc58ede9babc6f0c7d16124ed38ee81ddcce5bdacb58db6f7b8748"; + sha256 = "1525dfc137131c1bd273fbd7feb618b81f35860659f16209e772b7ba0673a432"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/kk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/kk/firefox-138.0.4.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "47233dbab7d055afbb88a940392c85af0cd3c2cfeb9ef1a1e45951ea61dd415e"; + sha256 = "964d2528f57cf645cdc42717f6d7927348fcdc64b41a97c76ed40ff938ce6b3a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/km/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/km/firefox-138.0.4.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "d31602052054a5563006421bd4c5cb49f3ee2b81c6d17cafc292d03db468a093"; + sha256 = "c88e49fa1e7b80dcea31e97c941db043489bf78d99bda288103178b9ef67f9f8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/kn/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/kn/firefox-138.0.4.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "2f4375d960dad794e663f6d11eccfab9d2f694b1c492688dc7a3bc170d8da548"; + sha256 = "515b23f015bf9515071096dabe6460bbd574cb1cd236a38685b033ce9f17b591"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ko/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ko/firefox-138.0.4.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "284fa288bace6a1d02ba073d35d7e6dc0f3a8204bbc9c694542696a384c7c13f"; + sha256 = "1e14f897d809c541e66b2ed6d7d99ec40c6fc5b205129dbbba020f0ddfc20238"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/lij/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/lij/firefox-138.0.4.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b83c96c8307dfc34c8a96e223fd608803636716c77c43ef3450657ea2245803f"; + sha256 = "2e512ed16b6f6417d0ce1526b227dd1db65574e7fbf77d44207e5f119d58cd9f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/lt/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/lt/firefox-138.0.4.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fd10c1a6bd22cea53fac7cbd3efecfab9c166f6cf1baa5f19bd2b583b6baf67a"; + sha256 = "9ebed7889b0d21bd1a8888346f7e7e8f695cf1d63f1f419ba5365097865b8e08"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/lv/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/lv/firefox-138.0.4.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3b47222f76bf46febe36ae9b725f802ad47e77723c56eeaec3bce31f0ec666ac"; + sha256 = "ea6fba7fabbdf5985ea39dbcf13af668a535111f63bcefb637839971ad8679c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/mk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/mk/firefox-138.0.4.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "1eef2a9d5dc8216ee9b7f41451c5fbb31280a34dbe57c68de17b0109b465bf9d"; + sha256 = "a73977acd9b93c91cb822e022d31d7e1e6b82a67534f6e3318b8ec22ae981f88"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/mr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/mr/firefox-138.0.4.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "40a82271bff17331831163968368c56c2380eab8c6d2e3e09c14fb398cf553fe"; + sha256 = "0e9e22920bf6532245d05fc8b59701837c08e194f55de9d9c2ec87df75e5b786"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ms/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ms/firefox-138.0.4.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d3238ca7258c369a3e7122e9748a75e11461fb2efc8cc86f4f69e513e0e38f88"; + sha256 = "a2998dbfcc31ba1a27e250ef82e338d777847d721fe2736d51c3da42aa8fc1da"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/my/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/my/firefox-138.0.4.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "0e4cb0b647707960e45277d521d11c58ae8c2cc71a2bb23aa3eb84e38e2688f0"; + sha256 = "6aa0cbe3b830a09c42f6e5047cb7532bcff4e7461ef2b4cdf66fc9da712d2a28"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/nb-NO/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/nb-NO/firefox-138.0.4.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "3817d86a750ffb49c71418f46e2b874e0679bb49477fa5be045b67a8f0d26e89"; + sha256 = "6983681bec0c0cf843dda0f6854f1024bf78b0ade236e0798ff310461bb6cbff"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ne-NP/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ne-NP/firefox-138.0.4.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "6d05df99f58dbb46be2ad31996797613e393acc0747e79ce2755e8f4e34cedc8"; + sha256 = "887832f25352196eae4b6eb647533b7850df63f2d588186993843f71141bce87"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/nl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/nl/firefox-138.0.4.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4be5d1e827ed27a01cbb9f7c532278cc224372ab6763a5f1b01c387790b49ed0"; + sha256 = "23cf469fc5cc8760eec4191938d1c9c62ee250e4535b7b9e9af6790e30bf4694"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/nn-NO/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/nn-NO/firefox-138.0.4.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "ca14556509be5b56c59c15da98ca59743817e6f2a723f0374b6cd5138f237bea"; + sha256 = "fa1a0e46dbdd3b3fe9a55cec7a909616c3bb7fdac7c31989241bde576352c4bd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/oc/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/oc/firefox-138.0.4.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "52e922dc023174deddc45724a6404fa98fcc3fab1249db7c676e4edea942e789"; + sha256 = "3267e3c66eb04d82090e59600afe5f7d63965a35a23a1fd821239e7e2f281abb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/pa-IN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/pa-IN/firefox-138.0.4.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "71a918cc8bbdc1330ab47a1dc87cf34acfdaa2d28b381303d39e4e3707356c46"; + sha256 = "c554ac5c4229d65903451596463bdfa3406c3422cbe451658fb09945b00ab9a1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/pl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/pl/firefox-138.0.4.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7016edfc3c4df5b35c0573e2fa7e6c027fa47d8d40efc26d4675bcea63247d45"; + sha256 = "ba6ac7e79b2baa3a134d84179604dd95f375a529f79524f35376a249e4aaef18"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/pt-BR/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/pt-BR/firefox-138.0.4.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1d9b962d17c4b9ce98f3ca3ee27322b457a60f40f5e8b22442e799ea06af6ef7"; + sha256 = "98fe932eb1fa04eb40e0bfac8d6600368cb095a00c0d5594ae89b31da29c4317"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/pt-PT/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/pt-PT/firefox-138.0.4.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9bfe91f80a3139c62c8cdf5bb37d35c1008e01597d36a2fca81e41aa3d17ef3b"; + sha256 = "d2b0635cd7d64c38dbcaab489aaf706706d6a3818ce4c5fe12d46867970837fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/rm/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/rm/firefox-138.0.4.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "d6bf491d89b34057906b84df56ccbf944f420af925e19fe33918d6585d6caa3c"; + sha256 = "2f17eaf677a89f0641ddd5bd272adfa7d2404a10ce36588e4101cb16f4d1c06a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ro/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ro/firefox-138.0.4.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "da4d3b63d5f17a36b838345597789cbd73813cdb8f9773d69d173d55857d0d3f"; + sha256 = "5c3fdebd6966a63a2b149061ac9e7a313ad045403a958e16f8d721875983ceb9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ru/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ru/firefox-138.0.4.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f9704dd046e83a9a6ed355a3835f02e83e2ee9b2243bc0910218be04b54dae51"; + sha256 = "a90635f3a73f440763594d87e3496c4a3d510fc35c35c71d6984f65558205fe6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/sat/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sat/firefox-138.0.4.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "e386d0c0386f6a57896b4024445c51c53a78cf3e4f9cf47e836fdce6e6a60d7b"; + sha256 = "79f3594ef58d26fe396e1d5254b944b8f84a68a1c2ef7bcef76b15658af29071"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/sc/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sc/firefox-138.0.4.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "2d70cc464f83686760504948d8083d5748f30030be0e549cd78e2c140943ecf1"; + sha256 = "99d5875677fd16c90b7ed0adf17a6d03cebc0056c0f63fa9a6ed21b2d3b87427"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/sco/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sco/firefox-138.0.4.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "55c655be9aeb47de0f12b5f3af96f7dfaecaa072c8543ae12e0dd1a30c969ba7"; + sha256 = "0f1a8173288e5efc5d49f6d7dc09f68a2f8f9afabc74acf523f3f3d57ff32465"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/si/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/si/firefox-138.0.4.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "c8af3c3cee002441de94a83b6cb5ff0855164bb11dc5da1f1138ef481834a0ba"; + sha256 = "e985191a49387bda29d8b0afe6a0d395e1151b28a5b6f9ed1ea6c7910452a5e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/sk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sk/firefox-138.0.4.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "0aebe440e1b3f4f8bdef2b29d31cf2f327a817c6875815b2424780c726e6c706"; + sha256 = "4b5251b43442056746574c3875a2d72c5684255e6fe335f3c28aeca0cdd2a5df"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/skr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/skr/firefox-138.0.4.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "9ac7983c07695887285605e1630c137d492bae0e0bc2a0bc72e90e34b2006291"; + sha256 = "2c1598a8dff78558835f07eeedee009b0d7f023ef475b981fe88d51edddc8acd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/sl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sl/firefox-138.0.4.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ff432f645d8ec6f01ba1b79798cdd2a8354255789713d5d93838dd58c93810b4"; + sha256 = "a569d658d08994b83e7b4da35d402ce096609aa70d4d863f700b9384ef9fb29b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/son/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/son/firefox-138.0.4.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "1cb4bbdfd80d5acdd8f3cf3caff24e678278afd70a81ea62cfdead111b4ed3c6"; + sha256 = "c2861f1086902791d8958b4c93728c23ac562db16fc9a751fadca17ebb8b56b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/sq/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sq/firefox-138.0.4.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "df5eb5e5c12e826e90f15eb72a00510f343ccf3ba8af94295f182a523d8ba17b"; + sha256 = "83488c68cb5ee1e9705eb91a7bcbaaf9fcf0321f2cd2864110cae421c102113f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/sr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sr/firefox-138.0.4.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "2f2a42a221a6d79653ebb6490af2e239bf9c291c67275368a68ffc8ea4f3a6f0"; + sha256 = "57bc4bebaf51204f586a35af80e29bce76d18e6ecb496ebb6c3f7d5ee6edfb21"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/sv-SE/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/sv-SE/firefox-138.0.4.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "5780ba80d2d4bf2e77c6782d77b649c556e9bbca10f5e19cf58c717c9d84675f"; + sha256 = "ddc79581cb750104d2b3ca950ebc08926ae169aedff9de0097820a8609756386"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/szl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/szl/firefox-138.0.4.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "1ec2ce94a00c3905c5968513114b443ec8aadb3dbf9aa45b8225e161f5276890"; + sha256 = "4d3b281f70e73c97d6333aa0b93efc8b744e63b66d54e3f819b1e0cd44d48edf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ta/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ta/firefox-138.0.4.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "1abaa556db5537b975be0167901807b0a8a4e483bf38e27c84f2cc44a0573230"; + sha256 = "3e3cd2018a8c1dded25dcaa567d4718a8fb2b97306e94328b1287ca0bd823416"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/te/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/te/firefox-138.0.4.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "373e712aa837a9a7d04dc0ff1ff952e2abba83996f27dac4fdd9912f904a8c6d"; + sha256 = "3b7927bccae8823ed3350eea6230a1597c87edd4ef03d2545aa54b790b433500"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/tg/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/tg/firefox-138.0.4.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "481549953121ffae113ea919db02650e3451b4e807a92f32cb4f7820562205fc"; + sha256 = "6eb55acda161ef168ffe6b8b7ccf338d1393b809451bdc2466108276c8ed6493"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/th/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/th/firefox-138.0.4.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3c2e22afbc7c09ef95aa567170faf494eea68d156f55b48a56ebb62edefd5af9"; + sha256 = "5a0798ea59cdfa393a142ed782e1229147da7332fca84607d2ddc8086cc831cf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/tl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/tl/firefox-138.0.4.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "32bbe4ceb5245741e147fa7e3c00cd5e0f8404c06b98c697b8bb0d68887e0961"; + sha256 = "2785030fa1641d6058d8f65012479348bbbffd458bf5266c83deb30f6f1f3553"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/tr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/tr/firefox-138.0.4.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "74c0568ca5d4133e62c30cf28d59d3108925b5186274c713cce6d88e58c72f02"; + sha256 = "c08252777473eb856df9eb417b01f2442e9d55421f0e2ac7924b48be10178709"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/trs/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/trs/firefox-138.0.4.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "ec17e6bbcaa1b5a23ba80c3cfd9961fca16154b4a94b2ec47da09a3dfd4b02af"; + sha256 = "4f79d48886ec1b6ad87a4e635a9b90d22a076556a35dc9245c08c1df6444c99e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/uk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/uk/firefox-138.0.4.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "22f454b37e3905667dc5e87bc7f787b3229d3a440f128c24df1ef1e50c6b1dac"; + sha256 = "92427d29b07e6712ca3807271b2ed26cdbe99424e6bb09acc5dcd92c229f86bc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/ur/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/ur/firefox-138.0.4.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "4fbb2b47c09c733fa8451bf997405e06352e1ca2007b1867ba68b91e3b108f5e"; + sha256 = "339dfe725ef1f4e788d0787149dfc03f8c219edea80c09a9f9ccef12883f23f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/uz/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/uz/firefox-138.0.4.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "63294639dd02b0ab16f30257303b0419c0fe2f5b35cbc0ed27015e1ea995feb0"; + sha256 = "2d8a591224fb5ee93fa4927dba5c76836cca0a25585418de5fb6f9072ae56e9e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/vi/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/vi/firefox-138.0.4.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "cf8c9790c7882a27843f22f4172f8f3bc69bd35cac256d44317d85e4ac6cbde5"; + sha256 = "38ff692acb9f0237ff989dc80c7d67c25286fda25070e8fd65e1b217d4400f15"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/xh/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/xh/firefox-138.0.4.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "91c28d759e0e6ed7a113f3bd47273a698c2634b505090ea9f72d8054d212466a"; + sha256 = "1c2d47df6876ab96c670562575cc9dbf8ec1ba183c6ea97035be74212786f64c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/zh-CN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/zh-CN/firefox-138.0.4.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "f209fa4cb033d18220cf1a7cead20487265b13226d9f639c53eb105438b1fbe7"; + sha256 = "f3c0e21a9d0e8875bf81bd75371cca8069308b3b89b6209dbe4fad9bebd75e44"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-x86_64/zh-TW/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-x86_64/zh-TW/firefox-138.0.4.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "158d1a4c2f8f414fb49d3852413f1f78b46580d8cdb481701aa47f36d66b57ef"; + sha256 = "6f4e54f67799f703422c290347aeb769687486586da55e152c2b9130206f57f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ach/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ach/firefox-138.0.4.tar.xz"; locale = "ach"; arch = "linux-i686"; - sha256 = "3e92ef8948d733e1722b969e2057169957fbe70a52f8390515d8935ffe4a0481"; + sha256 = "5dd3ba89132f9f8c7ee68e67af48d78c024c287d0a33b8c2f9ba4b55d1ad9f74"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/af/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/af/firefox-138.0.4.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "e40102448bc8b0ed6dbe410fab62f267a05063690ce961c2a644b5e9e13d13f2"; + sha256 = "f03189eed2f414ceece4d863002565f86665f359b863cf2a20a0307150ebe2cb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/an/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/an/firefox-138.0.4.tar.xz"; locale = "an"; arch = "linux-i686"; - sha256 = "a9181bf168d602565eb990d36419ab898547e4d448d6164f7fa4ea071b4b6d4d"; + sha256 = "fa601b188bbd69d0f449371c00d836d377ba313f017d05695939743037b8d3c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ar/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ar/firefox-138.0.4.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "abc504e65e68d3386d8bcb05e97141ab544ffbedf8cbea8bd6f532fff6694af1"; + sha256 = "0024c9a16e7f9b797fc03c3409d7867f67fba30152d1ba2da0cc8d31590169b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ast/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ast/firefox-138.0.4.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "e2d3d6b3f29c5bd1873e4515734f90f5d2e41b0ce0ce8ef6293ef99be1729b6b"; + sha256 = "9f9f45ec3c8b3d1041fd01366de8a7d7e4c5cfa139ee362ba749d27b10b63ad4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/az/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/az/firefox-138.0.4.tar.xz"; locale = "az"; arch = "linux-i686"; - sha256 = "8e18e8d38cac2450737140fdd6dca38f2bef967160647e70a408fa429d397fe7"; + sha256 = "db7b0bf68da87abaa98148a0eeef7e1190905385dd42e18c752fce65d50894fb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/be/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/be/firefox-138.0.4.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "325dc96f93d6685e72807fd78b07413e4e761060006a8673eae5da60d4e4af0f"; + sha256 = "26e860fc1a8fc14d7711f1b7da85ef8c9514eaa902ba21621b0347def6c5d55b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/bg/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/bg/firefox-138.0.4.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "b9bf7f7cfb27884c1178c35989dcb8913d2213d498efacc3218353f5ae3394d2"; + sha256 = "624cbda3f271329bf645f1ef43d1aeea9d8fbdb36076965f3b9db5a1b6ff4f5e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/bn/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/bn/firefox-138.0.4.tar.xz"; locale = "bn"; arch = "linux-i686"; - sha256 = "18f2e2de5e6e8b040b83894ad060552a18507ce5c6a1a85753fb12e5f014605f"; + sha256 = "597ccdce124bec7dca2e6072d34b11a5d920cf5056b13424729e159a8783b495"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/br/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/br/firefox-138.0.4.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "c9b6e2a4f6705d4c3ae2addc90bb7e51809eeb5a5390eda701356ea23dd973b9"; + sha256 = "b13c74d9f699454554c32d67eda818634ffb7b9e83e215b7909f564702721ca8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/bs/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/bs/firefox-138.0.4.tar.xz"; locale = "bs"; arch = "linux-i686"; - sha256 = "cf6f0c9a252660b58a71a5026f099bc4afa5a4fe5fb4fbf1398984d156687f6c"; + sha256 = "acdbf7f530ce672e03a0c04ed7689695d33a28e584822bde566f5a7cc002edbd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ca-valencia/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ca-valencia/firefox-138.0.4.tar.xz"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "9c1ffc7667066162427b52b45c01ae90db98a8a5ad732f353cd46d591efe9615"; + sha256 = "0166f2f05e40690709f172ed356908fdb1743065306322c450560300a99d54d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ca/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ca/firefox-138.0.4.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "f2f72c3ee4c5f3b1ff98243c026a93d7eba570902836ebefd014694b2d00ae51"; + sha256 = "85278d898c3c9ed00355965b3eba133bb83458e67e8c05fd93cfa4679d63fa5e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/cak/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/cak/firefox-138.0.4.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "c455f321b1f470dd15a6902acbff1b0654c936e15420b504c6da81172402a19d"; + sha256 = "5904a61687f1e43bcd3781781c11dee050c0a85158858097ea3aab12f2b3411f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/cs/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/cs/firefox-138.0.4.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "4534070832e991eb70c88f5d7e59d105a895bcad89f53ee629e3fb44143deba4"; + sha256 = "db2592b7c11979796ca264cf5784cfe216fce30543fca3382aab9dfdcfc86b46"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/cy/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/cy/firefox-138.0.4.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "d27e2ba15197a4c749805757ae1d937f96dba1d44b7df95bb5d2a6571a2053bd"; + sha256 = "af3eb1ea06ff7e6c18753c6cf3d70d70aed4764d6ddb0804754fa65fab706337"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/da/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/da/firefox-138.0.4.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "f4579f9289819cd8c39ba5339aa07461964ea13455a45532f2a4bdb792154000"; + sha256 = "797c4aede76d16ea193a664bebb1a39911a84cc2725930f3f5f472105c226af7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/de/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/de/firefox-138.0.4.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "5e69c8508fcad43a5c0f6ce95a7e23bf6f6899f486c8ce5e2990b04e1d12b2a0"; + sha256 = "10d20fbf478278b7839e2eb90b42ceb54665a32de7337a62829127c40d4cb3e6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/dsb/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/dsb/firefox-138.0.4.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c688b750ee9eac0511129c907ff0c299f8766adc2bcb276bfc45e7563f5b63d0"; + sha256 = "f3251a83c59efe8dca6003a2249c322a3fbd6ad36f1db709fea3ea0b11d47af1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/el/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/el/firefox-138.0.4.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "67ccb57d8de2c4665ff08c0c2e010fc6a8c18b3d43386d3baab11653fdaff93a"; + sha256 = "611c1d7d26801f491049fc09cafacb8bcd6552bb5e84ee5a96847e04416e206f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/en-CA/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/en-CA/firefox-138.0.4.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "58c95837e0796bdee072c9cebdebbdf9fa4d174b54d7358675e45879be5fec95"; + sha256 = "9248fff165cdddf83473eefcb044c21aea74e8163486de9c7472dc81c5568c38"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/en-GB/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/en-GB/firefox-138.0.4.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a8d087992c67ac93bca77e05297b3b6c7a2b5d0db09257ae8ec1c0882ea77463"; + sha256 = "168c1d5b3221e3de90b5e22b52e072527385898f24f4eca40327975f126e6a7b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/en-US/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/en-US/firefox-138.0.4.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "cbfbeaca5d6026f3d8f72a555aa18ac1c60c618868aeb7595b235879f58d0f7e"; + sha256 = "ee449eeb513f9e02731d1281a2575c18a803789d925312d08dbe77acfd42db53"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/eo/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/eo/firefox-138.0.4.tar.xz"; locale = "eo"; arch = "linux-i686"; - sha256 = "f3587601e0045090ad71edb691ab54e9dfdc148f69cdbd80fe5bb48fb8f933b5"; + sha256 = "a47996ea9b5370f46dec43f681fa02175eb9afd0b7c6a1c213de2c8221da394c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/es-AR/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/es-AR/firefox-138.0.4.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "a14cb9ebe832304e32963ca3ae943594468bd529bb0a27252683869555f049d4"; + sha256 = "8853b6e57a1bf6f1af9df93f18b54a3803c1c281ea62d7ebdd8a9c4752e3875b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/es-CL/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/es-CL/firefox-138.0.4.tar.xz"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0201f88ed61099f489d253b232bec93295c24283f3cc095501e0cc5e4dfb8fa4"; + sha256 = "fcf2534647fc003d28c65f5125efc855a2acfa40ccfd1808a9ea5ca66a06f93f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/es-ES/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/es-ES/firefox-138.0.4.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "12dc08a06d330ae72e2bc433d398af47ab0e6c03f144c8af3645e591209cc75b"; + sha256 = "afc9828ca74ebbf52f163585462c8f4536cb6c4d526a2264e7b77428699dc8ed"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/es-MX/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/es-MX/firefox-138.0.4.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "dadf1cfe2491fc3f13443a5fba49c4dc445fbc3436e91b8f8485e29858194d26"; + sha256 = "e30d7471cbf609d4c59aa3fbc80f93e8c61f3467641c163bd285e4388dfe2d5f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/et/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/et/firefox-138.0.4.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "c34647879ec1e216aad653cbbef934b2a979e5f9c2aca27c9102ee45be307cf6"; + sha256 = "2b27650300b9bba378caf83c58894f2c149962f1f8a957f7301ba624875533e4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/eu/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/eu/firefox-138.0.4.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "0913039cafa14551bef890efacd004ca4c74851e364493cfce750b0c642edb03"; + sha256 = "47ba871013aaff2c05b56d6e75e95d5131cc27885d76d4eb67c1cdbd452d82f6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/fa/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/fa/firefox-138.0.4.tar.xz"; locale = "fa"; arch = "linux-i686"; - sha256 = "1e3ba76c6f69fdcc874ed798b64453efd444e9958df20140d57da8345d66c7c2"; + sha256 = "7f1bcdd745ce25852951cabbe3aa1771e9adb054211ebd66376aa1551715ad24"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ff/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ff/firefox-138.0.4.tar.xz"; locale = "ff"; arch = "linux-i686"; - sha256 = "febbb983889da202c8f24b911d12e4e0a8996627f10e77860cefd85cc41ba3e1"; + sha256 = "b4a18327ea9d084cdea3fdeae6ab4e250a618551cecc4f5579146dbb78b1b7b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/fi/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/fi/firefox-138.0.4.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "bd5f2d808c13f7343683f1caf3ed34adc8b2800d091a3855dfa2c16a45b98672"; + sha256 = "70ad3a0ad598ae03bb82fa0d018fb67a3379c2fe290f8ca6db7c41547b936ee9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/fr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/fr/firefox-138.0.4.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "7e05d67289d8518eba2e80a08b6aec102cb9604059c46d569e243fe00e79fe2b"; + sha256 = "6b2b8e24a3d47d9278af8cdf950a6acd8e02f41dc8d2eed6959e9e9c22b43c38"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/fur/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/fur/firefox-138.0.4.tar.xz"; locale = "fur"; arch = "linux-i686"; - sha256 = "0f897a03ad3d09adcccd72247598b8a7ec4203c8852aa0b71f2e8e8a778a13c8"; + sha256 = "1f71f40a7b7613fce5db1ac90334c892f7942eb318c56366b0a8a9ebcdd573c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/fy-NL/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/fy-NL/firefox-138.0.4.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5a71ba6ba51993d3ac5d795a747b36a062a6c6e8c84f07f853a7e5f0e99f5fcc"; + sha256 = "c6c855030055902068fa6b1494b4bd8051107f9cc551270a763483fd73baf8d3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ga-IE/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ga-IE/firefox-138.0.4.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "723c569ad3f8de347bb129ccc82f9b1182d6d1b10bdf5224072d13e7ecde5505"; + sha256 = "5a0ee4954443dc0a9c72b141ba7c27ee4691f47203b41f871a26532d66608942"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/gd/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/gd/firefox-138.0.4.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "04565c6a8d3a295bc48e54eb0c359c191d01c28d3d47f907a33c4ba997800bc7"; + sha256 = "ca2527427edb8086f8451a3bd82a6b301bf2a96bac331bfffb57b4f51f91f3fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/gl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/gl/firefox-138.0.4.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "f635aa33837b4a54c20ab7a5e94351166bd0ac9bb8398482ce9a3cb4a5dc4d03"; + sha256 = "03a267074834c2b27d344d05cc2dcf00f29efb396ff9512bff0669a6f8bebbdf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/gn/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/gn/firefox-138.0.4.tar.xz"; locale = "gn"; arch = "linux-i686"; - sha256 = "6f9d72bc4ecd224d6cf40265753d39562706f5fa32f1a2b591368e8130dba0e8"; + sha256 = "cfe27a3e05b961904b1597c8d4fc0b0e99b7e33227520e43e8263f9c9cfe0b4a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/gu-IN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/gu-IN/firefox-138.0.4.tar.xz"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f03f70ba94bcf8f761cf4a46aca3feb5d9af67cabfdaeca0d43b377f6f15e81a"; + sha256 = "4cae698f4e15e43ce9cffdefaca39599adbba39175f50d65a46966fda45715f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/he/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/he/firefox-138.0.4.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "4413cf7fce4d70502691a58352f2373c92fe67759ed41f655c56d103c8b8c114"; + sha256 = "15740234c63502aebbfe37ada70c52d8d14233f9f44235a76ca2d81a28e4bcc4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/hi-IN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/hi-IN/firefox-138.0.4.tar.xz"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "23a3d57670da93e209f33e5d027852c30453d60b96f6b1ecce6991bd0ee2b75f"; + sha256 = "16ca487354ae6c278e2ea46809be206da5bf406374b2778423b901466321d7a9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/hr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/hr/firefox-138.0.4.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "0b651ef987bbbd9b28172db37311410bcfc36e4f9bd65f0edb90fec24e4e8f0b"; + sha256 = "f010c61e690aa48be7b5e1b8d2ca9f10cfa38d450738dad408901b22c9caaeaf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/hsb/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/hsb/firefox-138.0.4.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "19ca6c3a0bf588d5d04a5e40186d0c99d5d8ece1269d98f3967a9fef299ad211"; + sha256 = "880ef92add1adb0d1638d5bd7db94d1a3d2e753d9575fd5dc904b5efd1b6b646"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/hu/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/hu/firefox-138.0.4.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "265ae0e4aad7af421633b640f6b18d348d0bb1bcd15b4ced93fae735bd3dd2c4"; + sha256 = "a8495cf15efd6cec8655df3ac160c9b4991ab58c13c832c350829835cb4350e7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/hy-AM/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/hy-AM/firefox-138.0.4.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6b6b9326ea5bcebc87879a5b6c18ea9834e3cea32136c38d0e91b1813de5466c"; + sha256 = "89fc7f96ae391fcda0322c752c9f6d279cbf6f274c06c65ab1168d472ca7f8bc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ia/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ia/firefox-138.0.4.tar.xz"; locale = "ia"; arch = "linux-i686"; - sha256 = "7a5f5668ee07d3a52210203333cf92cc94ba691cf9045c5ddf6102898afb9f55"; + sha256 = "b22e860dda57ec4c2874ff4962a5c43912cc59dcb12f9c577d20cca4a35b0700"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/id/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/id/firefox-138.0.4.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "af94ee35e662aa5957ab5d3a983e65956b3afad1b2b968cbd89334ad48a7203e"; + sha256 = "a1fa0cc30aef3f5aa2d59f4ff472985c1de6d86f394d94517bab39387d7362cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/is/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/is/firefox-138.0.4.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "4bd309b77ca9e8089bcec7cc62067357972fab8465d59799e5aaf3c05343a292"; + sha256 = "580cdc317a53fdeaa83127a4bf5ce47224ab6757b985254001ac36e2bb0b5db8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/it/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/it/firefox-138.0.4.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "d68ce654182cc898fc6acfca3178960c627e9682f274a52d3e5add64e7561331"; + sha256 = "8431a4a808e7cb7e8f44d3f39f75c39de327d1a51e5297dd1f62ee0a4aa1d263"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ja/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ja/firefox-138.0.4.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "d62fddfe2ce1151e29a8a5c2e44f89edac22a344c1c02274ce55a56817d9df74"; + sha256 = "f6ded939f6ca9ecdf75e7b756b7bca5302cb3c9b9e311c716aecfa665969d6c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ka/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ka/firefox-138.0.4.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "9c31f73035ea6809d35080255a20ee2f024890a9d41aa7574ea393f32b0845ad"; + sha256 = "ba010ae9f3d60d3493d57b2cd149511ecbdef37c6b4e777e061f68ce53926573"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/kab/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/kab/firefox-138.0.4.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "4044267223e52815b922826ed6d62df5126351fae0d595700aa25c8d9e328eac"; + sha256 = "e63d49d6c4323404e936c1e4db07f1b1e9178c7e2fe6fdf3feea0e27b16ba7a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/kk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/kk/firefox-138.0.4.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "a12294a4a71fb7d86ea23ffa1be5608590f73662e60b45811f0e3bdea8656828"; + sha256 = "ca2c604cd04d1cded67e68573c8258757e347cadadc7a471f20224ba72125a80"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/km/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/km/firefox-138.0.4.tar.xz"; locale = "km"; arch = "linux-i686"; - sha256 = "cf50fbb434d592689b63f89db89b29f0676b92bb245cf0442f9e42ab922cd5dd"; + sha256 = "34cc683a8ff5d05c48eeeaf976a02088c90c30c282be284ed5d605a987bac2c7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/kn/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/kn/firefox-138.0.4.tar.xz"; locale = "kn"; arch = "linux-i686"; - sha256 = "c825910dc60a603c093368f56fdf02f8e659e7c4a5954c4e2ef69d33c781b87c"; + sha256 = "2e02074d9e35d3b7fb98c98780dd76be88eac05577753051862c051d8bca83e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ko/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ko/firefox-138.0.4.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "7cc64c8d265814e8d123b9163b9344846afac8c0d113b24b78151d667383a87e"; + sha256 = "ae8fc03e0d4f0933f9916060e057e9ddd1078d84913a184c1dc29b147bc11807"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/lij/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/lij/firefox-138.0.4.tar.xz"; locale = "lij"; arch = "linux-i686"; - sha256 = "1d5e32b81d6c39b70eb9cf9a4622bac882bdd736845dc7e18bafb5e0aceb4527"; + sha256 = "dd43f573183b283e73833952de1467575a6363f9b051729e2f47379ea2ce5b37"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/lt/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/lt/firefox-138.0.4.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "85ab7dbc1dd3451fa1fe1f9fb81baa1d898b7730c109fe85252ab7a69ad211e6"; + sha256 = "67490ea27fd204de0531c4a3cd7104fffbcdb5112e6c3f81e0f18ed22b8b5b40"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/lv/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/lv/firefox-138.0.4.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "4dba11ff2fad18ec20d3127d60754602349185ebea03854b209833814626a01a"; + sha256 = "ffa8d823643f2bb33c207c9ae73eb893dd538f8df6e86ba73c6af04f8f66b44c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/mk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/mk/firefox-138.0.4.tar.xz"; locale = "mk"; arch = "linux-i686"; - sha256 = "b31caf6c3fee626047075a990a321585d325091dc510b6ad5dcb09bd005e4936"; + sha256 = "f98f20c83a1f5e4cfd27b13dc440305982f1da069b71c2002763727f2186d3f6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/mr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/mr/firefox-138.0.4.tar.xz"; locale = "mr"; arch = "linux-i686"; - sha256 = "2903a12146298030715e8612a08d3edaa4d35841377ea9c9f6dd8f878ec1ad28"; + sha256 = "73d55f3dfeb925a639a6425290ed5a5684c2796e8903d5c001ac45322b6e795f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ms/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ms/firefox-138.0.4.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "2813e4609f3b737100ceb1192a538b1d7ac1722a83df24cdbbccf8e2bdc649d4"; + sha256 = "786383fe8e227318213e18a41d665e601d52994d7bdcb73b3d61381b1d757508"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/my/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/my/firefox-138.0.4.tar.xz"; locale = "my"; arch = "linux-i686"; - sha256 = "a5072da6b899761ff97b7e9f0ea598182efb909196cccca898d78cabee2dc93c"; + sha256 = "1abf6c05f1683b71bc4578a575ec066a244ac52071e1eee9e0cc1396f0e07581"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/nb-NO/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/nb-NO/firefox-138.0.4.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c661f652621dd10c9756ce932a40cccc1857220c7778c1b7b5bfa7166c28ea04"; + sha256 = "92c23443656cf3e87d7acea3f81da7282a41e27d647b11c3cec23d2c1a370372"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ne-NP/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ne-NP/firefox-138.0.4.tar.xz"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "486bfa3368258f04a6bc324bef2ee9a9c6c7872cc32495b9d063e69b7898ad3f"; + sha256 = "c539a8690ecef7dab5fcff0166722c4b88e7aff2bfae94c6a4ce34cb54a55a78"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/nl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/nl/firefox-138.0.4.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "c68057d34b759675489dac93e446bb21afad6d57363651013ea7c58e0960d470"; + sha256 = "839d1f1b17553309725efaa4810cdc5ac7890c0fb9d7d8bbb113633753529599"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/nn-NO/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/nn-NO/firefox-138.0.4.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "128232272d75c489a57efffcb54b59936f2588115d4770b36e2c3903e42149cf"; + sha256 = "4a556f61f1a6f9e5e7c69a5ba6d09315ea2c8874d7456b1ef9b52c4673755e58"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/oc/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/oc/firefox-138.0.4.tar.xz"; locale = "oc"; arch = "linux-i686"; - sha256 = "7035fb1612bdaf7169e2f4b2ca90780627e0a28e876d06338e59d92ec85e1348"; + sha256 = "97f6e2ed1e9062a5128cc418e14204d7d72decb6b2d5e855b24d6179a235338d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/pa-IN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/pa-IN/firefox-138.0.4.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "03396640cb5f104ed1c7991639ae058e6d2dc45c201e54beeb3bdc66c08cdeeb"; + sha256 = "f4e21991f94a6796ed072e1b77bdfa0479dccc6c54ffd3982c2d83284e9bdb01"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/pl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/pl/firefox-138.0.4.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "1ad5d0e090718c79b41371fa19b9a1c5be5a35947b7e103ef19a0d5b634f4cea"; + sha256 = "41e7d80bfbf56d968e4384a733736f4d1d640861efab71704b5a58803a153bcf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/pt-BR/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/pt-BR/firefox-138.0.4.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fd6c4e8614b11ebf77931feaf49eadcd97e8bbfa98b475aa656c61ea125e7fdc"; + sha256 = "2c553fa94b85f507201ca1464ebb2f9093244b73c982416b3166a878d7e7f6c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/pt-PT/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/pt-PT/firefox-138.0.4.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c3b5e37aea4611a6ae865a23c7f7456391cd36b5ca54844ab1fad55c1a49ffaf"; + sha256 = "ddffcb37d0d6c2edb894011a77e1f84fadc07c3ab7e3ed4a5a869884ff67c3d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/rm/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/rm/firefox-138.0.4.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "0286f8f70c8b5b1d548edc3dbdce7bcc2020070bae9b97bdc4b56c7800fc3472"; + sha256 = "02cf7a8d47ff3d4b60198e4827bfbc93d35c7271a11bbc48d1f7384aadce51a3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ro/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ro/firefox-138.0.4.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "2456957184ce0d561ff120ffc607cb5628ef471c827e4acf9a35e769487e1f5e"; + sha256 = "4381396f00da6c4f4455d10d83809721320e1562c7642305ed31aaa876eb5a47"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ru/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ru/firefox-138.0.4.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "64bc4ea5d0ca753637ef1ef84eae96f2b1a3658ffdfeac9dc72ed375599c15e3"; + sha256 = "3e4b3fd1bccc7700626e02c3d1837848dbf1ebfa27a40f4c0ae6c67078911958"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/sat/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sat/firefox-138.0.4.tar.xz"; locale = "sat"; arch = "linux-i686"; - sha256 = "1caef06c82c7234c98eb9fb23b3d3a0315e203d37704b536bf50fff31eb2a8df"; + sha256 = "8761d5cec27747ea0ed8c99c21702a847dd4eb86d88c6a9faad3b5e3942543e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/sc/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sc/firefox-138.0.4.tar.xz"; locale = "sc"; arch = "linux-i686"; - sha256 = "c314cbfbdca55e4502fec55fec137cf508119bcb4561d56ccfa3594f3b8f7349"; + sha256 = "75f5f760be1a943b6e6d9bc9ff63148d4e364b6bd50c7ed7202d825536873d4b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/sco/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sco/firefox-138.0.4.tar.xz"; locale = "sco"; arch = "linux-i686"; - sha256 = "baf1e0d6dc19dfdaec588ea6c6abfee241bd9426d8898e3cf170a51098f6c176"; + sha256 = "ad880343a9847d6e2f5ed7ed575812b075ee7e6979533bd386db0b680721c565"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/si/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/si/firefox-138.0.4.tar.xz"; locale = "si"; arch = "linux-i686"; - sha256 = "45b14491df2581fbae7019a98c0fc43b960dc638fb3095665d3f94cad689a7c1"; + sha256 = "212b68913e2311ec1012c27b28716cf51bae2f677883a1a9ce8b1c4fd0eb181c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/sk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sk/firefox-138.0.4.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "fe526846a1a6865e46b193e23cba248e3c3dd3882a4589af82ecf502f2cb9374"; + sha256 = "3013f3fb358103a8dc434064af8042b9c1e2aa0055f63d2047953b21828c13b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/skr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/skr/firefox-138.0.4.tar.xz"; locale = "skr"; arch = "linux-i686"; - sha256 = "40a022444eae8335fb649560d014ec75da0c213c0c42e3b14162d979b816a0fa"; + sha256 = "168a2a2bbb60b4d45af2422f077725941ca4faee077a4f1887ae955450d9c411"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/sl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sl/firefox-138.0.4.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "a87f29dcb86adadce6f5ad98b80453c84d251b729bb372121e865ac938c8c8df"; + sha256 = "fa40a7ada98c400fce7b7b1912a891bc62e7dd5612d9b5832d4497be0b7f30a0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/son/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/son/firefox-138.0.4.tar.xz"; locale = "son"; arch = "linux-i686"; - sha256 = "cb861f6832fe55cebfb832a3b3a66b42472ad298fdb9467736fe4eb34bb51938"; + sha256 = "4bb9b1d05796294bc5723e9f16b8f310803211de0ed5a3d20ee4611cdaaa2cce"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/sq/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sq/firefox-138.0.4.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "2cc63dd00b3be9c5e230ccb7e85656e479898abca29d6fbace8663b44da19d17"; + sha256 = "4ae8d8cb80a8ee95112c493d2a155c0fc58c43edd3317cf8cf2524c07ec4a521"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/sr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sr/firefox-138.0.4.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "2a77c6d8f8a8d3e88102606154a6b03fdfb100ee442bec7ebab7d26597769876"; + sha256 = "7a47f4872301fe2e2e63f66dbd65c347862bc6bcbbd8b073a0951dee4a744a15"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/sv-SE/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/sv-SE/firefox-138.0.4.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f75c5615f30da8278ee483e37eb627170647524d5490aa118c17ceb9f208fbaf"; + sha256 = "9952e86cd726904ab1e934ca8bddb639619c7941f03a731453906a995bb1ce1a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/szl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/szl/firefox-138.0.4.tar.xz"; locale = "szl"; arch = "linux-i686"; - sha256 = "5144f360059db58c5078d381931187d8b470b582725d9614c3674ad01065664b"; + sha256 = "5f09d2b854c2aed96cdcd0ba22ecaf7c11df84030daba04a92242640b92b14a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ta/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ta/firefox-138.0.4.tar.xz"; locale = "ta"; arch = "linux-i686"; - sha256 = "816bcf60dcce96d6c2dc953d1f980fc08214aee6447516b310cb888dbb47a64b"; + sha256 = "326bffa86932b908054324020814d2a79451cf8051711d6f6160eca4757c4459"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/te/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/te/firefox-138.0.4.tar.xz"; locale = "te"; arch = "linux-i686"; - sha256 = "73b0a1b639a6251ed0fbf15794b463bcb2bfcfc23e84f0ad3fc527dfa15bb8ff"; + sha256 = "ecbbdc8b49018802e4a4248b867e6ffee723432d693933db17f62221b75c8a35"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/tg/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/tg/firefox-138.0.4.tar.xz"; locale = "tg"; arch = "linux-i686"; - sha256 = "dddfc71f7e88ad13a643a1437ca13dc2fc0e4fbd926c406c17928e1d7469a553"; + sha256 = "5d93f9edd8668f1580b526e432806ec51581438f2001fc5778b6daf532ba23ab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/th/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/th/firefox-138.0.4.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "e1de41e635c8bc254f0eefb4cb4eb174cdda30cf7723a24809083528080263a5"; + sha256 = "3237d2946036174cde63d4344577dabfe36768f1f005d4758607ca8ab6654a0c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/tl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/tl/firefox-138.0.4.tar.xz"; locale = "tl"; arch = "linux-i686"; - sha256 = "45619b46046e2dae25a0722d8ea25981ef22c201be398ecdf018137f1e95cce8"; + sha256 = "ef810bb5828e21bba6822c0d563c70c62c36a167b71ebfd450c92ed673987610"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/tr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/tr/firefox-138.0.4.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "44637c50df16edf90cd7c9a3eaa08674b74f85e1ce2a9a16b149bb4f27831388"; + sha256 = "ac26b876e63990c71d1e1a96819b5733579d407c4deb50ac0efc502a531b36e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/trs/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/trs/firefox-138.0.4.tar.xz"; locale = "trs"; arch = "linux-i686"; - sha256 = "7e77f9102e09c11263c3ebc23829fb4f8cfbee6b01b43ce7634e358b3c344f26"; + sha256 = "42043be9e61e24817e9bcbc727939310d7db06735db976fd277b3669977c8a5f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/uk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/uk/firefox-138.0.4.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "1c0d300cda3a115efb84579bf24473046e541aa6495ead7d1d1a51ecef66928b"; + sha256 = "6c75f5613d266e7ac2ffd832db99749d84c20df3001adfcf0f825b14ee7df9c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/ur/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/ur/firefox-138.0.4.tar.xz"; locale = "ur"; arch = "linux-i686"; - sha256 = "d3baa35a6f1f54339b38b7ddfde87b19c5dfda89fc8c43d4a8954eefe557e010"; + sha256 = "0c6e8025ea003bfab16850fcc7efa398822bf368d3bba54e442a0d815a1dfff0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/uz/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/uz/firefox-138.0.4.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "391cf8e774730c6b40ca054e83238fc937cedc7c68b568dc167e32ce36051acc"; + sha256 = "34e66785d199e1a94a0c8a4c4f1339dfc55bcb0be05c56091cdae8dbd56beb7f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/vi/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/vi/firefox-138.0.4.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "012a803913d6217dc62a4fa760870fdb73e8be2c719882a3061a9e6e8d36c2cd"; + sha256 = "721a88a3dafc272e2a730e4e9b811af7de54e088e724c1b5c7ef0f3e6cb257fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/xh/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/xh/firefox-138.0.4.tar.xz"; locale = "xh"; arch = "linux-i686"; - sha256 = "0b7994f0f1f748ba034bb0524456b031998b3b668e38de2b92667b7b8e8f367a"; + sha256 = "3ddca5e0f0128433daefd3572dcf776e723e7bb2c81d97191ad6c33a5e9f6b9e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/zh-CN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/zh-CN/firefox-138.0.4.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "715efa6bf55315d95290570953e3031b5e1687fa3662b2471f6de6cb5b96824d"; + sha256 = "c21f102a63d80af9f6fee9b3a182dbc55b156a1438e2981ef81f076f1237adb9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-i686/zh-TW/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-i686/zh-TW/firefox-138.0.4.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "25e7d30b8f20fa75693552fc551021263f16825155adc35fc6963346f3bdeef5"; + sha256 = "a58dc610118c03fdb0d1ecc372f3cf8be538cb225c0268ee33454e42f1f9c570"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ach/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ach/firefox-138.0.4.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "6b947dbf651c6e5921a1cee417be9c7088f565074a5174383cfcb99cde6e3468"; + sha256 = "e7800054ce0aab6fe0963cb1487ebe4fbf68e22c87e2cce5ffd92797156d81f2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/af/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/af/firefox-138.0.4.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "ef6a8a11b19d68ea044aad6aeb4db55453341a3ad31abe6aa9241ac93b576561"; + sha256 = "bca03a4e4ae4631b474137319bf42b8182512efa6adad891de449cb7170f6c24"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/an/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/an/firefox-138.0.4.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "ae3e9f3d776a3b54acceb8728fe24fd9f98370f1faa328f034c00208df2b8040"; + sha256 = "7d70b461f98c404207ff1e9a70761975202ff5e4898f40793e0db5b33b91eb54"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ar/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ar/firefox-138.0.4.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "cb40400426ae1a45b0454183bac9f4148bc395099aed986df2a61d1dabf27ab3"; + sha256 = "3496b952dcf8957b11da512d2c030fd5e64bc3dd8ce106cc4dfa65f4f06bc1f9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ast/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ast/firefox-138.0.4.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "2ed5923c4ee656a70684690e39c7bb7da72b35f32420e840fbcccf255831dc9f"; + sha256 = "a966ed39a1bc79b8a2b8078dd9619c7b152319844f0882e493a1e9a209bb28b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/az/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/az/firefox-138.0.4.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "aa8a8101e595ee421852a9562476266db3910309f30cd035b438ff2977594642"; + sha256 = "024007bc7479294f0b8f971502f1845f72b38cb310c37946b3e2da9d95abea59"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/be/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/be/firefox-138.0.4.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "b2c7cae9b3b3b81dc3524c3f02e2611c1f9fe1f1db7eaefc0a39a88ef89ee3f6"; + sha256 = "073c76a06185f3d3e9a6138132b03997b9b7acf6a00c7e3134a1fb72b3e89a52"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/bg/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/bg/firefox-138.0.4.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "b63d75b928d1200f529442265adc8ff3dc55d1f0dea8cb7615c307e70f085556"; + sha256 = "061e7f3a2fade4016fd0dd5ab5af4c4620be75be22c935dd4669240a9091d510"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/bn/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/bn/firefox-138.0.4.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "8198dae46ec689ab5e7c023bb8c79464d447ee905e5a458c105ee8170bd0aed8"; + sha256 = "0de9ff6278f19ec15d438659eb35473a7dab7500fc7e5f0f183ffeac9e1dc21c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/br/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/br/firefox-138.0.4.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "ae3f4e7d2f26f2687b8e7a7565cdd584d4b678664868ee30f34f333b10e08c3a"; + sha256 = "07fc489b1ef7cc85d863a3d6ee844b363d17a618abd86fa6d7631d5afc351185"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/bs/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/bs/firefox-138.0.4.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "f47b1b9eb98b252f27c4e696114e4112b13061ad32793f0cf227aa8d0aa89cc6"; + sha256 = "bc4fe22d0fe0630fe666fc4acad616e1345be17f57044259f4f7e5430ac45943"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ca-valencia/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ca-valencia/firefox-138.0.4.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "1086370dd142b30d26a36ed11ea607a7f1a65a78eed943f8f90e4c96167235f2"; + sha256 = "88901e2aa2ce2fb17f25519c59c70968e8a0f1c5fe8fd76a9d82b0d21c8a7ae3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ca/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ca/firefox-138.0.4.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "3b2ef73d8982dcd3d18bf7c4d1cc6bf35139a76aa7a9e3b22fe13a67f6799c24"; + sha256 = "32ebc6c10aacd9978c4d6bb1cb885367c460cae7b78a7b6d47abbb002486f7da"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/cak/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/cak/firefox-138.0.4.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "89e7cddb826ff9fe4b59543bb3a9b07e68b1ce86be44b0ba339242a8490cafaa"; + sha256 = "2299aa3d0a432f624293009a0bd246ab366ee054ce7feb4c13c5d0db136f4def"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/cs/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/cs/firefox-138.0.4.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "5e0bb791839ebb15c7abfe04630c6f718b80c5833d507d240b5a6e14e77ababc"; + sha256 = "b6fafa10d291597a0cb438db3acad82c6ce6c08e5f509f1e4219a8bfba465d08"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/cy/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/cy/firefox-138.0.4.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "ad58d314d589fba55bdf4f51d9f506ddba4146b68dec9027fd6b552e7417eefa"; + sha256 = "7fca55c9fdfb3f4e0009abf66bf94dc3463cf8ddf610c630acfd8b42537e6762"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/da/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/da/firefox-138.0.4.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "98edb94830af9510bbac55fbeb2ed9401ec26dd4aedff808bd2a5a7d576cd6c0"; + sha256 = "c715bec710edd77a9b920b4dc1e258afceee2791686fd33e0084ed98c731e819"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/de/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/de/firefox-138.0.4.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "110a80baa58825b68f665f28e6276546b09cd996a892af2081d49aa6bd9431c2"; + sha256 = "de92ec72d7d0a3740c6f8fbfac506b4b4ef07852282148e216da8cdd8c25f42f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/dsb/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/dsb/firefox-138.0.4.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "c12c6af2533f48e6fd4c1445c1a76f3a6f889a6a85eac5d57086c907fb882fb6"; + sha256 = "7918fffd4fd176caa159351a4b69e525cb814beeaed470cbedd342c49f27a234"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/el/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/el/firefox-138.0.4.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "d5f5c86c22fc8250bbe606953144e08366a61a203b0deaf723f96a316fceb535"; + sha256 = "bf16dd99da6347af35c37a1867ab519f81a4559a594fc5758b850d769dd4ba68"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/en-CA/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/en-CA/firefox-138.0.4.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "177efda5544025b46f4b4c7425da74214ca2f009eb042178359ba6a17abac4b6"; + sha256 = "45f8b0c7260cefde9fe3a872fa847c702e2962afba71264b4aed24205dfb7ac3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/en-GB/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/en-GB/firefox-138.0.4.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "71faee72a90fc93b2d1443aeeccaf796d82ee2f97f2ff5776d68f585a8d22355"; + sha256 = "8da28e689b5a955804226fa65214a81d6e293df6fbedc24cc76f368d88cad106"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/en-US/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/en-US/firefox-138.0.4.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "132bc5ae758b1220980de9c7bded74bff53dd70e24e8f3085d9b3ff45d25b71a"; + sha256 = "6e078b2b61965b8b5525ae0da3216f7fc6a0460d4e0870e09addcb5a93a60a90"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/eo/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/eo/firefox-138.0.4.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "422b485eacab5e651a43bfc1e654d85f312b751476f8c48a84b0250ce27639e3"; + sha256 = "412040a9acdf879d6ba2d3fe158729e0b4ddf1309467ace033de526d06dc5259"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/es-AR/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/es-AR/firefox-138.0.4.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "ce311a1dd8e09e301a2b684237d904f641d488f3b573ddf7bc4f0d11b8025a2c"; + sha256 = "e1eb49ce025cd47742561930fbf83408a1afb1a163fc2f7af66a52c10715580a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/es-CL/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/es-CL/firefox-138.0.4.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "acd76f1387c2263f42aa16549d427be0d5c5f935c1029fe212707af9ca839965"; + sha256 = "413e7b2aff3a1aa43bfda19cde71b54251ce45269f73f01ce8b04311d7ca94f9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/es-ES/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/es-ES/firefox-138.0.4.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "b0748e580bca391bded2cdfbc7b93e9447605a373a051880906f0eb6314f289c"; + sha256 = "8935573908089eaea694d5287cab5540f580146ca135cf38b6ca61a8981da0f2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/es-MX/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/es-MX/firefox-138.0.4.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "fdf35f7edd3ab6d1da5b16e8ae195487b31adf262c0858d03fa61a58d21c0322"; + sha256 = "bbe96b11b84988efa968ec436a95057d6ce66b14b120a2d7e6ad7b91a841c5c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/et/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/et/firefox-138.0.4.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "5960537d6c9dc9c511a99d0bbead5cea0fc2f695b73fe4bf0f0b686c1cba2d3b"; + sha256 = "82f655438383306a152fdde0c11c479983d4f9a14f34c84b1ea9520e9054e14c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/eu/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/eu/firefox-138.0.4.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "151dffac6636b847cc54fbeafbb2821f07474f179d31f21813e430b48df1ad42"; + sha256 = "be0ed3f8e057e61e073d2be63dfb28b9fb2d0472233d0f464c28979c3a3a2084"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/fa/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/fa/firefox-138.0.4.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "5e77befa79f24adfca9c3aba1362ff154abdb6583533f945bd322d790276fc0a"; + sha256 = "ba19e14955b72223f4180e2af4df52388ed5bbc4eb231ced0fe973cdbac86005"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ff/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ff/firefox-138.0.4.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "848aa048308904c2f9ed4aa35e7448a80e88285eae7142d8822eed8188b5cd29"; + sha256 = "ae59688241a44042d7dc99333d988ead81416dabbca130d6ce842afe7464e341"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/fi/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/fi/firefox-138.0.4.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "38b0399bfdcaaa0461098430884318daec2666729d1cfee30f46c450204757e2"; + sha256 = "81aa6a6ed063d4a4e90355e884b15be92a1ce2a75dd6561b4036efc796ee3cae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/fr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/fr/firefox-138.0.4.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "32bae3279ed670f083b0db70ea2649b875e8a9030520ece59caaf5550fb7980a"; + sha256 = "34d2cb4fb7a49c693c185e59627b3e73cd26be854145bc251aca397b515da954"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/fur/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/fur/firefox-138.0.4.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "ee2f9041dcd78ab2c22e1edee619c4592007a83d4c48aea5ae46fd03931272f3"; + sha256 = "ea1f8c4885b634821bb6d34c5804149170414c8802a664b7398df46ade9a9bf0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/fy-NL/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/fy-NL/firefox-138.0.4.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "e1c6579a141f3304fb6ddfd8acb0e9117579b4a1dbf9986497c383c9a601098d"; + sha256 = "3bb5474d6e0308ac0851e0258cf973646e7df83d1b399817f05850ddebc49eab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ga-IE/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ga-IE/firefox-138.0.4.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "252f533ed9ee44143000abbbb96341c9b1ef273726725ee6f5a0b37564020e80"; + sha256 = "48565934c5f274d91c3c7d01188dee0c4b7db04bb5c5aaa7b19d6098f8017511"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/gd/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/gd/firefox-138.0.4.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "eaf77ea432a97e3d54ce34e48e2b778cda144308ff66f6406456f36c05b14460"; + sha256 = "9027a7addc56ef8937a1a79cc3b1d76ae8c349ec5fccb6423244b727bda1926f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/gl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/gl/firefox-138.0.4.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "5ecd9220dc26aaa4403a25935dd2276572940732cbf876eefaf256962fa49863"; + sha256 = "374162c5b2daef4eac897ef541c4a35029388927c9a1c08556896271a455e52d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/gn/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/gn/firefox-138.0.4.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "9b1770fbc517f9a6dde027931b165cd65d44f55da0e43b703ccb2e0992da19f3"; + sha256 = "ed2a6c221d9bfed5eb99ac61b0eac02fadb69ee8c66a429b60f4dce6f9b33b33"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/gu-IN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/gu-IN/firefox-138.0.4.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "4244d982d7296ad87c40e3bf12ab1c67b8b147799eee79c6f176943b2a9860d0"; + sha256 = "02513fefcc276ea98a598a2c788f0cf501fc9a4878bcf8f3f71801c3975c0863"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/he/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/he/firefox-138.0.4.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "ba63dd76f4880c362706e30df8c062ab069f08226a4fb08f9a169b0240b89eaf"; + sha256 = "82862c9d5f420a34ccbe74fe5904348b205327e924865a6b6b59ebbbedf41a90"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/hi-IN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/hi-IN/firefox-138.0.4.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "2d75c3a76e036f70e087018f6db41bbd3a0d7c1c61a0be341d2f355c23f6cae6"; + sha256 = "59b1bde64273879724fa980fcb235649a0cbfc491984200bb6bc585811d70132"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/hr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/hr/firefox-138.0.4.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "e3ca2cb7d375ea3fcc92698d277ec06adee5f19fb8868553fc15e5fd5aa658d8"; + sha256 = "80f4101e96ba9677a0018e1d153a95608a2b508cdd3cb2f044dfa86252d9be06"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/hsb/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/hsb/firefox-138.0.4.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "8b8f56729478336d1716a8a2545ccae67410fb53a593418ae5d0559149da0d5f"; + sha256 = "b766e3e1a435359af2ecbd5e5afb6daef94e624210b68c4a34320687e1c63897"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/hu/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/hu/firefox-138.0.4.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "4eb68842811e702ee2404b223c2c295d51732bd3d6f3268f0449284d3edb01e2"; + sha256 = "9f974d5a025881cfa74b19ed97a2bf4507925450eeb99f3dd1061288fd86d492"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/hy-AM/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/hy-AM/firefox-138.0.4.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "835823dfa45dea7c0059af4a53dc98bdf5e7cf81620524f70514095f6c3b4041"; + sha256 = "1e6a40a2ab8ab7cde9ebb31a9b4552b1f4c38e3b3dc1d97d591565b5d2816969"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ia/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ia/firefox-138.0.4.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "525e37a3743f10af9b73ce2b00a2306db52740b630184e2de8f92d6aa9a7ad47"; + sha256 = "6816fcf9105516ba115f70882152bdae6ac0c3083d84551d4973e28cc38538f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/id/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/id/firefox-138.0.4.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "f393b95e58f94392b45a8ad7798b2a9f54f096504bd4d454a0097bba39f3593a"; + sha256 = "507d3be3b06ce9d22d62d565983fc53475883ae4b0ed6ed1fa3c4b2afaa8b9ec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/is/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/is/firefox-138.0.4.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "b3c217f12b5add6d918218e802b11b311e776295ca3e7f2d053775805b43b8ee"; + sha256 = "c1f58fef708ad94faba30dabc8a3f14ea9d60af7927a2e029c15bb1027b453a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/it/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/it/firefox-138.0.4.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "4fe01510cdf51ccec52025f214244f596530f0f69aa3bfd12802e0768e9dcb8d"; + sha256 = "b80c16b2e23dc208b4465b244b046f885ddcf8a2876d47232c256401c27d8805"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ja/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ja/firefox-138.0.4.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "b1853ea17656bef19c7b741b28006278db51075acf88d16ff190cd936a2ccb98"; + sha256 = "646444dd4c28c81cbe19796e2f13724a41cc57ee3af1ff65f26defac94f9fe40"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ka/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ka/firefox-138.0.4.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "5abf629bd4e2d543aff42ce0ac55955461577fcae8eda6ec2723bf8823cea06a"; + sha256 = "5cbc44241330de896255614e7bdc2fc49287f5580611b5640d7763caa111889d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/kab/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/kab/firefox-138.0.4.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "cc189aee07f6ef2aed6997b63377a8d12311a5530ddaa2d4ff35a0fe0d8901b8"; + sha256 = "75d33229198c12a7aa7c390f74ef534a62c8eacf8b176cf6bbfb213b9fd253c7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/kk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/kk/firefox-138.0.4.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "3d07e8025d95123b6f3f17c2ddd35685c04c4103ac171c77a6a1d6d120be0584"; + sha256 = "a623bb9c429f531e9d00f74cb5f8936522104b43c3d31c4a6b9c1d8c60070105"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/km/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/km/firefox-138.0.4.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "3bfd7bc31285b8404f08315c569b91929726a336ebfa6cbb7b6a66113f153d48"; + sha256 = "10f4d8b97803f6d9d32d44873decbd9e994ea3ead6ff3a66a80af47e0a595f92"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/kn/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/kn/firefox-138.0.4.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "c1314b08a4839e2c5f04ad925b3f7894181032c63526e2b4bf3b24c8fd5a3e63"; + sha256 = "54dfee8ce36b2bb5841750730369f9bf15b4e784cb080c232f9d3461ecd5d42a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ko/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ko/firefox-138.0.4.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "3b3dd076835876619f7c969fa916475025e0f06492df23b4d133a0a4046b7c4b"; + sha256 = "8ef3d1cf0781b0a016750060fc3692439b6ad0d71260adf2cd4a4d83b659eb62"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/lij/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/lij/firefox-138.0.4.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "dc024a358c290216a5de4fe6d5aa49a8d08cbebe2aacbfbbe1d9c786ea17ee53"; + sha256 = "d820aa2fee3c0dfa3b2e927df6a807338a6ad28bb565189bf96564d5e9c464eb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/lt/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/lt/firefox-138.0.4.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "94f2d85fa93ec37a0a941f7251ee1a030c90598db4425497f1eea3f8b4fffc9e"; + sha256 = "3f86f10e0e212d78c015c082d0d80ba836b0bcb6107b9b42d2df22cdaecc9c56"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/lv/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/lv/firefox-138.0.4.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "82a9a0204e83f38a04f561ce0e98cf905f27f07cde2c3f990d73457c7aa115fb"; + sha256 = "62d046ebb70ed46d173327d16f984aedc672c6cf561c73d92ae9dab40c64c20f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/mk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/mk/firefox-138.0.4.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "1b5d47a9bf3f5043ad2d92befecfa36b3bb37b46e8c01f4c0b815925059703f7"; + sha256 = "d4f8a525c8f24e38558253d954b3c81e08d189e6e80d925334aba7387e1d2573"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/mr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/mr/firefox-138.0.4.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "620adb696da078e1eeb35f45f5f3196f46a6f62da67577a69718a8b68d2edde9"; + sha256 = "fbe4d8d6189044458c9901080343d8e40334cd1b633a6b4087c60d064ecec34d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ms/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ms/firefox-138.0.4.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "84a204c97e94793b8e5c4f11a6230928596560576b39278173a689e7fff8357a"; + sha256 = "bc811fb3e907ea2aaef4e229312b2b8b3190ed3ed136641adb5f445a57f64f8f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/my/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/my/firefox-138.0.4.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "fd864f5f862b3ce606cdfdd5c2fcb8a18686fd2fe0a7e2ec7fc8af4e60102ced"; + sha256 = "f482b811c216f2b2c653976445ede9a8e5125da802354d93ded5d67ba412fdca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/nb-NO/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/nb-NO/firefox-138.0.4.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "7e9d95cfa902063f0e376b7401e066be8434fbcae406d4db5333bcb3e1c5a1cc"; + sha256 = "f37e5af711466a1c282703341fb8f61bb4f1a14ecb42cfb80b64b28a9068e051"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ne-NP/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ne-NP/firefox-138.0.4.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "d267475a7a09651bdae98d9047ab84b5dafa06de56a2c428bdfc831712a7c510"; + sha256 = "bf0ae7c8a4f8248e08e0631086d0fc7dc432beed375398ece06daa7d253a6a01"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/nl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/nl/firefox-138.0.4.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "b31a45cca960edebad951e63c8fe8308e6a397c310a74a3bc8f69ce4b549e10e"; + sha256 = "a1513e2ff3d804ba98ba23f2c1763c2f1153f5d1971faa7f5de51081e4760741"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/nn-NO/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/nn-NO/firefox-138.0.4.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "e1e39ccf4ad39513851bc31bfe4f86fff7b43be99981c0ef33538a80c94cb1cf"; + sha256 = "b95717b63871fa8989e870b8a679d139b2bddbad846df29a1ff9de72ee83b250"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/oc/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/oc/firefox-138.0.4.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "0c79ac65987fca10da54b9396df8d00380da65b043fb41c30ded9d6c2cfef994"; + sha256 = "fd5bf5d5a6c354ea561321c815dbb878ea77bd3472905df04fee28ee5f5da40f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/pa-IN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/pa-IN/firefox-138.0.4.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "ac96622f8d943638ba42eb907d8a7f190c17fe1ab2ea7e97da513664b4f8e257"; + sha256 = "60c60e90b7775e062b519eb83bf7102426442ec3dbbc0bc1ae173615fe6ac097"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/pl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/pl/firefox-138.0.4.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "77a4f188444bb3d389b84902d8b2b49ac3bce8e3e9cb80e210eefac865d0a776"; + sha256 = "4dd7dfe2ba9443e6a00f7c84c35e909770e4702bb6f0d7ce04441770a703166d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/pt-BR/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/pt-BR/firefox-138.0.4.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "2ed7b4ecbc8bf10ecd6dbfe059366097863401a5985b4da8139114bfb885a370"; + sha256 = "3bcfa4433ffbeeb006d62e4f5e9369804bb29cc1d1c148cf5567a4d4e0b55841"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/pt-PT/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/pt-PT/firefox-138.0.4.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "38d1c6b6ab5795897167c35a8aa80cdb575c94a7c1bb9acfafe2d90aa02df9ee"; + sha256 = "65198fdcd506cdce1ebebc62aed478963c6a76fcffc4192bdb8ff9ebb76cec09"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/rm/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/rm/firefox-138.0.4.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "a066df0510ace1abeadeeaa18480d352448330e0ebc96dbad5edb72de264ff98"; + sha256 = "62ba3142235cb406f7f578e4965a474f3d444571b7be68fd2df83ac12c02051a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ro/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ro/firefox-138.0.4.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "9edf9e7d48143e385a3325269d5263321480550eb60a6fa75e2e1bfea4860bd2"; + sha256 = "dbd17c28ffc6a25fb19f949d42cd53f03821ad33d2c5d84a03951fd67247cf14"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ru/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ru/firefox-138.0.4.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "00b513d4970a448eac58af68734e4d37c7484f947efa0cc71dac2add0bcbef8f"; + sha256 = "5db4f48b841b99398d7b5a047c4a0a6554294beede94cc72e34b65ff064f809a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/sat/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sat/firefox-138.0.4.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "123a3e6ac054374d467a9423ca4fbe4e824a28e0f0980d83103780f31e6a9af5"; + sha256 = "e7ae475b021caf8089d2d3515bdfc09aa7585f3f4b979f12642e10470e5503b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/sc/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sc/firefox-138.0.4.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "61a2d8e653b67397dbf4620257ee887af2f4b9fe0f64e42d25bd029e3414ac55"; + sha256 = "00da6275dfa4fb2f72d863c78ccf79db0a57517ce89d722a8e8f1fc8df36febc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/sco/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sco/firefox-138.0.4.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "88bb1e464a41e4ea5e521a9c7378484380a039af018966b97cddb3737124c54b"; + sha256 = "5f9d55ccc869dbaf8c95b2fc7f3626899772d8449cdfd43745d884e629b80212"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/si/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/si/firefox-138.0.4.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "96b13f1da1dfbc2417b97c4e4a73075ea24c1aa8da91cdaa89d152e8df18c9f5"; + sha256 = "1c1ade479ca81755af6111d1f2b3a80d512e765b474d2b6bb1c600b8ea04be6f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/sk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sk/firefox-138.0.4.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "ecc17d4a6b7dc6dbef78b670032c6dbc1adfa172c94b039816d918db7c1ec6b5"; + sha256 = "80853a3259dbe712369833ff0855f38d80e3c26a37d7141220457fea783cb22a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/skr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/skr/firefox-138.0.4.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "b3b8992a2c6a81ebc32585e5bd22a4cf77ef58e35bb89c4ae2b13a92c89a3044"; + sha256 = "50db394442325c6f81e59fe7ab12c802dea74422f3ff83cb9f5c16151a3e1fec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/sl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sl/firefox-138.0.4.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "94767ee08c6a26df42a05fe324ce07892644fa57d517af1ed1a250d7518704a5"; + sha256 = "ec8e374d1966bb4d9d4e6494c021628ee0480ae67cfa5aa9fed627acb75794e0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/son/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/son/firefox-138.0.4.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "d4399da817877894b8331d00ce74d717354592ee3d8a42d05bde60f5457b2752"; + sha256 = "be76829cd68c41a4596890931041c29456672c12332b6e632efc1ee569195792"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/sq/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sq/firefox-138.0.4.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "86250e00e83acc9c7a105252dc94908f6b07bf4bf66d5912dd66ce866fe45272"; + sha256 = "d0879f857e49c55f706263ec6e9404dbae33de3f75ffa85f639bad82ce27b5a5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/sr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sr/firefox-138.0.4.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "6ada37f13a5261ee3764e905fe2c5873a6fd748dd73a8175766ecd6d8de5f56d"; + sha256 = "7d56046b0f581531ec3069f60b76fe18ba449699e35f8fed8da46a0f771139d5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/sv-SE/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/sv-SE/firefox-138.0.4.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "a54c96c08c063c6925d53af471e08e660aeb3037cd21056e0c9082a60e6224eb"; + sha256 = "fb84d18e0bdd0ded9333f1341c7f9f61cef941f633a12bdc4f0b6d00232b2004"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/szl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/szl/firefox-138.0.4.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "b5d026cd4d03252dbbcf6ea3a8d482b6b430ec69cc3c63bd5a759f13c7cd99ce"; + sha256 = "cbe04b1d56bf8110ae66e14737b5858b4be28908cfccee775dbe3c90f9f7681f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ta/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ta/firefox-138.0.4.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "b8eda9d00a9490e1d721587def00bcf98bf38332263cab6462bb602ec08f69fa"; + sha256 = "1d422d42c8583aa59d39969bf6ae46bc67fb278c5089f2c33a5a06021f23be18"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/te/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/te/firefox-138.0.4.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "e0019ca4a13fa4e159227ae0f1c3f65708f16a15395e8aa9250297b470464308"; + sha256 = "b38747300f986e5883376fe04392adfb4abea4bc727f4099c171d37d5d82b262"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/tg/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/tg/firefox-138.0.4.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "8f334c5488d15e60769186a633c20446f0aee79e899a3f6438ddab8974917847"; + sha256 = "9c10bb44c65ea59078e619f0d4ef13c70b434aced9339ce245a4af1d3600db26"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/th/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/th/firefox-138.0.4.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "221429af53cb40565b18987e2829f878423cae1916d3c20906a93283efe82daf"; + sha256 = "173ca4156591bd9c931e7fed09ee7d58594732eebae07caaf702a4cbfc4c3687"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/tl/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/tl/firefox-138.0.4.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "d5301cd185ecb01d58929f22b1689b0e5178de1128fa4aa725c1c047793a4d6c"; + sha256 = "04930b05b36942c0fa90d276eb95adc4f45712055f256e36b6cb690b9d456cd5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/tr/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/tr/firefox-138.0.4.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "7598b1550b3f2f830ad7ba92f4763cd86221ba4184df70f54c103d4284f355c1"; + sha256 = "8a15df5f7c66afca6b21d414f0fd08e39b8ac9bf7f7737607a0bde4e65948ee5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/trs/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/trs/firefox-138.0.4.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "b1ae9d7e0f0a2907f5c11abfb1476dcae54775700e363a2121e460ceb2dd5de8"; + sha256 = "b1adf0b5166da1126adfdf3073c41ad236357b36d617082baecfa0a0c3a4626f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/uk/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/uk/firefox-138.0.4.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "52124e9104c1f66be8c0b969179eb2e5aff2fcfaf8d2763a5f69dc2f5634b4c4"; + sha256 = "3129acd8165b32acab6f753e85e8ff24776738f98db4a7a72f5036911204178a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/ur/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/ur/firefox-138.0.4.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "e9d7e61b6bcfccbf0ec6e58850622a259b73f34cf8f200057ab934dd0696d64b"; + sha256 = "63a965fbcc1f371b32daf0eb7e1c8064bad5ecbf93376ad9e7517a5c8b9d72c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/uz/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/uz/firefox-138.0.4.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "0f06c65db42109a4ad5b5f07f4d0af4fa80bb347ad9d4b4ac98f96183590233a"; + sha256 = "61b0a1fd5b4698c9b5a5ddcd86a22f865882ae56eb57f7db373a01bda1952ef6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/vi/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/vi/firefox-138.0.4.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "fd8654d4503ba8e3998caa320cb210f7a3e02bac81d4c79d92afc7f8fbfc998a"; + sha256 = "2432d574e0d5cf8272c545bfaeaf24e2c7ef4edb5b9442b7fe0af88e0f6f6cd9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/xh/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/xh/firefox-138.0.4.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "e46527893f8a520061a2633a90f803faa5644de7d8a3cfc7e172f63dc0ab76df"; + sha256 = "631a41c20c3644ed3b196d75a76cf241a7394d715c14a125eab0bc31fe0901a2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/zh-CN/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/zh-CN/firefox-138.0.4.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "9a60d3be3f663ac3c912fc3c198fd1eabc48dbb382bf73d7dd7b5c8fb137e6cd"; + sha256 = "1ffbb5d6af142590895c0101c89c29da6b9036bed3b410230cd98c855e947628"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0/linux-aarch64/zh-TW/firefox-137.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/linux-aarch64/zh-TW/firefox-138.0.4.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "861bacb6c856d70a8f4a2b92ad1c468d440006791c3f2b55c1d479680d94c20e"; + sha256 = "0fadff63ab9283345cac653b4892340037569a76226a54e1f7bbdf42f072a957"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ach/Firefox%20138.0.4.dmg"; + locale = "ach"; + arch = "mac"; + sha256 = "3ac136a08c6b33b3e693a97933e77c8348fd5db8b36488b2f6602d609cc69cb0"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/af/Firefox%20138.0.4.dmg"; + locale = "af"; + arch = "mac"; + sha256 = "d1672c1830c3d8d33637ff4586cc52bddd638847063360510146366b99c9d470"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/an/Firefox%20138.0.4.dmg"; + locale = "an"; + arch = "mac"; + sha256 = "712bfaeb51f59fd4c69d4e725fa8008d4ea75483b7d1c828ce297d3b53e3d3d2"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ar/Firefox%20138.0.4.dmg"; + locale = "ar"; + arch = "mac"; + sha256 = "77209765a44b93a7a1cf2a535a5c2e73e04e23210ea5fe5d24a3d74104e6b19a"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ast/Firefox%20138.0.4.dmg"; + locale = "ast"; + arch = "mac"; + sha256 = "a275d903df9cd40e1a83c6613004c462ac39974d9b750789e27956702c9948ba"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/az/Firefox%20138.0.4.dmg"; + locale = "az"; + arch = "mac"; + sha256 = "51466148b09bf7055dcea0b8071c0f0499157475a97ffdfcb594d6bae09ef1d0"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/be/Firefox%20138.0.4.dmg"; + locale = "be"; + arch = "mac"; + sha256 = "248e58e209f20af13d872e8b9b7345a325a7b5ade4660cea9562ca78f30b1ef9"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/bg/Firefox%20138.0.4.dmg"; + locale = "bg"; + arch = "mac"; + sha256 = "77f4828962223882f62948869ab54bee4fa645b93ad485d1057a4fc3fea80997"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/bn/Firefox%20138.0.4.dmg"; + locale = "bn"; + arch = "mac"; + sha256 = "d21174441d39618697ec7b83de3d04d6a2df29cb416949417652234c86659b98"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/br/Firefox%20138.0.4.dmg"; + locale = "br"; + arch = "mac"; + sha256 = "9f7cddfd91dc21d66ef6cddd90d84ffe51cf7c52950d9bf9352e5df867e314a2"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/bs/Firefox%20138.0.4.dmg"; + locale = "bs"; + arch = "mac"; + sha256 = "6f6655cd28b1b023e4d28237938fd5c71bb9010374026d645a68f30bef237594"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ca-valencia/Firefox%20138.0.4.dmg"; + locale = "ca-valencia"; + arch = "mac"; + sha256 = "c9f59ecff31ac8e704209db62bc8d1c7863500f09c4643bf0648c738649f2af6"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ca/Firefox%20138.0.4.dmg"; + locale = "ca"; + arch = "mac"; + sha256 = "890f9404bf3a706b6cc814cf5ee24c6b1620882bf901b4f6e4bf01b0894afa47"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/cak/Firefox%20138.0.4.dmg"; + locale = "cak"; + arch = "mac"; + sha256 = "3a36b2c6866fb71b5603b1c9390ea0ec77d557569c86dcc3af8e290b8fe6956e"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/cs/Firefox%20138.0.4.dmg"; + locale = "cs"; + arch = "mac"; + sha256 = "7800f81448c466855025fac3b76f117137aa0992653893964e5d460cfd05e4e6"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/cy/Firefox%20138.0.4.dmg"; + locale = "cy"; + arch = "mac"; + sha256 = "2a451b589fc0f89e4739d17ff671cae547ca8d4fecf3bb9b7313a68e3c4b3b41"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/da/Firefox%20138.0.4.dmg"; + locale = "da"; + arch = "mac"; + sha256 = "f244f0155c3bd4b900962b900443a94baef1df4792ed900cbe4e8266af22b768"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/de/Firefox%20138.0.4.dmg"; + locale = "de"; + arch = "mac"; + sha256 = "55a4651a2ef01c88bb89319ac0b8a532b66ac435f821f206bda1171335858243"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/dsb/Firefox%20138.0.4.dmg"; + locale = "dsb"; + arch = "mac"; + sha256 = "a174edf43ab09f1548478782fe64fa961b0ebdfc6089078220a23740127077d2"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/el/Firefox%20138.0.4.dmg"; + locale = "el"; + arch = "mac"; + sha256 = "9664a7020b5ad197ef7965796512ece13fc839009d6b7115460f43308fa77178"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/en-CA/Firefox%20138.0.4.dmg"; + locale = "en-CA"; + arch = "mac"; + sha256 = "ea78c01cc2bf3a39f597098eb81b2a8c101c384b1be02addb7d7e54218eefd44"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/en-GB/Firefox%20138.0.4.dmg"; + locale = "en-GB"; + arch = "mac"; + sha256 = "5f732b8a0b7ae98612b347ecd5e3dfb31a025b79dfc8a72ee49cebaa09ceebc1"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/en-US/Firefox%20138.0.4.dmg"; + locale = "en-US"; + arch = "mac"; + sha256 = "6842663f38b8b12b08b67239f0cc2118e93fa0b5b57e856c21f384fb501fb430"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/eo/Firefox%20138.0.4.dmg"; + locale = "eo"; + arch = "mac"; + sha256 = "2b8d00b7bf0db729c2d2175e7f80d3f8d672bc801ffe2500166a634a3f7e1083"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/es-AR/Firefox%20138.0.4.dmg"; + locale = "es-AR"; + arch = "mac"; + sha256 = "98ffd41b5ff746df9ac64c6926b3c49b3cfac17a2dc1bd65d5f9141a4a62c9d2"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/es-CL/Firefox%20138.0.4.dmg"; + locale = "es-CL"; + arch = "mac"; + sha256 = "5479fcaaf105665413ed706681a87c7ba0194bae9f2b56a9d8470c5ed479788b"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/es-ES/Firefox%20138.0.4.dmg"; + locale = "es-ES"; + arch = "mac"; + sha256 = "d579e6f2ba06ee6baa118a7d30bd7478112bb15a2221f440ef61463ffabd337e"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/es-MX/Firefox%20138.0.4.dmg"; + locale = "es-MX"; + arch = "mac"; + sha256 = "079211e592d4f881dab4a9c0b8d89a6645347a6e02c23a58f2ec688adc56b766"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/et/Firefox%20138.0.4.dmg"; + locale = "et"; + arch = "mac"; + sha256 = "4bbcd47c07e4295514dda68b93426aab4b9c867bb490ecbeb805484f56dc3643"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/eu/Firefox%20138.0.4.dmg"; + locale = "eu"; + arch = "mac"; + sha256 = "b037b07509886a2c07c6b03b68bf2d6a7471a2c42c5ee4158fa018afbd145ca7"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/fa/Firefox%20138.0.4.dmg"; + locale = "fa"; + arch = "mac"; + sha256 = "8fe8c884d344fe9d5793636f1be2618c155b55a91dacc2108a19433f08c87fe3"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ff/Firefox%20138.0.4.dmg"; + locale = "ff"; + arch = "mac"; + sha256 = "513850aac0a99a6e7d966eb28e07e83d18047122621dddab592dfe90bb61ccd9"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/fi/Firefox%20138.0.4.dmg"; + locale = "fi"; + arch = "mac"; + sha256 = "80b5265d9ff548c19ff213ca8d26cd8764ed2e9eab42481dc0ced21c17f6b78e"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/fr/Firefox%20138.0.4.dmg"; + locale = "fr"; + arch = "mac"; + sha256 = "ead8029cff0572adaddba2472ec2d13bfc4e82c7a96b689337aeb71d162a299e"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/fur/Firefox%20138.0.4.dmg"; + locale = "fur"; + arch = "mac"; + sha256 = "b921ba3ff041e5fe4c17f21438dbd7ee7a9a4e7a508249df3a13f798cc01167b"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/fy-NL/Firefox%20138.0.4.dmg"; + locale = "fy-NL"; + arch = "mac"; + sha256 = "e706bf05ce049b193b7546d585aaeca4136d0773e9e9a9899022278b4b0f9bc8"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ga-IE/Firefox%20138.0.4.dmg"; + locale = "ga-IE"; + arch = "mac"; + sha256 = "f6ea386594e457f4368a18a8c69f05a2a3b5df96b0cc0a688d2563ced9d8fb0d"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/gd/Firefox%20138.0.4.dmg"; + locale = "gd"; + arch = "mac"; + sha256 = "8d4adaf0dedf1506ac1965524ca0a835f737a1a2fd07bf9a3f21fb0ec602e755"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/gl/Firefox%20138.0.4.dmg"; + locale = "gl"; + arch = "mac"; + sha256 = "11e5e063dbd173f0508706d9f0922e7217899615b2dde19e6eac07495fe0e620"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/gn/Firefox%20138.0.4.dmg"; + locale = "gn"; + arch = "mac"; + sha256 = "d44cb013ecff1732cf428805db9b0acc0248b8791cf5c35fefdfffa721cc29f8"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/gu-IN/Firefox%20138.0.4.dmg"; + locale = "gu-IN"; + arch = "mac"; + sha256 = "82932e549f0086e926c76894233efb652f99e7790abaec5e52f4c37d2cbad55a"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/he/Firefox%20138.0.4.dmg"; + locale = "he"; + arch = "mac"; + sha256 = "51c239717885d2d965a5b8112428273f14e7aa78eda39245376a265a932ff125"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/hi-IN/Firefox%20138.0.4.dmg"; + locale = "hi-IN"; + arch = "mac"; + sha256 = "1db6ced3ed13a8fa9aff5edf01797fcbdc0dee7a9be69d98cd41583e4ddd95f0"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/hr/Firefox%20138.0.4.dmg"; + locale = "hr"; + arch = "mac"; + sha256 = "b69b8c140c2ddba2bb0ac6a3690bc2d3c54203944c9000eaabd6f4b912841f60"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/hsb/Firefox%20138.0.4.dmg"; + locale = "hsb"; + arch = "mac"; + sha256 = "5ab9b0b9be7c0555b3e44e51bed022bdc0cb18f0b7017141dabb1daa9dfd6ec6"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/hu/Firefox%20138.0.4.dmg"; + locale = "hu"; + arch = "mac"; + sha256 = "7204e18d32f9ae90272cb9ed5c8112077be90bbd236249ceefc5f551b2fd8696"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/hy-AM/Firefox%20138.0.4.dmg"; + locale = "hy-AM"; + arch = "mac"; + sha256 = "304e5eec4595dca6c32a9cda36a5deed3e338ed7643e78d9f7496f6ddc2e8326"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ia/Firefox%20138.0.4.dmg"; + locale = "ia"; + arch = "mac"; + sha256 = "93c0e7cf689538877240845fff75bba1d1a69957e30bf8dcf131ebf3fd03bce7"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/id/Firefox%20138.0.4.dmg"; + locale = "id"; + arch = "mac"; + sha256 = "d88a4f33294da0f9950e573a6dcfbc2ad40a58246c5d69d24f8cfb0ae83bdf0a"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/is/Firefox%20138.0.4.dmg"; + locale = "is"; + arch = "mac"; + sha256 = "8245bab00dc3d81ae9cb661980eb169694c6799429ea9e849deb6bcdb293547c"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/it/Firefox%20138.0.4.dmg"; + locale = "it"; + arch = "mac"; + sha256 = "9b95138d400aa6708a60505694ef75effe891dcd30f3e88a44c4af70eca8415f"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ja-JP-mac/Firefox%20138.0.4.dmg"; + locale = "ja-JP-mac"; + arch = "mac"; + sha256 = "09da37434dd08332cb08d2738e67cb68724277b9e6f263cb41f18759e84e4d30"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ka/Firefox%20138.0.4.dmg"; + locale = "ka"; + arch = "mac"; + sha256 = "0c22e56604ca5724647a7aa0666337cec48875f6f2fb31cc6947f7904ed79fe6"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/kab/Firefox%20138.0.4.dmg"; + locale = "kab"; + arch = "mac"; + sha256 = "38bac8f6e2e5f0d4c43851d80205db73652ea17c225fd3ca4254cc2b53ac84ad"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/kk/Firefox%20138.0.4.dmg"; + locale = "kk"; + arch = "mac"; + sha256 = "12a4dda4a028a4833e1f7187ab783a3c26ccddfaec700cf5284c83ac18b05bce"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/km/Firefox%20138.0.4.dmg"; + locale = "km"; + arch = "mac"; + sha256 = "39f1e761b5f13ef50e763c7705da904812dafaa92ae1d72a28345f92d8f4e467"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/kn/Firefox%20138.0.4.dmg"; + locale = "kn"; + arch = "mac"; + sha256 = "8ad05e2ea6c80085ad206091a75b9bd722f11ab98e6f3be64cf52dd72f2d57d1"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ko/Firefox%20138.0.4.dmg"; + locale = "ko"; + arch = "mac"; + sha256 = "1657df3c4fcc329f59cf53008b50b391e4df0eee92e31848e3e691f54393bcea"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/lij/Firefox%20138.0.4.dmg"; + locale = "lij"; + arch = "mac"; + sha256 = "6b86fbf8b659134f37b8402170aaf7dcbaf156143366c031784585bc498b5ea1"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/lt/Firefox%20138.0.4.dmg"; + locale = "lt"; + arch = "mac"; + sha256 = "028155ad139df1b9fb5900031781f9ba99142dcb2e27f47b84213089c8b4d434"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/lv/Firefox%20138.0.4.dmg"; + locale = "lv"; + arch = "mac"; + sha256 = "4b3cbe9fafd4cb84480acbba79cee6db9c7344ee3cffda5bb296779052911f41"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/mk/Firefox%20138.0.4.dmg"; + locale = "mk"; + arch = "mac"; + sha256 = "1a61c2c47b59c0191289b847f6106d715c33576c7969a10fb95bffbeb746c487"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/mr/Firefox%20138.0.4.dmg"; + locale = "mr"; + arch = "mac"; + sha256 = "1a7acea842602d83233a302213ea7c2c5fac066847ba5f0afe7c5f50927c50bb"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ms/Firefox%20138.0.4.dmg"; + locale = "ms"; + arch = "mac"; + sha256 = "933cc3aec4d39ead31539c3420a1596973b038c5fefd6fb8070c0e44dbe650d3"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/my/Firefox%20138.0.4.dmg"; + locale = "my"; + arch = "mac"; + sha256 = "83e60548c42201a197e1972e05ac8ff2afa2b022a0960eeb4855a9cedd8984df"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/nb-NO/Firefox%20138.0.4.dmg"; + locale = "nb-NO"; + arch = "mac"; + sha256 = "43d0550b0e87444447734a19239e26841873ff6e2a0d6d77f697950897d45fbb"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ne-NP/Firefox%20138.0.4.dmg"; + locale = "ne-NP"; + arch = "mac"; + sha256 = "c0d6936ae1fabe0e09700328297e7fcf3b55ff4fb774c9ee32a4af7e60099f40"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/nl/Firefox%20138.0.4.dmg"; + locale = "nl"; + arch = "mac"; + sha256 = "6837520e293872fbaf512e9944ac9f516071cc4b6753998a4bc7043324182cd7"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/nn-NO/Firefox%20138.0.4.dmg"; + locale = "nn-NO"; + arch = "mac"; + sha256 = "cfd0abd9ee0826812c06543610e7c5ca2e03c57f9adfc1c104333b993aa1a9a2"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/oc/Firefox%20138.0.4.dmg"; + locale = "oc"; + arch = "mac"; + sha256 = "3cb83720ec60c9a6190121852038513af7ef7ab2670e9b95ef0f9e3301dbbb67"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/pa-IN/Firefox%20138.0.4.dmg"; + locale = "pa-IN"; + arch = "mac"; + sha256 = "7e8a867c6128aa9b729510cdf886a25405db8a0d5afff48f654114e9d85c2c2b"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/pl/Firefox%20138.0.4.dmg"; + locale = "pl"; + arch = "mac"; + sha256 = "8e283532101bc97cb4331919f0ca8e7145d3b0f4d6fb98a5a8c756ddc04e86b9"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/pt-BR/Firefox%20138.0.4.dmg"; + locale = "pt-BR"; + arch = "mac"; + sha256 = "56faedc7770936eb5d20f94f76326a206539eefd15375978326b4322ad759e3a"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/pt-PT/Firefox%20138.0.4.dmg"; + locale = "pt-PT"; + arch = "mac"; + sha256 = "c06c016f3729be765d5b0acf64b4e69db7fee87efb0ed76e9ff363051a7d55d6"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/rm/Firefox%20138.0.4.dmg"; + locale = "rm"; + arch = "mac"; + sha256 = "9e7c6615e78e5f044d1223e4517d66a6e58895e096932f7f0a5668a20cb91089"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ro/Firefox%20138.0.4.dmg"; + locale = "ro"; + arch = "mac"; + sha256 = "4a523f91a76d9c9ca1d52b649e8818ae011c4f23aa1835580f5b1157d5c36070"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ru/Firefox%20138.0.4.dmg"; + locale = "ru"; + arch = "mac"; + sha256 = "b5d8eb92706329e5022c985dba7ab79dff79ef64dfc26be2285d0fdb57ec58fb"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sat/Firefox%20138.0.4.dmg"; + locale = "sat"; + arch = "mac"; + sha256 = "fec418bae73b3e5a276efd003a54ea9735256c4cfcf8f1ce5c763d18f8bb9511"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sc/Firefox%20138.0.4.dmg"; + locale = "sc"; + arch = "mac"; + sha256 = "5736c0efa3115d5b74440b70ab8df22d45d8c78599c409bde09f7a21383fcbf6"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sco/Firefox%20138.0.4.dmg"; + locale = "sco"; + arch = "mac"; + sha256 = "ad72c689c81579ad0cf92debd543e6413ac347b62d3c8cffbf2eee0c63667b6a"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/si/Firefox%20138.0.4.dmg"; + locale = "si"; + arch = "mac"; + sha256 = "ecab64a3bd7b619fefb95ccf4d6ba12b155d907c3b2036eec3188b13bf459b28"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sk/Firefox%20138.0.4.dmg"; + locale = "sk"; + arch = "mac"; + sha256 = "5b0a58392ef50cbefcc94f48945c81b0f5977da493a7fb4b6a7d3e96fa95766d"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/skr/Firefox%20138.0.4.dmg"; + locale = "skr"; + arch = "mac"; + sha256 = "6d6f6ff8a0a81d3f1b4ffbcbc508dcdc4d29c6913fda9e8f7ba3b9911b4e9849"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sl/Firefox%20138.0.4.dmg"; + locale = "sl"; + arch = "mac"; + sha256 = "fef9a3a6e32002b16f2bfa9089740d2118fd0b7321bbec975bc33bbee76127f8"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/son/Firefox%20138.0.4.dmg"; + locale = "son"; + arch = "mac"; + sha256 = "a16daca62f9f187c138cc9512091ca27fbb68341aca333373b1aa4064d1995b2"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sq/Firefox%20138.0.4.dmg"; + locale = "sq"; + arch = "mac"; + sha256 = "7895ca4c7cb7ae469a8177fe3bd7e79935a81a41cb8ba8da27d1d693dc838518"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sr/Firefox%20138.0.4.dmg"; + locale = "sr"; + arch = "mac"; + sha256 = "2d0bcc75c964b73c79eaaf268c90d09ee4973f5297a704c505e5c94652b37e67"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/sv-SE/Firefox%20138.0.4.dmg"; + locale = "sv-SE"; + arch = "mac"; + sha256 = "d7c64f165852fb7b4b441879ab1006be6385e35cb9f5e1584b3a3469c1cafd58"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/szl/Firefox%20138.0.4.dmg"; + locale = "szl"; + arch = "mac"; + sha256 = "585a3cc4df211fc936ce6041e004ab3e801706919a398592c380481c9dd05bae"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ta/Firefox%20138.0.4.dmg"; + locale = "ta"; + arch = "mac"; + sha256 = "4b27162bb2589162bdb26e18db7b4b14165ce64bd5b423280da2efbf9ff01cb1"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/te/Firefox%20138.0.4.dmg"; + locale = "te"; + arch = "mac"; + sha256 = "dbbc126272a8bff19fe2c2479b2a2d0284d30d15d45427ff2562969d6ec65b79"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/tg/Firefox%20138.0.4.dmg"; + locale = "tg"; + arch = "mac"; + sha256 = "e3de69f295a5c8e00d3adb017e14c8766574a5461134852fa52447795caf6f47"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/th/Firefox%20138.0.4.dmg"; + locale = "th"; + arch = "mac"; + sha256 = "75471c7a4a3ab6b81eb1ec4f03f54a245f93e78cfa4cd5b980497236aedbdbd8"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/tl/Firefox%20138.0.4.dmg"; + locale = "tl"; + arch = "mac"; + sha256 = "48df7d11308fc8d55f53c8df0aa013d5d0aacdd09fbd2c7fe43a418c724bbd77"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/tr/Firefox%20138.0.4.dmg"; + locale = "tr"; + arch = "mac"; + sha256 = "6e51b9520f999d1d436cd4d65c526106c2d49fd67d8f5f435e2ccb8aed07d499"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/trs/Firefox%20138.0.4.dmg"; + locale = "trs"; + arch = "mac"; + sha256 = "38e5f9d1392c64cf53e3263d599f3ca2deead8f507ab89a8b13305185af8123d"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/uk/Firefox%20138.0.4.dmg"; + locale = "uk"; + arch = "mac"; + sha256 = "cf75cb71b63b31252fb5e605d3f86f889a19a8aaf680e7058859843c289ececa"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/ur/Firefox%20138.0.4.dmg"; + locale = "ur"; + arch = "mac"; + sha256 = "c3ecbafe9be4063d9a1dc944fafe5c9286525cf60e96890390d40092e1513e3a"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/uz/Firefox%20138.0.4.dmg"; + locale = "uz"; + arch = "mac"; + sha256 = "60780aed5504b50d1cdba188480937335bfa810925478061cc146416fe76ab15"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/vi/Firefox%20138.0.4.dmg"; + locale = "vi"; + arch = "mac"; + sha256 = "3ffc36e2d19298cecf659e208b6f4298c4b871c8f579c92478d0df6f7d75d797"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/xh/Firefox%20138.0.4.dmg"; + locale = "xh"; + arch = "mac"; + sha256 = "2b5342eccf9e0be7afd820abe5e8f1ac9c67c5814dd1b7e09714e13f183887cf"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/zh-CN/Firefox%20138.0.4.dmg"; + locale = "zh-CN"; + arch = "mac"; + sha256 = "d78e66267a70dbbba17cb4992114d39594cf0562540c81d00749382a50f95ddd"; + } + { + url = "https://archive.mozilla.org/pub/firefox/releases/138.0.4/mac/zh-TW/Firefox%20138.0.4.dmg"; + locale = "zh-TW"; + arch = "mac"; + sha256 = "6e4141e78b4593d7d9bee2eacaec14ce0eac7b555ebf787d3dd858c7d373afc2"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 471719e98278..00f1c18dc422 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -29,7 +29,7 @@ writeScript "update-${pname}" '' HOME=`mktemp -d` export GNUPGHOME=`mktemp -d` - curl https://keys.openpgp.org/vks/v1/by-fingerprint/14F26682D0916CDD81E37B6D61B7B526D98F0353 | gpg --import - + curl https://keys.openpgp.org/vks/v1/by-fingerprint/09BEED63F3462A2DFFAB3B875ECB6497C1A20256 | gpg --import - tmpfile=`mktemp` url=${baseUrl} @@ -60,27 +60,28 @@ writeScript "update-${pname}" '' # this is a list of sha256 and tarballs for both arches # Upstream files contains python repr strings like b'somehash', hence the sed dance - shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep '\.tar\.[a-z0-9]\+'` + shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep '\.\(tar\.[a-z0-9]\+\|dmg\)$' | grep -v mac-EME-free` cat > $tmpfile <> $tmpfile < -Date: Tue, 28 Nov 2023 11:21:18 -0800 -Subject: [PATCH] Handle CXCursor_LinkageSpec in Clang 18+ - -(cherry picked from commit 86f3dbe846020e2ba573d6eb38d1434d0cbcbb40) ---- - third_party/rust/bindgen/.cargo-checksum.json | 2 +- - third_party/rust/bindgen/ir/item.rs | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/third_party/rust/bindgen/.cargo-checksum.json b/third_party/rust/bindgen/.cargo-checksum.json -index 2242180..88718bd 100644 ---- a/third_party/rust/bindgen/.cargo-checksum.json -+++ b/third_party/rust/bindgen/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"Cargo.toml":"ae6de5b309f8bf07c259436b1113ccf405b2d7dd862e1b289bfef47a550956d1","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","build.rs":"4a9c4ac3759572e17de312a9d3f4ced3b6fd3c71811729e5a8d06bfbd1ac8f82","callbacks.rs":"9cbda648159897f93a07dbe90a1ee9ba92e2b020a02bc9725b87db4d025df3b6","clang.rs":"a38d153516c6685b46723010793b2f4e8b16468f3cd3296781dea6e485cd66da","codegen/bitfield_unit.rs":"fddeaeab5859f4e82081865595b7705f5c0774d997df95fa5c655b81b9cae125","codegen/bitfield_unit_tests.rs":"9df86490de5e9d66ccea583dcb686dd440375dc1a3c3cf89a89d5de3883bf28a","codegen/dyngen.rs":"7d727a737c616f7f2d3a07d825be8baad9078b3f35ad96277904559b4534ffcc","codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","codegen/helpers.rs":"5f24007a09e50db7bd2b49b07100cfed649c7b22232558e28c99c759d5d14152","codegen/impl_debug.rs":"71d8e28873ba2de466f2637a824746963702f0511728037d72ee5670c51194cb","codegen/impl_partialeq.rs":"f4599e32c66179ae515a6518a3e94b686689cf59f7dd9ab618c3fb69f17d2c77","codegen/mod.rs":"25ef86b9dd894b40724d78b99e2743654f09bb427a23ccf5940a620c6408688e","codegen/postprocessing/merge_extern_blocks.rs":"be5c5ff6d3d3d4e940814c4dc77f8d687aa6b053dcfbd2185c09616ba9022bf2","codegen/postprocessing/mod.rs":"d1e8c2864d5194a4cb2f6731c0ef582a55b363df9c4f888c26942ff37f728e1c","codegen/postprocessing/sort_semantically.rs":"3071dd509f2e5d3dfd99cafa6ee19bbacb9fec1c61a0b3f6e284a75c1f2c3db6","codegen/serialize.rs":"b1d8fff0bd9717ee7ca883fd3f376cf7b93adb65dc5bb89ede467b087e985a5f","codegen/struct_layout.rs":"7dfc814d3c914a0c53d8ed031baf543dab1def5959e8ab85220cad69a506383a","deps.rs":"5ee2332fdb10325f3b0a0c6d9ba94e13eb631ef39e955fa958afc3625bdb5448","extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","features.rs":"af20bd617cce27f6716ab3d61a1c8ddfaa46227f4a0d435b08a19d5f277cf8ba","ir/analysis/derive.rs":"ec514585eb40f0e3306bf3302aec0152a2e95e8dce13a67c36b5f00c0cbb76ef","ir/analysis/has_destructor.rs":"7a82f01e7e0595a31b56f7c398fa3019b3fe9100a2a73b56768f7e6943dcc3ce","ir/analysis/has_float.rs":"58ea1e38a59ef208400fd65d426cb5b288949df2d383b3a194fa01b99d2a87fa","ir/analysis/has_type_param_in_array.rs":"d1b9eb119dc14f662eb9bd1394c859f485479e4912589709cdd33f6752094e22","ir/analysis/has_vtable.rs":"368cf30fbe3fab7190fab48718b948caac5da8c9e797b709488716b919315636","ir/analysis/mod.rs":"0c10d8eeb26d7e6f4ce18e9dfb74ea1f9deff5cd350298aca3dc1041b17c20c4","ir/analysis/sizedness.rs":"944443d6aab35d2dd80e4f5e59176ac1e1c463ba2f0eb25d33f1d95dfac1a6d0","ir/analysis/template_params.rs":"d3cc41041b1c45e0b5be2c9f3f1cc0c2341481b9ff51589cba2428df4e6a1ea9","ir/annotations.rs":"f79de09803a3f3ccb33e366a10a707da98cd00a56ba18312ea927d6c977220a4","ir/comment.rs":"5dcfab0095d967daad9b2927093fce3786b1a2146171580afbf526ba56855e36","ir/comp.rs":"b7b28b96e4206b3215881d814661c63c5dd182f34b1163d54bcedbe85998cb06","ir/context.rs":"a7608f7d3dd607647f2af5f45fc7c09483d2a694f91265bba353a71652e2d419","ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","ir/dot.rs":"2d79d698e6ac59ce032840e62ff11103abed1d5e9e700cf383b492333eeebe1f","ir/enum_ty.rs":"0b612e0b57112068455eee519f894016d0a8f425d6a67b98c56b858f57d99f4a","ir/function.rs":"60407267473d785ea33ac854a70c8ca34749bc868024270992deca68a951f74c","ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","ir/item.rs":"880c982df0843cbdff38b9f9c3829a2d863a224e4de2260c41c3ac69e9148ad4","ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","ir/layout.rs":"61a0e4250ceab889606973f930f4d692837a13a69ae2579738ff09843fed3d65","ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","ir/module.rs":"7cae5561bcf84a5c3b1ee8f1c3336a33b7f44f0d5ffe885fb108289983fe763e","ir/objc.rs":"4eecdb754542d78acea27d2f547d18d49164047e6efaff8a8d283d6c2dc9875b","ir/template.rs":"4f0e3736558aa8ec359cd9749dc48f87bfff494dd195a67b39cfee7d8a7542ef","ir/traversal.rs":"0c37a0898801ad39bffc8dddd1ee8baa61bb7cf4f3fdc25c8fdd56b6c96ada65","ir/ty.rs":"ba0d7b16a1080caf4960cc7dea0d0800365da0dd5c6e735d508ec448e87b1d40","ir/var.rs":"ced3496cf0683fef91ce94aa09b0ee37255db8425ea8634d52bd73b1b5c160f6","lib.rs":"0bed6f10b2dd25753a40e6e7fa11239f08c05be414ad264c6d7e2f7a8b71f1b2","log_stubs.rs":"9f974e041e35c8c7e29985d27ae5cd0858d68f8676d1dc005c6388d7d011707f","parse.rs":"ccb2c506f08123708ae673b8216404fb22b4c951330662f9b7140b412b063260","regex_set.rs":"7dcc1ad52194f057ea00e8ebc9c23c465ffa6761eed6ba41560d2d02e03c43a6","time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"} -\ No newline at end of file -+{"files":{"Cargo.toml":"ae6de5b309f8bf07c259436b1113ccf405b2d7dd862e1b289bfef47a550956d1","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","build.rs":"4a9c4ac3759572e17de312a9d3f4ced3b6fd3c71811729e5a8d06bfbd1ac8f82","callbacks.rs":"9cbda648159897f93a07dbe90a1ee9ba92e2b020a02bc9725b87db4d025df3b6","clang.rs":"a38d153516c6685b46723010793b2f4e8b16468f3cd3296781dea6e485cd66da","codegen/bitfield_unit.rs":"fddeaeab5859f4e82081865595b7705f5c0774d997df95fa5c655b81b9cae125","codegen/bitfield_unit_tests.rs":"9df86490de5e9d66ccea583dcb686dd440375dc1a3c3cf89a89d5de3883bf28a","codegen/dyngen.rs":"7d727a737c616f7f2d3a07d825be8baad9078b3f35ad96277904559b4534ffcc","codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","codegen/helpers.rs":"5f24007a09e50db7bd2b49b07100cfed649c7b22232558e28c99c759d5d14152","codegen/impl_debug.rs":"71d8e28873ba2de466f2637a824746963702f0511728037d72ee5670c51194cb","codegen/impl_partialeq.rs":"f4599e32c66179ae515a6518a3e94b686689cf59f7dd9ab618c3fb69f17d2c77","codegen/mod.rs":"25ef86b9dd894b40724d78b99e2743654f09bb427a23ccf5940a620c6408688e","codegen/postprocessing/merge_extern_blocks.rs":"be5c5ff6d3d3d4e940814c4dc77f8d687aa6b053dcfbd2185c09616ba9022bf2","codegen/postprocessing/mod.rs":"d1e8c2864d5194a4cb2f6731c0ef582a55b363df9c4f888c26942ff37f728e1c","codegen/postprocessing/sort_semantically.rs":"3071dd509f2e5d3dfd99cafa6ee19bbacb9fec1c61a0b3f6e284a75c1f2c3db6","codegen/serialize.rs":"b1d8fff0bd9717ee7ca883fd3f376cf7b93adb65dc5bb89ede467b087e985a5f","codegen/struct_layout.rs":"7dfc814d3c914a0c53d8ed031baf543dab1def5959e8ab85220cad69a506383a","deps.rs":"5ee2332fdb10325f3b0a0c6d9ba94e13eb631ef39e955fa958afc3625bdb5448","extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","features.rs":"af20bd617cce27f6716ab3d61a1c8ddfaa46227f4a0d435b08a19d5f277cf8ba","ir/analysis/derive.rs":"ec514585eb40f0e3306bf3302aec0152a2e95e8dce13a67c36b5f00c0cbb76ef","ir/analysis/has_destructor.rs":"7a82f01e7e0595a31b56f7c398fa3019b3fe9100a2a73b56768f7e6943dcc3ce","ir/analysis/has_float.rs":"58ea1e38a59ef208400fd65d426cb5b288949df2d383b3a194fa01b99d2a87fa","ir/analysis/has_type_param_in_array.rs":"d1b9eb119dc14f662eb9bd1394c859f485479e4912589709cdd33f6752094e22","ir/analysis/has_vtable.rs":"368cf30fbe3fab7190fab48718b948caac5da8c9e797b709488716b919315636","ir/analysis/mod.rs":"0c10d8eeb26d7e6f4ce18e9dfb74ea1f9deff5cd350298aca3dc1041b17c20c4","ir/analysis/sizedness.rs":"944443d6aab35d2dd80e4f5e59176ac1e1c463ba2f0eb25d33f1d95dfac1a6d0","ir/analysis/template_params.rs":"d3cc41041b1c45e0b5be2c9f3f1cc0c2341481b9ff51589cba2428df4e6a1ea9","ir/annotations.rs":"f79de09803a3f3ccb33e366a10a707da98cd00a56ba18312ea927d6c977220a4","ir/comment.rs":"5dcfab0095d967daad9b2927093fce3786b1a2146171580afbf526ba56855e36","ir/comp.rs":"b7b28b96e4206b3215881d814661c63c5dd182f34b1163d54bcedbe85998cb06","ir/context.rs":"a7608f7d3dd607647f2af5f45fc7c09483d2a694f91265bba353a71652e2d419","ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","ir/dot.rs":"2d79d698e6ac59ce032840e62ff11103abed1d5e9e700cf383b492333eeebe1f","ir/enum_ty.rs":"0b612e0b57112068455eee519f894016d0a8f425d6a67b98c56b858f57d99f4a","ir/function.rs":"60407267473d785ea33ac854a70c8ca34749bc868024270992deca68a951f74c","ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","ir/item.rs":"f215cc40c013cdd6151149dd92b73e13a635a1056f5724174c0f0ff7da9286f8","ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","ir/layout.rs":"61a0e4250ceab889606973f930f4d692837a13a69ae2579738ff09843fed3d65","ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","ir/module.rs":"7cae5561bcf84a5c3b1ee8f1c3336a33b7f44f0d5ffe885fb108289983fe763e","ir/objc.rs":"4eecdb754542d78acea27d2f547d18d49164047e6efaff8a8d283d6c2dc9875b","ir/template.rs":"4f0e3736558aa8ec359cd9749dc48f87bfff494dd195a67b39cfee7d8a7542ef","ir/traversal.rs":"0c37a0898801ad39bffc8dddd1ee8baa61bb7cf4f3fdc25c8fdd56b6c96ada65","ir/ty.rs":"ba0d7b16a1080caf4960cc7dea0d0800365da0dd5c6e735d508ec448e87b1d40","ir/var.rs":"ced3496cf0683fef91ce94aa09b0ee37255db8425ea8634d52bd73b1b5c160f6","lib.rs":"0bed6f10b2dd25753a40e6e7fa11239f08c05be414ad264c6d7e2f7a8b71f1b2","log_stubs.rs":"9f974e041e35c8c7e29985d27ae5cd0858d68f8676d1dc005c6388d7d011707f","parse.rs":"ccb2c506f08123708ae673b8216404fb22b4c951330662f9b7140b412b063260","regex_set.rs":"7dcc1ad52194f057ea00e8ebc9c23c465ffa6761eed6ba41560d2d02e03c43a6","time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"} -\ No newline at end of file -diff --git a/third_party/rust/bindgen/ir/item.rs b/third_party/rust/bindgen/ir/item.rs -index 40f6f7d..d443bda 100644 ---- a/third_party/rust/bindgen/ir/item.rs -+++ b/third_party/rust/bindgen/ir/item.rs -@@ -1427,8 +1427,9 @@ impl Item { - } - } - -- // Guess how does clang treat extern "C" blocks? -- if cursor.kind() == CXCursor_UnexposedDecl { -+ // On Clang 18+, extern "C" is reported accurately as a LinkageSpec. -+ // Older LLVM treat it as UnexposedDecl. -+ if cursor.kind() == CXCursor_LinkageSpec || cursor.kind() == CXCursor_UnexposedDecl { - Err(ParseError::Recurse) - } else { - // We allowlist cursors here known to be unhandled, to prevent being --- -2.44.0 - diff --git a/pkgs/applications/networking/browsers/firefox/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch b/pkgs/applications/networking/browsers/firefox/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch new file mode 100644 index 000000000000..58107b6b9320 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch @@ -0,0 +1,57 @@ +From 45d40b3eeb393051bd3a49feebcefe39dc6e4e93 Mon Sep 17 00:00:00 2001 +From: Peter Collingbourne +Date: Wed, 23 Apr 2025 21:13:38 -0700 +Subject: [PATCH] build: fix RELRHACK_LINKER setting when linker name is target + triple prefixed + +RELRHACK_LINKER is used as the name of a binary installed in a +directory specified with -B to override the linker. Both Clang and +GCC will only look for a binary named "ld" (or "ld.$fuse_ld_setting" +if -fuse-ld= is specified) in the -B directories, which means that +if the linker name does not follow this pattern, for example if it +is named $target_triple-ld", the relrhack linker will not be found, +the compiler will use the normal linker and the link will fail. To fix +this problem, use the correct pattern to name the relrhack executable. +--- + toolkit/moz.configure | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/toolkit/moz.configure b/toolkit/moz.configure +index 6c47287a5b..1a9c368e5e 100644 +--- a/toolkit/moz.configure ++++ b/toolkit/moz.configure +@@ -1843,23 +1843,23 @@ with only_when("--enable-compile-environment"): + use_relrhack = depends(which_elf_hack)(lambda x: x == "relr") + set_config("RELRHACK", True, when=use_relrhack) + +- @depends(c_compiler, linker_ldflags, when=use_relrhack) +- def relrhack_real_linker(c_compiler, linker_ldflags): ++ @depends(linker_ldflags, when=use_relrhack) ++ def relrhack_linker(linker_ldflags): + ld = "ld" + for flag in linker_ldflags: + if flag.startswith("-fuse-ld="): + ld = "ld." + flag[len("-fuse-ld=") :] ++ return ld ++ ++ set_config("RELRHACK_LINKER", relrhack_linker) ++ ++ @depends(c_compiler, relrhack_linker, when=use_relrhack) ++ def relrhack_real_linker(c_compiler, ld): + ld = check_cmd_output( + c_compiler.compiler, f"--print-prog-name={ld}", *c_compiler.flags + ) + return ld.rstrip() + +- @depends(relrhack_real_linker, when=use_relrhack) +- def relrhack_linker(ld): +- return os.path.basename(ld) +- +- set_config("RELRHACK_LINKER", relrhack_linker) +- + std_filesystem = host_cxx_compiler.try_run( + header="#include ", + body='auto foo = std::filesystem::absolute("");', +-- +2.49.0.805.g082f7c87e0-goog + diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index ff8cfa3e8240..9799f2fcfb8c 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -44,7 +44,6 @@ in lib, pkgs, stdenv, - fetchpatch, patchelf, # build time @@ -77,6 +76,7 @@ in gnum4, gtk3, icu73, + icu77, # if you fiddle with the icu parameters, please check Thunderbird's overrides libGL, libGLU, libevent, @@ -98,6 +98,7 @@ in # Darwin apple-sdk_14, + apple-sdk_15, cups, rsync, # used when preparing .app directory @@ -151,11 +152,12 @@ in # Set to `!privacySupport` or `false`. crashreporterSupport ? - !privacySupport && !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isMusl, + !privacySupport + && !stdenv.hostPlatform.isLoongArch64 + && !stdenv.hostPlatform.isRiscV + && !stdenv.hostPlatform.isMusl, curl, geolocationSupport ? !privacySupport, - googleAPISupport ? geolocationSupport, - mlsAPISupport ? geolocationSupport, webrtcSupport ? !privacySupport, # digital rights managemewnt @@ -249,12 +251,21 @@ let } ); - defaultPrefs = { - "geo.provider.network.url" = { - value = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"; - reason = "Use MLS by default for geolocation, since our Google API Keys are not working"; - }; - }; + defaultPrefs = + if geolocationSupport then + { + "geo.provider.network.url" = { + value = "https://api.beacondb.net/v1/geolocate"; + reason = "We have no Google API keys and Mozilla Location Services were retired."; + }; + } + else + { + "geo.provider.use_geoclue" = { + value = false; + reason = "Geolocation support has been disabled through the `geolocationSupport` package attribute."; + }; + }; defaultPrefsFile = pkgs.writeText "nixos-default-prefs.js" ( lib.concatStringsSep "\n" ( @@ -295,68 +306,20 @@ buildStdenv.mkDerivation { ./env_var_for_system_dir-ff111.patch ] ++ lib.optionals (lib.versionAtLeast version "133") [ ./env_var_for_system_dir-ff133.patch ] - ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ - ./no-buildconfig-ffx96.patch - ] ++ lib.optionals (lib.versionAtLeast version "121" && lib.versionOlder version "136") [ ./no-buildconfig-ffx121.patch ] ++ lib.optionals (lib.versionAtLeast version "136") [ ./no-buildconfig-ffx136.patch ] - ++ - lib.optionals - ( - lib.versionOlder version "128.2" - || (lib.versionAtLeast version "129" && lib.versionOlder version "130") - ) - [ - (fetchpatch { - # https://bugzilla.mozilla.org/show_bug.cgi?id=1912663 - name = "cbindgen-0.27.0-compat.patch"; - url = "https://hg.mozilla.org/integration/autoland/raw-rev/98cd34c7ff57"; - hash = "sha256-MqgWHgbDedVzDOqY2/fvCCp+bGwFBHqmaJLi/mllZug="; - }) - ] - ++ lib.optionals (lib.versionOlder version "122") [ ./bindgen-0.64-clang-18.patch ] - ++ lib.optionals (lib.versionOlder version "123") [ - (fetchpatch { - name = "clang-18.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/ba6abbd36b496501cea141e17b61af674a18e279"; - hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw="; - }) - ] - ++ - lib.optionals - ( - (lib.versionAtLeast version "129" && lib.versionOlder version "134") - || lib.versionOlder version "128.6.0" - ) - [ - # Python 3.12.8 compat - # https://bugzilla.mozilla.org/show_bug.cgi?id=1935621 - # https://phabricator.services.mozilla.com/D231480 - ./mozbz-1935621-attachment-9442305.patch - ] ++ [ - # LLVM 19 turned on WASM reference types by default, exposing a bug - # that broke the Mozilla WASI build. Supposedly, it has been fixed - # upstream in LLVM, but the build fails in the same way for us even - # with LLVM 19 versions that contain the upstream patch. - # - # Apply the temporary patch Mozilla used to work around this bug - # for now until someone can investigate what’s going on here. - # - # TODO: Please someone figure out what’s up with this. - # - # See: - # See: - (fetchpatch { - name = "wasi-sdk-disable-reference-types.patch"; - url = "https://hg.mozilla.org/integration/autoland/raw-rev/23a9f6555c7c"; - hash = "sha256-CRywalJlRMFVLITEYXxpSq3jLPbUlWKNRHuKLwXqQfU="; - }) # Fix for missing vector header on macOS - # https://bugzilla.mozilla.org/show_bug.cgi?id=1939405 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1959377 + # Fixed on Firefox 139 ./firefox-mac-missing-vector-header.patch + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1962497 + # https://phabricator.services.mozilla.com/D246545 + # Fixed on Firefox 140 + ./build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch ] ++ extraPatches; @@ -365,6 +328,10 @@ buildStdenv.mkDerivation { rm -rf obj-x86_64-pc-linux-gnu patchShebangs mach build '' + # https://bugzilla.mozilla.org/show_bug.cgi?id=1927380 + + lib.optionalString (lib.versionAtLeast version "134") '' + sed -i "s/icu-i18n/icu-uc &/" js/moz.configure + '' + extraPostPatch; # Ignore trivial whitespace changes in patches, this fixes compatibility of @@ -398,6 +365,7 @@ buildStdenv.mkDerivation { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rsync ] + ++ lib.optionals stdenv.hostPlatform.isx86 [ nasm ] ++ lib.optionals crashreporterSupport [ dump_syms patchelf @@ -467,22 +435,6 @@ buildStdenv.mkDerivation { } fi '' - + lib.optionalString googleAPISupport '' - # Google API key used by Chromium and Firefox. - # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, - # please get your own set of keys at https://www.chromium.org/developers/how-tos/api-keys/. - echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/google-api-key - # 60.5+ & 66+ did split the google API key arguments: https://bugzilla.mozilla.org/show_bug.cgi?id=1531176 - configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/google-api-key") - configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/google-api-key") - '' - + lib.optionalString mlsAPISupport '' - # Mozilla Location services API key - # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, - # please get your own set of keys at https://location.services.mozilla.com/api. - echo "dfd7836c-d458-4917-98bb-421c82d3c8a0" > $TMPDIR/mls-api-key - configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key") - '' + lib.optionalString (enableOfficialBranding && !stdenv.hostPlatform.is32bit) '' export MOZILLA_OFFICIAL=1 '' @@ -519,13 +471,12 @@ buildStdenv.mkDerivation { ] ++ lib.optional (isElfhackPlatform stdenv) (enableFeature elfhackSupport "elf-hack") ++ lib.optional (!drmSupport) "--disable-eme" - ++ lib.optional (allowAddonSideload) "--allow-addon-sideload" + ++ lib.optional allowAddonSideload "--allow-addon-sideload" ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # MacOS builds use bundled versions of libraries: https://bugzilla.mozilla.org/show_bug.cgi?id=1776255 "--enable-system-pixman" "--with-system-ffi" - # Firefox 136 fails to link with our icu76.1 - (lib.optionalString (lib.versionOlder version "136") "--with-system-icu") + "--with-system-icu" "--with-system-jpeg" "--with-system-libevent" "--with-system-libvpx" @@ -573,12 +524,11 @@ buildStdenv.mkDerivation { libGL libGLU libstartup_notification - nasm perl zip ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 + (if lib.versionAtLeast version "138" then apple-sdk_15 else apple-sdk_14) cups ] ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) ( @@ -610,7 +560,7 @@ buildStdenv.mkDerivation { xorg.xorgproto zlib ( - if (lib.versionAtLeast version "116") then nss_latest else nss_esr # 3.90 + if (lib.versionAtLeast version "129") then nss_latest else nss_esr # 3.90 ) ] ++ lib.optional alsaSupport alsa-lib @@ -622,7 +572,7 @@ buildStdenv.mkDerivation { libdrm ] )) - ++ lib.optionals (lib.versionOlder version "136") [ icu73 ] + ++ [ (if (lib.versionAtLeast version "138") then icu77 else icu73) ] ++ lib.optional gssSupport libkrb5 ++ lib.optional jemallocSupport jemalloc ++ extraBuildInputs; diff --git a/pkgs/applications/networking/browsers/firefox/mozbz-1935621-attachment-9442305.patch b/pkgs/applications/networking/browsers/firefox/mozbz-1935621-attachment-9442305.patch deleted file mode 100644 index bbf9b2fa1036..000000000000 --- a/pkgs/applications/networking/browsers/firefox/mozbz-1935621-attachment-9442305.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/python/mach/mach/site.py b/python/mach/mach/site.py ---- a/python/mach/mach/site.py -+++ b/python/mach/mach/site.py -@@ -15,10 +15,11 @@ - import site - import subprocess - import sys - import sysconfig - import tempfile -+import warnings - from contextlib import contextmanager - from pathlib import Path - from typing import Callable, Optional - - from mach.requirements import ( -@@ -817,37 +818,79 @@ - - class PythonVirtualenv: - """Calculates paths of interest for general python virtual environments""" - - def __init__(self, prefix): -- if _is_windows: -- self.bin_path = os.path.join(prefix, "Scripts") -- self.python_path = os.path.join(self.bin_path, "python.exe") -- else: -- self.bin_path = os.path.join(prefix, "bin") -- self.python_path = os.path.join(self.bin_path, "python") - self.prefix = os.path.realpath(prefix) -+ self.paths = self._get_sysconfig_paths(self.prefix) - -- @functools.lru_cache(maxsize=None) -- def resolve_sysconfig_packages_path(self, sysconfig_path): -- # macOS uses a different default sysconfig scheme based on whether it's using the -- # system Python or running in a virtualenv. -- # Manually define the scheme (following the implementation in -- # "sysconfig._get_default_scheme()") so that we're always following the -- # code path for a virtualenv directory structure. -- if os.name == "posix": -- scheme = "posix_prefix" -- else: -- scheme = os.name -+ # Name of the Python executable to use in virtual environments. -+ # An executable with the same name as sys.executable might not exist in -+ # virtual environments. An executable with 'python' as the steam — -+ # without version numbers or ABI flags — will always be present in -+ # virtual environments, so we use that. -+ python_exe_name = "python" + sysconfig.get_config_var("EXE") -+ -+ self.bin_path = self.paths["scripts"] -+ self.python_path = os.path.join(self.bin_path, python_exe_name) - -- sysconfig_paths = sysconfig.get_paths(scheme) -- data_path = Path(sysconfig_paths["data"]) -- path = Path(sysconfig_paths[sysconfig_path]) -- relative_path = path.relative_to(data_path) -+ @staticmethod -+ def _get_sysconfig_paths(prefix): -+ """Calculate the sysconfig paths of a virtual environment in the given prefix. - -- # Path to virtualenv's "site-packages" directory for provided sysconfig path -- return os.path.normpath(os.path.normcase(Path(self.prefix) / relative_path)) -+ The virtual environment MUST be using the same Python distribution as us. -+ """ -+ # Determine the sysconfig scheme used in virtual environments -+ if "venv" in sysconfig.get_scheme_names(): -+ # A 'venv' scheme was added in Python 3.11 to allow users to -+ # calculate the paths for a virtual environment, since the default -+ # scheme may not always be the same as used on virtual environments. -+ # Some common examples are the system Python distributed by macOS, -+ # Debian, and Fedora. -+ # For more information, see https://github.com/python/cpython/issues/89576 -+ venv_scheme = "venv" -+ elif os.name == "nt": -+ # We know that before the 'venv' scheme was added, on Windows, -+ # the 'nt' scheme was used in virtual environments. -+ venv_scheme = "nt" -+ elif os.name == "posix": -+ # We know that before the 'venv' scheme was added, on POSIX, -+ # the 'posix_prefix' scheme was used in virtual environments. -+ venv_scheme = "posix_prefix" -+ else: -+ # This should never happen with upstream Python, as the 'venv' -+ # scheme should always be available on >=3.11, and no other -+ # platforms are supported by the upstream on older Python versions. -+ # -+ # Since the 'venv' scheme isn't available, and we have no knowledge -+ # of this platform/distribution, fallback to the default scheme. -+ # -+ # Hitting this will likely be the result of running a custom Python -+ # distribution targetting a platform that is not supported by the -+ # upstream. -+ # In this case, unless the Python vendor patched the Python -+ # distribution in such a way as the default scheme may not always be -+ # the same scheme, using the default scheme should be correct. -+ # If the vendor did patch Python as such, to work around this issue, -+ # I would recommend them to define a 'venv' scheme that matches -+ # the layout used on virtual environments in their Python distribution. -+ # (rec. signed Filipe Laíns — upstream sysconfig maintainer) -+ venv_scheme = sysconfig.get_default_scheme() -+ warnings.warn( -+ f"Unknown platform '{os.name}', using the default install scheme '{venv_scheme}'. " -+ "If this is incorrect, please ask your Python vendor to add a 'venv' sysconfig scheme " -+ "(see https://github.com/python/cpython/issues/89576, or check the code comment).", -+ stacklevel=2, -+ ) -+ # Build the sysconfig config_vars dictionary for the virtual environment. -+ venv_vars = sysconfig.get_config_vars().copy() -+ venv_vars["base"] = venv_vars["platbase"] = prefix -+ # Get sysconfig paths for the virtual environment. -+ return sysconfig.get_paths(venv_scheme, vars=venv_vars) -+ -+ def resolve_sysconfig_packages_path(self, sysconfig_path): -+ return self.paths[sysconfig_path] - - def site_packages_dirs(self): - dirs = [] - if sys.platform.startswith("win"): - dirs.append(os.path.normpath(os.path.normcase(self.prefix))) - diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx96.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx96.patch deleted file mode 100644 index 51f9f0e354f2..000000000000 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx96.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp -index e7be91a248..5eb98534ee 100644 ---- a/docshell/base/nsAboutRedirector.cpp -+++ b/docshell/base/nsAboutRedirector.cpp -@@ -66,9 +66,6 @@ static const RedirEntry kRedirMap[] = { - {"about", "chrome://global/content/aboutAbout.html", 0}, - {"addons", "chrome://mozapps/content/extensions/aboutaddons.html", - nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, -- {"buildconfig", "chrome://global/content/buildconfig.html", -- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | -- nsIAboutModule::IS_SECURE_CHROME_UI}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT}, -diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index 74c0ae8f34..a5d9645a96 100644 ---- a/toolkit/content/jar.mn -+++ b/toolkit/content/jar.mn -@@ -41,8 +41,6 @@ toolkit.jar: - content/global/plugins.css - content/global/plugins.js - #endif --* content/global/buildconfig.html -- content/global/buildconfig.css - content/global/contentAreaUtils.js - content/global/datepicker.xhtml - #ifndef MOZ_FENNEC diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index 18c64c870307..a4231f204e28 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -10,11 +10,11 @@ buildMozillaMach rec { pname = "firefox-beta"; binaryName = pname; - version = "137.0b6"; + version = "138.0b4"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "84c010f6e21957768a6fcebe6ec2f0e6a50b45b6a416cad3701f36d69dff9a448423e5b4f2ce0dc7abe46cb40ec02872027ad855b9afef355006ba32e13f4e27"; + sha512 = "a8f9e645c80d9c40b0435ee00261aa9fcac801efcfcbf42b10e6af9390290b9f643358aca6a01d9465eab3b64f46b2b71b4a3ea4c7e0a8f96bdfce15bf817f92"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 850fa78f80ba..79b2e0745b44 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = pname; - version = "137.0b10"; + version = "138.0b9"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ece2e76830b7f3fa0ea3b077948a874315c225da03f9043a5e63900f251aa7f568278aeae5c9b5be89bf07c2d783fbdfd1f2acf37e6dd7db3d82cb7e925e33d6"; + sha512 = "cf737b8c394150430cda512a84ebdf04426db0c413863eb37a327c44fc952db7de1be07956aaded3ddb769480fb307a102c1f4f7dab4ba8a38f2371fdd35a961"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix index c374d1dd08c4..1d29c2244730 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix @@ -9,11 +9,11 @@ buildMozillaMach rec { pname = "firefox"; - version = "128.9.0esr"; + version = "128.10.1esr"; applicationName = "Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "c0c8ac8374291cc93279064c73c17786c6f4fba7505ebc2cbd7a4ce7c82710620abdae7be15f60c43f9d10c3614fc9fd31f094e787105d528031c6f0510f7339"; + sha512 = "6e7363d8cbecda1cedaf534ac10dc046b5f515399ec754492357e8a558c61ee3389f7bb90aa929dbcb4d6eba041ae1e778a0a8f90aa1e1f939eea517333b6c45"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index b41f04710ed5..7e728b48ad45 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @@ -9,10 +9,10 @@ buildMozillaMach rec { pname = "firefox"; - version = "137.0"; + version = "138.0.4"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "81a2c0cc14ffc2e49e49379e6c2ab56cfb6e13b66666a64f3abff44a43bb2e7dc17274d325d1c20af062d40bff8063d788d4b2f931a7a646db8b07204ca6b481"; + sha512 = "64d80456da8df27d7eeed7eb20c35fcf213bc948eb48739b6101e2c476ea9a9133da928477a79683c96c160f8d53bed52be487f01a8d29e38d39071f12676806"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 14ccac136807..596c2cb0a849 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -33,7 +33,7 @@ writeScript "update-${attrPath}" '' set -eux HOME=`mktemp -d` export GNUPGHOME=`mktemp -d` - curl https://keys.openpgp.org/vks/v1/by-fingerprint/14F26682D0916CDD81E37B6D61B7B526D98F0353 | gpg --import - + curl https://keys.openpgp.org/vks/v1/by-fingerprint/09BEED63F3462A2DFFAB3B875ECB6497C1A20256 | gpg --import - url=${baseUrl} diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index c753b04fb700..f2e7b430f825 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -49,7 +49,7 @@ let wmClass ? applicationName, nativeMessagingHosts ? [ ], pkcs11Modules ? [ ], - useGlvnd ? true, + useGlvnd ? (!isDarwin), cfg ? config.${applicationName} or { }, ## Following options are needed for extra prefs & policies @@ -109,13 +109,13 @@ let zlib ] ) - ++ lib.optional (config.pulseaudio or true) libpulseaudio + ++ lib.optional (config.pulseaudio or (!isDarwin)) libpulseaudio ++ lib.optional alsaSupport alsa-lib ++ lib.optional sndioSupport sndio ++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc ++ pkcs11Modules - ++ gtk_modules; + ++ lib.optionals (!isDarwin) gtk_modules; gtk_modules = [ libcanberra-gtk3 ]; # Darwin does not rename bundled binaries @@ -289,7 +289,7 @@ let lndir jq ]; - buildInputs = [ browser.gtk3 ]; + buildInputs = lib.optionals (!isDarwin) [ browser.gtk3 ]; makeWrapperArgs = [ @@ -298,11 +298,6 @@ let ":" "${finalAttrs.libs}" - "--suffix" - "GTK_PATH" - ":" - "${lib.concatStringsSep ":" finalAttrs.gtk_modules}" - "--suffix" "PATH" ":" @@ -319,6 +314,12 @@ let "--set" "MOZ_ALLOW_DOWNGRADE" "1" + ] + ++ lib.optionals (!isDarwin) [ + "--suffix" + "GTK_PATH" + ":" + "${lib.concatStringsSep ":" finalAttrs.gtk_modules}" "--suffix" "XDG_DATA_DIRS" @@ -330,7 +331,7 @@ let "1" ] - ++ lib.optionals (!xdg-utils.meta.broken) [ + ++ lib.optionals (!xdg-utils.meta.broken && !isDarwin) [ # make xdg-open overridable at runtime "--suffix" "PATH" @@ -405,10 +406,12 @@ let + lib.optionalString isDarwin '' cd "${appPath}" - # These files have to be copied and not symlinked, otherwise tabs crash. + # The omni.ja files have to be copied and not symlinked, otherwise tabs crash. # Maybe related to how omni.ja file is mmapped into memory. See: # https://github.com/mozilla/gecko-dev/blob/b1662b447f306e6554647914090d4b73ac8e1664/modules/libjar/nsZipArchive.cpp#L204 - for file in $(find . -type l -name "omni.ja"); do + # + # The *.dylib files are copied, otherwise some basic functionality, e.g. Crypto API, is broken. + for file in $(find . -name "omni.ja" -o -name "*.dylib"); do rm "$file" cp "${browser}/${appPath}/$file" "$file" done @@ -455,8 +458,11 @@ let oldExe="$executablePrefix/.${applicationName}"-old mv "$executablePath" "$oldExe" fi - + '' + + lib.optionalString (!isDarwin) '' appendToVar makeWrapperArgs --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + '' + + '' concatTo makeWrapperArgs oldWrapperArgs makeWrapper "$oldExe" "$out/${finalBinaryPath}" "''${makeWrapperArgs[@]}" @@ -481,7 +487,7 @@ let done fi - install -D -t $out/share/applications $desktopItem/share/applications/* + install -m 644 -D -t $out/share/applications $desktopItem/share/applications/* '' + lib.optionalString hasMozSystemDirPatch '' diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 6785299be8e4..517d79942a0a 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -9,7 +9,7 @@ ( (buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.25.0"; + packageVersion = "11.26.1"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -17,14 +17,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "128.9.0"; + version = "128.10.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-zY0JklGWsulZXj45/yKJpJypGSA5qwH/zo8F52gp2nE="; + hash = "sha256-WX7I81Rjv/6+L+HCN6j/HvLOPJk0vyiLpUmxoK+FDn8="; }; extraConfigureFlags = [ @@ -66,8 +66,7 @@ privacySupport = true; webrtcSupport = true; enableOfficialBranding = false; - googleAPISupport = true; - mlsAPISupport = true; + geolocationSupport = true; } ).overrideAttrs (prev: { diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix deleted file mode 100644 index b0147b551828..000000000000 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - nix-update-script, - cmake, - pkg-config, - fribidi, - harfbuzz, - libogg, - libwebp, - mpg123, - opusfile, - SDL2, - the-foundation, - AppKit, - zip, - enableTUI ? false, - ncurses, - sealcurses, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "lagrange"; - version = "1.18.5"; - - src = fetchFromGitHub { - owner = "skyjake"; - repo = "lagrange"; - tag = "v${finalAttrs.version}"; - hash = "sha256-NlnT8dGh05dDjSMxjaBnW7x/KjLgf2Ma0nbaiR7MpiY="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - zip - ]; - - buildInputs = - [ - the-foundation - fribidi - harfbuzz - libogg - libwebp - mpg123 - opusfile - SDL2 - ] - ++ lib.optionals enableTUI [ - ncurses - sealcurses - ] - ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; - - cmakeFlags = [ - (lib.cmakeBool "ENABLE_TUI" enableTUI) - (lib.cmakeFeature "CMAKE_INSTALL_DATAROOTDIR" "${placeholder "out"}/share") - ]; - - installPhase = - lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - mv Lagrange.app $out/Applications - '' - + lib.optionalString (stdenv.hostPlatform.isDarwin && enableTUI) '' - # https://github.com/skyjake/lagrange/issues/610 - make install - install -d $out/share/lagrange - ln -s $out/Applications/Lagrange.app/Contents/Resources/resources.lgr $out/share/lagrange/resources.lgr - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - description = "Beautiful Gemini Client"; - homepage = "https://gmi.skyjake.fi/lagrange/"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ sikmir ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index a87745795204..85dc784ae873 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -15,8 +15,12 @@ rec { extraPostPatch = '' while read patch_name; do - echo "applying LibreWolf patch: $patch_name" - patch -p1 < ${source}/$patch_name + if [ "$patch_name" != "patches/macos-import-vector.patch" ]; then + echo "applying LibreWolf patch: $patch_name" + patch -p1 < ${source}/$patch_name + else + echo "skipping LibreWolf patch: $patch" + fi done <${source}/assets/patches.txt cp -r ${source}/themes/browser . diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 510aab612186..9f579f6aacb2 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "136.0.4-1", + "packageVersion": "138.0.4-1", "source": { - "rev": "136.0.4-1", - "hash": "sha256-ymW9vj4CariMaswrMQRKYEvTofFRjc50gF9EmTuhsRA=" + "rev": "138.0.4-1", + "hash": "sha256-KR8ZiueaEOXt2dw8T6ZvrQURV49Xu4cYe0XE8tEUmbw=" }, "firefox": { - "version": "136.0.4", - "hash": "sha512-wiUqpi0BXO1lNMsqwHH2gImZe0ZpAIPMHv9LrTBq5shlQ3Ge0tNfb5c790Rn1qBKukYNMJwG3qQl52xyDjROKA==" + "version": "138.0.4", + "hash": "sha512-ZNgEVtqN8n1+7tfrIMNfzyE7yUjrSHObYQHixHbqmpEz2pKEd6eWg8lsFg+NU77VK+SH8BqNKeONOQcfEmdoBg==" } } diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index bcdc561da2d1..7afe97c3bf9a 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, gperf, pkg-config, buildsystem, @@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-w1cifwLoP7KnaxK5ARkaCCIp2x8Ac2Lo8xx1RRDCoBw="; }; + patches = [ + # fixes libdom build on gcc 14 due to calloc-transposed-args warning + # remove on next release + (fetchpatch { + name = "fix-calloc-transposed-args.patch"; + url = "https://source.netsurf-browser.org/libsvgtiny.git/patch/?id=9d14633496ae504557c95d124b97a71147635f04"; + hash = "sha256-IRWWjyFXd+lWci/bKR9uPDKbP3ttK6zNB6Cy5bv4huc="; + }) + ]; + nativeBuildInputs = [ gperf pkg-config @@ -38,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; + enableParallelBuilding = true; + meta = { homepage = "https://www.netsurf-browser.org/projects/libsvgtiny/"; description = "NetSurf SVG decoder"; diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index 1f05ff540cee..c97bf204e483 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -15,7 +15,7 @@ gdk-pixbuf, cairo, pango, - webkitgtk_4_0, + webkitgtk_4_1, openssl, gstreamer, gst-libav, @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { cairo pango gtk3 - webkitgtk_4_0 + webkitgtk_4_1 openssl libfixposix ]; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 93c27b9acdd5..5defd3f14dd5 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -6,7 +6,9 @@ autoPatchelfHook, copyDesktopItems, dbus-glib, - ffmpeg, + # ffmpeg 7 not supported yet, results in MP4 playback being unavailable + # https://repo.palemoon.org/MoonchildProductions/UXP/issues/2523 + ffmpeg_6, gtk2-x11, withGTK3 ? true, gtk3, @@ -21,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.6.1"; + version = "33.7.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -145,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: { gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ - ffmpeg + ffmpeg_6 libglvnd libpulseaudio ] @@ -172,11 +174,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-OaiY34UcPZ0zxDZP/VrJyEXou2Kz77SqMuJMiVCRIbA="; + hash = "sha256-80L93pQaozdyqMnIswWnS+gNo+xVYv5eFVNnLiK/rcU="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-Yq9bpvyNP+tOKvcZbjxbNhrtimi6Ylb5vBytx+OEgiI="; + hash = "sha256-dnDQKRCqADzdotJRUeETqaGV+S+M6/de5LuBgMYYvPE="; }; }; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix deleted file mode 100644 index 66a2fc921c56..000000000000 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ /dev/null @@ -1,169 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - fetchzip, - python3, - wrapQtAppsHook, - glib-networking, - asciidoc, - docbook_xml_dtd_45, - docbook_xsl, - libxml2, - libxslt, - withPdfReader ? true, - pipewireSupport ? stdenv.hostPlatform.isLinux, - pipewire, - qtwayland, - qtbase, - qtwebengine, - enableWideVine ? false, - widevine-cdm, - # can cause issues on some graphics chips - enableVulkan ? false, - vulkan-loader, -}: - -let - isQt6 = lib.versions.major qtbase.version == "6"; - pdfjs = - let - version = "4.2.67"; - in - fetchzip { - url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; - hash = "sha256-7kfT3+ZwoGqZ5OwkO9h3DIuBFd0v8fRlcufxoBdcy8c="; - stripRoot = false; - }; - - version = "3.4.0"; -in - -python3.pkgs.buildPythonApplication { - pname = "qutebrowser" + lib.optionalString (!isQt6) "-qt5"; - inherit version; - pyproject = true; - - src = fetchurl { - url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-gUEkwO0zdDDmE6HaNm1eOJBMsgSa+xUFlxRWylymIj4="; - }; - - # Needs tox - doCheck = false; - - buildInputs = - [ - qtbase - glib-networking - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland - ]; - - build-system = with python3.pkgs; [ - setuptools - ]; - - nativeBuildInputs = [ - wrapQtAppsHook - asciidoc - docbook_xml_dtd_45 - docbook_xsl - libxml2 - libxslt - ]; - - dependencies = with python3.pkgs; [ - colorama - pyyaml - (if isQt6 then pyqt6-webengine else pyqtwebengine) - jinja2 - pygments - # scripts and userscripts libs - tldextract - beautifulsoup4 - readability-lxml - pykeepass - stem - pynacl - # extensive ad blocking - adblock - # for the qute-bitwarden user script to be able to copy the TOTP token to clipboard - pyperclip - ]; - - patches = [ - ./fix-restart.patch - ]; - - dontWrapQtApps = true; - - postPatch = - '' - substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser" - - sed -i "s,/usr,$out,g" qutebrowser/utils/standarddir.py - '' - + lib.optionalString withPdfReader '' - sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py - ''; - - installPhase = '' - runHook preInstall - - make -f misc/Makefile \ - PYTHON=${(python3.pythonOnBuildForHost.withPackages (ps: with ps; [ setuptools ])).interpreter} \ - PREFIX=. \ - DESTDIR="$out" \ - DATAROOTDIR=/share \ - install - - runHook postInstall - ''; - - postInstall = '' - # Patch python scripts - buildPythonPath "$out $propagatedBuildInputs" - scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/) - for i in $scripts; do - patchPythonScript "$i" - done - ''; - - preFixup = - let - libPath = lib.makeLibraryPath [ pipewire ]; - in - '' - makeWrapperArgs+=( - # Force the app to use QT_PLUGIN_PATH values from wrapper - --unset QT_PLUGIN_PATH - "''${qtWrapperArgs[@]}" - # avoid persistant warning on starup - --set QT_STYLE_OVERRIDE Fusion - ${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''} - ${lib.optionalString (enableVulkan) '' - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} - --set-default QSG_RHI_BACKEND vulkan - ''} - ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''} - --set QTWEBENGINE_RESOURCES_PATH "${qtwebengine}/resources" - ) - ''; - - meta = with lib; { - homepage = "https://github.com/qutebrowser/qutebrowser"; - changelog = "https://github.com/qutebrowser/qutebrowser/blob/v${version}/doc/changelog.asciidoc"; - description = "Keyboard-focused browser with a minimal GUI"; - license = licenses.gpl3Plus; - mainProgram = "qutebrowser"; - platforms = if enableWideVine then [ "x86_64-linux" ] else qtwebengine.meta.platforms; - maintainers = with maintainers; [ - jagajaga - rnhmjoj - ebzzry - dotlambda - ]; - }; -} diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix deleted file mode 100644 index 2e8e52b3efe4..000000000000 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - pkg-config, - wrapGAppsHook3, - glib, - gcr, - glib-networking, - gsettings-desktop-schemas, - gtk, - libsoup_2_4, - webkitgtk_4_0, - xorg, - dmenu, - findutils, - gnused, - coreutils, - gst_all_1, - patches ? null, -}: - -stdenv.mkDerivation rec { - pname = "surf"; - version = "2.1"; - - # tarball is missing file common.h - src = fetchgit { - url = "git://git.suckless.org/surf"; - rev = version; - sha256 = "1v926hiayddylq79n8l7dy51bm0dsa9n18nx9bkhg666cx973x4z"; - }; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - ]; - buildInputs = - [ - glib - gcr - glib-networking - gsettings-desktop-schemas - gtk - libsoup_2_4 - webkitgtk_4_0 - ] - ++ (with gst_all_1; [ - # Audio & video support for webkitgtk WebView - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - ]); - - inherit patches; - - makeFlags = [ "PREFIX=$(out)" ]; - - # Add run-time dependencies to PATH. Append them to PATH so the user can - # override the dependencies with their own PATH. - preFixup = - let - depsPath = lib.makeBinPath [ - xorg.xprop - dmenu - findutils - gnused - coreutils - ]; - in - '' - gappsWrapperArgs+=( - --suffix PATH : ${depsPath} - ) - ''; - - meta = with lib; { - description = "Simple web browser based on WebKitGTK"; - mainProgram = "surf"; - longDescription = '' - surf is a simple web browser based on WebKitGTK. It is able to display - websites and follow links. It supports the XEmbed protocol which makes it - possible to embed it in another application. Furthermore, one can point - surf to another URI by setting its XProperties. - ''; - homepage = "https://surf.suckless.org"; - license = licenses.mit; - platforms = webkitgtk_4_0.meta.platforms; - maintainers = with maintainers; [ joachifm ]; - }; -} diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index c467308b04fe..75b44f6c91bd 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -71,7 +71,7 @@ let in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.1.3570.60"; + version = "7.3.3635.12"; suffix = { @@ -84,8 +84,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-x7CjbOrEb0+/1eqRoYTxA1RDxQeLJFmziuFcBapYaOU="; - x86_64-linux = "sha256-G0y49vUsFJTzxKRw1ZsXQvep7/MtGaO0FAF2nAinysw="; + aarch64-linux = "sha256-Gplg0QD7DcibaOv1Q8RUnefACZdNnM8yKYYiP1dpY58="; + x86_64-linux = "sha256-qcV4n9/nAbb0Gw8azorDSjpjy4cXe2XlR94WwuwUEyc="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -98,6 +98,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ patchelf makeWrapper + qt5.wrapQtAppsHook ]; dontWrapQtApps = true; @@ -137,6 +138,7 @@ stdenv.mkDerivation rec { systemd libva qt5.qtbase + qt5.qtwayland freetype fontconfig libXrender @@ -219,6 +221,7 @@ stdenv.mkDerivation rec { --set-default FONTCONFIG_PATH "${fontconfig.out}/etc/fonts" \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ --prefix PATH : ${coreutils}/bin \ + ''${qtWrapperArgs[@]} \ ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} '' + lib.optionalString enableWidevine '' diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix deleted file mode 100644 index 0872fd859b20..000000000000 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - squashfsTools, - fetchurl, - lib, - stdenv, -}: - -# This derivation roughly follows the update-ffmpeg script that ships with the official Vivaldi -# downloads at https://vivaldi.com/download/ -stdenv.mkDerivation rec { - pname = "chromium-codecs-ffmpeg-extra"; - version = "115541"; - - src = fetchurl { - url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_41.snap"; - hash = "sha256-a1peHhku+OaGvPyChvLdh6/7zT+v8OHNwt60QUq7VvU="; - }; - - buildInputs = [ squashfsTools ]; - - unpackPhase = '' - unsquashfs -dest . $src - ''; - - installPhase = '' - install -vD chromium-ffmpeg-${version}/chromium-ffmpeg/libffmpeg.so $out/lib/libffmpeg.so - ''; - - meta = with lib; { - description = "Additional support for proprietary codecs for Vivaldi"; - homepage = "https://ffmpeg.org/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.lgpl21; - maintainers = with maintainers; [ - betaboon - cawilliamson - fptje - ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index a76be42cf112..f30c4262a176 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -4,6 +4,7 @@ makeWrapper, makeDesktopItem, fetchurl, + openjdk17-bootstrap, jdk11, jdk8, }: @@ -12,7 +13,7 @@ let generic = { version, - sha256, + hash, platform ? "", jdk, ... @@ -52,13 +53,16 @@ let "--user-agent" "Mozilla/5.0" ]; # HTTP 104 otherwise - inherit sha256; + inherit hash; }; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + makeWrapper ${jdk}/bin/java $out/bin/charles \ - --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" + --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' ${lib.optionalString (lib.versionOlder version "5.0") "-jar $out/share/java/charles.jar"} ${lib.optionalString (lib.versionAtLeast version "5.0") "-XX:+UseZGC -Djava.library.path='$out/share/java' --add-opens java.base/sun.security.ssl=com.charlesproxy --add-opens java.desktop/java.awt.event=com.charlesproxy --add-opens java.base/java.io=com.charlesproxy --add-modules com.jthemedetector,com.formdev.flatlaf --module-path '$out/share/java' -m com.charlesproxy"}" for fn in lib/*.jar; do install -D -m644 $fn $out/share/java/$(basename $fn) @@ -69,27 +73,37 @@ let mkdir -p $out/share/icons cp -r icon $out/share/icons/hicolor + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Web Debugging Proxy"; homepage = "https://www.charlesproxy.com/"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ kalbasit kashw2 ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.unfree; - platforms = platforms.unix; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.unfree; + platforms = lib.platforms.unix; }; }; in { + charles5 = ( + generic { + version = "5.0"; + hash = "sha256-gvspRI3uF7bjE4UBuTGS5+n2h0nKudLtW3sqs2GZIyM="; + platform = "_x86_64"; + jdk = openjdk17-bootstrap; + } + ); charles4 = ( generic { - version = "4.6.4"; - sha256 = "KEQYb90kt41dS3TJLZqdaV9P3mQA9UPsEyiFb/knm3w="; + version = "4.6.8"; + hash = "sha256-AaS+zmQTWsGoLEhyGHA/UojmctE7IV0N9fnygNhEPls="; platform = "_amd64"; jdk = jdk11; } @@ -97,7 +111,7 @@ in charles3 = ( generic { version = "3.12.3"; - sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss"; + hash = "sha256-Wotxzf6kutYv1F6q71eJVojVJsATJ81war/w4K1A848="; jdk = jdk8.jre; mainProgram = "charles"; } diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix deleted file mode 100644 index 1449e5040fd4..000000000000 --- a/pkgs/applications/networking/cloudflared/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ - lib, - stdenv, - buildGoModule, - fetchFromGitHub, - callPackage, - gitUpdater, -}: - -let - # https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250 - # buildGoModule = buildGoModule.override { - # go = buildPackages.go_1_22.overrideAttrs { - # pname = "cloudflare-go"; - # version = "1.22.2-devel-cf"; - # src = fetchFromGitHub { - # owner = "cloudflare"; - # repo = "go"; - # rev = "ec0a014545f180b0c74dfd687698657a9e86e310"; - # sha256 = "sha256-oQQ9Jyh8TphZSCaHqaugTL7v0aeZjyOdVACz86I2KvU="; - # }; - # }; - # }; -in - -buildGoModule rec { - pname = "cloudflared"; - version = "2025.2.1"; - - src = fetchFromGitHub { - owner = "cloudflare"; - repo = "cloudflared"; - tag = version; - hash = "sha256-RiHEUs1I9ErYBQF28la6kqU3BW968PVT+K7uGUVr6Ec="; - }; - - vendorHash = null; - - ldflags = [ - "-s" - "-w" - "-X main.Version=${version}" - "-X github.com/cloudflare/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=nixpkgs" - ]; - - preCheck = '' - # Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory - export HOME="$(mktemp -d)" - - # Workaround for: protocol_test.go:11: - # lookup protocol-v2.argotunnel.com on [::1]:53: read udp [::1]:51876->[::1]:53: read: connection refused - substituteInPlace "edgediscovery/protocol_test.go" \ - --replace "TestProtocolPercentage" "SkipProtocolPercentage" - - # Workaround for: origin_icmp_proxy_test.go:46: - # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied - substituteInPlace "ingress/origin_icmp_proxy_test.go" \ - --replace "TestICMPRouterEcho" "SkipICMPRouterEcho" - - # Workaround for: origin_icmp_proxy_test.go:110: - # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied - substituteInPlace "ingress/origin_icmp_proxy_test.go" \ - --replace "TestConcurrentRequestsToSameDst" "SkipConcurrentRequestsToSameDst" - - # Workaround for: origin_icmp_proxy_test.go:242: - # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied - substituteInPlace "ingress/origin_icmp_proxy_test.go" \ - --replace "TestICMPRouterRejectNotEcho" "SkipICMPRouterRejectNotEcho" - - # Workaround for: origin_icmp_proxy_test.go:108: - # Received unexpected error: cannot create ICMPv4 proxy: Group ID 100 is not between ping group 65534 to 65534 nor ICMPv6 proxy: socket: permission denied - substituteInPlace "ingress/origin_icmp_proxy_test.go" \ - --replace "TestTraceICMPRouterEcho" "SkipTraceICMPRouterEcho" - - # Workaround for: icmp_posix_test.go:28: socket: permission denied - substituteInPlace "ingress/icmp_posix_test.go" \ - --replace "TestFunnelIdleTimeout" "SkipFunnelIdleTimeout" - - # Workaround for: icmp_posix_test.go:88: Received unexpected error: Group ID 100 is not between ping group 65534 to 65534 - substituteInPlace "ingress/icmp_posix_test.go" \ - --replace "TestReuseFunnel" "SkipReuseFunnel" - - # Workaround for: manager_test.go:197: - # Should be false - substituteInPlace "datagramsession/manager_test.go" \ - --replace "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions" - ''; - - doCheck = !stdenv.hostPlatform.isDarwin; - - passthru = { - tests.simple = callPackage ./tests.nix { inherit version; }; - updateScript = gitUpdater { }; - }; - - meta = with lib; { - description = "Cloudflare Tunnel daemon, Cloudflare Access toolkit, and DNS-over-HTTPS client"; - homepage = "https://www.cloudflare.com/products/tunnel"; - changelog = "https://github.com/cloudflare/cloudflared/releases/tag/${version}"; - license = licenses.asl20; - platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ - bbigras - enorris - thoughtpolice - piperswe - qjoly - ]; - mainProgram = "cloudflared"; - # cloudflared requires a fork of go 1.22 to build (see override above), - # but go 1.22 is EOL and the toolchain has been removed from nixpkgs. - broken = true; - }; -} diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 14f88767f34b..4da964a3c7bf 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -14,16 +14,16 @@ builtins.mapAttrs }: buildGoModule rec { inherit pname; - version = "3.29.1"; + version = "3.29.3"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-e/xyrFJ9t+awpU8u8uYmXFRnk92/06vI5OoClyAMKTU="; + hash = "sha256-JK/iKVLXT8h+xZpkjVBEI8vfgRuoTHwWaoKikjBsJgI="; }; - vendorHash = "sha256-OP3J2NE491Aivzo80OmLAyQGe3hixLTz0p9FSA897ao="; + vendorHash = "sha256-dkBOhuX/tf+emLLeZ+7fI+z1pKwZLD0ZqZNxUMS32NE="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index be96dfdbe562..205e412c3cee 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cni"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - hash = "sha256-ocSc1fhbBB8YRxVVOvYMombOOkLMdfv9V4GYbf8kwIE="; + hash = "sha256-xeajsM8ZIlI6Otv9CQhPfYaVQwmJ5QcFEn1xt6e/ivQ="; }; - vendorHash = "sha256-/aPx8NgGkJ1irU0LGzmYTlsiX2U5or24Vl1PGHWuDyE="; + vendorHash = "sha256-uo3ZwFdD6aJ0WDGmt51l3hs9agUnv1cIQY/KMlNe5nI="; subPackages = [ "./cnitool" diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 085d688e51bd..11bfe5498ce3 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.6.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-thtN7po5SToM0ZFYIbycaPJTafLvk9hFV4XFGOpWmpg="; + hash = "sha256-S1BpOLPmWxaemPHTqZsYwGMH5KM1bPALcl78waZ0TBE="; }; vendorHash = null; @@ -53,6 +53,6 @@ buildGoModule rec { homepage = "https://www.cni.dev/plugins/"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ ] ++ teams.podman.members; + teams = [ teams.podman ]; }; } diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index e7edb3ebee33..d5aa2727ab0f 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,21 +1,21 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, installShellFiles, testers, - kubernetes-helm, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "kubernetes-helm"; - version = "3.17.2"; + version = "3.17.3"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; - rev = "v${version}"; - sha256 = "sha256-EMvKmnf4KfimjPYHoylij2kZVnvClK3Q/+offZvlO1I="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-1mOOG3MNFROnuZVUvLuspqNUUUctm6QDpCXP/6Di9H0="; }; vendorHash = "sha256-IX4zZnu8+cb2mJxQHOmZLUVxyqfWvbsRQR3q02Wpx6c="; @@ -23,8 +23,8 @@ buildGoModule rec { ldflags = [ "-w" "-s" - "-X helm.sh/helm/v3/internal/version.version=v${version}" - "-X helm.sh/helm/v3/internal/version.gitCommit=${src.rev}" + "-X helm.sh/helm/v3/internal/version.version=v${finalAttrs.version}" + "-X helm.sh/helm/v3/internal/version.gitCommit=${finalAttrs.src.rev}" ]; preBuild = '' @@ -57,7 +57,7 @@ buildGoModule rec { ''; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/helm completion bash > helm.bash $out/bin/helm completion zsh > helm.zsh $out/bin/helm completion fish > helm.fish @@ -65,9 +65,9 @@ buildGoModule rec { ''; passthru.tests.version = testers.testVersion { - package = kubernetes-helm; + package = finalAttrs.finalPackage; command = "helm version"; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; meta = with lib; { @@ -84,4 +84,4 @@ buildGoModule rec { techknowlogick ]; }; -} +}) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix index f62421e7329b..825b8e1f7780 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix @@ -43,6 +43,6 @@ buildGoModule rec { description = "Helm plugin to push chart package to ChartMuseum"; homepage = "https://github.com/chartmuseum/helm-push"; license = licenses.asl20; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 2f9545fbdc6c..86c8ce061745 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.10.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - hash = "sha256-vRngZigXOyxdx9bG2uWpeQ0ASTW+4tKuQWZ1Vm47Y+k="; + hash = "sha256-mEGW18oM75ikUhp3jsS6TefFhGi7AMjMpwyKsMe6qVc="; }; - vendorHash = "sha256-kotV3GC2ilq258cLVGOzBTHb0koWfn92Acl0L8rRi5I="; + vendorHash = "sha256-8k45W6US0xVSPE/17mdz0izpkbvlGuP8lv8G6ycO6yQ="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 90253a131ffe..b2d11d046a42 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "4.6.3"; + version = "4.6.4"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-5vsUyeQH/kCaHo7aze1xA1NVLXrxpFB19P708ikKTpg="; + hash = "sha256-PvWHxcxNSCI5RX830+b61fiyi0WX8ujEJzjyUOXp+iA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index e7e7bdc155a2..ca8a00403dff 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.171.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-zZt0YxGbDqIhg2tXjQo5QnD09ASOUgFyQ1uWbGcujkc="; + hash = "sha256-xLVUyzRl6Q9GJOoYJCo1pbYxheVjEvnQIa4BMJVR9PY="; }; - vendorHash = "sha256-sGqnM40Y1nr9dXcSSC1lkwh1ToRLpCMiWJhyMcxxH9U="; + vendorHash = "sha256-biFRdHnOvxd2hgTGPotZtlmbyqNrkW8f158kjAuLkuA="; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix deleted file mode 100644 index 7f65917312ed..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz"; - sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz"; - sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1"; - }; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json deleted file mode 100644 index b045a685e530..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "b3b340da3d88c6723f18cf6219edf50745d5a749cb552bd2d3eee0b1281dd5a2" - }, - "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "571f0addf5253ed0e98864157c885fbd14fc67f8efcfd638cc36ade48f903b8c" - }, - "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "f2fc003d8ec5c1ac66d0eeb9e410a443a0af3f5b23367d3578c55c6e9e0c618a" - }, - "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-images.txt", - "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1" - } -} diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix deleted file mode 100644 index 43fa8d0ff1e0..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - k3sVersion = "1.29.15+k3s1"; - k3sCommit = "35a47239188444222067c25cc096346adb20401f"; - k3sRepoSha256 = "0vynlcnmhhf82hr2rv01km5jyp2c2zb7872nnd8kzdxdw3jcqp7x"; - k3sVendorHash = "sha256-+es8ua7JuDnUXej6hqE1ooFS81NhuoYYuA2+4CgUOmU="; - chartVersions = import ./chart-versions.nix; - imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.14.1"; - k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; - k3sCNIVersion = "1.6.0-k3s1"; - k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; - containerdVersion = "1.7.26-k3s1"; - containerdSha256 = "0snz0i7xmnvs8bj7140q0lsxqdv835hksvk36baw71w5mbm1w1xz"; - criCtlVersion = "1.29.0-k3s1"; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json index 651e9a4ccdc1..1f7ace104885 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "aba20bf6082fdccafc36c1ba79ba2705b2ef6f159a3455585c98cf128e767986" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1c5efab645244d13cda7111a456aff796dfb4645c845df82266c4da56d3db2a7" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "658aa3c0672f2eb3305b262a7187d0fa7fa2759dccdca196612472a9fcc4fd48" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "df41354c497c8c2514b247c237415d721fb1381bb821c00af59526ba2ef1e8e8" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "f92a63c9f570afd4a9f33b69a441ce057ee4d31359026e9b699f519ae7b8a81a" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "041a626ab65e9f61bdc67e664649bc8dc434cc9f89da15611660967a1d156fa3" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-images.txt", - "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-images.txt", + "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index 23ce5c92fc2e..0b1653cd6653 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.30.11+k3s1"; - k3sCommit = "c2662fbee6d24b3917cf078cbf2ff69cae501340"; - k3sRepoSha256 = "0zsl5p2dmj3mkcjxbrhsa40r8bhgcrql8r8cxach4nv6y7fcyan5"; - k3sVendorHash = "sha256-G7RUyFzg3B4X0tdKmD1ep9a4cnVkUmFqBP5t1s8uFLc="; + k3sVersion = "1.30.12+k3s1"; + k3sCommit = "f9dbf16e17a6db90b64583316d9c321180e9c062"; + k3sRepoSha256 = "0d0kbbf6c6gv2s0w8m7br6vxcid48g8hirmszksd3g4brix3yxz2"; + k3sVendorHash = "sha256-FQu2Chk463c+/VYcOhfU8xIxm/ZNe1GumkEH/u2DIt0="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json index 2784691c211d..9c0007b99bda 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "2666c3880447979079b94babccf12296706167a5747a0f94962b257bda442449" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "b165c30ccff774f95019f70e200e59d3eea8a3b7fc63c64c07d839c1feb48357" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "6698d8bcfb029f1d16e0f2aa1d53be09d026995d26a0e4bfd92292f49c68538b" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "9adfe524ab0bb53d0753dc92759e7f2847e5ce75b88966544da16b5c37605da8" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "0c96ae243b40bb624f9cb34e2851c9cffc77e1ed0127b3e81a2e4a0ff56511a5" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "26ab12d269a619df5d21464e6b1fa539b7c7b2f039737f656683d59eb71f83ac" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-images.txt", - "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-images.txt", + "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix index a689a6065a33..495e9258de05 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.31.7+k3s1"; - k3sCommit = "e050ca66d129762a00599628e6f55cfdfab3a7ba"; - k3sRepoSha256 = "1q531x745ypc08wp43yf0mh0r90gpi6r8bqbmgpvx0nvv9gwn8sb"; - k3sVendorHash = "sha256-WQPXRwW50/6e1MPnuQCAICROVlrMfARUdHJAgJ7UwQQ="; + k3sVersion = "1.31.8+k3s1"; + k3sCommit = "33429f764d560f617c049e4ebb323c00963419c0"; + k3sRepoSha256 = "0dpp3gi2g4qqi0szz53j9z06bcgkdzh3c64651d8zjjj151rmhwv"; + k3sVendorHash = "sha256-vQQGJOFNO2rCJ/UWxWYgH617DctCmTF6eqH7Yq5T+2Q="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json index 0e30a88e86ec..fe7dd8574860 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "2c81a3f3527c590180cd71717ea23d83d023669b38439720fdce62fe23543536" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "2c27bf09b90459947dff497ca5028adefa8f8f3d2ae96a3164c11b8a5ed3bb86" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "97ae9c9825844a0fc034b8a4cb35e739cf10991e633ad2a586899d2a5aa6492d" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "5a3b7228988bfe725b6bfca0a8cf357dc4fe474ea910663a29d2fe58ab8065c9" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "80423c5023a7d2e3ad65e59293e46a01f5d5679c371a444d76a86b1cd2f474d1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "3b9131e8f51b9e8b9c1a1ceb5e51ebc245959aa50446def1a4323cf9340dfe0c" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-images.txt", - "sha256": "11373c7d60ed0db9b761b07b80b66240b426bef0ecc34d6f1ac91cd9d1ff085e" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-images.txt", + "sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix index f5aa4ee5a829..976a65943bc3 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.32.3+k3s1"; - k3sCommit = "079ffa8d99fb859cb8c001455e47efa65535d832"; - k3sRepoSha256 = "1cvd0668ca06ahhmkhrxwymfpssw75rjfv5n9yajzg1dmkv0cmrv"; - k3sVendorHash = "sha256-1Kd6gt1envXmzFAtwhjPe9LLsllt2bQ7sryamGcaLRs="; + k3sVersion = "1.32.4+k3s1"; + k3sCommit = "6b330558e47a257134434508c851193bb4e9bf9d"; + k3sRepoSha256 = "1ss7w5b5k7hjd9szx7p7cqvdqddb71iddqsf6dxkk9r1g5z7sbs5"; + k3sVendorHash = "sha256-e7uLDjCR/q04HwOHTb1E5gGiwKDN2Hbxmym7qJxfpWU="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; diff --git a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix new file mode 100644 index 000000000000..f511cbde3870 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-34.2.1+up34.2.0.tgz"; + sha256 = "0bnvkp1bxfsccgdnvpq3ni3p2h8jyvj0iclbqj0rsls8vv1jnp9z"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz"; + sha256 = "16ljy2ncn2kc4kr3m93w2kfw4vjk8is3cp3i2lx4b7afbmi75zyw"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json new file mode 100644 index 000000000000..5d212c7f9e0e --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json @@ -0,0 +1,18 @@ +{ + "airgap-images-amd64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "2822af9a2341033243bd1aff7433c0670bcad4059a8d0a35fb314dba24692674" + }, + "airgap-images-arm": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "cf175be8674dd1812cd92930a852ef7a11572c4588180f51d5c19bdfd0a810e4" + }, + "airgap-images-arm64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "c97f7a86a04aad7d5dc74d7e85e0fbc097e9edf76358f8a7c2097e6ca9740211" + }, + "images-list": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.0%2Bk3s1/k3s-images.txt", + "sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix new file mode 100644 index 000000000000..be10b6dd7b6a --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix @@ -0,0 +1,15 @@ +{ + k3sVersion = "1.33.0+k3s1"; + k3sCommit = "63ab8e534cdfce2a60f4b016dfedb4f8d74ae8ec"; + k3sRepoSha256 = "1ysfzb4216qk9gjmp2zp103xzjgz8irc7h9m4yp041gkvffa7pyg"; + k3sVendorHash = "sha256-eVMCrOAOCB7saYuxQQUUrmRHT+ZURXESTI6ZRKSDGZs="; + chartVersions = import ./chart-versions.nix; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); + k3sRootVersion = "0.14.1"; + k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; + k3sCNIVersion = "1.6.0-k3s1"; + k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; + containerdVersion = "2.0.4-k3s4"; + containerdSha256 = "05j5jyjnirks11z2930w4k5ij015hsm4pd2wxgj2531fyiy98azl"; + criCtlVersion = "1.31.0-k3s2"; +} diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 285b6c4e4c17..8cbb824230f0 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -41,6 +41,7 @@ lib: ethtool, fetchFromGitHub, fetchgit, + fetchpatch, fetchurl, fetchzip, findutils, @@ -69,7 +70,7 @@ lib: sqlite, stdenv, systemd, - util-linux, + util-linuxMinimal, yq-go, zstd, }: @@ -99,7 +100,7 @@ let description = "Lightweight Kubernetes distribution"; license = lib.licenses.asl20; homepage = "https://k3s.io"; - maintainers = lib.teams.k3s.members; + teams = [ lib.teams.k3s ]; platforms = lib.platforms.linux; # resolves collisions with other installations of kubectl, crictl, ctr @@ -331,6 +332,17 @@ let ldflags = versionldflags; }).overrideAttrs overrideContainerdAttrs; + + # TODO (#405952): remove this patch. We had to add it to avoid a mass rebuild + # for the 25.05 release. Once the above PR is merged, switch back to plain util-linuxMinimal. + k3sUtilLinux = util-linuxMinimal.overrideAttrs (prev: { + patches = + prev.patches or [ ] + ++ lib.singleton (fetchpatch { + url = "https://github.com/util-linux/util-linux/commit/7dbfe31a83f45d5aef2b508697e9511c569ffbc8.patch"; + hash = "sha256-bJqpZiPli5Pm/XpDA445Ab5jesXrlcnaO6e4V0B3rSw="; + }); + }); in buildGoModule rec { pname = "k3s"; @@ -377,7 +389,7 @@ buildGoModule rec { ipset bridge-utils ethtool - util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + k3sUtilLinux # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 conntrack-tools runc bash diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 46d911e4efe9..e174741f2e1a 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,16 +12,6 @@ let extraArgs = builtins.removeAttrs args [ "callPackage" ]; in { - k3s_1_29 = common ( - (import ./1_29/versions.nix) - // { - updateScript = [ - ./update-script.sh - "29" - ]; - } - ) extraArgs; - k3s_1_30 = common ( (import ./1_30/versions.nix) // { @@ -51,4 +41,14 @@ in ]; } ) extraArgs; + + k3s_1_33 = common ( + (import ./1_33/versions.nix) + // { + updateScript = [ + ./update-script.sh + "33" + ]; + } + ) extraArgs; } diff --git a/pkgs/applications/networking/cluster/k3s/docs/USAGE.md b/pkgs/applications/networking/cluster/k3s/docs/USAGE.md index 326118e1712a..e3f3dfb8d38c 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/USAGE.md +++ b/pkgs/applications/networking/cluster/k3s/docs/USAGE.md @@ -28,6 +28,7 @@ Multi-node setup it is simple to create a cluster of multiple nodes in a highly available setup (all nodes are in the control-plane and are a part of the etcd cluster). The first node is configured like this: + ``` { services.k3s = { @@ -55,3 +56,11 @@ Any other subsequent nodes can be added with a slightly different config: For this to work you need to open the aforementioned API, etcd, and flannel ports in the firewall. Official documentation on what ports need to be opened for specific use cases can be found on [k3s' documentation site](https://docs.k3s.io/installation/requirements#inbound-rules-for-k3s-nodes). Note that it is [recommended](https://etcd.io/docs/v3.3/faq/#why-an-odd-number-of-cluster-members) to use an odd number of nodes in such a cluster. Tip: If you run into connectivity issues between nodes for specific applications (e.g. ingress controller), please verify the firewall settings you have enabled (example under [Single Node](#single-node)) against the documentation for that specific application. In the ingress controller example, you may want to open 443 or 80 depending on your use case. + +## Quirks + +### `prefer-bundled-bin` + +K3s has a config setting `prefer-bundled-bin` (and CLI flag `--prefer-bundled-bin`) that makes k3s use binaries from the `/var/lib/rancher/k3s/data/current/bin/aux/` directory, as unpacked by the k3s binary, before the system `$PATH`. +This works with the official distribution of k3s but not with the package from nixpkgs, as it does not bundle the upstream binaries from [`k3s-root`](https://github.com/k3s-io/k3s-root) into the k3s binary. +Thus the `prefer-bundled-bin` setting **cannot** be used to work around issues (like [this `mount` regression](https://github.com/util-linux/util-linux/issues/3474)) with binaries used/called by the kubelet. diff --git a/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md b/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md index 26ec48e0273c..4e31e798beb8 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md +++ b/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md @@ -33,7 +33,7 @@ Note here we are pointing the nvidia runtime to "/run/current-system/sw/bin/nvid Now apply the following runtime class to k3s cluster: -``` +```yaml apiVersion: node.k8s.io/v1 handler: nvidia kind: RuntimeClass @@ -43,9 +43,12 @@ metadata: name: nvidia ``` -Following [k8s-device-plugin](https://github.com/NVIDIA/k8s-device-plugin#deployment-via-helm) install the helm chart with `runtimeClassName: nvidia` set. In order to passthrough the nvidia card into the container, your deployments spec must contain - runtimeClassName: nvidia - env: +Following [k8s-device-plugin](https://github.com/NVIDIA/k8s-device-plugin#deployment-via-helm) install the helm chart with `runtimeClassName: nvidia` set. In order to passthrough the nvidia card into the container, your deployments spec must contain -``` +```yaml +runtimeClassName: nvidia +# for each container + env: - name: NVIDIA_VISIBLE_DEVICES value: all - name: NVIDIA_DRIVER_CAPABILITIES diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index 8dc14006ee0f..7339b2ec4e97 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused jq nurl yq-go +#!nix-shell -i bash -p curl git gnugrep gnused go jq nurl yq-go set -x -eu -o pipefail @@ -35,6 +35,8 @@ cd "$K3S_STORE_PATH" # Set the DRONE variables as they are expected to be set in version.sh DRONE_TAG="$LATEST_TAG_NAME" DRONE_COMMIT="$K3S_COMMIT" +NO_DAPPER=1 # Skips git_version.sh execution in scripts/version.sh#L8 +source "${K3S_STORE_PATH}/scripts/git_version.sh" source "${K3S_STORE_PATH}/scripts/version.sh" K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \ diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index 6866703b4454..23496281ce2f 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -3,25 +3,22 @@ stdenv, rustPlatform, fetchFromGitHub, - Security ? null, versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "kubectl-view-allocations"; - version = "0.20.5"; + version = "0.21.1"; src = fetchFromGitHub { owner = "davidB"; repo = "kubectl-view-allocations"; tag = version; - hash = "sha256-Y+Yki0wTi/OTWbUvk+8EhTlhF7H51RrdFLFXk2VqF1M="; + hash = "sha256-1bE2idLPok6YmB1qyTDQmBg+uzc6/Sza75dSN7QpEcI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6sRpsXydzKB0ZaV1HeagINgb6ol9dj3XT0+pd53QOCw="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + cargoHash = "sha256-QAjANg8os3RID0Lrl7qGEvxT/1i8UBwVfK0G4PHwrXA="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 541bf4d25e01..caa36547429c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -9,6 +9,7 @@ runtimeShell, kubectl, nixosTests, + nix-update-script, components ? [ "cmd/kubelet" @@ -19,15 +20,15 @@ ], }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "kubernetes"; - version = "1.32.3"; + version = "1.33.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; - rev = "v${version}"; - hash = "sha256-kF3Oo+YETnsrFPWBO5b7nH2A2eONIOkE84+u6vOSrpE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5MlMBsYf8V7BvV6xaeRMVSRaE+TpG8xJkMwVGm/fVdo="; }; vendorHash = null; @@ -95,15 +96,18 @@ buildGoModule rec { runHook postInstall ''; - meta = with lib; { - description = "Production-Grade Container Scheduling and Management"; - license = licenses.asl20; - homepage = "https://kubernetes.io"; - maintainers = with maintainers; [ ] ++ teams.kubernetes.members; - platforms = platforms.linux; + passthru = { + updateScript = nix-update-script { }; + tests = nixosTests.kubernetes // { + inherit kubectl; + }; }; - passthru.tests = nixosTests.kubernetes // { - inherit kubectl; + meta = { + description = "Production-Grade Container Scheduling and Management"; + license = lib.licenses.asl20; + homepage = "https://kubernetes.io"; + teams = [ lib.teams.kubernetes ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 45d3a58c16d2..e48913a33d1c 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "25.3.2"; - sha256 = "1l0sww0h3s1x9262rj801jk965p1c8bl92lns53yhkarv80cy03y"; - vendorHash = "sha256-9b98kz4jlkL6S4g/naOIiSazjo8twkk+PL4aXSWubfQ="; + version = "25.5.1"; + sha256 = "0wnj2v08j71aq8p3qx3k71xkbnr84vxgd3cidka7lxrj21hcbk0q"; + vendorHash = "sha256-dxTTxTwDWvcDJiwMtqg814oUx0TsUcon7Wx0sVIq26A="; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix deleted file mode 100644 index 438fb2cfde49..000000000000 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - lib, - stdenv, - buildGoModule, - fetchFromGitHub, - installShellFiles, - pkg-config, - which, - libvirt, - vmnet, - withQemu ? false, - qemu, - makeWrapper, - OVMF, -}: - -buildGoModule rec { - pname = "minikube"; - version = "1.34.0"; - - vendorHash = "sha256-gw5Ol7Gp26KyIaiMvwik8FJpABpMT86vpFnZnAJ6hhs="; - - doCheck = false; - - src = fetchFromGitHub { - owner = "kubernetes"; - repo = "minikube"; - rev = "v${version}"; - sha256 = "sha256-Z7x3MOQUF3a19X4SSiIUfSJ3xl3482eKH700m/9pqcU="; - }; - postPatch = - (lib.optionalString (withQemu && stdenv.hostPlatform.isDarwin) '' - substituteInPlace \ - pkg/minikube/registry/drvs/qemu2/qemu2.go \ - --replace "/usr/local/opt/qemu/share/qemu" "${qemu}/share/qemu" \ - --replace "/opt/homebrew/opt/qemu/share/qemu" "${qemu}/share/qemu" - '') - + (lib.optionalString (withQemu && stdenv.hostPlatform.isLinux) '' - substituteInPlace \ - pkg/minikube/registry/drvs/qemu2/qemu2.go \ - --replace "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ - --replace "/usr/share/AAVMF/AAVMF_CODE.fd" "${OVMF.firmware}" - ''); - - nativeBuildInputs = [ - installShellFiles - pkg-config - which - makeWrapper - ]; - - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ vmnet ] - else if stdenv.hostPlatform.isLinux then - [ libvirt ] - else - null; - - buildPhase = '' - make COMMIT=${src.rev} - ''; - - installPhase = '' - install out/minikube -Dt $out/bin - - wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false - export HOME=$PWD - - for shell in bash zsh fish; do - $out/bin/minikube completion $shell > minikube.$shell - installShellCompletion minikube.$shell - done - ''; - - meta = with lib; { - homepage = "https://minikube.sigs.k8s.io"; - description = "Tool that makes it easy to run Kubernetes locally"; - mainProgram = "minikube"; - license = licenses.asl20; - maintainers = with maintainers; [ - ebzzry - copumpkin - vdemeester - atkinschang - Chili-Man - ]; - }; -} diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 80b8f6ce03f2..8dc8c1bb8c44 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -1,5 +1,6 @@ { lib, + config, python3, emptyFile, }: @@ -28,23 +29,28 @@ let }; plugins = - ps: _super: with ps; rec { - nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; - nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; - nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; - nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; - nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; + ps: _super: + with ps; + ( + rec { + nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; + nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; + nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; + nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; + nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; - nixops-aws = throw "nixops-aws was broken and was removed from nixpkgs"; - nixops-gce = throw "nixops-gce was broken and was removed from nixpkgs"; - nixops-libvirtd = throw "nixops-libvirtd was broken and was removed from nixpkgs"; - nixops-hetzner = throw "nixops-hetzner was broken and was removed from nixpkgs"; - nixops-hetznercloud = throw "nixops-hetznercloud was broken and was removed from nixpkgs"; - - # aliases for backwards compatibility - nixops-virtd = nixops-libvirtd; - nixopsvbox = nixops-vbox; - }; + # aliases for backwards compatibility + nixopsvbox = nixops-vbox; + } + // lib.optionalAttrs config.allowAliases rec { + nixops-aws = throw "nixops-aws was broken and was removed from nixpkgs"; + nixops-gce = throw "nixops-gce was broken and was removed from nixpkgs"; + nixops-libvirtd = throw "nixops-libvirtd was broken and was removed from nixpkgs"; + nixops-hetzner = throw "nixops-hetzner was broken and was removed from nixpkgs"; + nixops-hetznercloud = throw "nixops-hetznercloud was broken and was removed from nixpkgs"; + nixops-virtd = nixops-libvirtd; + } + ); # We should not reapply the overlay, but it tends to work out. (It's been this way since poetry2nix was dropped.) availablePlugins = this.plugins this.python.pkgs this.python.pkgs; diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix index 215423e3ad59..d4c521bffe22 100644 --- a/pkgs/applications/networking/cluster/rke2/builder.nix +++ b/pkgs/applications/networking/cluster/rke2/builder.nix @@ -44,126 +44,123 @@ lib: nixosTests, testers, }: -let - rke2 = buildGoModule rec { - pname = "rke2"; - version = rke2Version; +buildGoModule (finalAttrs: { + pname = "rke2"; + version = rke2Version; - src = fetchzip { - url = "https://github.com/rancher/rke2/archive/refs/tags/v${rke2Version}.tar.gz"; - hash = "${rke2TarballHash}"; - }; - - vendorHash = rke2VendorHash; - - nativeBuildInputs = [ makeWrapper ]; - - # Important utilities used by the kubelet. - # See: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 - # Notice the list in that issue is stale, but as a redundancy reservation. - buildInputs = [ - procps # pidof pkill - coreutils # uname touch env nice du - util-linux # lsblk fsck mkfs nsenter mount umount - ethtool # ethtool - socat # socat - iptables # iptables iptables-restore iptables-save - bridge-utils # brctl - iproute2 # ip tc - kmod # modprobe - lvm2 # dmsetup - ]; - - # Passing boringcrypto to GOEXPERIMENT variable to build with goboring library - GOEXPERIMENT = "boringcrypto"; - - # See: https://github.com/rancher/rke2/blob/e7f87c6dd56fdd76a7dab58900aeea8946b2c008/scripts/build-binary#L27-L38 - ldflags = [ - "-w" - "-X github.com/k3s-io/k3s/pkg/version.GitCommit=${lib.substring 0 6 rke2Commit}" - "-X github.com/k3s-io/k3s/pkg/version.Program=${pname}" - "-X github.com/k3s-io/k3s/pkg/version.Version=v${version}" - "-X github.com/k3s-io/k3s/pkg/version.UpstreamGolang=go${go.version}" - "-X github.com/rancher/rke2/pkg/images.DefaultRegistry=docker.io" - "-X github.com/rancher/rke2/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${etcdVersion}" - "-X github.com/rancher/rke2/pkg/images.DefaultKubernetesImage=rancher/hardened-kubernetes:${k8sImageTag}" - "-X github.com/rancher/rke2/pkg/images.DefaultPauseImage=rancher/mirrored-pause:${pauseVersion}" - "-X github.com/rancher/rke2/pkg/images.DefaultRuntimeImage=rancher/rke2-runtime:${dockerizedVersion}" - "-X github.com/rancher/rke2/pkg/images.DefaultCloudControllerManagerImage=rancher/rke2-cloud-provider:${ccmVersion}" - ]; - - tags = [ - "no_cri_dockerd" - "no_embedded_executor" - "no_stage" - "sqlite_omit_load_extension" - "selinux" - "netgo" - "osusergo" - ]; - - subPackages = [ "." ]; - - installPhase = '' - install -D $GOPATH/bin/rke2 $out/bin/rke2 - wrapProgram $out/bin/rke2 \ - --prefix PATH : ${lib.makeBinPath buildInputs} - - install -D ./bundle/bin/rke2-killall.sh $out/bin/rke2-killall.sh - wrapProgram $out/bin/rke2-killall.sh \ - --prefix PATH : ${ - lib.makeBinPath [ - systemd - gnugrep - gnused - ] - } \ - --prefix PATH : ${lib.makeBinPath buildInputs} - ''; - - doCheck = false; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - # Verify that the binary uses BoringCrypto - go tool nm $out/bin/.rke2-wrapped | grep '_Cfunc__goboringcrypto_' > /dev/null - runHook postInstallCheck - ''; - - passthru = { - inherit updateScript; - tests = - let - moduleTests = - let - package_version = - "rke2_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor rke2Version); - in - lib.mapAttrs (name: value: nixosTests.rke2.${name}.${package_version}) nixosTests.rke2; - in - { - version = testers.testVersion { - package = rke2; - version = "v${version}"; - }; - } - // moduleTests; - } // (lib.mapAttrs (_: value: fetchurl value) imagesVersions); - - meta = with lib; { - homepage = "https://github.com/rancher/rke2"; - description = "RKE2, also known as RKE Government, is Rancher's next-generation Kubernetes distribution"; - changelog = "https://github.com/rancher/rke2/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ - rorosen - zimbatm - zygot - ]; - mainProgram = "rke2"; - platforms = platforms.linux; - }; + src = fetchzip { + url = "https://github.com/rancher/rke2/archive/refs/tags/v${rke2Version}.tar.gz"; + hash = "${rke2TarballHash}"; }; -in -rke2 + + vendorHash = rke2VendorHash; + + nativeBuildInputs = [ makeWrapper ]; + + # Important utilities used by the kubelet. + # See: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 + # Notice the list in that issue is stale, but as a redundancy reservation. + buildInputs = [ + procps # pidof pkill + coreutils # uname touch env nice du + util-linux # lsblk fsck mkfs nsenter mount umount + ethtool # ethtool + socat # socat + iptables # iptables iptables-restore iptables-save + bridge-utils # brctl + iproute2 # ip tc + kmod # modprobe + lvm2 # dmsetup + ]; + + # Passing boringcrypto to GOEXPERIMENT variable to build with goboring library + GOEXPERIMENT = "boringcrypto"; + + # See: https://github.com/rancher/rke2/blob/e7f87c6dd56fdd76a7dab58900aeea8946b2c008/scripts/build-binary#L27-L38 + ldflags = [ + "-w" + "-X github.com/k3s-io/k3s/pkg/version.GitCommit=${lib.substring 0 6 rke2Commit}" + "-X github.com/k3s-io/k3s/pkg/version.Program=${finalAttrs.pname}" + "-X github.com/k3s-io/k3s/pkg/version.Version=v${finalAttrs.version}" + "-X github.com/k3s-io/k3s/pkg/version.UpstreamGolang=go${go.version}" + "-X github.com/rancher/rke2/pkg/images.DefaultRegistry=docker.io" + "-X github.com/rancher/rke2/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${etcdVersion}" + "-X github.com/rancher/rke2/pkg/images.DefaultKubernetesImage=rancher/hardened-kubernetes:${k8sImageTag}" + "-X github.com/rancher/rke2/pkg/images.DefaultPauseImage=rancher/mirrored-pause:${pauseVersion}" + "-X github.com/rancher/rke2/pkg/images.DefaultRuntimeImage=rancher/rke2-runtime:${dockerizedVersion}" + "-X github.com/rancher/rke2/pkg/images.DefaultCloudControllerManagerImage=rancher/rke2-cloud-provider:${ccmVersion}" + ]; + + tags = [ + "no_cri_dockerd" + "no_embedded_executor" + "no_stage" + "sqlite_omit_load_extension" + "selinux" + "netgo" + "osusergo" + ]; + + subPackages = [ "." ]; + + installPhase = '' + install -D $GOPATH/bin/rke2 $out/bin/rke2 + wrapProgram $out/bin/rke2 \ + --prefix PATH : ${lib.makeBinPath finalAttrs.buildInputs} + + install -D ./bundle/bin/rke2-killall.sh $out/bin/rke2-killall.sh + wrapProgram $out/bin/rke2-killall.sh \ + --prefix PATH : ${ + lib.makeBinPath [ + systemd + gnugrep + gnused + ] + } \ + --prefix PATH : ${lib.makeBinPath finalAttrs.buildInputs} + ''; + + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + # Verify that the binary uses BoringCrypto + go tool nm $out/bin/.rke2-wrapped | grep '_Cfunc__goboringcrypto_' > /dev/null + runHook postInstallCheck + ''; + + passthru = { + inherit updateScript; + tests = + let + moduleTests = + let + package_version = + "rke2_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor rke2Version); + in + lib.mapAttrs (name: value: nixosTests.rke2.${name}.${package_version}) nixosTests.rke2; + in + { + version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "v${finalAttrs.version}"; + }; + } + // moduleTests; + } // (lib.mapAttrs (_: value: fetchurl value) imagesVersions); + + meta = with lib; { + homepage = "https://github.com/rancher/rke2"; + description = "RKE2, also known as RKE Government, is Rancher's next-generation Kubernetes distribution"; + changelog = "https://github.com/rancher/rke2/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ + rorosen + zimbatm + zygot + ]; + mainProgram = "rke2"; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix deleted file mode 100644 index e10ba0c7e28f..000000000000 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - installShellFiles, - testers, - roxctl, -}: - -buildGoModule rec { - pname = "roxctl"; - version = "4.7.1"; - - src = fetchFromGitHub { - owner = "stackrox"; - repo = "stackrox"; - rev = version; - sha256 = "sha256-AQaMWpI7kFFotEQa536dqKxuP/mHuzNm75RPqUWw1VY="; - }; - - vendorHash = "sha256-v2aLKU6FBkJqenWzftKmngeXvQBPR03RPR0WcmOiYD0="; - - nativeBuildInputs = [ installShellFiles ]; - - subPackages = [ "roxctl" ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/stackrox/rox/pkg/version/internal.MainVersion=${version}" - ]; - - postInstall = '' - installShellCompletion --cmd roxctl \ - --bash <($out/bin/roxctl completion bash) \ - --fish <($out/bin/roxctl completion fish) \ - --zsh <($out/bin/roxctl completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = roxctl; - command = "roxctl version"; - }; - - meta = with lib; { - description = "Command-line client of the StackRox Kubernetes Security Platform"; - mainProgram = "roxctl"; - license = licenses.asl20; - homepage = "https://www.stackrox.io"; - maintainers = with maintainers; [ stehessel ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index b20c1b54dbcf..b87d7d33db22 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildGoModule, + buildGo123Module, fetchFromGitHub, fetchFromGitLab, callPackage, @@ -96,6 +97,7 @@ let # These are the providers that don't fall in line with the default model special-providers = { + aws = automated-providers.aws.override { mkProviderGoModule = buildGo123Module; }; # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely. checkly = automated-providers.checkly.override { spdx = "MIT"; }; gitlab = automated-providers.gitlab.override { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2255f3c544dc..ce7f37fcf97e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,21 +1,21 @@ { "aci": { - "hash": "sha256-f4hgHFJgRUG+mhRgD7GMtkXoYkzAbkxxMIzvGLS0ums=", + "hash": "sha256-NS5q6ElCGEGSceOCIVudKE6m6EzXMV/3HGHHXwYopOA=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.15.0", + "rev": "v2.16.0", "spdx": "MPL-2.0", "vendorHash": null }, "acme": { - "hash": "sha256-0iFJ6+7IpEExvjiC301PaVHWUuxqPlYjkMzwDJ1BzQo=", + "hash": "sha256-GpuIh2wRLv95EIF6Jhw43DZEqtECeVD3XZxMq9Ro3+s=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.31.0", + "rev": "v2.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-P3yrAfuYvN/sapQGj6fBYQtsScacIJW6JLBq+MOJlVc=" + "vendorHash": "sha256-fttldhDW9/MeWe7MVQqz8mFI2EuOkxMZg1CZ/+8ySFU=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -27,22 +27,22 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-tfkJ86MwXEvWfrUGL4yrHNoMeBWqEtQwCHhvuGRNU4o=", + "hash": "sha256-XZXyeWSgJ5h+dkxYNqb49BrdlmpbfMIxY7UgP2yAtoI=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.37.0", + "rev": "v4.40.0", "spdx": "MIT", - "vendorHash": "sha256-bviZHOxZajmx++SG6k/mkjHCa4Q7jMY7CaLUele/jgw=" + "vendorHash": "sha256-T2yIUO8DAuUC5s/bBxgsn99fCjJO1y6TzmPTuhT08FY=" }, "akamai": { - "hash": "sha256-MZF4yTG4wiFeOi4NLItQmxZ9ZcgHCryFpxpGy2jQYE8=", + "hash": "sha256-ivIJvWKfL9oYvLZeoErvYKuCZLEwNaZD7jFrIGPlurI=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v7.0.0", + "rev": "v7.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NO7e8S+UhbbGWeBm4+bzm6HqqA3G3WZwj3wJmug0aSA=" + "vendorHash": "sha256-Sp65odS8Axdv5UpA5j2SXvbC/rfet4GlIawxk054Cs4=" }, "alicloud": { "hash": "sha256-Jn4VzU6aPhMv6eMmXQ5gD5SA9IZfpmkRKpTrjRGrNF8=", @@ -63,13 +63,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { - "hash": "sha256-q2Ougw8U6kapeGWBLhsvrRMW8/kGhE0eTV35kPHrN5g=", + "hash": "sha256-nR8bgFvhENwC3L3w580FBtDK5l8WDfJqxDQZeUvWyl0=", "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", "repo": "terraform-provider-archive", - "rev": "v2.7.0", + "rev": "v2.7.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-51bLi7cqy7iUt9Aocog7OOKYWSdGbQEoZzasUpDuHu4=" + "vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug=" }, "argocd": { "hash": "sha256-3a/g1SbgeMWFMNTY/sYrItyE1rRimdNro8nu9wPTf6M=", @@ -90,13 +90,13 @@ "vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c=" }, "auth0": { - "hash": "sha256-5HiSoU3wxUtu2nsrq7h5cbqIenRMH2MpRfGJNqk8guI=", + "hash": "sha256-T8Ob7wv/GgAR+5/AoD0SJ0k+xRvpK5lTWKrhJkme2wg=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.14.0", + "rev": "v1.19.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-gD5HWmmy5P5yQH7UfzehDpxjB47aPfiUFDlQSY4BsVM=" + "vendorHash": "sha256-8jUEFJz2m8orL4n/w+c+hzwiQJkZia9TpVfYhkgyrrY=" }, "avi": { "hash": "sha256-e8yzc3nRP0ktcuuKyBXydS9NhoceYZKzJcqCWOfaPL0=", @@ -117,29 +117,29 @@ "vendorHash": null }, "aws": { - "hash": "sha256-4vRXU7FtSMrh/Zou3+agXqXXARFdZ0h6hxglKlY9+YU=", + "hash": "sha256-wTig0NyANYdITXus9FB7WGQ6BQED7jaVhBYgDzZaU5g=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.90.0", + "rev": "v5.97.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zjb8SQ6ALQryN7wE4MKn3nhhqEvoeq8CyZd8PlkZJt4=" + "vendorHash": "sha256-iYVzLsyX17GYd05CTqCMpEy1oDCiNi5F4Xiu0Lp9nTg=" }, "azuread": { - "hash": "sha256-xU6fsJIWl9WNzmZIK8qAB4ih4wcgiICdfYbgnCLNA1Y=", + "hash": "sha256-64afLKTgJ58O9GUv3GRTJKw7xgg0cglIv3EvARsxnn0=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v3.2.0", + "rev": "v3.3.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-wM/oWLOAB6EhtUVTP+gHn+hpqhrISAsd31ili2hmLyQ=", + "hash": "sha256-u9rcky6sIFEfPI5WqyqQ0Z+p4wXuV6mv+mHtHbI8Zbc=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.24.0", + "rev": "v4.29.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -153,40 +153,40 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-YcQq0FK76XjF80yOjOMhDp+aRoFOewXObVksDAzQSh8=", + "hash": "sha256-n+vKQ6IE1PV/09OCeYj28o1YKVP0cCDCTYLLq/4PClg=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.21.12", + "rev": "v1.21.13", "spdx": "MPL-2.0", "vendorHash": null }, "bigip": { - "hash": "sha256-I77ERUEEBIwco1t/fCZ266gJ7G6GXIug+6Df0OC6XgU=", + "hash": "sha256-MVnqTt9Hsc2wqKbCK+mEpNnNf1mKU6NgTPxO/8LZbaw=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.8", + "rev": "v1.22.9", "spdx": "MPL-2.0", "vendorHash": null }, "bitbucket": { - "hash": "sha256-cHuBfF0R/n03Y5KNnbdsWcGeX24+NPT2HnsQpTivCf0=", + "hash": "sha256-ZFHe91xPeKTdLRnOyFECjg1/7G2RPGpXSgaZOFrnDpY=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.45.1", + "rev": "v2.47.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iNY6Jz/SKOLynx33smDFbg371Wa31CouNtrOuV7lkcw=" + "vendorHash": "sha256-AcHndbTWMMsE7CSnLtUdnfyIfkKVfmOobNOhvtrTh4I=" }, "bitwarden": { - "hash": "sha256-fUmwIfRiLpbhENPZwc9CWZsIugppfc68qGR1Iy1UyBE=", + "hash": "sha256-pEvTdaXuxsfrmJmgYo9mC3OSzU7q0DHEj2esXiumpMk=", "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden", "owner": "maxlaverse", "repo": "terraform-provider-bitwarden", - "rev": "v0.13.5", + "rev": "v0.13.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-oO9+r/CSVSsD+xnJrAhNReWQjUNnHl6qCkoAQfD/VOg=" + "vendorHash": "sha256-nL0kii/BGihXiNp/69Kk/2J5o4lmYPHx6IqTF/IyWaU=" }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -198,22 +198,22 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "btp": { - "hash": "sha256-fny/kOPCJFySYPJwKpU5eCB6IClBE4KIjZoHpQplZHA=", + "hash": "sha256-c2nYUsjErdjxk6IyqpcDxExLLNjxh5A7Mq7WW2BWviw=", "homepage": "https://registry.terraform.io/providers/SAP/btp", "owner": "SAP", "repo": "terraform-provider-btp", - "rev": "v1.11.0", + "rev": "v1.12.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-DUc06D22wqYG/O27NkOxJ2bu+dwirReAq9Y6p135ICY=" + "vendorHash": "sha256-arLGaa/o9X0MYg/qIl6qhpBqcduu5Bu06FteR5KGSPw=" }, "buildkite": { - "hash": "sha256-Zlc82lncNf+jeYBck8QBJKuX4pmQmkkb4vYR+T8DoXU=", + "hash": "sha256-i16wgxO2rhs/wg1In+3VYstuUrfuj/ChVO4un5wDmgk=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.16.3", + "rev": "v1.17.2", "spdx": "MIT", - "vendorHash": "sha256-/d1oml8nUOBx6sOe1k43EhbAyfbObJJuoJCEaHQuIZs=" + "vendorHash": "sha256-/pzkQautZ1Db5ZUcoaLUPwP6QYqGrYYX442l5ucrocs=" }, "ccloud": { "hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=", @@ -225,13 +225,13 @@ "vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8=" }, "checkly": { - "hash": "sha256-gpCE4W35h/3FBLVTM1o038lDB3dgjIwDs8mXjep07RM=", + "hash": "sha256-0PUapBId0y6R5a3+mTN/p57S3ZrkaB4NDFTO77B/QTY=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.10.1", + "rev": "v1.11.0", "spdx": null, - "vendorHash": "sha256-FaqXLFc7ew7HgCZghNPm4sgmsm25/qMAqhqUtbduccU=" + "vendorHash": "sha256-mhuNDKTzkL6rWdoL54qt1s8lPMFMsRNNoFBGi5i9ksk=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -243,22 +243,22 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-N+ci49HQq5TMQo7XstYar8SrdOO5tQb92o+R/9LfX3s=", + "hash": "sha256-jB2tR53z9/ZHe/oI1TH4tQ0YrJmK7HiFCSzeI3brnRI=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.32.3", + "rev": "v1.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lQrtAU8zbeIGplfC8+017Ib9d4MFVF0pMvxmE3MLt3M=" + "vendorHash": "sha256-f6sqKzoQAUpCDrpQdMuK1SuLTKrd2PUn/J6VuKxXGZI=" }, "cloudflare": { - "hash": "sha256-5L5fnJCQU2gcXbbUq8KDid8NhedFXyYBgysggPxNxSY=", + "hash": "sha256-LghaF/2lc8EqTDL0s7pGnF4C/4Vx3GjGzOyg9Fl2LbE=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v5.2.0", + "rev": "v5.4.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-vh31Teu4PruX3i7EIlfumOn/R6libKzAxMPqhTxqBTA=" + "vendorHash": "sha256-C8KtuuNa2N0u1hTfYFhD/H/MwXS8iIx0gXwEo9BLI+Q=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -271,13 +271,13 @@ "vendorHash": "sha256-6MKWpiDq4yI3mfIJyzEsWLa7gi0+DScI5jKcOcM6Qs0=" }, "cloudinit": { - "hash": "sha256-RRvLQXgF/g+jIn8hO+Ma/tNsRaZEETWu/jNqDADVYGI=", + "hash": "sha256-xDHp2bG0/T4pE3j8L4zTVnaQ9te5MuAbiGmopFedOpk=", "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", "repo": "terraform-provider-cloudinit", - "rev": "v2.3.6", + "rev": "v2.3.7", "spdx": "MPL-2.0", - "vendorHash": "sha256-YdzNaMJcDiV194HiDBt+5RHw/BLn8H+wNcrpFSxqDOY=" + "vendorHash": "sha256-bD8BHhP4jxBRnFjmZE1MMkBn2/sMqNEaxTlQRMj2Crw=" }, "cloudscale": { "hash": "sha256-4RU1CD0WwLMd3NsnJWl2Smc8XBYlP9K8Iev16uqsetE=", @@ -317,13 +317,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-nevuczChWR4HPDefChJnSAVI53TFuPFdyDwKsHM3SW8=", + "hash": "sha256-exndOGDZQqvh6m8sJg9/dIGup5SQruwE7qK9T0s/FJ8=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.58.0", + "rev": "v3.62.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-tf0lVgueRNVXfttzrCyy0TSiQAVGcWIUCoDLyOWfW7s=" + "vendorHash": "sha256-uLNBbgW4oA8Cq0mjjMQFh7g37V+Ea9ek+ugBYJww88I=" }, "deno": { "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", @@ -335,13 +335,13 @@ "vendorHash": "sha256-mJXQVfCmW7ssFCrrRSiNb5Vg2QnS9NoBCgZlDDPMoEU=" }, "dexidp": { - "hash": "sha256-ommpazPlY4dMAOB1pgI7942aGH6YYPn6WtaowucQpZY=", + "hash": "sha256-un+jAmcK1MYljcAFyIHw0AFmvz4GltAsWxTOd/zXxyU=", "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp", "owner": "marcofranssen", "repo": "terraform-provider-dexidp", - "rev": "v0.6.1", + "rev": "v0.7.0", "spdx": "MIT", - "vendorHash": "sha256-3swcRmm+JZ4ZQX0hvXZosYDGwk0KSyZcqEdNGDYcyYE=" + "vendorHash": "sha256-0yoaiVn6j6g//iTPgX/y6M0A+cWAASDIuWMIHi/4w1o=" }, "dhall": { "hash": "sha256-QjY5ZazQn4HiLQtdmw9X7o5tFw+27B2IISzmzMMHjHE=", @@ -354,11 +354,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-jReUOuoRybh8g4smxy7QCkJEgUzDnaKhj7VO5ShSGsc=", + "hash": "sha256-AWRBSdz4nS5Mi4BUqy5J0Vi/2w4qFyXzGxKdboN8aTM=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.50.0", + "rev": "v2.53.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -372,40 +372,40 @@ "vendorHash": null }, "dns": { - "hash": "sha256-2sKDjC6QwztHMiEr6ZuAPDq/ySUjgsjVYfaXcRDN0xo=", + "hash": "sha256-+M4i5tvGrjGRBwB9bFp6YYhbz3qGRcg9W6PhD59Rfbk=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.4.2", + "rev": "v3.4.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-osSB88Xzvt5DTDE0AY2+QuKClfbGIVJNrXuy4Cbk1Tg=" + "vendorHash": "sha256-xu5t7VaLvbwo/Q7Xb4mkNt7UjU+hzfk7NgfFlxwbIhU=" }, "dnsimple": { - "hash": "sha256-ZKi8+EYLW/Pey0EHTKY0ly7+2Y13mqxMhGia6UUdEtI=", + "hash": "sha256-CkfgHBNtYCFZIMoXpX0ivkm1dyIs4mKSrHaiQ3qt/+w=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.8.0", + "rev": "v1.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HBwyjqKSshB4Nl2e/xnMnWgYVolSxvKZHi+bYfM2+Ho=" + "vendorHash": "sha256-WZqwBkVXoFmDikIyt9GWszLA/9YBoQHAdBuWbGKZBZw=" }, "docker": { - "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", + "hash": "sha256-vpgvEDcmUpumCNvahijb7lkkEQUeaHH0a+CSzPspIyM=", "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker", "owner": "kreuzwerker", "repo": "terraform-provider-docker", - "rev": "v3.0.2", + "rev": "v3.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" + "vendorHash": "sha256-b2N/m85aUbD93ATbqdqU/7HHQz2JKW7Cj96JnjLVq20=" }, "doppler": { - "hash": "sha256-Gxeq6uAkLW2ZI6FcgLb08DHGr/kCaEXrrSI8C7God2Y=", + "hash": "sha256-TPWHqRpvyk1dtSbQySMOecq0AhN2VlSB+2naPIbvMHI=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.15.0", + "rev": "v1.17.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-riWi+l7MsqaatRbo74w0c+oB+8RB7F3VEx4cj/NX72A=" + "vendorHash": "sha256-B8mYLd4VdADWoQLWiCM85VQrBfDdlYQ0wkCp9eUBQ4U=" }, "elasticsearch": { "hash": "sha256-a6kHN3w0sQCP+0+ZtFwcg9erfVBYkhNo+yOrnwweGWo=", @@ -417,31 +417,31 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-SCjw2IFRrtcY9jrPUNETr2IZIU9C3wW/WAS2TbzlsWE=", + "hash": "sha256-erQUWFpGqnxtU88AaD4Lq0OQyhOg0gXoFBMf6wQC1Fs=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v3.5.0", + "rev": "v3.8.0", "spdx": "MIT", - "vendorHash": "sha256-aTQreRL0UTMYWLs25qsdwdN+PaJcOHwLRA8CjIAsYi0=" + "vendorHash": "sha256-sjEgBLwk/dYUmq+kL0PtamEukXgC9rzeyTT87HK0Y8E=" }, "exoscale": { - "hash": "sha256-SL0O4hRVeLqxDEsh/BUZLUsypLPlvD7Z0ozr+RPuuv4=", + "hash": "sha256-RUO4Ge2z4e4N2FWiLtSNv/w2ivgOJVNYQCJvT8hN/8g=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.64.0", + "rev": "v0.64.1", "spdx": "MPL-2.0", "vendorHash": null }, "external": { - "hash": "sha256-BgtRCRGo0jf8lQTxmEOxFPuLrVffrXO2E2jBYQV9wqk=", + "hash": "sha256-rHMmGzYvsE5GT0E71UUIXjDG9+v52LI69/gdP2xuI7w=", "homepage": "https://registry.terraform.io/providers/hashicorp/external", "owner": "hashicorp", "repo": "terraform-provider-external", - "rev": "v2.3.4", + "rev": "v2.3.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-xlcOCdgRTQbJCsL39hs3dUVjssGpyNij0ickjSn8EX0=" + "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU=" }, "fastly": { "hash": "sha256-4sOcbqaC9FV/Si8/A6wvdDREYt7v5z0iNQc5TXWyjSU=", @@ -498,31 +498,31 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-1TN37PZR2skkmKhRbv1Z1Kv45G9b8WQz9yDK14fs1TI=", + "hash": "sha256-tZJuXYRD6+E6Bhrn+cjeSCRAePgj/g+E8YTStwjZiSM=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v17.10.0", + "rev": "v17.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1KTU8nMYUfC+LJHFeIpK6m4RUPWvSHNSXGVJgcnsVl8=" + "vendorHash": "sha256-3URc3A1kkcVQ/riB2/THuIEiCq9MrifxgRL73cjsbDA=" }, "google": { - "hash": "sha256-yiTTC9URf0A3AHHv7jUc9Y6cgxFkFspvx2NYB1HPKS4=", + "hash": "sha256-dqnmTAIcbqdRMk+0C24ZzcEycAM+vW9JuT1sCTamuK8=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v6.27.0", + "rev": "v6.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oGO+++WMiXUTCLFdBH2/uAzdN3RtrSNDSUBVMIYmI14=" + "vendorHash": "sha256-rGpnPH8ebHXasvelGoJEUU4YbeGJY4adFBbgAHJ8vSs=" }, "google-beta": { - "hash": "sha256-FybWpnUBQCxY1XQNSCk4slUg6vF8XDW1uQwgF0a2PgQ=", + "hash": "sha256-b79IHQxSid4LhIl3ZPd2rok8V4BdXejcYe5LBCjgvlQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v6.26.0", + "rev": "v6.35.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-AQKukbsW+EYndMxUpUHIWPh3taaJINs6qY9xhkP/N54=" + "vendorHash": "sha256-Qad4Dfg65aX8dsan4gimGP/hzSaQ7Ay+WTFlr2TgUzw=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -534,13 +534,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-A6rCZbnLSbPHn+QQ5wMlINRqT04tEvil2rHkdr5iBQw=", + "hash": "sha256-ZPejLOzShIW7BDlyYcFSV48uiA8XU15ziobHqtS7LW8=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v3.22.0", + "rev": "v3.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-GFH2w4bdqYWl0eFBo1r6YL1pA0l5QMwrXQ9BvK3DmEI=" + "vendorHash": "sha256-G5CiuQ0GPsJ7D+wlWQUAktT3DSgb2X7NL66c6U+9APU=" }, "gridscale": { "hash": "sha256-Ygt3L/dzwycccQZmuwbcaLHp9FBGNHgU19wSNmY8PzQ=", @@ -552,22 +552,22 @@ "vendorHash": null }, "harbor": { - "hash": "sha256-ryNGeQ9Ac81iQo+iaqao2dvZ30xYy9TGMOqrPldY5/8=", + "hash": "sha256-KYCyqNKqW/I4q1JHVK4rD9H8/D60IL7H9cCgz6wLg5Q=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.10.20", + "rev": "v3.10.21", "spdx": "MIT", - "vendorHash": "sha256-6kK9FMT+Ew6RBzNNR9OxYaCz1NjzKRv75Aa9l+p+B5E=" + "vendorHash": "sha256-C1MT4mA7ubh1mN4+HO0bwMpjVHjDIG6UXZI6gvXHFZE=" }, "hcloud": { - "hash": "sha256-wst3+LIcybM3VZlAzbkacJtAjl08je4rdeIJz1632yM=", + "hash": "sha256-DSTxn4t6YWxRBimMlqkP1VLqqxk1Kox+h0u9i9rSdhc=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.50.0", + "rev": "v1.50.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-ealJRIeNapOteRsRzEN5FayhG629gJ+eAV2ohTwHWL0=" + "vendorHash": "sha256-jbNkhNSSO9jT20J6dVhBEbN9cwtNrvx5EUcyOZcMd4Y=" }, "helm": { "hash": "sha256-LCvsZNeGQb4wWIASnQxXbH/3YJJaUZS9nY8mHq6M4FM=", @@ -606,20 +606,20 @@ "vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs=" }, "http": { - "hash": "sha256-eNF6OQZmJfzVXfvrhjtMJZG7mNYjS61Bplff+VaxrCA=", + "hash": "sha256-IXqKZ9RQP0kZVxc9OfaWglF8GeycSAl5DATdqc8n35g=", "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", "repo": "terraform-provider-http", - "rev": "v3.4.5", + "rev": "v3.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8=" + "vendorHash": "sha256-SsEWNIBkgcdTlSrB4hIvRmhMv2eJ2qQaPUmiN09A+NM=" }, "huaweicloud": { - "hash": "sha256-VSnjbjfE551IfZNsJh24pye3MaznTB1GQlmbM4IsJK4=", + "hash": "sha256-kNXlCtc1x9FWC5edeIv46QWCnDS2ET1Stdzn8WCkCLQ=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.73.3", + "rev": "v1.74.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -642,13 +642,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-enisQ1DOrA4HBi0Sr+6ZNIKnbUoH3LCXBN11J03hPhc=", + "hash": "sha256-MMVZnGQ8MWczkbMC9VUoRcplmIk4TdiahZ/ZSYhbQlM=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.76.1", + "rev": "v1.78.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-YUCyq1GiFnXSmx9VvhYc3MGnrMXdnOuAVx9BKp1R2N8=" + "vendorHash": "sha256-8P5GnDXY8n/NhSY0Oo/7CP7U7pH7f0Z0GfiFnicCxdo=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -660,31 +660,31 @@ "vendorHash": null }, "incus": { - "hash": "sha256-ARxXTh0mGA3VNqqDKgMLBRr8wNZ4D2p75/8dMxFowWU=", + "hash": "sha256-zIth+M/70f/uw+CE1r3z5m36VcenCW224x64BG2gkes=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v0.3.0", + "rev": "v0.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-BuVUDDwUgGo7FrgWDzhq4qkEudECoyqApftALBnQveE=" + "vendorHash": "sha256-HcKNrvDNthxPjg3qmUoRa0Ecj0dNJ5okf5wKT5SWGhU=" }, "infoblox": { - "hash": "sha256-iz/Khne3wggjkZFWZOK9DVZsB8HW6nsNBCfEbsBdhzk=", + "hash": "sha256-uxzWgxetwgzj9L5+yxw2EoMzdx6NbR2kEb4fGw3Wxn0=", "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox", "owner": "infobloxopen", "repo": "terraform-provider-infoblox", - "rev": "v2.9.0", + "rev": "v2.10.0", "spdx": "MPL-2.0", "vendorHash": null }, "jetstream": { - "hash": "sha256-RlYl8DNx+XjLjMQ8CbVJH0p2ZwBrDNp2OCvzHxQ7zLA=", + "hash": "sha256-N/cKiMwPHo8581PFg06RjgOGpGB02/CCARTIFu9kH3s=", "homepage": "https://registry.terraform.io/providers/nats-io/jetstream", "owner": "nats-io", "repo": "terraform-provider-jetstream", - "rev": "v0.1.1", + "rev": "v0.2.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-NEGjgtrn6ZowqSF6NAK1NnSjYVUvfWuH/4R5ZPdTZSs=" + "vendorHash": "sha256-Dd02Ikt51eh/FBEtswe8Qr6P5tgQFZJTKgO01gxPX3s=" }, "kafka": { "hash": "sha256-O8fD974eEmIgMAbLsENBkHiS1+2onx7OOrhnwv+cGoo=", @@ -705,13 +705,13 @@ "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU=" }, "keycloak": { - "hash": "sha256-mlPq3sOaGN/fFAxMmK9ahcupwWd/4gYdNTLGRqDjPLc=", + "hash": "sha256-DqGM7nmblbt0sD5dKzQ7URL9LYbaMSfP01nrjEwyado=", "homepage": "https://registry.terraform.io/providers/keycloak/keycloak", "owner": "keycloak", "repo": "terraform-provider-keycloak", - "rev": "v5.1.1", + "rev": "v5.2.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-51sFU6P4Ynyu9NpQxlbSV7EoB/Lk1da4O0bOuoeMujI=" + "vendorHash": "sha256-I1e1/Qr/22zAXDcEmfx7BHqKVUl8tcomqBk7SQv8aR4=" }, "kubectl": { "hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=", @@ -750,13 +750,13 @@ "vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE=" }, "linode": { - "hash": "sha256-ExAB9/27gdDP7SV5UXAaVO/aJ2LYtZYPr9Ur1ftxdCc=", + "hash": "sha256-LyGqcWYdwUfAKq3bTHMyZmIyJkndOUzWHkVXduESxus=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.35.1", + "rev": "v2.39.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-WRM/2mtu/U4Tgxc3nhptNRbscS9uhqa9v66nY2QXXig=" + "vendorHash": "sha256-4YMqzX/vQvWj0sb46NlTADb0be9+/0lwKs+3QArBvUk=" }, "linuxbox": { "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=", @@ -768,13 +768,13 @@ "vendorHash": "sha256-GxMCY/udIy3c7zLeNeghXtfCUw4+Ll83L/40N4/yVh8=" }, "local": { - "hash": "sha256-BwbKkChQFtNHr/UwMNWGD/KU82vxlcXNaRWrsyzYrRg=", + "hash": "sha256-JXGBZglJwUbclTzsHap8QaQnkjw6rRIsSPL+lpLLLBE=", "homepage": "https://registry.terraform.io/providers/hashicorp/local", "owner": "hashicorp", "repo": "terraform-provider-local", - "rev": "v2.5.2", + "rev": "v2.5.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-t5kQxSjd90mglgMvlMnhWBQlz1r+ZI5BKBD3dqty5lk=" + "vendorHash": "sha256-AlvcjfvyBwGawUqzba66qF97qoCUMVybKmIrf3jFyi8=" }, "lxd": { "hash": "sha256-ToK0Zua7e4CPm+8ZLIVw+dpt4bbahqWvvCKhjrAeW7s=", @@ -813,31 +813,31 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-80ke9CIl7kBUF3JRgydikXow2G3XhSVX8EZK7sd8xzA=", + "hash": "sha256-k9qpSxww6zXemEWDqjlrjFmeeMtKK9kR1hj9+gUq9VI=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2025.3.20", + "rev": "2025.5.15", "spdx": "0BSD", - "vendorHash": "sha256-xORnddTfzbQ1ZwINLF2/Fwi/rJ1KyxPzBKfNkQKNg0w=" + "vendorHash": "sha256-MjRVd/JlmHppdFG7k3pgNVWbCaEZuh5E591x/P6cT5o=" }, "minio": { - "hash": "sha256-OIdXZIy+W8yO3y7z/1JzG7QegJmMLTFSoC7FmioscmA=", + "hash": "sha256-wB4Gq1UY1zfrTjZrqFB3RlJo3+PbHjMrBeMU/z197fg=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.3.0", + "rev": "v3.5.0", "spdx": "AGPL-3.0", - "vendorHash": "sha256-1nm2Y4T9/mCWMXMjXEzBz3w08AYHjQJeb9mYPQeWPs0=" + "vendorHash": "sha256-7AU79r4OQbmrMI385KVIHon/4pWk6J9qnH+zQRrWtJI=" }, "mongodbatlas": { - "hash": "sha256-nuamsevz6ME0WlnnWGFKkLiD5wrihq1EML68rvRiu7Q=", + "hash": "sha256-JQW9y1EfrEInmz2+Er8BE0+6ZdcrO/w1y+czg7jPeRE=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.29.0", + "rev": "v1.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-WMExn+d3G0zpATJ2LYaJ9R4SDpQbngQE2YW3p8x3Scc=" + "vendorHash": "sha256-y9dhiG0zyOcvjgygLEW2o+GPXUug0ibxC2aLvfcY260=" }, "namecheap": { "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=", @@ -858,49 +858,49 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-KQqCckDXsxQrmRptttV9f7tSHBmKWE14aIppcR2dJrQ=", + "hash": "sha256-2Bmk1b84oL8DkPShff4RPQSlAu6ufwcb7sp6mJGeo84=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.59.0", + "rev": "v3.61.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ZZtfVgxp7YXNRXpeUisLzweQhHzgYOuQDAp1MsxAVhg=" + "vendorHash": "sha256-wqraBQqxpD69iIM45MZLWhgIEiyu300bok3OST+Hegs=" }, "nexus": { - "hash": "sha256-6RPga80ZoqEEFL7I2OVXcrwaxbdhSzZDEV07xL07rZs=", + "hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=", "homepage": "https://registry.terraform.io/providers/datadrivers/nexus", "owner": "datadrivers", "repo": "terraform-provider-nexus", - "rev": "v2.5.0", + "rev": "v2.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-wOpR+AJYW7YiARSIACta8Tr4bmGLUONRTEBLxHyHZZk=" + "vendorHash": "sha256-pez5anuq3hHXH7XMthT7y8+rjCHsMV3Vqk/DBCpbkdg=" }, "nomad": { - "hash": "sha256-k61iQ9FQG3nscBp5CE/fFCbHpeLawbUAtGPM+IZtfVc=", + "hash": "sha256-0ShkpPAxCT9lmfrVUoyjx7DhwlSYz9uEIujsKSB+dgA=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.4.0", + "rev": "v2.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-YmZvHzrEZVvXI8CIcjX40s+MHTThPeXNQ05cnqkNbbE=" + "vendorHash": "sha256-U8eA/9og4LIedhPSEN9SyInLQuJSzvm0AeFhzC3oqyQ=" }, "ns1": { - "hash": "sha256-llJmz8QWwoApmhWEXlQMlVvteXSlkZhXh7tCWuMMbrc=", + "hash": "sha256-fR64hIM14Bc+7xn7lPfsfZnGew7bd1TAkORwwL6NBsw=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.5.3", + "rev": "v2.6.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-jZAwCXozHYReks6ZGjqkvIitWeg19AVGm3R9r20XsMM=" + "vendorHash": "sha256-YfbhYhFMdGYQlijaYoAdJFmsjric4Oi4no+sBCq5d6g=" }, "null": { - "hash": "sha256-zvzBWnxWVXNOebnlgaP8lzwk6DMwwkGxx4i1QKCLSz0=", + "hash": "sha256-hPAcFWkeK1vjl1Cg/d7FaZpPhyU3pkU6VBIwxX2gEvA=", "homepage": "https://registry.terraform.io/providers/hashicorp/null", "owner": "hashicorp", "repo": "terraform-provider-null", - "rev": "v3.2.3", + "rev": "v3.2.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-btTvl9WcqWMa5YGkY0PT8c64H6ToNghLKX03dN/3IPs=" + "vendorHash": "sha256-ssmAveYUVI8z/1UWNeaMX0qdUewowCHNufJIFMirdVg=" }, "nutanix": { "deleteVendor": true, @@ -913,22 +913,22 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-/tgZFUzJqBNTxJzmhcs9YyB55DNwC3oFr9nVyHsFGW4=", + "hash": "sha256-fLeI4YdHZmRPILHeoEjwcNN9mVOq2zvdjSoQkIiwvdc=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v6.31.0", + "rev": "v7.0.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-Yfs+yd5AgHL8Wl9/Zq922WJwJUOjoTshOa9RyI/AGZc=", + "hash": "sha256-vsOes4rBULwQ3JX5A7GBKTMvTpjb0CEOWqd6OaO3ujI=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.15.0", + "rev": "v4.18.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pykDVH44iZoOihiRr9rA9rEsCc9N6TD+UMbHelab6Nw=" + "vendorHash": "sha256-5BkKjne3r3V8T+SkqjfHVEpXXK8sKTYMc23g1EaLoOE=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -967,13 +967,13 @@ "vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI=" }, "opentelekomcloud": { - "hash": "sha256-+ngMqXN5jrHTNZm0BJWppUzD/i6r6UznY8YsA26SdY4=", + "hash": "sha256-nCtltzYV9yDYEkAuOJVdBlk11nSpdQtk/zlKEn81srs=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.33", + "rev": "v1.36.38", "spdx": "MPL-2.0", - "vendorHash": "sha256-v0Jr7yh2DCA89UxxOUU7sC7jQ1myv70T3+DjBPpz5pE=" + "vendorHash": "sha256-Q02AnTFzEO5NES5rMQABuhwiLi5uZlzX4c06HQ+d9/A=" }, "openwrt": { "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=", @@ -994,20 +994,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-kbKoirah2EA8Wa2/d8TFPMUZmnewPPJ/Sgx2tTLeYrM=", + "hash": "sha256-KNA/4m7zom8+19JgfwgjIkD3rA9Co8AHI6nviyQOntU=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v2.1.0", + "rev": "v2.2.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-ed4i9Esj90h4bG4gzGZBqaaJJOsE2fLfip9xyneRAjg=", + "hash": "sha256-L+CyniSMCrG24+7f3rW4k5SIAuhI5FIqcGP4QX+huOY=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.23.1", + "rev": "v3.25.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1057,13 +1057,13 @@ "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg=" }, "proxmox": { - "hash": "sha256-dQvJVAxSR0eMeJseDR80MqXX4v7ry794bIr+ilpKBoQ=", + "hash": "sha256-agupFUy/4D0gJ12AhJDNt0FPnSWM1laBban13z04pPA=", "homepage": "https://registry.terraform.io/providers/Telmate/proxmox", "owner": "Telmate", "repo": "terraform-provider-proxmox", - "rev": "v3.0.1-rc6", + "rev": "v3.0.1-rc8", "spdx": "MIT", - "vendorHash": "sha256-rD4+m0txQhzw2VmQ56/ZXjtQ9QOufseZGg8TrisgAJo=" + "vendorHash": "sha256-LZ3g/UuI+u4ULaM2taso9GgSsmxJICjKhrSaWIL6nCw=" }, "rabbitmq": { "hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=", @@ -1075,47 +1075,47 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-LJgYGgJ7PLRq3WlT2rAnnM8svn4EGghLy3rY7lpmJxI=", + "hash": "sha256-H6ZdGvKSYRlDsCKIHlPHdEv1+6aa1rll/73IeJ+PDhc=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v6.1.4", + "rev": "v7.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA=" + "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8=" }, "random": { - "hash": "sha256-bbqTCLPjL1EowsEIx9SiwKAUt11LYxOOtj3syW/7gjQ=", + "hash": "sha256-tdTVqSJmQ6Ht3kdoYMxhoRN+XJqvu8BPVB0VQghcDVs=", "homepage": "https://registry.terraform.io/providers/hashicorp/random", "owner": "hashicorp", "repo": "terraform-provider-random", - "rev": "v3.7.1", + "rev": "v3.7.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-ILdu9D/SQ39zDcvl13IMhN+aocbTZO5SI8n6wvdS9I8=" + "vendorHash": "sha256-jyfzk3vbgZwHlyiFFw1mhD+us/7WNatUQTGN4WsrfgE=" }, "remote": { - "hash": "sha256-zuKtkJLTMsrGgk7OIY+K/HhEddgFuEfzK7DcwPnUX6k=", + "hash": "sha256-3wzvhGLYAIlDSqNg4K/j8KHOsXKZv8u4ssrm+aC0dus=", "homepage": "https://registry.terraform.io/providers/tenstad/remote", "owner": "tenstad", "repo": "terraform-provider-remote", - "rev": "v0.1.3", + "rev": "v0.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lkooWo0DbpL4zjNQ20TRw+hsHXWZP9u7u95n1WyzTQk=" + "vendorHash": "sha256-xo0alLK3fccbKRG5bN1G7orDsP47I3ySAzpZ9O0f2Fg=" }, "rootly": { - "hash": "sha256-KAeTOvh67bEpLVV/9jr1GI78wTA3Wu6zl69GlLKkPaA=", + "hash": "sha256-oAxjqJnA8kg7j9THplkCdcG4eVTpRKtenUIuAmeUULI=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v2.24.2", + "rev": "v2.27.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iq/Skuegzn9bz7aF6COYeoXQpXmKDkvKJJ/fnJqyJFg=" + "vendorHash": "sha256-IJJjA7SCQib5GdqbS2rnZtbBNB8sYYPYH+vHMGf1Bfk=" }, "rundeck": { - "hash": "sha256-OyXIuQu0/NLPIZUzOdnTq2M5Qg6AwOdYG2WozWDmOoQ=", + "hash": "sha256-cf+0qXpgxIsc/JbB7+u3MpmWFwUmpsinp1uARRhuBw0=", "homepage": "https://registry.terraform.io/providers/rundeck/rundeck", "owner": "rundeck", "repo": "terraform-provider-rundeck", - "rev": "v0.5.0", + "rev": "v0.5.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1129,13 +1129,13 @@ "vendorHash": "sha256-Ry791h5AuYP03nex9nM8X5Mk6PeL7hNDbFyVRvVPJNE=" }, "scaleway": { - "hash": "sha256-9ZdQi1Z1IfidVrqD8vQqmV7lyGalghls4/KJSoX3Kzw=", + "hash": "sha256-17BjGoIkKdMVVQMetx+ksQhLbTl/cCdC05HaB7Sai/4=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.52.0", + "rev": "v2.53.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hXvpCjWwlk4UuvtxWznP8t3qlvzBvWlrui2VdP0Hruo=" + "vendorHash": "sha256-1N9HByEI0TwI7rdg/OmMObwnb4Hx8oigv5A6hpF0TrY=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1147,22 +1147,22 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-Raq7Yaa4yHqpR4JhvITN9Pf0mVvRSwWkpVsYXcHGCvo=", + "hash": "sha256-NhU+FB7gZgeBJuFSsioQJlrN0yk/T9hwYhN3fqe+eoA=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v6.4.0", + "rev": "v6.4.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-kCVJEIR+3DAOoDzqv1Dd2JUPmEpO3sGHcjbEbMZT4BM=" + "vendorHash": "sha256-ESoNG3a0JblNnQJHMlnvbNAYWirSqfPabtkZnDMeMp0=" }, "sentry": { - "hash": "sha256-2JfzteVripOz96bAtQXC32wi8dWUQw8bry0HllNRQRA=", + "hash": "sha256-/rulw49DcAi5tk4j6XpvlG0X6HJgcMI+zotKsFU2MmI=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.14.3", + "rev": "v0.14.5", "spdx": "MIT", - "vendorHash": "sha256-RbUBHX0/nUihgiK6ibbkR/2DKJOdJt9VYyCJgWsj2zo=" + "vendorHash": "sha256-OurLZioO4zEBwsOyeUhv2KpQZEPySJn7I65w2rmvUn8=" }, "shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", @@ -1174,13 +1174,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-niwn969Bpw4NqNUCLf665b4W+NBKLwwwZWYWLA/4KXQ=", + "hash": "sha256-rzYy/tDLfbgzbKSPJWTzSFcamLh0HyF50nbtUJYokL4=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.9.0", + "rev": "v9.13.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-UCElzCPBGdl5IWCuN8g6BAzZnGfdVKSllH6pbVe1Aw8=" + "vendorHash": "sha256-/Lu1J/ZT5eq07quvqcm2N1dZPaWF23C5L5CVaUX7HaE=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1210,31 +1210,31 @@ "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8=" }, "sops": { - "hash": "sha256-MdsWKV98kWpZpTK5qC7x6vN6cODxeeiVVc+gtlh1s88=", + "hash": "sha256-VuQTJFI4KcSnaog9VTV+zBg0XAORvWzuCFYMB0BM6n4=", "homepage": "https://registry.terraform.io/providers/carlpett/sops", "owner": "carlpett", "repo": "terraform-provider-sops", - "rev": "v1.1.1", + "rev": "v1.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo=" + "vendorHash": "sha256-K/44Jio2a1kKYuyI6o/5wwMNRaZvx9zrNEC85v56xdU=" }, "spacelift": { - "hash": "sha256-ZnUQBVsNuvr0jfuJL5h8uvrqyiahq7CoMeQ7tXU/gTc=", + "hash": "sha256-uRqZ5GRCP+oxm42cVVUdwUUixKLZbqfd6PjohbF7wNQ=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.20.4", + "rev": "v1.22.0", "spdx": "MIT", "vendorHash": "sha256-oEamCseBGmETqeBLiBHfh81oQNUHWfTrsegkFijvb20=" }, "spotinst": { - "hash": "sha256-tTU9+4wxSMSWmmeuSpS60FSuzg9BH6ylEaywLB9LwQc=", + "hash": "sha256-gRR0Ie27Wsc8Hf4u5gto2tkuZp/VoPbKBfDcJYN4W9A=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.216.0", + "rev": "v1.219.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-STIPYBMj6r630/J71fAeLTkrvop/8u7gToGcijopqCo=" + "vendorHash": "sha256-M6MkqX8iVeP9IpLSLfkl7cMDDtO1VLw1YpODd0zPJvU=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1264,67 +1264,67 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-x7TN3UrvW3/0MnvmJEQp9z/2qUe2yX21hk0V9/nZUF0=", + "hash": "sha256-P/icRnqd24To3n/WCS666n3slQwt7eNUpt9aD7c9GGU=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.0.7", + "rev": "v3.0.10", "spdx": "MPL-2.0", - "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" + "vendorHash": "sha256-S3SBp17+qqA64tWydD5DYc9KahycJ+qDrdXvFwu6Lbc=" }, "sysdig": { - "hash": "sha256-9oj8rk4ltVcg5yPWU0WFxG1GvG3w9NM2MKi/UKM1U00=", + "hash": "sha256-fkMVPPKqUQdp/JSPByV3yuMaY3SKVy75u1ljAL9bEZc=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v1.52.0", + "rev": "v1.56.1", "spdx": "MPL-2.0", "vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s=" }, "tailscale": { - "hash": "sha256-I9t8HyLZmY98g/XjTy6JEryJ8ZOXfegnbymmxVwsy7Q=", + "hash": "sha256-0QBQv3KbCjQsHDiPYRVaskzhBt6MsrpFvXSYM83AFKY=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.18.0", + "rev": "v0.20.0", "spdx": "MIT", - "vendorHash": "sha256-bfcsqBusN311oncfCViG4aWy9rylvhrcjs/WUSbh4dI=" + "vendorHash": "sha256-f+2SYxdPVXDpwFY6ra9Abe/aXil6zzXk8wQTr49QkC8=" }, "talos": { - "hash": "sha256-49woELLSpheuyGnXuwamZwsHdOfjwSB4v8/INzSrMRU=", + "hash": "sha256-O5S0XYdTyNGihPx4hQhYN5+ApnMuCaIcWlHA9D9/3nM=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.7.1", + "rev": "v0.8.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-iEi3zkr4kIZ1FTAft/Fy//v7xtlX/8uSrnbuxgFTDyA=" + "vendorHash": "sha256-V0dK5G3zheyyqexBud+9Hg9ExYI/9X1wuYx+lEn6pVg=" }, "temporalcloud": { - "hash": "sha256-qzBgk6FOKiaKXwpUEj61pYW/72a0EpR3GTces5IbjJw=", + "hash": "sha256-hLY9C0df1h8JCwuXBPxemNurQR57oGXAq2v7NbAyZnU=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.6.1", + "rev": "v0.7.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-0B2XRpvUk0mgDu3inz37LLJijwH3aQyoSb8IaHr6was=" + "vendorHash": "sha256-HBdvXWZNPPAqPEKodwG0ZeiJOhfJHe9HRCcuozKpwVs=" }, "tencentcloud": { - "hash": "sha256-DkktMcHU0T9H/jGOq66N7n1bfBF7aDEWGYmQrzWsqr8=", + "hash": "sha256-enP2ZWUB+c414BXl9uvXateCMEFlCY6MDVayWRgTbe4=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.178", + "rev": "v1.81.191", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-VQmVnk+dmWHeQ5/edv2QROGJsMjDW2NxEBVzK/a/q0U=", + "hash": "sha256-hMpCuLAnwwAb8ugKxKDuFvtII2k/lcwYYL0sCvZewOY=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.64.0", + "rev": "v0.65.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-F64pMn3OZcDZGhZI6TeZNgYuTnRALKVm3v7JLR+V82w=" + "vendorHash": "sha256-PSUob2u8hue5ii+kV4bGcvexkIQxzWsHbbEbYO0celU=" }, "thunder": { "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=", @@ -1336,22 +1336,22 @@ "vendorHash": null }, "time": { - "hash": "sha256-namFdrrCw5/pAb1yvTmvli+9jewGzlVaa9TjS9Rt48g=", + "hash": "sha256-ZArYfbzbrkxGlL1BRFM7PN3hLzdssIL4COsUBdLVMYY=", "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", "repo": "terraform-provider-time", - "rev": "v0.13.0", + "rev": "v0.13.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-0o7WKJm4IesxparbbWhzXJNL80qxCUkJvQFypMobR1A=" + "vendorHash": "sha256-4XCCzB5Va1jtTn5vgIVKjQq4g8sKe0SIw3ynZExz/Vg=" }, "tls": { - "hash": "sha256-MK75g9gbi+f994hKHBAQRXrPG+hbZqnlyrK8WROiG5Y=", + "hash": "sha256-t/nUt0deyckP8opNiPZc5rbC1SleZwkrFXuQFw47sqA=", "homepage": "https://registry.terraform.io/providers/hashicorp/tls", "owner": "hashicorp", "repo": "terraform-provider-tls", - "rev": "v4.0.6", + "rev": "v4.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-qsbB7Scw9W4our6B+9NzsK4hrbWP34na7/eNLC99yKc=" + "vendorHash": "sha256-tYvQURTrFtr+rgSMGq2zi/5p5jJVGIse7+hj95gz68U=" }, "triton": { "deleteVendor": true, @@ -1364,11 +1364,11 @@ "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { - "hash": "sha256-20uIfcoqvZsX+1kNnOslDlzRbDNWwTEw55ElU3yvB4I=", + "hash": "sha256-vprEb9cddA3bgtauh9X7F6cNBWRr+lMvRTYHg2FLFN4=", "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", "repo": "terraform-provider-turbot", - "rev": "v1.12.0", + "rev": "v1.12.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1391,11 +1391,11 @@ "vendorHash": "sha256-rHJabyfgu3wU79h3DHHYQauFmcR/SDuikauBF+CybZA=" }, "vault": { - "hash": "sha256-GlRaV9CYm8IuIzeN/KRJWLCHIhc7Fdb5DL4fTA/dzV0=", + "hash": "sha256-6gCpXzvF4p2otwo3dJ8c+EvzbsMZfzVZymb41+hEZoM=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v4.7.0", + "rev": "v4.8.0", "spdx": "MPL-2.0", "vendorHash": "sha256-5e6WQ0lByT3BWcuJvG/LYRVeiiIYQDkV4A74CJhiUBA=" }, @@ -1409,13 +1409,13 @@ "vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4=" }, "venafi": { - "hash": "sha256-/fRqTu/M3OHR5v7pWAE04ijq70F7MxRILP1Ab2hw7gs=", + "hash": "sha256-vMZH0BQMkoizbME1pYCn+iMqwI8aSvhe0Dcrvstzots=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.21.2", + "rev": "v0.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kZ0JLjAYu3b01zHfp+VWTZ8sUCivfaS1Ld2/SDMOrks=" + "vendorHash": "sha256-OUQgisFi8ZR/Hv70pKB5Kwdk+Rd/Ll6qx3vKaX4NNtA=" }, "vinyldns": { "hash": "sha256-ow+o9fRw/t2i4N65zuVFbfPb68ZUcJfNB5ARYqRTsIs=", @@ -1436,13 +1436,13 @@ "vendorHash": "sha256-SF11E60OQiRdf+Pf6XyJg60yGRnGOcSzhrYccrWaeYE=" }, "vpsadmin": { - "hash": "sha256-kkH+VUfh5TsjCOQWnpTn4++ZhpBw/rF2pQI5ITA0jlE=", + "hash": "sha256-Yi5mFhJsGGPg3IyOdgV2mTfj5ZVd76vu3/JFNrh5+Wc=", "homepage": "https://registry.terraform.io/providers/vpsfreecz/vpsadmin", "owner": "vpsfreecz", "repo": "terraform-provider-vpsadmin", - "rev": "v1.1.0", + "rev": "v1.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-intukvmxiczvE3DmstYeNhgHgk3Dk/1wp11XrC0JDhE=" + "vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0=" }, "vra7": { "hash": "sha256-KzxthTn3z0kZTUTKO8zq6DaNMTnfb7gFlbuWgxZtqwo=", @@ -1454,22 +1454,22 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-ce3nKSBvF7Enk3wsW4ackEBIDPKPP0qkjZ7Dm9SGKV4=", + "hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.11.1", + "rev": "v2.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-3RylkFRnCG5Z9G/4iV8YJgBnNKYS4T3AhA2JdI+1FEY=" + "vendorHash": "sha256-47xWjlzpQ/EYzjbuuMKQiu5cfYAXdYkXRl+AOEP+sA4=" }, "vultr": { - "hash": "sha256-yR8zNnkxzOa3h7W9nWGBk2zgVXIaD3imZSAJakJ3994=", + "hash": "sha256-1ZzydEpNF06NUC0wYtFcPHpdj4FFPI+qF6pVRNsUxTs=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.25.0", + "rev": "v2.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iHChyx/h7zyrL5/isZCpHQdAe8P1na187EF+na0TkpU=" + "vendorHash": "sha256-i9RzGR03pRhRDDGKBROVSB1aK1EMCYQkYsjeczP8AE4=" }, "wavefront": { "hash": "sha256-yNNtOkodzwxKvHQq9GZlUicezGW6u2ih6ry/cOtJQGM=", @@ -1481,12 +1481,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-NPwDdTHKvQVfGDfR0kv0KvjJrjiRs8JcPtMcb3qcm5k=", + "hash": "sha256-durYCbCkN4m8U4m9f68JfHmVoabINTulDUC2QWpiJA4=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.139.0", + "rev": "v0.141.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2UnAigHaUj1d1UV/bsLnf2MF1I26N6242n6O8xh7U1s=" + "vendorHash": "sha256-5I2vcC1sPDS/wlDJNp9RI/T2P2RwJlGz47Z+8MfUzdY=" } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index 4d380a141b8f..38ce1f0b7fcf 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -8,6 +8,7 @@ # set -euo pipefail shopt -s inherit_errexit +set -x show_usage() { cat </dev/null if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then @@ -112,10 +117,19 @@ fi homepage="$(read_attr homepage)" -registry_response=$(curl -s "${homepage//providers/v1/providers}") - old_rev="$(read_attr rev)" -rev="$(jq -r '.tag' <<<"${registry_response}")" +registry_response_unstable=$(curl -s "${homepage//providers/v1/providers}") + +if is_stable_version "${old_rev}"; then + version_stable=$(jq -r '.versions | map(select(test("^[0-9]+\\.[0-9]+\\.[0-9]+$"))) | last' <<<${registry_response_unstable}) + registry_response_stable=$(curl -s "${homepage//providers/v1/providers}/${version_stable}") + rev="$(jq -r '.tag' <<<${registry_response_stable})" + registry_response=$registry_response_stable +else + rev="$(jq -r '.tag' <<<${registry_response_unstable})" + registry_response=$registry_response_unstable +fi + if [[ ${force} != 1 ]]; then if [[ ${old_rev} == "${rev}" ]]; then echo_provider "already at version ${rev}" diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ae80dab1db21..b6ac750d8eb1 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -45,6 +45,16 @@ let "-X 'github.com/hashicorp/terraform/version.dev=no'" ]; + postPatch = '' + # Between go 1.23 and 1.24 the following GODEBUG setting was removed, and a new + # similar one was added. + # https://github.com/golang/go/issues/72111 + # The setting is configured upstream due to the following timeouts caused by + # the TLS handshake using post-quantum crypto with servers that don't support it + # https://tldr.fail/ + substituteInPlace go.mod \ + --replace-quiet 'godebug tlskyber=0' 'godebug tlsmlkem=0' + ''; postConfigure = '' # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ @@ -184,9 +194,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.11.3"; - hash = "sha256-th2VaFlvRKvL0ZEcAGU9eJui+k5dTaPGtLB2u9Q/vxg="; - vendorHash = "sha256-Tz01h3VITbvyEAfT8sfU7ghHd+vlCBVsMTTQS96jp7c="; + version = "1.12.1"; + hash = "sha256-ikpSkcP4zt91Lf9gziytlZ4P27A0IP2qL+H2Lp9Cspg="; + vendorHash = "sha256-zWNLIurNP5e/AWr84kQCb2+gZIn6EAsuvr0ZnfSq7Zw="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/applications/networking/cluster/tftui/default.nix deleted file mode 100644 index dcdc0128c1be..000000000000 --- a/pkgs/applications/networking/cluster/tftui/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - fetchFromGitHub, - makeWrapper, - python3, - enableUsageTracking ? false, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "tftui"; - version = "0.13.5"; - pyproject = true; - - src = fetchFromGitHub { - owner = "idoavrah"; - repo = "terraform-tui"; - tag = "v${version}"; - hash = "sha256-xOlPuPVwfVT7jfBJPqZ5FbOs80HE0k2ZqcA+Jcxh9p4="; - }; - - pythonRelaxDeps = [ - "textual" - ]; - - nativeBuildInputs = with python3.pkgs; [ - makeWrapper - poetry-core - ]; - - propagatedBuildInputs = with python3.pkgs; [ - posthog - pyperclip - requests - rich - textual - ]; - - pythonImportsCheck = [ - "tftui" - ]; - - postInstall = lib.optionalString (!enableUsageTracking) '' - wrapProgram $out/bin/tftui \ - --add-flags "--disable-usage-tracking" - ''; - - meta = with lib; { - description = "Textual UI to view and interact with Terraform state"; - homepage = "https://github.com/idoavrah/terraform-tui"; - changelog = "https://github.com/idoavrah/terraform-tui/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; teams.bitnomial.members; - mainProgram = "tftui"; - }; -} diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index f729420cee65..b137309458a9 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { patches = [ ./patches/add-a-space-after-type-in-check-response-opt-sh.patch + + # https://github.com/dns-stats/compactor/pull/91 + ./patches/update-golden-cbor2diag-output.patch ]; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/compactor/patches/update-golden-cbor2diag-output.patch b/pkgs/applications/networking/compactor/patches/update-golden-cbor2diag-output.patch new file mode 100644 index 000000000000..49d447c8ce0d --- /dev/null +++ b/pkgs/applications/networking/compactor/patches/update-golden-cbor2diag-output.patch @@ -0,0 +1,57 @@ +From 7b6a93aa669f090952d2def77aaa05e685d0e094 Mon Sep 17 00:00:00 2001 +From: amesgen +Date: Fri, 18 Apr 2025 22:58:52 +0200 +Subject: [PATCH] Update golden cbor2diag output for newer versions + +Tested with cbor-diag 0.9.6 +--- + test-scripts/addressprefix.diag | 2 +- + test-scripts/testcontent-endtime.diag | 2 +- + test-scripts/testcontent-exclude-sig.diag | 2 +- + test-scripts/testcontent-exclude-sigflags.diag | 2 +- + test-scripts/testcontent-exclude.diag | 2 +- + test-scripts/testcontent.diag | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/test-scripts/addressprefix.diag b/test-scripts/addressprefix.diag +index cf7eee3..d02abb9 100644 +--- a/test-scripts/addressprefix.diag ++++ b/test-scripts/addressprefix.diag +@@ -1 +1 @@ +-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769], 6: 16, 7: 18, 8: 24, 9: 22}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {0: [h'D34F7B', h'56ED', h'3249EC', h'3249C0'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]] ++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769], 6: 16, 7: 18, 8: 24, 9: 22}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 0: [h'D34F7B', h'56ED', h'3249EC', h'3249C0'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]] +diff --git a/test-scripts/testcontent-endtime.diag b/test-scripts/testcontent-endtime.diag +index ba9dedc..10f5a0d 100644 +--- a/test-scripts/testcontent-endtime.diag ++++ b/test-scripts/testcontent-endtime.diag +@@ -1 +1 @@ +-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484], -1: [1459884804, 667820], -2: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]] ++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484], -1: [1459884804, 667820], -2: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]] +diff --git a/test-scripts/testcontent-exclude-sig.diag b/test-scripts/testcontent-exclude-sig.diag +index 77bfcc4..edab5a8 100644 +--- a/test-scripts/testcontent-exclude-sig.diag ++++ b/test-scripts/testcontent-exclude-sig.diag +@@ -1 +1 @@ +-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261113, 1: 0, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 1, 2: 86400, 3: 2}, {0: 1, 2: 86400, 3: 3}, {0: 1, 2: 86400, 3: 4}, {0: 1, 2: 86400, 3: 5}, {0: 1, 2: 32768, 3: 6}, {0: 8, 2: 86400, 3: 9}, {0: 8, 2: 86400, 3: 10}]}, 3: [{0: 0, 3: 61888, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 3: 11414, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]] ++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261113, 1: 0, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 1, 2: 86400, 3: 2}, {0: 1, 2: 86400, 3: 3}, {0: 1, 2: 86400, 3: 4}, {0: 1, 2: 86400, 3: 5}, {0: 1, 2: 32768, 3: 6}, {0: 8, 2: 86400, 3: 9}, {0: 8, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 3: 61888, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 3: 11414, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]] +diff --git a/test-scripts/testcontent-exclude-sigflags.diag b/test-scripts/testcontent-exclude-sigflags.diag +index a0bd5c9..d508f0c 100644 +--- a/test-scripts/testcontent-exclude-sigflags.diag ++++ b/test-scripts/testcontent-exclude-sigflags.diag +@@ -1 +1 @@ +-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261119, 1: 131055, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]] ++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261119, 1: 131055, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]] +diff --git a/test-scripts/testcontent-exclude.diag b/test-scripts/testcontent-exclude.diag +index c6ba34c..6bb1dad 100644 +--- a/test-scripts/testcontent-exclude.diag ++++ b/test-scripts/testcontent-exclude.diag +@@ -1 +1 @@ +-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261113, 1: 131068, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{0: 0, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]] ++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261113, 1: 131068, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]] +diff --git a/test-scripts/testcontent.diag b/test-scripts/testcontent.diag +index ba2d73c..dffcbf2 100644 +--- a/test-scripts/testcontent.diag ++++ b/test-scripts/testcontent.diag +@@ -1 +1 @@ +-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]] ++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]] diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 792b6b5a9331..a9433b3be18a 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -13,11 +13,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.25.0"; + version = "4.26.0"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-Snm9dDtHZQsx4T82tML77auBTb1lvITUOfL+kmhY4es="; + sha256 = "sha256-pEdjh/c4vhirj2R9bYDdi2FL7N9x67kTOyfXiJDzMKE="; }; buildInputs = [ diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 6f971f0c849f..9f19363d74fd 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,6 +1,6 @@ { stdenv, - fetchurl, + fetchzip, lib, makeWrapper, unzip, @@ -17,25 +17,24 @@ }: let - rev = 3546; + rev = 3627; jre' = if preferZulu then zulu else jre; gtk' = if preferGtk3 then gtk3 else gtk2; in stdenv.mkDerivation rec { pname = "davmail"; - version = "6.2.2"; + version = "6.3.0"; - src = fetchurl { + src = fetchzip { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip"; - hash = "sha256-45paGy6SfUFXK6vY8L4tHFYiio1/5ah9vTyGImdgwHI="; + hash = "sha256-zJMwCFX/uJnLeThj6/t2usBRM+LIuamZt0EFLG3N+8k="; + stripRoot = false; }; postPatch = '' sed -i -e '/^JAVA_OPTS/d' davmail ''; - sourceRoot = "."; - nativeBuildInputs = [ makeWrapper unzip diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index befd908a450f..3b6f5dfb8c25 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2025-03-19"; + version = "0-unstable-2025-05-11"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "aa58ee2a8a177f01d39bde7368f017fe0fcf425a"; - hash = "sha256-H+m5HqHGC1DzWgTQ0cyD5uwGLiRrKU3eJZ5M/InNmBg="; + rev = "232f4d469b67d746b9db067c0c73686dac87e938"; + hash = "sha256-k02oX7HAQ39UCm/hiS0cjibuZ/51sBTG1CnoP80e/mA="; }; - vendorHash = "sha256-tKY/8JUWNnHXtl305k/azAVsVihjC7TBYpopf/Ocqac="; + vendorHash = "sha256-gEwTpt/NPN1+YpTBmW8F34UotowrOcA0mfFgBdVFiTA="; env.CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix deleted file mode 100644 index 4a4ecd52c73e..000000000000 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - kdePackages, - wrapGAppsHook4, -}: - -stdenv.mkDerivation rec { - pname = "rssguard"; - version = "4.8.1"; - - src = fetchFromGitHub { - owner = "martinrotter"; - repo = pname; - tag = version; - sha256 = "sha256-qWxcjGl4EaLXZ0q6RVy+IKyBcqlx/yYojlGivSXy5Io="; - }; - - buildInputs = [ - kdePackages.qtwebengine - kdePackages.qttools - kdePackages.mpvqt - kdePackages.full - ]; - nativeBuildInputs = [ - cmake - wrapGAppsHook4 - kdePackages.wrapQtAppsHook - ]; - cmakeFlags = with lib; [ - (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"") - ]; - - meta = with lib; { - description = "Simple RSS/Atom feed reader with online synchronization"; - mainProgram = "rssguard"; - longDescription = '' - RSS Guard is a simple, light and easy-to-use RSS/ATOM feed aggregator - developed using Qt framework and with online feed synchronization support - for ownCloud/Nextcloud. - ''; - homepage = "https://github.com/martinrotter/rssguard"; - changelog = "https://github.com/martinrotter/rssguard/releases/tag/${version}"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ - jluttine - tebriel - ]; - }; -} diff --git a/pkgs/applications/networking/feedreaders/tuifeed/default.nix b/pkgs/applications/networking/feedreaders/tuifeed/default.nix deleted file mode 100644 index 9e8fc2a57c6a..000000000000 --- a/pkgs/applications/networking/feedreaders/tuifeed/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - stdenv, - fetchCrate, - rustPlatform, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "tuifeed"; - version = "0.4.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-/13YC5ur633bCRq2pEQKWL+EwLFp5ZkJF6Pnipqo76s="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-xfva1kEJz/KjPB5YP11130pyQngYUWAyqH3dVU7WqI8="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - doCheck = false; - - meta = with lib; { - description = "Terminal feed reader with a fancy UI"; - mainProgram = "tuifeed"; - homepage = "https://github.com/veeso/tuifeed"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ devhell ]; - }; -} diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix deleted file mode 100644 index 71ac15ef0cac..000000000000 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - lib, - stdenv, - fetchsvn, - autoreconfHook, - dbus, - gettext, - gnutls, - libfilezilla, - libidn, - nettle, - pkg-config, - pugixml, - sqlite, - tinyxml, - boost, - wrapGAppsHook3, - wxGTK32, - gtk3, - xdg-utils, - CoreServices, - Security, -}: - -stdenv.mkDerivation { - pname = "filezilla"; - version = "3.68.1"; - - src = fetchsvn { - url = "https://svn.filezilla-project.org/svn/FileZilla3/trunk"; - rev = "11205"; - hash = "sha256-izaNfagJYUcPRPihZ1yXwLUTHunzVXuiMITW69KPSFE="; - }; - - configureFlags = [ - "--disable-manualupdatecheck" - "--disable-autoupdatecheck" - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = - [ - boost - dbus - gettext - gnutls - libfilezilla - libidn - nettle - pugixml - sqlite - tinyxml - wxGTK32 - gtk3 - xdg-utils - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://filezilla-project.org/"; - description = "Graphical FTP, FTPS and SFTP client"; - longDescription = '' - FileZilla Client is a free, open source FTP client. It supports - FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available - under many platforms, binaries for Windows, Linux and macOS are - provided. - ''; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/applications/networking/ftp/gftp/default.nix b/pkgs/applications/networking/ftp/gftp/default.nix deleted file mode 100644 index 361abf88c2d8..000000000000 --- a/pkgs/applications/networking/ftp/gftp/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoconf, - automake, - gettext, - gtk, - intltool, - libtool, - ncurses, - openssl, - pkg-config, - readline, -}: - -stdenv.mkDerivation rec { - pname = "gftp"; - version = "2.9.1b"; - - src = fetchFromGitHub { - owner = "masneyb"; - repo = pname; - rev = version; - hash = "sha256-0zdv2oYl24BXh61IGCWby/2CCkzNjLpDrAFc0J89Pw4="; - }; - - nativeBuildInputs = [ - autoconf - automake - gettext - intltool - libtool - pkg-config - ]; - - buildInputs = [ - gtk - ncurses - openssl - readline - ]; - - preConfigure = '' - ./autogen.sh - ''; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - homepage = "https://github.com/masneyb/gftp"; - description = "GTK-based multithreaded FTP client for *nix-based machines"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - }; -} -# TODO: report the hardeningDisable to upstream diff --git a/pkgs/applications/networking/gopher/phetch/default.nix b/pkgs/applications/networking/gopher/phetch/default.nix deleted file mode 100644 index e5c90097e765..000000000000 --- a/pkgs/applications/networking/gopher/phetch/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - installShellFiles, - rustPlatform, - pkg-config, - openssl, - scdoc, - Security, - which, -}: - -rustPlatform.buildRustPackage rec { - pname = "phetch"; - version = "1.2.0"; - - outputs = [ - "out" - "man" - ]; - - src = fetchFromGitHub { - owner = "xvxx"; - repo = pname; - tag = "v${version}"; - hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-2lbQAM3gdytXsoMFzKwLWA1hvQIJf1vBdMRpYx/VLVg="; - - nativeBuildInputs = [ - installShellFiles - pkg-config - scdoc - which - ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - postInstall = '' - make manual - installManPage doc/phetch.1 - ''; - - doCheck = true; - - meta = with lib; { - description = "Quick lil gopher client for your terminal, written in rust"; - mainProgram = "phetch"; - longDescription = '' - phetch is a terminal client designed to help you quickly navigate the gophersphere. - - <1MB executable for Linux, Mac, and NetBSD - - Technicolor design (based on GILD) - - No-nonsense keyboard navigation - - Supports Gopher searches, text and menu pages, and downloads - - Save your favorite Gopher sites with bookmarks - - Opt-in history tracking - - Secure Gopher support (TLS) - - Tor support - ''; - changelog = "https://github.com/xvxx/phetch/releases/tag/v${version}"; - homepage = "https://github.com/xvxx/phetch"; - license = licenses.mit; - maintainers = with maintainers; [ felixalbrigtsen ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 0c3e2b095c03..b730bb4eb176 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -2,9 +2,7 @@ lib, stdenv, fetchFromGitHub, - buildPackages, vala, - cmake, ninja, wrapGAppsHook4, pkg-config, @@ -15,17 +13,17 @@ gtk4, glib-networking, libadwaita, + libcanberra, libnotify, - libsoup_2_4, + libsoup_3, libgee, - libsignal-protocol-c, + libomemo-c, libgcrypt, + meson, sqlite, gpgme, - pcre2, qrencode, icu, - gspell, srtp, libnice, gnutls, @@ -34,30 +32,28 @@ gst-plugins-good, gst-plugins-bad, gst-vaapi, - webrtc-audio-processing, + webrtc-audio-processing_1, }: stdenv.mkDerivation (finalAttrs: { pname = "dino"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-lF2cUalCrVD6274Ey8wggEXNvKXydlRjvX+815geL1c="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y3MGKpfhjmqnIvmt4mXnkmpjF/riXPDXyUiSrsceY6o="; }; postPatch = '' - # don't overwrite manually set version information - substituteInPlace CMakeLists.txt \ - --replace "include(ComputeVersion)" "" + echo ${finalAttrs.version} > VERSION ''; nativeBuildInputs = [ vala - cmake - ninja # https://github.com/dino/dino/issues/230 + meson + ninja pkg-config wrapGAppsHook4 gettext @@ -76,11 +72,10 @@ stdenv.mkDerivation (finalAttrs: { libnotify gpgme libgcrypt - libsoup_2_4 - pcre2 + libsoup_3 icu - libsignal-protocol-c - gspell + libcanberra + libomemo-c srtp libnice gnutls @@ -89,35 +84,22 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-good # contains rtpbin, required for VP9 gst-plugins-bad # required for H264, MSDK gst-vaapi # required for VAAPI - webrtc-audio-processing + webrtc-audio-processing_1 ]; - cmakeFlags = [ - "-DBUILD_TESTS=true" - "-DRTP_ENABLE_H264=true" - "-DRTP_ENABLE_MSDK=true" - "-DRTP_ENABLE_VAAPI=true" - "-DRTP_ENABLE_VP9=true" - "-DVERSION_FOUND=true" - "-DVERSION_IS_RELEASE=true" - "-DVERSION_FULL=${finalAttrs.version}" - "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext" - "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt" - "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" - "-DSOUP_VERSION=${lib.versions.major libsoup_2_4.version}" + doCheck = true; + + mesonFlags = [ + "-Dplugin-notification-sound=enabled" + "-Dplugin-rtp-h264=enabled" + "-Dplugin-rtp-msdk=enabled" + "-Dplugin-rtp-vaapi=enabled" + "-Dplugin-rtp-vp9=enabled" ]; # Undefined symbols for architecture arm64: "_gpg_strerror" NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lgpg-error"; - doCheck = true; - checkPhase = '' - runHook preCheck - ./xmpp-vala-test - ./signal-protocol-vala-test - runHook postCheck - ''; - # Dino looks for plugins with a .so filename extension, even on macOS where # .dylib is appropriate, and despite the fact that it builds said plugins with # that as their filename extension diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 528c544bc0aa..b4112a6126d6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,54 +9,54 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.89"; - ptb = "0.0.135"; - canary = "0.0.619"; - development = "0.0.73"; + stable = "0.0.94"; + ptb = "0.0.143"; + canary = "0.0.678"; + development = "0.0.75"; } else { - stable = "0.0.342"; - ptb = "0.0.166"; - canary = "0.0.727"; - development = "0.0.84"; + stable = "0.0.345"; + ptb = "0.0.173"; + canary = "0.0.784"; + development = "0.0.88"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-74M2SAJLS8u37m2bEo/Yblq822EbWWZfpLf5emvTusE="; + hash = "sha256-035nfbEyvdsNxZh6fkXh2JhY7EXQtwUnS4sUKr74MRQ="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-tzStiIAP83+ns5ZJr2DCtgLhoPf49RBnZtx6+unXndk="; + hash = "sha256-Ki6+o+8/yQjc6kxKS7Re2gBbpfMi3m02L69muqsNm04="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-2Jm0SjFMNw9Vlda9d2xywZlevxpay8DNx0krBr1sb4A="; + hash = "sha256-Z+pTuR5xZfbmucdx9aBti5diNp5oCpP1mu60mq7oPB8="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-zd8KpyBTdj+7jb1kRY99a48thdCRq3RNSC8oWKAQJXg="; + hash = "sha256-wxbmdEzJu66CqJ87cdOKH5fhWKFvD/FBaeJVFxRCvlQ="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-4Z/Up7KRRTaWEMUjVPi/CXbdeoEka72ZG6r3AeVmVjg="; + hash = "sha256-uyMcHV8dbCwKFQWy/s77KfEHKc+NiAq1X9Q0ih1ELLk="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-/VvTAAeSS/hzdaLt9Fjj+g3lqRVwJ08nM6fJdP77L9c="; + hash = "sha256-Fmh3EGjF3Xb2Vv39WEchrseo2t+4y1k+nLdb43GhJXI="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-RRQyXgAKTkOweMM6FE9exRXZWiT13dFh8VioGp2z1KQ="; + hash = "sha256-N3OdQZiLpkkaxr4yTfszHPj9/zfeVlUup5r2GB8OCMg="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-8qgWvcfWTL1FXSy5CeihpMxS3Ysa79ZFAlG1rAcoyUo="; + hash = "sha256-vjpbLg1YIXOSCwnuMwlXo7Sj8B28i812lJ3yV2NLMrE="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index ef77a66f3bb4..bf94609409a8 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -173,7 +173,10 @@ stdenv.mkDerivation rec { wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - ${lib.strings.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + ${lib.strings.optionalString withTTS '' + --run 'if [[ "''${NIXOS_SPEECH:-default}" != "False" ]]; then NIXOS_SPEECH=True; else unset NIXOS_SPEECH; fi' \ + --add-flags "\''${NIXOS_SPEECH:+--enable-speech-dispatcher}" \ + ''} \ ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \ diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index 606732baf580..2616621ad27c 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -15,15 +15,15 @@ let ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - amd64-linux_hash = "sha256-Ey2FhekQVSYB0ki4U3HyuKs/URgtZMCl41jkPsZMNrQ="; - arm64-linux_hash = "sha256-oiimMFwwkBOwqlCSFoGQSYHsDpcjTQingyuBkYz8fvA="; + amd64-linux_hash = "sha256-e5O8cvQqvymHQiu7kY1AhKfoVOsDLYK8hDX+PKgZPFs="; + arm64-linux_hash = "sha256-UskXFGxAFOrAK8bIXRHSwN0G1lakGyuRGXTYYRFKHaw="; } ."${arch}-linux_hash"; in mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb"; inherit hash; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index e5ba8abc06bd..be7e1f3faf14 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -7,10 +7,10 @@ mkFranzDerivation rec { pname = "franz"; name = "Franz"; - version = "5.10.0"; + version = "5.11.0"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "sha256-zQhZlxr7kyMWx6txDnV+ECBTzVEwnUaBsLWKJy3XYFg="; + sha256 = "sha256-4+HeH9lY5/2fswSwzMPM1Idllj01zU7nmlLOMYfcSsU="; }; meta = with lib; { description = "Free messaging app that combines chat & messaging services into one application"; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 471a7d47abb6..76e575fc1afd 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -40,11 +40,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "2.0.3"; + version = "2.2.0"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-DbM80fyJ+jwB9Yc9vfoiDqW7Sx7MDR0OEkHdOC6nRG4="; + hash = "sha256-TOZuMiE5RjaJYvNWxl2FyCp6uIO+LLWiRb7N9jc1yRk="; }; format = "pyproject"; @@ -139,6 +139,7 @@ python3.pkgs.buildPythonApplication rec { maintainers = with lib.maintainers; [ raskin abbradar + hlad ]; downloadPage = "http://gajim.org/download/"; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index f0e9a267e950..b6fc9a80f8a5 100644 --- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight matrix client with legacy and mobile browser support"; homepage = "https://github.com/element-hq/hydrogen-web"; - maintainers = lib.teams.matrix.members; + teams = [ lib.teams.matrix ]; license = lib.licenses.asl20; platforms = lib.platforms.all; inherit (olm.meta) knownVulnerabilities; diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix deleted file mode 100644 index f84eb379fec8..000000000000 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromSourcehut, - cmake, - extra-cmake-modules, - pkg-config, - kirigami2, - libdeltachat, - qtbase, - qtimageformats, - qtmultimedia, - qtwebengine, -}: - -mkDerivation { - pname = "kdeltachat"; - version = "unstable-2024-01-14"; - - src = fetchFromSourcehut { - owner = "~link2xt"; - repo = "kdeltachat"; - rev = "d61a01c2d6d5bdcc9ca500b466ed42689b2bd5c6"; - hash = "sha256-KmL3ODXPi1c8C5z2ySHg0vA5Vg/dZumDZTbpxkzf7A4="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - ]; - - buildInputs = [ - kirigami2 - libdeltachat - qtimageformats - qtmultimedia - qtwebengine - ]; - - # needed for qmlplugindump to work - QT_PLUGIN_PATH = "${qtbase.bin}/${qtbase.qtPluginPrefix}"; - QML2_IMPORT_PATH = lib.concatMapStringsSep ":" (lib: "${lib}/${qtbase.qtQmlPrefix}") [ - kirigami2 - qtmultimedia - ]; - - meta = with lib; { - description = "Delta Chat client using Kirigami framework"; - mainProgram = "kdeltachat"; - homepage = "https://git.sr.ht/~link2xt/kdeltachat"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 35e438c6a61f..1addd4fe76db 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { pname = "pantalaimon"; - version = "0.10.5"; + version = "0.10.6"; pyproject = true; # pypi tarball miss tests @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "matrix-org"; repo = "pantalaimon"; rev = version; - hash = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk="; + hash = "sha256-g+ZWarZnjlSOpD75yf53Upqj1qDlil7pdbfEsMAsjh0="; }; build-system = @@ -38,7 +38,6 @@ python3Packages.buildPythonApplication rec { with python3Packages; [ aiohttp - appdirs attrs cachetools click @@ -47,6 +46,7 @@ python3Packages.buildPythonApplication rec { logbook (matrix-nio.override { withOlm = true; }) peewee + platformdirs prompt-toolkit ] ++ lib.optionals enableDbusUi optional-dependencies.ui; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix index 6652781c75fc..05a4272a053f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -63,8 +63,6 @@ lib.makeScope newScope ( purple-plugin-pack = callPackage ./purple-plugin-pack { }; - purple-signald = callPackage ./purple-signald { }; - purple-slack = callPackage ./purple-slack { }; purple-vk-plugin = callPackage ./purple-vk-plugin { }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix deleted file mode 100644 index ed295055c2be..000000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pidgin, - json-glib, - signald, -}: - -stdenv.mkDerivation rec { - pname = "purple-signald"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "hoehermann"; - repo = "libpurple-signald"; - rev = "v${version}"; - hash = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc="; - fetchSubmodules = true; - }; - - buildInputs = [ - pidgin - json-glib - signald - ]; - - PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; - PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; - PKG_CONFIG_PIDGIN_DATADIR = "${placeholder "out"}/share"; - - meta = with lib; { - homepage = "https://github.com/hoehermann/libpurple-signald"; - description = "Signal support for Pidgin / libpurple"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ hufman ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 5ea2ed6bc1b3..fa4ca8190625 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -37,15 +37,15 @@ gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "profanity"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; - rev = version; - hash = "sha256-u/mp+vtMj602LfrulA+nhLNH8K6sqKIOuPJzhZusVmE="; + rev = finalAttrs.version; + hash = "sha256-3TmnbTnL8SPSd3seThavOOJVELi8kWLSlZlAub24KZ4="; }; patches = [ @@ -106,10 +106,6 @@ stdenv.mkDerivation rec { ++ lib.optionals pythonPluginSupport [ "--enable-python-plugins" ] ++ lib.optionals omemoSupport [ "--enable-omemo" ]; - preAutoreconf = '' - mkdir m4 - ''; - doCheck = true; LC_ALL = "en_US.utf8"; @@ -126,4 +122,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.devhell ]; platforms = platforms.unix; }; -} +}) 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 aec348dfa91c..d33cdaf0e5c7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation (finalAttrs: { inherit pname; - inherit (unwrapped) version meta passthru; + inherit (finalAttrs.unwrapped) version meta passthru; inherit unwrapped; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/qt-6.9.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/qt-6.9.patch new file mode 100644 index 000000000000..c852a8ab833f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/qt-6.9.patch @@ -0,0 +1,44 @@ +diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp +index 4e1d7c136..7c8f95888 100644 +--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp ++++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp +@@ -362,6 +362,10 @@ void PipPanel::init() { + ) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] { + // Workaround Qt's forced transient parent. + Ui::Platform::ClearTransientParent(widget()); ++ }, rp()->lifetime()); ++ ++ rp()->shownValue( ++ ) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] { + Ui::Platform::SetWindowMargins(widget(), _padding); + }, rp()->lifetime()); + +Submodule Telegram/lib_base contains modified content +diff --git a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp b/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp +index 8aca67c..6b781fb 100644 +--- a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp ++++ b/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp +@@ -16,7 +16,11 @@ + #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) + #include + #include ++#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) ++#include ++#else // Qt >= 6.9.0 + #include ++#endif // Qt < 6.9.0 + #endif // Qt >= 6.5.0 + + #include +@@ -39,7 +43,10 @@ std::string ParentWindowID(QWindow *window) { + } + + #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) +- if (const auto services = dynamic_cast( ++#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0) ++ using QDesktopUnixServices = QGenericUnixServices; ++#endif // Qt < 6.9.0 ++ if (const auto services = dynamic_cast( + QGuiApplicationPrivate::platformIntegration()->services())) { + return services->portalWindowIdentifier(window).toStdString(); + } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index b4ab76aebe29..d983f3a748c3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -56,6 +56,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-E9d5jWw4HeCO4sqDB0tXXgxM91kg1Gixi9B0xZQYe14="; }; + # Combined backport to fix Qt 6.9 issues: + # - https://github.com/telegramdesktop/tdesktop/commit/8b92ab25c776899c5432bf935447cac6f0b3ea2d + # - https://github.com/telegramdesktop/tdesktop/commit/c261c3367a11eeef69e6e346d339706dc4f00406 + # FIXME: remove in next update + patches = [ + ./qt-6.9.patch + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace-fail '"libasound.so.2"' '"${lib.getLib alsa-lib}/lib/libasound.so.2"' diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix deleted file mode 100644 index 31aaf069e8e2..000000000000 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - pkg-config, - openssl, - CoreServices, - Security, - SystemConfiguration, -}: - -rustPlatform.buildRustPackage rec { - pname = "twitch-tui"; - version = "2.6.18"; - - src = fetchFromGitHub { - owner = "Xithrius"; - repo = pname; - tag = "v${version}"; - hash = "sha256-uo9QEwSRIJKjWza8dEQXDCMQ/ydKBk/BX2TaVhX+k1M="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-H/MAbN7wCg74bNWt5xlNaukvGJLYyzuynYtIqxBOcbo="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; - - meta = with lib; { - description = "Twitch chat in the terminal"; - homepage = "https://github.com/Xithrius/twitch-tui"; - changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ maintainers.taha ]; - mainProgram = "twt"; - }; -} diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 0807b51f6fca..e87c9896370a 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -124,6 +124,13 @@ in ''; license = licenses.gpl3; maintainers = with maintainers; [ ttuegel ]; + mainProgram = + if monolithic then + "quassel" + else if buildClient then + "quasselclient" + else + "quasselcore"; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix deleted file mode 100644 index 30023e00057d..000000000000 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - stdenv, - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - Foundation, - dbusSupport ? stdenv.hostPlatform.isLinux, - dbus, - # rustls will be used for TLS if useOpenSSL=false - useOpenSSL ? stdenv.hostPlatform.isLinux, - openssl, - notificationSupport ? stdenv.hostPlatform.isLinux, -}: - -rustPlatform.buildRustPackage rec { - pname = "tiny"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "osa1"; - repo = "tiny"; - rev = "v${version}"; - hash = "sha256-phjEae2SS3zkSpuhhE4iscUM8ij8DT47YLIMATMG/+Q="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-lyjTl0kbtfQdqSqxti1181+oDVYP4U++v2JEOYvI7aM="; - - nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config; - buildInputs = - lib.optionals dbusSupport [ dbus ] - ++ lib.optionals useOpenSSL [ openssl ] - ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; - - buildFeatures = lib.optional notificationSupport "desktop-notifications"; - - meta = with lib; { - description = "Console IRC client"; - homepage = "https://github.com/osa1/tiny"; - changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ - Br1ght0ne - vyp - ]; - mainProgram = "tiny"; - }; -} diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 199b238ab388..b7d715ea4ad9 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -13,7 +13,6 @@ pkg-config, libgcrypt, cmake, - libobjc, libresolv, libiconv, asciidoctor, # manpages @@ -38,6 +37,7 @@ pcre2, libargon2, extraBuildInputs ? [ ], + writeScript, }: let @@ -98,16 +98,16 @@ let enabledPlugins = builtins.filter (p: p.enabled) plugins; in -assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins; -stdenv.mkDerivation rec { - version = "4.5.1"; - pname = "weechat"; - hardeningEnable = [ "pie" ]; +assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins; + +stdenv.mkDerivation rec { + pname = "weechat"; + version = "4.6.3"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-Z8FDx7xw5om56obfZ0yan/PPRMzJzf8hvmpWHV6vxSg="; + hash = "sha256-XAte+pabhzxL5YIBmxhSPuQD50MLgiOCW820Son1gV0="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 @@ -120,19 +120,22 @@ stdenv.mkDerivation rec { cmakeFlags = [ - "-DENABLE_MAN=ON" - "-DENABLE_DOC=ON" - "-DENABLE_DOC_INCOMPLETE=ON" - "-DENABLE_TESTS=${if enableTests then "ON" else "OFF"}" + (lib.cmakeBool "ENABLE_MAN" true) + (lib.cmakeBool "ENABLE_DOC" true) + (lib.cmakeBool "ENABLE_DOC_INCOMPLETE" true) + (lib.cmakeBool "ENABLE_TESTS" enableTests) ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" ] - ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeFeature "ICONV_LIBRARY" "${libiconv}/lib/libiconv.dylib") + ] + ++ map (p: lib.cmakeBool p.cmakeFlag p.enabled) plugins; nativeBuildInputs = [ cmake pkg-config asciidoctor ] ++ lib.optional enableTests cpputest; + buildInputs = [ ncurses @@ -146,12 +149,13 @@ stdenv.mkDerivation rec { libgcrypt ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc libresolv ] ++ lib.concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; + hardeningEnable = [ "pie" ]; + env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" # Fix '_res_9_init: undefined symbol' error @@ -167,13 +171,28 @@ stdenv.mkDerivation rec { ''; doInstallCheck = true; + installCheckPhase = '' $out/bin/weechat --version ''; + passthru.updateScript = writeScript "update-weechat" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p coreutils gawk git gnugrep common-updater-scripts + set -eu -o pipefail + + version="$(git ls-remote --refs https://github.com/weechat/weechat | \ + awk '{ print $2 }' | \ + grep "refs/tags/v" | \ + sed -E -e 's,refs/tags/v(.*)$,\1,' | \ + sort --version-sort --reverse | \ + head -n1)" + update-source-version weechat-unwrapped "$version" + ''; + meta = { homepage = "https://weechat.org/"; - changelog = "https://weechat.org/files/doc/weechat/ChangeLog-${version}.html"; + changelog = "https://github.com/weechat/weechat/releases/tag/v${version}"; description = "Fast, light and extensible chat client"; longDescription = '' You can find more documentation as to how to customize this package diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix index d08ad5686990..a9b5c72dbfbf 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -1,10 +1,10 @@ { - buildGo123Module, + buildGo124Module, cmake, extra-cmake-modules, fetchFromGitHub, git, - go_1_23, + go_1_24, kconfig, kcoreaddons, kdbusaddons, @@ -26,21 +26,21 @@ }: let - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-BgxWsT/s5Hv5cvzcSjfrgAmZhcoquaydSZKdPmld4Rg="; + hash = "sha256-8vtNAqCDXbzEuGXqUZL26EMmVLJqSFu+E/zhK8VafLE="; }; goDeps = - (buildGo123Module { + (buildGo124Module { pname = "ktailctl-go-wrapper"; inherit src version; modRoot = "src/wrapper"; - vendorHash = "sha256-ntk4WyJYEi6ZX2MyXMGgsYVqhAUQSGJLHWiNLkCwMEY="; + vendorHash = "sha256-F0fY9ZqibZNIUQSIlLRO3rX4gYAFHWMdFtwRNigpGZE="; }).goModules; in stdenv.mkDerivation { @@ -65,7 +65,7 @@ stdenv.mkDerivation { cmake extra-cmake-modules git - go_1_23 + go_1_24 wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 365aefcc4543..796742c045af 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -2,12 +2,11 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, - webkitgtk_4_0, + webkitgtk_4_1, ronn, libsass, notmuch, @@ -28,30 +27,21 @@ extraPythonPackages ? [ ], }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "astroid"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; - rev = "v${version}"; - sha256 = "sha256-6xQniOLNUk8tDkooDN3Tp6sb43GqoynO6+fN9yhNqZ4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-FDStUt989sQXX6kpqStrdjOdAMlLAepcDba9ul9tcps="; }; - patches = [ - (fetchpatch { - name = "symbolic-icons.patch"; - url = "https://github.com/astroidmail/astroid/commit/7c2022f06a4146ad62e858bcaacdb4ee817851b9.patch"; - hash = "sha256-hZHOg1wUR8Kpd6017fWzhMmG+/WQxSOCnsiyIvUcpbU="; - }) - (fetchpatch { - # error: 'is_regular' was not declared in this scope - name = "boost_is_regular.patch"; - url = "https://github.com/astroidmail/astroid/commit/abd84171dc6c4e639f3e86649ddc7ff211077244.patch"; - hash = "sha256-IY60AnWm18ZwrCFsOvBg76UginpMo7gXBf8GT87FqW4="; - }) - ]; + postPatch = '' + sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc + sed -i "s~ -geom 10x10~~g" src/config.cc + ''; nativeBuildInputs = [ cmake @@ -66,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtkmm3 gmime3 - webkitgtk_4_0 + webkitgtk_4_1 libsass libpeas python3 @@ -79,11 +69,6 @@ stdenv.mkDerivation rec { vim ]; - postPatch = '' - sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc - sed -i "s~ -geom 10x10~~g" src/config.cc - ''; - pythonPath = with python3.pkgs; requiredPythonModules extraPythonPackages; preFixup = '' buildPythonPath "$out $pythonPath" @@ -92,15 +77,15 @@ stdenv.mkDerivation rec { ) ''; - meta = with lib; { + meta = { homepage = "https://astroidmail.github.io/"; description = "GTK frontend to the notmuch mail system"; mainProgram = "astroid"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ bdimcheff SuprDewd ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index d531362bb966..2c4061da23bb 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.54.3"; + version = "3.56.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-dGz4HvXDJa8X9Tsvq0bWcmDzsT2gFNiZTUrZ6Ea4Ves="; + hash = "sha256-39/lmRCdI5vFbajpYlssGVcGegGujv81BmOj2q50vRY="; }; nativeBuildInputs = [ @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/evolution"; description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; mainProgram = "evolution"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 93eede6853d6..3084c682574c 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "imapfilter"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-pYnv9slw4bRPfCnhd/tlJC9JEx+3h40nyZ3qUll7p6c="; + sha256 = "sha256-9uPcdxZioXfdSuZO/fgtoIbQdWtc2DRr28iTonnG05U="; }; makeFlags = [ "SSLCAFILE=/etc/ssl/certs/ca-bundle.crt" diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix deleted file mode 100644 index 6bdd54302517..000000000000 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - lua, - file, - ncurses, - gmime, - pcre-cpp, - perl, - perlPackages, - makeWrapper, - debugBuild ? false, - alternativeGlobalConfigFilePath ? null, -}: - -let - version = "3.1"; - binaryName = if debugBuild then "lumail2-debug" else "lumail2"; - alternativeConfig = builtins.toFile "lumail2.lua" ( - builtins.readFile alternativeGlobalConfigFilePath - ); - - globalConfig = - if alternativeGlobalConfigFilePath == null then - '' - mkdir -p $out/etc/lumail2 - cp global.config.lua $out/etc/lumail2.lua - for n in ./lib/*.lua; do - cp "$n" $out/etc/lumail2/ - done - '' - else - '' - ln -s ${alternativeConfig} $out/etc/lumail2.lua - ''; - - getPath = type: "${lua}/lib/?.${type};"; - luaPath = getPath "lua"; - luaCPath = getPath "so"; -in -stdenv.mkDerivation { - pname = "lumail"; - inherit version; - - src = fetchurl { - url = "https://lumail.org/download/lumail-${version}.tar.gz"; - sha256 = "0vj7p7f02m3w8wb74ilajcwznc4ai4h2ikkz9ildy0c00aqsi5w4"; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - buildInputs = [ - lua - file - ncurses - gmime - pcre-cpp - perl - perlPackages.JSON - perlPackages.NetIMAPClient - ]; - - preConfigure = '' - sed -e 's|"/etc/lumail2|LUMAIL_LUAPATH"/..|' -i src/lumail2.cc src/imap_proxy.cc - - perlFlags= - for i in $(IFS=:; echo $PERL5LIB); do - perlFlags="$perlFlags -I$i" - done - - sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy - ''; - - buildFlags = lib.optional debugBuild "lumail2-debug"; - - installPhase = - '' - mkdir -p $out/bin || true - install -m755 ${binaryName} $out/bin/ - '' - + globalConfig - + '' - wrapProgram $out/bin/${binaryName} \ - --prefix LUA_PATH : "${luaPath}" \ - --prefix LUA_CPATH : "${luaCPath}" - ''; - - makeFlags = [ - "LVER=lua" - "PREFIX=$(out)" - "SYSCONFDIR=$(out)/etc" - "LUMAIL_LIBS=$(out)/etc/lumail2" - ]; - - meta = with lib; { - description = "Console-based email client"; - mainProgram = "lumail2"; - homepage = "https://lumail.org/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index b46ba1ecdf27..b4570d58434b 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "notmuch"; - version = "0.38.3"; + version = "0.39"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${finalAttrs.version}.tar.xz"; - hash = "sha256-mvRsyA2li0MByiuu/MJaQNES0DFVB+YywPPw8IMo0FQ="; + hash = "sha256-uIuwKnbEa62NMT/Su0+OOSmLUfZvy+swTZ+Aw+73BOM="; }; nativeBuildInputs = @@ -68,14 +68,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withRuby ruby ++ lib.optional withSfsexp sfsexp; - patches = [ - (fetchpatch { - name = "add-workaround-for-Emacs-30-pp-changes.patch"; - url = "https://git.notmuchmail.org/git?p=notmuch;a=patch;h=e3d4721b1ba4836c7646e057b50123fe994652eb"; - hash = "sha256-phfNSOlTajTmaf+DjtdmBAWSm+2tUbrQEChInUlwn5k="; - }) - ]; - postPatch = '' patchShebangs configure test/ @@ -142,10 +134,9 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${test-database} test/test-databases/database-v1.tar.xz '' + '' - # Issues since gnupg: 2.4.0 -> 2.4.1 - rm test/{T350-crypto,T357-index-decryption}.sh # Issues since pbr 6.0.0 bump (ModuleNotFoundError: No module named 'notmuch2') rm test/T055-path-config.sh + rm test/T610-message-property.sh # Flaky, seems to get its paths wrong sometimes (?) # *ERROR*: Opening output file: Permission denied, /nix/store/bzy21v2cd5sq1djzwa9b19q08wpp9mm0-emacs-29.1/bin/OUTPUT rm test/T460-emacs-tree.sh @@ -209,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - pythonSourceRoot = "notmuch-${finalAttrs.version}/bindings/python"; + pythonSourceRoot = "notmuch-${finalAttrs.version}/contrib/python-legacy"; gemEnv = buildEnv { name = "notmuch-vim-gems"; paths = with ruby.gems; [ mail ]; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix deleted file mode 100644 index 42f6c8597701..000000000000 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - gtk2, - openssl ? null, - gpgme ? null, - gpgSupport ? true, - sslSupport ? true, - fetchpatch, - Foundation, -}: - -assert gpgSupport -> gpgme != null; -assert sslSupport -> openssl != null; - -stdenv.mkDerivation rec { - pname = "sylpheed"; - version = "3.7.0"; - - src = fetchurl { - url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${pname}-${version}.tar.xz"; - sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; - }; - - patches = [ - (fetchpatch { - # patch upstream bug https://sylpheed.sraoss.jp/redmine/issues/306 - name = "patch-libsylph_ssl_c.patch"; - extraPrefix = ""; - url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/mail/sylpheed/patches/patch-libsylph_ssl_c?rev=1.4&content-type=text/plain"; - sha256 = "sha256-+FetU5vrfvE78nYAjKK/QFZnFw+Zr2PvoUGRWCuZczs="; - }) - (fetchpatch { - name = "CVE-2021-37746.patch"; - url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=ac286a71ed78429e16c612161251b9ea90ccd431"; - sha256 = "sha256-oLmUShtvO6io3jibKT67eO0O58vEDZEeaB51QTd3UkU="; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = - [ gtk2 ] - ++ lib.optionals gpgSupport [ gpgme ] - ++ lib.optionals sslSupport [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; - - configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl"; - - # Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool" - NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework Foundation"; - - meta = with lib; { - homepage = "https://sylpheed.sraoss.jp/en/"; - description = "Lightweight and user-friendly e-mail client"; - mainProgram = "sylpheed"; - maintainers = [ ]; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.gpl2; - }; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index e4528737697d..bed3329957db 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -3,6 +3,7 @@ # To update `thunderbird-bin`'s `release_sources.nix`, run from the nixpkgs root: # # nix-shell maintainers/scripts/update.nix --argstr package pkgs.thunderbird-bin-unwrapped +# nix-shell maintainers/scripts/update.nix --argstr package pkgs.thunderbird-esr-bin-unwrapped { lib, stdenv, @@ -24,6 +25,7 @@ systemLocale ? config.i18n.defaultLocale or "en_US", patchelfUnstable, # have to use patchelfUnstable to support --no-clobber-old-sections generated, + versionSuffix ? "", applicationName ? "Thunderbird", }: @@ -63,8 +65,7 @@ stdenv.mkDerivation { inherit pname version; src = fetchurl { - url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; - inherit (source) sha256; + inherit (source) url sha256; }; nativeBuildInputs = [ @@ -112,12 +113,12 @@ stdenv.mkDerivation { curl gnupg runtimeShell + versionSuffix ; baseName = "thunderbird"; channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; - versionSuffix = "esr"; }; passthru = { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix new file mode 100644 index 000000000000..01c6dbaded12 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix @@ -0,0 +1,797 @@ +{ + version = "128.10.1esr"; + sources = [ + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/af/thunderbird-128.10.1esr.tar.bz2"; + locale = "af"; + arch = "linux-x86_64"; + sha256 = "c66c686e94343eeb53ad0e202127becfb529cb3da2dca1b77b2420419e1fbe73"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ar/thunderbird-128.10.1esr.tar.bz2"; + locale = "ar"; + arch = "linux-x86_64"; + sha256 = "326c20ed0e8bea525cbfe385236efbddde2db7b5aabbda09081ff3a5aa21ddc9"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ast/thunderbird-128.10.1esr.tar.bz2"; + locale = "ast"; + arch = "linux-x86_64"; + sha256 = "d01bff98fda18ff648ddd57601c5f26e8b11e9df410f01192fbf7ba57732184e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/be/thunderbird-128.10.1esr.tar.bz2"; + locale = "be"; + arch = "linux-x86_64"; + sha256 = "c485a68ca28fedd45ce93e17180ef3122305d3ebac49028e001bf91c466fa701"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/bg/thunderbird-128.10.1esr.tar.bz2"; + locale = "bg"; + arch = "linux-x86_64"; + sha256 = "f31be4e8e2da5ae9390a99adce920b579db0bbb55d7ae9a0aee552af02149f10"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/br/thunderbird-128.10.1esr.tar.bz2"; + locale = "br"; + arch = "linux-x86_64"; + sha256 = "134cbb02c9023c66a46b3083b6f5751f6865f1d19b3e068571a92b341a264a8b"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ca/thunderbird-128.10.1esr.tar.bz2"; + locale = "ca"; + arch = "linux-x86_64"; + sha256 = "2b81952163805134cc65b21151958e1fd6c1ce3fb312917769ced340735baa48"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/cak/thunderbird-128.10.1esr.tar.bz2"; + locale = "cak"; + arch = "linux-x86_64"; + sha256 = "9c0156e6ff149c311d755123bd9f92d98e8cb41f05d54159d1fe12ce9a1c8f46"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/cs/thunderbird-128.10.1esr.tar.bz2"; + locale = "cs"; + arch = "linux-x86_64"; + sha256 = "76017bfa968079e3b48e36525e2d19f01a40b854a8d6ce2494a654d442296a6d"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/cy/thunderbird-128.10.1esr.tar.bz2"; + locale = "cy"; + arch = "linux-x86_64"; + sha256 = "067388baab68d54aca5fd4b105350871b4ed89e42763641b29e728c87312412c"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/da/thunderbird-128.10.1esr.tar.bz2"; + locale = "da"; + arch = "linux-x86_64"; + sha256 = "452e57612838e0d6a65162a66bd5347a694f46fb06f00ad522e6d331f314fe7a"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/de/thunderbird-128.10.1esr.tar.bz2"; + locale = "de"; + arch = "linux-x86_64"; + sha256 = "bda05607655b09504f07888e42e670346c4fb75c5105f4f01123fd9e0f2e5136"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/dsb/thunderbird-128.10.1esr.tar.bz2"; + locale = "dsb"; + arch = "linux-x86_64"; + sha256 = "1040cfbe784ce251a0ae00a210b5d3d6c9ef388f2292d1f4a855b4ec2e1158d8"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/el/thunderbird-128.10.1esr.tar.bz2"; + locale = "el"; + arch = "linux-x86_64"; + sha256 = "28b9c47b2ee873b2fdec84bff22ff834a86f90c85f7057711c79001e95d39ac5"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/en-CA/thunderbird-128.10.1esr.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha256 = "3d8b86bf5e774503a1d05ff94bd56d763c1c858b139f980faacfe23dff14f105"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/en-GB/thunderbird-128.10.1esr.tar.bz2"; + locale = "en-GB"; + arch = "linux-x86_64"; + sha256 = "c6bcf2b3bbf223c3a5fb90889945fd7da17431b9f545ca65c48bc617b2b8febb"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/en-US/thunderbird-128.10.1esr.tar.bz2"; + locale = "en-US"; + arch = "linux-x86_64"; + sha256 = "5eec0dd693b7fc90712c885bcad230eccd7f3450b46d87963b7782b07a79c02b"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/es-AR/thunderbird-128.10.1esr.tar.bz2"; + locale = "es-AR"; + arch = "linux-x86_64"; + sha256 = "9d419222115f4a44d8043abc53c76e68c36971a3c9d81a668c716495446dd505"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/es-ES/thunderbird-128.10.1esr.tar.bz2"; + locale = "es-ES"; + arch = "linux-x86_64"; + sha256 = "9ad29f1a7b2025fa00b2a16f4dbddd07a4c6c589e92be458215e909493d64d71"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/es-MX/thunderbird-128.10.1esr.tar.bz2"; + locale = "es-MX"; + arch = "linux-x86_64"; + sha256 = "8aed538779e334bedb084d8e23c76424f8c38c59f924fc616a216dff0f466572"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/et/thunderbird-128.10.1esr.tar.bz2"; + locale = "et"; + arch = "linux-x86_64"; + sha256 = "d6fe82c59bbd7f22ff2e14459f5730d04a81bd066d04a35872223d598c46f8ef"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/eu/thunderbird-128.10.1esr.tar.bz2"; + locale = "eu"; + arch = "linux-x86_64"; + sha256 = "2d46d7e535dfc8ca89cfec8e646e2ca1bd0ca67cfea4ed489ef50c7403e44cc8"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/fi/thunderbird-128.10.1esr.tar.bz2"; + locale = "fi"; + arch = "linux-x86_64"; + sha256 = "6ffe726c6221ea49cf45f0eab6887a6c4c4ede2efaa8776ecf990c52f2dddd2b"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/fr/thunderbird-128.10.1esr.tar.bz2"; + locale = "fr"; + arch = "linux-x86_64"; + sha256 = "7bbd0326d37d529631030fa8e9990ebaeec188014704dc3c2494514337cb5209"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/fy-NL/thunderbird-128.10.1esr.tar.bz2"; + locale = "fy-NL"; + arch = "linux-x86_64"; + sha256 = "63812daf0ef31b5906bc99e30369d268eb95e0c7c7e9754d4ff203106b891c9e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ga-IE/thunderbird-128.10.1esr.tar.bz2"; + locale = "ga-IE"; + arch = "linux-x86_64"; + sha256 = "a8694a13da1a05930746ce240c88c8c4a015bf4d81a0e013f27a2b86426fb421"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/gd/thunderbird-128.10.1esr.tar.bz2"; + locale = "gd"; + arch = "linux-x86_64"; + sha256 = "56dcd6b3d652508e3fa81b29171c7b108a878364e3e18d53d0d2a762ac0bfa71"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/gl/thunderbird-128.10.1esr.tar.bz2"; + locale = "gl"; + arch = "linux-x86_64"; + sha256 = "e3bc784bc66dcabc874ef29ccc129c2b6ed658f8babb963207087a84b70341c1"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/he/thunderbird-128.10.1esr.tar.bz2"; + locale = "he"; + arch = "linux-x86_64"; + sha256 = "2423696c56c56210b8a0f3d29b8813317d5eaf8ceb366a02134f33454a8b77dc"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/hr/thunderbird-128.10.1esr.tar.bz2"; + locale = "hr"; + arch = "linux-x86_64"; + sha256 = "56f8fd040b2ef3d116e3eed9e8a59d7831d11d366a398f2019486bddfc9a2798"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/hsb/thunderbird-128.10.1esr.tar.bz2"; + locale = "hsb"; + arch = "linux-x86_64"; + sha256 = "2b3acab919c76d89a51601e6363697ab83c2c90c45c3b81b9da7c294907df776"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/hu/thunderbird-128.10.1esr.tar.bz2"; + locale = "hu"; + arch = "linux-x86_64"; + sha256 = "6945c86d683259e113be15938749165ea388152550ca25c7757c7f0561365596"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/hy-AM/thunderbird-128.10.1esr.tar.bz2"; + locale = "hy-AM"; + arch = "linux-x86_64"; + sha256 = "535162246c252993dab09118458fe9100138cda68e0864d0f74b607517d67ed5"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/id/thunderbird-128.10.1esr.tar.bz2"; + locale = "id"; + arch = "linux-x86_64"; + sha256 = "60e05c5848428f87f5c2506fae299a1501482ff1d59e38bea37037f5352f048f"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/is/thunderbird-128.10.1esr.tar.bz2"; + locale = "is"; + arch = "linux-x86_64"; + sha256 = "5f71154d1a5c0fa2979b27dab349d0818ba47d4a98c1ff1dc8981542682dc46f"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/it/thunderbird-128.10.1esr.tar.bz2"; + locale = "it"; + arch = "linux-x86_64"; + sha256 = "9d53fcea9a6b7a530a418ed7dce16edf6e5e4380e24063a8596bfde39bfb1649"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ja/thunderbird-128.10.1esr.tar.bz2"; + locale = "ja"; + arch = "linux-x86_64"; + sha256 = "a0b26ef38e894fab1e9ba61e8f91fb40fa8e7fe98e612541ce41c637a01cfff0"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ka/thunderbird-128.10.1esr.tar.bz2"; + locale = "ka"; + arch = "linux-x86_64"; + sha256 = "6a9a3b21ecb587ca7c551b266f85daaa8f67c9a4dc4d848e0797aa5d7345c5e9"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/kab/thunderbird-128.10.1esr.tar.bz2"; + locale = "kab"; + arch = "linux-x86_64"; + sha256 = "ca407f60e6c72ad586169b75c2423fd4494a514eae24d11e3dcc3c8ba0e20e13"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/kk/thunderbird-128.10.1esr.tar.bz2"; + locale = "kk"; + arch = "linux-x86_64"; + sha256 = "43cb9688f7135044915b6b0d6f3d1d9ae72d99477a488b1d921e00f342e2277e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ko/thunderbird-128.10.1esr.tar.bz2"; + locale = "ko"; + arch = "linux-x86_64"; + sha256 = "0d7ca9cda728fa9d1bbd7698ba02a209ed9e78ac077d1eedfbf979f00fb942e7"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/lt/thunderbird-128.10.1esr.tar.bz2"; + locale = "lt"; + arch = "linux-x86_64"; + sha256 = "327829ce42e78a417a84d285a356ed3ac7c8d09ca755da7f8473eb226cdc6162"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/lv/thunderbird-128.10.1esr.tar.bz2"; + locale = "lv"; + arch = "linux-x86_64"; + sha256 = "05674ac21a82566afafd3da5b15c5b59f18a24b198c4c9dd33af2f1ca28c3e8f"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ms/thunderbird-128.10.1esr.tar.bz2"; + locale = "ms"; + arch = "linux-x86_64"; + sha256 = "ebbca65958ca8355066f9d57885140fedecf8d3a661b387016f3459e3d3c2f25"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/nb-NO/thunderbird-128.10.1esr.tar.bz2"; + locale = "nb-NO"; + arch = "linux-x86_64"; + sha256 = "a6735c6517e0450f275f6efeed060d08e8dbbf0879e9158ad87f6e32eb31cd72"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/nl/thunderbird-128.10.1esr.tar.bz2"; + locale = "nl"; + arch = "linux-x86_64"; + sha256 = "1064929fae022194bdc0d413e2c61f92b019da274c30d355bd2f445bee0395ba"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/nn-NO/thunderbird-128.10.1esr.tar.bz2"; + locale = "nn-NO"; + arch = "linux-x86_64"; + sha256 = "b87d37697efd424b6e5eee73566bda7d90be61794f2db48b9ff37ae14e309c2c"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/pa-IN/thunderbird-128.10.1esr.tar.bz2"; + locale = "pa-IN"; + arch = "linux-x86_64"; + sha256 = "851f84982228db5f2100d38cc641d1dbb676efcff5df120dfa7aa7b048ff78eb"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/pl/thunderbird-128.10.1esr.tar.bz2"; + locale = "pl"; + arch = "linux-x86_64"; + sha256 = "793a8f56f6a0ba9f9a848d1752d22cf7fffc45737ae37190467a9c3de3586b1e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/pt-BR/thunderbird-128.10.1esr.tar.bz2"; + locale = "pt-BR"; + arch = "linux-x86_64"; + sha256 = "149c387b3209434d17baee97c89527c3ee428f418ebc561c58f86d74cba297eb"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/pt-PT/thunderbird-128.10.1esr.tar.bz2"; + locale = "pt-PT"; + arch = "linux-x86_64"; + sha256 = "e525d2ef04133448f6dd261d87c7f53e528af1ccfe0b7367a643525efbb4f811"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/rm/thunderbird-128.10.1esr.tar.bz2"; + locale = "rm"; + arch = "linux-x86_64"; + sha256 = "e081b4ec691b8abdd1470a0ba7712f2cbb65aebcaadf1b3a6f52e2a7f3d2b6d2"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ro/thunderbird-128.10.1esr.tar.bz2"; + locale = "ro"; + arch = "linux-x86_64"; + sha256 = "140d956ff1e311d39e7abe3b5e1ee4cfad4262f9bf649b0554f103596140a6b6"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ru/thunderbird-128.10.1esr.tar.bz2"; + locale = "ru"; + arch = "linux-x86_64"; + sha256 = "c4fcc311d93215086b0e2e920ae03b4f89fbc1ea2a624987989fbafb1a1db88c"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/sk/thunderbird-128.10.1esr.tar.bz2"; + locale = "sk"; + arch = "linux-x86_64"; + sha256 = "ef2f660a4a60fdab36ffe91786bf11caebc2b1886eb6e075da3e03b89335579a"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/sl/thunderbird-128.10.1esr.tar.bz2"; + locale = "sl"; + arch = "linux-x86_64"; + sha256 = "6be2fce1cc5b0c16b897b8d027c6492b49e34239b44765a14bc30bdd7bf49a40"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/sq/thunderbird-128.10.1esr.tar.bz2"; + locale = "sq"; + arch = "linux-x86_64"; + sha256 = "151a5223e5dbe923d93dcd9ac580c719ee0fa32b52afb3adfe1ba61f8aea7948"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/sr/thunderbird-128.10.1esr.tar.bz2"; + locale = "sr"; + arch = "linux-x86_64"; + sha256 = "49e855e882a95a961d1bc28e71660e1c5fe60fd86ed3b24a07a56687607e28b9"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/sv-SE/thunderbird-128.10.1esr.tar.bz2"; + locale = "sv-SE"; + arch = "linux-x86_64"; + sha256 = "820a5c60c3b451b1f0771cd9fd65e21a5c47b9a3ecce96dbc6aea6814396884c"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/th/thunderbird-128.10.1esr.tar.bz2"; + locale = "th"; + arch = "linux-x86_64"; + sha256 = "0296358fe306d8b072a603c8fe8b1d63047b2c60dbb04437ea8608b32217bef7"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/tr/thunderbird-128.10.1esr.tar.bz2"; + locale = "tr"; + arch = "linux-x86_64"; + sha256 = "1291db7b68decfa7fabf948f011c3d21882a1585eb8084560269f3e97e856306"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/uk/thunderbird-128.10.1esr.tar.bz2"; + locale = "uk"; + arch = "linux-x86_64"; + sha256 = "dd73ee6027c1d15c4231adc7eb1a7fb8cf2a482541e3bb53ad06d3027c59ff51"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/uz/thunderbird-128.10.1esr.tar.bz2"; + locale = "uz"; + arch = "linux-x86_64"; + sha256 = "786cd211a5775d41df5c3a9afd454f7e0f4e2af3daa0b94f2d097fe9a9b50a7b"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/vi/thunderbird-128.10.1esr.tar.bz2"; + locale = "vi"; + arch = "linux-x86_64"; + sha256 = "4b19b4ddc22173654c58f272a32deb17ee60ca3b57b83043ffb7d2697b5264e1"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/zh-CN/thunderbird-128.10.1esr.tar.bz2"; + locale = "zh-CN"; + arch = "linux-x86_64"; + sha256 = "4afe9daa8c5c45488385bbb25dc6653b4371d92c36878247f52c81eec5abbc0b"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/zh-TW/thunderbird-128.10.1esr.tar.bz2"; + locale = "zh-TW"; + arch = "linux-x86_64"; + sha256 = "b290660b0dbbb0b7a73ba02a0e63c9314a5e739bdde4af14fe2f22dff6848fd5"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/af/thunderbird-128.10.1esr.tar.bz2"; + locale = "af"; + arch = "linux-i686"; + sha256 = "3120f8ac696695c340f7958bf34a08c459d9c058cc82e0042aa1470c75800a17"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ar/thunderbird-128.10.1esr.tar.bz2"; + locale = "ar"; + arch = "linux-i686"; + sha256 = "98298b3a274d6324845317b87eb16a3013c5f571bf4aa153f92519b808b1c9ab"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ast/thunderbird-128.10.1esr.tar.bz2"; + locale = "ast"; + arch = "linux-i686"; + sha256 = "cf570ea3dda592063a3ac3c94b0e19589957fb41e2d0d9876a911bfe0d093a5e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/be/thunderbird-128.10.1esr.tar.bz2"; + locale = "be"; + arch = "linux-i686"; + sha256 = "54f5cbe1eb765a1f3a5044b15995247d93af65d52d77575978a4266e8c92dfa1"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/bg/thunderbird-128.10.1esr.tar.bz2"; + locale = "bg"; + arch = "linux-i686"; + sha256 = "e6ed815e487bbb3cbcda3521e7e5dc2155cda8c2403712d5312ea479ee910689"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/br/thunderbird-128.10.1esr.tar.bz2"; + locale = "br"; + arch = "linux-i686"; + sha256 = "f86cf16e950897632b5ee19069e0ea270a432dae64c6ee2808cad28dfc4c9891"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ca/thunderbird-128.10.1esr.tar.bz2"; + locale = "ca"; + arch = "linux-i686"; + sha256 = "4f04ba3090f600e7634d88f29c8568eb8ccd20998cb8bd196eea3e1b14b2301f"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/cak/thunderbird-128.10.1esr.tar.bz2"; + locale = "cak"; + arch = "linux-i686"; + sha256 = "f0f6d125325922bb5bdd8c66b14d9fe879918798fdf156f0526e9825f37435e7"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/cs/thunderbird-128.10.1esr.tar.bz2"; + locale = "cs"; + arch = "linux-i686"; + sha256 = "da7718c38abfb5c64c0f3f75cc4d4c3c5c510532f0a5e4ff4cba0f9bf6fce42d"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/cy/thunderbird-128.10.1esr.tar.bz2"; + locale = "cy"; + arch = "linux-i686"; + sha256 = "830c07d56bd642c291f1c3deb7650c565e620a4d17c33f561fc20b8f6c5fba43"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/da/thunderbird-128.10.1esr.tar.bz2"; + locale = "da"; + arch = "linux-i686"; + sha256 = "93f7b3cf5ea839f120a20f9a8accbf801676a2644d6f9bb74c0854da8c1c8be2"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/de/thunderbird-128.10.1esr.tar.bz2"; + locale = "de"; + arch = "linux-i686"; + sha256 = "f224696b2b5b9a68d139d8262441cf03c166e9cc99d9bf9cbda526eb834bf467"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/dsb/thunderbird-128.10.1esr.tar.bz2"; + locale = "dsb"; + arch = "linux-i686"; + sha256 = "6816f08e9f4df65be9606ed7e14b629f94023207d381636402473e91de632659"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/el/thunderbird-128.10.1esr.tar.bz2"; + locale = "el"; + arch = "linux-i686"; + sha256 = "02150793596918b5080fccc8790ee28f1711ceb146d93cadc241dc870647f68e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/en-CA/thunderbird-128.10.1esr.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha256 = "da1cb2b3f036c36eb54c599f198d6f6362b8f58979f637effd3468894820ce63"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/en-GB/thunderbird-128.10.1esr.tar.bz2"; + locale = "en-GB"; + arch = "linux-i686"; + sha256 = "35155fc9cbaaa5cda207cfa2ee7919a7a74f63cef37ebd9d3f6aced65af61d9e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/en-US/thunderbird-128.10.1esr.tar.bz2"; + locale = "en-US"; + arch = "linux-i686"; + sha256 = "0b0041736a42409810dcfefaaa842058f2ca31adba240e63ea996e5a51d08aa3"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/es-AR/thunderbird-128.10.1esr.tar.bz2"; + locale = "es-AR"; + arch = "linux-i686"; + sha256 = "5941f02ecc5891569619d8d2f5aa05dc64ae4a26e53b335ca48ea0d208da6ae7"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/es-ES/thunderbird-128.10.1esr.tar.bz2"; + locale = "es-ES"; + arch = "linux-i686"; + sha256 = "144a8bc1710bad7cab3c06e274ecd9fdef8029dcf0253368264eec9bea3c3101"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/es-MX/thunderbird-128.10.1esr.tar.bz2"; + locale = "es-MX"; + arch = "linux-i686"; + sha256 = "df8768efbdfe3be8add56d2347428465bb1510cb98ecada28996c1a1f671ac02"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/et/thunderbird-128.10.1esr.tar.bz2"; + locale = "et"; + arch = "linux-i686"; + sha256 = "8eb4caec1b71fc19061d4217f50e623bd10114e0ffeca84f2cb5d15f270a81b4"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/eu/thunderbird-128.10.1esr.tar.bz2"; + locale = "eu"; + arch = "linux-i686"; + sha256 = "c976f0c92887eeb78044f9aad071d9bf91abdb18152134c76c88d07f0eb352fb"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/fi/thunderbird-128.10.1esr.tar.bz2"; + locale = "fi"; + arch = "linux-i686"; + sha256 = "781f489050cce136fd3f044c6f117825bd792a393798571a2286d2a428d10599"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/fr/thunderbird-128.10.1esr.tar.bz2"; + locale = "fr"; + arch = "linux-i686"; + sha256 = "6669e5f865255ec0518980dae774acd169630e396e5473ea291d1dedcf872f99"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/fy-NL/thunderbird-128.10.1esr.tar.bz2"; + locale = "fy-NL"; + arch = "linux-i686"; + sha256 = "0c022a1c0b15f2cf33878aec58d96af20c0edea3ba219e1b1f6f4659607e8899"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ga-IE/thunderbird-128.10.1esr.tar.bz2"; + locale = "ga-IE"; + arch = "linux-i686"; + sha256 = "5d254425d10ec0eb250368cc64415a08888e4d36fb5a96115daae20c5b568601"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/gd/thunderbird-128.10.1esr.tar.bz2"; + locale = "gd"; + arch = "linux-i686"; + sha256 = "d7f72b5564c7d6d3b0479494c5db39b43ba6c97ea891b4724a5ab879a7443673"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/gl/thunderbird-128.10.1esr.tar.bz2"; + locale = "gl"; + arch = "linux-i686"; + sha256 = "9962bdc0865fe15c128ec930e06eadbfa61eb3e922f3ff01e2d7ea4b1d263637"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/he/thunderbird-128.10.1esr.tar.bz2"; + locale = "he"; + arch = "linux-i686"; + sha256 = "835ed155d2ee97845b8c53767875940713fd712657c9a1254671061026baf089"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/hr/thunderbird-128.10.1esr.tar.bz2"; + locale = "hr"; + arch = "linux-i686"; + sha256 = "6381cd944832df7b023773c53ebf6170b1852b8723a43260ee2f1f87b97889d3"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/hsb/thunderbird-128.10.1esr.tar.bz2"; + locale = "hsb"; + arch = "linux-i686"; + sha256 = "b142d349ee7910d3932c266f0f8f19b90709c87938f7d0e254cfe5cbf5070d6d"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/hu/thunderbird-128.10.1esr.tar.bz2"; + locale = "hu"; + arch = "linux-i686"; + sha256 = "3520b52f83dc364e587f80e8074bc3814f5b4d7c0dbe0c6e8261f8e78b9983a9"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/hy-AM/thunderbird-128.10.1esr.tar.bz2"; + locale = "hy-AM"; + arch = "linux-i686"; + sha256 = "1b58df19a19a955d52ea0b54944ce2a83d29a012eff58064eed0ca22ecd89343"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/id/thunderbird-128.10.1esr.tar.bz2"; + locale = "id"; + arch = "linux-i686"; + sha256 = "f4bada34a7953b14d7c59ec335541d75f3b5f749aaccf15f86e26e7b82ac4700"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/is/thunderbird-128.10.1esr.tar.bz2"; + locale = "is"; + arch = "linux-i686"; + sha256 = "47a45bf4c9be0d8c7cffb386e507319e9cef741eedd8f94d21a46133e745a5d9"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/it/thunderbird-128.10.1esr.tar.bz2"; + locale = "it"; + arch = "linux-i686"; + sha256 = "ed7ed6804e7b088699e40fb0afc2da260f4a6dd920d40fb7caae57a2823bea48"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ja/thunderbird-128.10.1esr.tar.bz2"; + locale = "ja"; + arch = "linux-i686"; + sha256 = "e5f5677a0f10c281d04c32d17eb8c4cd7832bab665d4bd0b5bc4301b81fe86ac"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ka/thunderbird-128.10.1esr.tar.bz2"; + locale = "ka"; + arch = "linux-i686"; + sha256 = "96cde5975473758908acc179ff99f8b2309b8187a8f4e5a10361e27c27f8a28c"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/kab/thunderbird-128.10.1esr.tar.bz2"; + locale = "kab"; + arch = "linux-i686"; + sha256 = "94f716b78c04609de727aa700019e6b22df2b3ee95597138d4c513891b930c68"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/kk/thunderbird-128.10.1esr.tar.bz2"; + locale = "kk"; + arch = "linux-i686"; + sha256 = "b33ce1636d5d4a550ee752430273bf29dca5cf51f5d8ea2c9295a53a6b774659"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ko/thunderbird-128.10.1esr.tar.bz2"; + locale = "ko"; + arch = "linux-i686"; + sha256 = "834e2fef5417538c9b1c04329ea95a51685ffe196e12c7b92b115f1d6ef89845"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/lt/thunderbird-128.10.1esr.tar.bz2"; + locale = "lt"; + arch = "linux-i686"; + sha256 = "7a0f1cf847a088dbbe3a57a11e953530169974016321c0d8661872bee41b3568"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/lv/thunderbird-128.10.1esr.tar.bz2"; + locale = "lv"; + arch = "linux-i686"; + sha256 = "2bec40989bf5a78a6635df103dba0d95b816a0baed1a52804cf144cfd1203a27"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ms/thunderbird-128.10.1esr.tar.bz2"; + locale = "ms"; + arch = "linux-i686"; + sha256 = "aefd6fe512f45dde9d429ad69e776006e1be7266d140e6501414cf9610f71ec4"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/nb-NO/thunderbird-128.10.1esr.tar.bz2"; + locale = "nb-NO"; + arch = "linux-i686"; + sha256 = "dcc352bac76311990eecae929219a48647972837a0251b22ecd1bc282ad97721"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/nl/thunderbird-128.10.1esr.tar.bz2"; + locale = "nl"; + arch = "linux-i686"; + sha256 = "341b5d01749e8755820cc689b624b6d38520e80b79b644f529afd077d438c5a6"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/nn-NO/thunderbird-128.10.1esr.tar.bz2"; + locale = "nn-NO"; + arch = "linux-i686"; + sha256 = "53b878080dce821a4b843e50ab4fe96517e1fe7cbf2a100746b6f94f2f73098d"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/pa-IN/thunderbird-128.10.1esr.tar.bz2"; + locale = "pa-IN"; + arch = "linux-i686"; + sha256 = "753e4cc0548e6c457ca15d85126ec98d9b01eb1656dcc08d6223812d60141925"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/pl/thunderbird-128.10.1esr.tar.bz2"; + locale = "pl"; + arch = "linux-i686"; + sha256 = "9635b166c9b176b4afd64fe3595ab9f9597520549aaa04e467eb9b53b33398c4"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/pt-BR/thunderbird-128.10.1esr.tar.bz2"; + locale = "pt-BR"; + arch = "linux-i686"; + sha256 = "350b85a3392484604beb5bd7be1bdf9c451090bb769346605a922ae5cbceb8b1"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/pt-PT/thunderbird-128.10.1esr.tar.bz2"; + locale = "pt-PT"; + arch = "linux-i686"; + sha256 = "e7d34eec2294663aa0393aa075a352ade8ea77a24853cf312c80a510229b0b7b"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/rm/thunderbird-128.10.1esr.tar.bz2"; + locale = "rm"; + arch = "linux-i686"; + sha256 = "78cd5c7efb68b006ff90061a6daa81e49edeb010980d2759cc09d339b04e5158"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ro/thunderbird-128.10.1esr.tar.bz2"; + locale = "ro"; + arch = "linux-i686"; + sha256 = "4d4b27ed02fbc0c50cdb48ef1c4b31978365ad11067893d78c1c1602f6379da5"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ru/thunderbird-128.10.1esr.tar.bz2"; + locale = "ru"; + arch = "linux-i686"; + sha256 = "13db14980489b69efbf5958b0344591cc499c9cebd150b94acfbd52f7cc05fa1"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/sk/thunderbird-128.10.1esr.tar.bz2"; + locale = "sk"; + arch = "linux-i686"; + sha256 = "9569c6a344593ef330c0a474faee7481339ce5f47ec9e7a46d7676b736c3dc33"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/sl/thunderbird-128.10.1esr.tar.bz2"; + locale = "sl"; + arch = "linux-i686"; + sha256 = "0adf5e860d7c044c1044da715472b5e7524c34398ec376f68048c3e7e861835f"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/sq/thunderbird-128.10.1esr.tar.bz2"; + locale = "sq"; + arch = "linux-i686"; + sha256 = "f4b37f6f8f8522f06bd30444c73c08e57cf8618180768e1958aebb4a6c29dbc1"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/sr/thunderbird-128.10.1esr.tar.bz2"; + locale = "sr"; + arch = "linux-i686"; + sha256 = "f1b6f5fa94ba80b3e0d14a53207e1ca70ffca67ee0305ee6c1b1f22c067d4135"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/sv-SE/thunderbird-128.10.1esr.tar.bz2"; + locale = "sv-SE"; + arch = "linux-i686"; + sha256 = "4c8d109285e12ba5a3b7f3096337426874de46da653d21f87f794859c362a8d3"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/th/thunderbird-128.10.1esr.tar.bz2"; + locale = "th"; + arch = "linux-i686"; + sha256 = "b8ecad961311e092a46388db028ed794c2f9ce61bad661f371e7886c157ee41e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/tr/thunderbird-128.10.1esr.tar.bz2"; + locale = "tr"; + arch = "linux-i686"; + sha256 = "bf5cc9251b3b6c7979aa4f14e4365ec9c04c737df943c03346563429fd8a0e00"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/uk/thunderbird-128.10.1esr.tar.bz2"; + locale = "uk"; + arch = "linux-i686"; + sha256 = "aebf3219802af5e6e8697dc1c6a9bee89b0166627844ec45b11d469debac780b"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/uz/thunderbird-128.10.1esr.tar.bz2"; + locale = "uz"; + arch = "linux-i686"; + sha256 = "4da45bae60f6b5f2b129f5795f4b7128afd590eb7615d0c9e5e674513c32f49f"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/vi/thunderbird-128.10.1esr.tar.bz2"; + locale = "vi"; + arch = "linux-i686"; + sha256 = "1fe9e15fb4b825884e0b0a1daa1857ec387833694e180800cde206dda6d33f31"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/zh-CN/thunderbird-128.10.1esr.tar.bz2"; + locale = "zh-CN"; + arch = "linux-i686"; + sha256 = "0146dfc5ee0b29a3c34d655c66451a3ee1887e71add898ef36b5dd415726d62e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/zh-TW/thunderbird-128.10.1esr.tar.bz2"; + locale = "zh-TW"; + arch = "linux-i686"; + sha256 = "af6b63b013ea7b518e2e950cf9a824d3cf451bd1fd9aaeca4f19ca8356bc67bd"; + } + ]; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index ec1af8d8f5fd..26c11480272b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,1193 @@ { - version = "128.8.1esr"; + version = "138.0.1"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/af/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/af/thunderbird-138.0.1.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "1013fceb548167ca90b7125291eb85bca2d2e9a3ae4f414f6c7d2a6848bc1b45"; + sha256 = "db0a833bd7e89dcf627aaca2a9ed27f4d6661ed755e69dc4a5c177bae24f9dc0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ar/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ar/thunderbird-138.0.1.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a1c1ec155cdf1ca9ce1e56202da91fb7c6f30ed3f6db7ad1971ac4fdbd4bbb6b"; + sha256 = "775b9abca39f5a38f42508081bee10c680eab7226f14d0b4b47a24b8c6859593"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ast/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ast/thunderbird-138.0.1.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a85e37acbbdf1c3361b35bb5ab38b49124322923836feb937a7acdbb61e16cf6"; + sha256 = "66481bfc9e9cefe3865b57dc021e25cecb6473ac39f114795be2808a2888304d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/be/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/be/thunderbird-138.0.1.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "3db91b4244478bc98a160b45a9d26069f35cf128a7552b3ea036c8998f28ee24"; + sha256 = "479d8fc38b7d90b3927699e87433a1b53313e52aa552a02bb67d95dbefce2321"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/bg/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/bg/thunderbird-138.0.1.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "7c70e78e6e5bc46466a01921dc7341724752211a59201d07933c20d0f0343991"; + sha256 = "c097bc1bcd38aeefc677409af611f46250ffbd1623a34f5ebb1e6d18ce46901d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/br/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/br/thunderbird-138.0.1.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e3c187dbaa095b046a0797d4448c717416c457312abeef910595940638f0450e"; + sha256 = "0b974402095a491917a542fedfdf337686fab6d4b3df2a11741b918d6d3de9a1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ca/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ca/thunderbird-138.0.1.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "dc5fb1457bff9ca89d96472d5bed05150e6968dec081f3ecf83db7fd77b672e5"; + sha256 = "2fa6490081001048db2cafcfffa137a3faac7ab4fa5f8fab1b961ec3385f9127"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/cak/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/cak/thunderbird-138.0.1.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "db0cf8c9769d1f43dd10d9981837bc9eee8d561c0caa3170f76caef5e8de8cf3"; + sha256 = "3e5671a1fac2f525f55cfca7b22dd54e6405e7798250534932ebb15dd7528281"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/cs/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/cs/thunderbird-138.0.1.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ffed1d03587b43b8f91bf1ae951faec6b504f782a79ce157318858a385492d7b"; + sha256 = "818be66330654c33dae58f6d12f964fcbd303087794e63d9882b24d27291cc95"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/cy/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/cy/thunderbird-138.0.1.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "fc47f033c0c2978cec6bbe8b17cd5d3d6be40262c5ca99b868b0ffc35d5b8a72"; + sha256 = "cc694a7830b02a99e44139d22645601e82c229493182a4f56c6de963ce44f460"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/da/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/da/thunderbird-138.0.1.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "57f0e2016573fed49e1240a19a94c46d7707b646c0d61b9ddf5c8649d89a435a"; + sha256 = "ba493c8f8090ff2d07e09e80e567004e6c75d4147e41994d2137978101f12ec5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/de/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/de/thunderbird-138.0.1.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "cb5267e7f41b8ccec5105e0602ddd75f912d0627416bd29c0211121aab6e4dfd"; + sha256 = "5dc96feca1b53e73b5c4a5c705a299f92be0f0d7bf97305c849639660adccb64"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/dsb/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/dsb/thunderbird-138.0.1.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c9123f5f024a150fb26e8155e405d73649f2b8f384114c6e437514a1df59856c"; + sha256 = "eca7dd892230772da73825322d848d81bd689e3dee86424a1adbc41dd9150bd5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/el/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/el/thunderbird-138.0.1.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5bfdb2b5136cb792cd6ec027ee3b4c099172fe38e555867f954c408d689a18ff"; + sha256 = "8a11983a86ec9a8733a3c33a8b3487a68d087dd1473f7e1b7025e2501303562d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/en-CA/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/en-CA/thunderbird-138.0.1.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3295ccf7957a21a44987dce3af0aeedb6c3b743060eb7223740829c819a04071"; + sha256 = "79052f38101956280b2be5920eafc082a77250ceb680b2d576b8241271f1d553"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/en-GB/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/en-GB/thunderbird-138.0.1.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "4213003e05d7e25638e2064dcdd1d869e35662ad288070fd321fe2b60e254004"; + sha256 = "b5c577b6ecf8f3db288cbc4a0dfdd5042545189a86a4e19cc8839c621efd3a7b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/en-US/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/en-US/thunderbird-138.0.1.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2df2b8fab412eb3dbe6a2f3bb0547af5fa66d2c2dbc7f78c0201bbe255fa779d"; + sha256 = "e5c98a14416debd9c80df438ce5da71ab389f9ae4f0b4b7a7a7c53e105f475a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/es-AR/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/es-AR/thunderbird-138.0.1.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f0e3980d7771b3ab3d82e352f333cb9ef182e2005b634ef904710bd74de3503f"; + sha256 = "1b75191c44eeaa0c7bc8dd4f3d74b2748b26adf6c84609e673f2511816240015"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/es-ES/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/es-ES/thunderbird-138.0.1.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "8fe833d918e46a4717ea3539200dedd1e712fa89bf9427a983eb3f4dcc8f067e"; + sha256 = "d4a80cae7aa734a2f3dd8345f28364ecd6053040f0e27d8b4191dd13b9ecb23a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/es-MX/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/es-MX/thunderbird-138.0.1.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "00426c67a097968ef0ef876532b1ddaecbcc4d8635dc8805e1a282cefc59ccd7"; + sha256 = "4f0ccc9d0aaebc9948f516674de57b330482e32c213b17a913beaa6310f7ddb1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/et/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/et/thunderbird-138.0.1.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "1453ef45e4a8d1bb6c74dc91150d3a4f895dd5220b4be33f428845d13417b6bc"; + sha256 = "9dd981bcaf090807b5e39e25620bc0e16f97343223d788f682e6ff17f36a3d4f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/eu/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/eu/thunderbird-138.0.1.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "bb258a3b54aab7661bfa35be0bc2e3c9de833663dae87df64dc61465f4e4d75e"; + sha256 = "187b407ab590ac5edf8be7057137a63f90db905fe99d21387680181e9a676e43"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/fi/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/fi/thunderbird-138.0.1.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9c2ea3244de9763164fb17626cb0a3f40757f86cdee76b5d63ed251fd149f59c"; + sha256 = "86d41c0c869d2174d4960d27e891d4ea9358a4d49e43ecc458aa9678cd2b787b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/fr/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/fr/thunderbird-138.0.1.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "aa0dc1e0adb9fc5928c4594de763becb41e8423fc3adeec5f6f27a643cd9fbfb"; + sha256 = "c59e22fb1d68f6d152d7b11e8d8bd8e804c60426b76e45362dfb496a39000551"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/fy-NL/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/fy-NL/thunderbird-138.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "b20065b2e2cc571b02b90e85c7e61c4db76c27ed86f12efc57ddfc3f53ebee31"; + sha256 = "dd8655d113338975ced5e247429419f59a1d0f08c980c74eb8cd074bb7503dfa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ga-IE/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ga-IE/thunderbird-138.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "c2a0f4c18c88cec7bfdef86069014cdba89ef969dbecc00605be18ba6a5c4495"; + sha256 = "9af1b23145e139752692f10ee86448a48dd1bde852c68eac800c17c9a7c8c2e3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/gd/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/gd/thunderbird-138.0.1.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f702d1931310215a3f091f560ce34086e1864a7d2a981b6890182d1f6b817c68"; + sha256 = "45c4a6e3e70cf57770c09130d469a643e400992136d1e6b31b9d8c6abaf72ead"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/gl/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/gl/thunderbird-138.0.1.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ac1c1996ec521a6c59d2e55fa5af1f9a71ec1a40fa71aef1de2fa87f30400dc0"; + sha256 = "dc1707ecbba8f7c41aa5bea66d5c05a042bbeb43965fd61605b913850b107e9c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/he/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/he/thunderbird-138.0.1.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5bd1242155f000a9e1c3eff3ae1df0900208613f085ecff42ccbf6d2dcc8e673"; + sha256 = "d3c563a5a08b7da302070afcbf22b3b282fe04c24804ae20f3bab72e108724b1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hr/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/hr/thunderbird-138.0.1.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "16ae5be658966d5ba8b90dd2a970cbc9c04f5037312b283fd2b7b3b26fcd40ab"; + sha256 = "8432b563726859aae9b48cde72fe9052bd470b677503569f7b94b8099afb2d49"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hsb/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/hsb/thunderbird-138.0.1.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3fd7eb3258053f88498dfb1138f157e7d0d501cb9e2815145e6a11a48dbb1b59"; + sha256 = "ef81ff26964f54a6fbf0514eaa5daebcd9bdd14e1adfe760f97e63957ab4f79b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hu/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/hu/thunderbird-138.0.1.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "9cfb8919c62a73aa3940d2ada6bd9d43c1bff3841d1ede8b6d65ea36b9fec255"; + sha256 = "eeb149d1f78476478dabec94d7cb52bd7231374356ee5921df367553a79a7146"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hy-AM/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/hy-AM/thunderbird-138.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "743d74587977da860f566b82cca1af36920f3a11e4c6f8cb6c388276e105632a"; + sha256 = "006f60bdbd72652fbb1001f647415035a77673b385b0e9e3543a22a5b9a99cfd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/id/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/id/thunderbird-138.0.1.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1b550d116c2174f478d13fba988bc070165507a61a0ed341a8fbb551cfa2777d"; + sha256 = "9b31f9d2266fecf4fd2c07fbb50c978a64cf704a5ac5d31339972ab518df025b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/is/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/is/thunderbird-138.0.1.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "44f80b2b0358c18e5d5810d59aa9dca376485c12fc4c2da4786d41e979286a7f"; + sha256 = "8c1a612ecb43cb2785b4cf7f60a063da236363cd9cd08f353a78eacf934bdf4d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/it/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/it/thunderbird-138.0.1.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "981b59ba68471132f2529512d2f922c43e4cdc62fe1c8eff5d9e135443e1be89"; + sha256 = "8f5144673ba515ca85fa6eb137f593cefe5b31ada7a7413938890a949252a4c9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ja/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ja/thunderbird-138.0.1.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5095d5ef27963ac2da3cb017c30dff3409ef1e8932b8faa5a8b58b9005a136ab"; + sha256 = "1770106e37a0e02ae38f728c906dc81895dd6842c3e22399d1b5f7fed80cdef9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ka/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ka/thunderbird-138.0.1.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "bba448d866c26bf7c545ce72db99d72f4743e3e0b5b26e5dc234d934a75d6f60"; + sha256 = "78c156ba92139ac3e9a56db05f21a32b27600aed08981108c71e3a2a3c0bde6b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/kab/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/kab/thunderbird-138.0.1.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "6406fb5dd20ad88a71fc412f95e54d3219299830dd665680beec30c96624a95a"; + sha256 = "74678a0d449fe58328c3fad25596072cb06d1148cc66bb97cd43aeef38528204"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/kk/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/kk/thunderbird-138.0.1.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "bab3729c2efcf5642fe7db4d3ca182788a4e3e76472f03c481fb95c749047f04"; + sha256 = "10321de8b1609f8acdb271329847666e79aeaa830fd16f1bccf64be3fbd26dee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ko/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ko/thunderbird-138.0.1.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ef6120480f99b42cd2b748391e7ebb9d0242e25e9b5878ffc3c617ba10a85aab"; + sha256 = "b6a457343b31ada9c59a8a17eb477fe01ebe56a49b4ab986653578c2ddc3da01"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/lt/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/lt/thunderbird-138.0.1.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "0aab7f17137b9db634f6f8112715825488b5847e9deb6ff1fdb2618046caafe1"; + sha256 = "116035a5d42b54f8865af476eee059e7d9abaf3e41f7ab52f02cca1a15a172f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/lv/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/lv/thunderbird-138.0.1.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "706071eaa2cce1446080d7ef4c768fcb405f439d1bc0ca4da7a3fab8f36fdac7"; + sha256 = "b3e38dc0da3c0833db054a754fb439189567acc16f642960af3b082c9179069b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ms/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ms/thunderbird-138.0.1.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "89886f05fe1aef90349c9b7141fd22137d8558cc3d7b3dd99ff3519e74b6c795"; + sha256 = "64465e3cb59dcdcf4c7b56c9b926f443878e25326fc0dc74116d9abe9af9ef25"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/nb-NO/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/nb-NO/thunderbird-138.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "915fc851b73e6555d2fcefd17a0b96cd410f03014fe97f6f678d6c98f9c1926d"; + sha256 = "eeeb6164e4dd9273b8f1fc1c5ba1e5c303448d6c08ff0496db1402e7df51cecf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/nl/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/nl/thunderbird-138.0.1.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4a82daffc2bd00a66bdcfdb8aecc1e3cda51bd3b71b249a55400c4f16b5db5a4"; + sha256 = "fe05f8fac31904e93338a56ed960982b987d99c6fcf81dd3e9793c697c9b32fa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/nn-NO/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/nn-NO/thunderbird-138.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "fc2a46f1ba379a379f5840964bf42f35298371b109a4fc880720c324c5ce6b48"; + sha256 = "b4a5fa5632cc73fa8816c2dddf55a0c76ccd05b223965b8653516e2f007cf09b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pa-IN/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/pa-IN/thunderbird-138.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2968d0233af502cf1a1e82b51039208be05f11e31f1bf01a410841464fa65eb7"; + sha256 = "efa30ca09eae5bb522748b29909724bb6edaea8072af2a15dd46d661f7d46f87"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pl/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/pl/thunderbird-138.0.1.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "c2acdaf2418654558f35e524daefe206320c8f4d27c388ae1322fa92f4a8cb53"; + sha256 = "466958dcc8382a11d0b8ea73ab0cca0a00b7b50681096fcb68e097f4ec956605"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pt-BR/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/pt-BR/thunderbird-138.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "0c67de7e9501c1e497da49f9001b8b08f5dbed321e435322015a5b5c69b8c0ff"; + sha256 = "1682598d3af19c40546c8143e6b1b58e5359bf9540106ecaef35d5a7a06b15bd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pt-PT/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/pt-PT/thunderbird-138.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "09e2a9f011cdf67135bb527c5ad1c856b5f2227e411e711d16ec02cb88208981"; + sha256 = "ed64a1da61ddcedbed536baaf97c176cf4a056fd6513951ab91060538978292f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/rm/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/rm/thunderbird-138.0.1.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b5d298e135f5143cef392447754874d2e847f8e46eb914789f352fca5894d26b"; + sha256 = "06a27257ce8635a7828b47a98745697c4a55a206459aa9b242e7e73a8f2727bf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ro/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ro/thunderbird-138.0.1.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "35c67e8bc6b4b472e40dedf05034cc923198767ba0cc1e356c5badbd00edaa77"; + sha256 = "d94d5adfcf899b015b8cd46ae2c5ae95730e61fe70b8520ba314ecaeeeba919a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ru/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/ru/thunderbird-138.0.1.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "373307b2ff24b1e9d484e4b22a7bf185482753c986bda0e2b952fe25a882ca75"; + sha256 = "e1e494b8de2d7756773fedecfe91d59c34cc6963c98a46f38c44f21dc59309d9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sk/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/sk/thunderbird-138.0.1.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8267535b2778242133ba229970f49cf9a7036531fe3e2d83835e5cc13f70a7f6"; + sha256 = "5bf96757eed943df474353feade2d2a7bf17d619f23331ab9e5983d6d049c2ea"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sl/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/sl/thunderbird-138.0.1.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e7091b7c2350c360e2f26e65fba645dbab48628d975e205dacb92dd9dd5c5cdf"; + sha256 = "04c62c0f1e14d62ca77be2832952f864a752cf430c0c5b00c0c0db8e6ea55c78"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sq/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/sq/thunderbird-138.0.1.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "52ce1a83eba397ae34b09b3759183cdab32b3d40ac0751c0984f9fdd6842740b"; + sha256 = "8070a7238d820f2ce8f645845f43a3817c1f9064ddc4e9cc5c26324e8edaf56e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sr/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/sr/thunderbird-138.0.1.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ec2dc3a96d11e0bf514f2ec1087ab05cd7513af6a64804f3655ea5adfd17226e"; + sha256 = "af63eddbbc5db5e88062c1610482bcac520d84d11dcdfeccf39d925b975873a2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sv-SE/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/sv-SE/thunderbird-138.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "93a0b09b23e97503222db4daea393843626b151e496ba68ae04460b649fae72d"; + sha256 = "c0a8624eb183e23afb340c72e10585439a73393d553125917fec8bbf373568b7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/th/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/th/thunderbird-138.0.1.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "252058b29a9012a55b48757bff728ce11810ebe4e3d41cacb264aff5e18a839d"; + sha256 = "2759a85d183d2e3543aa7553f3be5db4cafc20ae308c237a24ec6e880b3e849c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/tr/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/tr/thunderbird-138.0.1.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "00f006c00b7b585bac99ef3ad1fdcebe0d44405b793cf963ef7ea8e4cdf41253"; + sha256 = "64ed929bcdb833b0f4503e8b18e0f3983dcbed9974e64e99de3280899c0f9873"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/uk/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/uk/thunderbird-138.0.1.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "21af80c8d76000967f204d9ebe7298d4501b98fe350cac0f3b6b04b2bb44d8e5"; + sha256 = "d0a827e29dd6ea28c7da1e239189d4803c173aafe35ada6cf8519d7a970fb2d3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/uz/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/uz/thunderbird-138.0.1.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d54696821cc28b860702a98b869a74e7ba5f74c00718b5bbd62912231823ca31"; + sha256 = "6c2012f2bea9869b96e900d5bb26fc55b7927f5d096029ff209a998adb5bbc11"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/vi/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/vi/thunderbird-138.0.1.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "35545cd2fbc4a76603192c8dd93378e4a7ab65fcb292fc3625d8ef5fc7ac57fb"; + sha256 = "6d9661ab3aea6472c327ad5ab2627ceb6beb67d92b91c21698d3ee22f54724a8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/zh-CN/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/zh-CN/thunderbird-138.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "8347af59e572a4dd2a3e38ee6385bdeebdfd9ca589d258d230ef2ef9f042b0c7"; + sha256 = "418ec9e56842c77071f3685a2ae73136596e93a22c5fd875f5534f5ac672c0f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/zh-TW/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-x86_64/zh-TW/thunderbird-138.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "262b3086e15bc43b91ba609b74e6f53d678bcb5edaf64d66f592508fcfe99b1d"; + sha256 = "c0cf4be622372833ab3f9d51ecef1e7d772145be502b7d9a97cb56d9b97f1c6f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/af/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/af/thunderbird-138.0.1.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "930f42ae5aa3b8f85cb801724060024729143e889e2ac59d8d37a70d962360c0"; + sha256 = "e2c47db628d68d639268849d68213d82a062ec82eec7a2e0b07c9e12f6482214"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ar/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ar/thunderbird-138.0.1.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "c4733b184c1dbcf2e8eab86dba07770512a0a579d512b027efae0bd853a8440d"; + sha256 = "793861fbdd418f1632c199f58e3cfe703d0354b0fcc4a8ded4a61b9793ddab7a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ast/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ast/thunderbird-138.0.1.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "e92d681785cc4e7445f913cbcba0590bdc777081b15f54da3df3f0e97b9576bc"; + sha256 = "a66b5113959b41455166555b4da22e2b30984cf8026102ebc25c10dcfec5115f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/be/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/be/thunderbird-138.0.1.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "2e83b8a276e57b2b6cbef4815c2aaaf5bda18a7607a9cf372feb08c2b84bbded"; + sha256 = "d72c9847333d8948c7b5d8e881329145791a6b5c363bd45731e9972a4aff93a2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/bg/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/bg/thunderbird-138.0.1.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "cac015b5f0a949af81278830ef3f31177c1488f28f1724fcd0f5af7943fc7da8"; + sha256 = "88fea655659504e54f74aa17e9bc4dd40d29f2f697c98fae0b68c77ddb39a4a2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/br/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/br/thunderbird-138.0.1.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "3250ed40c32e88e34f8bb08cd98afa80761cf1659acbaa7d13cbea0b5f4285b0"; + sha256 = "996442f38fc3a2de497cb25fc91d10f2568298e39240ae93a04522515c93af55"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ca/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ca/thunderbird-138.0.1.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "007f19df18a04a1d132d9013df6e749fed1248d09ce66bb7514e13c393e338bf"; + sha256 = "7935dc9fa50fa7ad994c376175f468a6d74e8618de6801380b8394671043b6f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/cak/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/cak/thunderbird-138.0.1.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "37ca027a41d337c7f7ca933dd789850a6ee8f978754af7ae0e77c450e36735d7"; + sha256 = "d0ba74c8fc5a8f301368a38938c46a8676732dc45dab7c4868363e1340ebca75"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/cs/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/cs/thunderbird-138.0.1.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "bb31b0a0db3a2b664fa0c2d0b1471e1ea1c9921ac9ade74c011497a1aa35064b"; + sha256 = "4c70ca2c6e16042f1eb4fef918c43bf389b39447f31b5fee713fbfed99cf7a0f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/cy/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/cy/thunderbird-138.0.1.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "5731c82e849aeeabf1efe223f026e715a5a84938dc530c5af47a33401f0cb045"; + sha256 = "c62154e97241623738b87bca3cb2408f6f0364d0cedf66cb3621590d4593ffe7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/da/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/da/thunderbird-138.0.1.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "36dbd8f9b33a82f30bfa64130a4a8eaa3fd411c0e04ffe3e8b22f1d2797756a4"; + sha256 = "fba811be171677ae1c3df18ca44455b2c970f0bfc08e354ad57e7d23694df7e5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/de/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/de/thunderbird-138.0.1.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "d026c72e97890974f59887768419f52230306f79b70d2e1551d7582e20b6cabb"; + sha256 = "f5caddbc7e9ac83590a73dc14496afa1e878d386aac331854c04bb6032587a8e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/dsb/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/dsb/thunderbird-138.0.1.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "4ed5855cf55679b5139d4b701fc10c8bab6c2d25dfcac876f8f2f1e22e6afd33"; + sha256 = "c97031a8a6cae87dc6bc2e4dca932a88a9a23c82d997614231e2010ec0f17467"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/el/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/el/thunderbird-138.0.1.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "9f6b006ced02883b7806d6338c0263afcae9da2ea61a9a95d44a08879ef66977"; + sha256 = "ab14f412fe36e1cd6960c263d2c474ea80c7f7639b93d040834210dbf997c81c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/en-CA/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/en-CA/thunderbird-138.0.1.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "b4ed296be204307fd6da4f48ef2f500a936d599b08535ef25c72b7be291f63dd"; + sha256 = "a6f70738aeb1202f1e0b88555de146d03feac763399d20fabd5f8892ee5dedfa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/en-GB/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/en-GB/thunderbird-138.0.1.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "db1a929bfb0498446e1925cba740441a6b359c5dbb4d7cc8896b2aec867f89b1"; + sha256 = "77320c069210f578fd27f5a6cca9ca378bb1ede004ec462740a4f91d475e8b7b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/en-US/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/en-US/thunderbird-138.0.1.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "9261a06bcaa2c418333deb60ddef961894aab90409b7981b36e98a0fc18a7dba"; + sha256 = "06ea548b598fe695a0ace46caeeb8411acf9ec0fb2b884c9127f486a85459bd9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/es-AR/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/es-AR/thunderbird-138.0.1.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "bd03068065aabd747be87f86e73c17ca93acab9efb6dcb243e587eb53a736dcc"; + sha256 = "3dfb2bbdf56ccaffe8622cfad900c093256ef27449ed34d34493b695cf5af94e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/es-ES/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/es-ES/thunderbird-138.0.1.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "42d9656001b299d04e39061c4b1c4756e55a2fb5cc1652b77bfb755edac94ab8"; + sha256 = "e1449a696809c7dc71f99cfb13b2eacc0b53d5d341f6446e0d73c1005cada388"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/es-MX/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/es-MX/thunderbird-138.0.1.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e0c97af5388c3d44d27275f1e3dd16265906ae81d4e1afc2ca9a329b637b7915"; + sha256 = "3cc0e3fe2d6aae3ff4c4923c1a7c18a3cdecbd719d0376a75b321e9e4ae0a5c5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/et/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/et/thunderbird-138.0.1.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "e5e2f18051fca84dd44b2c5a3778ad4969965f2cac86aa4264149edf680edbec"; + sha256 = "46a28361d44aaf719c4c894459e32440caa4de49f5d5a002dbb8654aefa1abad"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/eu/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/eu/thunderbird-138.0.1.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "a22ab6539a7e9572a7fb6913e9b976d570b67ff69ce585be5132cafd8ec86a52"; + sha256 = "7dc8e38d9f9d7feb73413615372acc033935d486bc77e54cfa93550d4de14a82"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/fi/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/fi/thunderbird-138.0.1.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "a0f2a030c8cce5f2c2969376813d39306a948752fe01c36b7dd81122ae3586ee"; + sha256 = "ad0ac62d302c1391b61fbcdfe1a98b8b79c654b7f292b94586c807d13afbc6e5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/fr/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/fr/thunderbird-138.0.1.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "f76eab20e735637746a6980ad3c99d2d35b6b5985f0b9a65c4ef467abcea3d06"; + sha256 = "39b7df4c5dff1cc5123957d4510026d913316508cb04d8309f845cbb98e99f1e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/fy-NL/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/fy-NL/thunderbird-138.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "c40cf21e2f8c0e7ea73ea23b4f63dc61c16c1d83966a2754f5b9e7a751f3413a"; + sha256 = "c8b232c1177c68969dfd256b6fbcf26d976c45251147c47a46293bc56ca89ed1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ga-IE/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ga-IE/thunderbird-138.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "f9293a76a3fba4d952a06f689d51273876597213fdda5123c22e8c2749aef046"; + sha256 = "afb5d8dc4afd2888d1ce55cbfaa68c022d652e419966e01e4fd7d0078abff3e2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/gd/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/gd/thunderbird-138.0.1.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "1bcf521d0b4d8b3f878ae8361db92ed32f55a7355eaade166ddda37d8ee2f342"; + sha256 = "08bbc41f7a2acf01bd89d57a91681403aad36793908a43aa6fed3875e00e6920"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/gl/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/gl/thunderbird-138.0.1.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "b96b2db085fc1cdd1605cbab4f812d2ae1f6cee7d313a3559af470e9239c3b5b"; + sha256 = "2cf7142ff9fd6a783fa4af4d5ed89045ef803b5a7a37d114baad59807734c027"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/he/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/he/thunderbird-138.0.1.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "4d997401092bf51594fbb85416fc0c3bc39de6f6904603ce2711937c7869b74b"; + sha256 = "5ef3cea0112d39d12ccccfc01b528b3a4247d40bcf8d8984c194d94ac7c16060"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hr/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/hr/thunderbird-138.0.1.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "f18606396db272a32c5eac538b13ac96268a95162262b4672d85015b0b5a4721"; + sha256 = "59a172bf3adde06e4ca8e4a28924fe945e99662df6dc7b8f6644759ac0e8965b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hsb/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/hsb/thunderbird-138.0.1.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "647baf1093bb16e9649fca57df1a5dce55edf157de7720edc36fae94cd5c9188"; + sha256 = "4a4f9ad2ecdc0c9012d433e4f2932b0606e6670cd064847fa00d8f2ca8ec496c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hu/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/hu/thunderbird-138.0.1.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "647dc9a3a4e7bb2c40832f5ad4703d19989b1f9f368ddfe450c2244ddd8a913c"; + sha256 = "7847b8aca04fee6ba436670e62c16b5487336127bdb6bf2a26922b1416279586"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hy-AM/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/hy-AM/thunderbird-138.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9f7c2d861ad0126821748473dd0d157eeda187517bb69fd1d4e0f8a08a6c0e73"; + sha256 = "9f8a01e15323079187b5b4c59665bb1a1458afb39a81ffc0be9cd5af9a60da51"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/id/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/id/thunderbird-138.0.1.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "3d13da114658f3205186cf66e55cebcc68ff2de4da2f1c1db0701420445691c2"; + sha256 = "9cfcd3a5ccc5c4a91e9df3b598918ab31edad8d7e87277a57852939daeedfe1b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/is/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/is/thunderbird-138.0.1.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "b177efd5a418b6d0c7552319e6051f8cc0b8d9ec5a393fa27a3bdd9b2821766b"; + sha256 = "9a935f74deb5eec502800c3e154d7a093c7eb1119a39ac8f0e49e8b9359b0bf7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/it/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/it/thunderbird-138.0.1.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "a20b753d2ddfb27af61636956c18937d730237af9b367b24ff88d79840fe8383"; + sha256 = "7f7b01bfad09ad5380af4a35b4f83dd4f43150aaeea5d40a61fc019c5db70a58"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ja/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ja/thunderbird-138.0.1.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "e90bc454fa9d2d6c8edac68fe919f4ab449979a857fe51063a9109a6fbbe5b5d"; + sha256 = "d84f431eab26f51e49c2dd7fe5150fe6398aa08363faa7cb1fbd5ed442468536"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ka/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ka/thunderbird-138.0.1.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "82bbe2fa5a34bb4ad238b8b2c683322b7bc3d1ac3121ef4d231264196a7526be"; + sha256 = "bfe0e4d68c8c79ff86fe1f48b37adb54fd68edb84ab75ee2c840687ceacb2ce6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/kab/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/kab/thunderbird-138.0.1.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "5a999970c668dd7a6ab87f0e180a3991a6bf8778c704a12492507e46129e3cd4"; + sha256 = "d53199af37f8fb6b0b1f28b1159500be226fe07f040cb99d9ac484807abb7cad"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/kk/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/kk/thunderbird-138.0.1.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "d359db37616b5daef05712caeb7ee5132d01d59ac01ff2f583e591a4f6364d32"; + sha256 = "5b9082954c5fc81d58415883e3d1cbf598e4e048fab78a153f10304789aeb4e3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ko/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ko/thunderbird-138.0.1.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "a99a4cc4659eaadb70ab51cb1172b8e97b1bd87dec87655247a5c828cbf2f1f2"; + sha256 = "7560daed426c866f6e08dc6d799341dc390de391e26e12fe7b9aed5c4fa3b175"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/lt/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/lt/thunderbird-138.0.1.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "078bda43f06b5e6e3027542b8dfe4e58799e96557bdf29996aab5f25f8ca40ab"; + sha256 = "1c537135a2b6fa170a396e640f4a52d654095f790a4846ebb78115a8a0594429"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/lv/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/lv/thunderbird-138.0.1.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "f15ee9402ecd9f11434f585446b3578fb2b93a0e4e5dca44826982e4b0a82d6c"; + sha256 = "f8d2233a7d992e2bbc6da2f903dd64a67ffbf6af472421fb7ff55c5b298b6178"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ms/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ms/thunderbird-138.0.1.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "86004e8ce785f8fef61bf253f002fa9d7f5de04a4e7e09edd070c107888fb390"; + sha256 = "71a0e722f0b0f00d62ed301517c4e06a868a3d2db6c3edc42c999f2b1a9f1552"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/nb-NO/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/nb-NO/thunderbird-138.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d483f4dcb1e0ead9be294f7f95b3f89669242511b87fce4a5ce4b95c70f21f99"; + sha256 = "3eb35e25aaf92496947b2c719f414d0b1e5f708884213e380eafc291c5cfa0e8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/nl/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/nl/thunderbird-138.0.1.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "b07a12fa9fe4f6df7e3ab079e03d812edcc617ad8ab7a359303dc8f25f613bb5"; + sha256 = "bca190672fcb0fc3ea95e3cb4e011d102ea80ccaea74099a726704cd9e3cf794"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/nn-NO/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/nn-NO/thunderbird-138.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "4128292d44d973421529200a69ea702e278363090b5bcd94c6c09d4e11edfa54"; + sha256 = "4403a003a05d4677e8de524532f93eb4ea2202d915527cc30961197be4e6ad35"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pa-IN/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/pa-IN/thunderbird-138.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c34f0f3d50ea007d82e107e4cb527890af8c3e544720b547c235d6ce0e5563f3"; + sha256 = "ce7bd32e48e1b77fda60ddbfc21ad13adbaed94fad9b6135139b3e03421f3076"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pl/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/pl/thunderbird-138.0.1.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "fa1a049f1164b313c10d91e207a642e5c0ecb9f03fbb777753acdd7e7dd004ce"; + sha256 = "87da5768d12cd03ef87f48d0b6a8838827324a4d5dbbfc6a0fd9025b602ce9e5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pt-BR/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/pt-BR/thunderbird-138.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9f7e7cf6e2efa7af246ecb98f8c24a2458ab14b31552ca978f6a7030435a2084"; + sha256 = "4b9039b2a6e26eb42bd6b1938a5ff1e45eb6dac9571030c7587bf9a7740e237b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pt-PT/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/pt-PT/thunderbird-138.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e668083cdce68fd2ad29aa87270944e5632bf0ad1ced7e005a95abfbb523bebb"; + sha256 = "5ee608b291985adf2db7d19b03a9fc6843bfca555947607c9ac17b267c54b40b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/rm/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/rm/thunderbird-138.0.1.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "7bfcedc109e5e2034f8647e79228e88b4375b613f41cbe8ddb45105146f64087"; + sha256 = "3a6938191b9f1d02a70aea6a681a3c93099715534f156f774ff6518a1a424b15"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ro/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ro/thunderbird-138.0.1.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "a7c1e99b66cff5a3e5c2ba6131f93a7b6c551fb1e75e8b97b742d3c0b82e86d0"; + sha256 = "d8fc232f93b38dde2bd1db9b183bfd420c992db19ab536f1eed8bbf9fec02e4f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ru/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/ru/thunderbird-138.0.1.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "3e851b9b7c831dcfd3fe1bce762df5ca518e85ed47a13a80220cae99c32752d2"; + sha256 = "ad1ae9629cb9aeced56094d3bc550633ea2105b9ca962655029c2ae3aa5a1166"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sk/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/sk/thunderbird-138.0.1.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "54d0d040a9b780a95306e7994e139292fb4cf135a0fa2c66a0bdbfb27dd5a9a1"; + sha256 = "4e2c8cc1470ecae57ea82c16b0d738410941b1f559f0dc2e6dacc7ac85129265"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sl/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/sl/thunderbird-138.0.1.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "0398d487fbd0c5ecb57aac1510e26888577188afc28d075686aa78204b1bb02c"; + sha256 = "ca1f072f1466245dc31e0f79a7d8e30dddbc0a98f49e811e9f842a8869677c4e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sq/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/sq/thunderbird-138.0.1.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "b13870f6713eaf55661411e4aceef8079a270306be17301e49e8871a421d2d6e"; + sha256 = "716aa9e5d31d3108511ea5a48e8eacddf822a9cae75d0e866a342b219db71e91"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sr/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/sr/thunderbird-138.0.1.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "16ef868a87edf38215d331d018e3c25909bb6e6d9cd0ea01545590e9fb73bfb7"; + sha256 = "be595fe3d06377e99841cb60e0bbb7914ef17b127c9723c5d6e09b18b1f8f08f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sv-SE/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/sv-SE/thunderbird-138.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4ef5386b75fabd2e42ca2cfceb8ef85c9278d4cd709f7878742ad4e6693e0483"; + sha256 = "876755afdc57e49c0d482ab6bcc7794a53cac87d81122727d3a03cd65b8589bf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/th/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/th/thunderbird-138.0.1.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "ea09ac54c7fdc357d11cadf51ddc555235c6d3ad1ab713b884ca4ebb9ec14b0a"; + sha256 = "b91110dc6eaeeca1067568e37b278fc99d58430663b7890e9d4c32ad39878059"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/tr/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/tr/thunderbird-138.0.1.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "5c43584fbbaf34bceff32c9d98156f109ab1c67c9e0d18c612ab90f3f3675cd5"; + sha256 = "05f8ed78d2395f33f6ae960319e2c7ffd1b828464b5412d7c297faa393a92920"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/uk/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/uk/thunderbird-138.0.1.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "a474ab35b1b7305fff98e512738e32cbdd50193a98c9e5c6eea1418054407218"; + sha256 = "699174466c46f3b3c5b9864744ab65749c722753f328bb7eca5382d245c1dfc8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/uz/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/uz/thunderbird-138.0.1.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "79caad981fde8c0ffa13157ef64224ce5e27aae218a15370eb7b0c686f82aba5"; + sha256 = "78ca18f5d3be3a5a97b81761acca219b810c1aef0f44b60821459cb30c933bef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/vi/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/vi/thunderbird-138.0.1.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "225480794d385493ecc1beb84f84c8c9509d6ad306648902d03277b0cb33feb8"; + sha256 = "171b681fb7ebac8d4e0ec46617c8cc8898241852ade34803590762cf6ebc2b66"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/zh-CN/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/zh-CN/thunderbird-138.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d6ab0c6c1a3171b3efd6c4684c9b6ef593fd4ba014e9ad77dd04691006027b64"; + sha256 = "8c13808ff6a74a7208276cbb3e4894dc443b502280532eff0aee54a692945f85"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/zh-TW/thunderbird-128.8.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/linux-i686/zh-TW/thunderbird-138.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "970b4015c12d149fb598abf585c5955944840dff254b3c4110d0c834161ceda2"; + sha256 = "d305e97b01698f51b596a78578a72b92230a03af4b86d87aea9e361e422d95d6"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/af/Thunderbird%20138.0.1.dmg"; + locale = "af"; + arch = "mac"; + sha256 = "f39e2dcbaf48ed142a7ce075a6a12dd4b58942e56aa5023d3e62763ec46c5701"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ar/Thunderbird%20138.0.1.dmg"; + locale = "ar"; + arch = "mac"; + sha256 = "75d67a02c58f580f8b49a7979d40fcd7c4e82f431dd51d31a3c08dc062b54d46"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ast/Thunderbird%20138.0.1.dmg"; + locale = "ast"; + arch = "mac"; + sha256 = "4bfac15cea5864b3d1d7f4fb2caa26ae5a8244f17f33fb7042dd9847db61e287"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/be/Thunderbird%20138.0.1.dmg"; + locale = "be"; + arch = "mac"; + sha256 = "9a40aa547eb32c3792651f25dd101efca3d29f4bf17cefa0dbf03a505a7d5de8"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/bg/Thunderbird%20138.0.1.dmg"; + locale = "bg"; + arch = "mac"; + sha256 = "0d546959e3f889b7c8a80d4b3a00c9d6f2f30cd1fedfc4a9f217835f6b676350"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/br/Thunderbird%20138.0.1.dmg"; + locale = "br"; + arch = "mac"; + sha256 = "363a9bf423f0f2af817fe35b2c08857570a6f09e190f6be88038fb055e3f2a22"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ca/Thunderbird%20138.0.1.dmg"; + locale = "ca"; + arch = "mac"; + sha256 = "1be0974f36326ff5b468afc067a399ddf7a77cfbc2ae5ab71772ac36cbfe700a"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/cak/Thunderbird%20138.0.1.dmg"; + locale = "cak"; + arch = "mac"; + sha256 = "f34c6d9fa6ad46322e04bb5960beb391a511aa709503f7419e4012e0d4400281"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/cs/Thunderbird%20138.0.1.dmg"; + locale = "cs"; + arch = "mac"; + sha256 = "71c850f32439bb9cb90c0f841ccfb69ffa8bacfdf42accb55c0937ec70d57577"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/cy/Thunderbird%20138.0.1.dmg"; + locale = "cy"; + arch = "mac"; + sha256 = "b90061e96c105503a7ee7fccb5a99cb9d62de424813ddcb7164afa2f38c66936"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/da/Thunderbird%20138.0.1.dmg"; + locale = "da"; + arch = "mac"; + sha256 = "d1e07140711662c157c729b1c75a1586cf3088a397767d90757d5b723cfb99da"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/de/Thunderbird%20138.0.1.dmg"; + locale = "de"; + arch = "mac"; + sha256 = "73afe766aba05dfd6e77872c26ee7bcd53c6e3bb7a0311e16f0e43e87818b1a4"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/dsb/Thunderbird%20138.0.1.dmg"; + locale = "dsb"; + arch = "mac"; + sha256 = "965e443230a501f44cdb7bf13e5eec08b862e69b69a5b2ad7433e3d474a4de9a"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/el/Thunderbird%20138.0.1.dmg"; + locale = "el"; + arch = "mac"; + sha256 = "24498593eaa082b1823c8a01b3acec1969df939cd32a37413185238eda6a3c17"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/en-CA/Thunderbird%20138.0.1.dmg"; + locale = "en-CA"; + arch = "mac"; + sha256 = "691be978c0b567d905317be7db7f9ad7d1a82826ff328a546c4fe168499a7f38"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/en-GB/Thunderbird%20138.0.1.dmg"; + locale = "en-GB"; + arch = "mac"; + sha256 = "d0baa7c3ca51b25a281a58061417c8ff7c6ae96827d22de76cc3dd9c77446b88"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/en-US/Thunderbird%20138.0.1.dmg"; + locale = "en-US"; + arch = "mac"; + sha256 = "382b7f07b925b38d5cc95b1187ff610219a662f3b0afc22d6450545a8aa2af74"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/es-AR/Thunderbird%20138.0.1.dmg"; + locale = "es-AR"; + arch = "mac"; + sha256 = "647433beec652fbade598e7b17258ed57c87b74dafaecca289884a2142fe8d54"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/es-ES/Thunderbird%20138.0.1.dmg"; + locale = "es-ES"; + arch = "mac"; + sha256 = "7d85e011d379b9799e81eeb63d841ae48bae02c3328ff4127fc4562a1da5d880"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/es-MX/Thunderbird%20138.0.1.dmg"; + locale = "es-MX"; + arch = "mac"; + sha256 = "c91f33456fdbdfde74130272b8c8acd0b2b2272df71b8ab61b57e6fbcefecb15"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/et/Thunderbird%20138.0.1.dmg"; + locale = "et"; + arch = "mac"; + sha256 = "7e71c684e3c9dcfd659588de6c51d6d6b1ff087c94abde63f342f0118794bfbb"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/eu/Thunderbird%20138.0.1.dmg"; + locale = "eu"; + arch = "mac"; + sha256 = "c701f330f3eb64c5658da3bb849971e786b8b0f27fc1a1fcde703806b2bc1856"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/fi/Thunderbird%20138.0.1.dmg"; + locale = "fi"; + arch = "mac"; + sha256 = "76ef42834ed3547aff00b7087de5fb88dbb21e6b00a5f87d860b716037434348"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/fr/Thunderbird%20138.0.1.dmg"; + locale = "fr"; + arch = "mac"; + sha256 = "fb92caede31a4c35f26d81c01cfd14a01ee287101ce9f604263925e4ac4ee7a5"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/fy-NL/Thunderbird%20138.0.1.dmg"; + locale = "fy-NL"; + arch = "mac"; + sha256 = "5769a9bd17bf7962cee09d3dc21f3cdc010df37db58e2af0e3b289511cc89e24"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ga-IE/Thunderbird%20138.0.1.dmg"; + locale = "ga-IE"; + arch = "mac"; + sha256 = "31e31af3e14f24c7d9429fe65e9d62424a06dd8c049eee4eb6ad73973d35d17f"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/gd/Thunderbird%20138.0.1.dmg"; + locale = "gd"; + arch = "mac"; + sha256 = "dbba8bc55c4ca995b36bb26bb1f0de77612149726fadb27b55d9adf72b678255"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/gl/Thunderbird%20138.0.1.dmg"; + locale = "gl"; + arch = "mac"; + sha256 = "61c7a3d6f691a30fd5015ff69ce613c8f62abc7b77ee5642a2752a0710695a5a"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/he/Thunderbird%20138.0.1.dmg"; + locale = "he"; + arch = "mac"; + sha256 = "85306063c7b2362b4a60636f08ab85e661ff843b27a12eeea1769caa31917c13"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/hr/Thunderbird%20138.0.1.dmg"; + locale = "hr"; + arch = "mac"; + sha256 = "ac2b4fe79344ea7dad0b9e6c9e3ca8ce2fc28bb3c2a1c5fccf26782977014e1a"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/hsb/Thunderbird%20138.0.1.dmg"; + locale = "hsb"; + arch = "mac"; + sha256 = "bd53027d99a34202a4215f4be4b70e81be403274c33a4972de7723e6010201f3"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/hu/Thunderbird%20138.0.1.dmg"; + locale = "hu"; + arch = "mac"; + sha256 = "d791c97ae4784143943dfa670e63d8697ec6fc9f73b5d7dc98a09a39a6fa6d8f"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/hy-AM/Thunderbird%20138.0.1.dmg"; + locale = "hy-AM"; + arch = "mac"; + sha256 = "3e4c3b299ba79e3604bf39a02a2182f7ac345ed092a3ec196b75ac726c227c3a"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/id/Thunderbird%20138.0.1.dmg"; + locale = "id"; + arch = "mac"; + sha256 = "160667120ad1ec4061b96b9cbda02705eabeed5de7591fc7a487da04863e3b6d"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/is/Thunderbird%20138.0.1.dmg"; + locale = "is"; + arch = "mac"; + sha256 = "7d89cad5ae165947e8cd130b264b2a19d716916bffbab65c63fd93266e65a4ef"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/it/Thunderbird%20138.0.1.dmg"; + locale = "it"; + arch = "mac"; + sha256 = "01ce3c4afdf7ddff923c31d30f12b9b2209dfb7dca0a4de9c3d6516f807ed72e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ja-JP-mac/Thunderbird%20138.0.1.dmg"; + locale = "ja-JP-mac"; + arch = "mac"; + sha256 = "14cbfcd0513da0c5366f18b7d349dd3b7381c4a2a2211b5ce01de5be7602d595"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ka/Thunderbird%20138.0.1.dmg"; + locale = "ka"; + arch = "mac"; + sha256 = "a33e4cae7078fb524554daae9aa0bc2c4b9eac22ab27d053de8536c74a0d6c75"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/kab/Thunderbird%20138.0.1.dmg"; + locale = "kab"; + arch = "mac"; + sha256 = "f24949dc16d79f0292ad2b4bd59b8cdcb7ebbf8dafb32b6bf114427382723dd7"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/kk/Thunderbird%20138.0.1.dmg"; + locale = "kk"; + arch = "mac"; + sha256 = "1bcd911e3b3d9bb3d07b007cbd23796c1d7a4c3b535c4a294479c8b71d7ae11f"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ko/Thunderbird%20138.0.1.dmg"; + locale = "ko"; + arch = "mac"; + sha256 = "6b6a4a11ac0bfa7ec20e192766987d43ba592215decbe8dd54a3b0c3102259ab"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/lt/Thunderbird%20138.0.1.dmg"; + locale = "lt"; + arch = "mac"; + sha256 = "7edd65e5372214eaf1ed21872bca57973af14c6c6b7d5c83fd690045e30f42f4"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/lv/Thunderbird%20138.0.1.dmg"; + locale = "lv"; + arch = "mac"; + sha256 = "3e00b0e95f0be4f969bfc089005313baea44511feec992ccbb07ddbb6901dba7"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ms/Thunderbird%20138.0.1.dmg"; + locale = "ms"; + arch = "mac"; + sha256 = "7e5df9e3fe8cd1e94fe5eb83c54a7efc725b45c5dcaa78744b8631f55f60620e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/nb-NO/Thunderbird%20138.0.1.dmg"; + locale = "nb-NO"; + arch = "mac"; + sha256 = "860227e0b5603e42bf37a6324e4e787aa29ff3fdf593ce4da5fa854399a1552d"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/nl/Thunderbird%20138.0.1.dmg"; + locale = "nl"; + arch = "mac"; + sha256 = "c5732ec80cb3a5c1f4be37efdbb0e5877fb1905c8c61f6a78deb11129aaeab64"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/nn-NO/Thunderbird%20138.0.1.dmg"; + locale = "nn-NO"; + arch = "mac"; + sha256 = "994e11db8ddf0409078c237eb97a53d573f3e755f0d84d28770bbac0c8877d48"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/pa-IN/Thunderbird%20138.0.1.dmg"; + locale = "pa-IN"; + arch = "mac"; + sha256 = "b35020db83a3ebd62bd7d8f59680f74ac9fd5ca84a6f92e30c1b43bb1df55063"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/pl/Thunderbird%20138.0.1.dmg"; + locale = "pl"; + arch = "mac"; + sha256 = "e806e5a5ef2f3fa54f65980eba84f572f119968ab13b50a12d77baf22e3b1cde"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/pt-BR/Thunderbird%20138.0.1.dmg"; + locale = "pt-BR"; + arch = "mac"; + sha256 = "ba94c6f4dd08502a545cb5a8a3c7a40a827f78b92a37bc58c683bac66bd4aff2"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/pt-PT/Thunderbird%20138.0.1.dmg"; + locale = "pt-PT"; + arch = "mac"; + sha256 = "a43b659c99ffeb230132f0a4f961696bcfb57fc8da5ec8ff23de36f830c76f8a"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/rm/Thunderbird%20138.0.1.dmg"; + locale = "rm"; + arch = "mac"; + sha256 = "de3b344e91fedd0bfc49f17f3571b5d028ecf8291c2bc54cd0c0d5c319c66eb8"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ro/Thunderbird%20138.0.1.dmg"; + locale = "ro"; + arch = "mac"; + sha256 = "7ddbb8d39221e881a21aa2ba44499a542ac18233acea67d474f5bf9237ebef32"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/ru/Thunderbird%20138.0.1.dmg"; + locale = "ru"; + arch = "mac"; + sha256 = "f8d469fe85da543025656225244c32180e4091db57ef77a7940c5bcefaab3189"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/sk/Thunderbird%20138.0.1.dmg"; + locale = "sk"; + arch = "mac"; + sha256 = "fc38afe62984fa56bcd0f465060e3f8e9c5dc9c19f44fb2a7a272e193803670e"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/sl/Thunderbird%20138.0.1.dmg"; + locale = "sl"; + arch = "mac"; + sha256 = "f7b3ef64000a34b3fb8ee6c6a3f24e7478fcffea14c7302bb2eb523dd1119cc7"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/sq/Thunderbird%20138.0.1.dmg"; + locale = "sq"; + arch = "mac"; + sha256 = "d06c5b7460d114c5bb11db6935fa948414eb312be9b9a2aae4cab427a36dc638"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/sr/Thunderbird%20138.0.1.dmg"; + locale = "sr"; + arch = "mac"; + sha256 = "cc2c1ad2fdf145590453b40f39319644c9bc07c614ddd69b22053b7a11a80708"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/sv-SE/Thunderbird%20138.0.1.dmg"; + locale = "sv-SE"; + arch = "mac"; + sha256 = "08193a52095a62b2c9df8dbae84500d467be39b4265450b9a6d1ebab5af45807"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/th/Thunderbird%20138.0.1.dmg"; + locale = "th"; + arch = "mac"; + sha256 = "21eb67c8c0441213cff96b2dec37583c514df91ccb02c90ee17daec4a821053f"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/tr/Thunderbird%20138.0.1.dmg"; + locale = "tr"; + arch = "mac"; + sha256 = "046165d96b491e29d89516333505af7e160e28086be722886bc7294bdf142b95"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/uk/Thunderbird%20138.0.1.dmg"; + locale = "uk"; + arch = "mac"; + sha256 = "c8c1881eea72039d49c53100cbfbd1e2869d7a5ddef2e88355728713fff6637a"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/uz/Thunderbird%20138.0.1.dmg"; + locale = "uz"; + arch = "mac"; + sha256 = "4182d0673851f7fc5975719dab4687280aeda1ffe8d4c8d328ed52747b122426"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/vi/Thunderbird%20138.0.1.dmg"; + locale = "vi"; + arch = "mac"; + sha256 = "5c0ae5f619c40b59a5e8360e3eb5373e0c24accb36b166cc834f30a12c1d2d1d"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/zh-CN/Thunderbird%20138.0.1.dmg"; + locale = "zh-CN"; + arch = "mac"; + sha256 = "63e98c9ddc09a67e663d249355f0779e9aec60729f03e1205292afdb4a18d5a9"; + } + { + url = "http://archive.mozilla.org/pub/thunderbird/releases/138.0.1/mac/zh-TW/Thunderbird%20138.0.1.dmg"; + locale = "zh-TW"; + arch = "mac"; + sha256 = "5da04b70cc5cfdfb8c880fc6bd9969bc42140aaa5f93c70bbdbe2ce0d931fb34"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index e004a4261d83..747665b72097 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,23 +5,28 @@ callPackage, fetchurl, icu73, + icu77, fetchpatch2, config, }: let - icu73' = icu73.overrideAttrs (attrs: { - # standardize vtzone output - # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 - patches = attrs.patches ++ [ - (fetchpatch2 { - url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; - stripLen = 3; - hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; - }) - ]; - }); + patchICU = + icu: + icu.overrideAttrs (attrs: { + # standardize vtzone output + # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 + patches = attrs.patches ++ [ + (fetchpatch2 { + url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; + stripLen = 3; + hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; + }) + ]; + }); + icu73' = patchICU icu73; + icu77' = patchICU icu77; common = { @@ -52,6 +57,7 @@ let extraPassthru = { icu73 = icu73'; + icu77 = icu77'; }; meta = with lib; { @@ -78,6 +84,7 @@ let pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" icu73 = icu73'; + icu77 = icu77'; }; in @@ -85,8 +92,8 @@ rec { thunderbird = thunderbird-latest; thunderbird-latest = common { - version = "136.0.1"; - sha512 = "cc217f3e07620442714337ea396a7146d9d80cc973de862990a9fac7c4343e900419b71ff8c6575e563deda6daff90bec5809a9a94376cbf1019c834f4e1b1e7"; + version = "138.0.1"; + sha512 = "2e71ee537292ec1a49237e93c43ed4c1a9eae58becfc7fa9ca0daf1e982c38704cb6d44e92b1bf7b45c5b8c27b23eb3aa7f48b375580f49ee60884dadc5d85b5"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; @@ -99,8 +106,8 @@ rec { thunderbird-128 = common { applicationName = "Thunderbird ESR"; - version = "128.8.1esr"; - sha512 = "f1ef0a665f2cef49b427cbfb4a3548df0cccf4470c03367cdb3d2729d4f6bbf25056c378ffa9e1184b6687332998d12ff9ba251b97b7ca859d9d43be9d7414ba"; + version = "128.10.1esr"; + sha512 = "09b54450928c6e0d948cd79a56c28bdb5fe5a81d7c710470a1ec195dd295c433b872682102c74930f19b1184391c30115293dadcd7dc8a08ae8baeb12770ef9c"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix deleted file mode 100644 index aade921aa809..000000000000 --- a/pkgs/applications/networking/mhost/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - Security, - SystemConfiguration, -}: - -rustPlatform.buildRustPackage rec { - pname = "mhost"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "lukaspustina"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-6jn9jOCh96d9y2l1OZ5hgxg7sYXPUFzJiiT95OR7lD0="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-n+ZVsdR+X7tMqZFYsjsWSUr6OkD90s44EFORqRldCNE="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; - - CARGO_CRATE_NAME = "mhost"; - - doCheck = false; - - meta = with lib; { - description = "Modern take on the classic host DNS lookup utility including an easy to use and very fast Rust lookup library"; - homepage = "https://github.com/lukaspustina/mhost"; - license = with licenses; [ - asl20 # or - mit - ]; - maintainers = [ maintainers.mgttlinger ]; - mainProgram = "mhost"; - }; -} diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix deleted file mode 100644 index 7cd4d9349997..000000000000 --- a/pkgs/applications/networking/mpop/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gnutls, - openssl, - gsasl, - libidn, - pkg-config, - Security, - nlsSupport ? true, - idnSupport ? true, - gsaslSupport ? true, - sslLibrary ? "gnutls", -}: -assert lib.assertOneOf "sslLibrary" sslLibrary [ - "gnutls" - "openssl" - "no" -]; - -stdenv.mkDerivation rec { - pname = "mpop"; - version = "1.4.21"; - - src = fetchurl { - url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-TKDR4NATZv4+DPSQ2I0VTfURJ4+1lWOHE748pnVmWFU="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = - lib.optional stdenv.hostPlatform.isDarwin Security - ++ lib.optional gsaslSupport gsasl - ++ lib.optional idnSupport libidn - ++ lib.optional (sslLibrary == "gnutls") gnutls - ++ lib.optional (sslLibrary == "openssl") openssl; - - configureFlags = [ - (lib.enableFeature nlsSupport "nls") - (lib.withFeature idnSupport "idn") - (lib.withFeature gsaslSupport "gsasl") - "--with-tls=${sslLibrary}" - ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-macosx-keyring"; - - meta = with lib; { - description = "POP3 mail retrieval agent"; - homepage = "https://marlam.de/mpop"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 96934461c2e7..60946106d0dd 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -15,7 +15,6 @@ netcat-gnu, texinfo, which, - Security, withKeyring ? true, libsecret, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, @@ -56,14 +55,11 @@ let "--with-libgsasl" ] ++ optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-keyring" ]; - buildInputs = - [ - gnutls - gsasl - libidn2 - ] - ++ optionals stdenv.hostPlatform.isDarwin [ Security ] - ++ optionals withKeyring [ libsecret ]; + buildInputs = [ + gnutls + gsasl + libidn2 + ] ++ optionals withKeyring [ libsecret ]; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix deleted file mode 100644 index a37177426b10..000000000000 --- a/pkgs/applications/networking/mujmap/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - notmuch, - stdenv, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "mujmap"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "elizagamedev"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-LyiJYKhoSXVf1P+nu56Wgp+z8biPpt0tWgPZQrB2NNQ="; - - buildInputs = [ - notmuch - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; - - meta = with lib; { - description = "JMAP integration for notmuch mail"; - homepage = "https://github.com/elizagamedev/mujmap/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ elizagamedev ]; - mainProgram = "mujmap"; - }; -} diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 14f27146c7ab..52a9e7dd61a6 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -110,7 +110,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 3205630ce61c..cab3e4774bee 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -13,7 +13,6 @@ protobuf, speex, libcap, - utf8proc, alsa-lib, python3, rnnoise, @@ -63,6 +62,7 @@ let cmakeFlags = [ "-D g15=OFF" "-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17 + "-D BUILD_NUMBER=${lib.versions.patch source.version}" ] ++ (overrides.configureFlags or [ ]); preConfigure = '' @@ -100,7 +100,6 @@ let qt5.qtsvg rnnoise speex - utf8proc ] ++ lib.optional (!jackSupport) alsa-lib ++ lib.optional jackSupport libjack2 diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 4df72311568d..1b6d530016b2 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.30.0"; + version = "0.90.0"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-Z2omesoEB6lJFy8ph6CFTb6XWsdgsvEG+i49dXmaC0Y="; + hash = "sha256-/7tj3SuTa2lSMgN4f2/OutzoPvAN7ARK1RKTLlMw13Y="; }; - vendorHash = "sha256-PYkjJ17hS0E0ncsUdrGWRn+3dEwZxS1nD0UjSDQflQ8="; + vendorHash = "sha256-Yd9vwdIwAGinIr/RLGdb4N9hsDeMu9aB2Z1EVnlxxtA="; inherit subPackages; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 7174db91e6e9..d50245b45021 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -12,6 +12,7 @@ # runtime deps adns, + bashNonInteractive, curl, gettext, gmp, @@ -38,17 +39,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnunet"; - version = "0.24.0"; + version = "0.24.1"; src = fetchurl { url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz"; - hash = "sha256-BoUvn0gz5ssGvu3fhyerlMQ4U69yOnY4etdxYS4WPFc="; + hash = "sha256-xPj50l06APgHCVg7h6qDEtAUVAkLc6QTtD7H7HwHujk="; }; enableParallelBuilding = true; nativeBuildInputs = [ - libtool + gettext # msgfmt makeWrapper meson ninja @@ -57,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ adns + bashNonInteractive curl - gettext gmp gnutls jansson @@ -71,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: { libopus libpulseaudio libsodium + libtool libunistring libxml2 ncurses @@ -78,6 +80,8 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optional postgresqlSupport libpq; + strictDeps = true; + preConfigure = '' # Brute force: since nix-worker chroots don't provide # /etc/{resolv.conf,hosts}, replace all references to `localhost' @@ -122,5 +126,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ pstn ]; platforms = lib.platforms.unix; changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${finalAttrs.version}"; + # meson: "Can not run test applications in this cross environment." (for dane_verify_crt_raw) + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; }) diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix deleted file mode 100644 index 798d4b906b44..000000000000 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - pkg-config, - openssl, - CoreServices, - Security, -}: - -rustPlatform.buildRustPackage { - pname = "synapse-bt"; - version = "unstable-2023-02-16"; - - src = fetchFromGitHub { - owner = "Luminarys"; - repo = "synapse"; - rev = "2165fe22589d7255e497d196c1d42b4c2ace1408"; - hash = "sha256-2irXNgEK9BjRuNu3DUMElmf2vIpGzwoFneAEe97GRh4="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-ebqUH01h4B3Aq3apSKpae8ncaFirbrZiDxjiQM9kzg4="; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; - - cargoBuildFlags = [ "--all" ]; - - meta = with lib; { - description = "Flexible and fast BitTorrent daemon"; - homepage = "https://synapse-bt.org/"; - license = licenses.isc; - maintainers = with maintainers; [ dywedir ]; - }; -} diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 45dcb717f2b8..30614b8b7f1f 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -23,7 +23,6 @@ dht, libnatpmp, libiconv, - Foundation, # Build options enableGTK3 ? false, gtkmm3, diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix deleted file mode 100644 index 240979abe9d2..000000000000 --- a/pkgs/applications/networking/pjsip/default.nix +++ /dev/null @@ -1,149 +0,0 @@ -{ - lib, - testers, - stdenv, - fetchFromGitHub, - openssl, - libsamplerate, - swig, - alsa-lib, - AppKit, - CoreFoundation, - Security, - python3, - pythonSupport ? true, - runCommand, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "pjsip"; - version = "2.14.1"; - - src = fetchFromGitHub { - owner = "pjsip"; - repo = "pjproject"; - tag = finalAttrs.version; - hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY="; - }; - - patches = [ ./fix-aarch64.patch ]; - - postPatch = '' - substituteInPlace \ - pjsip-apps/src/py_pjsua/setup.py \ - pjsip-apps/src/swig/python/setup.py \ - pjsip-apps/src/python/setup.py \ - pjsip-apps/src/python/setup-vc.py \ - --replace-fail "distutils.core" "setuptools" - ''; - - nativeBuildInputs = lib.optionals pythonSupport [ - swig - python3 - python3.pkgs.build - python3.pkgs.installer - python3.pkgs.setuptools - python3.pkgs.wheel - ]; - - buildInputs = - [ - openssl - libsamplerate - ] - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreFoundation - Security - ]; - - env = - lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-headerpad_max_install_names"; - }; - - preConfigure = '' - export LD=$CC - ''; - - postBuild = lib.optionalString pythonSupport '' - make -C pjsip-apps/src/swig/python - ''; - - configureFlags = [ "--enable-shared" ]; - - outputs = [ "out" ] ++ lib.optional pythonSupport "py"; - - postInstall = - '' - mkdir -p $out/bin - cp pjsip-apps/bin/pjsua-* $out/bin/pjsua - mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples - cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples - '' - + lib.optionalString pythonSupport '' - (cd pjsip-apps/src/swig/python && \ - python -m build --no-isolation --outdir dist/ --wheel - python -m installer --prefix $py dist/*.whl - ) - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # On MacOS relative paths are used to refer to libraries. All libraries use - # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to - # rewrite these to use absolute ones. - - # First, find all libraries (and their symlinks) in our outputs to define - # the install_name_tool -change arguments we should pass. - readarray -t libraries < <( - for outputName in $(getAllOutputNames); do - find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \) - done - ) - - # Determine the install_name_tool -change arguments that are going to be - # applied to all libraries. - change_args=() - for lib in "''${libraries[@]}"; do - lib_name="$(basename $lib)" - change_args+=(-change ../lib/$lib_name $lib) - change_args+=(-change ../../lib/$lib_name $lib) - done - - # Rewrite id and library refences for all non-symlinked libraries. - for lib in "''${libraries[@]}"; do - if [ -f "$lib" ]; then - install_name_tool -id $lib "''${change_args[@]}" $lib - fi - done - - # Rewrite library references for all executables. - find "$out" -executable -type f | while read executable; do - install_name_tool "''${change_args[@]}" "$executable" - done - ''; - - # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) - dontPatchELF = true; - - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "pjsua --version"; - }; - - passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; - - passthru.tests.python-pjsua2 = runCommand "python-pjsua2" { } '' - ${(python3.withPackages (pkgs: [ pkgs.pjsua2 ])).interpreter} -c "import pjsua2" > $out - ''; - - meta = with lib; { - description = "Multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; - homepage = "https://pjsip.org/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ olynch ]; - mainProgram = "pjsua"; - platforms = platforms.linux ++ platforms.darwin; - pkgConfigModules = [ "libpjproject" ]; - }; -}) diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 3bc4d3be4d81..eb4d15dc1986 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -22,14 +22,14 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.9.5"; + version = "4.9.6"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; - tag = "v${version}"; - hash = "sha256-mXRTXr7u049pgPRK5gwaGfQUmUl4vlKca4lRH06HZj8="; + tag = "${version}"; + hash = "sha256-Undf3qSClcRa1e9f6B/1hLPIjc2KPG745AXxYHQA0nE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index fd3e768c71d9..fa3d0fc67f68 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -7,7 +7,6 @@ pkg-config, gtk3, ncurses, - darwin, copyDesktopItems, makeDesktopItem, }: @@ -30,12 +29,10 @@ stdenv.mkDerivation rec { pkg-config copyDesktopItems ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isUnix [ - gtk3 - ncurses - ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp; + buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ + gtk3 + ncurses + ]; enableParallelBuilding = true; desktopItems = [ diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix deleted file mode 100644 index 9020ea614166..000000000000 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ /dev/null @@ -1,156 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - cmake, - ninja, - pkg-config, - wrapGAppsHook3, - curl, - fuse3, - desktopToDarwinBundle, - glib, - gtk3, - gettext, - libxkbfile, - libX11, - python3, - freerdp, - libssh, - libgcrypt, - gnutls, - pcre2, - libdbusmenu-gtk3, - libappindicator-gtk3, - libvncserver, - libpthreadstubs, - libXdmcp, - libxkbcommon, - libsecret, - libsoup_3, - spice-protocol, - spice-gtk, - libepoxy, - at-spi2-core, - openssl, - gsettings-desktop-schemas, - json-glib, - libsodium, - harfbuzz, - wayland, - # The themes here are soft dependencies; only icons are missing without them. - adwaita-icon-theme, - withKf5Wallet ? stdenv.hostPlatform.isLinux, - libsForQt5, - withLibsecret ? stdenv.hostPlatform.isLinux, - withWebkitGtk ? false, - webkitgtk_4_1, - withVte ? true, - vte, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "remmina"; - version = "1.4.39"; - - src = fetchFromGitLab { - owner = "Remmina"; - repo = "Remmina"; - rev = "v${finalAttrs.version}"; - hash = "sha256-gsQtPa6NLQC3nMfemmZv416hyqFg8Z1GDMALhNaPAOw="; - }; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - wrapGAppsHook3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; - - buildInputs = - [ - curl - gsettings-desktop-schemas - glib - gtk3 - gettext - libxkbfile - libX11 - freerdp - libssh - libgcrypt - gnutls - pcre2 - libvncserver - libpthreadstubs - libXdmcp - libxkbcommon - libsoup_3 - spice-protocol - spice-gtk - libepoxy - at-spi2-core - openssl - adwaita-icon-theme - json-glib - libsodium - harfbuzz - python3 - wayland - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - fuse3 - libappindicator-gtk3 - libdbusmenu-gtk3 - ] - ++ lib.optionals withLibsecret [ libsecret ] - ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] - ++ lib.optionals withWebkitGtk [ webkitgtk_4_1 ] - ++ lib.optionals withVte [ vte ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - - cmakeFlags = - [ - "-DWITH_FREERDP3=ON" - "-DWITH_VTE=${if withVte then "ON" else "OFF"}" - "-DWITH_TELEPATHY=OFF" - "-DWITH_AVAHI=OFF" - "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" - "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" - "-DWITH_WEBKIT2GTK=${if withWebkitGtk then "ON" else "OFF"}" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DHAVE_LIBAPPINDICATOR=OFF" - "-DWITH_CUPS=OFF" - "-DWITH_ICON_CACHE=OFF" - ]; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - --set-default SSL_CERT_DIR "/etc/ssl/certs/" - --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" - ${lib.optionalString stdenv.hostPlatform.isDarwin '' - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" - ''} - ) - ''; - - meta = with lib; { - license = licenses.gpl2Plus; - homepage = "https://gitlab.com/Remmina/Remmina"; - changelog = "https://gitlab.com/Remmina/Remmina/-/blob/master/CHANGELOG.md#${ - lib.replaceStrings [ "." ] [ "" ] finalAttrs.src.rev - }"; - description = "Remote desktop client written in GTK"; - mainProgram = "remmina"; - maintainers = with maintainers; [ - bbigras - melsigl - ryantm - ]; - platforms = platforms.linux ++ platforms.darwin; - }; -}) diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix deleted file mode 100644 index c25585d74701..000000000000 --- a/pkgs/applications/networking/rymdport/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenv, - buildGoModule, - fetchFromGitHub, - pkg-config, - libGL, - xorg, - Carbon, - Cocoa, -}: - -buildGoModule rec { - pname = "rymdport"; - version = "3.8.0"; - - src = fetchFromGitHub { - owner = "Jacalz"; - repo = "rymdport"; - rev = "v${version}"; - hash = "sha256-WWLs0gzFo1+scG+2JfNMd28jIP1BMMJOK4fhQ726mHY="; - }; - - vendorHash = "sha256-+FVERz1PVZSG8jqffUlglL+3VHsRNxHH0g2GYpYNQ9g="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = - with xorg; - [ - libGL - libX11 - libXcursor - libXext - libXi - libXinerama - libXrandr - libXxf86vm - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - IOKit - ]; - - postInstall = '' - for res in $(ls internal/assets/icons | sed -e 's/icon-//g' -e 's/.png//g'); do - install -Dm444 internal/assets/icons/icon-$res.png \ - $out/share/icons/hicolor/''${res}x''${res}/apps/io.github.jacalz.rymdport.png - done - install -Dm444 internal/assets/svg/icon.svg $out/share/icons/hicolor/scalable/apps/io.github.jacalz.rymdport.svg - install -Dm444 internal/assets/unix/io.github.jacalz.rymdport.desktop -t $out/share/applications - ''; - - meta = { - description = "Easy encrypted file, folder, and text sharing between devices"; - homepage = "https://github.com/Jacalz/rymdport"; - changelog = "https://github.com/Jacalz/rymdport/blob/${src.rev}/CHANGELOG.md"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ dotlambda ]; - platforms = lib.platforms.linux; - mainProgram = "rymdport"; - }; -} diff --git a/pkgs/applications/networking/sniffers/savvycan/default.nix b/pkgs/applications/networking/sniffers/savvycan/default.nix deleted file mode 100644 index 195412111d0e..000000000000 --- a/pkgs/applications/networking/sniffers/savvycan/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - qtbase, - qttools, - qmake, - qtserialbus, - qtserialport, - qtdeclarative, - wrapQtAppsHook, -}: - -stdenv.mkDerivation rec { - - pname = "savvycan"; - version = "213"; - - src = fetchFromGitHub { - owner = "collin80"; - repo = "SavvyCAN"; - rev = "V${version}"; - hash = "sha256-duITY6s/uadeBCFuG42JbLCaq7yaYv1qB8Q3GA8UJ0A="; - }; - - buildInputs = [ - qtbase - qttools - qtserialbus - qtserialport - qtdeclarative - ]; - - nativeBuildInputs = [ - qmake - wrapQtAppsHook - ]; - - meta = with lib; { - description = "QT based cross platform canbus tool"; - homepage = "https://savvycan.com/"; - changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${version}"; - maintainers = with maintainers; [ simoneruffini ]; - platforms = platforms.all; - license = licenses.mit; - mainProgram = "SavvyCAN"; - longDescription = '' - SavvyCAN is a cross platform QT based C++ program. It is a CAN bus reverse - engineering and capture tool. It was originally written to utilize EVTV - hardware such as the EVTVDue and CANDue hardware. It has since expanded to be - able to use any socketCAN compatible device as well as the Macchina M2 and - Teensy 3.x boards. SavvyCAN can use any CAN interface supported by QT's - SerialBus system (PeakCAN, Vector, SocketCAN, J2534, etc) It can capture and - send to multiple buses and CAN capture devices at once. It has many functions - specifically meant for reverse engineering data found on the CAN bus: - - Ability to capture even very highly loaded buses - - Ability to connect to many dongles simultaneously - - Scan captured traffic for data that looks coherent - - Show ASCII of captured data to find things like VIN numbers and traffic to - and from the radio - - Graph data found on the bus - - Load and Save many different file formats common to CAN capture tools (Vector - captures, Microchip, CANDo, PCAN, and many more) - - Load and Save DBC files. DBC files are used to store definitions for how data - are formatted on the bus. You can turn the raw data into things like a RPM, - odometer readings, and more. - - UDS scanning and decoding - - Scripting interface to be able to expand the scope of the software - - Best of all, it's free and open source. Don't like something about it? Change - it! - ''; - }; - -} diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index d613cc647432..575151378b5f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitLab, - ApplicationServices, asciidoctor, bcg729, bison, @@ -43,7 +42,6 @@ snappy, spandsp3, speexdsp, - SystemConfiguration, wrapGAppsHook3, zlib-ng, zstd, @@ -58,7 +56,7 @@ assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.4.5"; + version = "4.4.6"; outputs = [ "out" @@ -69,7 +67,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-NO8tc5Av5Gl3yzkxK9KJAZwIjkrXEnIGmbLBPYKRm0E="; + hash = "sha256-dzVlHxrXVCSMP4ZfyUq4N9UvL941C50Zto6Mb78LnfQ="; }; patches = [ @@ -148,9 +146,7 @@ stdenv.mkDerivation rec { sbc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices gmp - SystemConfiguration ]; strictDeps = true; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index ee79119edb25..8bc4f5f856ee 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "sha256-byJyRsjZND0CQAfx45jQa3PNHhqzF2O0cFGSfN4o/QA="; + sha256 = "sha256-QTUezD3OdOMqrxOCrdPFI8fB5XDhNVo9XpLgi7Y2aRg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix deleted file mode 100644 index 3e8fa37f5d4b..000000000000 --- a/pkgs/applications/networking/sync/casync/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - meson, - ninja, - pkg-config, - python3, - sphinx, - acl, - curl, - fuse, - libselinux, - udev, - xz, - zstd, - fuseSupport ? true, - selinuxSupport ? true, - udevSupport ? true, - glibcLocales, - rsync, -}: - -stdenv.mkDerivation { - pname = "casync"; - version = "2-226-gbd8898e"; - - src = fetchFromGitHub { - owner = "systemd"; - repo = "casync"; - rev = "bd8898ed92685e12022dd33a04c87786b5262344"; - sha256 = "04ibglizjzyd7ih13q6m7ic78n0mzw9nfmb3zd1fcm9j62qlq11i"; - }; - - buildInputs = - [ - acl - curl - xz - zstd - ] - ++ lib.optionals (fuseSupport) [ fuse ] - ++ lib.optionals (selinuxSupport) [ libselinux ] - ++ lib.optionals (udevSupport) [ udev ]; - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - sphinx - ]; - nativeCheckInputs = [ - glibcLocales - rsync - ]; - - postPatch = '' - for f in test/test-*.sh.in; do - patchShebangs $f - done - patchShebangs test/http-server.py - ''; - - PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; - mesonFlags = - lib.optionals (!fuseSupport) [ "-Dfuse=false" ] - ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] - ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; - - doCheck = true; - preCheck = '' - export LC_ALL="en_US.utf-8" - ''; - - meta = with lib; { - description = "Content-Addressable Data Synchronizer"; - mainProgram = "casync"; - homepage = "https://github.com/systemd/casync"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ flokli ]; - }; -} diff --git a/pkgs/applications/networking/sync/openrsync/default.nix b/pkgs/applications/networking/sync/openrsync/default.nix deleted file mode 100644 index 639ffeec28ab..000000000000 --- a/pkgs/applications/networking/sync/openrsync/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, -}: - -stdenv.mkDerivation { - pname = "openrsync"; - version = "unstable-2022-05-08"; - - src = fetchFromGitHub { - owner = "kristapsdz"; - repo = "openrsync"; - rev = "f50d0f8204ea18306a0c29c6ae850292ea826995"; - hash = "sha256-4tygoCQGIM0wqLfdWp55/oOPhD3lPUuTd9/LXQAASXU="; - }; - - # Uses oconfigure - prefixKey = "PREFIX="; - - meta = with lib; { - homepage = "https://www.openrsync.org/"; - description = "BSD-licensed implementation of rsync"; - mainProgram = "openrsync"; - license = licenses.isc; - maintainers = with maintainers; [ fgaz ]; - # https://github.com/kristapsdz/openrsync#portability - # https://github.com/kristapsdz/oconfigure#readme - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 62549ddbab9b..82de95739948 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { pname = "rclone"; - version = "1.69.1"; + version = "1.69.2"; outputs = [ "out" @@ -28,10 +28,15 @@ buildGoModule rec { owner = "rclone"; repo = "rclone"; tag = "v${version}"; - hash = "sha256-TNknN4Wr+SWuYWRQmfH7Xjih5WdoSC+ky70Zru1ODsw="; + hash = "sha256-WhviYa9H3FsYRgnUhheP6dRj9A9l2nrGeFAhUj5TCKU="; }; - vendorHash = "sha256-ms8mHUd6AxYW/OHwwad/34rx082xDK1lh6FIvFshIHM="; + patches = [ + # TODO: remove after updating to 1.69.3 + ./purego-update.patch + ]; + + vendorHash = "sha256-Wu9d98SIENCkJYoGT/f9KN8vnYYGMN7HxhzqtkOYQ/8="; subPackages = [ "." ]; @@ -90,7 +95,7 @@ buildGoModule rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; passthru = { tests = { @@ -107,7 +112,6 @@ buildGoModule rec { mainProgram = "rclone"; maintainers = with maintainers; [ SuperSandro2000 - tomfitzhenry ]; }; } diff --git a/pkgs/applications/networking/sync/rclone/purego-update.patch b/pkgs/applications/networking/sync/rclone/purego-update.patch new file mode 100644 index 000000000000..b936c1c0a07f --- /dev/null +++ b/pkgs/applications/networking/sync/rclone/purego-update.patch @@ -0,0 +1,28 @@ +diff --git a/go.mod b/go.mod +index f4d830b89..af23fc0d9 100644 +--- a/go.mod ++++ b/go.mod +@@ -134,7 +134,7 @@ require ( + github.com/cronokirby/saferith v0.33.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/dustin/go-humanize v1.0.1 // indirect +- github.com/ebitengine/purego v0.8.1 // indirect ++ github.com/ebitengine/purego v0.8.3 // indirect + github.com/emersion/go-message v0.18.0 // indirect + github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 // indirect + github.com/emersion/go-vcard v0.0.0-20230815062825-8fda7d206ec9 // indirect +diff --git a/go.sum b/go.sum +index 06a76c5ef..28b4dddbe 100644 +--- a/go.sum ++++ b/go.sum +@@ -213,8 +213,8 @@ github.com/dsnet/try v0.0.3/go.mod h1:WBM8tRpUmnXXhY1U6/S8dt6UWdHTQ7y8A5YSkRCkq4 + github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= + github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= + github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +-github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE= +-github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= ++github.com/ebitengine/purego v0.8.3 h1:K+0AjQp63JEZTEMZiwsI9g0+hAMNohwUOtY0RPGexmc= ++github.com/ebitengine/purego v0.8.3/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= + github.com/emersion/go-message v0.18.0 h1:7LxAXHRpSeoO/Wom3ZApVZYG7c3d17yCScYce8WiXA8= + github.com/emersion/go-message v0.18.0/go.mod h1:Zi69ACvzaoV/MBnrxfVBPV3xWEuCmC2nEN39oJF4B8A= + github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 h1:IbFBtwoTQyw0fIM5xv1HF+Y+3ZijDR839WMulgxCcUY= diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 746b4bb686d9..ed806e43de99 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -19,16 +19,16 @@ let }: buildGoModule rec { pname = stname; - version = "1.29.3"; + version = "1.29.5"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; tag = "v${version}"; - hash = "sha256-dTDrKLAUfZ+12JX6P6cWRs1ArWnDRmfhNAh0ZTTWpYU="; + hash = "sha256-mM+llkF9aMFkMzLptcEz+nXyHcuMHt+dpnqkzJgOZqQ="; }; - vendorHash = "sha256-/t+TIW66A6jKZvDtp/WcldqdkP5PtC6eP/R4Fspywxc="; + vendorHash = "sha256-5U0lsGSO4v++eMvz2r1rG5i/XPLbJAbvM9V66BKE6A8="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/office/beancount/beancount-ing-diba.nix b/pkgs/applications/office/beancount/beancount-ing-diba.nix index 84e905353740..2a4b567177e8 100644 --- a/pkgs/applications/office/beancount/beancount-ing-diba.nix +++ b/pkgs/applications/office/beancount/beancount-ing-diba.nix @@ -2,30 +2,28 @@ lib, python3, fetchFromGitHub, - fetchpatch, + beangulp, + beancount, }: python3.pkgs.buildPythonApplication rec { pname = "beancount-ing-diba"; - version = "0.6.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "siddhantgoel"; repo = "beancount-ing-diba"; rev = "v${version}"; - sha256 = "sha256-1cdXqdeTz38n0g13EXJ1/IF/gJJCe1uL/Z5NJz4DL+E="; + sha256 = "sha256-zjwajl+0ix4wnW0bf4MAuO9Lr9F8sBv87TIL5Ghmlxg="; }; - patches = [ - (fetchpatch { - name = "use-poetry-core.patch"; - url = "https://github.com/siddhantgoel/beancount-ing/commit/2d030330eed313a32c3968a2c8ce9400c6d18a41.patch"; - hash = "sha256-6v7eQhgj6d4x9uWSyuO3IxXrSWkJZRS/M4N3j0H3R/U="; - }) - ]; - format = "pyproject"; + propagatedBuildInputs = [ + beancount + beangulp + ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/applications/office/beancount/beancount_share.nix b/pkgs/applications/office/beancount/beancount_share.nix index 48951fe6ce41..9e2a0c29c411 100644 --- a/pkgs/applications/office/beancount/beancount_share.nix +++ b/pkgs/applications/office/beancount/beancount_share.nix @@ -2,21 +2,28 @@ lib, python3, fetchFromGitHub, + beancount, + beancount-plugin-utils, }: -python3.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication rec { pname = "beancount_share"; - version = "2023-12-31"; + version = "0.1.11"; src = fetchFromGitHub { owner = "akuukis"; repo = "beancount_share"; - rev = "8f925422b9947e88babbeab3fdf7d71c53c9aa9e"; - sha256 = "sha256-+ZA84VS0wf9TdrYleYB5OeKz7T8sDtrl4BM7Ft+k7OI="; + rev = "v${version}"; + sha256 = "sha256-BW2KEC0pmervT71FBixPcQciEuGcElCd2wW7BZL1xUg="; }; format = "pyproject"; + propagatedBuildInputs = [ + beancount + beancount-plugin-utils + ]; + buildInputs = [ python3.pkgs.setuptools ]; @@ -26,8 +33,5 @@ python3.pkgs.buildPythonApplication { description = "Beancount plugin to share expenses with external partners within one ledger"; license = licenses.agpl3Plus; maintainers = with maintainers; [ matthiasbeyer ]; - broken = true; - # At 2024-06-29, missing unpacked dependency - # https://hydra.nixos.org/build/262800507/nixlog/1 }; } diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix deleted file mode 100644 index 152d7004bf60..000000000000 --- a/pkgs/applications/office/grisbi/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - fetchurl, - lib, - stdenv, - gtk, - pkg-config, - libgsf, - libofx, - intltool, - wrapGAppsHook3, - libsoup_2_4, - adwaita-icon-theme, -}: - -stdenv.mkDerivation rec { - pname = "grisbi"; - version = "2.0.5"; - - src = fetchurl { - url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8="; - }; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - intltool - ]; - buildInputs = [ - gtk - libgsf - libofx - libsoup_2_4 - adwaita-icon-theme - ]; - - meta = with lib; { - description = "Personnal accounting application"; - mainProgram = "grisbi"; - longDescription = '' - Grisbi is an application written by French developers, so it perfectly - respects French accounting rules. Grisbi can manage multiple accounts, - currencies and users. It manages third party, expenditure and receipt - categories, budgetary lines, financial years, budget estimates, bankcard - management and other information that make Grisbi adapted for - associations. - ''; - homepage = "https://grisbi.org"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ layus ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix deleted file mode 100644 index c724658db2aa..000000000000 --- a/pkgs/applications/office/jameica/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - makeDesktopItem, - makeWrapper, - wrapGAppsHook3, - stripJavaArchivesHook, - ant, - jdk, - jre, - gtk2, - glib, - libXtst, - Cocoa, -}: - -let - _version = "2.10.4"; - _build = "487"; - version = "${_version}-${_build}"; - - swtSystem = - if stdenv.hostPlatform.system == "i686-linux" then - "linux" - else if stdenv.hostPlatform.system == "x86_64-linux" then - "linux64" - else if stdenv.hostPlatform.system == "aarch64-linux" then - "linux-arm64" - else if stdenv.hostPlatform.system == "x86_64-darwin" then - "macos64" - else if stdenv.hostPlatform.system == "aarch64-darwin" then - "macos-aarch64" - else - throw "Unsupported system: ${stdenv.hostPlatform.system}"; - - desktopItem = makeDesktopItem { - name = "jameica"; - exec = "jameica"; - comment = "Free Runtime Environment for Java Applications."; - desktopName = "Jameica"; - genericName = "Jameica"; - icon = "jameica"; - categories = [ "Office" ]; - }; -in -stdenv.mkDerivation rec { - pname = "jameica"; - inherit version; - - src = fetchFromGitHub { - owner = "willuhn"; - repo = "jameica"; - rev = "V_${builtins.replaceStrings [ "." ] [ "_" ] _version}_BUILD_${_build}"; - hash = "sha256-MSVSd5DyVL+dcfTDv1M99hxickPwT2Pt6QGNsu6DGZI="; - }; - - nativeBuildInputs = [ - ant - jdk - wrapGAppsHook3 - makeWrapper - stripJavaArchivesHook - ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - gtk2 - glib - libXtst - ] - ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; - - dontWrapGApps = true; - - # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries - # and is not able to build the application itself - buildPhase = '' - runHook preBuild - ant -f build -Dsystem.version=${version} init compile jar ${lib.optionalString stdenv.hostPlatform.isDarwin "zip lib"} - runHook postBuild - ''; - - installPhase = - '' - runHook preInstall - - mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,jameica-${version},java}/ - - # copy libraries except SWT - cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/jameica-${version}/ - # copy platform-specific SWT - cp lib/swt/${swtSystem}/swt.jar $out/share/jameica-${version}/ - - install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/ - install -Dm644 plugin.xml $out/share/java/ - install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png - cp ${desktopItem}/share/applications/* $out/share/applications/ - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - - # Create .app bundle for macOS - mkdir -p $out/Applications - chmod +x releases/${_version}-${_build}-${_build}/tmp/jameica.app/jameica*.sh - cp -r releases/${_version}-${_build}-${_build}/tmp/jameica.app $out/Applications/Jameica.app - '' - + '' - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${jre}/bin/java $out/bin/jameica \ - --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${lib.optionalString stdenv.hostPlatform.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''} de.willuhn.jameica.Main" \ - --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg (lib.makeLibraryPath buildInputs)} \ - --chdir "$out/share/java/" \ - "''${gappsWrapperArgs[@]}" - ''; - - meta = with lib; { - homepage = "https://www.willuhn.de/products/jameica/"; - description = "Free Runtime Environment for Java Applications"; - longDescription = '' - Runtime Environment for plugins like Hibiscus (HBCI Online Banking), - SynTAX (accounting) and JVerein (club management). - ''; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # source bundles dependencies as jars - ]; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ - flokli - r3dl3g - ]; - mainProgram = "jameica"; - }; -} diff --git a/pkgs/applications/office/ledger-web/Gemfile b/pkgs/applications/office/ledger-web/Gemfile deleted file mode 100644 index 77e8024da3a3..000000000000 --- a/pkgs/applications/office/ledger-web/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source 'https://rubygems.org' - -gem 'ledger_web' diff --git a/pkgs/applications/office/ledger-web/Gemfile.lock b/pkgs/applications/office/ledger-web/Gemfile.lock deleted file mode 100644 index 18a02b079f6c..000000000000 --- a/pkgs/applications/office/ledger-web/Gemfile.lock +++ /dev/null @@ -1,108 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - activemodel (8.0.2) - activesupport (= 8.0.2) - activerecord (8.0.2) - activemodel (= 8.0.2) - activesupport (= 8.0.2) - timeout (>= 0.4.0) - activesupport (8.0.2) - base64 - benchmark (>= 0.3) - bigdecimal - concurrent-ruby (~> 1.0, >= 1.3.1) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - logger (>= 1.4.2) - minitest (>= 5.1) - securerandom (>= 0.3) - tzinfo (~> 2.0, >= 2.0.5) - uri (>= 0.13.1) - base64 (0.2.0) - benchmark (0.4.0) - bigdecimal (3.1.9) - concurrent-ruby (1.3.5) - connection_pool (2.5.0) - database_cleaner (2.1.0) - database_cleaner-active_record (>= 2, < 3) - database_cleaner-active_record (2.2.0) - activerecord (>= 5.a) - database_cleaner-core (~> 2.0.0) - database_cleaner-core (2.0.1) - diff-lcs (1.6.0) - directory_watcher (1.5.1) - drb (2.2.1) - i18n (1.14.7) - concurrent-ruby (~> 1.0) - ledger_web (1.5.2) - database_cleaner - directory_watcher (~> 1.5.1) - pg - rack (>= 1.3.6) - rspec - sequel - sinatra - sinatra-contrib - sinatra-session - logger (1.6.6) - minitest (5.25.4) - multi_json (1.15.0) - mustermann (3.0.3) - ruby2_keywords (~> 0.0.1) - pg (1.5.9) - rack (3.1.12) - rack-protection (4.1.1) - base64 (>= 0.1.0) - logger (>= 1.6.0) - rack (>= 3.0.0, < 4) - rack-session (2.1.0) - base64 (>= 0.1.0) - rack (>= 3.0.0) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-core (3.13.3) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.2) - ruby2_keywords (0.0.5) - securerandom (0.4.1) - sequel (5.90.0) - bigdecimal - sinatra (4.1.1) - logger (>= 1.6.0) - mustermann (~> 3.0) - rack (>= 3.0.0, < 4) - rack-protection (= 4.1.1) - rack-session (>= 2.0.0, < 3) - tilt (~> 2.0) - sinatra-contrib (4.1.1) - multi_json (>= 0.0.2) - mustermann (~> 3.0) - rack-protection (= 4.1.1) - sinatra (= 4.1.1) - tilt (~> 2.0) - sinatra-session (1.0.0) - sinatra (>= 1.0) - tilt (2.6.0) - timeout (0.4.3) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - uri (1.0.3) - -PLATFORMS - ruby - -DEPENDENCIES - ledger_web - -BUNDLED WITH - 2.6.2 diff --git a/pkgs/applications/office/ledger-web/gemset.nix b/pkgs/applications/office/ledger-web/gemset.nix deleted file mode 100644 index c2df04b0176f..000000000000 --- a/pkgs/applications/office/ledger-web/gemset.nix +++ /dev/null @@ -1,471 +0,0 @@ -{ - activemodel = { - dependencies = [ "activesupport" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v35y2jzqlfy1wnrzlzj2cxylhnz09vykaa1l2dnkq7sl5zzpq8a"; - type = "gem"; - }; - version = "8.0.2"; - }; - activerecord = { - dependencies = [ - "activemodel" - "activesupport" - "timeout" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02nrya34qviawdkssyahb3mg08kqdc461b320a6ikr245jwp0d3r"; - type = "gem"; - }; - version = "8.0.2"; - }; - activesupport = { - dependencies = [ - "base64" - "benchmark" - "bigdecimal" - "concurrent-ruby" - "connection_pool" - "drb" - "i18n" - "logger" - "minitest" - "securerandom" - "tzinfo" - "uri" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5"; - type = "gem"; - }; - version = "8.0.2"; - }; - base64 = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; - type = "gem"; - }; - version = "0.2.0"; - }; - benchmark = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; - type = "gem"; - }; - version = "0.4.0"; - }; - bigdecimal = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; - type = "gem"; - }; - version = "3.1.9"; - }; - concurrent-ruby = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; - type = "gem"; - }; - version = "1.3.5"; - }; - connection_pool = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; - type = "gem"; - }; - version = "2.5.0"; - }; - database_cleaner = { - dependencies = [ "database_cleaner-active_record" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kc9bp3415p1m94d54y2pjjlsx546q0w3fn65xlxlxhm7dpa5jqx"; - type = "gem"; - }; - version = "2.1.0"; - }; - database_cleaner-active_record = { - dependencies = [ - "activerecord" - "database_cleaner-core" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1iz1hv2b1z7509dxvxdwzay1hhs24glxls5ldbyh688zxkcdca1j"; - type = "gem"; - }; - version = "2.2.0"; - }; - database_cleaner-core = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v44bn386ipjjh4m2kl53dal8g4d41xajn2jggnmjbhn6965fil6"; - type = "gem"; - }; - version = "2.0.1"; - }; - diff-lcs = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bnss89lcm3b1k3xcjd35grxqz5q040d12imd73qybwnfarggrx1"; - type = "gem"; - }; - version = "1.6.0"; - }; - directory_watcher = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fwc2shba7vks262ind74y3g76qp7znjq5q8b2dvza0yidgywhcq"; - type = "gem"; - }; - version = "1.5.1"; - }; - drb = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; - type = "gem"; - }; - version = "2.2.1"; - }; - i18n = { - dependencies = [ "concurrent-ruby" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; - type = "gem"; - }; - version = "1.14.7"; - }; - ledger_web = { - dependencies = [ - "database_cleaner" - "directory_watcher" - "pg" - "rack" - "rspec" - "sequel" - "sinatra" - "sinatra-contrib" - "sinatra-session" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0i4vagaiyayymlr41rsy4lg2cl1r011ib0ql9dgjadfy6imb4kqh"; - type = "gem"; - }; - version = "1.5.2"; - }; - logger = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; - type = "gem"; - }; - version = "1.6.6"; - }; - minitest = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw"; - type = "gem"; - }; - version = "5.25.4"; - }; - multi_json = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; - type = "gem"; - }; - version = "1.15.0"; - }; - mustermann = { - dependencies = [ "ruby2_keywords" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "123ycmq6pkivv29bqbv79jv2cs04xakzd0fz1lalgvfs5nxfky6i"; - type = "gem"; - }; - version = "3.0.3"; - }; - pg = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn"; - type = "gem"; - }; - version = "1.5.9"; - }; - rack = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0h65a1f9gsqx2ryisdy4lrd9a9l8gdv65dcscw9ynwwjr1ak1n00"; - type = "gem"; - }; - version = "3.1.12"; - }; - rack-protection = { - dependencies = [ - "base64" - "logger" - "rack" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0sniswjyi0yn949l776h7f67rvx5w9f04wh69z5g19vlsnjm98ji"; - type = "gem"; - }; - version = "4.1.1"; - }; - rack-session = { - dependencies = [ - "base64" - "rack" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1452c1bhh6fdnv17s1z65ajwh08axqnlmkhnr1qyyn2vacb3jz23"; - type = "gem"; - }; - version = "2.1.0"; - }; - rspec = { - dependencies = [ - "rspec-core" - "rspec-expectations" - "rspec-mocks" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; - type = "gem"; - }; - version = "3.13.0"; - }; - rspec-core = { - dependencies = [ "rspec-support" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1r6zbis0hhbik1ck8kh58qb37d1qwij1x1d2fy4jxkzryh3na4r5"; - type = "gem"; - }; - version = "3.13.3"; - }; - rspec-expectations = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; - type = "gem"; - }; - version = "3.13.3"; - }; - rspec-mocks = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; - type = "gem"; - }; - version = "3.13.2"; - }; - rspec-support = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; - type = "gem"; - }; - version = "3.13.2"; - }; - ruby2_keywords = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; - type = "gem"; - }; - version = "0.0.5"; - }; - securerandom = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; - type = "gem"; - }; - version = "0.4.1"; - }; - sequel = { - dependencies = [ "bigdecimal" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1s5qhylirrmfbjhdjdfqaiksjlaqmgixl25sxd8znq8dqwqlrydz"; - type = "gem"; - }; - version = "5.90.0"; - }; - sinatra = { - dependencies = [ - "logger" - "mustermann" - "rack" - "rack-protection" - "rack-session" - "tilt" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "002dkzdc1xqhvz5sdnj4vb0apczhs07mnpgq4kkd5dd1ka2pp6af"; - type = "gem"; - }; - version = "4.1.1"; - }; - sinatra-contrib = { - dependencies = [ - "multi_json" - "mustermann" - "rack-protection" - "sinatra" - "tilt" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1giziwf8mgki581jf40zzw3dhjkkmdg3yxbrahj9krd5h24vb90y"; - type = "gem"; - }; - version = "4.1.1"; - }; - sinatra-session = { - dependencies = [ "sinatra" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "183xl8i4d2hc03afd1i52gwn2xi3vzrv02g22llhfy5wkmm44gmq"; - type = "gem"; - }; - version = "1.0.0"; - }; - tilt = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; - type = "gem"; - }; - version = "2.6.0"; - }; - timeout = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm"; - type = "gem"; - }; - version = "0.4.3"; - }; - tzinfo = { - dependencies = [ "concurrent-ruby" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; - type = "gem"; - }; - version = "2.0.6"; - }; - uri = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; - type = "gem"; - }; - version = "1.0.3"; - }; -} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 356a46d5ca81..e4903a823013 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -10,7 +10,7 @@ libxslt, perl, perlPackages, - box2d, + box2d_2, gettext, zlib, libjpeg, @@ -343,6 +343,14 @@ stdenv.mkDerivation (finalAttrs: { # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking ./readd-explicit-zlib-link.patch + + # Backport patch to fix build with Poppler 25.05 + # FIXME: conditionalize/remove as upstream updates + (fetchpatch2 { + url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch"; + includes = [ "sdext/*" ]; + hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA="; + }) ] ++ lib.optionals (lib.versionOlder version "24.8") [ (fetchpatch2 { @@ -353,7 +361,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (variant == "collabora") [ ./fix-unpack-collabora.patch - ./skip-broken-sentence-breaking-rules.patch ]; postPatch = '' @@ -397,7 +404,7 @@ stdenv.mkDerivation (finalAttrs: { ant bluez5 boost - box2d + box2d_2 cairo clucene_core_2 cppunit @@ -613,7 +620,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-gtk3-kde5" ] ++ ( - if variant == "fresh" then + if variant == "fresh" || variant == "collabora" then [ "--with-system-rhino" "--with-rhino-jar=${rhino}/share/java/js.jar" diff --git a/pkgs/applications/office/libreoffice/skip-broken-sentence-breaking-rules.patch b/pkgs/applications/office/libreoffice/skip-broken-sentence-breaking-rules.patch deleted file mode 100644 index 0f0973146c28..000000000000 --- a/pkgs/applications/office/libreoffice/skip-broken-sentence-breaking-rules.patch +++ /dev/null @@ -1,48 +0,0 @@ -This part caused build failures in Collabora. - -LibreOffice has just dropped the entire file some time ago. - ---- a/i18npool/source/breakiterator/data/sent.txt 1970-01-01 01:00:01.000000000 +0100 ---- b/i18npool/source/breakiterator/data/sent.txt 1970-01-01 01:00:01.000000000 +0100 -@@ -88,41 +88,3 @@ - [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend $Thai]{bof}] ($Extend | $Format | $Close | $Sp)* [^$Thai]; - [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend]{bof}] ($Extend | $Format | $Close | $Sp)* ([$Sep{eof}] | $CR $LF){100}; - --## ------------------------------------------------- -- --!!reverse; -- --$SpEx_R = ($Extend | $Format)* $Sp; --$ATermEx_R = ($Extend | $Format)* $ATerm; --$STermEx_R = ($Extend | $Format)* $STerm; --$CloseEx_R = ($Extend | $Format)* $Close; -- --# --# Reverse rules. --# For now, use the old style inexact reverse rules, which are easier --# to write, but less efficient. --# TODO: exact reverse rules. It appears that exact reverse rules --# may require improving support for look-ahead breaks in the --# builder. Needs more investigation. --# -- --[{bof}] (.? | $LF $CR) [^$Sep]* [$Sep {eof}] ($SpEx_R* $CloseEx_R* ($STermEx_R | $ATermEx_R))*; --#.*; -- --# Explanation for this rule: --# --# It needs to back over --# The $Sep at which we probably begin --# All of the non $Sep chars leading to the preceding $Sep --# The preceding $Sep, which will be the second one that the rule matches. --# Any immediately preceding STerm or ATerm sequences. We need to see these --# to get the correct rule status when moving forwards again. --# --# [{bof}] inhibit rule chaining. Without this, rule would loop on itself and match --# the entire string. --# --# (.? | $LF $CR) Match one $Sep instance. Use .? rather than $Sep because position might be --# at the beginning of the string at this point, and we don't want to fail. --# Can only use {eof} once, and it is used later. --# -- diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch index 48c8ca880947..9cd2c9799c97 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch @@ -1,6 +1,8 @@ +diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk +index 63dc4b92b90d..fc6d83da6448 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk -@@ -69,8 +69,8 @@ endif +@@ -70,8 +70,8 @@ endif ifneq ($(DISABLE_GUI),TRUE) ifeq ($(OS),LINUX) @@ -10,17 +12,43 @@ CppunitTest_sc_tiledrendering2 \ )) endif +diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx +index 4dc1f0fe93c4..46b506131719 100644 --- a/sc/qa/extras/vba-macro-test.cxx +++ b/sc/qa/extras/vba-macro-test.cxx -@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) +@@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) // Failed: : Test change event for Range.FillRight: // Tests passed: 4 // Tests failed: 4 -#if !defined(_WIN32) +#if 0 // flaky, see above - { OUString("Ranges-3.xls"), - OUString( - "vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, + { u"Ranges-3.xls"_ustr, + u"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"_ustr }, + #endif +diff --git a/sc/qa/unit/subsequent_export_test2.cxx b/sc/qa/unit/subsequent_export_test2.cxx +index 1396cef69fa5..8ca0e4043f72 100644 +--- a/sc/qa/unit/subsequent_export_test2.cxx ++++ b/sc/qa/unit/subsequent_export_test2.cxx +@@ -100,6 +100,8 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringXLSX) + + CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX) + { ++ return; // fails consistently ++ + // this doc is configured with CalcA1 ref syntax + createScDoc("xlsx/empty.xlsx"); + +@@ -137,6 +139,8 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX) + + CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified) + { ++ return; // fails consistently ++ + createScDoc(); + + ScDocument* pDoc = getScDoc(); +diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx +index 40d2c6f174de..9f540581133e 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs) @@ -29,21 +57,104 @@ { + return; // fails consistently on nixpkgs? + - m_pDoc->InsertTab(0, "Formula"); + m_pDoc->InsertTab(0, u"Formula"_ustr); sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. ---- a/sw/qa/extras/tiledrendering/tiledrendering.cxx -+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -2948,6 +2948,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testHighlightNumbering_shd) +diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx +index 3892b36b5a85..68d5c21fc896 100644 +--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx ++++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx +@@ -1580,6 +1580,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testMultiViewInsertDeletePage) - CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testPilcrowRedlining) + CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testMultiViewInsertDeletePage2) + { ++ return; // fails consistently ++ + // Load the document. + SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp"); + SdTestViewCallback aView1; +diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx +index 17055fa287ed..aa27d6969717 100644 +--- a/sw/qa/extras/layout/layout.cxx ++++ b/sw/qa/extras/layout/layout.cxx +@@ -1364,6 +1364,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader) + #if !defined(MACOSX) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf150606) { + return; // flaky + - // Load a document where the top left tile contains - // paragraph and line break symbols with redlining. - SwXTextDocument* pXTextDocument = createDoc("pilcrow-redlining.fodt"); -@@ -4100,6 +4104,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) + createSwDoc("tdf150606-1-min.odt"); + + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); +diff --git a/sw/qa/extras/layout/layout4.cxx b/sw/qa/extras/layout/layout4.cxx +index eb9abea5a538..a2d511607a48 100644 +--- a/sw/qa/extras/layout/layout4.cxx ++++ b/sw/qa/extras/layout/layout4.cxx +@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in LTR text + createSwDoc("tdf56408-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1532,6 +1533,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in RTL text + createSwDoc("tdf56408-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1546,6 +1548,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // The fix for tdf#56408 introduced a change to line breaking between text with + // direction changes. This test verifies behavior in the trivial case, when a + // break opportunity exists at the direction change boundary. +@@ -1562,6 +1565,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify there is no crash/assertion for underflow after a number field + createSwDoc("tdf56408-after-field.fodt"); + } +@@ -1619,6 +1623,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf164907_rowHeightAtLeast) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1633,6 +1638,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +diff --git a/sw/qa/extras/odfexport/odfexport2.cxx b/sw/qa/extras/odfexport/odfexport2.cxx +index b2c844e91f81..46356e02c050 100644 +--- a/sw/qa/extras/odfexport/odfexport2.cxx ++++ b/sw/qa/extras/odfexport/odfexport2.cxx +@@ -1720,6 +1720,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) + // - Error: "2001-01-01" does not satisfy the "dateTime" type + // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip. + loadAndReload("midnight_redline.fodt"); ++ return; // fails on aarch64 + + xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); + assertXPathContent(pXmlDoc, +diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx +index 1e404a1d733a..33e9866dc828 100644 +--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx ++++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx +@@ -3788,6 +3788,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) // toggling Formatting Marks on/off for one view should have no effect on other views CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) { @@ -52,42 +163,40 @@ SwXTextDocument* pXTextDocument = createDoc(); int nView1 = SfxLokHelper::getView(); +diff --git a/unoxml/qa/unit/rdftest.cxx b/unoxml/qa/unit/rdftest.cxx +index 61c556369d21..c91befbbada2 100644 +--- a/unoxml/qa/unit/rdftest.cxx ++++ b/unoxml/qa/unit/rdftest.cxx +@@ -962,6 +962,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testTdf123293) + + CPPUNIT_TEST_FIXTURE(RDFStreamTest, testDocumentMetadataAccess) + { ++ return; // fails on aarch64 + loadFromURL(u"private:factory/swriter"_ustr); + + uno::Reference xDocumentMetadataAccess(mxComponent, +diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx +index c8a9e6e7c3cd..c0a2bb33b312 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx -@@ -529,6 +529,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testMixedCJKLatinScript_glyph_advanceme +@@ -553,6 +553,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testMixedCJKLatinScript_glyph_advanceme CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718) { -+ return; // fails to find the font ++ return; // fails in nixpkgs + #if HAVE_MORE_FONTS #if !defined _WIN32 // TODO: Fails on jenkins but passes locally vcl::Font aFont(u"Source Han Sans"_ustr, u"Regular"_ustr, Size(0, 72)); ---- ./sd/qa/unit/tiledrendering/tiledrendering.cxx 2025-03-22 19:42:09.450877126 +0100 -+++ ./sd/qa/unit/tiledrendering/tiledrendering.cxx 2025-03-22 19:47:05.663896648 +0100 -@@ -2496,6 +2496,7 @@ +diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +index 4909267f7c74..63a177b0a2a5 100644 +--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx ++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +@@ -6056,6 +6056,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature) - CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testGetViewRenderState) + CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters) { -+ return ; // SD;Dark instead of S;Dark is the correct outcome elsewhere? - SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp"); - int nFirstViewId = SfxLokHelper::getView(); - ViewCallback aView1; ---- ./sc/qa/unit/subsequent_export_test2.cxx 2025-03-22 19:51:50.959915451 +0100 -+++ ./sc/qa/unit/subsequent_export_test2.cxx 2025-03-22 19:51:54.691915697 +0100 -@@ -103,6 +103,7 @@ ++ return; // fails due to missing font: Noto Sans + saveAsPDF(u"tdf164106.fodt"); - CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX) - { -+ return; // Apparently an issue with loading reference config - // this doc is configured with CalcA1 ref syntax - createScDoc("xlsx/empty.xlsx"); - -@@ -140,6 +141,7 @@ - - CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified) - { -+ return; // Apparently an issue with loading reference config - createScDoc(); - - ScDocument* pDoc = getScDoc(); + auto pPdfDocument = parsePDFExport(); diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch index e8bd4b1f95f3..47e267ca1b11 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch @@ -1,6 +1,8 @@ +diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk +index 63dc4b92b90d..fc6d83da6448 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk -@@ -69,8 +69,8 @@ endif +@@ -70,8 +70,8 @@ endif ifneq ($(DISABLE_GUI),TRUE) ifeq ($(OS),LINUX) @@ -10,6 +12,8 @@ CppunitTest_sc_tiledrendering2 \ )) endif +diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx +index 4dc1f0fe93c4..46b506131719 100644 --- a/sc/qa/extras/vba-macro-test.cxx +++ b/sc/qa/extras/vba-macro-test.cxx @@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) @@ -21,6 +25,8 @@ { u"Ranges-3.xls"_ustr, u"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"_ustr }, #endif +diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx +index 40d2c6f174de..9f540581133e 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs) @@ -32,9 +38,11 @@ m_pDoc->InsertTab(0, u"Formula"_ustr); sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. +diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx +index 17055fa287ed..aa27d6969717 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx -@@ -1347,6 +1347,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader) +@@ -1364,6 +1364,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader) #if !defined(MACOSX) CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf150606) { @@ -42,10 +50,89 @@ + createSwDoc("tdf150606-1-min.odt"); - SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); +diff --git a/sw/qa/extras/layout/layout4.cxx b/sw/qa/extras/layout/layout4.cxx +index eb9abea5a538..a2d511607a48 100644 +--- a/sw/qa/extras/layout/layout4.cxx ++++ b/sw/qa/extras/layout/layout4.cxx +@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in LTR text + createSwDoc("tdf56408-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1532,6 +1533,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in RTL text + createSwDoc("tdf56408-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1546,6 +1548,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // The fix for tdf#56408 introduced a change to line breaking between text with + // direction changes. This test verifies behavior in the trivial case, when a + // break opportunity exists at the direction change boundary. +@@ -1562,6 +1565,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify there is no crash/assertion for underflow after a number field + createSwDoc("tdf56408-after-field.fodt"); + } +@@ -1619,6 +1623,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf164907_rowHeightAtLeast) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1633,6 +1638,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +diff --git a/sw/qa/extras/layout/layout5.cxx b/sw/qa/extras/layout/layout5.cxx +index 5f008a55b1c0..c6ae2a9023de 100644 +--- a/sw/qa/extras/layout/layout5.cxx ++++ b/sw/qa/extras/layout/layout5.cxx +@@ -1544,6 +1544,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf144450) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf166152) + { ++ return; // fails due to missing font: Noto Sans ++ + createSwDoc("tdf166152.fodt"); + + auto* pWrtShell = getSwDocShell()->GetWrtShell(); +diff --git a/sw/qa/extras/odfexport/odfexport2.cxx b/sw/qa/extras/odfexport/odfexport2.cxx +index 2f732b3863be..d06f19954da1 100644 +--- a/sw/qa/extras/odfexport/odfexport2.cxx ++++ b/sw/qa/extras/odfexport/odfexport2.cxx +@@ -1719,6 +1719,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) + // - Error: "2001-01-01" does not satisfy the "dateTime" type + // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip. + loadAndReload("midnight_redline.fodt"); ++ return; // fails on aarch64 + + xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); + assertXPathContent(pXmlDoc, +diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx +index 0f0cd9ed3403..b40b3240120c 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -4091,6 +4091,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) +@@ -3754,6 +3754,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) // toggling Formatting Marks on/off for one view should have no effect on other views CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) { @@ -54,69 +141,11 @@ SwXTextDocument* pXTextDocument = createDoc(); int nView1 = SfxLokHelper::getView(); ---- a/sw/qa/extras/layout/layout4.cxx -+++ b/sw/qa/extras/layout/layout4.cxx -@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking a first bidi portion correctly underflows in LTR text - createSwDoc("tdf56408-ltr.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -1532,6 +1532,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking a first bidi portion correctly underflows in RTL text - createSwDoc("tdf56408-rtl.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -1546,6 +1547,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // The fix for tdf#56408 introduced a change to line breaking between text with - // direction changes. This test verifies behavior in the trivial case, when a - // break opportunity exists at the direction change boundary. -@@ -1562,6 +1563,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify there is no crash/assertion for underflow after a number field - createSwDoc("tdf56408-after-field.fodt"); - } -@@ -1612,6 +1614,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf155229RowAtLeast) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions - createSwDoc("tdf157829-ltr.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -1626,6 +1629,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions - createSwDoc("tdf157829-rtl.fodt"); - auto pXmlDoc = parseLayoutDump(); ---- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -@@ -6079,6 +6079,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature) - - CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters) - { -+ return; // fails due to missing font: Noto Sans - saveAsPDF(u"tdf164106.fodt"); - - auto pPdfDocument = parsePDFExport(); +diff --git a/unoxml/qa/unit/rdftest.cxx b/unoxml/qa/unit/rdftest.cxx +index 61c556369d21..c91befbbada2 100644 --- a/unoxml/qa/unit/rdftest.cxx +++ b/unoxml/qa/unit/rdftest.cxx -@@ -962,6 +962,7 @@ +@@ -962,6 +962,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testTdf123293) CPPUNIT_TEST_FIXTURE(RDFStreamTest, testDocumentMetadataAccess) { @@ -124,13 +153,15 @@ loadFromURL(u"private:factory/swriter"_ustr); uno::Reference xDocumentMetadataAccess(mxComponent, ---- a/sw/qa/extras/odfexport/odfexport2.cxx -+++ b/sw/qa/extras/odfexport/odfexport2.cxx -@@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) - // - Error: "2001-01-01" does not satisfy the "dateTime" type - // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip. - loadAndReload("midnight_redline.fodt"); -+ return; // fails on aarch64 +diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +index 203b9cebc1df..b07082f1e6b1 100644 +--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx ++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +@@ -6077,6 +6077,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature) - xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); - assertXPathContent(pXmlDoc, + CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters) + { ++ return; // fails due to missing font: Noto Sans + saveAsPDF(u"tdf164106.fodt"); + + auto pPdfDocument = parsePDFExport(); diff --git a/pkgs/applications/office/libreoffice/src-collabora/deps.nix b/pkgs/applications/office/libreoffice/src-collabora/deps.nix index d072fa55775c..375992c61254 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/deps.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/deps.nix @@ -14,11 +14,11 @@ md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz"; } { - name = "boost_1_82_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz"; - sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de"; + name = "boost_1_86_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_86_0.tar.xz"; + sha256 = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c"; md5 = ""; - md5name = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de-boost_1_82_0.tar.xz"; + md5name = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c-boost_1_86_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -35,11 +35,11 @@ md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; } { - name = "bsh-2.0b6-src.zip"; - url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; - sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; - md5 = "beeca87be45ec87d241ddd0e1bad80c1"; - md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + name = "bsh-2.1.1-src.zip"; + url = "https://dev-www.libreoffice.org/src/bsh-2.1.1-src.zip"; + sha256 = "2248387ceaa319840434a3547a8b2fec12f95a8418ee039ce5ff5726053a139c"; + md5 = ""; + md5name = "2248387ceaa319840434a3547a8b2fec12f95a8418ee039ce5ff5726053a139c-bsh-2.1.1-src.zip"; } { name = "bzip2-1.0.8.tar.gz"; @@ -56,11 +56,11 @@ md5name = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf-cairo-1.17.6.tar.xz"; } { - name = "libcdr-0.1.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz"; - sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"; + name = "libcdr-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.8.tar.xz"; + sha256 = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c"; md5 = ""; - md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz"; + md5name = "ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c-libcdr-0.1.8.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -84,11 +84,11 @@ md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; } { - name = "libcmis-0.6.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz"; - sha256 = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074"; + name = "libcmis-0.6.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcmis-0.6.2.tar.xz"; + sha256 = "1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644"; md5 = ""; - md5name = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074-libcmis-0.6.1.tar.xz"; + md5name = "1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644-libcmis-0.6.2.tar.xz"; } { name = "CoinMP-1.8.4.tgz"; @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.11.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.11.0.tar.xz"; - sha256 = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb"; + name = "curl-8.12.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.12.1.tar.xz"; + sha256 = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202"; md5 = ""; - md5name = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb-curl-8.11.0.tar.xz"; + md5name = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202-curl-8.12.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -140,18 +140,18 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.10.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz"; - sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a"; + name = "libetonyek-0.1.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz"; + sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83"; md5 = ""; - md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; + md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; } { - name = "expat-2.6.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz"; - sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee"; + name = "expat-2.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz"; + sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30"; md5 = ""; - md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz"; + md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -161,11 +161,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.14.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.14.2.tar.xz"; - sha256 = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b"; + name = "fontconfig-2.16.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.1.tar.xz"; + sha256 = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a"; md5 = ""; - md5name = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b-fontconfig-2.14.2.tar.xz"; + md5name = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a-fontconfig-2.16.1.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -210,11 +210,11 @@ md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { - name = "liberation-fonts-ttf-2.1.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz"; - sha256 = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef"; + name = "liberation-fonts-ttf-2.1.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.5.tar.gz"; + sha256 = "7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0"; md5 = ""; - md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz"; + md5name = "7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0-liberation-fonts-ttf-2.1.5.tar.gz"; } { name = "LinLibertineG-20120116.zip"; @@ -238,18 +238,18 @@ md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; } { - name = "NotoSans-v2.014.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSans-v2.014.zip"; - sha256 = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1"; + name = "NotoSans-v2.015.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSans-v2.015.zip"; + sha256 = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5"; md5 = ""; - md5name = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1-NotoSans-v2.014.zip"; + md5name = "0c34df072a3fa7efbb7cbf34950e1f971a4447cffe365d3a359e2d4089b958f5-NotoSans-v2.015.zip"; } { - name = "NotoSerif-v2.014.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.014.zip"; - sha256 = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3"; + name = "NotoSerif-v2.015.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.015.zip"; + sha256 = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1"; md5 = ""; - md5name = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3-NotoSerif-v2.014.zip"; + md5name = "0e9a43c8a4b94ac76f55069ed1d7385bbcaf6b99527a94deb5619e032b7e76c1-NotoSerif-v2.015.zip"; } { name = "NotoSerifHebrew-v2.004.zip"; @@ -294,11 +294,11 @@ md5name = "b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f-NotoSerifArmenian-v2.008.zip"; } { - name = "NotoSansGeorgian-v2.003.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.003.zip"; - sha256 = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf"; + name = "NotoSansGeorgian-v2.005.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.005.zip"; + sha256 = "10e85011008108308e6feab0408242acb07804da61ede3d3ff236461ae07ab1b"; md5 = ""; - md5name = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf-NotoSansGeorgian-v2.003.zip"; + md5name = "10e85011008108308e6feab0408242acb07804da61ede3d3ff236461ae07ab1b-NotoSansGeorgian-v2.005.zip"; } { name = "NotoSerifGeorgian-v2.003.zip"; @@ -385,11 +385,11 @@ md5name = "c33e04199f6d69056a6de0ebc5522dbe36e02f145208c71c9a4c803841151ad2-NotoSerifTC.zip"; } { - name = "culmus-0.133.tar.gz"; - url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz"; - sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05"; + name = "culmus-0.140.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.140.tar.gz"; + sha256 = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3"; md5 = ""; - md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz"; + md5name = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3-culmus-0.140.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; @@ -406,18 +406,18 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "Amiri-1.000.zip"; - url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; - sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; + name = "Amiri-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-1.001.zip"; + sha256 = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a"; md5 = ""; - md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; + md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { - name = "ReemKufi-1.2.zip"; - url = "https://dev-www.libreoffice.org/src/ReemKufi-1.2.zip"; - sha256 = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413"; + name = "ReemKufi-1.7.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-1.7.zip"; + sha256 = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4"; md5 = ""; - md5name = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413-ReemKufi-1.2.zip"; + md5name = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4-ReemKufi-1.7.zip"; } { name = "Scheherazade-2.100.zip"; @@ -497,32 +497,32 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.13.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; - sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; + name = "freetype-2.13.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz"; + sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"; md5 = ""; - md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; + md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz"; } { - name = "frozen-1.1.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz"; - sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45"; + name = "frozen-1.2.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/frozen-1.2.0.tar.gz"; + sha256 = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823"; md5 = ""; - md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; + md5name = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823-frozen-1.2.0.tar.gz"; } { - name = "glm-0.9.9.8.zip"; - url = "https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip"; - sha256 = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad"; + name = "glm-1.0.1.zip"; + url = "https://dev-www.libreoffice.org/src/glm-1.0.1.zip"; + sha256 = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5"; md5 = ""; - md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip"; + md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; } { - name = "gpgme-1.23.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.23.2.tar.bz2"; - sha256 = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224"; + name = "gpgme-1.24.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2"; + sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581"; md5 = ""; - md5name = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224-gpgme-1.23.2.tar.bz2"; + md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -532,11 +532,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-8.2.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-8.2.2.tar.xz"; - sha256 = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3"; + name = "harfbuzz-8.5.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-8.5.0.tar.xz"; + sha256 = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27"; md5 = ""; - md5name = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3-harfbuzz-8.2.2.tar.xz"; + md5name = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27-harfbuzz-8.5.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -567,25 +567,25 @@ md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; } { - name = "icu4c-73_2-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz"; - sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1"; + name = "icu4c-75_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-75_1-src.tgz"; + sha256 = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef"; md5 = ""; - md5name = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1-icu4c-73_2-src.tgz"; + md5name = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef-icu4c-75_1-src.tgz"; } { - name = "icu4c-73_2-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-73_2-data.zip"; - sha256 = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701"; + name = "icu4c-75_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-75_1-data.zip"; + sha256 = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1"; md5 = ""; - md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip"; + md5name = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1-icu4c-75_1-data.zip"; } { - name = "Java-WebSocket-1.5.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz"; - sha256 = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720"; + name = "Java-WebSocket-1.6.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.6.0.tar.gz"; + sha256 = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728"; md5 = ""; - md5name = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720-Java-WebSocket-1.5.4.tar.gz"; + md5name = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728-Java-WebSocket-1.6.0.tar.gz"; } { name = "flow-engine-0.9.4.zip"; @@ -672,32 +672,32 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2024-06-14.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-06-14.tar.bz2"; - sha256 = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75"; + name = "language-subtag-registry-2025-03-10.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2"; + sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39"; md5 = ""; - md5name = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75-language-subtag-registry-2024-06-14.tar.bz2"; + md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2"; } { - name = "lcms2-2.16.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz"; - sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51"; + name = "lcms2-2.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz"; + sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074"; md5 = ""; - md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; + md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz"; } { - name = "libassuan-2.5.7.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.7.tar.bz2"; - sha256 = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76"; + name = "libassuan-3.0.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-3.0.2.tar.bz2"; + sha256 = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6"; md5 = ""; - md5name = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76-libassuan-2.5.7.tar.bz2"; + md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2"; } { - name = "libatomic_ops-7.8.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.0.tar.gz"; - sha256 = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31"; + name = "libatomic_ops-7.8.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz"; + sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51"; md5 = ""; - md5name = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31-libatomic_ops-7.8.0.tar.gz"; + md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -707,25 +707,25 @@ md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { - name = "libexttextcat-3.4.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz"; - sha256 = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df"; + name = "libexttextcat-3.4.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.7.tar.xz"; + sha256 = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd"; md5 = ""; - md5name = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df-libexttextcat-3.4.6.tar.xz"; + md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz"; } { - name = "libffi-3.4.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libffi-3.4.4.tar.gz"; - sha256 = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676"; + name = "libffi-3.4.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.4.8.tar.gz"; + sha256 = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b"; md5 = ""; - md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; + md5name = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b-libffi-3.4.8.tar.gz"; } { - name = "libgpg-error-1.48.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.48.tar.bz2"; - sha256 = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f"; + name = "libgpg-error-1.53.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.53.tar.bz2"; + sha256 = "6a0721b52027415f53abcbf63b5c37776a0f774d9126d560a3ce76c0eb42903f"; md5 = ""; - md5name = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f-libgpg-error-1.48.tar.bz2"; + md5name = "6a0721b52027415f53abcbf63b5c37776a0f774d9126d560a3ce76c0eb42903f-libgpg-error-1.53.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -749,32 +749,32 @@ md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; } { - name = "libwebp-1.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; - sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; + name = "libwebp-1.5.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz"; + sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c"; md5 = ""; - md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; + md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz"; } { - name = "xmlsec1-1.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.2.tar.gz"; - sha256 = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf"; + name = "xmlsec1-1.3.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.6.tar.gz"; + sha256 = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f"; md5 = ""; - md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz"; + md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz"; } { - name = "libxml2-2.12.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.12.9.tar.xz"; - sha256 = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590"; + name = "libxml2-2.13.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.13.7.tar.xz"; + sha256 = "14796d24402108e99d8de4e974d539bed62e23af8c4233317274ce073ceff93b"; md5 = ""; - md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz"; + md5name = "14796d24402108e99d8de4e974d539bed62e23af8c4233317274ce073ceff93b-libxml2-2.13.7.tar.xz"; } { - name = "libxslt-1.1.39.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.39.tar.xz"; - sha256 = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0"; + name = "libxslt-1.1.43.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.43.tar.xz"; + sha256 = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a"; md5 = ""; - md5name = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0-libxslt-1.1.39.tar.xz"; + md5name = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a-libxslt-1.1.43.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -784,18 +784,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-4.9.2.tgz"; - url = "https://dev-www.libreoffice.org/src/lxml-4.9.2.tgz"; - sha256 = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67"; + name = "lxml-5.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-5.3.2.tar.gz"; + sha256 = "773947d0ed809ddad824b7b14467e1a481b8976e87278ac4a730c2f7c7fcddc1"; md5 = ""; - md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz"; + md5name = "773947d0ed809ddad824b7b14467e1a481b8976e87278ac4a730c2f7c7fcddc1-lxml-5.3.2.tar.gz"; } { - name = "mariadb-connector-c-3.3.11-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.11-src.tar.gz"; - sha256 = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a"; + name = "mariadb-connector-c-3.3.15-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz"; + sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe"; md5 = ""; - md5name = "f7ba02f70aa2ae2b13e9ee5acc78423f6bede38998afb91326a62be46cf5956a-mariadb-connector-c-3.3.11-src.tar.gz"; + md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -819,11 +819,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.21.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz"; - sha256 = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c"; + name = "libmwaw-0.3.22.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.22.tar.xz"; + sha256 = "a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32"; md5 = ""; - md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz"; + md5name = "a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32-libmwaw-0.3.22.tar.xz"; } { name = "mythes-1.2.5.tar.xz"; @@ -833,11 +833,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.101.2-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.101.2-with-nspr-4.35.tar.gz"; - sha256 = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa"; + name = "nss-3.102.1-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.102.1-with-nspr-4.35.tar.gz"; + sha256 = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65"; md5 = ""; - md5name = "ff602c1fa86a4f841b27109918dfff60f41582e1caf6dbd651cfa72bdc8a64aa-nss-3.101.2-with-nspr-4.35.tar.gz"; + md5name = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65-nss-3.102.1-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -868,11 +868,11 @@ md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; } { - name = "openldap-2.6.7.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.6.7.tgz"; - sha256 = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930"; + name = "openldap-2.6.9.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz"; + sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff"; md5 = ""; - md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz"; + md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz"; } { name = "openssl-3.0.16.tar.gz"; @@ -896,11 +896,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-6536.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-6536.tar.bz2"; - sha256 = "9c2db89e9ea96f632108170bce7d901dbfc773bb09d03b7cd0ac68ebe26b9092"; + name = "pdfium-7012.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-7012.tar.bz2"; + sha256 = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd"; md5 = ""; - md5name = "9c2db89e9ea96f632108170bce7d901dbfc773bb09d03b7cd0ac68ebe26b9092-pdfium-6536.tar.bz2"; + md5name = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd-pdfium-7012.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -910,11 +910,11 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.44.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.44.tar.xz"; - sha256 = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e"; + name = "libpng-1.6.47.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.47.tar.xz"; + sha256 = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631"; md5 = ""; - md5name = "60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e-libpng-1.6.44.tar.xz"; + md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz"; } { name = "tiff-4.7.0.tar.xz"; @@ -938,18 +938,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.16.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.16.tar.bz2"; - sha256 = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865"; + name = "postgresql-14.17.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-14.17.tar.bz2"; + sha256 = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1"; md5 = ""; - md5name = "c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865-postgresql-13.16.tar.bz2"; + md5name = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1-postgresql-14.17.tar.bz2"; } { - name = "Python-3.9.21.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.9.21.tar.xz"; - sha256 = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1"; + name = "Python-3.10.17.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.10.17.tar.xz"; + sha256 = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0"; md5 = ""; - md5name = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1-Python-3.9.21.tar.xz"; + md5name = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0-Python-3.10.17.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -980,25 +980,25 @@ md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; } { - name = "librevenge-0.0.4.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; - sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; + name = "librevenge-0.0.5.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/librevenge-0.0.5.tar.bz2"; + sha256 = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5"; md5 = ""; - md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; + md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2"; } { - name = "rhino1_5R5.zip"; - url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; - sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; - md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; - md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + name = "rhino-1.7.15.zip"; + url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip"; + sha256 = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa"; + md5 = ""; + md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip"; } { - name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; - sha256 = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01"; + name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d"; md5 = ""; - md5name = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01-skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; + md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -1007,13 +1007,6 @@ md5 = ""; md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; } - { - name = "swingExSrc.zip"; - url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; - sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; - md5 = "35c94d2df8893241173de1d16b6034c0"; - md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; - } { name = "twaindsm_2.4.1.orig.tar.gz"; url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; @@ -1078,10 +1071,10 @@ md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz"; } { - name = "zxing-cpp-2.1.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.1.0.tar.gz"; - sha256 = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe"; + name = "zxing-cpp-2.2.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.2.1.tar.gz"; + sha256 = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635"; md5 = ""; - md5name = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe-zxing-cpp-2.1.0.tar.gz"; + md5name = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635-zxing-cpp-2.2.1.tar.gz"; } ] diff --git a/pkgs/applications/office/libreoffice/src-collabora/help.nix b/pkgs/applications/office/libreoffice/src-collabora/help.nix index 1ad21771ece7..0fa16c0e036b 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/help.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/help.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/help"; - rev = "refs/tags/cp-24.04.13-2"; - hash = "sha256-lyBuj7FI1jwVLLBkB6JJcmQVtm1FKExYWvRUoGqRbJ0="; + rev = "refs/tags/cp-25.04.1-1"; + hash = "sha256-jKcrkvdxpebCTeILrjA7bKfcsWw8VFjS7eimJI1dgFQ="; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/main.nix b/pkgs/applications/office/libreoffice/src-collabora/main.nix index d6ceb8ce2229..aa8d54321099 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/main.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/main.nix @@ -1,7 +1,7 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/core"; - rev = "refs/tags/cp-24.04.13-2"; - hash = "sha256-m+kNUxpHwr7dfWsmvM9FSzR2YvTWYpeawOr8YH3b700="; + rev = "refs/tags/cp-25.04.1-1"; + hash = "sha256-WhNNKL1RC0hWi21wH5EJRZ8V8U7jk6z8h3E3mVR56zk="; fetchSubmodules = false; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/translations.nix b/pkgs/applications/office/libreoffice/src-collabora/translations.nix index 8d6a1717239b..1248c511813a 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/translations.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/translations.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/translations"; - rev = "refs/tags/cp-24.04.13-2"; - hash = "sha256-BlV36hcR5mvwlnGNvCE/semLQPFTcL6HLqVK2cP357Y="; + rev = "refs/tags/cp-25.04.1-1"; + hash = "sha256-kZ5LwhEMWYv9peYPjTL14wjYv4LHUMtaM7XGYSVw68U="; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/version.nix b/pkgs/applications/office/libreoffice/src-collabora/version.nix index 27b8f494b15f..94c49e9eee21 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/version.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/version.nix @@ -1 +1 @@ -"24.04.13-2" +"25.04.1-1" diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index 0d1db330eec7..f546d1ff4c59 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -147,11 +147,11 @@ md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; } { - name = "expat-2.6.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz"; - sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee"; + name = "expat-2.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz"; + sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30"; md5 = ""; - md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz"; + md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -161,11 +161,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.16.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.0.tar.xz"; - sha256 = "6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220"; + name = "fontconfig-2.16.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.1.tar.xz"; + sha256 = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a"; md5 = ""; - md5name = "6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220-fontconfig-2.16.0.tar.xz"; + md5name = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a-fontconfig-2.16.1.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -336,11 +336,11 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "Amiri-1.000.zip"; - url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; - sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; + name = "Amiri-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-1.001.zip"; + sha256 = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a"; md5 = ""; - md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; + md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { name = "ReemKufi-1.7.zip"; @@ -588,18 +588,18 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2025-02-06.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-02-06.tar.bz2"; - sha256 = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662"; + name = "language-subtag-registry-2025-03-10.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2"; + sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39"; md5 = ""; - md5name = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662-language-subtag-registry-2025-02-06.tar.bz2"; + md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2"; } { - name = "lcms2-2.16.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz"; - sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51"; + name = "lcms2-2.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz"; + sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074"; md5 = ""; - md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; + md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz"; } { name = "libassuan-3.0.2.tar.bz2"; @@ -630,18 +630,18 @@ md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz"; } { - name = "libffi-3.4.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libffi-3.4.6.tar.gz"; - sha256 = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e"; + name = "libffi-3.4.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.4.8.tar.gz"; + sha256 = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b"; md5 = ""; - md5name = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e-libffi-3.4.6.tar.gz"; + md5name = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b-libffi-3.4.8.tar.gz"; } { - name = "libgpg-error-1.51.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.51.tar.bz2"; - sha256 = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2"; + name = "libgpg-error-1.54.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.54.tar.bz2"; + sha256 = "607dcadfd722120188eca5cd07193158b9dd906b578a557817ec779bd5e16d0e"; md5 = ""; - md5name = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2-libgpg-error-1.51.tar.bz2"; + md5name = "607dcadfd722120188eca5cd07193158b9dd906b578a557817ec779bd5e16d0e-libgpg-error-1.54.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -679,18 +679,18 @@ md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz"; } { - name = "libxml2-2.13.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.13.6.tar.xz"; - sha256 = "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96"; + name = "libxml2-2.13.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.13.8.tar.xz"; + sha256 = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a"; md5 = ""; - md5name = "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96-libxml2-2.13.6.tar.xz"; + md5name = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a-libxml2-2.13.8.tar.xz"; } { - name = "libxslt-1.1.42.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.42.tar.xz"; - sha256 = "85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb"; + name = "libxslt-1.1.43.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.43.tar.xz"; + sha256 = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a"; md5 = ""; - md5name = "85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb-libxslt-1.1.42.tar.xz"; + md5name = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a-libxslt-1.1.43.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -700,18 +700,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-5.3.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lxml-5.3.0.tar.gz"; - sha256 = "4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f"; + name = "lxml-5.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-5.4.0.tar.gz"; + sha256 = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd"; md5 = ""; - md5name = "4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f-lxml-5.3.0.tar.gz"; + md5name = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd-lxml-5.4.0.tar.gz"; } { - name = "mariadb-connector-c-3.3.14-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.14-src.tar.gz"; - sha256 = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49"; + name = "mariadb-connector-c-3.3.15-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz"; + sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe"; md5 = ""; - md5name = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49-mariadb-connector-c-3.3.14-src.tar.gz"; + md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -861,11 +861,11 @@ md5name = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1-postgresql-14.17.tar.bz2"; } { - name = "Python-3.10.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.10.16.tar.xz"; - sha256 = "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1"; + name = "Python-3.10.17.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.10.17.tar.xz"; + sha256 = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0"; md5 = ""; - md5name = "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1-Python-3.10.16.tar.xz"; + md5name = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0-Python-3.10.17.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index 34b2679b8400..9c18721e53a3 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0r6hbhi8zxnsjk2lmyqxdyfs7vdg30d40753qnwkwk3avq8hywdf"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-help-25.2.1.2.tar.xz"; + sha256 = "1cik6bvy4nvhyxr7nsbh5nl4irfmhlcfw2kpz2pyh5zbf11d5hi7"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-help-25.2.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index 15c5531bd614..825a8f845f53 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0pdpslpzrwkxxv775v563xw78wgsk8air8sf35cca165fwjaw0c0"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-25.2.1.2.tar.xz"; + sha256 = "1pysqa31by4rhghnfyz8xbygqn6d6fjqm2py1apxkw3xa8g4cm7a"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-25.2.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index a459874601f8..a1d4104540b2 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0jyc212vdjwixrm7fllnchai8jpxqk7kk4a4wsyfbx96ap5c1gc9"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-translations-25.2.1.2.tar.xz"; + sha256 = "0iqcr2snc34x19ys0317a939lflgk75ndjw6frja6a12p9625lnk"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-translations-25.2.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 11bfd520bcdc..0d091853804d 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"25.2.1.2" +"25.2.3.2" diff --git a/pkgs/applications/office/libreoffice/src-still/deps.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix index 3858e5aaa303..9301730b3521 100644 --- a/pkgs/applications/office/libreoffice/src-still/deps.nix +++ b/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.12.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.12.0.tar.xz"; - sha256 = "9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d"; + name = "curl-8.12.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.12.1.tar.xz"; + sha256 = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202"; md5 = ""; - md5name = "9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d-curl-8.12.0.tar.xz"; + md5name = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202-curl-8.12.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -147,11 +147,11 @@ md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; } { - name = "expat-2.6.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz"; - sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee"; + name = "expat-2.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz"; + sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30"; md5 = ""; - md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz"; + md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -336,11 +336,11 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "Amiri-1.000.zip"; - url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; - sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; + name = "Amiri-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-1.001.zip"; + sha256 = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a"; md5 = ""; - md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; + md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { name = "ReemKufi-1.7.zip"; @@ -364,11 +364,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.13.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.13.2.tar.xz"; - sha256 = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d"; + name = "freetype-2.13.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz"; + sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"; md5 = ""; - md5name = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d-freetype-2.13.2.tar.xz"; + md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz"; } { name = "frozen-1.1.1.tar.gz"; @@ -539,11 +539,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2025-02-06.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-02-06.tar.bz2"; - sha256 = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662"; + name = "language-subtag-registry-2025-03-10.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2"; + sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39"; md5 = ""; - md5name = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662-language-subtag-registry-2025-02-06.tar.bz2"; + md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2"; } { name = "lcms2-2.16.tar.gz"; @@ -553,11 +553,11 @@ md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; } { - name = "libassuan-3.0.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-3.0.1.tar.bz2"; - sha256 = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1"; + name = "libassuan-3.0.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-3.0.2.tar.bz2"; + sha256 = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6"; md5 = ""; - md5name = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1-libassuan-3.0.1.tar.bz2"; + md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2"; } { name = "libatomic_ops-7.8.2.tar.gz"; @@ -588,11 +588,11 @@ md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; } { - name = "libgpg-error-1.51.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.51.tar.bz2"; - sha256 = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2"; + name = "libgpg-error-1.55.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.55.tar.bz2"; + sha256 = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78"; md5 = ""; - md5name = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2-libgpg-error-1.51.tar.bz2"; + md5name = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78-libgpg-error-1.55.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -630,18 +630,18 @@ md5name = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917-xmlsec1-1.3.5.tar.gz"; } { - name = "libxml2-2.12.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.12.9.tar.xz"; - sha256 = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590"; + name = "libxml2-2.13.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.13.8.tar.xz"; + sha256 = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a"; md5 = ""; - md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz"; + md5name = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a-libxml2-2.13.8.tar.xz"; } { - name = "libxslt-1.1.41.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.41.tar.xz"; - sha256 = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda"; + name = "libxslt-1.1.43.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.43.tar.xz"; + sha256 = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a"; md5 = ""; - md5name = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda-libxslt-1.1.41.tar.xz"; + md5name = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a-libxslt-1.1.43.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -651,18 +651,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-5.2.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lxml-5.2.2.tar.gz"; - sha256 = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87"; + name = "lxml-5.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-5.4.0.tar.gz"; + sha256 = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd"; md5 = ""; - md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz"; + md5name = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd-lxml-5.4.0.tar.gz"; } { - name = "mariadb-connector-c-3.3.14-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.14-src.tar.gz"; - sha256 = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49"; + name = "mariadb-connector-c-3.3.15-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz"; + sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe"; md5 = ""; - md5name = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49-mariadb-connector-c-3.3.14-src.tar.gz"; + md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -777,11 +777,11 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.46.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.46.tar.xz"; - sha256 = "f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1"; + name = "libpng-1.6.47.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.47.tar.xz"; + sha256 = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631"; md5 = ""; - md5name = "f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1-libpng-1.6.46.tar.xz"; + md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz"; } { name = "tiff-4.7.0.tar.xz"; @@ -791,11 +791,11 @@ md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; } { - name = "poppler-25.01.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz"; - sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112"; + name = "poppler-25.04.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-25.04.0.tar.xz"; + sha256 = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d"; md5 = ""; - md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.0.tar.xz"; + md5name = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d-poppler-25.04.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -805,18 +805,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.18.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.18.tar.bz2"; - sha256 = "ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1"; + name = "postgresql-13.19.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.19.tar.bz2"; + sha256 = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea"; md5 = ""; - md5name = "ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1-postgresql-13.18.tar.bz2"; + md5name = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea-postgresql-13.19.tar.bz2"; } { - name = "Python-3.9.21.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.9.21.tar.xz"; - sha256 = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1"; + name = "Python-3.9.22.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.9.22.tar.xz"; + sha256 = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec"; md5 = ""; - md5name = "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1-Python-3.9.21.tar.xz"; + md5name = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec-Python-3.9.22.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix index 62a68fbcfaa7..dc23461a2d8d 100644 --- a/pkgs/applications/office/libreoffice/src-still/help.nix +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1g1fzp5bd5rim3wdqjwfgzyw14g7bdkc4i0pdfymybgsgxdrcc5z"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-help-24.8.5.2.tar.xz"; + sha256 = "0139rsgny1n554qycwmwsxyirr4afbw2q0r326s2mz6bxfg817qm"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-help-24.8.7.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix index ff9a0742d778..cec518b7d4df 100644 --- a/pkgs/applications/office/libreoffice/src-still/main.nix +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0sdqap232lcs8jkrxxs4h29zncyg9pibx8w6bczwa2nr2i0vv2ls"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-24.8.5.2.tar.xz"; + sha256 = "1swl16qznhzbchjzx6rp0a388s1ndwpdqswjpz1mxga514dlgpzh"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-24.8.7.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix index b1b69e9fe10d..878b8f3ae73b 100644 --- a/pkgs/applications/office/libreoffice/src-still/translations.nix +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "108qfnxdz9xw9njkq1lmiwa72ygiwnpzb5ghzr13v8jmhlk1a3fd"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.5/libreoffice-translations-24.8.5.2.tar.xz"; + sha256 = "0r4zvy4xlhz23bk4vmh03qa1d5qdrcjg4fppy0q92yclxkrnzlgh"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-translations-24.8.7.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix index 18bff564ccc3..1ca4acb8d8c9 100644 --- a/pkgs/applications/office/libreoffice/src-still/version.nix +++ b/pkgs/applications/office/libreoffice/src-still/version.nix @@ -1 +1 @@ -"24.8.5.2" +"24.8.7.2" diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 499ef5248938..6e88ab8b0020 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -8,13 +8,13 @@ let pname = "mendeley"; - version = "2.131.0"; + version = "2.132.1"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-pVykRTs0yI9UArgxuE3RUKI8onv27hjyG1Dy4PXztuQ="; + hash = "sha256-FzniIT3foLbXGQ6Rnmea9MmBs0mXAFDgwv0iu9eX3lM="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index c8e6d116bc9a..42f157f81562 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -32,11 +32,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; - hash = "sha256-CuWM7UEBAegmVeO0wgoHDPF2cUWtojPc73wguLpr1Ic="; + hash = "sha256-UzvnrwOs+qc27F96P8JWKr0gD+9coqfN7gK19E1hgp4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index e2f42460d99b..bc526578fdbb 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -31,11 +31,11 @@ mkDerivation rec { pname = "skrooge"; - version = "25.1.0"; + version = "25.4.0"; src = fetchurl { url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz"; - hash = "sha256-t8A9egotR2XoMBo5uoH2RBPEo3H6nPSJS5Oi4MkSVww="; + hash = "sha256-HNui/SjCN9LWxUxHDae59n5qPIwYWHX1uFSlVnwBlL8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/softmaker/softmaker-office-nx.nix b/pkgs/applications/office/softmaker/softmaker-office-nx.nix index f6b152df6883..e584a8078340 100644 --- a/pkgs/applications/office/softmaker/softmaker-office-nx.nix +++ b/pkgs/applications/office/softmaker/softmaker-office-nx.nix @@ -6,9 +6,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. officeVersion ? { - version = "1222"; + version = "1224"; edition = ""; - hash = "sha256-8ya9RYpd9G5SITYOpvhxjQE8ieV8TuAApkjNwCf9nHs="; + hash = "sha256-Y6x5E8WeI7Pf/wczWNKnHsCbXWW4Jdzo4ToBdzgmOF8="; }, ... diff --git a/pkgs/applications/office/softmaker/softmaker-office.nix b/pkgs/applications/office/softmaker/softmaker-office.nix index 8cc4bfada5c9..ec51ce3693aa 100644 --- a/pkgs/applications/office/softmaker/softmaker-office.nix +++ b/pkgs/applications/office/softmaker/softmaker-office.nix @@ -7,9 +7,9 @@ # Softmaker Office or when the upstream archive was replaced and # nixpkgs is not in sync yet. officeVersion ? { - version = "1222"; + version = "1224"; edition = "2024"; - hash = "sha256-eyYBK5ZxPcBakOvXUQZIU2aftyH6PXh/rtqC/1BJhg4="; + hash = "sha256-ix9R9Xlugvu5qmKAqC2DsZFhyJ+VVsD7MSpBv+4lmTY="; }, ... diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock deleted file mode 100644 index 30e48b7febbe..000000000000 --- a/pkgs/applications/office/timetrap/Gemfile.lock +++ /dev/null @@ -1,19 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - chronic (0.10.2) - sequel (5.30.0) - sqlite3 (1.4.2) - timetrap (1.15.2) - chronic (~> 0.10.2) - sequel (~> 5.30.0) - sqlite3 (~> 1.4.2) - -PLATFORMS - ruby - -DEPENDENCIES - timetrap - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix deleted file mode 100644 index cfb1c0a62fc9..000000000000 --- a/pkgs/applications/office/timetrap/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - bundlerEnv, - bundlerApp, - bundlerUpdateScript, - installShellFiles, -}: - -let - ttBundlerApp = bundlerApp { - pname = "timetrap"; - gemdir = ./.; - exes = [ - "t" - "timetrap" - ]; - - passthru.updateScript = bundlerUpdateScript "timetrap"; - }; - - ttGem = bundlerEnv { - pname = "timetrap"; - gemdir = ./.; - }; - -in - -stdenv.mkDerivation { - name = "timetrap"; - - dontUnpack = true; - - nativeBuildInputs = [ installShellFiles ]; - - installPhase = '' - mkdir $out; - cd $out; - - mkdir bin; pushd bin; - ln -vs ${ttBundlerApp}/bin/t; - ln -vs ${ttBundlerApp}/bin/timetrap; - popd; - - for c in t timetrap; do - installShellCompletion --cmd $c --bash ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/bash/*; - installShellCompletion --cmd $c --zsh ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/zsh/*; - done; - ''; - - meta = with lib; { - description = "Simple command line time tracker written in ruby"; - homepage = "https://github.com/samg/timetrap"; - license = licenses.mit; - maintainers = with maintainers; [ - jerith666 - manveru - nicknovitski - ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix deleted file mode 100644 index 16419444ee25..000000000000 --- a/pkgs/applications/office/timetrap/gemset.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - chronic = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; - type = "gem"; - }; - version = "0.10.2"; - }; - sequel = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0gqqnqrfayhwhkp0vy3frv68sgc7klyd6mfisx1j3djjvlyc7hmr"; - type = "gem"; - }; - version = "5.30.0"; - }; - sqlite3 = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; - type = "gem"; - }; - version = "1.4.2"; - }; - timetrap = { - dependencies = [ - "chronic" - "sequel" - "sqlite3" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0pfg5c3kmh1jfaaszw253bi93ixa6cznqmsafrcpccrdg9r8j2k8"; - type = "gem"; - }; - version = "1.15.2"; - }; -} diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index e96025aabc9c..4b1770dbd3d8 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation { inherit version; meta = metaCommon // { platforms = [ "x86_64-linux" ]; + mainProgram = "trilium-server"; }; src = fetchurl serverSource; @@ -50,6 +51,12 @@ stdenv.mkDerivation { exec ./node/bin/node src/www EOF chmod a+x $out/bin/trilium-server + + # ERROR: noBrokenSymlinks: found 4 dangling symlinks, 0 reflexive symlinks and 0 unreadable symlinks + unlink $out/share/trilium-server/node/bin/npx + unlink $out/share/trilium-server/node/bin/npm + unlink $out/share/trilium-server/node_modules/.bin/electron + unlink $out/share/trilium-server/node_modules/.bin/electron-installer-debian ''; passthru.tests = { diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix deleted file mode 100644 index a6608f926967..000000000000 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - cmake, - fftw, - hamlib, - libpulseaudio, - libGL, - libX11, - liquid-dsp, - pkg-config, - soapysdr-with-plugins, - wxGTK32, - enableDigitalLab ? false, - Cocoa, - WebKit, -}: - -stdenv.mkDerivation rec { - pname = "cubicsdr"; - version = "0.2.7"; - - src = fetchFromGitHub { - owner = "cjcliffe"; - repo = "CubicSDR"; - rev = version; - sha256 = "0cyv1vk97x4i3h3hhh7dx8mv6d1ad0fypdbx5fl26bz661sr8j2n"; - }; - - patches = [ - # Fix for liquid-dsp v1.50 - (fetchpatch { - url = "https://github.com/cjcliffe/CubicSDR/commit/0e3a785bd2af56d18ff06b56579197b3e89b34ab.patch"; - sha256 = "sha256-mPfNZcV3FnEtGVX4sCMSs+Qc3VeSBIRkpCyx24TKkcU="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = - [ - fftw - hamlib - liquid-dsp - soapysdr-with-plugins - wxGTK32 - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libpulseaudio - libGL - libX11 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - WebKit - ]; - - cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; - - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - install_name_tool -change libliquid.dylib ${lib.getLib liquid-dsp}/lib/libliquid.dylib ''${out}/bin/CubicSDR - ''; - - meta = with lib; { - homepage = "https://cubicsdr.com"; - description = "Software Defined Radio application"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lasandell ]; - platforms = platforms.unix; - mainProgram = "CubicSDR"; - }; -} diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/applications/radio/klog/default.nix index 9ac067a41897..f4729c183ed9 100644 --- a/pkgs/applications/radio/klog/default.nix +++ b/pkgs/applications/radio/klog/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "1.3.2"; src = fetchurl { - url = "https://download.savannah.nongnu.org/releases/klog/${pname}-${version}.tar.gz"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c"; }; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 2679132bdb8f..40929d11910d 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -11,7 +11,6 @@ libX11, gnuplot, fltk, - GLUT, withGui ? false, }: @@ -40,9 +39,6 @@ stdenv.mkDerivation rec { libusb1 soapysdr ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - GLUT - ] ++ lib.optionals withGui [ fltk libX11 diff --git a/pkgs/applications/radio/openwebrx/default.nix b/pkgs/applications/radio/openwebrx/default.nix index e4fd91c1ca64..e9d9c0c0d6f9 100644 --- a/pkgs/applications/radio/openwebrx/default.nix +++ b/pkgs/applications/radio/openwebrx/default.nix @@ -42,7 +42,7 @@ let homepage = "https://github.com/jketterl/js8py"; description = "Library to decode the output of the js8 binary of JS8Call"; license = licenses.gpl3Only; - maintainers = teams.c3d2.members; + teams = [ teams.c3d2 ]; }; }; @@ -75,7 +75,7 @@ let description = "Set of connectors that are used by OpenWebRX to interface with SDR hardware"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = teams.c3d2.members; + teams = [ teams.c3d2 ]; }; }; @@ -120,6 +120,6 @@ buildPythonApplication rec { description = "Simple DSP library and command-line tool for Software Defined Radio"; mainProgram = "openwebrx"; license = licenses.gpl3Only; - maintainers = teams.c3d2.members; + teams = [ teams.c3d2 ]; }; } diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index afa1fcf14bc8..cf9b3be83409 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -18,7 +18,6 @@ alsa-lib, muparserx, python3, - utf8proc, }: mkDerivation rec { @@ -69,7 +68,6 @@ mkDerivation rec { alsa-lib muparserx python3 - utf8proc ]; postInstall = '' diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix deleted file mode 100644 index 66ec4e7fdc6b..000000000000 --- a/pkgs/applications/radio/qlog/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - fetchFromGitHub, - qtbase, - stdenv, - lib, - wrapQtAppsHook, - qmake, - qtcharts, - qtwebengine, - qtserialport, - qtwebchannel, - hamlib, - qtkeychain, - pkg-config, - cups, -}: - -stdenv.mkDerivation rec { - pname = "qlog"; - version = "0.42.2"; - - src = fetchFromGitHub { - owner = "foldynl"; - repo = "QLog"; - rev = "v${version}"; - hash = "sha256-DWUfP0C48JMvUashqCaDfnsn1IxzhtOzmSG5Fh+sL/w="; - fetchSubmodules = true; - }; - - env.NIX_LDFLAGS = "-lhamlib"; - - buildInputs = - [ - qtbase - qtcharts - qtwebengine - qtserialport - qtwebchannel - hamlib - qtkeychain - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - cups - ]); - - nativeBuildInputs = [ - wrapQtAppsHook - qmake - pkg-config - ]; - - meta = with lib; { - description = "Amateur radio logbook software"; - mainProgram = "qlog"; - license = with licenses; [ gpl3Only ]; - homepage = "https://github.com/foldynl/QLog"; - maintainers = with maintainers; [ - oliver-koss - mkg20001 - ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index ed12a0114b28..aad4b36ed8ad 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -3,6 +3,7 @@ stdenv, airspy, airspyhf, + apple-sdk_12, aptdec, boost, cm256cc, @@ -12,6 +13,7 @@ dsdcc, faad2, fetchFromGitHub, + fetchpatch, fftwFloat, flac, glew, @@ -113,8 +115,17 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ] ++ lib.optionals withSDRplay [ sdrplay ]; + patches = [ + # https://github.com/f4exb/sdrangel/pull/2439 + (fetchpatch { + url = "https://github.com/f4exb/sdrangel/commit/60869b74f96b26e8a173f3f215c2badeaef9a136.patch"; + hash = "sha256-Lq9pyissNmLYavLCISga0EWbRwisGnKiz6UYhzxJatc="; + }) + ]; + cmakeFlags = [ "-DAPT_DIR=${aptdec}" "-DDAB_DIR=${dab_lib}" diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix deleted file mode 100644 index 6e140c25bffd..000000000000 --- a/pkgs/applications/radio/sdrpp/default.nix +++ /dev/null @@ -1,185 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libX11, - glfw, - glew, - fftwFloat, - volk, - zstd, - AppKit, - # Sources - airspy_source ? true, - airspy, - airspyhf_source ? true, - airspyhf, - bladerf_source ? true, - libbladeRF, - file_source ? true, - hackrf_source ? true, - hackrf, - limesdr_source ? true, - limesuite, - perseus_source ? false, # needs libperseus-sdr, not yet available in nixpks - plutosdr_source ? stdenv.hostPlatform.isLinux, - libiio, - libad9361, - rfspace_source ? true, - rtl_sdr_source ? true, - rtl-sdr-osmocom, - libusb1, # osmocom better w/ rtlsdr v4 - rtl_tcp_source ? true, - sdrplay_source ? false, - sdrplay, - soapy_source ? true, - soapysdr-with-plugins, - spyserver_source ? true, - usrp_source ? false, - uhd, - boost, - - # Sinks - audio_sink ? true, - rtaudio, - network_sink ? true, - portaudio_sink ? false, - portaudio, - - # Decoders - falcon9_decoder ? false, - m17_decoder ? false, - codec2, - meteor_demodulator ? true, - radio ? true, - weather_sat_decoder ? false, # is missing some dsp/pll.h - - # Misc - discord_presence ? true, - frequency_manager ? true, - recorder ? true, - rigctl_server ? true, - scanner ? true, -}: - -stdenv.mkDerivation rec { - pname = "sdrpp"; - - # SDR++ uses a rolling release model. - # Choose a git hash from head and use the date from that commit as - # version qualifier - git_hash = "27ab5bf3c194169ddf60ca312723fce96149cc8e"; - git_date = "2024-01-22"; - version = "1.1.0-unstable-" + git_date; - - src = fetchFromGitHub { - owner = "AlexandreRouma"; - repo = "SDRPlusPlus"; - rev = git_hash; - hash = "sha256-R4xWeqdHEAaje37VQaGlg+L2iYIOH4tXMHvZkZq4SDU="; - }; - - patches = [ ./runtime-prefix.patch ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "/usr/share" "share" \ - --replace "set(CMAKE_INSTALL_PREFIX" "#set(CMAKE_INSTALL_PREFIX" - substituteInPlace decoder_modules/m17_decoder/src/m17dsp.h \ - --replace "codec2.h" "codec2/codec2.h" - # Since the __TIME_ and __DATE__ is canonicalized in the build, - # use our qualified version shown in the programs window title. - substituteInPlace core/src/version.h --replace "1.1.0" "$version" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = - [ - glfw - glew - fftwFloat - volk - zstd - ] - ++ lib.optional stdenv.hostPlatform.isDarwin AppKit - ++ lib.optional stdenv.hostPlatform.isLinux libX11 - ++ lib.optional airspy_source airspy - ++ lib.optional airspyhf_source airspyhf - ++ lib.optional bladerf_source libbladeRF - ++ lib.optional hackrf_source hackrf - ++ lib.optional limesdr_source limesuite - ++ lib.optionals rtl_sdr_source [ - rtl-sdr-osmocom - libusb1 - ] - ++ lib.optional sdrplay_source sdrplay - ++ lib.optional soapy_source soapysdr-with-plugins - ++ lib.optionals plutosdr_source [ - libiio - libad9361 - ] - ++ lib.optionals usrp_source [ - uhd - boost - ] - ++ lib.optional audio_sink rtaudio - ++ lib.optional portaudio_sink portaudio - ++ lib.optional m17_decoder codec2; - - cmakeFlags = [ - # Sources - (lib.cmakeBool "OPT_BUILD_AIRSPYHF_SOURCE" airspyhf_source) - (lib.cmakeBool "OPT_BUILD_AIRSPY_SOURCE" airspy_source) - (lib.cmakeBool "OPT_BUILD_BLADERF_SOURCE" bladerf_source) - (lib.cmakeBool "OPT_BUILD_FILE_SOURCE" file_source) - (lib.cmakeBool "OPT_BUILD_HACKRF_SOURCE" hackrf_source) - (lib.cmakeBool "OPT_BUILD_LIMESDR_SOURCE" limesdr_source) - (lib.cmakeBool "OPT_BUILD_PERSEUS_SOURCE" perseus_source) - (lib.cmakeBool "OPT_BUILD_PLUTOSDR_SOURCE" plutosdr_source) - (lib.cmakeBool "OPT_BUILD_RFSPACE_SOURCE" rfspace_source) - (lib.cmakeBool "OPT_BUILD_RTL_SDR_SOURCE" rtl_sdr_source) - (lib.cmakeBool "OPT_BUILD_RTL_TCP_SOURCE" rtl_tcp_source) - (lib.cmakeBool "OPT_BUILD_SDRPLAY_SOURCE" sdrplay_source) - (lib.cmakeBool "OPT_BUILD_SOAPY_SOURCE" soapy_source) - (lib.cmakeBool "OPT_BUILD_SPYSERVER_SOURCE" spyserver_source) - (lib.cmakeBool "OPT_BUILD_USRP_SOURCE" usrp_source) - - # Sinks - (lib.cmakeBool "OPT_BUILD_AUDIO_SINK" audio_sink) - (lib.cmakeBool "OPT_BUILD_NETWORK_SINK" network_sink) - (lib.cmakeBool "OPT_BUILD_NEW_PORTAUDIO_SINK" portaudio_sink) - - # Decoders - (lib.cmakeBool "OPT_BUILD_FALCON9_DECODER" falcon9_decoder) - (lib.cmakeBool "OPT_BUILD_M17_DECODER" m17_decoder) - (lib.cmakeBool "OPT_BUILD_METEOR_DEMODULATOR" meteor_demodulator) - (lib.cmakeBool "OPT_BUILD_RADIO" radio) - (lib.cmakeBool "OPT_BUILD_WEATHER_SAT_DECODER" weather_sat_decoder) - - # Misc - (lib.cmakeBool "OPT_BUILD_DISCORD_PRESENCE" discord_presence) - (lib.cmakeBool "OPT_BUILD_FREQUENCY_MANAGER" frequency_manager) - (lib.cmakeBool "OPT_BUILD_RECORDER" recorder) - (lib.cmakeBool "OPT_BUILD_RIGCTL_SERVER" rigctl_server) - (lib.cmakeBool "OPT_BUILD_SCANNER" scanner) - ]; - - env.NIX_CFLAGS_COMPILE = "-fpermissive"; - - hardeningDisable = lib.optional stdenv.cc.isClang "format"; - - meta = with lib; { - description = "Cross-Platform SDR Software"; - homepage = "https://github.com/AlexandreRouma/SDRPlusPlus"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; - mainProgram = "sdrpp"; - }; -} diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix deleted file mode 100644 index 975a7dc1c261..000000000000 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - airspy, - soapysdr, - libobjc, - IOKit, - Security, -}: - -stdenv.mkDerivation rec { - pname = "soapyairspy"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "pothosware"; - repo = "SoapyAirspy"; - rev = "soapy-airspy-${version}"; - sha256 = "0g23yybnmq0pg2m8m7dbhif8lw0hdsmnnjym93fdyxfk5iln7fsc"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = - [ - airspy - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - Security - ]; - - cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - - meta = with lib; { - homepage = "https://github.com/pothosware/SoapyAirspy"; - description = "SoapySDR plugin for Airspy devices"; - license = licenses.mit; - maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix deleted file mode 100644 index 003561495c1b..000000000000 --- a/pkgs/applications/radio/soapyaudio/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - hamlib, - rtaudio, - alsa-lib, - libpulseaudio, - libjack2, - libusb1, - soapysdr, - Accelerate, - CoreAudio, -}: - -stdenv.mkDerivation rec { - pname = "soapyaudio"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "pothosware"; - repo = "SoapyAudio"; - rev = "soapy-audio-${version}"; - sha256 = "0minlsc1lvmqm20vn5hb4im7pz8qwklfy7sbr2xr73xkrbqdahc0"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = - [ - hamlib - rtaudio - libjack2 - libusb1 - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - libpulseaudio - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreAudio - ]; - - cmakeFlags = [ - "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" - "-DUSE_HAMLIB=ON" - ]; - - meta = with lib; { - homepage = "https://github.com/pothosware/SoapyAudio"; - description = "SoapySDR plugin for amateur radio and audio devices"; - license = licenses.mit; - maintainers = with maintainers; [ numinit ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix deleted file mode 100644 index 31747781cbda..000000000000 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - libbladeRF, - soapysdr, - libobjc, - IOKit, - Security, -}: - -let - version = "0.4.2"; - -in -stdenv.mkDerivation { - pname = "soapybladerf"; - inherit version; - - src = fetchFromGitHub { - owner = "pothosware"; - repo = "SoapyBladeRF"; - rev = "soapy-bladerf-${version}"; - sha256 = "sha256-lhTiu+iCdlLTY5ceND+F8HzKf2K9afuTi3cme6nGEMo="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = - [ - libbladeRF - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - Security - ]; - - cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - - meta = with lib; { - homepage = "https://github.com/pothosware/SoapyBladeRF"; - description = "SoapySDR plugin for BladeRF devices"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix deleted file mode 100644 index 949e5b5bff9d..000000000000 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - hackrf, - soapysdr, - libobjc, - IOKit, - Security, -}: - -let - version = "0.3.4"; - -in -stdenv.mkDerivation { - pname = "soapyhackrf"; - inherit version; - - src = fetchFromGitHub { - owner = "pothosware"; - repo = "SoapyHackRF"; - rev = "soapy-hackrf-${version}"; - sha256 = "sha256-fzPYHJAPX8FkFxPXpLlUagTd/NoamRX0YnxHwkbV1nI="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = - [ - hackrf - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - Security - ]; - - cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - - meta = with lib; { - homepage = "https://github.com/pothosware/SoapyHackRF"; - description = "SoapySDR plugin for HackRF devices"; - license = licenses.mit; - maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix deleted file mode 100644 index 16dd80a12cbc..000000000000 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - rtl-sdr, - soapysdr, - libobjc, - IOKit, - Security, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "soapyrtlsdr"; - version = "0.3.3"; - - src = fetchFromGitHub { - owner = "pothosware"; - repo = "SoapyRTLSDR"; - rev = "soapy-rtl-sdr-${finalAttrs.version}"; - sha256 = "sha256-IapdrBE8HhibY52Anm76/mVAoA0GghwnRCxxfGkyLTw="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = - [ - rtl-sdr - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - Security - ]; - - cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - - meta = with lib; { - homepage = "https://github.com/pothosware/SoapyRTLSDR"; - description = "SoapySDR plugin for RTL-SDR devices"; - license = licenses.mit; - maintainers = with maintainers; [ - ragge - luizribeiro - ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 115945657121..02d915ffa202 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "soapysdr"; # Don't forget to change passthru.abiVersion - version = "0.8.1-unstable-2024-12-22"; + version = "0.8.1-unstable-2025-03-30-03"; src = fetchFromGitHub { owner = "pothosware"; @@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: { # Instead of applying several patches for Python 3.12 compat, just take the latest, from: # use old get python lib for v2 (#437) - rev = "309335ec6a52eb712387ed025d705a3c0f7a1e24"; - hash = "sha256-a9414gX4fUAPQaKKqrWgSlFHZH0BWqbgHzhVCKnIn2M="; + rev = "fbf9f3c328868f46029284716df49095ab7b99a6"; + hash = "sha256-W4915c6hV/GR5PZRRXZJW3ERsZmQQQ08EA9wYp2tAVk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix deleted file mode 100644 index 062a5c17bf03..000000000000 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - uhd, - boost, - soapysdr, - libobjc, - IOKit, - Security, -}: - -stdenv.mkDerivation rec { - pname = "soapyuhd"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "pothosware"; - repo = "SoapyUHD"; - rev = "soapy-uhd-${version}"; - sha256 = "14rk9ap9ayks2ma6mygca08yfds9bgfmip8cvwl87l06hwhnlwhj"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = - [ - uhd - boost - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - Security - ]; - - cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - - postPatch = '' - sed -i "s:DESTINATION .*uhd/modules:DESTINATION $out/lib/uhd/modules:" CMakeLists.txt - ''; - - meta = with lib; { - homepage = "https://github.com/pothosware/SoapyAirspy"; - description = "SoapySDR plugin for UHD devices"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index 400aed42ca4c..7eb097556736 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { pname = "svxlink"; - version = "24.02"; + version = "25.05"; src = fetchFromGitHub { owner = "sm0svx"; repo = "svxlink"; tag = version; - hash = "sha256-QNm3LQ9RY24F/wmRuP+D2G5of1490YpZD9bp6dZErU0="; + hash = "sha256-xFtfHkLnStG730o5tGATLLZvcqYYpR+7ATUdib7B2rw="; }; cmakeFlags = [ diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix deleted file mode 100644 index 7f0e0836d9ca..000000000000 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - pkg-config, - intltool, - autoreconfHook, - gtk3, - glib, - curl, - goocanvas2, - gpsd, - hamlib, - wrapGAppsHook3, -}: - -stdenv.mkDerivation rec { - pname = "gpredict"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "csete"; - repo = "gpredict"; - rev = "v${version}"; - hash = "sha256-+hgjImfT3nWMBYwde7+KC/hzd84pwQbpoJvaJSNG4E8="; - }; - - patches = [ - # Pull upstream fix for -fno-common toolchains: - # https://github.com/csete/gpredict/issues/195 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch"; - sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a"; - }) - # Updates URLs for TLE files - # https://github.com/csete/gpredict/pull/305 - (fetchpatch { - name = "TLE-urls.patch"; - url = "https://github.com/csete/gpredict/commit/8f60f856921e8ee143cd6e2d34a9183778cb0fbf.patch"; - hash = "sha256-X/nKrqh5sjxDMLhA9LQek8AsJFqhvK/k8Ep3ug/0rMI="; - }) - - ]; - - nativeBuildInputs = [ - pkg-config - intltool - wrapGAppsHook3 - autoreconfHook - ]; - buildInputs = [ - curl - glib - gtk3 - goocanvas2 - gpsd - hamlib - ]; - - meta = { - description = "Real time satellite tracking and orbit prediction"; - mainProgram = "gpredict"; - longDescription = '' - Gpredict is a real time satellite tracking and orbit prediction program - written using the GTK widgets. Gpredict is targetted mainly towards ham radio - operators but others interested in satellite tracking may find it useful as - well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the - NORAD Keplerian elements. - ''; - license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; - homepage = "http://gpredict.oz9aec.net/"; - maintainers = with lib.maintainers; [ - markuskowa - cmcdragonkai - ]; - }; -} diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 1c41f924b898..1933c831b660 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, perl, wrapGAppsHook3, @@ -24,33 +23,41 @@ testers, xvfb-run, gitUpdater, + md4c, + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "24.4"; + version = "25.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${finalAttrs.version}"; - hash = "sha256-/xF9hXlPKhmpvpx9t1IgSqpvvqrGnd0xaf0QMvu+9IA="; + hash = "sha256-rbnGSdzPuFdSqWPaKtF3n4oLZ9l+4jX7KtnmcrTvwbs="; }; patches = [ - # Fix indi headers from https://github.com/Stellarium/stellarium/pull/4025 + # Patch from upstream to fix compilation with Qt 6.9 (fetchpatch { - url = "https://github.com/Stellarium/stellarium/commit/9669d64fb4104830412c6c6c2b45811075a92300.patch"; - hash = "sha256-CXeghxxRIV7Filveg+3pNAWymUpUuGnylvt4e8THJ8A="; + url = "https://github.com/Stellarium/stellarium/commit/bbcd60ae52b6f1395ef2390a2d2ba9d0f98db548.patch"; + hash = "sha256-9VaqLASxn1udUApDZRI5SCqCXNGOHUcdbM+pKhW8ZAg="; + }) + + # Upstream patch to support building with a locally provided md4c package + (fetchpatch { + url = "https://github.com/Stellarium/stellarium/commit/972c6ba72f575964fbf2049a22d51b4d1fd3983c.patch"; + hash = "sha256-ef1Jw5NeT0KLVKQt7VcvQh83n2ujMFK+Nv0165ZQ2r8="; }) ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ - --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ + --replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' substituteInPlace src/CMakeLists.txt \ - --replace "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/" + --replace-fail "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/" ''; nativeBuildInputs = [ @@ -74,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { indilib libnova exiv2 + md4c nlopt ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix deleted file mode 100644 index fabcfbd708dd..000000000000 --- a/pkgs/applications/science/biology/ants/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - makeBinaryWrapper, - itk, - vtk, - Cocoa, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "ANTs"; - version = "2.5.4"; - - src = fetchFromGitHub { - owner = "ANTsX"; - repo = "ANTs"; - tag = "v${finalAttrs.version}"; - hash = "sha256-7df9RcZZwfSkokG8dMQg65bCOk2atDGkJpPo8SrRrfY="; - }; - - nativeBuildInputs = [ - cmake - makeBinaryWrapper - ]; - - buildInputs = - [ - itk - vtk - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; - - cmakeFlags = [ - "-DANTS_SUPERBUILD=FALSE" - "-DUSE_VTK=TRUE" - ]; - - postInstall = '' - for file in $out/bin/*; do - wrapProgram $file --set PATH "$out/bin" - done - ''; - - meta = { - changelog = "https://github.com/ANTsX/ANTs/releases/tag/v${finalAttrs.version}"; - description = "Advanced normalization toolkit for medical image registration and other processing"; - homepage = "https://github.com/ANTsX/ANTs"; - license = lib.licenses.asl20; - mainProgram = "antsRegistration"; - maintainers = with lib.maintainers; [ bcdarwin ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index 239011dd7807..cbbc6ab194de 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -9,7 +9,6 @@ cpio, gawk, coreutils, - ApplicationServices, }: stdenv.mkDerivation rec { @@ -101,7 +100,7 @@ stdenv.mkDerivation rec { gawk zlib bzip2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; + ]; strictDeps = true; diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix deleted file mode 100644 index 32a32488c734..000000000000 --- a/pkgs/applications/science/biology/iv/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - neuron-version, - libX11, - libXext, - patchelf, -}: - -stdenv.mkDerivation rec { - pname = "iv"; - version = "19"; - - src = fetchurl { - url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/iv-${version}.tar.gz"; - sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; - }; - - nativeBuildInputs = [ patchelf ]; - buildInputs = [ libXext ]; - propagatedBuildInputs = [ libX11 ]; - - hardeningDisable = [ "format" ]; - - postInstall = - '' - for dir in $out/*; do # */ - if [ -d $dir/lib ]; then - mv $dir/* $out # */ - rmdir $dir - break - fi - done - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so - ''; - - meta = with lib; { - description = "InterViews graphical library for Neuron"; - license = licenses.bsd3; - homepage = "http://www.neuron.yale.edu/neuron"; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index ba268b46faad..0f75daf9c657 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -2,9 +2,9 @@ stdenv, lib, fetchFromGitHub, - python, + python3, makeWrapper, - eigen, + eigen_3_4_0, fftw, libtiff, libpng, @@ -20,27 +20,29 @@ withGui ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mrtrix"; - version = "3.0.4"; + version = "3.0.4-unstable-2025-04-09"; src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; - tag = version; - hash = "sha256-87zBAoBLWQPccGS37XyQ8H0GhL01k8GQFgcLL6IwbcM="; + rev = "7843bfc53a75f465901804ccf3fd6797d77531dd"; + hash = "sha256-C4Io3VkX10eWia4djrYvN12fWmwm0j1G60I8lmFH49w="; fetchSubmodules = true; }; nativeBuildInputs = [ - eigen makeWrapper + less + python3 ] ++ lib.optional withGui qt5.wrapQtAppsHook; buildInputs = [ ants - python + eigen_3_4_0 + python3 fftw libtiff libpng @@ -58,36 +60,47 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ bc ]; postPatch = '' - patchShebangs ./build ./configure ./run_tests ./bin/* + patchShebangs --build ./build ./configure ./run_tests + patchShebangs --host ./bin/* # patching interpreters before fixup is needed for tests: - patchShebangs ./bin/* patchShebangs testing/binaries/data/vectorstats/*py substituteInPlace ./run_tests \ - --replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' "" + --replace-fail 'git submodule update --init $datadir >> $LOGFILE 2>&1' "" + # reduce build noise + substituteInPlace ./configure \ + --replace-fail "[ '-Wall' ]" "[]" + + # fix error output (cuts off after a few lines otherwise) substituteInPlace ./build \ - --replace '"less -RX "' '"${less}/bin/less -RX "' + --replace-fail 'stderr=subprocess.PIPE' 'stderr=None' ''; configurePhase = '' - export EIGEN_CFLAGS="-isystem ${eigen}/include/eigen3" + runHook preConfigure + export EIGEN_CFLAGS="-isystem ${eigen_3_4_0}/include/eigen3" unset LD # similar to https://github.com/MRtrix3/mrtrix3/issues/1519 ./configure ${lib.optionalString (!withGui) "-nogui"}; + runHook postConfigure ''; buildPhase = '' + runHook preBuild ./build (cd testing && ../build) + runHook postBuild ''; installCheckPhase = '' + runHook preInstallCheck ./run_tests units ./run_tests binaries # can also `./run_tests scripts`, but this fails due to lack of FSL package # (and there's no convenient way to disable individual tests) + runHook postInstallCheck ''; doInstallCheck = true; @@ -99,13 +112,19 @@ stdenv.mkDerivation rec { runHook postInstall ''; - postInstall = '' - for prog in $out/bin/*; do - if [[ -x "$prog" ]]; then - wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} - fi - done - ''; + preFixup = + if withGui then + '' + qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ants ]}) + '' + else + '' + for prog in $out/bin/*; do + if [[ -x "$prog" ]]; then + wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} + fi + done + ''; meta = with lib; { broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); diff --git a/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch b/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch deleted file mode 100644 index a7782a1a0264..000000000000 --- a/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Makefile b/Makefile -index 2f51bfc..395d6f1 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,7 @@ - CC= gcc - CFLAGS= -g -Wall -O2 - #LDFLAGS= -Wl,-rpath,\$$ORIGIN/../lib --DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE -D_CURSES_LIB=1 -+DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE # -D_CURSES_LIB=1 - KNETFILE_O= knetfile.o - LOBJS= bgzf.o kstring.o bam_aux.o bam.o bam_import.o sam.o bam_index.o \ - bam_pileup.o bam_lpileup.o bam_md.o razf.o faidx.o bedidx.o \ -@@ -15,7 +15,7 @@ PROG= samtools - INCLUDES= -I. - SUBDIRS= . bcftools misc - LIBPATH= --LIBCURSES= -lcurses # -lXCurses -+LIBCURSES= # -lcurses # -lXCurses - - .SUFFIXES:.c .o - .PHONY: all lib diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix deleted file mode 100644 index dddf33a536b3..000000000000 --- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - zlib, -}: - -stdenv.mkDerivation rec { - pname = "samtools"; - version = "0.1.19"; - - src = fetchurl { - url = "mirror://sourceforge/samtools/${pname}-${version}.tar.bz2"; - sha256 = "d080c9d356e5f0ad334007e4461cbcee3c4ca97b8a7a5a48c44883cf9dee63d4"; - }; - - patches = [ - ./samtools-0.1.19-no-curses.patch - ]; - - buildInputs = [ zlib ]; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man - - cp samtools $out/bin - cp samtools.1 $out/share/man - ''; - - meta = with lib; { - description = "Tools for manipulating SAM/BAM/CRAM format"; - mainProgram = "samtools"; - license = licenses.mit; - homepage = "https://samtools.sourceforge.net/"; - platforms = platforms.unix; - maintainers = [ maintainers.unode ]; - }; -} diff --git a/pkgs/applications/science/chemistry/autodock-vina/default.nix b/pkgs/applications/science/chemistry/autodock-vina/default.nix index a084459cc1d7..4720d536351e 100644 --- a/pkgs/applications/science/chemistry/autodock-vina/default.nix +++ b/pkgs/applications/science/chemistry/autodock-vina/default.nix @@ -2,23 +2,23 @@ lib, stdenv, fetchFromGitHub, - boost, + boost186, glibc, }: let - boost' = boost.override { + boost' = boost186.override { enableShared = false; }; in stdenv.mkDerivation (finalAttrs: { pname = "autodock-vina"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "ccsb-scripps"; repo = "autodock-vina"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y0whqBecZt5D/5HEfL005rCq4lAJTr2mUxy5rygCEtc="; + hash = "sha256-AQJl/EUAkdIQJZSN27sbjG7dYbQxeEb8Pd+p2kKRnvA="; }; sourceRoot = "${finalAttrs.src.name}/build/${ @@ -47,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.boost = boost'; + meta = with lib; { description = "One of the fastest and most widely used open-source docking engines"; homepage = "https://vina.scripps.edu/"; diff --git a/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix b/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix index 2fa26286e53f..2b57a7d3f89b 100644 --- a/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix +++ b/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix @@ -2,12 +2,15 @@ lib, buildPythonPackage, autodock-vina, - boost, swig, setuptools, numpy, }: +let + inherit (autodock-vina) boost; +in + buildPythonPackage { inherit (autodock-vina) pname diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index a00c8d806b5f..55e3dd1f6e2e 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -31,7 +31,7 @@ let }; in stdenv.mkDerivation rec { - version = "16.3.11"; + version = "16.3.17"; pname = "jmol"; src = @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-sa2wYzLtk3rSghNxk/kJfaOIDPEJLfwKRRIXMRNBEuI="; + hash = "sha256-5L9+JGVHKwgW9bOX/Xm/fQUOisO7aivWhhBdQaNpzyk="; }; patchPhase = '' @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl2; platforms = platforms.all; - maintainers = with maintainers; [ mounium ] ++ teams.sage.members; + maintainers = with maintainers; [ mounium ]; + teams = [ teams.sage ]; }; } diff --git a/pkgs/applications/science/electronics/degate/default.nix b/pkgs/applications/science/electronics/degate/default.nix index 5e328890d48d..eb239685d008 100644 --- a/pkgs/applications/science/electronics/degate/default.nix +++ b/pkgs/applications/science/electronics/degate/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch, cmake, - boost, + boost183, qtbase, qtimageformats, qttools, @@ -12,7 +12,7 @@ }: let - boost_static = boost.override { enableStatic = true; }; + boost_static = boost183.override { enableStatic = true; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index ab0395d14b85..8b0fd62a5564 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -50,6 +50,11 @@ stdenv.mkDerivation { hash = "sha256-a/bWAUeDPj3g8BECOlXuqyCi4JgGLLs1605m380Drt0="; }; + patches = [ + # Fix build with Qt >= 6.9 + ./fix-stricter-types.patch + ]; + nativeBuildInputs = [ qmake pkg-config diff --git a/pkgs/applications/science/electronics/fritzing/fix-stricter-types.patch b/pkgs/applications/science/electronics/fritzing/fix-stricter-types.patch new file mode 100644 index 000000000000..49843e220535 --- /dev/null +++ b/pkgs/applications/science/electronics/fritzing/fix-stricter-types.patch @@ -0,0 +1,57 @@ +diff --git a/src/items/paletteitembase.cpp b/src/items/paletteitembase.cpp +index 49db343e..8760ba55 100644 +--- a/src/items/paletteitembase.cpp ++++ b/src/items/paletteitembase.cpp +@@ -626,7 +626,7 @@ QString PaletteItemBase::retrieveSvg(ViewLayer::ViewLayerID viewLayerID, QHash(m_viewLayerPlacement))), ""); + if (!svg.isEmpty()) return svg; + + SvgFileSplitter splitter; +@@ -657,7 +657,7 @@ QString PaletteItemBase::retrieveSvg(ViewLayer::ViewLayerID viewLayerID, QHash(m_viewLayerPlacement))), svg); + return svg; + } + +diff --git a/src/items/resistor.cpp b/src/items/resistor.cpp +index e2a23fd8..3fb4c669 100644 +--- a/src/items/resistor.cpp ++++ b/src/items/resistor.cpp +@@ -260,7 +260,7 @@ bool Resistor::collectExtraInfo(QWidget * parent, const QString & family, const + validator->setSymbol(OhmSymbol); + validator->setConverter(TextUtils::convertFromPowerPrefix); + validator->setBounds(MIN_RESISTANCE, MAX_RESISTANCE); +- validator->setRegularExpression(QRegularExpression(QString("((\\d{1,10})|(\\d{1,10}\\.)|(\\d{1,10}\\.\\d{1,5}))[\\x%1umkMG]{0,1}[\\x03A9]{0,1}").arg(TextUtils::MicroSymbolCode, 4, 16, QChar('0')))); ++ validator->setRegularExpression(QRegularExpression(QString("((\\d{1,10})|(\\d{1,10}\\.)|(\\d{1,10}\\.\\d{1,5}))[\\x%1umkMG]{0,1}[\\x03A9]{0,1}").arg(static_cast(TextUtils::MicroSymbolCode), 4, 16, QChar('0')))); + focusOutComboBox->setValidator(validator); + connect(focusOutComboBox->validator(), SIGNAL(sendState(QValidator::State)), this, SLOT(textModified(QValidator::State))); + connect(focusOutComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(resistanceEntry(int))); +diff --git a/src/utils/textutils.cpp b/src/utils/textutils.cpp +index a1a28d51..3d3aa8e0 100644 +--- a/src/utils/textutils.cpp ++++ b/src/utils/textutils.cpp +@@ -79,7 +79,7 @@ const QString TextUtils::AdobeIllustratorIdentifier = "Generator: Adobe Illustra + + QList PowerPrefixes; + QList PowerPrefixValues; +-const QString TextUtils::PowerPrefixesString = QString("pnmkMGTu\\x%1").arg(MicroSymbolCode, 4, 16, QChar('0')); ++const QString TextUtils::PowerPrefixesString = QString("pnmkMGTu\\x%1").arg(static_cast(MicroSymbolCode), 4, 16, QChar('0')); + + typedef QHash FixedFontsHash; + +@@ -763,7 +763,7 @@ QString TextUtils::convertExtendedChars(const QString & str) + result.append(c); + } + else { +- result.append(QString("&#x%1;").arg(c.unicode(), 0, 16)); ++ result.append("&#x" + QString::number(c.unicode(), 16) + ";"); + } + } + diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 1f42d5ae2a62..cfb13ffab886 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E="; }) ./4.4.1-newer-spdlog-fmt-compat.patch + ./resynthesis-fix-narrowing-conversion.patch ]; # make sure bundled dependencies don't get in the way - install also otherwise diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch b/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch new file mode 100644 index 000000000000..58160330cd06 --- /dev/null +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/resynthesis/src/resynthesis.cpp b/plugins/resynthesis/src/resynthesis.cpp +index 7a7e404114f..f2889667af8 100644 +--- a/plugins/resynthesis/src/resynthesis.cpp ++++ b/plugins/resynthesis/src/resynthesis.cpp +@@ -1058,7 +1058,7 @@ namespace hal + // delete the created directory and the contained files + std::filesystem::remove_all(base_path); + +- return OK(subgraph.size()); ++ return OK(static_cast(subgraph.size())); + } + + Result resynthesize_subgraph_of_type(Netlist* nl, const std::vector& gate_types, GateLibrary* target_gl) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index d22d774e80f1..9bbf2c3f19c6 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -47,7 +47,7 @@ opencascade-occt_7_6, libngspice, valgrind, - protobuf, + protobuf_29, nng, stable, @@ -186,7 +186,7 @@ stdenv.mkDerivation rec { unixODBC libdeflate opencascade-occt - protobuf + protobuf_29 # This would otherwise cause a linking requirement for mbedtls. (nng.override { mbedtlsSupport = false; }) @@ -226,5 +226,6 @@ stdenv.mkDerivation rec { homepage = "https://www.kicad.org/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 4d381eb9a392..515e6f750c4f 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "9.0.1"; + version = "9.0.2"; src = { - rev = "eb0a9f7b5b8f26024310bd02367f8414d6c80734"; - sha256 = "14g4ns2fxigzz1z4chcnaz2b8f4jkdmd56mnlpdq8nld8q84hywk"; + rev = "bf9b9242aea7832d140dc25ff897fe01e2f36e41"; + sha256 = "1v3nvp5ifa36hx3iw3whlp3j7hiy91fzihc0jc1daw0hnps7qy24"; }; }; libVersion = { - version = "9.0.1"; + version = "9.0.2"; libSources = { - symbols.rev = "f8789bb729b5ed7ddc6a45b68563157e3a070944"; - symbols.sha256 = "1q8vq4dwnhryizidx0s3x8p4yjhj3hbjhd40zy1pynkf1p174d7n"; - templates.rev = "793b29a36c6b11a11d3bb417cf508a48b8c6ebb8"; + symbols.rev = "9eab1c9c90a8aa84b0f7eec73076329d91764583"; + symbols.sha256 = "134x4d5w89aahl4k9zai6vwcazibz17gsgzy04l9xn4zcf6v11qp"; + templates.rev = "f93acff0f8c8c8e215ea125db060c86bf4b1f5d3"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "b5974927427a886128e5ba7a8adc285a751261d1"; - footprints.sha256 = "0xqjnvbf032l191spfdh6g579jfhlpyr7pg53pkqdhzz053j3rlz"; - packages3d.rev = "b1fd04f841f0d88b025be7357482cf7f48de4dae"; - packages3d.sha256 = "1xgwd9srp93pj4pnskk3cnkbx57n6kvmlk7qwi3fl6wim3kxfcj2"; + footprints.rev = "855079c1514bbdf38565fedcacee7fb05ffad5aa"; + footprints.sha256 = "0w44b7dzx6d3xw2vbw37k34zxy25bq46rsnv21x10227313vr2wm"; + packages3d.rev = "26e8886b3049a07e8b2b0bed82634ff755783352"; + packages3d.sha256 = "18cxlp5grvv5m63c3sb6m9l9cmijqqcjmxrkdzg63d5jp7w73smn"; }; }; }; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index ef645d36b079..6a706e5a81c4 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -10,17 +10,20 @@ libGLU, cmake, wrapQtAppsHook, + rustPlatform, + cargo, + rustc, }: stdenv.mkDerivation rec { pname = "librepcb"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-/Hw7ZTv2CbDcKuyI27wC46IxCcTnrXDS/Mf7csUTc7w="; + hash = "sha256-J4y0ikZNuOguN9msmEQzgcY0/REnOEOoDkY/ga+Cfd8="; fetchSubmodules = true; }; @@ -32,9 +35,20 @@ stdenv.mkDerivation rec { wrapQtAppsHook opencascade-occt libGLU + rustPlatform.cargoSetupHook + cargo + rustc ]; buildInputs = [ qtbase ]; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + sourceRoot = "source/${cargoRoot}"; + hash = "sha256-1td3WjxbDq2lX7c0trpYRhO82ChNAG/ZABBRsekYtq4="; + }; + + cargoRoot = "libs/librepcb/rust-core"; + meta = with lib; { description = "Free EDA software to develop printed circuit boards"; homepage = "https://librepcb.org/"; diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix deleted file mode 100644 index ef9db55ef3f5..000000000000 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - bison, - cmake, - doxygen, - flex, - git, - python3, - swig, - boost186, # 1.87.0 broken https://github.com/boostorg/asio/issues/442 - cbc, # for clp - cimg, - clp, # for or-tools - cudd, - eigen, - gtest, - glpk, - lcov, - lemon-graph, - libsForQt5, - libjpeg, - or-tools, - pcre, - pkg-config, - re2, # for or-tools - readline, - spdlog, - tcl, - tclPackages, - xorg, - yosys, - zlib, - llvmPackages, - stdenv, -}: - -let - or-tools-static = or-tools.overrideAttrs (oldAttrs: { - cmakeFlags = oldAttrs.cmakeFlags ++ [ - # https://github.com/google/or-tools/issues/3709 - "-DBUILD_SHARED_LIBS=OFF" - ]; - }); -in -mkDerivation rec { - pname = "openroad"; - version = "2.0-unstable-2025-03-01"; - - src = fetchFromGitHub { - owner = "The-OpenROAD-Project"; - repo = "OpenROAD"; - rev = "e794373d44ac5421f0633d8dda7e5c59e8fe79bf"; - fetchSubmodules = true; - hash = "sha256-a/X4FHkbiqHeblse2ZkLT56gYP+LCrAIZVCdsWF59jM="; - }; - - nativeBuildInputs = [ - bison - cmake - doxygen - flex - git - gtest - pkg-config - swig - ]; - - buildInputs = [ - boost186 - cbc - cimg - clp - cudd - eigen - glpk - lcov - lemon-graph - libjpeg - or-tools-static - pcre - python3 - libsForQt5.qtbase - libsForQt5.qtcharts - libsForQt5.qtsvg - libsForQt5.qtdeclarative - re2 - readline - spdlog - tcl - tclPackages.tclreadline - yosys - xorg.libX11 - zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; - - postPatch = '' - patchShebangs --build etc/find_messages.py - # Disable two tests that are failing curently. - sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CMakeLists.txt - ''; - - cmakeFlags = - [ - "-DENABLE_TESTS=ON" - "-DUSE_SYSTEM_BOOST=ON" - "-DUSE_SYSTEM_ABC=OFF" - "-DABC_SKIP_TESTS=ON" # it attempts to download gtest - "-DUSE_SYSTEM_OPENSTA=OFF" - "-DOPENROAD_VERSION=${version}_${src.rev}" - "-DCMAKE_RULE_MESSAGES=OFF" - "-DTCL_HEADER=${tcl}/include/tcl.h" - "-DTCL_LIBRARY=${tcl}/lib/libtcl${stdenv.hostPlatform.extensions.sharedLibrary}" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DCMAKE_CXX_FLAGS=-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED" - ]; - - # Resynthesis needs access to the Yosys binaries. - qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ yosys ]}" ]; - - # Upstream uses vendored package versions for some dependencies, so regression testing is prudent - # to see if there are any breaking changes in unstable that should be vendored as well. - doCheck = !stdenv.hostPlatform.isDarwin; # it seems to hang on darwin - checkPhase = '' - make test - ../test/regression - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/openroad -version - $out/bin/sta -version - ''; - - meta = with lib; { - description = "OpenROAD's unified application implementing an RTL-to-GDS flow"; - homepage = "https://theopenroadproject.org"; - license = licenses.bsd3; - maintainers = with maintainers; [ - trepetti - hzeller - ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index aa41e3185c03..8ced7004f1a2 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "qucs-s"; - version = "25.1.1"; + version = "25.1.2"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; rev = version; - hash = "sha256-H/iLCCX1fMozs/G8erX7cia7wRLjvLxofuiu6pGVJ58="; + hash = "sha256-+xPhHmuogNuolmMFcUAP2hMfJh1D+O4DrPkcuR6+mR8="; }; postPatch = '' diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix deleted file mode 100644 index 831cc31ecad3..000000000000 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - tcl, - tk, - libX11, - glibc, - which, - bison, - flex, - imake, - xorgproto, - gccmakedep, -}: - -let - libiconvInc = lib.optionalString stdenv.hostPlatform.isLinux "${glibc.dev}/include"; - libiconvLib = lib.optionalString stdenv.hostPlatform.isLinux "${glibc.out}/lib"; -in -stdenv.mkDerivation rec { - pname = "tkgate"; - version = "1.8.7"; - - src = fetchurl { - url = "https://www.tkgate.org/downloads/tkgate-${version}.tgz"; - sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs"; - }; - - nativeBuildInputs = [ - which - bison - flex - imake - gccmakedep - ]; - buildInputs = [ - tcl - tk - libX11 - xorgproto - ]; - dontUseImakeConfigure = true; - - patchPhase = '' - sed -i config.h \ - -e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "${tcl.release}"|' \ - -e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11.dev}/include"|' \ - -e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11.out}/lib"|' \ - \ - -e '20 i #define TCL_LIBRARY "${tcl}/lib"' \ - -e '20 i #define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"' \ - -e '20 i #define USE_ICONV 1' \ - \ - -e "s|.*#define.*TKGATE_HOMEDIRBASE.*|#define TKGATE_HOMEDIRBASE \\\"$out/lib\\\"|" \ - -e "s|.*#define.*TKGATE_BINDIR.*|#define TKGATE_BINDIR \\\"$out/bin\\\"|" \ - -e "s|.*#define.*TKGATE_MANDIR.*|#define TKGATE_MANDIR \\\"$out/share/man/man1\\\"|" \ - -e "s|file:/usr/X11R6/lib/tkgate-|file://$out/lib/tkgate-|" - ''; - - meta = { - description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; - mainProgram = "gmac"; - homepage = "https://www.tkgate.org/"; - license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix deleted file mode 100644 index eaf54af16c7c..000000000000 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ /dev/null @@ -1,212 +0,0 @@ -{ - stdenv, - fetchFromGitHub, - fetchgit, - lib, - autoconf, - automake, - bison, - blas, - flex, - fftw, - gfortran, - lapack, - libtool_2, - mpi, - suitesparse, - trilinos, - withMPI ? false, - # for doc - texliveMedium, - enableDocs ? true, - # for tests - bash, - bc, - openssh, # required by MPI - perl, - python3, - enableTests ? true, -}: - -assert withMPI -> trilinos.withMPI; - -let - version = "7.8.0"; - - # using fetchurl or fetchFromGitHub doesn't include the manuals - # due to .gitattributes files - xyce_src = fetchgit { - url = "https://github.com/Xyce/Xyce.git"; - rev = "Release-${version}"; - sha256 = "sha256-+aNy2bGuFQ517FZUvU0YqN0gmChRpVuFEmFGTCx9AgY="; - }; - - regression_src = fetchFromGitHub { - owner = "Xyce"; - repo = "Xyce_Regression"; - rev = "Release-${version}"; - sha256 = "sha256-Fxi/NpXXIw/bseWaLi2iQ4sg4S9Z+othGgSvQoxyJ9c="; - }; -in - -stdenv.mkDerivation rec { - pname = "xyce"; - inherit version; - - srcs = [ - xyce_src - regression_src - ]; - - sourceRoot = xyce_src.name; - - preConfigure = "./bootstrap"; - - configureFlags = - [ - "CXXFLAGS=-O3" - "--enable-xyce-shareable" - "--enable-shared" - "--enable-stokhos" - "--enable-amesos2" - ] - ++ lib.optionals withMPI [ - "--enable-mpi" - "CXX=mpicxx" - "CC=mpicc" - "F77=mpif77" - ]; - - enableParallelBuilding = true; - - nativeBuildInputs = - [ - autoconf - automake - gfortran - libtool_2 - ] - ++ lib.optionals enableDocs [ - (texliveMedium.withPackages ( - ps: with ps; [ - enumitem - koma-script - optional - framed - enumitem - multirow - newtx - preprint - ] - )) - ]; - - buildInputs = [ - bison - blas - flex - fftw - lapack - suitesparse - trilinos - ] ++ lib.optionals withMPI [ mpi ]; - - doCheck = enableTests; - - postPatch = '' - pushd ../${regression_src.name} - find Netlists -type f -regex ".*\.sh\|.*\.pl" -exec chmod ugo+x {} \; - # some tests generate new files, some overwrite netlists - find . -type d -exec chmod u+w {} \; - find . -type f -name "*.cir" -exec chmod u+w {} \; - patchShebangs Netlists/ TestScripts/ - # patch script generating functions - sed -i -E 's|/usr/bin/env perl|${lib.escapeRegex perl.outPath}/bin/perl|' \ - TestScripts/XyceRegression/Testing/Netlists/RunOptions/runOptions.cir.sh - sed -i -E 's|/bin/sh|${lib.escapeRegex bash.outPath}/bin/sh|' \ - TestScripts/XyceRegression/Testing/Netlists/RunOptions/runOptions.cir.sh - popd - ''; - - nativeCheckInputs = - [ - bc - perl - (python3.withPackages ( - ps: with ps; [ - numpy - scipy - ] - )) - ] - ++ lib.optionals withMPI [ - mpi - openssh - ]; - - checkPhase = '' - XYCE_BINARY="$(pwd)/src/Xyce" - EXECSTRING="${lib.optionalString withMPI "mpirun -np 2 "}$XYCE_BINARY" - TEST_ROOT="$(pwd)/../${regression_src.name}" - - # Honor the TMP variable - sed -i -E 's|/tmp|\$TMP|' $TEST_ROOT/TestScripts/suggestXyceTagList.sh - - EXLUDE_TESTS_FILE=$TMP/exclude_tests.$$ - # Gold standard has additional ":R" suffix in result column label - echo "Output/HB/hb-step-tecplot.cir" >> $EXLUDE_TESTS_FILE - # This test makes Xyce access /sys/class/net when run with MPI - ${lib.optionalString withMPI "echo \"CommandLine/command_line.cir\" >> $EXLUDE_TESTS_FILE"} - - $TEST_ROOT/TestScripts/run_xyce_regression \ - --output="$(pwd)/Xyce_Test" \ - --xyce_test="''${TEST_ROOT}" \ - --taglist="$($TEST_ROOT/TestScripts/suggestXyceTagList.sh "$XYCE_BINARY" | sed -E -e 's/TAGLIST=([^ ]+).*/\1/' -e '2,$d')" \ - --resultfile="$(pwd)/test_results" \ - --excludelist="$EXLUDE_TESTS_FILE" \ - "''${EXECSTRING}" - ''; - - outputs = [ - "out" - "doc" - ]; - - postInstall = lib.optionalString enableDocs '' - local docFiles=("doc/Users_Guide/Xyce_UG" - "doc/Reference_Guide/Xyce_RG" - "doc/Release_Notes/Release_Notes_${lib.versions.majorMinor version}/Release_Notes_${lib.versions.majorMinor version}") - - # SANDIA LaTeX class and some organization logos are not publicly available see - # https://groups.google.com/g/xyce-users/c/MxeViRo8CT4/m/ppCY7ePLEAAJ - for img in "snllineblubrd" "snllineblk" "DOEbwlogo" "NNSA_logo"; do - sed -i -E "s/\\includegraphics\[height=(0.[1-9]in)\]\{$img\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/" ''${docFiles[2]}.tex - done - - install -d $doc/share/doc/${pname}-${version}/ - for d in ''${docFiles[@]}; do - # Use a public document class - sed -i -E 's/\\documentclass\[11pt,report\]\{SANDreport\}/\\documentclass\[11pt,letterpaper\]\{scrreprt\}/' $d.tex - sed -i -E 's/\\usepackage\[sand\]\{optional\}/\\usepackage\[report\]\{optional\}/' $d.tex - pushd $(dirname $d) - make - install -t $doc/share/doc/${pname}-${version}/ $(basename $d.pdf) - popd - done - ''; - - meta = with lib; { - broken = - (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; - description = "High-performance analog circuit simulator"; - longDescription = '' - Xyce is a SPICE-compatible, high-performance analog circuit simulator, - capable of solving extremely large circuit problems by supporting - large-scale parallel computing platforms. - ''; - homepage = "https://xyce.sandia.gov"; - license = licenses.gpl3; - maintainers = with maintainers; [ fbeffa ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index 720afed8d24f..8f349b5dd174 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "easycrypt"; - version = "2025.02"; + version = "2025.03"; src = fetchFromGitHub { owner = pname; repo = pname; tag = "r${version}"; - hash = "sha256-XkfFCPmc8vd6gGFiz/Lxzk7BtcCQBzPNVPGFdiylZmc="; + hash = "sha256-Z6JaqR0BocEhDuof929HOvzWu6C77CAqeuYYY2PXvrs="; }; nativeBuildInputs = diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 02ab02728be5..d8685390bc1d 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -6,13 +6,13 @@ enableHO ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eprover"; - version = "3.1"; + version = "3.2"; src = fetchurl { - url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - hash = "sha256-+E2z7JAkiNXhZrWRXFbhI5f9NmB0Q4eixab4GlAFqYY="; + url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${finalAttrs.version}/E.tgz"; + hash = "sha256-B0yOX8MGJHY0HOeQ/RWtgATTIta2YnhEvSdoqIML1K4="; }; buildInputs = [ which ]; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's/ *CC *= *gcc$//' -i Makefile.vars ''; + configureFlags = [ "--exec-prefix=$(out)" @@ -29,13 +30,13 @@ stdenv.mkDerivation rec { "--enable-ho" ]; - meta = with lib; { + meta = { description = "Automated theorem prover for full first-order logic with equality"; homepage = "http://www.eprover.org/"; - license = licenses.gpl2; - maintainers = with maintainers; [ + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ raskin ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 2dac1f012c9e..4c6c20fe80c8 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,6 +1,5 @@ { haskellPackages, - mkDerivation, fetchFromGitHub, lib, stdenv, @@ -13,6 +12,8 @@ }: let + inherit (haskellPackages) mkDerivation; + version = "1.10.0"; src = fetchFromGitHub { owner = "tamarin-prover"; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix deleted file mode 100644 index 2152f68fe270..000000000000 --- a/pkgs/applications/science/logic/z3/default.nix +++ /dev/null @@ -1,216 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - python, - fixDarwinDylibNames, - javaBindings ? false, - ocamlBindings ? false, - pythonBindings ? true, - jdk ? null, - ocaml ? null, - findlib ? null, - zarith ? null, - writeScript, - replaceVars, -}: - -assert javaBindings -> jdk != null; -assert ocamlBindings -> ocaml != null && findlib != null && zarith != null; - -let - common = - { - version, - sha256, - patches ? [ ], - tag ? "z3", - doCheck ? true, - }: - stdenv.mkDerivation rec { - pname = "z3"; - inherit version sha256 patches; - src = fetchFromGitHub { - owner = "Z3Prover"; - repo = "z3"; - rev = "${tag}-${version}"; - sha256 = sha256; - }; - - strictDeps = true; - - nativeBuildInputs = - [ python ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames - ++ lib.optional javaBindings jdk - ++ lib.optionals ocamlBindings [ - ocaml - findlib - ]; - propagatedBuildInputs = [ python.pkgs.setuptools ] ++ lib.optionals ocamlBindings [ zarith ]; - enableParallelBuilding = true; - - postPatch = - lib.optionalString ocamlBindings '' - export OCAMLFIND_DESTDIR=$ocaml/lib/ocaml/${ocaml.version}/site-lib - mkdir -p $OCAMLFIND_DESTDIR/stublibs - '' - + - lib.optionalString - ((lib.versionAtLeast python.version "3.12") && (lib.versionOlder version "4.8.14")) - '' - # See https://github.com/Z3Prover/z3/pull/5729. This is a specialization of this patch for 4.8.5. - for file in scripts/mk_util.py src/api/python/CMakeLists.txt; do - substituteInPlace "$file" \ - --replace-fail "distutils.sysconfig.get_python_lib()" "sysconfig.get_path('purelib')" \ - --replace-fail "distutils.sysconfig" "sysconfig" - done - ''; - - configurePhase = - lib.concatStringsSep " " ( - [ "${python.pythonOnBuildForHost.interpreter} scripts/mk_make.py --prefix=$out" ] - ++ lib.optional javaBindings "--java" - ++ lib.optional ocamlBindings "--ml" - ++ lib.optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" - ) - + "\n" - + "cd build"; - - inherit doCheck; - checkPhase = '' - make -j $NIX_BUILD_CORES test - ./test-z3 -a - ''; - - postInstall = - '' - mkdir -p $dev $lib - mv $out/lib $lib/lib - mv $out/include $dev/include - '' - + lib.optionalString pythonBindings '' - mkdir -p $python/lib - mv $lib/lib/python* $python/lib/ - ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} - '' - + lib.optionalString javaBindings '' - mkdir -p $java/share/java - mv com.microsoft.z3.jar $java/share/java - moveToOutput "lib/libz3java.${stdenv.hostPlatform.extensions.sharedLibrary}" "$java" - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/z3 -version 2>&1 | grep -F "Z3 version $version" - ''; - - outputs = - [ - "out" - "lib" - "dev" - "python" - ] - ++ lib.optional javaBindings "java" - ++ lib.optional ocamlBindings "ocaml"; - - meta = with lib; { - description = "High-performance theorem prover and SMT solver"; - mainProgram = "z3"; - homepage = "https://github.com/Z3Prover/z3"; - changelog = "https://github.com/Z3Prover/z3/releases/tag/z3-${version}"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ - thoughtpolice - ttuegel - numinit - ]; - }; - }; - - static-matrix-def-patch = fetchpatch { - # clang / gcc fixes. fixes typos in some member names - name = "gcc-15-fixes.patch"; - url = "https://github.com/Z3Prover/z3/commit/2ce89e5f491fa817d02d8fdce8c62798beab258b.patch"; - includes = [ "src/math/lp/static_matrix_def.h" ]; - hash = "sha256-rEH+UzylzyhBdtx65uf8QYj5xwuXOyG6bV/4jgKkXGo="; - }; - - static-matrix-patch = fetchpatch { - # clang / gcc fixes. fixes typos in some member names - name = "gcc-15-fixes.patch"; - url = "https://github.com/Z3Prover/z3/commit/2ce89e5f491fa817d02d8fdce8c62798beab258b.patch"; - includes = [ "src/@dir@/lp/static_matrix.h" ]; - stripLen = 3; - extraPrefix = "src/@dir@/"; - hash = "sha256-+H1/VJPyI0yq4M/61ay8SRCa6OaoJ/5i+I3zVTAPUVo="; - }; - - # replace @dir@ in the path of the given list of patches - fixupPatches = dir: map (patch: replaceVars patch { inherit dir; }); -in -{ - z3_4_14 = common { - version = "4.14.1"; - sha256 = "sha256-pTsDzf6Frk4mYAgF81wlR5Kb1x56joFggO5Fa3G2s70="; - }; - z3_4_13 = common { - version = "4.13.4"; - sha256 = "sha256-8hWXCr6IuNVKkOegEmWooo5jkdmln9nU7wI8T882BSE="; - }; - z3_4_12 = common { - version = "4.12.6"; - sha256 = "sha256-X4wfPWVSswENV0zXJp/5u9SQwGJWocLKJ/CNv57Bt+E="; - patches = - fixupPatches "math" [ - ./lower-bound-typo.diff - static-matrix-patch - ] - ++ [ - static-matrix-def-patch - ]; - }; - z3_4_11 = common { - version = "4.11.2"; - sha256 = "sha256-OO0wtCvSKwGxnKvu+AfXe4mEzv4nofa7A00BjX+KVjc="; - patches = - fixupPatches "math" [ - ./lower-bound-typo.diff - static-matrix-patch - ./tail-matrix.diff - ] - ++ [ - static-matrix-def-patch - ]; - }; - z3_4_8 = common { - version = "4.8.17"; - sha256 = "sha256-BSwjgOU9EgCcm18Zx0P9mnoPc9ZeYsJwEu0ffnACa+8="; - patches = - fixupPatches "math" [ - ./lower-bound-typo.diff - static-matrix-patch - ./tail-matrix.diff - ] - ++ [ - static-matrix-def-patch - ]; - }; - z3_4_8_5 = common { - tag = "Z3"; - version = "4.8.5"; - sha256 = "sha256-ytG5O9HczbIVJAiIGZfUXC/MuYH7d7yLApaeTRlKXoc="; - patches = - fixupPatches "util" [ - ./lower-bound-typo.diff - static-matrix-patch - ./tail-matrix.diff - ] - ++ [ - ./4-8-5-typos.diff - ]; - }; -} diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/applications/science/logic/z3/tptp.nix deleted file mode 100644 index 8e1da19c6008..000000000000 --- a/pkgs/applications/science/logic/z3/tptp.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - stdenv, - z3, - cmake, -}: -stdenv.mkDerivation rec { - pname = "z3-tptp"; - version = z3.version; - - src = z3.src; - - sourceRoot = "${src.name}/examples/tptp"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ z3 ]; - - preConfigure = '' - echo 'set(Z3_LIBRARIES "-lz3")' >> CMakeLists.new - cat CMakeLists.txt | grep -E 'add_executable|project|link_libraries' >> CMakeLists.new - mv CMakeLists.new CMakeLists.txt - ''; - - installPhase = '' - mkdir -p "$out/bin" - cp "z3_tptp5" "$out/bin/" - ln -s "z3_tptp5" "$out/bin/z3-tptp" - ''; - - meta = { - inherit (z3.meta) license homepage platforms; - description = "TPTP wrapper for Z3 prover"; - maintainers = [ lib.maintainers.raskin ]; - }; -} diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix deleted file mode 100644 index 2fb6e386346a..000000000000 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, - installShellFiles, - pkg-config, - libiconv, - openssl, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "finalfrontier"; - version = "unstable-2022-01-06"; - - src = fetchFromGitHub { - owner = "finalfusion"; - repo = pname; - rev = "2461fb1dde13b73039926aa66606e470907a1b59"; - sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-AQiXRKOXV7kXiu9GbtPE0Rddy93t1Y5tuJmww4xFSaU="; - - nativeBuildInputs = [ - installShellFiles - pkg-config - ]; - - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - Security - ]; - - postInstall = '' - installManPage man/*.1 - - # Install shell completions - for shell in bash fish zsh; do - $out/bin/finalfrontier completions $shell > finalfrontier.$shell - done - installShellCompletion finalfrontier.{bash,fish,zsh} - ''; - - meta = with lib; { - description = "Utility for training word and subword embeddings"; - mainProgram = "finalfrontier"; - homepage = "https://github.com/finalfusion/finalfrontier/"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix deleted file mode 100644 index ec1e20a91329..000000000000 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, - installShellFiles, - blas, - gfortran, - lapack, - openssl, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "finalfusion-utils"; - version = "0.14.1"; - - src = fetchFromGitHub { - owner = "finalfusion"; - repo = pname; - rev = version; - sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-X8ENEtjH1RHU2+VwtkHsyVYK37O8doMlLk94O2BGqy0="; - - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = - [ - blas - gfortran.cc.lib - lapack - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - - # Enables build against a generic BLAS. - buildFeatures = [ "netlib" ]; - - postInstall = '' - # Install shell completions - for shell in bash fish zsh; do - $out/bin/finalfusion completions $shell > finalfusion.$shell - done - installShellCompletion finalfusion.{bash,fish,zsh} - ''; - - meta = with lib; { - description = "Utility for converting, quantizing, and querying word embeddings"; - homepage = "https://github.com/finalfusion/finalfusion-utils/"; - license = licenses.asl20; - maintainers = [ ]; - mainProgram = "finalfusion"; - }; -} diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 2d0634cec567..027a8b202582 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -33,10 +33,6 @@ blas, lapack, curl, - Cocoa, - Foundation, - libobjc, - libcxx, tzdata, withRecommendedPackages ? true, enableStrictBarrier ? false, @@ -77,51 +73,44 @@ stdenv.mkDerivation (finalAttrs: { tzdata which ]; - buildInputs = - [ - bzip2 - gfortran - libX11 - libXmu - libXt - libXt - libjpeg - libpng - libtiff - ncurses - pango - pcre2 - readline - (texliveSmall.withPackages ( - ps: with ps; [ - inconsolata - helvetic - ps.texinfo - fancyvrb - cm-super - rsfs - ] - )) - xz - zlib - less - texinfo - graphviz - icu - which - blas - lapack - curl - tcl - tk - jdk - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - Foundation - libobjc - libcxx - ]; + buildInputs = [ + bzip2 + gfortran + libX11 + libXmu + libXt + libXt + libjpeg + libpng + libtiff + ncurses + pango + pcre2 + readline + (texliveSmall.withPackages ( + ps: with ps; [ + inconsolata + helvetic + ps.texinfo + fancyvrb + cm-super + rsfs + ] + )) + xz + zlib + less + texinfo + graphviz + icu + which + blas + lapack + curl + tcl + tk + jdk + ]; strictDeps = true; patches = [ @@ -173,8 +162,8 @@ stdenv.mkDerivation (finalAttrs: { --disable-R-framework --without-x OBJC="clang" - CPPFLAGS="-isystem ${lib.getDev libcxx}/include/c++/v1" - LDFLAGS="-L${lib.getLib libcxx}/lib" + CPPFLAGS="-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1" + LDFLAGS="-L${lib.getLib stdenv.cc.libcxx}/lib" '' + '' ) @@ -258,6 +247,7 @@ stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "libR" ]; platforms = platforms.all; - maintainers = with maintainers; [ jbedo ] ++ teams.sage.members; + maintainers = with maintainers; [ jbedo ]; + teams = [ teams.sage ]; }; }) diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 4b9bd9e6fdcc..6592e9e3b81c 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -1,5 +1,4 @@ { - config, stdenv, lib, fetchFromGitHub, @@ -14,9 +13,6 @@ protobuf, doxygen, blas, - Accelerate, - CoreGraphics, - CoreVideo, lmdbSupport ? true, lmdb, leveldbSupport ? true, @@ -82,11 +78,6 @@ stdenv.mkDerivation rec { ++ lib.optionals pythonSupport [ python numpy - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreGraphics - CoreVideo ]; propagatedBuildInputs = lib.optionals pythonSupport ( @@ -124,6 +115,8 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + ./glog-cmake.patch + ./random-shuffle.patch (fetchpatch { name = "support-opencv4"; url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch"; diff --git a/pkgs/applications/science/math/caffe/glog-cmake.patch b/pkgs/applications/science/math/caffe/glog-cmake.patch new file mode 100644 index 000000000000..a7d550fee98d --- /dev/null +++ b/pkgs/applications/science/math/caffe/glog-cmake.patch @@ -0,0 +1,97 @@ +From 38b81bb53304d7a3f6aed36f7b4e77b6efa78338 Mon Sep 17 00:00:00 2001 +From: uku +Date: Wed, 14 May 2025 16:55:15 +0200 +Subject: [PATCH] fix linking against glog 0.7.x + +--- + cmake/Dependencies.cmake | 2 +- + cmake/External/glog.cmake | 4 +-- + cmake/Modules/FindGlog.cmake | 48 ------------------------------------ + 3 files changed, 3 insertions(+), 51 deletions(-) + delete mode 100644 cmake/Modules/FindGlog.cmake + +diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake +index 4a5bac47..88aa123f 100644 +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -32,7 +32,7 @@ endif() + # ---[ Google-glog + include("cmake/External/glog.cmake") + list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${GLOG_INCLUDE_DIRS}) +-list(APPEND Caffe_LINKER_LIBS PUBLIC ${GLOG_LIBRARIES}) ++list(APPEND Caffe_LINKER_LIBS PUBLIC glog::glog) + + # ---[ Google-gflags + include("cmake/External/gflags.cmake") +diff --git a/cmake/External/glog.cmake b/cmake/External/glog.cmake +index f9d0549c..43414544 100644 +--- a/cmake/External/glog.cmake ++++ b/cmake/External/glog.cmake +@@ -5,8 +5,8 @@ if (NOT __GLOG_INCLUDED) + set(__GLOG_INCLUDED TRUE) + + # try the system-wide glog first +- find_package(Glog) +- if (GLOG_FOUND) ++ find_package(glog REQUIRED) ++ if (glog_FOUND) + set(GLOG_EXTERNAL FALSE) + else() + # fetch and build glog from github +diff --git a/cmake/Modules/FindGlog.cmake b/cmake/Modules/FindGlog.cmake +deleted file mode 100644 +index 99abbe47..00000000 +--- a/cmake/Modules/FindGlog.cmake ++++ /dev/null +@@ -1,48 +0,0 @@ +-# - Try to find Glog +-# +-# The following variables are optionally searched for defaults +-# GLOG_ROOT_DIR: Base directory where all GLOG components are found +-# +-# The following are set after configuration is done: +-# GLOG_FOUND +-# GLOG_INCLUDE_DIRS +-# GLOG_LIBRARIES +-# GLOG_LIBRARYRARY_DIRS +- +-include(FindPackageHandleStandardArgs) +- +-set(GLOG_ROOT_DIR "" CACHE PATH "Folder contains Google glog") +- +-if(WIN32) +- find_path(GLOG_INCLUDE_DIR glog/logging.h +- PATHS ${GLOG_ROOT_DIR}/src/windows) +-else() +- find_path(GLOG_INCLUDE_DIR glog/logging.h +- PATHS ${GLOG_ROOT_DIR}) +-endif() +- +-if(MSVC) +- find_library(GLOG_LIBRARY_RELEASE libglog_static +- PATHS ${GLOG_ROOT_DIR} +- PATH_SUFFIXES Release) +- +- find_library(GLOG_LIBRARY_DEBUG libglog_static +- PATHS ${GLOG_ROOT_DIR} +- PATH_SUFFIXES Debug) +- +- set(GLOG_LIBRARY optimized ${GLOG_LIBRARY_RELEASE} debug ${GLOG_LIBRARY_DEBUG}) +-else() +- find_library(GLOG_LIBRARY glog +- PATHS ${GLOG_ROOT_DIR} +- PATH_SUFFIXES lib lib64) +-endif() +- +-find_package_handle_standard_args(Glog DEFAULT_MSG GLOG_INCLUDE_DIR GLOG_LIBRARY) +- +-if(GLOG_FOUND) +- set(GLOG_INCLUDE_DIRS ${GLOG_INCLUDE_DIR}) +- set(GLOG_LIBRARIES ${GLOG_LIBRARY}) +- message(STATUS "Found glog (include: ${GLOG_INCLUDE_DIR}, library: ${GLOG_LIBRARY})") +- mark_as_advanced(GLOG_ROOT_DIR GLOG_LIBRARY_RELEASE GLOG_LIBRARY_DEBUG +- GLOG_LIBRARY GLOG_INCLUDE_DIR) +-endif() +-- +2.49.0 + diff --git a/pkgs/applications/science/math/caffe/random-shuffle.patch b/pkgs/applications/science/math/caffe/random-shuffle.patch new file mode 100644 index 000000000000..1887696551ca --- /dev/null +++ b/pkgs/applications/science/math/caffe/random-shuffle.patch @@ -0,0 +1,67 @@ +From 11e585e52ab92bb9d7a995c5002cb55fbff687b2 Mon Sep 17 00:00:00 2001 +From: uku +Date: Thu, 15 May 2025 11:10:50 +0200 +Subject: [PATCH] fix: remove usages of random_shuffle + +--- + src/caffe/layers/hdf5_data_layer.cpp | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp +index 00716a92..01213691 100644 +--- a/src/caffe/layers/hdf5_data_layer.cpp ++++ b/src/caffe/layers/hdf5_data_layer.cpp +@@ -61,7 +61,9 @@ void HDF5DataLayer::LoadHDF5FileData(const char* filename) { + + // Shuffle if needed. + if (this->layer_param_.hdf5_data_param().shuffle()) { +- std::random_shuffle(data_permutation_.begin(), data_permutation_.end()); ++ std::random_device rand_device; ++ std::default_random_engine rand_engine(rand_device()); ++ std::shuffle(data_permutation_.begin(), data_permutation_.end(), rand_engine); + DLOG(INFO) << "Successfully loaded " << hdf_blobs_[0]->shape(0) + << " rows (shuffled)"; + } else { +@@ -104,7 +106,9 @@ void HDF5DataLayer::LayerSetUp(const vector*>& bottom, + + // Shuffle if needed. + if (this->layer_param_.hdf5_data_param().shuffle()) { +- std::random_shuffle(file_permutation_.begin(), file_permutation_.end()); ++ std::random_device rand_device; ++ std::default_random_engine rand_engine(rand_device()); ++ std::shuffle(file_permutation_.begin(), file_permutation_.end(), rand_engine); + } + + // Load the first HDF5 file and initialize the line counter. +@@ -137,14 +141,17 @@ bool HDF5DataLayer::Skip() { + + template + void HDF5DataLayer::Next() { ++ std::random_device rand_device; ++ std::default_random_engine rand_engine(rand_device()); + if (++current_row_ == hdf_blobs_[0]->shape(0)) { + if (num_files_ > 1) { + ++current_file_; + if (current_file_ == num_files_) { + current_file_ = 0; + if (this->layer_param_.hdf5_data_param().shuffle()) { +- std::random_shuffle(file_permutation_.begin(), +- file_permutation_.end()); ++ std::shuffle(file_permutation_.begin(), ++ file_permutation_.end(), ++ rand_engine); + } + DLOG(INFO) << "Looping around to first file."; + } +@@ -153,7 +160,7 @@ void HDF5DataLayer::Next() { + } + current_row_ = 0; + if (this->layer_param_.hdf5_data_param().shuffle()) +- std::random_shuffle(data_permutation_.begin(), data_permutation_.end()); ++ std::shuffle(data_permutation_.begin(), data_permutation_.end(), rand_engine); + } + offset_++; + } +-- +2.49.0 + diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix deleted file mode 100644 index c8bacea5acb7..000000000000 --- a/pkgs/applications/science/math/hmetis/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ghostscript, -}: - -stdenv.mkDerivation rec { - pname = "hmetis"; - version = "1.5"; - - src = fetchurl { - url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/hmetis/hmetis-${version}-linux.tar.gz"; - sha256 = "e835a098c046e9c26cecb8addfea4d18ff25214e49585ffd87038e72819be7e1"; - }; - - nativeBuildInputs = [ ghostscript ]; - - binaryFiles = "hmetis khmetis shmetis"; - - patchPhase = '' - for binaryfile in $binaryFiles; do - patchelf \ - --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.cc.libc}/lib \ - $binaryfile - done - ''; - - buildPhase = '' - gs -sOutputFile=manual.pdf -sDEVICE=pdfwrite -SNOPAUSE -dBATCH manual.ps - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/doc/hmetis $out/lib - mv $binaryFiles $out/bin - mv manual.pdf $out/share/doc/hmetis - mv libhmetis.a $out/lib - ''; - - meta = with lib; { - description = "hMETIS is a set of programs for partitioning hypergraphs"; - homepage = "http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ - "i686-linux" - "x86_64-linux" - ]; - }; -} diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 103e47e7fb87..32c2aab73c6a 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -8,6 +8,20 @@ let versions = [ + { + version = "14.2.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-WNLuq9RviYF3Mj8uOALhmvcxGGHVq/TAGFMTGWoYBcc="; + installer = "Wolfram_14.2.1_LIN.sh"; + } + { + version = "14.2.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-DcZbetr5wO3i/DkchgpsW3RGHfa1PslA4fK+bRQ68Bg="; + installer = "Wolfram_14.2.1_LIN_Bndl.sh"; + } { version = "14.2.0"; lang = "en"; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 914dee3bc83d..46a90105b61f 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -78,7 +78,8 @@ stdenv.mkDerivation rec { ''; downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ertes ] ++ teams.sage.members; + maintainers = with maintainers; [ ertes ]; + teams = [ teams.sage ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "gp"; }; diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index 935a52934a9a..2dbd5df4c123 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { inherit (pari.meta) license maintainers + teams platforms broken ; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index d9db711638e6..7feac844d1f8 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wxmaxima"; - version = "25.01.0"; + version = "25.04.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${finalAttrs.version}"; - hash = "sha256-XFlEBmKxpi7NnUxVXV2F+zQKrvR4r93aLtHOoVZ7SPw="; + hash = "sha256-AEy2a8BahV1yH67RIjcsVipuo5eUZcQZxR3HygSYGlU="; }; buildInputs = [ diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 6ac7ef85e075..c9e047fba632 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "8.0.4"; + version = "8.2.2"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-dp0zRMIG0PGXhth+Cc8FDhzl5X/4ud3GFCdE7wqPL/c="; + hash = "sha256-Q++34JKmJCciK53fmMPUxOPr35+Nd7YPYR4SwKOldQA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 6566d38b4ef7..c28c1b15b96e 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -20,7 +20,7 @@ qt5, xorg, cudaSupport ? config.cudaSupport, - cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities, + cudaCapabilities ? cudaPackages.flags.cudaCapabilities, cudaPackages, }: @@ -46,7 +46,7 @@ stdenv'.mkDerivation rec { cmakeFlags = lib.optionals cudaSupport [ (lib.cmakeBool "CUDA_ENABLED" true) (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" ( - lib.strings.concatStringsSep ";" (map cudaPackages.cudaFlags.dropDot cudaCapabilities) + lib.strings.concatStringsSep ";" (map cudaPackages.flags.dropDot cudaCapabilities) )) ]; diff --git a/pkgs/applications/science/misc/convertall/default.nix b/pkgs/applications/science/misc/convertall/default.nix index 703bb5b3221e..db2bf013b5f0 100644 --- a/pkgs/applications/science/misc/convertall/default.nix +++ b/pkgs/applications/science/misc/convertall/default.nix @@ -1,49 +1,28 @@ { lib, - stdenv, + flutter329, fetchFromGitHub, - python3, - wrapQtAppsHook, }: -let - inherit (python3.pkgs) wrapPython pyqt5; -in -stdenv.mkDerivation rec { +flutter329.buildFlutterApplication rec { pname = "convertall"; - version = "0.8.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "doug-101"; repo = "ConvertAll"; - rev = "v${version}"; - sha256 = "02xxasgbjbivsbhyfpn3cpv52lscdx5kc95s6ns1dvnmdg0fpng0"; + tag = "v${version}"; + hash = "sha256-wsSe7dVjEgLDOIavcMzdxW9LKZcZPaQMcw4RhsPS0jU="; }; - nativeBuildInputs = [ - python3 - wrapPython - wrapQtAppsHook - ]; + pubspecLock = lib.importJSON ./pubspec.lock.json; - propagatedBuildInputs = [ pyqt5 ]; - - installPhase = '' - python3 install.py -p $out -x - ''; - - postFixup = '' - buildPythonPath $out - patchPythonScript $out/share/convertall/convertall.py - makeQtWrapper $out/share/convertall/convertall.py $out/bin/convertall - ''; - - meta = with lib; { - homepage = "https://convertall.bellz.org/"; + meta = { + homepage = "https://convertall.bellz.org"; description = "Graphical unit converter"; mainProgram = "convertall"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ orivej ]; - platforms = pyqt5.meta.platforms; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ orivej ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/misc/convertall/pubspec.lock.json b/pkgs/applications/science/misc/convertall/pubspec.lock.json new file mode 100644 index 000000000000..986be5f7a292 --- /dev/null +++ b/pkgs/applications/science/misc/convertall/pubspec.lock.json @@ -0,0 +1,792 @@ +{ + "packages": { + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "a7f37ff061d7abc2fcf213554b9dcaca713c5853afa5c065c44888bc9ccaf813", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.6" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.12.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "cupertino_icons": { + "dependency": "transitive", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "decimal": { + "dependency": "direct main", + "description": { + "name": "decimal", + "sha256": "24a261d5d5c87e86c7651c417a5dbdf8bcd7080dd592533910e8d0505a279f21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "eval_ex": { + "dependency": "direct main", + "description": { + "name": "eval_ex", + "sha256": "3f8853d996ee41955f2232ad3730e95698fb1040d03f6ebc6ab01f1c2bc3be53", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.8" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.3" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "flutter_markdown_selectionarea": { + "dependency": "direct main", + "description": { + "name": "flutter_markdown_selectionarea", + "sha256": "d4bc27e70a5c40ebdab23a4b81f75d53696a214d4d1f13c12045b38a0ddc58a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.17+1" + }, + "flutter_spinbox": { + "dependency": "direct main", + "description": { + "name": "flutter_spinbox", + "sha256": "38d8c1a3a39f0fa72823d4470785f5e165f2deb53531ca7803b54ba45e4dbd46", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.4" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.8" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.9" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "markdown": { + "dependency": "transitive", + "description": { + "name": "markdown", + "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.16.0" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "provider": { + "dependency": "direct main", + "description": { + "name": "provider", + "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.4" + }, + "rational": { + "dependency": "transitive", + "description": { + "name": "rational", + "sha256": "cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.3" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.10" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.4" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.16" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.3" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.3.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.12.0" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.9" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + } + }, + "sdks": { + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.27.0" + } +} diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index b934320025a5..840e76c1fc5a 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -11,12 +11,12 @@ }: let - version = "3.9.2"; + version = "3.9.3"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-Z52YfS+caNe7N3xMv85eoBes6TwkSsGk5/rGaQd/6ds="; + hash = "sha256-wV5ur31JEGcMSLRHQq/H6GlsdpEzTH6ZxBkE9Sj6TkU="; }; npmPkg = buildNpmPackage { diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix deleted file mode 100644 index dfa7fbf8daf4..000000000000 --- a/pkgs/applications/science/misc/rink/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - openssl, - pkg-config, - ncurses, - curl, - installShellFiles, - asciidoctor, - libiconv, - Security, -}: - -rustPlatform.buildRustPackage rec { - version = "0.8.0"; - pname = "rink"; - - src = fetchFromGitHub { - owner = "tiffany352"; - repo = "rink-rs"; - rev = "v${version}"; - hash = "sha256-2+ZkyWhEnnO/QgCzWscbMr0u5kwdv2HqPLjtiXDfv/o="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-XvtEXBsdxUMJJntzzKVbUIjg78JpwyuUlTm6J3huDPE="; - - nativeBuildInputs = [ - pkg-config - installShellFiles - asciidoctor - ]; - buildInputs = - [ ncurses ] - ++ ( - if stdenv.hostPlatform.isDarwin then - [ - curl - libiconv - Security - ] - else - [ openssl ] - ); - - # Some tests fail and/or attempt to use internet servers. - doCheck = false; - - postBuild = '' - make man - ''; - - postInstall = '' - installManPage build/* - ''; - - meta = with lib; { - description = "Unit-aware calculator"; - mainProgram = "rink"; - homepage = "https://rinkcalc.app"; - license = with licenses; [ - mpl20 - gpl3Plus - ]; - maintainers = with maintainers; [ - sb0 - Br1ght0ne - ]; - }; -} diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index 1460ea3e8e08..b9a2ae22ff67 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -1,16 +1,7 @@ { - lib, - rustPlatform, - dbus, - freetype, - gtk3, - libsoup_3, - openssl, - pkg-config, - webkitgtk_4_1, - libappindicator, - makeWrapper, - coolercontrol, + cmake, + stdenv, + qt6, }: { @@ -19,48 +10,26 @@ meta, }: -rustPlatform.buildRustPackage { +stdenv.mkDerivation { pname = "coolercontrol"; inherit version src; - sourceRoot = "${src.name}/coolercontrol-ui/src-tauri"; - - useFetchCargoVendor = true; - cargoHash = "sha256-C0oVtU6esXOkssKyJ4XzLV2vGCPbvVKgvf3wXo9L158="; - - buildFeatures = [ "custom-protocol" ]; + sourceRoot = "${src.name}/coolercontrol"; nativeBuildInputs = [ - makeWrapper - pkg-config + cmake + qt6.wrapQtAppsHook ]; buildInputs = [ - dbus - openssl - freetype - libsoup_3 - gtk3 - webkitgtk_4_1 - libappindicator + qt6.qtbase + qt6.qtwebengine ]; - checkFeatures = [ "custom-protocol" ]; - - # copy the frontend static resources to final build directory - # Also modify tauri.conf.json so that it expects the resources at the new location - postPatch = '' - mkdir -p ui-build - cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/ - substituteInPlace tauri.conf.json --replace-fail '"frontendDist": "../dist"' '"frontendDist": "ui-build"' - ''; - postInstall = '' install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.desktop" -t "$out/share/applications/" install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.metainfo.xml" -t "$out/share/metainfo/" install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.png" -t "$out/share/icons/hicolor/256x256/apps/" install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.svg" -t "$out/share/icons/hicolor/scalable/apps/" - wrapProgram $out/bin/coolercontrol \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libappindicator ]} ''; meta = meta // { diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix index 19475bc7572e..0f687c9d5278 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix @@ -1,4 +1,4 @@ -{ buildNpmPackage, autoPatchelfHook }: +{ buildNpmPackage }: { version, @@ -11,15 +11,7 @@ buildNpmPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui"; - npmDepsHash = "sha256-t+QShKaXpQuEzeeu/ljBBEzeYsxqvMpx5waDZ2gyPAI="; - - preBuild = '' - autoPatchelf node_modules/sass-embedded-linux-x64/dart-sass/src/dart - ''; - - nativeBuildInputs = [ autoPatchelfHook ]; - - dontAutoPatchelf = true; + npmDepsHash = "sha256-FFVCE3/E+eiTvTeU53cc1Mdbrl5J3+YgYUYltpnGXz0="; postBuild = '' cp -r dist $out diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index ee9af95a0ddf..d1e5e43fc8c1 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -18,15 +18,14 @@ rustPlatform.buildRustPackage { sourceRoot = "${src.name}/coolercontrold"; useFetchCargoVendor = true; - cargoHash = "sha256-5gqtSZs/unFobEl1MHec2uhGDrWnO6ITlYbB78VasZg="; + cargoHash = "sha256-ZyYyQcaYd3VZ7FL0Hki33JO3LscPfBT5gl+nw2cXvUs="; buildInputs = [ libdrm ]; postPatch = '' # copy the frontend static resources to a directory for embedding mkdir -p ui-build - cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/ - substituteInPlace build.rs --replace-fail '"./resources/app"' '"./ui-build"' + cp -R ${coolercontrol.coolercontrol-ui-data}/* resources/app/ # Hardcode a shell substituteInPlace src/repositories/utils.rs \ diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix index 066be7abb8ff..35e138f5f195 100644 --- a/pkgs/applications/system/coolercontrol/default.nix +++ b/pkgs/applications/system/coolercontrol/default.nix @@ -5,13 +5,13 @@ }: let - version = "1.4.5"; + version = "2.1.0"; src = fetchFromGitLab { owner = "coolercontrol"; repo = "coolercontrol"; rev = version; - hash = "sha256-lRw5IcSrLM6aUajt2Ny1IUuGYcAjY1oUDZENyz0wVJI="; + hash = "sha256-xIc0ZecQGyjMQWVaucKomu7SbaHy+ymg5dkOjHjtJ9c="; }; meta = { diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 635aa584371d..d949ab2eb1f8 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -101,7 +101,8 @@ stdenv.mkDerivation rec { section in the NixOS manual. ''; homepage = "https://github.com/stsdc/monitor"; - maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; + maintainers = with maintainers; [ xiorcale ]; + teams = [ teams.pantheon ]; platforms = platforms.linux; license = licenses.gpl3Plus; mainProgram = "com.github.stsdc.monitor"; diff --git a/pkgs/applications/system/timed/default.nix b/pkgs/applications/system/timed/default.nix index 52f5f0c87efb..8fa9e5f93464 100644 --- a/pkgs/applications/system/timed/default.nix +++ b/pkgs/applications/system/timed/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/sailfishos/timed/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl21Only; mainProgram = "timed"; - maintainers = lib.teams.lomiri.members; + teams = [ lib.teams.lomiri ]; platforms = lib.platforms.linux; pkgConfigModules = [ "timed-qt${lib.versions.major qtbase.version}" diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index e380fe052d26..ee3b038e7970 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -164,5 +164,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; license = licenses.gpl3; + mainProgram = "urxvt"; }; } diff --git a/pkgs/applications/terminal-emulators/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix deleted file mode 100644 index 379bd1d94278..000000000000 --- a/pkgs/applications/terminal-emulators/stupidterm/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - vte, - gtk, - pcre2, - nixosTests, -}: - -stdenv.mkDerivation { - pname = "stupidterm"; - version = "2019-03-26"; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - vte - gtk - pcre2 - ]; - - src = fetchFromGitHub { - owner = "esmil"; - repo = "stupidterm"; - rev = "f824e41c2ca9016db73556c5d2f5a2861e235c8e"; - sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp"; - }; - - makeFlags = [ - "PKGCONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" - "binary=stupidterm" - ]; - - installPhase = '' - install -D stupidterm $out/bin/stupidterm - install -D -m 644 stupidterm.desktop $out/share/applications/stupidterm.desktop - install -D -m 644 stupidterm.ini $out/share/stupidterm/stupidterm.ini - - substituteInPlace $out/share/applications/stupidterm.desktop \ - --replace "Exec=st" "Exec=$out/bin/stupidterm" - ''; - - passthru.tests.test = nixosTests.terminal-emulators.stupidterm; - - meta = with lib; { - description = "Simple wrapper around the VTE terminal emulator widget for GTK"; - homepage = "https://github.com/esmil/stupidterm"; - license = licenses.lgpl3Plus; - maintainers = [ maintainers.etu ]; - platforms = platforms.linux; - mainProgram = "stupidterm"; - }; -} diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index 80f4858aa5f4..a4d0a59d931c 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Safely store secrets in a VCS repo"; homepage = "https://github.com/StackExchange/blackbox"; - maintainers = with maintainers; [ ericsagnes ]; + maintainers = with maintainers; [ ]; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/applications/version-management/danger-gitlab/default.nix b/pkgs/applications/version-management/danger-gitlab/default.nix index 8ee557bd295a..08ead7caf365 100644 --- a/pkgs/applications/version-management/danger-gitlab/default.nix +++ b/pkgs/applications/version-management/danger-gitlab/default.nix @@ -9,7 +9,7 @@ bundlerApp { description = "Gem that exists to ensure all dependencies are set up for Danger with GitLab"; homepage = "https://github.com/danger/danger-gitlab-gem"; license = licenses.mit; - maintainers = teams.serokell.members; + teams = [ teams.serokell ]; mainProgram = "danger"; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index bcbd9cf329df..60ac736f2649 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fossil"; - version = "2.25"; + version = "2.26"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz"; - hash = "sha256-5O6ceBUold+yp13pET/5NB17Del1wDOzUQYLv0DS/KE="; + hash = "sha256-uzT3iOGB1MRQXWmtQNZWazOYiGH4kdtt/KJ6uVQrcqo="; }; # required for build time tool `./tools/translate.c` diff --git a/pkgs/applications/version-management/git-fame/Gemfile.lock b/pkgs/applications/version-management/git-fame/Gemfile.lock deleted file mode 100644 index 23d6db943e49..000000000000 --- a/pkgs/applications/version-management/git-fame/Gemfile.lock +++ /dev/null @@ -1,155 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - git_fame (3.1.1) - activesupport (~> 7.0) - dry-initializer (~> 3.0) - dry-struct (~> 1.0) - dry-types (~> 1.0) - neatjson (~> 0.9) - rugged (~> 1.0) - tty-box (~> 0.5) - tty-option (~> 0.2) - tty-screen (~> 0.5) - tty-spinner (~> 0.9) - tty-table (~> 0.9, <= 0.10.0) - zeitwerk (~> 2.0) - activesupport (7.0.6) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - ast (2.4.2) - coderay (1.1.3) - concurrent-ruby (1.2.2) - diff-lcs (1.5.0) - docile (1.4.0) - dry-core (1.0.0) - concurrent-ruby (~> 1.0) - zeitwerk (~> 2.6) - dry-inflector (1.0.0) - dry-initializer (3.1.1) - dry-logic (1.5.0) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) - zeitwerk (~> 2.6) - dry-struct (1.6.0) - dry-core (~> 1.0, < 2) - dry-types (>= 1.7, < 2) - ice_nine (~> 0.11) - zeitwerk (~> 2.6) - dry-types (1.7.1) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0) - dry-inflector (~> 1.0) - dry-logic (~> 1.4) - zeitwerk (~> 2.6) - equatable (0.5.0) - factory_bot (6.2.1) - activesupport (>= 5.0.0) - faker (3.1.1) - i18n (>= 1.8.11, < 2) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - ice_nine (0.11.2) - method_source (1.0.0) - minitest (5.18.1) - neatjson (0.10.5) - necromancer (0.4.0) - parallel (1.22.1) - parser (3.2.1.1) - ast (~> 2.4.1) - pastel (0.7.2) - equatable (~> 0.5.0) - tty-color (~> 0.4.0) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) - rainbow (3.1.1) - rake (13.0.6) - regexp_parser (2.7.0) - rexml (3.2.5) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.1) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-github (2.4.0) - rspec-core (~> 3.0) - rspec-its (1.3.0) - rspec-core (>= 3.0.0) - rspec-expectations (>= 3.0.0) - rspec-mocks (3.12.4) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.0) - rubocop (1.24.1) - parallel (~> 1.10) - parser (>= 3.0.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.15.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.28.0) - parser (>= 3.2.1.0) - rubocop-md (1.2.0) - rubocop (>= 1.0) - rubocop-performance (1.16.0) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rake (0.6.0) - rubocop (~> 1.0) - rubocop-rspec (2.11.1) - rubocop (~> 1.19) - ruby-progressbar (1.13.0) - rugged (1.6.3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (2.1.0) - rexml - simplecov (~> 0.19) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - strings (0.1.8) - strings-ansi (~> 0.1) - unicode-display_width (~> 1.5) - unicode_utils (~> 1.4) - strings-ansi (0.2.0) - tty-box (0.5.0) - pastel (~> 0.7.2) - strings (~> 0.1.6) - tty-cursor (~> 0.7) - tty-color (0.4.3) - tty-cursor (0.7.1) - tty-option (0.2.0) - tty-screen (0.6.5) - tty-spinner (0.9.3) - tty-cursor (~> 0.7) - tty-table (0.10.0) - equatable (~> 0.5.0) - necromancer (~> 0.4.0) - pastel (~> 0.7.2) - strings (~> 0.1.0) - tty-screen (~> 0.6.4) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unicode-display_width (1.8.0) - unicode_utils (1.4.0) - zeitwerk (2.6.7) - -PLATFORMS - ruby - -DEPENDENCIES - git_fame - -BUNDLED WITH - 2.3.3 diff --git a/pkgs/applications/version-management/git-fame/gemset.nix b/pkgs/applications/version-management/git-fame/gemset.nix deleted file mode 100644 index 5212cfbcb8f3..000000000000 --- a/pkgs/applications/version-management/git-fame/gemset.nix +++ /dev/null @@ -1,741 +0,0 @@ -{ - activesupport = { - dependencies = [ - "concurrent-ruby" - "i18n" - "minitest" - "tzinfo" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; - type = "gem"; - }; - version = "7.0.6"; - }; - ast = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; - type = "gem"; - }; - version = "2.4.2"; - }; - coderay = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; - type = "gem"; - }; - version = "1.1.3"; - }; - concurrent-ruby = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; - type = "gem"; - }; - version = "1.2.2"; - }; - diff-lcs = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; - type = "gem"; - }; - version = "1.5.0"; - }; - docile = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; - type = "gem"; - }; - version = "1.4.0"; - }; - dry-core = { - dependencies = [ - "concurrent-ruby" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01gks2hrp7nl3pzb487azvd25dlbrc40d5cpk4n0szwnf2c0k4ks"; - type = "gem"; - }; - version = "1.0.0"; - }; - dry-inflector = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "09hnvna3lg2x36li63988kv664d0zvy7y0z33803yvrdr9hj7lka"; - type = "gem"; - }; - version = "1.0.0"; - }; - dry-initializer = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1v3dah1r96b10m8xjixmdmymg7dr16wn5715id4vxjkw6vm7s9jd"; - type = "gem"; - }; - version = "3.1.1"; - }; - dry-logic = { - dependencies = [ - "concurrent-ruby" - "dry-core" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05nldkc154r0qzlhss7n5klfiyyz05x2fkq08y13s34py6023vcr"; - type = "gem"; - }; - version = "1.5.0"; - }; - dry-struct = { - dependencies = [ - "dry-core" - "dry-types" - "ice_nine" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1rnlgn4wif0dvkvi10xwh1vd1q6mp35q6a7lwva0zmbc79dh4drp"; - type = "gem"; - }; - version = "1.6.0"; - }; - dry-types = { - dependencies = [ - "concurrent-ruby" - "dry-core" - "dry-inflector" - "dry-logic" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1f6dz0hm67rhybh6xq2s3vvr700cp43kf50z2lids62s2i0mh5hj"; - type = "gem"; - }; - version = "1.7.1"; - }; - equatable = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x"; - type = "gem"; - }; - version = "0.5.0"; - }; - factory_bot = { - dependencies = [ "activesupport" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1pfk942d6qwhw151hxaz7n4knk6whyxqvvywdx2cdw9yhykyaqzq"; - type = "gem"; - }; - version = "6.2.1"; - }; - faker = { - dependencies = [ "i18n" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1b8772jybi0vxzbcs5zw17k40z661c8adn2rd6vqqr7ay71bzl09"; - type = "gem"; - }; - version = "3.1.1"; - }; - git_fame = { - dependencies = [ - "activesupport" - "dry-initializer" - "dry-struct" - "dry-types" - "neatjson" - "rugged" - "tty-box" - "tty-option" - "tty-screen" - "tty-spinner" - "tty-table" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jqvhzwgvr2bpi4ldqidbcs9prb0xsikp50xx4r8dwhf8m9mh26h"; - type = "gem"; - }; - version = "3.1.1"; - }; - i18n = { - dependencies = [ "concurrent-ruby" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; - type = "gem"; - }; - version = "1.14.1"; - }; - ice_nine = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; - type = "gem"; - }; - version = "0.11.2"; - }; - method_source = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; - type = "gem"; - }; - version = "1.0.0"; - }; - minitest = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; - type = "gem"; - }; - version = "5.18.1"; - }; - neatjson = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wm1lq8yl6rzysh3wg6fa55w5534k6ppiz0qb7jyvdy582mk5i0s"; - type = "gem"; - }; - version = "0.10.5"; - }; - necromancer = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz"; - type = "gem"; - }; - version = "0.4.0"; - }; - parallel = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; - type = "gem"; - }; - version = "1.22.1"; - }; - parser = { - dependencies = [ "ast" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1a2v5f8fw7nxm41xp422p1pbr41hafy62bp95m7vg42cqp5y4grc"; - type = "gem"; - }; - version = "3.2.1.1"; - }; - pastel = { - dependencies = [ - "equatable" - "tty-color" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1"; - type = "gem"; - }; - version = "0.7.2"; - }; - pry = { - dependencies = [ - "coderay" - "method_source" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; - type = "gem"; - }; - version = "0.14.2"; - }; - rainbow = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; - type = "gem"; - }; - version = "3.1.1"; - }; - rake = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; - type = "gem"; - }; - version = "13.0.6"; - }; - regexp_parser = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0d6241adx6drsfzz74nx1ld3394nm6fjpv3ammzr0g659krvgf7q"; - type = "gem"; - }; - version = "2.7.0"; - }; - rexml = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; - rspec = { - dependencies = [ - "rspec-core" - "rspec-expectations" - "rspec-mocks" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; - type = "gem"; - }; - version = "3.12.0"; - }; - rspec-core = { - dependencies = [ "rspec-support" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f"; - type = "gem"; - }; - version = "3.12.1"; - }; - rspec-expectations = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; - type = "gem"; - }; - version = "3.12.2"; - }; - rspec-github = { - dependencies = [ "rspec-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kqjmd85v2fpb06d0rx43dc51f0igc1gmm8y3nz0wvmy7zg02njm"; - type = "gem"; - }; - version = "2.4.0"; - }; - rspec-its = { - dependencies = [ - "rspec-core" - "rspec-expectations" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad"; - type = "gem"; - }; - version = "1.3.0"; - }; - rspec-mocks = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1dcfh85m3ksir6n8gydsal4d85chpww1b2nahb05nl8xhgh0r2ij"; - type = "gem"; - }; - version = "3.12.4"; - }; - rspec-support = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; - type = "gem"; - }; - version = "3.12.0"; - }; - rubocop = { - dependencies = [ - "parallel" - "parser" - "rainbow" - "regexp_parser" - "rexml" - "rubocop-ast" - "ruby-progressbar" - "unicode-display_width" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1sn7ag295blmhpwv6x472m3fd0n25swz9imqwpk0hg21rdcdw7p0"; - type = "gem"; - }; - version = "1.24.1"; - }; - rubocop-ast = { - dependencies = [ "parser" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n2gsafg6p7nr1z8i1hkvp2qqkkbg842ba183dnl0h08xd9ms6q5"; - type = "gem"; - }; - version = "1.28.0"; - }; - rubocop-md = { - dependencies = [ "rubocop" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "11j802r5r022vxzycvwvzhyg24g8dky4slbvid24xi0ji73q444z"; - type = "gem"; - }; - version = "1.2.0"; - }; - rubocop-performance = { - dependencies = [ - "rubocop" - "rubocop-ast" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; - type = "gem"; - }; - version = "1.16.0"; - }; - rubocop-rake = { - dependencies = [ "rubocop" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nyq07sfb3vf3ykc6j2d5yq824lzq1asb474yka36jxgi4hz5djn"; - type = "gem"; - }; - version = "0.6.0"; - }; - rubocop-rspec = { - dependencies = [ "rubocop" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ivc9kgz18cn32iqi9wv5aj903yhamwddw84l7nklbl9xxvwz603"; - type = "gem"; - }; - version = "2.11.1"; - }; - ruby-progressbar = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; - type = "gem"; - }; - version = "1.13.0"; - }; - rugged = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in"; - type = "gem"; - }; - version = "1.6.3"; - }; - simplecov = { - dependencies = [ - "docile" - "simplecov-html" - "simplecov_json_formatter" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; - type = "gem"; - }; - version = "0.22.0"; - }; - simplecov-cobertura = { - dependencies = [ - "rexml" - "simplecov" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00izmp202y48qvmvwrh5x56cc5ivbjhgkkkjklvqmqzj9pik4r9c"; - type = "gem"; - }; - version = "2.1.0"; - }; - simplecov-html = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; - type = "gem"; - }; - version = "0.12.3"; - }; - simplecov_json_formatter = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; - type = "gem"; - }; - version = "0.1.4"; - }; - strings = { - dependencies = [ - "strings-ansi" - "unicode-display_width" - "unicode_utils" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0"; - type = "gem"; - }; - version = "0.1.8"; - }; - strings-ansi = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; - type = "gem"; - }; - version = "0.2.0"; - }; - tty-box = { - dependencies = [ - "pastel" - "strings" - "tty-cursor" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14g63v0jx87hba50rlv3c521zg9rw0f5d31cihcvym19xxa7v3l5"; - type = "gem"; - }; - version = "0.5.0"; - }; - tty-color = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk"; - type = "gem"; - }; - version = "0.4.3"; - }; - tty-cursor = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; - type = "gem"; - }; - version = "0.7.1"; - }; - tty-option = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xibs7kgbsw401ywfw67wg47fmm7sdcypy85m25af9r2q2hbq7gb"; - type = "gem"; - }; - version = "0.2.0"; - }; - tty-screen = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1"; - type = "gem"; - }; - version = "0.6.5"; - }; - tty-spinner = { - dependencies = [ "tty-cursor" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf"; - type = "gem"; - }; - version = "0.9.3"; - }; - tty-table = { - dependencies = [ - "equatable" - "necromancer" - "pastel" - "strings" - "tty-screen" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg"; - type = "gem"; - }; - version = "0.10.0"; - }; - tzinfo = { - dependencies = [ "concurrent-ruby" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; - type = "gem"; - }; - version = "2.0.6"; - }; - unicode-display_width = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; - type = "gem"; - }; - version = "1.8.0"; - }; - unicode_utils = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; - type = "gem"; - }; - version = "1.4.0"; - }; - zeitwerk = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; - type = "gem"; - }; - version = "2.6.7"; - }; -} diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix deleted file mode 100644 index b131fa6ee7f2..000000000000 --- a/pkgs/applications/version-management/git-gone/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - Security, - installShellFiles, - asciidoctor, -}: - -rustPlatform.buildRustPackage rec { - pname = "git-gone"; - version = "1.2.5"; - - src = fetchFromGitHub { - owner = "swsnr"; - repo = "git-gone"; - tag = "v${version}"; - hash = "sha256-4BhFombZCmv/GNG2OcNlWNKTk2h65yKn1ku734gCBCQ="; - }; - - # remove if updating to rust 1.85 - postPatch = '' - substituteInPlace Cargo.toml \ - --replace-fail "[package]" ''$'cargo-features = ["edition2024"]\n[package]' - ''; - - useFetchCargoVendor = true; - cargoHash = "sha256-VjnnrVN+uST99paImI1uNj34CNozid7ZiPslJqvmKCs="; - - # remove if updating to rust 1.85 - env.RUSTC_BOOTSTRAP = 1; - - nativeBuildInputs = [ - installShellFiles - asciidoctor - ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - postInstall = '' - asciidoctor --backend=manpage git-gone.1.adoc -o git-gone.1 - installManPage git-gone.1 - ''; - - meta = { - description = "Cleanup stale Git branches of merge requests"; - homepage = "https://github.com/swsnr/git-gone"; - changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - cafkafk - matthiasbeyer - ]; - mainProgram = "git-gone"; - }; -} diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 3ec812bc8219..73cb83527862 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.34.0"; + version = "3.34.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-2Or4L3wrvqW7bvrJcgvK7rGqjqiob6k8CZc/XauguLo="; + hash = "sha256-CllaviW7pqLD9XD4oSHyW2nG4lObkPWFseXZbtkNUQI="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix deleted file mode 100644 index 5107fef5426f..000000000000 --- a/pkgs/applications/version-management/git-stack/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - Security, - testers, - git-stack, -}: - -rustPlatform.buildRustPackage rec { - pname = "git-stack"; - version = "0.10.18"; - - src = fetchFromGitHub { - owner = "gitext-rs"; - repo = "git-stack"; - rev = "v${version}"; - hash = "sha256-iFoxYq4NHC/K0ruPDXHfayZDglebBJE00V57HUH9Y84="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-338iRd6zoy2O55sZ0h+s6i8kg4yXFBowRQLge9R9Bqs="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - - # Many tests try to access the file system. - doCheck = false; - - passthru.tests.version = testers.testVersion { - package = git-stack; - }; - - meta = with lib; { - description = "Stacked branch management for Git"; - homepage = "https://github.com/gitext-rs/git-stack"; - changelog = "https://github.com/gitext-rs/git-stack/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ stehessel ]; - mainProgram = "git-stack"; - }; -} diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix deleted file mode 100644 index 6c96b5f9b79c..000000000000 --- a/pkgs/applications/version-management/git-up/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - pythonPackages, - fetchPypi, - git, -}: - -pythonPackages.buildPythonApplication rec { - pname = "git-up"; - version = "2.3.0"; - format = "pyproject"; - - src = fetchPypi { - pname = "git_up"; - inherit version; - hash = "sha256-SncbnK6LxsleKRa/sSCm/8dsgPw/XJGvYfkcIeWYDy4="; - }; - - nativeBuildInputs = with pythonPackages; [ - poetry-core - ]; - - # git should be on path for tool to work correctly - propagatedBuildInputs = - [ - git - ] - ++ (with pythonPackages; [ - colorama - gitpython - termcolor - ]); - - nativeCheckInputs = [ - git - pythonPackages.pytest7CheckHook - ]; - - # 1. git fails to run as it cannot detect the email address, so we set it - # 2. $HOME is by default not a valid dir, so we have to set that too - # https://github.com/NixOS/nixpkgs/issues/12591 - preCheck = '' - export HOME=$TMPDIR - git config --global user.email "nobody@example.com" - git config --global user.name "Nobody" - ''; - - postInstall = '' - rm -r $out/${pythonPackages.python.sitePackages}/PyGitUp/tests - ''; - - meta = with lib; { - homepage = "https://github.com/msiemens/PyGitUp"; - description = "Git pull replacement that rebases all local branches when pulling"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - mainProgram = "git-up"; - }; -} diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index d806ee20190b..4064b1a29c8f 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -5,12 +5,11 @@ buildPackages, curl, openssl, - zlib, + zlib-ng, expat, perlPackages, python3, gettext, - cpio, gnugrep, gnused, gawk, @@ -38,12 +37,11 @@ nlsSupport ? true, osxkeychainSupport ? stdenv.hostPlatform.isDarwin, guiSupport ? false, - withManual ? true, + # Disable the manual since libxslt doesn't seem to parse the files correctly. + withManual ? !stdenv.hostPlatform.useLLVM, pythonSupport ? true, withpcre2 ? true, sendEmailSupport ? perlSupport, - Security, - CoreServices, nixosTests, withLibsecret ? false, pkg-config, @@ -62,7 +60,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.48.1"; + version = "2.49.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI @@ -84,8 +82,14 @@ stdenv.mkDerivation (finalAttrs: { inherit version; src = fetchurl { - url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-HF1UX13B61HpXSxQ2Y/fiLGja6H6MOmuXVOFxgJPgq0="; + url = + if lib.strings.hasInfix "-rc" version then + "https://www.kernel.org/pub/software/scm/git/testing/git-${ + builtins.replaceStrings [ "-" ] [ "." ] version + }.tar.xz" + else + "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; + hash = "sha256-YYGQz1kLfp9sEfkfI7HSZ82Yw6szuFBBbYdY+LWoVig="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -94,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; enableParallelBuilding = true; + enableParallelInstalling = true; patches = [ @@ -143,9 +148,8 @@ stdenv.mkDerivation (finalAttrs: { [ curl openssl - zlib + zlib-ng expat - cpio (if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv) bash ] @@ -155,10 +159,6 @@ stdenv.mkDerivation (finalAttrs: { tk ] ++ lib.optionals withpcre2 [ pcre2 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - CoreServices - ] ++ lib.optionals withLibsecret [ glib libsecret @@ -186,6 +186,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "prefix=\${out}" + "ZLIB_NG=1" ] # Git does not allow setting a shell separately for building and run-time. # Therefore lets leave it at the default /bin/sh when cross-compiling @@ -218,23 +219,36 @@ stdenv.mkDerivation (finalAttrs: { ]; postBuild = - lib.optionalString withManual '' + '' + # Set up the flags array for make in the same way as for the main build + # phase from stdenv. + local flagsArray=( + ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}} + SHELL="$SHELL" + ) + concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray + echoCmd 'build flags' "''${flagsArray[@]}" + '' + + lib.optionalString withManual '' # Need to build the main Git documentation before building the # contrib/subtree documentation, as the latter depends on the # asciidoc.conf file created by the former. - make -C Documentation + make -C Documentation PERL_PATH=${lib.getExe buildPackages.perlPackages.perl} "''${flagsArray[@]}" '' + '' - make -C contrib/subtree all ${lib.optionalString withManual "doc"} + make -C contrib/subtree "''${flagsArray[@]}" all ${lib.optionalString withManual "doc"} '' + lib.optionalString perlSupport '' - make -C contrib/diff-highlight + make -C contrib/diff-highlight "''${flagsArray[@]}" '' + lib.optionalString osxkeychainSupport '' - make -C contrib/credential/osxkeychain + make -C contrib/credential/osxkeychain "''${flagsArray[@]}" '' + lib.optionalString withLibsecret '' - make -C contrib/credential/libsecret + make -C contrib/credential/libsecret "''${flagsArray[@]}" + '' + + '' + unset flagsArray ''; ## Install @@ -246,13 +260,23 @@ stdenv.mkDerivation (finalAttrs: { preInstall = lib.optionalString osxkeychainSupport '' + mkdir -p $out/libexec/git-core + ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/libexec/git-core/ + + # ideally unneeded, but added for backwards compatibility mkdir -p $out/bin - ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/ + ln -s $out/libexec/git-core/git-credential-osxkeychain $out/bin/ + rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o '' + lib.optionalString withLibsecret '' + mkdir -p $out/libexec/git-core + ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/libexec/git-core/ + + # ideally unneeded, but added for backwards compatibility mkdir -p $out/bin - ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/ + ln -s $out/libexec/git-core/git-credential-libsecret $out/bin/ + rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o ''; @@ -262,8 +286,17 @@ stdenv.mkDerivation (finalAttrs: { unlink $1 || true } + # Set up the flags array for make in the same way as for the main install + # phase from stdenv. + local flagsArray=( + ''${enableParallelInstalling:+-j''${NIX_BUILD_CORES}} + SHELL="$SHELL" + ) + concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray + echoCmd 'install flags' "''${flagsArray[@]}" + # Install git-subtree. - make -C contrib/subtree install ${lib.optionalString withManual "install-doc"} + make -C contrib/subtree "''${flagsArray[@]}" install ${lib.optionalString withManual "install-doc"} rm -rf contrib/subtree # Install contrib stuff. @@ -312,8 +345,11 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString perlSupport '' # wrap perl commands - makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \ + makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/libexec/git-core/git-credential-netrc \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" + # ideally unneeded, but added for backwards compatibility + ln -s $out/libexec/git-core/git-credential-netrc $out/bin/ + wrapProgram $out/libexec/git-core/git-cvsimport \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" wrapProgram $out/libexec/git-core/git-archimport \ @@ -367,7 +403,7 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString withManual '' # Install man pages - make -j $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ + make "''${flagsArray[@]}" cmd-list.made install install-html \ -C Documentation '' @@ -391,13 +427,15 @@ stdenv.mkDerivation (finalAttrs: { '' ) + lib.optionalString osxkeychainSupport '' - ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/libexec/git-core/ # enable git-credential-osxkeychain on darwin if desired (default) mkdir -p $out/etc cat > $out/etc/gitconfig << EOF [credential] helper = osxkeychain EOF + '' + + '' + unset flagsArray ''; ## InstallCheck @@ -419,6 +457,12 @@ stdenv.mkDerivation (finalAttrs: { preInstallCheck = '' + # Some tests break with high concurrency + # https://github.com/NixOS/nixpkgs/pull/403237 + if ((NIX_BUILD_CORES > 32)); then + NIX_BUILD_CORES=32 + fi + installCheckFlagsArray+=( GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save" GIT_TEST_INSTALLED=$out/bin @@ -457,7 +501,11 @@ stdenv.mkDerivation (finalAttrs: { '' + '' # Flaky tests: + disable_test t0027-auto-crlf + disable_test t1451-fsck-buffer + disable_test t5319-multi-pack-index disable_test t6421-merge-partial-clone + disable_test t7504-commit-msg-hook # Fails reproducibly on ZFS on Linux with formD normalization disable_test t0021-conversion diff --git a/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch index c78400847418..04c02fb853ea 100644 --- a/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch +++ b/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch @@ -1,8 +1,17 @@ -diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt -index 3db4eab4ba..39bc0e77c9 100644 ---- a/Documentation/git-send-email.txt -+++ b/Documentation/git-send-email.txt -@@ -220,9 +220,9 @@ a password is obtained using 'git-credential'. +diff --git a/Documentation/git-send-email.adoc b/Documentation/git-send-email.adoc +index 7f223db42d..7e46a07d31 100644 +--- a/Documentation/git-send-email.adoc ++++ b/Documentation/git-send-email.adoc +@@ -177,7 +177,7 @@ Sending + The command will be executed in the shell if necessary. Default + is the value of `sendemail.sendmailCmd`. If unspecified, and if + --smtp-server is also unspecified, git-send-email will search +- for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH. ++ for `sendmail` in $PATH. + + --smtp-encryption=:: + Specify in what way encrypting begins for the SMTP connection. +@@ -233,9 +233,9 @@ a password is obtained using 'git-credential'. --smtp-server=:: If set, specifies the outgoing SMTP server to use (e.g. `smtp.example.com` or a raw IP address). If unspecified, and if @@ -16,10 +25,10 @@ index 3db4eab4ba..39bc0e77c9 100644 For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` diff --git a/git-send-email.perl b/git-send-email.perl -index e65d969d0b..508d49483d 100755 +index 798d59b84f..69c9cc2a7d 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -1066,8 +1066,7 @@ sub expand_one_alias { +@@ -1091,8 +1091,7 @@ sub expand_one_alias { } if (!defined $sendmail_cmd && !defined $smtp_server) { diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json deleted file mode 100644 index b8dcb9dca0f0..000000000000 --- a/pkgs/applications/version-management/gitlab/data.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": "17.10.1", - "repo_hash": "1bxkfn49dih3i3z6z1l5xx5hrvrxwwr1ag66aw4vmncw4vyxl2wj", - "yarn_hash": "0fw84hf9qswajmjhds59fn6l6xmyha6vja13dvb5slfw9cmbq9pi", - "owner": "gitlab-org", - "repo": "gitlab", - "rev": "v17.10.1-ee", - "passthru": { - "GITALY_SERVER_VERSION": "17.10.1", - "GITLAB_PAGES_VERSION": "17.10.1", - "GITLAB_SHELL_VERSION": "14.41.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0", - "GITLAB_WORKHORSE_VERSION": "17.10.1" - } -} diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix deleted file mode 100644 index 04027bd1297e..000000000000 --- a/pkgs/applications/version-management/gitlab/default.nix +++ /dev/null @@ -1,317 +0,0 @@ -{ - bundlerEnv, - cacert, - defaultGemConfig, - fetchFromGitLab, - fetchYarnDeps, - yarnConfigHook, - git, - gitlabEnterprise ? false, - lib, - makeWrapper, - nettools, - nixosTests, - nodejs_20, - replace, - ruby_3_3, - stdenv, - tzdata, - - # gem dependencies: - # gitlab-glfm-markdown - buildRubyGem, - cargo, - rustc, - rustPlatform, - - # gpgme - pkg-config, - - # openssl - openssl, - - # ruby-magic - file, - - # static-holmes - icu, - which, - zlib, -}: - -let - data = lib.importJSON ./data.json; - - version = data.version; - src = fetchFromGitLab { - owner = data.owner; - repo = data.repo; - rev = data.rev; - sha256 = data.repo_hash; - }; - - rubyEnv = bundlerEnv rec { - name = "gitlab-env-${version}"; - ruby = ruby_3_3; - gemdir = ./rubyEnv; - gemset = import (gemdir + "/gemset.nix") src; - gemConfig = defaultGemConfig // { - gpgme = attrs: { - nativeBuildInputs = [ pkg-config ]; - }; - # the openssl needs the openssl include files - openssl = attrs: { - buildInputs = [ openssl ]; - }; - ruby-magic = attrs: { - buildInputs = [ file ]; - buildFlags = [ "--enable-system-libraries" ]; - }; - gitlab-glfm-markdown = attrs: { - cargoDeps = rustPlatform.fetchCargoVendor { - src = stdenv.mkDerivation { - inherit (buildRubyGem { inherit (attrs) gemName version source; }) - name - src - unpackPhase - nativeBuildInputs - ; - dontBuilt = true; - installPhase = '' - cp -R ext/glfm_markdown $out - cp Cargo.lock $out - ''; - }; - hash = "sha256-VJR3F+6l8nYj1ZCHOWxnX82C68giXX45RkhIVpZvRLo="; - }; - - dontBuild = false; - - nativeBuildInputs = [ - cargo - rustc - rustPlatform.cargoSetupHook - rustPlatform.bindgenHook - ]; - - disallowedReferences = [ - rustc.unwrapped - ]; - - preInstall = '' - export CARGO_HOME="$PWD/../.cargo/" - ''; - - postInstall = '' - mv -v $GEM_HOME/gems/${attrs.gemName}-${attrs.version}/lib/{glfm_markdown/glfm_markdown.so,} - find $out -type f -name .rustc_info.json -delete - ''; - }; - - static_holmes = attrs: { - nativeBuildInputs = [ - icu - which - zlib.dev - ]; - }; - }; - groups = [ - "default" - "unicorn" - "ed25519" - "metrics" - "development" - "puma" - "test" - "kerberos" - "opentelemetry" - ]; - # N.B. omniauth_oauth2_generic and apollo_upload_server both provide a - # `console` executable. - ignoreCollisions = true; - - extraConfigPaths = [ - "${src}/vendor" - "${src}/gems" - ]; - }; - - assets = stdenv.mkDerivation { - pname = "gitlab-assets"; - inherit version src; - - yarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = data.yarn_hash; - }; - - nativeBuildInputs = [ - rubyEnv.wrappedRuby - rubyEnv.bundler - nodejs_20 - git - cacert - yarnConfigHook - ]; - - patches = [ - # Since version 12.6.0, the rake tasks need the location of git, - # so we have to apply the location patches here too. - ./remove-hardcoded-locations.patch - - # Gitlab edited the default database config since [1] and the - # installer now complains about valid keywords only being "main", "ci" and "embedded". - # - # [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028 - ./Remove-unsupported-database-names.patch - ]; - # One of the patches uses this variable - if it's unset, execution - # of rake tasks fails. - GITLAB_LOG_PATH = "log"; - FOSS_ONLY = !gitlabEnterprise; - - SKIP_YARN_INSTALL = 1; - NODE_OPTIONS = "--max-old-space-size=8192"; - - postConfigure = '' - # Some rake tasks try to run yarn automatically, which won't work - rm lib/tasks/yarn.rake - - # The rake tasks won't run without a basic configuration in place - mv config/database.yml.postgresql config/database.yml - mv config/gitlab.yml.example config/gitlab.yml - - patchShebangs scripts/frontend/ - ''; - - buildPhase = '' - runHook preBuild - - # TODO: Try to yarn install without --ignore-scripts - # Needed for the js dependency pinia to work - pushd node_modules/vue-demi - yarn run postinstall - popd - - bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production SKIP_YARN_INSTALL=true - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mv public/assets $out - - runHook postInstall - ''; - }; -in -stdenv.mkDerivation { - name = "gitlab${lib.optionalString gitlabEnterprise "-ee"}-${version}"; - - inherit src; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - rubyEnv - rubyEnv.wrappedRuby - rubyEnv.bundler - tzdata - git - nettools - ]; - - patches = [ - # Change hardcoded paths to the NixOS equivalent - ./remove-hardcoded-locations.patch - ]; - - postPatch = '' - ${lib.optionalString (!gitlabEnterprise) '' - # Remove all proprietary components - rm -rf ee - sed -i 's/-ee//' ./VERSION - ''} - - # For reasons I don't understand "bundle exec" ignores the - # RAILS_ENV causing tests to be executed that fail because we're - # not installing development and test gems above. Deleting the - # tests works though. - rm lib/tasks/test.rake - - rm config/initializers/gitlab_shell_secret_token.rb - - sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake - sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb - - mv config/puma.rb.example config/puma.rb - # Always require lib-files and application.rb through their store - # path, not their relative state directory path. This gets rid of - # warnings and means we don't have to link back to lib from the - # state directory. - ${replace}/bin/replace-literal -f -r -e '../../lib' "$out/share/gitlab/lib" config - ${replace}/bin/replace-literal -f -r -e '../lib' "$out/share/gitlab/lib" config - ${replace}/bin/replace-literal -f -r -e "require_relative 'application'" "require_relative '$out/share/gitlab/config/application'" config - ${replace}/bin/replace-literal -f -r -e 'require_relative "/home/git/gitlab/lib/gitlab/puma/error_handler"' "require_relative '$out/share/gitlab/lib/gitlab/puma/error_handler'" config - ''; - - buildPhase = '' - rm -f config/secrets.yml - mv config config.dist - rm -r tmp - ''; - - installPhase = '' - mkdir -p $out/share - cp -r . $out/share/gitlab - ln -sf ${assets} $out/share/gitlab/public/assets - rm -rf $out/share/gitlab/log - ln -sf /run/gitlab/log $out/share/gitlab/log - ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads - ln -sf /run/gitlab/config $out/share/gitlab/config - ln -sf /run/gitlab/tmp $out/share/gitlab/tmp - - # rake tasks to mitigate CVE-2017-0882 - # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/ - cp ${./reset_token.rake} $out/share/gitlab/lib/tasks/reset_token.rake - - # manually patch the shebang line in generate-loose-foreign-key - wrapProgram $out/share/gitlab/scripts/decomposition/generate-loose-foreign-key --set ENABLE_SPRING 0 --add-flags 'runner -e test' - ''; - - passthru = { - inherit rubyEnv assets; - ruby = rubyEnv.wrappedRuby; - GITALY_SERVER_VERSION = data.passthru.GITALY_SERVER_VERSION; - GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION; - GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION; - GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION; - gitlabEnv.FOSS_ONLY = lib.boolToString (!gitlabEnterprise); - tests = { - nixos-test-passes = nixosTests.gitlab; - }; - }; - - meta = - with lib; - { - homepage = "http://www.gitlab.com/"; - platforms = platforms.linux; - maintainers = teams.gitlab.members; - } - // ( - if gitlabEnterprise then - { - license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE - description = "GitLab Enterprise Edition"; - } - else - { - license = licenses.mit; - description = "GitLab Community Edition"; - longDescription = "GitLab Community Edition (CE) is an open source end-to-end software development platform with built-in version control, issue tracking, code review, CI/CD, and more. Self-host GitLab CE on your own servers, in a container, or on a cloud provider."; - } - ); -} diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix deleted file mode 100644 index 62713f7b9144..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - fetchFromGitLab, - git, - buildGoModule, -}: -let - data = lib.importJSON ../data.json; -in -buildGoModule rec { - pname = "gitlab-workhorse"; - - version = "17.10.1"; - - # nixpkgs-update: no auto update - src = fetchFromGitLab { - owner = data.owner; - repo = data.repo; - rev = data.rev; - sha256 = data.repo_hash; - }; - - sourceRoot = "${src.name}/workhorse"; - - vendorHash = "sha256-b8HLad4oK5x7uzlr1SQAZt20+OhB3iswhpIQnk4VF/o="; - buildInputs = [ git ]; - ldflags = [ "-X main.Version=${version}" ]; - doCheck = false; - prodyVendor = true; - - meta = with lib; { - homepage = "http://www.gitlab.com/"; - platforms = platforms.linux; - maintainers = teams.gitlab.members; - license = licenses.mit; - }; -} diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile deleted file mode 100644 index 3ba591d2b175..000000000000 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ /dev/null @@ -1,758 +0,0 @@ -# frozen_string_literal: true - -def next? - File.basename(__FILE__) == "Gemfile.next" -end - -source 'https://rubygems.org' - -if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this verification is still experimental - $LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__)) - require 'bundler-checksum' - BundlerChecksum.patch! -end - -# Please see https://docs.gitlab.com/ee/development/feature_categorization/#gemfile -ignore_feature_category = Module.new do - def gem(*arguments, feature_category: nil, **keyword_arguments) # rubocop:disable Lint/UnusedMethodArgument -- Ignoring feature_category intentionally - super(*arguments, **keyword_arguments) - end -end - -extend ignore_feature_category - -gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false, feature_category: :shared - -# NOTE: When incrementing the major or minor version here, also increment activerecord_version -# in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve -# https://gitlab.com/gitlab-org/gitlab/-/issues/375713 -# -# See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails - -if next? - gem 'rails', '~> 7.1.5.1', feature_category: :shared -else - gem 'rails', '~> 7.0.8.7', feature_category: :shared -end - -gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared -# This can be dropped after upgrading to Rails 7.2: https://github.com/rails/rails/pull/49674 -gem 'mutex_m', '~> 0.3', feature_category: :shared -# Need by Rails -gem 'drb', '~> 2.2', feature_category: :shared - -gem 'bootsnap', '~> 1.18.3', require: false, feature_category: :shared - -# Avoid the precompiled native gems because Omnibus needs to build this to ensure -# LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730 -gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared - -gem 'openssl', '~> 3.0', feature_category: :shared - -gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store', feature_category: :shared - -# GitLab Monorepo Gems -group :monorepo do - gem 'gitlab-utils', path: 'gems/gitlab-utils', feature_category: :shared -end - -gem 'gitlab-backup-cli', path: 'gems/gitlab-backup-cli', require: 'gitlab/backup/cli', feature_category: :backup_restore - -gem 'gitlab-secret_detection', '< 1.0', feature_category: :secret_detection - -# Responders respond_to and respond_with -gem 'responders', '~> 3.0', feature_category: :shared - -gem 'sprockets', '~> 3.7.0', feature_category: :shared -gem 'sprockets-rails', '~> 3.5.1', feature_category: :shared - -gem 'view_component', '~> 3.21.0', feature_category: :shared - -# Supported DBs -gem 'pg', '~> 1.5.6', feature_category: :database - -gem 'rugged', '~> 1.6', feature_category: :gitaly - -gem 'faraday', '~> 2', feature_category: :shared -gem 'faraday-retry', '~> 2', feature_category: :shared -# Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef. -gem 'logger', '~> 1.6.0', feature_category: :shared - -gem 'marginalia', '~> 1.11.1', feature_category: :database - -# Authorization -gem 'declarative_policy', '~> 1.1.0', feature_category: :shared - -# For source code paths mapping -gem 'coverband', '6.1.4', require: false, feature_category: :shared - -# Authentication libraries -gem 'devise', '~> 4.9.3', feature_category: :system_access -gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable', - feature_category: :system_access -gem 'bcrypt', '~> 3.1', '>= 3.1.14', feature_category: :system_access -gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access -gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access -gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access -gem 'rexml', '~> 3.4.0', feature_category: :shared -gem 'ruby-saml', '~> 1.18.0', path: 'vendor/gems/ruby-saml', feature_category: :system_access -gem 'omniauth', '~> 2.1.0', feature_category: :system_access -gem 'omniauth-auth0', '~> 3.1', feature_category: :system_access -gem 'omniauth-azure-activedirectory-v2', '~> 2.0', feature_category: :system_access -gem 'omniauth-alicloud', '~> 3.0.0', feature_category: :system_access -gem 'omniauth-github', '2.0.1', feature_category: :system_access -# See vendor/gems/omniauth-gitlab/README.md -gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab', feature_category: :system_access -gem 'omniauth-google-oauth2', '~> 1.1', feature_category: :system_access -gem 'omniauth-oauth2-generic', '~> 0.2.2', feature_category: :system_access -gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access -gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth', feature_category: :system_access -# See vendor/gems/omniauth_crowd/README.md -gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd', feature_category: :system_access -gem 'omniauth_openid_connect', '~> 0.8.0', feature_category: :system_access -# Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. -# See https://docs.gitlab.com/ee/development/emails.html#rationale. -gem 'openid_connect', '~> 2.3.0', feature_category: :system_access -# See gem README.md -gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce', feature_category: :system_access -gem 'omniauth-atlassian-oauth2', '~> 0.2.0', feature_category: :system_access -gem 'rack-oauth2', '~> 2.2.1', feature_category: :system_access -gem 'jwt', '~> 2.9.3', feature_category: :system_access - -# Kerberos authentication. EE-only -gem 'gssapi', '~> 1.3.1', group: :kerberos, feature_category: :system_access -gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos, feature_category: :system_access - -# Spam and anti-bot protection -gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails', feature_category: :insider_threat -gem 'akismet', '~> 3.0', feature_category: :insider_threat -gem 'invisible_captcha', '~> 2.1.0', feature_category: :insider_threat - -# Two-factor authentication -gem 'devise-two-factor', '~> 4.1.1', feature_category: :system_access -gem 'rqrcode', '~> 2.2', feature_category: :system_access - -gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted', feature_category: :shared - -# GitLab Pages -gem 'validates_hostname', '~> 1.0.13', feature_category: :pages -gem 'rubyzip', '~> 2.3.2', require: 'zip', feature_category: :pages -# GitLab Pages letsencrypt support -gem 'acme-client', '~> 2.0.19', feature_category: :pages - -# Browser detection -gem 'browser', '~> 5.3.1', feature_category: :shared - -# OS detection for usage ping -gem 'ohai', '~> 18.1', feature_category: :product_analytics - -# GPG -gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management - -# LDAP Auth -# GitLab fork with several improvements to original library. For full list of changes -# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap', feature_category: :system_access -gem 'net-ldap', '~> 0.17.1', feature_category: :system_access - -# API -gem 'grape', '~> 2.0.0', feature_category: :api -gem 'grape-entity', '~> 1.0.1', feature_category: :api -gem 'grape-swagger', '~> 2.1.2', group: [:development, :test], feature_category: :api -gem 'grape-swagger-entity', '~> 0.5.5', group: [:development, :test], feature_category: :api -gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api -gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared - -# GraphQL API -gem 'graphql', '2.4.11', path: 'vendor/gems/graphql', feature_category: :api -gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api -gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api -gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) - -# Cells -gem 'gitlab-topology-service-client', '~> 0.1', - path: 'vendor/gems/gitlab-topology-service-client', - feature_category: :cell - -# Duo Workflow -gem 'gitlab-duo-workflow-service-client', '~> 0.1', - path: 'vendor/gems/gitlab-duo-workflow-service-client', - feature_category: :duo_workflow - -# Generate Fake data -gem 'ffaker', '~> 2.24', feature_category: :shared - -gem 'hashie', '~> 5.0.0', feature_category: :shared - -# Pagination -gem 'kaminari', '~> 1.2.2', feature_category: :shared - -# HAML -gem 'hamlit', '~> 2.15.0', feature_category: :shared - -# Files attachments -gem 'carrierwave', '~> 1.3', feature_category: :shared -gem 'mini_magick', '~> 4.12', feature_category: :shared - -# for backups -gem 'fog-aws', '~> 3.26', feature_category: :shared -# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. -# Also see config/initializers/fog_core_patch.rb. -gem 'fog-core', '= 2.1.0', feature_category: :shared -gem 'fog-google', '~> 1.24.1', require: 'fog/google', feature_category: :shared -gem 'fog-local', '~> 0.8', feature_category: :shared -# NOTE: -# the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches -# the rest-client gem to drop the Content-Length header field for chunked transfers, -# which may have knock-on effects on other features using `RestClient`. -# We may want to update this dependency if this is ever addressed upstream, e.g. via -# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 -gem 'fog-aliyun', '~> 0.4', feature_category: :shared -gem 'gitlab-fog-azure-rm', '~> 2.2.0', require: 'fog/azurerm', feature_category: :shared - -# for Google storage - -# Need this specific version of google-apis-storage_v1 so that fog-google will utilize the updated list_objects with -# match_glob support in google-apis-core 0.11.1. Because of this we also have to bump google-cloud-storage to 1.45.0. -gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared -gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared -# We need >= 0.11.1 because that's when match_glob support is added to list_objects -gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1', feature_category: :shared -gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared -gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared -gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared -gem 'google-apis-cloudbilling_v1', '~> 0.22.0', feature_category: :shared -gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0', feature_category: :shared -gem 'google-apis-iam_v1', '~> 0.36.0', feature_category: :shared -gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared -gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared -gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared - -gem 'googleauth', '~> 1.8.1', feature_category: :shared -gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared -gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared - -# Seed data -gem 'seed-fu', '~> 2.3.7', feature_category: :shared - -# Search -gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search -gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search -gem 'elasticsearch-api', '7.17.11', feature_category: :global_search -gem 'aws-sdk-core', '~> 3.215.0', feature_category: :global_search -gem 'aws-sdk-cloudformation', '~> 1', feature_category: :global_search -gem 'aws-sdk-s3', '~> 1.177.0', feature_category: :global_search -gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search -gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search -# Used with Elasticsearch to support http keep-alive connections -gem 'typhoeus', '~> 1.4.0', feature_category: :global_search - -gem 'gitlab-active-context', path: 'gems/gitlab-active-context', require: 'active_context', - feature_category: :global_search - -# Markdown and HTML processing -gem 'html-pipeline', '~> 2.14.3', feature_category: :markdown -gem 'deckar01-task_list', '2.3.4', feature_category: :markdown -gem 'gitlab-markup', '~> 2.0.0', require: 'github/markup', feature_category: :markdown -gem 'commonmarker', '~> 0.23.10', feature_category: :markdown -gem 'kramdown', '~> 2.5.0', feature_category: :markdown -gem 'RedCloth', '~> 4.3.3', feature_category: :markdown -gem 'org-ruby', '~> 0.9.12', feature_category: :markdown -gem 'creole', '~> 0.5.0', feature_category: :markdown -gem 'wikicloth', '0.8.1', feature_category: :markdown -gem 'asciidoctor', '~> 2.0.18', feature_category: :markdown -gem 'asciidoctor-include-ext', '~> 0.4.0', require: false, feature_category: :markdown -gem 'asciidoctor-plantuml', '~> 0.0.16', feature_category: :markdown -gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdown -gem 'rouge', '~> 4.5.0', feature_category: :shared -gem 'truncato', '~> 0.7.13', feature_category: :team_planning -gem 'nokogiri', '~> 1.18', feature_category: :shared -gem 'gitlab-glfm-markdown', '~> 0.0.27', feature_category: :markdown -gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown -gem 'unicode-emoji', '~> 4.0', feature_category: :markdown - -# Calendar rendering -gem 'icalendar', '~> 2.10.1', feature_category: :team_planning - -# Diffs -gem 'diffy', '~> 3.4', feature_category: :shared -gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning - -# Application server -gem 'rack', '~> 2.2.9', feature_category: :shared -# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared - -group :puma do - gem 'puma', '= 6.5.0', require: false, feature_category: :shared - gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared -end - -# State machine -gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared - -# Background jobs -gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability -gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability -gem 'gitlab-sidekiq-fetcher', - path: 'vendor/gems/sidekiq-reliable-fetch', - require: 'sidekiq-reliable-fetch', - feature_category: :scalability - -# Cron Parser -gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration - -# HTTP requests -gem 'httparty', '~> 0.22.0', feature_category: :shared - -# Colored output to console -gem 'rainbow', '~> 3.0', feature_category: :shared - -# Progress bar -gem 'ruby-progressbar', '~> 1.10', feature_category: :shared - -# Linear-time regex library for untrusted regular expressions -gem 're2', '~> 2.15', feature_category: :shared - -# Misc - -gem 'semver_dialects', '~> 3.6', feature_category: :software_composition_analysis -gem 'version_sorter', '~> 2.3', feature_category: :shared -gem 'csv_builder', path: 'gems/csv_builder', feature_category: :shared - -# Export Ruby Regex to Javascript -gem 'js_regex', '~> 3.8', feature_category: :shared - -# User agent parsing -gem 'device_detector', feature_category: :shared - -# Redis -gem 'redis', '~> 5.4.0', feature_category: :redis -gem 'redis-clustering', '~> 5.4.0', feature_category: :redis -gem 'connection_pool', '~> 2.4', feature_category: :shared - -# Redis session store -gem 'redis-actionpack', '~> 5.5.0', feature_category: :redis - -# Discord integration -gem 'discordrb-webhooks', '~> 3.5', require: false, feature_category: :integrations - -# Jira integration -gem 'jira-ruby', '~> 2.3.0', feature_category: :integrations -gem 'atlassian-jwt', '~> 0.2.1', feature_category: :integrations - -# Slack integration -gem 'slack-messenger', '~> 2.3.5', feature_category: :integrations - -# FogBugz integration -gem 'ruby-fogbugz', '~> 0.3.0', feature_category: :importers - -# Kubernetes integration -gem 'kubeclient', '~> 4.11.0', feature_category: :shared - -# AI -gem 'circuitbox', '2.0.0', feature_category: :ai_abstraction_layer - -# Sanitize user input -gem 'sanitize', '~> 6.0.2', feature_category: :shared -gem 'babosa', '~> 2.0', feature_category: :shared - -# Sanitizes SVG input -gem 'loofah', '~> 2.24.0', feature_category: :shared - -# Used to provide license templates -gem 'licensee', '~> 9.16', feature_category: :shared - -# Detect and convert string character encoding -gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared - -# Detect mime content type from content -gem 'ruby-magic', '~> 0.6', feature_category: :shared - -# Faster blank -gem 'fast_blank', '~> 1.0.1', feature_category: :shared - -# Parse time & duration -gem 'gitlab-chronic', '~> 0.10.5', feature_category: :shared -gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared - -gem 'rack-proxy', '~> 0.7.7', feature_category: :shared - -gem 'cssbundling-rails', '1.4.2', feature_category: :shared -gem 'terser', '1.0.2', feature_category: :shared - -gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client', feature_category: :database -gem 'addressable', '~> 2.8', feature_category: :shared -gem 'gon', '~> 6.4.0', feature_category: :shared -gem 'request_store', '~> 1.7.0', feature_category: :shared -gem 'base32', '~> 0.3.0', feature_category: :shared -gem 'gitlab-license', '~> 2.6', feature_category: :shared - -# Protect against bruteforcing -gem 'rack-attack', '~> 6.7.0', feature_category: :shared - -# Sentry integration -gem 'sentry-ruby', '~> 5.22.0', feature_category: :observability -gem 'sentry-rails', '~> 5.22.0', feature_category: :observability -gem 'sentry-sidekiq', '~> 5.22.0', feature_category: :observability - -# PostgreSQL query parsing -# -gem 'pg_query', '~> 6.0.0', feature_category: :database - -gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared -gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared - -gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications -gem 'gitlab-labkit', '~> 0.37.0', feature_category: :shared -gem 'thrift', '>= 0.16.0', feature_category: :shared - -# I18n -gem 'rails-i18n', '~> 7.0', '>= 7.0.9', feature_category: :internationalization -gem 'gettext_i18n_rails', '~> 1.13.0', feature_category: :internationalization -gem 'gettext', '~> 3.5', '>= 3.5.1', - require: false, - group: [:development, :test], - feature_category: :internationalization - -gem 'batch-loader', '~> 2.0.5', feature_category: :shared - -gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared - -# Perf bar -gem 'peek', '~> 1.1', feature_category: :shared - -# Google Cloud Profiler support -gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false, - feature_category: :shared - -# Snowplow events trackin -gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics - -# Metrics -gem 'webrick', '~> 1.8.1', require: false, feature_category: :shared -gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_category: :shared - -# Event-driven reactor for Ruby -# Required manually in config/initializers/require_async_gem -gem 'async', '~> 2.23.0', require: false, feature_category: :shared - -# Security report schemas used to validate CI job artifacts of security jobs -gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_category: :vulnerability_management - -# OpenTelemetry -group :opentelemetry do - # Core OpenTelemetry gems - gem 'opentelemetry-sdk', feature_category: :observability - gem 'opentelemetry-exporter-otlp', feature_category: :observability - - # OpenTelemetry gems selected from full set in `opentelemetry-instrumentation-all` metagem - gem 'opentelemetry-instrumentation-active_support', feature_category: :observability - gem 'opentelemetry-instrumentation-action_pack', feature_category: :observability - gem 'opentelemetry-instrumentation-active_job', feature_category: :observability - gem 'opentelemetry-instrumentation-active_record', feature_category: :observability - gem 'opentelemetry-instrumentation-action_view', feature_category: :observability - gem 'opentelemetry-instrumentation-aws_sdk', feature_category: :observability - gem 'opentelemetry-instrumentation-http', feature_category: :observability - gem 'opentelemetry-instrumentation-concurrent_ruby', feature_category: :observability - gem 'opentelemetry-instrumentation-ethon', feature_category: :observability - gem 'opentelemetry-instrumentation-excon', feature_category: :observability - gem 'opentelemetry-instrumentation-faraday', feature_category: :observability - gem 'opentelemetry-instrumentation-grape', feature_category: :observability - gem 'opentelemetry-instrumentation-graphql', feature_category: :observability - gem 'opentelemetry-instrumentation-http_client', feature_category: :observability - gem 'opentelemetry-instrumentation-net_http', feature_category: :observability - gem 'opentelemetry-instrumentation-pg', feature_category: :observability - gem 'opentelemetry-instrumentation-rack', feature_category: :observability - gem 'opentelemetry-instrumentation-rails', feature_category: :observability - gem 'opentelemetry-instrumentation-rake', feature_category: :observability - gem 'opentelemetry-instrumentation-redis', feature_category: :observability - gem 'opentelemetry-instrumentation-sidekiq', feature_category: :observability -end - -gem 'warning', '~> 1.5.0', feature_category: :shared - -group :development do - gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling - gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared - - gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared - gem 'lookbook', '~> 2.3', feature_category: :shared - - # Better errors handler - gem 'better_errors', '~> 2.10.1', feature_category: :shared - - gem 'sprite-factory', '~> 1.7', feature_category: :shared - - gem 'listen', '~> 3.7', feature_category: :shared - - gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling - - gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling - - gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling - - gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling - - # Used by - # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake` - # * `lib/tasks/gitlab/db/migration_squash.rake` - gem 'git', '~> 1.8', feature_category: :shared -end - -group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared - gem 'bullet', '~> 7.2.0', feature_category: :shared - gem 'parser', '= 3.3.7.1', feature_category: :shared - gem 'pry-byebug', feature_category: :shared - gem 'pry-rails', '~> 0.3.9', feature_category: :shared - gem 'pry-shell', '~> 0.6.4', feature_category: :shared - - gem 'awesome_print', require: false, feature_category: :shared - - gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database - gem 'rspec-rails', '~> 7.0.0', feature_category: :shared - gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0', feature_category: :shared - - gem 'spring', '~> 4.1.0', feature_category: :shared - gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared - - gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false - gem 'haml_lint', '~> 0.58', feature_category: :tooling - - # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared - gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared - - # Profiling data from CI/CD pipelines - gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling - - gem 'knapsack', '~> 4.0.0', feature_category: :tooling - gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling - gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling - - gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared - - gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared - - gem 'parallel', '~> 1.19', require: false, feature_category: :shared - - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared - - gem 'pact', '~> 1.64', feature_category: :shared - - # For now we only use vite in development / test, and not for production builds - # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 - gem 'vite_rails', '~> 3.0.17', feature_category: :shared - gem 'vite_ruby', '~> 3.9.0', feature_category: :shared - - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling -end - -group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.8.0', require: false, feature_category: :tooling -end - -group :development, :test, :coverage do - gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling - gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling - gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling - gem 'undercover', '~> 0.6.0', require: false, feature_category: :tooling -end - -# Gems required in omnibus-gitlab pipeline -group :development, :test, :omnibus do - gem 'license_finder', '~> 7.0', require: false, feature_category: :shared -end - -# Gems required in various pipelines -group :development, :test, :monorepo do - gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared - gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling -end - -group :test do - gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling - gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling - gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling - gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling - gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling - - gem 'capybara', '~> 3.40', feature_category: :test_platform - gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform - gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform - - gem 'graphlyte', '~> 1.0.0', feature_category: :shared - - gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared - gem 'email_spec', '~> 2.3.0', feature_category: :shared - gem 'webmock', '~> 3.25.0', feature_category: :shared - gem 'rails-controller-testing', feature_category: :shared - gem 'concurrent-ruby', '~> 1.1', feature_category: :shared - gem 'test-prof', '~> 1.4.0', feature_category: :tooling - gem 'rspec_junit_formatter', feature_category: :shared - gem 'guard-rspec', feature_category: :shared - gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared - - gem 'gitlab_quality-test_tooling', '~> 2.8.0', require: false, feature_category: :tooling -end - -gem 'octokit', '~> 9.0', feature_category: :importers -# Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688 -gem 'faraday-multipart', '~> 1.0', feature_category: :importers - -gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared - -gem 'email_reply_trimmer', '~> 0.1', feature_category: :shared -gem 'html2text', feature_category: :shared - -gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared -gem 'rbtrace', '~> 0.4', require: false, feature_category: :shared -gem 'memory_profiler', '~> 1.0', require: false, feature_category: :shared -gem 'activerecord-explain-analyze', '~> 0.1', require: false, feature_category: :shared - -# OAuth -gem 'oauth2', '~> 2.0', feature_category: :system_access - -# Health check -gem 'health_check', '~> 3.0', feature_category: :shared - -# System information -gem 'vmstat', '~> 2.3.0', feature_category: :shared -gem 'sys-filesystem', '~> 1.4.3', feature_category: :shared - -# NTP client -gem 'net-ntp', feature_category: :shared - -# SSH keys support -gem 'ssh_data', '~> 1.3', feature_category: :shared - -# Spamcheck GRPC protocol definitions -gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat - -# Gitaly GRPC protocol definitions -gem 'gitaly', '~> 17.8.0', feature_category: :gitaly - -# KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 17.9.0.pre.rc2', feature_category: :deployment_management - -# Lock the version before issues below are resolved: -# https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 -# Or we can upgrade to a more recent version as long as we can confirm -# that it doesn't have the same issues. -gem 'grpc', '= 1.63.0', feature_category: :shared - -gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared - -gem 'toml-rb', '~> 2.2.0', feature_category: :shared - -# Feature toggles -gem 'flipper', '~> 0.28.0', feature_category: :shared -gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared -gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared -gem 'unleash', '~> 3.2.2', feature_category: :shared -gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared - -# Structured logging -gem 'lograge', '~> 0.5', feature_category: :shared -gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api - -# DNS Lookup -gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared - -# Countries list -gem 'countries', '~> 4.0.0', feature_category: :shared - -gem 'retriable', '~> 3.1.2', feature_category: :shared - -# LRU cache -gem 'lru_redux', feature_category: :shared - -# Locked as long as quoted-printable encoding issues are not resolved -# Monkey-patched in `config/initializers/mail_encoding_patch.rb` -# See https://gitlab.com/gitlab-org/gitlab/issues/197386 -# -# `config/initializers/mail_starttls_patch.rb` has also been patched to -# fix STARTTLS handling until https://github.com/mikel/mail/pull/1536 is -# released. -gem 'mail', '= 2.8.1', feature_category: :shared -gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false, feature_category: :shared - -gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer', feature_category: :shared - -# File encryption -gem 'lockbox', '~> 1.3.0', feature_category: :shared - -# Email validation -gem 'valid_email', '~> 0.1', feature_category: :shared - -# JSON -gem 'jsonb_accessor', '~> 1.4', feature_category: :shared -gem 'json', '~> 2.10.0', feature_category: :shared -gem 'json_schemer', '~> 2.3.0', feature_category: :shared -gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared -gem 'oj-introspect', '~> 0.8', feature_category: :shared -gem 'multi_json', '~> 1.14.1', feature_category: :shared -gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared - -gem 'webauthn', '~> 3.0', feature_category: :shared - -# IPAddress utilities -gem 'ipaddress', '~> 0.8.3', feature_category: :shared - -gem 'parslet', '~> 1.8', feature_category: :shared - -gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff', feature_category: :shared - -gem 'ed25519', '~> 1.3.0', feature_category: :shared - -# Error Tracking OpenAPI client -# See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature -gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api', feature_category: :shared - -# Vulnerability advisories -gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software_composition_analysis - -# Work with RPM packages -gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry - -# Remote Development -gem 'devfile', '~> 0.1.1', feature_category: :workspaces - -# Apple plist parsing -gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops -gem 'app_store_connect', feature_category: :mobile_devops - -# For phone verification -gem 'telesignenterprise', '~> 2.2', feature_category: :insider_threat - -# BufferedIO patch -# Updating this version will require updating scripts/allowed_warnings.txt -gem 'net-protocol', '~> 0.1.3', feature_category: :shared -gem "nkf", "~> 0.2.0", feature_category: :shared - -# This is locked to 0.6.0 because we patch Net::HTTP#connect in -# gems/gitlab-http/lib/net_http/connect_patch.rb. -# It can be upgraded but care must be taken to preserve the patch. -gem 'net-http', '= 0.6.0', feature_category: :shared -# This is locked to 0.13.0 because the default parser changes from RFC2396 to RFC3986, -# which can be removed after Rails 7.2 upgrade -# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173142#note_2277952450 -gem 'uri', '= 0.13.2', feature_category: :shared - -gem 'duo_api', '~> 1.3', feature_category: :system_access - -gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation - -gem 'paper_trail', '~> 15.0', feature_category: :shared - -gem "i18n_data", "~> 0.13.1", feature_category: :system_access - -gem "gitlab-cloud-connector", "~> 1.0.0", require: 'gitlab/cloud_connector', feature_category: :cloud_connector diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock deleted file mode 100644 index 5e2151533927..000000000000 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ /dev/null @@ -1,2377 +0,0 @@ -PATH - remote: gems/activerecord-gitlab - specs: - activerecord-gitlab (0.2.0) - activerecord (>= 7) - -PATH - remote: gems/click_house-client - specs: - click_house-client (0.1.0) - activesupport (< 8) - addressable (~> 2.8) - json (~> 2.7) - -PATH - remote: gems/csv_builder - specs: - csv_builder (0.1.0) - -PATH - remote: gems/error_tracking_open_api - specs: - error_tracking_open_api (1.0.0) - typhoeus (~> 1.0, >= 1.0.1) - -PATH - remote: gems/gitlab-active-context - specs: - gitlab-active-context (0.0.1) - activerecord - activesupport - connection_pool - elasticsearch - opensearch-ruby - pg - zeitwerk - -PATH - remote: gems/gitlab-backup-cli - specs: - gitlab-backup-cli (0.0.1) - activerecord (>= 7) - activesupport (>= 7) - addressable (~> 2.8) - concurrent-ruby (~> 1.1) - faraday (~> 2) - google-cloud-storage_transfer (~> 1.2.0) - google-protobuf (~> 3.25, >= 3.25.3) - googleauth (~> 1.8.1) - grpc (= 1.63.0) - json (~> 2.7) - jwt (~> 2.5) - logger (~> 1.5) - minitest (~> 5.11.0) - parallel (~> 1.19) - pg (~> 1.5.6) - rack (~> 2.2.9) - rainbow (~> 3.0) - rexml (~> 3.4.0) - thor (~> 1.3) - -PATH - remote: gems/gitlab-housekeeper - specs: - gitlab-housekeeper (0.1.0) - activesupport - awesome_print - httparty - rubocop - -PATH - remote: gems/gitlab-http - specs: - gitlab-http (0.1.0) - activesupport (~> 7) - concurrent-ruby (~> 1.2) - httparty (~> 0.21) - ipaddress (~> 0.8.3) - net-http (= 0.6.0) - railties (~> 7) - -PATH - remote: gems/gitlab-rspec_flaky - specs: - gitlab-rspec_flaky (0.1.0) - activesupport (>= 6.1, < 8) - rspec (~> 3.0) - -PATH - remote: gems/gitlab-rspec - specs: - gitlab-rspec (0.1.0) - activerecord (>= 6.1, < 8) - activesupport (>= 6.1, < 8) - rspec (~> 3.0) - -PATH - remote: gems/gitlab-safe_request_store - specs: - gitlab-safe_request_store (0.1.0) - rack (~> 2.2.8) - request_store - -PATH - remote: gems/gitlab-schema-validation - specs: - gitlab-schema-validation (0.1.0) - diffy - pg_query - -PATH - remote: gems/gitlab-utils - specs: - gitlab-utils (0.1.0) - actionview (>= 6.1.7.2) - activesupport (>= 6.1.7.2) - addressable (~> 2.8) - rake (~> 13.0) - -PATH - remote: gems/ipynbdiff - specs: - ipynbdiff (0.4.8) - diffy (~> 3.4) - oj (~> 3.16, >= 3.16.10) - -PATH - remote: vendor/gems/attr_encrypted - specs: - attr_encrypted (3.2.4) - encryptor (~> 3.0.0) - -PATH - remote: vendor/gems/bundler-checksum - specs: - bundler-checksum (0.1.0) - bundler - -PATH - remote: vendor/gems/cloud_profiler_agent - specs: - cloud_profiler_agent (0.0.1.pre) - google-cloud-profiler-v2 (~> 0.3) - google-protobuf (~> 3.25) - googleauth (>= 0.14) - stackprof (~> 0.2) - -PATH - remote: vendor/gems/devise-pbkdf2-encryptable - specs: - devise-pbkdf2-encryptable (0.0.0) - devise (~> 4.0) - devise-two-factor (~> 4.1.1) - -PATH - remote: vendor/gems/diff_match_patch - specs: - diff_match_patch (0.1.0) - -PATH - remote: vendor/gems/gitlab-duo-workflow-service-client - specs: - gitlab-duo-workflow-service-client (0.1) - grpc - -PATH - remote: vendor/gems/gitlab-topology-service-client - specs: - gitlab-topology-service-client (0.1) - google-protobuf (~> 3) - grpc - -PATH - remote: vendor/gems/graphql - specs: - graphql (2.4.11) - base64 - fiber-storage - logger - -PATH - remote: vendor/gems/mail-smtp_pool - specs: - mail-smtp_pool (0.1.0) - connection_pool (~> 2.0) - mail (~> 2.8) - -PATH - remote: vendor/gems/microsoft_graph_mailer - specs: - microsoft_graph_mailer (0.1.0) - mail (~> 2.7) - oauth2 (>= 1.4.4, < 3) - -PATH - remote: vendor/gems/omniauth-gitlab - specs: - omniauth-gitlab (4.0.0) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.8) - -PATH - remote: vendor/gems/omniauth-salesforce - specs: - omniauth-salesforce (1.0.5) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.0) - -PATH - remote: vendor/gems/omniauth_crowd - specs: - omniauth_crowd (2.4.0) - activesupport - nokogiri (>= 1.4.4) - omniauth (~> 2.0) - -PATH - remote: vendor/gems/ruby-saml - specs: - ruby-saml (1.18.0) - nokogiri (>= 1.13.10) - rexml - -PATH - remote: vendor/gems/sidekiq-7.2.4 - specs: - sidekiq (7.2.4) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.19.0) - -PATH - remote: vendor/gems/sidekiq-reliable-fetch - specs: - gitlab-sidekiq-fetcher (0.12.0) - json (>= 2.5) - sidekiq (~> 7.0) - -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.7) - base64 - nkf - rexml - RedCloth (4.3.4) - acme-client (2.0.20) - base64 (~> 0.2.0) - faraday (>= 1.0, < 3.0.0) - faraday-retry (>= 1.0, < 3.0.0) - actioncable (7.0.8.7) - actionpack (= 7.0.8.7) - activesupport (= 7.0.8.7) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.7) - actionpack (= 7.0.8.7) - activejob (= 7.0.8.7) - activerecord (= 7.0.8.7) - activestorage (= 7.0.8.7) - activesupport (= 7.0.8.7) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.0.8.7) - actionpack (= 7.0.8.7) - actionview (= 7.0.8.7) - activejob (= 7.0.8.7) - activesupport (= 7.0.8.7) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.7) - actionview (= 7.0.8.7) - activesupport (= 7.0.8.7) - rack (~> 2.0, >= 2.2.4) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.7) - actionpack (= 7.0.8.7) - activerecord (= 7.0.8.7) - activestorage (= 7.0.8.7) - activesupport (= 7.0.8.7) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) - actionview (7.0.8.7) - activesupport (= 7.0.8.7) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.7) - activesupport (= 7.0.8.7) - globalid (>= 0.3.6) - activemodel (7.0.8.7) - activesupport (= 7.0.8.7) - activerecord (7.0.8.7) - activemodel (= 7.0.8.7) - activesupport (= 7.0.8.7) - activerecord-explain-analyze (0.1.0) - activerecord (>= 4) - pg - activestorage (7.0.8.7) - actionpack (= 7.0.8.7) - activejob (= 7.0.8.7) - activerecord (= 7.0.8.7) - activesupport (= 7.0.8.7) - marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.7) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - aes_key_wrap (1.1.0) - akismet (3.0.0) - aliyun-sdk (0.8.0) - nokogiri (~> 1.6) - rest-client (~> 2.0) - amatch (0.4.1) - mize - tins (~> 1.0) - android_key_attestation (0.3.0) - apollo_upload_server (2.1.6) - actionpack (>= 6.1.6) - graphql (>= 1.8) - app_store_connect (0.38.0) - activesupport (>= 6.0.0) - jwt (>= 1.4) - zeitwerk (>= 2.6.7) - arr-pm (0.0.12) - asciidoctor (2.0.23) - asciidoctor-include-ext (0.4.0) - asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-kroki (0.10.0) - asciidoctor (~> 2.0) - asciidoctor-plantuml (0.0.16) - asciidoctor (>= 2.0.17, < 3.0.0) - ast (2.4.2) - async (2.23.0) - console (~> 1.29) - fiber-annotation - io-event (~> 1.9) - metrics (~> 0.12) - traces (~> 0.15) - atlassian-jwt (0.2.1) - jwt (~> 2.1) - attr_required (1.0.2) - awesome_print (1.9.2) - awrence (1.2.1) - aws-eventstream (1.3.0) - aws-partitions (1.1001.0) - aws-sdk-cloudformation (1.41.0) - aws-sdk-core (~> 3, >= 3.99.0) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.215.0) - aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.992.0) - aws-sigv4 (~> 1.9) - jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.76.0) - aws-sdk-core (~> 3, >= 3.188.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.177.0) - aws-sdk-core (~> 3, >= 3.210.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) - aws-eventstream (~> 1, >= 1.0.2) - axe-core-api (4.10.2) - dumb_delegator - ostruct - virtus - axe-core-rspec (4.10.2) - axe-core-api (= 4.10.2) - dumb_delegator - ostruct - virtus - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - babosa (2.0.0) - backport (1.2.0) - base32 (0.3.4) - base64 (0.2.0) - batch-loader (2.0.5) - bcrypt (3.1.20) - benchmark (0.2.0) - benchmark-ips (2.14.0) - benchmark-malloc (0.2.0) - benchmark-memory (0.2.0) - memory_profiler (~> 1) - benchmark-perf (0.6.0) - benchmark-trend (0.4.0) - better_errors (2.10.1) - erubi (>= 1.0.0) - rack (>= 0.9.0) - rouge (>= 1.0.0) - bigdecimal (3.1.7) - bindata (2.4.11) - binding_of_caller (1.0.0) - debug_inspector (>= 0.0.1) - bootsnap (1.18.4) - msgpack (~> 1.2) - browser (5.3.1) - builder (3.2.4) - bullet (7.2.0) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.11) - byebug (11.1.3) - capybara (3.40.0) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.11) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - capybara-screenshot (1.0.26) - capybara (>= 1.0, < 4) - launchy - carrierwave (1.3.4) - activemodel (>= 4.0.0) - activesupport (>= 4.0.0) - mime-types (>= 1.16) - ssrf_filter (~> 1.0, < 1.1.0) - cbor (0.5.9.8) - character_set (1.8.0) - charlock_holmes (0.7.9) - chef-config (18.3.0) - addressable - chef-utils (= 18.3.0) - fuzzyurl - mixlib-config (>= 2.2.12, < 4.0) - mixlib-shellout (>= 2.0, < 4.0) - tomlrb (~> 1.2) - chef-utils (18.3.0) - concurrent-ruby - chunky_png (1.4.0) - circuitbox (2.0.0) - citrus (3.0.2) - claide (1.1.0) - claide-plugins (0.9.2) - cork - nap - open4 (~> 1.3) - coderay (1.1.3) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - colored2 (3.1.2) - commonmarker (0.23.11) - concurrent-ruby (1.2.3) - connection_pool (2.5.0) - console (1.29.2) - fiber-annotation - fiber-local (~> 1.1) - json - cork (0.3.0) - colored2 (~> 3.1) - cose (1.3.0) - cbor (~> 0.5.9) - openssl-signature_algorithm (~> 1.0) - countries (4.0.1) - i18n_data (~> 0.13.0) - sixarm_ruby_unaccent (~> 1.1) - coverband (6.1.4) - redis (>= 3.0) - crack (0.4.3) - safe_yaml (~> 1.0.0) - crass (1.0.6) - creole (0.5.0) - crystalball (0.7.0) - git - css_parser (1.14.0) - addressable - cssbundling-rails (1.4.2) - railties (>= 6.0.0) - csv (3.3.0) - cvss-suite (3.3.0) - danger (9.4.2) - claide (~> 1.0) - claide-plugins (>= 0.9.2) - colored2 (~> 3.1) - cork (~> 0.1) - faraday (>= 0.9.0, < 3.0) - faraday-http-cache (~> 2.0) - git (~> 1.13) - kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.0) - no_proxy_fix - octokit (>= 4.0) - terminal-table (>= 1, < 4) - danger-gitlab (8.0.0) - danger - gitlab (~> 4.2, >= 4.2.0) - database_cleaner-active_record (2.2.0) - activerecord (>= 5.a) - database_cleaner-core (~> 2.0.0) - database_cleaner-core (2.0.1) - date (3.4.1) - deb_version (1.0.2) - debug_inspector (1.1.0) - deckar01-task_list (2.3.4) - html-pipeline (~> 2.0) - declarative (0.0.20) - declarative_policy (1.1.0) - deprecation_toolkit (1.5.1) - activesupport (>= 4.2) - derailed_benchmarks (2.2.1) - base64 - benchmark-ips (~> 2) - bigdecimal - drb - get_process_mem - heapy (~> 0) - logger - memory_profiler (>= 0, < 2) - mini_histogram (>= 0.3.0) - mutex_m - ostruct - rack (>= 1) - rack-test - rake (> 10, < 14) - ruby-statistics (>= 4.0.1) - ruby2_keywords - thor (>= 0.19, < 2) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - devfile (0.1.1) - device_detector (1.0.0) - devise (4.9.4) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0) - responders - warden (~> 1.2.3) - devise-two-factor (4.1.1) - activesupport (~> 7.0) - attr_encrypted (>= 1.3, < 5, != 2) - devise (~> 4.0) - railties (~> 7.0) - rotp (~> 6.0) - diff-lcs (1.5.0) - diffy (3.4.3) - digest-crc (0.6.5) - rake (>= 12.0.0, < 14.0.0) - discordrb-webhooks (3.5.0) - rest-client (>= 2.0.0) - docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.8.1) - railties (>= 5) - doorkeeper-device_authorization_grant (1.0.3) - doorkeeper (~> 5.5) - doorkeeper-openid_connect (1.8.11) - doorkeeper (>= 5.5, < 5.9) - jwt (>= 2.5) - ostruct (>= 0.5) - dotenv (2.7.6) - drb (2.2.1) - dry-cli (1.0.0) - dry-core (1.0.1) - concurrent-ruby (~> 1.0) - zeitwerk (~> 2.6) - dry-inflector (1.0.0) - dry-logic (1.5.0) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) - zeitwerk (~> 2.6) - dry-types (1.7.1) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0) - dry-inflector (~> 1.0) - dry-logic (~> 1.4) - zeitwerk (~> 2.6) - dumb_delegator (1.0.0) - duo_api (1.4.0) - e2mmap (0.1.0) - ed25519 (1.3.0) - elasticsearch (7.17.11) - elasticsearch-api (= 7.17.11) - elasticsearch-transport (= 7.17.11) - elasticsearch-api (7.17.11) - multi_json - elasticsearch-model (7.2.1) - activesupport (> 3) - elasticsearch (~> 7) - hashie - elasticsearch-rails (7.2.1) - elasticsearch-transport (7.17.11) - base64 - faraday (>= 1, < 3) - multi_json - email_reply_trimmer (0.1.6) - email_spec (2.3.0) - htmlentities (~> 4.3.3) - launchy (>= 2.1, < 4.0) - mail (~> 2.7) - email_validator (2.2.4) - activemodel - encryptor (3.0.0) - erubi (1.12.0) - escape_utils (1.3.0) - et-orbi (1.2.11) - tzinfo - ethon (0.16.0) - ffi (>= 1.15.0) - excon (0.99.0) - execjs (2.8.1) - expgen (0.1.1) - parslet - expression_parser (0.9.0) - extended-markdown-filter (0.7.0) - html-pipeline (~> 2.9) - factory_bot (6.5.0) - activesupport (>= 5.0.0) - factory_bot_rails (6.4.4) - factory_bot (~> 6.5) - railties (>= 5.0.0) - faraday (2.12.2) - faraday-net_http (>= 2.0, < 3.5) - json - logger - faraday-follow_redirects (0.3.0) - faraday (>= 1, < 3) - faraday-http-cache (2.5.0) - faraday (>= 0.8) - faraday-multipart (1.1.0) - multipart-post (~> 2.0) - faraday-net_http (3.1.0) - net-http - faraday-net_http_persistent (2.1.0) - faraday (~> 2.5) - net-http-persistent (~> 4.0) - faraday-retry (2.2.1) - faraday (~> 2.0) - faraday-typhoeus (1.1.0) - faraday (~> 2.0) - typhoeus (~> 1.4) - faraday_middleware-aws-sigv4 (1.0.1) - aws-sigv4 (~> 1.0) - faraday (>= 2.0, < 3) - fast_blank (1.0.1) - fast_gettext (2.3.0) - ffaker (2.24.0) - ffi (1.17.1) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) - rake - ffi-yajl (2.6.0) - libyajl2 (>= 1.2) - fiber-annotation (0.2.0) - fiber-local (1.1.0) - fiber-storage - fiber-storage (0.1.2) - find_a_port (1.0.1) - flipper (0.28.3) - concurrent-ruby (< 2) - flipper-active_record (0.28.3) - activerecord (>= 4.2, < 8) - flipper (~> 0.28.3) - flipper-active_support_cache_store (0.28.3) - activesupport (>= 4.2, < 8) - flipper (~> 0.28.3) - fog-aliyun (0.4.0) - addressable (~> 2.8.0) - aliyun-sdk (~> 0.8.0) - fog-core - fog-json - ipaddress (~> 0.8) - xml-simple (~> 1.1) - fog-aws (3.27.0) - base64 (~> 0.2.0) - fog-core (~> 2.1) - fog-json (~> 1.1) - fog-xml (~> 0.1) - fog-core (2.1.0) - builder - excon (~> 0.58) - formatador (~> 0.2) - mime-types - fog-google (1.24.1) - addressable (>= 2.7.0) - fog-core (< 2.5) - fog-json (~> 1.2) - fog-xml (~> 0.1.0) - google-apis-compute_v1 (~> 0.53) - google-apis-dns_v1 (~> 0.28) - google-apis-iamcredentials_v1 (~> 0.15) - google-apis-monitoring_v3 (~> 0.37) - google-apis-pubsub_v1 (~> 0.30) - google-apis-sqladmin_v1beta4 (~> 0.38) - google-apis-storage_v1 (>= 0.19, < 1) - google-cloud-env (>= 1.2, < 3.0) - fog-json (1.2.0) - fog-core - multi_json (~> 1.10) - fog-local (0.8.0) - fog-core (>= 1.27, < 3.0) - fog-xml (0.1.3) - fog-core - nokogiri (>= 1.5.11, < 2.0.0) - formatador (0.2.5) - forwardable (1.3.3) - fugit (1.11.1) - et-orbi (~> 1, >= 1.2.11) - raabro (~> 1.4) - fuzzyurl (0.9.0) - gapic-common (0.20.0) - faraday (>= 1.9, < 3.a) - faraday-retry (>= 1.0, < 3.a) - google-protobuf (~> 3.14) - googleapis-common-protos (>= 1.3.12, < 2.a) - googleapis-common-protos-types (>= 1.3.1, < 2.a) - googleauth (~> 1.0) - grpc (~> 1.36) - gdk-toogle (0.9.5) - haml - rails (>= 7.0.4.2) - gemoji (3.0.1) - get_process_mem (0.2.7) - ffi (~> 1.0) - gettext (3.5.1) - erubi - locale (>= 2.0.5) - prime - racc - text (>= 1.3.0) - gettext_i18n_rails (1.13.0) - fast_gettext (>= 0.9.0) - git (1.19.1) - addressable (~> 2.8) - rchardet (~> 1.8) - gitaly (17.8.4) - grpc (~> 1.0) - gitlab (4.19.0) - httparty (~> 0.20) - terminal-table (>= 1.5.1) - gitlab-chronic (0.10.6) - numerizer (~> 0.2) - gitlab-cloud-connector (1.0.0) - activesupport (~> 7.0) - jwt (~> 2.9.3) - gitlab-dangerfiles (4.8.1) - danger (>= 9.3.0) - danger-gitlab (>= 8.0.0) - rake (~> 13.0) - gitlab-experiment (0.9.1) - activesupport (>= 3.0) - request_store (>= 1.0) - gitlab-fog-azure-rm (2.2.0) - faraday (~> 2.0) - faraday-follow_redirects (~> 0.3.0) - faraday-net_http_persistent (~> 2.0) - fog-core (~> 2.1) - fog-json (~> 1.2) - mime-types - net-http-persistent (~> 4.0) - nokogiri (~> 1, >= 1.10.8) - gitlab-glfm-markdown (0.0.28) - rb_sys (~> 0.9.109) - gitlab-kas-grpc (17.9.1) - grpc (~> 1.0) - gitlab-labkit (0.37.0) - actionpack (>= 5.0.0, < 8.1.0) - activesupport (>= 5.0.0, < 8.1.0) - grpc (>= 1.62) - jaeger-client (~> 1.1.0) - opentracing (~> 0.4) - pg_query (>= 5.1.0, < 7.0) - redis (> 3.0.0, < 6.0.0) - gitlab-license (2.6.0) - gitlab-mail_room (0.0.27) - jwt (>= 2.0) - net-imap (>= 0.2.1) - oauth2 (>= 1.4.4, < 3) - redis (>= 5, < 6) - redis-namespace (>= 1.8.2) - gitlab-markup (2.0.0) - gitlab-net-dns (0.10.0) - gitlab-sdk (0.3.1) - activesupport (>= 5.2.0) - rake (~> 13.0) - snowplow-tracker (~> 0.8.0) - gitlab-secret_detection (0.19.0) - grpc (~> 1.63) - grpc-tools (~> 1.63) - grpc_reflection (~> 0.1) - parallel (~> 1) - re2 (~> 2.7) - toml-rb (~> 2.2) - gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1) - activesupport (>= 6, < 8) - json_schemer (~> 2.3.0) - gitlab-styles (13.1.0) - rubocop (= 1.71.1) - rubocop-capybara (~> 2.21.0) - rubocop-factory_bot (~> 2.26.1) - rubocop-graphql (~> 1.5.4) - rubocop-performance (~> 1.21.1) - rubocop-rails (~> 2.26.0) - rubocop-rspec (~> 3.0.4) - rubocop-rspec_rails (~> 2.30.0) - gitlab_chronic_duration (0.12.0) - numerizer (~> 0.2) - gitlab_omniauth-ldap (2.2.0) - net-ldap (~> 0.16) - omniauth (>= 1.3, < 3) - pyu-ruby-sasl (>= 0.0.3.3, < 0.1) - rubyntlm (~> 0.5) - gitlab_quality-test_tooling (2.8.0) - activesupport (>= 7.0, < 7.2) - amatch (~> 0.4.1) - fog-google (~> 1.24, >= 1.24.1) - gitlab (>= 4.19, < 6.0) - http (~> 5.0) - influxdb-client (~> 3.1) - nokogiri (~> 1.10) - parallel (>= 1, < 2) - rainbow (>= 3, < 4) - rspec-parameterized (~> 1.0.0) - table_print (= 1.5.7) - zeitwerk (>= 2, < 3) - globalid (1.1.0) - activesupport (>= 5.0) - gon (6.4.0) - actionpack (>= 3.0.20) - i18n (>= 0.7) - multi_json - request_store (>= 1.0) - google-apis-androidpublisher_v3 (0.34.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-cloudbilling_v1 (0.22.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-cloudresourcemanager_v1 (0.31.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-compute_v1 (0.57.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-container_v1 (0.43.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-container_v1beta1 (0.43.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-core (0.11.2) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.a) - rexml - webrick - google-apis-dns_v1 (0.36.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-iam_v1 (0.36.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-iamcredentials_v1 (0.15.0) - google-apis-core (>= 0.9.0, < 2.a) - google-apis-monitoring_v3 (0.54.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-pubsub_v1 (0.45.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-serviceusage_v1 (0.28.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-sqladmin_v1beta4 (0.41.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-storage_v1 (0.29.0) - google-apis-core (>= 0.11.0, < 2.a) - google-cloud-artifact_registry-v1 (0.11.0) - gapic-common (>= 0.20.0, < 2.a) - google-cloud-errors (~> 1.0) - google-cloud-location (>= 0.4, < 2.a) - grpc-google-iam-v1 (~> 1.1) - google-cloud-common (1.1.0) - google-protobuf (~> 3.14) - googleapis-common-protos-types (~> 1.2) - google-cloud-compute-v1 (2.6.0) - gapic-common (>= 0.20.0, < 2.a) - google-cloud-common (~> 1.0) - google-cloud-errors (~> 1.0) - google-cloud-core (1.7.0) - google-cloud-env (>= 1.0, < 3.a) - google-cloud-errors (~> 1.0) - google-cloud-env (2.1.1) - faraday (>= 1.0, < 3.a) - google-cloud-errors (1.3.0) - google-cloud-location (0.6.0) - gapic-common (>= 0.20.0, < 2.a) - google-cloud-errors (~> 1.0) - google-cloud-profiler-v2 (0.4.0) - gapic-common (>= 0.18.0, < 2.a) - google-cloud-errors (~> 1.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.29.0) - google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) - mini_mime (~> 1.0) - google-cloud-storage_transfer (1.2.0) - google-cloud-core (~> 1.6) - google-cloud-storage_transfer-v1 (>= 0.5, < 2.a) - google-cloud-storage_transfer-v1 (0.8.0) - gapic-common (>= 0.20.0, < 2.a) - google-cloud-errors (~> 1.0) - google-protobuf (3.25.6) - googleapis-common-protos (1.4.0) - google-protobuf (~> 3.14) - googleapis-common-protos-types (~> 1.2) - grpc (~> 1.27) - googleapis-common-protos-types (1.18.0) - google-protobuf (>= 3.18, < 5.a) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) - jwt (>= 1.4, < 3.0) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (>= 0.16, < 2.a) - gpgme (2.0.24) - mini_portile2 (~> 2.7) - grape (2.0.0) - activesupport (>= 5) - builder - dry-types (>= 1.1) - mustermann-grape (~> 1.0.0) - rack (>= 1.3.0) - rack-accept - grape-entity (1.0.1) - activesupport (>= 3.0.0) - multi_json (>= 1.3.2) - grape-path-helpers (2.0.1) - activesupport - grape (~> 2.0) - rake (> 12) - ruby2_keywords (~> 0.0.2) - grape-swagger (2.1.2) - grape (>= 1.7, < 3.0) - rack-test (~> 2) - grape-swagger-entity (0.5.5) - grape-entity (~> 1) - grape-swagger (~> 2) - grape_logging (1.8.4) - grape - rack - graphlient (0.8.0) - faraday (~> 2.0) - graphql-client - graphlyte (1.0.0) - graphql-client (0.23.0) - activesupport (>= 3.0) - graphql (>= 1.13.0) - graphql-docs (5.0.0) - commonmarker (~> 0.23, >= 0.23.6) - escape_utils (~> 1.2) - extended-markdown-filter (~> 0.4) - gemoji (~> 3.0) - graphql (~> 2.0) - html-pipeline (~> 2.14, >= 2.14.3) - sass-embedded (~> 1.58) - grpc (1.63.0) - google-protobuf (~> 3.25) - googleapis-common-protos-types (~> 1.0) - grpc-google-iam-v1 (1.5.0) - google-protobuf (~> 3.18) - googleapis-common-protos (~> 1.4) - grpc (~> 1.41) - grpc-tools (1.69.0) - grpc_reflection (0.1.1) - grpc - gssapi (1.3.1) - ffi (>= 1.0.1) - guard (2.16.2) - formatador (>= 0.2.4) - listen (>= 2.7, < 4.0) - lumberjack (>= 1.0.12, < 2.0) - nenv (~> 0.1) - notiffany (~> 0.0) - pry (>= 0.9.12) - shellany (~> 0.0) - thor (>= 0.18.1) - guard-compat (1.2.1) - guard-rspec (4.7.3) - guard (~> 2.1) - guard-compat (~> 1.1) - rspec (>= 2.99.0, < 4.0) - haml (5.2.2) - temple (>= 0.8.0) - tilt - haml_lint (0.61.0) - haml (>= 5.0) - parallel (~> 1.10) - rainbow - rubocop (>= 1.0) - sysexits (~> 1.1) - hamlit (2.15.0) - temple (>= 0.8.2) - thor - tilt - hana (1.3.7) - hashdiff (1.1.0) - hashie (5.0.0) - health_check (3.1.0) - railties (>= 5.0) - heapy (0.2.0) - thor - html-pipeline (2.14.3) - activesupport (>= 2) - nokogiri (>= 1.4) - html2text (0.2.0) - nokogiri (~> 1.6) - htmlbeautifier (1.4.2) - htmlentities (4.3.4) - http (5.1.1) - addressable (~> 2.8) - http-cookie (~> 1.0) - http-form_data (~> 2.2) - llhttp-ffi (~> 0.4.0) - http-accept (1.7.0) - http-cookie (1.0.5) - domain_name (~> 0.5) - http-form_data (2.3.0) - httparty (0.22.0) - csv - mini_mime (>= 1.0.0) - multi_xml (>= 0.5.2) - httpclient (2.8.3) - i18n (1.14.4) - concurrent-ruby (~> 1.0) - i18n_data (0.13.1) - icalendar (2.10.3) - ice_cube (~> 0.16) - ostruct - ice_cube (0.16.4) - ice_nine (0.11.2) - imagen (0.2.0) - parser (>= 2.5, != 2.5.1.1) - influxdb-client (3.2.0) - csv - invisible_captcha (2.1.0) - rails (>= 5.2) - io-event (1.9.0) - ipaddress (0.8.3) - jaeger-client (1.1.0) - opentracing (~> 0.3) - thrift - jaro_winkler (1.5.6) - jira-ruby (2.3.0) - activesupport - atlassian-jwt - multipart-post - oauth (~> 0.5, >= 0.5.0) - jmespath (1.6.2) - js_regex (3.8.0) - character_set (~> 1.4) - regexp_parser (~> 2.5) - regexp_property_values (~> 1.0) - json (2.10.1) - json-jwt (1.16.6) - activesupport (>= 4.2) - aes_key_wrap - base64 - bindata - faraday (~> 2.0) - faraday-follow_redirects - json_schemer (2.3.0) - bigdecimal - hana (~> 1.3) - regexp_parser (~> 2.0) - simpleidn (~> 0.2) - jsonb_accessor (1.4) - activerecord (>= 6.1) - activesupport (>= 6.1) - pg (>= 0.18.1) - jsonpath (1.1.2) - multi_json - jwt (2.9.3) - base64 - kaminari (1.2.2) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.2) - kaminari-activerecord (= 1.2.2) - kaminari-core (= 1.2.2) - kaminari-actionview (1.2.2) - actionview - kaminari-core (= 1.2.2) - kaminari-activerecord (1.2.2) - activerecord - kaminari-core (= 1.2.2) - kaminari-core (1.2.2) - knapsack (4.0.0) - rake - kramdown (2.5.1) - rexml (>= 3.3.9) - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - kubeclient (4.11.0) - http (>= 3.0, < 6.0) - jsonpath (~> 1.0) - recursive-open-struct (~> 1.1, >= 1.1.1) - rest-client (~> 2.0) - language_server-protocol (3.17.0.3) - launchy (2.5.2) - addressable (~> 2.8) - lefthook (1.11.2) - letter_opener (1.10.0) - launchy (>= 2.2, < 4) - letter_opener_web (3.0.0) - actionmailer (>= 6.1) - letter_opener (~> 1.9) - railties (>= 6.1) - rexml - libyajl2 (2.1.0) - license_finder (7.1.0) - bundler - rubyzip (>= 1, < 3) - thor (~> 1.2) - tomlrb (>= 1.3, < 2.1) - with_env (= 1.1.0) - xml-simple (~> 1.1.9) - licensee (9.17.1) - dotenv (>= 2, < 4) - octokit (>= 4.20, < 10.0) - reverse_markdown (>= 1, < 3) - rugged (>= 0.24, < 2.0) - thor (>= 0.19, < 2.0) - listen (3.7.1) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - llhttp-ffi (0.4.0) - ffi-compiler (~> 1.0) - rake (~> 13.0) - locale (2.1.4) - lockbox (1.3.0) - logger (1.6.6) - lograge (0.11.2) - actionpack (>= 4) - activesupport (>= 4) - railties (>= 4) - request_store (~> 1.0) - loofah (2.24.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - lookbook (2.3.4) - activemodel - css_parser - htmlbeautifier (~> 1.3) - htmlentities (~> 4.3.4) - marcel (~> 1.0) - railties (>= 5.0) - redcarpet (~> 3.5) - rouge (>= 3.26, < 5.0) - view_component (>= 2.0) - yard (~> 0.9) - zeitwerk (~> 2.5) - lru_redux (1.1.0) - lumberjack (1.2.7) - mail (2.8.1) - mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.0.2) - marginalia (1.11.1) - actionpack (>= 5.2) - activerecord (>= 5.2) - matrix (0.4.2) - memory_profiler (1.0.1) - method_source (1.0.0) - metrics (0.12.1) - mime-types (3.5.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2023.1003) - mini_histogram (0.3.1) - mini_magick (4.12.0) - mini_mime (1.1.2) - mini_portile2 (2.8.8) - minitest (5.11.3) - mixlib-cli (2.1.8) - mixlib-config (3.0.27) - tomlrb - mixlib-log (3.0.9) - mixlib-shellout (3.2.7) - chef-utils - mize (0.6.1) - msgpack (1.5.4) - multi_json (1.14.1) - multi_xml (0.6.0) - multipart-post (2.2.3) - murmurhash3 (0.1.7) - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - mustermann-grape (1.0.2) - mustermann (>= 1.0.0) - mutex_m (0.3.0) - nap (1.1.0) - nenv (0.3.0) - net-http (0.6.0) - uri - net-http-persistent (4.0.5) - connection_pool (~> 2.2) - net-imap (0.5.6) - date - net-protocol - net-ldap (0.17.1) - net-ntp (2.1.3) - net-pop (0.1.2) - net-protocol - net-protocol (0.1.3) - timeout - net-scp (4.0.0) - net-ssh (>= 2.6.5, < 8.0.0) - net-smtp (0.3.3) - net-protocol - net-ssh (7.3.0) - netrc (0.11.0) - nio4r (2.7.0) - nkf (0.2.0) - no_proxy_fix (0.1.2) - nokogiri (1.18.3) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - notiffany (0.1.3) - nenv (~> 0.1) - shellany (~> 0.0) - numerizer (0.2.0) - oauth (0.5.6) - oauth2 (2.0.9) - faraday (>= 0.17.3, < 3.0) - jwt (>= 1.0, < 3.0) - multi_xml (~> 0.5) - rack (>= 1.2, < 4) - snaky_hash (~> 2.0) - version_gem (~> 1.1) - octokit (9.2.0) - faraday (>= 1, < 3) - sawyer (~> 0.9) - ohai (18.1.18) - chef-config (>= 14.12, < 19) - chef-utils (>= 16.0, < 19) - ffi (~> 1.9) - ffi-yajl (~> 2.2) - ipaddress - mixlib-cli (>= 1.7.0) - mixlib-config (>= 2.0, < 4.0) - mixlib-log (>= 2.0.1, < 4.0) - mixlib-shellout (~> 3.2, >= 3.2.5) - plist (~> 3.1) - train-core - wmi-lite (~> 1.0) - oj (3.16.10) - bigdecimal (>= 3.0) - ostruct (>= 0.2) - oj-introspect (0.8.0) - oj (>= 3.16.10) - omniauth (2.1.2) - hashie (>= 3.4.6) - rack (>= 2.2.3) - rack-protection - omniauth-alicloud (3.0.0) - omniauth-oauth2 (~> 1.8) - omniauth-atlassian-oauth2 (0.2.0) - omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.5) - omniauth-auth0 (3.1.1) - omniauth (~> 2) - omniauth-oauth2 (~> 1) - omniauth-azure-activedirectory-v2 (2.0.0) - omniauth-oauth2 (~> 1.8) - omniauth-github (2.0.1) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.8) - omniauth-google-oauth2 (1.1.1) - jwt (>= 2.0) - oauth2 (~> 2.0.6) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.8.0) - omniauth-oauth2 (1.8.0) - oauth2 (>= 1.4, < 3) - omniauth (~> 2.0) - omniauth-oauth2-generic (0.2.8) - omniauth-oauth2 (~> 1.0) - rake - omniauth-saml (2.2.2) - omniauth (~> 2.1) - ruby-saml (~> 1.17) - omniauth-shibboleth-redux (2.0.0) - omniauth (>= 2.0.0) - omniauth_openid_connect (0.8.0) - omniauth (>= 1.9, < 3) - openid_connect (~> 2.2) - open4 (1.3.4) - openid_connect (2.3.1) - activemodel - attr_required (>= 1.0.0) - email_validator - faraday (~> 2.0) - faraday-follow_redirects - json-jwt (>= 1.16) - mail - rack-oauth2 (~> 2.2) - swd (~> 2.0) - tzinfo - validate_url - webfinger (~> 2.0) - opensearch-ruby (3.4.0) - faraday (>= 1.0, < 3) - multi_json (>= 1.0) - openssl (3.2.0) - openssl-signature_algorithm (1.3.0) - openssl (> 2.0) - opentelemetry-api (1.2.5) - opentelemetry-common (0.21.0) - opentelemetry-api (~> 1.0) - opentelemetry-exporter-otlp (0.29.1) - google-protobuf (>= 3.18) - googleapis-common-protos-types (~> 1.3) - opentelemetry-api (~> 1.1) - opentelemetry-common (~> 0.20) - opentelemetry-sdk (~> 1.2) - opentelemetry-semantic_conventions - opentelemetry-helpers-sql-obfuscation (0.1.0) - opentelemetry-common (~> 0.20) - opentelemetry-instrumentation-action_mailer (0.2.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-active_support (~> 0.1) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-action_pack (0.10.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-action_view (0.7.3) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-active_support (~> 0.6) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_job (0.7.8) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_record (0.8.1) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_support (0.6.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-aws_sdk (0.7.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-base (0.22.3) - opentelemetry-api (~> 1.0) - opentelemetry-registry (~> 0.1) - opentelemetry-instrumentation-concurrent_ruby (0.21.4) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-ethon (0.21.9) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-excon (0.22.5) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-faraday (0.24.7) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-grape (0.2.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-graphql (0.28.4) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-http (0.23.5) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-http_client (0.22.8) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-net_http (0.22.8) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-pg (0.29.1) - opentelemetry-api (~> 1.0) - opentelemetry-helpers-sql-obfuscation - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (0.25.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.33.1) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-action_mailer (~> 0.2.0) - opentelemetry-instrumentation-action_pack (~> 0.10.0) - opentelemetry-instrumentation-action_view (~> 0.7.0) - opentelemetry-instrumentation-active_job (~> 0.7.0) - opentelemetry-instrumentation-active_record (~> 0.8.0) - opentelemetry-instrumentation-active_support (~> 0.6.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rake (0.2.2) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-redis (0.25.7) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-sidekiq (0.25.7) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-registry (0.3.0) - opentelemetry-api (~> 1.1) - opentelemetry-sdk (1.6.0) - opentelemetry-api (~> 1.1) - opentelemetry-common (~> 0.20) - opentelemetry-registry (~> 0.2) - opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.10.0) - opentelemetry-api (~> 1.0) - opentracing (0.5.0) - optimist (3.0.1) - org-ruby (0.9.12) - rubypants (~> 0.2) - orm_adapter (0.5.0) - os (1.1.4) - ostruct (0.6.1) - pact (1.64.0) - pact-mock_service (~> 3.0, >= 3.3.1) - pact-support (~> 1.16, >= 1.16.9) - rack-test (>= 0.6.3, < 3.0.0) - rspec (~> 3.0) - term-ansicolor (~> 1.7) - thor (>= 0.20, < 2.0) - webrick (~> 1.8) - pact-mock_service (3.11.2) - find_a_port (~> 1.0.1) - json - pact-support (~> 1.16, >= 1.16.4) - rack (~> 2.0) - rspec (>= 2.14) - thor (>= 0.19, < 2.0) - webrick (~> 1.8) - pact-support (1.20.0) - awesome_print (~> 1.9) - diff-lcs (~> 1.5) - expgen (~> 0.1) - rainbow (~> 3.1.1) - paper_trail (15.1.0) - activerecord (>= 6.1) - request_store (~> 1.4) - parallel (1.26.3) - parser (3.3.7.1) - ast (~> 2.4.1) - racc - parslet (1.8.2) - pastel (0.8.0) - tty-color (~> 0.5) - peek (1.1.0) - railties (>= 4.0.0) - pg (1.5.9) - pg_query (6.0.0) - google-protobuf (>= 3.25.3) - plist (3.7.0) - png_quantizator (0.2.1) - premailer (1.23.0) - addressable - css_parser (>= 1.12.0) - htmlentities (>= 4.0.0) - premailer-rails (1.12.0) - actionmailer (>= 3) - net-smtp - premailer (~> 1.7, >= 1.7.9) - prime (0.1.3) - forwardable - singleton - prism (1.2.0) - proc_to_ast (0.1.0) - coderay - parser - unparser - prometheus-client-mmap (1.2.9) - base64 - bigdecimal - logger - rb_sys (~> 0.9.109) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.10.1) - byebug (~> 11.0) - pry (>= 0.13, < 0.15) - pry-rails (0.3.11) - pry (>= 0.13.0) - pry-shell (0.6.4) - pry (>= 0.13.0) - tty-markdown - tty-prompt - public_suffix (6.0.1) - puma (6.5.0) - nio4r (~> 2.0) - pyu-ruby-sasl (0.0.3.3) - raabro (1.4.0) - racc (1.8.1) - rack (2.2.11) - rack-accept (0.4.5) - rack (>= 0.4) - rack-attack (6.7.0) - rack (>= 1.0, < 4) - rack-cors (2.0.2) - rack (>= 2.0.0) - rack-oauth2 (2.2.1) - activesupport - attr_required - faraday (~> 2.0) - faraday-follow_redirects - json-jwt (>= 1.11.0) - rack (>= 2.1.0) - rack-protection (2.2.2) - rack - rack-proxy (0.7.7) - rack - rack-session (1.0.2) - rack (< 3) - rack-test (2.1.0) - rack (>= 1.3) - rack-timeout (0.7.0) - rails (7.0.8.7) - actioncable (= 7.0.8.7) - actionmailbox (= 7.0.8.7) - actionmailer (= 7.0.8.7) - actionpack (= 7.0.8.7) - actiontext (= 7.0.8.7) - actionview (= 7.0.8.7) - activejob (= 7.0.8.7) - activemodel (= 7.0.8.7) - activerecord (= 7.0.8.7) - activestorage (= 7.0.8.7) - activesupport (= 7.0.8.7) - bundler (>= 1.15.0) - railties (= 7.0.8.7) - rails-controller-testing (1.0.5) - actionpack (>= 5.0.1.rc1) - actionview (>= 5.0.1.rc1) - activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.1) - loofah (~> 2.21) - nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - rails-i18n (7.0.10) - i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 8) - railties (7.0.8.7) - actionpack (= 7.0.8.7) - activesupport (= 7.0.8.7) - method_source - rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) - rainbow (3.1.1) - rake (13.0.6) - rake-compiler-dock (1.9.1) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - rb_sys (0.9.110) - rake-compiler-dock (= 1.9.1) - rbs (3.6.1) - logger - rbtrace (0.5.1) - ffi (>= 1.0.6) - msgpack (>= 0.4.3) - optimist (>= 3.0.0) - rchardet (1.8.0) - re2 (2.15.0) - mini_portile2 (~> 2.8.7) - recaptcha (5.12.3) - json - recursive-open-struct (1.1.3) - redcarpet (3.6.0) - redis (5.4.0) - redis-client (>= 0.22.0) - redis-actionpack (5.5.0) - actionpack (>= 5) - redis-rack (>= 2.1.0, < 4) - redis-store (>= 1.1.0, < 2) - redis-client (0.22.2) - connection_pool - redis-cluster-client (0.11.0) - redis-client (~> 0.22) - redis-clustering (5.4.0) - redis (= 5.4.0) - redis-cluster-client (>= 0.10.0) - redis-namespace (1.11.0) - redis (>= 4) - redis-rack (3.0.0) - rack-session (>= 0.2.0) - redis-store (>= 1.2, < 2) - redis-store (1.11.0) - redis (>= 4, < 6) - regexp_parser (2.10.0) - regexp_property_values (1.0.0) - representable (3.2.0) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) - request_store (1.7.0) - rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - retriable (3.1.2) - reverse_markdown (1.4.0) - nokogiri - rexml (3.4.1) - rinku (2.0.0) - rotp (6.3.0) - rouge (4.5.1) - rqrcode (2.2.0) - chunky_png (~> 1.0) - rqrcode_core (~> 1.0) - rqrcode_core (1.2.0) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-benchmark (0.6.0) - benchmark-malloc (~> 0.2) - benchmark-perf (~> 0.6) - benchmark-trend (~> 0.4) - rspec (>= 3.0) - rspec-core (3.13.1) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-parameterized (1.0.2) - rspec-parameterized-core (< 2) - rspec-parameterized-table_syntax (< 2) - rspec-parameterized-core (1.0.0) - parser - proc_to_ast - rspec (>= 2.13, < 4) - unparser - rspec-parameterized-table_syntax (1.0.0) - binding_of_caller - rspec-parameterized-core (< 2) - rspec-rails (7.0.1) - actionpack (>= 7.0) - activesupport (>= 7.0) - railties (>= 7.0) - rspec-core (~> 3.13) - rspec-expectations (~> 3.13) - rspec-mocks (~> 3.13) - rspec-support (~> 3.13) - rspec-retry (0.6.2) - rspec-core (> 3.3) - rspec-support (3.13.1) - rspec_junit_formatter (0.6.0) - rspec-core (>= 2, < 4, != 2.12.0) - rspec_profiling (0.0.9) - activerecord - get_process_mem - rails - rubocop (1.71.1) - json (~> 2.3) - language_server-protocol (>= 3.17.0) - parallel (~> 1.10) - parser (>= 3.3.0.2) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.38.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.38.0) - parser (>= 3.3.1.0) - rubocop-capybara (2.21.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.26.1) - rubocop (~> 1.61) - rubocop-graphql (1.5.4) - rubocop (>= 1.50, < 2) - rubocop-performance (1.21.1) - rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.26.2) - activesupport (>= 4.2.0) - rack (>= 1.1) - rubocop (>= 1.52.0, < 2.0) - rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (3.0.5) - rubocop (~> 1.61) - rubocop-rspec_rails (2.30.0) - rubocop (~> 1.61) - rubocop-rspec (~> 3, >= 3.0.1) - ruby-fogbugz (0.3.0) - crack (~> 0.4) - multipart-post (~> 2.0) - ruby-lsp (0.23.10) - language_server-protocol (~> 3.17.0) - prism (>= 1.2, < 2.0) - rbs (>= 3, < 4) - sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.31) - ruby-lsp (>= 0.23.0, < 0.24.0) - ruby-lsp-rspec (0.1.22) - ruby-lsp (~> 0.23.0) - ruby-magic (0.6.0) - mini_portile2 (~> 2.8) - ruby-progressbar (1.11.0) - ruby-statistics (4.1.0) - ruby2_keywords (0.0.5) - rubyntlm (0.6.3) - rubypants (0.2.0) - rubyzip (2.3.2) - rugged (1.6.3) - safe_yaml (1.0.4) - safety_net_attestation (0.4.0) - jwt (~> 2.0) - sanitize (6.0.2) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - sass-embedded (1.77.5) - google-protobuf (>= 3.25, < 5.0) - rake (>= 13) - sawyer (0.9.2) - addressable (>= 2.3.5) - faraday (>= 0.17.3, < 3) - sd_notify (0.1.1) - seed-fu (2.3.9) - activerecord (>= 3.1) - activesupport (>= 3.1) - selenium-webdriver (4.27.0) - base64 (~> 0.2) - logger (~> 1.4) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2, < 3.0) - websocket (~> 1.0) - semver_dialects (3.6.0) - deb_version (~> 1.0.1) - pastel (~> 0.8.0) - thor (~> 1.3) - tty-command (~> 0.10.1) - sentry-rails (5.22.1) - railties (>= 5.0) - sentry-ruby (~> 5.22.1) - sentry-ruby (5.22.1) - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.22.1) - sentry-ruby (~> 5.22.1) - sidekiq (>= 3.0) - shellany (0.0.1) - shoulda-matchers (6.4.0) - activesupport (>= 5.2.0) - sidekiq-cron (1.12.0) - fugit (~> 1.8) - globalid (>= 1.0.1) - sidekiq (>= 6) - sigdump (0.2.5) - signet (0.18.0) - addressable (~> 2.8) - faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simple_po_parser (1.1.6) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (2.1.0) - rexml - simplecov (~> 0.19) - simplecov-html (0.12.3) - simplecov-lcov (0.8.0) - simplecov_json_formatter (0.1.4) - simpleidn (0.2.3) - singleton (0.3.0) - sixarm_ruby_unaccent (1.2.0) - slack-messenger (2.3.6) - re2 (~> 2.7, >= 2.7.0) - snaky_hash (2.0.0) - hashie - version_gem (~> 1.1) - snowplow-tracker (0.8.0) - solargraph (0.47.2) - backport (~> 1.2) - benchmark - bundler (>= 1.17.2) - diff-lcs (~> 1.4) - e2mmap - jaro_winkler (~> 1.5) - kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.1) - parser (~> 3.0) - reverse_markdown (>= 1.0.5, < 3) - rubocop (>= 0.52) - thor (~> 1.0) - tilt (~> 2.0) - yard (~> 0.9, >= 0.9.24) - sorbet-runtime (0.5.11647) - spamcheck (1.3.3) - grpc (~> 1.63) - spring (4.1.0) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) - sprite-factory (1.7.1) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) - sprockets (>= 3.0.0) - ssh_data (1.3.0) - ssrf_filter (1.0.8) - stackprof (0.2.27) - state_machines (0.5.0) - state_machines-activemodel (0.8.0) - activemodel (>= 5.1) - state_machines (>= 0.5.0) - state_machines-activerecord (0.8.0) - activerecord (>= 5.1) - state_machines-activemodel (>= 0.8.0) - strings (0.2.1) - strings-ansi (~> 0.2) - unicode-display_width (>= 1.5, < 3.0) - unicode_utils (~> 1.4) - strings-ansi (0.2.0) - swd (2.0.3) - activesupport (>= 3) - attr_required (>= 0.0.5) - faraday (~> 2.0) - faraday-follow_redirects - sync (0.5.0) - sys-filesystem (1.4.3) - ffi (~> 1.1) - sysexits (1.2.0) - table_print (1.5.7) - tanuki_emoji (0.13.0) - i18n (~> 1.14) - telesign (2.2.4) - net-http-persistent (>= 3.0.0, < 5.0) - telesignenterprise (2.2.2) - telesign (~> 2.2.3) - temple (0.8.2) - term-ansicolor (1.7.1) - tins (~> 1.0) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - terser (1.0.2) - execjs (>= 0.3.0, < 3) - test-prof (1.4.4) - test_file_finder (0.3.1) - faraday (>= 1.0, < 3.0, != 2.0.0) - text (1.3.1) - thor (1.3.1) - thread_safe (0.3.6) - thrift (0.16.0) - tilt (2.0.11) - timeout (0.4.3) - timfel-krb5-auth (0.8.3) - tins (1.31.1) - sync - toml-rb (2.2.0) - citrus (~> 3.0, > 3.0) - tomlrb (1.3.0) - tpm-key_attestation (0.12.0) - bindata (~> 2.4) - openssl (> 2.0) - openssl-signature_algorithm (~> 1.0) - traces (0.15.2) - trailblazer-option (0.1.2) - train-core (3.10.8) - addressable (~> 2.5) - ffi (!= 1.13.0) - json (>= 1.8, < 3.0) - mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 5.0) - net-ssh (>= 2.9, < 8.0) - truncato (0.7.13) - htmlentities (~> 4.3.1) - nokogiri (>= 1.7.0, <= 2.0) - tty-color (0.6.0) - tty-command (0.10.1) - pastel (~> 0.8) - tty-cursor (0.7.1) - tty-markdown (0.7.2) - kramdown (>= 1.16.2, < 3.0) - pastel (~> 0.8) - rouge (>= 3.14, < 5.0) - strings (~> 0.2.0) - tty-color (~> 0.5) - tty-screen (~> 0.8) - tty-prompt (0.23.1) - pastel (~> 0.8) - tty-reader (~> 0.8) - tty-reader (0.9.0) - tty-cursor (~> 0.7) - tty-screen (~> 0.8) - wisper (~> 2.0) - tty-screen (0.8.1) - typhoeus (1.4.1) - ethon (>= 0.9.0) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - uber (0.1.0) - undercover (0.6.3) - bigdecimal - imagen (>= 0.2.0) - rainbow (>= 2.1, < 4.0) - rugged (>= 0.27, < 1.8) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (2.4.2) - unicode-emoji (4.0.4) - unicode_utils (1.4.0) - uniform_notifier (1.16.0) - unleash (3.2.2) - murmurhash3 (~> 0.1.6) - unparser (0.6.7) - diff-lcs (~> 1.3) - parser (>= 3.2.0) - uri (0.13.2) - valid_email (0.1.3) - activemodel - mail (>= 2.6.1) - validate_url (1.0.15) - activemodel (>= 3.0.0) - public_suffix - validates_hostname (1.0.13) - activerecord (>= 3.0) - activesupport (>= 3.0) - version_gem (1.1.0) - version_sorter (2.3.0) - view_component (3.21.0) - activesupport (>= 5.2.0, < 8.1) - concurrent-ruby (~> 1.0) - method_source (~> 1.0) - virtus (2.0.0) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - vite_rails (3.0.19) - railties (>= 5.1, < 9) - vite_ruby (~> 3.0, >= 3.2.2) - vite_ruby (3.9.1) - dry-cli (>= 0.7, < 2) - logger (~> 1.6) - mutex_m - rack-proxy (~> 0.6, >= 0.6.1) - zeitwerk (~> 2.2) - vmstat (2.3.1) - warden (1.2.9) - rack (>= 2.0.9) - warning (1.5.0) - webauthn (3.0.0) - android_key_attestation (~> 0.3.0) - awrence (~> 1.1) - bindata (~> 2.4) - cbor (~> 0.5.9) - cose (~> 1.1) - openssl (>= 2.2) - safety_net_attestation (~> 0.4.0) - tpm-key_attestation (~> 0.12.0) - webfinger (2.1.3) - activesupport - faraday (~> 2.0) - faraday-follow_redirects - webmock (3.25.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.2) - websocket (1.2.10) - websocket-driver (0.7.6) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - wikicloth (0.8.1) - builder - expression_parser - rinku - wisper (2.0.1) - with_env (1.1.0) - wmi-lite (1.0.7) - xml-simple (1.1.9) - rexml - xpath (3.2.0) - nokogiri (~> 1.8) - yajl-ruby (1.4.3) - yard (0.9.37) - zeitwerk (2.6.7) - -PLATFORMS - ruby - -DEPENDENCIES - CFPropertyList (~> 3.0.0) - RedCloth (~> 4.3.3) - acme-client (~> 2.0.19) - activerecord-explain-analyze (~> 0.1) - activerecord-gitlab! - addressable (~> 2.8) - akismet (~> 3.0) - apollo_upload_server (~> 2.1.6) - app_store_connect - arr-pm (~> 0.0.12) - asciidoctor (~> 2.0.18) - asciidoctor-include-ext (~> 0.4.0) - asciidoctor-kroki (~> 0.10.0) - asciidoctor-plantuml (~> 0.0.16) - async (~> 2.23.0) - atlassian-jwt (~> 0.2.1) - attr_encrypted (~> 3.2.4)! - awesome_print - aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.215.0) - aws-sdk-s3 (~> 1.177.0) - axe-core-rspec (~> 4.10.0) - babosa (~> 2.0) - base32 (~> 0.3.0) - batch-loader (~> 2.0.5) - bcrypt (~> 3.1, >= 3.1.14) - benchmark-ips (~> 2.14.0) - benchmark-memory (~> 0.1) - better_errors (~> 2.10.1) - bootsnap (~> 1.18.3) - browser (~> 5.3.1) - bullet (~> 7.2.0) - bundler-checksum (~> 0.1.0)! - capybara (~> 3.40) - capybara-screenshot (~> 1.0.26) - carrierwave (~> 1.3) - charlock_holmes (~> 0.7.9) - circuitbox (= 2.0.0) - click_house-client! - cloud_profiler_agent (~> 0.0.0)! - commonmarker (~> 0.23.10) - concurrent-ruby (~> 1.1) - connection_pool (~> 2.4) - countries (~> 4.0.0) - coverband (= 6.1.4) - creole (~> 0.5.0) - crystalball (~> 0.7.0) - cssbundling-rails (= 1.4.2) - csv_builder! - cvss-suite (~> 3.3.0) - database_cleaner-active_record (~> 2.2.0) - deckar01-task_list (= 2.3.4) - declarative_policy (~> 1.1.0) - deprecation_toolkit (~> 1.5.1) - derailed_benchmarks - devfile (~> 0.1.1) - device_detector - devise (~> 4.9.3) - devise-pbkdf2-encryptable (~> 0.0.0)! - devise-two-factor (~> 4.1.1) - diff_match_patch (~> 0.1.0)! - diffy (~> 3.4) - discordrb-webhooks (~> 3.5) - doorkeeper (~> 5.8, >= 5.8.1) - doorkeeper-device_authorization_grant (~> 1.0.0) - doorkeeper-openid_connect (~> 1.8.10) - drb (~> 2.2) - duo_api (~> 1.3) - ed25519 (~> 1.3.0) - elasticsearch-api (= 7.17.11) - elasticsearch-model (~> 7.2) - elasticsearch-rails (~> 7.2) - email_reply_trimmer (~> 0.1) - email_spec (~> 2.3.0) - error_tracking_open_api! - factory_bot_rails (~> 6.4.3) - faraday (~> 2) - faraday-multipart (~> 1.0) - faraday-retry (~> 2) - faraday-typhoeus (~> 1.1) - faraday_middleware-aws-sigv4 (~> 1.0.1) - fast_blank (~> 1.0.1) - ffaker (~> 2.24) - ffi (~> 1.17) - flipper (~> 0.28.0) - flipper-active_record (~> 0.28.0) - flipper-active_support_cache_store (~> 0.28.0) - fog-aliyun (~> 0.4) - fog-aws (~> 3.26) - fog-core (= 2.1.0) - fog-google (~> 1.24.1) - fog-local (~> 0.8) - fugit (~> 1.11.1) - gdk-toogle (~> 0.9, >= 0.9.5) - gettext (~> 3.5, >= 3.5.1) - gettext_i18n_rails (~> 1.13.0) - git (~> 1.8) - gitaly (~> 17.8.0) - gitlab-active-context! - gitlab-backup-cli! - gitlab-chronic (~> 0.10.5) - gitlab-cloud-connector (~> 1.0.0) - gitlab-dangerfiles (~> 4.8.0) - gitlab-duo-workflow-service-client (~> 0.1)! - gitlab-experiment (~> 0.9.1) - gitlab-fog-azure-rm (~> 2.2.0) - gitlab-glfm-markdown (~> 0.0.27) - gitlab-housekeeper! - gitlab-http! - gitlab-kas-grpc (~> 17.9.0.pre.rc2) - gitlab-labkit (~> 0.37.0) - gitlab-license (~> 2.6) - gitlab-mail_room (~> 0.0.24) - gitlab-markup (~> 2.0.0) - gitlab-net-dns (~> 0.10.0) - gitlab-rspec! - gitlab-rspec_flaky! - gitlab-safe_request_store! - gitlab-schema-validation! - gitlab-sdk (~> 0.3.0) - gitlab-secret_detection (< 1.0) - gitlab-security_report_schemas (= 0.1.2.min15.0.0.max15.2.1) - gitlab-sidekiq-fetcher! - gitlab-styles (~> 13.1.0) - gitlab-topology-service-client (~> 0.1)! - gitlab-utils! - gitlab_chronic_duration (~> 0.12) - gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 2.8.0) - gon (~> 6.4.0) - google-apis-androidpublisher_v3 (~> 0.34.0) - google-apis-cloudbilling_v1 (~> 0.22.0) - google-apis-cloudresourcemanager_v1 (~> 0.31.0) - google-apis-compute_v1 (~> 0.57.0) - google-apis-container_v1 (~> 0.43.0) - google-apis-container_v1beta1 (~> 0.43.0) - google-apis-core (~> 0.11.0, >= 0.11.1) - google-apis-iam_v1 (~> 0.36.0) - google-apis-serviceusage_v1 (~> 0.28.0) - google-apis-sqladmin_v1beta4 (~> 0.41.0) - google-apis-storage_v1 (~> 0.29) - google-cloud-artifact_registry-v1 (~> 0.11.0) - google-cloud-compute-v1 (~> 2.6.0) - google-cloud-storage (~> 1.45.0) - google-protobuf (~> 3.25, >= 3.25.3) - googleauth (~> 1.8.1) - gpgme (~> 2.0.24) - grape (~> 2.0.0) - grape-entity (~> 1.0.1) - grape-path-helpers (~> 2.0.1) - grape-swagger (~> 2.1.2) - grape-swagger-entity (~> 0.5.5) - grape_logging (~> 1.8, >= 1.8.4) - graphlient (~> 0.8.0) - graphlyte (~> 1.0.0) - graphql (= 2.4.11)! - graphql-docs (~> 5.0.0) - grpc (= 1.63.0) - gssapi (~> 1.3.1) - guard-rspec - haml_lint (~> 0.58) - hamlit (~> 2.15.0) - hashie (~> 5.0.0) - health_check (~> 3.0) - html-pipeline (~> 2.14.3) - html2text - httparty (~> 0.22.0) - i18n_data (~> 0.13.1) - icalendar (~> 2.10.1) - influxdb-client (~> 3.1) - invisible_captcha (~> 2.1.0) - ipaddress (~> 0.8.3) - ipynbdiff! - jira-ruby (~> 2.3.0) - js_regex (~> 3.8) - json (~> 2.10.0) - json_schemer (~> 2.3.0) - jsonb_accessor (~> 1.4) - jwt (~> 2.9.3) - kaminari (~> 1.2.2) - knapsack (~> 4.0.0) - kramdown (~> 2.5.0) - kubeclient (~> 4.11.0) - lefthook (~> 1.11.0) - letter_opener_web (~> 3.0.0) - license_finder (~> 7.0) - licensee (~> 9.16) - listen (~> 3.7) - lockbox (~> 1.3.0) - logger (~> 1.6.0) - lograge (~> 0.5) - loofah (~> 2.24.0) - lookbook (~> 2.3) - lru_redux - mail (= 2.8.1) - mail-smtp_pool (~> 0.1.0)! - marginalia (~> 1.11.1) - memory_profiler (~> 1.0) - microsoft_graph_mailer (~> 0.1.0)! - mini_magick (~> 4.12) - minitest (~> 5.11.0) - multi_json (~> 1.14.1) - mutex_m (~> 0.3) - net-http (= 0.6.0) - net-ldap (~> 0.17.1) - net-ntp - net-protocol (~> 0.1.3) - nkf (~> 0.2.0) - nokogiri (~> 1.18) - oauth2 (~> 2.0) - octokit (~> 9.0) - ohai (~> 18.1) - oj (~> 3.16.0, >= 3.16.10) - oj-introspect (~> 0.8) - omniauth (~> 2.1.0) - omniauth-alicloud (~> 3.0.0) - omniauth-atlassian-oauth2 (~> 0.2.0) - omniauth-auth0 (~> 3.1) - omniauth-azure-activedirectory-v2 (~> 2.0) - omniauth-github (= 2.0.1) - omniauth-gitlab (~> 4.0.0)! - omniauth-google-oauth2 (~> 1.1) - omniauth-oauth2-generic (~> 0.2.2) - omniauth-salesforce (~> 1.0.5)! - omniauth-saml (~> 2.2.1) - omniauth-shibboleth-redux (~> 2.0) - omniauth_crowd (~> 2.4.0)! - omniauth_openid_connect (~> 0.8.0) - openid_connect (~> 2.3.0) - openssl (~> 3.0) - opentelemetry-exporter-otlp - opentelemetry-instrumentation-action_pack - opentelemetry-instrumentation-action_view - opentelemetry-instrumentation-active_job - opentelemetry-instrumentation-active_record - opentelemetry-instrumentation-active_support - opentelemetry-instrumentation-aws_sdk - opentelemetry-instrumentation-concurrent_ruby - opentelemetry-instrumentation-ethon - opentelemetry-instrumentation-excon - opentelemetry-instrumentation-faraday - opentelemetry-instrumentation-grape - opentelemetry-instrumentation-graphql - opentelemetry-instrumentation-http - opentelemetry-instrumentation-http_client - opentelemetry-instrumentation-net_http - opentelemetry-instrumentation-pg - opentelemetry-instrumentation-rack - opentelemetry-instrumentation-rails - opentelemetry-instrumentation-rake - opentelemetry-instrumentation-redis - opentelemetry-instrumentation-sidekiq - opentelemetry-sdk - org-ruby (~> 0.9.12) - os (~> 1.1, >= 1.1.4) - pact (~> 1.64) - paper_trail (~> 15.0) - parallel (~> 1.19) - parser (= 3.3.7.1) - parslet (~> 1.8) - peek (~> 1.1) - pg (~> 1.5.6) - pg_query (~> 6.0.0) - png_quantizator (~> 0.2.1) - premailer-rails (~> 1.12.0) - prometheus-client-mmap (~> 1.2.9) - pry-byebug - pry-rails (~> 0.3.9) - pry-shell (~> 0.6.4) - puma (= 6.5.0) - rack (~> 2.2.9) - rack-attack (~> 6.7.0) - rack-cors (~> 2.0.1) - rack-oauth2 (~> 2.2.1) - rack-proxy (~> 0.7.7) - rack-timeout (~> 0.7.0) - rails (~> 7.0.8.7) - rails-controller-testing - rails-i18n (~> 7.0, >= 7.0.9) - rainbow (~> 3.0) - rbtrace (~> 0.4) - re2 (~> 2.15) - recaptcha (~> 5.12) - redis (~> 5.4.0) - redis-actionpack (~> 5.5.0) - redis-clustering (~> 5.4.0) - request_store (~> 1.7.0) - responders (~> 3.0) - retriable (~> 3.1.2) - rexml (~> 3.4.0) - rouge (~> 4.5.0) - rqrcode (~> 2.2) - rspec-benchmark (~> 0.6.0) - rspec-parameterized (~> 1.0, >= 1.0.2) - rspec-rails (~> 7.0.0) - rspec-retry (~> 0.6.2) - rspec_junit_formatter - rspec_profiling (~> 0.0.9) - rubocop - ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.23.0) - ruby-lsp-rails (~> 0.3.6) - ruby-lsp-rspec (~> 0.1.10) - ruby-magic (~> 0.6) - ruby-progressbar (~> 1.10) - ruby-saml (~> 1.18.0)! - rubyzip (~> 2.3.2) - rugged (~> 1.6) - sanitize (~> 6.0.2) - sd_notify (~> 0.1.0) - seed-fu (~> 2.3.7) - selenium-webdriver (~> 4.21, >= 4.21.1) - semver_dialects (~> 3.6) - sentry-rails (~> 5.22.0) - sentry-ruby (~> 5.22.0) - sentry-sidekiq (~> 5.22.0) - shoulda-matchers (~> 6.4.0) - sidekiq! - sidekiq-cron (~> 1.12.0) - sigdump (~> 0.2.4) - simple_po_parser (~> 1.1.6) - simplecov (~> 0.22) - simplecov-cobertura (~> 2.1.0) - simplecov-lcov (~> 0.8.0) - slack-messenger (~> 2.3.5) - snowplow-tracker (~> 0.8.0) - solargraph (~> 0.47.2) - spamcheck (~> 1.3.0) - spring (~> 4.1.0) - spring-commands-rspec (~> 1.0.4) - sprite-factory (~> 1.7) - sprockets (~> 3.7.0) - sprockets-rails (~> 3.5.1) - ssh_data (~> 1.3) - stackprof (~> 0.2.26) - state_machines-activerecord (~> 0.8.0) - sys-filesystem (~> 1.4.3) - tanuki_emoji (~> 0.13) - telesignenterprise (~> 2.2) - terser (= 1.0.2) - test-prof (~> 1.4.0) - test_file_finder (~> 0.3.1) - thrift (>= 0.16.0) - timfel-krb5-auth (~> 0.8) - toml-rb (~> 2.2.0) - truncato (~> 0.7.13) - tty-prompt (~> 0.23) - typhoeus (~> 1.4.0) - undercover (~> 0.6.0) - unicode-emoji (~> 4.0) - unleash (~> 3.2.2) - uri (= 0.13.2) - valid_email (~> 0.1) - validates_hostname (~> 1.0.13) - version_sorter (~> 2.3) - view_component (~> 3.21.0) - vite_rails (~> 3.0.17) - vite_ruby (~> 3.9.0) - vmstat (~> 2.3.0) - warning (~> 1.5.0) - webauthn (~> 3.0) - webmock (~> 3.25.0) - webrick (~> 1.8.1) - wikicloth (= 0.8.1) - yajl-ruby (~> 1.4.3) - -BUNDLED WITH - 2.6.2 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix deleted file mode 100644 index 082de649e331..000000000000 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ /dev/null @@ -1,9759 +0,0 @@ -src: { - acme-client = { - dependencies = [ - "base64" - "faraday" - "faraday-retry" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1bixpb7sp6m7wp56icrs5094f0lvr2di1yspfwcmz6373d3ba2v5"; - type = "gem"; - }; - version = "2.0.20"; - }; - actioncable = { - dependencies = [ - "actionpack" - "activesupport" - "nio4r" - "websocket-driver" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qpiw9n8sswisvji91ra290wiihgl30kg3zkpffx0byz84w52d20"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - actionmailbox = { - dependencies = [ - "actionpack" - "activejob" - "activerecord" - "activestorage" - "activesupport" - "mail" - "net-imap" - "net-pop" - "net-smtp" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hn1d8fshkfijsmwflnvn2ys9i8k3rbkk7h6qsgwspg8v2iyl3ll"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - actionmailer = { - dependencies = [ - "actionpack" - "actionview" - "activejob" - "activesupport" - "mail" - "net-imap" - "net-pop" - "net-smtp" - "rails-dom-testing" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "054dv081ysp86im4hxcwwlmkl2zidnmy34mw4acghjkpz2igks4b"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - actionpack = { - dependencies = [ - "actionview" - "activesupport" - "rack" - "rack-test" - "rails-dom-testing" - "rails-html-sanitizer" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0b2y7wy6gx59zb88v1fqiyxdkafrsfma67sx5394yjlhhzbb3rj0"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - actiontext = { - dependencies = [ - "actionpack" - "activerecord" - "activestorage" - "activesupport" - "globalid" - "nokogiri" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1818spc73y96n94jssh77z2w4dnz84sn83ywrk5cicnmjzdx4xfb"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - actionview = { - dependencies = [ - "activesupport" - "builder" - "erubi" - "rails-dom-testing" - "rails-html-sanitizer" - ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vbziywvidi7gy69hqxsrcxh6n8i4x2w75qam1fzw0qrqv4mp5xy"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - activejob = { - dependencies = [ - "activesupport" - "globalid" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "081a32z17976kgf7a51blh7fsxsm3p8qj02p8wx8cd7fx8xdpx7g"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - activemodel = { - dependencies = [ "activesupport" ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10qaykhcs15wgyy9fd886mwdkf3iwsib0h6fcnwqa7jw0nxh8fzi"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - activerecord = { - dependencies = [ - "activemodel" - "activesupport" - ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0nm4y9fy19l65c18v3k8s3x2npp7kcn8ds2y5i38x8aq1r8whkzr"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - activerecord-explain-analyze = { - dependencies = [ - "activerecord" - "pg" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0yvz452ww0vn3n6197gx6zklwa591gc7f1m8accvjd9zw8gv3ssx"; - type = "gem"; - }; - version = "0.1.0"; - }; - activerecord-gitlab = { - dependencies = [ "activerecord" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/gems/activerecord-gitlab"; - type = "path"; - }; - version = "0.2.0"; - }; - activestorage = { - dependencies = [ - "actionpack" - "activejob" - "activerecord" - "activesupport" - "marcel" - "mini_mime" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1xcy76cwskwfm39lr4cg7bmknc8j0vymp55h8hzrhl1sfdriwhfa"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - activesupport = { - dependencies = [ - "concurrent-ruby" - "i18n" - "minitest" - "tzinfo" - ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zq4f834my1z6yh05rfr1dzl3i8padh33j092zlal979blvh4iyz"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - addressable = { - dependencies = [ "public_suffix" ]; - groups = [ - "danger" - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; - type = "gem"; - }; - version = "2.8.7"; - }; - aes_key_wrap = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19bn0y70qm6mfj4y1m0j3s8ggh6dvxwrwrj5vfamhdrpddsz8ddr"; - type = "gem"; - }; - version = "1.1.0"; - }; - akismet = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0c5jhqfgvpz84d8jai51hin018ldpfd0civbk7mfwmrj7n71p6bl"; - type = "gem"; - }; - version = "3.0.0"; - }; - aliyun-sdk = { - dependencies = [ - "nokogiri" - "rest-client" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "17avsza5r4f6d0f2ajgy6clmasrxs7jd16hz7ljq502jkczmv4b5"; - type = "gem"; - }; - version = "0.8.0"; - }; - amatch = { - dependencies = [ - "mize" - "tins" - ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1xs5j64cbbjc94lx72fgjq6f3r99p2fmg51fh1r7qqifd8i1bzyk"; - type = "gem"; - }; - version = "0.4.1"; - }; - android_key_attestation = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02spc1sh7zsljl02v9d5rdb717b628vw2k7jkkplifyjk4db0zj6"; - type = "gem"; - }; - version = "0.3.0"; - }; - apollo_upload_server = { - dependencies = [ - "actionpack" - "graphql" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cnddcnrb0gwhi0w2hrmh53fkpdxxy2v80rfp2q1hrcf4mr41v6w"; - type = "gem"; - }; - version = "2.1.6"; - }; - app_store_connect = { - dependencies = [ - "activesupport" - "jwt" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1rjwnb5fj0kzwgrn1n98gnb0s855ck1dm3j06sd01vcqj8829xih"; - type = "gem"; - }; - version = "0.38.0"; - }; - arr-pm = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fddw0vwdrr7v3a0lfqbmnd664j48a9psrjd3wh3k4i3flplizzx"; - type = "gem"; - }; - version = "0.0.12"; - }; - asciidoctor = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j"; - type = "gem"; - }; - version = "2.0.23"; - }; - asciidoctor-include-ext = { - dependencies = [ "asciidoctor" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0y3qixbssfrzp04ng7g4lh3dq16pgrw3p8cwc0v5bhmz5yfxnsj0"; - type = "gem"; - }; - version = "0.4.0"; - }; - asciidoctor-kroki = { - dependencies = [ "asciidoctor" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qih280cjsh3nmywa5ja6kbrd576qmkxnp9zbmxjw3hjizc2ahlf"; - type = "gem"; - }; - version = "0.10.0"; - }; - asciidoctor-plantuml = { - dependencies = [ "asciidoctor" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14qppm3qzfra2g2lf8jl3mbnrhi4alp8232zqz6dbpl6276lfzj0"; - type = "gem"; - }; - version = "0.0.16"; - }; - ast = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; - type = "gem"; - }; - version = "2.4.2"; - }; - async = { - dependencies = [ - "console" - "fiber-annotation" - "io-event" - "metrics" - "traces" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0p29xccd3y96m7yb15yr96j362cz855ramn2x83g5z2642ag68w3"; - type = "gem"; - }; - version = "2.23.0"; - }; - atlassian-jwt = { - dependencies = [ "jwt" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "08vqx5s0ax71lwis9l1bzy570sch0hpb53031ha2wgvp31sdilig"; - type = "gem"; - }; - version = "0.2.1"; - }; - attr_encrypted = { - dependencies = [ "encryptor" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/attr_encrypted"; - type = "path"; - }; - version = "3.2.4"; - }; - attr_required = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "16fbwr6nmsn97n0a6k1nwbpyz08zpinhd6g7196lz1syndbgrszh"; - type = "gem"; - }; - version = "1.0.2"; - }; - awesome_print = { - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0vkq6c8y2jvaw03ynds5vjzl1v9wg608cimkd3bidzxc0jvk56z9"; - type = "gem"; - }; - version = "1.9.2"; - }; - awrence = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0gj8f8c54r9cabkm41s59sa1ca5wpbipw7gq3sfl87x9296227fx"; - type = "gem"; - }; - version = "1.2.1"; - }; - aws-eventstream = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-partitions = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01w3b84d129q9b6bg2cm8p4cn8pl74l343sxsc47ax9sglqz6y99"; - type = "gem"; - }; - version = "1.1001.0"; - }; - aws-sdk-cloudformation = { - dependencies = [ - "aws-sdk-core" - "aws-sigv4" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "09kb3k5vpymg846gajc5d3wznww63yiv3ygdf4v42d4pf4wpbr1i"; - type = "gem"; - }; - version = "1.41.0"; - }; - aws-sdk-core = { - dependencies = [ - "aws-eventstream" - "aws-partitions" - "aws-sigv4" - "jmespath" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jafdv62q1cd8yvn6cl876bnz5vp6b4x2gnggsl0j4lyfkxnhh91"; - type = "gem"; - }; - version = "3.215.0"; - }; - aws-sdk-kms = { - dependencies = [ - "aws-sdk-core" - "aws-sigv4" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jfgw9a9c8xyjhkmgpd9rpi95h9i0rhbqszn8iqkbfm9rc9m1xz7"; - type = "gem"; - }; - version = "1.76.0"; - }; - aws-sdk-s3 = { - dependencies = [ - "aws-sdk-core" - "aws-sdk-kms" - "aws-sigv4" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10ziy8zslfjs0ihls7wiq6zvsncq89azh36rshmlylry1hhxjbxz"; - type = "gem"; - }; - version = "1.177.0"; - }; - aws-sigv4 = { - dependencies = [ "aws-eventstream" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0yf396fxashbqn0drbnvd9srxfg7w06v70q8kqpzi04zqchf6lvp"; - type = "gem"; - }; - version = "1.9.1"; - }; - axe-core-api = { - dependencies = [ - "dumb_delegator" - "ostruct" - "virtus" - ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "12djmxdbmbwk3r3ni8r73945plsr6wmw7yzw72gk42iq86ha0kn8"; - type = "gem"; - }; - version = "4.10.2"; - }; - axe-core-rspec = { - dependencies = [ - "axe-core-api" - "dumb_delegator" - "ostruct" - "virtus" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xgp28gk45v25l6l1d4clm1gq7brcwh9nma51wbsl3p40xcbw0p3"; - type = "gem"; - }; - version = "4.10.2"; - }; - axiom-types = { - dependencies = [ - "descendants_tracker" - "ice_nine" - "thread_safe" - ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1"; - type = "gem"; - }; - version = "0.1.1"; - }; - babosa = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19mqrnyizr1ipdp26vhrg0hwb851bwyvrs6xc29dk3ywljw8s8d6"; - type = "gem"; - }; - version = "2.0.0"; - }; - backport = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xbzzjrgah0f8ifgd449kak2vyf30micpz6x2g82aipfv7ypsb4i"; - type = "gem"; - }; - version = "1.2.0"; - }; - base32 = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1fjs0l3c5g9qxwp43kcnhc45slx29yjb6m6jxbb2x1krgjmi166b"; - type = "gem"; - }; - version = "0.3.4"; - }; - base64 = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; - type = "gem"; - }; - version = "0.2.0"; - }; - batch-loader = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04zjpzb2m1qjxk0lzdi5m812wyq5kkwcdbxs1asbm67lp0wgcjwn"; - type = "gem"; - }; - version = "2.0.5"; - }; - bcrypt = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "16a0g2q40biv93i1hch3gw8rbmhp77qnnifj1k0a6m7dng3zh444"; - type = "gem"; - }; - version = "3.1.20"; - }; - benchmark = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xwcnbwnbqq8jp92mvawn6y69cb53wsz84wwmk9vsfk1jjvqfw2z"; - type = "gem"; - }; - version = "0.2.0"; - }; - benchmark-ips = { - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "07cvi8z4ss6nzf4jp8sp6bp54d7prh6jg56dz035jpajbnkchaxp"; - type = "gem"; - }; - version = "2.14.0"; - }; - benchmark-malloc = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0svyac8alxbmip6b9rp34wq5lcimdaapjkaqdw1385i66l28ziip"; - type = "gem"; - }; - version = "0.2.0"; - }; - benchmark-memory = { - dependencies = [ "memory_profiler" ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0p5bwqc828yai7h71b7ny77hgd7dll00dy34izp3b5dh6dj467na"; - type = "gem"; - }; - version = "0.2.0"; - }; - benchmark-perf = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "08cngwnwk2h6cdxx3dyckxcg7d0yi3pm83c26kfzkq1xkyah2azy"; - type = "gem"; - }; - version = "0.6.0"; - }; - benchmark-trend = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10axhj80jan0b7c77hm0aj2yxv0dh9clfy4pppxvxfj3yjlh4nny"; - type = "gem"; - }; - version = "0.4.0"; - }; - better_errors = { - dependencies = [ - "erubi" - "rack" - "rouge" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wqazisnn6hn1wsza412xribpw5wzx6b5z5p4mcpfgizr6xg367p"; - type = "gem"; - }; - version = "2.10.1"; - }; - bigdecimal = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; - type = "gem"; - }; - version = "3.1.7"; - }; - bindata = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0shg48ilaxn8ps8arvyb8pr6pqigdmccirks185c306dzychr3n3"; - type = "gem"; - }; - version = "2.4.11"; - }; - binding_of_caller = { - dependencies = [ "debug_inspector" ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s"; - type = "gem"; - }; - version = "1.0.0"; - }; - bootsnap = { - dependencies = [ "msgpack" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0mdgj9yw1hmx3xh2qxyjc31y8igmxzd9h0c245ay2zkz76pl4k5c"; - type = "gem"; - }; - version = "1.18.4"; - }; - browser = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0g4bcpax07kqqr9cp7cjc7i0pcij4nqpn1rdsg2wdwhzf00m6x32"; - type = "gem"; - }; - version = "5.3.1"; - }; - builder = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; - type = "gem"; - }; - version = "3.2.4"; - }; - bullet = { - dependencies = [ - "activesupport" - "uniform_notifier" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "12gacycw1adsdjp14pm43619c6lcdaddhgbdizy7gnzmnjhwh0im"; - type = "gem"; - }; - version = "7.2.0"; - }; - bundler-checksum = { - dependencies = [ ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/bundler-checksum"; - type = "path"; - }; - version = "0.1.0"; - }; - byebug = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "ruby"; - } - ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; - type = "gem"; - }; - version = "11.1.3"; - }; - capybara = { - dependencies = [ - "addressable" - "matrix" - "mini_mime" - "nokogiri" - "rack" - "rack-test" - "regexp_parser" - "xpath" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vxfah83j6zpw3v5hic0j70h519nvmix2hbszmjwm8cfawhagns2"; - type = "gem"; - }; - version = "3.40.0"; - }; - capybara-screenshot = { - dependencies = [ - "capybara" - "launchy" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xqc7hdiw1ql42mklpfvqd2pyfsxmy55cpx0h9y0jlkpl1q96sw1"; - type = "gem"; - }; - version = "1.0.26"; - }; - carrierwave = { - dependencies = [ - "activemodel" - "activesupport" - "mime-types" - "ssrf_filter" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "089s8rbwddzcyw1ky34h90flz5wzqzi2lvajykbxn3l3s6mjsxw1"; - type = "gem"; - }; - version = "1.3.4"; - }; - cbor = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y"; - type = "gem"; - }; - version = "0.5.9.8"; - }; - CFPropertyList = { - dependencies = [ - "base64" - "nkf" - "rexml" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4"; - type = "gem"; - }; - version = "3.0.7"; - }; - character_set = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0l9z2pihzc11f0jpq2sx789zwpmwf5nyhsjps45zzvfs5931fwrb"; - type = "gem"; - }; - version = "1.8.0"; - }; - charlock_holmes = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml"; - type = "gem"; - }; - version = "0.7.9"; - }; - chef-config = { - dependencies = [ - "addressable" - "chef-utils" - "fuzzyurl" - "mixlib-config" - "mixlib-shellout" - "tomlrb" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1pvjf3qbb3apg9vdy4zykamm7801qz4m6256wjqn73fs87zs50y1"; - type = "gem"; - }; - version = "18.3.0"; - }; - chef-utils = { - dependencies = [ "concurrent-ruby" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0087jwhqslfm3ygj507dmmdp3k0589j5jl54mkwgbabbwan7lzw2"; - type = "gem"; - }; - version = "18.3.0"; - }; - chunky_png = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; - type = "gem"; - }; - version = "1.4.0"; - }; - circuitbox = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "056snhim934xysz630ysfbfdxa64vin5y24h2ha1wvj9fqg9qvj9"; - type = "gem"; - }; - version = "2.0.0"; - }; - citrus = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0l7nhk3gkm1hdchkzzhg2f70m47pc0afxfpl6mkiibc9qcpl3hjf"; - type = "gem"; - }; - version = "3.0.2"; - }; - claide = { - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; - type = "gem"; - }; - version = "1.1.0"; - }; - claide-plugins = { - dependencies = [ - "cork" - "nap" - "open4" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bhw5j985qs48v217gnzva31rw5qvkf7qj8mhp73pcks0sy7isn7"; - type = "gem"; - }; - version = "0.9.2"; - }; - click_house-client = { - dependencies = [ - "activesupport" - "addressable" - "json" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/gems/click_house-client"; - type = "path"; - }; - version = "0.1.0"; - }; - cloud_profiler_agent = { - dependencies = [ - "google-cloud-profiler-v2" - "google-protobuf" - "googleauth" - "stackprof" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/cloud_profiler_agent"; - type = "path"; - }; - version = "0.0.1.pre"; - }; - coderay = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "ruby"; - } - ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; - type = "gem"; - }; - version = "1.1.3"; - }; - coercible = { - dependencies = [ "descendants_tracker" ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah"; - type = "gem"; - }; - version = "1.0.0"; - }; - colored2 = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; - type = "gem"; - }; - version = "3.1.2"; - }; - commonmarker = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1gyjwd7in1nlf8zai2fxazxi8cy6xjzswdcjway520blb39ka7cx"; - type = "gem"; - }; - version = "0.23.11"; - }; - concurrent-ruby = { - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; - type = "gem"; - }; - version = "1.2.3"; - }; - connection_pool = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; - type = "gem"; - }; - version = "2.5.0"; - }; - console = { - dependencies = [ - "fiber-annotation" - "fiber-local" - "json" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1mkwwz5ry6hbn328fb3myr86zsc6lg0f7w1dlbfmjw043ddbgndg"; - type = "gem"; - }; - version = "1.29.2"; - }; - cork = { - dependencies = [ "colored2" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1g6l780z1nj4s3jr11ipwcj8pjbibvli82my396m3y32w98ar850"; - type = "gem"; - }; - version = "0.3.0"; - }; - cose = { - dependencies = [ - "cbor" - "openssl-signature_algorithm" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; - type = "gem"; - }; - version = "1.3.0"; - }; - countries = { - dependencies = [ - "i18n_data" - "sixarm_ruby_unaccent" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ic1zbzqbrvb3myhgzpq4vigr3qnyl2r0vga84d9z5121cy8lbnk"; - type = "gem"; - }; - version = "4.0.1"; - }; - coverband = { - dependencies = [ "redis" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1j0p1qsnnx0xhx43y7xskxwpcsv3yw5wj79qf7naf3nhdn73kkv5"; - type = "gem"; - }; - version = "6.1.4"; - }; - crack = { - dependencies = [ "safe_yaml" ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; - type = "gem"; - }; - version = "0.4.3"; - }; - crass = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; - type = "gem"; - }; - version = "1.0.6"; - }; - creole = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm"; - type = "gem"; - }; - version = "0.5.0"; - }; - crystalball = { - dependencies = [ "git" ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1why2py76hv2m7i3a1im3zi5zcjcvz2l1nvshzndlwah58vrywkf"; - type = "gem"; - }; - version = "0.7.0"; - }; - css_parser = { - dependencies = [ "addressable" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; - type = "gem"; - }; - version = "1.14.0"; - }; - cssbundling-rails = { - dependencies = [ "railties" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kscxk81incimp3y9dkaqbn8d1awzm2nn7dx24lq1nbs15l5fp18"; - type = "gem"; - }; - version = "1.4.2"; - }; - csv = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b"; - type = "gem"; - }; - version = "3.3.0"; - }; - csv_builder = { - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/gems/csv_builder"; - type = "path"; - }; - version = "0.1.0"; - }; - cvss-suite = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0hyqdsh7zrgfq8hjvgnk9ij5qrj3j51m650nrfqk7n6mw30ry6al"; - type = "gem"; - }; - version = "3.3.0"; - }; - danger = { - dependencies = [ - "claide" - "claide-plugins" - "colored2" - "cork" - "faraday" - "faraday-http-cache" - "git" - "kramdown" - "kramdown-parser-gfm" - "no_proxy_fix" - "octokit" - "terminal-table" - ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "104x4p9rmk8frf4l858p171vjaif7mqgxspx61d26c0hfg355ra3"; - type = "gem"; - }; - version = "9.4.2"; - }; - danger-gitlab = { - dependencies = [ - "danger" - "gitlab" - ]; - groups = [ - "danger" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1a530kx5s5rbx5yx3jqay56lkksqh0yj468hcpg16faiyv8dfza9"; - type = "gem"; - }; - version = "8.0.0"; - }; - database_cleaner-active_record = { - dependencies = [ - "activerecord" - "database_cleaner-core" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1iz1hv2b1z7509dxvxdwzay1hhs24glxls5ldbyh688zxkcdca1j"; - type = "gem"; - }; - version = "2.2.0"; - }; - database_cleaner-core = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v44bn386ipjjh4m2kl53dal8g4d41xajn2jggnmjbhn6965fil6"; - type = "gem"; - }; - version = "2.0.1"; - }; - date = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; - type = "gem"; - }; - version = "3.4.1"; - }; - deb_version = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04z75v3wdghqbahgipvz8y75krkqq17jbbna349ddl9ggwfr27y2"; - type = "gem"; - }; - version = "1.0.2"; - }; - debug_inspector = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; - type = "gem"; - }; - version = "1.1.0"; - }; - deckar01-task_list = { - dependencies = [ "html-pipeline" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rqn9jh45gsw045c6fm05875bpj2xbhnff5m5drmk9wy01zdrav6"; - type = "gem"; - }; - version = "2.3.4"; - }; - declarative = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; - type = "gem"; - }; - version = "0.0.20"; - }; - declarative_policy = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jri6fqpyrlnhl99mhqlqwpi6z8idb7g421rysxz40yyk8lwzx4s"; - type = "gem"; - }; - version = "1.1.0"; - }; - deprecation_toolkit = { - dependencies = [ "activesupport" ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1fh4d98irhph3ri7c2rrvvmmjd4z14702r8baq9flh5f34dap8d8"; - type = "gem"; - }; - version = "1.5.1"; - }; - derailed_benchmarks = { - dependencies = [ - "base64" - "benchmark-ips" - "bigdecimal" - "drb" - "get_process_mem" - "heapy" - "logger" - "memory_profiler" - "mini_histogram" - "mutex_m" - "ostruct" - "rack" - "rack-test" - "rake" - "ruby-statistics" - "ruby2_keywords" - "thor" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fa4bl6afnqqq55fp45bmwin02dgrw7zq9zwv2f1rm6y9xk80hk5"; - type = "gem"; - }; - version = "2.2.1"; - }; - descendants_tracker = { - dependencies = [ "thread_safe" ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79"; - type = "gem"; - }; - version = "0.0.4"; - }; - devfile = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0yf8ckwr0pkzbdhs4y57gv9a80hvasdjv815fn67yhs4zpphqs5f"; - type = "gem"; - }; - version = "0.1.1"; - }; - device_detector = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0zbsjj1bgwmsiqiw6x5fzbzp25xc10c02s37ggl2635ha0qzn05q"; - type = "gem"; - }; - version = "1.0.0"; - }; - devise = { - dependencies = [ - "bcrypt" - "orm_adapter" - "railties" - "responders" - "warden" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1y57fpcvy1kjd4nb7zk7mvzq62wqcpfynrgblj558k3hbvz4404j"; - type = "gem"; - }; - version = "4.9.4"; - }; - devise-pbkdf2-encryptable = { - dependencies = [ - "devise" - "devise-two-factor" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/devise-pbkdf2-encryptable"; - type = "path"; - }; - version = "0.0.0"; - }; - devise-two-factor = { - dependencies = [ - "activesupport" - "attr_encrypted" - "devise" - "railties" - "rotp" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15cbgb0hyq78myc6aaszzdrd9qll9n3qdhykmrx22qiyac3mnpy9"; - type = "gem"; - }; - version = "4.1.1"; - }; - diff-lcs = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; - type = "gem"; - }; - version = "1.5.0"; - }; - diff_match_patch = { - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/diff_match_patch"; - type = "path"; - }; - version = "0.1.0"; - }; - diffy = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22"; - type = "gem"; - }; - version = "3.4.3"; - }; - digest-crc = { - dependencies = [ "rake" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "09114ndpnnyamc2q07bmpzw7kp3rbbfv7plmxcbzzi9d6prmd92w"; - type = "gem"; - }; - version = "0.6.5"; - }; - discordrb-webhooks = { - dependencies = [ "rest-client" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1c933kq48sqja1a2fc4ki9w8x5ajl6lp67hslka5k05hwfyaiysj"; - type = "gem"; - }; - version = "3.5.0"; - }; - docile = { - groups = [ - "coverage" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; - type = "gem"; - }; - version = "1.4.0"; - }; - domain_name = { - dependencies = [ "unf" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; - type = "gem"; - }; - version = "0.5.20190701"; - }; - doorkeeper = { - dependencies = [ "railties" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v6jjb1259y8dq97ibchc20jqjgk3z7zn12ggv5wzn2mcz1z6m3d"; - type = "gem"; - }; - version = "5.8.1"; - }; - doorkeeper-device_authorization_grant = { - dependencies = [ "doorkeeper" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0y96jc05c26ld35q121yj1g7lfcb55jfsn6d1s2l42fml09arhwl"; - type = "gem"; - }; - version = "1.0.3"; - }; - doorkeeper-openid_connect = { - dependencies = [ - "doorkeeper" - "jwt" - "ostruct" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1lznnxv845lb513s8gs2wckg3vrbj1w573sbs1agmxbn670akaaj"; - type = "gem"; - }; - version = "1.8.11"; - }; - dotenv = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; - type = "gem"; - }; - version = "2.7.6"; - }; - drb = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; - type = "gem"; - }; - version = "2.2.1"; - }; - dry-cli = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1w39jms4bsggxvl23cxanhccv1ngb6nqxsqhi784v5bjz1lx3si8"; - type = "gem"; - }; - version = "1.0.0"; - }; - dry-core = { - dependencies = [ - "concurrent-ruby" - "zeitwerk" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03a5qn74c4lk2rpy6wlhv66synjlyzc4wn086xzphkpmw12l4bzk"; - type = "gem"; - }; - version = "1.0.1"; - }; - dry-inflector = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "09hnvna3lg2x36li63988kv664d0zvy7y0z33803yvrdr9hj7lka"; - type = "gem"; - }; - version = "1.0.0"; - }; - dry-logic = { - dependencies = [ - "concurrent-ruby" - "dry-core" - "zeitwerk" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05nldkc154r0qzlhss7n5klfiyyz05x2fkq08y13s34py6023vcr"; - type = "gem"; - }; - version = "1.5.0"; - }; - dry-types = { - dependencies = [ - "concurrent-ruby" - "dry-core" - "dry-inflector" - "dry-logic" - "zeitwerk" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1f6dz0hm67rhybh6xq2s3vvr700cp43kf50z2lids62s2i0mh5hj"; - type = "gem"; - }; - version = "1.7.1"; - }; - dumb_delegator = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "151fdn7y0gqs7f6y3y7rn3frv0z359qrw9hb4s7avn6j2qc42ppz"; - type = "gem"; - }; - version = "1.0.0"; - }; - duo_api = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xq8ikcphbxgwdyvmzm1162znrz6j0wsr2bkmwa4nvjf303b99h6"; - type = "gem"; - }; - version = "1.4.0"; - }; - e2mmap = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5"; - type = "gem"; - }; - version = "0.1.0"; - }; - ed25519 = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji"; - type = "gem"; - }; - version = "1.3.0"; - }; - elasticsearch = { - dependencies = [ - "elasticsearch-api" - "elasticsearch-transport" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "11pw5x7kg6f6m8rqy2kpbzdlnvijjpmbqkj2gz8237wkbl40y27d"; - type = "gem"; - }; - version = "7.17.11"; - }; - elasticsearch-api = { - dependencies = [ "multi_json" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01wi43a3zylrq2vca08vir5va142g5m3jcsak3rprjck8jvggn7y"; - type = "gem"; - }; - version = "7.17.11"; - }; - elasticsearch-model = { - dependencies = [ - "activesupport" - "elasticsearch" - "hashie" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02x2wvd22wwi2v6pps7y4advzkyfbhxn0fgsai49zcjbcrblnp4b"; - type = "gem"; - }; - version = "7.2.1"; - }; - elasticsearch-rails = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1r2nh6csdlbfk5hqq5qbvvw1kvv6qa382alil2ixjn33jl7dql07"; - type = "gem"; - }; - version = "7.2.1"; - }; - elasticsearch-transport = { - dependencies = [ - "base64" - "faraday" - "multi_json" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00qgyyvjyyv7z22qjd408pby1h7902gdwkh8h3z3jk2y57amg06i"; - type = "gem"; - }; - version = "7.17.11"; - }; - email_reply_trimmer = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0vijywhy1acsq4187ss6w8a7ksswaf1d5np3wbj962b6rqif5vcz"; - type = "gem"; - }; - version = "0.1.6"; - }; - email_spec = { - dependencies = [ - "htmlentities" - "launchy" - "mail" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "049dhlyy2hcksp1wj9mx2fngk5limkm3afxysnizg1hi2dxbw8yz"; - type = "gem"; - }; - version = "2.3.0"; - }; - email_validator = { - dependencies = [ "activemodel" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0106y8xakq6frv2xc68zz76q2l2cqvhfjc7ji69yyypcbc4kicjs"; - type = "gem"; - }; - version = "2.2.4"; - }; - encryptor = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb"; - type = "gem"; - }; - version = "3.0.0"; - }; - error_tracking_open_api = { - dependencies = [ "typhoeus" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/gems/error_tracking_open_api"; - type = "path"; - }; - version = "1.0.0"; - }; - erubi = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; - type = "gem"; - }; - version = "1.12.0"; - }; - escape_utils = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "029c7kynhkxw8fgq9q171xi68ajfqrb22r7drvkar018j8871yyz"; - type = "gem"; - }; - version = "1.3.0"; - }; - et-orbi = { - dependencies = [ "tzinfo" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj"; - type = "gem"; - }; - version = "1.2.11"; - }; - ethon = { - dependencies = [ "ffi" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v"; - type = "gem"; - }; - version = "0.16.0"; - }; - excon = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; - type = "gem"; - }; - version = "0.99.0"; - }; - execjs = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; - type = "gem"; - }; - version = "2.8.1"; - }; - expgen = { - dependencies = [ "parslet" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fd2sdh3lc3x0qds30czli8k5qr45bkb7ssx0kb038hhn9jhysjf"; - type = "gem"; - }; - version = "0.1.1"; - }; - expression_parser = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib"; - type = "gem"; - }; - version = "0.9.0"; - }; - extended-markdown-filter = { - dependencies = [ "html-pipeline" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0f7isjr3vpvmyc3arqcgn1fc69axxd73xk87nk31ibpv15sfzvn8"; - type = "gem"; - }; - version = "0.7.0"; - }; - factory_bot = { - dependencies = [ "activesupport" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0q927lvgjqj0xaplxhicj5xv8xadx3957mank3p7g01vb6iv6x33"; - type = "gem"; - }; - version = "6.5.0"; - }; - factory_bot_rails = { - dependencies = [ - "factory_bot" - "railties" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "122wkrc3d2q1dlca27794hh3arw0kvrf3rgmvn7hj3y5lb51g7hk"; - type = "gem"; - }; - version = "6.4.4"; - }; - faraday = { - dependencies = [ - "faraday-net_http" - "json" - "logger" - ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm"; - type = "gem"; - }; - version = "2.12.2"; - }; - faraday-follow_redirects = { - dependencies = [ "faraday" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr"; - type = "gem"; - }; - version = "0.3.0"; - }; - faraday-http-cache = { - dependencies = [ "faraday" ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qvl49xpl2mwxgcj6aj11qrjk94xrqhbnpl5vp1y2275crnkddv4"; - type = "gem"; - }; - version = "2.5.0"; - }; - faraday-multipart = { - dependencies = [ "multipart-post" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; - type = "gem"; - }; - version = "1.1.0"; - }; - faraday-net_http = { - dependencies = [ "net-http" ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; - type = "gem"; - }; - version = "3.1.0"; - }; - faraday-net_http_persistent = { - dependencies = [ - "faraday" - "net-http-persistent" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02yydasm9qlq59dnj3dldaqd0xidxyx59pnr2iqygnjn7yqj05xl"; - type = "gem"; - }; - version = "2.1.0"; - }; - faraday-retry = { - dependencies = [ "faraday" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "023ncwlagnf2irx2ckyj1pg1f1x436jgr4a5y45mih298p8zwij1"; - type = "gem"; - }; - version = "2.2.1"; - }; - faraday-typhoeus = { - dependencies = [ - "faraday" - "typhoeus" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1rwhd2f78vqj0wkkdah395apx6igp5xf82n5xgixs61q45y19ii4"; - type = "gem"; - }; - version = "1.1.0"; - }; - faraday_middleware-aws-sigv4 = { - dependencies = [ - "aws-sigv4" - "faraday" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "13xym8pfjh1j2pf63r45ybdy6p4hjrqn4algml5wd8bwd17yl0d0"; - type = "gem"; - }; - version = "1.0.1"; - }; - fast_blank = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1shpmamyzyhyxmv95r96ja5rylzaw60r19647d0fdm7y2h2c77r6"; - type = "gem"; - }; - version = "1.0.1"; - }; - fast_gettext = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "112gsrqah2w03kgi9mjsn6hl74mrwckphf223h36iayc4djf4lq2"; - type = "gem"; - }; - version = "2.3.0"; - }; - ffaker = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ljxb9kqssp70waz0an1ppm33821r0dbvs4b75qbqbv05p0ziqs3"; - type = "gem"; - }; - version = "2.24.0"; - }; - ffi = { - groups = [ - "default" - "development" - "kerberos" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6"; - type = "gem"; - }; - version = "1.17.1"; - }; - ffi-compiler = { - dependencies = [ - "ffi" - "rake" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; - type = "gem"; - }; - version = "1.0.1"; - }; - ffi-yajl = { - dependencies = [ "libyajl2" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0dj3y95260rvlclkkcxak6c1dsrzbyr4wik7jv3y949r4w9adfk9"; - type = "gem"; - }; - version = "2.6.0"; - }; - fiber-annotation = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00vcmynyvhny8n4p799rrhcx0m033hivy0s1gn30ix8rs7qsvgvs"; - type = "gem"; - }; - version = "0.2.0"; - }; - fiber-local = { - dependencies = [ "fiber-storage" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01lz929qf3xa90vra1ai1kh059kf2c8xarfy6xbv1f8g457zk1f8"; - type = "gem"; - }; - version = "1.1.0"; - }; - fiber-storage = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0b5fr7i4p2gfqv6k2d93124zcv2kbdzvamalbcb1hn1yzm12gxq2"; - type = "gem"; - }; - version = "0.1.2"; - }; - find_a_port = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1sswgpvn38yav4i21adrr7yy8c8299d7rj065gd3iwg6nn26lpb0"; - type = "gem"; - }; - version = "1.0.1"; - }; - flipper = { - dependencies = [ "concurrent-ruby" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0sgqc90fs9bmphaaphr7366ngy9wj2g4513dfdc36r1ljij4lp7x"; - type = "gem"; - }; - version = "0.28.3"; - }; - flipper-active_record = { - dependencies = [ - "activerecord" - "flipper" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "080rmmhz9kf4m3z845gqwm4f4cdr4pihhmsprxsjn1m8blk1raf6"; - type = "gem"; - }; - version = "0.28.3"; - }; - flipper-active_support_cache_store = { - dependencies = [ - "activesupport" - "flipper" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zfrzfbbr7kc2g5bdvlvf0yd43vpjsfkmcyl07q0c0ljg42y46hi"; - type = "gem"; - }; - version = "0.28.3"; - }; - fog-aliyun = { - dependencies = [ - "addressable" - "aliyun-sdk" - "fog-core" - "fog-json" - "ipaddress" - "xml-simple" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0f6cwnq4vq628lgv1wn7fzmwgcpv840zbmcwpfpiwy7b9dh388wg"; - type = "gem"; - }; - version = "0.4.0"; - }; - fog-aws = { - dependencies = [ - "base64" - "fog-core" - "fog-json" - "fog-xml" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1f67gjmvpcdql5mh4z9z0i03snwx80q7y37nyp1bgryb61gic4vm"; - type = "gem"; - }; - version = "3.27.0"; - }; - fog-core = { - dependencies = [ - "builder" - "excon" - "formatador" - "mime-types" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; - type = "gem"; - }; - version = "2.1.0"; - }; - fog-google = { - dependencies = [ - "addressable" - "fog-core" - "fog-json" - "fog-xml" - "google-apis-compute_v1" - "google-apis-dns_v1" - "google-apis-iamcredentials_v1" - "google-apis-monitoring_v3" - "google-apis-pubsub_v1" - "google-apis-sqladmin_v1beta4" - "google-apis-storage_v1" - "google-cloud-env" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1q2qhdkz7axp1f853d3jxx852gj5idrqhypxk8k3zm9fs72lxmnw"; - type = "gem"; - }; - version = "1.24.1"; - }; - fog-json = { - dependencies = [ - "fog-core" - "multi_json" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; - type = "gem"; - }; - version = "1.2.0"; - }; - fog-local = { - dependencies = [ "fog-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0yggsxd7c58p5i8zgvfw9rkqlg75l6hkbwnpgawd2sacwl4jsfr6"; - type = "gem"; - }; - version = "0.8.0"; - }; - fog-xml = { - dependencies = [ - "fog-core" - "nokogiri" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n"; - type = "gem"; - }; - version = "0.1.3"; - }; - formatador = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; - type = "gem"; - }; - version = "0.2.5"; - }; - forwardable = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1b5g1i3xdvmxxpq4qp0z4v78ivqnazz26w110fh4cvzsdayz8zgi"; - type = "gem"; - }; - version = "1.3.3"; - }; - fugit = { - dependencies = [ - "et-orbi" - "raabro" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578"; - type = "gem"; - }; - version = "1.11.1"; - }; - fuzzyurl = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03qchs33vfwbsv5awxg3acfmlcrf5xbhnbrc83fdpamwya0glbjl"; - type = "gem"; - }; - version = "0.9.0"; - }; - gapic-common = { - dependencies = [ - "faraday" - "faraday-retry" - "google-protobuf" - "googleapis-common-protos" - "googleapis-common-protos-types" - "googleauth" - "grpc" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rlka373b2iva4dz2diz2zx7jyx617hwqvnfx2hs5xs0nh24fc5g"; - type = "gem"; - }; - version = "0.20.0"; - }; - gdk-toogle = { - dependencies = [ - "haml" - "rails" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jfjp87f4zi5jp8ydwabvfz3dv115ickaaasbs8c096kfqjrgf1q"; - type = "gem"; - }; - version = "0.9.5"; - }; - gemoji = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; - type = "gem"; - }; - version = "3.0.1"; - }; - get_process_mem = { - dependencies = [ "ffi" ]; - groups = [ - "default" - "puma" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1fkyyyxjcx4iigm8vhraa629k2lxa1npsv4015y82snx84v3rzaa"; - type = "gem"; - }; - version = "0.2.7"; - }; - gettext = { - dependencies = [ - "erubi" - "locale" - "prime" - "racc" - "text" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0aji3873pxn6gc5qkvnv5y9025mqk0p6h22yrpyz2b3yx9qpzv03"; - type = "gem"; - }; - version = "3.5.1"; - }; - gettext_i18n_rails = { - dependencies = [ "fast_gettext" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1rlfmhhampvkzir32yqriry6rc6w66l36kb95lmfav4bjafp796l"; - type = "gem"; - }; - version = "1.13.0"; - }; - git = { - dependencies = [ - "addressable" - "rchardet" - ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0w3xhay1z7qx9ab04wmy5p4f1fadvqa6239kib256wsiyvcj595h"; - type = "gem"; - }; - version = "1.19.1"; - }; - gitaly = { - dependencies = [ "grpc" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kvv1idqscqh03wp6xcb5mi03j5hksbnn8dadcwpv2izm0srfv8r"; - type = "gem"; - }; - version = "17.8.4"; - }; - gitlab = { - dependencies = [ - "httparty" - "terminal-table" - ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ycnjjk1im5a82k02avix7c5c87vrkl87gsghgq29g2x34z5wr1z"; - type = "gem"; - }; - version = "4.19.0"; - }; - gitlab-active-context = { - dependencies = [ - "activerecord" - "activesupport" - "connection_pool" - "elasticsearch" - "opensearch-ruby" - "pg" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/gems/gitlab-active-context"; - type = "path"; - }; - version = "0.0.1"; - }; - gitlab-backup-cli = { - dependencies = [ - "activerecord" - "activesupport" - "addressable" - "concurrent-ruby" - "faraday" - "google-cloud-storage_transfer" - "google-protobuf" - "googleauth" - "grpc" - "json" - "jwt" - "logger" - "minitest" - "parallel" - "pg" - "rack" - "rainbow" - "rexml" - "thor" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/gems/gitlab-backup-cli"; - type = "path"; - }; - version = "0.0.1"; - }; - gitlab-chronic = { - dependencies = [ "numerizer" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1b592pa4f837idpg0a8cs8dfq18nvxm34bwvmv3amlln2cdd2i52"; - type = "gem"; - }; - version = "0.10.6"; - }; - gitlab-cloud-connector = { - dependencies = [ - "activesupport" - "jwt" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1bsis23gkm8p2q7p24l2si3iw3r329ygmklahakbh7lfd4yd3wpd"; - type = "gem"; - }; - version = "1.0.0"; - }; - gitlab-dangerfiles = { - dependencies = [ - "danger" - "danger-gitlab" - "rake" - ]; - groups = [ - "danger" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "007kxhbfi5kv7m4w9pvbrkfqwb8yp8shp8i77mj2l59qjqf35bdv"; - type = "gem"; - }; - version = "4.8.1"; - }; - gitlab-duo-workflow-service-client = { - dependencies = [ "grpc" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/gitlab-duo-workflow-service-client"; - type = "path"; - }; - version = "0.1"; - }; - gitlab-experiment = { - dependencies = [ - "activesupport" - "request_store" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0j0zs29izmhqc1jvgfsvikqdyg6r8kf3j9azbmsmm02l45sfwc7j"; - type = "gem"; - }; - version = "0.9.1"; - }; - gitlab-fog-azure-rm = { - dependencies = [ - "faraday" - "faraday-follow_redirects" - "faraday-net_http_persistent" - "fog-core" - "fog-json" - "mime-types" - "net-http-persistent" - "nokogiri" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1acbwzi4dkixfmb2rggzf4pg65cyxhbggrs4642p8y7mf0hpraii"; - type = "gem"; - }; - version = "2.2.0"; - }; - gitlab-glfm-markdown = { - dependencies = [ "rb_sys" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "188laljplhci8pr8crxi3b0sj9501zya74ipqyg33gkv0cf4h3ln"; - type = "gem"; - }; - version = "0.0.28"; - }; - gitlab-housekeeper = { - dependencies = [ - "activesupport" - "awesome_print" - "httparty" - "rubocop" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - path = "${src}/gems/gitlab-housekeeper"; - type = "path"; - }; - version = "0.1.0"; - }; - gitlab-http = { - dependencies = [ - "activesupport" - "concurrent-ruby" - "httparty" - "ipaddress" - "net-http" - "railties" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/gems/gitlab-http"; - type = "path"; - }; - version = "0.1.0"; - }; - gitlab-kas-grpc = { - dependencies = [ "grpc" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n59m8jy9nl2adr27dgqbbrg8w9bwgjvg1jzinmwwhf7d4b0qj7x"; - type = "gem"; - }; - version = "17.9.1"; - }; - gitlab-labkit = { - dependencies = [ - "actionpack" - "activesupport" - "grpc" - "jaeger-client" - "opentracing" - "pg_query" - "redis" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0w7szxnvh9hvxcragnqvn37c6jpm4gf7aadzxslajj91vdh0mpfj"; - type = "gem"; - }; - version = "0.37.0"; - }; - gitlab-license = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05nhswkfhxkr5y87gkq17h23a1kkr78c2n7pgg3hwr1m73kql7rc"; - type = "gem"; - }; - version = "2.6.0"; - }; - gitlab-mail_room = { - dependencies = [ - "jwt" - "net-imap" - "oauth2" - "redis" - "redis-namespace" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05i3jvgjv3rqyiwyfjpk0mp419f5jl5gn2m0grsgak09jaw7vh05"; - type = "gem"; - }; - version = "0.0.27"; - }; - gitlab-markup = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bm0zccj88aavy23vqy1pkz4gmbw6gdb40n0wqlz7a332j3iq6lm"; - type = "gem"; - }; - version = "2.0.0"; - }; - gitlab-net-dns = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0vkw1537wh37n57cygh7p2vb9fz4phbz2cg6njvq0545ihyn3d3k"; - type = "gem"; - }; - version = "0.10.0"; - }; - gitlab-rspec = { - dependencies = [ - "activerecord" - "activesupport" - "rspec" - ]; - groups = [ - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - path = "${src}/gems/gitlab-rspec"; - type = "path"; - }; - version = "0.1.0"; - }; - gitlab-rspec_flaky = { - dependencies = [ - "activesupport" - "rspec" - ]; - groups = [ - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - path = "${src}/gems/gitlab-rspec_flaky"; - type = "path"; - }; - version = "0.1.0"; - }; - gitlab-safe_request_store = { - dependencies = [ - "rack" - "request_store" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/gems/gitlab-safe_request_store"; - type = "path"; - }; - version = "0.1.0"; - }; - gitlab-schema-validation = { - dependencies = [ - "diffy" - "pg_query" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/gems/gitlab-schema-validation"; - type = "path"; - }; - version = "0.1.0"; - }; - gitlab-sdk = { - dependencies = [ - "activesupport" - "rake" - "snowplow-tracker" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0457dvz8zsb4fav85ry1v5pdzpyr41q397zgqzvjvfaa9w44kfj8"; - type = "gem"; - }; - version = "0.3.1"; - }; - gitlab-secret_detection = { - dependencies = [ - "grpc" - "grpc-tools" - "grpc_reflection" - "parallel" - "re2" - "toml-rb" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04sn44br9qcv5s4p2z0sjv402nlpiw0ial5gx0np9v1dcppqfpcr"; - type = "gem"; - }; - version = "0.19.0"; - }; - gitlab-security_report_schemas = { - dependencies = [ - "activesupport" - "json_schemer" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1bl0qrmb6xci719zxnaizja2pf0wabzi91b49y0immf9gr43f01h"; - type = "gem"; - }; - version = "0.1.2.min15.0.0.max15.2.1"; - }; - gitlab-sidekiq-fetcher = { - dependencies = [ - "json" - "sidekiq" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/sidekiq-reliable-fetch"; - type = "path"; - }; - version = "0.12.0"; - }; - gitlab-styles = { - dependencies = [ - "rubocop" - "rubocop-capybara" - "rubocop-factory_bot" - "rubocop-graphql" - "rubocop-performance" - "rubocop-rails" - "rubocop-rspec" - "rubocop-rspec_rails" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hgjrf41dvpsrblanhk00x367csjs3y4y2mlnxl5hd8njrrcbis6"; - type = "gem"; - }; - version = "13.1.0"; - }; - gitlab-topology-service-client = { - dependencies = [ - "google-protobuf" - "grpc" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/gitlab-topology-service-client"; - type = "path"; - }; - version = "0.1"; - }; - gitlab-utils = { - dependencies = [ - "actionview" - "activesupport" - "addressable" - "rake" - ]; - groups = [ "monorepo" ]; - platforms = [ ]; - source = { - path = "${src}/gems/gitlab-utils"; - type = "path"; - }; - version = "0.1.0"; - }; - gitlab_chronic_duration = { - dependencies = [ "numerizer" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0vf1zw3z45m6ldwjvvzvbc6gr0spcbl1x1vny4qwid8msi26jxhd"; - type = "gem"; - }; - version = "0.12.0"; - }; - gitlab_omniauth-ldap = { - dependencies = [ - "net-ldap" - "omniauth" - "pyu-ruby-sasl" - "rubyntlm" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1343sax19jidp7nr4s8bxpkyqwy6zb9lfslg99jys8xinfn20kdv"; - type = "gem"; - }; - version = "2.2.0"; - }; - gitlab_quality-test_tooling = { - dependencies = [ - "activesupport" - "amatch" - "fog-google" - "gitlab" - "http" - "influxdb-client" - "nokogiri" - "parallel" - "rainbow" - "rspec-parameterized" - "table_print" - "zeitwerk" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1c9wdinaf1z4qdynighcxxpkfarkizzh9slg2y77240mdsrgkyr9"; - type = "gem"; - }; - version = "2.8.0"; - }; - globalid = { - dependencies = [ "activesupport" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; - type = "gem"; - }; - version = "1.1.0"; - }; - gon = { - dependencies = [ - "actionpack" - "i18n" - "multi_json" - "request_store" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1w6ji15jrl4p6q0gxy5mmqspvzbmgkqj1d3xmbqr0a1rb7b1i9p3"; - type = "gem"; - }; - version = "6.4.0"; - }; - google-apis-androidpublisher_v3 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "09almff2kzdkciai63365q18wy0dfjhj48h8wa7lk77pjbfxgqfp"; - type = "gem"; - }; - version = "0.34.0"; - }; - google-apis-cloudbilling_v1 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zc6g2nx5l3qgf0kd8437ax1jwbmrxha2r2j17alyrn2pnp74ayv"; - type = "gem"; - }; - version = "0.22.0"; - }; - google-apis-cloudresourcemanager_v1 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1gzv5svbj62qcdw5ljva0sh8wifjx9wwx00kfj9bbff052i7597h"; - type = "gem"; - }; - version = "0.31.0"; - }; - google-apis-compute_v1 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0s40lzp1nvnpda45lvybira8gll8snkdd4v3x7sl8fmwi9a18ia0"; - type = "gem"; - }; - version = "0.57.0"; - }; - google-apis-container_v1 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0914hq1wcnvg68vcdwpq5kxnm5h38ay7rrdsrzlqn9i7rca2a7bq"; - type = "gem"; - }; - version = "0.43.0"; - }; - google-apis-container_v1beta1 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1l0k0davbaaqx76jy9vb6vk6j0l9hl68jmkgn7m6r4nvi37qzi38"; - type = "gem"; - }; - version = "0.43.0"; - }; - google-apis-core = { - dependencies = [ - "addressable" - "googleauth" - "httpclient" - "mini_mime" - "representable" - "retriable" - "rexml" - "webrick" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cly6ycryjhk15d60v3nqvhqpjk9f0nznnslbdnin90f5r54sbpd"; - type = "gem"; - }; - version = "0.11.2"; - }; - google-apis-dns_v1 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ivx6km85mlycb11x2rbkyg3kl4syy3730q7pk8h6zdkibbp7ljx"; - type = "gem"; - }; - version = "0.36.0"; - }; - google-apis-iam_v1 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rhzka4h1zg83zdyalbic25xbp8wrywsdfi6hdp663axdf3y5dqd"; - type = "gem"; - }; - version = "0.36.0"; - }; - google-apis-iamcredentials_v1 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "06smnmn2s460xl9x9rh07a3fkqdrjjy6azmx8iywggqgv2k5d8p9"; - type = "gem"; - }; - version = "0.15.0"; - }; - google-apis-monitoring_v3 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0a31sid7p4qn4m1gcq8z1bsqdyzzc84h4frh2dw97k5lwpff2zv7"; - type = "gem"; - }; - version = "0.54.0"; - }; - google-apis-pubsub_v1 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01dj7jx6dfyl4wz88nn7ml45qvck6khl7gli8h6hl9c1qwa4dzhx"; - type = "gem"; - }; - version = "0.45.0"; - }; - google-apis-serviceusage_v1 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qmh25nvf8f9p9fribm18nszvamilshavrmwyq3xmrs76q17w2sz"; - type = "gem"; - }; - version = "0.28.0"; - }; - google-apis-sqladmin_v1beta4 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "17bljsgmbp80d6wn3wjbzi537a9f5hmcr0zv776z2y8q92v565am"; - type = "gem"; - }; - version = "0.41.0"; - }; - google-apis-storage_v1 = { - dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1k432qgxf41c4m6d68rascm0gyj18r7ypmrnyzmxh7k7nh543awx"; - type = "gem"; - }; - version = "0.29.0"; - }; - google-cloud-artifact_registry-v1 = { - dependencies = [ - "gapic-common" - "google-cloud-errors" - "google-cloud-location" - "grpc-google-iam-v1" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0gkq82lsjz3yw9w819ifdqx9ixcbgydr5myy64wnczknx7fd505s"; - type = "gem"; - }; - version = "0.11.0"; - }; - google-cloud-common = { - dependencies = [ - "google-protobuf" - "googleapis-common-protos-types" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1yxmdxx933q48397jsczsmpshr4b61izv3spnhvzxd24s67v13bk"; - type = "gem"; - }; - version = "1.1.0"; - }; - google-cloud-compute-v1 = { - dependencies = [ - "gapic-common" - "google-cloud-common" - "google-cloud-errors" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "07hly5qbdy0qddw48biw0ybi2cx13861l5i09mj2abzw7yrmjq5r"; - type = "gem"; - }; - version = "2.6.0"; - }; - google-cloud-core = { - dependencies = [ - "google-cloud-env" - "google-cloud-errors" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0dagdfx3rnk9xplnj19gqpqn41fd09xfn8lp2p75psihhnj2i03l"; - type = "gem"; - }; - version = "1.7.0"; - }; - google-cloud-env = { - dependencies = [ "faraday" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg"; - type = "gem"; - }; - version = "2.1.1"; - }; - google-cloud-errors = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jynh1s93nl8njm5l5wcy86pnjmv112cq6m0443s52f04hg6h2s5"; - type = "gem"; - }; - version = "1.3.0"; - }; - google-cloud-location = { - dependencies = [ - "gapic-common" - "google-cloud-errors" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1l6j0i8flfdzl9c7db990632jmn5v7bmbh1i6x0sqp3f2p59jv1q"; - type = "gem"; - }; - version = "0.6.0"; - }; - google-cloud-profiler-v2 = { - dependencies = [ - "gapic-common" - "google-cloud-errors" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1qyknlvwji7vqhani490cacsrzlqfza10hv47him93yhfnqjmz2k"; - type = "gem"; - }; - version = "0.4.0"; - }; - google-cloud-storage = { - dependencies = [ - "addressable" - "digest-crc" - "google-apis-iamcredentials_v1" - "google-apis-storage_v1" - "google-cloud-core" - "googleauth" - "mini_mime" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0033bi8qwm0ksxsv5zhz4nzwsiaapq3xk79z8f8rx3v09vdap07j"; - type = "gem"; - }; - version = "1.45.0"; - }; - google-cloud-storage_transfer = { - dependencies = [ - "google-cloud-core" - "google-cloud-storage_transfer-v1" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n0nxy4l2kzcmcgx7j8mppyw9gwc8331fqcf6w6jmq4913sh2a8k"; - type = "gem"; - }; - version = "1.2.0"; - }; - google-cloud-storage_transfer-v1 = { - dependencies = [ - "gapic-common" - "google-cloud-errors" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xk1i7wg5alcgd9v4f0y3mjgxbsrcp53jhdjdc26wmfvfl1giglx"; - type = "gem"; - }; - version = "0.8.0"; - }; - google-protobuf = { - groups = [ - "default" - "development" - "opentelemetry" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0g0h7rwiivx93jddfws5pdkcpnhma3694k2jfv2i1k80qkrqnrmv"; - type = "gem"; - }; - version = "3.25.6"; - }; - googleapis-common-protos = { - dependencies = [ - "google-protobuf" - "googleapis-common-protos-types" - "grpc" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10p3kl9xdxl4xsijkj2l6qn525xchkbfhx3ch603ammibbxq08ys"; - type = "gem"; - }; - version = "1.4.0"; - }; - googleapis-common-protos-types = { - dependencies = [ "google-protobuf" ]; - groups = [ - "default" - "opentelemetry" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "17smfrcmklx2f3ld6ai8l3vz9i8m96cj72zdyygnpy1iykf1j398"; - type = "gem"; - }; - version = "1.18.0"; - }; - googleauth = { - dependencies = [ - "faraday" - "jwt" - "multi_json" - "os" - "signet" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1"; - type = "gem"; - }; - version = "1.8.1"; - }; - gpgme = { - dependencies = [ "mini_portile2" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0r1vmql7w7ka5xzj1aqf8pk2a4sv0znwj2zkg1fgvd5b89qcvv2k"; - type = "gem"; - }; - version = "2.0.24"; - }; - grape = { - dependencies = [ - "activesupport" - "builder" - "dry-types" - "mustermann-grape" - "rack" - "rack-accept" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jj98w80ry1ir8lc3347130s0z8yd7gk727r9ynwwk782x6gkvrs"; - type = "gem"; - }; - version = "2.0.0"; - }; - grape-entity = { - dependencies = [ - "activesupport" - "multi_json" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0d16s18k34crhyc44ycj062y81sdahgp8pcll9xggbq7wja9w3z0"; - type = "gem"; - }; - version = "1.0.1"; - }; - grape-path-helpers = { - dependencies = [ - "activesupport" - "grape" - "rake" - "ruby2_keywords" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1mq2cwy0jvprq3wdilds1n865jdl58sqg00im4w6fybf5kjiclmd"; - type = "gem"; - }; - version = "2.0.1"; - }; - grape-swagger = { - dependencies = [ - "grape" - "rack-test" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "153jhazisala3f7wzcvx8nf2d3f0m3dpb240fm2p1vmsr19vvmwa"; - type = "gem"; - }; - version = "2.1.2"; - }; - grape-swagger-entity = { - dependencies = [ - "grape-entity" - "grape-swagger" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1rpcsyzagcmd6pjixvms7mq0nc0aky53aw9mb9vmc6jbjqlfp852"; - type = "gem"; - }; - version = "0.5.5"; - }; - grape_logging = { - dependencies = [ - "grape" - "rack" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1lcjqwal3wc2r41wsi01d09cyhxhglxp6y7hd0564pdx5lr3xk7g"; - type = "gem"; - }; - version = "1.8.4"; - }; - graphlient = { - dependencies = [ - "faraday" - "graphql-client" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cbwirpx8hclxyrxfbjz5c62l7i6nsqg6x72yplm8d083pd0ii4q"; - type = "gem"; - }; - version = "0.8.0"; - }; - graphlyte = { - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kc0l67n5zlpwbnb8nrr27nm4fzpb7qih77a00grcvnygnv4mbxm"; - type = "gem"; - }; - version = "1.0.0"; - }; - graphql = { - dependencies = [ - "base64" - "fiber-storage" - "logger" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/graphql"; - type = "path"; - }; - version = "2.4.11"; - }; - graphql-client = { - dependencies = [ - "activesupport" - "graphql" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hdb5fd1vd1zs7kc84ng7lj95081dqwrapyidg8alsv7a7jbhf7j"; - type = "gem"; - }; - version = "0.23.0"; - }; - graphql-docs = { - dependencies = [ - "commonmarker" - "escape_utils" - "extended-markdown-filter" - "gemoji" - "graphql" - "html-pipeline" - "sass-embedded" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "011dasgfg93s39p2nnf88v2w9ds2czqxpgxvkxm4nfl0b9pcmfkn"; - type = "gem"; - }; - version = "5.0.0"; - }; - grpc = { - dependencies = [ - "google-protobuf" - "googleapis-common-protos-types" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "11ink0ayf14qgs3msn5a7dpg49vm3ck2415r64nfk1i8xv286hsz"; - type = "gem"; - }; - version = "1.63.0"; - }; - grpc-google-iam-v1 = { - dependencies = [ - "google-protobuf" - "googleapis-common-protos" - "grpc" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kip34n9604j2cc9rkplv5ljq0n8f4aizix4yr8rginsa38md8yf"; - type = "gem"; - }; - version = "1.5.0"; - }; - grpc-tools = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19r3ky3l593prhmk8ixdc4w1rbiyqzfw4dd0gk9ds1f38vhgrhyx"; - type = "gem"; - }; - version = "1.69.0"; - }; - grpc_reflection = { - dependencies = [ "grpc" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0yq9344fbjgkzxb54chwf26sf62iv5zv57js7dihg94lyw9dyixw"; - type = "gem"; - }; - version = "0.1.1"; - }; - gssapi = { - dependencies = [ "ffi" ]; - groups = [ "kerberos" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; - type = "gem"; - }; - version = "1.3.1"; - }; - guard = { - dependencies = [ - "formatador" - "listen" - "lumberjack" - "nenv" - "notiffany" - "pry" - "shellany" - "thor" - ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1fwgvkmrg97xfswwgfrfcl1nc937yxwazfvpmf8vxj7cvnx7mfki"; - type = "gem"; - }; - version = "2.16.2"; - }; - guard-compat = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zj6sr1k8w59mmi27rsii0v8xyy2rnsi09nqvwpgj1q10yq1mlis"; - type = "gem"; - }; - version = "1.2.1"; - }; - guard-rspec = { - dependencies = [ - "guard" - "guard-compat" - "rspec" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jkm5xp90gm4c5s51pmf92i9hc10gslwwic6mvk72g0yplya0yx4"; - type = "gem"; - }; - version = "4.7.3"; - }; - haml = { - dependencies = [ - "temple" - "tilt" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "035fgbfr20m08w4603ls2lwqbggr0vy71mijz0p68ib1am394xbf"; - type = "gem"; - }; - version = "5.2.2"; - }; - haml_lint = { - dependencies = [ - "haml" - "parallel" - "rainbow" - "rubocop" - "sysexits" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "08yn3z438hgh186iyvkqrhcy0fzzaky8j4h1hlbzzlfam49ckmx8"; - type = "gem"; - }; - version = "0.61.0"; - }; - hamlit = { - dependencies = [ - "temple" - "thor" - "tilt" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "13n3v9kbyrrm48hn1v0028cdrsq7pswb4s4w63x4b29kc99m1s6j"; - type = "gem"; - }; - version = "2.15.0"; - }; - hana = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03cvrv2wl25j9n4n509hjvqnmwa60k92j741b64a1zjisr1dn9al"; - type = "gem"; - }; - version = "1.3.7"; - }; - hashdiff = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jf9dxgjz6z7fvymyz2acyvn9iyvwkn6d9sk7y4fxwbmfc75yimm"; - type = "gem"; - }; - version = "1.1.0"; - }; - hashie = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; - type = "gem"; - }; - version = "5.0.0"; - }; - health_check = { - dependencies = [ "railties" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0mrv2323hx4lbcr6xii6ry89b3zvly5jsaacwbblxibx4c46a50h"; - type = "gem"; - }; - version = "3.1.0"; - }; - heapy = { - dependencies = [ "thor" ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1sl56ma851i82g3ax08igbn48igriiy152xzx30wgzv1bn21w53l"; - type = "gem"; - }; - version = "0.2.0"; - }; - html-pipeline = { - dependencies = [ - "activesupport" - "nokogiri" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "180kjksi0sdlqb0aq0bhal96ifwqm25hzb3w709ij55j51qls7ca"; - type = "gem"; - }; - version = "2.14.3"; - }; - html2text = { - dependencies = [ "nokogiri" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii"; - type = "gem"; - }; - version = "0.2.0"; - }; - htmlbeautifier = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1y55dx25l3wwc025mwl6jsbcsqrm30gs2d2pxnaxg07yh22ckq4x"; - type = "gem"; - }; - version = "1.4.2"; - }; - htmlentities = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; - type = "gem"; - }; - version = "4.3.4"; - }; - http = { - dependencies = [ - "addressable" - "http-cookie" - "http-form_data" - "llhttp-ffi" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; - type = "gem"; - }; - version = "5.1.1"; - }; - http-accept = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6"; - type = "gem"; - }; - version = "1.7.0"; - }; - http-cookie = { - dependencies = [ "domain_name" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; - type = "gem"; - }; - version = "1.0.5"; - }; - http-form_data = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1wx591jdhy84901pklh1n9sgh74gnvq1qyqxwchni1yrc49ynknc"; - type = "gem"; - }; - version = "2.3.0"; - }; - httparty = { - dependencies = [ - "csv" - "mini_mime" - "multi_xml" - ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v7s60abgwkahkqi4lf68hmz3j69jli3q25jsf9h1kvijif2lrbq"; - type = "gem"; - }; - version = "0.22.0"; - }; - httpclient = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; - type = "gem"; - }; - version = "2.8.3"; - }; - i18n = { - dependencies = [ "concurrent-ruby" ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; - type = "gem"; - }; - version = "1.14.4"; - }; - i18n_data = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rizqqss1bvb668mw72ls7rlj6im82aizz230jxn7d39kaq9kap5"; - type = "gem"; - }; - version = "0.13.1"; - }; - icalendar = { - dependencies = [ - "ice_cube" - "ostruct" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "11fl1kfqvgnh0vnryc9kbbaal693kdgf5h6qnj37p9wz5xkw5gqf"; - type = "gem"; - }; - version = "2.10.3"; - }; - ice_cube = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1dri4mcya1fwzrr9nzic8hj1jr28a2szjag63f9k7p2bw9fpw4fs"; - type = "gem"; - }; - version = "0.16.4"; - }; - ice_nine = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; - type = "gem"; - }; - version = "0.11.2"; - }; - imagen = { - dependencies = [ "parser" ]; - groups = [ - "coverage" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jz2750ildym7bfppx143zik7n576mpzrsqm4slxnxw80w9fk7rn"; - type = "gem"; - }; - version = "0.2.0"; - }; - influxdb-client = { - dependencies = [ "csv" ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1wp1p29hg5xb1izrl5xr6azp8x0l9kx9nvdg66glrxj20p48w7nw"; - type = "gem"; - }; - version = "3.2.0"; - }; - invisible_captcha = { - dependencies = [ "rails" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "07ibhphcvf9lfaar9g78cazbdrp03dzfks53bcaiss8vxgrm5d02"; - type = "gem"; - }; - version = "2.1.0"; - }; - io-event = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hag7zbmsvkbmv0486bxqvnngym4mhsj32aywwmklr5d21k2n9jc"; - type = "gem"; - }; - version = "1.9.0"; - }; - ipaddress = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; - type = "gem"; - }; - version = "0.8.3"; - }; - ipynbdiff = { - dependencies = [ - "diffy" - "oj" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/gems/ipynbdiff"; - type = "path"; - }; - version = "0.4.8"; - }; - jaeger-client = { - dependencies = [ - "opentracing" - "thrift" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1a2qlkc1hkr5hkj2574l1a63sm04bdx98gfhh9m8vvp6psdrnpnb"; - type = "gem"; - }; - version = "1.1.0"; - }; - jaro_winkler = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10fd3i92897blalxfkgc0jjv0qqx31v7cm7j2b6a3b97an0bfz80"; - type = "gem"; - }; - version = "1.5.6"; - }; - jira-ruby = { - dependencies = [ - "activesupport" - "atlassian-jwt" - "multipart-post" - "oauth" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qpbc97sag426h4hgcizqq2njxx5fridzxq6mq5s93jazxmnxwmb"; - type = "gem"; - }; - version = "2.3.0"; - }; - jmespath = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; - type = "gem"; - }; - version = "1.6.2"; - }; - js_regex = { - dependencies = [ - "character_set" - "regexp_parser" - "regexp_property_values" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1da4ccsq5bycg28iv0smmrra80jad3a8ya10lps5lv8fbbfvqd3r"; - type = "gem"; - }; - version = "3.8.0"; - }; - json = { - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x"; - type = "gem"; - }; - version = "2.10.1"; - }; - json-jwt = { - dependencies = [ - "activesupport" - "aes_key_wrap" - "base64" - "bindata" - "faraday" - "faraday-follow_redirects" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v16kd05ijdmw1q8avpfsjkdiha6c2070hbz2g2fqg3lv2f1yidb"; - type = "gem"; - }; - version = "1.16.6"; - }; - json_schemer = { - dependencies = [ - "bigdecimal" - "hana" - "regexp_parser" - "simpleidn" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0dgbrps0ydiyxcgj5n4dny0cmzwj125x1s792l7m5jjrp1rs27wz"; - type = "gem"; - }; - version = "2.3.0"; - }; - jsonb_accessor = { - dependencies = [ - "activerecord" - "activesupport" - "pg" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1avnyx2ympzbmkqbc9dfy87npzcfia8sys2dc9m6prs3p1y0h3h1"; - type = "gem"; - }; - version = "1.4"; - }; - jsonpath = { - dependencies = [ "multi_json" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fkdjic88hh0accp0sbx5mcrr9yaqwampf5c3214212d4i614138"; - type = "gem"; - }; - version = "1.1.2"; - }; - jwt = { - dependencies = [ "base64" ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rba9mji57sfa1kjhj0bwff1377vj0i8yx2rd39j5ik4vp60gzam"; - type = "gem"; - }; - version = "2.9.3"; - }; - kaminari = { - dependencies = [ - "activesupport" - "kaminari-actionview" - "kaminari-activerecord" - "kaminari-core" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0gia8irryvfhcr6bsr64kpisbgdbqjsqfgrk12a11incmpwny1y4"; - type = "gem"; - }; - version = "1.2.2"; - }; - kaminari-actionview = { - dependencies = [ - "actionview" - "kaminari-core" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02f9ghl3a9b5q7l079d3yzmqjwkr4jigi7sldbps992rigygcc0k"; - type = "gem"; - }; - version = "1.2.2"; - }; - kaminari-activerecord = { - dependencies = [ - "activerecord" - "kaminari-core" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0c148z97s1cqivzbwrak149z7kl1rdmj7dxk6rpkasimmdxsdlqd"; - type = "gem"; - }; - version = "1.2.2"; - }; - kaminari-core = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zw3pg6kj39y7jxakbx7if59pl28lhk98fx71ks5lr3hfgn6zliv"; - type = "gem"; - }; - version = "1.2.2"; - }; - knapsack = { - dependencies = [ "rake" ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1f42akjbdkrg1ihwvls9pkkvz8vikaapzgxl82dd128rfn42chm9"; - type = "gem"; - }; - version = "4.0.0"; - }; - kramdown = { - dependencies = [ "rexml" ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7"; - type = "gem"; - }; - version = "2.5.1"; - }; - kramdown-parser-gfm = { - dependencies = [ "kramdown" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; - type = "gem"; - }; - version = "1.1.0"; - }; - kubeclient = { - dependencies = [ - "http" - "jsonpath" - "recursive-open-struct" - "rest-client" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1k1zi27fnasqpinfxnajm81pyr11k2j510wacr53d37v97bzr1a9"; - type = "gem"; - }; - version = "4.11.0"; - }; - language_server-protocol = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; - type = "gem"; - }; - version = "3.17.0.3"; - }; - launchy = { - dependencies = [ "addressable" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a"; - type = "gem"; - }; - version = "2.5.2"; - }; - lefthook = { - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hnx5s38myd0dgs7frm75ikvyl0g14pg1z7zjryp55j9p9dkrkab"; - type = "gem"; - }; - version = "1.11.2"; - }; - letter_opener = { - dependencies = [ "launchy" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cnv3ggnzyagl50vzs1693aacv08bhwlprcvjp8jcg2w7cp3zwrg"; - type = "gem"; - }; - version = "1.10.0"; - }; - letter_opener_web = { - dependencies = [ - "actionmailer" - "letter_opener" - "railties" - "rexml" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0q4qfi5wnn5bv93zjf10agmzap3sn7gkfmdbryz296wb1vz1wf9z"; - type = "gem"; - }; - version = "3.0.0"; - }; - libyajl2 = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vx0mv0bbcy0qh3ik08b42vrq4kw1zg51121r18c0vvp4p3zcpda"; - type = "gem"; - }; - version = "2.1.0"; - }; - license_finder = { - dependencies = [ - "rubyzip" - "thor" - "tomlrb" - "with_env" - "xml-simple" - ]; - groups = [ - "development" - "omnibus" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v66fb85majc816qip42kbwcn41lr6rm5w6zim4a2kgp74v0n0kd"; - type = "gem"; - }; - version = "7.1.0"; - }; - licensee = { - dependencies = [ - "dotenv" - "octokit" - "reverse_markdown" - "rugged" - "thor" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "16h8yhk4z2wk2lc0l0m7z2pbbk6mfljhy6hp11dx6lw8dp325q0b"; - type = "gem"; - }; - version = "9.17.1"; - }; - listen = { - dependencies = [ - "rb-fsevent" - "rb-inotify" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; - type = "gem"; - }; - version = "3.7.1"; - }; - llhttp-ffi = { - dependencies = [ - "ffi-compiler" - "rake" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5"; - type = "gem"; - }; - version = "0.4.0"; - }; - locale = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "107pm4ccmla23z963kyjldgngfigvchnv85wr6m69viyxxrrjbsj"; - type = "gem"; - }; - version = "2.1.4"; - }; - lockbox = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1sm365iplg1iscizckjm6zy57zs0350czi9afqfnvig0wh35i3na"; - type = "gem"; - }; - version = "1.3.0"; - }; - logger = { - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; - type = "gem"; - }; - version = "1.6.6"; - }; - lograge = { - dependencies = [ - "actionpack" - "activesupport" - "railties" - "request_store" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vrjm4yqn5l6q5gsl72fmk95fl6j9z1a05gzbrwmsm3gp1a1bgac"; - type = "gem"; - }; - version = "0.11.2"; - }; - loofah = { - dependencies = [ - "crass" - "nokogiri" - ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1"; - type = "gem"; - }; - version = "2.24.0"; - }; - lookbook = { - dependencies = [ - "activemodel" - "css_parser" - "htmlbeautifier" - "htmlentities" - "marcel" - "railties" - "redcarpet" - "rouge" - "view_component" - "yard" - "zeitwerk" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01bni0dlqc9blb1akqsna39l2wb9a9dgv75mqhihrb0lnng4qj0n"; - type = "gem"; - }; - version = "2.3.4"; - }; - lru_redux = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1yxghzg7476sivz8yyr9nkak2dlbls0b89vc2kg52k0nmg6d0wgf"; - type = "gem"; - }; - version = "1.1.0"; - }; - lumberjack = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "07rvqrizmqzbjzhdsh4l4fyif26a7czb506dvch18kr3nkkamim5"; - type = "gem"; - }; - version = "1.2.7"; - }; - mail = { - dependencies = [ - "mini_mime" - "net-imap" - "net-pop" - "net-smtp" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; - type = "gem"; - }; - version = "2.8.1"; - }; - mail-smtp_pool = { - dependencies = [ - "connection_pool" - "mail" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/mail-smtp_pool"; - type = "path"; - }; - version = "0.1.0"; - }; - marcel = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0"; - type = "gem"; - }; - version = "1.0.2"; - }; - marginalia = { - dependencies = [ - "actionpack" - "activerecord" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kw9l9gw9dqmbpjxs3ndifia2204n8n92pjr4xp78hiynqm22qyb"; - type = "gem"; - }; - version = "1.11.1"; - }; - matrix = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; - type = "gem"; - }; - version = "0.4.2"; - }; - memory_profiler = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q"; - type = "gem"; - }; - version = "1.0.1"; - }; - method_source = { - groups = [ - "default" - "development" - "metrics" - "test" - ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "ruby"; - } - ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; - type = "gem"; - }; - version = "1.0.0"; - }; - metrics = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1762zjanzjzr7jwig2arpj4h09ylhspipp9blx4pb9cjvgm8xv22"; - type = "gem"; - }; - version = "0.12.1"; - }; - microsoft_graph_mailer = { - dependencies = [ - "mail" - "oauth2" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/microsoft_graph_mailer"; - type = "path"; - }; - version = "0.1.0"; - }; - mime-types = { - dependencies = [ "mime-types-data" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; - type = "gem"; - }; - version = "3.5.1"; - }; - mime-types-data = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0yjv0apysnrhbc70ralinfpcqn9382lxr643swp7a5sdwpa9cyqg"; - type = "gem"; - }; - version = "3.2023.1003"; - }; - mini_histogram = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "156xs8k7fqqcbk1fbf0ndz6gfw380fb2jrycfvhb06269r84n4ba"; - type = "gem"; - }; - version = "0.3.1"; - }; - mini_magick = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; - type = "gem"; - }; - version = "4.12.0"; - }; - mini_mime = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; - type = "gem"; - }; - version = "1.1.2"; - }; - mini_portile2 = { - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; - type = "gem"; - }; - version = "2.8.8"; - }; - minitest = { - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; - type = "gem"; - }; - version = "5.11.3"; - }; - mixlib-cli = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6"; - type = "gem"; - }; - version = "2.1.8"; - }; - mixlib-config = { - dependencies = [ "tomlrb" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0j0122lv2qgccl61njqi0pj6sp6nb85y07gcmw16bwg4k0c8nx6p"; - type = "gem"; - }; - version = "3.0.27"; - }; - mixlib-log = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n5dm5iz90ijvjn59jfm8gb8hgsvbj0f1kpzbl38b02z0z4a4v7x"; - type = "gem"; - }; - version = "3.0.9"; - }; - mixlib-shellout = { - dependencies = [ "chef-utils" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0zkwg76y96nkh1mv0k92ybq46cr06v1wmic16129ls3yqzwx3xj6"; - type = "gem"; - }; - version = "3.2.7"; - }; - mize = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "105pjjmncf7q724swbygrbsgmh74ni4s2xaclbyjcm7zg64maca0"; - type = "gem"; - }; - version = "0.6.1"; - }; - msgpack = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; - type = "gem"; - }; - version = "1.5.4"; - }; - multi_json = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; - type = "gem"; - }; - version = "1.14.1"; - }; - multi_xml = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; - type = "gem"; - }; - version = "0.6.0"; - }; - multipart-post = { - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; - type = "gem"; - }; - version = "2.2.3"; - }; - murmurhash3 = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0dh9xnjs98a2by2rd8jlcmx94miryssk1ral2pji21xbx7i2q2ip"; - type = "gem"; - }; - version = "0.1.7"; - }; - mustermann = { - dependencies = [ "ruby2_keywords" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd"; - type = "gem"; - }; - version = "3.0.0"; - }; - mustermann-grape = { - dependencies = [ "mustermann" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zpmc099rcpxmlfxb71zd6l7f9fcsg1fhi6627r03y1qlgb0jlvg"; - type = "gem"; - }; - version = "1.0.2"; - }; - mutex_m = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg"; - type = "gem"; - }; - version = "0.3.0"; - }; - nap = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll"; - type = "gem"; - }; - version = "1.1.0"; - }; - nenv = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0r97jzknll9bhd8yyg2bngnnkj8rjhal667n7d32h8h7ny7nvpnr"; - type = "gem"; - }; - version = "0.3.0"; - }; - net-http = { - dependencies = [ "uri" ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; - type = "gem"; - }; - version = "0.6.0"; - }; - net-http-persistent = { - dependencies = [ "connection_pool" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "13psmr8009wwknainvns5jidhvjsknffb6k7mzz0yrby6h5qhhkf"; - type = "gem"; - }; - version = "4.0.5"; - }; - net-imap = { - dependencies = [ - "date" - "net-protocol" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1rgva7p9gvns2ndnqpw503mbd36i2skkggv0c0h192k8xr481phy"; - type = "gem"; - }; - version = "0.5.6"; - }; - net-ldap = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; - type = "gem"; - }; - version = "0.17.1"; - }; - net-ntp = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0z96m7nnb9f634cz4i6p0x89z7g9i9h97cnk5f3x3q5x090kzisv"; - type = "gem"; - }; - version = "2.1.3"; - }; - net-pop = { - dependencies = [ "net-protocol" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; - type = "gem"; - }; - version = "0.1.2"; - }; - net-protocol = { - dependencies = [ "timeout" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd"; - type = "gem"; - }; - version = "0.1.3"; - }; - net-scp = { - dependencies = [ "net-ssh" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; - type = "gem"; - }; - version = "4.0.0"; - }; - net-smtp = { - dependencies = [ "net-protocol" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; - type = "gem"; - }; - version = "0.3.3"; - }; - net-ssh = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p"; - type = "gem"; - }; - version = "7.3.0"; - }; - netrc = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; - type = "gem"; - }; - version = "0.11.0"; - }; - nio4r = { - groups = [ - "default" - "puma" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm"; - type = "gem"; - }; - version = "2.7.0"; - }; - nkf = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv"; - type = "gem"; - }; - version = "0.2.0"; - }; - no_proxy_fix = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "006dmdb640v1kq0sll3dnlwj1b0kpf3i1p27ygyffv8lpcqlr6sf"; - type = "gem"; - }; - version = "0.1.2"; - }; - nokogiri = { - dependencies = [ - "mini_portile2" - "racc" - ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0npx535cs8qc33n0lpbbwl0p9fi3a5bczn6ayqhxvknh9yqw77vb"; - type = "gem"; - }; - version = "1.18.3"; - }; - notiffany = { - dependencies = [ - "nenv" - "shellany" - ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0f47h3bmg1apr4x51szqfv3rh2vq58z3grh4w02cp3bzbdh6jxnk"; - type = "gem"; - }; - version = "0.1.3"; - }; - numerizer = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ysxf30qcybh131r98frp38sqqkdhcjwpnajgrxl2w2kxvapd075"; - type = "gem"; - }; - version = "0.2.0"; - }; - oauth = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0"; - type = "gem"; - }; - version = "0.5.6"; - }; - oauth2 = { - dependencies = [ - "faraday" - "jwt" - "multi_xml" - "rack" - "snaky_hash" - "version_gem" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1yzpaghh8kwzgmvmrlbzf36ks5s2hf34rayzw081dp2jrzprs7xj"; - type = "gem"; - }; - version = "2.0.9"; - }; - octokit = { - dependencies = [ - "faraday" - "sawyer" - ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05j3gz79gxkid3lc2balyllqik4v4swnm0rcvxz14m76bkrpz92g"; - type = "gem"; - }; - version = "9.2.0"; - }; - ohai = { - dependencies = [ - "chef-config" - "chef-utils" - "ffi" - "ffi-yajl" - "ipaddress" - "mixlib-cli" - "mixlib-config" - "mixlib-log" - "mixlib-shellout" - "plist" - "train-core" - "wmi-lite" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1w0zrk1n6n7jl493k4vv5xaiszbmxsmaffy9xvykbfawjjb83vj2"; - type = "gem"; - }; - version = "18.1.18"; - }; - oj = { - dependencies = [ - "bigdecimal" - "ostruct" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0z1xw7xm7xkxnslhxqvfzvv5f1q1cl40niwvaxny2cg3fkcvw9kz"; - type = "gem"; - }; - version = "3.16.10"; - }; - oj-introspect = { - dependencies = [ "oj" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0r4jgnw44qvswidfd8fh4s7pkdg34bmmrxn2wn0lhab0klq1bfsw"; - type = "gem"; - }; - version = "0.8.0"; - }; - omniauth = { - dependencies = [ - "hashie" - "rack" - "rack-protection" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y"; - type = "gem"; - }; - version = "2.1.2"; - }; - omniauth-alicloud = { - dependencies = [ "omniauth-oauth2" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0gh1d69w6p62hj18bh2p5fdykg9za1yifpq18swp9ms0pcx4yp4w"; - type = "gem"; - }; - version = "3.0.0"; - }; - omniauth-atlassian-oauth2 = { - dependencies = [ - "omniauth" - "omniauth-oauth2" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jbnbp0pnasyrf0mgyig72hx8bdwhv78na6ffqrs1f4a3155f1zb"; - type = "gem"; - }; - version = "0.2.0"; - }; - omniauth-auth0 = { - dependencies = [ - "omniauth" - "omniauth-oauth2" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cn2qsc8gs7ib7y94b87iwar7zyc54nhh9ygfyq4sf9pgcvq77ix"; - type = "gem"; - }; - version = "3.1.1"; - }; - omniauth-azure-activedirectory-v2 = { - dependencies = [ "omniauth-oauth2" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wnhibz903ssnq9scl65a47d41zcczb3wjvc44y3w8ydabfwx164"; - type = "gem"; - }; - version = "2.0.0"; - }; - omniauth-github = { - dependencies = [ - "omniauth" - "omniauth-oauth2" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1m6a7kg3lxz2nm96prln2ja8r4wlm37m5vsy9199vnynqq5fgy4g"; - type = "gem"; - }; - version = "2.0.1"; - }; - omniauth-gitlab = { - dependencies = [ - "omniauth" - "omniauth-oauth2" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/omniauth-gitlab"; - type = "path"; - }; - version = "4.0.0"; - }; - omniauth-google-oauth2 = { - dependencies = [ - "jwt" - "oauth2" - "omniauth" - "omniauth-oauth2" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fahkghfa2iczmwss9bz5l4rh7siwzjnjp3akh7pdbsfx0kg35j4"; - type = "gem"; - }; - version = "1.1.1"; - }; - omniauth-oauth2 = { - dependencies = [ - "oauth2" - "omniauth" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0y4y122xm8zgrxn5nnzwg6w39dnjss8pcq2ppbpx9qn7kiayky5j"; - type = "gem"; - }; - version = "1.8.0"; - }; - omniauth-oauth2-generic = { - dependencies = [ - "omniauth-oauth2" - "rake" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04vnmszmm1jmwvg6cwdy9jxliwa8yawp4w4690pvyplx04wqavnf"; - type = "gem"; - }; - version = "0.2.8"; - }; - omniauth-salesforce = { - dependencies = [ - "omniauth" - "omniauth-oauth2" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/omniauth-salesforce"; - type = "path"; - }; - version = "1.0.5"; - }; - omniauth-saml = { - dependencies = [ - "omniauth" - "ruby-saml" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1czvs3nj1d8pmf39vgghpbp7g1hgzbxlv8d563agr16nq856bk44"; - type = "gem"; - }; - version = "2.2.2"; - }; - omniauth-shibboleth-redux = { - dependencies = [ "omniauth" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1qgzp0xaka6vqpx69mw6nbqaqmyqrawi11cyak4gq19l23ym7cz9"; - type = "gem"; - }; - version = "2.0.0"; - }; - omniauth_crowd = { - dependencies = [ - "activesupport" - "nokogiri" - "omniauth" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/omniauth_crowd"; - type = "path"; - }; - version = "2.4.0"; - }; - omniauth_openid_connect = { - dependencies = [ - "omniauth" - "openid_connect" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "099xg7s6450wlfzs77mbdx78g3dp0glx5q6f44i78akf7283hbqz"; - type = "gem"; - }; - version = "0.8.0"; - }; - open4 = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1"; - type = "gem"; - }; - version = "1.3.4"; - }; - openid_connect = { - dependencies = [ - "activemodel" - "attr_required" - "email_validator" - "faraday" - "faraday-follow_redirects" - "json-jwt" - "mail" - "rack-oauth2" - "swd" - "tzinfo" - "validate_url" - "webfinger" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10i13cn40jiiw8lslkv7bj1isinnwbmzlk6msgiph3gqry08702x"; - type = "gem"; - }; - version = "2.3.1"; - }; - opensearch-ruby = { - dependencies = [ - "faraday" - "multi_json" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0pd0ihmsjp0m0ckrv3jnwhzmls3kz2pcn21yqas5jg7dddl231ha"; - type = "gem"; - }; - version = "3.4.0"; - }; - openssl = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "054d6ybgjdzxw567m7rbnd46yp6gkdbc5ihr536vxd3p15vbhjrw"; - type = "gem"; - }; - version = "3.2.0"; - }; - openssl-signature_algorithm = { - dependencies = [ "openssl" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53"; - type = "gem"; - }; - version = "1.3.0"; - }; - opentelemetry-api = { - groups = [ - "default" - "opentelemetry" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1j9c2a4wgw0jaw63qscfasw3lf3kr45q83p4mmlf0bndcq2rlgdb"; - type = "gem"; - }; - version = "1.2.5"; - }; - opentelemetry-common = { - dependencies = [ "opentelemetry-api" ]; - groups = [ - "default" - "opentelemetry" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "160ws06d8mzx3hwjss2i954h8r86dp3sw95k2wrbq81sb121m2gy"; - type = "gem"; - }; - version = "0.21.0"; - }; - opentelemetry-exporter-otlp = { - dependencies = [ - "google-protobuf" - "googleapis-common-protos-types" - "opentelemetry-api" - "opentelemetry-common" - "opentelemetry-sdk" - "opentelemetry-semantic_conventions" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1c0f345cpcqz3p6salmag9vhr7flirga35xivc01kvpli7scai1j"; - type = "gem"; - }; - version = "0.29.1"; - }; - opentelemetry-helpers-sql-obfuscation = { - dependencies = [ "opentelemetry-common" ]; - groups = [ - "default" - "opentelemetry" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0cnlr3gqmd2q9wcaxhvlkxkbjvvvkp4vzcwif1j7kydw7lvz2vmw"; - type = "gem"; - }; - version = "0.1.0"; - }; - opentelemetry-instrumentation-action_mailer = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-active_support" - "opentelemetry-instrumentation-base" - ]; - groups = [ - "default" - "opentelemetry" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03nbn48q5ymk4wyhvnqa1wzvi1mzy2cbc8pmpf26x217zy6dvwl8"; - type = "gem"; - }; - version = "0.2.0"; - }; - opentelemetry-instrumentation-action_pack = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - "opentelemetry-instrumentation-rack" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00mbrqmpk7p3wy377izsspshzdb849b9dv22z8f2hajcpr2im0id"; - type = "gem"; - }; - version = "0.10.0"; - }; - opentelemetry-instrumentation-action_view = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-active_support" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "08ga079lc2xariw83xc4ly1kab718ripmfb9af7xh6vm9qajka3d"; - type = "gem"; - }; - version = "0.7.3"; - }; - opentelemetry-instrumentation-active_job = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0hirfvkg4kf575al080zvnpbxs3y9qlmzdr1w7qwkap7mjdks6r8"; - type = "gem"; - }; - version = "0.7.8"; - }; - opentelemetry-instrumentation-active_record = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14aar8w2szn5fi7j3lg35qlq1r12ka6lvcrcn700agv5nm3han5y"; - type = "gem"; - }; - version = "0.8.1"; - }; - opentelemetry-instrumentation-active_support = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1q07nn9ipq2yd7xjj24hh00cbvlda269k1l0xfkc8d8iw8mixrsg"; - type = "gem"; - }; - version = "0.6.0"; - }; - opentelemetry-instrumentation-aws_sdk = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1d8rbbn3qnv0bb4l7mlxd9zlihf8m6k7rrajaj5zmq5p9fq79hx3"; - type = "gem"; - }; - version = "0.7.0"; - }; - opentelemetry-instrumentation-base = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-registry" - ]; - groups = [ - "default" - "opentelemetry" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0pv064ksiynin8hzvljkwm5vlkgr8kk6g3qqpiwcik860i7l677n"; - type = "gem"; - }; - version = "0.22.3"; - }; - opentelemetry-instrumentation-concurrent_ruby = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1khlhzwb37mqnzr1vr49ljhi4bplmq9w8ndm0k8xbfsr8h8wivq4"; - type = "gem"; - }; - version = "0.21.4"; - }; - opentelemetry-instrumentation-ethon = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0p23m08mylzzkh6v3397a5v27wg4f8vs5jifrh3025lfg1rh9wr0"; - type = "gem"; - }; - version = "0.21.9"; - }; - opentelemetry-instrumentation-excon = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1x49m71zz8vbvv39gfbfvllnrflf2284r4f3bgbnb3l0b9din3zc"; - type = "gem"; - }; - version = "0.22.5"; - }; - opentelemetry-instrumentation-faraday = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1azbnb3f6lbmjciqdy5awyv6lhnkcyd4wqr6ayj8glj4v7b8bprn"; - type = "gem"; - }; - version = "0.24.7"; - }; - opentelemetry-instrumentation-grape = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - "opentelemetry-instrumentation-rack" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1dhpapza8qw8clfp7pri6r6sbibrx07sj7xfk3myivmp05rms8m1"; - type = "gem"; - }; - version = "0.2.0"; - }; - opentelemetry-instrumentation-graphql = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v6w0b3q0li5cq0xmc42ngqk9ahx60n5q31alka36ds4inxcrky2"; - type = "gem"; - }; - version = "0.28.4"; - }; - opentelemetry-instrumentation-http = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "07jycg8iicrcadhnpg1zd2fp6di5hddq6cdpfmz499r2lzwv9wbi"; - type = "gem"; - }; - version = "0.23.5"; - }; - opentelemetry-instrumentation-http_client = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ss5izgcj2874df0yl4akcjvgsg2wyflvbq43aic2zw93dw4a7s1"; - type = "gem"; - }; - version = "0.22.8"; - }; - opentelemetry-instrumentation-net_http = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bh462bpf9m1vg512y9dmjaj7hrlyy04qpwhrzjzmf14d25xcfq2"; - type = "gem"; - }; - version = "0.22.8"; - }; - opentelemetry-instrumentation-pg = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-helpers-sql-obfuscation" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ll2ka487ybsisk7c46lrag18nsfp9gbzrzmiyjjslnpiirc3gwc"; - type = "gem"; - }; - version = "0.29.1"; - }; - opentelemetry-instrumentation-rack = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0g94rqqgw1jhqfng2692559wrldl6xji45lhbr4id3l1dd7qp72k"; - type = "gem"; - }; - version = "0.25.0"; - }; - opentelemetry-instrumentation-rails = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-action_mailer" - "opentelemetry-instrumentation-action_pack" - "opentelemetry-instrumentation-action_view" - "opentelemetry-instrumentation-active_job" - "opentelemetry-instrumentation-active_record" - "opentelemetry-instrumentation-active_support" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15kd44ilp029vadv0yyjnajwv7mn2f29647xxd0svqyd1bf9j1ji"; - type = "gem"; - }; - version = "0.33.1"; - }; - opentelemetry-instrumentation-rake = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0840gnlr90nbl430yc72czn26bngdp94v4adz7q9ph3pmdm8mppv"; - type = "gem"; - }; - version = "0.2.2"; - }; - opentelemetry-instrumentation-redis = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1qrgnk2x64sks9gqb7fycfa6sass6ddqzh5dms4hdbz1bzag581f"; - type = "gem"; - }; - version = "0.25.7"; - }; - opentelemetry-instrumentation-sidekiq = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0cfzw1avv52idxvq02y95g3byxsswccck78zch5hmnnzvp5f59nn"; - type = "gem"; - }; - version = "0.25.7"; - }; - opentelemetry-registry = { - dependencies = [ "opentelemetry-api" ]; - groups = [ - "default" - "opentelemetry" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "08k8zqrg47v1jxcvxz9wxyqm03kjdw98qa8q0y840qvh988vcshi"; - type = "gem"; - }; - version = "0.3.0"; - }; - opentelemetry-sdk = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-common" - "opentelemetry-registry" - "opentelemetry-semantic_conventions" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14n49y6yq48jnbfms2razv7vm1lkdxwh5cd63cm9x8as9ksn1ndj"; - type = "gem"; - }; - version = "1.6.0"; - }; - opentelemetry-semantic_conventions = { - dependencies = [ "opentelemetry-api" ]; - groups = [ - "default" - "opentelemetry" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xhv5fwwgjj2k8ksprpg1nm5v8k3w6gyw4wiq2k08q3kf484rlhk"; - type = "gem"; - }; - version = "1.10.0"; - }; - opentracing = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy"; - type = "gem"; - }; - version = "0.5.0"; - }; - optimist = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; - type = "gem"; - }; - version = "3.0.1"; - }; - org-ruby = { - dependencies = [ "rubypants" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk"; - type = "gem"; - }; - version = "0.9.12"; - }; - orm_adapter = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda"; - type = "gem"; - }; - version = "0.5.0"; - }; - os = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap"; - type = "gem"; - }; - version = "1.1.4"; - }; - ostruct = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; - type = "gem"; - }; - version = "0.6.1"; - }; - pact = { - dependencies = [ - "pact-mock_service" - "pact-support" - "rack-test" - "rspec" - "term-ansicolor" - "thor" - "webrick" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1a3fbwzzzdsbzipv63mcq1q761mqc6w8k1vxkbrbf3aqi2489p8b"; - type = "gem"; - }; - version = "1.64.0"; - }; - pact-mock_service = { - dependencies = [ - "find_a_port" - "json" - "pact-support" - "rack" - "rspec" - "thor" - "webrick" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lds3xpkrx91lm74pa3n5167c8mkmqyki9axj7bjj0m18r2ybna2"; - type = "gem"; - }; - version = "3.11.2"; - }; - pact-support = { - dependencies = [ - "awesome_print" - "diff-lcs" - "expgen" - "rainbow" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0waq8ywxhljm5sjk7m3q7f6s2pvcfshg3ncs9dl7kcsg2ail7hs1"; - type = "gem"; - }; - version = "1.20.0"; - }; - paper_trail = { - dependencies = [ - "activerecord" - "request_store" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1yd9kdyyg1wisxi9mx01ar9s6h50x9k2av95xam58v6jx6bwvg0d"; - type = "gem"; - }; - version = "15.1.0"; - }; - parallel = { - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; - type = "gem"; - }; - version = "1.26.3"; - }; - parser = { - dependencies = [ - "ast" - "racc" - ]; - groups = [ - "coverage" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "18dcwrcnddvi8gl3hmbsb2cj1l7afxk2lh3jmhj90l95h1hn3gkx"; - type = "gem"; - }; - version = "3.3.7.1"; - }; - parslet = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88"; - type = "gem"; - }; - version = "1.8.2"; - }; - pastel = { - dependencies = [ "tty-color" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; - type = "gem"; - }; - version = "0.8.0"; - }; - peek = { - dependencies = [ "railties" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1k1yggixrcj72jlc98hi3jjd04x71dpynn8dxpcdhinyijniwl6n"; - type = "gem"; - }; - version = "1.1.0"; - }; - pg = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn"; - type = "gem"; - }; - version = "1.5.9"; - }; - pg_query = { - dependencies = [ "google-protobuf" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "012w1ypcbzy6w4dsxiziqn1vqddwzpza3zdvw9hivvhcj179mw7v"; - type = "gem"; - }; - version = "6.0.0"; - }; - plist = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wzhnbzraz60paxhm48c50fp9xi7cqka4gfhxmiq43mhgh5ajg3h"; - type = "gem"; - }; - version = "3.7.0"; - }; - png_quantizator = { - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0sqhydp5g9ly1kgfiya1fc6srmhf6avrb74j09z3lp0jck8d88v0"; - type = "gem"; - }; - version = "0.2.1"; - }; - premailer = { - dependencies = [ - "addressable" - "css_parser" - "htmlentities" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1yvy5lxq287izy7qsz23hry63rc57wkaaalqvxnwjncm56xgdmzh"; - type = "gem"; - }; - version = "1.23.0"; - }; - premailer-rails = { - dependencies = [ - "actionmailer" - "net-smtp" - "premailer" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0004f73kgrglida336fqkgx906m6n05nnfc17mypzg5rc78iaf61"; - type = "gem"; - }; - version = "1.12.0"; - }; - prime = { - dependencies = [ - "forwardable" - "singleton" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1qsk9q2n4yb80f5mwslxzfzm2ckar25grghk95cj7sbc1p2k3w5s"; - type = "gem"; - }; - version = "0.1.3"; - }; - prism = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bvdq2jsn1jj8vgp9xrmi6ljw0hqlv4i97v5aa0fcii34g9rrzr4"; - type = "gem"; - }; - version = "1.2.0"; - }; - proc_to_ast = { - dependencies = [ - "coderay" - "parser" - "unparser" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj"; - type = "gem"; - }; - version = "0.1.0"; - }; - prometheus-client-mmap = { - dependencies = [ - "base64" - "bigdecimal" - "logger" - "rb_sys" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0120712ar9cmjgyqrihf36pcslx8m73gp0l86dfw8yvn8gs9xzr0"; - type = "gem"; - }; - version = "1.2.9"; - }; - pry = { - dependencies = [ - "coderay" - "method_source" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; - type = "gem"; - }; - version = "0.14.2"; - }; - 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 = "0garafb0lxbm3sx2r9pqgs7ky9al58cl3wmwc0gmvmrl9bi2i7m6"; - type = "gem"; - }; - version = "0.3.11"; - }; - pry-shell = { - dependencies = [ - "pry" - "tty-markdown" - "tty-prompt" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "027jd53zjbimqb3n1329q4njs94bagmfnrfylxqv04lrsa14h0md"; - type = "gem"; - }; - version = "0.6.4"; - }; - public_suffix = { - groups = [ - "danger" - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; - type = "gem"; - }; - version = "6.0.1"; - }; - puma = { - dependencies = [ "nio4r" ]; - groups = [ "puma" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1wl9q4fl8gvhwdpfxghx6jdqi4508287pcgiwi96sdbzmdfbglcl"; - type = "gem"; - }; - version = "6.5.0"; - }; - pyu-ruby-sasl = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn"; - type = "gem"; - }; - version = "0.0.3.3"; - }; - raabro = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10m8bln9d00dwzjil1k42i5r7l82x25ysbi45fwyv4932zsrzynl"; - type = "gem"; - }; - version = "1.4.0"; - }; - racc = { - groups = [ - "coverage" - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; - type = "gem"; - }; - version = "1.8.1"; - }; - rack = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "12mv97fz3jp6nl4bc36wiqwdiivv5lgqcpfnan91w20rzapljk22"; - type = "gem"; - }; - version = "2.2.11"; - }; - rack-accept = { - dependencies = [ "rack" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936"; - type = "gem"; - }; - version = "0.4.5"; - }; - rack-attack = { - dependencies = [ "rack" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0z6pj5vjgl6swq7a33gssf795k958mss8gpmdb4v4cydcs7px91w"; - type = "gem"; - }; - version = "6.7.0"; - }; - rack-cors = { - dependencies = [ "rack" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "06ysmn14pdf2wyr7agm0qvvr9pzcgyf39w4yvk2n05w9k4alwpa1"; - type = "gem"; - }; - version = "2.0.2"; - }; - rack-oauth2 = { - dependencies = [ - "activesupport" - "attr_required" - "faraday" - "faraday-follow_redirects" - "json-jwt" - "rack" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19fi42hi9l474ki89y6cs8vrpfmc1h8zpd02iwjy4hw0a1yahfn7"; - type = "gem"; - }; - version = "2.2.1"; - }; - rack-protection = { - dependencies = [ "rack" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "169jzzgvbjrqmz4q55wp9pg4ji2h90mggcdxy152gv5vp96l2hgx"; - type = "gem"; - }; - version = "2.2.2"; - }; - rack-proxy = { - dependencies = [ "rack" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "12jw7401j543fj8cc83lmw72d8k6bxvkp9rvbifi88hh01blnsj4"; - type = "gem"; - }; - version = "0.7.7"; - }; - rack-session = { - dependencies = [ "rack" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0"; - type = "gem"; - }; - version = "1.0.2"; - }; - rack-test = { - dependencies = [ "rack" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; - type = "gem"; - }; - version = "2.1.0"; - }; - rack-timeout = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nc7kis61n4q7g78gxxsxygam022glmgwq9snydrkjiwg7lkfwvm"; - type = "gem"; - }; - version = "0.7.0"; - }; - rails = { - dependencies = [ - "actioncable" - "actionmailbox" - "actionmailer" - "actionpack" - "actiontext" - "actionview" - "activejob" - "activemodel" - "activerecord" - "activestorage" - "activesupport" - "railties" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vfd2l3m1802vq7gdqpvd3mkcfhxacpsxixqpx4n6x0mv56ysrsy"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - rails-controller-testing = { - dependencies = [ - "actionpack" - "actionview" - "activesupport" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "151f303jcvs8s149mhx2g5mn67487x0blrf9dzl76q1nb7dlh53l"; - type = "gem"; - }; - version = "1.0.5"; - }; - rails-dom-testing = { - dependencies = [ - "activesupport" - "nokogiri" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; - type = "gem"; - }; - version = "2.0.3"; - }; - rails-html-sanitizer = { - dependencies = [ - "loofah" - "nokogiri" - ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1w6bqm8d3afc66ff6npnsc2d8ky552n6qzwwwc1bh0wz6c8gplp3"; - type = "gem"; - }; - version = "1.6.1"; - }; - rails-i18n = { - dependencies = [ - "i18n" - "railties" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jiiv5ni1jrk15g572wc0l1ansbx6aqqsp2mk0pg9h18mkh1dbpg"; - type = "gem"; - }; - version = "7.0.10"; - }; - railties = { - dependencies = [ - "actionpack" - "activesupport" - "method_source" - "rake" - "thor" - "zeitwerk" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0pshckc6b9h2ikl3svk47iv0nq6v908h3q9ndlblpg021cl8bf8s"; - type = "gem"; - }; - version = "7.0.8.7"; - }; - rainbow = { - groups = [ - "coverage" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; - type = "gem"; - }; - version = "3.1.1"; - }; - rake = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; - type = "gem"; - }; - version = "13.0.6"; - }; - rake-compiler-dock = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lsdrlj1f5xcgg2phycfv1hvlsggiq6wqfff513i375skai20dz7"; - type = "gem"; - }; - version = "1.9.1"; - }; - rb-fsevent = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; - type = "gem"; - }; - version = "0.11.2"; - }; - rb-inotify = { - dependencies = [ "ffi" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; - type = "gem"; - }; - version = "0.10.1"; - }; - rb_sys = { - dependencies = [ "rake-compiler-dock" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0za20fy8x9yc13jzz3kzcdc58qswzdvxmbwxnjab7xmm94gzv4w9"; - type = "gem"; - }; - version = "0.9.110"; - }; - rbs = { - dependencies = [ "logger" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1h1jal1sv47saxyk33nnjk2ywrsf35aar18p7mc48s2m33876wpd"; - type = "gem"; - }; - version = "3.6.1"; - }; - rbtrace = { - dependencies = [ - "ffi" - "msgpack" - "optimist" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1p65p6f917al0f07sn5ca9yj92f7mk52xgnp0ahqpyrb8r6sdjz8"; - type = "gem"; - }; - version = "0.5.1"; - }; - rchardet = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; - type = "gem"; - }; - version = "1.8.0"; - }; - re2 = { - dependencies = [ "mini_portile2" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1n2v1lm3a4alh23r1x12blv9qqckas7cncpn4hk3ar3sdym25604"; - type = "gem"; - }; - version = "2.15.0"; - }; - recaptcha = { - dependencies = [ "json" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vmpppgdy64qa16bvkss0xyzmyyzxv5hwzvc1i6saw4yvm58kl9p"; - type = "gem"; - }; - version = "5.12.3"; - }; - recursive-open-struct = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0nnyr6qsqrcszf6c10n4zfjs8h9n67zvsmx6mp8brkigamr8llx3"; - type = "gem"; - }; - version = "1.1.3"; - }; - redcarpet = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; - type = "gem"; - }; - version = "3.6.0"; - }; - RedCloth = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15r2h7rfp4bi9i0bfmvgnmvmw0kl3byyac53rcakk4qsv7yv4caj"; - type = "gem"; - }; - version = "4.3.4"; - }; - redis = { - dependencies = [ "redis-client" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br"; - type = "gem"; - }; - version = "5.4.0"; - }; - redis-actionpack = { - dependencies = [ - "actionpack" - "redis-rack" - "redis-store" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "049kd6480j16d3xmnsayqmmrircffympzf8pbjrn5v0lijvp01fw"; - type = "gem"; - }; - version = "5.5.0"; - }; - redis-client = { - dependencies = [ "connection_pool" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1h5cgdv40zk0ph1nl64ayhn6anzwy6mbxyi7fci9n404ryvy9zii"; - type = "gem"; - }; - version = "0.22.2"; - }; - redis-cluster-client = { - dependencies = [ "redis-client" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1az0l2q11214gxbi8fcn7xfxj0m31d3wlxcqd0h8qjxqvsjcmrk3"; - type = "gem"; - }; - version = "0.11.0"; - }; - redis-clustering = { - dependencies = [ - "redis" - "redis-cluster-client" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fsnfi15xiy8sal6av11fqfjmdmjpy93amf790i0zwqcf1iq1qbw"; - type = "gem"; - }; - version = "5.4.0"; - }; - redis-namespace = { - dependencies = [ "redis" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0f92i9cwlp6xj6fyn7qn4qsaqvxfw4wqvayll7gbd26qnai1l6p9"; - type = "gem"; - }; - version = "1.11.0"; - }; - redis-rack = { - dependencies = [ - "rack-session" - "redis-store" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10438w0y1jbgr205zndvmz6md0mrqazh2j9fr88lvb8hms10pddb"; - type = "gem"; - }; - version = "3.0.0"; - }; - redis-store = { - dependencies = [ "redis" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "197d1088jw3wl3lfcdj4w4c4da13wsqyd12mj3czvlfw77ig7i7d"; - type = "gem"; - }; - version = "1.11.0"; - }; - regexp_parser = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb"; - type = "gem"; - }; - version = "2.10.0"; - }; - regexp_property_values = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03q8dn4fg51mfk5d4sfcr0f9hqbs42ghafi76k9nc7ms1gf9j90n"; - type = "gem"; - }; - version = "1.0.0"; - }; - representable = { - dependencies = [ - "declarative" - "trailblazer-option" - "uber" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kms3r6w6pnryysnaqqa9fsn0v73zx1ilds9d1c565n3xdzbyafc"; - type = "gem"; - }; - version = "3.2.0"; - }; - request_store = { - dependencies = [ "rack" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jw89j9s5p5cq2k7ffj5p4av4j4fxwvwjs1a4i9g85d38r9mvdz1"; - type = "gem"; - }; - version = "1.7.0"; - }; - responders = { - dependencies = [ - "actionpack" - "railties" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14kjykc6rpdh24sshg9savqdajya2dislc1jmbzg91w9967f4gv1"; - type = "gem"; - }; - version = "3.0.1"; - }; - rest-client = { - dependencies = [ - "http-accept" - "http-cookie" - "mime-types" - "netrc" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im"; - type = "gem"; - }; - version = "2.1.0"; - }; - retriable = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; - type = "gem"; - }; - version = "3.1.2"; - }; - reverse_markdown = { - dependencies = [ "nokogiri" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53"; - type = "gem"; - }; - version = "1.4.0"; - }; - rexml = { - groups = [ - "coverage" - "danger" - "default" - "development" - "omnibus" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; - type = "gem"; - }; - version = "3.4.1"; - }; - rinku = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "11cakxzp7qi04d41hbqkh92n52mm4z2ba8sqyhxbmfi4kypmls9y"; - type = "gem"; - }; - version = "2.0.0"; - }; - rotp = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0m48hv6wpmmm6cjr6q92q78h1i610riml19k5h1dil2yws3h1m3m"; - type = "gem"; - }; - version = "6.3.0"; - }; - rouge = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1pchwrkr0994v7mh054lcp0na3bk3mj2sk0dc33bn6bhxrnirj1a"; - type = "gem"; - }; - version = "4.5.1"; - }; - rqrcode = { - dependencies = [ - "chunky_png" - "rqrcode_core" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; - type = "gem"; - }; - version = "2.2.0"; - }; - rqrcode_core = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg"; - type = "gem"; - }; - version = "1.2.0"; - }; - rspec = { - dependencies = [ - "rspec-core" - "rspec-expectations" - "rspec-mocks" - ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; - type = "gem"; - }; - version = "3.13.0"; - }; - rspec-benchmark = { - dependencies = [ - "benchmark-malloc" - "benchmark-perf" - "benchmark-trend" - "rspec" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kyn7p409n75ikb7z9v3dbzjyyinkwi88f66alj9lnf2gssss50h"; - type = "gem"; - }; - version = "0.6.0"; - }; - rspec-core = { - dependencies = [ "rspec-support" ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0s688wfw77fjldzayvczg8bgwcgh6bh552dw7qcj1rhjk3r4zalx"; - type = "gem"; - }; - version = "3.13.1"; - }; - rspec-expectations = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; - type = "gem"; - }; - version = "3.13.3"; - }; - rspec-mocks = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; - type = "gem"; - }; - version = "3.13.2"; - }; - rspec-parameterized = { - dependencies = [ - "rspec-parameterized-core" - "rspec-parameterized-table_syntax" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hplygik9p5d92lhb9412lzap8msrmry2qrrq5d1f90r170dwmml"; - type = "gem"; - }; - version = "1.0.2"; - }; - rspec-parameterized-core = { - dependencies = [ - "parser" - "proc_to_ast" - "rspec" - "unparser" - ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hfc2q7g8f5s6kdh1chwlalvz3fvj57vlfpn18b23677hm4ljyr8"; - type = "gem"; - }; - version = "1.0.0"; - }; - rspec-parameterized-table_syntax = { - dependencies = [ - "binding_of_caller" - "rspec-parameterized-core" - ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "134q0hki279np9dv7mgr85wspdrvhpj9lpvxr9kx6pcwzwg9bpyp"; - type = "gem"; - }; - version = "1.0.0"; - }; - rspec-rails = { - dependencies = [ - "actionpack" - "activesupport" - "railties" - "rspec-core" - "rspec-expectations" - "rspec-mocks" - "rspec-support" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ycjggcmzbgrfjk04v26b43c3fj5jq2qic911qk7585wvav2qaxd"; - type = "gem"; - }; - version = "7.0.1"; - }; - rspec-retry = { - dependencies = [ "rspec-core" ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n6qc0d16h6bgh1xarmc8vc58728mgjcsjj8wcd822c8lcivl0b1"; - type = "gem"; - }; - version = "0.6.2"; - }; - rspec-support = { - groups = [ - "default" - "development" - "monorepo" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; - type = "gem"; - }; - version = "3.13.1"; - }; - rspec_junit_formatter = { - dependencies = [ "rspec-core" ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "059bnq1gcwl9g93cqf13zpz38zk7jxaa43anzz06qkmfwrsfdpa0"; - type = "gem"; - }; - version = "0.6.0"; - }; - rspec_profiling = { - dependencies = [ - "activerecord" - "get_process_mem" - "rails" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "143m9yiawqrjc02wack30k7m5w4d1axlsw0ds71vl55amqnvx6b1"; - type = "gem"; - }; - version = "0.0.9"; - }; - rubocop = { - dependencies = [ - "json" - "language_server-protocol" - "parallel" - "parser" - "rainbow" - "regexp_parser" - "rubocop-ast" - "ruby-progressbar" - "unicode-display_width" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ypwxjy2cp44278m9ljg3s937n2cd6x4yskcyzf1k9m3hkjd3pyk"; - type = "gem"; - }; - version = "1.71.1"; - }; - rubocop-ast = { - dependencies = [ "parser" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1bi6pgnii77763dzwhafcp8lrmnh4n1bqbdimhc9lfj4zs96gpsg"; - type = "gem"; - }; - version = "1.38.0"; - }; - rubocop-capybara = { - dependencies = [ "rubocop" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1aw0n8jwhsr39r9q2k90xjmcz8ai2k7xx2a87ld0iixnv3ylw9jx"; - type = "gem"; - }; - version = "2.21.0"; - }; - rubocop-factory_bot = { - dependencies = [ "rubocop" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1aljadsjx7affcarzbhz7pydpy6fgqb8hl951y0cmrffxpa3rqcd"; - type = "gem"; - }; - version = "2.26.1"; - }; - rubocop-graphql = { - dependencies = [ "rubocop" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14j14ld5d3w141r5lgaljcd8q1g3w4xn592cwzqxlxw5n108v21d"; - type = "gem"; - }; - version = "1.5.4"; - }; - rubocop-performance = { - dependencies = [ - "rubocop" - "rubocop-ast" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kkkv073c01px27w69g93gbjwajxji5wmawrmbb5l9s4ll101wjw"; - type = "gem"; - }; - version = "1.21.1"; - }; - rubocop-rails = { - dependencies = [ - "activesupport" - "rack" - "rubocop" - "rubocop-ast" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1bc4xpyx0gldjdmbl9aaqav5bjiqfc2zdw7k2r1zblmgsq4ilmpm"; - type = "gem"; - }; - version = "2.26.2"; - }; - rubocop-rspec = { - dependencies = [ "rubocop" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03vyjxs5rzrsn5graljffgzy1fgbyn99w5fz69y243dhn6gy5a66"; - type = "gem"; - }; - version = "3.0.5"; - }; - rubocop-rspec_rails = { - dependencies = [ - "rubocop" - "rubocop-rspec" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ijc1kw81884k0wjq1sgwaxa854n1fdddscp4fnzfzlx7zl150c8"; - type = "gem"; - }; - version = "2.30.0"; - }; - ruby-fogbugz = { - dependencies = [ - "crack" - "multipart-post" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0mznsnhsgh1yg57j5gighr9vjricnix1l7ngf654k3v4fkjcs12y"; - type = "gem"; - }; - version = "0.3.0"; - }; - ruby-lsp = { - dependencies = [ - "language_server-protocol" - "prism" - "rbs" - "sorbet-runtime" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v2dag8wl2zpd51qml5w0icb4wp77z7gfjcfq696zimxyf7v1pvi"; - type = "gem"; - }; - version = "0.23.10"; - }; - ruby-lsp-rails = { - dependencies = [ "ruby-lsp" ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xlcpxsz2sk57l0kwla2gj8l9cfqj7dxxf0794p67daldr3fs2k7"; - type = "gem"; - }; - version = "0.3.31"; - }; - ruby-lsp-rspec = { - dependencies = [ "ruby-lsp" ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1h2rnylicx9cw2agrxzgxcr0bl2ac8iy99sz7w657hbfrpsyv0p9"; - type = "gem"; - }; - version = "0.1.22"; - }; - ruby-magic = { - dependencies = [ "mini_portile2" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00b15fd74bkrxfqbx1gg2nw78fs7lvmn8mf92bway8vxgf3kh8bv"; - type = "gem"; - }; - version = "0.6.0"; - }; - ruby-progressbar = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; - type = "gem"; - }; - version = "1.11.0"; - }; - ruby-saml = { - dependencies = [ - "nokogiri" - "rexml" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/ruby-saml"; - type = "path"; - }; - version = "1.18.0"; - }; - ruby-statistics = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1agj0yspf9haqvqlq5dy3gqn8xc0h9a1dd7c44fi9rn4bnyplsbx"; - type = "gem"; - }; - version = "4.1.0"; - }; - ruby2_keywords = { - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; - type = "gem"; - }; - version = "0.0.5"; - }; - rubyntlm = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; - type = "gem"; - }; - version = "0.6.3"; - }; - rubypants = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph"; - type = "gem"; - }; - version = "0.2.0"; - }; - rubyzip = { - groups = [ - "default" - "development" - "omnibus" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; - type = "gem"; - }; - version = "2.3.2"; - }; - rugged = { - groups = [ - "coverage" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in"; - type = "gem"; - }; - version = "1.6.3"; - }; - safe_yaml = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - type = "gem"; - }; - version = "1.0.4"; - }; - safety_net_attestation = { - dependencies = [ "jwt" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln"; - type = "gem"; - }; - version = "0.4.0"; - }; - sanitize = { - dependencies = [ - "crass" - "nokogiri" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kymrjdpbmn4yaml3aaqyj1dzj8gqmm9h030dc2rj5mvja7fpi28"; - type = "gem"; - }; - version = "6.0.2"; - }; - sass-embedded = { - dependencies = [ - "google-protobuf" - "rake" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2"; - type = "gem"; - }; - version = "1.77.5"; - }; - sawyer = { - dependencies = [ - "addressable" - "faraday" - ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; - type = "gem"; - }; - version = "0.9.2"; - }; - sd_notify = { - groups = [ "puma" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0c9imnjbakx25r2n7widfp00s19ndzmmwax761mx5vbwm9nariyb"; - type = "gem"; - }; - version = "0.1.1"; - }; - seed-fu = { - dependencies = [ - "activerecord" - "activesupport" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0y7lzcshsq6i20qn1p8zczir4fivr6nbl1km91ns320vvh92v43d"; - type = "gem"; - }; - version = "2.3.9"; - }; - selenium-webdriver = { - dependencies = [ - "base64" - "logger" - "rexml" - "rubyzip" - "websocket" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1q5nbszbxz566yzyiv0a4lvfk56q89k0lk4mqp6wyddrc2nz88c8"; - type = "gem"; - }; - version = "4.27.0"; - }; - semver_dialects = { - dependencies = [ - "deb_version" - "pastel" - "thor" - "tty-command" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "18vkhjy290kf6cvwq03whfih29wyl7q003kx4qa82x3cgh1pi2mv"; - type = "gem"; - }; - version = "3.6.0"; - }; - sentry-rails = { - dependencies = [ - "railties" - "sentry-ruby" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1drz5lm7s2m55pmxdbpbcxlpvgaj3rchm14nrzl2s80fvh47c8i3"; - type = "gem"; - }; - version = "5.22.1"; - }; - sentry-ruby = { - dependencies = [ - "bigdecimal" - "concurrent-ruby" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "129jbd6zvfn59djs455hflk2nhf0sccnvp23vsiwd957dpbvsxzd"; - type = "gem"; - }; - version = "5.22.1"; - }; - sentry-sidekiq = { - dependencies = [ - "sentry-ruby" - "sidekiq" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "129ahag27akxqha2dldvvzkbxi3zcrca9naifak3xqaqbs8kyymx"; - type = "gem"; - }; - version = "5.22.1"; - }; - shellany = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ryyzrj1kxmnpdzhlv4ys3dnl2r5r3d2rs2jwzbnd1v96a8pl4hf"; - type = "gem"; - }; - version = "0.0.1"; - }; - shoulda-matchers = { - dependencies = [ "activesupport" ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1c082vpfdf3865xq6xayxw2hwqswhnc9g030p1gi4hmk9dzvnmch"; - type = "gem"; - }; - version = "6.4.0"; - }; - sidekiq = { - dependencies = [ - "concurrent-ruby" - "connection_pool" - "rack" - "redis-client" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/sidekiq-7.2.4"; - type = "path"; - }; - version = "7.2.4"; - }; - sidekiq-cron = { - dependencies = [ - "fugit" - "globalid" - "sidekiq" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v09lg8kza19jmigqv5hx2ibhm75j6pa639sfy4bv2208l50hqv6"; - type = "gem"; - }; - version = "1.12.0"; - }; - sigdump = { - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0hkj8fsl1swjfqvzgrwbyrwwn7403q95fficbll8nibhrqf6qw5v"; - type = "gem"; - }; - version = "0.2.5"; - }; - signet = { - dependencies = [ - "addressable" - "faraday" - "jwt" - "multi_json" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6"; - type = "gem"; - }; - version = "0.18.0"; - }; - simple_po_parser = { - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1wybcipkfawg4pragmayiig03xc084x3hbwywsh1dr9x9pa8f9hj"; - type = "gem"; - }; - version = "1.1.6"; - }; - simplecov = { - dependencies = [ - "docile" - "simplecov-html" - "simplecov_json_formatter" - ]; - groups = [ - "coverage" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; - type = "gem"; - }; - version = "0.22.0"; - }; - simplecov-cobertura = { - dependencies = [ - "rexml" - "simplecov" - ]; - groups = [ - "coverage" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00izmp202y48qvmvwrh5x56cc5ivbjhgkkkjklvqmqzj9pik4r9c"; - type = "gem"; - }; - version = "2.1.0"; - }; - simplecov-html = { - groups = [ - "coverage" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; - type = "gem"; - }; - version = "0.12.3"; - }; - simplecov-lcov = { - groups = [ - "coverage" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1h8kswnshgb9zidvc88f4zjy4gflgz3854sx9wrw8ppgnwfg6581"; - type = "gem"; - }; - version = "0.8.0"; - }; - simplecov_json_formatter = { - groups = [ - "coverage" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; - type = "gem"; - }; - version = "0.1.4"; - }; - simpleidn = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0a9c1mdy12y81ck7mcn9f9i2s2wwzjh1nr92ps354q517zq9dkh8"; - type = "gem"; - }; - version = "0.2.3"; - }; - singleton = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0y2pc7lr979pab5n5lvk3jhsi99fhskl5f2s6004v8sabz51psl3"; - type = "gem"; - }; - version = "0.3.0"; - }; - sixarm_ruby_unaccent = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "11237b8r8p7fc0cpn04v9wa7ggzq0xm6flh10h1lnb6zgc3schq0"; - type = "gem"; - }; - version = "1.2.0"; - }; - slack-messenger = { - dependencies = [ "re2" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1n367s0wjym1czllgwycgya13r3axgjfpivc6dlvgjzbgmc1wn2q"; - type = "gem"; - }; - version = "2.3.6"; - }; - snaky_hash = { - dependencies = [ - "hashie" - "version_gem" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1pl70rh92wsn15q4lwzikzi7j5a00vm77bqjg07k4sgzx0wjx2zy"; - type = "gem"; - }; - version = "2.0.0"; - }; - snowplow-tracker = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0f2afcmwbfxfrkf0scc5yi3x5lyrfbd3xri8zm2ri0is8kqz99kv"; - type = "gem"; - }; - version = "0.8.0"; - }; - solargraph = { - dependencies = [ - "backport" - "benchmark" - "diff-lcs" - "e2mmap" - "jaro_winkler" - "kramdown" - "kramdown-parser-gfm" - "parser" - "reverse_markdown" - "rubocop" - "thor" - "tilt" - "yard" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0smcpi3x87chkdqdclhgh36xlbwm7r44r58m3k1w4mcikdwlpjl7"; - type = "gem"; - }; - version = "0.47.2"; - }; - sorbet-runtime = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1dpxyhph8rp0bwiacqjsvsm67gm6v7bw16na20rk59g6y8953dk4"; - type = "gem"; - }; - version = "0.5.11647"; - }; - spamcheck = { - dependencies = [ "grpc" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1iqfsnz0ls27ml4dyqyp8k7sdq3rgxjqrlslh3c475fmzjfvla9s"; - type = "gem"; - }; - version = "1.3.3"; - }; - spring = { - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jx3y1krmx7flrp8fldb354cap1xxlln4yl97ik8smfzn07hhzzi"; - type = "gem"; - }; - version = "4.1.0"; - }; - spring-commands-rspec = { - dependencies = [ "spring" ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2"; - type = "gem"; - }; - version = "1.0.4"; - }; - sprite-factory = { - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "18hvn14vz1v3j1gvbqjypa59hgj3c4mqbimby50k407c395551jm"; - type = "gem"; - }; - version = "1.7.1"; - }; - sprockets = { - dependencies = [ - "concurrent-ruby" - "rack" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; - type = "gem"; - }; - version = "3.7.2"; - }; - sprockets-rails = { - dependencies = [ - "actionpack" - "activesupport" - "sprockets" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "17hiqkdpcjyyhlm997mgdcr45v35j5802m5a979i5jgqx5n8xs59"; - type = "gem"; - }; - version = "3.5.2"; - }; - ssh_data = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1h5aiqqlk51z12kgvanhdvd0ajvv2i68z6a7450yxgmflfaiwz7c"; - type = "gem"; - }; - version = "1.3.0"; - }; - ssrf_filter = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nx0vap3mrh62v37lr45h77ipp4li8x77v4kxr1psh3yhda9zx03"; - type = "gem"; - }; - version = "1.0.8"; - }; - stackprof = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03788mbipmihq2w7rznzvv0ks0s9z1321k1jyr6ffln8as3d5xmg"; - type = "gem"; - }; - version = "0.2.27"; - }; - state_machines = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3"; - type = "gem"; - }; - version = "0.5.0"; - }; - state_machines-activemodel = { - dependencies = [ - "activemodel" - "state_machines" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0b4dffzlj38adin6gm0ky72r5c507qdb1jprnm7h9gnlj2qxlcp9"; - type = "gem"; - }; - version = "0.8.0"; - }; - state_machines-activerecord = { - dependencies = [ - "activerecord" - "state_machines-activemodel" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1dmaf4f4cg3gamzgga3gamp0kv9lvianqzr9103dw0xbp00vfbq7"; - type = "gem"; - }; - version = "0.8.0"; - }; - strings = { - dependencies = [ - "strings-ansi" - "unicode-display_width" - "unicode_utils" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1yynb0qhhhplmpzavfrrlwdnd1rh7rkwzcs4xf0mpy2wr6rr6clk"; - type = "gem"; - }; - version = "0.2.1"; - }; - strings-ansi = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; - type = "gem"; - }; - version = "0.2.0"; - }; - swd = { - dependencies = [ - "activesupport" - "attr_required" - "faraday" - "faraday-follow_redirects" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0m86fzmwgw0vc8p6fwvnsdbldpgbqdz9cbp2zj9z06bc4jjf5nsc"; - type = "gem"; - }; - version = "2.0.3"; - }; - sync = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6"; - type = "gem"; - }; - version = "0.5.0"; - }; - sys-filesystem = { - dependencies = [ "ffi" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "08bln6c3qmylakgpmpswv4zdis8bf96nkbrxpb9xcal2i7g1j29r"; - type = "gem"; - }; - version = "1.4.3"; - }; - sysexits = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr"; - type = "gem"; - }; - version = "1.2.0"; - }; - table_print = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jxmd1yg3h0g27wzfpvq1jnkkf7frwb5wy9m4f47nf4k3wl68rj3"; - type = "gem"; - }; - version = "1.5.7"; - }; - tanuki_emoji = { - dependencies = [ "i18n" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14vdkzrfq3sv9dfzz0sgw89z7a6jic43jkndj7nqhvxdbhm1iqny"; - type = "gem"; - }; - version = "0.13.0"; - }; - telesign = { - dependencies = [ "net-http-persistent" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0hjcaiy58zg7vpy5vsaaz6ss8w6nlkkvz1p758gdmd5wlxpfkinw"; - type = "gem"; - }; - version = "2.2.4"; - }; - telesignenterprise = { - dependencies = [ "telesign" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cziz60q1pav635fln5xiag7vqvf992sk9xi1l5gxhm8ccra0izi"; - type = "gem"; - }; - version = "2.2.2"; - }; - temple = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861"; - type = "gem"; - }; - version = "0.8.2"; - }; - term-ansicolor = { - dependencies = [ "tins" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; - type = "gem"; - }; - version = "1.7.1"; - }; - terminal-table = { - dependencies = [ "unicode-display_width" ]; - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; - type = "gem"; - }; - version = "3.0.2"; - }; - terser = { - dependencies = [ "execjs" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "13mj7ds6kwl1z5dp8zg6b9l3vq9012g8yr99hlpf3d1dgsyf1hl0"; - type = "gem"; - }; - version = "1.0.2"; - }; - test-prof = { - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vsk2ca9kfrxhyd2xiiyr28hmxkh9vd8j2vwl5f1yfnkv4z52n8s"; - type = "gem"; - }; - version = "1.4.4"; - }; - test_file_finder = { - dependencies = [ "faraday" ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "16bi2x6n8vwpinlm3n7j666ryq06zndhp4cj32sq89vbl240byw3"; - type = "gem"; - }; - version = "0.3.1"; - }; - text = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; - type = "gem"; - }; - version = "1.3.1"; - }; - thor = { - groups = [ - "default" - "development" - "omnibus" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; - type = "gem"; - }; - version = "1.3.1"; - }; - thread_safe = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; - }; - thrift = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh"; - type = "gem"; - }; - version = "0.16.0"; - }; - tilt = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; - type = "gem"; - }; - version = "2.0.11"; - }; - timeout = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm"; - type = "gem"; - }; - version = "0.4.3"; - }; - timfel-krb5-auth = { - groups = [ - "default" - "kerberos" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b"; - type = "gem"; - }; - version = "0.8.3"; - }; - tins = { - dependencies = [ "sync" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kxykx7ywc0i3y4dwakz4b46dql4zc7h8b5w1hqhsqswq93s7i2i"; - type = "gem"; - }; - version = "1.31.1"; - }; - toml-rb = { - dependencies = [ "citrus" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19nr4wr5accc6l2y3avn7b02lqmk9035zxq42234k7fcqd5cbqm1"; - type = "gem"; - }; - version = "2.2.0"; - }; - tomlrb = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8"; - type = "gem"; - }; - version = "1.3.0"; - }; - tpm-key_attestation = { - dependencies = [ - "bindata" - "openssl" - "openssl-signature_algorithm" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1"; - type = "gem"; - }; - version = "0.12.0"; - }; - traces = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "109dh1xmsmvkg1pf3306svigh3m8kdmjqlznyk4bi2r4nws7hm6j"; - type = "gem"; - }; - version = "0.15.2"; - }; - trailblazer-option = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "18s48fndi2kfvrfzmq6rxvjfwad347548yby0341ixz1lhpg3r10"; - type = "gem"; - }; - version = "0.1.2"; - }; - train-core = { - dependencies = [ - "addressable" - "ffi" - "json" - "mixlib-shellout" - "net-scp" - "net-ssh" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fr2hydxs1rzmi7c1c1wcfi0m2piks3vl8hdhh8rpgjz041dm4w4"; - type = "gem"; - }; - version = "3.10.8"; - }; - truncato = { - dependencies = [ - "htmlentities" - "nokogiri" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1073j47fypwmc4myqzcd9rbipf1250qx2mnki4iqksv7q11ijqil"; - type = "gem"; - }; - version = "0.7.13"; - }; - tty-color = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; - type = "gem"; - }; - version = "0.6.0"; - }; - tty-command = { - dependencies = [ "pastel" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14hi8xiahfrrnydw6g3i30lxvvz90wp4xsrlhx8mabckrcglfv0c"; - type = "gem"; - }; - version = "0.10.1"; - }; - tty-cursor = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; - type = "gem"; - }; - version = "0.7.1"; - }; - tty-markdown = { - dependencies = [ - "kramdown" - "pastel" - "rouge" - "strings" - "tty-color" - "tty-screen" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04f599zn5rfndq4d9l0acllfpc041bzdkkz2h6x0dl18f2wivn0y"; - type = "gem"; - }; - version = "0.7.2"; - }; - tty-prompt = { - dependencies = [ - "pastel" - "tty-reader" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1j4y8ik82azjxshgd4i1v4wwhsv3g9cngpygxqkkz69qaa8cxnzw"; - type = "gem"; - }; - version = "0.23.1"; - }; - tty-reader = { - dependencies = [ - "tty-cursor" - "tty-screen" - "wisper" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6"; - type = "gem"; - }; - version = "0.9.0"; - }; - tty-screen = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; - type = "gem"; - }; - version = "0.8.1"; - }; - typhoeus = { - dependencies = [ "ethon" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0z7gamf6s83wy0yqms3bi4srirn3fc0lc7n65lqanidxcj1xn5qw"; - type = "gem"; - }; - version = "1.4.1"; - }; - tzinfo = { - dependencies = [ "concurrent-ruby" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; - type = "gem"; - }; - version = "2.0.6"; - }; - uber = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; - type = "gem"; - }; - version = "0.1.0"; - }; - undercover = { - dependencies = [ - "bigdecimal" - "imagen" - "rainbow" - "rugged" - ]; - groups = [ - "coverage" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1yk5rgr82zl0k1vjpfs42lpw2lzk5hgc970zd03abl1ypi344k57"; - type = "gem"; - }; - version = "0.6.3"; - }; - 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 = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; - type = "gem"; - }; - version = "2.4.2"; - }; - unicode-emoji = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c"; - type = "gem"; - }; - version = "4.0.4"; - }; - unicode_utils = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; - type = "gem"; - }; - version = "1.4.0"; - }; - uniform_notifier = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1dfvqixshwvm82b9qwdidvnkavdj7s0fbdbmyd4knkl6l3j9xcwr"; - type = "gem"; - }; - version = "1.16.0"; - }; - unleash = { - dependencies = [ "murmurhash3" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fxr4q8bs5pbf3y57f3bckg3ls9k76wzzkhvl1kdw879im4mcvhg"; - type = "gem"; - }; - version = "3.2.2"; - }; - unparser = { - dependencies = [ - "diff-lcs" - "parser" - ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1j6ym6cn43ry4lvcal7cv0n9g9awny7kcrn1crp7cwx2vwzffhmf"; - type = "gem"; - }; - version = "0.6.7"; - }; - uri = { - groups = [ - "danger" - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0mz4hxi8lxh8rs6aph1mrihczvvz8ag9zlin1gzvq490cmp1jmx5"; - type = "gem"; - }; - version = "0.13.2"; - }; - valid_email = { - dependencies = [ - "activemodel" - "mail" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0w3587sa7d1a51djyla57pbv9v105jsqvxhkg6vbxi343fsm455q"; - type = "gem"; - }; - version = "0.1.3"; - }; - validate_url = { - dependencies = [ - "activemodel" - "public_suffix" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lblym140w5n88ijyfgcvkxvpfj8m6z00rxxf2ckmmhk0x61dzkj"; - type = "gem"; - }; - version = "1.0.15"; - }; - validates_hostname = { - dependencies = [ - "activerecord" - "activesupport" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "06fspma67flsvwl3gfyrv2572l15pjsmqsncz5yp4kqbriw03i7a"; - type = "gem"; - }; - version = "1.0.13"; - }; - version_gem = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "104s7p4zp5yvf0bvbwd9mqmnkgz2z89h4hbvxi8pzd8d08c9a03b"; - type = "gem"; - }; - version = "1.1.0"; - }; - version_sorter = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1np1xy15xq5lcp0y5zr7sxnpwwgcq7bvfs6jc27vnkw0lfhz4ir1"; - type = "gem"; - }; - version = "2.3.0"; - }; - view_component = { - dependencies = [ - "activesupport" - "concurrent-ruby" - "method_source" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0p6z21kqz05966l77rfj7hdmhb6drld7qaxdbx4qawwylay7fnkz"; - type = "gem"; - }; - version = "3.21.0"; - }; - virtus = { - dependencies = [ - "axiom-types" - "coercible" - "descendants_tracker" - ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hniwgbdsjxa71qy47n6av8faf8qpwbaapms41rhkk3zxgjdlhc8"; - type = "gem"; - }; - version = "2.0.0"; - }; - vite_rails = { - dependencies = [ - "railties" - "vite_ruby" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "005mbcprdhjqx27561mb54kssjwxwij157x6wya1yp60gdkl8p0r"; - type = "gem"; - }; - version = "3.0.19"; - }; - vite_ruby = { - dependencies = [ - "dry-cli" - "logger" - "mutex_m" - "rack-proxy" - "zeitwerk" - ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1i2ckb29ffjj431amnk0sr5h9vbs00139irs7bqh51jpl55lln74"; - type = "gem"; - }; - version = "3.9.1"; - }; - vmstat = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "014ingrldwjgsw27af0x9kzv4ca0dayh3p99bi5grnsl191wp1sm"; - type = "gem"; - }; - version = "2.3.1"; - }; - warden = { - dependencies = [ "rack" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1l7gl7vms023w4clg02pm4ky9j12la2vzsixi2xrv9imbn44ys26"; - type = "gem"; - }; - version = "1.2.9"; - }; - warning = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lwcf7fsz1sda1fdbqq1i4q9kzg4f5vwrzgfg1vpa1hcxagw84hg"; - type = "gem"; - }; - version = "1.5.0"; - }; - webauthn = { - dependencies = [ - "android_key_attestation" - "awrence" - "bindata" - "cbor" - "cose" - "openssl" - "safety_net_attestation" - "tpm-key_attestation" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ri09bf640kkw4v6k2g90q2nw1mx2hsghhngaqgb7958q8id8xrz"; - type = "gem"; - }; - version = "3.0.0"; - }; - webfinger = { - dependencies = [ - "activesupport" - "faraday" - "faraday-follow_redirects" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0p39802sfnm62r4x5hai8vn6d1wqbxsxnmbynsk8rcvzwyym4yjn"; - type = "gem"; - }; - version = "2.1.3"; - }; - webmock = { - dependencies = [ - "addressable" - "crack" - "hashdiff" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "13hrfja9as50ymbzsmlqsnv3ijirnf6mini21y1qq04793y26g2p"; - type = "gem"; - }; - version = "3.25.0"; - }; - webrick = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; - type = "gem"; - }; - version = "1.8.2"; - }; - websocket = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1a4zc8d0d91c3xqwapda3j3zgpfwdbj76hkb69xn6qvfkfks9h9c"; - type = "gem"; - }; - version = "1.2.10"; - }; - websocket-driver = { - dependencies = [ "websocket-extensions" ]; - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; - type = "gem"; - }; - version = "0.7.6"; - }; - websocket-extensions = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; - type = "gem"; - }; - version = "0.1.5"; - }; - wikicloth = { - dependencies = [ - "builder" - "expression_parser" - "rinku" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s"; - type = "gem"; - }; - version = "0.8.1"; - }; - wisper = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf"; - type = "gem"; - }; - version = "2.0.1"; - }; - with_env = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh"; - type = "gem"; - }; - version = "1.1.0"; - }; - wmi-lite = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nnx4xz8g40dpi3ccqk5blj1ck06ydx09f9diksn1ghd8yxzavhi"; - type = "gem"; - }; - version = "1.0.7"; - }; - xml-simple = { - dependencies = [ "rexml" ]; - groups = [ - "default" - "development" - "omnibus" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0pb9plyl71mdbjr4kllfy53qx6g68ryxblmnq9dilvy837jk24fj"; - type = "gem"; - }; - version = "1.1.9"; - }; - xpath = { - dependencies = [ "nokogiri" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; - type = "gem"; - }; - version = "3.2.0"; - }; - yajl-ruby = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1lni4jbyrlph7sz8y49q84pb0sbj82lgwvnjnsiv01xf26f4v5wc"; - type = "gem"; - }; - version = "1.4.3"; - }; - yard = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14k9lb9a60r9z2zcqg08by9iljrrgjxdkbd91gw17rkqkqwi1sd6"; - type = "gem"; - }; - version = "0.9.37"; - }; - zeitwerk = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; - type = "gem"; - }; - version = "2.6.7"; - }; -} diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py deleted file mode 100755 index 1eb841c997f5..000000000000 --- a/pkgs/applications/version-management/gitlab/update.py +++ /dev/null @@ -1,411 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git - -import click -import click_log -import re -import logging -import subprocess -import json -import pathlib -import tempfile -from packaging.version import Version -from typing import Iterable - -import requests - -NIXPKGS_PATH = pathlib.Path(__file__).parent / "../../../../" -GITLAB_DIR = pathlib.Path(__file__).parent - -logger = logging.getLogger(__name__) -click_log.basic_config(logger) - - -class GitLabRepo: - version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?(\-gitlab)?") - - def __init__(self, owner: str = "gitlab-org", repo: str = "gitlab"): - self.owner = owner - self.repo = repo - - @property - def url(self): - return f"https://gitlab.com/{self.owner}/{self.repo}" - - @property - def tags(self) -> Iterable[str]: - """Returns a sorted list of repository tags""" - r = requests.get(self.url + "/refs?sort=updated_desc&ref=master").json() - tags = r.get("Tags", []) - - # filter out versions not matching version_regex - versions = list(filter(self.version_regex.match, tags)) - - # sort, but ignore v, -ee and -gitlab for sorting comparisons - versions.sort( - key=lambda x: Version( - x.replace("v", "").replace("-ee", "").replace("-gitlab", "") - ), - reverse=True, - ) - return versions - def get_git_hash(self, rev: str): - return ( - subprocess.check_output( - [ - "nix-prefetch-url", - "--unpack", - f"https://gitlab.com/{self.owner}/{self.repo}/-/archive/{rev}/{self.repo}-{rev}.tar.gz", - ] - ) - .decode("utf-8") - .strip() - ) - - def get_yarn_hash(self, rev: str): - with tempfile.TemporaryDirectory() as tmp_dir: - with open(tmp_dir + "/yarn.lock", "w") as f: - f.write(self.get_file("yarn.lock", rev)) - return ( - subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"]) - .decode("utf-8") - .strip() - ) - - @staticmethod - def rev2version(tag: str) -> str: - """ - normalize a tag to a version number. - This obviously isn't very smart if we don't pass something that looks like a tag - :param tag: the tag to normalize - :return: a normalized version number - """ - # strip v prefix - version = re.sub(r"^v", "", tag) - # strip -ee and -gitlab suffixes - return re.sub(r"-(ee|gitlab)$", "", version) - - def get_file(self, filepath, rev): - """ - returns file contents at a given rev - :param filepath: the path to the file, relative to the repo root - :param rev: the rev to fetch at - :return: - """ - return requests.get(self.url + f"/raw/{rev}/{filepath}").text - - def get_data(self, rev): - version = self.rev2version(rev) - - passthru = { - v: self.get_file(v, rev).strip() - for v in [ - "GITALY_SERVER_VERSION", - "GITLAB_PAGES_VERSION", - "GITLAB_SHELL_VERSION", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION", - ] - } - passthru["GITLAB_WORKHORSE_VERSION"] = version - - return dict( - version=self.rev2version(rev), - repo_hash=self.get_git_hash(rev), - yarn_hash=self.get_yarn_hash(rev), - owner=self.owner, - repo=self.repo, - rev=rev, - passthru=passthru, - ) - - -def _get_data_json(): - data_file_path = pathlib.Path(__file__).parent / "data.json" - with open(data_file_path, "r") as f: - return json.load(f) - - -def _call_nix_update(pkg, version): - """calls nix-update from nixpkgs root dir""" - return subprocess.check_output( - ["nix-update", pkg, "--version", version], cwd=NIXPKGS_PATH - ) - - -@click_log.simple_verbosity_option(logger) -@click.group() -def cli(): - pass - - -@cli.command("update-data") -@click.option("--rev", default="latest", help="The rev to use (vX.Y.Z-ee), or 'latest'") -def update_data(rev: str): - """Update data.json""" - logger.info("Updating data.json") - - repo = GitLabRepo() - if rev == "latest": - # filter out pre and rc releases - rev = next(filter(lambda x: not ("rc" in x or x.endswith("pre")), repo.tags)) - - data_file_path = pathlib.Path(__file__).parent / "data.json" - - data = repo.get_data(rev) - - with open(data_file_path.as_posix(), "w") as f: - json.dump(data, f, indent=2) - f.write("\n") - - -@cli.command("update-rubyenv") -def update_rubyenv(): - """Update rubyEnv""" - logger.info("Updating gitlab") - repo = GitLabRepo() - rubyenv_dir = pathlib.Path(__file__).parent / "rubyEnv" - - # load rev from data.json - data = _get_data_json() - rev = data["rev"] - version = data["version"] - - for fn in ["Gemfile.lock", "Gemfile"]: - with open(rubyenv_dir / fn, "w") as f: - f.write(repo.get_file(fn, rev)) - - # update to 1.2.9 to include https://gitlab.com/gitlab-org/ruby/gems/prometheus-client-mmap/-/commit/5d77f3f3e048834250589b416c6b3d4bba65a570 - subprocess.check_output( - ["sed", "-i", "s:'prometheus-client-mmap', '~> 1.2.8':'prometheus-client-mmap', '~> 1.2.9':g", "Gemfile"], - cwd=rubyenv_dir, - ) - - # Un-vendor sidekiq - # - # The sidekiq dependency was vendored to maintain compatibility with Redis 6.0 (as - # stated in this [comment]) but unfortunately, it seems to cause a crash in the - # application, as noted in this [upstream issue]. - # - # We can safely swap out the dependency, as our Redis release in nixpkgs is >= 7.0. - # - # [comment]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435#note_1979750600 - # [upstream issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435 - subprocess.check_output( - ["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq'|gem 'sidekiq', '~> 7.1.6'|g", "Gemfile"], - cwd=rubyenv_dir, - ) - - # Fetch vendored dependencies temporarily in order to build the gemset.nix - subprocess.check_output(["mkdir", "-p", "vendor/gems", "gems"], cwd=rubyenv_dir) - subprocess.check_output( - [ - "sh", - "-c", - f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=vendor/gems | tar -xj --strip-components=3", - ], - cwd=f"{rubyenv_dir}/vendor/gems", - ) - subprocess.check_output( - [ - "sh", - "-c", - f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=gems | tar -xj --strip-components=2", - ], - cwd=f"{rubyenv_dir}/gems", - ) - - # Undo our gemset.nix patches so that bundix runs through - subprocess.check_output( - ["sed", "-i", "-e", "1d", "-e", "s:\\${src}/::g", "gemset.nix"], cwd=rubyenv_dir - ) - - subprocess.check_output(["bundle", "lock"], cwd=rubyenv_dir) - subprocess.check_output(["bundix"], cwd=rubyenv_dir) - - subprocess.check_output( - [ - "sed", - "-i", - "-e", - "1i\\src:", - "-e", - 's:path = \\(vendor/[^;]*\\);:path = "${src}/\\1";:g', - "-e", - 's:path = \\(gems/[^;]*\\);:path = "${src}/\\1";:g', - "gemset.nix", - ], - cwd=rubyenv_dir, - ) - subprocess.check_output(["rm", "-rf", "vendor", "gems"], cwd=rubyenv_dir) - - -@cli.command("update-gitaly") -def update_gitaly(): - """Update gitaly""" - logger.info("Updating gitaly") - data = _get_data_json() - gitaly_server_version = data['passthru']['GITALY_SERVER_VERSION'] - repo = GitLabRepo(repo="gitaly") - gitaly_dir = pathlib.Path(__file__).parent / 'gitaly' - - makefile = repo.get_file("Makefile", f"v{gitaly_server_version}") - makefile += "\nprint-%:;@echo $($*)\n" - - git_version = subprocess.run(["make", "-f", "-", "print-GIT_VERSION"], check=True, input=makefile, text=True, capture_output=True).stdout.strip() - - _call_nix_update("gitaly", gitaly_server_version) - _call_nix_update("gitaly.git", git_version) - - -@cli.command("update-gitlab-pages") -def update_gitlab_pages(): - """Update gitlab-pages""" - logger.info("Updating gitlab-pages") - data = _get_data_json() - gitlab_pages_version = data["passthru"]["GITLAB_PAGES_VERSION"] - _call_nix_update("gitlab-pages", gitlab_pages_version) - - -def get_container_registry_version() -> str: - """Returns the version attribute of gitlab-container-registry""" - return subprocess.check_output( - [ - "nix", - "--experimental-features", - "nix-command", - "eval", - "-f", - ".", - "--raw", - "gitlab-container-registry.version", - ], - cwd=NIXPKGS_PATH, - ).decode("utf-8") - - -@cli.command("update-gitlab-shell") -def update_gitlab_shell(): - """Update gitlab-shell""" - logger.info("Updating gitlab-shell") - data = _get_data_json() - gitlab_shell_version = data["passthru"]["GITLAB_SHELL_VERSION"] - _call_nix_update("gitlab-shell", gitlab_shell_version) - - -@cli.command("update-gitlab-workhorse") -def update_gitlab_workhorse(): - """Update gitlab-workhorse""" - logger.info("Updating gitlab-workhorse") - data = _get_data_json() - gitlab_workhorse_version = data["passthru"]["GITLAB_WORKHORSE_VERSION"] - _call_nix_update("gitlab-workhorse", gitlab_workhorse_version) - - -@cli.command("update-gitlab-container-registry") -@click.option("--rev", default="latest", help="The rev to use (vX.Y.Z-ee), or 'latest'") -@click.option( - "--commit", is_flag=True, default=False, help="Commit the changes for you" -) -def update_gitlab_container_registry(rev: str, commit: bool): - """Update gitlab-container-registry""" - logger.info("Updading gitlab-container-registry") - repo = GitLabRepo(repo="container-registry") - old_container_registry_version = get_container_registry_version() - - if rev == "latest": - rev = next(filter(lambda x: not ("rc" in x or x.endswith("pre")), repo.tags)) - - version = repo.rev2version(rev) - _call_nix_update("gitlab-container-registry", version) - if commit: - new_container_registry_version = get_container_registry_version() - commit_container_registry( - old_container_registry_version, new_container_registry_version - ) - - -@cli.command('update-gitlab-elasticsearch-indexer') -def update_gitlab_elasticsearch_indexer(): - """Update gitlab-elasticsearch-indexer""" - data = _get_data_json() - gitlab_elasticsearch_indexer_version = data['passthru']['GITLAB_ELASTICSEARCH_INDEXER_VERSION'] - _call_nix_update('gitlab-elasticsearch-indexer', gitlab_elasticsearch_indexer_version) - - -@cli.command("update-all") -@click.option("--rev", default="latest", help="The rev to use (vX.Y.Z-ee), or 'latest'") -@click.option( - "--commit", is_flag=True, default=False, help="Commit the changes for you" -) -@click.pass_context -def update_all(ctx, rev: str, commit: bool): - """Update all gitlab components to the latest stable release""" - old_data_json = _get_data_json() - old_container_registry_version = get_container_registry_version() - - ctx.invoke(update_data, rev=rev) - - new_data_json = _get_data_json() - - ctx.invoke(update_rubyenv) - ctx.invoke(update_gitaly) - ctx.invoke(update_gitlab_pages) - ctx.invoke(update_gitlab_shell) - ctx.invoke(update_gitlab_workhorse) - ctx.invoke(update_gitlab_elasticsearch_indexer) - if commit: - commit_gitlab( - old_data_json["version"], new_data_json["version"], new_data_json["rev"] - ) - - ctx.invoke(update_gitlab_container_registry) - if commit: - new_container_registry_version = get_container_registry_version() - commit_container_registry( - old_container_registry_version, new_container_registry_version - ) - - -def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None: - """Commits the gitlab changes for you""" - subprocess.run( - [ - "git", - "add", - "data.json", - "rubyEnv", - "gitaly", - "gitlab-pages", - "gitlab-shell", - "gitlab-workhorse", - "gitlab-elasticsearch-indexer", - ], - cwd=GITLAB_DIR, - ) - subprocess.run( - [ - "git", - "commit", - "--message", - f"""gitlab: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/gitlab/-/blob/{new_rev}/CHANGELOG.md""", - ], - cwd=GITLAB_DIR, - ) - - -def commit_container_registry(old_version: str, new_version: str) -> None: - """Commits the gitlab-container-registry changes for you""" - subprocess.run(["git", "add", "gitlab-container-registry"], cwd=GITLAB_DIR) - subprocess.run( - [ - "git", - "commit", - "--message", - f"gitlab-container-registry: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/container-registry/-/blob/v{new_version}-gitlab/CHANGELOG.md", - ], - cwd=GITLAB_DIR, - ) - - -if __name__ == "__main__": - cli() diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/applications/version-management/gittyup/default.nix index cfe26c2de044..25e65657ce8d 100644 --- a/pkgs/applications/version-management/gittyup/default.nix +++ b/pkgs/applications/version-management/gittyup/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, cmark, - darwin, git, libssh2, lua5_4, @@ -60,24 +59,16 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = - [ - cmark - git - hunspell - libssh2 - lua5_4 - openssl - qtbase - qttools - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - ] - ); + buildInputs = [ + cmark + git + hunspell + libssh2 + lua5_4 + openssl + qtbase + qttools + ]; postInstall = '' # Those are not program libs, just some Qt5 libs that the build system leaks for some reason diff --git a/pkgs/applications/version-management/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix deleted file mode 100644 index 3b5c389e70ed..000000000000 --- a/pkgs/applications/version-management/lucky-commit/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - withOpenCL ? true, - stdenv, - OpenCL, - ocl-icd, -}: - -rustPlatform.buildRustPackage rec { - pname = "lucky-commit"; - version = "2.2.4"; - - src = fetchFromGitHub { - owner = "not-an-aardvark"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-57eOhlOkRU1sz0y/sfEyEFXQJx165qehBTP8iWiEGx8="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-8Z/bfSDjSrvGbPOVpvIYzOz5wxjkMsuwOWASnOA8ziM="; - - buildInputs = lib.optional withOpenCL (if stdenv.hostPlatform.isDarwin then OpenCL else ocl-icd); - - buildNoDefaultFeatures = !withOpenCL; - - # disable tests that require gpu - checkNoDefaultFeatures = true; - - meta = with lib; { - description = "Change the start of your git commit hashes to whatever you want"; - homepage = "https://github.com/not-an-aardvark/lucky-commit"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "lucky_commit"; - }; -} diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix deleted file mode 100644 index 3b6270bf8c65..000000000000 --- a/pkgs/applications/version-management/mercurial/default.nix +++ /dev/null @@ -1,302 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - python3Packages, - makeWrapper, - gettext, - installShellFiles, - re2Support ? true, - rustSupport ? stdenv.hostPlatform.isLinux, - cargo, - rustPlatform, - rustc, - fullBuild ? false, - gitSupport ? fullBuild, - guiSupport ? fullBuild, - tk, - highlightSupport ? fullBuild, - ApplicationServices, - # test dependencies - runCommand, - unzip, - which, - sqlite, - git, - cacert, - gnupg, -}: - -let - inherit (python3Packages) - docutils - python - fb-re2 - pygit2 - pygments - setuptools - ; - - self = python3Packages.buildPythonApplication rec { - pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.9.1"; - - src = fetchurl { - url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-5XdXfumpep+E08NNU8y4uTVCY9arlkR1JQlPPgpWcnA="; - }; - - format = "other"; - - passthru = { inherit python; }; # pass it so that the same version can be used in hg2git - - cargoDeps = - if rustSupport then - rustPlatform.fetchCargoVendor { - inherit src; - name = "mercurial-${version}"; - hash = "sha256-k/K1BupCqnlB++2T7hJxu82yID0jG8HwLNmb2eyx29o="; - sourceRoot = "mercurial-${version}/rust"; - } - else - null; - cargoRoot = if rustSupport then "rust" else null; - - propagatedBuildInputs = - lib.optional re2Support fb-re2 - ++ lib.optional gitSupport pygit2 - ++ lib.optional highlightSupport pygments; - nativeBuildInputs = - [ - makeWrapper - gettext - installShellFiles - setuptools - ] - ++ lib.optionals rustSupport [ - rustPlatform.cargoSetupHook - cargo - rustc - ]; - buildInputs = [ docutils ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; - - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional rustSupport "PURE=--rust"; - - postInstall = - (lib.optionalString guiSupport '' - mkdir -p $out/etc/mercurial - cp contrib/hgk $out/bin - cat >> $out/etc/mercurial/hgrc << EOF - [extensions] - hgk=$out/${python.sitePackages}/hgext/hgk.py - EOF - # setting HG so that hgk can be run itself as well (not only hg view) - WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} - --set HG $out/bin/hg - --prefix PATH : ${tk}/bin " - '') - + '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - $WRAP_TK - done - - # copy hgweb.cgi to allow use in apache - mkdir -p $out/share/cgi-bin - cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin - chmod u+x $out/share/cgi-bin/hgweb.cgi - - installShellCompletion --cmd hg \ - --bash contrib/bash_completion \ - --zsh contrib/zsh_completion - ''; - - passthru.tests = { - mercurial-tests = makeTests { flags = "--with-hg=$MERCURIAL_BASE/bin/hg"; }; - }; - - meta = with lib; { - description = "Fast, lightweight SCM system for very large distributed projects"; - homepage = "https://www.mercurial-scm.org"; - downloadPage = "https://www.mercurial-scm.org/release/"; - changelog = "https://wiki.mercurial-scm.org/Release${versions.majorMinor version}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ - lukegb - euxane - techknowlogick - ]; - platforms = platforms.unix; - mainProgram = "hg"; - }; - }; - - makeTests = - { - mercurial ? self, - nameSuffix ? "", - flags ? "", - }: - runCommand "${mercurial.pname}${nameSuffix}-tests" - { - inherit (mercurial) src; - - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; # needed for git - MERCURIAL_BASE = mercurial; - nativeBuildInputs = [ - python - unzip - which - sqlite - git - gnupg - ]; - - # https://bz.mercurial-scm.org/show_bug.cgi?id=6887 - propagatedBuildInputs = [ setuptools ]; - - postPatch = '' - patchShebangs . - - for f in **/*.{py,c,t}; do - # not only used in shebangs - substituteAllInPlace "$f" '/bin/sh' '${stdenv.shell}' - done - - for f in **/*.t; do - substituteInPlace 2>/dev/null "$f" \ - --replace '*/hg:' '*/*hg*:' \${ - # paths emitted by our wrapped hg look like ..hg-wrapped-wrapped - "" - } - --replace '"$PYTHON" "$BINDIR"/hg' '"$BINDIR"/hg' ${ - # 'hg' is a wrapper; don't run using python directly - "" - } - done - - # https://bz.mercurial-scm.org/show_bug.cgi?id=6887 - # Adding setuptools to the python path is not enough for the distutils - # module to be found, so we patch usage directly: - substituteInPlace tests/hghave.py \ - --replace-fail "distutils" "setuptools._distutils" - ''; - - # This runs Mercurial _a lot_ of times. - requiredSystemFeatures = [ "big-parallel" ]; - - # Don't run tests if not-Linux or if cross-compiling. - meta.broken = !stdenv.hostPlatform.isLinux || stdenv.buildPlatform != stdenv.hostPlatform; - } - '' - addToSearchPathWithCustomDelimiter : PYTHONPATH "${mercurial}/${python.sitePackages}" - - unpackPhase - cd "$sourceRoot" - patchPhase - - cat << EOF > tests/blacklists/nix - # tests enforcing "/usr/bin/env" shebangs, which are patched for nix - test-run-tests.t - test-check-shbang.t - - # unstable experimental/unsupported features - # https://bz.mercurial-scm.org/show_bug.cgi?id=6633#c1 - test-git-interop.t - - # doesn't like the extra setlocale warnings emitted by our bash wrappers - test-locale.t - - # Python 3.10-3.12 deprecation warning: asyncore - # https://bz.mercurial-scm.org/show_bug.cgi?id=6727 - test-patchbomb-tls.t - - # Python 3.12 _lsprof module change, breaking profile test - # https://bz.mercurial-scm.org/show_bug.cgi?id=6846 - test-profile.t - - # Python 3.12 deprecation warning: multi-threaded fork in worker.py - # https://bz.mercurial-scm.org/show_bug.cgi?id=6892 - test-clone-stream.t - test-clonebundles.t - test-fix-topology.t - test-fix.t - test-persistent-nodemap.t - test-profile.t - test-simple-update.t - - EOF - - export HGTEST_REAL_HG="${mercurial}/bin/hg" - # include tests for native components - export HGMODULEPOLICY="rust+c" - # extended timeout necessary for tests to pass on the busy CI workers - export HGTESTFLAGS="--blacklist blacklists/nix --timeout 1800 -j$NIX_BUILD_CORES ${flags}" - make check - touch $out - ''; -in -self.overridePythonAttrs (origAttrs: { - passthru = origAttrs.passthru // rec { - # withExtensions takes a function which takes the python packages set and - # returns a list of extensions to install. - # - # for instance: mercurial.withExtension (pm: [ pm.hg-evolve ]) - withExtensions = - f: - let - python = self.python; - mercurialHighPrio = - ps: - (ps.toPythonModule self).overrideAttrs (oldAttrs: { - meta = oldAttrs.meta // { - priority = 50; - }; - }); - plugins = (f python.pkgs) ++ [ (mercurialHighPrio python.pkgs) ]; - env = python.withPackages (ps: plugins); - in - stdenv.mkDerivation { - pname = "${self.pname}-with-extensions"; - - inherit (self) src version meta; - - buildInputs = self.buildInputs ++ self.propagatedBuildInputs; - nativeBuildInputs = self.nativeBuildInputs; - - dontUnpack = true; - dontPatch = true; - dontConfigure = true; - dontBuild = true; - doCheck = false; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - for bindir in ${lib.concatStringsSep " " (map (d: "${lib.getBin d}/bin") plugins)}; do - for bin in $bindir/*; do - ln -s ${env}/bin/$(basename $bin) $out/bin/ - done - done - - ln -s ${self}/share $out/share - - runHook postInstall - ''; - - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/hg help >/dev/null || exit 1 - - runHook postInstallCheck - ''; - }; - - tests = origAttrs.passthru.tests // { - withExtensions = withExtensions (pm: [ pm.hg-evolve ]); - }; - }; -}) diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix deleted file mode 100644 index 56f2f8e463b1..000000000000 --- a/pkgs/applications/version-management/p4/default.nix +++ /dev/null @@ -1,149 +0,0 @@ -{ - stdenv, - fetchurl, - fetchzip, - lib, - emptyDirectory, - linkFarm, - jam, - openssl, - CoreServices, - Foundation, - Security, - testers, -}: - -let - opensslStatic = openssl.override { - static = true; - }; - androidZlibContrib = - let - src = fetchzip { - url = "https://android.googlesource.com/platform/external/zlib/+archive/61174f4fd262c6075f88768465f308aae95a2f04.tar.gz"; - sha256 = "sha256-EMzKAHcEWOUugcHKH2Fj3ZaIHC9UlgO4ULKe3RvgxvI="; - stripRoot = false; - }; - in - linkFarm "android-zlib-contrib" [ - # We only want to keep the contrib directory as the other files conflict - # with p4's own zlib files. (For the same reason, we can't use the - # cone-based Git sparse checkout, either.) - { - name = "contrib"; - path = "${src}/contrib"; - } - ]; -in -stdenv.mkDerivation (finalAttrs: { - pname = "p4"; - version = "2024.1/2596294"; - - src = fetchurl { - # Upstream replaces minor versions, so use archived URL. - url = "https://web.archive.org/web/20240526153453id_/https://ftp.perforce.com/perforce/r24.1/bin.tools/p4source.tgz"; - sha256 = "sha256-6+DOJPeVzP4x0UsN9MlZRAyusapBTICX0BuyvVBQBC8="; - }; - - postPatch = lib.optionals stdenv.hostPlatform.isDarwin '' - # same error as https://github.com/pocoproject/poco/issues/4586 - substituteInPlace zlib/zutil.h \ - --replace-fail '#if defined(MACOS) || defined(TARGET_OS_MAC)' '#if defined(MACOS)' - ''; - - nativeBuildInputs = [ jam ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Foundation - Security - ]; - - outputs = [ - "out" - "bin" - "dev" - ]; - - hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ]; - - jamFlags = - [ - "-sEXEC=bin.unix" - "-sCROSS_COMPILE=${stdenv.cc.targetPrefix}" - "-sMALLOC_OVERRIDE=no" - "-sSSLINCDIR=${lib.getDev opensslStatic}/include" - "-sSSLLIBDIR=${lib.getLib opensslStatic}/lib" - ] - ++ lib.optionals stdenv.cc.isClang [ - "-sOSCOMP=clang" - "-sCLANGVER=${stdenv.cc.cc.version}" - ] - ++ lib.optionals stdenv.cc.isGNU [ - "-sOSCOMP=gcc" - "-sGCCVER=${stdenv.cc.cc.version}" - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ "-sOSVER=26" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-sOSVER=1013" - "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib" - ]; - - CCFLAGS = - # The file contrib/optimizations/slide_hash_neon.h is missing from the - # upstream distribution. It comes from the Android/Chromium sources. - lib.optionals stdenv.hostPlatform.isAarch64 [ "-I${androidZlibContrib}" ]; - - "C++FLAGS" = - # Avoid a compilation error that only occurs for 4-byte longs. - lib.optionals stdenv.hostPlatform.isi686 [ "-Wno-narrowing" ] - # See the "Header dependency changes" section of - # https://www.gnu.org/software/gcc/gcc-11/porting_to.html for more - # information on why we need to include these. - ++ - lib.optionals - (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0.0")) - [ - "-include" - "limits" - "-include" - "thread" - ]; - - preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - export MACOSX_SDK=$SDKROOT - ''; - - buildPhase = '' - runHook preBuild - jam $jamFlags -j$NIX_BUILD_CORES p4 - jam $jamFlags -j$NIX_BUILD_CORES -sPRODUCTION=yes p4api.tar - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $bin/bin $dev $out - cp bin.unix/p4 $bin/bin - cp -r bin.unix/p4api-*/include $dev - cp -r bin.unix/p4api-*/lib $out - runHook postInstall - ''; - - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "p4 -V"; - }; - - meta = with lib; { - description = "Perforce Helix Core command-line client and APIs"; - homepage = "https://www.perforce.com"; - license = licenses.bsd2; - mainProgram = "p4"; - platforms = platforms.unix; - maintainers = with maintainers; [ - corngood - impl - ]; - }; -}) diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/applications/version-management/qgit/default.nix index db3237991893..444adfbdab90 100644 --- a/pkgs/applications/version-management/qgit/default.nix +++ b/pkgs/applications/version-management/qgit/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "qgit"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "tibirna"; repo = "qgit"; rev = "${pname}-${version}"; - sha256 = "sha256-xM0nroWs4WByc2O469zVeAlzKn6LLr+8WDlEdSjtRYI="; + sha256 = "sha256-DmwxOy71mIklLQ7V/qMzi8qCMtKa9nWHlkjEr/9HJIU="; }; buildInputs = [ qtbase ]; diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix deleted file mode 100644 index 535abf792679..000000000000 --- a/pkgs/applications/version-management/sapling/default.nix +++ /dev/null @@ -1,210 +0,0 @@ -{ - lib, - stdenv, - python311Packages, - fetchFromGitHub, - fetchurl, - cargo, - curl, - pkg-config, - openssl, - rustPlatform, - rustc, - fetchYarnDeps, - yarn, - nodejs, - fixup-yarn-lock, - glibcLocales, - libiconv, - Cocoa, - CoreFoundation, - CoreGraphics, - CoreServices, - Security, - WebKit, - - enableMinimal ? false, -}: - -let - inherit (lib.importJSON ./deps.json) links version versionHash; - # Sapling sets a Cargo config containing lines like so: - # [target.aarch64-apple-darwin] - # rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"] - # - # The default cargo config that's set by the build hook will set - # unstable.host-config and unstable.target-applies-to-host which seems to - # result in the link arguments above being ignored and thus link failures. - # All it is there to do anyway is just to do stuff with musl and cross - # compilation, which doesn't work on macOS anyway so we can just stub it - # on macOS. - # - # See https://github.com/NixOS/nixpkgs/pull/198311#issuecomment-1326894295 - myCargoSetupHook = rustPlatform.cargoSetupHook.overrideAttrs (old: { - cargoConfig = lib.optionalString (!stdenv.hostPlatform.isDarwin) old.cargoConfig; - }); - - src = fetchFromGitHub { - owner = "facebook"; - repo = "sapling"; - rev = version; - hash = "sha256-4pOpJ91esTSH90MvvMu74CnlLULLUawqxcniUeqnLwA="; - }; - - addonsSrc = "${src}/addons"; - - # Fetches the Yarn modules in Nix to to be used as an offline cache - yarnOfflineCache = fetchYarnDeps { - yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-jCtrflwDrwql6rY1ff1eXLKdwmnXhg5bCJPlCczBCIk="; - }; - - # Builds the NodeJS server that runs with `sl web` - isl = stdenv.mkDerivation { - pname = "sapling-isl"; - src = addonsSrc; - inherit version; - - nativeBuildInputs = [ - fixup-yarn-lock - nodejs - yarn - ]; - - buildPhase = '' - runHook preBuild - - export HOME=$(mktemp -d) - fixup-yarn-lock yarn.lock - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} - yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress - patchShebangs node_modules - patchShebangs isl/node_modules - - substituteInPlace build-tar.py \ - --replace-fail 'run(yarn + ["--cwd", src_join(), "install", "--prefer-offline"])' 'pass' - - ${python311Packages.python}/bin/python3 build-tar.py \ - --output isl-dist.tar.xz \ - --yarn 'yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress' - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - install isl-dist.tar.xz $out/isl-dist.tar.xz - - runHook postInstall - ''; - }; -in -# Builds the main `sl` binary and its Python extensions -python311Packages.buildPythonApplication { - pname = "sapling"; - inherit src version; - - sourceRoot = "${src.name}/eden/scm"; - - # Upstream does not commit Cargo.lock - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; - "cloned-0.1.0" = "sha256-2BaNR/pQmR7pHtRf6VBQLcZgLHbj2JCxeX4auAB0efU="; - "fb303_core-0.0.0" = "sha256-PDGdKjR6KPv1uH1JSTeoG5Rs0ZkmNJLqqSXtvV3RWic="; - "fbthrift-0.0.1+unstable" = "sha256-J4REXGuLjHyN3SHilSWhMoqpRcn1QnEtsTsZF4Z3feU="; - "serde_bser-0.4.0" = "sha256-Su1IP3NzQu/87p/+uQaG8JcICL9hit3OV1O9oFiACsQ="; - }; - }; - 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, - # fetch the artifacts manually and link them. Then replace the hardcoded URLs - # with filesystem paths for the curl calls. - postUnpack = '' - mkdir $sourceRoot/hack_pydeps - ${lib.concatStrings ( - map (li: "ln -s ${fetchurl li} $sourceRoot/hack_pydeps/${baseNameOf li.url}\n") links - )} - sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py - ''; - - postInstall = '' - install ${isl}/isl-dist.tar.xz $out/lib/isl-dist.tar.xz - ''; - - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - wrapProgram $out/bin/sl \ - --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" - ''; - - nativeBuildInputs = [ - curl - pkg-config - myCargoSetupHook - cargo - rustc - ]; - - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - curl - libiconv - Cocoa - CoreFoundation - CoreGraphics - CoreServices - Security - WebKit - ]; - - HGNAME = "sl"; - SAPLING_OSS_BUILD = "true"; - SAPLING_VERSION_HASH = versionHash; - - # Python setuptools version 66 and newer does not support upstream Sapling's - # version numbers (e.g. "0.2.20230124-180750-hf8cd450a"). Change the version - # number to something supported by setuptools (e.g. "0.2.20230124"). - # https://github.com/facebook/sapling/issues/571 - SAPLING_VERSION = builtins.elemAt (builtins.split "-" version) 0; - - # just a simple check phase, until we have a running test suite. this should - # help catch issues like lack of a LOCALE_ARCHIVE setting (see GH PR #202760) - doCheck = true; - installCheckPhase = '' - echo -n "testing sapling version; should be \"$SAPLING_VERSION\"... " - $out/bin/sl version | grep -qw "$SAPLING_VERSION" - echo "OK!" - ''; - - # Expose isl to nix repl as sapling.isl. - passthru.isl = isl; - - meta = with lib; { - description = "Scalable, User-Friendly Source Control System"; - homepage = "https://sapling-scm.com"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ - pbar - thoughtpolice - ]; - platforms = platforms.unix; - mainProgram = "sl"; - }; -} diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index e4ef91162b11..5896f6b68149 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -14,57 +14,54 @@ unzip, pip, pythonOlder, - setuptools, + setuptools-scm, }: let - version = "0.89.15"; + version = "0.95.1"; gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; - gqlgenVersion = "0.17.39"; + gqlgenVersion = "0.17.64"; }; + patches = [ ./patches/core-go-update/builds/patch-deps.patch ]; + src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - hash = "sha256-rmNaBnTPDDQO/ImkGkMwW8fyjQyBUBchTEnbtAK24pw="; + hash = "sha256-On/dKqIuqsCLAgYkJQOeYL7Ne983JzEYKhuLpD5vNu4="; }; buildsrht-api = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "buildsrht-api"; modRoot = "api"; - vendorHash = "sha256-dwpuB+aYqzhGSdGVq/F9FTdHWMBkGMtVuZ7I3hB3b+Q="; + vendorHash = "sha256-GOM7fmJvfPJW3+XzvlwQZ9hBknlXwBKjGSmtIiapleY="; } // gqlgen ); buildsrht-worker = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "buildsrht-worker"; modRoot = "worker"; - vendorHash = "sha256-dwpuB+aYqzhGSdGVq/F9FTdHWMBkGMtVuZ7I3hB3b+Q="; + vendorHash = "sha256-nEXnCeUxlUMNUqhe82MKREXcaC9pvqZqyqhyQW+jQjQ="; } // gqlgen ); in buildPythonPackage rec { - inherit src version; + inherit src version patches; pname = "buildsrht"; pyproject = true; disabled = pythonOlder "3.7"; - postPatch = '' - substituteInPlace Makefile \ - --replace "all: api worker" "" - ''; - nativeBuildInputs = [ pip - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -78,9 +75,14 @@ buildPythonPackage rec { lxml ]; - preBuild = '' - export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht + env = { + PKGVER = version; + SRHT_PATH = "${srht}/${python.sitePackages}/srht"; + PREFIX = placeholder "out"; + }; + + postBuild = '' + make SASSC_INCLUDE=-I${srht}/share/sourcehut/scss/ all-share ''; postInstall = '' @@ -89,8 +91,10 @@ buildPythonPackage rec { cp -r images $out/lib cp contrib/submit_image_build $out/bin/builds.sr.ht - ln -s ${buildsrht-api}/bin/api $out/bin/buildsrht-api - ln -s ${buildsrht-worker}/bin/worker $out/bin/buildsrht-worker + ln -s ${buildsrht-api}/bin/api $out/bin/builds.sr.ht-api + ln -s ${buildsrht-worker}/bin/worker $out/bin/builds.sr.ht-worker + install -Dm644 schema.sql $out/share/sourcehut/builds.sr.ht-schema.sql + make install-share ''; pythonImportsCheck = [ "buildsrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index c8dc6e41ce9c..d600117e225f 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -24,12 +24,12 @@ sassc, pythonOlder, minify, - setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "srht"; - version = "0.71.8"; + version = "0.76.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "~sircmpwn"; repo = "core.sr.ht"; rev = version; - hash = "sha256-rDpm2HJOWScvIxOmHcat6y4CWdBE9T2gE/jZskYAFB0="; + hash = "sha256-lAN1JZXQuN2zxi/BdBtbNj52LPj9iYn0WB2OpyQcyuU="; fetchSubmodules = true; }; @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - setuptools + setuptools-scm ]; propagatedNativeBuildInputs = [ @@ -81,12 +81,19 @@ buildPythonPackage rec { importlib-metadata ]; - PKGVER = version; + env = { + PREFIX = placeholder "out"; + PKGVER = version; + }; + + postInstall = '' + make install + ''; pythonImportsCheck = [ "srht" ]; meta = with lib; { - homepage = "https://git.sr.ht/~sircmpwn/srht"; + homepage = "https://git.sr.ht/~sircmpwn/core.sr.ht"; description = "Core modules for sr.ht"; license = licenses.bsd3; maintainers = with maintainers; [ diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 289e2ff2554a..ede187a215fc 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -5,8 +5,6 @@ recurseIntoAttrs, nixosTests, config, - fetchPypi, - fetchpatch, }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` @@ -29,75 +27,6 @@ let todosrht = self.callPackage ./todo.nix { }; scmsrht = self.callPackage ./scm.nix { }; - - # sourcehut is not (yet) compatible with SQLAlchemy 2.x - sqlalchemy = super.sqlalchemy_1_4; - - # sourcehut is not (yet) compatible with flask-sqlalchemy 3.x - flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "2.5.1"; - format = "setuptools"; - src = fetchPypi { - pname = "Flask-SQLAlchemy"; - inherit version; - hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI="; - }; - propagatedBuildInputs = with self; [ - flask - sqlalchemy - ]; - disabledTests = [ "test_persist_selectable" ]; - }); - - # flask-sqlalchemy 2.x requires flask 2.x - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "2.3.3"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; - }; - }); - - # flask 2.x requires werkzeug 2.x - werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { - version = "2.3.8"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-VUslfHS763oNJUFgpPj/4YUkP1KlIDUGC3Ycpi2XfwM="; - }; - # Fixes a test failure with Pytest 8 - patches = (oldAttrs.patches or [ ]) ++ [ - (fetchpatch { - url = "https://github.com/pallets/werkzeug/commit/4e5bdca7f8227d10cae828f8064fb98190ace4aa.patch"; - hash = "sha256-83doVvfdpymlAB0EbfrHmuoKE5B2LJbFq+AY2xGpnl4="; - }) - ]; - nativeCheckInputs = oldAttrs.nativeCheckInputs or [ ] ++ [ self.pytest-xprocess ]; - }); - - # sourcehut is not (yet) compatible with factory-boy 3.x - factory-boy = super.factory-boy.overridePythonAttrs (oldAttrs: rec { - version = "2.12.0"; - src = fetchPypi { - pname = "factory_boy"; - inherit version; - hash = "sha256-+vSNYIoXNfDQo8nL9TbWT5EytUfa57pFLE2Zp56Eo3A="; - }; - nativeCheckInputs = - (with super; [ - django - mongoengine - pytestCheckHook - ]) - ++ (with self; [ - sqlalchemy - flask - flask-sqlalchemy - ]); - postPatch = ""; - }); }; }; in diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 887dac1a7070..cf58b41994e5 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -11,42 +11,44 @@ pythonOlder, unzip, pip, - setuptools, + setuptools-scm, }: let - version = "0.85.9"; + version = "0.88.10"; gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; - gqlgenVersion = "0.17.42"; + gqlgenVersion = "0.17.64"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "git.sr.ht"; rev = version; - hash = "sha256-tmbBw6x3nqN9nRIR3xOXQ+L5EACXLQYLXQYK3lsOsAI="; + hash = "sha256-o7d2EIx9oJAQSIrMMG/TYjAo7PJwT6rE8kcVMKoYenY="; }; + patches = [ ./patches/core-go-update/git/patch-deps.patch ]; + gitApi = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "gitsrht-api"; modRoot = "api"; - vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; + vendorHash = "sha256-20SxOZrvj41L8A5nuOro9DYiK6FyhwJK5cNAvxPB7qw="; } // gqlgen ); gitDispatch = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "gitsrht-dispatch"; - modRoot = "gitsrht-dispatch"; - vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; + modRoot = "dispatch"; + vendorHash = "sha256-MXLF7vO8SmUkU1nOxhObuzjT2ZRQQluIX7TRrxL7/3Y="; postPatch = '' - substituteInPlace gitsrht-dispatch/main.go \ - --replace /var/log/gitsrht-dispatch /var/log/sourcehut/gitsrht-dispatch + substituteInPlace dispatch/main.go \ + --replace-fail /var/log/git.sr.ht-dispatch /var/log/sourcehut/git.sr.ht-dispatch ''; } // gqlgen @@ -54,14 +56,14 @@ let gitKeys = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "gitsrht-keys"; - modRoot = "gitsrht-keys"; - vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; + modRoot = "keys"; + vendorHash = "sha256-MXLF7vO8SmUkU1nOxhObuzjT2ZRQQluIX7TRrxL7/3Y="; postPatch = '' - substituteInPlace gitsrht-keys/main.go \ - --replace /var/log/gitsrht-keys /var/log/sourcehut/gitsrht-keys + substituteInPlace keys/main.go \ + --replace-fail /var/log/git.sr.ht-keys /var/log/sourcehut/git.sr.ht-keys ''; } // gqlgen @@ -69,14 +71,14 @@ let gitShell = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "gitsrht-shell"; - modRoot = "gitsrht-shell"; - vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; + modRoot = "shell"; + vendorHash = "sha256-MXLF7vO8SmUkU1nOxhObuzjT2ZRQQluIX7TRrxL7/3Y="; postPatch = '' - substituteInPlace gitsrht-shell/main.go \ - --replace /var/log/gitsrht-shell /var/log/sourcehut/gitsrht-shell + substituteInPlace shell/main.go \ + --replace-fail /var/log/git.sr.ht-shell /var/log/sourcehut/git.sr.ht-shell ''; } // gqlgen @@ -84,34 +86,29 @@ let gitUpdateHook = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "gitsrht-update-hook"; - modRoot = "gitsrht-update-hook"; - vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; + modRoot = "update-hook"; + vendorHash = "sha256-MXLF7vO8SmUkU1nOxhObuzjT2ZRQQluIX7TRrxL7/3Y="; postPatch = '' - substituteInPlace gitsrht-update-hook/main.go \ - --replace /var/log/gitsrht-update-hook /var/log/sourcehut/gitsrht-update-hook + substituteInPlace update-hook/main.go \ + --replace-fail /var/log/git.sr.ht-update-hook /var/log/sourcehut/git.sr.ht-update-hook ''; } // gqlgen ); in buildPythonPackage rec { - inherit src version; + inherit src version patches; pname = "gitsrht"; pyproject = true; disabled = pythonOlder "3.7"; - postPatch = '' - substituteInPlace Makefile \ - --replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" "" - ''; - nativeBuildInputs = [ pip - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -121,18 +118,25 @@ buildPythonPackage rec { minio ]; - preBuild = '' - export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht + env = { + PKGVER = version; + SRHT_PATH = "${srht}/${python.sitePackages}/srht"; + PREFIX = placeholder "out"; + }; + + postBuild = '' + make SASSC_INCLUDE=-I${srht}/share/sourcehut/scss/ all-share ''; postInstall = '' mkdir -p $out/bin - ln -s ${gitApi}/bin/api $out/bin/gitsrht-api - ln -s ${gitDispatch}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch - ln -s ${gitKeys}/bin/gitsrht-keys $out/bin/gitsrht-keys - ln -s ${gitShell}/bin/gitsrht-shell $out/bin/gitsrht-shell - ln -s ${gitUpdateHook}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook + ln -s ${gitApi}/bin/api $out/bin/git.sr.ht-api + ln -s ${gitDispatch}/bin/dispatch $out/bin/git.sr.ht-dispatch + ln -s ${gitKeys}/bin/keys $out/bin/git.sr.ht-keys + ln -s ${gitShell}/bin/shell $out/bin/git.sr.ht-shell + ln -s ${gitUpdateHook}/bin/update-hook $out/bin/git.sr.ht-update-hook + install -Dm644 schema.sql $out/share/sourcehut/git.sr.ht-schema.sql + make PREFIX=$out install-share ''; pythonImportsCheck = [ "gitsrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 23e99349d24d..59642035e236 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,6 +1,7 @@ { lib, fetchFromSourcehut, + fetchpatch, buildGoModule, buildPythonPackage, srht, @@ -11,65 +12,71 @@ unzip, pip, pythonOlder, - setuptools, + setuptools-scm, }: let - version = "0.33.0"; + version = "0.36.1"; gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; - gqlgenVersion = "0.17.45"; + gqlgenVersion = "0.17.64"; }; - pyproject = true; - - disabled = pythonOlder "3.7"; + patches = [ + (fetchpatch { + name = "update-core-go-and-gqlgen.patch"; + url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht/rev/2765f086c3a67e00219cabe9a1dd01b2012c5c12.patch"; + hash = "sha256-MLZG07tD7vrfvx2GDRUvFd/7VxxZLrAa/C3bB/IvQpI="; + }) + ./patches/core-go-update/hg/patch-deps.patch + ]; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hg.sr.ht"; rev = version; - hash = "sha256-+BYeE+8dXY/MLLYyBBLD+eKqmrPiKyyCGIZLkCPzNYM="; + hash = "sha256-EeWRUb/BZ+KJXNqmzCFYHkvWUaPvF/F7ZaOYM0IEYwk="; vc = "hg"; }; hgsrht-api = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "hgsrht-api"; modRoot = "api"; - vendorHash = "sha256-K+KMhcvkG/qeQTnlHS4xhLCcvBQNNp2DcScJPm8Dbic="; + vendorHash = "sha256-elaVmyaO5IbzsnBYRjJvmoOFR8gx1xCfzd3z01KNXVA="; } // gqlgen ); hgsrht-keys = buildGoModule { - inherit src version; + inherit src version patches; pname = "hgsrht-keys"; - modRoot = "hgsrht-keys"; - vendorHash = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU="; + modRoot = "keys"; + vendorHash = "sha256-U5NtgyUgVqI25XBg51U7glNRpR5MZBCcsuuR6f+gZc8="; postPatch = '' - substituteInPlace hgsrht-keys/main.go \ - --replace /var/log/hgsrht-keys /var/log/sourcehut/hgsrht-keys + substituteInPlace keys/main.go \ + --replace-fail /var/log/hg.sr.ht-keys /var/log/sourcehut/hg.sr.ht-keys ''; }; in buildPythonPackage rec { - inherit src version; + inherit src version patches; pname = "hgsrht"; - postPatch = '' - substituteInPlace Makefile \ - --replace "all: api hgsrht-keys" "" + pyproject = true; - substituteInPlace hgsrht-shell \ - --replace /var/log/hgsrht-shell /var/log/sourcehut/hgsrht-shell + disabled = pythonOlder "3.7"; + + postPatch = '' + substituteInPlace hg.sr.ht-shell \ + --replace-fail /var/log/hg.sr.ht-shell /var/log/sourcehut/hg.sr.ht-shell ''; nativeBuildInputs = [ pip - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -79,20 +86,27 @@ buildPythonPackage rec { unidiff ]; - preBuild = '' - export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht + env = { + PKGVER = version; + SRHT_PATH = "${srht}/${python.sitePackages}/srht"; + PREFIX = placeholder "out"; + }; + + postBuild = '' + make SASSC_INCLUDE=-I${srht}/share/sourcehut/scss/ all-share ''; postInstall = '' - ln -s ${hgsrht-api}/bin/api $out/bin/hgsrht-api - ln -s ${hgsrht-keys}/bin/hgsrht-keys $out/bin/hgsrht-keys + ln -s ${hgsrht-api}/bin/api $out/bin/hg.sr.ht-api + ln -s ${hgsrht-keys}/bin/hgsrht-keys $out/bin/hg.sr.ht-keys + install -Dm644 schema.sql $out/share/sourcehut/hg.sr.ht-schema.sql + make install-share ''; pythonImportsCheck = [ "hgsrht" ]; meta = with lib; { - homepage = "https://git.sr.ht/~sircmpwn/hg.sr.ht"; + homepage = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; description = "Mercurial repository hosting service for the sr.ht network"; license = licenses.agpl3Only; maintainers = with maintainers; [ diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 5a800275e4ca..52b30b793ab6 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -5,7 +5,7 @@ buildPythonPackage, python, srht, - setuptools, + setuptools-scm, pip, pyyaml, pythonOlder, @@ -13,43 +13,41 @@ }: let - version = "0.17.7"; + version = "0.20.2"; gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; - gqlgenVersion = "0.17.43"; + gqlgenVersion = "0.17.64"; }; + patches = [ ./patches/core-go-update/hub/patch-deps.patch ]; + src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hub.sr.ht"; rev = version; - hash = "sha256-IyY7Niy/vZSAXjYZMlxY6uuQ8nH/4yT4+MaRjHtl6G4="; + hash = "sha256-blaaJ7kQBkswmSpEVEsDm6vaxuMuCcW2wmeN+fbwzjg="; }; hubsrht-api = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "hubsrht-api"; modRoot = "api"; - vendorHash = "sha256-GVN11nEJqIHh8MtKvIXe4zcUwJph9eTSkJ2R+ufD+ic="; + vendorHash = "sha256-jKNHZrFydp3+cD8MR2izzE8bi4H2uT/7+x/wmPkEIIc="; } // gqlgen ); in buildPythonPackage rec { - inherit src version; + inherit src version patches; pname = "hubsrht"; pyproject = true; disabled = pythonOlder "3.7"; - postPatch = '' - substituteInPlace Makefile --replace "all: api" "" - ''; - nativeBuildInputs = [ pip - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -57,13 +55,20 @@ buildPythonPackage rec { pyyaml ]; - preBuild = '' - export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht + env = { + PKGVER = version; + SRHT_PATH = "${srht}/${python.sitePackages}/srht"; + PREFIX = placeholder "out"; + }; + + postBuild = '' + make SASSC_INCLUDE=-I${srht}/share/sourcehut/scss/ all-share ''; postInstall = '' - ln -s ${hubsrht-api}/bin/api $out/bin/hubsrht-api + ln -s ${hubsrht-api}/bin/api $out/bin/hub.sr.ht-api + install -Dm644 schema.sql $out/share/sourcehut/hub.sr.ht-schema.sql + make install-share ''; # Module has no tests diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 8115410b8e33..f36515a55b7b 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -12,48 +12,45 @@ unzip, pip, pythonOlder, - setuptools, + setuptools-scm, }: let - version = "0.57.18"; + version = "0.62.3"; gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; - gqlgenVersion = "0.17.45"; + gqlgenVersion = "0.17.64"; }; + patches = [ ./patches/core-go-update/lists/patch-deps.patch ]; + src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "lists.sr.ht"; rev = version; - hash = "sha256-l+QPocnwHTjrU+M0wnm4tBrbz8KmSb6DovC+skuAnLc="; + hash = "sha256-HU3hnKdIoseCo1/lt3GIOQ5d3joykN11/Bzvk4xvH4Y="; }; listssrht-api = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "listssrht-api"; modRoot = "api"; - vendorHash = "sha256-UeVs/+uZNtv296bzXIBio2wcg3Uzu3fBM4APzF9O0hY="; + vendorHash = "sha256-XKDEr8ESs9oBh7DKu2jgPEMDY99nN25inkNwU/rrza8="; } // gqlgen ); in buildPythonPackage rec { - inherit src version; + inherit src version patches; pname = "listssrht"; pyproject = true; disabled = pythonOlder "3.7"; - postPatch = '' - substituteInPlace Makefile \ - --replace "all: api" "" - ''; - nativeBuildInputs = [ pip - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -65,13 +62,20 @@ buildPythonPackage rec { emailthreads ]; - preBuild = '' - export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht + env = { + PKGVER = version; + SRHT_PATH = "${srht}/${python.sitePackages}/srht"; + PREFIX = placeholder "out"; + }; + + postBuild = '' + make SASSC_INCLUDE=-I${srht}/share/sourcehut/scss/ all-share ''; postInstall = '' - ln -s ${listssrht-api}/bin/api $out/bin/listssrht-api + ln -s ${listssrht-api}/bin/api $out/bin/lists.sr.ht-api + install -Dm644 schema.sql $out/share/sourcehut/lists.sr.ht-schema.sql + make install-share ''; pythonImportsCheck = [ "listssrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index a9c2cc8a2c55..8b9e0525a926 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -9,47 +9,45 @@ unzip, pip, pythonOlder, - setuptools, + setuptools-scm, }: let - version = "0.16.5"; + version = "0.18.1"; gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; - gqlgenVersion = "0.17.43"; + gqlgenVersion = "0.17.64"; }; + patches = [ ./patches/core-go-update/man/patch-deps.patch ]; + src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "man.sr.ht"; rev = version; - hash = "sha256-JFMtif2kIE/fs5PNcQtkJikAFNszgZTU7BG/8fTncTI="; + hash = "sha256-c2xFC1pmOSGGMP4RVOmgFogj7CY2kHrADsWsm7M5ZK4="; }; mansrht-api = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "mansrht-api"; modRoot = "api"; - vendorHash = "sha256-GVN11nEJqIHh8MtKvIXe4zcUwJph9eTSkJ2R+ufD+ic="; + vendorHash = "sha256-jKNHZrFydp3+cD8MR2izzE8bi4H2uT/7+x/wmPkEIIc="; } // gqlgen ); in buildPythonPackage rec { - inherit src version; + inherit src version patches; pname = "mansrht"; pyproject = true; disabled = pythonOlder "3.7"; - postPatch = '' - substituteInPlace Makefile --replace "all: api" "" - ''; - nativeBuildInputs = [ pip - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -57,13 +55,20 @@ buildPythonPackage rec { pygit2 ]; - preBuild = '' - export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht + env = { + PKGVER = version; + SRHT_PATH = "${srht}/${python.sitePackages}/srht"; + PREFIX = placeholder "out"; + }; + + postBuild = '' + make SASSC_INCLUDE=-I${srht}/share/sourcehut/scss/ all-share ''; postInstall = '' - ln -s ${mansrht-api}/bin/api $out/bin/mansrht-api + ln -s ${mansrht-api}/bin/api $out/bin/man.sr.ht-api + install -Dm644 schema.sql $out/share/sourcehut/man.sr.ht-schema.sql + make install-share ''; pythonImportsCheck = [ "mansrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index ec1893968c13..356812b643d8 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -16,47 +16,44 @@ unzip, pip, pythonOlder, - setuptools, + setuptools-scm, }: let - version = "0.69.8"; + version = "0.72.11"; gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; - gqlgenVersion = "0.17.43"; + gqlgenVersion = "0.17.64"; }; + patches = [ ./patches/core-go-update/meta/patch-deps.patch ]; + src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "meta.sr.ht"; rev = version; - hash = "sha256-K7p6cytkPYgUuYr7BVfU/+sVbSr2YEmreIDnTatUMyk="; + hash = "sha256-dh+9wSQLL69xZ2Elmkyb9vEwpE7U7szz62VVS/0IM7Q="; }; metasrht-api = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "metasrht-api"; modRoot = "api"; - vendorHash = "sha256-vIkUK1pigVU8vZL5xpHLeinOga5eXXHTuDkHxwUz6uM="; + vendorHash = "sha256-z4gRqI05t3m7ANyDJHmBcOCW476IG/eTfLetPRPbqtg="; } // gqlgen ); in buildPythonPackage rec { pname = "metasrht"; - inherit version src; + inherit version src patches; pyproject = true; disabled = pythonOlder "3.7"; - postPatch = '' - substituteInPlace Makefile \ - --replace "all: api" "" - ''; - nativeBuildInputs = [ pip - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -71,14 +68,21 @@ buildPythonPackage rec { zxcvbn ]; - preBuild = '' - export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht + env = { + PKGVER = version; + SRHT_PATH = "${srht}/${python.sitePackages}/srht"; + PREFIX = placeholder "out"; + }; + + postBuild = '' + make SASSC_INCLUDE=-I${srht}/share/sourcehut/scss/ all-share ''; postInstall = '' mkdir -p $out/bin - ln -s ${metasrht-api}/bin/api $out/bin/metasrht-api + ln -s ${metasrht-api}/bin/api $out/bin/meta.sr.ht-api + install -Dm644 schema.sql $out/share/sourcehut/meta.sr.ht-schema.sql + make install-share ''; pythonImportsCheck = [ "metasrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/pages.nix b/pkgs/applications/version-management/sourcehut/pages.nix index 03c6ed31fee2..cd3aa0db0ce7 100644 --- a/pkgs/applications/version-management/sourcehut/pages.nix +++ b/pkgs/applications/version-management/sourcehut/pages.nix @@ -8,25 +8,23 @@ buildGoModule ( rec { pname = "pagessrht"; - version = "0.15.7"; + version = "0.16.0"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "pages.sr.ht"; rev = version; - hash = "sha256-Lobuf12ybSO7Y4ztOLMFW0dmPFaBSEPCy4Nmh89tylI="; + hash = "sha256-XnKNXYzg9wuL4U2twkAspaQJZy2HWLQQQl9AITtipVU="; }; + patches = ./patches/core-go-update/pages/patch-deps.patch; + postPatch = '' substituteInPlace Makefile \ - --replace "all: server" "" - - # fix build failure due to unused import - substituteInPlace server.go \ - --replace-warn ' "fmt"' "" + --replace-fail "all: server daily" "" ''; - vendorHash = "sha256-9hpOkP6AYSZe7MW1mrwFEKq7TvVt6OcF6eHWY4jARuU="; + vendorHash = "sha256-klDROxNvR7lk79ptckulImVVwsAfcnKtJJAaevlZSWU="; postInstall = '' mkdir -p $out/share/sql/ @@ -48,6 +46,6 @@ buildGoModule ( } // import ./fix-gqlgen-trimpath.nix { inherit unzip; - gqlgenVersion = "0.17.42"; + gqlgenVersion = "0.17.64"; } ) diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index 3e0800f6b014..e4208de8cd08 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -8,49 +8,46 @@ pyyaml, python, pythonOlder, - setuptools, + setuptools-scm, unzip, }: let - version = "0.15.4"; + version = "0.16.1"; gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; - gqlgenVersion = "0.17.45"; + gqlgenVersion = "0.17.64"; }; + patches = [ ./patches/core-go-update/paste/patch-deps.patch ]; + src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "paste.sr.ht"; rev = version; - hash = "sha256-M38hAMRdMzcqxJv7j7foOIYEImr/ZYz/lbYOF9R9g2M="; + hash = "sha256-SWtkE2/sTTJo0zAVFRfsA7fVF359OvgiHOT+yRaiads="; }; pastesrht-api = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "pastesrht-api"; modRoot = "api"; - vendorHash = "sha256-vt5nSPcx+Y/SaWcqjV38DTL3ZtzmdjbkJYMv5Fhhnq4="; + vendorHash = "sha256-uVqxPa1YggPgdSzGzXxVNdf4dM2DPGDXajkSXz4NhFM="; } // gqlgen ); in buildPythonPackage rec { - inherit src version; + inherit src version patches; pname = "pastesrht"; pyproject = true; disabled = pythonOlder "3.7"; - postPatch = '' - substituteInPlace Makefile \ - --replace "all: api" "" - ''; - nativeBuildInputs = [ pip - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -58,14 +55,20 @@ buildPythonPackage rec { pyyaml ]; - preBuild = '' - export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht + env = { + PKGVER = version; + SRHT_PATH = "${srht}/${python.sitePackages}/srht"; + PREFIX = placeholder "out"; + }; + + postBuild = '' + make SASSC_INCLUDE=-I${srht}/share/sourcehut/scss/ all-share ''; postInstall = '' mkdir -p $out/bin - ln -s ${pastesrht-api}/bin/api $out/bin/pastesrht-api + ln -s ${pastesrht-api}/bin/api $out/bin/paste.sr.ht-api + make install-share ''; pythonImportsCheck = [ "pastesrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/patches/core-go-update/builds/patch-deps.patch b/pkgs/applications/version-management/sourcehut/patches/core-go-update/builds/patch-deps.patch new file mode 100644 index 000000000000..27017b57ed8c --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/core-go-update/builds/patch-deps.patch @@ -0,0 +1,25 @@ +diff --git a/go.mod b/go.mod +index 07f7c64..972b258 100644 +--- a/go.mod ++++ b/go.mod +@@ -5,7 +5,7 @@ go 1.22.5 + toolchain go1.24.0 + + require ( +- git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b ++ git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c + github.com/99designs/gqlgen v0.17.64 + github.com/Masterminds/squirrel v1.5.4 +diff --git a/go.sum b/go.sum +index aaccf89..73bfe7c 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,5 +1,7 @@ + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b h1:d76irAQODAtl5G1zmKfwf60544fyGz74YT9k+7yYVxc= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b h1:UuQxEJrh/NNdmaVcK34opEz7ypXnPyxeRcT7Aigz+7E= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c h1:v2opuaN0C5ZpuCifRNR9ZQ8V9IG+Ja80otK1MFj5RnI= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= + git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= diff --git a/pkgs/applications/version-management/sourcehut/patches/core-go-update/git/patch-deps.patch b/pkgs/applications/version-management/sourcehut/patches/core-go-update/git/patch-deps.patch new file mode 100644 index 000000000000..f6e1d18e3c5c --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/core-go-update/git/patch-deps.patch @@ -0,0 +1,26 @@ +diff --git a/go.mod b/go.mod +index b1e0834..8299f9b 100644 +--- a/go.mod ++++ b/go.mod +@@ -5,7 +5,7 @@ go 1.22.5 + toolchain go1.24.0 + + require ( +- git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b ++ git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c + git.sr.ht/~sircmpwn/scm.sr.ht/srht-keys v0.0.0-20241202093706-8da5ec7e6b94 + git.sr.ht/~turminal/go-fnmatch v0.0.0-20211021204744-1a55764af6de +diff --git a/go.sum b/go.sum +index 193cce9..9b0bda4 100644 +--- a/go.sum ++++ b/go.sum +@@ -35,6 +35,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 + git.sr.ht/~sircmpwn/core-go v0.0.0-20240124105042-864816cfbc0c/go.mod h1:OovCpg5LsbYJjmDTpk5wUgHM4tUor736Pmxekm9BUcQ= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b h1:d76irAQODAtl5G1zmKfwf60544fyGz74YT9k+7yYVxc= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b h1:UuQxEJrh/NNdmaVcK34opEz7ypXnPyxeRcT7Aigz+7E= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= + git.sr.ht/~sircmpwn/dowork v0.0.0-20221010085743-46c4299d76a1/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c h1:v2opuaN0C5ZpuCifRNR9ZQ8V9IG+Ja80otK1MFj5RnI= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= diff --git a/pkgs/applications/version-management/sourcehut/patches/core-go-update/hg/patch-deps.patch b/pkgs/applications/version-management/sourcehut/patches/core-go-update/hg/patch-deps.patch new file mode 100644 index 000000000000..6ab931be71e9 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/core-go-update/hg/patch-deps.patch @@ -0,0 +1,25 @@ +diff --git a/go.mod b/go.mod +index ba49458..3a31083 100644 +--- a/go.mod ++++ b/go.mod +@@ -5,7 +5,7 @@ go 1.22.5 + toolchain go1.24.0 + + require ( +- git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b ++ git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c + github.com/99designs/gqlgen v0.17.64 + github.com/Masterminds/squirrel v1.5.4 +diff --git a/go.sum b/go.sum +index 61766aa..e01c045 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,5 +1,7 @@ + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b h1:d76irAQODAtl5G1zmKfwf60544fyGz74YT9k+7yYVxc= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b h1:UuQxEJrh/NNdmaVcK34opEz7ypXnPyxeRcT7Aigz+7E= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c h1:v2opuaN0C5ZpuCifRNR9ZQ8V9IG+Ja80otK1MFj5RnI= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= + git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= diff --git a/pkgs/applications/version-management/sourcehut/patches/core-go-update/hub/patch-deps.patch b/pkgs/applications/version-management/sourcehut/patches/core-go-update/hub/patch-deps.patch new file mode 100644 index 000000000000..495783f16b21 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/core-go-update/hub/patch-deps.patch @@ -0,0 +1,25 @@ +diff --git a/go.mod b/go.mod +index ea624d5..3674152 100644 +--- a/go.mod ++++ b/go.mod +@@ -5,7 +5,7 @@ go 1.22.5 + toolchain go1.24.0 + + require ( +- git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b ++ git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c + github.com/99designs/gqlgen v0.17.64 + github.com/vektah/gqlparser/v2 v2.5.23 +diff --git a/go.sum b/go.sum +index f67a555..a366a60 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,5 +1,7 @@ + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b h1:d76irAQODAtl5G1zmKfwf60544fyGz74YT9k+7yYVxc= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b h1:UuQxEJrh/NNdmaVcK34opEz7ypXnPyxeRcT7Aigz+7E= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c h1:v2opuaN0C5ZpuCifRNR9ZQ8V9IG+Ja80otK1MFj5RnI= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= + git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= diff --git a/pkgs/applications/version-management/sourcehut/patches/core-go-update/lists/patch-deps.patch b/pkgs/applications/version-management/sourcehut/patches/core-go-update/lists/patch-deps.patch new file mode 100644 index 000000000000..cd6054d9408c --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/core-go-update/lists/patch-deps.patch @@ -0,0 +1,26 @@ +diff --git a/go.mod b/go.mod +index da34484..24757a0 100644 +--- a/go.mod ++++ b/go.mod +@@ -6,7 +6,7 @@ toolchain go1.24.0 + + require ( + git.sr.ht/~emersion/go-emailthreads v0.0.0-20230220165133-75c43015b6c2 +- git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b ++ git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c + github.com/99designs/gqlgen v0.17.64 + github.com/Masterminds/squirrel v1.5.4 +diff --git a/go.sum b/go.sum +index 4590dd5..0c49985 100644 +--- a/go.sum ++++ b/go.sum +@@ -2,6 +2,8 @@ git.sr.ht/~emersion/go-emailthreads v0.0.0-20230220165133-75c43015b6c2 h1:5CkkRD + git.sr.ht/~emersion/go-emailthreads v0.0.0-20230220165133-75c43015b6c2/go.mod h1:CQUF7XpyupxjwxlNX3PHRCYL+N2COXTRRRS4MgM49R4= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b h1:d76irAQODAtl5G1zmKfwf60544fyGz74YT9k+7yYVxc= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b h1:UuQxEJrh/NNdmaVcK34opEz7ypXnPyxeRcT7Aigz+7E= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c h1:v2opuaN0C5ZpuCifRNR9ZQ8V9IG+Ja80otK1MFj5RnI= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= + git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= diff --git a/pkgs/applications/version-management/sourcehut/patches/core-go-update/man/patch-deps.patch b/pkgs/applications/version-management/sourcehut/patches/core-go-update/man/patch-deps.patch new file mode 100644 index 000000000000..581f42528f51 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/core-go-update/man/patch-deps.patch @@ -0,0 +1,25 @@ +diff --git a/go.mod b/go.mod +index 21c7713..8f158a2 100644 +--- a/go.mod ++++ b/go.mod +@@ -5,7 +5,7 @@ go 1.22.5 + toolchain go1.24.0 + + require ( +- git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b ++ git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c + github.com/99designs/gqlgen v0.17.64 + github.com/vektah/gqlparser/v2 v2.5.23 +diff --git a/go.sum b/go.sum +index f67a555..a366a60 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,5 +1,7 @@ + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b h1:d76irAQODAtl5G1zmKfwf60544fyGz74YT9k+7yYVxc= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b h1:UuQxEJrh/NNdmaVcK34opEz7ypXnPyxeRcT7Aigz+7E= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c h1:v2opuaN0C5ZpuCifRNR9ZQ8V9IG+Ja80otK1MFj5RnI= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= + git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= diff --git a/pkgs/applications/version-management/sourcehut/patches/core-go-update/meta/patch-deps.patch b/pkgs/applications/version-management/sourcehut/patches/core-go-update/meta/patch-deps.patch new file mode 100644 index 000000000000..7163246928a9 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/core-go-update/meta/patch-deps.patch @@ -0,0 +1,26 @@ +diff --git a/go.mod b/go.mod +index 463f022..a7dc400 100644 +--- a/go.mod ++++ b/go.mod +@@ -8,7 +8,7 @@ require ( + git.sr.ht/~emersion/go-oauth2 v0.0.0-20240217160856-2e0d6e20b088 + git.sr.ht/~emersion/gqlclient v0.0.0-20230820050442-8873fe0204b9 + git.sr.ht/~sircmpwn/abused v0.0.0-20240216134550-21e8606c6f89 +- git.sr.ht/~sircmpwn/core-go v0.0.0-20250311090327-1e3cd785af1e ++ git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c + github.com/99designs/gqlgen v0.17.64 + github.com/Masterminds/squirrel v1.5.4 +diff --git a/go.sum b/go.sum +index 9c08b1a..abf1a58 100644 +--- a/go.sum ++++ b/go.sum +@@ -6,6 +6,8 @@ git.sr.ht/~sircmpwn/abused v0.0.0-20240216134550-21e8606c6f89 h1:usW1i77LjfTfNzX + git.sr.ht/~sircmpwn/abused v0.0.0-20240216134550-21e8606c6f89/go.mod h1:A+FTCDOSRA0naGMcM9OenO7kMhBxj+Kbd+4nBpg6NO4= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250311090327-1e3cd785af1e h1:epi/OdTKtazVbHHn1Qunx+nSHt96+xBBiNgs+SgRGwo= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250311090327-1e3cd785af1e/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b h1:UuQxEJrh/NNdmaVcK34opEz7ypXnPyxeRcT7Aigz+7E= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c h1:v2opuaN0C5ZpuCifRNR9ZQ8V9IG+Ja80otK1MFj5RnI= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= + git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= diff --git a/pkgs/applications/version-management/sourcehut/patches/core-go-update/pages/patch-deps.patch b/pkgs/applications/version-management/sourcehut/patches/core-go-update/pages/patch-deps.patch new file mode 100644 index 000000000000..fad46f85377b --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/core-go-update/pages/patch-deps.patch @@ -0,0 +1,25 @@ +diff --git a/go.mod b/go.mod +index 67aa15c..baffe8e 100644 +--- a/go.mod ++++ b/go.mod +@@ -6,7 +6,7 @@ toolchain go1.24.0 + + require ( + git.sr.ht/~adnano/go-gemini v0.2.3 +- git.sr.ht/~sircmpwn/core-go v0.0.0-20250326085317-29a3ebfee9d0 ++ git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c + github.com/99designs/gqlgen v0.17.64 + github.com/CAFxX/httpcompression v0.0.9 +diff --git a/go.sum b/go.sum +index ccd1f94..0945505 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,5 +1,7 @@ + git.sr.ht/~adnano/go-gemini v0.2.3 h1:oJ+Y0/mheZ4Vg0ABjtf5dlmvq1yoONStiaQvmWWkofc= + git.sr.ht/~adnano/go-gemini v0.2.3/go.mod h1:hQ75Y0i5jSFL+FQ7AzWVAYr5LQsaFC7v3ZviNyj46dY= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b h1:UuQxEJrh/NNdmaVcK34opEz7ypXnPyxeRcT7Aigz+7E= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250326085317-29a3ebfee9d0 h1:jFSTrW57GbcDoW850vw95zg0pLS1pe+cD5JtAQJ54ho= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250326085317-29a3ebfee9d0/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c h1:v2opuaN0C5ZpuCifRNR9ZQ8V9IG+Ja80otK1MFj5RnI= diff --git a/pkgs/applications/version-management/sourcehut/patches/core-go-update/paste/patch-deps.patch b/pkgs/applications/version-management/sourcehut/patches/core-go-update/paste/patch-deps.patch new file mode 100644 index 000000000000..f381b0f186d2 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/core-go-update/paste/patch-deps.patch @@ -0,0 +1,25 @@ +diff --git a/go.mod b/go.mod +index bc39fc4..bd01e53 100644 +--- a/go.mod ++++ b/go.mod +@@ -5,7 +5,7 @@ go 1.22.5 + toolchain go1.24.0 + + require ( +- git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b ++ git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c + github.com/99designs/gqlgen v0.17.64 + github.com/Masterminds/squirrel v1.5.4 +diff --git a/go.sum b/go.sum +index 61766aa..e01c045 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,5 +1,7 @@ + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b h1:d76irAQODAtl5G1zmKfwf60544fyGz74YT9k+7yYVxc= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250304085405-cbf919e45b5b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b h1:UuQxEJrh/NNdmaVcK34opEz7ypXnPyxeRcT7Aigz+7E= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c h1:v2opuaN0C5ZpuCifRNR9ZQ8V9IG+Ja80otK1MFj5RnI= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= + git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= diff --git a/pkgs/applications/version-management/sourcehut/patches/core-go-update/todo/patch-deps.patch b/pkgs/applications/version-management/sourcehut/patches/core-go-update/todo/patch-deps.patch new file mode 100644 index 000000000000..b54e77147ed8 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/core-go-update/todo/patch-deps.patch @@ -0,0 +1,25 @@ +diff --git a/go.mod b/go.mod +index a352cfd..ab4beae 100644 +--- a/go.mod ++++ b/go.mod +@@ -5,7 +5,7 @@ go 1.22.5 + toolchain go1.24.0 + + require ( +- git.sr.ht/~sircmpwn/core-go v0.0.0-20250306104433-8e729e7539f4 ++ git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c + github.com/99designs/gqlgen v0.17.64 + github.com/Masterminds/squirrel v1.5.4 +diff --git a/go.sum b/go.sum +index 5342a85..50c87f1 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,5 +1,7 @@ + git.sr.ht/~sircmpwn/core-go v0.0.0-20250306104433-8e729e7539f4 h1:LvEcAyN0YDwqsa7QkFXne0bQEWAod6jAI2VIc+kk5sk= + git.sr.ht/~sircmpwn/core-go v0.0.0-20250306104433-8e729e7539f4/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b h1:UuQxEJrh/NNdmaVcK34opEz7ypXnPyxeRcT7Aigz+7E= ++git.sr.ht/~sircmpwn/core-go v0.0.0-20250311210855-6ba248d8be1b/go.mod h1:UHi3kXwgfZ/DIbMu5LeqZb3KrY/jsdUDefc8+3YWC3c= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c h1:v2opuaN0C5ZpuCifRNR9ZQ8V9IG+Ja80otK1MFj5RnI= + git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= + git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch index 889331f3e07f..fb2c32033128 100644 --- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch +++ b/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch @@ -23,16 +23,17 @@ diff --git a/srht/metrics.py b/srht/metrics.py index 68caf8e..2df5777 100644 --- a/srht/metrics.py +++ b/srht/metrics.py -@@ -1,11 +1,12 @@ +@@ -1,12 +1,12 @@ import time +from celery import Celery from prometheus_client.metrics_core import GaugeMetricFamily - from redis import Redis, ResponseError + from redis import ResponseError +-from srht.redis import from_url class RedisQueueCollector: def __init__(self, broker, name, documentation, queue_name="celery"): -- self.redis = Redis.from_url(broker) +- self.redis = from_url(broker) + self.redis = Celery("collector", broker=broker).connection_for_read().channel().client self.queue_name = queue_name self.name = name diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index cdccbe1a56e6..0a9bf574620f 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -6,12 +6,12 @@ pyyaml, buildsrht, pythonOlder, - setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "scmsrht"; - version = "0.22.24"; + version = "0.22.28"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,11 +20,11 @@ buildPythonPackage rec { owner = "~sircmpwn"; repo = "scm.sr.ht"; rev = version; - hash = "sha256-9IgMmYzInfrten7z8bznlSFJlUjHf3k3z76lkP6tP50="; + hash = "sha256-+zxqiz5yPpgTwAw7w8GqJFb3OCcJEH/UhS5u2Xs7pzo="; }; nativeBuildInputs = [ - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -33,9 +33,7 @@ buildPythonPackage rec { buildsrht ]; - preBuild = '' - export PKGVER=${version} - ''; + env.PKGVER = version; pythonImportsCheck = [ "scmsrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index de43d829fb4e..3d9374185563 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -10,47 +10,44 @@ python, unzip, pythonOlder, - setuptools, + setuptools-scm, }: let - version = "0.75.10"; + version = "0.77.5"; gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; - gqlgenVersion = "0.17.45"; + gqlgenVersion = "0.17.64"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "todo.sr.ht"; rev = version; - hash = "sha256-3dVZdupsygM7/6T1Mn7yRc776aa9pKgwF0hgZX6uVQ0="; + hash = "sha256-P+ypiW3GHoMClBmW5lUNAG6/sydHHnFGyGajmC3WARg="; }; + patches = [ ./patches/core-go-update/todo/patch-deps.patch ]; + todosrht-api = buildGoModule ( { - inherit src version; + inherit src version patches; pname = "todosrht-api"; modRoot = "api"; - vendorHash = "sha256-fImOQLnQLHTrg5ikuYRZ+u+78exAiYA19DGQoUjQBOM="; + vendorHash = "sha256-ny6cyUIgmupeU8SFP8+RSQU7DD3Lk+j+mZQBoXKv63I="; } // gqlgen ); in buildPythonPackage rec { - inherit src version; + inherit src version patches; pname = "todosrht"; pyproject = true; disabled = pythonOlder "3.7"; - postPatch = '' - substituteInPlace Makefile \ - --replace "all: api" "" - ''; - nativeBuildInputs = [ - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -58,13 +55,20 @@ buildPythonPackage rec { alembic ]; - preBuild = '' - export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht + env = { + PKGVER = version; + SRHT_PATH = "${srht}/${python.sitePackages}/srht"; + PREFIX = placeholder "out"; + }; + + postBuild = '' + make SASSC_INCLUDE=-I${srht}/share/sourcehut/scss/ all-share ''; postInstall = '' - ln -s ${todosrht-api}/bin/api $out/bin/todosrht-api + ln -s ${todosrht-api}/bin/api $out/bin/todo.sr.ht-api + install -Dm644 schema.sql $out/share/sourcehut/todo.sr.ht-schema.sql + make install-share ''; # pytest tests fail diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 353f567172b4..5513f8bfd0f5 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -16,8 +16,6 @@ openssl, lz4, utf8proc, - CoreServices, - Security, autoconf, libtool, apacheHttpd ? null, diff --git a/pkgs/applications/version-management/svn-all-fast-export/default.nix b/pkgs/applications/version-management/svn-all-fast-export/default.nix index 6b2628f3a4f1..f40d7a3b4d1a 100644 --- a/pkgs/applications/version-management/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/svn-all-fast-export/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.0.18"; + version = "1.0.20"; in stdenv.mkDerivation { pname = "svn-all-fast-export"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { owner = "svn-all-fast-export"; repo = "svn2git"; rev = version; - sha256 = "1b5yx2316hbyvw3v30vn1ljma9yd21nd59wis1gi34g92lgvqcd6"; + sha256 = "sha256-ALZ9wGEM2woELUdCxG1SSzIhOCHERsnrSnCVN2MH9Lo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index c1a1114fe3df..7b53783e3058 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "2.2.25"; + version = "2.2.27"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - hash = "sha256-9jlGENJVgzQi5oEspM6JHIgYt9np8WNKPJzoW2kSgQs="; + hash = "sha256-wu4kJCs1Bo6yVGLJuzXSCtv2nXhzlwX6jDTa0gTwPsw="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix deleted file mode 100644 index 77bf7cfb8517..000000000000 --- a/pkgs/applications/video/go2tv/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - stdenv, - buildGoModule, - fetchFromGitHub, - Carbon, - Cocoa, - Kernel, - UserNotifications, - xorg, - libglvnd, - pkg-config, - withGui ? true, -}: - -buildGoModule rec { - pname = "go2tv" + lib.optionalString (!withGui) "-lite"; - version = "1.18.1"; - - src = fetchFromGitHub { - owner = "alexballas"; - repo = "go2tv"; - tag = "v${version}"; - hash = "sha256-Ic4Kcc5Vx1QXFt28o5ItGwcvsKCB2HdZvILPRoEKbgI="; - }; - - vendorHash = "sha256-xp/zdkNV4z3rQMV0b/7TD+ApiaDWxR/aqOKvakGKAcI="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = - [ - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXinerama - xorg.libXi - xorg.libXext - xorg.libXxf86vm - libglvnd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - Kernel - UserNotifications - ]; - - ldflags = [ - "-s" - "-w" - "-linkmode=external" - ]; - - # conditionally build with GUI or not (go2tv or go2tv-lite sub-packages) - subPackages = [ "cmd/${pname}" ]; - - doCheck = false; - - meta = with lib; { - description = "Cast media files to UPnP/DLNA Media Renderers and Smart TVs"; - homepage = "https://github.com/alexballas/go2tv"; - changelog = "https://github.com/alexballas/go2tv/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ gdamjan ]; - mainProgram = pname; - }; -} diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 94c4b9342fcd..4d4fbee44a14 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "haruna"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-EoB8qoCiB6jvHqfhkGHhiq9/79MBLt6GguvRIwY90B0="; + hash = "sha256-7983qZ7c3i8Ilyvu36t02zeIcVO96PXGNLH3wq6JsvI="; domain = "invent.kde.org"; }; diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index cf660186976d..ebcdc89f4f1e 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -3,10 +3,6 @@ fetchFromGitHub, mkDerivation, stdenv, - Cocoa, - CoreAudio, - CoreFoundation, - MediaPlayer, SDL2, cmake, libGL, @@ -59,12 +55,6 @@ mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - CoreAudio - CoreFoundation - MediaPlayer ]; nativeBuildInputs = [ diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index d9965291c2ff..5fe8e8be2f25 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -19,11 +19,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.8.0"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - hash = "sha256-EANaNmvD8hcdGB2aoGemKvA9syS1VvIqGsP1jk0b+lE="; + hash = "sha256-YrwMvP66LAWKgx/yWBkWIkZtJ4a0YnhCiL7xB6fGm0E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix b/pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix index a9936818c4ff..6e27e41a45a7 100644 --- a/pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix +++ b/pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix @@ -27,6 +27,6 @@ buildKodiAddon rec { homepage = "https://a4k-openproject.github.io/a4kSubtitles/"; description = "Multi-Source Subtitles Addon"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/archive_tool/default.nix b/pkgs/applications/video/kodi/addons/archive_tool/default.nix index 0b90ee1cd5a3..4420d332bb5f 100644 --- a/pkgs/applications/video/kodi/addons/archive_tool/default.nix +++ b/pkgs/applications/video/kodi/addons/archive_tool/default.nix @@ -28,6 +28,6 @@ buildKodiAddon rec { homepage = "https://github.com/zach-morris/script.module.archive_tool"; description = "Set of common python functions to work with the Kodi archive virtual file system (vfs) binary addons"; license = licenses.gpl3Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/arrow/default.nix b/pkgs/applications/video/kodi/addons/arrow/default.nix index 16c736aab009..4f916c4a4036 100644 --- a/pkgs/applications/video/kodi/addons/arrow/default.nix +++ b/pkgs/applications/video/kodi/addons/arrow/default.nix @@ -33,6 +33,6 @@ buildKodiAddon rec { homepage = "https://github.com/razzeee/script.module.arrow"; description = "Better dates & times for Python"; license = licenses.asl20; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index 056b5bb6a817..71ee6e21aa48 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -35,6 +35,6 @@ buildKodiAddon rec { homepage = "https://github.com/thomas-ernest/plugin.video.arteplussept"; description = "Watch videos available on Arte+7"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/bluetooth-manager/default.nix b/pkgs/applications/video/kodi/addons/bluetooth-manager/default.nix new file mode 100644 index 000000000000..56aa202a11d0 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/bluetooth-manager/default.nix @@ -0,0 +1,24 @@ +{ + buildKodiAddon, + fetchFromGitHub, + lib, +}: +buildKodiAddon rec { + pname = "bluetooth-manager"; + namespace = "script.bluetooth.man"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "wastis"; + repo = "BluetoothManager"; + tag = "v${version}"; + hash = "sha256-KKaR7rIkflMYU6EDBEcorHQ3t7jsB4Qe6Ikg+eBblkA="; + }; + + meta = with lib; { + description = "Addon that allows to manage bluetooth devices from within a Linux based Kodi"; + platforms = platforms.all; + maintainers = teams.kodi.members; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/video/kodi/addons/certifi/default.nix b/pkgs/applications/video/kodi/addons/certifi/default.nix index b626cb643a10..b42b95a0f525 100644 --- a/pkgs/applications/video/kodi/addons/certifi/default.nix +++ b/pkgs/applications/video/kodi/addons/certifi/default.nix @@ -42,6 +42,6 @@ buildKodiAddon rec { homepage = "https://certifi.io"; description = "Python package for providing Mozilla's CA Bundle"; license = licenses.mpl20; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/chardet/default.nix b/pkgs/applications/video/kodi/addons/chardet/default.nix index 1d02432a3630..d472e4b70578 100644 --- a/pkgs/applications/video/kodi/addons/chardet/default.nix +++ b/pkgs/applications/video/kodi/addons/chardet/default.nix @@ -26,6 +26,6 @@ buildKodiAddon rec { homepage = "https://github.com/Freso/script.module.chardet"; description = "Universal encoding detector"; license = licenses.lgpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index 33ab01e94c6b..a76afe010f3b 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -36,7 +36,7 @@ let homepage = "https://github.com/kodi-game/controller-topology-project"; description = "Models how controllers connect to and map to each other for all gaming history"; license = with licenses; [ odbl ]; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; }; in diff --git a/pkgs/applications/video/kodi/addons/dateutil/default.nix b/pkgs/applications/video/kodi/addons/dateutil/default.nix index 2443c057e850..2ba64ae6ece4 100644 --- a/pkgs/applications/video/kodi/addons/dateutil/default.nix +++ b/pkgs/applications/video/kodi/addons/dateutil/default.nix @@ -35,6 +35,6 @@ buildKodiAddon rec { asl20 bsd3 ]; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/defusedxml/default.nix b/pkgs/applications/video/kodi/addons/defusedxml/default.nix index 2f93e2bbeb0a..4f4109868a95 100644 --- a/pkgs/applications/video/kodi/addons/defusedxml/default.nix +++ b/pkgs/applications/video/kodi/addons/defusedxml/default.nix @@ -27,6 +27,6 @@ buildKodiAddon rec { homepage = "https://github.com/tiran/defusedxml"; description = "defusing XML bombs and other exploits"; license = licenses.psfl; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/formula1/default.nix b/pkgs/applications/video/kodi/addons/formula1/default.nix index ce7733db7f55..8c2ff2e7b429 100644 --- a/pkgs/applications/video/kodi/addons/formula1/default.nix +++ b/pkgs/applications/video/kodi/addons/formula1/default.nix @@ -10,11 +10,11 @@ buildKodiAddon rec { pname = "formula1"; namespace = "plugin.video.formula1"; - version = "2.0.3"; + version = "2.0.4"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-T2q7/bbzarjbqmLQR5g5lBnO0mdrwrWX5/c5GZ48nKM="; + sha256 = "sha256-tyVq/yfnPQ5NAnlYCT8lF/s2voh4NOQPRawXX1+ryTU="; }; propagatedBuildInputs = [ @@ -31,6 +31,6 @@ buildKodiAddon rec { homepage = "https://github.com/jaylinski/kodi-addon-formula1"; description = "Videos from the Formula 1 website"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/future/default.nix b/pkgs/applications/video/kodi/addons/future/default.nix index 346be9f8d7f5..65155d14e5a8 100644 --- a/pkgs/applications/video/kodi/addons/future/default.nix +++ b/pkgs/applications/video/kodi/addons/future/default.nix @@ -27,6 +27,6 @@ buildKodiAddon rec { homepage = "https://python-future.org"; description = "Missing compatibility layer between Python 2 and Python 3"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/iagl/default.nix b/pkgs/applications/video/kodi/addons/iagl/default.nix index ae8ff5dc19aa..b24bfb78ea76 100644 --- a/pkgs/applications/video/kodi/addons/iagl/default.nix +++ b/pkgs/applications/video/kodi/addons/iagl/default.nix @@ -37,6 +37,6 @@ buildKodiAddon rec { homepage = "https://github.com/zach-morris/plugin.program.iagl"; description = "Launch Games from the Internet using Kodi"; license = licenses.gpl3Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/idna/default.nix b/pkgs/applications/video/kodi/addons/idna/default.nix index 9166e50b733d..7a258c2b3867 100644 --- a/pkgs/applications/video/kodi/addons/idna/default.nix +++ b/pkgs/applications/video/kodi/addons/idna/default.nix @@ -26,6 +26,6 @@ buildKodiAddon rec { homepage = "https://github.com/Freso/script.module.idna"; description = "Internationalized Domain Names for Python"; license = licenses.bsd3; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/infotagger/default.nix b/pkgs/applications/video/kodi/addons/infotagger/default.nix index 40b0399ca3b2..4d7384a8c5df 100644 --- a/pkgs/applications/video/kodi/addons/infotagger/default.nix +++ b/pkgs/applications/video/kodi/addons/infotagger/default.nix @@ -28,6 +28,6 @@ buildKodiAddon rec { homepage = "https://github.com/jurialmunkey/script.module.infotagger"; description = "Wrapper for new Nexus InfoTagVideo ListItem methods to maintain backwards compatibility"; license = licenses.gpl3Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 1806e8732199..0be4e6e98eb5 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -23,13 +23,13 @@ in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "21.5.9"; + version = "21.5.13"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; tag = "${version}-${rel}"; - hash = "sha256-OArvp/MgJGsRs3Z59JfgOkfwyhQ3ArC1yf37z7Y7khg="; + hash = "sha256-XcRg0FtoN7SXRVEBWM9gIlLOMGT3x64s9WD12UJdblw="; }; extraCMakeFlags = [ @@ -64,6 +64,6 @@ buildKodiBinaryAddon rec { description = "Kodi inputstream addon for several manifest types"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix b/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix index e48f8e8be209..bbe0c44e7e0f 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix @@ -11,13 +11,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-ffmpegdirect"; namespace = "inputstream.ffmpegdirect"; - version = "21.3.5"; + version = "21.3.7"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.ffmpegdirect"; rev = "${version}-${rel}"; - sha256 = "sha256-pPufkDPHq5EsvC6YTsRX9TjqjIczOL/6Vc5HGDIe9Gk="; + sha256 = "sha256-s1Owbj95DT+RR8eBRwMuUHrJwr6JR05efx5M11vH8cQ="; }; extraBuildInputs = [ @@ -31,6 +31,6 @@ buildKodiBinaryAddon rec { description = "InputStream Client for streams that can be opened by either FFmpeg's libavformat or Kodi's cURL"; platforms = platforms.all; license = licenses.gpl2Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix b/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix index 33e4bcb02626..7ebcbd340ea0 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix @@ -11,13 +11,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-rtmp"; namespace = "inputstream.rtmp"; - version = "21.1.0"; + version = "21.1.2"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.rtmp"; rev = "${version}-${rel}"; - sha256 = "sha256-M6LFokWQRzBZ7inzRsMxyWzkV0XsGHh4d0CPhv1NCfI="; + sha256 = "sha256-AkpRbYOe30dWDcflCGXxJz8Y+9bQw9ZmZF88ra2c+fc="; }; extraBuildInputs = [ @@ -31,6 +31,6 @@ buildKodiBinaryAddon rec { description = "Client for RTMP streams"; platforms = platforms.all; license = licenses.gpl2Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index 72af05fb8e1e..d4fb290b6daa 100644 --- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -34,6 +34,6 @@ buildKodiAddon rec { homepage = "https://github.com/emilsvennesson/script.module.inputstreamhelper"; description = "Simple Kodi module that makes life easier for add-on developers relying on InputStream based add-ons and DRM playback"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix index d6a20068a6df..31d6028d3f4a 100644 --- a/pkgs/applications/video/kodi/addons/invidious/default.nix +++ b/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -38,6 +38,6 @@ buildKodiAddon rec { homepage = "https://github.com/petterreinholdtsen/kodi-invidious-plugin"; description = "Privacy-friendly way of watching YouTube content"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix index 221c450be543..6a0ac9b4ef00 100644 --- a/pkgs/applications/video/kodi/addons/jellycon/default.nix +++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix @@ -62,6 +62,6 @@ buildKodiAddon rec { easily switch between multiple user accounts at will. ''; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 037612982d34..6b6cdbcc1d2e 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -52,6 +52,6 @@ buildKodiAddon rec { homepage = "https://jellyfin.org/"; description = "Whole new way to manage and view your media library"; license = licenses.gpl3Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/joystick/default.nix b/pkgs/applications/video/kodi/addons/joystick/default.nix index 073f7422ee33..b533e34262b3 100644 --- a/pkgs/applications/video/kodi/addons/joystick/default.nix +++ b/pkgs/applications/video/kodi/addons/joystick/default.nix @@ -27,6 +27,6 @@ buildKodiBinaryAddon rec { description = "Binary addon for raw joystick input"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/jurialmunkey/default.nix b/pkgs/applications/video/kodi/addons/jurialmunkey/default.nix new file mode 100644 index 000000000000..537712ebf357 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/jurialmunkey/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildKodiAddon, + fetchFromGitHub, + requests, + infotagger, +}: + +buildKodiAddon rec { + pname = "jurialmunkey"; + namespace = "script.module.jurialmunkey"; + version = "0.2.28"; + + src = fetchFromGitHub { + owner = "jurialmunkey"; + repo = namespace; + rev = "v${version}"; + hash = "sha256-3bT1mFzY28r3tzb5zrLKwLs83uotfKezI020SetJuso="; + }; + + propagatedBuildInputs = [ + requests + infotagger + ]; + + passthru = { + pythonPath = "resources/modules"; + }; + + meta = with lib; { + homepage = "https://github.com/jurialmunkey/script.module.jurialmunkey/tree/main"; + description = "Common code required by TMDbHelper and other related jurialmunkey add-ons"; + license = licenses.gpl3Plus; + teams = [ teams.kodi ]; + }; +} diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix index c5866e993749..5070099be7e8 100644 --- a/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -11,11 +11,11 @@ buildKodiAddon rec { pname = "keymap"; namespace = "script.keymap"; - version = "1.3.0"; + version = "1.3.2"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-931iJv9wsY20pXckvTlEhxGCDFSBHonpGO2c2OYiqrI="; + sha256 = "sha256-y9bREG1fGY6TJYW4xMUBbsAp6DSzb78tY1+iyUrGjgQ="; }; propagatedBuildInputs = [ @@ -33,6 +33,6 @@ buildKodiAddon rec { homepage = "https://github.com/tamland/xbmc-keymap-editor"; description = "GUI for configuring mappings for remotes, keyboard and other inputs supported by Kodi"; license = licenses.gpl3Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/kodi-six/default.nix b/pkgs/applications/video/kodi/addons/kodi-six/default.nix index 96f425257343..e456b5813c27 100644 --- a/pkgs/applications/video/kodi/addons/kodi-six/default.nix +++ b/pkgs/applications/video/kodi/addons/kodi-six/default.nix @@ -27,6 +27,6 @@ buildKodiAddon rec { homepage = "https://github.com/romanvm/kodi.six"; description = "Wrappers around Kodi Python API for seamless Python 2/3 compatibility"; license = licenses.gpl3Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/libretro-2048/default.nix b/pkgs/applications/video/kodi/addons/libretro-2048/default.nix index 866fdc3e6da2..533d316e1b65 100644 --- a/pkgs/applications/video/kodi/addons/libretro-2048/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-2048/default.nix @@ -32,6 +32,7 @@ buildKodiBinaryAddon rec { description = "2048 GameClient for Kodi"; platforms = platforms.all; license = licenses.publicDomain; - maintainers = with maintainers; teams.kodi.members ++ [ kazenyuk ]; + maintainers = with maintainers; [ kazenyuk ]; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/libretro-fuse/default.nix b/pkgs/applications/video/kodi/addons/libretro-fuse/default.nix index 0524dc485304..f80f0f4137a9 100644 --- a/pkgs/applications/video/kodi/addons/libretro-fuse/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-fuse/default.nix @@ -32,6 +32,7 @@ buildKodiBinaryAddon rec { description = "Sinclair - ZX Spectrum (Fuse) GameClient for Kodi"; platforms = platforms.all; license = licenses.gpl3Only; - maintainers = with maintainers; teams.kodi.members ++ [ kazenyuk ]; + maintainers = with maintainers; [ kazenyuk ]; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix b/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix index 8bead49157ad..674814e3974b 100644 --- a/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix @@ -32,6 +32,6 @@ buildKodiBinaryAddon rec { description = "Genesis Plus GX GameClient for Kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/libretro-gw/default.nix b/pkgs/applications/video/kodi/addons/libretro-gw/default.nix index 0ba14aa80a45..4f8b3fad121c 100644 --- a/pkgs/applications/video/kodi/addons/libretro-gw/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-gw/default.nix @@ -33,6 +33,6 @@ buildKodiBinaryAddon rec { description = "Game and Watch for Kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix b/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix index ecca37db0d2a..30e907f175d0 100644 --- a/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix @@ -32,6 +32,6 @@ buildKodiBinaryAddon rec { description = "mGBA for Kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/libretro-nestopia/default.nix b/pkgs/applications/video/kodi/addons/libretro-nestopia/default.nix index 4a299720f0a0..87f28c23655d 100644 --- a/pkgs/applications/video/kodi/addons/libretro-nestopia/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-nestopia/default.nix @@ -33,6 +33,6 @@ buildKodiBinaryAddon rec { description = "Nintendo - NES / Famicom (Nestopia UE) GameClient for Kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix b/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix index 4e614b8bb611..d8a101d7150b 100644 --- a/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix @@ -32,6 +32,6 @@ buildKodiBinaryAddon rec { description = "Snes9X GameClient for Kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/libretro/default.nix b/pkgs/applications/video/kodi/addons/libretro/default.nix index f6ab8b81ed39..da31ed8e199a 100644 --- a/pkgs/applications/video/kodi/addons/libretro/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro/default.nix @@ -25,6 +25,6 @@ buildKodiBinaryAddon rec { description = "Libretro wrapper for Kodi's Game API"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/mediacccde/default.nix b/pkgs/applications/video/kodi/addons/mediacccde/default.nix index b61c2f0f9841..10941fb364ee 100644 --- a/pkgs/applications/video/kodi/addons/mediacccde/default.nix +++ b/pkgs/applications/video/kodi/addons/mediacccde/default.nix @@ -33,6 +33,6 @@ buildKodiAddon rec { homepage = "https://github.com/voc/plugin.video.media-ccc-de/"; description = "media.ccc.de for Kodi"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/mediathekview/default.nix b/pkgs/applications/video/kodi/addons/mediathekview/default.nix index dec6c0736e27..6c9d21b8ec59 100644 --- a/pkgs/applications/video/kodi/addons/mediathekview/default.nix +++ b/pkgs/applications/video/kodi/addons/mediathekview/default.nix @@ -25,6 +25,6 @@ buildKodiAddon rec { homepage = "https://github.com/mediathekview/plugin.video.mediathekview"; description = "Access media libraries of German speaking broadcasting stations"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/myconnpy/default.nix b/pkgs/applications/video/kodi/addons/myconnpy/default.nix index dd2b1dd857e1..097ae346c796 100644 --- a/pkgs/applications/video/kodi/addons/myconnpy/default.nix +++ b/pkgs/applications/video/kodi/addons/myconnpy/default.nix @@ -26,6 +26,6 @@ buildKodiAddon rec { homepage = "http://dev.mysql.com/doc/connector-python/en/index.html"; description = "MySQL Connector/Python"; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index f40dc45da27e..76ec7fd1d242 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -12,13 +12,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.23.3"; + version = "1.23.4"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - hash = "sha256-tve7E7dK60BIHETdwt9hD3/5eEdJB6c6rhw4oDoLAKM="; + hash = "sha256-yq5XNhKQSBh7r/2apHXLMjhovV6xhL9DcDwXn9nt0KQ="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildKodiAddon rec { homepage = "https://github.com/CastagnaIT/plugin.video.netflix"; description = "Netflix VOD Services Add-on"; license = licenses.mit; - maintainers = teams.kodi.members ++ [ maintainers.pks ]; + maintainers = [ maintainers.pks ]; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/orftvthek/default.nix b/pkgs/applications/video/kodi/addons/orftvthek/default.nix index f1e202f7ced0..d8ecf5596b39 100644 --- a/pkgs/applications/video/kodi/addons/orftvthek/default.nix +++ b/pkgs/applications/video/kodi/addons/orftvthek/default.nix @@ -30,6 +30,6 @@ buildKodiAddon rec { homepage = "https://github.com/s0faking/plugin.video.orftvthek"; description = "Addon for accessing the Austrian ORF ON streaming service"; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/pdfreader/default.nix b/pkgs/applications/video/kodi/addons/pdfreader/default.nix index 49783ffef23f..4eea80fe08a9 100644 --- a/pkgs/applications/video/kodi/addons/pdfreader/default.nix +++ b/pkgs/applications/video/kodi/addons/pdfreader/default.nix @@ -21,6 +21,6 @@ buildKodiAddon rec { homepage = "https://forum.kodi.tv/showthread.php?tid=187421"; description = "Comic book reader"; license = licenses.gpl2Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/plugin-cache/default.nix b/pkgs/applications/video/kodi/addons/plugin-cache/default.nix index 62a445df8513..7e21281c3156 100644 --- a/pkgs/applications/video/kodi/addons/plugin-cache/default.nix +++ b/pkgs/applications/video/kodi/addons/plugin-cache/default.nix @@ -27,6 +27,6 @@ buildKodiAddon rec { homepage = "https://github.com/anxdpanic/script.common.plugin.cache"; description = "Common plugin cache"; license = licenses.gpl3Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix index 64cce5cd061a..125c891235c5 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix @@ -9,13 +9,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "21.0.1"; + version = "21.0.2"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "sha256-Hb8TcJxRUIKHbevAUgt5q6z26W3uX9NbVwYyvrLnf7U="; + sha256 = "sha256-wgKMt3ufvOh08nwZTGvDGoJ0U+aUzSWJptCNRiRW4B0="; }; extraBuildInputs = [ @@ -28,6 +28,6 @@ buildKodiBinaryAddon rec { description = "Kodi's HDHomeRun PVR client addon"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix index 1fa72a866df6..e7abb4e76abf 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix @@ -7,13 +7,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "21.2.5"; + version = "21.2.6"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "sha256-BG5mGD674gvjUSdydu4g3F/4GH53gkJoKMDuvaFNi6k="; + sha256 = "sha256-opxNgin+Sz/Nb9IGZ+OFrCzbDc4FXl2LaNKUu5LAgFM="; }; meta = with lib; { @@ -21,6 +21,6 @@ buildKodiBinaryAddon rec { description = "Kodi's Tvheadend HTSP client addon"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index 473b517456c1..e41a4b32d48f 100644 --- a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix @@ -14,13 +14,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "21.8.5"; + version = "21.10.2"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-UFEZZr7Z6GqnN8ZSA+JkdsiAlf7p5xPwDOcwLzJc9v8="; + sha256 = "sha256-bw0rAEn8R44n5Nzc9ni6IGaG/Bxry6GSyWcT6BdgLz8="; }; extraBuildInputs = [ @@ -39,6 +39,6 @@ buildKodiBinaryAddon rec { description = "Kodi's IPTV Simple client addon"; platforms = platforms.all; license = licenses.gpl2Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix b/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix index 91a8095de7bc..a345f5255a26 100644 --- a/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix @@ -8,13 +8,13 @@ buildKodiBinaryAddon rec { pname = "pvr-vdr-vnsi"; namespace = "pvr.vdr.vnsi"; - version = "21.1.2"; + version = "21.1.3"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.vdr.vnsi"; rev = "${version}-${rel}"; - sha256 = "sha256-o7WVO/TvSK6bZEnUeNQhapXOVQbDlpJDObC93/9XpJo="; + sha256 = "sha256-V/ICEK006Zs4mipywAbRl8ZdezsprCgdC2WYtc/cAAY="; }; extraBuildInputs = [ libGL ]; @@ -24,6 +24,6 @@ buildKodiBinaryAddon rec { description = "Kodi's VDR VNSI PVR client addon"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/radioparadise/default.nix b/pkgs/applications/video/kodi/addons/radioparadise/default.nix index 09feb45561b4..0f6bd31a094a 100644 --- a/pkgs/applications/video/kodi/addons/radioparadise/default.nix +++ b/pkgs/applications/video/kodi/addons/radioparadise/default.nix @@ -32,6 +32,6 @@ buildKodiAddon rec { homepage = "https://github.com/alxndr42/script.radioparadise"; description = "Radio Paradise addon for Kodi"; license = licenses.gpl3Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/raiplay/default.nix b/pkgs/applications/video/kodi/addons/raiplay/default.nix index 084bc4e596e3..e28563254a87 100644 --- a/pkgs/applications/video/kodi/addons/raiplay/default.nix +++ b/pkgs/applications/video/kodi/addons/raiplay/default.nix @@ -33,6 +33,6 @@ buildKodiAddon rec { homepage = "https://github.com/maxbambi/plugin.video.raitv/"; description = "Live radio and TV channels, latest 7 days of programming, broadcast archive, news"; license = licenses.gpl3Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/requests-cache/default.nix b/pkgs/applications/video/kodi/addons/requests-cache/default.nix index b809576e9ffc..465d2cbd53a9 100644 --- a/pkgs/applications/video/kodi/addons/requests-cache/default.nix +++ b/pkgs/applications/video/kodi/addons/requests-cache/default.nix @@ -31,6 +31,6 @@ buildKodiAddon rec { homepage = "https://github.com/reclosedev/requests-cache"; description = "Persistent cache for requests library"; license = licenses.bsd2; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/requests/default.nix b/pkgs/applications/video/kodi/addons/requests/default.nix index 258e1791a348..ca9ad2c75cd5 100644 --- a/pkgs/applications/video/kodi/addons/requests/default.nix +++ b/pkgs/applications/video/kodi/addons/requests/default.nix @@ -37,6 +37,6 @@ buildKodiAddon rec { homepage = "http://python-requests.org"; description = "Python HTTP for Humans"; license = licenses.asl20; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/robotocjksc/default.nix b/pkgs/applications/video/kodi/addons/robotocjksc/default.nix new file mode 100644 index 000000000000..47b7e0ab2250 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/robotocjksc/default.nix @@ -0,0 +1,25 @@ +{ + lib, + buildKodiAddon, + fetchFromGitHub, +}: + +buildKodiAddon rec { + pname = "robotocjksc"; + namespace = "resource.font.robotocjksc"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "jurialmunkey"; + repo = namespace; + rev = "v${version}"; + hash = "sha256-s/h/KKlGYGMvf7RdI9ONk4S+NCzlaDX5w3CdNfbC2KE="; + }; + + meta = with lib; { + homepage = "https://github.com/jurialmunkey/resource.font.robotocjksc"; + description = "Roboto CJKSC fonts"; + license = licenses.asl20; + teams = [ teams.kodi ]; + }; +} diff --git a/pkgs/applications/video/kodi/addons/routing/default.nix b/pkgs/applications/video/kodi/addons/routing/default.nix index 08131bf4f891..d0cb93791eaa 100644 --- a/pkgs/applications/video/kodi/addons/routing/default.nix +++ b/pkgs/applications/video/kodi/addons/routing/default.nix @@ -26,6 +26,6 @@ buildKodiAddon rec { homepage = "https://github.com/tamland/kodi-plugin-routing"; description = "Routing module for kodi plugins"; license = licenses.gpl3Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix index dba58914feb1..6db0cb685c9c 100644 --- a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix +++ b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix @@ -44,6 +44,7 @@ buildKodiAddon rec { homepage = "https://github.com/firsttris/plugin.video.sendtokodi"; description = "Plays various stream sites on Kodi using yt-dlp"; license = licenses.mit; - maintainers = teams.kodi.members ++ [ maintainers.pks ]; + maintainers = [ maintainers.pks ]; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/signals/default.nix b/pkgs/applications/video/kodi/addons/signals/default.nix index 8016c67366fe..eab35bc94ca8 100644 --- a/pkgs/applications/video/kodi/addons/signals/default.nix +++ b/pkgs/applications/video/kodi/addons/signals/default.nix @@ -26,6 +26,6 @@ buildKodiAddon rec { homepage = "https://github.com/ruuk/script.module.addon.signals"; description = "Provides signal/slot mechanism for inter-addon communication"; license = licenses.lgpl21Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/simplecache/default.nix b/pkgs/applications/video/kodi/addons/simplecache/default.nix index 05f5da9f9848..4e97c9b42d37 100644 --- a/pkgs/applications/video/kodi/addons/simplecache/default.nix +++ b/pkgs/applications/video/kodi/addons/simplecache/default.nix @@ -27,6 +27,6 @@ buildKodiAddon rec { homepage = "https://github.com/kodi-community-addons/script.module.simplecache"; description = "A simple object cache for Kodi addons"; license = licenses.asl20; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/simplejson/default.nix b/pkgs/applications/video/kodi/addons/simplejson/default.nix index e54716d41257..f9bf7cd6cae8 100644 --- a/pkgs/applications/video/kodi/addons/simplejson/default.nix +++ b/pkgs/applications/video/kodi/addons/simplejson/default.nix @@ -27,6 +27,6 @@ buildKodiAddon rec { homepage = "https://github.com/simplejson/simplejson"; description = "Simple, fast, extensible JSON encoder/decoder for Python"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/six/default.nix b/pkgs/applications/video/kodi/addons/six/default.nix index 0f07ec3cae79..3a7a7ee500a7 100644 --- a/pkgs/applications/video/kodi/addons/six/default.nix +++ b/pkgs/applications/video/kodi/addons/six/default.nix @@ -24,6 +24,6 @@ buildKodiAddon rec { homepage = "https://pypi.org/project/six/"; description = "Python 2 and 3 compatibility utilities"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/skyvideoitalia/default.nix b/pkgs/applications/video/kodi/addons/skyvideoitalia/default.nix index f2cad94df53b..07aafa148c96 100644 --- a/pkgs/applications/video/kodi/addons/skyvideoitalia/default.nix +++ b/pkgs/applications/video/kodi/addons/skyvideoitalia/default.nix @@ -35,6 +35,6 @@ buildKodiAddon rec { homepage = "https://www.github.com/nixxo/plugin.video.skyvideoitalia"; description = "Show video content from the website of Sky Italia (video.sky.it). News, sport, entertainment and much more"; license = licenses.gpl3Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/somafm/default.nix b/pkgs/applications/video/kodi/addons/somafm/default.nix index 88a0a205eb37..a750daba98cf 100644 --- a/pkgs/applications/video/kodi/addons/somafm/default.nix +++ b/pkgs/applications/video/kodi/addons/somafm/default.nix @@ -27,6 +27,6 @@ buildKodiAddon rec { homepage = "https://github.com/Soma-FM-Kodi-Add-On/plugin.audio.somafm"; description = "SomaFM addon for Kodi"; license = licenses.gpl3Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/sponsorblock/default.nix b/pkgs/applications/video/kodi/addons/sponsorblock/default.nix index fb9e9cdd6e6f..1ec94912c27b 100644 --- a/pkgs/applications/video/kodi/addons/sponsorblock/default.nix +++ b/pkgs/applications/video/kodi/addons/sponsorblock/default.nix @@ -30,6 +30,6 @@ buildKodiAddon rec { homepage = "https://github.com/siku2/script.service.sponsorblock"; description = "Port of SponsorBlock for Invidious and YouTube Plugin"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/steam-controller/default.nix b/pkgs/applications/video/kodi/addons/steam-controller/default.nix index 7d1c94fbc843..212552ab4b18 100644 --- a/pkgs/applications/video/kodi/addons/steam-controller/default.nix +++ b/pkgs/applications/video/kodi/addons/steam-controller/default.nix @@ -21,6 +21,6 @@ buildKodiBinaryAddon rec { meta = with lib; { description = "Binary addon for steam controller"; platforms = platforms.all; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/steam-launcher/default.nix b/pkgs/applications/video/kodi/addons/steam-launcher/default.nix index 678e2757d6fa..d5e3bd6a5e40 100644 --- a/pkgs/applications/video/kodi/addons/steam-launcher/default.nix +++ b/pkgs/applications/video/kodi/addons/steam-launcher/default.nix @@ -45,6 +45,6 @@ buildKodiAddon { configured via the addon. ''; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/steam-library/default.nix b/pkgs/applications/video/kodi/addons/steam-library/default.nix index e4434813c37c..397d3452ae56 100644 --- a/pkgs/applications/video/kodi/addons/steam-library/default.nix +++ b/pkgs/applications/video/kodi/addons/steam-library/default.nix @@ -29,6 +29,6 @@ buildKodiAddon rec { homepage = "https://github.com/aanderse/plugin.program.steam.library"; description = "View your entire Steam library right from Kodi"; license = licenses.gpl3Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/svtplay/default.nix b/pkgs/applications/video/kodi/addons/svtplay/default.nix index c301234682a4..2c6e75fe86de 100644 --- a/pkgs/applications/video/kodi/addons/svtplay/default.nix +++ b/pkgs/applications/video/kodi/addons/svtplay/default.nix @@ -26,7 +26,7 @@ buildKodiAddon rec { ''; platforms = platforms.all; license = licenses.gpl3Plus; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; broken = true; # no release for kodi 21 }; diff --git a/pkgs/applications/video/kodi/addons/texturemaker/default.nix b/pkgs/applications/video/kodi/addons/texturemaker/default.nix new file mode 100644 index 000000000000..51f6f909823d --- /dev/null +++ b/pkgs/applications/video/kodi/addons/texturemaker/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildKodiAddon, + fetchFromGitHub, + jurialmunkey, +}: + +buildKodiAddon rec { + pname = "texturemaker"; + namespace = "script.texturemaker"; + version = "0.2.10"; + + src = fetchFromGitHub { + owner = "jurialmunkey"; + repo = namespace; + rev = "v${version}"; + hash = "sha256-GtUDNc0qatGzgSqQdDJgZnrhI1f+SPyoG9Og+oRFxRM="; + }; + + propagatedBuildInputs = [ + jurialmunkey + ]; + + meta = with lib; { + homepage = "https://github.com/jurialmunkey/script.texturemaker/tree/main"; + description = "Texture Maker helps skinners build gradient based textures"; + license = licenses.gpl3Plus; + teams = [ teams.kodi ]; + }; +} diff --git a/pkgs/applications/video/kodi/addons/trakt-module/default.nix b/pkgs/applications/video/kodi/addons/trakt-module/default.nix index 45456d182d18..6232965179e6 100644 --- a/pkgs/applications/video/kodi/addons/trakt-module/default.nix +++ b/pkgs/applications/video/kodi/addons/trakt-module/default.nix @@ -35,6 +35,6 @@ buildKodiAddon rec { homepage = "https://github.com/Razzeee/script.module.trakt"; description = "Python trakt.py library packed for Kodi"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/trakt/default.nix b/pkgs/applications/video/kodi/addons/trakt/default.nix index 11ac06c60d56..df8f2224697d 100644 --- a/pkgs/applications/video/kodi/addons/trakt/default.nix +++ b/pkgs/applications/video/kodi/addons/trakt/default.nix @@ -33,6 +33,6 @@ buildKodiAddon rec { homepage = "https://kodi.wiki/view/Add-on:Trakt"; description = "Trakt.tv movie and TV show scrobbler for Kodi"; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/typing_extensions/default.nix b/pkgs/applications/video/kodi/addons/typing_extensions/default.nix index af7f94a82aec..51e48fb33b77 100644 --- a/pkgs/applications/video/kodi/addons/typing_extensions/default.nix +++ b/pkgs/applications/video/kodi/addons/typing_extensions/default.nix @@ -26,6 +26,6 @@ buildKodiAddon rec { homepage = "https://github.com/python/typing/tree/master/typing_extensions"; description = "Python typing extensions"; license = licenses.psfl; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/upnext/default.nix b/pkgs/applications/video/kodi/addons/upnext/default.nix index 051cd4788f1e..591769343a82 100644 --- a/pkgs/applications/video/kodi/addons/upnext/default.nix +++ b/pkgs/applications/video/kodi/addons/upnext/default.nix @@ -27,6 +27,6 @@ buildKodiAddon rec { homepage = "https://github.com/im85288/service.upnext"; description = "Up Next - Proposes to play the next episode automatically"; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index ba97017e8ffd..f3aa3ac30c53 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -27,6 +27,6 @@ buildKodiAddon rec { homepage = "https://urllib3.readthedocs.io/en/latest/"; description = "HTTP library with thread-safe connection pooling, file post, and more"; license = licenses.mit; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix b/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix index 752908d159ca..5d3b338605e2 100644 --- a/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix +++ b/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix @@ -37,6 +37,6 @@ buildKodiBinaryAddon rec { description = "LibArchive Virtual Filesystem add-on for Kodi"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/vfs-rar/default.nix b/pkgs/applications/video/kodi/addons/vfs-rar/default.nix index 298abe38e57f..28a0a0287708 100644 --- a/pkgs/applications/video/kodi/addons/vfs-rar/default.nix +++ b/pkgs/applications/video/kodi/addons/vfs-rar/default.nix @@ -23,6 +23,6 @@ buildKodiBinaryAddon rec { description = "RAR archive Virtual Filesystem add-on for Kodi"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix b/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix index 5314cf606c43..6c544f21fc91 100644 --- a/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix +++ b/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix @@ -29,6 +29,6 @@ buildKodiBinaryAddon rec { description = "SFTP Virtual Filesystem add-on for Kodi"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix b/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix index 96ad51a136b3..dfd79938f53c 100644 --- a/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-fishbmc/default.nix @@ -31,6 +31,6 @@ buildKodiBinaryAddon rec { description = "FishBMC visualization for kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/visualization-goom/default.nix b/pkgs/applications/video/kodi/addons/visualization-goom/default.nix index bfc80fbf2b38..c50458c11ee1 100644 --- a/pkgs/applications/video/kodi/addons/visualization-goom/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-goom/default.nix @@ -31,6 +31,6 @@ buildKodiBinaryAddon rec { description = "Goom visualization for kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/visualization-matrix/default.nix b/pkgs/applications/video/kodi/addons/visualization-matrix/default.nix index 2839edcec799..570952bc1747 100644 --- a/pkgs/applications/video/kodi/addons/visualization-matrix/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-matrix/default.nix @@ -31,6 +31,6 @@ buildKodiBinaryAddon rec { description = "Matrix visualization for kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix b/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix index f91cab16bf06..e6d7a8130cf8 100644 --- a/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-pictureit/default.nix @@ -31,6 +31,6 @@ buildKodiBinaryAddon rec { description = "PictureIt visualization for kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix index b8355efc60a9..7c207dd4e33e 100644 --- a/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix @@ -33,6 +33,6 @@ buildKodiBinaryAddon rec { description = "Projectm visualization for kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/visualization-shadertoy/default.nix b/pkgs/applications/video/kodi/addons/visualization-shadertoy/default.nix index 77a871c967ad..6f1da4d23af8 100644 --- a/pkgs/applications/video/kodi/addons/visualization-shadertoy/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-shadertoy/default.nix @@ -33,6 +33,6 @@ buildKodiBinaryAddon rec { description = "Shadertoy visualization for kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/visualization-spectrum/default.nix b/pkgs/applications/video/kodi/addons/visualization-spectrum/default.nix index 6afbca9ca4a9..7de865a02704 100644 --- a/pkgs/applications/video/kodi/addons/visualization-spectrum/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-spectrum/default.nix @@ -31,6 +31,6 @@ buildKodiBinaryAddon rec { description = "Spectrum visualization for kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/visualization-starburst/default.nix b/pkgs/applications/video/kodi/addons/visualization-starburst/default.nix index 027f16f8e424..ddc2acd6b0c2 100644 --- a/pkgs/applications/video/kodi/addons/visualization-starburst/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-starburst/default.nix @@ -31,6 +31,6 @@ buildKodiBinaryAddon rec { description = "Starburst visualization for kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix index 6b8416a45d6d..22fa4fb23aaa 100644 --- a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix @@ -31,6 +31,6 @@ buildKodiBinaryAddon rec { description = "Waveform visualization for kodi"; platforms = platforms.all; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/websocket/default.nix b/pkgs/applications/video/kodi/addons/websocket/default.nix index d8a4cd381a21..b80060f77c15 100644 --- a/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -32,6 +32,6 @@ buildKodiAddon rec { homepage = "https://github.com/websocket-client/websocket-client"; description = "WebSocket client for Python"; license = licenses.lgpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix b/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix index bb9e68130c7a..f647d5a98632 100644 --- a/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix +++ b/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix @@ -24,6 +24,6 @@ buildKodiAddon rec { homepage = "https://github.com/XBMC-Addons/script.module.xbmcswift2"; description = "Framework to ease development of Kodi addons"; license = licenses.gpl3Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index fb4e6ebd7304..4178d02a7289 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -10,13 +10,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.1.1.6"; + version = "7.2.0.1"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-fcr7FDTaStr9EaEaC3QG3uJQav0YuEITa62Y1kW1vlM="; + hash = "sha256-6CT/35jV1cmXPlJBKb7Sm8Hkurmybx163864vP20Ijw="; }; propagatedBuildInputs = [ @@ -33,6 +33,6 @@ buildKodiAddon rec { homepage = "https://github.com/anxdpanic/plugin.video.youtube"; description = "YouTube is one of the biggest video-sharing websites of the world"; license = licenses.gpl2Only; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; }; } diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 9d19c210b873..4012b94eb450 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -473,7 +473,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://kodi.tv/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = teams.kodi.members; + teams = [ teams.kodi ]; mainProgram = "kodi"; }; }) diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix deleted file mode 100644 index 0147a07b45ec..000000000000 --- a/pkgs/applications/video/mapmap/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - qttools, - qtmultimedia, - liblo, - gst_all_1, - qmake, - pkg-config, - wrapQtAppsHook, -}: - -with stdenv; - -mkDerivation rec { - - version = "0.6.2"; - pname = "mapmap"; - - src = fetchFromGitHub { - owner = "mapmapteam"; - repo = "mapmap"; - rev = version; - sha256 = "1pyb3vz19lbfz2hrfqm9a29vnajw1bigdrblbmcy32imkf4isfvm"; - }; - - nativeBuildInputs = [ - qmake - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - qttools - qtmultimedia - liblo - gst_all_1.gstreamer - gst_all_1.gstreamermm - gst_all_1.gst-libav - gst_all_1.gst-vaapi - ]; - - patches = [ - (fetchpatch { - name = "message-handler-segfault.patch"; - url = "https://github.com/mapmapteam/mapmap/pull/519/commits/22eeee59ba7de6de7b73ecec3b0ea93bdc7f04e8.patch"; - sha256 = "0is905a4lf9vvl5b1n4ky6shrnbs5kz9mlwfk78hrl4zabfmcl5l"; - }) - # fix build with libsForQt515 - (fetchpatch { - url = "https://github.com/mapmapteam/mapmap/pull/518/commits/ac49acc1e2ec839832b86838e93a8c13030affeb.patch"; - sha256 = "sha256-tSLbyIDv5mSejnw9oru5KLAyQqjgJLLREKQomEUcGt8="; - }) - ]; - - installPhase = '' - mkdir -p $out/bin - cp mapmap $out/bin/mapmap - mkdir -p $out/share/applications/ - sed 's|Icon=/usr/share/icons/hicolor/scalable/apps/mapmap.svg|Icon=mapmap|g' resources/texts/mapmap.desktop > $out/share/applications/mapmap.desktop - mkdir -p $out/share/icons/hicolor/scalable/apps/ - cp resources/images/logo/mapmap.* $out/share/icons/hicolor/scalable/apps/ - ''; - - # RPATH in /tmp hack - # preFixup = '' - # rm -r $NIX_BUILD_TOP/__nix_qt5__ - # ''; - - meta = with lib; { - description = "Open source video mapping software"; - homepage = "https://github.com/mapmapteam/mapmap"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux; - mainProgram = "mapmap"; - }; - -} diff --git a/pkgs/applications/video/memento/default.nix b/pkgs/applications/video/memento/default.nix index 84966b843ada..f846057c2a20 100644 --- a/pkgs/applications/video/memento/default.nix +++ b/pkgs/applications/video/memento/default.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "memento"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ripose-jp"; repo = "Memento"; rev = "v${finalAttrs.version}"; - hash = "sha256-8kgMEHDLb2EtwmIOs6WQO3a1QSypwN1FX/f2n7uRBFs="; + hash = "sha256-IvzvlToSyA20FWU0x+wgE3rT0dYbuY6xyaGgz1D1f6Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mlv-app/aarch64-flags.patch b/pkgs/applications/video/mlv-app/aarch64-flags.patch deleted file mode 100644 index 4d26bfdd39d0..000000000000 --- a/pkgs/applications/video/mlv-app/aarch64-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro -index ebdc552..3e37573 100644 ---- a/platform/qt/MLVApp.pro -+++ b/platform/qt/MLVApp.pro -@@ -120,7 +120,7 @@ win32{ - - # Linux - linux-g++*{ -- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -ftree-vectorize -+ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 -ftree-vectorize - QMAKE_CXXFLAGS += -fopenmp -std=c++11 -ftree-vectorize - LIBS += -lgomp - } diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix deleted file mode 100644 index d008e08f3d2b..000000000000 --- a/pkgs/applications/video/mlv-app/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - fetchFromGitHub, - lib, - mkDerivation, - qmake, - qtbase, - qtmultimedia, - stdenv, -}: - -mkDerivation rec { - pname = "mlv-app"; - version = "1.14"; - - src = fetchFromGitHub { - owner = "ilia3101"; - repo = "MLV-App"; - rev = "QTv${version}"; - sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU="; - }; - - patches = lib.optionals stdenv.hostPlatform.isAarch64 [ - # remove optimization flags with x86 only instruction sets - ./aarch64-flags.patch - ]; - - installPhase = '' - runHook preInstall - install -Dm555 -t $out/bin mlvapp - install -Dm444 -t $out/share/applications mlvapp.desktop - install -Dm444 -t $out/share/icons/hicolor/512x512/apps RetinaIMG/MLVAPP.png - runHook postInstall - ''; - - qmakeFlags = [ "MLVApp.pro" ]; - - preConfigure = '' - export HOME=$TMPDIR - cd platform/qt/ - ''; - - buildInputs = [ - qtmultimedia - qtbase - ]; - - dontWrapQtApps = true; - - preFixup = '' - wrapQtApp "$out/bin/mlvapp" - ''; - - nativeBuildInputs = [ - qmake - ]; - - meta = with lib; { - description = "All in one MLV processing app that is pretty great"; - homepage = "https://mlv.app"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux; - mainProgram = "mlvapp"; - }; -} diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index e156fee4a1ff..e880ffb89266 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -65,7 +65,6 @@ libjpegSupport ? true, libjpeg, useUnfreeCodecs ? false, - darwin, buildPackages, }: @@ -176,11 +175,7 @@ stdenv.mkDerivation { ++ lib.optional libpngSupport libpng ++ lib.optional libjpegSupport libjpeg ++ lib.optional bs2bSupport libbs2b - ++ lib.optional v4lSupport libv4l - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.OpenGL - ]; + ++ lib.optional v4lSupport libv4l; configurePlatforms = [ ]; configureFlags = diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix index 822950ffc9b7..b21df5478a3e 100644 --- a/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -81,14 +81,12 @@ lib.makeOverridable ( inherit scriptName; } // lib.optionalAttrs (runtime-dependencies != [ ]) { - extraWrapperArgs = - [ - "--prefix" - "PATH" - ":" - ] - ++ (map lib.makeBinPath runtime-dependencies) - ++ args.passthru.extraWrapperArgs or [ ]; + extraWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath runtime-dependencies) + ] ++ args.passthru.extraWrapperArgs or [ ]; }; meta = { diff --git a/pkgs/applications/video/mpv/scripts/eisa01.nix b/pkgs/applications/video/mpv/scripts/eisa01.nix index 38e6e4f50567..508b1fdf64e4 100644 --- a/pkgs/applications/video/mpv/scripts/eisa01.nix +++ b/pkgs/applications/video/mpv/scripts/eisa01.nix @@ -12,13 +12,13 @@ let let self = { inherit pname; - version = "0-unstable-2023-11-25"; + version = "0-unstable-2025-05-08"; src = fetchFromGitHub { owner = "Eisa01"; repo = "mpv-scripts"; - rev = "48d68283cea47ff8e904decc9003b3abc3e2123e"; - hash = "sha256-edJfotlC5T8asqPIygR67BEWjP4i54Wx54StLfjpc48="; + rev = "4701419f9b9063a5425f3942ec62cc029599430d"; + hash = "sha256-QXpuqViVXIGCDbX0OVjDW7E67odZTMbk1iXfz7bBasU="; # avoid downloading screenshots and videos sparseCheckout = [ "scripts/" @@ -54,6 +54,22 @@ lib.recurseIntoAttrs ( }; }; + simplebookmark = { + scriptPath = "scripts/SimpleBookmark.lua"; + meta = { + description = "Simple bookmarks script based on assigning keys"; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + }; + }; + + simplehistory = { + scriptPath = "scripts/SimpleHistory.lua"; + meta = { + description = "Store videos in a history file, continue watching your last played or resume previously played videos, manage and play from your history, and more"; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + }; + }; + smartskip = { scriptPath = "scripts/SmartSkip.lua"; meta = { @@ -61,5 +77,13 @@ lib.recurseIntoAttrs ( maintainers = with lib.maintainers; [ iynaix ]; }; }; + + undoredo = { + scriptPath = "scripts/UndoRedo.lua"; + meta = { + description = "Undo / redo any accidental time jumps"; + maintainers = with lib.maintainers; [ iynaix ]; + }; + }; } ) diff --git a/pkgs/applications/video/mpv/scripts/manga-reader.nix b/pkgs/applications/video/mpv/scripts/manga-reader.nix index 77223d041c8a..fa0288f7a1fb 100644 --- a/pkgs/applications/video/mpv/scripts/manga-reader.nix +++ b/pkgs/applications/video/mpv/scripts/manga-reader.nix @@ -8,12 +8,12 @@ buildLua { pname = "manga-reader"; - version = "0-unstable-2025-02-16"; + version = "0-unstable-2025-05-01"; src = fetchFromGitHub { owner = "Dudemanguy"; repo = "mpv-manga-reader"; - rev = "68824666b669ec101835f6d7aa510896e82ec30f"; - hash = "sha256-9PGJ2OrAcbJIBLI/XGT2HQpC3KuoYnn1ws9oB9AnHQA="; + rev = "01312a1bf84ff2de48483760b7c9d638ebe08e20"; + hash = "sha256-j2uLB2pZiCKvMJBebXoXom9J5jJYMCA2Gz0QUI2yCQQ="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/modernz.nix b/pkgs/applications/video/mpv/scripts/modernz.nix index 16d9da36e4f7..357736724488 100644 --- a/pkgs/applications/video/mpv/scripts/modernz.nix +++ b/pkgs/applications/video/mpv/scripts/modernz.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernz"; - version = "0.2.7"; + version = "0.2.8"; scriptPath = "modernz.lua"; src = fetchFromGitHub { owner = "Samillion"; repo = "ModernZ"; rev = "v${finalAttrs.version}"; - hash = "sha256-BMxwQa+G8FiTl3qpoFxz1czZH1UweTYPwN9tDluQFBo="; + hash = "sha256-pQttcfCaw9K8BD/T2CZdRAb9QEFobyeUj/KmNStgzEg="; }; postInstall = '' diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index a6a00283129e..7c85120bcf6b 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -10,13 +10,13 @@ buildLua rec { pname = "mpvacious"; - version = "0.39"; + version = "0.40"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-8E/EGIePK5siCchZPL81XMgspvNaRunqiLVU/J3nsmI="; + sha256 = "sha256-PxLbv9aGVQV4Gea2H/GcWv/yuaRSqBRqbzRXu612kLE="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/applications/video/mpv/scripts/twitch-chat.nix b/pkgs/applications/video/mpv/scripts/twitch-chat.nix index cdcadf2f9ead..bf6eab70d187 100644 --- a/pkgs/applications/video/mpv/scripts/twitch-chat.nix +++ b/pkgs/applications/video/mpv/scripts/twitch-chat.nix @@ -7,13 +7,13 @@ }: buildLua { pname = "twitch-chat"; - version = "0-unstable-2024-06-23"; + version = "0-unstable-2025-03-30"; src = fetchFromGitHub { owner = "CrendKing"; repo = "mpv-twitch-chat"; - rev = "bb0c2e84675f4f1e0c221c8e1d3516b60242b985"; - hash = "sha256-lnWYcr49koI60Su85OWbcxrARWTfXW2zIvfCZ6c3GtI="; + rev = "97c94ae58b4a898067b9c63c477716280327d8e1"; + hash = "sha256-KjlzVuj47zos2RQHbveijsyJoN2f7VGBboWolISom7M="; postFetch = "rm $out/screenshot.webp"; }; diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix index 2838dd5e4942..4d3078f89bc8 100644 --- a/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -9,21 +9,21 @@ buildLua (finalAttrs: { pname = "uosc"; - version = "5.6.2"; + version = "5.8.0"; scriptPath = "src/uosc"; src = fetchFromGitHub { owner = "tomasklaen"; repo = "uosc"; rev = finalAttrs.version; - hash = "sha256-UbSEJGlLSX5wZpfj+Cb3LfWw17pnjxIJUNtP8dclKoU="; + hash = "sha256-O8GLYsFoDQmYvHWLwfWo1zcQvCsV2RqAe/m+R5cOITI="; }; passthru.updateScript = gitUpdater { }; tools = buildGoModule { pname = "uosc-bin"; inherit (finalAttrs) version src; - vendorHash = "sha256-nkY0z2GiDxfNs98dpe+wZNI3dAXcuHaD/nHiZ2XnZ1Y="; + vendorHash = "sha256-oRXChHeVQj6nXvKOVV125sM8wD33Dxxv0r/S7sl6SxQ="; }; # the script uses custom "texture" fonts as the background for ui elements. diff --git a/pkgs/applications/video/mpv/scripts/visualizer.nix b/pkgs/applications/video/mpv/scripts/visualizer.nix index cf80bb47f0af..c26e3f63766c 100644 --- a/pkgs/applications/video/mpv/scripts/visualizer.nix +++ b/pkgs/applications/video/mpv/scripts/visualizer.nix @@ -6,13 +6,13 @@ }: buildLua { pname = "visualizer"; - version = "0-unstable-2024-09-26"; + version = "0-unstable-2025-04-12"; src = fetchFromGitHub { owner = "mfcc64"; repo = "mpv-scripts"; - rev = "bff344ee2aeaa0153c7e593dc262d68bcc3031c6"; - sha256 = "kNf5b153fIbKja1ZUOV3w4taH5CWjAJhGUMywXF6dMg="; + rev = "bf6776f5c3dae8d83ba29b820496af89dc436613"; + sha256 = "9ApUBXjH4TKPP4P/fUXSNYbJu2AH6HBYt+1K+sHB7yE="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 98ddc17e5589..88f29a6f718c 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -48,8 +48,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "MythTV"; repo = "mythtv"; - rev = "v${version}"; - hash = "sha256-ZhVlDX5I6SJEntVg30Iy/XxgsorDjFycAt2uksJMJps="; + tag = "v${version}"; + hash = "sha256-4mWtPJi2CBoek8LWEfdFxe1ybomAOCTWBTKExMm7nLU="; }; patches = [ diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 6d11f5aa5f7e..57175d62e0e7 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake + extra-cmake-modules pkg-config wrapQtAppsHook ]; @@ -71,7 +72,6 @@ stdenv.mkDerivation { python3 python3.pkgs.pyside2 python3.pkgs.shiboken2 - extra-cmake-modules wayland glog ceres-solver diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 62e02381c134..85619d66e647 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -6,7 +6,6 @@ ninja, nv-codec-headers-12, fetchFromGitHub, - fetchpatch, addDriverRunpath, autoAddDriverRunpath, cudaSupport ? config.cudaSupport, @@ -40,7 +39,7 @@ pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio, browserSupport ? true, - libcef, + cef-binary, pciutils, pipewireSupport ? stdenv.hostPlatform.isLinux, withFdk ? true, @@ -66,6 +65,19 @@ let inherit (lib) optional optionals; + cef = cef-binary.overrideAttrs (oldAttrs: { + version = "127.3.5"; + __intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD + gitRevision = "114ea2a"; + chromiumVersion = "127.0.6533.120"; + + srcHash = + { + aarch64-linux = "sha256-s8dR97rAO0mCUwbpYnPWyY3t8movq05HhZZKllhZdBs="; + x86_64-linux = "sha256-57E7bZKpViWno9W4AaaSjL9B4uxq+rDXAou1tsiODUg="; + } + .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); + }); in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; @@ -85,33 +97,6 @@ stdenv.mkDerivation (finalAttrs: { # Lets obs-browser build against CEF 90.1.0+ ./Enable-file-access-and-universal-access-for-file-URL.patch ./fix-nix-plugin-path.patch - # TODO: remove when CHROME_VERSION_BUILD(libcef) >= 6367 - (fetchpatch { - name = "Check-source-validity-before-attempting-to-log-rende.patch"; - url = "https://github.com/obsproject/obs-browser/pull/478.patch"; - revert = true; - stripLen = 1; - extraPrefix = "plugins/obs-browser/"; - hash = "sha256-mQVhK4r8LlK2F9/jlDHA1V6M29mAfxWAU/VsMXYNrhU="; - }) - # TODO: remove when CHROME_VERSION_BUILD(libcef) >= 6367 - (fetchpatch { - name = "Print-browser-source-renderer-crashes-to-OBS-log.patch"; - url = "https://github.com/obsproject/obs-browser/pull/475.patch"; - revert = true; - stripLen = 1; - extraPrefix = "plugins/obs-browser/"; - hash = "sha256-ha77OYpWn57JovPNE+izyDOB/2KlF3qWVv/PGEgyu84="; - }) - # TODO: remove when CHROME_VERSION_BUILD(libcef) >= 6367 - (fetchpatch { - name = "Log-error-if-CefInitialize-fails.patch.patch"; - url = "https://github.com/obsproject/obs-browser/pull/477.patch"; - revert = true; - stripLen = 1; - extraPrefix = "plugins/obs-browser/"; - hash = "sha256-MMLFQtpWjfpti/38qEcOuXr1L3s1MPRHjuaZCjNmvt0="; - }) ]; nativeBuildInputs = @@ -168,20 +153,12 @@ stdenv.mkDerivation (finalAttrs: { pipewire libdrm ] - ++ optional browserSupport libcef + ++ optional browserSupport cef ++ optional withFdk fdk_aac; # Copied from the obs-linuxbrowser postUnpack = lib.optionalString browserSupport '' - mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ - for i in ${libcef}/share/cef/*; do - ln -s $i cef/Release/ - ln -s $i cef/Resources/ - done - ln -s ${libcef}/lib/*.so* cef/Release/ - ln -s ${libcef}/libexec/cef/chrome-sandbox cef/Release/ - ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ - ln -s ${libcef}/include cef/ + ln -s ${cef} cef ''; postPatch = '' @@ -243,8 +220,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.optionalString browserSupport '' # Link cef components again after patchelfing other libs - ln -s ${libcef}/lib/* $out/lib/obs-plugins/ - ln -s ${libcef}/libexec/cef/* $out/lib/obs-plugins/ + ln -sf ${cef}/${cef.buildType}/* $out/lib/obs-plugins/ '') ]; diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix index c9fbda2b4e35..a79db9013a5f 100644 --- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix +++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix @@ -4,6 +4,7 @@ cmake, libbfd, SDL2, + libGL, obs-studio, looking-glass-client, }: @@ -21,6 +22,7 @@ stdenv.mkDerivation { obs-studio libbfd SDL2 + libGL ]; env.NIX_CFLAGS_COMPILE = "-mavx"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix index 0a80098f5d1b..ff4cbf415c9d 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-3d-effect"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-3d-effect"; rev = version; - sha256 = "sha256-SgxrBhuO3IaqINwjwdtn31cIcu3hXiPZyVMZJiNsO+s="; + sha256 = "sha256-5cPXfEcKIATFQktjIN5lmYjvakYe/k26aHKlJz5FqPE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix index 97747cadbab0..8aac08543123 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-color-monitor"; - version = "0.8.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-color-monitor"; tag = finalAttrs.version; - hash = "sha256-cVMpmkcw8GzNGyd80g1oKmyiEYGMcRtWtDj9MC7RYf8="; + hash = "sha256-TwsEIOgQjj1wza7i8nne63oBM3FB6GmMjCq8/PuiWHs="; }; nativeBuildInputs = [ cmake ]; @@ -39,6 +39,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ hlad ]; - broken = true; }; }) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix index 22e963b1d8e1..3897fc7b384a 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "obs-livesplit-one"; - version = "0.3.4"; + version = "0.4.1"; src = fetchFromGitHub { owner = "LiveSplit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3B3P1PlzIlpVqHJMKWpEnWXGgD/IaiWM1FVKn0BtRj0="; + sha256 = "sha256-4Ar4ChSl226BVFyAnqpWDLxsZF63bxl++sWD+6aENW8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JHocpqDeF24Qn9lUr+YCnZqgckLhGRpWQD7WGCxVmd8="; + cargoHash = "sha256-e0FDa72vzRb5AMVmtkvAkiQ5GUXsq0LekqF+wDYDsr8="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index bdedeeed9c78..9e542067069d 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-kCiRgfpcFdxoK6e8jtrtzkBD4w5B/ilO1YyBHCG13gg="; + sha256 = "sha256-BCivYK18T4b+lRo6Qf9qFwmjAyjCPZDekQVi03QBLHc="; }; nativeBuildInputs = [ cmake ]; 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 fefdefc8eb4f..559d5db86cba 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 @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=./lib" - "-DCMAKE_INSTALL_DATADIR=./usr" + "-DCMAKE_INSTALL_DATADIR=./share" ]; meta = with lib; { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index 6c2074bd7f7e..744ba03ca442 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-shaderfilter"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-shaderfilter"; rev = version; - sha256 = "sha256-J4g8PTPtVkKNkUTb0Ntz+HT4AaNCtqt58KfZOMS6llE="; + sha256 = "sha256-HJFgGicOtEZMMJyAkwgHCvWPoj00C6YGU9NwagD4Fpw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix index 20b0fc3d2084..eda617a1f353 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-source-record"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-source-record"; rev = version; - sha256 = "sha256-wh5BVWKHelw/ry6algST4EFGmmqsKs+phmVacS77dqM="; + sha256 = "sha256-mlPLZ9n0F4K1tRx9xPuNMGzupRGLmyVsqKS12A4X5vw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index 141bf70c2a2d..f01050fffa25 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-vkcapture"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "nowrep"; repo = "obs-vkcapture"; rev = "v${finalAttrs.version}"; - hash = "sha256-RIDsT6eL6bUfqPiyPlecnZHu5OorcJb3Xal8pjdOpAA="; + hash = "sha256-ghfRST7J3bipQnOZnYMtmDggET+Etq/ngHs+zQ0bm1w="; }; cmakeFlags = lib.optionals stdenv.hostPlatform.isi686 [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix index 72c1768cf5b8..a4bab7b7b626 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, obs-studio, - webkitgtk_4_0, + webkitgtk_4_1, glib-networking, meson, cmake, @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [ obs-studio - webkitgtk_4_0 + webkitgtk_4_1 glib-networking ]; diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index b0c39aa7b3b5..4a49b281adaa 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -8,11 +8,10 @@ frei0r, opencolorio, ffmpeg_6, - CoreFoundation, cmake, wrapQtAppsHook, openimageio, - openexr_3, + openexr, portaudio, imath, qtwayland, @@ -27,7 +26,7 @@ let version = "2.4.15.0"; src = ( old.src.override { - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M="; } ); @@ -78,12 +77,12 @@ stdenv.mkDerivation { opencolorio openimageio' imath - openexr_3 + openexr portaudio qtwayland qtmultimedia qttools - ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreFoundation; + ]; meta = with lib; { description = "Professional open-source NLE video editor"; diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index ad0ee012cebf..a6ffd25afc2d 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -43,13 +43,13 @@ let in buildPerlModule rec { pname = "pipe-viewer"; - version = "0.5.4"; + version = "0.5.6"; src = fetchFromGitHub { owner = "trizen"; repo = "pipe-viewer"; rev = version; - hash = "sha256-xChwX6lfwLH1Rv9rnd+ONKJFQTnoPv1aX9fIv7AUDBU="; + hash = "sha256-ZcO07zDMXSFOWIC0XHqeqjgPJXzWWh8G2szTkvF8OjM="; }; nativeBuildInputs = [ makeWrapper ] ++ lib.optionals withGtk3 [ wrapGAppsHook3 ]; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index c979752948d0..e6e8314a21a9 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg, @@ -16,22 +15,24 @@ pkg-config, libpulseaudio, libv4l, + pipewire, qtbase, qttools, + wrapQtAppsHook, cmake, ninja, - nix-update-script, + unstableGitUpdater, }: -mkDerivation { +stdenv.mkDerivation { pname = "simplescreenrecorder"; - version = "0.4.4-unstable-2024-08-13"; + version = "0.4.4-unstable-2025-01-25"; src = fetchFromGitHub { owner = "MaartenBaert"; repo = "ssr"; - rev = "4e3ba13dd212fc4213fe0911f371bc7d34033b8d"; - hash = "sha256-jBZkyrZOrUljWgO8U4SZOTCu3sOm83unQ7vyv+KkAuE="; + rev = "c50e83eea53f45eff503af58e6c86d0e928222f3"; + hash = "sha256-pTgIooEOIYwOrSuXD0L5S7J7IsUIyzRuEX2ZziiIiAM="; }; cmakeFlags = [ @@ -52,7 +53,9 @@ mkDerivation { pkg-config cmake ninja + wrapQtAppsHook ]; + buildInputs = [ alsa-lib ffmpeg @@ -65,12 +68,13 @@ mkDerivation { libGL libpulseaudio libv4l + pipewire qtbase qttools qtx11extras ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = unstableGitUpdater { }; meta = with lib; { description = "Screen recorder for Linux"; diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index d778c762c5b4..b085b465528e 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "4.2.10"; + version = "4.2.12"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - hash = "sha256-qnE/0gnuY982qYz3ouUKFPURNkxM0XKWqf3w5ZwczV0="; - rev = "V${version}"; + hash = "sha256-b2DSHbjMnRSY4pf5gSizU3Jbq8gEGC5xFYHCdIaYMfs="; + tag = "V${version}"; }; buildInputs = [ diff --git a/pkgs/applications/video/vdr/nopacity/default.nix b/pkgs/applications/video/vdr/nopacity/default.nix index 6c04f49fb49a..84e8e48ab7b6 100644 --- a/pkgs/applications/video/vdr/nopacity/default.nix +++ b/pkgs/applications/video/vdr/nopacity/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "vdr-skin-nopacity"; - version = "1.1.18"; + version = "1.1.19"; src = fetchFromGitLab { repo = "SkinNopacity"; owner = "kamel5"; - hash = "sha256-Aq5PtD6JV8jdBURADl9KkdVQvfmeQD/Zh62g5ansuC4="; - rev = version; + hash = "sha256-f15KtoPLvB5bF//5+gmmDmx8MGmiIDPGOYoNgSkcVqM="; + tag = version; }; buildInputs = [ diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index ef35f18b2f86..05f1b637f101 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -4,7 +4,7 @@ vdr, fetchFromGitHub, graphicsmagick, - boost, + boost186, libgcrypt, ncurses, callPackage, @@ -155,7 +155,7 @@ in buildInputs = [ vdr - boost + boost186 libgcrypt ]; diff --git a/pkgs/applications/video/youtube-tui/default.nix b/pkgs/applications/video/youtube-tui/default.nix deleted file mode 100644 index b2e2f38bc33d..000000000000 --- a/pkgs/applications/video/youtube-tui/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - openssl, - xorg, - stdenv, - python3, - makeBinaryWrapper, - libsixel, - mpv, - CoreFoundation, - Security, - AppKit, -}: - -rustPlatform.buildRustPackage rec { - pname = "youtube-tui"; - version = "0.8.1"; - - src = fetchFromGitHub { - owner = "Siriusmart"; - repo = "youtube-tui"; - tag = "v${version}"; - hash = "sha256-PAQkFg9SV6q3No5drYPPJZXzQ/XqtOhMr3eQOCnM+7Q="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-AjqxuNEyuDkYYuvi6Oii3/BfKFNUoJiBH4cS8cb7yMs="; - - nativeBuildInputs = [ - pkg-config - python3 - makeBinaryWrapper - ]; - - buildInputs = - [ - openssl - xorg.libxcb - libsixel - mpv - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - AppKit - ]; - - # sixel-sys is dynamically linked to libsixel - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - wrapProgram $out/bin/youtube-tui \ - --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsixel ]}" - ''; - - meta = with lib; { - description = "Aesthetically pleasing YouTube TUI written in Rust"; - homepage = "https://siriusmart.github.io/youtube-tui"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ Ruixi-rebirth ]; - mainProgram = "youtube-tui"; - }; -} diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index fc57f0cf270d..05e1ee00d10f 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.32.3"; + version = "1.32.4"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-EIJT/LwxRZUYvbH0EFYSeZpGgFOywI6jpfmFO3g8cps="; + hash = "sha256-zMSGXRJvFPlbJAnrdHMQYLPkS138r5/2/gyJhhoytgs="; }; vendorHash = null; @@ -85,7 +85,7 @@ buildGoModule rec { Kubernetes Container Runtime Interface ''; license = licenses.asl20; - maintainers = with maintainers; [ ] ++ teams.podman.members; + teams = [ teams.podman ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 4135f7a0938a..250d862ba56e 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-4IToXaOEMfgEh9mXuN7nRn+8l8T6+mzVWYvfsYN4ZIM="; + hash = "sha256-KU9B6ygK6PwMvXDL+SBB79TCBScJDgVMs4m92zgibdE="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 7d133751e713..8c337284d3a3 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.34.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-AoYm2gRqNgXTc7ksQeSPVo+gTkxaFwhfLhue3Z8a4Wo="; + hash = "sha256-3WaTUylmXk2urn9Pe76AdnckJvFBJBSccXCvFSRotyo="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGoModule rec { rm -rf pkg/e2e/ ''; - vendorHash = "sha256-ISX+PpjapST9d/rFP0SPlFYyPb5NcwwQT6mhb1H1qEE="; + vendorHash = "sha256-AcBBtetOuTnCA6ZQVUta+6lJQoSJhBXifEoToUhrpAk="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 2f9e3d58aae5..5be14107857d 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -86,7 +86,7 @@ rec { }; preBuild = '' - substituteInPlace Makefile --replace-warn "/bin/bash" "${lib.getExe bash}" + substituteInPlace Makefile --replace-warn "/bin/bash" "${stdenv.shell}" ''; # docker/runc already include these patches / are not applicable @@ -360,15 +360,17 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_25 = callPackage dockerGen rec { - version = "25.0.6"; - cliRev = "v${version}"; - cliHash = "sha256-7ZKjlONL5RXEJZrvssrL1PQMNANP0qTw4myGKdtd19U="; + version = "25.0.8"; + # Upstream forgot to tag release + # https://github.com/docker/cli/issues/5789 + cliRev = "43987fca488a535d810c429f75743d8c7b63bf4f"; + cliHash = "sha256-OwufdfuUPbPtgqfPeiKrQVkOOacU2g4ommHb770gV40="; mobyRev = "v${version}"; - mobyHash = "sha256-+zkhUMeVD3HNq8WrWQmLskq+HykvD5kzSACmf67YbJE="; - runcRev = "v1.1.12"; - runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; - containerdRev = "v1.7.20"; - containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY="; + mobyHash = "sha256-n7GdjQEceqyC7E2sPXQWyxpRThtH35eM/J20yLa5NSs="; + runcRev = "v1.2.4"; + runcHash = "sha256-LdYCMxdqDP7rKo6Ek/B1DE6QvUFrltbSJVggkVkXQZo="; + containerdRev = "v1.7.25"; + containerdHash = "sha256-T0F5bwxSCqa4Czs/W01NaAlJJFvgrzkBC1y/r+muivA="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; @@ -393,10 +395,24 @@ rec { cliHash = "sha256-7laxRfssh2aGfJeZI0PsJ/MCiy2npigSmCa1SUlWY4s="; mobyRev = "v${version}"; mobyHash = "sha256-q+VCJZ93jvPJQE0xn89prH/6spsarVY3VUEmgwyMxU4="; - runcRev = "v1.2.3"; - runcHash = "sha256-SdeCmPttMXQdIn3kGWsIM3dfhQCx1C5bMyAM889VVUc="; - containerdRev = "v1.7.24"; - containerdHash = "sha256-03vJs61AnTuFAdImZjBfn1izFcoalVJdVs9DZeDcABI="; + runcRev = "v1.2.4"; + runcHash = "sha256-LdYCMxdqDP7rKo6Ek/B1DE6QvUFrltbSJVggkVkXQZo="; + containerdRev = "v1.7.25"; + containerdHash = "sha256-T0F5bwxSCqa4Czs/W01NaAlJJFvgrzkBC1y/r+muivA="; + tiniRev = "v0.19.0"; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + }; + + docker_28 = callPackage dockerGen rec { + version = "28.1.1"; + cliRev = "v${version}"; + cliHash = "sha256-bRnJ+c2C4t+94NL82L0S3r84uoJaTDq16YQGvEmo7Sw="; + mobyRev = "v${version}"; + mobyHash = "sha256-FB9btun41PAqqBjb9Ebn7SyjrIg/ILe3xJ+mqu2lqrs="; + runcRev = "v1.2.6"; + runcHash = "sha256-XMN+YKdQOQeOLLwvdrC6Si2iAIyyHD5RgZbrOHrQE/g="; + containerdRev = "v1.7.27"; + containerdHash = "sha256-H94EHnfW2Z59KcHcbfJn+BipyZiNUvHe50G5EXbrIps="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix deleted file mode 100644 index f9ee61291426..000000000000 --- a/pkgs/applications/virtualization/lima/bin.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchurl, - writeScript, - installShellFiles, - qemu, - makeBinaryWrapper, - autoPatchelfHook, -}: - -let - version = "0.22.0"; - - dist = { - aarch64-darwin = rec { - archSuffix = "Darwin-arm64"; - url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "271e0224d3e678450424abd4e6766a14ea52b146824bf8cfac7a0f486ceb2a0c"; - }; - - x86_64-darwin = rec { - archSuffix = "Darwin-x86_64"; - url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "f2d331ef783e0bb00e193efc3d5c9438df5d284b1cbac771e5d239c3459b2b3d"; - }; - - aarch64-linux = rec { - archSuffix = "Linux-aarch64"; - url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "8c5c6dc21fae19c5645bf8db8f441aeab7fba21fbe882b2b9db58c126d07846b"; - }; - - x86_64-linux = rec { - archSuffix = "Linux-x86_64"; - url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "58e66114ae1e991512a86b6952ab3a1ffe0e12e08199a9a3ea13c3d2f24b307e"; - }; - }; -in -stdenvNoCC.mkDerivation { - inherit version; - pname = "lima"; - src = fetchurl { - inherit - (dist.${stdenvNoCC.hostPlatform.system} - or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}") - ) - url - sha256 - ; - }; - - sourceRoot = "."; - - nativeBuildInputs = [ - makeBinaryWrapper - installShellFiles - ] ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; - - installPhase = - '' - runHook preInstall - mkdir -p $out - cp -r bin share $out - chmod +x $out/bin/limactl - wrapProgram $out/bin/limactl \ - --prefix PATH : ${lib.makeBinPath [ qemu ]} - '' - + lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' - # the shell completion only works with a patched $out/bin/limactl and so - # needs to run after the autoPatchelfHook is executed in postFixup. - doShellCompletion() { - installShellCompletion --cmd limactl \ - --bash <($out/bin/limactl completion bash) \ - --fish <($out/bin/limactl completion fish) \ - --zsh <($out/bin/limactl completion zsh) - } - postFixupHooks+=(doShellCompletion) - '' - + '' - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - USER=nix $out/bin/limactl validate $out/share/lima/examples/default.yaml - USER=nix $out/bin/limactl validate $out/share/lima/examples/experimental/vz.yaml - ''; - - # Stripping removes entitlements of the binary on Darwin making it non-operational. - # Therefore, disable stripping on Darwin. - dontStrip = stdenvNoCC.hostPlatform.isDarwin; - - passthru.updateScript = - let - lima-bin = builtins.toString ./bin.nix; - in - writeScript "update-lima-bin.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts curl jq gawk - - set -eou pipefail - - LATEST_VERSION=$(curl -H "Accept: application/vnd.github+json" -Ls https://api.github.com/repos/lima-vm/lima/releases/latest | jq -r .tag_name | cut -c 2-) - curl -Ls -o SHA256SUMS https://github.com/lima-vm/lima/releases/download/v$LATEST_VERSION/SHA256SUMS - AARCH64_DARWIN_SHA256=$(cat SHA256SUMS | awk '/Darwin-arm64/{print $1}') - X86_64_DARWIN_SHA256=$(cat SHA256SUMS | awk '/Darwin-x86_64/{print $1}') - AARCH64_LINUX_SHA256=$(cat SHA256SUMS | awk '/Linux-aarch64/{print $1}') - X86_64_LINUX_SHA256=$(cat SHA256SUMS | awk '/Linux-x86_64/{print $1}') - - # reset version first so that all platforms are always updated and in sync - update-source-version lima-bin $LATEST_VERSION $AARCH64_DARWIN_SHA256 --file=${lima-bin} --ignore-same-version --system=aarch64-darwin - update-source-version lima-bin $LATEST_VERSION $X86_64_DARWIN_SHA256 --file=${lima-bin} --ignore-same-version --system=x86_64-darwin - update-source-version lima-bin $LATEST_VERSION $AARCH64_LINUX_SHA256 --file=${lima-bin} --ignore-same-version --system=aarch64-linux - update-source-version lima-bin $LATEST_VERSION $X86_64_LINUX_SHA256 --file=${lima-bin} --ignore-same-version --system=x86_64-linux - rm SHA256SUMS - ''; - - meta = with lib; { - homepage = "https://github.com/lima-vm/lima"; - description = "Linux virtual machines (on macOS, in most cases)"; - license = licenses.asl20; - maintainers = with maintainers; [ tricktron ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 705aef607045..6365ef7d44c8 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "lima"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "lima-vm"; repo = "lima"; rev = "v${version}"; - hash = "sha256-3K2RC4cPoIuDePTOYzY+ejmBFZwgYDvCtoe/ZLX66sc="; + hash = "sha256-pwSLQlYPJNzvXuW6KLmQoaafQyf3o6fjVAfKe9RJ3UE="; }; - vendorHash = "sha256-tjogQUD+F/3ALlJwpdDKdXHRcYB+n0EuJ81TB1VKKDY="; + vendorHash = "sha256-JxrUX22yNb5/tZIBWDiBaMLOpEnOk+2lZdpzCjjqO4E="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index cff5da08d3aa..deaefb7db927 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -116,7 +116,6 @@ stdenv.mkDerivation { platforms = platforms.linux; # Darwin probably works too but I haven't tested it license = licenses.gpl2; maintainers = with maintainers; [ - copumpkin raitobezarius ]; }; diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index a50dfb78ceec..7c5cecf27fd8 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -9,7 +9,7 @@ }: buildPythonApplication rec { - version = "1.3.0"; + version = "1.4.0"; pname = "podman-compose"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonApplication rec { repo = "podman-compose"; owner = "containers"; tag = "v${version}"; - hash = "sha256-0k+vJwWYEXQ6zxkcvjxBv9cq8nIBS15F7ul5VwqYtys="; + hash = "sha256-779L8fc5rxnkW5f4i/zgc8K9bEwKNKjw20cNlSwU/aA="; }; build-system = [ @@ -35,7 +35,8 @@ buildPythonApplication rec { homepage = "https://github.com/containers/podman-compose"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members; + maintainers = [ lib.maintainers.sikmir ]; + teams = [ lib.teams.podman ]; mainProgram = "podman-compose"; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7c9d5c30312a..8012b12d2b63 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -31,10 +31,9 @@ libcap_ng, socat, libslirp, + libcbor, apple-sdk_13, darwinMinVersionHook, - rez, - setfile, guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal, numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, @@ -145,11 +144,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "9.2.2"; + version = "9.2.3"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-dS6u63cpI6c9U2sjHgW8wJybH1FpCkGtmXPZAOTsn78="; + hash = "sha256-uu1JQnDDYb9pgWrMhFEuPv7XHHoj92aRZCuAvD3naT4="; }; depsBuildBuild = @@ -179,8 +178,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals hexagonSupport [ glib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool - rez - setfile ] ++ lib.optionals (!userOnly) [ dtc ]; @@ -199,6 +196,7 @@ stdenv.mkDerivation (finalAttrs: { snappy libtasn1 libslirp + libcbor ] ++ lib.optionals (!userOnly) [ curl ] ++ lib.optionals ncursesSupport [ ncurses ] @@ -263,6 +261,13 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-qemu-ga.patch + # On macOS, QEMU uses `Rez(1)` and `SetFile(1)` to attach its icon + # to the binary. Unfortunately, those commands are proprietary, + # deprecated since Xcode 6, and operate on resource forks, which + # these days are stored in extended attributes, which aren’t + # supported in the Nix store. So we patch out the calls. + ./skip-macos-icon.patch + # Workaround for upstream issue with nested virtualisation: https://gitlab.com/qemu-project/qemu/-/issues/1008 (fetchpatch { url = "https://gitlab.com/qemu-project/qemu/-/commit/3e4546d5bd38a1e98d4bd2de48631abf0398a3a2.diff"; @@ -436,7 +441,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.qemu.org/"; description = "Generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ qyliss ] ++ lib.optionals xenSupport xen.meta.maintainers; + maintainers = with maintainers; [ qyliss ]; + teams = lib.optionals xenSupport xen.meta.teams; platforms = platforms.unix; } # toolsOnly: Does not have qemu-kvm and there's no main support tool diff --git a/pkgs/applications/virtualization/qemu/skip-macos-icon.patch b/pkgs/applications/virtualization/qemu/skip-macos-icon.patch new file mode 100644 index 000000000000..4f6f3a9a9e4a --- /dev/null +++ b/pkgs/applications/virtualization/qemu/skip-macos-icon.patch @@ -0,0 +1,14 @@ +diff --git a/scripts/entitlement.sh b/scripts/entitlement.sh +index 0f412949ec..23f56d083a 100755 +--- a/scripts/entitlement.sh ++++ b/scripts/entitlement.sh +@@ -25,9 +25,5 @@ + codesign --entitlements "$ENTITLEMENT" --force -s - "$SRC" + fi + +-# Add the QEMU icon to the binary on Mac OS +-Rez -append "$ICON" -o "$SRC" +-SetFile -a C "$SRC" +- + mv -f "$SRC" "$DST" + trap '' exit diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 0866cce66a4b..7d4eaf367b60 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -9,14 +9,14 @@ let callPackage (import ./generic.nix rec { pname = "apptainer"; - version = "1.4.0"; + version = "1.4.1"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; tag = "v${version}"; - hash = "sha256-whitdwFOvQgRS9lwbsWhhm92+i1qGW+OFOreNSyvldk="; + hash = "sha256-1deSlDNk8ZI/z1eWmslesXO0ypCoMxCJMdihFPCSPIc="; }; # Override vendorHash with overrideAttrs. @@ -46,19 +46,19 @@ let callPackage (import ./generic.nix rec { pname = "singularity-ce"; - version = "4.3.0"; + version = "4.3.1"; projectName = "singularity"; src = fetchFromGitHub { owner = "sylabs"; repo = "singularity"; tag = "v${version}"; - hash = "sha256-zmrwP5ZAsRz+1zR/VozjBiT+YGJrCnvD3Y7dUsqbQwk="; + hash = "sha256-hkUM9K0AweRpLa+LZ7XOI/oDk72EKWzVN5h4Kz2w2B0="; }; # Override vendorHash with overrideAttrs. # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash - vendorHash = "sha256-Ayp+V8M3PP53ZLEagsxBB/r8Ci0tNIiH9NtbHpX6NmM="; + vendorHash = "sha256-hAVynmVXPmQPo+Kd2ajBSU+UqBpvJ5TokOJXZwySr+w="; extraConfigureFlags = [ # Do not build squashfuse from the Git submodule sources, use Nixpkgs provided version diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index eeab97c4652d..3c9ba2e744cb 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -74,9 +74,9 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - virtualboxVersion = "7.1.6"; - virtualboxSubVersion = "a"; - virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d"; + virtualboxVersion = "7.1.8"; + virtualboxSubVersion = ""; + virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d"; kvmPatchVersion = "20250207"; kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y="; @@ -249,8 +249,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optional enableKvm ( let patchVboxVersion = - # There is no updated patch for 7.0.22 yet, but the older one still applies. - if finalAttrs.virtualboxVersion == "7.0.22" then "7.0.20" else finalAttrs.virtualboxVersion; + # There is no updated patch for 7.1.8 yet, but the older one still applies. + if finalAttrs.virtualboxVersion == "7.1.8" then "7.1.6" else finalAttrs.virtualboxVersion; in fetchpatch { name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; @@ -418,7 +418,7 @@ stdenv.mkDerivation (finalAttrs: { fromSource binaryNativeCode ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl3Only; homepage = "https://www.virtualbox.org/"; maintainers = with lib.maintainers; [ sander diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 7b9eb812064f..a26f3a0cac3f 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -4,7 +4,7 @@ virtualbox, }: let - virtualboxExtPackVersion = "7.1.6"; + virtualboxExtPackVersion = "7.1.8"; in fetchurl rec { name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack"; @@ -14,7 +14,7 @@ fetchurl rec { # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS let - value = "c13e47d3fb2c849019accb03353c7d04ffb9c264920075972ed2e2befe3cdd8b"; + value = "912586a3a1e9285f9df264f7999e6fffc0b8a42f2e013dd898a86f7ed3975d37"; in assert (builtins.stringLength value) == 64; value; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index 61e577ebd95f..008a41353afe 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -5,7 +5,7 @@ }: fetchurl { url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso"; - sha256 = "dbbda1645bc05c9260adfe9efc4949cb590ec5ec02680aff936375670cffcafc"; + sha256 = "0001ed19cc389f04723c9b911338559b9b74bea0d24edf794d8d2ce5b5cb14e0"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 2d8365fa3006..6de71ef33067 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,9 +12,9 @@ libX11, }: let - virtualboxVersion = "7.1.6"; - virtualboxSubVersion = "a"; - virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d"; + virtualboxVersion = "7.1.8"; + virtualboxSubVersion = ""; + virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d"; virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { inherit virtualboxVersion virtualboxSubVersion virtualboxSha256; @@ -150,7 +150,7 @@ stdenv.mkDerivation { host/guest clipboard support. ''; sourceProvenance = with lib.sourceTypes; [ fromSource ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix deleted file mode 100644 index c994cf7ec819..000000000000 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - Hypervisor, - vmnet, - xpc, - libobjc, - zlib, -}: - -stdenv.mkDerivation rec { - pname = "xhyve"; - version = "20210203"; - - src = fetchFromGitHub { - owner = "machyve"; - repo = "xhyve"; - rev = "83516a009c692ea5d2993d1071e68d05d359b11e"; - sha256 = "1pjdg4ppy6qh3vr1ls5zyw3jzcvwny9wydnmfpadwij1hvns7lj3"; - }; - - buildInputs = [ - Hypervisor - vmnet - xpc - libobjc - zlib - ]; - - # Don't use git to determine version - prePatch = '' - substituteInPlace Makefile \ - --replace 'shell git describe --abbrev=6 --dirty --always --tags' "$version" - ''; - - makeFlags = [ - "CFLAGS+=-Wno-shift-sign-overflow" - ''CFLAGS+=-DVERSION=\"${version}\"'' - ]; - - installPhase = '' - mkdir -p $out/bin - cp build/xhyve $out/bin - ''; - - meta = with lib; { - description = "Lightweight Virtualization on macOS Based on bhyve"; - homepage = "https://github.com/mist64/xhyve"; - maintainers = [ maintainers.lnl7 ]; - license = licenses.bsd2; - platforms = platforms.darwin; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; - }; -} diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix deleted file mode 100644 index adfa29198ed4..000000000000 --- a/pkgs/applications/window-managers/cage/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - meson, - ninja, - pkg-config, - wayland-scanner, - scdoc, - makeWrapper, - wlroots, - wayland, - wayland-protocols, - pixman, - libxkbcommon, - xcbutilwm, - systemd, - libGL, - libX11, - xwayland ? null, - nixosTests, -}: - -stdenv.mkDerivation rec { - pname = "cage"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "cage-kiosk"; - repo = "cage"; - tag = "v${version}"; - hash = "sha256-2SFtz62z0EF8cpFTC6wGi125MD4a5mkXqP/C+7fH+3g="; - }; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wayland-scanner - scdoc - makeWrapper - ]; - - buildInputs = [ - wlroots - wayland - wayland-protocols - pixman - libxkbcommon - xcbutilwm - systemd - libGL - libX11 - ]; - - postFixup = lib.optionalString wlroots.enableXWayland '' - wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin" - ''; - - # Tests Cage using the NixOS module by launching xterm: - passthru.tests.basic-nixos-module-functionality = nixosTests.cage; - - meta = with lib; { - description = "Wayland kiosk that runs a single, maximized application"; - homepage = "https://www.hjdskes.nl/projects/cage/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; - mainProgram = "cage"; - }; -} diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix deleted file mode 100644 index 93aa7f55d087..000000000000 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cairo, - fontconfig, - libdrm, - libevdev, - libinput, - libxkbcommon, - xcbutilwm, - makeWrapper, - meson, - ninja, - nixosTests, - pango, - pixman, - pkg-config, - scdoc, - systemd, - wayland, - wayland-protocols, - wayland-scanner, - withXwayland ? true, - xwayland, - wlroots, -}: - -stdenv.mkDerivation rec { - pname = "cagebreak"; - version = "2.3.1"; - - src = fetchFromGitHub { - owner = "project-repo"; - repo = pname; - rev = version; - hash = "sha256-GAANZIEUtuONPBpk0E3fErgOZtm3wB+gWJNwfO6VOTo="; - }; - - nativeBuildInputs = [ - makeWrapper - meson - ninja - pkg-config - scdoc - wayland-scanner - ]; - - buildInputs = [ - cairo - fontconfig - libdrm - libevdev - libinput - libxkbcommon - xcbutilwm - pango - pixman - systemd - wayland - wayland-protocols - wlroots - ]; - - mesonFlags = [ - "-Dman-pages=true" - "-Dversion_override=${version}" - "-Dxwayland=${lib.boolToString withXwayland}" - ]; - - postPatch = '' - # TODO: investigate why is this happening - sed -i -e 's|||' *.c - - # 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 '' - wrapProgram $out/bin/cagebreak \ - --prefix PATH : "${lib.makeBinPath [ xwayland ]}" - ''; - - meta = with lib; { - homepage = "https://github.com/project-repo/cagebreak"; - description = "Wayland tiling compositor inspired by ratpoison"; - license = licenses.mit; - maintainers = with maintainers; [ berbiche ]; - platforms = platforms.linux; - changelog = "https://github.com/project-repo/cagebreak/blob/${version}/Changelog.md"; - mainProgram = "cagebreak"; - }; - - passthru.tests.basic = nixosTests.cagebreak; -} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index 7aee0a3a17a4..da2b2cbd51af 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -28,7 +28,9 @@ let { hypr-dynamic-cursors = import ./hypr-dynamic-cursors.nix; } { hyprfocus = import ./hyprfocus.nix; } { hyprgrass = import ./hyprgrass.nix; } - { hyprscroller = import ./hyprscroller.nix; } + { + hyprscroller = throw "hyprlandPlugins.hyprscroller has been removed as the upstream project is deprecated. Consider using `hyprlandPlugins.hyprscrolling`."; + } # Added 2025-05-09 { hyprspace = import ./hyprspace.nix; } { hyprsplit = import ./hyprsplit.nix; } (import ./hyprland-plugins.nix) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix index 21529b55fb15..5524e1c1d2dc 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix @@ -8,13 +8,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "hl0.48.0"; + version = "hl0.49.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; tag = version; - hash = "sha256-CUlxc2u1Y8gpeAl7NKrZxxpeZjyU2DBxOYb8b0haM2M="; + hash = "sha256-dYxkdbg6yj8HhuBkCmklMQVR17N7P32R8ir7b7oNxm4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix index 27c645acb74a..890bda27dff7 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix @@ -8,13 +8,13 @@ mkHyprlandPlugin hyprland { pluginName = "hypr-dynamic-cursors"; - version = "0-unstable-2025-03-26"; + version = "0-unstable-2025-05-08"; src = fetchFromGitHub { owner = "VirtCode"; repo = "hypr-dynamic-cursors"; - rev = "e2c32d8108960b6eaf96918485503e90a016de4b"; - hash = "sha256-/teXJjfdp4cZetlD7lsunettI5QB3UWeODhrrDXooOs="; + rev = "1aabd346eb7ad12a614fd18d095d13422d8b95b4"; + hash = "sha256-KophdgmuoPO4adpgXxhDBAMQoRRoHjngiFWQxLoGgWY="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix index 49c9f25e3ee4..185525befa6f 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix @@ -13,13 +13,13 @@ mkHyprlandPlugin hyprland { pluginName = "hyprgrass"; - version = "0.8.2-unstable-2025-02-01"; + version = "0.8.2-unstable-2025-05-08"; src = fetchFromGitHub { owner = "horriblename"; repo = "hyprgrass"; - rev = "f7017c493e071c02f203c09a63ef7260dede0586"; - hash = "sha256-F9Jnu36LXJnfDdc3mG4JYKACw/ygsPcwEbZsOdCreIQ="; + rev = "7cf3779b5cdc6fa62fdc733b30c31a5b8e48609c"; + hash = "sha256-8Sl2V23EYcZMniBLmKenxH7bMLTGC6Q84ntyFvOUkWU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 5c41bc86d719..8884bd4eb130 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -14,13 +14,13 @@ let mkHyprlandPlugin, }: let - version = "0.48.0"; + version = "0.49.0-fix"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; tag = "v${version}"; - hash = "sha256-q6v3nkJZdu45bwCuymQ+q3U7uwfA+M3GqsvZ0TgNsi4="; + hash = "sha256-5wjvmFtk85uBJLnrKZbfrgo9OTTQlFP18ZNgfBwFsz0="; }; in mkHyprlandPlugin hyprland { @@ -33,7 +33,7 @@ let homepage = "https://github.com/hyprwm/hyprland-plugins"; description = "Hyprland ${description} plugin"; license = lib.licenses.bsd3; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; inherit (hyprland.meta) platforms; }; } @@ -44,8 +44,10 @@ let csgo-vulkan-fix = "CS:GO/CS2 Vulkan fix"; hyprbars = "window title"; hyprexpo = "workspaces overview"; + hyprscrolling = "scrolling layout"; hyprtrails = "smooth trails behind moving windows"; hyprwinwrap = "xwinwrap-like"; + xtra-dispatchers = "extra dispatchers"; }; in hyprland-plugins diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix deleted file mode 100644 index 83090727ed08..000000000000 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - mkHyprlandPlugin, - hyprland, - cmake, - fetchFromGitHub, - nix-update-script, -}: - -mkHyprlandPlugin hyprland { - pluginName = "hyprscroller"; - version = "0-unstable-2025-03-24"; - - src = fetchFromGitHub { - owner = "dawsers"; - repo = "hyprscroller"; - rev = "5b62ca58790f8c2961da79af95efa458f6a814fe"; - hash = "sha256-monOoefLpK2cUAPBlJlVt9BkoSELQmYVysj81zJ74i0="; - }; - - nativeBuildInputs = [ cmake ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - mv hyprscroller.so $out/lib/libhyprscroller.so - - runHook postInstall - ''; - - passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; - - meta = { - homepage = "https://github.com/dawsers/hyprscroller"; - description = "Hyprland layout plugin providing a scrolling layout like PaperWM"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ donovanglover ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix index 2e2d2e06d819..51aa0db52b88 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix @@ -8,13 +8,13 @@ mkHyprlandPlugin hyprland { pluginName = "hyprspace"; - version = "0-unstable-2025-02-08"; + version = "0-unstable-2025-05-09"; src = fetchFromGitHub { owner = "KZDKM"; repo = "hyprspace"; - rev = "ac55bbdb6cee760af9315899b5b187a40ce43e46"; - hash = "sha256-t/KaeHEgzh225HUdAiHXRsgDeyDrBCMTg0LjR73v3Nw="; + rev = "82bdb6720ef6163f0b10b49ba49702f0bde815d8"; + hash = "sha256-qs8I5gBib+RLNGYa9om36VivHVrrisJDlZ4EnXNA6OQ="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix index 03f3f6453386..8a7d7cda0a96 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -9,13 +9,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hyprsplit"; - version = "0.48.0"; + version = "0.48.1-unstable-2025-05-03"; src = fetchFromGitHub { owner = "shezdy"; repo = "hyprsplit"; - rev = "refs/tags/v${version}"; - hash = "sha256-FTp5mkrrgo/plCFHuFnx+EtDnQQoChq0mdKpb2a4LrQ="; + rev = "9a65a4d33cc86703d2ac1f349de9697c8fc7a4b9"; + hash = "sha256-NJTCUa8kHXzQDpUmSifXrHMheR5yejigG2vPBepHolA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 23cb13795695..c4fcab1949b1 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -96,7 +96,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/releases/tag/v${finalAttrs.version}"; mainProgram = "hyprland-share-picker"; license = lib.licenses.bsd3; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix index 7e789586cda9..c847a8a8f313 100644 --- a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix +++ b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix @@ -2,7 +2,7 @@ pkgs, lib, glibcLocales, - python, + python3, fetchpatch, fetchFromGitHub, # Usage: bumblebee-status.override { plugins = p: [p.arandr p.bluetooth2]; }; @@ -13,13 +13,13 @@ let # { = { name = "..."; propagatedBuildInputs = [ ... ]; buildInputs = [ ... ]; } } allPlugins = lib.mapAttrs (name: value: value // { inherit name; }) ( - import ./plugins.nix { inherit pkgs python; } + import ./plugins.nix { inherit pkgs python3; } ); # [ { name = "..."; propagatedBuildInputs = [ ... ]; buildInputs = [ ... ]; } ] selectedPlugins = plugins allPlugins; in -python.pkgs.buildPythonPackage { +python3.pkgs.buildPythonPackage { pname = "bumblebee-status"; inherit version; @@ -42,7 +42,7 @@ python.pkgs.buildPythonPackage { buildInputs = lib.concatMap (p: p.buildInputs or [ ]) selectedPlugins; propagatedBuildInputs = lib.concatMap (p: p.propagatedBuildInputs or [ ]) selectedPlugins; - checkInputs = with python.pkgs; [ + checkInputs = with python3.pkgs; [ freezegun netifaces psutil @@ -60,7 +60,7 @@ python.pkgs.buildPythonPackage { # FIXME: We skip the `dunst` module tests, some of which fail with # `RuntimeError: killall -s SIGUSR2 dunst not found`. # This is not solved by adding `pkgs.killall` to `checkInputs`. - ${python.interpreter} -m pytest -k 'not test_dunst.py' + ${python3.interpreter} -m pytest -k 'not test_dunst.py' runHook postCheck ''; @@ -70,7 +70,7 @@ python.pkgs.buildPythonPackage { find $out -name "__pycache__" -type d | xargs rm -rv # Make themes available for bumblebee-status to detect them - cp -r ./themes $out/${python.sitePackages} + cp -r ./themes $out/${python3.sitePackages} ''; meta = with lib; { diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index cea706f8e84f..c9cbe06ba560 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/PandorasFox/i3lock-color"; maintainers = with maintainers; [ malyn ]; + mainProgram = "i3lock-color"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index be926cdc5a82..13f192272038 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://stumpwm.github.io/"; license = lib.licenses.gpl2Plus; mainProgram = "stumpwm"; - maintainers = lib.teams.lisp.members; + teams = [ lib.teams.lisp ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/window-managers/wayfire/firedecor.nix b/pkgs/applications/window-managers/wayfire/firedecor.nix index 573a78abb0bc..f0fbd1f85cd1 100644 --- a/pkgs/applications/window-managers/wayfire/firedecor.nix +++ b/pkgs/applications/window-managers/wayfire/firedecor.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/mntmn/Firedecor"; description = "Advanced window decoration plugin for the Wayfire window manager"; license = licenses.mit; - inherit (mate.mate-wayland-session.meta) maintainers; + inherit (mate.mate-wayland-session.meta) teams; inherit (wayfire.meta) platforms; }; }) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 30ecf4fa09f7..9d72bfe6ed98 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -247,6 +247,7 @@ rec { libsecret # For bitwarden libmpg123 # Slippi launcher + brotli # TwitchDropsMiner ]; }; } diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 195a7091242a..4618b1cbba52 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -492,7 +492,7 @@ stdenvNoCC.mkDerivation { darwinMinVersionVariable ; } - // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) { + // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) { # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`. fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk; }; diff --git a/pkgs/build-support/build-typst-package.nix b/pkgs/build-support/build-typst-package.nix new file mode 100644 index 000000000000..13e1ddd2537c --- /dev/null +++ b/pkgs/build-support/build-typst-package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenvNoCC, +}: + +/** + `buildTypstPackage` is a helper builder for typst packages. + + # Inputs + + `attrs` + : attrs for stdenvNoCC.mkDerivation + typstDeps (a list of `buildTypstPackage` derivations) + + # Example + ```nix + { buildTypstPackage, typstPackages }: + + buildTypstPackage { + pname = "example"; + version = "0.0.1"; + src = ./.; + typstDeps = with typstPackages; [ oxifmt ]; + } + ``` +*/ + +lib.extendMkDerivation { + constructDrv = stdenvNoCC.mkDerivation; + + excludeDrvArgNames = [ + "typstDeps" + ]; + + extendDrvArgs = + finalAttrs: + { + typstDeps ? [ ], + ... + }@attrs: + { + name = "typst-package-${finalAttrs.pname}-${finalAttrs.version}"; + + dontBuild = true; + + installPhase = + let + outDir = "$out/lib/typst-packages/${finalAttrs.pname}/${finalAttrs.version}"; + in + '' + runHook preInstall + mkdir -p ${outDir} + cp -r . ${outDir} + runHook postInstall + ''; + + propagatedBuildInputs = typstDeps; + + passthru = { + inherit typstDeps; + }; + }; +} diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh index 039263e9aaca..b56bb39c97a9 100644 --- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh +++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh @@ -1,4 +1,4 @@ -needsTarget=true +targetPassed=false targetValue="" declare -i n=0 @@ -14,22 +14,20 @@ while (("$n" < "$nParams")); do echo "Error: -target requires an argument" >&2 exit 1 fi - needsTarget=false + targetPassed=true targetValue=$v # skip parsing the value of -target n+=1 ;; --target=*) - needsTarget=false + targetPassed=true targetValue="${p#*=}" ;; esac done -if ! $needsTarget && [[ "$targetValue" != "@defaultTarget@" ]]; then +if $targetPassed && [[ "$targetValue" != "@defaultTarget@" ]] && (( "${NIX_CC_WRAPPER_SUPPRESS_TARGET_WARNING:-0}" < 1 )); then echo "Warning: supplying the --target $targetValue != @defaultTarget@ argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2 -fi - -if $needsTarget && [[ $0 != *cpp ]]; then +elif [[ $0 != *cpp ]]; then extraBefore+=(-target @defaultTarget@ @machineFlags@) fi diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 2c3dc8884023..90b6d9b04adc 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -30,7 +30,7 @@ done # Arocc does not support "-B" if [[ -z "@isArocc@" ]]; then # `-B@bintools@/bin' forces cc to use ld-wrapper.sh when calling ld. - NIX_CFLAGS_COMPILE_@suffixSalt@="-B@bintools@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@" + NIX_CFLAGS_COMPILE_@suffixSalt@="-B@bintools@/bin/@bintools_targetPrefix@ $NIX_CFLAGS_COMPILE_@suffixSalt@" fi # Export and assign separately in order that a failing $(..) will fail diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 4440d99ccaba..9fed30303ab8 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -32,7 +32,7 @@ if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then fi if (( "${NIX_DEBUG:-0}" >= 1 )); then - declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection pacret pie pic strictoverflow format trivialautovarinit zerocallusedregs) + declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret pie pic strictoverflow format trivialautovarinit zerocallusedregs) declare -A hardeningDisableMap=() # Determine which flags were effectively disabled so we can report below. @@ -91,6 +91,10 @@ for flag in "${!hardeningEnableMap[@]}"; do if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stack-clash-protection >&2; fi hardeningCFlagsBefore+=('-fstack-clash-protection') ;; + nostrictaliasing) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling nostrictaliasing >&2; fi + hardeningCFlagsBefore+=('-fno-strict-aliasing') + ;; pie) # NB: we do not use `+=` here, because PIE flags must occur before any PIC flags if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 692474d48c42..b9df3fc1b2b0 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -745,9 +745,17 @@ stdenvNoCC.mkDerivation { # no `/usr/include`, there’s essentially no risk to dropping # the flag there. See discussion in NixOS/nixpkgs#191152. # - + optionalString ((cc.isClang or false) && !(cc.isROCm or false) && !targetPlatform.isDarwin) '' - echo " -nostdlibinc" >> $out/nix-support/cc-cflags - '' + + + optionalString + ( + (cc.isClang or false) + && !(cc.isROCm or false) + && !targetPlatform.isDarwin + && !targetPlatform.isAndroid + ) + '' + echo " -nostdlibinc" >> $out/nix-support/cc-cflags + '' ## ## Man page and info support @@ -872,6 +880,7 @@ stdenvNoCC.mkDerivation { cc = optionalString (!nativeTools) cc; wrapperName = "CC_WRAPPER"; inherit suffixSalt coreutils_bin bintools; + bintools_targetPrefix = bintools.targetPrefix; inherit libc_bin libc_dev libc_lib; inherit darwinPlatformForCC; default_hardening_flags_str = builtins.toString defaultHardeningFlags; @@ -880,7 +889,7 @@ stdenvNoCC.mkDerivation { # These will become empty strings when not targeting Darwin. inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable; } - // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) { + // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) { # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`. fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk; }; diff --git a/pkgs/build-support/coq/meta-fetch/default.nix b/pkgs/build-support/coq/meta-fetch/default.nix index cc435b299cfd..84819993c48a 100644 --- a/pkgs/build-support/coq/meta-fetch/default.nix +++ b/pkgs/build-support/coq/meta-fetch/default.nix @@ -148,14 +148,15 @@ switch arg [ in { version = rv.version or v; - src = rv.src or fetcher ( - location - // { - rev = releaseRev v; - artifact = releaseArtifact v; - } - // rv - ); + src = + rv.src or (fetcher ( + location + // { + rev = releaseRev v; + artifact = releaseArtifact v; + } + // rv + )); }; } { diff --git a/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py b/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py index b3cd3e511f09..879acc5f4acb 100644 --- a/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py +++ b/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py @@ -60,7 +60,7 @@ for pname in depsDict: command = ["nix-prefetch-git", strippedRepo, version] rawRes = subprocess.run(command, check=True, text=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL).stdout sha256 = json.loads(rawRes)["sha256"] - lockedDepsDict[pname] = {"version": version, "repository": repository, "sha256": sha256} + lockedDepsDict[pname] = {"version": version, "repository": strippedRepo, "sha256": sha256} else: eprint(f"Fetching {pname}@{version}") url = f"https://code.dlang.org/packages/{pname}/{version}.zip" diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ca3692029181..09096dfc78a2 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -392,6 +392,7 @@ rec { postMount = '' echo "Packing raw image..." + mkdir -p $out tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . ''; diff --git a/pkgs/build-support/dotnet/auto-patchcil-hook/auto-patchcil.sh b/pkgs/build-support/dotnet/auto-patchcil-hook/auto-patchcil.sh new file mode 100644 index 000000000000..898ad68cb969 --- /dev/null +++ b/pkgs/build-support/dotnet/auto-patchcil-hook/auto-patchcil.sh @@ -0,0 +1,118 @@ +#!@shell@ +# shellcheck shell=bash + +declare -a autoPatchcilLibs +declare -a extraAutoPatchcilLibs + +gatherLibraries() { + if [ -d "$1/lib" ]; then + autoPatchcilLibs+=("$1/lib") + fi +} + +addEnvHooks "${targetOffset:?}" gatherLibraries + +# Can be used to manually add additional directories with shared object files +# to be included for the next autoPatchcil invocation. +addAutoPatchcilSearchPath() { + local -a findOpts=() + + while [ $# -gt 0 ]; do + case "$1" in + --) + shift + break + ;; + --no-recurse) + shift + findOpts+=("-maxdepth" 1) + ;; + --*) + echo "addAutoPatchcilSearchPath: ERROR: Invalid command line" \ + "argument: $1" >&2 + return 1 + ;; + *) break ;; + esac + done + + local dir= + while IFS= read -r -d '' dir; do + extraAutoPatchcilLibs+=("$dir") + done < <( + find "$@" "${findOpts[@]}" \! -type d \ + \( -name '*.so' -o -name '*.so.*' \) -print0 | + sed -z 's#/[^/]*$##' | + uniq -z + ) +} + +autoPatchcil() { + local rid= + local norecurse= + while [ $# -gt 0 ]; do + case "$1" in + --) + shift + break + ;; + --rid) + rid="$2" + shift 2 + ;; + --no-recurse) + shift + norecurse=1 + ;; + --*) + echo "autoPatchcil: ERROR: Invalid command line" \ + "argument: $1" >&2 + return 1 + ;; + *) break ;; + esac + done + + if [ -z "$rid" ]; then + echo "autoPatchcil: ERROR: No RID (Runtime ID) provided." >&2 + return 1 + fi + + local ignoreMissingDepsArray=("--ignore-missing") + concatTo ignoreMissingDepsArray autoPatchcilIgnoreMissingDeps + + if [ ${#ignoreMissingDepsArray[@]} -lt 2 ]; then + ignoreMissingDepsArray=() + fi + + local autoPatchcilFlags=( + ${norecurse:+--no-recurse} + --rid "$rid" + "${ignoreMissingDepsArray[@]}" + --paths "$@" + --libs "${autoPatchcilLibs[@]}" + ) + + # shellcheck disable=SC2016 + echoCmd 'patchcil auto flags' "${autoPatchcilFlags[@]}" + @patchcil@ auto "${autoPatchcilFlags[@]}" +} + +autoPatchcilFixupOutput() { + if [[ -z "${dontAutoPatchcil-}" ]]; then + if [ -n "${dotnetRuntimeIds+x}" ]; then + if [[ -n $__structuredAttrs ]]; then + local dotnetRuntimeIdsArray=("${dotnetRuntimeIds[@]}") + else + # shellcheck disable=SC2206 # Intentionally expanding it to preserve old behavior + local dotnetRuntimeIdsArray=($dotnetRuntimeIds) + fi + else + local dotnetRuntimeIdsArray=("") + fi + + autoPatchcil --rid "${autoPatchcilRuntimeId:-${dotnetRuntimeIdsArray[0]}}" -- "${prefix:?}" + fi +} + +fixupOutputHooks+=(autoPatchcilFixupOutput) diff --git a/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix b/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix new file mode 100644 index 000000000000..cbe9105e6115 --- /dev/null +++ b/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix @@ -0,0 +1,14 @@ +{ + lib, + bash, + patchcil, + makeSetupHook, +}: + +makeSetupHook { + name = "auto-patchcil-hook"; + substitutions = { + shell = lib.getExe bash; + patchcil = lib.getExe patchcil; + }; +} ./auto-patchcil.sh diff --git a/pkgs/build-support/dotnet/dotnetenv/Wrapper/.editorconfig b/pkgs/build-support/dotnet/dotnetenv/Wrapper/.editorconfig new file mode 100644 index 000000000000..15ffe1f4b563 --- /dev/null +++ b/pkgs/build-support/dotnet/dotnetenv/Wrapper/.editorconfig @@ -0,0 +1,5 @@ +[*] +end_of_line = unset +indent_style = unset +insert_final_newline = unset +trim_trailing_whitespace = unset diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index e112703773cd..569a67182844 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -6,7 +6,9 @@ echo "exporting $url (rev $rev) into $out" -$SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ +runHook preFetch + +$SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" --name "$name" \ ${leaveDotGit:+--leave-dotGit} \ ${fetchLFS:+--fetch-lfs} \ ${deepClone:+--deepClone} \ diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 5145aa83116f..1da8d2591c5b 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -38,6 +38,11 @@ lib.makeOverridable ( nonConeMode ? false, name ? null, nativeBuildInputs ? [ ], + # Shell code executed before the file has been fetched. This, in + # particular, can do things like set NIX_PREFETCH_GIT_CHECKOUT_HOOK to + # run operations between the checkout completing and deleting the .git + # directory. + preFetch ? "", # Shell code executed after the file has been fetched # successfully. This can do things like check or transform the file. postFetch ? "", @@ -75,7 +80,6 @@ lib.makeOverridable ( server admins start using the new version? */ - assert deepClone -> leaveDotGit; assert nonConeMode -> (sparseCheckout != [ ]); let @@ -130,6 +134,7 @@ lib.makeOverridable ( deepClone branchName nonConeMode + preFetch postFetch ; rev = revWithTag; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 69f35dc3bea0..7ba7fa568cd6 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -47,6 +47,7 @@ Options: --url url Any url understood by 'git clone'. --rev ref Any sha1 or references (such as refs/heads/master) --hash h Expected hash. + --name n Symbolic store path name to use for the result (default: based on URL) --branch-name Branch name to check out into --sparse-checkout Only fetch and checkout part of the repository. --non-cone-mode Use non-cone mode for sparse checkouts. @@ -75,6 +76,7 @@ for arg; do --url) argfun=set_url;; --rev) argfun=set_rev;; --hash) argfun=set_hashType;; + --name) argfun=set_symbolicName;; --branch-name) argfun=set_branchName;; --deepClone) deepClone=true;; --sparse-checkout) argfun=set_sparseCheckout;; @@ -424,6 +426,12 @@ if test -z "$branchName"; then branchName=fetchgit fi +if [ -v symbolicName ]; then + storePathName="$symbolicName" +else + storePathName="$(url_to_name "$url" "$rev")" +fi + tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")" exit_handlers+=(remove_tmpHomePath) ln -s "${NETRC:-$HOME/.netrc}" "$tmpHomePath/.netrc" @@ -443,7 +451,7 @@ else # If the hash was given, a file with that hash may already be in the # store. if test -n "$expHash"; then - finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$(url_to_name "$url" "$rev")") + finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$storePathName") if ! nix-store --check-validity "$finalPath" 2> /dev/null; then finalPath= fi @@ -458,7 +466,7 @@ else tmpPath="$(realpath "$(mktemp -d --tmpdir git-checkout-tmp-XXXXXXXX)")" exit_handlers+=(remove_tmpPath) - tmpFile="$tmpPath/$(url_to_name "$url" "$rev")" + tmpFile="$tmpPath/$storePathName" mkdir -p "$tmpFile" # Perform the checkout. diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix index 577de59ff868..e26917a4f673 100644 --- a/pkgs/build-support/fetchgit/tests.nix +++ b/pkgs/build-support/fetchgit/tests.nix @@ -34,7 +34,7 @@ name = "leave-git-nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; - sha256 = "sha256-3YYVIeaeu6zO7bBkZxF+1d5VS0K2GHYEZwChB3tPJ4s="; + sha256 = "sha256-VmQ38+lr+rNPaTnjjV41uC2XSN4fkfZAfytE2uKyLfo="; leaveDotGit = true; }; @@ -50,7 +50,7 @@ name = "submodule-leave-git-source"; url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; - sha256 = "sha256-0pwleO/m4Iws3BF9ewyWbYMcGfEJLS3BYzWfDSYtXs8="; + sha256 = "sha256-EC2PMEEtA7f5OFdsluHn7pi4QXhCZuFML8tib4pV7Ek="; leaveDotGit = true; fetchSubmodules = true; }; @@ -59,16 +59,19 @@ name = "submodule-deep-source"; url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; - sha256 = "sha256-eRHOwolRZDJS/5zk88e7SdoO7nKKtjDXMLVsyFPFgk8="; + sha256 = "sha256-3zWogs6EZBnzUfz6gBnigETTKGYl9KFKFgsy6Bl4DME="; deepClone = true; fetchSubmodules = true; + # deepClone implies leaveDotGit, so delete the .git directory after + # fetching to distinguish from the submodule-leave-git-deep test. + postFetch = "rm -r $out/.git"; }; submodule-leave-git-deep = testers.invalidateFetcherByDrvHash fetchgit { name = "submodule-leave-git-deep-source"; url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; - sha256 = "sha256-eRHOwolRZDJS/5zk88e7SdoO7nKKtjDXMLVsyFPFgk8="; + sha256 = "sha256-ieYn9I/0RgeSwQkSqwKaU3RgjKFlRqMg7zw0Nvu3azA="; deepClone = true; leaveDotGit = true; fetchSubmodules = true; diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index ccc079b70204..31f35c0568d3 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -16,6 +16,7 @@ description ? null, homepage ? null, maintainers ? [ ], + teams ? [ ], unpack ? false, # whether to use fetchzip rather than fetchurl }: applyPatches ( @@ -27,7 +28,7 @@ applyPatches ( { license = lib.licenses.${license}; longDescription = description; - inherit homepage maintainers; + inherit homepage maintainers teams; } // lib.optionalAttrs (description != null) { longDescription = description; diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 9575d98960fe..c0e53ba637a7 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -222,7 +222,7 @@ stdenvNoCC.mkDerivation ( # If set, prefer the content-addressable mirrors # (http://tarballs.nixos.org) over the original URLs. - preferHashedMirrors = true; + preferHashedMirrors = false; # New-style output content requirements. inherit (hash_) outputHashAlgo outputHash; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index ea6ee11b23b3..731ad0104206 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -215,13 +215,19 @@ # SAMBA samba = [ - "https://www.samba.org/ftp/" - "http://www.samba.org/ftp/" + "https://download.samba.org/pub/" + "http://download.samba.org/pub/" ]; # GNU Savannah savannah = [ - # Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html + # Try the official HTTP(S) dispatchers first. + # These generate redirects to mirrors appropriate for the user. + "https://download.savannah.gnu.org/releases/" + "https://download.savannah.nongnu.org/releases/" + + # If the above fail, try some individual mirrors. + # These are taken from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html "https://mirror.easyname.at/nongnu/" "https://savannah.c3sl.ufpr.br/" "https://mirror.csclub.uwaterloo.ca/nongnu/" diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index db494fc82b27..9b692b4f6dec 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -37,6 +37,9 @@ lib.extendMkDerivation { "buildGoModule: vendorHash is missing" ), + # The go.sum file to track which can cause rebuilds. + goSum ? null, + # Whether to delete the vendor folder supplied with the source. deleteVendor ? false, @@ -69,13 +72,24 @@ lib.extendMkDerivation { vendorHash deleteVendor proxyVendor + goSum ; goModules = if (finalAttrs.vendorHash == null) then "" else (stdenv.mkDerivation { - name = "${finalAttrs.name or "${finalAttrs.pname}-${finalAttrs.version}"}-go-modules"; + name = + let + prefix = "${finalAttrs.name or "${finalAttrs.pname}-${finalAttrs.version}"}-"; + + # If "goSum" is supplied then it can cause "goModules" to rebuild. + # Attach the hash name of the "go.sum" file so we can rebuild when it changes. + suffix = lib.optionalString ( + finalAttrs.goSum != null + ) "-${(lib.removeSuffix "-go.sum" (lib.removePrefix "${builtins.storeDir}/" finalAttrs.goSum))}"; + in + "${prefix}go-modules${suffix}"; nativeBuildInputs = (finalAttrs.nativeBuildInputs or [ ]) ++ [ go @@ -83,7 +97,7 @@ lib.extendMkDerivation { cacert ]; - inherit (finalAttrs) src modRoot; + inherit (finalAttrs) src modRoot goSum; # The following inheritance behavior is not trivial to expect, and some may # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and diff --git a/pkgs/build-support/kernel/make-initrd-ng-tool.nix b/pkgs/build-support/kernel/make-initrd-ng-tool.nix index 9097728fe7a9..c373530285c7 100644 --- a/pkgs/build-support/kernel/make-initrd-ng-tool.nix +++ b/pkgs/build-support/kernel/make-initrd-ng-tool.nix @@ -1,10 +1,6 @@ { rustPlatform, lib, - makeWrapper, - patchelf, - glibc, - binutils, }: rustPlatform.buildRustPackage { diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix index 4d2ad14a023b..da2941cdd6f2 100644 --- a/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/pkgs/build-support/kernel/make-initrd-ng.nix @@ -20,8 +20,6 @@ in # Name of the derivation (not of the resulting file!) name ? "initrd", - strip ? true, - # Program used to compress the cpio archive; use "cat" for no compression. # This can also be a function which takes a package set and returns the path to the compressor, # such as `pkgs: "${pkgs.lzop}/bin/lzop"`. @@ -95,15 +93,10 @@ runCommand name passAsFile = [ "contents" ]; contents = builtins.toJSON contents; - nativeBuildInputs = - [ - makeInitrdNGTool - cpio - ] - ++ lib.optional makeUInitrd ubootTools - ++ lib.optional strip binutils; - - STRIP = if strip then "${pkgsBuildHost.binutils.targetPrefix}strip" else null; + nativeBuildInputs = [ + makeInitrdNGTool + cpio + ] ++ lib.optional makeUInitrd ubootTools; }) '' mkdir -p ./root/var/empty diff --git a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock index ce5f5ef00971..67f72276575e 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock +++ b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "eyre" @@ -35,6 +35,12 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "libc" +version = "0.2.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" + [[package]] name = "log" version = "0.4.21" @@ -47,6 +53,7 @@ version = "0.1.0" dependencies = [ "eyre", "goblin", + "libc", "serde", "serde_json", ] diff --git a/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml b/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml index 69081b94d892..bdcdffd80195 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml +++ b/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml @@ -9,5 +9,6 @@ edition = "2018" [dependencies] eyre = "0.6.8" goblin = "0.5.0" +libc = "0.2.171" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs index 934c2faebed8..85449c7eb027 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs +++ b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs @@ -5,9 +5,12 @@ use std::fs; use std::hash::Hash; use std::iter::FromIterator; use std::os::unix; +use std::os::unix::fs::PermissionsExt; use std::path::{Component, Path, PathBuf}; use std::process::Command; +use libc::umask; + use eyre::Context; use goblin::{elf::Elf, Object}; use serde::Deserialize; @@ -186,27 +189,6 @@ fn copy_file< if let Ok(Object::Elf(e)) = Object::parse(&contents) { add_dependencies(source, e, &contents, &dlopen, queue)?; - - // Make file writable to strip it - let mut permissions = fs::metadata(&target) - .wrap_err_with(|| format!("failed to get metadata for {:?}", target))? - .permissions(); - permissions.set_readonly(false); - fs::set_permissions(&target, permissions) - .wrap_err_with(|| format!("failed to set readonly flag to false for {:?}", target))?; - - // Strip further than normal - if let Ok(strip) = env::var("STRIP") { - if !Command::new(strip) - .arg("--strip-all") - .arg(OsStr::new(&target)) - .output()? - .status - .success() - { - println!("{:?} was not successfully stripped.", OsStr::new(&target)); - } - } }; Ok(()) @@ -335,6 +317,9 @@ fn main() -> eyre::Result<()> { let output = &args[2]; let out_path = Path::new(output); + // The files we create should not be writable. + unsafe { umask(0o022) }; + let mut queue = NonRepeatingQueue::::new(); for sp in input { diff --git a/pkgs/build-support/make-hardcode-gsettings-patch/default.nix b/pkgs/build-support/make-hardcode-gsettings-patch/default.nix index e63e5976f3eb..b803bd97eacf 100644 --- a/pkgs/build-support/make-hardcode-gsettings-patch/default.nix +++ b/pkgs/build-support/make-hardcode-gsettings-patch/default.nix @@ -27,6 +27,10 @@ For example, `{ "org.gnome.evolution" = "EVOLUTION_SCHEMA_PATH"; }` hardcodes looking for `org.gnome.evolution` into `@EVOLUTION_SCHEMA_PATH@`. + - `schemaExistsFunction`: name of the function that is used for checking + if optional schema exists. Its invocation will be replaced with TRUE + for known schemas. + - `patches`: A list of patches to apply before generating the patch. Example: @@ -54,6 +58,7 @@ src, patches ? [ ], schemaIdToVariableMapping, + schemaExistsFunction ? null, }: runCommand "hardcode-gsettings.patch" @@ -71,6 +76,7 @@ runCommand "hardcode-gsettings.patch" patchPhase set -x cp ${builtins.toFile "glib-schema-to-var.json" (builtins.toJSON schemaIdToVariableMapping)} ./glib-schema-to-var.json + cp ${builtins.toFile "glib-schema-exists-function.json" (builtins.toJSON schemaExistsFunction)} ./glib-schema-exists-function.json git init git add -A spatch --sp-file "${./hardcode-gsettings.cocci}" --dir . --in-place diff --git a/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci b/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci index e916d74fd1f5..ceee9a657610 100644 --- a/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci +++ b/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci @@ -34,6 +34,17 @@ def get_schema_directory(schema_id): return f'"@{schema_to_var[schema_id]}@"' raise Exception(f"Unknown schema path {schema_id!r}, please add it to ./glib-schema-to-var.json") + +@script:python schema_exists_fn@ +fn; +@@ +import json + +with open("./glib-schema-exists-function.json") as fn_file: + if (fn := json.load(fn_file)): + coccinelle.fn = fn + + @find_cpp_constants@ identifier const_name; expression val; @@ -143,3 +154,12 @@ fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_ID) { get_schema_direct + schema = g_settings_schema_source_lookup(schema_source, SCHEMA_ID, FALSE); + settings = g_settings_new_full(schema, NULL, PATH); +} + + +@replace_schema_exists_fns depends on ever record_cpp_constants || never record_cpp_constants@ +// We want to run after #define constants have been collected but even if there are no #defines. +expression SCHEMA_ID; +identifier schema_exists_fn.fn; +@@ +-fn(SCHEMA_ID) ++true diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix deleted file mode 100644 index e3f89bacf54c..000000000000 --- a/pkgs/build-support/mitm-cache/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - callPackage, - rustPlatform, - replaceVars, - openssl, - Security, - python3Packages, -}: - -rustPlatform.buildRustPackage rec { - pname = "mitm-cache"; - version = "0.1.2"; - - src = fetchFromGitHub { - owner = "chayleaf"; - repo = "mitm-cache"; - rev = "v${version}"; - hash = "sha256-eY8mgmQB8wXQ7YJbLvdjXEEgGD+/RDywjvehJYf7ckE="; - }; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - - useFetchCargoVendor = true; - cargoHash = "sha256-DTPlPCumkVI2naYoNdO8T3pQNSawBA0FZ9LxVpqKqN0="; - - setupHook = replaceVars ./setup-hook.sh { - inherit openssl; - ephemeral_port_reserve = python3Packages.ephemeral-port-reserve; - }; - - passthru.fetch = callPackage ./fetch.nix { }; - - meta = with lib; { - description = "A MITM caching proxy for use in nixpkgs"; - homepage = "https://github.com/chayleaf/mitm-cache#readme"; - license = licenses.mit; - maintainers = with maintainers; [ chayleaf ]; - mainProgram = "mitm-cache"; - }; -} diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 747043e3d12a..69181aee399c 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -103,6 +103,16 @@ lib.extendMkDerivation { # Stripping takes way too long with the amount of files required by a typical Node.js project. dontStrip = args.dontStrip or true; + env = { + npm_config_arch = + { + "x86_64" = "x64"; + "aarch64" = "arm64"; + } + .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name; + npm_config_platform = stdenv.hostPlatform.parsed.kernel.name; + } // (args.env or { }); + meta = (args.meta or { }) // { platforms = args.meta.platforms or nodejs.meta.platforms; }; diff --git a/pkgs/build-support/node/fetch-yarn-deps/common.js b/pkgs/build-support/node/fetch-yarn-deps/common.js index 8e0d1b0e470b..95dab609a855 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/common.js +++ b/pkgs/build-support/node/fetch-yarn-deps/common.js @@ -5,7 +5,9 @@ const path = require('path') const urlToName = url => { const isCodeloadGitTarballUrl = url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/') - if (url.startsWith('git+') || isCodeloadGitTarballUrl) { + if (url.startsWith('file:')) { + return url + } else if (url.startsWith('git+') || isCodeloadGitTarballUrl) { return path.basename(url) } else { return url diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix index 11497db66ecb..16cdee665d0d 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -18,7 +18,6 @@ makeSetupHook, cacert, callPackage, - nixForLinking, }: let @@ -55,7 +54,6 @@ in lib.makeBinPath [ coreutils nix-prefetch-git - nixForLinking ] } diff --git a/pkgs/build-support/node/import-npm-lock/default.nix b/pkgs/build-support/node/import-npm-lock/default.nix index 7442d48bad16..d80643d60a32 100644 --- a/pkgs/build-support/node/import-npm-lock/default.nix +++ b/pkgs/build-support/node/import-npm-lock/default.nix @@ -27,7 +27,7 @@ let fetcherOpts, }: ( - if module ? "resolved" then + if module ? "resolved" && module.resolved != null then ( let # Parse scheme from URL diff --git a/pkgs/build-support/rust/fetch-cargo-vendor-util.py b/pkgs/build-support/rust/fetch-cargo-vendor-util.py index 6f2f76725601..183b587c4217 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor-util.py +++ b/pkgs/build-support/rust/fetch-cargo-vendor-util.py @@ -7,6 +7,7 @@ import shutil import subprocess import sys import tomllib +from os.path import islink, realpath from pathlib import Path from typing import Any, TypedDict, cast from urllib.parse import unquote @@ -194,11 +195,41 @@ def find_crate_manifest_in_tree(tree: Path, crate_name: str) -> Path: def copy_and_patch_git_crate_subtree(git_tree: Path, crate_name: str, crate_out_dir: Path) -> None: + + # This function will get called by copytree to decide which entries of a directory should be copied + # We'll copy everything except symlinks that are invalid + def ignore_func(dir_str: str, path_strs: list[str]) -> list[str]: + ignorelist: list[str] = [] + + dir = Path(realpath(dir_str, strict=True)) + + for path_str in path_strs: + path = dir / path_str + if not islink(path): + continue + + # Filter out cyclic symlinks and symlinks pointing at nonexistant files + try: + target_path = Path(realpath(path, strict=True)) + except OSError: + ignorelist.append(path_str) + eprint(f"Failed to resolve symlink, ignoring: {path}") + continue + + # Filter out symlinks that point outside of the current crate's base git tree + # This can be useful if the nix build sandbox is turned off and there is a symlink to a common absolute path + if not target_path.is_relative_to(git_tree): + ignorelist.append(path_str) + eprint(f"Symlink points outside of the crate's base git tree, ignoring: {path} -> {target_path}") + continue + + return ignorelist + crate_manifest_path = find_crate_manifest_in_tree(git_tree, crate_name) crate_tree = crate_manifest_path.parent eprint(f"Copying to {crate_out_dir}") - shutil.copytree(crate_tree, crate_out_dir, ignore_dangling_symlinks=True) + shutil.copytree(crate_tree, crate_out_dir, ignore=ignore_func) crate_out_dir.chmod(0o755) with open(crate_manifest_path, "r") as f: diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index 077ff80efe0b..d63cfb8c52b9 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -228,7 +228,7 @@ let echo Found crate ${pkg.name} at $crateCargoTOML tree=$(dirname $crateCargoTOML) - ${python3Packages.python.interpreter} -c 'import sys, shutil; shutil.copytree(sys.argv[1], sys.argv[2], ignore_dangling_symlinks=True)' "$tree" "$out" + cp -prvL "$tree" "$out" || echo "Warning: certain files couldn't be copied!" >&2 chmod u+w $out if grep -q workspace "$out/Cargo.toml"; then diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix index 105303201617..40dd67bb8302 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix @@ -1,21 +1,12 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "basic-dynamic"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; - cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; + cargoLock.lockFileContents = builtins.readFile ./package/Cargo.lock; doInstallCheck = true; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix index 203badd86755..5bf1f12ee6bb 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix @@ -1,23 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "basic-sparse"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./.cargo/config.toml - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; extraRegistries = { "sparse+https://index.crates.io/" = "https://static.crates.io/crates"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/.cargo/config.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/.cargo/config.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/.cargo/config.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/.cargo/config.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix index 325380977b88..7bcca6064f08 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix @@ -1,22 +1,13 @@ { lib, rustPlatform }: -let - fs = lib.fileset; -in + rustPlatform.buildRustPackage { pname = "basic"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; }; doInstallCheck = true; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/basic/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix index 3111c747d372..265c964ce0c9 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix @@ -1,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency-branch"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.4" = "1ilk9wvfw3mdm57g199ys8f5nrgdrh0n3a4c8b7nz6lgnqvfrv6z"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix index 5b1dcc1aef61..f9a314f49d7a 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix @@ -2,40 +2,26 @@ rustPlatform, pkg-config, openssl, - lib, - darwin, - stdenv, + zlib, }: -let - fs = lib.fileset; -in + rustPlatform.buildRustPackage { pname = "git-dependency-rev-non-workspace-nested-crate"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + zlib + ]; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "cargo-test-macro-0.1.0" = "1yy1y1d523xdzwg1gc77pigbcwsbawmy4b7vw8v21m7q957sk0c4"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix index d3cb0fa7df81..34eb36941576 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix @@ -1,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency-rev"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix index dfaa1e3028da..d0d267a40cae 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix @@ -1,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency-tag"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml index ec1331455bec..cd1cb594a769 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml @@ -12,8 +12,8 @@ keywords = [ bar = "1.0.0" [dependencies.foo] +version = "1.0.0" features = [ "cat", "meow", ] -version = "1.0.0" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix index 98aa35bf8e1d..5f1a060268bf 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix @@ -1,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix index b53b7113590c..9b9228e5696d 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix @@ -1,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "v1"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; }; doInstallCheck = true; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/v1/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/v1/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/v1/package/src/main.rs diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index cba158bd31ea..0fb5aac50a7a 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -22,10 +22,12 @@ assertExecutable() { # --unset VAR : remove VAR from the environment # --chdir DIR : change working directory (use instead of --run "cd DIR") # --run COMMAND : run command before the executable -# --add-flags ARGS : prepend ARGS to the invocation of the executable +# --add-flag ARG : prepend the single argument ARG to the invocation of the executable # (that is, *before* any arguments passed on the command line) -# --append-flags ARGS : append ARGS to the invocation of the executable +# --append-flag ARG : append the single argument ARG to the invocation of the executable # (that is, *after* any arguments passed on the command line) +# --add-flags ARGS : prepend ARGS verbatim to the Bash-interpreted invocation of the executable +# --append-flags ARGS : append ARGS verbatim to the Bash-interpreted invocation of the executable # --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP # --suffix @@ -164,6 +166,14 @@ makeShellWrapper() { contents="$(cat "$fileName")" addValue "$p" "$varName" "$separator" "$contents" done + elif [[ "$p" == "--add-flag" ]]; then + flags=${params[n + 1]@Q} + n=$((n + 1)) + flagsBefore="${flagsBefore-} $flags" + elif [[ "$p" == "--append-flag" ]]; then + flags=${params[n + 1]@Q} + n=$((n + 1)) + flagsAfter="${flagsAfter-} $flags" elif [[ "$p" == "--add-flags" ]]; then flags="${params[$((n + 1))]}" n=$((n + 1)) diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix index 66cafe07c058..b8d1ae8a6834 100644 --- a/pkgs/build-support/substitute-files/substitute-all-files.nix +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -2,27 +2,32 @@ args: -stdenv.mkDerivation ( - { - name = if args ? name then args.name else baseNameOf (toString args.src); - builder = builtins.toFile "builder.sh" '' - set -o pipefail +# TODO(@wolfgangwalther): Remove substituteAllFiles after 25.05 branch-off. +lib.warn + "substituteAllFiles is deprecated and will be removed in 25.11. Use replaceVars for each file instead." + ( + stdenv.mkDerivation ( + { + name = if args ? name then args.name else baseNameOf (toString args.src); + builder = builtins.toFile "builder.sh" '' + set -o pipefail - eval "$preInstall" + eval "$preInstall" - args= + args= - pushd "$src" - echo -ne "${lib.concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do - mkdir -p "$out/$(dirname "$line")" - substituteAll "$line" "$out/$line" - done - popd + pushd "$src" + echo -ne "${lib.concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do + mkdir -p "$out/$(dirname "$line")" + substituteAll "$line" "$out/$line" + done + popd - eval "$postInstall" - ''; - preferLocalBuild = true; - allowSubstitutes = false; - } - // args -) + eval "$postInstall" + ''; + preferLocalBuild = true; + allowSubstitutes = false; + } + // args + ) + ) diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index 7f8d55449472..1135c822e22d 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -6,21 +6,24 @@ let isInvalidArgName = x: builtins.match "^[a-z][a-zA-Z0-9_]*$" x == null; invalidArgs = builtins.filter isInvalidArgName (builtins.attrNames args); in -if invalidArgs == [ ] then - stdenvNoCC.mkDerivation ( - { - name = if args ? name then args.name else baseNameOf (toString args.src); - builder = ./substitute-all.sh; - inherit (args) src; - preferLocalBuild = true; - allowSubstitutes = false; - } - // args - ) -else - throw '' - Argument names for `pkgs.substituteAll` must: - - start with a lower case ASCII letter - - only contain ASCII letters, digits and underscores - Found invalid argument names: ${lib.concatStringsSep ", " invalidArgs}. - '' +# TODO(@wolfgangwalther): Remove substituteAll, the nix function, after 25.05 branch-off. +lib.warn "substituteAll is deprecated and will be removed in 25.11. Use replaceVars instead." ( + if invalidArgs == [ ] then + stdenvNoCC.mkDerivation ( + { + name = if args ? name then args.name else baseNameOf (toString args.src); + builder = ./substitute-all.sh; + inherit (args) src; + preferLocalBuild = true; + allowSubstitutes = false; + } + // args + ) + else + throw '' + Argument names for `pkgs.substituteAll` must: + - start with a lower case ASCII letter + - only contain ASCII letters, digits and underscores + Found invalid argument names: ${lib.concatStringsSep ", " invalidArgs}. + '' +) diff --git a/pkgs/build-support/testers/hasPkgConfigModules/tester.nix b/pkgs/build-support/testers/hasPkgConfigModules/tester.nix index b48e98be7d8c..1d9e3ff50986 100644 --- a/pkgs/build-support/testers/hasPkgConfigModules/tester.nix +++ b/pkgs/build-support/testers/hasPkgConfigModules/tester.nix @@ -32,6 +32,7 @@ runCommand testName insecure = throw "unused"; license = throw "unused"; maintainers = throw "unused"; + teams = throw "unused"; platforms = throw "unused"; unfree = throw "unused"; unsupported = throw "unused"; diff --git a/pkgs/build-support/testers/shellcheck/tester.nix b/pkgs/build-support/testers/shellcheck/tester.nix index 7d1a372a5a60..80b702382bc3 100644 --- a/pkgs/build-support/testers/shellcheck/tester.nix +++ b/pkgs/build-support/testers/shellcheck/tester.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation { dontConfigure = true; dontBuild = true; checkPhase = '' - find "$src" -type f -print0 | xargs -0 shellcheck + find "$src" -type f -print0 | xargs -0 shellcheck --source-path="$src" ''; installPhase = '' touch "$out" diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index c8a3e4a3a733..4be06b5c4913 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -367,17 +367,14 @@ rec { ''; checkPhase = - # GHC (=> shellcheck) isn't supported on some platforms (such as risc-v) - # but we still want to use writeShellApplication on those platforms let - shellcheckSupported = - lib.meta.availableOn stdenv.buildPlatform shellcheck-minimal.compiler - && (builtins.tryEval shellcheck-minimal.compiler.outPath).success; excludeFlags = lib.optionals (excludeShellChecks != [ ]) [ "--exclude" (lib.concatStringsSep "," excludeShellChecks) ]; - shellcheckCommand = lib.optionalString shellcheckSupported '' + # GHC (=> shellcheck) isn't supported on some platforms (such as risc-v) + # but we still want to use writeShellApplication on those platforms + shellcheckCommand = lib.optionalString shellcheck-minimal.compiler.bootstrapAvailable '' # use shellcheck which does not include docs # pandoc takes long to build and documentation isn't needed for just running the cli ${lib.getExe shellcheck-minimal} ${ @@ -1025,9 +1022,27 @@ rec { postPatch ? "", ... }@args: + assert lib.assertMsg ( + !args ? meta + ) "applyPatches will not merge 'meta', change it in 'src' instead"; + assert lib.assertMsg ( + !args ? passthru + ) "applyPatches will not merge 'passthru', change it in 'src' instead"; if patches == [ ] && prePatch == "" && postPatch == "" then src # nothing to do, so use original src to avoid additional drv else + let + keepAttrs = names: lib.filterAttrs (name: val: lib.elem name names); + # enables tools like nix-update to determine what src attributes to replace + extraPassthru = lib.optionalAttrs (lib.isAttrs src) ( + keepAttrs [ + "rev" + "tag" + "url" + "outputHash" + ] src + ); + in stdenvNoCC.mkDerivation ( { inherit @@ -1042,8 +1057,14 @@ rec { phases = "unpackPhase patchPhase installPhase"; installPhase = "cp -R ./ $out"; } - # Carry `meta` information from the underlying `src` if present. - // (optionalAttrs (src ? meta) { inherit (src) meta; }) + # Carry (and merge) information from the underlying `src` if present. + // (optionalAttrs (src ? meta) { + inherit (src) meta; + }) + // (optionalAttrs (extraPassthru != { } || src ? passthru) { + passthru = extraPassthru // src.passthru or { }; + }) + # Forward any additional arguments to the derviation // (removeAttrs args [ "src" "name" diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 95923cace296..fe2e42855e0e 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -984,277 +984,11 @@ rec { # The set of supported RPM-based distributions. - rpmDistros = { - - # Note: no i386 release for Fedora >= 26 - fedora26x86_64 = - let - version = "26"; - in - { - name = "fedora-${version}-x86_64"; - fullName = "Fedora ${version} (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "880055a50c05b20641530d09b23f64501a000b2f92fe252417c530178730a95e"; - }; - urlPrefix = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os"; - archs = [ - "noarch" - "x86_64" - ]; - packages = commonFedoraPackages ++ [ - "cronie" - "util-linux" - ]; - unifiedSystemDir = true; - }; - - fedora27x86_64 = - let - version = "27"; - in - { - name = "fedora-${version}-x86_64"; - fullName = "Fedora ${version} (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "48986ce4583cd09825c6d437150314446f0f49fa1a1bd62dcfa1085295030fe9"; - }; - urlPrefix = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os"; - archs = [ - "noarch" - "x86_64" - ]; - packages = commonFedoraPackages ++ [ - "cronie" - "util-linux" - ]; - unifiedSystemDir = true; - }; - - centos6i386 = - let - version = "6.9"; - in - rec { - name = "centos-${version}-i386"; - fullName = "CentOS ${version} (i386)"; - urlPrefix = "mirror://centos/${version}/os/i386"; - packagesList = fetchurl rec { - url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; - sha256 = "b826a45082ef68340325c0855f3d2e5d5a4d0f77d28ba3b871791d6f14a97aeb"; - }; - archs = [ - "noarch" - "i386" - ]; - packages = commonCentOSPackages ++ [ "procps" ]; - }; - - centos6x86_64 = - let - version = "6.9"; - in - rec { - name = "centos-${version}-x86_64"; - fullName = "CentOS ${version} (x86_64)"; - urlPrefix = "mirror://centos/${version}/os/x86_64"; - packagesList = fetchurl rec { - url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; - sha256 = "ed2b2d4ac98d774d4cd3e91467e1532f7e8b0275cfc91a0d214b532dcaf1e979"; - }; - archs = [ - "noarch" - "x86_64" - ]; - packages = commonCentOSPackages ++ [ "procps" ]; - }; - - # Note: no i386 release for 7.x - centos7x86_64 = - let - version = "7.4.1708"; - in - rec { - name = "centos-${version}-x86_64"; - fullName = "CentOS ${version} (x86_64)"; - urlPrefix = "mirror://centos/${version}/os/x86_64"; - packagesList = fetchurl rec { - url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; - sha256 = "b686d3a0f337323e656d9387b9a76ce6808b26255fc3a138b1a87d3b1cb95ed5"; - }; - archs = [ - "noarch" - "x86_64" - ]; - packages = commonCentOSPackages ++ [ "procps-ng" ]; - }; - }; + rpmDistros = { }; # The set of supported Dpkg-based distributions. debDistros = { - ubuntu1404i386 = { - name = "ubuntu-14.04-trusty-i386"; - fullName = "Ubuntu 14.04 Trusty (i386)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/trusty/main/binary-i386/Packages.bz2"; - sha256 = "1d5y3v3v079gdq45hc07ja0bjlmzqfwdwwlq0brwxi8m75k3iz7x"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/trusty/universe/binary-i386/Packages.bz2"; - sha256 = "03x9w92by320rfklrqhcl3qpwmnxds9c8ijl5zhcb21d6dcz5z1a"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu1404x86_64 = { - name = "ubuntu-14.04-trusty-amd64"; - fullName = "Ubuntu 14.04 Trusty (amd64)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/trusty/main/binary-amd64/Packages.bz2"; - sha256 = "1hhzbyqfr5i0swahwnl5gfp5l9p9hspywb1vpihr3b74p1z935bh"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2"; - sha256 = "04560ba8s4z4v5iawknagrkn9q1nzvpn081ycmqvhh73p3p3g1jm"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu1604i386 = { - name = "ubuntu-16.04-xenial-i386"; - fullName = "Ubuntu 16.04 Xenial (i386)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/xenial/main/binary-i386/Packages.xz"; - sha256 = "13r75sp4slqy8w32y5dnr7pp7p3cfvavyr1g7gwnlkyrq4zx4ahy"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/xenial/universe/binary-i386/Packages.xz"; - sha256 = "14fid1rqm3sc0wlygcvn0yx5aljf51c2jpd4x0zxij4019316hsh"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu1604x86_64 = { - name = "ubuntu-16.04-xenial-amd64"; - fullName = "Ubuntu 16.04 Xenial (amd64)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/xenial/main/binary-amd64/Packages.xz"; - sha256 = "110qnkhjkkwm316fbig3aivm2595ydz6zskc4ld5cr8ngcrqm1bn"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/xenial/universe/binary-amd64/Packages.xz"; - sha256 = "0mm7gj491yi6q4v0n4qkbsm94s59bvqir6fk60j73w7y4la8rg68"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu1804i386 = { - name = "ubuntu-18.04-bionic-i386"; - fullName = "Ubuntu 18.04 Bionic (i386)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/bionic/main/binary-i386/Packages.xz"; - sha256 = "0f0v4131kwf7m7f8j3288rlqdxk1k3vqy74b7fcfd6jz9j8d840i"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/bionic/universe/binary-i386/Packages.xz"; - sha256 = "1v75c0dqr0wp0dqd4hnci92qqs4hll8frqdbpswadgxm5chn91bw"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu1804x86_64 = { - name = "ubuntu-18.04-bionic-amd64"; - fullName = "Ubuntu 18.04 Bionic (amd64)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/bionic/main/binary-amd64/Packages.xz"; - sha256 = "1ls81bjyvmfz6i919kszl7xks1ibrh1xqhsk6698ackndkm0wp39"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/bionic/universe/binary-amd64/Packages.xz"; - sha256 = "1832nqpn4ap95b3sj870xqayrza9in4kih9jkmjax27pq6x15v1r"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu2004i386 = { - name = "ubuntu-20.04-focal-i386"; - fullName = "Ubuntu 20.04 Focal (i386)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/focal/main/binary-i386/Packages.xz"; - sha256 = "sha256-7RAYURoN3RKYQAHpwBS9TIV6vCmpURpphyMJQmV4wLc="; - }) - (fetchurl { - url = "mirror://ubuntu/dists/focal/universe/binary-i386/Packages.xz"; - sha256 = "sha256-oA551xVE80volUPgkMyvzpQ1d+GhuZd4DAe7dXZnULM="; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu2004x86_64 = { - name = "ubuntu-20.04-focal-amd64"; - fullName = "Ubuntu 20.04 Focal (amd64)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/focal/main/binary-amd64/Packages.xz"; - sha256 = "sha256-d1eSH/j+7Zw5NKDJk21EG6SiOL7j6myMHfXLzUP8mGE="; - }) - (fetchurl { - url = "mirror://ubuntu/dists/focal/universe/binary-amd64/Packages.xz"; - sha256 = "sha256-RqdG2seJvZU3rKVNsWgLnf9RwkgVMRE1A4IZnX2WudE="; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - ubuntu2204i386 = { name = "ubuntu-22.04-jammy-i386"; fullName = "Ubuntu 22.04 Jammy (i386)"; @@ -1315,28 +1049,6 @@ rec { ]; }; - debian10i386 = { - name = "debian-10.13-buster-i386"; - fullName = "Debian 10.13 Buster (i386)"; - packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-i386/Packages.xz"; - hash = "sha256-n9JquhtZgxw3qr9BX0MQoY3ZTIHN0dit+iru3DC31UY="; - }; - urlPrefix = "https://snapshot.debian.org/archive/debian/20221126T084953Z"; - packages = commonDebianPackages; - }; - - debian10x86_64 = { - name = "debian-10.13-buster-amd64"; - fullName = "Debian 10.13 Buster (amd64)"; - packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-amd64/Packages.xz"; - hash = "sha256-YukIIB3u87jgp9oudwklsxyKVKjSL618wFgDSXiFmjU="; - }; - urlPrefix = "https://snapshot.debian.org/archive/debian/20221126T084953Z"; - packages = commonDebianPackages; - }; - debian11i386 = { name = "debian-11.8-bullseye-i386"; fullName = "Debian 11.8 Bullseye (i386)"; diff --git a/pkgs/build-support/wasm-bindgen-cli/default.nix b/pkgs/build-support/wasm-bindgen-cli/default.nix index 40c120c14b79..1cdbd5d9906a 100644 --- a/pkgs/build-support/wasm-bindgen-cli/default.nix +++ b/pkgs/build-support/wasm-bindgen-cli/default.nix @@ -8,7 +8,6 @@ openssl, stdenv, curl, - darwin, }: { @@ -28,7 +27,6 @@ rustPlatform.buildRustPackage { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.Security ]; nativeCheckInputs = [ nodejs_latest ]; diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 47c35ef5448f..d0359bbc38dc 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -456,7 +456,7 @@ recurseIntoAttrs { ); }; - data = { + data = recurseIntoAttrs { json = expectDataEqual { file = writeJSON "data.json" { hello = "world"; }; expected = '' diff --git a/pkgs/build-support/xen/default.nix b/pkgs/build-support/xen/default.nix index 2c80d8ab1d8e..dd3a16de26ce 100644 --- a/pkgs/build-support/xen/default.nix +++ b/pkgs/build-support/xen/default.nix @@ -363,7 +363,7 @@ stdenv.mkDerivation (finalAttrs: { mit ]; - maintainers = teams.xen.members; + teams = [ teams.xen ]; knownVulnerabilities = optional (versionOlder version minSupportedVersion) "The Xen Project Hypervisor version ${version} is no longer supported by the Xen Project Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html"; mainProgram = "xl"; diff --git a/pkgs/by-name/_0/_010editor/package.nix b/pkgs/by-name/_0/_010editor/package.nix index 70864efa7750..2535cda85495 100644 --- a/pkgs/by-name/_0/_010editor/package.nix +++ b/pkgs/by-name/_0/_010editor/package.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "010editor"; - version = "15.0.1"; + version = "15.0.2"; src = if stdenv.hostPlatform.isLinux then fetchzip { url = "https://download.sweetscape.com/010EditorLinux64Installer${finalAttrs.version}.tar.gz"; - hash = "sha256-/Bfm/fPX3Szla23U9+qoq99E2v8jC3f9pgkJMTxNFUk="; + hash = "sha256-oXwC4criDox8rac7mnJroqxMNKU7k+y7JQqc88XoRFc="; } else fetchurl { url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg"; - hash = "sha256-hpDhcX1xS4Nry2HOIrFwqYK45JOmy66lPq6dJr9pkQg="; + hash = "sha256-RZtFV3AbE5KfzW18usW0FS/AnX8Uets/RkVayBAODQ4="; }; sourceRoot = "."; diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index 718f414bec9f..fbd1e8db8cc9 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -23,13 +23,13 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.30.3"; + version = "2.31.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-dXhmRl48Uk4T4947Dwz6ZkaRkZlmcADXKt/m6d1VNe8=" "zip"; - i686-linux = fetch "linux_386" "sha256-+B4fZ41DBe9TnIHOntBQDAvTYOckVwK5B+wwsIU6fAI=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-MsBSjJi7hJbS1wU3lVeywRrhGAZkoqxRb4FTg8fFN00=" "zip"; + aarch64-linux = fetch "linux_arm64" "sha256-l42h6mGqcb7Wy1ryXM0gxnt2fUUDr8+4nc9qIG0nDgc=" "zip"; + i686-linux = fetch "linux_386" "sha256-3oxBu0SAbWNgHZxirmKXm0Mk/uRZRPX/qCfYvkANTfM=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-hlktdQCGMtTIbd2j9x0aHKCIoIAydDj/caKaIWJfJTI=" "zip"; aarch64-darwin = - fetch "apple_universal" "sha256-RVng7huZfRRR99TLKwmmun6woSiIhM5YnaEfWgdPJr4=" + fetch "apple_universal" "sha256-PahPWQ4HpaOvEC1zda8X1Bft+8l/0qGWSJUEcfuWlxg=" "pkg"; x86_64-darwin = aarch64-darwin; }; @@ -80,7 +80,7 @@ stdenv.mkDerivation { doInstallCheck = true; versionCheckProgram = "${builtins.placeholder "out"}/bin/${mainProgram}"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru = { updateScript = ./update.sh; diff --git a/pkgs/by-name/_1/_1password-gui-beta/package.nix b/pkgs/by-name/_1/_1password-gui-beta/package.nix new file mode 100644 index 000000000000..e302dfbeab7b --- /dev/null +++ b/pkgs/by-name/_1/_1password-gui-beta/package.nix @@ -0,0 +1,4 @@ +{ _1password-gui, ... }: +_1password-gui.override { + channel = "beta"; +} diff --git a/pkgs/applications/misc/1password-gui/darwin.nix b/pkgs/by-name/_1/_1password-gui/darwin.nix similarity index 100% rename from pkgs/applications/misc/1password-gui/darwin.nix rename to pkgs/by-name/_1/_1password-gui/darwin.nix diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/by-name/_1/_1password-gui/linux.nix similarity index 100% rename from pkgs/applications/misc/1password-gui/linux.nix rename to pkgs/by-name/_1/_1password-gui/linux.nix diff --git a/pkgs/by-name/_1/_1password-gui/package.nix b/pkgs/by-name/_1/_1password-gui/package.nix new file mode 100644 index 000000000000..e4a9866ff3f2 --- /dev/null +++ b/pkgs/by-name/_1/_1password-gui/package.nix @@ -0,0 +1,63 @@ +{ + stdenv, + callPackage, + channel ? "stable", + fetchurl, + lib, + # This is only relevant for Linux, so we need to pass it through + polkitPolicyOwners ? [ ], +}: + +let + pname = "1password"; + + versions = builtins.fromJSON (builtins.readFile ./versions.json); + hostOs = if stdenv.hostPlatform.isLinux then "linux" else "darwin"; + version = versions."${channel}-${hostOs}" or (throw "unknown channel-os ${channel}-${hostOs}"); + + sources = builtins.fromJSON (builtins.readFile ./sources.json); + + src = fetchurl { + inherit + (sources.${channel}.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")) + url + hash + ; + }; + + meta = { + description = "Multi-platform password manager"; + homepage = "https://1password.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + khaneliman + timstott + savannidgerinel + sebtm + bdd + ]; + platforms = builtins.attrNames sources.${channel}; + mainProgram = "1password"; + }; + +in +if stdenv.hostPlatform.isDarwin then + callPackage ./darwin.nix { + inherit + pname + version + src + meta + ; + } +else + callPackage ./linux.nix { + inherit + pname + version + src + meta + polkitPolicyOwners + ; + } diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json new file mode 100644 index 000000000000..072a76f730b0 --- /dev/null +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -0,0 +1,38 @@ +{ + "stable": { + "x86_64-linux": { + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.76.x64.tar.gz", + "hash": "sha256-vEbmZP0WQ0Ha92V/owFKtxavahWMpV73vRiflZ1dpzQ=" + }, + "aarch64-linux": { + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.76.arm64.tar.gz", + "hash": "sha256-4GHFLlpThIJ5oAVgwXUAy4Gb0569RLXK1kdLErOr6j8=" + }, + "x86_64-darwin": { + "url": "https://downloads.1password.com/mac/1Password-8.10.76-x86_64.zip", + "hash": "sha256-hAIVQ7QVpZzQqW5ikCjp6HsskQWH5bbzM85DNyY0hFQ=" + }, + "aarch64-darwin": { + "url": "https://downloads.1password.com/mac/1Password-8.10.76-aarch64.zip", + "hash": "sha256-jfdtLBsd1IvntJHZOJ0pxIrwjIUOcG3thfyjTMNIMK4=" + } + }, + "beta": { + "x86_64-linux": { + "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.10.76-32.BETA.x64.tar.gz", + "hash": "sha256-149kU1CKQ0iLlD6O7jOjrcwwlxMdd5iAm53ILK2mv2o=" + }, + "aarch64-linux": { + "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.10.76-32.BETA.arm64.tar.gz", + "hash": "sha256-xHurzI8OcooSOCkQlSgtOH1Bgdur2oO1sNwKUOvSckA=" + }, + "x86_64-darwin": { + "url": "https://downloads.1password.com/mac/1Password-8.10.76-32.BETA-x86_64.zip", + "hash": "sha256-LgDl5DLUdn4bSRXrx11QOv0J6VXyns+KQgbU/Y0JxDU=" + }, + "aarch64-darwin": { + "url": "https://downloads.1password.com/mac/1Password-8.10.76-32.BETA-aarch64.zip", + "hash": "sha256-mJFuejGiUKV0PEJF8ajiL3cMRQTRghoaCRyP8afatgY=" + } + } +} diff --git a/pkgs/applications/misc/1password-gui/update.sh b/pkgs/by-name/_1/_1password-gui/update.sh similarity index 100% rename from pkgs/applications/misc/1password-gui/update.sh rename to pkgs/by-name/_1/_1password-gui/update.sh diff --git a/pkgs/by-name/_1/_1password-gui/versions.json b/pkgs/by-name/_1/_1password-gui/versions.json new file mode 100644 index 000000000000..93f47b2a9435 --- /dev/null +++ b/pkgs/by-name/_1/_1password-gui/versions.json @@ -0,0 +1,6 @@ +{ + "stable-linux": "8.10.76", + "stable-darwin": "8.10.76", + "beta-linux":"8.10.76-32.BETA", + "beta-darwin": "8.10.76-32.BETA" +} diff --git a/pkgs/by-name/_4/_4ti2/package.nix b/pkgs/by-name/_4/_4ti2/package.nix index 22ac67da8ebc..c75964800726 100644 --- a/pkgs/by-name/_4/_4ti2/package.nix +++ b/pkgs/by-name/_4/_4ti2/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "4ti2"; - version = "1.6.10"; + version = "1.6.11"; src = fetchFromGitHub { owner = "4ti2"; repo = "4ti2"; rev = "Release_${builtins.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-Rz8O1Tf81kzpTGPq7dkZJvv444F1/VqKu7VuRvH59kQ="; + hash = "sha256-hNkJnc8EGF07aE7VqKCI9zkTm6SJgXOGuefy219IXtE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/_5/_5etools/package.nix b/pkgs/by-name/_5/_5etools/package.nix deleted file mode 100644 index 1af299ce97ff..000000000000 --- a/pkgs/by-name/_5/_5etools/package.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchFromGitHub, lib }: - -fetchFromGitHub rec { - pname = "5etools"; - version = "1.175.2"; - - owner = "5etools-mirror-1"; - repo = "5etools-mirror-1.github.io"; - rev = "v${version}"; - hash = "sha256-0+QjtcmKsfcSehvn4DChBhSVooy9wlqaSCgeAFgeL+w="; - - meta = with lib; { - description = "Suite of browser-based tools for players and DMs of D&D 5e"; - homepage = "https://5e.tools"; - changelog = "https://github.com/5etools-mirror-1/5etools-mirror-1.github.io/releases/tag/v${version}"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ urandom ]; - hydraPlatforms = [ ]; # src tarball is 4.7G, unpackeed 4.8G, exceeds hydras output limit - }; -} diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index fdb973da8264..b9dca41b39ae 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, telegram-desktop, withWebkit ? true, }: @@ -21,6 +22,16 @@ telegram-desktop.override { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + # https://github.com/desktop-app/lib_base/pull/268 + url = "https://github.com/desktop-app/lib_base/commit/c952da37294b958e896b27528e7834f0892faa0a.patch"; + extraPrefix = "Telegram/lib_base/"; + stripLen = 1; + hash = "sha256-xiq8WLAiSZwpvdyK5JbRAdQ9us93+9oMmeMBqVb1TbI="; + }) + ]; + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) ]; diff --git a/pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch b/pkgs/by-name/_7/_7zz/fix-cross-mingw-build.patch similarity index 100% rename from pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch rename to pkgs/by-name/_7/_7zz/fix-cross-mingw-build.patch diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/by-name/_7/_7zz/package.nix similarity index 100% rename from pkgs/tools/archivers/7zz/default.nix rename to pkgs/by-name/_7/_7zz/package.nix diff --git a/pkgs/tools/archivers/7zz/setup-hook.sh b/pkgs/by-name/_7/_7zz/setup-hook.sh similarity index 100% rename from pkgs/tools/archivers/7zz/setup-hook.sh rename to pkgs/by-name/_7/_7zz/setup-hook.sh diff --git a/pkgs/tools/archivers/7zz/update.sh b/pkgs/by-name/_7/_7zz/update.sh similarity index 100% rename from pkgs/tools/archivers/7zz/update.sh rename to pkgs/by-name/_7/_7zz/update.sh diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index 6ac9ace5603f..de8587f0ef8a 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -22,17 +22,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.6.64"; + version = "1.6.194"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-0geit1ZDsNOPhpdmOeT1xSnQ3oitMiMY14zoGG8hsGU="; + hash = "sha256-4iL3+GeyOZoZN8IXo0jjSq3hYHKBTpytk8owXMdfACo="; fetchSubmodules = true; }; - vendorHash = "sha256-1osdAkUMmkBoLpKhoESUh2URMi3OYhLfRs+N9fDnnKQ="; + vendorHash = "sha256-XBcrs6G3Kq9WsODegy2KxqSp+qwr+NpdLJLa3qmW9kA="; buildInputs = [ alsa-lib diff --git a/pkgs/by-name/aa/aalib/package.nix b/pkgs/by-name/aa/aalib/package.nix index 45dc803e5815..4b1885005d08 100644 --- a/pkgs/by-name/aa/aalib/package.nix +++ b/pkgs/by-name/aa/aalib/package.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, ncurses, - automake, }: stdenv.mkDerivation rec { @@ -33,7 +32,6 @@ stdenv.mkDerivation rec { # The fuloong2f is not supported by aalib still preConfigure = '' - cp ${automake}/share/automake*/config.{sub,guess} . configureFlagsArray+=( "--bindir=$bin/bin" "--includedir=$dev/include" diff --git a/pkgs/by-name/aa/aapt/package.nix b/pkgs/by-name/aa/aapt/package.nix index c9944f844520..c7767eebe559 100644 --- a/pkgs/by-name/aa/aapt/package.nix +++ b/pkgs/by-name/aa/aapt/package.nix @@ -51,6 +51,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://developer.android.com/tools/aapt2"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ linsui ]; + teams = [ lib.teams.android ]; platforms = lib.platforms.unix; badPlatforms = [ # The linux executable only supports x86_64 diff --git a/pkgs/by-name/aa/aardvark-dns/package.nix b/pkgs/by-name/aa/aardvark-dns/package.nix index f946ea4ba59f..d28bbf2db3f7 100644 --- a/pkgs/by-name/aa/aardvark-dns/package.nix +++ b/pkgs/by-name/aa/aardvark-dns/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "containers"; repo = "aardvark-dns"; rev = "v${version}"; - hash = "sha256-mWaB1E/n/N2Tb5bqrMJX2XfPvZBCG+dxar3kGCHgv0I="; + hash = "sha256-drDu+YaqlylDRJHs6ctbDvhaec3UqQ+0GsUeHfhY4Zg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-t9qfPz4Jy1RueiDEY2fB3Y1uty0i/Wf0ElsR+nSVF5g="; + cargoHash = "sha256-YUgaXx/+rZrTtscQIg3bkIp4L1bnjmSiudrim+ZXa64="; passthru.tests = { inherit (nixosTests) podman; }; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { description = "Authoritative dns server for A/AAAA container records"; homepage = "https://github.com/containers/aardvark-dns"; license = licenses.asl20; - maintainers = with maintainers; [ ] ++ teams.podman.members; + teams = [ teams.podman ]; platforms = platforms.linux; mainProgram = "aardvark-dns"; }; diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index bf0bdb0bc06f..21122c2bbeba 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "ab-av1"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; rev = "v${version}"; - hash = "sha256-rj02Opkwi4M249Ya4uBl4u1l8Mx+FBcRcxDgD6ng9kg="; + hash = "sha256-FqyY4HUOrpSsqR5XO96+IXnT7w8C1gGfia0YH1d/nkg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Vi38eNn+SnhQx7Gp1T2RPIBeu3bUAZ74dr0mMG5Mha0="; + cargoHash = "sha256-nadMsYt1RaZbqArSEiz/kAz/HuTS0E3bsn94D9UmAME="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ab/abcde/package.nix b/pkgs/by-name/ab/abcde/package.nix new file mode 100644 index 000000000000..517ddd6539e3 --- /dev/null +++ b/pkgs/by-name/ab/abcde/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchurl, + libcdio-paranoia, + cddiscid, + wget, + which, + vorbis-tools, + id3v2, + python3Packages, + lame, + flac, + glyr, + perlPackages, + makeWrapper, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "abcde"; + version = "2.9.3"; + + src = fetchurl { + url = "https://abcde.einval.com/download/abcde-${finalAttrs.version}.tar.gz"; + hash = "sha256-BGzQu6eN1LvcvPgv5iWGXGDfNaAFSC3hOmaZxaO4MSQ="; + }; + + # FIXME: This package does not support `distmp3', `eject', etc. + + configurePhase = '' + sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; + s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ; + s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \ + "Makefile"; + + echo 'CDPARANOIA=${lib.getExe libcdio-paranoia}' >>abcde.conf + echo CDROMREADERSYNTAX=cdparanoia >>abcde.conf + + substituteInPlace "abcde" \ + --replace "/etc/abcde.conf" "$out/etc/abcde.conf" + ''; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = with perlPackages; [ + perl + MusicBrainz + MusicBrainzDiscID + IOSocketSSL + ]; + + installFlags = [ "sysconfdir=$(out)/etc" ]; + + postFixup = '' + for cmd in abcde cddb-tool abcde-musicbrainz-tool; do + wrapProgram "$out/bin/$cmd" \ + --prefix PERL5LIB : "$PERL5LIB" \ + --prefix PATH ":" ${ + lib.makeBinPath [ + "$out" + which + libcdio-paranoia + cddiscid + wget + vorbis-tools + id3v2 + python3Packages.eyed3 + lame + flac + glyr + ] + } + done + ''; + + meta = { + homepage = "http://abcde.einval.com/wiki/"; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + description = "Command-line audio CD ripper"; + longDescription = '' + abcde is a front-end command-line utility (actually, a shell + script) that grabs tracks off a CD, encodes them to + Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack) + format, and tags them, all in one go. + ''; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ab/abcm2ps/package.nix b/pkgs/by-name/ab/abcm2ps/package.nix index 873bbebcd36e..41633768c0ae 100644 --- a/pkgs/by-name/ab/abcm2ps/package.nix +++ b/pkgs/by-name/ab/abcm2ps/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitHub, + fetchfossil, docutils, pkg-config, freetype, @@ -11,13 +11,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "abcm2ps"; - version = "8.14.15"; + version = "8.14.17"; - src = fetchFromGitHub { - owner = "leesavide"; - repo = "abcm2ps"; + src = fetchfossil { + url = "https://chiselapp.com/user/moinejf/repository/abcm2ps"; rev = "v${finalAttrs.version}"; - hash = "sha256-0ZSMKARX16/33sIWR8LOVOFblI/Q+iZgnfVq/xqRMnI="; + hash = "sha256-YA36wfj7owKu/KyWgCj6U8EJEh831cFtQj4/JtH6kVg="; }; configureFlags = [ diff --git a/pkgs/by-name/ab/abctl/package.nix b/pkgs/by-name/ab/abctl/package.nix index f078176f0529..968206813bb0 100644 --- a/pkgs/by-name/ab/abctl/package.nix +++ b/pkgs/by-name/ab/abctl/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "abctl"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "airbytehq"; repo = "abctl"; tag = "v${version}"; - hash = "sha256-O+ABjageccJudXtO5wUYLIT/kI04f68RLW0B7d//jdw="; + hash = "sha256-ZM0ae4Oiz/q4KSkxVxEXPe6oJa5fsNWzw+fX5hobc1c="; }; checkFlags = @@ -33,7 +33,7 @@ buildGoModule rec { in [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-4pi5EX7N4zf72rez2aClFezgnT70A7Crd2YTasl5CvU="; + vendorHash = "sha256-9djIgVLPQmqEzDqUBipmXA8DlwYx9D4QlMna26vyJKI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ab/abpoa/package.nix b/pkgs/by-name/ab/abpoa/package.nix index 8cef3f0efb35..a7f23fc035e9 100644 --- a/pkgs/by-name/ab/abpoa/package.nix +++ b/pkgs/by-name/ab/abpoa/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "${lib.optionalString enablePython "py"}abpoa"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "yangao07"; repo = "abPOA"; tag = "v${finalAttrs.version}"; - hash = "sha256-90mkXp4cC0Omnx0C7ab7NNs/M2oedIcICTUJl3qhcyo="; + hash = "sha256-E6XdiRULgJy9rf4NfXGBqUC+m0pMZKMsA5pHvCNNLJk="; }; patches = [ ./simd-arch.patch ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = lib.optionalString (!enablePython) '' runHook preInstall - install -Dm755 ./bin/abpoa -t $out/bin + install -Dm755 ./bin/abpoa* $out/bin/abpoa runHook postInstall ''; diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix index 0258e55330d1..08fac458cdb1 100644 --- a/pkgs/by-name/ab/abracadabra/package.nix +++ b/pkgs/by-name/ab/abracadabra/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "3.0.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-yCjMinDCoBTOC5Ks4MUd0MQeitfrIe8bI3Q4ahz36kQ="; + hash = "sha256-4M/LrM1Edu9isvpKPArir7UwPJ0u0Yjl4ttFtxcqYtM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ab/abseil-cpp_202501/package.nix b/pkgs/by-name/ab/abseil-cpp_202501/package.nix new file mode 100644 index 000000000000..0e7be335f957 --- /dev/null +++ b/pkgs/by-name/ab/abseil-cpp_202501/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gtest, + static ? stdenv.hostPlatform.isStatic, + cxxStandard ? null, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "abseil-cpp"; + version = "20250127.1"; + + src = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + tag = finalAttrs.version; + hash = "sha256-QTywqQCkyGFpdbtDBvUwz9bGXxbJs/qoFKF6zYAZUmQ="; + }; + + cmakeFlags = + [ + (lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true) + (lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true) + (lib.cmakeBool "BUILD_SHARED_LIBS" (!static)) + ] + ++ lib.optionals (cxxStandard != null) [ + (lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard) + ]; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ gtest ]; + + meta = { + description = "Open-source collection of C++ code designed to augment the C++ standard library"; + homepage = "https://abseil.io/"; + changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.GaetanLepage ]; + }; +}) diff --git a/pkgs/by-name/ac/accerciser/package.nix b/pkgs/by-name/ac/accerciser/package.nix index 1a2ed9adf4a4..d8a3ed5b2fbe 100644 --- a/pkgs/by-name/ac/accerciser/package.nix +++ b/pkgs/by-name/ac/accerciser/package.nix @@ -74,7 +74,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://gitlab.gnome.org/GNOME/accerciser/-/blob/${version}/NEWS?ref_type=tags"; description = "Interactive Python accessibility explorer"; mainProgram = "accerciser"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/by-name/ac/accountsservice/package.nix b/pkgs/by-name/ac/accountsservice/package.nix index c236ebf9c706..49ec225068b1 100644 --- a/pkgs/by-name/ac/accountsservice/package.nix +++ b/pkgs/by-name/ac/accountsservice/package.nix @@ -104,7 +104,8 @@ stdenv.mkDerivation rec { description = "D-Bus interface for user account query and manipulation"; homepage = "https://www.freedesktop.org/wiki/Software/AccountsService"; license = licenses.gpl3Plus; - maintainers = teams.freedesktop.members ++ (with maintainers; [ pSub ]); + maintainers = with maintainers; [ pSub ]; + teams = [ teams.freedesktop ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/dns/acme-dns/default.nix b/pkgs/by-name/ac/acme-dns/package.nix similarity index 100% rename from pkgs/servers/dns/acme-dns/default.nix rename to pkgs/by-name/ac/acme-dns/package.nix diff --git a/pkgs/by-name/ac/acme-sh/package.nix b/pkgs/by-name/ac/acme-sh/package.nix index 21464579d61a..cdaba282258e 100644 --- a/pkgs/by-name/ac/acme-sh/package.nix +++ b/pkgs/by-name/ac/acme-sh/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "acme.sh"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "acmesh-official"; repo = "acme.sh"; tag = version; - hash = "sha256-BPZ+5xvKqEaz+tkccVL0hEDAxLkICW5O+qPf73bOqRU="; + hash = "sha256-Fgik1TCWDlkyEI9QkXpc/94mGKb7U7hMoamdYU7nTJc="; }; nativeBuildInputs = [ @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { - Cron job notifications for renewal or error etc. ''; license = licenses.gpl3Only; - maintainers = lib.teams.serokell.members; + teams = [ lib.teams.serokell ]; inherit (coreutils.meta) platforms; mainProgram = "acme.sh"; }; diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index 7211b45c70ee..96a8a0d0a78a 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "acpica-tools"; - version = "R2024_12_12"; + version = "R2025_04_04"; src = fetchFromGitHub { owner = "acpica"; repo = "acpica"; tag = finalAttrs.version; - hash = "sha256-vxiWYUAEk54F1M0WrrMTHZ4DNJxxT/GaXetd5LjE808="; + hash = "sha256-+dMuyp3tT0eSLPyzLseuHMY+nNfl6roBFrsnXiZSHkY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix index 0243af57fe21..121ad3a60415 100644 --- a/pkgs/by-name/ac/act/package.nix +++ b/pkgs/by-name/ac/act/package.nix @@ -8,7 +8,7 @@ }: let - version = "0.2.75"; + version = "0.2.77"; in buildGoModule { pname = "act"; @@ -18,10 +18,10 @@ buildGoModule { owner = "nektos"; repo = "act"; tag = "v${version}"; - hash = "sha256-YIhgS1kQ9EKoIaSp/zGVQmWXyYZranEQU9onQW3gD0k="; + hash = "sha256-bcqHj40lySE2xXGuUbXbH5cjQ5NoJCvjE/uX8HaKVho="; }; - vendorHash = "sha256-LKNajCwb33syv9KcNHKYIGTnAN8r7PkGilDB3HnKkY4="; + vendorHash = "sha256-YH5SIZ73VYqg7+sSJpvqkIlBUy1rs3uNEWiEBDRdkQw="; doCheck = false; diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix index 8eb5e3aaf86b..df8b6c2fec76 100644 --- a/pkgs/by-name/ac/action-validator/package.nix +++ b/pkgs/by-name/ac/action-validator/package.nix @@ -2,22 +2,28 @@ lib, rustPlatform, fetchFromGitHub, + unstableGitUpdater, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "action-validator"; - version = "0.6.0"; + version = "0.6.0-unstable-2025-02-16"; src = fetchFromGitHub { owner = "mpalmer"; repo = "action-validator"; - rev = "v${version}"; - hash = "sha256-lJHGx/GFddIwVVXRj75Z/l5CH/yuw/uIhr02Qkjruww="; + rev = "2f8be1d2066eb3687496a156d00b4f1b3ea7b028"; + hash = "sha256-QDnikgAfkrvn7/vnmgTQ5J8Ro2HZ6SVkp9cPUYgejqM="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-dy66ZkU9lIYGe9T3oR8m5cGcBQO5MF1KsLjfaHTtvlY="; + cargoHash = "sha256-FuJ5NzeZhfN312wK5Q1DgIXUAN6hqxu/1BhGqasbdS8="; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + branch = "main"; + }; meta = with lib; { description = "Tool to validate GitHub Action and Workflow YAML files"; diff --git a/pkgs/by-name/ac/actiona/disable-tts.patch b/pkgs/by-name/ac/actiona/disable-tts.patch new file mode 100644 index 000000000000..ec36dff532a5 --- /dev/null +++ b/pkgs/by-name/ac/actiona/disable-tts.patch @@ -0,0 +1,96 @@ +diff --git a/actexec/CMakeLists.txt b/actexec/CMakeLists.txt +index 49d8128..e8bfa16 100644 +--- a/actexec/CMakeLists.txt ++++ b/actexec/CMakeLists.txt +@@ -40,7 +40,7 @@ endif() + + setup_target(${PROJECT}) + +-find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Qml Network Widgets Core5Compat Multimedia TextToSpeech REQUIRED) ++find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Qml Network Widgets Core5Compat Multimedia REQUIRED) + + target_link_directories(${PROJECT} + PRIVATE +@@ -75,7 +75,6 @@ target_link_libraries( + Qt6::Widgets + Qt6::Core5Compat + Qt6::Multimedia +- Qt6::TextToSpeech + ${LIBNOTIFY_LIBRARIES} + ) + +diff --git a/actiona/CMakeLists.txt b/actiona/CMakeLists.txt +index d03d650..222b2f9 100644 +--- a/actiona/CMakeLists.txt ++++ b/actiona/CMakeLists.txt +@@ -125,7 +125,7 @@ endif() + + setup_target(${PROJECT}) + +-find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Qml Network Widgets Core5Compat Multimedia TextToSpeech REQUIRED) ++find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Qml Network Widgets Core5Compat Multimedia REQUIRED) + + target_link_directories(${PROJECT} + PRIVATE +@@ -162,7 +162,6 @@ target_link_libraries( + Qt6::Widgets + Qt6::Core5Compat + Qt6::Multimedia +- Qt6::TextToSpeech + ${LIBNOTIFY_LIBRARIES} + ${LIBX11_LIBRARIES} + $<$:shlwapi> +diff --git a/actions/system/CMakeLists.txt b/actions/system/CMakeLists.txt +index a3019b1..6d9430c 100644 +--- a/actions/system/CMakeLists.txt ++++ b/actions/system/CMakeLists.txt +@@ -67,8 +67,6 @@ set(HEADERS + ${HEADERS_PREFIX}/actions/playsoundinstance.hpp + ${HEADERS_PREFIX}/actions/systemdefinition.hpp + ${HEADERS_PREFIX}/actions/systeminstance.hpp +- ${HEADERS_PREFIX}/actions/texttospeechdefinition.hpp +- ${HEADERS_PREFIX}/actions/texttospeechinstance.hpp + ${HEADERS_PREFIX}/code/mediaplaylist.hpp + ${HEADERS_PREFIX}/code/notify.hpp + ${HEADERS_PREFIX}/code/process.hpp +@@ -140,7 +138,6 @@ find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS + DBus + Multimedia + MultimediaWidgets +- TextToSpeech + REQUIRED) + + target_link_directories(${PROJECT} +@@ -167,7 +164,6 @@ target_link_libraries(${PROJECT} + Qt6::DBus + Qt6::Multimedia + Qt6::MultimediaWidgets +- Qt6::TextToSpeech + ${LIBNOTIFY_LIBRARIES} + ${BLUEZ_LIBRARIES} + $<$:Bthprops> +diff --git a/actions/system/src/actionpacksystem.hpp b/actions/system/src/actionpacksystem.hpp +index ea045e3..a5af35a 100644 +--- a/actions/system/src/actionpacksystem.hpp ++++ b/actions/system/src/actionpacksystem.hpp +@@ -32,10 +32,6 @@ + #include "actions/playsounddefinition.hpp" + #include "actions/findimagedefinition.hpp" + +-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +-#include "actions/texttospeechdefinition.hpp" +-#endif +- + #include "code/system.hpp" + #include "code/mediaplaylist.hpp" + #include "code/notify.hpp" +@@ -64,9 +60,6 @@ public: + addActionDefinition(new Actions::DetachedCommandDefinition(this)); + addActionDefinition(new Actions::PlaySoundDefinition(this)); + addActionDefinition(new Actions::FindImageDefinition(this)); +-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +- addActionDefinition(new Actions::TextToSpeechDefinition(this)); +-#endif + } + + QString id() const override { return QStringLiteral("system"); } diff --git a/pkgs/by-name/ac/actiona/package.nix b/pkgs/by-name/ac/actiona/package.nix new file mode 100644 index 000000000000..6f858cab5a4c --- /dev/null +++ b/pkgs/by-name/ac/actiona/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + cmake, + pkg-config, + + bluez, + libnotify, + opencv, + qt6, + + # Running with TTS support causes the program to freeze for a few seconds every time at startup, + # so it is disabled by default + textToSpeechSupport ? false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "actiona"; + version = "3.11.1"; + + src = fetchFromGitHub { + owner = "Jmgr"; + repo = "actiona"; + rev = "v${finalAttrs.version}"; + hash = "sha256-sJlzrrpmo2CbzChCtiyxqDtjoN58BN4Ptjm4sH83zAw="; + fetchSubmodules = true; + }; + + patches = lib.optionals (!textToSpeechSupport) [ + # Removes TTS support + ./disable-tts.patch + ]; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + bluez + libnotify + opencv + qt6.qtbase + qt6.qtmultimedia + qt6.qttools + qt6.qt5compat + ] ++ lib.optionals textToSpeechSupport [ qt6.qtspeech ]; + + meta = { + description = "Cross-platform automation tool"; + homepage = "https://github.com/Jmgr/actiona"; + license = lib.licenses.gpl3Only; + mainProgram = "actiona"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index 73a9e3c0a21d..51a33635dbff 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -7,21 +7,49 @@ cacert, gitMinimal, nodejs_20, + python3, yarn, nixosTests, nix-update-script, }: let - version = "25.3.1"; + version = "25.5.0"; src = fetchFromGitHub { + name = "actualbudget-actual-source"; owner = "actualbudget"; repo = "actual"; tag = "v${version}"; - hash = "sha256-UZ2Z1tkMbGJwka//cIC0aG1KCcTSxUPLzctEaOhnKQA="; + hash = "sha256-NYAO1Yx3u0wm9F6zSwIolQkXBfFO1YkSKV5UMCBi8nw="; + }; + translations = fetchFromGitHub { + name = "actualbudget-translations-source"; + owner = "actualbudget"; + repo = "translations"; + # Note to updaters: this repo is not tagged, so just update this to the Git + # tip at the time the update is performed. + rev = "312fce7791e6722357e5d2f851407f4b7cf4ecb9"; + hash = "sha256-kDArpSFiNJJF5ZGCtcn7Ci7wCpI1cTSknDZ4sQgy/Nc="; }; yarn_20 = yarn.override { nodejs = nodejs_20; }; + SUPPORTED_ARCHITECTURES = builtins.toJSON { + os = [ + "darwin" + "linux" + ]; + cpu = [ + "arm" + "arm64" + "ia32" + "x64" + ]; + libc = [ + "glibc" + "musl" + ]; + }; + # We cannot use fetchYarnDeps because that doesn't support yarn2/berry # lockfiles (see https://github.com/NixOS/nixpkgs/issues/254369) offlineCache = stdenvNoCC.mkDerivation { @@ -34,22 +62,7 @@ let yarn_20 ]; - SUPPORTED_ARCHITECTURES = builtins.toJSON { - os = [ - "darwin" - "linux" - ]; - cpu = [ - "arm" - "arm64" - "ia32" - "x64" - ]; - libc = [ - "glibc" - "musl" - ]; - }; + inherit SUPPORTED_ARCHITECTURES; buildPhase = '' runHook preBuild @@ -57,9 +70,15 @@ let export HOME=$(mktemp -d) yarn config set enableTelemetry 0 yarn config set cacheFolder $out + # At this stage we don't need binaries yet, so we can skip preinstall + # scripts here. + yarn config set enableScripts false yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES" - yarn workspaces focus @actual-app/sync-server --production + # Install dependencies for all workspaces, and include devDependencies, + # to build web UI. Dependencies will be re-created in offline mode in the + # package's install phase. + yarn install --immutable runHook postBuild ''; @@ -76,14 +95,61 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = - { - aarch64-darwin = "sha256-IJBfBA71PZeE/Zlu2kzQw8l/D4lVAV5I5loRyRfncKA="; - aarch64-linux = "sha256-djE2lt/o/7kd7ci2TW3mhjSptD3etChbvtdbiWqp/wo="; - x86_64-darwin = "sha256-AShd87VFwqDbJZoFJPg6HsdhTx7XMVdZ5sRWLXU8ldM="; - x86_64-linux = "sha256-me0v+RuoleOKFRyJ7iyLTKRnV2Cz2Q1MLc/SE2sSSH8="; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + outputHash = "sha256-NPyFzklzAUIrTADTF/JBOieWMXOhL+X3pF3qXrfdyCs="; + }; + + webUi = stdenvNoCC.mkDerivation { + pname = "actual-server-webui"; + inherit version; + srcs = [ + src + translations + ]; + sourceRoot = "${src.name}/"; + + nativeBuildInputs = [ + nodejs_20 + yarn_20 + ]; + + inherit SUPPORTED_ARCHITECTURES; + + postPatch = '' + ln -sv ../../../${translations.name} ./packages/desktop-client/locale + cp -r ${offlineCache}/node_modules ./node_modules + + patchShebangs --build ./bin ./packages/*/bin + + # Patch all references to `git` to a no-op `true`. This neuter automatic + # translation update. + substituteInPlace bin/package-browser \ + --replace-fail "git" "true" + + # Allow `remove-untranslated-languages` to do its job. + chmod -R u+w ./packages/desktop-client/locale + ''; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + yarn config set enableTelemetry 0 + yarn config set cacheFolder ${offlineCache} + yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES" + + yarn build:server + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r packages/desktop-client/build $out + + runHook postInstall + ''; + dontFixup = true; }; in stdenv.mkDerivation { @@ -92,25 +158,45 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper + (python3.withPackages (ps: [ ps.setuptools ])) # Used by node-gyp yarn_20 ]; + inherit SUPPORTED_ARCHITECTURES; + installPhase = '' runHook preInstall - mkdir -p $out/{bin,lib,lib/actual/packages/sync-server} - cp -r ${offlineCache}/node_modules/ $out/lib/actual - cp -r ./packages/sync-server/{app.js,src,migrations,package.json} $out/lib/actual/packages/sync-server + mkdir -p $out/{bin,lib,lib/actual/packages/sync-server,lib/actual/packages/desktop-client} + cp -r ./packages/sync-server/{app.js,src,migrations,package.json,bin} $out/lib/actual/packages/sync-server + # sync-server uses package.json to determine path to web ui. + cp ./packages/desktop-client/package.json $out/lib/actual/packages/desktop-client + cp -r ${webUi} $out/lib/actual/packages/desktop-client/build + + # Re-create node_modules/ to contain just production packages required for + # sync-server itself, using existing offline cache. This will also now build + # binaries. + export HOME=$(mktemp -d) + yarn config set enableNetwork false + yarn config set enableOfflineMode true + yarn config set enableTelemetry 0 + yarn config set cacheFolder ${offlineCache} + yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES" + + export npm_config_nodedir=${nodejs_20} + + yarn workspaces focus @actual-app/sync-server --production + cp -r ./node_modules $out/lib/actual/ makeWrapper ${lib.getExe nodejs_20} "$out/bin/actual-server" \ - --add-flags "$out/lib/actual/packages/sync-server/app.js" \ + --add-flags "$out/lib/actual/packages/sync-server/bin/actual-server.js" \ --set NODE_PATH "$out/actual/lib/node_modules" runHook postInstall ''; passthru = { - inherit offlineCache; + inherit offlineCache webUi; tests = nixosTests.actual; passthru.updateScript = nix-update-script { }; }; @@ -121,6 +207,8 @@ stdenv.mkDerivation { homepage = "https://actualbudget.org/"; mainProgram = "actual-server"; license = lib.licenses.mit; + # https://github.com/NixOS/nixpkgs/issues/403846 + broken = stdenv.isDarwin; maintainers = [ lib.maintainers.oddlama lib.maintainers.patrickdag diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index dd0cf99a7831..9bee2fc45d33 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ada"; - version = "3.2.2"; + version = "3.2.4"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; tag = "v${version}"; - hash = "sha256-Qag6cWybRxbQC7LvQmxLVcCw4RtMJ5TOSDwCmNs2XFA="; + hash = "sha256-tC7Hpf9xCysraTtVC+mYE/DVNrG02lwLAlDiTeaWpY4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ad/adaptivecpp/package.nix b/pkgs/by-name/ad/adaptivecpp/package.nix index 909a4bafc375..5949c7e91f5f 100644 --- a/pkgs/by-name/ad/adaptivecpp/package.nix +++ b/pkgs/by-name/ad/adaptivecpp/package.nix @@ -167,9 +167,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Multi-backend implementation of SYCL for CPUs and GPUs"; mainProgram = "acpp"; maintainers = with maintainers; [ yboettcher ]; - # Broken with current nixpkgs ROCm 6.0.2 - # Works with updated ROCm, see https://github.com/NixOS/nixpkgs/pull/367695 - broken = rocmSupport && strings.versionOlder rocmPackages.clr.version "6.3.1"; license = licenses.bsd2; }; }) diff --git a/pkgs/by-name/ad/adcli/package.nix b/pkgs/by-name/ad/adcli/package.nix index 6ca3445c88a4..1cf15a2d1a87 100644 --- a/pkgs/by-name/ad/adcli/package.nix +++ b/pkgs/by-name/ad/adcli/package.nix @@ -14,7 +14,7 @@ xmlto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "adcli"; version = "0.9.2"; @@ -22,13 +22,14 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "realmd"; repo = "adcli"; - rev = version; + tag = finalAttrs.version; hash = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE="; }; nativeBuildInputs = [ autoreconfHook docbook_xsl + libxslt # xsltproc pkg-config util-linux xmlto @@ -37,11 +38,15 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl libkrb5 - libxslt openldap ]; - configureFlags = [ "--disable-debug" ]; + strictDeps = true; + + configureFlags = [ + "--disable-debug" + "ac_cv_path_KRB5_CONFIG=${lib.getExe' (lib.getDev libkrb5) "krb5-config"}" + ]; postPatch = '' substituteInPlace tools/Makefile.am \ @@ -61,15 +66,15 @@ stdenv.mkDerivation rec { patch_docbook doc/adcli-docs.xml ''; - meta = with lib; { + meta = { homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html"; description = "Helper library and tools for Active Directory client operations"; mainProgram = "adcli"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ SohamG anthonyroussel ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ad/addr-book-combine/package.nix b/pkgs/by-name/ad/addr-book-combine/package.nix new file mode 100644 index 000000000000..23f69f5e24d7 --- /dev/null +++ b/pkgs/by-name/ad/addr-book-combine/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromSourcehut, + nix-update-script, +}: +buildGoModule { + pname = "addr-book-combine"; + version = "0-unstable-2022-12-14"; + + src = fetchFromSourcehut { + owner = "~jcc"; + repo = "addr-book-combine"; + rev = "11696f4726b981c774ad1d4858f1a935ac71e9ac"; + hash = "sha256-SENur3p5LxMNnjo/+qiVdrEs+i+rI1PT1wYYdLLqWrg="; + }; + + vendorHash = null; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Combine multiple aerc-style address books into a single address book"; + homepage = "https://jasoncarloscox.com/creations/addr-book-combine/"; + downloadPage = "https://git.sr.ht/~jcc/addr-book-combine"; + license = lib.licenses.gpl3Only; + mainProgram = "addr-book-combine"; + maintainers = with lib.maintainers; [ antonmosich ]; + }; +} diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix index 10d98113e0c3..f4966916c8ef 100644 --- a/pkgs/by-name/ad/adguardian/package.nix +++ b/pkgs/by-name/ad/adguardian/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-yPDysaslL/7N60eZ/hqZl5ZXIsof/pvlgHYfW1mIWtI="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Terminal-based, real-time traffic monitoring and statistics for your AdGuard Home instance"; mainProgram = "adguardian"; diff --git a/pkgs/by-name/ad/adidnsdump/package.nix b/pkgs/by-name/ad/adidnsdump/package.nix index 97b568ab074a..b935efd8552d 100644 --- a/pkgs/by-name/ad/adidnsdump/package.nix +++ b/pkgs/by-name/ad/adidnsdump/package.nix @@ -6,33 +6,29 @@ python3.pkgs.buildPythonApplication rec { pname = "adidnsdump"; - version = "1.3.1-unstable-2023-12-13"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "dirkjanm"; repo = "adidnsdump"; - rev = "8bbb4b05b2d1b792f3c77ce0a4a762ab9e08727d"; - hash = "sha256-dIbnUyV3gdWHHoyzD0ME2fXlMoiQkdrqQ7qQ6Ab6qs0="; + tag = "v${version}"; + hash = "sha256-gKOIZuXYm8ltaajmOZXulPX5dI4fWz4xiZ8W0kPpcRk="; }; - nativeBuildInputs = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ impacket ldap3 ]; - pythonImportsCheck = [ - "adidnsdump" - ]; + pythonImportsCheck = [ "adidnsdump" ]; meta = with lib; { description = "Active Directory Integrated DNS dumping by any authenticated user"; homepage = "https://github.com/dirkjanm/adidnsdump"; - changelog = "https://github.com/dirkjanm/adidnsdump/releases/tag/v${version}"; + changelog = "https://github.com/dirkjanm/adidnsdump/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "adidnsdump"; diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix new file mode 100644 index 000000000000..6dc9083f41dd --- /dev/null +++ b/pkgs/by-name/ad/adios2/package.nix @@ -0,0 +1,146 @@ +{ + lib, + stdenv, + fetchFromGitHub, + perl, + cmake, + ninja, + gfortran, + pkg-config, + python3, + python3Packages, + mpi, + bzip2, + lz4, + c-blosc2, + hdf5-mpi, + libfabric, + libpng, + libsodium, + pugixml, + sqlite, + zeromq, + zfp, + zlib, + zlib-ng, + zstd, + ucx, + yaml-cpp, + nlohmann_json, + llvmPackages, + pythonSupport ? false, + withExamples ? false, +}: +stdenv.mkDerivation (finalAttrs: { + version = "2.10.2"; + pname = "adios2"; + + src = fetchFromGitHub { + owner = "ornladios"; + repo = "adios2"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NVyw7xoPutXeUS87jjVv1YxJnwNGZAT4QfkBLzvQbwg="; + }; + + postPatch = + '' + patchShebangs cmake/install/post/generate-adios2-config.sh.in + '' + # Dynamic cast to nullptr on darwin platform, switch to unsafe reinterpret cast. + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace bindings/Python/py11{Attribute,Engine,Variable}.cpp \ + --replace-fail "dynamic_cast" "reinterpret_cast" + ''; + + nativeBuildInputs = + [ + perl + cmake + ninja + gfortran + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3 + python3Packages.pybind11 + ]; + + buildInputs = + [ + mpi + bzip2 + lz4 + c-blosc2 + (hdf5-mpi.override { inherit mpi; }) + libfabric + libpng + libsodium + pugixml + sqlite + zeromq + zfp + zlib + zlib-ng # required by c-blocs2 + zstd # required by c-blocs2 + yaml-cpp + nlohmann_json + + # Todo: add these optional dependcies in nixpkgs. + # sz + # mgard + # catalyst + ] + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ucx) ucx + # openmp required by zfp + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; + + propagatedBuildInputs = lib.optionals pythonSupport [ + (python3Packages.mpi4py.override { inherit mpi; }) + python3Packages.numpy + ]; + + cmakeFlags = [ + (lib.cmakeBool "ADIOS2_USE_HDF5" true) + (lib.cmakeBool "ADIOS2_USE_HDF5_VOL" true) + (lib.cmakeBool "BUILD_TESTING" false) + (lib.cmakeBool "ADIOS2_BUILD_EXAMPLES" withExamples) + (lib.cmakeBool "ADIOS2_USE_EXTERNAL_DEPENDENCIES" true) + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_PYTHONDIR" python3.sitePackages) + ]; + + # equired for finding the generated adios2-config.cmake file + env.adios2_DIR = "${placeholder "out"}/lib/cmake/adios2"; + + # Ctest takes too much time, so we only perform some smoke Python tests. + doInstallCheck = pythonSupport; + + preCheck = + '' + export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH + '' + + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") '' + rm ../testing/adios2/python/TestBPWriteTypesHighLevelAPI.py + ''; + + pytestFlagsArray = [ + "../testing/adios2/python/Test*.py" + ]; + + pythonImportsCheck = [ "adios2" ]; + + nativeInstallCheckInputs = lib.optionals pythonSupport [ + python3Packages.pythonImportsCheckHook + python3Packages.pytestCheckHook + ]; + + meta = { + homepage = "https://adios2.readthedocs.io/en/latest/"; + description = "The Adaptable Input/Output System version 2"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ qbisi ]; + }; +}) diff --git a/pkgs/by-name/ad/adlplug/package.nix b/pkgs/by-name/ad/adlplug/package.nix new file mode 100644 index 000000000000..16fb9beb6825 --- /dev/null +++ b/pkgs/by-name/ad/adlplug/package.nix @@ -0,0 +1,111 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + fmt, + liblo, + alsa-lib, + freetype, + libX11, + libXrandr, + libXinerama, + libXext, + libXcursor, + + # Enabling JACK requires a JACK server at runtime, no fallback mechanism + withJack ? false, + libjack2, + + type ? "ADL", +}: + +assert lib.assertOneOf "type" type [ + "ADL" + "OPN" +]; +let + chip = + { + ADL = "OPL3"; + OPN = "OPN2"; + } + .${type}; + mainProgram = "${type}plug"; +in +stdenv.mkDerivation { + pname = "${lib.strings.toLower type}plug"; + version = "unstable-2021-12-17"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = "ADLplug"; + rev = "a488abedf1783c61cb4f0caa689f1b01bf9aa17d"; + fetchSubmodules = true; + sha256 = "1a5zw0rglqgc5wq1n0s5bxx7y59dsg6qy02236fakl34bvbk60yz"; + }; + + cmakeFlags = [ + (lib.cmakeFeature "ADLplug_CHIP" chip) + (lib.cmakeBool "ADLplug_USE_SYSTEM_FMT" true) + (lib.cmakeBool "ADLplug_Jack" withJack) + ]; + + NIX_LDFLAGS = toString ( + lib.optionals stdenv.hostPlatform.isDarwin [ + # Framework that JUCE needs which don't get linked properly + "-framework CoreAudioKit" + "-framework QuartzCore" + "-framework AudioToolbox" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # JUCE dlopen's these at runtime + "-lX11" + "-lXext" + "-lXcursor" + "-lXinerama" + "-lXrandr" + ] + ); + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = + [ + fmt + liblo + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + freetype + libX11 + libXrandr + libXinerama + libXext + libXcursor + ] + ++ lib.optionals withJack [ libjack2 ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,Library/Audio/Plug-Ins/{VST,Components}} + + mv $out/bin/${mainProgram}.app $out/Applications/ + ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram} + + mv vst2/${mainProgram}.vst $out/Library/Audio/Plug-Ins/VST/ + mv au/${mainProgram}.component $out/Library/Audio/Plug-Ins/Components/ + ''; + + meta = { + inherit mainProgram; + description = "${chip} FM Chip Synthesizer"; + homepage = "https://github.com/jpcima/ADLplug"; + license = lib.licenses.boost; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/by-name/ad/adminer/package.nix b/pkgs/by-name/ad/adminer/package.nix index e6122df922f4..af0f004c62fc 100644 --- a/pkgs/by-name/ad/adminer/package.nix +++ b/pkgs/by-name/ad/adminer/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "5.1.0"; pname = "adminer"; + version = "5.3.0"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${finalAttrs.version}/adminer-${finalAttrs.version}.zip"; - hash = "sha256-SLu7NJoCkfEL9WhYQSHEx5QZmD6cjkBXpwEnp7d6Elo="; + hash = "sha256-7EnZ0frx8i6DXHO5E/65k+h+WuflTo8eBYNRVAmh7Kg="; }; nativeBuildInputs = [ @@ -44,17 +44,17 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Database management in a single PHP file"; homepage = "https://www.adminer.org"; - license = with licenses; [ + license = with lib.licenses; [ asl20 gpl2Only ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ jtojnar sstef ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix index ef748bc77dae..7511b95242c7 100644 --- a/pkgs/by-name/ad/adw-gtk3/package.nix +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "adw-gtk3"; - version = "5.6"; + version = "5.10"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "adw-gtk3"; tag = "v${finalAttrs.version}"; - hash = "sha256-S/H6JGXwEgiqmcH1W+ZyHYOkk0gQtKG9Q3BiI2IjnEM="; + hash = "sha256-0OZk27b0kujzWtRX5uvelTMivL19g6sNB1IY6BsrO10="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ad/adwaita-fonts/package.nix b/pkgs/by-name/ad/adwaita-fonts/package.nix index d1b044794793..b47d77a85334 100644 --- a/pkgs/by-name/ad/adwaita-fonts/package.nix +++ b/pkgs/by-name/ad/adwaita-fonts/package.nix @@ -32,6 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/adwaita-fonts"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.qxrein ] ++ lib.teams.gnome.members; + maintainers = [ lib.maintainers.qxrein ]; + teams = [ lib.teams.gnome ]; }; }) diff --git a/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix b/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix index 62686f251f16..e798acf99c7b 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy"; changelog = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.cc-by-sa-30; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.all; }; }) diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index 567c1e1527a9..4eba811c8583 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "47.0"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz"; - hash = "sha256-rQiKIpWMuEaeQdnxu6Dvsn5YaiECITzYnMJtsuACvf4="; + hash = "sha256-hHBoiIZQ2WcxFb5tvyv9wxpGrrxSimqdtEIOYOZWuNQ="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme"; changelog = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/${version}/NEWS?ref_type=tags"; platforms = with platforms; linux ++ darwin; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.cc-by-sa-30; }; } diff --git a/pkgs/by-name/ae/aemu/package.nix b/pkgs/by-name/ae/aemu/package.nix index 03722e15320c..969ec27581df 100644 --- a/pkgs/by-name/ae/aemu/package.nix +++ b/pkgs/by-name/ae/aemu/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitiles, cmake, - darwin, }: stdenv.mkDerivation { @@ -23,9 +22,6 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; cmakeFlags = [ "-DAEMU_COMMON_GEN_PKGCONFIG=ON" diff --git a/pkgs/applications/audio/aeolus/stops.nix b/pkgs/by-name/ae/aeolus-stops/package.nix similarity index 100% rename from pkgs/applications/audio/aeolus/stops.nix rename to pkgs/by-name/ae/aeolus-stops/package.nix diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/by-name/ae/aeolus/package.nix similarity index 100% rename from pkgs/applications/audio/aeolus/default.nix rename to pkgs/by-name/ae/aeolus/package.nix diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix index a151e3890841..1731a4a66d9a 100644 --- a/pkgs/by-name/ae/aerospace/package.nix +++ b/pkgs/by-name/ae/aerospace/package.nix @@ -9,7 +9,7 @@ let appName = "AeroSpace.app"; - version = "0.17.1-Beta"; + version = "0.18.5-Beta"; in stdenv.mkDerivation { pname = "aerospace"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip"; - sha256 = "sha256-IMU0s57dpes7Vm2Wv191LwkRgiF+ZIqNWHzrl4a1Pm0="; + sha256 = "sha256-rF4emnLNVE1fFlxExliN7clSBocBrPwQOwBqRtX9Q4o="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ae/aerospike/package.nix b/pkgs/by-name/ae/aerospike/package.nix index 5a7de5fc4b53..84f7642ede5e 100644 --- a/pkgs/by-name/ae/aerospike/package.nix +++ b/pkgs/by-name/ae/aerospike/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aerospike-server"; - version = "8.0.0.5"; + version = "8.0.0.7"; src = fetchFromGitHub { owner = "aerospike"; repo = "aerospike-server"; rev = version; - hash = "sha256-Ou7lSQHkudE0cuhXUtx9EI3z+udfnHI+CXdgoef2TIw="; + hash = "sha256-pusPYp3zbd+y+Gc3XnAk8sn74jp/+UzjoWb1wuD1+uE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ae/aespipe/package.nix b/pkgs/by-name/ae/aespipe/package.nix index 1538490c1927..7964bb697cce 100644 --- a/pkgs/by-name/ae/aespipe/package.nix +++ b/pkgs/by-name/ae/aespipe/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "aespipe"; - version = "2.4h"; + version = "2.4i"; src = fetchurl { url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2"; - sha256 = "sha256-6rMR/CbqQyibw632YNYnBJJJSWByXSAm7EkXKUoaukk="; + sha256 = "sha256-tBx6qsJULlnY/1jB/52HtS1KjBhHt5nIr+yR2UUXx14="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 0628d85c49ad..c069ac1a5437 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -4,9 +4,9 @@ stdenvNoCC, fetchFromGitHub, rustPlatform, - electron_34, + electron_35, nodejs_22, - yarn-berry, + yarn-berry_4, cacert, writableTmpDirAsHomeHook, cargo, @@ -17,6 +17,8 @@ jq, copyDesktopItems, makeWrapper, + llvmPackages, + apple-sdk_15, makeDesktopItem, nix-update-script, buildType ? "stable", @@ -32,32 +34,32 @@ let } .${hostPlatform.parsed.cpu.name} or (throw "affine(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}"); - electron = electron_34; + electron = electron_35; nodejs = nodejs_22; - yarn = yarn-berry.override { inherit nodejs; }; + yarn-berry = yarn-berry_4.override { inherit nodejs; }; productName = if buildType != "stable" then "AFFiNE-${buildType}" else "AFFiNE"; binName = lib.toLower productName; in stdenv.mkDerivation (finalAttrs: { pname = binName; - version = "0.20.5"; + version = "0.21.6"; src = fetchFromGitHub { owner = "toeverything"; repo = "AFFiNE"; tag = "v${finalAttrs.version}"; - hash = "sha256-eMVHwjJe6u3A3Dxo6SurusRuMksp/moPmXAUv0FXBwc="; + hash = "sha256-xiOfy3uskqYv5b0U2s1Zpc4/ydsRhhUd8M33IH0BJ10="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-Ob+A7NMTFuJ2wmRkHmemHnqkEAiY7G8NyxXXrT7NTR8="; + hash = "sha256-1BTSvHaSPE55v6awnvRry1Exms+zeGug3PNldZ2v2HY="; }; yarnOfflineCache = stdenvNoCC.mkDerivation { name = "yarn-offline-cache"; inherit (finalAttrs) src; nativeBuildInputs = [ - yarn + yarn-berry cacert writableTmpDirAsHomeHook ]; @@ -96,12 +98,17 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-e5GNWgeYw4CcpOGDd/LNk+syBupqAuws0hz+wUbaFL4="; + outputHash = "sha256-XpVygLwK/vjQJ5cDckIRM3Uo5hcahTz/XV1WjBQmOac="; }; + + buildInputs = lib.optionals hostPlatform.isDarwin [ + apple-sdk_15 + ]; + nativeBuildInputs = [ nodejs - yarn + yarn-berry cargo rustc findutils @@ -113,10 +120,18 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals hostPlatform.isLinux [ copyDesktopItems makeWrapper + ] + ++ lib.optionals hostPlatform.isDarwin [ + # bindgenHook is needed to build `coreaudio-sys` on darwin + rustPlatform.bindgenHook ]; - # force yarn install run in CI mode - env.CI = "1"; + env = { + # force yarn install run in CI mode + CI = "1"; + # `LIBCLANG_PATH` is needed to build `coreaudio-sys` on darwin + LIBCLANG_PATH = lib.optionalString hostPlatform.isDarwin "${lib.getLib llvmPackages.libclang}/lib"; + }; # Remove code under The AFFiNE Enterprise Edition (EE) license. # Keep file package.json for `yarn install --immutable` lockfile check. diff --git a/pkgs/by-name/af/afpfs-ng/package.nix b/pkgs/by-name/af/afpfs-ng/package.nix deleted file mode 100644 index 75199dda96e9..000000000000 --- a/pkgs/by-name/af/afpfs-ng/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fuse, - readline, - libgcrypt, - gmp, -}: - -stdenv.mkDerivation { - pname = "afpfs-ng"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "simonvetter"; - repo = "afpfs-ng"; - rev = "f6e24eb73c9283732c3b5d9cb101a1e2e4fade3e"; - sha256 = "125jx1rsqkiifcffyjb05b2s36rllckdgjaf1bay15k9gzhwwldz"; - }; - - # Add workaround for -fno-common toolchains like upstream gcc-10 to - # avoid build failures like: - # ld: afpcmd-cmdline_main.o:/build/source/cmdline/cmdline_afp.h:4: multiple definition of - # `full_url'; afpcmd-cmdline_afp.o:/build/source/cmdline/cmdline_afp.c:27: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - buildInputs = [ - fuse - readline - libgcrypt - gmp - ]; - - meta = with lib; { - homepage = "https://github.com/simonvetter/afpfs-ng"; - description = "Client implementation of the Apple Filing Protocol"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/by-name/ag/age-plugin-1p/package.nix b/pkgs/by-name/ag/age-plugin-1p/package.nix new file mode 100644 index 000000000000..453c3752cbdf --- /dev/null +++ b/pkgs/by-name/ag/age-plugin-1p/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "age-plugin-1p"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "Enzime"; + repo = "age-plugin-1p"; + tag = "v${version}"; + hash = "sha256-QYHHD7wOgRxRVkUOjwMz5DV8oxlb9mmb2K4HPoISguU="; + }; + + vendorHash = "sha256-WrdwhlaqciVEB2L+Dh/LEeSE7I3+PsOTW4c+0yOKzKY="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Use SSH keys from 1Password with age"; + mainProgram = "age-plugin-1p"; + homepage = "https://github.com/Enzime/age-plugin-1p"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ Enzime ]; + }; +} diff --git a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix index e5ee7c0a4040..317d1296f66b 100644 --- a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix +++ b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix @@ -24,16 +24,16 @@ let in buildGoModule rec { pname = "age-plugin-fido2-hmac"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "olastor"; repo = "age-plugin-fido2-hmac"; rev = "v${version}"; - hash = "sha256-q77j+b0GDJhkCDLJYfIH2ZXqiwTC+ZM8CqXFv11UFaE="; + hash = "sha256-DQVNUvKUyx1MUpWy5TeL1FYM5s8eeoNnNjKYozVgAxE="; }; - vendorHash = "sha256-wNJnpCg5fmzGe45r7LDpr9OBujTzenFhFlxvSj/URbY="; + vendorHash = "sha256-/H4zHfaRw2EqV8p57Y1Lgb2N1VXBucetvl7mJ6Jdu/8="; ldflags = [ "-s" diff --git a/pkgs/by-name/ag/age-plugin-ledger/package.nix b/pkgs/by-name/ag/age-plugin-ledger/package.nix new file mode 100644 index 000000000000..c885ff169ff8 --- /dev/null +++ b/pkgs/by-name/ag/age-plugin-ledger/package.nix @@ -0,0 +1,48 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libusb1, + openssl, + rage, +}: + +rustPlatform.buildRustPackage rec { + pname = "age-plugin-ledger"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "Ledger-Donjon"; + repo = "age-plugin-ledger"; + rev = "v${version}"; + hash = "sha256-g5GbWXhaGEafiM3qkGlRXHcOzPZl2pbDWEBPg4gQWcg="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-zR7gJNIqno50bQo0kondCxEC0ZgssqXNqACF6fnLDrc="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libusb1 + openssl + ]; + + nativeCheckInputs = [ + rage + ]; + + meta = with lib; { + description = "Ledger Nano plugin for age"; + mainProgram = "age-plugin-ledger"; + homepage = "https://github.com/Ledger-Donjon/age-plugin-ledger"; + license = with licenses; [ + mit + asl20 + ]; + maintainers = with maintainers; [ erdnaxe ]; + }; +} diff --git a/pkgs/by-name/ag/age-plugin-se/package.nix b/pkgs/by-name/ag/age-plugin-se/package.nix new file mode 100644 index 000000000000..49f485ee2b64 --- /dev/null +++ b/pkgs/by-name/ag/age-plugin-se/package.nix @@ -0,0 +1,66 @@ +{ + lib, + fetchFromGitHub, + swiftPackages, + swift, + swiftpm, + nix-update-script, +}: +let + inherit (swiftPackages) stdenv; +in +stdenv.mkDerivation (finalAttrs: { + pname = "age-plugin-se"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "remko"; + repo = "age-plugin-se"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sg73DzlW4aXNbIIePZox4JkF10OfsMtPw0q/0DWwgDk="; + }; + + nativeBuildInputs = [ + swift + swiftpm + ]; + + # Can't find libdispatch without this on NixOS. (swift 5.8) + LD_LIBRARY_PATH = lib.optionalString stdenv.isLinux "${swiftPackages.Dispatch}/lib"; + + postPatch = + let + swift-crypto = fetchFromGitHub { + owner = "apple"; + repo = "swift-crypto"; + # FIXME: Update to a newer version once https://github.com/NixOS/nixpkgs/issues/343210 is fixed + # This is the last version to support swift tools 5.8 which is newest version supported by nixpkgs: + # https://github.com/apple/swift-crypto/commit/35703579f63c2518fc929a1ce49805ba6134137c + tag = "3.7.1"; + hash = "sha256-zxmHxTryAezgqU5qjXlFFThJlfUsPxb1KRBan4DSm9A="; + }; + in + '' + ln -s ${swift-crypto} swift-crypto + substituteInPlace Package.swift --replace-fail 'url: "https://github.com/apple/swift-crypto.git"' 'path: "./swift-crypto"), //' + ''; + + makeFlags = [ + "PREFIX=$(out)" + "RELEASE=1" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Age plugin for Apple's Secure Enclave"; + homepage = "https://github.com/remko/age-plugin-se/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + onnimonni + remko + ]; + mainProgram = "age-plugin-se"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ag/age-plugin-sss/package.nix b/pkgs/by-name/ag/age-plugin-sss/package.nix index 036b110ed493..c678c49d7de8 100644 --- a/pkgs/by-name/ag/age-plugin-sss/package.nix +++ b/pkgs/by-name/ag/age-plugin-sss/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "age-plugin-sss"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "olastor"; repo = "age-plugin-sss"; tag = "v${version}"; - hash = "sha256-4cLQRG4Al1C3x/D385kb/aYTlQqe/5bS9oMLJmHOJ1I="; + hash = "sha256-ZcL1bty4qMWVl8zif9tAWFKZiTFklHxaAHESpapZ4WM="; }; - vendorHash = "sha256-HQavX6X2k/oABnHXAnOwHNkGpCTr539zRk0xwO8zS9o="; + vendorHash = "sha256-Sr+6Tgbm7n8gQMqZng3kyzmpMgBZaIX1oEn6nV5c89U="; ldflags = [ "-s" diff --git a/pkgs/by-name/ag/age/package.nix b/pkgs/by-name/ag/age/package.nix index 91c368133fc2..0a0c0a43eed9 100644 --- a/pkgs/by-name/ag/age/package.nix +++ b/pkgs/by-name/ag/age/package.nix @@ -3,10 +3,13 @@ buildGoModule, fetchFromGitHub, installShellFiles, - age-plugin-tpm, - age-plugin-ledger, - age-plugin-yubikey, age-plugin-fido2-hmac, + age-plugin-ledger, + age-plugin-se, + age-plugin-sss, + age-plugin-tpm, + age-plugin-yubikey, + age-plugin-1p, makeWrapper, runCommand, }: @@ -57,10 +60,13 @@ buildGoModule (final: { # group age plugins together passthru.plugins = { inherit - age-plugin-tpm - age-plugin-ledger - age-plugin-yubikey age-plugin-fido2-hmac + age-plugin-ledger + age-plugin-se + age-plugin-sss + age-plugin-tpm + age-plugin-yubikey + age-plugin-1p ; }; diff --git a/pkgs/by-name/ag/agenda/package.nix b/pkgs/by-name/ag/agenda/package.nix index ee1d83855686..b3553b8eb1b5 100644 --- a/pkgs/by-name/ag/agenda/package.nix +++ b/pkgs/by-name/ag/agenda/package.nix @@ -59,7 +59,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple, fast, no-nonsense to-do (task) list designed for elementary OS"; homepage = "https://github.com/dahenson/agenda"; - maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; + maintainers = with maintainers; [ xiorcale ]; + teams = [ teams.pantheon ]; platforms = platforms.linux; license = licenses.gpl3; mainProgram = "com.github.dahenson.agenda"; diff --git a/pkgs/by-name/ag/agnos/package.nix b/pkgs/by-name/ag/agnos/package.nix new file mode 100644 index 000000000000..cc171a165971 --- /dev/null +++ b/pkgs/by-name/ag/agnos/package.nix @@ -0,0 +1,33 @@ +{ + fetchFromGitHub, + lib, + nixosTests, + rustPlatform, + openssl, + pkg-config, +}: +rustPlatform.buildRustPackage rec { + pname = "agnos"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "krtab"; + repo = "agnos"; + rev = "v${version}"; + hash = "sha256-hSiJvpTQIbhz/0AFBTvgfRDTqOi9YcDOvln15SksMJs="; + }; + + cargoHash = "sha256-wmnfAvtTjioslSdD6z0mMl3Hz46wpPYMk494r9xXj44="; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + meta = with lib; { + description = "Obtains certificates from Let's Encrypt using DNS-01 without the need for API access to the DNS provider"; + homepage = "https://github.com/krtab/agnos"; + license = licenses.mit; + maintainers = with maintainers; [ justinas ]; + }; + + passthru.tests = nixosTests.agnos; +} diff --git a/pkgs/by-name/ah/ahoy/package.nix b/pkgs/by-name/ah/ahoy/package.nix index a1bd10628946..3ce01640ca15 100644 --- a/pkgs/by-name/ah/ahoy/package.nix +++ b/pkgs/by-name/ah/ahoy/package.nix @@ -2,33 +2,42 @@ lib, fetchFromGitHub, buildGoModule, + versionCheckHook, nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "ahoy"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "ahoy-cli"; repo = "ahoy"; - tag = "v${version}"; - hash = "sha256-xwjfY9HudxVz3xEEyRPtWysbojtan56ABBL3KgG0J/8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-wYsPutdO9ZkXQu4mrFV56mrJTeSFF/3oRaHO0ia7DHk="; }; + sourceRoot = "${finalAttrs.src.name}/v2"; + # vendor folder exists vendorHash = null; - passthru = { - updateScript = nix-update-script { }; - }; + ldflags = [ "-X main.version=${finalAttrs.version}" ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; meta = { description = "Create self-documenting cli programs from YAML files"; homepage = "https://github.com/ahoy-cli/ahoy"; - changelog = "https://github.com/ahoy-cli/ahoy/releases/tag/v${version}"; + changelog = "https://github.com/ahoy-cli/ahoy/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ genga898 ]; mainProgram = "ahoy"; }; -} +}) diff --git a/pkgs/by-name/ai/aichat/package.nix b/pkgs/by-name/ai/aichat/package.nix index 63b99c08d560..88a31667aa53 100644 --- a/pkgs/by-name/ai/aichat/package.nix +++ b/pkgs/by-name/ai/aichat/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; tag = "v${version}"; - hash = "sha256-gs2nkZhz26tmFbAShLsFOgYt/RlPiqKTmdaPSG96m3E="; + hash = "sha256-5fXZfRrHBAtjUa1VzzsdoFvXQSPQ8YUNJ7yhZlp58tM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-cDYxT8WvryTLzBeMtp/iObdSfF84W1XT8ZN/nmoZfFY="; + cargoHash = "sha256-YK2mps9DUs4HNFmYHtZHTJREuImlQ24y64ykGr8ovTs="; nativeBuildInputs = [ pkg-config @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ai/aide/package.nix b/pkgs/by-name/ai/aide/package.nix index 43a9849688de..9ec1e6d05692 100644 --- a/pkgs/by-name/ai/aide/package.nix +++ b/pkgs/by-name/ai/aide/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "aide"; - version = "0.18.8"; + version = "0.19"; src = fetchurl { url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-FmYtxjLRfixWMLgBdS+XkSqOIml8Bl694XXxzDe4OmA="; + sha256 = "sha256-5/ugIUvgEpnXY1m/8pdSM+0kEzLkz8//Wc0baomrpeQ="; }; buildInputs = [ diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index a05dead8c537..97c1dd836453 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -4,34 +4,23 @@ pkg-config, rustPlatform, fetchFromGitHub, - darwin, - stdenv, }: rustPlatform.buildRustPackage rec { pname = "aiken"; - version = "1.1.15"; + version = "1.1.17"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; rev = "v${version}"; - hash = "sha256-zbtsSEWgzhMeRMLb/ocsbz28lYXbSgucnPLVB9z7iwo="; + hash = "sha256-bEsBLihMqYHJa5913Q434xKVufxTrcaxwcANPV9u37U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-k4gjgeQTZQw0OU1bHJPWskeZ974pTJGaKaIpM5+lZeU="; + cargoHash = "sha256-Ob4UuBLD6HFbghv4E2XMj+xVeUSFtc9qPUNuUDgZeQA="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ai/ain/package.nix b/pkgs/by-name/ai/ain/package.nix index 3b6d29815fc9..22b8ca8b173e 100644 --- a/pkgs/by-name/ai/ain/package.nix +++ b/pkgs/by-name/ai/ain/package.nix @@ -4,31 +4,34 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "ain"; - version = "1.4.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "jonaslu"; repo = "ain"; - rev = "v${version}"; - hash = "sha256-JEavBPnF3WW6oCZ1OC8g1dZev4qC7bi74/q2nvXK3mo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-jZTdFA3ZNb0xIN7+ne5bz6jMpj4jqZ/JHxz2x83fBm8="; }; - vendorHash = "sha256-+72Y8SKvx7KBK5AIBWKlDqQYpHnZc9CNxCdo4yakPb0="; + vendorHash = "sha256-VLn7JPYYFmQ/9c0zKHWJBqtxwCbWgsN4FHlXrQiKMj4="; ldflags = [ "-s" "-w" - "-X=main.gitSha=${src.rev}" + "-X=main.gitSha=${finalAttrs.src.tag}" ]; - meta = with lib; { + # need network + doCheck = false; + + meta = { description = "HTTP API client for the terminal"; homepage = "https://github.com/jonaslu/ain"; - changelog = "https://github.com/jonaslu/ain/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + changelog = "https://github.com/jonaslu/ain/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "ain"; }; -} +}) diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix index 651668ce045a..4e6e75f250aa 100644 --- a/pkgs/by-name/ai/air-formatter/package.nix +++ b/pkgs/by-name/ai/air-formatter/package.nix @@ -7,20 +7,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "air-formatter"; - version = "0.4.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "posit-dev"; repo = "air"; tag = finalAttrs.version; - hash = "sha256-ePTbXwOYIJF8xsiHR03EUwQnKP8KSN/8S8iRY8ME988="; + hash = "sha256-32/wdz4CFYM/PFVSQiqYErXGHHn2KJyreiQq48vQryY="; }; # Remove duplicate entries from cargo lock cargoPatches = [ ./cargo-lock.patch ]; useFetchCargoVendor = true; - cargoHash = "sha256-EHhelQDXGLZqbUia84OqU7frlRBXfi2oPDxhLuW7d64="; + cargoHash = "sha256-zPT47K8OGtprxQt3ZOF2xmf6IRV5rsKWXeaXlyBdVlE="; useNextest = true; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/air"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ai/aircrack-ng/package.nix b/pkgs/by-name/ai/aircrack-ng/package.nix index fdc2284305e8..b9c42d6cb30b 100644 --- a/pkgs/by-name/ai/aircrack-ng/package.nix +++ b/pkgs/by-name/ai/aircrack-ng/package.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { description = "WiFi security auditing tools suite"; homepage = "https://www.aircrack-ng.org/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ caralice ]; + maintainers = with lib.maintainers; [ magistau ]; platforms = with lib.platforms; builtins.concatLists [ diff --git a/pkgs/by-name/ai/airdrop-cli/package.nix b/pkgs/by-name/ai/airdrop-cli/package.nix new file mode 100644 index 000000000000..805fd28bcbbd --- /dev/null +++ b/pkgs/by-name/ai/airdrop-cli/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + swift, + swiftPackages, + swiftpm, +}: + +# Doesn't build without using the same stdenv (and Clang) to build swift +swiftPackages.stdenv.mkDerivation { + pname = "airdrop-cli"; + version = "0-unstable-2024-04-13"; + + src = fetchFromGitHub { + owner = "vldmrkl"; + repo = "airdrop-cli"; + rev = "dcdd570c3af3aae509ba7ad9fb26782b427f3a1a"; + hash = "sha256-7gKKeedRayf27XrOhntu41AMXgxc7fqJRE8Jhbihh3o="; + }; + + nativeBuildInputs = [ + swift + swiftpm + ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = { + description = "Use Airdrop from the CLI on macOS written in Swift"; + homepage = "https://github.com/vldmrkl/airdrop-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Enzime ]; + mainProgram = "airdrop"; + platforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/ai/airtame/package.nix b/pkgs/by-name/ai/airtame/package.nix index 50d792059907..e67d572ccdef 100644 --- a/pkgs/by-name/ai/airtame/package.nix +++ b/pkgs/by-name/ai/airtame/package.nix @@ -66,11 +66,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "airtame-application"; - version = "4.12.0"; + version = "4.13.1"; src = fetchurl { url = "https://downloads.airtame.com/app/latest/linux/Airtame-${finalAttrs.version}.deb"; - hash = "sha256-HTqJ637iPtiReFLoGdgKkpxW0UGRPvLjgMMcVV+cRfY="; + hash = "sha256-3VvEsohH2siC2SxdrWSg0sjlbrBC2VR3NY5m6Q2YKHU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix index e36aed4a6046..f622c15f192e 100644 --- a/pkgs/by-name/ai/airwin2rack/package.nix +++ b/pkgs/by-name/ai/airwin2rack/package.nix @@ -53,7 +53,7 @@ let vcvRackSdk = srcOnly vcv-rack; pname = "airwin2rack"; - version = "2.13.0"; + version = "2.13.0-unstable-2025-04-07"; in stdenv.mkDerivation { inherit pname; @@ -62,8 +62,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "baconpaul"; repo = "airwin2rack"; - tag = "DAWPlugin"; - hash = "sha256-xjE9M5fMeOOYncq7xe+v++XvfUL6QZc2tF0jnYWSwKQ="; + rev = "595eb7c7ccec5f9e662f8d620579a91dab60c1ff"; + hash = "sha256-gBphJ6WSPw6DOQk64w8GmLrtuYSF7NFEf6xK1oxOF3w="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index 1d324fa7e43d..ea41dc9fbf98 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-03-23"; + version = "0-unstable-2025-04-27"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "9de336a436cb5ea1e47a319947acb1ea44cede6e"; - hash = "sha256-gI5dmI5ysoCmUBTL6CgUw+F/K8D4RbXlXNTpIJMbotk="; + rev = "f8a3f0d1b4ba5ad15777a7143f338731b9658d1a"; + hash = "sha256-Kdz8Q71LHeYhH+Lbgg9fhAYsC62LJLdQo5R+h9DwpXY="; }; # we patch helpers because honestly im spooked out by where those variables diff --git a/pkgs/by-name/ai/aisleriot/package.nix b/pkgs/by-name/ai/aisleriot/package.nix index 25752df90425..d68221a23384 100644 --- a/pkgs/by-name/ai/aisleriot/package.nix +++ b/pkgs/by-name/ai/aisleriot/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/aisleriot"; description = "Collection of patience games written in guile scheme"; mainProgram = "sol"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/ai/aixlog/package.nix b/pkgs/by-name/ai/aixlog/package.nix index f8e7253d303c..4504e8f964f2 100644 --- a/pkgs/by-name/ai/aixlog/package.nix +++ b/pkgs/by-name/ai/aixlog/package.nix @@ -32,6 +32,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/badaix/aixlog"; changelog = "https://github.com/badaix/aixlog/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/ak/akira-unstable/package.nix b/pkgs/by-name/ak/akira-unstable/package.nix index c6b880c69e5c..43b8de632e5c 100644 --- a/pkgs/by-name/ak/akira-unstable/package.nix +++ b/pkgs/by-name/ak/akira-unstable/package.nix @@ -68,13 +68,11 @@ stdenv.mkDerivation rec { description = "Native Linux Design application built in Vala and GTK"; homepage = "https://github.com/akiraux/Akira"; license = licenses.gpl3Plus; - maintainers = - with maintainers; - [ - Br1ght0ne - neonfuz - ] - ++ teams.pantheon.members; + maintainers = with maintainers; [ + Br1ght0ne + neonfuz + ]; + teams = [ teams.pantheon ]; platforms = platforms.linux; mainProgram = "com.github.akiraux.akira"; }; diff --git a/pkgs/by-name/al/alacarte/package.nix b/pkgs/by-name/al/alacarte/package.nix index 2d4309a193a2..a39f8f9435f2 100644 --- a/pkgs/by-name/al/alacarte/package.nix +++ b/pkgs/by-name/al/alacarte/package.nix @@ -17,14 +17,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "alacarte"; - version = "3.54.1"; + version = "3.56.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "alacarte"; rev = version; - hash = "sha256-nfSYbGZvx76UzHGf6Jxq8Ny5o9NX5nXG9Kc/gRNn6HM="; + hash = "sha256-sH/2ULI1QEqmgFIFFnOwsx2/+TMt+bPu0l0LUcnBgWg="; }; format = "other"; diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix index 5df6dc00cd65..df06e6abf25e 100644 --- a/pkgs/by-name/al/alacritty-theme/package.nix +++ b/pkgs/by-name/al/alacritty-theme/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (self: { pname = "alacritty-theme"; - version = "0-unstable-2025-03-20"; + version = "0-unstable-2025-05-15"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "86c578469e2bf784faf6f916883bf48349ff4f6d"; - hash = "sha256-0phAQvPPiwE7MneaN7XoLZKPgAIDGYf3fYvYUjhbts8="; + rev = "59a96ef4c734f97a1aadaa619b31cc1ca90a0fbc"; + hash = "sha256-7Qu00+odZblXqN9e3uVZWfIWySFT0IiwIyK5wEbtReE="; sparseCheckout = [ "themes" ]; }; diff --git a/pkgs/by-name/al/alan/package.nix b/pkgs/by-name/al/alan/package.nix new file mode 100644 index 000000000000..7e60a031a796 --- /dev/null +++ b/pkgs/by-name/al/alan/package.nix @@ -0,0 +1,60 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cgreen, + openjdk, + pkg-config, + which, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "alan"; + version = "3.0beta8"; + + src = fetchFromGitHub { + owner = "alan-if"; + repo = "alan"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-9F99rr7tdkaGPHtD92ecmUxO6xrjQDRhGtSTVbMLz30="; + }; + + postPatch = '' + patchShebangs --build bin + # The Makefiles have complex CFLAGS that don't allow separate control of optimization + sed -i 's/-O0/-O2/g' compiler/Makefile.common + sed -i 's/-Og/-O2/g' interpreter/Makefile.common + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/alan/examples + # Build the release tarball + make package + # The release tarball isn't split up into subdirectories + tar -xf alan*.tgz --strip-components=1 -C $out/share/alan + mv $out/share/alan/*.alan $out/share/alan/examples + chmod a-x $out/share/alan/examples/*.alan + mv $out/share/alan/{alan,arun} $out/bin + # a2a3 isn't included in the release tarball + cp bin/a2a3 $out/bin + + runHook postInstall + ''; + + nativeBuildInputs = [ + cgreen + openjdk + pkg-config + which + ]; + + meta = { + homepage = "https://www.alanif.se/"; + description = "Alan interactive fiction language"; + license = lib.licenses.artistic2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ neilmayhew ]; + }; +}) diff --git a/pkgs/by-name/al/alan_2/package.nix b/pkgs/by-name/al/alan_2/package.nix new file mode 100644 index 000000000000..fe6530446584 --- /dev/null +++ b/pkgs/by-name/al/alan_2/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + lib, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "alan2"; + version = "2.8.7"; + + src = fetchFromGitHub { + owner = "alan-if"; + repo = "alan"; + rev = "71f23ec79f7f5d66aa5ae9fd3f9b8dae41a89f15"; + hash = "sha256-lqrMnfANgQtXTAmzxzHaJMAyqHNOdrerjtrs8LGd0hg="; + }; + + makefile = "Makefile.unix"; + + env.NIX_CFLAGS_COMPILE = toString [ + # Add a workaround for -fno-common toolchains like upstream gcc-10. + # alan-3 is already fixed, but the backport is nontrivial. + "-fcommon" + # smScSema.c:142:11: error: assignment to 'unsigned char *' from incompatible pointer type 'unsigned char **' [-Wincompatible-pointer-types] + "-Wno-error=incompatible-pointer-types" + # smScSema.c:183:10: error: implicit declaration of function 'read'; did you mean 'fread'? [-Wimplicit-function-declaration] + "-Wno-error=implicit-function-declaration" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/alan2 + cp compiler/alan $out/bin/alan2 + cp interpreter/arun $out/bin/arun2 + cp alan.readme ChangeLog $out/share/alan2 + + runHook postInstall + ''; + + meta = { + homepage = "https://www.alanif.se/"; + description = "Alan interactive fiction language (legacy version)"; + license = lib.licenses.artistic2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ neilmayhew ]; + }; +} diff --git a/pkgs/by-name/al/albedo/package.nix b/pkgs/by-name/al/albedo/package.nix index 55645a6dc6ce..798163a70791 100644 --- a/pkgs/by-name/al/albedo/package.nix +++ b/pkgs/by-name/al/albedo/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "albedo"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "coreruleset"; repo = "albedo"; tag = "v${version}"; - hash = "sha256-Yx8C44/Dy4hlmCxpuTjhqwwvEZq6HOdvq1AeNRd17MM="; + hash = "sha256-4ZQTOix5bCn4EmrabiG4L74F2++cQhIbvtgNKBW7aDk="; }; vendorHash = "sha256-qZga699UjBsPmOUSN66BFInl8Bmk42HiVn0MfPlxRE4="; diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix index 172a4d709435..c474a0bcc86c 100644 --- a/pkgs/by-name/al/albert/package.nix +++ b/pkgs/by-name/al/albert/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.27.5"; + version = "0.27.8"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; tag = "v${finalAttrs.version}"; - hash = "sha256-rdBNh9TICeOpglaJ5OJbE/f4W/UPqCkhp8H/H2OBTRM="; + hash = "sha256-UZJS61YeieA68PUNgudpjn1iWHCTvhXpt3uXJAkJtCg="; fetchSubmodules = true; }; @@ -77,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: { # See: https://github.com/NixOS/nixpkgs/issues/279226 license = lib.licenses.unfree; maintainers = with lib.maintainers; [ - ericsagnes synthetica eljamm ]; diff --git a/pkgs/by-name/al/alda/deps.json b/pkgs/by-name/al/alda/deps.json new file mode 100644 index 000000000000..d765cb5cf6a7 --- /dev/null +++ b/pkgs/by-name/al/alda/deps.json @@ -0,0 +1,269 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "net/java/dev/jna#jna/5.6.0": { + "jar": "sha256-VVfiNaiqL5dm1dxgnWeUjyqIMsLXls6p7x1svgs7fq8=", + "pom": "sha256-X+gbAlWXjyRhbTexBgi3lJil8wc+HZsgONhzaoMfJgg=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-android-extensions/1.7.21": { + "jar": "sha256-JVeliP7QxmbRVq1uDfXjFOqz1p5m6aJyJ5uaRiQ0xq8=", + "pom": "sha256-8pic3UN0A8hyZc/K8GHSFOaGlVyX40ntFWa6FqouDI0=" + }, + "org/jetbrains/kotlin#kotlin-annotation-processing-gradle/1.7.21": { + "jar": "sha256-RhyKdFvNVeRyXykBIVnUdOEor/G4KlPR80UkYFK5cwk=", + "pom": "sha256-r2JZxfjfTezw8FXmZcTLaP8TtK9c1HfuHTO/7gAaFr4=" + }, + "org/jetbrains/kotlin#kotlin-build-common/1.7.21": { + "jar": "sha256-Y3O9HhUPfcsnL1KvvBWZBkCSqddbKM7WvroA/qy6u/8=", + "pom": "sha256-msmBVHbIUfFKH3QeG46CJRxyepVGgMdXT4owUn2z718=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.7.21": { + "jar": "sha256-Ty5JK8x5XgaA4/h67qGtrp8wbK9SBAuUpvoPiP2skvk=", + "pom": "sha256-CwIzMip2MO/eEzUmjkYSPw1tNjg5gg/TfE7Lbv+njjs=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/1.7.21": { + "jar": "sha256-LdVae/7udr97ASbFtx0FuJmBK6a0Cjc1n50T+uIC8yc=", + "pom": "sha256-+JDieVykDuyu+jpdjkOND3C7YCo5SUe7rOp2Quqy+Tw=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/1.7.21": { + "jar": "sha256-tyPlHq8syE/a+sqHJnk/7I1SFyUNiAv0eDA/JE3UGoU=", + "pom": "sha256-Be4Gj7v3IvWRSlqiWO6KKLZChF9B1/+bVGhtXKJbvxk=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.7.21": { + "jar": "sha256-A+bwJUNSJIlOSe5e2EfLCwtKh540z6uQ1wzakmKnV00=", + "pom": "sha256-vB3pwgh7ouTlQQF6i66PQF7IAKGK5MJH6R8rVedh5kk=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.7.21": { + "jar": "sha256-rflytT2LY7s2jZA88y6bB+pTZW6PnaXxDfuv03gxviE=", + "module": "sha256-zGXnGhweng0JaG9cpJGORShIY1q7VCl15HwYlnw6A10=", + "pom": "sha256-89unBFqYcdah5QnkF+tjQa3bmHFaL409ZnJlAdq0s0Y=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.7.21/gradle71": { + "jar": "sha256-rflytT2LY7s2jZA88y6bB+pTZW6PnaXxDfuv03gxviE=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/1.7.21": { + "jar": "sha256-NZhwZybLzo0oE05oiZw9WAv3LH6/kJcUHY28rtgnmHg=", + "pom": "sha256-PRwDYK9odF8qAyoMAYR//Pnriq1wa/ZZydhAoYTsXyM=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/1.7.21": { + "jar": "sha256-C1dqyzeBqctWEKphxbev3zKQ/C2digzUv+FTe4dcReY=", + "module": "sha256-ygHy2JJMcpaXMax+oVbwi7GP60LDEAClIj2dwW1ZuTg=", + "pom": "sha256-Flz/idoRsXIpiJPHg0sNQadm1/PdIPoIvfiJxlXD5zc=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.7.21": { + "jar": "sha256-FNP/F7o8tMi+uK3297QFB4gTS4kbsTyr5yPIwQ0dDhg=", + "module": "sha256-kCJoZCp1guVF4xgQnjdIw3WxOLCKFVuBX2yAi7vuR7U=", + "pom": "sha256-y2vKOdHhBWBXcMCj3ubUXw58XtPFNGiZ9ycQsf//HaY=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/1.7.21": { + "module": "sha256-j6I2KYtJBynes0XjG8ZPKSj3wbXxwjH8ZtvINlnBZ+E=", + "pom": "sha256-0gTXpKcf6Scv44M9x0IAkan/EJaky6JfcnihlUI1BGk=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/1.7.21/gradle71": { + "jar": "sha256-P12cqfSxiGOZjcVpNIk9m1ICRRzucJ+uuXbI+rI2cyI=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.7.21": { + "jar": "sha256-MOGWrbAAH9F7ZgNe2QcNPw5Hui0ycTt1wwPGt7e3FeI=", + "pom": "sha256-so6g3vy5lNH7U6e7olh9J0DG0mAXk2UglP1ox0Ul0CA=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/1.7.21": { + "jar": "sha256-k1KYF/2Nj9hlItZqqtyr0UKhcueMz+uUnNKJ40xw+Qs=", + "pom": "sha256-CEYFdUhagoAZC0g8H3fyCk063IegIXTzDuxVdNm65FY=" + }, + "org/jetbrains/kotlin#kotlin-project-model/1.7.21": { + "jar": "sha256-4htTvrj3SxM6Y4mClPSlfcSiKJvoVfZrD5rosVYjFT8=", + "pom": "sha256-JQfT7SKoHyssNSxMUOY1MivHEQClFQJN0NtQRifJ8Bs=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/1.7.21": { + "jar": "sha256-0ZLMLNlDFecijrkTZqNpdmpoIrPOvKwUwR1MSXM2y6Q=", + "pom": "sha256-2xzYRWGPDLQXOK3H72jZ+NIjZ1sFg+NbsMCEA30AWe4=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.7.21": { + "jar": "sha256-qu9jHwICEl2ZHZgjRxn4ZK1anW40m/DtRGsTd9gXGKE=", + "pom": "sha256-xHXL2+0BepcMD9y46qu1UNc9E6T+a4e3efxM9S148JM=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.7.21": { + "jar": "sha256-ZOK9uuvzgJSzwh5nCX5Qe4NoTaQTi6h6CwmhMgOXVCg=", + "pom": "sha256-5c0+HEj+qhC1YVqidOFh5/dcFijcJhZ1ALZ0b4gfweM=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/1.7.21": { + "jar": "sha256-Uz441a1oFCoFE0HyK8cO113IUGSxk3rPBRN1XMPwSF4=", + "pom": "sha256-cnwtOnluoiOWPu7P7kHvKygsVbZ+V8O0mgFwpMSbfGE=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/1.7.21": { + "jar": "sha256-N5fxg1NC+8EuycHU+YMyugKCkaMyUakHySJ9j9lK7kg=", + "pom": "sha256-tw2g1Eorhw7Lz85ZcMMOOOLs3htfQqHdRC0TA5gSKUY=" + }, + "org/jetbrains/kotlin#kotlin-util-io/1.7.21": { + "jar": "sha256-7MKI4AQqAUdgOeILbOXgaRj+8fic+J9V39KO8Xwm800=", + "pom": "sha256-ziTM1kPWW+8Cey9uINCnkhdq29ug2eVVmS5CR6Y3Ne8=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/1.7.21": { + "jar": "sha256-UgkkU0RkIN+7h4BN6s6yGfVI53fm3xK35wRKOmaHEgs=", + "pom": "sha256-D8d7J3Rc+kzuX+AA5tEpmtSUT3rMB4A7u8ws0rAT3oU=" + }, + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/1.7.21": { + "pom": "sha256-18S+c5nTziimR77ivh3nCwUdpLqoz9X4KYNDJ2UKD30=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": { + "jar": "sha256-eNbMcTX4TWkv83Uvz9H6G74JQNffcGUuTx6u7Ax4r7s=", + "module": "sha256-yIXdAoEHbFhDgm3jF+PLzcPYhZ2+71OuHPrNG5xg+W4=", + "pom": "sha256-U2IuA3eN+EQPwBIgGjW7S9/kAWTv7GErvvze7LL/wqs=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/beust#klaxon/5.5": { + "jar": "sha256-f3Dsuhzc49DOpclOquGebQxaghgbbCTT3YCKNBnoNmM=", + "module": "sha256-cTrnhsjIf450jQbQoAExvIoDm8D8CiW/hPlV7VfMVsk=", + "pom": "sha256-teJXipFEa32OdDdaMvcHE4Txk2PIgVVKeC+oi9rc4G0=" + }, + "com/github/ajalt#clikt/2.4.0": { + "jar": "sha256-y21C07flGUor7O60y2LyYbteF0ZO/UEoWCOx0CaX5NM=", + "pom": "sha256-NzDHKP9dkuJfCDJCAtZtUrjqo6pxK15lz2pk+7LQWu0=" + }, + "com/illposed/osc#javaosc-core/0.8": { + "jar": "sha256-7PP/me8hI4cOUWtC4ey+JDiTHqgPOpAFWB3j4JxPEa0=", + "pom": "sha256-mNnI2Dr2I8tkc2WpiY8o6+l8xE7IvEuSu2RnxbN3iig=" + }, + "com/illposed/osc#javaosc-parent/0.8": { + "pom": "sha256-nEUgmNlVT1AifJfkGt0/t6mvSSUGgHK/3YywUtl8x3U=" + }, + "io/github/microutils#kotlin-logging/1.7.7": { + "jar": "sha256-1wWAiO9qS6YuCdp5Z3L4Au0bTKiEngcfUaE8BnJ7yNU=", + "pom": "sha256-S5CFtHXe6jjnDkQOqtKXvd64cOe72bSs83Lh6XpufwQ=" + }, + "io/github/soc#directories/11": { + "jar": "sha256-77POMLMv/9qN5mZtpIYCIHOS9+OWbgwuXK92LV8xtNA=", + "pom": "sha256-9TrWtmVBXtGq6uEj/Et/1aAjlJ6YYA3ebUBPJoY41L0=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java/dev/jna#jna/5.6.0": { + "jar": "sha256-VVfiNaiqL5dm1dxgnWeUjyqIMsLXls6p7x1svgs7fq8=", + "pom": "sha256-X+gbAlWXjyRhbTexBgi3lJil8wc+HZsgONhzaoMfJgg=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache/logging#logging-parent/3": { + "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + }, + "org/apache/logging/log4j#log4j-api/2.17.0": { + "jar": "sha256-q5ytyA4jRYDj88jBhkQxT8zUs80/cIXU6TSGbLVhuV0=", + "pom": "sha256-ZCLZr1mssAd+ipHHw0pAYv9WqXMcNINqckJwhOJ6pHk=" + }, + "org/apache/logging/log4j#log4j-core/2.17.0": { + "jar": "sha256-ZcM9ybJKXl9srK5iaAZBWCiUdJx78WyVEDLvkvPhKmA=", + "pom": "sha256-WUQnTrlVkKznwmIB2XJbSrHHZU0pU658wm1z/95AaL4=" + }, + "org/apache/logging/log4j#log4j-slf4j-impl/2.17.0": { + "jar": "sha256-+t6tPpnGeG2PtMLM94EEx+xinUfNsKDxT0gmOWHxfiw=", + "pom": "sha256-2425FiIV2tNpmqWxkBLh4lcivt+S3nhYvY7R/+kGRak=" + }, + "org/apache/logging/log4j#log4j/2.17.0": { + "pom": "sha256-hwRgb663edbSkE8CymFuC5gf44nZ/puJ7ISh5CrugdI=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.7.21": { + "jar": "sha256-Ty5JK8x5XgaA4/h67qGtrp8wbK9SBAuUpvoPiP2skvk=", + "pom": "sha256-CwIzMip2MO/eEzUmjkYSPw1tNjg5gg/TfE7Lbv+njjs=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.7.21": { + "jar": "sha256-A+bwJUNSJIlOSe5e2EfLCwtKh540z6uQ1wzakmKnV00=", + "pom": "sha256-vB3pwgh7ouTlQQF6i66PQF7IAKGK5MJH6R8rVedh5kk=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/1.7.21": { + "jar": "sha256-nTpktCC+2+20HV5tsJ28h2FKffCBR5PACQqDYJBp+1Y=", + "pom": "sha256-bOmRoyzYOdq3wbf88+1xbr6XgbRgg3ViDC9fH8RwjrA=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.7.21": { + "jar": "sha256-wbF65MSTF+7Sb3ecM8lpBEbFZp6zx+Jsibbg1s8sogQ=", + "pom": "sha256-Xn69/iAG9vHksPORwbqBhTmKj2NF2xpStYTx40Cz8EM=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/1.7.21": { + "jar": "sha256-LEmLbZiWTK3dS1hLe0mPmxCPaf8akVOrxlt02uQJJ/Y=", + "pom": "sha256-LuSdd/3Dw6l0akiYCbfGQ3fh2NnEXCDZI+MXI5sicwQ=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/1.7.21": { + "jar": "sha256-0ZLMLNlDFecijrkTZqNpdmpoIrPOvKwUwR1MSXM2y6Q=", + "pom": "sha256-2xzYRWGPDLQXOK3H72jZ+NIjZ1sFg+NbsMCEA30AWe4=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.7.21": { + "jar": "sha256-qu9jHwICEl2ZHZgjRxn4ZK1anW40m/DtRGsTd9gXGKE=", + "pom": "sha256-xHXL2+0BepcMD9y46qu1UNc9E6T+a4e3efxM9S148JM=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.7.21": { + "jar": "sha256-ZOK9uuvzgJSzwh5nCX5Qe4NoTaQTi6h6CwmhMgOXVCg=", + "pom": "sha256-5c0+HEj+qhC1YVqidOFh5/dcFijcJhZ1ALZ0b4gfweM=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/1.7.21": { + "jar": "sha256-Uz441a1oFCoFE0HyK8cO113IUGSxk3rPBRN1XMPwSF4=", + "pom": "sha256-cnwtOnluoiOWPu7P7kHvKygsVbZ+V8O0mgFwpMSbfGE=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.3.50": { + "pom": "sha256-tjlv6ALXvHajgUheJmy5dfOy8tPdm/chOqtsonpWH8E=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.7.21": { + "jar": "sha256-5iv+yiNhA6EBciS4oiqEHbXcTbSdgKOb1E27IkaEpmo=", + "pom": "sha256-LuberkeOGLGvushzHFvxoUe1dWiT1Z7b+nEWBcNDX4Q=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.7.21": { + "jar": "sha256-uMqg+XFaIYf0+pmQba5Xy6EM7vmn+Ajb7o6vNjWVWKU=", + "pom": "sha256-vy6yU9onofKT0RRpMpRBeF26xRceWB8v7Z1aKm2YaZw=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.7.21": { + "jar": "sha256-sy5K5+uwVycz/kOThb8DT1+u6LbFhdQW/s+TPpSR044=", + "pom": "sha256-bzuTQ8QS1q5ApMePuKcJhklkUKlSjNusdimojhqlg4k=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.7.21": { + "jar": "sha256-1Gqddz/7ne5P8adIrIRdyOUABcWJMClRdgorUYe93Rk=", + "pom": "sha256-mzkq1D4vQhJp9jxiBz+ulCN9LjHe7o9msZzBkbTaBqw=" + }, + "org/jetbrains/kotlin#kotlin-test-annotations-common/1.7.21": { + "jar": "sha256-rL18jX1a/ozZJj0T56fr9lAj6tdop723/lXpF6v/PCA=", + "pom": "sha256-g9wLShdNHayV7j+hTG6sY+/BMtneVJjaaY+/IcAaD00=" + }, + "org/jetbrains/kotlin#kotlin-test-common/1.7.21": { + "jar": "sha256-viIcyIaWha97LEDdTl2wIWbODGMiIjdQJ6AH1RefST4=", + "pom": "sha256-82l3EYhGqaGsUURO61wrH8ADdOQEgmmdO5BHccR9Ea8=" + }, + "org/jetbrains/kotlin#kotlin-test-junit/1.7.21": { + "jar": "sha256-uEDz41MSnnZO8oEKLD60oUy9N4OyKMRuFq76xrdjnXA=", + "module": "sha256-Y2wOGDQFBAASi++BC4QLyOaTacNK8Wzcdcc08pY3ba4=", + "pom": "sha256-JuG33A35HRRJeLEF5jrY09f4XD9Nig0Ayzv6A40QbsQ=" + }, + "org/jetbrains/kotlin#kotlin-test/1.7.21": { + "jar": "sha256-gduLV6zilmvvZtsh9AG1BA8IDtNgSgLANsKpEftfUSQ=", + "module": "sha256-oFFqqWK+trPpadPnwMXIIDv3enEWHxL/RXxDr+Q+VIo=", + "pom": "sha256-7cxHqPMffTxln+ebYm673YZp1tqHc8rVf+o+cvfKj/4=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + } + } +} diff --git a/pkgs/by-name/al/alda/package.nix b/pkgs/by-name/al/alda/package.nix index 9dd53d82834a..d62989bb243e 100644 --- a/pkgs/by-name/al/alda/package.nix +++ b/pkgs/by-name/al/alda/package.nix @@ -1,46 +1,109 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + buildGoModule, + gradle, makeWrapper, jre, + symlinkJoin, }: - -stdenv.mkDerivation (finalAttrs: { +let pname = "alda"; version = "2.3.1"; - - src_alda = fetchurl { - url = "https://alda-releases.nyc3.digitaloceanspaces.com/${finalAttrs.version}/client/linux-amd64/alda"; - hash = "sha256-m4d3cLgqWmGMw0SM4J+7nvV/ytSoB7obMDiJCh3yboQ="; + src = fetchFromGitHub { + owner = "alda-lang"; + repo = "alda"; + tag = "release-${version}"; + hash = "sha256-//VfegK8wkGKSpvtsNTEQqbVJkcucNiamoNIXaEBLb8="; }; + license = lib.licenses.epl20; - src_player = fetchurl { - url = "https://alda-releases.nyc3.digitaloceanspaces.com/${finalAttrs.version}/player/non-windows/alda-player"; - hash = "sha256-XwgOidQjnMClXPIS1JPzsVJ6c7vXwBHBAfUPX3WL8uU="; - }; + alda_client = buildGoModule { + pname = "${pname}-client"; + inherit version src; - dontUnpack = true; + sourceRoot = "${src.name}/client"; + vendorHash = "sha256-h09w6ZLirLNxYv/ibeN5pCnXSvT+1FGiXiYNReZBMXI="; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = - let - binPath = lib.makeBinPath [ jre ]; - in - '' - install -D ${finalAttrs.src_alda} $out/bin/alda - install -D ${finalAttrs.src_player} $out/bin/alda-player - - wrapProgram $out/bin/alda --prefix PATH : $out/bin:${binPath} - wrapProgram $out/bin/alda-player --prefix PATH : $out/bin:${binPath} + preBuild = '' + go generate main.go ''; + env.CGO_ENABLED = 0; + ldflags = [ + "-w" + "-extldflags '-static'" + ]; + tags = [ "netgo" ]; + subPackages = [ "." ]; + + postInstall = '' + mv $out/bin/client $out/bin/alda + ''; + + meta = { + inherit license; + homepage = "https://github.com/alda-lang/alda/tree/master/client"; + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; + maintainers = [ lib.maintainers.ericdallo ]; + platforms = lib.platforms.unix; + }; + }; + alda_player = stdenv.mkDerivation { + pname = "${pname}-player"; + inherit version src; + + sourceRoot = "${src.name}/player"; + nativeBuildInputs = [ + gradle + makeWrapper + ]; + + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + __darwinAllowLocalNetworking = true; + + gradleBuildTask = "fatJar"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share} + cp build/libs/alda-player-fat.jar $out/share + + makeWrapper ${lib.getExe jre} $out/bin/alda-player \ + --add-flags "-jar $out/share/alda-player-fat.jar" + + runHook postInstall + ''; + + meta = { + inherit license; + homepage = "https://github.com/alda-lang/alda/tree/master/player"; + maintainers = [ lib.maintainers.ericdallo ]; + platforms = lib.platforms.unix; + }; + }; +in +symlinkJoin { + inherit pname version; + paths = [ + alda_client + alda_player + ]; + meta = { + inherit license; description = "Music programming language for musicians"; homepage = "https://alda.io"; - license = lib.licenses.epl10; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode + ]; maintainers = [ lib.maintainers.ericdallo ]; - platforms = jre.meta.platforms; + platforms = lib.platforms.unix; }; -}) +} diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix index afc5e4b820b6..f3a63b58a25d 100644 --- a/pkgs/by-name/al/aldente/package.nix +++ b/pkgs/by-name/al/aldente/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.31.3"; + version = "1.33"; src = fetchurl { url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-O1PGjq5W/BSnfHrmbd4FrtZ7+k+Be9l/5mmvOtlMXRo="; + hash = "sha256-uUklxpQEVVXp2eZLYBpmAsVo5ziV0zvHRJA4JRiJAJk="; }; dontBuild = true; diff --git a/pkgs/by-name/al/alejandra/package.nix b/pkgs/by-name/al/alejandra/package.nix index 0c39e55ecce1..d694755d2de5 100644 --- a/pkgs/by-name/al/alejandra/package.nix +++ b/pkgs/by-name/al/alejandra/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "3.1.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - hash = "sha256-g0SSfTWZ5mtMOpQic+eqq9sXMy1E/7yKxxfupZd9V4A="; + hash = "sha256-Oi1n2ncF4/AWeY6X55o2FddIRICokbciqFYK64XorYk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-17HoU0GcJlTP254RqFX4gZxEflwJGSbBULA/rg0paUc="; + cargoHash = "sha256-IX4xp8llB7USpS/SSQ9L8+17hQk5nkXFP8NgFKVLqKU="; passthru.tests = { version = testers.testVersion { package = alejandra; }; diff --git a/pkgs/by-name/al/alembic/package.nix b/pkgs/by-name/al/alembic/package.nix new file mode 100644 index 000000000000..08a804fa1514 --- /dev/null +++ b/pkgs/by-name/al/alembic/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + openexr, + hdf5-threadsafe, +}: + +stdenv.mkDerivation rec { + pname = "alembic"; + version = "1.8.8"; + + src = fetchFromGitHub { + owner = "alembic"; + repo = "alembic"; + rev = version; + hash = "sha256-R69UYyvLnMwv1JzEQ6S6elvR83Rmvc8acBJwSV/+hCk="; + }; + + # note: out is unused (but required for outputDoc anyway) + outputs = [ + "bin" + "dev" + "out" + "lib" + ]; + + # Prevent cycle between bin and dev (only occurs on Darwin for some reason) + propagatedBuildOutputs = [ "lib" ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + openexr + hdf5-threadsafe + ]; + + # These flags along with the postPatch step ensure that all artifacts end up + # in the correct output without needing to move anything + # + # - bin: Uses CMAKE_INSTALL_BINDIR (set via CMake setup hooK) + # - lib (contains shared libraries): Uses ALEMBIC_LIB_INSTALL_DIR + # - dev (headers): Uses CMAKE_INSTALL_PREFIX + # (this works because every other install rule uses an absolute DESTINATION) + # - dev (CMake files): Uses ConfigPackageLocation + + cmakeFlags = [ + "-DUSE_HDF5=ON" + "-DUSE_TESTS=ON" + "-DALEMBIC_LIB_INSTALL_DIR=${placeholder "lib"}/lib" + "-DConfigPackageLocation=${placeholder "dev"}/lib/cmake/Alembic" + "-DCMAKE_INSTALL_PREFIX=${placeholder "dev"}" + "-DQUIET=ON" + ]; + + postPatch = '' + find bin/ -type f -name CMakeLists.txt -print -exec \ + sed -i 's/INSTALL(TARGETS \([a-zA-Z ]*\) DESTINATION bin)/INSTALL(TARGETS \1)/' {} \; + ''; + + doCheck = true; + enableParallelChecking = false; + + meta = with lib; { + description = "Open framework for storing and sharing scene data"; + homepage = "http://alembic.io/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ + guibou + tmarkus + ]; + }; +} diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix index 5625e8f0671e..110be7dfb561 100644 --- a/pkgs/by-name/al/alephone/package.nix +++ b/pkgs/by-name/al/alephone/package.nix @@ -36,15 +36,15 @@ stdenv.mkDerivation (finalAttrs: { "icons" ]; pname = "alephone"; - version = "1.10"; + version = "1.10.1"; src = fetchurl { url = let - date = "20240822"; + date = "20250302"; in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2"; - hash = "sha256-Es2Uo0RIJHYeO/60XiHVLJe9Eoan8DREtAI2KGjuLaM="; + hash = "sha256-Jn8357JYR6cWISDxzYutLTWBDMTv0h923cSFf+RU8V8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/alertmanager-ntfy/package.nix b/pkgs/by-name/al/alertmanager-ntfy/package.nix new file mode 100644 index 000000000000..be0d1e4a35a9 --- /dev/null +++ b/pkgs/by-name/al/alertmanager-ntfy/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, + nix-update-script, +}: + +buildGoModule { + pname = "alertmanager-ntfy"; + version = "0-unstable-2025-05-04"; + + src = fetchFromGitHub { + owner = "alexbakker"; + repo = "alertmanager-ntfy"; + rev = "f05e3c029bab3bdfb9aefbddbfc6bd9c7d4aa80f"; + hash = "sha256-rKCJnffsBEXmTg2s0nqQf8BuHQnSgcwVBhC7gRzg4ew="; + }; + + vendorHash = "sha256-e1JAoDNm2+xB/bZcEGr5l4+va8GIg1R8pdj3d+/Y+UY="; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/alertmanager-ntfy --help > /dev/null + + runHook postInstallCheck + ''; + + passthru = { + tests = { inherit (nixosTests.prometheus) alertmanager-ntfy; }; + updateScript = nix-update-script { extraArgs = [ "--version=branch=master" ]; }; + }; + + meta = { + description = "Forwards Prometheus Alertmanager notifications to ntfy.sh"; + homepage = "https://github.com/alexbakker/alertmanager-ntfy"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "alertmanager-ntfy"; + }; +} diff --git a/pkgs/by-name/al/alexandria/package.nix b/pkgs/by-name/al/alexandria/package.nix index a97efd139000..345f66c6470a 100644 --- a/pkgs/by-name/al/alexandria/package.nix +++ b/pkgs/by-name/al/alexandria/package.nix @@ -27,16 +27,14 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - prePatch = '' - chmod +w .. # make sure that /build/source is writeable - ''; - npmDeps = fetchNpmDeps { inherit src; - sourceRoot = "${src.name}"; hash = "sha256-6r9bEY7e1Eef/0/CJ26ITpFJcCVUEKLrFx+TNEomLPE="; }; + cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; + useFetchCargoVendor = true; cargoHash = "sha256-VX/G4dF9DhlGfifp4xf9xkXli7BHFtKY2+HaMHqqPiA="; @@ -61,12 +59,6 @@ rustPlatform.buildRustPackage rec { libappindicator-gtk3 ]; - npmRoot = ".."; - - sourceRoot = "${src.name}/src-tauri"; - - buildAndTestDir = "."; - meta = { homepage = "https://github.com/btpf/Alexandria"; changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}"; diff --git a/pkgs/by-name/al/alfis/package.nix b/pkgs/by-name/al/alfis/package.nix new file mode 100644 index 000000000000..d6a3a2d93618 --- /dev/null +++ b/pkgs/by-name/al/alfis/package.nix @@ -0,0 +1,57 @@ +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + makeWrapper, + webkitgtk_4_0, + zenity, + withGui ? true, +}: + +rustPlatform.buildRustPackage rec { + pname = "alfis"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = "Revertron"; + repo = "Alfis"; + rev = "v${version}"; + hash = "sha256-ettStNktSDZnYNN/IWqTB1Ou1g1QEGFabS4EatnDLaE="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-xe0YQCKnDV6M6IKWgljsuJ5ZevkdpxZDnNHAHKJyUec="; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + buildInputs = lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0; + + buildNoDefaultFeatures = true; + buildFeatures = [ "doh" ] ++ lib.optional withGui "webgui"; + + checkFlags = [ + # these want internet access, disable them + "--skip=dns::client::tests::test_tcp_client" + "--skip=dns::client::tests::test_udp_client" + ]; + + postInstall = lib.optionalString (withGui && stdenv.hostPlatform.isLinux) '' + wrapProgram $out/bin/alfis \ + --prefix PATH : ${lib.makeBinPath [ zenity ]} + ''; + + meta = { + description = "Alternative Free Identity System"; + homepage = "https://alfis.name"; + changelog = "https://github.com/Revertron/Alfis/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ misuzu ]; + platforms = lib.platforms.unix; + mainProgram = "alfis"; + broken = withGui && stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index ff6921cb57d9..43476269af5c 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "algia"; - version = "0.0.84"; + version = "0.0.86"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; rev = "v${version}"; - hash = "sha256-i7rSmLFtUFSA1pW5IShYnTxjtwZ5z31OP4kVcMQgMxA="; + hash = "sha256-dpvBlFI6xmQOwui7Ma1ewIoxgFctG9fK+pLhjK/71XI="; }; - vendorHash = "sha256-8zAGkz17U7j0WWh8ayLowVhNZQvbIlA2YgXMgVIHuFg="; + vendorHash = "sha256-Yt95kSXAIBxHgX+VUefKrumg9thuvh3c+gnSu/2PSQY="; meta = { description = "CLI application for nostr"; diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix index 5de675497c7f..342cb01d9e0e 100644 --- a/pkgs/by-name/al/aliae/package.nix +++ b/pkgs/by-name/al/aliae/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "aliae"; - version = "0.26.4"; + version = "0.26.5"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "aliae"; tag = "v${version}"; - hash = "sha256-Xyj/CEvYnVz8bX0vMsFAyRY7Hp6heHFjvq+VeCYWXow="; + hash = "sha256-F5OteK1D0MCNyiZG6iz3vawkx74WJKst2Yr6ca8TYZw="; }; - vendorHash = "sha256-wNcn7ATUumuki8IQIrs7f8cf3uD7sMFlaS6BhgpEMVM="; + vendorHash = "sha256-TsJU1oAc1T+VdUYzrcyflTPYJhG6sPjFNZ7bZKk1KdM="; sourceRoot = "${src.name}/src"; diff --git a/pkgs/by-name/al/alibuild/package.nix b/pkgs/by-name/al/alibuild/package.nix new file mode 100644 index 000000000000..d9315f52f68c --- /dev/null +++ b/pkgs/by-name/al/alibuild/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3Packages, + fetchPypi, +}: + +python3Packages.buildPythonApplication rec { + pname = "alibuild"; + version = "1.17.18"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-771XCMYNJsQzD7rb/7q5rheeIL8X2bvMWwLkA40CJ9Y="; + }; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + nativeBuildInputs = with python3Packages; [ pip ]; + + dependencies = with python3Packages; [ + requests + pyyaml + boto3 + jinja2 + distro + ]; + + pythonRelaxDeps = [ "boto3" ]; + + doCheck = false; + + meta = { + homepage = "https://alisw.github.io/alibuild/"; + description = "Build tool for ALICE experiment software"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ktf ]; + }; +} diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index 6b80cc99aac9..7c26ac68aa57 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [ # ignore one failing test for now - (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-rollout") + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'aligator-test-py-rollout|aligator-test-py-frames'") ]; # Fontconfig error: Cannot load default config file: No such file: (null) diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix index 72c325b8297f..8ddb7c933f52 100644 --- a/pkgs/by-name/al/alioth/package.nix +++ b/pkgs/by-name/al/alioth/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "alioth"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "google"; repo = "alioth"; tag = "v${version}"; - hash = "sha256-CQYh/F7eGk94dsXP7j3udhhBReYBvV6D8nzK/3VicwU="; + hash = "sha256-xFNX2cxmaw2H8D21qs6mnTMuSidmJ0xJ/b4pxdLTvow="; }; # Checks use `debug_assert_eq!` checkType = "debug"; useFetchCargoVendor = true; - cargoHash = "sha256-kW76EBlpzeSmIhW5UsYjPYp5KeH2mPuf3aAiTSM06g4="; + cargoHash = "sha256-x2Abw/RVKpPx0EWyF3w0kywtd23A+NSNaHRVZ4oB1jI="; separateDebugInfo = true; diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix index 2c2f3e3d3610..77805b365d33 100644 --- a/pkgs/by-name/al/alist/package.nix +++ b/pkgs/by-name/al/alist/package.nix @@ -11,14 +11,14 @@ }: buildGoModule rec { pname = "alist"; - version = "3.43.0"; - webVersion = "3.43.0"; + version = "3.44.0"; + webVersion = "3.44.0"; src = fetchFromGitHub { owner = "AlistGo"; repo = "alist"; tag = "v${version}"; - hash = "sha256-0+gt5S/eklSp8K4z1bXUVHaG7L3zKhi6TdVaxX/Y83w="; + hash = "sha256-zaIS2DYB7x76SCHCX9aJ0/8Lejwy3/AlLbnztSNJtSc="; # 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; @@ -32,11 +32,11 @@ buildGoModule rec { }; web = fetchzip { url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz"; - hash = "sha256-uFa9V8DSHk0ET0BCdfT37qUNP2kLNjmt2S6fEk1muME="; + hash = "sha256-YPqbEPpwRVTWwH/LOq7cGsYju6YqdFCOseD52OsnkSk="; }; proxyVendor = true; - vendorHash = "sha256-40YuarjrOvwHyXmHZoiqGMueN7dzu8zQ6hgInmsWVJg="; + vendorHash = "sha256-eBIlBtO+AlW2TE4xgxktePb2bm1lIYiuZ4+AUd1bdW8="; buildInputs = [ fuse ]; diff --git a/pkgs/by-name/al/alisthelper/package.nix b/pkgs/by-name/al/alisthelper/package.nix new file mode 100644 index 000000000000..324f4fc9e477 --- /dev/null +++ b/pkgs/by-name/al/alisthelper/package.nix @@ -0,0 +1,77 @@ +{ + lib, + fetchFromGitHub, + flutter327, + libayatana-appindicator, + copyDesktopItems, + makeDesktopItem, + runCommand, + yq, + alisthelper, + _experimental-update-script-combinators, + gitUpdater, +}: + +flutter327.buildFlutterApplication { + pname = "alisthelper"; + version = "0.2.0-unstable-2025-01-04"; + + src = fetchFromGitHub { + owner = "Xmarmalade"; + repo = "alisthelper"; + rev = "181a1207df0c9eb8336097b9a9249342dd9df097"; + hash = "sha256-6FJd+8eJoRK3cEdkLCgr7q4L6kEeSsMMkiVRx6Pa5jk="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + buildInputs = [ + libayatana-appindicator + ]; + + preBuild = '' + packageRun build_runner build + ''; + + desktopItems = [ + (makeDesktopItem { + name = "alisthelper"; + exec = "alisthelper"; + icon = "alisthelper"; + desktopName = "Alist Helper"; + }) + ]; + + postInstall = '' + install -Dm644 assets/alisthelper.png -t $out/share/pixmaps + ''; + + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + buildInputs = [ yq ]; + inherit (alisthelper) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "alisthelper.pubspecSource" ./pubspec.lock.json) + ]; + }; + + meta = { + description = "Designed to simplify the use of the desktop version of alist"; + homepage = "https://github.com/Xmarmalade/alisthelper"; + mainProgram = "alisthelper"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ emaryn ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/al/alisthelper/pubspec.lock.json b/pkgs/by-name/al/alisthelper/pubspec.lock.json new file mode 100644 index 000000000000..44d75b9d3915 --- /dev/null +++ b/pkgs/by-name/al/alisthelper/pubspec.lock.json @@ -0,0 +1,1554 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "76.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.3" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.11.0" + }, + "analyzer_plugin": { + "dependency": "transitive", + "description": { + "name": "analyzer_plugin", + "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.3" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.3" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.14" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.3" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "ci": { + "dependency": "transitive", + "description": { + "name": "ci", + "sha256": "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.1" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.0" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "csv": { + "dependency": "transitive", + "description": { + "name": "csv", + "sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "custom_lint": { + "dependency": "transitive", + "description": { + "name": "custom_lint", + "sha256": "3486c470bb93313a9417f926c7dd694a2e349220992d7b9d14534dc49c15bba9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "custom_lint_builder": { + "dependency": "transitive", + "description": { + "name": "custom_lint_builder", + "sha256": "42cdc41994eeeddab0d7a722c7093ec52bd0761921eeb2cbdbf33d192a234759", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "custom_lint_core": { + "dependency": "transitive", + "description": { + "name": "custom_lint_core", + "sha256": "02450c3e45e2a6e8b26c4d16687596ab3c4644dd5792e3313aa9ceba5a49b7f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "custom_lint_visitor": { + "dependency": "transitive", + "description": { + "name": "custom_lint_visitor", + "sha256": "bfe9b7a09c4775a587b58d10ebb871d4fe618237639b1e84d5ec62d7dfef25f9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0+6.11.0" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.7" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.7.0" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "fast_gbk": { + "dependency": "direct main", + "description": { + "name": "fast_gbk", + "sha256": "3f0dc0309986f615404ea8d1fccf00a535dc00ee90b88d71492866bd95586489", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_selector": { + "dependency": "direct main", + "description": { + "name": "file_selector", + "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "file_selector_android": { + "dependency": "transitive", + "description": { + "name": "file_selector_android", + "sha256": "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1+12" + }, + "file_selector_ios": { + "dependency": "transitive", + "description": { + "name": "file_selector_ios", + "sha256": "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.3+1" + }, + "file_selector_linux": { + "dependency": "transitive", + "description": { + "name": "file_selector_linux", + "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+2" + }, + "file_selector_macos": { + "dependency": "transitive", + "description": { + "name": "file_selector_macos", + "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4+2" + }, + "file_selector_platform_interface": { + "dependency": "transitive", + "description": { + "name": "file_selector_platform_interface", + "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "file_selector_web": { + "dependency": "transitive", + "description": { + "name": "file_selector_web", + "sha256": "c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4+2" + }, + "file_selector_windows": { + "dependency": "transitive", + "description": { + "name": "file_selector_windows", + "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+3" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.2" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_riverpod": { + "dependency": "direct main", + "description": { + "name": "flutter_riverpod", + "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "freezed": { + "dependency": "direct dev", + "description": { + "name": "freezed", + "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.7" + }, + "freezed_annotation": { + "dependency": "direct main", + "description": { + "name": "freezed_annotation", + "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "hotreloader": { + "dependency": "transitive", + "description": { + "name": "hotreloader", + "sha256": "ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "intl": { + "dependency": "transitive", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json2yaml": { + "dependency": "transitive", + "description": { + "name": "json2yaml", + "sha256": "da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "json_annotation": { + "dependency": "direct main", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "direct dev", + "description": { + "name": "json_serializable", + "sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.9.0" + }, + "launch_at_startup": { + "dependency": "direct main", + "description": { + "name": "launch_at_startup", + "sha256": "1f8a75520913d1038630049e6c44a2575a23ffd28cc8b14fdf37401d1d21de84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.7" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.8" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "logger": { + "dependency": "direct main", + "description": { + "name": "logger", + "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3-main.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "menu_base": { + "dependency": "transitive", + "description": { + "name": "menu_base", + "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.2" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.15" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "riverpod": { + "dependency": "transitive", + "description": { + "name": "riverpod", + "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "riverpod_analyzer_utils": { + "dependency": "transitive", + "description": { + "name": "riverpod_analyzer_utils", + "sha256": "c6b8222b2b483cb87ae77ad147d6408f400c64f060df7a225b127f4afef4f8c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.8" + }, + "riverpod_lint": { + "dependency": "direct dev", + "description": { + "name": "riverpod_lint", + "sha256": "83e4caa337a9840469b7b9bd8c2351ce85abad80f570d84146911b32086fbd99", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.3" + }, + "rxdart": { + "dependency": "transitive", + "description": { + "name": "rxdart", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.28.0" + }, + "screen_retriever": { + "dependency": "direct main", + "description": { + "name": "screen_retriever", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "3c7e73920c694a436afaf65ab60ce3453d91f84208d761fbd83fc21182134d93", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.4" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "shortid": { + "dependency": "transitive", + "description": { + "name": "shortid", + "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "slang": { + "dependency": "direct main", + "description": { + "name": "slang", + "sha256": "a466773de768eb95bdf681e0a92e7c8010d44bb247b62130426c83ece33aeaed", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.32.0" + }, + "slang_build_runner": { + "dependency": "direct dev", + "description": { + "name": "slang_build_runner", + "sha256": "b2e0c63f3c801a4aa70b4ca43173893d6eb7d5a421fc9d97ad983527397631b3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.32.0" + }, + "slang_flutter": { + "dependency": "direct main", + "description": { + "name": "slang_flutter", + "sha256": "1a98e878673996902fa5ef0b61ce5c245e41e4d25640d18af061c6aab917b0c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.32.0" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.5" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.0" + }, + "state_notifier": { + "dependency": "transitive", + "description": { + "name": "state_notifier", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "tray_manager": { + "dependency": "direct main", + "description": { + "name": "tray_manager", + "sha256": "f231031c5c0eb4ad514e18ddaab27a912ddbe50335c594bc28fb0f9972ab6a84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.14" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.3.0" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.9.0" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.5" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.3" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + } + }, + "sdks": { + "dart": ">=3.6.0 <4.0.0", + "flutter": ">=3.24.0" + } +} diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix index e6501719314c..a817172589f3 100644 --- a/pkgs/by-name/al/alistral/package.nix +++ b/pkgs/by-name/al/alistral/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "alistral"; - version = "0.5.5"; + version = "0.5.8"; src = fetchFromGitHub { owner = "RustyNova016"; repo = "Alistral"; tag = "v${finalAttrs.version}"; - hash = "sha256-DrHoVAIPD/F6pY04QXVilXiwD/nWzeVquuHzRiq2sRY="; + hash = "sha256-LSuNVfGus9kO1g4EfVCw6yWxudvYqBnM5mpJWH7MBCs="; }; # remove if updating to rust 1.85 @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-Jyus5L0z0Z6Qf9vBcO6/h+py0JNKG1FS6qXONUM26BM="; + cargoHash = "sha256-lq+0R5g4MwVm8ESjKpz+aymjpqcaAE856XnBtYXYs8A="; env.RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/al/alive2/package.nix b/pkgs/by-name/al/alive2/package.nix index f627751189c8..fce8f5472147 100644 --- a/pkgs/by-name/al/alive2/package.nix +++ b/pkgs/by-name/al/alive2/package.nix @@ -8,32 +8,35 @@ llvm_18, cmake, ninja, + nix-update-script, }: clangStdenv.mkDerivation (finalAttrs: { pname = "alive2"; - version = "0-unstable-2024-09-23"; + version = "20.0"; src = fetchFromGitHub { owner = "AliveToolkit"; repo = "alive2"; - rev = "05a964284056b38a6dc1f807e7acad64a0308328"; - sha256 = "sha256-okKKUU7WLXLD9Hvsfoz+1HQWoyQ/bqRpBk5ogr7kSJA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-4QNrBRGH+rxXwb7zTRYAixxipN3ybcXuWCmO+BLU9r4="; }; nativeBuildInputs = [ cmake + ninja + re2c ]; buildInputs = [ - re2c z3 hiredis llvm_18 - ninja ]; + strictDeps = true; postPatch = '' substituteInPlace CMakeLists.txt \ + --replace-fail '-Werror' "" \ --replace-fail 'find_package(Git REQUIRED)' "" ''; @@ -56,12 +59,15 @@ clangStdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Automatic verification of LLVM optimizations"; homepage = "https://github.com/AliveToolkit/alive2"; license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ shogo ]; + teams = [ lib.teams.ngi ]; mainProgram = "alive"; }; }) diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index cd2b508f3733..70bc20f74d59 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,24 +8,24 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.264"; + version = "3.0.277"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${version}"; - hash = "sha256-dTGpg2cIcAHsaF6AHfP3rqLHLSIflrkZrjlbnFEW5Pk="; + hash = "sha256-4HWSebmMys3yzj2H3JC7hAayl9xQeVBQWCEGlZSudUc="; fetchSubmodules = true; }; - vendorHash = "sha256-XpsMnt3AYHMn/js1E88RBxegKrTeaZYpRhHEuq4HDjM="; + vendorHash = "sha256-cyE7yuwYUR/vv1w/b7QaiSoyX2XiUy5vNdodu+9PIl8="; subPackages = [ "main" ]; ldflags = [ "-s" "-w" - "-X github.com/aliyun/aliyun-cli/cli.Version=${version}" + "-X github.com/aliyun/aliyun-cli/v3/cli.Version=${version}" ]; nativeCheckInputs = [ writableTmpDirAsHomeHook ]; diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index 2b578f86bb47..a7e5fd6fbf86 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2117"; + version = "2.0.2147"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-jcExEGUtBMeKesdYVkkJSlJ59HhHZUAqhVvXkJVZp8g="; + hash = "sha256-SVZV9/eAPp7IxWhNxKuDgxFaW/nQiLZkRrqCgRbU9hQ="; }; - npmDepsHash = "sha256-2SrPy3OybchYATCs0bmU1dZGBCKGhto1M1fPk68V/h8="; + npmDepsHash = "sha256-pJZpgmo3yNo9xGHC4U2XDBm+EFdFCP8BCSlmRnHUUVo="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/al/alliance/package.nix b/pkgs/by-name/al/alliance/package.nix index 726c25a932e9..1b6ab31d2318 100644 --- a/pkgs/by-name/al/alliance/package.nix +++ b/pkgs/by-name/al/alliance/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitLab, + fetchFromGitHub, xorgproto, motif, libX11, @@ -16,17 +16,18 @@ stdenv.mkDerivation { pname = "alliance"; - version = "unstable-2022-01-13"; + version = "unstable-2025-02-24"; - src = fetchFromGitLab { - domain = "gitlab.lip6.fr"; - owner = "vlsi-eda"; - repo = "alliance"; - rev = "ebece102e15c110fc79f1da50524c68fd9523f0c"; - hash = "sha256-NGtE3ZmN9LrgXG4NIKrp7dFRVzrKMoudlPUtYYKrZjY="; - }; - - prePatch = "cd alliance/src"; + src = + let + src = fetchFromGitHub { + owner = "lip6"; + repo = "alliance"; + rev = "a8502d32df0a4ad1bd29ab784c4332319669ecd2"; + hash = "sha256-b2uaYZEzHMB3qCMRVANNnjTxr6OYb1Unswxjq5knYzM="; + }; + in + "${src}/alliance/src"; nativeBuildInputs = [ libtool @@ -43,17 +44,13 @@ stdenv.mkDerivation { bison ]; - # Disable parallel build, errors: - # ./pat_decl_y.y:736:5: error: expected '=', ... - enableParallelBuilding = false; - - ALLIANCE_TOP = placeholder "out"; - configureFlags = [ - "--prefix=${placeholder "out"}" "--enable-alc-shared" ]; + # To avoid compiler error in LoadDataBase.c:366:27 + env.NIX_CFLAGS_COMPILE = "-Wno-incompatible-pointer-types"; + postPatch = '' # texlive for docs seems extreme substituteInPlace autostuff \ diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix index bcce322418c9..cbb780c2ee5d 100644 --- a/pkgs/by-name/al/allure/package.nix +++ b/pkgs/by-name/al/allure/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.33.0"; + version = "2.34.0"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-ZRAvIBF89LFYWfmO/bPqL85/XQ9l0TRGOs/uQ9no7tA="; + hash = "sha256-1R4x8LjUv4ZQXfFeJ1HkHml3sRLhb1tRV3UqApVEo7U="; }; dontConfigure = true; diff --git a/pkgs/by-name/al/almanah/package.nix b/pkgs/by-name/al/almanah/package.nix index d5635b6d51fa..3a08d10ab794 100644 --- a/pkgs/by-name/al/almanah/package.nix +++ b/pkgs/by-name/al/almanah/package.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/almanah"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/al/alsa-firmware/package.nix b/pkgs/by-name/al/alsa-firmware/package.nix index 2bf35a11a63c..af5cae0fb1f4 100644 --- a/pkgs/by-name/al/alsa-firmware/package.nix +++ b/pkgs/by-name/al/alsa-firmware/package.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { depsBuildBuild = lib.optional ( stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform.isAarch64 + || stdenv.hostPlatform.isLoongArch64 || stdenv.hostPlatform.isRiscV64 ) buildPackages.stdenv.cc; diff --git a/pkgs/by-name/al/alsa-tools/package.nix b/pkgs/by-name/al/alsa-tools/package.nix index 222a11242112..82f238d16190 100644 --- a/pkgs/by-name/al/alsa-tools/package.nix +++ b/pkgs/by-name/al/alsa-tools/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "alsa-tools"; - version = "1.2.11"; + version = "1.2.14"; src = fetchurl { url = "mirror://alsa/tools/alsa-tools-${finalAttrs.version}.tar.bz2"; - hash = "sha256-CRXJY0pQL9NlXKnFdNJZvJ55mD2R1Frqz/bzwA+K4+k="; + hash = "sha256-+u9v3TnsecmlRz3GOqG2Mxv3ZkqdRSoKgZjOxwFsvG8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/alt-ergo/package.nix b/pkgs/by-name/al/alt-ergo/package.nix index 1cd2bb503889..4adef6770175 100644 --- a/pkgs/by-name/al/alt-ergo/package.nix +++ b/pkgs/by-name/al/alt-ergo/package.nix @@ -8,11 +8,11 @@ let pname = "alt-ergo"; - version = "2.6.0"; + version = "2.6.2"; src = fetchurl { url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; - hash = "sha256-EmkxGvJSeKRmiSuoeMyIi6WfF39T3QPxKixiOwP8834="; + hash = "sha256-OeLJEop9HonzMuMaJxbzWfO54akl/oHxH6SnSbXSTYI="; }; in diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index 99491392eef2..430c563295eb 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "7.21.1"; + version = "7.24.0"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-pFP2QvHcJoGBfTDI/8uYSs8k28BNgwQqjXAvuhaUUcQ="; + hash = "sha256-iURIOxRgGCNXJA+9cDb07iwj0b4H8TdX8bPPmM3RjyI="; }; sourceRoot = "."; diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix index 9c6e046c6176..38ae1087564e 100644 --- a/pkgs/by-name/al/altair/package.nix +++ b/pkgs/by-name/al/altair/package.nix @@ -7,11 +7,11 @@ let pname = "altair"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-DO4T/NgLSxZIxVK4oEz6QNsQJRacF8KRcwAvWToxIy8="; + sha256 = "sha256-3tLBZNuiqhSRg/a2g2PC53esnNb1jVFpCO2YiC7Rw6k="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/al/altus/package.nix b/pkgs/by-name/al/altus/package.nix index 59eb2e510921..51fc6edee604 100644 --- a/pkgs/by-name/al/altus/package.nix +++ b/pkgs/by-name/al/altus/package.nix @@ -7,12 +7,12 @@ let pname = "altus"; - version = "5.6.0"; + version = "5.7.1"; src = fetchurl { name = "altus-${version}.AppImage"; url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage"; - hash = "sha512-u4eBTboFJaU5qLFURXFchOmFV7GzlDbUokrBpxx8QeAJO6B0IwX1gJU0C69BKinIdO4Q93SAcjsvUkvSI+blrw=="; + hash = "sha256-G0jKBnobMKJWZmLtyYLpdruNxEVGt5rZHPFJYJkY8Y4="; }; appimageContents = appimageTools.extractType2 { @@ -25,10 +25,9 @@ appimageTools.wrapType2 { nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' - install -m 444 -D ${appimageContents}/Altus.desktop $out/share/applications/altus.desktop - install -m 444 -D ${appimageContents}/Altus.png \ - $out/share/icons/hicolor/scalable/apps/altus.png - substituteInPlace $out/share/applications/altus.desktop \ + install -Dm 644 ${appimageContents}/Altus.desktop -t $out/share/applications + install -Dm 644 ${appimageContents}/Altus.png -t $out/share/icons/hicolor/256x256/apps + substituteInPlace $out/share/applications/Altus.desktop \ --replace-fail 'Exec=AppRun' 'Exec=altus' wrapProgram "$out/bin/altus" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" diff --git a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix index eb4c2493bc26..979dcef9d0fa 100644 --- a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix +++ b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "amazon-cloudwatch-agent"; - version = "1.300053.1"; + version = "1.300055.2"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-cloudwatch-agent"; tag = "v${version}"; - hash = "sha256-UyaAFBJ/GRwfnZVfFDsRSjAbMEHoiVCpo/M6c7nzA5M="; + hash = "sha256-af+bU57fGzenojHdyXcmtLuBHT6Lo5M5dgZRtu/zFQ8="; }; - vendorHash = "sha256-MrT30LZODuvzq3hqk/6D5u0ZAf2q2WB07yfjl6RbmtM="; + vendorHash = "sha256-WDEShkYNwrZgPT0v/9gZaL+4sQ8f4AhEEtaDvgMhuEM="; # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77. subPackages = [ diff --git a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix index 8c0b5d01b7ea..5a73c36f8cc8 100644 --- a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix +++ b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "amazon-ec2-net-utils"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "amazonlinux"; repo = "amazon-ec2-net-utils"; tag = "v${version}"; - hash = "sha256-uHYEavdBggdXBYUSDFvajRVLxcRge/kiu60c1a4SPRw="; + hash = "sha256-FHPJeyXrnf0+aeh1YqFXWz7qreLs6FHpZuPArt/nkIo="; }; strictDeps = true; diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index 0d7082f3f787..5e6e66dee31d 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -3,30 +3,40 @@ fetchFromGitHub, rustPlatform, protobuf_26, + versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "amazon-q-cli"; - version = "1.7.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-q-developer-cli"; - tag = "v${version}"; - hash = "sha256-uKsj7QBKomkO1xP5VgOGI5W8CHIgPQx4QsS2voghrVc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-X1L3Nrzchp8yuGGBwwLQ4ZE41GKH3pFR2CX77TYYhNo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-G99vb+7eomxDy9xFJjKA+KpCH2NUzitAKHZE5b62Db8="; + cargoHash = "sha256-qtQ+e0NRzzGn0s2zpnMNUv7JdQDuImMfyC0C/QZrpjU="; cargoBuildFlags = [ "-p" - "q_cli" + "chat_cli" ]; + + nativeBuildInputs = [ + protobuf_26 + ]; + + postInstall = '' + install -m 0755 $out/bin/chat_cli $out/bin/amazon-q + ''; + cargoTestFlags = [ "-p" - "q_cli" + "chat_cli" ]; # skip integration tests that have external dependencies @@ -50,15 +60,13 @@ rustPlatform.buildRustPackage rec { "--skip=init_lint_zsh_post_zshrc" "--skip=init_lint_zsh_pre_zprofile" "--skip=init_lint_zsh_pre_zshrc" + "--skip=telemetry::cognito::test::pools" ]; - nativeBuildInputs = [ - protobuf_26 - ]; - - postInstall = '' - mv $out/bin/q_cli $out/bin/amazon-q - ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/amazon-q"; + versionCheckProgramArg = "--version"; meta = { description = "Amazon Q Developer AI coding agent CLI"; @@ -67,7 +75,8 @@ rustPlatform.buildRustPackage rec { mit asl20 ]; + mainProgram = "amazon-q"; maintainers = [ lib.maintainers.jamesward ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/tools/amazon-qldb-shell/Cargo.lock b/pkgs/by-name/am/amazon-qldb-shell/Cargo.lock similarity index 100% rename from pkgs/development/tools/amazon-qldb-shell/Cargo.lock rename to pkgs/by-name/am/amazon-qldb-shell/Cargo.lock diff --git a/pkgs/by-name/am/amazon-qldb-shell/package.nix b/pkgs/by-name/am/amazon-qldb-shell/package.nix new file mode 100644 index 000000000000..61a942bb021c --- /dev/null +++ b/pkgs/by-name/am/amazon-qldb-shell/package.nix @@ -0,0 +1,47 @@ +{ + lib, + cmake, + fetchFromGitHub, + rustPlatform, + testers, +}: + +let + pname = "amazon-qldb-shell"; + version = "2.0.1"; + package = rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-aXScqJ1LijMSAy9YkS5QyXtTqxd19lLt3BbyVXlbw8o="; + }; + + nativeBuildInputs = [ + cmake + rustPlatform.bindgenHook + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "amazon-qldb-driver-0.1.0" = "sha256-az0rANBcryHHnpGWvo15TGGW4KMUULZHaj5msIHts14="; + }; + }; + + passthru.tests.version = testers.testVersion { inherit package; }; + + meta = with lib; { + description = "Interface to send PartiQL statements to Amazon Quantum Ledger Database (QLDB)"; + homepage = "https://github.com/awslabs/amazon-qldb-shell"; + license = licenses.asl20; + maintainers = [ maintainers.terlar ]; + mainProgram = "qldb"; + # See https://hydra.nixos.org/build/255146098/log. + broken = true; # Added 2024-04-06 + }; + }; +in +package diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 7d87fa200942..183dfd1d9d60 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -42,13 +42,13 @@ let in buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.3.1957.0"; + version = "3.3.2299.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; tag = version; - hash = "sha256-lOfeGkImwRxua3dSmefb1WcgnviHhOYtYK1VaRW9C6A="; + hash = "sha256-8jqsAGnfn6+a+Zs9XfIyHzG/+jPO+UoSVsm0GHthq3E="; }; vendorHash = null; @@ -176,7 +176,6 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ - copumpkin manveru anthonyroussel arianvp diff --git a/pkgs/by-name/am/amber-secret/package.nix b/pkgs/by-name/am/amber-secret/package.nix index c62940c467d1..a05d3fbab349 100644 --- a/pkgs/by-name/am/amber-secret/package.nix +++ b/pkgs/by-name/am/amber-secret/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, }: @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Gwj0rnbKWifja5NJwskcrFpPoK15HjSQHXolGbgV784="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - meta = { description = "Manage secret values in-repo via public key cryptography"; homepage = "https://github.com/fpco/amber"; diff --git a/pkgs/by-name/am/amber/package.nix b/pkgs/by-name/am/amber/package.nix new file mode 100644 index 000000000000..8a8eef4bb0d2 --- /dev/null +++ b/pkgs/by-name/am/amber/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + libiconv, +}: + +rustPlatform.buildRustPackage rec { + pname = "amber"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = pname; + tag = "v${version}"; + sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-UFuWD3phcKuayQITd85Sou4ygDBMzjrR39vWrlseYJQ="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + meta = with lib; { + description = "Code search-and-replace tool"; + homepage = "https://github.com/dalance/amber"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.bdesham ]; + }; +} diff --git a/pkgs/by-name/am/amberol/package.nix b/pkgs/by-name/am/amberol/package.nix index 7c0c6a63c1d3..67c87323b67b 100644 --- a/pkgs/by-name/am/amberol/package.nix +++ b/pkgs/by-name/am/amberol/package.nix @@ -80,7 +80,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/World/amberol"; description = "Small and simple sound and music player"; - maintainers = with lib.maintainers; [ linsui ] ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ linsui ]; + teams = [ lib.teams.gnome-circle ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "amberol"; diff --git a/pkgs/by-name/am/amd-libflame/package.nix b/pkgs/by-name/am/amd-libflame/package.nix index 6022742e05fc..8da26d47f60b 100644 --- a/pkgs/by-name/am/amd-libflame/package.nix +++ b/pkgs/by-name/am/amd-libflame/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "amd-libflame"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "amd"; repo = "libflame"; rev = version; - hash = "sha256-Shsv5Zd59FN5tq1LY7QqPRtAHEysHIVbPeKIIZ/2eMw="; + hash = "sha256-9Z0e6RCJfqQlq3oT4fBu8rwPH1OWEKQ52rVDa0Y0rJU="; }; postPatch = '' @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace '-mtune=native' "" ''; + env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + passthru = { inherit blas64; }; diff --git a/pkgs/by-name/am/ameba/package.nix b/pkgs/by-name/am/ameba/package.nix index 6e0ae32c5f9e..f7f7f8bd98b6 100644 --- a/pkgs/by-name/am/ameba/package.nix +++ b/pkgs/by-name/am/ameba/package.nix @@ -25,6 +25,6 @@ crystal.buildCrystalPackage rec { homepage = "https://crystal-ameba.github.io"; changelog = "https://github.com/crystal-ameba/ameba/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ kimburgess ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/am/amiri/package.nix b/pkgs/by-name/am/amiri/package.nix index 19f418728f25..9692307cbde5 100644 --- a/pkgs/by-name/am/amiri/package.nix +++ b/pkgs/by-name/am/amiri/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "amiri"; - version = "1.001"; + version = "1.002"; src = fetchzip { url = "https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip"; - hash = "sha256-YwiDY5/Ty5Pwj3d8+UafUNLVZ3omRtFRWQCLn2RkheM="; + hash = "sha256-Ln2AFiQ5hX4w1yu5NCF28S0hmfWUhEINi1YJVV/Gngo="; }; installPhase = '' diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index ed17dc8c903f..aae7e13c13af 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, kdePackages, @@ -12,14 +13,12 @@ shadowsocks-rust, cloak-pt, wireguard-tools, - procps, - iproute2, - sudo, libssh, zlib, tun2socks, xray, nix-update-script, + bash, }: let amnezia-tun2socks = tun2socks.overrideAttrs ( @@ -56,16 +55,25 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn"; - version = "4.8.5.0"; + version = "4.8.6.0"; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amnezia-client"; tag = finalAttrs.version; - hash = "sha256-k0BroQYrmJzM0+rSZMf20wHba5NbOK/xm5lbUFBNEHI="; + hash = "sha256-WQbay3dtGNPPpcK1O7bfs/HKO4ytfmQo60firU/9o28="; fetchSubmodules = true; }; + # Temporary patch header file to fix build with QT 6.9 + patches = [ + (fetchpatch { + name = "add-missing-include.patch"; + url = "https://github.com/amnezia-vpn/amnezia-client/commit/c44ce0d77cc3acdf1de48a12459a1a821d404a1c.patch"; + hash = "sha256-Q6UMD8PlKAcI6zNolT5+cULECnxNrYrD7cifvNg1ZrY="; + }) + ]; + postPatch = '' substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \ @@ -83,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace client/configurators/openvpn_configurator.cpp \ --replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/libexec\");" substituteInPlace client/ui/qautostart.cpp \ - --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png" + --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "AmneziaVPN" substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \ --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png" substituteInPlace deploy/data/linux/AmneziaVPN.service \ @@ -107,31 +115,26 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + bash + kdePackages.qt5compat + kdePackages.qtremoteobjects + kdePackages.qtsvg libsecret qt6.qtbase qt6.qttools - kdePackages.qtremoteobjects - kdePackages.qtsvg - kdePackages.qt5compat ]; - qtWrapperArgs = [ - ''--prefix PATH : ${ - lib.makeBinPath [ - procps - iproute2 - sudo - ] - }'' - ]; + installPhase = '' + runHook preInstall - postInstall = '' mkdir -p $out/bin $out/libexec $out/share/applications $out/share/pixmaps $out/lib/systemd/system - cp client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/ - cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/libexec/ - cp ../AppDir/AmneziaVPN.desktop $out/share/applications/ - cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/ - cp ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/ + install -m555 client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/ + install -m555 ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/libexec/ + install -m444 ../AppDir/AmneziaVPN.desktop $out/share/applications/ + install -m444 ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/ + install -m444 ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/ + + runHook postInstall ''; passthru = { @@ -149,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Amnezia VPN Client"; downloadPage = "https://amnezia.org/en/downloads"; - homepage = "https://amnezia.org/en"; + homepage = "https://github.com/amnezia-vpn/amnezia-client"; license = licenses.gpl3; mainProgram = "AmneziaVPN"; maintainers = with maintainers; [ sund3RRR ]; diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json new file mode 100644 index 000000000000..0e79a7f7113c --- /dev/null +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -0,0 +1,489 @@ +{ + "name": "amp-cli", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "@sourcegraph/amp": "^0.0.1747483284-g8cf01d" + } + }, + "node_modules/@colors/colors": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", + "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", + "license": "MIT", + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/@dabh/diagnostics": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", + "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", + "license": "MIT", + "dependencies": { + "colorspace": "1.1.x", + "enabled": "2.0.x", + "kuler": "^2.0.0" + } + }, + "node_modules/@sourcegraph/amp": { + "version": "0.0.1747483284-g8cf01d", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1747483284-g8cf01d.tgz", + "integrity": "sha512-LTlMR3cs5ax9EGIuyu92g85SJdsXV7fvADsEnYmBOd/no7r1CIxeEtOzLFY1FPDCxLHjN74BivwHs0piMiLktg==", + "dependencies": { + "@types/runes": "^0.4.3", + "@vscode/ripgrep": "1.15.11", + "runes": "^0.4.3", + "string-width": "^6.1.0", + "winston": "^3.17.0", + "xdg-basedir": "^5.1.0" + }, + "bin": { + "amp": "dist/amp.js" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@types/runes": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@types/runes/-/runes-0.4.3.tgz", + "integrity": "sha512-kncnfKlRj4FM0+9IRBlZ/06b1BNVDya3d5hN5kFfuzCNAgZFZuApz/XBqe0+d6Y5cV/f86UD8q2ehnaSVdtBrw==", + "license": "MIT" + }, + "node_modules/@types/triple-beam": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", + "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", + "license": "MIT" + }, + "node_modules/@vscode/ripgrep": { + "version": "1.15.11", + "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.11.tgz", + "integrity": "sha512-G/VqtA6kR50mJkIH4WA+I2Q78V5blovgPPq0VPYM0QIRp57lYMkdV+U9VrY80b3AvaC72A1z8STmyxc8ZKiTsw==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "https-proxy-agent": "^7.0.2", + "proxy-from-env": "^1.1.0", + "yauzl": "^2.9.2" + } + }, + "node_modules/agent-base": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, + "node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/async": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "license": "MIT" + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/color": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", + "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.3", + "color-string": "^1.6.0" + } + }, + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "license": "MIT" + }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "license": "MIT", + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, + "node_modules/colorspace": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", + "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", + "license": "MIT", + "dependencies": { + "color": "^3.1.3", + "text-hex": "1.0.x" + } + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "license": "MIT" + }, + "node_modules/emoji-regex": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "license": "MIT" + }, + "node_modules/enabled": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", + "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", + "license": "MIT" + }, + "node_modules/fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", + "license": "MIT", + "dependencies": { + "pend": "~1.2.0" + } + }, + "node_modules/fecha": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", + "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", + "license": "MIT" + }, + "node_modules/fn.name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", + "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", + "license": "MIT" + }, + "node_modules/https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "license": "MIT" + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/kuler": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", + "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", + "license": "MIT" + }, + "node_modules/logform": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz", + "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==", + "license": "MIT", + "dependencies": { + "@colors/colors": "1.6.0", + "@types/triple-beam": "^1.3.2", + "fecha": "^4.2.0", + "ms": "^2.1.1", + "safe-stable-stringify": "^2.3.1", + "triple-beam": "^1.3.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/one-time": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", + "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", + "license": "MIT", + "dependencies": { + "fn.name": "1.x.x" + } + }, + "node_modules/pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", + "license": "MIT" + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/runes": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/runes/-/runes-0.4.3.tgz", + "integrity": "sha512-K6p9y4ZyL9wPzA+PMDloNQPfoDGTiFYDvdlXznyGKgD10BJpcAosvATKrExRKOrNLgD8E7Um7WGW0lxsnOuNLg==", + "license": "MIT", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safe-stable-stringify": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz", + "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, + "node_modules/stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-6.1.0.tgz", + "integrity": "sha512-k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ==", + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^10.2.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", + "license": "MIT" + }, + "node_modules/triple-beam": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", + "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", + "license": "MIT", + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" + }, + "node_modules/winston": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz", + "integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==", + "license": "MIT", + "dependencies": { + "@colors/colors": "^1.6.0", + "@dabh/diagnostics": "^2.0.2", + "async": "^3.2.3", + "is-stream": "^2.0.0", + "logform": "^2.7.0", + "one-time": "^1.0.0", + "readable-stream": "^3.4.0", + "safe-stable-stringify": "^2.3.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.9.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/winston-transport": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz", + "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==", + "license": "MIT", + "dependencies": { + "logform": "^2.7.0", + "readable-stream": "^3.6.2", + "triple-beam": "^1.3.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/xdg-basedir": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz", + "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "license": "MIT", + "dependencies": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } + } + } +} diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix new file mode 100644 index 000000000000..0774eaddc0c4 --- /dev/null +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -0,0 +1,84 @@ +{ + lib, + buildNpmPackage, + fetchzip, + ripgrep, + makeWrapper, +}: + +buildNpmPackage rec { + pname = "amp-cli"; + version = "0.0.1747483284-g8cf01d"; + + src = fetchzip { + url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${version}.tgz"; + hash = "sha256-8mPYdr0t/5kEGK/0nG0GyxviAU9EhjA1bAQXggvuF6k="; + }; + + postPatch = '' + cp ${./package-lock.json} package-lock.json + + # Create a minimal package.json with just the dependency we need (without devDependencies) + cat > package.json < bin/amp-wrapper.js << EOF + #!/usr/bin/env node + require('@sourcegraph/amp/dist/amp.js') + EOF + chmod +x bin/amp-wrapper.js + ''; + + npmDepsHash = "sha256-aFB9EuWp7skmY5uzNRBBs8/UcFgtrQpBqciO2UK1fwY="; + + propagatedBuildInputs = [ + ripgrep + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + npmFlags = [ + "--no-audit" + "--no-fund" + "--ignore-scripts" + ]; + + # Disable build and prune steps + dontNpmBuild = true; + + postInstall = '' + wrapProgram $out/bin/amp \ + --prefix PATH : ${lib.makeBinPath [ ripgrep ]} + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Amp is an AI coding agent, in research preview from Sourcegraph. This is the CLI for Amp."; + homepage = "https://github.com/sourcegraph/amp"; + downloadPage = "https://www.npmjs.com/package/@sourcegraph/amp"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + keegancsmith + owickstrom + ]; + mainProgram = "amp"; + }; +} diff --git a/pkgs/by-name/am/amp-cli/update.sh b/pkgs/by-name/am/amp-cli/update.sh new file mode 100755 index 000000000000..07c32a5e35be --- /dev/null +++ b/pkgs/by-name/am/amp-cli/update.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nodePackages.npm nix-update + +set -euo pipefail + +version=$(npm view @sourcegraph/amp version) + +# Generate updated lock file +cd "$(dirname "${BASH_SOURCE[0]}")" +npm i --package-lock-only @sourcegraph/amp@"$version" +rm -f package.json # package.json is not used by buildNpmPackage + +# Update version and hashes +cd - +nix-update amp-cli --version "$version" diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix index 36f4a1ca6462..1c32dd578eba 100644 --- a/pkgs/by-name/am/amp/package.nix +++ b/pkgs/by-name/am/amp/package.nix @@ -9,7 +9,6 @@ xorg, cmake, libgit2, - darwin, curl, writableTmpDirAsHomeHook, }: @@ -41,14 +40,9 @@ rustPlatform.buildRustPackage rec { xorg.libxcb libgit2 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - curl - Security - AppKit - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + ]; nativeCheckInputs = [ writableTmpDirAsHomeHook diff --git a/pkgs/by-name/an/anakron/package.nix b/pkgs/by-name/an/anakron/package.nix new file mode 100644 index 000000000000..5cd737856512 --- /dev/null +++ b/pkgs/by-name/an/anakron/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenvNoCC, + fetchzip, + xorg, +}: + +stdenvNoCC.mkDerivation rec { + pname = "anakron"; + version = "0.3.3"; + + src = fetchzip { + url = "https://github.com/molarmanful/ANAKRON/releases/download/v${version}/ANAKRON-release_v${version}.zip"; + hash = "sha256-l4MA3OsMnqPIBWKx3ZO5XnxjE0gnIGyAtsZe2z/9zrw="; + }; + + nativeBuildInputs = [ xorg.mkfontscale ]; + + installPhase = '' + runHook preInstall + + misc="$out/share/fonts/misc" + install -D -m 644 *.{bdf,otb,pcf} -t "$misc" + install -D -m 644 *.psfu -t "$out/share/consolefonts" + install -D -m 644 *.ttf -t "$out/share/fonts/truetype" + + # create fonts.dir so NixOS xorg module adds to fp + mkfontdir "$misc" + + runHook postInstall + ''; + + meta = { + description = "Thicc retrofuturistic bitmap font made for the modern screen"; + homepage = "https://github.com/molarmanful/ANAKRON"; + changelog = "https://github.com/molarmanful/ANAKRON/releases/tag/v${version}"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + ejiektpobehuk + ]; + }; +} diff --git a/pkgs/by-name/an/analog/package.nix b/pkgs/by-name/an/analog/package.nix index 11777f147a24..add6dff6eebd 100644 --- a/pkgs/by-name/an/analog/package.nix +++ b/pkgs/by-name/an/analog/package.nix @@ -2,6 +2,10 @@ stdenv, lib, fetchFromGitHub, + bzip2, + gd, + libjpeg, + libpng, }: stdenv.mkDerivation rec { @@ -15,11 +19,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-NCturEibnpl6+paUZezksHzP33WtAzfIolvBLeEHXjY="; }; + buildInputs = [ + bzip2 + gd + libjpeg + libpng + ]; + postPatch = '' sed -i src/anlghead.h \ -e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \ -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/${pname}/lang/\"|g" - substituteInPlace src/Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + substituteInPlace src/Makefile \ + --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc" \ + --replace-fail "LIBS = -lm" "LIBS = -lm -lpng -lgd -ljpeg -lz -lbz2" \ + --replace-fail "DEFS =" "DEFS = -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB" ''; installPhase = '' diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix index 0c497b16f119..46c6d61e5a09 100644 --- a/pkgs/by-name/an/anchor/package.nix +++ b/pkgs/by-name/an/anchor/package.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "anchor"; - version = "0.31.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "coral-xyz"; repo = "anchor"; rev = "v${version}"; - hash = "sha256-rwf2PWHoUl8Rkmktb2u7veRrIcLT3syi7M2OZxdxjG4="; + hash = "sha256-pvD0v4y7DilqCrhT8iQnAj5kBxGQVqNvObJUBzFLqzA="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-ack2/WFrycfYHYVnZt0Q94WJdQrvLU/VZYm1KeqOjIQ="; + cargoHash = "sha256-fjhLA+utQdgR75wg+/N4VwASW6+YBHglRPj14sPHmGA="; checkFlags = [ # the following test cases try to access network, skip them diff --git a/pkgs/by-name/an/andagii/package.nix b/pkgs/by-name/an/andagii/package.nix index 08101b709407..4d7a886ac548 100644 --- a/pkgs/by-name/an/andagii/package.nix +++ b/pkgs/by-name/an/andagii/package.nix @@ -23,14 +23,11 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - # There are multiple claims that the font is GPL, so I include the - # package; but I cannot find the original source, so use it on your - # own risk Debian claims it is GPL - good enough for me. - meta = with lib; { + meta = { homepage = "http://www.i18nguy.com/unicode/unicode-font.html"; description = "Unicode Plane 1 Osmanya script font"; - maintainers = with maintainers; [ raskin ]; - license = "unknown"; - platforms = platforms.all; + maintainers = [ lib.maintainers.raskin ]; + license = lib.licenses.unfreeRedistributable; # upstream uses the term copyleft only + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/an/android-studio-tools/package.nix b/pkgs/by-name/an/android-studio-tools/package.nix index 0cd30e449e93..271051255c31 100644 --- a/pkgs/by-name/an/android-studio-tools/package.nix +++ b/pkgs/by-name/an/android-studio-tools/package.nix @@ -52,6 +52,7 @@ stdenvNoCC.mkDerivation { changelog = "https://developer.android.com/studio/releases"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ pandapip1 ]; + teams = [ lib.teams.android ]; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ fromSource ]; # The 'binaries' are actually shell scripts }; diff --git a/pkgs/by-name/an/android-udev-rules/package.nix b/pkgs/by-name/an/android-udev-rules/package.nix index a1dcffe21cd8..402f598a10d5 100644 --- a/pkgs/by-name/an/android-udev-rules/package.nix +++ b/pkgs/by-name/an/android-udev-rules/package.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; + teams = [ lib.teams.android ]; }; } diff --git a/pkgs/by-name/an/angryoxide/package.nix b/pkgs/by-name/an/angryoxide/package.nix new file mode 100644 index 000000000000..5abe04cd555a --- /dev/null +++ b/pkgs/by-name/an/angryoxide/package.nix @@ -0,0 +1,59 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libxkbcommon, + sqlite, + zlib, + wayland, +}: + +let + libwifi = fetchFromGitHub { + owner = "Ragnt"; + repo = "libwifi"; + rev = "71268e1898ad88b8b5d709e186836db417b33e81"; + hash = "sha256-2X/TZyLX9Tb54c6Sdla4bsWdq05NU72MVSuPvNfxySk="; + }; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "angryoxide"; + version = "0.8.32"; + + src = fetchFromGitHub { + owner = "Ragnt"; + repo = "AngryOxide"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Sla5lvyqZho9JE4QVS9r0fx5+DVlU90c8OSfO4/f0B4="; + }; + + postPatch = '' + rm -r libs/libwifi + ln -s ${libwifi} libs/libwifi + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-mry4l0a7DZOWkrChU40OVRCBjKwI39cyZtvEBA5tro0="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libxkbcommon + sqlite + wayland + zlib + ]; + + meta = { + description = "802.11 Attack Tool"; + changelog = "https://github.com/Ragnt/AngryOxide/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/Ragnt/AngryOxide/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fvckgrimm ]; + mainProgram = "angryoxide"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/an/angular-language-server/package.nix b/pkgs/by-name/an/angular-language-server/package.nix index 54cc37502949..fda131f3150c 100644 --- a/pkgs/by-name/an/angular-language-server/package.nix +++ b/pkgs/by-name/an/angular-language-server/package.nix @@ -16,11 +16,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "angular-language-server"; - version = "19.2.2"; + version = "20.0.0"; src = fetchurl { name = "angular-language-server-${finalAttrs.version}.zip"; url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix"; - hash = "sha256-WoNrKcK9Gr9gVWH/pwKyEUHuzcVNKh6zQwwpG4BuVCg="; + hash = "sha256-87SImzcGbwvf9xtdbD3etqaWe6fMVeCKc+f8qTyFnUA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix index 2d2d8f10f8ce..4a9f8b82eb80 100644 --- a/pkgs/by-name/an/ani-cli/package.nix +++ b/pkgs/by-name/an/ani-cli/package.nix @@ -27,13 +27,13 @@ in stdenvNoCC.mkDerivation (finalAttrs: { pname = "ani-cli"; - version = "4.9"; + version = "4.10"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-7zuepWTtrFp9RW3zTSjPzyJ9e+09PdKgwcnV+DqPEUY="; + hash = "sha256-R/YQ02ctTcAEzrVyWlaCHi1YW82iPrMBbbMNP21r0p8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/an/animeko/deps.json b/pkgs/by-name/an/animeko/deps.json new file mode 100644 index 000000000000..4e2cb0c59590 --- /dev/null +++ b/pkgs/by-name/an/animeko/deps.json @@ -0,0 +1,3513 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://dl.google.com/dl/android/maven2": { + "androidx/annotation#annotation-jvm/1.7.0": { + "jar": "sha256-42uOS4OTpK3HTj1KsirVo2OW8M6i5AtXNOrhSTff0iQ=", + "module": "sha256-B85gw3erlOR8jJAlibl3YDAGT9Gn5NWgGjjXAONeXbQ=", + "pom": "sha256-LT/MEucHiGmSA5JmI39FEUDKqPlMHmLn/E1gLeNFsNc=" + }, + "androidx/annotation#annotation-jvm/1.8.0": { + "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=", + "module": "sha256-48tFJVOdDtdLsjjvksae7yKoDkIsDSrLxR5hh/67ChM=", + "pom": "sha256-2fkI7m1IgSSs7VVv2Ka6nf5kf+AUuFrXIhRhEQ0DI2E=" + }, + "androidx/annotation#annotation-jvm/1.8.1": { + "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=", + "module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=", + "pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ=" + }, + "androidx/annotation#annotation-jvm/1.9.0": { + "jar": "sha256-Mjbh5ExB2jeMGsm1Fb7gUB2NxRKZFGUQCstN/mQFmk4=", + "module": "sha256-S1hpnRTWadIj2lC7hf/md3UH0x9JDVMFA4ODZ0l15Tg=", + "pom": "sha256-PEA0l9/stnxrIZqvVYVD8wnJSOIoxAB7ADMBEYDw6+U=" + }, + "androidx/annotation#annotation-jvm/1.9.1": { + "jar": "sha256-HjQ5F+vye6lv5NxSscrX/TK3OPvGNVu2zVs7MF1yEtA=", + "module": "sha256-A/tlkXfIYY5HQlklwRvJHzhHA+omwmW+myXNeSkrURw=", + "pom": "sha256-ibmcIY1gAZMWtQqreYFnB7whaWyJagMOGxrgOJYby44=" + }, + "androidx/annotation#annotation/1.7.0": { + "module": "sha256-UwcIZW04BgUHfqi8qa4TcvvRrzjjdfQR1OQyY71RDDw=", + "pom": "sha256-IcYYrIxwkt2VGT8FwLGWGDp86PE2anqRLIAOvuNoqFg=" + }, + "androidx/annotation#annotation/1.8.0": { + "module": "sha256-1ZCg2OAvQF3nSejcgLdB3FA8bj5MnAFtYU12tl8LWe8=", + "pom": "sha256-fDjBim6KzHvYjvrNfhR6iXqUW5nbci5U4LnOJEYQLVs=" + }, + "androidx/annotation#annotation/1.8.1": { + "module": "sha256-5jhuha/dhlBE4hZXXkk+05pjpjJb2SU3miFCnDlByLU=", + "pom": "sha256-txIll07Ah+uWwl72gZ9VscIvUw6FykRrpzX7Zu0E/1w=" + }, + "androidx/annotation#annotation/1.9.0": { + "module": "sha256-dHz857uARn6ipotGGHOPdjoUHND1Yvw1p8IVBCf1oxo=", + "pom": "sha256-73DxHmNYnrfKKI079t8q0gNPFR6F8gux9F0MyeQwhRk=" + }, + "androidx/annotation#annotation/1.9.1": { + "module": "sha256-8gSwW3KKl1YXGLxxYkLkfGKcAIWoDudPylPU1ji8vj8=", + "pom": "sha256-xzOIHC4X1ffIZhzAKpFZyxYLeyCUon1ZORbIfT4lBjY=" + }, + "androidx/arch/core#core-common/2.2.0": { + "jar": "sha256-ZTCKBrHADuGGy54ZMhOD8EO5k4E/FSLEf0o+MwO9ukE=", + "module": "sha256-7fQgDP3C2UYjIlLJnl3LnGG7kJ61RQsmE9HU/cl0uYE=", + "pom": "sha256-HhfUr41kJb4qafivTWVKh+BFYlmp7vFUKGm8sCNUfig=" + }, + "androidx/collection#collection-jvm/1.4.5": { + "jar": "sha256-U5pDQo34ozdiL7eBQB9fDNzVLYs2FfAIWvUckAAv8zM=", + "module": "sha256-0kq0tJY72cP4nhwA15eqeV6wK6/HGNzf0mYhH5k/KyM=", + "pom": "sha256-0eYk/dD1wygCSsORVHJkScQzfZ5WoFR/sLsW1Dn6FlY=" + }, + "androidx/collection#collection-jvm/1.5.0-beta01": { + "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=", + "module": "sha256-m9Z90440sDcxxzEBAPpp2VYEY7WO82jiTplq39WylHk=", + "pom": "sha256-/TNZM8LOdQe4YcQsRrKMlLKMFVxsFh69V8vgrcZjE+Q=" + }, + "androidx/collection#collection-jvm/1.5.0-beta02": { + "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=", + "module": "sha256-yWJG1TMsMZqFSrXS9FSuxp7B+OxCE8y9w8Jveoqq4Rg=", + "pom": "sha256-DHhItMroK4NUQVzDv8UOSBU38sDsOHLDdyi2AJNawAw=" + }, + "androidx/collection#collection/1.4.5": { + "module": "sha256-I34e/Faj4lqOpM7sJlWMKZhEv8U6rQb/P1PKHINeKMg=", + "pom": "sha256-DA39zlfaULfpyifTsZv/vjuY8x3cfgPNWEz3eAmns0k=" + }, + "androidx/collection#collection/1.5.0-beta01": { + "module": "sha256-zTV6fk5naCWsI4CaFLSw0HOExeNoUc58UVC3JnqLbxs=", + "pom": "sha256-ZpkVL++tCxICWB6bwx1hXuVwby1ukelKc84D/MZuNHw=" + }, + "androidx/collection#collection/1.5.0-beta02": { + "module": "sha256-XRtuakhubfGGt+zxG0YZ9qnNJjWzMoP+7vVCC7jK4lc=", + "pom": "sha256-dYjYKThPGuEmvP8qMD3kIZH43XcHuMyNv/NHNyGhC+A=" + }, + "androidx/databinding#databinding-common/8.6.1": { + "jar": "sha256-Zsq4JjnawPbCQzRkwJOwdNYIxLuIfsOKm4vErJgSZzI=", + "pom": "sha256-HVKzfmoakn9cRdrzpUt3qvP+ghuVaBfYMgrZeM9HObI=" + }, + "androidx/databinding#databinding-compiler-common/8.6.1": { + "jar": "sha256-9ht4WRdSaUuWDV/o+X/eSaL7ORFkf/q9bX1Wkjf8c2I=", + "pom": "sha256-0KpDvv3NKTdFk5QCJ0aw0l0Hq5S4njiMxd51jjbZsxs=" + }, + "androidx/datastore#datastore-core-jvm/1.1.3": { + "jar": "sha256-Niy60fE4dKIsc2ChjrmVylKjYDeboOpa8bHPDfAxmi8=", + "module": "sha256-UmGZehK21geoJRfnYSIzci3SVeQVrOanr1IzItT1nzk=", + "pom": "sha256-PjzxV7ZBhO8a829Fvu/J4NSxQXboljpDobvM6mUIUxI=" + }, + "androidx/datastore#datastore-core-okio-jvm/1.1.3": { + "jar": "sha256-KRUGtPzjmCSXk+MnIHY1vU3yUYHZU5gI1xgaSr0IdfU=", + "module": "sha256-zVmKuJgBFPskrdXyfKxVldwxG2gi7jUnVC3FwFcWc1s=", + "pom": "sha256-A6bYrsZtSOpv1VS/p0vx77pOBIkA1WipNAoU8qVy3Rw=" + }, + "androidx/datastore#datastore-core-okio/1.1.3": { + "module": "sha256-SWvvC38Y/ZPd0+j/mrdvWq4YdDNrSpwe7n7YgjBdY+w=", + "pom": "sha256-qNiO7HMQohfDyzlAjArdOuyd+iuKJaia8av+HRMUegk=" + }, + "androidx/datastore#datastore-core/1.1.3": { + "module": "sha256-8lm5afpDZrxe0WT0Alngj23e25rLD+1E3BClSnZ0p9Y=", + "pom": "sha256-R0vKoLsIzJYBd+VxG5sKaHqMo/EZdLMSDOLAU9CmDlI=" + }, + "androidx/datastore#datastore-preferences-core-jvm/1.1.3": { + "jar": "sha256-yznhIjtDJNcwxXOivOo6NTCevZNY++YwiZcFo/vKyvY=", + "module": "sha256-jUuuxy3XADVcSt/3NT91dMlHKa0ooV/Z4VCPYllsSLo=", + "pom": "sha256-QPd7mcpDHTWea5G1Fgb8EilaqOJmsQgu0ZpUCiEovAg=" + }, + "androidx/datastore#datastore-preferences-core/1.1.3": { + "module": "sha256-/1gXB5+CMCjyAVpNkP9lmYuGAN9e6mIv1DHHxUy+818=", + "pom": "sha256-4JQxqWCBKD841vntXUIwGhHRtxPmuDAAA1Bl+hB2Z7g=" + }, + "androidx/datastore#datastore-preferences-external-protobuf/1.1.3": { + "jar": "sha256-/LPzc890NCbIXrsNPMZErvrybzm3+lW7kCONQbaJ7Kc=", + "module": "sha256-BN/dYC2DAcG/IiN+nxIO+SJvvAKi/OUSGfsxmGrjAIA=", + "pom": "sha256-DMlR5kOJ0MeRDCa32XgweqPIjMDLtj5r3d8puNH6MeE=" + }, + "androidx/datastore#datastore-preferences-proto/1.1.3": { + "jar": "sha256-Y2hqYS85uMpgO+vjN21V+2ye4opKUXPvpJyJy8yooSc=", + "module": "sha256-lOdNtE+L1YmQpJEE+suE7qeOQ/xdYG3OWFJ4EDO0J4s=", + "pom": "sha256-/4WW0Y9dfYVv9AtvG5hCRNzIYdc28gydatF4RyI6waI=" + }, + "androidx/graphics#graphics-shapes-desktop/1.0.1": { + "jar": "sha256-8wXB4aw+t9IOVFUPSOB7VqlpUUc90/57uJE+0M06XpE=", + "module": "sha256-0lI9c6u+Lx54cQatTh96zuMKfGI3D4W7TXgnAPD9BwE=", + "pom": "sha256-8cK2TcpMcwYnX0QhdnEnQOsCG3ivD4oxbFd75j3rxuc=" + }, + "androidx/graphics#graphics-shapes/1.0.1": { + "module": "sha256-LX9tVQQimfnE+EeKoJS8QJmjRpAnef8wkf7R38K2L1M=", + "pom": "sha256-drUM5mT6RKSxZUIIHgiJkc8xaubnI6pM0BpicZ8aiic=" + }, + "androidx/lifecycle#lifecycle-common-jvm/2.9.0-alpha08": { + "jar": "sha256-rLRTlzoTYO0Y2EBYDm+Ncdyr+lJ6oehZvtSE20xTNbE=", + "module": "sha256-9Xd8ppZxVmGZ3jhyrBFGQCR4uHe+k6CWCncnL4Y0dI4=", + "pom": "sha256-UJ/gyGH21JJu5935B3V2mExTRb7B/6tMBAEs5agCgGY=" + }, + "androidx/lifecycle#lifecycle-common/2.9.0-alpha08": { + "module": "sha256-awUTjQm0RClnOOsshSgBycz8ZB3jUWX8wIZRw9/BlvY=", + "pom": "sha256-gTBpAMV+VZ2TFs75W3MFH2ek74p8vxSjsLTWuN46WX4=" + }, + "androidx/lifecycle#lifecycle-runtime-desktop/2.9.0-alpha08": { + "jar": "sha256-c54I5HdGbNhxhLvRfEkLPrgdBN0X/otowLVJpFnlg+o=", + "module": "sha256-/U2AQwWz+ccQ3pZgTDaaWJzpBWzvPBLXLfCvxgBooCQ=", + "pom": "sha256-/uDg3D+qBrx2tDRs5B5sGGSdgxib5STv7oEbrnlJfOk=" + }, + "androidx/lifecycle#lifecycle-runtime/2.9.0-alpha08": { + "module": "sha256-ihhLC+ff0o4yvI11d31N1fezUgOgWY3BEiNJTpvDmE4=", + "pom": "sha256-K1NQSadO4zEFGDp3frk/K8Pc4eZyLVPtU1tzT2qwgLY=" + }, + "androidx/lifecycle#lifecycle-viewmodel-desktop/2.9.0-alpha08": { + "jar": "sha256-XRIKJZL12D4c15kar6/dlGq9d4aM0i52mqmmAn60sjA=", + "module": "sha256-+eIYGqxXK8p0PmLn4PpC11zD/T0OvROUZ2gB8BcBxcs=", + "pom": "sha256-RSaPE7q3ZjmOeYOGRqUY4NwFic6bUlajze30+d7Wais=" + }, + "androidx/lifecycle#lifecycle-viewmodel/2.9.0-alpha08": { + "module": "sha256-xq8B7ZVLEyTGUB6TGRvOuBgPI4kabPhV6LwOcoZ4n7s=", + "pom": "sha256-Id6ZA7OFAESafBIVSnPS9KZUS8A9rKsH9sv61IdDlSg=" + }, + "androidx/paging#paging-common-jvm/3.3.6": { + "jar": "sha256-m6OQ1JxJCDe+xyT+9mBGVJWnMY3oG2kdRjNOvk2Dqio=", + "module": "sha256-qyJqL/6Vbk7NPrvGJpWo44YTDeJ2ShAPaZMnvX1KJZ4=", + "pom": "sha256-Xm1r7BhBdGnccg6//qQsMgsdYEO9uNS9Os5UP3pWnIg=" + }, + "androidx/paging#paging-common/3.3.6": { + "module": "sha256-laMPLlShL85R6fLzDMER+rayFuBB29jCbYZinBi1fHY=", + "pom": "sha256-QqEut6WreMa24QK2w0SLzhmCfeFj3fwvT6PT9sCjd0A=" + }, + "androidx/performance#performance-annotation-jvm/1.0.0-alpha01": { + "jar": "sha256-jQDt0rDtNUMQF6pZlzl+HdFA1FR/VUYs0YoMYsgX6Ec=", + "module": "sha256-lUXtqn9grdo4UabgVusT23S30C7mkk/Ec9cYtcTlSvI=", + "pom": "sha256-OUJQciGu1ry4UH6wtx4t4AbCapD6Pwz1Xvk/c5/OQAQ=" + }, + "androidx/performance#performance-annotation/1.0.0-alpha01": { + "module": "sha256-p+/urPLRetxNBttusv/ZkRf/UllUPqjH1vLzbWLawTw=", + "pom": "sha256-2iS/vOWDd2juWR/jxTs3X9GFbeXMYPX9OTDffLANuWM=" + }, + "androidx/room#androidx.room.gradle.plugin/2.7.0": { + "pom": "sha256-jO03tXX2KgGYh6AvgkEd9plwN+69ODbdJRNCh6kjpZw=" + }, + "androidx/room#room-common-jvm/2.7.0": { + "jar": "sha256-sqALiMi42BDQfsvfkv3/R9t/DqiE7+XDHNp6UmybGuU=", + "module": "sha256-spo0zB4zdf2SApU2qych9SCnOxwAAAc5935I684GnrM=", + "pom": "sha256-jqAbXXin7uVpeXWrXQ71uKrR+VZtyRWxgHhY9rknC+g=" + }, + "androidx/room#room-common/2.7.0": { + "module": "sha256-7HbDv4WtRYn9CMNSIAGv+niXDrd3IQfLXgbvYON6dOs=", + "pom": "sha256-/NHMaEUFNJFmGFvnQAFSeTMc+tb8gbp6Dwqc5bHYvjM=" + }, + "androidx/room#room-compiler-processing/2.7.0": { + "jar": "sha256-uWCePhQVdZWKAhfe54YQqx5xVwm3XvOD6Fn7lu+wDfA=", + "module": "sha256-r+YNX3hAYJyB8/eNj+iJmkdUfZbSh4S9Don0d3WIM3U=", + "pom": "sha256-re9BpiiLw/dND2YQ/kaZzO8QCpCk85Xbcm6kke6mDRI=" + }, + "androidx/room#room-compiler/2.7.0": { + "jar": "sha256-2QjokrEGOdKTIOpNZL6hxAPgVYKhY1mFVtXqI+sEsM0=", + "module": "sha256-GdNDFFyug3uwErJLIjLamd/3c/3txYWIpofScOA6HWM=", + "pom": "sha256-I0WACHZFgR4KU5COgKdbp5rRq+SHuAx2LfUAv59sCis=" + }, + "androidx/room#room-external-antlr/2.7.0": { + "jar": "sha256-a/eUv/6N4mOCZQJRG0x98FcDErbMmTEsp/xr2wiAyh4=", + "module": "sha256-MWfDNMTvWzrm9Hz/Xc1gFBGoeZwNkF/go7ajUoxhfSE=", + "pom": "sha256-32NsPDSZkkgDFp8ogHawWP1sDwcFsIdXYvu5K9FtTkA=" + }, + "androidx/room#room-gradle-plugin/2.7.0": { + "jar": "sha256-WGQDSy8Jp8aqbeKTYYpbO89705g9eSwWZRTeR6hKGo0=", + "module": "sha256-SJ6pyGRF5MjsvLSN6d/pU07e2ssp07IkuDg6+PvfDb4=", + "pom": "sha256-gtTxMUDD52vJq3mo+8RpY24RGCLZL+T+dA3WjZSoYkQ=" + }, + "androidx/room#room-migration-jvm/2.7.0": { + "jar": "sha256-jFzsjy1docuf3pYP3SJTu/xr50+aSgPs24LaF2YiMaw=", + "module": "sha256-I8rhKFYmQ1YmBrTgdWsM3JJWSyp7tYQvf9BOsJsQgcA=", + "pom": "sha256-BxT33w6jjXRHmxSpQr/08kYsR8jxixPJZa8VX8+rmic=" + }, + "androidx/room#room-migration/2.7.0": { + "module": "sha256-DE8cr5FSvrgFxHMbHsKc+0kdPlA881uSPR1S1XSmjUg=", + "pom": "sha256-9p246bQJHRqqYz8+kT5YNiBL2n34v3kFZH527U8g2C8=" + }, + "androidx/room#room-paging-jvm/2.7.0": { + "jar": "sha256-sk4d9SMJ87PYtjte4pRxJKSBwNeRneu9A04eH+2PoTg=", + "module": "sha256-rEo8iiqO6QHutUnCYUydLpFEqb4MBDcdYn3ENOv5nek=", + "pom": "sha256-2TdAJljNPTJti6QlulPwX+gQcqZsH+NbKmvXCHth3fA=" + }, + "androidx/room#room-paging/2.7.0": { + "module": "sha256-rtb2GsbL168Mo1ojygUDCrc9S04ezPXWrp03gLHRkf0=", + "pom": "sha256-G7J547FpfmE4KmYFc34hvstU0xDHClTpuPaqd0ZkhQ0=" + }, + "androidx/room#room-runtime-jvm/2.7.0": { + "jar": "sha256-REhdvgDmROk7ZMVw7zuAhOJqJezyPTBUcglZlN0SOCw=", + "module": "sha256-nEzKxPSjcjzMYYFO6b33cDuWDXx9QFbLIkI0TZhqnVc=", + "pom": "sha256-inWvKB1RJ5Er9JyRUbHG8V/HhI8+kvO4U2Q9/itqJKY=" + }, + "androidx/room#room-runtime/2.7.0": { + "module": "sha256-hFvOPtZrDS3j59zXLIWeCw7+KV7+DStX6f4ptheteWQ=", + "pom": "sha256-n/HDkKw80IGMI6ARZ2ubg+Pi3b0bZKRXYfBdABPxGvA=" + }, + "androidx/sqlite#sqlite-bundled-jvm/2.5.0": { + "jar": "sha256-vXvOYFl1Dj/2KpKNi7z3y2Jwqu8eI5V6reZXcH4a22M=", + "module": "sha256-qUqhqRd/wWYOK8t5ITN9U1wTnvDPkvwKzb40pdehXVc=", + "pom": "sha256-lcBAf1FDBVMvq24ZjT1ZvEg3O4X4U7nJsgX/xs1hhqs=" + }, + "androidx/sqlite#sqlite-bundled/2.5.0": { + "module": "sha256-nOptix4yytKlCdma3LnVjI6ejW9BNWyjR80ZZlKp7cA=", + "pom": "sha256-QBok46XmeqpSCMY3wQdt4mHi6QATUNdOn8cijtWFSqg=" + }, + "androidx/sqlite#sqlite-jvm/2.5.0": { + "jar": "sha256-v8KIIfcqgyxHp1bH0JFJvbARcdyw1bcD54Wh0HIu/is=", + "module": "sha256-5F90ErgzCNd4k9vb3EM+eU4kJOLOEtX7H/66UEVyTBo=", + "pom": "sha256-Tzgy5s4TGAjOulzCcurjzPbF2vFODoY8pvN91PvKkhU=" + }, + "androidx/sqlite#sqlite/2.5.0": { + "module": "sha256-NplIHJ/Fh59CvG9fIv/8tuXSP3WGLmbwB+/2MdcWl3k=", + "pom": "sha256-rT9uj0qsJCjS/sbcmYdgBKmLeI0EEKj0sWmrV4JtVj8=" + }, + "com/android#signflinger/8.6.1": { + "jar": "sha256-wdyixoNjTuGilCmPnHF5V4r2qG4IC9xA+WGRW8XIFC8=", + "pom": "sha256-HxZNAt/iuj4BXQLj8kgg3iRlktkX8eAPkaGnaTYa+Z0=" + }, + "com/android#zipflinger/8.6.1": { + "jar": "sha256-gd1IVhilCaMjWSm56xMJHYhEUmYd5s5aRcw4scVVQhw=", + "pom": "sha256-5R3NgXBmVPdF4UHUUxw3lY3xrEfunNdWISvWGndYx0U=" + }, + "com/android/application#com.android.application.gradle.plugin/8.6.1": { + "pom": "sha256-NnATbXn6gs8BrM3gQBObBgLTl+nwo3RVm6lvLtWW2Ws=" + }, + "com/android/databinding#baseLibrary/8.6.1": { + "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=", + "pom": "sha256-Lek/tvpLtdFPC53HpfcM+MJxM7aJ31tHyf5K+ZcC/sI=" + }, + "com/android/library#com.android.library.gradle.plugin/8.6.1": { + "pom": "sha256-bfpZ48HmjapL4RvLUNueWbh1ikieqUa38d3FscST17o=" + }, + "com/android/tools#annotations/31.6.1": { + "jar": "sha256-slmV+nsiDTX7uOMl3wcfgpFpG/uv+XNMmOOPRewqc+4=", + "pom": "sha256-IWRj0T6tv+FyrXle/98/hWYWFLvK0xWyIBs4z9h8650=" + }, + "com/android/tools#common/31.6.1": { + "jar": "sha256-SSGmYQvyjwKRHrfW4bpJjbmIhOXyM+VScmGaCEG9THk=", + "pom": "sha256-bc+djIuiKoCXnRZ3UceVp790AgJ5J+DQAVS2SVQGcY4=" + }, + "com/android/tools#dvlib/31.6.1": { + "jar": "sha256-XMxJAlggKFBjDFnuy50ppshJuxfxD0ypAX22SfcuSB8=", + "pom": "sha256-za6RmOnCv5LJRoOwCdaq2DENFPYlB+XtUrWPkzaaFdA=" + }, + "com/android/tools#repository/31.6.1": { + "jar": "sha256-FpwueneqMJeIedv4swQ2ZxFlhy/L392mxzWq3bZxA0A=", + "pom": "sha256-Wy1SZioiTKSQkY2NBO11pwKijjKk3M059fQHjDuAvmc=" + }, + "com/android/tools#sdk-common/31.6.1": { + "jar": "sha256-rWbuxoXuvi5q5DA+cMifcjF/p9jMKznjb9+oZFoiYP0=", + "pom": "sha256-jGPiQ8FUZMUpy8d0RExbQLCvEBhvI6wLYJxdH5LxU5k=" + }, + "com/android/tools#sdklib/31.6.1": { + "jar": "sha256-MaLhQQus1+ikZH45fM+RS2hrMjIpbkIpEo47rZZwbiQ=", + "pom": "sha256-t811xH6Y3EkY4FmdmhQgL2ymw1jQwhRTL7syF2cVBGg=" + }, + "com/android/tools/analytics-library#crash/31.6.1": { + "jar": "sha256-LFwmQglnZ1wHS8cUCDH+O/9burx/u8CLop/cPq3MlRA=", + "pom": "sha256-NvqCjh3SQRZx/J6x0GEMMnsuvnMEkHDq4TTa/B6Es+Y=" + }, + "com/android/tools/analytics-library#protos/31.6.1": { + "jar": "sha256-DNE93twi3+NTWkxq3FZNH8OA9pXdH9dM8CEwxRDPtXM=", + "pom": "sha256-+Yz/nvLEIr1Qwd8C/LAqFpUrZSpq5dyxKUTM71DBwLA=" + }, + "com/android/tools/analytics-library#shared/31.6.1": { + "jar": "sha256-GI7Dy4ge1lXfkxHMWHAdyzKZc2UAToqmhUrPtg9uNeE=", + "pom": "sha256-jSxpFb90fFudanGXtCcFXXnMACySZqkOvMLeIyt8F64=" + }, + "com/android/tools/analytics-library#tracker/31.6.1": { + "jar": "sha256-fo9FqtqL7accKXbBXxoxbqoA/UqWgyITEc7SvbwCZAg=", + "pom": "sha256-ZG+eNf6Hg+tmaOcON9/3yNQWLu0ZGXzeLKQZXyp32f0=" + }, + "com/android/tools/build#aapt2-proto/8.6.1-11315950": { + "jar": "sha256-95NZqIrRc08kmq3KiGgHshXyYFVUnCLzTc6pojE9FOo=", + "module": "sha256-lJIZIVzqn+pESWzhbsPEczrj8Wp5dT7swK3SSxG8i0M=", + "pom": "sha256-1CRPdNhw+GpIBkVdAW+5IVtIKJH4omliEBG908ttgyU=" + }, + "com/android/tools/build#aaptcompiler/8.6.1": { + "jar": "sha256-fhn/PUfDvZs5JZbXFSKvckBT7ypf/iazn1sw6B6Ig6E=", + "module": "sha256-0iUxrbUzYh8DC4UMxyzgGBbF4qEcKfEPr0hiFwFLOO0=", + "pom": "sha256-Dt08VAlDjvWKPt31D6OygjTLLLdat/ththA2I3qdhhY=" + }, + "com/android/tools/build#apksig/8.6.1": { + "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=", + "pom": "sha256-Y2IgqwyxLrjpsO9Y9Hje/wQ6+1rI+pwOfjCIxaNFtzc=" + }, + "com/android/tools/build#apkzlib/8.6.1": { + "jar": "sha256-HBpn1vTxhkJ6wWbrqg3YZ/WV1RRPySUlKwX/udGhVrc=", + "pom": "sha256-+A/Fp631hgvcxti+aqP1Wk+HkwmZGFYN02l6sWjxbTY=" + }, + "com/android/tools/build#builder-model/8.6.1": { + "jar": "sha256-UW4P83gUFTJoP7OxbLDnFRe/izU4jCeXb6kGhyiahFg=", + "module": "sha256-oeBqW8yyM+dvrU838ONRwEtvnOs+PRiNwMWSaYJBtOo=", + "pom": "sha256-CwbNfNpMYeDszj94IZgV1bdHSb3fVnab/yNFAim9Fa8=" + }, + "com/android/tools/build#builder-test-api/8.6.1": { + "jar": "sha256-joChV9NorfAWKfWjBseP7R+x3M7uYcRXla4gfZG9q0w=", + "module": "sha256-dCvKxrVZ0bXunzxiNmtEJXoFDMd/OSUrh1769zww9ks=", + "pom": "sha256-PaWDrQnaoX+K8N90eIrkO7FBfEAqAKELcjEbsIEWs58=" + }, + "com/android/tools/build#builder/8.6.1": { + "jar": "sha256-vE7pSfTulTgcg1SH67axlkiJ1hBLAyOXln2ItPIG5I0=", + "module": "sha256-RYhYJQ9RO//baGrO0ACo2s3vkSvQkXlbQF13TpuZSfo=", + "pom": "sha256-Q5TYmYx2pslZaYSNasSzBOaunYwdy6dJ+wuiODezZFQ=" + }, + "com/android/tools/build#bundletool/1.16.0": { + "jar": "sha256-HqK/UnS7rHo7tWGFIdL6EfsE6QDjOopkYCnsYzL8CMg=", + "pom": "sha256-8uiq1EVaQjckYtXhiiaXPWdXEXmmdX84JfIn6Rry8ts=" + }, + "com/android/tools/build#gradle-api/8.6.1": { + "jar": "sha256-B/dr8vj3svN2zIbqvU+KgnkYK2Vw9EDnhD0GbwLF9VY=", + "module": "sha256-KZXYqt4hXuoOQg5PM9v2RKC4pHxkaT5AfCzFdFra7LM=", + "pom": "sha256-GdPcq6tb3TEhEcywDXVL8U0rtG+5xe34fuEor8awjuY=" + }, + "com/android/tools/build#gradle-settings-api/8.6.1": { + "jar": "sha256-fKfb0L6RIEeJkOJfuDzwg6P8ebypZE4kfMVUY1jOKYI=", + "module": "sha256-qzNDgysjM4ATShFTOlRaKo+3GLboSDxtkmMEETNZB74=", + "pom": "sha256-NOp/ZQ+mdHYwCvsxWAIFF4fOfztRDY082faDycpqc8I=" + }, + "com/android/tools/build#gradle/8.6.1": { + "jar": "sha256-lpdzOiFfLtQuWy/EBTSE7IMuqylYTrztlNkskQkAUcE=", + "module": "sha256-KYi7+h3QeXxNVkLISB5RMAMNuTKahKacPoVKmpmUBQU=", + "pom": "sha256-N4nZdy0Ai/FRwZ9rgaRCwv/NZUpXq0k/n664frPY0Eg=" + }, + "com/android/tools/build#manifest-merger/31.6.1": { + "jar": "sha256-qpY9SvRasDHFcHg86ShtIRHusLjDvfROSMqQcUzMt1Q=", + "module": "sha256-WrgUxcYq6ApgHpOLUxOcEPFKicMKVWPFCsRSeHNxsPY=", + "pom": "sha256-yTK9b/FjMsbpwsLtTK/2+/aUBxhTCpByB/t4KV38qLo=" + }, + "com/android/tools/build/jetifier#jetifier-core/1.0.0-beta10": { + "jar": "sha256-Jqu0oTkn2QYhacUEyelP6A6a46T3tauIdasAdTapH14=", + "module": "sha256-8JF1iaQtJ2Fj8QBAq1hC6RiD3L2x1Iv9Hx/Kpywcp7c=", + "pom": "sha256-XJ1C5rfjXU2NAuCjIs8maTs+w2QrEHyPC+WnIdRaDG0=" + }, + "com/android/tools/build/jetifier#jetifier-processor/1.0.0-beta10": { + "jar": "sha256-xQZ6e5KCN6EnGl6ctXEOn4C0lzKTlFvFHjpMhk6kv+0=", + "module": "sha256-NsJVdrGZk982AXBSjMYrckbDd3bWFYFUpnzfj8LVjhM=", + "pom": "sha256-M7F/OWmJQEpJF0dIVpvI7fTjmmKkKjXOk9ylwOS6CEI=" + }, + "com/android/tools/ddms#ddmlib/31.6.1": { + "jar": "sha256-xXHAIk/j5+ZgcZbZXMMUL9wZ8BPo8VEPaMe0pobFOAk=", + "pom": "sha256-NhGKNIRO8zU7wHiko/RwiEI0KK1q0ejNStAVV6Ka6Ok=" + }, + "com/android/tools/layoutlib#layoutlib-api/31.6.1": { + "jar": "sha256-mLrjb/BR4RTdTu9e/6gPvl5VKUT0IzzokhYNos2e6u0=", + "pom": "sha256-7NQxU4aAO6nUO2e4+myS8EkERQHgRdMvQmDZP5yaajA=" + }, + "com/android/tools/lint#lint-model/31.6.1": { + "jar": "sha256-O7YYb3ddznoQY5HiS8w8jScLzN8vVRuSFhxq3AvC7N4=", + "pom": "sha256-1YuNHgi4YrbKf3M/pbGQszNZViI+ZGV9SoxCw1PRVdY=" + }, + "com/android/tools/lint#lint-typedef-remover/31.6.1": { + "jar": "sha256-W09IUhXKTYbvIxn8OYtfIlHmL1RGvF/Q4AZTZI3d4xg=", + "pom": "sha256-dk7anwlKi4/gldYIdZl6hhwiekbfspnUdJ9ook3e4MM=" + }, + "com/android/tools/utp#android-device-provider-ddmlib-proto/31.6.1": { + "jar": "sha256-2p8/Pa4mVEyQZoVJWEdl1YVKh8Ql0s/ld80002AOoJc=", + "pom": "sha256-eOOwDF+DPBf3rKWULwBsorkVu9lg9k1TSo1AoDm62aI=" + }, + "com/android/tools/utp#android-device-provider-gradle-proto/31.6.1": { + "jar": "sha256-rSNCux1vlVY0AKMiST6hwinLk985RPEmG3OZ9xhJQEk=", + "pom": "sha256-da7iacXcaVBY4hK/6bQGXlNPfbVdb+IprrQ62VFU51o=" + }, + "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.6.1": { + "jar": "sha256-OEUGlN5jKMLEy6aW+cBOzdXOaVI1X2jDoi+VQdHWVG8=", + "pom": "sha256-cP+V6yxSgoI6jJjvssM+5tLyGWS4he9IXxkhF0ODIMY=" + }, + "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.6.1": { + "jar": "sha256-VD62yNcrLtdFH46TnV2AiQVm8UvCa335yDR1BrJY164=", + "pom": "sha256-771HKHgCPhXZzZNlIth03F/Um+MUIScA9rF6BYFxF8E=" + }, + "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.6.1": { + "jar": "sha256-77TXAUqqc1UkagfC5DeiIx+yUlQP8bzmhyyI3I2onRI=", + "pom": "sha256-orxwsWG8GzB3crqSXOMlRKR1Of3gSnCbMgiFYKvpvtY=" + }, + "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.6.1": { + "jar": "sha256-rt7F7EYn2JjMzfQtgDjbIOukSVdTxT0bCzeHNEkcr18=", + "pom": "sha256-tApCizomm6Ik+1p6DQ0swY5TEgFVDuR1Wx1wR4k6mQs=" + }, + "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.6.1": { + "jar": "sha256-kSkCS9jjg1O8o+sm39jjYo4FjVfW6dhFH/w18BZ1HmM=", + "pom": "sha256-OysKImsUosDlrWKdEGL7sppvGVQsXxT+D4mP/wEh5Io=" + }, + "com/android/tools/utp#android-test-plugin-host-retention-proto/31.6.1": { + "jar": "sha256-PbjtOO9JtpTK6kZq4i47Ns7clVezWJ0OB8DN2DKUWRw=", + "pom": "sha256-ZnblwB6LjiWcJJEqrXEx6rC+D+/kBeUZzs6o4+kBoMg=" + }, + "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.6.1": { + "jar": "sha256-y99xvKYOFMMOeyz0uQ8PCj6ME498rdh0sNnArgguAnQ=", + "pom": "sha256-j1FzWv7i9yDS70ZCGHoppH7u2uTuNVyS/X3R9K526rQ=" + }, + "com/google/testing/platform#core-proto/0.0.9-alpha02": { + "jar": "sha256-bYqJBndBUPQ6j60IymTiXGBww5vYpvwTslk/KJJC/pU=", + "pom": "sha256-J855WUJ6L/7kjQ/rRRKKPzbMQX7YqCKvoigiyPWliyU=" + } + }, + "https://plugins.gradle.org/m2": { + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" + }, + "com/fasterxml/jackson#jackson-base/2.16.2": { + "pom": "sha256-2+E1aBujNdhSI0UNczbqmrJnBPbXHWY2aVcOPXvkDrY=" + }, + "com/fasterxml/jackson#jackson-base/2.18.2": { + "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.2": { + "pom": "sha256-CZW2YqaOsTyz6Qj7biN58Mo+7rxmVnd8xVhLDCcRHS8=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.2": { + "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson#jackson-parent/2.18.1": { + "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.2": { + "jar": "sha256-WBvWEADvdkiUP3gcoFaJ5W0D9gUnSDZajis6m10/oy8=", + "module": "sha256-4Ruvm1NubflNqmNaEBPsPgabhmuOES3cKqBEahVQUNw=", + "pom": "sha256-CyvWlOqJJn7qSBJqilskplI0xkM4dULSRGnRlb+6HPg=" + }, + "com/fasterxml/jackson/core#jackson-core/2.18.2": { + "jar": "sha256-2AVK58DRwtL1XSjkYCbr5YkogfP6tfQ5IzGEOBw7Sh8=", + "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=", + "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.2": { + "jar": "sha256-SzZOaFDciRcvzx1N0muP9UiO2kT/RlfiLdJlID3Vqzw=", + "module": "sha256-jH2sL3J4GNiEeoKqTqxrAXTXnPBN+Q3iJGBy5t005wA=", + "pom": "sha256-STo9tkR7eo7Ls3JCNMbOZ31y20sE9roAjw6+rqe+Wp0=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.16.2": { + "module": "sha256-dJwa2Kf8wceyqxu28cVdj0aO7N52dj8XOnBqhbYDu9I=", + "pom": "sha256-PX/SUZIuX9QxAM3Q2LYv8XqhGcbwfkziEa+hRCWLCbk=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.18.2": { + "jar": "sha256-OBocBxHku4hWGmwACLWpRUZWKMoHdkzNZqDZfuB61hI=", + "module": "sha256-evxmQXLDpubGw1hHZaAyncb+q7/mu6ibrq2L0un77Hs=", + "pom": "sha256-9W9UNh5DSV7TuiShoG8OO3QZA+Q+0TLxpq086QErhBU=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.16.2": { + "pom": "sha256-0pd0eUdcVynnGNdKFrH0sDOlhPNKqINfgOy/MHJKnUA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.18.2": { + "pom": "sha256-4h1diLBHShG3H+lBAMT1KVv6F08u5q5LCtArdhZHhkg=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-guava/2.18.2": { + "jar": "sha256-cb8hy/lU9EZcPgGHpiwwueDi7WEvpk3cuomoeTGyoIo=", + "module": "sha256-GvbeQyGW2+HaV18d3FiWKF3DS/pg6o3/+5/RN8rPnG8=", + "pom": "sha256-7i25uOpx1O5KQrwGqqcT0jbh69iM2JJ/ajKEcCMcPNM=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-joda/2.18.2": { + "jar": "sha256-Hd3EfKqnKAeD1ylsd/anBbepK8lapGkJP84EsTZ4c1c=", + "module": "sha256-l7/z2hhe3gfky7GdnuLX7aQbYeQlaRfLA9EF7fhxaNs=", + "pom": "sha256-fhIcCK11w60LpYCsK1K1Rz3DSIYw1QfituIuTjeeJjU=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.2": { + "jar": "sha256-4tIC1GBuI66vilqWMtsG9f79W2PSUcP1A/n6qnhTDlw=", + "module": "sha256-Jd8o9WC1kI6hAYUATV/Bkyk0hHBj5mcpJID2dbOx7eQ=", + "pom": "sha256-FivnrZea9eDHOc1+0BiJ+Br0ggDJ+RJ5lqElrFGzSkc=" + }, + "com/fasterxml/jackson/datatype#jackson-datatypes-collections/2.18.2": { + "pom": "sha256-VB0YzwMSgDw1e8lKVSkC4P5MdlieH4+dVtJOuwThRLc=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.2": { + "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY=" + }, + "com/github/ben-manes/caffeine#caffeine/2.9.3": { + "jar": "sha256-Hgp7vvHdeRZTFD8/BdDkiZNL9UgeWKh8nmGc1Gtocps=", + "module": "sha256-J9/TStZlaZDTxzF2NEsJkfLIJwn6swcJs93qj6MAMHA=", + "pom": "sha256-b6TxwQGSgG+O8FtdS+e9n1zli4dvZDZNTpDD/AkjI9w=" + }, + "com/github/curious-odd-man#rgxgen/1.4": { + "jar": "sha256-sTsHS/BFeKORAEFwh0RmSKB54tYmzYQfl5TjTmim6Ow=", + "pom": "sha256-rwIHmlYZmNS7r7ypKLxD5qSjfa6svs0ziBypPNW6TnQ=" + }, + "com/github/java-json-tools#btf/1.3": { + "jar": "sha256-Z8PkYutQgH9OCl9N7jBLvxfNmGpC7l6wsvTJv2TRMNk=", + "pom": "sha256-qb8bOVbm1Gy99zeRKOsXMs3hrGVAl5RNxlobbcQlcPA=" + }, + "com/github/java-json-tools#jackson-coreutils-equivalence/1.0": { + "jar": "sha256-60qa19gD+whL/895PIqB9R10W21DjChHDvnVql+4oYI=", + "pom": "sha256-0Vd8uaSY6Et0+ADXdRiQb/ErXT4vKJ2SqTauCU6sxeE=" + }, + "com/github/java-json-tools#jackson-coreutils/2.0": { + "jar": "sha256-FrOqvTqeslZV3aQz41+b2cfBqnmRQncC9fEfAAgT27A=", + "pom": "sha256-jZ7pOk/dXSvYDrqUonoTDWBo8/heSI61vxSUOHEc6eo=" + }, + "com/github/java-json-tools#json-patch/1.13": { + "jar": "sha256-H3lNJWlltT7zfnC1VQXi7QDdwBhNROLo4f3OWjysx94=", + "pom": "sha256-59lec35Uwo1EuFv2Qw8VNvZEZU1pQr2ogzM4r5aWSw8=" + }, + "com/github/java-json-tools#json-schema-core/1.2.14": { + "jar": "sha256-yFmUL92inCbMsr6DqEU6Ew3jX95viK4Yl4VRa10U+Bw=", + "pom": "sha256-pR/BAI6VN7vFJbpywl4Lz4LzXxscwwfC53jS7fO9V18=" + }, + "com/github/java-json-tools#json-schema-validator/2.2.14": { + "jar": "sha256-zZ48WZuzIpZRf9OsOL7qxwnwpquBstQolJXQNhulmJk=", + "pom": "sha256-W8HTDGddkv+DV3ldOvN172JqvffrMjS2TahmKqEeqZs=" + }, + "com/github/java-json-tools#msg-simple/1.2": { + "jar": "sha256-vvQRG5k6Wz5hSNj1hWIczqwqGInNvDREixFjLg2Kmo8=", + "pom": "sha256-bvPzUgcukUz6FzkzRoXyotAAJRL8Ul+kEtSQ1FCUMKM=" + }, + "com/github/java-json-tools#uri-template/0.10": { + "jar": "sha256-OTb2fY59+j7t7+RQ/1iHF0kwiYLGuLcGU1qIQ5HfT7A=", + "pom": "sha256-MXithX0gGmwpZy4rFGrAuj7MUlNquZaUpGuxJfoBxrk=" + }, + "com/github/jknack#handlebars-jackson2/4.3.1": { + "jar": "sha256-UjLit9Od6+U8/YQ54FLF4i2rnUPROkrm+QziV2D8iRY=", + "pom": "sha256-GLG2aavIFa3VZFQXH3O77lXF8EKe+3P74Wk8E+rWL3A=" + }, + "com/github/jknack#handlebars.java/4.3.1": { + "pom": "sha256-UECkDYFTRzveednE1O+4cSChaQ+uWFtYKAcH1DdCCZk=" + }, + "com/github/jknack#handlebars/4.3.1": { + "jar": "sha256-VCT9EukRzxW+/RY0G0bg4bxoGqYePLHAcMV+aNzNW70=", + "pom": "sha256-/DAp8kYk6YvWC1pGmSEPP1YKOUiTQpzQbMrYROj41BU=" + }, + "com/github/joschi/jackson#jackson-datatype-threetenbp/2.18.2": { + "jar": "sha256-WhH8ZX6ZfW2tJsOilRNaWDRHqkoPoB9CSj2Y4TcZHTA=", + "pom": "sha256-0PmnYltkM3ZwhFZ7X310MqvuZHwX/b/WxFyx4zYvRcU=" + }, + "com/github/mifmif#generex/1.0.2": { + "jar": "sha256-j4ziM8M14I4ROj+Ved4QRvsZkn6CRosbvrzWy6h2C4E=", + "pom": "sha256-R2QJlPzU46EZStsn0s/kEQII7qlCwgSDTZailCVt5hQ=" + }, + "com/github/zafarkhaja#java-semver/0.10.2": { + "jar": "sha256-qOMuF1ddAYjB8+Lle7ldsJeTiDyIU/3oKLY+yx+Zpjo=", + "pom": "sha256-fwBf8/kA6GlV9aU0tamqjqVLtdYLtgrCN1lVCjZnaDU=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/code/gson#gson/2.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, + "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.1.20-1.0.31": { + "pom": "sha256-lrP34a55nJ9OmB1DIOe/SzsXFWRF1s2MvXXH1/1Cv/s=" + }, + "com/google/devtools/ksp#symbol-processing-api/2.1.20-1.0.31": { + "jar": "sha256-dy+FxyWzgCE9grQ9abQImS/U2sr50zJo4kJpQQ6gl5g=", + "module": "sha256-4GCAUjhnrw8wK83PqhzRT0jXO0EG852X7TvKh6yL8Lk=", + "pom": "sha256-uqoBWau+KpclCzYnONSk6a+seGjjZ5uD4jOeOKVWYHo=" + }, + "com/google/devtools/ksp#symbol-processing-common-deps/2.1.20-1.0.31": { + "jar": "sha256-qiyLzpH11PQt9VjLY6CXZMYHmKIcyvsue2Iwjdzc2TY=", + "module": "sha256-lSn8quFQ0UpsBgHuv2mBUEnzv2asHlnOaO57fU2XnUE=", + "pom": "sha256-eeve5b/kHDHPi1u83bvZftu8JhyYbuv+DeZf1WEQ7q4=" + }, + "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.1.20-1.0.31": { + "jar": "sha256-2ewkT6M+FXQk8eA2jNAWxKI4adwsUftrk6+aUuxIIVI=", + "module": "sha256-7q8aYoisLJi7sZRlqpfuLHWSSv1dK+/KO3w7hQP+P/w=", + "pom": "sha256-nQnbav/D80/FQo57fXmATVEROP3h0WIeKtEc9mQhXbY=" + }, + "com/google/errorprone#error_prone_annotations/2.21.1": { + "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=", + "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI=" + }, + "com/google/errorprone#error_prone_parent/2.21.1": { + "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/32.1.3-jre": { + "pom": "sha256-8oPB8EiXqaiKP6T/RoBOZeghFICaCc0ECUv33gGxhXs=" + }, + "com/google/guava#guava/32.1.3-jre": { + "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q=", + "module": "sha256-9f/3ZCwS52J7wUKJ/SZ+JgLBf5WQ4jUiw+YxB/YcKUI=", + "pom": "sha256-cA5tRudbWTmiKkHCXsK7Ei88vvTv7UXjMS/dy+mT2zM=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/googlecode/libphonenumber#libphonenumber-parent/8.11.1": { + "pom": "sha256-X12sUXT4TGCi6Z56g8eCb3NJgfvCDqHUN/em/Piq2hY=" + }, + "com/googlecode/libphonenumber#libphonenumber/8.11.1": { + "jar": "sha256-9DDJI5TCBT8WhxWFPaltmZlulONOWikbl8XIalrWKpg=", + "pom": "sha256-irUVuq10qC2rsC6+nm8XLUj0r+0KyAxn7aKIRqbN7dA=" + }, + "com/ibm/icu#icu4j/72.1": { + "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=", + "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug=" + }, + "com/samskivert#jmustache/1.15": { + "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", + "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k=" + }, + "com/strumenta#antlr-kotlin-gradle-plugin/1.0.3": { + "jar": "sha256-5VI7i8hPUYGRUEHSNsdTuaemtxM22yon7eQcRAYe81U=", + "module": "sha256-4AgFnvxtTXyXhNBV7cL8+I0FalWxjLeP1n+hN52K6Mc=", + "pom": "sha256-6aXHG2HPFEq+C0vhR9kFy9XibQe5xL3ocPk5aqj4tAU=" + }, + "com/strumenta#antlr-kotlin-target/1.0.3": { + "jar": "sha256-lqRnHwdcq2Cs3wfpebaekNprmlbgT9gtCgJwK71A5fU=", + "module": "sha256-bIyr2lyJg151FjpUGn4oXUqjFa1uic7pRFmd9DqHn0A=", + "pom": "sha256-LYVuemGj8sPqq2la0+VIgZmMhZ2VvibtMM3mdIjQA7M=" + }, + "com/strumenta/antlr-kotlin#com.strumenta.antlr-kotlin.gradle.plugin/1.0.3": { + "pom": "sha256-QexbCkIylibd1Tm6buHXXt6NhjhmGswhCt4ks7uH7IU=" + }, + "com/sun/activation#all/1.2.2": { + "pom": "sha256-GXPUmcwsEmSv8tbQUqHHFq5hPQGK4cL2EN1qTRwkV44=" + }, + "commons-cli#commons-cli/1.5.0": { + "jar": "sha256-vIuwH8D60lA4VwbiD5J93P9hc/Yzmzh9yHkjd1JWesY=", + "pom": "sha256-TuxDxPwoBMvrQ2mcq/qC+gYocfzB3P0QkCpdglIGdMA=" + }, + "commons-codec#commons-codec/1.11": { + "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", + "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" + }, + "commons-io#commons-io/2.16.1": { + "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", + "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "de/mannodermaus/android-junit5#de.mannodermaus.android-junit5.gradle.plugin/1.11.2.0": { + "pom": "sha256-t/WMW61Or7HykDeck2obA02h7vt/4A0usFyRxSXbehE=" + }, + "de/mannodermaus/gradle/plugins#android-junit5/1.11.2.0": { + "jar": "sha256-GAKPIqrV1Zx4DhD5Rlg55HpudC8eieZ7iFJSv5BRkAE=", + "module": "sha256-C2TlYxgPaaZloRD36F1C/M3F5Nc2o443uPGUhkmqYBw=", + "pom": "sha256-JUDnyFj7pBcEusJ6/+oBZ+ldhhfxyBwJ3iEjhKr4wbA=" + }, + "dk/brics/automaton#automaton/1.11-8": { + "jar": "sha256-okR19sz+HMek/p404Fzmh7DODG6Mt4Hg7O07GGSCxh4=", + "pom": "sha256-N1e360Vz2a4E37ViqPa9WqtKZbiD31RKTzYJTXz+I78=" + }, + "io/sentry#sentry-kotlin-multiplatform-gradle-plugin/0.11.0": { + "jar": "sha256-oF79yaoh0yoN/JzCh34jdSMHhBQ1HAhvng6H/WnigfA=", + "module": "sha256-BAVFTRMLVMv0d3rlOiVcJRDpnjGMhw5hwD+xYCxhDGk=", + "pom": "sha256-lsnWBhj/V6ICwjZdCW1tN5C5jhcTTzEMfPySFO/dius=" + }, + "io/sentry/kotlin/multiplatform/gradle#io.sentry.kotlin.multiplatform.gradle.gradle.plugin/0.11.0": { + "pom": "sha256-Wx8+RUj2DLyVZUVk+Xk+cbuU1STNcmfaPjL5xTFExP4=" + }, + "io/swagger#swagger-annotations/1.6.14": { + "jar": "sha256-J22F3CEgy8MLCL40t7rlQYRnymmDgUsNHgcYKeu1xQA=", + "pom": "sha256-XG0N2eUofKfwGeaH5i3HsGdnbwSJGV9fW+fmBTlVzLs=" + }, + "io/swagger#swagger-compat-spec-parser/1.0.70": { + "jar": "sha256-QG1OJJTrvLfBPUhPYEuBQEe34mgsw7cg0ixmXXaYjEg=", + "pom": "sha256-ypicQ+g5ALJ/rxXlx5zK+/mzpFs8UDoSgjrvf50BJjk=" + }, + "io/swagger#swagger-core/1.6.14": { + "jar": "sha256-2Xj1GhtYw8rtvflugONH7SndoNr4lEEw54WukqTdnyc=", + "pom": "sha256-zW3kbGB6HDQQElKqyX2EPQnpCxZAfZY2OcDqlQteTaI=" + }, + "io/swagger#swagger-models/1.6.14": { + "jar": "sha256-GMZMZwzhhe7VMZEqXQkj3RpbclxxRyGNcDsoNGyvlMM=", + "pom": "sha256-UXFllcHcdBALjQwb02lzqQ9W0PXI0aPgfk4J/IA3K6s=" + }, + "io/swagger#swagger-parser-project/1.0.70": { + "pom": "sha256-naIUULAVDE+U1YmsSIEtQh3mmNtIPDZ6PXiXbz3X9YU=" + }, + "io/swagger#swagger-parser-safe-url-resolver/1.0.70": { + "jar": "sha256-Ln6L9oFHtNvSS+JcEhd/Tig+krfDxvoD8EZjNkLzVcg=", + "pom": "sha256-pnrulNravyrPHrLB98dCdiweijfcRqflq95yDsNh7LU=" + }, + "io/swagger#swagger-parser/1.0.70": { + "jar": "sha256-lX6gThFPIQq8h6VDkm1mTB/ubvFePd1bhGtPrIPpEYE=", + "pom": "sha256-t1ioajcZscT68y1v4XxTalKGXxYjr1YXidKasKw0r6c=" + }, + "io/swagger#swagger-project/1.6.14": { + "pom": "sha256-9F5u6XAwQIotCRByYaFCqb8e9Y2WXZWYcBDfWZBqmL0=" + }, + "io/swagger/core/v3#swagger-annotations/2.2.21": { + "jar": "sha256-ZEUU+9oJzwvYwql2bsqaQofWxsOzRktc97Qx51sW0W8=", + "pom": "sha256-f+e4Efwks28d4ZBh3M2NNu8TxzAClbrDUq/ODZXhS5Q=" + }, + "io/swagger/core/v3#swagger-core/2.2.21": { + "jar": "sha256-wkL+SD0YHvsxYcjO8jLS8U03T2Cl/3xhrM59YeZBFJ0=", + "pom": "sha256-dfPAX969TtOmiCL93OV4dbFYMeLkfeSPWoWS83nrkNo=" + }, + "io/swagger/core/v3#swagger-models/2.2.21": { + "jar": "sha256-kQ9VvG+elOuM9mB0G8ghVnSkbdtmG1uKdSWyW2VStTg=", + "pom": "sha256-fxD+bKOG8XLV2U71emtTC1WJpP88pxJ6DFy9S4pv8yg=" + }, + "io/swagger/core/v3#swagger-project/2.2.21": { + "pom": "sha256-oiRjNjBIh36joj69WOGddbieayxhGJnmxjZ11e2kopQ=" + }, + "io/swagger/parser/v3#swagger-parser-core/2.1.22": { + "jar": "sha256-Vrr9/sIPaeCstC8QZ/yJdUwO/5MKjmUYdS+1EFnpPro=", + "pom": "sha256-VXT1Zc9Z+wntNm6Aw1PFu6tnEMP+hdMtrsV0RcEUUpM=" + }, + "io/swagger/parser/v3#swagger-parser-project/2.1.22": { + "pom": "sha256-m9KOOxqc4ku4hYtZMikKU/uWTFzTLwuiYIHSiRaGU8U=" + }, + "io/swagger/parser/v3#swagger-parser-safe-url-resolver/2.1.22": { + "jar": "sha256-TLSrNBq3mzOnl3YUVYmG0Spl99F+s5jUZYcxDJhAZkQ=", + "pom": "sha256-pTqKn9Mt9uyasjgEdLq02XOVTkKoEk3PJjg/gW5V0nQ=" + }, + "io/swagger/parser/v3#swagger-parser-v2-converter/2.1.22": { + "jar": "sha256-ZdYDOEa7MOP77YKQKHUh1+4+qciFv4wRKLyAbCGuX5c=", + "pom": "sha256-ro9VZVRvOHC/5RFdggAUVkKw7Y9aDqHS13LtVfLcohI=" + }, + "io/swagger/parser/v3#swagger-parser-v3/2.1.22": { + "jar": "sha256-BG/B+afec2a/unwbF5Dh77DnIN3JR1rVX8Wz00rOkXU=", + "pom": "sha256-28v9n4aXUQZyxQg2+vyMfAs5CbOa8UI3rANkAJsL2AA=" + }, + "io/swagger/parser/v3#swagger-parser/2.1.22": { + "jar": "sha256-F2yeSuhlXHy2sOilbA+kBLFasK6wy3LkopTurQhK6yM=", + "pom": "sha256-jCk5Kv5uPnYrDDmEgP7oSkymWNWr5G7DeTtsvuQkIa0=" + }, + "jakarta/activation#jakarta.activation-api/1.2.2": { + "jar": "sha256-oYepORA671hJp6+EvX4nvi0SDEEK8pFDc3X/4GH08J0=", + "pom": "sha256-XlD+k4BoRx9QSn78QHGCNCW1IOq8b4DHLZNevVRoMJE=" + }, + "jakarta/validation#jakarta.validation-api/2.0.2": { + "jar": "sha256-tC1CQo89kiyJKpCfoEMofVd8DFsWWtm31WjOv4f8nqQ=", + "pom": "sha256-Oy5Oh3+3C6+h2tdcDemZxFYTEoLUcbpR3z25bDt02pI=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.3": { + "pom": "sha256-KA2lMXYBZtRBI2jQ3Yme9K6/0KfYK/IzUC4phWgGrak=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/2.3.3": { + "jar": "sha256-wEU59HLppt0MdoXqgtZ3KCJpq457rKLhRQDjgeDGzsU=", + "pom": "sha256-f+LKXc5LFKZGu/kh0TykLK8qLAZU2hVcdWOGXJiTlv0=" + }, + "javax/validation#validation-api/1.1.0.Final": { + "jar": "sha256-8517pyU+NfWsSAgewbwoxd+bMqxLfbIIU+Wo52v3sO0=", + "pom": "sha256-uGNJEebL5sFLML0G44N9fmko/H4clieN7GFwi2qu4hw=" + }, + "joda-time#joda-time/2.12.7": { + "jar": "sha256-OFKCsAWBjPrM2+i9JCmBHn5kF4LyuIkyprj/UdZo9hY=", + "pom": "sha256-hf3b+kfCmf2OzhyT//1H2cLTyQNaM7XbAXswTGd+hCg=" + }, + "net/java/dev/jna#jna/5.12.1": { + "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=", + "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.3.4": { + "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=", + "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4=" + }, + "org/antlr#antlr-master/3.5.3": { + "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU=" + }, + "org/antlr#antlr-runtime/3.5.3": { + "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=", + "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU=" + }, + "org/antlr#antlr4-master/4.13.1": { + "pom": "sha256-28/JebgFKPwMtFP8to28nSsGA6e+LNzpmrL8aHFGnRg=" + }, + "org/antlr#antlr4-runtime/4.13.1": { + "jar": "sha256-VGZdKDjMZkWDQ0aO/FOeRU/JW0aooEsTxqxD/JvmNQU=", + "pom": "sha256-GSJrF7+jj5nqImsi6XQg4qjt4JqXQg+xrPGG2a2kZXE=" + }, + "org/antlr#antlr4/4.13.1": { + "jar": "sha256-ziYdzmlSWDmqn8W9IyzhuBOnpAp1AwcTzEqA74Fw89U=", + "pom": "sha256-ahWaEs/WYoqnNuw//ZM/qUEuXLy3zn7FIXo/9CDGapk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache/commons#commons-lang3/3.12.0": { + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "org/apache/commons#commons-lang3/3.14.0": { + "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", + "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/54": { + "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M=" + }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/commons#commons-text/1.10.0": { + "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=", + "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc=" + }, + "org/apache/httpcomponents#httpclient/4.5.14": { + "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", + "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.14": { + "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.16": { + "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" + }, + "org/apache/maven#maven-parent/41": { + "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM=" + }, + "org/apache/maven/resolver#maven-resolver-api/1.9.18": { + "jar": "sha256-6/ueHf7qPCAXkFGEWB4AeHS06qydKL//z+UTPXCsYzk=", + "pom": "sha256-gpDaoM1/u6B2ewc2hmkig4fKuumaE8NDP71FcGKa44Q=" + }, + "org/apache/maven/resolver#maven-resolver-util/1.9.18": { + "jar": "sha256-LrDqZnvEiThEeCMd2nUWQH1LWyKhOAdyKYcd6TYqeuI=", + "pom": "sha256-qY5q9c3xskVkhq4LuBKOUv7o1plmKa9gYGu8nBqt+Ow=" + }, + "org/apache/maven/resolver#maven-resolver/1.9.18": { + "pom": "sha256-+x3U5VTNLbzt6WFSlJIecLGDUz9GeROs2aN4f/3WlDs=" + }, + "org/checkerframework#checker-qual/3.37.0": { + "jar": "sha256-5M4TdswnNeHd4iC2KtCRP1EpdwTarRVaM/OGvF2w2fc=", + "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=", + "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA=" + }, + "org/commonmark#commonmark-parent/0.21.0": { + "pom": "sha256-qeGddPQOEj3jbHAaUlIg2r5eMjVDZUfbek/TwJi31Qs=" + }, + "org/commonmark#commonmark/0.21.0": { + "jar": "sha256-gQhKcDUEb+MG8NvxbvV6aNCO5clwBOqGfmK120bpivs=", + "pom": "sha256-RhGg7TfAGTzGANRRrUxFfT0NVBxaxlbI2ANL0s0NB1g=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": { + "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=", + "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=", + "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" + }, + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": { + "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" + }, + "org/gradle/toolchains#foojay-resolver/0.9.0": { + "jar": "sha256-woQImj+HVX92Ai2Z8t8oNlaKpIs/5OKSI5LVZrqBQXY=", + "module": "sha256-huXl1QMWJYbAlW/QKippt22nwHIPSuAj82bRkaqXtLg=", + "pom": "sha256-wdtMSmUHZ5Y7dl/Q3d7P4eqLjp9kQo+H3iB/V48DeOc=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.9.0": { + "pom": "sha256-23zxG+5ohO+yiQQTn2LAD4tFhT5gwPQXFc9pV2tr/fA=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/compose/hot-reload#core/1.0.0-alpha05": { + "jar": "sha256-sxLfmlRSkDi4835keehBs5dF9iZbSYE2d9BlliJ/O94=", + "module": "sha256-rqsb+JwLN0x2rnXYEd4HQSXZh2oREH8ZnUwreznCZrI=", + "pom": "sha256-C5YOLk1d1uqJ0Jl96xqer/QulPf6QNpOYc9mKTaBiWo=" + }, + "org/jetbrains/compose/hot-reload#gradle-core/1.0.0-alpha05": { + "jar": "sha256-7kWrwVHX4AywZfkDccecD7DuVRxnlshjIRIpJR7Ri5o=", + "module": "sha256-7/zPQpnAW+lcRthgfOAxMPOVlVDugysS8Ehte+Yi6ZM=", + "pom": "sha256-CAukVwfeQWzNqVJ8E4D2clG7d0KK2J/8RIy2iVtBR40=" + }, + "org/jetbrains/compose/hot-reload#gradle-plugin/1.0.0-alpha05": { + "jar": "sha256-oTw5Byo4IyBOHZ9CXWjZbMUT6+9cYjyKbsc8bhdXgqw=", + "module": "sha256-weJpoNnKRyKDQa8UHzm93CJ06qQcn8q79Cf8j3EBf5k=", + "pom": "sha256-KBm/7ol3Qev1iRsgkoqwiAyXwzGeuyQYhrrnDDQBVDM=" + }, + "org/jetbrains/compose/hot-reload#orchestration/1.0.0-alpha05": { + "jar": "sha256-g5JIQknG2u2ux4aSIz0tquo3mRuF6zhCbzifKaH3zhg=", + "module": "sha256-HF7Cr+l1CoQ3Utktjmqcz8IWRtBxtfU5N0jGNiNZl5w=", + "pom": "sha256-46cK348/uX/OabYXAUUiGcMGj0MbGJnkr7QWPRjNeQY=" + }, + "org/jetbrains/compose/hot-reload#org.jetbrains.compose.hot-reload.gradle.plugin/1.0.0-alpha05": { + "pom": "sha256-0LBsmU0E8W1HkDDuJ4uIBvVYPLn4zEvAGUhSWH/p0dY=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-assignment/2.0.21": { + "module": "sha256-8638yrZURNtqqzwNfSVoZG7AyS8kWCh/KLKu5POXNtw=", + "pom": "sha256-QBfCQqfb3Oca6ApXB7S/OyOoIr8jpodahFp7UTYhzQ8=" + }, + "org/jetbrains/kotlin#kotlin-assignment/2.0.21/gradle85": { + "jar": "sha256-USUeNCELiNTJCAXKZS6Xe93IR4OkVAY5ydIQkJhbrOY=" + }, + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": { + "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=", + "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": { + "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=", + "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": { + "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", + "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": { + "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=", + "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", + "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=", + "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": { + "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=", + "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20/gradle85": { + "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { + "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", + "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": { + "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", + "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=", + "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": { + "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=", + "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=", + "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { + "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", + "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": { + "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", + "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": { + "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=", + "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { + "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", + "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": { + "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", + "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": { + "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=", + "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y=" + }, + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21": { + "module": "sha256-kJCVCx7oa4b+KWmV2AKG6opPN5+yshjoVvzt0ErS1Hk=", + "pom": "sha256-7lYZBmzLB5zDMy4kcnQ1n9dQXeLVQPuRtyd5ICW2Siw=" + }, + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": { + "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM=" + }, + "org/jetbrains/kotlin#kotlin-serialization/2.1.20": { + "module": "sha256-OMZPybedsk2Y415NutDvDjOxdsKXSTE8c7k6D5bCIgs=", + "pom": "sha256-Ffv0qiQBTCr6vmXjwzrY39LYocR8z5dsBbqKNqGou0I=" + }, + "org/jetbrains/kotlin#kotlin-serialization/2.1.20/gradle85": { + "jar": "sha256-rNawwcN18ocop1LMbI0itREnbFT1DZcb7UM957K9qjI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.25": { + "jar": "sha256-+1Nz3XYbTpPj9TjF6FO7o4pxFDoYFTbo8ZPtbk7ds7g=", + "pom": "sha256-ckCZBrgP9PZNYa6k78tXnSAVKEJm36nXnL2R56IzPzU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.25": { + "jar": "sha256-+U/feDkM6b4wODvwOcWpNcrqM7EfA3/H+Gu87hkoflo=", + "pom": "sha256-iFJunaBb6fYOQo2CJojL5PW7mpJAxaz5W7fHJH4F0lc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": { + "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", + "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": { + "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=", + "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { + "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", + "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.1.20": { + "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=", + "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { + "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", + "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" + }, + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.1.20": { + "pom": "sha256-YjXePQABYjdcj3IvCO2hU/CQ4RoDW0qbi+fqxO8UX+Y=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.11.2": { + "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", + "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit/platform#junit-platform-commons/1.11.2": { + "jar": "sha256-A848YFTAEaJpU6Bl2mpISJ0fvBmV5Mo8bXACk+cbWAA=", + "module": "sha256-JDUwwaksy3kIxfplM+srI8HhSb64v/Kx6w3jIbnM35U=", + "pom": "sha256-AsIlCWXiPhdtqNtEtxYTPNZcOFIzwdMf7DF9zxZCpKA=" + }, + "org/mozilla#rhino/1.7.7.2": { + "jar": "sha256-XG2uBQzrcXdKX8gs5uPwOS2vD/qew1lvcNTQfuULiXA=", + "pom": "sha256-B2kGiYfBiVPlHUGeBi9AlW8egvOioUD+qITXxeb6lH8=" + }, + "org/openapi/generator#org.openapi.generator.gradle.plugin/7.12.0": { + "pom": "sha256-cy0Bb5mz68spMTiBTLZzrileVwJ7eszW3rI4i36trvc=" + }, + "org/openapitools#openapi-generator-core/7.12.0": { + "jar": "sha256-1i7L+r769XJwuQlPhT22OSLBurjRvZeySSsU+dXh3cc=", + "pom": "sha256-pM5XOAPpXM/kpE6SfjNl8OjhjXuLyOhuWip4LcIPp/Q=" + }, + "org/openapitools#openapi-generator-gradle-plugin/7.12.0": { + "jar": "sha256-7ebZvRqfYpJphbGh2zs7bL6hpdmA6AriShY8YtKgL+w=", + "module": "sha256-/36BV6Z93iRmMO4NCKQoSmvq+7BGOwUhx82o38uJwO0=", + "pom": "sha256-mpt94GZYvi5qWOspjwNtQVI0KDhhWaoBG04fUezQxFI=" + }, + "org/openapitools#openapi-generator-project/7.12.0": { + "pom": "sha256-A0Cv8o4MgwW361VK1RFPIpHDgmn10mTSxwsjfYs6qL8=" + }, + "org/openapitools#openapi-generator/7.12.0": { + "jar": "sha256-iCgK585kGwsTh5c+b0SB/mzUXLa0DDjpKlABC0vNxf0=", + "pom": "sha256-dy1bhJjSzsifgrn8wlQuCEwknqVNY3JAyQdQF6Qt25A=" + }, + "org/projectlombok#lombok/1.18.30": { + "jar": "sha256-FBUbR1gtVwtN4WoUfs4729GazkruW946VXjIfbnsuZg=", + "pom": "sha256-ZQAfOC9dHORWkjEbsbp8JDyFYZXUkkc9cv+afRzHdpk=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" + }, + "org/slf4j#slf4j-api/2.0.9": { + "jar": "sha256-CBiTDcjX3rtAMgRhFpHaWOSdQsULb/z9zgLa23w8K2w=", + "pom": "sha256-nDplT50KoaNLMXjr5TqJx2eS4dgfwelznL6bFhBSM4U=" + }, + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" + }, + "org/slf4j#slf4j-bom/2.0.9": { + "pom": "sha256-6u9FhIB9gSxqC2z4OdXkf1DHVDJ3GbnOCB4nHRXaYkM=" + }, + "org/slf4j#slf4j-ext/1.7.36": { + "jar": "sha256-mlXkRTG1xiOgxTqqn0yr2RG7AFx1EqBMXTTlZNv7N6s=", + "pom": "sha256-VTdBQZqrqQ3JxJgXs2fFQjihNXzVFXZzDVF2e3fKUzE=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" + }, + "org/slf4j#slf4j-parent/2.0.9": { + "pom": "sha256-wwfwQkFB8cUArlzw04aOSGbLIZ7V45m2bFoHxh6iH9U=" + }, + "org/slf4j#slf4j-simple/1.7.36": { + "jar": "sha256-Lzm+2UPWJN+o9BAtBXEoOhCHC2qjbxl6ilBvFHAQwQ8=", + "pom": "sha256-xWuAoKa+oqBGPnDQiSrjOKnlB+SGdnpSBFNAmBIFjRs=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/threeten#threetenbp/1.7.0": { + "jar": "sha256-hXkX0jGaTpLcHF4663Wg2shERe0xXnrD2Cu40rKYl38=", + "pom": "sha256-nLthSu/sbVcp7MrdZMmhnpshg/w6Dgk8APN2rPptC0Q=" + }, + "org/yaml#snakeyaml/2.3": { + "jar": "sha256-Y6dv5mtlI2C9TCwQfm8CWNqn1LtJIAi6jCb80jD/kUY=", + "pom": "sha256-D1omWgYzGwBJ41K+MsoyLeGLF/PU27cGNdQNppLjWC8=" + } + }, + "https://repo.maven.apache.org/maven2": { + "co/touchlab#stately-concurrency-jvm/2.0.6": { + "jar": "sha256-xXzbbhXYgkYbZMLTW+5HStX2u2n292NYsAMbjpdifMU=", + "module": "sha256-n0VLzay0uQBBPuzIjvnxynJaJf5WgxZ195hTywqesxc=", + "pom": "sha256-Sn16ELtB2tpniuJG9su7Zq+TkEEA4VA+L+ejydzS4Zw=" + }, + "co/touchlab#stately-concurrency/2.0.6": { + "module": "sha256-IlN5jSsDf4/hgTUWU7fNF1k4fs1pF5rMUNn0B4A/64s=", + "pom": "sha256-L5e3PLF1pEI0TLUmCdQ75sPOwnzOpyekuBs49H+kbDg=" + }, + "co/touchlab#stately-concurrent-collections-jvm/2.0.6": { + "jar": "sha256-eiZz5zS76bg3OXVlw+lvAZM1VrZIpBvy5/LHiM0KJt4=", + "module": "sha256-QP8Kqzsjmb7vobUCrAqy1a1wfRcLYqftfLSVu2QQnZk=", + "pom": "sha256-CRJBRhJXMyyjdGw4Sy/lj7Q/n/ep6ZjZVEqmddCAdqs=" + }, + "co/touchlab#stately-concurrent-collections/2.0.6": { + "module": "sha256-/Pqut7oYe99qycvB0HNJiWSbCn/8bfteU5TBcJYfaLI=", + "pom": "sha256-sid4YljDlKaO0ntiFyaB+JdOQoJHeTBU0XxAxlDEEfI=" + }, + "co/touchlab#stately-strict-jvm/2.0.6": { + "jar": "sha256-cM/Ua0UA8Z6fF7hakUCrQC9c8S1RAtLVbBNPp2vtpHw=", + "module": "sha256-3dQ2UrC12fnIuNPe+e1XZ9OaNKWvQ74o4MQ46Ohsrvk=", + "pom": "sha256-poFWwpzfT/g8rvcucNWk0oSDVxYdNwbJnz3OceVgEbQ=" + }, + "co/touchlab#stately-strict/2.0.6": { + "module": "sha256-TyxtwTMLI7F5yQS56cxGPAip+d0LOXKawSy9I8at6f8=", + "pom": "sha256-A9TEJqxQFp4ofkJnI97GkZOI2npXJF605qNVeWsvswE=" + }, + "com/android/tools/build#transform-api/2.0.0-deprecated-use-gradle-api": { + "jar": "sha256-6LQVGuFnnxq+ehTuNxrJs8ZRrntjKQ0fWGvdD3j6zpo=", + "pom": "sha256-1J0Xn3B9PzoAsqfTYTa1SqjUT6IncHA82C/lL7OeIus=" + }, + "com/eygraber#jsonpathkt-core-jvm/3.0.2": { + "jar": "sha256-p5YDAMnGB+mrTGfGsfI1Q31i1XlsAKM8qNLSTEsAlRc=", + "module": "sha256-xoNNMOycXFQLQunNVozBdhA1vAac71PlgGanCaCAGps=", + "pom": "sha256-xsHLkcRuA4Y0aCpEoOO/k6UEwyigwTuZfh/CS/jWUvo=" + }, + "com/eygraber#jsonpathkt-core/3.0.2": { + "module": "sha256-t/rlfihk0gBJtP5H37obpKZ7nZs4QnPTdrth+fOzHMA=", + "pom": "sha256-nBE2rnSk5zRu3Dw67dLZIjzi4auz/NhLHJu6BSf3Bm4=" + }, + "com/eygraber#jsonpathkt-kotlinx-jvm/3.0.2": { + "jar": "sha256-tyo9Ns009XB66Jr679syLsRojca6knCx79BXqGJDOSQ=", + "module": "sha256-mt9oMtVSnT9dFCYgiR1Dlo9Svl9+b2P/fgyJ2P01Sxk=", + "pom": "sha256-DbV9LdB2fAqSwcRZjt7l42eq0WiA1UMPAwWhHpzgvUw=" + }, + "com/eygraber#jsonpathkt-kotlinx/3.0.2": { + "module": "sha256-D6X/2rSnMu5nKkWKtijyx4sAAAwvI/EE8ovfpUwUuC8=", + "pom": "sha256-1Tqg0V7psdzgrm2Vh3UjYYFR2koOK4k8uh5aCdGWSFo=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/github/ajalt/colormath#colormath-jvm/3.6.1": { + "jar": "sha256-oYU+5KX+xjbbu4xElVt6MBXwLOj5z6HCNQeRwsLTY5w=", + "module": "sha256-fHKvGnzj4EFMhBqBgWvDwVpy6X9lKMwHqp+lSFCHpYc=", + "pom": "sha256-PeaemJMjZ5OF480HME/v08BfRFa7MsoyJ8s7y/RNHAo=" + }, + "com/github/ajalt/colormath#colormath/3.6.1": { + "module": "sha256-xA0F1dTNksc2qxDVkR6HjjsIqBRa76mjy20/VUPM8Bc=", + "pom": "sha256-uBYdwuDrGNPXm8koHtFxA3IcwcEvFYo1QydbqSlw/jg=" + }, + "com/github/hypfvieh#dbus-java-core/5.1.0": { + "jar": "sha256-zwHLfTNa9q4l/NWL0vGsmoRlrNUpZwZoo6OQL9jByc8=", + "pom": "sha256-wzg1ufJbGqFilYhA+bHFuK1spezi9s1tQaFNrXn/w2o=" + }, + "com/github/hypfvieh#dbus-java-parent/5.1.0": { + "pom": "sha256-W076MXQHBiM+KijdiegYah39xbo/GMrNPyfjvA/hp8o=" + }, + "com/github/hypfvieh#dbus-java-transport-native-unixsocket/5.1.0": { + "jar": "sha256-J2y5zyB1tipKDgAXVrjG+KtBJfFVQSi3WLG4C4Scou4=", + "pom": "sha256-/NNmULVPly2uVrpHy6DCGZk0SIWLuAPRGil5eqC2B2M=" + }, + "com/github/oshi#oshi-core/5.8.6": { + "jar": "sha256-avZFtrMZxaH+alrAPB+0seypajtifK6JU1L5ibcgkBc=", + "pom": "sha256-iNcNOxnby2YuXDxFceX8mavCZldu+Cv6u7RGkm9MISo=" + }, + "com/github/oshi#oshi-parent/5.8.6": { + "pom": "sha256-Fe+B2OTv+TYQPJ+HYGMM7LNXs5OGTFuvnKWHQTOzkMc=" + }, + "com/github/seancfoley#ipaddress/5.5.1": { + "jar": "sha256-XqReV9sMLWJBkqUEbO6kGwrK95t2ilShTIZ5G7ZFknA=", + "pom": "sha256-SgNmB8ql/IEESw4z3aBYEuXIwwk8rZwtAYkF+up2Klo=" + }, + "com/github/zafarkhaja#java-semver/0.10.2": { + "jar": "sha256-qOMuF1ddAYjB8+Lle7ldsJeTiDyIU/3oKLY+yx+Zpjo=", + "pom": "sha256-fwBf8/kA6GlV9aU0tamqjqVLtdYLtgrCN1lVCjZnaDU=" + }, + "com/google/android#annotations/4.1.1.4": { + "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=", + "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng=" + }, + "com/google/api/grpc#proto-google-common-protos/2.17.0": { + "jar": "sha256-TvH+DDJ/wVIdHXU7CxxKh1pUvRTr3tOv/wyjlTILbqk=", + "pom": "sha256-PwKBU6WFxZ9Viz5Dp8mAmmAai7XpEGHWxlj/+iTLjiY=" + }, + "com/google/auto#auto-common/1.2.1": { + "jar": "sha256-9D8p/ipuuvBLJZjN7sMqTjRtSalATpkPX8GcGfOijQ4=", + "pom": "sha256-E7S1AGKUn4sTQ5J8WBU207sFG4r+pQmqb5AvTeKLwbI=" + }, + "com/google/auto#auto-parent/6": { + "pom": "sha256-BfdAxmSBZdsAz2GN1WwgDEcl41jm1U9YU+C+wVc06go=" + }, + "com/google/auto#auto-parent/7": { + "pom": "sha256-pGQm/MtdMnBa2cu8mW94a9BIzIy90h2wRlABafFaQ1Y=" + }, + "com/google/auto/value#auto-value-annotations/1.6.2": { + "jar": "sha256-tIsE3bpA6KwzvwNvBvxDmV/FCEvZS9qs6AfOJ9O+o/s=", + "pom": "sha256-HHbNRi/JbnqpbccM6C8NVAY9bfFts1ycfZzA0amdP/8=" + }, + "com/google/auto/value#auto-value-annotations/1.6.3": { + "jar": "sha256-DpUf7owx9gJwvEZVOoWGABt7k9uxKuwGNzqpmhUDksA=", + "pom": "sha256-4fx4D37gJeZis9pycj2+KsjawKL4kg8mUxXE4b49dlw=" + }, + "com/google/auto/value#auto-value-parent/1.6.2": { + "pom": "sha256-J7ZAyCF59c/2IAnAtyAz2bxg9g6ZAqZoAidLf+N/yBw=" + }, + "com/google/auto/value#auto-value-parent/1.6.3": { + "pom": "sha256-5Z31cytMs01XJxgURvne2c5EJRMaChBiUZ7qGW3k2KE=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" + }, + "com/google/code/gson#gson/2.10.1": { + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, + "com/google/crypto/tink#tink/1.7.0": { + "jar": "sha256-iJcKRWoIukxmsBsj5YRsoQlcwU5Uy0g2Pl0uFaEwcwg=", + "pom": "sha256-Ku41I3FfjyzRCyYDyNGeVhrHWDELfiyYU5RtLF57S/c=" + }, + "com/google/dagger#dagger/2.28.3": { + "jar": "sha256-8d0j+K40qOkTZnI5kerQ1kmdGj6RY85VDCALAtdqhys=", + "pom": "sha256-JlupWajhPDoGEz8EtTkWnBAY2v/U0z9TxFOrTLOG9XA=" + }, + "com/google/devtools/ksp#symbol-processing-api/2.0.10-1.0.24": { + "jar": "sha256-3X3eBwvlTeZse91N4ExD+0KeDGK7EypkSM+jNlOvsik=", + "module": "sha256-v8OiFHE2oHw5IP2mGeugc8uTgcVlf++xYc/ViZSPmVI=", + "pom": "sha256-RSj+eY/v7sCVpz6GHBIG+oJUlqDntlInL0D/yWCBTmI=" + }, + "com/google/devtools/ksp#symbol-processing-api/2.1.20-1.0.31": { + "jar": "sha256-dy+FxyWzgCE9grQ9abQImS/U2sr50zJo4kJpQQ6gl5g=", + "module": "sha256-4GCAUjhnrw8wK83PqhzRT0jXO0EG852X7TvKh6yL8Lk=", + "pom": "sha256-uqoBWau+KpclCzYnONSk6a+seGjjZ5uD4jOeOKVWYHo=" + }, + "com/google/devtools/ksp#symbol-processing/2.1.20-1.0.31": { + "jar": "sha256-Ur1VHTVEWTntuCsPTlKCLHVH+Qa8gellmZ5nqSHlQp4=", + "pom": "sha256-hMXtNZ96txDxZjUS7NMqc3khjyaZA05mT9lLc/XJV4E=" + }, + "com/google/errorprone#error_prone_annotations/2.11.0": { + "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" + }, + "com/google/errorprone#error_prone_annotations/2.18.0": { + "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" + }, + "com/google/errorprone#error_prone_annotations/2.26.1": { + "jar": "sha256-3iXy2aIVZSm9dl9R2O/fwN+nMB4E77nMdbfxDPXQ4Ps=", + "pom": "sha256-rqfpkeLf3LR/X71QhYdTX3gCvLni/C1Ou1C+QbaE2p8=" + }, + "com/google/errorprone#error_prone_annotations/2.27.0": { + "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + }, + "com/google/errorprone#error_prone_annotations/2.3.1": { + "pom": "sha256-PtzmtxG6No7+Frm3qssCFPvWSEFMublllTouftiagZo=" + }, + "com/google/errorprone#error_prone_annotations/2.3.3": { + "jar": "sha256-7FnxtwLZr8CejDkp9cQnd97GI6bqJzGsaUMyx9doD1o=", + "pom": "sha256-v9aSVaDAETr+5NoBNruAsSaMuw1h3wBp2NIrO+8laNU=" + }, + "com/google/errorprone#error_prone_parent/2.11.0": { + "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" + }, + "com/google/errorprone#error_prone_parent/2.18.0": { + "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" + }, + "com/google/errorprone#error_prone_parent/2.26.1": { + "pom": "sha256-SmrQDTGwpa3Nmk9gUGXVtEX65KBMv4J+XRrBB34vgU0=" + }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" + }, + "com/google/errorprone#error_prone_parent/2.3.1": { + "pom": "sha256-dnUl2agRKc0IGWg4KYAzYye+QWKx4iUaGCkR2qczwSM=" + }, + "com/google/errorprone#error_prone_parent/2.3.3": { + "pom": "sha256-awWm9S4rZbTvzjy7pTNbCBsdykuX3mkCNM1TZHmkDzI=" + }, + "com/google/flatbuffers#flatbuffers-java/1.12.0": { + "jar": "sha256-P4wIi03QSphYch8uFiUIyU2w3Yb5YeMG7mPvLtqHG/c=", + "pom": "sha256-yyJrr1RiYHcPIegVKmqoi6FSMNc591DfSA8qZo1D4Os=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/28.1-android": { + "pom": "sha256-+K/LQ/0kw7YibkCL25zsVpFzcVpMLIAXPMrt2E4VGJE=" + }, + "com/google/guava#guava-parent/32.0.1-jre": { + "pom": "sha256-Q+0ONrNT9B5et1zXVmZ8ni35fO8G6xYGaWcVih0DTSo=" + }, + "com/google/guava#guava-parent/33.2.1-jre": { + "pom": "sha256-kJX22O43ZZUCB1EHhYMMwigOeBBnkV+pnP4XQNSGXBQ=" + }, + "com/google/guava#guava/28.1-android": { + "jar": "sha256-4RLOksDwczll7t5z2UWJxZpyEosGsIu6Xr4vnqZy72A=", + "pom": "sha256-AZa+urqiZWDxCO6xBNYph62L6mB9mxPto/Aoa3ZdbqY=" + }, + "com/google/guava#guava/32.0.1-jre": { + "jar": "sha256-vX+iJ1kfuFCWd9DREiz5UVjzuKn0VlP1goHYefbcSMU=", + "pom": "sha256-QsJX9/c203ezGv7u6XirJtcwzXCvYN3nZi4YI1LiSCo=" + }, + "com/google/guava#guava/33.2.1-jre": { + "jar": "sha256-RSstl4e302b6jPXtmhxAQEVC0F7/p6WY2gO7u7dtnzE=", + "module": "sha256-0j7aahwsC9JfijNGzd7sQ7Ufdb+Bm5MeqpgybqZEdCI=", + "pom": "sha256-QoF73BwMjHN9a0Ec+vSoR2nn0nHoebAW/QhQJIoG2rU=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "com/google/jimfs#jimfs-parent/1.1": { + "pom": "sha256-xxVVdR5X4O+RKHDorJYlrnglAqalucGcz4OyqX2LJr0=" + }, + "com/google/jimfs#jimfs/1.1": { + "jar": "sha256-xIKOKNfAqTCvk4dRCzutp9qlwE18Jadce4sIHxwlfd0=", + "pom": "sha256-76huXNki8XtHL9/K5XI02NSsPhSLYlBzffzkVK96ekQ=" + }, + "com/google/protobuf#protobuf-bom/3.22.3": { + "pom": "sha256-E6Mt+53m/Bw8P3r1Pk1cd/130rR2uuOLdLdYHN7i5lU=" + }, + "com/google/protobuf#protobuf-java-util/3.22.3": { + "jar": "sha256-xhX3aHncXDA+TfW5Smr6OVNAWMdUXbLUg/2V2fY8i/4=", + "pom": "sha256-tEcBsGoGSGXsm1YUqT6eKPrdfU38S0YPIcgZ71Pb4tY=" + }, + "com/google/protobuf#protobuf-java/3.22.3": { + "jar": "sha256-WdOI6motLXaujv/3/U0MYMbw9GTD06ub6OWt0JKXVwg=", + "pom": "sha256-GG6nlBUPW0Kup+xgQd83PR2KioMWJPWKVd67YEPscxI=" + }, + "com/google/protobuf#protobuf-parent/3.22.3": { + "pom": "sha256-OZEz1/b1eTTddsSxjoY0j0JFMhCNr0oByPgguGZfCSk=" + }, + "com/google/truth#truth-parent/1.0.1": { + "pom": "sha256-HH/IY4Mu2YCOQ9jBdpH/Fn0xPxETTvx1Yf9R0UIZbX4=" + }, + "com/google/truth#truth/1.0.1": { + "jar": "sha256-HM9DNOepTPAKIKYZtUYrU6zzJ04AtwSYv1soo7wb6bE=", + "pom": "sha256-BGhsbq3NYNi3sKTT9Vk4phaHYObiwkETOQNra/BGow8=" + }, + "com/googlecode/java-diff-utils#diffutils/1.3.0": { + "jar": "sha256-YbpNxJrcqVJDvqoFaa3CojrttSkq54qgEYb6eC69xcI=", + "pom": "sha256-L+Md1jCbD18ZW73EdJz8CvBl1h8Gz+GD39LyCSq4R7Y=" + }, + "com/googlecode/juniversalchardet#juniversalchardet/1.0.3": { + "jar": "sha256-dXv+kGGTuLZR553CbNZ9a1XQdwos37A4FZFQT3edSnY=", + "pom": "sha256-eEY5mzXHzWQqmzoADD4tYtBOs3pFR7aTPMixi8wvCGs=" + }, + "com/guardsquare#proguard-base/7.6.1": { + "jar": "sha256-wmUOZmw0Q3gdxenq7l3ochWT8AvkTp2HzsdhQGNXx3A=", + "module": "sha256-JdmBh6U8Iv9cCQfhdTWgK0Q4Wk3FSISxJ5uhKQg6Zys=", + "pom": "sha256-O3Fie597ZAogi4a7LLfEgUItx6e3izXZny0Y50dSH/0=" + }, + "com/guardsquare#proguard-core/9.1.7": { + "jar": "sha256-2wb6n2tDu304ZCD4VPQapVoRAj3ja61o4EPDrD8zuNU=", + "module": "sha256-CUllErGoVDVOUdGan6XEEjVKLTlZYczHasOIL5WlTgs=", + "pom": "sha256-m+fvKU0pm6gP/ZzKEa0wl+N+QTcbZGSYElqADUqO0qg=" + }, + "com/guardsquare#proguard-gradle/7.6.1": { + "jar": "sha256-ScjoQGfRVpIV8WK59EEiVEIvX4A5eu04C8yyBZeH7xk=", + "module": "sha256-fND7x+oT+8EkO9lAeq2kpBe8HuLXEHcCTcmwn2SsGAc=", + "pom": "sha256-q/PvEB1bM2lv5Ytjm4FzrVAOqQf72Yp4JZV5+s+kkng=" + }, + "com/intellij#annotations/12.0": { + "jar": "sha256-+KsTsUvggP4vYX+Q5VWZdg5KG03u6lxZXfY9DWN17W0=", + "pom": "sha256-+vgt4NwC4MCuMnzWU/NyVUlrLlP84oCzq0yzRVOokIY=" + }, + "com/materialkolor#material-color-utilities-jvm/2.0.2": { + "jar": "sha256-ehw5WMVYOvirrpQhsrFd9NwzwNTdBre8MPt5lVBOUvU=", + "module": "sha256-kPEIT/8zQ6SXWgx4tVu3ihklHZ+5xQ2nWxq4I60HxJg=", + "pom": "sha256-X2qIr8xO02UgBwGJfn81ofQc+oKhq4UwsJGWw99ll8M=" + }, + "com/materialkolor#material-color-utilities/2.0.2": { + "module": "sha256-u3ChedRjiAQYquydGdokwnMI1v97Y6njUeODeqAmOgs=", + "pom": "sha256-hI1hgNrDQj9o+61ebYVQ5CvhnSEw4ZKpi2kIi3N97FU=" + }, + "com/materialkolor#material-kolor-jvm/2.0.2": { + "jar": "sha256-3xSWEBi6K+/P5wTLqUXhjWV5e5Cjv3kH2n+LwMEqcdE=", + "module": "sha256-FGKbUUptRNpHaUEIPdemeJayYZg5PKtvEuVju3zkDqE=", + "pom": "sha256-8/9psHfIIKrR9URczybPUmUfMbcZNvo3t9L6aZOdFls=" + }, + "com/materialkolor#material-kolor/2.0.2": { + "module": "sha256-2rR3ErARsdPdnh0oVnlcwm1+eqd1cHr8YxFhex6PUEc=", + "pom": "sha256-YTrDfhrG8ubIcdEdmZD0G7K8rHytPn1S0RdHHL+SCVA=" + }, + "com/posthog/java#posthog/1.2.0": { + "jar": "sha256-gnEBAD2F9li1yqwPI4IQ/ySEhjR+qVSd6kvBPHWfYao=", + "pom": "sha256-YIqAJ1xuFdnIJ7i/5RZw0LCqjy6jsgd5xT2vokFoTLo=" + }, + "com/squareup#javapoet/1.10.0": { + "jar": "sha256-IO9LguQ/98ZSKBohMTzzuUEJJGet0/pzUJwm9pae/as=", + "pom": "sha256-FpA0CiIiefLLrfNz6Igm+iD388w+wCUvNoGP7TJwGrE=" + }, + "com/squareup#javapoet/1.13.0": { + "jar": "sha256-THUX6EinGzbQadErs79Gpw/UzaMQXYIrDtLhnAC2kpE=", + "pom": "sha256-VKNPqFAqRryQ79tJJiYAWR+oC/mjT1pMeYMRrsFsqXc=" + }, + "com/squareup#javawriter/2.5.0": { + "jar": "sha256-/PsJ+w6gqpfTz+fqeSOYCBNI5GjxJrNgPLOAPyQBl/A=", + "pom": "sha256-4avX8RFs9eDFmUdpPiGJII7JQpayozlMlZ41EdOZp7A=" + }, + "com/squareup#kotlinpoet-javapoet/1.17.0": { + "jar": "sha256-DuzCjrnihTDyUJXqizGJXn02usHQLOWx7EPG9FiudSo=", + "module": "sha256-941d40pspfy5lEpVgLfTp/An0NPHUnQbVPB9c1YrvBI=", + "pom": "sha256-UYdDQZQMIUZXB4KHOYtP80A+UEF1H1AspNeXPnsEB/o=" + }, + "com/squareup#kotlinpoet-jvm/1.17.0": { + "jar": "sha256-MTPU9Iznd2amqMwuVV2JFk387703L0/0P4mn/tNYaRA=", + "module": "sha256-pDRbgzxsew6i8tyeAc9qmc/nL2chZajAA/FIKFYaeWY=", + "pom": "sha256-HEEbqzdRQX0ziGMe9tptORWlBdqReP7kh8bokmy/L10=" + }, + "com/squareup#kotlinpoet/1.17.0": { + "module": "sha256-ZyhcxKgLPMedn4Gj41fQDEr3EpwEkNJCSKgs1aGBKOA=", + "pom": "sha256-V5cDmMARYvZ3D8Ax77UJe5s29kuHpiN0jYjzfCB34pw=" + }, + "com/squareup/okhttp3#okhttp-sse/4.12.0": { + "jar": "sha256-v/T7yu96rC2RDU/0ba+qTm0V2hJ99rrJchbaRpQ6fUw=", + "module": "sha256-c+RIzK9gfU9gO4tuZmGHKk/6PCZBGTyLvE1r2h5Ww0I=", + "pom": "sha256-lKunzO96e5DcolIFhb8LEjNtyO+U1ZGWPu2sV3lnkzw=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.10.2": { + "jar": "sha256-/Qp+dsZzHwDpILe8EcBdgjqTIEVDGt1Ujgld4CCmnt4=", + "module": "sha256-p4CkJMVx4odVASiuADMjVibf/iFsuNs7ICRkmWrZaPA=", + "pom": "sha256-AP000Iv0YxNiofVSLKpXyuKMosfpOS76My72Vs/anUM=" + }, + "com/squareup/okio#okio-jvm/3.4.0": { + "module": "sha256-b+wTzzNhYANkv8xoAEr3x2DOrx/Bu8yVh0KuTWHbFRI=", + "pom": "sha256-ZqiFeYHqbD7IuGE6QJvxLxR5Ze+UmMt6jzcXKMTi2k0=" + }, + "com/squareup/okio#okio/3.10.2": { + "module": "sha256-P94fn79yxsMm1eiktTL0/Z/aLdDLFEK8pODHl9FBI4c=", + "pom": "sha256-7lbAIUoPqfER2nExxVDo3ICvDL9WCVbBzNosZtdQa0E=" + }, + "com/squareup/okio#okio/3.4.0": { + "module": "sha256-aRc2CEF6IRPm+mr+t7RUCyDfcM/aP6Fsc6qk+nAv+tM=", + "pom": "sha256-QOr9s+epasxcFR3pzL7BKFDy37XL53Ph90zrU2JVggM=" + }, + "com/strumenta#antlr-kotlin-runtime-jvm/1.0.3": { + "jar": "sha256-Hy+1MJxqlAq1K0GMHWN055qy79+mqcYbPd16f5VgROQ=", + "module": "sha256-Q3Q+dXyRTUnqniw40PdBVjum8IGTNXuoK5VXi9wS+OU=", + "pom": "sha256-1ASIHsVa6sEEiWDIm8iKxJtk9IaGa5/k2Heo5vMsiGI=" + }, + "com/strumenta#antlr-kotlin-runtime/1.0.3": { + "module": "sha256-Sw9znKgtPCPKsNUbt1FZMMu15geYvGmkda6stdgtdfM=", + "pom": "sha256-z1Sha4i+Muw+HXsuHfqNl60Sif/MdmtzLMW6sOu4q7k=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "com/sun/activation#all/1.2.1": { + "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U=" + }, + "com/sun/activation#javax.activation/1.2.0": { + "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=", + "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4=" + }, + "com/sun/istack#istack-commons-runtime/3.0.8": { + "jar": "sha256-T/q7Br5FSgXkOY4gx3+itjCNS4jfvvfKMKdrW31VBe8=", + "pom": "sha256-wuAU00y4TtKH0GSYbEXDBaQSQiinM37M9sQh0U1wjxw=" + }, + "com/sun/istack#istack-commons/3.0.8": { + "pom": "sha256-oPBRfoUS8PvMe4KVwS9lZqPQwthtZVY53GYu+MDH6+U=" + }, + "com/sun/xml/bind#jaxb-bom-ext/2.3.2": { + "pom": "sha256-Gn3sKyfn4FV0TNuM8bkN70/Uc6zRuATv8JgTk1iVm9c=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/2.3.2": { + "pom": "sha256-IN1tw0q3VJrEDaHYLpIiLsQ0etDsDLEY72xXA77VOhg=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/2.3.2": { + "pom": "sha256-sk+NUfGEpovBuG1IwOPP7+shpE7eHF9zA8WK4EiFM+w=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/2.3.2": { + "pom": "sha256-tV0++psVj0g6MOkseMy2APkzFHM9CJ66m3RDbwGzFKQ=" + }, + "com/sun/xml/fastinfoset#FastInfoset/1.2.16": { + "jar": "sha256-BW86HhRECfIe0Wr8JoBfWOmiHz/OFUPELUAHGdJQxRE=", + "pom": "sha256-4UfSWKtuZpH3BZmpUkAObmx1WPjJwCjb4b4jF4MI6DA=" + }, + "com/sun/xml/fastinfoset#fastinfoset-project/1.2.16": { + "pom": "sha256-kFgkJa3B9AtBNi2vuVFzkxIlrKpeeWINXmvVL2Rikro=" + }, + "commons-codec#commons-codec/1.10": { + "pom": "sha256-vbjbcBLREqbj6o/bfFELMA2Z7/CBnSfd26nEM5fqTPs=" + }, + "commons-codec#commons-codec/1.11": { + "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", + "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" + }, + "commons-codec#commons-codec/1.15": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "commons-io#commons-io/2.13.0": { + "jar": "sha256-Zx6qOWiNrC/6pGRbPJmAri0OokceSual2hmc0VriNmY=", + "pom": "sha256-2z/tZMLhd06/1rGnSQN3MrFJuREd1+a5hfCN2lVHBDk=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "de/jangassen#jfa/1.2.0": { + "jar": "sha256-8cwY8VldRBroOc2hRlwIsefbRrcsHX87NzIK4WQexys=", + "pom": "sha256-tNgod+BwsV0dTmdrQV9qVCnw4i3U75gX2F5MWcU7yr8=" + }, + "dev/dirs#directories/26": { + "jar": "sha256-bRj+Jaowt+CLkIzSEVHY+W4illxkCs13Ua3Zu/5hN9Q=", + "pom": "sha256-/I3n/GawcvT21bNv67uZx1DG75JxViX1o9hJlAWpRoI=" + }, + "dev/drewhamilton/poko#poko-annotations-jvm/0.18.2": { + "jar": "sha256-5U2qgc0DiSljOuxZYGAi4eqjQyo8pnNJS78a5V5CI00=", + "module": "sha256-oGDXCDj/aGYX9DElgx0QV7KBCBr0bZlC8MCuOM1ge6c=", + "pom": "sha256-BVtbvG8ajpBWbCaYSrVLS4HMmA1QzKilZlIkFmFilN0=" + }, + "dev/drewhamilton/poko#poko-annotations/0.18.2": { + "module": "sha256-SGjNwVoyGxGrPIxbbqrE092oUghR/NLbI0/Deq7r5M4=", + "pom": "sha256-TdmQ/XvDu3R2lhMzoVAl/4Sc7XL5736bCmQankBb5FI=" + }, + "io/coil-kt/coil3#coil-compose-core-jvm/3.1.0": { + "jar": "sha256-iqHXrh0R+WnozcyP7kK37moDbiH3BWfjw0hu3Z19xZQ=", + "module": "sha256-6ucdZ4HM4ykKPjiM2fpZ0mctNIjahwbqiRFkcBrisQ4=", + "pom": "sha256-IkVryyLUfV3o4sKdbElAZNznVYtdGfMTBpw1f+r5B20=" + }, + "io/coil-kt/coil3#coil-compose-core/3.1.0": { + "module": "sha256-LCfu/rg6PgVENUharnPuHLz0w9SGQy0qqzfkxk7xE44=", + "pom": "sha256-CmIgsinPftmV0VSvssT3YXFBxcqY3S8LuF60CDDmGkQ=" + }, + "io/coil-kt/coil3#coil-core-jvm/3.1.0": { + "jar": "sha256-bUShEYjFP07qLofrrcaq2QBpEyybAp/Bs1rrCt3tXvc=", + "module": "sha256-maObXGZpxFXtE10hgduI0HIYJVehl1oT8DKKEmw8iDk=", + "pom": "sha256-dGE3HEWhgeyUR4vPDvALWuaGr8mmlmRUG2wbdmoSteU=" + }, + "io/coil-kt/coil3#coil-core/3.1.0": { + "module": "sha256-KvywLPZHytam/fsYywCHVoSfevdHpKAemBuIMPSIMKE=", + "pom": "sha256-NPm6Yg431Ruux7rY05bTJDzAbe7Kw1pil0/MUGlZCuo=" + }, + "io/coil-kt/coil3#coil-network-core-jvm/3.1.0": { + "jar": "sha256-gzLkXPeSzSTZgUdE24Sw5tM+xurwckvQfdwfznxVWR8=", + "module": "sha256-2GSNiy+ATWSIq79fIIe3XJRs/s5bGO1kCNvAV4Htobw=", + "pom": "sha256-3bv13KN1OnzvdpV8dm0JssLUGlImUCEWHMCCouklg0Y=" + }, + "io/coil-kt/coil3#coil-network-core/3.1.0": { + "module": "sha256-7KfwcYeJQrG/0cIZiwHKX9E+nCev5wEkXDe1OUOGxQY=", + "pom": "sha256-2pkj5T1iBNefNQHFuJ9eDIfpEesc/RgO9FuCRFdhuso=" + }, + "io/coil-kt/coil3#coil-network-ktor3-jvm/3.1.0": { + "jar": "sha256-zE+fjW1EfnVZy5cXw6Rd+9NR3dBqNHJAATIlEhYLAhU=", + "module": "sha256-NL4hHQNYOOVzu8BW1MTBE/0j9mDWQDE/sT49mtouPnI=", + "pom": "sha256-J9d+GTns0g4uh1xv+g1qFaOIRm2BLSxDHqf7Lj1LDSQ=" + }, + "io/coil-kt/coil3#coil-network-ktor3/3.1.0": { + "module": "sha256-RNdytNnbOOlTvpZSG2OLq4/5ytNrU0+FhydwhVLDr8M=", + "pom": "sha256-kS6c9+OHz0df40DvQy4r5spGydJG1mrfan0Mj3LnPoE=" + }, + "io/coil-kt/coil3#coil-svg-jvm/3.1.0": { + "jar": "sha256-QTpTtLbgpAuFHRqZoBpM2RrA3Gj6zv3det/bLVRWWI8=", + "module": "sha256-mau2YXPP/ryK24Fec4o/60Q3hykNUYBZaKfkmq/Cj18=", + "pom": "sha256-+ZVXTLorw3vi6CDxPjSm58ixTJJ41UohDoFJR6B84vE=" + }, + "io/coil-kt/coil3#coil-svg/3.1.0": { + "module": "sha256-EGfUH5lQDPAcbXABXm6leUBHiMNJBBxAhIfMYjofx9k=", + "pom": "sha256-kMjSxVq5L64ip85AistZYi0F2ytsLqpEoESIbMd3Y2o=" + }, + "io/fabric8#kubernetes-client-bom/5.12.2": { + "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" + }, + "io/github/g00fy2#versioncompare/1.4.1": { + "jar": "sha256-0mgnvHDjpuBw9bco4vhNvwopE5siGBr2Vm4MFvCNRGU=", + "module": "sha256-rHAoh4apAuF5CeYvf7dyrkIcRgqxDnIAtQIfWONIE2w=", + "pom": "sha256-6nUQLRXjrmYp7wResnYd5EAyW24RYSjC8P1MFj3Slj0=" + }, + "io/github/vinceglb#filekit-compose-jvm/0.8.1": { + "jar": "sha256-SKLBEibYuhb+uwS9Sc9hmRUIuPf1yySO+MfJF94jm70=", + "module": "sha256-/KXuix/ergSiAv7wQIC+cmmBvD2V5n3tNW0ZqaXoXA0=", + "pom": "sha256-O8Jr5JwGJ0Ol+7hfroeQdmOEfGS06TwkEIajeikWq1E=" + }, + "io/github/vinceglb#filekit-compose/0.8.1": { + "module": "sha256-BGWWzoEdlb1bai0cuoAAijQk5HUKyonDH+UGrD14PGs=", + "pom": "sha256-kgInUnnltl0A/vidBVSKiWxH1jDyDteiFgp9ekhPWx8=" + }, + "io/github/vinceglb#filekit-core-jvm/0.8.1": { + "jar": "sha256-iiV81/qR5r/kbeaBA5TME5PaYAlr4tS5PgBKaQftjwA=", + "module": "sha256-k8D9Wi2TIBqCViEbmuWnbrgh8d1SpS7M1bG/Rw/yWLk=", + "pom": "sha256-NJmcDTRavJj3mlBaO1o+OK5AxfG5gWMtacX0NsyBtFk=" + }, + "io/github/vinceglb#filekit-core/0.8.1": { + "module": "sha256-qopIGqRvCjIgtHbyjRoKHtsyoMtFmfmTeae1PI5nYfk=", + "pom": "sha256-m9MD9XiEXZB17a+NhYhDXjkeNmT/IVefaYUJ2unnElY=" + }, + "io/grpc#grpc-api/1.57.0": { + "jar": "sha256-jSw4Qpn4Tuiqf2cPAOfLJrh+IxzzCRR0MHsyt2kQ9xw=", + "pom": "sha256-w/BUp8iGFkfQpVglsKlJ9E/PycZPR5CD2WgTgUxQJhI=" + }, + "io/grpc#grpc-context/1.57.0": { + "jar": "sha256-lT/KzYL1MeabduODT1gwutTCKuhBROBY1x3ICnQwJ10=", + "pom": "sha256-qyZOgr+2q4lfYBavizzERJWryB52nDD6WprgrRa+bMY=" + }, + "io/grpc#grpc-core/1.57.0": { + "jar": "sha256-O+5IxzvExbVb7Xm+DkhK3ya6Vr675XmN2/NHFO8eHOo=", + "pom": "sha256-gYQEX1eR4Azyzbz16IRq/Uj1z35aTzj7W4MDx7Lv5Vs=" + }, + "io/grpc#grpc-netty/1.57.0": { + "jar": "sha256-gdQ/LU7Rj6NBvYQKNzXxQDpwB0oEbhV+J/Z5tyG0ya0=", + "pom": "sha256-7Z3917HtQ1avs8XRQH3ttjTIYC+0EEebSArYwROe4Xs=" + }, + "io/grpc#grpc-protobuf-lite/1.57.0": { + "jar": "sha256-LFB8AtmBuEohdj1E4Jr08nmIHdPiW+MID2NhJYYH8Zg=", + "pom": "sha256-sCO+cAiElIn2Uu7/df0P4aqckF9nHTROFtqv3fkhgZ0=" + }, + "io/grpc#grpc-protobuf/1.57.0": { + "jar": "sha256-SfmG1OqxJhD9ukpokPylLV62U1mJFv24Y6Nm1eKO7Pc=", + "pom": "sha256-wNy4xn/QHapjJW8Pi2jTcHzrfKhc2qt6PGw/9GDhPdE=" + }, + "io/grpc#grpc-stub/1.57.0": { + "jar": "sha256-bm7hQVOfoU2fpHn39RFgVUREPH4BHnjic8+UaKoYMGA=", + "pom": "sha256-bURZSHxiHf8xUQqIgpBjYx6RXS3Md01xkoQYEW5ZqI0=" + }, + "io/insert-koin#koin-core-jvm/3.5.6": { + "jar": "sha256-gjubMViP+QIVwfzq4w36FB0lKOPU5CwoQ+pAyDUr32k=", + "module": "sha256-IiurmbCubv5NKYHgt8fLYFRc6AGHTBVZkVBlZgYm6yE=", + "pom": "sha256-yxpqM0oiFH6G7kBL5IZ5NsBo2bEjuG4p9/Muj5gigok=" + }, + "io/insert-koin#koin-core/3.5.6": { + "module": "sha256-WnEdfzLKDSCiFism3KeuouftaTuHAhG2JSbDNRLJOVk=", + "pom": "sha256-q6P4ZLcET4XYNsJX/+7xpw2qfzR+wrLru0B7lNurny4=" + }, + "io/ktor#ktor-client-auth-jvm/3.1.1": { + "jar": "sha256-329l/zrE5Z84mcVbIUNozKBO7wA+J52/DJLcH3fR3ls=", + "module": "sha256-sZqQXc/2jXqOAYCozlbZvQhTMg1y42nHFO/xaGW8/Eg=", + "pom": "sha256-ChKNLmW/7F6SfniGwera1NAyllUZaOd7JiSLl8fFmqM=" + }, + "io/ktor#ktor-client-auth/3.1.1": { + "module": "sha256-DWnrM+1rLvNXs5QDEElR5y0U+B1t5KhGGsnnYRBz7HY=", + "pom": "sha256-3q0S+EmOKsqGyFJc6YDq7yYwYDejlOImpH3d2SvJxxw=" + }, + "io/ktor#ktor-client-content-negotiation-jvm/3.1.1": { + "jar": "sha256-9fYVfyPmDpqiCpLSsbSW1A6gxQJeB8lveBKmBarupAM=", + "module": "sha256-SCZUx0znKxyZZCV1RpL2GwyxM4BLizYtuH26ka6y1xY=", + "pom": "sha256-ia79EEhHe0Pym1iWYkc26LQj+PRTk2bMkLaMSn8nA2M=" + }, + "io/ktor#ktor-client-content-negotiation/3.1.1": { + "module": "sha256-dnr9WD7WI8oU7iTsSbhAO1bUNWoeQQpyYFr02bfFj2U=", + "pom": "sha256-Di1JFt/rE+LSRzCiv+v1W69RlRjX8hnBUqbmrW6qLbU=" + }, + "io/ktor#ktor-client-core-jvm/3.1.1": { + "jar": "sha256-3HNSBoFanfp2nJZNhjsX852CcVWpWVMs5xesy6EuzZg=", + "module": "sha256-CENjXDvN3YfWsKfm958QwlH4rTUGzBkrp+MtmPqdVmA=", + "pom": "sha256-FmsvLevYylLL8MQrpe3a5QS7Ebbcpupj8vDhkRJNjcY=" + }, + "io/ktor#ktor-client-core/3.0.3": { + "module": "sha256-xct1TTMOkdHNf3fMCCBeeT57xmmpyuGHqiEPs+dc2as=", + "pom": "sha256-6f576kgFKdQhOWzkAMDGhPHLZDpd2O9w40xrOSPU0WA=" + }, + "io/ktor#ktor-client-core/3.1.1": { + "module": "sha256-HENLQIV+SHTQkQeY2WWDys7TW7VcdZN+SqrXXXSZVKg=", + "pom": "sha256-pwvXeScZY9OUOsWxO4t8fDJMYB8n/E5eVUe4cs0Hbzg=" + }, + "io/ktor#ktor-client-logging-jvm/3.1.1": { + "jar": "sha256-scU9pJ/ECVY/TG+5oPfOsz7SoUYpNMmTkuWxzKDmqcE=", + "module": "sha256-f7fPWljnLO1KkqMpaj+2GEJ6sLksLArpQMacO9Jc/DU=", + "pom": "sha256-xBM/E1VdDRDkmrg0W1PtbsSIuer6z/klJC1jHHF/JJw=" + }, + "io/ktor#ktor-client-logging/3.1.1": { + "module": "sha256-5+ChGRMReioaTYFqFmrXAX4SNuP2A1sI7wiCB61wJLs=", + "pom": "sha256-HNgSST22zmdv05YtF8nvkxlUuJAIG1kFUn9Jk1aTZE0=" + }, + "io/ktor#ktor-client-okhttp-jvm/3.1.1": { + "jar": "sha256-T+9oV25+/zsrNG8AbTFhdX3/CuBEItSd8msBwPhdPsk=", + "module": "sha256-q5hd6r5DVjOOBS/BxArKsoYyEZh8TzGS7cUGBpi3tRE=", + "pom": "sha256-VM5iQXFRshxgKoGGb/MHk9VNUYb+Vk+dSWKPUIBDvzY=" + }, + "io/ktor#ktor-client-okhttp/3.1.1": { + "module": "sha256-lHmI2EdO0QQw8tOXS5byK0a9McDNOhio18BQOlTfx60=", + "pom": "sha256-bigHx/DYkJLQgIC3Seq2A4/Syoq91pHrFmxmeK5kgVw=" + }, + "io/ktor#ktor-client-websockets-jvm/3.1.1": { + "jar": "sha256-x+SdwwC+Z/PsxAt/w1643p32hcM6pbSqaYMsRzoNGmM=", + "module": "sha256-K9DsnywbSE/xkIHD/2mjNwuTrKsMACav66KPpIu0JxQ=", + "pom": "sha256-77mNIPrzcCEmODMnUmFJtSaKovcisJSX0/kDljVV1KY=" + }, + "io/ktor#ktor-client-websockets/3.1.1": { + "module": "sha256-ODpIQKD4NNlTGOV4MEiGZ2kwcpm6ZoVuGp9ZbMpGEBM=", + "pom": "sha256-hbNOfoLxMoHliwVRIMaLyP9GhTSRfjvzMZ92vJP2Hjs=" + }, + "io/ktor#ktor-events-jvm/3.1.1": { + "jar": "sha256-edJ+rfJ6J433kMSQ9XyZG+2TYLVaBbyfH3RLIjMLUFs=", + "module": "sha256-WJLv/yddO0Mise6kS906BoD3z/iXiO8WyAl3cKjF+eQ=", + "pom": "sha256-RUqm3g/VPlJIOZnKSd6VjwNBKx1GlF14lqJBsQbBjqg=" + }, + "io/ktor#ktor-events/3.1.1": { + "module": "sha256-wzRhIZmbL3rNh0doWOTY9aZkInpcOyQcc52dQoJb250=", + "pom": "sha256-mgwRaawFQZcZe8CPF8yCeXgjqcJWZHQd04GnazL9QDs=" + }, + "io/ktor#ktor-http-cio-jvm/3.1.1": { + "jar": "sha256-ZZVfvsiA9mb/MOXN7MM+Of/XwLZYwJ2niUlOhSjJTGA=", + "module": "sha256-peUjznqqEclSfeB7wxRak6lzc4Jl/TyB959reYeS5gQ=", + "pom": "sha256-/qMR8z1NKfV6m/wkrecn6vtFullv9JZ5qkVSpewTpo0=" + }, + "io/ktor#ktor-http-cio/3.1.1": { + "module": "sha256-zpUnEGKYRlbN9wmx3vIwThGij+tQpQM07Xnk+F8E7A8=", + "pom": "sha256-sCIN4cXz3pHqhu7SxkHXu0lSfD1iqeivo97xFkeLbaA=" + }, + "io/ktor#ktor-http-jvm/3.1.1": { + "jar": "sha256-wQ4iEltDk+ZhJN35ediJmc/7C/vo1boZIkD7oQTRX7o=", + "module": "sha256-mzpLiic6QZ7i2L5SIsgbJvKRdrakojuBX/RKvDmrDeM=", + "pom": "sha256-8j+CYetHYjfH2lXKZ8awMFS+kGpCF1+/iIvOtIAhKGk=" + }, + "io/ktor#ktor-http/3.1.1": { + "module": "sha256-Bj/oGNpM0JsqAR/mb8lAX/fiuetFaPVekpbQoG8sPA0=", + "pom": "sha256-scSnlJ/nls6z8YMjWYqDxfk9J7U2VFFg4o+WIGGPn7s=" + }, + "io/ktor#ktor-io-jvm/3.1.1": { + "jar": "sha256-MYuRb0fIUXCvS+6fD0VQsODt7Ky14dwsKCl3bI17yas=", + "module": "sha256-J2rXuOWEtkb7XV76b+hFYvhC9Dzwvj/UlkVd/z51ydE=", + "pom": "sha256-YRjAOam6H6htK4CxoZ7Iy/xKIvUZ6vA/VFdXzTqxd8w=" + }, + "io/ktor#ktor-io/3.1.1": { + "module": "sha256-4u15APMHK4VkiSseR1fzRWyJ5HV+nnfcqf8W3DmIiFA=", + "pom": "sha256-mna6AnP0Vy1oTURo784BtATSSsWzokuK4ceWQhx5D+c=" + }, + "io/ktor#ktor-network-jvm/3.1.1": { + "jar": "sha256-CJy7uU8kt14+TEQBuu/ZWG9bFcnYAKbpPzCmSxlZsjk=", + "module": "sha256-AiZQk2xYwEEStePfJD4zaQDmtyKbCkUl8cn1nIPeeis=", + "pom": "sha256-GUk3Y9TxFQvCKfqdD8yERJOQw+q8txxc+yRVupmmkWU=" + }, + "io/ktor#ktor-network/3.1.1": { + "module": "sha256-gP7XcFwFdzTMk8+cf55cD0lo+nWMqlDjvpH+YrpoL5g=", + "pom": "sha256-QLSG36c91ynR99yevJNL5z3pJSKFnbKWqE/28gyGw2Y=" + }, + "io/ktor#ktor-serialization-jvm/3.1.1": { + "jar": "sha256-nJldXoF13kgYMCplAbuZqOEZ1GI8dVUt32DuPWbF594=", + "module": "sha256-TvQH316/TX58e5s19DVmPe10KsUeJcoelb6dOWJtv6c=", + "pom": "sha256-N7BrHSbkoMBbuMk+puGnHZ54zf+XndPAmkwaFFPS4aM=" + }, + "io/ktor#ktor-serialization-kotlinx-json-jvm/3.1.1": { + "jar": "sha256-gdtumyFpbgVyaerBobZE6HHOnnWj2o5oBTq3c5fvwBs=", + "module": "sha256-CEkEG0MWhxZhDsR+ZEv8QOVnvIJhIZsbMQg6ZEjfh3g=", + "pom": "sha256-TpiA/27FDdaawiouv423bdGB43ROw/rLCF+DdPJwfSw=" + }, + "io/ktor#ktor-serialization-kotlinx-json/3.1.1": { + "module": "sha256-zmVZ1QiGCaXMpCVrSXZUnyjQXio8jPjeY+vGE8DVvwI=", + "pom": "sha256-J+jZHK6F3ud002BmizCLErAsuaRt7EI9L4C/+izqYXI=" + }, + "io/ktor#ktor-serialization-kotlinx-jvm/3.1.1": { + "jar": "sha256-UGynsB5FAvvYlIZP5A1KhGwLR6WVTU01+8TI+ABI16A=", + "module": "sha256-R3hXpALaI/FAd8cdDC3qsL9YfRkonR2JIjBQLK5nGbI=", + "pom": "sha256-+qg/wXYrGtneZ6sAj4apLQ0FibrTvA8KyEoKYNSGN0k=" + }, + "io/ktor#ktor-serialization-kotlinx/3.1.1": { + "module": "sha256-A/l5EFJLtQLF2/pkXc8PdIlRT25cynPWbPh85oX9PFk=", + "pom": "sha256-xTkjB+ik4dwgJZoqIre628d2DM8ICoyH0cFXAPuV9OA=" + }, + "io/ktor#ktor-serialization/3.1.1": { + "module": "sha256-Lnp0xtJFkGOeRvOt5X4D4hGL0l27Kn4FFP5PiMoCA2o=", + "pom": "sha256-e0xBuMWwvFPneI6U80sg2Tee1pkMkCuLna4CHKvBoUI=" + }, + "io/ktor#ktor-sse-jvm/3.1.1": { + "jar": "sha256-9MoU6LzJPLDfazwRhRyAzeDsTFMvOifdxPbhfN9QlfI=", + "module": "sha256-wnFsMZK+6WMzsz49jrTSdLuqZYKOdwAAJfzFky0xhcQ=", + "pom": "sha256-Ebf9pIb6xeXY0vs0ey8bLdpvGMIgozJ7FdwEDv7vxcI=" + }, + "io/ktor#ktor-sse/3.1.1": { + "module": "sha256-O/XgdWtXZX72kbUV/UekraLWexcmh2C9pJCe7KXs94U=", + "pom": "sha256-555aU506JSbasDuU/4PFFVe46G0dHBFveXLdb4qB9ZU=" + }, + "io/ktor#ktor-utils-jvm/3.1.1": { + "jar": "sha256-MXZ8uCHKB3KftclmDjjYgZ3Jo7jKm4u2q1D/a9BMuCk=", + "module": "sha256-YE7wk8++XQq2CD/73rAjNXZASXMZs/ipoN1a1SYRQh8=", + "pom": "sha256-LUGC3pBGlMdY+c9CxicYgMpM2EFWdBYB2t0zKyMZ7wQ=" + }, + "io/ktor#ktor-utils/3.1.1": { + "module": "sha256-vnVD0+g6f+TAgP1UWgXSXPsYfcAwg2IkCbv3Yg7HibU=", + "pom": "sha256-OWwgs5DCmMIdK4M24tPWSSfzmoj5zPOaew2h/xkcP40=" + }, + "io/ktor#ktor-websocket-serialization-jvm/3.1.1": { + "jar": "sha256-+zaNzbdiPHF4rKhjMiJknLFRBkaVS0m6NZxckm+Y/EE=", + "module": "sha256-SKFYB5qMwz5EBDrEkaVFtWNL5oMiY44INoclZIenLR0=", + "pom": "sha256-emkQogxJM7X00SJanW4uaE2RGvvxSVFiEO6YBbCyYXI=" + }, + "io/ktor#ktor-websocket-serialization/3.1.1": { + "module": "sha256-y6bmysD6XrDCG2n1ZfWaSSFPnEnc6Qrq8L/QWEyV7fQ=", + "pom": "sha256-GarQzpRZpleFsOJ5XY+87sf0o65DOfy9KrV8Y6zdQ6k=" + }, + "io/ktor#ktor-websockets-jvm/3.1.1": { + "jar": "sha256-INrwtfeSnXsLIH9WMN1SPUcYLSUdysUzqbGcqCQG69s=", + "module": "sha256-IIfo/BNzNDnJk6E0Cl7+ontaV2czRCONpcHr3uLMMAk=", + "pom": "sha256-grzt+ITD43sODDeuhHhiMxOpyTn3NTXoQuKqKwEE7Jw=" + }, + "io/ktor#ktor-websockets/3.1.1": { + "module": "sha256-NaXY4UALTUsTCqUHVhdEoG7u55c17bo/qrW+yVFUBPY=", + "pom": "sha256-UBJv8ak1FyiMAYseKTCfOozAfimsqU4WIpzV6LKjZNc=" + }, + "io/netty#netty-bom/4.1.86.Final": { + "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" + }, + "io/netty#netty-buffer/4.1.93.Final": { + "jar": "sha256-AHx9nDeN8C05BWfQ1931Qv/dsCG3MT2/UCOSET/6uwg=", + "pom": "sha256-g/vFTitzuG1Vsgj2GNGioVaRDsFG9+zldWUAe3UK3Xg=" + }, + "io/netty#netty-codec-http/4.1.93.Final": { + "jar": "sha256-2s94znirLSlXAyXbTNJFHqWJY5gH3pWIGg+nFVqea1U=", + "pom": "sha256-o9r/8HG20oToBj2WhD3iu4PPO4iergzJ4K22SlejG4I=" + }, + "io/netty#netty-codec-http2/4.1.93.Final": { + "jar": "sha256-2WzAkEWhNBxtR0lDUqomO4e3L7HS6p7KFhqnOCC/6Ls=", + "pom": "sha256-CEQztC1UH3rEtZKH3SUyhc/aOj1l3nLnNou37D02cnE=" + }, + "io/netty#netty-codec-socks/4.1.93.Final": { + "jar": "sha256-DqR7W6I8odqOuRRsj8dVwScUFGM7Hivizh33ZLoP/yo=", + "pom": "sha256-jNgW7ZkalGBBurTLJL2cjkHuBpJRJRHy2DzvU462Bdc=" + }, + "io/netty#netty-codec/4.1.93.Final": { + "jar": "sha256-mQw3gWjcY2TG/1aXAfTy8SL//omYs+GJ66TE2GjtEIQ=", + "pom": "sha256-Gc3tJnoHDf8avJ0Cm1UvrSYqzBq6XGxnsiePyhE6Jqs=" + }, + "io/netty#netty-common/4.1.93.Final": { + "jar": "sha256-RDuzFlmfsW47rrovtYiBgU1/8LevF2/nbjgHGm6G+MA=", + "pom": "sha256-QtiDsT6zjKv1SWFkYsXzMfUzO/DI/JIVdE+DwBgKT2s=" + }, + "io/netty#netty-handler-proxy/4.1.93.Final": { + "jar": "sha256-KsX3+++gtz73g4iQaTRNVRVQWhSyMDvmk8UALEht8rQ=", + "pom": "sha256-bcUNoOZ/WXgSh0+B6qRUBPfQdrgZnqkIiTKoXBthAkU=" + }, + "io/netty#netty-handler/4.1.93.Final": { + "jar": "sha256-Tl9WOuFO1xM4GBbVgvX8/QYVrvspIDSGzft4LYoAoCs=", + "pom": "sha256-hKFSXKwLR1nvrvKZekf+Gbm1ZC+Sc/oP1YoudsegWf4=" + }, + "io/netty#netty-parent/4.1.93.Final": { + "pom": "sha256-sQnLdvN1/tuKnvdaxYBjFw3rfqLd0CT0Zv723GXN/O4=" + }, + "io/netty#netty-resolver/4.1.93.Final": { + "jar": "sha256-5Zdwtm6Bgi5dERrE5UTX6wxUPgooX1JijlOUGs2O11k=", + "pom": "sha256-WzUMPJHp5V0py+aM/k7yEWzB8DKGd+v59hW6twgsefQ=" + }, + "io/netty#netty-transport-native-unix-common/4.1.93.Final": { + "jar": "sha256-d0FlocTbqssX+cGtZms1aaallxWugo58PUdwP0eaU+c=", + "pom": "sha256-Fbwltn/wpJJysnDvK4z/1iAFfKFssp3/etVmGtyirhI=" + }, + "io/netty#netty-transport/4.1.93.Final": { + "jar": "sha256-paeAGbwc1D28PHt83TgBkSyibR9Jj7VgUU/uSXhkupY=", + "pom": "sha256-DdYqDrPLHqABpNBCbk9cCN8ccNkmVnW/+lxYNhNCLUM=" + }, + "io/perfmark#perfmark-api/0.26.0": { + "jar": "sha256-t9I+k6NFN84zJwgmmg0UBHiKW14ZSegvVTX85Rs+qVs=", + "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=", + "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto=" + }, + "io/sentry#sentry-kotlin-multiplatform-jvm/0.11.0": { + "jar": "sha256-EMJ6bRCkZK7LXZhhvjqlcnl6Cx/nipa87zUg4F4vZ1A=", + "module": "sha256-jf0/tfj/kN+g0T8Yr1K5nwYCY4Q3kMHHSIVNvpYY74Y=", + "pom": "sha256-XCpFSbIjGBj6v/vivnBZ2k2TC5yb+bsfyPG3rh/owz0=" + }, + "io/sentry#sentry-kotlin-multiplatform/0.11.0": { + "module": "sha256-4dzObB02wWfDljIlMAzF9qTVRHotFmHEuFoIF18YpgM=", + "pom": "sha256-9WZj83fjsVpNX5RQeEAzvJxGVzf665CSme6Ohp/LEDU=" + }, + "io/sentry#sentry/7.18.1": { + "jar": "sha256-npO59Q7db27VOBDSXewyg6CNnS3TEnwq9JMLsqh5qQM=", + "module": "sha256-bgQgjWchfoLi85Wn4N1t18viJc/iIn/RDwaTjOMsQuw=", + "pom": "sha256-DCOMY/KBAE6hfzTIUhqEETJFWFO4JGnUhj9wLY0wvuA=" + }, + "jakarta/activation#jakarta.activation-api/1.2.1": { + "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=", + "pom": "sha256-QlhcsH3afyOqBOteCUAGGUSiRqZ609FpQvvlaf8DzTE=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { + "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.0.0": { + "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.2": { + "pom": "sha256-FaVbfVN8n5lwrq0o0q+XwFn2X/YQL3a70p8SR92Kbfs=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/2.3.2": { + "jar": "sha256-aRVjBAeb3u2fwK47OTifGbPMS6REO8gFCJlTlOrXQuo=", + "pom": "sha256-tTeziNurTMBpC50vsMdBJNZyUxc0VnrPblMTDqsTGtY=" + }, + "javax/annotation#javax.annotation-api/1.3.2": { + "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=", + "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c=" + }, + "javax/inject#javax.inject/1": { + "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", + "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/bytebuddy#byte-buddy-agent/1.17.4": { + "jar": "sha256-4drn78VWLCmtO2JbkOaGQgjeabrVYyw/k6VH8XYirFE=", + "pom": "sha256-1ghCjJXnT6aXreYmDmCUE8O+oL+Wh72hvoe3BAPi/8k=" + }, + "net/bytebuddy#byte-buddy-parent/1.17.4": { + "pom": "sha256-4FQGL6bGDfvTnqmX8zgQZWTR7w3f5vu+qGeD+toDvak=" + }, + "net/bytebuddy#byte-buddy/1.17.4": { + "jar": "sha256-dHaHMSGaWy4MydKxyeIJLgYiJC5BsZJaa6c0bhYHMbw=", + "pom": "sha256-7sHUc2OcrqtenXbx+KSGRrCQZ7DFyYS3oL5TAoghg10=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java/dev/jna#jna-jpms/5.12.1": { + "jar": "sha256-Az6Kx6dCYkdIvyUWSPFQls9uFavgxMFfSnfKEIFqEyQ=", + "pom": "sha256-/oIEsE54gTuRM65GObdiwZauazmdQ9Z/olFXz7FSXS0=" + }, + "net/java/dev/jna#jna-platform-jpms/5.12.1": { + "jar": "sha256-1zvIB9SAk+9FzjVcZEb9/fO8DucEOysV+wM66hdhEQY=", + "pom": "sha256-CgHHSMhZdtcu2DfW/tp7Rk1DtjlV4JsYhH2FOPMmJc0=" + }, + "net/java/dev/jna#jna-platform/5.13.0": { + "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", + "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + }, + "net/java/dev/jna#jna-platform/5.15.0": { + "jar": "sha256-GLf259NM6JMJptkFKuGph+jmQFfi9oPgHlDy8rWc0VM=", + "pom": "sha256-oNnHuB/tH6i+iLAv16dWDeGxrFlYOh4sWiGopdxs32c=" + }, + "net/java/dev/jna#jna-platform/5.6.0": { + "jar": "sha256-ns6ovysbOZY5OdGLcEZO72DFCP7Ygg+dyroMNVGOq/c=", + "pom": "sha256-G+s1y0GE5skGp+Murr2FLdPaCiY5YumRNKuUWDI5Tig=" + }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "net/java/dev/jna#jna/5.15.0": { + "jar": "sha256-pWQVjSirUSf8apWAKO1UJ5/gmZZixGQltqOwmipSCU0=", + "pom": "sha256-J2YC/zZ6TDkVXa7MHoy1T0eJ5dgN+Qo6i2YD8d61ngU=" + }, + "net/java/dev/jna#jna/5.6.0": { + "jar": "sha256-VVfiNaiqL5dm1dxgnWeUjyqIMsLXls6p7x1svgs7fq8=", + "pom": "sha256-X+gbAlWXjyRhbTexBgi3lJil8wc+HZsgONhzaoMfJgg=" + }, + "net/sf/jopt-simple#jopt-simple/4.9": { + "jar": "sha256-JsWFbpVLX4ZNt28TuGkZtZxu7Pn9kwuWuqiIRia68vU=", + "pom": "sha256-evfi2LJLR5jwTCt9okyfvRt1V7TgF8IFRIFWWRYHkJI=" + }, + "net/sf/kxml#kxml2/2.3.0": { + "jar": "sha256-8mTdn3mh/eEM5ezFMiHv8kvkyTMcgwt9UvLwintjPeI=", + "pom": "sha256-Mc5gb06VGJNimbsNJ8l4+mHhhf0d58mHT+lZpT40poU=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/15": { + "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache/commons#commons-compress/1.21": { + "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=", + "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/35": { + "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/httpcomponents#httpclient/4.5.14": { + "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", + "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.14": { + "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.6": { + "pom": "sha256-sEK0HyOR7bANNff05Qmu0hI2SMHSRs5Y0Pe5Bcn+H3M=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.16": { + "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" + }, + "org/apache/httpcomponents#httpcomponents-parent/10": { + "pom": "sha256-yq+WfZSvshdT82CCxghiBr0fSIJf9ZaTLM66crZdOfo=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" + }, + "org/apache/httpcomponents#httpmime/4.5.6": { + "jar": "sha256-CysRAsGNPH4Fp3IUubdQGm9gVhdK5WBODiVndu2nVT4=", + "pom": "sha256-37/W/+KnhMqYF8RjZap/ileDILgFveOdb1WgsJ2KqMo=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "org/apache/logging/log4j#log4j-api/2.20.0": { + "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", + "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" + }, + "org/apache/logging/log4j#log4j-api/2.24.2": { + "jar": "sha256-DKPsvUwxW91fLvavEncS33GMeDNMzlv2+3tKoX/asSY=", + "pom": "sha256-PvzSYUu/xZCVlJDx3FgXwUGRmYHZ6daaZSZKFzHhWKc=" + }, + "org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.2": { + "pom": "sha256-NQKIlCeybxfvStgWgCxJtJQ/DJOXJoYdEmPlenKiMEY=" + }, + "org/apache/logging/log4j#log4j-core/2.20.0": { + "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", + "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" + }, + "org/apache/logging/log4j#log4j-core/2.24.2": { + "jar": "sha256-enuQ24ZshqEJOz/edYyig5jrsqUz2g15owzAp4UGud8=", + "pom": "sha256-XA2/WcPDVRdm+NdukpIOd0gLFWuTR6L3Uuz+tN1kSxc=" + }, + "org/apache/logging/log4j#log4j-slf4j2-impl/2.20.0": { + "jar": "sha256-uN0+TqnP+hjbXzAc2MU5FYZi5pHv1HAaqHtNCZYb2LA=", + "pom": "sha256-twx2AextJIylCOojNyjIYqBi2lg0doIWdAcvq7OLkU4=" + }, + "org/apache/logging/log4j#log4j/2.20.0": { + "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" + }, + "org/apache/logging/log4j#log4j/2.24.2": { + "pom": "sha256-TY1YM2j0eTVGPhpnFQLVkBnHSvSki7sjoiOptI8B9Hk=" + }, + "org/bitbucket/b_c#jose4j/0.9.5": { + "jar": "sha256-gI+zFm8+Z9rZgRwzECmrFoEkL9Urc1vD8z8oEWf8xy4=", + "pom": "sha256-utAkGAobRpy9lOXy2xKEG8rFRD2VRWB/Zzz95nfB2HI=" + }, + "org/bouncycastle#bcpkix-jdk18on/1.77": { + "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", + "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" + }, + "org/bouncycastle#bcprov-jdk18on/1.77": { + "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", + "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" + }, + "org/bouncycastle#bcutil-jdk18on/1.77": { + "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", + "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" + }, + "org/checkerframework#checker-compat-qual/2.5.5": { + "jar": "sha256-EdE0skXpysxHRRTS1mtbhhj4A5oUZc3FW7wLNOAAi3o=", + "pom": "sha256-QvIevZGDvgSe5a/IIrNFQDpdp2QDeHVzSgObDW4DU74=" + }, + "org/checkerframework#checker-qual/2.5.8": { + "pom": "sha256-M6xqDxNBrpZkfH1EZfSqPST+l9Jpe87izq5vyLXvLDw=" + }, + "org/checkerframework#checker-qual/3.33.0": { + "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", + "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", + "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" + }, + "org/checkerframework#checker-qual/3.42.0": { + "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=", + "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=", + "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo=" + }, + "org/codehaus/groovy#groovy-bom/3.0.14": { + "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.18": { + "jar": "sha256-R/BYUrSO6brv74D6PYzqYO+kdTwAExId1/5e7y5ccp0=", + "pom": "sha256-rfUi9IOcNfUynql8QHrr6/qIB7ZEhS3E1c18l7em0uA=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.23": { + "jar": "sha256-n/5Sa/Q6Y0jp2LM7nNb1gKf17tDPBVkTAH7aJj3pdNA=", + "pom": "sha256-VhDbBrczZBrLx6DEioDEAGnbYnutBD+MfI16+09qPSc=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.18": { + "pom": "sha256-Tp31RqR89jBKExfEaHAQCocm++oRsN0YMi+VfkBwlzw=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.23": { + "pom": "sha256-a38FSrhqh/jiWZ81gIsJiZIuhrbKsTmIAhzRJkCktAQ=" + }, + "org/codehaus/mojo#mojo-parent/50": { + "pom": "sha256-+BnK0bFbaneRyLYB6WveM3ZeRoE5WAfbRTfS8N7dSTs=" + }, + "org/codehaus/mojo#mojo-parent/74": { + "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM=" + }, + "org/eclipse/ee4j#project/1.0.2": { + "pom": "sha256-dJWgenl+iOQ8O8GodCG9ix/FXjIpH6GOTjLYAx3chz8=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { + "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" + }, + "org/glassfish/jaxb#jaxb-bom/2.3.2": { + "pom": "sha256-oQGLtUZ47Z9ayy96QITjhf9RAgH06dv1913GpnX2a+c=" + }, + "org/glassfish/jaxb#jaxb-runtime/2.3.2": { + "jar": "sha256-5uCh6J+2/3hieeagCC1c71LcLr5nBT0EGABzdlK0/Rs=", + "pom": "sha256-lEilrX+mimCD375PQsjIPggrkgKhBUAfxo6UTCZUizQ=" + }, + "org/glassfish/jaxb#txw2/2.3.2": { + "jar": "sha256-SmqfSDOI1GG4GqmijGhbi3TAWXmTvxiEsE7dvKlfSP4=", + "pom": "sha256-p53QAvsDgYP/KGomNb4uaMEDuH4OZHF9jUS/0Bf9M+o=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jdom#jdom2/2.0.6": { + "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=", + "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains#annotations/22.0.0": { + "pom": "sha256-pe8M4dxdO/1vYQD63AN3RVsc+wJRwsIX0yZqWkNYW7U=" + }, + "org/jetbrains#annotations/23.0.0": { + "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", + "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" + }, + "org/jetbrains#annotations/26.0.1": { + "jar": "sha256-IDe+N4mA07qTM+l5VfOyzeOSqhJNBMpzzi7uZlcZkpc=", + "module": "sha256-x/njSbNN+LIRRw4imGJEnDzBPLweeMebKXo3Ryey5gU=", + "pom": "sha256-kEBuKDkHRCqz88ZftqO25RdILNb4Ywgep70sggENrFc=" + }, + "org/jetbrains/androidx/graphics#graphics-shapes/1.0.0-alpha03": { + "module": "sha256-6Q8fmUKy7j76WxfzVB5BKVZaQEmIAA2KM1fOYkXADQY=", + "pom": "sha256-IfsRREjUl71+KtFsG8xpYId4BzWlJTKW5b1sV1PQqLs=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-common/2.9.0-alpha04": { + "module": "sha256-aqFPy1x7azOaQkXjSCA2jWL2o4Wahb9eU4e0Vf1VTK0=", + "pom": "sha256-y0+U9WGyH0BMf7zIZeF5+hHKJTf4sZjQ0IRnNrajdnA=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.9.0-alpha04": { + "jar": "sha256-0oShPRDCm4/pPqXDlBPLjXQGUyug8Tdg98XOOq6Xe4Q=", + "module": "sha256-esWuBXS3RpwQThCsq1fLSNIWLv+HqKzXVnssnlboViU=", + "pom": "sha256-uegv/vs3HDMYEeBv/sb9ZXxGU4NJllBoU6tYlfZaXpE=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.9.0-alpha04": { + "module": "sha256-zKUN2P4iFsvYiFY9EYeH/MIsJdtDK75DUTVCXEblUhw=", + "pom": "sha256-5Hd36RAmo6FWG6DQRaXA4qAP3U27+vSG6sSV5k4lfHY=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.9.0-alpha04": { + "module": "sha256-bknNPW5DPJhx0PwTQb6lYTv/qA6zDdl3a1t8zFJHuas=", + "pom": "sha256-IbBAlrekoKrDY3mx/9kntqdMo2p7qnXpVeKDCDGooEo=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose-desktop/2.9.0-alpha04": { + "jar": "sha256-3f7rkmLQZaY8VAvnMqDmILZ3rHrvLCE6WEViehKSmSE=", + "module": "sha256-GexRNKE1HoJkB7/BdOirRTKG1eeQD116YiGwmDpnb7g=", + "pom": "sha256-48MWNEKfaaHQJ26ICLbpl7QDjCbfXVWTGeMTqe3DYLI=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose/2.9.0-alpha04": { + "module": "sha256-+9ayBiK9qNkZRCxpdHOYde6oLKsJaLOnPge4W1IGQ1Q=", + "pom": "sha256-fbPEU9dzg315i1FjOYEM8BJVysWTiBWNFgR+c5Be2gs=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate-desktop/2.9.0-alpha04": { + "jar": "sha256-FvZbSHgaFMaUIlbxNBVMBUBTKqpCF3t3++WbI+jRs9Y=", + "module": "sha256-sNV0hf7suQu9XH6cEl3m4MjMoggyRlZXUvruc0FviWU=", + "pom": "sha256-HwUIvK17WzGQ0hUOFF4uWjNOnngubx7+0xj7ROm6dwQ=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.0-alpha04": { + "module": "sha256-gKcAIcYGY/cR5VNPT0yjp00OJRlAeBuYhTF2bK4UQzs=", + "pom": "sha256-y/uF18Nt6BJq+dMSSopge12enEwOhoG+TbsYGpIkYTQ=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.9.0-alpha04": { + "module": "sha256-CFQVo5KYYbwCv5xCBLcAn3nq0287BA6wYGECflIfyjQ=", + "pom": "sha256-giBGHdXfQbn0Sf4U+c2i9eoSI2gGbsx9HHa+gbNj+Tg=" + }, + "org/jetbrains/androidx/navigation#navigation-common-desktop/2.9.0-alpha14": { + "jar": "sha256-lQvnQVnErCjzcuGoNdn43Na7/PwhRDXZZXYYknvbKWw=", + "module": "sha256-iv67qHpYcLSEfCMAzWy4v9MN1UsyuyYAMDtos6DAcqY=", + "pom": "sha256-5MbcH3rekEXjNnczStuluQxWGjJi5PZoDcPe/E9F1DA=" + }, + "org/jetbrains/androidx/navigation#navigation-common/2.9.0-alpha14": { + "module": "sha256-P+Epqwk2Z3VEJoKGM1A+rthoAaK8U3Rkt1zEehv+wzI=", + "pom": "sha256-nTK4Sfn/CvXOS8vbr73cVQQL+xYqQdkRGO7HrOyc8JQ=" + }, + "org/jetbrains/androidx/navigation#navigation-compose-desktop/2.9.0-alpha14": { + "jar": "sha256-2fTNWGnlYiKAiO847s/4e1zSUVxXSSA4B/vYO+pTwq0=", + "module": "sha256-XDYB5RxltcvX+zXaQNBYf6Q60lTVaGV/xCZPvmI65Ls=", + "pom": "sha256-RwX+glV/+QAjKDxQ85PncaqNInRtAflZiST+zQz1b3E=" + }, + "org/jetbrains/androidx/navigation#navigation-compose/2.9.0-alpha14": { + "module": "sha256-qcO91XvDZpKz2kv1/bk70d8fstKt3fl3i9+u4gGOSVs=", + "pom": "sha256-mapb841feXzWuyMYMnGi5qzLMVaIP0cNcwREmMsHufw=" + }, + "org/jetbrains/androidx/navigation#navigation-runtime-desktop/2.9.0-alpha14": { + "jar": "sha256-kcV34HYpS8w/d/Uak8aHcTsWHp/UEi4JQ93kL748wY8=", + "module": "sha256-ctyeUp5q13fCG0tGGMFR9xlhxGBXFHLCTiqzc40KzTg=", + "pom": "sha256-rwYCidS9nQbH6aSqZIQ81jvGQJc4R6DGEjtJnuYWVcA=" + }, + "org/jetbrains/androidx/navigation#navigation-runtime/2.9.0-alpha14": { + "module": "sha256-2UTxuyQaMEQPaM1yLJkSv06Sp36qL44OBuq2dxC+7mA=", + "pom": "sha256-kTzW+l0TI2YOAzxJJwoqOybSBomTbqKu82RMxU5oSmw=" + }, + "org/jetbrains/androidx/performance#performance-annotation/1.0.0-alpha02": { + "module": "sha256-y892B/wsGu+lmgMT6hWE6gEIdc8Xnnu0TEYPVZnNc+I=", + "pom": "sha256-tFBttAnpLok73PB36S16gG1UTSN/7gb6JIPrjCFdBcM=" + }, + "org/jetbrains/androidx/savedstate#savedstate-desktop/1.3.0-alpha04": { + "jar": "sha256-41987aa7a73hycDhjM16ps4bdeNGCfgH6ihIBgrY4bc=", + "module": "sha256-rqMsjfibFAKUunDY5cM6DD4s8DH2IEJjJQ312mzVU0A=", + "pom": "sha256-cYUyHCtb5DXgXMQpVT47ML5BykjpBjpALGaPv9S+iWY=" + }, + "org/jetbrains/androidx/savedstate#savedstate/1.3.0-alpha04": { + "module": "sha256-i2FTZNeMO3Ki3XPl5dLnqG9H2K1/dP+1TjERVYhN2Eo=", + "pom": "sha256-ncPtVEigP556xWa9fJkp+RdYrNclUtttMuTum55Ox/4=" + }, + "org/jetbrains/androidx/window#window-core-desktop/1.4.0-alpha03": { + "jar": "sha256-TxK74lqFammMZ5aUQvQZcu3/qS0QfscnRSqs3FV1tg4=", + "module": "sha256-IN2SFn/GNnwrdFYj1igc/p2aGSXsHzstrN6TuCz+StY=", + "pom": "sha256-YwINNUMCxMPapZN9DQt35fOjuVTjkK72gnIpO7g0dic=" + }, + "org/jetbrains/androidx/window#window-core/1.4.0-alpha03": { + "module": "sha256-Uv5LQSghWM8m3ufAnN9Wd1i2IDoUk8gs6XTEM7VVdTQ=", + "pom": "sha256-KzAGtHCQliab2Q5wp683r5UmmqKs1YMeHG4mwsi+P8Y=" + }, + "org/jetbrains/compose#compose-gradle-plugin/1.8.0-alpha04": { + "jar": "sha256-2WBK5Um8q507w3WtQW2ji06xPpYvX5Hb7TIoofXWgxg=", + "module": "sha256-Gth21E1Ko0iLdc4WCDX9MNfJ5zjtIQzUQhYLtpOI9WM=", + "pom": "sha256-u9FEofPKM25kpi+2F1lo1yhlCmIzgzQoJBZqvrZbQf8=" + }, + "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.8.0-alpha04": { + "jar": "sha256-P5gb/7uA9FJx5DwcSTBKZkaPA111MCkA2Km70SPPUM0=", + "module": "sha256-btmw3t87doChrQ5ax3+br5laTF0TQjXEAyiEFrpSxq4=", + "pom": "sha256-vozzwcRUa5YqICnukSMGH951SdvXNmil91k2CQ68Vos=" + }, + "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.8.0-alpha04": { + "pom": "sha256-LloUKySgGL+p98Vv1ABrhlOUxEvzHVDCOfQRT3hLxQc=" + }, + "org/jetbrains/compose/animation#animation-core-desktop/1.8.0-alpha04": { + "jar": "sha256-KRrqHKb+qzsKwxzBZG7i5jQVLigruiY2/dfht+DFtQw=", + "module": "sha256-S/W/S2PMtco+xOpNtVE0LB7OUdiMvrhbsZHph6T5Xyk=", + "pom": "sha256-Pi27qd9WDdTiM94hqVBN0NwjcHgwDLxFc4QEHtTecCg=" + }, + "org/jetbrains/compose/animation#animation-core/1.8.0-alpha04": { + "module": "sha256-fDflvEiuq6jUGjBXSWbJ6DS3k9Exhq+gWWCiRYZzhnM=", + "pom": "sha256-Gx5oYdORxl/GM/eKaNj8oxGjE84p2LfslxlHCy286UY=" + }, + "org/jetbrains/compose/animation#animation-desktop/1.8.0-alpha04": { + "jar": "sha256-cunpgaebbblw+8dwFjiSt3PinbG33L8Khlxew07T+aw=", + "module": "sha256-0oaNiCNmM4ZFs6s1u7vO3g6DzCNYVzn1P/tB9yjVS74=", + "pom": "sha256-EXEmubeGcJmLLT77p77E7PYB93degR1AaVqTgoHzfGM=" + }, + "org/jetbrains/compose/animation#animation/1.8.0-alpha04": { + "module": "sha256-CKEQLW2XTTeC9vPTqP2xxwabAfvt+xOoPrJQvpuj2iA=", + "pom": "sha256-xj9AG9d+sLiw6+6JyJAlHBmR48lyHHfzaG0db6ADX6I=" + }, + "org/jetbrains/compose/annotation-internal#annotation/1.7.1": { + "module": "sha256-OBY3qiWg10JF0HpLhxPDjcUBtU+yWvnWHdwzMR9AFhk=", + "pom": "sha256-exANVYBe1I3wrGACFGbx1YcGM0wXJ9DQhRrNt302Ptk=" + }, + "org/jetbrains/compose/annotation-internal#annotation/1.8.0-alpha04": { + "module": "sha256-IPD+KWwOHKwUt3lpz+YNjrqOhgRFq/pJaP6G8zW1Kmk=", + "pom": "sha256-y+VVh6dkRxbLCSwF7tnKzkcDmzzWqMvbBcDT2kOfKx8=" + }, + "org/jetbrains/compose/collection-internal#collection/1.8.0-alpha04": { + "module": "sha256-vaFu6aIimSDvb3uPClwDQpd/ULoPX9c26t0Ex/cVS6c=", + "pom": "sha256-tdLR02XqaOZqtCrrGsKIOlEEhXKyCQr8Wtj4vciX4vU=" + }, + "org/jetbrains/compose/components#components-resources-desktop/1.8.0-alpha04": { + "jar": "sha256-G1jfMsZ/+08PPbwV/am5WeLsP0PgvFbdsIi+NRI3uaA=", + "module": "sha256-eBTk/GIdZEvVU2yX0kEX5zj7ca1PX9K0gwvkDzRyST4=", + "pom": "sha256-nNjAAz37WdYh2qf3/uMGjmX6WxXFzOQjhUc1ZRf6pZs=" + }, + "org/jetbrains/compose/components#components-resources/1.8.0-alpha04": { + "module": "sha256-QaapFBtuLRStUe2FSWfscImfxAxlzgr9py7+VOqUviM=", + "pom": "sha256-4YEBL4X+jda6rRYB1/ADf4bL168vEtcu7AXg5ucLwuY=" + }, + "org/jetbrains/compose/components#components-ui-tooling-preview-desktop/1.8.0-alpha04": { + "jar": "sha256-AgAr0hEQXk6BQOfXeonP6SGBToYuj314vM/ej+Gyl9A=", + "module": "sha256-5ZNliGoYZ4baEJQFRAwiybLJ7i8j0aqcyiVYfydyY/k=", + "pom": "sha256-JpKpRqmhhwNK+etHaGNO8mfl2XM9cDL84YJ9qN3sdRo=" + }, + "org/jetbrains/compose/components#components-ui-tooling-preview/1.8.0-alpha04": { + "module": "sha256-4AO3yPVIehqTsA0DnKEAKIUiMYgTWk/jG6/wZkTyKpE=", + "pom": "sha256-biX6hgQI0jdlIhg5rrl7pEkRh0Ac3kdAGKgCnfbdeOc=" + }, + "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.8.0-alpha04": { + "pom": "sha256-dIPgJCP4kd0RMgMVhp4Buyyrg3GKAbOyg3zWdIYb8iM=" + }, + "org/jetbrains/compose/desktop#desktop-jvm-macos-x64/1.7.1": { + "pom": "sha256-wmVpVQhvtQIR33ifcfL5M44Tqr+tbRPC8C0Qu4iPmic=" + }, + "org/jetbrains/compose/desktop#desktop-jvm/1.8.0-alpha04": { + "jar": "sha256-IZE7EA1GFlcHsrZW7Vs4vI7aD2Bj9VMnh+nRv3+UPv4=", + "module": "sha256-px3tHKJpOpZPpS18KyGDEaJqeL8iAzkBnkHYFdZGYU8=", + "pom": "sha256-gsz84p4fqrIpVYptzzg9R3aFi2aud5LPxIgrR79+knc=" + }, + "org/jetbrains/compose/desktop#desktop/1.8.0-alpha04": { + "module": "sha256-bsLHN/jwn0KVOFMJFeOZJxXRmQQX1cmAYt2XH+G5CwQ=", + "pom": "sha256-A5sexl6DYuM28keotN4oELcIKFKvMNjz8OxFBvpWZQ0=" + }, + "org/jetbrains/compose/foundation#foundation-desktop/1.8.0-alpha04": { + "jar": "sha256-UsZBh9YVrTi/PfQQaLKgGA2BiND4dfeaRpOPMHP9r7s=", + "module": "sha256-okLMq8ahtwADXCyTAFnyKsMC13Cz1KWk8sTEJncsGgM=", + "pom": "sha256-Jla3YP+wk7QTcc08ppcQM7lGAw6X1Ti4ux0z6YLfeM8=" + }, + "org/jetbrains/compose/foundation#foundation-layout-desktop/1.8.0-alpha04": { + "jar": "sha256-OCl8mANYZ4ojg1m10ru5DhE2tJuADGsvAnboR1q+SMI=", + "module": "sha256-HHEXynrYkcMxjqbl2Yi5xJHJipaCJDOFCOcGrhi2X9U=", + "pom": "sha256-K4qgsUplVMBjD8rpIjDAQae2np2tNs15ILqj66+ZtrE=" + }, + "org/jetbrains/compose/foundation#foundation-layout/1.8.0-alpha04": { + "module": "sha256-3j0zb44v6qd5Brs7Mt3WQN8W3Ci5+SAKcSZDtKT0mU4=", + "pom": "sha256-8F0/i7DVy4p5OtG8OD7D0IElawLjdAPCxanSqncqoEY=" + }, + "org/jetbrains/compose/foundation#foundation/1.8.0-alpha04": { + "module": "sha256-9oLYatpLCjX0kvltrnryeLTkVQRoj6CWOi+F9UmmsCo=", + "pom": "sha256-YdA6m9aCwFJtOkRsur7DUUKl0W+N9aG9zTpa4d6f6OU=" + }, + "org/jetbrains/compose/hot-reload#runtime-api-jvm/1.0.0-alpha05": { + "jar": "sha256-+2p7PMWZNC8rUApqQ17M8vue1B2pcsfUgCzbSn4DFGI=", + "module": "sha256-XphVM5YuX4vKHnPq7LRw2S0LyC08/H9RydVNB8foCmc=", + "pom": "sha256-6mjs2xBA1jFGN8MN7iTkMqMHcLoDNh9IAIw6AB+ytOs=" + }, + "org/jetbrains/compose/hot-reload#runtime-api/1.0.0-alpha05": { + "module": "sha256-VpDI/Ph2E+SAxgPr7QMKRGlUzS3K+9dk9zE1u+eP8DM=", + "pom": "sha256-7dli33dNo1SH/dpP7yi7G1gQj4eeQwpMFQ+oWA4xgqE=" + }, + "org/jetbrains/compose/hot-reload#runtime-jvm/1.0.0-alpha05": { + "jar": "sha256-238TALVeJgQ639D38TzROTpKqD3twn6kw6AJRiGUriw=", + "module": "sha256-LBG1MeaMgYj7+H0QTIumK3trdF5wPNaCvqLcdiG8YXg=", + "pom": "sha256-Qx1LGtWuX0mxy0TAYzZR6WmPpzDjcKR/iziowomZt1Q=" + }, + "org/jetbrains/compose/material#material-desktop/1.8.0-alpha04": { + "jar": "sha256-Jigh7AXNWziN0f9Z2e9q/aE1jUyewBXzjOMf90J7Ngg=", + "module": "sha256-R096AAjrxZC/DOA6pAcxDy6Qep2M9ZWOpfZnZbZ4Ftk=", + "pom": "sha256-AaGiVgwez3+fFyDjdjKGa+OiMDTs9LWGhVKWsVpuC6Q=" + }, + "org/jetbrains/compose/material#material-icons-core-desktop/1.7.3": { + "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=", + "module": "sha256-e0EAWgTkVmrpU/c4diAmlt7sVBJ+ATzce8P7c0ZwNOM=", + "pom": "sha256-KPX/59+P3dmEwytjUP1xGPxkcPinV2ocaS8zZq72QKY=" + }, + "org/jetbrains/compose/material#material-icons-core/1.6.11": { + "module": "sha256-VcHqxOfrTOt14Cav0FTk+LgZBVPgJ2zuvR/HdXisYcE=", + "pom": "sha256-964wavWzWSCtqddmkygHpwQ7vFLBD8DBVp+BohfGoV0=" + }, + "org/jetbrains/compose/material#material-icons-core/1.7.3": { + "module": "sha256-bzMObQpiopITWjDBxT6lGWrXrrBIZ5r2Hk/JKmYukHY=", + "pom": "sha256-wDviSkFlDR3YN/+tAA7Mf8y+y2EAoOj0gDmEcMQqhGo=" + }, + "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.3": { + "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=", + "module": "sha256-PYIoDQjwjMPjN58f/jiHBUovuDfknStj1JIumjf6ecU=", + "pom": "sha256-cD/QmE10zp88WXPXTsyyxD26VBml9VT91Ux0URHkfzY=" + }, + "org/jetbrains/compose/material#material-icons-extended/1.7.3": { + "module": "sha256-sfqa12veAdmGn5uwxxKc0rByeU8jfgTRXj73yKZqSHI=", + "pom": "sha256-3NyiJy7t6vlAZmO5s4zMl8cXnoWqHKeJMuxhIuVZlYw=" + }, + "org/jetbrains/compose/material#material-ripple-desktop/1.8.0-alpha03": { + "jar": "sha256-vW+Je+w5CQLiVd0+HXLXY5jV6C3r1PDAbDCltfCsSVU=", + "module": "sha256-EtHZWUpaT43b+JNnLr0UNH+46uVvUsDso09uxw205gM=", + "pom": "sha256-0bQRtiT+S+VGZx57wM/MON424kPVd6XK7jGg5DhVDp4=" + }, + "org/jetbrains/compose/material#material-ripple-desktop/1.8.0-alpha04": { + "jar": "sha256-vW+Je+w5CQLiVd0+HXLXY5jV6C3r1PDAbDCltfCsSVU=", + "module": "sha256-oM3vSNacD0JZtYIvq4B2Z4QIYiHfaFioE2o3SpNdA34=", + "pom": "sha256-nLydR64foEZCAi/Z8Rkt4ozRgPFZ2k2SZj6cshQIiHo=" + }, + "org/jetbrains/compose/material#material-ripple/1.8.0-alpha03": { + "module": "sha256-RsSmhJ+KpLqDYBhJAqEx9A6kNmzAa/7eHwLOozoq88I=", + "pom": "sha256-dfywyKynZatgupUyaZC2o3BaMTs7JMefGvPEGfsLAjg=" + }, + "org/jetbrains/compose/material#material-ripple/1.8.0-alpha04": { + "module": "sha256-iTZr4vBCDfaIQuwAb7nKj2FbhbQzXgSOplOAHXazhho=", + "pom": "sha256-HDkzxtQw3cr4HRaHNZF5Xi2EL1bI6LK3+Bn9rhaFmoo=" + }, + "org/jetbrains/compose/material#material/1.8.0-alpha04": { + "module": "sha256-Nw5J10UtSt7rZIbZyjV0xEIBoMfBbEbe7VyLW7xHWus=", + "pom": "sha256-FcN5SQtW5NvA/ziosiKCm00iyQJj5J41CPaiRqdwkbY=" + }, + "org/jetbrains/compose/material3#material3-adaptive-navigation-suite-desktop/1.8.0-alpha04": { + "jar": "sha256-9Uj8r2rhipDxUf74oa4gtk3ajY6pXEtRmkKriHx+lBg=", + "module": "sha256-02VF4O1EUxBsJWEDq0s//c1ITJvBIQXp2/CGDZEqe+s=", + "pom": "sha256-lfSxzo6ZXZ8nO85Wj9aTZcb45iJE4JDbAuXngeaOaXE=" + }, + "org/jetbrains/compose/material3#material3-adaptive-navigation-suite/1.8.0-alpha04": { + "module": "sha256-ZKQWCdUc8i6K/Qt9+ECWl0O7PeWnB29ESj8rOzGOv5g=", + "pom": "sha256-5kU73LVJ/0daXUsa3zSy1KN/529FESSUwdngxXrvg/U=" + }, + "org/jetbrains/compose/material3#material3-desktop/1.8.0-alpha03": { + "jar": "sha256-JURxLAyB9oXJh91EBvN4VambiTVbXP2R+c9V15F94Vc=", + "module": "sha256-fLSR87OVtlX5bqGfSRT6nQJV4aeIE9xXmCUx0a8O0Is=", + "pom": "sha256-Gs17XElZ84eFPvucYiPDkD66znWSRH55vnwKqkNV9K0=" + }, + "org/jetbrains/compose/material3#material3/1.8.0-alpha03": { + "module": "sha256-/AykMQ/v1zUjdyjas194djHfq2fW59SyJ5Ti5ngAb8o=", + "pom": "sha256-mkJqqoq807D8Ab0Gn5jBGs5Dzu5T3W6zmKaBmGccqIE=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive-desktop/1.1.0-alpha04": { + "jar": "sha256-faTVrekedntUkmvz+K6IqQUUq6HFgAtgFoE2GOe/Bxk=", + "module": "sha256-9ZsRYQmNkBDivhHHAhUGb/KrEm4S8AjpjnwtFZA5oWc=", + "pom": "sha256-RijD+D95uC1ctRTiSfuJngonVjxnzjyXl5ovI+9H78M=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive-layout-desktop/1.1.0-alpha04": { + "jar": "sha256-MUflmNxPziKVzbNQh7P9LwVRYwOoK53PftAr6Rva+1I=", + "module": "sha256-SKnOGlvVTbdsdJ+si7fQ6kg2uFurgGGX8OCuk+yHQN0=", + "pom": "sha256-quacszVe3boTYfiNrvs0fy1sFRmM8RUsnQqL5/nNumA=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive-layout/1.1.0-alpha04": { + "module": "sha256-jIaOoEfIH3Q1gcc4e2rE708ZepvtLfGrp0er3ndroyg=", + "pom": "sha256-lWqjI6SbV9FQocBVgJ/4Y1PYt4VAYEi087exf5JwKmM=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive-navigation-desktop/1.1.0-alpha04": { + "jar": "sha256-GLbT0U/iQwJoWJAT7cLu8c+VkF7HZY4vcmBSlFroEc4=", + "module": "sha256-Gj73jQ5kwX/WoMHEdPOkUuy2yyH0WvfDxkJIis5RTus=", + "pom": "sha256-zTTtJpfBL7bdrZ3z9DQRl8EH3Fx2aSbZB8NCDu4BGzw=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive-navigation/1.1.0-alpha04": { + "module": "sha256-VHtOiubu1uUUPILo7b8QVrxejL81ho2TzJFkYJJ5PQw=", + "pom": "sha256-U/JpeqLcjSltxij3HQAOpIJKQeiKE3jYInkNJWCjNos=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive/1.1.0-alpha04": { + "module": "sha256-Vc4jWNA93TUofKnlRJcPlY+nHA9bJjP2htfZci32s8Y=", + "pom": "sha256-DwakDtwakDR3JatlKtuWyGoRzBdJ/thKi3FWMptr6js=" + }, + "org/jetbrains/compose/runtime#runtime-desktop/1.8.0-alpha04": { + "jar": "sha256-dYqLRtj3TT3WoY7PUNssBl2hcU1Tker6jPwNSuAFYyc=", + "module": "sha256-7mwXTJw3AUDwHL8cuOXAbD1j0sK5OcFbgwUuySJtVPc=", + "pom": "sha256-2iWE6NCe5JBcpmt6axdlodHESV7suZzNu9dpE5Yyykw=" + }, + "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.8.0-alpha04": { + "jar": "sha256-M5d4mfkEp+5caZLXkWOvWdIUzYmLCvPTfglOw32O9Zs=", + "module": "sha256-9AfZmTsolCClY7HzhsBtLEMoyeSs5BQe0QdOEvBqL/U=", + "pom": "sha256-A9rVWm5bnC5fR7+lYsyrTFPBbF1H9+lUrYVxUpptCJU=" + }, + "org/jetbrains/compose/runtime#runtime-saveable/1.8.0-alpha04": { + "module": "sha256-QEvySeBkdYZXuELg6Y3C45n5VMs+2Uc+c9iANW5FVLM=", + "pom": "sha256-L3/5oiP1pQLRj25jhd0032jKDPuBZoGO0+iLX5DUOYk=" + }, + "org/jetbrains/compose/runtime#runtime/1.8.0-alpha04": { + "module": "sha256-Ke4vccjmeAhP1xXn6TGv8ODjUAKICzdLy91O4IVO5pk=", + "pom": "sha256-2+tAHC7YOJC8P+S9gbOVRhT+IlcbpCA3NadhlFXROx0=" + }, + "org/jetbrains/compose/ui#ui-backhandler-desktop/1.8.0-alpha04": { + "jar": "sha256-2TtvBgXT16ftfFyheCy/yRlMpKB0zoz75bYBhhgEXvs=", + "module": "sha256-EYbwhN8UwlowXz6W70caow2VZsnKHL6iVU+lPbLlscM=", + "pom": "sha256-BaEAFwP5tXZnw+UKaNMLr+gs4r3q33KyTf2Tsk6rn44=" + }, + "org/jetbrains/compose/ui#ui-backhandler/1.8.0-alpha04": { + "module": "sha256-TBDY0Hn3KGaXliBWYe8TZabnDmpDGKn1QFyWQnxpbxc=", + "pom": "sha256-feZmFnksgkPDl9/stOR/3Dpq8QAOC1EVTxusUEsV7ZQ=" + }, + "org/jetbrains/compose/ui#ui-desktop/1.8.0-alpha04": { + "jar": "sha256-Job8jQ7qgLdf+L7mQ4wW59jYwINBvNTVdIw4nGdJL7k=", + "module": "sha256-Ff5YZ+Jq4s4GcEPEBC+zYPXDXHX/KNruZft5gCHwfEs=", + "pom": "sha256-UeXawNBzLJWDDnmg+CNyua/P1UbA9ieLV/HDVgAjVZk=" + }, + "org/jetbrains/compose/ui#ui-geometry-desktop/1.8.0-alpha04": { + "jar": "sha256-wi1EyFpdVX9holthBwT3BQfHrU/RYa9xK+Ot9cZhRCk=", + "module": "sha256-L68iLOl2A2eWUu7zXtBOjUKJVOq/2VrkpTTmAVzmtv0=", + "pom": "sha256-QD9xIa1KSkSVA70YjcW8WCZpbWDAFz+iv88dBbmmHps=" + }, + "org/jetbrains/compose/ui#ui-geometry/1.8.0-alpha04": { + "module": "sha256-iLjBZ8Ca8KHrRhwwCAeGyIykpkXz4IRDoYerbEmmaho=", + "pom": "sha256-a8eClm810GAi2FmaPhBF61JjLWtxeZUIHh0eHES/Wbc=" + }, + "org/jetbrains/compose/ui#ui-graphics-desktop/1.8.0-alpha04": { + "jar": "sha256-dgUyDYIUnaO3j7g+l6AGw2zuQcnm32vs6eZ6njvSeCc=", + "module": "sha256-RWpENQKtypekjfWFEN2BrpU1GDn7eidYbdEQmls2m9M=", + "pom": "sha256-1Ejf64hTl7MM5v3kHeTMAxM8tuzCyNI1vNrgOt7+has=" + }, + "org/jetbrains/compose/ui#ui-graphics/1.8.0-alpha04": { + "module": "sha256-dgasC7Sv2UrXEFPfZfZmndoWJQLAac0DbYWGlQIpR3o=", + "pom": "sha256-8r5b6KfndcPCq3x3x0oztRK6VQJSnVGUn3UCpVoOY1g=" + }, + "org/jetbrains/compose/ui#ui-test-desktop/1.8.0-alpha04": { + "jar": "sha256-8gwMPdg/+P73LRMdnYbd29Qyqg8TPFaq9Uh4MgKnwPM=", + "module": "sha256-R0xVp9dK9/nca2YPVz53s2biaHPwQh8YTzdMUh4mCSI=", + "pom": "sha256-/5DjfJFuZ9MYZEbybZJDJB6C/umgKs2Qk9h8otDrqbU=" + }, + "org/jetbrains/compose/ui#ui-test-junit4-desktop/1.8.0-alpha04": { + "jar": "sha256-3KpvbErFEDM8mZGRUaXaN+xZWZBWNBQ8410jLV30Mqg=", + "module": "sha256-4mfNKVC5Nrr+2dieyE9yLu2wlvwsyYcYNTouIO4yM4g=", + "pom": "sha256-xOPEs9/VKdwlCqHQzKmdZaNE1jL+Vq6WEEgxTBybseo=" + }, + "org/jetbrains/compose/ui#ui-test-junit4/1.8.0-alpha04": { + "module": "sha256-9BnCIqNd12DsgLydKk5BPHJNLsV7LicVSNR8bBUbEAI=", + "pom": "sha256-Dvgz+9We2mi46oNrGpp3zQLMrkCt6FUQu41TLa8uOg8=" + }, + "org/jetbrains/compose/ui#ui-test/1.8.0-alpha04": { + "module": "sha256-W2m3RxNmKdS5oYN0lMtnkm1aqNz2dSh8ECxUVSwvNTY=", + "pom": "sha256-Dzod4EqSklAgLdCF8GRcNWQqri+ZXDYsRvYKhEiv3Tk=" + }, + "org/jetbrains/compose/ui#ui-text-desktop/1.8.0-alpha04": { + "jar": "sha256-647zK5XWCZCYBUzUlLAPHJ492qSeFkwpbdA4ZscbxF0=", + "module": "sha256-HGLf8eMvWtn0jXhqzIAqjLsomvK8DGCQaH/qoykTm6U=", + "pom": "sha256-RxihxZRXxaJjOirKneQzRgjf7bodUJYF6B9KQfi5BmA=" + }, + "org/jetbrains/compose/ui#ui-text/1.8.0-alpha04": { + "module": "sha256-xWcKB6ER/XjY6lXCrrEX5cB9mxHyOGwKYmFIhuz2TuM=", + "pom": "sha256-hlzfNRHDmpaFFYFgzyTOpd5MZpL2XlQl5Zj8PUH5Fk8=" + }, + "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.8.0-alpha04": { + "jar": "sha256-SXgjEEYpWRoL9Au5lUam/EP84Ku7O/ysdGdI1g6NuoA=", + "module": "sha256-JsNUPNwLW1E66x5Sf2RjGBGUoSXJpuyIMFHa4Ztuym8=", + "pom": "sha256-Fcvhcf1/dQcU/T1Y3w6aL3SuB9axqtArgXWLsVS7Zls=" + }, + "org/jetbrains/compose/ui#ui-tooling-preview/1.8.0-alpha04": { + "module": "sha256-MC3ACIOclhJmen+O2UquZf4Oh3sFSihf9qV4RFmoZbs=", + "pom": "sha256-+lu0KDtKzkAq41dHCKlXcgcw2Bm9bS5DOR7IhzBCHjU=" + }, + "org/jetbrains/compose/ui#ui-unit-desktop/1.8.0-alpha04": { + "jar": "sha256-UFp3/NVE2OFY461bhSre/Nlh64+9NB/rjiGmk5UtuQY=", + "module": "sha256-0bxWb7mqdrA9KB4EzxNvi8Khs3BDLyVGeHYovegjr1s=", + "pom": "sha256-ljirfotctywtFIZ9A7V1MtIdIf6tjArzi5RCzcP7b/g=" + }, + "org/jetbrains/compose/ui#ui-unit/1.8.0-alpha04": { + "module": "sha256-pApTFo4xoFjFBPVZPjwrg1D/bA4w+CQ4wl3ukRuWPcc=", + "pom": "sha256-jBPwgwt41ln/tQHBHTNh8E3BelJzimXhJznwxXRLj7w=" + }, + "org/jetbrains/compose/ui#ui-util-desktop/1.8.0-alpha04": { + "jar": "sha256-zdnzOHJxDBTfdVDa2/yR1VrZo7cTRDHCr460L3V+F68=", + "module": "sha256-6iji9UjrDLhJ9cMEfL07jA8ThL7zN75zei3Y93rWMJ8=", + "pom": "sha256-8pQJk9w30k59Y44xX2ItT0kS1Ob8gOkQ+oqQe5z21eA=" + }, + "org/jetbrains/compose/ui#ui-util/1.8.0-alpha04": { + "module": "sha256-38CfOmAhhkWdmFrU8dCngZjXKMatWV44uimDAHZ+prY=", + "pom": "sha256-B2zeSirC6CxianbCa2ob+PmrGCHve//5qbpbPTxAxl0=" + }, + "org/jetbrains/compose/ui#ui/1.8.0-alpha04": { + "module": "sha256-k/S+3me2wuxyXAXSPgvXBXmlp9NLMla+L6taIH5LnOg=", + "pom": "sha256-2sOUh4F9TSH5g7gA7c+GLhHghZP++mLLqwxgdksIedY=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.20": { + "module": "sha256-LBPSZp00NWUMcd8t8VDbTl8QAZKj6B6XnnUrTeCVcxA=", + "pom": "sha256-AudGCweKYIs9brqmIBbZi5cSPtITgU7QorGL2r2+UzU=" + }, + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.20/gradle85": { + "jar": "sha256-CpCRRspmOsVVe9Gcwyum7Cbk6Wf11fDpU8iImxe3n3g=" + }, + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20": { + "module": "sha256-6NVkojvCA3s++xxbAP+3SuRPmXJFd+L8jYf/u8nLn7U=", + "pom": "sha256-oRA6cKb4/8EITdwIGyS6smpWRJcvnM0UG4mU2fUFRHg=" + }, + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20/gradle85": { + "jar": "sha256-ZnTyl1XTJq3cdWov3Kvyu2AvAABKDtLbZp2j306EgAY=" + }, + "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=", + "pom": "sha256-rIU9chaJ+vEV8RiBCjU2/CcvE1to0CdFOqpW6eY79wc=" + }, + "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { + "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", + "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" + }, + "org/jetbrains/kotlin#kotlin-build-statistics/2.1.20": { + "jar": "sha256-TSjxg6dsMKjKwg56P6hwVMLdHbiGSzyc04nhjdmX0x4=", + "pom": "sha256-OR9tc0uDTJG3qAHiI638c2tYDb3ODxOafkvUdknATKM=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": { + "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=", + "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { + "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", + "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.20": { + "jar": "sha256-bpSJbjIWA+O/6J/vAkeORNHWSj0l1J0GlIkv/AHGCs8=", + "pom": "sha256-EPseNeDocGdH6Og+ro+LQ0BrpmTkIB7J38ua99prQro=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.20": { + "jar": "sha256-xUoAcYyMDj7oWL9Cdxx/QBxePBc4hh4Y6VNjcQQvobM=", + "pom": "sha256-InQE6sbYCbwNlN74kzbf332afVOHkqI01Svbr8Kuha8=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.20": { + "jar": "sha256-3jtUI9j7+G6ivRM01AG8SqhOKOxIlFlS0RwAsQsUArY=", + "pom": "sha256-xgNdI3KARTSALDfOVU6MjLqq6EUUp7rWzAlkJNjySUU=" + }, + "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.1.20": { + "jar": "sha256-z4dQOryWkU8WnJ7WHTCgl1eMJrDaJmb90XLsfP8vrF0=", + "pom": "sha256-9CTFzFuaSpzOgM4GY2kMA4jf9yPI8fQ4vdk0q2F5JYA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.1.20": { + "jar": "sha256-NjCjAYLGNXDrUZrmWqqUGSF9utCBT+3kLI3ecERlpMY=", + "pom": "sha256-+qpgvkJw6RSbWUOSZjlhkr60f/XjpAmF3u3FTlkXItI=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.20": { + "jar": "sha256-2eg98dhHogG6PAFqeGztCRvpUDmX0J9qnPF5buSJ83Q=", + "pom": "sha256-sdOMCv1uHRXEjBxdFWzmBXj0MxNr7FI/TrGZ968/gik=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": { + "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=", + "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": { + "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=", + "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=", + "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20/gradle85": { + "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.20": { + "jar": "sha256-6vELILujkjoH+PsYL7jNVlaZ4Vfuc9Elma8fXKuiUEA=", + "pom": "sha256-PdYeaTbcUQBs5MN+/+Q+/hQAuEHgnsSx7kqU9rkZOCo=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.20": { + "jar": "sha256-APb4Q6vJMNDGGrtOPjAsjRd2EpH5srwlhv4SsMuXXq0=", + "module": "sha256-td7wBfIpohsq1pJt9wjPhLqe+8TsGcY16/5baTcx2wg=", + "pom": "sha256-CjCxRdSY1H2yVdDUzWp3hMXx+QyL+YgsupWCKjvzMHA=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.20": { + "jar": "sha256-1jf7pHCzv3E7CmXmcXrV3QOocl/MlFMCiUc6smtC6Cs=", + "module": "sha256-WJm5fnqbFx5sBeVJziqbo8ddJZMVnUsrAVZkFLVoUWo=", + "pom": "sha256-18CRV8ehutuNrk6Jv54N9FRbBM0DqqQJZqJm87hG0sM=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20": { + "module": "sha256-6Ue1RPTNCcFQr9h5G70yoxN92uMEWn1TlL6lCaq5bFc=", + "pom": "sha256-H2OowlwTZmlled2VLz639CoKSns/avaRpIIjEwb82sk=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20/gradle85": { + "jar": "sha256-+wFuZDtY4Koq7IkRDq8U54s3aMFX8lQ0V5X9aqEEk+s=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": { + "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=", + "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.20": { + "jar": "sha256-EyGYEVmGCVkEsMsB76rh2BJJZB75FJ4Fs0T4ZKrpdfQ=", + "pom": "sha256-LZayVvD8kesSvOtuR2HhPXAf8TU/BZL8VymI2uai0Zs=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.0.0": { + "jar": "sha256-rY8cfbxaxG9cvS0uXeOcVsnbZd195xaoTgHOIIdYruY=", + "pom": "sha256-PyOxTvYPHkQ9bUHzmYPiOKpkiVjOHYmLarOcx8kYIGY=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.1.0": { + "jar": "sha256-uNOpJXS6HfxJvfIFJW0e3gZkFIyxUKti+qhyteG7RjI=", + "pom": "sha256-G8hTyAjj0o3D8Gf2Z/ZSSro0YWl6+VJu/et09Ulojdg=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.1.10": { + "jar": "sha256-2obtTzqMiIVZLWuKppH7hge0nzdzyLvQjDsUoxsU0v0=", + "pom": "sha256-OZxrMFNXrzLnNKHaSNydMR73ZhVSBR9IHHJPBeTNwBw=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": { + "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=", + "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.9.20": { + "jar": "sha256-SbZvmonVD9KVTC6K6sgOT0iLCgkyKiXvrWJhV2cT3A8=", + "pom": "sha256-lCtehgLTF+wTZS8cAiIFK7kIF/KM9v6dRxEvCbPo5n0=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.9.24": { + "jar": "sha256-plFmRFu4XvgWzeEnJ5/gAX0rfMQ5s7lyOQ4bc21k6Uw=", + "pom": "sha256-CghcMAUb1tSrdlrVoMUXnEE7NfdBjyiDFy+9m6GrzMk=" + }, + "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { + "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", + "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" + }, + "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-x88d6VXfIqFihyImvQZ3yaDItmMKLi1z0R0UfNDFO3M=", + "pom": "sha256-cWKsEOFFTpJ2c7FcrQMp2jgvt1jmVPWfy0AHRZ2eyEE=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": { + "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", + "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/2.1.20": { + "jar": "sha256-rkOX+7OqKhraCSkOdTu6maQRRUiXfDEVUmuZWPTLGgQ=", + "pom": "sha256-D4O1qQFWxhpv8QlVey2YjicQ7j++n0pCV6bqDYdIw9Y=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { + "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", + "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/2.1.20": { + "jar": "sha256-X9v2rnIjfOM11gPrEsSbCbycGjPAwB8dYud/8zZjzvs=", + "pom": "sha256-H3dwkEXdkF63UFqUKA037HV/CHCc/p86dKunO7+Z95s=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { + "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", + "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.20": { + "jar": "sha256-PU93KyOEFGUAF+l0YiVrfE1e36EBPL9Ud1c+sawuKIQ=", + "pom": "sha256-D/9/8dO/qczj77tNs4mJwmilHrZ/ge/QMRuKZGGLhak=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { + "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", + "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.20": { + "jar": "sha256-9mXXCxoIN/86Dve+xPxdn+1n6nXkaX3hWOtR8epQHD8=", + "pom": "sha256-tjmuINh6gV4wTd0goOTEk34Ttfx6Qme14VwOWQIphmU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { + "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", + "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.20": { + "jar": "sha256-afRXrKuYNkwOtXjEl+DDypMLjPuCvndASdoEzeOAh/c=", + "pom": "sha256-PERTORE37EVcdL5Jb3HZpJhpbSVJvmT1mmBkfO7iVT0=" + }, + "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.1.20": { + "jar": "sha256-5pZQZxDSxI0BfMiczB6kkQF5lXcJK3Ah/q2pX/Yv1X8=", + "pom": "sha256-Al1rBx59fPPsennw0/5He9Ydveir9ZbYn41DL3wBmCU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.0": { + "module": "sha256-K5pa54X4UTqT+M7D9uXgf4sXZvhJezpIfzRBolHWdWM=", + "pom": "sha256-Sp2nqeUpW9VC1YY8rgNfevnKEB8iXEoIkcPS343CqA0=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.10": { + "module": "sha256-fgul3UlZnOJ2woa+M0hY8lEoSiD3bbm8D12g+8mbtfU=", + "pom": "sha256-u8xfrT9+3ktGnUnbpsA+GZMTNlW16BcTteahvt0c60I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.20": { + "module": "sha256-lNCtKyMZuFxANRz57nB32hLdOFA5LmzxCj/oFZ+8c/c=", + "pom": "sha256-1iLjAAVmBil0Qmj6iRKPt97U1C4XTOsIH2f3BWrJqLs=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=", + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.20": { + "jar": "sha256-xUUdZ6J/M6/QmRPGfhzro4l65wiEsk7w/3EVflW2CGU=", + "pom": "sha256-AS4cVe1q3kF7y4JBEuvqaCrWJd++4WCFw3nM+hT68DM=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.24": { + "jar": "sha256-tmmbhQugeJ8ukEJ5zYvce+qRMP/RV826AB/HQl2KR7c=", + "pom": "sha256-RYapN9W8vDqzBCwECaHHKWFLy6PHpylvJS1ibuNzh9Q=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.1.10": { + "jar": "sha256-L4dvs1tz2YBuyFAHAyZavL1ap8PIH0GiylSoVahkmzQ=", + "pom": "sha256-6yvOL/52LUQE2Or+lYF3XLxbkLsfl/0xZLpyJRfTvsY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.20": { + "jar": "sha256-+DP8yU8LscMbnni9S9p+oj9Xn/NAiuGpTi61dHCGoqs=", + "pom": "sha256-o7B96wkfKu1Z1lWYhPRPmc/135ufo1okvNa4sGnP9I0=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.24": { + "jar": "sha256-W1u/s+EYS14TMXw9QiN/okrdRDsud4GWHuozTbE2rbE=", + "pom": "sha256-BuBt70n5aq9uXD7EKDauWdbi2mJUcAkUKBZ1Z53J8qU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.1.10": { + "jar": "sha256-sJJg6kgo3Gz8Z9JhJ9rOOK4ru+ilZdLQKXJegcLSWOw=", + "pom": "sha256-YGyBfFx/1hFnDVWVK1dz+lxo8OPNJyelXe07GzzKLYc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.20": { + "module": "sha256-3Mql0xVHD6s5IFAohru4Xy2myGECxl2cBEEFRO7bIBk=", + "pom": "sha256-43IWpzLI6Bqf0FtN2JLDDKwMrXtOP9ovlmP0jogHQcA=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { + "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", + "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.0": { + "jar": "sha256-1vkbew8wbMopn+x0+3w05IdNb17FuSWgtN4hkB4RnD8=", + "module": "sha256-3PvI6L8yzWen763ZHTEVK86YcJEdbsUIePT9tuA+cOI=", + "pom": "sha256-E05IwXeWwcECfsvmyfHHXHkvU1mHq4nh4d2kP4w2b14=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.10": { + "jar": "sha256-XyrByo3Is3o/QxTnFtNpaevwInp1GB0yaZ0Kj2RbHCE=", + "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=", + "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.20": { + "jar": "sha256-G8x06M6E4sJeqv3hDxJINJzOMGK242l4y+7GENsekwo=", + "module": "sha256-VdKW5FRF9siGmbCJZwbqlVCvh62Uhz3BO2W+u9VmCm8=", + "pom": "sha256-Z1DheZ7lAgd9rlw9WZeW9mdgb2DTXpXLeQRI3HkStAs=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": { + "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=", + "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.1.20": { + "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=", + "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM=" + }, + "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.20": { + "jar": "sha256-8tXmhHFbkgtghJaObDPIuwWwtrl5GYAOLyIdlBgkDH0=", + "pom": "sha256-hCdVuVwx20vbks9tQshUGhcB+ivc8lIahwa8sDKgoZc=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/2.1.20": { + "jar": "sha256-/3nFsObkLZIOuxx2uhDMLdvyJOgFZFqO6sreSRbiqs4=", + "pom": "sha256-ps3TjXdd/QfQe9FZ00LPegqWg4qH50guIgxjrtluEoA=" + }, + "org/jetbrains/kotlin/native/cocoapods#org.jetbrains.kotlin.native.cocoapods.gradle.plugin/2.1.20": { + "pom": "sha256-Ud4AgMpY7sAcC9faZsz6yM6cDwasE2UJDIAuZ1j9hTg=" + }, + "org/jetbrains/kotlinx#atomicfu-gradle-plugin/0.27.0": { + "jar": "sha256-Ol911FKwg/txpx9fTjcvZH5kIguP1fXyk4pBDj4ESXc=", + "module": "sha256-HWkjLkplqQUDI3mHA4Gs0ns/IqI4dVPgK+vhpVMA5sA=", + "pom": "sha256-I1EtRWDRpL/Rm2h1wg9DE85ep20RhyUwI4yx58oxNDE=" + }, + "org/jetbrains/kotlinx#atomicfu-jvm/0.27.0": { + "jar": "sha256-K2hGQXAHCosIXYpyJMfAAtvWXqFOH4uXqWBRFaJS9/s=", + "module": "sha256-zi6Gt1JxP/5nAUvdHhLvKQxwLom/rLh6sn+/3X4Tusk=", + "pom": "sha256-WyUzVczAbyUcuFKuBHKkLV+9TQKZWebXgj6dE56gPZk=" + }, + "org/jetbrains/kotlinx#atomicfu-transformer/0.27.0": { + "jar": "sha256-Mun9/FpwR6fnVEc4/YmRFLUnp6RiTfhXAnsehwIAeOw=", + "module": "sha256-eKfmR1/c4aDr+A62Mk5w0km24a/CgrdQPcw8pCk+yMg=", + "pom": "sha256-CiaCvpkn5FD+21SnYt9RxyUXW8f7A8ckPWDy8ckBQrk=" + }, + "org/jetbrains/kotlinx#atomicfu/0.27.0": { + "module": "sha256-umecB1fjmeaKmfl9c4QosvtwB3F93/Dx3uuoYrr0RpA=", + "pom": "sha256-e3Fbn9t9MTr8hRjV/Kv0LrSfzNbNf/RHNqEF6AmUBdg=" + }, + "org/jetbrains/kotlinx#kotlinx-collections-immutable-jvm/0.3.8": { + "jar": "sha256-cumpsAA+xSVLY4GG98oWdbCABr3eTJxMWJlwNCzNLnc=", + "module": "sha256-ak06jrdCIbQ7CP4hv5Vcq9aROJd9z3j4b9DvYiC3Efc=", + "pom": "sha256-LE3NVjaKtStQKwiwLC8dOMBpV5BC9ZeanMEGzkA7u78=" + }, + "org/jetbrains/kotlinx#kotlinx-collections-immutable/0.3.8": { + "module": "sha256-mO+84WKQhF+zCN6UK5GjA4ZYuhUzoNL3eIO5bsqRQAI=", + "pom": "sha256-3IVbPjOh9u/AP72/DZlRG3Swh+lplfAEUfvyyJrgpHc=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.1": { + "pom": "sha256-nL0EumPnOZhWdFcT4xLS8hYaHUTtpQbe1HyNVtr4Rh8=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { + "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.1": { + "jar": "sha256-BpxZiGMyMOB07A05Mh7DzapFR8SekLqTbGPY/JHIwA0=", + "module": "sha256-GN1lRl7IDQ5uXXGBi/EZLvSBfPXSASgrW5sbcTrHlpo=", + "pom": "sha256-f5AURlw6uheoNXqJZcqcnKjJ4aBEfHrqEXxkB4CKUtY=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { + "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", + "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", + "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.1": { + "module": "sha256-y/1tFz4KXCmGr5U/ixzPKYAqrQnqympOkRQQj4rKyLE=", + "pom": "sha256-Ip7SIxgcPK8nt6wwHIFp3KLYYxkbcQ5hNVGlh5XANlU=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.0": { + "module": "sha256-FE7s1TZd4+MNe0YibAWAUeOZVbXBieMfpMfP+5nWILo=", + "pom": "sha256-yglaS/iLR0+trOgzLBCXC3nLgBu/XfBHo5Ov4Ql28yE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.10.1": { + "jar": "sha256-5fpnTj2mpw/hGI/A1l+GcFN5rto0xZy9ML0VwORlts8=", + "module": "sha256-Z53VZCkanbzH7lbmZCzzqdB7BXGWj9lN5BachzJ/i8U=", + "pom": "sha256-UqJfb2ZMxFkJQmTVEDOeVYOqyQJ/DqqqPXA1XHVQkkY=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-swing/1.10.1": { + "jar": "sha256-qOh6sO902a8KkWo3y3UtfCrrYhHyXWI3mYI1nJZWHdo=", + "module": "sha256-P8dvci/OUdZsWememwHmFMozLBpiW1j1/7H/ZvoBGgA=", + "pom": "sha256-pxygooWV1T8YLSaT9FWC0KsuhQYYe4azqQWNMUR4Y2c=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.10.1": { + "jar": "sha256-rD9FbJ4lw/wBVC3CCGVdBYPNN7X3LDWFYme3S9FmSrY=", + "module": "sha256-1Vy3uqS9VxhXovsAlq2pCDkpDPbzlw3hyGo3SusjhYI=", + "pom": "sha256-TvSo5xgZYDxXlcn4ejrRwLktoq61ANQ7TdfkHn6EoYk=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.8.0": { + "jar": "sha256-FTXMH0MjXYVm+NW8bRwR8HBBF+TlY/Ls5+aqPmhpXyA=", + "module": "sha256-HS0Zc6L0GowMEmPmCyXneS9ji4xV18ocbQZztkvlfac=", + "pom": "sha256-BtHlPqNm5to7FxkwV1+RYnzxnkUqTnqfDeMNLwQdZFE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.10.1": { + "module": "sha256-AkvK55oMK20YsLqRTJ9d4UW7+8nckZ8nD4lbLj34cVU=", + "pom": "sha256-ZpLE67CEkFdBfJclBfYjCNOoV62m66JGnTM40HX6JXM=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.8.0": { + "module": "sha256-DsPHX/2ZpqLfto8wfy8vcxQckz5Yt3sQTxyMrDr9U5Q=", + "pom": "sha256-NV8/pvBjDl6ZuHxywcQ4YgKin0lpFeOHWaOK3gsGkAQ=" + }, + "org/jetbrains/kotlinx#kotlinx-datetime-jvm/0.6.2": { + "jar": "sha256-ECdkkhEp4eRKdPQIt6C42sbRiSxgQuDkj4vbu/eMbS4=", + "module": "sha256-NU2xXaMv4YfblMbCNe96hDNrLdx5PQw3JEOZ320Kx9M=", + "pom": "sha256-OnOPkC80uNtLRGTRs9kj0mVuLKzEY2woadrFIO/Rbik=" + }, + "org/jetbrains/kotlinx#kotlinx-datetime/0.6.2": { + "module": "sha256-F5UTkzbHp4fwwvvyHSFc/1mRxx+AIZyjyiYOA0eIzCg=", + "pom": "sha256-6LX1lHxGTDyHzUJEdZ1odW/Db3pvZGQAFHGmXEX0z6U=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.6.0": { + "jar": "sha256-uqd6eD1wpmr4jWiYodSXHkqoTmKyZBgFc3m98J+1uto=", + "module": "sha256-Tw2oHhXO+zujubirjmHoaoLtZd2N3S46cF2Euybr/Oo=", + "pom": "sha256-dQpt9xYR1MMAN+mCfSOVSSkKRuDBQBBoi4FM2ZZyG8c=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.7.0": { + "jar": "sha256-6jimaw/0btgt3tnoHS3OcOX74DvWzFK0/IhpOB3qe30=", + "module": "sha256-D852CxW6wLkL7xvZDJfi0V+sQ6ZtwSCbSq7Jadk0Nv8=", + "pom": "sha256-mhfWfOIxynIhqWkS1WVtjRZ1gJ5FI/LDmupvs+o6bV8=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.6.0": { + "module": "sha256-aO+bxmrpVPRzxZ9R679Ywdewb9b/9zNd0/s9JPipOQA=", + "pom": "sha256-I1NofPyzbJCaW8T08LUj0wv2WuXI34CsxW6enFJb528=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.7.0": { + "module": "sha256-3NfGKkJ9279ezgt5jcEqD41VcSN/UScFEKUHIotjM3k=", + "pom": "sha256-b+eWaxTo7fC/rO+FfIiUpr9EtmFsbwK/7UoJMU7+0Zw=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.6.0": { + "jar": "sha256-QlI8gII9Me9Z+uQsklLvHTsRicqdPMOt/UAqKdBj5v8=", + "module": "sha256-tZuXjCxEJJpnRkGmlONaKs7LqBLah9NlpRZzQqjKU0c=", + "pom": "sha256-3DNkYsj1BEkGHNRdXLHI9oC+VEGqgQ6UQR/4GQmdT2s=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.7.0": { + "jar": "sha256-bt7cm+TYeK6oDH3WCfkb/Ef809NsyR/Q8/Mo+9ZlbI8=", + "module": "sha256-dDDspoloWorXVm2MgIIUpylQsdbwNjQd+MTYKah3Bsg=", + "pom": "sha256-I4nhfLeFp854BZ7v7yv5fpGCbCe4PMzhkbTkLtlfiBo=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core/0.6.0": { + "module": "sha256-FIX7aljyQWnRr3PEFDAiUKx4u0axpD4Csa4hILKhJPA=", + "pom": "sha256-QIZ+EY9KW7uz291WZ3DY8Yu07w02MtyE+WyZ+2vD6oE=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core/0.7.0": { + "module": "sha256-gTKXY+sZquO3OGcb7DFrkESEkcO/Unj24Q6kxwKS4iQ=", + "pom": "sha256-fu4E9DS9OmrRjhQFT0SH9DvKyQwDabBFA7FltzG+3Mo=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.3": { + "pom": "sha256-KdaYQrt9RJviqkreakp85qpVgn0KsT0Wh0X+bZVzkzI=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.0": { + "pom": "sha256-xD5IdSnM/RIJ66hlOrjolZggNGSq+/5fBEje2ZKHFQk=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.6.3": { + "jar": "sha256-KcghqNTiXL/k8s6WzdRSb2H49OaaE1+WEqNKgdk7ZfE=", + "module": "sha256-MpEE29NOS96QVhHUJ8dYTlPD+MQRg2+59pmsnbpbqmw=", + "pom": "sha256-K0qolJn8AbMNHBB1lmmOCvQ0BBLVQBnFAdm6ayk7oro=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.0": { + "jar": "sha256-08lOnYKbum4MTNOuR4pAhG3UnVR11nB4d76FOXav5BY=", + "module": "sha256-NzH80jhWGpCpdSs0hfHWNeAbRF5Kd4F9ewd/S50vQi0=", + "pom": "sha256-QVKRtvWbeTemcau136BLJyl811jLUQLNzHWUFJj5wDw=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.6.3": { + "module": "sha256-Nh6eMetylhdLdAhaxJ7dhKTzkAupQxpOQM0cI952oyg=", + "pom": "sha256-0tv2/BU2TIlp1qq24+zMdROZU/LMBXtzDjUmdGWztX4=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.0": { + "module": "sha256-mE2aqabpvMONfoNuqNAAsThyCH/GZY0NjWIldjPzlfE=", + "pom": "sha256-nVbnQWLOQn4MSetsuXUSR0Mq3PwukTw4KWY+27qr7hM=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-io-jvm/1.8.0": { + "jar": "sha256-q17I6kiBUZfEan359BimJ5H+kc2lAjuUHOTehy2BDME=", + "module": "sha256-/pQ5hti3/I7HoytonItHbDDM9KNbcKLEWxtffZ00BkM=", + "pom": "sha256-PbZlvwY1l3Inc9mKLQpqSps0FpeEFOnTYfICjTUc0yg=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-io/1.8.0": { + "module": "sha256-+3LQaky980DBOnBPywfUsWJ66NnDCtZnEwb6x1UnB7Q=", + "pom": "sha256-xgC76woBPRA7cbGCa+t0Sbnv/5x4Knl0JKoOdV+Cw0Q=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.6.3": { + "jar": "sha256-0yNBebz/GIbVPWfBHspH9/PPe2PDSdFpZfbbUbfz3Zo=", + "module": "sha256-InoqmtOMAQsQe8gFjNYVF32lqqhts399WNSdnJt/l9A=", + "pom": "sha256-eN9n0GTTuq8a9Ohi6YFGl3YpfGyHi7e/G0Ljky9vr48=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.0": { + "jar": "sha256-e3xEWIDO+U3EZPRzPaGzO5S+54gFBB6giuBuhQfkYg4=", + "module": "sha256-l+NZl/6prZY63lv0wDko/lOXS4JlIdSwP7+zyrAgiqo=", + "pom": "sha256-4CSBj4YiByqIM8DTmVd3Uet3ZJymO9DA/AYATWaRd6Q=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.6.3": { + "module": "sha256-gNHYf6CmO/+Dleo5EL2oDQnw9YNQTd6o7QB7x6hrTNQ=", + "pom": "sha256-KcIhdhjlMdfYMsyICupu0aj0B3PkN/WkHXC9FUaNPOM=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.0": { + "module": "sha256-lK/eU8GRw+Hge5+AiqF3f4YryKlbxQtGYozQkhnVaFg=", + "pom": "sha256-WAgq+Zc0Ah1bjbKcQ1sR1FyhGxwP14bHhFIsnSxxeVg=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-protobuf-jvm/1.8.0": { + "jar": "sha256-hWHBft8F4n6AKDDzuOnQrEoBhIxcM6eQMpMjgttxzjQ=", + "module": "sha256-wfxTEVd7TXf5mSZWiG2ZqcI6JfmoL8Ka1GkTai1e4fg=", + "pom": "sha256-c5L1fbU2xPK4BkfZQD9mho6mdHuoBFa9+0S/UNTdMY0=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-protobuf/1.8.0": { + "module": "sha256-C2UuSc1eykX730eSf6dH4dgsU8l8IcBSaozSeSAvyLY=", + "pom": "sha256-FGqb0rgoDpxfshb2oI9pSq4OYaroqFVB9leDfqf7QcA=" + }, + "org/jetbrains/skiko#skiko-awt-runtime-linux-x64/0.9.2": { + "jar": "sha256-1bqEsjiWPQTCXG6mfgbqhfjxIPY38iI7Jx/xmyCHago=", + "pom": "sha256-dgQjvLzTxvtYTM38ZmbILq0cjCePzc0hBw3drAh0WMg=" + }, + "org/jetbrains/skiko#skiko-awt-runtime-macos-x64/0.8.18": { + "jar": "sha256-czu+FuSlNbp4+zYYaaM20jfZXipSidJWnSlZudWeeGE=", + "pom": "sha256-yyEZbtoYT2eJZvn/23cBJe0POPoqYIBS7ObM+fLDjtw=" + }, + "org/jetbrains/skiko#skiko-awt/0.9.2": { + "jar": "sha256-4fgV9E9dr88S9nPNozVa5Zw5dUv5nzsR9tAP1wAVYUg=", + "module": "sha256-cRS/M68lkIkGDdO3c/8ew/0ZhGFmN1AXDR+ArDc7/D0=", + "pom": "sha256-u/8yFQDlUOusYZRHz8OFwTW3aYV6Jy+Wh8rdXnyBuXk=" + }, + "org/jetbrains/skiko#skiko/0.9.2": { + "module": "sha256-9bO/I9+wmkJel8IVGQUAdw5PvNU3BMSVHJQzhkibmYc=", + "pom": "sha256-gDnIMi9XqGWuacIkOKLhw8qTahFfCuPbLJYYoK79bxs=" + }, + "org/json#json/20231013": { + "jar": "sha256-DxgZLfKJEU4XqhoNCn+DcsyfXH5Pfjmtz4kG/nFPp9M=", + "pom": "sha256-xQBAI9OfVGNbNbvrQOIaKtVR/KDy41Cxzje9DnyypGY=" + }, + "org/jsoup#jsoup/1.18.1": { + "jar": "sha256-O7Ww7AKZir5FpR83185nwwaLTM1KtjyWWSnsUHTWTpE=", + "pom": "sha256-xN46hPu17vS9IpjW3pgcbNlyKHlQXINz4bZ/EdHK8n0=" + }, + "org/jspecify#jspecify/1.0.0": { + "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", + "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", + "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/jvnet/staxex#stax-ex/1.8.1": { + "jar": "sha256-IFIlSQVunlCqNe8LRFouR6U9Br4LCpRn1wTiSD/7BJo=", + "pom": "sha256-j8hPNs5tps6MiTtlOBmaf2mmmgcG2bF6PuajoJRS7tY=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mozilla#rhino/1.7.10": { + "jar": "sha256-OOswAM9WuMdVnuVYhmp2juvL8lQXRSLWQEt/B491wtQ=", + "pom": "sha256-PHy6D12ldR1ipVZ2iXp64jaHx6Hi++HUdMW8Wka5+bM=" + }, + "org/openani/anitorrent#anitorrent-native-desktop-jni/0.2.0": { + "jar": "sha256-9LiZUNc3YshQre6bkCHh4zA9ZnTCaKBuNIK5Ju99qLI=", + "module": "sha256-c2G9Lw8t3ztqV1yTQmYOyymBpgy5Y9AAvoWJ+i6EVQA=", + "pom": "sha256-iGZteZ475N+d0tVVZ/iISHzIsXd8Tcc9ba93z5uW/Og=" + }, + "org/openani/anitorrent#anitorrent-native-desktop/0.2.0": { + "jar": "sha256-xt6tovrFO46mUj29p3WXsSgAZnRhbxQPBN8jJkxtGqM=", + "module": "sha256-RZc7W63m6YC4b+7n2clkdwBN5SRb5FEVZ88X+3OOUsM=", + "pom": "sha256-hPy+1uzaX5/YloQvdcb+X7Ir3vV/hJD6aBmpY1slvb4=" + }, + "org/openani/anitorrent#anitorrent-native-desktop/0.2.0/linux-x64": { + "jar": "sha256-fExfhUPLpfnTcaElh9C8d3KjuDDvqUDNv/PJF2wbLKw=" + }, + "org/openani/anitorrent#anitorrent-native/0.2.0": { + "module": "sha256-ZWpbvwWi7WTW4Ej8hyxELlSDKv1+wZTUPYPY8LlzI8k=", + "pom": "sha256-fDLSHOpLWBoaqZy56RcVS3vr0x8L3FKQO+larWZSmYQ=" + }, + "org/openani/anitorrent#catalog/0.2.0": { + "module": "sha256-Fp+/oA0z4BUbxPomV8rnAyZ6xF6aQ92b7N7cSh1qyq4=", + "pom": "sha256-biSyM8rPd6AVOIxolBm3JV+kjGfQA4km2WE8pJPY3kI=" + }, + "org/openani/anitorrent/catalog/0.2.0/catalog-0.2.0": { + "toml": "sha256-3yKg8yGXTxBzOV2CstWaymNc11DvlO4E6h9zXzQZ9Nw=" + }, + "org/openani/jsystemthemedetector#jSystemThemeDetector/3.8": { + "jar": "sha256-X/eFF2nvc9yE+f6sNFteBOzgDEaMgTl4HIhUEZxPB+E=", + "module": "sha256-tNPURyLcLU+zp0XR3bPrI2KkCTxbwyQFXPR2947iSbs=", + "pom": "sha256-A9Q+KKmVsrk+45mKFLodgLiJsyAbdvV5ZlKhNzhDIBk=" + }, + "org/openani/mediamp#catalog/0.0.26": { + "module": "sha256-I16xb6VSWCPEXR00K6Pqe+1Ord4hoVegIdFJCjiw70I=", + "pom": "sha256-itzCsDj32fyeFUTVTKskJnG7J9I1ketiWnzmCOCjNfc=" + }, + "org/openani/mediamp#mediamp-api-desktop/0.0.26": { + "jar": "sha256-wq88zxU6os+DET2GQqnWf7IFQisk8nQfuOMm7yaRhxg=", + "module": "sha256-Robr2Hjhc9Mucq0MlPX9uDbPTGU37OM+EQMyCuyGCFM=", + "pom": "sha256-rYSUUSwrno45hElP5s65pi+HpfySFdniNZAgLsxFs5Y=" + }, + "org/openani/mediamp#mediamp-api/0.0.26": { + "module": "sha256-67z9qC1RG4iuQ4LkN3hZX8nU/RlqJdB5kgR4WZfdAV4=", + "pom": "sha256-/YHwjj6d4vOu5v9yr9ctEAV7J7aIQPtF+Nc5Zy5Z7MI=" + }, + "org/openani/mediamp#mediamp-compose-desktop/0.0.26": { + "jar": "sha256-oC7g3ItyOR0dT7B8L1ncqpQcYYmkC5CbbgKfmXBbCxQ=", + "module": "sha256-KUPXp03ZHWwJoFW9Yv3G7qZ6KVnzu9kXaHko0sCwa1M=", + "pom": "sha256-gCRVtSffFrskMft9QoPlP00xAkx5fO0RufLK6F+XDPQ=" + }, + "org/openani/mediamp#mediamp-compose/0.0.26": { + "module": "sha256-GourAD3L6fbG/2vk6sAcWFbAixi8JMT8VS4hLM5vKGg=", + "pom": "sha256-kDFj3l1wpEcOGnBM5+auo4ir1muIHfb9NW9PaZ8exG8=" + }, + "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.26": { + "jar": "sha256-CmvsMdXJcrr1UcbNQVI8OyPqwxo9pLKYoa1ye5k0764=", + "module": "sha256-5IKmn1mlfajGIvv66eSr8SBOU+V5dcndh+FlU8gf5nw=", + "pom": "sha256-rWfE+eWilDOkDWU2xLzA+qv2x8/dF+Qwhet7lGVTnd0=" + }, + "org/openani/mediamp#mediamp-source-ktxio/0.0.26": { + "module": "sha256-YT7EHwxB69StjLsu3EmPYhb4MWHJLxLfJ7CSy+X7INk=", + "pom": "sha256-Fd7cpjCUJnGnofv2uq3DqePrH00ahYT+f96hVi3Grlc=" + }, + "org/openani/mediamp#mediamp-vlc-compose/0.0.26": { + "jar": "sha256-FpRyBToA2qz5SNOQPmTDKr+RO/AZuco60pGvUHueTLQ=", + "module": "sha256-0RYTOM3zHsvu9VY9GIaIUYXyZhIWJGh+qVbt/QuSoLY=", + "pom": "sha256-i1WxsUV+u/uKjTURro7eR08gU55kI2G+v31g48BCTpc=" + }, + "org/openani/mediamp#mediamp-vlc/0.0.26": { + "jar": "sha256-6kpP5IZcVMPP+YlO5zSgYaMhi0LpbLGSarofI17Qviw=", + "module": "sha256-19aWYPuBD+jGAxH+vYjlUUmqGnl+XGs+jguNlO3724M=", + "pom": "sha256-gO7O6O/LGGPEvgOCoQzgcrqAdSWesJqc223ZVlC2yXg=" + }, + "org/openani/mediamp/catalog/0.0.26/catalog-0.0.26": { + "toml": "sha256-OuAXWWvPwKdSS1Xx4zrv4tcOkzYl5BpsbwQb5+gX88g=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-analysis/9.6": { + "pom": "sha256-+j+ZUCHP9PQTkwbmz/7uoHU5EGRA0psZzAanpjahOFA=" + }, + "org/ow2/asm#asm-analysis/9.7": { + "jar": "sha256-e8a8vCE3mUigyMRn+w+GQgbluBj2vAtUaHL1yflBVW8=", + "pom": "sha256-nDMIDry2Ma5Pd+ti7We/xAy4cujP0Fishj5EXB3Zc98=" + }, + "org/ow2/asm#asm-commons/9.6": { + "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w=" + }, + "org/ow2/asm#asm-commons/9.7": { + "jar": "sha256-OJvCR5WOBJ/JoECNOYySxtNwwYA1EgOV1Muh2dkwS3o=", + "pom": "sha256-Ws7j7nJS7ZC4B0x1XQInh0malfr/+YrEpoUQfE2kCbQ=" + }, + "org/ow2/asm#asm-tree/9.6": { + "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + }, + "org/ow2/asm#asm-tree/9.7": { + "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=", + "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw=" + }, + "org/ow2/asm#asm-util/9.6": { + "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4=" + }, + "org/ow2/asm#asm-util/9.7": { + "jar": "sha256-N6ZBTTZkGXPxrxBJN8ldbZIbLdtNYSxmxanysT/BQhE=", + "pom": "sha256-XQFNjIcNSHGCW9LdtVZ7Ie9trI7Ei7uNu0ZbCzor9FI=" + }, + "org/ow2/asm#asm/9.6": { + "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", + "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + }, + "org/ow2/asm#asm/9.7": { + "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=", + "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-api/1.8.0-alpha2": { + "pom": "sha256-q7TTRvEsRpktok1TctybilWE2+hXbAlUkpId+iFpsEo=" + }, + "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" + }, + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/slf4j#slf4j-parent/1.8.0-alpha2": { + "pom": "sha256-nWWHTIet1peG5j/+ncT025AuB86ODQmzlRqZ46ptLCg=" + }, + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" + }, + "org/slf4j#slf4j-simple/1.8.0-alpha2": { + "jar": "sha256-ObJOKXTUdzen28wQKUiyzOcb0wNUEKnRb5gRhQhgtcI=", + "pom": "sha256-rqEymqts7JmjCCpSzd/IKFTxEyjspEEpGkhMHUCuNCQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.24": { + "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", + "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/tensorflow#tensorflow-lite-metadata/0.1.0-rc2": { + "jar": "sha256-LComT4QkmMNtNNKnuRNCSQ2alihiyFuqwazVTsL8ptk=", + "pom": "sha256-mk9eVnQ2bBVskDkWYvA+18WXHWqmODLfdKJx2m/4LpY=" + }, + "org/xerial#sqlite-jdbc/3.41.2.2": { + "jar": "sha256-DNq0EJR+BLZ0Pfmc8VQyZ93RBzV9b3aUjRRb5ZD9SX0=", + "pom": "sha256-rhGjsR3LrBtkA2ieP9jYKyzupV6C2/xLsyrt7fjMrI4=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + }, + "tech/annexflow/compose#constraintlayout-compose-multiplatform-jvm/0.4.0": { + "jar": "sha256-xKVyQqdp1fCQB2UuS6gQcYmKZTInhQjD2TBn/0Ei6v0=", + "module": "sha256-TPx/6DMO+jmovVcqPHueF7WicqeBhBNKbvWbSnPRXgc=", + "pom": "sha256-nQULYmnCFV2QxFBxHWiJMIrPIvvW5yPnI4JZfoRfF9Y=" + }, + "tech/annexflow/compose#constraintlayout-compose-multiplatform/0.4.0": { + "module": "sha256-+Vs8lwmJ+y8cr2GN1AsbB4b1NC6hIESyTUH4TealwDY=", + "pom": "sha256-vb7fI+JUSZUrzLJYPx60FY9Dm9Zq2Wov9WJFoLdQvBE=" + }, + "uk/co/caprica#vlcj-natives/4.8.1": { + "jar": "sha256-9Hzvkd/fM1YRttEZRcnReU6FgRs4hMH9MfntdqsZ2lA=", + "pom": "sha256-pnZ3QHPk7j14LkcSlnmHf318CucundSwQCXVZnIpLtw=" + }, + "uk/co/caprica#vlcj/4.8.2": { + "jar": "sha256-ME1YXngL6HZbqk+oOzdsIZIHifnlcK7PiIkS1A7tq7U=", + "pom": "sha256-73L1ioRac36UiwFSE9tItp+cUTf3O1B8/ZeOVFxbIAk=" + } + } +} diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix new file mode 100644 index 000000000000..0998722307b0 --- /dev/null +++ b/pkgs/by-name/an/animeko/package.nix @@ -0,0 +1,256 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gradle, + jetbrains, + autoPatchelfHook, + fontconfig, + libXinerama, + libXrandr, + file, + gtk3, + glib, + cups, + lcms2, + alsa-lib, + libGL, + libvlc, + libidn, + pulseaudio, + ffmpeg, + libva, + libdvbpsi, + libogg, + chromaprint, + protobuf_21, + libgcrypt, + libdvdnav, + libsecret, + aribb24, + libavc1394, + libmpcdec, + libvorbis, + libebml, + faad2, + libjpeg8, + libkate, + librsvg, + xorg, + libsForQt5, + libupnp, + aalib, + libcaca, + libmatroska, + libopenmpt-modplug, + libsidplayfp, + shine, + libarchive, + gnupg, + srt, + libshout, + ffmpeg_6, + libmpeg2, + xcbutilkeysyms, + lirc, + lua5_2, + taglib, + libspatialaudio, + libmtp, + speexdsp, + libsamplerate, + sox, + libmad, + libnotify, + taglib_1, + zvbi, + libdc1394, + libcddb, + libbluray, + libdvdread, + libvncserver, + twolame, + samba, + libnfs, + flac, + writeShellScript, + nix-update, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "animeko"; + version = "4.10.1"; + + src = fetchFromGitHub { + owner = "open-ani"; + repo = "animeko"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sFEq6tJfADH5x8+wdQ9T89awT7/Qx2RV5r+cND3J0iw="; + fetchSubmodules = true; + }; + + # copy currentAniBuildConfig from upstream release asset to local.properties + postPatch = '' + echo "jvm.toolchain.version=21" >> local.properties + echo "ani.dandanplay.app.id=2qkvdr35cy" >> local.properties + echo "ani.dandanplay.app.secret=WspqhGkCD4DQbIUiXTPprrGmpn3YHFeX" >> local.properties + echo "ani.sentry.dsn=https://e548a2f9a8d7dbf1785da0b1a90e1595@o4508788947615744.ingest.us.sentry.io/4508788953448448" >> local.properties + echo "ani.analytics.server=https://us.i.posthog.com" >> local.properties + echo "ani.analytics.key=phc_7uXkMsKVXfFP9ERNbTT5lAHjVLYAskiRiakjxLROrHw" >> local.properties + echo "kotlin.native.ignoreDisabledTargets=true" >> local.properties + sed -i "s/^version.name=.*/version.name=${finalAttrs.version}/" gradle.properties + sed -i "s/^package.version=.*/package.version=${finalAttrs.version}/" gradle.properties + substituteInPlace gradle/libs.versions.toml \ + --replace-fail 'antlr-kotlin = "1.0.2"' 'antlr-kotlin = "1.0.3"' + ''; + + gradleBuildTask = "createReleaseDistributable"; + + gradleUpdateTask = finalAttrs.gradleBuildTask; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + silent = false; + useBwrap = false; + }; + + env.JAVA_HOME = jetbrains.jdk; + + gradleFlags = [ "-Dorg.gradle.java.home=${jetbrains.jdk}" ]; + + nativeBuildInputs = [ + gradle + autoPatchelfHook + ]; + + buildInputs = [ + fontconfig + libXinerama + libXrandr + file + shine + libmpeg2 + gtk3 + glib + cups + lcms2 + alsa-lib + libidn + pulseaudio + ffmpeg + faad2 + libjpeg8 + libkate + librsvg + xorg.libXpm + libsForQt5.qt5.qtsvg + libsForQt5.qt5.qtbase + libsForQt5.qt5.qtx11extras + libupnp + aalib + libcaca + libva + libdvbpsi + libogg + chromaprint + protobuf_21 + libgcrypt + libsecret + aribb24 + twolame + libmpcdec + libvorbis + libebml + libmatroska + libopenmpt-modplug + libavc1394 + libmtp + libsidplayfp + libarchive + gnupg + srt + libshout + ffmpeg_6 + xcbutilkeysyms + lirc + lua5_2 + taglib + libspatialaudio + speexdsp + libsamplerate + sox + libmad + libnotify + zvbi + libdc1394 + libcddb + libbluray + libdvdread + libvncserver + samba + libnfs + taglib_1 + libdvdnav + flac + ]; + + autoPatchelfIgnoreMissingDeps = [ + "libmpcdec.so.6" + "libsidplay2.so.1" + "libresid-builder.so.0" + "libsrt-gnutls.so.1.5" + "liblua5.2.so.0" + "libspatialaudio.so.0" + "libdc1394.so.25" + "libx265.so.199" + "libdca.so.0" + "liba52-0.7.4.so" + "libFLAC.so.12" + ]; + + dontWrapQtApps = true; + + doCheck = false; + + installPhase = '' + runHook preInstall + + cp -r app/desktop/build/compose/binaries/main-release/app/Ani $out + chmod +x $out/lib/runtime/lib/jcef_helper + substituteInPlace app/desktop/appResources/linux-x64/animeko.desktop \ + --replace-fail "icon" "animeko" + install -Dm644 app/desktop/appResources/linux-x64/animeko.desktop $out/share/applications/animeko.desktop + install -Dm644 app/desktop/appResources/linux-x64/icon.png $out/share/pixmaps/animeko.png + + runHook postInstall + ''; + + preFixup = '' + patchelf --add-needed libGL.so.1 \ + --add-rpath ${ + lib.makeLibraryPath [ + libGL + libvlc + ] + } $out/bin/Ani + ''; + + passthru.updateScript = writeShellScript "update-animeko" '' + ${lib.getExe nix-update} animeko + $(nix-build -A animeko.mitmCache.updateScript) + ''; + + meta = { + description = "One-stop platform for finding, following and watching anime"; + homepage = "https://github.com/open-ani/animeko"; + mainProgram = "Ani"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ emaryn ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode + ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/an/ankama-launcher/package.nix b/pkgs/by-name/an/ankama-launcher/package.nix index 30df54b188ce..1d8e7cf9720a 100644 --- a/pkgs/by-name/an/ankama-launcher/package.nix +++ b/pkgs/by-name/an/ankama-launcher/package.nix @@ -5,15 +5,15 @@ }: let pname = "ankama-launcher"; - version = "3.12.38"; + version = "3.12.39"; # The original URL for the launcher is: # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL. # To update the client, head to web.archive.org and create a new snapshot of the download page. src = fetchurl { - url = "https://web.archive.org/web/20250325223011/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; - hash = "sha256-psN7aJQ19s4dYI1s/o6mma32g9++wKZyINDpNo3/q+U="; + url = "https://web.archive.org/web/20250413180128/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; + hash = "sha256-25x+x5Y0pIxvJyjbctt9weCEiH0UlqGbGM7/RKkyHXA="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/an/annextimelog/package.nix b/pkgs/by-name/an/annextimelog/package.nix index da260dbce7ba..7306ad674574 100644 --- a/pkgs/by-name/an/annextimelog/package.nix +++ b/pkgs/by-name/an/annextimelog/package.nix @@ -5,37 +5,29 @@ fetchPypi, }: -let - tzdata = python3.pkgs.tzdata.overrideAttrs rec { - version = "2023.4"; - - src = fetchPypi { - pname = "tzdata"; - inherit version; - hash = "sha256-3VTJTylHZVIsdzmWSbT+/ZVSJHmmZKDOyH9BvrxhSMk="; - }; - }; -in python3.pkgs.buildPythonApplication rec { pname = "annextimelog"; - version = "0.14.0"; + version = "0.15.0"; format = "pyproject"; src = fetchFromGitLab { owner = "nobodyinperson"; repo = "annextimelog"; rev = "v${version}"; - hash = "sha256-+3PkG33qKckagSVvVdqkypulO7uu5AMOv8fQiP8IUbs="; + hash = "sha256-RfqBtbfArFva3TVJGF4STx0QTio62qxXaM23lsLYLUg="; }; - nativeBuildInputs = - with python3.pkgs; - [ - setuptools - wheel - poetry-core - ] - ++ [ tzdata ]; + pythonRelaxDeps = [ "rich" ]; + + nativeBuildInputs = with python3.pkgs; [ + unittestCheckHook + setuptools + wheel + poetry-core + tzdata + ]; + + unittestFlags = [ "-vb" ]; propagatedBuildInputs = with python3.pkgs; [ rich diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index eedaf4b991f8..d6abffa3745e 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -15,7 +15,7 @@ libxml2, cmake, exiftool, - openexr_3, + openexr, glib, python3Packages, perlPackages, @@ -71,20 +71,23 @@ let src = fetchFromGitHub { owner = "AOMediaCodec"; repo = "libavif"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs="; }; + + patches = [ ]; + doCheck = false; }; in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2025-03-18"; + version = "0-unstable-2025-03-27"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "dd6127b7324f012abbdda55a56af4bcd061f0f83"; - hash = "sha256-RNYs40UcfLlkqdf8vRjAzGDYvIMjxTNdamc9kt0Eg1I="; + rev = "62f9a4c56b02deca9fda4aff4392e4f44dea379c"; + hash = "sha256-T9go14/wMJbOzKjOnRzzmeklFPQMbrTUnXyPlVahpkQ="; fetchSubmodules = true; }; @@ -147,7 +150,7 @@ stdenv.mkDerivation { libxkbcommon libxslt libXtst - openexr_3 + openexr openjpeg osm-gps-map pcre diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix index d7793812a0d3..2afd42a5fe1c 100644 --- a/pkgs/by-name/an/ansi/package.nix +++ b/pkgs/by-name/an/ansi/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "ansi-escape-sequences-cli"; - version = "0.1.4"; + version = "0.2.0"; src = fetchCrate { inherit pname version; - hash = "sha256-KGPlNXkF16VdoOb3tg3nsQRdtgU83z7ibPy965bvvDk="; + hash = "sha256-15C389g4PrI8Qg25B1LxFgb7gkABw0q0O5RDg3YTv3w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-r2dZ3io8YRWE1BJQ+gM5uwhz56RgvjHvgmARnHVsQCA="; + cargoHash = "sha256-u7BfevNT3f7YVFke9BzHK/LHHYJZlGTYyg0dENc1pVs="; meta = { description = "Quickly get ANSI escape sequences"; diff --git a/pkgs/tools/admin/ansible/doctor.nix b/pkgs/by-name/an/ansible-doctor/package.nix similarity index 100% rename from pkgs/tools/admin/ansible/doctor.nix rename to pkgs/by-name/an/ansible-doctor/package.nix diff --git a/pkgs/tools/admin/ansible/later.nix b/pkgs/by-name/an/ansible-later/package.nix similarity index 100% rename from pkgs/tools/admin/ansible/later.nix rename to pkgs/by-name/an/ansible-later/package.nix diff --git a/pkgs/by-name/an/ansible-lint/package.nix b/pkgs/by-name/an/ansible-lint/package.nix new file mode 100644 index 000000000000..6a7cf6d2ae9d --- /dev/null +++ b/pkgs/by-name/an/ansible-lint/package.nix @@ -0,0 +1,100 @@ +{ + lib, + python3Packages, + fetchPypi, + ansible, + writableTmpDirAsHomeHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "ansible-lint"; + version = "25.4.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "ansible_lint"; + hash = "sha256-8vKzGtGZklsjQ/ZgVS+5Rolw8WwsXVfan+rnDsTuyn0="; + }; + + postPatch = '' + # it is fine if lint tools are missing + substituteInPlace conftest.py \ + --replace-fail "sys.exit(1)" "" + ''; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + dependencies = with python3Packages; [ + # https://github.com/ansible/ansible-lint/blob/master/.config/requirements.in + ansible-core + ansible-compat + black + filelock + importlib-metadata + jsonschema + packaging + pyyaml + rich + ruamel-yaml + subprocess-tee + wcmatch + yamllint + ]; + + pythonRelaxDeps = [ "ruamel.yaml" ]; + + # tests can't be easily run without installing things from ansible-galaxy + doCheck = false; + + nativeCheckInputs = + with python3Packages; + [ + flaky + pytest-xdist + pytestCheckHook + ] + ++ [ + writableTmpDirAsHomeHook + ansible + ]; + + preCheck = '' + # create a working ansible-lint executable + export PATH=$PATH:$PWD/src/ansiblelint + ln -rs src/ansiblelint/__main__.py src/ansiblelint/ansible-lint + patchShebangs src/ansiblelint/__main__.py + + # create symlink like in the git repo so test_included_tasks does not fail + ln -s ../roles examples/playbooks/roles + ''; + + disabledTests = [ + # requires network + "test_cli_auto_detect" + "test_install_collection" + "test_prerun_reqs_v1" + "test_prerun_reqs_v2" + "test_require_collection_wrong_version" + # re-execs ansible-lint which does not works correct + "test_custom_kinds" + "test_run_inside_role_dir" + "test_run_multiple_role_path_no_trailing_slash" + "test_runner_exclude_globs" + "test_discover_lintables_umlaut" + ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ]; + + meta = { + description = "Best practices checker for Ansible"; + mainProgram = "ansible-lint"; + homepage = "https://github.com/ansible/ansible-lint"; + changelog = "https://github.com/ansible/ansible-lint/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sengaya ]; + }; +} diff --git a/pkgs/by-name/an/ansible-navigator/package.nix b/pkgs/by-name/an/ansible-navigator/package.nix index 92583af36043..0fa8e99a50f9 100644 --- a/pkgs/by-name/an/ansible-navigator/package.nix +++ b/pkgs/by-name/an/ansible-navigator/package.nix @@ -7,7 +7,7 @@ }: python3Packages.buildPythonApplication rec { pname = "ansible-navigator"; - version = "25.1.0"; + version = "25.4.1"; pyproject = true; disabled = python3Packages.pythonOlder "3.10"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "ansible_navigator"; - hash = "sha256-WcA14CiUUNXa+yR1IzoyQ7LWBXFI8yzV+xpRj2W8lzQ="; + hash = "sha256-ygX7rPqd63PpLHm0XqOh5vvwN9h6KivMZQco9XdyUog="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/an/ansilove/package.nix b/pkgs/by-name/an/ansilove/package.nix new file mode 100644 index 000000000000..ea2faa9b5fd5 --- /dev/null +++ b/pkgs/by-name/an/ansilove/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libansilove, +}: + +stdenv.mkDerivation rec { + pname = "ansilove"; + version = "4.2.1"; + + src = fetchFromGitHub { + owner = "ansilove"; + repo = "ansilove"; + tag = version; + hash = "sha256-13v2NLVJt11muwocBiQYz/rxQkte/W6LXwB/H/E9Nvk="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ libansilove ]; + + meta = { + description = "ANSI and ASCII art to PNG converter in C"; + homepage = "https://github.com/ansilove/ansilove"; + changelog = "https://github.com/ansilove/ansilove/blob/${src.rev}/ChangeLog"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ jethair ]; + mainProgram = "ansilove"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/an/ant/package.nix b/pkgs/by-name/an/ant/package.nix index 073c14a0b57e..a6b4b115d373 100644 --- a/pkgs/by-name/an/ant/package.nix +++ b/pkgs/by-name/an/ant/package.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; - maintainers = [ ] ++ lib.teams.java.members; + teams = [ lib.teams.java ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/an/anthy/package.nix b/pkgs/by-name/an/anthy/package.nix index 8774882dfbcc..9c7cf466705c 100644 --- a/pkgs/by-name/an/anthy/package.nix +++ b/pkgs/by-name/an/anthy/package.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' # for cross builds, copy build tools from the native package - cp -r "${buildPackages.anthy}"/lib/internals/{mkdepgraph,.libs} depgraph/ - cp -r "${buildPackages.anthy}"/lib/internals/{mkworddic,.libs} mkworddic/ - cp -r "${buildPackages.anthy}"/lib/internals/{calctrans,.libs} calctrans/ - cp -r "${buildPackages.anthy}"/lib/internals/{mkfiledic,.libs} mkanthydic/ + cp -r "${buildPackages.anthy.dev}"/lib/internals/{mkdepgraph,.libs} depgraph/ + cp -r "${buildPackages.anthy.dev}"/lib/internals/{mkworddic,.libs} mkworddic/ + cp -r "${buildPackages.anthy.dev}"/lib/internals/{calctrans,.libs} calctrans/ + cp -r "${buildPackages.anthy.dev}"/lib/internals/{mkfiledic,.libs} mkanthydic/ substituteInPlace mkworddic/Makefile.in \ --replace-fail 'anthy.wdic : mkworddic' 'anthy.wdic : ' \ --replace-fail 'all: ' 'all: anthy.wdic #' @@ -30,17 +30,23 @@ stdenv.mkDerivation rec { --replace-fail 'all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)' 'all-am: $(DATA)' ''; + outputs = [ + "out" + "dev" + ]; + meta = with lib; { description = "Hiragana text to Kana Kanji mixed text Japanese input method"; homepage = "https://anthy.osdn.jp/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ericsagnes ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; postFixup = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - mkdir "$out/lib/internals" - cp -r depgraph/{mkdepgraph,.libs} mkworddic/{mkworddic,.libs} calctrans/{calctrans,.libs} mkanthydic/{mkfiledic,.libs} "$out/lib/internals" + # not relevant for installed package + mkdir "$dev/lib/internals" + cp -r depgraph/{mkdepgraph,.libs} mkworddic/{mkworddic,.libs} calctrans/{calctrans,.libs} mkanthydic/{mkfiledic,.libs} "$dev/lib/internals" ''; src = fetchurl { diff --git a/pkgs/by-name/an/antidote/package.nix b/pkgs/by-name/an/antidote/package.nix index f1060567983b..e4e47cfa44d2 100644 --- a/pkgs/by-name/an/antidote/package.nix +++ b/pkgs/by-name/an/antidote/package.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.9.7"; + version = "1.9.8"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; rev = "v${finalAttrs.version}"; - hash = "sha256-Gg69O35CpsI3Q3cdxBpRDOfSxRxWG3PHew59kJVH1eQ="; + hash = "sha256-74bajVwbsfbibOIqETrewHZbbzceOHD6d1OEh+LYh7o="; }; dontPatch = true; diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix index 9e40ab88bf29..2a70d2d9722c 100644 --- a/pkgs/by-name/an/antimatter-dimensions/package.nix +++ b/pkgs/by-name/an/antimatter-dimensions/package.nix @@ -19,12 +19,12 @@ let in buildNpmPackage rec { pname = "antimatter-dimensions"; - version = "0-unstable-2024-10-16"; + version = "0-unstable-2025-05-08"; src = fetchFromGitHub { owner = "IvarK"; repo = "AntimatterDimensionsSourceCode"; - rev = "b813542c2f77501d0b8d07ae8b0044df2a994e86"; - hash = "sha256-1uZeY0Lgqbo9X9xbXed0aYy8mNApMBXJRlaoliZb/mA="; + rev = "7b29fa1c0771b93a8bf8198ca04886167ecffc0b"; + hash = "sha256-z7dVToxu8qWCPajf0vKprXF4zSBCRDquBgjf55ZPgyE="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/an/ants/package.nix b/pkgs/by-name/an/ants/package.nix new file mode 100644 index 000000000000..f2595124a1ad --- /dev/null +++ b/pkgs/by-name/an/ants/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + makeBinaryWrapper, + itk, + vtk, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ANTs"; + version = "2.6.0"; + + src = fetchFromGitHub { + owner = "ANTsX"; + repo = "ANTs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3k9EOylOAUwxBNpzi6U/XZGarCZlbh9PdecKyJh81Yk="; + }; + + nativeBuildInputs = [ + cmake + makeBinaryWrapper + ]; + + buildInputs = [ + itk + vtk + ]; + + cmakeFlags = [ + "-DANTS_SUPERBUILD=FALSE" + "-DUSE_VTK=TRUE" + ]; + + postInstall = '' + for file in $out/bin/*; do + wrapProgram $file --prefix PATH : "$out/bin" + done + ''; + + meta = { + changelog = "https://github.com/ANTsX/ANTs/releases/tag/v${finalAttrs.version}"; + description = "Advanced normalization toolkit for medical image registration and other processing"; + homepage = "https://github.com/ANTsX/ANTs"; + license = lib.licenses.asl20; + mainProgram = "antsRegistration"; + maintainers = with lib.maintainers; [ bcdarwin ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/an/anubis-xess/package.nix b/pkgs/by-name/an/anubis-xess/package.nix new file mode 100644 index 000000000000..0b6a83cbaf2a --- /dev/null +++ b/pkgs/by-name/an/anubis-xess/package.nix @@ -0,0 +1,35 @@ +{ buildNpmPackage, anubis }: + +buildNpmPackage { + pname = "${anubis.pname}-xess"; + inherit (anubis) version src; + + npmDepsHash = "sha256-hTKTTBmfMGv6I+4YbWrOt6F+qD6ysVYi+DEC1konBFk="; + + buildPhase = '' + runHook preBuild + + npx postcss ./xess/xess.css -o xess.min.css + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 xess.min.css $out/xess.min.css + + runHook postInstall + ''; + + meta = anubis.meta // { + description = "Xess files for Anubis"; + longDescription = '' + This package is consumed by the main `anubis` package to render the final + styling for the bot check page. + + **It is not supposed to be used as a standalone package**, and it exists to + ensure Anubis' styling is override-able by downstreams. + ''; + }; +} diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix index f772dd03f7e4..39393f755aaa 100644 --- a/pkgs/by-name/an/anubis/package.nix +++ b/pkgs/by-name/an/anubis/package.nix @@ -2,21 +2,34 @@ lib, buildGoModule, fetchFromGitHub, - nix-update-script, + nixosTests, stdenv, + + anubis-xess, + + esbuild, + brotli, + zstd, }: + buildGoModule (finalAttrs: { pname = "anubis"; - version = "1.15.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "TecharoHQ"; repo = "anubis"; tag = "v${finalAttrs.version}"; - hash = "sha256-PlZEGe3kTBkTd17nTLSW6pGiUKIPVQttep92FT+10g8="; + hash = "sha256-grtzkNxgShbldjm+lnANbKVhkUrbwseAT1NaBL85mHg="; }; - vendorHash = "sha256-Rcra5cu7zxGm2LhL2x9Kd3j/uQaEb8OOh/j5Rhh8S1k="; + vendorHash = "sha256-EOT/sdVINj9oO1jZHPYB3jQ+XApf9eCUKuMY0tV+vpg="; + + nativeBuildInputs = [ + esbuild + brotli + zstd + ]; subPackages = [ "cmd/anubis" @@ -32,20 +45,30 @@ buildGoModule (finalAttrs: { "-extldflags=-static" ]; + postPatch = '' + patchShebangs ./web/build.sh + ''; + + preBuild = '' + go generate ./... && ./web/build.sh && cp -r ${anubis-xess}/xess.min.css ./xess + ''; + preCheck = '' export DONT_USE_NETWORK=1 ''; - passthru.updateScript = nix-update-script { }; + passthru.tests = { inherit (nixosTests) anubis; }; meta = { description = "Weighs the soul of incoming HTTP requests using proof-of-work to stop AI crawlers"; - homepage = "https://github.com/TecharoHQ/anubis/"; + homepage = "https://anubis.techaro.lol/"; changelog = "https://github.com/TecharoHQ/anubis/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ knightpp soopyc + ryand56 + sigmasquadron ]; mainProgram = "anubis"; }; diff --git a/pkgs/by-name/an/anvil-editor/extras.nix b/pkgs/by-name/an/anvil-editor/extras.nix deleted file mode 100644 index 4e130565fe4c..000000000000 --- a/pkgs/by-name/an/anvil-editor/extras.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - buildGoModule, - anvil-editor, -}: - -buildGoModule { - inherit (anvil-editor) version src meta; - - pname = "anvil-editor-extras"; - - modRoot = "anvil-extras"; - - vendorHash = "sha256-PH7HSMlCAHn4L1inJDbDcj6n+i6LXakIOqwdUkRjf9E="; -} diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix index 2466eb283aa0..918554209356 100644 --- a/pkgs/by-name/an/anvil-editor/package.nix +++ b/pkgs/by-name/an/anvil-editor/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - buildGoModule, + buildGo123Module, fetchzip, pkg-config, copyDesktopItems, @@ -12,26 +12,31 @@ vulkan-headers, libGL, xorg, - callPackage, buildPackages, - anvilExtras ? callPackage ./extras.nix { }, }: -buildGoModule rec { +buildGo123Module (finalAttrs: { pname = "anvil-editor"; - version = "0.4"; + version = "0.6"; # has to update vendorHash of extra package manually # nixpkgs-update: no auto update src = fetchzip { - url = "https://anvil-editor.net/releases/anvil-src-v${version}.tar.gz"; - hash = "sha256-0fi6UeppWC9KbWibjQYlPlRqsl9xsvij8YpJUS0S/wY="; + url = "https://anvil-editor.net/releases/anvil-src-v${finalAttrs.version}.tar.gz"; + hash = "sha256-i0S5V3j6OPpu4z1ljDKP3WYa9L+EKwo/MBNgW2ENYk8="; }; modRoot = "anvil/src/anvil"; vendorHash = "sha256-1oFBV7D7JgOt5yYAxVvC4vL4ccFv3JrNngZbo+5pzrk="; + anvilExtras = buildGo123Module { + pname = "anvil-editor-extras"; + inherit (finalAttrs) version src meta; + vendorHash = "sha256-4pfk5XuwDbCWFZIF+1l+dy8NfnGNjgHmSg9y6/RnTSo="; + modRoot = "anvil-extras"; + }; + nativeBuildInputs = [ pkg-config @@ -60,8 +65,11 @@ buildGoModule rec { exec = "anvil"; icon = "anvil"; desktopName = "Anvil"; - comment = meta.description; - categories = [ "TextEditor" ]; + comment = finalAttrs.meta.description; + categories = [ + "Utility" + "TextEditor" + ]; startupWMClass = "anvil"; }) ]; @@ -76,13 +84,9 @@ buildGoModule rec { install -Dm644 anvil_''${square}x32.png $out/share/icons/hicolor/''${square}/apps/anvil.png done popd - cp ${anvilExtras}/bin/* $out/bin + cp ${finalAttrs.anvilExtras}/bin/* $out/bin ''; - passthru = { - inherit anvilExtras; - }; - meta = { description = "Graphical, multi-pane tiling editor inspired by Acme"; homepage = "https://anvil-editor.net"; @@ -91,4 +95,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ aleksana ]; platforms = with lib.platforms; unix ++ windows; }; -} +}) diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix index 6a7f5dd81eae..85e0eff56e7a 100644 --- a/pkgs/by-name/an/anydesk/package.nix +++ b/pkgs/by-name/an/anydesk/package.nix @@ -34,14 +34,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "anydesk"; - version = "6.4.2"; + version = "7.0.0"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz" ]; - hash = "sha256-KJTyIMuKNLymD/DsitN+Rgro7lgkY13fmkFNxsEUkWU="; + hash = "sha256-AEj4/S4k6mnCb/CagEDhpCtExB8pIqv7V2b/br4nC/8="; }; buildInputs = diff --git a/pkgs/by-name/an/anyk/version.json b/pkgs/by-name/an/anyk/version.json index 9f4cfc4da1f2..42ea6c7e1254 100644 --- a/pkgs/by-name/an/anyk/version.json +++ b/pkgs/by-name/an/anyk/version.json @@ -1,5 +1,5 @@ { - "url": "https://web.archive.org/web/20250202083430/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava", - "sha256": "0w6ps68z7kgfqkc35sxqkcflm4svzykhiafadkw4k40ihin4fa5w", - "version": "3.39.0" + "url": "https://web.archive.org/web/20250504163105/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava", + "sha256": "0a7bdyadk00ik5kkx65v6qx433fcd8n7aj42fmzcijp5raz63plv", + "version": "3.42.0" } diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index c9c9e269833d..232cb1c23748 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage { pname = "anyrun"; - version = "0-unstable-2024-12-27"; + version = "0-unstable-2025-04-29"; src = fetchFromGitHub { owner = "kirottu"; repo = "anyrun"; - rev = "06017e753c8886d5296768dca80745ee09402a2d"; - hash = "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o="; + rev = "005333a60c03cf58e0a59b03e76989441276e88b"; + hash = "sha256-0zJs4J4w1jG83hByNJ+WxANHW7sLzMdvA408LDCCnTY="; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix index 6b2f2472a473..e3f4bde83b1c 100644 --- a/pkgs/by-name/an/anytype-heart/package.nix +++ b/pkgs/by-name/an/anytype-heart/package.nix @@ -11,12 +11,14 @@ let pname = "anytype-heart"; - version = "0.39.11"; + # Use only versions specified in anytype-ts middleware.version file: + # https://github.com/anyproto/anytype-ts/blob/v/middleware.version + version = "0.40.21"; src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-heart"; tag = "v${version}"; - hash = "sha256-+H63bc4aJPERfclzKh4E3uYEEwNycLfe0BCPSlilqCc="; + hash = "sha256-53LSaETzxwhKkI9is6N6G1+f5Cnf7KStvHA9qeaWUNo="; }; arch = @@ -34,7 +36,7 @@ in buildGoModule { inherit pname version src; - vendorHash = "sha256-fbZ1DiRcD9dnS8e7BMrKPYApqZmQbaH6DsSSO1knDmo="; + vendorHash = "sha256-WsYRkAIYDkKWkQpq843dD7Rqc993eHSgee2IX6PomcU="; subPackages = [ "cmd/grpcserver" ]; tags = [ diff --git a/pkgs/by-name/an/anytype/0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch b/pkgs/by-name/an/anytype/0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch new file mode 100644 index 000000000000..7931ec439968 --- /dev/null +++ b/pkgs/by-name/an/anytype/0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch @@ -0,0 +1,37 @@ +From d236396b1da80a7233168e01e8164256e7f69cc1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?David=20Chocholat=C3=BD?= +Date: Fri, 25 Apr 2025 12:29:37 +0200 +Subject: [PATCH] feat(update): Disable auto checking for updates and updating + manually + +--- + electron/js/update.js | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/electron/js/update.js b/electron/js/update.js +index 0e34efa..9386c90 100644 +--- a/electron/js/update.js ++++ b/electron/js/update.js +@@ -29,7 +29,8 @@ class UpdateManager { + autoUpdater.autoInstallOnAppQuit = false; + autoUpdater.channel = channel; + +- this.setTimeout(); ++ // PATCH(update): Never check for updates on a timer timeout. ++ // this.setTimeout(); + + autoUpdater.on('checking-for-update', () => { + Util.log('info', 'Checking for update'); +@@ -93,6 +94,9 @@ class UpdateManager { + }; + + isAllowed () { ++ // PATCH(update): Always disallow update check, even when requested by the user manually or when Anytype starts. ++ return false; ++ + const { config } = ConfigManager; + + if (config.updateDisabled) { +-- +2.49.0 + diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 21cf65f6c3d0..98d1511c80f9 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -1,6 +1,5 @@ { lib, - runCommand, fetchFromGitHub, buildNpmPackage, pkg-config, @@ -10,38 +9,31 @@ makeDesktopItem, copyDesktopItems, commandLineArgs ? "", - nix-update-script, }: let pname = "anytype"; - version = "0.45.3"; + version = "0.46.5"; src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-ts"; tag = "v${version}"; - hash = "sha256-fwfxmNca75xAAHKeT2nddz+XZexDomzHbw188LXxZqA="; + hash = "sha256-gDlxyHxBLWVBLnaI6rFclfjwqkw9gneBEC7ssmWDKYU="; }; description = "P2P note-taking tool"; locales = fetchFromGitHub { owner = "anyproto"; repo = "l10n-anytype-ts"; - rev = "687106c4e37297f86fab79f77ef83599b61ab65c"; - hash = "sha256-Y0irD0jzqYobnjtD2M1+hTDRUUYnuygUx9+tE1gUoTw="; + rev = "1d7ca0073bdd02d0145b8da3b1b956ca0652a108"; + hash = "sha256-aL79DOIFH3CocbcLW0SJ472mYPZJXrPJyRKy8zXiF4o="; }; - - electron-headers = runCommand "electron-headers" { } '' - mkdir -p $out - tar -C $out --strip-components=1 -xvf ${electron.headers} - ''; - in buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-9BI+rXzTYonlMhcH8uiWyyF18JGv8GL1U9hZ9Z6X3As="; + npmDepsHash = "sha256-WEw3RCi7dWs2eMYxLH7DcmWBrN4T8T6beIyplcXgJAA="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -55,7 +47,11 @@ buildNpmPackage { npmFlags = [ # keytar needs to be built against electron's ABI - "--nodedir=${electron-headers}" + "--nodedir=${electron.headers}" + ]; + + patches = [ + ./0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch ]; buildPhase = '' @@ -104,11 +100,12 @@ buildNpmPackage { desktopItems = [ (makeDesktopItem { - name = "Anytype"; + name = "anytype"; exec = "anytype"; icon = "anytype"; desktopName = "Anytype"; comment = description; + mimeTypes = [ "x-scheme-handler/anytype" ]; categories = [ "Utility" "Office" @@ -119,17 +116,6 @@ buildNpmPackage { }) ]; - passthru.updateScript = nix-update-script { - # Prevent updating to versions with '-' in them. - # Necessary since Anytype uses Electron-based 'MAJOR.MINOR.PATCH(-{alpha,beta})?' versioning scheme where each - # {alpha,beta} version increases the PATCH version, releasing a new full release version in GitHub instead of a - # pre-release version. - extraArgs = [ - "--version-regex" - "[^-]*" - ]; - }; - meta = { inherit description; homepage = "https://anytype.io/"; diff --git a/pkgs/by-name/ao/aoc-cli/package.nix b/pkgs/by-name/ao/aoc-cli/package.nix new file mode 100644 index 000000000000..f63e2586bc79 --- /dev/null +++ b/pkgs/by-name/ao/aoc-cli/package.nix @@ -0,0 +1,34 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "aoc-cli"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "scarvalhojr"; + repo = pname; + rev = version; + hash = "sha256-UdeCKhEWr1BjQ6OMLP19OLWPlvvP7FGAO+mi+bQUPQA="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-cm8yt7PRjar21EVFIjXYgDkO7+VpHGIB3tJ8hkK+Phw="; + + meta = with lib; { + description = "Advent of code command line tool"; + homepage = "https://github.com/scarvalhojr/aoc-cli/"; + license = licenses.mit; + maintainers = with maintainers; [ jordanisaacs ]; + mainProgram = "aoc"; + }; +} diff --git a/pkgs/by-name/ao/aocl-utils/package.nix b/pkgs/by-name/ao/aocl-utils/package.nix index 1dc44ad7c08c..bdeb5ce95216 100644 --- a/pkgs/by-name/ao/aocl-utils/package.nix +++ b/pkgs/by-name/ao/aocl-utils/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aocl-utils"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "amd"; repo = "aocl-utils"; rev = version; - hash = "sha256-96j3Sw+Ts+CZzjPpUlt8cRYO5z0iASo+W/x1nrrAyQE="; + hash = "sha256-1g5gERVxXKAeCyNR9/HheUfj+MPxJso3NzqDonvuyMo="; }; patches = [ ./pkg-config.patch ]; diff --git a/pkgs/by-name/ao/aonsoku/package.nix b/pkgs/by-name/ao/aonsoku/package.nix index efa56fbef48d..03fa9cc13a3d 100644 --- a/pkgs/by-name/ao/aonsoku/package.nix +++ b/pkgs/by-name/ao/aonsoku/package.nix @@ -2,16 +2,12 @@ lib, fetchFromGitHub, rustPlatform, - cargo-tauri, nodejs, - pnpm, - + pnpm_8, pkg-config, wrapGAppsHook3, - openssl, - libsoup_2_4, webkitgtk_4_1, glib-networking, nix-update-script, @@ -19,39 +15,38 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aonsoku"; - version = "0.8.3"; + version = "0.9.1"; src = fetchFromGitHub { owner = "victoralvesf"; repo = "aonsoku"; tag = "v${finalAttrs.version}"; - hash = "sha256-A1U1ubprwYJvyqTe5gVYTo8687sfP/76GfA+2EmtoCo="; + hash = "sha256-qlc7P222e6prYG30iVTAZhP772za3H7gVszfWvOr2NM="; }; - pnpmDeps = pnpm.fetchDeps { + # lockfileVersion: '6.0' need old pnpm + pnpmDeps = pnpm_8.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-BMEBJRycmOgsI1loTPTNY1dVOJ0HTCnzg0QyNAzZMn4="; + hash = "sha256-h1rcM+H2c0lk7bpGeQT5ue9bQIggrCFHkj4o7KxnH08="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; useFetchCargoVendor = true; - cargoHash = "sha256-yuKaf05bQFah3MTC0eF82pMmTJrllWfUKX3SdIWbPjM="; + cargoHash = "sha256-8UtfL8iB1XKP31GT9Ok5hIQSobQTm681uiluG+IhK/s="; patches = [ ./remove_updater.patch ]; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_8.configHook cargo-tauri.hook - pkg-config wrapGAppsHook3 ]; buildInputs = [ openssl - libsoup_2_4 webkitgtk_4_1 glib-networking ]; diff --git a/pkgs/by-name/ao/aonsoku/remove_updater.patch b/pkgs/by-name/ao/aonsoku/remove_updater.patch index 8f3ac85b61dd..8145cf552b63 100644 --- a/pkgs/by-name/ao/aonsoku/remove_updater.patch +++ b/pkgs/by-name/ao/aonsoku/remove_updater.patch @@ -37,10 +37,3 @@ index 3afc5f6..19785e5 100644 "app": { "withGlobalTauri": true, "security": { -@@ -56,4 +47,4 @@ - } - ] - } --} -\ No newline at end of file -+} diff --git a/pkgs/by-name/ap/apache-directory-studio/package.nix b/pkgs/by-name/ap/apache-directory-studio/package.nix index 8d607bc77787..6fd1e7301e56 100644 --- a/pkgs/by-name/ap/apache-directory-studio/package.nix +++ b/pkgs/by-name/ap/apache-directory-studio/package.nix @@ -8,7 +8,7 @@ makeDesktopItem, glib, libsecret, - webkitgtk_4_0, + webkitgtk_4_1, }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ glib - webkitgtk_4_0 + webkitgtk_4_1 ] } \ --run "mkdir -p /tmp/SWT-GDBusServer" diff --git a/pkgs/by-name/ap/apery/package.nix b/pkgs/by-name/ap/apery/package.nix new file mode 100644 index 000000000000..0a6ea700290e --- /dev/null +++ b/pkgs/by-name/ap/apery/package.nix @@ -0,0 +1,56 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + unstableGitUpdater, +}: + +rustPlatform.buildRustPackage { + pname = "apery"; + version = "2.1.0-unstable-2024-06-23"; + + src = fetchFromGitHub { + owner = "HiraokaTakuya"; + # Successor of C++ implementation + # https://github.com/HiraokaTakuya/apery/blob/d14471fc879062bfabbd181eaa91e90c7cc28a71/Readme.txt#L3-L4 + repo = "apery_rust"; + rev = "8e64bc427bff033a38f1b60b9013ad2d62f88db7"; + hash = "sha256-Y8IBZISutXNgbuc7/qhNoiwYDCP6M9ukhu48t3oZM18="; + # The submodule includes evaluation files for the installCheckPhase + fetchSubmodules = true; + }; + + cargoHash = "sha256-xaQ83WKXKSAFRSKzaTFnM2lklGLCJG+i7wa8a+KNR/I="; + + checkFlags = [ + "--skip=movegen" + ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + usi_command='isready + go byoyomi 1000 + wait' + usi_output="$("$out/bin/apery" <<< "$usi_command")" + [[ "$usi_output" == *'bestmove'* ]] + + runHook postInstallCheck + ''; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + branch = "master"; + }; + + meta = { + description = "USI shogi engine"; + homepage = "https://github.com/HiraokaTakuya/apery_rust"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "apery"; + }; +} diff --git a/pkgs/by-name/ap/apkeep/package.nix b/pkgs/by-name/ap/apkeep/package.nix new file mode 100644 index 000000000000..e95face53a8d --- /dev/null +++ b/pkgs/by-name/ap/apkeep/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchCrate, + rustPlatform, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "apkeep"; + version = "0.17.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-YjGfnYK22RIVa8D8CWnAxHGDqXENGAPIeQQ606Q3JW8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-CwucGAwAvxePNQu5p1OWx9o9xsvpzX1abH6HyF43nEE="; + + prePatch = '' + rm .cargo/config.toml + ''; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + meta = with lib; { + description = "Command-line tool for downloading APK files from various sources"; + homepage = "https://github.com/EFForg/apkeep"; + changelog = "https://github.com/EFForg/apkeep/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = [ ]; + mainProgram = "apkeep"; + }; +} diff --git a/pkgs/by-name/ap/apkid/package.nix b/pkgs/by-name/ap/apkid/package.nix index eb496bf43ad3..2ee7d82560bc 100644 --- a/pkgs/by-name/ap/apkid/package.nix +++ b/pkgs/by-name/ap/apkid/package.nix @@ -6,44 +6,41 @@ python3.pkgs.buildPythonApplication rec { pname = "apkid"; - version = "2.1.5"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "rednaga"; repo = "APKiD"; tag = "v${version}"; - hash = "sha256-yO3k2kT043/KkiCjDnNUlqxX86kQqMZ+CghD+yon3r4="; + hash = "sha256-/8p2qR1je65k1irXFcCre2e16rhGjcu0+u6RChMYTWQ="; }; - propagatedBuildInputs = with python3.pkgs; [ - yara-python - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - preBuild = '' - # Prepare the YARA rules - ${python3.interpreter} prep-release.py - ''; - postPatch = '' # We have dex support enabled in yara-python substituteInPlace setup.py \ --replace "yara-python-dex>=1.0.1" "yara-python" ''; - pythonImportsCheck = [ - "apkid" - ]; + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ yara-python ]; + + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + + preBuild = '' + # Prepare the YARA rules + ${python3.interpreter} prep-release.py + ''; + + pythonImportsCheck = [ "apkid" ]; meta = with lib; { description = "Android Application Identifier"; - mainProgram = "apkid"; homepage = "https://github.com/rednaga/APKiD"; - license = with licenses; [ gpl3Only ]; + changelog = "https://github.com/rednaga/APKiD/releases/tag/${src.tag}"; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "apkid"; }; } diff --git a/pkgs/by-name/ap/apksigner/deps.json b/pkgs/by-name/ap/apksigner/deps.json index a0f5ccb9c489..8cc534ae140d 100644 --- a/pkgs/by-name/ap/apksigner/deps.json +++ b/pkgs/by-name/ap/apksigner/deps.json @@ -1,24 +1,116 @@ { "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, - "https://jcenter.bintray.com": { - "com/google#google/1": { - "pom": "sha256-zW2xehGjHt55TMvR3w5Nl1D2QCNHMfIc/4hamZcnfoE=" + "https://dl.google.com": { + "dl/android/maven2/androidx/annotation#annotation/1.5.0": { + "jar": "sha256-Jh+3wCEIWFALq2bTQ1SXKnUWarQYKt0oN4CwVRPW7Eo=", + "module": "sha256-TIT+7i24kf9rl9YToNQKuWzil7A0ppJ8qEefCegtfC4=", + "pom": "sha256-4pMlmZmt4HAXXEqreA0H1V0BhbtDpRWiT1iQ0CLhzAU=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/google/android#annotations/4.1.1.4": { + "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=", + "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng=" + }, + "com/google/api#api-common/2.10.0": { + "jar": "sha256-Dq1YL3+jxBQOhjbPxgMUdsK7LxAHb9P0OakBiDoUXyY=", + "pom": "sha256-epLvsCCqY6cYZuC1wNpRBdJfrh3YMxtPvpV5gstzfJ0=" + }, + "com/google/api#gapic-generator-java-pom-parent/2.19.0": { + "pom": "sha256-dis49MzAgcHaiOffE49+1XOepbigivOpB0PlatLOrgU=" + }, + "com/google/api#gax-grpc/2.27.0": { + "jar": "sha256-BJ7WlAxDd2B0aLFemBdckNrCQ/3cHqdrXKsq4SLdYOY=", + "pom": "sha256-ct6RfbdpiCvKGUoJh2AgIwKKYMVO43D2nBu/e/6RL+c=" + }, + "com/google/api#gax-httpjson/0.112.0": { + "jar": "sha256-GYL4bCXE46YPuHhzIe0ANP9Tra8YG/CTYJ9j7TtD1b8=", + "pom": "sha256-mja5Hi8kl1P7zcshG6z97kzIMjuTe1o3V5Qt0Sn/AwY=" + }, + "com/google/api#gax-parent/2.27.0": { + "pom": "sha256-36zNIaIPzIoNvn1S/akZh5UbADv3yv7ysTH+vdd/HJo=" + }, + "com/google/api#gax/2.27.0": { + "jar": "sha256-IFGFWHOE0Er5eWm1a7F69m+l3YieYhvPywYrfofJhQ4=", + "pom": "sha256-5tuvtvcdoq5RF1olhHoD/IZFqMwvuBMTTg2hdwZa4ac=" + }, + "com/google/api/grpc#grpc-google-common-protos/2.18.0": { + "jar": "sha256-j8v4L9wybri+S66NfSJ2bY1kiXEKrYm0R7KDI0X20xg=", + "pom": "sha256-SyTmH6k63B3hoi23gtzvnGI79qx3ZDIh8VJ70RFNSv4=" + }, + "com/google/api/grpc#grpc-google-iam-v1/1.13.0": { + "jar": "sha256-1b/fLrb7yp50a18XNkO0tzzI6Ofwfcw0v5BbJiGWkRk=", + "pom": "sha256-ek30qnkYxKAcjuu6lqCN5dBlrSOC0g4s1/wlFUUyzkk=" + }, + "com/google/api/grpc#proto-google-cloud-kms-v1/0.111.0": { + "jar": "sha256-L3nwQq3sTUjYbWjcjCMUNseJ05qAfaOzxL++nSoIjSs=", + "pom": "sha256-rnCdRQZTQge24UwBzB/N7gvYoi41UtWGxuGUIntqrFY=" + }, + "com/google/api/grpc#proto-google-common-protos/2.18.0": { + "jar": "sha256-XnfwFi+3Bfz0iLeHnoNppkJCmrz3tZecR35ktUaSklM=", + "pom": "sha256-m7sNr83dtembMtRQgJLH+4BQcs2f3utgKb2EpPKwq98=" + }, + "com/google/api/grpc#proto-google-iam-v1/1.13.0": { + "jar": "sha256-2HTNg7AF8tncQ5NmAe54D3VMTUxpYhcukKYYJV2poCQ=", + "pom": "sha256-vyLch8u8mx7Q2E2GNmMqAsdP/Jo9Wz+yTA6gW4P9ZaQ=" + }, + "com/google/auth#google-auth-library-bom/1.16.0": { + "pom": "sha256-JPx2runhD92FvXDMp3OgoXAGh6+BM+plxG8yS8R+Hfw=" + }, + "com/google/auth#google-auth-library-credentials/1.16.0": { + "jar": "sha256-tYqdGKn2CmYmFW5+VUOQs1jflcpfiuO8iVuGhfV8+HY=", + "pom": "sha256-PyZmDOenD4P3KRBeKjouOvy4R8e7atDGua5o/QXP/rQ=" + }, + "com/google/auth#google-auth-library-oauth2-http/1.16.0": { + "jar": "sha256-NXcWxdf5UNRXH5J0IWWItZgu2am4vrhWmwNCurcv+w4=", + "pom": "sha256-ubUIswklyQO/3jNpJM71TVRJJL8Pc9LSM8I28YvEdPA=" + }, + "com/google/auth#google-auth-library-parent/1.16.0": { + "pom": "sha256-PVbYHAAlOoH0bs/SLPCJaHxmX6UPtUEc864tWLmeNeQ=" + }, + "com/google/auto/value#auto-value-annotations/1.10.1": { + "jar": "sha256-pP4KIRkl6TioUQ10F2PuEXGhG/kx9Yke9NTuhPynK+I=", + "pom": "sha256-n7rMhpTRkE37TVrx5KVGD9ZMHKnQBJ0YFFQs0q0osEc=" + }, + "com/google/auto/value#auto-value-parent/1.10.1": { + "pom": "sha256-9y2jrhi84YuHRM1yM6qDSjLTvR4LRTsV9tujP3lzz+k=" + }, + "com/google/cloud#google-cloud-kms/2.20.0": { + "jar": "sha256-pNPghrGcOyoJ+TrdBX6ySxyigjmOEBw/2SbHISvBoLI=", + "pom": "sha256-DAaJz/1vXvxHRJDqDlTSU6m3xPskn0Pqqn04Y9yz2Mc=" + }, + "com/google/cloud#google-cloud-shared-config/1.5.5": { + "pom": "sha256-mLz9fSHahIoeXpTp4VJG+eHoe1bJ54zxfJsSOG4jrnM=" }, "com/google/code/findbugs#jsr305/3.0.2": { "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, - "com/google/errorprone#error_prone_annotations/2.2.0": { - "jar": "sha256-br0iyhudjsBtQd6NZOBZaYHZYHtCA1+e03T53icaSBo=", - "pom": "sha256-XgJY6huk5RoTN0JoC8IkSPerIUvkBz6GGfZF7xvkLdU=" + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" }, - "com/google/errorprone#error_prone_parent/2.2.0": { - "pom": "sha256-xGCQLd9ezmiDLGsnHOUqCSiwXPOmrIGo9UjHPL1UETg=" + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" }, - "com/google/gradle#osdetector-gradle-plugin/1.6.2": { - "jar": "sha256-hFw+/OY70j2WLyELE77rqwXE1YOJihsaf/uMez7X1dQ=", - "pom": "sha256-W/T2le0Rd+gFJFJbbloECl1+pLFhlrERCILGLmmlVeg=" + "com/google/crypto/tink#tink-android/1.12.0": { + "jar": "sha256-p4a4yhHV+9D77QyT6KTJulr6arhS953M2BMjSl6ZUto=", + "pom": "sha256-qr8HB2wBaJTvmlxFIKP1m4+VhK87URpDZBzNnZudIPg=" + }, + "com/google/errorprone#error_prone_annotations/2.18.0": { + "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=", + "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" + }, + "com/google/errorprone#error_prone_annotations/2.22.0": { + "jar": "sha256-gqAnuGVB9Y0fnuAgzfa+voKsx6Jn08U6LqXNYzWTK70=", + "pom": "sha256-tyXFIVFBaOnCDTcZp2qgG1DlpygoWfTqhMJRz5+EIIA=" + }, + "com/google/errorprone#error_prone_parent/2.18.0": { + "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" + }, + "com/google/errorprone#error_prone_parent/2.22.0": { + "pom": "sha256-XSUivqg99aWBzNayJ2Nco04NOXt2ct50ispBVwgFc8c=" }, "com/google/guava#failureaccess/1.0.1": { "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", @@ -27,80 +119,274 @@ "com/google/guava#guava-parent/26.0-android": { "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" }, - "com/google/guava#guava-parent/27.0.1-jre": { - "pom": "sha256-MX6IKRJi4M8oBelWwYhQ8dRWXIXC4REvXZ0Iqxcy5pY=" + "com/google/guava#guava-parent/31.1-jre": { + "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" }, - "com/google/guava#guava/27.0.1-jre": { - "jar": "sha256-4cgU/QRJKifDjgMX6r6qGz6VDsgBAjnkAP6QrWyRB7Q=", - "pom": "sha256-ao3QQfI6a7FKhuRA/MuZNTe2InE1eg2sCjyw/zkVjzY=" + "com/google/guava#guava-parent/32.0.1-jre": { + "pom": "sha256-Q+0ONrNT9B5et1zXVmZ8ni35fO8G6xYGaWcVih0DTSo=" + }, + "com/google/guava#guava/31.1-jre": { + "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=", + "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" + }, + "com/google/guava#guava/32.0.1-jre": { + "jar": "sha256-vX+iJ1kfuFCWd9DREiz5UVjzuKn0VlP1goHYefbcSMU=", + "pom": "sha256-QsJX9/c203ezGv7u6XirJtcwzXCvYN3nZi4YI1LiSCo=" }, "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" }, - "com/google/j2objc#j2objc-annotations/1.1": { - "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=", - "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4=" + "com/google/http-client#google-http-client-bom/1.42.3": { + "pom": "sha256-SllPSmi+keMqV7keI9plQGixLtIveYBfvNYiYfULR+w=" }, - "com/google/protobuf#protobuf-bom/3.8.0": { - "pom": "sha256-WjrGCFOIDEORPNXLY7Np626WRuHtDEgGnsmpMTd700c=" + "com/google/http-client#google-http-client-bom/1.43.1": { + "pom": "sha256-eSc6FEsB1GX+f+tvJLN7Gfbv0mCOXvEviOY1sf3toEg=" }, - "com/google/protobuf#protobuf-gradle-plugin/0.8.11": { - "jar": "sha256-gFr+/pf6AYFXpWvxQtvuStIo0RSyq3s97le5fD4teHk=", - "pom": "sha256-RBeVBVv4AjSXKcjFWdrVcmi4C4tk6KPePK2lQmo45aA=" + "com/google/http-client#google-http-client-gson/1.43.1": { + "jar": "sha256-AXQG5RBaMxR6sTuve0kf9T2Z5UpeK2G3zNZR4WQilpg=", + "pom": "sha256-EqhE8wvEQ29kCX2xTYNt7vxshmldPFpetmi76P8OaUE=" }, - "com/google/protobuf#protobuf-javalite/3.8.0": { - "jar": "sha256-HSWDsgkvIdvCnJCabwV+u4bYTkxU/LHXvAAmO4AaM/g=", - "pom": "sha256-4EnZCbCH/zokFi4H0KgIFE7BnnwK6Z1Ee0dZZ83361s=" + "com/google/http-client#google-http-client-parent/1.43.1": { + "pom": "sha256-fOZP1l2/NuZ5y+SUhU79JODdC/xXe1umLNCV5q8u6xM=" }, - "com/google/protobuf#protobuf-parent/3.8.0": { - "pom": "sha256-cGPoFu/yyZcFW9KmbuLJtObNEvhcj8lW5UhweQmAHEU=" + "com/google/http-client#google-http-client/1.43.1": { + "jar": "sha256-g043sK8s/oCyl75NalyP0MyrHQsT6bjXrJIejdLyUew=", + "pom": "sha256-21zBH3o7xj6nYyIPc6n1GO173MhAZ2Mt5VXeWQPtmPI=" }, - "com/google/protobuf#protoc/3.8.0": { - "pom": "sha256-0bqQU0Wx2o1GXQ0DCkzgiuVX0nz8krZiMvEN3ks4V9I=" + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" }, - "com/google/protobuf/protoc/3.8.0/protoc-3.8.0-linux-x86_64": { - "exe": "sha256-eeGGIvawJqOETt7d5Fzw4M98+8emLCho2dgtvtYSZeQ=" + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" }, - "commons-lang#commons-lang/2.6": { - "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", - "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + "com/google/protobuf#protobuf-bom/3.21.12": { + "pom": "sha256-O72GqUBXpnHmPVX532EsZBlz1ecNba4qtFYk/xrfUcU=" + }, + "com/google/protobuf#protobuf-bom/3.25.3": { + "pom": "sha256-tG4/Jv4PRz/zMHfuEkX4jUuNs1zHn1VM0P2Td2akXlg=" + }, + "com/google/protobuf#protobuf-java-util/3.21.12": { + "jar": "sha256-mz2nSVlbZsrww1ZW+nc2c8YdtopqyzTOHKtbL/xxDF8=", + "pom": "sha256-PRUyjuLPonCuYhxzlMMcW/IKhXZLSYrW9ubHSkv8YVw=" + }, + "com/google/protobuf#protobuf-java-util/3.25.3": { + "jar": "sha256-uBPI1tVUy3HB6C0XHX+AcwrnQiKhhchjy+3wUHLIgVU=", + "pom": "sha256-mwLH87Tr551RO/JGiw1vgOEe8RQylMsDQHxgaV5qkEs=" + }, + "com/google/protobuf#protobuf-java/3.21.12": { + "jar": "sha256-Pz7b2pKGJGCA8+r1Yd1rDVorHxAI9pCRFchgnOrp34c=", + "pom": "sha256-CXiOUXdwUnUK3bE39cMbdwDlY6UsncRQlXqGVM/gVrU=" + }, + "com/google/protobuf#protobuf-java/3.25.3": { + "jar": "sha256-6Q2N25Y7IKlypqWbUJOt4rB8vlRsqzJ5qvQ4MmA4X1g=", + "pom": "sha256-we+sGuAPC7q2VkKOGWtjaYyRTQ3SK+EgcQvv/EgctUc=" + }, + "com/google/protobuf#protobuf-parent/3.21.12": { + "pom": "sha256-fj44jW/7fyDmb/JfRbk3i0Igt7L9Jh9rO8IGs9/4u8g=" + }, + "com/google/protobuf#protobuf-parent/3.25.3": { + "pom": "sha256-vCdEYIzqOnotTNC3Thw/iBOMZM5aphudfwr9hGiCvno=" + }, + "com/google/re2j#re2j/1.6": { + "jar": "sha256-yLXDRy1NtZSoZbLkf4NdB/uLFBXuulWdzPsKaUXwM80=", + "pom": "sha256-DL7CO8gvuQDrXrYsX8LLXiObeKDrdl67CObwX6YVgDo=" + }, + "commons-codec#commons-codec/1.15": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "io/grpc#grpc-alts/1.54.0": { + "jar": "sha256-QuBz77s7BWtBMTUNw7YVjv2DwPRSkNXkxLjKE1e2dPA=", + "pom": "sha256-Wc0wTLw2SQmfETtEnYlKbtmFANL5T3r6NptcUgH+GcM=" + }, + "io/grpc#grpc-api/1.54.0": { + "jar": "sha256-NSGfOWFrmjPIxboZbh0ktJ4yHzREhgdT6EBVV1lUqjE=", + "pom": "sha256-iqKb2G5W60UzGTEwbPLlwghGzOs/diXB0JLo+HWcko8=" + }, + "io/grpc#grpc-auth/1.54.0": { + "jar": "sha256-uYtd/UbKUaJ/iRTEnqAMbC9Lncy+etrgHW2E9upCKwo=", + "pom": "sha256-rX6kJxBLu9zKyS0bfc39FXrGk85JRfE2Ub9qurIQkcE=" + }, + "io/grpc#grpc-bom/1.54.0": { + "pom": "sha256-wB1RhDKFZItNboB1O9UUDTdW1KnW4SAhTy1gkDlazOw=" + }, + "io/grpc#grpc-context/1.54.0": { + "jar": "sha256-m06EXYri30e2/Q4u3hFuRQ73kjy9OgkyBAJ4a+GeabE=", + "pom": "sha256-PYaGleq7bre/2dEP2Gs1eadI56H//daiqggiETog+Nc=" + }, + "io/grpc#grpc-core/1.54.0": { + "jar": "sha256-TXdLP8ITllVypPxK5R3B60vI0j4jKaGKdfA3yD439Sw=", + "pom": "sha256-oqzTg5rJXFBeqDlAkD1iyKJBZI6xugikVEPv+cKQ3I4=" + }, + "io/grpc#grpc-googleapis/1.54.0": { + "jar": "sha256-1+sx96NQTbxWX2v2IbnDl+RpmlgWFg7ag1VXdFbs+3U=", + "pom": "sha256-HmQDIfQAa3I7ur8CLWKQKmY0jWpdOwbdhQNysLsmES0=" + }, + "io/grpc#grpc-grpclb/1.54.0": { + "jar": "sha256-1NardVATbDs+tI6Yjz6DhPunQp75MZQ+B+SQ7NX16JU=", + "pom": "sha256-8IjegVQnmpBi85PnyDSsoWgICTmmSikpJ6caLI8HlkE=" + }, + "io/grpc#grpc-netty-shaded/1.54.0": { + "jar": "sha256-ttwhAzyT4l1E+CFS2PukMmv90xvU4gdfnSLe6AARhzM=", + "pom": "sha256-i+oJeBjOfkKMaKfSGDTrYD+yIBFph9Ts+nErHNRMb2w=" + }, + "io/grpc#grpc-protobuf-lite/1.54.0": { + "jar": "sha256-P32lYgFAtVuOB6EGWkMN0+Fef09UrRyjIWQoiDNY4wU=", + "pom": "sha256-3rGZlpJjBEb/ideQi1vfP5QYlTbVkveLiaXSeMIMY8c=" + }, + "io/grpc#grpc-protobuf/1.54.0": { + "jar": "sha256-YHmJNi3MEc3qF9Br45PE5CW+noqDQbIePw2++TMO2ZM=", + "pom": "sha256-XWefgulq6R3X5tBTvMXoixITOYwKr3NQoIEr1+7Y3bI=" + }, + "io/grpc#grpc-services/1.54.0": { + "jar": "sha256-fju+4YgrWDu88gdLePsz334Jv4Ymx6inpZSs0ppoM8s=", + "pom": "sha256-jcgkDnq8AfsuLraWhuIBFDuIthEW5M3DVzXKkucVwTM=" + }, + "io/grpc#grpc-stub/1.54.0": { + "jar": "sha256-r0gbqrjAHhEW+9bOWZFQOtgGSONrFIZBkv3ZK3v1J50=", + "pom": "sha256-AqilDzJx3oQos/0QN/dC6yu4ll/PIjHSEUEMWK00JAg=" + }, + "io/grpc#grpc-xds/1.54.0": { + "jar": "sha256-/mFHagVvHSFermdL52ussBXevRuybPdNnnbaGRlQxGk=", + "pom": "sha256-C+nz32pRbunKczoYxQ38ErVCaNfbYPG9IUpWxbNkL9k=" + }, + "io/netty#netty-buffer/4.1.100.Final": { + "jar": "sha256-Rih0tE7ngvvv7GQHjNpuuOe/nw4K9xqSjvTB8tVk9+4=", + "pom": "sha256-pKlxXeZ2+R2PiLQOt4c6DWN2mQIIZ5jTqJjKkwMlvTQ=" + }, + "io/netty#netty-codec-http/4.1.100.Final": { + "jar": "sha256-MmgR0knLDlVV544Cbod4NOeSJhw48GZtgEZEJmldlZA=", + "pom": "sha256-5rfLfsxp5E8SdyWkEk1Qh2M0+JZPx0d/xpSnSSqV/4o=" + }, + "io/netty#netty-codec-http2/4.1.100.Final": { + "jar": "sha256-I7SnQ1D0z41BuT+5PVK1BQZn2NU//8OFZyyG6rg7h0k=", + "pom": "sha256-4iMo6SZzeIbMW1eEC5GirtaP3oE6H1efmrWRF6KLmbw=" + }, + "io/netty#netty-codec/4.1.100.Final": { + "jar": "sha256-GAoB7WevOZYC4k/xwyhk5/V/V8Sg+l6as/6bDl6c8FE=", + "pom": "sha256-iRrXaSyRGjVqC573wlW8ZK/FJui/zK5vGMXtKRJJj3U=" + }, + "io/netty#netty-common/4.1.100.Final": { + "jar": "sha256-0pCDAfGsbykQkAdCRzwV1wF2XT1EZ6zbHuu53zqoKIU=", + "pom": "sha256-7/apmfoHAOALyd4Cj8yyoTEC57RJ87oqI6inaGAGMa8=" + }, + "io/netty#netty-handler/4.1.100.Final": { + "jar": "sha256-DhDlhMLn/ff0gE4Udg7ZhwA/G2KrmC9i6vE6mJJ5PTo=", + "pom": "sha256-RuVkerE0TF+u/+oM1QmRNGWAjAlGnQX1S3pWPpbZ1T4=" + }, + "io/netty#netty-parent/4.1.100.Final": { + "pom": "sha256-JXh90dBp/s0Q5HNgpQz2V7w5vtluqn53QAGI7vUFh0E=" + }, + "io/netty#netty-resolver/4.1.100.Final": { + "jar": "sha256-xCxIHHdunTZ6Rcw6Z6BvZYl9KAM06zCyNiuMVbdSP08=", + "pom": "sha256-Ti52vDcKBWTdt++pzyAydS4yj83QdRcOHB4jE/qO/cY=" + }, + "io/netty#netty-transport-classes-epoll/4.1.100.Final": { + "jar": "sha256-mrxLF7EhKzNmbq5OgBPQu3iporzQqaYhub0Gp+X8AFA=", + "pom": "sha256-bHkKddDuLakj/JXuMuvwGTqynytmeNms58AFqWdlT4s=" + }, + "io/netty#netty-transport-native-unix-common/4.1.100.Final": { + "jar": "sha256-XYiCMKBMSj5kfGTpM877ZP1JBW+Wm/tzTIo/zt8L6oo=", + "pom": "sha256-sWyNDgg/ZadLYRjCLtAsk9AbgIT2XB6sCPzm6BbVCxU=" + }, + "io/netty#netty-transport/4.1.100.Final": { + "jar": "sha256-sd7s7tqzc0zblZxV9L5atKZnqK7VkSH/k3Y/SUcPVHA=", + "pom": "sha256-n+Q/DqN6PO7cz/FXy6YQMx065VyJpfmkj7x11+FVnjw=" + }, + "io/opencensus#opencensus-api/0.31.1": { + "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=", + "pom": "sha256-VW9CfhIJDvs2pgh/dBCr/kXeEBByktlvpj5BdRdOy3Y=" + }, + "io/opencensus#opencensus-contrib-http-util/0.31.1": { + "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=", + "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s=" + }, + "io/opencensus#opencensus-proto/0.2.0": { + "jar": "sha256-DBktRR6d106Ychsn0C8OK2vKRLUVY7Xavy4hH3o+vxM=", + "pom": "sha256-twh5B5IPyKgVNGhrLxorMxEnr5fwFau9s3hqUfP6HlI=" + }, + "io/perfmark#perfmark-api/0.26.0": { + "jar": "sha256-t9I+k6NFN84zJwgmmg0UBHiKW14ZSegvVTX85Rs+qVs=", + "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=", + "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto=" + }, + "javax/annotation#javax.annotation-api/1.3.2": { + "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=", + "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c=" }, "junit#junit/4.13": { "jar": "sha256-S4Uy9jvcDgZhUH+UfrMkqVTR26xjGtGciqmgD+7R2GM=", "pom": "sha256-mg3Ew/orCG5wgiZzfvS7N4R8PLHOTiA1F8CfYwWyJn4=" }, - "kr/motd/maven#os-maven-plugin/1.6.2": { - "jar": "sha256-OgxJXeHOvIP2e+qhd2p5NvAvEfKt3Th5WWp4sqhryqM=", - "pom": "sha256-bXDR8vJydzDXedMqH9L7seoI51pnpQotjn0P2zoqSvM=" + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" }, - "org/apache#apache/7": { - "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" }, - "org/apache/commons#commons-parent/17": { - "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/httpcomponents#httpclient/4.5.14": { + "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", + "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.14": { + "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.16": { + "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" }, "org/bouncycastle#bcprov-jdk15on/1.68": { "jar": "sha256-9zKkbI3n4iMvIAfGgqIdH0zIqKAUm2t71qoa/cZaD40=", "pom": "sha256-2QfezWhfnNlx5xvfbOWXzzqVt8j/ajSCNRv9irwXz+A=" }, - "org/checkerframework#checker-qual/2.5.2": { - "jar": "sha256-ZLAmkci51OdwD47i50Lc5+osboHmYrdSLJ7jv1aMBAo=", - "pom": "sha256-3EzUOKNkYtATwjOMjiBtECoyKgDzNynolV7iGYWcnt4=" + "org/checkerframework#checker-qual/3.32.0": { + "jar": "sha256-tm4CXaCmv4Xwt/X9rcqDKjJ3H4WhLKwUAaPAzY/XPM0=", + "module": "sha256-zN7Nqhqu63g5UfanwY3Bk5XC4qXn93RQ1we41i6H3k8=", + "pom": "sha256-eVqIZSpu3vocMP26soASnkGDsaz5lKx0vkPz64qnfc8=" }, - "org/codehaus/mojo#animal-sniffer-annotations/1.17": { - "jar": "sha256-kmVPST7P7FIILnY1Tw6/h2SNw9XOwuPDzblHwBZ0elM=", - "pom": "sha256-6VarXS60j6uuEjANDNLTKU1KKkGrwgaMI8tNYK12y+U=" + "org/checkerframework#checker-qual/3.33.0": { + "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", + "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", + "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" }, - "org/codehaus/mojo#animal-sniffer-parent/1.17": { - "pom": "sha256-GKA98W4qGExYLbexJWM8Fft3FAJ6hMG1MtcpM9wIuB8=" + "org/codehaus/mojo#animal-sniffer-annotations/1.23": { + "jar": "sha256-n/5Sa/Q6Y0jp2LM7nNb1gKf17tDPBVkTAH7aJj3pdNA=", + "pom": "sha256-VhDbBrczZBrLx6DEioDEAGnbYnutBD+MfI16+09qPSc=" }, - "org/codehaus/mojo#mojo-parent/40": { - "pom": "sha256-/GSNzcQE+L9m4Fg5FOz5gBdmGCASJ76hFProUEPLdV4=" + "org/codehaus/mojo#animal-sniffer-parent/1.23": { + "pom": "sha256-a38FSrhqh/jiWZ81gIsJiZIuhrbKsTmIAhzRJkCktAQ=" }, - "org/conscrypt#conscrypt-openjdk-uber/2.5.1": { - "jar": "sha256-AfnHQstZKhUeLmK9U5eomAYoqWcAH82s1KpHRGeGhfM=", - "pom": "sha256-XivA41GARnUwxVpnqvq+XvmOBg7raY6a9tCw3N26lc0=" + "org/codehaus/mojo#mojo-parent/74": { + "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM=" + }, + "org/conscrypt#conscrypt-openjdk-uber/2.5.2": { + "jar": "sha256-6vU32Y4DPQ8EUc0bjMdOAte1XsiC2mPIgGDYBrqJw0g=", + "pom": "sha256-tf1UhzL5MlRdd3iQ65lSIr/oZiMjUb6QgTfjnDxnLYs=" }, "org/hamcrest#hamcrest-core/1.3": { "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", @@ -109,11 +395,191 @@ "org/hamcrest#hamcrest-parent/1.3": { "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.7.10": { + "jar": "sha256-GfEC7+lin46rxjhTrRXFM+R8R/kfygkoXFvehuWfkdQ=", + "pom": "sha256-EBHGO4julM3/XVlpNzB1WbxVA3tzPMAM5jzaPPrgqOs=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.7.10": { + "jar": "sha256-53H+dCUKlD6PY0ZxMgH/HYy5XDpdGpGiK2Wp4E9qiQE=", + "pom": "sha256-bMDPWivALe4GDruQw1Nfw929ejurIQrOPhQqr4F2TYE=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/reactivestreams#reactive-streams/1.0.4": { + "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", + "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" }, "org/sonatype/oss#oss-parent/9": { "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/threeten#threetenbp/1.6.8": { + "jar": "sha256-5LHrPZDDilTH8zhP2pV+C1vwtBtAZypErosDy2yHzgY=", + "pom": "sha256-ztMznYANG7wB7mct+A5NqHUgrgKXuarI+MS33aI+SwI=" + }, + "software/amazon/awssdk#annotations/2.23.18": { + "pom": "sha256-u/NoQopTahMxql1Uvl5/dMme+HetPvY/5YRzf4DTpMU=" + }, + "software/amazon/awssdk#annotations/2.24.7": { + "jar": "sha256-S8kcmqIxIc1ZKHM3eo3KkOG5G5gaTSA+yIxYXJJtrCo=", + "pom": "sha256-MNwRu7T2as2U4FEa7tvDIoOuKlGzckjz3M6L0MNc1Vo=" + }, + "software/amazon/awssdk#apache-client/2.23.18": { + "jar": "sha256-bwCXzDSM6l4mgs964DnXNIxJaLzjyz5IRh0rCFTBuWA=", + "pom": "sha256-Sryz9iZpMOKTHR7oYgwXtEd14ALx06MOVK5rJrWAfWg=" + }, + "software/amazon/awssdk#auth/2.23.18": { + "jar": "sha256-M8GVspwMVYVYXst52xpvTgV2oEr9iv7A9uP5UDIQKjk=", + "pom": "sha256-5xBdSEiC3SfSt4OlyDiZaXSDqxvGmpt1aJh3wVy/8S8=" + }, + "software/amazon/awssdk#aws-core/2.23.18": { + "jar": "sha256-d5rCzOz3dSqGSqai1nTJplvIwXVNcm8hawUwXlwQHdw=", + "pom": "sha256-Nq6BlAcW/P8sKQ522m06sYt/4qvNy37mI0//QJa6apI=" + }, + "software/amazon/awssdk#aws-json-protocol/2.23.18": { + "jar": "sha256-fm4kjYFOEamqNkIdNyb3ocgmIfiKplFGzKLPj0qvVHg=", + "pom": "sha256-3zpiZb1Cca7+HoOaU/NaxTU2FQXAELhZTb903D/ThIQ=" + }, + "software/amazon/awssdk#aws-sdk-java-pom/2.23.18": { + "pom": "sha256-DdAF90kz/ezIfyWOAHi15vE3HEnDCSu99BBzegOs92E=" + }, + "software/amazon/awssdk#aws-sdk-java-pom/2.24.7": { + "pom": "sha256-pVxLnOskbbcG57vMlkFp9eOeNCmYmJCz7ZSer7WAqJg=" + }, + "software/amazon/awssdk#bom-internal/2.23.18": { + "pom": "sha256-EzVaaj68bODzg3vEWjIAH479BKI81AvpMDUFxxRpSDo=" + }, + "software/amazon/awssdk#bom-internal/2.24.7": { + "pom": "sha256-UvuCrqRzdmMYh/1two+aINZyzj7/you1rwOV9FXo2yI=" + }, + "software/amazon/awssdk#checksums-spi/2.23.18": { + "jar": "sha256-oxjGgwaqdDS4fZXniNlVi9HpsTv1BkYl9kCUrDmnJ5k=", + "pom": "sha256-iW8Gv9gFverLy9IcN2rXPFh3ifpDdt/pMYG2ovkrvo4=" + }, + "software/amazon/awssdk#checksums/2.23.18": { + "jar": "sha256-+kXnR8Mmw1n79nvEWpbREvnQQxprRtpxv3n7+fIfcxQ=", + "pom": "sha256-WK7sn8HcpnD+m/9nhkeMmb9sLfa7URxMssYVXEd8zKo=" + }, + "software/amazon/awssdk#core/2.23.18": { + "pom": "sha256-whHR/zyCuvajWz0YKmBaGAP4x6nI9BIpyQyjPUc3SzU=" + }, + "software/amazon/awssdk#core/2.24.7": { + "pom": "sha256-ZMbleXgYUo4ziEm41KmM5GnLpTtpMAJaUWluhdUihM0=" + }, + "software/amazon/awssdk#endpoints-spi/2.23.18": { + "jar": "sha256-OVfxld7QPPaUT1mpxJTeZmmB/te1ZmWU+ZBQqzO/s6I=", + "pom": "sha256-rGgFmHffZn1aMj825X+O6Dgli9hf7EAlgYbhdwx41DY=" + }, + "software/amazon/awssdk#http-auth-aws/2.23.18": { + "jar": "sha256-AiTCBorI2wsGy/v81fxRhJt4Wf0rgdN+BuKEwEjb9z0=", + "pom": "sha256-SZ3tLK1vEUB21usf0BlzpX+Xozz/jRiTB90yD97zDtk=" + }, + "software/amazon/awssdk#http-auth-spi/2.23.18": { + "jar": "sha256-9QgH9ykETUTdIKmmRsEPf315BqMRaJs7O4I+irl9T08=", + "pom": "sha256-JQhtFkAGGOZNI2v++xTkuDk0Agu/h7AOfYhyq5q7osA=" + }, + "software/amazon/awssdk#http-auth/2.23.18": { + "jar": "sha256-2EW616cSQdPU2M+T5ZWD/mLFn4oE+30kaNLNvCBeiEU=", + "pom": "sha256-7TEY+UtwlSyvNrROBP5LgsgZV92fMzAHlU11bFsISeY=" + }, + "software/amazon/awssdk#http-client-spi/2.23.18": { + "pom": "sha256-1TEyPV+1aJGyk4QuGcLyl+0bq9GdK8jjc4TYd2BDYhg=" + }, + "software/amazon/awssdk#http-client-spi/2.24.7": { + "jar": "sha256-CzaksEhfg5sPpIDVgL4mg+0fHyYdIwVDH+8WPuyqKaA=", + "pom": "sha256-fi5vVpujx2UZvZkoMVu0YIaqL7sfTkkox9R9HdUgDYg=" + }, + "software/amazon/awssdk#http-clients/2.23.18": { + "pom": "sha256-oUaoCeI7DcOEz19MbrlBF+KljXB2OhN07fUHKRxW2ZM=" + }, + "software/amazon/awssdk#http-clients/2.24.7": { + "pom": "sha256-4VlySxMbsOD1H+uAx6soz7WLj546GSgRBBgewnm2XVI=" + }, + "software/amazon/awssdk#identity-spi/2.23.18": { + "jar": "sha256-PoZDhNJz9EbpoNIhq3Jqkna1cUMEW0l7D0/pxi7qUc4=", + "pom": "sha256-r1rmx6GeTNQvGU4xumS5xiUPGTY9VzSCTvU15+2zKsQ=" + }, + "software/amazon/awssdk#json-utils/2.23.18": { + "jar": "sha256-+dslPsJnAc6pNxjie1wEPvdvBrqdDdE0U8sgJdG41Y4=", + "pom": "sha256-NN7X19+3TF9NfDB5RH2ocpyGp3iXis2XJEsXF9Ek2Js=" + }, + "software/amazon/awssdk#kms/2.23.18": { + "jar": "sha256-CGGjL6rC8iOhchxcXpT7eWo+PtRl+7CRUH2AJfmgVMo=", + "pom": "sha256-6viSKV9amkbB30ERWxRaALK8ZC2+ltCrvxYd+sWqh04=" + }, + "software/amazon/awssdk#metrics-spi/2.23.18": { + "pom": "sha256-KB0RG8RCazAERl/cnMHLQJi2lQ++fkh8XLV0hMGpyUw=" + }, + "software/amazon/awssdk#metrics-spi/2.24.7": { + "jar": "sha256-GrYI8X2pwQpTtAtkmvGryTcrOaeCAF+NIr4z1GAf/yM=", + "pom": "sha256-1IrYkDfvgMLQs9I/35sra/mFctZmtlQC3R/tLP7lsN4=" + }, + "software/amazon/awssdk#netty-nio-client/2.23.18": { + "jar": "sha256-r6+aUWrbxgE8DgskuGHDOuVuTX61LIj8aH6FFRKYk3Y=", + "pom": "sha256-a5+91SZtknAOAjzfcSxXS76r8Cidzn+npSFISd3LUIY=" + }, + "software/amazon/awssdk#profiles/2.23.18": { + "jar": "sha256-1x1EHZXQtrfvONfkFhzSxqMh8EWtSln7ydeH0lE1oaw=", + "pom": "sha256-gDr0geArwi5S818OLS5fMquSQuqNgZWJRHcXXy9+LRc=" + }, + "software/amazon/awssdk#protocol-core/2.23.18": { + "jar": "sha256-YRxqBiVDHXID1ge5A/wRXUQFPO3x7dRBy7xI+8tjF2E=", + "pom": "sha256-lcjiTtXLew0sWD3t31PXLYVpUWLDhi5Qp0ugKR91Sao=" + }, + "software/amazon/awssdk#protocols/2.23.18": { + "pom": "sha256-wmTssyedVEqWIg1rxnXgARiIMs5WmGdF54wRtMvgSbQ=" + }, + "software/amazon/awssdk#regions/2.23.18": { + "jar": "sha256-uGMn/39yXEmYI+SgQuIgX0TMIuCq3C7+hnyHrrCtXaY=", + "pom": "sha256-l16KuXCbR9v13/bIOTM3m5v7qr+ieMrn5MDuEAsa/os=" + }, + "software/amazon/awssdk#sdk-core/2.23.18": { + "jar": "sha256-5ZY7kCNgNwVBOpvtfog3UfUOACRqVKhoAjj4Xgd07hk=", + "pom": "sha256-1vPsBkbZdi4Pgkk9/eTvbB2ACe02mKp1/sobuXR3zAQ=" + }, + "software/amazon/awssdk#services/2.23.18": { + "pom": "sha256-qbegC61+DnRYnxo28oC4lmKco9rkzB3mLenDCZhQrAQ=" + }, + "software/amazon/awssdk#third-party-jackson-core/2.23.18": { + "jar": "sha256-4zLJO048lhRWhMVIpzDohFJlCXKiaT20ozrTLvP0xP0=", + "pom": "sha256-BXOfqKWU/kz3Nq22QKZa8GRBkMlQpMRkAiYELqTB5Ho=" + }, + "software/amazon/awssdk#third-party/2.23.18": { + "pom": "sha256-OM/sIB6RuoAiypK1qepIaptnSY8Z6MtXLcDavlCHpIQ=" + }, + "software/amazon/awssdk#url-connection-client/2.24.7": { + "jar": "sha256-1zbDWhwNA+d4w4LR04pFSml3Mf4SbH/P2PaWLYFo7Co=", + "pom": "sha256-5SMf1UBLK7EGkGRhX2bSiR2zXxbL1sIZaQgNVCKvPeY=" + }, + "software/amazon/awssdk#utils/2.23.18": { + "pom": "sha256-57JdScZbeYdG/9psUCriiqC0smxcKT2/G0fy6lF8bsI=" + }, + "software/amazon/awssdk#utils/2.24.7": { + "jar": "sha256-Mx09/XCVBuON4XdYr++IzBkfvkEuCC5Z83OzlDZMO+0=", + "pom": "sha256-iqyHgJjhBSQRB/2H7zmNOl6wWpOMsdLhuyBR2DtCuuM=" + }, + "software/amazon/eventstream#eventstream/1.0.1": { + "jar": "sha256-DDfY5pYRfwLDAhkbgRCw0Osg+kEvzjTDomnsc8Fs6CI=", + "pom": "sha256-+UYMt5Sgp69oJ377V2lWno5mUVJQJ2w35ip+i9SyV8w=" } } } diff --git a/pkgs/by-name/ap/apksigner/package.nix b/pkgs/by-name/ap/apksigner/package.nix index 108d15a89e99..b8ff6932a0d4 100644 --- a/pkgs/by-name/ap/apksigner/package.nix +++ b/pkgs/by-name/ap/apksigner/package.nix @@ -5,6 +5,7 @@ jdk_headless, gradle_8, makeWrapper, + bashNonInteractive, }: let # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." @@ -12,36 +13,19 @@ let in stdenv.mkDerivation rec { pname = "apksigner"; - version = "34.0.5-unstable-2024-03-06"; + # Major version is derived from the API version of the corresponding Android release. + # Patch version is derived from the release number. + # For example, Android 15 had releases starting at r24 -> r30 is patch 6. + version = "35.0.6"; src = fetchgit { # use pname here because the final jar uses this as the filename name = pname; url = "https://android.googlesource.com/platform/tools/apksig"; - rev = "ac5cbb07d87cc342fcf07715857a812305d69888"; - hash = "sha256-sLAs7XEkhNkQjB/nhBODxI3QzxFvLWM1SBKDuXp6gvw="; + rev = "refs/tags/android-15.0.0_r30"; + hash = "sha256-f/PggxvBv8nYUyL9Ukd4YVpunpRWbLL5UYsYhsiDWRE="; }; - postPatch = '' - cat >> build.gradle <> $out/logprof.conf + '' +) diff --git a/pkgs/by-name/ap/apparmor-teardown/package.nix b/pkgs/by-name/ap/apparmor-teardown/package.nix new file mode 100644 index 000000000000..f5c299b24d76 --- /dev/null +++ b/pkgs/by-name/ap/apparmor-teardown/package.nix @@ -0,0 +1,33 @@ +{ + writeShellApplication, + coreutils, + gnused, + gnugrep, + which, + + # apparmor deps + apparmor-parser, + apparmor-bin-utils, + libapparmor, +}: +writeShellApplication { + name = "apparmor-teardown"; + runtimeInputs = [ + apparmor-parser + apparmor-bin-utils + coreutils + gnused + gnugrep + which + ]; + + text = '' + set +e # the imported script tries to `read` an empty line + # shellcheck source=/dev/null + . ${apparmor-parser}/lib/apparmor/rc.apparmor.functions + remove_profiles + exit 0 + ''; + + inherit (libapparmor) meta; +} diff --git a/pkgs/by-name/ap/apparmor-utils/package.nix b/pkgs/by-name/ap/apparmor-utils/package.nix new file mode 100644 index 000000000000..06e773dcc5f9 --- /dev/null +++ b/pkgs/by-name/ap/apparmor-utils/package.nix @@ -0,0 +1,86 @@ +{ + lib, + makeWrapper, + gawk, + perl, + bash, + stdenv, + which, + linuxHeaders ? stdenv.cc.libc.linuxHeaders, + python3Packages, + bashNonInteractive, + buildPackages, + + # apparmor deps + libapparmor, + apparmor-parser, + apparmor-teardown, +}: +python3Packages.buildPythonApplication { + pname = "apparmor-utils"; + inherit (libapparmor) version src; + + postPatch = + '' + patchShebangs . + cd utils + + substituteInPlace aa-remove-unknown \ + --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions" + substituteInPlace Makefile \ + --replace-fail "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" + sed -i -E 's/^(DESTDIR|BINDIR|PYPREFIX)=.*//g' Makefile + sed -i aa-unconfined -e "/my_env\['PATH'\]/d" + '' + + (lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i Makefile -e "/\/d" + ''); + + format = "other"; + strictDeps = true; + + doCheck = true; + + nativeBuildInputs = [ + makeWrapper + which + bashNonInteractive + python3Packages.setuptools + ]; + + buildInputs = [ + bash + perl + ]; + + pythonPath = [ + python3Packages.notify2 + python3Packages.psutil + libapparmor + ]; + + makeFlags = [ + "LANGS=" + "POD2MAN=${lib.getExe' buildPackages.perl "pod2man"}" + "POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}" + "MANDIR=share/man" + ]; + + installFlags = [ + "DESTDIR=$(out)" + "BINDIR=$(out)/bin" + "VIM_INSTALL_PATH=$(out)/share" + "PYPREFIX=" + ]; + + postInstall = '' + wrapProgram $out/bin/aa-remove-unknown \ + --prefix PATH : ${lib.makeBinPath [ gawk ]} + + ln -s ${lib.getExe apparmor-teardown} $out/bin/aa-teardown + ''; + + meta = libapparmor.meta // { + description = "Mandatory access control system - script user-land utilities"; + }; +} diff --git a/pkgs/by-name/ap/appeditor/package.nix b/pkgs/by-name/ap/appeditor/package.nix index 989345f505cb..c5265297083d 100644 --- a/pkgs/by-name/ap/appeditor/package.nix +++ b/pkgs/by-name/ap/appeditor/package.nix @@ -56,7 +56,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Edit the Pantheon desktop application menu"; homepage = "https://github.com/donadigo/appeditor"; - maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; + maintainers = with maintainers; [ xiorcale ]; + teams = [ teams.pantheon ]; platforms = platforms.linux; license = licenses.gpl3Plus; mainProgram = "com.github.donadigo.appeditor"; diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index d7f316ea540f..7c5dc7e4b330 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-e0G7J2BRRC+2MMqpvu5BNnimS7RRTjRBgo/j1T9iYWU="; + hash = "sha256-EuioRmdN4kUDh2P4Qb5YQZeNZqxwBgZ57VsY0YD1ru4="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-A9BCdYxeWPjCOZ/L0wYTVuqybLHfc1vsWWxAY7IJohw="; + hash = "sha256-uLM6hMASA9D5rOChgLnPsfeCAmgoo0IW8CsyfgRGBIU="; }; aarch64-darwin = x86_64-darwin; } @@ -30,7 +30,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.8.7"; + version = "0.9.2"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; diff --git a/pkgs/by-name/ap/appimagekit/nix.patch b/pkgs/by-name/ap/appimagekit/nix.patch deleted file mode 100644 index f03922cb5ca4..000000000000 --- a/pkgs/by-name/ap/appimagekit/nix.patch +++ /dev/null @@ -1,82 +0,0 @@ -Submodule lib/libappimage contains modified content -diff --git a/lib/libappimage/cmake/dependencies.cmake b/lib/libappimage/cmake/dependencies.cmake -index 8d96484..c7b17a1 100644 ---- a/lib/libappimage/cmake/dependencies.cmake -+++ b/lib/libappimage/cmake/dependencies.cmake -@@ -91,9 +91,18 @@ if(NOT USE_SYSTEM_SQUASHFUSE) - INCLUDE_DIRS "" - ) - else() -- message(STATUS "Using system squashfuse") -+ message(STATUS "Using system squashfsfuse from ${SQUASHFUSE}") - -- import_pkgconfig_target(TARGET_NAME libsquashfuse PKGCONFIG_TARGET squashfuse) -+ add_library(libsquashfuse INTERFACE IMPORTED GLOBAL) -+ -+ set(squashfuse_INCLUDE_DIRS "${SQUASHFUSE}/include") -+ set(squashfuse_LIBRARIES "${SQUASHFUSE}/lib/libsquashfuse.a;${SQUASHFUSE}/lib/libsquashfuse_ll.a;${SQUASHFUSE}/lib/libfuseprivate.a") -+ -+ set_property( -+ TARGET libsquashfuse -+ PROPERTY INTERFACE_LINK_LIBRARIES ${squashfuse_LIBRARIES} -+ ) -+ include_directories(${squashfuse_INCLUDE_DIRS}) - endif() - - -diff --git a/src/appimagetool.c b/src/appimagetool.c -index 6b37419..23425e7 100644 ---- a/src/appimagetool.c -+++ b/src/appimagetool.c -@@ -38,7 +38,7 @@ - #include - - #include --#include "squashfuse.h" -+#include - - #include - #include -@@ -96,7 +96,7 @@ static void die(const char *msg) { - } - - /* Function that prints the contents of a squashfs file --* using libsquashfuse (#include "squashfuse.h") */ -+* using libsquashfuse (#include ) */ - int sfs_ls(char* image) { - sqfs_err err = SQFS_OK; - sqfs_traverse trv; -diff --git a/src/appimagetoolnoglib.c b/src/appimagetoolnoglib.c -index f900e76..ffa87f8 100644 ---- a/src/appimagetoolnoglib.c -+++ b/src/appimagetoolnoglib.c -@@ -3,7 +3,7 @@ - - #include - #include --#include "squashfuse.h" -+#include - - #include - #include -@@ -118,7 +118,7 @@ int is_regular_file(const char *path) - } - - /* Function that prints the contents of a squashfs file -- * using libsquashfuse (#include "squashfuse.h") */ -+ * using libsquashfuse (#include ) */ - int sfs_ls(char* image) { - sqfs_err err = SQFS_OK; - sqfs_traverse trv; -diff --git a/src/runtime.c b/src/runtime.c -index bada3af..70a642b 100644 ---- a/src/runtime.c -+++ b/src/runtime.c -@@ -29,7 +29,7 @@ - - #define _GNU_SOURCE - --#include "squashfuse.h" -+#include - #include - #include diff --git a/pkgs/by-name/ap/appimagekit/package.nix b/pkgs/by-name/ap/appimagekit/package.nix deleted file mode 100644 index 9f5b5d10bf96..000000000000 --- a/pkgs/by-name/ap/appimagekit/package.nix +++ /dev/null @@ -1,175 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - cmake, - autoconf, - automake, - libtool, - makeWrapper, - wget, - xxd, - desktop-file-utils, - file, - gnupg, - glib, - zlib, - cairo, - openssl, - fuse, - xz, - squashfuse, - inotify-tools, - libarchive, - squashfsTools, - gtest, -}: - -let - - appimagekit_src = fetchFromGitHub { - owner = "AppImage"; - repo = "AppImageKit"; - rev = "8bbf694455d00f48d835f56afaa1dabcd9178ba6"; - hash = "sha256-pqg+joomC5CI9WdKP/h/XKPsruMgZEaIOjPLOqnNPZw="; - fetchSubmodules = true; - }; - - # squashfuse adapted to nix from cmake expression in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake" - appimagekit_squashfuse = squashfuse.overrideAttrs rec { - pname = "squashfuse"; - version = "unstable-2016-10-09"; - - src = fetchFromGitHub { - owner = "vasi"; - repo = pname; - rev = "1f980303b89c779eabfd0a0fdd36d6a7a311bf92"; - sha256 = "sha256-BZd1+7sRYZHthULKk3RlgMIy4uCUei45GbSEiZxLPFM="; - }; - - patches = [ - "${appimagekit_src}/lib/libappimage/src/patches/squashfuse.patch" - "${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.patch" - ]; - - postPatch = '' - cp -v ${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.[hc] . - ''; - - # Workaround build failure on -fno-common toolchains: - # ld: libsquashfuse_ll.a(libfuseprivate_la-fuseprivate.o):(.bss+0x8): - # multiple definition of `have_libloaded'; runtime.4.o:(.bss.have_libloaded+0x0): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure = '' - sed -i "/PKG_CHECK_MODULES.*/,/,:./d" configure - sed -i "s/typedef off_t sqfs_off_t/typedef int64_t sqfs_off_t/g" common.h - ''; - - configureFlags = [ - "--disable-demo" - "--disable-high-level" - "--without-lzo" - "--without-lz4" - ]; - - postConfigure = '' - sed -i "s|XZ_LIBS = -llzma |XZ_LIBS = -Bstatic -llzma/|g" Makefile - ''; - - # only static libs and header files - installPhase = '' - mkdir -p $out/lib $out/include - cp -v ./.libs/*.a $out/lib - cp -v ./*.h $out/include - ''; - }; - -in -stdenv.mkDerivation rec { - pname = "appimagekit"; - version = "unstable-2020-12-31"; - - src = appimagekit_src; - - patches = [ ./nix.patch ]; - - postPatch = '' - patchShebangs src/embed-magic-bytes-in-file.sh - ''; - - nativeBuildInputs = [ - pkg-config - cmake - autoconf - automake - libtool - wget - xxd - desktop-file-utils - makeWrapper - ]; - - buildInputs = [ - glib - zlib - cairo - openssl - fuse - xz - inotify-tools - libarchive - squashfsTools - appimagekit_squashfuse - ]; - - preConfigure = '' - export HOME=$(pwd) - ''; - - cmakeFlags = [ - "-DUSE_SYSTEM_XZ=ON" - "-DUSE_SYSTEM_SQUASHFUSE=ON" - "-DSQUASHFUSE=${appimagekit_squashfuse}" - "-DUSE_SYSTEM_LIBARCHIVE=ON" - "-DUSE_SYSTEM_GTEST=ON" - "-DUSE_SYSTEM_MKSQUASHFS=ON" - "-DTOOLS_PREFIX=${stdenv.cc.targetPrefix}" - ]; - - postInstall = '' - mkdir -p $out/lib/appimagekit - cp "${squashfsTools}/bin/mksquashfs" "$out/lib/appimagekit/" - cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin" - - wrapProgram "$out/bin/appimagetool" \ - --prefix PATH : "${ - lib.makeBinPath [ - file - gnupg - ] - }" \ - --unset SOURCE_DATE_EPOCH - ''; - - nativeCheckInputs = [ gtest ]; - - # for debugging - passthru = { - squashfuse = appimagekit_squashfuse; - }; - - meta = with lib; { - description = "Tool to package desktop applications as AppImages"; - longDescription = '' - AppImageKit is an implementation of the AppImage format that - provides tools such as appimagetool and appimaged for handling - AppImages. - ''; - license = licenses.mit; - maintainers = with maintainers; [ taeer ]; - homepage = src.meta.homepage; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/ap/appimageupdate/package.nix b/pkgs/by-name/ap/appimageupdate/package.nix index b1af05103d8a..a39187409b4b 100644 --- a/pkgs/by-name/ap/appimageupdate/package.nix +++ b/pkgs/by-name/ap/appimageupdate/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, qt5, @@ -27,6 +28,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-b2RqSw0Ksn9OLxQV9+3reBiqrty+Kx9OwV93jlvuPnY="; }; + patches = [ + (fetchpatch { + name = "include-algorithm-header.patch"; + url = "https://github.com/AppImageCommunity/AppImageUpdate/commit/5e91de84aba775ba8d3a4771e4f7f06056f9b764.patch"; + hash = "sha256-RX2HFAlGsEjXona7cL3WdwwiiA0u9CnfvHMC6S0DeLY="; + }) + ]; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail 'VERSION 1-alpha' 'VERSION ${finalAttrs.version}' \ diff --git a/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix b/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix index 7bb655a1863b..ebf7bf69ca30 100644 --- a/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix +++ b/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix @@ -34,7 +34,7 @@ let description = "Reverse engineered headers for Apple's CoreSymbolication framework"; homepage = "https://github.com/matthewbauer/CoreSymbolication"; license = lib.licenses.mit; - maintainers = lib.teams.darwin.members; + teams = [ lib.teams.darwin ]; platforms = lib.platforms.darwin; }; }); diff --git a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix index d562816c17bd..0f87f9c326bd 100644 --- a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix +++ b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix @@ -35,7 +35,24 @@ self: super: { | .main_library.reexported_libraries[].names[] |= select([.] | inside($libs) | not) ' > usr/lib/$libSystem~ # Convert libSystem back to tbd-v4 because not all tooling supports the JSON-based format yet. - llvm-readtapi -delete-input --filetype=tbd-v4 usr/lib/$libSystem~ -o usr/lib/$libSystem + llvm-readtapi --filetype=tbd-v4 usr/lib/$libSystem~ -o usr/lib/$libSystem + rm usr/lib/$libSystem~ done + + # Strip weak C++ symbols to work around `libc++` leakage in system + # frameworks for now. These are only present on `x86_64-darwin`, so + # it should hopefully be harmless. + # + # TODO FIXME: This is kind of horrible. + while read -r -d "" stub; do + printf 'Stripping weak C++ symbols from %s\n' "$stub" + llvm-readtapi --filetype=tbd-v5 "$stub" \ + | jq ' + (.main_library, .libraries[]?).exported_symbols[]?.data.weak[]? |= + select(startswith("__Z") | not) + ' > $stub~ + llvm-readtapi --filetype=tbd-v4 $stub~ -o $stub + rm $stub~ + done < <(find . -name '*.tbd' -print0) ''; } diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix index f413de4603ec..04b32f07a642 100644 --- a/pkgs/by-name/ap/apple-sdk/package.nix +++ b/pkgs/by-name/ap/apple-sdk/package.nix @@ -108,7 +108,7 @@ stdenvNoCC.mkDerivation ( meta = { description = "Frameworks and libraries required for building packages on Darwin"; homepage = "https://developer.apple.com"; - maintainers = lib.teams.darwin.members; + teams = [ lib.teams.darwin ]; platforms = lib.platforms.darwin; badPlatforms = [ lib.systems.inspect.patterns.is32bit ]; }; diff --git a/pkgs/development/libraries/physics/applgrid/bad_code.patch b/pkgs/by-name/ap/applgrid/bad_code.patch similarity index 100% rename from pkgs/development/libraries/physics/applgrid/bad_code.patch rename to pkgs/by-name/ap/applgrid/bad_code.patch diff --git a/pkgs/by-name/ap/applgrid/package.nix b/pkgs/by-name/ap/applgrid/package.nix new file mode 100644 index 000000000000..f5ebcf89d724 --- /dev/null +++ b/pkgs/by-name/ap/applgrid/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchurl, + gfortran, + hoppet, + lhapdf, + root5, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "applgrid"; + version = "1.4.70"; + + src = fetchurl { + url = "https://www.hepforge.org/archive/applgrid/${pname}-${version}.tgz"; + sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; + }; + + nativeBuildInputs = [ gfortran ]; + + # For some reason zlib was only needed after bump to gfortran8 + buildInputs = [ + hoppet + lhapdf + root5 + zlib + ]; + + patches = [ + ./bad_code.patch + ]; + + preConfigure = + '' + substituteInPlace src/Makefile.in \ + --replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib" + '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace src/Makefile.in \ + --replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib" + ''); + + enableParallelBuilding = false; # broken + + # Install private headers required by APFELgrid + postInstall = '' + for header in src/*.h; do + install -Dm644 "$header" "$out"/include/appl_grid/"`basename $header`" + done + ''; + + meta = with lib; { + description = "APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics"; + license = licenses.gpl3; + homepage = "http://applgrid.hepforge.org"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix index c34b69026b4f..e607dd3c9163 100644 --- a/pkgs/by-name/ap/application-title-bar/package.nix +++ b/pkgs/by-name/ap/application-title-bar/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "application-title-bar"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "antroids"; repo = "application-title-bar"; tag = "v${finalAttrs.version}"; - hash = "sha256-VlZlcPBGwV8Gyqm8CjwUZdaQgTiPLsSxj0iIXKbLEpE="; + hash = "sha256-YSzXjFPCG/bs1Qm9YvoEDcM9GmlSosf2KAyz+7lx6Xg="; }; propagatedUserEnvPkgs = with kdePackages; [ kconfig ]; diff --git a/pkgs/by-name/ap/apprun-cli/package.nix b/pkgs/by-name/ap/apprun-cli/package.nix index 1f2d7f5ced4e..1ae19d83a0c5 100644 --- a/pkgs/by-name/ap/apprun-cli/package.nix +++ b/pkgs/by-name/ap/apprun-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "apprun-cli"; - version = "0.0.2"; + version = "0.3.2"; src = fetchFromGitHub { owner = "fujiwara"; repo = "apprun-cli"; tag = "v${version}"; - hash = "sha256-SvFShjAHjIKhz/YolgmFeaAxflh3FRPEZDx57+AtXeQ="; + hash = "sha256-k8ZFDWIuUjYqDIm7JdiqjeF2qaPX0SaOgqk4oud09Lc="; }; - vendorHash = "sha256-pz97Eihc/6b2J+JuEZJQoqBkKtf1J5XbSFMQa1CJrRo="; + vendorHash = "sha256-WQRDkxL52RQmZn2aeE13pU4YGk8UjuZtS1lTNb53/hQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/ap/appvm/package.nix b/pkgs/by-name/ap/appvm/package.nix index 62378c5072fe..5947b482ad9a 100644 --- a/pkgs/by-name/ap/appvm/package.nix +++ b/pkgs/by-name/ap/appvm/package.nix @@ -22,13 +22,13 @@ let in buildGoModule rec { pname = "appvm"; - version = "unstable-2021-12-20"; + version = "0.6"; src = fetchFromGitHub { owner = "jollheef"; repo = pname; - rev = "17f17be7846d872e7e26d5cb6759a52ea4113587"; - sha256 = "sha256-FL5olOy1KufULyqI2dJeS0OnKzC3LfPWxnia2i4f4yY="; + tag = "v${version}"; + sha256 = "sha256-n+YputGiNWSOYbwes/rjz0h3RWZONDTc8+LDc0La/KU="; }; vendorHash = "sha256-8eU+Mf5dxL/bAMMShXvj8I1Kdd4ysBTWvgYIXwLStPI="; @@ -45,14 +45,14 @@ buildGoModule rec { }" ''; - meta = with lib; { + meta = { description = "Nix-based app VMs"; homepage = "https://code.dumpstack.io/tools/${pname}"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ dump_stack cab404 onny ]; - license = licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index c6724ca7b683..5512e92156de 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.9.33"; + version = "3.0.1"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "apt-team"; repo = "apt"; rev = finalAttrs.version; - hash = "sha256-CniUdpQWUyS0GMRLmdA4zX0iF3geT5dglBfJy1li9O0="; + hash = "sha256-pWOXwcZBhr2kOZuP0IEg/PazF8bIN0qvsHOz8SY+Xr8="; }; # cycle detection; lib can't be split diff --git a/pkgs/by-name/ap/aptly/package.nix b/pkgs/by-name/ap/aptly/package.nix index f04824a05fb3..9987d43bbb8d 100644 --- a/pkgs/by-name/ap/aptly/package.nix +++ b/pkgs/by-name/ap/aptly/package.nix @@ -12,18 +12,18 @@ aptly, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "aptly"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "aptly-dev"; repo = "aptly"; - rev = "v${version}"; - sha256 = "sha256-LqGOLXXaGfQfoj2r+aY9SdOKUDI9+22EsHKBhHMidyk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-oGogOK0oQTdmlQUrIOo2BT/8wEk9kZ3mJbj0K5s9tiU="; }; - vendorHash = "sha256-6l3OFKFTtFWT68Ylav6woczBlMhD75C9ZoQ6OeLz0Cs="; + vendorHash = "sha256-4z0JFC+Cz72e48ygfgA4DYJVkpInPIyA5yh//eedt8Q="; nativeBuildInputs = [ installShellFiles @@ -33,21 +33,24 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.Version=${version}" ]; + preBuild = '' + echo ${finalAttrs.version} > VERSION + ''; + postInstall = '' installShellCompletion --bash --name aptly completion.d/aptly installShellCompletion --zsh --name _aptly completion.d/_aptly - wrapProgram "$out/bin/aptly" \ - --prefix PATH ":" "${ + wrapProgram $out/bin/aptly \ + --prefix PATH : ${ lib.makeBinPath [ gnupg bzip2 xz graphviz ] - }" + } ''; doCheck = false; @@ -57,12 +60,13 @@ buildGoModule rec { command = "aptly version"; }; - meta = with lib; { + meta = { homepage = "https://www.aptly.info"; description = "Debian repository management tool"; - license = licenses.mit; - maintainers = with maintainers; [ montag451 ] ++ teams.bitnomial.members; - changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${version}"; + license = lib.licenses.mit; + changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${finalAttrs.version}"; + maintainers = [ lib.maintainers.montag451 ]; + teams = [ lib.teams.bitnomial ]; mainProgram = "aptly"; }; -} +}) diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix index 8e652f2b1f89..de3bc91aeaa9 100644 --- a/pkgs/by-name/ap/apvlv/package.nix +++ b/pkgs/by-name/ap/apvlv/package.nix @@ -20,7 +20,7 @@ poppler, stdenv, testers, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, }: @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { libxshmfence # otherwise warnings in compilation pcre poppler - webkitgtk_4_0 + webkitgtk_4_1 ]; installPhase = '' diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index 80a34de0a0e7..26af9529aa98 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A very light linux rendering backend library"; homepage = "https://github.com/hyprwm/aquamarine"; license = lib.licenses.bsd3; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; }) diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix index 512f839244f1..458cbb3ce673 100644 --- a/pkgs/by-name/ar/aranym/package.nix +++ b/pkgs/by-name/ar/aranym/package.nix @@ -4,6 +4,7 @@ autoreconfHook, fetchFromGitHub, libGLU, + libX11, pkg-config, stdenv, }: @@ -26,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGLU + libX11 SDL2 ]; diff --git a/pkgs/by-name/ar/aravis/package.nix b/pkgs/by-name/ar/aravis/package.nix index 7f2f7ce4a2f3..5447efb9e304 100644 --- a/pkgs/by-name/ar/aravis/package.nix +++ b/pkgs/by-name/ar/aravis/package.nix @@ -30,13 +30,13 @@ assert enableViewer -> wrapGAppsHook3 != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.33"; + version = "0.8.34"; src = fetchFromGitHub { owner = "AravisProject"; repo = "aravis"; - rev = version; - sha256 = "sha256-D6zcTCaFJxJ2VhhsgEFu5+3Xx1MJov4ryrtA0VkjZlY="; + tag = version; + hash = "sha256-6tCV2QyzlMNnkXlRz41JT05FeBcRckHXM50VGY5/BnM="; }; outputs = [ @@ -82,6 +82,9 @@ stdenv.mkDerivation rec { doCheck = true; + # needed for fakegv tests + __darwinAllowLocalNetworking = true; + meta = { description = "Library for video acquisition using GenICam cameras"; longDescription = '' diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index af4c56d640ae..957c24aafd49 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.87.1-60573"; + version = "1.91.2-62278"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-UiB5MQl7hRl6nPu4xiwOdhC40bHYIcpPNtWg98HqCJc="; + hash = "sha256-8ry7FomJem6rMv3q6w0LffWl3bDHSdyxlWzDf58oNnc="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/ar/archi/package.nix b/pkgs/by-name/ar/archi/package.nix index 8bf9c5806541..5d3bc9a91c8d 100644 --- a/pkgs/by-name/ar/archi/package.nix +++ b/pkgs/by-name/ar/archi/package.nix @@ -7,29 +7,31 @@ jdk, libsecret, glib, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, _7zz, nixosTests, + copyDesktopItems, + makeDesktopItem, }: stdenv.mkDerivation rec { pname = "Archi"; - version = "5.5.0"; + version = "5.6.0"; src = { "x86_64-linux" = fetchurl { url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Linux64-${version}.tgz"; - hash = "sha256-DLYgfYzSsxW4JZfWM+EU8icY+DvMMkvrIkj4NMiNBL0="; + hash = "sha256-zPgsRfbhN22Sph/5AvP7y2uHdgy1cZRcsm+O1dVLNHc="; }; "x86_64-darwin" = fetchurl { url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-${version}.dmg"; - hash = "sha256-BeQPTsY4pgCsoE4P+dMKE+P3UP+8WiUTbiWFespkzsk="; + hash = "sha256-NZWMQzLsPcJ7cZoYFUxXxLIu7yCIHE5pw9+UqjtG7Cc="; }; "aarch64-darwin" = fetchurl { url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-Silicon-${version}.dmg"; - hash = "sha256-g5FFgv7w4Hs26GlUXCpV3VQjNrWd355vtxt6FD84DWg="; + hash = "sha256-a80QyJT+mizT4bxhJ/1rXnQGbq0Zxwmqb74n2QH4H3I="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -48,6 +50,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook + copyDesktopItems ]; sourceRoot = if stdenv.hostPlatform.isDarwin then "." else null; @@ -55,6 +58,8 @@ stdenv.mkDerivation rec { installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then '' + runHook preInstall + mkdir -p $out/bin $out/libexec for f in configuration features p2 plugins Archi.ini; do cp -r $f $out/libexec @@ -65,18 +70,40 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath ([ glib - webkitgtk_4_0 + webkitgtk_4_1 ]) } \ --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ --prefix PATH : ${jdk}/bin + + install -Dm444 icon.xpm $out/share/icons/hicolor/256x256/apps/archi.xpm + + runHook postInstall '' else '' + runHook preInstall + mkdir -p "$out/Applications" mv Archi.app "$out/Applications/" + + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "archi"; + desktopName = "Archi"; + exec = "Archi"; + type = "Application"; + comment = meta.description; + icon = "archi"; + categories = [ + "Development" + ]; + }) + ]; + passthru.updateScript = ./update.sh; passthru.tests = { inherit (nixosTests) archi; }; diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix index b1384d9d60f8..4140936fc5e7 100644 --- a/pkgs/by-name/ar/archipelago/package.nix +++ b/pkgs/by-name/ar/archipelago/package.nix @@ -7,10 +7,10 @@ }: let pname = "archipelago"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${version}/Archipelago_${version}_linux-x86_64.AppImage"; - hash = "sha256-hpyMi/Zd4yDKd/53xuChRTQDD9QkcyqwqrmwoWSQMkY="; + hash = "sha256-8mPlR5xVnHL9I0rV4bMFaffSJv7dMlCcPHrLkM/pyVU="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ar/archtika/package.nix b/pkgs/by-name/ar/archtika/package.nix deleted file mode 100644 index c59c95e9516e..000000000000 --- a/pkgs/by-name/ar/archtika/package.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - stdenv, - buildNpmPackage, - importNpmLock, - symlinkJoin, - fetchFromGitHub, - nix-update-script, -}: - -let - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "archtika"; - repo = "archtika"; - tag = "v${version}"; - hash = "sha256-ba9da7LqCE/e2lhRVHD7GOhwOj1fNTBbN/pARPMzIg4="; - }; - - web = buildNpmPackage { - name = "web-app"; - src = "${src}/web-app"; - npmDepsHash = "sha256-RTyo7K/Hr1hBGtcBKynrziUInl91JqZl84NkJg16ufA="; - npmFlags = [ "--legacy-peer-deps" ]; - installPhase = '' - mkdir -p $out/web-app - cp package.json $out/web-app - cp -r node_modules $out/web-app - cp -r build/* $out/web-app - cp -r template-styles $out/web-app - ''; - }; - - api = stdenv.mkDerivation { - name = "api"; - src = "${src}/rest-api"; - installPhase = '' - mkdir -p $out/rest-api/db/migrations - cp -r db/migrations/* $out/rest-api/db/migrations - ''; - }; -in -symlinkJoin { - pname = "archtika"; - inherit version; - - paths = [ - web - api - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Modern, performant and lightweight CMS"; - homepage = "https://archtika.com"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.thiloho ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/ar/arduino-cli/package.nix b/pkgs/by-name/ar/arduino-cli/package.nix index 9072f6e05ac8..d1023f24e958 100644 --- a/pkgs/by-name/ar/arduino-cli/package.nix +++ b/pkgs/by-name/ar/arduino-cli/package.nix @@ -12,13 +12,13 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "arduino"; repo = "arduino-cli"; tag = "v${version}"; - hash = "sha256-7rruSIhKGm2R89Jo1jY+1ZWKloYsL5oaSWuppMKOeFQ="; + hash = "sha256-zP0N9QfyaKCFP413S2rlrWwqVdfhdcxAgcxsAO/mfpE="; }; nativeBuildInputs = [ installShellFiles ]; @@ -27,7 +27,7 @@ let subPackages = [ "." ]; - vendorHash = "sha256-uNrkDqw0JoRxe7FuAvQLd7Y4i+nQPhKH0/aWES2+FRc="; + vendorHash = "sha256-BOB9K5N4ELLWdSHCNdFYCypbEyoZz2dOz9wouwP7AHw="; postPatch = let @@ -71,16 +71,16 @@ let unset HOME ''; - meta = with lib; { + meta = { inherit (src.meta) homepage; description = "Arduino from the command line"; mainProgram = "arduino-cli"; changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}"; - license = [ - licenses.gpl3Only - licenses.asl20 + license = with lib.licenses; [ + gpl3Only + asl20 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ ryantm sfrijters ]; diff --git a/pkgs/by-name/ar/arduino-ide/package.nix b/pkgs/by-name/ar/arduino-ide/package.nix index 84dceea635f4..8c55748c2182 100644 --- a/pkgs/by-name/ar/arduino-ide/package.nix +++ b/pkgs/by-name/ar/arduino-ide/package.nix @@ -6,11 +6,11 @@ let pname = "arduino-ide"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { url = "https://github.com/arduino/arduino-ide/releases/download/${version}/arduino-ide_${version}_Linux_64bit.AppImage"; - hash = "sha256-U1yMxqL+XfJpb7i7DsEzE2CpCAPJptrjLPm5JVntO8I="; + hash = "sha256-3Zx6XRhkvAt1Erv13wF3p3lm3guRDYreh+ATBzoO6pk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ar/ares-cli/package.nix b/pkgs/by-name/ar/ares-cli/package.nix index 180507184c6f..88e67f7e22fc 100644 --- a/pkgs/by-name/ar/ares-cli/package.nix +++ b/pkgs/by-name/ar/ares-cli/package.nix @@ -6,12 +6,12 @@ }: buildNpmPackage rec { pname = "ares-cli"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "webos-tools"; repo = "cli"; rev = "v${version}"; - hash = "sha256-tSnmIDDDEhhQBrjZ5bujmCaYpetTjpdCGUjKomue+Bc="; + hash = "sha256-L8suZDtXVchVyvp7KCv0UaceJqqGBdfopd5tZzwj3MY="; }; postPatch = '' @@ -19,7 +19,7 @@ buildNpmPackage rec { ''; dontNpmBuild = true; - npmDepsHash = "sha256-eTuAi+32pK8rGQ5UDWesDFvlkjWj/ERevD+aYXYYr0Q="; + npmDepsHash = "sha256-ATIxe/sulfOpz5KiWauDAPZrlfUOFyiTa+5ECFbVd+0="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ar/ares-rs/package.nix b/pkgs/by-name/ar/ares-rs/package.nix index 21e41d5b1aa6..4e7ba2a2b08e 100644 --- a/pkgs/by-name/ar/ares-rs/package.nix +++ b/pkgs/by-name/ar/ares-rs/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -36,5 +37,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "ares"; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/by-name/ar/ares/darwin-build-fixes.patch b/pkgs/by-name/ar/ares/darwin-build-fixes.patch index e0fe64bc94da..96b07f2ee141 100644 --- a/pkgs/by-name/ar/ares/darwin-build-fixes.patch +++ b/pkgs/by-name/ar/ares/darwin-build-fixes.patch @@ -1,18 +1,18 @@ diff --git a/cmake/macos/compilerconfig.cmake b/cmake/macos/compilerconfig.cmake -index 99272c662..50f94db37 100644 +index f0c900f28..4da64f0b3 100644 --- a/cmake/macos/compilerconfig.cmake +++ b/cmake/macos/compilerconfig.cmake -@@ -27,7 +27,7 @@ message(DEBUG "macOS SDK Path: ${CMAKE_OSX_SYSROOT}") - string(REGEX MATCH ".+/SDKs/MacOSX([0-9]+\\.[0-9])+\\.sdk$" _ ${CMAKE_OSX_SYSROOT}) - set(_ares_macos_current_sdk ${CMAKE_MATCH_1}) - message(DEBUG "macOS SDK version: ${_ares_macos_current_sdk}") --if(_ares_macos_current_sdk VERSION_LESS _ares_macos_minimum_sdk) -+if(FALSE) - message( - FATAL_ERROR - "Your macOS SDK version (${_ares_macos_current_sdk}) is too low. " +@@ -25,7 +25,7 @@ function(check_sdk_requirements) + set(ares_macos_minimum_sdk 11.1) # Minimum tested SDK + set(ares_macos_minimum_xcode 12.4) # Sync with SDK + execute_process( +- COMMAND xcrun --sdk macosx --show-sdk-platform-version ++ COMMAND echo @sdkVersion@ + OUTPUT_VARIABLE ares_macos_current_sdk + RESULT_VARIABLE result + OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/cmake/macos/helpers.cmake b/cmake/macos/helpers.cmake -index 864a629f0..f455345bf 100644 +index 3777ac98a..07ff17009 100644 --- a/cmake/macos/helpers.cmake +++ b/cmake/macos/helpers.cmake @@ -35,7 +35,6 @@ function(ares_configure_executable target) @@ -23,3 +23,16 @@ index 864a629f0..f455345bf 100644 install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application) endif() +diff --git a/ruby/cmake/os-macos.cmake b/ruby/cmake/os-macos.cmake +index 39c339428..dafb58c66 100644 +--- a/ruby/cmake/os-macos.cmake ++++ b/ruby/cmake/os-macos.cmake +@@ -43,7 +43,7 @@ target_link_libraries( + if(SDL_FOUND) + target_link_libraries( + ruby +- PRIVATE "$" ++ PRIVATE "$" + ) + endif() + diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index e917588264c8..84eaaf6f3d49 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -1,6 +1,5 @@ { lib, - SDL2, alsa-lib, apple-sdk_14, cmake, @@ -19,6 +18,8 @@ moltenvk, openal, pkg-config, + replaceVars, + sdl3, stdenv, udev, vulkan-loader, @@ -28,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "143"; + version = "144"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; tag = "v${finalAttrs.version}"; - hash = "sha256-uuFKbS7WvxkTyyQfuQ6iKPvRt+54zUPdjUlQ/ohBAr8="; + hash = "sha256-BpVyPdtsIUstLVf/HGO6vcAlLgJP5SgJbZtqEV/uJ2g="; }; nativeBuildInputs = @@ -49,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - SDL2 + sdl3 libao librashader vulkan-loader @@ -73,7 +74,9 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - ./darwin-build-fixes.patch + (replaceVars ./darwin-build-fixes.patch { + sdkVersion = apple-sdk_14.version; + }) ]; cmakeFlags = [ diff --git a/pkgs/by-name/ar/argo-rollouts/package.nix b/pkgs/by-name/ar/argo-rollouts/package.nix index 34dda4412482..f4e1f3419e04 100644 --- a/pkgs/by-name/ar/argo-rollouts/package.nix +++ b/pkgs/by-name/ar/argo-rollouts/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-SNzWAs1ytduU2XhPccJ+HUagh8cHcIb6zj0/EosdpTc="; + sha256 = "sha256-C2Ha3Sdq5IOHEc9S4jb4g6do6a4Gkm4E0BVFq5TnJDM="; }; vendorHash = "sha256-1YtRc2xLP8QAIK+vO690zHb9tXCkR7na/zwwlIdAxgQ="; diff --git a/pkgs/by-name/ar/argo-workflows/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix index 4539d99529a8..475d9054aa19 100644 --- a/pkgs/by-name/ar/argo-workflows/package.nix +++ b/pkgs/by-name/ar/argo-workflows/package.nix @@ -38,16 +38,16 @@ let in buildGoModule rec { pname = "argo-workflows"; - version = "3.6.5"; + version = "3.6.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; tag = "v${version}"; - hash = "sha256-LvFpYVylVwWhoVtMDldalSHa5KGdbKVB6yFnP5ha4gg="; + hash = "sha256-LV6Pg+RFVFNwh6rmlHgqwcu99tse9wW3nBHpj4zYdrU="; }; - vendorHash = "sha256-hMegxeUFSBf32dnXmD7QagkvWgWDeB4Fu4nlKNoePWY="; + vendorHash = "sha256-jYVwIHqArsF3pHKnCuyO2OMhEhutAsiq91iBh+KqerA="; doCheck = false; diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 1f03ca226775..b6ec6f336c7e 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -3,22 +3,23 @@ buildGoModule, fetchFromGitHub, installShellFiles, + nix-update-script, stdenv, }: buildGoModule rec { pname = "argocd"; - version = "2.14.7"; + version = "2.14.11"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-ilXJWPvu3qwzuUN6AsQNyzrTHdQO51IFZcvZiQ/+/tU="; + hash = "sha256-KCU/WMytx4kOzlkZDwLfRRfutBtdk6UVBNdXOWC5kWc="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-sfyTXP2vKVJQdUti0TNW/vrKovvN1/PMhEOUI8IiY44="; + vendorHash = "sha256-Xm9J08pxzm3fPQjMA6NDu+DPJGsvtUvj+n/qrOZ9BE4="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 @@ -26,25 +27,27 @@ buildGoModule rec { ldflags = let - package_url = "github.com/argoproj/argo-cd/v2/common"; + packageUrl = "github.com/argoproj/argo-cd/v2/common"; in [ "-s" "-w" - "-X ${package_url}.version=${version}" - "-X ${package_url}.buildDate=unknown" - "-X ${package_url}.gitCommit=${src.rev}" - "-X ${package_url}.gitTag=${src.rev}" - "-X ${package_url}.gitTreeState=clean" - "-X ${package_url}.kubectlVersion=v0.31.2" - # NOTE: Update kubectlVersion when upgrading this package with - # https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22k8s.io%2Fkubectl%22+path%3Ago.mod&type=code - # Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code - # Will need a way to automate it :P + "-X ${packageUrl}.version=${version}" + "-X ${packageUrl}.buildDate=unknown" + "-X ${packageUrl}.gitCommit=${src.rev}" + "-X ${packageUrl}.gitTag=${src.rev}" + "-X ${packageUrl}.gitTreeState=clean" ]; nativeBuildInputs = [ installShellFiles ]; + # set ldflag for kubectlVersion since it is needed for argo + # Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code + prePatch = '' + export KUBECTL_VERSION=$(grep 'k8s.io/kubectl v' go.mod | cut -f 2 -d " " | cut -f 1 -d "=" ) + echo using $KUBECTL_VERSION + ldflags="''${ldflags} -X github.com/argoproj/argo-cd/v2/common.kubectlVersion=''${KUBECTL_VERSION}" + ''; installPhase = '' runHook preInstall mkdir -p $out/bin @@ -64,6 +67,8 @@ buildGoModule rec { --zsh <($out/bin/argocd completion zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Declarative continuous deployment for Kubernetes"; mainProgram = "argocd"; @@ -74,6 +79,7 @@ buildGoModule rec { shahrukh330 bryanasdev000 qjoly + FKouhai ]; }; } diff --git a/pkgs/by-name/ar/aria2/package.nix b/pkgs/by-name/ar/aria2/package.nix new file mode 100644 index 000000000000..ee98ae99d934 --- /dev/null +++ b/pkgs/by-name/ar/aria2/package.nix @@ -0,0 +1,85 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + autoreconfHook, + gnutls, + c-ares, + libxml2, + sqlite, + zlib, + libssh2, + cppunit, + sphinx, + nixosTests, +}: + +stdenv.mkDerivation rec { + pname = "aria2"; + version = "1.37.0"; + + src = fetchFromGitHub { + owner = "aria2"; + repo = "aria2"; + rev = "release-${version}"; + sha256 = "sha256-xbiNSg/Z+CA0x0DQfMNsWdA+TATyX6dCeW2Nf3L3Kfs="; + }; + + strictDeps = true; + nativeBuildInputs = [ + pkg-config + autoreconfHook + sphinx + ]; + + buildInputs = [ + gnutls + c-ares + libxml2 + sqlite + zlib + libssh2 + ]; + + outputs = [ + "bin" + "dev" + "out" + "doc" + "man" + ]; + + configureFlags = [ + "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" + "--enable-libaria2" + "--with-bashcompletiondir=${placeholder "bin"}/share/bash-completion/completions" + ]; + + prePatch = '' + patchShebangs --build doc/manual-src/en/mkapiref.py + ''; + + nativeCheckInputs = [ cppunit ]; + doCheck = false; # needs the net + + enableParallelBuilding = true; + + passthru.tests = { + aria2 = nixosTests.aria2; + }; + + meta = with lib; { + homepage = "https://aria2.github.io"; + changelog = "https://github.com/aria2/aria2/releases/tag/release-${version}"; + description = "Lightweight, multi-protocol, multi-source, command-line download utility"; + mainProgram = "aria2c"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ + Br1ght0ne + koral + timhae + ]; + }; +} diff --git a/pkgs/by-name/ar/aribb25/package.nix b/pkgs/by-name/ar/aribb25/package.nix new file mode 100644 index 000000000000..820ae89b83ca --- /dev/null +++ b/pkgs/by-name/ar/aribb25/package.nix @@ -0,0 +1,59 @@ +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + autoreconfHook, + pkg-config, + pcsclite, +}: + +stdenv.mkDerivation rec { + pname = "aribb25"; + # FIXME: change the rev for fetchFromGitLab in next release + version = "0.2.7"; + + src = fetchFromGitLab { + domain = "code.videolan.org"; + owner = "videolan"; + repo = pname; + # rev = version; FIXME: uncomment in next release + rev = "c14938692b313b5ba953543fd94fd1cad0eeef18"; # 0.2.7 with build fixes + sha256 = "1kb9crfqib0npiyjk4zb63zqlzbhqm35nz8nafsvdjd71qbd2amp"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-deprecated-non-prototype"; + + patches = + let + url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff"; + in + [ + (fetchpatch { + name = "make-cli-pipes-work-1.patch"; + url = url "0425184dbf3fdaf59854af5f530da88b2196a57b"; + sha256 = "0ysm2jivpnqxz71vw1102616qxww2gx005i0c5lhi6jbajqsa1cd"; + }) + (fetchpatch { + name = "make-cli-pipes-work-2.patch"; + url = url "cebabeab2bda065dca1c9f033b42d391be866d86"; + sha256 = "1283kqv1r4rbaba0sv2hphkhcxgjkmh8ndlcd24fhx43nn63hd28"; + }) + ]; + + meta = with lib; { + description = "Sample implementation of the ARIB STD-B25 standard"; + homepage = "https://code.videolan.org/videolan/aribb25"; + license = licenses.isc; + maintainers = with maintainers; [ midchildan ]; + mainProgram = "b25"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ar/ark-pixel-font/limit-builds.patch b/pkgs/by-name/ar/ark-pixel-font/limit-builds.patch deleted file mode 100644 index c63798e071c9..000000000000 --- a/pkgs/by-name/ar/ark-pixel-font/limit-builds.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/build.py b/build.py -index 48bc757d..88b9ed9b 100644 ---- a/build.py -+++ b/build.py -@@ -1,6 +1,5 @@ - from scripts import configs - from scripts.configs import path_define --from scripts.services import publish_service, info_service, template_service, image_service - from scripts.services.font_service import DesignContext, FontContext - from scripts.utils import fs_util - -@@ -21,21 +20,6 @@ def main(): - font_context.make_pcf() - font_context.make_otc() - font_context.make_ttc() -- publish_service.make_release_zips(font_config, width_mode) -- info_service.make_info_file(design_context, width_mode) -- info_service.make_alphabet_txt_file(design_context, width_mode) -- template_service.make_alphabet_html_file(design_context, width_mode) -- template_service.make_demo_html_file(design_context) -- image_service.make_preview_image_file(font_config) -- template_service.make_index_html_file() -- template_service.make_playground_html_file() -- image_service.make_readme_banner() -- image_service.make_github_banner() -- image_service.make_itch_io_banner() -- image_service.make_itch_io_background() -- image_service.make_itch_io_cover() -- image_service.make_afdian_cover() -- - - if __name__ == '__main__': - main() - diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix index 7d0313f9f23e..21e84141216b 100644 --- a/pkgs/by-name/ar/ark-pixel-font/package.nix +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -3,52 +3,37 @@ python312Packages, fetchFromGitHub, nix-update-script, - fetchPypi, }: -let - pixel-font-builder-compat = python312Packages.pixel-font-builder.overrideAttrs rec { - version = "0.0.26"; - src = fetchPypi { - inherit version; - pname = "pixel_font_builder"; - hash = "sha256-bgs2FbOA5tcUXe5+KuVztWGAv5yFxQNBaiZMeZ+ic+8="; - }; - }; -in python312Packages.buildPythonPackage rec { pname = "ark-pixel-font"; - version = "2024.05.12"; + version = "2025.03.14"; + pyproject = false; src = fetchFromGitHub { owner = "TakWolf"; repo = "ark-pixel-font"; tag = version; - hash = "sha256-PGhhKWHDpvOqa3vaI40wuIsAEdWGb62cN7QJeHQqiss="; + hash = "sha256-B/XsZEpSxY4k8uj3Vy31c9+GcO7d3NFcADLtPU6p/CI="; }; - format = "other"; - - nativeBuildInputs = with python312Packages; [ - pixel-font-builder-compat + dependencies = with python312Packages; [ + pixel-font-builder + pixel-font-knife unidata-blocks character-encoding-utils - pypng + pyyaml pillow beautifulsoup4 jinja2 - gitpython + loguru + cyclopts ]; - # By default build.py builds a LOT of extraneous artifacts we don't need. - patches = [ ./limit-builds.patch ]; - buildPhase = '' runHook preBuild - # Too much debug output would break Hydra, so this jankness has to be here for it to build at all. - # I wish there's a builtin way to set the log level without modifying the script itself... - python3 build.py 2>&1 >/dev/null | grep -E '^(INFO|WARN|ERROR)' + python -m tools.cli --cleanup runHook postBuild ''; diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix index e19dd01c1622..8705b3e6445e 100644 --- a/pkgs/by-name/ar/arkade/package.nix +++ b/pkgs/by-name/ar/arkade/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.37"; + version = "0.11.39"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-eo2Kh9b+zQMS/MEiM8cZE0QYUub4zEKFtwBMJnva+Dk="; + hash = "sha256-ILiiK8WWuSB1QKTo89/JJ5ADCBKbRXVn9fNVL3c7y0s="; }; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ar/arma3-unix-launcher/disable_steam_integration.patch b/pkgs/by-name/ar/arma3-unix-launcher/disable_steam_integration.patch deleted file mode 100644 index d07244e71526..000000000000 --- a/pkgs/by-name/ar/arma3-unix-launcher/disable_steam_integration.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/arma3-unix-launcher/main.cpp b/src/arma3-unix-launcher/main.cpp -index 10f6ed9..c706734 100644 ---- a/src/arma3-unix-launcher/main.cpp -+++ b/src/arma3-unix-launcher/main.cpp -@@ -216,3 +216,3 @@ int main(int argc, char *argv[]) - -- MainWindow w(std::move(client), config_file, parser.get("--disable-steam-integration")); -+ MainWindow w(std::move(client), config_file, !parser.get("--disable-steam-integration")); - w.show(); -diff --git a/src/dayz-linux-launcher/main.cpp b/src/dayz-linux-launcher/main.cpp -index f30bf8a..e0cef66 100644 ---- a/src/dayz-linux-launcher/main.cpp -+++ b/src/dayz-linux-launcher/main.cpp -@@ -216,3 +216,3 @@ int main(int argc, char *argv[]) - -- MainWindow w(std::move(client), config_file, parser.get("--disable-steam-integration")); -+ MainWindow w(std::move(client), config_file, !parser.get("--disable-steam-integration")); - w.show(); diff --git a/pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch b/pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch index 947a790c38df..4d40190c38ea 100644 --- a/pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch +++ b/pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch @@ -1,19 +1,19 @@ diff --git a/cmake/external_dependencies.cmake b/cmake/external_dependencies.cmake -index 2eb6ec5..9f1d67e 100644 +index 76648b2..145e978 100644 --- a/cmake/external_dependencies.cmake +++ b/cmake/external_dependencies.cmake -@@ -4,7 +4,7 @@ include(FetchContent) - +@@ -3,7 +3,7 @@ include(FetchContent) + function(setup_library SOURCE_TO_TEST) set(boolArgs HEADER_ONLY) - set(oneValueArgs NAME CXX_FLAGS GIT_REPOSITORY GIT_TAG TEST_DEFINITIONS TEST_LINK_LIBS) + set(oneValueArgs NAME CXX_FLAGS URL GIT_TAG TEST_DEFINITIONS TEST_LINK_LIBS) set(multiValueArgs WHEN) cmake_parse_arguments(LIB_SETUP "${boolArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - -@@ -27,12 +27,11 @@ function(setup_library SOURCE_TO_TEST) + +@@ -26,12 +26,11 @@ function(setup_library SOURCE_TO_TEST) endif() - + FetchContent_Declare(${LIB_SETUP_NAME} - GIT_REPOSITORY ${LIB_SETUP_GIT_REPOSITORY} - GIT_TAG ${LIB_SETUP_GIT_TAG}) @@ -26,7 +26,7 @@ index 2eb6ec5..9f1d67e 100644 FetchContent_Populate(${LIB_SETUP_NAME}) set(SRCDIR "${LIB_SETUP_NAME}_SOURCE_DIR") set(BINDIR "${LIB_SETUP_NAME}_BINARY_DIR") -@@ -51,8 +50,7 @@ function(setup_argparse) +@@ -50,8 +49,7 @@ function(setup_argparse) }") setup_library("${CHECK_SOURCE}" NAME argparse @@ -36,7 +36,7 @@ index 2eb6ec5..9f1d67e 100644 HEADER_ONLY ) if (NOT TARGET argparse::argparse) -@@ -64,7 +62,7 @@ function(setup_curlpp) +@@ -63,7 +61,7 @@ function(setup_curlpp) set(CHECK_SOURCE "#error unimplemented}") setup_library("${CHECK_SOURCE}" NAME curlpp @@ -63,7 +63,7 @@ index 2eb6ec5..9f1d67e 100644 + URL @fmt_src@ TEST_LINK_LIBS fmt ) - + @@ -126,7 +123,7 @@ function(setup_nlohmann_json) add_library(nlohmann_json INTERFACE) else() @@ -84,7 +84,7 @@ index 2eb6ec5..9f1d67e 100644 ) get_target_property(TARGET_TYPE pugixml TYPE) @@ -188,8 +184,7 @@ function(setup_spdlog) - + setup_library("${CHECK_SOURCE}" NAME spdlog - GIT_REPOSITORY https://github.com/gabime/spdlog.git @@ -94,7 +94,7 @@ index 2eb6ec5..9f1d67e 100644 TEST_LINK_LIBS ${FMT_TARGET_NAME} CXX_FLAGS "-Wno-attributes -Wno-reorder -Wno-redundant-move" @@ -198,8 +193,7 @@ endfunction() - + function(setup_steamworkssdk) FetchContent_Declare(steamworkssdk - URL https://github.com/julianxhokaxhiu/SteamworksSDKCI/releases/download/1.53/SteamworksSDK-v1.53.0_x64.zip diff --git a/pkgs/by-name/ar/arma3-unix-launcher/package.nix b/pkgs/by-name/ar/arma3-unix-launcher/package.nix index 93b0cdd0bb9e..9529c24486b7 100644 --- a/pkgs/by-name/ar/arma3-unix-launcher/package.nix +++ b/pkgs/by-name/ar/arma3-unix-launcher/package.nix @@ -11,18 +11,19 @@ nlohmann_json, qt5, spdlog, + steam-run, replaceVars, buildDayZLauncher ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "arma3-unix-launcher"; - version = "413-unstable-2025-02-10"; + version = "420"; src = fetchFromGitHub { owner = "muttleyxd"; repo = "arma3-unix-launcher"; - rev = "7d4bcb166da3bb64ef10af421619d0b00136ebd5"; - hash = "sha256-so7fjxESUAkQfO4hO5aQTzU5lHpeJlOOfEGp0Pb89sQ="; + tag = "commit-${finalAttrs.version}"; + hash = "sha256-QY3zDtfZt2ifF69Jzp0Ls1SpDCliKdkwLaGFXneT79o="; }; patches = [ @@ -52,8 +53,11 @@ stdenv.mkDerivation (finalAttrs: { doctest_src = null; trompeloeil_src = null; }) - # game won't launch with steam integration anyways, disable it - ./disable_steam_integration.patch + + # use steam-run when running the game directly + (replaceVars ./steam-run.patch { + steamRun = lib.getExe steam-run; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ar/arma3-unix-launcher/steam-run.patch b/pkgs/by-name/ar/arma3-unix-launcher/steam-run.patch new file mode 100644 index 000000000000..6c6651766df1 --- /dev/null +++ b/pkgs/by-name/ar/arma3-unix-launcher/steam-run.patch @@ -0,0 +1,35 @@ +diff --git a/src/arma3-unix-launcher-library/arma3client.cpp b/src/arma3-unix-launcher-library/arma3client.cpp +index dbb17d0..ee8853c 100644 +--- a/src/arma3-unix-launcher-library/arma3client.cpp ++++ b/src/arma3-unix-launcher-library/arma3client.cpp +@@ -63,7 +63,7 @@ namespace + disable_esync); + if (!is_proton) + { +- StdUtils::StartBackgroundProcess(fmt::format("env {} {} {}", user_environment_variables, executable_path, arguments), ++ StdUtils::StartBackgroundProcess(fmt::format("@steamRun@ env {} {} {}", user_environment_variables, executable_path, arguments), + arma_path.string()); + return; + } +@@ -83,7 +83,7 @@ namespace + + auto const environment = fmt::format(R"env({} SteamGameId={} LD_PRELOAD={} STEAM_COMPAT_DATA_PATH="{}")env", + get_esync_prefix(disable_esync), arma3_id, ld_preload_path, steam_compat_data_path.string()); +- auto const command = fmt::format(R"command(env {} {} {} {} {} "{}" {})command", environment, user_environment_variables, ++ auto const command = fmt::format(R"command(@steamRun@ env {} {} {} {} {} "{}" {})command", environment, user_environment_variables, + optional_steam_runtime(steam_utils), compatibility_tool.first, + get_verb(compatibility_tool.second), executable_path.string(), arguments); + spdlog::info("Running Arma:\n{}\n", command); +diff --git a/src/dayz-linux-launcher-library/dayzclient.cpp b/src/dayz-linux-launcher-library/dayzclient.cpp +index 5fc9027..d2b9e92 100644 +--- a/src/dayz-linux-launcher-library/dayzclient.cpp ++++ b/src/dayz-linux-launcher-library/dayzclient.cpp +@@ -76,7 +76,7 @@ namespace + + auto const environment = fmt::format(R"env({} SteamGameId={} LD_PRELOAD={} STEAM_COMPAT_DATA_PATH="{}")env", + get_esync_prefix(disable_esync), dayz_id, ld_preload_path, steam_compat_data_path.string()); +- auto const command = fmt::format(R"command(env {} {} {} {} {} "{}" {})command", environment, user_environment_variables, ++ auto const command = fmt::format(R"command(@steamRun@ env {} {} {} {} {} "{}" {})command", environment, user_environment_variables, + optional_steam_runtime(steam_utils), compatibility_tool.first, + get_verb(compatibility_tool.second), executable_path.string(), arguments); + spdlog::info("Running DayZ:\n{}\n", command); diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix index c7edb0135324..76fd8c93cf3a 100644 --- a/pkgs/by-name/ar/armadillo/package.nix +++ b/pkgs/by-name/ar/armadillo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "14.4.1"; + version = "14.4.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-Js4nK/3IJGwnjm+M+lN3eh77FO8ZbogIL+4F2hpGNJE="; + hash = "sha256-bf3c+9kecGedfBHpSlljp+/aAC/sNR5vSHWsjiRcURc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ar/arouteserver/package.nix b/pkgs/by-name/ar/arouteserver/package.nix index 4f37d09e6b84..331d761fad15 100644 --- a/pkgs/by-name/ar/arouteserver/package.nix +++ b/pkgs/by-name/ar/arouteserver/package.nix @@ -59,6 +59,7 @@ python3Packages.buildPythonPackage rec { homepage = "https://github.com/pierky/arouteserver"; changelog = "https://github.com/pierky/arouteserver/blob/v${version}/CHANGES.rst"; license = with lib.licenses; [ gpl3Only ]; - maintainers = lib.teams.wdz.members ++ (with lib.maintainers; [ marcel ]); + maintainers = with lib.maintainers; [ marcel ]; + teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/by-name/ar/arp-scan-rs/package.nix b/pkgs/by-name/ar/arp-scan-rs/package.nix index 946d12ae0189..adaa18ee35e6 100644 --- a/pkgs/by-name/ar/arp-scan-rs/package.nix +++ b/pkgs/by-name/ar/arp-scan-rs/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, gitUpdater, rustPlatform, @@ -18,6 +19,7 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; + cargoHash = "sha256-lPE/mx4LzSOG1YjGol1f77oox4voZzp9RqrKYZAMoX0="; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -43,5 +45,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "arp-scan"; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/arrayfire/no-assets.patch b/pkgs/by-name/ar/arrayfire/no-assets.patch similarity index 100% rename from pkgs/development/libraries/arrayfire/no-assets.patch rename to pkgs/by-name/ar/arrayfire/no-assets.patch diff --git a/pkgs/development/libraries/arrayfire/no-download.patch b/pkgs/by-name/ar/arrayfire/no-download.patch similarity index 100% rename from pkgs/development/libraries/arrayfire/no-download.patch rename to pkgs/by-name/ar/arrayfire/no-download.patch diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/by-name/ar/arrayfire/package.nix similarity index 100% rename from pkgs/development/libraries/arrayfire/default.nix rename to pkgs/by-name/ar/arrayfire/package.nix diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 8ecdbfd612f3..44c23d06329c 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -36,7 +36,7 @@ openssl, perl, pkg-config, - protobuf, + protobuf_29, python3, rapidjson, re2, @@ -51,29 +51,36 @@ testers, enableShared ? !stdenv.hostPlatform.isStatic, enableFlight ? stdenv.buildPlatform == stdenv.hostPlatform, - enableJemalloc ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64, + # Disable also on RiscV + # configure: error: cannot determine number of significant virtual address bits + enableJemalloc ? + !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isRiscV64, enableS3 ? true, - enableGcs ? !stdenv.hostPlatform.isDarwin, + # google-cloud-cpp fails to build on RiscV + enableGcs ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isRiscV64, }: let + # https://github.com/apache/arrow/issues/45807 + protobuf = protobuf_29; + arrow-testing = fetchFromGitHub { name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "4d209492d514c2d3cb2d392681b9aa00e6d8da1c"; - hash = "sha256-IkiCbuy0bWyClPZ4ZEdkEP7jFYLhM7RCuNLd6Lazd4o="; + rev = "d2a13712303498963395318a4eb42872e66aead7"; + hash = "sha256-c8FL37kG0uo7o0Zp71WjCl7FD5BnVgqUCCXXX9gI0lg="; }; parquet-testing = fetchFromGitHub { name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "c7cf1374cf284c0c73024cd1437becea75558bf8"; - hash = "sha256-DThjyZ34LajHwXZy1IhYKUGUG/ejQ9WvBNuI8eUKmSs="; + rev = "18d17540097fca7c40be3d42c167e6bfad90763c"; + hash = "sha256-gKEQc2RKpVp39RmuZbIeIXAwiAXDHGnLXF6VQuJtnRA="; }; - version = "19.0.1"; + version = "20.0.0"; in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; @@ -83,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "apache"; repo = "arrow"; rev = "apache-arrow-${version}"; - hash = "sha256-toHwUIOZRpgR0K7pQtT5nqWpO9G7AuHYTcvA6UVg9lA="; + hash = "sha256-JFPdKraCU+xRkBTAHyY4QGnBVlOjQ1P5+gq9uxyqJtk="; }; sourceRoot = "${finalAttrs.src.name}/cpp"; diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index c6ac2033d256..428aaf9d400e 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -32,7 +32,7 @@ exiv2, exiftool, mimalloc, - openexr_3, + openexr, ilmbase, opencolorio, color-transformation-language, @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { exiftool libcanberra-gtk3 mimalloc - openexr_3 + openexr ilmbase opencolorio color-transformation-language diff --git a/pkgs/by-name/ar/artem/package.nix b/pkgs/by-name/ar/artem/package.nix index a04e31e6b3f5..9305dabc5f83 100644 --- a/pkgs/by-name/ar/artem/package.nix +++ b/pkgs/by-name/ar/artem/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - checkFlags = [ # require internet access "--skip=arguments::input::url_input" diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix index 37586e86a2ed..58d2bd27db10 100644 --- a/pkgs/by-name/ar/arti/package.nix +++ b/pkgs/by-name/ar/arti/package.nix @@ -10,21 +10,21 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "arti"; - version = "1.3.2"; + version = "1.4.2"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; group = "tpo"; owner = "core"; repo = "arti"; - tag = "arti-v${version}"; - hash = "sha256-vypPQjTr3FsAz1AyS1J67MF35+HzMLNu5B9wkkEI30A="; + tag = "arti-v${finalAttrs.version}"; + hash = "sha256-dryW7znckIsa7O2H0U7p1urBXtANU6B9Pv11A+pBiho="; }; useFetchCargoVendor = true; - cargoHash = "sha256-brC8ZTB/+LAtNiG9/MGhPzzFcnaEBV/zU9lexZ56N/I="; + cargoHash = "sha256-o4he+WVsXf5GymTOvbBIsdhnGrvDtD8AMWmRMQMNiOw="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; @@ -48,22 +48,22 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { extraArgs = [ "--version-regex=^arti-v(.*)$" ]; }; }; meta = { description = "Implementation of Tor in Rust"; mainProgram = "arti"; homepage = "https://arti.torproject.org/"; - changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v${version}/CHANGELOG.md"; + changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 mit ]; maintainers = with lib.maintainers; [ rapiteanu ]; }; -} +}) diff --git a/pkgs/by-name/ar/artisan/package.nix b/pkgs/by-name/ar/artisan/package.nix new file mode 100644 index 000000000000..e0a21953d456 --- /dev/null +++ b/pkgs/by-name/ar/artisan/package.nix @@ -0,0 +1,43 @@ +{ + lib, + appimageTools, + fetchurl, + nix-update-script, +}: +let + pname = "artisan"; + version = "3.1.4"; + + src = fetchurl { + url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage"; + hash = "sha256-GU9DCAIMioPRUC1IDu8SbhD802pWEH7MlALnQH+Y4oU="; + }; + + appimageContents = appimageTools.extract { + inherit pname version src; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/org.artisan_scope.artisan.desktop $out/share/applications/org.artisan_scope.artisan.desktop + install -m 444 -D ${appimageContents}/artisan.png $out/share/applications/artisan.png + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=v([\\d.]+)" ]; + }; + + meta = { + description = "visual scope for coffee roasters"; + homepage = "https://artisan-scope.org/"; + changelog = "https://github.com/artisan-roaster-scope/artisan/releases/tag/v${version}"; + downloadPage = "https://github.com/artisan-roaster-scope/artisan/releases"; + license = lib.licenses.gpl3Only; + mainProgram = "artisan"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ bohreromir ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/as/as31/package.nix b/pkgs/by-name/as/as31/package.nix index 2936f7a79958..5f3104b43907 100644 --- a/pkgs/by-name/as/as31/package.nix +++ b/pkgs/by-name/as/as31/package.nix @@ -2,22 +2,29 @@ lib, stdenv, fetchurl, + fetchpatch, bison, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "as31"; version = "2.3.1"; src = fetchurl { - url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:${pname}-${version}.tar.gz"; - name = "${pname}-${version}.tar.gz"; + url = "mirror://debian/pool/main/a/as31/${finalAttrs.pname}_${finalAttrs.version}.orig.tar.gz"; + name = "${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; hash = "sha256-zSEyWHFon5nyq717Mpmdv1XZ5Hz0e8ZABqsP8M83c1U="; }; patches = [ # Check return value of getline in run.c ./0000-getline-break.patch + + # fix build with gcc14 + (fetchpatch { + url = "https://salsa.debian.org/debian/as31/-/raw/76735fbf1fb00ce70ffd98385137908b7bd9bd5c/debian/patches/update_sizebuf_types.patch"; + hash = "sha256-ERrPdY0afKwXmdSLoWmWR55nKfvmieGlz+nhwFWRnrM="; + }) ]; postPatch = '' @@ -34,12 +41,12 @@ stdenv.mkDerivation rec { bison ]; - meta = with lib; { - homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31"; + meta = { + homepage = "https://www.pjrc.com/tech/8051/tools/as31-doc.html"; description = "8031/8051 assembler"; mainProgram = "as31"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/as/ascii-draw/package.nix b/pkgs/by-name/as/ascii-draw/package.nix index ad17218131a4..fa6a9f41c3df 100644 --- a/pkgs/by-name/as/ascii-draw/package.nix +++ b/pkgs/by-name/as/ascii-draw/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "ascii-draw"; - version = "1.0.0"; + version = "1.1.0"; pyproject = false; src = fetchFromGitHub { owner = "Nokse22"; repo = "ascii-draw"; tag = "v${version}"; - hash = "sha256-+K9th1LbESVzAiJqIplWpj2QHt7zDidENs7jHOuJ2S0="; + hash = "sha256-ed8RSS9anU5gstWTrJc2APx7PLmTzVVWXg8Sif8tySM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix index a79fa32aae9b..c5d94322405a 100644 --- a/pkgs/by-name/as/asciinema-agg/package.nix +++ b/pkgs/by-name/as/asciinema-agg/package.nix @@ -2,13 +2,8 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Security; -in rustPlatform.buildRustPackage rec { pname = "agg"; version = "1.5.0"; @@ -25,10 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-KQ4g4hWy8FZH4nLiB0874r8FCINXJboZ4C1dAAPA8Gc="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - meta = with lib; { description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder"; homepage = "https://github.com/asciinema/agg"; diff --git a/pkgs/by-name/as/asciinema_3/package.nix b/pkgs/by-name/as/asciinema_3/package.nix index 2704facb09e3..6b9b4de833ad 100644 --- a/pkgs/by-name/as/asciinema_3/package.nix +++ b/pkgs/by-name/as/asciinema_3/package.nix @@ -9,18 +9,18 @@ let self = rustPlatform.buildRustPackage { pname = "asciinema"; - version = "3.0.0-rc.3"; + version = "3.0.0-rc.4"; src = fetchFromGitHub { name = "asciinema-source-${self.version}"; owner = "asciinema"; repo = "asciinema"; rev = "v${self.version}"; - hash = "sha256-TYJ17uVj8v1u630MTb033h0X3aYRXY9d89GjAxG8muk="; + hash = "sha256-w1LV21EqHNC+LYMLpljGQrxmBJ8ztCQ7g3YbJ6ME5j0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dgeHQs1IYD8m8gOtPEn+l0A2RbSmwTyzrbiusD3dUX0="; + cargoHash = "sha256-Q6HoKrcwa67lAsl4zgNYilo4LzPxySz2lE85ZdOSPpM="; nativeCheckInputs = [ python3 ]; @@ -56,7 +56,10 @@ let ''; license = with lib.licenses; [ gpl3Plus ]; mainProgram = "asciinema"; - maintainers = with lib.maintainers; [ jiriks74 ]; + maintainers = with lib.maintainers; [ + jiriks74 + llakala + ]; }; }; in diff --git a/pkgs/by-name/as/asdbctl/package.nix b/pkgs/by-name/as/asdbctl/package.nix new file mode 100644 index 000000000000..d6edeff45b59 --- /dev/null +++ b/pkgs/by-name/as/asdbctl/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + udev, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "asdbctl"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "juliuszint"; + repo = "asdbctl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-S5m1iQlchGKc0PODQNDHpNzaNXRepmk5zfK5aXdiMiM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-OPmnGh6xN6XeREeIgyYB2aeHUpdQ5hFS5MivcTeY29E="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + udev + ]; + + postInstall = '' + install -Dm444 \ + rules.d/20-asd-backlight.rules \ + $out/lib/udev/rules.d/20-asd-backlight.rules + ''; + + meta = { + description = "Apple Studio Display brightness controll"; + mainProgram = "asdbctl"; + homepage = "https://github.com/juliuszint/asdbctl"; + changelog = "https://github.com/juliuszint/asdbctl/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers.danieldk + ]; + }; +}) diff --git a/pkgs/by-name/as/ashell/package.nix b/pkgs/by-name/as/ashell/package.nix index f89bd96f66c4..a270b3fb92a2 100644 --- a/pkgs/by-name/as/ashell/package.nix +++ b/pkgs/by-name/as/ashell/package.nix @@ -9,20 +9,22 @@ pipewire, libpulseaudio, wayland, + udev, + vulkan-loader, }: rustPlatform.buildRustPackage rec { pname = "ashell"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "MalpenZibo"; repo = "ashell"; tag = version; - hash = "sha256-a0yvmAq/4TDe+W1FLeLPSLppX81G6fdAOhzDmDJg3II="; + hash = "sha256-J97MRYYkNx8Ze4vcxZTDVOSQLCANyIBcDtqZEsEZ80w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Vh/+4iApi+03ZmMIDSXc9Mn408v3wC+WlNJsXNcva+Q="; + cargoHash = "sha256-XDcCCKq/NOzaKTDwVu0GCeGV70IlJ2TvD0w8ib+lEhg="; nativeBuildInputs = [ pkg-config @@ -33,12 +35,14 @@ rustPlatform.buildRustPackage rec { runtimeDependencies = [ wayland libGL + vulkan-loader ]; buildInputs = [ libpulseaudio libxkbcommon pipewire + udev ] ++ runtimeDependencies; meta = { diff --git a/pkgs/by-name/as/ashpd-demo/package.nix b/pkgs/by-name/as/ashpd-demo/package.nix index bcfca11eaa5e..f03cbff96f3d 100644 --- a/pkgs/by-name/as/ashpd-demo/package.nix +++ b/pkgs/by-name/as/ashpd-demo/package.nix @@ -17,22 +17,25 @@ wayland, wrapGAppsHook4, desktop-file-utils, + gitUpdater, + common-updater-scripts, + _experimental-update-script-combinators, }: stdenv.mkDerivation (finalAttrs: { pname = "ashpd-demo"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "bilelmoussaoui"; repo = "ashpd"; rev = "${finalAttrs.version}-demo"; - hash = "sha256-fIyJEUcyTcjTbBycjuJb99wALQelMT7Zq6PHKcL2F80="; + hash = "sha256-0IGqA8PM6I2p4/MrptkdSWIZThMoeaMsdMc6tVTI2MU="; }; cargoDeps = rustPlatform.fetchCargoVendor { src = "${finalAttrs.src}/ashpd-demo"; - hash = "sha256-iluV24uSEHDcYi6pO2HNrKs4ShwFvZ/ryv8ioopaNMI="; + hash = "sha256-kUEzVBk8dKXCQdHFJJS633CBG1F57TIxJg1xApMwzbI="; }; nativeBuildInputs = [ @@ -63,6 +66,37 @@ stdenv.mkDerivation (finalAttrs: { cd ashpd-demo ''; + passthru = { + updateScript = + let + updateSource = gitUpdater { + url = finalAttrs.src.gitRepoUrl; + rev-suffix = "-demo"; + }; + + updateLockfile = { + command = [ + "sh" + "-c" + '' + PATH=${ + lib.makeBinPath [ + common-updater-scripts + ] + } + update-source-version ashpd-demo --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null + '' + ]; + # Experimental feature: do not copy! + supportedFeatures = [ "silent" ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateLockfile + ]; + }; + meta = with lib; { description = "Tool for playing with XDG desktop portals"; mainProgram = "ashpd-demo"; diff --git a/pkgs/by-name/as/ashuffle/package.nix b/pkgs/by-name/as/ashuffle/package.nix index e809869b43e6..80bd69bf6256 100644 --- a/pkgs/by-name/as/ashuffle/package.nix +++ b/pkgs/by-name/as/ashuffle/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ashuffle"; - version = "3.14.8"; + version = "3.14.9"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; rev = "v${version}"; - hash = "sha256-XnibLlwUspI2aveWfMg/TOe59vK6Z2WEnF7gafUmx6E="; + hash = "sha256-HQ4+vyTvX0mhfuRclbiC+MvllV3300ztAwL0IxrUiC8="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/as/aspectj/package.nix b/pkgs/by-name/as/aspectj/package.nix index 55b9cf5af86c..744ade323008 100644 --- a/pkgs/by-name/as/aspectj/package.nix +++ b/pkgs/by-name/as/aspectj/package.nix @@ -6,7 +6,7 @@ }: let - version = "1.9.22.1"; + version = "1.9.24"; versionSnakeCase = builtins.replaceStrings [ "." ] [ "_" ] version; in stdenvNoCC.mkDerivation { @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation { src = fetchurl { url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar"; - hash = "sha256-NIyYVhJIGXz+vNVoAQzYsDfmOYc4QrRzJGWeQjS4X0U="; + hash = "sha256-p+UOtuP8hNymfvmL/SPg99YrhU7m5GDudtLISqL5TWQ="; }; dontUnpack = true; diff --git a/pkgs/by-name/as/assaultcube/package.nix b/pkgs/by-name/as/assaultcube/package.nix index ec7fc9f43e2f..7db82cf87f44 100644 --- a/pkgs/by-name/as/assaultcube/package.nix +++ b/pkgs/by-name/as/assaultcube/package.nix @@ -10,6 +10,8 @@ libvorbis, SDL2, SDL2_image, + libGL, + libX11, makeWrapper, zlib, file, @@ -43,6 +45,8 @@ stdenv.mkDerivation rec { openal SDL2 SDL2_image + libGL + libX11 libogg libvorbis ]; diff --git a/pkgs/by-name/as/assimp/package.nix b/pkgs/by-name/as/assimp/package.nix index 4aaa2ed60876..33a3a0b5de58 100644 --- a/pkgs/by-name/as/assimp/package.nix +++ b/pkgs/by-name/as/assimp/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, cmake, - boost, zlib, }: @@ -25,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - boost zlib ]; diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index aec3330674e7..4783207b3a6f 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ast-grep"; - version = "0.36.2"; + version = "0.38.2"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; tag = finalAttrs.version; - hash = "sha256-Ma4HwjbKujPEqJVXwNVV8HgszLlqDw3ogVoHwdKfwpU="; + hash = "sha256-mUqjD/otB891kJ8aIF3NP9ewo7yAuGE3yPK+gIIrm2w="; }; # error: linker `aarch64-linux-gnu-gcc` not found @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-+qOrRGao2szGHvLE5DGccKMwKApYoAyK+moPtMMKhdE="; + cargoHash = "sha256-s2h2Zt0cRW6V0VAKNuTL8WkHdfkLvuZA/bnSkQKcr9w="; nativeBuildInputs = [ installShellFiles ]; @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix index 9627a5177890..94c9dad7dae8 100644 --- a/pkgs/by-name/as/astyle/package.nix +++ b/pkgs/by-name/as/astyle/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.6.8"; + version = "3.6.9"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-WviuegXF5hbdH4TXWLSQnC0uz8F5+IP9EE0iPzTMbf8="; + hash = "sha256-tkRZdlTfW0AIe+SkZyPGUED3zlnzNp8bj2kPnBDKurw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/as/asuka/package.nix b/pkgs/by-name/as/asuka/package.nix new file mode 100644 index 000000000000..32ae8dfc7d8c --- /dev/null +++ b/pkgs/by-name/as/asuka/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromSourcehut, + pkg-config, + ncurses, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "asuka"; + version = "0.8.5"; + + src = fetchFromSourcehut { + owner = "~julienxx"; + repo = pname; + rev = version; + sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-aNHkhcvOdK6sf6nWxCNPxcktYhrnmLdMrLqWb/1QBQ4="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + ncurses + openssl + ]; + + meta = with lib; { + description = "Gemini Project client written in Rust with NCurses"; + mainProgram = "asuka"; + homepage = "https://git.sr.ht/~julienxx/asuka"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index 3b4a0344be8f..edaff5e252cf 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -17,17 +17,17 @@ }: rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "6.1.10"; + version = "6.1.12"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-KCGoaqqXWFApD464jbNcdGhd7DDxrpNcRg/ClM0GrJc="; + hash = "sha256-E/tDd7wQKDgC91x1rGa8Ltn4GMPk3DJDvmMQNafVLyM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-c3uoQWdf4nG2SzLpB/T7AM/wrfxqVZcTVX1eRFZTGhQ="; + cargoHash = "sha256-lvm3xvI01RyaSS39nm3l7Zpn3x23DDBQr+0Gggl4p9U="; postPatch = '' files=" diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix index e82ebcd62f22..44737209b9af 100644 --- a/pkgs/by-name/as/async-profiler/package.nix +++ b/pkgs/by-name/as/async-profiler/package.nix @@ -4,16 +4,17 @@ fetchFromGitHub, jdk, makeWrapper, + nix-update-script, }: stdenv.mkDerivation rec { pname = "async-profiler"; - version = "3.0"; + version = "4.0"; src = fetchFromGitHub { owner = "jvm-profiling-tools"; repo = "async-profiler"; rev = "v${version}"; - hash = "sha256-0CCJoRjRLq4LpiRD0ibzK8So9qSQymePCTYUI60Oy2k="; + hash = "sha256-4S5Lbhqu2V7TzrbFf3G3G4OEYLU6w5lcgUl49k9YqSA="; }; nativeBuildInputs = [ makeWrapper ]; @@ -35,6 +36,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/async-profiler --prefix PATH : ${lib.makeBinPath [ jdk ]} ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Low overhead sampling profiler for Java that does not suffer from Safepoint bias problem"; homepage = "https://github.com/jvm-profiling-tools/async-profiler"; diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index 761b2a5741f1..84f77fc7fb56 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.54.1"; + version = "2.56.2"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz"; - hash = "sha256-8HKeXIdl/rGWm7bB+6GK+iWCEmsDWap1oXP9oaz5PEw="; + hash = "sha256-4bHJg2qJR4UvdEDDLiMXkjTHa9mM2cxAAfN2QF+LeDs="; }; nativeBuildInputs = @@ -111,7 +111,8 @@ stdenv.mkDerivation rec { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); + maintainers = with maintainers; [ raskin ]; + teams = [ teams.gnome ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index fd17a1e8b909..5b54a99a2cf7 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-7y4DDoGguHfU4JxnMyRmjrqJ4gg76C9WSmZ8ey+Mitg="; + hash = "sha256-Hw93XI//d+ubVZvNPpq6z2P5XLSzw/EqzrrifSEmWUM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sohEi3ARZlkNTQTpPVpQ1j/IyVP4rbBSdo6cpJdY1I4="; + cargoHash = "sha256-OrTPHfMFF5A9SGBcjcNIOC/JGLtkJzSk9EEVcv6NwOs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/at/atasm/package.nix b/pkgs/by-name/at/atasm/package.nix index e6155b1bf927..5021f93eaf2b 100644 --- a/pkgs/by-name/at/atasm/package.nix +++ b/pkgs/by-name/at/atasm/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "atasm"; - version = "1.26"; + version = "1.29"; src = fetchFromGitHub { owner = "CycoPH"; repo = "atasm"; rev = "V${version}"; - hash = "sha256-W9I1Wf2IVBy2l+jyrAOmlpO59uZM1SkBLuNcu2fXI1M="; + hash = "sha256-TGSmlNz8kxsHlIhq4ZNDBU8uhpsZGK0oEp2qD4SndE8="; }; makefile = "Makefile"; diff --git a/pkgs/by-name/at/atf/package.nix b/pkgs/by-name/at/atf/package.nix index cbae83d9d988..ced8145fa934 100644 --- a/pkgs/by-name/at/atf/package.nix +++ b/pkgs/by-name/at/atf/package.nix @@ -10,26 +10,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "atf"; - version = "0.22"; + version = "0.23"; src = fetchFromGitHub { owner = "freebsd"; repo = "atf"; tag = "atf-${finalAttrs.version}"; - hash = "sha256-vZfBk/lH+04d3NbTUYjAaxwGFHtnagl/kY04hgkE4Iw="; + hash = "sha256-g9cXeiCaiyGQXtg6eyrbRQpqk4VLGSFuhfPB+ynbDIo="; }; - patches = [ - # https://github.com/freebsd/atf/issues/88 - # https://github.com/freebsd/atf/pull/85 - # Maintainer say it fix some tests in issue 88. - ./pr-85.patch - (fetchpatch { - url = "https://github.com/freebsd/atf/commit/b42c98612cb99fa3f52766a46203263dc1de7187.patch?full_index=1"; - hash = "sha256-goDPIdIF8vHXDengVIYbxw5W/JT5kfsG5japgtranas="; - }) - ]; - postPatch = lib.optionalString finalAttrs.doInstallCheck '' # Can’t find `c_helpers` in the work folder. diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index f4aa1ef22121..8fbfa6f1b90a 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -6,23 +6,23 @@ athens, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "athens"; - version = "0.15.4"; + version = "0.16.0"; src = fetchFromGitHub { owner = "gomods"; repo = "athens"; - rev = "v${version}"; - hash = "sha256-6NBdif8rQ1aj4nTYXhrWyErzRv0q8WpIheRnb2FCnkU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vynO6J69VTJ/CYp/W7BNzFWMLQG8PHXfS90uCCIp8rA="; }; - vendorHash = "sha256-W65lQYGrRg8LwFERj5MBOPFAn2j+FE7ep4ANuAGmfgM="; + vendorHash = "sha256-XM/ft+1u4KH77uOEh6ZO2YKy7jK2UUn+w7CDZeYqjFc="; env.CGO_ENABLED = "0"; ldflags = [ "-s" - "-X github.com/gomods/athens/pkg/build.version=${version}" + "-X github.com/gomods/athens/pkg/build.version=${finalAttrs.version}" ]; subPackages = [ "cmd/proxy" ]; @@ -47,4 +47,4 @@ buildGoModule rec { ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix index 170208d48855..57b74162f0b3 100644 --- a/pkgs/by-name/at/atlantis/package.nix +++ b/pkgs/by-name/at/atlantis/package.nix @@ -2,37 +2,39 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "atlantis"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; - rev = "v${version}"; - hash = "sha256-6/e3h4et5xzo0Eoh5I90FW9drOUSut1Wz7MgTSlVXGk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-2xgU3H6X9EcbySV9RXN5oCn+7EkfdwebeYsL5+Vl69E="; }; + ldflags = [ - "-X=main.version=${version}" + "-X=main.version=${finalAttrs.version}" "-X=main.date=1970-01-01T00:00:00Z" ]; - vendorHash = "sha256-OZBvDblAQ3VZ4AOnfSOlGrcKKzAkngRanwLzU0dPe+s="; + vendorHash = "sha256-1xII3GIQQCku3UzwPJnJu//zAJGuGCOSETR6sU4lPR8="; subPackages = [ "." ]; doInstallCheck = true; - installCheckPhase = '' - $out/bin/atlantis version | grep ${version} > /dev/null - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/atlantis"; + versionCheckProgramArg = "version"; - meta = with lib; { + meta = { homepage = "https://github.com/runatlantis/atlantis"; description = "Terraform Pull Request Automation"; mainProgram = "atlantis"; - license = licenses.asl20; - maintainers = with maintainers; [ jpotier ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jpotier ]; }; -} +}) diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix index e91e6feea075..2f25507a51a3 100644 --- a/pkgs/by-name/at/atlas/package.nix +++ b/pkgs/by-name/at/atlas/package.nix @@ -4,31 +4,30 @@ fetchFromGitHub, installShellFiles, testers, - atlas, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "atlas"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; - rev = "v${version}"; - hash = "sha256-iM+Qy8tQAjonXpt36WWIEIAmtqnR0wWtMMxIh76Fv0U="; + rev = "v${finalAttrs.version}"; + hash = "sha256-uMINAdoHYRVaZ7QdxZ0G03cOTRe6ObnIuxo3ic+tMnE="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-kSKxZmguHasRlxI3h2Gm/0sj8dQwUd8F9bL1yp6stRE="; + vendorHash = "sha256-K94zOisolCplE/cFrWmv4/MWl5DD27lRekPTl+o4Jwk="; nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" - "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" + "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${finalAttrs.version}" ]; subPackages = [ "." ]; @@ -41,17 +40,17 @@ buildGoModule rec { ''; passthru.tests.version = testers.testVersion { - package = atlas; + package = finalAttrs.finalPackage; command = "atlas version"; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; meta = { description = "Modern tool for managing database schemas"; homepage = "https://atlasgo.io/"; - changelog = "https://github.com/ariga/atlas/releases/tag/v${version}"; + changelog = "https://github.com/ariga/atlas/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "atlas"; }; -} +}) diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix index f4f5ac70cf52..2788ac042833 100644 --- a/pkgs/by-name/at/atmos/package.nix +++ b/pkgs/by-name/at/atmos/package.nix @@ -2,27 +2,30 @@ lib, buildGoModule, fetchFromGitHub, + terraform, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "atmos"; - version = "1.95.0"; + version = "1.174.0"; src = fetchFromGitHub { owner = "cloudposse"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-shhkaPYU1N3Q7eu8CyZXYrR11kxb+r9II4lpfRWTOas="; + repo = "atmos"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lkU4g+CMT3Dob7dG5iaX82FZ6oWIEkCnL+RrZ+JRmFM="; }; - vendorHash = "sha256-4pUx8qzptzuGeIrT7m67iidMSUNbDSGV8p+KkHqX3lo="; + vendorHash = "sha256-0VtuRtvof360vH3SK3TzV4S44owSqn7n2J/aV7/KIJI="; ldflags = [ "-s" "-w" - "-X github.com/cloudposse/atmos/cmd.Version=v${version}" + "-X github.com/cloudposse/atmos/cmd.Version=v${finalAttrs.version}" ]; + nativeCheckInputs = [ terraform ]; + preCheck = '' # Remove tests that depend on a network connection. rm -f \ @@ -31,21 +34,26 @@ buildGoModule rec { pkg/describe/describe_affected_test.go ''; - doCheck = true; + # depend on a network connection. + doCheck = false; + + # depend on a network connection. + doInstallCheck = false; - doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck - $out/bin/atmos version | grep "v${version}" + + $out/bin/atmos version | grep "v${finalAttrs.version}" + runHook postInstallCheck ''; - meta = with lib; { + meta = { homepage = "https://atmos.tools"; - changelog = "https://github.com/cloudposse/atmos/releases/tag/v${version}"; + changelog = "https://github.com/cloudposse/atmos/releases/tag/v${finalAttrs.version}"; description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)"; mainProgram = "atmos"; - license = licenses.asl20; - maintainers = with maintainers; [ ] ++ teams.cloudposse.members; + license = lib.licenses.asl20; + teams = [ lib.teams.cloudposse ]; }; -} +}) diff --git a/pkgs/by-name/at/atomicparsley/package.nix b/pkgs/by-name/at/atomicparsley/package.nix new file mode 100644 index 000000000000..823693975ac0 --- /dev/null +++ b/pkgs/by-name/at/atomicparsley/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "atomicparsley"; + version = "20240608.083822.1ed9031"; + + src = fetchFromGitHub { + owner = "wez"; + repo = pname; + rev = version; + sha256 = "sha256-VhrOMpGNMkNNYjcfCqlHI8gdApWr1ThtcxDwQ6gyV/g="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ zlib ]; + + installPhase = '' + runHook preInstall + install -D AtomicParsley $out/bin/AtomicParsley + runHook postInstall + ''; + + doCheck = true; + + postPatch = '' + patchShebangs tests/test.sh + ''; + + # copying files so that we dont need to patch the test.sh + checkPhase = '' + ( + cp AtomicParsley ../tests + cd ../tests + mkdir tests + mv *.mp4 tests + ./test.sh + ) + ''; + + meta = with lib; { + description = "CLI program for reading, parsing and setting metadata into MPEG-4 files"; + homepage = "https://github.com/wez/atomicparsley"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ pjones ]; + mainProgram = "AtomicParsley"; + }; +} diff --git a/pkgs/by-name/at/atomix/package.nix b/pkgs/by-name/at/atomix/package.nix index a7f3f8f01f6f..9a9919630f83 100644 --- a/pkgs/by-name/at/atomix/package.nix +++ b/pkgs/by-name/at/atomix/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/atomix"; changelog = "https://gitlab.gnome.org/GNOME/atomix/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/at/ats/install-atsdoc-hats-files.patch b/pkgs/by-name/at/ats/install-atsdoc-hats-files.patch deleted file mode 100644 index 93c6fa07d8a6..000000000000 --- a/pkgs/by-name/at/ats/install-atsdoc-hats-files.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ats-lang-anairiats-0.2.11/Makefile 2013-12-10 00:43:52.000000000 +0100 -+++ ats-lang-anairiats-0.2.11/Makefile 2014-03-02 07:49:06.985837425 +0100 -@@ -97,7 +97,7 @@ - cd $(abs_top_srcdir) - [ -d $(bindir2) ] || $(MKDIR_P) $(bindir2) - $(MKDIR_P) $(ATSLIBHOME2)/bin -- find ccomp contrib doc libats libc prelude -type d \ -+ find ccomp contrib doc libats libatsdoc libc prelude -type d \ - -exec $(MKDIR_P) $(ATSLIBHOME2)/\{} \; \ - -print - -@@ -105,7 +105,7 @@ - # - # recursively install all files in the list except .svn control files. - # -- for d in ccomp/runtime contrib doc libats libc prelude; do \ -+ for d in ccomp/runtime contrib doc libats libatsdoc libc prelude; do \ - cd $(abs_top_srcdir) && \ - $(INSTALL) -d $(ATSLIBHOME2)/"$$d" && \ - find "$$d" -name .svn -prune -o -type f \ -@@ -143,6 +143,17 @@ - $(INSTALL) -m 755 ats_env.sh $(bindir2)/"$$b" && \ - echo [ats_env.sh] is installed into $(bindir2)/"$$b"; \ - done -+# -+# install atsdoc headers -+# -+ for f in \ -+ utils/atsdoc/SATS/*.sats utils/atsdoc/DATS/*.dats utils/atsdoc/HATS/*.hats; \ -+ do \ -+ [ -f "$$f" ] || continue; \ -+ cd $(abs_top_srcdir) && \ -+ $(INSTALL) -m 644 -D "$$f" $(ATSLIBHOME2)/"$$f" && \ -+ echo "$$f"; \ -+ done - - install:: install_files - diff --git a/pkgs/by-name/at/ats/package.nix b/pkgs/by-name/at/ats/package.nix deleted file mode 100644 index 227702fb316b..000000000000 --- a/pkgs/by-name/at/ats/package.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gmp, -}: - -stdenv.mkDerivation rec { - pname = "ats"; - version = "0.2.12"; - - src = fetchurl { - url = "mirror://sourceforge/ats-lang/ats-lang-anairiats-${version}.tgz"; - sha256 = "0l2kj1fzhxwsklwmn5yj2vp9rmw4jg0b18bzwqz72bfi8i39736k"; - }; - - # this is necessary because atxt files usually include some .hats files - patches = [ ./install-atsdoc-hats-files.patch ]; - buildInputs = [ gmp ]; - - meta = { - description = "Functional programming language with dependent types"; - homepage = "http://www.ats-lang.org"; - license = lib.licenses.gpl3Plus; - # TODO: it looks like ATS requires gcc specifically. Someone with more knowledge - # will need to experiment. - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index f0ddc302125c..3b8a97074e52 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -2,15 +2,19 @@ lib, rustPlatform, fetchFromGitHub, - nixForLinking, + nixVersions, nixosTests, boost, pkg-config, stdenv, installShellFiles, - darwin, crates ? [ "attic-client" ], }: +let + # Only the attic-client crate builds against the Nix C++ libs + # This derivation is also used to build the server + needNixInclude = lib.elem "attic-client" crates; +in rustPlatform.buildRustPackage { pname = "attic"; version = "0-unstable-2025-02-02"; @@ -27,24 +31,21 @@ rustPlatform.buildRustPackage { installShellFiles ]; - buildInputs = - [ - nixForLinking - boost - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); + buildInputs = lib.optional needNixInclude nixVersions.nix_2_24 ++ [ + boost + ]; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; cargoHash = "sha256-AbpWnYfBMrR6oOfy2LkQvIPYsClCWE89bJav+iHTtLM="; useFetchCargoVendor = true; - ATTIC_DISTRIBUTOR = "nixpkgs"; - NIX_INCLUDE_PATH = "${lib.getDev nixForLinking}/include"; + env = + { + ATTIC_DISTRIBUTOR = "nixpkgs"; + } + // lib.optionalAttrs needNixInclude { + NIX_INCLUDE_PATH = "${lib.getDev nixVersions.nix_2_24}/include"; + }; # Attic interacts with Nix directly and its tests require trusted-user access # to nix-daemon to import NARs, which is not possible in the build sandbox. diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index 0de5a7b65d14..bf01919a04d5 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -5,23 +5,22 @@ installShellFiles, rustPlatform, nixosTests, - jq, - moreutils, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "atuin"; - version = "18.4.0"; + version = "18.6.1"; src = fetchFromGitHub { owner = "atuinsh"; repo = "atuin"; - rev = "v${version}"; - hash = "sha256-P/q4XYhpXo9kwiltA0F+rQNSlqI+s8TSi5v5lFJWJ/4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-aRaUiGH2CTPtmbfrtLlNfoQzQWG817eazWctqwRlOCE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0KswWFy44ViPHlMCmwgVlDe7diDjLmVUk2517BEMTtk="; + cargoHash = "sha256-umagQYzOMr3Jh1RewjT0aX5FpYxs9N/70NZXoGaAfi4="; # atuin's default features include 'check-updates', which do not make sense # for distribution builds. List all other default features. @@ -43,8 +42,11 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/atuin gen-completions -s zsh) ''; - passthru.tests = { - inherit (nixosTests) atuin; + passthru = { + tests = { + inherit (nixosTests) atuin; + }; + updateScript = nix-update-script { }; }; checkFlags = [ @@ -71,4 +73,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "atuin"; }; -} +}) diff --git a/pkgs/by-name/au/audacious-plugins/package.nix b/pkgs/by-name/au/audacious-plugins/package.nix index 5614a0450e04..f8d739feb72e 100644 --- a/pkgs/by-name/au/audacious-plugins/package.nix +++ b/pkgs/by-name/au/audacious-plugins/package.nix @@ -110,9 +110,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; postInstall = '' - ln -s ${ - vgmstream.override { buildAudaciousPlugin = true; } - }/lib/audacious/Input/* $out/lib/audacious/Input + ln -s ${vgmstream.audacious}/lib/audacious/Input/* $out/lib/audacious/Input ''; meta = audacious-bare.meta // { diff --git a/pkgs/by-name/au/audio-recorder/package.nix b/pkgs/by-name/au/audio-recorder/package.nix index cd500cc52da8..729c431817ca 100644 --- a/pkgs/by-name/au/audio-recorder/package.nix +++ b/pkgs/by-name/au/audio-recorder/package.nix @@ -15,14 +15,14 @@ libpulseaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "audio-recorder"; - version = "2.1.3"; + version = "3.3.4"; src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ebionic.tar.gz"; - sha256 = "160pnmnmc9zwzyclsci3w1qwlgxkfx1y3x5ck6i587w78570an1r"; + name = "audio-recorder-${finalAttrs.version}.tar.gz"; + url = "https://launchpad.net/~audio-recorder/+archive/ubuntu/ppa/+files/audio-recorder_${finalAttrs.version}%7Ejammy.tar.gz"; + hash = "sha256-RQ8zAT98EdVgdHENX0WDDYGvu7XjoB7f2FPv2JYJqug="; }; # https://bugs.launchpad.net/audio-recorder/+bug/1784622 @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ]) ++ lib.optional pulseaudioSupport libpulseaudio; - meta = with lib; { + meta = { description = "Audio recorder for GNOME and Unity Desktops"; mainProgram = "audio-recorder"; longDescription = '' @@ -65,8 +65,8 @@ stdenv.mkDerivation rec { formats such as OGG audio, Flac, MP3 and WAV. ''; homepage = "https://launchpad.net/~audio-recorder"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.msteen ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.msteen ]; }; -} +}) diff --git a/pkgs/by-name/au/audio-sharing/package.nix b/pkgs/by-name/au/audio-sharing/package.nix index 955d8ad736e3..3f4fe10a07dd 100644 --- a/pkgs/by-name/au/audio-sharing/package.nix +++ b/pkgs/by-name/au/audio-sharing/package.nix @@ -74,7 +74,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/World/AudioSharing"; description = "Automatically share the current audio playback in the form of an RTSP stream"; mainProgram = "audio-sharing"; - maintainers = with maintainers; [ benediktbroich ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ benediktbroich ]; + teams = [ teams.gnome-circle ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 8284635c4be9..84c31d3aac1d 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "38f05a857ff3cec50bafb594b5d0ab49d6c585ae", - "hash": "sha256-FFZPhQRqmL6pp5aS6qg1Dhf80PAFE2O9oDJB5kSHL50=", - "version": "2.20.0", - "depsHash": "sha256-mB57omyxV338K4LpNMfIThLc2Mz71NqEyFTjWrfAo10=", - "clientDepsHash": "sha256-Wnmue1aGWN9rwP3xYp5q+POP85tHY5gbYBQMKXu9H3Q=" + "rev": "077273033657da2345494084dc7a1f399cc1a7ba", + "hash": "sha256-6ygJrB7AvOyRLgDrkz/qLXiJXP+0U7uhi1HqZP62+gU=", + "version": "2.23.0", + "depsHash": "sha256-3ANieZvWxLVDiIZ1oGSB3UQgApZvukXN5OokyUnFyzg=", + "clientDepsHash": "sha256-WiMQZwPFo5qTo4kTWZ+LuLKDEorediQ+GhUxAO+nRCc=" } diff --git a/pkgs/development/libraries/audiofile/CVE-2015-7747.patch b/pkgs/by-name/au/audiofile/CVE-2015-7747.patch similarity index 100% rename from pkgs/development/libraries/audiofile/CVE-2015-7747.patch rename to pkgs/by-name/au/audiofile/CVE-2015-7747.patch diff --git a/pkgs/development/libraries/audiofile/gcc-6.patch b/pkgs/by-name/au/audiofile/gcc-6.patch similarity index 100% rename from pkgs/development/libraries/audiofile/gcc-6.patch rename to pkgs/by-name/au/audiofile/gcc-6.patch diff --git a/pkgs/by-name/au/audiofile/package.nix b/pkgs/by-name/au/audiofile/package.nix new file mode 100644 index 000000000000..de5ce22b017a --- /dev/null +++ b/pkgs/by-name/au/audiofile/package.nix @@ -0,0 +1,109 @@ +{ + stdenv, + lib, + fetchurl, + fetchpatch, + alsa-lib, +}: + +let + + fetchDebianPatch = + { + name, + debname, + sha256, + }: + fetchpatch { + inherit sha256 name; + url = "https://salsa.debian.org/multimedia-team/audiofile/raw/debian/0.3.6-4/debian/patches/${debname}"; + }; + +in + +stdenv.mkDerivation rec { + pname = "audiofile"; + version = "0.3.6"; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; + + src = fetchurl { + url = "https://audiofile.68k.org/audiofile-${version}.tar.gz"; + sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; + }; + + 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 + # have to run `make` that far first). + # + # Without this, the executables in this package (sfcommands and examples) + # fail to build: https://github.com/NixOS/nixpkgs/issues/103215 + # + # There might be a more sensible way to do this with autotools, but I am not + # smart enough to discover it. + preBuild = lib.optionalString stdenv.hostPlatform.isStatic '' + make -C libaudiofile $makeFlags + sed -i "s/dependency_libs=.*/dependency_libs=' -lstdc++'/" libaudiofile/libaudiofile.la + ''; + + patches = [ + ./gcc-6.patch + ./CVE-2015-7747.patch + + (fetchDebianPatch { + name = "CVE-2017-6829.patch"; + debname = "04_clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch"; + sha256 = "04qxl51i64c53v69q2kx61qdq474f4vapk8rq97cipj7yrar392m"; + }) + (fetchDebianPatch { + name = "CVE-2017-6827+CVE-2017-6828+CVE-2017-6832+CVE-2017-6835+CVE-2017-6837.patch"; + debname = "05_Always-check-the-number-of-coefficients.patch"; + sha256 = "1ih03kfkabffi6ymp6832q470i28rsds78941vzqlshnqjb2nnxw"; + }) + (fetchDebianPatch { + name = "CVE-2017-6839.patch"; + debname = "06_Check-for-multiplication-overflow-in-MSADPCM-decodeSam.patch"; + sha256 = "0a8s2z8rljlj03p7l1is9s4fml8vyzvyvfrh1m6xj5a8vbi635d0"; + }) + (fetchDebianPatch { + name = "CVE-2017-6830+CVE-2017-6834+CVE-2017-6836+CVE-2017-6838.patch"; + debname = "07_Check-for-multiplication-overflow-in-sfconvert.patch"; + sha256 = "0rfba8rkasl5ycvc0kqlzinkl3rvyrrjvjhpc45h423wmjk2za2l"; + }) + (fetchDebianPatch { + name = "audiofile-fix-multiplyCheckOverflow-signature.patch"; + debname = "08_Fix-signature-of-multiplyCheckOverflow.-It-returns-a-b.patch"; + sha256 = "032p5jqp7q7jgc5axdnazz00zm7hd26z6m5j55ifs0sykr5lwldb"; + }) + (fetchDebianPatch { + name = "CVE-2017-6831.patch"; + debname = "09_Actually-fail-when-error-occurs-in-parseFormat.patch"; + sha256 = "0csikmj8cbiy6cigg0rmh67jrr0sgm56dfrnrxnac3m9635nxlac"; + }) + (fetchDebianPatch { + name = "CVE-2017-6833.patch"; + debname = "10_Check-for-division-by-zero-in-BlockCodec-runPull.patch"; + sha256 = "1rlislkjawq98bbcf1dgl741zd508wwsg85r37ca7pfdf6wgl6z7"; + }) + ]; + + meta = with lib; { + description = "Library for reading and writing audio files in various formats"; + homepage = "http://www.68k.org/~michael/audiofile/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/au/audiothekar/package.nix b/pkgs/by-name/au/audiothekar/package.nix index c39867f7a575..38fdbf9e1110 100644 --- a/pkgs/by-name/au/audiothekar/package.nix +++ b/pkgs/by-name/au/audiothekar/package.nix @@ -20,6 +20,11 @@ buildDotnetModule rec { projectFile = "Audiothekar.sln"; + # > Unable to use package assets cache due to I/O error. This can occur when + # > the same project is built more than once in parallel. Performance may be + # > degraded, but the build result will not be impacted. + enableParallelBuilding = false; + doCheck = false; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/au/audiowaveform/package.nix b/pkgs/by-name/au/audiowaveform/package.nix index 2d5d23cb35bb..ba34af45f68f 100644 --- a/pkgs/by-name/au/audiowaveform/package.nix +++ b/pkgs/by-name/au/audiowaveform/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "audiowaveform"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "bbc"; repo = "audiowaveform"; rev = version; - sha256 = "sha256-FcQq0xWs3jH2MfhFQ5r5Vaz8B3akBHBSg8Z/k9An/Wg="; + sha256 = "sha256-GrYShlLUD2vZYN6sJy4FnAMPiV36rOAxZUrK0mxJCRk="; }; cmakeFlags = [ diff --git a/pkgs/by-name/au/augeas/package.nix b/pkgs/by-name/au/augeas/package.nix index 7c735901a4d9..7f1dc2d14381 100644 --- a/pkgs/by-name/au/augeas/package.nix +++ b/pkgs/by-name/au/augeas/package.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation rec { libxml2 ]; - enableParallelBuilding = true; + # Makefile doesn't specify dependencies on parser.h correctly + enableParallelBuilding = false; doCheck = true; diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index 1a3018e39b4a..999362ef86b6 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -2,20 +2,22 @@ lib, buildGoModule, fetchFromGitHub, + installShellFiles, + stdenv, }: buildGoModule rec { pname = "auth0-cli"; - version = "1.10.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${version}"; - hash = "sha256-6JWruZahA3Stu89FGOH2vF6L4wi5CJmqPjJ6fcRkaMY="; + hash = "sha256-RcRJBW8FgCi9Lxz/KARql7ArozqYgttpQ9IXIKzvo6s="; }; - vendorHash = "sha256-mW7eu8Va8XyV4hD4qkM86LvQhLGWirU+L5UKNvgQIFo="; + vendorHash = "sha256-6y2iGxaromnMYIU2rnvwmQwn8f1PdihB4DH9r5sRT68="; ldflags = [ "-s" @@ -34,6 +36,15 @@ buildGoModule rec { --replace-fail "TestFetchUniversalLoginBrandingData" "SkipFetchUniversalLoginBrandingData" ''; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd auth0 \ + --bash <($out/bin/auth0 completion bash) \ + --fish <($out/bin/auth0 completion fish) \ + --zsh <($out/bin/auth0 completion zsh) + ''; + subPackages = [ "cmd/auth0" ]; meta = with lib; { diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index 53946da43883..082bada63e83 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -92,7 +92,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "authenticator"; homepage = "https://gitlab.gnome.org/World/Authenticator"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ austinbutler ] ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ austinbutler ]; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 86c096f829ed..c8c7410d8d4c 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -7,6 +7,7 @@ buildNpmPackage, buildGoModule, runCommand, + bash, chromedriver, openapi-generator-cli, nodejs, @@ -30,7 +31,7 @@ let homepage = "https://goauthentik.io/"; license = licenses.mit; platforms = platforms.linux; - broken = stdenvNoCC.hostPlatform.isAarch64; + broken = stdenvNoCC.buildPlatform != stdenvNoCC.hostPlatform; maintainers = with maintainers; [ jvanbruegge risson @@ -44,7 +45,7 @@ let sourceRoot = "source/website"; - outputHash = "sha256-GIFz1ku0bS/GaWehOp2z9Te9qpWt61DQrw0LA+z/XCk="; + outputHash = "sha256-lPpphGi8l2X/fR9YoJv37piAe82oqSLAKHze8oTrGNc="; outputHashMode = "recursive"; nativeBuildInputs = [ @@ -54,7 +55,7 @@ let buildPhase = '' npm ci --cache ./cache - rm -r ./cache + rm -r ./cache node_modules/@parcel/watcher-linux-* node_modules/.package-lock.json ''; installPhase = '' @@ -277,7 +278,7 @@ let pyyaml requests-oauthlib scim2-filter-parser - sentry-sdk_2 + sentry-sdk service-identity setproctitle structlog @@ -343,6 +344,8 @@ stdenvNoCC.mkDerivation { pname = "authentik"; inherit src version; + buildInputs = [ bash ]; + postPatch = '' rm Makefile patchShebangs lifecycle/ak diff --git a/pkgs/by-name/au/authoscope/package.nix b/pkgs/by-name/au/authoscope/package.nix index d46c6117c8ae..1c3350aabafb 100644 --- a/pkgs/by-name/au/authoscope/package.nix +++ b/pkgs/by-name/au/authoscope/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, installShellFiles, libcap, @@ -31,15 +29,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libcap - zlib - openssl - ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libcap + zlib + openssl + ]; postInstall = '' installManPage docs/${pname}.1 diff --git a/pkgs/by-name/au/auto-multiple-choice/package.nix b/pkgs/by-name/au/auto-multiple-choice/package.nix index b6cc032bb152..85820918503f 100644 --- a/pkgs/by-name/au/auto-multiple-choice/package.nix +++ b/pkgs/by-name/au/auto-multiple-choice/package.nix @@ -25,11 +25,11 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "auto-multiple-choice"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "https://download.auto-multiple-choice.net/${pname}_${version}_dist.tar.gz"; - # before 1.6.0, the URL pattern used "precomp" instead of "dist". ^^^^ - sha256 = "sha256-I9Xw1BN8ZSQhi5F1R3axHBKE6tnaCNk8k5tts6LoMjY="; + # before 1.7.0, the URL pattern used "precomp" instead of "dist". ^^^^ + sha256 = "sha256-37kWqgdvZopvNSU6LA/FmY2wfSJz3rRSlaQF2HSbdmA="; }; # There's only the Makefile diff --git a/pkgs/by-name/au/autobase/package-lock.json b/pkgs/by-name/au/autobase/package-lock.json new file mode 100644 index 000000000000..bdfcbf0502ec --- /dev/null +++ b/pkgs/by-name/au/autobase/package-lock.json @@ -0,0 +1,5215 @@ +{ + "name": "autobase", + "version": "7.7.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "autobase", + "version": "7.7.0", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.1", + "bare-events": "^2.2.0", + "compact-encoding": "^2.16.0", + "core-coupler": "^2.0.0", + "debounceify": "^1.0.0", + "hyperbee": "^2.22.0", + "hypercore": "^11.4.0", + "hypercore-crypto": "^3.4.0", + "hypercore-id-encoding": "^1.2.0", + "index-encoder": "^3.3.2", + "mutexify": "^1.4.0", + "nanoassert": "^2.0.0", + "protomux-wakeup": "^2.0.0", + "ready-resource": "^1.0.0", + "resolve-reject-promise": "^1.1.0", + "safety-catch": "^1.0.2", + "signal-promise": "^1.0.3", + "sub-encoder": "^2.1.1", + "tiny-buffer-map": "^1.1.1" + }, + "devDependencies": { + "autobase-test-helpers": "^3.0.0", + "brittle": "^3.1.1", + "corestore": "^7.0.15", + "rache": "^1.0.0", + "same-data": "^1.0.0", + "standard": "^17.0.0", + "test-tmp": "^1.2.0", + "uncaughts": "^1.1.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", + "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@hyperswarm/secret-stream": { + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/@hyperswarm/secret-stream/-/secret-stream-6.8.1.tgz", + "integrity": "sha512-F3fr8CKB6za9Ac7ifjgAe07qnnesl5kS0MtLsyKxA1Og8E+FZykdwLpgoLjnEa7G6E1L56lASLr42E4kd20sog==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.1.0", + "hypercore-crypto": "^3.3.1", + "noise-curve-ed": "^2.0.1", + "noise-handshake": "^4.0.0", + "sodium-secretstream": "^1.1.0", + "sodium-universal": "^5.0.0", + "streamx": "^2.14.0", + "timeout-refresh": "^2.0.0", + "unslab": "^1.3.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@rtsao/scc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", + "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, + "license": "ISC" + }, + "node_modules/acorn": { + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-includes": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz", + "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "es-shim-unscopables": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", + "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/assert": { + "name": "bare-assert", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bare-assert/-/bare-assert-1.0.2.tgz", + "integrity": "sha512-7AGTrUCz7OOWnMOp4hWnksAkFeZlvW7WMwvKQBANVJIOtjWa6RLSPyUN+zs3QBufRZwIYhYB3UpkAlDbBPp2/Q==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/async-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", + "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/autobase-test-helpers": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/autobase-test-helpers/-/autobase-test-helpers-3.1.0.tgz", + "integrity": "sha512-3Jk1nWEcMxYOtU6rt4ujpchLz0W/Uv7S6v0tea53wW9rZqwFzgffEYbufNak53/93DBbp3gwX+AgHdfHtpx4RQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/b4a": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", + "license": "Apache-2.0" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/bare-addon-resolve": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/bare-addon-resolve/-/bare-addon-resolve-1.9.4.tgz", + "integrity": "sha512-unn6Vy/Yke6F99vg/7tcrvM2KUvIhTNniaSqDbam4AWkd4NhvDVSrQiRYVlNzUV2P7SPobkCK7JFVxrJk9btCg==", + "license": "Apache-2.0", + "dependencies": { + "bare-module-resolve": "^1.10.0", + "bare-semver": "^1.0.0" + }, + "peerDependencies": { + "bare-url": "*" + }, + "peerDependenciesMeta": { + "bare-url": { + "optional": true + } + } + }, + "node_modules/bare-ansi-escapes": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/bare-ansi-escapes/-/bare-ansi-escapes-2.2.3.tgz", + "integrity": "sha512-02ES4/E2RbrtZSnHJ9LntBhYkLA6lPpSEeP8iqS3MccBIVhVBlEmruF1I7HZqx5Q8aiTeYfQVeqmrU9YO2yYoQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.5" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-assert": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bare-assert/-/bare-assert-1.0.2.tgz", + "integrity": "sha512-7AGTrUCz7OOWnMOp4hWnksAkFeZlvW7WMwvKQBANVJIOtjWa6RLSPyUN+zs3QBufRZwIYhYB3UpkAlDbBPp2/Q==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-cov": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/bare-cov/-/bare-cov-1.1.0.tgz", + "integrity": "sha512-y5ik6JY3Gd1Eb0+9GDWOSHPQ+/Mgyj40du1fTlCiEklyMTPhgOJUMRwzAka1V+8KkvgQ8OEbkK/xL4XEfPYGQA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-fs": "^4.1.2", + "bare-inspector": "^4.0.1", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "bare-url": "^2.1.5", + "bare-v8-to-istanbul": "v1.0.0", + "picomatch": "^4.0.2", + "which-runtime": "^1.2.1" + } + }, + "node_modules/bare-crypto": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/bare-crypto/-/bare-crypto-1.4.3.tgz", + "integrity": "sha512-XlIhSB+2ht2+Yli2Ic+HhOvdP0vd+TWWISxzYp50EwfsOwCI4TaeONj5hIr6aDWKhYn0FMsFec7U30QOIXMD4Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.3" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-debug-log": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/bare-debug-log/-/bare-debug-log-1.0.0.tgz", + "integrity": "sha512-tN02RFk6yiS2s7DerJVLvE4W/xrRkNMiCilvS/3fQbu72tj1rteXcQMiztICX5Z3yYsTNJrBokUnAUPjfDU45A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^2.3.0" + } + }, + "node_modules/bare-debug-log/node_modules/bare-os": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.4.tgz", + "integrity": "sha512-z3UiI2yi1mK0sXeRdc4O1Kk8aOa/e+FNWZcTiPB/dfTWyLypuE99LibgRaQki914Jq//yAWylcAt+mknKdixRQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-dns": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/bare-dns/-/bare-dns-2.0.5.tgz", + "integrity": "sha512-C8JF4f/nXXtzyyqyKaSs74HgYZCW3VcG836D0nmANQWGgZlKpw6VMHfpAZM7O4ljcyaNYxdq9pOKE+WXh3AOgA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-env": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-env/-/bare-env-3.0.0.tgz", + "integrity": "sha512-0u964P5ZLAxTi+lW4Kjp7YRJQ5gZr9ycYOtjLxsSrupgMz3sn5Z9n4SH/JIifHwvadsf1brA2JAjP+9IOWwTiw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/bare-events": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz", + "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==", + "license": "Apache-2.0" + }, + "node_modules/bare-format": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bare-format/-/bare-format-1.0.1.tgz", + "integrity": "sha512-1oS+LZrWK6tnYnvNSHDGljc2MPunRxwhpFriuCgzNF+oklrnwmBKD91tS0yt+jpl2j3UgcSDzBIMiVTvLs9A8w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-inspect": "^3.0.0" + } + }, + "node_modules/bare-fs": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.4.tgz", + "integrity": "sha512-r8+26Voz8dGX3AYpJdFb1ZPaUSM8XOLCZvy+YGpRTmwPHIxA7Z3Jov/oMPtV7hfRQbOnH8qGlLTzQAbgtdNN0Q==", + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.4", + "bare-path": "^3.0.0", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-hrtime": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/bare-hrtime/-/bare-hrtime-2.0.11.tgz", + "integrity": "sha512-Mnb2rnGRSHzNHQwFrK8VVqD8Oob/CiSsBlgZGKQ1xTj25GPI19sXHjUPzrkHOU1DaoVj1ig1VO7rZGaYOfXPaw==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-http1": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bare-http1/-/bare-http1-4.0.2.tgz", + "integrity": "sha512-6Jns5oBG9LFz/U2PuFk2LHQbQ1ZuUgPyuahfbNikPL/HcjpSGdSl0xMiN3Qt852Xm1sLBsTGxl0OoM2cVCYzNQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.0.0", + "bare-stream": "^2.3.0", + "bare-tcp": "^2.0.0" + } + }, + "node_modules/bare-https": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bare-https/-/bare-https-2.0.0.tgz", + "integrity": "sha512-qmjNZmYQ4nn+k3CLlxVyOqWYamdBPqE7psR5/lFWG39fskAR4C2h29d1Ka5BeWOGDAWhXImFIwZUxwCE/7xeLA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-http1": "^4.0.0", + "bare-tcp": "^2.0.0", + "bare-tls": "^2.0.0" + } + }, + "node_modules/bare-inspect": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/bare-inspect/-/bare-inspect-3.0.8.tgz", + "integrity": "sha512-Z3McUtoM/saxTBtr7l4M9ADR1m5foXwtxJrO1OPaBLN25M4lNHVm7uwL9e0qlS8kuLXTI41TLEN4S9veJ3EJJA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-ansi-escapes": "^2.1.0", + "bare-type": "^1.0.0" + } + }, + "node_modules/bare-inspector": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/bare-inspector/-/bare-inspector-4.0.1.tgz", + "integrity": "sha512-MZGIci2OFzwDNWlY/JUmEVtK/0xa+mbdggOB0jSI0WYkQpyxaiD4q/8xZ42k4kOoZNLKpYMI31wmllm6jS5w9g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.1.0", + "bare-http1": "^4.0.0", + "bare-stream": "^2.0.0", + "bare-url": "^2.0.0", + "bare-ws": "^2.0.0" + }, + "engines": { + "bare": ">=1.2.0" + } + }, + "node_modules/bare-module-resolve": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/bare-module-resolve/-/bare-module-resolve-1.10.2.tgz", + "integrity": "sha512-C9COe/GhWfVXKytW3DElTkiBU+Gb2OXeaVkdGdRB/lp26TVLESHkTGS876iceAGdvtPgohfp9nX8vXHGvN3++Q==", + "license": "Apache-2.0", + "dependencies": { + "bare-semver": "^1.0.0" + }, + "peerDependencies": { + "bare-url": "*" + }, + "peerDependenciesMeta": { + "bare-url": { + "optional": true + } + } + }, + "node_modules/bare-os": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz", + "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==", + "license": "Apache-2.0", + "engines": { + "bare": ">=1.14.0" + } + }, + "node_modules/bare-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", + "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/bare-pipe": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/bare-pipe/-/bare-pipe-4.0.6.tgz", + "integrity": "sha512-S9kpDJq74gkceynfRqXCaED119k2jF2us4U9xZnTLX0GEduWQY29MNTpAMAf/ucEailW9SPLjGLzbfPCONz3Lw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.0.0", + "bare-stream": "^2.0.0" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-process": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/bare-process/-/bare-process-4.2.1.tgz", + "integrity": "sha512-wcmyQWTHxd2xRgeKUSY46ofmuEAJ9CLo/6swJTHOZFPYpBShMWNPVI2Ba8o0n/X/YE4as99M28x37saWZ1L1vQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.3.1", + "bare-hrtime": "^2.0.0", + "bare-os": "^3.5.0", + "bare-pipe": "^4.0.0", + "bare-signals": "^4.0.0", + "bare-tty": "^5.0.0" + } + }, + "node_modules/bare-semver": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bare-semver/-/bare-semver-1.0.1.tgz", + "integrity": "sha512-UtggzHLiTrmFOC/ogQ+Hy7VfoKoIwrP1UFcYtTxoCUdLtsIErT8+SWtOC2DH/snT9h+xDrcBEPcwKei1mzemgg==", + "license": "Apache-2.0" + }, + "node_modules/bare-signals": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bare-signals/-/bare-signals-4.0.2.tgz", + "integrity": "sha512-+V7ngZRbkQDN6OJj1/Evm725HeXvZ3onHI52jBi/LJAe2bSPn2sNZI1Y9xu0MlebhROdRTqa7lpN/OQVDMRt3g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.3", + "bare-os": "^3.3.1" + }, + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-stream": { + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz", + "integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==", + "license": "Apache-2.0", + "dependencies": { + "streamx": "^2.21.0" + }, + "peerDependencies": { + "bare-buffer": "*", + "bare-events": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + }, + "bare-events": { + "optional": true + } + } + }, + "node_modules/bare-subprocess": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/bare-subprocess/-/bare-subprocess-5.0.3.tgz", + "integrity": "sha512-iCx8kfvqClPAQGsbL2RfMubB6EYoZ67ZhaEIpn6wIqIa60p4zLAlGJyEQQtXPo/5dclbpgzWre5hvJ7HzXC/aA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.5.4", + "bare-os": "^3.0.1", + "bare-pipe": "^4.0.0" + }, + "engines": { + "bare": ">=1.7.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-tcp": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/bare-tcp/-/bare-tcp-2.0.4.tgz", + "integrity": "sha512-Xv0DgOwG0zZwmckY43aRs2iOGewkgXlsBu0oWv3h7Y7sGl8a2tyNe4frxYWRRN3N09SwUJZtid1RSW315MDXmg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-dns": "^2.0.4", + "bare-events": "^2.5.4", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-tls": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/bare-tls/-/bare-tls-2.0.4.tgz", + "integrity": "sha512-mJK7CHoXhBEd+z7KIFf0e5GIJgkIp9b9kt7axTmFyUEyQlyzlAzTrQHCkw++PEwF0soNXgOYQtmb+KUqhpgK+g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-tty": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/bare-tty/-/bare-tty-5.0.2.tgz", + "integrity": "sha512-xOHwI7zZl2Opm7Rul5O+okE32j7O14feJhgovJX2EghtQ2IWVfiC1oH0DmFruMvKthvhZY/Lpg8n5SVBaZhV1A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.2.0", + "bare-signals": "^4.0.0", + "bare-stream": "^2.0.0" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-type": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/bare-type/-/bare-type-1.0.6.tgz", + "integrity": "sha512-6QFeIIp1d06xU9BjDPkl8+QeHil3TKSDpIKUid6bQzwYvxFOnMVhAifRS3J0fvWirEMlWmqxDDKjHW8RPe6C3Q==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "bare": ">=1.2.0" + } + }, + "node_modules/bare-url": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.6.tgz", + "integrity": "sha512-FgjDeR+/yDH34By4I0qB5NxAoWv7dOTYcOXwn73kr+c93HyC2lU6tnjifqUe33LKMJcDyCYPQjEAqgOQiXkE2Q==", + "license": "Apache-2.0", + "dependencies": { + "bare-path": "^3.0.0" + } + }, + "node_modules/bare-utils": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/bare-utils/-/bare-utils-1.2.0.tgz", + "integrity": "sha512-Y9G5DbMUgcx078Etc7h9CD31aI9vYFZ/xl6JLnyvBX9+4lrlXw+5/6toNJGaNSylo4jJf8Cu3yBIDxMLviRFFw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-debug-log": "^1.0.0", + "bare-format": "^1.0.0", + "bare-inspect": "^3.0.0" + } + }, + "node_modules/bare-v8-to-istanbul": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/bare-v8-to-istanbul/-/bare-v8-to-istanbul-1.0.0.tgz", + "integrity": "sha512-5xm9ykzWrk7ntC0Ps2tnNwlFlEAMb3Rk0w/WlwJ/A1xboTQKa9f+NO/31PXB5LspMaz9Qv2pnIwiiHWEnk+kXQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "assert": "npm:bare-assert", + "bare-assert": "^1.0.2", + "bare-fs": "^4.1.2", + "bare-path": "^3.0.0", + "bare-process": "^4.2.0", + "bare-url": "^2.1.5", + "bare-utils": "^1.2.0", + "fs": "npm:bare-fs", + "path": "npm:bare-path", + "process": "npm:bare-process", + "url": "npm:bare-url", + "util": "npm:bare-utils", + "v8-to-istanbul": "^9.3.0", + "which-runtime": "^1.2.1" + } + }, + "node_modules/bare-ws": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/bare-ws/-/bare-ws-2.0.1.tgz", + "integrity": "sha512-ugewb5bmg3k4ICBe1Rkd6Z80/E082xDjyrVDMfk/4HJoTeqIiDZ+hJKJMEXsyfo482Gk6QpNq0ixRjIIumpubA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-crypto": "^1.2.0", + "bare-events": "^2.3.1", + "bare-http1": "^4.0.0", + "bare-https": "^2.0.0", + "bare-stream": "^2.1.2" + } + }, + "node_modules/big-sparse-array": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/big-sparse-array/-/big-sparse-array-1.0.3.tgz", + "integrity": "sha512-6RjV/3mSZORlMdpUaQ6rUSpG637cZm0//E54YYGtQg1c1O+AbZP8UTdJ/TchsDZcTVLmyWZcseBfp2HBeXUXOQ==", + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/brittle": { + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/brittle/-/brittle-3.16.1.tgz", + "integrity": "sha512-1OONeI0lLvN6Atu4oMgvqilyXAE/a/aWqFuPdYaZOkkAXQMGb8fEowVcHJbZloZwdGaTDyNZzrdeGjC73M+rXQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.0", + "bare-cov": "^1.1.0", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "bare-subprocess": "^5.0.0", + "error-stack-parser": "^2.1.4", + "globbie": "^1.0.2", + "paparam": "^1.6.2", + "same-object": "^1.0.2", + "test-tmp": "^1.4.0", + "tmatch": "^5.0.0" + }, + "bin": { + "brittle": "bin/node.js", + "brittle-bare": "bin/bare.js", + "brittle-node": "bin/node.js", + "brittle-pear": "bin/pear.js" + } + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/builtins/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/call-bind": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/codecs": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/codecs/-/codecs-3.1.0.tgz", + "integrity": "sha512-Dqx8NwvBvnMeuPQdVKy/XEF71igjR5apxBvCGeV0pP1tXadOiaLvDTXt7xh+/5wI1ASB195mXQGJbw3Ml4YDWQ==", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.3" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/compact-encoding": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/compact-encoding/-/compact-encoding-2.16.1.tgz", + "integrity": "sha512-vP39X4nwtesmZucaAxDg4wnudOoaJTSR+fikzi8VLVxbwLmcWXf3t0LxY0n2H1AMpdoQZ08lmUf4GY3XiDPnMQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.3.0" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/core-coupler": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/core-coupler/-/core-coupler-2.0.0.tgz", + "integrity": "sha512-FJuEvsdCMwx0Wu+gFQ49rGCi8LCXh8kizHsCQwkdgPZFEFiF0z2HDvyIs+fPt5wMIfU2UVFDuN+dtpfbIxJE6g==", + "license": "Apache-2.0", + "dependencies": { + "safety-catch": "^1.0.2" + } + }, + "node_modules/corestore": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/corestore/-/corestore-7.4.2.tgz", + "integrity": "sha512-4ivC/VOEp+3gxD4HhzFcxJG2AHmgGUbBfs7wSWcfjxZSOp23v+miWA9CtN/a+iP3S5BXTJ0CT94WYPIB7Mp0+w==", + "dev": true, + "license": "MIT", + "dependencies": { + "b4a": "^1.6.7", + "hypercore": "^11.0.0", + "hypercore-crypto": "^3.4.2", + "hypercore-errors": "^1.4.0", + "hypercore-id-encoding": "^1.3.0", + "ready-resource": "^1.1.1", + "sodium-universal": "^5.0.1" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/data-view-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/inspect-js" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/debounceify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/debounceify/-/debounceify-1.1.0.tgz", + "integrity": "sha512-eKuHDVfJVg+u/0nPy8P+fhnLgbyuTgVxuCRrS/R7EpDSMMkBDgSes41MJtSAY1F1hcqfHz3Zy/qpqHHIp/EhdA==", + "license": "MIT" + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/device-file": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/device-file/-/device-file-1.2.6.tgz", + "integrity": "sha512-gHH0lYHWvxjDOstkLji6ExtmYUPtpgICdkEeOuKkodiz111e7rPZP1WWwHlEmvA/gDNQl3KJkbWJ8YDidu3C4A==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.7", + "bare-fs": "^4.0.1", + "fs-native-extensions": "^1.4.0" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/error-stack-parser": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", + "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "stackframe": "^1.3.4" + } + }, + "node_modules/es-abstract": { + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "data-view-buffer": "^1.0.2", + "data-view-byte-length": "^1.0.2", + "data-view-byte-offset": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.1.0", + "es-to-primitive": "^1.3.0", + "function.prototype.name": "^1.1.8", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.0", + "get-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.2", + "is-regex": "^1.2.1", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.0", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.3", + "object-keys": "^1.1.1", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.3", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.18" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz", + "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.6", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "iterator.prototype": "^1.1.4", + "safe-array-concat": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-to-primitive": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" + } + }, + "node_modules/eslint-config-standard-jsx": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", + "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "peerDependencies": { + "eslint": "^8.8.0", + "eslint-plugin-react": "^7.28.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", + "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", + "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rtsao/scc": "^1.1.0", + "array-includes": "^3.1.8", + "array.prototype.findlastindex": "^1.2.5", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.12.0", + "hasown": "^2.0.2", + "is-core-module": "^2.15.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.8", + "object.groupby": "^1.0.3", + "object.values": "^1.2.0", + "semver": "^6.3.1", + "string.prototype.trimend": "^1.0.8", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz", + "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.37.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz", + "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.3", + "array.prototype.tosorted": "^1.1.4", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.2.1", + "estraverse": "^5.3.0", + "hasown": "^2.0.2", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.9", + "object.fromentries": "^2.0.8", + "object.values": "^1.2.1", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.5", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.12", + "string.prototype.repeat": "^1.0.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-fifo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", + "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", + "license": "MIT" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flat-tree": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/flat-tree/-/flat-tree-1.12.1.tgz", + "integrity": "sha512-GchQ+onbnw5QaqsGbpcV6c8etAd396X/EVdDxutQMkGapB0lRvV9heIXS6ZffQVCse0hm2hBpK7GJz2Zp7qiMg==", + "license": "MIT" + }, + "node_modules/flatted": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, + "license": "ISC" + }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/fs": { + "name": "bare-fs", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.4.tgz", + "integrity": "sha512-r8+26Voz8dGX3AYpJdFb1ZPaUSM8XOLCZvy+YGpRTmwPHIxA7Z3Jov/oMPtV7hfRQbOnH8qGlLTzQAbgtdNN0Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.4", + "bare-path": "^3.0.0", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/fs-native-extensions": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/fs-native-extensions/-/fs-native-extensions-1.4.2.tgz", + "integrity": "sha512-QoQqYdHJTtfHUUO/ylyKSrt3dtPDyXCAjzveqCxPsV3hpIMNt455ua470+iTKJ8lFZ94pLC6Dv1TBbwOFLiV5w==", + "license": "Apache-2.0", + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.0" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/generate-object-property": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-2.0.0.tgz", + "integrity": "sha512-KwuURPyqn2Mz8DdV29pJwQu0Y7tcsbkULr82eeOcY/ZllFK6I9Wm8dsRByIu7CKWlFi9BdW1b3mcXMp/kQBQsw==", + "license": "MIT", + "dependencies": { + "is-property": "^1.0.0" + } + }, + "node_modules/generate-string": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/generate-string/-/generate-string-1.0.1.tgz", + "integrity": "sha512-IfTY0dKZM43ACyGvXkbG7De7WY7MxTS5VO6Juhe8oJKpCmrYYXoqp/cJMskkpi0k9H8wuXq0H+eI898/BCqvXg==", + "license": "MIT" + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/globbie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/globbie/-/globbie-1.0.2.tgz", + "integrity": "sha512-815R4zBxKIOnMuj9Qf0zlx3VeyDqqX9Oi2KIjRFtofyyUcZCmL8tGAamXG+VTGukLva8MFQDkmTDG8wvVTYF7Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-fs": "^4.1.2", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "brittle": "^3.6.0", + "picomatch": "^4.0.2" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/has-bigints": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/hyperbee": { + "version": "2.24.2", + "resolved": "https://registry.npmjs.org/hyperbee/-/hyperbee-2.24.2.tgz", + "integrity": "sha512-RAzptsdDN4oDCQ/MjWavjt720D+jRbzHvVl+YW6OwdcaLJslGpbKjbdWV1yuDiGwBs7iRwTUaFA78GtcRHZFwA==", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.0", + "codecs": "^3.0.0", + "debounceify": "^1.0.0", + "hypercore-errors": "^1.0.0", + "mutexify": "^1.4.0", + "protocol-buffers-encodings": "^1.2.0", + "rache": "^1.0.0", + "ready-resource": "^1.0.0", + "safety-catch": "^1.0.2", + "streamx": "^2.12.4", + "unslab": "^1.2.0" + } + }, + "node_modules/hypercore": { + "version": "11.6.3", + "resolved": "https://registry.npmjs.org/hypercore/-/hypercore-11.6.3.tgz", + "integrity": "sha512-ypjlsfmfdHTtWRb5MDFQh8nndALGN6bAf5rDbStncgT39217yj5aR3mGITRXkL0hlstJ3AMvuOWtnWm2RUXAtg==", + "license": "MIT", + "dependencies": { + "@hyperswarm/secret-stream": "^6.0.0", + "b4a": "^1.1.0", + "bare-events": "^2.2.0", + "big-sparse-array": "^1.0.3", + "compact-encoding": "^2.11.0", + "fast-fifo": "^1.3.0", + "flat-tree": "^1.9.0", + "hypercore-crypto": "^3.2.1", + "hypercore-errors": "^1.2.0", + "hypercore-id-encoding": "^1.2.0", + "hypercore-storage": "^1.0.0", + "is-options": "^1.0.1", + "nanoassert": "^2.0.0", + "protomux": "^3.5.0", + "quickbit-universal": "^2.2.0", + "random-array-iterator": "^1.0.0", + "safety-catch": "^1.0.1", + "sodium-universal": "^5.0.1", + "streamx": "^2.12.4", + "unslab": "^1.3.0", + "z32": "^1.0.0" + } + }, + "node_modules/hypercore-crypto": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-3.6.0.tgz", + "integrity": "sha512-0slkW1wzq4B95SD8Z5nt1Yf/3KrIcGsBWTJTsCjHzMXie+sZ5I2IkWcxX1mo4+c0xVESnKAKphKSpGf2kf2BGA==", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.6", + "compact-encoding": "^2.15.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/hypercore-errors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/hypercore-errors/-/hypercore-errors-1.4.0.tgz", + "integrity": "sha512-WoaT467lNbDCglxisthpoC1mpBOH/CoM5IADPQm6BvPzZqXca1S6N1uoflLnZOIre9klCr1SdUnLgDWXLalJ7A==", + "license": "Apache-2.0" + }, + "node_modules/hypercore-id-encoding": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/hypercore-id-encoding/-/hypercore-id-encoding-1.3.0.tgz", + "integrity": "sha512-W6sHdGo5h7LXEsoWfKf/KfuROZmZRQDlGqJF2EPHW+noCK66Vvr0+zE6cL0vqQi18s0kQPeN7Sq3QyR0Ytc2VQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.5.3", + "z32": "^1.0.0" + } + }, + "node_modules/hypercore-storage": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/hypercore-storage/-/hypercore-storage-1.14.0.tgz", + "integrity": "sha512-IkCRvDaBbZqR0nORvhtVN2h5NtJ/Of+dmxCy7tGzjW51cLrouBCJVBNJ005D6yIiEEvTMFogxPZIA+ZTFEP80Q==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.7", + "bare-fs": "^4.0.1", + "bare-path": "^3.0.0", + "compact-encoding": "^2.16.0", + "device-file": "^1.2.2", + "flat-tree": "^1.12.1", + "hypercore-crypto": "^3.4.2", + "hyperschema": "^1.7.0", + "index-encoder": "^3.3.2", + "resolve-reject-promise": "^1.0.0", + "rocksdb-native": "^3.1.1", + "scope-lock": "^1.2.4", + "streamx": "^2.21.1" + } + }, + "node_modules/hyperschema": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/hyperschema/-/hyperschema-1.11.0.tgz", + "integrity": "sha512-oIu1hQ4zO1AqpBc6Dt07WenlELFfs6S6gQETmf7P6UTHwGSPiVc067B6gFxApVRgZuv9cQ4edReILNtHFEgj0A==", + "license": "Apache-2.0", + "dependencies": { + "bare-fs": "^4.0.1", + "compact-encoding": "^2.15.0", + "generate-object-property": "^2.0.0", + "generate-string": "^1.0.1" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/index-encoder": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/index-encoder/-/index-encoder-3.4.0.tgz", + "integrity": "sha512-k3+ENtseFYI9ZPOIZzVH8LlONUvXAcd4jvCPo+Nob/T/2t5R5Rfh8XiFXBG++gHHuVby7HBDp/3YbyEmE481cg==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/internal-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-async-function": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", + "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "async-function": "^1.0.0", + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-boolean-object": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz", + "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-generator-function": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number-object": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-options": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-options/-/is-options-1.0.2.tgz", + "integrity": "sha512-u+Ai74c8Q74aS8BuHwPdI1jptGOT1FQXgCq8/zv0xRuE+wRgSMEJLj8lVO8Zp9BeGb29BXY6AsNPinfqjkr7Fg==", + "license": "MIT", + "dependencies": { + "b4a": "^1.1.1" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-property": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", + "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==", + "license": "MIT" + }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-string": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz", + "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/iterator.prototype": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz", + "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "get-proto": "^1.0.0", + "has-symbols": "^1.1.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/load-json-file": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", + "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^4.0.0", + "pify": "^4.0.1", + "strip-bom": "^3.0.0", + "type-fest": "^0.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=6" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/mutexify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/mutexify/-/mutexify-1.4.0.tgz", + "integrity": "sha512-pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg==", + "license": "MIT", + "dependencies": { + "queue-tick": "^1.0.0" + } + }, + "node_modules/nanoassert": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-2.0.0.tgz", + "integrity": "sha512-7vO7n28+aYO4J+8w96AzhmU8G+Y/xpPDJz/se19ICsqj/momRbb9mh9ZUtkoJ5X3nTnPdhEJyc0qnM6yAsHBaA==", + "license": "ISC" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/noise-curve-ed": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/noise-curve-ed/-/noise-curve-ed-2.1.0.tgz", + "integrity": "sha512-zAzJx+VwZM3w6EA1hTmDhJfvAnCeBQn/1FAeZ0LtGxCcCtlAK/uJXQVF/eDVUOaAZ286lHlx77WJ+qj9SmsRRg==", + "license": "ISC", + "dependencies": { + "b4a": "^1.1.0", + "nanoassert": "^2.0.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/noise-handshake": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/noise-handshake/-/noise-handshake-4.1.0.tgz", + "integrity": "sha512-ZHt2+mOXTvjtaWS2h/JPvQjmknfKrEld2xdSsRYWXnYiJmK/N+dtxrDVSt1cr9wGAlhH7Ek43lIZNsL5bVeX9A==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.1.0", + "nanoassert": "^2.0.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz", + "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.values": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/paparam": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/paparam/-/paparam-1.8.3.tgz", + "integrity": "sha512-OLLDV8E+QoDGpHKW+7Fv7yLKJp7iMncaowH2s0oEuix6UXxHHxW8Tg0m0+IePR017UgyEg3CVlYSb1ON5BscVQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "license": "MIT", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/path": { + "name": "bare-path", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", + "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", + "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^3.0.0", + "load-json-file": "^5.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/process": { + "name": "bare-process", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/bare-process/-/bare-process-4.2.1.tgz", + "integrity": "sha512-wcmyQWTHxd2xRgeKUSY46ofmuEAJ9CLo/6swJTHOZFPYpBShMWNPVI2Ba8o0n/X/YE4as99M28x37saWZ1L1vQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.3.1", + "bare-hrtime": "^2.0.0", + "bare-os": "^3.5.0", + "bare-pipe": "^4.0.0", + "bare-signals": "^4.0.0", + "bare-tty": "^5.0.0" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, + "license": "MIT", + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/protocol-buffers-encodings": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.2.0.tgz", + "integrity": "sha512-daeNPuKh1NlLD1uDfbLpD+xyUTc07nEtfHwmBZmt/vH0B7VOM+JOCOpDcx9ZRpqHjAiIkGqyTDi+wfGSl17R9w==", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.0", + "signed-varint": "^2.0.1", + "varint": "5.0.0" + } + }, + "node_modules/protomux": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/protomux/-/protomux-3.10.1.tgz", + "integrity": "sha512-jgBqx8ZyaBWea/DFG4eOu1scOaeBwcnagiRC1XFVrjeGt7oAb0Pk5udPpBUpJ4DJBRjra50jD6YcZiQQTRqaaA==", + "license": "MIT", + "dependencies": { + "b4a": "^1.3.1", + "compact-encoding": "^2.5.1", + "queue-tick": "^1.0.0", + "safety-catch": "^1.0.1", + "unslab": "^1.3.0" + } + }, + "node_modules/protomux-wakeup": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/protomux-wakeup/-/protomux-wakeup-2.4.2.tgz", + "integrity": "sha512-7kNhlp0vfBbsOVAyJdlTH7CzbGo6V51Vn4XHPtH/9/uEy1vF7Jca0CxETid+pn8ySDYxr/UcsKQhOr4ycn0xyw==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.7", + "hypercore-crypto": "^3.5.0", + "hyperschema": "^1.10.4", + "protomux": "^3.10.1" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/queue-tick": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", + "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", + "license": "MIT" + }, + "node_modules/quickbit-native": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/quickbit-native/-/quickbit-native-2.3.6.tgz", + "integrity": "sha512-Fg4fRVW9lGMbT+QXhWcDvGSkkGCenbjx2EBg4rD3tDg7b2jW2Os+ypILpbXwXFoMKIlACIPvwerRxrPPFOTdVA==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "b4a": "^1.6.0", + "require-addon": "^1.1.0" + } + }, + "node_modules/quickbit-universal": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/quickbit-universal/-/quickbit-universal-2.2.0.tgz", + "integrity": "sha512-w02i1R8n7+6pEKTud8DfF8zbFY9o7RtPlUc3jWbtCkDKvhbx/AvV7oNnz4/TcmsPGpSJS+fq5Ud6RH6+YPvSGg==", + "license": "ISC", + "dependencies": { + "b4a": "^1.6.0", + "simdle-universal": "^1.1.0" + }, + "optionalDependencies": { + "quickbit-native": "^2.2.0" + } + }, + "node_modules/rache": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rache/-/rache-1.0.0.tgz", + "integrity": "sha512-e0k0g0w/8jOCB+7YqCIlOa+OJ38k0wrYS4x18pMSmqOvLKoyhmMhmQyCcvfY6VaP8D75cqkEnlakXs+RYYLqNg==", + "license": "Apache-2.0" + }, + "node_modules/random-array-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-array-iterator/-/random-array-iterator-1.0.0.tgz", + "integrity": "sha512-u7xCM93XqKEvPTP6xZp2ehttcAemKnh73oKNf1FvzuVCfpt6dILDt1Kxl1LeBjm2iNIeR49VGFhy4Iz3yOun+Q==", + "license": "MIT" + }, + "node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/ready-resource": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/ready-resource/-/ready-resource-1.1.2.tgz", + "integrity": "sha512-BN2Yfg/avHpozP+XSo+gsjHQ0AejnfbCJeJT4eamAHSf7dgYmNNWsZqTt5IEc06mjlLao+c2jlTbZvpZyRtRNQ==", + "license": "MIT", + "dependencies": { + "bare-events": "^2.2.0" + } + }, + "node_modules/refcounter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/refcounter/-/refcounter-1.0.0.tgz", + "integrity": "sha512-1WosVzUy0kPUaPMEtlNDwm99UsteALIhXXR8rerELoa63WkYIXAl0hxgwPFrIYBRWZPGUyekQ04FRtPJ7dHk9w==", + "license": "Apache-2.0" + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/require-addon": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/require-addon/-/require-addon-1.1.0.tgz", + "integrity": "sha512-KbXAD5q2+v1GJnkzd8zzbOxchTkStSyJZ9QwoCq3QwEXAaIlG3wDYRZGzVD357jmwaGY7hr5VaoEAL0BkF0Kvg==", + "license": "Apache-2.0", + "dependencies": { + "bare-addon-resolve": "^1.3.0", + "bare-url": "^2.1.0" + }, + "engines": { + "bare": ">=1.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/resolve-reject-promise": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/resolve-reject-promise/-/resolve-reject-promise-1.1.0.tgz", + "integrity": "sha512-LWsTOA91AqzBTjSGgX79Tc130pwcBK6xjpJEO+qRT5IKZ6bGnHKcc8QL3upUBcWuU8OTIDzKK2VNSwmmlqvAVg==", + "license": "MIT" + }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rocksdb-native": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/rocksdb-native/-/rocksdb-native-3.6.0.tgz", + "integrity": "sha512-HD6Wj/KsKlmU/lCA5RJbDDGVfhGHZea7qMeKuNRrKA/7SHr5hi7jqXx9Hf9NGpVw7lBrH7Iqwz3WQSZxQ/otlg==", + "license": "Apache-2.0", + "dependencies": { + "compact-encoding": "^2.15.0", + "ready-resource": "^1.0.0", + "refcounter": "^1.0.0", + "require-addon": "^1.0.2", + "resolve-reject-promise": "^1.1.0", + "streamx": "^2.16.1" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safety-catch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/safety-catch/-/safety-catch-1.0.2.tgz", + "integrity": "sha512-C1UYVZ4dtbBxEtvOcpjBaaD27nP8MlvyAQEp2fOTOEe6pfUpk1cDUxij6BR1jZup6rSyUTaBBplK7LanskrULA==", + "license": "MIT" + }, + "node_modules/same-data": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/same-data/-/same-data-1.0.0.tgz", + "integrity": "sha512-Eqn7N2yV+aKMlUHTRqUwYG1Iv0cJqjlvLKj/GoP5PozJn361QaOYX14+v87r7NqQUZC22noP/LfLrSQiPwAygw==", + "dev": true, + "license": "MIT" + }, + "node_modules/same-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/same-object/-/same-object-1.0.2.tgz", + "integrity": "sha512-csHWhvUsLbIOHDM/nP+KHWM+BLPsIzWkFa8HbzaI0G7BqKXgx+7FJpKTGgLXyz5amfdY2OVBcmXTqYOMEk04og==", + "dev": true, + "license": "MIT" + }, + "node_modules/scope-lock": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/scope-lock/-/scope-lock-1.2.4.tgz", + "integrity": "sha512-BpSd8VCuCxW9ZitcdIC/vjs3gMaP9bRBL5nkHcyfX2VrS52n13/rHuBA2xJ/S/4DPuRdAO/Bk8pWd8eD/gHCIA==", + "license": "Apache-2.0" + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-promise": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/signal-promise/-/signal-promise-1.0.3.tgz", + "integrity": "sha512-WBgv0UnIq2C+Aeh0/n+IRpP6967eIx9WpynTUoiW3isPpfe1zu2LJzyfXdo9Tgef8yR/sGjcMvoUXD7EYdiz+g==", + "license": "MIT" + }, + "node_modules/signed-varint": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/signed-varint/-/signed-varint-2.0.1.tgz", + "integrity": "sha512-abgDPg1106vuZZOvw7cFwdCABddfJRz5akcCcchzTbhyhYnsG31y4AlZEgp315T7W3nQq5P4xeOm186ZiPVFzw==", + "license": "MIT", + "dependencies": { + "varint": "~5.0.0" + } + }, + "node_modules/simdle-native": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/simdle-native/-/simdle-native-1.3.6.tgz", + "integrity": "sha512-WXb3AUnMVOgfMbrOlz0SVpL8pMpC9K2WX/wJ7k5alqza77tO/4vCF7pUtuiPJdMxEBIsX30joKRY7JWRJ4yHqQ==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "b4a": "^1.6.0", + "require-addon": "^1.1.0" + } + }, + "node_modules/simdle-universal": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/simdle-universal/-/simdle-universal-1.1.2.tgz", + "integrity": "sha512-3n3w1bs+uwgHKQjt6arez83EywNlhZzYvNOhvAASTl/8KqNIcqr6aHyGt3JRlfuUC7iB0tomJRPlJ2cRGIpBzA==", + "license": "ISC", + "dependencies": { + "b4a": "^1.6.0" + }, + "optionalDependencies": { + "simdle-native": "^1.1.1" + } + }, + "node_modules/sodium-native": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-5.0.1.tgz", + "integrity": "sha512-Q305aUXc0OzK7VVRvWkeEQJQIHs6slhFwWpyqLB5iJqhpyt2lYIVu96Y6PQ7TABIlWXVF3YiWDU3xS2Snkus+g==", + "license": "MIT", + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.1" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/sodium-secretstream": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/sodium-secretstream/-/sodium-secretstream-1.2.0.tgz", + "integrity": "sha512-q/DbraNFXm1KfCiiZvapmz5UC3OlpirYFIvBK2MhGaOFSb3gRyk8OXTi17UI9SGfshQNCpsVvlopogbzZNyW6Q==", + "license": "MIT", + "dependencies": { + "b4a": "^1.1.1", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/sodium-universal": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-5.0.1.tgz", + "integrity": "sha512-rv+aH+tnKB5H0MAc2UadHShLMslpJsc4wjdnHRtiSIEYpOetCgu8MS4ExQRia+GL/MK3uuCyZPeEsi+J3h+Q+Q==", + "license": "MIT", + "dependencies": { + "sodium-native": "^5.0.1" + }, + "peerDependencies": { + "sodium-javascript": "~0.8.0" + }, + "peerDependenciesMeta": { + "sodium-javascript": { + "optional": true + } + } + }, + "node_modules/stackframe": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", + "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==", + "dev": true, + "license": "MIT" + }, + "node_modules/standard": { + "version": "17.1.2", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.2.tgz", + "integrity": "sha512-WLm12WoXveKkvnPnPnaFUUHuOB2cUdAsJ4AiGHL2G0UNMrcRAWY2WriQaV8IQ3oRmYr0AWUbLNr94ekYFAHOrA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "eslint": "^8.41.0", + "eslint-config-standard": "17.1.0", + "eslint-config-standard-jsx": "^11.0.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.36.1", + "standard-engine": "^15.1.0", + "version-guard": "^1.1.1" + }, + "bin": { + "standard": "bin/cmd.cjs" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/standard-engine": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", + "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "get-stdin": "^8.0.0", + "minimist": "^1.2.6", + "pkg-conf": "^3.1.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/streamx": { + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz", + "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==", + "license": "MIT", + "dependencies": { + "fast-fifo": "^1.3.2", + "text-decoder": "^1.1.0" + }, + "optionalDependencies": { + "bare-events": "^2.2.0" + } + }, + "node_modules/string.prototype.matchall": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", + "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "regexp.prototype.flags": "^1.5.3", + "set-function-name": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/sub-encoder": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/sub-encoder/-/sub-encoder-2.1.3.tgz", + "integrity": "sha512-Xxx04ygZo/1J3yHvaSA6VhDmiSaBQkw/PmO3YnnYFXle+tfOGToC6FcDpIfMztWZXJzuKG14b/57HMkiL58C6A==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.0", + "codecs": "^3.1.0" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/test-tmp": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/test-tmp/-/test-tmp-1.4.0.tgz", + "integrity": "sha512-GVggxGg+jXqP2Wbju50JVLo+9E+nIOPPyWqgr63EbOnNItIKu1cEbJpTWAJeflnyGqXOtcMI7ijHRp88GUkfDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bare-fs": "^4.0.1", + "bare-os": "^3.3.0", + "bare-path": "^3.0.0" + } + }, + "node_modules/text-decoder": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", + "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/timeout-refresh": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-2.0.1.tgz", + "integrity": "sha512-SVqEcMZBsZF9mA78rjzCrYrUs37LMJk3ShZ851ygZYW1cMeIjs9mL57KO6Iv5mmjSQnOe/29/VAfGXo+oRCiVw==", + "license": "MIT" + }, + "node_modules/tiny-buffer-map": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/tiny-buffer-map/-/tiny-buffer-map-1.1.1.tgz", + "integrity": "sha512-C1eDw6ks9CmkDbWVCPHobuixPTkxGa7IDERlaVk98dv4tOUdz42o3haHBr0uhNxbj0gczBTVIyS2uQsu+1vc2Q==", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.0" + } + }, + "node_modules/tmatch": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/tmatch/-/tmatch-5.0.0.tgz", + "integrity": "sha512-Ib9OtBkpHn07tXP04SlN1SYRxFgTk6wSM2EBmjjxug4u5RXPRVLkdFJSS1PmrQidaSB8Lru9nRtViQBsbxzE5Q==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unbox-primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-bigints": "^1.0.2", + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/uncaughts": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/uncaughts/-/uncaughts-1.1.1.tgz", + "integrity": "sha512-UuD2hCFnjsoGRsMH2m6cpbRPwUSdCeQw9xjf6gIV48l43Y5lvdrWm4FvBDS8UXtsjx6D6K6BvJy3rloUAiZRYA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "which-runtime": "^1.2.1" + } + }, + "node_modules/unslab": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/unslab/-/unslab-1.3.0.tgz", + "integrity": "sha512-YATkfKAFj47kTzmiQrWXMyRvaVrHsW6MEALa4bm+FhiA2YG4oira+Z3DXN6LrYOYn2Y8eO94Lwl9DOHjs1FpoQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.6" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url": { + "name": "bare-url", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.6.tgz", + "integrity": "sha512-FgjDeR+/yDH34By4I0qB5NxAoWv7dOTYcOXwn73kr+c93HyC2lU6tnjifqUe33LKMJcDyCYPQjEAqgOQiXkE2Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-path": "^3.0.0" + } + }, + "node_modules/util": { + "name": "bare-utils", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/bare-utils/-/bare-utils-1.2.0.tgz", + "integrity": "sha512-Y9G5DbMUgcx078Etc7h9CD31aI9vYFZ/xl6JLnyvBX9+4lrlXw+5/6toNJGaNSylo4jJf8Cu3yBIDxMLviRFFw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-debug-log": "^1.0.0", + "bare-format": "^1.0.0", + "bare-inspect": "^3.0.0" + } + }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/varint": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.0.tgz", + "integrity": "sha512-gC13b/bWrqQoKY2EmROCZ+AR0jitc6DnDGaQ6Ls9QpKmuSgJB1eQ7H3KETtQm7qSdMWMKCmsshyCmUwMLh3OAA==", + "license": "MIT" + }, + "node_modules/version-guard": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.3.tgz", + "integrity": "sha512-JwPr6erhX53EWH/HCSzfy1tTFrtPXUe927wdM1jqBBeYp1OM+qPHjWbsvv6pIBduqdgxxS+ScfG7S28pzyr2DQ==", + "dev": true, + "license": "0BSD", + "engines": { + "node": ">=0.10.48" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", + "is-async-function": "^2.0.0", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", + "is-generator-function": "^1.0.10", + "is-regex": "^1.2.1", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.1.0", + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-runtime": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-runtime/-/which-runtime-1.2.1.tgz", + "integrity": "sha512-8feIHccQFH/whiA1fD1b4c5+Q7T4ry1g1oHYc2mHnFh81tTQFsCvy3zhS2geUapkFAVBddUT/AM1a3rbqJweFg==", + "license": "Apache-2.0" + }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/z32": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/z32/-/z32-1.1.0.tgz", + "integrity": "sha512-1WUHy+VS6d0HPNspDxvLssBbeQjXMjSnpv0vH82vRAUfg847NmX3OXozp/hRP5jPhxBbrVzrgvAt+UsGNzRFQQ==", + "license": "MIT", + "dependencies": { + "b4a": "^1.5.3" + } + } + } +} diff --git a/pkgs/by-name/au/autobase/package.nix b/pkgs/by-name/au/autobase/package.nix new file mode 100644 index 000000000000..5b2729ce28a9 --- /dev/null +++ b/pkgs/by-name/au/autobase/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "autobase"; + version = "7.7.0"; + + src = fetchFromGitHub { + owner = "holepunchto"; + repo = "autobase"; + tag = "v${finalAttrs.version}"; + hash = "sha256-YKNb2lpSQgH4bDZmA4qJzUFSeJFHXJZseMEml/JxD+s="; + }; + + npmDepsHash = "sha256-oorYb9i/prb/5Jt/hNQcq/NPQq/kAhI2KU8d28nPv/0="; + + dontNpmBuild = true; + + # ERROR: Missing package-lock.json from src + # Copy vendored package-lock.json to src via postPatch + postPatch = '' + cp ${./package-lock.json} ./package-lock.json + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Concise multiwriter for data structures with Hypercore"; + homepage = "https://github.com/holepunchto/autobase"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + teams = with lib.teams; [ ngi ]; + }; +}) diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index 13d5453eda32..dd8665d419f6 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -13,12 +13,12 @@ let pname = "autobrr"; - version = "1.59.0"; + version = "1.62.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-etVhOgE8H8bWuraBepwDSZZzo9Xl819w2sT+UwpUVjM="; + hash = "sha256-lygDs92WiIzHYgYqel2nseWcXgBFEQV+i5tC0NYpYUE="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -40,7 +40,7 @@ let src sourceRoot ; - hash = "sha256-FzYgJvPk2RYC55LON9Wk6q6Fm2RpVeNKm/EH+KZF1hM="; + hash = "sha256-XFGxutHWk1RHnrN//WVTr4RyARIkygdG2C1Af5W0dBc="; }; postBuild = '' @@ -60,7 +60,7 @@ buildGoModule rec { src ; - vendorHash = "sha256-fX2bXF2buXt/T1tfkybq8r9t5MWLGa3Wa+qVMx7z1Jc="; + vendorHash = "sha256-/MOP06po885vg1C6j+let8UC710j68oP+L3j9oEU0Lw="; preBuild = '' cp -r ${autobrr-web}/* web/dist diff --git a/pkgs/tools/text/autocorrect/Cargo.lock b/pkgs/by-name/au/autocorrect/Cargo.lock similarity index 100% rename from pkgs/tools/text/autocorrect/Cargo.lock rename to pkgs/by-name/au/autocorrect/Cargo.lock diff --git a/pkgs/by-name/au/autocorrect/package.nix b/pkgs/by-name/au/autocorrect/package.nix new file mode 100644 index 000000000000..ec62b9adca50 --- /dev/null +++ b/pkgs/by-name/au/autocorrect/package.nix @@ -0,0 +1,45 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "autocorrect"; + version = "2.13.3"; + + src = fetchFromGitHub { + owner = "huacnlee"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-fwq+Q2GpPXWfIQjfSACBjdyjrmYwVKSSZxCy3+NIKNI="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoBuildFlags = [ + "-p" + "autocorrect-cli" + ]; + cargoTestFlags = [ + "-p" + "autocorrect-cli" + ]; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Linter and formatter for help you improve copywriting, to correct spaces, punctuations between CJK (Chinese, Japanese, Korean)"; + mainProgram = "autocorrect"; + homepage = "https://huacnlee.github.io/autocorrect"; + changelog = "https://github.com/huacnlee/autocorrect/releases/tag/v${version}"; + license = licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/tools/text/autocorrect/update.sh b/pkgs/by-name/au/autocorrect/update.sh similarity index 100% rename from pkgs/tools/text/autocorrect/update.sh rename to pkgs/by-name/au/autocorrect/update.sh diff --git a/pkgs/by-name/au/autokbisw/nix/default.nix b/pkgs/by-name/au/autokbisw/nix/default.nix new file mode 100644 index 000000000000..ef16085c27f5 --- /dev/null +++ b/pkgs/by-name/au/autokbisw/nix/default.nix @@ -0,0 +1,7 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "sha256-FSIi4jDX7R35jDHkKzQFJLl4K0Hdx9UWgwxJbHVpsYU="; + }; +} diff --git a/pkgs/by-name/au/autokbisw/nix/workspace-state.json b/pkgs/by-name/au/autokbisw/nix/workspace-state.json new file mode 100644 index 000000000000..67db53fa95f3 --- /dev/null +++ b/pkgs/by-name/au/autokbisw/nix/workspace-state.json @@ -0,0 +1,25 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "e1465042f195f374b94f915ba8ca49de24300a0d", + "version": "1.0.2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + } + ] + }, + "version": 6 +} diff --git a/pkgs/by-name/au/autokbisw/package.nix b/pkgs/by-name/au/autokbisw/package.nix new file mode 100644 index 000000000000..76b601b2ae24 --- /dev/null +++ b/pkgs/by-name/au/autokbisw/package.nix @@ -0,0 +1,45 @@ +{ + fetchFromGitHub, + lib, + swift, + swiftPackages, + swiftpm, + swiftpm2nix, +}: +let + # Nix dir generated by running `swiftpm2nix` in the upstream project + generated = swiftpm2nix.helpers ./nix; +in +swiftPackages.stdenv.mkDerivation rec { + pname = "autokbisw"; + version = "2.0.1"; + src = fetchFromGitHub { + owner = "ohueter"; + repo = "autokbisw"; + tag = version; + hash = "sha256-xNXXgDLWW8pdik3STmhpZATf9REd+8IGeoX/oxGg4vc="; + }; + nativeBuildInputs = [ + swift + swiftpm + ]; + configurePhase = generated.configure; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp $(swiftpmBinPath)/autokbisw $out/bin/ + + runHook postInstall + ''; + + meta = { + description = "Automatic keyboard input language switching for macOS"; + homepage = "https://github.com/ohueter/autokbisw"; + changelog = "https://github.com/ohueter/autokbisw/releases/tag/${version}"; + license = lib.licenses.asl20; + mainProgram = "autokbisw"; + maintainers = with lib.maintainers; [ craigf ]; + platforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 8347e677dced..b626bea1f401 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.67"; + version = "2.0.75"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${version}"; - sha256 = "sha256-j7wQ7jUiXpiDdGBDSiGkIcnnrwkJZESiwB4yqxp0moU="; + sha256 = "sha256-DEHnMgHJTpf2t7iqaYC7AvG8Su4dTCCalnEwP75T8rA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-AIZnpE9ULyZnKNOtpoTP1VQYXMAxEuDiHWdEJGiGo5Q="; + cargoHash = "sha256-b6f6BDIPygXvXKEXxzy2KW/khk5RuUIhgBfcB30IqQc="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/au/autotrace/package.nix b/pkgs/by-name/au/autotrace/package.nix index 40be3cef2fa8..0db4a5c722cc 100644 --- a/pkgs/by-name/au/autotrace/package.nix +++ b/pkgs/by-name/au/autotrace/package.nix @@ -11,29 +11,19 @@ imagemagick, libpng, pstoedit, - darwin, }: stdenv.mkDerivation rec { pname = "autotrace"; - version = "0.31.9"; + version = "0.31.10"; src = fetchFromGitHub { owner = "autotrace"; repo = "autotrace"; rev = version; - hash = "sha256-8qqB6oKmbz95dNLtdLvb69cEj/P7TzdoKEyJ8+4ITzs="; + hash = "sha256-PbEK5+7jcYIwYmgxBIOpNyj2KJNPfqKBKb+wYwoLKSo="; }; - patches = [ - (fetchpatch { - # https://github.com/autotrace/autotrace/pull/105 - name = "imagemagick7-support.patch"; - url = "https://github.com/autotrace/autotrace/compare/170488e1871d50aad7a800b901e33ded7d31773a...c26a2a059926c595a00839c8d9961e9381206579.patch"; - hash = "sha256-Q82LRF/BsJ/Ii2s+7yaYHs9agMKYVYIMnbwqz8P92s0="; - }) - ]; - nativeBuildInputs = [ autoreconfHook gettext @@ -41,16 +31,12 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - glib - imagemagick - libpng - pstoedit - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + imagemagick + libpng + pstoedit + ]; meta = with lib; { homepage = "https://github.com/autotrace/autotrace"; diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix index eedf43f8f5f1..049185a3a2d8 100644 --- a/pkgs/by-name/av/avbroot/package.nix +++ b/pkgs/by-name/av/avbroot/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "avbroot"; - version = "3.14.0"; + version = "3.16.0"; src = fetchFromGitHub { owner = "chenxiaolong"; repo = "avbroot"; tag = "v${version}"; - hash = "sha256-d0sYOTM9o100XJ+5WzjSGM41Ax+l6LHlM0/Lbwz8gVc="; + hash = "sha256-9tHDkKzqEynHsdzKGL0Ten2FccsqLOsKFBxqeisGGAU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LrjzDser5J7fIfviAGxeCmaoeu4XV/aG54ptiVI3Mn4="; + cargoHash = "sha256-GGqrxnFkmzFtoi9Tl5QcbZJwa7ZWYexF205nrxZ+57Q="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/av/avisynthplus/package.nix b/pkgs/by-name/av/avisynthplus/package.nix index 1c5bee5f5557..c224ec6a02db 100644 --- a/pkgs/by-name/av/avisynthplus/package.nix +++ b/pkgs/by-name/av/avisynthplus/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "avisynthplus"; - version = "3.7.4"; + version = "3.7.5"; src = fetchFromGitHub { owner = "AviSynth"; repo = "AviSynthPlus"; tag = "v${finalAttrs.version}"; - hash = "sha256-M+F7bUSlH6kAyQLCq0RxmaE19RqHPPleTMyRuz5zqPg="; + hash = "sha256-RkEZWsAKZABtl+SbRLCjMqyQoi9ainbaI9hWlpO6Fwo="; }; patchPhase = '' diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix index b0bd09a65756..09f24f5d9621 100644 --- a/pkgs/by-name/av/avro-cpp/package.nix +++ b/pkgs/by-name/av/avro-cpp/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/avrogencpp"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "C++ library which implements parts of the Avro Specification"; diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix index b2b74d8a0eb0..dea61fe0fc3d 100644 --- a/pkgs/by-name/aw/await/package.nix +++ b/pkgs/by-name/aw/await/package.nix @@ -40,11 +40,12 @@ stdenv.mkDerivation rec { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = with lib; { + changelog = "https://github.com/slavaGanzin/await/releases/tag/${version}"; description = "Small binary that runs a list of commands in parallel and awaits termination"; - homepage = "https://await-cli.app"; + homepage = "https://github.com/slavaGanzin/await"; license = licenses.mit; maintainers = with maintainers; [ chewblacka ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/aws-c-cal/aws-c-cal-musl-compat.patch b/pkgs/by-name/aw/aws-c-cal/aws-c-cal-musl-compat.patch similarity index 100% rename from pkgs/development/libraries/aws-c-cal/aws-c-cal-musl-compat.patch rename to pkgs/by-name/aw/aws-c-cal/aws-c-cal-musl-compat.patch diff --git a/pkgs/by-name/aw/aws-c-cal/package.nix b/pkgs/by-name/aw/aws-c-cal/package.nix new file mode 100644 index 000000000000..eceed9985693 --- /dev/null +++ b/pkgs/by-name/aw/aws-c-cal/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + aws-c-common, + nix, + openssl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "aws-c-cal"; + # nixpkgs-update: no auto update + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-cal"; + rev = "v${finalAttrs.version}"; + hash = "sha256-dYFUYdMQMT8CZFMrCrhQ8JPEhA4CVf+f7VLFt3JNmn8="; + }; + + patches = [ + # Fix openssl adaptor code for musl based static binaries. + ./aws-c-cal-musl-compat.patch + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + aws-c-common + openssl + ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + + passthru.tests = { + inherit nix; + }; + + meta = with lib; { + description = "AWS Crypto Abstraction Layer"; + homepage = "https://github.com/awslabs/aws-c-cal"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej ]; + }; +}) diff --git a/pkgs/by-name/aw/aws-c-io/package.nix b/pkgs/by-name/aw/aws-c-io/package.nix new file mode 100644 index 000000000000..ddf698b7bb54 --- /dev/null +++ b/pkgs/by-name/aw/aws-c-io/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + aws-c-cal, + aws-c-common, + nix, + s2n-tls, +}: + +stdenv.mkDerivation rec { + pname = "aws-c-io"; + # nixpkgs-update: no auto update + version = "0.15.3"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-/pG/+MHAu/TYTtY/RQrr1U1ev2FZ1p/O8kIRUDDOcvQ="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + aws-c-cal + aws-c-common + s2n-tls + ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + + passthru.tests = { + inherit nix; + }; + + meta = with lib; { + description = "AWS SDK for C module for IO and TLS"; + homepage = "https://github.com/awslabs/aws-c-io"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/by-name/aw/aws-iam-authenticator/package.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix index 24e83364591f..40957f4d229c 100644 --- a/pkgs/by-name/aw/aws-iam-authenticator/package.nix +++ b/pkgs/by-name/aw/aws-iam-authenticator/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.30"; + version = "0.7.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; tag = "v${version}"; - hash = "sha256-pgAk2qhsJTXbaXtdmKkA5GUIJt2ShWJ1mG6h0Zuh+Ng="; + hash = "sha256-ZoK6GYAGNIRNzKAn1m5SaytBwEpufqDBWo2oJB4YA8c="; }; - vendorHash = "sha256-dR98s5g2KFGJIFbgYHmW2813GEhLFZZvV5nja84a0Ik="; + vendorHash = "sha256-OEiU9m5oQ7zQDp6OAj2L7wk61ul7zSDXyxIVthfkpQg="; ldflags = let diff --git a/pkgs/by-name/aw/aws-lambda-rie/package.nix b/pkgs/by-name/aw/aws-lambda-rie/package.nix index a259673271c9..a5fe80fb2b7e 100644 --- a/pkgs/by-name/aw/aws-lambda-rie/package.nix +++ b/pkgs/by-name/aw/aws-lambda-rie/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "aws-lambda-runtime-interface-emulator"; - version = "1.23"; + version = "1.25"; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-runtime-interface-emulator"; rev = "v${version}"; - sha256 = "sha256-zbeaWbvWk3duBfdUb70G/O4gO20NSHiwuTUZjtGlM3Q="; + sha256 = "sha256-GHoEyTM3vDVmozcKoi5ETG4V10o82HcigmmhIMV0UJg="; }; vendorHash = "sha256-fGoqKDBg+O4uzGmhEIROsBvDS+6zWCzsXe8U6t98bqk="; @@ -25,6 +25,6 @@ buildGoModule rec { mainProgram = "aws-lambda-rie"; homepage = "https://github.com/aws/aws-lambda-runtime-interface-emulator"; license = licenses.asl20; - maintainers = with maintainers; [ teto ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/aw/aws-lc/package.nix b/pkgs/by-name/aw/aws-lc/package.nix index 3f665ab3f14d..fc79bcb98d9a 100644 --- a/pkgs/by-name/aw/aws-lc/package.nix +++ b/pkgs/by-name/aw/aws-lc/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - overrideSDK, cmakeMinimal, fetchFromGitHub, ninja, @@ -9,18 +8,15 @@ aws-lc, useSharedLibraries ? !stdenv.hostPlatform.isStatic, }: -let - awsStdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in -awsStdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "aws-lc"; - version = "1.47.0"; + version = "1.51.2"; src = fetchFromGitHub { owner = "aws"; repo = "aws-lc"; rev = "v${finalAttrs.version}"; - hash = "sha256-Nf+UmtXbtWwkVT63eui5kINyzsmTYqCWXh8JlMHz1h8="; + hash = "sha256-Of4zXFO2+2uvu5xi4tmzUK9F5pJ+VyKQOrLpdYPvhSA="; }; outputs = [ diff --git a/pkgs/by-name/aw/aws-nuke/package.nix b/pkgs/by-name/aw/aws-nuke/package.nix index edf5b8a57eba..6e994b9f5d48 100644 --- a/pkgs/by-name/aw/aws-nuke/package.nix +++ b/pkgs/by-name/aw/aws-nuke/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "aws-nuke"; - version = "3.51.0"; + version = "3.54.0"; src = fetchFromGitHub { owner = "ekristen"; repo = "aws-nuke"; tag = "v${version}"; - hash = "sha256-ITYHcmOK+vPezxdMNsFwdxUXDHXljVUOyrdR7eXJYeE="; + hash = "sha256-BicxJhisCmUXWaBGA/VZSKkh7F3PUjArJC75n1G5jpE="; }; - vendorHash = "sha256-DK7nR5P/Y/aSpG+AORYHmVypeVNfRqWE7X8J40lVyjY="; + vendorHash = "sha256-6BIPF4bBEBnMHLjnH1rSCrh+cbwWjcpBKxHeQcTbEPk="; overrideModAttrs = _: { preBuild = '' diff --git a/pkgs/by-name/aw/aws-sdk-cpp/package.nix b/pkgs/by-name/aw/aws-sdk-cpp/package.nix new file mode 100644 index 000000000000..a0854db31509 --- /dev/null +++ b/pkgs/by-name/aw/aws-sdk-cpp/package.nix @@ -0,0 +1,169 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + openssl, + zlib, + aws-crt-cpp, + nix, + arrow-cpp, + aws-sdk-cpp, + # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. + apis ? [ "*" ], + # Whether to enable AWS' custom memory management. + customMemoryManagement ? true, +}: + +let + host_os = + if stdenv.hostPlatform.isDarwin then + "APPLE" + else if stdenv.hostPlatform.isAndroid then + "ANDROID" + else if stdenv.hostPlatform.isWindows then + "WINDOWS" + else if stdenv.hostPlatform.isLinux then + "LINUX" + else + throw "Unknown host OS"; +in + +stdenv.mkDerivation rec { + pname = "aws-sdk-cpp"; + # nixpkgs-update: no auto update + version = "1.11.448"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-sdk-cpp"; + rev = version; + hash = "sha256-K0UFs7vOeZeQIs3G5L4FfEWXDGTXT9ssr/vQwa1l2lw="; + }; + + postPatch = + '' + # Append the dev output to path hints in finding Aws.h to avoid + # having to pass `AWS_CORE_HEADER_FILE` explicitly to cmake configure + # when using find_package(AWSSDK CONFIG) + substituteInPlace cmake/AWSSDKConfig.cmake \ + --replace 'C:/AWSSDK/''${AWSSDK_INSTALL_INCLUDEDIR}/aws/core' \ + 'C:/AWSSDK/''${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" + "${placeholder "dev"}/include/aws/core' + + # Avoid blanket -Werror to evade build failures on less + # tested compilers. + substituteInPlace cmake/compiler_settings.cmake \ + --replace '"-Werror"' ' ' + + # Flaky on Hydra + rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp + rm tests/aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp + rm tests/aws-cpp-sdk-core-tests/aws/client/AwsConfigTest.cpp + # Includes aws-c-auth private headers, so only works with submodule build + rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp + # TestRandomURLMultiThreaded fails + rm tests/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp + '' + + lib.optionalString stdenv.hostPlatform.isi686 '' + # EPSILON is exceeded + rm tests/aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp + ''; + + # FIXME: might be nice to put different APIs in different outputs + # (e.g. libaws-cpp-sdk-s3.so in output "s3"). + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + cmake + curl + ]; + + buildInputs = [ + curl + openssl + zlib + ]; + + # propagation is needed for Security.framework to be available when linking + propagatedBuildInputs = [ aws-crt-cpp ]; + + cmakeFlags = + [ + "-DBUILD_DEPS=OFF" + ] + ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-DENABLE_TESTING=OFF" + "-DCURL_HAS_H2=1" + "-DCURL_HAS_TLS_PROXY=1" + "-DTARGET_ARCH=${host_os}" + ] + ++ lib.optional (apis != [ "*" ]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; + + env.NIX_CFLAGS_COMPILE = toString [ + # openssl 3 generates several deprecation warnings + "-Wno-error=deprecated-declarations" + ]; + + postFixupHooks = [ + # This bodge is necessary so that the file that the generated -config.cmake file + # points to an existing directory. + "mkdir -p $out/include" + ]; + + __darwinAllowLocalNetworking = true; + + # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder. + requiredSystemFeatures = [ "big-parallel" ]; + + passthru = { + tests = { + inherit nix arrow-cpp; + cmake-find-package = stdenv.mkDerivation { + pname = "aws-sdk-cpp-cmake-find-package-test"; + version = "0"; + dontUnpack = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ aws-sdk-cpp ]; + buildCommand = '' + cat > CMakeLists.txt <<'EOF' + find_package(AWSSDK) + EOF + + # Intentionally not using 'cmakeConfigurePhase' to test that find_package works without it. + mkdir build && cd build + if output=$(cmake -Wno-dev .. 2>&1); then + if grep -Fw -- "Found AWS" - <<< "$output"; then + touch "$out" + else + echo "'Found AWS' not found in the cmake output!" >&2 + echo "The output was:" >&2 + echo "$output" >&2 + exit 1 + fi + else + echo -n "'cmake -Wno-dev ..'" >&2 + echo " returned a non-zero exit code." >&2 + echo "$output" >&2 + exit 1 + fi + ''; + }; + }; + }; + + meta = with lib; { + description = "C++ interface for Amazon Web Services"; + homepage = "https://github.com/aws/aws-sdk-cpp"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej ]; + # building ec2 runs out of memory: cc1plus: out of memory allocating 33554372 bytes after a total of 74424320 bytes + broken = stdenv.buildPlatform.is32bit && ((builtins.elem "ec2" apis) || (builtins.elem "*" apis)); + }; +} diff --git a/pkgs/by-name/aw/aws-signing-helper/package.nix b/pkgs/by-name/aw/aws-signing-helper/package.nix index 3b9ee9e1b363..dc4ca020dbb0 100644 --- a/pkgs/by-name/aw/aws-signing-helper/package.nix +++ b/pkgs/by-name/aw/aws-signing-helper/package.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "aws-signing-helper"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "aws"; repo = "rolesanywhere-credential-helper"; rev = "v${version}"; - hash = "sha256-CIUhO+5gMIknB3NwYwaBbtZEkW2x/U2Bi9Qbqn9bLuc="; + hash = "sha256-aWSOSGv7JpRii/xYzLF1K58Lcvwywzw9AN9dNUZni/I="; }; - vendorHash = "sha256-QKKgBIocJoGbfs78PxNBLBi4KTDPtSuhzvsb6OBhNWQ="; + vendorHash = "sha256-8YkLeGtf8Il7V5rVk+YJgH03lx+Ivq6kcqZNXcUnyrc="; checkPhase = '' runHook preCheck diff --git a/pkgs/by-name/aw/aws-sso-cli/package.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix index 99412edca5e0..edbaed61c55f 100644 --- a/pkgs/by-name/aw/aws-sso-cli/package.nix +++ b/pkgs/by-name/aw/aws-sso-cli/package.nix @@ -9,15 +9,15 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.17.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-VEI+vCNeNoFOE+2j/OUjRszXsUQP2E1iUdPUW9X3tHk="; + hash = "sha256-D6ytiuh335r1XHwX6riI5OkpA8C1Ta0EwD1yPwob2ms="; }; - vendorHash = "sha256-a57RtK8PxwaRrSA6W6R//GacZ+pK8mBi4ZASS5NvShE="; + vendorHash = "sha256-SNMU7qDfLRGUSLjzrJHtIMgbcRc2DxXwWEUaUEY6PME="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix index 6952b24a07c6..bdcf2e63b8b8 100644 --- a/pkgs/by-name/aw/aws-workspaces/package.nix +++ b/pkgs/by-name/aw/aws-workspaces/package.nix @@ -1,109 +1,73 @@ { - stdenv, - lib, - makeWrapper, - dpkg, - fetchurl, - autoPatchelfHook, - curl, - libkrb5, - lttng-ust, - libpulseaudio, + callPackage, + writeShellApplication, + buildFHSEnv, + webkitgtk_4_1, gtk3, - openssl_1_1, - icu70, - webkitgtk_4_0, - librsvg, + pango, + atk, + cairo, gdk-pixbuf, - libsoup_2_4, - glib-networking, - graphicsmagick_q16, - libva, - libusb1, - hiredis, - xcbutil, + protobufc, + cyrus_sasl, }: -stdenv.mkDerivation (finalAttrs: { +let + workspacesclient = callPackage ./workspacesclient.nix { }; + + # Source: https://github.com/jthomaschewski/pkgbuilds/pull/3 + # Credits to https://github.com/rwolfson + custom_lsb_release = writeShellApplication { + name = "lsb_release"; + + text = '' + # "Fake" lsb_release script + # This only exists so that "lsb_release -r" will return the below string + # when placed in the $PATH + + if [ "$#" -ne 1 ] || [ "$1" != "-r" ] ; then + echo "Expected only '-r' argument" + exit 1 + fi + + echo "Release: 22.04" + ''; + }; pname = "aws-workspaces"; - version = "4.7.0.4312"; - src = fetchurl { - # Check new version at https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/Packages - urls = [ - "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/workspacesclient_${finalAttrs.version}_amd64.deb" - "https://archive.org/download/workspacesclient_${finalAttrs.version}_amd64/workspacesclient_${finalAttrs.version}_amd64.deb" - ]; - hash = "sha256-G0o5uFnEkiUWmkTMUHlVcidw+2x8e/KmMfVBE7oLXV8="; - }; +in +buildFHSEnv { + inherit pname; + inherit (workspacesclient) version; - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - ]; + runScript = "${workspacesclient}/bin/workspacesclient"; - # Crashes at startup when stripping: - # "Failed to create CoreCLR, HRESULT: 0x80004005" - dontStrip = true; + includeClosures = true; - buildInputs = [ - (lib.getLib stdenv.cc.cc) - libkrb5 - curl - lttng-ust - libpulseaudio + targetPkgs = pkgs: [ + workspacesclient + custom_lsb_release + webkitgtk_4_1 gtk3 - openssl_1_1.out - icu70 - webkitgtk_4_0 - librsvg + pango + atk + cairo gdk-pixbuf - libsoup_2_4 - glib-networking - graphicsmagick_q16 - hiredis - libusb1 - libva - xcbutil + protobufc + cyrus_sasl ]; - unpackPhase = '' - ${dpkg}/bin/dpkg -x $src $out + extraBwrapArgs = [ + # provide certificates where Debian-style OpenSSL can find them + "--symlink /etc/ssl/certs/ca-certificates.crt /etc/ssl/cert.pem" + ]; + + # expected executable doesn't match the name of this package + extraInstallCommands = '' + mv $out/bin/${pname} $out/bin/workspacesclient + + ln -s ${workspacesclient}/share $out/ ''; - preFixup = '' - patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so - patchelf --replace-needed libGraphicsMagick++-Q16.so.12 libGraphicsMagick++.so.12 $out/usr/lib/x86_64-linux-gnu/pcoip-client/vchan_plugins/libvchan-plugin-clipboard.so - patchelf --replace-needed libhiredis.so.0.14 libhiredis.so $out/lib/libpcoip_core.so - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/lib - mv $out/opt/workspacesclient/* $out/lib - rm -rf $out/opt - - wrapProgram $out/lib/workspacesclient \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \ - --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ - --set GIO_EXTRA_MODULES "${glib-networking.out}/lib/gio/modules" - - mv $out/lib/workspacesclient $out/bin - - runHook postInstall - ''; - - meta = with lib; { - description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution"; - homepage = "https://clients.amazonworkspaces.com"; - license = licenses.unfree; - mainProgram = "workspacesclient"; - maintainers = with maintainers; [ - mausch - dylanmtaylor - ]; - platforms = [ "x86_64-linux" ]; # TODO Mac support - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -}) + meta = workspacesclient.meta; +} diff --git a/pkgs/by-name/aw/aws-workspaces/workspacesclient.nix b/pkgs/by-name/aw/aws-workspaces/workspacesclient.nix new file mode 100644 index 000000000000..b1234722ec64 --- /dev/null +++ b/pkgs/by-name/aw/aws-workspaces/workspacesclient.nix @@ -0,0 +1,72 @@ +{ + stdenv, + lib, + fetchurl, + dpkg, + makeWrapper, + glib-networking, +}: + +let + dcv-path = "lib/x86_64-linux-gnu/workspacesclient/dcv"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "workspacesclient"; + version = "2024.8.5191"; + + src = fetchurl { + urls = [ + # Check new version at https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/jammy/main/binary-amd64/Packages + "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/jammy/main/binary-amd64/workspacesclient_${finalAttrs.version}_amd64.deb" + "https://d3nt0h4h6pmmc4.cloudfront.net/new_workspacesclient_jammy_amd64.deb" + ]; + hash = "sha256-BDxMycVgWciJZe8CtElXaWVnqYDQO5NmawK10GvP2+k="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -R usr/* $out/ + + # We introduce a dependency on the source file so that it need not be redownloaded everytime + echo $src >> "$out/share/workspace_dependencies.pin" + + runHook postInstall + ''; + + postFixup = '' + # provide network support + wrapProgram "$out/bin/workspacesclient" \ + --set GIO_EXTRA_MODULES ${glib-networking}/lib/gio/modules \ + + # dcvclient does not setup the environment correctly. + # Instead wrap the binary directly the correct environment paths + mv $out/${dcv-path}/dcvclientbin $out/${dcv-path}/dcvclient + wrapProgram $out/${dcv-path}/dcvclient \ + --suffix LD_LIBRARY_PATH : $out/${dcv-path} \ + --suffix GIO_EXTRA_MODULES : ${dcv-path}/gio/modules \ + --set DCV_SASL_PLUGIN_DIR $out/${dcv-path}/sasl2 \ + + # shrink the install by removing all vendored libraries which will be provided by Nixpkgs + find $out/${dcv-path} -name lib\* ! -name libdcv\* ! -name libgioopenssl\* | xargs rm + ''; + + meta = { + description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution"; + homepage = "https://clients.amazonworkspaces.com"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "workspacesclient"; + maintainers = with lib.maintainers; [ + mausch + dylanmtaylor + ]; + platforms = [ "x86_64-linux" ]; # TODO Mac support + }; +}) diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 58d482d5c8d1..069be0822da0 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -64,25 +64,25 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli2"; - version = "2.25.5"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.27.2"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; tag = version; - hash = "sha256-l2X7QhhrX0MzdB4WpuqaDcJdRK7G/vfig+F3F1tHM5Y="; + hash = "sha256-rdgjA6t5L4mNKnyRyNdIyzX6fjMUgbD0YCjresK94Dg="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'flit_core>=3.7.1,<3.9.1' 'flit_core>=3.7.1' \ - --replace-fail 'awscrt==0.23.8' 'awscrt>=0.23.6' \ + --replace-fail 'awscrt==0.25.4' 'awscrt>=0.25.4' \ --replace-fail 'cryptography>=40.0.0,<43.0.2' 'cryptography>=43.0.0' \ --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \ --replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \ --replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' \ - --replace-fail 'zipp<3.21.0' 'zipp>=3.21.0' + --replace-fail 'ruamel.yaml.clib>=0.2.0,<=0.2.12' 'ruamel.yaml.clib>=0.2.0' \ substituteInPlace requirements-base.txt \ --replace-fail "wheel==0.43.0" "wheel>=0.43.0" diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 2d0a1e3cb865..f74292beb65b 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -25,14 +25,14 @@ in python.pkgs.buildPythonApplication rec { pname = "awsebcli"; - version = "3.21"; + version = "3.24"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-elastic-beanstalk-cli"; tag = version; - hash = "sha256-VU8bXvS4m4eIamjlgGmHE2qwDXWAXvWTa0QHomXR5ZE="; + hash = "sha256-i1CcOlrrtizvQMXKoj5xQYlmaTB8JWb4X5S+EcnQXps="; }; pythonRelaxDeps = [ @@ -45,17 +45,12 @@ python.pkgs.buildPythonApplication rec { "urllib3" ]; - postPatch = '' - # https://github.com/aws/aws-elastic-beanstalk-cli/pull/469 - substituteInPlace setup.py \ - --replace-fail "scripts=['bin/eb']," "" - ''; - dependencies = with python.pkgs; [ blessed botocore cement colorama + fabric pathspec pyyaml future @@ -88,6 +83,13 @@ python.pkgs.buildPythonApplication rec { "test_generate_and_upload_keypair__exit_code_1" "test_generate_and_upload_keypair__exit_code_is_other_than_1_and_0" "test_generate_and_upload_keypair__ssh_keygen_not_present" + + # AssertionError: Expected 'echo' to be called once. Called 2 times + "test_multiple_modules__one_or_more_of_the_specified_modules_lacks_an_env_yaml" + + # fails on hydra only on aarch64-linux + # ebcli.objects.exceptions.CredentialsError: Operation Denied. You appear to have no credentials + "test_aws_eb_profile_environment_variable_found__profile_exists_in_credentials_file" ]; meta = with lib; { diff --git a/pkgs/by-name/ax/axmldec/package.nix b/pkgs/by-name/ax/axmldec/package.nix deleted file mode 100644 index 7d8fba5a6d0d..000000000000 --- a/pkgs/by-name/ax/axmldec/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - doxygen, - boost, - zlib, -}: - -stdenv.mkDerivation rec { - pname = "axmldec"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "ytsutano"; - repo = "axmldec"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-LFDZZbRDa8mQmglgS4DA/OqXp0HJZ2uqg1hbStdgvUw="; - }; - - nativeBuildInputs = [ - cmake - doxygen - ]; - buildInputs = [ - boost - zlib - ]; - - meta = with lib; { - description = "Stand-alone binary AndroidManifest.xml decoder"; - longDescription = '' - This tool accepts either a binary or a text XML file and prints the - decoded XML to the standard output or a file. It also allows you to - extract the decoded AndroidManifest.xml directly from an APK file. - ''; - homepage = "https://github.com/ytsutano/axmldec"; - changelog = "https://github.com/ytsutano/axmldec/releases/tag/${src.rev}"; - license = licenses.isc; - mainProgram = "axmldec"; - maintainers = with maintainers; [ franciscod ]; - platforms = platforms.unix ++ platforms.windows; - }; -} diff --git a/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix index 451aade5bc9d..cca64e866ca5 100644 --- a/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix @@ -65,8 +65,11 @@ stdenv.mkDerivation (finalAttrs: { "lomiri" ]; }; + tests = { + startup = nixosTests.ayatana-indicators; + lomiri = nixosTests.lomiri.desktop-ayatana-indicator-bluetooth; + }; updateScript = gitUpdater { }; - tests.vm = nixosTests.ayatana-indicators; }; meta = { diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index 1caaab62108e..c9e5f682879f 100644 --- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -137,7 +137,8 @@ stdenv.mkDerivation (finalAttrs: { ]; }; tests = { - inherit (nixosTests) ayatana-indicators; + startup = nixosTests.ayatana-indicators; + lomiri = nixosTests.lomiri.desktop-ayatana-indicator-datetime; }; updateScript = gitUpdater { }; }; diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix index 04373cd3a2aa..5777b40952d0 100644 --- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-display"; - version = "24.5.1"; + version = "24.5.2"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-display"; tag = finalAttrs.version; - hash = "sha256-vvDgJVFrgtjAzDXXas19osDydS+C3brZOctXIIWrkyM="; + hash = "sha256-rsZjEfAiz1HC5XMjPume1Y6miNAv1kmPFP4J/+NKlsA="; }; postPatch = '' @@ -114,7 +114,10 @@ stdenv.mkDerivation (finalAttrs: { "lomiri" ]; }; - tests.vm = nixosTests.ayatana-indicators; + tests = { + startup = nixosTests.ayatana-indicators; + lomiri = nixosTests.lomiri.desktop-ayatana-indicator-display; + }; updateScript = gitUpdater { }; }; diff --git a/pkgs/by-name/ay/ayatana-indicator-power/package.nix b/pkgs/by-name/ay/ayatana-indicator-power/package.nix index 00385980367d..a586f05f1ced 100644 --- a/pkgs/by-name/ay/ayatana-indicator-power/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-power/package.nix @@ -94,7 +94,10 @@ stdenv.mkDerivation (finalAttrs: { "lomiri" ]; }; - tests.vm = nixosTests.ayatana-indicators; + tests = { + startup = nixosTests.ayatana-indicators; + lomiri = nixosTests.lomiri.desktop-ayatana-indicator-power; + }; updateScript = gitUpdater { }; }; diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index e6a2c4737bd4..d674cf3b76cb 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-session"; - version = "24.5.0"; + version = "24.5.1"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-session"; tag = finalAttrs.version; - hash = "sha256-p4nu7ZgnEjnnxNqyZIg//YcssnQcCY7GFDbpGIu1dz0="; + hash = "sha256-jqcgQTsC4VBit3wwtKKTdEG71CUPJpeMtpzikE4IGhE="; }; postPatch = '' @@ -84,7 +84,10 @@ stdenv.mkDerivation (finalAttrs: { "lomiri" ]; }; - tests.vm = nixosTests.ayatana-indicators; + tests = { + startup = nixosTests.ayatana-indicators; + lomiri = nixosTests.lomiri.desktop-ayatana-indicator-session; + }; updateScript = gitUpdater { }; }; diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix index 983ec1833ed1..24fec1368290 100644 --- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix @@ -115,7 +115,10 @@ stdenv.mkDerivation (finalAttrs: { "lomiri" ]; }; - tests.vm = nixosTests.ayatana-indicators; + tests = { + startup = nixosTests.ayatana-indicators; + lomiri = nixosTests.lomiri.desktop-ayatana-indicator-sound; + }; updateScript = gitUpdater { }; }; diff --git a/pkgs/by-name/az/az-pim-cli/package.nix b/pkgs/by-name/az/az-pim-cli/package.nix index 8878135ed3e8..e595583cde3b 100644 --- a/pkgs/by-name/az/az-pim-cli/package.nix +++ b/pkgs/by-name/az/az-pim-cli/package.nix @@ -5,8 +5,9 @@ installShellFiles, stdenv, buildPackages, - versionCheckHook, nix-update-script, + testers, + az-pim-cli, }: buildGoModule (finalAttrs: { pname = "az-pim-cli"; @@ -37,11 +38,13 @@ buildGoModule (finalAttrs: { '' ); - doInstallCheck = true; - nativeInstallCheck = [ versionCheckHook ]; - versionCheckProgramArg = "version"; - - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + command = "HOME=$TMPDIR az-pim-cli --version"; + package = az-pim-cli; + }; + }; meta = { description = "List and activate Azure Entra ID Privileged Identity Management roles from the CLI"; diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 94165c99ec07..ad726c07c86b 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -27,6 +27,7 @@ pipewire, pkg-config, portaudio, + SDL2, sndio, spirv-tools, soundtouch, @@ -34,10 +35,7 @@ vulkan-headers, xorg, zstd, - enableSDL2 ? true, - SDL2, - enableQt ? true, - enableQtTranslations ? enableQt, + enableQtTranslations ? true, qt6, enableCubeb ? true, cubeb, @@ -53,20 +51,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "azahar"; - version = "2120.2"; + version = "2121.1"; src = fetchzip { - # TODO: use this when https://github.com/azahar-emu/azahar/issues/779 is resolved - # url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-20250329-32bb14f.tar.xz"; - hash = "sha256-OyAc4nePQDuuwb+/ABnNe5ihPqMEoAqNeCYvME7SIio="; + url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz"; + hash = "sha256-jadQsuU1SfvUc5DO5XqZXTe53U9XGOHScDGx66Oh18Q="; }; nativeBuildInputs = [ cmake doxygen pkg-config - ] ++ lib.optionals enableQt [ qt6.wrapQtAppsHook ]; + qt6.wrapQtAppsHook + ]; buildInputs = [ @@ -91,7 +88,12 @@ stdenv.mkDerivation (finalAttrs: { openssl pipewire portaudio + qt6.qtbase + qt6.qtmultimedia + qt6.qttools + qt6.qtwayland soundtouch + SDL2 sndio spirv-tools vulkan-headers @@ -99,17 +101,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXext zstd ] - ++ optionals enableQt ( - with qt6; - [ - qtbase - qtmultimedia - qttools - qtwayland - ] - ) ++ optionals enableQtTranslations [ qt6.qttools ] - ++ optionals enableSDL2 [ SDL2 ] ++ optionals enableCubeb [ cubeb ] ++ optionals useDiscordRichPresence [ rapidjson ]; @@ -147,9 +139,7 @@ stdenv.mkDerivation (finalAttrs: { (cmakeBool "DISABLE_SYSTEM_LODEPNG" true) (cmakeBool "DISABLE_SYSTEM_VMA" true) (cmakeBool "DISABLE_SYSTEM_XBYAK" true) - (cmakeBool "ENABLE_QT" enableQt) (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) - (cmakeBool "ENABLE_SDL2" enableSDL2) (cmakeBool "ENABLE_CUBEB" enableCubeb) (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) ]; diff --git a/pkgs/by-name/az/azmq/package.nix b/pkgs/by-name/az/azmq/package.nix index 2ec9e1cf2bbe..85bd155514f2 100644 --- a/pkgs/by-name/az/azmq/package.nix +++ b/pkgs/by-name/az/azmq/package.nix @@ -2,22 +2,23 @@ lib, stdenv, fetchFromGitHub, - boost, + boost183, cmake, ninja, zeromq, catch2, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "azmq"; - version = "unstable-2023-03-23"; + version = "1.0.3-unstable-2025-01-19"; src = fetchFromGitHub { owner = "zeromq"; repo = "azmq"; - rev = "2c1adac46bced4eb74ed9be7c74563bb113eaacf"; - hash = "sha256-4o1CHlg9kociIL6QN/kU2cojPvFRhtjFmKIAz0dapUM="; + rev = "4e8f18bf3ac60f5c8126db61e48927ea19a88195"; + hash = "sha256-0TYZvQefoW77RXhQ57niXs3Kcz2YHW9cBDNGFU47BBs="; }; nativeBuildInputs = [ @@ -26,7 +27,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - boost + boost183 catch2 zeromq ]; @@ -34,11 +35,15 @@ stdenv.mkDerivation { # Broken for some reason on this platform. doCheck = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; + meta = with lib; { homepage = "https://github.com/zeromq/azmq"; license = licenses.boost; description = "C++ language binding library integrating ZeroMQ with Boost Asio"; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 1739e2b3115e..b2f4a25b6d29 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -50,9 +50,9 @@ }, "aks-preview": { "pname": "aks-preview", - "version": "13.0.0b8", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b8-py2.py3-none-any.whl", - "hash": "sha256-vF9KIzydog62S8IsXReYUg/2WjJkCGmQTKc3cd7xYL0=", + "version": "14.0.0b7", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-14.0.0b7-py2.py3-none-any.whl", + "hash": "sha256-c3nxx7SMqE9Ng431jQ8c8zxojyT0g4Cddt3iy6npyF4=", "description": "Provides a preview for upcoming AKS features" }, "akshybrid": { @@ -71,16 +71,16 @@ }, "alertsmanagement": { "pname": "alertsmanagement", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/alertsmanagement-1.0.0b1-py3-none-any.whl", - "hash": "sha256-4eFa7/GrmyX7gguRTmAs6Ep9AOU4LrB9QT8UktkLCdE=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/alertsmanagement-1.0.0b2-py3-none-any.whl", + "hash": "sha256-N/N2I0+AR9+T18U1XMhk817BlfbHur4Uj1c0kwOvZpY=", "description": "Microsoft Azure Command-Line Tools AlertsManagementClient Extension" }, "amg": { "pname": "amg", - "version": "2.5.5", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.5-py3-none-any.whl", - "hash": "sha256-uCgv54CC2Ed5coMxxWbX1OQLbFNYIh8gRnYM87U/9WU=", + "version": "2.6.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.6.0-py3-none-any.whl", + "hash": "sha256-I8WRrhs2VdqwpIuT5fqPeITwvfy14X3hWZLFN5IEz80=", "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension" }, "amlfs": { @@ -120,9 +120,9 @@ }, "authV2": { "pname": "authV2", - "version": "0.1.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/authV2-0.1.3-py3-none-any.whl", - "hash": "sha256-6wVjb4x44vg7f0Uv5W9amuSW1pCdw2kkrl+YovtbzkE=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/authV2-1.0.0-py3-none-any.whl", + "hash": "sha256-wY5B27CGJZK6rL3sPeLvRuZyMS8J+ttHCHI+OZp1NIM=", "description": "Microsoft Azure Command-Line Tools Authv2 Extension" }, "automanage": { @@ -141,9 +141,9 @@ }, "azure-firewall": { "pname": "azure-firewall", - "version": "1.2.2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.2-py2.py3-none-any.whl", - "hash": "sha256-EmH9F4kTG4K7QDwb44Wq0FMUD3Wo1pcWS0KwMXzdnVU=", + "version": "1.2.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.3-py2.py3-none-any.whl", + "hash": "sha256-bSUGhZI7L+XUsubSKhFwzw//uIXuA7qSLuEkyottgb4=", "description": "Manage Azure Firewall resources" }, "azurelargeinstance": { @@ -202,11 +202,18 @@ "hash": "sha256-nqYWLTf8M5C+Tc5kywXFxYgHAQTz6SpwGrR1RzVlqKk=", "description": "Translate ARM template to executable Azure CLI scripts" }, + "computeschedule": { + "pname": "computeschedule", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/computeschedule-1.0.0b1-py3-none-any.whl", + "hash": "sha256-0Y9gWNep/StKi09aOHUCCY37k/mkLLSZnQSvlq30gVc=", + "description": "Microsoft Azure Command-Line Tools Computeschedule Extension" + }, "confidentialledger": { "pname": "confidentialledger", - "version": "1.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/confidentialledger-1.0.0-py3-none-any.whl", - "hash": "sha256-Ovv0nxDN3dlnVWI2TOInX29w61MY+oW2WNcRseJNyU4=", + "version": "2.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/confidentialledger-2.0.0-py3-none-any.whl", + "hash": "sha256-N9YcNSvlUXT6z+XLLxQ0h1fXquNAEJKpMKd7VOSMY8k=", "description": "Microsoft Azure Command-Line Tools ConfidentialLedger Extension" }, "confluent": { @@ -218,9 +225,9 @@ }, "connectedmachine": { "pname": "connectedmachine", - "version": "1.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.1.0-py3-none-any.whl", - "hash": "sha256-m3EBWmsEd3De7Yg91AkoV2QcaldPIQfuVYsFNf8pRtg=", + "version": "1.1.1b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.1.1b1-py3-none-any.whl", + "hash": "sha256-IFX8KBG4QrgEIdsPzhlHQ1/q+0sFgQBlMUeF+wgTzGA=", "description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension" }, "connectedvmware": { @@ -232,9 +239,9 @@ }, "cosmosdb-preview": { "pname": "cosmosdb-preview", - "version": "1.2.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.2.0-py2.py3-none-any.whl", - "hash": "sha256-BNwAiinMYkMedUXdbD2jhlpgBA6Y96CKmabgzolcq2w=", + "version": "1.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.4.0-py2.py3-none-any.whl", + "hash": "sha256-u8wSLjuIyy6aC4tPKou9dSk1nKeb19Tx8JhpUYVGH34=", "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension" }, "costmanagement": { @@ -260,9 +267,9 @@ }, "customlocation": { "pname": "customlocation", - "version": "0.1.3", - "url": "https://arcplatformcliextprod.z13.web.core.windows.net/customlocation-0.1.3-py2.py3-none-any.whl", - "hash": "sha256-XjZDWxqB3iXnTnDEXCrJ+YBlE4w1BQ8pIQrkDBhITig=", + "version": "0.1.4", + "url": "https://arcplatformcliextprod.z13.web.core.windows.net/customlocation-0.1.4-py2.py3-none-any.whl", + "hash": "sha256-4Ou6/8XRwH5c1hXZy54hJE7fxEeyjLAYcTmhGNyIkrc=", "description": "Microsoft Azure Command-Line Tools Customlocation Extension" }, "databox": { @@ -302,9 +309,9 @@ }, "dataprotection": { "pname": "dataprotection", - "version": "1.5.5", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.5-py3-none-any.whl", - "hash": "sha256-DsYp2y2HQd+PVNJVuyJepEHgBuGGc8Cg5GEwZWJVcPk=", + "version": "1.6.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.6.0-py3-none-any.whl", + "hash": "sha256-UkZbS0aIcaSM6KlI6CaP5lgq6m/cQophstc2k9ZegKw=", "description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension" }, "datashare": { @@ -372,9 +379,9 @@ }, "durabletask": { "pname": "durabletask", - "version": "1.0.0b3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-1.0.0b3-py3-none-any.whl", - "hash": "sha256-ItQrmkZBSiyR12+Fiez6W7XvEhwwFeSKNxFPvVwdRK8=", + "version": "1.0.0b4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-1.0.0b4-py3-none-any.whl", + "hash": "sha256-L+gilyc4l/SbtEkXlmSuLfVvtolVJxO68Z/Ezl/YH1Y=", "description": "Microsoft Azure Command-Line Tools Durabletask Extension" }, "dynatrace": { @@ -407,9 +414,9 @@ }, "elastic-san": { "pname": "elastic-san", - "version": "1.2.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-1.2.0b1-py3-none-any.whl", - "hash": "sha256-UvtysdxQsTTOlkSI7exVTH2ESfhB5H2LNV2fGscQzmA=", + "version": "1.3.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-1.3.0-py3-none-any.whl", + "hash": "sha256-Y1XlsJaX3nixL9AeENaVufA2rFwLTIwowGc7pt1OoOw=", "description": "Microsoft Azure Command-Line Tools ElasticSan Extension" }, "eventgrid": { @@ -435,9 +442,9 @@ }, "fleet": { "pname": "fleet", - "version": "1.4.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.4.0-py3-none-any.whl", - "hash": "sha256-HYOpAAyHn/Gpor/y6iMYOrYeNCcT3+22YjRVk7FlhDg=", + "version": "1.5.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.5.2-py3-none-any.whl", + "hash": "sha256-oshfK8G4NECSNxucAke46csKnw4eRBvOrQG2gGLCbq8=", "description": "Microsoft Azure Command-Line Tools Fleet Extension" }, "fluid-relay": { @@ -456,9 +463,9 @@ }, "front-door": { "pname": "front-door", - "version": "1.2.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-1.2.0-py3-none-any.whl", - "hash": "sha256-Iyunss0kJA1Ohtgg5fp4oRFDs6Yk7ZU6NFEhBQDt++A=", + "version": "1.3.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-1.3.0-py3-none-any.whl", + "hash": "sha256-kJXpPk8IfhFbVbInxaBLq894/nzyxalvVZQkQ37PTRk=", "description": "Manage networking Front Doors" }, "fzf": { @@ -533,16 +540,16 @@ }, "image-copy-extension": { "pname": "image-copy-extension", - "version": "1.0.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-1.0.1-py2.py3-none-any.whl", - "hash": "sha256-XYMjEh5KX8bdlXXEBhasDLjDZx7DvFK2jDmwTnZPZZQ=", + "version": "1.0.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-1.0.2-py2.py3-none-any.whl", + "hash": "sha256-POLkBXJTiA9mZ8ezYUJDcl3/CSClNdffYBcQbJTbolY=", "description": "Support for copying managed vm images between regions" }, "image-gallery": { "pname": "image-gallery", - "version": "0.1.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_gallery-0.1.3-py2.py3-none-any.whl", - "hash": "sha256-YmDB9L+1idK6BWkxc1ihScqru9SaBI5pMo5EhxaUqs0=", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_gallery-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-WwVNZ7dYcfXELlsSNrkhKgtolYE4oNRIQJ1DoJxzIZE=", "description": "Support for Azure Image Gallery" }, "import-export": { @@ -568,23 +575,23 @@ }, "internet-analyzer": { "pname": "internet-analyzer", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/internet_analyzer-1.0.0b1-py2.py3-none-any.whl", - "hash": "sha256-RWSIGnyQus/YgcYppBgjmAB8iG0JnqiNuX4f8QBTpcQ=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/internet_analyzer-1.0.0b2-py2.py3-none-any.whl", + "hash": "sha256-0VPsQG6yLh+rTMGNKgMJLgNTGHBzj5OYCKPOr5y322k=", "description": "Microsoft Azure Command-Line Tools Internet Analyzer Extension" }, "ip-group": { "pname": "ip-group", - "version": "0.1.2", - "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/ip_group-0.1.2-py2.py3-none-any.whl", - "hash": "sha256-r7otiophKGO2P1BNbP9tVZYQuWHkx33C/Um5/gPsZ6I=", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/ip_group-1.0.1-py2.py3-none-any.whl", + "hash": "sha256-d/Yzd3mdYssQDJO9kSTZKHC2hY4OleQ1XQf1pLDfax0=", "description": "Microsoft Azure Command-Line Tools IpGroup Extension" }, "k8s-extension": { "pname": "k8s-extension", - "version": "1.6.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.3-py3-none-any.whl", - "hash": "sha256-NHKwalI003mKt2/WS8q6A7nbjDyKBMQMrng+YPiDAeY=", + "version": "1.6.4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.4-py3-none-any.whl", + "hash": "sha256-O11I5IFPdUDFWcMwgucurugl+zHzkvAL5Idj5UCHkwY=", "description": "Microsoft Azure Command-Line Tools K8s-extension Extension" }, "k8s-runtime": { @@ -601,6 +608,13 @@ "hash": "sha256-z1cp6dAgKaGJGCUjVDKFyXN9UV9BxhDIM41D+HL58B0=", "description": "Microsoft Azure Command-Line Tools KustoManagementClient Extension" }, + "lambda-test": { + "pname": "lambda-test", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/lambda_test-1.0.0b1-py3-none-any.whl", + "hash": "sha256-KnNCZsTNn4948xKiHJ6Nba3NYLHy+T5yEF55BtQ9a1Q=", + "description": "Microsoft Azure Command-Line Tools LambdaTest Extension" + }, "log-analytics": { "pname": "log-analytics", "version": "1.0.0b1", @@ -638,10 +652,10 @@ }, "managednetworkfabric": { "pname": "managednetworkfabric", - "version": "7.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-7.1.0-py3-none-any.whl", - "hash": "sha256-xnwHKrgF+uDN9zcvBizZEh2xan9CdN8Vb/oV5tp7y44=", - "description": "Support for managednetworkfabric commands based on 2024-02-15-preview API version" + "version": "8.0.0b3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-8.0.0b3-py3-none-any.whl", + "hash": "sha256-RoqlmB/Bl7S81w3IDL1MTooGkiabI14TxYFHaQ9Qi9U=", + "description": "Support for managednetworkfabric commands based on 2024-06-15-preview API version" }, "managementpartner": { "pname": "managementpartner", @@ -722,16 +736,16 @@ }, "networkcloud": { "pname": "networkcloud", - "version": "3.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-3.0.0b1-py3-none-any.whl", - "hash": "sha256-YGCfBmwvotljUiwopPmRGLx+4T3NOdp8YySgF9ro+KY=", - "description": "Support for Azure Operator Nexus network cloud commands based on 2024-10-01-preview API version" + "version": "3.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-3.0.0-py3-none-any.whl", + "hash": "sha256-ZNWvZ6Ptc8QM0HWzCtR6RZnw9PaobrVKjjfcCI9didc=", + "description": "Support for Azure Operator Nexus network cloud commands based on 2025-02-01 API version" }, "new-relic": { "pname": "new-relic", - "version": "1.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.0-py3-none-any.whl", - "hash": "sha256-MQUxCuwjIdQp8GjnTf4WsLZMcQCqUervLBF2WXHqb1o=", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.1-py3-none-any.whl", + "hash": "sha256-VKbfg2sflMylsHcjvJ1QUhbVW3fOG+JViuCSIt4mJ2A=", "description": "Microsoft Azure Command-Line Tools NewRelic Extension" }, "next": { @@ -797,6 +811,13 @@ "hash": "sha256-/k47qFwfZZZqBZKR5G6+t8lW8o2isVtUGwSSdltiOZI=", "description": "Microsoft Azure Command-Line Tools PeeringManagementClient Extension" }, + "pinecone": { + "pname": "pinecone", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/pinecone-1.0.0b1-py3-none-any.whl", + "hash": "sha256-5WXKpClTweNCLz/wW/PcKLbpFOdJagp1l7FOD3Ou/WM=", + "description": "Microsoft Azure Command-Line Tools Pinecone Extension" + }, "playwright-cli-extension": { "pname": "playwright-cli-extension", "version": "1.0.0b1", @@ -834,9 +855,9 @@ }, "quantum": { "pname": "quantum", - "version": "1.0.0b4", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b4-py3-none-any.whl", - "hash": "sha256-c8KlBVlkh2jxI95wOayCiMJlzuTYjpTDzthc7LzmtVI=", + "version": "1.0.0b6", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b6-py3-none-any.whl", + "hash": "sha256-KTYDvglCzrPy4XWsPbBvKKhFI1/mxKwsyBi5/8q2+y8=", "description": "Microsoft Azure Command-Line Tools Quantum Extension" }, "qumulo": { @@ -855,9 +876,9 @@ }, "redisenterprise": { "pname": "redisenterprise", - "version": "1.2.1b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.1b1-py3-none-any.whl", - "hash": "sha256-mBboVxqGiYZJczJ7YzHSQ3A9oxtAwFOe2JE2udv2yeA=", + "version": "1.2.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.1-py3-none-any.whl", + "hash": "sha256-Yu06kpzoZJLt8l5Ft9R6Au9VS6rFr9v9bmrqlp0IDGg=", "description": "Microsoft Azure Command-Line Tools RedisEnterprise Extension" }, "reservation": { @@ -876,9 +897,9 @@ }, "resource-mover": { "pname": "resource-mover", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/resource_mover-1.0.0b1-py3-none-any.whl", - "hash": "sha256-O8n0GqMMT2vAT/eA3DDo3wW/yIfyrb356J1Z+DieVfM=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/resource_mover-1.0.0b2-py3-none-any.whl", + "hash": "sha256-p+Ug4CXDyrokp4JTY3cEjxdJqZzrVPAJ8zOS/JZDVw8=", "description": "Microsoft Azure Command-Line Tools ResourceMoverServiceAPI Extension" }, "sap-hana": { @@ -930,18 +951,11 @@ "hash": "sha256-qxkULJouBhkLbawnLYzynhecnig/ll+OOk0pJ1uEfOU=", "description": "Microsoft Azure Command-Line Tools SiteRecovery Extension" }, - "spring": { - "pname": "spring", - "version": "1.26.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.26.1-py3-none-any.whl", - "hash": "sha256-TyY/a5DJ1zntN22Gl9YCWz/Ty26zubZpwzlS10IyeVo=", - "description": "Microsoft Azure Command-Line Tools spring Extension" - }, "spring-cloud": { "pname": "spring-cloud", - "version": "3.1.8", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring_cloud-3.1.8-py3-none-any.whl", - "hash": "sha256-FJk6vjUkwopCsum6DwqKcIMWK6kXSXXgnYzqg0uYKe4=", + "version": "3.1.9", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring_cloud-3.1.9-py3-none-any.whl", + "hash": "sha256-ySMrn4B/ff7cLESAZJUFrR5AajwTbAYeC0hd3ypJivU=", "description": "Microsoft Azure Command-Line Tools spring-cloud Extension" }, "stack-hci": { @@ -953,16 +967,16 @@ }, "stack-hci-vm": { "pname": "stack-hci-vm", - "version": "1.6.5", - "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.6.5-py3-none-any.whl", - "hash": "sha256-iXEzjXI9tAJoVWyj/wobX/iw1lHhRdOV4kdYXveRTbk=", + "version": "1.8.2", + "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.8.2-py3-none-any.whl", + "hash": "sha256-SmSb7R1LxmEY8/BSA//KB7crWv8JRdVE8xVAGE52ptc=", "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension" }, "standbypool": { "pname": "standbypool", - "version": "1.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-1.0.0-py3-none-any.whl", - "hash": "sha256-WlY5U30m/7sG845ovWyTntkJBdmssYwHFhgjcy+yfPk=", + "version": "2.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-2.0.0-py3-none-any.whl", + "hash": "sha256-8nsig3n3h7HZqgFQC0jelvOWs8bZoe2uOYFe0AxJBfc=", "description": "Microsoft Azure Command-Line Tools Standbypool Extension" }, "staticwebapp": { @@ -1051,9 +1065,9 @@ }, "virtual-network-manager": { "pname": "virtual-network-manager", - "version": "1.3.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-1.3.1-py3-none-any.whl", - "hash": "sha256-y5VTXAV6YZk4S8nlwwqZQtvFic8M6tsqYtJqp/cNTh0=", + "version": "2.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-2.0.0-py3-none-any.whl", + "hash": "sha256-EbmCqrszG4PC80yCDl+IfzdKw0tO4R0SL6iD+wymu9w=", "description": "Microsoft Azure Command-Line Tools NetworkManagementClient Extension" }, "virtual-network-tap": { @@ -1072,9 +1086,9 @@ }, "vmware": { "pname": "vmware", - "version": "7.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-7.1.0-py2.py3-none-any.whl", - "hash": "sha256-U9yLHYA814TmaMTU1jDewgOQQGr0YmbfCGD1SKXCH50=", + "version": "7.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-7.2.0-py2.py3-none-any.whl", + "hash": "sha256-4Pkx39w6vQ+sdw7P0DqUY/zM8v37nwmU2XqPqRLFdrI=", "description": "Azure VMware Solution commands" }, "webapp": { @@ -1084,6 +1098,13 @@ "hash": "sha256-kIsN8HzvZSF2oPK/D9z1i10W+0kD7jwG9z8Ls5E6XA8=", "description": "Additional commands for Azure AppService" }, + "weights-and-biases": { + "pname": "weights-and-biases", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/weights_and_biases-1.0.0b1-py3-none-any.whl", + "hash": "sha256-p961+8YG/7LsyS8b+xfEPq2hZeiwlwqBvnyXnkxoz3o=", + "description": "Microsoft Azure Command-Line Tools WeightsAndBiases Extension" + }, "workloads": { "pname": "workloads", "version": "1.1.0", diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index a7af4d93965d..609acd44a90e 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -16,9 +16,9 @@ { application-insights = mkAzExtension rec { pname = "application-insights"; - version = "1.2.3"; + version = "2.0.0b1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/application_insights-${version}-py2.py3-none-any.whl"; - hash = "sha256-yUHCMtBDZmNuE1TP4AcIUhAT+IpbHnR0DYBH7EbZBZk="; + hash = "sha256-4akS+zbaKxFrs0x0uKP/xX28WyK5KLduOkgZaBYeANM="; description = "Support for managing Application Insights components and querying metrics, events, and logs from such components"; propagatedBuildInputs = with python3Packages; [ isodate ]; meta.maintainers = with lib.maintainers; [ andreasvoss ]; @@ -83,9 +83,9 @@ containerapp = mkAzExtension rec { pname = "containerapp"; - version = "1.1.0b4"; + version = "1.1.0b5"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl"; - hash = "sha256-d2pqanDERA54NGQwzO1S2D+WM1q5w1dmKjYbEdbknik="; + hash = "sha256-gC75NiDDRw4DVIDGiyfdCcFSAzdUgVNjyTfrgGgRd90="; description = "Microsoft Azure Command-Line Tools Containerapp Extension"; propagatedBuildInputs = with python3Packages; [ docker @@ -140,9 +140,9 @@ vm-repair = mkAzExtension rec { pname = "vm-repair"; - version = "2.1.1"; + version = "2.1.2"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; - hash = "sha256-3Pgwppp4IssNYhJ+USQNwMEp91XdZDwNlnNWzVWrHFM="; + hash = "sha256-DOuH7BG4WrhP7SQH3GInFh7DHT0qN3JhSG76EXmNn24="; description = "Support for repairing Azure Virtual Machines"; propagatedBuildInputs = with python3Packages; [ opencensus ]; meta.maintainers = with lib.maintainers; [ ]; @@ -156,4 +156,5 @@ connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194 deidservice = throw "The 'deidservice' extension for azure-cli was moved under healthcareapis"; # Added 2024-11-19, https://github.com/Azure/azure-cli-extensions/pull/8224 logz = throw "The 'logz' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8459 + spring = throw "The 'spring' extension for azure-cli was deprecated upstream"; # Added 2025-05-07, https://github.com/Azure/azure-cli-extensions/pull/8652 } diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 36adc81b5c16..62bdf047b188 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -26,14 +26,14 @@ }: let - version = "2.70.0"; + version = "2.72.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; - rev = "azure-cli-${version}"; - hash = "sha256-vvX/LkG8qA53AxVlvq7FSTqbVblvE5xbDq4V0SINCAk="; + tag = "azure-cli-${version}"; + hash = "sha256-LuQhGrAYVgv+OH214A4xz4LV+xwIshNAH8nAlQL4mDc="; }; # put packages that needs to be overridden in the py package scope @@ -473,7 +473,8 @@ py.pkgs.toPythonApplication ( sourceProvenance = [ lib.sourceTypes.fromSource ]; license = lib.licenses.mit; mainProgram = "az"; - maintainers = with lib.maintainers; [ katexochen ] ++ lib.teams.stridtech.members; + maintainers = with lib.maintainers; [ katexochen ]; + teams = [ lib.teams.stridtech ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index a410f5c47161..b5233892d1c1 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -203,6 +203,14 @@ let azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip" "sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k="; + + # Observed error during runtime: + # AttributeError: Can't get attribute 'NormalizedResponse' on . + # Did you mean: '_msal_public_app_kwargs'? + msal = + overrideAzureMgmtPackage super.msal "1.32.3" "tar.gz" + "sha256-XuoDhonHilpwyo7L4SRUWLVahXvQlu+2mJxpuhWYXTU="; }; }; in diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix index fb324cc58ad7..412976e8a9b1 100644 --- a/pkgs/by-name/az/azure-storage-azcopy/package.nix +++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.28.1"; + version = "10.29.2"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; tag = "v${version}"; - hash = "sha256-9TWccJYcQrl986GyLAvQPTubg7P6lT+OjdkTdjww7nU="; + hash = "sha256-wLErYkiN5V6aZx6Vztr3Gk5XB+aOo9de5QjEbwDLBXg="; }; subPackages = [ "." ]; - vendorHash = "sha256-Cno1H6p4qr+0CDGSd6TyCVEi+lLGoruwGVkDe8lMg08="; + vendorHash = "sha256-Aq38kpgQ1NQQVkF0hjMLzvK8HvxfzYARbeWmsc54Ldg="; doCheck = false; diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix index e21a59cc6f69..a2ec96104bb7 100644 --- a/pkgs/by-name/az/azurehound/package.nix +++ b/pkgs/by-name/az/azurehound/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, versionCheckHook, @@ -7,13 +8,13 @@ buildGoModule rec { pname = "azurehound"; - version = "2.3.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "SpecterOps"; repo = "AzureHound"; tag = "v${version}"; - hash = "sha256-BbwQ3u1SD4AjNjHzT6QB0x7QJAZ59m1DtvhjZapLIx4="; + hash = "sha256-hLIXgb0LJs5INB23V3m33OViANarJodbwZewdx91css="; }; vendorHash = "sha256-FG3207OTzkMEoSvQsTH7Ky9T3ur7glG7k0ERfd12SO0="; @@ -28,7 +29,7 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Azure Data Exporter for BloodHound"; @@ -37,5 +38,6 @@ buildGoModule rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "azurehound"; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix index 1e0fdda3c287..24fb96652f95 100644 --- a/pkgs/by-name/az/azurite/package.nix +++ b/pkgs/by-name/az/azurite/package.nix @@ -3,7 +3,6 @@ buildNpmPackage, fetchFromGitHub, stdenv, - darwin, libsecret, pkg-config, python3, @@ -11,32 +10,24 @@ buildNpmPackage rec { pname = "azurite"; - version = "3.33.0"; + version = "3.34.0"; src = fetchFromGitHub { owner = "Azure"; repo = "Azurite"; rev = "v${version}"; - hash = "sha256-aH9FAT49y4k87lzerQdgLqi+ZlucORQX4w1NBFtEfMw="; + hash = "sha256-6NECduq2ewed8bR4rlF5MW8mGcsgu8bqgA/DBt8ywtM="; }; - npmDepsHash = "sha256-jfa04iWz0aOiFD1YkXn5YEXqQcrY+rIDbVmmUaA5sYc="; + npmDepsHash = "sha256-WRaD99CsIuH3BrO01eVuoEZo40VjuScnVzmlFcKpj8g="; nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libsecret - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin; - [ - Security - apple_sdk.frameworks.AppKit - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libsecret + ]; meta = { description = "An open source Azure Storage API compatible server"; diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix index 31088ea5fd1a..34c6d912572c 100644 --- a/pkgs/by-name/b3/b3sum/package.nix +++ b/pkgs/by-name/b3/b3sum/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "1.8.0"; + version = "1.8.2"; src = fetchCrate { inherit version pname; - hash = "sha256-FWblGKr/ZQsLZkPOax20FYEyoLiPREf7UjfOtFCljZU="; + hash = "sha256-/qyBs+t8n5I6uf1dSc3E0yHpdlUz77pvlqV5+r4dRBc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vSxAG0CKtTHZ/3fSDtZqmqvfY+swDBBPZ8YZP1Vlj0w="; + cargoHash = "sha256-PKVDfBFWQY95FxJ66vl6E26GEZChNCsA3ST++iieYSM="; meta = { description = "BLAKE3 cryptographic hash function"; diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix index bfccb384280f..e99f319fb7e5 100644 --- a/pkgs/by-name/ba/babl/package.nix +++ b/pkgs/by-name/ba/babl/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "babl"; - version = "0.1.110"; + version = "0.1.112"; outputs = [ "out" @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor finalAttrs.version}/babl-${finalAttrs.version}.tar.xz"; - hash = "sha256-v0e+dUDWJ1OJ9mQx7wMGTfU3YxXiQ9C6tEjGqnE/V0M="; + hash = "sha256-+2lmgkIXh8j+zIPoqrSBId7I7jjRGbZSkc/L4xUCink="; }; patches = [ diff --git a/pkgs/by-name/ba/backblaze-b2/package.nix b/pkgs/by-name/ba/backblaze-b2/package.nix index 52bb9e7ab60b..d99becd2a904 100644 --- a/pkgs/by-name/ba/backblaze-b2/package.nix +++ b/pkgs/by-name/ba/backblaze-b2/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "4.3.1"; + version = "4.3.2"; pyproject = true; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; tag = "v${version}"; - hash = "sha256-uWANUb7AV9ADWJ7Ut8qloEhgoXJ62yTSbXrCHVY1tFE="; + hash = "sha256-I6baipQDQft5bi352W9YXFAVuVqIkEqEfmD9iP2LBqs="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix index 1b963d940c7d..37dbc1ff7f45 100644 --- a/pkgs/by-name/ba/backgroundremover/package.nix +++ b/pkgs/by-name/ba/backgroundremover/package.nix @@ -11,7 +11,7 @@ let p = python3.pkgs; self = p.buildPythonApplication rec { pname = "backgroundremover"; - version = "0.2.9"; + version = "0.3.0"; pyproject = true; build-system = [ @@ -22,7 +22,7 @@ let owner = "nadermx"; repo = "backgroundremover"; rev = "v${version}"; - hash = "sha256-tQ8J3xamOzPPSbFMxIDYKv1TzK1AVwF/DWXdZlrlYvM="; + hash = "sha256-fWazMDjc+EoXvO7Iq+zwtJaMEU64ajpO6JtlvU5T0nc="; }; models = runCommand "background-remover-models" { } '' diff --git a/pkgs/by-name/ba/backlight-auto/package.nix b/pkgs/by-name/ba/backlight-auto/package.nix index 3d8dc7338a9c..e6f849bf7096 100644 --- a/pkgs/by-name/ba/backlight-auto/package.nix +++ b/pkgs/by-name/ba/backlight-auto/package.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { + # Does not support zig 0.12 or newer, hasn't been updated in 2 years. + broken = lib.versionAtLeast zig.version "0.12"; description = "Automatically set screen brightness with a webcam"; mainProgram = "backlight-auto"; homepage = "https://len.falken.directory/backlight-auto.html"; diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index 505934d42f48..73472f3d62b0 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -11,13 +11,13 @@ }: let pname = "backrest"; - version = "1.7.3"; + version = "1.8.1"; src = fetchFromGitHub { owner = "garethgeorge"; repo = "backrest"; tag = "v${version}"; - hash = "sha256-X3FiNor2q/JgyV05CIAls7MjMvongH5dGeutPz+CW9I="; + hash = "sha256-lpYny+5bXIxj+ZFhbSn200sBrDShISESZw+L5sy+X+Q="; }; frontend = stdenv.mkDerivation (finalAttrs: { @@ -32,7 +32,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-rBu+6QwTmQsjHh0yd8QjdHPc3VOmadJQ+NK9X6qbSx8="; + hash = "sha256-q7VMQb/FRT953yT2cyGMxUPp8p8XkA9mvqGI7S7Eifg="; }; buildPhase = '' @@ -53,7 +53,7 @@ in buildGoModule { inherit pname src version; - vendorHash = "sha256-OVJnJ5fdpa1vpYTCxtvRGbnICbfwZeYiCwAS8c4Tg2Y="; + vendorHash = "sha256-AINnBkP+e9C/f/C3t6NK+6PYSVB4NON0C71S6SwUXbE="; nativeBuildInputs = [ gzip ]; @@ -69,7 +69,11 @@ buildGoModule { checkFlags = let skippedTests = - [ "TestRunCommand" ] + [ + "TestMultihostIndexSnapshots" + "TestRunCommand" + "TestSnapshot" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestBackup" # relies on ionice "TestCancelBackup" diff --git a/pkgs/by-name/ba/backward-cpp/package.nix b/pkgs/by-name/ba/backward-cpp/package.nix index 84e877ec9642..c7acd08002f5 100644 --- a/pkgs/by-name/ba/backward-cpp/package.nix +++ b/pkgs/by-name/ba/backward-cpp/package.nix @@ -2,33 +2,29 @@ stdenv, lib, fetchFromGitHub, + cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "backward"; version = "1.6"; src = fetchFromGitHub { owner = "bombela"; repo = "backward-cpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ + cmake + ]; - mkdir -p $out/include - cp backward.hpp $out/include - - runHook postInstall - ''; - - meta = with lib; { + meta = { description = "Beautiful stack trace pretty printer for C++"; homepage = "https://github.com/bombela/backward-cpp"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ]; }; -} +}) diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index b74de3029be5..4f9074ef8418 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -27,17 +27,17 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "bacon"; - version = "3.12.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; tag = "v${finalAttrs.version}"; - hash = "sha256-M/9QzLRY0QhMSSadjxZArLhcM3S6yjLPdP6R9p/1cL4="; + hash = "sha256-/m549z9NWZhkn6/Y6WM1+og0vyg1DbqZmK3oGpydQa0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-799hpVUj4RfF2ei19bE/+qOixk5/v7PPuxmmDC0Zkqw="; + cargoHash = "sha256-X35mC8c1NeonUA1yYO9C7KCzHKpyIn6mbVWkZUhv+Es="; buildFeatures = lib.optionals withSound [ "sound" @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = lib.optionals withSound soundDependencies; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; postInstall = diff --git a/pkgs/by-name/ba/bacula/package.nix b/pkgs/by-name/ba/bacula/package.nix new file mode 100644 index 000000000000..b76e7569aece --- /dev/null +++ b/pkgs/by-name/ba/bacula/package.nix @@ -0,0 +1,86 @@ +{ + lib, + stdenv, + fetchurl, + sqlite, + libpq, + zlib, + acl, + ncurses, + openssl, + readline, + gettext, +}: + +stdenv.mkDerivation rec { + pname = "bacula"; + version = "15.0.3"; + + src = fetchurl { + url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; + sha256 = "sha256-KUr9PS651bccPQ6I/fGetRO/24Q7KNNcBVLkrgYoJ6E="; + }; + + # libtool.m4 only matches macOS 10.* + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + substituteInPlace configure \ + --replace "10.*)" "*)" + ''; + + buildInputs = + [ + libpq + sqlite + zlib + ncurses + openssl + readline + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + gettext # bacula requires CoreFoundation, but its `configure` script will only link it when it detects libintl. + ] + # acl relies on attr, which I can't get to build on darwin + ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl; + + configureFlags = + [ + "--with-sqlite3=${sqlite.dev}" + "--with-postgresql=${lib.getDev libpq}" + "--with-logdir=/var/log/bacula" + "--with-working-dir=/var/lib/bacula" + "--mandir=\${out}/share/man" + ] + ++ + lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) + "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # bacula’s `configure` script fails to detect CoreFoundation correctly, + # but these symbols are available in the nixpkgs CoreFoundation framework. + "gt_cv_func_CFLocaleCopyCurrent=yes" + "gt_cv_func_CFPreferencesCopyAppValue=yes" + ]; + + installFlags = [ + "logdir=\${out}/logdir" + "working_dir=\${out}/workdir" + ]; + + postInstall = '' + mkdir -p $out/bin + ln -s $out/sbin/* $out/bin + ''; + + meta = with lib; { + description = "Enterprise ready, Network Backup Tool"; + homepage = "http://bacula.org/"; + license = with licenses; [ + agpl3Only + bsd2 + ]; + maintainers = with maintainers; [ + lovek323 + eleanor + ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix index 9dc855b9ded8..f1655fe44951 100644 --- a/pkgs/by-name/ba/badger/package.nix +++ b/pkgs/by-name/ba/badger/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "badger"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "badger"; rev = "v${version}"; - hash = "sha256-W3vPTLGI7YT7dFklJnOcpfYqQ9aBCsel9L6q4WNincY="; + hash = "sha256-R4nahpUuCjPas1NBnWmQ/KBTY+/yPSyo8AmTvgwhYVI="; }; - vendorHash = "sha256-UVdOiaj1FN0etB9F0kt+THfO0Aa1kgdGYVeSVv4GpxY="; + vendorHash = "sha256-x4+CHLmQhu7Y6n1qx2CBY6KzRIRLD7Gn+pzXQy3/5rA="; subPackages = [ "badger" ]; diff --git a/pkgs/by-name/ba/badlion-client/package.nix b/pkgs/by-name/ba/badlion-client/package.nix index 557dfbdb4c84..ebf0608ffc83 100644 --- a/pkgs/by-name/ba/badlion-client/package.nix +++ b/pkgs/by-name/ba/badlion-client/package.nix @@ -2,35 +2,40 @@ lib, fetchurl, appimageTools, + makeWrapper, }: -let +appimageTools.wrapAppImage rec { pname = "badlion-client"; - version = "4.3.0"; + version = "4.5.4"; - src = fetchurl { - name = "badlion-client-linux"; - # https://www.badlion.net/download/client/latest/linux - url = "https://web.archive.org/web/20240529090437if_/https://client-updates-cdn77.badlion.net/BadlionClient"; - hash = "sha256-9elNLSqCO21m1T2D+WABKotD9FfW3FrcOxbnPdyVd+w="; + src = appimageTools.extractType2 { + inherit pname version; + src = fetchurl { + name = "badlion-client-linux"; + # https://www.badlion.net/download/client/latest/linux + url = "https://web.archive.org/web/20250416011033/https://client-updates.badlion.net/BadlionClient"; + hash = "sha256-M2aG3vb1EBpvx8ODs67Ua1R7lBXSe2oIcSwFzSz91n4="; + }; }; - appimageContents = appimageTools.extract { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' - install -Dm444 ${appimageContents}/BadlionClient.desktop $out/share/applications/BadlionClient.desktop - install -Dm444 ${appimageContents}/BadlionClient.png $out/share/pixmaps/BadlionClient.png + install -Dm444 ${src}/BadlionClient.desktop $out/share/applications/BadlionClient.desktop + install -Dm444 ${src}/BadlionClient.png $out/share/pixmaps/BadlionClient.png substituteInPlace $out/share/applications/BadlionClient.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=badlion-client' + --replace-fail "Exec=AppRun --no-sandbox %U" "Exec=badlion-client" + wrapProgram $out/bin/badlion-client \ + --set APPIMAGE 1 ''; - meta = with lib; { + extraPkgs = pkgs: [ pkgs.xorg.libxshmfence ]; + + meta = { description = "Most Complete All-In-One Mod Library for Minecraft with 100+ Mods, FPS Improvements, and more"; homepage = "https://client.badlion.net"; - license = with licenses; [ unfree ]; + license = lib.licenses.unfree; maintainers = [ ]; mainProgram = "badlion-client"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/ba/badwolf/package.nix b/pkgs/by-name/ba/badwolf/package.nix deleted file mode 100644 index d0a46e9b81ec..000000000000 --- a/pkgs/by-name/ba/badwolf/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - ninja, - pkg-config, - ed, - wrapGAppsHook3, - webkitgtk_4_0, - libxml2, - glib-networking, - gettext, -}: - -stdenv.mkDerivation rec { - pname = "badwolf"; - version = "1.3.0"; - - src = fetchgit { - url = "https://hacktivis.me/git/badwolf.git"; - rev = "v${version}"; - hash = "sha256-feWSxK9TJ5MWxUKutuTcdmMk5IbLjNseUAvfm20kQ1U="; - }; - - # configure script not accepting '--prefix' - prefixKey = "PREFIX="; - - nativeBuildInputs = [ - ninja - pkg-config - ed - wrapGAppsHook3 - ]; - - buildInputs = [ - webkitgtk_4_0 - libxml2 - gettext - glib-networking - ]; - - meta = with lib; { - description = "Minimalist and privacy-oriented WebKitGTK+ browser"; - mainProgram = "badwolf"; - homepage = "https://hacktivis.me/projects/badwolf"; - license = with licenses; [ - bsd3 - cc-by-sa-40 - ]; - platforms = platforms.linux; - maintainers = with maintainers; [ - laalsaas - aleksana - ]; - }; -} diff --git a/pkgs/by-name/ba/bagels/package.nix b/pkgs/by-name/ba/bagels/package.nix new file mode 100644 index 000000000000..02fdb79568bd --- /dev/null +++ b/pkgs/by-name/ba/bagels/package.nix @@ -0,0 +1,100 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "bagels"; + version = "0.3.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "EnhancedJax"; + repo = "bagels"; + tag = version; + hash = "sha256-dmBu0HSRGs4LmJY2PHNlRf0RdodmN+ZM0brwuiNmPyU="; + }; + + build-system = with python3Packages; [ + hatchling + ]; + + pythonRelaxDeps = [ + "aiohappyeyeballs" + "aiohttp" + "aiosignal" + "attrs" + "blinker" + "click" + "multidict" + "platformdirs" + "propcache" + "pydantic-core" + "pydantic" + "pygments" + "requests" + "rich" + "sqlalchemy" + "textual" + "typing-extensions" + "werkzeug" + "yarl" + ]; + + dependencies = with python3Packages; [ + aiohappyeyeballs + aiohttp-jinja2 + aiohttp + aiosignal + annotated-types + attrs + blinker + click-default-group + click + frozenlist + idna + itsdangerous + linkify-it-py + markdown-it-py + markupsafe + mdit-py-plugins + mdurl + msgpack + multidict + numpy + packaging + platformdirs + plotext + propcache + pydantic-core + pydantic + pygments + python-dateutil + pyyaml + requests + rich + sqlalchemy + textual + tomli + typing-extensions + uc-micro-py + werkzeug + xdg-base-dirs + yarl + ]; + + meta = { + homepage = "https://github.com/EnhancedJax/Bagels"; + description = "Powerful expense tracker that lives in your terminal."; + longDescription = '' + Bagels expense tracker is a TUI application where you can track and analyse your money flow, with convenience oriented features and a complete interface. + ''; + changelog = "https://github.com/EnhancedJax/Bagels/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + loc + ]; + mainProgram = "bagels"; + }; +} diff --git a/pkgs/by-name/ba/baikal/composer.lock b/pkgs/by-name/ba/baikal/composer.lock new file mode 100644 index 000000000000..912df439a5fe --- /dev/null +++ b/pkgs/by-name/ba/baikal/composer.lock @@ -0,0 +1,3208 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "f91906fb4e71dc307de14dd620e65338", + "packages": [ + { + "name": "psr/log", + "version": "1.1.4", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.4" + }, + "time": "2021-05-03T11:20:27+00:00" + }, + { + "name": "sabre/dav", + "version": "4.7.0", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/dav.git", + "reference": "074373bcd689a30bcf5aaa6bbb20a3395964ce7a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/dav/zipball/074373bcd689a30bcf5aaa6bbb20a3395964ce7a", + "reference": "074373bcd689a30bcf5aaa6bbb20a3395964ce7a", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-date": "*", + "ext-dom": "*", + "ext-iconv": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-pcre": "*", + "ext-simplexml": "*", + "ext-spl": "*", + "lib-libxml": ">=2.7.0", + "php": "^7.1.0 || ^8.0", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "sabre/event": "^5.0", + "sabre/http": "^5.0.5", + "sabre/uri": "^2.0", + "sabre/vobject": "^4.2.1", + "sabre/xml": "^2.0.1" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.19", + "monolog/monolog": "^1.27 || ^2.0", + "phpstan/phpstan": "^0.12 || ^1.0", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" + }, + "suggest": { + "ext-curl": "*", + "ext-imap": "*", + "ext-pdo": "*" + }, + "bin": [ + "bin/sabredav", + "bin/naturalselection" + ], + "type": "library", + "autoload": { + "psr-4": { + "Sabre\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + } + ], + "description": "WebDAV Framework for PHP", + "homepage": "http://sabre.io/", + "keywords": [ + "CalDAV", + "CardDAV", + "WebDAV", + "framework", + "iCalendar" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/dav/issues", + "source": "https://github.com/fruux/sabre-dav" + }, + "time": "2024-10-29T11:46:02+00:00" + }, + { + "name": "sabre/event", + "version": "5.1.7", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/event.git", + "reference": "86d57e305c272898ba3c28e9bd3d65d5464587c2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/event/zipball/86d57e305c272898ba3c28e9bd3d65d5464587c2", + "reference": "86d57e305c272898ba3c28e9bd3d65d5464587c2", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.17.1||^3.63", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" + }, + "type": "library", + "autoload": { + "files": [ + "lib/coroutine.php", + "lib/Loop/functions.php", + "lib/Promise/functions.php" + ], + "psr-4": { + "Sabre\\Event\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + } + ], + "description": "sabre/event is a library for lightweight event-based programming", + "homepage": "http://sabre.io/event/", + "keywords": [ + "EventEmitter", + "async", + "coroutine", + "eventloop", + "events", + "hooks", + "plugin", + "promise", + "reactor", + "signal" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/event/issues", + "source": "https://github.com/fruux/sabre-event" + }, + "time": "2024-08-27T11:23:05+00:00" + }, + { + "name": "sabre/http", + "version": "5.1.12", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/http.git", + "reference": "dedff73f3995578bc942fa4c8484190cac14f139" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/http/zipball/dedff73f3995578bc942fa4c8484190cac14f139", + "reference": "dedff73f3995578bc942fa4c8484190cac14f139", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-curl": "*", + "ext-mbstring": "*", + "php": "^7.1 || ^8.0", + "sabre/event": ">=4.0 <6.0", + "sabre/uri": "^2.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.17.1||^3.63", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" + }, + "suggest": { + "ext-curl": " to make http requests with the Client class" + }, + "type": "library", + "autoload": { + "files": [ + "lib/functions.php" + ], + "psr-4": { + "Sabre\\HTTP\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + } + ], + "description": "The sabre/http library provides utilities for dealing with http requests and responses. ", + "homepage": "https://github.com/fruux/sabre-http", + "keywords": [ + "http" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/http/issues", + "source": "https://github.com/fruux/sabre-http" + }, + "time": "2024-08-27T16:07:41+00:00" + }, + { + "name": "sabre/uri", + "version": "2.3.4", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/uri.git", + "reference": "b76524c22de90d80ca73143680a8e77b1266c291" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/uri/zipball/b76524c22de90d80ca73143680a8e77b1266c291", + "reference": "b76524c22de90d80ca73143680a8e77b1266c291", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^3.63", + "phpstan/extension-installer": "^1.4", + "phpstan/phpstan": "^1.12", + "phpstan/phpstan-phpunit": "^1.4", + "phpstan/phpstan-strict-rules": "^1.6", + "phpunit/phpunit": "^9.6" + }, + "type": "library", + "autoload": { + "files": [ + "lib/functions.php" + ], + "psr-4": { + "Sabre\\Uri\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + } + ], + "description": "Functions for making sense out of URIs.", + "homepage": "http://sabre.io/uri/", + "keywords": [ + "rfc3986", + "uri", + "url" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/uri/issues", + "source": "https://github.com/fruux/sabre-uri" + }, + "time": "2024-08-27T12:18:16+00:00" + }, + { + "name": "sabre/vobject", + "version": "4.5.6", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/vobject.git", + "reference": "900266bb3bd448a9f7f41f82344ad0aba237cb27" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/vobject/zipball/900266bb3bd448a9f7f41f82344ad0aba237cb27", + "reference": "900266bb3bd448a9f7f41f82344ad0aba237cb27", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": "^7.1 || ^8.0", + "sabre/xml": "^2.1 || ^3.0 || ^4.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.17.1", + "phpstan/phpstan": "^0.12 || ^1.11", + "phpunit/php-invoker": "^2.0 || ^3.1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" + }, + "suggest": { + "hoa/bench": "If you would like to run the benchmark scripts" + }, + "bin": [ + "bin/vobject", + "bin/generate_vcards" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Sabre\\VObject\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + }, + { + "name": "Dominik Tobschall", + "email": "dominik@fruux.com", + "homepage": "http://tobschall.de/", + "role": "Developer" + }, + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net", + "homepage": "http://mnt.io/", + "role": "Developer" + } + ], + "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects", + "homepage": "http://sabre.io/vobject/", + "keywords": [ + "availability", + "freebusy", + "iCalendar", + "ical", + "ics", + "jCal", + "jCard", + "recurrence", + "rfc2425", + "rfc2426", + "rfc2739", + "rfc4770", + "rfc5545", + "rfc5546", + "rfc6321", + "rfc6350", + "rfc6351", + "rfc6474", + "rfc6638", + "rfc6715", + "rfc6868", + "vCalendar", + "vCard", + "vcf", + "xCal", + "xCard" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/vobject/issues", + "source": "https://github.com/fruux/sabre-vobject" + }, + "time": "2024-10-14T11:53:54+00:00" + }, + { + "name": "sabre/xml", + "version": "2.2.11", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/xml.git", + "reference": "01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/xml/zipball/01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc", + "reference": "01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xmlreader": "*", + "ext-xmlwriter": "*", + "lib-libxml": ">=2.6.20", + "php": "^7.1 || ^8.0", + "sabre/uri": ">=1.0,<3.0.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.17.1||3.63.2", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" + }, + "type": "library", + "autoload": { + "files": [ + "lib/Deserializer/functions.php", + "lib/Serializer/functions.php" + ], + "psr-4": { + "Sabre\\Xml\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + }, + { + "name": "Markus Staab", + "email": "markus.staab@redaxo.de", + "role": "Developer" + } + ], + "description": "sabre/xml is an XML library that you may not hate.", + "homepage": "https://sabre.io/xml/", + "keywords": [ + "XMLReader", + "XMLWriter", + "dom", + "xml" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/xml/issues", + "source": "https://github.com/fruux/sabre-xml" + }, + "time": "2024-09-06T07:37:46+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-php81", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/yaml", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "e99b4e94d124b29ee4cf3140e1b537d2dad8cec9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e99b4e94d124b29ee4cf3140e1b537d2dad8cec9", + "reference": "e99b4e94d124b29ee4cf3140e1b537d2dad8cec9", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-ctype": "^1.8" + }, + "conflict": { + "symfony/console": "<5.4" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0|^7.0" + }, + "bin": [ + "Resources/bin/yaml-lint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Loads and dumps YAML files", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/yaml/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + }, + { + "name": "twig/twig", + "version": "v3.14.0", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig.git", + "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/126b2c97818dbff0cdf3fbfc881aedb3d40aae72", + "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php81": "^1.29" + }, + "require-dev": { + "psr/container": "^1.0|^2.0", + "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/Resources/core.php", + "src/Resources/debug.php", + "src/Resources/escaper.php", + "src/Resources/string_loader.php" + ], + "psr-4": { + "Twig\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Twig Team", + "role": "Contributors" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "https://twig.symfony.com", + "keywords": [ + "templating" + ], + "support": { + "issues": "https://github.com/twigphp/Twig/issues", + "source": "https://github.com/twigphp/Twig/tree/v3.14.0" + }, + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2024-09-09T17:55:12+00:00" + } + ], + "packages-dev": [ + { + "name": "clue/ndjson-react", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/clue/reactphp-ndjson.git", + "reference": "392dc165fce93b5bb5c637b67e59619223c931b0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/392dc165fce93b5bb5c637b67e59619223c931b0", + "reference": "392dc165fce93b5bb5c637b67e59619223c931b0", + "shasum": "" + }, + "require": { + "php": ">=5.3", + "react/stream": "^1.2" + }, + "require-dev": { + "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35", + "react/event-loop": "^1.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Clue\\React\\NDJson\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering" + } + ], + "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.", + "homepage": "https://github.com/clue/reactphp-ndjson", + "keywords": [ + "NDJSON", + "json", + "jsonlines", + "newline", + "reactphp", + "streaming" + ], + "support": { + "issues": "https://github.com/clue/reactphp-ndjson/issues", + "source": "https://github.com/clue/reactphp-ndjson/tree/v1.3.0" + }, + "funding": [ + { + "url": "https://clue.engineering/support", + "type": "custom" + }, + { + "url": "https://github.com/clue", + "type": "github" + } + ], + "time": "2022-12-23T10:58:28+00:00" + }, + { + "name": "composer/pcre", + "version": "3.3.1", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "conflict": { + "phpstan/phpstan": "<1.11.10" + }, + "require-dev": { + "phpstan/phpstan": "^1.11.10", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^8 || ^9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/3.3.1" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-08-27T18:44:43+00:00" + }, + { + "name": "composer/semver", + "version": "3.4.3", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.4.3" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-09-19T14:15:21+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "3.0.5", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef", + "shasum": "" + }, + "require": { + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1 || ^2 || ^3" + }, + "require-dev": { + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/3.0.5" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-05-06T16:37:16+00:00" + }, + { + "name": "evenement/evenement", + "version": "v3.0.2", + "source": { + "type": "git", + "url": "https://github.com/igorw/evenement.git", + "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc", + "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc", + "shasum": "" + }, + "require": { + "php": ">=7.0" + }, + "require-dev": { + "phpunit/phpunit": "^9 || ^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Evenement\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + } + ], + "description": "Événement is a very simple event dispatching library for PHP", + "keywords": [ + "event-dispatcher", + "event-emitter" + ], + "support": { + "issues": "https://github.com/igorw/evenement/issues", + "source": "https://github.com/igorw/evenement/tree/v3.0.2" + }, + "time": "2023-08-08T05:53:35+00:00" + }, + { + "name": "fidry/cpu-core-counter", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/theofidry/cpu-core-counter.git", + "reference": "8520451a140d3f46ac33042715115e290cf5785f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", + "reference": "8520451a140d3f46ac33042715115e290cf5785f", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "fidry/makefile": "^0.2.0", + "fidry/php-cs-fixer-config": "^1.1.2", + "phpstan/extension-installer": "^1.2.0", + "phpstan/phpstan": "^1.9.2", + "phpstan/phpstan-deprecation-rules": "^1.0.0", + "phpstan/phpstan-phpunit": "^1.2.2", + "phpstan/phpstan-strict-rules": "^1.4.4", + "phpunit/phpunit": "^8.5.31 || ^9.5.26", + "webmozarts/strict-phpunit": "^7.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Fidry\\CpuCoreCounter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Théo FIDRY", + "email": "theo.fidry@gmail.com" + } + ], + "description": "Tiny utility to get the number of CPU cores.", + "keywords": [ + "CPU", + "core" + ], + "support": { + "issues": "https://github.com/theofidry/cpu-core-counter/issues", + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" + }, + "funding": [ + { + "url": "https://github.com/theofidry", + "type": "github" + } + ], + "time": "2024-08-06T10:04:20+00:00" + }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v3.58.1", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", + "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/04e9424025677a86914b9a4944dbbf4060bb0aff", + "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff", + "shasum": "" + }, + "require": { + "clue/ndjson-react": "^1.0", + "composer/semver": "^3.4", + "composer/xdebug-handler": "^3.0.3", + "ext-filter": "*", + "ext-json": "*", + "ext-tokenizer": "*", + "fidry/cpu-core-counter": "^1.0", + "php": "^7.4 || ^8.0", + "react/child-process": "^0.6.5", + "react/event-loop": "^1.0", + "react/promise": "^2.0 || ^3.0", + "react/socket": "^1.0", + "react/stream": "^1.0", + "sebastian/diff": "^4.0 || ^5.0 || ^6.0", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", + "symfony/finder": "^5.4 || ^6.0 || ^7.0", + "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", + "symfony/polyfill-mbstring": "^1.28", + "symfony/polyfill-php80": "^1.28", + "symfony/polyfill-php81": "^1.28", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" + }, + "require-dev": { + "facile-it/paraunit": "^1.3 || ^2.0", + "infection/infection": "^0.27.11", + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^2.1", + "mikey179/vfsstream": "^1.6.11", + "php-coveralls/php-coveralls": "^2.7", + "php-cs-fixer/accessible-object": "^1.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4", + "phpunit/phpunit": "^9.6 || ^10.5.5 || ^11.0.2", + "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "keywords": [ + "Static code analysis", + "fixer", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.58.1" + }, + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2024-05-29T16:39:07+00:00" + }, + { + "name": "phpstan/phpstan", + "version": "1.12.7", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", + "issues": "https://github.com/phpstan/phpstan/issues", + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + } + ], + "time": "2024-10-18T11:12:07+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, + { + "name": "react/cache", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/cache.git", + "reference": "d47c472b64aa5608225f47965a484b75c7817d5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b", + "reference": "d47c472b64aa5608225f47965a484b75c7817d5b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "react/promise": "^3.0 || ^2.0 || ^1.1" + }, + "require-dev": { + "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "Async, Promise-based cache interface for ReactPHP", + "keywords": [ + "cache", + "caching", + "promise", + "reactphp" + ], + "support": { + "issues": "https://github.com/reactphp/cache/issues", + "source": "https://github.com/reactphp/cache/tree/v1.2.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2022-11-30T15:59:55+00:00" + }, + { + "name": "react/child-process", + "version": "v0.6.5", + "source": { + "type": "git", + "url": "https://github.com/reactphp/child-process.git", + "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43", + "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43", + "shasum": "" + }, + "require": { + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.0", + "react/event-loop": "^1.2", + "react/stream": "^1.2" + }, + "require-dev": { + "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35", + "react/socket": "^1.8", + "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\ChildProcess\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "Event-driven library for executing child processes with ReactPHP.", + "keywords": [ + "event-driven", + "process", + "reactphp" + ], + "support": { + "issues": "https://github.com/reactphp/child-process/issues", + "source": "https://github.com/reactphp/child-process/tree/v0.6.5" + }, + "funding": [ + { + "url": "https://github.com/WyriHaximus", + "type": "github" + }, + { + "url": "https://github.com/clue", + "type": "github" + } + ], + "time": "2022-09-16T13:41:56+00:00" + }, + { + "name": "react/dns", + "version": "v1.13.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/dns.git", + "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", + "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "react/cache": "^1.0 || ^0.6 || ^0.5", + "react/event-loop": "^1.2", + "react/promise": "^3.2 || ^2.7 || ^1.2.1" + }, + "require-dev": { + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", + "react/async": "^4.3 || ^3 || ^2", + "react/promise-timer": "^1.11" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Dns\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "Async DNS resolver for ReactPHP", + "keywords": [ + "async", + "dns", + "dns-resolver", + "reactphp" + ], + "support": { + "issues": "https://github.com/reactphp/dns/issues", + "source": "https://github.com/reactphp/dns/tree/v1.13.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-06-13T14:18:03+00:00" + }, + { + "name": "react/event-loop", + "version": "v1.5.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/event-loop.git", + "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", + "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" + }, + "suggest": { + "ext-pcntl": "For signal handling support when using the StreamSelectLoop" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\EventLoop\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.", + "keywords": [ + "asynchronous", + "event-loop" + ], + "support": { + "issues": "https://github.com/reactphp/event-loop/issues", + "source": "https://github.com/reactphp/event-loop/tree/v1.5.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2023-11-13T13:48:05+00:00" + }, + { + "name": "react/promise", + "version": "v3.2.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/promise.git", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63", + "shasum": "" + }, + "require": { + "php": ">=7.1.0" + }, + "require-dev": { + "phpstan/phpstan": "1.10.39 || 1.4.10", + "phpunit/phpunit": "^9.6 || ^7.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "React\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "A lightweight implementation of CommonJS Promises/A for PHP", + "keywords": [ + "promise", + "promises" + ], + "support": { + "issues": "https://github.com/reactphp/promise/issues", + "source": "https://github.com/reactphp/promise/tree/v3.2.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-05-24T10:39:05+00:00" + }, + { + "name": "react/socket", + "version": "v1.16.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/socket.git", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", + "shasum": "" + }, + "require": { + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.0", + "react/dns": "^1.13", + "react/event-loop": "^1.2", + "react/promise": "^3.2 || ^2.6 || ^1.2.1", + "react/stream": "^1.4" + }, + "require-dev": { + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", + "react/async": "^4.3 || ^3.3 || ^2", + "react/promise-stream": "^1.4", + "react/promise-timer": "^1.11" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Socket\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP", + "keywords": [ + "Connection", + "Socket", + "async", + "reactphp", + "stream" + ], + "support": { + "issues": "https://github.com/reactphp/socket/issues", + "source": "https://github.com/reactphp/socket/tree/v1.16.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-07-26T10:38:09+00:00" + }, + { + "name": "react/stream", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/stream.git", + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d", + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d", + "shasum": "" + }, + "require": { + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.8", + "react/event-loop": "^1.2" + }, + "require-dev": { + "clue/stream-filter": "~1.2", + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Stream\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP", + "keywords": [ + "event-driven", + "io", + "non-blocking", + "pipe", + "reactphp", + "readable", + "stream", + "writable" + ], + "support": { + "issues": "https://github.com/reactphp/stream/issues", + "source": "https://github.com/reactphp/stream/tree/v1.4.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-06-11T12:45:25+00:00" + }, + { + "name": "sebastian/diff", + "version": "5.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e", + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0", + "symfony/process": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "security": "https://github.com/sebastianbergmann/diff/security/policy", + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T07:15:17+00:00" + }, + { + "name": "symfony/console", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "f793dd5a7d9ae9923e35d0503d08ba734cec1d79" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/f793dd5a7d9ae9923e35d0503d08ba734cec1d79", + "reference": "f793dd5a7d9ae9923e35d0503d08ba734cec1d79", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0|^7.0" + }, + "conflict": { + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Eases the creation of beautiful and testable command line interfaces", + "homepage": "https://symfony.com", + "keywords": [ + "cli", + "command-line", + "console", + "terminal" + ], + "support": { + "source": "https://github.com/symfony/console/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-10-09T08:40:40+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/event-dispatcher-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/dependency-injection": "<5.4", + "symfony/service-contracts": "<2.5" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/stopwatch": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50", + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/event-dispatcher": "^1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/4856c9cf585d5a0313d8d35afd681a526f038dd3", + "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "require-dev": { + "symfony/process": "^5.4|^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-10-25T15:07:50+00:00" + }, + { + "name": "symfony/finder", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "symfony/filesystem": "^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Finds files and directories via an intuitive fluent interface", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-10-01T08:30:56+00:00" + }, + { + "name": "symfony/options-resolver", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "0a62a9f2504a8dd27083f89d21894ceb01cc59db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0a62a9f2504a8dd27083f89d21894ceb01cc59db", + "reference": "0a62a9f2504a8dd27083f89d21894ceb01cc59db", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an improved replacement for the array_replace PHP function", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "3833d7255cc303546435cb650316bff708a1c75c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/process", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "1f9f59b46880201629df3bd950fc5ae8c55b960f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/1f9f59b46880201629df3bd950fc5ae8c55b960f", + "reference": "1f9f59b46880201629df3bd950fc5ae8c55b960f", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Executes commands in sub-processes", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "2cae0a6f8d04937d02f6d19806251e2104d54f92" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/2cae0a6f8d04937d02f6d19806251e2104d54f92", + "reference": "2cae0a6f8d04937d02f6d19806251e2104d54f92", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/service-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a way to profile code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + }, + { + "name": "symfony/string", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/translation-contracts": "<2.5" + }, + "require-dev": { + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": {}, + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^8.1", + "ext-dom": "*", + "ext-openssl": "*", + "ext-pdo": "*", + "ext-zlib": "*" + }, + "platform-dev": {}, + "plugin-api-version": "2.6.0" +} diff --git a/pkgs/by-name/ba/baikal/package.nix b/pkgs/by-name/ba/baikal/package.nix new file mode 100644 index 000000000000..fcdff1452489 --- /dev/null +++ b/pkgs/by-name/ba/baikal/package.nix @@ -0,0 +1,25 @@ +{ + php, + fetchFromGitHub, + lib, +}: +php.buildComposerProject rec { + pname = "baikal"; + version = "0.10.1"; + src = fetchFromGitHub { + owner = "sabre-io"; + repo = "Baikal"; + tag = version; + hash = "sha256-YQQwTdwfHQZdUhO5HbScj/Bl8ype7TtPI3lHjvz2k04="; + }; + # It doesn't provide a composer.lock file, we have to generate manually. + composerLock = ./composer.lock; + vendorHash = "sha256-R9DlgrULUJ02wBOGIdOQrcKiATSSZ/UApYODQ8485Qs="; + + meta = { + description = "Lightweight CalDAV+CardDAV server that offers an extensive web interface with easy management of users, address books and calendars"; + homepage = "https://sabre.io/baikal/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ wrvsrx ]; + }; +} diff --git a/pkgs/by-name/ba/balatro/package.nix b/pkgs/by-name/ba/balatro/package.nix index 181cd305411b..526ca9ee051f 100644 --- a/pkgs/by-name/ba/balatro/package.nix +++ b/pkgs/by-name/ba/balatro/package.nix @@ -11,18 +11,17 @@ withMods ? true, withLinuxPatch ? true, }: -let - version = "1.0.1n"; - balatroExe = requireFile { - name = "Balatro-${version}.exe"; +stdenv.mkDerivation (finalAttrs: { + pname = "balatro"; + version = "1.0.1o"; + + src = requireFile { + name = "Balatro-${finalAttrs.version}.exe"; url = "https://store.steampowered.com/app/2379780/Balatro/"; # Use `nix hash file --sri --type sha256` to get the correct hash - hash = "sha256-mJ5pL+Qj3+ldOLFcQc64dM0edTeQSePIYpp5EuwxKXo="; + hash = "sha256-DXX+FkrM8zEnNNSzesmHiN0V8Ljk+buLf5DE5Z3pP0c="; }; -in -stdenv.mkDerivation { - pname = "balatro"; - inherit version; + nativeBuildInputs = [ p7zip copyDesktopItems @@ -43,7 +42,7 @@ stdenv.mkDerivation { buildPhase = '' runHook preBuild tmpdir=$(mktemp -d) - 7z x ${balatroExe} -o$tmpdir -y + 7z x ${finalAttrs.src} -o$tmpdir -y ${if withLinuxPatch then "patch $tmpdir/globals.lua -i ${./globals.patch}" else ""} patchedExe=$(mktemp -u).zip 7z a $patchedExe $tmpdir/* @@ -76,4 +75,4 @@ stdenv.mkDerivation { platforms = love.meta.platforms; mainProgram = "balatro"; }; -} +}) diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index 2672e0fb03db..2df1c531049f 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -22,16 +22,16 @@ let in buildNpmPackage' rec { pname = "balena-cli"; - version = "21.1.3"; + version = "21.1.11"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-44r0dbcX/KRmfucNy4p/OMrKFC2J8P9eQpwTOTOmwS4="; + hash = "sha256-fWFXlespMcnMAOSgkVh7c9QmvBf3kJyFfH7Gtu5nylw="; }; - npmDepsHash = "sha256-wEshPXXpFVOYzaqh6c5z47OccBEWMP5aarZP42PYgzk="; + npmDepsHash = "sha256-WGTmOfnVhxRV0ERpmRx77gOmfqyHRJkdoPaCYgoHq88="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/by-name/ba/bambootracker/package.nix b/pkgs/by-name/ba/bambootracker/package.nix new file mode 100644 index 000000000000..5b96caa3e842 --- /dev/null +++ b/pkgs/by-name/ba/bambootracker/package.nix @@ -0,0 +1,125 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + gitUpdater, + libsForQt5, + pkg-config, + qt6Packages, + rtaudio_6, + rtmidi, + withQt6 ? false, +}: + +let + qtPackages = if withQt6 then qt6Packages else libsForQt5; +in +stdenv.mkDerivation (finalAttrs: { + pname = "bambootracker" + lib.optionalString withQt6 "-qt6"; + version = "0.6.5"; + + src = fetchFromGitHub { + owner = "BambooTracker"; + repo = "BambooTracker"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-WoyOqInOOOIEwsMOc2yoTdh9UhJOvFKE1GfkxOuXDe0="; + }; + + patches = [ + # Remove when version > 0.6.5 + (fetchpatch { + name = "0001-bambootracker-Fix-compiler-warnings.patch"; + url = "https://github.com/BambooTracker/BambooTracker/commit/d670cf8b6113318cd938cf19be76b6b14d3635f1.patch"; + hash = "sha256-yyOMaOYKSc1hbbCL7wjFNPDmX2oMYo10J4hjZJss2zs="; + }) + + # Remove when version > 0.6.5 + (fetchpatch { + name = "0002-bambootracker-Fix-GCC15-compat.patch"; + url = "https://github.com/BambooTracker/BambooTracker/commit/92c0a7d1cfb05d1c6ae9482181c5c378082b772c.patch"; + hash = "sha256-6K0RZD0LevggxFr92LaNmq+eMgOFJgFX60IgAw7tYdM="; + }) + + # Remove when version > 0.6.5 + (fetchpatch { + name = "0003-bambootracker-Drop-unused-property.patch"; + url = "https://github.com/BambooTracker/BambooTracker/commit/de4459f0315f099d3e0a2d20b938ec76285f2d46.patch"; + hash = "sha256-zTh6i+hgQZ3kEid0IzQaR/PsrYlnhplccdlaS5g8FeA="; + }) + ]; + + postPatch = lib.optionalString withQt6 '' + # Work around lrelease finding in qmake being broken by using pre-Qt5.12 code path + # https://github.com/NixOS/nixpkgs/issues/214765 + substituteInPlace BambooTracker/lang/lang.pri \ + --replace 'equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12)' 'if(true)' + ''; + + nativeBuildInputs = + [ + pkg-config + ] + ++ (with qtPackages; [ + qmake + qttools + wrapQtAppsHook + ]); + + buildInputs = + [ + rtaudio_6 + rtmidi + ] + ++ ( + with qtPackages; + [ + qtbase + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + qtwayland + ] + ++ lib.optionals withQt6 [ + qt5compat + ] + ); + + qmakeFlags = + [ + "CONFIG+=system_rtaudio" + "CONFIG+=system_rtmidi" + ] + ++ lib.optionals stdenv.cc.isClang [ + # Clang is extra-strict about some deprecations + # https://github.com/BambooTracker/BambooTracker/issues/506 + "CONFIG+=no_warnings_are_errors" + ]; + + postConfigure = "make qmake_all"; + + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.hostPlatform.isDarwin; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv $out/{bin,Applications}/BambooTracker.app + ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker + wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker + ''; + + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + }; + }; + + meta = { + description = "Tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; + mainProgram = "BambooTracker"; + homepage = "https://bambootracker.github.io/BambooTracker/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ OPNA2608 ]; + }; +}) diff --git a/pkgs/by-name/ba/bamf/package.nix b/pkgs/by-name/ba/bamf/package.nix index d79106094b6d..94276bfa2565 100644 --- a/pkgs/by-name/ba/bamf/package.nix +++ b/pkgs/by-name/ba/bamf/package.nix @@ -19,17 +19,21 @@ dbus, python3, wrapGAppsHook3, + withDocs ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: stdenv.mkDerivation rec { pname = "bamf"; version = "0.5.6"; - outputs = [ - "out" - "dev" - "devdoc" - ]; + outputs = + [ + "out" + "dev" + ] + ++ lib.optionals withDocs [ + "devdoc" + ]; src = fetchgit { url = "https://git.launchpad.net/~unity-team/bamf"; @@ -37,14 +41,18 @@ stdenv.mkDerivation rec { sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ - (python3.withPackages (ps: with ps; [ lxml ])) # Tests + (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ lxml ])) # Tests autoreconfHook dbus docbook_xsl gnome-common gobject-introspection - gtk-doc + gtk-doc # required for autoreconfHook, even when `withDocs = false` pkg-config vala which @@ -66,10 +74,13 @@ stdenv.mkDerivation rec { --replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user' ''; - configureFlags = [ - "--enable-gtk-doc" - "--enable-headless-tests" - ]; + configureFlags = + [ + "--enable-headless-tests" + ] + ++ lib.optionals withDocs [ + "--enable-gtk-doc" + ]; # Fix paths makeFlags = [ @@ -79,6 +90,7 @@ stdenv.mkDerivation rec { # TODO: Requires /etc/machine-id doCheck = false; + strictDeps = true; # Ignore deprecation errors env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; @@ -96,6 +108,7 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/bamf"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; + maintainers = with maintainers; [ davidak ]; + teams = [ teams.pantheon ]; }; } diff --git a/pkgs/by-name/ba/bamtools/package.nix b/pkgs/by-name/ba/bamtools/package.nix index 2c6792c47c88..e522610b1df9 100644 --- a/pkgs/by-name/ba/bamtools/package.nix +++ b/pkgs/by-name/ba/bamtools/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bamtools"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "pezmaster31"; repo = "bamtools"; tag = "v${finalAttrs.version}"; - hash = "sha256-l2DmA4P1kPneTCL9YVACE6LcQHT0F+mufPyM69VkksE="; + hash = "sha256-3kIa407YgBpulh2koQQFK/RLmGEZvEvTnZyWKm+pngg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ba/banana-accounting/package.nix b/pkgs/by-name/ba/banana-accounting/package.nix index b1e455bbf6c3..2be9b632bf7c 100644 --- a/pkgs/by-name/ba/banana-accounting/package.nix +++ b/pkgs/by-name/ba/banana-accounting/package.nix @@ -1,31 +1,33 @@ { + lib, + stdenv, + fetchurl, autoPatchelfHook, + wrapGAppsHook3, cairo, e2fsprogs, - fetchurl, gmp, gtk3, libGL, libX11, - lib, - stdenv, libgcrypt, - wrapGAppsHook3, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "banana-accounting"; - version = "10.0.12"; + version = "10.1.24"; srcs = fetchurl { - url = "https://web.archive.org/web/20220821013214/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz"; - hash = "sha256-Xs7K/Z6qM1fKKfYMkwAGznNR0Kt/gY7qTr8ZOriIdYw="; + url = "https://web.archive.org/web/20250416013207/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz"; + hash = "sha256-5GewPGOCyeS6faL8aMUZ/JDUUn2PGuur0ws/7nlNX6M="; }; sourceRoot = "."; - dontConfigure = true; - dontBuild = true; + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook3 + ]; buildInputs = [ cairo @@ -38,25 +40,28 @@ stdenv.mkDerivation { libgcrypt ]; - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook3 - ]; + dontConfigure = true; + + dontBuild = true; installPhase = '' runHook preInstall - mkdir -p $out/bin - mv ./* $out - ln -s $out/usr/bin/bananaplus $out/bin/ + + mkdir -p $out/opt $out/bin $out/share + cp -r . $out/opt/banana-accounting + ln -s $out/opt/banana-accounting/usr/bin/bananaplus $out/bin/bananaplus + ln -s $out/opt/banana-accounting/usr/share/applications $out/share/applications + ln -s $out/opt/banana-accounting/usr/share/icons $out/share/icons + runHook postInstall ''; - meta = with lib; { + meta = { description = "Accounting Software for small companies, associations and individuals"; - homepage = "https://www.banana.ch/"; - license = licenses.unfree; + homepage = "https://www.banana.ch"; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jacg ]; + maintainers = with lib.maintainers; [ jacg ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; -} +}) diff --git a/pkgs/by-name/ba/bandcamp-collection-downloader/deps.json b/pkgs/by-name/ba/bandcamp-collection-downloader/deps.json new file mode 100644 index 000000000000..719f1aacb4f8 --- /dev/null +++ b/pkgs/by-name/ba/bandcamp-collection-downloader/deps.json @@ -0,0 +1,340 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, + "com/google/code/gson#gson/2.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": { + "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=", + "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": { + "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", + "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", + "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=", + "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { + "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", + "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": { + "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", + "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=", + "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": { + "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=", + "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=", + "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { + "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", + "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": { + "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", + "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { + "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", + "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": { + "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", + "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": { + "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", + "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { + "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", + "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { + "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", + "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" + }, + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.21": { + "pom": "sha256-Jk8V5sp1XIU/oPWvEPa9GgHwmLKsDPmOHP05kBF/tjo=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" + }, + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, + "com/google/errorprone#error_prone_annotations/2.27.0": { + "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" + }, + "com/sun/mail#all/1.6.2": { + "pom": "sha256-S36Dqpt31l4AfpfLUPm4nNt1T6rxZBHl/ZTR49q3brM=" + }, + "com/sun/mail#javax.mail/1.6.2": { + "jar": "sha256-RbUV5xBJRMCeRbnHuxzl3/ZASGN0hS3SsugMw3Ut+hE=", + "pom": "sha256-xCKcBbWDbwAlITY9NDXz0HJmJ0RUi/F+fnreyv5ouf0=" + }, + "info/picocli#picocli/4.6.1": { + "jar": "sha256-Km4DMQ2xSfihHrBYqnjndcIp74FjM8loc3l2LSKDOtY=", + "pom": "sha256-sQOC7VBz9mKP84EayWFEkbHv8wLDz55Cmo81P2w75M8=" + }, + "javax/activation#activation/1.1": { + "jar": "sha256-KIHHnJ1u8BxY5ivuoT6dGsi4uqFvL8GYrW5ndt79zdM=", + "pom": "sha256-1JDlQKEVBLnXFxixyF/vez3mgCNhKQgkU5sHbVj6qKA=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/ini4j#ini4j/0.5.4": { + "jar": "sha256-qtYGNe7lZyVO0p8Y+xjA+eTE2s9RyCKRKCAxg7s14t0=", + "pom": "sha256-XMYUkRJoPvybUbn9k3h307NQPfboBdMHHOTbOb41mY8=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { + "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", + "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { + "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", + "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.0.21": { + "jar": "sha256-2Gv0M4pthBzM37v/LaBb0DpJw9uMP5erhed+AhrQhFs=", + "pom": "sha256-esgfO7B8TWqo+pj/WjmaR6vRzhx4bU8/rZbvKBIL34o=" + }, + "org/jetbrains/kotlin#kotlin-native-prebuilt/2.0.21": { + "pom": "sha256-Gv4wJE4ZR67Wy+01BBrTbFnw6nZK/bxv/56agY7loEE=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": { + "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", + "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { + "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", + "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { + "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", + "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { + "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", + "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { + "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", + "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21/all": { + "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg=" + }, + "org/jetbrains/kotlin#kotlin-test-junit5/2.0.21": { + "jar": "sha256-rEfeYZt9h+K/339u7Gpiph0b3AwyV0DfUhhrFBk2cT0=", + "module": "sha256-pJ3WSbaBmpF2wNksgkT2sD6Q4xvXpTO3oJGsud6wleQ=", + "pom": "sha256-rdbbLWF1KU0hNI3eEMyqHeUWNT9uQHp24FNbS1RcJ30=" + }, + "org/jetbrains/kotlin#kotlin-test/2.0.21": { + "jar": "sha256-qJeyjGo+qOyPAO12aUGgwN+ZPX9lkIh1h5ho4IzriYU=", + "module": "sha256-1GaHPese5eDSFPdNDVC5BCGQZV+eUBRW/Qk72SCkL40=", + "pom": "sha256-6jadb0j7+WeUIXBPuf9tTM4mA3iZUKl8pd5bLsH5c4o=" + }, + "org/jetbrains/kotlin#kotlin-test/2.0.21/all": { + "jar": "sha256-2iho+pWj+4814rTjMcouKTIUhnAZZex2a66CD5jgJ3w=" + }, + "org/jetbrains/kotlin/kotlin-native-prebuilt/2.0.21/kotlin-native-prebuilt-2.0.21-linux-x86_64": { + "tar.gz": "sha256-8SXMZFcnRldupsPfHmVklSr9dpJcJNdc/4X4zdRG/ls=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/jsoup#jsoup/1.18.1": { + "jar": "sha256-O7Ww7AKZir5FpR83185nwwaLTM1KtjyWWSnsUHTWTpE=", + "pom": "sha256-xN46hPu17vS9IpjW3pgcbNlyKHlQXINz4bZ/EdHK8n0=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.1": { + "jar": "sha256-YNXDmMMtxwObmSglFK1gZAYdhBfPlZofa9IDjMkHyRM=", + "module": "sha256-+H9zEVSfSf4k5igqEWXpB+AXqR6XnK2r/fm/VMP3EG8=", + "pom": "sha256-PK9ZSxPa5xB1EN2Zj02en6J3MFzcohMh/dWRmdyHzz0=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.1": { + "jar": "sha256-ApMN/klfk/5wsmVQrOOij34bkAyEQmwuRibOAgxygtY=", + "module": "sha256-VBIeWCzLLUYl7J+lRnlDbJA/oFPHQJe75F/fud22f7g=", + "pom": "sha256-MHCG3F5wjLdZAQhoXAQOCOCK3g7UlUkwsvM8BttT6l4=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/platform#junit-platform-commons/1.10.1": { + "jar": "sha256-fZhV7j8/cfAV6xR5VZv5I3gyQ8JPv72LKb7Y6AmbVnI=", + "module": "sha256-VtNwYvzicEHwtaNfOTxoyK0jr+NLLTDvjgewT8EZ1N0=", + "pom": "sha256-Su81pl6VGRWhPZ920fr/CaeMND5SJC+vNSBDtwx/bzA=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.10.1": { + "jar": "sha256-uqSORw1t7nNpoKiCDFHaicFGMnntpuE6ME0R9Fkix2A=", + "module": "sha256-KXiTcRuSz0lfdH41o6rLSDELHRNBpFzYTSP5QxxS4p0=", + "pom": "sha256-3X1k/Zr2eJywPFDCWGyRW7hrHizIwH+5dPHbDvhhZA0=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/platform#junit-platform-launcher/1.10.1": { + "jar": "sha256-3tQUxQTojQInAzEHGWkIThsv2bz4RD811E2ixuMwG8I=", + "module": "sha256-3ZcDx0TqC54Vv4yeP+vM/B40cBalXXHvf/qbC8TEBRI=", + "pom": "sha256-unroFwQMcqPCbTY6R/wTZIoc0MZOmjgYDd6YGKG1DjM=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/slf4j#slf4j-api/1.6.6": { + "pom": "sha256-cxmZMiteIokinNntRiTJQexXG3xh0qJ9alB+9zuXyho=" + }, + "org/slf4j#slf4j-api/1.7.32": { + "jar": "sha256-NiT4R0wa9G11+YvAl9eGSjI8gbOAiqQ2iabhxgHAJ74=", + "pom": "sha256-ABzeWzxrqRBwQlz+ny5pXkrri8KQotTNllMRJ6skT+U=" + }, + "org/slf4j#slf4j-parent/1.6.6": { + "pom": "sha256-QrjCR2CP2OENW2Zs98gKW1nSseEoRQ97bZ0sIM+2sxs=" + }, + "org/slf4j#slf4j-parent/1.7.32": { + "pom": "sha256-WrNJ0PTHvAjtDvH02ThssZQKL01vFSFQ4W277MC4PHA=" + }, + "org/slf4j#slf4j-simple/1.7.32": { + "jar": "sha256-0v3XtzyiAZogYtFFoNhheaWPmMjD41ynxzWieztWIcM=", + "pom": "sha256-VVTmGS0A/7oRfST9+HBIj50DkABH6Lq1XgDugzgvQdg=" + }, + "org/xerial#sqlite-jdbc/3.47.0.0": { + "jar": "sha256-k9R8AGN3xHb497RdANIGBrd9WVFCPzRu9WtbCBNhwtM=", + "pom": "sha256-3SmXElydGbywbhuMYYZoJWi8iqHfmOguXp9Litbx/X0=" + }, + "org/zeroturnaround#zt-zip/1.14": { + "jar": "sha256-lkDsuPjrnDFVsVbtu0BJyT3uXaKz31U6UdlGmK+3aNk=", + "pom": "sha256-esRAYySqeauHFiEV/lpCdp4yB8eCFbvCMZ2ZNeNV5hg=" + } + } +} diff --git a/pkgs/by-name/ba/bandcamp-collection-downloader/package.nix b/pkgs/by-name/ba/bandcamp-collection-downloader/package.nix new file mode 100644 index 000000000000..e0318ef03109 --- /dev/null +++ b/pkgs/by-name/ba/bandcamp-collection-downloader/package.nix @@ -0,0 +1,68 @@ +{ + lib, + jre, + gradle_8, + + makeWrapper, + stdenv, + fetchFromGitLab, +}: +let + gradle = gradle_8; +in +stdenv.mkDerivation (finalAttrs: { + pname = "bandcamp-collection-downloader"; + version = "0-unstable-2024-10-29"; + + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "Ezwen"; + repo = "bandcamp-collection-downloader"; + rev = "fe8a98d92d776d194be196b6860f55e194a999f8"; + hash = "sha256-OaloKYlENq2kSzC8jvt4JJ7PsxLuqUuOdnYoazW5YUE="; + }; + + nativeBuildInputs = [ + gradle + makeWrapper + ]; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + # this is required for using mitm-cache on Darwin + __darwinAllowLocalNetworking = true; + + # tests want to talk to bandcamp + doCheck = false; + + gradleBuildTask = "fatjar"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/bandcamp-collection-downloader + cp build/libs/bandcamp-collection-downloader.jar $out/share/bandcamp-collection-downloader/bandcamp-collection-downloader.jar + + makeWrapper ${lib.getExe jre} $out/bin/bandcamp-collection-downloader \ + --add-flags "-jar $out/share/bandcamp-collection-downloader/bandcamp-collection-downloader.jar" + + runHook postInstall + ''; + + meta = { + description = "Tool to automatically download purchased music from bandcamp"; + license = lib.licenses.agpl3Only; + homepage = "https://framagit.org/Ezwen/bandcamp-collection-downloader"; + maintainers = [ lib.maintainers.shelvacu ]; + mainProgram = "bandcamp-collection-downloader"; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; + }; +}) diff --git a/pkgs/by-name/ba/bandwhich/package.nix b/pkgs/by-name/ba/bandwhich/package.nix index 65a9950e3061..234b5e1f176d 100644 --- a/pkgs/by-name/ba/bandwhich/package.nix +++ b/pkgs/by-name/ba/bandwhich/package.nix @@ -5,7 +5,6 @@ rustPlatform, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,8 +23,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/ba/bandwidth/package.nix b/pkgs/by-name/ba/bandwidth/package.nix index b6471d2d7597..8f0965b2ea27 100644 --- a/pkgs/by-name/ba/bandwidth/package.nix +++ b/pkgs/by-name/ba/bandwidth/package.nix @@ -1,20 +1,20 @@ { lib, stdenv, - fetchurl, + requireFile, nasm, }: let - inherit (stdenv.hostPlatform.parsed.cpu) bits; - arch = "bandwidth${toString bits}"; + arch = "bandwidth${toString stdenv.hostPlatform.parsed.cpu.bits}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bandwidth"; version = "1.11.2d"; - src = fetchurl { - url = "https://zsmith.co/archives/bandwidth-${version}.tar.gz"; + src = requireFile { + message = "This file does not have a valid url."; + name = "bandwidth-${finalAttrs.version}.tar.gz"; hash = "sha256-7IrNiCXKf1vyRGl73Ccu3aYMqPVc4PpEr6lnSqIa4Q8="; }; @@ -48,16 +48,18 @@ stdenv.mkDerivation rec { ]; installPhase = '' - mkdir -p $out/bin - cp ${arch} $out/bin/bandwidth + runHook preInstall + + install -Dm755 ${arch} $out/bin/bandwidth + + runHook postInstall ''; - meta = with lib; { - homepage = "https://zsmith.co/bandwidth.html"; + meta = { description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; - license = licenses.gpl2Plus; - platforms = platforms.x86 ++ platforms.arm ++ platforms.aarch64; - maintainers = with maintainers; [ r-burns ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.x86 ++ lib.platforms.arm ++ lib.platforms.aarch64; + maintainers = with lib.maintainers; [ r-burns ]; mainProgram = "bandwidth"; }; -} +}) diff --git a/pkgs/by-name/ba/bao/package.nix b/pkgs/by-name/ba/bao/package.nix index 56a3071df33a..cf01ae2ff834 100644 --- a/pkgs/by-name/ba/bao/package.nix +++ b/pkgs/by-name/ba/bao/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "bao"; - version = "0.13.0"; + version = "0.13.1"; src = fetchCrate { inherit version; pname = "${pname}_bin"; - hash = "sha256-MpMNhL1n8dNJJcJJiDXv/qWUgCNqQIvvcR8veH+abuI="; + hash = "sha256-8h5otpu3z2Hgy0jMCITJNr8Q4iVdlR5Lea2X+WuenWs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Vw8T/pgGMjI8QklkQNuZSYmKcKhaR320q8ZBAT4HPZ8="; + cargoHash = "sha256-B0wvJTcIRJxBU0G1DONnKeQYrmsmMIorhTLc73o4/kE="; meta = { description = "Implementation of BLAKE3 verified streaming"; diff --git a/pkgs/by-name/ba/baobab/package.nix b/pkgs/by-name/ba/baobab/package.nix index 5f086e172531..d6355480fcb5 100644 --- a/pkgs/by-name/ba/baobab/package.nix +++ b/pkgs/by-name/ba/baobab/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "47.0"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/baobab/${lib.versions.major version}/baobab-${version}.tar.xz"; - hash = "sha256-uI90+cBS08I4j3Bi0ijPXpJ1Raz3QIxWhB34DM0fnDc="; + hash = "sha256-VFklBNSdgH8jWRvn5+7xDGyd/LesUnuBw6zVh4eyb9o="; }; nativeBuildInputs = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { mainProgram = "baobab"; homepage = "https://apps.gnome.org/Baobab/"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix index 167a709fac5a..f537422bc7d4 100644 --- a/pkgs/by-name/ba/bark-server/package.nix +++ b/pkgs/by-name/ba/bark-server/package.nix @@ -3,17 +3,18 @@ buildGoModule, fetchFromGitHub, versionCheckHook, + nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "bark-server"; - version = "2.1.9"; + version = "2.2.1"; src = fetchFromGitHub { owner = "Finb"; repo = "bark-server"; - tag = "v${version}"; - hash = "sha256-bZWX47krx9V0qXg6Yl8yQbX1zd5DtsWkIBLi0bDxrpA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-wwb3k68tjdmN+dy5CKJoUIScLXzNucq6wXy1HgXNa/0="; # 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; @@ -26,19 +27,22 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-Yti+W3GKUMEfNBHf4C435BpYsDjCzgfLr55iqU3BGbA="; + vendorHash = "sha256-FTzSlliphTukCNf+cGGKWK798SARdEkE2HpfWS8ZlNc="; ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; preBuild = '' - ldflags+=" -X \"main.buildDate=$(cat SOURCE_DATE_EPOCH)\"" - ldflags+=" -X main.commitID==$(cat COMMIT)" + ldflags+=" -X \"main.buildDate=$( $linuxConfigFilename + + # disable auto update + sed -i 's/[^=]*\.auto_update_disabled/true/' $out/resources/app/build/main/main-entry-*.mjs + + # prevent updates + sed -i -E 's/executeDownload\([^)]+\)\{/executeDownload(){return;/g' $out/resources/app/build/main/main-entry-*.mjs + + # hide version status element on about page otherwise a error message is shown + sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $out/resources/app/build/renderer/PrefsPanes-*.css + ''; }; in -stdenvNoCC.mkDerivation rec { +appimageTools.wrapAppImage { inherit pname version; - src = appimage; + src = appimageContents; - nativeBuildInputs = [ makeWrapper ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; - installPhase = '' - runHook preInstall + extraInstallCommands = '' + install -Dm 644 ${appimageContents}/beepertexts.png $out/share/icons/hicolor/512x512/apps/beepertexts.png + install -Dm 644 ${appimageContents}/beepertexts.desktop -t $out/share/applications/ + substituteInPlace $out/share/applications/beepertexts.desktop --replace-fail "AppRun" "beeper" - mkdir -p $out/ - cp -r bin $out/bin - - mkdir -p $out/share/${pname} - cp -a ${appimageContents}/locales $out/share/${pname} - cp -a ${appimageContents}/resources $out/share/${pname} - cp -a ${appimageContents}/usr/share/icons $out/share/ - install -Dm 644 ${appimageContents}/${pname}.desktop -t $out/share/applications/ - - substituteInPlace $out/share/applications/${pname}.desktop --replace "AppRun" "${pname}" - - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" - - runHook postInstall + . ${makeWrapper}/nix-support/setup-hook + wrapProgram $out/bin/beeper \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" \ + --set APPIMAGE beeper ''; passthru = { @@ -56,16 +56,18 @@ stdenvNoCC.mkDerivation rec { name = "update-beeper"; runtimeInputs = [ curl - yq common-updater-scripts ]; text = '' set -o errexit - latestLinux="$(curl -s https://download.todesktop.com/2003241lzgn20jd/latest-linux.yml)" - version="$(echo "$latestLinux" | yq -r .version)" - update-source-version beeper "$version" "" "https://download.beeper.com/versions/$version/linux/appImage/x64" --source-key=src.src + latestLinux="$(curl --silent --output /dev/null --write-out "%{redirect_url}\n" https://api.beeper.com/desktop/download/linux/x64/stable/com.automattic.beeper.desktop)" + version="$(echo "$latestLinux" | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')" + update-source-version beeper "$version" ''; }); + + # needed for nix-update + inherit src; }; meta = with lib; { @@ -79,8 +81,8 @@ stdenvNoCC.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ jshcmpbll - mjm edmundmiller + zh4ngx ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/be/bemenu/package.nix b/pkgs/by-name/be/bemenu/package.nix index ace85ff9ec1b..0da5facf1bbe 100644 --- a/pkgs/by-name/be/bemenu/package.nix +++ b/pkgs/by-name/be/bemenu/package.nix @@ -9,13 +9,14 @@ harfbuzz, pkg-config, scdoc, + makeWrapper, ncursesSupport ? true, ncurses, - waylandSupport ? true, + waylandSupport ? stdenv.hostPlatform.isLinux, wayland, wayland-protocols, wayland-scanner, - x11Support ? true, + x11Support ? stdenv.hostPlatform.isLinux, xorg, }: @@ -30,11 +31,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-0vpqJ2jydTt6aVni0ma0g+80PFz+C4xJ5M77sMODkSg="; }; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace GNUmakefile --replace '-soname' '-install_name' + ''; + strictDeps = true; - nativeBuildInputs = [ - pkg-config - scdoc - ] ++ lib.optionals waylandSupport [ wayland-scanner ]; + nativeBuildInputs = + [ + pkg-config + scdoc + ] + ++ lib.optional stdenv.hostPlatform.isDarwin makeWrapper + ++ lib.optional waylandSupport wayland-scanner; buildInputs = [ @@ -66,12 +74,20 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional waylandSupport "wayland" ++ lib.optional x11Support "x11"; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + so="$(find "$out/lib" -name "libbemenu.so.[0-9]" -print -quit)" + for f in "$out/bin/"*; do + install_name_tool -change "$(basename $so)" "$so" $f + wrapProgram $f --set BEMENU_BACKEND curses + done + ''; + meta = with lib; { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu"; license = licenses.gpl3Plus; maintainers = with maintainers; [ crertel ]; mainProgram = "bemenu"; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; }; }) diff --git a/pkgs/by-name/be/bemoji/package.nix b/pkgs/by-name/be/bemoji/package.nix index a7b4215aceeb..939964c6bc87 100644 --- a/pkgs/by-name/be/bemoji/package.nix +++ b/pkgs/by-name/be/bemoji/package.nix @@ -3,16 +3,15 @@ stdenvNoCC, fetchFromGitHub, }: - -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "bemoji"; - version = "0.4.0"; + version = "0.4.0-unstable-2024-04-28"; src = fetchFromGitHub { owner = "marty-oehme"; repo = "bemoji"; - tag = "v${version}"; - hash = "sha256-HXwho0vRI9ZrUuDMicMH4ZNExY+zJfbrne2LMQmmHww="; + rev = "1b5e9c1284ede59d771bfd43780cc8f6f7446f38"; + hash = "sha256-WD4oFq0NRZ0Dt/YamutM7iWz3fMRxCqwgRn/rcUsTIw="; }; strictDeps = true; @@ -28,6 +27,9 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; mainProgram = "bemoji"; platforms = platforms.all; - maintainers = with maintainers; [ laurent-f1z1 ]; + maintainers = with maintainers; [ + laurent-f1z1 + MrSom3body + ]; }; } diff --git a/pkgs/by-name/be/bencode/package.nix b/pkgs/by-name/be/bencode/package.nix index b3df112d9101..776f1dcddf0d 100644 --- a/pkgs/by-name/be/bencode/package.nix +++ b/pkgs/by-name/be/bencode/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fbdtemme/bencode"; changelog = "https://github.com/fbdtemme/bencode/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.unix; # Broken because the default stdenv on these targets doesn't support C++20. broken = with stdenv; isDarwin || (isLinux && isAarch64); diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix index 3be50eab068b..d68e21988b29 100644 --- a/pkgs/by-name/be/benthos/package.nix +++ b/pkgs/by-name/be/benthos/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "benthos"; - version = "4.46.0"; + version = "4.51.0"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "benthos"; tag = "v${version}"; - hash = "sha256-txIzW6qU4XZyvt5ndIjmYwo4D2gWlD4CjEI591k3b8s="; + hash = "sha256-GOI878JBRXrJsy0MRFyW6pH4UGj6ZOOqBElLUesqZ24="; }; proxyVendor = true; @@ -22,7 +22,7 @@ buildGoModule rec { "cmd/benthos" ]; - vendorHash = "sha256-1XEIZemPo8IuSpakTr7Zy4Jqd/vukL5ORuW/5tA6otw="; + vendorHash = "sha256-S3rxNRr1O8+90VTUEFBPdo3uUftqSj8lvCNAdQNs7SQ="; # doCheck = false; diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index 722e4a5a8188..badc035b76cc 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "bento"; - version = "1.5.2"; + version = "1.7.1"; src = fetchFromGitHub { owner = "warpstreamlabs"; repo = "bento"; tag = "v${version}"; - hash = "sha256-ufRC/xVuSnoN+dHeiQZ2k2T8mYxz576l1n+y3Y3TMEY="; + hash = "sha256-pV7Fd+Ir+ZqteM0In/NiZrAyvPFS+oOnONhGVeBzA2g="; }; proxyVendor = true; - vendorHash = "sha256-FRaT+TeH6+0RzvCwPd0e+2a6i85GTPARS2H49zYVwk4="; + vendorHash = "sha256-ow/XOO8Xc72v6Ue9VHjnPuq+HlqE4YZHw+gJB4x7sKk="; subPackages = [ "cmd/bento" @@ -33,7 +33,7 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/be/berglas/package.nix b/pkgs/by-name/be/berglas/package.nix index d5412784ba4a..23d58fc3a53b 100644 --- a/pkgs/by-name/be/berglas/package.nix +++ b/pkgs/by-name/be/berglas/package.nix @@ -35,16 +35,16 @@ in buildGoModule rec { pname = "berglas"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bW8D8g4FPx0i4iPP7Pvm0UpaJFNsECR3kuHEZn8NLx0="; + sha256 = "sha256-gBZY/xj/T7UYQ5mnN6udpBKViE/RYz9tmbmYN+JqsBk="; }; - vendorHash = "sha256-+ncl/6BJ7J2cby29I1IvkUgbiyDP+co/+Cyyh/V8A1I="; + vendorHash = "sha256-NR4YoaJ5ztc7eokRexNzDBtAH7JM4vZH13K550KWFNM="; ldflags = [ "-s" diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index b0a5136311d6..d9bd14d19e2f 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -28,7 +28,7 @@ xcbutilkeysyms, xcb-util-cursor, gtk3, - webkitgtk_4_0, + webkitgtk_4_1, python3, curl, pcre, @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { libXScrnSaver curl gtk3 - webkitgtk_4_0 + webkitgtk_4_1 freetype libGL libusb1 diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix index ca6dc376ee14..5148f1ac0e52 100644 --- a/pkgs/by-name/be/beszel/package.nix +++ b/pkgs/by-name/be/beszel/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "beszel"; - version = "0.10.2"; + version = "0.11.1"; src = fetchFromGitHub { owner = "henrygd"; repo = "beszel"; tag = "v${version}"; - hash = "sha256-yYSX58qA4vE7Bp3ADc6rIMf9yaeU7Zw7D5rmES6x6oA="; + hash = "sha256-tAi48PAHDGIZn/HMsnCq0mLpvFSqUOMocq47hooiFT8="; }; webui = buildNpmPackage { @@ -53,7 +53,7 @@ buildGoModule rec { sourceRoot = "${src.name}/beszel"; - vendorHash = "sha256-VX9mil0Hdmb85Zd9jfvm5Zz2pPQx+oAGHY+BI04bYQY="; + vendorHash = "sha256-B6mOqOgcrRn0jV9wnDgRmBvfw7I/Qy5MNYvTiaCgjBE="; preBuild = '' mkdir -p site/dist diff --git a/pkgs/by-name/be/better-commits/package.nix b/pkgs/by-name/be/better-commits/package.nix new file mode 100644 index 000000000000..b29e209e3d64 --- /dev/null +++ b/pkgs/by-name/be/better-commits/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "better-commits"; + version = "1.16.1"; + + src = fetchFromGitHub { + owner = "Everduin94"; + repo = "better-commits"; + tag = "v${version}"; + hash = "sha256-70PEcktGGck7egDmaIteFEMCNpo6ZuWyIVPiOywr2tc="; + }; + + npmDepsHash = "sha256-g34UutgT5315BpsQSuGGLIU6Ga+hpEz74HNLKKOB+ec="; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "CLI for creating better commits following the conventional commits specification"; + homepage = "https://github.com/Everduin94/better-commits"; + license = licenses.mit; + maintainers = [ maintainers.ilarvne ]; + platforms = platforms.unix; + mainProgram = "better-commits"; + }; +} diff --git a/pkgs/by-name/be/better-control/package.nix b/pkgs/by-name/be/better-control/package.nix new file mode 100644 index 000000000000..eb42e699351f --- /dev/null +++ b/pkgs/by-name/be/better-control/package.nix @@ -0,0 +1,104 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + gtk3, + bash, + networkmanager, + bluez, + brightnessctl, + power-profiles-daemon, + gammastep, + libpulseaudio, + desktop-file-utils, + wrapGAppsHook3, + gobject-introspection, + upower, + nix-update-script, +}: + +python3Packages.buildPythonApplication rec { + pname = "better-control"; + version = "6.11.6"; + pyproject = false; + + src = fetchFromGitHub { + owner = "quantumvoid0"; + repo = "better-control"; + tag = "v${version}"; + hash = "sha256-+2hY+o+GPyJHXpQFVW8BOUEiIBGQ1hItOVpA/AVas2Q="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + nativeBuildInputs = [ + desktop-file-utils + wrapGAppsHook3 + gobject-introspection + ]; + + buildInputs = [ + bash + gtk3 + ]; + + # Check src/utils/dependencies.py + runtimeDeps = [ + libpulseaudio + networkmanager + bluez + brightnessctl + power-profiles-daemon + gammastep + upower + ]; + + dependencies = with python3Packages; [ + pygobject3 + dbus-python + psutil + qrcode + requests + setproctitle + pillow + pycairo + ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + dontWrapGApps = true; + + makeWrapperArgs = [ + "\${gappsWrapperArgs[@]}" + "--prefix PATH : ${lib.makeBinPath runtimeDeps}" + ]; + + postInstall = '' + rm $out/bin/betterctl + chmod +x $out/share/better-control/better_control.py + substituteInPlace $out/bin/* \ + --replace-fail "python3 " "" + substituteInPlace $out/share/applications/better-control.desktop \ + --replace-fail "/usr/bin/" "" + ''; + + # Project has no tests + doCheck = false; + + postFixup = '' + wrapPythonProgramsIn "$out/share/better-control" "$out $pythonPath" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple control panel for linux based on GTK"; + homepage = "https://github.com/quantumvoid0/better-control"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ Rishabh5321 ]; + platforms = lib.platforms.linux; + mainProgram = "control"; # Users use both "control" and "better-control" to launch + }; +} diff --git a/pkgs/by-name/be/betula/package.nix b/pkgs/by-name/be/betula/package.nix index c78e7ad5fc15..6b6e9f67eab1 100644 --- a/pkgs/by-name/be/betula/package.nix +++ b/pkgs/by-name/be/betula/package.nix @@ -5,15 +5,15 @@ }: buildGoModule rec { pname = "betula"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromSourcehut { owner = "~bouncepaw"; repo = "betula"; rev = "v${version}"; - hash = "sha256-20sA2Hnnppr2RXqu2Qx2bkU/u9FUkH6INUUGx2zKfao="; + hash = "sha256-f2F0YRhDnKdMqcUvpcRFNAI62gbusfzIUKQSZ65onMU="; }; - vendorHash = "sha256-SWcQYF8LP6lw5kWlAVFt3qiwDnvpSOXenmdm6TSfJSc="; + vendorHash = "sha256-3PS4fIyHbGGjnbMOy2VIQBXsnIyYDKR/ecl/i5jwSVM="; env.CGO_ENABLED = 1; # These tests use internet, so are failing in Nix build. diff --git a/pkgs/by-name/be/beyond-all-reason/package.nix b/pkgs/by-name/be/beyond-all-reason/package.nix new file mode 100644 index 000000000000..65190afee71d --- /dev/null +++ b/pkgs/by-name/be/beyond-all-reason/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchurl, + appimageTools, + openal, +}: +let + version = "1.2988.0"; + pname = "beyond-all-reason"; + + src = fetchurl { + url = "https://github.com/beyond-all-reason/BYAR-Chobby/releases/download/v${version}/Beyond-All-Reason-${version}.AppImage"; + hash = "sha256-ZJW5BdxxqyrM2TJTO0SBp4BXt3ILyi77EZx73X8hqJE="; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = pkgs: [ openal ]; + + meta = { + homepage = "https://www.beyondallreason.info/"; + downloadPage = "https://www.beyondallreason.info/download"; + changelog = "https://github.com/beyond-all-reason/BYAR-Chobby/releases/tag/v${version}"; + description = "Free Real Time Strategy Game with a grand scale and full physical simulation in a sci-fi setting"; + license = lib.licenses.gpl2Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ + kiyotoko + ]; + }; +} diff --git a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix index bf6c2ce7eafc..9a9dea4594d3 100644 --- a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix +++ b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = with lib; { homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; diff --git a/pkgs/by-name/bf/bftpd/package.nix b/pkgs/by-name/bf/bftpd/package.nix index f195306c784e..414171b7aa72 100644 --- a/pkgs/by-name/bf/bftpd/package.nix +++ b/pkgs/by-name/bf/bftpd/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "bftpd"; - version = "6.2"; + version = "6.3"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-lZGFsUV6LNjkBNUpV9UYedVt1yt1qTBJUorxGt4ApsI="; + sha256 = "sha256-f7XZCSrGwmQqyf5C4xtJ46Q4SDHxbr15rDzcAK1PvB4="; }; # utmp has been replaced by utmpx since Mac OS X 10.6 (Snow Leopard): diff --git a/pkgs/by-name/bg/bgpq3/package.nix b/pkgs/by-name/bg/bgpq3/package.nix index de42af14b940..b8e46187787a 100644 --- a/pkgs/by-name/bg/bgpq3/package.nix +++ b/pkgs/by-name/bg/bgpq3/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bgpq3"; - version = "0.1.36.1"; + version = "0.1.38"; src = fetchFromGitHub { owner = "snar"; repo = "bgpq3"; rev = "v${version}"; - hash = "sha256-rOpggVlXKaf3KBhfZ2lVooDaQA0iRjSbsLXF02GEyBw="; + hash = "sha256-rqZI7yqlVHfdRTOsA5V6kzJ2TGCy8mp6yP+rzsQX9Yc="; }; meta = with lib; { diff --git a/pkgs/by-name/bi/bibiman/package.nix b/pkgs/by-name/bi/bibiman/package.nix index 5cf56994b93c..5cecc77e6938 100644 --- a/pkgs/by-name/bi/bibiman/package.nix +++ b/pkgs/by-name/bi/bibiman/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "bibiman"; - version = "0.11.4"; + version = "0.11.6"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lukeflo"; repo = "bibiman"; tag = "v${version}"; - hash = "sha256-LYoo3j3On4oCANg0acsyL7knFhOjKW0/zBVyK20knDs="; + hash = "sha256-nyONqQmS8MvgMrq6XIuMjc8FkP9wKQu+EVnQUcSAjEo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VYG9KshZ4/MIgtwmfJ+sa8PKj9dgPuNgCUgqF+XRiMA="; + cargoHash = "sha256-fdUCrf6gdZZtrL93GQMnA+4ZJ8qkjsBKJJN5u4VKE1w="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/bi/biblioteca/package.nix b/pkgs/by-name/bi/biblioteca/package.nix index 8e04e854367b..7f6d8fa5359d 100644 --- a/pkgs/by-name/bi/biblioteca/package.nix +++ b/pkgs/by-name/bi/biblioteca/package.nix @@ -101,7 +101,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://apps.gnome.org/Biblioteca/"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ bot-wxt1221 ] ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + teams = [ lib.teams.gnome-circle ]; license = lib.licenses.gpl3Only; description = "Documentation viewer for GNOME"; mainProgram = "biblioteca"; diff --git a/pkgs/by-name/bi/bic/package.nix b/pkgs/by-name/bi/bic/package.nix index 452e14250925..2a57ca0d5466 100644 --- a/pkgs/by-name/bi/bic/package.nix +++ b/pkgs/by-name/bi/bic/package.nix @@ -5,44 +5,59 @@ readline, autoreconfHook, autoconf-archive, + gcc, gmp, flex, bison, + libffi, + makeWrapper, + pkg-config, }: stdenv.mkDerivation rec { pname = "bic"; - version = "1.0.0"; + version = "1.0.0-unstable-2022-02-16"; src = fetchFromGitHub { owner = "hexagonal-sun"; repo = "bic"; - rev = "v${version}"; - sha256 = "1ws46h1ngzk14dspmsggj9535yl04v9wh8v4gb234n34rdkdsyyw"; + rev = "b224d2776fdfe84d02eb96a21880a9e4ceeb3065"; + hash = "sha256-6na7/kCXhHN7utbvXvTWr3QG4YhDww9AkilyKf71HlM="; }; buildInputs = [ readline + gcc gmp ]; + nativeBuildInputs = [ autoreconfHook autoconf-archive bison flex + gcc + libffi + makeWrapper + pkg-config ]; - meta = with lib; { + postInstall = '' + wrapProgram $out/bin/bic \ + --prefix PATH : ${lib.makeBinPath [ gcc ]} + ''; + + meta = { description = "C interpreter and API explorer"; mainProgram = "bic"; longDescription = '' bic This a project that allows developers to explore and test C-APIs using a read eval print loop, also known as a REPL. ''; - license = with licenses; [ gpl2Plus ]; + license = with lib.licenses; [ gpl2Plus ]; homepage = "https://github.com/hexagonal-sun/bic"; - platforms = platforms.unix; - maintainers = with maintainers; [ hexagonal-sun ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ hexagonal-sun ]; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; diff --git a/pkgs/by-name/bi/bicep-lsp/deps.json b/pkgs/by-name/bi/bicep-lsp/deps.json new file mode 100644 index 000000000000..4b4be16a0797 --- /dev/null +++ b/pkgs/by-name/bi/bicep-lsp/deps.json @@ -0,0 +1,1297 @@ +[ + { + "pname": "Azure.Bicep.Internal.RoslynAnalyzers", + "version": "0.1.45", + "hash": "sha256-k+eY3pA4T5lXfrhqNu3CMXPUqWs2vJjd+p6W+fHr0Fs=" + }, + { + "pname": "Azure.Bicep.Types", + "version": "0.5.110", + "hash": "sha256-3sg2vF7WDPCi4JQnQvFv/uw90RFrvjKf5SrDqATyQQs=" + }, + { + "pname": "Azure.Bicep.Types.Az", + "version": "0.2.756", + "hash": "sha256-fYnDKiUhKY0aWz1GFkUVGWnRJQdHaTzYaj6fP7nJkqs=" + }, + { + "pname": "Azure.Bicep.Types.K8s", + "version": "0.1.644", + "hash": "sha256-Zrq4vOEMfDv0rk8bc46ww/D8l4PqVba2Alhdpb50KL0=" + }, + { + "pname": "Azure.Containers.ContainerRegistry", + "version": "1.1.1", + "hash": "sha256-BC7QlrtYz74yDtTf/Kvf+Y3Vm3NEZsJLO5g5twKuxkI=" + }, + { + "pname": "Azure.Core", + "version": "1.28.0", + "hash": "sha256-mEulHd88jjFglFVTn6zVSue/aqDYWds40glal9L1af8=" + }, + { + "pname": "Azure.Core", + "version": "1.36.0", + "hash": "sha256-lokfjW2wvgFu6bALLzNmDhXIz3HXoPuGX0WfGb9hmpI=" + }, + { + "pname": "Azure.Core", + "version": "1.43.0", + "hash": "sha256-/AE7soQTyaXesI7TdGKjSlxKR6z8t9HpdlOaNUC7eEk=" + }, + { + "pname": "Azure.Core", + "version": "1.44.1", + "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk=" + }, + { + "pname": "Azure.Deployments.Core", + "version": "1.224.0", + "hash": "sha256-T6z0ZTanppSVlsPMmtSiVdNJWReAg+snvM4qvMgNNNk=" + }, + { + "pname": "Azure.Deployments.Core", + "version": "1.241.0", + "hash": "sha256-f5GLoXqPz4MQa5XLKYzNCnGq/p3nWzom0o476xnSjOA=" + }, + { + "pname": "Azure.Deployments.DiffEngine", + "version": "1.241.0", + "hash": "sha256-qdBEMoqHD9aWeb1hMQm/QctNTtct2Y1HKzejLP8LeEg=" + }, + { + "pname": "Azure.Deployments.Engine", + "version": "1.241.0", + "hash": "sha256-rOq/2I0ZErMfg/4Z3odusCIiIJHFQj6hoOqYlcmGOko=" + }, + { + "pname": "Azure.Deployments.Expression", + "version": "1.224.0", + "hash": "sha256-P0bncRi4VntjtNQHNZL02fa2tH8aho1Y0+lxvssY5AM=" + }, + { + "pname": "Azure.Deployments.Expression", + "version": "1.241.0", + "hash": "sha256-fu3gJsqarSjj6Qp2f4SDhTLU2rYtf6ld9J7ywwPVeqY=" + }, + { + "pname": "Azure.Deployments.Extensibility", + "version": "1.241.0", + "hash": "sha256-PQyUoide4V5YZpnBzu5g2grCLr7jAgek+D5Xu9AIrag=" + }, + { + "pname": "Azure.Deployments.Extensibility.Core", + "version": "0.1.55", + "hash": "sha256-u5Xo/TkFJSOeI+/T1fWuEeFVQVT4gM6pE09jhY6b2vU=" + }, + { + "pname": "Azure.Deployments.Internal.GenerateNotice", + "version": "0.1.45", + "hash": "sha256-WjFwaSY7Nsk2BJRzC2/gfEGnOttXEYYeHTNP24fi608=" + }, + { + "pname": "Azure.Deployments.JsonPath", + "version": "1.17.0", + "hash": "sha256-o0rJ3pgwijC/7h1sajlukFQOLBD5RW0d3wbXJgVvt8Q=" + }, + { + "pname": "Azure.Deployments.ResourceMetadata", + "version": "1.17.0", + "hash": "sha256-vpJNeQQw4XazLfAlgkSwhCWFZOjWkdOnTHxB1fOfv4k=" + }, + { + "pname": "Azure.Deployments.Templates", + "version": "1.224.0", + "hash": "sha256-4O4tUhuWhEQpw3UywSbUQvvTOUNION7sZHGEZ8M1xWo=" + }, + { + "pname": "Azure.Deployments.Templates", + "version": "1.241.0", + "hash": "sha256-DWvdU3ipGUg5c5kyJXzFQ4x1l60x+qsWGZ++7XHMNcI=" + }, + { + "pname": "Azure.Identity", + "version": "1.13.2", + "hash": "sha256-SCwpd4p5urStrwQqI8iNkl0oAlrarNvjzHoSodOgnBY=" + }, + { + "pname": "Azure.ResourceManager", + "version": "1.13.0", + "hash": "sha256-pWjp8mjGikgJvTXCslF/sjXURq3rB36JkiTWHYJIWV0=" + }, + { + "pname": "Azure.ResourceManager", + "version": "1.4.0", + "hash": "sha256-jwJf9JlL5JcsLkK87VeU7Y3njvZt3PoT7LIdQygGiIQ=" + }, + { + "pname": "Azure.ResourceManager.ResourceGraph", + "version": "1.0.1", + "hash": "sha256-PSazvdFwF9XwsJ3a6Df4fykDs66Vs3sDu3AbOyYgIc4=" + }, + { + "pname": "Azure.ResourceManager.Resources", + "version": "1.9.0", + "hash": "sha256-TiFfFUjDf+R7O0Tdgodk20EWshcxuwhFSAJwmOO1gFw=" + }, + { + "pname": "CommandLineParser", + "version": "2.9.1", + "hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo=" + }, + { + "pname": "Google.Protobuf", + "version": "3.29.2", + "hash": "sha256-gSnkG1pHeLJStWp2fUBRO4eJvvSFYQrbhrLvgYh30YM=" + }, + { + "pname": "Grpc.Core.Api", + "version": "2.67.0", + "hash": "sha256-e20szw18ddOV4euAfsJEHr74HIVzdfjV5pYvGpLVmn4=" + }, + { + "pname": "Grpc.Net.Client", + "version": "2.67.0", + "hash": "sha256-93Q3+bBl4Z4saeYq25uPFucrsdrm0fgFB+URiVRU6Ec=" + }, + { + "pname": "Grpc.Net.Common", + "version": "2.67.0", + "hash": "sha256-czx/y3JgMmxXPL/LkqFcjXhAZRllFTW2rTnm7iLtSI4=" + }, + { + "pname": "Grpc.Tools", + "version": "2.69.0", + "hash": "sha256-3nye4UcU2J7tnruKhoacD0S+fPN6d0A34K1yxlYrfxI=" + }, + { + "pname": "Humanizer.Core", + "version": "2.14.1", + "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o=" + }, + { + "pname": "IPNetwork2", + "version": "2.6.548", + "hash": "sha256-6N61UG/WrJWNv+bO/l9BNWA17iPIMn5G4J7maw54UPg=" + }, + { + "pname": "IPNetwork2", + "version": "2.6.598", + "hash": "sha256-FPjItZbaf5gJYP6lORQITPqWnwHN0WDLvq+v4Hmc3Q4=" + }, + { + "pname": "JetBrains.Annotations", + "version": "2019.1.3", + "hash": "sha256-gn2Z7yANT+2tnK+qbOA2PviRf1M1VtvamABGajgGC6E=" + }, + { + "pname": "JetBrains.Annotations", + "version": "2024.3.0", + "hash": "sha256-BQYhE7JDJ9Bw588KyWzOvQFvQTiRa0K9maVkI9lZgBc=" + }, + { + "pname": "Json.More.Net", + "version": "2.0.1.2", + "hash": "sha256-fnp/By8n8xKa8bhvUbO2p8rlze5AvgA+z9ZvWEpL/Ls=" + }, + { + "pname": "Json.More.Net", + "version": "2.1.0", + "hash": "sha256-AdQdfQa4nD5e1QCwiEiJOn/DGs5ogyaaTwN+14E/bho=" + }, + { + "pname": "JsonDiffPatch.Net", + "version": "2.1.0", + "hash": "sha256-lyUOusPMv1ZF3EcrEFG4Fze603CVPxLwOPmTVOy/HmU=" + }, + { + "pname": "JsonPatch.Net", + "version": "3.1.0", + "hash": "sha256-bvCOOiH2SruZXF+jPYlAaEkinZ040YDp9QjP3QXlCbc=" + }, + { + "pname": "JsonPatch.Net", + "version": "3.3.0", + "hash": "sha256-o9AHT43llgnlTIiQ+7YrZ5b06BDj9EExDuT3slHJ7qA=" + }, + { + "pname": "JsonPath.Net", + "version": "1.1.0", + "hash": "sha256-FQGPodaxHwyfRN3HhEl7N39SKsn922FiZAiDzKOYxUo=" + }, + { + "pname": "JsonPath.Net", + "version": "2.0.1", + "hash": "sha256-4UWnu5iTzOupiGYR6X9xoDQoF2KMJ30h2sn0p5TfUu4=" + }, + { + "pname": "JsonPointer.Net", + "version": "5.0.0", + "hash": "sha256-OCeXHpJyHJSyh2vpnrY8nSuM4u3eNXtN6YXnJZyHnWc=" + }, + { + "pname": "JsonPointer.Net", + "version": "5.2.0", + "hash": "sha256-Bn5AtyUxOz+p8JShDvfpzetWqscXwc/MJ85FcYXL9yQ=" + }, + { + "pname": "JsonSchema.Net", + "version": "7.0.4", + "hash": "sha256-sCaGr8m20DzNEkF3TS7Cb+wmvo3hYZPZwQ2bTqwlB5g=" + }, + { + "pname": "MediatR", + "version": "8.1.0", + "hash": "sha256-dyqhDG1NJjY1b+dj37sMmklGkxAm3zKdhh2lBJ0/HTM=" + }, + { + "pname": "Microsoft.AspNet.WebApi.Client", + "version": "6.0.0", + "hash": "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo=" + }, + { + "pname": "Microsoft.Automata.SRM", + "version": "1.2.2", + "hash": "sha256-cVVxKqguV48WRuk2HyRP5A2b4kZd3nSVY3rMe0SRSQw=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "1.1.1", + "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "5.0.0", + "hash": "sha256-bpJjcJSUSZH0GeOXoZI12xUQOf2SRtxG7sZV0dWS5TI=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "6.0.0", + "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "7.0.0", + "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "8.0.0", + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" + }, + { + "pname": "Microsoft.Build.Tasks.Git", + "version": "8.0.0", + "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" + }, + { + "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", + "version": "3.3.4", + "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "6.0.1", + "hash": "sha256-v55PAURxnSGYgbv9x+4/pMeI51H27ikRfHBuUB+N5nE=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "8.0.0", + "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "9.0.2", + "hash": "sha256-AUNaLhYTcHUkqKGhSL7QgrifV9JkjKhNQ4Ws8UtZhlM=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "6.0.0", + "hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "8.0.0", + "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.0", + "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.1", + "hash": "sha256-r3iWP+kwKo4Aib8SGo91kKWR5WusLrbFHUAw5uKQeNA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.2", + "hash": "sha256-icRtfbi0nDRUYDErtKYx0z6A1gWo5xdswsSM6o4ozxc=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "6.0.0", + "hash": "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "8.0.0", + "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "9.0.1", + "hash": "sha256-uq6i0gTobSTqaNm/0XZuv8GGjFpnvgwXnCCPWl9FP9g=" + }, + { + "pname": "Microsoft.Extensions.Configuration.FileExtensions", + "version": "9.0.0", + "hash": "sha256-PsLo6mrLGYfbi96rfCG8YS1APXkUXBG4hLstpT60I4s=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Json", + "version": "9.0.0", + "hash": "sha256-qQn7Ol0CvPYuyecYWYBkPpTMdocO7I6n+jXQI2udzLI=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "6.0.1", + "hash": "sha256-V+CulDoU3NXWn5EjH64JhDVQ0h+ev5BW95T+2uL1hU4=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "8.0.1", + "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "9.0.2", + "hash": "sha256-jNQVj2Xo7wzVdNDu27bLbYCVUOF8yDVrFtC3cZ9OsXo=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "6.0.0", + "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.2", + "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.2", + "hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics", + "version": "8.0.1", + "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "8.0.1", + "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "9.0.0", + "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Physical", + "version": "9.0.0", + "hash": "sha256-IzFpjKHmF1L3eVbFLUZa2N5aH3oJkJ7KE1duGIS7DP8=" + }, + { + "pname": "Microsoft.Extensions.FileSystemGlobbing", + "version": "9.0.0", + "hash": "sha256-eBLa8pW/y/hRj+JbEr340zbHRABIeFlcdqE0jf5/Uhc=" + }, + { + "pname": "Microsoft.Extensions.Http", + "version": "8.0.1", + "hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o=" + }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "6.0.0", + "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk=" + }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "8.0.1", + "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "6.0.0", + "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.2", + "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" + }, + { + "pname": "Microsoft.Extensions.ObjectPool", + "version": "5.0.10", + "hash": "sha256-tAjiU3w0hdPAGUitszxZ6jtEilRn977MY7N5eZMx0x0=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "6.0.0", + "hash": "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "8.0.2", + "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" + }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "6.0.0", + "hash": "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw=" + }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "8.0.0", + "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "5.0.1", + "hash": "sha256-e4uoLnUSmON4If9qJh78+4z14IzW9qCu5YkqLdQqWQU=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "6.0.0", + "hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "8.0.0", + "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.0", + "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.1", + "hash": "sha256-tdbtoC7eQGW5yh66FWCJQqmFJkNJD+9e6DDKTs7YAjs=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.2", + "hash": "sha256-zy/YNMaY47o6yNv2WuYiAJEjtoOF8jlWgsWHqXeSm4s=" + }, + { + "pname": "Microsoft.Identity.Client", + "version": "4.67.2", + "hash": "sha256-E8i4RE7TUVna5RlN/o6ALR7hBLk8yXLQwZm2m5gygW4=" + }, + { + "pname": "Microsoft.Identity.Client.Extensions.Msal", + "version": "4.67.2", + "hash": "sha256-NhOz/8A2S5UT55BSNCWsMz3YSjy4lF3rhdYuTrXIYLQ=" + }, + { + "pname": "Microsoft.IdentityModel.Abstractions", + "version": "6.35.0", + "hash": "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.1", + "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "3.1.0", + "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "5.0.0", + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.3", + "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=" + }, + { + "pname": "Microsoft.PowerPlatform.ResourceStack", + "version": "7.0.0.2076", + "hash": "sha256-SZ1T6ir1vBQMbRqhA2gujxjz01nWnf5wtrAJHVxd/Jo=" + }, + { + "pname": "Microsoft.PowerPlatform.ResourceStack", + "version": "7.0.0.2080", + "hash": "sha256-dABBbYNretOIfVcvt437VZGPpBe4IYsAfkDMamJf2j0=" + }, + { + "pname": "Microsoft.SourceLink.Common", + "version": "8.0.0", + "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=" + }, + { + "pname": "Microsoft.SourceLink.GitHub", + "version": "8.0.0", + "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" + }, + { + "pname": "Microsoft.VisualStudio.Threading", + "version": "17.12.19", + "hash": "sha256-4lriaeIL8wbirIvT1sxLTsL8dny+0Puq+OFxrp/4nng=" + }, + { + "pname": "Microsoft.VisualStudio.Threading", + "version": "17.6.40", + "hash": "sha256-5HtsgSPV5RdaPREGDvJ7qMOFubb1wMyHwkfTnZs9Zsc=" + }, + { + "pname": "Microsoft.VisualStudio.Threading.Analyzers", + "version": "17.13.2", + "hash": "sha256-pfhN5HDSWbo6hmlSnCVWvnkYTqSjs8PNtSyHCEEtUjI=" + }, + { + "pname": "Microsoft.VisualStudio.Validation", + "version": "17.6.11", + "hash": "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM=" + }, + { + "pname": "Microsoft.VisualStudio.Validation", + "version": "17.8.8", + "hash": "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "4.7.0", + "hash": "sha256-+jWCwRqU/J/jLdQKDFm93WfIDrDMXMJ984UevaQMoi8=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, + { + "pname": "Microsoft.Win32.Registry.AccessControl", + "version": "8.0.0", + "hash": "sha256-F2/VVsc5c3RpsraXAx63P8OdZA61Hh1HbirYI3U1FT4=" + }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "8.0.0", + "hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ=" + }, + { + "pname": "Microsoft.Windows.Compatibility", + "version": "8.0.10", + "hash": "sha256-VlLNyPBhHsg96Oq3Z8/bxK0iaSQqiUsQ+hQo3rGD3FU=" + }, + { + "pname": "Nerdbank.GitVersioning", + "version": "3.7.112", + "hash": "sha256-vrItlaH5MpBHa4MI1cQgI11NAe4W3XsxR9DizFE7fus=" + }, + { + "pname": "Nerdbank.GitVersioning", + "version": "3.7.115", + "hash": "sha256-sqn+i7vvBgBUtm7j82mH+SpApgI2hsmL5DYfLm1Z7gw=" + }, + { + "pname": "Nerdbank.Streams", + "version": "2.10.69", + "hash": "sha256-a0hXKhR7dv6Vm4rlUOD2ffBKG49CC3wzXLCHeTz1ms4=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" + }, + { + "pname": "Newtonsoft.Json.Bson", + "version": "1.0.2", + "hash": "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA=" + }, + { + "pname": "OmniSharp.Extensions.JsonRpc", + "version": "0.19.9", + "hash": "sha256-n/DjyqXDVxWIPZZ/kdNak7gTFD6638bJtvW3hrEZFWU=" + }, + { + "pname": "OmniSharp.Extensions.JsonRpc.Generators", + "version": "0.19.9", + "hash": "sha256-38+lTizxqeBkWp6ZvMOe2dVsCG1PbQXjXgerXAsK+zw=" + }, + { + "pname": "OmniSharp.Extensions.LanguageProtocol", + "version": "0.19.9", + "hash": "sha256-L1O76h4n+qYDCvnKS3j3rwHDW60S4b7s8Cgg8sBbogw=" + }, + { + "pname": "OmniSharp.Extensions.LanguageServer", + "version": "0.19.9", + "hash": "sha256-cGIRuIqUl3pKfYpeT2mY4RigbZOa2yGf1itbSFydZW0=" + }, + { + "pname": "OmniSharp.Extensions.LanguageServer.Shared", + "version": "0.19.9", + "hash": "sha256-S27e9BjRaaVcbUle+MF0nRxjHS/fIhNqDyr3aBZyiog=" + }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" + }, + { + "pname": "runtime.linux-arm.runtime.native.System.IO.Ports", + "version": "8.0.0", + "hash": "sha256-m5+od7ZhlzImwSE9E7Qq1nH3A3muXwCnsvrVUoJ7+WE=" + }, + { + "pname": "runtime.linux-arm64.runtime.native.System.IO.Ports", + "version": "8.0.0", + "hash": "sha256-IgbG3HT3A0VItWl5asE7Hk0zaQjQneKQS9f65cQAjLI=" + }, + { + "pname": "runtime.linux-x64.runtime.native.System.IO.Ports", + "version": "8.0.0", + "hash": "sha256-44oujSHhc0Nl2WCvLYkScrAyqNAlbGfOnlzPwCofwlA=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.Data.SqlClient.sni", + "version": "4.7.0", + "hash": "sha256-cj0+BpmoibwOWj2wNXwONJeTGosmFwhD349zPjNaBK0=" + }, + { + "pname": "runtime.native.System.IO.Ports", + "version": "8.0.0", + "hash": "sha256-BqExVU/zHj7o++mzOpY9y+i9yZZVbcGmO/D4mRzigY8=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.osx-arm64.runtime.native.System.IO.Ports", + "version": "8.0.0", + "hash": "sha256-oFMF60yyTy3fXwLlXJkNUtzdRz4EyxevAUIcfcVESCE=" + }, + { + "pname": "runtime.osx-x64.runtime.native.System.IO.Ports", + "version": "8.0.0", + "hash": "sha256-b2J9DcunMtChpuyNC0XN39Z01Wr738HI/syJW1n9bfE=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + }, + { + "pname": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni", + "version": "4.4.0", + "hash": "sha256-8xGiqk5g4kM79//SirozmDtDpqwVXH3CmvIs7GNwfh0=" + }, + { + "pname": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni", + "version": "4.4.0", + "hash": "sha256-HoXKGBkue0RJT1SZxAliVmT5rbfU3xD8mH8hfCvRxwQ=" + }, + { + "pname": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni", + "version": "4.4.0", + "hash": "sha256-jPnWzDcbufO51GLGjynWHy0b+5PBqNxM+VKmSrObeUw=" + }, + { + "pname": "Semver", + "version": "3.0.0", + "hash": "sha256-nX5ka27GY6pz9S73H6sLSQCrnAyyI9xDVdzrtlMp4BQ=" + }, + { + "pname": "SharpYaml", + "version": "2.1.1", + "hash": "sha256-KSs7993j0VJxSDx/VpruMQFnnjP4CzvzPLlIfDEwOpw=" + }, + { + "pname": "Sprache.StrongNamed", + "version": "2.3.2", + "hash": "sha256-q6G1Y1/oellt0ABex7UQZdc0ACEBKFT6Ah+mNIHWyVw=" + }, + { + "pname": "System.ClientModel", + "version": "1.1.0", + "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM=" + }, + { + "pname": "System.CodeDom", + "version": "8.0.0", + "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Immutable", + "version": "1.6.0", + "hash": "sha256-gnu+8nN48GAd4GRgeB5cAQmW7VnCubL/8h7zO377fd0=" + }, + { + "pname": "System.Collections.Immutable", + "version": "5.0.0", + "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8=" + }, + { + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + }, + { + "pname": "System.ComponentModel.Composition", + "version": "8.0.0", + "hash": "sha256-MnKdjE/qIvAmEeRc3gOn5uJhT0TI3UnUJPjj3TLHFQo=" + }, + { + "pname": "System.ComponentModel.Composition.Registration", + "version": "8.0.0", + "hash": "sha256-m0DmAA1V3/sbvy0YFrQeODAXGGPMmBExHYlAyZlE6j8=" + }, + { + "pname": "System.Configuration.ConfigurationManager", + "version": "8.0.1", + "hash": "sha256-2vgU/BBFDOO2506UX6mtuBQ9c2bCShLLhoy67l7418E=" + }, + { + "pname": "System.Data.Odbc", + "version": "8.0.1", + "hash": "sha256-LmqokSy9D1SDDFiezsOKyhT47vHwAbRqVX68Alp/uwk=" + }, + { + "pname": "System.Data.OleDb", + "version": "8.0.1", + "hash": "sha256-umcrU6CFFItewo5y2JYsBFM5lu45r0f9Jkh/3g9xtto=" + }, + { + "pname": "System.Data.SqlClient", + "version": "4.8.6", + "hash": "sha256-Qc/yco3e0+6jP8UiMA0ERlfSEKdINv0BmHixh9Z8fJQ=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.6.0", + "hash": "sha256-CXjadDqpxzYqiZzF6t3Wl6Fum+8U1/cjmEBCkzxw7h4=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "6.0.0", + "hash": "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "6.0.1", + "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "8.0.1", + "hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo=" + }, + { + "pname": "System.Diagnostics.EventLog", + "version": "8.0.1", + "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA=" + }, + { + "pname": "System.Diagnostics.PerformanceCounter", + "version": "8.0.1", + "hash": "sha256-B+rMR/+8rOA9/5PV77d8LUQyZdlL04+H2zLJMBHic4Q=" + }, + { + "pname": "System.DirectoryServices", + "version": "8.0.0", + "hash": "sha256-a6ECGvsDqHPZuaG920zMjcCOBD2Kvg8jWpSacgL4a7A=" + }, + { + "pname": "System.DirectoryServices.AccountManagement", + "version": "8.0.1", + "hash": "sha256-dtsdt9e1VJZbTshj7AC2k3gQ+0qGmv5haRhHkCjHm6M=" + }, + { + "pname": "System.DirectoryServices.Protocols", + "version": "8.0.0", + "hash": "sha256-Hq3/Y2QpZlJUY52W6WYpiUSQsiMWlxvevLBF+icpGzo=" + }, + { + "pname": "System.Drawing.Common", + "version": "8.0.10", + "hash": "sha256-GOmBRym8DI9J3t2apGV0fTdpTgFL3hCJtzeUvgDDGD4=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Abstractions", + "version": "21.3.1", + "hash": "sha256-Y6lE9xWEEztnNGo03ME+YJrPUMed2C5M4MNek7tajjA=" + }, + { + "pname": "System.IO.Packaging", + "version": "8.0.1", + "hash": "sha256-xf0BAfqQvITompBsvfpxiLts/6sRQEzdjNA3f/q/vY4=" + }, + { + "pname": "System.IO.Pipelines", + "version": "7.0.0", + "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY=" + }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.0", + "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" + }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.2", + "hash": "sha256-uxM7J0Q/dzEsD0NGcVBsOmdHiOEawZ5GNUKBwpdiPyE=" + }, + { + "pname": "System.IO.Ports", + "version": "8.0.0", + "hash": "sha256-G8j9c0erBzZfJAVlW08XoE58gPhiNWJE78sFaBV2e4Q=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Management", + "version": "8.0.0", + "hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0=" + }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, + { + "pname": "System.Memory.Data", + "version": "1.0.2", + "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0=" + }, + { + "pname": "System.Memory.Data", + "version": "6.0.0", + "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" + }, + { + "pname": "System.Memory.Data", + "version": "9.0.2", + "hash": "sha256-2b8t6eeX/3JUDTD4oxsbSD2+2NV87P/a5S0YuNPWRwM=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, + { + "pname": "System.Private.ServiceModel", + "version": "4.10.0", + "hash": "sha256-SIUm4sBAdr1cVtGIXC6sHI6nBi0NWQ6Tuo4TSXaFiAA=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.2", + "hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU=" + }, + { + "pname": "System.Reactive", + "version": "6.0.0", + "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Context", + "version": "8.0.0", + "hash": "sha256-4ArfguTY4FmbNccexnqwMpmTkDHlA5sCczQ5Ri5kA94=" + }, + { + "pname": "System.Reflection.DispatchProxy", + "version": "4.7.1", + "hash": "sha256-Oi+l32p73ZxwcB6GrSS2m25BccfpuwbY4eyFEwUe0IM=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.7.0", + "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.1", + "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0=" + }, + { + "pname": "System.Runtime.Caching", + "version": "8.0.1", + "hash": "sha256-Uj9k5meIDXlEm8V5MWyzaWz4YA+8OWHE5K8kMq0kTR4=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.2", + "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Security.AccessControl", + "version": "4.7.0", + "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" + }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.Cryptography.Pkcs", + "version": "8.0.1", + "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "4.5.0", + "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "8.0.0", + "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=" + }, + { + "pname": "System.Security.Cryptography.Xml", + "version": "8.0.2", + "hash": "sha256-9TCmVyMB4+By/ipU8vdYDtSnw1tkkebnXXVRdT78+28=" + }, + { + "pname": "System.Security.Permissions", + "version": "8.0.0", + "hash": "sha256-+YUPY+3HnTmfPLZzr+5qEk0RqalCbFZBgLXee1yCH1M=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.7.0", + "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "5.0.0", + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "System.ServiceModel.Duplex", + "version": "4.10.0", + "hash": "sha256-vDnBmdc/douzYpyRYihpoRNepi0tDWDLyNfhYjslewY=" + }, + { + "pname": "System.ServiceModel.Http", + "version": "4.10.0", + "hash": "sha256-LX217zvhSEgj2lXPUZjuY55e16/2BfiDyHf5IvP7zaw=" + }, + { + "pname": "System.ServiceModel.NetTcp", + "version": "4.10.0", + "hash": "sha256-lFhHA3n2Antyx/CfhDaxLP9ViHofAnN4asKA/hIAO2s=" + }, + { + "pname": "System.ServiceModel.Primitives", + "version": "4.10.0", + "hash": "sha256-3AzRMkvZ/44Gfcsx/RKH7k4Yb74WFJSPr9CelyIFK6g=" + }, + { + "pname": "System.ServiceModel.Security", + "version": "4.10.0", + "hash": "sha256-XB+Zpv2+ahf1mRomy/6eLiZ/vLpT4HhFPUMPfU/2H9Y=" + }, + { + "pname": "System.ServiceModel.Syndication", + "version": "8.0.0", + "hash": "sha256-vKgiDGQBcaEQiWpfU6kGRtlJslBQXtFGqF+EVk/u7kI=" + }, + { + "pname": "System.ServiceProcess.ServiceController", + "version": "8.0.1", + "hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8=" + }, + { + "pname": "System.Speech", + "version": "8.0.0", + "hash": "sha256-ogtnRBUcTruWZ0NVivKUupkVPAINigOBuJ0Gv/T1wQk=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "8.0.0", + "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "4.7.2", + "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "6.0.0", + "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.0", + "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.2", + "hash": "sha256-tZhc/Xe+SF9bCplthph2QmQakWxKVjMfQJZzD1Xbpg8=" + }, + { + "pname": "System.Text.Json", + "version": "4.7.2", + "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" + }, + { + "pname": "System.Text.Json", + "version": "6.0.10", + "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" + }, + { + "pname": "System.Text.Json", + "version": "6.0.9", + "hash": "sha256-5jjvxV8ubGYjkydDhLsGZXB6ml3O/7CGauQcu1ikeLs=" + }, + { + "pname": "System.Text.Json", + "version": "8.0.5", + "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.0", + "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.2", + "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.1", + "hash": "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM=" + }, + { + "pname": "System.Threading.AccessControl", + "version": "8.0.0", + "hash": "sha256-8ugqZSyqfTfIBt4xcLdvb6BmBTHWFsGATkasNvsEtJQ=" + }, + { + "pname": "System.Threading.Channels", + "version": "6.0.0", + "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, + { + "pname": "System.Web.Services.Description", + "version": "4.10.0", + "hash": "sha256-zpx/LCb2ofqdR0Z8KOqYI2xkuacv2wASKPZ06gesgog=" + }, + { + "pname": "System.Windows.Extensions", + "version": "8.0.0", + "hash": "sha256-aHkz7LtmUDDRS7swQM0i6dDVUytRCMYeA2CfaeVA2Y0=" + }, + { + "pname": "TestableIO.System.IO.Abstractions", + "version": "21.3.1", + "hash": "sha256-qd1RLqBoX4uI58gsb2BiIrUEOL6nrhlXs9L7toFbgjk=" + }, + { + "pname": "TestableIO.System.IO.Abstractions.Wrappers", + "version": "21.3.1", + "hash": "sha256-+z1R4Kn0hwjGQ6vC7NIgDS7/ccGd1/wy5sjmjvXCIIQ=" + } +] diff --git a/pkgs/by-name/bi/bicep-lsp/package.nix b/pkgs/by-name/bi/bicep-lsp/package.nix new file mode 100644 index 000000000000..9fdb1381dc86 --- /dev/null +++ b/pkgs/by-name/bi/bicep-lsp/package.nix @@ -0,0 +1,57 @@ +{ + autoPatchelfHook, + buildDotnetModule, + coreutils, + dotnetCorePackages, + fetchFromGitHub, + icu, + lib, + libkrb5, + openssl, + stdenv, +}: + +buildDotnetModule rec { + pname = "bicep-lsp"; + version = "0.34.44"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "bicep"; + tag = "v${version}"; + hash = "sha256-vyPRLPTvQkwN7unlIHs6DvpjXnXyW1PDtH9hhIOgN1A="; + }; + + projectFile = "src/Bicep.LangServer/Bicep.LangServer.csproj"; + + postPatch = '' + substituteInPlace global.json --replace-warn "8.0.406" "${dotnetCorePackages.sdk_8_0.version}" + ''; + + nugetDeps = ./deps.json; + + # From: https://github.com/Azure/bicep/blob/v0.34.44/global.json#L7 + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + buildInputs = lib.optionals stdenv.isLinux [ + icu + libkrb5 + openssl + stdenv.cc.cc.lib + ]; + + doCheck = !(stdenv.isDarwin && stdenv.isAarch64); # mono is not available on aarch64-darwin + + meta = { + description = "Domain Specific Language (DSL) for deploying Azure resources declaratively"; + homepage = "https://github.com/Azure/bicep/"; + changelog = "https://github.com/Azure/bicep/releases/tag/v${version}"; + license = lib.licenses.mit; + teams = [ lib.teams.stridtech ]; + platforms = lib.platforms.all; + badPlatforms = [ "aarch64-linux" ]; + }; +} diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index ee9dcb13c301..0b87a3f4aa14 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -56,7 +56,8 @@ buildDotnetModule rec { homepage = "https://github.com/Azure/bicep/"; changelog = "https://github.com/Azure/bicep/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ khaneliman ] ++ lib.teams.stridtech.members; + maintainers = [ ]; + teams = [ lib.teams.stridtech ]; mainProgram = "bicep"; }; } diff --git a/pkgs/by-name/bi/biff/package.nix b/pkgs/by-name/bi/biff/package.nix new file mode 100644 index 000000000000..496db4a2298d --- /dev/null +++ b/pkgs/by-name/bi/biff/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + rustPlatform, + versionCheckHook, + withLocaleSupport ? true, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "biff"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "BurntSushi"; + repo = "biff"; + tag = finalAttrs.version; + hash = "sha256-SkrPn6reekoJkKsMH2pB1FtYwObUcmA2W0wVvkbzTEE="; + }; + + buildFeatures = lib.optional withLocaleSupport "locale"; + + cargoHash = "sha256-x8nieQ1X5BLDTjYh67ApWDoS6chLy2DYAehgnPnhrVk="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command line tool for datetime arithmetic, parsing, formatting and more"; + homepage = "https://github.com/BurntSushi/biff"; + changelog = "https://github.com/BurntSushi/biff/blob/${finalAttrs.version}/CHANGELOG.md"; + license = [ + lib.licenses.mit + lib.licenses.unlicense + ]; + maintainers = [ lib.maintainers.kpbaks ]; + mainProgram = "biff"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/bi/bigloo/package.nix b/pkgs/by-name/bi/bigloo/package.nix index 054acfa7c8f1..961716f0564a 100644 --- a/pkgs/by-name/bi/bigloo/package.nix +++ b/pkgs/by-name/bi/bigloo/package.nix @@ -6,17 +6,16 @@ automake, libtool, gmp, - darwin, libunistring, }: stdenv.mkDerivation rec { pname = "bigloo"; - version = "4.5b"; + version = "4.6a"; src = fetchurl { - url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-${version}.tar.gz"; - sha256 = "sha256-hk1SXuan/zOf2ajJc8xGv5piOjgn2Ev7bgSikiNwfaU="; + url = "https://www-sop.inria.fr/mimosa/fp/Bigloo/download/bigloo-${version}.tar.gz"; + hash = "sha256-lwXsPeAMwcUe52mYlIQaN3DAaodCFbRWNbiESuba8KY="; }; nativeBuildInputs = [ @@ -26,7 +25,6 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.ApplicationServices libunistring ]; diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix index 0ce69cbcb605..868ae0174df0 100644 --- a/pkgs/by-name/bi/bilibili/sources.nix +++ b/pkgs/by-name/bi/bilibili/sources.nix @@ -1,6 +1,6 @@ # Generated by ./update.sh - do not update manually! { - version = "1.16.3-2"; - arm64-hash = "sha256-lVRo4w4+Hj1lDXtxUD0DnerOGeV33tdG8iZZnVWtVjc="; - x86_64-hash = "sha256-PAQ7B8jVDwb1qVJLFFSylL7Oh95Fe8LbgD0OcC1Xez8="; + version = "1.16.4-1"; + arm64-hash = "sha256-x+sVupWT8CrEPSTOJFW1DYuc3tuVepHXjRF7+8NdTbw="; + x86_64-hash = "sha256-zMw8NfeLNMBbJZqoZeNy9j65otJ8iWnq79PLqzlR+6I="; } diff --git a/pkgs/by-name/bi/bililiverecorder/package.nix b/pkgs/by-name/bi/bililiverecorder/package.nix index 6fdd6a636ab4..990ea12d4579 100644 --- a/pkgs/by-name/bi/bililiverecorder/package.nix +++ b/pkgs/by-name/bi/bililiverecorder/package.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "bililiverecorder"; - version = "2.15.2"; + version = "2.17.0"; src = fetchzip { url = "https://github.com/BililiveRecorder/BililiveRecorder/releases/download/v${version}/BililiveRecorder-CLI-any.zip"; - hash = "sha256-cbyeMpbPKr9m8o6EaioNIkEleGTQ9ZkYkRyJiX079BA="; + hash = "sha256-6ucOngVWbtPQ1HTNrmbd15JTuzOPMt0Bj4QaoqUEUDQ="; stripRoot = false; }; diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix index ef5e300418e8..b1c9126cdb5b 100644 --- a/pkgs/by-name/bi/binary/package.nix +++ b/pkgs/by-name/bi/binary/package.nix @@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/fizzyizzy05/binary"; changelog = "https://github.com/fizzyizzy05/binary/releases/tag/${version}"; license = lib.licenses.gpl3Plus; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; mainProgram = "binary"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix index 2162a141318b..a9563ea30631 100644 --- a/pkgs/by-name/bi/binaryninja-free/package.nix +++ b/pkgs/by-name/bi/binaryninja-free/package.nix @@ -19,11 +19,11 @@ }: stdenv.mkDerivation rec { pname = "binaryninja-free"; - version = "4.2.6455"; + version = "5.0.7290"; src = fetchurl { - url = "https://web.archive.org/web/20241209150225/https://cdn.binary.ninja/installers/binaryninja_free_linux.zip"; - hash = "sha256-NOVuLmko8iYcJ/0fr0DNw7xPEC8EhT/SzcFWtNmjlYI="; + url = "https://web.archive.org/web/20250426133400/https://cdn.binary.ninja/installers/binaryninja_free_linux.zip"; + hash = "sha256-Fzdv+454Ajj8IxmdcxvcDGePFsTmmyPpnfBXge4p8iU="; }; icon = fetchurl { @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { ''; meta = { + changelog = "https://binary.ninja/changelog/#${lib.replaceStrings [ "." ] [ "-" ] version}"; description = "Interactive decompiler, disassembler, debugger"; homepage = "https://binary.ninja/"; license = { diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix index 23426039e3c4..f969a14feaef 100644 --- a/pkgs/by-name/bi/bind/package.nix +++ b/pkgs/by-name/bi/bind/package.nix @@ -3,7 +3,6 @@ lib, fetchurl, removeReferencesTo, - darwin, perl, pkg-config, libcap, @@ -28,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bind"; - version = "9.20.6"; + version = "9.20.9"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-7X9UtE+EpyAaL6epSfMCHqVoUpv62Q/KZk/VXAUQQTQ="; + hash = "sha256-PSaQDtnJqFkHP/6puX4pLBJI2tGCebF7BfyyPDCR+G0="; }; outputs = [ @@ -66,8 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux libcap ++ lib.optional enableGSSAPI libkrb5 - ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])); depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -138,13 +136,16 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests = { - withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; }; - inherit (nixosTests) bind; - prometheus-exporter = nixosTests.prometheus-exporters.bind; - kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node; - kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node; - }; + tests = + { + withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; }; + inherit (nixosTests) bind; + prometheus-exporter = nixosTests.prometheus-exporters.bind; + } + // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node; + kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node; + }; updateScript = gitUpdater { # No nicer place to find latest stable release. @@ -162,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://downloads.isc.org/isc/bind9/cur/${lib.versions.majorMinor finalAttrs.version}/doc/arm/html/notes.html#notes-for-bind-${ lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version }"; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; outputsToInstall = [ diff --git a/pkgs/by-name/bi/bingo/package.nix b/pkgs/by-name/bi/bingo/package.nix index 10da22668ad9..b5c7235b9367 100644 --- a/pkgs/by-name/bi/bingo/package.nix +++ b/pkgs/by-name/bi/bingo/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "bingo"; version = "0.9.0"; src = fetchFromGitHub { owner = "bwplotka"; repo = "bingo"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bzh6P+J8EoewjOofwWXMgtSXAhESetD3y9EiqLNOT54="; }; @@ -35,4 +35,4 @@ buildGoModule rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aaronjheng ]; }; -} +}) diff --git a/pkgs/by-name/bi/binocle/package.nix b/pkgs/by-name/bi/binocle/package.nix new file mode 100644 index 000000000000..8c35e3ff33c2 --- /dev/null +++ b/pkgs/by-name/bi/binocle/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + makeWrapper, + xorg, + vulkan-loader, +}: + +rustPlatform.buildRustPackage rec { + pname = "binocle"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-WAk7xIrCRfVofn4w+gP5E3wnSZbXm/6MZWlNmtoLm20="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-AUmDubbi6y1SaHZazr2xZc+16SQhI6WBnPg6I7rv3K4="; + + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + wrapProgram $out/bin/binocle \ + --suffix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath ( + with xorg; + [ + libX11 + libXcursor + libXi + libXrandr + ] + ++ [ vulkan-loader ] + ) + } + ''; + + meta = with lib; { + description = "Graphical tool to visualize binary data"; + mainProgram = "binocle"; + homepage = "https://github.com/sharkdp/binocle"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix index e1fdd004f087..2ab6721f8c36 100644 --- a/pkgs/by-name/bi/binsider/package.nix +++ b/pkgs/by-name/bi/binsider/package.nix @@ -1,6 +1,5 @@ { lib, - darwin, rustPlatform, fetchFromGitHub, stdenv, @@ -21,14 +20,6 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreServices - ] - ); - checkType = "debug"; checkFlags = [ "--skip=test_extract_strings" diff --git a/pkgs/by-name/bi/binwalk/package.nix b/pkgs/by-name/bi/binwalk/package.nix index 538c23dcf9af..69b3d8405d18 100644 --- a/pkgs/by-name/bi/binwalk/package.nix +++ b/pkgs/by-name/bi/binwalk/package.nix @@ -33,55 +33,44 @@ xz, zlib, zstd, - _7zz, + p7zip, + makeBinaryWrapper, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "binwalk"; version = "3.1.0"; src = fetchFromGitHub { owner = "ReFirmLabs"; repo = "binwalk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-em+jOnhCZH5EEJrhXTHmxiwpMcBr5oNU1+5IJ1H/oco="; }; useFetchCargoVendor = true; cargoHash = "sha256-cnJVeuvNNApEHqgZDcSgqkH3DKAr8+HkqXUH9defTCA="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + makeBinaryWrapper + ]; # https://github.com/ReFirmLabs/binwalk/commits/master/dependencies buildInputs = [ bzip2 - cabextract - dmg2img dtc - dumpifs fontconfig - gnutar - jefferson - lzfse lzo - lzop - lz4 openssl_3 python3.pkgs.python-lzo - sasquatch - sleuthkit - srec2bin - ubi_reader ucl - uefi-firmware-parser - unyaffs unzip - vmlinux-to-elf xz zlib - zstd - _7zz - ] ++ lib.optionals enableUnfree [ unrar ]; + ]; + + dontUseCargoParallelTests = true; # skip broken tests checkFlags = @@ -110,10 +99,37 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; versionCheckProgramArg = "-V"; + postInstall = '' + wrapProgram $out/bin/binwalk --suffix PATH : ${ + lib.makeBinPath ( + [ + p7zip + cabextract + dmg2img + dumpifs + jefferson + vmlinux-to-elf + lz4 + lzfse + lzop + sasquatch + srec2bin + gnutar + sleuthkit + ubi_reader + uefi-firmware-parser + unyaffs + zstd + ] + ++ lib.optionals enableUnfree [ unrar ] + ) + } + ''; + meta = { description = "Firmware Analysis Tool"; homepage = "https://github.com/ReFirmLabs/binwalk"; - changelog = "https://github.com/ReFirmLabs/binwalk/releases/tag/v${version}"; + changelog = "https://github.com/ReFirmLabs/binwalk/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ @@ -122,4 +138,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "binwalk"; }; -} +}) diff --git a/pkgs/by-name/bi/bird-lg/package.nix b/pkgs/by-name/bi/bird-lg/package.nix index db6fb798c0d4..8bb1180a8fa2 100644 --- a/pkgs/by-name/bi/bird-lg/package.nix +++ b/pkgs/by-name/bi/bird-lg/package.nix @@ -9,13 +9,13 @@ let { modRoot, vendorHash }: buildGoModule rec { pname = "bird-lg-${modRoot}"; - version = "1.3.5"; + version = "1.3.8"; src = fetchFromGitHub { owner = "xddxdd"; repo = "bird-lg-go"; rev = "v${version}"; - hash = "sha256-lWpTIuN+wCSDBHmpRIfVG8Z1Qx1s55MnJomQPjczB5k="; + hash = "sha256-j81cfHqXNsTM93ofxXz+smkjN8OdJXxtm9z5LdzC+r8="; }; doDist = false; @@ -41,12 +41,12 @@ let bird-lg-frontend = generic { modRoot = "frontend"; - vendorHash = "sha256-+M9Mlqck2E/ETW+NXsKwIeWlmZAaBU07fgDhKUU9PAI="; + vendorHash = "sha256-luJuIZ0xN8mdtWwTlfEDnAwMgt+Tzxlk2ZIDPIwHpcY="; }; bird-lg-proxy = generic { modRoot = "proxy"; - vendorHash = "sha256-nBTLQUX68f98D0RTlyX0gnvhQ+bu8d3Vv67J/YoXJxs="; + vendorHash = "sha256-OVyfPmLTHV5RFdLgRHEH/GqxuG5MnGt9Koz0DxpSg+4="; }; in symlinkJoin { diff --git a/pkgs/by-name/bi/bird2/package.nix b/pkgs/by-name/bi/bird2/package.nix index 5d28f0add04c..4fd22de7de28 100644 --- a/pkgs/by-name/bi/bird2/package.nix +++ b/pkgs/by-name/bi/bird2/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "bird"; - version = "2.16.1"; + version = "2.17.1"; src = fetchurl { url = "https://bird.network.cz/download/bird-${version}.tar.gz"; - hash = "sha256-9uWcvMrKYmaK6gIGhyS9QnuexEnH4PD8VoFQOYjHNbQ="; + hash = "sha256-v9cY36WWgZs4AWiHgyElFLRnFjMprsm7zQ+j3uA+EOk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix index 279199cafb4f..1c839dadb796 100644 --- a/pkgs/by-name/bi/bird3/package.nix +++ b/pkgs/by-name/bi/bird3/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "bird"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://bird.network.cz/download/bird-${version}.tar.gz"; - hash = "sha256-iGhAPKqE4lVLtuYK2+fGV+e7fErEGRDjmPNeI2upD6E="; + url = "https://bird.nic.cz/download/bird-${version}.tar.gz"; + hash = "sha256-KXJRl0/4g+TvA/zNbJEtEW7Un/Lxxjtm0dul8HCUREo="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS"; description = "BIRD Internet Routing Daemon"; - homepage = "https://bird.network.cz"; + homepage = "https://bird.nic.cz/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ herbetom ]; platforms = platforms.linux; diff --git a/pkgs/by-name/bi/bisq2/package.nix b/pkgs/by-name/bi/bisq2/package.nix index 96a7d15f070c..05519f122068 100644 --- a/pkgs/by-name/bi/bisq2/package.nix +++ b/pkgs/by-name/bi/bisq2/package.nix @@ -18,7 +18,7 @@ }: let - version = "2.1.6"; + version = "2.1.7"; jdk = jdk23.override { enableJavaFX = true; }; @@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb"; - hash = "sha256-420XZt8wEzY70xv1OZswYZO1/dtVDt8CRyKCJW068H0="; + hash = "sha256-kNQbTZoHFR2qFw/Jjc9iaEews/oUOYoJanmbVH/vs44="; # Verify the upstream Debian package prior to extraction. # See https://bisq.wiki/Bisq_2#Installation @@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation rec { signature = fetchurl { url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc"; - hash = "sha256-17NjRIcDKlmqvX/zKVrahWd8qJEY+v25qP9yfFMPojw="; + hash = "sha256-Cl9EIp+ycD8Tp/bx5dXQK206jZzrYJkI/U9ItfXDRWw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix index 4c5c9f69a8cd..32b6cda4b3c1 100644 --- a/pkgs/by-name/bi/bitcomet/package.nix +++ b/pkgs/by-name/bi/bitcomet/package.nix @@ -1,16 +1,18 @@ { lib, - fetchurl, appimageTools, - webkitgtk_4_0, + fetchurl, }: + let pname = "bitcomet"; - version = "2.12.1"; + version = "2.13.2"; + src = fetchurl { url = "https://download.bitcomet.com/linux/x86_64/BitComet-${version}-x86_64.AppImage"; - hash = "sha256-iaUPf9gSTd2m641Ja9/5v4wkO3H4+R08YXohLCeFuTQ="; + hash = "sha256-T66hmWmjt7ZZj03IxTSYtNUBoFHgwOoAIOHMyJSAmbU="; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { @@ -24,16 +26,15 @@ appimageTools.wrapType2 { ]; extraInstallCommands = '' - mkdir -p $out/share/applications - install -m 444 ${appimageContents}/com.bitcomet.linux.desktop $out/share/applications/bitcomet.desktop + install -Dm644 ${appimageContents}/com.bitcomet.linux.desktop $out/share/applications/bitcomet.desktop substituteInPlace $out/share/applications/bitcomet.desktop \ - --replace-fail 'Exec=usr/bin/BitComet' 'Exec=bitcomet' - cp -r ${appimageContents}/usr/share/icons $out/share + --replace-fail "Exec=usr/bin/BitComet" "Exec=bitcomet" + cp -r ${appimageContents}/usr/share/icons $out/share/icons ''; meta = { homepage = "https://www.bitcomet.com"; - description = "Free BitTorrent download client"; + description = "BitTorrent download client"; mainProgram = "bitcomet"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index cd04a4cde2b5..5da72b29ee18 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "bitrise"; - version = "2.30.5"; + version = "2.31.1"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = "v${version}"; - hash = "sha256-j7Gbr+j/5RnM7S6eRZZkmlXgY+vBgfTJ5ZaLz8o7pww="; + hash = "sha256-mSlN+7V25HFyTE5glz8vRzv2OplzsiEybBj71DThcSk="; }; # many tests rely on writable $HOME/.bitrise and require network access diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 9f7da212c2c1..ec936f6a3a8b 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -13,13 +13,13 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2025.2.0"; + version = "2025.4.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; tag = "cli-v${version}"; - hash = "sha256-Ls30yeqMDBA4HjQdnICJy0HVHm7VfZarsKUHn3KTatA="; + hash = "sha256-sWphSdxh07GS7GPlNVxK7zoXMTGLjT7qTLfH1nsIiQQ="; }; postPatch = '' @@ -29,7 +29,7 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-V77I2ZzmcCo06vq76lGkRa+NmTEUe2urD0D1HQ/gBJA="; + npmDepsHash = "sha256-/BOzDt+wgnWedWfShPkAhaeujBBQTDlZdtiKl3wrOqE="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools @@ -74,12 +74,16 @@ buildNpmPackage rec { shopt -u globstar ''; - postInstall = '' - # The @bitwarden modules are actually npm workspaces inside the source tree, which - # leave dangling symlinks behind. They can be safely removed, because their source is - # bundled via webpack and thus not needed at run-time. - rm -rf $out/lib/node_modules/@bitwarden/clients/node_modules/{@bitwarden,.bin} - ''; + postInstall = + '' + # The @bitwarden modules are actually npm workspaces inside the source tree, which + # leave dangling symlinks behind. They can be safely removed, because their source is + # bundled via webpack and thus not needed at run-time. + rm -rf $out/lib/node_modules/@bitwarden/clients/node_modules/{@bitwarden,.bin} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd bw --zsh <($out/bin/bw completion --shell zsh) + ''; passthru = { tests = { @@ -87,7 +91,6 @@ buildNpmPackage rec { }; updateScript = nix-update-script { extraArgs = [ - "--commit" "--version=stable" "--version-regex=^cli-v(.*)$" ]; diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 44f33663d5cd..70f8ada470e0 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -34,13 +34,13 @@ let in buildNpmPackage' rec { pname = "bitwarden-desktop"; - version = "2025.2.0"; + version = "2025.4.2"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-+RMeo+Kyum1WNm7citUe9Uk5yOtfhMPPlQRtnYL3Pj8="; + hash = "sha256-sWphSdxh07GS7GPlNVxK7zoXMTGLjT7qTLfH1nsIiQQ="; }; patches = [ @@ -76,7 +76,7 @@ buildNpmPackage' rec { "--ignore-scripts" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-fYZJA6qV3mqxO2g+yxD0MWWQc9QYmdWJ7O7Vf88Qpbs="; + npmDepsHash = "sha256-/BOzDt+wgnWedWfShPkAhaeujBBQTDlZdtiKl3wrOqE="; cargoDeps = rustPlatform.fetchCargoVendor { inherit @@ -86,7 +86,7 @@ buildNpmPackage' rec { cargoRoot patches ; - hash = "sha256-OldVFMI+rcGAbpDg7pHu/Lqbw5I6/+oXULteQ9mXiFc="; + hash = "sha256-EONHK33RuVy2ZlUzwdvdBX+6/jiCsrNo9ueZYQtWSkA="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -222,7 +222,6 @@ buildNpmPackage' rec { passthru = { updateScript = nix-update-script { extraArgs = [ - "--commit" "--version=stable" "--version-regex=^desktop-v(.*)$" ]; diff --git a/pkgs/by-name/bi/bitwuzla/package.nix b/pkgs/by-name/bi/bitwuzla/package.nix index 4fb78ff4e646..9900a69a7777 100644 --- a/pkgs/by-name/bi/bitwuzla/package.nix +++ b/pkgs/by-name/bi/bitwuzla/package.nix @@ -12,6 +12,7 @@ gmp, cadical, cryptominisat, + kissat, zlib, pkg-config, cmake, @@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ninja cmake ]; + buildInputs = [ cadical cryptominisat @@ -44,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { symfpu gmp zlib + kissat ]; mesonFlags = [ @@ -51,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { # but setting it to shared works even in pkgsStatic "-Ddefault_library=shared" "-Dcryptominisat=true" + "-Dkissat=true" (lib.strings.mesonEnable "testing" finalAttrs.finalPackage.doCheck) ]; @@ -77,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { set -euxo pipefail; $out/bin/bitwuzla -S cms -j 3 -m file.smt2 | tee /dev/stderr | grep $needle; $out/bin/bitwuzla -S cadical -m file.smt2 | tee /dev/stderr | grep $needle; + $out/bin/bitwuzla -S kissat -m file.smt2 | tee /dev/stderr | grep $needle; ) runHook postInstallCheck diff --git a/pkgs/by-name/bl/black-hole-solver/package.nix b/pkgs/by-name/bl/black-hole-solver/package.nix new file mode 100644 index 000000000000..02e0ee253496 --- /dev/null +++ b/pkgs/by-name/bl/black-hole-solver/package.nix @@ -0,0 +1,42 @@ +{ + stdenv, + lib, + fetchurl, + cmake, + buildPackages, + pkg-config, + python3, + rinutils, +}: + +stdenv.mkDerivation rec { + pname = "black-hole-solver"; + version = "1.14.0"; + + src = fetchurl { + url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz"; + sha256 = "sha256-XEe9CT27Fg9LCQ/WcKt8ErQ3HTmxezu9jGxKEpdVV8A="; + }; + + nativeBuildInputs = [ + cmake + (buildPackages.perl.withPackages (ps: [ ps.PathTiny ])) + pkg-config + python3 + ]; + buildInputs = [ + rinutils + ]; + + prePatch = '' + patchShebangs ./scripts + ''; + + meta = { + description = "Solver for Solitaire variants Golf, Black Hole, and All in a Row"; + mainProgram = "black-hole-solve"; + homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/"; + license = lib.licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix index b2122e397bd0..0b545d374d58 100644 --- a/pkgs/by-name/bl/blackfire/php-probe.nix +++ b/pkgs/by-name/bl/blackfire/php-probe.nix @@ -25,6 +25,7 @@ let "8.1" = "sha256-oRd6PbBLOboH9EVRfZl5u71ZoVMFO4K/uftxlL/vm18="; "8.2" = "sha256-95qBidNHIGLGCb3QbUIzBMHsRi2GTPhwAjJg+JTteDk="; "8.3" = "sha256-8TO28o4YYFK1r2tInjXKenki/izHzZL0Dblaippekl8="; + "8.4" = "sha256-Dg+Q0W6Rh2L4J7hmxLxuM3l/dKYHT499Mix4Zpu2Vno="; }; }; "i686-linux" = { @@ -33,6 +34,7 @@ let "8.1" = "sha256-mXJ1hO8NcODG7Wj3lQ+5lkSjcbkKLN5OOzcobigScKI="; "8.2" = "sha256-P5fQTVfE/DvLD4E3kUPE+eeOM9YVNNixgWVRq3Ca5M4="; "8.3" = "sha256-rMUv2EUlepBahMaEvs60i7RFTmaBe4P4qB1hcARqP9Y="; + "8.4" = "sha256-g7v7oN7wfrER9VPk6bGhr+l6GMh2iYHUihcXF9T4GOc="; }; }; "aarch64-linux" = { @@ -41,6 +43,7 @@ let "8.1" = "sha256-Tj7LHXS4m9hF9gY/9vfOQPJVP+vHM1h8XdBY9vyRhFo="; "8.2" = "sha256-6kfotMptfVLPL414mr6LeJZ3ODnjepYQYnKvg4fHIAg="; "8.3" = "sha256-M/GTdinOi3Em7GJOm1iUKkuDNg8La3iQpG+wGHp0ycE="; + "8.4" = "sha256-/wwgP76liAb6//uvDLGD5l+skh4P22Q8KdZN7nlEbXI="; }; }; "aarch64-darwin" = { diff --git a/pkgs/by-name/bl/blackshades/package.nix b/pkgs/by-name/bl/blackshades/package.nix index acdc2e385849..ec2bdfe33d4e 100644 --- a/pkgs/by-name/bl/blackshades/package.nix +++ b/pkgs/by-name/bl/blackshades/package.nix @@ -7,22 +7,47 @@ libGLU, libsndfile, openal, - zig_0_11, + zig_0_14, + runCommand, }: stdenv.mkDerivation (finalAttrs: { pname = "blackshades"; - version = "2.5.1"; + version = "2.5.2-unstable-2025-03-12"; src = fetchFromSourcehut { owner = "~cnx"; repo = "blackshades"; - rev = finalAttrs.version; + rev = "a2fbe0e08bedbbbb1089dbb8f3e3cb4d76917bd0"; fetchSubmodules = true; - hash = "sha256-qdpXpuXHr9w2XMfgOVveWv3JoqdJHVB8TCqZdyaw/DM="; + hash = "sha256-W6ltmWCw7jfiTiNlh60YVF7mz//8s+bgu4F9gy5cDgw="; }; - nativeBuildInputs = [ zig_0_11.hook ]; + postUnpack = '' + ln -s ${ + runCommand "${finalAttrs.finalPackage.name}-zig-deps" + { + inherit (finalAttrs) src; + + nativeBuildInputs = [ zig_0_14 ]; + + outputHashAlgo = null; + outputHashMode = "recursive"; + outputHash = "sha256-wBIfLeaKtTow2Z7gjEgIFmqcTGWgpRWI+k0t294BslM="; + } + '' + export ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + + runHook unpackPhase + cd $sourceRoot + + zig build --fetch + mv $ZIG_GLOBAL_CACHE_DIR/p $out + '' + } $ZIG_GLOBAL_CACHE_DIR/p + ''; + + nativeBuildInputs = [ zig_0_14.hook ]; buildInputs = [ glfw diff --git a/pkgs/by-name/bl/blanket/package.nix b/pkgs/by-name/bl/blanket/package.nix index 631bc5062921..e83a89c6e3d5 100644 --- a/pkgs/by-name/bl/blanket/package.nix +++ b/pkgs/by-name/bl/blanket/package.nix @@ -72,12 +72,10 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/rafaelmardojai/blanket"; license = lib.licenses.gpl3Plus; mainProgram = "blanket"; - maintainers = - with lib.maintainers; - [ - onny - ] - ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ + onny + ]; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/bl/blender/darwin.patch b/pkgs/by-name/bl/blender/darwin.patch index 192516758c94..187c7b42d2c2 100644 --- a/pkgs/by-name/bl/blender/darwin.patch +++ b/pkgs/by-name/bl/blender/darwin.patch @@ -1,17 +1,21 @@ ---- a/CMakeLists.txt 2024-03-01 08:08:05 -+++ b/CMakeLists.txt 2024-04-24 15:45:30 -@@ -2134,7 +2134,7 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0611614fe18..a6dcb2f04b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2567,7 +2567,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO) ) if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP) if(APPLE) - if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0) + if(FALSE) - # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag) - # with Xcode-11 (the Clang of which doesn't support the flag). + # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag) + # with Xcode-11 (the Clang of which doesn't support the flag). message( ---- a/build_files/cmake/platform/platform_apple.cmake 2024-02-22 15:31:36 -+++ b/build_files/cmake/platform/platform_apple.cmake 2024-04-24 16:06:13 -@@ -55,7 +55,6 @@ +diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake +index b2db64bbd2e..aac4b552655 100644 +--- a/build_files/cmake/platform/platform_apple.cmake ++++ b/build_files/cmake/platform/platform_apple.cmake +@@ -55,7 +55,6 @@ if(NOT DEFINED LIBDIR) endif() endif() if(NOT EXISTS "${LIBDIR}/.git") @@ -19,7 +23,7 @@ endif() if(FIRST_RUN) message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") -@@ -115,10 +114,6 @@ +@@ -121,10 +120,6 @@ if(WITH_CODEC_SNDFILE) find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib) find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib) list(APPEND LIBSNDFILE_LIBRARIES @@ -30,35 +34,35 @@ ) print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}") -@@ -162,9 +157,7 @@ +@@ -168,9 +163,7 @@ if(WITH_CODEC_FFMPEG) set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg) set(FFMPEG_FIND_COMPONENTS avcodec avdevice avformat avutil - mp3lame ogg opus swresample swscale - theora theoradec theoraenc vorbis vorbisenc - vorbisfile vpx x264) -+ swresample swscale) ++ swresample swscale) if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a) list(APPEND FFMPEG_FIND_COMPONENTS aom) endif() -@@ -275,7 +268,6 @@ +@@ -285,7 +278,6 @@ endif() add_bundled_libraries(boost/lib) - if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) -- string(APPEND PLATFORM_LINKFLAGS " -liconv") # boost_locale and ffmpeg needs it ! + if(WITH_CODEC_FFMPEG) +- string(APPEND PLATFORM_LINKFLAGS " -liconv") # ffmpeg needs it ! endif() if(WITH_PUGIXML) -@@ -350,7 +342,7 @@ - +@@ -361,7 +353,7 @@ endif() # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags. if(WITH_OPENMP) -- if(CMAKE_C_COMPILER_ID MATCHES "Clang") -+ if(FALSE) - # Use OpenMP from our precompiled libraries. - message(STATUS "Using ${LIBDIR}/openmp for OpenMP") - set(OPENMP_CUSTOM ON) -@@ -427,7 +419,7 @@ + if(CMAKE_C_COMPILER_ID MATCHES "Clang") +- if(${CMAKE_C_COMPILER_VERSION} VERSION_GREATER_EQUAL 17.0) ++ if(FALSE) # clang in nix was compatible with openmp + if(WITH_STRICT_BUILD_OPTIONS) + message(SEND_ERROR "OpenMP library is not compatible with the current Clang version") + else() +@@ -446,7 +438,7 @@ string(APPEND PLATFORM_LINKFLAGS " -Wl,-unexported_symbols_list,'${PLATFORM_SYMBOLS_MAP}'" ) @@ -67,3 +71,23 @@ if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64") # Silence "no platform load command found in , assuming: macOS". string(APPEND PLATFORM_LINKFLAGS " -Wl,-ld_classic") +diff --git a/source/blender/blendthumb/CMakeLists.txt b/source/blender/blendthumb/CMakeLists.txt +index 935b3f94ee1..f3d73637f71 100644 +--- a/source/blender/blendthumb/CMakeLists.txt ++++ b/source/blender/blendthumb/CMakeLists.txt +@@ -65,15 +65,6 @@ elseif(APPLE) + # Prevent Xcode from overwriting the signature. + XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "" + ) +- # CMake needs the target defined in the same file as add_custom_command. +- # It needs to be code-signed (ad-hoc in this case) +- # even on developer machine to generate thumbnails. +- # Command taken from XCode build process. +- add_custom_command( +- TARGET blender-thumbnailer POST_BUILD +- COMMAND codesign --deep --force --sign - --entitlements "${CMAKE_SOURCE_DIR}/release/darwin/thumbnailer_entitlements.plist" +- --timestamp=none $ +- ) + elseif(UNIX) + # ----------------------------------------------------------------------------- + # Build `blender-thumbnailer` executable diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 6d4516c07a6e..bd3a2e09f4f7 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -1,12 +1,8 @@ { - Cocoa, - CoreGraphics, - ForceFeedback, - OpenAL, - OpenGL, SDL, addDriverRunpath, alembic, + apple-sdk_15, blender, boost, brotli, @@ -53,16 +49,18 @@ llvmPackages, makeWrapper, mesa, + nix-update-script, + openUsdSupport ? !stdenv.hostPlatform.isDarwin, openal, opencollada-blender, opencolorio, openexr, openimagedenoise, - openimageio, + openimageio_2, openjpeg, openpgl, opensubdiv, - openvdb_11, + openvdb, openxr-loader, pkg-config, potrace, @@ -92,7 +90,6 @@ let (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; openImageDenoiseSupport = (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; - openUsdSupport = !stdenv.hostPlatform.isDarwin; vulkanSupport = !stdenv.hostPlatform.isDarwin; python3 = python3Packages.python; @@ -104,20 +101,21 @@ let }); optix = fetchzip { - # URL from https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/333add667b43255dcb011215a2d2af48281e83cf#9b9baac1eb9b72790eef5540a1685306fc43fd6c_30_30 - url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; - hash = "sha256-aMrp0Uff4c3ICRn4S6zedf6Q4Mc0/duBhKwKgYgMXVU="; + # Look at upstream Blender BuildBot logs to determine the current version, + # see Git blame here for historical details + url = "https://developer.download.nvidia.com/redist/optix/v7.4/OptiX-7.4.0-Include.zip"; + hash = "sha256-ca08XetwaUYC9foeP5bff9kcDfuFgEzopvjspn2s8RY="; }; in stdenv'.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.4.0"; + version = "4.4.3"; - srcs = fetchzip { + src = fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-pAzOayAPyRYgTixAyg2prkUtI70uFulRuBYhgU9ZNw4="; + hash = "sha256-vHDOKI7uqB5EbdRu711axBuYX1zM746E6GvK2Nl5hZg="; }; patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; @@ -251,11 +249,11 @@ stdenv'.mkDerivation (finalAttrs: { libwebp opencolorio openexr - openimageio + openimageio_2 openjpeg openpgl (opensubdiv.override { inherit cudaSupport; }) - openvdb_11 + openvdb potrace pugixml python3 @@ -281,12 +279,10 @@ stdenv'.mkDerivation (finalAttrs: { ] else [ - Cocoa - CoreGraphics - ForceFeedback - OpenAL - OpenGL SDL + # blender chooses Metal features based on runtime system version + # lets use the latest SDK and let Blender handle falling back on older systems. + apple-sdk_15 brotli llvmPackages.openmp sse2neon @@ -321,7 +317,7 @@ stdenv'.mkDerivation (finalAttrs: { ps.requests ps.zstandard ] - ++ lib.optional openUsdSupport [ pyPkgsOpenusd ]; + ++ lib.optionals openUsdSupport [ pyPkgsOpenusd ]; blenderExecutable = placeholder "out" @@ -414,6 +410,12 @@ stdenv'.mkDerivation (finalAttrs: { }], check=True) # noqa: E501 ''; }; + + updateScript = nix-update-script { + extraArgs = [ + "--url=https://projects.blender.org/blender/blender" + ]; + }; }; meta = { @@ -432,7 +434,6 @@ stdenv'.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-darwin" ]; - broken = stdenv.hostPlatform.isDarwin; # fails due to too-old SDK, using newer SDK fails to compile maintainers = with lib.maintainers; [ amarshall veprbl diff --git a/pkgs/by-name/bl/blink/package.nix b/pkgs/by-name/bl/blink/package.nix new file mode 100644 index 000000000000..1474675e21bb --- /dev/null +++ b/pkgs/by-name/bl/blink/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + fetchFromGitHub, + lib, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "blink"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "jart"; + repo = "blink"; + rev = finalAttrs.version; + hash = "sha256-4wgDftXOYm2fMP+/aTRljDi38EzbbwAJlQkuxjAMl3I="; + }; + + buildInputs = [ zlib ]; + + # Do not include --enable-static and --disable-shared flags during static compilation + dontAddStaticConfigureFlags = true; + + # Don't add --build and --host flags as they are not supported + configurePlatforms = lib.optionals stdenv.hostPlatform.isStatic [ ]; + + # ./configure script expects --static not standard --enable-static + configureFlags = lib.optional stdenv.hostPlatform.isStatic "--static"; + + # 'make check' requires internet connection + doCheck = true; + checkTarget = "test"; + + meta = { + description = "Tiniest x86-64-linux emulator"; + longDescription = '' + blink is a virtual machine that runs x86-64-linux programs on different operating systems and hardware architectures. It's designed to do the same thing as the qemu-x86_64 command, except that + - blink is much smaller in size than qemu-x86_64 + - blink will run your Linux binaries on any POSIX platform, whereas qemu-x86_64 only supports Linux + - blink goes 2x faster than qemu-x86_64 on some benchmarks, such as SSE integer / floating point math. Blink is also faster at running ephemeral programs such as compilers + ''; + + homepage = "https://github.com/jart/blink"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ t4ccer ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/bl/blisp/package.nix b/pkgs/by-name/bl/blisp/package.nix new file mode 100644 index 000000000000..e59750000393 --- /dev/null +++ b/pkgs/by-name/bl/blisp/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + argtable, + cmake, + libserialport, + pkg-config, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "blisp"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "pine64"; + repo = "blisp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-cN35VLbdQFA3KTZ8PxgpbsLGXqfFhw5eh3nEBRZqAm4="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + argtable + libserialport + ]; + + cmakeFlags = [ + "-DBLISP_BUILD_CLI=ON" + "-DBLISP_USE_SYSTEM_LIBRARIES=ON" + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=implicit-function-declaration"; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "v${finalAttrs.version}"; + }; + + meta = with lib; { + description = "In-System-Programming (ISP) tool & library for Bouffalo Labs RISC-V Microcontrollers and SoCs"; + license = licenses.mit; + mainProgram = "blisp"; + homepage = "https://github.com/pine64/blisp"; + platforms = platforms.unix; + maintainers = [ maintainers.bdd ]; + }; +}) diff --git a/pkgs/by-name/bl/blobfuse/package.nix b/pkgs/by-name/bl/blobfuse/package.nix index 2eb2b7b2a6ba..6de880843121 100644 --- a/pkgs/by-name/bl/blobfuse/package.nix +++ b/pkgs/by-name/bl/blobfuse/package.nix @@ -9,19 +9,19 @@ }: let - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-fuse"; rev = "blobfuse2-${version}"; - sha256 = "sha256-QCrBsEh8o4GblCWNcJssm9c6uSQYVs+qrdzfmI9l278="; + sha256 = "sha256-bpMX7flbb/QYZUtq1I1s2lAvrBhW7esPwxN/JupryDo="; }; in buildGoModule { pname = "blobfuse"; inherit version src; - vendorHash = "sha256-ZzpstCTABL9x5NM5tTiWZqOfI+BSKGZfb+ahbFUmcdo="; + vendorHash = "sha256-uWesaZshuBVf4yJiX6YqNMr0GiBkrHhOqefnCrpPCHg="; buildInputs = [ fuse3 ]; diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index d5236efdea77..6c6f6ba67283 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "blockbench"; - version = "4.12.2"; + version = "4.12.4"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; tag = "v${version}"; - hash = "sha256-/OdSV/wTrs6roiPiSQCqCLrlWtkB11gm3DM7r7B4HUU="; + hash = "sha256-tg2ICxliTmahO3twKgC4LSVyiX9K2jfA7lCcSCkzcbQ="; }; nativeBuildInputs = @@ -28,7 +28,7 @@ buildNpmPackage rec { copyDesktopItems ]; - npmDepsHash = "sha256-ZM3hFMHuKl5BW1+10czESDknc9jIZ024mUSUdNHF3EM="; + npmDepsHash = "sha256-a5OjCVHPeaBEYTFIUOnc9We677oCGwAvwMv8f1QRk9Q="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; @@ -66,7 +66,7 @@ buildNpmPackage rec { for size in 16 32 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - magick convert -resize "$size"x"$size" icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png + magick icon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png done makeWrapper ${lib.getExe electron} $out/bin/blockbench \ diff --git a/pkgs/by-name/bl/bloomeetunes/package.nix b/pkgs/by-name/bl/bloomeetunes/package.nix index 91985748a386..c155618d562d 100644 --- a/pkgs/by-name/bl/bloomeetunes/package.nix +++ b/pkgs/by-name/bl/bloomeetunes/package.nix @@ -10,13 +10,13 @@ flutter324.buildFlutterApplication rec { pname = "bloomeetunes"; - version = "2.11.4"; + version = "2.11.6"; src = fetchFromGitHub { owner = "HemantKArya"; repo = "BloomeeTunes"; - tag = "v${version}+169"; - hash = "sha256-7YpOo1n8vsO3CTRoRioJzf3GJx4Hg4NB+oNDCTmsVyM="; + tag = "v${version}+171"; + hash = "sha256-gSAe5S5rdcNLP4v7NTchQj3UJ/h6msLax9H77w+JJnk="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json b/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json index 590c6ddce023..7ac5e40f623a 100644 --- a/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json +++ b/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json @@ -490,26 +490,6 @@ "source": "hosted", "version": "2.0.7" }, - "extended_image": { - "dependency": "direct main", - "description": { - "name": "extended_image", - "sha256": "9786aab821aac117763d6e4419cd49f5031fbaacfe3fd212c5b313d0334c37a9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.2.1" - }, - "extended_image_library": { - "dependency": "transitive", - "description": { - "name": "extended_image_library", - "sha256": "9a94ec9314aa206cfa35f16145c3cd6e2c924badcc670eaaca8a3a8063a68cd7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.5" - }, "fading_edge_scrollview": { "dependency": "transitive", "description": { @@ -778,16 +758,6 @@ "source": "hosted", "version": "1.2.2" }, - "http_client_helper": { - "dependency": "transitive", - "description": { - "name": "http_client_helper", - "sha256": "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, "http_multi_server": { "dependency": "transitive", "description": { diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix index b794a28a68c0..ab2b5897d490 100644 --- a/pkgs/by-name/bl/bloop/package.nix +++ b/pkgs/by-name/bl/bloop/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "2.0.9"; + version = "2.0.10"; platform = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then - "sha256-mslCzvJ+z5VNQkVa9HXjw2bUBprMgs3bAy3RmEt8OlI=" + "sha256-GoWHVYIA98YMMmhYj1bBysABBq2UxEcELXqDi+XRnQ4=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then - "sha256-XdMPo9O7ADhInmGFIOHihl1z4yPKAyDjCH7m3tCtKNo=" + "sha256-hE54Z2QLlAt4S+LQOAD0jLf1y2/PkKO9JAT2L6M8lWA=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then - "sha256-sJM00f2KBI6fnVj3U/h/pYAFT7QjZkfJ7ubDfFlRJ0Q=" + "sha256-8gtaiSilf1yL50QSsy4K686R1J9W5NL1JyB7onMSTOw=" else throw "unsupported platform"; }; diff --git a/pkgs/by-name/bl/bluebubbles/package.nix b/pkgs/by-name/bl/bluebubbles/package.nix new file mode 100644 index 000000000000..f2985d19add5 --- /dev/null +++ b/pkgs/by-name/bl/bluebubbles/package.nix @@ -0,0 +1,72 @@ +{ + lib, + flutter327, + fetchFromGitHub, + autoPatchelfHook, + webkitgtk_4_1, + libnotify, + libayatana-appindicator, + jdk, + mpv, +}: + +flutter327.buildFlutterApplication rec { + pname = "bluebubbles"; + version = "1.15.4"; + + src = fetchFromGitHub { + owner = "BlueBubblesApp"; + repo = "bluebubbles-app"; + tag = "v${version}+73-desktop"; + hash = "sha256-+JCj4EuwFbzE4u+7iJ+v9FQuLVt1tozwBufw+eL5usk="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes = { + desktop_webview_auth = "sha256-n3lvYFUzm/1sCwQBJ3Ovup4Mq7lqGJ17ktk3TJrHhKE="; + disable_battery_optimization = "sha256-IsfclmbdLvju+0VWElFz9brdVntRESFB+PF8UPJBL2E="; + firebase_dart = "sha256-jq4Y5ApGPrXcLN3gwC9NuGN/EQkl5u64iMzL8KG02Sc="; + gesture_x_detector = "sha256-H3OJxDhESWwnpRky9jS9RIBiZ7gSqWQ/j0x/1VvRb5M="; + local_notifier = "sha256-0vajd2XNGpV9aqywbCUvDC2SLjwxh1LmshTa5yttQUI="; + permission_handler_windows = "sha256-9h0wEOgY6gtqaSyH9x2fbvH8Y0EfoVs/qNqwwI5d18k="; + video_thumbnail = "sha256-7IbKg6bBA5D8ODwMNwJqIohTCbAox56TMgoI07CbrPw="; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + webkitgtk_4_1 + libnotify + libayatana-appindicator + jdk + mpv + ]; + + # distributed in release tarballs under `data/flutter_assets/.env`, necessary for build and runtime + preBuild = '' + echo 'TENOR_API_KEY=AIzaSyAQwUlgo8sF5FBuIiampkfzaGgVPMglcGk' > .env + ''; + + postInstall = '' + sed -i 's#Icon=.*/bluebubbles.png#Icon=bluebubbles#g' snap/gui/bluebubbles.desktop + install -Dm0644 snap/gui/bluebubbles.desktop $out/share/applications/bluebubbles.desktop + install -Dm0644 snap/gui/bluebubbles.png $out/share/pixmaps/bluebubbles.png + ''; + + extraWrapProgramArgs = '' + --prefix LD_LIBRARY_PATH : $out/app/bluebubbles/lib + ''; + + meta = { + description = "Cross-platform iMessage client"; + homepage = "https://github.com/BlueBubblesApp/bluebubbles-app"; + mainProgram = "bluebubbles"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + emaryn + zacharyweiss + ]; + }; +} diff --git a/pkgs/by-name/bl/bluebubbles/pubspec.lock.json b/pkgs/by-name/bl/bluebubbles/pubspec.lock.json new file mode 100644 index 000000000000..1f9cc645fdcd --- /dev/null +++ b/pkgs/by-name/bl/bluebubbles/pubspec.lock.json @@ -0,0 +1,4405 @@ +{ + "packages": { + "_discoveryapis_commons": { + "dependency": "transitive", + "description": { + "name": "_discoveryapis_commons", + "sha256": "113c4100b90a5b70a983541782431b82168b3cae166ab130649c36eb3559d498", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.7" + }, + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "76.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.3" + }, + "adaptive_theme": { + "dependency": "direct main", + "description": { + "name": "adaptive_theme", + "sha256": "caa49b4c73b681bf12a641dff77aa1383262a00cf38b9d1a25b180e275ba5ab9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.7.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.11.0" + }, + "animated_size_and_fade": { + "dependency": "direct main", + "description": { + "name": "animated_size_and_fade", + "sha256": "1a013cb7cd9e1751d6b8a38e34e4d0732f010c2d6021acd2176a455ee3df4664", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "animated_stack_widget": { + "dependency": "transitive", + "description": { + "name": "animated_stack_widget", + "sha256": "ce4788dd158768c9d4388354b6fb72600b78e041a37afc4c279c63ecafcb9408", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.4" + }, + "animations": { + "dependency": "direct main", + "description": { + "name": "animations", + "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.11" + }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "app_install_date": { + "dependency": "direct main", + "description": { + "name": "app_install_date", + "sha256": "0860b8feb129a97a2dae58e5d2dcfc274418ad803a80be35af83ad590daa4fe3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.5" + }, + "app_links": { + "dependency": "direct main", + "description": { + "name": "app_links", + "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.0" + }, + "app_links_linux": { + "dependency": "transitive", + "description": { + "name": "app_links_linux", + "sha256": "f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "app_links_platform_interface": { + "dependency": "transitive", + "description": { + "name": "app_links_platform_interface", + "sha256": "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "app_links_web": { + "dependency": "transitive", + "description": { + "name": "app_links_web", + "sha256": "af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "0c64e928dcbefddecd234205422bcfc2b5e6d31be0b86fef0d0dd48d7b4c9742", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.4" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "asn1lib": { + "dependency": "transitive", + "description": { + "name": "asn1lib", + "sha256": "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.9" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "async_extension": { + "dependency": "transitive", + "description": { + "name": "async_extension", + "sha256": "1b8b3a7f3822a87bf804bcef5ef614effa0357d3ea69de35ff431f1007eb8ca9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.14" + }, + "async_task": { + "dependency": "direct main", + "description": { + "name": "async_task", + "sha256": "a0effde412fdb5d0b08d4329a75967a26d67e4b20055f928fe6e7ad8697222cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "audio_waveforms": { + "dependency": "direct main", + "description": { + "name": "audio_waveforms", + "sha256": "658fef41bbab299184b65ba2fd749e8ec658c1f7d54a21f7cf97fa96b173b4ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "auto_size_text": { + "dependency": "direct main", + "description": { + "name": "auto_size_text", + "sha256": "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "barcode": { + "dependency": "transitive", + "description": { + "name": "barcode", + "sha256": "7b6729c37e3b7f34233e2318d866e8c48ddb46c1f7ad01ff7bb2a8de1da2b9f4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.9" + }, + "bidi": { + "dependency": "transitive", + "description": { + "name": "bidi", + "sha256": "9a712c7ddf708f7c41b1923aa83648a3ed44cfd75b04f72d598c45e5be287f9d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.12" + }, + "bitsdojo_window": { + "dependency": "direct main", + "description": { + "name": "bitsdojo_window", + "sha256": "88ef7765dafe52d97d7a3684960fb5d003e3151e662c18645c1641c22b873195", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "bitsdojo_window_linux": { + "dependency": "transitive", + "description": { + "name": "bitsdojo_window_linux", + "sha256": "9519c0614f98be733e0b1b7cb15b827007886f6fe36a4fb62cf3d35b9dd578ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.4" + }, + "bitsdojo_window_macos": { + "dependency": "transitive", + "description": { + "name": "bitsdojo_window_macos", + "sha256": "f7c5be82e74568c68c5b8449e2c5d8fd12ec195ecd70745a7b9c0f802bb0268f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.4" + }, + "bitsdojo_window_platform_interface": { + "dependency": "transitive", + "description": { + "name": "bitsdojo_window_platform_interface", + "sha256": "65daa015a0c6dba749bdd35a0f092e7a8ba8b0766aa0480eb3ef808086f6e27c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "bitsdojo_window_windows": { + "dependency": "transitive", + "description": { + "name": "bitsdojo_window_windows", + "sha256": "fa982cf61ede53f483e50b257344a1c250af231a3cdc93a7064dd6dc0d720b68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_cli_annotations": { + "dependency": "transitive", + "description": { + "name": "build_cli_annotations", + "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.4" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.15" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "build_verify": { + "dependency": "direct dev", + "description": { + "name": "build_verify", + "sha256": "abbb9b9eda076854ac1678d284c053a5ec608e64da741d0801f56d4bbea27e23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.5" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "charcode": { + "dependency": "transitive", + "description": { + "name": "charcode", + "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "chunked_stream": { + "dependency": "direct main", + "description": { + "name": "chunked_stream", + "sha256": "b2fde5f81d780f0c1699b8347cae2e413412ae947fc6e64727cc48c6bb54c95c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.1" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.0" + }, + "confetti": { + "dependency": "direct main", + "description": { + "name": "confetti", + "sha256": "79376a99648efbc3f23582f5784ced0fe239922bd1a0fb41f582051eba750751", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.0" + }, + "connectivity_plus": { + "dependency": "direct main", + "description": { + "name": "connectivity_plus", + "sha256": "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.3" + }, + "connectivity_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus_platform_interface", + "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "cronet_http": { + "dependency": "transitive", + "description": { + "name": "cronet_http", + "sha256": "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "crop_your_image": { + "dependency": "direct main", + "description": { + "name": "crop_your_image", + "sha256": "14c8977b11a009dc5e73e0f6522970f93363e38183f1b2ffefe1676dc9c3f49d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "crypto_keys": { + "dependency": "transitive", + "description": { + "name": "crypto_keys", + "sha256": "acc19abf34623d990a0e8aec69463d74a824c31f137128f42e2810befc509ad0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.0+1" + }, + "csslib": { + "dependency": "direct main", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "csv": { + "dependency": "transitive", + "description": { + "name": "csv", + "sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "cupertino_http": { + "dependency": "transitive", + "description": { + "name": "cupertino_http", + "sha256": "5a043ec21fd7f56b24c549fd293a7fc60bba899509246cd0ffc2a91cb78c9be2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dart_earcut": { + "dependency": "transitive", + "description": { + "name": "dart_earcut", + "sha256": "e485001bfc05dcbc437d7bfb666316182e3522d4c3f9668048e004d0eb2ce43b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "dart_ping": { + "dependency": "transitive", + "description": { + "name": "dart_ping", + "sha256": "2f5418d0a5c64e53486caaac78677b25725b1e13c33c5be834ce874ea18bd24f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.1" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.8" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.11" + }, + "defer_pointer": { + "dependency": "direct main", + "description": { + "name": "defer_pointer", + "sha256": "d69e6f8c1d0f052d2616cc1db3782e0ea73f42e4c6f6122fd1a548dfe79faf02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2" + }, + "desktop_webview_auth": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "webkit2gtk-4.1", + "resolved-ref": "7210ff6a4975d1e877c9ccfaa6ecb7a18013f0b7", + "url": "https://github.com/BlueBubblesApp/flutter_desktop_webview_auth.git" + }, + "source": "git", + "version": "0.0.15" + }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.3.0" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.2" + }, + "dice_bear": { + "dependency": "direct main", + "description": { + "name": "dice_bear", + "sha256": "4dde957ee3838f1de82aeff43c68f8e976f102ed9b5cb3be2ba1abe243a109af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.7" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.8.0+1" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "disable_battery_optimization": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "996c83bf5f58522ba8da3ce6f44952be7b68171c", + "resolved-ref": "996c83bf5f58522ba8da3ce6f44952be7b68171c", + "url": "https://github.com/BlueBubblesApp/Disable-Battery-Optimizations.git" + }, + "source": "git", + "version": "1.1.1" + }, + "dlibphonenumber": { + "dependency": "direct main", + "description": { + "name": "dlibphonenumber", + "sha256": "8d6ebe4e941a43268ed977c2f7d331e6d8d0d2fb92a4236efcc5e38c0b1cd964", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.34" + }, + "dynamic_color": { + "dependency": "direct main", + "description": { + "name": "dynamic_color", + "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.7.0" + }, + "easy_debounce": { + "dependency": "direct main", + "description": { + "name": "easy_debounce", + "sha256": "f082609cfb8f37defb9e37fc28bc978c6712dedf08d4c5a26f820fa10165a236", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "emoji_picker_flutter": { + "dependency": "direct main", + "description": { + "name": "emoji_picker_flutter", + "sha256": "9a44c102079891ea5877f78c70f2e3c6e9df7b7fe0a01757d31f1046eeaa016d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "encrypt": { + "dependency": "direct main", + "description": { + "name": "encrypt", + "sha256": "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.3" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.7" + }, + "exif": { + "dependency": "direct main", + "description": { + "name": "exif", + "sha256": "a7980fdb3b7ffcd0b035e5b8a5e1eef7cadfe90ea6a4e85ebb62f87b96c7a172", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0" + }, + "expressions": { + "dependency": "transitive", + "description": { + "name": "expressions", + "sha256": "308a621b602923dd8a0cf3072793b24850d06453eb49c6b698cbda41a282e904", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.5+2" + }, + "extended_image": { + "dependency": "transitive", + "description": { + "name": "extended_image", + "sha256": "69d4299043334ecece679996e47d0b0891cd8c29d8da0034868443506f1d9a78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.3.1" + }, + "extended_image_library": { + "dependency": "transitive", + "description": { + "name": "extended_image_library", + "sha256": "e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.6" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "faker": { + "dependency": "direct main", + "description": { + "name": "faker", + "sha256": "544c34e9e1d322824156d5a8d451bc1bb778263b892aded24ec7ba77b0706624", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "fast_contacts": { + "dependency": "direct main", + "description": { + "name": "fast_contacts", + "sha256": "69b7c2208f9da3666c1577191b3d8f6193c90567eb0a9dfead8e59607caebe87", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.2.1" + }, + "file_selector_linux": { + "dependency": "transitive", + "description": { + "name": "file_selector_linux", + "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+2" + }, + "file_selector_macos": { + "dependency": "transitive", + "description": { + "name": "file_selector_macos", + "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4+2" + }, + "file_selector_platform_interface": { + "dependency": "transitive", + "description": { + "name": "file_selector_platform_interface", + "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "file_selector_windows": { + "dependency": "transitive", + "description": { + "name": "file_selector_windows", + "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+4" + }, + "firebase_dart": { + "dependency": "direct main", + "description": { + "path": "packages/firebase_dart", + "ref": "beb79f70a2bb0e96e6bb9fdebac2ff452f138950", + "resolved-ref": "beb79f70a2bb0e96e6bb9fdebac2ff452f138950", + "url": "https://github.com/appsup-dart/firebase_dart.git" + }, + "source": "git", + "version": "1.0.11" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flat_buffers": { + "dependency": "transitive", + "description": { + "name": "flat_buffers", + "sha256": "380bdcba5664a718bfd4ea20a45d39e13684f5318fcd8883066a55e21f37f4c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "23.5.26" + }, + "flex_color_picker": { + "dependency": "direct main", + "description": { + "name": "flex_color_picker", + "sha256": "c083b79f1c57eaeed9f464368be376951230b3cb1876323b784626152a86e480", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.7.0" + }, + "flex_color_scheme": { + "dependency": "direct main", + "description": { + "name": "flex_color_scheme", + "sha256": "ae638050fceb35b6040a43cf67892f9b956022068e736284919d93322fdd4ba2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.1" + }, + "flex_seed_scheme": { + "dependency": "transitive", + "description": { + "name": "flex_seed_scheme", + "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.5.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_acrylic": { + "dependency": "direct main", + "description": { + "name": "flutter_acrylic", + "sha256": "b3996dbde5abf5823cc9ead4cf2e5267c3181f15585fe47ce4dc4472e7ec827a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "flutter_audio_waveforms": { + "dependency": "direct main", + "description": { + "name": "flutter_audio_waveforms", + "sha256": "425dda9ee5ef9bb2ff2a2000b19ec595593b3baba6a1274da8d1d729846a144b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1+8" + }, + "flutter_displaymode": { + "dependency": "direct main", + "description": { + "name": "flutter_displaymode", + "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "flutter_dotenv": { + "dependency": "direct main", + "description": { + "name": "flutter_dotenv", + "sha256": "b7c7be5cd9f6ef7a78429cabd2774d3c4af50e79cb2b7593e3d5d763ef95c61b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.2.1" + }, + "flutter_image_compress": { + "dependency": "direct main", + "description": { + "name": "flutter_image_compress", + "sha256": "51d23be39efc2185e72e290042a0da41aed70b14ef97db362a6b5368d0523b27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "flutter_image_compress_common": { + "dependency": "transitive", + "description": { + "name": "flutter_image_compress_common", + "sha256": "c5c5d50c15e97dd7dc72ff96bd7077b9f791932f2076c5c5b6c43f2c88607bfb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "flutter_image_compress_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_image_compress_macos", + "sha256": "20019719b71b743aba0ef874ed29c50747461e5e8438980dfa5c2031898f7337", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "flutter_image_compress_ohos": { + "dependency": "transitive", + "description": { + "name": "flutter_image_compress_ohos", + "sha256": "e76b92bbc830ee08f5b05962fc78a532011fcd2041f620b5400a593e96da3f51", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "flutter_image_compress_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_image_compress_platform_interface", + "sha256": "579cb3947fd4309103afe6442a01ca01e1e6f93dc53bb4cbd090e8ce34a41889", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "flutter_image_compress_web": { + "dependency": "transitive", + "description": { + "name": "flutter_image_compress_web", + "sha256": "b9b141ac7c686a2ce7bb9a98176321e1182c9074650e47bb140741a44b6f5a96", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.5" + }, + "flutter_improved_scrolling": { + "dependency": "direct main", + "description": { + "name": "flutter_improved_scrolling", + "sha256": "46aec4599cdec31f1cd481d6614a9de98a6d6bff865f1d5fae3d7de9b5b7f74f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "flutter_isolate": { + "dependency": "direct main", + "description": { + "name": "flutter_isolate", + "sha256": "36a84e1a22371d8092ea2121145b330c24fb272acb951fb30c60ba44926b8fb3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "flutter_keyboard_visibility": { + "dependency": "direct main", + "description": { + "name": "flutter_keyboard_visibility", + "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "flutter_keyboard_visibility_linux": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_linux", + "sha256": "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "flutter_keyboard_visibility_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_macos", + "sha256": "c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "flutter_keyboard_visibility_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_platform_interface", + "sha256": "e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "flutter_keyboard_visibility_web": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_web", + "sha256": "d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "flutter_keyboard_visibility_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_windows", + "sha256": "fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.3" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "flutter_local_notifications": { + "dependency": "direct main", + "description": { + "name": "flutter_local_notifications", + "sha256": "d59eeafd6df92174b1d5f68fc9d66634c97ce2e7cfe2293476236547bb19bbbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "19.0.0" + }, + "flutter_local_notifications_linux": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_linux", + "sha256": "e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "flutter_local_notifications_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_platform_interface", + "sha256": "2569b973fc9d1f63a37410a9f7c1c552081226c597190cb359ef5d5762d1631c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "flutter_local_notifications_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_windows", + "sha256": "f8fc0652a601f83419d623c85723a3e82ad81f92b33eaa9bcc21ea1b94773e6e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "flutter_map": { + "dependency": "direct main", + "description": { + "name": "flutter_map", + "sha256": "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.2" + }, + "flutter_map_marker_popup": { + "dependency": "direct main", + "description": { + "name": "flutter_map_marker_popup", + "sha256": "a7540538114b5d1627ab67b498273d66bc36090385412ae49ef215af4a2861c5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "flutter_markdown": { + "dependency": "direct main", + "description": { + "name": "flutter_markdown", + "sha256": "e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6+2" + }, + "flutter_native_splash": { + "dependency": "direct dev", + "description": { + "name": "flutter_native_splash", + "sha256": "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.27" + }, + "flutter_slidable": { + "dependency": "direct main", + "description": { + "name": "flutter_slidable", + "sha256": "ab7dbb16f783307c9d7762ede2593ce32c220ba2ba0fd540a3db8e9a3acba71a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "flutter_sliding_up_panel": { + "dependency": "direct main", + "description": { + "name": "flutter_sliding_up_panel", + "sha256": "94f928973d83e146bbc52051e2d9f2a7ed7a5c9e7f04b54d835fff2e41d6cb99", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "flutter_staggered_grid_view": { + "dependency": "direct main", + "description": { + "name": "flutter_staggered_grid_view", + "sha256": "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "flutter_svg": { + "dependency": "direct main", + "description": { + "name": "flutter_svg", + "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.17" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_timezone": { + "dependency": "direct main", + "description": { + "name": "flutter_timezone", + "sha256": "bc286cecb0366d88e6c4644e3962ebd1ce1d233abc658eb1e0cd803389f84b64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "geolocator": { + "dependency": "direct main", + "description": { + "name": "geolocator", + "sha256": "afebc912cbe6496e8823e064ca519afb5610072bb9c4a9feea715f6feb4f7f28", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.0.3" + }, + "geolocator_android": { + "dependency": "transitive", + "description": { + "name": "geolocator_android", + "sha256": "fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.6.2" + }, + "geolocator_apple": { + "dependency": "transitive", + "description": { + "name": "geolocator_apple", + "sha256": "419e50f754281d3606750af07b198ecfe938e8648d3e30a898d3ac342ab717e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.12" + }, + "geolocator_platform_interface": { + "dependency": "transitive", + "description": { + "name": "geolocator_platform_interface", + "sha256": "722db30c0a2caa82a59d6655f04ef0a492da003036b880342cc67e6f1abc188f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.5" + }, + "geolocator_web": { + "dependency": "transitive", + "description": { + "name": "geolocator_web", + "sha256": "e54434b2ce9c677759a188d7e32e950802f79a9e9f45728239404bece0f1bd8d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "geolocator_windows": { + "dependency": "transitive", + "description": { + "name": "geolocator_windows", + "sha256": "4862e798b8a84ec300531888e7acd137b74637636069df230d79fabd110e2734", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.4" + }, + "gesture_x_detector": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "7de6e023ff68f67af1d83f7c1303d8b973f84944", + "resolved-ref": "7de6e023ff68f67af1d83f7c1303d8b973f84944", + "url": "https://github.com/BlueBubblesApp/xgesture_flutter.git" + }, + "source": "git", + "version": "1.1.1" + }, + "get": { + "dependency": "direct main", + "description": { + "name": "get", + "sha256": "c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.7.2" + }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.0" + }, + "git": { + "dependency": "transitive", + "description": { + "name": "git", + "sha256": "de678c6f0d5e2761c2c3643d31b1010883cc4d3e352949ef7c15f98f27d676ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "github": { + "dependency": "direct main", + "description": { + "name": "github", + "sha256": "57f6ad78591f9638e903409977443093f862d25062a6b582a3c89e4ae44e4814", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.24.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "globbing": { + "dependency": "transitive", + "description": { + "name": "globbing", + "sha256": "4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "google_fonts": { + "dependency": "direct main", + "description": { + "name": "google_fonts", + "sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.1" + }, + "google_identity_services_web": { + "dependency": "transitive", + "description": { + "name": "google_identity_services_web", + "sha256": "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.3" + }, + "google_ml_kit": { + "dependency": "direct main", + "description": { + "name": "google_ml_kit", + "sha256": "52a89712eeccb80a42a7de78d813ca7cc1988fb21d6e7011403ac627ce104eab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "google_mlkit_barcode_scanning": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_barcode_scanning", + "sha256": "5852d1daa007a05b33f99e3e3fa34227c49d9c41bc92a85d820666a57fd5c35f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.0" + }, + "google_mlkit_commons": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_commons", + "sha256": "7e9a6d6e66b44aa8cfe944bda9bc3346c52486dd890ca49e5bc98845cda40d7f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.0" + }, + "google_mlkit_digital_ink_recognition": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_digital_ink_recognition", + "sha256": "11ea94f71062ad2a784aeda7716b16a0e641878b0ddfaa930be23bcff90a6bd7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.0" + }, + "google_mlkit_entity_extraction": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_entity_extraction", + "sha256": "36e1f5b053c56a4d2919931d75bd73dc37e4c8b68f8e8ebeb2aa99b1bdba4de2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.0" + }, + "google_mlkit_face_detection": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_face_detection", + "sha256": "65988405c884fd84a4ccc8bded7b5e3e4c33362f6f4eaaa94818bdaaba7bab7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.0" + }, + "google_mlkit_face_mesh_detection": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_face_mesh_detection", + "sha256": "aa2659c03f46cf69510a998e0bd14f23b9d3c7b0c9b1fe1050656ad80d6e24bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.0" + }, + "google_mlkit_image_labeling": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_image_labeling", + "sha256": "9251c91c9281378a4716bb96dc0d3c9f54c0f809577aaba47ef24c52941dc859", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.0" + }, + "google_mlkit_language_id": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_language_id", + "sha256": "80446a42cf5f9daf39f28489b2b38ce883aa9e3daadd73e1fe1591022507248a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.0" + }, + "google_mlkit_object_detection": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_object_detection", + "sha256": "56f196c03a1a7b0986efac0e48ab4b82a35645de3f1f2eebc08e308ad93db469", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.0" + }, + "google_mlkit_pose_detection": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_pose_detection", + "sha256": "05c4a6eaab12e575a55c83b357d76c1f694be5caf1dc8d5229a18327712f6685", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.0" + }, + "google_mlkit_selfie_segmentation": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_selfie_segmentation", + "sha256": "f2ff57b9d5ea0029a31ec14d038ff64d35c19b15de3b01bd517513f8c23cb779", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.0" + }, + "google_mlkit_smart_reply": { + "dependency": "direct main", + "description": { + "name": "google_mlkit_smart_reply", + "sha256": "5a54de1b38e65a476c05605440691043befd3444570457d85f744c71154ef038", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.0" + }, + "google_mlkit_text_recognition": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_text_recognition", + "sha256": "e7609cec8de3022680a36ead8a8bafa9fd2360ea018a728feaad12dcb0e3c177", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.0" + }, + "google_mlkit_translation": { + "dependency": "transitive", + "description": { + "name": "google_mlkit_translation", + "sha256": "826cfe74fbee8f455d987949782e1873f50d79c1f2a971848e3f8dde851290d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.0" + }, + "google_sign_in": { + "dependency": "direct main", + "description": { + "name": "google_sign_in", + "sha256": "d0a2c3bcb06e607bb11e4daca48bd4b6120f0bbc4015ccebbe757d24ea60ed2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "google_sign_in_android": { + "dependency": "transitive", + "description": { + "name": "google_sign_in_android", + "sha256": "4e52c64366bdb3fe758f683b088ee514cc7a95e69c52b5ee9fc5919e1683d21b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.0" + }, + "google_sign_in_ios": { + "dependency": "transitive", + "description": { + "name": "google_sign_in_ios", + "sha256": "29cd125f58f50ceb40e8253d3c0209e321eee3e5df16cd6d262495f7cad6a2bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.8.1" + }, + "google_sign_in_platform_interface": { + "dependency": "transitive", + "description": { + "name": "google_sign_in_platform_interface", + "sha256": "5f6f79cf139c197261adb6ac024577518ae48fdff8e53205c5373b5f6430a8aa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "google_sign_in_web": { + "dependency": "transitive", + "description": { + "name": "google_sign_in_web", + "sha256": "460547beb4962b7623ac0fb8122d6b8268c951cf0b646dd150d60498430e4ded", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.4+4" + }, + "googleapis": { + "dependency": "transitive", + "description": { + "name": "googleapis", + "sha256": "dfea9984f0785ed445ba78e2aa8c55dadd86d6a60ea9e0ffbadad51edb5e7e36", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.2.0" + }, + "googleapis_auth": { + "dependency": "transitive", + "description": { + "name": "googleapis_auth", + "sha256": "befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "gtk": { + "dependency": "transitive", + "description": { + "name": "gtk", + "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "hand_signature": { + "dependency": "direct main", + "description": { + "name": "hand_signature", + "sha256": "e007153776b9558234761150b6b3ae98a6b3008e9b824da9911475794a982994", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "hashcodes": { + "dependency": "transitive", + "description": { + "name": "hashcodes", + "sha256": "80f9410a5b3c8e110c4b7604546034749259f5d6dcca63e0d3c17c9258f1a651", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "hive": { + "dependency": "transitive", + "description": { + "name": "hive", + "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "html": { + "dependency": "transitive", + "description": { + "name": "html", + "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.5" + }, + "http": { + "dependency": "direct overridden", + "description": { + "name": "http", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "http_client_helper": { + "dependency": "transitive", + "description": { + "name": "http_client_helper", + "sha256": "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "http_profile": { + "dependency": "transitive", + "description": { + "name": "http_profile", + "sha256": "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "idb_shim": { + "dependency": "direct main", + "description": { + "name": "idb_shim", + "sha256": "9e7ec816139bfafb69ae4b3668ad29dbd43c53428d6eb31f9332d42bd4fa7205", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1+7" + }, + "image": { + "dependency": "direct main", + "description": { + "name": "image", + "sha256": "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.3" + }, + "image_picker": { + "dependency": "direct main", + "description": { + "name": "image_picker", + "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "image_picker_android": { + "dependency": "transitive", + "description": { + "name": "image_picker_android", + "sha256": "8bd392ba8b0c8957a157ae0dc9fcf48c58e6c20908d5880aea1d79734df090e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.12+22" + }, + "image_picker_for_web": { + "dependency": "transitive", + "description": { + "name": "image_picker_for_web", + "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "image_picker_ios": { + "dependency": "transitive", + "description": { + "name": "image_picker_ios", + "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.12+2" + }, + "image_picker_linux": { + "dependency": "transitive", + "description": { + "name": "image_picker_linux", + "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1+2" + }, + "image_picker_macos": { + "dependency": "transitive", + "description": { + "name": "image_picker_macos", + "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1+2" + }, + "image_picker_platform_interface": { + "dependency": "transitive", + "description": { + "name": "image_picker_platform_interface", + "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.10.1" + }, + "image_picker_windows": { + "dependency": "transitive", + "description": { + "name": "image_picker_windows", + "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1+1" + }, + "image_size_getter": { + "dependency": "direct main", + "description": { + "name": "image_size_getter", + "sha256": "9a299e3af2ebbcfd1baf21456c3c884037ff524316c97d8e56035ea8fdf35653", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "in_app_review": { + "dependency": "direct main", + "description": { + "name": "in_app_review", + "sha256": "36a06771b88fb0e79985b15e7f2ac0f1142e903fe72517f3c055d78bc3bc1819", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.10" + }, + "in_app_review_platform_interface": { + "dependency": "transitive", + "description": { + "name": "in_app_review_platform_interface", + "sha256": "fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "infinite_listview": { + "dependency": "transitive", + "description": { + "name": "infinite_listview", + "sha256": "f6062c1720eb59be553dfa6b89813d3e8dd2f054538445aaa5edaddfa5195ce6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "internet_connection_checker_plus": { + "dependency": "direct main", + "description": { + "name": "internet_connection_checker_plus", + "sha256": "eb3a6f03e7b1641589f580993d29aee0b3c4920fc618f7556de359fedb87b02e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.1" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.2" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "irondash_engine_context": { + "dependency": "transitive", + "description": { + "name": "irondash_engine_context", + "sha256": "cd7b769db11a2b5243b037c8a9b1ecaef02e1ae27a2d909ffa78c1dad747bb10", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.4" + }, + "irondash_message_channel": { + "dependency": "transitive", + "description": { + "name": "irondash_message_channel", + "sha256": "b4101669776509c76133b8917ab8cfc704d3ad92a8c450b92934dd8884a2f060", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "jni": { + "dependency": "transitive", + "description": { + "name": "jni", + "sha256": "f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1" + }, + "jose": { + "dependency": "transitive", + "description": { + "name": "jose", + "sha256": "7955ec5d131960104e81fbf151abacb9d835c16c9e793ed394b2809f28b2198d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4" + }, + "js": { + "dependency": "direct overridden", + "description": { + "name": "js", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "languagetool_textfield": { + "dependency": "direct main", + "description": { + "name": "languagetool_textfield", + "sha256": "53ae4016e0544daadae3594cb4a55e2c40fc3d533b6a64df9d0df1ede55c4437", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "latlong2": { + "dependency": "transitive", + "description": { + "name": "latlong2", + "sha256": "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.1" + }, + "launch_at_startup": { + "dependency": "direct main", + "description": { + "name": "launch_at_startup", + "sha256": "1f8a75520913d1038630049e6c44a2575a23ffd28cc8b14fdf37401d1d21de84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.7" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.8" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "lists": { + "dependency": "transitive", + "description": { + "name": "lists", + "sha256": "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "local_auth": { + "dependency": "direct main", + "description": { + "name": "local_auth", + "sha256": "434d854cf478f17f12ab29a76a02b3067f86a63a6d6c4eb8fbfdcfe4879c1b7b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "local_auth_android": { + "dependency": "transitive", + "description": { + "name": "local_auth_android", + "sha256": "0abe4e72f55c785b28900de52a2522c86baba0988838b5dc22241b072ecccd74", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.48" + }, + "local_auth_darwin": { + "dependency": "transitive", + "description": { + "name": "local_auth_darwin", + "sha256": "630996cd7b7f28f5ab92432c4b35d055dd03a747bc319e5ffbb3c4806a3e50d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.3" + }, + "local_auth_platform_interface": { + "dependency": "transitive", + "description": { + "name": "local_auth_platform_interface", + "sha256": "1b842ff177a7068442eae093b64abe3592f816afd2a533c0ebcdbe40f9d2075a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.10" + }, + "local_auth_windows": { + "dependency": "transitive", + "description": { + "name": "local_auth_windows", + "sha256": "bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.11" + }, + "local_notifier": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "838278324c1ce007303e45111e57c4a9b3ac01f1", + "resolved-ref": "838278324c1ce007303e45111e57c4a9b3ac01f1", + "url": "https://github.com/BlueBubblesApp/local_notifier.git" + }, + "source": "git", + "version": "0.1.6" + }, + "logger": { + "dependency": "direct main", + "description": { + "name": "logger", + "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "macos_window_utils": { + "dependency": "transitive", + "description": { + "name": "macos_window_utils", + "sha256": "3534f2af024f2f24112ca28789a44e6750083f8c0065414546c6593ee48a5009", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.1" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3-main.0" + }, + "maps_launcher": { + "dependency": "direct main", + "description": { + "name": "maps_launcher", + "sha256": "dac4c609720211fa6336b5903d917fe45e545c6b5665978efc3db2a3f436b1ae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0+1" + }, + "markdown": { + "dependency": "transitive", + "description": { + "name": "markdown", + "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "direct main", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "media_kit": { + "dependency": "direct main", + "description": { + "name": "media_kit", + "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11" + }, + "media_kit_libs_android_video": { + "dependency": "direct main", + "description": { + "name": "media_kit_libs_android_video", + "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.6" + }, + "media_kit_libs_linux": { + "dependency": "direct main", + "description": { + "name": "media_kit_libs_linux", + "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "media_kit_libs_windows_video": { + "dependency": "direct main", + "description": { + "name": "media_kit_libs_windows_video", + "sha256": "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.10" + }, + "media_kit_native_event_loop": { + "dependency": "direct main", + "description": { + "name": "media_kit_native_event_loop", + "sha256": "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.9" + }, + "media_kit_video": { + "dependency": "direct main", + "description": { + "name": "media_kit_video", + "sha256": "2cc3b966679963ba25a4ce5b771e532a521ebde7c6aa20e9802bec95d9916c8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.5" + }, + "menu_base": { + "dependency": "transitive", + "description": { + "name": "menu_base", + "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "metadata_fetch": { + "dependency": "direct main", + "description": { + "name": "metadata_fetch", + "sha256": "24a713eaddbebea3dc3036a6c1d6f7c57e187fff5f0ef07be3e3ebbb7820c3e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "mgrs_dart": { + "dependency": "transitive", + "description": { + "name": "mgrs_dart", + "sha256": "fb89ae62f05fa0bb90f70c31fc870bcbcfd516c843fb554452ab3396f78586f7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "mime_type": { + "dependency": "direct main", + "description": { + "name": "mime_type", + "sha256": "d652b613e84dac1af28030a9fba82c0999be05b98163f9e18a0849c6e63838bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "mobile_scanner": { + "dependency": "direct main", + "description": { + "name": "mobile_scanner", + "sha256": "9cb9e371ee9b5b548714f9ab5fd33b530d799745c83d5729ecd1e8ab2935dbd1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.7" + }, + "msix": { + "dependency": "direct main", + "description": { + "name": "msix", + "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.8" + }, + "multi_value_listenable_builder": { + "dependency": "direct main", + "description": { + "name": "multi_value_listenable_builder", + "sha256": "5d073a5ab4935c3eab7134dec939544467bdf8a71ab24d01f0dcc3f94f03a71e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2" + }, + "multicast_dns": { + "dependency": "transitive", + "description": { + "name": "multicast_dns", + "sha256": "0a568c8411ab0979ab8cd4af1c29b6d316d854ab81592463ccceb92b35fde813", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2+8" + }, + "native_dio_adapter": { + "dependency": "direct main", + "description": { + "name": "native_dio_adapter", + "sha256": "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "network_info_plus": { + "dependency": "direct main", + "description": { + "name": "network_info_plus", + "sha256": "08f4166bbb77da9e407edef6322a33f87b18c0ca46483fb25606cb3d2bfcdd2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.3" + }, + "network_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "network_info_plus_platform_interface", + "sha256": "7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "network_tools": { + "dependency": "direct main", + "description": { + "name": "network_tools", + "sha256": "c48cb49b0e20e968c83147725e1d941544296b8414987a8a4bb7dd9dd664d443", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.6" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "numberpicker": { + "dependency": "direct main", + "description": { + "name": "numberpicker", + "sha256": "4c129154944b0f6b133e693f8749c3f8bfb67c4d07ef9dcab48b595c22d1f156", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "objectbox": { + "dependency": "direct main", + "description": { + "name": "objectbox", + "sha256": "ea823f4bf1d0a636e7aa50b43daabb64dd0fbd80b85a033016ccc1bc4f76f432", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.3" + }, + "objectbox_flutter_libs": { + "dependency": "direct main", + "description": { + "name": "objectbox_flutter_libs", + "sha256": "c91350bbbce5e6c2038255760b5be988faead004c814f833c2cd137445c6ae70", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.3" + }, + "objectbox_generator": { + "dependency": "direct dev", + "description": { + "name": "objectbox_generator", + "sha256": "96da521f2cef455cd524f8854e31d64495c50711ad5f1e2cf3142a8e527bc75f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.3" + }, + "objective_c": { + "dependency": "transitive", + "description": { + "name": "objective_c", + "sha256": "49e569fac1202d7fee1655fbbdfbf228840e11416be592bce2a6797b23de8231", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "on_exit": { + "dependency": "direct main", + "description": { + "name": "on_exit", + "sha256": "5a4c625374ddc9146b5dc6617e5c9885e326d0e876cf6554875f9961f564bd96", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "open_filex": { + "dependency": "direct main", + "description": { + "name": "open_filex", + "sha256": "9976da61b6a72302cf3b1efbce259200cd40232643a467aac7370addf94d6900", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.7.0" + }, + "openid_client": { + "dependency": "transitive", + "description": { + "name": "openid_client", + "sha256": "1d39a829dc770947bf8ec8684a3456743ef0205a777371efe16773a44163eb6a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.9" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.3.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "particles_flutter": { + "dependency": "direct main", + "description": { + "name": "particles_flutter", + "sha256": "35a010675a4d07d89501d555e1a477b39d32a1fb1ad1e16e6cd85f25149d8f53", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "pasteboard": { + "dependency": "direct main", + "description": { + "name": "pasteboard", + "sha256": "7bf733f3a00c7188ec1f2c6f0612854248b302cf91ef3611a2b7bb141c0f9d55", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.16" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "pdf": { + "dependency": "direct main", + "description": { + "name": "pdf", + "sha256": "28eacad99bffcce2e05bba24e50153890ad0255294f4dd78a17075a2ba5c8416", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.11.3" + }, + "pdf_widget_wrapper": { + "dependency": "transitive", + "description": { + "name": "pdf_widget_wrapper", + "sha256": "c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "peanut": { + "dependency": "direct dev", + "description": { + "name": "peanut", + "sha256": "b7e5fffabc97c4f0bfcce723a1a437202d33ae9f8a1c5962c68834315b56c737", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "permission_handler": { + "dependency": "direct main", + "description": { + "name": "permission_handler", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.4.0" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.1.0" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.6" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3+5" + }, + "permission_handler_platform_interface": { + "dependency": "direct overridden", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "permission_handler_windows": { + "dependency": "direct overridden", + "description": { + "path": "permission_handler_windows", + "ref": "251a9475644f64784efedff4b3a8bd5c99d3884d", + "resolved-ref": "251a9475644f64784efedff4b3a8bd5c99d3884d", + "url": "https://github.com/BlueBubblesApp/flutter-permission-handler.git" + }, + "source": "git", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "photo_manager": { + "dependency": "direct main", + "description": { + "name": "photo_manager", + "sha256": "0bc7548fd3111eb93a3b0abf1c57364e40aeda32512c100085a48dade60e574f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.4" + }, + "photo_view": { + "dependency": "direct main", + "description": { + "name": "photo_view", + "sha256": "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.0" + }, + "pixel_snap": { + "dependency": "transitive", + "description": { + "name": "pixel_snap", + "sha256": "677410ea37b07cd37ecb6d5e6c0d8d7615a7cf3bd92ba406fd1ac57e937d1fb0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.5" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pointer_interceptor": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor", + "sha256": "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1+2" + }, + "pointer_interceptor_ios": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_ios", + "sha256": "a6906772b3205b42c44614fcea28f818b1e5fdad73a4ca742a7bd49818d9c917", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1" + }, + "pointer_interceptor_platform_interface": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_platform_interface", + "sha256": "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.0+1" + }, + "pointer_interceptor_web": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_web", + "sha256": "7a7087782110f8c1827170660b09f8aa893e0e9a61431dbbe2ac3fc482e8c044", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.2+1" + }, + "pointycastle": { + "dependency": "transitive", + "description": { + "name": "pointycastle", + "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.9.1" + }, + "polylabel": { + "dependency": "transitive", + "description": { + "name": "polylabel", + "sha256": "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.1" + }, + "printing": { + "dependency": "direct main", + "description": { + "name": "printing", + "sha256": "482cd5a5196008f984bb43ed0e47cbfdca7373490b62f3b27b3299275bf22a93", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.14.2" + }, + "process_run": { + "dependency": "transitive", + "description": { + "name": "process_run", + "sha256": "a68fa9727392edad97a2a96a77ce8b0c17d28336ba1b284b1dfac9595a4299ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2+1" + }, + "proj4dart": { + "dependency": "transitive", + "description": { + "name": "proj4dart", + "sha256": "c8a659ac9b6864aa47c171e78d41bbe6f5e1d7bd790a5814249e6b68bc44324e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "protobuf": { + "dependency": "transitive", + "description": { + "name": "protobuf", + "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "provider": { + "dependency": "transitive", + "description": { + "name": "provider", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "pull_down_button": { + "dependency": "direct main", + "description": { + "name": "pull_down_button", + "sha256": "12cdd8ff187a3150ebdf075e5074299f085579b158d2b4e655ccbafccf95f25b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.2" + }, + "qr": { + "dependency": "transitive", + "description": { + "name": "qr", + "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "qr_flutter": { + "dependency": "direct main", + "description": { + "name": "qr_flutter", + "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "receive_intent": { + "dependency": "direct main", + "description": { + "name": "receive_intent", + "sha256": "8e6b6edd1f4127265c1f19bfd53e8e92dd65f32cc9b377247bb7876a655479c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.7" + }, + "record": { + "dependency": "direct main", + "description": { + "name": "record", + "sha256": "2e3d56d196abcd69f1046339b75e5f3855b2406fc087e5991f6703f188aa03a6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.2.1" + }, + "record_android": { + "dependency": "transitive", + "description": { + "name": "record_android", + "sha256": "36e009c3b83e034321a44a7683d95dd055162a231f95600f7da579dcc79701f9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "record_darwin": { + "dependency": "transitive", + "description": { + "name": "record_darwin", + "sha256": "e487eccb19d82a9a39cd0126945cfc47b9986e0df211734e2788c95e3f63c82c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "record_linux": { + "dependency": "transitive", + "description": { + "name": "record_linux", + "sha256": "74d41a9ebb1eb498a38e9a813dd524e8f0b4fdd627270bda9756f437b110a3e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "record_platform_interface": { + "dependency": "transitive", + "description": { + "name": "record_platform_interface", + "sha256": "8a575828733d4c3cb5983c914696f40db8667eab3538d4c41c50cbb79e722ef4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "record_web": { + "dependency": "transitive", + "description": { + "name": "record_web", + "sha256": "ef6f5c7760f22d6785ee8d97a2133ff14cb839c65e525ad831eb7f891d83f592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.5" + }, + "record_windows": { + "dependency": "transitive", + "description": { + "name": "record_windows", + "sha256": "26bfebc8899f4fa5b6b044089887dc42115820cd6a907bdf40c16e909e87de0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "reorderables": { + "dependency": "direct main", + "description": { + "name": "reorderables", + "sha256": "004a886e4878df1ee27321831c838bc1c976311f4ca6a74ce7d561e506540a77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "rxdart": { + "dependency": "direct overridden", + "description": { + "name": "rxdart", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.28.0" + }, + "safe_local_storage": { + "dependency": "transitive", + "description": { + "name": "safe_local_storage", + "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "saver_gallery": { + "dependency": "direct main", + "description": { + "name": "saver_gallery", + "sha256": "bf59475e50b73d666630bed7a5fdb621fed92d637f64e3c61ce81653ec6a833c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.1" + }, + "screen_brightness": { + "dependency": "transitive", + "description": { + "name": "screen_brightness", + "sha256": "ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2+1" + }, + "screen_brightness_android": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_android", + "sha256": "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0+2" + }, + "screen_brightness_ios": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_ios", + "sha256": "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "screen_brightness_macos": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_macos", + "sha256": "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0+1" + }, + "screen_brightness_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_platform_interface", + "sha256": "b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "screen_brightness_windows": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_windows", + "sha256": "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "screen_retriever": { + "dependency": "direct main", + "description": { + "name": "screen_retriever", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "scroll_to_index": { + "dependency": "direct main", + "description": { + "name": "scroll_to_index", + "sha256": "b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "secure_application": { + "dependency": "direct main", + "description": { + "name": "secure_application", + "sha256": "1476f2a8df44ed9617bf42f51a1fce2ab0b83bfd4ea58983a5f7d3748b356ef3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "sembast": { + "dependency": "transitive", + "description": { + "name": "sembast", + "sha256": "9026ea34aa3a0f26a966529ef80b57b6fe40f810cadeadd1b208202d1bf153e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.8.3" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.4" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.2" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.8" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "shimmer": { + "dependency": "direct main", + "description": { + "name": "shimmer", + "sha256": "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "shortid": { + "dependency": "transitive", + "description": { + "name": "shortid", + "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "simple_animations": { + "dependency": "direct main", + "description": { + "name": "simple_animations", + "sha256": "6c0f1d53d351a2187da979cc6883322eb9e76f1147c1aecc1937c498eaa9abff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.0" + }, + "skeletonizer": { + "dependency": "direct main", + "description": { + "name": "skeletonizer", + "sha256": "0dcacc51c144af4edaf37672072156f49e47036becbc394d7c51850c5c1e884b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.3" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "sliding_up_panel2": { + "dependency": "direct main", + "description": { + "name": "sliding_up_panel2", + "sha256": "7c2aac81c03e74fcd070799c5e2011f1c5de7026bd22a76164e81e23a49f2bdb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0+1" + }, + "slugify": { + "dependency": "direct main", + "description": { + "name": "slugify", + "sha256": "b272501565cb28050cac2d96b7bf28a2d24c8dae359280361d124f3093d337c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "smooth_page_indicator": { + "dependency": "direct main", + "description": { + "name": "smooth_page_indicator", + "sha256": "b21ebb8bc39cf72d11c7cfd809162a48c3800668ced1c9da3aade13a32cf6c1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "socket_io_client": { + "dependency": "direct main", + "description": { + "name": "socket_io_client", + "sha256": "180fdbc7685e32a849511bbf8b1c7bcc46ab0ff116f7024aa204b425bb3a1ffe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "socket_io_common": { + "dependency": "transitive", + "description": { + "name": "socket_io_common", + "sha256": "a914df90f25003fea62dbd0b186d98b745b1b72c16be87418e15a2511d25dadb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "sortedmap": { + "dependency": "transitive", + "description": { + "name": "sortedmap", + "sha256": "f000f40804e15fad5e3ad429164291c06cf7fcf8cc982006cf482852b912c3cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.4" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sprung": { + "dependency": "direct main", + "description": { + "name": "sprung", + "sha256": "54322638f5e393d2b808175f7eadbaa4836a4425456e98d93c3d676dc56ebdf1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.0" + }, + "store_checker": { + "dependency": "direct main", + "description": { + "name": "store_checker", + "sha256": "f191b6f1035caff62137c365cba21ad1a3c82c0369b522639052cd29fb48720f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.8.0" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "string_validator": { + "dependency": "transitive", + "description": { + "name": "string_validator", + "sha256": "a278d038104aa2df15d0e09c47cb39a49f907260732067d0034dc2f2e4e2ac94", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "super_clipboard": { + "dependency": "transitive", + "description": { + "name": "super_clipboard", + "sha256": "5203c881d24033c3e6154c2ae01afd94e7f0a3201280373f28e540f1defa3f40", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.0-dev.6" + }, + "super_drag_and_drop": { + "dependency": "direct main", + "description": { + "name": "super_drag_and_drop", + "sha256": "36e00943b14303b03a5d689659cab87a02d9c8265efb189abb98db9c946368ae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.0-dev.6" + }, + "super_native_extensions": { + "dependency": "transitive", + "description": { + "name": "super_native_extensions", + "sha256": "09ccc40c475e6f91770eaeb2553bf4803812d7beadc3759aa57d643370619c86", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.0-dev.6" + }, + "supercharged": { + "dependency": "direct main", + "description": { + "name": "supercharged", + "sha256": "ab49c848b33e28243f5ce82b976736de17d0852b71d0dfbde53fbb5e2ecca7cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "supercharged_dart": { + "dependency": "transitive", + "description": { + "name": "supercharged_dart", + "sha256": "cb95edda32eacd27664089700a750120be41daa84aa6cd2aeded46227c16b867", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "synchronized": { + "dependency": "direct main", + "description": { + "name": "synchronized", + "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0+3" + }, + "system_info2": { + "dependency": "direct main", + "description": { + "name": "system_info2", + "sha256": "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "system_tray": { + "dependency": "direct main", + "description": { + "name": "system_tray", + "sha256": "40444e5de8ed907822a98694fd031b8accc3cb3c0baa547634ce76189cf3d9cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "tenor_dart": { + "dependency": "transitive", + "description": { + "name": "tenor_dart", + "sha256": "ef48b584ef3897ed973b769a90ada76ea7ff70bd8194fadd21d588f73f515120", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2" + }, + "tenor_flutter": { + "dependency": "direct main", + "description": { + "name": "tenor_flutter", + "sha256": "b7d7f8586111e61e32ba7e13bea817d89835117b7aa791662d928671fae4ac81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.5" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "transitive", + "description": { + "name": "test", + "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.8" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.5" + }, + "throttling": { + "dependency": "transitive", + "description": { + "name": "throttling", + "sha256": "e48a4c681b1838b8bf99c1a4f822efe43bb69132f9a56091cd5b7d931c862255", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "timezone": { + "dependency": "transitive", + "description": { + "name": "timezone", + "sha256": "ffc9d5f4d1193534ef051f9254063fa53d588609418c84299956c3db9383587d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.0" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "tray_manager": { + "dependency": "direct main", + "description": { + "name": "tray_manager", + "sha256": "80be6c508159a6f3c57983de795209ac13453e9832fd574143b06dceee188ed2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2" + }, + "try_catch": { + "dependency": "transitive", + "description": { + "name": "try_catch", + "sha256": "3e0f62abdd51ea40f59c0e5958cfac7d6b92faec5a9faf85f174c6cc34c018af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "tuple": { + "dependency": "direct main", + "description": { + "name": "tuple", + "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "unicode": { + "dependency": "transitive", + "description": { + "name": "unicode", + "sha256": "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "unicode_emojis": { + "dependency": "direct main", + "description": { + "name": "unicode_emojis", + "sha256": "2f86d695420086dcf6f41c35bd81c33ef75c8e5fc0431fd9ca54066060086d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "unifiedpush": { + "dependency": "direct main", + "description": { + "name": "unifiedpush", + "sha256": "6dbed5a6305ca33f1865c7a3d814ae39476b79a2d23ca76a5708f023f405730f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "unifiedpush_android": { + "dependency": "transitive", + "description": { + "name": "unifiedpush_android", + "sha256": "7443dece0a850ae956514f809983eb2b39fc518c2c7d24dbfe817198bec89134", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "unifiedpush_platform_interface": { + "dependency": "transitive", + "description": { + "name": "unifiedpush_platform_interface", + "sha256": "dd588d78a8b2bfc10430e30035526e98caa543d0b7364a6344b5eb4815721c6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "universal_html": { + "dependency": "direct main", + "description": { + "name": "universal_html", + "sha256": "56536254004e24d9d8cfdb7dbbf09b74cf8df96729f38a2f5c238163e3d58971", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.4" + }, + "universal_io": { + "dependency": "direct main", + "description": { + "name": "universal_io", + "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.2" + }, + "universal_platform": { + "dependency": "transitive", + "description": { + "name": "universal_platform", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "uri_parser": { + "dependency": "transitive", + "description": { + "name": "uri_parser", + "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.15" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "uuid": { + "dependency": "direct overridden", + "description": { + "name": "uuid", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.1" + }, + "vcf_dart": { + "dependency": "direct main", + "description": { + "name": "vcf_dart", + "sha256": "971c143ce2e2029bd8cf0544f82a718408587ba304be70e85a02998a2b4c13a1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.18" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.13" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.16" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "version": { + "dependency": "direct main", + "description": { + "name": "version", + "sha256": "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "video_player": { + "dependency": "direct main", + "description": { + "name": "video_player", + "sha256": "48941c8b05732f9582116b1c01850b74dbee1d8520cd7e34ad4609d6df666845", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.3" + }, + "video_player_android": { + "dependency": "transitive", + "description": { + "name": "video_player_android", + "sha256": "ae7d4f1b41e3ac6d24dd9b9d5d6831b52d74a61bdd90a7a6262a33d8bb97c29a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.8.2" + }, + "video_player_avfoundation": { + "dependency": "transitive", + "description": { + "name": "video_player_avfoundation", + "sha256": "84b4752745eeccb6e75865c9aab39b3d28eb27ba5726d352d45db8297fbd75bc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "video_player_platform_interface": { + "dependency": "transitive", + "description": { + "name": "video_player_platform_interface", + "sha256": "df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "video_player_web": { + "dependency": "transitive", + "description": { + "name": "video_player_web", + "sha256": "3ef40ea6d72434edbfdba4624b90fd3a80a0740d260667d91e7ecd2d79e13476", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.4" + }, + "video_thumbnail": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "master", + "resolved-ref": "adfeff44e1bb7d11fd4f63c420d46cff5ae687f9", + "url": "https://github.com/BlueBubblesApp/video_thumbnail.git" + }, + "source": "git", + "version": "0.5.3" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.3.0" + }, + "volume_controller": { + "dependency": "transitive", + "description": { + "name": "volume_controller", + "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.8" + }, + "wakelock_plus": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus", + "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.10" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "win32": { + "dependency": "direct main", + "description": { + "name": "win32", + "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.10.1" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.5" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.3" + }, + "windows_taskbar": { + "dependency": "direct main", + "description": { + "name": "windows_taskbar", + "sha256": "204edfdb280a7053febdf50fc9b49b3c007255bd8a83c082d10c174ec6548f33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "wkt_parser": { + "dependency": "transitive", + "description": { + "name": "wkt_parser", + "sha256": "8a555fc60de3116c00aad67891bcab20f81a958e4219cc106e3c037aa3937f13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "x509": { + "dependency": "transitive", + "description": { + "name": "x509", + "sha256": "cbd1a63846884afd273cda247b0365284c8d85a365ca98e110413f93d105b935", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.4+3" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + } + }, + "sdks": { + "dart": ">=3.6.0 <3.29.0", + "flutter": ">=3.27.0" + } +} diff --git a/pkgs/by-name/bl/bluefish/package.nix b/pkgs/by-name/bl/bluefish/package.nix new file mode 100644 index 000000000000..5fabf05d836e --- /dev/null +++ b/pkgs/by-name/bl/bluefish/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchurl, + wrapGAppsHook3, + pkg-config, + gtk3, + libxml2, + enchant, + gucharmap, + python3, + adwaita-icon-theme, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bluefish"; + version = "2.2.17"; + + src = fetchurl { + url = "mirror://sourceforge/bluefish/bluefish-${finalAttrs.version}.tar.bz2"; + hash = "sha256-Onn2Ql4Uk56hNPlsFCTjqsBb7pWQS+Q0WBiDB4p7clM="; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + buildInputs = [ + adwaita-icon-theme + gtk3 + libxml2 + enchant + gucharmap + python3 + ]; + + # infb_gui.c:143:61: error: implicit declaration of function 'xmlNanoHTTPFetch' [-Wimplicit-function-declaration] + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + + meta = { + description = "Powerful editor targeted towards programmers and webdevelopers"; + homepage = "https://bluefish.openoffice.nl/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ vbgl ]; + platforms = lib.platforms.all; + mainProgram = "bluefish"; + }; +}) diff --git a/pkgs/by-name/bl/bluejay/package.nix b/pkgs/by-name/bl/bluejay/package.nix new file mode 100644 index 000000000000..f702954261e8 --- /dev/null +++ b/pkgs/by-name/bl/bluejay/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + kdePackages, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bluejay"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "EbonJaeger"; + repo = "bluejay"; + tag = "v${finalAttrs.version}"; + hash = "sha256-mt64v+TccmB/0qV4+EeXbyjPmOM8cDXPV1nIH4FvXSA="; + }; + + nativeBuildInputs = [ + cmake + ninja + kdePackages.extra-cmake-modules + kdePackages.wrapQtAppsHook + ]; + + buildInputs = [ + kdePackages.bluez-qt + kdePackages.kconfig + kdePackages.kcoreaddons + kdePackages.kdbusaddons + kdePackages.ki18n + kdePackages.kirigami + kdePackages.kirigami-addons + kdePackages.qtbase + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "bluejay"; + description = "Bluetooth manager written in Qt"; + homepage = "https://github.com/EbonJaeger/bluejay"; + changelog = "https://github.com/EbonJaeger/bluejay/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mpl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ federicoschonborn ]; + }; +}) diff --git a/pkgs/by-name/bl/blueprint-compiler/package.nix b/pkgs/by-name/bl/blueprint-compiler/package.nix index 6ffd8a7337f6..b66748db09c9 100644 --- a/pkgs/by-name/bl/blueprint-compiler/package.nix +++ b/pkgs/by-name/bl/blueprint-compiler/package.nix @@ -7,8 +7,10 @@ meson, ninja, python3, + runCommand, stdenv, testers, + wrapGAppsNoGuiHook, xvfb-run, }: stdenv.mkDerivation (finalAttrs: { @@ -30,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja + wrapGAppsNoGuiHook ]; buildInputs = [ @@ -64,8 +67,17 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + # regression test that `blueprint-compiler` can be used in a standalone + # context outside of nix builds, and doesn't rely on the setup hooks of + # its propagated inputs for basic functionality. + # see https://github.com/NixOS/nixpkgs/pull/400415 + standalone = runCommand "blueprint-compiler-test-standalone" { } '' + ${lib.getExe finalAttrs.finalPackage} --help && touch $out + ''; }; meta = with lib; { diff --git a/pkgs/by-name/bl/bluesnooze/package.nix b/pkgs/by-name/bl/bluesnooze/package.nix new file mode 100644 index 000000000000..7fa0017646c4 --- /dev/null +++ b/pkgs/by-name/bl/bluesnooze/package.nix @@ -0,0 +1,40 @@ +{ + fetchurl, + lib, + stdenv, + unzip, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "bluesnooze"; + version = "1.2"; + src = fetchurl { + url = "https://github.com/odlp/bluesnooze/releases/download/v${finalAttrs.version}/Bluesnooze.zip"; + hash = "sha256-B1qLfPj2bU9AAsYqGYWl0/sEPj3wnn/UBeiM4kqW/rA="; + }; + + # Needed to avoid the binary becoming corrupted and mac refusing to open it. I + # don't know why. + dontFixup = true; + + # "unpack" phase does the unzipping automatically + nativeBuildInputs = [ unzip ]; + sourceRoot = "."; # squash "unpacker produced multiple directories" error + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -r Bluesnooze.app $out/Applications/ + + runHook postInstall + ''; + + meta = { + description = "Bluesnooze prevents your sleeping Mac from connecting to Bluetooth accessories"; + homepage = "https://github.com/odlp/bluesnooze"; + changelog = "https://github.com/odlp/bluesnooze/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ craigf ]; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix index 766bc20cfdaf..5f9fd46c3aa0 100644 --- a/pkgs/by-name/bl/bluespec/package.nix +++ b/pkgs/by-name/bl/bluespec/package.nix @@ -22,7 +22,7 @@ asciidoctor, texliveFull, which, - makeWrapper, + makeBinaryWrapper, cctools, targetPackages, # install -m 644 lib/libstp.dylib /private/tmp/nix-build-bluespec-2024.07.drv-5/source/inst/lib/SAT @@ -160,15 +160,17 @@ stdenv.mkDerivation rec { [ automake autoconf - asciidoctor bison flex ghcWithPackages perl pkg-config - texliveFull tcl - makeWrapper + makeBinaryWrapper + ] + ++ lib.optionals withDocs [ + texliveFull + asciidoctor ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/B-Lang-org/bsc/blob/main/src/comp/bsc.hs#L1838 @@ -212,12 +214,16 @@ stdenv.mkDerivation rec { postFixup = '' # https://github.com/B-Lang-org/bsc/blob/65e3a87a17f6b9cf38cbb7b6ad7a4473f025c098/src/comp/bsc.hs#L1839 - wrapProgram $out/bin/bsc --prefix PATH : ${ - lib.makeBinPath (if stdenv.hostPlatform.isDarwin then [ cctools ] else [ targetPackages.stdenv.cc ]) - } + # `/bin/bsc` is a bash script which the script name to call the binary in the `/bin/core` directory + # thus wrapping `/bin/bsc` messes up the scriptname detection in it. + wrapProgram $out/bin/core/bsc \ + --prefix PATH : ${ + lib.makeBinPath (if stdenv.hostPlatform.isDarwin then [ cctools ] else [ targetPackages.stdenv.cc ]) + } ''; doCheck = true; + doInstallCheck = true; # TODO To fix check-suite: # On darwin @@ -276,6 +282,13 @@ stdenv.mkDerivation rec { ) ''; + installCheckPhase = '' + output="$($out/bin/bsc 2>&1 || true)" + echo "bsc output:" + echo "$output" + echo "$output" | grep -q "to get help" + ''; + meta = { description = "Toolchain for the Bluespec Hardware Definition Language"; homepage = "https://github.com/B-Lang-org/bsc"; diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix index 3d6e2cc30e1a..46d9f0f64ece 100644 --- a/pkgs/by-name/bl/bluetuith/package.nix +++ b/pkgs/by-name/bl/bluetuith/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "bluetuith"; version = "0.2.3"; src = fetchFromGitHub { owner = "darkhz"; - repo = pname; - rev = "v${version}"; + repo = "bluetuith"; + tag = "v${finalAttrs.version}"; hash = "sha256-yXH/koNT4ec/SOZhSU01iPNAfD1MdMjM2+wNmjXWsrk="; }; @@ -23,7 +23,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/darkhz/bluetuith/cmd.Version=${version}@nixpkgs" + "-X github.com/darkhz/bluetuith/cmd.Version=${finalAttrs.version}@nixpkgs" ]; passthru.updateScript = nix-update-script { }; @@ -47,4 +47,4 @@ buildGoModule rec { katexochen ]; }; -} +}) diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix index 8b144b85c781..24fbbc765b66 100644 --- a/pkgs/by-name/bl/bluez-alsa/package.nix +++ b/pkgs/by-name/bl/bluez-alsa/package.nix @@ -15,22 +15,28 @@ pkg-config, readline, sbc, + python3, }: stdenv.mkDerivation (finalAttrs: { pname = "bluez-alsa"; - version = "4.1.1"; + version = "4.3.1"; src = fetchFromGitHub { owner = "Arkq"; repo = "bluez-alsa"; - rev = "v${finalAttrs.version}"; - hash = "sha256-oGaYiSkOhqfjUl+mHTs3gqFcxli3cgkRtT6tbjy3ht0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Vebxyku7xl/ReU025iThEbvfHsi4kCbvFqlBGDWrHxc="; }; + postPatch = '' + patchShebangs src/dbus-codegen.py + ''; + nativeBuildInputs = [ autoreconfHook pkg-config + python3 ]; buildInputs = diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix index b3892d9d80aa..f9d8d0cadba9 100644 --- a/pkgs/by-name/bl/bluez/package.nix +++ b/pkgs/by-name/bl/bluez/package.nix @@ -6,7 +6,6 @@ docutils, ell, enableExperimental ? false, - fetchpatch, fetchurl, glib, json_c, @@ -28,31 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bluez"; - version = "5.79"; + version = "5.80"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz"; - hash = "sha256-QWSlMDqfcccPSMA/9gvjQjG1aNk6mtXnmSjTTmqg6oo="; + hash = "sha256-pNC8oymWkfBtW9l3O4VGOCBKUaUCbEKwrX8cbPFrRZo="; }; - patches = - [ - (fetchpatch { - name = "musl.patch"; - url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee"; - hash = "sha256-yMXPRPK8aT+luVoXNxx9zIa4c6E0BKYKS55DCfr8EQ0="; - }) - ] - ++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) - # Disable one failing test with musl libc, also seen by alpine - # https://github.com/bluez/bluez/issues/726 - ( - fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48"; - hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4="; - } - ); - buildInputs = [ alsa-lib dbus @@ -87,12 +68,21 @@ stdenv.mkDerivation (finalAttrs: { # Disable some tests: # - test-mesh-crypto depends on the following kernel settings: # CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC] + # - test-vcp is flaky (?), see: + # - https://github.com/bluez/bluez/issues/683 + # - https://github.com/bluez/bluez/issues/726 '' - if [[ ! -f unit/test-mesh-crypto.c ]]; then - echo "unit/test-mesh-crypto.c no longer exists" - false - fi - echo 'int main() { return 77; }' > unit/test-mesh-crypto.c + skipTest() { + if [[ ! -f unit/$1.c ]]; then + echo "unit/$1.c no longer exists" + false + fi + + echo 'int main() { return 77; }' > unit/$1.c + } + + skipTest test-mesh-crypto + skipTest test-vcp ''; configureFlags = [ diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index ee5a9aec0f5a..6312e990bb95 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20250125"; + version = "20250308"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-TH230E27+tAOV63HUM3RgwlcxJS76vna8zhBXLWlmbI="; + hash = "sha256-I4jZ+xhldmM6pyX/FjVSpdunpqN1qMuakBSrV+59maI="; }; patches = [ diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index e737a3374f5f..59509c3cd12c 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/rtbrick/bngblaster/"; changelog = "https://github.com/rtbrick/bngblaster/releases/tag/${finalAttrs.version}"; license = licenses.bsd3; - maintainers = teams.wdz.members; + teams = [ teams.wdz ]; badPlatforms = platforms.darwin; }; }) diff --git a/pkgs/by-name/bo/boa/package.nix b/pkgs/by-name/bo/boa/package.nix index e3a5a8430d3b..d1dc13fc8991 100644 --- a/pkgs/by-name/bo/boa/package.nix +++ b/pkgs/by-name/bo/boa/package.nix @@ -2,37 +2,26 @@ lib, rustPlatform, fetchFromGitHub, - fetchpatch, pkg-config, bzip2, openssl, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "boa"; - version = "0.17.3"; + version = "0.20"; src = fetchFromGitHub { owner = "boa-dev"; repo = "boa"; rev = "v${version}"; - hash = "sha256-ROzdOanfHNPwHXA0SzU2fpuBonbDbgDqH+ZgOjwK/tg="; + hash = "sha256-foCIzzFoEpcE6i0QrSbiob3YHIOeTpjwpAMtcPGL8Vg="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - name = "fix-rust-1.71-lints.patch"; - url = "https://github.com/boa-dev/boa/commit/93d05bda6864aa6ee67682d84bd4fc2108093ef5.patch"; - hash = "sha256-hMp4/UBN5moGBSqf8BJV2nBwgV3cry9uC2fJmdT5hkQ="; - }) - ]; - useFetchCargoVendor = true; - cargoHash = "sha256-1/92dyuEV+Xib0znEAgQOOmbsyjK/f2lYsXuPahLuw4="; + cargoHash = "sha256-PphgRSVCj724eYAC04Orpz/klYuAhphiQ3v5TRChs+w="; cargoBuildFlags = [ "--package" @@ -41,16 +30,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - bzip2 - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + bzip2 + openssl + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/bo/boatswain/package.nix b/pkgs/by-name/bo/boatswain/package.nix index 2296f2cd057d..3fa413624471 100644 --- a/pkgs/by-name/bo/boatswain/package.nix +++ b/pkgs/by-name/bo/boatswain/package.nix @@ -70,7 +70,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/World/boatswain"; changelog = "https://gitlab.gnome.org/World/boatswain/-/releases/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ _0xMRTT ] ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ _0xMRTT ]; + teams = [ lib.teams.gnome-circle ]; mainProgram = "boatswain"; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix index d609ef99196b..a28522dce7dd 100644 --- a/pkgs/by-name/bo/bochs/package.nix +++ b/pkgs/by-name/bo/bochs/package.nix @@ -2,7 +2,6 @@ lib, SDL2, curl, - darwin, docbook_xml_dtd_45, docbook_xsl, fetchurl, @@ -62,9 +61,6 @@ stdenv.mkDerivation (finalAttrs: { libGLU libX11 libXpm - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc ]; configureFlags = diff --git a/pkgs/by-name/bo/boilr/0001-update-time.patch b/pkgs/by-name/bo/boilr/0001-update-time.patch deleted file mode 100644 index 334d0fe1e9b3..000000000000 --- a/pkgs/by-name/bo/boilr/0001-update-time.patch +++ /dev/null @@ -1,287 +0,0 @@ -From 047681f1425c7cd68b77fdd729ea4664f73126b8 Mon Sep 17 00:00:00 2001 -From: wxt <3264117476@qq.com> -Date: Mon, 23 Sep 2024 15:11:09 +0800 -Subject: [PATCH] update time - ---- - Cargo.lock | 87 +++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 56 insertions(+), 31 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index be4fbeb..42f29b8 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -265,7 +265,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -282,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -467,7 +467,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -809,6 +809,15 @@ dependencies = [ - "serde", - ] - -+[[package]] -+name = "deranged" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", -+] -+ - [[package]] - name = "derivative" - version = "2.2.0" -@@ -1007,7 +1016,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1259,7 +1268,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2002,6 +2011,12 @@ dependencies = [ - "winapi", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-integer" - version = "0.1.45" -@@ -2156,7 +2171,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2308,7 +2323,7 @@ dependencies = [ - "pest_meta", - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2339,7 +2354,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2389,6 +2404,12 @@ dependencies = [ - "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" -@@ -2407,9 +2428,9 @@ dependencies = [ - - [[package]] - name = "proc-macro2" --version = "1.0.57" -+version = "1.0.86" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" - dependencies = [ - "unicode-ident", - ] -@@ -2425,9 +2446,9 @@ dependencies = [ - - [[package]] - name = "quote" --version = "1.0.27" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" - dependencies = [ - "proc-macro2", - ] -@@ -2711,22 +2732,22 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.163" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.163" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2748,7 +2769,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2981,9 +3002,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.16" -+version = "2.0.77" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" - dependencies = [ - "proc-macro2", - "quote", -@@ -3035,7 +3056,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -3061,11 +3082,14 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.21" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ -+ "deranged", - "itoa", -+ "num-conv", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -3073,16 +3097,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.1" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.9" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - -@@ -3153,7 +3178,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -3260,7 +3285,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - ] - - [[package]] -@@ -3443,7 +3468,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - "wasm-bindgen-shared", - ] - -@@ -3477,7 +3502,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.16", -+ "syn 2.0.77", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] --- -2.46.0 - diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index 5cd51c8c4e45..b0a50817b5fd 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -7,6 +7,7 @@ gtk3, xorg, perl, + pkg-config, openssl, speechd-minimal, libxkbcommon, @@ -34,23 +35,22 @@ let in rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "BoilR"; - version = "1.9.4"; + version = "1.9.6"; src = fetchFromGitHub { owner = "PhilipK"; repo = "BoilR"; tag = "v.${version}"; - hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80="; + hash = "sha256-qCY/I3ACrs5mWpgN+xmWi42rF9Mzqxxce2DIA+R1RNs="; }; - cargoPatches = [ - ./0001-update-time.patch - ]; - useFetchCargoVendor = true; - cargoHash = "sha256-5FvlyJgYtqgJyxlfXWe9oBBkwIY+c8Fp/rHuNLJ1j7s="; + cargoHash = "sha256-9B2NcFO/Bj553yaOMi7oBZJTFtCQmBnJkU9nK+vjThU="; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ + perl + pkg-config + ]; buildInputs = rpathLibs; diff --git a/pkgs/by-name/bo/bold/package.nix b/pkgs/by-name/bo/bold/package.nix index 05e3324e6be4..91e827dc23f8 100644 --- a/pkgs/by-name/bo/bold/package.nix +++ b/pkgs/by-name/bo/bold/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "-v" ]; + versionCheckProgramArg = "-v"; passthru = { updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index fa8533ecc983..f2c01aceb329 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -7,94 +7,45 @@ ninja, libarchive, libz, - libcef, + cef-binary, luajit, xorg, libgbm, glib, - nss, - nspr, - atk, - at-spi2-atk, - libdrm, - expat, - libxkbcommon, - gtk3, jdk17, pango, cairo, - alsa-lib, - dbus, - at-spi2-core, - cups, - systemd, buildFHSEnv, makeDesktopItem, copyDesktopItems, enableRS3 ? false, }: let - cef = libcef.overrideAttrs (oldAttrs: { - installPhase = - let - gl_rpath = lib.makeLibraryPath [ - stdenv.cc.cc.lib - ]; - rpath = lib.makeLibraryPath [ - glib - nss - nspr - atk - at-spi2-atk - libdrm - expat - xorg.libxcb - libxkbcommon - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - libgbm - gtk3 - pango - cairo - alsa-lib - dbus - at-spi2-core - cups - xorg.libxshmfence - systemd - ]; - in - '' - mkdir -p $out/lib/ $out/share/cef/ - cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/ - cp -r ../Resources/* $out/lib/ - cp -r ../Release/* $out/lib/ - patchelf --set-rpath "${rpath}" $out/lib/libcef.so - patchelf --set-rpath "${gl_rpath}" $out/lib/libEGL.so - patchelf --set-rpath "${gl_rpath}" $out/lib/libGLESv2.so - cp ../Release/*.bin $out/share/cef/ - cp -r ../Resources/* $out/share/cef/ - cp -r ../include $out - cp -r ../libcef_dll $out - cp -r ../cmake $out - ''; + cef = cef-binary.overrideAttrs (oldAttrs: { + version = "126.2.18"; + __intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD + gitRevision = "3647d39"; + chromiumVersion = "126.0.6478.183"; + + srcHash = + { + aarch64-linux = "sha256-Ni5aEbI+WuMnbT8gPWMONN5NkTySw7xJvnM6U44Njao="; + x86_64-linux = "sha256-YwND4zsndvmygJxwmrCvaFuxjJO704b6aDVSJqpEOKc="; + } + .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }); in let bolt = stdenv.mkDerivation (finalAttrs: { pname = "bolt-launcher"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "AdamCake"; repo = "bolt"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-fNCi2Wu+oOL6p8IBm6bHZ/rcaFmqoKs2DnXQ+ZA9McE="; + hash = "sha256-zEExwQRzDmV0xd3lcxFE2ZVfkyTFYZQe3/c0IWJ9C/c="; }; nativeBuildInputs = [ @@ -115,26 +66,19 @@ let jdk17 ]; - cmakeFlags = [ - "-D CMAKE_BUILD_TYPE=Release" - "-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include" - "-G Ninja" - ]; + cmakeFlags = + [ + "-D CMAKE_BUILD_TYPE=Release" + "-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include" + "-G Ninja" + ] + ++ lib.optionals (stdenv.hostPlatform.isAarch64) [ + (lib.cmakeFeature "PROJECT_ARCH" "arm64") + ]; preConfigure = '' - mkdir -p cef/dist/Release cef/dist/Resources cef/dist/include - - ln -s ${cef}/lib/* cef/dist/Release - - ln -s ${cef}/share/cef/*.pak cef/dist/Resources - ln -s ${cef}/share/cef/icudtl.dat cef/dist/Resources - ln -s ${cef}/share/cef/locales cef/dist/Resources - - ln -s ${cef}/include/* cef/dist/include - ln -s ${cef}/libcef_dll cef/dist/libcef_dll - - ln -s ${cef}/cmake cef/dist/cmake - ln -s ${cef}/CMakeLists.txt cef/dist + mkdir -p cef + ln -s ${cef} cef/dist ''; postFixup = '' diff --git a/pkgs/by-name/bo/bombono/package.nix b/pkgs/by-name/bo/bombono/package.nix index e309785aec6c..f10dd7a7c941 100644 --- a/pkgs/by-name/bo/bombono/package.nix +++ b/pkgs/by-name/bo/bombono/package.nix @@ -6,7 +6,7 @@ fetchpatch, fetchpatch2, scons, - boost, + boost183, dvdauthor, dvdplusrwtools, enca, @@ -60,7 +60,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - boost + boost183 dvdauthor dvdplusrwtools enca diff --git a/pkgs/by-name/bo/boogie/deps.json b/pkgs/by-name/bo/boogie/deps.json index 894291c52120..0f2b839942d4 100644 --- a/pkgs/by-name/bo/boogie/deps.json +++ b/pkgs/by-name/bo/boogie/deps.json @@ -2,961 +2,961 @@ { "pname": "CocoR", "version": "2014.12.24", - "sha256": "0ps8h7aawkcc1910qnh13llzb01pvgsjmg862pxp0p4wca2dn7a2" + "hash": "sha256-Qh3bhGKcXHD7FQa9KvXbN4D1KR0BWgxCCoxNrtSBSF8=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "6.0.0", - "sha256": "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3" + "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" }, { "pname": "Microsoft.CodeCoverage", "version": "16.2.0", - "sha256": "07h1ylca2j7a4hznq4m4b8nrzv1lw7gcf848k2a3nbm6rapv61ki" + "hash": "sha256-cQazr8qmLjuUmIggx97hNOyfLVqkEmw/JOpIoRj1AR4=" }, { "pname": "Microsoft.CSharp", "version": "4.0.1", - "sha256": "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj" + "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8=" }, { "pname": "Microsoft.DotNet.InternalAbstractions", "version": "1.0.0", - "sha256": "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x" + "hash": "sha256-HX3iOXH75I1L7eNihCbMNDDpcotfZpfQUdqdRTGM6FY=" }, { "pname": "Microsoft.NET.Test.Sdk", "version": "16.2.0", - "sha256": "1nr5jxchdy3p7jm4fm73d5yivghjisdsyafma8fs5d1v49bhgckq" + "hash": "sha256-eLIHVyI7tKIdUtUpr5uOEr4dfWnjVEeqPHf4BlmXJds=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.0.1", - "sha256": "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr" + "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.0.1", - "sha256": "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p" + "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Microsoft.TestPlatform.ObjectModel", "version": "16.2.0", - "sha256": "1ywzyx75d61wm75l7wglxzglg5k9nq66wd56m52hmmg8mf253z57" + "hash": "sha256-p/xRhKvo1QpFqaY0bgy2aZZH3+/08UPLqTyYVk73n/s=" }, { "pname": "Microsoft.TestPlatform.TestHost", "version": "16.2.0", - "sha256": "05dx9nv1skc5ji79ji5vz6c93b09w9xh70iyy6j5ca978ga92i6g" + "hash": "sha256-z0SR1EMnKVak8T6CA3viCayRmPm7RJlOlIVNHbZNvRU=" }, { "pname": "Microsoft.Win32.Primitives", "version": "4.0.1", - "sha256": "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7" + "hash": "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk=" }, { "pname": "Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq" + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, { "pname": "Microsoft.Win32.Registry", "version": "4.0.0", - "sha256": "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k" + "hash": "sha256-M/06F/Z2wTHCh4pZOgtCjUGLD1FJXEJKCmzOeFMl7uo=" }, { "pname": "Microsoft.Win32.Registry", "version": "4.3.0", - "sha256": "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7" + "hash": "sha256-50XwFbyRfZkTD/bBn76WV/NIpOy/mzXD3MMEVFX/vr8=" }, { "pname": "Microsoft.Win32.SystemEvents", "version": "6.0.0", - "sha256": "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p" + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" }, { "pname": "NETStandard.Library", "version": "1.6.0", - "sha256": "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k" + "hash": "sha256-ExWI1EKDCRishcfAeHVS/RoJphqSqohmJIC/wz3ZtVo=" }, { "pname": "NETStandard.Library", "version": "2.0.0", - "sha256": "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy" + "hash": "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0=" }, { "pname": "Newtonsoft.Json", "version": "9.0.1", - "sha256": "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r" + "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU=" }, { "pname": "NUnit", "version": "3.12.0", - "sha256": "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2" + "hash": "sha256-YrZ1FqCJUaILErAuXSC1BF7btofDqr6RcChuxbuQAKE=" }, { "pname": "NUnit3TestAdapter", "version": "3.15.1", - "sha256": "1nhpvzxbxgymmkb3bd5ci40rg8k71bfx2ghbgc99znvnvhf2034y" + "hash": "sha256-ngwgHNx2258Sews+0d0KZ6KXAYmstDXWrNW/vvrfF9o=" }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", - "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0" + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" }, { "pname": "runtime.any.System.Diagnostics.Tools", "version": "4.3.0", - "sha256": "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk" + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" }, { "pname": "runtime.any.System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn" + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" }, { "pname": "runtime.any.System.Globalization", "version": "4.3.0", - "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x" + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" }, { "pname": "runtime.any.System.Globalization.Calendars", "version": "4.3.0", - "sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201" + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" }, { "pname": "runtime.any.System.IO", "version": "4.3.0", - "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x" + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" }, { "pname": "runtime.any.System.Reflection", "version": "4.3.0", - "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly" + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" }, { "pname": "runtime.any.System.Reflection.Extensions", "version": "4.3.0", - "sha256": "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33" + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.3.0", - "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf" + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" }, { "pname": "runtime.any.System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl" + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" }, { "pname": "runtime.any.System.Runtime", "version": "4.3.0", - "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b" + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" }, { "pname": "runtime.any.System.Runtime.Handles", "version": "4.3.0", - "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x" + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" }, { "pname": "runtime.any.System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19" + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" }, { "pname": "runtime.any.System.Text.Encoding", "version": "4.3.0", - "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3" + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" }, { "pname": "runtime.any.System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8" + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" }, { "pname": "runtime.any.System.Threading.Tasks", "version": "4.3.0", - "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va" + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" }, { "pname": "runtime.any.System.Threading.Timer", "version": "4.3.0", - "sha256": "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086" + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d" + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" }, { "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59" + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" }, { "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa" + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" }, { "pname": "runtime.native.System", "version": "4.0.0", - "sha256": "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf" + "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894=" }, { "pname": "runtime.native.System", "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, { "pname": "runtime.native.System.IO.Compression", "version": "4.1.0", - "sha256": "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk" + "hash": "sha256-085JrZxNEwIHdBWKKKFsh1JzpF0AblvrUsz5T8kH4jQ=" }, { "pname": "runtime.native.System.Net.Http", "version": "4.0.1", - "sha256": "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6" + "hash": "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E=" }, { "pname": "runtime.native.System.Security.Cryptography", "version": "4.0.0", - "sha256": "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9" + "hash": "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w=" }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97" + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" }, { "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3" + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" }, { "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf" + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3" + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" }, { "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn" + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" }, { "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3" + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" }, { "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy" + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" }, { "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5" + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" }, { "pname": "runtime.unix.Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id" + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" }, { "pname": "runtime.unix.System.Console", "version": "4.3.0", - "sha256": "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80" + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5" + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" }, { "pname": "runtime.unix.System.IO.FileSystem", "version": "4.3.0", - "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix" + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" }, { "pname": "runtime.unix.System.Net.Primitives", "version": "4.3.0", - "sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4" + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" }, { "pname": "runtime.unix.System.Net.Sockets", "version": "4.3.0", - "sha256": "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12" + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", - "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk" + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" }, { "pname": "runtime.unix.System.Runtime.Extensions", "version": "4.3.0", - "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p" + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, { "pname": "StyleCop.Analyzers", "version": "1.1.118", - "sha256": "0hj4ax64cay2lvrh9693m0g4pmis0fi5wpm12xwzvc7lkizvac0a" + "hash": "sha256-CjC1f5z0sP15F6FeXqIDOtZLHqgjmQTzpsIrRkxXREI=" }, { "pname": "System.AppContext", "version": "4.1.0", - "sha256": "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz" + "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs=" }, { "pname": "System.Buffers", "version": "4.0.0", - "sha256": "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr" + "hash": "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8=" }, { "pname": "System.Buffers", "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, { "pname": "System.Collections", "version": "4.0.11", - "sha256": "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6" + "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" }, { "pname": "System.Collections", "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" }, { "pname": "System.Collections.Concurrent", "version": "4.0.12", - "sha256": "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc" + "hash": "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8=" }, { "pname": "System.Collections.Immutable", "version": "1.2.0", - "sha256": "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m" + "hash": "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo=" }, { "pname": "System.Collections.NonGeneric", "version": "4.0.1", - "sha256": "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d" + "hash": "sha256-jdCVXmGOsJ+2F0xAagCkiMZ91SGAm9iOhO2u4ksmKaU=" }, { "pname": "System.Collections.NonGeneric", "version": "4.3.0", - "sha256": "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k" + "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8=" }, { "pname": "System.Collections.Specialized", "version": "4.0.1", - "sha256": "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9" + "hash": "sha256-qao6hk9XKdRtpsqdks2uOx5jqT41KpuTCb1cg4w/e/E=" }, { "pname": "System.Collections.Specialized", "version": "4.3.0", - "sha256": "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20" + "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk=" }, { "pname": "System.ComponentModel", "version": "4.0.1", - "sha256": "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z" + "hash": "sha256-X5T36S49q1odsn6wAET6EGNlsxOyd66naMr5T3G9mGw=" }, { "pname": "System.ComponentModel", "version": "4.3.0", - "sha256": "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb" + "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU=" }, { "pname": "System.ComponentModel.EventBasedAsync", "version": "4.0.11", - "sha256": "07r5i7xwban347nsfw28hhjwpr78ywksjyhywvhj1yr0s7sr00wh" + "hash": "sha256-kAOQ9dEg+yDh5h56qSf36OTLJYRIcKftIcOqxfuJJR8=" }, { "pname": "System.ComponentModel.EventBasedAsync", "version": "4.3.0", - "sha256": "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7" + "hash": "sha256-h7o4X3XojdRyJWQdUfZetLdqtrQlddMzxhh6j9Zcaec=" }, { "pname": "System.ComponentModel.Primitives", "version": "4.1.0", - "sha256": "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0" + "hash": "sha256-AIcFeZDeYbaI4V9lY8TtUG+xkUyhA8K8dYSDp5StZXE=" }, { "pname": "System.ComponentModel.Primitives", "version": "4.3.0", - "sha256": "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0" + "hash": "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus=" }, { "pname": "System.ComponentModel.TypeConverter", "version": "4.1.0", - "sha256": "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y" + "hash": "sha256-HmzGTU2NVj8qUn1xCGxifOQ/e/HZCVvgIECzcJPaDJ0=" }, { "pname": "System.ComponentModel.TypeConverter", "version": "4.3.0", - "sha256": "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x" + "hash": "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54=" }, { "pname": "System.Configuration.ConfigurationManager", "version": "6.0.0", - "sha256": "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw" + "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=" }, { "pname": "System.Console", "version": "4.0.0", - "sha256": "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf" + "hash": "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo=" }, { "pname": "System.Diagnostics.Debug", "version": "4.0.11", - "sha256": "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz" + "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" }, { "pname": "System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "4.0.0", - "sha256": "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m" + "hash": "sha256-dYh9UoFesuGcHY+ewsI+z2WnNy+bwHPsHQ3t85cbzNg=" }, { "pname": "System.Diagnostics.Process", "version": "4.1.0", - "sha256": "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s" + "hash": "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg=" }, { "pname": "System.Diagnostics.Process", "version": "4.3.0", - "sha256": "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7" + "hash": "sha256-Rzo24qXhuJDDgrGNHr2eQRHhwLmsYmWDqAg/P5fOlzw=" }, { "pname": "System.Diagnostics.TextWriterTraceListener", "version": "4.0.0", - "sha256": "1xigiwkwyxak0dhm0p8i2zb7a9syly9cdb5s9zkr9rbad4f2fqhs" + "hash": "sha256-GmInHGlq5ZTnT7qsxpKnXid11hcRXVBhA1N1zyePL/Y=" }, { "pname": "System.Diagnostics.Tools", "version": "4.0.1", - "sha256": "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x" + "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" }, { "pname": "System.Diagnostics.TraceSource", "version": "4.0.0", - "sha256": "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h" + "hash": "sha256-cCjdPU7ow91HGf1hBIOLJMQGO6pNmF+N+5/Z38XJh9U=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.1.0", - "sha256": "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394" + "hash": "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, { "pname": "System.Drawing.Common", "version": "6.0.0", - "sha256": "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz" + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" }, { "pname": "System.Dynamic.Runtime", "version": "4.0.11", - "sha256": "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9" + "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" }, { "pname": "System.Globalization", "version": "4.0.11", - "sha256": "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d" + "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" }, { "pname": "System.Globalization", "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" }, { "pname": "System.Globalization.Calendars", "version": "4.0.1", - "sha256": "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh" + "hash": "sha256-EJN3LbN+b0O9Dr2eg7kfThCYpne0iJ/H/GIyUTNVYC8=" }, { "pname": "System.Globalization.Extensions", "version": "4.0.1", - "sha256": "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc" + "hash": "sha256-zLtkPryJwqTGcJqMC6zoMMvMrT+aAL5GoumjmMtqUEI=" }, { "pname": "System.Globalization.Extensions", "version": "4.3.0", - "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls" + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" }, { "pname": "System.IO", "version": "4.1.0", - "sha256": "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp" + "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" }, { "pname": "System.IO", "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, { "pname": "System.IO.Compression", "version": "4.1.0", - "sha256": "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji" + "hash": "sha256-UT4KEfJNZOk7b4X0AqLFUsqfHu6myVH/BhbRKYc+1Uc=" }, { "pname": "System.IO.Compression.ZipFile", "version": "4.0.1", - "sha256": "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82" + "hash": "sha256-An0Twb9JODl/nuVm6MR0kJ3aj4WxGpI/1/vVp5b94kA=" }, { "pname": "System.IO.FileSystem", "version": "4.0.1", - "sha256": "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1" + "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" }, { "pname": "System.IO.FileSystem", "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.0.1", - "sha256": "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612" + "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" }, { "pname": "System.Linq", "version": "4.1.0", - "sha256": "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5" + "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" }, { "pname": "System.Linq", "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, { "pname": "System.Linq.Async", "version": "6.0.1", - "sha256": "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq" + "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI=" }, { "pname": "System.Linq.Expressions", "version": "4.1.0", - "sha256": "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg" + "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" }, { "pname": "System.Net.Http", "version": "4.1.0", - "sha256": "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb" + "hash": "sha256-y6PnGuObJvOkhl9CXNFJQcV3SXuEz5yRLOCxGGTEucQ=" }, { "pname": "System.Net.NameResolution", "version": "4.3.0", - "sha256": "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq" + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" }, { "pname": "System.Net.Primitives", "version": "4.0.11", - "sha256": "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r" + "hash": "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M=" }, { "pname": "System.Net.Sockets", "version": "4.1.0", - "sha256": "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls" + "hash": "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0=" }, { "pname": "System.ObjectModel", "version": "4.0.12", - "sha256": "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj" + "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s=" }, { "pname": "System.Private.DataContractSerialization", "version": "4.1.1", - "sha256": "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r" + "hash": "sha256-OaE+ZcEfkpIkbdMOMAMiJa9vgiVP25FGuFrf+N/mafY=" }, { "pname": "System.Private.Uri", "version": "4.3.0", - "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx" + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { "pname": "System.Reactive", "version": "4.4.1", - "sha256": "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a" + "hash": "sha256-inA6nw9CX0g/AeygMwJoARGOY79pli/jLF54CweUqD8=" }, { "pname": "System.Reflection", "version": "4.1.0", - "sha256": "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9" + "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" }, { "pname": "System.Reflection", "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Emit", "version": "4.0.1", - "sha256": "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp" + "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.0.1", - "sha256": "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0" + "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.0.1", - "sha256": "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr" + "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" }, { "pname": "System.Reflection.Extensions", "version": "4.0.1", - "sha256": "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn" + "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ=" }, { "pname": "System.Reflection.Extensions", "version": "4.3.0", - "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq" + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" }, { "pname": "System.Reflection.Metadata", "version": "1.3.0", - "sha256": "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b" + "hash": "sha256-a/RQr++mSsziWaOTknicfIQX/zJrwPFExfhK6PM0tfg=" }, { "pname": "System.Reflection.Primitives", "version": "4.0.1", - "sha256": "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28" + "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.1.0", - "sha256": "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7" + "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.3.0", - "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1" + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" }, { "pname": "System.Resources.ResourceManager", "version": "4.0.1", - "sha256": "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi" + "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" }, { "pname": "System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" }, { "pname": "System.Runtime", "version": "4.1.0", - "sha256": "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m" + "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" }, { "pname": "System.Runtime", "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, { "pname": "System.Runtime.Caching", "version": "6.0.0", - "sha256": "0wh98a77cby4i3h2mar241k01105x661kh03vlyd399shxkfk60a" + "hash": "sha256-CpjpZoc6pdE83QPAGYzpBYQAZiAiqyrgiMQvdo5CCXI=" }, { "pname": "System.Runtime.Extensions", "version": "4.1.0", - "sha256": "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z" + "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, { "pname": "System.Runtime.Handles", "version": "4.0.1", - "sha256": "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g" + "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" }, { "pname": "System.Runtime.Handles", "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, { "pname": "System.Runtime.InteropServices", "version": "4.1.0", - "sha256": "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1" + "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, { "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.0.0", - "sha256": "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6" + "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4=" }, { "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.3.0", - "sha256": "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii" + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" }, { "pname": "System.Runtime.Loader", "version": "4.0.0", - "sha256": "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0" + "hash": "sha256-gE5/ehU3Qq5phhSxGuPmSv1DFVQeiyl1/+YyrO+I7lI=" }, { "pname": "System.Runtime.Numerics", "version": "4.0.1", - "sha256": "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn" + "hash": "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg=" }, { "pname": "System.Runtime.Serialization.Json", "version": "4.0.2", - "sha256": "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn" + "hash": "sha256-thmzgYbyxoPYtkDdDwoG7wnVuVhFNwLUE2AsDfRf1yM=" }, { "pname": "System.Runtime.Serialization.Primitives", "version": "4.1.1", - "sha256": "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k" + "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" }, { "pname": "System.Security.AccessControl", "version": "6.0.0", - "sha256": "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58" + "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" }, { "pname": "System.Security.Claims", "version": "4.3.0", - "sha256": "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn" + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.2.0", - "sha256": "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85" + "hash": "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE=" }, { "pname": "System.Security.Cryptography.Cng", "version": "4.2.0", - "sha256": "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc" + "hash": "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU=" }, { "pname": "System.Security.Cryptography.Csp", "version": "4.0.0", - "sha256": "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q" + "hash": "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M=" }, { "pname": "System.Security.Cryptography.Encoding", "version": "4.0.0", - "sha256": "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4" + "hash": "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik=" }, { "pname": "System.Security.Cryptography.OpenSsl", "version": "4.0.0", - "sha256": "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q" + "hash": "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs=" }, { "pname": "System.Security.Cryptography.Primitives", "version": "4.0.0", - "sha256": "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh" + "hash": "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ=" }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "6.0.0", - "sha256": "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss" + "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=" }, { "pname": "System.Security.Cryptography.X509Certificates", "version": "4.1.0", - "sha256": "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh" + "hash": "sha256-sBUUhJP+yYDXvcjNMKqNpn8yzGUpVABwK9vVUvYKjzI=" }, { "pname": "System.Security.Permissions", "version": "6.0.0", - "sha256": "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw" + "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" }, { "pname": "System.Security.Principal", "version": "4.3.0", - "sha256": "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf" + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" }, { "pname": "System.Security.Principal.Windows", "version": "4.3.0", - "sha256": "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr" + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" }, { "pname": "System.Text.Encoding", "version": "4.0.11", - "sha256": "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw" + "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" }, { "pname": "System.Text.Encoding", "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, { "pname": "System.Text.Encoding.Extensions", "version": "4.0.11", - "sha256": "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs" + "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI=" }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" }, { "pname": "System.Text.RegularExpressions", "version": "4.1.0", - "sha256": "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7" + "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c=" }, { "pname": "System.Text.RegularExpressions", "version": "4.3.0", - "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l" + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" }, { "pname": "System.Threading", "version": "4.0.11", - "sha256": "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls" + "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" }, { "pname": "System.Threading", "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, { "pname": "System.Threading.Tasks", "version": "4.0.11", - "sha256": "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5" + "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.0.0", - "sha256": "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr" + "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.3.0", - "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z" + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" }, { "pname": "System.Threading.Thread", "version": "4.0.0", - "sha256": "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc" + "hash": "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8=" }, { "pname": "System.Threading.Thread", "version": "4.3.0", - "sha256": "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4" + "hash": "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg=" }, { "pname": "System.Threading.ThreadPool", "version": "4.0.10", - "sha256": "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx" + "hash": "sha256-/fowWjM/0ZZFC1Rwu0i5N71iRxV2JOd3jQV2Jn0wuTk=" }, { "pname": "System.Threading.ThreadPool", "version": "4.3.0", - "sha256": "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1" + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" }, { "pname": "System.Threading.Timer", "version": "4.0.1", - "sha256": "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6" + "hash": "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY=" }, { "pname": "System.Windows.Extensions", "version": "6.0.0", - "sha256": "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip" + "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=" }, { "pname": "System.Xml.ReaderWriter", "version": "4.0.11", - "sha256": "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5" + "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA=" }, { "pname": "System.Xml.ReaderWriter", "version": "4.3.0", - "sha256": "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1" + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" }, { "pname": "System.Xml.XDocument", "version": "4.0.11", - "sha256": "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18" + "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" }, { "pname": "System.Xml.XmlDocument", "version": "4.0.1", - "sha256": "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1" + "hash": "sha256-gdoFrPo54v1LjkBF79f8EvtltVVjHz9ZI9kc5ve0GkY=" }, { "pname": "System.Xml.XmlDocument", "version": "4.3.0", - "sha256": "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi" + "hash": "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4=" }, { "pname": "System.Xml.XmlSerializer", "version": "4.0.11", - "sha256": "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z" + "hash": "sha256-v6x4d6W18dijG5cDqQmVHdtWRf6Y4OkdBolT3d5g3wY=" }, { "pname": "System.Xml.XPath", "version": "4.0.1", - "sha256": "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m" + "hash": "sha256-lQCoK2M51SGRuGjfiuIW26Y2goABY2RLE6cZ4816WDo=" }, { "pname": "System.Xml.XPath", "version": "4.3.0", - "sha256": "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci" + "hash": "sha256-kd1JMqj6obhxzEPRJeYvcUyJqkOs/9A0UOQccC6oYrM=" }, { "pname": "System.Xml.XPath.XmlDocument", "version": "4.0.1", - "sha256": "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc" + "hash": "sha256-bK9AfAYrdSipdRbmo8Rk7394ku92UFNe2TEQF5+k/lA=" }, { "pname": "System.Xml.XPath.XmlDocument", "version": "4.3.0", - "sha256": "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm" + "hash": "sha256-NWPne5KQuqUt7WvaRT1KX3kkpWv6EPTHcI6CO/GBNME=" } ] diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 71ef9beadd79..0cb3bf7e4539 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -4,20 +4,21 @@ fetchFromGitHub, z3, dotnetCorePackages, + nix-update-script, }: buildDotnetModule rec { pname = "Boogie"; - version = "3.4.2"; + version = "3.5.1"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; - rev = "v${version}"; - hash = "sha256-IWtYbb1IFB6DLIYYTP+q7q+h/0aqonxr/mWwf+83aRo="; + tag = "v${version}"; + hash = "sha256-0YZy4TYff6iupSAwDw8qvR6vdkUh8PDXKoKARfEyEPQ="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-sdk = dotnetCorePackages.sdk_8_0; projectFile = [ "Source/Boogie.sln" ]; nugetDeps = ./deps.json; @@ -42,7 +43,6 @@ buildDotnetModule rec { postFixup = '' ln -s "$out/bin/BoogieDriver" "$out/bin/boogie" - rm -f $out/bin/{Microsoft,NUnit3,System}.* "$out/bin"/*Tests ''; doInstallCheck = true; @@ -50,8 +50,11 @@ buildDotnetModule rec { $out/bin/boogie ${./install-check-file.bpl} ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Intermediate verification language"; + changelog = "https://github.com/boogie-org/boogie/releases/tag/${src.tag}"; homepage = "https://github.com/boogie-org/boogie"; longDescription = '' Boogie is an intermediate verification language (IVL), intended as a @@ -59,8 +62,9 @@ buildDotnetModule rec { This derivation may be used as a vim plugin to provide syntax highlighting. ''; - license = licenses.mspl; - maintainers = [ maintainers.taktoa ]; - platforms = with platforms; (linux ++ darwin); + license = lib.licenses.mspl; + mainProgram = "boogie"; + maintainers = with lib.maintainers; [ taktoa ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/by-name/bo/book-summary/package.nix b/pkgs/by-name/bo/book-summary/package.nix index 1d8e5ce13beb..961d19229d24 100644 --- a/pkgs/by-name/bo/book-summary/package.nix +++ b/pkgs/by-name/bo/book-summary/package.nix @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "book-summary"; homepage = "https://github.com/dvogt23/book-summary"; license = licenses.mit; - maintainers = with teams; iog.members; + teams = with teams; [ iog ]; }; } diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix new file mode 100644 index 000000000000..780f40250026 --- /dev/null +++ b/pkgs/by-name/bo/bootdev-cli/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + nix-update-script, + versionCheckHook, + writableTmpDirAsHomeHook, +}: + +buildGoModule rec { + pname = "bootdev-cli"; + version = "1.19.1"; + + src = fetchFromGitHub { + owner = "bootdotdev"; + repo = "bootdev"; + tag = "v${version}"; + hash = "sha256-cAVCTA4SZdD3QVgbSbha860fExq1swWnJjpWKpfHP2Q="; + }; + + vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM="; + + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ + installShellFiles + writableTmpDirAsHomeHook + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd bootdev \ + --bash <($out/bin/bootdev completion bash) \ + --zsh <($out/bin/bootdev completion zsh) \ + --fish <($out/bin/bootdev completion fish) + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/bootdev"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI used to complete coding challenges and lessons on Boot.dev"; + homepage = "https://github.com/bootdotdev/bootdev"; + changelog = "https://github.com/bootdotdev/bootdev/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vinnymeller ]; + mainProgram = "bootdev"; + }; +} diff --git a/pkgs/by-name/bo/bootloadhid/package.nix b/pkgs/by-name/bo/bootloadhid/package.nix new file mode 100644 index 000000000000..302ee02cd917 --- /dev/null +++ b/pkgs/by-name/bo/bootloadhid/package.nix @@ -0,0 +1,43 @@ +{ + fetchurl, + lib, + libusb-compat-0_1, + stdenv, + ... +}: + +stdenv.mkDerivation { + pname = "bootloadhid"; + version = "0-unstable-2012-12-08"; + + src = fetchurl { + url = "https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz"; + hash = "sha256-FU5+OGKaOi7sLfZm7foe4vLppXAY8X2fD48GTMINh1Q="; + }; + + nativeBuildInputs = [ + libusb-compat-0_1 + ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + setSourceRoot = "sourceRoot=$(echo */commandline)"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install bootloadHID $out/bin + + runHook postInstall + ''; + + meta = { + description = "USB boot loader for AVR microcontrollers with at least 2 kB of boot load section, e.g. ATMega8"; + homepage = "https://www.obdev.at/products/vusb/bootloadhid.html"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ thetaoofsu ]; + mainProgram = "bootloadHID"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/bo/bootspec-lix/package.nix b/pkgs/by-name/bo/bootspec-lix/package.nix new file mode 100644 index 000000000000..411c3e0f1e85 --- /dev/null +++ b/pkgs/by-name/bo/bootspec-lix/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromGitea, + fetchpatch, +}: +rustPlatform.buildRustPackage rec { + pname = "bootspec-lix"; + version = "1.0.0"; + + src = fetchFromGitea { + domain = "git.lix.systems"; + owner = "lix-community"; + repo = "bootspec"; + rev = "v${version}"; + 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="; + }) + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-65jk8UlXZgQoxuwRcGlMnI4e+LpCJuP2TaqK+Kn4GnQ="; + + meta = with lib; { + description = "Vendor-neutral implementation of RFC-0125's datatype and synthesis tooling"; + homepage = "https://git.lix.systems/lix-community/bootspec"; + license = licenses.mit; + maintainers = [ lib.maintainers.raitobezarius ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/bo/bootspec/package.nix b/pkgs/by-name/bo/bootspec/package.nix index 8ba4b349371c..b34ef43d0b2a 100644 --- a/pkgs/by-name/bo/bootspec/package.nix +++ b/pkgs/by-name/bo/bootspec/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { description = "Implementation of RFC-0125's datatype and synthesis tooling"; homepage = "https://github.com/DeterminateSystems/bootspec"; license = licenses.mit; - maintainers = teams.determinatesystems.members; + teams = [ teams.determinatesystems ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/bo/bore/package.nix b/pkgs/by-name/bo/bore/package.nix new file mode 100644 index 000000000000..6b1c58f072a2 --- /dev/null +++ b/pkgs/by-name/bo/bore/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromBitbucket, + installShellFiles, +}: + +rustPlatform.buildRustPackage rec { + pname = "bore"; + version = "0.4.1"; + + src = fetchFromBitbucket { + owner = "delan"; + repo = "nonymous"; + rev = "${pname}-${version}"; + sha256 = "1fdnnx7d18gj4rkv1dc6q379dqabl66zks9i0rjarjwcci8m30d9"; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-6uIqvX50XoWCPQ8u38rUdi4LwtMTBcNuefNmzGY+vLU="; + cargoBuildFlags = [ + "-p" + pname + ]; + + # error[E0793]: reference to packed field is unaligned + doCheck = !stdenv.hostPlatform.isDarwin; + + # FIXME can’t test --all-targets and --doc in a single invocation + cargoTestFlags = [ + "--all-targets" + "--workspace" + ]; + checkFeatures = [ "std" ]; + + nativeBuildInputs = [ + installShellFiles + ] ++ lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; + + postInstall = '' + installManPage $src/bore/doc/bore.1 + ''; + + doInstallCheck = true; + installCheckPhase = '' + printf '\0\0\0\0\0\0\0\0\0\0\0\0' \ + | $out/bin/bore --decode \ + | grep -q ';; NoError #0 Query 0 0 0 0 flags' + ''; + + meta = with lib; { + description = "DNS query tool"; + homepage = "https://crates.io/crates/bore"; + license = licenses.isc; + maintainers = [ ]; + mainProgram = "bore"; + broken = stdenv.hostPlatform.isDarwin; # bindgen fails on: "in6_addr_union_(...)" is not a valid Ident + }; +} diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix index e2be04cc98f9..afcc6d71902d 100644 --- a/pkgs/by-name/bo/borgbackup/package.nix +++ b/pkgs/by-name/bo/borgbackup/package.nix @@ -20,14 +20,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "borgbackup"; repo = "borg"; tag = version; - hash = "sha256-n1hCM7Sp0t2bOJEzErEd1PS/Xc7c+KDmJ4PjQuuF140="; + hash = "sha256-1RRizsHY6q1ruofTkRZ4sSN4k6Hoo+sG85w2zz+7yL8="; }; postPatch = '' @@ -45,6 +45,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ # docs sphinxHook + sphinxcontrib-jquery guzzle-sphinx-theme # shell completions @@ -78,6 +79,13 @@ python.pkgs.buildPythonApplication rec { ''--prefix PATH ':' "${openssh}/bin"'' ]; + preInstallSphinx = '' + # remove invalid outputs for manpages + rm .sphinx/man/man/_static/jquery.js + rm .sphinx/man/man/_static/_sphinx_javascript_frameworks_compat.js + rmdir .sphinx/man/man/_static/ + ''; + postInstall = '' installShellCompletion --cmd borg \ --bash scripts/shell_completions/bash/borg \ @@ -113,8 +121,6 @@ python.pkgs.buildPythonApplication rec { "test_get_keys_dir" "test_get_security_dir" "test_get_config_dir" - # https://github.com/borgbackup/borg/issues/6573 - "test_basic_functionality" ]; preCheck = '' diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index 6456f44e3e6e..eb2f5b5a9673 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -15,12 +15,12 @@ }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.9.14"; + version = "2.0.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-w503lwXlKWlTsguzECUGmsbhvdJzTF4XK+Ib2KuD2DE="; + hash = "sha256-jpaTLbDmwcL8ihu8XTD2LsSfmneBpOGSVaRcJyeSSo4="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix index 9c8ea8edad61..fa45b473b54a 100644 --- a/pkgs/by-name/bo/boringssl/package.nix +++ b/pkgs/by-name/bo/boringssl/package.nix @@ -55,6 +55,8 @@ buildGoModule { ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; installPhase = '' + runHook preInstall + mkdir -p $bin/bin $dev $out/lib mv tool/bssl $bin/bin @@ -64,6 +66,8 @@ buildGoModule { mv decrepit/libdecrepit.a $out/lib mv ../include $dev + + runHook postInstall ''; outputs = [ diff --git a/pkgs/by-name/bo/boringtun/package.nix b/pkgs/by-name/bo/boringtun/package.nix index f5dc75228c26..7c76299df70c 100644 --- a/pkgs/by-name/bo/boringtun/package.nix +++ b/pkgs/by-name/bo/boringtun/package.nix @@ -1,36 +1,32 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "boringtun"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "boringtun"; - rev = "boringtun-cli-${version}"; - sha256 = "sha256-PY7yqBNR4CYh8Y/vk4TYxxJnnv0eig8sjXp4dR4CX04="; + tag = "boringtun-${finalAttrs.version}"; + hash = "sha256-QrgKO0SVU4Z9GlNtZZmOV+Xcm1PonzLbUTGAFFOV/BM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-9qvX6P/DquQDlt6wOzI5ZQXQzNil1cD7KiuegDXtrQ0="; - - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + cargoHash = "sha256-j1I16QC46MMxcK7rbZJgI8KiKJvF29hkuGKiYLc6uW0="; # Testing this project requires sudo, Docker and network access, etc. doCheck = false; - meta = with lib; { + meta = { description = "Userspace WireGuard® implementation in Rust"; homepage = "https://github.com/cloudflare/boringtun"; - license = licenses.bsd3; - maintainers = with maintainers; [ xrelkd ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ xrelkd ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "boringtun-cli"; }; -} +}) diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix index 65e30e9c8014..1625c109899e 100644 --- a/pkgs/by-name/bo/bosh-cli/package.nix +++ b/pkgs/by-name/bo/bosh-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.9.4"; + version = "7.9.5"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GTxl0lsM1BMWTUAQfNYkJupDUCnXWavTnRZrkaCRpPc="; + sha256 = "sha256-CyrOsPx55hZubBV0t5uMTTLVWC1qmEym1IwinvmSlWM="; }; vendorHash = null; diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index 62b3b2af8ab5..04f2d5927435 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -20,24 +20,25 @@ lsb-release, pciutils, procps, + gamemode, gamescope, mangohud, vkbasalt-cli, vmtouch, libportal, nix-update-script, - removeWarningPopup ? false, # Final reminder to report any issues on nixpkgs' bugtracker + removeWarningPopup ? false, }: python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "51.17"; + version = "51.21"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; tag = version; - hash = "sha256-m4ATWpAZxIBp1X0cNeyNGmt6aIBo/cHH+DpOMkLia0E="; + hash = "sha256-rUS2LRr7NqTvNd706AC/U/QUDcF8tzwkHDuS3R0O1KY="; }; patches = @@ -45,7 +46,6 @@ python3Packages.buildPythonApplication rec { ./vulkan_icd.patch ./redirect-bugtracker.patch ./remove-flatpak-check.patch - ./remove-core-tab.patch ] ++ ( if removeWarningPopup then @@ -104,6 +104,7 @@ python3Packages.buildPythonApplication rec { imagemagick vkbasalt-cli + gamemode gamescope mangohud vmtouch @@ -132,6 +133,7 @@ python3Packages.buildPythonApplication rec { psydvl shamilton Gliczy + XBagon ]; platforms = lib.platforms.linux; mainProgram = "bottles"; diff --git a/pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch b/pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch deleted file mode 100644 index 79e88db7dc5f..000000000000 --- a/pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/bottles/frontend/ui/preferences.blp b/bottles/frontend/ui/preferences.blp -index 9dd12a16..c1fcf649 100644 ---- a/bottles/frontend/ui/preferences.blp -+++ b/bottles/frontend/ui/preferences.blp -@@ -284,20 +284,6 @@ template $PreferencesWindow: Adw.PreferencesWindow { - } - } - -- Adw.PreferencesPage pref_core { -- icon-name: "application-x-addon-symbolic"; -- title: _("Core"); -- visible: false; -- -- Adw.PreferencesGroup list_runtimes { -- title: _("Runtime"); -- } -- -- Adw.PreferencesGroup list_winebridge { -- title: _("WineBridge"); -- } -- } -- - Adw.PreferencesPage { - icon-name: "applications-science-symbolic"; - title: _("Experiments"); -diff --git a/bottles/frontend/views/preferences.py b/bottles/frontend/views/preferences.py -index ce7ec958..f46c6e5b 100644 ---- a/bottles/frontend/views/preferences.py -+++ b/bottles/frontend/views/preferences.py -@@ -53,8 +53,6 @@ class PreferencesWindow(Adw.PreferencesWindow): - switch_steam_programs = Gtk.Template.Child() - switch_epic_games = Gtk.Template.Child() - switch_ubisoft_connect = Gtk.Template.Child() -- list_winebridge = Gtk.Template.Child() -- list_runtimes = Gtk.Template.Child() - list_runners = Gtk.Template.Child() - list_dxvk = Gtk.Template.Child() - list_vkd3d = Gtk.Template.Child() -@@ -66,7 +64,6 @@ class PreferencesWindow(Adw.PreferencesWindow): - btn_bottles_path_reset = Gtk.Template.Child() - label_bottles_path = Gtk.Template.Child() - btn_steam_proton_doc = Gtk.Template.Child() -- pref_core = Gtk.Template.Child() - - # endregion - -@@ -170,10 +167,6 @@ class PreferencesWindow(Adw.PreferencesWindow): - self.installers_stack.set_visible_child_name("installers_offline") - self.dlls_stack.set_visible_child_name("dlls_offline") - -- # populate components lists -- self.populate_runtimes_list() -- self.populate_winebridge_list() -- - RunAsync(self.ui_update) - - # connect signals -@@ -319,18 +312,6 @@ class PreferencesWindow(Adw.PreferencesWindow): - list_component.add(_entry) - self.__registry.append(_entry) - -- def populate_runtimes_list(self): -- for runtime in self.manager.supported_runtimes.items(): -- self.list_runtimes.add( -- ComponentEntry(self.window, runtime, "runtime", is_upgradable=True) -- ) -- -- def populate_winebridge_list(self): -- for bridge in self.manager.supported_winebridge.items(): -- self.list_winebridge.add( -- ComponentEntry(self.window, bridge, "winebridge", is_upgradable=True) -- ) -- - def populate_dxvk_list(self): - self.__populate_component_list( - "dxvk", self.manager.supported_dxvk, self.list_dxvk diff --git a/pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch b/pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch index ddce9a0df8ee..d3388b11d31b 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch +++ b/pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch @@ -15,3 +15,80 @@ index 6ff7c011..c26ea0b9 100644 bottles_sources = [ '__init__.py', 'main.py', +diff --git a/bottles/frontend/views/bottle_details.py b/bottles/frontend/views/bottle_details.py +index 65667ea9..7ae1eb19 100644 +--- a/bottles/frontend/views/bottle_details.py ++++ b/bottles/frontend/views/bottle_details.py +@@ -436,20 +436,19 @@ class BottleView(Adw.PreferencesPage): + dialog.connect("response", execute) + dialog.show() + +- if Xdp.Portal.running_under_sandbox(): +- if self.window.settings.get_boolean("show-sandbox-warning"): +- dialog = Adw.MessageDialog.new( +- self.window, +- _("Be Aware of Sandbox"), +- _( +- "Bottles is running in a sandbox, a restricted permission environment needed to keep you safe. If the program won't run, consider moving inside the bottle (3 dots icon on the top), then launch from there." +- ), +- ) +- dialog.add_response("dismiss", _("_Dismiss")) +- dialog.connect("response", show_chooser) +- dialog.present() +- else: +- show_chooser() ++ if self.window.settings.get_boolean("show-sandbox-warning"): ++ dialog = Adw.MessageDialog.new( ++ self.window, ++ _("Be Aware of Sandbox"), ++ _( ++ "Bottles is running in a sandbox, a restricted permission environment needed to keep you safe. If the program won't run, consider moving inside the bottle (3 dots icon on the top), then launch from there." ++ ), ++ ) ++ dialog.add_response("dismiss", _("_Dismiss")) ++ dialog.connect("response", show_chooser) ++ dialog.present() ++ else: ++ show_chooser() + + def __backup(self, widget, backup_type): + """ +diff --git a/bottles/frontend/views/bottle_preferences.py b/bottles/frontend/views/bottle_preferences.py +index 288e693b..b8b57618 100644 +--- a/bottles/frontend/views/bottle_preferences.py ++++ b/bottles/frontend/views/bottle_preferences.py +@@ -139,7 +139,7 @@ class PreferencesView(Adw.PreferencesPage): + self.queue = details.queue + self.details = details + +- if not gamemode_available or not Xdp.Portal.running_under_sandbox(): ++ if not gamemode_available: + return + + _not_available = _("This feature is unavailable on your system.") +diff --git a/bottles/frontend/views/list.py b/bottles/frontend/views/list.py +index 43ab9c22..a283b178 100644 +--- a/bottles/frontend/views/list.py ++++ b/bottles/frontend/views/list.py +@@ -82,8 +82,6 @@ class BottlesBottleRow(Adw.ActionRow): + + def run_executable(self, *_args): + """Display file dialog for executable""" +- if not Xdp.Portal.running_under_sandbox(): +- return + + def set_path(_dialog, response): + if response != Gtk.ResponseType.ACCEPT: +diff --git a/bottles/frontend/views/new_bottle_dialog.py b/bottles/frontend/views/new_bottle_dialog.py +index a8b007d4..c6f0a156 100644 +--- a/bottles/frontend/views/new_bottle_dialog.py ++++ b/bottles/frontend/views/new_bottle_dialog.py +@@ -80,7 +80,7 @@ class BottlesNewBottleDialog(Adw.Dialog): + super().__init__(**kwargs) + # common variables and references + self.window = GtkUtils.get_parent_window() +- if not self.window or not Xdp.Portal.running_under_sandbox(): ++ if not self.window: + return + + self.app = self.window.get_application() diff --git a/pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch b/pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch index ed0ba631d3a7..1f343ff174d6 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch +++ b/pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch @@ -1,10 +1,8 @@ -diff --git a/bottles/frontend/windows/main_window.py b/bottles/frontend/windows/main_window.py -index 79bf0d72..e37ca43e 100644 ---- a/bottles/frontend/windows/main_window.py -index 79bf0d72..e37ca43e 100644 ---- a/bottles/frontend/windows/main_window.py -+++ b/bottles/frontend/windows/main_window.py -@@ -104,29 +104,15 @@ class MainWindow(Adw.ApplicationWindow): +diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py +index 802b08b5..c4cada1d 100644 +--- a/bottles/frontend/windows/window.py ++++ b/bottles/frontend/windows/window.py +@@ -102,29 +102,15 @@ class BottlesWindow(Adw.ApplicationWindow): def response(dialog, response, *args): if response == "close": diff --git a/pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch b/pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch index 192986ae725d..92fc4afc8fb2 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch +++ b/pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch @@ -1,8 +1,8 @@ -diff --git a/bottles/frontend/windows/main_window.py b/bottles/frontend/windows/main_window.py -index 79bf0d72..e3a15cb5 100644 ---- a/bottles/frontend/windows/main_window.py -+++ b/bottles/frontend/windows/main_window.py -@@ -104,29 +104,29 @@ class MainWindow(Adw.ApplicationWindow): +diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py +index 802b08b5..e3de0536 100644 +--- a/bottles/frontend/windows/window.py ++++ b/bottles/frontend/windows/window.py +@@ -102,29 +102,30 @@ class BottlesWindow(Adw.ApplicationWindow): def response(dialog, response, *args): if response == "close": @@ -15,15 +15,15 @@ index 79bf0d72..e3a15cb5 100644 ) - download_url = "usebottles.com/download" + bugtracker_url = "github.com/NixOS/nixpkgs/issues" ++ error_dialog = Adw.AlertDialog.new( _("Unsupported Environment"), - f"{body} {download_url}.", -+ f"{body} {bugtracker_url}.", ++ f"{body} {bugtracker_url}. \nThis warning can be disabled by overriding the package: `(pkgs.bottles.override {{ removeWarningPopup = true; }})`", ) -- error_dialog.add_response("close", _("Close")) -+ error_dialog.add_response("close", _("Understood")) + error_dialog.add_response("close", _("Close")) error_dialog.set_body_use_markup(True) error_dialog.connect("response", response) error_dialog.present(self) diff --git a/pkgs/by-name/bo/boulder/package.nix b/pkgs/by-name/bo/boulder/package.nix index aca011e0fba2..bf412476d179 100644 --- a/pkgs/by-name/bo/boulder/package.nix +++ b/pkgs/by-name/bo/boulder/package.nix @@ -4,16 +4,17 @@ buildGoModule, testers, boulder, + nix-update-script, }: buildGoModule rec { pname = "boulder"; - version = "2024-07-16"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "letsencrypt"; repo = "boulder"; - rev = "release-${version}"; + tag = "release-${version}"; leaveDotGit = true; postFetch = '' pushd $out @@ -21,7 +22,7 @@ buildGoModule rec { find $out -name .git -print0 | xargs -0 rm -rf popd ''; - hash = "sha256-mIUT9qVBPWrL0ySORwgEH6azaQmzMCl7ha/eYRtvAg4="; + hash = "sha256-FXk+JZJ1azpgN6IQ9aYmpUEO1CGs9/3sog1NjrfB4d8="; }; vendorHash = null; @@ -58,6 +59,7 @@ buildGoModule rec { "TestAddPrecertificateKeyHash" "TestAddPrecertificateNoOCSP" "TestAddRegistration" + "TestAddReplacementOrder" "TestAddSerial" "TestAdministrativelyRevokeCertificate" "TestAuthorization500" @@ -81,6 +83,7 @@ buildGoModule rec { "TestCheckCertReturnsDNSNames" "TestCheckExactCertificateLimit" "TestCheckFQDNSetRateLimitOverride" + "TestCheckIdentifiersPaused" "TestCheckWildcardCert" "TestCheckWildcardCert" "TestClientTransportCredentials" @@ -99,6 +102,7 @@ buildGoModule rec { "TestDeactivateAuthorization" "TestDeactivateRegistration" "TestDedupOnRegistration" + "TestDialerTimeout" "TestDirectory" "TestDontFindRevokedCert" "TestEarlyOrderRateLimiting" @@ -106,9 +110,11 @@ buildGoModule rec { "TestEnforceJWSAuthType" "TestExactPublicSuffixCertLimit" "TestExtractJWK" + "TestFQDNSetExists" "TestFQDNSetTimestampsForWindow" "TestFQDNSets" "TestFQDNSetsExists" + "TestFQDNSetsExists" "TestFailExit" "TestFasterGetOrderForNames" "TestFinalizeAuthorization2" @@ -116,6 +122,7 @@ buildGoModule rec { "TestFinalizeOrderWildcard" "TestFinalizeOrderWithMixedSANAndCN" "TestFinalizeSCTError" + "TestFinalizeWithMustStaple" "TestFindCertsAtCapacity" "TestFindExpiringCertificates" "TestFindIDs" @@ -145,6 +152,8 @@ buildGoModule rec { "TestGetOrder" "TestGetOrderExpired" "TestGetOrderForNames" + "TestGetPausedIdentifiers" + "TestGetPausedIdentifiersOnlyUnpausesOneAccount" "TestGetPendingAuthorization2" "TestGetRevokedCerts" "TestGetSerialMetadata" @@ -221,12 +230,15 @@ buildGoModule rec { "TestPOST404" "TestPanicStackTrace" "TestParseJWSRequest" + "TestPauseIdentifiers" "TestPendingAuthorizationsUnlimited" "TestPerformValidationAlreadyValid" "TestPerformValidationBadChallengeType" "TestPerformValidationExpired" "TestPerformValidationSuccess" "TestPerformValidationVAError" + "TestPerformValidation_FailedThenSuccessfulValidationResetsPauseIdentifiersRatelimit" + "TestPerformValidation_FailedValidationsTriggerPauseIdentifiersRatelimit" "TestPrepAuthzForDisplay" "TestPreresolvedDialerTimeout" "TestProcessCerts" @@ -242,6 +254,7 @@ buildGoModule rec { "TestRegistrationsPerIPOverrideUsage" "TestRehydrateHostPort" "TestRelativeDirectory" + "TestReplacementOrderExists" "TestReplicationLagRetries" "TestResolveContacts" "TestRevokeCertByApplicant_Controller" @@ -260,6 +273,7 @@ buildGoModule rec { "TestSerialsFromPrivateKey" "TestSetAndGet" "TestSetOrderProcessing" + "TestSetReplacementOrderFinalized" "TestSingleton" "TestStart" "TestStatusForOrder" @@ -268,6 +282,7 @@ buildGoModule rec { "TestTLSALPN01DialTimeout" "TestTLSConfigLoad" "TestTimeouts" + "TestUnpauseAccount" "TestUpdateCRLShard" "TestUpdateChallengeFinalizedAuthz" "TestUpdateChallengeRAError" @@ -275,6 +290,8 @@ buildGoModule rec { "TestUpdateMissingAuthorization" "TestUpdateNowWithAllFailingSRV" "TestUpdateNowWithOneFailingSRV" + "TestUpdateRegistrationContact" + "TestUpdateRegistrationKey" "TestUpdateRegistrationSame" "TestUpdateRevokedCertificate" "TestValidJWSForKey" @@ -302,12 +319,15 @@ buildGoModule rec { done ''; - passthru.tests.version = testers.testVersion { - package = boulder; - inherit version; + passthru = { + tests.version = testers.testVersion { + package = boulder; + inherit version; + }; + updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { homepage = "https://github.com/letsencrypt/boulder"; description = "ACME-based certificate authority, written in Go"; longDescription = '' @@ -317,8 +337,8 @@ buildGoModule rec { revoke certificates for their domains. Boulder is the software that runs Let's Encrypt. ''; - license = licenses.mpl20; + license = lib.licenses.mpl20; mainProgram = "boulder"; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/bo/box2d/cmake_dont_fetch_enkits.patch b/pkgs/by-name/bo/box2d/cmake_dont_fetch_enkits.patch new file mode 100644 index 000000000000..aa685fb71f14 --- /dev/null +++ b/pkgs/by-name/bo/box2d/cmake_dont_fetch_enkits.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8c1390e..791d3b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,10 +83,7 @@ if(PROJECT_IS_TOP_LEVEL) + # Used in tests and samples + FetchContent_Declare( + enkits +- GIT_REPOSITORY https://github.com/dougbinks/enkiTS.git +- GIT_TAG master +- GIT_SHALLOW TRUE +- GIT_PROGRESS TRUE ++ URL @enkits_src@ + ) + FetchContent_MakeAvailable(enkits) + endif() diff --git a/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch b/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch new file mode 100644 index 000000000000..dd76023882df --- /dev/null +++ b/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch @@ -0,0 +1,54 @@ +diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt +index 5020345..97af8c6 100644 +--- a/samples/CMakeLists.txt ++++ b/samples/CMakeLists.txt +@@ -17,47 +17,12 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "GLFW Examples") + set(GLFW_BUILD_TESTS OFF CACHE BOOL "GLFW Tests") + set(GLFW_INSTALL OFF CACHE BOOL "GLFW Install") + +-FetchContent_Declare( +- glfw +- GIT_REPOSITORY https://github.com/glfw/glfw.git +- GIT_TAG 3.4 +- GIT_SHALLOW TRUE +- GIT_PROGRESS TRUE +-) +-FetchContent_MakeAvailable(glfw) ++find_package(glfw) + + # imgui and glfw backend for GUI + # https://gist.github.com/jeffamstutz/992723dfabac4e3ffff265eb71a24cd9 + # Modified to pin to a specific imgui release +-FetchContent_Populate(imgui +- URL https://github.com/ocornut/imgui/archive/refs/tags/v1.91.3.zip +- SOURCE_DIR ${CMAKE_SOURCE_DIR}/build/imgui +-) +- +-set(IMGUI_DIR ${CMAKE_SOURCE_DIR}/build/imgui) +- +-add_library(imgui STATIC +- ${IMGUI_DIR}/imconfig.h +- ${IMGUI_DIR}/imgui.h +- +- ${IMGUI_DIR}/imgui.cpp +- ${IMGUI_DIR}/imgui_draw.cpp +- ${IMGUI_DIR}/imgui_demo.cpp +- ${IMGUI_DIR}/imgui_tables.cpp +- ${IMGUI_DIR}/imgui_widgets.cpp +- +- ${IMGUI_DIR}/backends/imgui_impl_glfw.cpp +- ${IMGUI_DIR}/backends/imgui_impl_opengl3.cpp +-) +- +-target_link_libraries(imgui PUBLIC glfw glad) +-target_include_directories(imgui PUBLIC ${IMGUI_DIR} ${IMGUI_DIR}/backends) +-target_compile_definitions(imgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS) +-set_target_properties(imgui PROPERTIES +- CXX_STANDARD 20 +- CXX_STANDARD_REQUIRED YES +- CXX_EXTENSIONS NO +-) ++find_package(imgui) + + # jsmn for json + set(JSMN_DIR ${CMAKE_SOURCE_DIR}/extern/jsmn) diff --git a/pkgs/by-name/bo/box2d/package.nix b/pkgs/by-name/bo/box2d/package.nix new file mode 100644 index 000000000000..27da46b1027e --- /dev/null +++ b/pkgs/by-name/bo/box2d/package.nix @@ -0,0 +1,100 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + replaceVars, + + # nativeBuildInputs + cmake, + pkg-config, + + # buildInputs + glfw3, + imgui, + libGLU, + libX11, + libXcursor, + libXi, + libXinerama, + libXrandr, + libglut, + xorgproto, + + nix-update-script, +}: + +let + inherit (lib) cmakeBool; + +in +stdenv.mkDerivation (finalAttrs: { + pname = "box2d"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "erincatto"; + repo = "box2d"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QTSU1+9x8GoUK3hlTDMh43fc4vbNfFR7syt6xVHIuPs="; + }; + + patches = [ + # prevent CMake from trying to download some libraries from the internet + (replaceVars ./cmake_dont_fetch_enkits.patch { + enkits_src = fetchFromGitHub { + owner = "dougbinks"; + repo = "enkiTS"; + rev = "686d0ec31829e0d9e5edf9ceb68c40f9b9b20ea9"; + hash = "sha256-CerLj/WY+J3mrMvv7dGmZltjAM9v5C/IY4X+Ph78HVs="; + }; + }) + ./cmake_use_system_glfw_and_imgui.patch + ]; + + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.cc.isGNU [ + # error: '*(float *)((char *)&localPointA + offsetof(b2Vec2, y))' may be used uninitialized + "-Wno-error=maybe-uninitialized" + ] + ); + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + glfw3 + (imgui.override { + # GLFW backend is disabled by default on darwin but box2d imports it unconditionally + # https://github.com/erincatto/box2d/blob/v3.1.0/samples/main.cpp#L28 + IMGUI_BUILD_GLFW_BINDING = true; + }) + libGLU + libX11 + libXcursor + libXi + libXinerama + libXrandr + libglut + xorgproto + ]; + + cmakeFlags = [ + (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "2D physics engine"; + homepage = "https://box2d.org/"; + changelog = "https://github.com/erincatto/box2d/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.unix; + license = lib.licenses.zlib; + }; +}) diff --git a/pkgs/by-name/bo/box2d_2/package.nix b/pkgs/by-name/bo/box2d_2/package.nix new file mode 100644 index 000000000000..48eb6c42bfc9 --- /dev/null +++ b/pkgs/by-name/bo/box2d_2/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + cmake, + pkg-config, + + # buildInputs + glfw3, + libGLU, + libX11, + libXcursor, + libXi, + libXinerama, + libXrandr, + libglut, + xorgproto, + + nix-update-script, +}: + +let + inherit (lib) cmakeBool; + +in +stdenv.mkDerivation (finalAttrs: { + pname = "box2d"; + version = "2.4.2"; + + src = fetchFromGitHub { + owner = "erincatto"; + repo = "box2d"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yvhpgiZpjTPeSY7Ma1bh4LwIokUUKB10v2WHlamL9D8="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + glfw3 + libGLU + libX11 + libXcursor + libXi + libXinerama + libXrandr + libglut + xorgproto + ]; + + cmakeFlags = [ + (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) + ]; + + meta = { + description = "2D physics engine"; + homepage = "https://box2d.org/"; + changelog = "https://github.com/erincatto/box2d/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.unix; + license = lib.licenses.zlib; + }; +}) diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix index 78d6f96e7044..e41ca1994904 100644 --- a/pkgs/by-name/bo/boxflat/package.nix +++ b/pkgs/by-name/bo/boxflat/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonPackage rec { pname = "boxflat"; - version = "1.28.5"; + version = "1.30.1"; pyproject = true; src = fetchFromGitHub { owner = "Lawstorant"; repo = "boxflat"; tag = "v${version}"; - hash = "sha256-YwszXAm0B1FuLfa9EKNoh0cXXxj82CXY5q8ot1G184M="; + hash = "sha256-5P6To0VRnvdu316bPIL7gDRuZLRjXLFbOpB9wZKs/t8="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/bp/bpfilter/package.nix b/pkgs/by-name/bp/bpfilter/package.nix index 52474e7775e4..f76bfcb465d3 100644 --- a/pkgs/by-name/bp/bpfilter/package.nix +++ b/pkgs/by-name/bp/bpfilter/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bpfilter"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "facebook"; repo = "bpfilter"; tag = "v${finalAttrs.version}"; - hash = "sha256-k8zl6WQ5htxu2nsubOoqMg69E/z+4TQTtywIfZG/G7U="; + hash = "sha256-Z0L4sY944cj/rqfOwwjNWOU0tZDAsZ1ocf4/djHad2Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 705e28a646bf..98ad818b4868 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.23.0"; + version = "0.23.2"; src = fetchFromGitHub { owner = "bpftrace"; repo = "bpftrace"; rev = "v${version}"; - hash = "sha256-OAT8nw5fFhKINK8Jy+RJXSvfU40G4fpR/5J1GPoyewY="; + hash = "sha256-AIjWF+MRnzEwvi1+XBxeiyJIX6059Hy8GgVwjZum2cc="; }; buildInputs = with llvmPackages; [ diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 8785f5c0f034..3b6c71e68f31 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.76.81"; + version = "1.78.102"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-Q9BCoSIgP0asYACkHgashQ5h4BITl5My4dxuy50ID8g="; + hash = "sha256-V+Kwdb1k/IbAOJfQ9+Nvr75MTQoGhuXM59X0nNmMfTc="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-Mzd1qxPUmlZkl7kmuO+rEVT8EE2EF8fQwdF2398gjoI="; + hash = "sha256-S5eN33LlpQJFoPkurLKooGkPvqLCV70TjqHVj2e54rk="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-5GrlXZW2uIHNpTXFHStWWfGpz4hINR9z6442n2g9258="; + hash = "sha256-BjPcuMOIj6wLZONEzCLZx2UhOM8Sibvb432we+j3Md4="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-gOZagyA0oM8KvM+FTsYV/vknG6fG/49rfNInQmN/8K4="; + hash = "sha256-/fl4Jq/7Q9phTjMHQiMjNgK2dU52rE7O98nLBaQlM9A="; }; }; diff --git a/pkgs/by-name/br/breakpointHook/attach.sh b/pkgs/by-name/br/breakpointHook/attach.sh index 0605adafdb62..afc192342fbc 100755 --- a/pkgs/by-name/br/breakpointHook/attach.sh +++ b/pkgs/by-name/br/breakpointHook/attach.sh @@ -56,6 +56,10 @@ elif [ "$(echo "$pids" | wc -l)" -ne 1 ]; then fi pid="$(echo "$pids" | head -n1)" + +# get the build top level directory inside the sandbox (eg. /build) +buildDir=$(getVar NIX_BUILD_TOP) + # bash is needed to load the env vars, as we do not know the syntax of the debug shell. # bashInteractive is used instead of bash, as we depend on it anyways, due to it being # the default debug shell @@ -71,11 +75,11 @@ pwd="$(readlink /proc/$pid/cwd)" # If another shell is chosen via `debugShell`, it will only have simple env vars avaialable. exec nsenter --mount --ipc --uts --pid --net --target "$pid" "$bashInteractive" -c " set -eu -o pipefail - source /build/env-vars + source \"$buildDir/env-vars\" cd \"$pwd\" if [ -n \"$debugShell\" ]; then exec \"$debugShell\" else - exec \"$bashInteractive\" --init-file /build/env-vars + exec \"$bashInteractive\" --init-file \"$buildDir/env-vars\" fi " diff --git a/pkgs/by-name/br/brev-cli/package.nix b/pkgs/by-name/br/brev-cli/package.nix index f4bc9b3468ec..698103ae8a71 100644 --- a/pkgs/by-name/br/brev-cli/package.nix +++ b/pkgs/by-name/br/brev-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.308"; + version = "0.6.310"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gqx/aOTpoN7nfstlFl4EulQ9Kzm/YlYOOiyrWIoJvcU="; + sha256 = "sha256-dZY87iUPr1NYZNERAzuxX/en0fgefekpXAi5Um1nTBc="; }; - vendorHash = "sha256-DMkBRya1Dxn8mcpuG/vtIt+v/9iVmb58iNe3fPY/xv4="; + vendorHash = "sha256-7MXZVdpsPHfHk8hNZM2CT0FW8gTKt3oUap7CTVYMNfI="; env.CGO_ENABLED = 0; subPackages = [ "." ]; diff --git a/pkgs/by-name/br/brewtarget/package.nix b/pkgs/by-name/br/brewtarget/package.nix new file mode 100644 index 000000000000..97e1594839d3 --- /dev/null +++ b/pkgs/by-name/br/brewtarget/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + meson, + ninja, + boost, + pandoc, + pkg-config, + xercesc, + xalanc, + qt6Packages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "brewtarget"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "Brewtarget"; + repo = "brewtarget"; + rev = "v${finalAttrs.version}"; + hash = "sha256-PAq+TjggGDSTkN3W1n+3IUIPDcfWbQcWKjoiDd95IV4="; + fetchSubmodules = true; + }; + + postPatch = '' + # 3 sed statements from below derived from AUR + # Disable boost-stacktrace_backtrace, requires an optional boost lib that's only built in Debianland + sed -i "/boostModules += 'stacktrace_backtrace'/ {N;N;d}" meson.build + # Make libbacktrace not required, we're not running the bt script + sed -i "/compiler\.find_library('backtrace'/ {n;s/true/false/}" meson.build + # Disable static linking + sed -i 's/static : true/static : false/g' meson.build + ''; + + nativeBuildInputs = [ + meson + cmake + ninja + pkg-config + qt6Packages.wrapQtAppsHook + pandoc + ]; + buildInputs = [ + boost + qt6Packages.qtbase + qt6Packages.qttools + qt6Packages.qtmultimedia + qt6Packages.qtsvg + xercesc + xalanc + ]; + + meta = { + description = "Open source beer recipe creation tool"; + mainProgram = "brewtarget"; + homepage = "http://www.brewtarget.org/"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ + avnik + mmahut + ]; + }; +}) diff --git a/pkgs/by-name/br/brial/package.nix b/pkgs/by-name/br/brial/package.nix index d82ac052d737..6e3ab205ccbc 100644 --- a/pkgs/by-name/br/brial/package.nix +++ b/pkgs/by-name/br/brial/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BRiAl/BRiAl"; description = "Legacy version of PolyBoRi maintained by sagemath developers"; license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/br/brickstore/package.nix b/pkgs/by-name/br/brickstore/package.nix index 0f53cf2c790e..44e3d45a017e 100644 --- a/pkgs/by-name/br/brickstore/package.nix +++ b/pkgs/by-name/br/brickstore/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "brickstore"; - version = "2024.5.2"; + version = "2024.12.3"; src = fetchFromGitHub { owner = "rgriebl"; repo = "brickstore"; rev = "v${finalAttrs.version}"; - hash = "sha256-Bu9oNbZm3lx/CfYAReHyWe/kW+kaefDWeBtWLHOCORU="; + hash = "sha256-4sxPplZ1t8sSfwTCeeBtfU4U0gcE9FROt6dKvkfyO6Q="; fetchSubmodules = true; }; @@ -45,16 +45,14 @@ stdenv.mkDerivation (finalAttrs: { tbb ]; - preConfigure = '' - sed -i '/^)$/d' cmake/BuildQCoro.cmake + patches = [ + ./qcoro-cmake.patch # Don't have CMake fetch qcoro from github, get it from nixpkgs + ./qjsonvalue-include.patch # Add a required '#include ' + ]; + # Since we get qcoro from nixpkgs instead, change the CMake file to reflect the right directory + preConfigure = '' substituteInPlace cmake/BuildQCoro.cmake \ - --replace-fail 'FetchContent_Declare(' ' ' \ - --replace-fail ' qcoro' ' ' \ - --replace-fail ' GIT_REPOSITORY https://github.com/danvratil/qcoro.git' ' ' \ - --replace-fail ' GIT_TAG v''${QCORO_VERSION}' ' ' \ - --replace-fail 'FetchContent_GetProperties(qcoro)' ' ' \ - --replace-fail 'FetchContent_Populate(qcoro)' ' ' \ --replace-fail \ 'add_subdirectory(''${qcoro_SOURCE_DIR} ''${qcoro_BINARY_DIR} EXCLUDE_FROM_ALL)' \ 'add_subdirectory(${qcoro.src} ${qcoro}bin/qcoro)' diff --git a/pkgs/by-name/br/brickstore/qcoro-cmake.patch b/pkgs/by-name/br/brickstore/qcoro-cmake.patch new file mode 100644 index 000000000000..824129b5cf48 --- /dev/null +++ b/pkgs/by-name/br/brickstore/qcoro-cmake.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/BuildQCoro.cmake b/cmake/BuildQCoro.cmake +index 941e813..41c88c6 100644 +--- a/cmake/BuildQCoro.cmake ++++ b/cmake/BuildQCoro.cmake +@@ -14,14 +14,6 @@ if (BACKEND_ONLY) + set(QCORO_WITH_QML OFF) + endif() + +-FetchContent_Declare( +- qcoro +- GIT_REPOSITORY https://github.com/danvratil/qcoro.git +- GIT_TAG v${QCORO_VERSION} +- SOURCE_SUBDIR "NeedManualAddSubDir" # make it possible to add_subdirectory below +-) +- +-FetchContent_MakeAvailable(qcoro) + + set(mll ${CMAKE_MESSAGE_LOG_LEVEL}) + if (NOT VERBOSE_FETCH) + diff --git a/pkgs/by-name/br/brickstore/qjsonvalue-include.patch b/pkgs/by-name/br/brickstore/qjsonvalue-include.patch new file mode 100644 index 000000000000..27ac28a2769e --- /dev/null +++ b/pkgs/by-name/br/brickstore/qjsonvalue-include.patch @@ -0,0 +1,12 @@ +diff --git a/src/bricklink/order.cpp b/src/bricklink/order.cpp +index 14426e5b..59856f0c 100755 +--- a/src/bricklink/order.cpp ++++ b/src/bricklink/order.cpp +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include "bricklink/core.h" + #include "bricklink/io.h" diff --git a/pkgs/by-name/br/brigand/package.nix b/pkgs/by-name/br/brigand/package.nix deleted file mode 100644 index d1cdee16f2e1..000000000000 --- a/pkgs/by-name/br/brigand/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, -}: - -stdenv.mkDerivation { - pname = "brigand"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "edouarda"; - repo = "brigand"; - rev = "4db9f665b4ece31b51aaf35b499b2c8e5811efa3"; - sha256 = "14b8r3s24zq0l3addy3irzxs5cyqn3763y5s310lmzzswgj1v7r4"; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Instant compile time C++ 11 metaprogramming library"; - longDescription = '' - Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library. - Everything you were doing with Boost.MPL can be done with Brigand. And if that's not the case, open an issue!''; - homepage = "https://github.com/edouarda/brigand"; - license = licenses.boost; - maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/by-name/br/brogue/fix-compilation.diff b/pkgs/by-name/br/brogue/fix-compilation.diff new file mode 100644 index 000000000000..e68f6fcafcc1 --- /dev/null +++ b/pkgs/by-name/br/brogue/fix-compilation.diff @@ -0,0 +1,38 @@ +diff --git a/src/brogue/Architect.c b/src/brogue/Architect.c +index abe5acf..b38291d 100755 +--- a/src/brogue/Architect.c ++++ b/src/brogue/Architect.c +@@ -1676,7 +1676,7 @@ void addMachines() { + // Add the amulet holder if it's depth 26: + if (rogue.depthLevel == AMULET_LEVEL) { + for (failsafe = 50; failsafe; failsafe--) { +- if (buildAMachine(MT_AMULET_AREA, -1, -1, NULL, NULL, NULL, NULL)) { ++ if (buildAMachine(MT_AMULET_AREA, -1, -1, 0L, NULL, NULL, NULL)) { + break; + } + } +diff --git a/src/brogue/RogueMain.c b/src/brogue/RogueMain.c +index 49b08b9..3666963 100755 +--- a/src/brogue/RogueMain.c ++++ b/src/brogue/RogueMain.c +@@ -880,7 +880,7 @@ void startLevel(short oldLevelNumber, short stairDirection) { + getQualifyingPathLocNear(&loc[0], &loc[1], + player.xLoc, player.yLoc, + true, +- T_DIVIDES_LEVEL, NULL, ++ T_DIVIDES_LEVEL, 0L, + T_PATHING_BLOCKER, (HAS_MONSTER | HAS_ITEM | HAS_STAIRS | IS_IN_MACHINE), + false); + } +diff --git a/src/platform/platformdependent.c b/src/platform/platformdependent.c +index 635a738..e725513 100644 +--- a/src/platform/platformdependent.c ++++ b/src/platform/platformdependent.c +@@ -21,6 +21,7 @@ + * along with Brogue. If not, see . + */ + ++#include + #include + #include + #include diff --git a/pkgs/by-name/br/brogue/package.nix b/pkgs/by-name/br/brogue/package.nix index c450b7c0ab5f..f3891abbd5ef 100644 --- a/pkgs/by-name/br/brogue/package.nix +++ b/pkgs/by-name/br/brogue/package.nix @@ -14,9 +14,11 @@ stdenv.mkDerivation (finalAttrs: { version = "1.7.5"; src = fetchurl { - url = "https://sites.google.com/site/broguegame/brogue-${finalAttrs.version}-linux-amd64.tbz2"; - sha256 = "0i042zb3axjf0cpgpdh8hvfn66dbfizidyvw0iymjk2n760z2kx7"; + url = "https://drive.google.com/uc?export=download&id=1ED_2nPubP-P0e_PHKYVzZF42M1Y9pUb4"; + hash = "sha256-p0/xgTlWTFl9BHz7Fn90qxlj3YYItvsuA052NdYXBEQ="; + name = "brogue.tbz2"; }; + patches = [ # Pull upstream fix for -fno-common toolchains: # https://github.com/tmewett/BrogueCE/pull/63 @@ -25,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/tmewett/BrogueCE/commit/2c7ed0c48d9efd06bf0a2589ba967c0a22a8fa87.patch"; sha256 = "19lr2fa25dh79klm4f4kqyyqq7w5xmw9z0fvylkcckqvcv7dwhp3"; }) + # error: passing argument 4 of 'buildAMachine' makes integer from pointer without a cast [] + ./fix-compilation.diff ]; prePatch = '' diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index ad607142586c..0337d6312945 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -4,32 +4,33 @@ rustPlatform, fetchFromGitHub, installShellFiles, - makeWrapper, + makeBinaryWrapper, pkg-config, libgit2, zlib, buildPackages, + versionCheckHook, withClipboard ? true, withTrash ? !stdenv.hostPlatform.isDarwin, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "broot"; - version = "1.45.1"; + version = "1.46.4"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; - rev = "v${version}"; - hash = "sha256-xLmVqYjQqjWMBm2A5OJl2wFIvxbWviX//J10BnKgWyk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-YoTR/rj/edg2KQhPRoihA38V4XM5EM5oJtLIH6zR/38="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8QRqRAXyqWS13TxUlSawjh/Qo4Qs5yQtNlqXj0hMW0c="; + cargoHash = "sha256-IFDKHsBTJFEmQ6FUG7yJmAEAVrzMvY9qbWQTnvUg274="; nativeBuildInputs = [ installShellFiles - makeWrapper + makeBinaryWrapper pkg-config ]; @@ -43,13 +44,13 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optionals withTrash [ "trash" ] ++ lib.optionals withClipboard [ "clipboard" ]; - RUSTONIG_SYSTEM_LIBONIG = true; + env.RUSTONIG_SYSTEM_LIBONIG = true; postPatch = '' # Fill the version stub in the man page. We can't fill the date # stub reproducibly. substitute man/page man/broot.1 \ - --replace "#version" "${version}" + --replace-fail "#version" "${finalAttrs.version}" ''; postInstall = @@ -84,16 +85,15 @@ rustPlatform.buildRustPackage rec { ''; doInstallCheck = true; - installCheckPhase = '' - $out/bin/broot --version | grep "${version}" - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "Interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; - changelog = "https://github.com/Canop/broot/releases/tag/v${version}"; + changelog = "https://github.com/Canop/broot/releases/tag/v${finalAttrs.version}"; maintainers = with maintainers; [ dywedir ]; license = with licenses; [ mit ]; mainProgram = "broot"; }; -} +}) diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix index b22741da77b0..d1e96531a95d 100644 --- a/pkgs/by-name/br/browsers/package.nix +++ b/pkgs/by-name/br/browsers/package.nix @@ -10,8 +10,6 @@ glib, gtk3, pango, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -33,21 +31,14 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildInputs = - [ - atk - cairo - gdk-pixbuf - glib - gtk3 - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.CoreText - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + pango + ]; postInstall = '' install -m 444 \ diff --git a/pkgs/by-name/br/brscan5/package.nix b/pkgs/by-name/br/brscan5/package.nix index 2a0490da9ed5..688d12caa454 100644 --- a/pkgs/by-name/br/brscan5/package.nix +++ b/pkgs/by-name/br/brscan5/package.nix @@ -9,6 +9,7 @@ glib, libredirect, nixosTests, + udevCheckHook, }: let myPatchElf = file: '' @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper patchelf + udevCheckHook ]; buildInputs = [ libusb1 @@ -79,6 +81,9 @@ stdenv.mkDerivation rec { # driver is hardcoded to look in /opt/brother/scanner/brscan5/models for model metadata. # patch it to look in /etc/opt/brother/scanner/models instead, so nixos environment.etc can make it available printf '/etc/opt/brother/scanner/models\x00' | dd of=opt/brother/scanner/brscan5/libsane-brother5.so.1.0.7 bs=1 seek=${toString patchOffsetBytes} conv=notrunc + + # remove deprecated SYSFS udev rule + sed -i -e '/^SYSFS/d' opt/brother/scanner/brscan5/udev-rules/*.rules ''; installPhase = '' @@ -111,7 +116,7 @@ stdenv.mkDerivation rec { echo "brother5" > $out/etc/sane.d/dll.d/brother5.conf mkdir -p $out/etc/udev/rules.d - cp -p $PATH_TO_BRSCAN5/udev-rules/NN-brother-mfp-brscan5-1.0.2-2.rules \ + install -m 0444 $PATH_TO_BRSCAN5/udev-rules/NN-brother-mfp-brscan5-1.0.2-2.rules \ $out/etc/udev/rules.d/49-brother-mfp-brscan5-1.0.2-2.rules ETCDIR=$out/etc/opt/brother/scanner/brscan5 @@ -121,6 +126,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; + # We want to run the udevCheckHook + doInstallCheck = true; + dontPatchELF = true; passthru.tests = { inherit (nixosTests) brscan5; }; diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix index 5540328dcc12..343ebd315164 100644 --- a/pkgs/by-name/br/bruno-cli/package.nix +++ b/pkgs/by-name/br/bruno-cli/package.nix @@ -38,6 +38,7 @@ buildNpmPackage { npm run build --workspace=packages/bruno-common npm run build --workspace=packages/bruno-graphql-docs npm run build --workspace=packages/bruno-query + npm run build --workspace=packages/bruno-requests npm run sandbox:bundle-libraries --workspace=packages/bruno-js diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 213057d99a3e..b7a9bb82e1a8 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -17,20 +17,20 @@ buildNpmPackage rec { pname = "bruno"; - version = "2.0.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-iKwmBkeyKlahzmPCPZ/S8XwIgTK6qD2XHiQkUu2nnZQ="; + hash = "sha256-ch8xqa4XZJvK6HDrDidgL+z8E9rezDkAqcpgBRy4E9E="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-t6KZc48nS9hyQZdOS4lVgcMw9RyyK7jEmMjA41s4HaY="; + npmDepsHash = "sha256-ZUZZWnp10Z4vQTZTTPenAXXpez6WbmB/S1VBiARuNP4="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = @@ -92,8 +92,10 @@ buildNpmPackage rec { npm run build --workspace=packages/bruno-common npm run build --workspace=packages/bruno-graphql-docs + npm run build --workspace=packages/bruno-converters npm run build --workspace=packages/bruno-app npm run build --workspace=packages/bruno-query + npm run build --workspace=packages/bruno-requests npm run sandbox:bundle-libraries --workspace=packages/bruno-js diff --git a/pkgs/by-name/br/brush/package.nix b/pkgs/by-name/br/brush/package.nix index 387af37b02d8..0a9e153f19ba 100644 --- a/pkgs/by-name/br/brush/package.nix +++ b/pkgs/by-name/br/brush/package.nix @@ -12,24 +12,24 @@ rustPlatform.buildRustPackage rec { pname = "brush"; - version = "0.2.16"; + version = "0.2.17"; src = fetchFromGitHub { owner = "reubeno"; repo = "brush"; tag = "brush-shell-v${version}"; - hash = "sha256-ZQ1IiWkM888CWEtwWJ+dMjJO1sGvBTA8E6f9v9JLh/w="; + hash = "sha256-64xj9yu6OCNTnuymEd5ihdE0s8RWfrSMfTz9TlMQ6Sg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Vg5efRierCc7sT+7b94/4i4+3L5CoOrDoeMx/Rzg5mE="; + cargoHash = "sha256-AIEgSUl3YFCa6FOgoZYpPc1qc2EOfpm1lZEQYlBgkGg="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; # Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false; diff --git a/pkgs/by-name/br/brutespray/package.nix b/pkgs/by-name/br/brutespray/package.nix index 910deace049e..3e94c0ed5fe7 100644 --- a/pkgs/by-name/br/brutespray/package.nix +++ b/pkgs/by-name/br/brutespray/package.nix @@ -1,47 +1,34 @@ { lib, - stdenv, - python3, + buildGoModule, fetchFromGitHub, - makeWrapper, + makeBinaryWrapper, medusa, }: -stdenv.mkDerivation rec { +buildGoModule (finalAttrs: { pname = "brutespray"; - version = "1.8.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "x90skysn3k"; repo = "brutespray"; - rev = "brutespray-${version}"; - sha256 = "sha256-O9HOsj0R6oHI7jjG4FBqbrSAQSVomgeD7tyPDNCNmIo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-oH7Gun/nKScv2buLwM6faiz9/3sl9l4JzkKbdTnGz0Q="; }; - postPatch = '' - substituteInPlace brutespray.py \ - --replace "/usr/share/brutespray" "$out/share/brutespray" - ''; + vendorHash = "sha256-TBLjCXb1W5FHBrzxBI0/3NMuM9eCizLiz489jyZsEso="; - dontBuild = true; - nativeBuildInputs = [ - python3.pkgs.wrapPython - makeWrapper - ]; - buildInputs = [ python3 ]; + nativeBuildInputs = [ makeBinaryWrapper ]; - installPhase = '' - install -Dm0755 brutespray.py $out/bin/brutespray - patchShebangs $out/bin - patchPythonScript $out/bin/brutespray + postInstall = '' wrapProgram $out/bin/brutespray \ --prefix PATH : ${lib.makeBinPath [ medusa ]} - mkdir -p $out/share/brutespray - cp -r wordlist/ $out/share/brutespray/wordlist + cp -r wordlist $out/share/brutespray/wordlist ''; - meta = with lib; { + meta = { homepage = "https://github.com/x90skysn3k/brutespray"; description = "Tool to do brute-forcing from Nmap output"; mainProgram = "brutespray"; @@ -49,7 +36,7 @@ stdenv.mkDerivation rec { This tool automatically attempts default credentials on found services directly from Nmap output. ''; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix new file mode 100644 index 000000000000..da2e6bbea66c --- /dev/null +++ b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, + dotnetCorePackages, +}: + +buildDotnetModule { + pname = "depotdownloader"; + version = "2.7.4-unstable-2024-12-01"; + + src = fetchFromGitHub { + owner = "Iluhadesu"; + repo = "DepotDownloader"; + rev = "a9f58e5513b72bd00b623a83e1460b3c5db49248"; + hash = "sha256-+QfwKQJzyXqUvTn8kKP7lYHvbtRtdJ7jc/W7E87tV7w="; + }; + + projectFile = "DepotDownloader.sln"; + nugetDeps = ./deps.json; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + meta = { + description = "Fork of DepotDownloader to be used by BSManager"; + license = lib.licenses.gpl2Only; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + mainProgram = "DepotDownloader"; + }; +} diff --git a/pkgs/by-name/bs/bs-manager/depotdownloader/deps.json b/pkgs/by-name/bs/bs-manager/depotdownloader/deps.json new file mode 100644 index 000000000000..85d09e76a9de --- /dev/null +++ b/pkgs/by-name/bs/bs-manager/depotdownloader/deps.json @@ -0,0 +1,67 @@ +[ + { + "pname": "Microsoft.NETCore.Platforms", + "version": "5.0.0", + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, + { + "pname": "Microsoft.Windows.CsWin32", + "version": "0.3.106", + "hash": "sha256-S1uQa684taPb6uh69784ebVpXoirMoX+pxBRA+Rrzlg=" + }, + { + "pname": "Microsoft.Windows.SDK.Win32Docs", + "version": "0.1.42-alpha", + "hash": "sha256-6DvzmNzrGVfWmNJNqooj+Ya+7bAQlyeg7pmyKaUlIws=" + }, + { + "pname": "Microsoft.Windows.SDK.Win32Metadata", + "version": "60.0.34-preview", + "hash": "sha256-KdRe73sXipzMvm2BLmwwBZGh+l9isZDC9l8WFyUR1zM=" + }, + { + "pname": "Microsoft.Windows.WDK.Win32Metadata", + "version": "0.11.4-experimental", + "hash": "sha256-b3oKUKbr+3Udfl7RWzUY9BR/XWNsN+VmEkBxk6KiFo0=" + }, + { + "pname": "protobuf-net", + "version": "3.2.30", + "hash": "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE=" + }, + { + "pname": "protobuf-net.Core", + "version": "3.2.30", + "hash": "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY=" + }, + { + "pname": "SteamKit2", + "version": "3.0.0-beta.4", + "hash": "sha256-7cXlpCuUD8ZuTMtqsT5MdklkZb+XIGBdoI28anjUXtg=" + }, + { + "pname": "System.Collections.Immutable", + "version": "7.0.0", + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + }, + { + "pname": "System.IO.Hashing", + "version": "8.0.0", + "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE=" + }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "5.0.0", + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + } +] diff --git a/pkgs/by-name/bs/bs-manager/package.nix b/pkgs/by-name/bs/bs-manager/package.nix index 207934fe86c9..1c5974b429f8 100644 --- a/pkgs/by-name/bs/bs-manager/package.nix +++ b/pkgs/by-name/bs/bs-manager/package.nix @@ -1,87 +1,143 @@ { - asar, - autoPatchelfHook, - dpkg, - electron, - fetchurl, lib, - makeWrapper, - nix-update-script, - openssl, stdenv, - zlib, + callPackage, + nix-update-script, + + buildNpmPackage, + fetchNpmDeps, + fetchFromGitHub, + makeDesktopItem, + + autoPatchelfHook, + copyDesktopItems, + makeWrapper, + + electron, + steam-run-free, }: -stdenv.mkDerivation (finalAttrs: { + +buildNpmPackage (finalAttrs: { pname = "bs-manager"; - version = "1.5.2"; + version = "1.5.3"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://github.com/Zagrios/bs-manager/releases/download/v1.5.2/bs-manager_1.5.2_amd64.deb"; - hash = "sha256-rNqnEez56t4TPIKhljC0HEams2xhj6nB3CGW0CuQBKQ="; - } - else - throw "BSManager is not available for your platform"; + src = fetchFromGitHub { + owner = "Zagrios"; + repo = "bs-manager"; + tag = "v${finalAttrs.version}"; + hash = "sha256-thqz6sFmov5py7mUBYUC6ANBgjnNFC1hfLEsaxJVYu8="; + }; - # TODO: Package BSManager's fork of DepotDownloader and replace vendored binary at $out/opt/BSManager/resources/assets/scripts/DepotDownloader - # See https://github.com/Iluhadesu/DepotDownloader + patches = [ + # https://github.com/Zagrios/bs-manager/pull/870 + ./use-steam-run-for-wine.patch + ]; + + postPatch = '' + # don't search for resources in electron's resource directory, but our own + substituteInPlace src/main/services/utils.service.ts \ + --replace-fail "process.resourcesPath" "'$out/share/bs-manager/resources'" + + # replace vendored DepotDownloader with our own + rm assets/scripts/DepotDownloader + ln -s ${finalAttrs.passthru.depotdownloader}/bin/DepotDownloader assets/scripts/DepotDownloader + ''; + + npmDepsHash = "sha256-VsCbz7ImDnJ0tonVhA4lOPA0w//tqF4hLhrReLUqYI8="; + + extraNpmDeps = fetchNpmDeps { + name = "bs-manager-${finalAttrs.version}-extra-npm-deps"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/release/app"; + hash = "sha256-JqDsv9kvYnbJdNwXN1EbppSrFVqr2cSnVhV2+8uw54g="; + }; + + makeCacheWritable = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + npmRebuildFlags = [ "--ignore-scripts" ]; nativeBuildInputs = [ - asar - autoPatchelfHook # for vendored DepotDownloader - dpkg + autoPatchelfHook # for some prebuilt node deps: query-process @resvg/resvg-js + copyDesktopItems makeWrapper ]; buildInputs = [ stdenv.cc.cc - zlib ]; - # DepotDownloader dlopen()s libssl - runtimeDependencies = [ - (lib.getLib openssl) - ]; + preBuild = '' + pushd release/app - dontConfigure = true; - dontBuild = true; + rm -r "$npm_config_cache" + npmDeps="$extraNpmDeps" npmConfigHook + npm run postinstall + + popd + ''; + + postBuild = '' + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + npm exec electron-builder -- \ + --dir \ + --config=electron-builder.config.js \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron.version} + ''; installPhase = '' runHook preInstall - mkdir -p $out/opt/BSManager - cp -r opt/BSManager/{locales,resources} $out/opt/BSManager - cp -Tr usr/ $out + for icon in build/icons/png/*.png; do + install -Dm644 $icon $out/share/icons/hicolor/$(basename $icon .png)/apps/bs-manager.png + done - # Some assets aren't included in the asar bundle. BSManager relies on - # process.resourcesPath to load some of these assets which we have to patch later - asar extract $out/opt/BSManager/resources/app.asar $out/opt/BSManager/resources - rm $out/opt/BSManager/resources/app.asar + mkdir -p $out/share/bs-manager + cp -r release/build/*-unpacked/{locales,resources{,.pak}} $out/share/bs-manager - # Update desktop Exec entry - substituteInPlace $out/share/applications/bs-manager.desktop \ - --replace-fail Exec=/opt/BSManager/bs-manager Exec=bs-manager - - mkdir -p $out/bin makeWrapper ${lib.getExe electron} $out/bin/bs-manager \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ - --add-flags $out/opt/BSManager/resources \ + --add-flags $out/share/bs-manager/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --prefix PATH : ${lib.makeBinPath [ steam-run-free ]} \ --inherit-argv0 runHook postInstall ''; - preFixup = '' - substituteInPlace "$out/opt/BSManager/resources/dist/main/main.js" \ - --replace-fail "process.resourcesPath" "'$out/opt/BSManager/resources'" - ''; + desktopItems = [ + (makeDesktopItem { + desktopName = "BSManager"; + name = "BSManager"; + exec = "bs-manager"; + terminal = false; + type = "Application"; + icon = "bs-manager"; + mimeTypes = [ + "x-scheme-handler/bsmanager" + "x-scheme-handler/beatsaver" + "x-scheme-handler/bsplaylist" + "x-scheme-handler/modelsaber" + "x-scheme-handler/web+bsmap" + ]; + categories = [ + "Utility" + "Game" + ]; + }) + ]; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + depotdownloader = callPackage ./depotdownloader { }; + }; meta = { - changelog = "https://github.com/Zagrios/bs-manager/blob/master/CHANGELOG.md"; + changelog = "https://github.com/Zagrios/bs-manager/blob/${finalAttrs.src.rev}/CHANGELOG.md"; description = "Your Beat Saber Assistant"; homepage = "https://github.com/Zagrios/bs-manager"; license = lib.licenses.gpl3Only; @@ -89,8 +145,12 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ mistyttm Scrumplex + ImSapphire + tomasajt + ]; + platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ + binaryNativeCode # prebuilt node deps ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/pkgs/by-name/bs/bs-manager/use-steam-run-for-wine.patch b/pkgs/by-name/bs/bs-manager/use-steam-run-for-wine.patch new file mode 100644 index 000000000000..1335a20877b7 --- /dev/null +++ b/pkgs/by-name/bs/bs-manager/use-steam-run-for-wine.patch @@ -0,0 +1,40 @@ +diff --git a/src/main/services/linux.service.ts b/src/main/services/linux.service.ts +index 7f92bed..5f12896 100644 +--- a/src/main/services/linux.service.ts ++++ b/src/main/services/linux.service.ts +@@ -129,12 +129,7 @@ export class LinuxService { + return fs.pathExistsSync(protonPath) && fs.pathExistsSync(winePath); + } + +- public async getWinePath(): Promise { +- if (await this.isNixOS()) { +- // Use system wine for nixos +- return "wine"; +- } +- ++ public getWinePath(): string { + if (!this.staticConfig.has("proton-folder")) { + throw new Error("proton-folder variable not set"); + } +diff --git a/src/main/services/mods/bs-mods-manager.service.ts b/src/main/services/mods/bs-mods-manager.service.ts +index c842fda..60cc190 100644 +--- a/src/main/services/mods/bs-mods-manager.service.ts ++++ b/src/main/services/mods/bs-mods-manager.service.ts +@@ -162,12 +162,15 @@ export class BsModsManagerService { + let winePath: string = ""; + if (process.platform === "linux") { + const { error: winePathError, result: winePathResult } = +- await tryit(async () => this.linuxService.getWinePath()); ++ tryit(() => this.linuxService.getWinePath()); + if (winePathError) { + log.error(winePathError); + return false; + } +- winePath = `"${winePathResult}"`; ++ ++ winePath = await this.linuxService.isNixOS() ++ ? `steam-run "${winePathResult}"` ++ : `"${winePathResult}"`; + + const winePrefix = this.linuxService.getWinePrefixPath(); + if (!winePrefix) { diff --git a/pkgs/by-name/bs/bsky-cli/package.nix b/pkgs/by-name/bs/bsky-cli/package.nix index 3a521dc04beb..e4fbfb6b9ab4 100644 --- a/pkgs/by-name/bs/bsky-cli/package.nix +++ b/pkgs/by-name/bs/bsky-cli/package.nix @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/bsky"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; nativeBuildInputs = [ versionCheckHook ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bs/bstone/package.nix b/pkgs/by-name/bs/bstone/package.nix index e5f98c653ad5..d49537671f82 100644 --- a/pkgs/by-name/bs/bstone/package.nix +++ b/pkgs/by-name/bs/bstone/package.nix @@ -3,19 +3,18 @@ stdenv, fetchFromGitHub, cmake, - SDL2, - libGL, + sdl2-compat, }: stdenv.mkDerivation (finalAttrs: { pname = "bstone"; - version = "1.2.13"; + version = "1.2.16"; src = fetchFromGitHub { owner = "bibendovsky"; repo = "bstone"; - rev = "v${finalAttrs.version}"; - hash = "sha256-jK40/FdC11SWe2Vmh6cbNTxPeM1vrAveEtUWoiAh+jc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-6BNIMBbLBcQoVx5lnUz14viAvBcFjoZLY8c30EgcvKQ="; }; nativeBuildInputs = [ @@ -23,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libGL - SDL2 + sdl2-compat ]; postInstall = '' - mkdir -p $out/bin - mv $out/bstone* $out/bin + mkdir -p $out/{bin,share/bibendovsky/bstone} + mv $out/bstone $out/bin + mv $out/*.txt $out/share/bibendovsky/bstone ''; meta = { diff --git a/pkgs/by-name/bt/btcpayserver/deps.json b/pkgs/by-name/bt/btcpayserver/deps.json index c1f584145e25..0476ee04605d 100644 --- a/pkgs/by-name/bt/btcpayserver/deps.json +++ b/pkgs/by-name/bt/btcpayserver/deps.json @@ -46,8 +46,8 @@ }, { "pname": "BTCPayServer.Hwi", - "version": "2.0.2", - "hash": "sha256-CUq68FosFJyUtjjpnONhqQEXjtC9mF7zmkRjZnGwA1I=" + "version": "2.0.6", + "hash": "sha256-LEj2R9hFQVCBol91l1ICn13z8rxT9iVkKT4krFskzLM=" }, { "pname": "BTCPayServer.Lightning.All", @@ -699,46 +699,21 @@ "version": "2.2.1", "hash": "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY=" }, - { - "pname": "NBitcoin", - "version": "5.0.40", - "hash": "sha256-cEu9luoct9YiL80z16THezZcaHgSPf6UU4Rz5QmyH+c=" - }, - { - "pname": "NBitcoin", - "version": "6.0.8", - "hash": "sha256-pfJRCSVAdh87SmEKeAYg7TNoGpQDtf026N+V0bL/ILk=" - }, - { - "pname": "NBitcoin", - "version": "7.0.31", - "hash": "sha256-sybd3AOGVlN7U6rLuWSi1kVxtBeaXb8iy786gc0CIh4=" - }, { "pname": "NBitcoin", "version": "7.0.45", "hash": "sha256-hWgtvAJvONk6jg1WiytE6M+ExkQJUCwO6cyVA6JE+8w=" }, - { - "pname": "NBitcoin", - "version": "7.0.46", - "hash": "sha256-c5KHQ/TYGBTMoKKKo7XYR8r7VTJlaU0ZW6KqWRMjh2Y=" - }, - { - "pname": "NBitcoin", - "version": "7.0.48", - "hash": "sha256-IbiCGHu1cug4kDzwS+vpTqX4jYifxWegFpIctjb/bOA=" - }, - { - "pname": "NBitcoin", - "version": "7.0.49", - "hash": "sha256-0MQSBeQahSX9s1PPFWengy5J8pWiKR48Vx7dsh3I2p4=" - }, { "pname": "NBitcoin", "version": "7.0.50", "hash": "sha256-l3H70u5OAbd2hevX/yeVBdQyee/dUn5mp4iGvTnTcjk=" }, + { + "pname": "NBitcoin", + "version": "8.0.8", + "hash": "sha256-gpbxlfE7TN7mUOcWF9+r8htQTc19KqAuzsVaG5RYa3A=" + }, { "pname": "NBitcoin.Altcoins", "version": "3.0.31", diff --git a/pkgs/by-name/bt/btcpayserver/package.nix b/pkgs/by-name/bt/btcpayserver/package.nix index a863bbf155b3..6c1eeff9b5c6 100644 --- a/pkgs/by-name/bt/btcpayserver/package.nix +++ b/pkgs/by-name/bt/btcpayserver/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "2.0.7"; + version = "2.1.1"; src = fetchFromGitHub { owner = "btcpayserver"; repo = "btcpayserver"; - rev = "v${version}"; - sha256 = "sha256-LOyGNdlU8wvDFmYQ2v1H3Z12++ChVrGM53zBTWCCiCk="; + tag = "v${version}"; + hash = "sha256-5zvxLEQbKTcslcpq1JRgY/L0XWnQ4UyFWww6SGcTtcs="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix new file mode 100644 index 000000000000..9926e922a985 --- /dev/null +++ b/pkgs/by-name/bt/btop/package.nix @@ -0,0 +1,66 @@ +{ + lib, + config, + stdenv, + fetchFromGitHub, + cmake, + removeReferencesTo, + autoAddDriverRunpath, + apple-sdk_15, + versionCheckHook, + rocmPackages, + cudaSupport ? config.cudaSupport, + rocmSupport ? config.rocmSupport, +}: + +stdenv.mkDerivation rec { + pname = "btop"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "aristocratos"; + repo = pname; + rev = "v${version}"; + hash = "sha256-4x2vGmH2dfHZHG+zj2KGsL/pRNIZ8K8sXYRHy0io5IE="; + }; + + nativeBuildInputs = + [ + cmake + ] + ++ lib.optionals cudaSupport [ + autoAddDriverRunpath + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + ]; + + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/bin/btop) + ''; + + postPhases = lib.optionals rocmSupport [ "postPatchelf" ]; + postPatchelf = lib.optionalString rocmSupport '' + patchelf --add-rpath ${lib.getLib rocmPackages.rocm-smi}/lib $out/bin/btop + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + meta = with lib; { + description = "Monitor of resources"; + homepage = "https://github.com/aristocratos/btop"; + changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ + khaneliman + rmcgibbo + ]; + mainProgram = "btop"; + }; +} diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix index 2cb63e250917..dead16e648bf 100644 --- a/pkgs/by-name/bt/btrfs-progs/package.nix +++ b/pkgs/by-name/bt/btrfs-progs/package.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation rec { homepage = "https://btrfs.readthedocs.io/en/latest/"; changelog = "https://github.com/kdave/btrfs-progs/raw/v${version}/CHANGES"; license = licenses.gpl2Only; + mainProgram = "btrfs"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/bu/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json index ff094b700c3e..01590ff23086 100644 --- a/pkgs/by-name/bu/buck2/hashes.json +++ b/pkgs/by-name/bu/buck2/hashes.json @@ -1,11 +1,11 @@ { "_comment": "@generated by pkgs/by-name/bu/buck2/update.sh" -, "_prelude": "sha256-o/YUIu8vuIIk2kfkMaijZNVLqwELwum4mFJ9sbqnDIs=" -, "buck2-x86_64-linux": "sha256-kN+nB1PAYIxG52BGM7kOmgUxVDKXhcWzyGyvWQ+CvTo=" -, "rust-project-x86_64-linux": "sha256-UbC43xyEIIT76K2OHnp4lBo3saoTeuZxYDRieEry+tE=" -, "buck2-x86_64-darwin": "sha256-oRDdUjHwtGB4xBj0tzJEIiAyI6LUVEVQbjNqdEJwu5E=" -, "rust-project-x86_64-darwin": "sha256-mp8xR4bFb9esN3QABG03H07t09caMNQLKOqxdg8+CEw=" -, "buck2-aarch64-linux": "sha256-9Y5ODzE90sAIKjxtZMA8nEkKPLfrpcQjPw0HPzzh/Hs=" -, "rust-project-aarch64-linux": "sha256-rwT6mO0lyRnyCfdUtYcdelJArHZCHP6K/A//n+yLtgA=" -, "buck2-aarch64-darwin": "sha256-kyPtJvkJ/fWCFqwtueqXsiazeu8xcAeXxvwQG+FjQ4M=" -, "rust-project-aarch64-darwin": "sha256-JYQiCEcplVHTK2iPLDBpGyyoMXU5B0/P/r8VCN1IDko=" +, "_prelude": "sha256-eU4EZ9OqJVUH/YPFctJZM+KZK70IEslr2qLUUvz3ctM=" +, "buck2-x86_64-linux": "sha256-r/5txsY7/i0fQaQsH40YdAhSD/bXtr5aGlAuxaOs8jg=" +, "rust-project-x86_64-linux": "sha256-XJFhaxJvOklMMO3emtdJS4zNu989HLCIU9qBP31XpCo=" +, "buck2-x86_64-darwin": "sha256-9SW0xn7w2dH81oHwze/ysnQyrIAgu8+1WJuXMmxslFo=" +, "rust-project-x86_64-darwin": "sha256-MvYv96OtOU7NEZKXf3gDvCjEcbegLI+1HFN7XBdPAXA=" +, "buck2-aarch64-linux": "sha256-wlmkgWdotvqxmflzoJG266weCsjxtM0mVO0xf7vKVr0=" +, "rust-project-aarch64-linux": "sha256-7zhO+s8LOuDj5ysyADkfqRIZiOG9ewBtfcB43sPfVc4=" +, "buck2-aarch64-darwin": "sha256-0bNtPX8TLTCxf7rEeiUYtJUbzRmgRdgHrv98mmmM/Rg=" +, "rust-project-aarch64-darwin": "sha256-a4OLLLYJjTBskXfB7OWqULPkV5amgDEHudJKRLGwuAU=" } diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix index 38a9ac04771b..9ce373f75736 100644 --- a/pkgs/by-name/bu/buck2/package.nix +++ b/pkgs/by-name/bu/buck2/package.nix @@ -44,7 +44,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # our version of buck2; this should be a git tag - version = "2025-01-02"; + version = "2025-05-06"; # map our platform name to the rust toolchain suffix # NOTE (aseipp): must be synchronized with update.sh! @@ -82,7 +82,7 @@ let # tooling prelude-src = let - prelude-hash = "d11a72de049a37b9b218a3ab8db33d3f97b9413c"; + prelude-hash = "48c249f8c7b99ff501d6e857754760315072b306"; name = "buck2-prelude-${version}.tar.gz"; hash = buildHashes."_prelude"; url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz"; diff --git a/pkgs/by-name/bu/buckets/package.nix b/pkgs/by-name/bu/buckets/package.nix index 4a572cf0d0cf..c0e90904add2 100644 --- a/pkgs/by-name/bu/buckets/package.nix +++ b/pkgs/by-name/bu/buckets/package.nix @@ -18,16 +18,16 @@ let .${system}; # Get hash in sri format - # nix-prefetch-url | xargs nix hash to-sri --type sha256 --extra-experimental-features nix-command + # nix-prefetch-url | xargs nix hash convert --hash-algo sha256 hash = { - x86_64-linux = "sha256-Gj/VDsV+ks8bhsFwU47+oBmsYOa0lQMHZeqQ3/IHm9E="; - aarch64-linux = "sha256-9pIT7iiarHBtHRdX5lqdfmJLJLMkugqZdprBZm5g1A8="; + x86_64-linux = "sha256-DK5+VT4+OCcJ4Bbv6GGs6R332GMsD1gNEmcz0iaJb1c="; + aarch64-linux = "sha256-Qu2YHGu0EPFaXjlUwJ7On8tOA9rqX/k8UnwADuRxoUk="; } .${system}; pname = "buckets"; - version = "0.75.0"; + version = "0.80.0"; src = fetchurl { url = "https://github.com/buckets/application/releases/download/v${version}/Buckets-linux-latest-${platform}-${version}.AppImage"; inherit hash; diff --git a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix index fe3c54487f6d..6031bb405457 100644 --- a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix +++ b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/samlane-ma/analogue-clock-applet"; changelog = "https://github.com/samlane-ma/analogue-clock-applet/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = lib.teams.budgie.members; + teams = [ lib.teams.budgie ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/bu/budgie-backgrounds/package.nix b/pkgs/by-name/bu/budgie-backgrounds/package.nix index 576f600fe731..b4f7b502ace6 100644 --- a/pkgs/by-name/bu/budgie-backgrounds/package.nix +++ b/pkgs/by-name/bu/budgie-backgrounds/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds"; changelog = "https://github.com/BuddiesOfBudgie/budgie-backgrounds/releases/tag/v${finalAttrs.version}"; license = lib.licenses.cc0; - maintainers = lib.teams.budgie.members; + teams = [ lib.teams.budgie ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 1e97c87364d8..6e45b327e7a4 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center"; changelog = "https://github.com/BuddiesOfBudgie/budgie-control-center/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; - maintainers = lib.teams.budgie.members; + teams = [ lib.teams.budgie ]; mainProgram = "budgie-control-center"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/bu/budgie-desktop-view/package.nix b/pkgs/by-name/bu/budgie-desktop-view/package.nix index 601f43fae1e7..f59d65b5d73e 100644 --- a/pkgs/by-name/bu/budgie-desktop-view/package.nix +++ b/pkgs/by-name/bu/budgie-desktop-view/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop-view"; changelog = "https://github.com/BuddiesOfBudgie/budgie-desktop-view/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; - maintainers = lib.teams.budgie.members; + teams = [ lib.teams.budgie ]; mainProgram = "org.buddiesofbudgie.budgie-desktop-view"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix index 2e09fcf99e41..e83ab613bfa3 100644 --- a/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix +++ b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { homepage changelog license - maintainers + teams platforms ; }; diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 6126ba0dd6e0..860cd7961bfd 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -77,6 +77,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/46c83b1265b4230668da472d9ef6926941678418.patch"; hash = "sha256-qnA8iBEctZbE86qIPudI1vMbgFy4xDWrxxej517ORws="; }) + + # Add override for overlay-key to prevent crash with mutter-common v48-rc + # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/683 + (fetchpatch { + url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/c24091bb424abe99ebcdd33eedd37068f735ad2a.patch"; + hash = "sha256-4WEkscftOGZmzH7imMTmcTDPH6eHMeEhgto+R5NNlh0="; + }) ]; nativeBuildInputs = [ @@ -145,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { lgpl21Plus cc-by-sa-30 ]; - maintainers = lib.teams.budgie.members; + teams = [ lib.teams.budgie ]; platforms = lib.platforms.linux; pkgConfigModules = [ "budgie-1.0" diff --git a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix index 02bd605ee3cf..ca3def9789ff 100644 --- a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix +++ b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix @@ -35,9 +35,6 @@ let [org.gnome.desktop.wm.preferences:Budgie] titlebar-font="Noto Sans Bold 10" - [org.gnome.mutter:Budgie] - edge-tiling=true - [com.solus-project.budgie-menu:Budgie] use-default-menu-icon=true diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix index cf44c39eae72..4f8c0a67a321 100644 --- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix +++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/zalesyc/budgie-media-player-applet/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = lib.teams.budgie.members; + teams = [ lib.teams.budgie ]; }; }) diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix index 85aeef52ec9e..355e811a2b85 100644 --- a/pkgs/by-name/bu/budgie-screensaver/package.nix +++ b/pkgs/by-name/bu/budgie-screensaver/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver"; changelog = "https://github.com/BuddiesOfBudgie/budgie-screensaver/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Only; - maintainers = lib.teams.budgie.members; + teams = [ lib.teams.budgie ]; mainProgram = "budgie-screensaver"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix index 7170bf16474c..93889789d360 100644 --- a/pkgs/by-name/bu/budgie-session/package.nix +++ b/pkgs/by-name/bu/budgie-session/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/BuddiesOfBudgie/budgie-session"; changelog = "https://github.com/BuddiesOfBudgie/budgie-session/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; - maintainers = lib.teams.budgie.members; + teams = [ lib.teams.budgie ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/bu/budgie-systemmonitor-applet/install-schemas-to-datadir.patch b/pkgs/by-name/bu/budgie-systemmonitor-applet/install-schemas-to-datadir.patch new file mode 100644 index 000000000000..292127b0db7f --- /dev/null +++ b/pkgs/by-name/bu/budgie-systemmonitor-applet/install-schemas-to-datadir.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index f63bdec..2de3778 100644 +--- a/meson.build ++++ b/meson.build +@@ -52,7 +52,7 @@ add_project_arguments( + LIB_INSTALL_DIR = join_paths(libdir, 'budgie-desktop', 'plugins', meson.project_name()) + + install_data('schema/com.prateekmedia.systemmonitor.gschema.xml', +- install_dir: '/usr/share/glib-2.0/schemas' ++ install_dir: join_paths(datadir, 'glib-2.0/schemas') + ) + + subdir('icons') diff --git a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix new file mode 100644 index 000000000000..b4bb9cb2ae23 --- /dev/null +++ b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + budgie-desktop, + fetchFromGitHub, + glib, + gtk3, + libgee, + libgtop, + libpeas, + meson, + ninja, + nix-update-script, + pkg-config, + vala, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "budgie-systemmonitor-applet"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "prateekmedia"; + repo = "budgie-systemmonitor-applet"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OWGy2LokpMOW4ZR3K+Bym7i88xQAJqWO43Pu7SjxRSw="; + }; + + # Remove if/when https://github.com/prateekmedia/budgie-systemmonitor-applet/pull/3 is merged + patches = [ ./install-schemas-to-datadir.patch ]; + + strictDeps = true; + + nativeBuildInputs = [ + glib # For `glib-compile-schemas` + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + budgie-desktop + glib + gtk3 + libgee + libgtop + libpeas + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Budgie applet to show cpu frequency, ram, swap, network and uptime"; + homepage = "https://github.com/prateekmedia/budgie-systemmonitor-applet"; + changelog = "https://github.com/prateekmedia/budgie-systemmonitor-applet/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.budgie.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix index dd95b40ceca9..8a90ba6725ed 100644 --- a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix +++ b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = lib.teams.budgie.members; + teams = [ lib.teams.budgie ]; }; }) diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index ba104a09d707..3ef29d223170 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "buf"; - version = "1.51.0"; + version = "1.52.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-/6SDsIVyorDWjOkdUB1t0vAA2VLy6MiGyiFo+2rUfEU="; + hash = "sha256-oHmTOQBvuJWQdmC/LL72r+n2uwaQC8z3/1BRM0NzMbI="; }; - vendorHash = "sha256-4GD2yNfYTQobPeJ+zPQ+ECDTeNUi4PK8oXSxpBF/4Wk="; + vendorHash = "sha256-+zJ2pCLyXnqFOIWWfnhAzSnUOjQSDo4AqCxBNNZED7E="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix index 1482119defbf..c3c04a12a985 100644 --- a/pkgs/by-name/bu/buffer/package.nix +++ b/pkgs/by-name/bu/buffer/package.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "buffer"; - version = "0.9.7"; + version = "0.9.10"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "cheywood"; repo = "buffer"; - rev = finalAttrs.version; - hash = "sha256-W6LTTQvIMAB99q2W11EBlBknJnOuv4ptgf5SSM422Cg="; + tag = finalAttrs.version; + hash = "sha256-amWfrZX1b1OmLhL7w8j/+iEwYRnO1DVR580pLkjtS/g="; }; nativeBuildInputs = [ @@ -54,12 +54,12 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - meta = with lib; { + meta = { description = "Minimal editing space for all those things that don't need keeping"; homepage = "https://gitlab.gnome.org/cheywood/buffer"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; mainProgram = "buffer"; - maintainers = with maintainers; [ michaelgrahamevans ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ michaelgrahamevans ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix new file mode 100644 index 000000000000..f72a9c357b16 --- /dev/null +++ b/pkgs/by-name/bu/buffrs/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "buffrs"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "helsing-ai"; + repo = "buffrs"; + tag = "v${version}"; + hash = "sha256-lqSaXTuIXeuvS01i/35oLUU39FpVEpMoR3OSRstKhjI="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-3urjpHMW46ZnPMsiaRgRyhFOKA+080MauNESRjf/W1Y="; + + # Disabling tests meant to work over the network, as they will fail + # inside the builder. + checkFlags = [ + "--skip=cmd::install::upgrade::fixture" + "--skip=cmd::publish::lib::fixture" + "--skip=cmd::publish::local::fixture" + "--skip=cmd::tuto::fixture" + ]; + + meta = { + description = "Modern protobuf package management"; + homepage = "https://github.com/helsing-ai/buffrs"; + license = lib.licenses.asl20; + mainProgram = "buffrs"; + maintainers = with lib.maintainers; [ danilobuerger ]; + }; +} diff --git a/pkgs/by-name/bu/buffybox/package.nix b/pkgs/by-name/bu/buffybox/package.nix index 734edca31ddc..3e6af13bacf8 100644 --- a/pkgs/by-name/bu/buffybox/package.nix +++ b/pkgs/by-name/bu/buffybox/package.nix @@ -11,27 +11,32 @@ pkg-config, scdoc, stdenv, - unstableGitUpdater, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "buffybox"; - version = "3.2.0-unstable-2025-03-16"; + version = "3.3.0"; src = fetchFromGitLab { domain = "gitlab.postmarketos.org"; owner = "postmarketOS"; repo = "buffybox"; fetchSubmodules = true; # to use its vendored lvgl - rev = "56a9867e90ece88596e330774da64cf277069b59"; - hash = "sha256-4lSgswcvvV6W1KN6QhsjeHY8MMXXC4fRYBmPE/hb0vA="; + rev = "dce41a6f07a2b63c3136409b7bcd0078299fadf9"; + hash = "sha256-n5RQg7kGS+lg7sRe5Defl3nDEha0vhc/FbwywD5wBsg="; }; patches = [ (fetchpatch2 { - # https://gitlab.postmarketos.org/postmarketOS/buffybox/-/merge_requests/42 - url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/commit/1f0c30e88dc61b8b508696cd890393c3b7911b58.patch?full_index=1"; - hash = "sha256-hQ6Hjfyj059j2cRfrFz9Se6xRowIGW1HVHULLYtHcS8="; + # This fixes a bug that might annoy you if you use something like PKCS#11 + url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/commit/d8214b522a3cc72cd4639a1dd114103a02e9218c.patch"; + hash = "sha256-WxKuioJ1Fo5ARRYF/R4yULDVB4pq11phljzVGdWTV6s="; + }) + (fetchpatch2 { + # Fixes up UB + url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/commit/4e13c312241420cbb3e5cc7d4f0dd3e5d17449be.patch"; + hash = "sha256-7yX6gGsptwijx+ZedSJWJKhwaoBVpxIbGK+ZiMLsIhc="; }) ]; @@ -57,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A suite of graphical applications for the terminal"; diff --git a/pkgs/by-name/bu/bufisk/package.nix b/pkgs/by-name/bu/bufisk/package.nix index 05ec70526546..d04834079f62 100644 --- a/pkgs/by-name/bu/bufisk/package.nix +++ b/pkgs/by-name/bu/bufisk/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "bufisk"; version = "0.1.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "bufisk"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pVnqvQn7jwpx6T3sS4eA29JeJdh0GrPVm0J8n2UjJTw="; }; @@ -29,4 +29,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "bufisk"; }; -} +}) diff --git a/pkgs/by-name/bu/bugdom/package.nix b/pkgs/by-name/bu/bugdom/package.nix new file mode 100644 index 000000000000..924b69f29f50 --- /dev/null +++ b/pkgs/by-name/bu/bugdom/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitHub, + SDL2, + libGL, + cmake, + makeWrapper, +}: + +stdenv.mkDerivation rec { + pname = "bugdom"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "jorio"; + repo = pname; + rev = version; + hash = "sha256-0c7v5tSqYuqtLOFl4sqD7+naJNqX/wlKHVntkZQGJ8A="; + fetchSubmodules = true; + }; + + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Expects SDL2.framework in specific location, which we don't have + # Passing this in cmakeFlags doesn't work because the path is hard-coded for Darwin + substituteInPlace cmake/FindSDL2.cmake \ + --replace 'set(SDL2_LIBRARIES' 'set(SDL2_LIBRARIES "${SDL2}/lib/libSDL2.dylib") #' + # Expects plutil, which we don't have + sed -i '/plutil/d' CMakeLists.txt + ''; + + buildInputs = [ + + SDL2 + libGL + ]; + + nativeBuildInputs = [ + cmake + makeWrapper + ]; + + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" + # Expects SDL2.framework in specific location, which we don't have + "-DSDL2_INCLUDE_DIRS=${lib.getInclude SDL2}/include/SDL2" + ]; + + installPhase = + '' + runHook preInstall + + '' + + ( + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/{bin,Applications} + mv {,$out/Applications/}Bugdom.app + makeWrapper $out/{Applications/Bugdom.app/Contents/MacOS,bin}/Bugdom + '' + else + '' + mkdir -p $out/share/bugdom + mv Data $out/share/bugdom + install -Dm755 {.,$out/bin}/Bugdom + wrapProgram $out/bin/Bugdom --run "cd $out/share/bugdom" + install -Dm644 $src/packaging/io.jor.bugdom.desktop $out/share/applications/io.jor.bugdom.desktop + install -Dm644 $src/packaging/io.jor.bugdom.png $out/share/pixmaps/io.jor.bugdom.png + '' + ) + + '' + + runHook postInstall + ''; + + meta = with lib; { + description = "Port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems"; + homepage = "https://github.com/jorio/Bugdom"; + license = with licenses; [ cc-by-sa-40 ]; + maintainers = with maintainers; [ lux ]; + mainProgram = "Bugdom"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/bu/bugstalker/package.nix b/pkgs/by-name/bu/bugstalker/package.nix index b1393ba65ae9..86135b2abd44 100644 --- a/pkgs/by-name/bu/bugstalker/package.nix +++ b/pkgs/by-name/bu/bugstalker/package.nix @@ -6,19 +6,19 @@ libunwind, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "bugstalker"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "godzie44"; repo = "BugStalker"; - rev = "v${version}"; - hash = "sha256-JacRt+zNwL7hdpdh5h9Mxztqi47f5eUbcZyx6ct/5Bc="; + rev = "v${finalAttrs.version}"; + hash = "sha256-8Iqg2coFsPQY3ws5MEC1LhTu+Z1lXeI3ccjgoBS454o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-w599KFLbyxFQzxIk6s9obPv804TLreOCMj/eApeSk7A="; + cargoHash = "sha256-a5YI6bOo/rsi9hZO1BcVMjJtdrYq2aHqxtlO3F+P+8s="; buildInputs = [ libunwind ]; @@ -35,4 +35,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "bs"; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/bu/buildbox/package.nix b/pkgs/by-name/bu/buildbox/package.nix index eae793cf4599..1a370c55d8c8 100644 --- a/pkgs/by-name/bu/buildbox/package.nix +++ b/pkgs/by-name/bu/buildbox/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "buildbox"; - version = "1.3.7"; + version = "1.3.11"; src = fetchFromGitLab { owner = "BuildGrid"; repo = "buildbox/buildbox"; tag = finalAttrs.version; - hash = "sha256-US0qJrKoAYR4rMmolC8jx7IpQ2PiHZy7L2bog+I3G48="; + hash = "sha256-lIRYwZLjYCpA4TMO3GF/yykVKn7LDyNHW9zItZmS9vM="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postFixup = '' - makeWrapper $out/bin/buildbox-run-bubblewrap $out/bin/buildbox-run --prefix PATH : ${lib.makeBinPath [ bubblewrap ]} + wrapProgram $out/bin/buildbox-run --prefix PATH : ${lib.makeBinPath [ bubblewrap ]} ''; meta = { diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix index 210e4d6f61cb..3442fa8a862a 100644 --- a/pkgs/by-name/bu/buildkit/package.nix +++ b/pkgs/by-name/bu/buildkit/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.20.2"; + version = "0.21.1"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-2zLXkiouPLmjxveoggsr+WUmdcZEN+FzeiVR1Dk6EA8="; + hash = "sha256-qLErgFS/Vos99Yx7gUeLa0ysO6Anzm+kDIgKQQbQL3w="; }; vendorHash = null; diff --git a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix index 5cc2d5900e33..1c416a848597 100644 --- a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix +++ b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix @@ -30,6 +30,6 @@ buildGoModule rec { description = "Command-line tool (and Lambda) for collecting Buildkite agent metrics"; homepage = "https://github.com/buildkite/buildkite-agent-metrics"; license = licenses.mit; - maintainers = teams.determinatesystems.members; + teams = [ teams.determinatesystems ]; }; } diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix new file mode 100644 index 000000000000..21373e5e8914 --- /dev/null +++ b/pkgs/by-name/bu/buildstream/package.nix @@ -0,0 +1,116 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + + # buildInputs + buildbox, + fuse3, + lzip, + patch, + + # tests + addBinToPathHook, + gitMinimal, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "buildstream"; + version = "2.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "apache"; + repo = "buildstream"; + tag = version; + hash = "sha256-6a0VzYO5yj7EHvAb0xa4xZ0dgBKjFcwKv2F4o93oahY="; + }; + + build-system = with python3Packages; [ + cython + pdm-pep517 + setuptools + setuptools-scm + ]; + + dependencies = with python3Packages; [ + click + dulwich + grpcio + jinja2 + markupsafe + packaging + pluginbase + protobuf + psutil + pyroaring + requests + ruamel-yaml + ruamel-yaml-clib + tomlkit + ujson + ]; + + buildInputs = [ + buildbox + fuse3 + lzip + patch + ]; + + pythonImportsCheck = [ "buildstream" ]; + + nativeCheckInputs = [ + addBinToPathHook + buildbox + gitMinimal + python3Packages.pexpect + python3Packages.pyftpdlib + python3Packages.pytest-datafiles + python3Packages.pytest-env + python3Packages.pytest-timeout + python3Packages.pytest-xdist + python3Packages.pytestCheckHook + versionCheckHook + ]; + + disabledTests = [ + # ValueError: Unexpected comparison between all and '' + "test_help" + + # Error loading project: project.conf [line 37 column 2]: Failed to load source-mirror plugin 'mirror': No package metadata was found for sample-plugins + "test_source_mirror_plugin" + + # AssertionError: assert '1a5528cad211...0bbe5ee314c14' == '2ccfee62a657...52dbc47203a88' + "test_fixed_cas_import" + "test_random_cas_import" + + # Runtime error: The FUSE stager child process unexpectedly died with exit code 2 + "test_patch_sources_cached_1" + "test_patch_sources_cached_2" + "test_source_cache_key" + "test_custom_transform_source" + + # Blob not found in the local CAS + "test_source_pull_partial_fallback_fetch" + ]; + + disabledTestPaths = [ + # FileNotFoundError: [Errno 2] No such file or directory: '/build/source/tmp/popen-gw1/test_report_when_cascache_exit0/buildbox-casd' + "tests/internals/cascache.py" + ]; + + versionCheckProgram = "${placeholder "out"}/bin/bst"; + versionCheckProgramArg = "--version"; + + meta = { + description = "Powerful software integration tool"; + downloadPage = "https://buildstream.build/install.html"; + homepage = "https://buildstream.build"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + mainProgram = "bst"; + maintainers = with lib.maintainers; [ shymega ]; + }; +} diff --git a/pkgs/by-name/bu/buku/package.nix b/pkgs/by-name/bu/buku/package.nix index edd09870b813..edf76eadacc1 100644 --- a/pkgs/by-name/bu/buku/package.nix +++ b/pkgs/by-name/bu/buku/package.nix @@ -23,15 +23,15 @@ let in with python3.pkgs; buildPythonApplication rec { - version = "4.8"; + version = "5.0"; pname = "buku"; pyproject = true; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; - rev = "v${version}"; - sha256 = "sha256-kPVlfTYUusf5CZnKB53WZcCHo3MEnA2bLUHTRPGPn+8="; + tag = "v${version}"; + sha256 = "sha256-b3j3WLMXl4sXZpIObC+F7RRpo07cwJpAK7lQ7+yIzro="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/bulky/package.nix b/pkgs/by-name/bu/bulky/package.nix index 0312d2565b6c..ad37f1aaca59 100644 --- a/pkgs/by-name/bu/bulky/package.nix +++ b/pkgs/by-name/bu/bulky/package.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linuxmint/bulky"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/pkgs/by-name/bu/bumblebee/nixos.patch similarity index 100% rename from pkgs/tools/X11/bumblebee/nixos.patch rename to pkgs/by-name/bu/bumblebee/nixos.patch diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix new file mode 100644 index 000000000000..cfffcec882f6 --- /dev/null +++ b/pkgs/by-name/bu/bumblebee/package.nix @@ -0,0 +1,192 @@ +# The bumblebee package allows a program to be rendered on an +# dedicated video card by spawning an additional X11 server and +# streaming the results via VirtualGL or primus to the primary server. + +# The package is rather chaotic; it's also quite recent. +# As it may change a lot, some of the hacks in this nix expression +# will hopefully not be needed in the future anymore. + +# To test: +# 1. make sure that the 'bbswitch' kernel module is installed, +# 2. then run 'bumblebeed' as root +# 3. Then either 'optirun glxinfo' or 'primusrun glxinfo' as user. +# +# The glxinfo output should indicate the Nvidia driver is being used +# and all expected extensions are supported. +# +# To use at startup, see hardware.bumblebee options. + +{ + stdenv, + lib, + fetchurl, + fetchpatch, + pkg-config, + help2man, + makeWrapper, + glib, + libbsd, + libX11, + xorgserver, + kmod, + xf86videonouveau, + nvidia_x11 ? linuxPackages.nvidia_x11, + linuxPackages, + pkgsi686Linux, + virtualgl, + libglvnd, + automake111x, + autoconf, + # The below should only be non-null in a x86_64 system. On a i686 + # system the above nvidia_x11 and virtualgl will be the i686 packages. + # TODO: Confusing. Perhaps use "SubArch" instead of i686? + nvidia_x11_i686 ? + if stdenv.hostPlatform.system == "x86_64-linux" then + pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; } + else + null, + libglvnd_i686 ? + if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.libglvnd else null, + useDisplayDevice ? false, + extraNvidiaDeviceOptions ? "", + extraNouveauDeviceOptions ? "", + useNvidia ? true, +}: + +let + nvidia_x11s = + [ nvidia_x11 ] + ++ lib.optional nvidia_x11.useGLVND libglvnd + ++ lib.optionals (nvidia_x11_i686 != null) ( + [ nvidia_x11_i686 ] ++ lib.optional nvidia_x11_i686.useGLVND libglvnd_i686 + ); + + nvidiaLibs = lib.makeLibraryPath nvidia_x11s; + + bbdPath = lib.makeBinPath [ + kmod + xorgserver + ]; + + xmodules = lib.concatStringsSep "," ( + map (x: "${x.out or x}/lib/xorg/modules") ( + [ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau + ) + ); + + modprobePatch = fetchpatch { + url = "https://github.com/Bumblebee-Project/Bumblebee/commit/1ada79fe5916961fc4e4917f8c63bb184908d986.patch"; + sha256 = "02vq3vba6nx7gglpjdfchws9vjhs1x02a543yvqrxqpvvdfim2x2"; + }; + libkmodPatch = fetchpatch { + url = "https://github.com/Bumblebee-Project/Bumblebee/commit/deceb14cdf2c90ff64ebd1010a674305464587da.patch"; + sha256 = "00c05i5lxz7vdbv445ncxac490vbl5g9w3vy3gd71qw1f0si8vwh"; + }; + gcc10Patch = fetchpatch { + url = "https://github.com/Bumblebee-Project/Bumblebee/commit/f94a118a88cd76e2dbea33d735bd53cf54b486a1.patch"; + hash = "sha256-3b5tLoMrGYSdg9Hz5bh0c44VIrbSZrY56JpWEyU/Pik="; + }; + +in +stdenv.mkDerivation rec { + pname = "bumblebee"; + version = "3.2.1"; + + src = fetchurl { + url = "https://www.bumblebee-project.org/${pname}-${version}.tar.gz"; + sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; + }; + + patches = [ + ./nixos.patch + + modprobePatch + libkmodPatch + gcc10Patch + ]; + + # By default we don't want to use a display device + nvidiaDeviceOptions = + lib.optionalString (!useDisplayDevice) '' + # Disable display device + Option "UseEDID" "false" + Option "UseDisplayDevice" "none" + '' + + extraNvidiaDeviceOptions; + + nouveauDeviceOptions = extraNouveauDeviceOptions; + + # the have() function is deprecated and not available to bash completions the + # way they are currently loaded in NixOS, so use _have. See #10936 + postPatch = '' + substituteInPlace scripts/bash_completion/bumblebee \ + --replace "have optirun" "_have optirun" + ''; + + preConfigure = '' + # Don't use a special group, just reuse wheel. + substituteInPlace configure \ + --replace 'CONF_GID="bumblebee"' 'CONF_GID="wheel"' + + # Apply configuration options + substituteInPlace conf/xorg.conf.nvidia \ + --subst-var nvidiaDeviceOptions + + substituteInPlace conf/xorg.conf.nouveau \ + --subst-var nouveauDeviceOptions + ''; + + # Build-time dependencies of bumblebeed and optirun. + # Note that it has several runtime dependencies. + buildInputs = [ + libX11 + glib + libbsd + kmod + ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + help2man + automake111x + autoconf + ]; + + # The order of LDPATH is very specific: First X11 then the host + # environment then the optional sub architecture paths. + # + # The order for MODPATH is the opposite: First the environment that + # includes the acceleration driver. As this is used for the X11 + # server, which runs under the host architecture, this does not + # include the sub architecture components. + configureFlags = + [ + "--with-udev-rules=$out/lib/udev/rules.d" + # see #10282 + #"CONF_PRIMUS_LD_PATH=${primusLibs}" + ] + ++ lib.optionals useNvidia [ + "CONF_LDPATH_NVIDIA=${nvidiaLibs}" + "CONF_MODPATH_NVIDIA=${nvidia_x11.bin}/lib/xorg/modules" + ]; + + CFLAGS = [ + "-DX_MODULE_APPENDS=\\\"${xmodules}\\\"" + ]; + + postInstall = '' + wrapProgram "$out/sbin/bumblebeed" \ + --prefix PATH : "${bbdPath}" + + wrapProgram "$out/bin/optirun" \ + --prefix PATH : "${virtualgl}/bin" + ''; + + meta = with lib; { + description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)"; + homepage = "https://github.com/Bumblebee-Project/Bumblebee"; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index f6adf59a0c90..b557e8f14eb8 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index a9f40cf9de02..59a189d9e5d8 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -17,7 +17,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.2.8"; + version = "1.2.13"; pname = "bun"; src = @@ -86,19 +86,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-ioBqQKA3Mp5PtVlFcmf2xOvoIEy7rNsD85s0m+1ao1U="; + hash = "sha256-gVQ2dSTYwpjtsmm40N9h1GnsQZTTYcB+S40sZfu8Lvs="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-Iwg/JW8qHRVcRW4S45xR4x3EG5fGNCDZkV9Du4ar6rE="; + hash = "sha256-tqJVN7wtEevkSkeN1iqOAdvJ9OHEt9LXMLSn6dNYDMk="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-vYcbm19aR540MrO4YFQgeSwNOKLot8/H03i0NP8c2og="; + hash = "sha256-BTh6RkWJFTig33Ql6JEuwWt0JRFs1BZ2aqUsowE/jGQ="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-QrSLNmdguYb+HWqLE8VwbSZzCDmoV3eQzS6PKHmenzE="; + hash = "sha256-i7LkxH6uGD8kc8Vbm853mMSig21kbCWHp5h6PRBi4QA="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index 0a6b737335c5..6d73ad238382 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, versionCheckHook, nix-update-script, }: @@ -22,19 +20,10 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-2pgQB2myEnLvrU3ApNL/bwaVcGku+X/TjR6YBqXD7Xg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - IOKit - SystemConfiguration - ] - ); - nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/bu/bundler/package.nix b/pkgs/by-name/bu/bundler/package.nix index f9345f777e3a..dd606e28e00b 100644 --- a/pkgs/by-name/bu/bundler/package.nix +++ b/pkgs/by-name/bu/bundler/package.nix @@ -13,8 +13,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.6.2"; - source.sha256 = "sha256-S4l1bhsFOQ/2eEkRGaEPCXOiBFzJ/LInsCqTlrKPfXQ="; + version = "2.6.6"; + source.sha256 = "sha256-gysquNKtbj0nUTj7ZA3z021IGOFC0Tsne0SIZxG4l2E="; dontPatchShebangs = true; postFixup = '' @@ -25,7 +25,7 @@ buildRubyGem rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bundler"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/by-name/bu/bupstash/package.nix similarity index 100% rename from pkgs/tools/backup/bupstash/default.nix rename to pkgs/by-name/bu/bupstash/package.nix diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 2481b5a236b7..b3d2fea710aa 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -9,20 +9,20 @@ }: let - version = "2025.1.5"; + version = "2025.4.2"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-QTYeiM2hyZpvSu5oE2wrNrF3qFkp4JJnQftOg3BJqZA="; + hash = "sha256-wtCZ3/7JvygSCka4i3Il2ajpSuuTPTwHeVJa4gGFDPw="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-vIcBRsylS+ftSq5x0HDe6Zb8dtVUtWw6hENBITYmzyQ="; + hash = "sha256-+1aTq7XKacsi/gzUpeZvSuwpKPDMo6H3C81pxWCC4w8="; }; src = fetchurl { @@ -109,7 +109,9 @@ buildFHSEnv { hydraPlatforms = [ ]; maintainers = with maintainers; [ bennofs + blackzeshi fab + yechielw ]; mainProgram = "burpsuite"; }; diff --git a/pkgs/by-name/bu/bustle/package.nix b/pkgs/by-name/bu/bustle/package.nix index 789299bd6aff..10a433f59a35 100644 --- a/pkgs/by-name/bu/bustle/package.nix +++ b/pkgs/by-name/bu/bustle/package.nix @@ -64,12 +64,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Graphical D-Bus message analyser and profiler"; homepage = "https://gitlab.gnome.org/World/bustle"; license = lib.licenses.lgpl21Plus; - maintainers = - with lib.maintainers; - [ - jtojnar - ] - ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ + jtojnar + ]; + teams = [ lib.teams.gnome-circle ]; mainProgram = "bustle"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/bu/bustools/package.nix b/pkgs/by-name/bu/bustools/package.nix index 2ed9fb52bad9..38ae60fa0ab9 100644 --- a/pkgs/by-name/bu/bustools/package.nix +++ b/pkgs/by-name/bu/bustools/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "bustools"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "BUStools"; repo = "bustools"; rev = "v${version}"; - sha256 = "sha256-0Y+9T9V+l20hqxpKbSWsEB0tt8A/ctYcoPN2n/roxvg="; + sha256 = "sha256-Af2WUryx4HQuAlNJ1RWJK1Mj2M7X+4Ckap3rqEJ3vto="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/bu/buteo-syncfw/package.nix b/pkgs/by-name/bu/buteo-syncfw/package.nix index 3b23742a09eb..9acf267e799c 100644 --- a/pkgs/by-name/bu/buteo-syncfw/package.nix +++ b/pkgs/by-name/bu/buteo-syncfw/package.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/sailfishos/buteo-syncfw/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl21Only; mainProgram = "msyncd"; - maintainers = lib.teams.lomiri.members; + teams = [ lib.teams.lomiri ]; platforms = lib.platforms.linux; pkgConfigModules = [ "buteosyncfw5" diff --git a/pkgs/by-name/bu/butt/package.nix b/pkgs/by-name/bu/butt/package.nix index dcbc83ed0c3f..deae52c17a82 100644 --- a/pkgs/by-name/bu/butt/package.nix +++ b/pkgs/by-name/bu/butt/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "butt"; - version = "1.44.0"; + version = "1.45.0"; src = fetchurl { url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz"; - hash = "sha256-2RC0ChDbyhzjd+4jnBRuR0botIVQugpA1rUZm1yH4Kc="; + hash = "sha256-iEmFEJRsTvHeKGYvnhzYXSC/q0DSw0Z/YgK4buDtg2Q="; }; postPatch = '' diff --git a/pkgs/by-name/bu/butterfly/package.nix b/pkgs/by-name/bu/butterfly/package.nix index 1255f4b6152e..96af2dc290b8 100644 --- a/pkgs/by-name/bu/butterfly/package.nix +++ b/pkgs/by-name/bu/butterfly/package.nix @@ -1,7 +1,7 @@ { lib, + flutter329, fetchFromGitHub, - flutter327, runCommand, butterfly, yq, @@ -9,15 +9,15 @@ gitUpdater, }: -flutter327.buildFlutterApplication rec { +flutter329.buildFlutterApplication rec { pname = "butterfly"; - version = "2.2.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "LinwoodDev"; repo = "Butterfly"; tag = "v${version}"; - hash = "sha256-lf1CCpLd7eM4iJvTsR2AI6xGCQ2NJ1mlYkR0hW03SRA="; + hash = "sha256-ih+oADHEBB8fOt1Uoxc98BNr6BuoONnFNt8wHQxgpfA="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -25,19 +25,18 @@ flutter327.buildFlutterApplication rec { sourceRoot = "${src.name}/app"; gitHashes = { - dart_leap = "sha256-eEyUqdVToybQoDwdmz47H0f3/5zRdJzmPv1d/5mTOgA="; - lw_file_system = "sha256-0LLSADBWq19liQLtJIJEuTEqmeyIWP61zRRjjpdV6SM="; - flutter_secure_storage_web = "sha256-ULYXcFjz9gKMjw1Q1KAmX2J7EcE8CbW0MN/EnwmaoQY="; - networker = "sha256-1b8soPRbHOGAb2wpsfw/uETnAlaCJZyLmynVRDX9Y8s="; - lw_file_system_api = "sha256-ctz9+HEWGV47XUWa+RInS2gHnkrJQqgafnrbI8m3Yfo="; + dart_leap = "sha256-oO5851cIdrW/asgOePxvwUgjn1XchkH9CKJUruvlLYI="; + lw_file_system = "sha256-l04sXm9FXHF0ZUdQplnGoih483PczMQvlFF0r/UEuao="; + networker = "sha256-/3jFIZj66hWbTcIQx9OB5QRrukcBT4zpek+56AVaGIA="; + lw_file_system_api = "sha256-/Ur9zu4Ovb4x8j1n6Q6FWFuJ9yp92YQG3b7H5CMf3II="; lw_sysapi = "sha256-OYVHBiAshYKRH/6BEcY+BXm9VIfSAFnFBOBWlQIO5Tc="; - material_leap = "sha256-MF0wN4JsmKVzwwWjBKqY0DaLLdUuY0abyLF1VilTslM="; - networker_socket = "sha256-8LRyo5HzreUMGh5j39vL+Gqzxp4MN/jhHYpDxbFV0Ao="; - perfect_freehand = "sha256-dMJ8CyhoQWbBRvUQyzPc7vdAhCzcAl1X7CcaT3u6dWo="; - pdf = "sha256-cIBSgePv5LIFRbc7IIx1fSVJceGEmzdZzDkOiD1z92E="; - pdf_widget_wrapper = "sha256-hXDFdgyu2DvIqwVBvk6TVDW+FdlMGAn5v5JZKQwp8fA="; + material_leap = "sha256-l04sXm9FXHF0ZUdQplnGoih483PczMQvlFF0r/UEuao="; + networker_crypto = "sha256-nI0luldloScjjix75kR5yOE1ZX8KFxMIC2N4whKlXUg="; + networker_socket = "sha256-5y1oy0IYDs7nhiIx653vI5Gfh5jrVewkRFxB1mjxlE4="; + perfect_freehand = "sha256-eBiid097rkF82n65Yg6a4VkKPv+70HIOYJT+9sCD//U="; + network_info_plus = "sha256-fOh/Qm7T65jDtckMTB3ZP2xT7UH6Wi/x5i61xXNbWac="; + swamp_api = "sha256-ONaCXeMwEEHDvVmbo3o66O3CTCx4xGR3T5ZtSEwPvaw="; reorderable_grid = "sha256-g30DSPL/gsk0r8c2ecoKU4f1P3BF15zLnBVO6RXvDGQ="; - printing = "sha256-0JdMld1TN2EtJVQSuYdSIfi/q96roVUJEAY8dWK9xCM="; }; postInstall = '' diff --git a/pkgs/by-name/bu/butterfly/pubspec.lock.json b/pkgs/by-name/bu/butterfly/pubspec.lock.json index 5b3fade46671..ce0cb1fe92b7 100644 --- a/pkgs/by-name/bu/butterfly/pubspec.lock.json +++ b/pkgs/by-name/bu/butterfly/pubspec.lock.json @@ -4,27 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "88399e291da5f7e889359681a8f64b18c5123e03576b01f32a6a276611e511c3", + "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f", "url": "https://pub.dev" }, "source": "hosted", - "version": "78.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.3" + "version": "82.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "62899ef43d0b962b056ed2ebac6b47ec76ffd003d5f7c4e4dc870afe63188e33", + "sha256": "f4c21c94eb4623b183c1014a470196b3910701bea9b926e6c91270d756e6fc60", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.1.0" + "version": "7.4.1" }, "animations": { "dependency": "direct main", @@ -40,81 +34,81 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a", + "sha256": "a7f37ff061d7abc2fcf213554b9dcaca713c5853afa5c065c44888bc9ccaf813", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.6" }, "args": { "dependency": "direct main", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "barcode": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "barcode", - "sha256": "ab180ce22c6555d77d45f0178a523669db67f95856e3378259ef2ffeb43e6003", + "sha256": "7b6729c37e3b7f34233e2318d866e8c48ddb46c1f7ad01ff7bb2a8de1da2b9f4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.8" + "version": "2.2.9" }, "bidi": { "dependency": "transitive", "description": { "name": "bidi", - "sha256": "9a712c7ddf708f7c41b1923aa83648a3ed44cfd75b04f72d598c45e5be287f9d", + "sha256": "77f475165e94b261745cf1032c751e2032b8ed92ccb2bf5716036db79320637d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.12" + "version": "2.0.13" }, "bloc": { "dependency": "transitive", "description": { "name": "bloc", - "sha256": "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e", + "sha256": "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.4" + "version": "9.0.0" }, "bloc_concurrency": { "dependency": "direct main", "description": { "name": "bloc_concurrency", - "sha256": "456b7a3616a7c1ceb975c14441b3f198bf57d81cb95b7c6de5cb0c60201afcd8", + "sha256": "86b7b17a0a78f77fca0d7c030632b59b593b22acea2d96972588f40d4ef53a94", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.5" + "version": "0.3.0" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "build": { "dependency": "transitive", @@ -140,31 +134,31 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.3" + "version": "4.0.4" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.3" + "version": "2.4.4" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.14" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", @@ -190,11 +184,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.3" + "version": "8.9.5" }, "butterfly_api": { "dependency": "direct main", @@ -203,47 +197,47 @@ "relative": true }, "source": "path", - "version": "2.2.4" + "version": "2.3.0" }, "camera": { "dependency": "direct main", "description": { "name": "camera", - "sha256": "26ff41045772153f222ffffecba711a206f670f5834d40ebf5eed3811692f167", + "sha256": "413d2b34fe28496c35c69ede5b232fb9dd5ca2c3a4cb606b14efc1c7546cc8cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.11.0+2" + "version": "0.11.1" }, "camera_android_camerax": { "dependency": "transitive", "description": { "name": "camera_android_camerax", - "sha256": "ecadc214daed34d8503540525d26577731c066f1993c254aa5272da7629e8f10", + "sha256": "26673643ed8f4a468a81ebd7ca760bc1d8c4c741df6d731cc958585ac1983126", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.12" + "version": "0.6.15" }, "camera_avfoundation": { "dependency": "transitive", "description": { "name": "camera_avfoundation", - "sha256": "c3038e6e72e284b14ad246a419f26908c08f8886d114cb8a2e351988439bfa68", + "sha256": "a33cd9a250296271cdf556891b7c0986a93772426f286595eccd5f45b185933c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.17+6" + "version": "0.9.18+14" }, "camera_platform_interface": { "dependency": "transitive", "description": { "name": "camera_platform_interface", - "sha256": "953e7baed3a7c8fae92f7200afeb2be503ff1a17c3b4e4ed7b76f008c2810a31", + "sha256": "2f757024a48696ff4814a789b0bd90f5660c0fb25f393ab4564fb483327930e2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.0" + "version": "2.10.0" }, "camera_web": { "dependency": "transitive", @@ -259,21 +253,21 @@ "dependency": "direct main", "description": { "name": "camera_windows", - "sha256": "116118ccc3e8001b67490cbd895db622105c91ffcee4080d74419673a8dc01a9", + "sha256": "c4339d71bc4256993f5c8ae2f3355463d830a5cb52851409ab1c627401c69811", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.6+1" + "version": "0.2.6+2" }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "checked_yaml": { "dependency": "transitive", @@ -289,11 +283,11 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", @@ -309,21 +303,21 @@ "dependency": "direct main", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "connectivity_plus": { "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "e0817759ec6d2d8e57eb234e6e57d2173931367a865850c7acea40d4b4f9c27d", + "sha256": "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.1" + "version": "6.1.3" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -365,13 +359,33 @@ "source": "hosted", "version": "3.0.6" }, + "cryptography_flutter_plus": { + "dependency": "direct main", + "description": { + "name": "cryptography_flutter_plus", + "sha256": "35a8c270aae0abaac7125a6b6b33c2b3daa0ea90d85320aa7d588b6dd6c2edc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.4" + }, + "cryptography_plus": { + "dependency": "direct main", + "description": { + "name": "cryptography_plus", + "sha256": "34db787df4f4740a39474b6fb0a610aa6dc13a5b5b68754b4787a79939ac0454", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.1" + }, "dart_leap": { "dependency": "transitive", "description": { "path": "packages/dart_leap", - "ref": "dfda6c2e3cef2e29511f97e9470fd4deb8e0c573", - "resolved-ref": "dfda6c2e3cef2e29511f97e9470fd4deb8e0c573", - "url": "https://github.com/LinwoodDev/dart_pkgs" + "ref": "b7787191b0705ff0a22149409b1b360468d9e06d", + "resolved-ref": "b7787191b0705ff0a22149409b1b360468d9e06d", + "url": "https://github.com/LinwoodDev/dart_pkgs.git" }, "source": "git", "version": "1.0.0" @@ -380,11 +394,11 @@ "dependency": "transitive", "description": { "name": "dart_mappable", - "sha256": "f69a961ae8589724ebb542e588f228ae844c5f78028899cbe2cc718977c1b382", + "sha256": "2255b2c00e328a65fef5a8df2dabfc0dc9c2e518c33a50051a4519b1c7a28c48", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.5.0" }, "dart_style": { "dependency": "transitive", @@ -400,21 +414,21 @@ "dependency": "transitive", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "device_info_plus": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "device_info_plus", - "sha256": "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431", + "sha256": "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.2.0" + "version": "11.3.3" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -450,31 +464,31 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "file_selector": { "dependency": "direct main", @@ -490,11 +504,11 @@ "dependency": "transitive", "description": { "name": "file_selector_android", - "sha256": "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc", + "sha256": "6bba3d590ee9462758879741abc132a19133600dd31832f55627442f1ebd7b54", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1+12" + "version": "0.5.1+14" }, "file_selector_ios": { "dependency": "transitive", @@ -550,11 +564,11 @@ "dependency": "transitive", "description": { "name": "file_selector_windows", - "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4", + "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+3" + "version": "0.9.3+4" }, "fixnum": { "dependency": "transitive", @@ -570,21 +584,21 @@ "dependency": "direct main", "description": { "name": "flex_color_scheme", - "sha256": "09bea5d776f694c5a67f2229f2aa500cc7cce369322dc6500ab01cf9ad1b4e1a", + "sha256": "3344f8f6536c6ce0473b98e9f084ef80ca89024ad3b454f9c32cf840206f4387", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.0" + "version": "8.2.0" }, "flex_seed_scheme": { "dependency": "transitive", "description": { "name": "flex_seed_scheme", - "sha256": "d3ba3c5c92d2d79d45e94b4c6c71d01fac3c15017da1545880c53864da5dfeb0", + "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.5.0" + "version": "3.5.1" }, "flutter": { "dependency": "direct main", @@ -596,11 +610,11 @@ "dependency": "direct main", "description": { "name": "flutter_bloc", - "sha256": "b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a", + "sha256": "1046d719fbdf230330d3443187cc33cc11963d15c9089f6cc56faa42a4c5f0cc", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.6" + "version": "9.1.0" }, "flutter_driver": { "dependency": "direct dev", @@ -638,82 +652,81 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", + "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.24" + "version": "2.0.28" }, "flutter_secure_storage": { "dependency": "direct main", "description": { "name": "flutter_secure_storage", - "sha256": "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea", + "sha256": "f7eceb0bc6f4fd0441e29d43cab9ac2a1c5ffd7ea7b64075136b718c46954874", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.4" + "version": "10.0.0-beta.4" + }, + "flutter_secure_storage_darwin": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_darwin", + "sha256": "f226f2a572bed96bc6542198ebaec227150786e34311d455a7e2d3d06d951845", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" }, "flutter_secure_storage_linux": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_linux", - "sha256": "bf7404619d7ab5c0a1151d7c4e802edad8f33535abfbeff2f9e1fe1274e2d705", + "sha256": "9b4b73127e857cd3117d43a70fa3dddadb6e0b253be62e6a6ab85caa0742182c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" - }, - "flutter_secure_storage_macos": { - "dependency": "transitive", - "description": { - "name": "flutter_secure_storage_macos", - "sha256": "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.3" + "version": "2.0.1" }, "flutter_secure_storage_platform_interface": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_platform_interface", - "sha256": "cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8", + "sha256": "8ceea1223bee3c6ac1a22dabd8feefc550e4729b3675de4b5900f55afcb435d6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "2.0.1" }, "flutter_secure_storage_web": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { - "path": "flutter_secure_storage_web", - "ref": "1d7b32bde7910bc2ffd1db5245ee0b2478ff4b7d", - "resolved-ref": "1d7b32bde7910bc2ffd1db5245ee0b2478ff4b7d", - "url": "https://github.com/CodeDoctorDE/flutter_secure_storage.git" + "name": "flutter_secure_storage_web", + "sha256": "4c3f233e739545c6cb09286eeec1cc4744138372b985113acc904f7263bef517", + "url": "https://pub.dev" }, - "source": "git", - "version": "2.0.0-beta.1" + "source": "hosted", + "version": "2.0.0" }, "flutter_secure_storage_windows": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_windows", - "sha256": "b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709", + "sha256": "ff32af20f70a8d0e59b2938fc92de35b54a74671041c814275afd80e27df9f21", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "4.0.0" }, "flutter_svg": { "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", + "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.17" + "version": "2.1.0" }, "flutter_test": { "dependency": "direct dev", @@ -731,21 +744,21 @@ "dependency": "direct dev", "description": { "name": "freezed", - "sha256": "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c", + "sha256": "6022db4c7bfa626841b2a10f34dd1e1b68e8f8f9650db6112dcdeeca45ca793c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.8" + "version": "3.0.6" }, "freezed_annotation": { "dependency": "transitive", "description": { "name": "freezed_annotation", - "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "sha256": "c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "3.0.0" }, "frontend_server_client": { "dependency": "transitive", @@ -767,21 +780,21 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "go_router": { "dependency": "direct main", "description": { "name": "go_router", - "sha256": "7c2d40b59890a929824f30d442e810116caf5088482629c894b9e4478c67472d", + "sha256": "f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.6.3" + "version": "14.8.1" }, "graphs": { "dependency": "transitive", @@ -797,11 +810,11 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_multi_server": { "dependency": "transitive", @@ -827,21 +840,21 @@ "dependency": "direct main", "description": { "name": "idb_shim", - "sha256": "9e7ec816139bfafb69ae4b3668ad29dbd43c53428d6eb31f9332d42bd4fa7205", + "sha256": "d3dae2085f2dcc9d05b851331fddb66d57d3447ff800de9676b396795436e135", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1+7" + "version": "2.6.5+1" }, "image": { "dependency": "direct main", "description": { "name": "image", - "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.4" }, "integration_test": { "dependency": "direct main", @@ -893,11 +906,11 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" }, "json_annotation": { "dependency": "direct main", @@ -913,31 +926,31 @@ "dependency": "direct dev", "description": { "name": "json_serializable", - "sha256": "8f52361c07497a7f2c16c13aac159f9be6fb12b1d67719eac98a21d9a205d571", + "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.9.2" + "version": "6.9.5" }, "leak_tracker": { "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -973,9 +986,9 @@ "dependency": "direct main", "description": { "path": "packages/lw_file_system", - "ref": "54f7ac141410938babff9539dca190f5d130a0db", - "resolved-ref": "54f7ac141410938babff9539dca190f5d130a0db", - "url": "https://github.com/LinwoodDev/dart_pkgs" + "ref": "d5c41c874b0758cb8fb623cdd095c032f04f5740", + "resolved-ref": "d5c41c874b0758cb8fb623cdd095c032f04f5740", + "url": "https://github.com/LinwoodDev/dart_pkgs.git" }, "source": "git", "version": "1.0.0" @@ -984,9 +997,9 @@ "dependency": "transitive", "description": { "path": "packages/lw_file_system_api", - "ref": "5ab1b96bea6ef0e0c07629ff4e7152b4437cf8ee", - "resolved-ref": "5ab1b96bea6ef0e0c07629ff4e7152b4437cf8ee", - "url": "https://github.com/LinwoodDev/dart_pkgs" + "ref": "2ecf53489240f055c841d7c8f92fe374cc6a27ae", + "resolved-ref": "2ecf53489240f055c841d7c8f92fe374cc6a27ae", + "url": "https://github.com/LinwoodDev/dart_pkgs.git" }, "source": "git", "version": "1.0.0" @@ -997,21 +1010,11 @@ "path": "packages/lw_sysapi", "ref": "ebf47114a4d63fc06a6be0dbbfd5594ed82e7ee5", "resolved-ref": "ebf47114a4d63fc06a6be0dbbfd5594ed82e7ee5", - "url": "https://github.com/LinwoodDev/dart_pkgs" + "url": "https://github.com/LinwoodDev/dart_pkgs.git" }, "source": "git", "version": "0.0.1" }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.3-main.0" - }, "markdown": { "dependency": "direct main", "description": { @@ -1026,11 +1029,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -1046,9 +1049,9 @@ "dependency": "direct main", "description": { "path": "packages/material_leap", - "ref": "9a142aa2aefc61c8c5ff2c70b31ea81b8485e428", - "resolved-ref": "9a142aa2aefc61c8c5ff2c70b31ea81b8485e428", - "url": "https://github.com/LinwoodDev/dart_pkgs" + "ref": "d5c41c874b0758cb8fb623cdd095c032f04f5740", + "resolved-ref": "d5c41c874b0758cb8fb623cdd095c032f04f5740", + "url": "https://github.com/LinwoodDev/dart_pkgs.git" }, "source": "git", "version": "0.0.1" @@ -1057,11 +1060,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", @@ -1083,13 +1086,45 @@ "source": "hosted", "version": "1.0.0" }, + "network_info_plus": { + "dependency": "direct main", + "description": { + "path": "packages/network_info_plus/network_info_plus", + "ref": "9bd0c023f2dc209576dc66bf989048ba218127b6", + "resolved-ref": "9bd0c023f2dc209576dc66bf989048ba218127b6", + "url": "https://github.com/CodeDoctorDE/plus_plugins.git" + }, + "source": "git", + "version": "6.1.3" + }, + "network_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "network_info_plus_platform_interface", + "sha256": "7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, "networker": { "dependency": "direct main", "description": { "path": "packages/networker/networker", - "ref": "071e02761bf55a47bcde0cdc2a711b8ff5fbbb18", - "resolved-ref": "071e02761bf55a47bcde0cdc2a711b8ff5fbbb18", - "url": "https://github.com/LinwoodDev/dart_pkgs" + "ref": "2e0ab5b548cb8e2d64ca24e0d7b4a6cfcc6d57fe", + "resolved-ref": "2e0ab5b548cb8e2d64ca24e0d7b4a6cfcc6d57fe", + "url": "https://github.com/LinwoodDev/dart_pkgs.git" + }, + "source": "git", + "version": "1.0.0" + }, + "networker_crypto": { + "dependency": "direct main", + "description": { + "path": "packages/networker/networker_crypto", + "ref": "1cc2988f680758fcb45c88b3905b0312d8c5a513", + "resolved-ref": "1cc2988f680758fcb45c88b3905b0312d8c5a513", + "url": "https://github.com/LinwoodDev/dart_pkgs.git" }, "source": "git", "version": "1.0.0" @@ -1098,9 +1133,9 @@ "dependency": "direct main", "description": { "path": "packages/networker/networker_socket", - "ref": "9085d42cf75c3d3edc8edb9ef22697dbbe2bf38c", - "resolved-ref": "9085d42cf75c3d3edc8edb9ef22697dbbe2bf38c", - "url": "https://github.com/LinwoodDev/dart_pkgs" + "ref": "72c7cdd7a60d98c3a7f587122da83dc8b99b7ed0", + "resolved-ref": "72c7cdd7a60d98c3a7f587122da83dc8b99b7ed0", + "url": "https://github.com/LinwoodDev/dart_pkgs.git" }, "source": "git", "version": "1.0.0" @@ -1129,41 +1164,41 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.2" + "version": "8.3.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.2.0" }, "path": { "dependency": "transitive", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_parsing": { "dependency": "transitive", @@ -1189,11 +1224,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.17" }, "path_provider_foundation": { "dependency": "transitive", @@ -1238,31 +1273,29 @@ "pdf": { "dependency": "direct main", "description": { - "path": "pdf", - "ref": "4be45bf7000640f38cb62088899a0f5185b4dc89", - "resolved-ref": "4be45bf7000640f38cb62088899a0f5185b4dc89", - "url": "https://github.com/CodeDoctorDE/dart_pdf.git" + "name": "pdf", + "sha256": "28eacad99bffcce2e05bba24e50153890ad0255294f4dd78a17075a2ba5c8416", + "url": "https://pub.dev" }, - "source": "git", - "version": "3.11.2" + "source": "hosted", + "version": "3.11.3" }, "pdf_widget_wrapper": { "dependency": "transitive", "description": { - "path": "widget_wrapper", - "ref": "c2b5d2b932ee1a4544db4ff8a9b218151b404c5c", - "resolved-ref": "c2b5d2b932ee1a4544db4ff8a9b218151b404c5c", - "url": "https://github.com/CodeDoctorDE/dart_pdf.git" + "name": "pdf_widget_wrapper", + "sha256": "c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5", + "url": "https://pub.dev" }, - "source": "git", + "source": "hosted", "version": "1.0.4" }, "perfect_freehand": { "dependency": "direct main", "description": { "path": ".", - "ref": "6228363ff19e95aa16055dd493533d4c01fa2209", - "resolved-ref": "6228363ff19e95aa16055dd493533d4c01fa2209", + "ref": "85a6db5889db2916733a0f6c6914e66d06931f71", + "resolved-ref": "85a6db5889db2916733a0f6c6914e66d06931f71", "url": "https://github.com/CodeDoctorDE/perfect-freehand-dart.git" }, "source": "git", @@ -1272,11 +1305,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "phosphor_flutter": { "dependency": "direct main", @@ -1302,11 +1335,11 @@ "dependency": "transitive", "description": { "name": "platform", - "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "plugin_platform_interface": { "dependency": "transitive", @@ -1342,52 +1375,51 @@ "dependency": "transitive", "description": { "name": "posix", - "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a", + "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.1" + "version": "6.0.2" }, "printing": { "dependency": "direct main", "description": { - "path": "printing", - "ref": "4147fe72fcba3b271da02971171ff1ef71f3a7f7", - "resolved-ref": "4147fe72fcba3b271da02971171ff1ef71f3a7f7", - "url": "https://github.com/CodeDoctorDE/dart_pdf.git" + "name": "printing", + "sha256": "482cd5a5196008f984bb43ed0e47cbfdca7373490b62f3b27b3299275bf22a93", + "url": "https://pub.dev" }, - "source": "git", - "version": "5.14.0" + "source": "hosted", + "version": "5.14.2" }, "process": { "dependency": "transitive", "description": { "name": "process", - "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "5.0.3" }, "provider": { "dependency": "transitive", "description": { "name": "provider", - "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.1.4" }, "pub_semver": { "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", @@ -1424,11 +1456,11 @@ "dependency": "direct main", "description": { "name": "replay_bloc", - "sha256": "36d0fb566e47aa0f1f96d567e93b442c3fa5c957777ef52a5f60d2f9e9d8e766", + "sha256": "1e9bc379bd64a0625ccf080a1618f3a9514ff3a998b7dd7a306379d4303318f3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.7" + "version": "0.3.0" }, "rxdart": { "dependency": "direct main", @@ -1494,21 +1526,21 @@ "dependency": "transitive", "description": { "name": "sembast", - "sha256": "b3dde17154b2233d039fe3c386871d2ccddb4f31e058502c4036b03858e2ff5f", + "sha256": "d3f0d0ba501a5f1fd7d6c8532ee01385977c8a069c334635dae390d059ae3d6d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.8.1+1" + "version": "3.8.5" }, "share_plus": { "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400", + "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.3" + "version": "10.1.4" }, "share_plus_platform_interface": { "dependency": "transitive", @@ -1524,21 +1556,21 @@ "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.5" + "version": "2.5.3" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "bf808be89fe9dc467475e982c1db6c2faf3d2acf54d526cd5ec37d86c99dbd84", + "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.10" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1574,11 +1606,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.3" }, "shared_preferences_windows": { "dependency": "transitive", @@ -1604,11 +1636,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.0" }, "sky_engine": { "dependency": "transitive", @@ -1640,11 +1672,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -1660,21 +1692,21 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", @@ -1690,11 +1722,11 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "super_clipboard": { "dependency": "direct main", @@ -1716,6 +1748,17 @@ "source": "hosted", "version": "0.9.0-dev.6" }, + "swamp_api": { + "dependency": "direct main", + "description": { + "path": "api", + "ref": "e3731236887b11685aa9c7c94d453babf726b46c", + "resolved-ref": "e3731236887b11685aa9c7c94d453babf726b46c", + "url": "https://github.com/LinwoodDev/Swamp.git" + }, + "source": "git", + "version": "1.0.0" + }, "sync_http": { "dependency": "transitive", "description": { @@ -1730,31 +1773,31 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.3.1" }, "term_glyph": { "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "timing": { "dependency": "transitive", @@ -1800,21 +1843,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.16" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.2" + "version": "6.3.3" }, "url_launcher_linux": { "dependency": "transitive", @@ -1880,11 +1923,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7", + "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.15" + "version": "1.1.18" }, "vector_graphics_codec": { "dependency": "transitive", @@ -1920,11 +1963,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "watcher": { "dependency": "transitive", @@ -1940,31 +1983,31 @@ "dependency": "direct main", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", "description": { "name": "web_socket", - "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "sha256": "bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.6" + "version": "1.0.0" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.3" }, "webdriver": { "dependency": "transitive", @@ -1980,21 +2023,21 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.10.0" + "version": "5.12.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.5" + "version": "2.1.0" }, "window_manager": { "dependency": "direct main", @@ -2038,7 +2081,7 @@ } }, "sdks": { - "dart": ">=3.6.0 <4.0.0", - "flutter": ">=3.27.1" + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.29.3" } } diff --git a/pkgs/by-name/bw/bwa/package.nix b/pkgs/by-name/bw/bwa/package.nix index c306c2755d7e..5ee4d19b3f99 100644 --- a/pkgs/by-name/bw/bwa/package.nix +++ b/pkgs/by-name/bw/bwa/package.nix @@ -5,15 +5,15 @@ zlib, }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "bwa"; - version = "unstable-2022-09-23"; + version = "0.7.19"; src = fetchFromGitHub { owner = "lh3"; repo = "bwa"; - rev = "139f68fc4c3747813783a488aef2adc86626b01b"; - hash = "sha256-8u35lTK6gBKeapYoIkG9MuJ/pyy/HFA2OiPn+Ml2C6c="; + tag = "v${version}"; + hash = "sha256-o3+7kf+49mnRn5PjtdOiAaI9VK1cyT9p5QUSQ/W4GxI="; }; buildInputs = [ zlib ]; diff --git a/pkgs/by-name/bw/bws/package.nix b/pkgs/by-name/bw/bws/package.nix index e7003dc22984..8bc8bdd91761 100644 --- a/pkgs/by-name/bw/bws/package.nix +++ b/pkgs/by-name/bw/bws/package.nix @@ -7,7 +7,6 @@ oniguruma, openssl, stdenv, - darwin, python3, perl, }: @@ -41,9 +40,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/by-name/by/byobu/package.nix b/pkgs/by-name/by/byobu/package.nix index 207454b44ba4..42dbc0613f90 100644 --- a/pkgs/by-name/by/byobu/package.nix +++ b/pkgs/by-name/by/byobu/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "byobu"; - version = "6.12"; + version = "6.13"; src = fetchFromGitHub { owner = "dustinkirkland"; repo = "byobu"; rev = finalAttrs.version; - hash = "sha256-NzC9Njsnz14mfKnERGDZw8O3vux0wnfCKwjUeTBQswc="; + hash = "sha256-h+3BEMfBRozmpqFNRyfKzjKgevaYm8v7DsJMwkhiCQ4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bz/bzflag/package.nix b/pkgs/by-name/bz/bzflag/package.nix new file mode 100644 index 000000000000..2871047c4001 --- /dev/null +++ b/pkgs/by-name/bz/bzflag/package.nix @@ -0,0 +1,43 @@ +{ + stdenv, + lib, + fetchurl, + pkg-config, + curl, + SDL2, + libGLU, + libGL, + glew, + ncurses, + c-ares, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bzflag"; + version = "2.4.30"; + + src = fetchurl { + url = "https://download.bzflag.org/bzflag/source/${finalAttrs.version}/bzflag-${finalAttrs.version}.tar.bz2"; + sha256 = "sha256-u3i3UOe856p8Eb01kGuwikmsx8UL8pYprzgO7NFTiU0="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + curl + SDL2 + libGLU + libGL + glew + ncurses + c-ares + ]; + + meta = { + description = "Multiplayer 3D Tank game"; + homepage = "https://bzflag.org/"; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; + maintainers = [ ]; + }; +}) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 6122da0739a9..1448d1cefcb0 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -8,19 +8,19 @@ versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "c2patool"; - version = "0.9.12"; + version = "0.16.5"; src = fetchFromGitHub { owner = "contentauth"; - repo = "c2patool"; - rev = "v${version}"; - hash = "sha256-3OaCsy6xt2Pc/Cqm3qbbpr7kiQiA2BM/LqIQnuw73MY="; + repo = "c2pa-rs"; + tag = "c2patool-v${finalAttrs.version}"; + hash = "sha256-W9I7I4sukKBg4seRyn9iXoNhkRoSKcjbpjgZjvQKCGw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-jod9wKuyhbY+/3NIEMZGoKIA1rT6Y4XoLKqYvzM5fAQ="; + cargoHash = "sha256-C5PkwMfP/MyO8QlQk0DwkU2Z/u/FdJIvwpE3gseUG/Q="; # use the non-vendored openssl env.OPENSSL_NO_VENDOR = 1; @@ -30,9 +30,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ - openssl - ]; + buildInputs = [ openssl ]; + + # could not compile `c2pa` (lib test) due to 102 previous errors + doCheck = false; checkFlags = [ # These tests rely on additional executables to be compiled to "target/debug/". @@ -51,18 +52,16 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - nativeInstallCheckInputs = [ - versionCheckHook - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; - meta = with lib; { - description = "Command line tool for displaying and adding C2PA manifests"; - homepage = "https://github.com/contentauth/c2patool"; - license = with licenses; [ + meta = { + description = "Command line tool for working with C2PA manifests and media assets"; + homepage = "https://github.com/contentauth/c2pa-rs/tree/main/cli"; + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ ok-nick ]; + maintainers = with lib.maintainers; [ ok-nick ]; mainProgram = "c2patool"; }; -} +}) diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix index 5cae5d2671c4..28253a6300da 100644 --- a/pkgs/by-name/c3/c3c/package.nix +++ b/pkgs/by-name/c3/c3c/package.nix @@ -9,29 +9,45 @@ libffi, xar, versionCheckHook, + rev ? "unknown", + debug ? false, + checks ? true, }: - +let + inherit (lib.strings) optionalString; +in llvmPackages.stdenv.mkDerivation (finalAttrs: { - pname = "c3c"; - version = "0.6.6"; + + pname = "c3c${optionalString debug "-debug"}"; + version = "0.7.1"; src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; tag = "v${finalAttrs.version}"; - hash = "sha256-+rNj1SmiBYBw3Ncx2uS8X5OA/qDvJ8SFpZOQVRCgvmM="; + hash = "sha256-2nTFQNoSAdD12BiwWMtrD9SeelTUOM3DYUdjBSjWnVU="; }; + cmakeBuildType = if debug then "Debug" else "Release"; + postPatch = '' + substituteInPlace git_hash.cmake \ + --replace-fail "\''${GIT_HASH}" "${rev}" substituteInPlace CMakeLists.txt \ - --replace-fail "\''${LLVM_LIBRARY_DIRS}" "${llvmPackages.lld.lib}/lib ${llvmPackages.llvm.lib}/lib" + --replace-fail "-Werror" "" ''; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DC3_ENABLE_CLANGD_LSP=${if debug then "ON" else "OFF"}" + "-DC3_LLD_DIR=${llvmPackages.lld.lib}/lib" + "-DLLVM_CRT_LIBRARY_DIR=${llvmPackages.compiler-rt}/lib/darwin" + ]; buildInputs = [ llvmPackages.llvm llvmPackages.lld + llvmPackages.compiler-rt curl libxml2 libffi @@ -39,12 +55,18 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ python3 ]; - doCheck = llvmPackages.stdenv.system == "x86_64-linux"; + doCheck = + lib.elem llvmPackages.stdenv.system [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + ] + && checks; checkPhase = '' runHook preCheck - ( cd ../resources/testproject; ../../build/c3c build ) - ( cd ../test; python src/tester.py ../build/c3c test_suite ) + ( cd ../resources/testproject; ../../build/c3c build --trust=full ) + ( cd ../test; ../build/c3c compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c test_suite ) runHook postCheck ''; @@ -56,6 +78,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/c3lang/c3c"; license = licenses.lgpl3Only; maintainers = with maintainers; [ + hucancode anas ]; platforms = platforms.all; diff --git a/pkgs/by-name/c3/c3d/package.nix b/pkgs/by-name/c3/c3d/package.nix new file mode 100644 index 000000000000..ceb1f60c8a6c --- /dev/null +++ b/pkgs/by-name/c3/c3d/package.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + itk, +}: + +stdenv.mkDerivation { + pname = "c3d"; + version = "1.4.1-unstable-2024-08-07"; + + src = fetchFromGitHub { + owner = "pyushkevich"; + repo = "c3d"; + rev = "9e6174153ab87eae014f5b802413478c8fbc9a1a"; + hash = "sha256-s2/XRyKoiMnF6cRsxxNUSlNtksbOyKSlk8hAGxJELqw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ itk ]; + + cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; + + meta = with lib; { + homepage = "https://github.com/pyushkevich/c3d"; + description = "Medical imaging processing tool"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.gpl3; + broken = stdenv.hostPlatform.isAarch64; + # /build/source/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:312:10: fatal error: xmmintrin.h: No such file or directory + }; +} diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix index 1bb6049bc849..fcb7de1bd203 100644 --- a/pkgs/by-name/ca/cables/package.nix +++ b/pkgs/by-name/ca/cables/package.nix @@ -7,12 +7,12 @@ let pname = "cables"; - version = "0.5.10"; + version = "0.5.14"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; - sha256 = "sha256-FwjmqCIoo1RG+57Y1fnAAWRtOAj4ILQb0pJMESxkiwo="; + sha256 = "sha256-kgTVIrWFrG47bApFUthCkkL3RdtjIrZkL8sXi8sKxaU="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix index c908df82511f..866d548412f7 100644 --- a/pkgs/by-name/ca/cacert/package.nix +++ b/pkgs/by-name/ca/cacert/package.nix @@ -23,7 +23,7 @@ let lib.concatStringsSep "\n\n" extraCertificateStrings ); - srcVersion = "3.108"; + srcVersion = "3.111"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -47,7 +47,7 @@ let owner = "nss-dev"; repo = "nss"; rev = "NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM"; - hash = "sha256-L2XRj3D8SsS2QYQFDLwGtaPoZ7tN4kz8hGdVKefFSu8="; + hash = "sha256-GFtoSvLF5nAwBIiMa9CeEl5geAOK60gG2tjuQFubgYs="; }; dontBuild = true; diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index e867d5d0903c..bc219a3cfbf5 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -10,12 +10,12 @@ stdenv, }: let - version = "2.9.1"; + version = "2.10.0"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; tag = "v${version}"; - hash = "sha256-28ahonJ0qeynoqf02gws0LstaL4E08dywSJ8s3tgEDI="; + hash = "sha256-us1TnszA/10OMVSDsNvzRb6mcM4eMR3pQ5EF4ggA958="; }; in buildGoModule { @@ -26,10 +26,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; tag = "v${version}"; - hash = "sha256-XW1cBW7mk/aO/3IPQK29s4a6ArSKjo7/64koJuzp07I="; + hash = "sha256-hzDd2BNTZzjwqhc/STbSAHnNlP7g1cFuMehqU1LumQE="; }; - vendorHash = "sha256-qrlpuqTnFn/9oMTMovswpS1eAI7P9gvesoMpsIWKcY8="; + vendorHash = "sha256-9Iu4qmBVkGeSAywLgQuDR7y+TwCBqwhVxhfaXhCDnUc="; subPackages = [ "cmd/caddy" ]; diff --git a/pkgs/by-name/ca/cage/package.nix b/pkgs/by-name/ca/cage/package.nix new file mode 100644 index 000000000000..d11cb43ba4fd --- /dev/null +++ b/pkgs/by-name/ca/cage/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wayland-scanner, + scdoc, + makeWrapper, + wlroots_0_18, + wayland, + wayland-protocols, + pixman, + libxkbcommon, + xcbutilwm, + systemd, + libGL, + libX11, + xwayland ? null, + nixosTests, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cage"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "cage-kiosk"; + repo = "cage"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2SFtz62z0EF8cpFTC6wGi125MD4a5mkXqP/C+7fH+3g="; + }; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wayland-scanner + scdoc + makeWrapper + ]; + + buildInputs = [ + wlroots_0_18 + wayland + wayland-protocols + pixman + libxkbcommon + xcbutilwm + systemd + libGL + libX11 + ]; + + postFixup = lib.optionalString wlroots_0_18.enableXWayland '' + wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin" + ''; + + # Tests Cage using the NixOS module by launching xterm: + passthru.tests.basic-nixos-module-functionality = nixosTests.cage; + + meta = { + description = "Wayland kiosk that runs a single, maximized application"; + homepage = "https://www.hjdskes.nl/projects/cage/"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ primeos ]; + mainProgram = "cage"; + }; +}) diff --git a/pkgs/by-name/ca/cagebreak/package.nix b/pkgs/by-name/ca/cagebreak/package.nix new file mode 100644 index 000000000000..b0611707e04f --- /dev/null +++ b/pkgs/by-name/ca/cagebreak/package.nix @@ -0,0 +1,97 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cairo, + fontconfig, + libdrm, + libevdev, + libinput, + libxkbcommon, + xcbutilwm, + makeWrapper, + meson, + ninja, + nixosTests, + pango, + pixman, + pkg-config, + scdoc, + systemd, + wayland, + wayland-protocols, + wayland-scanner, + withXwayland ? true, + xwayland, + wlroots_0_18, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cagebreak"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "project-repo"; + repo = "cagebreak"; + tag = finalAttrs.version; + hash = "sha256-vXRIZqFyywRettzriOArl1FGdzWdaeVOfYFZCiPLQZg="; + }; + + nativeBuildInputs = [ + makeWrapper + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + + buildInputs = [ + cairo + fontconfig + libdrm + libevdev + libinput + libxkbcommon + xcbutilwm + pango + pixman + systemd + wayland + wayland-protocols + wlroots_0_18 + ]; + + mesonFlags = [ + "-Dman-pages=true" + "-Dversion_override=${finalAttrs.version}" + "-Dxwayland=${lib.boolToString withXwayland}" + ]; + + postPatch = '' + # TODO: investigate why is this happening + sed -i -e 's|||' *.c + + # 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 '' + wrapProgram $out/bin/cagebreak \ + --prefix PATH : "${lib.makeBinPath [ xwayland ]}" + ''; + + meta = { + homepage = "https://github.com/project-repo/cagebreak"; + description = "Wayland tiling compositor inspired by ratpoison"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; + changelog = "https://github.com/project-repo/cagebreak/blob/${finalAttrs.version}/Changelog.md"; + mainProgram = "cagebreak"; + }; + + passthru.tests.basic = nixosTests.cagebreak; +}) diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index 401ec4676de6..c9953ffc5013 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -15,14 +15,14 @@ let "cli" "desktop" ]; - version = "0.45.1"; + version = "0.48.1"; cli = fetchurl { url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; - hash = "sha256-tudXyf9wwWABMGwfsxaLJtkZPKImlgjzfJJYFtimQOE="; + hash = "sha256-UdeC3BZmQVUdWmwQTC27ptF0+lZgCXpF8yXaf8Bjpbo="; }; desktop = fetchurl { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-meNB1KCtxApsP95476ggL2gbCxu2fdold6BQ2dlZqFc="; + hash = "sha256-4KQpgO8Cb+TkKuDOK+bAE0nOhlwjkSUVXLHJmHaj6NQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version; @@ -70,6 +70,7 @@ let maintainers = with lib.maintainers; [ octodi d3vil0p3r + blackzeshi ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix index d8a4365afe6f..1d96951ac59c 100644 --- a/pkgs/by-name/ca/cairo/package.nix +++ b/pkgs/by-name/ca/cairo/package.nix @@ -21,7 +21,6 @@ glib, xcbSupport ? x11Support, libxcb, - darwin, testers, }: @@ -60,19 +59,9 @@ stdenv.mkDerivation ( python3 ]; - buildInputs = - [ - docbook_xsl - ] - ++ optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreGraphics - CoreText - ApplicationServices - Carbon - ] - ); + buildInputs = [ + docbook_xsl + ]; patches = [ # Pull upstream fix to fix "out of memory" errors: diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/package.nix b/pkgs/by-name/ca/calamares-nixos-extensions/package.nix index c55a3a214f1f..c6bd7665ac09 100644 --- a/pkgs/by-name/ca/calamares-nixos-extensions/package.nix +++ b/pkgs/by-name/ca/calamares-nixos-extensions/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "calamares-nixos-extensions"; - version = "0.3.22"; + version = "0.3.23"; src = fetchFromGitHub { owner = "NixOS"; repo = "calamares-nixos-extensions"; rev = finalAttrs.version; - hash = "sha256-Tmp/sWQmhiZe2dmA+msCMPwPlBd1Oa3q5X+QP+CoAWI="; + hash = "sha256-KNRztajU7sTLNDwCwP4WOdR2IRMqfbeapdko58LcrjM="; }; installPhase = '' diff --git a/pkgs/by-name/ca/calaos_installer/package.nix b/pkgs/by-name/ca/calaos_installer/package.nix new file mode 100644 index 000000000000..1af9b86e5178 --- /dev/null +++ b/pkgs/by-name/ca/calaos_installer/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libsForQt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "calaos_installer"; + version = "3.11"; + + src = fetchFromGitHub { + owner = "calaos"; + repo = "calaos_installer"; + tag = "v${finalAttrs.version}"; + hash = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY="; + }; + + buildInputs = [ libsForQt5.qtbase ]; + nativeBuildInputs = with libsForQt5; [ + qmake + wrapQtAppsHook + qttools + ]; + + qmakeFlags = [ "REVISION=${finalAttrs.version}" ]; + + installPhase = + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/Applications + cp -a calaos_installer.app $out/Applications + '' + else + '' + mkdir -p $out/bin + cp -a calaos_installer $out/bin + ''; + + meta = { + description = "Calaos Installer, a tool to create calaos configuration"; + mainProgram = "calaos_installer"; + homepage = "https://www.calaos.fr/"; + downloadPage = "https://github.com/calaos/calaos_installer/"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ tiramiseb ]; + }; +}) diff --git a/pkgs/by-name/ca/calcure/package.nix b/pkgs/by-name/ca/calcure/package.nix index e9b4f4745906..1ef4bef9ccfc 100644 --- a/pkgs/by-name/ca/calcure/package.nix +++ b/pkgs/by-name/ca/calcure/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "calcure"; - version = "3.1"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "calcure"; tag = version; - hash = "sha256-ufrJbc3WMY88VEsUHlWxQ1m0iupts4zNusvQL8YAqJc="; + hash = "sha256-YFX70gtNcIXG5XIuMlz47nmtjt/2oHzi6cajcj+DAyQ="; }; nativeBuildInputs = with python3.pkgs; [ @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { description = "Modern TUI calendar and task manager with minimal and customizable UI"; mainProgram = "calcure"; homepage = "https://github.com/anufrievroman/calcure"; - changelog = "https://github.com/anufrievroman/calcure/releases/tag/${version}"; + changelog = "https://github.com/anufrievroman/calcure/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; }; diff --git a/pkgs/by-name/ca/calf/package.nix b/pkgs/by-name/ca/calf/package.nix new file mode 100644 index 000000000000..34edfdc3b7bb --- /dev/null +++ b/pkgs/by-name/ca/calf/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + cairo, + expat, + fftwSinglePrec, + fluidsynth, + glib, + gtk2, + libjack2, + ladspaH, + gnome2, + lv2, + pkg-config, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation rec { + pname = "calf"; + version = "0.90.6"; + + src = fetchFromGitHub { + owner = "calf-studio-gear"; + repo = "calf"; + tag = version; + hash = "sha256-rcMuQFig6BrnyGFyvYaAHmOvabEHGl+1lMNfffLHn1w="; + }; + + outputs = [ + "out" + "doc" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cairo + expat + fftwSinglePrec + fluidsynth + glib + gtk2 + libjack2 + ladspaH + gnome2.libglade + lv2 + ]; + + meta = { + homepage = "https://calf-studio-gear.org"; + description = "Set of high quality open source audio plugins for musicians"; + license = lib.licenses.lgpl2; + maintainers = [ ]; + platforms = lib.platforms.linux; + mainProgram = "calfjackhost"; + }; +} diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 97927b9289ea..52c1d0061ed8 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -17,6 +17,7 @@ libuchardet, libusb1, libwebp, + nix-update-script, optipng, piper-tts, pkg-config, @@ -35,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "8.1.1"; + version = "8.4.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-lz+QlrajIjA2uvo6Iomejk9Y+djDjUNPAd5BZT3Dz5Y="; + hash = "sha256-5uexcItbBgO2Tv52clS0N+IhplqpKwq43p2yqSxANek="; }; patches = [ @@ -219,6 +220,7 @@ stdenv.mkDerivation (finalAttrs: { $ETN 'test_qt' # we don't include svg or webp support $ETN 'test_import_of_all_python_modules' # explores actual file paths, gets confused $ETN 'test_websocket_basic' # flakey + ${lib.optionalString stdenv.hostPlatform.isAarch64 "$ETN 'test_piper'"} # https://github.com/microsoft/onnxruntime/issues/10038 ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"} ) @@ -227,6 +229,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--url=https://github.com/kovidgoyal/calibre" ]; + }; + meta = { homepage = "https://calibre-ebook.com"; description = "Comprehensive e-book software"; diff --git a/pkgs/by-name/ca/calls/package.nix b/pkgs/by-name/ca/calls/package.nix index 42b96b70058e..6d9932afeee8 100644 --- a/pkgs/by-name/ca/calls/package.nix +++ b/pkgs/by-name/ca/calls/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "calls"; - version = "47.0"; + version = "48.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "calls"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-HzQz5jmlXwUHLXC6nhHCa8E8zczaA89YxteZgxSV0YY="; + hash = "sha256-JK+bG/5p+c37aP7ZTGiPDh8tBHgWsuFkD7AsyZXePaw="; }; outputs = [ diff --git a/pkgs/by-name/ca/cambalache/package.nix b/pkgs/by-name/ca/cambalache/package.nix index a664bdc6ac1c..0e10ba9b654e 100644 --- a/pkgs/by-name/ca/cambalache/package.nix +++ b/pkgs/by-name/ca/cambalache/package.nix @@ -18,21 +18,21 @@ webkitgtk_4_1, webkitgtk_6_0, nix-update-script, + casilda, }: python3.pkgs.buildPythonApplication rec { pname = "cambalache"; - version = "0.90.4"; - - format = "other"; + version = "0.94.1"; + pyproject = false; # Did not fetch submodule since it is only for tests we don't run. src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jpu"; repo = "cambalache"; - rev = version; - hash = "sha256-XS6JBJuifmN2ElCGk5hITbotZ+fqEdjopL6VqmMP2y4="; + tag = version; + hash = "sha256-dX9YiBCBG/ALWX0W1CjvdUlOCQ6UulnQCiYUscRMKWk="; }; nativeBuildInputs = [ @@ -60,6 +60,7 @@ python3.pkgs.buildPythonApplication rec { # For extra widgets support. libadwaita libhandy + casilda ]; # Prevent double wrapping. @@ -67,25 +68,11 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' patchShebangs postinstall.py - # those programs are used at runtime not build time - # https://gitlab.gnome.org/jpu/cambalache/-/blob/0.12.1/meson.build#L79-80 - substituteInPlace ./meson.build \ - --replace-fail "find_program('broadwayd', required: true)" "" \ - --replace-fail "find_program('gtk4-broadwayd', required: true)" "" ''; preFixup = '' # Let python wrapper use GNOME flags. - makeWrapperArgs+=( - # For broadway daemons - --prefix PATH : "${ - lib.makeBinPath [ - gtk3 - gtk4 - ] - }" - "''${gappsWrapperArgs[@]}" - ) + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; postFixup = '' @@ -97,15 +84,15 @@ python3.pkgs.buildPythonApplication rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { homepage = "https://gitlab.gnome.org/jpu/cambalache"; description = "RAD tool for GTK 4 and 3 with data model first philosophy"; mainProgram = "cambalache"; - maintainers = teams.gnome.members; - license = with licenses; [ + teams = [ lib.teams.gnome ]; + license = with lib.licenses; [ lgpl21Only # Cambalache gpl2Only # tools ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ca/camilladsp/Cargo.lock b/pkgs/by-name/ca/camilladsp/Cargo.lock new file mode 100644 index 000000000000..7bf2cb054da3 --- /dev/null +++ b/pkgs/by-name/ca/camilladsp/Cargo.lock @@ -0,0 +1,3483 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "CamillaDSP" +version = "3.0.1" +dependencies = [ + "alsa 0.9.1", + "alsa-sys", + "audio_thread_priority", + "chrono", + "circular-queue", + "clap 4.5.37", + "coreaudio-rs 0.11.3", + "cpal", + "criterion", + "crossbeam-channel", + "dispatch", + "flexi_logger", + "lazy_static", + "libpulse-binding", + "libpulse-simple-binding", + "log", + "native-tls", + "nix 0.28.0", + "num-complex", + "num-traits", + "parking_lot 0.12.3", + "rand", + "rand_distr", + "rawsample", + "rayon", + "realfft", + "rubato", + "serde", + "serde_json", + "serde_with", + "serde_yaml", + "signal-hook", + "tungstenite", + "version_check", + "wasapi", + "windows", + "zbus", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alsa" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" +dependencies = [ + "alsa-sys", + "bitflags 1.3.2", + "libc", + "nix 0.23.2", +] + +[[package]] +name = "alsa" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" +dependencies = [ + "alsa-sys", + "bitflags 2.9.0", + "cfg-if", + "libc", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +dependencies = [ + "anstyle", + "once_cell", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.3.0", + "futures-lite 2.6.0", + "pin-project-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 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.28", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.6.0", + "parking", + "polling 3.7.4", + "rustix 0.38.44", + "slab", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.4.0", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.44", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "async-signal" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +dependencies = [ + "async-io 2.4.0", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.44", + "signal-hook-registry", + "slab", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "audio_thread_priority" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3632611da7e79f8fc8fd75840f1ccfa7792dbf1e25d00791344a4450dd8834f" +dependencies = [ + "cfg-if", + "libc", + "log", + "mach", + "windows-sys 0.52.0", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.9.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.101", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.6.0", + "piper", +] + +[[package]] +name = "bumpalo" +version = "3.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-link", +] + +[[package]] +name = "circular-queue" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2df8276ab95fe8665a814190345239d91105df5df0fda26ddc7784c96244dc76" +dependencies = [ + "version_check", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading 0.8.6", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags 1.3.2", + "textwrap", + "unicode-width", +] + +[[package]] +name = "clap" +version = "4.5.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "coreaudio-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" +dependencies = [ + "bitflags 1.3.2", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b" +dependencies = [ + "bindgen", +] + +[[package]] +name = "cpal" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" +dependencies = [ + "alsa 0.6.0", + "core-foundation-sys", + "coreaudio-rs 0.10.0", + "jack", + "jni", + "js-sys", + "lazy_static", + "libc", + "mach", + "ndk", + "ndk-glue", + "nix 0.23.2", + "oboe", + "parking_lot 0.11.2", + "stdweb", + "thiserror", + "web-sys", + "winapi", +] + +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "criterion" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +dependencies = [ + "atty", + "cast", + "clap 2.34.0", + "criterion-plot", + "csv", + "itertools 0.10.5", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_cbor", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d" +dependencies = [ + "memchr", +] + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "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", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "data-encoding" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "enumflags2" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener 5.4.0", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "flexi_logger" +version = "0.27.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469e584c031833564840fb0cdbce99bdfe946fd45480a188545e73a76f45461c" +dependencies = [ + "chrono", + "crossbeam-channel", + "crossbeam-queue", + "glob", + "is-terminal", + "lazy_static", + "log", + "nu-ansi-term", + "regex", + "thiserror", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" +dependencies = [ + "fastrand 2.3.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + +[[package]] +name = "glob" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" + +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hermit-abi" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "iana-time-zone" +version = "0.1.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core 0.61.0", +] + +[[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.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +dependencies = [ + "equivalent", + "hashbrown 0.15.3", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +dependencies = [ + "hermit-abi 0.5.0", + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jack" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d2ac12f11bb369f3c50d24dbb9fdb00dc987434c9dd622a12c13f618106e153" +dependencies = [ + "bitflags 1.3.2", + "jack-sys", + "lazy_static", + "libc", + "log", +] + +[[package]] +name = "jack-sys" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b91f2d2d10bc2bab38f4dfa4bc77123a988828af39dd3f30dd9db14d44f2cc1" +dependencies = [ + "lazy_static", + "libc", + "libloading 0.6.7", + "pkg-config", +] + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +dependencies = [ + "getrandom 0.3.2", + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.172" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + +[[package]] +name = "libloading" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libm" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72" + +[[package]] +name = "libpulse-binding" +version = "2.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909eb3049e16e373680fe65afe6e2a722ace06b671250cc4849557bc57d6a397" +dependencies = [ + "bitflags 2.9.0", + "libc", + "libpulse-sys", + "num-derive 0.4.2", + "num-traits", + "winapi", +] + +[[package]] +name = "libpulse-simple-binding" +version = "2.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7bebef0381c8e3e4b23cc24aaf36fab37472bece128de96f6a111efa464cfef" +dependencies = [ + "libpulse-binding", + "libpulse-simple-sys", + "libpulse-sys", +] + +[[package]] +name = "libpulse-simple-sys" +version = "1.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bd96888fe37ad270d16abf5e82cccca1424871cf6afa2861824d2a52758eebc" +dependencies = [ + "libpulse-sys", + "pkg-config", +] + +[[package]] +name = "libpulse-sys" +version = "1.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d74371848b22e989f829cc1621d2ebd74960711557d8b45cfe740f60d0a05e61" +dependencies = [ + "libc", + "num-derive 0.4.2", + "num-traits", + "pkg-config", + "winapi", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + +[[package]] +name = "litemap" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[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.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "native-tls" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-glue" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" +dependencies = [ + "lazy_static", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-macro", + "ndk-sys", +] + +[[package]] +name = "ndk-macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" +dependencies = [ + "darling", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.9.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "oboe" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" +dependencies = [ + "jni", + "ndk", + "ndk-context", + "num-derive 0.3.3", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" +dependencies = [ + "cc", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "oorandom" +version = "11.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" + +[[package]] +name = "openssl" +version = "0.10.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" +dependencies = [ + "bitflags 2.9.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "openssl-probe" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + +[[package]] +name = "openssl-sys" +version = "0.9.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[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 = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.10", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.11", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand 2.3.0", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.44", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "primal-check" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08" +dependencies = [ + "num-integer", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[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 0.2.16", +] + +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "rawsample" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb6c62a8f838420b4bb444ce954d99f827dd3bd5227ffb56b24e2298c5380d9" +dependencies = [ + "num-traits", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "realfft" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "390252372b7f2aac8360fc5e72eba10136b166d6faeed97e6d0c8324eb99b2b1" +dependencies = [ + "rustfft", +] + +[[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.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" +dependencies = [ + "bitflags 2.9.0", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "rubato" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5d18b486e7d29a408ef3f825bc1327d8f87af091c987ca2f5b734625940e234" +dependencies = [ + "num-complex", + "num-integer", + "num-traits", + "realfft", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustfft" +version = "6.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f266ff9b0cfc79de11fd5af76a2bc672fe3ace10c96fa06456740fa70cb1ed49" +dependencies = [ + "num-complex", + "num-integer", + "num-traits", + "primal-check", + "strength_reduce", + "transpose", + "version_check", +] + +[[package]] +name = "rustix" +version = "0.37.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "519165d378b97752ca44bbe15047d5d3409e875f39327546b42ac81d7e18c1b6" +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.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.9.0", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +dependencies = [ + "bitflags 2.9.0", + "errno", + "libc", + "linux-raw-sys 0.9.4", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustversion" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[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.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.9.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "serde_json" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "serde_with" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +dependencies = [ + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "serde_yaml" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +dependencies = [ + "indexmap 1.9.3", + "ryu", + "serde", + "yaml-rust", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stdweb" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" + +[[package]] +name = "strength_reduce" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "tempfile" +version = "3.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" +dependencies = [ + "fastrand 2.3.0", + "getrandom 0.3.2", + "once_cell", + "rustix 1.0.7", + "windows-sys 0.59.0", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[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 = "toml_datetime" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.9.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "tracing-core" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +dependencies = [ + "once_cell", +] + +[[package]] +name = "transpose" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" +dependencies = [ + "num-integer", + "strength_reduce", +] + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "native-tls", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "url" +version = "2.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasapi" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f6b03b82e419f186fcdc06ac6068621bdadc88b89b2612067f1c021ad2c9449" +dependencies = [ + "log", + "num-integer", + "widestring", + "windows", + "windows-core 0.57.0", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn 2.0.101", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "web-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "widestring" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d" + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +dependencies = [ + "windows-core 0.57.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement 0.57.0", + "windows-interface 0.57.0", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" +dependencies = [ + "windows-implement 0.60.0", + "windows-interface 0.59.1", + "windows-link", + "windows-result 0.3.2", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "windows-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags 2.9.0", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "xdg-home" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" +dependencies = [ + "libc", + "windows-sys 0.59.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", +] + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", + "synstructure", +] + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.8.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/by-name/ca/camilladsp/package.nix b/pkgs/by-name/ca/camilladsp/package.nix new file mode 100644 index 000000000000..33995fcba6f8 --- /dev/null +++ b/pkgs/by-name/ca/camilladsp/package.nix @@ -0,0 +1,57 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libpulseaudio, + openssl, + stdenv, + alsa-lib, + nix-update-script, + versionCheckHook, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "camilladsp"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "HEnquist"; + repo = "camilladsp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-IJ1sYprBh8ys1Og3T3newIDlBlR0PoQiblbJmzLbsfs="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + libpulseaudio + openssl + ] ++ lib.optionals stdenv.isLinux [ alsa-lib ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + meta = { + description = "Flexible cross-platform IIR and FIR engine for crossovers, room correction etc"; + homepage = "https://github.com/HEnquist/camilladsp"; + changelog = "https://github.com/HEnquist/camilladsp/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ paepcke ]; + mainProgram = "camilladsp"; + }; +}) diff --git a/pkgs/by-name/ca/camset/package.nix b/pkgs/by-name/ca/camset/package.nix new file mode 100644 index 000000000000..77c6f4ee168e --- /dev/null +++ b/pkgs/by-name/ca/camset/package.nix @@ -0,0 +1,67 @@ +{ + python3Packages, + fetchFromGitHub, + copyDesktopItems, + makeDesktopItem, + gobject-introspection, + v4l-utils, + wrapGAppsHook3, + lib, +}: + +python3Packages.buildPythonApplication { + pname = "camset"; + version = "0-unstable-2023-05-20"; + pyproject = true; + + src = fetchFromGitHub { + owner = "azeam"; + repo = "camset"; + rev = "b813ba9b1d29f2d46fad268df67bf3615a324f3e"; + hash = "sha256-vTF3MJQi9fZZDlbEj5800H22GGWOte3+KZCpSnsSTaQ="; + }; + + build-system = with python3Packages; [ setuptools ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook3 + copyDesktopItems + ]; + + dependencies = with python3Packages; [ + pygobject3 + opencv-python + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : ${lib.makeBinPath [ v4l-utils ]} + ) + ''; + + desktopItems = [ + (makeDesktopItem { + name = "camset"; + exec = "camset"; + icon = "camera"; + comment = "Adjust webcam settings"; + desktopName = "Camset"; + categories = [ + "Utility" + "Video" + ]; + type = "Application"; + }) + ]; + + meta = { + description = "GUI for Video4Linux adjustments of webcams"; + homepage = "https://github.com/azeam/camset"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ averdow ]; + }; +} diff --git a/pkgs/by-name/ca/camunda-modeler/package.nix b/pkgs/by-name/ca/camunda-modeler/package.nix index a6bf459dc75b..58907c267493 100644 --- a/pkgs/by-name/ca/camunda-modeler/package.nix +++ b/pkgs/by-name/ca/camunda-modeler/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.33.1"; + version = "5.34.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-YZSekLBjyADmBauGn5gonJ98bpW7ubHeKDS7J0IxsJo="; + hash = "sha256-3A8f371zyfx2GWJSwL0e+pD9M1Nitk4P7voq+V8Fojs="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; @@ -76,7 +76,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/camunda/camunda-modeler"; description = "An integrated modeling solution for BPMN, DMN and Forms based on bpmn.io"; - maintainers = teams.wdz.members; + teams = [ teams.wdz ]; license = licenses.mit; inherit (electron.meta) platforms; mainProgram = "camunda-modeler"; diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix index 7703ec0b7a4c..d53f3648d64e 100644 --- a/pkgs/by-name/ca/canaille/package.nix +++ b/pkgs/by-name/ca/canaille/package.nix @@ -2,6 +2,7 @@ lib, python3, fetchFromGitLab, + fetchpatch, openldap, nixosTests, }: @@ -11,7 +12,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "canaille"; - version = "0.0.57"; + version = "0.0.74"; pyproject = true; disabled = python.pythonOlder "3.10"; @@ -20,9 +21,17 @@ python.pkgs.buildPythonApplication rec { owner = "yaal"; repo = "canaille"; rev = "refs/tags/${version}"; - hash = "sha256-pesN7k5kGHi3dqTMaXWdCsNsnaJxXv/Ku1wVC9N9a3k="; + hash = "sha256-FL02ADM7rUU43XR71UWr4FLr/NeUau7zRwTMOSFm1T4="; }; + patches = [ + # https://gitlab.com/yaal/canaille/-/merge_requests/275 + (fetchpatch { + url = "https://gitlab.com/yaal/canaille/-/commit/1c7fc8b1034a4423f7f46ad8adeced854910b702.patch"; + hash = "sha256-fu7D010NG7yUChOve7HY3e7mm2c/UGpfcTAiTU8BnGg="; + }) + ]; + build-system = with python.pkgs; [ hatchling babel @@ -32,10 +41,12 @@ python.pkgs.buildPythonApplication rec { dependencies = with python.pkgs; [ + blinker flask + flask-caching flask-wtf pydantic-settings - requests + httpx wtforms ] ++ sentry-sdk.optional-dependencies.flask; @@ -57,6 +68,7 @@ python.pkgs.buildPythonApplication rec { toml faker time-machine + pytest-scim2-server ] ++ optional-dependencies.front ++ optional-dependencies.oidc @@ -79,27 +91,34 @@ python.pkgs.buildPythonApplication rec { export SCHEMA="${openldap}/etc/schema" # Just use their example config for testing - export CONFIG=canaille/config.sample.toml + export CONFIG=tests/app/fixtures/default-config.toml ''; optional-dependencies = with python.pkgs; { front = [ email-validator flask-babel + flask-talisman flask-themer pycountry pytz - toml + tomlkit zxcvbn-rs-py ]; - oidc = [ authlib ]; + oidc = [ + authlib + joserfc + ]; scim = [ + httpx scim2-models authlib + scim2-client ]; ldap = [ python-ldap ]; sentry = [ sentry-sdk ]; postgresql = [ + flask-alembic passlib sqlalchemy sqlalchemy-json @@ -111,6 +130,7 @@ python.pkgs.buildPythonApplication rec { qrcode ]; sms = [ smpplib ]; + server = [ hypercorn ]; }; passthru = { @@ -120,16 +140,6 @@ python.pkgs.buildPythonApplication rec { }; }; - disabledTests = [ - # cause by authlib being too up-to-date for this version of canaille - # see: https://github.com/NixOS/nixpkgs/issues/389861#issuecomment-2726361949 - # FIX: update and see if this is fixed - "test_invalid_client[ldap_backend]" - "test_invalid_client[memory_backend]" - "test_invalid_client[sql_backend]" - "test_password_reset[sql_backend]" - ]; - meta = with lib; { description = "Lightweight Identity and Authorization Management"; homepage = "https://canaille.readthedocs.io/en/latest/index.html"; diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix index 6e7c3249a2bf..08be228942e6 100644 --- a/pkgs/by-name/ca/candy-icons/package.nix +++ b/pkgs/by-name/ca/candy-icons/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "candy-icons"; - version = "0-unstable-2025-04-02"; + version = "0-unstable-2025-05-08"; src = fetchFromGitHub { owner = "EliverLara"; repo = "candy-icons"; - rev = "063a64161ec8f0fcb019e54db9be8a0f9a4be9ed"; - hash = "sha256-T9j5OCPpuaZRktsfN8b8n0G3osjti8hXmAwD4MaADBU="; + rev = "47abaeba8de75a1805b10f4fc8d698c6e8c614c9"; + hash = "sha256-COC926EPA7w1eUnXq40iFuANUF3Rch83e/BekBsHNFo="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/ca/canon-cups-ufr2/package.nix b/pkgs/by-name/ca/canon-cups-ufr2/package.nix index 8065b80aa27a..f556ff2b7346 100644 --- a/pkgs/by-name/ca/canon-cups-ufr2/package.nix +++ b/pkgs/by-name/ca/canon-cups-ufr2/package.nix @@ -180,15 +180,15 @@ stdenv.mkDerivation rec { ( cd $out/lib - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0 - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0 - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib:${stdenv.cc.libc}/lib:$out/lib" libcanonufr2r.so.1.0.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib:${stdenv.cc.libc}/lib" libcaepcmufr2.so.1.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib:${stdenv.cc.libc}/lib" libColorGearCufr2.so.2.0.0 ) ( cd $out/bin - patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv - patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2 + patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib:${stdenv.cc.libc}/lib" cnsetuputil2 cnpdfdrv + patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib:${stdenv.cc.libc}/lib:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2 wrapProgram $out/bin/cnrsdrvufr2 \ --prefix LD_LIBRARY_PATH ":" "$out/lib" \ diff --git a/pkgs/by-name/ca/canto-curses/package.nix b/pkgs/by-name/ca/canto-curses/package.nix index 78be4ecaeb2d..69e02fac6472 100644 --- a/pkgs/by-name/ca/canto-curses/package.nix +++ b/pkgs/by-name/ca/canto-curses/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchurl, python3Packages, readline, ncurses, @@ -18,6 +19,14 @@ python3Packages.buildPythonApplication rec { sha256 = "1vzb9n1j4gxigzll6654ln79lzbrrm6yy0lyazd9kldyl349b8sr"; }; + # Fixes the issue found here https://github.com/themoken/canto-curses/issues/59 + patches = [ + (fetchurl { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/canto-curses/-/raw/6daa56bc5baebb2444c368a8208666ef484a6fc0/fix-build.patch"; + hash = "sha256-2TMNmwjUAGyenSDqxfI+U2hNeDZaj2CivfTfpX7CKgY="; + }) + ]; + buildInputs = [ readline ncurses diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix index 2b33a5f0c894..f14f53b4c991 100644 --- a/pkgs/by-name/ca/capnproto-rust/package.nix +++ b/pkgs/by-name/ca/capnproto-rust/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "capnproto-rust"; - version = "0.20.1"; + version = "0.21.0"; src = fetchCrate { crateName = "capnpc"; inherit version; - hash = "sha256-iLjvKxVfkAVoM4AYgr31Ud1mk3MyMPReDXv1IbKEvcE="; + hash = "sha256-QI38Xy0zgL+sgH1WaOL2eMcQdOPPHE9Dcucs42eaL2o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-P8zbqKqAvnKvWuCk+kHg17gJ/JZ61uC+yv7x/GzUxkk="; + cargoHash = "sha256-Oljyv9qCfZF2/CoHNqs9bvCAEfGpmfvNzTvvyaVMH2U="; postInstall = '' mkdir -p $out/include/capnp diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix index 9334d336e364..646df7c9a87b 100644 --- a/pkgs/by-name/ca/capnproto/package.nix +++ b/pkgs/by-name/ca/capnproto/package.nix @@ -75,6 +75,6 @@ clangStdenv.mkDerivation rec { ''; license = licenses.mit; platforms = platforms.all; - maintainers = lib.teams.lix.members; + teams = [ lib.teams.lix ]; }; } diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix index 5deac4688fef..cf3bba068a44 100644 --- a/pkgs/by-name/ca/capslock/package.nix +++ b/pkgs/by-name/ca/capslock/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "capslock"; version = "0.2.7"; src = fetchFromGitHub { owner = "google"; repo = "capslock"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-kRuEcrx9LBzCpXFWlc9bSsgZt84T8R8VFdbAWAseSPQ="; }; @@ -33,4 +33,4 @@ buildGoModule rec { mainProgram = "capslock"; maintainers = with lib.maintainers; [ katexochen ]; }; -} +}) diff --git a/pkgs/by-name/ca/capypdf/package.nix b/pkgs/by-name/ca/capypdf/package.nix index 3ada4db8cd48..60473b6cd08b 100644 --- a/pkgs/by-name/ca/capypdf/package.nix +++ b/pkgs/by-name/ca/capypdf/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "capypdf"; - version = "0.15.0"; + version = "0.16.0"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "jpakkane"; repo = "capypdf"; rev = finalAttrs.version; - hash = "sha256-aaZHIBXOdKysxAk/011b9Di/QHH5vgF+/g3tWPn6d/k="; + hash = "sha256-FqXb0e16sADJVdXCbWJcAs/5+xpGAXIwXR0bgGEuHRE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix index a26dd2a00038..39c2699bc2da 100644 --- a/pkgs/by-name/ca/carapace-bridge/package.nix +++ b/pkgs/by-name/ca/carapace-bridge/package.nix @@ -6,21 +6,21 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "carapace-bridge"; - version = "1.2.4"; + version = "1.2.9"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bridge"; - tag = "v${version}"; - hash = "sha256-/HjoE6yaawo1hCemnvtfK3wj4SBSW91D4oyuZ5qxV4M="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y69byUUDJJ+nJuZ6lcl+McFtJGYb5zgE8+QTbhoZ9Bc="; }; # buildGoModule try to run `go mod vendor` instead of `go work vendor` on the # workspace if proxyVendor is off proxyVendor = true; - vendorHash = "sha256-zfV5IcpwtK3n76jWs4ldMlpEqbyNmmXZWDj+fh66luw="; + vendorHash = "sha256-TVqQrqdMmzv1w4Y37pB2t/apdMPm6QO/0VVS3x86GpE="; postPatch = '' substituteInPlace cmd/carapace-bridge/main.go \ @@ -36,9 +36,9 @@ buildGoModule rec { meta = { description = "Multi-shell completion bridge for carapace"; homepage = "https://carapace.sh/"; - changelog = "https://github.com/carapace-sh/carapace-bridge/releases/tag/v${version}"; + changelog = "https://github.com/carapace-sh/carapace-bridge/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ famfo ]; license = lib.licenses.mit; mainProgram = "carapace-bridge"; }; -} +}) diff --git a/pkgs/by-name/ca/cardpeek/package.nix b/pkgs/by-name/ca/cardpeek/package.nix new file mode 100644 index 000000000000..84c2f283d035 --- /dev/null +++ b/pkgs/by-name/ca/cardpeek/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + autoreconfHook, + glib, + gtk3, + pcsclite, + lua5_2, + curl, + readline, +}: +let + version = "0.8.4"; +in +stdenv.mkDerivation { + pname = "cardpeek"; + inherit version; + + src = fetchFromGitHub { + owner = "L1L1"; + repo = "cardpeek"; + rev = "cardpeek-${version}"; + sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; + }; + + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # replace xcode check and hard-coded PCSC framework path + substituteInPlace configure.ac \ + --replace-fail 'if test ! -e "/Applications/Xcode.app/"; then' 'if test yes != yes; then' \ + --replace-fail 'PCSC_HEADERS=`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*.sdk/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers/ | sort | head -1`' 'PCSC_HEADERS=$SDKROOT/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers' + ''; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + buildInputs = [ + glib + gtk3 + lua5_2 + curl + readline + ] ++ lib.optional stdenv.hostPlatform.isLinux pcsclite; + + enableParallelBuilding = true; + + meta = { + homepage = "https://github.com/L1L1/cardpeek"; + description = "Tool to read the contents of ISO7816 smart cards"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ embr ]; + mainProgram = "cardpeek"; + }; +} diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix index 6495652b190b..ca43b5ba79cb 100644 --- a/pkgs/by-name/ca/cargo-about/package.nix +++ b/pkgs/by-name/ca/cargo-about/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,12 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ zstd ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ zstd ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ca/cargo-ament-build/Cargo.lock b/pkgs/by-name/ca/cargo-ament-build/Cargo.lock new file mode 100644 index 000000000000..741bf0371325 --- /dev/null +++ b/pkgs/by-name/ca/cargo-ament-build/Cargo.lock @@ -0,0 +1,122 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "cargo-ament-build" +version = "0.1.9" +dependencies = [ + "anyhow", + "cargo-manifest", + "pico-args", +] + +[[package]] +name = "cargo-manifest" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf5acda331466fdea759172dbc2fb9e650e382dbca6a8dd3f576d9aeeac76da6" +dependencies = [ + "serde", + "serde_derive", + "toml", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "pico-args" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" + +[[package]] +name = "proc-macro2" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "2.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "indexmap", + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" diff --git a/pkgs/by-name/ca/cargo-ament-build/package.nix b/pkgs/by-name/ca/cargo-ament-build/package.nix new file mode 100644 index 000000000000..d453f34dba96 --- /dev/null +++ b/pkgs/by-name/ca/cargo-ament-build/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cargo-ament-build"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "ros2-rust"; + repo = "cargo-ament-build"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5D0eB3GCQLgVYuYkHMTkboruiYSAaWy3qZjF/hVpRP0="; + }; + + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ pkg-config ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cargo plugin for use with colcon workspaces"; + homepage = "https://github.com/ros2-rust/cargo-ament-build"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ guelakais ]; + }; +}) diff --git a/pkgs/by-name/ca/cargo-audit/package.nix b/pkgs/by-name/ca/cargo-audit/package.nix new file mode 100644 index 000000000000..278182395abf --- /dev/null +++ b/pkgs/by-name/ca/cargo-audit/package.nix @@ -0,0 +1,51 @@ +{ + lib, + rustPlatform, + fetchCrate, + pkg-config, + openssl, + zlib, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-audit"; + version = "0.21.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-bRBQpZ0YoKDh959a1a7+qEs2vh+dbP8vYcwbkNZQ5cQ="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-MIwKgQM3LoNV9vcs8FfxTzqXhIhLkYd91dMEgPH++zk="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + zlib + ]; + + buildFeatures = [ "fix" ]; + + # The tests require network access which is not available in sandboxed Nix builds. + doCheck = false; + + meta = with lib; { + description = "Audit Cargo.lock files for crates with security vulnerabilities"; + mainProgram = "cargo-audit"; + homepage = "https://rustsec.org"; + changelog = "https://github.com/rustsec/rustsec/blob/cargo-audit/v${version}/cargo-audit/CHANGELOG.md"; + license = with licenses; [ + mit # or + asl20 + ]; + maintainers = with maintainers; [ + basvandijk + figsoda + jk + ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-bazel/package.nix b/pkgs/by-name/ca/cargo-bazel/package.nix new file mode 100644 index 000000000000..a92331c607d5 --- /dev/null +++ b/pkgs/by-name/ca/cargo-bazel/package.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchCrate, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-bazel"; + version = "0.8.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-E/yF42Vx9tv8Ik1j23El3+fI19ZGzq6nikVMATY7m3E="; + + # `test_data` is explicitly excluded from the package published to crates.io, so tests cannot be run + doCheck = false; + + meta = with lib; { + description = "Part of the `crate_universe` collection of tools which use Cargo to generate build targets for Bazel"; + mainProgram = "cargo-bazel"; + homepage = "https://github.com/bazelbuild/rules_rust"; + license = licenses.asl20; + maintainers = with maintainers; [ rickvanprim ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index e82557f33b24..df57efde5343 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -6,37 +6,31 @@ bzip2, xz, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.12.2"; + version = "1.12.5"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-mGb6ZHi6XGYiVe0NHcBx7MWtcSDK2/wXpM4j0GiczEk="; + hash = "sha256-ZG0LMVgfQygaJlxCCanS5Nk81XjDt++L83BYL6cXdos="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rtDV1wAoUfZOTBSvCjqhGlyDVXJiZ+Wopgu21zJWDfw="; + cargoHash = "sha256-wJAzHRPnZGGpiV5+OrBq0RTSAXHNA7IqLMrhr338xXg="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - bzip2 - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + xz + zstd + ]; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix index 3a4c056117ba..fd690616a5bf 100644 --- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix +++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - darwin, rustPlatform, pkg-config, openssl, @@ -43,12 +42,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; useFetchCargoVendor = true; cargoHash = "sha256-SigRm2ZC7jH1iCEGRpka1G/e9kBEieFVU0YDBl2LfTM="; diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix index f31448bc7a1a..547eb68f1078 100644 --- a/pkgs/by-name/ca/cargo-bolero/package.nix +++ b/pkgs/by-name/ca/cargo-bolero/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bolero"; - version = "0.13.1"; + version = "0.13.3"; src = fetchCrate { inherit pname version; - hash = "sha256-73TjQYkSng93tryaZpBtwq3MdVYZC8enEibx6yTdEKw="; + hash = "sha256-xU7a5xEFSrFsQ1K5DIYgACuf+34QeCvGmWvlSSwI03I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0T7KyTQ5kJ4mv5lLxYeo7hxLjSkrmjfenrNV+7GL1hM="; + cargoHash = "sha256-FMpM42D3h42NfDzH+EVs6NB2RVehFNFAYTMvzRQVt/s="; buildInputs = [ libbfd diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix index af31e5f60aab..d1985e7a460f 100644 --- a/pkgs/by-name/ca/cargo-bump/package.nix +++ b/pkgs/by-name/ca/cargo-bump/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Increments the version number of the current project"; mainProgram = "cargo-bump"; diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix index 13c8f86603a9..3001f1ae4020 100644 --- a/pkgs/by-name/ca/cargo-bundle/package.nix +++ b/pkgs/by-name/ca/cargo-bundle/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pkg-config, stdenv, - darwin, libxkbcommon, wayland, }: @@ -28,14 +27,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libxkbcommon - wayland - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libxkbcommon + wayland + ]; meta = with lib; { description = "Wrap rust executables in OS-specific app bundles"; diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix new file mode 100644 index 000000000000..7cd88d36d85a --- /dev/null +++ b/pkgs/by-name/ca/cargo-c/package.nix @@ -0,0 +1,69 @@ +{ + lib, + rustPlatform, + fetchCrate, + pkg-config, + curl, + openssl, + stdenv, + libiconv, + rav1e, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-c"; + version = "0.10.2"; + + src = fetchCrate { + inherit pname; + # this version may need to be updated along with package version + version = "${version}+cargo-0.80.0"; + hash = "sha256-ltxd4n3oo8ZF/G/zmR4FSVtNOkxwCjDv6PdxkmWxZ+8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-tCJ7Giyj7Wqowhk0N7CkvAiWvF6DBNw7G7aAnn2+mp8="; + + nativeBuildInputs = [ + pkg-config + (lib.getDev curl) + ]; + buildInputs = + [ + openssl + curl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + # Ensure that we are avoiding build of the curl vendored in curl-sys + doInstallCheck = stdenv.hostPlatform.libc == "glibc"; + installCheckPhase = '' + runHook preInstallCheck + + ldd "$out/bin/cargo-cbuild" | grep libcurl.so + + runHook postInstallCheck + ''; + + passthru.tests = { + inherit rav1e; + }; + + meta = with lib; { + description = "Cargo subcommand to build and install C-ABI compatible dynamic and static libraries"; + longDescription = '' + Cargo C-ABI helpers. A cargo applet that produces and installs a correct + pkg-config file, a static library and a dynamic library, and a C header + to be used by any C (and C-compatible) software. + ''; + homepage = "https://github.com/lu-zero/cargo-c"; + changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ + cpu + matthiasbeyer + ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-careful/package.nix b/pkgs/by-name/ca/cargo-careful/package.nix index 849ec6df3eb3..8d168b4f9961 100644 --- a/pkgs/by-name/ca/cargo-careful/package.nix +++ b/pkgs/by-name/ca/cargo-careful/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-careful"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "RalfJung"; repo = "cargo-careful"; rev = "v${version}"; - hash = "sha256-pYfyqsS+bGwSP6YZAtI+8iMXdID/hrCiX+cuYoYiZmc="; + hash = "sha256-dalsBILFZzVHBIhGGIOUMSCWuM7xE46w91MbzCYa1Io="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hb3x2LKtDNAhMbRCB3kAwHloFTojGzQdXsMjxeJYB6k="; + cargoHash = "sha256-Es5BT0jfyJXuw7TTtGRhI4PeplZgTYm6JhSxQiZ+6NE="; meta = with lib; { description = "Tool to execute Rust code carefully, with extra checking along the way"; diff --git a/pkgs/by-name/ca/cargo-clean-recursive/package.nix b/pkgs/by-name/ca/cargo-clean-recursive/package.nix index 355e29db73c0..36599a86030f 100644 --- a/pkgs/by-name/ca/cargo-clean-recursive/package.nix +++ b/pkgs/by-name/ca/cargo-clean-recursive/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-clean-recursive"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "IgaguriMK"; repo = "cargo-clean-recursive"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-H/t9FW7zxS+58lrvay/lmb0xFgpeJQ1dCIm0oSEtflA="; + sha256 = "sha256-9+FqRvd0s9N7mQwIf+f3+vBhaa0YQWUR0j0lv4CBOkM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-PcUKvVm9pKyw4sxJo9m6UJhsVURdlAwp1so199DAQBI="; + cargoHash = "sha256-KIoRsCy/Cei1YM/94kUcgI2Twgi8kEFVNiUM+sCPMyo="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ca/cargo-clone/package.nix b/pkgs/by-name/ca/cargo-clone/package.nix new file mode 100644 index 000000000000..a67332aa956c --- /dev/null +++ b/pkgs/by-name/ca/cargo-clone/package.nix @@ -0,0 +1,49 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + zlib, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-clone"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "janlikar"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kK0J1Vfx1T17CgZ3DV9kQbAUxk4lEfje5p6QvdBS5VQ="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-IbNwlVKGsi70G+ATimRZbHbW91vFddQl//dfAM6JO8I="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + zlib + ]; + + # requires internet access + doCheck = false; + + meta = with lib; { + description = "Cargo subcommand to fetch the source code of a Rust crate"; + mainProgram = "cargo-clone"; + homepage = "https://github.com/janlikar/cargo-clone"; + changelog = "https://github.com/janlikar/cargo-clone/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ + asl20 + mit + ]; + maintainers = with maintainers; [ + figsoda + matthiasbeyer + janlikar + ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix new file mode 100644 index 000000000000..ab6749d0a401 --- /dev/null +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -0,0 +1,60 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + curl, + pkg-config, + libgit2, + openssl, + zlib, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-codspeed"; + version = "2.10.1"; + + src = fetchFromGitHub { + owner = "CodSpeedHQ"; + repo = "codspeed-rust"; + rev = "v${version}"; + hash = "sha256-eKZDoOI9mbJC6lbO6Q8tTMj5RtHqOs9YCvTmn7/I/9w="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-JX6Y7qh3cyGPqBRfFvUM/sNx5aoMappQcnlPTFWTH2w="; + + nativeBuildInputs = [ + curl + pkg-config + ]; + + buildInputs = [ + curl + libgit2 + openssl + zlib + ]; + + cargoBuildFlags = [ "-p=cargo-codspeed" ]; + cargoTestFlags = cargoBuildFlags; + checkFlags = [ + # requires an extra dependency, blit + "--skip=test_package_in_deps_build" + ]; + + env = { + LIBGIT2_NO_VENDOR = 1; + }; + + meta = with lib; { + description = "Cargo extension to build & run your codspeed benchmarks"; + homepage = "https://github.com/CodSpeedHQ/codspeed-rust"; + changelog = "https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/${src.rev}"; + license = with licenses; [ + mit + asl20 + ]; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "cargo-codspeed"; + }; +} diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix index 9d052d9df626..8deaf38fa346 100644 --- a/pkgs/by-name/ca/cargo-component/package.nix +++ b/pkgs/by-name/ca/cargo-component/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; # requires the wasm32-wasi target doCheck = false; diff --git a/pkgs/by-name/ca/cargo-crev/package.nix b/pkgs/by-name/ca/cargo-crev/package.nix new file mode 100644 index 000000000000..11b1a97c8724 --- /dev/null +++ b/pkgs/by-name/ca/cargo-crev/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + perl, + pkg-config, + curl, + libiconv, + openssl, + gitMinimal, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-crev"; + version = "0.26.4"; + + src = fetchFromGitHub { + owner = "crev-dev"; + repo = "cargo-crev"; + rev = "v${version}"; + sha256 = "sha256-tuOFanGmIRQs0whXINplfHNyKBhJ1QGF+bBVxqGX/yU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-CmDTNE0nn2BxB//3vE1ao+xnzA1JBhIQdqcQNWuIKHU="; + + preCheck = '' + export HOME=$(mktemp -d) + git config --global user.name "Nixpkgs Test" + git config --global user.email "nobody@example.com" + ''; + + nativeBuildInputs = [ + perl + pkg-config + ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + curl + ]; + + nativeCheckInputs = [ gitMinimal ]; + + meta = with lib; { + description = "Cryptographically verifiable code review system for the cargo (Rust) package manager"; + mainProgram = "cargo-crev"; + homepage = "https://github.com/crev-dev/cargo-crev"; + license = with licenses; [ + asl20 + mit + mpl20 + ]; + maintainers = with maintainers; [ + b4dm4n + matthiasbeyer + ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-cyclonedx/package.nix b/pkgs/by-name/ca/cargo-cyclonedx/package.nix new file mode 100644 index 000000000000..193a967a79f7 --- /dev/null +++ b/pkgs/by-name/ca/cargo-cyclonedx/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + curl, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-cyclonedx"; + version = "0.5.7"; + + src = fetchFromGitHub { + owner = "CycloneDX"; + repo = "cyclonedx-rust-cargo"; + rev = "${pname}-${version}"; + hash = "sha256-T/9eHI2P8eCZAqMTeZz1yEi5nljQWfHrdNiU3h3h74U="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-deczbMPeJsnmXbVB60stKhJJZRIIwjY5vExS3x3b6aU="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + ]; + + meta = with lib; { + description = "Creates CycloneDX Software Bill of Materials (SBOM) from Rust (Cargo) projects"; + mainProgram = "cargo-cyclonedx"; + longDescription = '' + The CycloneDX module for Rust (Cargo) creates a valid CycloneDX Software + Bill-of-Material (SBOM) containing an aggregate of all project + dependencies. CycloneDX is a lightweight SBOM specification that is + easily created, human and machine readable, and simple to parse. + ''; + homepage = "https://github.com/CycloneDX/cyclonedx-rust-cargo"; + license = licenses.asl20; + maintainers = with maintainers; [ nikstur ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix index f54a2c67e987..14dbd2f002e5 100644 --- a/pkgs/by-name/ca/cargo-deb/package.nix +++ b/pkgs/by-name/ca/cargo-deb/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.11.4"; + version = "2.12.1"; src = fetchFromGitHub { owner = "kornelski"; repo = "cargo-deb"; rev = "v${version}"; - hash = "sha256-E0PU0j0n1ITP65D+p1upn3cBFBKkoCbyHe6S5XxDAyU="; + hash = "sha256-Ov3rVfURzzZ6+YFq4Cqtoq5RQVHHjqvgkOcpsvAy1jc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uPLXUx+nbUqXJM83RHxuXWiVWEWp5c+v5A0dOESL9oA="; + cargoHash = "sha256-11l/9l1WD7vLHNOKFVOxcR4OI2ft1IrT5bRX77XS+BI="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix index 44ac63b9ae51..6e8cf25fc729 100644 --- a/pkgs/by-name/ca/cargo-deny/package.nix +++ b/pkgs/by-name/ca/cargo-deny/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; @@ -43,7 +36,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with lib; { - description = "Cargo plugin to generate list of all licenses for a crate"; + description = "Cargo plugin for linting your dependencies"; mainProgram = "cargo-deny"; homepage = "https://github.com/EmbarkStudios/cargo-deny"; changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md"; diff --git a/pkgs/by-name/ca/cargo-dephell/package.nix b/pkgs/by-name/ca/cargo-dephell/package.nix index d0fbd26e846e..2d20d48146b7 100644 --- a/pkgs/by-name/ca/cargo-dephell/package.nix +++ b/pkgs/by-name/ca/cargo-dephell/package.nix @@ -6,7 +6,6 @@ stdenv, curl, openssl, - darwin, libgit2, }: @@ -39,7 +38,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.Security libgit2 ]; diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix index d97e19fb6a5e..072522b8d476 100644 --- a/pkgs/by-name/ca/cargo-dist/package.nix +++ b/pkgs/by-name/ca/cargo-dist/package.nix @@ -7,8 +7,6 @@ bzip2, xz, zstd, - stdenv, - darwin, git, rustup, }: @@ -31,15 +29,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + xz + zstd + ]; nativeCheckInputs = [ git diff --git a/pkgs/by-name/ca/cargo-duplicates/package.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix index 8ab9656c8c22..e2fb19230887 100644 --- a/pkgs/by-name/ca/cargo-duplicates/package.nix +++ b/pkgs/by-name/ca/cargo-duplicates/package.nix @@ -7,8 +7,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,16 +28,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + curl + libgit2 + openssl + zlib + ]; meta = with lib; { description = "Cargo subcommand for displaying when different versions of a same dependency are pulled in"; diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix new file mode 100644 index 000000000000..93b405e1c825 --- /dev/null +++ b/pkgs/by-name/ca/cargo-edit/package.nix @@ -0,0 +1,50 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + zlib, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-edit"; + version = "0.13.4"; + + src = fetchFromGitHub { + owner = "killercup"; + repo = pname; + rev = "v${version}"; + hash = "sha256-gs7+OuW0av7p45+wgXVVS17YKTwIqDFQWc3kKE7y/Yw="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-JafagbF+JCp3ATtGjlExLDUehYqO9DhI39uD4fLafsQ="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + zlib + ]; + + doCheck = false; # integration tests depend on changing cargo config + + meta = with lib; { + description = "Utility for managing cargo dependencies from the command line"; + homepage = "https://github.com/killercup/cargo-edit"; + changelog = "https://github.com/killercup/cargo-edit/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ + Br1ght0ne + figsoda + gerschtli + jb55 + killercup + matthiasbeyer + ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-embassy/package.nix b/pkgs/by-name/ca/cargo-embassy/package.nix new file mode 100644 index 000000000000..2ca2d86be880 --- /dev/null +++ b/pkgs/by-name/ca/cargo-embassy/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + udev, +}: +rustPlatform.buildRustPackage { + pname = "cargo-embassy"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "adinack"; + repo = "cargo-embassy"; + # 0.3.4 with cargo.lock. Switch back + # to tag = when next version released + rev = "989a406387ebda89acd943c57e207d78eba600c1"; + hash = "sha256-C8eFQFHYIj2P+zPOKLVBNX97UDVbbcdjbqh5n53ktCU="; + }; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + udev + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + cargoHash = "sha256-iLGoc6CKZGlq9bw1sL0jCVm9lGa0i/BXiseU1USGjfQ="; + useFetchCargoVendor = true; + + meta = { + description = "Command line tool for creating Embassy projects"; + homepage = "https://github.com/adinack/cargo-embassy"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.samw ]; + platforms = lib.platforms.unix; + mainProgram = "cargo-embassy"; + }; +} diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index bdf13f371b85..33a053d1e725 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.104"; + version = "1.0.106"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cargo-expand"; rev = version; - hash = "sha256-PSiuTw3H3vl4Tnts5eOTd1v8SLPvYZCkuQ/pTSa3O18="; + hash = "sha256-7j8i0wvbbAFPNgHamy+lybQpz1ht+n90oidVGSXP6MA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-apFOBEao2DKsdjdth+vGzzRa9Mw7fTb/88TetY0vp6E="; + cargoHash = "sha256-e6K97VUsCYx56Y9r7QPVBV3eMwWnjEhZoEKpmuKmkJk="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; diff --git a/pkgs/by-name/ca/cargo-flamegraph/package.nix b/pkgs/by-name/ca/cargo-flamegraph/package.nix new file mode 100644 index 000000000000..63c8b27b195e --- /dev/null +++ b/pkgs/by-name/ca/cargo-flamegraph/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + makeWrapper, + perf, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-flamegraph"; + version = "0.6.8"; + + src = fetchFromGitHub { + owner = "flamegraph-rs"; + repo = "flamegraph"; + rev = "v${version}"; + sha256 = "sha256-JGUABNCZhDyTTrjFCRsT+wkuAeZn9mCHCI6XgGYEl7Y="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-FjLjEoorbZC2WZ424w2aFLmd4dIfy5s13sR8BSRVNIo="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]; + + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + wrapProgram $out/bin/cargo-flamegraph \ + --set-default PERF ${perf}/bin/perf + wrapProgram $out/bin/flamegraph \ + --set-default PERF ${perf}/bin/perf + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Easy flamegraphs for Rust projects and everything else, without Perl or pipes <3"; + homepage = "https://github.com/flamegraph-rs/flamegraph"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ + killercup + matthiasbeyer + ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-fund/package.nix b/pkgs/by-name/ca/cargo-fund/package.nix new file mode 100644 index 000000000000..f76b85b33093 --- /dev/null +++ b/pkgs/by-name/ca/cargo-fund/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + rustPlatform, + curl, + openssl, + libiconv, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-fund"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "acfoltzer"; + repo = pname; + rev = version; + hash = "sha256-8mnCwWwReNH9s/gbxIhe7XdJRIA6BSUKm5jzykU5qMU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-9NozPJzQIuF2KHaT6t4qBU0qKtBbM05mHxzmHlU3Dr4="; + + # The tests need a GitHub API token. + doCheck = false; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + curl + ]; + + meta = with lib; { + description = "Discover funding links for your project's dependencies"; + mainProgram = "cargo-fund"; + homepage = "https://github.com/acfoltzer/cargo-fund"; + license = with licenses; [ + mit # or + asl20 + ]; + maintainers = with maintainers; [ johntitor ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch b/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch deleted file mode 100644 index 97a9090e904d..000000000000 --- a/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cargo-geiger/src/lib.rs b/cargo-geiger/src/lib.rs -index cc08146..d220ad9 100644 ---- a/cargo-geiger/src/lib.rs -+++ b/cargo-geiger/src/lib.rs -@@ -5,7 +5,6 @@ - #![deny(clippy::cargo)] - #![deny(clippy::doc_markdown)] - #![forbid(unsafe_code)] --#![deny(warnings)] - - /// Argument parsing - pub mod args; diff --git a/pkgs/by-name/ca/cargo-geiger/fix-build-with-rust-1.80.patch b/pkgs/by-name/ca/cargo-geiger/fix-build-with-rust-1.80.patch deleted file mode 100644 index 37d9c2ebad38..000000000000 --- a/pkgs/by-name/ca/cargo-geiger/fix-build-with-rust-1.80.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 48c5606f..4c796675 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2238,6 +2238,12 @@ dependencies = [ - "winapi", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-traits" - version = "0.2.17" -@@ -3148,13 +3154,14 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.30" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", - "powerfmt", - "serde", -@@ -3170,10 +3177,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.15" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index edfa3438a50d..c32c8cd452b6 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -6,87 +6,82 @@ pkg-config, openssl, # darwin dependencies - darwin, libiconv, curl, + # testing + testers, + cargo-geiger, }: rustPlatform.buildRustPackage rec { pname = "cargo-geiger"; - version = "0.11.7"; + version = "0.12.0"; src = fetchFromGitHub { - owner = "rust-secure-code"; + owner = "geiger-rs"; repo = "cargo-geiger"; - rev = "cargo-geiger@v${version}"; - hash = "sha256-/5yuayqneZV6aVQ6YFgqNS2XY3W6yETRQ0kE5ovc7p8="; + tag = "cargo-geiger-${version}"; + hash = "sha256-OW/LOZUCGOIl7jeWnzt4SXTo3gplJx/wbC21S1TdZx0="; }; - cargoPatches = [ - # https://github.com/geiger-rs/cargo-geiger/pull/528 - ./fix-build-with-rust-1.80.patch - ]; - useFetchCargoVendor = true; - cargoHash = "sha256-n6RfulzrK9QebC1tgVVd/YnBc21Jf0OSfHApRO1c0ew="; - - patches = [ - ./allow-warnings.patch - ]; + cargoHash = "sha256-aDgpEfX0QRkQD6c4ant6uSN18WLHVnZISRr7lyu9IzA="; buildInputs = [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - libiconv - curl - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + curl + ]; nativeBuildInputs = [ pkg-config ] # curl-sys wants to run curl-config on darwin ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl.dev ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + # skip tests with networking or other failures checkFlags = [ - "--skip serialize_test1_quick_report" + # panics "--skip serialize_test2_quick_report" "--skip serialize_test3_quick_report" - "--skip serialize_test4_quick_report" "--skip serialize_test6_quick_report" - "--skip serialize_test7_quick_report" - "--skip serialize_test1_report" "--skip serialize_test2_report" "--skip serialize_test3_report" - "--skip serialize_test4_report" "--skip serialize_test6_report" - "--skip serialize_test7_report" - # multiple test cases that time-out or cause memory leaks - "--skip test_package" + # requires networking + "--skip test_package::case_2" + "--skip test_package::case_3" + "--skip test_package::case_6" + "--skip test_package::case_9" + # panics, snapshot assertions fails "--skip test_package_update_readme::case_2" "--skip test_package_update_readme::case_3" "--skip test_package_update_readme::case_5" ]; - meta = with lib; { - homepage = "https://github.com/rust-secure-code/cargo-geiger"; - changelog = "https://github.com/rust-secure-code/cargo-geiger/blob/cargo-geiger-${version}/CHANGELOG.md"; + passthru.tests.version = testers.testVersion { + package = cargo-geiger; + }; + + meta = { description = "Detects usage of unsafe Rust in a Rust crate and its dependencies"; - mainProgram = "cargo-geiger"; longDescription = '' A cargo plugin that detects the usage of unsafe Rust in a Rust crate and its dependencies. It provides information to aid auditing and guide dependency selection but it can not help you decide when and why unsafe code is appropriate. ''; - license = with licenses; [ + homepage = "https://github.com/geiger-rs/cargo-geiger"; + changelog = "https://github.com/geiger-rs/cargo-geiger/blob/cargo-geiger-${version}/CHANGELOG.md"; + mainProgram = "cargo-geiger"; + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ evanjs gepbird jk diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix index 3c4d01d28f37..668174e7aede 100644 --- a/pkgs/by-name/ca/cargo-generate/package.nix +++ b/pkgs/by-name/ca/cargo-generate/package.nix @@ -7,7 +7,6 @@ libgit2, openssl, stdenv, - darwin, gitMinimal, }: @@ -36,14 +35,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + ]; nativeCheckInputs = [ gitMinimal ]; diff --git a/pkgs/by-name/ca/cargo-guppy/package.nix b/pkgs/by-name/ca/cargo-guppy/package.nix index e4d839f57aa4..f7ee8b1fc56e 100644 --- a/pkgs/by-name/ca/cargo-guppy/package.nix +++ b/pkgs/by-name/ca/cargo-guppy/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -24,11 +22,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ openssl ]; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix index 17084a1ef913..0dc2048eccb9 100644 --- a/pkgs/by-name/ca/cargo-hakari/package.nix +++ b/pkgs/by-name/ca/cargo-hakari/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-hf2/package.nix b/pkgs/by-name/ca/cargo-hf2/package.nix new file mode 100644 index 000000000000..6f7960a834ae --- /dev/null +++ b/pkgs/by-name/ca/cargo-hf2/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchCrate, + pkg-config, + libusb1, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-hf2"; + version = "0.3.3"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-cRliZegzRKmoGIE96pyVuNySA2L6l+imcTHbZBXXiz4="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders"; + mainProgram = "cargo-hf2"; + homepage = "https://lib.rs/crates/cargo-hf2"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ astrobeastie ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-info/package.nix b/pkgs/by-name/ca/cargo-info/package.nix index a9f2a69a3a1d..4225e0690651 100644 --- a/pkgs/by-name/ca/cargo-info/package.nix +++ b/pkgs/by-name/ca/cargo-info/package.nix @@ -4,8 +4,6 @@ fetchFromGitLab, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Cargo subcommand to show crates info from crates.io"; diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix index 927bce7f59d0..ff0b0a820001 100644 --- a/pkgs/by-name/ca/cargo-lambda/package.nix +++ b/pkgs/by-name/ca/cargo-lambda/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-lambda"; - version = "1.8.1"; + version = "1.8.5"; src = fetchFromGitHub { owner = "cargo-lambda"; repo = "cargo-lambda"; tag = "v${version}"; - hash = "sha256-1i/nBuO7B6GHWmaibO8+w9LNCWGV5HdCP2B3WQPT/7c="; + hash = "sha256-iYfm7/XbLThtEo+zSW8sn7T6XEhzyiVKy6/cisshc+Y="; }; useFetchCargoVendor = true; - cargoHash = "sha256-i11bDmzCvsv4jTBsjCdryM8rx6FBefUXh4mbiGhyLt4="; + cargoHash = "sha256-mCD3Szbl5BXknTWJhm2xlcIV0aKczsEi8yRDA4erTYc="; nativeCheckInputs = [ cacert ]; diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index 51dde7bc7058..21527f9b2e59 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -1,19 +1,8 @@ { - darwin, fetchFromGitHub, lib, rustPlatform, - stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) - CoreServices - SystemConfiguration - Security - ; - inherit (lib) optionals; - inherit (stdenv.hostPlatform) isDarwin; -in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; version = "0.2.28"; @@ -28,12 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Da9ei4yAOfhSQmQgrUDZCmMeJXTfGnYhI1+L0JT/ECs="; - buildInputs = optionals isDarwin [ - SystemConfiguration - Security - CoreServices - ]; - # https://github.com/leptos-rs/cargo-leptos#dependencies buildFeatures = [ "no_downloads" ]; # cargo-leptos will try to install missing dependencies on its own otherwise doCheck = false; # Check phase tries to query crates.io diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix index 33851806f7ea..f4b30c6b4250 100644 --- a/pkgs/by-name/ca/cargo-local-registry/package.nix +++ b/pkgs/by-name/ca/cargo-local-registry/package.nix @@ -7,8 +7,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,19 +28,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; + buildInputs = [ + curl + libgit2 + openssl + zlib + ]; # tests require internet access doCheck = false; diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index 5581bad62b2a..71ef2c04fe79 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -6,8 +6,6 @@ installShellFiles, bzip2, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,14 +27,10 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - bzip2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + ]; postInstall = '' installShellCompletion extra/shell/*.bash diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix index c03a5b7045d3..c14cb9982ec1 100644 --- a/pkgs/by-name/ca/cargo-mobile2/package.nix +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -1,19 +1,16 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, git, - darwin, makeWrapper, }: let - inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.17.5"; + version = "0.20.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-eaKj2S1qiG6qQd7yG4RrK/a+1IsgBybodSTfERDvGE4="; + hash = "sha256-7/ol4Jb/2s007LeSMo6YYDT5vipsZZF6O4hfJ7ylHGg="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at @@ -29,7 +26,7 @@ rustPlatform.buildRustPackage { # sourceRoot = "${src.name}/tooling/cli"; useFetchCargoVendor = true; - cargoHash = "sha256-IW/2Xp52TlqYtvXZqSDv9/Uv9B/thM360ecbbWLXPNE="; + cargoHash = "sha256-zSUT2zClpSlBDu6vgMv4TZn9Jp0Ych6EQKo1AwkSMXU="; preBuild = '' mkdir -p $out/share/ @@ -37,7 +34,7 @@ rustPlatform.buildRustPackage { export CARGO_HOME=$out/share/ ''; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config git diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix index 26a763edeb15..1e44adb6cc0e 100644 --- a/pkgs/by-name/ca/cargo-modules/package.nix +++ b/pkgs/by-name/ca/cargo-modules/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.22.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "regexident"; repo = "cargo-modules"; tag = "v${version}"; - hash = "sha256-TlnuEurPCcQb3CXr1ffmDv3WQxSZ27qG9erLyHgF7nk="; + hash = "sha256-MJswCl5eJjKarB2ufeNLQL0ZPDaRPpX6OGOqszG+a0g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-42nhyEAC9KKD3of0BBTYoVpFYx/+oXS7Ro1Hzxgvr+E="; + cargoHash = "sha256-N1Bj0fqyirp51DNsrZEtRGOSUPS1YNbk+O3kdboQ+TQ="; checkFlags = [ "--skip=cfg_test::with_tests::smoke" @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Cargo plugin for showing a tree-like overview of a crate's modules"; diff --git a/pkgs/by-name/ca/cargo-msrv/package.nix b/pkgs/by-name/ca/cargo-msrv/package.nix index a8c8dd80bb53..72528f1ab810 100644 --- a/pkgs/by-name/ca/cargo-msrv/package.nix +++ b/pkgs/by-name/ca/cargo-msrv/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.17.1"; + version = "0.18.4"; src = fetchFromGitHub { owner = "foresterre"; repo = "cargo-msrv"; tag = "v${version}"; - sha256 = "sha256-cRdnx9K+EkVEKtPxQk+gXK6nkgkpWhpYij/5e7pFzMU="; + sha256 = "sha256-dvCKi40c9PmM05MK+0VGWxny0ZA+9YO/M3zmv5Qv6b0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-D35koQEqHsmXIBgXRCyI8Wyo2OVSuTFCjgm/JjO4VDo="; + cargoHash = "sha256-cIyoGFIxtX4/Dn4RbtMB75WQj+UO44V182u6C5smgSw="; passthru = { updateScript = gitUpdater { diff --git a/pkgs/by-name/ca/cargo-ndk/package.nix b/pkgs/by-name/ca/cargo-ndk/package.nix new file mode 100644 index 000000000000..cbd1db25b326 --- /dev/null +++ b/pkgs/by-name/ca/cargo-ndk/package.nix @@ -0,0 +1,31 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-ndk"; + version = "3.5.7"; + + src = fetchFromGitHub { + owner = "bbqsrc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-tzjiq1jjluWqTl+8MhzFs47VRp3jIRJ7EOLhUP8ydbM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Kt4GLvbGK42RjivLpL5W5z5YBfDP5B83mCulWz6Bisw="; + + meta = with lib; { + description = "Cargo extension for building Android NDK projects"; + mainProgram = "cargo-ndk"; + homepage = "https://github.com/bbqsrc/cargo-ndk"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index 2cd4adad6ebf..e9576697c014 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.93"; + version = "0.9.95"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-MH3OPEap56GYT/84wlmDp7B/v45TgyW6KQLTJXHy5wI="; + hash = "sha256-OtCFehXzcdE8kBUkDg8y5ygTOtH2eP5aMzTpugDSg/E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7Re6TcHYhwFp4cj/KzJXpL0taH6X/S63lgAW5rtSrZk="; + cargoHash = "sha256-nrRq5ET++jplx5argN04Ax+HTE6VqvBhnSsS/ZFNYr8="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix index c9d50be042e8..204189edcb52 100644 --- a/pkgs/by-name/ca/cargo-public-api/package.nix +++ b/pkgs/by-name/ca/cargo-public-api/package.nix @@ -5,8 +5,6 @@ pkg-config, curl, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; # Tests fail doCheck = false; diff --git a/pkgs/by-name/ca/cargo-raze/package.nix b/pkgs/by-name/ca/cargo-raze/package.nix index b3e40543ed3f..380e4a737475 100644 --- a/pkgs/by-name/ca/cargo-raze/package.nix +++ b/pkgs/by-name/ca/cargo-raze/package.nix @@ -7,7 +7,6 @@ curl, libgit2, openssl, - darwin, }: let version = "0.16.1"; @@ -37,7 +36,7 @@ rustPlatform.buildRustPackage { libgit2 openssl curl - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin issue: Os { code: 24, kind: Uncategorized, message: "Too many open files" } diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix index c57bc18292b3..5594a8602be1 100644 --- a/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/pkgs/by-name/ca/cargo-rdme/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -15,10 +13,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lVu9w8l3+SeqiMoQ8Bjoslf7tWz49jrrE4g/pDU1axI="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-W800jepxDv6OjbcxRKphAnDU2OuBGGGSLELe8gAfTr8="; diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index 7f8baef63270..8d755e78ef27 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -7,23 +7,22 @@ openssl, stdenv, curl, - darwin, git, }: rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.25.17"; + version = "0.25.18"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; tag = "v${version}"; - hash = "sha256-SFuEcku6NZlOqLVYrlCJB+ofa8WaL9HJzJcZ42uJ434="; + hash = "sha256-1CHUkXjb8+wOFQWo/04KcLaJcv/dLiDYwPrSnzWucXI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-663u8pUnMlUE/6+1WitbLJlJjtLKohns4FM5Iup/WzU="; + cargoHash = "sha256-ESaESon1oJAlvsv6+TIb/lLsOQmjgheQWm82Lr0mJOE="; nativeBuildInputs = [ pkg-config @@ -36,7 +35,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/ca/cargo-seek/package.nix b/pkgs/by-name/ca/cargo-seek/package.nix new file mode 100644 index 000000000000..6c4fa885f51d --- /dev/null +++ b/pkgs/by-name/ca/cargo-seek/package.nix @@ -0,0 +1,51 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + openssl, + pkg-config, + rustPlatform, + writableTmpDirAsHomeHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cargo-seek"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "tareqimbasher"; + repo = "cargo-seek"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SDVAi4h+/ebGX+8M66Oyd0LfQn+J7/QhDW97ZBdoN14="; + }; + + cargoHash = "sha256-DyXRbtvCJte7mCQKusipeikr981vMHPEVYcGSwVI5Kg="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ writableTmpDirAsHomeHook ]; + # We cannot use `versionCheckHook` here since access to the $HOME directory is required. + installCheckPhase = '' + runHook preInstallCheck + $out/bin/cargo-seek --version | grep "${finalAttrs.version}" + runHook postInstallCheck + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal user interface for searching, adding and installing cargo crates"; + homepage = "https://github.com/tareqimbasher/cargo-seek"; + changelog = "https://github.com/tareqimbasher/cargo-seek/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qwqawawow ]; + mainProgram = "cargo-seek"; + }; +}) diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix index 629d422ec522..58b0f9441552 100644 --- a/pkgs/by-name/ca/cargo-semver-checks/package.nix +++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, cmake, zlib, - stdenv, - darwin, testers, cargo-semver-checks, nix-update-script, @@ -13,29 +11,25 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = "cargo-semver-checks"; tag = "v${version}"; - hash = "sha256-bit8/o5MqlIL4vvCS9fGR2rNtD/Dn58aFqsmyhKueUI="; + hash = "sha256-84tRzqJqvm+ermtWMCkOIUmNeH/RLf8IUTIsEVPbGQk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/8Juz8F5vJ/JLDYZUG9tyxkLSN7YPh5yAKJflpuSZ0w="; + cargoHash = "sha256-8VtSQZHR8L6nijcN71ey9nW5nrAsPK6qyqJSWQDz8uw="; nativeBuildInputs = [ cmake ]; - buildInputs = - [ - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + zlib + ]; checkFlags = [ # requires internet access diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index bb3837d4514d..96815b728efd 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.1.11"; + version = "1.2.7"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-2M0C4BCDWxcLz3X1exBjGqv5Ep/XKkGEuR5fBvusShU="; + hash = "sha256-IOTlDLHSFH93tgCaF8ZOboIRkGImcT+oDfbmKKjNDlM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ADbB5KvT0TlHAffFZiJpJDmEzwogfQi1SuA9UKL2H/U="; + cargoHash = "sha256-6Pu7qFOT9fPjtgjNqZ4mF37xNLuCIl1U3a23vGpRs4k="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix index 09751176fb2e..9294970a3ae8 100644 --- a/pkgs/by-name/ca/cargo-show-asm/package.nix +++ b/pkgs/by-name/ca/cargo-show-asm/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.48"; + version = "0.2.49"; src = fetchCrate { inherit pname version; - hash = "sha256-y8qGadmp+6exKAJvNIyBQLZnIe0DYRkiWMyIAMXMr0s="; + hash = "sha256-DH3jE7nGdwIQVHk80EsC4gYh5+wk6VMWS0d+jZYnX1I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6AE/Ym6Uc2kXafWW3Z/qr8O3tLcbO1wkoYdGjDw5/Do="; + cargoHash = "sha256-R+I6EVzHvI1Et4nvxENc3IvfmSLr/g77x4wCMNb2R88="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix index 157a1f175e8c..cccfa424425e 100644 --- a/pkgs/by-name/ca/cargo-shuttle/package.nix +++ b/pkgs/by-name/ca/cargo-shuttle/package.nix @@ -5,35 +5,28 @@ pkg-config, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-RXt9qcLepJJA+MMFm26UMLuwgh8V13DoBueY1Z+W63w="; + hash = "sha256-37HQDiIgwxbMcFo7kM/SZ7dJzZc5CzL03xQNiMkG8l8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-zaI/W92XyuAXs+wF1KOBEiCRqHiTTMGPiq2wrAbCDH4="; + cargoHash = "sha256-CYpAsNzQyIPigZSY/PwzGhYHU0316odwkwvxdcVisYk="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + zlib + ]; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-sonar/package.nix b/pkgs/by-name/ca/cargo-sonar/package.nix new file mode 100644 index 000000000000..7cf2c74ec0bd --- /dev/null +++ b/pkgs/by-name/ca/cargo-sonar/package.nix @@ -0,0 +1,34 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cargo-sonar"; + version = "1.3.0"; + + src = fetchFromGitLab { + owner = "woshilapin"; + repo = "cargo-sonar"; + tag = finalAttrs.version; + hash = "sha256-f319hi6mrnlHTvsn7kN2wFHyamXtplLZ8A6TN0+H3jY="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-KLw6kAR2pF5RFhRDfsL093K+jk3oiSHLZ2CQvrBuhWY="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Utility to produce some Sonar-compatible format from different Rust tools like cargo-clippy cargo-audit or cargo-outdated"; + mainProgram = "cargo-sonar"; + homepage = "https://gitlab.com/woshilapin/cargo-sonar"; + license = [ lib.licenses.mit ]; + maintainers = [ lib.maintainers.jonboh ]; + }; +}) diff --git a/pkgs/by-name/ca/cargo-supply-chain/package.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix index 95431b78947f..36b9aca3122c 100644 --- a/pkgs/by-name/ca/cargo-supply-chain/package.nix +++ b/pkgs/by-name/ca/cargo-supply-chain/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-fsW3qTyFMcj/OTouOah1ZFskw075V8jBwhs02AxY7kU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Gather author, contributor and publisher data on crates in your dependency graph"; mainProgram = "cargo-supply-chain"; diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix index a2ebd230797f..10af9e673561 100644 --- a/pkgs/by-name/ca/cargo-swift/package.nix +++ b/pkgs/by-name/ca/cargo-swift/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-swift"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "antoniusnaumann"; repo = "cargo-swift"; rev = "v${version}"; - hash = "sha256-T8cIZJwnA3bFMIEezMrh5LRXV1SRCAVLanQm7rmc0sU="; + hash = "sha256-D6s25pOMdVZXBtBce/KEvqwn/9owrmxDOev3E59qrQ8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Zl5y2pHQIcLU5EDtmxsAv+/0n4DZ/qXwN4Prmm8Nd34="; + cargoHash = "sha256-pypBvfVW7m9dAvrc9ftrBOJ/wC+xLUuhGr7g7DVdZDI="; meta = with lib; { description = "Cargo plugin to easily build Swift packages from Rust code"; diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index 5350c7e15550..5f54ba0c9d87 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -2,30 +2,19 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.61"; + version = "1.0.63"; src = fetchCrate { inherit pname version; - hash = "sha256-54Hu7n5KD41aywL8IqhO0k7aR0N7yi3QNNTX1sqvGvE="; + hash = "sha256-SNTqoxguv+HRdTLBL+cxUGNmprlC6VnpZ8xp6tKr+is="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1Grjj2uaEjr2YKvkd8cxJfUpR8OYqmtuSvIW4tSdIyM="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - DiskArbitration - Foundation - IOKit - ] - ); + cargoHash = "sha256-gpGBXh1qR5cFZXDSYKDYg8d4/A/K88dYSUb9mNrmGno="; meta = with lib; { description = "Graph the number of crates that depend on your crate over time"; diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix new file mode 100644 index 000000000000..3d08cbd550f1 --- /dev/null +++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix @@ -0,0 +1,50 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + curl, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-tarpaulin"; + version = "0.32.5"; + + src = fetchFromGitHub { + owner = "xd009642"; + repo = "tarpaulin"; + rev = version; + hash = "sha256-68WDe0Fp0QJ6WCVJFeMniJTpGSzfxLGLM/a/CZxVxrA="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Uf+l4LqPoG8FKvZD0lYGC2hz7gLZYJf6HAUe0SQiT9s="; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + ]; + + doCheck = false; + + meta = with lib; { + description = "Code coverage tool for Rust projects"; + mainProgram = "cargo-tarpaulin"; + homepage = "https://github.com/xd009642/tarpaulin"; + changelog = "https://github.com/xd009642/tarpaulin/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ + mit # or + asl20 + ]; + maintainers = with maintainers; [ + figsoda + hugoreeves + ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index ea5f2808dc4a..9be1ca1e89ee 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${version}"; - hash = "sha256-tUa3Hb2pDqjcQs8isu1PxI5nx4rUzB/rOep2hDsun1Q="; + hash = "sha256-ut5Etn5yf4X3NvFa5JCRH2sQGnC/xzaRhALoyxdjy2k="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nwrKeCKrzwDOdRwkkuRMR91IbtPRxnSrJFyEW0W+1wA="; + cargoHash = "sha256-1YLpK2frSmdCj5aksuZhnHkAZdwHX/ZuVKXyqVJel/s="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix index d15580c8cd0b..c1efbb8ca254 100644 --- a/pkgs/by-name/ca/cargo-temp/package.nix +++ b/pkgs/by-name/ca/cargo-temp/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${version}"; - hash = "sha256-ejcqgfnvIGUhidhJpAh6uJrm8oFb8rS98wRI3iQBP9I="; + hash = "sha256-71kAlZKSBnROZ8wXe4kQa8nNug5/hk6NKsqHoQU5pWc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lfahdQtv35VH9XTApcu/GIR2QOqXKlb8Gpy6X58LmpA="; + cargoHash = "sha256-rHTEWc3JAnsz5z+NmTb84VSXHSR6nNlb5C+n9VxvnUQ="; meta = with lib; { description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/pkgs/by-name/ca/cargo-udeps/package.nix b/pkgs/by-name/ca/cargo-udeps/package.nix new file mode 100644 index 000000000000..a98e53c83c39 --- /dev/null +++ b/pkgs/by-name/ca/cargo-udeps/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + libiconv, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-udeps"; + version = "0.1.55"; + + src = fetchFromGitHub { + owner = "est31"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-4/JfD2cH46it8PkU58buTHwFXBZI3sytyJCUWl+vSAE="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-4fF5nW8G2XMvC2K2nW7fhZL9DvjW4/cZXSCJurSu9NE="; + + nativeBuildInputs = [ pkg-config ]; + + # TODO figure out how to use provided curl instead of compiling curl from curl-sys + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + # Requires network access + doCheck = false; + + meta = with lib; { + description = "Find unused dependencies in Cargo.toml"; + homepage = "https://github.com/est31/cargo-udeps"; + license = licenses.mit; + maintainers = with maintainers; [ + b4dm4n + matthiasbeyer + ]; + mainProgram = "cargo-udeps"; + }; +} diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix index 65a41aa8ca91..d59ff0f0ac72 100644 --- a/pkgs/by-name/ca/cargo-ui/package.nix +++ b/pkgs/by-name/ca/cargo-ui/package.nix @@ -10,7 +10,6 @@ fontconfig, libGL, xorg, - darwin, }: rustPlatform.buildRustPackage rec { @@ -43,9 +42,6 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr xorg.libxcb - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit ]; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/ca/cargo-unused-features/package.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix index c669ab159ed6..7502501d53df 100644 --- a/pkgs/by-name/ca/cargo-unused-features/package.nix +++ b/pkgs/by-name/ca/cargo-unused-features/package.nix @@ -6,8 +6,6 @@ pkg-config, libgit2, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,16 +25,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + curl + libgit2 + openssl + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index 2dc1c2ca2082..034b7544eed2 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -12,7 +12,6 @@ libssh2, openssl, zlib, - darwin, }: rustPlatform.buildRustPackage rec { @@ -47,7 +46,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.Security ]; postBuild = '' diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix index cadb8bc4cc51..6463f3821661 100644 --- a/pkgs/by-name/ca/cargo-valgrind/package.nix +++ b/pkgs/by-name/ca/cargo-valgrind/package.nix @@ -6,35 +6,36 @@ makeWrapper, valgrind, }: - rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; tag = version; - sha256 = "sha256-yUCDKklkfK+2n+THH4QlHb+FpeWfObXpmp4VozsFiUM="; + sha256 = "sha256-gr/s2dYCFmhwfXT3tqWPFpXQK2QaAhL7Aqnn1A3KjJI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nTqdsi+5YmOzQ5DPn3jOfUXUUut9uo5xKyx/R2MjV1A="; + cargoHash = "sha256-iNsGrbncZwCHXn/xuiI4Mw4F3FFWswEhwpIMI0xcFgU="; passthru = { updateScript = nix-update-script { }; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + valgrind # for tests where the executable is not wrapped yet + ]; postInstall = '' wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]} ''; checkFlags = [ - "--skip examples_are_runnable" "--skip tests_are_runnable" - "--skip issue74" + "--skip default_cargo_project_reports_no_violations" ]; meta = with lib; { diff --git a/pkgs/by-name/ca/cargo-vet/package.nix b/pkgs/by-name/ca/cargo-vet/package.nix new file mode 100644 index 000000000000..25bde7e2bbd2 --- /dev/null +++ b/pkgs/by-name/ca/cargo-vet/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cargo-vet"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "cargo-vet"; + tag = "v${finalAttrs.version}"; + hash = "sha256-HSEhFCcdC79OA8MP73De+iLIjcr1XMHxfJ9a1Q3JJYI="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-+X6DLxWPWMcGzJMVZAj3C5P5MyywIb4ml0Jsyo9/uAE="; + + # the test_project tests require internet access + checkFlags = [ "--skip=test_project" ]; + + meta = { + description = "Tool to help projects ensure that third-party Rust dependencies have been audited by a trusted source"; + mainProgram = "cargo-vet"; + homepage = "https://mozilla.github.io/cargo-vet"; + license = with lib.licenses; [ + asl20 # or + mit + ]; + maintainers = with lib.maintainers; [ + figsoda + jk + matthiasbeyer + ]; + }; +}) diff --git a/pkgs/by-name/ca/cargo-vibe/package.nix b/pkgs/by-name/ca/cargo-vibe/package.nix index 841d7b57ea69..1f0afa5289b0 100644 --- a/pkgs/by-name/ca/cargo-vibe/package.nix +++ b/pkgs/by-name/ca/cargo-vibe/package.nix @@ -7,7 +7,6 @@ dbus, udev, openssl, - darwin, }: rustPlatform.buildRustPackage { pname = "cargo-vibe"; @@ -26,20 +25,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - dbus - openssl - ] - ++ lib.optional stdenv.hostPlatform.isLinux udev - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - IOKit - CoreBluetooth - ] - ); + buildInputs = [ + dbus + openssl + ] ++ lib.optional stdenv.hostPlatform.isLinux udev; meta = with lib; { description = "Cargo x Buttplug.io"; diff --git a/pkgs/by-name/ca/cargo-wasi/package.nix b/pkgs/by-name/ca/cargo-wasi/package.nix index ce9289c1a8cf..52772adaaf6e 100644 --- a/pkgs/by-name/ca/cargo-wasi/package.nix +++ b/pkgs/by-name/ca/cargo-wasi/package.nix @@ -5,7 +5,6 @@ pkg-config, stdenv, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,9 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; # Checks need to be disabled here because the current test suite makes assumptions # about the surrounding environment that aren't Nix friendly. See these lines for specifics: diff --git a/pkgs/by-name/ca/cargo-watch/package.nix b/pkgs/by-name/ca/cargo-watch/package.nix new file mode 100644 index 000000000000..b994a7a853c5 --- /dev/null +++ b/pkgs/by-name/ca/cargo-watch/package.nix @@ -0,0 +1,44 @@ +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-watch"; + version = "8.5.3"; + + src = fetchFromGitHub { + owner = "watchexec"; + repo = pname; + rev = "v${version}"; + hash = "sha256-agwK20MkvnhqSVAWMy3HLkUJbraINn12i6VAg8mTzBk="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-4AVZ747d6lOjxHN+co0A7APVB5Xj6g5p/Al5fLbgPnc="; + + NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + "-framework" + "AppKit" + ]; + + # `test with_cargo` tries to call cargo-watch as a cargo subcommand + # (calling cargo-watch with command `cargo watch`) + preCheck = '' + export PATH="$(pwd)/target/${stdenv.hostPlatform.rust.rustcTarget}/release:$PATH" + ''; + + meta = with lib; { + description = "Cargo subcommand for watching over Cargo project's source"; + mainProgram = "cargo-watch"; + homepage = "https://github.com/watchexec/cargo-watch"; + license = licenses.cc0; + maintainers = with maintainers; [ + xrelkd + ivan + matthiasbeyer + ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-whatfeatures/package.nix b/pkgs/by-name/ca/cargo-whatfeatures/package.nix new file mode 100644 index 000000000000..e46acabfeb9b --- /dev/null +++ b/pkgs/by-name/ca/cargo-whatfeatures/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-whatfeatures"; + version = "0.9.13"; + + src = fetchFromGitHub { + owner = "museun"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YJ08oBTn9OwovnTOuuc1OuVsQp+/TPO3vcY4ybJ26Ms="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-p95aYXsZM9xwP/OHEFwq4vRiXoO1n1M0X3TNbleH+Zw="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + meta = with lib; { + description = "Simple cargo plugin to get a list of features for a specific crate"; + mainProgram = "cargo-whatfeatures"; + homepage = "https://github.com/museun/cargo-whatfeatures"; + license = with licenses; [ + mit + asl20 + ]; + maintainers = with maintainers; [ + ivan-babrou + matthiasbeyer + ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix index 219553af4b60..59befd9ae071 100644 --- a/pkgs/by-name/ca/cargo-workspaces/package.nix +++ b/pkgs/by-name/ca/cargo-workspaces/package.nix @@ -6,8 +6,6 @@ libssh2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,16 +24,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libssh2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libssh2 + openssl + zlib + ]; env = { LIBSSH2_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix index 8ecc440197a6..856ef613ceaa 100644 --- a/pkgs/by-name/ca/cargo-zigbuild/package.nix +++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.19.8"; + version = "0.20.0"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-S/Xx487z8LFjCSrB9tQTJy4+AQial2Dptg5xZqzPkVE="; + hash = "sha256-sUoEKLaUBxKKtCwgw/CcLrVRA4OMhto7d0PR+TMU5xk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-L9SoaXGzYHY6vOWESvovHNzSehOWD4RGAC/3K6qT6Ks="; + cargoHash = "sha256-jvSOYWydnCFgJx1LTzQ1kHEVpzsdPLo19NVMBaLJEeQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ca/cariddi/package.nix b/pkgs/by-name/ca/cariddi/package.nix index 443623316b53..ccfb76d9c86c 100644 --- a/pkgs/by-name/ca/cariddi/package.nix +++ b/pkgs/by-name/ca/cariddi/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cariddi"; - version = "1.3.5"; + version = "1.4.1"; src = fetchFromGitHub { owner = "edoardottt"; repo = "cariddi"; tag = "v${version}"; - hash = "sha256-mRrUTRknax3b4hs3frQMzg0GyB3WjMDZJk0RQSAC88U="; + hash = "sha256-hhzzSEuraer3oQwpNZn4ROASYKQHsnwZs+XHuJ8MkK4="; }; - vendorHash = "sha256-ML1aLbrYhs2IxnN2ywKFOpvAV6yuYb8GI+dtoxwJl4A="; + vendorHash = "sha256-GvgH6i2t3O39gG2hsKsv5xbLb1V1qi3MqVSfw2D+cZg="; ldflags = [ "-w" diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix index 8e866051a250..06dd4c480f87 100644 --- a/pkgs/by-name/ca/cartero/package.nix +++ b/pkgs/by-name/ca/cartero/package.nix @@ -18,18 +18,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cartero"; - version = "0.1.5"; + version = "0.2.2"; src = fetchFromGitHub { owner = "danirod"; repo = "cartero"; tag = "v${finalAttrs.version}"; - hash = "sha256-1pSOyVGGl+G6mspdzzYP/BoQueVvAHTP6Vwqt6zL80c="; + hash = "sha256-WQ1pGAIFOwXZ+cokHTBPkFrTGikqpEYxK7J5LFqoeH0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-qqxoP/T9de4w2wQJaCtQGRsoD+/dF7ir4iwYY69R+/I="; + hash = "sha256-vmpBZqRo3Wc7E1d/UzZWDfV96cI9WaSykdxEOTN9KvU="; }; nativeBuildInputs = [ @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { payloads to compatible requests. ''; homepage = "https://cartero.danirod.es"; + changelog = "https://github.com/danirod/cartero/releases"; license = lib.licenses.gpl3Plus; mainProgram = "cartero"; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ca/carto/package.nix b/pkgs/by-name/ca/carto/package.nix index 1183c7bdd983..193d5657318e 100644 --- a/pkgs/by-name/ca/carto/package.nix +++ b/pkgs/by-name/ca/carto/package.nix @@ -19,6 +19,11 @@ buildNpmPackage rec { dontNpmBuild = true; + postInstall = '' + # Remove broken symlinks + find "$out/lib/node_modules" -xtype l -delete + ''; + meta = { changelog = "https://github.com/mapbox/carto/blob/${src.rev}/CHANGELOG.md"; description = "Mapnik stylesheet compiler"; diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix index b320581255d1..f7dbb0751844 100644 --- a/pkgs/by-name/ca/cartridges/package.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -85,7 +85,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://apps.gnome.org/Cartridges/"; changelog = "https://github.com/kra-mo/cartridges/releases/tag/${version}"; license = lib.licenses.gpl3Plus; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; mainProgram = "cartridges"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ca/casilda/package.nix b/pkgs/by-name/ca/casilda/package.nix new file mode 100644 index 000000000000..3b702edeb455 --- /dev/null +++ b/pkgs/by-name/ca/casilda/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchpatch, + meson, + ninja, + pkg-config, + gobject-introspection, + glib, + gtk4, + wayland-protocols, + libepoxy, + wayland, + wayland-scanner, + wlroots_0_18, + libxkbcommon, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "casilda"; + version = "0.2.0"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "jpu"; + repo = "casilda"; + tag = finalAttrs.version; + hash = "sha256-wTYx4Wj8u52+yNc/A5Lg0zqmhKh8X0q99e+TilpUrC4="; + }; + + patches = [ + # Fix missing clock_gettime function + # https://gitlab.gnome.org/jpu/casilda/-/merge_requests/4 + (fetchpatch { + url = "https://gitlab.gnome.org/jpu/casilda/-/commit/dcebb8e67d6dc7c47332d1c76a1d5bf60eaee7b1.patch"; + hash = "sha256-l3zu29PPRwzDuoeoqUs4Gi3JziyZ9vDdqvRfz7GQ4Sw="; + }) + ]; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wayland-scanner + ]; + + buildInputs = [ + libepoxy + glib + wayland-protocols + wayland # for wayland-server + libxkbcommon + ]; + + propagatedBuildInputs = [ + gtk4 + wlroots_0_18 # todo: move to buildInputs after https://gitlab.gnome.org/jpu/casilda/-/merge_requests/7 + ]; + + strictDeps = true; + + meta = { + homepage = "https://gitlab.gnome.org/jpu/casilda"; + description = "Simple Wayland compositor widget for Gtk 4 which can be used to embed other processes windows in Gtk 4 application"; + maintainers = with lib.maintainers; [ emaryn ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ca/casync/package.nix b/pkgs/by-name/ca/casync/package.nix new file mode 100644 index 000000000000..703af1ab01c7 --- /dev/null +++ b/pkgs/by-name/ca/casync/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + python3, + sphinx, + acl, + curl, + fuse, + libselinux, + udev, + xz, + zstd, + fuseSupport ? true, + selinuxSupport ? true, + udevSupport ? true, + glibcLocales, + rsync, +}: + +stdenv.mkDerivation { + pname = "casync"; + version = "2-unstable-2023-10-16"; + + src = fetchFromGitHub { + owner = "systemd"; + repo = "casync"; + rev = "e6817a79d89b48e1c6083fb1868a28f1afb32505"; + hash = "sha256-L7I80kSG4/ES2tGvHHgvOxJZzF76yeqy2WquKCPhnFk="; + }; + + buildInputs = + [ + acl + curl + xz + zstd + ] + ++ lib.optionals fuseSupport [ fuse ] + ++ lib.optionals selinuxSupport [ libselinux ] + ++ lib.optionals udevSupport [ udev ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + sphinx + ]; + nativeCheckInputs = [ + glibcLocales + rsync + ]; + + postPatch = '' + for f in test/test-*.sh.in; do + patchShebangs $f + done + patchShebangs test/http-server.py + ''; + + PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + mesonFlags = + lib.optionals (!fuseSupport) [ "-Dfuse=false" ] + ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] + ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; + + doCheck = true; + preCheck = '' + export LC_ALL="en_US.utf-8" + ''; + + meta = with lib; { + description = "Content-Addressable Data Synchronizer"; + mainProgram = "casync"; + homepage = "https://github.com/systemd/casync"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/by-name/ca/catatonit/package.nix b/pkgs/by-name/ca/catatonit/package.nix index 1844d936d6b5..b97867aecb29 100644 --- a/pkgs/by-name/ca/catatonit/package.nix +++ b/pkgs/by-name/ca/catatonit/package.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { description = "Container init that is so simple it's effectively brain-dead"; homepage = "https://github.com/openSUSE/catatonit"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ erosennin ] ++ teams.podman.members; + maintainers = with maintainers; [ erosennin ]; + teams = [ teams.podman ]; platforms = platforms.linux; mainProgram = "catatonit"; }; diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix index c69411830c67..d79ad9ef84cb 100644 --- a/pkgs/by-name/ca/catboost/package.nix +++ b/pkgs/by-name/ca/catboost/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { shopt -s globstar for cmakelists in **/CMakeLists.*; do sed -i "s/OpenSSL::OpenSSL/OpenSSL::SSL/g" $cmakelists - ${lib.optionalString (lib.versionOlder cudaPackages.cudaVersion "11.8") '' + ${lib.optionalString (cudaPackages.cudaOlder "11.8") '' sed -i 's/-gencode=arch=compute_89,code=sm_89//g' $cmakelists sed -i 's/-gencode=arch=compute_90,code=sm_90//g' $cmakelists ''} diff --git a/pkgs/by-name/ca/catbox/package.nix b/pkgs/by-name/ca/catbox/package.nix new file mode 100644 index 000000000000..e4bc2f051931 --- /dev/null +++ b/pkgs/by-name/ca/catbox/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule rec { + pname = "catbox"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "konimarti"; + repo = "catbox"; + tag = "v${version}"; + hash = "sha256-mLjrHDc8Sn/cHYc8VbrC0YMVVCKyhiYHVzE5kvMergc="; + }; + + vendorHash = "sha256-mbxZUCxkPhgIzUUgiQ1P1z6Zgs0UaVnm+erW60AIIH8="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Pipe mbox messages into shell commands"; + homepage = "https://github.com/konimarti/catbox"; + license = lib.licenses.mit; + mainProgram = "catbox"; + maintainers = with lib.maintainers; [ antonmosich ]; + }; +} diff --git a/pkgs/by-name/ca/cato-client/package.nix b/pkgs/by-name/ca/cato-client/package.nix new file mode 100644 index 000000000000..44aa79563bb4 --- /dev/null +++ b/pkgs/by-name/ca/cato-client/package.nix @@ -0,0 +1,69 @@ +{ + stdenv, + fetchurl, + writeScript, + autoPatchelfHook, + dpkg, + libz, + lib, +}: +stdenv.mkDerivation rec { + pname = "cato-client"; + version = "5.4.0.1006"; + + src = fetchurl { + url = "https://clients.catonetworks.com/linux/${version}/cato-client-install.deb"; + sha256 = "sha256-3RyiDgfWL4vA/pUyOigmuK+SV1Q96Y65HVERPeadWWY="; + }; + + passthru.updateScript = writeScript "update-cato-client" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre2 common-updater-scripts + + set -eu -o pipefail + + version="$(curl -sI https://clientdownload.catonetworks.com/public/clients/cato-client-install.deb | grep -Fi 'Location:' | pcre2grep -o1 '/(([0-9]\.?)+)/')" + update-source-version cato-client "$version" + ''; + + dontConfigure = true; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + libz + stdenv.cc.cc + ]; + + unpackPhase = '' + runHook preUnpack + dpkg -x $src source + cd source + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + mkdir $out + + mv usr/lib $out/lib + + mkdir -p $out/bin + mv usr/sbin/* $out/bin + mv usr/bin/* $out/bin + + runHook postInstall + ''; + + meta = { + description = "Lightweight agent that provides secure zero-trust access to resources everywhere"; + homepage = "https://www.catonetworks.com/platform/cato-client/"; + mainProgram = "cato-sdp"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ yarekt ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/ca/catppuccin-fcitx5/package.nix b/pkgs/by-name/ca/catppuccin-fcitx5/package.nix index d062438f5e48..ef769a011d05 100644 --- a/pkgs/by-name/ca/catppuccin-fcitx5/package.nix +++ b/pkgs/by-name/ca/catppuccin-fcitx5/package.nix @@ -3,27 +3,36 @@ stdenvNoCC, fetchFromGitHub, unstableGitUpdater, + + withRoundedCorners ? false, }: stdenvNoCC.mkDerivation { pname = "catppuccin-fcitx5"; - version = "0-unstable-2025-03-22"; + version = "0-unstable-2025-05-16"; src = fetchFromGitHub { owner = "catppuccin"; repo = "fcitx5"; - rev = "383c27ac46cbb55aa5f58acbd32841c1ed3a78a0"; - hash = "sha256-n83f9ge4UhBFlgCPRCXygcVJiDp7st48lAJHTm1ohR4="; + rev = "393845cf3ed0e0000bfe57fe1b9ad75748e2547f"; + hash = "sha256-ss0kW+ulvMhxeZKBrjQ7E5Cya+02eJrGsE4OLEkqKks="; }; dontConfigure = true; dontBuild = true; - installPhase = '' - runHook preInstall - mkdir -p $out/share/fcitx5 - cp -r src $out/share/fcitx5/themes - runHook postInstall - ''; + installPhase = + '' + runHook preInstall + '' + + lib.optionalString withRoundedCorners '' + find src -name theme.conf -exec sed -iE 's/^# (Image=(panel|highlight).svg)/\1/' {} + + '' + + '' + mkdir -p $out/share/fcitx5 + cp -r src $out/share/fcitx5/themes + + runHook postInstall + ''; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/ca/catppuccin-kvantum/package.nix b/pkgs/by-name/ca/catppuccin-kvantum/package.nix index c7f0e0cf6070..a651d2e7b069 100644 --- a/pkgs/by-name/ca/catppuccin-kvantum/package.nix +++ b/pkgs/by-name/ca/catppuccin-kvantum/package.nix @@ -33,13 +33,13 @@ lib.checkListOfEnum "${pname}: theme accent" stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-10-25"; + version = "0-unstable-2025-04-22"; src = fetchFromGitHub { owner = "catppuccin"; repo = "Kvantum"; - rev = "a87694e0a3c97644dbb34f8835112d17b54ace68"; - hash = "sha256-eQmEeKC+L408ajlNg3oKMnDK6Syy2GV6FrR2TN5ZBCg="; + rev = "bc98ccaf9e64a354dd752c24605d4e3a9fe5bfd2"; + hash = "sha256-9DVVUFWhKNe2x3cNVBI78Yf5reh3L22Jsu1KKpKLYsU="; }; installPhase = '' diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index fd168c3021ab..dbd858137473 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -1,5 +1,6 @@ let validThemes = [ + "alacritty" "bat" "bottom" "btop" @@ -55,6 +56,14 @@ let selectedSources = map (themeName: builtins.getAttr themeName sources) themeList; sources = { + alacritty = fetchFromGitHub { + name = "alacritty"; + owner = "catppuccin"; + repo = "alacritty"; + rev = "f6cb5a5c2b404cdaceaff193b9c52317f62c62f7"; + hash = "sha256-H8bouVCS46h0DgQ+oYY8JitahQDj0V9p2cOoD4cQX+Q="; + }; + bat = fetchFromGitHub { name = "bat"; owner = "catppuccin"; @@ -83,8 +92,8 @@ let name = "element"; owner = "catppuccin"; repo = "element"; - rev = "ddced941a2014107918484263b63e030889777fe"; - hash = "sha256-8EP/IQW3rdtomHBfnQNIjGbiD6OapPzXPFLjziNDcmc="; + rev = "70b7ee121dcef28c6c8191d60df2f88b23c89084"; + hash = "sha256-iUSPlmEvwL9akbPobkbDWPr6TTHA/LdCK2Nty7Zslls="; }; grub = fetchFromGitHub { @@ -222,6 +231,11 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO local capitalizedVariant=$(sed 's/^\(.\)/\U\1/' <<< "${variant}") local capitalizedAccent=$(sed 's/^\(.\)/\U\1/' <<< "${accent}") + '' + + lib.optionalString (lib.elem "alacritty" themeList) '' + mkdir -p "$out/alacritty" + cp "${sources.alacritty}/catppuccin-${variant}.toml" "$out/alacritty/" + '' + lib.optionalString (lib.elem "bat" themeList) '' mkdir -p "$out/bat" @@ -240,7 +254,7 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "element" themeList) '' mkdir -p "$out/element" - cp -r "${sources.element}/themes/Catppuccin-${variant}.json" "$out/element/" + cp -r "${sources.element}/themes/${variant}/${accent}.json" "$out/element/" '' + lib.optionalString (lib.elem "grub" themeList) '' diff --git a/pkgs/by-name/cb/cbor-diag/Gemfile.lock b/pkgs/by-name/cb/cbor-diag/Gemfile.lock index 4a4fc73d4b32..3fb8993319ef 100644 --- a/pkgs/by-name/cb/cbor-diag/Gemfile.lock +++ b/pkgs/by-name/cb/cbor-diag/Gemfile.lock @@ -3,18 +3,18 @@ GEM specs: cbor-canonical (0.1.2) cbor-deterministic (0.1.3) - cbor-diag (0.8.8) + cbor-diag (0.9.6) cbor-canonical cbor-deterministic cbor-packed json_pure neatjson treetop (~> 1) - cbor-packed (0.1.5) - json_pure (2.7.2) + cbor-packed (0.2.2) + json_pure (2.8.1) neatjson (0.10.5) polyglot (0.3.5) - treetop (1.6.12) + treetop (1.6.14) polyglot (~> 0.3) PLATFORMS @@ -24,4 +24,4 @@ DEPENDENCIES cbor-diag BUNDLED WITH - 2.5.16 + 2.6.6 diff --git a/pkgs/by-name/cb/cbor-diag/gemset.nix b/pkgs/by-name/cb/cbor-diag/gemset.nix index 65789a0348e0..c01ae16a4451 100644 --- a/pkgs/by-name/cb/cbor-diag/gemset.nix +++ b/pkgs/by-name/cb/cbor-diag/gemset.nix @@ -32,30 +32,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12gicnz857iin9lhbrigyqz4v8fan9lq4sd56rfcb2c7a8azvmz9"; + sha256 = "0c0a4pfvnhkh8dmih1igm7qm2ligzvccppjskpz85v69xizfsj71"; type = "gem"; }; - version = "0.8.8"; + version = "0.9.6"; }; cbor-packed = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1dijyj7rivi39h34f32fx7k4xvngldf569i0372n1z6w01nv761l"; + sha256 = "0sbbz0p17m77xqmh4fv4rwly1cj799hapdsg4h43kwsw8h0rnk8n"; type = "gem"; }; - version = "0.1.5"; + version = "0.2.2"; }; json_pure = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13b4dminf6znfwvj8d61w6dar9zrxnndrmiig19adbliv0haxmlr"; + sha256 = "1kks889ymaq5xqvj18qamar3il8m3dnnaf6cij0a0kwxp8lpk1va"; type = "gem"; }; - version = "2.7.2"; + version = "2.8.1"; }; neatjson = { groups = [ "default" ]; @@ -83,9 +83,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d"; + sha256 = "1m5fqy7vq6y7bgxmw7jmk7y6pla83m16p7lb41lbqgg53j8x2cds"; type = "gem"; }; - version = "1.6.12"; + version = "1.6.14"; }; } diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index 941d3022a8c9..00162a46eb58 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -15,12 +15,14 @@ doctest, xcodebuild, makeWrapper, + ctestCheckHook, + writableTmpDirAsHomeHook, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "ccache"; - version = "4.11.2"; + version = "4.11.3"; src = fetchFromGitHub { owner = "ccache"; @@ -39,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { exit 1 fi ''; - hash = "sha256-Jno0CeMyy911aZSro5LqYINyVD8haZJF2aOSGF26thY="; + hash = "sha256-w41e73Zh5HhYhgLPtaaSiJ48BklBNtnK9S859tol5wc="; }; outputs = [ @@ -82,31 +84,24 @@ stdenv.mkDerivation (finalAttrs: { # test/run requires the compgen function which is available in # bashInteractive, but not bash. bashInteractive + ctestCheckHook + writableTmpDirAsHomeHook ] ++ lib.optional stdenv.hostPlatform.isDarwin xcodebuild; checkInputs = [ doctest ]; - checkPhase = - let - badTests = - [ - "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "test.basedir" - "test.fileclone" # flaky on hydra (possibly filesystem-specific?) - "test.multi_arch" - "test.nocpp2" - ]; - in - '' - runHook preCheck - export HOME=$(mktemp -d) - ctest --output-on-failure -E '^(${lib.concatStringsSep "|" badTests})$' - runHook postCheck - ''; + disabledTests = + [ + "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) + "test.fileclone" # flaky on hydra, also seems to fail on zfs + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "test.basedir" + "test.multi_arch" + "test.nocpp2" + ]; passthru = { # A derivation that provides gcc and g++ commands, but that diff --git a/pkgs/by-name/cc/cctools/package.nix b/pkgs/by-name/cc/cctools/package.nix index be2e3898cf75..6350540065ed 100644 --- a/pkgs/by-name/cc/cctools/package.nix +++ b/pkgs/by-name/cc/cctools/package.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { apple-psl20 gpl2 # GNU as ]; - maintainers = lib.teams.darwin.members; + teams = [ lib.teams.darwin ]; platforms = lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/cc/cctz/package.nix b/pkgs/by-name/cc/cctz/package.nix new file mode 100644 index 000000000000..a28c22d0443f --- /dev/null +++ b/pkgs/by-name/cc/cctz/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "cctz"; + version = "2.4"; + + src = fetchFromGitHub { + owner = "google"; + repo = "cctz"; + rev = "v${version}"; + sha256 = "sha256-F4h8nT1karymV16FFHC0ldSbdOOx5AMstqi4Bc5m3UQ="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + installTargets = + [ "install_hdrs" ] + ++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib" + ++ lib.optional stdenv.hostPlatform.isStatic "install_lib"; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/google/cctz"; + description = "C++ library for translating between absolute and civil times"; + license = licenses.asl20; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/cd/cddiscid/package.nix b/pkgs/by-name/cd/cddiscid/package.nix new file mode 100644 index 000000000000..7360ec62239c --- /dev/null +++ b/pkgs/by-name/cd/cddiscid/package.nix @@ -0,0 +1,34 @@ +{ + fetchurl, + lib, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "cd-discid"; + version = "1.4"; + + src = fetchurl { + url = "http://linukz.org/download/${pname}-${version}.tar.gz"; + sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz"; + }; + + installFlags = [ + "PREFIX=$(out)" + "INSTALL=install" + ]; + + meta = with lib; { + homepage = "http://linukz.org/cd-discid.shtml"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + description = "Command-line utility to get CDDB discid information from a CD-ROM disc"; + mainProgram = "cd-discid"; + + longDescription = '' + cd-discid is a backend utility to get CDDB discid information + from a CD-ROM disc. It was originally designed for cdgrab (now + abcde), but can be used for any purpose requiring CDDB data. + ''; + }; +} diff --git a/pkgs/by-name/cd/cddlib/package.nix b/pkgs/by-name/cd/cddlib/package.nix index a745c3a5b42e..9357a9edbb9a 100644 --- a/pkgs/by-name/cd/cddlib/package.nix +++ b/pkgs/by-name/cd/cddlib/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of the Double Description Method for generating all vertices of a convex polyhedron"; license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html"; }; diff --git a/pkgs/by-name/cd/cde/package.nix b/pkgs/by-name/cd/cde/package.nix deleted file mode 100644 index d61c888d482b..000000000000 --- a/pkgs/by-name/cd/cde/package.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - libxcrypt, -}: - -stdenv.mkDerivation rec { - pname = "cde"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "usnistgov"; - repo = "corr-CDE"; - rev = "v${version}"; - sha256 = "sha256-s375gtqBWx0GGXALXR+fN4bb3tmpvPNu/3bNz+75UWU="; - }; - - # The build is small, so there should be no problem - # running this locally. There is also a use case for - # older systems, where modern binaries might not be - # useful. - preferLocalBuild = true; - - buildInputs = [ libxcrypt ]; - - patchBuild = '' - sed -i -e '/install/d' $src/Makefile - ''; - - preBuild = '' - patchShebangs . - ''; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: ../readelf-mini/libreadelf-mini.a(dwarf.o):/build/source/readelf-mini/dwarf.c:64: - # multiple definition of `do_wide'; ../readelf-mini/libreadelf-mini.a(readelf-mini.o):/build/source/readelf-mini/readelf-mini.c:170: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - installPhase = '' - install -d $out/bin - install -t $out/bin cde cde-exec - ''; - - meta = with lib; { - homepage = "https://github.com/usnistgov/corr-CDE"; - description = "Packaging tool for building portable packages"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.rlupton20 ]; - platforms = platforms.linux; - # error: architecture aarch64 is not supported by bundled strace - badPlatforms = [ "aarch64-linux" ]; - }; -} diff --git a/pkgs/by-name/cd/cdecl/package.nix b/pkgs/by-name/cd/cdecl/package.nix index 590b928c11f7..2a9e7762cfd3 100644 --- a/pkgs/by-name/cd/cdecl/package.nix +++ b/pkgs/by-name/cd/cdecl/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdecl"; - version = "18.4.1"; + version = "18.4.2"; src = fetchFromGitHub { owner = "paul-j-lucas"; repo = "cdecl"; tag = "cdecl-${finalAttrs.version}"; - hash = "sha256-GtNB55zFIpt6yYE3olC3yQr2RLsS9AMewzJKDcb67GM="; + hash = "sha256-adM+EoumgZs207WpqMHG09RknC3gcaaemqPCZF3P6gU="; }; strictDeps = true; diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 0180e338c4b9..9736275892aa 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.12"; + version = "1.1.18"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-rhrcjGR179oBhflEBAztHD+e6Q0MsIkAR40LDrSYzgE="; + hash = "sha256-Zp3ObJkK60g4VgH8e1aghHjCbueu/9FNru9RUx6uIuE="; }; vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; diff --git a/pkgs/by-name/cd/cdo/package.nix b/pkgs/by-name/cd/cdo/package.nix index 6fb2fb68abe7..e3f10732ed21 100644 --- a/pkgs/by-name/cd/cdo/package.nix +++ b/pkgs/by-name/cd/cdo/package.nix @@ -15,9 +15,14 @@ enable_cxx ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cdo"; - version = "2.4.2"; + version = "2.5.1"; + + src = fetchurl { + url = "https://code.mpimet.mpg.de/attachments/download/29864/cdo-${finalAttrs.version}.tar.gz"; + hash = "sha256-QYv5HoZMv+VHw8jhUNMUGc+nFefTRVCMVZGxq9pUV9E="; + }; # Dependencies buildInputs = [ @@ -27,11 +32,6 @@ stdenv.mkDerivation rec { python3 ]; - src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/29481/${pname}-${version}.tar.gz"; - sha256 = "sha256-TfH+K4+S9Uwn6585nt+rQNkyIAWmcyyhUk71wWJ6xOc="; - }; - configureFlags = [ "--with-netcdf=${netcdf}" @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ++ lib.optional enable_all_static "--enable-all-static" ++ lib.optional enable_cxx "--enable-cxx"; - meta = with lib; { + meta = { description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data"; mainProgram = "cdo"; longDescription = '' @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { There are more than 600 operators available. ''; homepage = "https://code.mpimet.mpg.de/projects/cdo/"; - license = licenses.bsd3; - maintainers = [ maintainers.ltavard ]; - platforms = with platforms; linux ++ darwin; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ltavard ]; + platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/cd/cdrdao/package.nix b/pkgs/by-name/cd/cdrdao/package.nix new file mode 100644 index 000000000000..20a60e9d2db5 --- /dev/null +++ b/pkgs/by-name/cd/cdrdao/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchurl, + fetchpatch, + pkg-config, + libiconv, + libvorbis, + libmad, + libao, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cdrdao"; + version = "1.2.5"; + + src = fetchurl { + url = "mirror://sourceforge/cdrdao/cdrdao-${finalAttrs.version}.tar.bz2"; + hash = "sha256-0ZtnyFPF26JAavqrbNeI53817r5jTKxGeVKEd8e+AbY="; + }; + + makeFlags = [ + "RM=rm" + "LN=ln" + "MV=mv" + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libiconv + libvorbis + libmad + libao + ]; + + hardeningDisable = [ "format" ]; + + patches = [ + # Fix build on macOS SDK < 12 + # https://github.com/cdrdao/cdrdao/pull/19 + (fetchpatch { + url = "https://github.com/cdrdao/cdrdao/commit/105d72a61f510e3c47626476f9bbc9516f824ede.patch"; + hash = "sha256-NVIw59CSrc/HcslhfbYQNK/qSmD4QbfuV8hWYhWelX4="; + }) + + # Fix undefined behaviour caused by uninitialized variable + # https://github.com/cdrdao/cdrdao/pull/21 + (fetchpatch { + url = "https://github.com/cdrdao/cdrdao/commit/251a40ab42305c412674c7c2d391374d91e91c95.patch"; + hash = "sha256-+nGlWw5rgc5Ns2l+6fQ4Hp2LbhO4R/I95h9WGIh/Ebw="; + }) + ]; + + # we have glibc/include/linux as a symlink to the kernel headers, + # and the magic '..' points to kernelheaders, and not back to the glibc/include + postPatch = '' + sed -i 's,linux/../,,g' dao/sg_err.h + ''; + + # Needed on gcc >= 6. + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + + meta = { + description = "Tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; + homepage = "https://cdrdao.sourceforge.net/"; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; + }; +}) diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix index dcc28f431b17..4874ad387d19 100644 --- a/pkgs/by-name/ce/cedar/package.nix +++ b/pkgs/by-name/ce/cedar/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "cedar"; - version = "4.3.3"; + version = "4.4.0"; src = fetchFromGitHub { owner = "cedar-policy"; repo = "cedar"; tag = "v${version}"; - hash = "sha256-o4oSZcQdOQsCbu92w0jY/EQKGtQis+8tUxaLIqVC1po="; + hash = "sha256-rF6r7BUwjRYK9MM0owLs77i7duNj710+PHoX1LGDO24="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1vEI0dtdb9CKhNvFeBL8KdxSfzF77X7zl1xxpvvRCQk="; + cargoHash = "sha256-6SvXJc7ow0zhCPqrI15n05FUBZOmYDnqV4YSclkTZ9I="; passthru = { tests.version = testers.testVersion { package = cedar; }; diff --git a/pkgs/by-name/ce/cef-binary/package.nix b/pkgs/by-name/ce/cef-binary/package.nix new file mode 100644 index 000000000000..060e935cfe88 --- /dev/null +++ b/pkgs/by-name/ce/cef-binary/package.nix @@ -0,0 +1,15 @@ +{ + libcef, +}: + +libcef.overrideAttrs (oldAttrs: { + pname = "cef-binary"; + + installPhase = '' + runHook preInstall + + cp -r .. $out + + runHook postInstall + ''; +}) diff --git a/pkgs/by-name/ce/cegui/package.nix b/pkgs/by-name/ce/cegui/package.nix index cf7c9707744f..241624683aeb 100644 --- a/pkgs/by-name/ce/cegui/package.nix +++ b/pkgs/by-name/ce/cegui/package.nix @@ -7,20 +7,19 @@ freetype, boost, expat, - darwin, libiconv, unstableGitUpdater, }: stdenv.mkDerivation { pname = "cegui"; - version = "0-unstable-2023-03-18"; + version = "0-unstable-2025-04-06"; src = fetchFromGitHub { owner = "paroj"; repo = "cegui"; - rev = "186ce900e293b98f2721c11930248a8de54aa338"; - hash = "sha256-RJ4MnxklcuxC+ZYEbfma5RDc2aeJ95LuTwNk+FnEhdo="; + rev = "a630bcc3f1e4b66edcf0fd00edcb9b29ad8446a3"; + hash = "sha256-9lZ7eBwmxZ33XNDJXQ2lbCcH5JyH0KoY1mj/g+2HOJs="; }; strictDeps = true; @@ -37,8 +36,6 @@ stdenv.mkDerivation { expat ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Foundation libiconv ]; diff --git a/pkgs/by-name/ce/celeste/package.nix b/pkgs/by-name/ce/celeste/package.nix index 48ef60083dde..acc76f8f5302 100644 --- a/pkgs/by-name/ce/celeste/package.nix +++ b/pkgs/by-name/ce/celeste/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - darwin, just, pkg-config, wrapGAppsHook4, @@ -58,22 +57,17 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook4 ]; - buildInputs = - [ - cairo - dbus - gdk-pixbuf - glib - graphene - gtk4 - libadwaita - librclone - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + cairo + dbus + gdk-pixbuf + glib + graphene + gtk4 + libadwaita + librclone + pango + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ce/celluloid/package.nix b/pkgs/by-name/ce/celluloid/package.nix index 67d17f6b1266..132cc461ccbc 100644 --- a/pkgs/by-name/ce/celluloid/package.nix +++ b/pkgs/by-name/ce/celluloid/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "celluloid"; - version = "0.27"; + version = "0.28"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; - rev = "v${finalAttrs.version}"; - hash = "sha256-zuYt7taIb4w3NIszUpnSYvLIdYQH492tBwhLa6IgWDw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-72t8AVBDvvyf91zR/uXwT/PvNucyjUQFpQUQ5wnekXw="; }; nativeBuildInputs = [ @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/celluloid-player/celluloid/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; mainProgram = "celluloid"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ samlukeyes123 ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ce/cemu/0001-glslang-cmake-target.patch b/pkgs/by-name/ce/cemu/0001-glslang-cmake-target.patch deleted file mode 100644 index af0426bf7d60..000000000000 --- a/pkgs/by-name/ce/cemu/0001-glslang-cmake-target.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Cafe/CMakeLists.txt.orig b/src/Cafe/CMakeLists.txt -index 91d257b..cff779a 100644 ---- a/src/Cafe/CMakeLists.txt -+++ b/src/Cafe/CMakeLists.txt -@@ -545,7 +545,7 @@ target_link_libraries(CemuCafe PRIVATE - Boost::nowide - CURL::libcurl - fmt::fmt -- glslang::SPIRV -+ glslang::glslang - ih264d - OpenSSL::Crypto - OpenSSL::SSL diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 28c90ea1d828..29a354635a6c 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -7,7 +7,6 @@ cubeb, curl, fetchFromGitHub, - fetchpatch, fmt_9, gamemode, glm, @@ -45,20 +44,20 @@ let src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-J4gz4rnydu8JlzqNC/OIoVoRcgeFd6B1Qboxu5drOKY="; }; }; in stdenv.mkDerivation (finalAttrs: { pname = "cemu"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; - rev = "v${finalAttrs.version}"; - hash = "sha256-JBd5ntU1fFDvQpNbfP63AQANzuQTdfd4dfB29/BN5LM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-YO3rMhlBZ5fGu0ceAFB0R3owFuSobx39faWL9EUFwAM="; }; patches = [ @@ -66,12 +65,6 @@ stdenv.mkDerivation (finalAttrs: { # > The following imported targets are referenced, but are missing: # > SPIRV-Tools-opt ./0000-spirv-tools-opt-cmakelists.patch - ./0001-glslang-cmake-target.patch - (fetchpatch { - name = "fix-building-against-boost-187.patch"; - url = "https://github.com/cemu-project/Cemu/commit/2b0cbf7f6b6c34c748585d255ee7756ff592a502.patch"; - hash = "sha256-jHB/9MWZ/oNfUgZtxtgkSN/OnRARSuGVfXFFB9ldDpI="; - }) ./0002-cemu-imgui.patch ]; diff --git a/pkgs/by-name/ce/cen64/cast-mi_regs-callbacks.patch b/pkgs/by-name/ce/cen64/cast-mi_regs-callbacks.patch new file mode 100644 index 000000000000..fc86ce32233c --- /dev/null +++ b/pkgs/by-name/ce/cen64/cast-mi_regs-callbacks.patch @@ -0,0 +1,22 @@ +From f13bdf94c00a9da3b152ed9fe20001e240215b96 Mon Sep 17 00:00:00 2001 +From: James Lambert +Date: Tue, 9 Feb 2021 11:49:51 -0700 +Subject: [PATCH] Cast mi_regs callbacks + +--- + bus/controller.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/bus/controller.c b/bus/controller.c +index 1f0cdfccf..24b3df260 100644 +--- a/bus/controller.c ++++ b/bus/controller.c +@@ -44,7 +44,7 @@ int bus_init(struct bus_controller *bus, int dd_present) { + static const struct bus_controller_mapping mappings[NUM_MAPPINGS] = { + {read_ai_regs, write_ai_regs, AI_REGS_BASE_ADDRESS, AI_REGS_ADDRESS_LEN}, + {read_dp_regs, write_dp_regs, DP_REGS_BASE_ADDRESS, DP_REGS_ADDRESS_LEN}, +- {read_mi_regs, write_mi_regs, MI_REGS_BASE_ADDRESS, MI_REGS_ADDRESS_LEN}, ++ {(memory_rd_function)read_mi_regs, (memory_wr_function)write_mi_regs, MI_REGS_BASE_ADDRESS, MI_REGS_ADDRESS_LEN}, + {read_pi_regs, write_pi_regs, PI_REGS_BASE_ADDRESS, PI_REGS_ADDRESS_LEN}, + {read_ri_regs, write_ri_regs, RI_REGS_BASE_ADDRESS, RI_REGS_ADDRESS_LEN}, + {read_si_regs, write_si_regs, SI_REGS_BASE_ADDRESS, SI_REGS_ADDRESS_LEN}, diff --git a/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch b/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch new file mode 100644 index 000000000000..7d3ff742c57a --- /dev/null +++ b/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch @@ -0,0 +1,137 @@ +From 41ad58ab1953835313ad2b89686931b08b5b47e8 Mon Sep 17 00:00:00 2001 +From: ghpzin +Date: Tue, 25 Mar 2025 15:26:07 +0300 +Subject: [PATCH] Fix thread arg type for pthread_setname_np + +- change `thread` arg type to `cen64_thread` instead of `cen64_thread *` +(`pthread_t` instead of `pthread_t *`) according to definition of +`pthread_setname_np` from ``: +`int pthread_setname_np(pthread_t thread, const char *name);` +fixes gcc14 errors: +``` +/build/source/cen64.c:475:24: error: passing argument 1 of 'cen64_thread_setname' makes pointer from integer without a cast [-Wint-conversion] + 475 | cen64_thread_setname(thread, "device"); + | ^~~~~~ + | | + | cen64_thread {aka long unsigned int} +In file included from /build/source/device/device.h:26, + from /build/source/cen64.c:15: +/build/source/os/posix/thread.h:59:54: note: expected 'cen64_thread *' {aka 'long unsigned int *'} but argument is of type 'cen64_thread' {aka 'lo> + 59 | static inline int cen64_thread_setname(cen64_thread *t, const char *name) { + | ~~~~~~~~~~~~~~^ +``` + +- add cast to `cen64_thread` from NULL where `cen64_thread` is called +with it, fixes gcc14 errors: +``` +/build/source/gdb/gdb.c:82:24: error: passing argument 1 of 'cen64_thread_setname' makes integer from pointer without a cast [-Wint-conversion] + 82 | cen64_thread_setname(NULL, "gdb"); + | ^~~~ + | | + | void * +/build/source/os/posix/thread.h:59:53: note: expected 'cen64_thread' {aka 'long unsigned int'} but argument is of type 'void *' + 59 | static inline int cen64_thread_setname(cen64_thread t, const char *name) { + | ~~~~~~~~~~~~~^ +``` +--- + cen64.c | 2 +- + device/device.c | 4 ++-- + gdb/gdb.c | 4 ++-- + os/posix/thread.h | 6 +++--- + os/winapi/thread.h | 2 +- + 5 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/cen64.c b/cen64.c +index 51014a4..ca6bda1 100644 +--- a/cen64.c ++++ b/cen64.c +@@ -483,7 +483,7 @@ int run_device(struct cen64_device *device, bool no_video) { + } + + CEN64_THREAD_RETURN_TYPE run_device_thread(void *opaque) { +- cen64_thread_setname(NULL, "device"); ++ cen64_thread_setname((cen64_thread)NULL, "device"); + struct cen64_device *device = (struct cen64_device *) opaque; + + device_run(device); +diff --git a/device/device.c b/device/device.c +index cd5a046..c915846 100644 +--- a/device/device.c ++++ b/device/device.c +@@ -224,7 +224,7 @@ CEN64_THREAD_RETURN_TYPE run_rcp_thread(void *opaque) { + } + + CEN64_THREAD_RETURN_TYPE run_vr4300_thread(void *opaque) { +- cen64_thread_setname(NULL, "vr4300"); ++ cen64_thread_setname((cen64_thread)NULL, "vr4300"); + struct cen64_device *device = (struct cen64_device *) opaque; + + while (likely(device->running)) { +@@ -351,4 +351,4 @@ int device_debug_spin(struct cen64_device *device) { + + cen64_cold void device_connect_debugger(struct cen64_device *device, void* break_handler_data, vr4300_debug_break_handler break_handler) { + vr4300_connect_debugger(device->vr4300, break_handler_data, break_handler); +-} +\ No newline at end of file ++} +diff --git a/gdb/gdb.c b/gdb/gdb.c +index 021784d..0e8d188 100644 +--- a/gdb/gdb.c ++++ b/gdb/gdb.c +@@ -79,7 +79,7 @@ bool gdb_parse_packet(const char* input, int len, const char** command_start, co + } + + CEN64_THREAD_RETURN_TYPE gdb_thread(void *opaque) { +- cen64_thread_setname(NULL, "gdb"); ++ cen64_thread_setname((cen64_thread)NULL, "gdb"); + struct gdb *gdb = (struct gdb *) opaque; + + cen64_mutex_lock(&gdb->client_mutex); +@@ -257,4 +257,4 @@ cen64_cold void gdb_destroy(struct gdb* gdb) { + + gdb->device = NULL; + free(gdb); +-} +\ No newline at end of file ++} +diff --git a/os/posix/thread.h b/os/posix/thread.h +index 2a261c6..e8e6144 100644 +--- a/os/posix/thread.h ++++ b/os/posix/thread.h +@@ -45,9 +45,9 @@ static inline int cen64_thread_join(cen64_thread *t) { + #ifdef __APPLE__ + int pthread_setname_np(const char*); + #elif __NETBSD__ +-int pthread_setname_np(cen64_thread*, const char*, const char*); ++int pthread_setname_np(cen64_thread, const char*, const char*); + #else +-int pthread_setname_np(cen64_thread*, const char*); ++int pthread_setname_np(cen64_thread, const char*); + #endif + + // Sets the name of the thread to a specific value +@@ -56,7 +56,7 @@ int pthread_setname_np(cen64_thread*, const char*); + // If you call it at the wrong time or your OS doesn't support custom thread names + // the return value will be non-zero. + // If cen64_thread is not set the name of the current thread will be changed. +-static inline int cen64_thread_setname(cen64_thread *t, const char *name) { ++static inline int cen64_thread_setname(cen64_thread t, const char *name) { + #ifdef __APPLE__ + if (t == NULL) + return pthread_setname_np(name); +diff --git a/os/winapi/thread.h b/os/winapi/thread.h +index d7c162a..128d935 100644 +--- a/os/winapi/thread.h ++++ b/os/winapi/thread.h +@@ -57,7 +57,7 @@ static inline int cen64_thread_join(cen64_thread *t) { + // + // Windows isn't supported for the moment. + // +-static inline int cen64_thread_setname(cen64_thread *t, const char *name) { ++static inline int cen64_thread_setname(cen64_thread t, const char *name) { + return ENOSYS; + } + +-- +2.48.1 + diff --git a/pkgs/by-name/ce/cen64/package.nix b/pkgs/by-name/ce/cen64/package.nix index 1a2450ee6304..ea6071c71260 100644 --- a/pkgs/by-name/ce/cen64/package.nix +++ b/pkgs/by-name/ce/cen64/package.nix @@ -11,15 +11,23 @@ stdenv.mkDerivation rec { pname = "cen64"; - version = "unstable-2022-10-02"; + version = "0-unstable-2023-05-29"; src = fetchFromGitHub { owner = "n64dev"; repo = "cen64"; - rev = "ee6db7d803a77b474e73992fdc25d76b9723d806"; - sha256 = "sha256-/CraSu/leNA0dl8NVgFjvKdOWrC9/namAz5NSxtPr+I="; + rev = "1c1118462bd9d9b8ceb4c556a647718072477aab"; + sha256 = "sha256-vFk29KESATcEY0eRNbS+mHLD9T1phJiG1fqjOlI19/w="; }; + patches = [ + # fix build with gcc14: + # https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96 + ./cast-mi_regs-callbacks.patch + # https://github.com/n64dev/cen64/pull/237 + ./fix-thread-arg-type-for-pthread_setname_np.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libGL diff --git a/pkgs/by-name/ce/centerim/package.nix b/pkgs/by-name/ce/centerim/package.nix deleted file mode 100644 index 44abb6a12e6a..000000000000 --- a/pkgs/by-name/ce/centerim/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gnused, - openssl, - curl, - ncurses, - libjpeg, - withGpg ? true, - gpgme ? null, -}: - -stdenv.mkDerivation rec { - version = "5.0.1"; - pname = "centerim5"; - - src = fetchurl { - url = "http://centerim.org/download/cim5/${pname}-${version}.tar.gz"; - sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk"; - }; - - CXXFLAGS = "-std=gnu++98"; - - buildInputs = [ - openssl - curl - ncurses - libjpeg - ] ++ lib.optional withGpg gpgme; - - preConfigure = '' - ${gnused}/bin/sed -i '1,1i#include ' libicq2000/libicq2000/sigslot.h - ''; - - configureFlags = [ - "--with-openssl=${openssl.dev}" - ]; - - meta = { - homepage = "https://www.centerim.org/"; - description = "Fork of CenterICQ, a curses instant messaging program"; - license = lib.licenses.gpl2Plus; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index e96f82a984b6..3af99ba44ff5 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -16,23 +16,23 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.4.9"; + version = "6.2.0"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-FDtAkoN1bdqVUEP0obbXBfQfVRpZN5YXbU1KT1yXWuI="; + hash = "sha256-DCtUw/0EWJcgQSBd/csbgoi1ncN1LnLJZvfv3AZyW0o="; }; - vendorHash = "sha256-WfYN7bhtOPDp2UeB/WqtN3dD3+WO9lIxnXe2iTqn000="; + vendorHash = "sha256-35RmwI5Qy50jgUAjOz0UlE7CgjVuDiwFfG3uYafr1O4="; 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}" + "-X=github.com/centrifugal/centrifugo/v6/internal/build.Version=${version}" + "-X=github.com/centrifugal/centrifugo/v6/internal/build.UsageStatsEndpoint=${statsEndpoint}" + "-X=github.com/centrifugal/centrifugo/v6/internal/build.UsageStatsToken=${statsToken}" ]; excludedPackages = [ @@ -56,7 +56,10 @@ buildGoModule rec { homepage = "https://centrifugal.dev"; changelog = "https://github.com/centrifugal/centrifugo/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.tie ]; + maintainers = [ + lib.maintainers.tie + lib.maintainers.valodim + ]; mainProgram = "centrifugo"; }; } diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix index 8db4efbf105c..0231fbe7dbc9 100644 --- a/pkgs/by-name/ce/ceph-csi/package.nix +++ b/pkgs/by-name/ce/ceph-csi/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.13.1"; + version = "3.14.0"; src = fetchFromGitHub { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - hash = "sha256-Wa5elZbQotgeb4pH9DIZd48CQyBJ0O5y1SidIb/iyGY="; + hash = "sha256-c6OaWDR38S0yl3pVN+DYjfg9oHqmVXljstmvBDmfOi8="; }; preConfigure = '' diff --git a/pkgs/by-name/ce/cerca/package.nix b/pkgs/by-name/ce/cerca/package.nix new file mode 100644 index 000000000000..b8787a7a47df --- /dev/null +++ b/pkgs/by-name/ce/cerca/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "cerca"; + version = "0-unstable-2025-05-06"; + + src = fetchFromGitHub { + owner = "cblgh"; + repo = "cerca"; + rev = "a2706a35e3efc8b816b4374e24493548429041db"; + hash = "sha256-FDlASFjI+D/iOH0r2Yd638aS0na19TxkN7Z1kD/o/fY"; + }; + + vendorHash = "sha256-yfsI0nKfzyzmtbS9bSHRaD2pEgxN6gOKAA/FRDxJx40="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Lean forum software"; + homepage = "https://github.com/cblgh/cerca"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ dansbandit ]; + mainProgram = "cerca"; + }; +} diff --git a/pkgs/by-name/ce/certbot/package.nix b/pkgs/by-name/ce/certbot/package.nix index 300ee0005c15..5c1cf5746425 100644 --- a/pkgs/by-name/ce/certbot/package.nix +++ b/pkgs/by-name/ce/certbot/package.nix @@ -7,19 +7,6 @@ let python = python3.override { self = python; packageOverrides = self: super: { - josepy = super.josepy.overridePythonAttrs (old: rec { - version = "1.15.0"; - src = fetchFromGitHub { - owner = "certbot"; - repo = "josepy"; - tag = "v${version}"; - hash = "sha256-fK4JHDP9eKZf2WO+CqRdEjGwJg/WNLvoxiVrb5xQxRc="; - }; - dependencies = with self; [ - pyopenssl - cryptography - ]; - }); }; }; in diff --git a/pkgs/by-name/ce/certinfo-go/package.nix b/pkgs/by-name/ce/certinfo-go/package.nix index 23b3e6b9762b..f3f8fc02b470 100644 --- a/pkgs/by-name/ce/certinfo-go/package.nix +++ b/pkgs/by-name/ce/certinfo-go/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "certinfo-go"; - version = "0.1.42"; + version = "0.1.43"; src = fetchFromGitHub { owner = "paepckehh"; repo = "certinfo"; tag = "v${version}"; - hash = "sha256-XnHQTMohpuMnV2trSqZ9PlKWmuOyHGDj+6ljKfUD40A="; + hash = "sha256-vXNk4DrElWmV7yxWEiLZexJQzVBUY08fF0in6hpBwjA="; }; - vendorHash = "sha256-Bbj+8TAJJWhkOxib9cz/Znj5bHAXcgrDONRpGDK+los="; + vendorHash = "sha256-rAXnnd9E3HFvmbI+dIJj0F81NwXXD53QATNNmlOpBRM="; ldflags = [ "-s" diff --git a/pkgs/by-name/ce/certinfo/package.nix b/pkgs/by-name/ce/certinfo/package.nix index 073c6ce3ed9c..b5f79fdd1a86 100644 --- a/pkgs/by-name/ce/certinfo/package.nix +++ b/pkgs/by-name/ce/certinfo/package.nix @@ -4,7 +4,6 @@ buildGo123Module, fetchFromGitHub, libX11, - darwin, }: buildGo123Module rec { @@ -21,10 +20,7 @@ buildGo123Module rec { # clipboard functionality not working on Darwin doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); - buildInputs = - [ ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]; vendorHash = null; diff --git a/pkgs/by-name/ce/certstream-server-go/package.nix b/pkgs/by-name/ce/certstream-server-go/package.nix index a6fac3934297..f95dcabf35db 100644 --- a/pkgs/by-name/ce/certstream-server-go/package.nix +++ b/pkgs/by-name/ce/certstream-server-go/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "certstream-server-go"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "d-Rickyy-b"; repo = "certstream-server-go"; tag = "v${version}"; - hash = "sha256-iA4kwhGvAkRL0cMCfo0mdQYUZbWk3Y8xdb7jjjTaRFM="; + hash = "sha256-ashuwJjWrKjVtjPzBLmXX7EMFX0nlxs4B53pBP2G3Bo="; }; - vendorHash = "sha256-S5uF+i5Qsgi3M7B7LbO7CDO2GkWXn4X8wK/hgSSedHo="; + vendorHash = "sha256-+7wL6JA5sNRNJQKelVkEVCZ5pqOlmn8o7Um2g6rsIlc="; ldflags = [ "-s" diff --git a/pkgs/by-name/ce/cewler/package.nix b/pkgs/by-name/ce/cewler/package.nix index a146ef653f64..3a65802c2615 100644 --- a/pkgs/by-name/ce/cewler/package.nix +++ b/pkgs/by-name/ce/cewler/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cewler"; - version = "1.2.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "roys"; repo = "cewler"; rev = "v${version}"; - hash = "sha256-lVI3p6YMugQ3yKHFNxISmUY7XZMuX/TXvVUoZfIeJog="; + hash = "sha256-Od9O71122jVwqZ5ntoBQQtyNQjt2RRbZT8DzWFPUN84="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix index 0826b2919953..2f9958f05417 100644 --- a/pkgs/by-name/cf/cfripper/package.nix +++ b/pkgs/by-name/cf/cfripper/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.17.0"; + version = "1.17.1"; pyproject = true; src = fetchFromGitHub { owner = "Skyscanner"; repo = "cfripper"; tag = "v${version}"; - hash = "sha256-xmCI+rM8Ijj66Df6H5WFpxTDkKqW5CPwXh+w/Qaqooc="; + hash = "sha256-qAsIm1mcvMQshKActmFZuxgH3Yyzvw6m7e8DklG1AQ4="; }; pythonRelaxDeps = [ @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool for analysing CloudFormation templates"; homepage = "https://github.com/Skyscanner/cfripper"; - changelog = "https://github.com/Skyscanner/cfripper/releases/tag/v${version}"; + changelog = "https://github.com/Skyscanner/cfripper/releases/tag/${src.tag}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; mainProgram = "cfripper"; diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index 9f3adc36999b..c9decc92d1c0 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -3,28 +3,40 @@ stdenv, rustPlatform, fetchFromGitHub, + installShellFiles, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cfspeedtest"; - version = "1.3.1"; + version = "1.3.4"; src = fetchFromGitHub { owner = "code-inflation"; repo = "cfspeedtest"; - tag = "v${version}"; - hash = "sha256-86PZlTwqplKCVZl6IG2Qch+IMdfiTfpBhdNf00XIXbU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-6ea9qOAFP7+1UIrGASFiAPyem+VDVgzrgD44ELsXRzc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-54gIhBuVl77NDGotbgcOJsPxZL3XdJBnDEDbNpbVSNk="; + cargoHash = "sha256-uyLd4KQa9zWMCuurpdQv0OnCSguE180dm6FzHR+nC40="; - meta = with lib; { + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd cfspeedtest \ + --bash <($out/bin/cfspeedtest --generate-completion bash) \ + --fish <($out/bin/cfspeedtest --generate-completion fish) \ + --zsh <($out/bin/cfspeedtest --generate-completion zsh) + ''; + + meta = { description = "Unofficial CLI for speed.cloudflare.com"; homepage = "https://github.com/code-inflation/cfspeedtest"; - license = with licenses; [ mit ]; - broken = stdenv.hostPlatform.isDarwin; - maintainers = with maintainers; [ colemickens ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ + colemickens + stepbrobd + ]; mainProgram = "cfspeedtest"; }; -} +}) diff --git a/pkgs/by-name/cg/cg3/package.nix b/pkgs/by-name/cg/cg3/package.nix index e4e142d641ee..6423db36f790 100644 --- a/pkgs/by-name/cg/cg3/package.nix +++ b/pkgs/by-name/cg/cg3/package.nix @@ -7,64 +7,64 @@ cmake, icu, boost, + pkg-config, + sqlite, + cg3, }: -let - cg3 = stdenv.mkDerivation rec { - pname = "cg3"; - version = "1.3.9"; +stdenv.mkDerivation (finalAttrs: { + pname = "cg3"; + version = "1.5.1"; - src = fetchFromGitHub { - owner = "GrammarSoft"; - repo = "cg3"; - rev = "v${version}"; - sha256 = "sha256-TiEhhk90w5GibGZ4yalIf+4qLA8NoU6+GIPN6QNTz2A="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - icu - boost - ]; - - doCheck = true; - - postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/cg3.pc \ - --replace '=''${prefix}//' '=/' - ''; - - passthru.tests.minimal = - runCommand "${pname}-test" - { - buildInputs = [ - cg3 - dieHook - ]; - } - '' - echo 'DELIMITERS = "."; ADD (tag) (*);' >grammar.cg3 - printf '""\n\t"a" tag\n\n' >want.txt - printf '""\n\t"a"\n\n' | vislcg3 -g grammar.cg3 >got.txt - diff -s want.txt got.txt || die "Grammar application did not produce expected parse" - touch $out - ''; - - # TODO, consider optionals: - # - Enable tcmalloc unless darwin? - # - Enable python bindings? - - meta = with lib; { - homepage = "https://github.com/GrammarSoft/cg3"; - description = "Constraint Grammar interpreter, compiler and applicator vislcg3"; - maintainers = with maintainers; [ unhammer ]; - license = licenses.gpl3Plus; - platforms = platforms.all; - }; + src = fetchFromGitHub { + owner = "GrammarSoft"; + repo = "cg3"; + tag = "v${finalAttrs.version}"; + hash = "sha256-R3ePghkr4m6FmiHfhPVdLRAJaipIBhGLOX0Hz1nNPv4="; }; -in -cg3 + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + icu + boost + sqlite + ]; + + doCheck = true; + + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/cg3.pc \ + --replace-fail '=''${prefix}//' '=/' + ''; + + passthru.tests.minimal = + runCommand "cg3-test" + { + buildInputs = [ + cg3 + dieHook + ]; + } + '' + echo 'DELIMITERS = "."; ADD (tag) (*);' >grammar.cg3 + printf '""\n\t"a" tag\n\n' >want.txt + printf '""\n\t"a"\n\n' | vislcg3 -g grammar.cg3 >got.txt + diff -s want.txt got.txt || die "Grammar application did not produce expected parse" + touch $out + ''; + + # TODO, consider optionals: + # - Enable tcmalloc unless darwin? + # - Enable python bindings? + meta = { + homepage = "https://github.com/GrammarSoft/cg3"; + description = "Constraint Grammar interpreter, compiler and applicator vislcg3"; + maintainers = with lib.maintainers; [ unhammer ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/cg/cgif/package.nix b/pkgs/by-name/cg/cgif/package.nix index dc6fb3dcf885..dddd1d67a1a2 100644 --- a/pkgs/by-name/cg/cgif/package.nix +++ b/pkgs/by-name/cg/cgif/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cgif"; - version = "0.3.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dloebl"; repo = "cgif"; - rev = "V${finalAttrs.version}"; - sha256 = "sha256-FvqpToIVYblpuRWeEaUA8MA2Bnp9dpqGquylnXevhX4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-i8xngmVhRCGkczY3NzomLkXj+iqPb81lvLn6dXsByYs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chafa/package.nix b/pkgs/by-name/ch/chafa/package.nix new file mode 100644 index 000000000000..ef46ea903727 --- /dev/null +++ b/pkgs/by-name/ch/chafa/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + autoconf, + automake, + libtool, + pkg-config, + which, + libavif, + libjxl, + librsvg, + libxslt, + libxml2, + docbook_xml_dtd_412, + docbook_xsl, + glib, +}: + +stdenv.mkDerivation rec { + version = "1.14.5"; + pname = "chafa"; + + src = fetchFromGitHub { + owner = "hpjansson"; + repo = "chafa"; + rev = version; + sha256 = "sha256-9RkN0yZnHf5cx6tsp3P6jsi0/xtplWxMm3hYCPjWj0M="; + }; + + outputs = [ + "bin" + "dev" + "man" + "out" + ]; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + which + libxslt + libxml2 + docbook_xml_dtd_412 + docbook_xsl + installShellFiles + ]; + + buildInputs = [ + glib + libavif + libjxl + librsvg + ]; + + patches = [ ./xmlcatalog_patch.patch ]; + + preConfigure = '' + substituteInPlace ./autogen.sh --replace pkg-config '$PKG_CONFIG' + NOCONFIGURE=1 ./autogen.sh + ''; + + configureFlags = [ + "--enable-man" + "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" + ]; + + postInstall = '' + installShellCompletion --cmd chafa tools/completions/zsh-completion.zsh + ''; + + meta = with lib; { + description = "Terminal graphics for the 21st century"; + homepage = "https://hpjansson.org/chafa/"; + license = licenses.lgpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.mog ]; + mainProgram = "chafa"; + }; +} diff --git a/pkgs/tools/misc/chafa/xmlcatalog_patch.patch b/pkgs/by-name/ch/chafa/xmlcatalog_patch.patch similarity index 100% rename from pkgs/tools/misc/chafa/xmlcatalog_patch.patch rename to pkgs/by-name/ch/chafa/xmlcatalog_patch.patch diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix index a9d848a59619..17c763fff44c 100644 --- a/pkgs/by-name/ch/chainsaw/package.nix +++ b/pkgs/by-name/ch/chainsaw/package.nix @@ -2,39 +2,41 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "chainsaw"; - version = "2.10.1"; + version = "2.12.2"; src = fetchFromGitHub { owner = "WithSecureLabs"; repo = "chainsaw"; - tag = "v${version}"; - hash = "sha256-ErDIfLhzCiFm3dZzr6ThjYCplfDKbALAqcu8c0gREH4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-SoQXGpkMrE0vno0dJ00ebB0oR1sDVlgWRSgKQoHlv2A="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LTvCExHQnQIbGGeh4bK6b3r9XXOxREMTOlRQv+BjKrM="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; + cargoHash = "sha256-ncf5fRf9NulcWTOuRE2rdAOIyvz5YEgpB1j/Rfj8vDk="; ldflags = [ "-w" "-s" ]; - meta = with lib; { + checkFlags = [ + # failed + "--skip=analyse_srum_database_json" + "--skip=search_jq_simple_string" + "--skip=search_q_jsonl_simple_string" + "--skip=search_q_simple_string" + ]; + + meta = { description = "Rapidly Search and Hunt through Windows Forensic Artefacts"; homepage = "https://github.com/WithSecureLabs/chainsaw"; - changelog = "https://github.com/WithSecureLabs/chainsaw/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/WithSecureLabs/chainsaw/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "chainsaw"; }; -} +}) diff --git a/pkgs/by-name/ch/chamber/package.nix b/pkgs/by-name/ch/chamber/package.nix index 4f6dd8670f67..9f721954031f 100644 --- a/pkgs/by-name/ch/chamber/package.nix +++ b/pkgs/by-name/ch/chamber/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "chamber"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ySOlP0sFk3+IRt/zstZK6lEE2pzoVSiZz3wFxdesgc="; + sha256 = "sha256-9+I/zH4sHlLQkEn+fCboI3vCjYjlk+hdYnWuxq47r5I="; }; env.CGO_ENABLED = 0; - vendorHash = "sha256-KlouLjW9hVKFi9uz34XHd4CzNOiyO245QNygkB338YQ="; + vendorHash = "sha256-IjCBf1h6r+EDLfgGqP/VfsHaD5oPkIR33nYBAcb6SLY="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix index 93b6b9993991..918a95f10788 100644 --- a/pkgs/by-name/ch/changedetection-io/package.nix +++ b/pkgs/by-name/ch/changedetection-io/package.nix @@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { dnspython elementpath eventlet + extruct feedgen flask flask-compress diff --git a/pkgs/by-name/ch/chaos/package.nix b/pkgs/by-name/ch/chaos/package.nix index 534ca61872ef..983709dd0fb4 100644 --- a/pkgs/by-name/ch/chaos/package.nix +++ b/pkgs/by-name/ch/chaos/package.nix @@ -29,7 +29,7 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "Tool to communicate with Chaos DNS API"; diff --git a/pkgs/by-name/ch/charge-lnd/package.nix b/pkgs/by-name/ch/charge-lnd/package.nix index 2defe92c7aa0..ba1b058ad1ba 100644 --- a/pkgs/by-name/ch/charge-lnd/package.nix +++ b/pkgs/by-name/ch/charge-lnd/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.2.13"; + version = "0.3.0"; src = fetchFromGitHub { owner = "accumulator"; repo = "charge-lnd"; tag = "v${version}"; - hash = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac="; + hash = "sha256-a/zIEA2oF1+BoZXk4YDWx69eVFSnANUE/F+ARI/VsXU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/ch/charliecloud/package.nix b/pkgs/by-name/ch/charliecloud/package.nix index dd831bd34ebd..f14227833d94 100644 --- a/pkgs/by-name/ch/charliecloud/package.nix +++ b/pkgs/by-name/ch/charliecloud/package.nix @@ -13,26 +13,30 @@ findutils, sudo, nixosTests, + pkg-config, + fuse3, }: -stdenv.mkDerivation rec { - - version = "0.24"; +stdenv.mkDerivation (finalAttrs: { pname = "charliecloud"; + version = "0.38"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; - rev = "v${version}"; - sha256 = "sha256-kdaVlwE3vdCxsmJTOUwx8J+9UcBuXbKDwS2MHX2ZPPM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Mr2Qa1PRTarJ0I8nkH/Xsq8QN3OxOfL8tpl1lL1WV0c="; }; nativeBuildInputs = [ autoreconfHook makeWrapper + pkg-config ]; + buildInputs = [ docker + fuse3 (python3.withPackages (ps: [ ps.lark ps.requests @@ -48,11 +52,12 @@ stdenv.mkDerivation rec { in [ "--with-python=${pythonEnv}/bin/python3" + "-disable-bundled-lark" ]; preConfigure = '' patchShebangs test/ - substituteInPlace configure.ac --replace "/usr/bin/env" "${coreutils}/bin/env" + substituteInPlace configure.ac --replace-fail "/usr/bin/env" "${coreutils}/bin/env" ''; makeFlags = [ @@ -94,5 +99,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bzizou ]; platforms = lib.platforms.linux; }; - -} +}) diff --git a/pkgs/by-name/ch/charm-freeze/package.nix b/pkgs/by-name/ch/charm-freeze/package.nix index cfe6109d7bc6..d5da8ac2253c 100644 --- a/pkgs/by-name/ch/charm-freeze/package.nix +++ b/pkgs/by-name/ch/charm-freeze/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "charm-freeze"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "freeze"; rev = "v${version}"; - hash = "sha256-eV8X/vftF/GGuM0RnLCkIStSR98fN6nmW3BzoASPLH0="; + hash = "sha256-1zc62m1uS8Bl6x54SG2///PWfiKbZood6VBibbsFX7I="; }; - vendorHash = "sha256-Y/UsqYtzXtOCE4bGf/mRAqJ0GxEtKq0qYecbitn0EhM="; + vendorHash = "sha256-BEMVjPexJ3Y4ScXURu7lbbmrrehc6B09kfr03b/SPg8="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 99d094dd7f50..ec94207f8d56 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "charmcraft"; - version = "3.4.3"; + version = "3.4.6"; pyproject = true; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; tag = version; - hash = "sha256-TCr6iZHUIJ/dZhj8pWsCYKAfqv9LXD3fGP432UQh/Lo="; + hash = "sha256-i7XhsVmeO3fzAWCQ1v9J/dv4oSdN00svauIColQcj9A="; }; postPatch = '' diff --git a/pkgs/by-name/ch/chars/package.nix b/pkgs/by-name/ch/chars/package.nix new file mode 100644 index 000000000000..ae87f1efd6c8 --- /dev/null +++ b/pkgs/by-name/ch/chars/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "chars"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "antifuchs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mBtwdPzIc6RgEFTyReStFlhS4UhhRWjBTKT6gD3tzpQ="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Df+twOjzfq+Vxzuv+APiy94XmhBajgk+6+1BRFf+xm0="; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + }; + + meta = with lib; { + description = "Commandline tool to display information about unicode characters"; + mainProgram = "chars"; + homepage = "https://github.com/antifuchs/chars"; + license = licenses.mit; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix new file mode 100644 index 000000000000..86f55dcc6050 --- /dev/null +++ b/pkgs/by-name/ch/chatbox/package.nix @@ -0,0 +1,49 @@ +{ + lib, + appimageTools, + fetchurl, + writeScript, +}: +let + pname = "chatbox"; + version = "1.12.3"; + + src = fetchurl { + url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage"; + hash = "sha256-/jrieUFKGSZT59e0q42rmUeDslHWgEPga/7jg8375sw="; + }; + + appimageContents = appimageTools.extract { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/xyz.chatboxapp.app.desktop $out/share/applications/chatbox.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/xyz.chatboxapp.app.png $out/share/icons/hicolor/512x512/apps/chatbox.png + substituteInPlace $out/share/applications/chatbox.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=chatbox' \ + --replace-fail 'Icon=xyz.chatboxapp.app' 'Icon=chatbox' + ''; + + passthru.updateScript = writeScript "update-chatbox" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + version=$(curl -I -X GET https://chatboxai.app/install_chatbox/linux | grep -oP 'Chatbox-\K[0-9]+\.[0-9]+\.[0-9]+') + update-source-version chatbox $version + ''; + + meta = { + description = "AI client application and smart assistant"; + homepage = "https://chatboxai.app"; + downloadPage = "https://chatboxai.app/en#download"; + changelog = "https://chatboxai.app/en/help-center/changelog"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ c31io ]; + mainProgram = "chatbox"; + + # Help porting to other platforms :) + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/ch/chatgpt/package.nix b/pkgs/by-name/ch/chatgpt/package.nix index 0dc77de11805..9799e446af64 100644 --- a/pkgs/by-name/ch/chatgpt/package.nix +++ b/pkgs/by-name/ch/chatgpt/package.nix @@ -1,7 +1,6 @@ { lib, stdenvNoCC, - darwin, fetchurl, _7zz, undmg, diff --git a/pkgs/by-name/ch/chatmcp/package.nix b/pkgs/by-name/ch/chatmcp/package.nix index 9737a73e0d1f..f66a52c419dd 100644 --- a/pkgs/by-name/ch/chatmcp/package.nix +++ b/pkgs/by-name/ch/chatmcp/package.nix @@ -1,6 +1,6 @@ { lib, - flutter327, + flutter329, fetchFromGitHub, autoPatchelfHook, copyDesktopItems, @@ -12,15 +12,15 @@ gitUpdater, }: -flutter327.buildFlutterApplication rec { +flutter329.buildFlutterApplication rec { pname = "chatmcp"; - version = "0.0.21-alpha"; + version = "0.0.51"; src = fetchFromGitHub { owner = "daodao97"; repo = "chatmcp"; tag = "v${version}"; - hash = "sha256-T0HVvnMBH/Tnhks7NTCdE3QkHPbg4XaPnT1aJ+LSH6E="; + hash = "sha256-XLlNK0VH766kaTjGaIgOKOot16TGkaTlF0yEzuGID5o="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/ch/chatmcp/pubspec.lock.json b/pkgs/by-name/ch/chatmcp/pubspec.lock.json index e6ecd97ee755..975843c6621c 100644 --- a/pkgs/by-name/ch/chatmcp/pubspec.lock.json +++ b/pkgs/by-name/ch/chatmcp/pubspec.lock.json @@ -4,47 +4,41 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", + "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f", "url": "https://pub.dev" }, "source": "hosted", - "version": "76.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.3" + "version": "82.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", + "sha256": "13c1e6c6fd460522ea840abec3f677cc226f5fec7872c04ad7b425517ccf54f7", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.11.0" + "version": "7.4.4" }, "archive": { "dependency": "transitive", "description": { "name": "archive", - "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.7" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "async": { "dependency": "transitive", @@ -90,31 +84,31 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.3" + "version": "4.0.4" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.3" + "version": "2.4.4" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.14" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", @@ -140,11 +134,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.3" + "version": "8.9.5" }, "cached_network_image": { "dependency": "direct main", @@ -196,6 +190,16 @@ "source": "hosted", "version": "2.0.3" }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "cli_util": { "dependency": "transitive", "description": { @@ -250,11 +254,11 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", + "sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.13.1" }, "cross_file": { "dependency": "transitive", @@ -296,16 +300,6 @@ "source": "hosted", "version": "1.0.8" }, - "curl_logger_dio_interceptor": { - "dependency": "direct main", - "description": { - "name": "curl_logger_dio_interceptor", - "sha256": "f20d89187a321d2150e1412bca30ebf4d89130bafc648ce21bd4f1ef4062b214", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, "dart_style": { "dependency": "transitive", "description": { @@ -316,36 +310,6 @@ "source": "hosted", "version": "3.0.1" }, - "dio": { - "dependency": "direct main", - "description": { - "name": "dio", - "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.8.0+1" - }, - "dio_web_adapter": { - "dependency": "transitive", - "description": { - "name": "dio_web_adapter", - "sha256": "e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "dotenv": { - "dependency": "direct main", - "description": { - "name": "dotenv", - "sha256": "379e64b6fc82d3df29461d349a1796ecd2c436c480d4653f3af6872eccbc90e1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.0" - }, "event_bus": { "dependency": "direct main", "description": { @@ -356,6 +320,16 @@ "source": "hosted", "version": "2.0.1" }, + "eventflux": { + "dependency": "direct main", + "description": { + "name": "eventflux", + "sha256": "f6da4534c84b11531ae84546fbd0202b743ca7ef6bc92c84c0f50d7a1c487a12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, "fake_async": { "dependency": "transitive", "description": { @@ -370,11 +344,11 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "transitive", @@ -390,11 +364,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "cacfdc5abe93e64d418caa9256eef663499ad791bb688d9fd12c85a311968fba", + "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.2" + "version": "8.3.7" }, "fixnum": { "dependency": "transitive", @@ -422,15 +396,25 @@ "source": "hosted", "version": "3.4.1" }, - "flutter_dotenv": { + "flutter_client_sse": { "dependency": "direct main", "description": { - "name": "flutter_dotenv", - "sha256": "b7c7be5cd9f6ef7a78429cabd2774d3c4af50e79cb2b7593e3d5d763ef95c61b", + "name": "flutter_client_sse", + "sha256": "4ce0297206473dfc064b255fe086713240002e149f52519bd48c21423e4aa5d2", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.2.1" + "version": "2.0.3" + }, + "flutter_form_builder": { + "dependency": "direct main", + "description": { + "name": "flutter_form_builder", + "sha256": "aa3901466c70b69ae6c7f3d03fcbccaec5fde179d3fded0b10203144b546ad28", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.1" }, "flutter_highlight": { "dependency": "direct main", @@ -442,16 +426,6 @@ "source": "hosted", "version": "0.7.0" }, - "flutter_highlighter": { - "dependency": "direct main", - "description": { - "name": "flutter_highlighter", - "sha256": "93173afd47a9ada53f3176371755e7ea4a1065362763976d06d6adfb4d946e10", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.1" - }, "flutter_inappwebview": { "dependency": "direct main", "description": { @@ -618,26 +592,6 @@ "source": "sdk", "version": "0.0.0" }, - "flutter_markdown": { - "dependency": "direct main", - "description": { - "name": "flutter_markdown", - "sha256": "b3ff1ef5fb3924ee02b4d38b974ffae3969d50603e68787684ee9dd45f6f144a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.6+1" - }, - "flutter_markdown_latex": { - "dependency": "direct main", - "description": { - "name": "flutter_markdown_latex", - "sha256": "839e76a84abb3632ffcebbd450cf93c7e9894af65622527d23f0084cee1bfd04", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.4" - }, "flutter_math_fork": { "dependency": "direct main", "description": { @@ -652,31 +606,41 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", + "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.24" + "version": "2.0.28" }, - "flutter_statusbarcolor_ns": { + "flutter_popup": { "dependency": "direct main", "description": { - "name": "flutter_statusbarcolor_ns", - "sha256": "a971b00344dff1bff95c95e1c5d4cd38923a27d0d6fac684ebaf220b1d1abbdc", + "name": "flutter_popup", + "sha256": "8f93cb4ec7341330ee585b4624ac6596f02587aaefc47297344cb7b5af26aa07", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.0" + "version": "3.3.4" }, "flutter_svg": { "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", + "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.17" + "version": "2.1.0" + }, + "flutter_switch": { + "dependency": "direct main", + "description": { + "name": "flutter_switch", + "sha256": "b91477f926bba135d2d203d7b24367492662d8d9c3aa6adb960b14c1087d3c41", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2" }, "flutter_test": { "dependency": "direct dev", @@ -721,7 +685,7 @@ "version": "2.3.2" }, "highlight": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "highlight", "sha256": "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21", @@ -730,25 +694,15 @@ "source": "hosted", "version": "0.7.0" }, - "highlighter": { - "dependency": "direct main", - "description": { - "name": "highlighter", - "sha256": "92180c72b9da8758e1acf39a45aa305a97dcfe2fdc8f3d1d2947c23f2772bfbc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.1" - }, "html": { "dependency": "transitive", "description": { "name": "html", - "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", + "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.15.5" + "version": "0.15.6" }, "html2md": { "dependency": "direct main", @@ -761,7 +715,7 @@ "version": "1.3.2" }, "http": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "http", "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", @@ -794,11 +748,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.4" }, "intl": { "dependency": "direct main", @@ -824,11 +778,11 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" }, "json_annotation": { "dependency": "transitive", @@ -840,6 +794,16 @@ "source": "hosted", "version": "4.9.0" }, + "jsonc": { + "dependency": "direct main", + "description": { + "name": "jsonc", + "sha256": "326a3c5c774a77c3c4e327f359e0268bff34135d0c16078beee6d921c49a16ed", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, "keyboard_dismisser": { "dependency": "direct main", "description": { @@ -900,16 +864,6 @@ "source": "hosted", "version": "1.3.0" }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.3-main.0" - }, "markdown": { "dependency": "direct main", "description": { @@ -924,11 +878,11 @@ "dependency": "direct main", "description": { "name": "markdown_widget", - "sha256": "216dced98962d7699a265344624bc280489d739654585ee881c95563a3252fac", + "sha256": "b52c13d3ee4d0e60c812e15b0593f142a3b8a2003cde1babb271d001a1dbdc1c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2+6" + "version": "2.3.2+8" }, "matcher": { "dependency": "transitive", @@ -974,11 +928,11 @@ "dependency": "direct dev", "description": { "name": "mockito", - "sha256": "f99d8d072e249f719a5531735d146d8cf04c580d93920b04de75bef6dfb2daf6", + "sha256": "4546eac99e8967ea91bae633d2ca7698181d008e95fa4627330cf903d573277a", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.4.5" + "version": "5.4.6" }, "nested": { "dependency": "transitive", @@ -1014,11 +968,31 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.3.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" }, "path": { "dependency": "direct main", @@ -1054,11 +1028,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.17" }, "path_provider_foundation": { "dependency": "transitive", @@ -1100,75 +1074,15 @@ "source": "hosted", "version": "2.3.0" }, - "permission_handler": { - "dependency": "direct main", - "description": { - "name": "permission_handler", - "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "11.3.1" - }, - "permission_handler_android": { - "dependency": "transitive", - "description": { - "name": "permission_handler_android", - "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "12.0.13" - }, - "permission_handler_apple": { - "dependency": "transitive", - "description": { - "name": "permission_handler_apple", - "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.4.5" - }, - "permission_handler_html": { - "dependency": "transitive", - "description": { - "name": "permission_handler_html", - "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.3+5" - }, - "permission_handler_platform_interface": { - "dependency": "transitive", - "description": { - "name": "permission_handler_platform_interface", - "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.3" - }, - "permission_handler_windows": { - "dependency": "transitive", - "description": { - "name": "permission_handler_windows", - "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.1" - }, "petitparser": { "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "platform": { "dependency": "transitive", @@ -1204,31 +1118,31 @@ "dependency": "transitive", "description": { "name": "posix", - "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a", + "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.1" + "version": "6.0.2" }, "provider": { "dependency": "direct main", "description": { "name": "provider", - "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.1.5" }, "pub_semver": { "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", @@ -1324,41 +1238,41 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", + "sha256": "b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.4" + "version": "11.0.0" }, "share_plus_platform_interface": { "dependency": "transitive", "description": { "name": "share_plus_platform_interface", - "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b", + "sha256": "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "6.0.0" }, "shared_preferences": { "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "688ee90fbfb6989c980254a56cb26ebe9bb30a3a2dff439a78894211f73de67a", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.1" + "version": "2.5.3" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "650584dcc0a39856f369782874e562efd002a9c94aec032412c9eb81419cce1f", + "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "2.4.10" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1394,11 +1308,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.3" }, "shared_preferences_windows": { "dependency": "transitive", @@ -1444,11 +1358,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.0" }, "sky_engine": { "dependency": "transitive", @@ -1510,51 +1424,51 @@ "dependency": "direct main", "description": { "name": "sqflite", - "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", + "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "sqflite_android": { "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", + "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4+6" + "version": "2.5.5" }, "sqflite_common_ffi": { "dependency": "direct main", "description": { "name": "sqflite_common_ffi", - "sha256": "883dd810b2b49e6e8c3b980df1829ef550a94e3f87deab5d864917d27ca6bf36", + "sha256": "1f3ef3888d3bfbb47785cc1dda0dc7dd7ebd8c1955d32a9e8e9dae1e38d1c4c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.4+4" + "version": "2.3.5" }, "sqflite_darwin": { "dependency": "transitive", "description": { "name": "sqflite_darwin", - "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c", + "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1+1" + "version": "2.4.2" }, "sqflite_platform_interface": { "dependency": "transitive", @@ -1567,14 +1481,14 @@ "version": "2.4.0" }, "sqlite3": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "sqlite3", - "sha256": "35d3726fe18ab1463403a5cc8d97dbc81f2a0b08082e8173851363fcc97b6627", + "sha256": "310af39c40dd0bb2058538333c9d9840a2725ae0b9f77e4fd09ad6696aa8f66e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.2" + "version": "2.7.5" }, "stack_trace": { "dependency": "transitive", @@ -1620,11 +1534,11 @@ "dependency": "direct main", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.3.1" }, "term_glyph": { "dependency": "transitive", @@ -1710,21 +1624,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.16" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.2" + "version": "6.3.3" }, "url_launcher_linux": { "dependency": "transitive", @@ -1760,11 +1674,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", + "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "url_launcher_windows": { "dependency": "transitive", @@ -1860,31 +1774,31 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", "description": { "name": "web_socket", - "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "sha256": "bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.6" + "version": "1.0.0" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.0.3" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -1896,25 +1810,15 @@ "source": "hosted", "version": "1.2.1" }, - "widgets_to_image": { - "dependency": "direct main", - "description": { - "name": "widgets_to_image", - "sha256": "9a251b95d3a9f10d72420dde9b7e3b0da5eddd47fb19cad066bc68c60b0d1dfb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.10.1" + "version": "5.12.0" }, "window_manager": { "dependency": "direct main", @@ -1958,7 +1862,7 @@ } }, "sdks": { - "dart": ">=3.7.0-0 <4.0.0", - "flutter": ">=3.27.0" + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.29.0" } } diff --git a/pkgs/by-name/ch/chatterino2/common.nix b/pkgs/by-name/ch/chatterino2/common.nix index feca6623b96e..0e8fb6cd4bb1 100644 --- a/pkgs/by-name/ch/chatterino2/common.nix +++ b/pkgs/by-name/ch/chatterino2/common.nix @@ -7,6 +7,7 @@ boost, openssl, libsecret, + libnotify, libavif, kdePackages, }: @@ -24,13 +25,17 @@ stdenv.mkDerivation { qtsvg qt5compat qtkeychain + qtimageformats ]) ++ [ boost openssl libsecret ] - ++ lib.optional stdenv.hostPlatform.isLinux kdePackages.qtwayland + ++ lib.optionals stdenv.hostPlatform.isLinux [ + kdePackages.qtwayland + libnotify + ] ++ lib.optional enableAvifSupport libavif; cmakeFlags = [ diff --git a/pkgs/by-name/ch/chatterino2/package.nix b/pkgs/by-name/ch/chatterino2/package.nix index cd22b02ec183..7e109330875f 100644 --- a/pkgs/by-name/ch/chatterino2/package.nix +++ b/pkgs/by-name/ch/chatterino2/package.nix @@ -2,7 +2,7 @@ lib, callPackage, fetchFromGitHub, - nix-update-script, + gitUpdater, boost186, }: @@ -12,19 +12,22 @@ ( finalAttrs: _: { pname = "chatterino2"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "Chatterino"; repo = "chatterino2"; tag = "v${finalAttrs.version}"; - hash = "sha256-nrw4dQ7QjPPMbZXMC+p3VgUQKwc1ih6qS13D9+9oNuw="; + hash = "sha256-W2sqlqL6aa68aQ3nE161G64x7K7p8iByX03g1dseQbs="; fetchSubmodules = true; }; passthru = { buildChatterino = args: callPackage ./common.nix args; - updateScript = nix-update-script { }; + updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "beta"; + }; }; meta = { diff --git a/pkgs/by-name/ch/chatterino7/package.nix b/pkgs/by-name/ch/chatterino7/package.nix index 3bff23f94c4c..d3fe6ed076f6 100644 --- a/pkgs/by-name/ch/chatterino7/package.nix +++ b/pkgs/by-name/ch/chatterino7/package.nix @@ -2,7 +2,7 @@ lib, chatterino2, fetchFromGitHub, - nix-update-script, + gitUpdater, boost186, }: @@ -13,17 +13,20 @@ ( finalAttrs: _: { pname = "chatterino7"; - version = "7.5.2"; + version = "7.5.3"; src = fetchFromGitHub { owner = "SevenTV"; repo = "chatterino7"; tag = "v${finalAttrs.version}"; - hash = "sha256-kQeW9Qa8NPs47xUlqggS4Df4fxIoknG8O5IBdOeIo+4="; + hash = "sha256-KrAr3DcQDjb+LP+vIf0qLSSgII0m5rNwhncLNHlLaC8="; fetchSubmodules = true; }; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "beta"; + }; meta = { description = "Chat client for Twitch chat"; @@ -38,7 +41,10 @@ changelog = "https://github.com/SevenTV/chatterino7/blob/${finalAttrs.src.rev}/CHANGELOG.c7.md"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ marie ]; + maintainers = with lib.maintainers; [ + marie + supa + ]; }; } ) diff --git a/pkgs/by-name/ch/chatty/package.nix b/pkgs/by-name/ch/chatty/package.nix index b93bbd84b9f0..bd93fb4a4853 100644 --- a/pkgs/by-name/ch/chatty/package.nix +++ b/pkgs/by-name/ch/chatty/package.nix @@ -30,22 +30,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "chatty"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Chatty"; tag = "v${finalAttrs.version}"; - hash = "sha256-iPqV3xluzHPm8TCOOLvczoAPe3LuJuhWEBnQWBUU18U="; + hash = "sha256-VQgEXegP4SjniueyVQNx6Jt8/cHUpUcHP0yEa1cF00w="; }; - postPatch = '' - # https://gitlab.gnome.org/World/Chatty/-/merge_requests/1465 - substituteInPlace src/matrix/chatty-ma-account.c \ - --replace-fail '#include ' "" - ''; - nativeBuildInputs = [ appstream-glib desktop-file-utils diff --git a/pkgs/by-name/ch/chatzone-desktop/package.nix b/pkgs/by-name/ch/chatzone-desktop/package.nix index ead23b676468..ccceab6659f0 100644 --- a/pkgs/by-name/ch/chatzone-desktop/package.nix +++ b/pkgs/by-name/ch/chatzone-desktop/package.nix @@ -10,10 +10,10 @@ let pname = "chatzone-desktop"; - version = "5.2.5"; + version = "5.3.0"; src = fetchurl { - url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/v5.2.5/569/chatzone-desktop-linux-5.2.5.AppImage"; - hash = "sha256-PIghhiy0w9cb7Ki8gPOK8OZB3TFwNd68AAwUI5JzZU8="; + url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.3.0/736/chatzone-desktop-linux-5.3.0.AppImage"; + hash = "sha256-aCu3ZqCBLU4oqf/MnAjwzF/y2CHX0NS9C+eXg46VaY4="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in @@ -35,12 +35,13 @@ stdenvNoCC.mkDerivation { terminal = false; desktopName = "Chatzone"; genericName = "Ozon corporate messenger"; - comment = "Mattermost Desktop application for Linux"; + comment = "Chatzone Desktop application for Linux"; categories = [ "Network" "InstantMessaging" "Chat" ]; + startupWMClass = "Chatzone"; mimeTypes = [ "x-scheme-handler/mattermost" ]; }) ]; diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index d58ac515b596..acd3bfeed975 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -11,19 +11,18 @@ pkg-config, zlib, unstableGitUpdater, - libseccomp, replaceVars, }: stdenv.mkDerivation { pname = "chawan"; - version = "0-unstable-2025-03-27"; + version = "0-unstable-2025-04-18"; src = fetchFromSourcehut { owner = "~bptato"; repo = "chawan"; - rev = "b2d954b96f227597b62cfae1ac64785bd8f0fb37"; - hash = "sha256-1kxqzzEMGDFNk25mQX8p7TuADuTMIz+hHZ7p+i7m494="; + rev = "656092f399d36c13a551b4a2474c8aded3388b1a"; + hash = "sha256-GYCmRIswHFM+VehBlf8NSAt0ewrl7SVD0y9lLhFYkvo="; }; patches = [ ./mancha-augment-path.diff ]; @@ -48,7 +47,6 @@ stdenv.mkDerivation { buildInputs = [ curlMinimal - libseccomp ncurses zlib ]; @@ -83,6 +81,5 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ jtbx ]; mainProgram = "cha"; - broken = stdenv.hostPlatform.isDarwin; # pending PR #292043 }; } diff --git a/pkgs/by-name/ch/chcase/package.nix b/pkgs/by-name/ch/chcase/package.nix new file mode 100644 index 000000000000..6530a2b82035 --- /dev/null +++ b/pkgs/by-name/ch/chcase/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + vala, + pkg-config, + blueprint-compiler, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "chcase"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "ryonakano"; + repo = "chcase"; + tag = finalAttrs.version; + hash = "sha256-3TuAnuWV3Sm1T76Go4NWe2eA55ImR1TFYoCUnqfp9DE="; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + blueprint-compiler + ]; + + meta = { + homepage = "https://github.com/ryonakano/chcase"; + description = "Small library to convert case of a given string"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ emaryn ]; + }; +}) diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix index f02be3672c94..769a5956f01a 100644 --- a/pkgs/by-name/ch/check-jsonschema/package.nix +++ b/pkgs/by-name/ch/check-jsonschema/package.nix @@ -1,26 +1,24 @@ { lib, fetchFromGitHub, - python3, + python3Packages, }: -with python3.pkgs; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.30.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "0.33.0"; + pyproject = true; src = fetchFromGitHub { owner = "python-jsonschema"; repo = "check-jsonschema"; tag = version; - hash = "sha256-qaNSL7ZPEWJ8Zc/XPEWtUJYQnUJ7jNdla1I0d6+GReM="; + hash = "sha256-dygE9vFQpoDtTBtN4zoWY1JXUxBSgiX3GDzdk72BmgI="; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ ruamel-yaml jsonschema requests @@ -28,27 +26,26 @@ buildPythonApplication rec { regress ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-xdist responses + identify ]; + disabledTests = [ "test_schemaloader_yaml_data" ]; + pythonImportsCheck = [ "check_jsonschema" "check_jsonschema.cli" ]; - disabledTests = [ - "test_schemaloader_yaml_data" - ]; - - meta = with lib; { + meta = { description = "Jsonschema CLI and pre-commit hook"; mainProgram = "check-jsonschema"; homepage = "https://github.com/python-jsonschema/check-jsonschema"; changelog = "https://github.com/python-jsonschema/check-jsonschema/blob/${version}/CHANGELOG.rst"; - license = licenses.asl20; - maintainers = with maintainers; [ sudosubin ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sudosubin ]; }; } diff --git a/pkgs/by-name/ch/check-sieve/package.nix b/pkgs/by-name/ch/check-sieve/package.nix index 626d10774ac1..ac76b9a90868 100644 --- a/pkgs/by-name/ch/check-sieve/package.nix +++ b/pkgs/by-name/ch/check-sieve/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "check-sieve"; - version = "0.10"; + version = "0.10-unstable-2025-05-06"; src = fetchFromGitHub { owner = "dburkart"; repo = "check-sieve"; - tag = "check-sieve-${version}"; - hash = "sha256-UMtkiyRGX+/lL7a+c+iZHUJhg0nb4+puSPzM5W71F9o="; + rev = "794c2b116078af59fa8b7bf7a00450f8de0f06de"; + hash = "sha256-jml+G253cqYco9vKXwI8LW7w/mN74lMthCzlRXl+SWc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/check/package.nix b/pkgs/by-name/ch/check/package.nix new file mode 100644 index 000000000000..853bc99382bb --- /dev/null +++ b/pkgs/by-name/ch/check/package.nix @@ -0,0 +1,42 @@ +{ + fetchurl, + lib, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "check"; + version = "0.15.2"; + + src = fetchurl { + url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; + 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; + + meta = with lib; { + description = "Unit testing framework for C"; + + longDescription = '' + Check is a unit testing framework for C. It features a simple + interface for defining unit tests, putting little in the way of the + developer. Tests are run in a separate address space, so Check can + catch both assertion failures and code errors that cause + segmentation faults or other signals. The output from unit tests + can be used within source code editors and IDEs. + ''; + + homepage = "https://libcheck.github.io/check/"; + + license = licenses.lgpl2Plus; + mainProgram = "checkmk"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ch/checkbashisms/package.nix b/pkgs/by-name/ch/checkbashisms/package.nix index 1890b21d7cf1..d0f6f3e1ff69 100644 --- a/pkgs/by-name/ch/checkbashisms/package.nix +++ b/pkgs/by-name/ch/checkbashisms/package.nix @@ -8,31 +8,33 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.23.7"; pname = "checkbashisms"; + version = "2.25.10"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz"; - hash = "sha256-nOnlE1Ry2GR+L/tWZV4AOR6Omap6SormBc8OH/2fNgk="; + hash = "sha256-pEzXrKV/bZbYG7j5QXjRDATZRGLt0fhdpwTDbCoKcus="; }; nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ perl ]; buildPhase = '' runHook preBuild substituteInPlace ./scripts/checkbashisms.pl \ - --replace '###VERSION###' "$version" + --replace-fail '###VERSION###' "${finalAttrs.version}" runHook postBuild ''; + installPhase = '' runHook preInstall - installManPage scripts/$pname.1 - installShellCompletion --bash --name $pname scripts/$pname.bash_completion - install -D -m755 scripts/$pname.pl $out/bin/$pname + installManPage scripts/checkbashisms.1 + installShellCompletion --bash --name checkbashisms scripts/checkbashisms.bash_completion + install -D -m755 scripts/checkbashisms.pl $out/bin/checkbashisms runHook postInstall ''; diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 1bdf939e5318..a6c1a3310361 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,17 +25,18 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.396"; + version = "3.2.427"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-Ppj8dxxT+BcqrxJRycFBBb0QmoFI1yY0/eE7bZY2QaQ="; + hash = "sha256-jdlTSWdojaM7M5g7yWCudZeCuQqaZZWFYJ0kWWup4ts="; }; pythonRelaxDeps = [ + "asteval" "bc-detect-secrets" "bc-python-hcl2" "boto3" @@ -69,6 +70,7 @@ python3.pkgs.buildPythonApplication rec { aiohttp aiomultiprocess argcomplete + asteval bc-detect-secrets bc-jsonpath-ng bc-python-hcl2 diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix index a5147b3ae705..4c63aa50be43 100644 --- a/pkgs/by-name/ch/checkpwn/package.nix +++ b/pkgs/by-name/ch/checkpwn/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-8ALu1Ij4o2fdsRWhlWu6rOIfHZjIIC+fHJ07XIbH66s="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # requires internet access checkFlags = [ "--skip=test_cli_" diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix index 47926b6b84c5..294b988da062 100644 --- a/pkgs/by-name/ch/checkstyle/package.nix +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -7,12 +7,12 @@ }: stdenvNoCC.mkDerivation rec { - version = "10.22.0"; + version = "10.23.1"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-U6QpASgCKxv3NTFINkJ9Aey4E9Y089RY5X2TNhSlIOs="; + sha256 = "sha256-bF0U+SLjVoCLTZLbdtFy98HZtYK7uw0zew2gGuisdH8="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/ch/cherry-studio/missing-hashes.json b/pkgs/by-name/ch/cherry-studio/missing-hashes.json new file mode 100644 index 000000000000..1240077e0388 --- /dev/null +++ b/pkgs/by-name/ch/cherry-studio/missing-hashes.json @@ -0,0 +1,102 @@ +{ + "@esbuild/aix-ppc64@npm:0.21.5": "1f48fea96ab4fbc2921756361bc8a0c4d0690f14dc2298a357aa3d436bcd1cd646d490e5d71c4e0fb46b9e04401bc93153d6886456dd0665b6758be643c95a16", + "@esbuild/aix-ppc64@npm:0.25.2": "e25252d47d27d5e15a09ba7e7e906fe35d90a363e1eec7bc1e054c066bea6f89364139385008f78e8b4523ebaecb1f7a678213c8fcc2cd0309d539bbc455fd05", + "@esbuild/android-arm64@npm:0.21.5": "7a4831b0886c165ed671f0094dcd491235fe503364a261379c84e2225a3c3230a06bce1d3a02316fa8a040b0ffede56c617746dc3b5550549ae3fb07095bb20d", + "@esbuild/android-arm64@npm:0.25.2": "b387ab30ec70902c81ca1231a7838ccc993ad8dff9561a5ec7d7d4e5f03426153d42e496985a02539bce55f6d1048156f36e24a29f61fa5fd8e0587f62696703", + "@esbuild/android-arm@npm:0.21.5": "9fa871018a9f2198f40fde2c672fcb1b9d3ab5ee602644ea4cf68c548ee2c0b6c60ad851ce85219f84886fd29757d8c49bac28ea48a2a16708a088e32dfe673a", + "@esbuild/android-arm@npm:0.25.2": "8e7efb22407ad9a985ff5a09dc0d2b895126c6ccca470db671ca0a3e3026f79666af20ce5d296311f5d056e95ca71e743feeae526f94dcaacb5a6969f9963283", + "@esbuild/android-x64@npm:0.21.5": "24e477ccdaf1437cabe8710bc052a13b975a53617094a225e39823a1c562a71ef975d860ab895c129a813302495d85387143e27068e62fc897a2ac0335e4a2f6", + "@esbuild/android-x64@npm:0.25.2": "66256eee6168c2f903c45c82863f1377f525dc7de0fc902fca412a44d0abbb8a25761fb9e10c8663b25b0f816d86b7e353d2b77ab39eae95234333f9d233ddc4", + "@esbuild/darwin-arm64@npm:0.21.5": "67b0e4ebc870d0babb6721328f02b0e75eca5ee8f176220fa194ac5897ce76a27aa4f6d724389a74e1517670f70e766fe03c30875fdebeee5b1f7b22e99c5a1f", + "@esbuild/darwin-arm64@npm:0.25.2": "36a568a779000133d077e2272181232f52939c3e0b0b986ad3f3fd6ab29628c148e88cd857f6de41a16e22e6a252bb16680f91c00c7d813690fa9bc060f58386", + "@esbuild/darwin-x64@npm:0.21.5": "a4b6df47edf4b1e91eeca9d7af18f538e25615e00763709a4cc24a8918e7ac93b9bfc2ef9f44086f16257d05ad99e23c1213a7a1397475d1a78f0a1e773af89a", + "@esbuild/darwin-x64@npm:0.25.2": "b761a20f8db7bf0499f6cba51c72104e733d9186d6f34a7f5e4590c02ecc2f9b84cd02c4e7bd3dade4156b7f92015cdbddc516dd1e4859233e3155cb0fecda58", + "@esbuild/freebsd-arm64@npm:0.21.5": "a4cf357807f2ea445b5191b8e5488070b567e2b534dba24ce6f8f1a332598ee0b9ffa41b3b0e55cd0cf57e2b56f0f1d84413faba182b81cb43bf19edf58a7654", + "@esbuild/freebsd-arm64@npm:0.25.2": "8f869d6200dba388ac4c008c7a5b6522f44797370a12f94fd19e37b6cd76bdbdf48d0fa893b5ce200a538a151281e9f71e985f82ec8b8c96f16075e45266c718", + "@esbuild/freebsd-x64@npm:0.21.5": "8957c1345196e5dabd7d9f290b5292161f5d9955f269051fa7873118cfb5a20c31d70771ea3560b513f879d0948ba32fba915fb1b387571c4fbbb1fbeaf2dd87", + "@esbuild/freebsd-x64@npm:0.25.2": "6cdfb6c6d6f6ead324a9ee75ab1068305672207cf1d3189bcf5599ec158e0eb07d74ff63597e389777163b4399da1cc6164b918a7ea9e798e7fd45eee6aad9bb", + "@esbuild/linux-arm64@npm:0.21.5": "1b95b17ed94eb977e38ea9130e677551b7cf0ccccdb3f23a9f8b59b5d67400817c2a417e4f043295bd3f67796853da2a1b1a8ca201ffe745efb40a144dfdc99c", + "@esbuild/linux-arm64@npm:0.25.2": "a0d51ec6e91e97461916eb6c25b12a8ea6b58ec2f3d91199c0c3f02ec569e98ff1389700250d4664d8394d3d5b5a051d695b34bfe77ab4a12985dfc18f315b73", + "@esbuild/linux-arm@npm:0.21.5": "6bfcd098ada5e6117d028777e5cc58456c2f570157fa0a0dce30c9d05b8389b86f74bf6b862534bf6994d342946c98b6774e1820880fd289765864b668e94c17", + "@esbuild/linux-arm@npm:0.25.2": "5a4cf4045a2a5949dc8875dbad9a82fde7333d3f59b66d8cb614b34b76a7fb715a8d74e41f0788104bcef0436108ca548d71a543f582073e0458e20370dbb802", + "@esbuild/linux-ia32@npm:0.21.5": "73c249c9918f0c9a9268ffe14fe745f5e7564b309dcea213da08a5e4367ffdfc8df4b004c70f80269dce0f653a3280cfdd8bf9a7a616b5b60649e4faea6e69b5", + "@esbuild/linux-ia32@npm:0.25.2": "535c1755ed95a47b05b865361d2efbef3490f05815743c0d2372f55a2e14f0cc1d5ed6e5dd6f91c7aea871ea2f64cea021eea6e714027148489c54edc6e2b19f", + "@esbuild/linux-loong64@npm:0.21.5": "60977efe24b3b6e1461d49da07dd57c1234992b9d2e6ac7d0dedfee538321d42be25e496ffb193121d3a6c6ca6ea6722b880e95695824dcc6643a3d9426b2296", + "@esbuild/linux-loong64@npm:0.25.2": "8ff82f5cdd7a9490dfb3be64c990841d2a8e1a0ce83d76fa8d5e9b0ba7aa91ca725f338ff43b4d69a18744905f1730adf87a7f8359ae839030663e0bbe2807e2", + "@esbuild/linux-mips64el@npm:0.21.5": "20fb6c8f6e58f66cd4351034858b2ad85bda4144576b180979305cfabed43780a71934e9f176e476c719f14e37253b231a43d46638ad232989d5f4dd72ec6b75", + "@esbuild/linux-mips64el@npm:0.25.2": "382520bf655329d04f65e041f9bf774d11a2232bdf5125934732db915c179b1172ec3429722d9f02f46ee5bad7b70372872bfd003d7c1cc5ec95b7ca6ec8a983", + "@esbuild/linux-ppc64@npm:0.21.5": "69f2ef1d127f48bc14cec479ae1a96dbf5fea651e0a3f148486f73495d2acb91acdaa164cd80648844916f05e7f9f9665a1864dd394e7f9acf96bea70937e6b5", + "@esbuild/linux-ppc64@npm:0.25.2": "c5736195867e9c441cabd0a2cbaa62f91c4e4963ed7490018d09a932d549e1d281411ddf9dbd4a4b68f0c0298c1321ba15fd4e493cdc3dea3e14b7a6207b12f8", + "@esbuild/linux-riscv64@npm:0.21.5": "60c749d87c0f67cc67c5cc0d82aa597b7a807bc52510a16960337433bdbc8fa9f3c46eba98080106c0971e404e2250ca11c441bb4ae5b7a7d78b4095e3a70363", + "@esbuild/linux-riscv64@npm:0.25.2": "c72879775daded232fb2e36a6fe26058ec1ccd1f5dd6a76b4e8da700c6dd20cb15b684bce34569cadd41f25a0a53bd2037994279856bb3148f8c16055adcaf68", + "@esbuild/linux-s390x@npm:0.21.5": "a14ff0484b962b374fd1e4662a53f8dd8999ba39fcf891f15631dfb2802c8d18893d6e366c42d28d55885e5804b7d6252c0e3cee038c241285c9b537ef12b4ae", + "@esbuild/linux-s390x@npm:0.25.2": "d8810561312c4c7705f3c580ef8cd38e2768feb19ebf2899595a227f59dfb6ca35182f8ad7ca65d503cc5d9c688fe742002243387aa09b98b8c32aabc522ac4e", + "@esbuild/linux-x64@npm:0.21.5": "9e5663fcace9c8456e9934a9ed6e7428db4080024eef3bfeaf82d476120bd881382c958be2785463d6b44467b3d3f870d6cce09a9cb37bcef19afeb97814d674", + "@esbuild/linux-x64@npm:0.25.2": "32c8a5f7d0640655ebf60f379ee2b037fe83f3f0edad911a9098505e6ac589c5f2873ff441017183626a19d334e3bb59f58411f2d5474eb7222917575593abea", + "@esbuild/netbsd-arm64@npm:0.25.2": "0b7f77ec46163feac839b17b94e7db87edf61441bd9a67115722bf72781021c8220576a2e2c70bbca45b89a1e69a6b132f5489b59e84241b197272c1ee080304", + "@esbuild/netbsd-x64@npm:0.21.5": "3cb6115c4557d653c7ad6d2be5b4ed7a688b14d85b7b7108a1a57dda0b2cca3f8ed13560fa6639da8788f860b75eb714a17cfb7ba8f967e93bdf40c9b3a1cde1", + "@esbuild/netbsd-x64@npm:0.25.2": "6d6686f5d2eb79b042bd4f38dc95e73a8e290a057be1b6afc42867830c9cf2313600b4fd53287f2f418c9f454bf5df02154b16dcfbfc33a6eb2ce9722a4eecc1", + "@esbuild/openbsd-arm64@npm:0.25.2": "8a08c16440c6389623bbacb717412635aff61a1552c917e707d71da1dc92c618eea9a9aa1606a4a4f322216f100ede658523baec2e82b1f11b4efd523d491173", + "@esbuild/openbsd-x64@npm:0.21.5": "1caf0b502d6e2612ffd3e62589de2b9cd48cd742818746011d437e2d5787df4984f7c17b7a536aa20f12d04e519c859d755a7b57e6db0ed277054bd9c1036e85", + "@esbuild/openbsd-x64@npm:0.25.2": "43baf3248bb460e169cb1b5f26f5eb720088fa0d467c77f4f72c6cfa8e6d7b7794c52ed5e4a9a2113db53313c5fec86e352c94939abf601ab22d5e6e9addc4e5", + "@esbuild/sunos-x64@npm:0.21.5": "676da7301c7c600bb7de2523ecf5d877128da3c125fd8136533f5be38ca15d9f800b2fbbd396ca37d44c5daa51b8124d8a4728bb18245cd2becb3191b897c45a", + "@esbuild/sunos-x64@npm:0.25.2": "0babbb99d3bc3ed818b2b01fbf65ebbf5930defb850e5a5a94a3ba5fc7bc2463d561c07af0d3ac6d6d0197c86682750ceb47abf7d293dd3222b1bd33da9f8aa5", + "@esbuild/win32-arm64@npm:0.21.5": "9b2ab87429efd3c2697dc5c7948ea57b57757b6e4709469e773b73cd5fe4b7fda5912073f4c3bdf9d0346b8f3ae443367a63bcd51de24fb81b9f592712eb3366", + "@esbuild/win32-arm64@npm:0.25.2": "205aab6fc7b0ca7ee992cd24d73550110c1f79dc2ca724384bb52aa95111248df022375cd648314bd7eeb42083d576c55572f3d39d4ddcd82fc7372f1e7688b0", + "@esbuild/win32-ia32@npm:0.21.5": "c1fe3276507d82202c464cd4809e67e6f151e29ed9de05c32d086dfe30207db15e646911ebc7f50df659891bfee292a25062792c589c2ff769be238c6b5fb8be", + "@esbuild/win32-ia32@npm:0.25.2": "aa38c0e082e3111e84929a64638cce1c3e1114218726e41c99bf239f2c05be94fb6fe1083366aa342bbd8e75fd449a6a3bcae9b6b3b84066a3a3882dcbaa0090", + "@esbuild/win32-x64@npm:0.21.5": "5d7b28baa9c22684d35ec0515f6d36f8f583f26733c8e84c7f78edf17b8a7d133819267486f2fd66f20ca3a810896f11c3c81106d745040c2f07ade314846bf1", + "@esbuild/win32-x64@npm:0.25.2": "2f2d147c610a3c3ab0f0f97132e4421464d3d38b835d989e8c324b7397e2592cd05485ec1998ae352f06d3191dd1d71c24f94f63f7c70cd8ea8a4c85441502a9", + "@libsql/darwin-arm64@npm:0.4.7": "161ac6b537e39e33c65a7f06c16152ccd5077129b8321b5d0082e008054c47dbc32563d39a47e223d09994457211582ff3760ffa5523f2dd3cfac1dd726a577a", + "@libsql/darwin-x64@npm:0.4.7": "45c85d00566507f19474f9ae4b6453fa8fff10994147751df2dd2177edf9961520af54156d2d41b23cdfaaf2b219ea4ebd4b44a868e890088fc2283c1224752b", + "@libsql/linux-arm64-gnu@npm:0.4.7": "c4126b0d717b45a8d1d66797bd7447fdaf53631277dac0250e0aa0267e279493b114b3823407e49da0e2928d6595d3a28370acb99c43424e8bc7e11434cae5f8", + "@libsql/linux-arm64-musl@npm:0.4.7": "13eef982caf2b73cebabde76b8e209ddea27d2ff0e6228a56704a50ad41975ff03a15d90bec6ccc908cb16355d685903719676f7a91c92d20a68eecff4a4f0b6", + "@libsql/linux-x64-gnu@npm:0.4.7": "524bf04f98f7a91e343b294262a627a965f626082b63b998c8019d105380caa2435e240f6085103751f87919ac2415aba97075696822915bf1a4e4492d9376f5", + "@libsql/linux-x64-musl@npm:0.4.7": "227cddb499cbbf677c1dfaeeb8bd787d4c6d4cbf50c94ac1632348f26b412d2f8bacdb0131050c507d1961f96f8bbff2d8b7949f26f1dcebb61e115da9253aa0", + "@libsql/win32-x64-msvc@npm:0.4.7": "2fcb8715b6f0571dec145eaaf3fd53c7c5aa5bf408fe1be9d84b10adc8a909bb6ee60b45e0d7052b0c1722c30ac212356a3f1adcdf7f57d5a59b48f36ca5bdf5", + "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a", + "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79", + "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b", + "@parcel/watcher-freebsd-x64@npm:2.5.1": "cbd2b7884bc92422edabc0c74c3fbc06512bb7300fc137aaff2e96f46f61e5272265a0b5d230acc82a0e777b0c11661f0b8b7f89a9342c0920b752436dd2c750", + "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "f2e1ec14dbb0f85a84a75f55fd7721598694976ba3ad439832b57e558b0d9240cc80ff83053fb8cf7caffb0592d51bb39d325112763ec1734924b49d4ba9c144", + "@parcel/watcher-linux-arm-musl@npm:2.5.1": "83344c7ecda2e79db59d711bcee0c3fa26922989139c031bd762cf3d5bfb191797e22e9ed6072690b822dfd62629623ba4e7eedb3c41930a987fc3d4106000e1", + "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "562231feb159a294752378bebecc69a2d33366a9d877835844578799f8536398006e0e570849f9e2db04085a3ea82131459cd10fd6b42dea10cd73bd0c9ca13e", + "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "f62db52a90ebbaa29ca9900e6b9bd3fc6e5c650741bbde9a2742cbc332c678b753fc6a596d67659394fd9262aa826463ea667d18cc554bcaaac9e8da1a2a29d0", + "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "425e557991fde5092d6a9e20be71810600415e5fa157dca0b39bd8db86653d3ee7b037305261c8782d1a065f2a64d235e17b57876b26f5bb0dd7a9bdbe364690", + "@parcel/watcher-linux-x64-musl@npm:2.5.1": "4dbb066ba9478c8b8de39e3c1083cbb74f86f03eaf4445603e69909d6c072134644316faa20a2445419b9fe1a8063ade7b5331a5766d807ee0b15b8a70c59a2d", + "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628", + "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c", + "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963", + "@rollup/rollup-android-arm-eabi@npm:4.40.0": "723053f558eaeeb0a1fbf3b3063b930d3b1267a6aba211719927b0467f48513a514a05391689298a64624e98daa005e4685ef668787ebc228fd0527a5f17b419", + "@rollup/rollup-android-arm64@npm:4.40.0": "2562821c7032d2d95b891f47f02291d714d072fd91b3dbd07c528a7543f5e7d2458903cc38829feec311f1ebca6e34624262ae2e10aa32a0532b83c564db94cc", + "@rollup/rollup-darwin-arm64@npm:4.40.0": "cde6c2f4fe819131f65f5d19f8d1fd4889a4b8cc130cb30582fde72c79e388ef4644f57c7b03f453d4048043524ca067d5e2b4b505a5568840c73021fb74b572", + "@rollup/rollup-darwin-x64@npm:4.40.0": "28c269104ff10f0ab87a30c93139662780b0b6b4877a95cede7d66e833d478d1eb2f5aa275f60decb8383b2c05161f315902ad8fa1a52fa76283a05ceb32bf6b", + "@rollup/rollup-freebsd-arm64@npm:4.40.0": "27e99df8d1c5f0dfaead8fa6ce3025c5f959b4803e7683d95183761b1ecada4d877bd7f36465c424657ef650eac6199ddcf4911eda6367555633819454a5548d", + "@rollup/rollup-freebsd-x64@npm:4.40.0": "3422ce75f0fe774925763b1b63dded9aee56038d167af0b7f8ca0e468a8fae86d6a8aecd0b86a79718b8fc78c5ad987ba5b98be17b95fdcd48e4307749376e1b", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.0": "b32cd2a73db75926722dfd42a6c5c6f2f1631f70a8d261317a0ce54e2c5dcee849c0a59cd85de0c0c7bbea9defb4f6649b1354871e6ac7f637cc22673d1486c1", + "@rollup/rollup-linux-arm-musleabihf@npm:4.40.0": "1c1d95fe81ee31d0d9cd75258865d35d2afccd8255b856c0da9a3c8afa012feb6b9557d1c234af8f4cc5dfd9d397564c650fe2e8769cb4407f626058c2e19d9c", + "@rollup/rollup-linux-arm64-gnu@npm:4.40.0": "a8d071163d135e992023a374660a72cc94af4d77a711e7720d4e3fc544a7af037add4839ef8d061503e5320ee80defd35b43a68cebad0105d16cfd870387934c", + "@rollup/rollup-linux-arm64-musl@npm:4.40.0": "5582761d9426caccee50beb1fdb06ebb16fba540eabde06e21d18f59667f7c6c99ca0c2743d1b9cdb54a3d0b28445befad52c76412632bf0d79f280022acc630", + "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.0": "6d65384886c655b4a9190a2c8e3cd99d7049d13864be0f9b06c32a23ba1242bd09be0e9cba9425898a48b41bba52eb98223e34e3943924370a68f7c7800f66b2", + "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.0": "ebe38407efd0e45e92f939fe725e64695096c4389747b81f241e8a5d655526615e81512f3d61deae6aaf60669328a9bc93ac352351d6ccf8f1746caeb44bd7ab", + "@rollup/rollup-linux-riscv64-gnu@npm:4.40.0": "32cc2e2d03eadca60f42ba14af9723584c1ef7ee29f8a79578aacd9ce17e287d1f841aa926278d4b7cbf0f6d054c4ec045873a24c67279ca37f20e999f24bd4e", + "@rollup/rollup-linux-riscv64-musl@npm:4.40.0": "507c785bde98633f0139baccce0635047d43b19fb1d1fc770d4d88b11ef62b7885b0dac51a42c5f3e05bc0a56480928ae6304898884f0b5b0e56ad0cc98920f6", + "@rollup/rollup-linux-s390x-gnu@npm:4.40.0": "e464366194da4d1a72fc5ecce6c59027004b878fc36114f2d7c25812da5fe1885c29eb14d7bb318a4bb3242a99e772f7713da22f7f2d93f4b6e6a3e012f3d1f4", + "@rollup/rollup-linux-x64-gnu@npm:4.40.0": "b472cd5acd066a60bd970865be1b229ca4c31a658a5c0277b6f441396243a20c535502a0ea7ea0dca6d12e2ccf53324b7e94c0d32a4f81f0b9866fd6cc3aff5a", + "@rollup/rollup-linux-x64-musl@npm:4.40.0": "f553ef17a801559ca9418eb57dd9621884bde4d0d9f01292d9bb84de271efbf4ba737ddaf78a710edd6138528f3d8e2b3d6ba1a969c9e34624ad4266bfba39db", + "@rollup/rollup-win32-arm64-msvc@npm:4.40.0": "f14da0ce3062084d81fd42432ddf6c3cd869b4c48dc1acd803bc151bc3b508dbd290d60624ab5507d691b9e53bec81a508b61688304f171088549067ec86445d", + "@rollup/rollup-win32-ia32-msvc@npm:4.40.0": "e6849d8cb8c276681f558b8212d58340488814e697486d9d125c1191479a4819387f681945f59c2b9fdd40020403cb72a099906960625da65d2114cf3df701e5", + "@rollup/rollup-win32-x64-msvc@npm:4.40.0": "347f3af8176858afaec0f4f0d7951d4cda81f77c30e8260c678a11809bcdee0542762f27f6a4194562c2a8a6321a774ea523216ed8cf105e041eff7498443f28", + "@swc/core-darwin-arm64@npm:1.11.21": "6f228ce5497f8b797d9b838af6d51c8fc27d1643d13b033ed762ab5247047da91efa3e61f38040b5ff326bfb6af0ed663f5ec8319574db1c0e355d64c9c2b665", + "@swc/core-darwin-x64@npm:1.11.21": "8f7fcf910f17ab6d30fe55d7498f0ff2ac47e1e0fad749e01151891d5257f49c6354dae31917cc5097230940f9a068fcd981441e7c9581b1373e9e9c4d1ff9aa", + "@swc/core-linux-arm-gnueabihf@npm:1.11.21": "5f0d964b13b3c138fe0b3249b852db4330707d4584ed5d5b0b71fb72023e3b35f3faa88c6b8f49970f7adee57976e7e1fc9115be194b91f435249b6531602e1c", + "@swc/core-linux-arm64-gnu@npm:1.11.21": "203995730e55bfe640055a7adbb0c6b133c698aa018394d0338d00d311b10f874e46cdc0579585fb443505a3361b3da185436ad9fea553ecbed697a4f810ea7e", + "@swc/core-linux-arm64-musl@npm:1.11.21": "9618139c32eefd5acf184fc0c5e09986f170cec1069296a274c32b694a5a2129ae7aa21b8d016d5c186574929f05d456c6f4babdd0e528021dee4c51605da2d8", + "@swc/core-linux-x64-gnu@npm:1.11.21": "886a4f4a3ad6d0d3b437a250bf36b0395b34f4731381ce1cbbe43b05fb7ab4aa12a23c3f0e33bc4b2703ebcdad9a7e3fc18b7481a79e372ecc331c1e3eca1437", + "@swc/core-linux-x64-musl@npm:1.11.21": "069f33ba7b9376494f7345efed1c845e201857bbe5ba165ca8026760989344eaf0e5efbbc7f711a6c776385aa5ad383cee75543687c024854acb296c4e4752c1", + "@swc/core-win32-arm64-msvc@npm:1.11.21": "05ea5df6614075ec8487a91cb047a30aebeef3f142232a2feb0a475c85f2d64a876aef4183849f43480b9b5786afad7b3cb2bc1f53060d71ab6ff439a71317f3", + "@swc/core-win32-ia32-msvc@npm:1.11.21": "ad1ba754c36131238f2ac8ec51ffc4b987888b45b3008c0fbdd31d85d6fc039f8dd9c5d188c24cb72c4f4f345090a4dcfbcbfd840e954b7aeeb2974e0baf0e4a", + "@swc/core-win32-x64-msvc@npm:1.11.21": "0fb0c108c2e4a3bd82251f7552c9daa8c243829617bee7d954d1b0e021214184ead5c08dd108b3a5ac2d501797db794246a25867970ef2082f844f47b5b25070", + "dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7", + "iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43" +} diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 4cbdfcbe5528..19510bf703bf 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -1,9 +1,10 @@ { lib, - stdenvNoCC, + stdenv, fetchFromGitHub, - cacert, - yarn-berry, + yarn-berry_4, + nodejs, + python3, electron, makeWrapper, writableTmpDirAsHomeHook, @@ -12,64 +13,51 @@ commandLineArgs ? "", }: -stdenvNoCC.mkDerivation (finalAttrs: { +let + yarn-berry = yarn-berry_4; +in +stdenv.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.1.10"; + version = "1.3.4"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-rTIUBlQemYOAT0NRS80FcZfEc1Q9jUmlMU5YW99z0QE="; + hash = "sha256-xCS8ZomIAVEnQ2SJRay/ii7xhPMO+ctc8C14Xrje8kI="; }; - yarnOfflineCache = stdenvNoCC.mkDerivation { - name = "${finalAttrs.pname}-${finalAttrs.version}-offline-cache"; - inherit (finalAttrs) src; + postPatch = '' + substituteInPlace src/main/services/ConfigManager.ts \ + --replace-fail "ConfigKeys.AutoUpdate, true" "ConfigKeys.AutoUpdate, false" \ + --replace-fail "ConfigKeys.AutoUpdate, value" "ConfigKeys.AutoUpdate, false" + substituteInPlace src/main/services/AppUpdater.ts \ + --replace-fail " = isActive" " = false" + substituteInPlace src/renderer/src/hooks/useSettings.ts \ + --replace-fail "isAutoUpdate)" "false)" + ''; - nativeBuildInputs = [ - cacert - yarn-berry - writableTmpDirAsHomeHook - ]; + missingHashes = ./missing-hashes.json; - postConfigure = '' - yarn config set enableTelemetry false - yarn config set enableGlobalCache false - yarn config set --json supportedArchitectures.os '[ "linux", "darwin" ]' - yarn config set --json supportedArchitectures.cpu '["arm", "arm64", "ia32", "x64"]' - yarn config set cacheFolder $out - ''; - - buildPhase = '' - runHook preBuild - - yarn install --mode=skip-build - - runHook postBuild - ''; - - outputHashMode = "recursive"; - outputHash = "sha256-GVIa8/rNdYTcPYqaRZp8VGKeh0IiNttXzJEVvCpCAQo="; + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src missingHashes; + hash = "sha256-cStjxlmOnoDfrt6z5jvpkHfIKyfZ9UFWbbZjnJLiTu4="; }; nativeBuildInputs = [ + yarn-berry.yarnBerryConfigHook yarn-berry makeWrapper writableTmpDirAsHomeHook copyDesktopItems + (python3.withPackages (ps: with ps; [ setuptools ])) + nodejs ]; - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - - postConfigure = '' - yarn config set enableTelemetry false - yarn config set enableGlobalCache false - export cachePath=$(mktemp -d) - cp -r $yarnOfflineCache/* $cachePath - yarn config set cacheFolder $cachePath - yarn install --mode=skip-build - ''; + env = { + YARN_ENABLE_SCRIPTS = "false"; + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + }; buildPhase = '' runHook preBuild @@ -91,21 +79,27 @@ stdenvNoCC.mkDerivation (finalAttrs: { exec = "cherry-studio --no-sandbox %U"; terminal = false; icon = "cherry-studio"; - startupWMClass = "Cherry Studio"; + startupWMClass = "CherryStudio"; categories = [ "Utility" ]; + mimeTypes = [ "x-scheme-handler/cherrystudio" ]; }) ]; installPhase = '' runHook preInstall - mkdir -p $out/lib/cherry-studio - cp -r dist/linux-unpacked/{resources,LICENSE*} $out/lib/cherry-studio + mkdir -p $out/opt/cherry-studio + ${ + if stdenv.hostPlatform.isAarch64 then + "cp -r dist/linux-arm64-unpacked/{resources,LICENSE*} $out/opt/cherry-studio" + else + "cp -r dist/linux-unpacked/{resources,LICENSE*} $out/opt/cherry-studio" + } install -Dm644 build/icon.png $out/share/pixmaps/cherry-studio.png makeWrapper ${lib.getExe electron} $out/bin/cherry-studio \ --inherit-argv0 \ - --add-flags $out/lib/cherry-studio/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags $out/opt/cherry-studio/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall @@ -120,9 +114,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { mainProgram = "cherry-studio"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; - license = with lib.licenses; [ - asl20 - unfree - ]; + license = with lib.licenses; [ agpl3Only ]; }; }) diff --git a/pkgs/by-name/ch/cherry-studio/update.sh b/pkgs/by-name/ch/cherry-studio/update.sh index 78609183ed43..ed7554177e66 100755 --- a/pkgs/by-name/ch/cherry-studio/update.sh +++ b/pkgs/by-name/ch/cherry-studio/update.sh @@ -1,8 +1,10 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq nix bash coreutils nix-update +#!nix-shell -i bash -p curl gnused jq nix bash coreutils nix-update yarn-berry.yarn-berry-fetcher set -eou pipefail +PACKAGE_DIR=$(realpath $(dirname $0)) + latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/CherryHQ/cherry-studio/releases/latest | jq --raw-output .tag_name) latestVersion=$(echo "$latestTag" | sed 's/^v//') @@ -13,4 +15,14 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then exit 0 fi -nix-update cherry-studio --version "$latestVersion" +nix-update cherry-studio --version "$latestVersion" || true + +export HOME=$(mktemp -d) +src=$(nix-build --no-link $PWD -A cherry-studio.src) +WORKDIR=$(mktemp -d) +cp --recursive --no-preserve=mode $src/* $WORKDIR +pushd $WORKDIR +yarn-berry-fetcher missing-hashes yarn.lock >$PACKAGE_DIR/missing-hashes.json +popd + +nix-update cherry-studio --version skip || true diff --git a/pkgs/by-name/ch/cherrybomb/package.nix b/pkgs/by-name/ch/cherrybomb/package.nix index ea40863dd6b6..b1ea2ba7875a 100644 --- a/pkgs/by-name/ch/cherrybomb/package.nix +++ b/pkgs/by-name/ch/cherrybomb/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-j9CT2HHFY4ANWKvx8t/jgCc3aOiSEJlq8CHstjSc+O4="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "CLI tool that helps you avoid undefined user behavior by validating your API specifications"; mainProgram = "cherrybomb"; diff --git a/pkgs/by-name/ch/cherrytree/package.nix b/pkgs/by-name/ch/cherrytree/package.nix index 08aa96f13bae..3004d14356a2 100644 --- a/pkgs/by-name/ch/cherrytree/package.nix +++ b/pkgs/by-name/ch/cherrytree/package.nix @@ -1,13 +1,13 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, cmake, pkg-config, python3, wrapGAppsHook3, gtkmm3, - gtksourceview, + gtksourceview4, gtksourceviewmm, gspell, libxmlxx, @@ -19,15 +19,15 @@ vte, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cherrytree"; - version = "1.1.4"; + version = "1.4.0"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; - tag = "v${version}"; - hash = "sha256-JiSGoEVGotaPqEKFHjTagi+sZPgdX+tKI0FIHRmJKHE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-X87L3oSidnXH/IIHtVbeIn0ehWkSgrAkX0+TUGQomV0="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtkmm3 - gtksourceview + gtksourceview4 gtksourceviewmm gspell libxmlxx @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { vte ]; - meta = with lib; { + meta = { description = "Hierarchical note taking application"; mainProgram = "cherrytree"; longDescription = '' @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { a Cherrytree document where you can easily find it. ''; homepage = "https://www.giuspen.com/cherrytree"; - changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${version}/changelog.txt"; - license = licenses.gpl3Plus; + changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${finalAttrs.version}/changelog.txt"; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ch/chess-clock/package.nix b/pkgs/by-name/ch/chess-clock/package.nix index addadc9dfcc6..353a94422c17 100644 --- a/pkgs/by-name/ch/chess-clock/package.nix +++ b/pkgs/by-name/ch/chess-clock/package.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/World/chess-clock"; license = lib.licenses.gpl3Plus; mainProgram = "chess-clock"; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; }; } diff --git a/pkgs/by-name/ch/chess-tui/package.nix b/pkgs/by-name/ch/chess-tui/package.nix index e914e3c88cbc..fba36ad6acdd 100644 --- a/pkgs/by-name/ch/chess-tui/package.nix +++ b/pkgs/by-name/ch/chess-tui/package.nix @@ -4,25 +4,30 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "chess-tui"; - version = "1.2.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "thomas-mauran"; repo = "chess-tui"; - rev = "${version}"; - hash = "sha256-LtxaZ/7p/lqStoUmckVVaegQp02Ci3L46fMFEgledj4="; + tag = finalAttrs.version; + hash = "sha256-L7SaWNSS5tn8OyKTPixTtlMB+OmVd9I0VXtasQMI5GI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Ydn/y7HF8VppEjkRy3ayibgxpcLc1NiHlR5oLi3D11A="; + cargoHash = "sha256-u3Di/vTKbyehmNbTlMZPNRejgK9jYROQv8qdz2XT4Bs="; - meta = with lib; { + checkFlags = [ + # assertion failed: result.is_ok() + "--skip=tests::test_config_create" + ]; + + meta = { description = "Chess TUI implementation in rust"; homepage = "https://github.com/thomas-mauran/chess-tui"; - maintainers = with maintainers; [ ByteSudoer ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ ByteSudoer ]; + license = lib.licenses.mit; mainProgram = "chess-tui"; }; -} +}) diff --git a/pkgs/by-name/ch/chez-matchable/package.nix b/pkgs/by-name/ch/chez-matchable/package.nix index 1b595f432ce5..86c3095fe375 100644 --- a/pkgs/by-name/ch/chez-matchable/package.nix +++ b/pkgs/by-name/ch/chez-matchable/package.nix @@ -7,12 +7,13 @@ stdenv.mkDerivation rec { pname = "chez-matchable"; + # nixpkgs-update: no auto update version = "0.2"; src = fetchFromGitHub { owner = "fedeinthemix"; repo = "chez-matchable"; - rev = "v${version}"; + tag = "v${version}"; sha256 = "sha256-UYoT8Kp1FTfiL22ntrFXFcAB1HGVrJ6p9JgvhUKi+Yo="; }; diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix index 52ac003255ed..f67861648dd5 100644 --- a/pkgs/by-name/ch/chez/package.nix +++ b/pkgs/by-name/ch/chez/package.nix @@ -16,19 +16,17 @@ let # x64 darwin fails with invalid memory reference with clang-18 & 19. # https://github.com/cisco/ChezScheme/issues/896 - stdenv = - if args.stdenv.hostPlatform.isDarwin && args.stdenv.hostPlatform.isx86_64 then - llvmPackages_17.stdenv - else - args.stdenv; + # aarch64 darwin fails to execute `system` calls with clang-18 & 19. + # https://github.com/cisco/ChezScheme/issues/928 + stdenv = if args.stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else args.stdenv; in stdenv.mkDerivation (finalAttrs: { pname = "chez-scheme"; - version = "10.1.0"; + version = "10.2.0"; src = fetchurl { url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz"; - hash = "sha256-kYGmyMSrXl0y2Hn/FZ0zWlDU+LOIYRriKiY+kyw1OYs="; + hash = "sha256-t5WRbUz+1ZJAxfRLG1B6hlfv0o5i5y4TTQNIbp8+N0o="; }; nativeBuildInputs = diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 736a8005dca9..e292d3f8ccf5 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.60.1"; + version = "2.62.4"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-Rfh7b/G/6oIc+m13ReLOn8OdQ5SvV0Jt1vxpwAKRJyI="; + hash = "sha256-GVUPW5zEuactbonqdJhn0C+Ru2v0J883Waj+IgaConQ="; }; - vendorHash = "sha256-G+xntx8Igz2NiG7jwC5nP2QOCrPEyHOgVUxfrbRSOp0="; + vendorHash = "sha256-rTrA0ZoHWl2yL+4Wv+SkyJy6cw0cg4BGHMrZsMDVH38="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 84069c8123d7..3fad85b9913e 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2025-03-27"; + version = "0.4.0-unstable-2025-05-09"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "906aa9704dfd131fabbcb3ae2dbba33b7cc2a5da"; - hash = "sha256-oRo26GB28wQ5gx+EgN/xyvOyA4IaObG0np05bFlJsF8="; + rev = "69a96dc0b3a9e01999e9d0d7feb9e1bf8a0cfa4d"; + hash = "sha256-M7c+ym12FmXALqENCIb24s3I+/pzLE82ORyr/DmFsUY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chirpstack-concentratord/package.nix b/pkgs/by-name/ch/chirpstack-concentratord/package.nix index f01d68e48672..528c4af854f5 100644 --- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix +++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage rec { pname = "chirpstack-concentratord"; - version = "4.4.7"; + version = "4.4.8"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-concentratord"; rev = "v${version}"; - hash = "sha256-RFjBeFGK0HzRPeCCU5Un3c3XSg8hmXo+7DWP6tfsDgw="; + hash = "sha256-koEzUTbeuTjeoHmZc6hP2cZM66d0toI9YExGRtDjNBQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-phTYdiVxeC6eOBzz6RvgrSN56+RRcXUiktxNzy/qLY0="; + cargoHash = "sha256-JRcVigA5yDsW4otPMvi3udjasQWQNrWJQ6zd6XXyQIk="; buildInputs = [ libloragw-2g4 diff --git a/pkgs/by-name/ch/chirpstack-fuota-server/package.nix b/pkgs/by-name/ch/chirpstack-fuota-server/package.nix index d81d9ccb284e..8b7f88257f9b 100644 --- a/pkgs/by-name/ch/chirpstack-fuota-server/package.nix +++ b/pkgs/by-name/ch/chirpstack-fuota-server/package.nix @@ -3,7 +3,7 @@ buildGoModule, fetchFromGitHub, versionCheckHook, - nix-update-script, + unstableGitUpdater, }: buildGoModule rec { pname = "chirpstack-fuota-server"; @@ -32,7 +32,9 @@ buildGoModule rec { "-skip=TestStorage" # Depends on external database server ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = { description = "FUOTA server which can be used together with ChirpStack Application Server"; diff --git a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix index 16f2cf22ffa7..201b76b285e5 100644 --- a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix +++ b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "chirpstack-mqtt-forwarder"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-mqtt-forwarder"; rev = "v${version}"; - hash = "sha256-jbu8O1Wag6KpN49VyXsYO8os95ctZjzuxKXoDMLyiKU="; + hash = "sha256-JsRhgSEA5xdpeljdA9/h5bVGytt6rIvX3FqI6ZiCLys="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ks92eXKWWiEIhNhEMMN2VH970u64nBWLGObOda74c0o="; + cargoHash = "sha256-6kN4ml7JVW6Ygw9+wg79h+1zv/HPNjTw1FZlOOl7jGc="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix index 7abde58978fe..5f2591fbf0a1 100644 --- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix +++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "chirpstack-rest-api"; - version = "4.11.0"; + version = "4.12.0"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-rest-api"; rev = "v${version}"; - hash = "sha256-yYuSciMsQudGqBPNqj28TZgCGtZb9j7mtEkBR8tbEm4="; + hash = "sha256-0OeWrE+9YJTf72+1KTpySutjlY53QYqSdl8bwS2MY10="; }; - vendorHash = "sha256-UZ1todyWnxRTnqEGc/2rM+JCZPWYG/WA+OnivpB6JGI="; + vendorHash = "sha256-5fP2v5JTsBkJ1SLx94HWLKwf5Jb3desLen3VxwER9vE="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix index 6c07e39e421a..f8b2355d0e2a 100644 --- a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix +++ b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "chirpstack-udp-forwarder"; - version = "4.1.8"; + version = "4.1.10"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-udp-forwarder"; rev = "v${version}"; - hash = "sha256-Snj5nKyFsq8WJJNw1d8O/YX/dZ/tCTVBw5R8kXJvsa4="; + hash = "sha256-71pzD1wF6oNgi2eP/f/buX/vWpZda5DpD2mN1F7n3lk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ntY0Ze9MlbdRnmzA5AJN4Hjlhv18Iboj83gba8A4xHw="; + cargoHash = "sha256-3RrFA/THO9fWfk41nVbFGFv/VeFOcdN2mWgshC5PODw="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/ch/chit/package.nix b/pkgs/by-name/ch/chit/package.nix index dc9fa955817f..218d867f4482 100644 --- a/pkgs/by-name/ch/chit/package.nix +++ b/pkgs/by-name/ch/chit/package.nix @@ -5,7 +5,6 @@ pkg-config, stdenv, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,13 +24,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; # update Carg.lock to work with openssl 3 postPatch = '' diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 61b8766d6501..73175713bbe9 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -8,7 +8,6 @@ cmake, ninja, ffmpeg-headless, - darwin, zlib, testers, validatePkgConfig, @@ -57,15 +56,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ffmpeg-headless ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreGraphics - CoreVideo - zlib - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + zlib + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_EXAMPLES" withExamples) diff --git a/pkgs/by-name/ch/chromatic/package.nix b/pkgs/by-name/ch/chromatic/package.nix deleted file mode 100644 index d5f3c194133c..000000000000 --- a/pkgs/by-name/ch/chromatic/package.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - meson, - ninja, - pkg-config, - rustc, - cargo, - wrapGAppsHook4, - desktop-file-utils, - libxml2, - libadwaita, - portaudio, - libpulseaudio, -}: - -stdenv.mkDerivation rec { - pname = "chromatic"; - version = "0-unstable-2023-08-05"; - - src = fetchFromGitHub { - owner = "nate-xyz"; - repo = "chromatic"; - rev = "ffaeb50dcce74bf3ba1b05f98423cf48f205f55e"; - hash = "sha256-E3v3UoQumBBYDOiXMfCRh5J7bfUCkettHth7SAresCE="; - }; - - patches = [ - # solve error[E0310]: the parameter type `T` may not live long enough - # in rust-serialize crate - ./rustc_serialize_update.patch - ]; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - patches = [ ./rustc_serialize_update.patch ]; - hash = "sha256-9fdOOkxs4L0sYZIRT9wbgp169mQc2IyFRZlAcOHcOcg="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - rustPlatform.cargoSetupHook - rustc - cargo - wrapGAppsHook4 - desktop-file-utils - libxml2.bin # xmllint - ]; - - buildInputs = [ - libadwaita - portaudio - libpulseaudio - ]; - - meta = with lib; { - description = "Fine-tune your instruments"; - longDescription = '' - Fine-tune your instruments with Chromatic. Chromatic - detects the frequency of audio input, converts it to - a musical note with the correct semitone and octave, - and displays the cents error. Cents are displayed on - an analog gauge to make tuning more visually intuitive. - Requires PulseAudio or PipeWire. - ''; - homepage = "https://github.com/nate-xyz/chromatic"; - license = licenses.gpl3Plus; - mainProgram = "chromatic"; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/ch/chromatic/rustc_serialize_update.patch b/pkgs/by-name/ch/chromatic/rustc_serialize_update.patch deleted file mode 100644 index fa56db4d5399..000000000000 --- a/pkgs/by-name/ch/chromatic/rustc_serialize_update.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index ab2add4..7740629 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1031,9 +1031,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - - [[package]] - name = "rustc-serialize" --version = "0.3.24" -+version = "0.3.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" -+checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" - - [[package]] - name = "rustc_version" diff --git a/pkgs/by-name/ch/chrome-pak-customizer/package.nix b/pkgs/by-name/ch/chrome-pak-customizer/package.nix new file mode 100644 index 000000000000..26f5711143f6 --- /dev/null +++ b/pkgs/by-name/ch/chrome-pak-customizer/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + cmake, + ninja, +}: + +stdenv.mkDerivation { + pname = "chrome-pak-customizer"; + version = "2.0-unstable-2021-06-24"; + + src = fetchFromGitHub { + owner = "myfreeer"; + repo = "chrome-pak-customizer"; + rev = "bfabc033207ebbd6e0017ce99500d3e379a0a3f6"; + hash = "sha256-MCGLbHSUPcO1nMUYCqRws4+hLGEaNjX9oqGzixw8VWY="; + }; + + nativeBuildInputs = [ + cmake + ninja + installShellFiles + ]; + + cmakeFlags = [ (lib.cmakeBool "LGPL" false) ]; + + installPhase = '' + runHook preInstall + + installBin pak + + runHook postInstall + ''; + + meta = { + description = "Simple batch tool to customize pak files in chrome or chromium-based browser"; + homepage = "https://github.com/myfreeer/chrome-pak-customizer"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ulysseszhan ]; + mainProgram = "pak"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ch/chruby-fish/package.nix b/pkgs/by-name/ch/chruby-fish/package.nix index 620a63c1fa52..6535c250477c 100644 --- a/pkgs/by-name/ch/chruby-fish/package.nix +++ b/pkgs/by-name/ch/chruby-fish/package.nix @@ -1,26 +1,20 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, - chruby, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chruby-fish"; - version = "0.8.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "JeanMertz"; repo = "chruby-fish"; - rev = "v${version}"; - sha256 = "15q0ywsn9pcypbpvlq0wb41x4igxm9bsvhg9a05dqw1n437qjhyb"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Lk6XvmKgEjXVjO3jMjJkCxoX7TGMxq3ib0Ohh/J4IPI="; }; - postInstall = '' - sed -i -e '1iset CHRUBY_ROOT ${chruby}' $out/share/chruby/auto.fish - sed -i -e '1iset CHRUBY_ROOT ${chruby}' $out/share/chruby/chruby.fish - ''; - installFlags = [ "PREFIX=$(out)" ]; meta = { @@ -30,4 +24,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.cohei ]; }; -} +}) diff --git a/pkgs/by-name/ch/chsrc/disable-static-compiling.patch b/pkgs/by-name/ch/chsrc/disable-static-compiling.patch deleted file mode 100644 index 470deb32e9c9..000000000000 --- a/pkgs/by-name/ch/chsrc/disable-static-compiling.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile b/Makefile -index 99065da..2415738 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,9 +16,6 @@ endif - ifeq ($(CC), clang) - CFLAGS += $(CLANG_FLAGS) - endif --ifeq ($(shell uname), Linux) -- CFLAGS += -static --endif - - Target = chsrc - diff --git a/pkgs/by-name/ch/chsrc/package.nix b/pkgs/by-name/ch/chsrc/package.nix index 571e6302d03a..d8c58669355f 100644 --- a/pkgs/by-name/ch/chsrc/package.nix +++ b/pkgs/by-name/ch/chsrc/package.nix @@ -1,33 +1,31 @@ { lib, - fetchFromGitHub, stdenv, + fetchFromGitHub, texinfo, }: stdenv.mkDerivation (finalAttrs: { pname = "chsrc"; - version = "0.1.9"; + version = "0.2.1"; src = fetchFromGitHub { owner = "RubyMetric"; repo = "chsrc"; - rev = "v${finalAttrs.version}"; - hash = "sha256-MwT6SuDisJ2ynxlOqAUA8WjhrTeUcyoAMArehnby8Yw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-yZjza4BSgRCOwc719iNdG17WVuLPUBJjZb6Yz4FsTcA="; }; nativeBuildInputs = [ texinfo ]; - patches = [ - ./disable-static-compiling.patch - ]; - installPhase = '' runHook preInstall + install -Dm755 chsrc $out/bin/chsrc install -Dm644 doc/chsrc.1 -t $out/share/man/man1/ makeinfo doc/chsrc.texi --output=chsrc.info - install -Dm 644 chsrc.info -t $out/share/info/ + install -Dm644 chsrc.info -t $out/share/info/ + runHook postInstall ''; diff --git a/pkgs/by-name/ch/chunkfs/package.nix b/pkgs/by-name/ch/chunkfs/package.nix index 60efcdf47667..5b7dd92b1745 100644 --- a/pkgs/by-name/ch/chunkfs/package.nix +++ b/pkgs/by-name/ch/chunkfs/package.nix @@ -6,13 +6,13 @@ fuse, }: -stdenv.mkDerivation rec { - version = "0.7"; +stdenv.mkDerivation (finalAttrs: { pname = "chunkfs"; + version = "0.8"; src = fetchurl { - url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz"; - sha256 = "4c168fc2b265a6ba34afc565707ea738f34375325763c0596f2cfa1c9b8d40f1"; + url = "https://chunkfs.florz.de/chunkfs_${finalAttrs.version}.tar.xz"; + hash = "sha256-HFv51ta2eNW9Qt9CUp2oTTlC8Lpwc1XKR/uYzMDfd88="; }; buildInputs = [ @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa"; - homepage = "http://chunkfs.florz.de/"; + homepage = "http://chunkfs.florz.de"; license = lib.licenses.gpl2Plus; - platforms = with lib.platforms; linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix index 0bd0e4c2e23e..3a66cd3c6a3d 100644 --- a/pkgs/by-name/ci/cider-2/package.nix +++ b/pkgs/by-name/ci/cider-2/package.nix @@ -33,7 +33,8 @@ appimageTools.wrapType2 rec { install -m 444 -D ${contents}/Cider.desktop $out/share/applications/${pname}.desktop substituteInPlace $out/share/applications/${pname}.desktop \ --replace-warn 'Exec=Cider' 'Exec=${pname}' - cp -r ${contents}/usr/share/icons $out/share + install -Dm444 ${contents}/usr/share/icons/hicolor/256x256/cider.png \ + $out/share/icons/hicolor/256x256/apps/cider.png ''; meta = { diff --git a/pkgs/by-name/ci/ciel/package.nix b/pkgs/by-name/ci/ciel/package.nix index 343c1e116317..98bfd6f8e185 100644 --- a/pkgs/by-name/ci/ciel/package.nix +++ b/pkgs/by-name/ci/ciel/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage rec { pname = "ciel"; - version = "3.3.0"; + version = "3.9.6"; src = fetchFromGitHub { owner = "AOSC-Dev"; repo = "ciel-rs"; tag = "v${version}"; - hash = "sha256-vV1qZLVVVc6KFZrpF4blKmbfQjf/Ltn+IhmM5Zqb2zU="; + hash = "sha256-J6mXNJuLkKVNzE5lRRQEOt0yb2ow5EctXkr22eqOfII="; }; useFetchCargoVendor = true; - cargoHash = "sha256-A52SV0Ng6exHEtlaZWBvVTEAqMKp6unQBhr1cozQTWo="; + cargoHash = "sha256-n9VCy3nlZ+WDm9krlc3XO/YgdrbEMJuODBvYRkznUgU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix index 09560bf7b55f..c2630a055d44 100644 --- a/pkgs/by-name/ci/cilium-cli/package.nix +++ b/pkgs/by-name/ci/cilium-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "cilium"; repo = "cilium-cli"; tag = "v${version}"; - hash = "sha256-/R91MFE7JYutq8mOKpzLNPlt42R86dOZGJs4EOkLfKU="; + hash = "sha256-9+nNZEXjSoNB/Ftn/CtoBcR/uaD71C1jzDEaEG3Wpb4="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 91cbc70496ee..9b1da3fea236 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.5.3"; + version = "3.5.4"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; tag = "v.${finalAttrs.version}"; - hash = "sha256-iGpLVsS8o8BqxEu63mZeeB49+lnYmdi2X5ISip89UDY="; + hash = "sha256-VCgMSIaQAcPH7DWUEfoJahCQDr49lzO7pUw1+NXHA60="; }; outputs = [ diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index 1252761cc1bb..567e51445700 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon-common/package.nix @@ -221,6 +221,6 @@ stdenv.mkDerivation rec { description = "Cinnamon desktop environment"; license = [ licenses.gpl2 ]; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix index 1b87565edaf5..64fc0d1f8f3b 100644 --- a/pkgs/by-name/ci/cinnamon-control-center/package.nix +++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix @@ -90,6 +90,6 @@ stdenv.mkDerivation rec { mainProgram = "cinnamon-control-center"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix index 1016119236ba..a58b09a422d3 100644 --- a/pkgs/by-name/ci/cinnamon-desktop/package.nix +++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { licenses.lgpl2 ]; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ci/cinnamon-menus/package.nix b/pkgs/by-name/ci/cinnamon-menus/package.nix index 4c423800bcdb..405987fcec75 100644 --- a/pkgs/by-name/ci/cinnamon-menus/package.nix +++ b/pkgs/by-name/ci/cinnamon-menus/package.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { licenses.lgpl2 ]; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix index 83f1072f95e6..50e97ecea209 100644 --- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix +++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation rec { licenses.lgpl2 ]; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix index 45dd7591357d..d332997cfcf1 100644 --- a/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/pkgs/by-name/ci/cinnamon-session/package.nix @@ -107,6 +107,6 @@ stdenv.mkDerivation rec { description = "Cinnamon session manager"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix index 76a2b434c81e..7a0753864cfb 100644 --- a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix +++ b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix @@ -105,6 +105,6 @@ stdenv.mkDerivation rec { description = "Settings daemon for the Cinnamon desktop"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ci/cinnamon-translations/package.nix b/pkgs/by-name/ci/cinnamon-translations/package.nix index b75620366732..36c3be20728a 100644 --- a/pkgs/by-name/ci/cinnamon-translations/package.nix +++ b/pkgs/by-name/ci/cinnamon-translations/package.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Translations files for the Cinnamon desktop"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 06ace97cbaf7..1e316ac71015 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -7,11 +7,8 @@ cinny, desktop-file-utils, wrapGAppsHook3, - makeBinaryWrapper, pkg-config, openssl, - dbus, - glib, glib-networking, webkitgtk_4_0, jq, @@ -21,19 +18,19 @@ rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.5.1"; + version = "4.7.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${version}"; - hash = "sha256-xWHR0lg/3w2K+hExKCD84hdQ7UCZRrOnH2dNybaYMFE="; + hash = "sha256-ls0ZxXiIrjyLL0MoxOTU/RK0k323nUiQfxtlwsEL45U="; }; sourceRoot = "${src.name}/src-tauri"; useFetchCargoVendor = true; - cargoHash = "sha256-iI0oWuETVVPuoKlWplsgocF7DEvwTVSp5r1WmQd7R04="; + cargoHash = "sha256-NSzGB6o6BBoak2gbSOu8ucWA+R+behuTxeMnKpyA7no="; postPatch = let @@ -64,31 +61,29 @@ rustPlatform.buildRustPackage rec { --set-key="Categories" --set-value="Network;InstantMessaging;" \ $out/share/applications/cinny.desktop ''; - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - wrapProgram "$out/bin/cinny" \ - --inherit-argv0 \ + + preFixup = '' + gappsWrapperArgs+=( --set-default WEBKIT_DISABLE_DMABUF_RENDERER "1" + ) ''; - nativeBuildInputs = [ - wrapGAppsHook3 - pkg-config - cargo-tauri_1.hook - desktop-file-utils - makeBinaryWrapper - ]; - - buildInputs = + nativeBuildInputs = [ - openssl + cargo-tauri_1.hook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - dbus - glib - glib-networking - webkitgtk_4_0 + desktop-file-utils + pkg-config + wrapGAppsHook3 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + glib-networking + openssl + webkitgtk_4_0 + ]; + meta = { description = "Yet another matrix client for desktop"; homepage = "https://github.com/cinnyapp/cinny-desktop"; diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index 66eacdb06d24..8bd7e28df524 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "cinny-unwrapped"; - version = "4.5.1"; + version = "4.7.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-uwazJSd9I80ExKv22Ycg/fBDGZ1GuW4pcBo83lUwhoc="; + hash = "sha256-x4cRZ0XfyvRqOWIqtsVBiIPDxC3J9SUdoReiWNUB/X8="; }; - npmDepsHash = "sha256-o5txGbuNl+ZMk5acu/0/5CTNTvdP+Tqyw7heFRaZ4lM="; + npmDepsHash = "sha256-s8dKMGwg6DL+aEq0Sk04VF1pSDpAW18Dok113xDWb8Q="; nativeBuildInputs = [ python3 diff --git a/pkgs/by-name/ci/cipher/package.nix b/pkgs/by-name/ci/cipher/package.nix index b93049e9d4d2..1db35c979473 100644 --- a/pkgs/by-name/ci/cipher/package.nix +++ b/pkgs/by-name/ci/cipher/package.nix @@ -58,7 +58,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple application for encoding and decoding text, designed for elementary OS"; homepage = "https://github.com/arshubham/cipher"; - maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; + maintainers = with maintainers; [ xiorcale ]; + teams = [ teams.pantheon ]; platforms = platforms.linux; license = licenses.gpl3Plus; mainProgram = "com.github.arshubham.cipher"; diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix index 93f2e791c8c2..763b862a5732 100644 --- a/pkgs/by-name/ci/circleci-cli/package.nix +++ b/pkgs/by-name/ci/circleci-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.31543"; + version = "0.1.31792"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0hikYA7oU3tTHZdEcxDzMXCg13+muk6V7MyqJwExm0A="; + sha256 = "sha256-0D0jCBE027zEQI/3iX4nF5ut8PS+nKuKhNf5+buazb8="; }; vendorHash = "sha256-H7q373HL6M6ETkXEY5tAwN32rx0eMkqRAAZ4kQf9rKk="; diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index b68b64dcd96f..33bea2f71e8b 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.111.1"; + version = "1.118.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-eOoUwYNQS83/uNfbbEPUbTf9aIjqc2vklIC3zi9U9KU="; + hash = "sha256-ZjJQkl9KgrCwxafHyQzX+wutl5FIdwHpKGaB5mlhdsc="; fetchSubmodules = true; }; @@ -104,12 +104,6 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "check-circt check-circt-integration"; - preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' - echo moving libarc-jit-env.dylib to '$lib' before check because archilator links to the output path - mkdir -pv $lib/lib - cp -v ./lib/libarc-jit-env.dylib $lib/lib - ''; - outputs = [ "out" "lib" diff --git a/pkgs/by-name/ci/circumflex/package.nix b/pkgs/by-name/ci/circumflex/package.nix index 926a660f0a66..b2d65ddb6479 100644 --- a/pkgs/by-name/ci/circumflex/package.nix +++ b/pkgs/by-name/ci/circumflex/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "circumflex"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-jjtjOT8lFPsk300Q9EtsX/w8Bck0pwrS/GyouoBsZ+0="; + hash = "sha256-qponQtfpAXQxpAhkXaylgzpsvbccTIz9kmhdI4tPuNQ="; }; - vendorHash = "sha256-Nlv8H5YqHrqACW2kEXg+mkc3bCgXVudrSNfyu+xeFBA="; + vendorHash = "sha256-HTrV2zK4i5gN2msIl0KTwjdmEDLjFz5fMCig1YPIC1A="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 6bdb50af35dc..7a0411231fe1 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.140.8"; + version = "0.144.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${version}"; - hash = "sha256-nh6nvH26mYPHmjixTk3sn65JXVT5QSj7cX8yfEYaoD4="; + hash = "sha256-pbfLEoc9MF9Zo9P5D8R0WM/ZbzwhdIZhtcWR9tSKzX8="; }; - vendorHash = "sha256-tOwVuOPBXqNB2aKOfqBGDziKskGnyjo+qllko9x39UA="; + vendorHash = "sha256-PH28ZIubrJWk4qTrL9OSx/ylW1iEP0j0iq4uNg9d9ko="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/by-name/ci/citations/package.nix b/pkgs/by-name/ci/citations/package.nix index 7fc6357ac63b..85882d414c52 100644 --- a/pkgs/by-name/ci/citations/package.nix +++ b/pkgs/by-name/ci/citations/package.nix @@ -1,6 +1,5 @@ { cargo, - darwin, desktop-file-utils, fetchFromGitLab, gettext, @@ -52,17 +51,13 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 ]; - buildInputs = - [ - glib - gtk4 - gtksourceview5 - libadwaita - poppler - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + gtk4 + gtksourceview5 + libadwaita + poppler + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang ( lib.concatStringsSep " " [ @@ -94,7 +89,8 @@ stdenv.mkDerivation (finalAttrs: { description = "Manage your bibliographies using the BibTeX format"; homepage = "https://apps.gnome.org/app/org.gnome.World.Citations"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ benediktbroich ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ benediktbroich ]; + teams = [ teams.gnome-circle ]; platforms = platforms.unix; mainProgram = "citations"; }; diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index 7aac936bfe5a..2775c9a504bc 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "civo"; - version = "1.1.99"; + version = "1.2.3"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-30uv9vVjfjZWsUhwrgY7TYs8cAkv+v/TdsSW+VmupJM="; + hash = "sha256-NREiQA/zAxClwKZDq5SR43/AAT6HqdfR6/ud9Xhe5rM="; }; - vendorHash = "sha256-c4KyK0HtIW08/DQ6PLgA+M8GABrKHjAayZahkvo/Erc="; + vendorHash = "sha256-xSvq8ZrkdzRhfD2gPKSJkLnwVQuFuWnSYJ89iUDOpUU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix index 9b6979ba9a20..45616081a481 100644 --- a/pkgs/by-name/cj/cjdns/package.nix +++ b/pkgs/by-name/cj/cjdns/package.nix @@ -5,7 +5,7 @@ rustPlatform, nodejs, which, - python39, + python3, libuv, util-linux, nixosTests, @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ which - python39 + python3 nodejs pkg-config ] @@ -66,11 +66,11 @@ rustPlatform.buildRustPackage rec { passthru.tests.basic = nixosTests.cjdns; meta = with lib; { + broken = true; # outdated, incompatible with supported python versions homepage = "https://github.com/cjdelisle/cjdns"; description = "Encrypted networking for regular people"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; - broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix index 0c9fce38f415..9d3339369515 100644 --- a/pkgs/by-name/cj/cjs/package.nix +++ b/pkgs/by-name/cj/cjs/package.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { ]; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ck/ckan/package.nix b/pkgs/by-name/ck/ckan/package.nix index 14fce13de723..b0b8dd4faecc 100644 --- a/pkgs/by-name/ck/ckan/package.nix +++ b/pkgs/by-name/ck/ckan/package.nix @@ -9,15 +9,16 @@ imagemagick, copyDesktopItems, makeDesktopItem, + nix-update-script, }: stdenv.mkDerivation rec { pname = "ckan"; - version = "1.35.2"; + version = "1.36.0"; src = fetchurl { url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe"; - sha256 = "sha256-SK2eKdH/bm+W+qU8XUHRD9uffmfp5bR4dBvBEUKCm8E="; + hash = "sha256-Tw8s86FtBz/92uq2imFZm4n88NCCpePTpydoAoYsE3U="; }; icon = fetchurl { @@ -75,6 +76,8 @@ stdenv.mkDerivation rec { }) ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Mod manager for Kerbal Space Program"; mainProgram = "ckan"; diff --git a/pkgs/by-name/ck/ckbcomp/package.nix b/pkgs/by-name/ck/ckbcomp/package.nix index 74a25d1a5c09..4d003bd16af9 100644 --- a/pkgs/by-name/ck/ckbcomp/package.nix +++ b/pkgs/by-name/ck/ckbcomp/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.235"; + version = "1.236"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-EGUPj5MesEhC+W6E+8Cute3HtpurwZk0TlcLBReepvI="; + sha256 = "sha256-b7ck48wRPga/ugCVbPCKRSRrpawIJCsEV1kbNeXDIHk="; }; buildInputs = [ perl ]; diff --git a/pkgs/by-name/cl/clairvoyance/package.nix b/pkgs/by-name/cl/clairvoyance/package.nix index f8bbe77a1402..c54c6db6bbe0 100644 --- a/pkgs/by-name/cl/clairvoyance/package.nix +++ b/pkgs/by-name/cl/clairvoyance/package.nix @@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-CVXa2HvX7M0cwqnTeZVETg07j324ATQuMNreEgAC2QA="; }; + pythonRelaxDeps = [ "rich" ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/cl/clairvoyant/package.nix b/pkgs/by-name/cl/clairvoyant/package.nix index 6c95b62474db..5b77c89e452c 100644 --- a/pkgs/by-name/cl/clairvoyant/package.nix +++ b/pkgs/by-name/cl/clairvoyant/package.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cassidyjames/clairvoyant"; license = lib.licenses.gpl3Plus; mainProgram = "com.github.cassidyjames.clairvoyant"; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; }; }) diff --git a/pkgs/by-name/cl/clamav/package.nix b/pkgs/by-name/cl/clamav/package.nix new file mode 100644 index 000000000000..6cafb20cee6e --- /dev/null +++ b/pkgs/by-name/cl/clamav/package.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + cmake, + zlib, + bzip2, + libiconv, + libxml2, + openssl, + ncurses, + curl, + libmilter, + pcre2, + libmspack, + systemd, + json_c, + check, + rustc, + rust-bindgen, + rustfmt, + cargo, + python3, +}: + +stdenv.mkDerivation rec { + pname = "clamav"; + version = "1.4.2"; + + src = fetchurl { + url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; + hash = "sha256-jJL4reKo8snWaI0dY+5X9sr5ZddNzgbQlxxnCcjmwEw="; + }; + + patches = [ + # Flaky test, remove this when https://github.com/Cisco-Talos/clamav/issues/343 is fixed + ./remove-freshclam-test.patch + ./sample-cofiguration-file-install-location.patch + ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ + cmake + pkg-config + rustc + rust-bindgen + rustfmt + cargo + python3 + ]; + buildInputs = [ + zlib + bzip2 + libxml2 + openssl + ncurses + curl + libiconv + libmilter + pcre2 + libmspack + json_c + check + ] ++ lib.optional stdenv.hostPlatform.isLinux systemd; + + cmakeFlags = [ + "-DSYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd" + "-DAPP_CONFIG_DIRECTORY=/etc/clamav" + ]; + + doCheck = true; + + checkInputs = [ + python3.pkgs.pytest + ]; + + meta = with lib; { + homepage = "https://www.clamav.net"; + description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ + robberer + qknight + globin + ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/clamav/remove-freshclam-test.patch b/pkgs/by-name/cl/clamav/remove-freshclam-test.patch similarity index 100% rename from pkgs/tools/security/clamav/remove-freshclam-test.patch rename to pkgs/by-name/cl/clamav/remove-freshclam-test.patch diff --git a/pkgs/tools/security/clamav/sample-cofiguration-file-install-location.patch b/pkgs/by-name/cl/clamav/sample-cofiguration-file-install-location.patch similarity index 100% rename from pkgs/tools/security/clamav/sample-cofiguration-file-install-location.patch rename to pkgs/by-name/cl/clamav/sample-cofiguration-file-install-location.patch diff --git a/pkgs/by-name/cl/clamsmtp/header-order.patch b/pkgs/by-name/cl/clamsmtp/header-order.patch deleted file mode 100644 index 102ae0a471dd..000000000000 --- a/pkgs/by-name/cl/clamsmtp/header-order.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/common/smtppass.c b/common/smtppass.c -index d9be1ba..4a366f4 100644 ---- a/common/smtppass.c -+++ b/common/smtppass.c -@@ -60,15 +60,15 @@ - - #include "usuals.h" - --#ifdef LINUX_TRANSPARENT_PROXY --#include --#endif -- - #include "compat.h" - #include "sock_any.h" - #include "stringx.h" - #include "sppriv.h" - -+#ifdef LINUX_TRANSPARENT_PROXY -+#include -+#endif -+ - /* ----------------------------------------------------------------------- - * STRUCTURES - */ - diff --git a/pkgs/by-name/cl/clamsmtp/package.nix b/pkgs/by-name/cl/clamsmtp/package.nix deleted file mode 100644 index a54a48da5bc8..000000000000 --- a/pkgs/by-name/cl/clamsmtp/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - stdenv, - fetchurl, -}: - -stdenv.mkDerivation rec { - pname = "clamsmtp"; - version = "1.10"; - - src = fetchurl { - url = "http://thewalter.net/stef/software/clamsmtp/${pname}-${version}.tar.gz"; - sha256 = "0apr1pxifw6f1rbbsdrrwzs1dnhybg4hda3qqhqcw7p14r5xnbx5"; - }; - - patches = [ ./header-order.patch ]; - - meta = with lib; { - description = "SMTP filter that allows to check for viruses using the ClamAV - anti-virus software"; - homepage = "http://thewalter.net/stef/software/clamsmtp/"; - license = licenses.bsd3; - maintainers = [ maintainers.ekleog ]; - mainProgram = "clamsmtpd"; - platforms = platforms.all; - }; -} diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix index 36a1a38de8e8..c90de82444f5 100644 --- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix +++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix @@ -7,15 +7,15 @@ }: rustPlatform.buildRustPackage rec { pname = "clang-tidy-sarif"; - version = "0.7.0"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-DFen1QYQxArNfc0CXNtP0nZEvbCxqTH5KS3q3FcfDPs="; + hash = "sha256-ALwEsF1n6WYqITfYTn8mIyn3sxTbDux17FxKIorKkFc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-AfkiK91vXaw4oWvfYlV3C0M/cGf4ZThALB/cANcZmFQ="; + cargoHash = "sha256-cTBXStAA+oCRze2Bh/trultdqtBNOOpXQltJ6R34nF8="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cl/clapgrep/package.nix b/pkgs/by-name/cl/clapgrep/package.nix index 71fbae07627d..e9875dd4b9ed 100644 --- a/pkgs/by-name/cl/clapgrep/package.nix +++ b/pkgs/by-name/cl/clapgrep/package.nix @@ -1,65 +1,63 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, wrapGAppsHook4, pkg-config, blueprint-compiler, + meson, + ninja, + rustc, + cargo, + desktop-file-utils, gtk4, libadwaita, glib, + poppler, + gtksourceview5, nix-update-script, }: -let - version = "1.3.1"; - appid = "de.leopoldluley.Clapgrep"; -in -rustPlatform.buildRustPackage { + +stdenv.mkDerivation (finalAttrs: { pname = "clapgrep"; - inherit version; + version = "25.05+1"; src = fetchFromGitHub { owner = "luleyleo"; repo = "clapgrep"; - tag = "v${version}"; - hash = "sha256-MYV8MrCIpa8eqp2iCLTNLZrVQOyGsMEGqlnEF43fyls="; + tag = "v${finalAttrs.version}"; + hash = "sha256-DL3voYSsNGjPb1CnPuJGg+7UgWYZO7cH5T2Z37BuDSE="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-tpWv8CznTxoAgOf0mb99peqUTQSfv+16dAmX8n7XVDQ="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + hash = "sha256-hTejIaXIAi8opZdE2X3vEi+VYoSti8RNB41ikVOWGPk="; + }; nativeBuildInputs = [ + meson + ninja wrapGAppsHook4 pkg-config blueprint-compiler + rustc + rustPlatform.cargoSetupHook + cargo + desktop-file-utils ]; buildInputs = [ gtk4 libadwaita glib + poppler + gtksourceview5 ]; - env.APP_ID = appid; - - # see Justfile - postInstall = '' - mv $out/bin/clapgrep-gnome $out/bin/clapgrep - install -D assets/${appid}.desktop -t $out/share/applications - install -D assets/${appid}.metainfo.xml -t $out/share/metainfo - install -D assets/icons/hicolor/scalable/apps/${appid}.svg -t $out/share/icons/hicolor/scalable/apps - - mkdir -p assets/locale - cat po/LINGUAS | while read lang; do - mkdir -p assets/locale/$lang/LC_MESSAGES; - msgfmt -o assets/locale/$lang/LC_MESSAGES/${appid}.mo po/$lang.po; - done - cp -r assets/locale -t $out/share - ''; - passthru.updateScript = nix-update-script { }; meta = { @@ -70,4 +68,4 @@ rustPlatform.buildRustPackage { maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "clapgrep"; }; -} +}) diff --git a/pkgs/by-name/cl/clapper-enhancers/package.nix b/pkgs/by-name/cl/clapper-enhancers/package.nix new file mode 100644 index 000000000000..4de5dca52635 --- /dev/null +++ b/pkgs/by-name/cl/clapper-enhancers/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + libpeas2, + json-glib, + libsoup_3, + glib, + clapper-unwrapped, + gst_all_1, + python3Packages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "clapper-enhancers"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "Rafostar"; + repo = "clapper-enhancers"; + tag = finalAttrs.version; + hash = "sha256-CUfTz+YvliJXiv/nsdrpDVFSblqoSW7js8vAtJ9u5vM="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + python3Packages.python + python3Packages.wrapPython + ]; + + buildInputs = [ + libpeas2 + json-glib + libsoup_3 + glib + clapper-unwrapped + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + ]; + + pythonPath = with python3Packages; [ + yt-dlp + ]; + + postFixup = '' + buildPythonPath "$out $pythonPath" + for yt_plugin in $out/lib/clapper-enhancers/plugins/yt-dlp/*.py; do + patchPythonScript $yt_plugin + done + ''; + + mesonFlags = [ "-Denhancersdir=${placeholder "out"}/${finalAttrs.passthru.pluginPath}" ]; + + passthru.pluginPath = "lib/clapper-enhancers/plugins"; + + meta = { + description = "Plugins enhancing Clapper library capabilities"; + homepage = "https://github.com/Rafostar/clapper-enhancers"; + license = lib.licenses.lgpl21Only; + inherit (clapper-unwrapped.meta) maintainers platforms; + }; +}) diff --git a/pkgs/by-name/cl/clapper-unwrapped/package.nix b/pkgs/by-name/cl/clapper-unwrapped/package.nix new file mode 100644 index 000000000000..c5bc14eea542 --- /dev/null +++ b/pkgs/by-name/cl/clapper-unwrapped/package.nix @@ -0,0 +1,90 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gobject-introspection, + pkg-config, + ninja, + desktop-file-utils, + shared-mime-info, + meson, + gtk4, + gst_all_1, + libGL, + libadwaita, + libsoup_3, + vala, + cmake, + libmicrodns, + glib-networking, + libpeas2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "clapper-unwrapped"; + version = "0.8.0"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Rafostar"; + repo = "clapper"; + tag = finalAttrs.version; + hash = "sha256-Yb2fWsdd8jhxkGWKanLn7CAuF4MjyQ27XTrO8ja3hfs="; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + cmake + ninja + pkg-config + desktop-file-utils # for update-desktop-database + gtk4 # for gtk4-update-icon-cache + shared-mime-info # for update-mime-database + vala + ]; + + buildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + glib-networking # for TLS support + gtk4 + libGL + libadwaita + libsoup_3 + libmicrodns + libpeas2 + ]; + + postPatch = '' + patchShebangs --build build-aux/meson/postinstall.py + ''; + + preFixup = '' + mkdir -p $out/share/gsettings-schemas + # alias clapper-unwrapped schemas to also provide clapper schemas. + # the precise schema patch can vary based on host platform. + schemas=$(basename $lib/share/gsettings-schemas/clapper-unwrapped-*) + cp -r $lib/share/gsettings-schemas/$schemas $out/share/gsettings-schemas/''${schemas/clapper-unwrapped-/clapper-} + ''; + + meta = { + description = "GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering"; + longDescription = '' + Clapper is a GNOME media player built using the GTK4 toolkit. + The media player is using GStreamer as a media backend. + ''; + homepage = "https://github.com/Rafostar/clapper"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/cl/clapper/package.nix b/pkgs/by-name/cl/clapper/package.nix index b1219422261a..596b03a94cd0 100644 --- a/pkgs/by-name/cl/clapper/package.nix +++ b/pkgs/by-name/cl/clapper/package.nix @@ -1,88 +1,41 @@ { - lib, - stdenv, - fetchFromGitHub, - gobject-introspection, - pkg-config, - ninja, - desktop-file-utils, - makeWrapper, - shared-mime-info, + stdenvNoCC, + clapper-unwrapped, wrapGAppsHook4, - meson, - gtk4, - gst_all_1, - libGL, - libadwaita, - libsoup_3, - vala, - cmake, - libmicrodns, - gtuber, - glib-networking, - libpeas2, + gobject-introspection, + xorg, + clapper-enhancers, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation { pname = "clapper"; - version = "0.8.0"; + inherit (clapper-unwrapped) version meta; - src = fetchFromGitHub { - owner = "Rafostar"; - repo = "clapper"; - tag = finalAttrs.version; - hash = "sha256-Yb2fWsdd8jhxkGWKanLn7CAuF4MjyQ27XTrO8ja3hfs="; - }; + src = clapper-unwrapped; + + dontConfigure = true; + dontBuild = true; nativeBuildInputs = [ + wrapGAppsHook4 gobject-introspection - meson - cmake - ninja - makeWrapper - pkg-config - wrapGAppsHook4 # for gsettings - desktop-file-utils # for update-desktop-database - shared-mime-info # for update-mime-database - vala + xorg.lndir ]; - buildInputs = [ - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gtuber - glib-networking # for TLS support - gtk4 - libGL - libadwaita - libsoup_3 - libmicrodns - libpeas2 - ]; + buildInputs = [ clapper-unwrapped ] ++ clapper-unwrapped.buildInputs; - postPatch = '' - patchShebangs --build build-aux/meson/postinstall.py + installPhase = '' + runHook preInstall + + mkdir -p $out + lndir $src $out + + runHook postInstall ''; - # The package uses "clappersink" provided by itself preFixup = '' gappsWrapperArgs+=( - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $out/lib/gstreamer-1.0 + --set-default CLAPPER_ENHANCERS_PATH "${clapper-enhancers}/${clapper-enhancers.passthru.pluginPath}" ) ''; - - meta = { - description = "GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering"; - longDescription = '' - Clapper is a GNOME media player built using the GTK4 toolkit. - The media player is using GStreamer as a media backend. - ''; - homepage = "https://github.com/Rafostar/clapper"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ aleksana ]; - platforms = lib.platforms.linux; - }; -}) +} diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index 0155e8d72370..b0dc46f1cc28 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -5,19 +5,23 @@ protobuf, versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-rs"; - version = "0.7.5"; + version = "0.7.7"; src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; - tag = "v${version}"; - hash = "sha256-c4XF0F2ifTvbXTMGiJc1EaGTlS/X5ilZTpXe01uHs4Y="; + tag = "v${finalAttrs.version}"; + hash = "sha256-x89sFBQ6bAIHvaRTCxqKKgFKo7PpquVze0R6VicwrJw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZSwNlknpZ0zKj+sklmO14Ey5DPZ0Wk9xxMiXwIiuRd0="; + cargoHash = "sha256-jfc0Rmt9eEN3ds5Rakj+IcJcUa28CbhiSu4AfqHurf0="; + + patches = [ + ./unbounded-shifts.patch + ]; nativeInstallCheckInputs = [ protobuf @@ -53,4 +57,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ aaronjheng ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch b/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch new file mode 100644 index 000000000000..ab6c43b7a264 --- /dev/null +++ b/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch @@ -0,0 +1,13 @@ +diff --git a/clash_lib/src/lib.rs b/clash_lib/src/lib.rs +index 6ada034..420e465 100644 +--- a/clash_lib/src/lib.rs ++++ b/clash_lib/src/lib.rs +@@ -2,7 +2,7 @@ + #![feature(ip)] + #![feature(sync_unsafe_cell)] + #![feature(let_chains)] +-#![cfg_attr(not(version("1.86.0")), feature(unbounded_shifts))] ++#![feature(unbounded_shifts)] + + #[macro_use] + extern crate anyhow; diff --git a/pkgs/by-name/cl/clash-verge-rev/0001-core-validate-bin_path-to-prevent-RCE-in-start_clash.patch b/pkgs/by-name/cl/clash-verge-rev/0001-core-validate-bin_path-to-prevent-RCE-in-start_clash.patch new file mode 100644 index 000000000000..30bb329a77f2 --- /dev/null +++ b/pkgs/by-name/cl/clash-verge-rev/0001-core-validate-bin_path-to-prevent-RCE-in-start_clash.patch @@ -0,0 +1,72 @@ +From fff6494e26edce6bf8a5b4c40d9535f820608cc3 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Mon, 28 Apr 2025 16:43:29 +0800 +Subject: [PATCH 1/2] core: validate bin_path to prevent RCE in start_clash + +Add a security check in CoreManager::start_clash to ensure that the provided +binary path (`bin_path`) must be located under the current executable's +directory. This prevents potential remote code execution (RCE) attacks +caused by arbitrary binary path injection. +--- + src/service/core.rs | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/src/service/core.rs b/src/service/core.rs +index 84407a5..51081ed 100644 +--- a/src/service/core.rs ++++ b/src/service/core.rs +@@ -7,6 +7,7 @@ use once_cell::sync::Lazy; + use std::{ + collections::HashMap, + sync::{atomic::Ordering, Arc, Mutex}, ++ env, + }; + + impl CoreManager { +@@ -227,7 +228,7 @@ impl CoreManager { + .unwrap() + .running_pid + .load(Ordering::Relaxed) as u32; +- ++ + match process::find_processes("verge-mihomo") { + Ok(pids) => { + // 直接在迭代过程中过滤和终止 +@@ -248,18 +249,32 @@ impl CoreManager { + }) + .filter(|&success| success) + .count(); +- ++ + println!("Successfully stopped {} verge-mihomo processes", kill_count); + } + Err(e) => { + eprintln!("Error finding verge-mihomo processes: {}", e); + } + } +- ++ + Ok(()) + } + + pub fn start_clash(&self, body: StartBody) -> Result<(), String> { ++ { ++ let bin_path = std::path::Path::new(body.bin_path.as_str()); ++ let current_exe = std::env::current_exe() ++ .map_err(|e| format!("Failed to get current exe path: {}", e))?; ++ let current_dir = current_exe.parent() ++ .ok_or("Failed to get current directory")?; ++ ++ if !bin_path.starts_with(current_dir) { ++ return Err(format!( ++ "Invalid binary path for clash kernel. It must be under: {}", ++ current_dir.display() ++ )); ++ } ++ } + { + // Check clash & stop if needed + let is_running_clash = self +-- +2.49.0 + diff --git a/pkgs/by-name/cl/clash-verge-rev/0002-core-prevent-overwriting-existing-file-by-validating.patch b/pkgs/by-name/cl/clash-verge-rev/0002-core-prevent-overwriting-existing-file-by-validating.patch new file mode 100644 index 000000000000..596809d9b828 --- /dev/null +++ b/pkgs/by-name/cl/clash-verge-rev/0002-core-prevent-overwriting-existing-file-by-validating.patch @@ -0,0 +1,33 @@ +From b104778a608862789f2be400b9f13a92b1ec5b20 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Mon, 28 Apr 2025 21:38:02 +0800 +Subject: [PATCH 2/2] core: prevent overwriting existing file by validating its + existence + +Add a check to verify whether the specified `log_file` already exists before proceeding. +If the file exists, return an error to prevent accidental or malicious overwriting of files. +This enhances the security of log file handling by mitigating arbitrary file overwrite risks. +--- + src/service/core.rs | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/service/core.rs b/src/service/core.rs +index 51081ed..a2c4f82 100644 +--- a/src/service/core.rs ++++ b/src/service/core.rs +@@ -275,6 +275,12 @@ impl CoreManager { + )); + } + } ++ { ++ let log_file = std::path::Path::new(body.log_file.as_str()); ++ if log_file.exists() { ++ return Err(format!("Log file already exists: {}", log_file.display())); ++ } ++ } + { + // Check clash & stop if needed + let is_running_clash = self +-- +2.49.0 + diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index ca8ba21bae81..4dcbf111d4ff 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -8,19 +8,17 @@ wrapGAppsHook3, v2ray-geoip, v2ray-domain-list-community, - copyDesktopItems, - makeDesktopItem, libsoup, }: let pname = "clash-verge-rev"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-rev"; tag = "v${version}"; - hash = "sha256-CiVwFSCbCxFm8naogpL73gUp8HNHwcIiygSVon4WNZk="; + hash = "sha256-MJD1FWh/43pOffdWznCVPyGVXcIyqhXzmoEmyM8Tspg="; }; src-service = fetchFromGitHub { @@ -31,8 +29,8 @@ let }; service-cargo-hash = "sha256-lMOQznPlkHIMSm5nOLuGP9qJXt3CXnd+q8nCu+Xbbt8="; - npm-hash = "sha256-v9+1NjXo/1ogmep+4IP+9qoUR1GJz87VGeOoMzQ1Rfw="; - vendor-hash = "sha256-nU3bIxD5zggTScNGH3HmnnXUGkLMwnQbIBVI1DmIpFs="; + pnpm-hash = "sha256-v9+1NjXo/1ogmep+4IP+9qoUR1GJz87VGeOoMzQ1Rfw="; + vendor-hash = "sha256-y3XVHi00mnuVFxSd02YBgfWuXYRVIs+e0tITXNOFRsA="; service = callPackage ./service.nix { inherit @@ -44,23 +42,13 @@ let ; }; - webui = callPackage ./webui.nix { - inherit - version - src - pname - meta - npm-hash - ; - }; - unwrapped = callPackage ./unwrapped.nix { inherit pname version src + pnpm-hash vendor-hash - webui meta libsoup ; @@ -92,20 +80,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ wrapGAppsHook3 - copyDesktopItems - ]; - - desktopItems = [ - (makeDesktopItem { - name = "clash-verge"; - exec = "clash-verge"; - comment = "Clash Verge Rev"; - type = "Application"; - icon = "clash-verge"; - desktopName = "Clash Verge Rev"; - terminal = false; - categories = [ "Network" ]; - }) ]; installPhase = '' @@ -115,12 +89,13 @@ stdenv.mkDerivation { cp -r ${unwrapped}/share/* $out/share cp -r ${unwrapped}/bin/clash-verge $out/bin/clash-verge # This can't be symbol linked. It will find mihomo in its runtime path - ln -s ${service}/bin/clash-verge-service $out/bin/clash-verge-service + cp ${service}/bin/clash-verge-service $out/bin/clash-verge-service ln -s ${mihomo}/bin/mihomo $out/bin/verge-mihomo # people who want to use alpha build show override mihomo themselves. The alpha core entry was removed in clash-verge. ln -s ${v2ray-geoip}/share/v2ray/geoip.dat $out/lib/Clash\ Verge/resources/geoip.dat ln -s ${v2ray-domain-list-community}/share/v2ray/geosite.dat $out/lib/Clash\ Verge/resources/geosite.dat ln -s ${dbip-country-lite.mmdb} $out/lib/Clash\ Verge/resources/Country.mmdb + runHook postInstall ''; } diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix index 9641abcc922d..60f2670efbc8 100644 --- a/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -15,6 +15,19 @@ rustPlatform.buildRustPackage { src = src-service; sourceRoot = "${src-service.name}"; + patches = [ + # FIXME: remove until upstream fix these + # https://github.com/clash-verge-rev/clash-verge-rev/issues/3428 + + # Patch: Restrict bin_path in spawn_process to be under the clash-verge-service directory. + # This prevents arbitrary code execution by ensuring only trusted binaries from the Nix store are allowed to run. + ./0001-core-validate-bin_path-to-prevent-RCE-in-start_clash.patch + + # Patch: Add validation to prevent overwriting existing files. + # This mitigates arbitrary file overwrite risks by ensuring a file does not already exist before writing. + ./0002-core-prevent-overwriting-existing-file-by-validating.patch + ]; + nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index bf0cae5f8eaf..97bac8b060f9 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -2,48 +2,53 @@ pname, version, src, - libayatana-appindicator, - vendor-hash, - fetchpatch, - glib, - webui, - pkg-config, - libsoup, - rustPlatform, - makeDesktopItem, - libsForQt5, - kdePackages, meta, - webkitgtk_4_1, + + pnpm-hash, + vendor-hash, + + rustPlatform, + + cargo-tauri, + jq, + moreutils, + nodejs, + pkg-config, + pnpm_9, + + glib, + kdePackages, + libayatana-appindicator, + libsForQt5, + libsoup, openssl, + webkitgtk_4_1, }: rustPlatform.buildRustPackage { inherit version src meta; pname = "${pname}-unwrapped"; - sourceRoot = "${src.name}/src-tauri"; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; useFetchCargoVendor = true; cargoHash = vendor-hash; + pnpmDeps = pnpm_9.fetchDeps { + inherit pname version src; + hash = pnpm-hash; + }; + env = { OPENSSL_NO_VENDOR = 1; }; - patches = [ - (fetchpatch { - name = "fix-service-mode-mihomo-check.patch"; - url = "https://github.com/clash-verge-rev/clash-verge-rev/commit/16d4f9fe7ee95b7312a10bf216c818c3e144dea7.patch"; - hash = "sha256-FQHm1jjo0W1IokMDJGWVMVV9DWItG1prX+TIysL12DA="; - }) - ]; - - prePatch = '' - cd .. - ''; - postPatch = '' - cd src-tauri + # We disable the option to try to use the bleeding-edge version of mihomo + # If you need a newer version, you can override the mihomo input of the wrapped package + sed -i -e '/Mihomo Alpha/d' ./src/components/setting/mods/clash-core-viewer.tsx + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -54,42 +59,44 @@ rustPlatform.buildRustPackage { --replace-fail '"kwriteconfig5"' '"${libsForQt5.kconfig}/bin/kwriteconfig5"' \ --replace-fail '"kwriteconfig6"' '"${kdePackages.kconfig}/bin/kwriteconfig6"' - substituteInPlace ./tauri.conf.json \ - --replace-fail '"frontendDist": "../dist",' '"frontendDist": "${webui}",' \ - --replace-fail '"beforeBuildCommand": "pnpm run web:build"' '"beforeBuildCommand": ""' - sed -i -e '/externalBin/d' -e '/resources/d' tauri.conf.json - sed -i -e '/sidecar/d' -e '/resources/d' tauri.linux.conf.json - chmod 777 ../.cargo - rm ../.cargo/config.toml + # this file tries to override the linker used when compiling for certain platforms + rm .cargo/config.toml + + # disable updater and don't try to bundle helper binaries + jq ' + .bundle.createUpdaterArtifacts = false | + del(.bundle.resources) | + del(.bundle.externalBin) + ' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json + + jq 'del(.bundle.externalBin)' src-tauri/tauri.linux.conf.json | sponge src-tauri/tauri.linux.conf.json + + # As a side effect of patching the service to fix the arbitrary file overwrite issue, + # we also need to update the timestamp format in the filename to the second level. + # This ensures that the Clash kernel can still be restarted within one minute without problems. + substituteInPlace src-tauri/src/utils/dirs.rs \ + --replace-fail '%Y-%m-%d-%H%M' '%Y-%m-%d-%H%M%S' ''; nativeBuildInputs = [ + cargo-tauri.hook + jq + moreutils + nodejs pkg-config - rustPlatform.cargoSetupHook + pnpm_9.configHook ]; buildInputs = [ - openssl + libayatana-appindicator libsoup + openssl webkitgtk_4_1 ]; + # make sure the .desktop file name does not contain whitespace, + # so that the service can register it as an auto-start item postInstall = '' - install -DT icons/128x128@2x.png $out/share/icons/hicolor/128x128@2/apps/clash-verge.png - install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/clash-verge.png - install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/clash-verge.png + mv $out/share/applications/Clash\ Verge.desktop $out/share/applications/clash-verge.desktop ''; - - desktopItems = [ - (makeDesktopItem { - name = "clash-verge-rev"; - exec = "clash-verge %u"; - icon = "clash-verge-rev"; - desktopName = "Clash Verge Rev"; - genericName = meta.description; - mimeTypes = [ "x-scheme-handler/clash" ]; - type = "Application"; - terminal = false; - }) - ]; } diff --git a/pkgs/by-name/cl/clash-verge-rev/webui.nix b/pkgs/by-name/cl/clash-verge-rev/webui.nix deleted file mode 100644 index d8cdc4f80b1b..000000000000 --- a/pkgs/by-name/cl/clash-verge-rev/webui.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - version, - src, - pname, - pnpm_9, - nodejs, - stdenv, - meta, - npm-hash, -}: -stdenv.mkDerivation { - inherit version src meta; - pname = "${pname}-webui"; - pnpmDeps = pnpm_9.fetchDeps { - inherit pname version src; - hash = npm-hash; - }; - - nativeBuildInputs = [ - nodejs - pnpm_9.configHook - ]; - - postPatch = '' - chmod -R +644 -- ./src/components/setting/mods/clash-core-viewer.tsx - chmod -R +644 -- ./src/components/setting/mods - sed -i -e '/Mihomo Alpha/d' ./src/components/setting/mods/clash-core-viewer.tsx - ''; - - buildPhase = '' - runHook preBuild - - node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cp -r dist $out - - runHook postInstall - ''; -} diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 9e1f0bc44794..e2fdd266549a 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -5,13 +5,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^0.2.59" + "@anthropic-ai/claude-code": "^0.2.122" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "0.2.59", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.59.tgz", - "integrity": "sha512-hcUHEiPUmkgU00J4/1dlLgWvf5ZkWOjMpUrXhMq2o143LOElKuTGxPGt2RtmFHKk6DesFZcV/gabZYkcTqraBw==", + "version": "0.2.122", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.122.tgz", + "integrity": "sha512-q9XnW6a4btqHM2XYxkcl2d7dDNRTX8pvaeisiNWYzAOSKC+wUfOrkioUUS3BG+i6sNtJB03jPKJdqvEvtXbZjw==", "hasInstallScript": true, "license": "SEE LICENSE IN README.md", "bin": { diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index f213dbb17bd8..c395e785c544 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -2,18 +2,21 @@ lib, buildNpmPackage, fetchzip, + nodejs_20, }: buildNpmPackage rec { pname = "claude-code"; - version = "0.2.59"; + version = "0.2.122"; + + nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-XHHWmDw9qBM4fQ975wSk12hJnr4+1H4AhlNc+IBV3qs="; + hash = "sha256-9w1wjuOTSphEfgKfNJhDFiTKuIJqfV6Bz4XEYXMIaGE="; }; - npmDepsHash = "sha256-KorQlEB90EDE+NIxyUh1apqCDzgrCpwcaOy2mt2mz1s="; + npmDepsHash = "sha256-71YPsgeI8bmb+wwFHS5XOXKJXsagWZj+hBf2T/+GYMU="; postPatch = '' cp ${./package-lock.json} package-lock.json @@ -24,8 +27,7 @@ buildNpmPackage rec { AUTHORIZED = "1"; # `claude-code` tries to auto-update by default, this disables that functionality. - # Note that the `DISABLE_AUTOUPDATER` environment variable is not documented, so this trick may - # not continue to work. + # https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview#environment-variables postInstall = '' wrapProgram $out/bin/claude \ --set DISABLE_AUTOUPDATER 1 diff --git a/pkgs/by-name/cl/claws-mail/package.nix b/pkgs/by-name/cl/claws-mail/package.nix index 42d0f5ab2914..88adbe8526e6 100644 --- a/pkgs/by-name/cl/claws-mail/package.nix +++ b/pkgs/by-name/cl/claws-mail/package.nix @@ -55,7 +55,7 @@ enablePluginClamd ? true, enablePluginDillo ? true, enablePluginFancy ? true, - webkitgtk_4_0, + webkitgtk_4_1, enablePluginFetchInfo ? true, enablePluginKeywordWarner ? true, enablePluginLibravatar ? enablePluginRavatar, @@ -147,7 +147,7 @@ let { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; - deps = [ webkitgtk_4_0 ]; + deps = [ webkitgtk_4_1 ]; } { flags = [ "fetchinfo-plugin" ]; diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix new file mode 100644 index 000000000000..463f36deca47 --- /dev/null +++ b/pkgs/by-name/cl/clblas/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + gfortran, + blas, + boost, + python3, + ocl-icd, + opencl-headers, +}: + +stdenv.mkDerivation rec { + pname = "clblas"; + version = "2.12"; + + src = fetchFromGitHub { + owner = "clMathLibraries"; + repo = "clBLAS"; + rev = "v${version}"; + sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs"; + }; + + patches = [ + ./platform.patch + (fetchpatch { + url = "https://github.com/clMathLibraries/clBLAS/commit/68ce5f0b824d7cf9d71b09bb235cf219defcc7b4.patch"; + hash = "sha256-XoVcHgJ0kTPysZbM83mUX4/lvXVHKbl7s2Q8WWiUnMs="; + }) + ]; + + postPatch = '' + sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt + ''; + + preConfigure = '' + cd src + ''; + + cmakeFlags = [ + "-DBUILD_TEST=OFF" + ]; + + nativeBuildInputs = [ + cmake + gfortran + python3 + ]; + buildInputs = + [ + blas + boost + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + ocl-icd + opencl-headers + ]; + + strictDeps = true; + + meta = with lib; { + homepage = "https://github.com/clMathLibraries/clBLAS"; + description = "Software library containing BLAS functions written in OpenCL"; + longDescription = '' + This package contains a library of BLAS functions on top of OpenCL. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/development/libraries/science/math/clblas/platform.patch b/pkgs/by-name/cl/clblas/platform.patch similarity index 100% rename from pkgs/development/libraries/science/math/clblas/platform.patch rename to pkgs/by-name/cl/clblas/platform.patch diff --git a/pkgs/by-name/cl/clean-css-cli/package.nix b/pkgs/by-name/cl/clean-css-cli/package.nix index 195aa7537d1b..4141f0731390 100644 --- a/pkgs/by-name/cl/clean-css-cli/package.nix +++ b/pkgs/by-name/cl/clean-css-cli/package.nix @@ -3,30 +3,29 @@ buildNpmPackage, fetchFromGitHub, }: - -let +buildNpmPackage (finalAttrs: { + pname = "clean-css-cli"; version = "5.6.3"; + src = fetchFromGitHub { owner = "clean-css"; repo = "clean-css-cli"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tsFNcQg55uY2gL5xLLLS6INLlYzbsU6M3hnsYeOFGEw="; }; -in -buildNpmPackage { - pname = "clean-css-cli"; - inherit version src; npmDepsHash = "sha256-uvI9esVVOE18syHUCJpoiDY+Vh3hJO+GsMOTZSYJaxg="; dontNpmBuild = true; + dontCheckForBrokenSymlinks = true; + meta = { - changelog = "https://github.com/clean-css/clean-css-cli/blob/${src.rev}/History.md"; description = "Command-line interface to the clean-css CSS optimization library"; homepage = "https://github.com/clean-css/clean-css-cli"; + changelog = "https://github.com/clean-css/clean-css-cli/blob/v${finalAttrs.version}/History.md"; license = lib.licenses.mit; mainProgram = "cleancss"; maintainers = with lib.maintainers; [ momeemt ]; }; -} +}) diff --git a/pkgs/by-name/cl/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch b/pkgs/by-name/cl/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch deleted file mode 100644 index 3e0fbe6b996d..000000000000 --- a/pkgs/by-name/cl/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch +++ /dev/null @@ -1,17 +0,0 @@ -The clean command line compiler clm checks modules for freshness by comparing timestamps. -However, in chroot builds all files installed have the same timestamp. This leads to clm -trying to rebuild the library modules distributed with the Clean install every time a user -compiles any file. This patch changes the freshness check to use less than instead of less -than or equal to in order to avoid this. - ---- clean-upstream/src/tools/clm/clm.c 2010-12-10 06:12:17.000000000 -0430 -+++ clean/src/tools/clm/clm.c 2010-12-25 10:29:09.840675925 -0430 -@@ -250,7 +250,7 @@ - || (t1.dwHighDateTime==t2.dwHighDateTime && (unsigned)(t1.dwLowDateTime)<=(unsigned)(t2.dwLowDateTime))) - #else - typedef unsigned long FileTime; --# define FILE_TIME_LE(t1,t2) (t1<=t2) -+# define FILE_TIME_LE(t1,t2) (t1/var/log/clickhouse-server/clickhouse-server\.log!d' \ + $out/etc/clickhouse-server/config.xml + substituteInPlace $out/etc/clickhouse-server/config.xml \ + --replace-fail "/var/log/clickhouse-server/clickhouse-server.err.log" "1" + substituteInPlace $out/etc/clickhouse-server/config.xml \ + --replace-fail "trace" "warning" + ''; + + # Builds in 7+h with 2 cores, and ~20m with a big-parallel builder. + requiredSystemFeatures = [ "big-parallel" ]; + + passthru.tests.clickhouse = nixosTests.clickhouse; + + meta = with lib; { + homepage = "https://clickhouse.com"; + description = "Column-oriented database management system"; + license = licenses.asl20; + maintainers = with maintainers; [ + orivej + mbalatsko + thevar1able + ]; + + # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 + platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) (platforms.linux ++ platforms.darwin); + broken = stdenv.buildPlatform != stdenv.hostPlatform; + }; +}) diff --git a/pkgs/by-name/cl/clickup/package.nix b/pkgs/by-name/cl/clickup/package.nix index e0d2a9e8b4c3..4d1ec6b6030b 100644 --- a/pkgs/by-name/cl/clickup/package.nix +++ b/pkgs/by-name/cl/clickup/package.nix @@ -7,12 +7,12 @@ }: let pname = "clickup"; - version = "3.3.79"; + version = "3.5.87"; src = fetchurl { # Using archive.org because the website doesn't store older versions of the software. - url = "https://web.archive.org/web/20240601173958/https%3A%2F%2Fdesktop.clickup.com%2Flinux"; - hash = "sha256-jAOYDX9j+ZTqWsSg0rEckKZnErgsIV6+CtUv3M3wNqM="; + url = "https://web.archive.org/web/20250419020454/https://desktop.clickup.com/linux"; + hash = "sha256-+Et+N8ZR5pJ8dvsU/tZa+LLpatooTnq3D24c6t1NS18="; }; appimage = appimageTools.wrapType2 { diff --git a/pkgs/by-name/cl/clifm/package.nix b/pkgs/by-name/cl/clifm/package.nix index 9adfe65a1401..61398c22a792 100644 --- a/pkgs/by-name/cl/clifm/package.nix +++ b/pkgs/by-name/cl/clifm/package.nix @@ -7,17 +7,19 @@ file, readline, python3, + nix-update-script, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clifm"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "leo-arch"; repo = "clifm"; - rev = "v${version}"; - hash = "sha256-RAxhjDNaNkMSIJaca1NNiMQNaEZ3WDAvaWzN3u/PceA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q4BzkLclJJGybx6tnOhfRE3X5iFtuYTfbAvSLO7isX4="; }; buildInputs = [ @@ -35,12 +37,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + nativeCheckInputs = [ versionCheckHook ]; + doCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://github.com/leo-arch/clifm"; - description = "CliFM is a CLI-based, shell-like, and non-curses terminal file manager written in C: simple, fast, extensible, and lightweight as hell"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ nadir-ishiguro ]; - platforms = platforms.unix; + changelog = "https://github.com/leo-arch/clifm/releases/tag/v${finalAttrs.version}"; + description = "A CLI-based, shell-like, and non-curses terminal file manager"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ nadir-ishiguro ]; + platforms = lib.platforms.unix; mainProgram = "clifm"; }; -} +}) diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix index 2484b659a4a8..cdfe44916f55 100644 --- a/pkgs/by-name/cl/clightning/package.nix +++ b/pkgs/by-name/cl/clightning/package.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "24.11.1"; + version = "25.02.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - hash = "sha256-FdrD+FA0t90oJnXjUA8oalU7DDjUv70fAteNxbhscgk="; + hash = "sha256-2wp9o1paWJWfxIvm9BDnsKX3GDUXKaPkpB89cwb6Oj8="; }; # when building on darwin we need cctools to provide the correct libtool @@ -95,11 +95,6 @@ stdenv.mkDerivation rec { stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 ) "-Wno-error=gnu-folding-constant"; - # The `clnrest` plugin requires a Python environment to run - postInstall = '' - rm -r $out/libexec/c-lightning/plugins/clnrest - ''; - meta = with lib; { description = "Bitcoin Lightning Network implementation in C"; longDescription = '' diff --git a/pkgs/by-name/cl/clima/package.nix b/pkgs/by-name/cl/clima/package.nix index 1e73159f8062..650ccfacf768 100644 --- a/pkgs/by-name/cl/clima/package.nix +++ b/pkgs/by-name/cl/clima/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-3BNDo5ksra1d8X6yQZYSlS2CSiZfkuTHkQtIC2ckbKE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Minimal viewer for Termimad"; homepage = "https://github.com/Canop/clima"; diff --git a/pkgs/by-name/cl/clinfo/package.nix b/pkgs/by-name/cl/clinfo/package.nix new file mode 100644 index 000000000000..5eb7ef8dfc68 --- /dev/null +++ b/pkgs/by-name/cl/clinfo/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + ocl-icd, + opencl-headers, +}: + +stdenv.mkDerivation rec { + pname = "clinfo"; + version = "3.0.25.02.14"; + + src = fetchFromGitHub { + owner = "Oblomov"; + repo = "clinfo"; + rev = version; + sha256 = "sha256-UkkrRpmY5vZtTeEqPNYfxAGaJDoTSrNUG9N1Bknozow="; + }; + + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + ocl-icd + opencl-headers + ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "Print all known information about all available OpenCL platforms and devices in the system"; + homepage = "https://github.com/Oblomov/clinfo"; + license = licenses.cc0; + maintainers = with maintainers; [ + athas + r-burns + ]; + platforms = platforms.unix; + mainProgram = "clinfo"; + }; +} diff --git a/pkgs/by-name/cl/clipboard-jh/package.nix b/pkgs/by-name/cl/clipboard-jh/package.nix index d2d0651f5123..5ed2283649a3 100644 --- a/pkgs/by-name/cl/clipboard-jh/package.nix +++ b/pkgs/by-name/cl/clipboard-jh/package.nix @@ -9,7 +9,6 @@ wayland-scanner, wayland, xorg, - darwin, nix-update-script, alsa-lib, openssl, @@ -44,9 +43,6 @@ stdenv.mkDerivation rec { wayland xorg.libX11 alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit ]; cmakeBuildType = "MinSizeRel"; diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index 22597dd1f781..66bfcc8dab99 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -5,7 +5,6 @@ rustPlatform, protobuf, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { @@ -22,12 +21,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-UA+NTtZ2qffUPUmvCidnTHwFzD3WOPTlxHR2e2vKwPQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - nativeBuildInputs = [ protobuf installShellFiles diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix index 27113c21094c..eed513ff09b2 100644 --- a/pkgs/by-name/cl/clippy-sarif/package.nix +++ b/pkgs/by-name/cl/clippy-sarif/package.nix @@ -8,15 +8,15 @@ }: rustPlatform.buildRustPackage rec { pname = "clippy-sarif"; - version = "0.7.0"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-J2QtM6lrkOXQO3ZARJWIgjkj0pLzmL9id5b2JNkGeiA="; + hash = "sha256-pqu7jIKksjn52benebICQEhgCW59MX+RRTcHm2ufjWE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ExH4asrM9MIW1/oslU64LnalEAvmTFuOmersrQM0Wjk="; + cargoHash = "sha256-wdJTQjDCmbJVPEUV6DENb2UegAc1ET4iSw3SzmlGPnA="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cl/cliqr/package.nix b/pkgs/by-name/cl/cliqr/package.nix index 94c8fc4b17e3..2f5774a48419 100644 --- a/pkgs/by-name/cl/cliqr/package.nix +++ b/pkgs/by-name/cl/cliqr/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "cliqr"; - version = "0.1.26"; + version = "0.1.29"; src = fetchFromGitHub { owner = "paepckehh"; repo = "cliqr"; tag = "v${finalAttrs.version}"; - hash = "sha256-JM5sWVby8dSFz2YtNXgU9z5fc6EI5nnxmpQN/71kdjI="; + hash = "sha256-fhNMiUaCTk4xYGJRMuZCHeYvzGeVwkS7E7LU1L+LuBg="; }; vendorHash = null; diff --git a/pkgs/by-name/cl/cliquer/package.nix b/pkgs/by-name/cl/cliquer/package.nix index 33d9c0704a98..9cdceddfe00a 100644 --- a/pkgs/by-name/cl/cliquer/package.nix +++ b/pkgs/by-name/cl/cliquer/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://users.aalto.fi/~pat/cliquer.html"; downloadPage = src.meta.homepage; # autocliquer license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; mainProgram = "cl"; platforms = platforms.unix; }; diff --git a/pkgs/by-name/cl/cliscord/package.nix b/pkgs/by-name/cl/cliscord/package.nix new file mode 100644 index 000000000000..41f2f38e74ee --- /dev/null +++ b/pkgs/by-name/cl/cliscord/package.nix @@ -0,0 +1,33 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage { + pname = "cliscord"; + version = "0-unstable-2022-10-07"; + + src = fetchFromGitHub { + owner = "somebody1234"; + repo = "cliscord"; + rev = "d62317d55c07ece8c9d042dcd74b62e58c9bfaeb"; + hash = "sha256-dmR49yyErahOUxR9pGW1oYy8Wq5SWOprK317u+JPBv4="; + }; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ pkg-config ]; + + cargoHash = "sha256-bJA+vqbhXeygIAg9HWom3xSuPpJgJY5FLb8UMBjrh7U="; + + meta = { + description = "Simple command-line tool to send text and files to discord"; + homepage = "https://github.com/somebody1234/cliscord"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lom ]; + mainProgram = "cliscord"; + }; +} diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix index fd647ee59c33..482a230e06ef 100644 --- a/pkgs/by-name/cl/clj-kondo/package.nix +++ b/pkgs/by-name/cl/clj-kondo/package.nix @@ -7,11 +7,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2025.02.20"; + version = "2025.04.07"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-oTa/WA1ieukgHf8GX5oE1D2lTZ2KjFPty3aVWUb64Ck="; + sha256 = "sha256-yJyRqQglJUiHotB70zga5NhFquHsKgmwT9sryZHEFRU="; }; graalvmDrv = graalvmPackages.graalvm-ce; diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix index 11b3a776bd94..6f44e5b9928d 100644 --- a/pkgs/by-name/cl/cljfmt/package.nix +++ b/pkgs/by-name/cl/cljfmt/package.nix @@ -9,11 +9,11 @@ buildGraalvmNativeImage rec { pname = "cljfmt"; - version = "0.13.0"; + version = "0.13.1"; src = fetchurl { url = "https://github.com/weavejester/cljfmt/releases/download/${version}/cljfmt-${version}-standalone.jar"; - hash = "sha256-gPIDaFb8mmJyoAIOUWV7ZNNi/rSnuRkYN16Grqly0/c="; + hash = "sha256-Dj1g6hMzRhqm0pJggODVFgEkayB2Wdh3d0z6RglHbgY="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/by-name/cl/cljstyle/package.nix b/pkgs/by-name/cl/cljstyle/package.nix new file mode 100644 index 000000000000..f27f1bd57957 --- /dev/null +++ b/pkgs/by-name/cl/cljstyle/package.nix @@ -0,0 +1,52 @@ +{ + lib, + buildGraalvmNativeImage, + fetchMavenArtifact, + fetchurl, + graalvmPackages, + versionCheckHook, +}: + +let + pname = "cljstyle"; + version = "0.17.642"; + + # must be on classpath to build native image + graal-build-time = fetchMavenArtifact { + repos = [ "https://repo.clojars.org/" ]; + groupId = "com.github.clj-easy"; + artifactId = "graal-build-time"; + version = "1.0.5"; + hash = "sha256-M6/U27a5n/QGuUzGmo8KphVnNa2K+LFajP5coZiFXoY="; + }; +in +buildGraalvmNativeImage { + inherit pname version; + + src = fetchurl { + url = "https://github.com/greglook/${pname}/releases/download/${version}/${pname}-${version}.jar"; + hash = "sha256-AkCuTZeDXbNBuwPZEMhYGF/oOGIKq5zVDwL8xwnj+mE="; + }; + + graalvmDrv = graalvmPackages.graalvm-ce; + + extraNativeImageBuildArgs = [ + "-H:+ReportExceptionStackTraces" + "--no-fallback" + "-cp ${graal-build-time.passthru.jar}" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "version" ]; + + meta = { + description = "Tool for formatting Clojure code"; + homepage = "https://github.com/greglook/cljstyle"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.epl10; + changelog = "https://github.com/greglook/cljstyle/blob/${version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ psyclyx ]; + mainProgram = "cljstyle"; + }; +} diff --git a/pkgs/by-name/cl/clock-rs/package.nix b/pkgs/by-name/cl/clock-rs/package.nix index dc657cba17c9..b6047daa75d7 100644 --- a/pkgs/by-name/cl/clock-rs/package.nix +++ b/pkgs/by-name/cl/clock-rs/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "clock-rs"; - version = "0.1.214"; + version = "0.1.215"; src = fetchFromGitHub { owner = "Oughie"; repo = "clock-rs"; tag = "v${version}"; - sha256 = "sha256-D0Wywl20TFIy8aQ9UkcI6T+5huyRuCCPc+jTeXsZd8g="; + sha256 = "sha256-uDEvJqaaBNRxohYqHE6qfqUF07ynRvGwJKWbYfgPEvg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-W4m4JffqNwebGWYNsMF6U0bDroqXJAixmcmqcqYjyzw="; + cargoHash = "sha256-Zry6mkOUdEgC95Y3U3RCXPJUsmaSoRPlHvUThI92GQU="; meta = { description = "Modern, digital clock that effortlessly runs in your terminal"; diff --git a/pkgs/by-name/cl/clockify/package.nix b/pkgs/by-name/cl/clockify/package.nix index 6441c4bbc202..d25c393bc3a0 100644 --- a/pkgs/by-name/cl/clockify/package.nix +++ b/pkgs/by-name/cl/clockify/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "clockify"; - version = "2.2.9.2224"; + version = "2.3.2.2633"; src = fetchurl { - url = "https://web.archive.org/web/20241218115559/https://clockify.me/downloads/Clockify_Setup.AppImage"; - hash = "sha256-/L70C+sTFJPzXkt1NSak2wVTRtFy2zInIlmLPG5LqeY="; + url = "https://web.archive.org/web/20250419021523/https://clockify.me/downloads/Clockify_Setup.AppImage"; + hash = "sha256-cQP1QkF2uWGsCjYjVdxPFLL8atAjT6rPQbPqeNX0QqQ="; }; extraInstallCommands = diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix index e9ed88881c7b..695ada8c5491 100644 --- a/pkgs/by-name/cl/clojure-lsp/package.nix +++ b/pkgs/by-name/cl/clojure-lsp/package.nix @@ -10,18 +10,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2025.03.07-17.42.36"; + version = "2025.03.27-20.21.36"; src = fetchFromGitHub { owner = "clojure-lsp"; repo = "clojure-lsp"; rev = version; - hash = "sha256-3CKY3t2NWGAQNWYhmyiq3IJDMp81Q0LDCrS23XJeIys="; + hash = "sha256-xS/WVTJFCdktYxBvey855PW5Heqlx4EhpDAMHQ5Bj5M="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - hash = "sha256-ZxUSIHUTJW2TtRZiESKAnuBOS7s2UwzqpTTgAxjkR7Q="; + hash = "sha256-g8jX+41gojvoJHV/xMcP+4ROc9LewCUTuDTQcpHQ6+E="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index 1f623d9b9fac..c6a4052d8999 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clorinde"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "halcyonnouveau"; repo = "clorinde"; tag = "clorinde-v${finalAttrs.version}"; - hash = "sha256-zl4LSDxbvzmfigMCTvaoF1vGbWj/Obce4aHpM0rPqxM="; + hash = "sha256-PUAySbgmbulSlkabABiSFeDDa+o0tQ2uQtiQGSqO1/w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-05sN5MkwBhpdmVcz0OUwx7h2ZJBjZefj8B9dLvkPZLw="; + cargoHash = "sha256-zSeAD3MBflO+lhuLxH57YhR6wxsqZn62XQ0dgImdNLE="; cargoBuildFlags = [ "--package=clorinde" ]; diff --git a/pkgs/by-name/cl/closurecompiler/package.nix b/pkgs/by-name/cl/closurecompiler/package.nix index e2f0033080ef..99579703b5bc 100644 --- a/pkgs/by-name/cl/closurecompiler/package.nix +++ b/pkgs/by-name/cl/closurecompiler/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20240317"; + version = "20250407"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-axJQrCHAW90gncUV2bYDezC1VVooTddB/wWRqChIt84="; + sha256 = "sha256-T9qZBdjeV+pa5d+wRGSAwmP1Kn7laZTuFuDOxqadhVQ="; }; dontUnpack = true; diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix index bfaf3e536471..442a83cf3e26 100644 --- a/pkgs/by-name/cl/cloud-hypervisor/package.nix +++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix @@ -57,6 +57,7 @@ rustPlatform.buildRustPackage rec { ]; platforms = [ "aarch64-linux" + "riscv64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/cl/cloud-provider-kind/package.nix b/pkgs/by-name/cl/cloud-provider-kind/package.nix new file mode 100644 index 000000000000..6f9842e4153f --- /dev/null +++ b/pkgs/by-name/cl/cloud-provider-kind/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + gitUpdater, + stdenv, +}: +buildGoModule rec { + pname = "cloud-provider-kind"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "cloud-provider-kind"; + tag = "v${version}"; + hash = "sha256-6HdP6/uUCtLyZ7vjFGB2NLqe73v/yolRTUE5s/KyIIk="; + }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + vendorHash = null; + + checkFlags = lib.optional stdenv.isDarwin "-skip=^Test_firstSuccessfulProbe$"; + + meta = { + description = "Load Balancer implementation for Kubernetes-in-Docker"; + homepage = "https://github.com/kubernetes-sigs/cloud-provider-kind"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nicoo ]; + mainProgram = "cloud-provider-kind"; + }; +} diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index c44772eedc6b..ab7966ce3fda 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "0.8.12"; + version = "0.8.17"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-nIpQL9TtkLiw9M20ueD6CtFroBDJDaHslPPnAbIZDj4="; - aarch64-linux = "sha256-DSocmD0aisLBTt91ga4evgdirzJKtpuup/FYQ2ap1og="; - x86_64-darwin = "sha256-uBNwJaorejquuR+/dWrtOyj6DzU8BZ6O5MLQ5TsYp28="; - aarch64-darwin = "sha256-X+PuCj50Ep3TIWQrZRwJKJRXAPXJ3IKqnYlt5CKMOw0="; + x86_64-linux = "sha256-j3QJJ6cF+dcotkMJcDbW1rf1ETdfofiTotDcV+bH8zY="; + aarch64-linux = "sha256-0N+D0ba3+D6xfiW8RjV1XHTcypLiGyuuHZFOqYS3JZE="; + x86_64-darwin = "sha256-YCn7jvpgh2+i6qWBbsqSBFmNlwPduPNExXF+QnxiQ+c="; + aarch64-darwin = "sha256-EOgrnJljZVSkzjZRZSUIfn1Ly6IrTS6I/8uwRVktnzE="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckPhaseInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/cl/cloudflare-dyndns/package.nix b/pkgs/by-name/cl/cloudflare-dyndns/package.nix index cf013c5d69ac..dcbfbb2b8f27 100644 --- a/pkgs/by-name/cl/cloudflare-dyndns/package.nix +++ b/pkgs/by-name/cl/cloudflare-dyndns/package.nix @@ -6,27 +6,24 @@ python3.pkgs.buildPythonApplication rec { pname = "cloudflare-dyndns"; - version = "5.0"; + version = "5.3"; pyproject = true; src = fetchFromGitHub { owner = "kissgyorgy"; repo = "cloudflare-dyndns"; rev = "v${version}"; - hash = "sha256-tI6qdNxIMEuAR+BcqsRi2EBXTQnfdDLKW7Y+fbcmlao="; + hash = "sha256-t0MqH9lDfl+cAnPYSG7P32OGO8Qpo1ep0Hj3Xl76lhU="; }; build-system = with python3.pkgs; [ - poetry-core + hatchling ]; dependencies = with python3.pkgs; [ - attrs click - cloudflare - pydantic - requests httpx + pydantic truststore ]; diff --git a/pkgs/by-name/cl/cloudflare-utils/package.nix b/pkgs/by-name/cl/cloudflare-utils/package.nix index d1f35537098c..80de794035a6 100644 --- a/pkgs/by-name/cl/cloudflare-utils/package.nix +++ b/pkgs/by-name/cl/cloudflare-utils/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "cloudflare-utils"; - version = "1.3.5"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Cyb3r-Jak3"; repo = "cloudflare-utils"; rev = "v${version}"; - hash = "sha256-LbqH48ysOp2s+e+52doHIyaxUbzzCdJqhdvLuIJ3CCc="; + hash = "sha256-/vausJEe5g6Txgq1z7oUUku0w6sd/mmYcZQ8D7dZ03E="; }; - vendorHash = "sha256-fg2BJkXdCWAO83kMoxkHlEyZuVezu9rs0hEda17KObE="; + vendorHash = "sha256-/kbXAljCe07dC/jL4RMeN8tKXhSPMxXY33CqBDySA8w="; meta = { description = "Helpful Cloudflare utility program"; diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index 7ffc5647ff91..f59722e4d55e 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -23,15 +23,15 @@ }: let - version = "2025.1.861"; + version = "2025.4.929"; sources = { x86_64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb"; - hash = "sha256-9Y1mBKS74x1F3OEusqvm7W8RoJnfBHnXTtwbFVfhjc4="; + hash = "sha256-9pofIjiKbe/8vKWe8bc1xoRE1PSexeDxnJcVqfxHd2c="; }; aarch64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb"; - hash = "sha256-WM9c17t5rJDdGeMP17k/eZx4knLHd+MbkleIF1mNA4A="; + hash = "sha256-Y3VMuf9rxsvvfL/UVbW2d8hWHfEMhoDZcv/oahinFNo="; }; }; in @@ -107,11 +107,12 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/warp-svc --prefix PATH : ${lib.makeBinPath [ nftables ]} + wrapProgram $out/bin/warp-cli --prefix PATH : ${lib.makeBinPath [ desktop-file-utils ]} ''; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru = { inherit sources; @@ -145,7 +146,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Replaces the connection between your device and the Internet with a modern, optimized, protocol"; - homepage = "https://pkg.cloudflareclient.com/packages/cloudflare-warp"; + homepage = "https://pkg.cloudflareclient.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; mainProgram = "warp-cli"; diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix new file mode 100644 index 000000000000..76c098576006 --- /dev/null +++ b/pkgs/by-name/cl/cloudflared/package.nix @@ -0,0 +1,96 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + callPackage, + gitUpdater, +}: + +buildGoModule rec { + pname = "cloudflared"; + version = "2025.5.0"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = "cloudflared"; + tag = version; + hash = "sha256-ZnkE9x4A9HoiSXzvYuzyW/dH08r0aJUk/q6gFVgtTjk="; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X github.com/cloudflare/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=nixpkgs" + ]; + + preCheck = '' + # Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory + export HOME="$(mktemp -d)" + + # Workaround for: protocol_test.go:11: + # lookup protocol-v2.argotunnel.com on [::1]:53: read udp [::1]:51876->[::1]:53: read: connection refused + substituteInPlace "edgediscovery/protocol_test.go" \ + --replace "TestProtocolPercentage" "SkipProtocolPercentage" + + # Workaround for: origin_icmp_proxy_test.go:46: + # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied + substituteInPlace "ingress/origin_icmp_proxy_test.go" \ + --replace "TestICMPRouterEcho" "SkipICMPRouterEcho" + + # Workaround for: origin_icmp_proxy_test.go:110: + # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied + substituteInPlace "ingress/origin_icmp_proxy_test.go" \ + --replace "TestConcurrentRequestsToSameDst" "SkipConcurrentRequestsToSameDst" + + # Workaround for: origin_icmp_proxy_test.go:242: + # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied + substituteInPlace "ingress/origin_icmp_proxy_test.go" \ + --replace "TestICMPRouterRejectNotEcho" "SkipICMPRouterRejectNotEcho" + + # Workaround for: origin_icmp_proxy_test.go:108: + # Received unexpected error: cannot create ICMPv4 proxy: Group ID 100 is not between ping group 65534 to 65534 nor ICMPv6 proxy: socket: permission denied + substituteInPlace "ingress/origin_icmp_proxy_test.go" \ + --replace "TestTraceICMPRouterEcho" "SkipTraceICMPRouterEcho" + + # Workaround for: icmp_posix_test.go:28: socket: permission denied + substituteInPlace "ingress/icmp_posix_test.go" \ + --replace "TestFunnelIdleTimeout" "SkipFunnelIdleTimeout" + + # Workaround for: icmp_posix_test.go:88: Received unexpected error: Group ID 100 is not between ping group 65534 to 65534 + substituteInPlace "ingress/icmp_posix_test.go" \ + --replace "TestReuseFunnel" "SkipReuseFunnel" + + # Workaround for: manager_test.go:197: + # Should be false + substituteInPlace "datagramsession/manager_test.go" \ + --replace "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions" + ''; + + doCheck = !stdenv.hostPlatform.isDarwin; + + passthru = { + tests.simple = callPackage ./tests.nix { inherit version; }; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Cloudflare Tunnel daemon, Cloudflare Access toolkit, and DNS-over-HTTPS client"; + homepage = "https://www.cloudflare.com/products/tunnel"; + changelog = "https://github.com/cloudflare/cloudflared/releases/tag/${version}"; + license = licenses.asl20; + platforms = platforms.unix ++ platforms.windows; + maintainers = with maintainers; [ + bbigras + enorris + thoughtpolice + piperswe + qjoly + wrbbz + ]; + mainProgram = "cloudflared"; + }; +} diff --git a/pkgs/applications/networking/cloudflared/tests.nix b/pkgs/by-name/cl/cloudflared/tests.nix similarity index 100% rename from pkgs/applications/networking/cloudflared/tests.nix rename to pkgs/by-name/cl/cloudflared/tests.nix diff --git a/pkgs/by-name/cl/cloudfoundry-cli/package.nix b/pkgs/by-name/cl/cloudfoundry-cli/package.nix index 90db90e6abed..36022db8ad53 100644 --- a/pkgs/by-name/cl/cloudfoundry-cli/package.nix +++ b/pkgs/by-name/cl/cloudfoundry-cli/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.12.0"; + version = "8.14.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-W9hshsq02AiDVNFYMoIWCei04b7pPTmIP2+fMyLgcDY="; + sha256 = "sha256-vlDq7Wme8undaZ6HNd84QsWW8Vz0Tev+9nSTbn+NLic="; }; - vendorHash = "sha256-6pAcDdCCp64o6VuSSLyLtnLPD5OxSt4o3eUpRhJzXTI="; + vendorHash = "sha256-TWVnUdqVIqTRn5tgO+DgCY421riyYkrQS8AkTVYszZ4="; subPackages = [ "." ]; diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix index 0748232051c9..74372b7a2ae0 100644 --- a/pkgs/by-name/cl/cloudlist/package.nix +++ b/pkgs/by-name/cl/cloudlist/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "cloudlist"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cloudlist"; tag = "v${version}"; - hash = "sha256-HYCD7mCfIJOijKTPvL5OixZ6zmI/P/+0Agx9bBhxy0Y="; + hash = "sha256-xCGGyPfD6cQgVTowh8ZO9Ak3xH5Hct51Vm18FJWLF1E="; }; - vendorHash = "sha256-fZ7l4+No/a8EYqC1nacSyh5fD2QAdzANjTTmbY0d/L4="; + vendorHash = "sha256-PW9Yu8d5PPIL6cc692N8e5qO73drEgfu7JrVeihggcs="; subPackages = [ "cmd/cloudlist/" ]; @@ -29,7 +29,7 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "Tool for listing assets from multiple cloud providers"; diff --git a/pkgs/by-name/cl/cloudlogoffline/package.nix b/pkgs/by-name/cl/cloudlogoffline/package.nix deleted file mode 100644 index 6732d3ec92a2..000000000000 --- a/pkgs/by-name/cl/cloudlogoffline/package.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - qt6, - makeDesktopItem, - copyDesktopItems, -}: -stdenv.mkDerivation (self: { - pname = "cloudlogoffline"; - version = "1.1.5"; - rev = self.version; - hash = "sha256-CF56yk7hsM4M43le+CLy93oLyZ9kaqaRTFWtjJuF6Vo="; - - src = fetchFromGitHub { - inherit (self) rev hash; - owner = "myzinsky"; - repo = "cloudLogOffline"; - }; - - nativeBuildInputs = - [ - qt6.qmake - qt6.wrapQtAppsHook - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - copyDesktopItems - ]; - - buildInputs = [ - qt6.qtbase - qt6.qtlocation - qt6.qtpositioning - qt6.qtsvg - ]; - - postPatch = - let - targetDir = if stdenv.hostPlatform.isDarwin then "Applications" else "bin"; - in - '' - substituteInPlace CloudLogOffline.pro \ - --replace 'target.path = /opt/$''${TARGET}/bin' "target.path = $out/${targetDir}" - ''; - - postInstall = - lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - install -d $out/share/pixmaps - install -m644 images/logo_circle.svg $out/share/pixmaps/cloudlogoffline.svg - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # FIXME: For some reason, the Info.plist isn't copied correctly to - # the application bundle when building normally, instead creating an - # empty file. This doesn't happen when building in a dev shell with - # genericBuild. - # So, just copy the file manually. - plistPath="$out/Applications/CloudLogOffline.app/Contents/Info.plist" - [[ -s "$plistPath" ]] && { echo "expected Info.plist to be empty; workaround no longer needed?"; exit 1; } - install -m644 macos/Info.plist $out/Applications/CloudLogOffline.app/Contents/Info.plist - ''; - - desktopItems = lib.optionals (!stdenv.hostPlatform.isDarwin) [ - (makeDesktopItem { - name = "cloudlogoffline"; - desktopName = "CloudLogOffline"; - exec = "CloudLogOffline"; - icon = "cloudlogoffline"; - comment = self.meta.description; - genericName = "Ham radio contact logbook"; - categories = [ - "Network" - "Utility" - "HamRadio" - ]; - }) - ]; - - meta = { - description = "Offline frontend for Cloudlog"; - homepage = "https://github.com/myzinsky/cloudLogOffline"; - license = [ lib.licenses.lgpl3 ]; - mainProgram = "CloudLogOffline"; - maintainers = [ lib.maintainers.dblsaiko ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/by-name/cl/clpeak/package.nix b/pkgs/by-name/cl/clpeak/package.nix index bf8285ca8969..05630a9bb0f3 100644 --- a/pkgs/by-name/cl/clpeak/package.nix +++ b/pkgs/by-name/cl/clpeak/package.nix @@ -7,26 +7,18 @@ opencl-clhpp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clpeak"; - version = "1.1.0"; + version = "1.1.4"; src = fetchFromGitHub { owner = "krrishnarraj"; repo = "clpeak"; - rev = version; + tag = finalAttrs.version; fetchSubmodules = true; - sha256 = "1wkjpvn4r89c3y06rv7gfpwpqw6ljmqwz0w0mljl9y5hn1r4pkx2"; + hash = "sha256-unQLZ5EExL9lU2XuYLJjASeFzDA74+TnU0CQTWyNYiQ="; }; - patches = [ - # The cl.hpp header was removed from opencl-clhpp. This patch - # updates clpeak to use the new cp2.hpp header. The patch comes - # from the following PR and was updated to apply against more - # recent versions: https://github.com/krrishnarraj/clpeak/pull/46 - ./clpeak-clhpp2.diff - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -34,11 +26,11 @@ stdenv.mkDerivation rec { opencl-clhpp ]; - meta = with lib; { + meta = { description = "Tool which profiles OpenCL devices to find their peak capacities"; homepage = "https://github.com/krrishnarraj/clpeak/"; - license = licenses.unlicense; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.xokdvium ]; mainProgram = "clpeak"; }; -} +}) diff --git a/pkgs/by-name/cl/clubhouse-cli/package.nix b/pkgs/by-name/cl/clubhouse-cli/package.nix deleted file mode 100644 index f77b9419988b..000000000000 --- a/pkgs/by-name/cl/clubhouse-cli/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildNpmPackage, - fetchFromGitHub, -}: - -buildNpmPackage rec { - pname = "clubhouse-cli"; - version = "2.7.0"; - - src = fetchFromGitHub { - owner = "andjosh"; - repo = "clubhouse-cli"; - rev = "v${version}"; - hash = "sha256-OGUEPWKL3GBIQHEDljX1gXMRDEztIrJT5ivAIcyW91k="; - }; - - npmDepsHash = "sha256-QlCLEvmqLVkWwgTVlToYD6bptLp/MVfQ10Wdfr3PIr4="; - - meta = { - description = "Command line tool for viewing, creating and updating clubhouse.io stories"; - homepage = "https://github.com/andjosh/clubhouse-cli"; - changelog = "https://github.com/andjosh/clubhouse-cli/blob/${src.rev}/CHANGELOG.md"; - license = lib.licenses.mit; - mainProgram = "club"; - maintainers = with lib.maintainers; [ tobim ]; - }; -} diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index ac81adcf2569..6aa4bbacafe3 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.9.6"; + version = "1.10.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-XXtVGIpoR2JfkR7urfHuh6xKoIvsF42NV+4yjxb8nls="; + hash = "sha256-8clNhU9RxQ63zBaNnvftp4+wUG33bL8KCxbgzJwJdPo="; }; - vendorHash = "sha256-SdLeME6EFraGUXE1zUdEfxTETUKLDmecYpWEg5DE4PQ="; + vendorHash = "sha256-iProsOETP9ahyemF2tHUVmoiqjG+ghjZkHb6PAhygb4="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/by-name/cl/clusternet/package.nix b/pkgs/by-name/cl/clusternet/package.nix index 02e0648ee688..042177ed5366 100644 --- a/pkgs/by-name/cl/clusternet/package.nix +++ b/pkgs/by-name/cl/clusternet/package.nix @@ -1,10 +1,10 @@ { lib, fetchFromGitHub, - buildGoModule, + buildGo123Module, }: -buildGoModule rec { +buildGo123Module rec { pname = "clusternet"; version = "0.17.3"; diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/by-name/cl/clutter-gst/package.nix similarity index 100% rename from pkgs/development/libraries/clutter-gst/default.nix rename to pkgs/by-name/cl/clutter-gst/package.nix diff --git a/pkgs/by-name/cm/cmake/009-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NETRC-values.diff b/pkgs/by-name/cm/cmake/009-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NETRC-values.diff new file mode 100644 index 000000000000..7749a95053a0 --- /dev/null +++ b/pkgs/by-name/cm/cmake/009-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NETRC-values.diff @@ -0,0 +1,13 @@ +diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx +index b9133ed7d47b9023de66a94ed5ff15a0f1ba440c..0cf8a71a72daaa07cb42b3f5eef81d2d04300cd6 100644 +--- a/Source/cmCurl.cxx ++++ b/Source/cmCurl.cxx +@@ -170,7 +170,7 @@ std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level, + const std::string& netrc_file) + { + std::string e; +- CURL_NETRC_OPTION curl_netrc_level = CURL_NETRC_LAST; ++ long curl_netrc_level = CURL_NETRC_LAST; + ::CURLcode res; + + if (!netrc_level.empty()) { diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 3b16a92821fd..15dc2765fcc6 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -29,13 +29,11 @@ useSharedLibraries ? (!isMinimalBuild && !stdenv.hostPlatform.isCygwin), uiToolkits ? [ ], # can contain "ncurses" and/or "qt5" buildDocs ? !(isMinimalBuild || (uiToolkits == [ ])), - darwin, libsForQt5, gitUpdater, }: let - inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; inherit (libsForQt5) qtbase wrapQtAppsHook; cursesUI = lib.elem "ncurses" uiToolkits; qt5UI = lib.elem "qt5" uiToolkits; @@ -50,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.31.5"; + version = "3.31.6"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-ZvtToUVki+VrRvqejMreOk0N/JLkAeUs52va0f6kPSc="; + hash = "sha256-ZTQn8PUBR1Cq//InJ/sqpgxscyypGAjPt4ziLd2eVfA="; }; patches = @@ -78,6 +76,8 @@ stdenv.mkDerivation (finalAttrs: { # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900 # Needed to correctly link curl in pkgsStatic. ./008-FindCURL-Add-more-target-properties-from-pkg-config.diff + # Backport of https://gitlab.kitware.com/cmake/cmake/-/commit/1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd + ./009-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NETRC-values.diff ]; outputs = @@ -117,9 +117,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional useOpenSSL openssl ++ lib.optional cursesUI ncurses - ++ lib.optional qt5UI qtbase - ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices - ++ lib.optional (stdenv.hostPlatform.isDarwin && !isMinimalBuild) SystemConfiguration; + ++ lib.optional qt5UI qtbase; preConfigure = '' fixCmakeFiles . diff --git a/pkgs/by-name/cm/cmatrix/package.nix b/pkgs/by-name/cm/cmatrix/package.nix index 756cc96e8987..af5c949c7495 100644 --- a/pkgs/by-name/cm/cmatrix/package.nix +++ b/pkgs/by-name/cm/cmatrix/package.nix @@ -4,32 +4,38 @@ fetchFromGitHub, autoreconfHook, ncurses, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cmatrix"; version = "2.0"; src = fetchFromGitHub { owner = "abishekvashok"; repo = "cmatrix"; - rev = "v${version}"; - sha256 = "1h9jz4m4s5l8c3figaq46ja0km1gimrkfxm4dg7mf4s84icmasbm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-dWlVWSRIE1fPa6R2N3ONL9QJlDQEqxfdYIgWTSr5MsE="; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses ]; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-V"; + doInstallCheck = true; + + meta = { description = "Simulates the falling characters theme from The Matrix movie"; - license = licenses.gpl3; longDescription = '' CMatrix simulates the display from "The Matrix" and is based on the screensaver from the movie's website. ''; homepage = "https://github.com/abishekvashok/cmatrix"; + changelog = "https://github.com/abishekvashok/cmatrix/releases/tag/v${finalAttrs.version}"; platforms = ncurses.meta.platforms; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ Tert0 ]; mainProgram = "cmatrix"; }; -} +}) diff --git a/pkgs/by-name/cm/cmctl/package.nix b/pkgs/by-name/cm/cmctl/package.nix index 7f72b847e4d8..a443b7df1faf 100644 --- a/pkgs/by-name/cm/cmctl/package.nix +++ b/pkgs/by-name/cm/cmctl/package.nix @@ -7,52 +7,50 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "cmctl"; - version = "1.14.7"; + version = "2.2.0"; src = fetchFromGitHub { owner = "cert-manager"; - repo = "cert-manager"; - rev = "v${version}"; - hash = "sha256-ZvrR8k1jiyAMUKM9VA6vKH2uhMKnd22OQe08CIlxXjs="; + repo = "cmctl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Kr7vwVW6v08QRbJDs2u0vK241ljNfhLVYIQCBl31QSs="; }; - sourceRoot = "${src.name}/cmd/ctl"; - - vendorHash = "sha256-qaSzAPNVe25Fbbfqy0OFFnMJ21IlWuoJKwnT7y2wmOs="; + vendorHash = "sha256-SYCWvt2K3MEow4cDKxLSK+Bp0hZG9rNI9PoXdPcPESg="; ldflags = [ "-s" "-w" - "-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build.name=cmctl" - "-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build/commands.registerCompletion=true" - "-X github.com/cert-manager/cert-manager/pkg/util.AppVersion=v${version}" - "-X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=${src.rev}" + "-X github.com/cert-manager/cert-manager/pkg/util.AppVersion=v${finalAttrs.version}" + "-X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=${finalAttrs.src.rev}" ]; + # integration tests require running etcd, kubernetes + postPatch = '' + rm -r test/integration + ''; + nativeBuildInputs = [ installShellFiles ]; - # Trusted by this computer: no: x509: “cert-manager” certificate is not trusted + # Trusted by this computer: no: x509: “cert-manager” certificate is not + # trusted doCheck = !stdenv.hostPlatform.isDarwin; - postInstall = - '' - mv $out/bin/ctl $out/bin/cmctl - '' - + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd cmctl \ + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd cmctl \ --bash <($out/bin/cmctl completion bash) \ --fish <($out/bin/cmctl completion fish) \ --zsh <($out/bin/cmctl completion zsh) - ''; + ''; passthru.updateScript = nix-update-script { }; - meta = with lib; { - description = "CLI tool for managing cert-manager service on Kubernetes clusters"; + meta = { + description = "Command line utility to interact with a cert-manager instalation on Kubernetes"; mainProgram = "cmctl"; longDescription = '' cert-manager adds certificates and certificate issuers as resource types @@ -63,10 +61,13 @@ buildGoModule rec { Let's Encrypt, HashiCorp Vault, and Venafi as well as private PKI, and it ensures certificates remain valid and up to date, attempting to renew certificates at an appropriate time before expiry. + + cmctl is a command line tool to help you manage cert-manager and its + resources inside your Kubernetes cluster. ''; - downloadPage = "https://github.com/cert-manager/cert-manager"; - license = licenses.asl20; + downloadPage = "https://github.com/cert-manager/cmctl"; + license = lib.licenses.asl20; homepage = "https://cert-manager.io/"; - maintainers = with maintainers; [ joshvanl ]; + maintainers = with lib.maintainers; [ joshvanl ]; }; -} +}) diff --git a/pkgs/by-name/cm/cminpack/package.nix b/pkgs/by-name/cm/cminpack/package.nix index 08f5ea016148..7d2b48cd3d13 100644 --- a/pkgs/by-name/cm/cminpack/package.nix +++ b/pkgs/by-name/cm/cminpack/package.nix @@ -2,7 +2,6 @@ lib, stdenv, cmake, - darwin, fetchFromGitHub, withBlas ? true, blas, @@ -25,15 +24,9 @@ stdenv.mkDerivation rec { cmake ]; - buildInputs = - lib.optionals withBlas [ - blas - ] - ++ lib.optionals (withBlas && stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.frameworks.Accelerate - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.CoreVideo - ]; + buildInputs = lib.optionals withBlas [ + blas + ]; cmakeFlags = [ "-DUSE_BLAS=${if withBlas then "ON" else "OFF"}" diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index e97baa266960..b31597fcbee4 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.46.2"; + version = "11.54.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-V2N+YFaQH/1WsPJUa97CNONwpk+fB2YaO+GUnfcyBEE="; + hash = "sha256-w9O3uEgzSe7e6+ij3AGVOVmDemDY8D1I4UcGXKb1B3E="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-khFV7dli2J6UVNDV5IQoMI0YU8X1FviLCuN524UEFTg="; + vendorHash = "sha256-iGWdx4bgc4TFZ6opc/W9FfXkn6Xgff8pQjOl5SczgSE="; ldflags = [ "-w" diff --git a/pkgs/by-name/cn/cnsprcy/package.nix b/pkgs/by-name/cn/cnsprcy/package.nix index 283459e487a2..bc277adbe46b 100644 --- a/pkgs/by-name/cn/cnsprcy/package.nix +++ b/pkgs/by-name/cn/cnsprcy/package.nix @@ -5,30 +5,38 @@ sqlite, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cnsprcy"; - version = "0.2.0"; + version = "0.3.2"; src = fetchFromSourcehut { owner = "~xaos"; repo = "cnsprcy"; - rev = "v0.2.0"; - hash = "sha256-f+DauSU4bT3EljY8/ig7jLnUgyDPEo2NSBQcPN0iKx0="; + rev = "cnspr/v${finalAttrs.version}"; + hash = "sha256-wwsemwN87YsNRLkr0UNbzSLF2WDaKY6IFXew64g4QoU="; }; + sourceRoot = "${finalAttrs.src.name}/v${finalAttrs.version}"; + useFetchCargoVendor = true; - cargoHash = "sha256-lPTufjKOXMvPy+cP1UyVCTfRXkOmzZqDR6yraIgk+Dg="; + + cargoHash = "sha256-8hNuF5tD1PwdIJB0q3wxDOGDcppo0ac+zol3AHWGv0s="; + + passthru.updateScript = ./update.sh; RUSTC_BOOTSTRAP = true; - buildInputs = [ sqlite ]; meta = { description = "End to end encrypted connections between trusted devices"; homepage = "https://git.sr.ht/~xaos/cnsprcy"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ supinie ]; + maintainers = with lib.maintainers; [ + supinie + oluchitheanalyst + ]; + teams = [ lib.teams.ngi ]; mainProgram = "cnspr"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/cn/cnsprcy/update.sh b/pkgs/by-name/cn/cnsprcy/update.sh new file mode 100755 index 000000000000..c6ab5fe5ba46 --- /dev/null +++ b/pkgs/by-name/cn/cnsprcy/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update common-updater-scripts gnused + +set -euo pipefail + +version=$(list-git-tags --url="https://git.sr.ht/~xaos/cnsprcy" | sed -En 's/^cnspr\/v(.*)/\1/p' | tail -1) +nix-update cnsprcy --version="$version" diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix index 2058ba3fc98f..9532011b9db7 100644 --- a/pkgs/by-name/cn/cntb/package.nix +++ b/pkgs/by-name/cn/cntb/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "cntb"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "contabo"; repo = "cntb"; rev = "v${version}"; - hash = "sha256-4QS1fkXVcGxhZDPRLDc0xKl4jr8W4og/Qf591i3gzxk="; + hash = "sha256-chO59HBpMXXFMIt+7UjUxE3WtzUak8VhD/ahEXT5l/k="; # docs contains two files with the same name but different cases, # this leads to a different hash on case insensitive filesystems (e.g. darwin) # https://github.com/contabo/cntb/issues/34 @@ -22,7 +22,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorHash = "sha256-LOGSllVQ28bXaqHXEv1Zd1vcTRZTZ5wy+gSQv1JWKMU="; + vendorHash = "sha256-D0B1a2qbTGpAK1PkB+wqsReft14/SoKY3/I6k+pB2D0="; ldflags = [ "-X contabo.com/cli/cntb/cmd.version=${src.rev}" diff --git a/pkgs/by-name/co/cobalt/package.nix b/pkgs/by-name/co/cobalt/package.nix index 7ee588a34ef1..c347159e9f7d 100644 --- a/pkgs/by-name/co/cobalt/package.nix +++ b/pkgs/by-name/co/cobalt/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cobalt"; - version = "0.19.8"; + version = "0.20.0"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-neOJ3UqRisCcyarRIXfHyl9nAe2Wl9IXVDNwIYEQYys="; + hash = "sha256-6WbJjPz+1KX04xMCiylJZiAPjF6jKPTPz7rObgFF4dY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-j2xmEoMV7lVhqj4lKWA3QdEDEGUpRlZc4ikZoDQJlB8="; + cargoHash = "sha256-Y9+zJ89XrVk3mZD1s9N7oaXvcBP5RNjp3hMjX1Wz3HA="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix index dac40f8c7851..826bbe609b7b 100644 --- a/pkgs/by-name/co/cobang/package.nix +++ b/pkgs/by-name/co/cobang/package.nix @@ -1,89 +1,76 @@ { lib, python3Packages, + blueprint-compiler, + desktop-file-utils, fetchFromGitHub, gst_all_1, gobject-introspection, - gtk3, - libhandy, - librsvg, + libadwaita, + libportal-gtk4, + meson, networkmanager, - wrapGAppsHook3, + ninja, + pipewire, + pkg-config, + wrapGAppsHook4, }: python3Packages.buildPythonApplication rec { pname = "cobang"; - version = "0.15.0"; - pyproject = true; + version = "1.6.2"; + pyproject = false; # Built with meson src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; tag = "v${version}"; - hash = "sha256-ozHmGpRx+Ts6yrDXwm4OHXTArunQbJOlA/7zJvRNQio="; + hash = "sha256-M32bGVPOkbx93gDPQcin+Dv9P8zfx1Ory+DTJY+bypI="; }; + # https://github.com/hongquan/CoBang/issues/117 postPatch = '' - # Fixes "Multiple top-level packages discovered in a flat-layout" - sed -i '$ a\[tool.setuptools]' pyproject.toml - sed -i '$ a\packages = ["cobang"]' pyproject.toml + substituteInPlace src/window.blp \ + --replace-fail 'seeing-symbolic' 'scanner-symbolic' ''; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = [ + blueprint-compiler + desktop-file-utils # Needed to recognize gobject namespaces gobject-introspection - wrapGAppsHook3 - setuptools + meson + ninja + pkg-config + wrapGAppsHook4 ]; - buildInputs = with python3Packages; [ + buildInputs = [ + gst_all_1.gst-plugins-base # Requires v4l2src (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) - # For gobject namespaces - libhandy + # gtk4paintablesink + gst_all_1.gst-plugins-rs + libadwaita + libportal-gtk4 networkmanager + pipewire ]; dependencies = with python3Packages; [ - brotlicffi - kiss-headers logbook - pillow - requests - single-version - # Unlisted dependencies - pygobject3 - python-zbar # Needed as a gobject namespace and to fix 'Caps' object is not subscriptable gst-python - ]; - - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - ]; - - pythonRelaxDeps = [ - "Pillow" + pillow + pygobject3 + python-zbar ]; # Wrapping this manually for SVG recognition dontWrapGApps = true; - postInstall = '' - # Needed by the application - cp -R data $out/${python3Packages.python.sitePackages}/ - - # Icons and applications - install -Dm 644 $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/ - install -Dm 644 $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop.in -t $out/share/applications/ - mv $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop{.in,} - ''; - preFixup = '' - wrapProgram $out/bin/cobang \ - ''${gappsWrapperArgs[@]} \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; meta = { diff --git a/pkgs/by-name/co/coc-basedpyright/package.nix b/pkgs/by-name/co/coc-basedpyright/package.nix new file mode 100644 index 000000000000..a5e4d87253c6 --- /dev/null +++ b/pkgs/by-name/co/coc-basedpyright/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage { + pname = "coc-basedpyright"; + # No tagged releases, this version is inferred from + version = "1.19.0-unstable-2025-04-30"; + + src = fetchFromGitHub { + owner = "fannheyward"; + repo = "coc-basedpyright"; + rev = "7d944083c7d4843b1dfa9e05014873b0b5bbb85b"; + hash = "sha256-5Vuw54bSk3WMy8bMsIvtkfDmlx3oocxmD1ykfpErbkc="; + }; + + npmDepsHash = "sha256-hn+Y1f7o/Oz37XXJUPF2CJbrPzZYOY0njrJv+T3ve6w="; + + meta = { + description = "Basedpyright extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-basedpyright"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wrvsrx ]; + }; +} diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index a5a4baf1c97d..a58a3ee4c2be 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -14,7 +14,9 @@ git, glib, glib-networking, + gnused, gnutls, + iproute2, json-glib, krb5, libssh, @@ -30,6 +32,7 @@ pkg-config, polkit, python3Packages, + sscg, systemd, udev, xmlto, @@ -37,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit"; - version = "331"; + version = "338"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; tag = finalAttrs.version; - hash = "sha256-G0L1ZcvjUCSNkDvYoyConymZ4bsEye03t5K15EyI008="; + hash = "sha256-ZNvMLzkDh1SuyHuChWM0YykSYu152JHvjrKVm+u0Upw="; fetchSubmodules = true; }; @@ -76,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { udev python3Packages.pygobject3 python3Packages.pip + bashInteractive ]; postPatch = '' @@ -93,6 +97,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/common/cockpitconf.c \ --replace-fail 'const char *cockpit_config_dirs[] = { PACKAGE_SYSCONF_DIR' 'const char *cockpit_config_dirs[] = { "/etc"' + substituteInPlace src/**/*.c \ + --replace-quiet "/bin/sh" "${lib.getExe bashInteractive}" + # instruct users with problems to create a nixpkgs issue instead of nagging upstream directly substituteInPlace configure.ac \ --replace-fail 'devel@lists.cockpit-project.org' 'https://github.com/NixOS/nixpkgs/issues/new?assignees=&labels=0.kind%3A+bug&template=bug_report.md&title=cockpit%25' @@ -160,13 +167,27 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH : ${ lib.makeBinPath [ coreutils + sscg openssl ] } \ --run 'cd $(mktemp -d)' - wrapProgram $out/bin/cockpit-bridge \ - --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} + for binary in $out/bin/cockpit-bridge $out/libexec/cockpit-askpass; do + chmod +x $binary + wrapProgram $binary \ + --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} + done + + patchShebangs $out/share/cockpit/issue/update-issue + wrapProgram $out/share/cockpit/issue/update-issue \ + --prefix PATH : ${ + lib.makeBinPath [ + iproute2 + gnused + ] + } + substituteInPlace $out/${python3Packages.python.sitePackages}/cockpit/_vendor/systemd_ctypes/libsystemd.py \ --replace-warn libsystemd.so.0 ${systemd}/lib/libsystemd.so.0 diff --git a/pkgs/by-name/co/cocom/package.nix b/pkgs/by-name/co/cocom/package.nix new file mode 100644 index 000000000000..0e3d79ec2d32 --- /dev/null +++ b/pkgs/by-name/co/cocom/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "cocom"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "LamdaLamdaLamda"; + repo = pname; + rev = "v${version}"; + sha256 = "0sl4ivn95sr5pgw2z877gmhyfc4mk9xr457i5g2i4wqnf2jmy14j"; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-kfseD0dYNC1IFAamLJee7LozGppE2mZgBMCUHJC0dP4="; + + # Tests require network access + doCheck = false; + + meta = with lib; { + description = "NTP client"; + homepage = "https://github.com/LamdaLamdaLamda/cocom"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "cocom"; + }; +} diff --git a/pkgs/by-name/co/coconutbattery/package.nix b/pkgs/by-name/co/coconutbattery/package.nix index cef8e8b27769..a822dac98fab 100644 --- a/pkgs/by-name/co/coconutbattery/package.nix +++ b/pkgs/by-name/co/coconutbattery/package.nix @@ -6,20 +6,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "coconutbattery"; - version = "3.9.14"; + version = "4.0.2,152"; src = fetchzip { url = "https://coconut-flavour.com/downloads/coconutBattery_${ - builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version + lib.replaceStrings [ "." "," ] [ "" "_" ] finalAttrs.version }.zip"; - hash = "sha256-zKSPKwDBwxlyNJFurCLLGtba9gpizJCjOOAd81vdD5Q="; + hash = "sha256-PNSDUp07lUx5ebcfM3WSJAfRQjeuIIy7KfY0KJ0i1AE="; }; - dontPatch = true; - dontConfigure = true; - dontBuild = true; - dontFixup = true; - installPhase = '' runHook preInstall @@ -29,16 +24,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "Standard for battery reading since 2005"; longDescription = '' With coconutBattery you are always aware of your current battery health. It shows you live information about the battery quality in your Mac, iPhone and iPad. ''; homepage = "https://www.coconut-flavour.com/coconutbattery"; - license = with licenses; [ unfree ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ stepbrobd ]; + license = with lib.licenses; [ unfree ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" "x86_64-darwin" diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 2af676d2d474..2e37479f805f 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -42,32 +42,33 @@ # linux installation rsync, + commandLineArgs ? "", # darwin build undmg, }: let pname = "cursor"; - version = "0.48.6"; + version = "0.49.6"; inherit (stdenvNoCC) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/1649e229afdef8fd1d18ea173f063563f1e722ef/linux/x64/Cursor-0.48.6-x86_64.AppImage"; - hash = "sha256-ZiQpVRZRaFOJ8UbANRd1F+4uhv7W/t15d9wmGKshu80="; + url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/linux/x64/Cursor-0.49.6-x86_64.AppImage"; + hash = "sha256-WH4/Zw0VJmRGyRzMlkThkhZ4fGysMKBUSIPCTsyGS4w="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/1649e229afdef8fd1d18ea173f063563f1e722ef/linux/arm64/Cursor-0.48.6-aarch64.AppImage"; - hash = "sha256-PUnrQz/H4hfbyX4mumG5v4DcKG6N6yh6taMpnnG35hQ="; + url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/linux/arm64/Cursor-0.49.6-aarch64.AppImage"; + hash = "sha256-cpNoff6mDRkT2RicaDlxzqVP9BNe6UEGgJVHr1xMiv0="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/1649e229afdef8fd1d18ea173f063563f1e722ef/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-S2l2Kz3rG6z4iKLyGFeKVeyrWq7eb09v1+knBln+Mgk="; + url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-fAaLY9YTIuNThFl5OsIMHavy2xwDgYooL4xTSp4Cwzw="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/1649e229afdef8fd1d18ea173f063563f1e722ef/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-6QEH/A6qxKLyrJQQkFj4FFXF/BoVupov92ve7fO0ads="; + url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-DNN2+gfs9u0tZmh75J258d2TL6ErIYludMgPJZcgfb8="; }; }; @@ -113,7 +114,6 @@ stdenvNoCC.mkDerivation { libdrm libgbm libGL - libGL libva-minimal libxkbcommon libxkbfile @@ -162,20 +162,17 @@ stdenvNoCC.mkDerivation { substituteInPlace $out/share/applications/cursor.desktop --replace-fail "/usr/share/cursor/cursor" "$out/bin/cursor" wrapProgram $out/bin/cursor \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" + --add-flags "--update=false" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" \ + --add-flags ${lib.escapeShellArg commandLineArgs} ''} ${lib.optionalString hostPlatform.isDarwin '' APP_DIR="$out/Applications" - CURSOR_APP="$APP_DIR/Cursor.app" mkdir -p "$APP_DIR" cp -Rp Cursor.app "$APP_DIR" mkdir -p "$out/bin" - cat << EOF > "$out/bin/cursor" - #!${stdenvNoCC.shell} - open -na "$CURSOR_APP" --args "\$@" - EOF - chmod +x "$out/bin/cursor" + ln -s "$APP_DIR/Cursor.app/Contents/Resources/app/bin/cursor" "$out/bin/cursor" ''} runHook postInstall @@ -193,7 +190,6 @@ stdenvNoCC.mkDerivation { license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ - sarahec aspauldingcode ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/co/code2prompt/package.nix b/pkgs/by-name/co/code2prompt/package.nix index 03c5e6e7b0a8..4170d25e5e63 100644 --- a/pkgs/by-name/co/code2prompt/package.nix +++ b/pkgs/by-name/co/code2prompt/package.nix @@ -4,8 +4,6 @@ rustPlatform, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,12 +28,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = [ openssl ]; meta = { description = "A CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting"; diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index c95d906d22c9..c832396b10ea 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitea, installShellFiles, lib, @@ -10,35 +9,24 @@ }: rustPlatform.buildRustPackage rec { pname = "codeberg-cli"; - version = "0.4.9"; + version = "0.4.11"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Aviac"; repo = "codeberg-cli"; rev = "v${version}"; - hash = "sha256-uifLgXwKcdZ8Q2GjVIa/EA5iq+T9pm821aKsXPbPL34="; + hash = "sha256-wf9Ve7focNBo6fGsjBQpTIx+DtxOo73AIQ9uoV8Q88Q="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nKI0bIKocTjodZ6O1VTTTrlzeeueaH6crF9jdTnx5lI="; + cargoHash = "sha256-LmLMTnNwxih5HcrMUmQpVdIVz4KeHxcOFtOrNqgGPkA="; nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - let - d = darwin.apple_sdk.frameworks; - in - [ - d.CoreServices - d.Security - d.SystemConfiguration - ] - ); + buildInputs = [ openssl ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd berg \ diff --git a/pkgs/by-name/co/codeblocks/fix-clipboard-flush.patch b/pkgs/by-name/co/codeblocks/fix-clipboard-flush.patch deleted file mode 100644 index ee4ebd61af0b..000000000000 --- a/pkgs/by-name/co/codeblocks/fix-clipboard-flush.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/src/app.cpp b/src/src/app.cpp -index 81130fd..f98d37b 100644 ---- a/src/src/app.cpp -+++ b/src/src/app.cpp -@@ -602,7 +602,8 @@ bool CodeBlocksApp::OnInit() - m_BatchWindowAutoClose = true; - m_pSingleInstance = nullptr; - -- wxTheClipboard->Flush(); -+ if (wxTheClipboard->IsOpened()) -+ wxTheClipboard->Flush(); - - wxCmdLineParser& parser = *Manager::GetCmdLineParser(); - parser.SetDesc(cmdLineDesc); -@@ -851,7 +852,8 @@ bool CodeBlocksApp::OnInit() - - int CodeBlocksApp::OnExit() - { -- wxTheClipboard->Flush(); -+ if (wxTheClipboard->IsOpened()) -+ wxTheClipboard->Flush(); - - if (g_DDEServer) delete g_DDEServer; - diff --git a/pkgs/by-name/co/codeblocks/package.nix b/pkgs/by-name/co/codeblocks/package.nix index a9cfa5d99d17..c668c9e39a73 100644 --- a/pkgs/by-name/co/codeblocks/package.nix +++ b/pkgs/by-name/co/codeblocks/package.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}"; - version = "20.03"; pname = "codeblocks"; + version = "25.03"; src = fetchurl { - url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks-${version}.tar.xz"; - sha256 = "1idaksw1vacmm83krxh5zlb12kad3dkz9ixh70glw1gaibib7vhm"; + url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.xz"; + hash = "sha256-sPaqWQjTNtf0H5V2skGKx9J++8WSgqqMkXHYjOp0BJ4="; }; nativeBuildInputs = [ @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { zip wrapGAppsHook3 ]; + buildInputs = [ wxGTK32 @@ -39,114 +40,15 @@ stdenv.mkDerivation rec { hunspell boost ]; + enableParallelBuilding = true; - patches = [ - ./writable-projects.patch - ./fix-clipboard-flush.patch - # Fix build on non-x86 machines - (fetchpatch { - name = "remove-int3.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/d76c015c456561d2c7987935a5f4dc6c0932b0c4.patch"; - sha256 = "sha256-dpH33vGf2aNdYTeLwxglYDNbvwoY2bGSG6YFRyoGw+A="; - }) - (fetchpatch { - name = "remove-pragmas.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/966949d5ab7f3cb86e2a2c7ef4e853ee209b5a1a.patch"; - sha256 = "sha256-XjejjGOvDk3gl1/n9R69XATGLj5n7tOZNyG8vIlwfyg="; - }) - # Fix build with GCC 11 - (fetchpatch { - name = "use-gcc11-openfilelist.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/a5ea6ff7ff301d739d3dc8145db1578f504ee4ca.patch"; - sha256 = "sha256-kATaLej8kJf4xm0VicHfRetOepX8O9gOhwdna0qylvQ="; - }) - (fetchpatch { - name = "use-gcc11-ccmanager.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/04b7c50fb8c6a29b2d84579ee448d2498414d855.patch"; - sha256 = "sha256-VPy/M6IvNBxUE4hZRbLExFm0DJf4gmertrqrvsXQNz4="; - }) - # Fix build with wxGTK 3.1.5 - (fetchpatch { - name = "use-wxgtk315.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/2345b020b862ec855038dd32a51ebb072647f28d.patch"; - sha256 = "sha256-RRjwZA37RllnG8cJdBEnASpEd8z0+ru96fjntO42OvU="; - }) - (fetchpatch { - name = "fix-taskbar-icons.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/40eb88e3f2b933f19f9933e06c8d0899c54f5e25.patch"; - hash = "sha256-Gj5gtxX5QNYAeF+QrPS/bBHLLEmflSxUHSLUK3GSs0I="; - }) - (fetchpatch { - name = "fix-warnings.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/56ac0396fad7a5b4bbb40bb8c4b5fe1755078aef.patch"; - excludes = [ "src/src/environmentsettingsdlg.h" ]; - hash = "sha256-tl4rF9iAf1TzCIbKhVFqcxvr1IiPdwqLYZg0SY5BJ7I="; - }) - (fetchpatch { - name = "fix-getstring.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/dbdf5c5ea9e3161233f0588a7616b7e4fedc7870.patch"; - sha256 = "sha256-DrEMFluN8vs0LERa7ULGshl7HdejpsuvXAMjIr/K1fQ="; - }) - # Fix build with wxGTK 3.1.6 - (fetchpatch { - name = "remove-code-for-old-wx-1.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/8035dfdff321754819f79e3165401aa59bd8c7f7.patch"; - hash = "sha256-Z8Ap03W/XH5VwKFVudJr7rugb0BgI2dKJgQS4yIWbEM="; - }) - (fetchpatch { - name = "remove-code-for-old-wx-2.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/9a9c6a9d5e3e0f6eff5594ecd61a2222f073be9c.patch"; - hash = "sha256-SwYixvbRuXQ+jA1ijmClWkzqzzr0viVuFOAsihGc5dM="; - }) - (fetchpatch { - name = "remove-code-for-old-wx-3.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/c28746f4887f10e6f9f10eeafae0fb22ecdbf9c7.patch"; - hash = "sha256-1lcIiCnY2nBuUsffXC2rdglOE3ccIbogcgTx4M2Ee2I="; - }) - (fetchpatch { - name = "fix-notebookstyles.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/29315df024251850832583f73e67e515dae10830.patch"; - hash = "sha256-Uc1V0eEbNljnN+1Dqb/35MLSSoLjyuRZMTofgcXRyb8="; - }) - (fetchpatch { - name = "fix-regex.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/46720043319758cb0e798eb23520063583c40eaa.patch"; - hash = "sha256-Aix58T0JJcX/7VZukU/9i/nXh9GJywXC3yXEyUZK0js="; - }) - (fetchpatch { - name = "fix-build-with-clang.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/92cb2239662952e3b59b31e03edd653bb8066e64.patch"; - hash = "sha256-XI7JW9Nuueb7muKpaC2icM/CxhrCJtO48cLHK+BVWXI="; - }) - (fetchpatch { - name = "fix-build-with-clang-2.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/edc6b145bcdcaf2823ef9c7da51a211f65d6f5d0.patch"; - hash = "sha256-GuttBL4gp1IBn3ia2O8wtOR6xOSGrzwCKXwFLI3RO5o="; - }) - (fetchpatch { - name = "fix-normalize.patch"; - url = "https://github.com/archlinux/svntogit-community/raw/458eacb60bc0e71e3d333943cebbc41e75ed0956/trunk/sc_wxtypes-normalize.patch"; - hash = "sha256-7wEwDLwuNUWHUwHjFyq74sHiuEha1VexRLEX42rPZSs="; - }) - # Fix HiDPI - (fetchpatch { - name = "update-about-dialog.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/a4aacc92640b587ad049cd6aa68c637e536e9ab5.patch"; - hash = "sha256-2S4sVn+Dq5y9xcxCkzQ+WeR+qWxAOLbQUZEnk060RI0="; - }) - (fetchpatch { - name = "add-display-info.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/f2f127cf5cd97c7da6a957a3f7764cb25cc9017e.patch"; - hash = "sha256-C0dVfC0NIHMXfWNlOwjzoGz5tmG2dlnU/EE92Jjebbs="; - }) - (fetchpatch { - name = "fix-hidpi.patch"; - url = "https://github.com/arnholm/codeblocks_sfmirror/commit/b2e4f1279804e1d11b71bc75eeb37072c3589296.patch"; - hash = "sha256-/Xp6ww9C3V6I67tTA4MrGpSGo3J0MXzFjzQU7RxY84U="; - }) - ]; - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + patches = [ ./writable-projects.patch ]; + + preConfigure = "substituteInPlace ./configure --replace-fail /bin/file ${file}/bin/file"; + postConfigure = lib.optionalString stdenv.hostPlatform.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; + configureFlags = [ "--enable-pch=no" ] ++ lib.optionals contribPlugins [ @@ -156,13 +58,14 @@ stdenv.mkDerivation rec { ) "--with-boost-libdir=${boost}/lib" ]; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins ''; - meta = with lib; { - maintainers = [ maintainers.linquize ]; - platforms = platforms.all; + meta = { + maintainers = [ lib.maintainers.linquize ]; + platforms = lib.platforms.all; description = "Open source, cross platform, free C, C++ and Fortran IDE"; longDescription = '' Code::Blocks is a free C, C++ and Fortran IDE built to meet the most demanding needs of its users. @@ -170,6 +73,6 @@ stdenv.mkDerivation rec { Finally, an IDE with all the features you need, having a consistent look, feel and operation across platforms. ''; homepage = "http://www.codeblocks.org"; - license = licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix new file mode 100644 index 000000000000..d0895cc0ef49 --- /dev/null +++ b/pkgs/by-name/co/codebook/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "codebook"; + version = "0.2.13"; + + src = fetchFromGitHub { + owner = "blopker"; + repo = "codebook"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8cbXdK0QbUVtqWvKSDRk3ejJrWo2lgykJG3O57e1ik8="; + }; + + buildAndTestSubdir = "crates/codebook-lsp"; + cargoHash = "sha256-NsPdNjqVFa3bbDu/VZk++lsh5NW01+eVOGe1BlgHDiQ="; + + # Integration tests require internet access for dictionaries + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Unholy spellchecker for code"; + homepage = "https://github.com/blopker/codebook"; + changelog = "https://github.com/blopker/codebook/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + jpds + ]; + mainProgram = "codebook-lsp"; + platforms = with lib.platforms; unix ++ windows; + }; +}) diff --git a/pkgs/by-name/co/codec2/fix-pkg-config.patch b/pkgs/by-name/co/codec2/fix-pkg-config.patch new file mode 100644 index 000000000000..58b9d13e8e3c --- /dev/null +++ b/pkgs/by-name/co/codec2/fix-pkg-config.patch @@ -0,0 +1,13 @@ +diff --git a/codec2.pc.in b/codec2.pc.in +index ecca704..94fca12 100644 +--- a/codec2.pc.in ++++ b/codec2.pc.in +@@ -1,6 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/codec2 ++libdir=@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@/codec2 + + Name: codec2 + Description: A speech codec for 2400 bit/s and below diff --git a/pkgs/by-name/co/codec2/package.nix b/pkgs/by-name/co/codec2/package.nix index 23e4896dbeca..b7c29445a81c 100644 --- a/pkgs/by-name/co/codec2/package.nix +++ b/pkgs/by-name/co/codec2/package.nix @@ -1,31 +1,43 @@ { lib, + testers, stdenv, buildPackages, fetchFromGitHub, cmake, freedvSupport ? false, - lpcnetfreedv, + lpcnet, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "codec2"; version = "1.2.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "codec2"; - rev = "${version}"; + rev = finalAttrs.version; hash = "sha256-69Mp4o3MgV98Fqfai4txv5jQw2WpoPuoWcwHsNAFPQM="; }; + patches = [ + # Fix nix-store path dupliucations + ./fix-pkg-config.patch + ]; + + outputs = [ + "out" + "lib" + "dev" + ]; + nativeBuildInputs = [ cmake buildPackages.stdenv.cc # needs to build a C program to run at build time ]; buildInputs = lib.optionals freedvSupport [ - lpcnetfreedv + lpcnet ]; # we need to unset these variables from stdenv here and then set their equivalents in the cmake flags @@ -40,10 +52,18 @@ stdenv.mkDerivation rec { install -Dm0755 src/{c2enc,c2sim,freedv_rx,freedv_tx,cohpsk_*,fdmdv_*,fsk_*,ldpc_*,ofdm_*} -t $out/bin/ ''; - # Swap keyword order to satisfy SWIG parser - postFixup = '' - sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h - ''; + postFixup = + # Swap keyword order to satisfy SWIG parser + '' + sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $dev/include/$pname/freedv_api.h + '' + + + # generated cmake module is not compatible with multiple outputs + '' + substituteInPlace $dev/lib/cmake/codec2/codec2-config.cmake --replace-fail \ + '"''${_IMPORT_PREFIX}/include/codec2' \ + "\"$dev/include/codec2" + ''; cmakeFlags = [ @@ -56,6 +76,8 @@ stdenv.mkDerivation rec { "-DLPCNET=ON" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; homepage = "https://www.rowetel.com/codec2.html"; @@ -64,5 +86,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ markuskowa ]; # generate_codebook only built for host platform broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; + pkgConfigModules = [ "codec2" ]; }; -} +}) diff --git a/pkgs/by-name/co/codechecker/package.nix b/pkgs/by-name/co/codechecker/package.nix index f09011e8e68b..110f262805ca 100644 --- a/pkgs/by-name/co/codechecker/package.nix +++ b/pkgs/by-name/co/codechecker/package.nix @@ -68,6 +68,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + distutils # required in python312 to call subcommands (see https://github.com/Ericsson/codechecker/issues/4350) lxml sqlalchemy alembic @@ -122,6 +123,6 @@ python3Packages.buildPythonApplication rec { felixsinger ]; mainProgram = "CodeChecker"; - platforms = platforms.linux; + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/pkgs/by-name/co/codecov-cli/package.nix b/pkgs/by-name/co/codecov-cli/package.nix index 63f7a7ce0457..3fe49668b9e9 100644 --- a/pkgs/by-name/co/codecov-cli/package.nix +++ b/pkgs/by-name/co/codecov-cli/package.nix @@ -1,22 +1,29 @@ { - fetchPypi, lib, python3Packages, + fetchFromGitHub, }: python3Packages.buildPythonApplication rec { pname = "codecov-cli"; - version = "9.1.1"; + version = "10.4.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-jaljYA2x2nZUOn9vy/CdtxfGjQKHtrtY13WmBdsICTA="; - }; + src = + (fetchFromGitHub { + owner = "codecov"; + repo = "codecov-cli"; + tag = "v${version}"; + hash = "sha256-R1GFQ81N/e2OX01oSs8Xs+PM0JKVZofiUPADVdxCzWk="; + fetchSubmodules = true; + }).overrideAttrs + (_: { + GIT_CONFIG_COUNT = 1; + GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; + GIT_CONFIG_VALUE_0 = "git@github.com:"; + }); - build-system = with python3Packages; [ - setuptools - ]; + build-system = with python3Packages; [ setuptools ]; pythonRelaxDeps = [ "httpx" @@ -33,6 +40,8 @@ python3Packages.buildPythonApplication rec { responses test-results-parser tree-sitter + sentry-sdk + wrapt ]; meta = { diff --git a/pkgs/by-name/co/codegrab/package.nix b/pkgs/by-name/co/codegrab/package.nix new file mode 100644 index 000000000000..d30d6cbe5de3 --- /dev/null +++ b/pkgs/by-name/co/codegrab/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "codegrab"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "epilande"; + repo = "codegrab"; + tag = "v${finalAttrs.version}"; + hash = "sha256-gKxvPcAZ8TnECAs3iMkFfZKdaq8vkLz/T9MUBWk4MfQ="; + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse --short HEAD > $out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + vendorHash = "sha256-u9pVOZOwK6xLdR4tlWN2eBoJZ2ziPEdJv78uCV0Suus="; + + checkFlags = [ + "-skip=TestParseSizeString" + ]; + + ldflags = [ + "-s" + "-w" + "-X=github.com/epilande/codegrab/internal/utils.Version=${finalAttrs.version}" + ]; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X=github.com/epilande/codegrab/internal/utils.CommitSHA=$(cat COMMIT)" + ''; + + meta = { + description = "Interactive CLI tool for selecting and bundling code into a single, LLM-ready output file"; + homepage = "https://github.com/epilande/codegrab"; + changelog = "https://github.com/epilande/codegrab/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ taha-yassine ]; + mainProgram = "grab"; + }; +}) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 29c07029fcac..a3121bf19eb2 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -23,10 +23,10 @@ let hash = { - x86_64-linux = "sha256-iFJRdECSmFZt63yVkozaZeIT0MP8vfW3G5SvuE8/wZw="; - aarch64-linux = "sha256-JJxjYFgaj2f6RQRszWfxG26SjTokhoGDZjqbg7HGoV0="; - x86_64-darwin = "sha256-27bhqNIw3Aceq8u0UthR5Ju20SQiGVMCfUZiHbzC6wk="; - aarch64-darwin = "sha256-wajMCeRaOzXSJgb5z8i+ed+2w0xWTm0I2Wb3hTq1LqY="; + x86_64-linux = "sha256-noZVrLvkiHP2H3+zWlgqRpKIFxdQzhjl/2XjRpuVYhs="; + aarch64-linux = "sha256-bznlEnBZqF3Vfkt8y9XCgQ5O0yxzlGw9HAoByblZ2A4="; + x86_64-darwin = "sha256-LIbFX5WUlWw+wF3Sj+v+2zDn2xzvDlW8AO/TJsvDa6c="; + aarch64-darwin = "sha256-ANS9FFwrgmRhknpNija9DhO2Znj/RAJhq2GUMZiau6o="; } .${system} or throwSystem; @@ -35,7 +35,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.42.4"; + version = "1.46.3"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/codeium_language_server"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix index d61ac2cf6ace..2896d97bd7bc 100644 --- a/pkgs/by-name/co/codeql/package.nix +++ b/pkgs/by-name/co/codeql/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.20.7"; + version = "2.21.2"; dontConfigure = true; dontBuild = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-PYTKW+zfmOuJr5BClB3JQKeuZH986uct0m4WyDTxxnQ="; + hash = "sha256-1/CyLpW6E6TuoDMacAn6LyjIGV8wEkJRCz05EufA2Eg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix index fa3139329d58..c2057d2179f7 100644 --- a/pkgs/by-name/co/coder/package.nix +++ b/pkgs/by-name/co/coder/package.nix @@ -15,21 +15,21 @@ let channels = { stable = { - version = "2.19.1"; + version = "2.20.3"; hash = { - x86_64-linux = "sha256-w8yET4jpuNn/DswFlJ8QpKS5YjI9gs0OTmQ0D1f5JZE="; - x86_64-darwin = "sha256-2ttVjvemACsRLoRE7wMmgsUUDM2AFNo5lXG1kCL8Ae8="; - aarch64-linux = "sha256-8BJrMj0s2MzgCueWlWsGKntEkBwW7rBYZF+5O3lVLN0="; - aarch64-darwin = "sha256-9v0OzQMGq92lNKsOevpE1jjwto+ETgfmVmK5p+JdVBI="; + x86_64-linux = "sha256-+s/xoiN7LYIMZU8n0pT3Zx6c48t+WYbWIAG73D1MkNE="; + x86_64-darwin = "sha256-3T/Szjcfiau5k4fixz33jQDYQj+bmWxh6lztY+S+BKg="; + aarch64-linux = "sha256-XJt22ZbSVRKyA3+VLh+hcy3hPSPg1witUahj6cLLshg="; + aarch64-darwin = "sha256-v6efJ41ayxe/YaaM2g0KOo+Dk4jf+xbeLuLj4o09vKY="; }; }; mainline = { - version = "2.20.0"; + version = "2.21.3"; hash = { - x86_64-linux = "sha256-Vk2Qhk4eNf9Akwza0QNuAc/lh2BtU0sd6QSS2IIyZo4="; - x86_64-darwin = "sha256-TVQYQOqJj9gnTt5HaVVjyr7sBPD3mAPpy5vNw9RJ7dc="; - aarch64-linux = "sha256-hBp7lVaJk30KD8eQ4ehoI1/DW28SWQisGtY4lJNVETw="; - aarch64-darwin = "sha256-pvFZELrXk1bf5nfbDskY3bpSCv22Ls0Leo11Dgu/dfI="; + x86_64-linux = "sha256-n5RBXjjjUfgo1xYT1atiI3M65/kQJNHkQ8q0jPifRFg="; + x86_64-darwin = "sha256-xajUFNvv/r0ZqT1zkCwthXFWoxnP3oqcBuSap0DJ9og="; + aarch64-linux = "sha256-ICIwkyu4lVXlsDzd0urvdw7u98PLPClnZn27qBMz4gs="; + aarch64-darwin = "sha256-hFu3Q2jbxAIfLbatV4lh6Rn7B5kX4QnO24meMiouAk8="; }; }; }; diff --git a/pkgs/by-name/co/coder/update.sh b/pkgs/by-name/co/coder/update.sh index 60e9a97af221..6c12ef73b191 100755 --- a/pkgs/by-name/co/coder/update.sh +++ b/pkgs/by-name/co/coder/update.sh @@ -23,7 +23,7 @@ update_version_and_hashes() { # Update version number, using '#' as delimiter sed -i "/${channel} = {/,/};/{ s#^\(\s*\)version = .*#\1version = \"$version\";# - }" ./default.nix + }" ./package.nix # Update hashes for each architecture for ARCH in "${!ARCHS[@]}"; do @@ -37,7 +37,7 @@ update_version_and_hashes() { # Update the Nix file with the new hash, using '#' as delimiter and preserving indentation sed -i "/${channel} = {/,/};/{ s#^\(\s*\)${ARCH} = .*#\1${ARCH} = \"${SRI_HASH}\";# - }" ./default.nix + }" ./package.nix done } diff --git a/pkgs/by-name/co/codesnap/package.nix b/pkgs/by-name/co/codesnap/package.nix index cc3ec65a606f..7492b19fe251 100644 --- a/pkgs/by-name/co/codesnap/package.nix +++ b/pkgs/by-name/co/codesnap/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "codesnap"; - version = "0.10.5"; + version = "0.10.9"; src = fetchFromGitHub { owner = "mistricky"; repo = "CodeSnap"; tag = "v${version}"; - hash = "sha256-g2Xu/PKRSYrHKDJ5/MZRUkDQeYuxvNWPTuymhI8Iu5Q="; + hash = "sha256-EtMEUtLSgYrb0izPPCh432uX2p/8Ykf2caAR+8ZdxhU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bQT+tpoSZ54yppyNJxbOEqQoIKqYZAnRo0j42Ti+EJo="; + cargoHash = "sha256-atvSygt1Xi+rPxcJb0zdRBnL6SpSkyCcGxs1z2hWXGA="; cargoBuildFlags = [ "-p" @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix new file mode 100644 index 000000000000..59613e6e254e --- /dev/null +++ b/pkgs/by-name/co/codex/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nodejs_22, # Node ≥22 is required by codex-cli + pnpm_10, + makeBinaryWrapper, + installShellFiles, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "codex"; + version = "0.1.2504301751"; # from codex-cli/package.json + + src = fetchFromGitHub { + owner = "openai"; + repo = "codex"; + rev = "463a230991393c7b39f2543a9766e6133ef65393"; + hash = "sha256-CSd5e6BsGEigENjPu6R6s+QhZRLQ2CTmI5XBI9mPkmA="; + }; + + pnpmWorkspaces = [ "@openai/codex" ]; + + nativeBuildInputs = [ + nodejs_22 + pnpm_10.configHook + makeBinaryWrapper + installShellFiles + ]; + + pnpmDeps = pnpm_10.fetchDeps { + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + hash = "sha256-pPwHjtqqaG+Zqmq6x5o+WCT1H9XuXAqFNKMzevp7wTc="; + }; + + buildPhase = '' + runHook preBuild + pnpm --filter @openai/codex run build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dest=$out/lib/node_modules/@openai/codex + mkdir -p "$dest" + cp -r codex-cli/dist codex-cli/bin codex-cli/package.json "$dest" + cp LICENSE README.md "$dest" + + mkdir -p $out/bin + makeBinaryWrapper ${nodejs_22}/bin/node $out/bin/codex --add-flags "$dest/bin/codex.js" + + # Install shell completions + ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + $out/bin/codex completion bash > codex.bash + $out/bin/codex completion zsh > codex.zsh + $out/bin/codex completion fish > codex.fish + installShellCompletion codex.{bash,zsh,fish} + ''} + + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "Lightweight coding agent that runs in your terminal"; + homepage = "https://github.com/openai/codex"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.malo ]; + mainProgram = "codex"; + }; +}) diff --git a/pkgs/by-name/co/codipack/package.nix b/pkgs/by-name/co/codipack/package.nix index 73fffb6c9935..3f1a717a507c 100644 --- a/pkgs/by-name/co/codipack/package.nix +++ b/pkgs/by-name/co/codipack/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "codipack"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "SciCompKL"; repo = "CoDiPack"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZD9P4yWcF9zGeTyw6ENAcGoPyc8QcBdNZNnqRV4MH8s="; + hash = "sha256-feYtPDV0t7b49NIL5s6ZoBttRG2Bkwc0gOX6R6xDIbs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cogl/package.nix b/pkgs/by-name/co/cogl/package.nix new file mode 100644 index 000000000000..76bf395f125d --- /dev/null +++ b/pkgs/by-name/co/cogl/package.nix @@ -0,0 +1,150 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libGL, + glib, + gdk-pixbuf, + xorg, + libintl, + pangoSupport ? true, + pango, + cairo, + gobject-introspection, + wayland, + gnome, + libgbm, + mesa-gl-headers, + automake, + autoconf, + gstreamerSupport ? false, + gst_all_1, + harfbuzz, +}: + +stdenv.mkDerivation rec { + pname = "cogl"; + version = "1.22.8"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/cogl-${version}.tar.xz"; + sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8"; + }; + + patches = [ + # Some deepin packages need the following patches. They have been + # submitted by Fedora on the GNOME Bugzilla + # (https://bugzilla.gnome.org/787443). Upstream thinks the patch + # could be merged, but dev can not make a new release. + ./patches/gnome_bugzilla_787443_359589_deepin.patch + ./patches/gnome_bugzilla_787443_361056_deepin.patch + ]; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + pkg-config + libintl + automake + autoconf + gobject-introspection + ]; + + configureFlags = + [ + "--enable-introspection" + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + "--enable-kms-egl-platform" + "--enable-wayland-egl-platform" + "--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.hostPlatform.isDarwin [ + "--disable-glx" + "--without-x" + ] + ++ lib.optionals gstreamerSupport [ + "--enable-cogl-gst" + ]; + + # TODO: this shouldn't propagate so many things + # especially not gobject-introspection + propagatedBuildInputs = + [ + glib + gdk-pixbuf + gobject-introspection + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wayland + libgbm + mesa-gl-headers + libGL + xorg.libXrandr + xorg.libXfixes + xorg.libXcomposite + xorg.libXdamage + ] + ++ lib.optionals gstreamerSupport [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; + + buildInputs = lib.optionals pangoSupport [ + pango + cairo + harfbuzz + ]; + + env = + { + COGL_PANGO_DEP_CFLAGS = toString ( + lib.optionals (stdenv.hostPlatform.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) + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Small open source library for using 3D graphics hardware for rendering"; + maintainers = with maintainers; [ lovek323 ]; + + longDescription = '' + Cogl is a small open source library for using 3D graphics hardware for + rendering. The API departs from the flat state machine style of OpenGL + and is designed to make it easy to write orthogonal components that can + render without stepping on each other's toes. + ''; + + platforms = platforms.unix; + license = with licenses; [ + mit + bsd3 + publicDomain + sgi-b-20 + ]; + }; +} diff --git a/pkgs/development/libraries/cogl/patches/gnome_bugzilla_787443_359589_deepin.patch b/pkgs/by-name/co/cogl/patches/gnome_bugzilla_787443_359589_deepin.patch similarity index 100% rename from pkgs/development/libraries/cogl/patches/gnome_bugzilla_787443_359589_deepin.patch rename to pkgs/by-name/co/cogl/patches/gnome_bugzilla_787443_359589_deepin.patch diff --git a/pkgs/development/libraries/cogl/patches/gnome_bugzilla_787443_361056_deepin.patch b/pkgs/by-name/co/cogl/patches/gnome_bugzilla_787443_361056_deepin.patch similarity index 100% rename from pkgs/development/libraries/cogl/patches/gnome_bugzilla_787443_361056_deepin.patch rename to pkgs/by-name/co/cogl/patches/gnome_bugzilla_787443_361056_deepin.patch diff --git a/pkgs/by-name/co/coinlive/package.nix b/pkgs/by-name/co/coinlive/package.nix index f8c073ab8ce9..26d3d9eb6ba8 100644 --- a/pkgs/by-name/co/coinlive/package.nix +++ b/pkgs/by-name/co/coinlive/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, openssl, pkg-config, @@ -25,13 +23,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/co/colcon/package.nix b/pkgs/by-name/co/colcon/package.nix new file mode 100644 index 000000000000..c88b051d468a --- /dev/null +++ b/pkgs/by-name/co/colcon/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication colcon diff --git a/pkgs/by-name/co/coldsnap/package.nix b/pkgs/by-name/co/coldsnap/package.nix index c669088be099..f3b48edcbba6 100644 --- a/pkgs/by-name/co/coldsnap/package.nix +++ b/pkgs/by-name/co/coldsnap/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { description = "Command line interface for Amazon EBS snapshots"; changelog = "https://github.com/awslabs/coldsnap/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + teams = [ teams.determinatesystems ]; mainProgram = "coldsnap"; }; } diff --git a/pkgs/by-name/co/colima/package.nix b/pkgs/by-name/co/colima/package.nix index 5337a0c85cde..52cdc4f08e5b 100644 --- a/pkgs/by-name/co/colima/package.nix +++ b/pkgs/by-name/co/colima/package.nix @@ -6,14 +6,10 @@ fetchFromGitHub, installShellFiles, lima, - lima-bin, makeWrapper, qemu, testers, colima, - # use lima-bin on darwin to support native macOS virtualization - # https://github.com/NixOS/nixpkgs/pull/209171 - lima-drv ? if stdenv.hostPlatform.isDarwin then lima-bin else lima, }: buildGoModule rec { @@ -55,7 +51,7 @@ buildGoModule rec { wrapProgram $out/bin/colima \ --prefix PATH : ${ lib.makeBinPath [ - lima-drv + lima qemu ] } diff --git a/pkgs/by-name/co/collision/package.nix b/pkgs/by-name/co/collision/package.nix new file mode 100644 index 000000000000..eb2552c1e097 --- /dev/null +++ b/pkgs/by-name/co/collision/package.nix @@ -0,0 +1,117 @@ +{ + stdenv, + lib, + fetchFromGitHub, + crystal, + wrapGAppsHook4, + desktopToDarwinBundle, + gobject-introspection, + nautilus-python, + python3, + libadwaita, + openssl, + libxml2, + pkg-config, + gitUpdater, + _experimental-update-script-combinators, + runCommand, + crystal2nix, + writeShellScript, +}: + +crystal.buildCrystalPackage rec { + pname = "Collision"; + version = "3.10.0"; + + src = fetchFromGitHub { + owner = "GeopJr"; + repo = "Collision"; + rev = "v${version}"; + hash = "sha256-ZXGhMicwlkXUw8I6HUNVxY4vCaVixdV76+wYn34Py6Q="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail 'gtk-update-icon-cache $(PREFIX)/share/icons/hicolor' 'true' + ''; + + shardsFile = ./shards.nix; + copyShardDeps = true; + + preBuild = '' + cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug && \ + install -Dm755 bin/gi-crystal ../../bin/gi-crystal && cd ../.. + ''; + + # Crystal compiler has a strange issue with OpenSSL. The project will not compile due to + # main_module:(.text+0x6f0): undefined reference to `SSL_library_init' + # There is an explanation for this https://danilafe.com/blog/crystal_nix_revisited/ + # Shortly, adding pkg-config to buildInputs along with openssl fixes the issue. + nativeBuildInputs = + [ + wrapGAppsHook4 + pkg-config + gobject-introspection + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle + ]; + + buildInputs = [ + libadwaita + openssl + libxml2 + nautilus-python + python3.pkgs.pygobject3 + ]; + + buildTargets = [ + "bindings" + "build" + ]; + + doCheck = false; + doInstallCheck = false; + + installTargets = [ + "desktop" + "install" + ]; + + postInstall = '' + install -Dm555 ./nautilus-extension/collision-extension.py -t $out/share/nautilus-python/extensions + ''; + + passthru = { + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "collision.shardLock" "./shard.lock") + { + command = [ + (writeShellScript "update-lock" "cd $1; ${lib.getExe crystal2nix}") + ./. + ]; + supportedFeatures = [ "silent" ]; + } + { + command = [ + "rm" + "./shard.lock" + ]; + supportedFeatures = [ "silent" ]; + } + ]; + shardLock = runCommand "shard.lock" { inherit src; } '' + cp $src/shard.lock $out + ''; + }; + + meta = with lib; { + description = "Check hashes for your files"; + homepage = "https://github.com/GeopJr/Collision"; + license = licenses.bsd2; + mainProgram = "collision"; + maintainers = with maintainers; [ sund3RRR ]; + teams = [ teams.gnome-circle ]; + }; +} diff --git a/pkgs/by-name/co/collision/shards.nix b/pkgs/by-name/co/collision/shards.nix new file mode 100644 index 000000000000..ed6012d41382 --- /dev/null +++ b/pkgs/by-name/co/collision/shards.nix @@ -0,0 +1,42 @@ +{ + blake3 = { + url = "https://github.com/geopjr/blake3.cr.git"; + rev = "v1.4.0"; + sha256 = "1kp3rqddcsjj15syfnfvsx694nmpjzxmgawnf7y7dxdakk3przlw"; + }; + gettext = { + url = "https://github.com/geopjr/gettext.cr.git"; + rev = "v1.0.0"; + sha256 = "1y27m4170rr4532j56grzhwbz8hj6z7j3zfkd0jnfwnsxclks1kc"; + }; + gi-crystal = { + url = "https://github.com/hugopl/gi-crystal.git"; + rev = "v0.25.0"; + sha256 = "0lgs85khg6yzmw7vnkjxygrga1618440hayjc51jmjcfh2lff1k2"; + }; + gtk4 = { + url = "https://github.com/hugopl/gtk4.cr.git"; + rev = "v0.17.0"; + sha256 = "0lv3nvsanxi4g2322zvkf1jxx5zgzaapk228vcw2cl0ja1drm06d"; + }; + harfbuzz = { + url = "https://github.com/hugopl/harfbuzz.cr.git"; + rev = "v0.2.0"; + sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694"; + }; + libadwaita = { + url = "https://github.com/hugopl/libadwaita.cr.git"; + rev = "v0.1.0"; + sha256 = "13iqij1rwqdlsd9gls3gz4i4frlsda3yasdbbmrzpa8d3qm3p8yq"; + }; + non-blocking-spawn = { + url = "https://github.com/geopjr/non-blocking-spawn.git"; + rev = "v1.1.0"; + sha256 = "1h43gskannylaai4dz2sjb6rds2h6slm1krg88inan12silhp66c"; + }; + pango = { + url = "https://github.com/hugopl/pango.cr.git"; + rev = "v0.3.1"; + sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv"; + }; +} diff --git a/pkgs/by-name/co/colobot/data.nix b/pkgs/by-name/co/colobot/data.nix index d2fcedee561d..5d0ccf49d219 100644 --- a/pkgs/by-name/co/colobot/data.nix +++ b/pkgs/by-name/co/colobot/data.nix @@ -10,15 +10,15 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "colobot-data"; - version = "0.2.0-alpha"; + version = "0.2.2-alpha"; src = fetchFromGitHub { owner = "colobot"; repo = "colobot-data"; - rev = "colobot-gold-${version}"; - sha256 = "sha256-yzIbAzrGsDe6hO0GHF9gjnj7IE8B7+5LDbvjZi4Wtms="; + tag = "colobot-gold-${finalAttrs.version}"; + hash = "sha256-Voxfc5iCFT7gyahaai5wLPi6fe7dWryYLjfNjfXpwWs="; }; nativeBuildInputs = [ @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gettext ]; - enableParallelBuilding = false; # Build procedure requires the data folder patchPhase = '' cp -r $src localSrc @@ -45,11 +44,11 @@ stdenv.mkDerivation rec { cd localSrc ''; - meta = with lib; { + meta = { homepage = "https://colobot.info/"; description = "Game data for colobot"; - license = licenses.gpl3; - maintainers = with maintainers; [ freezeboy ]; - platforms = platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ freezeboy ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/colobot/package.nix b/pkgs/by-name/co/colobot/package.nix index 89ed5a7bd7e8..e720c73fe40d 100644 --- a/pkgs/by-name/co/colobot/package.nix +++ b/pkgs/by-name/co/colobot/package.nix @@ -24,17 +24,17 @@ let colobot-data = callPackage ./data.nix { }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "colobot"; # Maybe require an update to package colobot-data as well # in file data.nix next to this one - version = "0.2.1-alpha"; + version = "0.2.2-alpha"; src = fetchFromGitHub { owner = "colobot"; repo = "colobot"; - rev = "colobot-gold-${version}"; - hash = "sha256-3iea2+5xCT0//NAjMHrynZKSoiOSgLTNMUQkRhXuXg8="; + tag = "colobot-gold-${finalAttrs.version}"; + hash = "sha256-QhNHtAG+hKq7qJhKWCJcP4ejm5YDOU8pyYtitJppVlU="; }; nativeBuildInputs = [ @@ -58,8 +58,6 @@ stdenv.mkDerivation rec { openal ]; - enableParallelBuilding = false; - # The binary ends in games directory postInstall = '' mv $out/games $out/bin @@ -68,11 +66,11 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { homepage = "https://colobot.info/"; description = "Colobot: Gold Edition is a real-time strategy game, where you can program your bots"; - license = licenses.gpl3; - maintainers = with maintainers; [ freezeboy ]; - platforms = platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ freezeboy ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/color-transformation-language/package.nix b/pkgs/by-name/co/color-transformation-language/package.nix index 7fe0b5c661be..1fd5403142c9 100644 --- a/pkgs/by-name/co/color-transformation-language/package.nix +++ b/pkgs/by-name/co/color-transformation-language/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, ilmbase, - openexr_3, + openexr, libtiff, aces-container, }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ilmbase - openexr_3 + openexr libtiff aces-container ]; diff --git a/pkgs/by-name/co/colord-gtk/package.nix b/pkgs/by-name/co/colord-gtk/package.nix index 46d7e1cfb3e2..7c6895d10d1b 100644 --- a/pkgs/by-name/co/colord-gtk/package.nix +++ b/pkgs/by-name/co/colord-gtk/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.freedesktop.org/software/colord/intro.html"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; mainProgram = "cd-convert"; }; diff --git a/pkgs/by-name/co/colord/package.nix b/pkgs/by-name/co/colord/package.nix index 963b8567fa0b..d3ffa44b89d1 100644 --- a/pkgs/by-name/co/colord/package.nix +++ b/pkgs/by-name/co/colord/package.nix @@ -136,7 +136,8 @@ stdenv.mkDerivation rec { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; homepage = "https://www.freedesktop.org/software/colord/"; license = licenses.lgpl2Plus; - maintainers = [ maintainers.marcweber ] ++ teams.freedesktop.members; + maintainers = [ maintainers.marcweber ]; + teams = [ teams.freedesktop ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/coloursum/package.nix b/pkgs/by-name/co/coloursum/package.nix new file mode 100644 index 000000000000..08bf30cb08ba --- /dev/null +++ b/pkgs/by-name/co/coloursum/package.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "coloursum"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "ticky"; + repo = "coloursum"; + rev = "v${version}"; + hash = "sha256-zA2JhSnlFccSY01WMGsgF4AmrF/3BRUCcSMfoEbEPgA="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-aZkWzJaEW6/fiCfb+RKNef0eJf/CJW8OU1N2OlHwuJM="; + + meta = with lib; { + description = "Colourise your checksum output"; + mainProgram = "coloursum"; + homepage = "https://github.com/ticky/coloursum"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/by-name/co/combinatorial_designs/package.nix b/pkgs/by-name/co/combinatorial_designs/package.nix index f3dc999ca434..29cb4e0d7df3 100644 --- a/pkgs/by-name/co/combinatorial_designs/package.nix +++ b/pkgs/by-name/co/combinatorial_designs/package.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { ''; license = licenses.publicDomain; platforms = platforms.all; - maintainers = teams.sage.members; + teams = [ teams.sage ]; }; } diff --git a/pkgs/by-name/co/commit-formatter/package.nix b/pkgs/by-name/co/commit-formatter/package.nix index 624ffd71879d..a5fce8403584 100644 --- a/pkgs/by-name/co/commit-formatter/package.nix +++ b/pkgs/by-name/co/commit-formatter/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "commit-formatter"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Eliot00"; repo = "commit-formatter"; rev = "v${version}"; - sha256 = "EYzhb9jJ4MzHxIbaTb1MxeXUgoxTwcnq5JdxAv2uNcA="; + sha256 = "sha256-hXpHEtPj6lrYBAzz8ZrhK+L3RBB2K1VIAi81kFlFgxY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uW+mmArQZ5Pl2TlKIRd00dB6615Nn/Q8KtRE/ahl5V4="; + cargoHash = "sha256-rqIBDzZghz+fj96im+SNwnLV9jCRjRmh3Wd48z07XH0="; meta = with lib; { description = "CLI tool to help you write git commit"; diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix index 639d9275357d..c07cd82dceac 100644 --- a/pkgs/by-name/co/commit/package.nix +++ b/pkgs/by-name/co/commit/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "commit"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "sonnyp"; repo = "Commit"; tag = "v${finalAttrs.version}"; - hash = "sha256-L8CI8SAGWhhJyTc8aMPV0s+UevEJGE7n1l7fFnTjdPw="; + hash = "sha256-yNzMFOd0IN5EUKG7ztCEbQzQ9RHc+D4iC1OiBauMSwE="; fetchSubmodules = true; }; @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Commit message editor"; homepage = "https://github.com/sonnyp/Commit"; license = lib.licenses.gpl3Only; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; mainProgram = "re.sonny.Commit"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/co/commonsBcel/package.nix b/pkgs/by-name/co/commonsBcel/package.nix index 3be849e9332e..68f15b6bdd7b 100644 --- a/pkgs/by-name/co/commonsBcel/package.nix +++ b/pkgs/by-name/co/commonsBcel/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-bcel/"; description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/by-name/co/commonsCompress/package.nix b/pkgs/by-name/co/commonsCompress/package.nix index 73ca1feda9b8..eba0861bb8bb 100644 --- a/pkgs/by-name/co/commonsCompress/package.nix +++ b/pkgs/by-name/co/commonsCompress/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-compress"; description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/co/commonsFileUpload/package.nix b/pkgs/by-name/co/commonsFileUpload/package.nix index e21b8078c2a2..506ebdc09124 100644 --- a/pkgs/by-name/co/commonsFileUpload/package.nix +++ b/pkgs/by-name/co/commonsFileUpload/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-fileupload"; description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/co/commonsIo/package.nix b/pkgs/by-name/co/commonsIo/package.nix index 92156099c103..ef7dc20cfcd8 100644 --- a/pkgs/by-name/co/commonsIo/package.nix +++ b/pkgs/by-name/co/commonsIo/package.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.18.0"; + version = "2.19.0"; pname = "commons-io"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-qrB4cLnvaTQaZJWrrDO8IYsYI2hp6/nN7nCRcFhKTeE="; + sha256 = "sha256-zhS4nMCrwL2w2qNXco5oRkXSiOzzepD6EiZzmCgfnNI="; }; installPhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-io"; description = "Library of utilities to assist with developing IO functionality"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/co/commonsLang/package.nix b/pkgs/by-name/co/commonsLang/package.nix index 44850f72f064..a3077e666774 100644 --- a/pkgs/by-name/co/commonsLang/package.nix +++ b/pkgs/by-name/co/commonsLang/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Provides additional methods to manipulate standard Java library classes"; homepage = "https://commons.apache.org/proper/commons-lang"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; platforms = with lib.platforms; unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; diff --git a/pkgs/by-name/co/commonsMath/package.nix b/pkgs/by-name/co/commonsMath/package.nix index 0353b1dc682b..6254ce20ce4d 100644 --- a/pkgs/by-name/co/commonsMath/package.nix +++ b/pkgs/by-name/co/commonsMath/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-math/"; description = "Library of lightweight, self-contained mathematics and statistics components"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index d12b2c2466d0..7dbfa6951bd2 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.37.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = "comrak"; rev = "v${version}"; - sha256 = "sha256-LnsYGRsQvKUIYTgeN3Z9BKga8hHmrHSA/ucH9dNDYPI="; + sha256 = "sha256-hy/kn8hShwzLHvzp3x1eSGipYRSXjOYCMPHEM1xQEr0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-YyOJr/Y7Q2yJ21u+wyYeDe9SDmFuKlPVRol3IclOOQU="; + cargoHash = "sha256-MFSyxoNzPzIP2Yi3lCyEcsAx4DvNmk2Jr75oD/tX9iE="; meta = with lib; { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/by-name/co/conan/package.nix b/pkgs/by-name/co/conan/package.nix index 50edea536250..98c9fe156347 100644 --- a/pkgs/by-name/co/conan/package.nix +++ b/pkgs/by-name/co/conan/package.nix @@ -5,27 +5,27 @@ git, pkg-config, xcbuild, - python3, + python3Packages, zlib, + cmake, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "conan"; - version = "2.9.1"; - format = "setuptools"; + version = "2.15.1"; + pyproject = true; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; tag = version; - hash = "sha256-1KKXOvoSAemzafWvBoYFtxqgSObHcXe3GVPgG25VNm0="; + hash = "sha256-yJe8DOpIsrAoM5d0txppnq/B6VlOtkTIRfVl35KtCKI="; }; - nativeBuildInputs = with python3.pkgs; [ - ]; + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = - with python3.pkgs; + dependencies = + with python3Packages; [ bottle colorama @@ -49,28 +49,32 @@ python3.pkgs.buildPythonApplication rec { pyopenssl ]; + pythonRelaxDeps = [ + "urllib3" + "distro" + ]; + nativeCheckInputs = [ git pkg-config zlib ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - xcbuild.xcrun - ] - ++ (with python3.pkgs; [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ] + ++ (with python3Packages; [ mock parameterized pytest-xdist pytestCheckHook webtest + cmake ]); + dontUseCmakeConfigure = true; + __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ - "conan" - ]; + pythonImportsCheck = [ "conan" ]; disabledTests = [ @@ -78,6 +82,10 @@ python3.pkgs.buildPythonApplication rec { "TestFTP" # Unstable test "test_shared_windows_find_libraries" + # 'cmake' tool version 'Any' is not available + "test_build" + # 'cmake' tool version '3.27' is not available + "test_metabuild" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Rejects paths containing nix @@ -107,18 +115,17 @@ python3.pkgs.buildPythonApplication rec { "test/functional/tools/system/package_manager_test.py" "test/functional/tools_versions_test.py" "test/functional/util/test_cmd_args_to_string.py" - "test/integration/command/user_test.py" - "test/integration/command_v2/list_test.py" "test/performance/test_large_graph.py" "test/unittests/tools/env/test_env_files.py" + "test/integration/ui/exit_with_code_test.py" ]; - meta = with lib; { + meta = { description = "Decentralized and portable C/C++ package manager"; mainProgram = "conan"; homepage = "https://conan.io"; changelog = "https://github.com/conan-io/conan/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ HaoZeke ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ HaoZeke ]; }; } diff --git a/pkgs/by-name/co/conceal/package.nix b/pkgs/by-name/co/conceal/package.nix index 37c276d22096..866eb72c001c 100644 --- a/pkgs/by-name/co/conceal/package.nix +++ b/pkgs/by-name/co/conceal/package.nix @@ -8,19 +8,21 @@ conceal, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "conceal"; - version = "0.5.5"; + version = "0.6.1"; src = fetchFromGitHub { owner = "TD-Sky"; repo = "conceal"; - rev = "v${version}"; - sha256 = "sha256-BYLDSRgBba6SoGsL/NTV/OTG1/V9RSr8lisj42JqBRM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-kgJcxckXfwnKZ3MyJ+GE1LiQmu9YdfqFrtL9gBJ330E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-yCHN7N+hRrWfuCEBA6gh2S/rRP+ZkHCjFBGGY9/LTb4="; + cargoHash = "sha256-Ym/HnUOLIKfCFWgusx92QeQYaNp9tfrhg5V1h02q3e0="; + + env.CONCEAL_GEN_COMPLETIONS = "true"; nativeBuildInputs = [ installShellFiles ]; @@ -36,17 +38,17 @@ rustPlatform.buildRustPackage rec { passthru.tests = testers.testVersion { package = conceal; command = "conceal --version"; - version = "conceal ${version}"; + version = "conceal ${finalAttrs.version}"; }; - meta = with lib; { + meta = { description = "Trash collector written in Rust"; homepage = "https://github.com/TD-Sky/conceal"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jedsek kashw2 ]; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/co/concessio/package.nix b/pkgs/by-name/co/concessio/package.nix index 803182fc4686..c8fa52d89ce4 100644 --- a/pkgs/by-name/co/concessio/package.nix +++ b/pkgs/by-name/co/concessio/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "concessio"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "ronniedroid"; repo = "concessio"; tag = "v${finalAttrs.version}"; - hash = "sha256-XH+4oEZSKa6lAS0zXxdlCsVJcGDglKSgaD+zoRM6Pws="; + hash = "sha256-GDiwpErxz6GiYajcRBOnX0RO1jeaSmpLLxqEsB3nJLA="; }; strictDeps = true; diff --git a/pkgs/by-name/co/conduit/package.nix b/pkgs/by-name/co/conduit/package.nix index 62100ccf20b4..74a581ea495c 100644 --- a/pkgs/by-name/co/conduit/package.nix +++ b/pkgs/by-name/co/conduit/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "conduit"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "LLNL"; repo = "conduit"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-R7DiMwaMG9VfqDJiO3kFPb76j6P2GZl/6qLxDfVex8A="; + hash = "sha256-xs/9hsE1DLCegXp3CHSl6qpC4ap+niNAWX5lNlUxz9E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/conduktor-ctl/package.nix b/pkgs/by-name/co/conduktor-ctl/package.nix new file mode 100644 index 000000000000..b9762a293a56 --- /dev/null +++ b/pkgs/by-name/co/conduktor-ctl/package.nix @@ -0,0 +1,60 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + stdenv, + versionCheckHook, +}: +buildGoModule rec { + pname = "conduktor-ctl"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "conduktor"; + repo = "ctl"; + rev = "refs/tags/v${version}"; + hash = "sha256-8FsYkwYAXmfLKdFmg6t8DSQkx+/EpGxKX7l+k+ey8MA="; + }; + + vendorHash = "sha256-kPCBzLU6aH6MNlKZcKKFcli99ZmdOtPV5+5gxPs5GH4="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-X github.com/conduktor/ctl/utils.version=${version}" ]; + + checkPhase = '' + go test ./... + ''; + + postInstall = + '' + mv $out/bin/ctl $out/bin/conduktor + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd conduktor \ + --bash <($out/bin/conduktor completion bash) \ + --fish <($out/bin/conduktor completion fish) \ + --zsh <($out/bin/conduktor completion zsh) + ''; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgram = "${placeholder "out"}/bin/conduktor"; + + versionCheckProgramArg = "version"; + + meta = { + description = "CLI tool to interact with the Conduktor Console and Gateway"; + mainProgram = "conduktor"; + homepage = "https://github.com/conduktor/ctl"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + conduktorbot + marnas + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/co/conduktor/package.nix b/pkgs/by-name/co/conduktor/package.nix index e78f4bd35e22..a84c63fc6789 100644 --- a/pkgs/by-name/co/conduktor/package.nix +++ b/pkgs/by-name/co/conduktor/package.nix @@ -1,38 +1,48 @@ { - stdenv, lib, + stdenv, fetchurl, fetchzip, jdk11, - makeWrapper, + openjfx17, + gtk3, + glib, + pango, + cairo, + gdk-pixbuf, + xorg, + makeBinaryWrapper, makeDesktopItem, copyDesktopItems, }: -stdenv.mkDerivation rec { +let + openjfx_jdk = openjfx17.override { withWebKit = true; }; +in +stdenv.mkDerivation (finalAttrs: { pname = "conduktor"; - version = "2.15.1"; + version = "2.24.9"; src = fetchzip { - url = "https://github.com/conduktor/builds/releases/download/v${version}/Conduktor-linux-${version}.zip"; - sha256 = "sha256-9y/7jni5zIITUWd75AxsfG/b5vCYotmeMeC9aYM2WEs="; + url = "https://github.com/conduktor/builds/releases/download/v${finalAttrs.version}/Conduktor-linux-${finalAttrs.version}.zip"; + hash = "sha256-c9QjlKPZpeJi5YTq4gm+sg7my4EP0LI95AfGguF4ork="; }; nativeBuildInputs = [ - makeWrapper + makeBinaryWrapper copyDesktopItems ]; desktopItems = [ (makeDesktopItem { type = "Application"; - name = pname; + name = "conduktor"; desktopName = "Conduktor"; - genericName = meta.description; - exec = pname; + genericName = finalAttrs.meta.description; + exec = "conduktor"; icon = fetchurl { - url = "https://github.com/conduktor/builds/raw/v${version}/.github/resources/Conduktor.png"; - sha256 = "0s7p74qclvac8xj2m22gfxx5m2c7cf0nqpk5sb049p2wvryhn2j4"; + url = "https://github.com/conduktor/builds/raw/v${finalAttrs.version}/.github/resources/Conduktor.png"; + hash = "sha256-mk4c9ecookRb7gR56cedIWfPfQy2uGF+ZbX6NI90KI0="; }; comment = "A beautiful and fully-featured desktop client for Apache Kafka"; }) @@ -44,23 +54,36 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/applications - mv * $out - wrapProgram "$out/bin/conduktor" --set JAVA_HOME "${jdk11.home}" + cp -r . $out + wrapProgram $out/bin/conduktor \ + --set JAVA_HOME ${jdk11.home} \ + --set LD_LIBRARY_PATH ${ + lib.makeLibraryPath [ + openjfx_jdk + gtk3 + gtk3 + glib + pango + cairo + gdk-pixbuf + xorg.libXtst + ] + } \ + --add-flags "--module-path ${openjfx_jdk}/lib --add-modules=javafx.controls,javafx.fxml" runHook postInstall ''; - meta = with lib; { + meta = { description = "Apache Kafka Desktop Client"; longDescription = '' Conduktor is a GUI over the Kafka ecosystem, to make the development and management of Apache Kafka clusters as easy as possible. ''; homepage = "https://www.conduktor.io/"; - changelog = "https://www.conduktor.io/changelog/#${version}"; - license = licenses.unfree; - maintainers = with maintainers; [ trobert ]; - platforms = platforms.linux; + changelog = "https://www.conduktor.io/changelog/#${finalAttrs.version}"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ trobert ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix index 89af36894092..15ebfc2e3649 100644 --- a/pkgs/by-name/co/conduwuit/package.nix +++ b/pkgs/by-name/co/conduwuit/package.nix @@ -15,7 +15,6 @@ rust-jemalloc-sys, enableLiburing ? stdenv.hostPlatform.isLinux, liburing, - nixosTests, }: let rust-jemalloc-sys' = rust-jemalloc-sys.override { @@ -81,16 +80,12 @@ rustPlatform.buildRustPackage rec { passthru = { updateScript = nix-update-script { }; - tests = - { - version = testers.testVersion { - inherit version; - package = conduwuit; - }; - } - // lib.optionalAttrs stdenv.hostPlatform.isLinux { - inherit (nixosTests) conduwuit; + tests = { + version = testers.testVersion { + inherit version; + package = conduwuit; }; + }; }; meta = { @@ -98,6 +93,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://conduwuit.puppyirl.gay/"; changelog = "https://github.com/girlbossceo/conduwuit/releases/tag/v${version}"; license = lib.licenses.asl20; + knownVulnerabilities = [ + "On April 11, 2025, the conduwuit project officially ceased development" + ]; maintainers = with lib.maintainers; [ niklaskorz ]; # Not a typo, conduwuit is a drop-in replacement for conduit. mainProgram = "conduit"; diff --git a/pkgs/by-name/co/confluent-cli/package.nix b/pkgs/by-name/co/confluent-cli/package.nix index 87d5c364691d..198360e9a7ef 100644 --- a/pkgs/by-name/co/confluent-cli/package.nix +++ b/pkgs/by-name/co/confluent-cli/package.nix @@ -1,64 +1,70 @@ { - stdenv, - autoPatchelfHook, - fetchurl, lib, + stdenv, + fetchurl, + autoPatchelfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "confluent-cli"; - version = "4.16.0"; + version = "4.26.1"; # To get the latest version: # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 src = - { - x86_64-linux = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_linux_amd64.tar.gz"; - hash = "sha256-OFmbIqyDnZxymutdObzPvyuHJnfW353e+ChjDLfhQvI="; + let + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + system = selectSystem { + x86_64-linux = "linux_amd64"; + aarch64-linux = "linux_arm64"; + x86_64-darwin = "darwin_amd64"; + aarch64-darwin = "darwin_arm64"; }; - aarch64-linux = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_linux_arm64.tar.gz"; - hash = "sha256-EZ+3WYIkmP5Aw3yg4fKUs805W58OFrILjp+Z18G6jjQ="; + in + fetchurl { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${finalAttrs.version}/confluent_${finalAttrs.version}_${system}.tar.gz"; + hash = selectSystem { + x86_64-linux = "sha256-TvlOvVtIu1V3PYgVu0PhGNaeZo1rI4kseyiu5Me+pNE="; + aarch64-linux = "sha256-raBMe7hyBcVW0wBTHMLxoktWUUh/1AoKgmpsqYojn5c="; + x86_64-darwin = "sha256-BD2uifycqYX+v21PSAkiB8qz6dXwHAAEygg/uwaPJm8="; + aarch64-darwin = "sha256-PRmJfiL6gHN1EQnggsQAEINzLJ0hZ36SlXGwJTUa134="; }; - x86_64-darwin = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_darwin_amd64.tar.gz"; - hash = "sha256-ogqrGn0I34L+UIzA+9Q+3LlcVoDlYnPRUqkn9oasCG8="; - }; - aarch64-darwin = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_darwin_arm64.tar.gz"; - hash = "sha256-CQNGs8tFSUH3okFufVPUQqHTrVB3kyrbbgT9mFGmkYc="; - }; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dontStrip = stdenv.hostPlatform.isDarwin; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/doc/confluent-cli} cp confluent $out/bin/ cp LICENSE $out/share/doc/confluent-cli/ cp -r legal $out/share/doc/confluent-cli/ + + runHook postInstall ''; - meta = with lib; { + passthru.updateScript = ./update.sh; + + meta = { description = "Confluent CLI"; homepage = "https://docs.confluent.io/confluent-cli/current/overview.html"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ rguevara84 autophagy ]; - # TODO: There's support for i686 systems but I do not have any such system # to build it locally on, it's also unfree so I cannot rely on ofborg to # build it. Get the list of supported system by looking at the list of # files in the S3 bucket: # # https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=confluent-cli/archives/1.25.0/&delimiter=/%27 - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/co/confluent-cli/update.sh b/pkgs/by-name/co/confluent-cli/update.sh new file mode 100755 index 000000000000..2992fffd400a --- /dev/null +++ b/pkgs/by-name/co/confluent-cli/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix curl coreutils jq common-updater-scripts + +set -eou pipefail + +latestVersion=$(curl -s "https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=confluent-cli/archives/&delimiter=/" | + sed 's/>\nconfluent-cli/archives/' | + sed -n 's#confluent-cli/archives/\(v\?\)\([^/]*\)/#\2#p' | + grep -v '^latest$' | + sort --version-sort | + tail -n1) +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; confluent-cli.version or (lib.getVersion confluent-cli)" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +for i in \ + "x86_64-linux linux_amd64" \ + "aarch64-linux linux_arm64" \ + "x86_64-darwin darwin_amd64" \ + "aarch64-darwin darwin_arm64"; do + set -- $i + hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/$latestVersion/confluent_${latestVersion}_$2.tar.gz")) + update-source-version confluent-cli $latestVersion $hash --system=$1 --ignore-same-version +done diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix index 4c65d417844a..6878520d44c6 100644 --- a/pkgs/by-name/co/conftest/package.nix +++ b/pkgs/by-name/co/conftest/package.nix @@ -3,34 +3,32 @@ buildGoModule, fetchFromGitHub, installShellFiles, + versionCheckHook, + writableTmpDirAsHomeHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "conftest"; - version = "0.58.0"; + version = "0.59.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; - tag = "v${version}"; - hash = "sha256-zvm4IPtv2B5gw3r3/ZtWcAXF632100xl8VgxhthsKkY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-bmZp1cPNTm6m30YxjlWdnfv2437nDXH+taDNFZ0OKIY="; }; - vendorHash = "sha256-1jMMz661ND6MAbRk+FgdA8KtpsNdrNFM8OPBuJmS0Sk="; + vendorHash = "sha256-aPvGbtAucb9OdcydO4dMLJrrM3XretPI7zyJULlm1fg="; ldflags = [ "-s" "-w" - "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}" + "-X github.com/open-policy-agent/conftest/internal/commands.version=${finalAttrs.version}" ]; nativeBuildInputs = [ installShellFiles ]; - preCheck = '' - export HOME="$(mktemp -d)" - ''; - postInstall = '' installShellCompletion --cmd conftest \ --bash <($out/bin/conftest completion bash) \ @@ -38,19 +36,23 @@ buildGoModule rec { --zsh <($out/bin/conftest completion zsh) ''; - doInstallCheck = true; - installCheckPhase = '' - export HOME="$(mktemp -d)" - $out/bin/conftest --version | grep ${version} > /dev/null - ''; + nativeCheckInputs = [ + writableTmpDirAsHomeHook + ]; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + meta = { description = "Write tests against structured configuration data"; mainProgram = "conftest"; downloadPage = "https://github.com/open-policy-agent/conftest"; homepage = "https://www.conftest.dev"; - changelog = "https://github.com/open-policy-agent/conftest/releases/tag/v${version}"; - license = licenses.asl20; + changelog = "https://github.com/open-policy-agent/conftest/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; longDescription = '' Conftest helps you write tests against structured configuration data. Using Conftest you can write tests for your Kubernetes configuration, @@ -61,9 +63,9 @@ buildGoModule rec { assertions. You can read more about Rego in 'How do I write policies' in the Open Policy Agent documentation. ''; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ jk yurrriq ]; }; -} +}) diff --git a/pkgs/by-name/co/conkeyscan/package.nix b/pkgs/by-name/co/conkeyscan/package.nix index b3563b5b54ef..ebf74e92eb16 100644 --- a/pkgs/by-name/co/conkeyscan/package.nix +++ b/pkgs/by-name/co/conkeyscan/package.nix @@ -4,7 +4,25 @@ fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + self = python3; + packageOverrides = self: super: { + pyrate-limiter = super.pyrate-limiter.overridePythonAttrs (oldAttrs: rec { + version = "2.10.0"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + tag = "v${version}"; + hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0="; + }; + doCheck = false; + }); + }; + }; + +in + +python.pkgs.buildPythonApplication rec { pname = "conkeyscan"; version = "1.1.0"; pyproject = true; @@ -21,9 +39,9 @@ python3.pkgs.buildPythonApplication rec { --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}" ''; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with python.pkgs; [ setuptools ]; - dependencies = with python3.pkgs; [ + dependencies = with python.pkgs; [ atlassian-python-api beautifulsoup4 clize diff --git a/pkgs/by-name/co/conmon-rs/package.nix b/pkgs/by-name/co/conmon-rs/package.nix index 6d2014c86b0c..3f7cbe960220 100644 --- a/pkgs/by-name/co/conmon-rs/package.nix +++ b/pkgs/by-name/co/conmon-rs/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { description = "OCI container runtime monitor written in Rust"; homepage = "https://github.com/containers/conmon-rs"; license = licenses.asl20; - maintainers = with maintainers; [ ] ++ teams.podman.members; + teams = [ teams.podman ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/conmon/package.nix b/pkgs/by-name/co/conmon/package.nix index 3d6910ec56cb..52ad5403811f 100644 --- a/pkgs/by-name/co/conmon/package.nix +++ b/pkgs/by-name/co/conmon/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/conmon"; description = "OCI container runtime monitor"; license = licenses.asl20; - maintainers = with maintainers; [ ] ++ teams.podman.members; + teams = [ teams.podman ]; platforms = platforms.linux; mainProgram = "conmon"; }; diff --git a/pkgs/by-name/co/conserve/package.nix b/pkgs/by-name/co/conserve/package.nix index 2095e4091881..831fc448615b 100644 --- a/pkgs/by-name/co/conserve/package.nix +++ b/pkgs/by-name/co/conserve/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-r14ApN9kGWIyeNlbqrb+vOvvmH2n+O5ovvtSVNTMASo="; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.frameworks.Security - ]; - checkFlags = [ # expected to panic if unix user has no secondary group, # which is the case in the nix sandbox diff --git a/pkgs/by-name/co/console-setup/package.nix b/pkgs/by-name/co/console-setup/package.nix index cf5c554e54cc..93ac6b899a7c 100644 --- a/pkgs/by-name/co/console-setup/package.nix +++ b/pkgs/by-name/co/console-setup/package.nix @@ -12,14 +12,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "console-setup"; - version = "1.234"; + version = "1.236"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; tag = finalAttrs.version; - hash = "sha256-Sd2/bSBv7kb7CiPYGdK/3AkZQtIY0bCVSN7pGZzyvfM="; + hash = "sha256-b7ck48wRPga/ugCVbPCKRSRrpawIJCsEV1kbNeXDIHk="; }; buildInputs = [ diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index 89ba5a817b3b..674a6c6eb5c4 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "consul"; - version = "1.20.5"; + version = "1.21.0"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -22,7 +22,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; tag = "v${version}"; - hash = "sha256-dBx/WHi+qFrOyA0lIjvARcAZ96WvHCjVs94XicSL5L0="; + hash = "sha256-KNBsOKd+GzxhmvM2aItnoYpob8cZ7Wzjp1fi7IRlLnk="; }; # This corresponds to paths with package main - normally unneeded but consul @@ -32,7 +32,7 @@ buildGoModule rec { "connect/certgen" ]; - vendorHash = "sha256-rQDVXMLXI2/D4SNLfs3CT4chDnzhh1aU5xuMMBDMhLI="; + vendorHash = "sha256-l0fhZVsaoQnKVN2/3ioS/T7YSNTarOy84PxZ9Xx40t4="; doCheck = false; diff --git a/pkgs/by-name/co/contacts/package.nix b/pkgs/by-name/co/contacts/package.nix new file mode 100644 index 000000000000..d99f0b3a8c05 --- /dev/null +++ b/pkgs/by-name/co/contacts/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + xcbuildHook, +}: + +stdenv.mkDerivation { + version = "1.1a-3"; + pname = "contacts"; + + src = fetchFromGitHub { + owner = "dhess"; + repo = "contacts"; + rev = "4092a3c6615d7a22852a3bafc44e4aeeb698aa8f"; + hash = "sha256-Li/c5uf9rfpuU+hduuSm7EmhVwIIkS72dqzmN+0cE3A="; + }; + + postPatch = '' + substituteInPlace contacts.m \ + --replace "int peopleSort" "long peopleSort" + ''; + + nativeBuildInputs = [ xcbuildHook ]; + + installPhase = '' + mkdir -p $out/bin + cp Products/Default/contacts $out/bin + ''; + + meta = with lib; { + description = "Access contacts from the Mac address book from command-line"; + homepage = "http://www.gnufoo.org/contacts/contacts.html"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.darwin; + hydraPlatforms = platforms.darwin; + }; +} diff --git a/pkgs/by-name/co/container2wasm/package.nix b/pkgs/by-name/co/container2wasm/package.nix index 18c5578b523c..8db352772f59 100644 --- a/pkgs/by-name/co/container2wasm/package.nix +++ b/pkgs/by-name/co/container2wasm/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "container2wasm"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "ktock"; repo = "container2wasm"; tag = "v${version}"; - hash = "sha256-1m5BX8w6PVV7gsTXas+rdQirOu1RicbJDZdGj0Fh5sc="; + hash = "sha256-detM0A8pm65VmEuEh7Xc+LcXfz4aq9p46NvJtdzfzAA="; }; - vendorHash = "sha256-azlZt+E8S+TjIEhwwmvRjAig4EVqbUm9tsFiIXim0Rs="; + vendorHash = "sha256-G75YojD+GR1C++crDkWS3A4nrUI9HwZfxmKpdNZ7qYY="; ldflags = [ "-s" diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix index 52c9167111fb..ad25a106c215 100644 --- a/pkgs/by-name/co/containerd/package.nix +++ b/pkgs/by-name/co/containerd/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { pname = "containerd"; - version = "2.0.4"; + version = "2.0.5"; outputs = [ "out" @@ -27,7 +27,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; tag = "v${version}"; - hash = "sha256-KW2fKdsJ590UPGcu2O3IGyJ+/iY0c8GQLirL8zK3F14="; + hash = "sha256-BY6lIzTlJbBbeIxCtSd7NcYVEWta3VNMmHmH97ksGsE="; }; postPatch = "patchShebangs ."; diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index 8e80f0f9ed14..ab1f24407686 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -3,6 +3,7 @@ buildGoModule, fetchFromGitHub, installShellFiles, + versionCheckHook, }: buildGoModule rec { @@ -23,9 +24,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/srl-labs/containerlab/cmd.version=${version}" - "-X github.com/srl-labs/containerlab/cmd.commit=${src.rev}" - "-X github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z" + "-X github.com/srl-labs/containerlab/cmd/version.Version=${version}" + "-X github.com/srl-labs/containerlab/cmd/version.commit=${src.rev}" + "-X github.com/srl-labs/containerlab/cmd/version.date=1970-01-01T00:00:00Z" ]; preCheck = '' @@ -41,6 +42,12 @@ buildGoModule rec { --zsh <($out/bin/containerlab completion zsh) ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgramArg = "version"; + meta = { description = "Container-based networking lab"; homepage = "https://containerlab.dev/"; diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix index 779144322f25..d26ce03f12da 100644 --- a/pkgs/by-name/co/contour/package.nix +++ b/pkgs/by-name/co/contour/package.nix @@ -24,17 +24,18 @@ sigtool, nixosTests, installShellFiles, + reflection-cpp, }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "contour"; - version = "0.5.1.7247"; + version = "0.6.1.7494"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "contour"; - rev = "v${final.version}"; - hash = "sha256-/vpbyaULemyM3elwaoofvbeeID7jNrmu8X8HlZxWGCk"; + tag = "v${finalAttrs.version}"; + hash = "sha256-jgasZhdcJ+UF3VIl8HLcxBayvbA/dkaOG8UtANRgeP4="; }; patches = [ ./dont-fix-app-bundle.diff ]; @@ -69,6 +70,7 @@ stdenv.mkDerivation (final: { microsoft-gsl range-v3 yaml-cpp + reflection-cpp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -100,13 +102,13 @@ stdenv.mkDerivation (final: { passthru.tests.test = nixosTests.terminal-emulators.contour; - meta = with lib; { + meta = { description = "Modern C++ Terminal Emulator"; 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; [ moni ]; - platforms = platforms.unix; + changelog = "https://github.com/contour-terminal/contour/raw/v${finalAttrs.version}/Changelog.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ moni ]; + platforms = lib.platforms.unix; mainProgram = "contour"; }; }) diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 2a56fd2830a7..81ca074ff9cb 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -7,7 +7,6 @@ libiconv, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -33,7 +32,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; checkFlags = [ diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix index 7fc8c3a66588..470c2535842e 100644 --- a/pkgs/by-name/co/converseen/package.nix +++ b/pkgs/by-name/co/converseen/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "converseen"; - version = "0.12.2.5"; + version = "0.14.0.0"; src = fetchFromGitHub { owner = "Faster3ck"; repo = "Converseen"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q1MmKPzk7erMM5Z5zYP3hGyazupfPjArkmFOFEhxWg4="; + hash = "sha256-i7r6AyOk+WtMjlDc5/tDvaUV6yMKaQ7xZ9z9s+KBmts="; }; strictDeps = true; diff --git a/pkgs/by-name/co/convertlit/package.nix b/pkgs/by-name/co/convertlit/package.nix index 6bc9cd4ffaef..94dec0acec8a 100644 --- a/pkgs/by-name/co/convertlit/package.nix +++ b/pkgs/by-name/co/convertlit/package.nix @@ -5,12 +5,14 @@ libtommath, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "convertlit"; version = "1.8"; src = fetchzip { - url = "http://www.convertlit.com/convertlit${lib.replaceStrings [ "." ] [ "" ] version}src.zip"; + url = "http://www.convertlit.com/convertlit${ + lib.replaceStrings [ "." ] [ "" ] finalAttrs.version + }src.zip"; sha256 = "182nsin7qscgbw2h92m0zadh3h8q410h5cza6v486yjfvla3dxjx"; stripRoot = false; }; @@ -19,18 +21,22 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + + postPatch = '' + substituteInPlace clit18/Makefile --replace gcc \$\(CC\) + substituteInPlace clit18/Makefile --replace ../libtommath-0.30/libtommath.a -ltommath + ''; + buildPhase = '' cd lib make cd ../clit18 - substituteInPlace Makefile \ - --replace ../libtommath-0.30/libtommath.a -ltommath make ''; installPhase = '' - mkdir -p $out/bin - cp clit $out/bin + install -Dm755 clit $out/bin/clit ''; meta = { @@ -40,4 +46,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index a45cbf962503..5f873a8fdd61 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, fetchFromGitHub, buildNpmPackage, rustPlatform, pkg-config, openssl, - darwin, }: rustPlatform.buildRustPackage rec { pname = "cook-cli"; @@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; postPatch = '' rm -rf "ui/public" diff --git a/pkgs/by-name/co/copier/package.nix b/pkgs/by-name/co/copier/package.nix index cceaf852271c..80e24c2f99b1 100644 --- a/pkgs/by-name/co/copier/package.nix +++ b/pkgs/by-name/co/copier/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "copier"; - version = "9.4.1"; + version = "9.6.0"; pyproject = true; src = fetchFromGitHub { @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { postFetch = '' rm $out/tests/demo/doc/ma*ana.txt ''; - hash = "sha256-bNz3xFYksgdN9iXbkZIHWsHpRa9aICxBZmzy/t0+3z0="; + hash = "sha256-mezmXrOvfqbZGZadNZklQZt/OEKqRYnwugNkZc88t6o="; }; POETRY_DYNAMIC_VERSIONING_BYPASS = version; @@ -49,16 +49,14 @@ python3.pkgs.buildPythonApplication rec { questionary ]; - makeWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ git ]}" - ]; + makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ git ]}" ]; - meta = with lib; { + meta = { description = "Library and command-line utility for rendering projects templates"; homepage = "https://copier.readthedocs.io"; changelog = "https://github.com/copier-org/copier/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ greg ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; mainProgram = "copier"; }; } diff --git a/pkgs/by-name/co/copilot-cli/package.nix b/pkgs/by-name/co/copilot-cli/package.nix index a04f46bf5f42..c490225de5a0 100644 --- a/pkgs/by-name/co/copilot-cli/package.nix +++ b/pkgs/by-name/co/copilot-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.34.0"; + version = "1.34.1"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-iipDvjPCNtk6wHjukgtnWzz0qwAJOU9DpolesNM2ELo="; + hash = "sha256-Oxt1+0z+woNPsFuCkj4t71/e21mHtoCd281BwbHCGc8="; }; - vendorHash = "sha256-VzvbWh3qk9YvUdzlFa0UZMlNpjtLn1WJY4oN6/QPuuo="; + vendorHash = "sha256-ZdYuQAdjzvxxqKHoiHfhfJff3OfEE7ciIGcX1W3jVXY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index c0d97ed5723a..bb328afce10d 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -1,6 +1,7 @@ { lib, stdenvNoCC, + buildFHSEnv, fetchzip, nix-update-script, }: @@ -24,30 +25,48 @@ let } ."${stdenvNoCC.hostPlatform.system}" or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); -in + executableName = "copilot-language-server"; + fhs = + { package }: + buildFHSEnv { + name = package.meta.mainProgram; + version = package.version; + targetPkgs = pkgs: [ pkgs.stdenv.cc.cc.lib ]; + runScript = lib.getExe package; + + meta = package.meta // { + description = + package.meta.description + + " (FHS-wrapped, expand package details for further information when to use it)"; + longDescription = "Use this version if you encounter an error like `Could not start dynamically linked executable` or `SyntaxError: Invalid or unexpected token` (see nixpkgs issue [391730](https://github.com/NixOS/nixpkgs/issues/391730))."; + }; + }; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.294.0"; + version = "1.322.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-native-${finalAttrs.version}.zip"; - hash = "sha256-8nB8vlrSy+949HiJRCa9yFqu/GAaluFH1VzE63AUUs8="; + hash = "sha256-3AJTC4TI+sqTi1/B1XQZght7CClplWwIxjGmrt1E2ME="; stripRoot = false; }; - npmDepsHash = "sha256-PLX/mN7xu8gMh2BkkyTncP3+rJ3nBmX+pHxl0ONXbe4="; installPhase = '' runHook preInstall - install -Dt "$out"/bin "${os}-${arch}"/copilot-language-server + install "${os}-${arch}/${executableName}" -Dm755 -t "$out"/bin runHook postInstall ''; dontStrip = true; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + fhs = fhs { package = finalAttrs.finalPackage; }; + }; meta = { description = "Use GitHub Copilot with any editor or IDE via the Language Server Protocol"; @@ -60,7 +79,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { shortName = "GitHub Copilot License"; url = "https://github.com/customer-terms/github-copilot-product-specific-terms"; }; - mainProgram = "copilot-language-server"; + mainProgram = executableName; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix index c11f14947429..03795d31950c 100644 --- a/pkgs/by-name/co/coppwr/package.nix +++ b/pkgs/by-name/co/coppwr/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "coppwr"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "dimtpap"; repo = "coppwr"; rev = version; - hash = "sha256-5TgK/0UN05P3WENch4sBo/Sy9FaMmyH/gZ+6qUyM1z0="; + hash = "sha256-Wit0adP9M8vlCXF6WJx2tZnR6LrwcvoTNx1KC1HfN8w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xF/eBBXlbOfGy9avDkOXT/q72DHJ7Zlu3lfDsTwo+3U="; + cargoHash = "sha256-tgvSOwZmboe4DzEqJOCYWwIbAStGV1F6ZAzlwCd7Uo4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix index 7569bdb81082..f088947528c2 100644 --- a/pkgs/by-name/co/copycat/package.nix +++ b/pkgs/by-name/co/copycat/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-gjFVvP2h+HJdDdNVtqTT1E1s4ZYXfWuhtMBRJkWRcDw="; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk_11_0.frameworks.AppKit - ]; - meta = { description = "Utility to copy project tree contents to clipboard"; homepage = "https://github.com/DeeKahy/CopyCat"; diff --git a/pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff b/pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff new file mode 100644 index 000000000000..b291abb05039 --- /dev/null +++ b/pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff @@ -0,0 +1,14 @@ +diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt +index 38deb12..7bbaa81 100644 +--- a/src/helper/CMakeLists.txt ++++ b/src/helper/CMakeLists.txt +@@ -27,8 +27,8 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1") + option(POLKIT_POLICY_INSTALL_DIR "Polkit policy files installation directory" OFF) + + # Find polkit ++pkg_check_modules(POLKIT REQUIRED polkit-gobject-1) + if(NOT POLKIT_POLICY_INSTALL_DIR) +- pkg_check_modules(POLKIT REQUIRED polkit-gobject-1) + execute_process( + COMMAND pkg-config --variable=policydir polkit-gobject-1 + RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT diff --git a/pkgs/by-name/co/corectrl/package.nix b/pkgs/by-name/co/corectrl/package.nix index 3a8d2851b8be..33dcafd2cf21 100644 --- a/pkgs/by-name/co/corectrl/package.nix +++ b/pkgs/by-name/co/corectrl/package.nix @@ -1,11 +1,12 @@ { botan3, - extra-cmake-modules, fetchFromGitLab, + cmake, + pkg-config, hwdata, lib, libdrm, - libsForQt5, + kdePackages, mesa-demos, polkit, procps, @@ -18,32 +19,32 @@ stdenv.mkDerivation (finalAttrs: { pname = "corectrl"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-rQibIjLmSnkA8jk6GOo68JIeb4wZq0wxXpLs3zsB7GI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-NwGrvDqImiyPc3AsL7rMwNG9na+AzZS6NvXQOc6VWHg="; }; nativeBuildInputs = [ - extra-cmake-modules - libsForQt5.wrapQtAppsHook + cmake + pkg-config + kdePackages.extra-cmake-modules + kdePackages.wrapQtAppsHook ]; buildInputs = [ botan3 libdrm # TODO: report upstream that libdrm is not detected at configure time - libsForQt5.karchive - libsForQt5.kauth - libsForQt5.qtbase - libsForQt5.qtcharts - libsForQt5.qtquickcontrols2 - libsForQt5.qtsvg - libsForQt5.qttools - libsForQt5.qtxmlpatterns - libsForQt5.quazip + kdePackages.karchive + kdePackages.kauth + kdePackages.qtbase + kdePackages.qtcharts + kdePackages.qtsvg + kdePackages.qttools + kdePackages.quazip mesa-demos polkit procps @@ -54,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - ./polkit-dir.patch + ./Always-locate-polkit-with-pkg-config.diff ]; cmakeFlags = [ diff --git a/pkgs/by-name/co/corectrl/polkit-dir.patch b/pkgs/by-name/co/corectrl/polkit-dir.patch deleted file mode 100644 index beaef3b5097e..000000000000 --- a/pkgs/by-name/co/corectrl/polkit-dir.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt -index 3fe2ace..2542ea1 100644 ---- a/src/helper/CMakeLists.txt -+++ b/src/helper/CMakeLists.txt -@@ -22,15 +22,7 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1") - - # Find polkit - pkg_check_modules(POLKIT REQUIRED polkit-gobject-1) --execute_process( -- COMMAND pkg-config --variable=policydir polkit-gobject-1 -- RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT -- OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR -- OUTPUT_STRIP_TRAILING_WHITESPACE --) --if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0") -- message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable using pkg-config") --endif() -+option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory") - - list(APPEND HELPER_COMPILE_DEFINITIONS - ELPP_THREAD_SAFE diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index b6ff5c566804..467b7ed05b15 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "coroot-node-agent"; - version = "1.23.15"; + version = "1.23.23"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${version}"; - hash = "sha256-3rr8LWaEhhAvzJisVj2uLK3O5us5/XEOpl7RFL2GBxw="; + hash = "sha256-LLRAKmtHDsYzo17NW2/fkUu7z4dr3OlXe/QyUDypQOM="; }; - vendorHash = "sha256-SxyIlyDHuu8Ls1+/rujWE9elZiTfSYWIrV8vP5xsqTU="; + vendorHash = "sha256-11gj+s1fG6uOUTiezNk+/eS4g/bdth09Gl5jcOa9joo="; buildInputs = [ systemdLibs ]; diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index 05c5a5dc8f81..4f210041fac1 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "coroot"; - version = "1.9.9"; + version = "1.10.1"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${version}"; - hash = "sha256-pGNlXXggy32vnbbjGNCev8HzUltls1ElGVULPhOwoRQ="; + hash = "sha256-3HSILiqgmEm/ZzyvhNspnAuHGw/CyyeYd9f561bZjF4="; }; - vendorHash = "sha256-wyxNT8g5TUCjlxauL7NmCf4HZ91V2nD64L1L/rYH864="; + vendorHash = "sha256-1yKb8CuNcwpHWC0eDIs2Ml3H7xGYaTCGxyrtuyLvd8c="; npmDeps = fetchNpmDeps { src = "${src}/front"; hash = "sha256-inZV+iv837+7ntBae/oLSNLxpzoqEcJNPNdBE+osJHQ="; diff --git a/pkgs/by-name/co/corrosion/package.nix b/pkgs/by-name/co/corrosion/package.nix index cdd2debdaa61..54e30851a464 100644 --- a/pkgs/by-name/co/corrosion/package.nix +++ b/pkgs/by-name/co/corrosion/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-/Xq0SKaKuOgrMXbgw+Aa59NEnU1mPQhARoh7EqV01K8="; + hash = "sha256-sO2U0llrDOWYYjnfoRZE+/ofg3kb+ajFmqvaweRvT7c="; }; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/co/cosign/package.nix b/pkgs/by-name/co/cosign/package.nix new file mode 100644 index 000000000000..52de7fc557cd --- /dev/null +++ b/pkgs/by-name/co/cosign/package.nix @@ -0,0 +1,86 @@ +{ + stdenv, + lib, + buildGoModule, + fetchFromGitHub, + pcsclite, + pkg-config, + installShellFiles, + pivKeySupport ? true, + pkcs11Support ? true, + testers, +}: + +buildGoModule (finalAttrs: { + pname = "cosign"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "sigstore"; + repo = "cosign"; + rev = "v${finalAttrs.version}"; + hash = "sha256-QvU+JpIcE9EX+ehRWvs2bS2VGgGVekNX8f5+mITIwU0="; + }; + + buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite); + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + vendorHash = "sha256-qIi+Pp4XZg1GxOhM9fCyD9rPaIiQHhoQudB50gzWgrM="; + + subPackages = [ + "cmd/cosign" + ]; + + tags = + [ ] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ]; + + ldflags = [ + "-s" + "-w" + "-X sigs.k8s.io/release-utils/version.gitVersion=v${finalAttrs.version}" + "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" + ]; + + __darwinAllowLocalNetworking = true; + + preCheck = '' + # test all paths + unset subPackages + + rm pkg/cosign/ctlog_test.go # Require network access + rm pkg/cosign/tlog_test.go # Require network access + rm cmd/cosign/cli/verify/verify_test.go # Require network access + rm cmd/cosign/cli/verify/verify_blob_attestation_test.go # Require network access + rm cmd/cosign/cli/verify/verify_blob_test.go # Require network access + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd cosign \ + --bash <($out/bin/cosign completion bash) \ + --fish <($out/bin/cosign completion fish) \ + --zsh <($out/bin/cosign completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "cosign version"; + version = "v${finalAttrs.version}"; + }; + + meta = with lib; { + homepage = "https://github.com/sigstore/cosign"; + changelog = "https://github.com/sigstore/cosign/releases/tag/v${finalAttrs.version}"; + description = "Container Signing CLI with support for ephemeral keys and Sigstore signing"; + mainProgram = "cosign"; + license = licenses.asl20; + maintainers = with maintainers; [ + lesuisse + jk + developer-guy + ]; + }; +}) diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index d43c222385b8..415f168dd5b4 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -14,21 +14,23 @@ udev, xkeyboard_config, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applets"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-kRj2hEtE8FYky9Fn8hgHBo+UwWjOoS7/ROh9qz/0Vzs="; + hash = "sha256-DmU9Dlb8w3a8U+oSGwWARPh1SRbv/8TW7TO9SSvDe1U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-jADtvhMzWdJydT1T14PSk4ggZpWIcXiOK0TW2llKeos="; + cargoHash = "sha256-wWs3B5hh2DP93i+4gGDTi+7NT4bj8ULJ+fT95sXxUdg="; nativeBuildInputs = [ just @@ -64,24 +66,30 @@ rustPlatform.buildRustPackage (finalAttrs: { ) ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { homepage = "https://github.com/pop-os/cosmic-applets"; description = "Applets for the COSMIC Desktop Environment"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - qyliss - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index a6fca5a62349..a40d47b3f989 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -6,21 +6,23 @@ libcosmicAppHook, just, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applibrary"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applibrary"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-hJOM5dZdLq6uYfhfspZzpbHgUOK/FWuIXuFPoisS8DU="; + hash = "sha256-2rGw4Jmr2rL9X1URA5wVPIZocuroS8yaQs42sJqiTbw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-95jTSn0yYj2PNVtfumfD1rPf1yLXHUi60FBqENK8CSw="; + cargoHash = "sha256-+nkXcbAPcIkg+p4ct/E0bm5O0n1MGN43AaWPjw13t9s="; nativeBuildInputs = [ just @@ -43,23 +45,30 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { homepage = "https://github.com/pop-os/cosmic-applibrary"; description = "Application Template for the COSMIC Desktop Environment"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; mainProgram = "cosmic-app-library"; }; diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index 61fe82b61528..7ac948e176f6 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -1,55 +1,65 @@ { lib, stdenv, - stdenvAdapters, fetchFromGitHub, rustPlatform, + cosmic-wallpapers, libcosmicAppHook, just, nasm, nix-update-script, - - withMoldLinker ? stdenv.targetPlatform.isLinux, + nixosTests, }: -rustPlatform.buildRustPackage.override - { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; } - (finalAttrs: { - pname = "cosmic-bg"; - version = "1.0.0-alpha.6"; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-bg"; + version = "1.0.0-alpha.7"; - src = fetchFromGitHub { - owner = "pop-os"; - repo = "cosmic-bg"; - tag = "epoch-${finalAttrs.version}"; - hash = "sha256-4b4laUXTnAbdngLVh8/dD144m9QrGReSEjRZoNR6Iks="; + # nixpkgs-update: no auto update + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-bg"; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-KMP7TmamtbycF/nKctjYozMJwVr9zdp4A8AWriswo2g="; + }; + + postPatch = '' + substituteInPlace config/src/lib.rs data/v1/all \ + --replace-fail '/usr/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg' \ + "${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg" + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk="; + + nativeBuildInputs = [ + just + libcosmicAppHook + nasm + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg" + ]; + + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; }; - - useFetchCargoVendor = true; - cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk="; - - nativeBuildInputs = [ - just - libcosmicAppHook - nasm - ]; - - dontUseJustBuild = true; - dontUseJustCheck = true; - - justFlags = [ - "--set" - "prefix" - (placeholder "out") - "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg" - ]; - - env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold"; - - passthru.updateScript = nix-update-script { + updateScript = nix-update-script { extraArgs = [ "--version" "unstable" @@ -57,16 +67,14 @@ rustPlatform.buildRustPackage.override "epoch-(.*)" ]; }; + }; - meta = { - homepage = "https://github.com/pop-os/cosmic-bg"; - description = "Applies Background for the COSMIC Desktop Environment"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; - platforms = lib.platforms.linux; - mainProgram = "cosmic-bg"; - }; - }) + meta = { + homepage = "https://github.com/pop-os/cosmic-bg"; + description = "Applies Background for the COSMIC Desktop Environment"; + license = lib.licenses.mpl20; + teams = [ lib.teams.cosmic ]; + platforms = lib.platforms.linux; + mainProgram = "cosmic-bg"; + }; +}) diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 90fb1c30c203..6cb3d5b49d3a 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -12,26 +12,26 @@ seatd, udev, systemd, - xwayland, nix-update-script, + nixosTests, - useXWayland ? true, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-CygtVtzO8JJQv+G3yx/OCCy8BlPqyNqcmf3Mv1gFuT4="; + hash = "sha256-2AnGEUWumE1C4Mi5inN7enbxCdWCKbQdYpUvTK3jGQ4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bfVsfrxGi0Lq/YRddCVhfqXL8kPGL9p4bqSNPsmjx0o="; + cargoHash = "sha256-fj6TIBuZ5hrds4WMHRa2krXN5fivKriO2Q/FWdnlGaA="; separateDebugInfo = true; @@ -59,17 +59,23 @@ rustPlatform.buildRustPackage (finalAttrs: { dontCargoInstall = true; - preFixup = lib.optionalString useXWayland '' - libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]}) - ''; - - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { @@ -77,11 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Compositor for the COSMIC Desktop Environment"; mainProgram = "cosmic-comp"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - qyliss - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-design-demo/package.nix b/pkgs/by-name/co/cosmic-design-demo/package.nix index 5a4f4fc1c81e..45110579aa37 100644 --- a/pkgs/by-name/co/cosmic-design-demo/package.nix +++ b/pkgs/by-name/co/cosmic-design-demo/package.nix @@ -52,10 +52,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/pop-os/cosmic-design-demo"; description = "Design Demo for the COSMIC Desktop Environment"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; mainProgram = "cosmic-design-demo"; }; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index f9077e2c283c..35f996a4550b 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -16,25 +16,27 @@ wayland, xorg, vulkan-loader, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-edit"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-mKVZI/x8+LrwFHGnJOzOq/vFkGev7sM9xJQOTA7uZGA="; + hash = "sha256-mgUSkYtc+i9pXv0n3zLHwBXFxfeWlhbsFJKa7X+mI98="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+b8pSSBUMs1EJDlldgR1UqLLH0sLU/djMOtE3JsDpkQ="; + cargoHash = "sha256-qfPLDgGeYGSO0ZKJooXRK0NnTqzJ6zq6RhBpTTUusQY="; # COSMIC applications now uses vergen for the About page # Update the COMMIT_DATE to match when the commit was made - env.VERGEN_GIT_COMMIT_DATE = "2025-02-20"; + env.VERGEN_GIT_COMMIT_DATE = "2025-04-17"; env.VERGEN_GIT_SHA = finalAttrs.src.tag; postPatch = '' @@ -84,15 +86,21 @@ rustPlatform.buildRustPackage (finalAttrs: { --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" ''; + passthru.tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-edit"; description = "Text Editor for the COSMIC Desktop Environment"; mainProgram = "cosmic-edit"; license = licenses.gpl3Only; - maintainers = with maintainers; [ - ahoneybun - nyabinary - ]; + teams = [ teams.cosmic ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-ext-ctl/package.nix b/pkgs/by-name/co/cosmic-ext-ctl/package.nix index 9812b7f88eff..da6fcab6e26a 100644 --- a/pkgs/by-name/co/cosmic-ext-ctl/package.nix +++ b/pkgs/by-name/co/cosmic-ext-ctl/package.nix @@ -6,22 +6,19 @@ nix-update-script, cosmic-comp, }: -let - version = "1.1.0"; -in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-ext-ctl"; - inherit version; + version = "1.5.0"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ctl"; - tag = "v${version}"; - hash = "sha256-dcUzrJcwJpzbYPuqdHgm43NYbaowsFmFP4sS0cfzNAg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-URqNhkC1XrXYxr14K6sT3TLso38eWLMA+WplBdj52Vg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EReo2hkBaIO1YOBx4D9rQSXlx+3NK5VQtj59jfZZI/0="; + cargoHash = "sha256-OL1LqOAyIFFCGIp3ySdvEXJ1ECp9DgC/8mfAPo/E7k4="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -31,11 +28,11 @@ rustPlatform.buildRustPackage { meta = { description = "CLI for COSMIC Desktop configuration management"; - changelog = "https://github.com/cosmic-utils/cosmic-ctl/releases/tag/v${version}"; + changelog = "https://github.com/cosmic-utils/cosmic-ctl/releases/tag/v${finalAttrs.version}"; homepage = "https://github.com/cosmic-utils/cosmic-ctl"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ HeitorAugustoLN ]; mainProgram = "cosmic-ctl"; inherit (cosmic-comp.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 7951c9f82d9d..e3e3514eed80 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -7,24 +7,26 @@ libcosmicAppHook, glib, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-files"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-files"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-i1CVhfieexeiKPwp0y29QyrKspzEFkp1+zwIaM9D/Qc="; + hash = "sha256-bI5yTpqU2N6hFwI9wi4b9N5onY5iN+8YDM3bSgdYxjQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-I5WRuEogMwa0dB6wxhWDxivqhCdUugvsPrwUvjjDnt8="; + cargoHash = "sha256-7AOdSk9XIXFCDyCus3XgOK3ZBVa4CvX+NFM0jHf7Wbs="; env = { - VERGEN_GIT_COMMIT_DATE = "2025-02-21"; + VERGEN_GIT_COMMIT_DATE = "2025-04-22"; VERGEN_GIT_SHA = finalAttrs.src.tag; }; @@ -71,7 +73,17 @@ rustPlatform.buildRustPackage (finalAttrs: { defaultCargoTestFlags="$cargoTestFlags" - cargoTestFlags="$defaultCargoTestFlags --package cosmic-files" + # Some tests with the `compio` runtime expect io_uring support but that + # is disabled in the Nix sandbox and the tests fail because they can't + # run in the sandbox. Ideally, the `compio` crate should fallback to a + # non-io_uring runtime but for some reason, that doesn't happen. + cargoTestFlags="$defaultCargoTestFlags --package cosmic-files -- \ + --skip operation::tests::copy_dir_to_same_location \ + --skip operation::tests::copy_file_to_same_location \ + --skip operation::tests::copy_file_with_diff_name_to_diff_dir \ + --skip operation::tests::copy_file_with_extension_to_same_loc \ + --skip operation::tests::copy_to_diff_dir_doesnt_dupe_files \ + --skip operation::tests::copying_file_multiple_times_to_same_location" runHook cargoCheckHook cargoTestFlags="$defaultCargoTestFlags --package cosmic-files-applet" @@ -80,13 +92,23 @@ rustPlatform.buildRustPackage (finalAttrs: { runHook postCheck ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { @@ -94,11 +116,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "File Manager for the COSMIC Desktop Environment"; license = lib.licenses.gpl3Only; mainProgram = "cosmic-files"; - maintainers = with lib.maintainers; [ - ahoneybun - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index 90ca350a82c2..625bb450b68d 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -12,21 +12,26 @@ coreutils, xkeyboard_config, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-greeter"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-K6kCBtlmFfav8UP4zorzDJBzHt4CoSaFFAufrW1DPrw="; + hash = "sha256-o9ZoRHi+k+HCSGfRz1lQFAeJMCqcTQEHf5rf9wn3qqY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nmkM/Jm2P5ftZFfzX+O1Fe6eobRbgBkajZsbyI67Zfw="; + cargoHash = "sha256-hUHkyz/avFu9g1FMdC+4vz6xM75CauurrarhouuVZXc="; + + env.VERGEN_GIT_COMMIT_DATE = "2025-04-25"; + env.VERGEN_GIT_SHA = finalAttrs.src.tag; cargoBuildFlags = [ "--all" ]; @@ -69,13 +74,23 @@ rustPlatform.buildRustPackage (finalAttrs: { ) ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { @@ -83,10 +98,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Greeter for the COSMIC Desktop Environment"; mainProgram = "cosmic-greeter"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index a400c9eb4c32..a182beced385 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,13 +9,14 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-icons"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-icons"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-j5H2+BOWxq2jShN15QCvj9rY6OK+vlUbyR9R07Ka2rA="; + hash = "sha256-KDmEYeuiDTYvqg2XJK8pMDfsmROKtN+if5Qxz57H5xs="; }; nativeBuildInputs = [ just ]; @@ -48,9 +49,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = with lib.licenses; [ cc-by-sa-40 ]; - maintainers = with lib.maintainers; [ - a-kenji - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; }; }) diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index 3bf2c64eb330..72525666fb94 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -11,17 +11,19 @@ just, bash, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-idle"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-idle"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-hORU+iMvWA4XMSWmzir9EwjpLK5vOLR8BgMZz+aIZ4U="; + hash = "sha256-dRvcow+rZ4sJV6pBxRIw6SCmU3aXP9uVKtFEJ9vozzI="; }; useFetchCargoVendor = true; @@ -48,13 +50,23 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace src/main.rs --replace-fail '"/bin/sh"' '"${lib.getExe' bash "sh"}"' ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { @@ -62,7 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/pop-os/cosmic-idle"; license = lib.licenses.gpl3Only; mainProgram = "cosmic-idle"; - maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; sourceProvenance = [ lib.sourceTypes.fromSource ]; }; diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index fba267328761..82731e20b975 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -1,52 +1,57 @@ { lib, stdenv, - stdenvAdapters, fetchFromGitHub, rustPlatform, just, libcosmicAppHook, nix-update-script, - - withMoldLinker ? stdenv.targetPlatform.isLinux, + nixosTests, }: -rustPlatform.buildRustPackage.override - { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; } - (finalAttrs: { - pname = "cosmic-launcher"; - version = "1.0.0-alpha.6"; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-launcher"; + version = "1.0.0-alpha.7"; - src = fetchFromGitHub { - owner = "pop-os"; - repo = "cosmic-launcher"; - tag = "epoch-${finalAttrs.version}"; - hash = "sha256-BtYnL+qkM/aw+Air5yOKH098V+TQByM5mh1DX7v+v+s="; + # nixpkgs-update: no auto update + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-launcher"; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-niMsDLVMUEr8VyubDm6RGgS7p22v5nH/F8cASJOszhs="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Wh3vI42RBfXpI7mvPVUmGK3fITGi+EGyo+lG7VnZg3w="; + + nativeBuildInputs = [ + just + libcosmicAppHook + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-launcher" + ]; + + env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable"; + + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; }; - - useFetchCargoVendor = true; - cargoHash = "sha256-g7Qr3C8jQg65KehXAhftdXCpEukag0w12ClvZFkxfqs="; - - nativeBuildInputs = [ - just - libcosmicAppHook - ]; - - dontUseJustBuild = true; - dontUseJustCheck = true; - - justFlags = [ - "--set" - "prefix" - (placeholder "out") - "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-launcher" - ]; - - env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - "--cfg tokio_unstable${lib.optionalString withMoldLinker " -C link-arg=-fuse-ld=mold"}"; - passthru.updateScript = nix-update-script { extraArgs = [ "--version" @@ -55,16 +60,14 @@ rustPlatform.buildRustPackage.override "epoch-(.*)" ]; }; + }; - meta = { - homepage = "https://github.com/pop-os/cosmic-launcher"; - description = "Launcher for the COSMIC Desktop Environment"; - mainProgram = "cosmic-launcher"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; - platforms = lib.platforms.linux; - }; - }) + meta = { + homepage = "https://github.com/pop-os/cosmic-launcher"; + description = "Launcher for the COSMIC Desktop Environment"; + mainProgram = "cosmic-launcher"; + license = lib.licenses.gpl3Only; + teams = [ lib.teams.cosmic ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index 99a85f7ee6a7..57103ec5f811 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -4,49 +4,36 @@ fetchFromGitHub, rustPlatform, just, + libcosmicAppHook, which, - pkg-config, - makeBinaryWrapper, - libxkbcommon, - wayland, - appstream-glib, - desktop-file-utils, - intltool, + nixosTests, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-notifications"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-notifications"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-d6bAiRSO2opKSZfadyQYrU9oIrXwPNzO/g2E2RY6q04="; + hash = "sha256-xcGmcOoxHb7gj6fW7xPZ5R0MTkMVXNJgvr9d5LPy9kw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-utip7E8NST88mPaKppkuOcdW+QkFoRqWy3a2McvMHo8="; - - postPatch = '' - substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" - ''; + cargoHash = "sha256-7EDe1OjGS6Xl0N/BrZG8lzWO0pFbwiEp+kn6WyydJQM="; nativeBuildInputs = [ just which - pkg-config - makeBinaryWrapper - ]; - buildInputs = [ - libxkbcommon - wayland - appstream-glib - desktop-file-utils - intltool + libcosmicAppHook ]; dontUseJustBuild = true; + # Runs the default checkPhase instead + dontUseJustCheck = true; justFlags = [ "--set" @@ -57,17 +44,32 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-notifications" ]; - postInstall = '' - wrapProgram $out/bin/cosmic-notifications \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}" - ''; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; - meta = with lib; { + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; + }; + + meta = { homepage = "https://github.com/pop-os/cosmic-notifications"; description = "Notifications for the COSMIC Desktop Environment"; mainProgram = "cosmic-notifications"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ nyabinary ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + teams = [ lib.teams.cosmic ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 745f86f03891..a1e9e92961b0 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -1,26 +1,34 @@ { lib, fetchFromGitHub, + sound-theme-freedesktop, rustPlatform, libcosmicAppHook, pulseaudio, udev, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-osd"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-ezOeRgqI/GOWFknUVZI7ZLEy1GYaBI+/An83HWKL6ho="; + hash = "sha256-POjuxrNBajp4IOw7YwF2TS4OfoM8Hxo1fO48nkhKj8U="; }; + postPatch = '' + substituteInPlace src/components/app.rs \ + --replace-fail '/usr/share/sounds/freedesktop/stereo/audio-volume-change.oga' '${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga' + ''; + useFetchCargoVendor = true; - cargoHash = "sha256-vYehF2RjPrTZiuGcRUe4XX3ftRo7f+SIoKizD/kOtR8="; + cargoHash = "sha256-kfExKggQo3MoTXw1JbKWjLu5kwYF0n7DzSQcG6e1+QQ="; nativeBuildInputs = [ libcosmicAppHook ]; @@ -31,13 +39,23 @@ rustPlatform.buildRustPackage (finalAttrs: { env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1"; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { @@ -45,10 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "OSD for the COSMIC Desktop Environment"; mainProgram = "cosmic-osd"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 279addbd48b7..cce5a88314c9 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -6,21 +6,23 @@ libcosmicAppHook, just, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-6lt9Rig1pM37B7+nRrR+eYke8umSfYlg8aLB45Q1X+4="; + hash = "sha256-QcrkfU6HNZ2tWfKsMdcv58HC/PE7b4T14AIep85TWOY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EIp9s42deMaB7BDe7RAqj2+CnTXjHCtZjS5Iq8l46A4="; + cargoHash = "sha256-qufOJeWPRjj4GgWNJmQfYaGKeYOQbkTeFzrUSi9QNnQ="; nativeBuildInputs = [ just @@ -39,13 +41,23 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { @@ -53,11 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Panel for the COSMIC Desktop Environment"; mainProgram = "cosmic-panel"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - qyliss - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index 4dc39cf83dfb..aef2c1f9a13a 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -13,21 +13,23 @@ libglvnd, libgbm, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-player"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-player"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-Ebjj+C+yLCRomZy2W8mYDig1pv7aQcD3A9V2M53RM5U="; + hash = "sha256-/xf3IOFVpctfgaaNNq2HUzK/qHt7Qikcv0JKoPJboRU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-p1ylYB6xuF0UrhUO+QbGIgxqvZeQ6+GIbSNijTDXyRE="; + cargoHash = "sha256-0RrtErTR2J5mn/Lfppk+5X8UUOC2LN65krAq1uz/O4M="; postPatch = '' substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" @@ -71,23 +73,30 @@ rustPlatform.buildRustPackage (finalAttrs: { libcosmicAppWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { homepage = "https://github.com/pop-os/cosmic-player"; description = "Media player for the COSMIC Desktop Environment"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - ahoneybun - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; mainProgram = "cosmic-player"; }; diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index e887e516cbec..915552203b0b 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -4,27 +4,38 @@ fetchFromGitHub, wayland-scanner, nix-update-script, + nixosTests, }: stdenv.mkDerivation { pname = "cosmic-protocols"; - version = "0-unstable-2025-03-21"; + version = "0-unstable-2025-05-02"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-protocols"; - rev = "ee0d46f4b7e1508011a98225f14c4a0528ab2914"; - hash = "sha256-oD9BYWX0uPpdsOYAyFq/pI6zxM0SfEb8lq9QA2yrBZY="; + rev = "1425bd44ed2b318a552201cc752ae11f2f483ef5"; + hash = "sha256-rzLust1BKbITEgN7Hwjy1CT+4iOipv+4VIixfUAuCms="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; nativeBuildInputs = [ wayland-scanner ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "branch=HEAD" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch=HEAD" + ]; + }; }; meta = { @@ -34,10 +45,7 @@ stdenv.mkDerivation { mit gpl3Only ]; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index e8115fad0f15..bea71c835207 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -1,56 +1,59 @@ { lib, stdenv, - stdenvAdapters, fetchFromGitHub, rustPlatform, just, pkg-config, wayland, nix-update-script, - - withMoldLinker ? stdenv.targetPlatform.isLinux, + nixosTests, }: -rustPlatform.buildRustPackage.override - { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; } - (finalAttrs: { - pname = "cosmic-randr"; - version = "1.0.0-alpha.6"; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-randr"; + version = "1.0.0-alpha.7"; - src = fetchFromGitHub { - owner = "pop-os"; - repo = "cosmic-randr"; - tag = "epoch-${finalAttrs.version}"; - hash = "sha256-Sqxe+vKonsK9MmJGtbrZHE7frfrjkHXysm0WQt7WSU4="; + # nixpkgs-update: no auto update + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-randr"; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-vCGbWsG/F3WhWVSy8Z3r4ZHpks/X/57/ZZXuw6BFl+c="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-lW44Y7RhA1l+cCDwqSq9sbhWi+kONJ0zy1fUu8WPYw0="; + + nativeBuildInputs = [ + just + pkg-config + ]; + + buildInputs = [ wayland ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr" + ]; + + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; }; - - useFetchCargoVendor = true; - cargoHash = "sha256-UQ/fhjUiniVeHRQYulYko4OxcWB6UhFuxH1dVAfAzIY="; - - nativeBuildInputs = [ - just - pkg-config - ]; - - buildInputs = [ wayland ]; - - dontUseJustBuild = true; - dontUseJustCheck = true; - - justFlags = [ - "--set" - "prefix" - (placeholder "out") - "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr" - ]; - - env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold"; - - passthru.updateScript = nix-update-script { + updateScript = nix-update-script { extraArgs = [ "--version" "unstable" @@ -58,16 +61,14 @@ rustPlatform.buildRustPackage.override "epoch-(.*)" ]; }; + }; - meta = { - homepage = "https://github.com/pop-os/cosmic-randr"; - description = "Library and utility for displaying and configuring Wayland outputs"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; - platforms = lib.platforms.linux; - mainProgram = "cosmic-randr"; - }; - }) + meta = { + homepage = "https://github.com/pop-os/cosmic-randr"; + description = "Library and utility for displaying and configuring Wayland outputs"; + license = lib.licenses.mpl20; + teams = [ lib.teams.cosmic ]; + platforms = lib.platforms.linux; + mainProgram = "cosmic-randr"; + }; +}) diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index df6a50a5ec12..20eef7825038 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -5,17 +5,19 @@ rustPlatform, just, pkg-config, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-screenshot"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-screenshot"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-/sGYF+XWmPraNGlBVUcN/nokDB9JwWViEAL9gVH3ZaI="; + hash = "sha256-VvU/9vYdoTvy3yzdeXrhKrtS9tUHMKnaSAeNTEKk5PA="; }; useFetchCargoVendor = true; @@ -37,11 +39,20 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-screenshot" ]; + passthru.tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-screenshot"; description = "Screenshot tool for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyabinary ]; + teams = [ teams.cosmic ]; platforms = platforms.linux; mainProgram = "cosmic-screenshot"; }; diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index 3f3bf681c7b1..0f605f183615 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -7,21 +7,23 @@ dbus, stdenv, xdg-desktop-portal-cosmic, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-session"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-2EKkVdZ7uNNJ/E/3knmeH3EBa+tkYmIxP3t9d6yacww="; + hash = "sha256-vozm4vcXV3RB9Pk6om1UNCfGh80vIVJvSwbzwGDQw3Y="; }; useFetchCargoVendor = true; - cargoHash = "sha256-iYObxjWJUKgZKGTkqtYgQK4758k0EYZGhIAM/oLxxso="; + cargoHash = "sha256-68budhhbt8wPY7sfDqwIs4MWB/NBXsswK6HbC2AnHqE="; postPatch = '' substituteInPlace data/start-cosmic \ @@ -42,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: { (placeholder "out") "--set" "cosmic_dconf_profile" - "cosmic" + "${placeholder "out"}/etc/dconf/profile/cosmic" "--set" "cargo-target-dir" "target/${stdenv.hostPlatform.rust.cargoShortTarget}" @@ -50,31 +52,24 @@ rustPlatform.buildRustPackage (finalAttrs: { env.XDP_COSMIC = "${xdg-desktop-portal-cosmic}/libexec/xdg-desktop-portal-cosmic"; - postInstall = '' - dconf_profile_dst=$out/etc/dconf/profile/cosmic - if [ ! -f $dconf_profile_dst ]; then - install -Dm0644 data/dconf/profile/cosmic $dconf_profile_dst - else - # future proofing - echo 'The Justfile is now correctly installing the dconf profile.' - echo 'Please remove the dconf profile from the `postInstall` phase.' - exit 1 - fi - ''; - - passthru.providedSessions = [ "cosmic" ]; + passthru = { + providedSessions = [ "cosmic" ]; + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + }; meta = { homepage = "https://github.com/pop-os/cosmic-session"; description = "Session manager for the COSMIC desktop environment"; license = lib.licenses.gpl3Only; mainProgram = "cosmic-session"; - maintainers = with lib.maintainers; [ - a-kenji - nyabinary - thefossguy - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 48345bac9841..b9b19d3cda14 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -3,29 +3,42 @@ fetchFromGitHub, stdenv, rustPlatform, + pop-gtk-theme, + adw-gtk3, pkg-config, + libpulseaudio, geoclue2-with-demo-agent, libinput, udev, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings-daemon"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings-daemon"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-DtwW6RxHnNh87Xu0NCULfUsHNzYU9tHtFKE9HO3rvME="; + hash = "sha256-vdhkE5CmgiGYg5TXxN7lLqxjv7apKEKvIscXFIzZfRc="; }; + postPatch = '' + substituteInPlace src/battery.rs \ + --replace-fail '/usr/share/sounds/Pop/' '${pop-gtk-theme}/share/sounds/Pop/' + substituteInPlace src/theme.rs \ + --replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3' + ''; + useFetchCargoVendor = true; - cargoHash = "sha256-lGzQBL9IXbPsaKeVHp34xkm5FnTxWvfw4wg3El4LZdA="; + cargoHash = "sha256-Dzv1SDeZFIa+LFQQ91lO7RBHldsjDnGf+R12Ln2WZwU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libinput + libpulseaudio udev ]; @@ -38,12 +51,21 @@ rustPlatform.buildRustPackage (finalAttrs: { dontCargoInstall = true; + passthru.tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-settings-daemon"; description = "Settings Daemon for the COSMIC Desktop Environment"; mainProgram = "cosmic-settings-daemon"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyabinary ]; + teams = [ teams.cosmic ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 3cac2e12b85f..115e85af7ba7 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - stdenvAdapters, fetchFromGitHub, rustPlatform, cmake, @@ -19,73 +18,77 @@ cosmic-randr, xkeyboard_config, nix-update-script, - - withMoldLinker ? stdenv.targetPlatform.isLinux, + nixosTests, }: let libcosmicAppHook' = (libcosmicAppHook.__spliced.buildHost or libcosmicAppHook).override { includeSettings = false; }; in -rustPlatform.buildRustPackage.override - { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; } - (finalAttrs: { - pname = "cosmic-settings"; - version = "1.0.0-alpha.6"; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-settings"; + version = "1.0.0-alpha.7"; - src = fetchFromGitHub { - owner = "pop-os"; - repo = "cosmic-settings"; - tag = "epoch-${finalAttrs.version}"; - hash = "sha256-UKg3TIpyaqtynk6wLFFPpv69F74hmqfMVPra2+iFbvE="; + # nixpkgs-update: no auto update + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-settings"; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-rrPgCXl4uD4Gvstgj9Sdv6rB/0d8wa56CdBjAkTLQG8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-7Aoy/okgFSwDU6jMYzTGtwPbK82yMgL5bnKBfBUD3vA="; + + nativeBuildInputs = [ + cmake + just + libcosmicAppHook' + pkg-config + rustPlatform.bindgenHook + util-linux + ]; + + buildInputs = [ + expat + fontconfig + freetype + libinput + pipewire + pulseaudio + udev + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings" + ]; + + preFixup = '' + libcosmicAppWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ cosmic-randr ]} + --set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml + --set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml + ) + ''; + + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; }; - - useFetchCargoVendor = true; - cargoHash = "sha256-mf/Cw3/RLrCYgsk7JKCU2+oPn1VPbD+4JzkUmbd47m8="; - - nativeBuildInputs = [ - cmake - just - libcosmicAppHook' - pkg-config - rustPlatform.bindgenHook - util-linux - ]; - - buildInputs = [ - expat - fontconfig - freetype - libinput - pipewire - pulseaudio - udev - ]; - - dontUseJustBuild = true; - dontUseJustCheck = true; - - justFlags = [ - "--set" - "prefix" - (placeholder "out") - "--set" - "bin-src" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings" - ]; - - env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold"; - - preFixup = '' - libcosmicAppWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ cosmic-randr ]} - --set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml - --set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml - ) - ''; - - passthru.updateScript = nix-update-script { + updateScript = nix-update-script { extraArgs = [ "--version" "unstable" @@ -93,16 +96,14 @@ rustPlatform.buildRustPackage.override "epoch-(.*)" ]; }; + }; - meta = { - description = "Settings for the COSMIC Desktop Environment"; - homepage = "https://github.com/pop-os/cosmic-settings"; - license = lib.licenses.gpl3Only; - mainProgram = "cosmic-settings"; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; - platforms = lib.platforms.linux; - }; - }) + meta = { + description = "Settings for the COSMIC Desktop Environment"; + homepage = "https://github.com/pop-os/cosmic-settings"; + license = lib.licenses.gpl3Only; + mainProgram = "cosmic-settings"; + teams = [ lib.teams.cosmic ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index e096b9cc2d03..7b83da52b175 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -10,21 +10,23 @@ flatpak, openssl, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-store"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-store"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-ce7PaHBhRFUoujAS6j10XWbD2PxzK6XXIk/ENclT1iY="; + hash = "sha256-skNzkpcdGJkve7enlnnZxYxnScHFmyaCAy0xaMEEsE0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-kPCE6F8/UsTJOmIjwxBLISk/Jhfljwa666WhXuKkkDE="; + cargoHash = "sha256-2iWJFPSvNQ6JwQwzowKYbgjog2gsjOUlReai/j0d3Do="; nativeBuildInputs = [ just @@ -51,6 +53,14 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; updateScript = nix-update-script { extraArgs = [ "--version" @@ -65,11 +75,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/pop-os/cosmic-store"; description = "App Store for the COSMIC Desktop Environment"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - ahoneybun - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index f8efd682d3a4..419e5cc65288 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -10,26 +10,28 @@ freetype, libinput, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-term"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-sdeRkT6UcyBKIFnJZn3aGf8LZQimqVPqtXo7RtwUs5M="; + hash = "sha256-leCKdnlevfLiPJkloWCpOjkHaSf7+EYdobZRZ/Jis+4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Qznkqp+zWpP/ok2xG7U5lYBW0qo4+ARnm8hgxU20ha0="; + cargoHash = "sha256-Re9t25tkwmrvXB9GmPSVG+QDUZmk5rwrrY2ntlB3Tdw="; # COSMIC applications now uses vergen for the About page # Update the COMMIT_DATE to match when the commit was made env = { - VERGEN_GIT_COMMIT_DATE = "2025-02-21"; + VERGEN_GIT_COMMIT_DATE = "2025-04-20"; VERGEN_GIT_SHA = finalAttrs.src.tag; }; @@ -57,24 +59,30 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-term" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { homepage = "https://github.com/pop-os/cosmic-term"; description = "Terminal for the COSMIC Desktop Environment"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - ahoneybun - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; mainProgram = "cosmic-term"; }; diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index ff2a28dad520..b88b9479e476 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -8,15 +8,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-wallpapers"; tag = "epoch-${finalAttrs.version}"; forceFetchGit = true; fetchLFS = true; - hash = "sha256-Exrps3DicL/G/g0kbSsCvoFhiJn1k3v8I09GhW7EwNM="; + hash = "sha256-XtNmV6fxKFlirXQvxxgAYSQveQs8RCTfcFd8SVdEXtE="; }; patches = [ @@ -52,10 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # round_moons_nasa.jpg: https://www.planetary.org/space-images/the-solar-systems-round-moons publicDomain ]; - maintainers = with lib.maintainers; [ - pandapip1 - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 598ad84c8a36..f639ddda00ae 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -9,21 +9,23 @@ libgbm, udev, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-workspaces-epoch"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-workspaces-epoch"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-3jivE0EaSddPxMYn9DDaYUMafPf60XeCwVeQegbt++c="; + hash = "sha256-d7KYZbq8O/t5V/gU+wwstp06vyfnmt6vRKo+54Dct+o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-l5y9bOG/h24EfiAFfVKjtzYCzjxU2TI8wh6HBUwoVcE="; + cargoHash = "sha256-TjgnPuFUIDtxx9kpvN9hKiir3/ZVtCc0z1CE4UHre1Q="; separateDebugInfo = true; @@ -45,13 +47,23 @@ rustPlatform.buildRustPackage (finalAttrs: { "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { @@ -59,10 +71,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Workspaces Epoch for the COSMIC Desktop Environment"; mainProgram = "cosmic-workspaces"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmopolitan/package.nix b/pkgs/by-name/co/cosmopolitan/package.nix index fd8821dd8a1a..be57b9ed5d4d 100644 --- a/pkgs/by-name/co/cosmopolitan/package.nix +++ b/pkgs/by-name/co/cosmopolitan/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://justine.lol/cosmopolitan/"; description = "Your build-once run-anywhere c library"; license = lib.licenses.isc; - maintainers = lib.teams.cosmopolitan.members; + teams = [ lib.teams.cosmopolitan ]; platforms = lib.platforms.x86_64; badPlatforms = lib.platforms.darwin; }; diff --git a/pkgs/by-name/co/costa/package.nix b/pkgs/by-name/co/costa/package.nix index 0c39de81e3be..aa540e23c593 100644 --- a/pkgs/by-name/co/costa/package.nix +++ b/pkgs/by-name/co/costa/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "COSTA"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "eth-cscs"; repo = "COSTA"; rev = "v${version}"; - hash = "sha256-jiAyZXC7wiuEnOLsQFFLxhN3AsGXN09q/gHC2Hrb2gg="; + hash = "sha256-smrDK7iucGWlL1pDv+O4QXefxr1QirC00q5Wva0S+ks="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix index 69535aef9427..f4425425c19f 100644 --- a/pkgs/by-name/co/cotp/package.nix +++ b/pkgs/by-name/co/cotp/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.9.2"; + version = "1.9.5"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-5wVIjh16AYwrzjbPgvjsQhihu/vwdQfzU2kZS6eSTWs="; + hash = "sha256-Jv5BT7P/OXLkkfrEf+8x2IrACMhqr3zpbcKX8I/TzDc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6VdlXQymOFZgMksGRQ7f9ZGrzKblYlQAoBFUhi4wuM0="; + cargoHash = "sha256-9iZyi3TPnqRpt+SRI3t7kwwiGpwUjQ0BrLZQY3X383o="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; diff --git a/pkgs/by-name/co/cotton/package.nix b/pkgs/by-name/co/cotton/package.nix new file mode 100644 index 000000000000..87f20b1acff4 --- /dev/null +++ b/pkgs/by-name/co/cotton/package.nix @@ -0,0 +1,31 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "cotton"; + version = "unstable-2023-09-13"; + + src = fetchFromGitHub { + owner = "danielhuang"; + repo = pname; + rev = "df9d79a4b0bc4b140e87ddd7795924a93775a864"; + sha256 = "sha256-ZMQaVMH8cuOb4PQ19g0pAFAMwP8bR60+eWFhiXk1bYE="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-y162tjxPGZQiYBJxFk4QN9ZqSH8jrqa5Y961Sx2zrRs="; + + meta = with lib; { + description = "Package manager for JavaScript projects"; + mainProgram = "cotton"; + homepage = "https://github.com/danielhuang/cotton"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ + dit7ya + figsoda + ]; + }; +} diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix index d0eca5422fa1..9bd5ea132869 100644 --- a/pkgs/by-name/co/coturn/package.nix +++ b/pkgs/by-name/co/coturn/package.nix @@ -9,6 +9,7 @@ libmicrohttpd, sqlite, nixosTests, + systemdMinimal, }: stdenv.mkDerivation rec { @@ -26,13 +27,17 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = [ - openssl - (libevent.override { inherit openssl; }) - libprom - libmicrohttpd - sqlite.dev - ]; + buildInputs = + [ + openssl + (libevent.override { inherit openssl; }) + libprom + libmicrohttpd + sqlite.dev + ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform systemdMinimal) [ + systemdMinimal + ]; patches = [ ./pure-configure.patch diff --git a/pkgs/by-name/co/coulomb/deps.json b/pkgs/by-name/co/coulomb/deps.json new file mode 100644 index 000000000000..495d52685391 --- /dev/null +++ b/pkgs/by-name/co/coulomb/deps.json @@ -0,0 +1,486 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jitpack.io": { + "com/github/bailuk#java-gtk/0.5.0": { + "jar": "sha256-fCXY4gCLzBU7D+RFsLGz3NN47176XCtak+z65vURKl8=", + "module": "sha256-7mj8zV9UNi61F1iEA809wldidgJQKETrS/FYk4hYbCQ=", + "pom": "sha256-lARyD2FpDWBPqPMJ+0npOLh4VMP0P9/aK0QasHJYimU=" + } + }, + "https://plugins.gradle.org/m2": { + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/github/johnrengelman#shadow/8.1.1": { + "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", + "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=", + "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { + "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" + }, + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, + "com/google/code/gson#gson-parent/2.9.1": { + "pom": "sha256-fKCEXnNoVhjePka9NDTQOko3PVIPq5OmgDGK1sjLKnk=" + }, + "com/google/code/gson#gson/2.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, + "com/google/code/gson#gson/2.9.1": { + "jar": "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=", + "pom": "sha256-5ZZjI9cUJXCzekvpeeIbwtroSBB+TcQW2PRNmqPwKQM=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "io/fabric8#kubernetes-client-bom/5.12.2": { + "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" + }, + "io/netty#netty-bom/4.1.86.Final": { + "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { + "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" + }, + "jakarta/platform#jakartaee-api-parent/9.0.0": { + "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache/ant#ant-launcher/1.10.13": { + "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=", + "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o=" + }, + "org/apache/ant#ant-parent/1.10.13": { + "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk=" + }, + "org/apache/ant#ant/1.10.13": { + "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", + "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "org/apache/logging/log4j#log4j-api/2.20.0": { + "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", + "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" + }, + "org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "org/apache/logging/log4j#log4j-core/2.20.0": { + "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", + "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" + }, + "org/apache/logging/log4j#log4j/2.20.0": { + "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" + }, + "org/codehaus/groovy#groovy-bom/3.0.14": { + "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" + }, + "org/codehaus/plexus#plexus-utils/3.5.1": { + "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", + "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI=" + }, + "org/codehaus/plexus#plexus/10": { + "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { + "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" + }, + "org/gradle/toolchains#foojay-resolver/0.7.0": { + "jar": "sha256-k2crR0Cg/b+7W68INT24rpqbsl9rEKk8B4EmxxfbOsA=", + "module": "sha256-7WdGoJ8yv63bkLApECrmIybiSBKaaLdGYqSkM9VTFLg=", + "pom": "sha256-iCa8+5Iq8MIR5BPTmwgWWRPAgwZkE+BzDNgrLgsKie4=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.7.0": { + "pom": "sha256-yKRD4vrvh28zijkSM8IKka1bg/acHGuiDTmns5EGJAo=" + }, + "org/jdom#jdom2/2.0.6.1": { + "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", + "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.20": { + "jar": "sha256-c6fXFRN1WzF9Kxttp2bW5reiXcmdzv5DEzJTNkIuzhE=", + "pom": "sha256-10GK0lyAbeg2FQvdNQsAvmwtJQmeXXQd3+PzgcUurY0=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.20": { + "jar": "sha256-V+1QIg547DnoqAAUMw8pXlSFtWOMESmvntfVPXhYxcI=", + "pom": "sha256-nHrVho+yGJsb9NbCL2yUmDs6jhopTpWlQSy4Lg9C3bI=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.20": { + "jar": "sha256-o2BL81DIvM4nECFYu7OD+k0YFLxIaq7VnyeOraUf9q0=", + "pom": "sha256-WXBD+4xlJ/QpmcoE7TUpY5Is0W5piKqlLT2zLaHbhZ0=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.20": { + "jar": "sha256-4DzwSwNA8a4VEhBjC10pFcKXmIxuIuTe206nz7dKz2c=", + "pom": "sha256-3M3xugxPzYvUIwNFroP6fb6SglY9ilP9XmHFM1tbcYA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.20": { + "jar": "sha256-cxUswf2CHQcTlHOry/jH0B0A5oaEuWHhkurogNycfaQ=", + "pom": "sha256-qUcReIj0z/tjk9QurqYRtj31ib8pYXgmzLclNxK/OsM=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.20": { + "jar": "sha256-W9URO4WrhSjhkuK7P8GX9bw0SLzb0Fh5Czf9N/TuV68=", + "pom": "sha256-IZgoJm6keO7rQuT1L5bQuQfYykhHz4aq45FprYsupKU=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.20": { + "jar": "sha256-i2O0/7e6aOKHIFaa1HqWzAZclFZO0WHuoVrIZIh7pN4=", + "pom": "sha256-D8eaPIg8fbbsD6lU1cimiugRBlIm+4WRbhy/9pnlwUc=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20": { + "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=", + "module": "sha256-CJ8SCJE61calM09nu8pI/HsK+hCv0L2lFT+8tSzCqWw=", + "pom": "sha256-IQOK734wtxG0qE3grS1TO9MgXhOKrWfP1YnXl+/afII=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.20": { + "jar": "sha256-Ce2wJ7mh899xYnGuyte7QaHdvC+cETFyl5ANTyvc6Iw=", + "pom": "sha256-wZireMJmzzvnodJHBeW7GIbUlF/cpPcX9U77hv9M10o=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.20": { + "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", + "module": "sha256-wy8Uw0SXgCqOjXk7K11nkj4gIlOUePNm4Yp+9kFOut4=", + "pom": "sha256-Vn7N8kaceWkMLgmdz6r8PhF67GTe3BejtJ/Uo/ptDgg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.20": { + "jar": "sha256-UUx/F9xeVO5dFqdhs2S500OVa8rUnf0I4IWWIldzfhk=", + "module": "sha256-HPn20+xtMFqgiQMqyJL/rogcwQUAP0VvLBX9PDAyCm4=", + "pom": "sha256-SEIbKUnHKiDU4OPybYcYxruScIbHbF/AlSCg1jbPumc=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20": { + "module": "sha256-aBPMpB7w+/FciL7MQB44cGuWlEwhtr7HPdiM+QoPIB4=", + "pom": "sha256-eEmYfUbGj7neKvOwReEq1nPm1mOvbqpf2MYRlCt3LF0=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20/gradle85": { + "jar": "sha256-gSn2LLfGJ7XOghh+QqbYfEKVK8e6ZLgFo1R/aFIxlmI=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.20": { + "module": "sha256-GwMjHvp7O20xsJNocpQfh+J6gZwANxiz0JiAt25j180=", + "pom": "sha256-TDLrNQlMFjWd943q7BHOUjvjYEB0FPoK7Miu/GftSkM=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.20": { + "jar": "sha256-QsQvvic/oDBOThf3OSxms56R+Z01+FwGixG91Wuemdw=", + "pom": "sha256-5f4GjE69XIhYw1w56GI6vrnIb4oXJUdC5/VZjkP62jw=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.0.20": { + "jar": "sha256-wWbyBR6R0ZnpYP/HsnZEhcFRDNF2dN17jOPC/NBqhys=", + "pom": "sha256-mISZMftwkWhS6qfCDm2Pr1IsUNd627r9k2T1JrfN7EI=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.20": { + "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", + "pom": "sha256-XhIxEeAQewRmSIOgpAjB/zvbXQR+SQH4L0xC8QV4Bi0=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.0.20": { + "jar": "sha256-ZGTbjUFywhoXp5C20XiQIu1nrbN8UL5ri59YK1UrhSI=", + "pom": "sha256-LrBxVfqEF46ZVjnOe3aRcofK5UKjXSm1a7CZEB0oajw=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/2.0.20": { + "jar": "sha256-h92Djcd3gsuVZ/GnYUmbPkpQ9SjABbJjii4+V0EKljs=", + "pom": "sha256-fbTRw72mdZvifuk35gfoscRpWNwIR3Ey/a7t4BbnOP8=" + }, + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.20": { + "pom": "sha256-JyOoqUP6SkTTcD8VTEW31UcMcZ1OYKvz4ixzt3s4i5M=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-commons/9.4": { + "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=", + "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk=" + }, + "org/ow2/asm#asm-tree/9.4": { + "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", + "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" + }, + "org/ow2/asm#asm/9.4": { + "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", + "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.24": { + "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", + "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" + }, + "org/vafer#jdependency/2.8.0": { + "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", + "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/errorprone#error_prone_annotations/2.18.0": { + "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=", + "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" + }, + "com/google/errorprone#error_prone_parent/2.18.0": { + "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/32.1.2-jre": { + "pom": "sha256-iOnLAHM1q1/bMUpuPJh3NOwjCMmgY/90fHRpGJ0Kkr8=" + }, + "com/google/guava#guava/32.1.2-jre": { + "jar": "sha256-vGXep8/Z5NrPhBnYrw50FlWFfSeIW7NdlD1xh/w6j84=", + "module": "sha256-5Azwhc7QWrGPnJTnx7wZfhzbaVvJOa/DRKskwUFNbH4=", + "pom": "sha256-PyCFltceCDmyU6SQr0mjbvf9tFG+kKQqsd+els/TFmA=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/checkerframework#checker-qual/3.33.0": { + "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", + "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", + "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" + }, + "org/ejml#ejml-all/0.43": { + "jar": "sha256-GBDaHXRTexoIeerYHHHOSEzBQtS4mBV3pHdTeeiSRXg=", + "module": "sha256-L6r5GgeR5U0jw5CXL7StUdLFxf+56s9RWMjeW/99Fh0=", + "pom": "sha256-+XUcA/lcos9UotaxcRsnIRzRJH2aVVonBGCwQY5e7Q4=" + }, + "org/ejml#ejml-cdense/0.43": { + "jar": "sha256-p/w9/byGtxRqOJB0OtalJrtqvzSSisXjK8RwzbYsE1k=", + "module": "sha256-xtKuzLBpMx9PhMnUTOhX41MA6OU7MClSnmPcZcNx7lU=", + "pom": "sha256-aUxBPx4SPy6EBQJ9BFapzLVpIfeRUIQ0GHOZxkSAc4Q=" + }, + "org/ejml#ejml-core/0.43": { + "jar": "sha256-gk82hbw41d6uHMHu7CM+HDSwxb6c4cTnKd607pAZTdg=", + "module": "sha256-vB0hwXsc0fHk3liP1x8j5GLeFb9amF3+gJjTtgkd1mE=", + "pom": "sha256-i9r882Z7d9gILFuLJapI0N4vRTiXx8tYJXhGVcDMA9E=" + }, + "org/ejml#ejml-ddense/0.43": { + "jar": "sha256-Ca8oTFIJ4IRxe0z/nphVqMgpiybCl7cPt+BGLQEtiKg=", + "module": "sha256-+L5P/I+yqBHlZ3PfNHN54ayy0fYiI9t2vkoZGnFlnBM=", + "pom": "sha256-k+Z/WVJU1qok5L6QWr9IAkLgMyNT7VLxLv9/jw3gPNk=" + }, + "org/ejml#ejml-dsparse/0.43": { + "jar": "sha256-YOK/6s0bydXtWJdYrLkw5M89aVS+Peen4m7SGfI/qpE=", + "module": "sha256-OsTQjsRuw2tZ8Z2VfhZAMHhfqHsDnmwv0rHEx2CHGvs=", + "pom": "sha256-JSXdCWEaCIyfxWiF/D2SY6g09hqHSv8k3Iv+pZ9CM7A=" + }, + "org/ejml#ejml-fdense/0.43": { + "jar": "sha256-aYfzCUarOrYBhVEjityoqiLzU2L4G96rQjzxeO0y0Jk=", + "module": "sha256-17G6273LePZWgSnUvNNC24Lpt8vVz3P7IfAZH6BFL2Q=", + "pom": "sha256-/F3shPgpX84LhBM8+nH5wpqI0QYATYNwwbn8b3dFT7U=" + }, + "org/ejml#ejml-fsparse/0.43": { + "jar": "sha256-WkZs60HHQxRvAOJRw1MdF5YOWcUTlgSeuhsCtkNu/dk=", + "module": "sha256-A+2C1L2rpq23TqKBw8KT9OPTCzkmXZiqdH4oSZyDcPE=", + "pom": "sha256-Hp1uhLrUX26LLWlIe/vdsz1+Krc/MJex8/0TNpX8juo=" + }, + "org/ejml#ejml-simple/0.43": { + "jar": "sha256-PS0FZYn+8he1J2U+g+w2luZnilf43xc1wq2sBSSZxnM=", + "module": "sha256-EhdXX+Zg0uocDt2CVGiDKcUP0u0Q4+1NcRFphpdrR2k=", + "pom": "sha256-RHst4Wksfb/vM9colSeK6GQae5HlWDZjwVOqEOtLBNc=" + }, + "org/ejml#ejml-zdense/0.43": { + "jar": "sha256-aGU63SwAt+cT2nXFZ2HbTzm+GXQsjxLbNuJ2IKy0f1M=", + "module": "sha256-N0BJcmoNrj/LPbwuAaxra+6I7myj4Z8naR9xXWVHK8o=", + "pom": "sha256-Ejz7uqu3F0Lzd/9mXGEk2SPvNrSgfXLNZqUKhwvoBaU=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-build-common/2.0.20": { + "jar": "sha256-NvDXXOmviQZNnbT9IeIsVQdyAP5OOufZnjREmCZ6oNs=", + "pom": "sha256-EOhYxaCAxN21Wx0GvujV6Ea4YQX1aw5A8ojj+mGWEXI=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.20": { + "jar": "sha256-V+1QIg547DnoqAAUMw8pXlSFtWOMESmvntfVPXhYxcI=", + "pom": "sha256-nHrVho+yGJsb9NbCL2yUmDs6jhopTpWlQSy4Lg9C3bI=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.20": { + "jar": "sha256-nOb4Gmmcw32zY6KDcVC8YqJJA9r2EhA00Sl5qpUBRGs=", + "pom": "sha256-DyiqOx3o2AWm+HlX08PWbDOeDEMmaZlc9Zf58r6J4II=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.20": { + "jar": "sha256-o2BL81DIvM4nECFYu7OD+k0YFLxIaq7VnyeOraUf9q0=", + "pom": "sha256-WXBD+4xlJ/QpmcoE7TUpY5Is0W5piKqlLT2zLaHbhZ0=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.20": { + "jar": "sha256-4DzwSwNA8a4VEhBjC10pFcKXmIxuIuTe206nz7dKz2c=", + "pom": "sha256-3M3xugxPzYvUIwNFroP6fb6SglY9ilP9XmHFM1tbcYA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.20": { + "jar": "sha256-cxUswf2CHQcTlHOry/jH0B0A5oaEuWHhkurogNycfaQ=", + "pom": "sha256-qUcReIj0z/tjk9QurqYRtj31ib8pYXgmzLclNxK/OsM=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.20": { + "jar": "sha256-W9URO4WrhSjhkuK7P8GX9bw0SLzb0Fh5Czf9N/TuV68=", + "pom": "sha256-IZgoJm6keO7rQuT1L5bQuQfYykhHz4aq45FprYsupKU=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.0.20": { + "jar": "sha256-ZzHCVkuXOXGDWCVJAUC3rZ63Jtk4/gzvTr7y7Fkt6wM=", + "pom": "sha256-rVSg2nLxASl08e7sdp2EopMnzzfMrVUxt4cT/GD0tnY=" + }, + "org/jetbrains/kotlin#kotlin-native-prebuilt/2.0.20": { + "pom": "sha256-xYoRfPul4AVC+QrYLytqsh4Z46Ifzvy0mLq5k69FDwY=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.20": { + "jar": "sha256-/pcAKmeY9yB1ZGSJGdbuzPszi5XcBLSIhthWZVvGSk4=", + "pom": "sha256-o6N2KcmFzt17+d12rGdJaz+ApZIoVB6WiAKg7obEuRQ=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.20": { + "jar": "sha256-XTdTOT5/7PHSG67l2314gyZ4K9v4qOxqKyzM97Ve5sY=", + "pom": "sha256-BesUmiCZ8ILJf1xFQ1HQuMphLFUwo6wyHSyMB12wEVU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.20": { + "jar": "sha256-Ie8wOrS54Pnzl8FIliU6rkkCV7+w3VAInBwcBPAYcXE=", + "pom": "sha256-zr8swRmuHPJqP2tECxidwrruhS0nASU06qNqrNue4VI=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.20": { + "jar": "sha256-WgaucwO1TL0XdYnWEFumv9WbGxgur7W2aHJf9ypf0y0=", + "pom": "sha256-z6al9YOJy3K0SRLTABoB9eqL+vx5mbr6BRGz7t/LYdI=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.20": { + "jar": "sha256-sLtQD2MztLFsjraeo5TvaE8zRT+NNDEDSokHqfGNtvE=", + "pom": "sha256-m8uNHCOvcm21KpNrpbkXeyRoKSBYxT8Ckd5MwNpOzh4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { + "jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=", + "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", + "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.20/all": { + "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg=" + }, + "org/jetbrains/kotlin/kotlin-native-prebuilt/2.0.20/kotlin-native-prebuilt-2.0.20-linux-x86_64": { + "tar.gz": "sha256-soKRi19RWLL41bU94ICTpyIG/CO5E4Lh3dJjDHIChCc=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.0": { + "jar": "sha256-EICI/X6kao5loM5/XXWuP/eGVgZ3CgeHFfWm5XCeF9g=", + "module": "sha256-rlZhzTgeEJo8NXWzqy3tdHnnvdfOxKqfJtQ3iXNAl5s=", + "pom": "sha256-Tx3RjtVlgTdJThuDUFN5V994ExxnNYrDw/IM3vKF9xw=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.0": { + "jar": "sha256-V+pI5veVIAeRBlu8hrcLhM0FNnxcnyrI+SaOJxVMiKg=", + "module": "sha256-ahCFcpBdHtGcAtzQePNMHt6zFVX1RCF24BQYJwCFYmo=", + "pom": "sha256-tgBsZQiRofdWh1Z2xtj+m0FqwckRfntBg0KdnxU0crU=" + }, + "org/junit/jupiter#junit-jupiter-params/5.10.0": { + "jar": "sha256-8lmnMizON1QwwiNqLcsk1KSdIgRbcjrYWviOEXBDkcI=", + "module": "sha256-GW9/Tv35x3OnEEwzn2AlNCuHQvz6sC+IArqAJ+0o+S4=", + "pom": "sha256-hJpvXnjyuDFLW10KDMymYhblwH4pWFRxJX3/CvrLELE=" + }, + "org/junit/jupiter#junit-jupiter/5.10.0": { + "jar": "sha256-jkveI+4o/EQ5dWVKeyjEEKO3jWvpa3jJmrc2lew0T3w=", + "module": "sha256-BXDggypUZagvBKK492Hyux4w+v4oLSowmHAV/LBQdgM=", + "pom": "sha256-9LAPh2BzWmAc6U0sxq0r9WpK30885g7iD1LHDa5bMxM=" + }, + "org/junit/platform#junit-platform-commons/1.10.0": { + "jar": "sha256-YIPbCMoR/KHhYJnQ3P7eAZPYCzdisnY0nYDT2lNnkbI=", + "module": "sha256-jLYNPfgdYG6hvj4/yuVpdlOxswPi96mCKn7RJkdF/Cc=", + "pom": "sha256-vkEftVMxuqETp0wRkA8HVVhasg76cMJtlQ9a4hRJALA=" + }, + "org/junit/platform#junit-platform-engine/1.10.0": { + "jar": "sha256-zTOO/QLuc5Zup1TgwMceGhH0r125wgA+S2E34RkVWr4=", + "module": "sha256-duCMg/k91SuD6IW5AJIMHcheNoaID2ZTrysiMX9N3jc=", + "pom": "sha256-+RGG4YGx4VrofVJ5uaKzDGLO1ROQE6NJoQu03hL6+YI=" + }, + "org/junit/platform#junit-platform-launcher/1.10.0": { + "jar": "sha256-jGC2YawXBwGmNd/GdWXvu4yFtcXN1aSpV246AVxxEaQ=", + "module": "sha256-9dy3QIxCQmA/mb1c3GNcQGbRioKNuF7TcAqo3T6vGmk=", + "pom": "sha256-Z3Xvl0dO7JwTo1If5iAPmqG4cegyc9q1VfgEgGW7wRI=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/by-name/co/coulomb/package.nix b/pkgs/by-name/co/coulomb/package.nix new file mode 100644 index 000000000000..62ebb35f1ce8 --- /dev/null +++ b/pkgs/by-name/co/coulomb/package.nix @@ -0,0 +1,97 @@ +{ + stdenv, + lib, + gradle, + jdk21_headless, + fetchFromGitHub, + stripJavaArchivesHook, + wrapGAppsHook4, + nix-update-script, + makeWrapper, + pkg-config, + gtk4, + libadwaita, + glib, + pango, + gdk-pixbuf, + atk, + cairo, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "coulomb"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "hamza-algohary"; + repo = "Coulomb"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SbtFUUla0uoeDik+7CtibV/lvgUg8N81WWRp2+8wygM="; + }; + + postPatch = '' + substituteInPlace app/build.gradle.kts \ + --replace-fail "languageVersion.set(JavaLanguageVersion.of(19))" "languageVersion.set(JavaLanguageVersion.of(21))" + ''; + + nativeBuildInputs = [ + gradle + jdk21_headless + makeWrapper + pkg-config + stripJavaArchivesHook + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4 + libadwaita + glib + pango + gdk-pixbuf + atk + cairo + ]; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + gradleFlags = [ "-Dfile.encoding=utf-8" ]; + + dontWrapGApps = true; + + doCheck = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/coulomb,lib-jna} + cp app/build/libs/app-all.jar $out/share/coulomb/ + + mkdir -p $out/share/{applications,icons/{dark,light,hicolor/scalable/apps}} + cp app/build/resources/main/*.desktop $out/share/applications + cp -r app/build/resources/main/icons/vector/* $out/share/icons/ + cp app/build/resources/main/icons/vector/light/coulomb.svg $out/share/icons/hicolor/scalable/apps/io.github.hamza_algohary.Coulomb.svg + + makeWrapper ${jdk21_headless}/bin/java $out/bin/coulomb \ + --add-flags "-Djava.library.path=${lib.makeLibraryPath finalAttrs.buildInputs}" \ + --add-flags "-jar $out/share/coulomb/app-all.jar" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \ + ''${gappsWrapperArgs[@]} + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple and beautiful circuit simulator app"; + homepage = "https://github.com/hamza-algohary/Coulomb"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ thtrf ]; + platforms = lib.platforms.linux; + mainProgram = "coulomb"; + }; +}) diff --git a/pkgs/by-name/co/courier-unicode/package.nix b/pkgs/by-name/co/courier-unicode/package.nix index c9a8354d70c5..d8ae055f7b32 100644 --- a/pkgs/by-name/co/courier-unicode/package.nix +++ b/pkgs/by-name/co/courier-unicode/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "courier-unicode"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "mirror://sourceforge/courier/courier-unicode/${version}/courier-unicode-${version}.tar.bz2"; - sha256 = "sha256-uD7mRqR8Kp1pL7bvuThWRmjDLsF51PrAwH6s6KG4/JE="; + sha256 = "sha256-tkXS8AqrvGgjIO3mlspQIBJm9xChvOxKxQQmlcmef2k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix index ca9dfb496065..e9fd022b8b74 100644 --- a/pkgs/by-name/co/cowsql/package.nix +++ b/pkgs/by-name/co/cowsql/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Embeddable, replicated and fault tolerant SQL engine"; homepage = "https://github.com/cowsql/cowsql"; license = licenses.lgpl3Only; - maintainers = teams.lxc.members; + teams = [ teams.lxc ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix index d62f7930f3b5..c459e6555e63 100644 --- a/pkgs/by-name/co/cozette/package.nix +++ b/pkgs/by-name/co/cozette/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.27.0"; + version = "1.29.0"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${ builtins.replaceStrings [ "." ] [ "-" ] version }.zip"; - hash = "sha256-L/C1fohaLSVbrxAr4v3R83x1/Yt8fI3Lo+c84cZvEHY="; + hash = "sha256-DHUnCzp6c3d57cfkO2kH+czXRiqRWn6DBTo9NVTghQ0="; }; installPhase = '' diff --git a/pkgs/by-name/cp/cplay-ng/package.nix b/pkgs/by-name/cp/cplay-ng/package.nix index 82b331616607..5a1b7919c349 100644 --- a/pkgs/by-name/cp/cplay-ng/package.nix +++ b/pkgs/by-name/cp/cplay-ng/package.nix @@ -1,32 +1,27 @@ { lib, - python3, + python3Packages, fetchFromGitHub, makeWrapper, mpv, pulseaudio, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cplay-ng"; - version = "5.3.1"; + version = "5.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "xi"; repo = "cplay-ng"; - rev = version; - hash = "sha256-6mphhoLDkGZ2r+elzLlPl3B8fNz3loqrQB8x8276AHI="; + tag = version; + hash = "sha256-ob5wX+Q5XKB/fTYG5phLU61imonpk2A/fk5cg/dfr1Y="; }; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; - build-system = [ - python3.pkgs.setuptools - ]; - - pyproject = true; + build-system = [ python3Packages.setuptools ]; postInstall = '' wrapProgram $out/bin/cplay-ng \ @@ -38,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { } ''; - meta = with lib; { + meta = { homepage = "https://github.com/xi/cplay-ng"; description = "Simple curses audio player"; mainProgram = "cplay-ng"; @@ -55,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { maintained. This is a rewrite that aims to stay true to the original design while evolving with a shifting environment. ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fgaz ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ fgaz ]; }; } diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index a2c7781a3932..8fac7bd37c96 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.40.8"; + version = "0.42.0"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-7jW8kdymeSSZDuUQkNG6ZP7aeKJKXSLHLQ1kw3o8ijs="; + hash = "sha256-IA13qA/b+owlrqbVAkhd4rS98/XB5RNONiJaPwjDm+A="; }; postPatch = '' diff --git a/pkgs/by-name/cp/cpp-netlib/0001-Compatibility-with-boost-1.83.patch b/pkgs/by-name/cp/cpp-netlib/0001-Compatibility-with-boost-1.83.patch new file mode 100644 index 000000000000..2c860aaba4f7 --- /dev/null +++ b/pkgs/by-name/cp/cpp-netlib/0001-Compatibility-with-boost-1.83.patch @@ -0,0 +1,33 @@ +From 8be99f5972826c25378bccb9fbd7291623c7b2a7 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Fri, 9 May 2025 13:39:17 +0800 +Subject: [PATCH] Compatibility with boost 1.83 + +--- + boost/network/protocol/http/server/impl/parsers.ipp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/boost/network/protocol/http/server/impl/parsers.ipp b/boost/network/protocol/http/server/impl/parsers.ipp +index c31e60e..3272c2f 100755 +--- a/boost/network/protocol/http/server/impl/parsers.ipp ++++ b/boost/network/protocol/http/server/impl/parsers.ipp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #ifdef BOOST_NETWORK_NO_LIB + #ifndef BOOST_NETWORK_INLINE +@@ -32,7 +33,7 @@ typedef std::basic_string u32_string; + template <> // + struct assign_to_container_from_value { + static void call(u32_string const& val, std::string& attr) { +- u32_to_u8_iterator begin = val.begin(), ++ boost::u32_to_u8_iterator begin = val.begin(), + end = val.end(); + for (; begin != end; ++begin) attr += *begin; + } +-- +2.48.1 + diff --git a/pkgs/by-name/cp/cpp-netlib/package.nix b/pkgs/by-name/cp/cpp-netlib/package.nix index 307c466ea6ef..466884fbbd33 100644 --- a/pkgs/by-name/cp/cpp-netlib/package.nix +++ b/pkgs/by-name/cp/cpp-netlib/package.nix @@ -3,11 +3,15 @@ stdenv, fetchFromGitHub, cmake, - boost, + boost186, openssl, + llvmPackages_18, }: - -stdenv.mkDerivation rec { +let + # std::char_traits has been removed + stdenvForCppNetlib = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; +in +stdenvForCppNetlib.mkDerivation rec { pname = "cpp-netlib"; version = "0.13.0-final"; @@ -19,9 +23,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # 'u32_to_u8_iterator' was not declared + ./0001-Compatibility-with-boost-1.83.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - boost + # io_service.hpp has been removed in boost 1.87+ + boost186 openssl ]; diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix index add68cdfa169..a542b899ec27 100644 --- a/pkgs/by-name/cp/cpp-utilities/package.nix +++ b/pkgs/by-name/cp/cpp-utilities/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.28.0"; + version = "5.28.1"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-EdqM7RsvJzMQWtwqnohbC5JJRVZJYgpTLJW1rPmTB4s="; + sha256 = "sha256-+VbVVRtOKNjJNQYU/QOU5hfARxHicsQQgm2TH5y8qx8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cp/cppad/package.nix b/pkgs/by-name/cp/cppad/package.nix index 5d6a9830c9b3..ed8b57071380 100644 --- a/pkgs/by-name/cp/cppad/package.nix +++ b/pkgs/by-name/cp/cppad/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "coin-or"; repo = "CppAD"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-rAKD/PAjepDchvrJp7iLYw5doNq8Af1oVh61gfMcNYI="; }; diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index 9673186587a0..9bcdedb354f8 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; installCheckPhase = '' runHook preInstallCheck diff --git a/pkgs/by-name/cp/cppfront/package.nix b/pkgs/by-name/cp/cppfront/package.nix new file mode 100644 index 000000000000..415e1eda16f5 --- /dev/null +++ b/pkgs/by-name/cp/cppfront/package.nix @@ -0,0 +1,105 @@ +{ + stdenv, + lib, + fetchFromGitHub, + installShellFiles, + nix-update-script, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cppfront"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "hsutter"; + repo = "cppfront"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QYjon2EpNexYa2fl09AePkpq0LkRVBOQM++eldcVMvI="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + # Remove with next release + postPatch = '' + substituteInPlace source/version.info \ + --replace-fail "0.8.0" "0.8.1" + ''; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + $CXX source/cppfront.cpp -std=c++20 -o cppfront + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + installBin cppfront + cp -r include $out/include + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "-version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + + tests.hello-world = stdenv.mkDerivation (finalAttrs': { + pname = "${finalAttrs.pname}-hello-world-test"; + inherit (finalAttrs) version src; + + sourceRoot = "${finalAttrs'.src.name}/regression-tests"; + + nativeBuildInputs = [ + finalAttrs.finalPackage + installShellFiles + ]; + + postBuild = '' + cppfront pure2-hello.cpp2 + $CXX -std=c++20 -o pure2-hello{,.cpp} + ''; + + postInstall = '' + installBin pure2-hello + ''; + + doInstallCheck = true; + postInstallCheck = '' + $out/bin/pure2-hello | grep '^Hello \[world\]$' > /dev/null + ''; + + meta = { + inherit (finalAttrs.meta) maintainers platforms; + mainProgram = "pure2-hello"; + }; + }); + }; + + meta = { + description = "Experimental compiler from a potential C++ 'syntax 2' (Cpp2) to today's 'syntax 1' (Cpp1)"; + homepage = "https://hsutter.github.io/cppfront/"; + changelog = "https://github.com/hsutter/cppfront/releases/tag/${finalAttrs.src.tag}"; + mainProgram = "cppfront"; + license = with lib.licenses; [ + asl20 + llvm-exception + ]; + maintainers = with lib.maintainers; [ + marcin-serwin + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix index de9cff77feab..20fc80c99e5f 100644 --- a/pkgs/by-name/cp/cpplint/package.nix +++ b/pkgs/by-name/cp/cpplint/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "cpplint"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "cpplint"; repo = "cpplint"; tag = version; - hash = "sha256-IM1XznnpdL1Piei9kKR1nCwfs7TVgLcTgMI4r+cQXLg="; + hash = "sha256-4crTuqynQt8Nyjqea6DpREtLy7ydRF0hNVnc7tUnO1k="; }; # We use pytest-cov-stub instead diff --git a/pkgs/by-name/cp/cpptrace/package.nix b/pkgs/by-name/cp/cpptrace/package.nix index 86980c933c0d..0a9b0cc43d51 100644 --- a/pkgs/by-name/cp/cpptrace/package.nix +++ b/pkgs/by-name/cp/cpptrace/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpptrace"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "jeremy-rifkin"; repo = "cpptrace"; tag = "v${finalAttrs.version}"; - hash = "sha256-3BnAWRpKJR5lsokpmbOLUIQGuiH46AM1NQwOtBl28AA="; + hash = "sha256-oFwRFFDLl4/3szVj/ge8cSrpuuHEzf4VsCPGTE0dxRc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cp/cpr/package.nix b/pkgs/by-name/cp/cpr/package.nix new file mode 100644 index 000000000000..7e9cc4aa2b4b --- /dev/null +++ b/pkgs/by-name/cp/cpr/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + openssl, + curl, + zlib, + gtest, + cppcheck, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cpr"; + version = "1.11.2"; + + src = fetchFromGitHub { + owner = "libcpr"; + repo = "cpr"; + tag = finalAttrs.version; + hash = "sha256-nKX9AYVC4e3B+vOzXWZu8S4I5BNpKnqkFJ2e8bVAUE4="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + gtest + cppcheck + ]; + + buildInputs = [ + openssl + zlib + curl + ]; + + cmakeFlags = [ + # NOTE: Does not build with CPPCHECK + # (lib.cmakeBool "CPR_ENABLE_CPPCHECK" true) + (lib.cmakeBool "CPR_BUILD_TEST" true) + (lib.cmakeBool "CURL_ZLIB" false) + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "CPR_USE_SYSTEM_CURL" true) + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") + ]; + + # Install headers + postInstall = '' + mkdir -p $out/include + cp -r $src/include/* $out/include/ + ''; + + meta = { + description = "C++ Requests: Curl for People, a spiritual port of Python Requests"; + homepage = "https://github.com/libcpr/cpr"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ phodina ]; + }; +}) diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index ed22b074fb45..a787aea6bccd 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpu-x"; - version = "5.1.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; tag = "v${finalAttrs.version}"; - hash = "sha256-gD5sEeALbGwMBP2UDc28TnVBlbCRMIeqWkrq0oi97Nw="; + hash = "sha256-UOOqPkOXsyZthreg0Fv/KMJcm0Syd7/Uni9G3H6UJ2E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cp/cpu_features/package.nix b/pkgs/by-name/cp/cpu_features/package.nix index 2e0c26314192..0e143c255153 100644 --- a/pkgs/by-name/cp/cpu_features/package.nix +++ b/pkgs/by-name/cp/cpu_features/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "cpu_features"; - version = "0.9.0"; + version = "0.10.1"; outputs = [ "out" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "cpu_features"; rev = "v${version}"; - hash = "sha256-uXN5crzgobNGlLpbpuOxR+9QVtZKrWhxC/UjQEakJwk="; + hash = "sha256-IBJc1sHHh4G3oTzQm1RAHHahsEECC+BDl14DHJ8M1Ys="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cp/cpuid/package.nix b/pkgs/by-name/cp/cpuid/package.nix index e656212991f9..31a0db378678 100644 --- a/pkgs/by-name/cp/cpuid/package.nix +++ b/pkgs/by-name/cp/cpuid/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20241023"; + version = "20250513"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-/HdDWo1dKzVRcTMB6M24PmKjz+3IQTKw7JsbteUkT9w="; + sha256 = "sha256-b0dKIrWEhIjkVLAaMduA65WNVWdLUzlTP8DmrreTYms="; }; # For pod2man during the build process. diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index f55460cb8a7a..76022e1a95c1 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2025-02-19"; + version = "0-unstable-2025-03-27"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea"; - hash = "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U="; + rev = "39ea79a3c132f4e678695c579ea9353d2bd29968"; + hash = "sha256-uochXC0AtOw8N/ycyVJdiRw4pibCW2ENrFMT3jtxDSg="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/cr/crabfit-api/package.nix b/pkgs/by-name/cr/crabfit-api/package.nix index 7012a40ea5b2..abffd72bd555 100644 --- a/pkgs/by-name/cr/crabfit-api/package.nix +++ b/pkgs/by-name/cr/crabfit-api/package.nix @@ -8,8 +8,6 @@ protobuf, openssl, sqlite, - stdenv, - darwin, adaptor ? "sql", }: @@ -53,16 +51,10 @@ rustPlatform.buildRustPackage rec { protobuf ]; - buildInputs = - [ - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + sqlite + ]; buildFeatures = [ "${adaptor}-adaptor" ]; diff --git a/pkgs/by-name/cr/crackxls/package.nix b/pkgs/by-name/cr/crackxls/package.nix index b14153eb44bc..7e7d4d9cf798 100644 --- a/pkgs/by-name/cr/crackxls/package.nix +++ b/pkgs/by-name/cr/crackxls/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, pkg-config, autoconf, automake, @@ -12,51 +11,38 @@ }: stdenv.mkDerivation rec { - pname = "crackxls"; - version = "0.4"; + version = "1.0"; src = fetchFromGitHub { owner = "GavinSmith0123"; repo = "crackxls2003"; - rev = "v${version}"; - sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; + tag = "v${version}"; + sha256 = "sha256-CJFC4iKHHpSRQBdotmum7NjpPNUjbB6cSCs5HMXnjO8="; }; - patches = [ - # Pull patch pending upstream inclusion for -fno-common support: - # https://github.com/GavinSmith0123/crackxls2003/pull/3 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/GavinSmith0123/crackxls2003/commit/613d6c1844f76c7b67671aaa265375fed56c2a56.patch"; - sha256 = "1pk67x67d9wji576mc57z5bzqlf9ygvn9m1z47w12mad7qmj9h1n"; - }) - ]; - nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ openssl libgsf gmp ]; - # Avoid "-O5 -march=native" - makeFlags = [ "OPTIM_FLAGS=" ]; - installPhase = '' mkdir -p $out/bin cp crackxls2003 $out/bin/ ''; - meta = with lib; { + meta = { homepage = "https://github.com/GavinSmith0123/crackxls2003/"; description = "Used to break the encryption on old Microsoft Excel and Microsoft Word files"; mainProgram = "crackxls2003"; - platforms = platforms.linux; - license = licenses.gpl3; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/by-name/cr/crawley/package.nix b/pkgs/by-name/cr/crawley/package.nix index fa0e0b0fc9fa..26030672969e 100644 --- a/pkgs/by-name/cr/crawley/package.nix +++ b/pkgs/by-name/cr/crawley/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "crawley"; - version = "1.7.10"; + version = "1.7.11"; src = fetchFromGitHub { owner = "s0rg"; repo = "crawley"; rev = "v${version}"; - hash = "sha256-vc3HHkX0BFVSJi1Ll9T8IgYh5P6rzi4FowE7Jdy/tO8="; + hash = "sha256-P+BsfVYqUDZ+wqIwziWLI3V0nUnypenHFfmw6EkPigo="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-jj8FNZs/bkFQxveOkqmGVO3MNPPv5O9ebodoi7hhzIs="; + vendorHash = "sha256-lcCcfn83WGBegQzUKEF8kpu7DdcLyVbS+PGX0mYrr40="; ldflags = [ "-w" diff --git a/pkgs/by-name/cr/crc/package.nix b/pkgs/by-name/cr/crc/package.nix index f94350a168f6..1e127e3d9d6e 100644 --- a/pkgs/by-name/cr/crc/package.nix +++ b/pkgs/by-name/cr/crc/package.nix @@ -2,28 +2,26 @@ lib, buildGoModule, fetchFromGitHub, - testers, - crc, coreutils, + writableTmpDirAsHomeHook, }: let - openShiftVersion = "4.15.12"; + openShiftVersion = "4.18.2"; okdVersion = "4.15.0-0.okd-2024-02-23-163410"; - microshiftVersion = "4.15.12"; - podmanVersion = "4.4.4"; + microshiftVersion = "4.18.2"; writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; - gitCommit = "27c493c19b7f396931c3b94cc3367f572e6af04a"; - gitHash = "sha256-uxp3DVYbbjKf1Cjj7GCf9QBxFq3K136k51eymD0U018="; + gitCommit = "e843be9c9889abd33ce2f9aee161fac1d44e3fa8"; + gitHash = "sha256-irlVpRBZzE6lfjK8nlNmWlryGj25u/5LcX7pG3WD/Fs="; in -buildGoModule rec { - version = "2.36.0"; +buildGoModule (finalAttrs: { pname = "crc"; + version = "2.49.0"; src = fetchFromGitHub { owner = "crc-org"; repo = "crc"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = gitHash; }; @@ -31,48 +29,46 @@ buildGoModule rec { postPatch = '' substituteInPlace pkg/crc/oc/oc_linux_test.go \ - --replace "/bin/echo" "${coreutils}/bin/echo" + --replace-fail "/bin/echo" "${coreutils}/bin/echo" ''; - subPackages = [ - "cmd/crc" - ]; + subPackages = [ "cmd/crc" ]; tags = [ "containers_image_openpgp" ]; ldflags = [ - "-X github.com/crc-org/crc/v2/pkg/crc/version.crcVersion=${version}" + "-X github.com/crc-org/crc/v2/pkg/crc/version.crcVersion=${finalAttrs.version}" "-X github.com/crc-org/crc/v2/pkg/crc/version.ocpVersion=${openShiftVersion}" "-X github.com/crc-org/crc/v2/pkg/crc/version.okdVersion=${okdVersion}" - "-X github.com/crc-org/crc/v2/pkg/crc/version.podmanVersion=${podmanVersion}" "-X github.com/crc-org/crc/v2/pkg/crc/version.microshiftVersion=${microshiftVersion}" "-X github.com/crc-org/crc/v2/pkg/crc/version.commitSha=${builtins.substring 0 8 gitCommit}" "-X github.com/crc-org/crc/v2/pkg/crc/segment.WriteKey=${writeKey}" ]; - preCheck = '' - export HOME=$(mktemp -d) + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + HOME=$(mktemp -d) $out/bin/crc version | grep ${finalAttrs.version} > /dev/null + + runHook postInstallCheck ''; - passthru.tests.version = testers.testVersion { - package = crc; - command = '' - export HOME=$(mktemp -d) - crc version - ''; - }; passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Manage a local OpenShift 4.x cluster, Microshift or a Podman VM optimized for testing and development purposes"; homepage = "https://crc.dev/crc/getting_started/getting_started/introducing/"; - changelog = "https://github.com/crc-org/crc/releases/tag/v${version}"; - license = licenses.asl20; + changelog = "https://github.com/crc-org/crc/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; mainProgram = "crc"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ matthewpi shikanime tricktron ]; }; -} +}) diff --git a/pkgs/by-name/cr/crc/update.sh b/pkgs/by-name/cr/crc/update.sh index 4e46cbc428cc..d022177a9354 100755 --- a/pkgs/by-name/cr/crc/update.sh +++ b/pkgs/by-name/cr/crc/update.sh @@ -26,7 +26,7 @@ CRC_COMMIT=$(curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") CRC_GIT_PREFETCH=$(nix-prefetch-url --unpack https://github.com/crc-org/crc/archive/${CRC_COMMIT}.tar.gz) -CRC_GIT_HASH=$(nix hash to-sri --type sha256 ${CRC_GIT_PREFETCH}) +CRC_GIT_HASH=$(nix hash convert --to sri --hash-algo sha256 ${CRC_GIT_PREFETCH}) FILE_MAKEFILE=${WORKDIR}/Makefile curl --silent https://raw.githubusercontent.com/crc-org/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE @@ -37,9 +37,6 @@ OPENSHIFT_VERSION=$(grep 'OPENSHIFT_VERSION' ${FILE_MAKEFILE} | OKD_VERSION=$(grep 'OKD_VERSION' ${FILE_MAKEFILE} | head -n1 | awk '{print $3}') -PODMAN_VERSION=$(grep 'PODMAN_VERSION' ${FILE_MAKEFILE} | - head -n1 | awk '{print $3}') - MICROSHIFT_VERSION=$(grep 'MICROSHIFT_VERSION' ${FILE_MAKEFILE} | head -n1 | awk '{print $3}') @@ -61,9 +58,6 @@ sed -i "s|openShiftVersion = \".*\"|openShiftVersion = \"${OPENSHIFT_VERSION:-}\ sed -i "s|okdVersion = \".*\"|okdVersion = \"${OKD_VERSION:-}\"|" \ ${NIXPKGS_CRC_FOLDER}/package.nix -sed -i "s|podmanVersion = \".*\"|podmanVersion = \"${PODMAN_VERSION:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/package.nix - sed -i "s|microshiftVersion = \".*\"|microshiftVersion = \"${MICROSHIFT_VERSION:-}\"|" \ ${NIXPKGS_CRC_FOLDER}/package.nix diff --git a/pkgs/by-name/cr/create-react-app/package.nix b/pkgs/by-name/cr/create-react-app/package.nix deleted file mode 100644 index 2a2d2172d9f4..000000000000 --- a/pkgs/by-name/cr/create-react-app/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildNpmPackage, - fetchFromGitHub, -}: - -buildNpmPackage rec { - pname = "create-react-app"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "facebook"; - repo = "create-react-app"; - rev = "v${version}"; - hash = "sha256-nUvJRxBZ98ogSkbw8ciFYtZRQNFD6pLThoEjeDMcGm0="; - }; - - npmDepsHash = "sha256-diGu53lJi+Fs7pTAQGCXoDtP7YyKZLIN/2Wo+e1Mzc4="; - - env.PUPPETEER_SKIP_DOWNLOAD = true; - - npmWorkspace = "packages/create-react-app"; - - dontNpmBuild = true; - - meta = { - changelog = "https://github.com/facebook/create-react-app/blob/${src.rev}/CHANGELOG.md"; - description = "Create React apps with no build configuration"; - homepage = "https://github.com/facebook/create-react-app"; - license = lib.licenses.mit; - mainProgram = "create-react-app"; - maintainers = [ ]; - }; -} diff --git a/pkgs/by-name/cr/createrepo_c/package.nix b/pkgs/by-name/cr/createrepo_c/package.nix index dca06c3efc40..f81fb02fbb2b 100644 --- a/pkgs/by-name/cr/createrepo_c/package.nix +++ b/pkgs/by-name/cr/createrepo_c/package.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://rpm-software-management.github.io/createrepo_c/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/cr/credhub-cli/package.nix b/pkgs/by-name/cr/credhub-cli/package.nix index 8a918197881f..083965598479 100644 --- a/pkgs/by-name/cr/credhub-cli/package.nix +++ b/pkgs/by-name/cr/credhub-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.44"; + version = "2.9.45"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-5963iZ7fDNs+J96+GSoGcjKLCqu8u3obAWE9+9oEBGU="; + sha256 = "sha256-WOiUA2Bk6/ymV2wqPu4a4x0SL1TZXsZOTALta8ZMu6I="; }; # these tests require network access that we're not going to give them diff --git a/pkgs/by-name/cr/creek/build.zig.zon.nix b/pkgs/by-name/cr/creek/build.zig.zon.nix index 551c0489363f..557d54ac178c 100644 --- a/pkgs/by-name/cr/creek/build.zig.zon.nix +++ b/pkgs/by-name/cr/creek/build.zig.zon.nix @@ -1,110 +1,31 @@ -# generated by zon2nix (https://github.com/Cloudef/zig2nix) +# generated by zon2nix (https://github.com/nix-community/zon2nix) + { - lib, linkFarm, - fetchurl, + fetchzip, fetchgit, - runCommandLocal, - zig, - name ? "zig-packages", }: -let - unpackZigArtifact = - { - name, - artifact, - }: - runCommandLocal name { nativeBuildInputs = [ zig ]; } '' - hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" - mv "$TMPDIR/p/$hash" "$out" - chmod 755 "$out" - ''; - fetchZig = - { - name, - url, - hash, - }: - let - artifact = fetchurl { inherit url hash; }; - in - unpackZigArtifact { inherit name artifact; }; - - fetchGitZig = - { - name, - url, - hash, - }: - let - parts = lib.splitString "#" url; - url_base = builtins.elemAt parts 0; - url_without_query = builtins.elemAt (lib.splitString "?" url_base) 0; - rev_base = builtins.elemAt parts 1; - rev = - if builtins.match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}"; - in - fetchgit { - inherit name rev hash; - url = url_without_query; - deepClone = false; - }; - - fetchZigArtifact = - { - name, - url, - hash, - }: - let - parts = lib.splitString "://" url; - proto = builtins.elemAt parts 0; - path = builtins.elemAt parts 1; - fetcher = { - "git+http" = fetchGitZig { - inherit name hash; - url = "http://${path}"; - }; - "git+https" = fetchGitZig { - inherit name hash; - url = "https://${path}"; - }; - http = fetchZig { - inherit name hash; - url = "http://${path}"; - }; - https = fetchZig { - inherit name hash; - url = "https://${path}"; - }; - }; - in - fetcher.${proto}; -in -linkFarm name [ +linkFarm "zig-packages" [ { - name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56"; - path = fetchZigArtifact { - name = "zig-pixman"; - url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz"; - hash = "sha256-CYgFIOR9H5q8UUpFglaixOocCMT6FGpcKQQBUVWpDKQ="; + name = "fcft-2.0.0-zcx6C5EaAADIEaQzDg5D4UvFFMjSEwDE38vdE9xObeN9"; + path = fetchzip { + url = "https://git.sr.ht/~novakane/zig-fcft/archive/v2.0.0.tar.gz"; + hash = "sha256-qDEtiZNSkzN8jUSnZP/itqh8rMf+lakJy4xMB0I8sxQ="; }; } { - name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; - path = fetchZigArtifact { - name = "zig-wayland"; - url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; - hash = "sha256-gxzkHLCq2NqX3l4nEly92ARU5dqP1SqnjpGMDgx4TXA="; + name = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz"; + hash = "sha256-8tA4auo5FEI4IPnomV6bkpQHUe302tQtorFQZ1l14NU="; }; } { - name = "1220a4029ee3ee70d3175c69878e2b70dccd000c4324bc74ba800d8a143b7250fb38"; - path = fetchZigArtifact { - name = "zig-fcft"; - url = "https://git.sr.ht/~novakane/zig-fcft/archive/1.1.0.tar.gz"; - hash = "sha256-osL/zsXqa8tC/Qvzf0/wXeNCzw02F2viCo+d8Gh2S7U="; + name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz"; + hash = "sha256-ydEavD9z20wRwn9ZVX56ZI2T5i1tnm3LupVxfa30o84="; }; } ] diff --git a/pkgs/by-name/cr/creek/package.nix b/pkgs/by-name/cr/creek/package.nix index c9971a1e6bad..e68f872896fa 100644 --- a/pkgs/by-name/cr/creek/package.nix +++ b/pkgs/by-name/cr/creek/package.nix @@ -1,7 +1,7 @@ { callPackage, lib, - zig_0_13, + zig_0_14, stdenv, fetchFromGitHub, fcft, @@ -12,43 +12,46 @@ wayland-protocols, }: let - zig = zig_0_13; + zig = zig_0_14; in stdenv.mkDerivation (finalAttrs: { pname = "creek"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "nmeum"; repo = "creek"; tag = "v${finalAttrs.version}"; - hash = "sha256-3Q690DEMgPqURTHKzJwH5iVyTLvgYqNpxuwAEV+/Lyw="; + hash = "sha256-5TANQt/VWafm6Lj4dYViiK0IMy/chGr/Gzq0S66HZqI="; }; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ zig.hook pkg-config - wayland wayland-scanner ]; buildInputs = [ fcft pixman + wayland wayland-protocols ]; - deps = callPackage ./build.zig.zon.nix { - inherit zig; - }; + deps = callPackage ./build.zig.zon.nix { }; zigBuildFlags = [ "--system" "${finalAttrs.deps}" ]; + passthru.updateScript = ./update.sh; + meta = { - homepage = "https://git.8pit.net/creek"; + homepage = "https://github.com/nmeum/creek"; + changelog = "https://github.com/nmeum/creek/releases/v${finalAttrs.version}"; description = "Malleable and minimalist status bar for the River compositor"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ alexandrutocar ]; diff --git a/pkgs/by-name/cr/creek/update.sh b/pkgs/by-name/cr/creek/update.sh new file mode 100755 index 000000000000..a346ab54c950 --- /dev/null +++ b/pkgs/by-name/cr/creek/update.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash common-updater-scripts gnused nixfmt-rfc-style + +latest_tag=$(list-git-tags --url=https://github.com/nmeum/creek | sed 's/^v//' | tail -n 1) + +update-source-version creek "$latest_tag" + +wget "https://raw.githubusercontent.com/nmeum/creek/v${latest_tag}/build.zig.zon" +nix --extra-experimental-features 'nix-command flakes' run github:nix-community/zon2nix# -- build.zig.zon >pkgs/by-name/cr/creek/build.zig.zon.nix + +nixfmt pkgs/by-name/cr/creek/build.zig.zon.nix + +rm -rf build.zig.zon diff --git a/pkgs/by-name/cr/crengine-ng/package.nix b/pkgs/by-name/cr/crengine-ng/package.nix new file mode 100644 index 000000000000..13746edacd89 --- /dev/null +++ b/pkgs/by-name/cr/crengine-ng/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitLab, + cmake, + pkg-config, + fribidi, + libunibreak, + freetype, + fontconfig, + harfbuzz, + zlib, + zstd, + libpng, + libjpeg, + utf8proc, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "crengine-ng"; + version = "0.9.12"; + + src = fetchFromGitLab { + owner = "coolreader-ng"; + repo = "crengine-ng"; + tag = finalAttrs.version; + hash = "sha256-sNExFNnUKfl+4VCWeqK/Pt2Qy6DtYn7GYnwz5hHkjZw="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + fribidi + libunibreak + freetype + fontconfig + harfbuzz + zlib + zstd + libpng + libjpeg + utf8proc + ]; + + postPatch = '' + substituteInPlace crengine/crengine-ng.pc.cmake \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + + meta = { + homepage = "https://gitlab.com/coolreader-ng/crengine-ng"; + description = "Cross-platform library designed to implement text viewers and e-book readers"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ vnpower ]; + }; +}) diff --git a/pkgs/by-name/cr/cri-tools/package.nix b/pkgs/by-name/cr/cri-tools/package.nix index c0da20906e86..0a15e50fc610 100644 --- a/pkgs/by-name/cr/cri-tools/package.nix +++ b/pkgs/by-name/cr/cri-tools/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.32.0"; + version = "1.33.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - hash = "sha256-wdtsx5DIg+65VRRUPai5d8Tk/zQ4MhVjXNFKK4NCBFs="; + hash = "sha256-KxckDpZ3xfD+buCGrQ+udJF0X2D9sg/d3TLSQEcWyV4="; }; vendorHash = null; @@ -48,6 +48,6 @@ buildGoModule rec { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; homepage = "https://github.com/kubernetes-sigs/cri-tools"; license = licenses.asl20; - maintainers = with maintainers; [ ] ++ teams.podman.members; + teams = [ teams.podman ]; }; } diff --git a/pkgs/by-name/cr/criticality-score/package.nix b/pkgs/by-name/cr/criticality-score/package.nix index bec3173c5059..3a85bcfd4f85 100644 --- a/pkgs/by-name/cr/criticality-score/package.nix +++ b/pkgs/by-name/cr/criticality-score/package.nix @@ -41,7 +41,7 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Gives criticality score for an open source project"; diff --git a/pkgs/by-name/cr/criu/package.nix b/pkgs/by-name/cr/criu/package.nix index 728a1ad28939..a07fb3169214 100644 --- a/pkgs/by-name/cr/criu/package.nix +++ b/pkgs/by-name/cr/criu/package.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { asciidoc xmlto libpaper - libuuid docbook_xsl which makeWrapper @@ -64,6 +63,7 @@ stdenv.mkDerivation rec { libnet nftables libbsd + libuuid ]; propagatedBuildInputs = [ @@ -95,6 +95,7 @@ stdenv.mkDerivation rec { "powerpc" = "ppc64"; "s390" = "s390"; "mips" = "mips"; + "loongarch" = "loongarch64"; }; in [ @@ -146,6 +147,7 @@ stdenv.mkDerivation rec { "x86_64-linux" "aarch64-linux" "armv7l-linux" + "loongarch64-linux" ]; maintainers = [ maintainers.thoughtpolice ]; }; diff --git a/pkgs/by-name/cr/cro-mag-rally/package.nix b/pkgs/by-name/cr/cro-mag-rally/package.nix index 0cc55c3fb0f6..15096c8bd0e9 100644 --- a/pkgs/by-name/cr/cro-mag-rally/package.nix +++ b/pkgs/by-name/cr/cro-mag-rally/package.nix @@ -3,48 +3,53 @@ stdenv, fetchFromGitHub, SDL2, + libGL, cmake, - makeWrapper, + makeBinaryWrapper, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "CroMagRally"; - version = "3.0.0-unstable-2023-05-21"; + version = "3.0.1"; src = fetchFromGitHub { owner = "jorio"; repo = "CroMagRally"; - rev = "5983de40c180b50bbbec8b04f5f5f1ceccd1901b"; - hash = "sha256-QbUkrNY7DZQts8xaimE83yXpCweKvnn0uDb1CawLfEE="; + tag = finalAttrs.version; + hash = "sha256-6KmvILl5tZYxbDYg58LVstmtqoCogc6TV11oagKvqcg="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake - makeWrapper + makeBinaryWrapper ]; + buildInputs = [ SDL2 + libGL ]; installPhase = '' runHook preInstall - mkdir -p "$out/share/CroMagRally" - mv Data ReadMe.txt "$out/share/CroMagRally/" - install -Dm755 {.,$out/bin}/CroMagRally - wrapProgram $out/bin/CroMagRally --chdir "$out/share/CroMagRally" - install -Dm644 $src/packaging/cromagrally.desktop $out/share/applications/cromagrally.desktop - install -Dm644 $src/packaging/cromagrally-desktopicon.png $out/share/pixmaps/cromagrally-desktopicon.png + + mkdir -p $out/share/CroMagRally + mv Data ReadMe.txt $out/share/CroMagRally/ + install -Dm755 CroMagRally $out/bin/CroMagRally + wrapProgram $out/bin/CroMagRally --chdir $out/share/CroMagRally + install -Dm644 ${finalAttrs.src}/packaging/io.jor.cromagrally.desktop $out/share/applications/cromagrally.desktop + install -Dm644 ${finalAttrs.src}/packaging/io.jor.cromagrally.png $out/share/pixmaps/io.jor.cromagrally.png + runHook postInstall ''; - meta = with lib; { + meta = { description = "Port of Cro-Mag Rally, a 2000 Macintosh game by Pangea Software, for modern operating systems"; homepage = "https://github.com/jorio/CroMagRally"; changelog = "https://github.com/jorio/CroMagRally/releases"; - license = licenses.cc-by-sa-40; - maintainers = with maintainers; [ lux ]; - platforms = platforms.linux; + license = lib.licenses.cc-by-sa-40; + maintainers = with lib.maintainers; [ lux ]; + platforms = lib.platforms.linux; mainProgram = "CroMagRally"; }; -} +}) diff --git a/pkgs/by-name/cr/croaring/package.nix b/pkgs/by-name/cr/croaring/package.nix index 70d6a6884709..fb32c80736b6 100644 --- a/pkgs/by-name/cr/croaring/package.nix +++ b/pkgs/by-name/cr/croaring/package.nix @@ -3,17 +3,18 @@ stdenv, fetchFromGitHub, cmake, + cmocka, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "croaring"; - version = "2.0.3"; + version = "4.3.1"; src = fetchFromGitHub { owner = "RoaringBitmap"; repo = "CRoaring"; - rev = "v${version}"; - hash = "sha256-WaFyJ/6zstJ05e3vfrwhaZKQsjRAEvVTs688Hw0fr94="; + tag = "v${finalAttrs.version}"; + hash = "sha256-c4o8AMCtDGLChXxJKJyxkWhuYu7axqLb2ce8IOGk920="; }; # roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor @@ -23,6 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = [ cmocka ]; + doCheck = true; preConfigure = '' @@ -37,14 +40,16 @@ stdenv.mkDerivation rec { } dependencies/.cache/cmocka ''; - meta = with lib; { + cmakeFlags = [ (lib.cmakeBool "ROARING_USE_CPM" false) ]; + + meta = { description = "Compressed bitset library for C and C++"; - homepage = "https://roaringbitmap.org/"; - license = with licenses; [ + homepage = "https://roaringbitmap.org"; + license = with lib.licenses; [ asl20 mit ]; - maintainers = [ maintainers.orivej ]; - platforms = platforms.all; + maintainers = [ lib.maintainers.orivej ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index 2c972beb7939..8493b0ed7279 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "croc"; - version = "10.2.1"; + version = "10.2.2"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - hash = "sha256-T75RyUjni7pNOxSe90xYW8426g3XjtI7YN0z8WADusQ="; + hash = "sha256-tRWkokgs2SZglkgzK+UxwzbTk99GcPgDBcgJkMURNJ8="; }; - vendorHash = "sha256-IL2nKlxJ08xBCW9mnHlPlOccgjHSeLt6ISpMMiBf7J8="; + vendorHash = "sha256-oyLjCORfx3Pf8T1EQqM9XBrmQyMSDHy2X2axh1L79PQ="; subPackages = [ "." ]; diff --git a/pkgs/by-name/cr/cromite/package.nix b/pkgs/by-name/cr/cromite/package.nix index 1673ddaef1a2..118bee32b0a0 100644 --- a/pkgs/by-name/cr/cromite/package.nix +++ b/pkgs/by-name/cr/cromite/package.nix @@ -1,9 +1,9 @@ { - fetchurl, lib, + stdenv, + fetchurl, makeBinaryWrapper, patchelf, - stdenv, copyDesktopItems, makeDesktopItem, @@ -51,9 +51,6 @@ # Command line programs coreutils, - # command line arguments which are always set e.g "--disable-gpu" - commandLineArgs ? "", - # Will crash without. systemd, @@ -96,6 +93,9 @@ # For QT support qt6, + + # command line arguments which are always set e.g "--disable-gpu" + commandLineArgs ? "", }: let @@ -166,15 +166,15 @@ let qt6.qtbase qt6.qtwayland ]; - commit = "ee9852e97e8e1d0ec5edf1c1b35fd1f8b57f2929"; + commit = "0ffdb845a6a3308cbd9826bb78269d1d05cfb8aa"; in stdenv.mkDerivation (finalAttrs: { pname = "cromite"; - version = "134.0.6998.108"; + version = "135.0.7049.100"; src = fetchurl { url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${commit}/chrome-lin64.tar.gz"; - hash = "sha256-P1dLdpFYQlnJYT2o02PietgL2VW0cTGqYLtbkBJyPl0="; + hash = "sha256-bB6CPqgwT1p7aXIKauOrRhG4dhCQ9tyO+HHRrkbrsPQ="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -223,20 +223,17 @@ stdenv.mkDerivation (finalAttrs: { cp -v -a . $out/share/cromite # replace bundled vulkan-loader rm -v $out/share/cromite/libvulkan.so.1 - ln -v -s -t "$out/share/cromite" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" + ln -v -s -t $out/share/cromite ${lib.getLib vulkan-loader}/lib/libvulkan.so.1 # "--simulate-outdated-no-au" disables auto updates and browser outdated popup mkdir $out/bin makeWrapper $out/share/cromite/chrome $out/bin/cromite \ - --prefix QT_PLUGIN_PATH : "${qt6.qtbase}/lib/qt-6/plugins" \ - --prefix QT_PLUGIN_PATH : "${qt6.qtwayland}/lib/qt-6/plugins" \ + --prefix QT_PLUGIN_PATH : "${qt6.qtbase}/lib/qt-6/plugins:${qt6.qtwayland}/lib/qt-6/plugins" \ --prefix NIXPKGS_QT6_QML_IMPORT_PATH : "${qt6.qtwayland}/lib/qt-6/qml" \ --prefix LD_LIBRARY_PATH : "$rpath" \ - --prefix PATH : "$binpath" \ - --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ + --prefix PATH : "$binpath:${lib.makeBinPath [ xdg-utils ]}" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ --set CHROME_WRAPPER "cromite" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so diff --git a/pkgs/by-name/cr/crossfire-arch/package.nix b/pkgs/by-name/cr/crossfire-arch/package.nix new file mode 100644 index 000000000000..ca29d5ababd1 --- /dev/null +++ b/pkgs/by-name/cr/crossfire-arch/package.nix @@ -0,0 +1,34 @@ +{ + stdenv, + lib, + fetchgit, +}: + +stdenv.mkDerivation { + pname = "crossfire-arch"; + version = "2025-04"; + + src = fetchgit { + url = "https://git.code.sf.net/p/crossfire/crossfire-arch"; + rev = "876eb50b9199e9aa06175b7a7d85832662be3f78"; + hash = "sha256-jDiAKcjWYvjGiD68LuKlZS4sOR9jW3THp99kAEdE+y0="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + cp -a . "$out/" + + runHook postInstall + ''; + + meta = with lib; { + description = "Archetype data for the Crossfire free MMORPG"; + homepage = "http://crossfire.real-time.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + hydraPlatforms = [ ]; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/pkgs/by-name/cr/crossfire-client/package.nix b/pkgs/by-name/cr/crossfire-client/package.nix new file mode 100644 index 000000000000..58bc840c8c1e --- /dev/null +++ b/pkgs/by-name/cr/crossfire-client/package.nix @@ -0,0 +1,72 @@ +{ + stdenv, + lib, + fetchgit, + cmake, + pkg-config, + perl, + vala, + gtk2, + pcre, + zlib, + libGL, + libGLU, + libpng, + fribidi, + harfbuzzFull, + xorg, + util-linux, + curl, + SDL2, + SDL2_image, + SDL2_mixer, + libselinux, + libsepol, +}: + +stdenv.mkDerivation { + pname = "crossfire-client"; + version = "2025-01"; + + src = fetchgit { + url = "https://git.code.sf.net/p/crossfire/crossfire-client"; + hash = "sha256-iFm9yVEIBwngr8/0f9TRS4Uw0hnjrW6ngMRfsWY6TX0="; + rev = "c69f578add358c1db567f6b46f532dd038d2ade0"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + perl + vala + ]; + buildInputs = [ + gtk2 + pcre + zlib + libGL + libGLU + libpng + fribidi + harfbuzzFull + xorg.libpthreadstubs + xorg.libXdmcp + curl + SDL2 + SDL2_image + SDL2_mixer + util-linux + libselinux + libsepol + ]; + hardeningDisable = [ "format" ]; + + meta = with lib; { + description = "GTKv2 client for the Crossfire free MMORPG"; + mainProgram = "crossfire-client-gtk2"; + homepage = "http://crossfire.real-time.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/pkgs/by-name/cr/crossfire-gridarta/package.nix b/pkgs/by-name/cr/crossfire-gridarta/package.nix new file mode 100644 index 000000000000..59d274d9774b --- /dev/null +++ b/pkgs/by-name/cr/crossfire-gridarta/package.nix @@ -0,0 +1,53 @@ +{ + stdenv, + lib, + fetchgit, + makeWrapper, + jre, + gradle, +}: + +stdenv.mkDerivation rec { + name = "crossfire-gridarta"; + version = "2025-04"; + + src = fetchgit { + url = "https://git.code.sf.net/p/gridarta/gridarta"; + rev = "9ff39a63071fc76141117eac97a27c07d312cfb5"; + hash = "sha256-UotvRJey0SXhKjyKo0L7MiDtqvsBOUcT0315fkAKwb0="; + }; + + nativeBuildInputs = [ + jre + gradle + makeWrapper + ]; + + buildPhase = '' + runHook preBuild + gradle :src:crossfire:createEditorJar + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -pv $out/share/java $out/bin + cp src/crossfire/build/libs/CrossfireEditor.jar $out/share/java/ + + makeWrapper ${jre}/bin/java $out/bin/crossfire-gridarta \ + --add-flags "-jar $out/share/java/CrossfireEditor.jar" \ + --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \ + --set _JAVA_AWT_WM_NONREPARENTING 1 + + runHook postInstall + ''; + + meta = with lib; { + description = "Map and archetype editor for the Crossfire free MMORPG"; + homepage = "http://crossfire.real-time.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/pkgs/by-name/cr/crossfire-jxclient/package.nix b/pkgs/by-name/cr/crossfire-jxclient/package.nix new file mode 100644 index 000000000000..e5297d6fab50 --- /dev/null +++ b/pkgs/by-name/cr/crossfire-jxclient/package.nix @@ -0,0 +1,73 @@ +{ + stdenv, + lib, + fetchgit, + makeWrapper, + gradle, + jre, + ffmpeg, +}: + +stdenv.mkDerivation rec { + name = "crossfire-jxclient"; + version = "2025-01"; + + src = fetchgit { + url = "https://git.code.sf.net/p/crossfire/jxclient"; + rev = "01471f0fdf7a5fd8b4ea6d5b49bde7edead5c505"; + hash = "sha256-NGBj3NUBZIfS9J3FHqER8lblPuFEEH9dsTKFBqioiik="; + # For some reason, submodule fetching fails in nix even though it works in + # the shell. So we fetch the sounds repo separately below. + fetchSubmodules = false; + }; + + sounds = fetchgit { + url = "https://git.code.sf.net/p/crossfire/crossfire-sounds"; + rev = "b53f436e1d1cca098c641f34c46f15c828ea9c8f"; + hash = "sha256-zA+SaQAaNxNroHESCSonDiUsCuCzjZp+WZNzvsJHNXY="; + }; + + nativeBuildInputs = [ + jre + gradle + makeWrapper + ffmpeg + ]; + + patchPhase = '' + runHook prePatch + + rm -rf sounds + ln -s ${sounds} sounds + + runHook postPatch + ''; + + buildPhase = '' + runHook preBuild + gradle :createJar + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -pv $out/share/java $out/bin + cp jxclient.jar $out/share/java/jxclient.jar + + makeWrapper ${jre}/bin/java $out/bin/crossfire-jxclient \ + --add-flags "-jar $out/share/java/jxclient.jar" \ + --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \ + --set _JAVA_AWT_WM_NONREPARENTING 1 + + runHook postInstall + ''; + + meta = with lib; { + description = "Java-based fullscreen client for the Crossfire free MMORPG"; + homepage = "http://crossfire.real-time.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/pkgs/by-name/cr/crossfire-maps/package.nix b/pkgs/by-name/cr/crossfire-maps/package.nix new file mode 100644 index 000000000000..35575bbaa6b0 --- /dev/null +++ b/pkgs/by-name/cr/crossfire-maps/package.nix @@ -0,0 +1,34 @@ +{ + stdenv, + lib, + fetchgit, +}: + +stdenv.mkDerivation { + pname = "crossfire-maps"; + version = "2025-04"; + + src = fetchgit { + url = "https://git.code.sf.net/p/crossfire/crossfire-maps"; + rev = "ec57d473064ed1732adb1897415b56f96fbd9382"; + hash = "sha256-hJOMa8c80T4/NC37NKM270LDHNqWK6NZfKvKnFno9TE="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + cp -a . "$out/" + + runHook postInstall + ''; + + meta = with lib; { + description = "Map data for the Crossfire free MMORPG"; + homepage = "http://crossfire.real-time.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + hydraPlatforms = [ ]; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/pkgs/by-name/cr/crossfire-server/package.nix b/pkgs/by-name/cr/crossfire-server/package.nix new file mode 100644 index 000000000000..58d8d510ff74 --- /dev/null +++ b/pkgs/by-name/cr/crossfire-server/package.nix @@ -0,0 +1,60 @@ +{ + stdenv, + lib, + pkgs, + fetchgit, + autoconf, + automake, + libtool, + flex, + perl, + check, + pkg-config, + python3, + # Included here so that hosts using custom maps/archetypes can easily override. + maps ? pkgs.crossfire-maps, + arch ? pkgs.crossfire-arch, +}: + +stdenv.mkDerivation { + pname = "crossfire-server"; + version = "2025-04"; + + src = fetchgit { + url = "https://git.code.sf.net/p/crossfire/crossfire-server"; + rev = "5f742b9f9f785e4a59a3a463bee1f31c9bc67098"; + hash = "sha256-e7e3xN7B1cv9+WkZGzOJgrFer50Cs0L/2dYB9RmGCiE="; + }; + + nativeBuildInputs = [ + autoconf + automake + libtool + flex + perl + check + pkg-config + python3 + ]; + hardeningDisable = [ "format" ]; + + preConfigure = '' + ln -s ${arch} lib/arch + ln -s ${maps} lib/maps + sh autogen.sh + ''; + + configureFlags = [ "--with-python=${python3}" ]; + + postInstall = '' + ln -s ${maps} "$out/share/crossfire/maps" + ''; + + meta = with lib; { + description = "Server for the Crossfire free MMORPG"; + homepage = "http://crossfire.real-time.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index 16aa5fd8d4f5..e7efaa7f2a5f 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -21,19 +21,19 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2025-03-27"; + version = "0-unstable-2025-05-16"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "779126e8670cb471fc35e07c9f6a958638bbd9e3"; - hash = "sha256-xYd4KSLcuc1u6JV67UgW9FgkQGwQZLjlvpmngnWc0ew="; + rev = "581ccb06d726b037fd75f64ef964b3d0eb989e33"; + hash = "sha256-U4qWUPuGuAJlTMFY3qHTrlSmNYgxzuYxCHzZZ2O48FA="; fetchSubmodules = true; }; separateDebugInfo = true; useFetchCargoVendor = true; - cargoHash = "sha256-W+oQ11sbGcA6EfFZZuvSFFYwmR1dRKCP7HvSTTODO14="; + cargoHash = "sha256-ZagGHo1DxSR51rvt0SKO1grhvKth5CuxXiCT6rKqGGk="; nativeBuildInputs = [ pkg-config @@ -85,6 +85,7 @@ rustPlatform.buildRustPackage { license = licenses.bsd3; platforms = [ "aarch64-linux" + "riscv64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index dcf9f7c0dc4d..d817e93cd755 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/pkgs/by-name/cr/crowdsec/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.6.6"; + version = "1.6.8"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = pname; tag = "v${version}"; - hash = "sha256-yregZUHdwfg/MJ9ndeHzpo4md9Qq+BAF0gHGC80+Mp0="; + hash = "sha256-/NTlj0kYCOMxShfoKdmouJTiookDjccUj5HFHLPn5HI="; }; - vendorHash = "sha256-XTKOApMagrcHlgdGascIJzRZxjd+IBVhEyF+FiszOkQ="; + vendorHash = "sha256-7587ezh/9C69UzzQGq3DVGBzNEvTzho/zhRlG6g6tkk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cr/crudini/package.nix b/pkgs/by-name/cr/crudini/package.nix index ae8387c374b3..d42b2ce0ec8e 100644 --- a/pkgs/by-name/cr/crudini/package.nix +++ b/pkgs/by-name/cr/crudini/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "crudini"; - version = "0.9.5"; + version = "0.9.6"; format = "pyproject"; src = fetchFromGitHub { owner = "pixelb"; repo = "crudini"; - rev = version; - hash = "sha256-BU4u7uBsNyDOwWUjOIlBWcf1AeUXXZ+johAe+bjws1U="; + tag = version; + hash = "sha256-XW9pdP+aie6v9h35gLYM0wVrcsh+dcEB7EueATOV4w4="; }; postPatch = '' diff --git a/pkgs/by-name/cr/crun/package.nix b/pkgs/by-name/cr/crun/package.nix index 05c6cd7168af..ec21ea35a5b7 100644 --- a/pkgs/by-name/cr/crun/package.nix +++ b/pkgs/by-name/cr/crun/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/crun"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ] ++ teams.podman.members; + teams = [ teams.podman ]; mainProgram = "crun"; }; } diff --git a/pkgs/by-name/cr/crusader/package.nix b/pkgs/by-name/cr/crusader/package.nix index eb530cb6d32d..057accbabd86 100644 --- a/pkgs/by-name/cr/crusader/package.nix +++ b/pkgs/by-name/cr/crusader/package.nix @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix index bee6f77e3291..51d690c54019 100644 --- a/pkgs/by-name/cr/cryptomator/package.nix +++ b/pkgs/by-name/cr/cryptomator/package.nix @@ -17,18 +17,18 @@ let in maven.buildMavenPackage rec { pname = "cryptomator"; - version = "1.15.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; tag = version; - hash = "sha256-yNCVSaA2GtTFUYoN7IZxEYMxkkQwMiNnfnmSXaruFjM="; + hash = "sha256-U/I18OtinWlk8d9OLLAzZHoN5d8KHx9CUoZsv2mrQtw="; }; mvnJdk = jdk; mvnParameters = "-Dmaven.test.skip=true -Plinux"; - mvnHash = "sha256-w0mIeSFRSGl3EorrGcxqnXF6C0SowjWUMYT/NN1erwM="; + mvnHash = "sha256-uQz70epBFKTyX/PpOyWBtxHOiX0OQT3aTX6KWKwLc1I="; preBuild = '' VERSION=${version} diff --git a/pkgs/by-name/cr/cryptpad/package.nix b/pkgs/by-name/cr/cryptpad/package.nix index 94087f88b86b..804ff3c72a29 100644 --- a/pkgs/by-name/cr/cryptpad/package.nix +++ b/pkgs/by-name/cr/cryptpad/package.nix @@ -1,6 +1,7 @@ { bash, buildNpmPackage, + coreutils, fetchFromGitHub, fetchpatch, fetchurl, @@ -13,7 +14,7 @@ }: let - version = "2024.12.0"; + version = "2025.3.0"; # nix version of install-onlyoffice.sh # a later version could rebuild from sdkjs/web-apps as per # https://github.com/cryptpad/onlyoffice-builds/blob/main/build.sh @@ -83,10 +84,10 @@ buildNpmPackage { owner = "cryptpad"; repo = "cryptpad"; rev = version; - hash = "sha256-oSrDajaCEc7I2AsDzKoO34ffd4OeXDwFDGm45yQDSvE="; + hash = "sha256-NxkVMsfLzdzifdn+f0C6mBJGd1oLwcMTAIXv+gBG7rI="; }; - npmDepsHash = "sha256-1EwxAe+8FOrngZx5+FEeu9uHKWZNBpsECEGrsyiZ2GU="; + npmDepsHash = "sha256-GWkyRlizPSA72WwoY+mRLwaMeD/SXdo6oUVwsd2gp7c="; nativeBuildInputs = [ makeBinaryWrapper @@ -99,12 +100,6 @@ buildNpmPackage { # fix httpSafePort setting # https://github.com/cryptpad/cryptpad/pull/1571 ./0001-env.js-fix-httpSafePort-handling.patch - # https://github.com/cryptpad/cryptpad/pull/1740 - (fetchpatch { - name = "Add `--check`, `--rdfind`, `--no-rdfind` options to `install-onlyoffice.sh`"; - url = "https://github.com/cryptpad/cryptpad/commit/f38668735e777895db2eadd3413cff386fb12c0c.patch"; - hash = "sha256-J4AK1XIa3q+/lD74p2c9O7jt0VEtofTmfAaQNU71sp8="; - }) ]; # cryptpad build tries to write in cache dir @@ -147,7 +142,7 @@ buildNpmPackage { # directory. makeWrapper "${lib.getExe nodejs}" "$out/bin/cryptpad" \ --add-flags "$out_cryptpad/server.js" \ - --run "for d in customize.dist lib www; do ln -sf \"$out_cryptpad/\$d\" .; done" \ + --run "for d in customize.dist lib www scripts; do ${coreutils}/bin/ln -sf \"$out_cryptpad/\$d\" .; done" \ --run "if ! [ -d customize ]; then \"${lib.getExe nodejs}\" \"$out_cryptpad/scripts/build.js\"; fi" ''; diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix index 3e2b74a4d588..8ba13330dfe1 100644 --- a/pkgs/by-name/cr/cryptsetup/package.nix +++ b/pkgs/by-name/cr/cryptsetup/package.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { [ "--with-crypto_backend=openssl" "--disable-ssh-token" + "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" ] ++ lib.optionals (!rebuildMan) [ "--disable-asciidoc" diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix index 59797607d4fd..c755886c5425 100644 --- a/pkgs/by-name/cr/crystal-dock/package.nix +++ b/pkgs/by-name/cr/crystal-dock/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "crystal-dock"; - version = "2.11"; + version = "2.14"; src = fetchFromGitHub { owner = "dangvd"; repo = "crystal-dock"; rev = "v${finalAttrs.version}"; - hash = "sha256-edTBlqCJkw9ER06yZeXvJXQeQ5bJn//ss5ceYwt0QUU="; + hash = "sha256-szW3zIgwy0a9NmEax6xemeCdjs3//r7BRfUDeLv+VxE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cs/csaf-tool/package.nix b/pkgs/by-name/cs/csaf-tool/package.nix new file mode 100644 index 000000000000..7bf230eb5a7a --- /dev/null +++ b/pkgs/by-name/cs/csaf-tool/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.csaf-tool diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix index 0771b7942c79..9e581fa2c077 100644 --- a/pkgs/by-name/cs/csdr/package.nix +++ b/pkgs/by-name/cs/csdr/package.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; - maintainers = teams.c3d2.members; + teams = [ teams.c3d2 ]; }; } diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index 995fc3d2bf64..aed55650a4d2 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -6,22 +6,22 @@ nix-update-script, }: let - inherit (dotnetCorePackages) sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; in buildDotnetGlobalTool rec { pname = "csharp-ls"; - version = "0.16.0"; + version = "0.17.0"; - nugetHash = "sha256-1uj0GlnrOXIYcjJSbkr3Kugft9xrHX4RYOeqH0hf1VU="; + nugetHash = "sha256-8dPBDhLc+L/njlRE4UPqhWRV2k+jjgRri4rLW0dIHzM="; - dotnet-sdk = sdk_8_0; - dotnet-runtime = sdk_8_0; + inherit dotnet-sdk; + dotnet-runtime = dotnet-sdk; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cs/csvkit/package.nix b/pkgs/by-name/cs/csvkit/package.nix index 2c852ab32d85..1c69c0be9d9e 100644 --- a/pkgs/by-name/cs/csvkit/package.nix +++ b/pkgs/by-name/cs/csvkit/package.nix @@ -1,24 +1,22 @@ { lib, - python3, + python3Packages, fetchPypi, }: -let +python3Packages.buildPythonApplication rec { pname = "csvkit"; - version = "2.0.1"; - pythonEnv = python3; -in -pythonEnv.pkgs.buildPythonApplication { - inherit pname version; + version = "2.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-qpRgJm1XE/8xKkFO0+3Ybgw6MdqbLidYy+VkP+EUbdE="; + hash = "sha256-uR6PWkhYiMPFFbFcwlJc5L5c/NT0dm6tgxE+eHtf1TY="; }; - propagatedBuildInputs = with pythonEnv.pkgs; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ agate agate-excel agate-dbf @@ -26,13 +24,9 @@ pythonEnv.pkgs.buildPythonApplication { setuptools # csvsql imports pkg_resources ]; - nativeCheckInputs = with pythonEnv.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - pythonImportsCheck = [ - "csvkit" - ]; + pythonImportsCheck = [ "csvkit" ]; disabledTests = [ # Tries to compare CLI output - and fails! diff --git a/pkgs/by-name/cs/csvlens/package.nix b/pkgs/by-name/cs/csvlens/package.nix index b5842124d09e..eeff5047f1b8 100644 --- a/pkgs/by-name/cs/csvlens/package.nix +++ b/pkgs/by-name/cs/csvlens/package.nix @@ -1,28 +1,32 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, + fetchpatch2, }: rustPlatform.buildRustPackage rec { pname = "csvlens"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "YS-L"; repo = "csvlens"; tag = "v${version}"; - hash = "sha256-JlyDw+VL/vpKTvvBlDIwVIovhKJX2pV4UTY47cLR1IE="; + hash = "sha256-kyUfpZaOpLP8nGrXH8t9cOutXFkZsmZnPmIu3t6uaWU="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit + patches = [ + (fetchpatch2 { + # https://github.com/YS-L/csvlens/pull/129 + name = "fix-flaky-test.patch"; + url = "https://github.com/YS-L/csvlens/commit/8544e9d4179eef10e8d1a625a41c0e1ef3eb188b.patch"; + hash = "sha256-j02H+R14Hfm7ZEHFPRGqTY/GEzj5ETXp72kk7os9Zso="; + }) ]; useFetchCargoVendor = true; - cargoHash = "sha256-nfw8mMauOTDCBh9O2ye96p8WXDFta4DXXb9kJVz7f3E="; + cargoHash = "sha256-lr1pqFodqgsKHRFGonXj0nG4elomiSMETulBdCLMR3w="; meta = with lib; { description = "Command line csv viewer"; diff --git a/pkgs/by-name/cs/csvquote/package.nix b/pkgs/by-name/cs/csvquote/package.nix index 7a3b1c8bab15..0342ee16641c 100644 --- a/pkgs/by-name/cs/csvquote/package.nix +++ b/pkgs/by-name/cs/csvquote/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + coreutils, patsh, }: @@ -25,6 +26,9 @@ stdenv.mkDerivation rec { patsh ]; + # needed for cross + buildInputs = [ coreutils ]; + makeFlags = [ "BINDIR=$(out)/bin" ]; @@ -35,7 +39,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteAllInPlace $out/bin/csvheader - patsh $out/bin/csvheader -fs ${builtins.storeDir} + patsh $out/bin/csvheader -fs ${builtins.storeDir} --path "$HOST_PATH" ''; meta = with lib; { diff --git a/pkgs/by-name/ct/ctestCheckHook/ctest-check-hook.sh b/pkgs/by-name/ct/ctestCheckHook/ctest-check-hook.sh new file mode 100644 index 000000000000..65d39923f967 --- /dev/null +++ b/pkgs/by-name/ct/ctestCheckHook/ctest-check-hook.sh @@ -0,0 +1,44 @@ +# shellcheck shell=bash disable=SC2154 + +ctestCheckHook() { + echo "Executing ctestCheckHook" + + runHook preCheck + + local buildCores=1 + + if [ "${enableParallelChecking-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + + local flagsArray=( + "-j$buildCores" + # This is enabled by the cmakeConfigurePhase by exporting + # CTEST_OUTPUT_ON_FAILURE, but it makes sense it enable it globally here + # as well. + "--output-on-failure" + ) + + local disabledTestsArray=() + concatTo disabledTestsArray disabledTests + + if [ ${#disabledTestsArray[@]} -ne 0 ]; then + local ctestExcludedTestsFile=$NIX_BUILD_TOP/.ctest-excluded-tests + disabledTestsString="$(concatStringsSep "\n" disabledTestsArray)" + echo -e "$disabledTestsString" >"$ctestExcludedTestsFile" + flagsArray+=("--exclude-from-file" "$ctestExcludedTestsFile") + fi + + concatTo flagsArray ctestFlags checkFlags checkFlagsArray + + echoCmd 'ctest flags' "${flagsArray[@]}" + ctest "${flagsArray[@]}" + + echo "Finished ctestCheckHook" + + runHook postCheck +} + +if [ -z "${dontUseCTestCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=ctestCheckHook +fi diff --git a/pkgs/by-name/ct/ctestCheckHook/package.nix b/pkgs/by-name/ct/ctestCheckHook/package.nix new file mode 100644 index 000000000000..631b2ba8b86a --- /dev/null +++ b/pkgs/by-name/ct/ctestCheckHook/package.nix @@ -0,0 +1,9 @@ +{ + makeSetupHook, + cmake, +}: + +makeSetupHook { + name = "ctestCheckHook"; + propagatedBuildInputs = [ cmake ]; +} ./ctest-check-hook.sh diff --git a/pkgs/by-name/ct/ctlptl/package.nix b/pkgs/by-name/ct/ctlptl/package.nix index c2f832e33062..49ce61b095e9 100644 --- a/pkgs/by-name/ct/ctlptl/package.nix +++ b/pkgs/by-name/ct/ctlptl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.40"; + version = "0.8.41"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-O6oAkYzkBUecwAcLjPIR7D/k4REWND8TWdstPNVJ0MU="; + hash = "sha256-PjTgXjA3lP4tzkcnWt711DJtu5/2zR+a2yyYmzf5WvE="; }; - vendorHash = "sha256-1BrohvN3Eefuy2y7pjdwhzFQG9YLr9X/CLbOeTBZkjY="; + vendorHash = "sha256-EYpPZvAhKsKguvDousIs9BTD8fnCcZql3IktKf92wxs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ct/ctpv/package.nix b/pkgs/by-name/ct/ctpv/package.nix index aeac6bdee939..b0911c51be42 100644 --- a/pkgs/by-name/ct/ctpv/package.nix +++ b/pkgs/by-name/ct/ctpv/package.nix @@ -15,6 +15,7 @@ glow, imagemagick, jq, + poppler-utils, ueberzug, }: @@ -52,11 +53,15 @@ stdenv.mkDerivation rec { glow # for markdown files imagemagick jq # for json files + poppler-utils # for pdf files ueberzug # for image files on X11 ] }"; ''; + # Until https://github.com/NikitaIvanovV/ctpv/pull/90 is merged + patches = [ ./use-polite-flag.patch ]; + meta = with lib; { description = "File previewer for a terminal"; homepage = "https://github.com/NikitaIvanovV/ctpv"; diff --git a/pkgs/by-name/ct/ctpv/use-polite-flag.patch b/pkgs/by-name/ct/ctpv/use-polite-flag.patch new file mode 100644 index 000000000000..9cd37a5267f0 --- /dev/null +++ b/pkgs/by-name/ct/ctpv/use-polite-flag.patch @@ -0,0 +1,13 @@ +diff --git a/sh/helpers.sh b/sh/helpers.sh +index fef8691..229d38f 100644 +--- a/sh/helpers.sh ++++ b/sh/helpers.sh +@@ -73,7 +73,7 @@ is_anim_image() { + chafa_run() { + format='-f symbols' + autochafa && format= +- chafasixel && format='-f sixels' ++ chafasixel && format='-f sixels --polite on' + chafa -s "${w}x${h}" $format "$1" | sed 's/#/\n#/g' + } + diff --git a/pkgs/by-name/ct/ctre/package.nix b/pkgs/by-name/ct/ctre/package.nix index f0418ae956e8..14ee2cef419f 100644 --- a/pkgs/by-name/ct/ctre/package.nix +++ b/pkgs/by-name/ct/ctre/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ctre"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "hanickadot"; repo = "compile-time-regular-expressions"; rev = "v${version}"; - hash = "sha256-Fmx8eKo4UHSYQa5RL70VmaogQj+ILVA1gfpaVE8+MlQ="; + hash = "sha256-/44oZi6j8+a1D6ZGZpoy82GHjPtqzOvuS7d3SPbH7fs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix new file mode 100644 index 000000000000..f736e87e8290 --- /dev/null +++ b/pkgs/by-name/cu/cubeb/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + alsa-lib, + jack2, + libpulseaudio, + sndio, + speexdsp, + lazyLoad ? !stdenv.hostPlatform.isDarwin, +}: + +assert lib.assertMsg ( + stdenv.hostPlatform.isDarwin -> !lazyLoad +) "cubeb: lazyLoad is inert on Darwin"; + +let + backendLibs = [ + alsa-lib + jack2 + libpulseaudio + sndio + ]; + +in +stdenv.mkDerivation { + pname = "cubeb"; + version = "unstable-2022-10-18"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "cubeb"; + rev = "27d2a102b0b75d9e49d43bc1ea516233fb87d778"; + hash = "sha256-q+uz1dGU4LdlPogL1nwCR/KuOX4Oy3HhMdA6aJylBRk="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ speexdsp ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) backendLibs; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TESTS=OFF" # tests require an audio server + "-DBUNDLE_SPEEX=OFF" + "-DUSE_SANITIZERS=OFF" + + # Whether to lazily load libraries with dlopen() + "-DLAZY_LOAD_LIBS=${if lazyLoad then "ON" else "OFF"}" + ]; + + passthru = { + # For downstream users when lazyLoad is true + backendLibs = lib.optionals lazyLoad backendLibs; + }; + + meta = with lib; { + description = "Cross platform audio library"; + mainProgram = "cubeb-test"; + homepage = "https://github.com/mozilla/cubeb"; + license = licenses.isc; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix new file mode 100644 index 000000000000..ab7e8d6ac8aa --- /dev/null +++ b/pkgs/by-name/cu/cubicsdr/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + fftw, + hamlib, + libpulseaudio, + libGL, + libX11, + liquid-dsp, + pkg-config, + soapysdr-with-plugins, + wxGTK32, + enableDigitalLab ? false, +}: + +stdenv.mkDerivation rec { + pname = "cubicsdr"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "cjcliffe"; + repo = "CubicSDR"; + rev = version; + sha256 = "0cyv1vk97x4i3h3hhh7dx8mv6d1ad0fypdbx5fl26bz661sr8j2n"; + }; + + patches = [ + # Fix for liquid-dsp v1.50 + (fetchpatch { + url = "https://github.com/cjcliffe/CubicSDR/commit/0e3a785bd2af56d18ff06b56579197b3e89b34ab.patch"; + sha256 = "sha256-mPfNZcV3FnEtGVX4sCMSs+Qc3VeSBIRkpCyx24TKkcU="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = + [ + fftw + hamlib + liquid-dsp + soapysdr-with-plugins + wxGTK32 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libpulseaudio + libGL + libX11 + ]; + + cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -change libliquid.dylib ${lib.getLib liquid-dsp}/lib/libliquid.dylib ''${out}/bin/CubicSDR + ''; + + meta = with lib; { + homepage = "https://cubicsdr.com"; + description = "Software Defined Radio application"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lasandell ]; + platforms = platforms.unix; + mainProgram = "CubicSDR"; + }; +} diff --git a/pkgs/by-name/cu/cups-bjnp/package.nix b/pkgs/by-name/cu/cups-bjnp/package.nix index 8702daa4884a..6a751adf7fdd 100644 --- a/pkgs/by-name/cu/cups-bjnp/package.nix +++ b/pkgs/by-name/cu/cups-bjnp/package.nix @@ -5,23 +5,29 @@ cups, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cups-bjnp"; - version = "1.2.2"; + version = "2.0.3"; src = fetchurl { - url = "mirror://sourceforge/cups-bjnp/cups-bjnp-${version}.tar.gz"; - sha256 = "0sb0vm1sf8ismzd9ba33qswxmsirj2z1b7lnyrc9v5ixm7q0bnrm"; + url = "mirror://sourceforge/cups-bjnp/cups-bjnp-${finalAttrs.version}.tar.gz"; + hash = "sha256-yRSy/Z2OJs4i8t9iRNne/uwx7ppTYPcj7ss7APIWhQA="; }; - preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; + preConfigure = '' + mkdir -p $out/lib/cups/backend + configureFlags="--with-cupsbackenddir=$out/lib/cups/backend" + ''; buildInputs = [ cups ]; + env.NIX_CFLAGS_COMPILE = toString [ "-include stdio.h" "-Wno-error=stringop-truncation" "-Wno-error=deprecated-declarations" "-Wno-unused-variable" + "-Wno-error=address" + "-Wno-error=dangling-pointer" ]; meta = { @@ -34,4 +40,4 @@ stdenv.mkDerivation rec { homepage = "http://cups-bjnp.sourceforge.net"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/cu/cups-browsed/package.nix b/pkgs/by-name/cu/cups-browsed/package.nix index 169bfda6e3bc..7db6cb771a95 100644 --- a/pkgs/by-name/cu/cups-browsed/package.nix +++ b/pkgs/by-name/cu/cups-browsed/package.nix @@ -24,15 +24,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkg-config cups + glib # Required for gdbus-codegen + pkg-config ]; buildInputs = [ avahi + cups + glib libcupsfilters libppd - glib ]; configureFlags = [ diff --git a/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix b/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix index 97ec5a226c9d..2df2785e28d2 100644 --- a/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix +++ b/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { buildInputs = [ cups ]; postPatch = '' - sed -r 's|(gscall, size, ")cp |\1${coreutils}/bin/cp |' cups-pdf.c -i + substituteInPlace cups-pdf.c \ + --replace-fail '"cp ' '"${lib.getExe' coreutils "cp"} ' ''; # gcc command line is taken from original cups-pdf's README file @@ -44,11 +45,11 @@ stdenv.mkDerivation { passthru.tests.vmtest = nixosTests.cups-pdf; - meta = with lib; { + meta = { description = "CUPS backend that turns print jobs into searchable PDF files"; homepage = "https://github.com/alexivkin/CUPS-PDF-to-PDF"; - license = licenses.gpl2Only; - maintainers = [ maintainers.yarny ]; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.yarny ]; longDescription = '' cups-pdf is a CUPS backend that generates a PDF file for each print job and puts this file into a folder on the local machine such that the print job's owner can access the file. diff --git a/pkgs/tools/networking/curl-impersonate/chrome/default.nix b/pkgs/by-name/cu/curl-impersonate/chrome/default.nix similarity index 100% rename from pkgs/tools/networking/curl-impersonate/chrome/default.nix rename to pkgs/by-name/cu/curl-impersonate/chrome/default.nix diff --git a/pkgs/tools/networking/curl-impersonate/chrome/deps.nix b/pkgs/by-name/cu/curl-impersonate/chrome/deps.nix similarity index 100% rename from pkgs/tools/networking/curl-impersonate/chrome/deps.nix rename to pkgs/by-name/cu/curl-impersonate/chrome/deps.nix diff --git a/pkgs/tools/networking/curl-impersonate/chrome/disable-building-docs.patch b/pkgs/by-name/cu/curl-impersonate/chrome/disable-building-docs.patch similarity index 100% rename from pkgs/tools/networking/curl-impersonate/chrome/disable-building-docs.patch rename to pkgs/by-name/cu/curl-impersonate/chrome/disable-building-docs.patch diff --git a/pkgs/tools/networking/curl-impersonate/chrome/update.sh b/pkgs/by-name/cu/curl-impersonate/chrome/update.sh similarity index 100% rename from pkgs/tools/networking/curl-impersonate/chrome/update.sh rename to pkgs/by-name/cu/curl-impersonate/chrome/update.sh diff --git a/pkgs/tools/networking/curl-impersonate/firefox/curl-impersonate-0.6.1-fix-command-paths.patch b/pkgs/by-name/cu/curl-impersonate/firefox/curl-impersonate-0.6.1-fix-command-paths.patch similarity index 100% rename from pkgs/tools/networking/curl-impersonate/firefox/curl-impersonate-0.6.1-fix-command-paths.patch rename to pkgs/by-name/cu/curl-impersonate/firefox/curl-impersonate-0.6.1-fix-command-paths.patch diff --git a/pkgs/tools/networking/curl-impersonate/firefox/default.nix b/pkgs/by-name/cu/curl-impersonate/firefox/default.nix similarity index 100% rename from pkgs/tools/networking/curl-impersonate/firefox/default.nix rename to pkgs/by-name/cu/curl-impersonate/firefox/default.nix diff --git a/pkgs/tools/networking/curl-impersonate/firefox/deps.nix b/pkgs/by-name/cu/curl-impersonate/firefox/deps.nix similarity index 100% rename from pkgs/tools/networking/curl-impersonate/firefox/deps.nix rename to pkgs/by-name/cu/curl-impersonate/firefox/deps.nix diff --git a/pkgs/tools/networking/curl-impersonate/firefox/update.sh b/pkgs/by-name/cu/curl-impersonate/firefox/update.sh similarity index 100% rename from pkgs/tools/networking/curl-impersonate/firefox/update.sh rename to pkgs/by-name/cu/curl-impersonate/firefox/update.sh diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/by-name/cu/curl-impersonate/package.nix similarity index 100% rename from pkgs/tools/networking/curl-impersonate/default.nix rename to pkgs/by-name/cu/curl-impersonate/package.nix diff --git a/pkgs/by-name/cu/curlMinimal/0001-http2-fix-stream-window-size-after-unpausing.patch b/pkgs/by-name/cu/curlMinimal/0001-http2-fix-stream-window-size-after-unpausing.patch new file mode 100644 index 000000000000..8960f617d3f1 --- /dev/null +++ b/pkgs/by-name/cu/curlMinimal/0001-http2-fix-stream-window-size-after-unpausing.patch @@ -0,0 +1,155 @@ +From 5fbd78eb2dc4afbd8884e8eed27147fc3d4318f6 Mon Sep 17 00:00:00 2001 +From: Stefan Eissing +Date: Fri, 4 Apr 2025 10:43:13 +0200 +Subject: [PATCH] http2: fix stream window size after unpausing + +When pausing a HTTP/2 transfer, the stream's local window size +is reduced to 0 to prevent the server from sending further data +which curl cannot write out to the application. + +When unpausing again, the stream's window size was not correctly +increased again. The attempt to trigger a window update was +ignored by nghttp2, the server never received it and the transfer +stalled. + +Add a debug feature to allow use of small window sizes which +reproduces this bug in test_02_21. + +Fixes #16955 +Closes #16960 +--- + docs/libcurl/libcurl-env-dbg.md | 5 +++++ + lib/http2.c | 31 +++++++++++++++++++++++++++++++ + tests/http/test_02_download.py | 27 +++++++++++++++++++++++++-- + 3 files changed, 61 insertions(+), 2 deletions(-) + +diff --git a/docs/libcurl/libcurl-env-dbg.md b/docs/libcurl/libcurl-env-dbg.md +index 471533625f6b..60c887bfd5a9 100644 +--- a/docs/libcurl/libcurl-env-dbg.md ++++ b/docs/libcurl/libcurl-env-dbg.md +@@ -147,3 +147,8 @@ Make a blocking, graceful shutdown of all remaining connections when + a multi handle is destroyed. This implicitly triggers for easy handles + that are run via easy_perform. The value of the environment variable + gives the shutdown timeout in milliseconds. ++ ++## `CURL_H2_STREAM_WIN_MAX` ++ ++Set to a positive 32-bit number to override the HTTP/2 stream window's ++default of 10MB. Used in testing to verify correct window update handling. +diff --git a/lib/http2.c b/lib/http2.c +index 88fbcceb7135..a1221dcc51de 100644 +--- a/lib/http2.c ++++ b/lib/http2.c +@@ -44,6 +44,7 @@ + #include "connect.h" + #include "rand.h" + #include "strdup.h" ++#include "strparse.h" + #include "transfer.h" + #include "dynbuf.h" + #include "headers.h" +@@ -141,6 +142,9 @@ struct cf_h2_ctx { + uint32_t goaway_error; /* goaway error code from server */ + int32_t remote_max_sid; /* max id processed by server */ + int32_t local_max_sid; /* max id processed by us */ ++#ifdef DEBUGBUILD ++ int32_t stream_win_max; /* max h2 stream window size */ ++#endif + BIT(initialized); + BIT(via_h1_upgrade); + BIT(conn_closed); +@@ -166,6 +170,18 @@ static void cf_h2_ctx_init(struct cf_h2_ctx *ctx, bool via_h1_upgrade) + Curl_hash_offt_init(&ctx->streams, 63, h2_stream_hash_free); + ctx->remote_max_sid = 2147483647; + ctx->via_h1_upgrade = via_h1_upgrade; ++#ifdef DEBUGBUILD ++ { ++ const char *p = getenv("CURL_H2_STREAM_WIN_MAX"); ++ ++ ctx->stream_win_max = H2_STREAM_WINDOW_SIZE_MAX; ++ if(p) { ++ curl_off_t l; ++ if(!Curl_str_number(&p, &l, INT_MAX)) ++ ctx->stream_win_max = (int32_t)l; ++ } ++ } ++#endif + ctx->initialized = TRUE; + } + +@@ -285,7 +301,15 @@ static int32_t cf_h2_get_desired_local_win(struct Curl_cfilter *cf, + * This gets less precise the higher the latency. */ + return (int32_t)data->set.max_recv_speed; + } ++#ifdef DEBUGBUILD ++ else { ++ struct cf_h2_ctx *ctx = cf->ctx; ++ CURL_TRC_CF(data, cf, "stream_win_max=%d", ctx->stream_win_max); ++ return ctx->stream_win_max; ++ } ++#else + return H2_STREAM_WINDOW_SIZE_MAX; ++#endif + } + + static CURLcode cf_h2_update_local_win(struct Curl_cfilter *cf, +@@ -302,6 +326,13 @@ static CURLcode cf_h2_update_local_win(struct Curl_cfilter *cf, + int32_t wsize = nghttp2_session_get_stream_effective_local_window_size( + ctx->h2, stream->id); + if(dwsize > wsize) { ++ rv = nghttp2_session_set_local_window_size(ctx->h2, NGHTTP2_FLAG_NONE, ++ stream->id, dwsize); ++ if(rv) { ++ failf(data, "[%d] nghttp2 set_local_window_size(%d) failed: " ++ "%s(%d)", stream->id, dwsize, nghttp2_strerror(rv), rv); ++ return CURLE_HTTP2; ++ } + rv = nghttp2_submit_window_update(ctx->h2, NGHTTP2_FLAG_NONE, + stream->id, dwsize - wsize); + if(rv) { +diff --git a/tests/http/test_02_download.py b/tests/http/test_02_download.py +index 4b9ae3caefab..b55f022338ad 100644 +--- a/tests/http/test_02_download.py ++++ b/tests/http/test_02_download.py +@@ -313,9 +313,9 @@ def test_02_20_h2_small_frames(self, env: Env, httpd): + assert httpd.stop() + assert httpd.start() + +- # download via lib client, 1 at a time, pause/resume at different offsets ++ # download serial via lib client, pause/resume at different offsets + @pytest.mark.parametrize("pause_offset", [0, 10*1024, 100*1023, 640000]) +- @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3']) ++ @pytest.mark.parametrize("proto", ['http/1.1', 'h3']) + def test_02_21_lib_serial(self, env: Env, httpd, nghttpx, proto, pause_offset): + if proto == 'h3' and not env.have_h3(): + pytest.skip("h3 not supported") +@@ -332,6 +332,29 @@ def test_02_21_lib_serial(self, env: Env, httpd, nghttpx, proto, pause_offset): + srcfile = os.path.join(httpd.docs_dir, docname) + self.check_downloads(client, srcfile, count) + ++ # h2 download parallel via lib client, pause/resume at different offsets ++ # debug-override stream window size to reproduce #16955 ++ @pytest.mark.parametrize("pause_offset", [0, 10*1024, 100*1023, 640000]) ++ @pytest.mark.parametrize("swin_max", [0, 10*1024]) ++ def test_02_21_h2_lib_serial(self, env: Env, httpd, pause_offset, swin_max): ++ proto = 'h2' ++ count = 2 ++ docname = 'data-10m' ++ url = f'https://localhost:{env.https_port}/{docname}' ++ run_env = os.environ.copy() ++ run_env['CURL_DEBUG'] = 'multi,http/2' ++ if swin_max > 0: ++ run_env['CURL_H2_STREAM_WIN_MAX'] = f'{swin_max}' ++ client = LocalClient(name='hx-download', env=env, run_env=run_env) ++ if not client.exists(): ++ pytest.skip(f'example client not built: {client.name}') ++ r = client.run(args=[ ++ '-n', f'{count}', '-P', f'{pause_offset}', '-V', proto, url ++ ]) ++ r.check_exit_code(0) ++ srcfile = os.path.join(httpd.docs_dir, docname) ++ self.check_downloads(client, srcfile, count) ++ + # download via lib client, several at a time, pause/resume + @pytest.mark.parametrize("pause_offset", [100*1023]) + @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3']) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index fe28b750ab15..9f3b02d2fc59 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, pkg-config, perl, nixosTests, @@ -92,7 +91,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.12.1"; + version = "8.13.0"; src = fetchurl { urls = [ @@ -101,9 +100,14 @@ stdenv.mkDerivation (finalAttrs: { builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-A0Hx7ZeibIEauuvTfWK4M5VnkrdgfqPxXQAWE8dt4gI="; + hash = "sha256-Sgk5eaPC0C3i+8AFSaMncQB/LngDLG+qXs0vep4VICU="; }; + patches = [ + # Backport of https://github.com/curl/curl/commit/5fbd78eb2dc4afbd8884e8eed27147fc3d4318f6 + ./0001-http2-fix-stream-window-size-after-unpausing.patch + ]; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion # necessary for FreeBSD code path in configure postPatch = '' @@ -158,15 +162,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional wolfsslSupport wolfssl ++ lib.optional rustlsSupport rustls-ffi ++ lib.optional zlibSupport zlib - ++ lib.optional zstdSupport zstd - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - CoreServices - SystemConfiguration - ] - ); + ++ lib.optional zstdSupport zstd; # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html preConfigure = '' diff --git a/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch b/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch deleted file mode 100644 index 0de9769d2216..000000000000 --- a/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/go.mod b/go.mod -index bebd23f..2ad575f 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,8 +1,8 @@ - module github.com/rs/curlie - - require ( -- golang.org/x/crypto v0.1.0 -- golang.org/x/sys v0.1.0 -+ golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3 -+ golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 - ) - - go 1.13 -diff --git a/go.sum b/go.sum -index 6b2e5c3..452bcf9 100644 ---- a/go.sum -+++ b/go.sum -@@ -1,4 +1,6 @@ - github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -+golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3 h1:mPCVkWhSH1DSDQg4ZwAFYMo/+evpqK1WzBt33b9TXRE= -+golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= - golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= -@@ -10,6 +12,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug - golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= - golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 h1:WecRHqgE09JBkh/584XIE6PMz5KKE/vER4izNUi30AQ= -+golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --- -2.40.1 diff --git a/pkgs/by-name/cu/curlie/package.nix b/pkgs/by-name/cu/curlie/package.nix index b215a3dfb105..0d26874856cd 100644 --- a/pkgs/by-name/cu/curlie/package.nix +++ b/pkgs/by-name/cu/curlie/package.nix @@ -1,32 +1,28 @@ { + lib, buildGoModule, fetchFromGitHub, - lib, curlie, testers, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "curlie"; - version = "1.7.2"; + version = "1.8.2"; src = fetchFromGitHub { owner = "rs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-YOsq3cB+Pn2eC1Dky3fobBRR7GMxcf/tvWr6i3Vq/BE="; + repo = "curlie"; + tag = "v${finalAttrs.version}"; + hash = "sha256-BlpIDik4hkU4c+KCyAmgUURIN362RDQID/qo6Ojp2Ek="; }; - patches = [ - ./bump-golang-x-sys.patch - ]; - - vendorHash = "sha256-VsPdMUfS4UVem6uJgFISfFHQEKtIumDQktHQFPC1muc="; + vendorHash = "sha256-GBccl8V87u26dtrGpHR+rKqRBqX6lq1SBwfsPvj/+44="; ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; passthru.tests.version = testers.testVersion { @@ -34,11 +30,11 @@ buildGoModule rec { command = "curlie version"; }; - meta = with lib; { + meta = { description = "Frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; homepage = "https://curlie.io/"; - maintainers = with maintainers; [ ma27 ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ ma27 ]; + license = lib.licenses.mit; mainProgram = "curlie"; }; -} +}) diff --git a/pkgs/by-name/cu/curtail/package.nix b/pkgs/by-name/cu/curtail/package.nix index e52f20734c4d..8c00f21cb9df 100644 --- a/pkgs/by-name/cu/curtail/package.nix +++ b/pkgs/by-name/cu/curtail/package.nix @@ -22,14 +22,14 @@ python3.pkgs.buildPythonApplication rec { pname = "curtail"; - version = "1.12.0"; + version = "1.13.0"; format = "other"; src = fetchFromGitHub { owner = "Huluti"; repo = "Curtail"; tag = version; - sha256 = "sha256-+TnGCLRJsdqdChqonHGuA4kUEiB9Mfc2aQttyt+uFnM="; + sha256 = "sha256-JfioWtd0jGTyaD5uELAqH6J+h04MOrfEqdR7GWgXyMw="; }; nativeBuildInputs = [ @@ -86,6 +86,6 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "curtail"; homepage = "https://github.com/Huluti/Curtail"; license = licenses.gpl3Only; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; }; } diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index 060efc4c84a4..2f63ddd9534f 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -2,13 +2,11 @@ lib, stdenv, fetchFromGitea, - fetchFromGitLab, - fetchpatch, cmake, git, pkg-config, boost, - eigen, + eigen_3_4_0, glm, libGL, libpng, @@ -43,33 +41,7 @@ stdenv.mkDerivation { buildInputs = [ boost - # https://codeberg.org/doug-moen/curv/issues/228 - # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19' - # https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c - (eigen.overrideAttrs (old: rec { - version = "3.4.0"; - src = fetchFromGitLab { - owner = "libeigen"; - repo = "eigen"; - rev = version; - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; - }; - patches = (old.patches or [ ]) ++ [ - # Fixes e.g. onnxruntime on aarch64-darwin: - # https://hydra.nixos.org/build/248915128/nixlog/1, - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. - # - # The patch is from - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) - # which is two years old, - # but Eigen hasn't had a release in two years either: - # https://gitlab.com/libeigen/eigen/-/issues/2699. - (fetchpatch { - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; - }) - ]; - })) + eigen_3_4_0 glm libGL libpng diff --git a/pkgs/by-name/cu/cutentr/package.nix b/pkgs/by-name/cu/cutentr/package.nix new file mode 100644 index 000000000000..bea06e6c05e3 --- /dev/null +++ b/pkgs/by-name/cu/cutentr/package.nix @@ -0,0 +1,66 @@ +{ + stdenv, + libsForQt5, + fetchFromGitLab, + makeDesktopItem, + lib, + copyDesktopItems, +}: + +let + version = "0.3.3"; +in + +stdenv.mkDerivation { + pname = "cutentr"; + inherit version; + + src = fetchFromGitLab { + owner = "BoltsJ"; + repo = "cuteNTR"; + tag = version; + hash = "sha256-KfnC9R38qSMhQDeaMBWm1HoO3Wzs5kyfPFwdMZCWw4E="; + }; + + desktopItems = lib.singleton (makeDesktopItem { + name = "cuteNTR"; + desktopName = "cuteNTR"; + icon = "cutentr"; + exec = "cutentr"; + categories = [ "Game" ]; + }); + + nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook + copyDesktopItems + ]; + + buildInputs = [ + libsForQt5.qtbase + ]; + + buildPhase = '' + runHook preBuild + qmake + make + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp -r cutentr $out/bin + + install -m 444 -D setup/gui/com.gitlab.BoltsJ.cuteNTR.svg $out/share/icons/hicolor/scalable/apps/cutentr.svg + runHook postInstall + ''; + + meta = { + description = "A 3DS streaming client for Linux"; + homepage = "https://gitlab.com/BoltsJ/cuteNTR"; + license = lib.licenses.gpl3Plus; + mainProgram = "cutentr"; + platforms = [ "x86_64-linux" ]; + maintainers = [ lib.maintainers.EarthGman ]; + }; +} diff --git a/pkgs/by-name/cu/cuyo/package.nix b/pkgs/by-name/cu/cuyo/package.nix index f95a9d3b5a91..1f816b9fa00c 100644 --- a/pkgs/by-name/cu/cuyo/package.nix +++ b/pkgs/by-name/cu/cuyo/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { version = "2.1.0"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz"; + url = "mirror://savannah/cuyo/cuyo-2.1.0.tar.gz"; sha256 = "17yqv924x7yvwix7yz9jdhgyar8lzdhqvmpvv0any8rdkajhj23c"; }; diff --git a/pkgs/by-name/cv/cve-prioritizer/package.nix b/pkgs/by-name/cv/cve-prioritizer/package.nix index 705951a13d3c..dde4e6415855 100644 --- a/pkgs/by-name/cv/cve-prioritizer/package.nix +++ b/pkgs/by-name/cv/cve-prioritizer/package.nix @@ -1,37 +1,21 @@ { lib, fetchFromGitHub, - fetchpatch, python3, }: python3.pkgs.buildPythonApplication rec { pname = "cve-prioritizer"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "TURROKS"; repo = "CVE_Prioritizer"; rev = "refs/tags/v${version}"; - hash = "sha256-ade/gcRrdvVsp5F61ZndsNL3s3gq8TDk/dZvPc55S/8="; + hash = "sha256-FJN/AM4NFctMszzIBdvww7OtC7fimb++tbtRZ77ll5c="; }; - patches = [ - # Add script, https://github.com/TURROKS/CVE_Prioritizer/pull/33 - (fetchpatch { - name = "add-script.patch"; - url = "https://github.com/TURROKS/CVE_Prioritizer/commit/c29f2332cde7d79e0c9f34c0a1811611a8fb73c9.patch"; - hash = "sha256-/hnS+YKO4zNGVGTG+KsugJH7Bt2OE8Q2F+7ZX+uhFlU="; - }) - ]; - - postPatch = '' - # https://github.com/TURROKS/CVE_Prioritizer/pull/32 - substituteInPlace pyproject.toml \ - --replace-fail "CVE Prioritizer" "cve-prioritizer" - ''; - build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/by-name/cw/cwe-client-cli/package.nix b/pkgs/by-name/cw/cwe-client-cli/package.nix index 19bed845691f..65977be759bf 100644 --- a/pkgs/by-name/cw/cwe-client-cli/package.nix +++ b/pkgs/by-name/cw/cwe-client-cli/package.nix @@ -9,12 +9,12 @@ }: rustPlatform.buildRustPackage rec { pname = "cwe-client-cli"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "NotBalds"; repo = "cwe-client-cli"; rev = "v${version}"; - hash = "sha256-7zzmYwuQ+Sg8hf1zuKtKUMgk0Is1YJB4WdOKdxtWRA0="; + hash = "sha256-3ehzERWV0/hV0Suy9LtCcp+xmaD13Chgu4a0gPT7cHs="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { openssl_3 ]; useFetchCargoVendor = true; - cargoHash = "sha256-ctcsO7HRs3wWcOFW+ewQbKGCSEBlVzT/enAEjFIAaPU="; + cargoHash = "sha256-ml6anuAJru2zVIHNf/z4gdQjplRrXL4FO44cxfaDRns="; meta = { description = "Simple command line client for CWE"; diff --git a/pkgs/by-name/cy/cyber/package.nix b/pkgs/by-name/cy/cyber/package.nix index 651e8aed7d6d..a2e219ef6f2e 100644 --- a/pkgs/by-name/cy/cyber/package.nix +++ b/pkgs/by-name/cy/cyber/package.nix @@ -2,22 +2,22 @@ lib, stdenv, fetchFromGitHub, - zig_0_11, + zig_0_12, }: stdenv.mkDerivation rec { pname = "cyber"; - version = "unstable-2023-09-19"; + version = "0-unstable-2025-12-10"; src = fetchFromGitHub { owner = "fubark"; repo = "cyber"; - rev = "f95cd189cf090d26542a87b1d2ced461e75fa1a7"; - hash = "sha256-ctEd8doXMKq3L9/T+jOcWqlBQN0pVhsu9DjBXsg/u/4="; + rev = "2a2298d6aa12f9136b18cd85965f4a58e484f506"; + hash = "sha256-d81z+wUIQ/KUVa+GyXbT+E8dsG8Mdt1hZW1Qe1mmAiw="; }; nativeBuildInputs = [ - zig_0_11.hook + zig_0_12.hook ]; zigBuildFlags = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fubark/cyber"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; - inherit (zig_0_11.meta) platforms; + inherit (zig_0_12.meta) platforms; broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/cy/cyberpunk-neon/package.nix b/pkgs/by-name/cy/cyberpunk-neon/package.nix index 4c8d177fdd08..9c209040827b 100644 --- a/pkgs/by-name/cy/cyberpunk-neon/package.nix +++ b/pkgs/by-name/cy/cyberpunk-neon/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "cyberpunk-neon"; - version = "0-unstable-2025-02-01"; + version = "0-unstable-2025-05-05"; src = fetchFromGitHub { owner = "Roboron3042"; repo = "Cyberpunk-Neon"; - rev = "eb7595459c0d4164262e0ccaf8d6e5c1936a6f67"; - hash = "sha256-whHBIxEGGvTPVUaE/HQDb/Qyl5sPMGlOmofgNCBaNng="; + rev = "e74c25c8507bbbb23d81d075402bd983a61ebe07"; + hash = "sha256-LzoSC9O6173YcKvMWkSKkxsUVCZYMA844FnDfdr1gVc="; }; outputs = [ diff --git a/pkgs/by-name/cy/cyclonedx-cli/package.nix b/pkgs/by-name/cy/cyclonedx-cli/package.nix index 3038e5c541ea..603ba9d47881 100644 --- a/pkgs/by-name/cy/cyclonedx-cli/package.nix +++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix @@ -33,7 +33,8 @@ buildDotnetModule rec { description = "CycloneDX CLI tool for SBOM analysis, merging, diffs and format conversions"; homepage = "https://github.com/CycloneDX/cyclonedx-cli"; changelog = "https://github.com/CycloneDX/cyclonedx-cli/releases/tag/v${version}"; - maintainers = (with maintainers; [ thillux ]) ++ teams.cyberus.members; + maintainers = with maintainers; [ thillux ]; + teams = [ teams.cyberus ]; license = licenses.asl20; platforms = with platforms; (linux ++ darwin); mainProgram = "cyclonedx"; diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix index cea4a5e01c3b..b9fd203b0c6a 100644 --- a/pkgs/by-name/cy/cyclonedx-python/package.nix +++ b/pkgs/by-name/cy/cyclonedx-python/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "cyclonedx-python"; - version = "5.3.0"; + version = "6.1.1"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python"; tag = "v${version}"; - hash = "sha256-H3r/ypD3aEkrCnclf+zh0BK4ZzDQBMNvWS7V7xKX43g="; + hash = "sha256-faR7sC4ymS0g5+r++QrgX01E8CbDKCmChPFMW8jgWBg="; }; build-system = with python3Packages; [ poetry-core ]; @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/CycloneDX/cyclonedx-python"; changelog = "https://github.com/CycloneDX/cyclonedx-python/releases/tag/${src.tag}"; license = lib.licenses.asl20; - maintainers = lib.teams.cyberus.members; + teams = [ lib.teams.cyberus ]; mainProgram = "cyclonedx-py"; }; } diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index 90e981850a1e..ccf33e9fc15b 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-KAHCeM1rAPGi98PrcVJtzkhTWGWFwf37VuSQTjqXSEg="; + hash = "sha256-asg8ATzM2cwh+crnzqjWMsee1I9BPm9an8d3lzj6yS4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LwBTDBrsigt8H6PFuuGndiMlj5d8v68dyHipVYOGKVk="; + cargoHash = "sha256-DFAlFEJfR6jUplQ50AK4SszdBIw0jbxFRgYNHg3sN8c="; nativeBuildInputs = [ @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix index 649d3757879f..7bb238cd612c 100644 --- a/pkgs/by-name/cy/cypress/package.nix +++ b/pkgs/by-name/cy/cypress/package.nix @@ -13,7 +13,6 @@ udev, unzip, xorg, - darwin, }: let @@ -65,34 +64,20 @@ stdenv.mkDerivation rec { (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux ( - with xorg; - [ - libXScrnSaver - libXdamage - libXtst - libxshmfence - nss - gtk2 - alsa-lib - gtk3 - libgbm - ] - ) - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - CoreServices - CoreMedia - CoreAudio - AudioToolbox - AVFoundation - Foundation - ApplicationServices - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux ( + with xorg; + [ + libXScrnSaver + libXdamage + libXtst + libxshmfence + nss + gtk2 + alsa-lib + gtk3 + libgbm + ] + ); runtimeDependencies = lib.optional stdenv.hostPlatform.isLinux (lib.getLib udev); diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix index a5ed89a09ed4..8bc78f051514 100644 --- a/pkgs/by-name/cy/cyrus-imapd/package.nix +++ b/pkgs/by-name/cy/cyrus-imapd/package.nix @@ -66,13 +66,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cyrus-imapd"; - version = "3.10.1"; + version = "3.12.0"; src = fetchFromGitHub { owner = "cyrusimap"; repo = "cyrus-imapd"; tag = "cyrus-imapd-${finalAttrs.version}"; - hash = "sha256-jMSTduQmLB55smBmbJ32eLqiC24ufQyX/FT9d18lDCo="; + hash = "sha256-sdHAxlrxQHzcSt2buOGfRv/OR8BYFHrNoo+r/ePVFsg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index a0fb267941f0..37804ca9e831 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -3,13 +3,11 @@ atk, cairo, callPackage, - darwin, fetchFromGitHub, gdk-pixbuf, glib, gobject-introspection, gtk4, - overrideSDK, pango, pkg-config, rustPlatform, @@ -21,11 +19,7 @@ }: let - buildRustPackage' = rustPlatform.buildRustPackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; - - self = buildRustPackage' { + self = rustPlatform.buildRustPackage { pname = "czkawka"; version = "9.0.0"; @@ -45,22 +39,14 @@ let wrapGAppsHook4 ]; - buildInputs = - [ - atk - cairo - gdk-pixbuf - glib - gtk4 - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Foundation - ] - ); + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk4 + pango + ]; nativeCheckInputs = [ xvfb-run ]; @@ -86,7 +72,7 @@ let versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/czkawka_cli"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/d-/d-spy/package.nix b/pkgs/by-name/d-/d-spy/package.nix index 860e9cea1574..36ecd9d1a4d4 100644 --- a/pkgs/by-name/d-/d-spy/package.nix +++ b/pkgs/by-name/d-/d-spy/package.nix @@ -14,19 +14,18 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "d-spy"; - version = "47.0"; + version = "48.0"; outputs = [ "out" - "lib" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/d-spy/${lib.versions.major version}/d-spy-${version}.tar.xz"; - hash = "sha256-7/sw1DKtXkPmxEm9+OMX2il+VuAnQW5z4ulsTPGPaeg="; + url = "mirror://gnome/sources/d-spy/${lib.versions.major finalAttrs.version}/d-spy-${finalAttrs.version}.tar.xz"; + hash = "sha256-D3oJAZBGGU2X/Dw0KzhOocOA4Qqc/IAlv83lfVlcODA="; }; nativeBuildInputs = [ @@ -55,11 +54,8 @@ stdenv.mkDerivation rec { description = "D-Bus exploration tool"; mainProgram = "d-spy"; homepage = "https://gitlab.gnome.org/GNOME/d-spy"; - license = with licenses; [ - lgpl3Plus # library - gpl3Plus # app - ]; - maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + teams = [ teams.gnome ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix index 59660722c989..922fed3a9725 100644 --- a/pkgs/by-name/d2/d2/package.nix +++ b/pkgs/by-name/d2/d2/package.nix @@ -10,16 +10,16 @@ buildGo123Module rec { pname = "d2"; - version = "0.6.9"; + version = "0.7.0"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; tag = "v${version}"; - hash = "sha256-Z+RC3wXqplGxaECIpHDiV8giWItvE5KFh3N+mwVL6HU="; + hash = "sha256-RlQRf/ueYCbanXXA8tAftQ/9JKkH0QwT4+7Vlwtlnp8="; }; - vendorHash = "sha256-ujyPfQx9FyMq5GBRquBHxcQ47R72RP6g2/rqLICDdWM="; + vendorHash = "sha256-STiIS0BRHypNujKNtNb77IXBDdeHVl/uGjVFubJrDc8="; excludedPackages = [ "./e2etests" ]; diff --git a/pkgs/by-name/da/dailies/package.nix b/pkgs/by-name/da/dailies/package.nix new file mode 100644 index 000000000000..6893c8f0502b --- /dev/null +++ b/pkgs/by-name/da/dailies/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage { + pname = "dailies"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "JachymPutta"; + repo = "dailies"; + rev = "66938203c644a54adcc1dbbe44ad37d348f3e986"; + hash = "sha256-hT+tffJ4F4VfblfYmb1o0hl5EZjU/QOgDYudKS8EvJg="; + }; + + cargoHash = "sha256-R8r6YFo0Ih7esJl/OpcNNmmmB9pGxOXCc+3/ZivaWSw="; + + meta = with lib; { + description = "Daily journaling in plain markdown"; + homepage = "https://github.com/JachymPutta/dailies"; + license = licenses.mit; + maintainers = with maintainers; [ JachymPutta ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/da/daisydisk/package.nix b/pkgs/by-name/da/daisydisk/package.nix index 9ee74970ce10..c6309a84d5c0 100644 --- a/pkgs/by-name/da/daisydisk/package.nix +++ b/pkgs/by-name/da/daisydisk/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "daisydisk"; - version = "4.30"; + version = "4.31"; src = fetchzip { url = "https://daisydiskapp.com/download/DaisyDisk.zip"; - hash = "sha256-4nVD5FXj0Ol+QQ7NYUxGH3DzkXEpTawJoZpUgdIUNVY="; + hash = "sha256-z0F1sHihmXR5hN/AwrxLr9ZxfcCN+OSeWvWBe+qwWMU="; stripRoot = false; }; diff --git a/pkgs/by-name/da/daktilo/package.nix b/pkgs/by-name/da/daktilo/package.nix index dde3104c7622..2fcd06953ac4 100644 --- a/pkgs/by-name/da/daktilo/package.nix +++ b/pkgs/by-name/da/daktilo/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, unixtools, pkg-config, alsa-lib, @@ -30,16 +28,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - alsa-lib - xorg.libX11 - xorg.libXi - xorg.libXtst - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + alsa-lib + xorg.libX11 + xorg.libXi + xorg.libXtst + ]; nativeCheckInputs = [ unixtools.script diff --git a/pkgs/by-name/da/dalfox/package.nix b/pkgs/by-name/da/dalfox/package.nix index ee4b66bc9474..924a520e9acd 100644 --- a/pkgs/by-name/da/dalfox/package.nix +++ b/pkgs/by-name/da/dalfox/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dalfox"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "hahwul"; repo = "dalfox"; tag = "v${version}"; - hash = "sha256-F4CXVgHdEjSMK3YIF5X6zCVVI17GkIE3KGAE1OxfhyY="; + hash = "sha256-EM5T8uBMSkjxd7wTaMFPpbErAhcN2oLaV2g8MAxb0lQ="; }; - vendorHash = "sha256-Nt0Rgwrjs2irKPnt5G/32VH3Wj19+xnh+gLspWDnKCY="; + vendorHash = "sha256-EgNE3Z/NZ1lV0BPVe4MhB9bIYSMLftzYfmw65ktSo7A="; ldflags = [ "-w" diff --git a/pkgs/by-name/da/dalphaball/package.nix b/pkgs/by-name/da/dalphaball/package.nix new file mode 100644 index 000000000000..5a1142f993e2 --- /dev/null +++ b/pkgs/by-name/da/dalphaball/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gfortran, + gmp, +}: + +stdenv.mkDerivation rec { + pname = "dalphaball"; + version = "0-unstable-2023-06-15"; + + src = fetchFromGitHub { + owner = "outpace-bio"; + repo = "DAlphaBall"; + rev = "7b9dc05fa2a40f7ea36c6d89973d150eaed459d9"; + hash = "sha256-mUxEL9b67z/mG+0pcM5uQ/jPAfEUpJlXOXPmqDea+U4="; + }; + + sourceRoot = "${src.name}/src"; + strictDeps = true; + + nativeBuildInputs = [ + gfortran + ]; + + buildInputs = [ + gfortran.cc.lib + gmp + ]; + + installPhase = '' + runHook preInstall + install -Dm755 DAlphaBall.gcc $out/bin/DAlphaBall + runHook postInstall + ''; + + meta = { + description = "Computes the surface area and volume of unions of many balls"; + mainProgram = "DAlphaBall"; + homepage = "https://github.com/outpace-bio/DAlphaBall"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ aschleck ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/da/damon/package.nix b/pkgs/by-name/da/damon/package.nix index dc89187fdd17..d7cd836d6d47 100644 --- a/pkgs/by-name/da/damon/package.nix +++ b/pkgs/by-name/da/damon/package.nix @@ -21,7 +21,7 @@ buildGoModule { homepage = "https://github.com/hashicorp/damon"; license = licenses.mpl20; description = "Terminal UI (TUI) for HashiCorp Nomad"; - maintainers = teams.iog.members; + teams = [ teams.iog ]; mainProgram = "damon"; }; } diff --git a/pkgs/by-name/da/dap/package.nix b/pkgs/by-name/da/dap/package.nix deleted file mode 100644 index f8f2177b4fa9..000000000000 --- a/pkgs/by-name/da/dap/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchurl, -}: - -stdenv.mkDerivation rec { - pname = "dap"; - version = "3.10"; - - src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "Bk5sty/438jLb1PpurMQ5OqMbr6JqUuuQjcg2bejh2Y="; - }; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - homepage = "https://www.gnu.org/software/dap"; - description = "Small statistics and graphics package based on C"; - longDescription = '' - Dap is a small statistics and graphics package based on C. Version 3.0 and - later of Dap can read SBS programs (based on the utterly famous, industry - standard statistics system with similar initials - you know the one I - mean)! The user wishing to perform basic statistical analyses is now freed - from learning and using C syntax for straightforward tasks, while - retaining access to the C-style graphics and statistics features provided - by the original implementation. Dap provides core methods of data - management, analysis, and graphics that are commonly used in statistical - consulting practice (univariate statistics, correlations and regression, - ANOVA, categorical data analysis, logistic regression, and nonparametric - analyses). - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix index 22bea35fd699..4c33c477ef6e 100644 --- a/pkgs/by-name/da/dapr-cli/package.nix +++ b/pkgs/by-name/da/dapr-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - hash = "sha256-ex6H5N5h5ScacyakgFDh8/xJMfS6Q6d2FmfcBXiCl+4="; + hash = "sha256-hMBXNJKerRjI2vWsqRlMHyxlgyfN6WNbwVbMpe59rM4="; }; - vendorHash = "sha256-k7TrQX6w034T4LfEfywCQC5OXo9hVDNrEyJe/qOKOEk="; + vendorHash = "sha256-RH802JcEHzrVEf4t7O0croSc36LNM6MtFXFJtDffIvU="; proxyVendor = true; diff --git a/pkgs/by-name/da/daq/package.nix b/pkgs/by-name/da/daq/package.nix deleted file mode 100644 index 40e7fec92598..000000000000 --- a/pkgs/by-name/da/daq/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - flex, - bison, - libpcap, - libdnet, - libnfnetlink, - libnetfilter_queue, -}: - -stdenv.mkDerivation rec { - pname = "daq"; - version = "2.2.2"; - - src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; - sha256 = "0yvzscy7vqj7s5rccza0f7p6awghfm3yaxihx1h57lqspg51in3w"; - }; - - buildInputs = [ - flex - bison - libpcap - libdnet - libnfnetlink - libnetfilter_queue - ]; - - configureFlags = [ - "--enable-nfq-module=yes" - "--with-dnet-includes=${libdnet}/includes" - "--with-dnet-libraries=${libdnet}/lib" - ]; - - NIX_CFLAGS_COMPILE = "-Wno-incompatible-pointer-types"; - - meta = { - description = "Data AcQuisition library (DAQ), for packet I/O"; - mainProgram = "daq-modules-config"; - homepage = "https://www.snort.org"; - maintainers = with lib.maintainers; [ aycanirican ]; - license = lib.licenses.gpl2; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/by-name/da/dar/package.nix b/pkgs/by-name/da/dar/package.nix new file mode 100644 index 000000000000..3c31e3e19999 --- /dev/null +++ b/pkgs/by-name/da/dar/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchzip, + which, + attr, + e2fsprogs, + curl, + libargon2, + librsync, + libthreadar, + gpgme, + libgcrypt, + openssl, + bzip2, + lz4, + lzo, + xz, + zlib, + zstd, +}: + +stdenv.mkDerivation rec { + version = "2.7.17"; + pname = "dar"; + + src = fetchzip { + url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; + sha256 = "sha256-mX99mMiYJ3EDhb96fEMR/E5rnhLe1Ds/21o4EhOVgVo="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ which ]; + + buildInputs = + [ + curl + librsync + libthreadar + gpgme + libargon2 + libgcrypt + openssl + bzip2 + lz4 + lzo + xz + zlib + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + attr + e2fsprogs + ]; + + configureFlags = [ + "--disable-birthtime" + "--disable-upx" + "--disable-dar-static" + "--disable-build-html" + "--enable-threadar" + ]; + + hardeningDisable = [ "format" ]; + + enableParallelBuilding = true; + + postInstall = '' + # Disable html help + rm -r "$out"/share/dar + ''; + + meta = with lib; { + homepage = "http://dar.linux.free.fr"; + description = "Disk ARchiver, allows backing up files into indexed archives"; + maintainers = with maintainers; [ izorkin ]; + license = licenses.gpl2Only; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix index 29e620568ab5..666bc7ba60d5 100644 --- a/pkgs/by-name/da/darklua/package.nix +++ b/pkgs/by-name/da/darklua/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, }: @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-DQkj4t+l6FJnJQ+g96CXypssbRzHbS6X9AOG0LGDclg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' rm .cargo/config.toml diff --git a/pkgs/by-name/da/darkly-qt5/package.nix b/pkgs/by-name/da/darkly-qt5/package.nix new file mode 100644 index 000000000000..de0113957bd4 --- /dev/null +++ b/pkgs/by-name/da/darkly-qt5/package.nix @@ -0,0 +1,5 @@ +{ + darkly, + libsForQt5, +}: +darkly.override { qtPackages = libsForQt5; } diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix new file mode 100644 index 000000000000..3b2eceaa8ed6 --- /dev/null +++ b/pkgs/by-name/da/darkly/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + kdePackages, + qtPackages ? kdePackages, + gitUpdater, +}: +let + qtMajorVersion = lib.versions.major qtPackages.qtbase.version; +in +stdenv.mkDerivation (finalAttrs: { + pname = "darkly-qt${qtMajorVersion}"; + version = "0.5.19"; + + src = fetchFromGitHub { + owner = "Bali10050"; + repo = "Darkly"; + tag = "v${finalAttrs.version}"; + hash = "sha256-hT6OHL8xLp6PZba9hPDxvdGwNkf5ROH9L7ATtnuODpk="; + }; + + nativeBuildInputs = [ + cmake + ninja + qtPackages.wrapQtAppsHook + qtPackages.extra-cmake-modules + ]; + + buildInputs = + with qtPackages; + [ + qtbase + kconfig + kcoreaddons + kcmutils + kguiaddons + ki18n + kiconthemes + kwindowsystem + ] + ++ lib.optionals (qtMajorVersion == "5") [ + kirigami2 + ] + ++ lib.optionals (qtMajorVersion == "6") [ + kcolorscheme + kdecoration + kirigami + ]; + + cmakeFlags = map (v: lib.cmakeBool "BUILD_QT${v}" (v == qtMajorVersion)) [ + "5" + "6" + ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = + { + description = "Modern style for Qt applications (fork of Lightly)"; + homepage = "https://github.com/Bali10050/Darkly"; + changelog = "https://github.com/Bali10050/Darkly/releases/tag/v${finalAttrs.version}"; + platforms = lib.platforms.linux; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ pluiedev ]; + } + // lib.optionalAttrs (qtMajorVersion == "6") { + mainProgram = "darkly-settings6"; + }; +}) diff --git a/pkgs/by-name/da/darkplaces/package.nix b/pkgs/by-name/da/darkplaces/package.nix index cd9bf852657e..17c10f4a57a0 100644 --- a/pkgs/by-name/da/darkplaces/package.nix +++ b/pkgs/by-name/da/darkplaces/package.nix @@ -6,6 +6,7 @@ libjpeg, SDL2, libvorbis, + xorg, }: stdenv.mkDerivation { pname = "darkplaces"; @@ -22,6 +23,7 @@ stdenv.mkDerivation { zlib libjpeg SDL2 + xorg.libX11 ]; buildFlags = [ "release" ]; diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index 2ab187fa7fe2..03e4a14efc04 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -47,15 +47,15 @@ libpng, librsvg, libsecret, - libsoup_2_4, libsysprof-capture, libthai, libtiff, libwebp, + libxml2, libxslt, lua, util-linux, - openexr_3, + openexr, openjpeg, osm-gps-map, pcre2, @@ -133,14 +133,14 @@ stdenv.mkDerivation rec { libpng librsvg libsecret - libsoup_2_4 libsysprof-capture libthai libtiff libwebp + libxml2 libxslt lua - openexr_3 + openexr openjpeg osm-gps-map pcre2 @@ -196,7 +196,7 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = gitUpdater { diff --git a/pkgs/by-name/da/darling-dmg/package.nix b/pkgs/by-name/da/darling-dmg/package.nix index 9f4f436275c6..e33350d939a4 100644 --- a/pkgs/by-name/da/darling-dmg/package.nix +++ b/pkgs/by-name/da/darling-dmg/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, cmake, fuse, zlib, @@ -25,6 +26,15 @@ stdenv.mkDerivation { hash = "sha256-QM75GuFHl2gRlRw1BmTexUE1d9YNnhG0qmTqmE9kMX4="; }; + patches = [ + # Fix compilation + (fetchpatch2 { + name = "cmake-cxx-standard-17.patch"; + url = "https://github.com/darlinghq/darling-dmg/pull/105/commits/b7c620f76a5f76748b3d14dd2a58e77f8b6ed0c0.patch"; + hash = "sha256-i1lisEiwYm4IxgKmBYnjscvW6ObT7XGLVbjW2i5yXV4="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ fuse diff --git a/pkgs/by-name/da/darling/package.nix b/pkgs/by-name/da/darling/package.nix deleted file mode 100644 index 2a161397bca2..000000000000 --- a/pkgs/by-name/da/darling/package.nix +++ /dev/null @@ -1,267 +0,0 @@ -{ - clangStdenv, - lib, - runCommandWith, - writeShellScript, - fetchFromGitHub, - fetchpatch, - nixosTests, - - freetype, - libjpeg, - libpng, - libtiff, - giflib, - libX11, - libXext, - libXrandr, - libXcursor, - libxkbfile, - cairo, - libglvnd, - fontconfig, - dbus, - libGLU, - fuse, - ffmpeg, - pulseaudio, - - makeWrapper, - python2, - python3, - cmake, - ninja, - pkg-config, - bison, - flex, - - libbsd, - openssl, - - xdg-user-dirs, - - addDriverRunpath, - - # Whether to pre-compile Python 2 bytecode for performance. - compilePy2Bytecode ? false, -}: -let - stdenv = clangStdenv; - - # The build system invokes clang to compile Darwin executables. - # In this case, our cc-wrapper must not be used. - ccWrapperBypass = - runCommandWith - { - inherit stdenv; - name = "cc-wrapper-bypass"; - runLocal = false; - derivationArgs = { - template = writeShellScript "template" '' - for (( i=1; i<=$#; i++)); do - j=$((i+1)) - if [[ "''${!i}" == "-target" && "''${!j}" == *"darwin"* ]]; then - # their flags must take precedence - exec @unwrapped@ "$@" $NIX_CFLAGS_COMPILE - fi - done - exec @wrapped@ "$@" - ''; - }; - } - '' - unwrapped_bin=${stdenv.cc.cc}/bin - wrapped_bin=${stdenv.cc}/bin - - mkdir -p $out/bin - - unwrapped=$unwrapped_bin/$CC wrapped=$wrapped_bin/$CC \ - substituteAll $template $out/bin/$CC - unwrapped=$unwrapped_bin/$CXX wrapped=$wrapped_bin/$CXX \ - substituteAll $template $out/bin/$CXX - - chmod +x $out/bin/$CC $out/bin/$CXX - ''; - - wrappedLibs = [ - # To find all of them: rg -w wrap_elf - - # src/native/CMakeLists.txt - freetype - libjpeg - libpng - libtiff - giflib - libX11 - libXext - libXrandr - libXcursor - libxkbfile - cairo - libglvnd - fontconfig - dbus - libGLU - - # src/external/darling-dmg/CMakeLists.txt - fuse - - # src/CoreAudio/CMakeLists.txt - ffmpeg - pulseaudio - ]; -in -stdenv.mkDerivation { - pname = "darling"; - version = "unstable-2024-02-03"; - - src = fetchFromGitHub { - owner = "darlinghq"; - repo = "darling"; - rev = "25afbc76428c39c3909e9efcf5caef1140425211"; - fetchSubmodules = true; - hash = "sha256-z9IMgc5hH2Upn8wHl1OgP42q9HTSkeHnxB3N812A+Kc="; - # Remove 500MB of dependency test files to get under Hydra output limit - postFetch = '' - rm -r $out/src/external/openjdk/test - rm -r $out/src/external/libmalloc/tests - rm -r $out/src/external/libarchive/libarchive/tar/test - ''; - }; - - outputs = [ - "out" - "sdk" - ]; - - patches = [ - # Fix 'clang: error: no such file or directory: .../signal/mach_excUser.c' - # https://github.com/darlinghq/darling/issues/1511 - # https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d - (fetchpatch { - url = "https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d.patch?full_index=1"; - hash = "sha256-FnLcHnK4cNto+E3OQSxE3iK+FHSU8y459FcpMvrzd6o="; - }) - - # Fix compatibility with ffmpeg_7 - # https://github.com/darlinghq/darling/pull/1537 - # https://github.com/darlinghq/darling/commit/9655d5598c87dcb22c54a83cc7741b77cb47a1b0 - (fetchpatch { - url = "https://github.com/darlinghq/darling/commit/9655d5598c87dcb22c54a83cc7741b77cb47a1b0.patch?full_index=1"; - hash = "sha256-ogMo4SRRwiOhaVJ+OS8BVolGDa7vGKyR9bdGiOiCuRc="; - }) - ]; - - postPatch = '' - # We have to be careful - Patching everything indiscriminately - # would affect Darwin scripts as well - chmod +x src/external/bootstrap_cmds/migcom.tproj/mig.sh - patchShebangs \ - src/external/bootstrap_cmds/migcom.tproj/mig.sh \ - src/external/darlingserver/scripts \ - src/external/openssl_certificates/scripts - - substituteInPlace src/startup/CMakeLists.txt --replace SETUID "" - substituteInPlace src/external/basic_cmds/CMakeLists.txt --replace SETGID "" - ''; - - nativeBuildInputs = [ - bison - ccWrapperBypass - cmake - flex - makeWrapper - ninja - pkg-config - python3 - ] ++ lib.optional compilePy2Bytecode python2; - buildInputs = wrappedLibs ++ [ - libbsd - openssl - stdenv.cc.libc.linuxHeaders - ]; - - # Breaks valid paths like - # Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include - dontFixCmake = true; - - # src/external/objc4 forces OBJC_IS_DEBUG_BUILD=1, which conflicts with NDEBUG - # TODO: Fix in a better way - cmakeBuildType = " "; - - cmakeFlags = [ - "-DTARGET_i386=OFF" - "-DCOMPILE_PY2_BYTECODE=${if compilePy2Bytecode then "ON" else "OFF"}" - "-DDARLINGSERVER_XDG_USER_DIR_CMD=${xdg-user-dirs}/bin/xdg-user-dir" - ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-macro-redefined -Wno-unused-command-line-argument"; - - # Linux .so's are dlopen'd by wrapgen during the build - env.LD_LIBRARY_PATH = lib.makeLibraryPath wrappedLibs; - - # Breaks shebangs of Darwin scripts - dontPatchShebangs = true; - - postInstall = '' - # Install the SDK as a separate output - mkdir -p $sdk - - sdkDir=$(readlink -f ../Developer) - - while read -r path; do - dst="$sdk/Developer/''${path#$sdkDir}" - - if [[ -L "$path" ]]; then - target=$(readlink -m "$path") - if [[ -e "$target" && "$target" == "$NIX_BUILD_TOP"* && "$target" != "$sdkDir"* ]]; then - # dereference - cp -r -L "$path" "$dst" - elif [[ -e "$target" ]]; then - # preserve symlink - cp -d "$path" "$dst" - else - # ignore symlink - >&2 echo "Ignoring symlink $path -> $target" - fi - elif [[ -f $path ]]; then - cp "$path" "$dst" - elif [[ -d $path ]]; then - mkdir -p "$dst" - fi - done < <(find $sdkDir) - - mkdir -p $sdk/bin - cp src/external/cctools-port/cctools/ld64/src/*-ld $sdk/bin - cp src/external/cctools-port/cctools/ar/*-{ar,ranlib} $sdk/bin - ''; - - postFixup = '' - echo "Checking for references to $NIX_STORE in Darling root..." - - set +e - grep -r --exclude=mldr "$NIX_STORE" $out/libexec/darling - ret=$? - set -e - - if [[ $ret == 0 ]]; then - echo "Found references to $NIX_STORE in Darling root (see above)" - exit 1 - fi - - patchelf --add-rpath "${lib.makeLibraryPath wrappedLibs}:${addDriverRunpath.driverLink}/lib" \ - $out/libexec/darling/usr/libexec/darling/mldr - ''; - - passthru.tests.nixos = nixosTests.darling; - - meta = with lib; { - description = "Open-source Darwin/macOS emulation layer for Linux"; - homepage = "https://www.darlinghq.org"; - changelog = "https://github.com/darlinghq/darling/releases"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ zhaofengli ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "darling"; - }; -} diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index 0db5d2922fdc..b8945655f42a 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -11,24 +11,24 @@ }: let - embedded-protocol-version = "3.1.0"; + embedded-protocol-version = "3.2.0"; embedded-protocol = fetchFromGitHub { owner = "sass"; repo = "sass"; rev = "refs/tags/embedded-protocol-${embedded-protocol-version}"; - hash = "sha256-DBoGACNhc9JMT8D+dO50aKUitY8xx/3IGj/XntFts1w="; + hash = "sha256-yX30i1gbVZalVhefj9c37mpFOIDaQlsLeAh7UnY56ro="; }; in buildDartApplication rec { pname = "dart-sass"; - version = "1.86.0"; + version = "1.89.0"; src = fetchFromGitHub { owner = "sass"; repo = "dart-sass"; rev = version; - hash = "sha256-TYjw3ACeScP1bf12mKB5U3DxPspkCsupQADc0CFDKLw="; + hash = "sha256-ydKkZlpjshIf8/Q1ufUFHWmJGonYPtzMiXn4VxDgHDo="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index bf2b9c210cb0..bbe061c58e4d 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57", + "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f", "url": "https://pub.dev" }, "source": "hosted", - "version": "80.0.0" + "version": "82.0.0" }, "analyzer": { "dependency": "direct dev", "description": { "name": "analyzer", - "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e", + "sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.0" + "version": "7.4.5" }, "archive": { "dependency": "direct dev", @@ -80,6 +80,16 @@ "source": "hosted", "version": "2.0.3" }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "cli_pkg": { "dependency": "direct main", "description": { @@ -134,11 +144,11 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", + "sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.13.1" }, "crypto": { "dependency": "direct dev", @@ -244,21 +254,21 @@ "dependency": "transitive", "description": { "name": "html", - "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", + "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.15.5" + "version": "0.15.6" }, "http": { "dependency": "direct main", "description": { "name": "http", - "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", + "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "http_multi_server": { "dependency": "transitive", @@ -354,11 +364,11 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.16.0" + "version": "1.17.0" }, "mime": { "dependency": "transitive", @@ -394,11 +404,11 @@ "dependency": "direct main", "description": { "name": "node_interop", - "sha256": "3af2420c728173806f4378cf89c53ba9f27f7f67792b898561bff9d390deb98e", + "sha256": "4848ac408c0cdd0f70136b755df816a8e4c96c244e5377a3fb3b8f8950666150", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.0" }, "node_preamble": { "dependency": "direct dev", @@ -464,21 +474,21 @@ "dependency": "direct main", "description": { "name": "protobuf", - "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d", + "sha256": "fbb0c37d435641d0b84813c1dad41e6fa61ddc880a320bce16b3063ecec35aa6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "4.0.0" }, "protoc_plugin": { "dependency": "direct dev", "description": { "name": "protoc_plugin", - "sha256": "fb0554851c9eca30bd18405fbbfe81e39166d4a2f0e5b770606fd69da3da0b2f", + "sha256": "cb2c7ec4ca331a8b1b3042200d1fe329f989450c8d380b45565b21ae3f7f5ce9", "url": "https://pub.dev" }, "source": "hosted", - "version": "21.1.2" + "version": "22.1.0" }, "pub_api_client": { "dependency": "direct dev", @@ -644,31 +654,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e", + "sha256": "f1665eeffe3b6b193548b5f515e8d1b54ccd9a6e0e7721a417e134e7ed7f06a1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.15" + "version": "1.26.0" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "sha256": "6c7653816b1c938e121b69ff63a33c9dc68102b65a5fb0a5c0f9786256ed33e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.4" + "version": "0.7.5" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", + "sha256": "3caa7c3956b366643b2dedecff764cc32030317b2a15252aed845570df6bcc0f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.8" + "version": "0.6.9" }, "test_descriptor": { "dependency": "direct dev", @@ -744,21 +754,21 @@ "dependency": "transitive", "description": { "name": "web_socket", - "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.6" + "version": "1.0.1" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.0.3" }, "webkit_inspection_protocol": { "dependency": "transitive", diff --git a/pkgs/by-name/da/dartsim/disable-failing-tests.patch b/pkgs/by-name/da/dartsim/disable-failing-tests.patch new file mode 100644 index 000000000000..d808dc837246 --- /dev/null +++ b/pkgs/by-name/da/dartsim/disable-failing-tests.patch @@ -0,0 +1,78 @@ +diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt +index 623102952bfa..c193d6e405fa 100644 +--- a/tests/integration/CMakeLists.txt ++++ b/tests/integration/CMakeLists.txt +@@ -74,11 +74,6 @@ if(TARGET dart-utils) + endif() + + if(TARGET dart-utils-urdf) +- if(NOT MSVC) +- dart_add_test("integration" test_DartLoader) +- target_link_libraries(test_DartLoader dart-utils-urdf) +- endif() +- + dart_add_library(SharedLibraryWamIkFast SharedLibraryWamIkFast.hpp SharedLibraryWamIkFast.cpp) + target_link_libraries(SharedLibraryWamIkFast PUBLIC dart) + target_compile_definitions(SharedLibraryWamIkFast PUBLIC IKFAST_NO_MAIN IKFAST_CLIBRARY) +@@ -88,12 +83,6 @@ if(TARGET dart-utils-urdf) + target_link_libraries(GeneratedWamIkFast PUBLIC dart) + target_compile_definitions(GeneratedWamIkFast PUBLIC IKFAST_NO_MAIN IKFAST_CLIBRARY) + target_compile_options(GeneratedWamIkFast PRIVATE -w) +- +- if(BUILD_SHARED_LIBS) +- dart_add_test("integration" test_IkFast) +- target_link_libraries(test_IkFast dart-utils-urdf) +- add_dependencies(test_IkFast GeneratedWamIkFast SharedLibraryWamIkFast) +- endif() + endif() + + dart_format_add( +@@ -117,24 +106,8 @@ if(TARGET dart-collision-bullet) + target_link_libraries(test_Raycast dart-collision-bullet) + endif() + +-if(TARGET dart-collision-ode) +- # This test doesn't work with FCL because it converts simple shapes to meshes, which makes +- # it difficult to come up with correct test expectations. +- dart_add_test("integration" test_ForceDependentSlip) +- target_link_libraries(test_ForceDependentSlip dart-collision-ode) +-endif() +- + if(TARGET dart-utils) + +- dart_add_test("integration" test_Collision) +- target_link_libraries(test_Collision dart-utils) +- if(TARGET dart-collision-bullet) +- target_link_libraries(test_Collision dart-collision-bullet) +- endif() +- if(TARGET dart-collision-ode) +- target_link_libraries(test_Collision dart-collision-ode) +- endif() +- + dart_add_test("integration" test_Dynamics) + target_link_libraries(test_Dynamics dart-utils) + +@@ -159,9 +132,4 @@ if(TARGET dart-utils) + target_link_libraries(test_World dart-collision-bullet) + endif() + +- if(TARGET dart-utils-urdf) +- dart_add_test("integration" test_ForwardKinematics) +- target_link_libraries(test_ForwardKinematics dart-utils-urdf) +- endif() +- + endif() +diff --git a/tests/regression/CMakeLists.txt b/tests/regression/CMakeLists.txt +index e0dd73c6a461..fa3f7c61c7b0 100644 +--- a/tests/regression/CMakeLists.txt ++++ b/tests/regression/CMakeLists.txt +@@ -12,9 +12,6 @@ endif() + + if(TARGET dart-utils-urdf) + +- dart_add_test("regression" test_Issue838) +- target_link_libraries(test_Issue838 dart-utils-urdf) +- + dart_add_test("regression" test_Issue892) + + dart_add_test("regression" test_Issue895) diff --git a/pkgs/by-name/da/dartsim/package.nix b/pkgs/by-name/da/dartsim/package.nix new file mode 100644 index 000000000000..7345cee85d4a --- /dev/null +++ b/pkgs/by-name/da/dartsim/package.nix @@ -0,0 +1,154 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + pythonSupport ? false, + python3Packages, + + # nativeBuildInputs + cmake, + pkg-config, + + # propagatedBuildInputs + assimp, + blas, + boost, + bullet, + eigen, + fcl, + fmt, + libglut, + nlopt, + imgui, + ipopt, + lapack, + libGL, + libGLU, + ode, + openscenegraph, + pagmo2, + tinyxml-2, + urdfdom, + + # checkInputs + gbenchmark, + gtest, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dartsim"; + version = "6.15.0"; + + src = fetchFromGitHub { + owner = "dartsim"; + repo = "dart"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ik6FwrN5Ta1LinrXpZZc7AmzdFPoLjG07/zo1IZdmgI="; + }; + + # disable failing tests. CMAKE_CTEST_ARGUMENTS does not work. + patches = [ ./disable-failing-tests.patch ]; + + postPatch = '' + # https://github.com/dartsim/dart/pull/1904, merged upstream + substituteInPlace tests/benchmark/CMakeLists.txt \ + --replace-fail \ + "FetchContent_MakeAvailable(benchmark)" \ + "find_package(benchmark REQUIRED)" + + # https://github.com/dartsim/dart/pull/1907, merged upstream + substituteInPlace python/CMakeLists.txt \ + --replace-fail \ + "FetchContent_MakeAvailable(pybind11)" \ + "find_package(pybind11 CONFIG REQUIRED)" + + # fix use of absolute CMake paths in .pc + substituteInPlace CMakeLists.txt \ + --replace-fail \ + "$""{CMAKE_INSTALL_PREFIX}/$""{CMAKE_INSTALL_LIBDIR}" \ + "$""{CMAKE_INSTALL_LIBDIR}" + substituteInPlace cmake/dart.pc.in \ + --replace-fail \ + "libdir=$""{prefix}/" \ + "libdir=" \ + --replace-fail \ + "includedir=$""{prefix}/" \ + "includedir=" + + # install python bindings + substituteInPlace python/dartpy/CMakeLists.txt \ + --replace-fail \ + "EXCLUDE_FROM_ALL" \ + "" + echo "install(TARGETS $""{pybind_module} DESTINATION ${python3Packages.python.sitePackages})" \ + >> python/dartpy/CMakeLists.txt + ''; + + nativeBuildInputs = + [ + cmake + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pybind11 + ]; + + propagatedBuildInputs = + [ + blas + boost + assimp + bullet + eigen + fcl + fmt + libglut + gbenchmark + nlopt + # requires imgui_impl_opengl2.h + (imgui.override { IMGUI_BUILD_OPENGL2_BINDING = true; }) + ipopt + lapack + libGL + libGLU + ode + openscenegraph + pagmo2 + tinyxml-2 + urdfdom + ] + ++ lib.optionals pythonSupport [ + python3Packages.numpy + ]; + + checkInputs = [ + gbenchmark + gtest + ]; + nativeCheckInputs = lib.optionals pythonSupport [ + python3Packages.pytest + python3Packages.pythonImportsCheckHook + ]; + doCheck = true; + # build unit tests + preCheck = "make tests"; + pythonImportsCheck = [ "dartpy" ]; + + cmakeFlags = [ + (lib.cmakeBool "DART_BUILD_DARTPY" pythonSupport) + (lib.cmakeBool "DART_USE_SYSTEM_IMGUI" true) + (lib.cmakeBool "DART_USE_SYSTEM_GOOGLEBENCHMARK" true) + (lib.cmakeBool "DART_USE_SYSTEM_GOOGLETEST" true) + ]; + + meta = { + description = "DART: Dynamic Animation and Robotics Toolkit"; + homepage = "https://github.com/dartsim/dart"; + changelog = "https://github.com/dartsim/dart/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; +}) diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index 6a4dfd8729ba..37d5168f8741 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -8,6 +8,7 @@ ffmpeg, libxslt, shaka-packager, + nix-update-script, }: let @@ -24,13 +25,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "dash-mpd-cli"; - version = "0.2.25"; + version = "0.2.26"; src = fetchFromGitHub { owner = "emarsden"; repo = "dash-mpd-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-xC/U48QyVn9K8Do1909XS7j9aY+ia0gd5cMdfipIds4="; + hash = "sha256-PMzHWY129Bddl1RQQyEPstqvDLAqXxGv9I3fw1AylBo="; }; patches = [ @@ -38,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; useFetchCargoVendor = true; - cargoHash = "sha256-QHfon0795XNtG3jCVv56EIA1pPToWUiopKWI3cA7Vg0="; + cargoHash = "sha256-qy8X9DoBD5MIUQ6akalqtyasst0ZKJJLZTEz+6Hp6EI="; nativeBuildInputs = [ makeWrapper @@ -59,6 +60,8 @@ rustPlatform.buildRustPackage (finalAttrs: { } ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Download media content from a DASH-MPEG or DASH-WebM MPD manifest"; longDescription = '' diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index c339d01ea28d..03b9c1470691 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "databricks-cli"; - version = "0.245.0"; + version = "0.250.0"; src = fetchFromGitHub { owner = "databricks"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-4EWBDfDCiOF9LcON5XT77kNcAXBd57ZjsSGB+hzRgOw="; + hash = "sha256-AqXwlt7Aqi0cRoDiUfE1LFOJqtRmySuA6D4RMYOonU4="; }; # Otherwise these tests fail asserting that the version is 0.0.0-dev @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}" ''; - vendorHash = "sha256-XkUkCraKR9AP0lRZa+u1YMWzLZV+xxWZgbAlxkVjsXM="; + vendorHash = "sha256-tpm7eCjJuRpVnZfMZais1bHVhnQ8DxchaN1/7ljKNOo="; excludedPackages = [ "bundle/internal" diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/by-name/da/databricks-sql-cli/package.nix similarity index 100% rename from pkgs/applications/misc/databricks-sql-cli/default.nix rename to pkgs/by-name/da/databricks-sql-cli/package.nix diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix index 3b1d7284116f..18d1735c31d9 100644 --- a/pkgs/by-name/da/datafusion-cli/package.nix +++ b/pkgs/by-name/da/datafusion-cli/package.nix @@ -2,30 +2,24 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "datafusion-cli"; - version = "45.0.0"; + version = "47.0.0"; src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; repo = "arrow-datafusion"; - rev = version; - sha256 = "sha256-XIxUp4i68psNtKoFR/uVJHCToz681m2q8qUhtMQKCLo="; + tag = finalAttrs.version; + hash = "sha256-IKG0sLF5LAS2Tch3hdzsGHwAf2k43aVvMo1a29pxza0="; }; - sourceRoot = "${src.name}/datafusion-cli"; - useFetchCargoVendor = true; - cargoHash = "sha256-qJjZ4Um2K27IJy7w99kJGs5ZB1y57xd6P896+Hm2GOg="; + cargoHash = "sha256-kl2+cVQhEkRsQWO8w3WEtXAoVIqj3s3IcbRBn175yxg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildAndTestSubdir = "datafusion-cli"; checkFlags = [ # Some tests not found fake path @@ -41,12 +35,15 @@ rustPlatform.buildRustPackage rec { "--skip=tests::test_parquet_metadata_works_with_strings" ]; - meta = with lib; { + # timeout + doCheck = false; + + meta = { description = "cli for Apache Arrow DataFusion"; mainProgram = "datafusion-cli"; homepage = "https://arrow.apache.org/datafusion"; - changelog = "https://github.com/apache/arrow-datafusion/blob/${version}/datafusion/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + changelog = "https://github.com/apache/arrow-datafusion/blob/${finalAttrs.version}/datafusion/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; }; -} +}) diff --git a/pkgs/by-name/da/datamash/package.nix b/pkgs/by-name/da/datamash/package.nix index abd51be89721..6a0acde45e2f 100644 --- a/pkgs/by-name/da/datamash/package.nix +++ b/pkgs/by-name/da/datamash/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "datamash"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "mirror://gnu/datamash/datamash-${version}.tar.gz"; - sha256 = "sha256-etl+jH72Ft0DqlvWeuJMSIJy2z59H1d0FhwYt18p9v0="; + sha256 = "sha256-84Lr2gNlDdZ5Fh91j5wKbMkpMhNDjUp3qO2jJarLh9I="; }; meta = with lib; { diff --git a/pkgs/by-name/da/davis/package.nix b/pkgs/by-name/da/davis/package.nix index 9c937919c864..45923d8625f2 100644 --- a/pkgs/by-name/da/davis/package.nix +++ b/pkgs/by-name/da/davis/package.nix @@ -27,8 +27,11 @@ php.buildComposerProject2 (finalAttrs: { rm -rf "$out/share" ''; - passthru.tests = { - inherit (nixosTests) davis; + passthru = { + php = php; + tests = { + inherit (nixosTests) davis; + }; }; meta = { diff --git a/pkgs/by-name/da/davix/package.nix b/pkgs/by-name/da/davix/package.nix new file mode 100644 index 000000000000..dd29f9f561b0 --- /dev/null +++ b/pkgs/by-name/da/davix/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchurl, + cmake, + pkg-config, + openssl, + libxml2, + boost, + python3, + libuuid, + curl, + gsoap, + rapidjson, + enableTools ? true, + # Use libcurl instead of libneon + # Note that the libneon used is bundled in the project + # See https://github.com/cern-fts/davix/issues/23 + defaultToLibcurl ? false, + enableIpv6 ? true, + enableTcpNodelay ? true, + # Build davix_copy.so + enableThirdPartyCopy ? false, +}: + +let + boolToUpper = b: lib.toUpper (lib.boolToString b); +in +stdenv.mkDerivation rec { + version = "0.8.7"; + pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy"; + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + buildInputs = + [ + boost + curl + libxml2 + openssl + rapidjson + ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid + ++ lib.optional (enableThirdPartyCopy) gsoap; + + # using the url below since the github release page states + # "please ignore the GitHub-generated tarballs, as they are incomplete" + # https://github.com/cern-fts/davix/releases/tag/R_0_8_0 + src = fetchurl { + url = "https://github.com/cern-fts/davix/releases/download/R_${ + lib.replaceStrings [ "." ] [ "_" ] version + }/davix-${version}.tar.gz"; + sha256 = "sha256-eMJOFO3X5OVgOS1nFH7IZYwqoNNkBBW99rxROvz2leY="; + }; + + preConfigure = '' + find . -mindepth 1 -maxdepth 1 -type f -name "patch*.sh" -print0 | while IFS= read -r -d ''' file; do + patchShebangs "$file" + done + ''; + + cmakeFlags = [ + "-DENABLE_TOOLS=${boolToUpper enableTools}" + "-DEMBEDDED_LIBCURL=OFF" + "-DLIBCURL_BACKEND_BY_DEFAULT=${boolToUpper defaultToLibcurl}" + "-DENABLE_IPV6=${boolToUpper enableIpv6}" + "-DENABLE_TCP_NODELAY=${boolToUpper enableTcpNodelay}" + "-DENABLE_THIRD_PARTY_COPY=${boolToUpper enableThirdPartyCopy}" + ]; + + meta = with lib; { + description = "Toolkit for Http-based file management"; + + longDescription = "Davix is a toolkit designed for file + operations with Http based protocols (WebDav, Amazon S3, ...). + Davix provides an API and a set of command line tools"; + + license = licenses.lgpl2Plus; + homepage = "https://github.com/cern-fts/davix"; + changelog = "https://github.com/cern-fts/davix/blob/R_${ + lib.replaceStrings [ "." ] [ "_" ] version + }/RELEASE-NOTES.md"; + maintainers = with maintainers; [ adev ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/db/db-rest/package.nix b/pkgs/by-name/db/db-rest/package.nix index 6aa4e722d169..761170f118ca 100644 --- a/pkgs/by-name/db/db-rest/package.nix +++ b/pkgs/by-name/db/db-rest/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, - nodejs_18, + nodejs, nix-update-script, nixosTests, }: @@ -10,7 +10,7 @@ buildNpmPackage rec { pname = "db-rest"; version = "6.1.0"; - nodejs = nodejs_18; + inherit nodejs; src = fetchFromGitHub { owner = "derhuerst"; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index fac1601d14d8..f56dc18dcdbf 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -10,14 +10,14 @@ wrapGAppsHook3, gtk3, glib, - webkitgtk_4_0, + webkitgtk_4_1, glib-networking, override_xmx ? "1024m", }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "25.0.1"; + version = "25.0.4"; src = let @@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-p4bVQxP5dazNPSGJN6tu2rsowLf5VPJN30W+q8HiUNM="; - aarch64-linux = "sha256-3vrJOqC5szOWcj/oDg3uc1BND5vfbMRR+MNTDcG4vk8="; - x86_64-darwin = "sha256-bu67Tz8awAQ69inY2s330g2qPan2tRLWImeYx9HB3tU="; - aarch64-darwin = "sha256-3TnswzRm3l7egoZttaOBSfO0aGasD56dOndMZ0howDI="; + x86_64-linux = "sha256-ALtJIld7gT4pj+jGRkwMloq6B/ZBOMYZxws9N7xNNZg="; + aarch64-linux = "sha256-Ka+jEI6y1BRqV83yDvu1yDzJfpUIxKKD+zehVHcNQ/o="; + x86_64-darwin = "sha256-P8f0NlMjh/46RChQy8JIm71msqX023K2QaFEic2Br9M="; + aarch64-darwin = "sha256-a9H9M1j6iPcrVcfDxCZHeZj6e55QH3XochXaL2OStlI="; }; in fetchurl { @@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { preInstall = '' # most directories are for different architectures, only keep what we need shopt -s extglob - pushd ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/ + pushd ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}plugins/com.sun.jna_*/com/sun/jna/ rm -r !(ptr|internal|linux-x86-64|linux-aarch64|darwin-x86-64|darwin-aarch64)/ popd ''; @@ -83,16 +83,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { lib.makeLibraryPath [ gtk3 glib - webkitgtk_4_0 + webkitgtk_4_1 glib-networking ] }" mkdir -p $out/share/icons/hicolor/256x256/apps - # for some reason it's missing from the aarch64 build - if [ -e $out/opt/dbeaver/dbeaver.png ]; then - ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png - fi + ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png mkdir -p $out/share/applications ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop diff --git a/pkgs/by-name/db/dbeaver-bin/update.sh b/pkgs/by-name/db/dbeaver-bin/update.sh index c89262bb3a29..cda09005e38e 100755 --- a/pkgs/by-name/db/dbeaver-bin/update.sh +++ b/pkgs/by-name/db/dbeaver-bin/update.sh @@ -1,8 +1,9 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +BASEDIR="$(dirname "$0")/../../../.." latestVersion=$(curl "https://api.github.com/repos/dbeaver/dbeaver/tags" | jq -r '.[0].name') -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; dbeaver-bin.version" | tr -d '"') +currentVersion=$(nix-instantiate --eval -E "with import ${BASEDIR} {}; lib.getVersion dbeaver-bin" | tr -d '"') echo "latest version: $latestVersion" echo "current version: $currentVersion" @@ -22,5 +23,5 @@ do prefetch=$(nix-prefetch-url "https://github.com/dbeaver/dbeaver/releases/download/$latestVersion/dbeaver-ce-$latestVersion-$2") hash=$(nix-hash --type sha256 --to-sri $prefetch) - update-source-version dbeaver-bin $latestVersion $hash --system=$1 --ignore-same-version + (cd "$BASEDIR" && update-source-version dbeaver-bin $latestVersion $hash --system=$1 --ignore-same-version) done diff --git a/pkgs/by-name/db/dbench/fix-missing-stdint.patch b/pkgs/by-name/db/dbench/fix-missing-stdint.patch deleted file mode 100644 index 96cb28e9e55a..000000000000 --- a/pkgs/by-name/db/dbench/fix-missing-stdint.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- dbench-65b1987.org/libnfs.c 2017-11-08 12:25:39.652147989 +0000 -+++ dbench-65b1987/libnfs.c 2017-11-08 12:26:20.269897054 +0000 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #define discard_const(ptr) ((void *)((intptr_t)(ptr))) - diff --git a/pkgs/by-name/db/dbench/package.nix b/pkgs/by-name/db/dbench/package.nix deleted file mode 100644 index 456d99a66939..000000000000 --- a/pkgs/by-name/db/dbench/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - autoconf, - popt, - zlib, - rpcsvc-proto, - libtirpc, -}: - -stdenv.mkDerivation rec { - pname = "dbench"; - version = "2013-01-01"; - - src = fetchgit { - url = "git://git.samba.org/sahlberg/${pname}.git"; - rev = "65b19870ed8d25bff14cafa1c30beb33f1fb6597"; - sha256 = "16lcbwmmx8z5i73k3dnf54yffrpx7ql3y9k3cpkss9dcyxb1p83i"; - }; - - nativeBuildInputs = [ - autoconf - rpcsvc-proto - ]; - buildInputs = [ - popt - zlib - libtirpc - ]; - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; - NIX_LDFLAGS = [ "-ltirpc" ]; - - patches = [ - # patch has been also sent upstream and might be included in future versions - ./fix-missing-stdint.patch - ]; - - preConfigure = '' - ./autogen.sh - configureFlagsArray+=("--datadir=$out/share/dbench") - ''; - - postInstall = '' - cp -R loadfiles/* $out/share/dbench/doc/dbench/loadfiles - - # dbench looks here for the file - ln -s doc/dbench/loadfiles/client.txt $out/share/dbench/client.txt - - # backwards compatible to older nixpkgs packaging introduced by - # 3f27be8e5d5861cd4b9487d6c5212d88bf24316d - ln -s dbench/doc/dbench/loadfiles $out/share/loadfiles - ''; - - meta = with lib; { - description = "Filesystem benchmark tool based on load patterns"; - mainProgram = "dbench"; - homepage = "https://dbench.samba.org/"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index 9711a68a83e4..3d7b6a485a81 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -1,34 +1,38 @@ { lib, stdenv, + appimageTools, fetchurl, _7zz, - appimageTools, }: + let pname = "dbgate"; - version = "6.2.0"; + version = "6.3.3"; src = fetchurl { aarch64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage"; - hash = "sha256-ZhF8ZxfJSNWg4AGj84oSs3/lJLiijSZDGXdnyuFLV7Q="; + hash = "sha256-H4ACPBLmZ78JOCxgx/ZuP8yawh8XK9EN+CZh12uLf8g="; }; x86_64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage"; - hash = "sha256-d6+24Bn12v32fwRGK0GHkkDbNzknMIBbpNDygmIT9/E="; + hash = "sha256-lsQ3/O2Jr4VQ7pusiUYgUPiXu5WHEzLiUf+vmKC0tEo="; }; x86_64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg"; - hash = "sha256-6gwjI0nlhzh0rLevdFRkcPPUrlxrwwIDSnD4mENtHc8="; + hash = "sha256-1mO/wlvV+zaB7gLJcl8WfD9SnHdio8eXXHboyYBsWzU="; }; aarch64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg"; - hash = "sha256-cSFtA/rjkE6lxxs1DR6yvP6WR9a4gjzsdUo8/oyz4/I="; + hash = "sha256-EFKjPJZ2sghPFNYO/A3Ow2GTFyuTcB85VAuQZFn6Q3U="; }; } - .${stdenv.system} or (throw "dbgate: ${stdenv.system} is unsupported."); + .${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported."); + + passthru.updateScript = ./update.sh; + meta = { description = "Database manager for MySQL, PostgreSQL, SQL Server, MongoDB, SQLite and others"; homepage = "https://dbgate.org/"; @@ -51,6 +55,7 @@ if stdenv.hostPlatform.isDarwin then pname version src + passthru meta ; @@ -62,8 +67,10 @@ if stdenv.hostPlatform.isDarwin then installPhase = '' runHook preInstall + mkdir -p $out/Applications cp -r *.app $out/Applications + runHook postInstall ''; } @@ -76,11 +83,14 @@ else pname version src + passthru meta ; + extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop --replace-warn "Exec=AppRun --no-sandbox" "Exec=$out/bin/${pname}" + install -Dm644 ${appimageContents}/dbgate.desktop -t $out/share/applications + substituteInPlace $out/share/applications/dbgate.desktop \ + --replace-warn "Exec=AppRun --no-sandbox" "Exec=dbgate" cp -r ${appimageContents}/usr/share/icons $out/share ''; } diff --git a/pkgs/by-name/db/dbgate/update.sh b/pkgs/by-name/db/dbgate/update.sh new file mode 100755 index 000000000000..a7acfa2c0e91 --- /dev/null +++ b/pkgs/by-name/db/dbgate/update.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix-update common-updater-scripts nix + +set -euo pipefail + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; dbgate.version or (lib.getVersion dbgate)" | tr -d '"') +nix-update dbgate +latestVersion=$(nix-instantiate --eval -E "with import ./. {}; dbgate.version or (lib.getVersion dbgate)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +for system in \ + x86_64-linux \ + aarch64-linux \ + x86_64-darwin \ + aarch64-darwin; do + hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; dbgate.src.url" --system "$system" | tr -d '"'))) + update-source-version dbgate $latestVersion $hash --system=$system --ignore-same-version +done diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix index 4bc003d3eabb..8be3a8f3a1b3 100644 --- a/pkgs/by-name/db/dbip-asn-lite/package.nix +++ b/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-asn-lite"; - version = "2025-03"; + version = "2025-05"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-kois0DGelPxJo6Gnq9NUwl2c+A1QzkB+tYyi3dZSel4="; + hash = "sha256-7o/mGSi66++h9mOPhsv/M/taDHJ7kPfKPh7jb+nC4IQ="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix index 3032ae9e849d..7d986448796b 100644 --- a/pkgs/by-name/db/dbip-city-lite/package.nix +++ b/pkgs/by-name/db/dbip-city-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-city-lite"; - version = "2025-03"; + version = "2025-05"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-lmpIbG3Riv3Sm4HF3UOJoTih1rGZK4j5Mvi3j2U1a3g="; + hash = "sha256-Trqy6BlagHycC432BE1p/fF+hfcVpPhzVJTKIJQaWlY="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix index e06e9ad44e09..23fb563eaffa 100644 --- a/pkgs/by-name/db/dbip-country-lite/package.nix +++ b/pkgs/by-name/db/dbip-country-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2025-03"; + version = "2025-05"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-zs4MubzX7ZqEjS39jQM4bPHOBdqi/h2mHPh9ObP4VQQ="; + hash = "sha256-7ZmodKYVMID/5yOMZuEpRkb41/DTrgprJPG7DYnYNak="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix index 703ab3dcfb90..ab3e084f4a0d 100644 --- a/pkgs/by-name/db/dblab/package.nix +++ b/pkgs/by-name/db/dblab/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dblab"; - version = "0.30.1"; + version = "0.32.0"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-a0452fNr78FDhVoBF8RkKbtamvc5e6gEbTOeRdgGQs4="; + hash = "sha256-Hcwuh+NGHp1nb6dS1CDC+M7onlNpJbkb6UAiC4j3ZiU="; }; - vendorHash = "sha256-n1Z3sNvNLX1QpfpDSGDygjbC6IE85SBJHvyliy11OjU="; + vendorHash = "sha256-WxIlGdd3Si3Lyf9FZOCAepDlRo2F3EDRy00EawkZATY="; ldflags = [ "-s -w -X main.version=${version}" ]; diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix index 1fd5daa283da..ab4f7a1cda83 100644 --- a/pkgs/by-name/db/dbmate/package.nix +++ b/pkgs/by-name/db/dbmate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.26.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; tag = "v${version}"; - hash = "sha256-fxlarxb0HAUPDFI0dtnRTKkLoRS/dfs6ZaNPU0UKS4Y="; + hash = "sha256-HlX84eqM9s9EWCKnFDqcpUoEBc20/fpw1KHQ7q0UkLo="; }; - vendorHash = "sha256-a7EUZXCth2lj172xwyNldoEKHnZrncX4RetAUNAZsrg="; + vendorHash = "sha256-yZmTzoa/tl/vJWX5Ds0wL14iAc2uxJHRWCS5XMN12Hs="; doCheck = false; diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix index b9ab77c35dd5..976125f91625 100644 --- a/pkgs/by-name/db/dbus-cpp/package.nix +++ b/pkgs/by-name/db/dbus-cpp/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, testers, boost186, @@ -20,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dbus-cpp"; - version = "5.0.3"; + version = "5.0.4"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lib-cpp/dbus-cpp"; - rev = finalAttrs.version; - hash = "sha256-t8SzPRUuKeEchT8vAsITf8MwbgHA+mR5C9CnkdVyX7s="; + tag = finalAttrs.version; + hash = "sha256-ki4bnwRpvmB9yzt/Mn3MQs1Dr6Vrcs2D0tvCjvvfmq4="; }; outputs = [ @@ -36,39 +35,22 @@ stdenv.mkDerivation (finalAttrs: { "examples" ]; - patches = [ - # Handle already-stolen dbus call better - # Remove when version > 5.0.3 - (fetchpatch { - name = "0001-dbus-cpp-src-Dont-steal-a-pending-dbus-call-more-then-once.patch"; - url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/9f3d1ff2b1c6c732285949c3dbb35e40cf55ea92.patch"; - hash = "sha256-xzOCIJVsK2J+X9RsV930R9uw6h4UxqwSaNOgv8v4qQU="; - }) - - # Fix GCC13 compilation - # Remove when version > 5.0.3 - (fetchpatch { - name = "0002-dbus-cpp-Add-missing-headers-for-GCC13.patch"; - url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/c761b1eec084962dbe64d35d7f7b86dcbe57a3f7.patch"; - hash = "sha256-/tKe3iHWxP9jWtpdgwwRynj8565u9LxCt4WXJDXzgX4="; - }) - ]; - postPatch = '' substituteInPlace doc/CMakeLists.txt \ - --replace 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}' + --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}' # Warning on aarch64-linux breaks build due to -Werror substituteInPlace CMakeLists.txt \ - --replace '-Werror' "" + --replace-fail '-Werror' "" # pkg-config output patching hook expects prefix variable here substituteInPlace data/dbus-cpp.pc.in \ - --replace 'includedir=''${exec_prefix}' 'includedir=''${prefix}' + --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}' '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' - sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt + substituteInPlace CMakeLists.txt \ + --replace-fail 'add_subdirectory(tests)' '# add_subdirectory(tests)' ''; strictDeps = true; @@ -98,11 +80,10 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DDBUS_CPP_ENABLE_DOC_GENERATION=ON" + (lib.cmakeBool "DBUS_CPP_ENABLE_DOC_GENERATION" true) ]; - # Too flaky on ARM CI & for some amd64 users - doCheck = false; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # DBus, parallelism messes with communication enableParallelChecking = false; @@ -112,17 +93,21 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Dbus-binding leveraging C++-11"; homepage = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ OPNA2608 ]; + changelog = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/blob/${finalAttrs.version}/ChangeLog"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ OPNA2608 ]; mainProgram = "dbus-cppc"; - platforms = platforms.linux; + platforms = lib.platforms.linux; pkgConfigModules = [ "dbus-cpp" ]; diff --git a/pkgs/by-name/db/dbus-glib/package.nix b/pkgs/by-name/db/dbus-glib/package.nix index 291c5c069661..e5e4854aadbd 100644 --- a/pkgs/by-name/db/dbus-glib/package.nix +++ b/pkgs/by-name/db/dbus-glib/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "dbus-glib"; - version = "0.112"; + version = "0.114"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/dbus-glib-${version}.tar.gz"; - sha256 = "sha256-fVUNzN/NKG4ziVUBgp7Zce62XGFOc6rbSgiu73GbFDo="; + sha256 = "sha256-wJxcCFsqDjkbjufXg6HWP+RE6WcXzBgU1htej8KCenw="; }; outputs = [ diff --git a/pkgs/by-name/db/dbus-test-runner/package.nix b/pkgs/by-name/db/dbus-test-runner/package.nix index 10d110e648a2..225df1ebae0e 100644 --- a/pkgs/by-name/db/dbus-test-runner/package.nix +++ b/pkgs/by-name/db/dbus-test-runner/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://launchpad.net/dbus-test-runner"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = teams.lomiri.members; + teams = [ teams.lomiri ]; pkgConfigModules = [ "dbustest-1" ]; diff --git a/pkgs/by-name/db/dbvisualizer/package.nix b/pkgs/by-name/db/dbvisualizer/package.nix index 9151eff9b697..2c76599a1500 100644 --- a/pkgs/by-name/db/dbvisualizer/package.nix +++ b/pkgs/by-name/db/dbvisualizer/package.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "25.1.2"; + version = "25.1.4"; src = let @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "https://www.dbvis.com/product_download/dbvis-${finalAttrs.version}/media/dbvis_linux_${underscoreVersion}.tar.gz"; - hash = "sha256-bEvC0cd/slgddXDiLaArri3+hA3CRHBy9vhrJ8m1Jrg="; + hash = "sha256-oEp0+HCfI//ukcqxVX5j6ep25TsuOHplHteWnrzlLu8="; }; strictDeps = true; diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix index 405fc0a2d5eb..396d243bb61c 100644 --- a/pkgs/by-name/dc/dcgm/package.nix +++ b/pkgs/by-name/dc/dcgm/package.nix @@ -6,7 +6,7 @@ catch2, cmake, ninja, - cudaPackages_11_8, + cudaPackages_11, cudaPackages_12, boost, fmt_9, @@ -24,7 +24,7 @@ let # The runtime closure, thankfully, is quite small as it does not # include the CUDA libraries. cudaPackageSets = [ - cudaPackages_11_8 + cudaPackages_11 cudaPackages_12 ]; @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { description = "Data Center GPU Manager (DCGM) is a daemon that allows users to monitor NVIDIA data-center GPUs"; homepage = "https://developer.nvidia.com/dcgm"; license = licenses.asl20; - maintainers = teams.deshaw.members; + teams = [ teams.deshaw ]; mainProgram = "dcgmi"; platforms = platforms.linux; }; diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix index 2a1d45a1eb6d..522c615e18bd 100644 --- a/pkgs/by-name/dc/dconf-editor/package.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/DconfEditor/"; changelog = "https://gitlab.gnome.org/GNOME/dconf-editor/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/dc/dconf/package.nix b/pkgs/by-name/dc/dconf/package.nix index 0984e2d5eed3..547295d2a96e 100644 --- a/pkgs/by-name/dc/dconf/package.nix +++ b/pkgs/by-name/dc/dconf/package.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { # Mandatory libdconfsettings shared library. lib.systems.inspect.platformPatterns.isStatic ]; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; mainProgram = "dconf"; }; } diff --git a/pkgs/by-name/dc/dcw-gmt/package.nix b/pkgs/by-name/dc/dcw-gmt/package.nix index efa697b2926a..c99acb2d29ef 100644 --- a/pkgs/by-name/dc/dcw-gmt/package.nix +++ b/pkgs/by-name/dc/dcw-gmt/package.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: { for use by GMT, the Generic Mapping Tools. ''; license = licenses.lgpl3Plus; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); + maintainers = with lib.maintainers; [ tviti ]; + teams = [ lib.teams.geospatial ]; }; }) diff --git a/pkgs/by-name/dd/dd_rescue/package.nix b/pkgs/by-name/dd/dd_rescue/package.nix index 78e35bec6748..e4db2fcefc0b 100644 --- a/pkgs/by-name/dd/dd_rescue/package.nix +++ b/pkgs/by-name/dd/dd_rescue/package.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - version = "1.99.8"; + version = "1.99.21"; pname = "dd_rescue"; src = fetchurl { - sha256 = "1gbxm8gr9sx5g1q9dycs21hkxikcy97q09lp1lvs59pnd9qpdnwh"; + hash = "sha256-YB3gyUX/8dsFfIbGUWX5rvRuIa2q9E4LOCtEOz+z/bk="; url = "http://www.garloff.de/kurt/linux/ddrescue/${pname}-${version}.tar.bz2"; }; @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; homepage = "http://www.garloff.de/kurt/linux/ddrescue/"; license = licenses.gpl2Plus; + mainProgram = "dd_rescue"; }; } diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index e1604260e3c5..0d3316ffe133 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20250320"; + version = "20250504"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "sha256-KhZp0gGGK27hAtfAwuff7VI9Z3D4MtMxkNW6l6B56Xw="; + sha256 = "sha256-C0FpasSh1fKA8Xcm080dYKyXREQ0Ryy5YBknEiuiLcM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix index 353905fa0979..2df598aa57f6 100644 --- a/pkgs/by-name/dd/ddev/package.nix +++ b/pkgs/by-name/dd/ddev/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.24.4"; + version = "1.24.5"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-sd8Ux3zkKd9L2phv0dovWHSIpLS/OXCNwxTGGcvBQ3c="; + hash = "sha256-CyYGmxYJ5ef+H1qt0CiFcGOslBwkeHqdDQcmuqu4g9M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch b/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch index 3dcc79124ec3..20d1bc70e641 100644 --- a/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch +++ b/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch @@ -1,6 +1,6 @@ -From 3b1bcc92389e8468cd3790dfd223cb653b5f753f Mon Sep 17 00:00:00 2001 +From fae7504042bb5e3efe253476000d1b15523bd2d7 Mon Sep 17 00:00:00 2001 From: OPNA2608 -Date: Sun, 16 Mar 2025 19:56:39 +0100 +Date: Thu, 1 May 2025 15:57:02 +0200 Subject: [PATCH] Make findPath & its calls behave well with store - images is a cache of downloaded card images. @@ -8,14 +8,23 @@ Subject: [PATCH] Make findPath & its calls behave well with store - campaigns, cubes & constructed are user-downloaded files that set up possible game styles. create & populate them for the game, and tell it to not try to create them on its own. --- - index.js | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + index.js | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/index.js b/index.js -index 738bfca..3ac32e8 100755 +index 99f0697..492d096 100755 --- a/index.js +++ b/index.js -@@ -75,16 +75,16 @@ app.on('ready', () => { +@@ -8,6 +8,8 @@ const path = require('path'); + const fs = require('fs'); + app.commandLine.appendSwitch('disable-gpu-vsync'); //NVIDIA vsync patch //must be before whenready + ++const userCacheDir = path.normalize(process.env.HOME + "/.cache/ddm") ++ + app.on('ready', () => { + const mainWindow = new BrowserWindow({ + width: 1344, +@@ -61,16 +63,16 @@ app.on('ready', () => { const isDir = fs.statSync(fullPath).isDirectory(); if (containsDanger(fullPath)) throw new Error ("Dangerous files detected"); if (isDir) return fullPath; @@ -24,7 +33,7 @@ index 738bfca..3ac32e8 100755 else try { //dev - const fullPath = path.join(__dirname, folderName); -+ const fullPath = path.join(allowFolderCreation ? (process.env.HOME + "/.cache/ddm") : __dirname, folderName); ++ const fullPath = path.join(allowFolderCreation ? userCacheDir : __dirname, folderName); if (!fs.existsSync(fullPath) && allowFolderCreation) fs.mkdirSync(fullPath, {recursive: true}); const isDir = fs.statSync(fullPath).isDirectory(); console.log(fullPath) @@ -35,7 +44,16 @@ index 738bfca..3ac32e8 100755 } -@@ -108,7 +108,7 @@ app.on('ready', () => { +@@ -92,7 +94,7 @@ app.on('ready', () => { + path.join(basePath, "campaigns"), + path.join(basePath, "cubes"), + path.join(basePath, "constructed"), +- path.join(basePath, "images") ++ path.join(userCacheDir, "images") + ]; + + // Check if the directory is within allowed paths +@@ -117,7 +119,7 @@ app.on('ready', () => { try { if (!["campaigns", "cubes", "constructed"].includes(folderName)) throw new Error(`bad folder name ${folderName}`); @@ -44,7 +62,7 @@ index 738bfca..3ac32e8 100755 if (!fs.existsSync(folderPath)) fs.mkdirSync(folderPath); const files = fs.readdirSync(folderPath); if (folderName === "campaigns" ) return files.filter(file => fs.statSync (path.join(folderPath, file)).isDirectory()); -@@ -127,7 +127,7 @@ app.on('ready', () => { +@@ -136,7 +138,7 @@ app.on('ready', () => { ipcMain.handle('open-local-folder', async (event, folderName) => { if (!["campaigns", "cubes", "constructed"].includes(folderName)) throw new Error(`bad folder name ${constructed}`); diff --git a/pkgs/by-name/dd/ddm/package.nix b/pkgs/by-name/dd/ddm/package.nix index 5443a7b4beec..5d8e10e52412 100644 --- a/pkgs/by-name/dd/ddm/package.nix +++ b/pkgs/by-name/dd/ddm/package.nix @@ -16,11 +16,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "ddm"; - version = "4.0.0"; + version = "4.1.0"; src = requireFile { name = "DungeonDuelMonsters-linux-x64.zip"; - hash = "sha256-Ycy5Cbd4NR/TptVnl5wV154uA0JU0UzIRHTAi/xm0cs="; + hash = "sha256-gq2nGwpaStqaVI1pL63xygxOI/z53o+zLwiKizG98Ks="; url = "https://mikaygo.itch.io/ddm"; }; diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index 9f4ad6d0c392..8f49b6b9e41c 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "19.0"; + version = "19.2"; src = fetchFromGitHub { owner = "ddnet"; repo = "ddnet"; tag = version; - hash = "sha256-R9LXcYM96fibHzpXDWIOSASKIbh+GeiGyz7xVvV2v1Q="; + hash = "sha256-7moxTdoUTOpAHDT0LNNG6ccHeXKxd6ND+GRcgchWVSI="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix index 378c3ddfe77a..a5a9320038b8 100644 --- a/pkgs/by-name/dd/ddns-go/package.nix +++ b/pkgs/by-name/dd/ddns-go/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.9.1"; + version = "6.9.2"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-QGvXUYeT01+P843gBX+IJWTyPg0cPI9jZWh3tAcmEqE="; + hash = "sha256-78Y6kJWrF3EtbvLc5Jk+mNZQRfydcIPn4bw7tIUvGoY="; }; - vendorHash = "sha256-5XrwVIaQ2dMizx3Pj0dmLkpYwypUVnfxLNxmNsVhVzY="; + vendorHash = "sha256-RPYjw4G1jfsrge1eXKdQ6RdNL7srjagUY14GzXBJvpI="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/dd/ddosify/package.nix b/pkgs/by-name/dd/ddosify/package.nix index e77ce0e5c8b2..d94b7f286067 100644 --- a/pkgs/by-name/dd/ddosify/package.nix +++ b/pkgs/by-name/dd/ddosify/package.nix @@ -2,25 +2,28 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "ddosify"; - version = "1.0.6"; + version = "2.6.0"; src = fetchFromGitHub { owner = "ddosify"; repo = "ddosify"; - tag = "v${version}"; - hash = "sha256-5K/qXtdlDC09dEjRwYvoh9SapGLNmvywDMiNdwZDDTQ="; + tag = "selfhosted-${finalAttrs.version}"; + hash = "sha256-EPbpBCSaUVVhxGlj7gRqwHLuj5p6563iiARqkEjA6Rk="; }; vendorHash = "sha256-Wg4JzA2aEwNBsDrkauFUb9AS38ITLBGex9QHzDcdpoM="; + sourceRoot = "${finalAttrs.src.name}/ddosify_engine"; + ldflags = [ "-s" "-w" - "-X=main.GitVersion=${version}" + "-X=main.GitVersion=${finalAttrs.version}" "-X=main.GitCommit=unknown" "-X=main.BuildDate=unknown" ]; @@ -30,16 +33,16 @@ buildGoModule rec { doInstallCheck = true; - installCheckPhase = '' - $out/bin/ddosify -version | grep ${version} > /dev/null - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; - meta = with lib; { + versionCheckProgramArg = "-version"; + + meta = { description = "High-performance load testing tool, written in Golang"; mainProgram = "ddosify"; homepage = "https://ddosify.com/"; - changelog = "https://github.com/ddosify/ddosify/releases/tag/v${version}"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ bryanasdev000 ]; + changelog = "https://github.com/ddosify/ddosify/releases/tag/selfhosted-${finalAttrs.version}"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ bryanasdev000 ]; }; -} +}) diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix index 2468dd302b24..c4e42b702aa5 100644 --- a/pkgs/by-name/de/debase/package.nix +++ b/pkgs/by-name/de/debase/package.nix @@ -9,25 +9,15 @@ stdenv.mkDerivation rec { pname = "debase"; # NOTE: When updating version, also update commit hash in prePatch. - version = "2"; + version = "3"; - src = - (fetchFromGitHub { - owner = "toasterllc"; - repo = "debase"; - tag = "v${version}"; - hash = "sha256-6AavH8Ag+879ntcxJDbVgsg8V6U4cxwPQYPKvq2PpoQ="; - fetchSubmodules = true; - }).overrideAttrs - { - # Workaround to fetch git@github.com submodules. - # See https://github.com/NixOS/nixpkgs/issues/195117 - # - # Already fixed in latest upstream, so delete at next version bump. - GIT_CONFIG_COUNT = 1; - GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; - GIT_CONFIG_VALUE_0 = "git@github.com:"; - }; + src = fetchFromGitHub { + owner = "toasterllc"; + repo = "debase"; + tag = "v${version}"; + hash = "sha256-IOh5TlFHFhIaP5bpQHYzY4wwmQUdwKePmSzEM2qx8oE="; + fetchSubmodules = true; + }; prePatch = '' # xcrun is not available in the Darwin stdenv, but we don't need it anyway. @@ -36,18 +26,13 @@ stdenv.mkDerivation rec { # NOTE: Update this when updating version. substituteInPlace Makefile \ - --replace-fail 'git rev-parse HEAD' 'echo bbe9f1737ab229dd370640a4b5d5e742a051c13b' \ + --replace-fail 'git rev-parse HEAD' 'echo aa083074d67938d50336bd3737c960b038d91134' \ --replace-fail '$(GITHASHHEADER): .git/HEAD .git/index' '$(GITHASHHEADER):' ''; patches = [ # Ignore debase's vendored copy of libgit2 in favor of the nixpkgs version. ./ignore-vendored-libgit2.patch - # Already fixed in latest upstream, so delete at next version bump. - (fetchpatch { - url = "https://github.com/toasterllc/debase/commit/d483c5ac016ac2ef3600e93ae4022cd9d7781c83.patch"; - hash = "sha256-vVQMOEiLTd46+UknZm8Y197sjyK/kTK/M+9sRX9AssY="; - }) ]; buildInputs = [ @@ -78,8 +63,6 @@ stdenv.mkDerivation rec { meta = { description = "TUI for drag-and-drop manipulation of git commits"; homepage = "https://toaster.llc/debase"; - # The author has not yet specified a license. - # See https://github.com/toasterllc/debase/pull/4 license = lib.licenses.publicDomain; mainProgram = "debase"; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index 2d92cac2eea7..ec27b1091aba 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -27,13 +27,13 @@ let exec ''${EDITOR-${nano}/bin/nano} "$@" ''; in -stdenv.mkDerivation rec { - version = "2.23.5"; +stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; + version = "2.25.10"; src = fetchurl { - url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - hash = "sha256-j0fUVTS/lPKFdgeMhksiJz2+E5koB07IK2uEj55EWG0="; + url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz"; + hash = "sha256-pEzXrKV/bZbYG7j5QXjRDATZRGLt0fhdpwTDbCoKcus="; }; patches = [ @@ -45,15 +45,19 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace scripts/Makefile --replace /usr/share/dpkg ${dpkg}/share/dpkg - substituteInPlace scripts/debrebuild.pl --replace /usr/bin/perl ${perlPackages.perl}/bin/perl + substituteInPlace scripts/debrebuild.pl \ + --replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl" patchShebangs scripts + # Remove man7 target to avoid missing *.7 file error + substituteInPlace doc/Makefile \ + --replace-fail " install_man7" "" ''; nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ xz @@ -121,15 +125,14 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/${python.sitePackages}" \ --prefix PATH : "${dpkg}/bin" done - ln -s cvs-debi $out/bin/cvs-debc ln -s debchange $out/bin/dch ln -s pts-subscribe $out/bin/pts-unsubscribe ''; - meta = with lib; { + meta = { description = "Debian package maintenance scripts"; - license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; + license = lib.licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index c6b2c75d88f5..af377878b5f2 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.21"; + version = "5.22"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-wAVXZWSulhA1QlKi52eOlN86b05DAxeSTc4qd6UsJBM="; + hash = "sha256-TcPWQIgCSJWvJiePqEdRK2kju9xDpl6c9+VOagDsOhs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/debsigs/package.nix b/pkgs/by-name/de/debsigs/package.nix new file mode 100644 index 000000000000..ec3bc52be75d --- /dev/null +++ b/pkgs/by-name/de/debsigs/package.nix @@ -0,0 +1,34 @@ +{ + binutils, + lib, + perlPackages, + fetchFromGitLab, +}: + +perlPackages.buildPerlPackage rec { + pname = "debsigs"; + version = "0.2.2"; + + src = fetchFromGitLab { + owner = "debsigs"; + repo = "debsigs"; + tag = "release/${version}"; + hash = "sha256-gCc5JmmdhTAUQqkMOK/0YmlCRD0JcpemCpqusYmpoKU="; + }; + + sourceRoot = "${src.name}/perl"; + + postPatch = '' + substituteInPlace arf.pm \ + --replace-fail /usr/bin/ar ${binutils.bintools}/bin/ar + ''; + + meta = { + description = "Manipulate the cryptographic signatures stored inside a .deb file"; + mainProgram = "debsigs"; + homepage = "https://gitlab.com/debsigs/debsigs"; + changelog = "https://gitlab.com/debsigs/debsigs/-/tags/release/${version}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ usertam ]; + }; +} diff --git a/pkgs/by-name/de/decasify/package.nix b/pkgs/by-name/de/decasify/package.nix index e45007c8879e..23a8fe5f0883 100644 --- a/pkgs/by-name/de/decasify/package.nix +++ b/pkgs/by-name/de/decasify/package.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "decasify"; - version = "0.8.0"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/alerque/decasify/releases/download/v${finalAttrs.version}/decasify-${finalAttrs.version}.tar.zst"; - hash = "sha256-HTUAb/yL3H4B/n/Ecd/fDpnTYiqwco/E07sa6pFIIU4="; + hash = "sha256-XPl4HfhkwhHRkfc64BTafeHgLK1lB4UHKP6loLn5Ruc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-TywF5nh3ptA4a/wUSlSd7fzcuX4cA2OHT1MbcnjfMq0="; + hash = "sha256-rbFacCK/HU2D7QbVfMgKr9VevfutBJJtbXbKodTmkrc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix index 162c1b9a8aa5..dbfb975e1530 100644 --- a/pkgs/by-name/de/decibels/package.nix +++ b/pkgs/by-name/de/decibels/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitLab, + fetchurl, appstream, blueprint-compiler, desktop-file-utils, @@ -13,20 +13,15 @@ pkg-config, typescript, wrapGAppsHook4, - nix-update-script, + gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "decibels"; - version = "46.0"; + version = "48.0"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - group = "GNOME"; - owner = "Incubator"; - repo = "decibels"; - rev = version; - hash = "sha256-3LQQcrpmWrTfk8A8GR+KnxJEB1HGozgEsM+j5ECK8kc="; - fetchSubmodules = true; + src = fetchurl { + url = "mirror://gnome/sources/decibels/${lib.versions.major finalAttrs.version}/decibels-${finalAttrs.version}.tar.xz"; + hash = "sha256-IpsRqSYxR7y4w+If8NSvZZ+yYmL4rs5Uetz4xl4DH3Q="; }; nativeBuildInputs = [ @@ -60,16 +55,21 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { }; + updateScript = gnome.updateScript { + packageName = "decibels"; + }; }; meta = { description = "Play audio files"; - homepage = "https://gitlab.gnome.org/GNOME/Incubator/decibels"; - changelog = "https://gitlab.gnome.org/GNOME/Incubator/decibels/-/blob/main/NEWS?ref_type=tags"; + homepage = "https://gitlab.gnome.org/GNOME/decibels"; + changelog = "https://gitlab.gnome.org/GNOME/decibels/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.gpl3Only; - maintainers = lib.teams.gnome-circle.members; + teams = [ + lib.teams.gnome + lib.teams.gnome-circle + ]; mainProgram = "org.gnome.Decibels"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index 53412526e224..48b7c92f5a30 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "deck"; - version = "1.45.0"; + version = "1.47.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; tag = "v${version}"; - hash = "sha256-XIv1ql2PNhosFVlw9nfXcoTouTkIC3chtWLDjrsF0nY="; + hash = "sha256-k/cAybKJq/s5PcEMjT92dZlue9XpEeeHwICHk8ex3G8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -27,7 +27,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-bVHRzhie5OkuZ8MJ5LnXqr8R38exq5nwrU1w5gSfhVI="; + vendorHash = "sha256-nKKCz7T6HLCBwQjPV/kpzgtR8yNiZS/Ta0H1DlKaLk8="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/pkgs/by-name/de/decktape/package.nix b/pkgs/by-name/de/decktape/package.nix index 7f5a1bf304e0..6ab216c334fd 100644 --- a/pkgs/by-name/de/decktape/package.nix +++ b/pkgs/by-name/de/decktape/package.nix @@ -6,16 +6,16 @@ }: buildNpmPackage rec { name = "decktape"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "astefanutti"; repo = "decktape"; rev = "v${version}"; - hash = "sha256-V7JoYtwP7iQYFi/WhFpkELs7mNKF6CqrMyjWhxLkcTA="; + hash = "sha256-SsdjqkMEVD0pVgIZ9Upmrz/1KOWcb1KUy/v/xTCVGc0="; }; - npmDepsHash = "sha256-rahrIhB0GhqvzN2Vu6137Cywr19aQ70gVbNSSYzFD+s="; + npmDepsHash = "sha256-Z5fLGMvxVhM8nW81PQ5ZFPHK6m2uoYUv0A4XsTa3Z2Y="; npmPackFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; diff --git a/pkgs/by-name/de/deepsource/package.nix b/pkgs/by-name/de/deepsource/package.nix index 39f97281d73b..191076648a5a 100644 --- a/pkgs/by-name/de/deepsource/package.nix +++ b/pkgs/by-name/de/deepsource/package.nix @@ -49,7 +49,7 @@ buildGoModule rec { ''; doInstallCheck = true; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/de/defaultbrowser/package.nix b/pkgs/by-name/de/defaultbrowser/package.nix new file mode 100644 index 000000000000..a08d7aa2516c --- /dev/null +++ b/pkgs/by-name/de/defaultbrowser/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "defaultbrowser"; + version = "unstable-2020-07-23"; + + src = fetchFromGitHub { + owner = "kerma"; + repo = pname; + rev = "d2860c00dd7fbb5d615232cc819d7d492a6a6ddb"; + sha256 = "sha256-SelUQXoKtShcDjq8uKg3wM0kG2opREa2DGQCDd6IsOQ="; + }; + + makeFlags = [ + "CC=cc" + "PREFIX=$(out)" + ]; + + meta = with lib; { + mainProgram = "defaultbrowser"; + description = "Command line tool for getting and setting a default browser (HTTP handler) in Mac OS X"; + homepage = "https://github.com/kerma/defaultbrowser"; + platforms = platforms.darwin; + maintainers = [ ]; + license = licenses.mit; + }; +} diff --git a/pkgs/by-name/de/degit-rs/Cargo.lock b/pkgs/by-name/de/degit-rs/Cargo.lock new file mode 100644 index 000000000000..92e788be0291 --- /dev/null +++ b/pkgs/by-name/de/degit-rs/Cargo.lock @@ -0,0 +1,1875 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi 0.3.9", +] + +[[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 0.3.9", +] + +[[package]] +name = "autocfg" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +dependencies = [ + "autocfg 1.4.0", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets", +] + +[[package]] +name = "base64" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +dependencies = [ + "byteorder", + "either", + "iovec", +] + +[[package]] +name = "cc" +version = "1.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" +dependencies = [ + "shlex", +] + +[[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 = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "colored" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" +dependencies = [ + "is-terminal", + "lazy_static", + "winapi 0.3.9", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "cookie" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" +dependencies = [ + "time", + "url 1.7.2", +] + +[[package]] +name = "cookie_store" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" +dependencies = [ + "cookie", + "failure", + "idna 0.1.5", + "log", + "publicsuffix", + "serde", + "serde_json", + "time", + "try_from", + "url 1.7.2", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam-deque" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ + "autocfg 1.4.0", + "cfg-if 0.1.10", + "crossbeam-utils", + "lazy_static", + "maybe-uninit", + "memoffset", + "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", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ + "autocfg 1.4.0", + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "degit" +version = "0.1.3" +dependencies = [ + "clap", + "colored", + "flate2", + "indicatif", + "regex", + "reqwest", + "tar", +] + +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "filetime" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "libredox", + "windows-sys 0.59.0", +] + +[[package]] +name = "flate2" +version = "1.0.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding 2.3.1", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags 1.3.2", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + +[[package]] +name = "futures-cpupool" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" +dependencies = [ + "futures", + "num_cpus", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "h2" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" +dependencies = [ + "byteorder", + "bytes", + "fnv", + "futures", + "http", + "indexmap", + "log", + "slab", + "string", + "tokio-io", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "http" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" +dependencies = [ + "bytes", + "fnv", + "itoa 0.4.8", +] + +[[package]] +name = "http-body" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" +dependencies = [ + "bytes", + "futures", + "http", + "tokio-buf", +] + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "hyper" +version = "0.12.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" +dependencies = [ + "bytes", + "futures", + "futures-cpupool", + "h2", + "http", + "http-body", + "httparse", + "iovec", + "itoa 0.4.8", + "log", + "net2", + "rustc_version", + "time", + "tokio", + "tokio-buf", + "tokio-executor", + "tokio-io", + "tokio-reactor", + "tokio-tcp", + "tokio-threadpool", + "tokio-timer", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" +dependencies = [ + "bytes", + "futures", + "hyper", + "native-tls", + "tokio-io", +] + +[[package]] +name = "idna" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg 1.4.0", + "hashbrown", +] + +[[package]] +name = "indicatif" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c60da1c9abea75996b70a931bba6c750730399005b61ccd853cee50ef3d0d0c" +dependencies = [ + "console", + "lazy_static", + "number_prefix", + "parking_lot 0.12.3", + "regex", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.161" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.5.7", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg 1.4.0", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[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.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +dependencies = [ + "autocfg 1.4.0", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "net2" +version = "0.2.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg 1.4.0", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf9993e59c894e3c08aa1c2712914e9e6bf1fcbfc6bef283e2183df345a4fee" +dependencies = [ + "num-traits", +] + +[[package]] +name = "object" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "openssl" +version = "0.10.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags 2.6.0", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.86", +] + +[[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.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "parking_lot" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" +dependencies = [ + "lock_api 0.3.4", + "parking_lot_core 0.6.3", + "rustc_version", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api 0.4.12", + "parking_lot_core 0.9.10", +] + +[[package]] +name = "parking_lot_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66b810a62be75176a80873726630147a5ca780cd33921e0b5709033e66b0a" +dependencies = [ + "cfg-if 0.1.10", + "cloudabi", + "libc", + "redox_syscall 0.1.57", + "rustc_version", + "smallvec 0.6.14", + "winapi 0.3.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.5.7", + "smallvec 1.13.2", + "windows-targets", +] + +[[package]] +name = "percent-encoding" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "proc-macro2" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "publicsuffix" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" +dependencies = [ + "idna 0.2.3", + "url 2.5.2", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.8", + "libc", + "rand_chacha", + "rand_core 0.4.2", + "rand_hc", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift", + "winapi 0.3.9", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.3.1", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi 0.3.9", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi 0.3.9", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "reqwest" +version = "0.9.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" +dependencies = [ + "base64", + "bytes", + "cookie", + "cookie_store", + "encoding_rs", + "flate2", + "futures", + "http", + "hyper", + "hyper-tls", + "log", + "mime", + "mime_guess", + "native-tls", + "serde", + "serde_json", + "serde_urlencoded", + "time", + "tokio", + "tokio-executor", + "tokio-io", + "tokio-threadpool", + "tokio-timer", + "url 1.7.2", + "uuid", + "winreg", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[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.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.214" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.214" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.86", +] + +[[package]] +name = "serde_json" +version = "1.0.132" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +dependencies = [ + "itoa 1.0.11", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" +dependencies = [ + "dtoa", + "itoa 0.4.8", + "serde", + "url 1.7.2", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg 1.4.0", +] + +[[package]] +name = "smallvec" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +dependencies = [ + "maybe-uninit", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "string" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" +dependencies = [ + "bytes", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "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.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "tar" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi", + "winapi 0.3.9", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +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 = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" +dependencies = [ + "bytes", + "futures", + "mio", + "num_cpus", + "tokio-current-thread", + "tokio-executor", + "tokio-io", + "tokio-reactor", + "tokio-tcp", + "tokio-threadpool", + "tokio-timer", +] + +[[package]] +name = "tokio-buf" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" +dependencies = [ + "bytes", + "either", + "futures", +] + +[[package]] +name = "tokio-current-thread" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" +dependencies = [ + "futures", + "tokio-executor", +] + +[[package]] +name = "tokio-executor" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" +dependencies = [ + "crossbeam-utils", + "futures", +] + +[[package]] +name = "tokio-io" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" +dependencies = [ + "bytes", + "futures", + "log", +] + +[[package]] +name = "tokio-reactor" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" +dependencies = [ + "crossbeam-utils", + "futures", + "lazy_static", + "log", + "mio", + "num_cpus", + "parking_lot 0.9.0", + "slab", + "tokio-executor", + "tokio-io", + "tokio-sync", +] + +[[package]] +name = "tokio-sync" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" +dependencies = [ + "fnv", + "futures", +] + +[[package]] +name = "tokio-tcp" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" +dependencies = [ + "bytes", + "futures", + "iovec", + "mio", + "tokio-io", + "tokio-reactor", +] + +[[package]] +name = "tokio-threadpool" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" +dependencies = [ + "crossbeam-deque", + "crossbeam-queue", + "crossbeam-utils", + "futures", + "lazy_static", + "log", + "num_cpus", + "slab", + "tokio-executor", +] + +[[package]] +name = "tokio-timer" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" +dependencies = [ + "crossbeam-utils", + "futures", + "slab", + "tokio-executor", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "try_from" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" +dependencies = [ + "cfg-if 0.1.10", +] + +[[package]] +name = "unicase" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" + +[[package]] +name = "unicode-bidi" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "url" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +dependencies = [ + "idna 0.1.5", + "matches", + "percent-encoding 1.0.1", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding 2.3.1", +] + +[[package]] +name = "uuid" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" +dependencies = [ + "rand", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "want" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" +dependencies = [ + "futures", + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winreg" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] diff --git a/pkgs/by-name/de/degit-rs/package.nix b/pkgs/by-name/de/degit-rs/package.nix new file mode 100644 index 000000000000..dad20fb12e8d --- /dev/null +++ b/pkgs/by-name/de/degit-rs/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage { + pname = "degit-rs"; + version = "0.1.2-unstable-2021-09-22"; + + src = fetchFromGitHub { + owner = "psnszsn"; + repo = "degit-rs"; + rev = "c7dbeb75131510a79400838e081b90665c654c80"; + hash = "sha256-swyfKnYQ+I4elnDnJ0yPDUryiFXEVnrGt9xHWiEe6wo="; + }; + + # The source repo doesn't provide a Cargo.lock file, so we need to create one + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + cargoLock.lockFile = ./Cargo.lock; + + cargoHash = "sha256-bUoZsXU7iWK7MZ/hXk1JNUX1hN88lrU1mc1rrYuiCYs="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + # The test suite is not working for it requires a network connection, + # so we disable it + doCheck = false; + + meta = { + description = "Rust rewrite of degit"; + homepage = "https://github.com/psnszsn/degit-rs"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + mainProgram = "degit"; + maintainers = with lib.maintainers; [ chillcicada ]; + }; +} diff --git a/pkgs/by-name/de/dehydrated/package.nix b/pkgs/by-name/de/dehydrated/package.nix index 236b71c8c29a..521404cd8098 100644 --- a/pkgs/by-name/de/dehydrated/package.nix +++ b/pkgs/by-name/de/dehydrated/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "dehydrated"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "lukas2511"; repo = "dehydrated"; rev = "v${version}"; - sha256 = "sha256-K08eeruyT5vKzK3PzfCkubZiHbf9Yq7wzD1z69MeDtY="; + sha256 = "sha256-xDDYqP6oxJt0NPgHtHV1xQKUxVc8JQxWekXwxezggtE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix index 0c7d6883db31..056172d876fc 100644 --- a/pkgs/by-name/de/deja-dup/package.nix +++ b/pkgs/by-name/de/deja-dup/package.nix @@ -90,7 +90,8 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://apps.gnome.org/DejaDup/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jtojnar ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ jtojnar ]; + teams = [ teams.gnome-circle ]; platforms = platforms.linux; mainProgram = "deja-dup"; }; diff --git a/pkgs/by-name/de/dell-command-configure/package.nix b/pkgs/by-name/de/dell-command-configure/package.nix index d7df3dcf31ea..207eb1cf891a 100644 --- a/pkgs/by-name/de/dell-command-configure/package.nix +++ b/pkgs/by-name/de/dell-command-configure/package.nix @@ -1,6 +1,6 @@ { - stdenv, lib, + stdenv, fetchurl, dpkg, autoPatchelfHook, @@ -17,20 +17,20 @@ # the dependencies from other pkgs. let - version = "4.11.0-6"; + version = "5.1.0-6"; - unpacked = stdenv.mkDerivation rec { + unpacked = stdenv.mkDerivation (finalAttrs: { inherit version; pname = "dell-command-configure-unpacked"; src = fetchurl { urls = [ - "https://dl.dell.com/FOLDER10469726M/1/command-configure_${version}.ubuntu22_amd64.tar.gz" - "https://web.archive.org/web/20240228233129/https://dl.dell.com/FOLDER10469726M/1/command-configure_4.11.0-6.ubuntu22_amd64.tar.gz" + "https://dl.dell.com/FOLDER12705845M/1/command-configure_${version}.ubuntu24_amd64.tar.gz" + "https://web.archive.org/web/20250421172156/https://dl.dell.com/FOLDER12705845M/1/command-configure_5.1.0-6.ubuntu24_amd64.tar.gz" ]; # The CDN blocks the Curl user-agent, so set to blank instead. curlOpts = ''-A=""''; - hash = "sha256-Bwa4sYguYwEBKEJSP3wzHhzjuDeaGQN8fKeooWHX18E="; + hash = "sha256-MM6Djkz/VuVCLHGEji88Xq0vIV+AfqQkjNXz4zqFOtw="; }; dontBuild = true; @@ -38,8 +38,8 @@ let nativeBuildInputs = [ dpkg ]; unpackPhase = '' - tar -xzf ${src} - dpkg-deb -x command-configure_${version}.ubuntu22_amd64.deb command-configure + tar -xzf ${finalAttrs.src} + dpkg-deb -x command-configure_${version}.ubuntu24_amd64.deb command-configure dpkg-deb -x srvadmin-hapi_9.5.0_amd64.deb srvadmin-hapi ''; @@ -47,7 +47,7 @@ let mkdir $out cp -r . $out ''; - }; + }); # Contains a fopen() wrapper for finding the firmware package wrapperLibName = "wrapper-lib.so"; @@ -74,16 +74,20 @@ stdenv.mkDerivation { inherit version; pname = "dell-command-configure"; + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ openssl (lib.getLib stdenv.cc.cc) ]; - nativeBuildInputs = [ autoPatchelfHook ]; + dontConfigure = true; src = unpacked; installPhase = '' + runHook preInstall + install -D -t $out/lib -m644 -v command-configure/opt/dell/dcc/libhapiintf.so install -D -t $out/lib -m644 -v command-configure/opt/dell/dcc/libsmbios_c.so.2 install -D -t $out/bin -m755 -v command-configure/opt/dell/dcc/cctk @@ -91,6 +95,8 @@ stdenv.mkDerivation { for lib in $(find srvadmin-hapi/opt/dell/srvadmin/lib64 -type l); do install -D -t $out/lib -m644 -v $lib done + + runHook postInstall ''; postFixup = '' @@ -104,11 +110,11 @@ stdenv.mkDerivation { $out/lib/* ''; - meta = with lib; { + meta = { description = "Configure BIOS settings on Dell laptops"; homepage = "https://www.dell.com/support/article/us/en/19/sln311302/dell-command-configure"; - license = licenses.unfree; - maintainers = with maintainers; [ ryangibb ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ ryangibb ]; platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index fe157f31fea3..42759cc723a5 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -12,7 +12,6 @@ python3, rustPlatform, stdenv, - darwin, testers, deltachat-desktop, yq, @@ -20,17 +19,17 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "1.157.3"; + version = "1.159.4"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-J9Tm35xuyIbHH2HGcctENYbArIlRWe7xzKyF3hGbwNA="; + hash = "sha256-OLE3BoQNgpOHYuMUFBmk+raXimJGOsXySkfP+UTDk/8="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-BX0TpyG2OJkD5BUIPCij5/g3aRf6FuF9E8y9GM12o7U="; + hash = "sha256-+h93tSiKxnnNXPGk7elMQrcIuw3G/j2/gugqSbqOrDw="; }; }; electron = electron_34; @@ -38,18 +37,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "1.56.0"; + version = "1.58.2"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-XkA1WOMLe0+Fz0wE54KSZWeN+rRqT0TE1PXDppPm6SI="; + hash = "sha256-JYuYuv+OmAQzdw2AM0Qn0Z0+qq8G1JrW5jl2MI21x6M="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-4VvJNpuO7P6m6BBxBWFebtRsXvqkjdAjmnBwxG+qNns="; + hash = "sha256-pW8SKplbXLQ5OWLOrG36aAnP/j0y9QaYGIg+Q2/Ulfk="; }; nativeBuildInputs = @@ -65,10 +64,6 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; VERSION_INFO_GIT_REF = finalAttrs.src.tag; @@ -116,6 +111,8 @@ stdenv.mkDerivation (finalAttrs: { --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 + install -Dt "$out/share/icons/hicolor/scalable/apps" images/tray/deltachat.svg + runHook postInstall ''; diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix index 7b2d061fe88a..d2dfbb4ce306 100644 --- a/pkgs/by-name/de/deltatouch/package.nix +++ b/pkgs/by-name/de/deltatouch/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "deltatouch"; - version = "1.10.2"; + version = "1.14.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lk108"; repo = "deltatouch"; rev = "v${finalAttrs.version}"; - hash = "sha256-QcrBo7lrMYkOZGSyS5fLAwNxZwKFrylU5P5my2Jl93k="; + hash = "sha256-vumMAMm9+dKlmi5a6ehIDePpQKkco/smYSM1K/QiXu4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/delve/package.nix b/pkgs/by-name/de/delve/package.nix index 686df217888b..6b7e51b078e9 100644 --- a/pkgs/by-name/de/delve/package.nix +++ b/pkgs/by-name/de/delve/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "delve"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - hash = "sha256-QAFCJ5oQYHDXrNLptRdAWzzbX6J9XVgnmsB3eZ3Lko8="; + hash = "sha256-BFezzZpkF88xYsOcn3pI2zsH+OTRLvuwqa3CaU9Fk44="; }; vendorHash = null; diff --git a/pkgs/by-name/de/dendrite/package.nix b/pkgs/by-name/de/dendrite/package.nix index b7c61341a7b3..6ac13b00831c 100644 --- a/pkgs/by-name/de/dendrite/package.nix +++ b/pkgs/by-name/de/dendrite/package.nix @@ -70,7 +70,7 @@ buildGoModule rec { description = "Second-generation Matrix homeserver written in Go"; changelog = "https://github.com/element-hq/dendrite/releases/tag/v${version}"; license = licenses.agpl3Plus; - maintainers = teams.matrix.members; + teams = [ teams.matrix ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/de/deno/librusty_v8.nix b/pkgs/by-name/de/deno/librusty_v8.nix index 68c42657c851..fbd9f29aac67 100644 --- a/pkgs/by-name/de/deno/librusty_v8.nix +++ b/pkgs/by-name/de/deno/librusty_v8.nix @@ -2,11 +2,11 @@ { fetchLibrustyV8 }: fetchLibrustyV8 { - version = "135.0.0"; + version = "135.1.0"; shas = { - x86_64-linux = "sha256-jA/cUjzT3KhpBGFyxZSp61X05PhD6XKAGtZyKdnts7U="; - aarch64-linux = "sha256-+jqLUIv96994e1fFJcYCQNJJ8smF18sU76lq0sirszo="; - x86_64-darwin = "sha256-atemob6PgxMncD4F+b5mfleTHSTMdKvJAwFD9ul/eJ4="; - aarch64-darwin = "sha256-0fDaHgvUTDFKEhQp7WaNe+54e3+GScGO5+8+Qa89nLQ="; + x86_64-linux = "sha256-QGpFNkVHO9j4uagYNC5X3JVif80RVazp63oqrdWYUoU="; + aarch64-linux = "sha256-J4E32qZNyqmJyFKBuU+6doRYL3ZSaEMSBlML+hSkj+o="; + x86_64-darwin = "sha256-UnulsDS1LlrVR2+cz+4zgWxKqbkB5ch3T9UofGCZduQ="; + aarch64-darwin = "sha256-mU7N/1vXzCP+mwjzLTsDkT+8YOJifwNju3Rv9Cq5Loo="; }; } diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index a63f31cb5090..b5725fdb7b62 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, rustPlatform, cmake, + yq, protobuf, installShellFiles, librusty_v8 ? callPackage ./librusty_v8.nix { @@ -18,39 +19,37 @@ let canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "deno"; - version = "2.2.6"; + version = "2.2.12"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; - tag = "v${version}"; - hash = "sha256-Ner3178YukKKqMVQAGpU3bE+fxo9UXrRPp7iqCFSUjs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/5KCwWyPdx/OKjoKgHZ8BAih7dh21VrbC+N1U74B/KI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dakHDPGv7trd2Kib9Hk5jHZHR3pzk1YIyJW/0uY6WSg="; + cargoHash = "sha256-3I1yplJjVH7Mf2wjwk8qSdbHTcR20QSJGF9MHtnu+q8="; postPatch = '' # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857 - substituteInPlace Cargo.toml --replace-fail "libffi = \"=3.2.0\"" "libffi = { version = \"3.2.0\", features = [\"system\"] }" + tomlq -ti '.workspace.dependencies.libffi = { "version": .workspace.dependencies.libffi, "features": ["system"] }' Cargo.toml ''; # uses zlib-ng but can't dynamically link yet # https://github.com/rust-lang/libz-sys/issues/158 - nativeBuildInputs = - [ - rustPlatform.bindgenHook - # required by libz-ng-sys crate - cmake - # required by deno_kv crate - protobuf - installShellFiles - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - lld - ]; + nativeBuildInputs = [ + rustPlatform.bindgenHook + # for tomlq to adjust Cargo.toml + yq + # required by libz-ng-sys crate + cmake + # required by deno_kv crate + protobuf + installShellFiles + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; configureFlags = lib.optionals stdenv.cc.isClang [ # This never worked with clang, but became a hard error recently: https://github.com/llvm/llvm-project/commit/3d5b610c864c8f5980eaa16c22b71ff1cf462fae @@ -89,7 +88,7 @@ rustPlatform.buildRustPackage rec { installCheckPhase = lib.optionalString canExecute '' runHook preInstallCheck $out/bin/deno --help - $out/bin/deno --version | grep "deno ${version}" + $out/bin/deno --version | grep "deno ${finalAttrs.version}" runHook postInstallCheck ''; @@ -98,7 +97,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://deno.land/"; - changelog = "https://github.com/denoland/deno/releases/tag/v${version}"; + changelog = "https://github.com/denoland/deno/releases/tag/v${finalAttrs.version}"; description = "Secure runtime for JavaScript and TypeScript"; longDescription = '' Deno aims to be a productive and secure scripting environment for the modern programmer. @@ -122,4 +121,4 @@ rustPlatform.buildRustPackage rec { "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index c83fdb474c9e..4d04b29dd1b2 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -11,27 +11,29 @@ }: let pname = "dependabot-cli"; - version = "1.57.0"; + version = "1.64.0"; # vv Also update this vv tag = "nixpkgs-dependabot-cli-${version}"; + updateJobProxy = dockerTools.pullImage { imageName = "ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy"; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag} - imageDigest = "sha256:cc4a9b7db8ddf3924b6c25cc8a74d9937bf803e64733035809862a1c0a6df984"; - sha256 = "0wkr0rac7dp1080s4zik5yzi5967gkfylly2148ipgw50sp0sq8s"; + imageDigest = "sha256:3030ba5ff8f556e47016fca94d81c677b5c6abde99fef228341e1537588e503a"; + hash = "sha256-RiXUae5ONScoDu85L6BEf3T4JodBYha6v+d9kWl8oWc="; # Don't update this, it's used to refer to the imported image later finalImageName = "dependabot-update-job-proxy"; finalImageTag = tag; }; + updaterGitHubActions = dockerTools.pullImage { imageName = "ghcr.io/dependabot/dependabot-updater-github-actions"; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag} - imageDigest = "sha256:6665b3e26ef97577e83f2dfd0007a73c02b003126e72c0b4b196fe570088ed93"; - sha256 = "0q7w3yp49wb70gkjjl2syvs75hm1jkva2qslzckwxh73z0kq2z0q"; + imageDigest = "sha256:a356576adbec11bc34b142b6ef69a5856a09dc3654bdc9f9b046c08ee2d73ff8"; + hash = "sha256-zqydb2v39xiSBT5ayWEacD0NIH6LoFX8lkRcCKppH08="; # Don't update this, it's used to refer to the imported image later finalImageName = "dependabot-updater-github-actions"; @@ -45,10 +47,10 @@ buildGoModule { owner = "dependabot"; repo = "cli"; rev = "v${version}"; - hash = "sha256-ZT1fwDT19uUjp5iG0NLSrc/6PLW/sukAd0w66mLdFVg="; + hash = "sha256-NcmDYCXdhMY1KFz3if0XlX4EisQFr0YhJItllXnOfaA="; }; - vendorHash = "sha256-jSINiETadd0ixzFBilgphi1vJNsRYeDkbaVNk5stTp4="; + vendorHash = "sha256-pnB1SkuEGm0KfkDfjnoff5fZRsAgD5w2H4UwsD3Jlbo="; ldflags = [ "-s" @@ -104,7 +106,6 @@ buildGoModule { homepage = "https://github.com/dependabot/cli"; license = licenses.mit; maintainers = with maintainers; [ - l0b0 infinisil ]; }; diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix index b710995a1173..6c342f3ac380 100644 --- a/pkgs/by-name/de/dependency-track/package.nix +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -12,7 +12,7 @@ nixosTests, }: let - version = "4.12.7"; + version = "4.13.2"; frontend = buildNpmPackage { pname = "dependency-track-frontend"; @@ -25,7 +25,7 @@ let owner = "DependencyTrack"; repo = "frontend"; rev = version; - hash = "sha256-JuZM/IJd+6xtiC2Tq4ecArmT24D1m8J719UZG+iP2s0="; + hash = "sha256-HshphdOvJMRdMWYNc+nOkoFGA9Rr+N7+Gs8THBZjKTM="; }; installPhase = '' @@ -33,7 +33,7 @@ let cp -R ./dist $out/ ''; - npmDepsHash = "sha256-5kLtdEM0tI02ufsmJNCfZkuEJdp6wBWlGiELJ87YOyQ="; + npmDepsHash = "sha256-u5yVJlW9LhptyHQddd1RCBgU/xNdSNX5FAmSEj6n7Ng="; forceGitDeps = true; makeCacheWritable = true; @@ -50,7 +50,7 @@ maven.buildMavenPackage rec { owner = "DependencyTrack"; repo = "dependency-track"; rev = version; - hash = "sha256-GcA6Vv3H0gujkRYxipLg9ydk/HorNzwWkEAjKnMrHro="; + hash = "sha256-4A34lt6M0M1+HPGFFqH/Ik07FBNz6pI0XYiW9rIVsOk="; }; patches = [ @@ -65,7 +65,7 @@ maven.buildMavenPackage rec { ''; mvnJdk = jre_headless; - mvnHash = "sha256-4BqLasUTPa1cfLLNp7D2yGBbLe5K2EppxJoFJ+mx8cA="; + mvnHash = "sha256-V0EhfPN8htR4v/KQpQ9tec6dAe/FOxBCp8cUZqL7mFo="; manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ]; buildOffline = true; @@ -120,7 +120,7 @@ maven.buildMavenPackage rec { description = "Intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain"; homepage = "https://github.com/DependencyTrack/dependency-track"; license = lib.licenses.asl20; - maintainers = lib.teams.cyberus.members; + teams = [ lib.teams.cyberus ]; mainProgram = "dependency-track"; inherit (jre_headless.meta) platforms; }; diff --git a/pkgs/by-name/de/deploy-rs/package.nix b/pkgs/by-name/de/deploy-rs/package.nix index f5f9e30197a2..e618554e01b5 100644 --- a/pkgs/by-name/de/deploy-rs/package.nix +++ b/pkgs/by-name/de/deploy-rs/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage { @@ -20,11 +18,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-e+Exc0lEamAieZ7QHJBYvmnmM/9YHdLRD3La4U5FRMo="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - meta = { description = "Multi-profile Nix-flake deploy tool"; homepage = "https://github.com/serokell/deploy-rs"; diff --git a/pkgs/by-name/de/depotdownloader/deps.json b/pkgs/by-name/de/depotdownloader/deps.json index 35ed0aaca6c4..1eaf8335e93a 100644 --- a/pkgs/by-name/de/depotdownloader/deps.json +++ b/pkgs/by-name/de/depotdownloader/deps.json @@ -11,8 +11,8 @@ }, { "pname": "Microsoft.Windows.CsWin32", - "version": "0.3.106", - "hash": "sha256-S1uQa684taPb6uh69784ebVpXoirMoX+pxBRA+Rrzlg=" + "version": "0.3.183", + "hash": "sha256-bn0rHYoVLRTqiZqkkp6u3PMKtg0NNxA2F++1e/+3Jhw=" }, { "pname": "Microsoft.Windows.SDK.Win32Docs", @@ -21,23 +21,23 @@ }, { "pname": "Microsoft.Windows.SDK.Win32Metadata", - "version": "60.0.34-preview", - "hash": "sha256-KdRe73sXipzMvm2BLmwwBZGh+l9isZDC9l8WFyUR1zM=" + "version": "61.0.15-preview", + "hash": "sha256-OB60ThIv8e7AMGaRRzJ8dWme5HjN+Q0HoUDquP2ejTg=" }, { "pname": "Microsoft.Windows.WDK.Win32Metadata", - "version": "0.11.4-experimental", - "hash": "sha256-b3oKUKbr+3Udfl7RWzUY9BR/XWNsN+VmEkBxk6KiFo0=" + "version": "0.12.8-experimental", + "hash": "sha256-YaN6JlgnpIooLYu3NdFVHwoqFwZYTeePtekXCfTiLTo=" }, { "pname": "protobuf-net", - "version": "3.2.45", - "hash": "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA=" + "version": "3.2.52", + "hash": "sha256-phXeroBt5KbHYkApkkMa0mRCVkDY+dtOOXXNY+i50Ek=" }, { "pname": "protobuf-net.Core", - "version": "3.2.45", - "hash": "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ=" + "version": "3.2.52", + "hash": "sha256-/9Jj26tuSKeYJb9udwew5i5EVvaoeNu/vBCKS0VhSQQ=" }, { "pname": "QRCoder", @@ -46,18 +46,13 @@ }, { "pname": "SteamKit2", - "version": "3.0.1", - "hash": "sha256-OnfUEPSEE9J6oTO1NFsa1MJRWvEH5MDR1wsGedKGzgI=" - }, - { - "pname": "System.Collections.Immutable", - "version": "7.0.0", - "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + "version": "3.2.0", + "hash": "sha256-hB/36fP9kf+1mIx+hTELUMHe8ZkmSKxOK41ZzOaBa3E=" }, { "pname": "System.IO.Hashing", - "version": "9.0.0", - "hash": "sha256-k6Pdndm5fTD6CB1QsQfP7G+2h4B30CWIsuvjHuBg3fc=" + "version": "9.0.4", + "hash": "sha256-rbcQzEncB3VuUZIcsE1tq30suf5rvRE4HkE+0lR/skU=" }, { "pname": "System.Security.AccessControl", @@ -68,5 +63,10 @@ "pname": "System.Security.Principal.Windows", "version": "5.0.0", "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "ZstdSharp.Port", + "version": "0.8.5", + "hash": "sha256-+UQFeU64md0LlSf9nMXif6hHnfYEKm+WRyYd0Vo2QvI=" } ] diff --git a/pkgs/by-name/de/depotdownloader/package.nix b/pkgs/by-name/de/depotdownloader/package.nix index 809c32023cb0..4d9c6020eac8 100644 --- a/pkgs/by-name/de/depotdownloader/package.nix +++ b/pkgs/by-name/de/depotdownloader/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "depotdownloader"; - version = "3.0.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "SteamRE"; repo = "DepotDownloader"; rev = "DepotDownloader_${version}"; - hash = "sha256-QfnSs8pmWq/+64XdJskYxmUDKbHCnhA6Xd8VrTUaeJE="; + hash = "sha256-zduNWIQi+ItNSh9RfRfY0giIw/tMQIMRh9woUzQ5pJw="; }; projectFile = "DepotDownloader.sln"; diff --git a/pkgs/by-name/de/descent3-unwrapped/package.nix b/pkgs/by-name/de/descent3-unwrapped/package.nix index d97165bd9093..96619f708e72 100644 --- a/pkgs/by-name/de/descent3-unwrapped/package.nix +++ b/pkgs/by-name/de/descent3-unwrapped/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { # the wrapped version of Descent 3. Once there’s a stable version of Descent # 3 that supports the -additionaldir command-line option, we can stop using # an unstable version of Descent 3. - version = "1.5.0-beta-unstable-2025-03-22"; + version = "1.5.0-beta-unstable-2025-05-08"; src = fetchFromGitHub { owner = "DescentDevelopers"; repo = "Descent3"; - rev = "55827d453f835df944b7071ed336ba6a5c30a976"; + rev = "72cca136162ccff6d738693d109e29568de90ebb"; leaveDotGit = true; # Descent 3 is supposed to display its Git commit hash in the bottom right # corner of the main menu. That feature only works if either the .git @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { git rev-parse --verify HEAD | tr --delete '\n' > git-hash.txt rm -r .git ''; - hash = "sha256-RZCkApFwbBtAnBWimupsaTcItwAWNJCntIu6S0UOcyU="; + hash = "sha256-IcOSYIBqkk1e8NlPc4srr9glxWA4p0FY0QDAWb1Hb6I="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix index c2fe3d22ce30..9418d41ab034 100644 --- a/pkgs/by-name/de/deskflow/package.nix +++ b/pkgs/by-name/de/deskflow/package.nix @@ -29,17 +29,18 @@ lerc, doxygen, writableTmpDirAsHomeHook, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "deskflow"; - version = "1.20.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "deskflow"; repo = "deskflow"; - tag = "v${version}"; - hash = "sha256-lX8K7HuC/Sxa5M0h+r5NmdFf032nVrE9JF6H+IBWPUA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-gXFBn8hlI8MZ9Vy3goPjosn0JgvaAgZaFIGh/3rFdx8="; }; postPatch = '' @@ -106,15 +107,17 @@ stdenv.mkDerivation rec { runHook postCheck ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/deskflow/deskflow"; description = "Share one mouse and keyboard between multiple computers on Windows, macOS and Linux"; mainProgram = "deskflow"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ flacks ]; license = with lib; [ licenses.gpl2Plus licenses.openssl ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix index df1eeece456a..ba20cccd88d9 100644 --- a/pkgs/by-name/de/detect-it-easy/package.nix +++ b/pkgs/by-name/de/detect-it-easy/package.nix @@ -51,9 +51,8 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/icons ''; - # clean up wrongly created dirs in `install.sh` and broken .desktop file postInstall = '' - grep -v "Version=#VERSION#" $src/LINUX/die.desktop > $out/share/applications/die.desktop + cp -r $src/XYara/yara_rules $out/lib/die/ ''; meta = { diff --git a/pkgs/by-name/de/detox/package.nix b/pkgs/by-name/de/detox/package.nix index 8ce5c3496ccb..aa4aa5db4ef2 100644 --- a/pkgs/by-name/de/detox/package.nix +++ b/pkgs/by-name/de/detox/package.nix @@ -4,39 +4,47 @@ fetchFromGitHub, flex, autoreconfHook, + automake, + autoconf-archive, + libtool, + pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "detox"; - version = "1.4.5"; + version = "2.0.0"; src = fetchFromGitHub { owner = "dharple"; repo = "detox"; - rev = "v${version}"; - hash = "sha256-cTuK5EIimRVZ1nfuTa1ds6xrawYIAbwNNIkNONd9y4Q="; + tag = "v${finalAttrs.version}"; + hash = "sha256-MMzkUh3xyyChOI1Y/mQKjnxL439mntKiMVYXuW8cPWI="; }; nativeBuildInputs = [ flex autoreconfHook + automake + autoconf-archive + libtool + pkg-config ]; hardeningDisable = [ "format" ]; - meta = with lib; { + meta = { homepage = "https://github.com/dharple/detox"; description = "Utility designed to clean up filenames"; - changelog = "https://github.com/dharple/detox/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/dharple/detox/blob/v${finalAttrs.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 equivalents. It will also clean up filenames with UTF-8 or Latin-1 (or CP-1252) characters in them. ''; - license = licenses.bsd3; - platforms = platforms.linux; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; maintainers = [ ]; mainProgram = "detox"; }; -} +}) diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index d852ff4e50c8..278307f174d5 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -11,6 +11,7 @@ docker, yarn, docker-compose, + nix-update-script, }: let @@ -18,18 +19,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.72.0"; + version = "0.76.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-3rSWD6uxwcMQdHBSmmAQ0aevqevVXINigCj06jjEcRc="; + hash = "sha256-yTXAzyvkPO/7Xg+F4+hlLkyTpGHAqW3/3scJElfDfxA="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-KSVr6RlBEeDAo8D+7laTN+pSH8Ukl6WTpeAULuG2fq8="; + hash = "sha256-4NaZEA00dNPHAb7pcasufKf/4b8ufwS2lNS+a0rxbv8="; }; nativeBuildInputs = [ @@ -81,6 +82,8 @@ stdenv.mkDerivation (finalAttrs: { } ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Dev container CLI, run and manage your dev environments via a devcontainer.json"; homepage = "https://containers.dev/"; diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index d3ebaef3882a..78d4ec464822 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -6,7 +6,6 @@ rustPlatform, testers, cachix, - sqlx-cli, nixVersions, openssl, pkg-config, @@ -20,14 +19,14 @@ let src = fetchFromGitHub { owner = "domenkozar"; repo = "nix"; - rev = "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546"; - hash = "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg="; + rev = "b455edf3505f1bf0172b39a735caef94687d0d9c"; + hash = "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s="; }; doCheck = false; doInstallCheck = false; }); - version = "1.4.1"; + version = "1.6.1"; in rustPlatform.buildRustPackage { pname = "devenv"; @@ -37,29 +36,18 @@ rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-OjdnHKQ+eWA8YvPUpl3xxyaNK91c9sMebqXgVdN8Lm4="; + hash = "sha256-CEVWxRaln3sp0541QpMfcfmI2w+RN72UgNLV5Dy9sco="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Z7xf1fuXi2Lx005rQwWa7ZNw8nJGz1z33KPnX/pxO3E="; + cargoHash = "sha256-t4Cj7JlBVrMP02Dqibq2IgdKy6ejv+CeffmcPAkh7BE="; buildAndTestSubdir = "devenv"; - # Force sqlx to use the prepared queries - SQLX_OFFLINE = true; - # A local database to use for preparing queries - DATABASE_URL = "sqlite:nix-eval-cache.db"; - - preBuild = '' - cargo sqlx database setup --source devenv-eval-cache/migrations - cargo sqlx prepare --workspace - ''; - nativeBuildInputs = [ installShellFiles makeBinaryWrapper pkg-config - sqlx-cli ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/de/devhelp/package.nix b/pkgs/by-name/de/devhelp/package.nix index 9cfa44a0f6df..d1954757b40e 100644 --- a/pkgs/by-name/de/devhelp/package.nix +++ b/pkgs/by-name/de/devhelp/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/Devhelp/"; changelog = "https://gitlab.gnome.org/GNOME/devhelp/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/de/devilspie2/package.nix b/pkgs/by-name/de/devilspie2/package.nix new file mode 100644 index 000000000000..a9d002d49331 --- /dev/null +++ b/pkgs/by-name/de/devilspie2/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchurl, + intltool, + pkg-config, + glib, + gtk3, + lua, + libwnck, +}: + +stdenv.mkDerivation rec { + pname = "devilspie2"; + version = "0.44"; + + src = fetchurl { + url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-Cp8erdKyKjGBY+QYAGXUlSIboaQ60gIepoZs0RgEJkA="; + }; + + nativeBuildInputs = [ + intltool + pkg-config + ]; + buildInputs = [ + glib + gtk3 + lua + libwnck + ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp bin/devilspie2 $out/bin + cp devilspie2.1 $out/share/man/man1 + ''; + + meta = with lib; { + description = "Window matching utility"; + longDescription = '' + Devilspie2 is a window matching utility, allowing the user to + perform scripted actions on windows as they are created. For + example you can script a terminal program to always be + positioned at a specific screen position, or position a window + on a specific workspace. + ''; + homepage = "https://www.nongnu.org/devilspie2/"; + license = licenses.gpl3; + maintainers = [ maintainers.ebzzry ]; + platforms = platforms.linux; + mainProgram = "devilspie2"; + }; +} diff --git a/pkgs/by-name/de/devilutionx/add-nix-share-path-to-mpq-search.patch b/pkgs/by-name/de/devilutionx/add-nix-share-path-to-mpq-search.patch new file mode 100644 index 000000000000..ec8198fcc84e --- /dev/null +++ b/pkgs/by-name/de/devilutionx/add-nix-share-path-to-mpq-search.patch @@ -0,0 +1,12 @@ +diff --git a/Source/init.cpp b/Source/init.cpp +index 4e6fab1..ecd4ff9 100644 +--- a/Source/init.cpp ++++ b/Source/init.cpp +@@ -144,6 +144,7 @@ std::vector GetMPQSearchPaths() + paths.emplace_back("/usr/local/share/diasurgical/devilutionx/"); + paths.emplace_back("/usr/share/diasurgical/devilutionx/"); + } ++ paths.emplace_back("@assets@"); + #elif defined(NXDK) + paths.emplace_back("D:\\"); + #elif (defined(_WIN64) || defined(_WIN32)) && !defined(__UWP__) && !defined(NXDK) diff --git a/pkgs/by-name/de/devilutionx/package.nix b/pkgs/by-name/de/devilutionx/package.nix new file mode 100644 index 000000000000..a3f8d21ba257 --- /dev/null +++ b/pkgs/by-name/de/devilutionx/package.nix @@ -0,0 +1,108 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + bzip2, + cmake, + pkg-config, + gettext, + libsodium, + SDL2, + SDL2_image, + SDL_audiolib, + simpleini, + fmt, + libpng, + libtiff, + libwebp, + smpq, +}: + +let + # TODO: submit a PR upstream to allow system copies of these libraries where possible + + # fork with patches, far behind upstream + asio = fetchurl { + url = "https://github.com/diasurgical/asio/archive/4bcf552fcea3e1ae555dde2ab33bc9fa6770da4d.tar.gz"; + sha256 = "sha256-AFBy5OFsAzxZsiI4DirIHh+VjFkdalEhN9OGqhC0Cvc="; + }; + + # fork with patches, upstream seems to be dead + libmpq = fetchurl { + url = "https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz"; + sha256 = "sha256-NIzZwr6cBn38uKLWzW+Uet5QiOFUPB5dsf3FsS22ruo="; + }; + + # not "real" package with pkg-config or cmake file, just collection of source files + libsmackerdec = fetchurl { + url = "https://github.com/diasurgical/libsmackerdec/archive/91e732bb6953489077430572f43fc802bf2c75b2.tar.gz"; + sha256 = "sha256-5WXjfvGuT4hG2cnCS4YbxW/c4tek7OR95EjgCqkEi4c="; + }; + + # fork with patches, far behind upstream + libzt = fetchFromGitHub { + owner = "diasurgical"; + repo = "libzt"; + fetchSubmodules = true; + rev = "d6c6a069a5041a3e89594c447ced3f15d77618b8"; + sha256 = "sha256-ttRJLfaGHzhS4jd8db7BNPWROCti3ZxuRouqsL/M5ew="; + }; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "devilutionx"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "diasurgical"; + repo = "devilutionX"; + tag = finalAttrs.version; + hash = "sha256-F23MTe7vMOgIBH6qm7X1+8gIMmN9E+d/GZnFsQZt2cM="; + }; + + patches = [ ./add-nix-share-path-to-mpq-search.patch ]; + + postPatch = '' + substituteInPlace 3rdParty/asio/CMakeLists.txt --replace-fail "${asio.url}" "${asio}" + substituteInPlace 3rdParty/libmpq/CMakeLists.txt --replace-fail "${libmpq.url}" "${libmpq}" + substituteInPlace 3rdParty/libsmackerdec/CMakeLists.txt --replace-fail "${libsmackerdec.url}" "${libsmackerdec}" + substituteInPlace 3rdParty/libzt/CMakeLists.txt \ + --replace-fail "GIT_REPOSITORY https://github.com/diasurgical/libzt.git" "" \ + --replace-fail "GIT_TAG ${libzt.rev}" "SOURCE_DIR ${libzt}" + substituteInPlace Source/init.cpp \ + --replace-fail "@assets@" "$out/share/diasurgical/devilutionx/" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + gettext + smpq # used to build devilutionx.mpq + ]; + + buildInputs = [ + bzip2 + fmt + libpng + libtiff + libwebp + libsodium + SDL2 + SDL2_image + SDL_audiolib + simpleini + ]; + + meta = { + homepage = "https://github.com/diasurgical/devilutionX"; + description = "Diablo build for modern operating systems"; + mainProgram = "devilutionx"; + longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game."; + license = lib.licenses.sustainableUse; + maintainers = with lib.maintainers; [ + aanderse + ]; + platforms = with lib.platforms; linux ++ windows; + }; +}) diff --git a/pkgs/by-name/de/devmode/package.nix b/pkgs/by-name/de/devmode/package.nix index c3cf994df65e..011127b26ea1 100644 --- a/pkgs/by-name/de/devmode/package.nix +++ b/pkgs/by-name/de/devmode/package.nix @@ -55,6 +55,7 @@ let --chmod=u=rwX \ --delete-before \ --delay-updates \ + --links \ $out_link/ \ $serve/ else diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/by-name/de/devpi-client/package.nix similarity index 100% rename from pkgs/development/tools/devpi-client/default.nix rename to pkgs/by-name/de/devpi-client/package.nix diff --git a/pkgs/by-name/de/devtoolbox/package.nix b/pkgs/by-name/de/devtoolbox/package.nix index dc3797428f13..85ea3b387653 100644 --- a/pkgs/by-name/de/devtoolbox/package.nix +++ b/pkgs/by-name/de/devtoolbox/package.nix @@ -20,14 +20,14 @@ }: python3Packages.buildPythonApplication rec { pname = "devtoolbox"; - version = "1.2.3"; + version = "1.2.5"; pyproject = false; # uses meson src = fetchFromGitHub { owner = "aleiepure"; repo = "devtoolbox"; tag = "v${version}"; - hash = "sha256-Ns2utC/qiwzEJJkdqwpx320k3srj5OJi8K+u5fI1LwE="; + hash = "sha256-CgpSZvpwBKo2gzp2QbBPFBK0tPhqKFC/DxXdmTWVAwc="; }; postPatch = '' diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix index fa273a1b4040..01a3eebb0880 100644 --- a/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/df/dfilemanager/package.nix b/pkgs/by-name/df/dfilemanager/package.nix new file mode 100644 index 000000000000..74d65f0ecc16 --- /dev/null +++ b/pkgs/by-name/df/dfilemanager/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libsForQt5, + file, +}: + +stdenv.mkDerivation { + pname = "dfilemanager"; + version = "unstable-2021-02-20"; + + src = fetchFromGitHub { + owner = "probonopd"; + repo = "dfilemanager"; + rev = "61179500a92575e05cf9a71d401c388726bfd73d"; + hash = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc="; + }; + + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.solid + file + ]; + + cmakeFlags = [ "-DQT5BUILD=true" ]; + + meta = { + homepage = "https://github.com/probonopd/dfilemanager"; + description = "File manager written in Qt/C++"; + mainProgram = "dfm"; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ ]; + }; +} diff --git a/pkgs/by-name/df/dfl-applications/package.nix b/pkgs/by-name/df/dfl-applications/package.nix new file mode 100644 index 000000000000..82a1ab286ee1 --- /dev/null +++ b/pkgs/by-name/df/dfl-applications/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + qt6, + dfl-ipc, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dfl-applications"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "applications"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VDkJkrkhjWi61YD7qNQSF9/ctXtvVf+nh/zUVxAAE4Q="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + qt6.qtbase + dfl-ipc + ]; + + dontWrapQtApps = true; + + outputs = [ + "out" + "dev" + ]; + + meta = { + description = "Library provides a thin wrapper around QApplication, QGuiApplication and QCoreApplication"; + homepage = "https://gitlab.com/desktop-frameworks/applications"; + changelog = "https://gitlab.com/desktop-frameworks/applications/-/blob/${finalAttrs.src.rev}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/df/dfl-ipc/package.nix b/pkgs/by-name/df/dfl-ipc/package.nix new file mode 100644 index 000000000000..b1e09c6871c5 --- /dev/null +++ b/pkgs/by-name/df/dfl-ipc/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + qt6, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dfl-ipc"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "ipc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-GjQg7Fq7fWal1vh/jR5qqm+qs+D/McCoQfktOvO86eA="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + buildInputs = [ + qt6.qtbase + ]; + + dontWrapQtApps = true; + + outputs = [ + "out" + "dev" + ]; + + meta = { + description = "A very simple set of IPC classes for inter-process communication"; + homepage = "https://gitlab.com/desktop-frameworks/ipc"; + changelog = "https://gitlab.com/desktop-frameworks/ipc/-/blob/${finalAttrs.src.rev}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/df/dfl-login1/package.nix b/pkgs/by-name/df/dfl-login1/package.nix new file mode 100644 index 000000000000..59984c4d167b --- /dev/null +++ b/pkgs/by-name/df/dfl-login1/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + qt6, + systemd, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dfl-login1"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "login1"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Aw2yg5KH618/lG+BQU8JZhQ/8qr6L3vWiEgUNu7aGYY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + qt6.qtbase + systemd + ]; + + dontWrapQtApps = true; + + outputs = [ + "out" + "dev" + ]; + + meta = { + description = "Implementation of systemd/elogind for DFL"; + homepage = "https://gitlab.com/desktop-frameworks/login1"; + changelog = "https://gitlab.com/desktop-frameworks/login1/-/blob/${finalAttrs.src.rev}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/df/dfl-utils/package.nix b/pkgs/by-name/df/dfl-utils/package.nix new file mode 100644 index 000000000000..f229cf90f84d --- /dev/null +++ b/pkgs/by-name/df/dfl-utils/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + qt6, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dfl-utils"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "utils"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XiOLVx9X2i+IWORde05P2cFulQRU/EQErbyr5fgZDY4="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + buildInputs = [ + qt6.qtbase + ]; + + dontWrapQtApps = true; + + outputs = [ + "out" + "dev" + ]; + + meta = { + description = "Some utilities for DFL"; + homepage = "https://gitlab.com/desktop-frameworks/utils"; + changelog = "https://gitlab.com/desktop-frameworks/utils/-/blob/${finalAttrs.src.rev}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/dg/dgraph/package.nix b/pkgs/by-name/dg/dgraph/package.nix index 631ee7a1293f..15ff7c9955cb 100644 --- a/pkgs/by-name/dg/dgraph/package.nix +++ b/pkgs/by-name/dg/dgraph/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "dgraph"; - version = "24.1.1"; + version = "24.1.2"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "sha256-WAjoAbd8tGpianZXfrvRbRCdbkVP/gO/ekotT5KyrG8="; + sha256 = "sha256-cW8n+HkWwRtdabp5GCCkF6Izgb9LjYxLjoR1jDoePN0="; }; vendorHash = "sha256-eOo2ihaabdhDRATIc5C4YEMBcA0Xl5xzBKW5GJhrTOA="; diff --git a/pkgs/by-name/dh/dhcpcd/package.nix b/pkgs/by-name/dh/dhcpcd/package.nix index 7394fea8f83f..b6b814248050 100644 --- a/pkgs/by-name/dh/dhcpcd/package.nix +++ b/pkgs/by-name/dh/dhcpcd/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--disable-privsep" "--dbdir=/var/lib/dhcpcd" + "--with-default-hostname=nixos" (lib.enableFeature enablePrivSep "privsep") ] ++ lib.optional enablePrivSep "--privsepuser=dhcpcd"; @@ -62,7 +63,12 @@ stdenv.mkDerivation rec { ) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; passthru.tests = { - inherit (nixosTests.networking.scripted) macvlan dhcpSimple dhcpOneIf; + inherit (nixosTests.networking.scripted) + macvlan + dhcpSimple + dhcpHostname + dhcpOneIf + ; }; meta = with lib; { diff --git a/pkgs/by-name/dh/dhewm3/package.nix b/pkgs/by-name/dh/dhewm3/package.nix index fe6d3059c172..8fccc5b7a317 100644 --- a/pkgs/by-name/dh/dhewm3/package.nix +++ b/pkgs/by-name/dh/dhewm3/package.nix @@ -10,6 +10,7 @@ libjpeg, libogg, libvorbis, + libX11, openal, curl, copyDesktopItems, @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { SDL2 libGLU libGL + libX11 zlib libjpeg libogg diff --git a/pkgs/by-name/di/di/package.nix b/pkgs/by-name/di/di/package.nix index dcfd55c68fd3..c0fb2a1ad100 100644 --- a/pkgs/by-name/di/di/package.nix +++ b/pkgs/by-name/di/di/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "di"; - version = "5.0.14"; + version = "6.0.0"; src = fetchurl { url = "mirror://sourceforge/diskinfo-di/${pname}-${version}.tar.gz"; - sha256 = "sha256-H/5UgMT7CfzaCQnIsytRnGC1cV2mF6/SQxEU1dVDKtk="; + sha256 = "sha256-e2Y+TbBEsfpJhr0Bj4J8GOlv5tH5o2cy3LsEUOf1GMs="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/di/dia/package.nix b/pkgs/by-name/di/dia/package.nix index 6331ed8b496b..fb9b8df29c84 100644 --- a/pkgs/by-name/di/dia/package.nix +++ b/pkgs/by-name/di/dia/package.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation { hash = "sha256-U+8TUE1ULt6MNxnvw9kFjCAVBecUy2Sarof6H9+kR7Q="; }; - # Required for the PDF plugin when building with clang. - CXXFLAGS = "-std=c++17"; + # Required for the PDF plugin + CXXFLAGS = "-std=c++20"; preConfigure = '' patchShebangs . @@ -44,7 +44,7 @@ stdenv.mkDerivation { [ graphene gtk3 - libxml2 + (libxml2.override { zlibSupport = true; }) python3 poppler ] diff --git a/pkgs/by-name/di/dialect/package.nix b/pkgs/by-name/di/dialect/package.nix index a9c95c7f7e08..b119fccc63be 100644 --- a/pkgs/by-name/di/dialect/package.nix +++ b/pkgs/by-name/di/dialect/package.nix @@ -68,17 +68,20 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + postFixup = '' + patchShebangs --update --host $out/share/dialect/search_provider + ''; + doCheck = false; - # handle setup hooks better - strictDeps = false; + strictDeps = true; passthru.updateScript = nix-update-script { }; meta = { homepage = "https://github.com/dialect-app/dialect"; description = "Translation app for GNOME"; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "dialect"; diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix index 80a957991a90..3eb6f534986b 100644 --- a/pkgs/by-name/di/diebahn/package.nix +++ b/pkgs/by-name/di/diebahn/package.nix @@ -18,25 +18,24 @@ libadwaita, pango, gettext, - darwin, blueprint-compiler, nix-update-script, }: stdenv.mkDerivation rec { pname = "diebahn"; - version = "2.7.3"; + version = "2.8.1"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "railway"; tag = version; - hash = "sha256-PD76zxgQJ332MVu5LL9SNDrf66xmE/td4uDv/FYq0aU="; + hash = "sha256-mHHebsQKxjwsQd14oVDnencCCL8hOWIWhKF/J9aVeBU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-3+UTN0KKnbpPm948XW4NSZkMYJUv974VtTqtG8orR/E="; + hash = "sha256-M6z8HfGehd+AdOEJZgmmonfqQa7Jevte+TaaatqRZHQ="; }; nativeBuildInputs = [ @@ -51,24 +50,15 @@ stdenv.mkDerivation rec { blueprint-compiler ]; - buildInputs = - [ - cairo - gdk-pixbuf - glib - gtk4 - libadwaita - openssl - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Foundation - Security - ] - ); + buildInputs = [ + cairo + gdk-pixbuf + glib + gtk4 + libadwaita + openssl + pango + ]; # Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys # because the vendored copy does not build with newer versions of clang. @@ -88,12 +78,10 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/schmiddi-on-mobile/railway"; license = lib.licenses.gpl3Plus; mainProgram = "diebahn"; - maintainers = - with lib.maintainers; - [ - dotlambda - lilacious - ] - ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ + dotlambda + lilacious + ]; + teams = [ lib.teams.gnome-circle ]; }; } diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 92b98816e363..49b1bf26dd83 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,16 +27,16 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.2.8"; + version = "2.2.10"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-+h5gLhbFxVnEHsFZqkkQe6rUiiZy6oYcF2mnb44VHDU="; + hash = "sha256-ELl8jrTWu2pXn2+ZQh7Z/lrmxRCkCXCCXvXcAKF5IJg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vCdxtrhyIhy3VuLWl7XYysCFecHReHWhAs/BRaBTbrk="; + cargoHash = "sha256-uijO0eAc9U7T5SDh3iCr/wC257Q83VOJGop4KADGfgA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/di/diffnav/package.nix b/pkgs/by-name/di/diffnav/package.nix index a104299e95d2..d109a82aa770 100644 --- a/pkgs/by-name/di/diffnav/package.nix +++ b/pkgs/by-name/di/diffnav/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "diffnav"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "diffnav"; rev = "refs/tags/v${version}"; - hash = "sha256-JXxeRq8OuTvzkbxDr1xVXeW0RFtCRyEbhCGvXeWHb0g="; + hash = "sha256-admPiEKyatdUkR89vZP8RYHTqtZVSJ8KSvtpnsBViBw="; }; vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI="; diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index 98e4e8d584b0..f6227f3edea0 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -106,11 +106,11 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "293"; + version = "295"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-DZLeZhhWHcBGbO0lCucs5+6kXfwKk71Iwxhjej0ClLE="; + hash = "sha256-BxyE14vXS7lGFwWsruDAcdXMRsoETFwXPQxfMpSh1+E="; }; outputs = [ diff --git a/pkgs/by-name/di/diffr/package.nix b/pkgs/by-name/di/diffr/package.nix new file mode 100644 index 000000000000..a599e8188400 --- /dev/null +++ b/pkgs/by-name/di/diffr/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "diffr"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "mookid"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ylZE2NtTXbGqsxE72ylEQCacTyxBO+/WgvEpoXd5OZI="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-pbGfoEk8peWBA0F0EdiAJJtan74O5RD6TmNJUTY2ijA="; + + preCheck = '' + export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr + ''; + + meta = with lib; { + description = "Yet another diff highlighting tool"; + mainProgram = "diffr"; + homepage = "https://github.com/mookid/diffr"; + license = with licenses; [ mit ]; + maintainers = [ ]; + }; +} diff --git a/pkgs/by-name/di/diffstat/package.nix b/pkgs/by-name/di/diffstat/package.nix index e1d8a43e804b..acecb08db22d 100644 --- a/pkgs/by-name/di/diffstat/package.nix +++ b/pkgs/by-name/di/diffstat/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "diffstat"; - version = "1.67"; + version = "1.68"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz" "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz" ]; - hash = "sha256-dg7QyZxtZDI41BuA5gJ4zxaD/7lKKDlUrH7xaMhSdmo="; + hash = "sha256-ifkpSorHT8728bmsQI9D6+340gjj7+C5m0rMFtxlgsc="; }; buildInputs = [ zstd ]; diff --git a/pkgs/by-name/di/digiham/package.nix b/pkgs/by-name/di/digiham/package.nix index ce97f31ebe2e..13fe0f3f9001 100644 --- a/pkgs/by-name/di/digiham/package.nix +++ b/pkgs/by-name/di/digiham/package.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Tools for decoding digital ham communication"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; - maintainers = lib.teams.c3d2.members; + teams = [ lib.teams.c3d2 ]; }; }) diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index c39ab8df0019..9c0d01fd5838 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -4,6 +4,7 @@ lib, fetchFromGitLab, fetchgit, + fetchpatch, cmake, ninja, @@ -62,18 +63,25 @@ in stdenv.mkDerivation (finalAttrs: { pname = "digikam"; - version = "8.5.0"; + version = "8.6.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; repo = "digikam"; rev = "v${finalAttrs.version}"; - hash = "sha256-KO6kq0SlYzu7sh6+7JQWhIeHNowy3fx03OFTdDwyR10="; + hash = "sha256-CMyvNOAlIqD6OeqUquQ+/sOiBXmEowZe3/qmaXxh0X0="; }; patches = [ ./disable-tests-download.patch + + # Fix build with Qt 6.9 + # FIXME: remove in next update + (fetchpatch { + url = "https://invent.kde.org/graphics/digikam/-/commit/325b19fc7f0d04cdc1308f235c207c1ab43e945d.patch"; + hash = "sha256-bsxaNuLuU9MyDRmenOqO4JuzsbpUvfKQwcSCDfLHoWQ="; + }) ]; strictDeps = true; @@ -196,6 +204,9 @@ stdenv.mkDerivation (finalAttrs: { --replace "/usr/bin/sqlite3" "${lib.getExe sqlite}" ''; + # over 3h in a normal build slot (2 cores + requiredSystemFeatures = [ "big-parallel" ]; + meta = { description = "Photo management application"; homepage = "https://www.digikam.org/"; diff --git a/pkgs/by-name/di/dijo/package.nix b/pkgs/by-name/di/dijo/package.nix new file mode 100644 index 000000000000..bf716c07a46e --- /dev/null +++ b/pkgs/by-name/di/dijo/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + ncurses, +}: + +rustPlatform.buildRustPackage rec { + pname = "dijo"; + version = "0.2.7"; + buildInputs = [ ncurses ]; + src = fetchFromGitHub { + owner = "NerdyPepper"; + repo = "dijo"; + rev = "v${version}"; + sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE="; + }; + useFetchCargoVendor = true; + cargoHash = "sha256-Pny/RBtr65jKu2DdyIrluZWeZIgGb8Ev7mxvTMWPlyI="; + + meta = with lib; { + description = "Scriptable, curses-based, digital habit tracker"; + homepage = "https://github.com/NerdyPepper/dijo"; + license = licenses.mit; + maintainers = [ ]; + mainProgram = "dijo"; + }; +} diff --git a/pkgs/by-name/di/dillo-plus/package.nix b/pkgs/by-name/di/dillo-plus/package.nix index 8247cee5781f..e6032ba38c95 100644 --- a/pkgs/by-name/di/dillo-plus/package.nix +++ b/pkgs/by-name/di/dillo-plus/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dillo-plus"; - version = "3.3.0"; + version = "3.3.0-unstable-2025-01-18"; src = fetchFromGitHub { owner = "crossbowerbt"; repo = "dillo-plus"; - rev = "v${finalAttrs.version}"; - hash = "sha256-NLerc1GXTdzuGVshXn7faK4vOu7wDVMiQNTljOF7OhA="; + rev = "7d093e6bddcb3338938ea5959844e62ff1f9b76f"; + hash = "sha256-7DZ+Ruu1sb+yKHSigdFEVe0xkrsQXSQ2esPhujD3Qrc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/dillo/package.nix b/pkgs/by-name/di/dillo/package.nix index cc6b32b1d205..e32387f02ca2 100644 --- a/pkgs/by-name/di/dillo/package.nix +++ b/pkgs/by-name/di/dillo/package.nix @@ -3,16 +3,12 @@ autoreconfHook, fetchFromGitHub, fltk, - giflib, - libXcursor, - libXi, - libXinerama, libjpeg, libpng, + libwebp, libressl, mbedtls, openssl, - perl, pkg-config, stdenv, which, @@ -48,15 +44,11 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - fltk - giflib - libXcursor - libXi - libXinerama libjpeg libpng - perl + libwebp ssl + fltk ]; outputs = [ @@ -88,6 +80,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "dillo"; maintainers = with lib.maintainers; [ ]; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/di/dim/Cargo.lock b/pkgs/by-name/di/dim/Cargo.lock deleted file mode 100644 index 9cc6b9834d80..000000000000 --- a/pkgs/by-name/di/dim/Cargo.lock +++ /dev/null @@ -1,4186 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "aes-gcm" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anitomy" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5dbd2cfb14d3a442954182c1e8804a859e65143473ddfc7521e8766a4c44a9d" -dependencies = [ - "anitomy-sys", -] - -[[package]] -name = "anitomy-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1ade7dff1b0d6e91f90986f26538baa14f8143d9c5d79cae3f914070a2e30ea" -dependencies = [ - "cc", -] - -[[package]] -name = "anstream" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-compression" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", - "zstd", - "zstd-safe", -] - -[[package]] -name = "async-trait" -version = "0.1.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "atoi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616896e05fc0e2649463a93a15183c6a16bf03413a7af88ef1285ddedfa9cda5" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core 0.3.4", - "axum-macros", - "base64 0.21.5", - "bitflags 1.3.2", - "bytes 1.5.0", - "futures-util", - "http 0.2.9", - "http-body 0.4.5", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "multer", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", - "sync_wrapper", - "tokio", - "tokio-tungstenite", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202651474fe73c62d9e0a56c6133f7a0ff1dc1c8cf7a5b03381af2a26553ac9d" -dependencies = [ - "async-trait", - "axum-core 0.4.1", - "bytes 1.5.0", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "http-body-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes 1.5.0", - "futures-util", - "http 0.2.9", - "http-body 0.4.5", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77cb22c689c44d4c07b0ab44ebc25d69d8ae601a2f28fb8d672d344178fa17aa" -dependencies = [ - "async-trait", - "bytes 1.5.0", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-extra" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523ae92256049a3b02d3bb4df80152386cd97ddba0c8c5077619bdc8c4b1859b" -dependencies = [ - "axum 0.7.2", - "axum-core 0.4.1", - "bytes 1.5.0", - "cookie", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "http-body-util", - "mime", - "pin-project-lite", - "serde", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-macros" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "barrage" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5951c75bdabb58753d140dd5802f12ff3a483cb2e16fb5276e111b94b19e87" -dependencies = [ - "concurrent-queue", - "event-listener", - "spin 0.9.8", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "brotli" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "cache-padded" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "catty" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf0adb3cc1c06945672f8dcc827e42497ac6d0aff49f459ec918132b82a5cbc" -dependencies = [ - "spin 0.9.8", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.48.5", -] - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "bitflags 1.3.2", - "textwrap", - "unicode-width", -] - -[[package]] -name = "clap" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - -[[package]] -name = "cookie" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" -dependencies = [ - "percent-encoding", - "time 0.3.36", - "version_check", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" -dependencies = [ - "atty", - "cast", - "clap 2.34.0", - "criterion-plot", - "csv", - "futures", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_cbor", - "serde_derive", - "serde_json", - "tinytemplate", - "tokio", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "ctr" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" -dependencies = [ - "cipher", -] - -[[package]] -name = "darwin-libproc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb90051930c9a0f09e585762152048e23ac74d20c10590ef7cf01c0343c3046" -dependencies = [ - "darwin-libproc-sys", - "libc", - "memchr", -] - -[[package]] -name = "darwin-libproc-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57cebb5bde66eecdd30ddc4b9cd208238b15db4982ccc72db59d699ea10867c1" -dependencies = [ - "libc", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.2", - "lock_api", - "once_cell", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "data-encoding" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "dia-i18n" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "292babb903a8ffc5e23d17085137a0f33c00a07dfbc6117619c7e6dc7f4111ae" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dim" -version = "0.1.0" -dependencies = [ - "clap 4.4.7", - "dim-auth", - "dim-core", - "dim-database", - "dim-events", - "dim-extern-api", - "dim-utils", - "dim-web", - "fdlimit", - "nightfall", - "tokio", - "tracing", - "xtra", -] - -[[package]] -name = "dim-auth" -version = "0.4.0-dev" -dependencies = [ - "aes-gcm", - "base64 0.13.1", - "displaydoc", - "once_cell", - "rand", - "serde", - "thiserror", -] - -[[package]] -name = "dim-core" -version = "0.4.0-dev" -dependencies = [ - "async-trait", - "axum 0.6.20", - "cfg-if", - "chrono", - "criterion", - "dia-i18n", - "dim-auth", - "dim-database", - "dim-events", - "dim-extern-api", - "dim-utils", - "displaydoc", - "futures", - "fuzzy-matcher", - "http 0.2.9", - "hyper", - "ignore", - "image", - "itertools", - "lazy_static", - "libsqlite3-sys", - "nightfall", - "nix 0.23.2", - "notify", - "once_cell", - "parking_lot 0.12.1", - "percent-encoding", - "rand", - "reqwest", - "rusqlite", - "rust-embed", - "serde", - "serde_derive", - "serde_json", - "serial_test", - "sqlx", - "tempfile", - "thiserror", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "toml", - "tracing", - "tracing-appender", - "tracing-subscriber", - "url", - "uuid 1.10.0", - "xmlwriter", - "xtra", - "zip", -] - -[[package]] -name = "dim-database" -version = "0.4.0-dev" -dependencies = [ - "base64 0.13.1", - "cfg-if", - "dim-auth", - "displaydoc", - "itertools", - "lazy_static", - "once_cell", - "ring 0.16.20", - "serde", - "serde_derive", - "serde_json", - "sqlx", - "thiserror", - "tokio", - "tracing", - "uuid 0.8.2", -] - -[[package]] -name = "dim-events" -version = "0.4.0-dev" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "dim-extern-api" -version = "0.4.0-dev" -dependencies = [ - "anitomy", - "async-trait", - "chrono", - "dashmap", - "displaydoc", - "governor", - "rand", - "reqwest", - "retry-block", - "serde", - "serde_json", - "thiserror", - "tokio", - "torrent-name-parser", - "tracing", -] - -[[package]] -name = "dim-utils" -version = "0.1.0" -dependencies = [ - "dia-i18n", -] - -[[package]] -name = "dim-web" -version = "0.1.0" -dependencies = [ - "axum 0.6.20", - "axum-extra", - "cfg-if", - "chrono", - "dim-core", - "dim-database", - "dim-events", - "dim-extern-api", - "dim-utils", - "displaydoc", - "dominant_color", - "futures", - "fuzzy-matcher", - "http 0.2.9", - "hyper", - "image", - "nightfall", - "once_cell", - "percent-encoding", - "rust-embed", - "serde", - "serde_derive", - "serde_json", - "sqlx", - "thiserror", - "tokio", - "tokio-stream", - "tower", - "tower-http", - "tracing", - "tracing-appender", - "tracing-subscriber", - "uuid 1.10.0", -] - -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "dominant_color" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2494b5d589b485e8b75ef5e81b4dc271fb0d5814132c308d5d11f0de9b300d96" - -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "err-derive" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "errno" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "exr" -version = "1.71.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" -dependencies = [ - "bit_field", - "flume 0.11.0", - "half 2.2.1", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "fdeflate" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "fdlimit" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b" -dependencies = [ - "libc", -] - -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "pin-project", - "spin 0.9.8", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "futures" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" - -[[package]] -name = "futures-executor" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot 0.11.2", -] - -[[package]] -name = "futures-io" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-macro" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "futures-sink" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" - -[[package]] -name = "futures-task" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" - -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[package]] -name = "futures-util" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "ghash" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "globset" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "governor" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c390a940a5d157878dd057c78680a33ce3415bcd05b4799509ea44210914b4d5" -dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot 0.12.1", - "quanta", - "rand", - "smallvec", -] - -[[package]] -name = "h2" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" -dependencies = [ - "bytes 1.5.0", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.9", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "half" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" -dependencies = [ - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" - -[[package]] -name = "hashlink" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" -dependencies = [ - "hashbrown 0.11.2", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes 1.5.0", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" -dependencies = [ - "bytes 1.5.0", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes 1.5.0", - "http 0.2.9", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes 1.5.0", - "http 1.0.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" -dependencies = [ - "bytes 1.5.0", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "pin-project-lite", -] - -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes 1.5.0", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http 0.2.9", - "http-body 0.4.5", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.4.10", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.9", - "hyper", - "rustls 0.21.8", - "tokio", - "tokio-rustls 0.24.1", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-rational", - "num-traits", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "iri-string" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21859b667d66a4c1dacd9df0863b3efb65785474255face87f5bca39dd8407c0" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libc" -version = "0.2.150" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" - -[[package]] -name = "libsqlite3-sys" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libva-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e4c5aa2cb99e640a357c42cf83dcb978ed08f99a3ca09eac534091aee2e9ba" -dependencies = [ - "cc", - "cfg-if", - "libc", - "pkg-config", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "mp4" -version = "0.8.2" -source = "git+https://github.com/vgarleanu/mp4-rust#d4f85ce3a438bc80d93df467c3f3320c5b3352e7" -dependencies = [ - "byteorder", - "bytes 0.5.6", - "num-rational", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "multer" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" -dependencies = [ - "bytes 1.5.0", - "encoding_rs", - "futures-util", - "http 0.2.9", - "httparse", - "log", - "memchr", - "mime", - "spin 0.9.8", - "version_check", -] - -[[package]] -name = "nightfall" -version = "0.3.12-rc4" -source = "git+https://github.com/Dusk-Labs/nightfall?rev=878f07edd5d2c71261c5ae02fe3a6db7cda18be7#878f07edd5d2c71261c5ae02fe3a6db7cda18be7" -dependencies = [ - "async-trait", - "cfg-if", - "err-derive", - "lazy_static", - "mp4", - "nix 0.27.1", - "ntapi", - "once_cell", - "psutil", - "rusty_vainfo", - "serde", - "serde_derive", - "serde_json", - "tokio", - "tokio-stream", - "tracing", - "uuid 1.10.0", - "winapi", - "xtra", - "xtra_proc", -] - -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "libc", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - -[[package]] -name = "notify" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" -dependencies = [ - "bitflags 1.3.2", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "mio", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", - "serde", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.3", - "libc", -] - -[[package]] -name = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "png" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "pollster" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7" - -[[package]] -name = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "psutil" -version = "3.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f866af2b0f8e4b0d2d00aad8a9c5fc48fad33466cd99a64cbb3a4c1505f1a62d" -dependencies = [ - "cfg-if", - "darwin-libproc", - "mach", - "nix 0.23.2", - "once_cell", - "thiserror", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "quanta" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" -dependencies = [ - "crossbeam-utils", - "libc", - "mach", - "once_cell", - "raw-cpuid", - "wasi 0.10.2+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "reqwest" -version = "0.11.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" -dependencies = [ - "async-compression", - "base64 0.21.5", - "bytes 1.5.0", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http 0.2.9", - "http-body 0.4.5", - "hyper", - "hyper-rustls", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.8", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-rustls 0.24.1", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.2", - "winreg", -] - -[[package]] -name = "retry-block" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "095a7c37fd304fa4fef479da6293cd8dcd8ddb7eb26a03c28cc33f949362a379" -dependencies = [ - "async-trait", - "futures-util", - "rand", - "serde", - "tokio", - "tokio-stream", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" -dependencies = [ - "cc", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "rusqlite" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a" -dependencies = [ - "bitflags 1.3.2", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "memchr", - "smallvec", -] - -[[package]] -name = "rust-embed" -version = "5.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe1fe6aac5d6bb9e1ffd81002340363272a7648234ec7bdfac5ee202cb65523" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "5.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed91c41c42ef7bf687384439c312e75e0da9c149b0390889b94de3c7d9d9e66" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils", - "syn 1.0.109", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a512219132473ab0a77b52077059f1c47ce4af7fbdc94503e9862a34422876d" -dependencies = [ - "walkdir", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.38.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.1", - "log", - "ring 0.16.20", - "sct 0.6.1", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.21.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" -dependencies = [ - "log", - "ring 0.17.5", - "rustls-webpki", - "sct 0.7.1", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.5", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rusty_vainfo" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7e34bc5c01a524319b395c0eaab6dd5a521d6d1d796de4de714ad2ccd6caf8" -dependencies = [ - "libva-sys", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", -] - -[[package]] -name = "serde" -version = "1.0.192" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half 1.8.2", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.192" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" -dependencies = [ - "itoa", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serial_test" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bcc41d18f7a1d50525d080fd3e953be87c4f9f1a974f3c21798ca00d54ec15" -dependencies = [ - "lazy_static", - "parking_lot 0.11.2", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2881bccd7d60fb32dfa3d7b3136385312f8ad75e2674aab2852867a09790cae8" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "sqlformat" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" -dependencies = [ - "itertools", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551873805652ba0d912fec5bbb0f8b4cdd96baf8e2ebf5970e5671092966019b" -dependencies = [ - "sqlx-core", - "sqlx-macros", -] - -[[package]] -name = "sqlx-core" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" -dependencies = [ - "ahash", - "atoi", - "bitflags 1.3.2", - "byteorder", - "bytes 1.5.0", - "crc", - "crossbeam-queue", - "either", - "event-listener", - "flume 0.10.14", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "hashlink", - "hex", - "indexmap", - "itoa", - "libc", - "libsqlite3-sys", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls 0.19.1", - "sha2", - "smallvec", - "sqlformat", - "sqlx-rt", - "stringprep", - "thiserror", - "tokio-stream", - "url", - "webpki", - "webpki-roots 0.21.1", -] - -[[package]] -name = "sqlx-macros" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0fba2b0cae21fc00fe6046f8baa4c7fcb49e379f0f592b04696607f69ed2e1" -dependencies = [ - "dotenv", - "either", - "heck", - "once_cell", - "proc-macro2", - "quote", - "sha2", - "sqlx-core", - "sqlx-rt", - "syn 1.0.109", - "url", -] - -[[package]] -name = "sqlx-rt" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae" -dependencies = [ - "once_cell", - "tokio", - "tokio-rustls 0.22.0", -] - -[[package]] -name = "stringprep" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" -dependencies = [ - "finl_unicode", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tempfile" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.4.1", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" -dependencies = [ - "backtrace", - "bytes 1.5.0", - "libc", - "mio", - "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.5", - "tokio-macros", - "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.8", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes 1.5.0", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "torrent-name-parser" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2db832ca29f7c5c063a8678bc82f50d50abd6c33af3246ab34a3169e5f5ee51" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "async-compression", - "base64 0.21.5", - "bitflags 2.4.1", - "bytes 1.5.0", - "futures-core", - "futures-util", - "http 0.2.9", - "http-body 0.4.5", - "http-range-header", - "httpdate", - "iri-string", - "mime", - "mime_guess", - "percent-encoding", - "pin-project-lite", - "tokio", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "tracing", - "uuid 1.10.0", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-appender" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" -dependencies = [ - "crossbeam-channel", - "time 0.3.36", - "tracing-subscriber", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes 1.5.0", - "data-encoding", - "http 0.2.9", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "uuid" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" -dependencies = [ - "getrandom", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" - -[[package]] -name = "web-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki-roots" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[package]] -name = "xtra" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca0a1b28e7cf635b4e961c7330416bf842a89bca42f5c707ab02a065e1ee60f" -dependencies = [ - "async-trait", - "barrage", - "catty", - "flume 0.10.14", - "futures-core", - "futures-sink", - "futures-timer", - "futures-util", - "pollster", - "tokio", -] - -[[package]] -name = "xtra_proc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0972940e244acf1715d05b50b6e937d2ca97db4247437e9d07c5eaf0d978ebb0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "zip" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" -dependencies = [ - "byteorder", - "bzip2", - "crc32fast", - "flate2", - "thiserror", - "time 0.1.43", -] - -[[package]] -name = "zstd" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", -] - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] diff --git a/pkgs/by-name/di/dim/bump-nightfall.patch b/pkgs/by-name/di/dim/bump-nightfall.patch index 37979efd5f78..74649e980273 100644 --- a/pkgs/by-name/di/dim/bump-nightfall.patch +++ b/pkgs/by-name/di/dim/bump-nightfall.patch @@ -1,21 +1,243 @@ -diff --git a/dim/Cargo.toml b/dim/Cargo.toml -index b7c8106493...38518ba29d 100644 ---- a/dim/Cargo.toml -+++ b/dim/Cargo.toml -@@ -15,7 +15,7 @@ - fdlimit = "0.2.1" +diff --git a/Cargo.lock b/Cargo.lock +index adb78aa..5634132 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 - # git dependencies --nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [ -+nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [ - "cuda", - "ssa_transmux", - ] } + [[package]] + name = "addr2line" +@@ -58,7 +58,7 @@ version = "0.7.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" + dependencies = [ +- "getrandom", ++ "getrandom 0.2.11", + "once_cell", + "version_check", + ] +@@ -979,7 +979,7 @@ dependencies = [ + "tracing-appender", + "tracing-subscriber", + "url", +- "uuid 1.5.0", ++ "uuid 1.16.0", + "xmlwriter", + "xtra", + "zip", +@@ -1079,7 +1079,7 @@ dependencies = [ + "tracing", + "tracing-appender", + "tracing-subscriber", +- "uuid 1.5.0", ++ "uuid 1.16.0", + ] + + [[package]] +@@ -1411,6 +1411,18 @@ dependencies = [ + "wasi 0.11.0+wasi-snapshot-preview1", + ] + ++[[package]] ++name = "getrandom" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "r-efi", ++ "wasi 0.14.2+wasi-0.2.4", ++] ++ + [[package]] + name = "ghash" + version = "0.4.4" +@@ -1874,9 +1886,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + + [[package]] + name = "libc" +-version = "0.2.150" ++version = "0.2.172" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" ++checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + + [[package]] + name = "libsqlite3-sys" +@@ -2049,14 +2061,14 @@ dependencies = [ + [[package]] + name = "nightfall" + version = "0.3.12-rc4" +-source = "git+https://github.com/Dusk-Labs/nightfall?tag=0.3.12-rc4#147ea96146b4cae6f666741020cef0622a90d46c" ++source = "git+https://github.com/Dusk-Labs/nightfall?rev=878f07edd5d2c71261c5ae02fe3a6db7cda18be7#878f07edd5d2c71261c5ae02fe3a6db7cda18be7" + dependencies = [ + "async-trait", + "cfg-if", + "err-derive", + "lazy_static", + "mp4", +- "nix 0.20.0", ++ "nix 0.27.1", + "ntapi", + "once_cell", + "psutil", +@@ -2067,7 +2079,7 @@ dependencies = [ + "tokio", + "tokio-stream", + "tracing", +- "uuid 0.8.2", ++ "uuid 1.16.0", + "winapi", + "xtra", + "xtra_proc", +@@ -2075,27 +2087,26 @@ dependencies = [ + + [[package]] + name = "nix" +-version = "0.20.0" ++version = "0.23.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" ++checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" + dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", ++ "memoffset 0.6.5", + ] + + [[package]] + name = "nix" +-version = "0.23.2" ++version = "0.27.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" ++checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" + dependencies = [ +- "bitflags 1.3.2", +- "cc", ++ "bitflags 2.4.1", + "cfg-if", + "libc", +- "memoffset 0.6.5", + ] + + [[package]] +@@ -2140,9 +2151,9 @@ dependencies = [ + + [[package]] + name = "ntapi" +-version = "0.3.7" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" ++checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" + dependencies = [ + "winapi", + ] +@@ -2481,6 +2492,12 @@ dependencies = [ + "proc-macro2", + ] + ++[[package]] ++name = "r-efi" ++version = "5.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" ++ + [[package]] + name = "rand" + version = "0.8.5" +@@ -2508,7 +2525,7 @@ version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + dependencies = [ +- "getrandom", ++ "getrandom 0.2.11", + ] + + [[package]] +@@ -2689,7 +2706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" + dependencies = [ + "cc", +- "getrandom", ++ "getrandom 0.2.11", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", +@@ -3505,7 +3522,7 @@ dependencies = [ + "tower-layer", + "tower-service", + "tracing", +- "uuid 1.5.0", ++ "uuid 1.16.0", + ] + + [[package]] +@@ -3742,16 +3759,16 @@ version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + dependencies = [ +- "getrandom", ++ "getrandom 0.2.11", + ] + + [[package]] + name = "uuid" +-version = "1.5.0" ++version = "1.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" ++checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" + dependencies = [ +- "getrandom", ++ "getrandom 0.3.3", + ] + + [[package]] +@@ -3803,6 +3820,15 @@ version = "0.11.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + ++[[package]] ++name = "wasi" ++version = "0.14.2+wasi-0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" ++dependencies = [ ++ "wit-bindgen-rt", ++] ++ + [[package]] + name = "wasm-bindgen" + version = "0.2.88" +@@ -4092,6 +4118,15 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "wit-bindgen-rt" ++version = "0.39.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" ++dependencies = [ ++ "bitflags 2.4.1", ++] ++ + [[package]] + name = "xmlwriter" + version = "0.1.0" diff --git a/dim-core/Cargo.toml b/dim-core/Cargo.toml -index b311b7c7af...ffc5d85dbb 100644 +index b311b7c..ffc5d85 100644 --- a/dim-core/Cargo.toml +++ b/dim-core/Cargo.toml -@@ -11,7 +11,7 @@ +@@ -11,7 +11,7 @@ vaapi = ["nightfall/vaapi"] [dependencies] # git dependencies @@ -24,7 +246,7 @@ index b311b7c7af...ffc5d85dbb 100644 "cuda", "ssa_transmux", ] } -@@ -72,7 +72,7 @@ +@@ -72,7 +72,7 @@ tracing-subscriber = { version = "^0.3.10", features = [ "json", ] } url = "2.2.2" @@ -34,10 +256,10 @@ index b311b7c7af...ffc5d85dbb 100644 xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] } diff --git a/dim-web/Cargo.toml b/dim-web/Cargo.toml -index 2da5764d50...4c7574c0b4 100644 +index 2da5764..4c7574c 100644 --- a/dim-web/Cargo.toml +++ b/dim-web/Cargo.toml -@@ -14,7 +14,7 @@ +@@ -14,7 +14,7 @@ dim-utils = { path = "../dim-utils" } dim-events = { path = "../dim-events" } dim-core = { path = "../dim-core" } @@ -46,3 +268,16 @@ index 2da5764d50...4c7574c0b4 100644 "cuda", "ssa_transmux", ] } +diff --git a/dim/Cargo.toml b/dim/Cargo.toml +index b7c8106..38518ba 100644 +--- a/dim/Cargo.toml ++++ b/dim/Cargo.toml +@@ -15,7 +15,7 @@ xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] } + fdlimit = "0.2.1" + + # git dependencies +-nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [ ++nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [ + "cuda", + "ssa_transmux", + ] } diff --git a/pkgs/by-name/di/dim/bump-time.patch b/pkgs/by-name/di/dim/bump-time.patch new file mode 100644 index 000000000000..0e40ceebdfef --- /dev/null +++ b/pkgs/by-name/di/dim/bump-time.patch @@ -0,0 +1,74 @@ +From af60408709d51a002944a3deb92cb4d2b242add5 Mon Sep 17 00:00:00 2001 +From: Gabriel Fontes +Date: Thu, 8 Aug 2024 10:40:44 -0300 +Subject: [PATCH] fix build failure with rust 1.80 + +--- + Cargo.lock | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index adb78aa7..7c057bad 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -643,7 +643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" + dependencies = [ + "percent-encoding", +- "time 0.3.30", ++ "time 0.3.36", + "version_check", + ] + +@@ -2157,6 +2157,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -3301,12 +3307,13 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.30" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", + "powerfmt", + "serde", + "time-core", +@@ -3321,10 +3328,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.15" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -3539,7 +3547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" + dependencies = [ + "crossbeam-channel", +- "time 0.3.30", ++ "time 0.3.36", + "tracing-subscriber", + ] + diff --git a/pkgs/by-name/di/dim/package.nix b/pkgs/by-name/di/dim/package.nix index 53ab3a0ed685..c28db10cab47 100644 --- a/pkgs/by-name/di/dim/package.nix +++ b/pkgs/by-name/di/dim/package.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, buildNpmPackage, - darwin, makeWrapper, ffmpeg, git, @@ -14,9 +13,11 @@ libva, fetchpatch, }: -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "dim"; version = "0-unstable-2023-12-29"; + src = fetchFromGitHub { owner = "Dusk-Labs"; repo = "dim"; @@ -26,8 +27,8 @@ rustPlatform.buildRustPackage rec { frontend = buildNpmPackage { pname = "dim-ui"; - inherit version; - src = "${src}/ui"; + inherit (finalAttrs) version; + src = "${finalAttrs.src}/ui"; postPatch = '' ln -s ${./package-lock.json} package-lock.json @@ -37,12 +38,14 @@ rustPlatform.buildRustPackage rec { installPhase = '' runHook preInstall + cp -r build $out + runHook postInstall ''; }; - patches = [ + cargoPatches = [ # Upstream uses a 'ffpath' function to look for config directory and # (ffmpeg) binaries in the same directory as the binary. Patch it to use # the working dir and PATH instead. @@ -52,6 +55,10 @@ rustPlatform.buildRustPackage rec { # revision for FFmpeg >= 6 support. ./bump-nightfall.patch + # Bump the time dependency to fix build failure with rust 1.80+ + # https://github.com/Dusk-Labs/dim/pull/614 + ./bump-time.patch + # Upstream has some unused imports that prevent things from compiling... # Remove for next release. (fetchpatch { @@ -61,8 +68,16 @@ rustPlatform.buildRustPackage rec { }) ]; + useFetchCargoVendor = true; + cargoHash = "sha256-T0v7pajg3UfRnVOx3ie6rOf+vJSW2l7yoCsJrtxIwcg="; + postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock + substituteInPlace dim-core/src/lib.rs \ + --replace-fail "#![deny(warnings)]" "#![warn(warnings)]" + substituteInPlace dim-events/src/lib.rs \ + --replace-fail "#![deny(warnings)]" "#![warn(warnings)]" + substituteInPlace dim-database/src/lib.rs \ + --replace-fail "#![deny(warnings)]" "#![warn(warnings)]" ''; postConfigure = '' @@ -75,25 +90,10 @@ rustPlatform.buildRustPackage rec { git ]; - buildInputs = - [ sqlite ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ] - ++ lib.optional libvaSupport libva; + buildInputs = [ sqlite ] ++ lib.optional libvaSupport libva; buildFeatures = lib.optional libvaSupport "vaapi"; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "mp4-0.8.2" = "sha256-OtVRtOTU/yoxxoRukpUghpfiEgkKoJZNflMQ3L26Cno="; - "nightfall-0.3.12-rc4" = "sha256-AbSuLe3ySOla3NB+mlfHRHqHuMqQbrThAaUZ747GErE="; - }; - }; - checkFlags = [ # Requires network "--skip=tmdb::tests::johhny_test_seasons" @@ -120,4 +120,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.misterio77 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/di/dinit/package.nix b/pkgs/by-name/di/dinit/package.nix index 0aa23f46e645..394d370bfb88 100644 --- a/pkgs/by-name/di/dinit/package.nix +++ b/pkgs/by-name/di/dinit/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "dinit"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "davmac314"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postFetch = '' [ -f "$out/BUILD" ] && rm "$out/BUILD" ''; - hash = "sha256-mhb/0EeJpUReGE2xxVXs0iUGctDOVnpR1Q+IVUtFT0Y="; + hash = "sha256-IKT4k2eXCOCXtiypGbsIpN0OHS+WKqXvr4Mb61fbl0M="; }; postPatch = '' diff --git a/pkgs/by-name/di/dioxionary/package.nix b/pkgs/by-name/di/dioxionary/package.nix index a4de07a41b84..16fedc05404f 100644 --- a/pkgs/by-name/di/dioxionary/package.nix +++ b/pkgs/by-name/di/dioxionary/package.nix @@ -11,17 +11,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "dioxionary"; - version = "1.1.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "vaaandark"; repo = "dioxionary"; tag = "v${finalAttrs.version}"; - hash = "sha256-7Kex5o518L7v5EAhlr4BGoT7LynTe5JmDU8Urn0H3vA="; + hash = "sha256-xIieWhT/a5dZ+UPfsMWtgwru5nkUdzr8/0pOiqCSnqo="; # enable fetchSubmodules since the tests require dictionaries from the submodules fetchSubmodules = true; }; - cargoHash = "sha256-3Cny2OtEoevlUilL0/xtYbyHcuBsFGEFZG6EX35PL+M="; + cargoHash = "sha256-YFx8V86awxVUX83bNLHRP6nIBZGHck/0ywriBgVqvxY="; useFetchCargoVendor = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/directvnc/package.nix b/pkgs/by-name/di/directvnc/package.nix deleted file mode 100644 index d37ffa86ae35..000000000000 --- a/pkgs/by-name/di/directvnc/package.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - autoreconfHook, - pkg-config, - directfb, - zlib, - libjpeg, - xorgproto, -}: - -stdenv.mkDerivation { - pname = "directvnc"; - version = "0.7.7.2015-04-16"; - - src = fetchFromGitHub { - owner = "drinkmilk"; - repo = "directvnc"; - rev = "d336f586c5865da68873960092b7b5fbc9f8617a"; - sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b"; - }; - - patches = [ - # Pull fix pending upstream inclusion for -fno-common toolchain - # support: - # https://github.com/drinkmilk/directvnc/pull/7 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/drinkmilk/directvnc/commit/e9c23d049bcf31d0097348d44391fe5fd9aad12b.patch"; - sha256 = "1dnzr0dnx20w80r73j4a9n6mhbazjzlr5ps9xjj898924cg140zx"; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - directfb - zlib - libjpeg - xorgproto - ]; - - meta = with lib; { - description = "DirectFB VNC client"; - homepage = "http://drinkmilk.github.io/directvnc/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/di/direnv/package.nix b/pkgs/by-name/di/direnv/package.nix index b2ef901d02b0..06bcfa467f36 100644 --- a/pkgs/by-name/di/direnv/package.nix +++ b/pkgs/by-name/di/direnv/package.nix @@ -6,20 +6,21 @@ bash, fish, zsh, + writableTmpDirAsHomeHook, }: buildGoModule rec { pname = "direnv"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - hash = "sha256-C4FkBS+2MZGGlpWb7ng4Aa9IvqEuY716M5h2W3b8N1E="; + hash = "sha256-xqHc4Eb0mHQezmElJv20AMNQPgusXdvskNmlO+JP1lw="; }; - vendorHash = "sha256-O2NZgWn00uKLstYPIj9LwyF4kmitJ1FXltazv8RrmZg="; + vendorHash = "sha256-+7HnbJ6cIzYHkEJVcp2IydHyuqD5PfdL6TUcq7Dpluk="; # we have no bash at the moment for windows BASH_PATH = lib.optionalString (!stdenv.hostPlatform.isWindows) "${bash}/bin/bash"; @@ -36,11 +37,15 @@ buildGoModule rec { nativeCheckInputs = [ fish zsh + writableTmpDirAsHomeHook ]; checkPhase = '' - export HOME=$(mktemp -d) + runHook preCheck + make test-go test-bash test-fish test-zsh + + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/by-name/di/dirt/package.nix b/pkgs/by-name/di/dirt/package.nix index 1791a0a6c31a..cb6d240242ab 100644 --- a/pkgs/by-name/di/dirt/package.nix +++ b/pkgs/by-name/di/dirt/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, libsndfile, libsamplerate, liblo, @@ -11,44 +10,43 @@ stdenv.mkDerivation { pname = "dirt"; - version = "unstable-2018-01-01"; + version = "0-unstable-2025-03-30"; + src = fetchFromGitHub { repo = "Dirt"; owner = "tidalcycles"; - rev = "b09604c7d8e581bc7799d7e2ad293e7cdd254bda"; - sha256 = "13adglk2d31d7mswfvi02b0rjdhzmsv11cc8smhidmrns3f9s96n"; + rev = "4edc6192da3508fecb9f2e26bb0370cdeb6c4166"; + hash = "sha256-Zo1RzlfENnI2OmwPfO+O8u6Y1BToy911PYzdPQzK2sk="; fetchSubmodules = true; }; - patches = [ - # Pull patch pending upstream inclusion for upstream gcc-10 support: - # https://github.com/tidalcycles/Dirt/pull/65 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/tidalcycles/Dirt/commit/43fd267745d486228c4185b4fcbd7d9fbc362cc2.patch"; - sha256 = "08r34ylzs31wwf0la995pb149ccq0vr7qg4792pkhca57zi0bff8"; - }) - ]; + buildInputs = [ libsndfile libsamplerate liblo libjack2 ]; + postPatch = '' sed -i "s|./samples|$out/share/dirt/samples|" dirt.c ''; + makeFlags = [ "PREFIX=$(out)" ]; + + # error: passing argument 4 of 'lo_server_thread_add_method' from incompatible pointer type + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + postInstall = '' mkdir -p $out/share/dirt/ cp -r samples $out/share/dirt/ ''; - meta = with lib; { + meta = { description = "Unimpressive thingie for playing bits of samples with some level of accuracy"; homepage = "https://github.com/tidalcycles/Dirt"; - license = licenses.gpl3; - maintainers = with maintainers; [ anderspapitto ]; - platforms = with platforms; linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ anderspapitto ]; + platforms = lib.platforms.linux; mainProgram = "dirt"; }; } diff --git a/pkgs/by-name/di/discord-gamesdk/package.nix b/pkgs/by-name/di/discord-gamesdk/package.nix index 5d7a8185be45..c82b6c4fde10 100644 --- a/pkgs/by-name/di/discord-gamesdk/package.nix +++ b/pkgs/by-name/di/discord-gamesdk/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = let - processor = stdenv.hostPlatform.uname.processor; + processor = stdenv.hostPlatform.parsed.cpu.name; sharedLibrary = stdenv.hostPlatform.extensions.sharedLibrary; in '' diff --git a/pkgs/by-name/di/discord-rpc/package.nix b/pkgs/by-name/di/discord-rpc/package.nix new file mode 100644 index 000000000000..530e70732acf --- /dev/null +++ b/pkgs/by-name/di/discord-rpc/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + rapidjson, + buildExamples ? false, +}: + +stdenv.mkDerivation rec { + pname = "discord-rpc"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "discordapp"; + repo = pname; + rev = "v${version}"; + sha256 = "04cxhqdv5r92lrpnhxf8702a8iackdf3sfk1050z7pijbijiql2a"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + rapidjson + ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=true" + "-DBUILD_EXAMPLES=${lib.boolToString buildExamples}" + ]; + + patches = [ + # Adds unreleased PR https://github.com/discord/discord-rpc/pull/387 + (fetchpatch { + name = "0001-Update-.clang-format.patch"; + url = "https://github.com/discord/discord-rpc/commit/dc26645316a1996a10995d9f5fae53ca1caddade.patch"; + hash = "sha256-geofgXwfbDsvsYCz92IVFrdvBDiGvMBiFd3GEbsdoHU="; + }) + ]; + + meta = with lib; { + description = "Official library to interface with the Discord client"; + homepage = "https://github.com/discordapp/discord-rpc"; + license = licenses.mit; + maintainers = [ ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/di/discordchatexporter-desktop/package.nix b/pkgs/by-name/di/discordchatexporter-desktop/package.nix index ad643bceca4d..836913be9ff7 100644 --- a/pkgs/by-name/di/discordchatexporter-desktop/package.nix +++ b/pkgs/by-name/di/discordchatexporter-desktop/package.nix @@ -40,7 +40,7 @@ buildDotnetModule rec { homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; license = licenses.gpl3Plus; changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md"; - maintainers = with maintainers; [ kekschen ]; + maintainers = with maintainers; [ willow ]; platforms = [ "x86_64-linux" ]; mainProgram = "discordchatexporter"; }; diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index 1a6c9b2305ff..43fefc03b2a6 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -12,12 +12,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "disko"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0="; + hash = "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; diff --git a/pkgs/by-name/di/diskus/package.nix b/pkgs/by-name/di/diskus/package.nix new file mode 100644 index 000000000000..d83b2fa79fe2 --- /dev/null +++ b/pkgs/by-name/di/diskus/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "diskus"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = "diskus"; + rev = "v${version}"; + sha256 = "sha256-88+U5Y2CC0PhikRO3VqoUwZEYZjwln+61OPWbLLb8T0="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-keBnhE4ltOVMEuxPifiB2EAHk32u3PqaPGTeVexVXWM="; + + meta = with lib; { + description = "Minimal, fast alternative to 'du -sh'"; + homepage = "https://github.com/sharkdp/diskus"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = [ maintainers.fuerbringer ]; + platforms = platforms.unix; + longDescription = '' + diskus is a very simple program that computes the total size of the + current directory. It is a parallelized version of du -sh. + ''; + mainProgram = "diskus"; + }; +} diff --git a/pkgs/by-name/di/dispad/package.nix b/pkgs/by-name/di/dispad/package.nix deleted file mode 100644 index c74e108ded06..000000000000 --- a/pkgs/by-name/di/dispad/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - libX11, - libXi, - libconfuse, -}: - -stdenv.mkDerivation rec { - pname = "dispad"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "BlueDragonX"; - repo = "dispad"; - rev = "v${version}"; - hash = "sha256-PtwvaNtnCm3Y+6vlxPDc21RyIA2v3vkMOHpoGFxNFng="; - }; - - buildInputs = [ - libX11 - libXi - libconfuse - ]; - - meta = with lib; { - description = "Small daemon for disabling trackpads while typing"; - homepage = "https://github.com/BlueDragonX/dispad"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ zimbatm ]; - platforms = platforms.linux; - mainProgram = "dispad"; - }; -} diff --git a/pkgs/by-name/di/displaycal/package.nix b/pkgs/by-name/di/displaycal/package.nix index 260990326c3b..0cc84d63161a 100644 --- a/pkgs/by-name/di/displaycal/package.nix +++ b/pkgs/by-name/di/displaycal/package.nix @@ -11,13 +11,13 @@ python3.pkgs.buildPythonApplication rec { pname = "displaycal"; - version = "3.9.15"; + version = "3.9.16"; format = "setuptools"; src = fetchPypi { pname = "DisplayCAL"; inherit version; - hash = "sha256-VX3xQQn8FKcrqyx1RpGste2QmATgTh6cCowAmtnpbeM="; + hash = "sha256-Ozl0RrYJ/oarNddnz+JjQKyRY6ZNvM9sJapqn75X3Mw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix index fc5297d95afa..4a5f5f7f07a2 100644 --- a/pkgs/by-name/di/dissent/package.nix +++ b/pkgs/by-name/di/dissent/package.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "dissent"; - version = "0.0.32"; + version = "0.0.34"; src = fetchFromGitHub { owner = "diamondburned"; repo = "dissent"; tag = "v${version}"; - hash = "sha256-6ZUJp4pW+rbV+2TJ9H69kThc5zzDFG5KjGRHVwFS76Q="; + hash = "sha256-65UsXSxcEQhQM3N4wUoEehJmF9pJPcGCG7fF/DWe+zU="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ buildGoModule rec { install -D -m 444 -t $out/share/dbus-1/services nix/so.libdb.dissent.service ''; - vendorHash = "sha256-cA+rD7mbTYE+LqdLFFV8Li65wL2B5cUFwxWsMwNMRQg="; + vendorHash = "sha256-unb/x7bzWWkr2zKioOarY2VdrGBiJq/mORsWifuulqQ="; meta = { description = "Third-party Discord client designed for a smooth, native experience (formerly gtkcord4)"; diff --git a/pkgs/by-name/di/distant/package.nix b/pkgs/by-name/di/distant/package.nix index 23a9a02d7863..2153efe0a10d 100644 --- a/pkgs/by-name/di/distant/package.nix +++ b/pkgs/by-name/di/distant/package.nix @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/di/distgen/package.nix b/pkgs/by-name/di/distgen/package.nix index fc2f68fdf22f..2cf615a79017 100644 --- a/pkgs/by-name/di/distgen/package.nix +++ b/pkgs/by-name/di/distgen/package.nix @@ -6,32 +6,44 @@ python3.pkgs.buildPythonApplication rec { pname = "distgen"; - version = "1.18"; + version = "2.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lS6OeEaPiK8Pskuoww9KwyNhKnGQ+dHhdPmZn1Igj0Q="; + hash = "sha256-VG9EX9LHoZamBM3PEm5qGpViK39qD+PA8vcHTzvsW+o="; }; - nativeCheckInputs = with python3.pkgs; [ - pytest - mock + build-system = with python3.pkgs; [ + setuptools + argparse-manpage ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ distro jinja2 six pyyaml ]; - checkPhase = "make test-unit PYTHON=${python3.executable}"; + nativeCheckInputs = with python3.pkgs; [ + pytest + mock + ]; - meta = with lib; { + checkPhase = '' + runHook preCheck + + make test-unit PYTHON=${python3.executable} + + runHook postCheck + ''; + + meta = { description = "Templating system/generator for distributions"; mainProgram = "dg"; - license = licenses.gpl2Plus; - homepage = "https://distgen.readthedocs.io/"; - maintainers = with maintainers; [ bachp ]; + license = lib.licenses.gpl2Plus; + homepage = "https://distgen.readthedocs.io"; + maintainers = with lib.maintainers; [ bachp ]; }; } diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix index fdbc44c8a501..0acf92585bf5 100644 --- a/pkgs/by-name/di/distribution/package.nix +++ b/pkgs/by-name/di/distribution/package.nix @@ -7,15 +7,15 @@ distribution, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "distribution"; - version = "3.0.0-rc.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "distribution"; repo = "distribution"; - tag = "v${version}"; - hash = "sha256-aDvcwsA1J1S7haNGvb2PikN51PpDqM93NJQKRH/acwM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-myezQTEdH7kkpCoAeZMf5OBxT4Bz8Qx6vCnwim230RY="; }; vendorHash = null; @@ -30,7 +30,7 @@ buildGoModule rec { passthru = { tests.version = testers.testVersion { package = distribution; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; updateScript = nix-update-script { }; }; @@ -50,4 +50,4 @@ buildGoModule rec { mainProgram = "registry"; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix index 74b87fda311c..c7970e436c50 100644 --- a/pkgs/by-name/di/distrobox/package.nix +++ b/pkgs/by-name/di/distrobox/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; - version = "1.8.1"; + version = "1.8.1.2"; src = fetchFromGitHub { owner = "89luca89"; repo = "distrobox"; rev = finalAttrs.version; - hash = "sha256-SwSb3UETvimRtbcmD9f6A57MpnHP6p9trW+OBQW5ZyY="; + hash = "sha256-wTu+8SQZaf8TKkjyvKqTvIWnCZTiPnozybTu5uKXEJk="; }; dontConfigure = true; diff --git a/pkgs/by-name/di/distrobuilder/nixos-generator.patch b/pkgs/by-name/di/distrobuilder/nixos-generator.patch index 7379274fa072..44e668dfb552 100644 --- a/pkgs/by-name/di/distrobuilder/nixos-generator.patch +++ b/pkgs/by-name/di/distrobuilder/nixos-generator.patch @@ -1,16 +1,16 @@ -diff --git a/distrobuilder/lxc.generator b/distrobuilder/lxc.generator -index dc5b506..0265da8 100644 ---- a/distrobuilder/lxc.generator -+++ b/distrobuilder/lxc.generator -@@ -21,16 +21,6 @@ is_incus_vm() { - [ -e /dev/virtio-ports/org.linuxcontainers.incus ] +diff --git c/distrobuilder/lxc.generator w/distrobuilder/lxc.generator +index 5f854d3..927f2df 100644 +--- c/distrobuilder/lxc.generator ++++ w/distrobuilder/lxc.generator +@@ -16,16 +16,6 @@ is_lxc_privileged_container() { + grep -qw 4294967295$ /proc/self/uid_map } -# is_in_path succeeds if the given file exists in on of the paths -is_in_path() { - # Don't use $PATH as that may not include all relevant paths - for path in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin; do -- [ -e "${path}/$1" ] && return 0 +- [ -e "${path}/${1}" ] && return 0 - done - - return 1 @@ -19,21 +19,23 @@ index dc5b506..0265da8 100644 ## Fix functions # fix_ro_paths avoids udevd issues with /sys and /proc being writable fix_ro_paths() { -@@ -42,38 +32,6 @@ fix_ro_paths() { +@@ -47,41 +37,6 @@ fix_ro_run() { EOF } -# fix_nm_link_state forces the network interface to a DOWN state ahead of NetworkManager starting up -fix_nm_link_state() { -- [ -e "/sys/class/net/$1" ] || return 0 -- ip_path= -- if [ -f /sbin/ip ]; then -- ip_path=/sbin/ip -- elif [ -f /bin/ip ]; then -- ip_path=/bin/ip +- [ -e "/sys/class/net/${1}" ] || return 0 +- +- ip= +- if [ -f "/sbin/ip" ]; then +- ip="/sbin/ip" +- elif [ -f "/bin/ip" ]; then +- ip="/bin/ip" - else - return 0 - fi +- - cat <<-EOF > /run/systemd/system/network-device-down.service - # This file was created by distrobuilder - [Unit] @@ -44,13 +46,14 @@ index dc5b506..0265da8 100644 - [Service] - # do not turn off if there is a default route to 169.254.0.1, i.e. the device is a routed nic - ExecCondition=/bin/sh -c '! /usr/bin/grep -qs 00000000.0100FEA9 /proc/net/route' -- ExecStart=-${ip_path} link set $1 down +- ExecStart=-${ip} link set ${1} down - Type=oneshot - RemainAfterExit=true - - [Install] - WantedBy=default.target - EOF +- - mkdir -p /run/systemd/system/default.target.wants - ln -sf /run/systemd/system/network-device-down.service /run/systemd/system/default.target.wants/network-device-down.service -} @@ -58,78 +61,105 @@ index dc5b506..0265da8 100644 # fix_systemd_override_unit generates a unit specific override fix_systemd_override_unit() { dropin_dir="/run/systemd/${1}.d" -@@ -113,16 +71,7 @@ fix_systemd_mask() { +@@ -122,16 +77,7 @@ fix_systemd_mask() { # fix_systemd_udev_trigger overrides the systemd-udev-trigger.service to match the latest version # of the file which uses "ExecStart=-" instead of "ExecStart=". fix_systemd_udev_trigger() { -- cmd= +- udev= - if [ -f /usr/bin/udevadm ]; then -- cmd=/usr/bin/udevadm +- udev=/usr/bin/udevadm - elif [ -f /sbin/udevadm ]; then -- cmd=/sbin/udevadm +- udev=/sbin/udevadm - elif [ -f /bin/udevadm ]; then -- cmd=/bin/udevadm +- udev=/bin/udevadm - else - return 0 - fi -+ cmd=udevadm ++ udev=/run/current-system/sw/bin/udevadm mkdir -p /run/systemd/system/systemd-udev-trigger.service.d cat <<-EOF > /run/systemd/system/systemd-udev-trigger.service.d/zzz-lxc-override.conf -@@ -134,38 +83,13 @@ fix_systemd_udev_trigger() { +@@ -143,52 +89,40 @@ fix_systemd_udev_trigger() { EOF } -# fix_systemd_sysctl overrides the systemd-sysctl.service to use "ExecStart=-" instead of "ExecStart=". -fix_systemd_sysctl() { -- cmd=/usr/lib/systemd/systemd-sysctl -- ! [ -e "${cmd}" ] && cmd=/lib/systemd/systemd-sysctl +- sysctl=/usr/lib/systemd/systemd-sysctl +- [ ! -e "${sysctl}" ] && sysctl=/lib/systemd/systemd-sysctl +- - mkdir -p /run/systemd/system/systemd-sysctl.service.d - cat <<-EOF > /run/systemd/system/systemd-sysctl.service.d/zzz-lxc-override.conf - # This file was created by distrobuilder - [Service] - ExecStart= -- ExecStart=-${cmd} +- ExecStart=-${sysctl} - EOF -} - ## Main logic --# Nothing to do in Incus VM but deployed in case it is later converted to a container --is_incus_vm && exit 0 - # Exit immediately if not an Incus/LXC container is_lxc_container || exit 0 --# Check for NetworkManager --nm_exists=0 -- --is_in_path NetworkManager && nm_exists=1 -- # Determine systemd version +-SYSTEMD="" -for path in /usr/lib/systemd/systemd /lib/systemd/systemd; do - [ -x "${path}" ] || continue -- -- systemd_version="$("${path}" --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)" ++SYSTEMD="$(/run/current-system/sw/lib/systemd/systemd --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)" + +- SYSTEMD="$("${path}" --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)" - break -done -+systemd_version="$(systemd --version | head -n1 | cut -d' ' -f2)" - # Determine distro name and release - ID="" -@@ -196,7 +120,6 @@ fi +-# Apply systemd overrides +-if [ "${SYSTEMD}" -ge 244 ]; then +- fix_systemd_override_unit system/service +-else +- # Setup per-unit overrides +- find /lib/systemd /etc/systemd /run/systemd /usr/lib/systemd -name "*.service" -type f | sed 's#/\(lib\|etc\|run\|usr/lib\)/systemd/##g'| while read -r service_file; do +- fix_systemd_override_unit "${service_file}" +- done +-fi + +-# Workarounds for unprivileged containers. +-if ! is_lxc_privileged_container; then +- fix_ro_paths systemd-networkd.service +- fix_ro_paths systemd-resolved.service ++ ++# Overriding some systemd features is only needed if security.nesting=false ++# in which case, /dev/.lxc will be missing ++# Adding this conditional back for NixOS as we do not have the reported ++# problems, and the overrides could reduce potential service hardening ++if [ ! -d /dev/.lxc ]; then ++ # Apply systemd overrides ++ if [ "${SYSTEMD}" -ge 244 ]; then ++ fix_systemd_override_unit system/service ++ else ++ # Setup per-unit overrides ++ find /lib/systemd /etc/systemd /run/systemd /usr/lib/systemd -name "*.service" -type f | sed 's#/\(lib\|etc\|run\|usr/lib\)/systemd/##g'| while read -r service_file; do ++ fix_systemd_override_unit "${service_file}" ++ done ++ fi ++ ++ # Workarounds for unprivileged containers. ++ if ! is_lxc_privileged_container; then ++ fix_ro_paths systemd-networkd.service ++ fix_ro_paths systemd-resolved.service ++ fi + fi # Ignore failures on some units. fix_systemd_udev_trigger -fix_systemd_sysctl - # Mask some units. - fix_systemd_mask dev-hugepages.mount -@@ -226,11 +149,6 @@ if [ -d /etc/udev ]; then + # Fix issues with /run not being writable. + fix_ro_run systemd-nsresourced.service +@@ -221,11 +155,6 @@ if [ -d /etc/udev ]; then EOF fi -# Workarounds for NetworkManager in containers --if [ "${nm_exists}" -eq 1 ]; then +-if is_in_path NetworkManager; then - fix_nm_link_state eth0 -fi - diff --git a/pkgs/by-name/di/distrobuilder/package.nix b/pkgs/by-name/di/distrobuilder/package.nix index bc204e8d74a6..657aaf6419c0 100644 --- a/pkgs/by-name/di/distrobuilder/package.nix +++ b/pkgs/by-name/di/distrobuilder/package.nix @@ -10,6 +10,7 @@ gnutar, hivex, makeWrapper, + nix-update-script, nixosTests, pkg-config, squashfsTools, @@ -35,16 +36,15 @@ let in buildGoModule rec { pname = "distrobuilder"; - version = "3.1"; + version = "3.2"; - vendorHash = "sha256-3oHLvOdHbOdaL2FTo+a5HmayNi/i3zoAsU/du9h1N30="; + vendorHash = "sha256-nlqapWxuSZlbt22F3Y9X1uXFxJHvEoUBZDl078x8ZnA="; src = fetchFromGitHub { owner = "lxc"; repo = "distrobuilder"; - rev = "refs/tags/distrobuilder-${version}"; - sha256 = "sha256-cIzIoLQmg1kgI1QRAmFh/ca88PJBW2yIY92BKHKwTMk="; - fetchSubmodules = false; + tag = "distrobuilder-${version}"; + sha256 = "sha256-aDCx2WGAKdTNf0uMzwxG0AUmbuuWBFPYzNyycKklYOY="; }; buildInputs = bins; @@ -67,13 +67,15 @@ buildGoModule rec { }; generator = callPackage ./generator.nix { inherit src version; }; + + updateScript = nix-update-script { }; }; meta = { description = "System container image builder for LXC and LXD"; homepage = "https://github.com/lxc/distrobuilder"; license = lib.licenses.asl20; - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; platforms = lib.platforms.linux; mainProgram = "distrobuilder"; }; diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix index 5d491178bd3b..da7faadf9365 100644 --- a/pkgs/by-name/di/diswall/package.nix +++ b/pkgs/by-name/di/diswall/package.nix @@ -1,14 +1,9 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Security; -in rustPlatform.buildRustPackage rec { pname = "diswall"; version = "0.6.1"; @@ -20,10 +15,6 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-t2ZBi3ab6OUWzc0L0Hq/ay+s3KNDMeu6mkYxti48BuE="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-I4jfeOtK+ho2jksGHgQqHE+L6UzS240t+7v3/Eb/xAs="; diff --git a/pkgs/by-name/di/diylc/package.nix b/pkgs/by-name/di/diylc/package.nix index b56c50137d47..adbdae1f6721 100644 --- a/pkgs/by-name/di/diylc/package.nix +++ b/pkgs/by-name/di/diylc/package.nix @@ -2,88 +2,71 @@ lib, stdenv, fetchurl, + copyDesktopItems, makeDesktopItem, unzip, - bash, - jre8, + jdk17, + makeBinaryWrapper, }: -let +stdenv.mkDerivation (finalAttrs: { pname = "diylc"; - version = "4.18.0"; - files = { - app = fetchurl { - url = "https://github.com/bancika/diy-layout-creator/releases/download/v${version}/diylc-${version}.zip"; - sha256 = "09fpp3dn086clgnjz5yj4fh5bnjvj6mvxkx9n3zamcwszjmxr40d"; - }; - icon16 = fetchurl { - url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_small.png"; - sha256 = "1is50aidfwzwfzwqv57s2hwhx0r5c21cp77bkl93xkdqkh2wd8x4"; - }; - icon32 = fetchurl { - url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_medium.png"; - sha256 = "0a45p18n84xz1nd3zv3y16jlimvqzhbzg3q3f4lawgx4rcrn2n3d"; - }; - icon48 = fetchurl { - url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_large.png"; - sha256 = "06dkz0dcy8hfmnzr5ri5n1sh8r7mg83kzbvs3zy58wwhgzs1ddk6"; - }; - }; - launcher = makeDesktopItem { - name = "diylc"; - desktopName = "DIY Layout Creator"; - comment = "Multi platform circuit layout and schematic drawing tool"; - exec = "diylc"; - icon = "diylc_icon"; - categories = [ - "Development" - "Electronics" - ]; - }; -in -stdenv.mkDerivation { - inherit pname version; + version = "5.3.0"; - dontUnpack = true; + src = fetchurl { + url = "https://github.com/bancika/diy-layout-creator/releases/download/v${finalAttrs.version}/diylc-${finalAttrs.version}-universal.zip"; + hash = "sha256-1oeeU9SkDqS3vF/b4B4ACJ6NjtkS9lQBl7yEF+rFTY0="; + }; - buildInputs = [ jre8 ]; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ + copyDesktopItems + unzip + makeBinaryWrapper + ]; + + desktopItems = [ + (makeDesktopItem { + name = "diylc"; + desktopName = "DIY Layout Creator"; + comment = "Multi platform circuit layout and schematic drawing tool"; + exec = "diylc"; + icon = "diylc_icon"; + categories = [ + "Development" + "Electronics" + ]; + }) + ]; installPhase = '' runHook preInstall - mkdir -p $out/share/diylc - unzip -UU ${files.app} -d $out/share/diylc - rm $out/share/diylc/diylc.exe - rm $out/share/diylc/run.sh - # Nope, the icon cannot be named 'diylc' because KDE does not like it. - install -Dm644 ${files.icon16} $out/share/icons/hicolor/16x16/apps/diylc_icon.png - install -Dm644 ${files.icon32} $out/share/icons/hicolor/32x32/apps/diylc_icon.png - install -Dm644 ${files.icon48} $out/share/icons/hicolor/48x48/apps/diylc_icon.png - - mkdir -p $out/share/applications - ln -s ${launcher}/share/applications/* $out/share/applications/ - - mkdir -p $out/bin - cat < $out/bin/diylc - #!${bash}/bin/sh - cd $out/share/diylc - ${jre8}/bin/java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter - EOF - chmod +x $out/bin/diylc + install -Dm644 icons/icon_16x16.png $out/share/icons/hicolor/16x16/apps/diylc_icon.png + install -Dm644 icons/icon_32x32.png $out/share/icons/hicolor/32x32/apps/diylc_icon.png + install -Dm644 icons/icon_48x48.png $out/share/icons/hicolor/48x48/apps/diylc_icon.png + install -Dm644 icons/icon_64x64.png $out/share/icons/hicolor/64x64/apps/diylc_icon.png + install -Dm644 icons/icon_512x512.png $out/share/icons/hicolor/512x512/apps/diylc_icon.png + install -Dm644 diylc.jar $out/app/diylc/diylc.jar + install -Dm755 run.sh $out/app/diylc/run.sh + patchShebangs $out/app/diylc/run.sh + substituteInPlace $out/app/diylc/run.sh \ + --replace-fail '$(which java)' "${jdk17}/bin/java" \ + --replace-fail "exec java" "exec ${jdk17}/bin/java" + mkdir $out/bin + makeWrapper $out/app/diylc/run.sh $out/bin/diylc runHook postInstall ''; - meta = with lib; { + meta = { description = "Multi platform circuit layout and schematic drawing tool"; mainProgram = "diylc"; - homepage = "https://bancika.github.io/diy-layout-creator/"; + homepage = "https://bancika.github.io/diy-layout-creator"; changelog = "https://github.com/bancika/diy-layout-creator/releases"; - license = licenses.gpl3Plus; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/dj/django-upgrade/package.nix b/pkgs/by-name/dj/django-upgrade/package.nix index d190c11e5f3c..01d6a65956b5 100644 --- a/pkgs/by-name/dj/django-upgrade/package.nix +++ b/pkgs/by-name/dj/django-upgrade/package.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; pythonImportsCheck = [ "django_upgrade" ]; diff --git a/pkgs/by-name/dl/dleyna-connector-dbus/package.nix b/pkgs/by-name/dl/dleyna-connector-dbus/package.nix deleted file mode 100644 index f0b64e2f6361..000000000000 --- a/pkgs/by-name/dl/dleyna-connector-dbus/package.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - stdenv, - lib, - meson, - ninja, - pkg-config, - fetchFromGitHub, - fetchpatch, - dleyna-core, - glib, -}: - -stdenv.mkDerivation rec { - pname = "dleyna-connector-dbus"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "phako"; - repo = "dleyna-connector-dbus"; - rev = "v${version}"; - sha256 = "WDmymia9MD3BRU6BOCzCIMrz9V0ACRzmEGqjbbuUmlA="; - }; - - patches = [ - # Fix build with meson 1.2. We use the gentoo patch instead of the - # usptream one because the latter only applies on the libsoup_3 based - # merged dLeyna project. - # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 - (fetchpatch { - url = "https://github.com/gentoo/gentoo/raw/4a0982b49a1d94aa785b05d9b7d256c26c499910/net-libs/dleyna-connector-dbus/files/meson-1.2.0.patch"; - sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - dleyna-core - glib - ]; - - meta = with lib; { - description = "D-Bus API for the dLeyna services"; - homepage = "https://github.com/phako/dleyna-connector-dbus"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/by-name/dl/dleyna-core/package.nix b/pkgs/by-name/dl/dleyna-core/package.nix deleted file mode 100644 index 92f021ae594a..000000000000 --- a/pkgs/by-name/dl/dleyna-core/package.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - meson, - ninja, - pkg-config, - gupnp, -}: - -stdenv.mkDerivation rec { - pname = "dleyna-core"; - version = "0.7.0"; - - outputs = [ - "out" - "dev" - ]; - - setupHook = ./setup-hook.sh; - - src = fetchFromGitHub { - owner = "phako"; - repo = "dleyna-core"; - rev = "v${version}"; - sha256 = "i4L9+iyAdBNtgImbD54jkjYL5hvzeZ2OaAyFrcFmuG0="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - propagatedBuildInputs = [ - gupnp - ]; - - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.cc.isClang [ - "-Wno-error=implicit-function-declaration" - "-Wno-error=int-conversion" - ] - ); - - meta = with lib; { - description = "Library of utility functions that are used by the higher level dLeyna"; - homepage = "https://github.com/phako/dleyna-core"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/by-name/dl/dleyna-core/setup-hook.sh b/pkgs/by-name/dl/dleyna-core/setup-hook.sh deleted file mode 100644 index 287ad4dc1897..000000000000 --- a/pkgs/by-name/dl/dleyna-core/setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -addDleynaConnectorPath () { - if test -d "$1/lib/dleyna-1.0/connectors" - then - export DLEYNA_CONNECTOR_PATH="${DLEYNA_CONNECTOR_PATH-}${DLEYNA_CONNECTOR_PATH:+:}$1/lib/dleyna-1.0/connectors" - fi -} - -addEnvHooks "$targetOffset" addDleynaConnectorPath diff --git a/pkgs/by-name/dl/dleyna-renderer/package.nix b/pkgs/by-name/dl/dleyna-renderer/package.nix deleted file mode 100644 index d4d0adb60244..000000000000 --- a/pkgs/by-name/dl/dleyna-renderer/package.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - meson, - ninja, - pkg-config, - dleyna-connector-dbus, - dleyna-core, - gssdp, - gupnp, - gupnp-av, - gupnp-dlna, - libsoup_2_4, - makeWrapper, - docbook-xsl-nons, - libxslt, -}: - -stdenv.mkDerivation rec { - pname = "dleyna-renderer"; - version = "0.7.2"; - - src = fetchFromGitHub { - owner = "phako"; - repo = "dleyna-renderer"; - rev = "v${version}"; - sha256 = "sha256-bGasT3XCa7QHV3D7z59TSHoqWksNSIgaO0z9zYfHHuw="; - }; - - patches = [ - # Fix build with meson 1.2. We use the gentoo patch instead of the - # usptream one because the latter only applies on the libsoup_3 based - # merged dLeyna project. - # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 - (fetchpatch { - url = "https://github.com/gentoo/gentoo/raw/2ebe20ff4cda180cc248d31a021107d08ecf39d9/net-libs/dleyna-renderer/files/meson-1.2.0.patch"; - sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - makeWrapper - - # manpage - docbook-xsl-nons - libxslt # for xsltproc - ]; - - buildInputs = [ - dleyna-core - dleyna-connector-dbus # runtime dependency to be picked up to DLEYNA_CONNECTOR_PATH - gssdp - gupnp - gupnp-av - gupnp-dlna - libsoup_2_4 - ]; - - preFixup = '' - wrapProgram "$out/libexec/dleyna-renderer-service" \ - --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH" - ''; - - meta = with lib; { - description = "Library to discover and manipulate Digital Media Renderers"; - homepage = "https://github.com/phako/dleyna-renderer"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/by-name/dl/dleyna-server/package.nix b/pkgs/by-name/dl/dleyna-server/package.nix deleted file mode 100644 index 6850d3d8200c..000000000000 --- a/pkgs/by-name/dl/dleyna-server/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - meson, - ninja, - makeWrapper, - pkg-config, - dleyna-core, - dleyna-connector-dbus, - gssdp, - gupnp, - gupnp-av, - gupnp-dlna, - libsoup_2_4, -}: - -stdenv.mkDerivation rec { - pname = "dleyna-server"; - version = "0.7.2"; - - src = fetchFromGitHub { - owner = "phako"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-jlF9Lr/NG+Fsy/bB7aLb7xOLqel8GueJK5luo9rsDME="; - }; - - patches = [ - # Fix build with meson 1.2. We use the gentoo patch instead of the - # usptream one because the latter only applies on the libsoup_3 based - # merged dLeyna project. - # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 - (fetchpatch { - url = "https://github.com/gentoo/gentoo/raw/2e3a1f4f7a1ef0c3e387389142785d98b5834e60/net-misc/dleyna-server/files/meson-1.2.0.patch"; - sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - makeWrapper - ]; - - buildInputs = [ - dleyna-core - dleyna-connector-dbus # runtime dependency to be picked up to DLEYNA_CONNECTOR_PATH - gssdp - gupnp - gupnp-av - gupnp-dlna - libsoup_2_4 - ]; - - preFixup = '' - wrapProgram "$out/libexec/dleyna-server-service" \ - --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH" - ''; - - meta = with lib; { - description = "Library to discover, browse and manipulate Digital Media Servers"; - homepage = "https://github.com/phako/dleyna-server"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/by-name/dl/dleyna/package.nix b/pkgs/by-name/dl/dleyna/package.nix new file mode 100644 index 000000000000..d40c9b89bbcd --- /dev/null +++ b/pkgs/by-name/dl/dleyna/package.nix @@ -0,0 +1,57 @@ +{ + stdenv, + lib, + docutils, + fetchFromGitLab, + meson, + ninja, + pkg-config, + gupnp_1_6, + gupnp-av, + gupnp-dlna, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dleyna"; + version = "0.8.3"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "dLeyna"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ti4yF8sALpWyrdQTt/jVrMKQ4PLhakEi620fJNMxT0c="; + }; + + nativeBuildInputs = [ + meson + ninja + docutils + pkg-config + ]; + + buildInputs = [ + gupnp_1_6 + gupnp-dlna + gupnp-av + gupnp-dlna + ]; + + mesonFlags = [ + # Sphinx docs not installed, do not depend on sphinx + "-Ddocs=false" + ]; + + meta = { + description = "Library of utility functions that are used by the higher level dLeyna"; + homepage = "https://gitlab.gnome.org/World/dLeyna"; + maintainers = with lib.maintainers; [ jtojnar ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl21Only; + }; +}) diff --git a/pkgs/by-name/dl/dlib/package.nix b/pkgs/by-name/dl/dlib/package.nix index 16c34f2168dc..7817b88b25e5 100644 --- a/pkgs/by-name/dl/dlib/package.nix +++ b/pkgs/by-name/dl/dlib/package.nix @@ -20,13 +20,13 @@ }@inputs: (if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec { pname = "dlib"; - version = "19.24.8"; + version = "19.24.9"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; tag = "v${version}"; - sha256 = "sha256-b8DFlfBnF4Fk7beJPxQJDVHaCR7s5/4uAPi3RV9cBZ4="; + sha256 = "sha256-Uil7Eh6LNaglrMY6fK6b00PdA4E2KnZKng4s7v1tewo="; }; postPatch = '' diff --git a/pkgs/by-name/dl/dlx/package.nix b/pkgs/by-name/dl/dlx/package.nix index 4aa97c8efd28..5afed01df063 100644 --- a/pkgs/by-name/dl/dlx/package.nix +++ b/pkgs/by-name/dl/dlx/package.nix @@ -6,18 +6,21 @@ stdenv.mkDerivation { pname = "dlx"; - version = "2012-07-08"; + version = "0-unstable-2012-07-08"; src = fetchzip { url = "https://www.davidviner.com/zip/dlx/dlx.zip"; - sha256 = "0508linnar9ivy3xr99gzrb2l027ngx12dlxaxs7w67cnwqnb0dg"; + hash = "sha256-r4FlMbfsGH50V502EfqzRwAqVv4vpdyH3zFlZW2kCBQ="; }; - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "LINK=${stdenv.cc.targetPrefix}cc" - "CFLAGS=-O2" - ]; + preBuild = '' + makeFlagsArray+=( + CC="${stdenv.cc.targetPrefix}cc" + LINK="${stdenv.cc.targetPrefix}cc" + CFLAGS="-O2 -Wno-implicit-function-declaration" + ) + ''; + hardeningDisable = [ "format" ]; installPhase = '' @@ -28,10 +31,10 @@ stdenv.mkDerivation { mv README.txt MANUAL.TXT $out/share/dlx/doc/ ''; - meta = with lib; { + meta = { homepage = "https://www.davidviner.com/dlx.html?name=DLX+Simulator"; description = "DLX simulator written in C"; - license = licenses.gpl2Only; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/dm/dm-mono/package.nix b/pkgs/by-name/dm/dm-mono/package.nix new file mode 100644 index 000000000000..a3f323aa6efb --- /dev/null +++ b/pkgs/by-name/dm/dm-mono/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "dm-mono"; + version = "1.0-unstable-2020-04-15"; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "dm-mono"; + rev = "57fadabfb200a77de2812540026c249dc3013077"; + hash = "sha256-Xj6UmvH7tqW6xdobBxuafqc7TB1nrTFwHWv4DaZmwx8="; + }; + + installPhase = '' + runHook preInstall + + install -m644 --target $out/share/fonts/truetype -D exports/*.ttf + + runHook postInstall + ''; + + meta = { + description = "Monospace typeface"; + homepage = "https://github.com/googlefonts/dm-mono"; + changelog = "https://github.com/googlefonts/dm-mono/blob/main/CHANGELOG.md"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ jennifgcrl ]; + }; +} diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index 3c181f50deb4..0bd513a08e5c 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -15,7 +15,6 @@ curl, tzdata, gdb, - Foundation, callPackage, targetPackages, fetchpatch, @@ -138,14 +137,10 @@ stdenv.mkDerivation (finalAttrs: { git ]; - buildInputs = - [ - curl - tzdata - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; + buildInputs = [ + curl + tzdata + ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/dm/dmitry/implicit-function-declaration.patch b/pkgs/by-name/dm/dmitry/implicit-function-declaration.patch new file mode 100644 index 000000000000..608f90ccbc4d --- /dev/null +++ b/pkgs/by-name/dm/dmitry/implicit-function-declaration.patch @@ -0,0 +1,28 @@ +--- + src/dmitry.c | 1 + + src/file.c | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/src/dmitry.c b/src/dmitry.c +index d47f231..567482d 100644 +--- a/src/dmitry.c ++++ b/src/dmitry.c +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/file.c b/src/file.c +index f4ad48b..3714786 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -1,4 +1,6 @@ + #include "includes/file.h" ++#include ++#include + int file_prep() + { + outputfile[strlen(outputfile)] = '\0'; diff --git a/pkgs/by-name/dm/dmitry/package.nix b/pkgs/by-name/dm/dmitry/package.nix index 5a641d1bf03e..fcde9593ba4b 100644 --- a/pkgs/by-name/dm/dmitry/package.nix +++ b/pkgs/by-name/dm/dmitry/package.nix @@ -16,16 +16,18 @@ stdenv.mkDerivation { hash = "sha256-cYFeBM8xFMaLXYk6Rg+5JvfbbIJI9F3mefzCX3+XbB0="; }; + patches = [ ./implicit-function-declaration.patch ]; + nativeBuildInputs = [ autoreconfHook ]; env.NIX_CFLAGS_COMPILE = toString [ "-fcommon" ]; - meta = with lib; { + meta = { description = "Deepmagic Information Gathering Tool"; mainProgram = "dmitry"; homepage = "https://github.com/jaygreig86/dmitry"; - maintainers = with maintainers; [ d3vil0p3r ]; - platforms = platforms.linux; - license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ d3vil0p3r ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/by-name/dm/dmlive/package.nix b/pkgs/by-name/dm/dmlive/package.nix index 68158f7ec19d..c3fbc6542b78 100644 --- a/pkgs/by-name/dm/dmlive/package.nix +++ b/pkgs/by-name/dm/dmlive/package.nix @@ -20,17 +20,17 @@ in rustPlatform.buildRustPackage { pname = "dmlive"; - version = "5.5.7-unstable-2025-01-25"; + version = "5.5.8-unstable-2025-04-06"; src = fetchFromGitHub { owner = "THMonster"; repo = "dmlive"; - rev = "79b4d9430fca3ebb86c57ee506989f620ea68a21"; # no tag - hash = "sha256-0DDKKd4IZj+3AyVMG4FXjCbvvMg5iDCiF1B6nB8n3lU="; + rev = "b066a637093871de9962e08d4f0ae0b77bd8f1f4"; # no tag + hash = "sha256-pAsxr6zGCDZ0qysGT1+2+5+WKI2QopGxnZWpfnxk/fI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UwKQivYZyXYADbwf4VA1h2y7YzpxefUgDYQG+NaLMwE="; + cargoHash = "sha256-GVko8GK5Muha4uqDMgk7VkFoFCVcmk0vM1GUELvSzgM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/dm/dmtx-utils/package.nix b/pkgs/by-name/dm/dmtx-utils/package.nix new file mode 100644 index 000000000000..4736c2b0418c --- /dev/null +++ b/pkgs/by-name/dm/dmtx-utils/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + libdmtx, + imagemagick, +}: + +stdenv.mkDerivation rec { + pname = "dmtx-utils"; + version = "0.7.6-unstable-2023-09-21"; + + src = fetchFromGitHub { + owner = "dmtx"; + repo = "dmtx-utils"; + rev = "057faa00143c152e8e21c29a36137f771614daed"; + hash = "sha256-uXzPAv6DappyHBNmsTg6qRUvtUUdP1IPOdDvIcevfco="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libdmtx + imagemagick + ]; + + meta = { + description = "Data matrix command-line utilities"; + homepage = "https://github.com/dmtx/dmtx-utils"; + changelog = "https://github.com/dmtx/dmtx-utils/blob/v${version}/ChangeLog"; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix index ee3c31feb368..8cdc78b5fd87 100644 --- a/pkgs/by-name/dn/dnf5/package.nix +++ b/pkgs/by-name/dn/dnf5/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.2.12.0"; + version = "5.2.13.1"; outputs = [ "out" @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; tag = finalAttrs.version; - hash = "sha256-r5bZgcnY7O1U28tkSnSJur3/Z/llabGe7mlIMA8ZGls="; + hash = "sha256-Qt3G4jsJNk7iMOWliGjyR2dOGpWANVtZFeYwlsYbFrw="; }; nativeBuildInputs = diff --git a/pkgs/by-name/dn/dnote/package.nix b/pkgs/by-name/dn/dnote/package.nix index 0873d9943613..87e65f1f5cd0 100644 --- a/pkgs/by-name/dn/dnote/package.nix +++ b/pkgs/by-name/dn/dnote/package.nix @@ -110,7 +110,7 @@ buildGoModule rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/dnote-cli"; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; # Fails on darwin: # panic: initializing context: initializing files: creating the dnote dir: # initializing config dir: creating a directory at /var/empty/.config/dnote: mkdir /var/empty: file exists diff --git a/pkgs/by-name/dn/dns-over-https/package.nix b/pkgs/by-name/dn/dns-over-https/package.nix index 524c957e8370..db100adceb15 100644 --- a/pkgs/by-name/dn/dns-over-https/package.nix +++ b/pkgs/by-name/dn/dns-over-https/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "dns-over-https"; - version = "2.3.8"; + version = "2.3.10"; src = fetchFromGitHub { owner = "m13253"; repo = "dns-over-https"; tag = "v${version}"; - hash = "sha256-0tjqj67PWPRChspUQQeZqtW68IB2G8N2vhebMwHNbX4="; + hash = "sha256-WQ6OyZfQMtW9nZcvlBjHk0R96NQr0Lc2mGB5taC0d6k="; }; - vendorHash = "sha256-cASJYEglq2IrnxjqOCiepjExX/FmakeMjxPOsjUDTWM="; + vendorHash = "sha256-46BrN50G5IhdMwMVMU9Wdj/RFzUzIPoTRucCedMGu4g="; ldflags = [ "-w" diff --git a/pkgs/by-name/dn/dns-root-data/package.nix b/pkgs/by-name/dn/dns-root-data/package.nix index 76c420f7d056..8d2a25648754 100644 --- a/pkgs/by-name/dn/dns-root-data/package.nix +++ b/pkgs/by-name/dn/dns-root-data/package.nix @@ -5,7 +5,6 @@ }: let - rootHints = fetchurl { # Original source https://www.internic.net/domain/named.root # occasionally suffers from pointless hash changes, @@ -16,25 +15,21 @@ let ]; hash = "sha256-4lG/uPnNHBNIZ/XIeDM1w3iukrpeW0JIjTnGSwkJ8U4="; }; - - rootKey = ./root.key; - rootDs = ./root.ds; - in - stdenv.mkDerivation { pname = "dns-root-data"; - version = "2024-06-20"; + version = "2025-04-14"; buildCommand = '' mkdir $out cp ${rootHints} $out/root.hints - cp ${rootKey} $out/root.key - cp ${rootDs} $out/root.ds + cp ${./root.key} $out/root.key + cp ${./root.ds} $out/root.ds ''; meta = with lib; { - description = "DNS root data including root zone and DNSSEC key"; + homepage = "https://www.iana.org/domains/root/files"; + description = "DNS root data including root hints and DNSSEC root trust anchor + key"; maintainers = with maintainers; [ fpletz vcunat diff --git a/pkgs/by-name/dn/dns-root-data/root.key b/pkgs/by-name/dn/dns-root-data/root.key index edfc762ad602..a4764873b532 100644 --- a/pkgs/by-name/dn/dns-root-data/root.key +++ b/pkgs/by-name/dn/dns-root-data/root.key @@ -1 +1,2 @@ -. 172800 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b} +. 86400 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b} +. 86400 IN DNSKEY 257 3 8 AwEAAa96jeuknZlaeSrvyAJj6ZHv28hhOKkx3rLGXVaC6rXTsDc449/cidltpkyGwCJNnOAlFNKF2jBosZBU5eeHspaQWOmOElZsjICMQMC3aeHbGiShvZsx4wMYSjH8e7Vrhbu6irwCzVBApESjbUdpWWmEnhathWu1jo+siFUiRAAxm9qyJNg/wOZqqzL/dL/q8PkcRU5oUKEpUge71M3ej2/7CPqpdVwuMoTvoB+ZOT4YeGyxMvHmbrxlFzGOHOijtzN+u1TQNatX2XBuzZNQ1K+s2CXkPIZo7s6JgZyvaBevYtxPvYLw4z9mR7K2vaF18UYH9Z9GNUUeayffKC73PYc= ;{id = 38696 (ksk), size = 2048b} diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index 80e0371592ce..b152cb2a70e3 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.18.0"; + version = "4.20.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; tag = "v${version}"; - hash = "sha256-amnjCivOy81mFB2Ke76PaSVryUHz85POQXq2ljLiGu4="; + hash = "sha256-GiwmSAcExafo5fJcdNsMF8BuvHdUaNoCLpl5y1pautw="; }; - vendorHash = "sha256-Ey+HXt0nbnuxT3xb5LorDS3r+hp6v8i0uuHuXRJp+2U="; + vendorHash = "sha256-8KSqPDEI5gmxzcgFsaCzeXzYN6tO9Fjq7rnQN/vSThw="; nativeBuildInputs = [ installShellFiles ]; @@ -51,7 +51,7 @@ buildGoModule rec { meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://dnscontrol.org/"; - changelog = "https://github.com/StackExchange/dnscontrol/releases/tag/${src.rev}"; + changelog = "https://github.com/StackExchange/dnscontrol/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; mainProgram = "dnscontrol"; diff --git a/pkgs/by-name/dn/dnscrypt-proxy/package.nix b/pkgs/by-name/dn/dnscrypt-proxy/package.nix index 92d43baaa160..0084aa0c5120 100644 --- a/pkgs/by-name/dn/dnscrypt-proxy/package.nix +++ b/pkgs/by-name/dn/dnscrypt-proxy/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "dnscrypt-proxy"; - version = "2.1.7"; + version = "2.1.8"; vendorHash = null; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-s0ooICual87+y/DMppuTQtNzZRRCg/42SQImDrPVRng="; + sha256 = "sha256-/D5RE8AbI9i9TVdFQCYW8OLPU4TgIIDRsZfWEyXo92g="; }; passthru.tests = { inherit (nixosTests) dnscrypt-proxy2; }; diff --git a/pkgs/by-name/dn/dnsdist/package.nix b/pkgs/by-name/dn/dnsdist/package.nix index 48e9c8e01602..044865599ada 100644 --- a/pkgs/by-name/dn/dnsdist/package.nix +++ b/pkgs/by-name/dn/dnsdist/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - hash = "sha256-9mT3Opao1zQ9MmlqzLcP2LHtQyjXPNsKYnpWHW4v2Z4="; + hash = "sha256-6GvGNtTS3IusGA7Iza+/5fNSKbYAXsFddRD7b1i0n1o="; }; patches = [ diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix index 9761f1a55fef..b2179b0ef5c1 100644 --- a/pkgs/by-name/dn/dnsmasq/package.nix +++ b/pkgs/by-name/dn/dnsmasq/package.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "dnsmasq"; - version = "2.90"; + version = "2.91"; src = fetchurl { url = "https://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz"; - hash = "sha256-jlAwm9g3v+yWSagS4GbAm2mItz10m30pPAbFfUahCeQ="; + hash = "sha256-9iJoKEizNnetsratCCZGGKKuCgHaSGqT/YzZEYaz0VM="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index 724c016a474d..8dc40c0f1df0 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.75.2"; + version = "0.75.4"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-lxrb6DIYompvLX3R7HI63C7ZbNW76J28Xnt7AHTVwmQ="; + hash = "sha256-pKIUyB/GXuqLos2OdYw6heTbsaj4l2xhSy3iCQKdbaA="; }; - vendorHash = "sha256-PIj91tN9LbNaBE5gLTYD7p9dgcRaFe1i7PnWNJ5H580="; + vendorHash = "sha256-imML/SK4NdHGH5FsjvKjt5GM3vwi6v+pF1Mu8Dy8Lms="; ldflags = [ "-s" diff --git a/pkgs/by-name/dn/dnstake/package.nix b/pkgs/by-name/dn/dnstake/package.nix index 21d922961273..e48d7e3ca11d 100644 --- a/pkgs/by-name/dn/dnstake/package.nix +++ b/pkgs/by-name/dn/dnstake/package.nix @@ -1,8 +1,8 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, - fetchpatch, }: buildGoModule rec { @@ -11,27 +11,20 @@ buildGoModule rec { src = fetchFromGitHub { owner = "pwnesia"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM="; + repo = "dnstake"; + tag = "v${version}"; + hash = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM="; }; - patches = [ - # https://github.com/pwnesia/dnstake/pull/36 - (fetchpatch { - name = "update-x-sys-fix-darwin.patch"; - url = "https://github.com/pwnesia/dnstake/commit/974efbbff4ce26d2f2646ca2ceb1316c131cefbe.patch"; - sha256 = "sha256-fLOGF8damdLROd8T0fH/FGSVX23dtc+yHhSvVCwVeuY="; - }) - ]; - vendorHash = "sha256-lV6dUl+OMUQfhlgNL38k0Re1Mr3VP9b8SI3vTJ8CP18="; meta = with lib; { description = "Tool to check missing hosted DNS zones"; homepage = "https://github.com/pwnesia/dnstake"; - license = with licenses; [ mit ]; + changelog = "https://github.com/pwnesia/dnstake/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "dnstake"; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/networking/dnsviz/fix-path.patch b/pkgs/by-name/dn/dnsviz/fix-path.patch similarity index 77% rename from pkgs/tools/networking/dnsviz/fix-path.patch rename to pkgs/by-name/dn/dnsviz/fix-path.patch index 7906058cd98e..4dc963dec71f 100644 --- a/pkgs/tools/networking/dnsviz/fix-path.patch +++ b/pkgs/by-name/dn/dnsviz/fix-path.patch @@ -2,10 +2,10 @@ diff --git a/dnsviz/config.py.in b/dnsviz/config.py.in index 373fde2..007f0f1 100644 --- a/dnsviz/config.py.in +++ b/dnsviz/config.py.in -@@ -26,12 +26,7 @@ from __future__ import unicode_literals +@@ -26,12 +26,7 @@ import os import sys - + -_prefix = '__DNSVIZ_INSTALL_PREFIX__' -if (hasattr(sys, 'real_prefix') or hasattr(sys, 'base_prefix')) and \ - not _prefix: @@ -13,6 +13,6 @@ index 373fde2..007f0f1 100644 -else: - DNSVIZ_INSTALL_PREFIX = _prefix +DNSVIZ_INSTALL_PREFIX = "@out@" - DNSVIZ_SHARE_PATH = os.path.join(DNSVIZ_INSTALL_PREFIX, 'share', 'dnsviz') + DNSVIZ_SHARE_PATH = os.getenv('DNSVIZ_SHARE_PATH', os.path.join(DNSVIZ_INSTALL_PREFIX, 'share', 'dnsviz')) JQUERY_PATH = __JQUERY_PATH__ JQUERY_UI_PATH = __JQUERY_UI_PATH__ diff --git a/pkgs/by-name/dn/dnsviz/package.nix b/pkgs/by-name/dn/dnsviz/package.nix new file mode 100644 index 000000000000..bba786016014 --- /dev/null +++ b/pkgs/by-name/dn/dnsviz/package.nix @@ -0,0 +1,51 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "dnsviz"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "dnsviz"; + repo = "dnsviz"; + tag = "v${version}"; + hash = "sha256-JlPikEvRPFhHcTyRJ2ZgmQOrrc6qzhbAO6+NtiN+Wqo="; + }; + + patches = [ + # override DNSVIZ_INSTALL_PREFIX with $out + ./fix-path.patch + ]; + + postPatch = '' + substituteInPlace dnsviz/config.py.in \ + --replace-fail '@out@' $out + ''; + + dependencies = with python3Packages; [ + dnspython + m2crypto + pygraphviz + ]; + + # Tests require network connection and /etc/resolv.conf + doCheck = false; + + pythonImportsCheck = [ "dnsviz" ]; + + meta = { + description = "Tool suite for analyzing and visualizing DNS and DNSSEC behavior"; + mainProgram = "dnsviz"; + longDescription = '' + DNSViz is a tool suite for analysis and visualization of Domain Name System (DNS) behavior, + including its security extensions (DNSSEC). + + This tool suite powers the Web-based analysis available at https://dnsviz.net/ + ''; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ jojosch ]; + }; +} diff --git a/pkgs/by-name/dn/dnsx/package.nix b/pkgs/by-name/dn/dnsx/package.nix index 7828cff04f5b..e7c8e68e77de 100644 --- a/pkgs/by-name/dn/dnsx/package.nix +++ b/pkgs/by-name/dn/dnsx/package.nix @@ -32,7 +32,7 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = [ "-version" ]; + versionCheckProgramArg = "-version"; meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; diff --git a/pkgs/by-name/do/docbook2x/package.nix b/pkgs/by-name/do/docbook2x/package.nix index 52d59e710bc8..e266b8835ee1 100644 --- a/pkgs/by-name/do/docbook2x/package.nix +++ b/pkgs/by-name/do/docbook2x/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # writes its output to stdout instead of creating a file. patches = [ ./db2x_texixml-to-stdout.patch ]; - strictDpes = true; + strictDeps = true; nativeBuildInputs = [ makeWrapper perlPackages.perl diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index 07d247b8d65c..6e046bf81318 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -2,7 +2,6 @@ lib, ocamlPackages, stdenv, - overrideSDK, fetchFromGitHub, python3, dune_3, @@ -13,15 +12,9 @@ docfd, }: -let - # Needed for x86_64-darwin - buildDunePackage' = ocamlPackages.buildDunePackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; -in -buildDunePackage' rec { +ocamlPackages.buildDunePackage rec { pname = "docfd"; - version = "8.0.3"; + version = "11.0.1"; minimalOCamlVersion = "5.1"; @@ -29,7 +22,7 @@ buildDunePackage' rec { owner = "darrenldl"; repo = "docfd"; rev = version; - hash = "sha256-890/3iBruaQtWwlcvwuz4ujp7+P+5y1/2Axx4Iuik8Q="; + hash = "sha256-uRC2QBn4gAfS9u85YaNH2Mm2C0reP8FnDHbyloY+OC8="; }; nativeBuildInputs = [ @@ -42,18 +35,22 @@ buildDunePackage' rec { cmdliner containers-data decompress + diet digestif eio_main lwd nottui notty + ocaml_sqlite3 ocolor oseq ppx_deriving ppxlib + progress re spelll timedesc + uuseg yojson ]; diff --git a/pkgs/by-name/do/docker-credential-gcr/package.nix b/pkgs/by-name/do/docker-credential-gcr/package.nix index 18a0f7a1580d..c059f8204d6a 100644 --- a/pkgs/by-name/do/docker-credential-gcr/package.nix +++ b/pkgs/by-name/do/docker-credential-gcr/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.27"; + version = "2.1.29"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; tag = "v${version}"; - hash = "sha256-WoTbqqbFoIS525uytYAYmzrFbRYBi1C65Z5EDwzu6GI="; + hash = "sha256-Rp2V7z1SCV5Dvo8kGELQUeEbMF1ug0cKU9Oe9RXVBIk="; }; postPatch = '' diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix new file mode 100644 index 000000000000..a5068fe5a748 --- /dev/null +++ b/pkgs/by-name/do/docker-language-server/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + docker, + gotestsum, +}: + +buildGoModule rec { + pname = "docker-language-server"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "docker-language-server"; + tag = "v${version}"; + hash = "sha256-4R0GEufK++ZvihrurLwN24QnqwSt1cTkjFjbCVXqIw0="; + }; + + vendorHash = "sha256-YDBNJzTyPEM/Zvv1Ieo3GG+NlvDOrghxdOqkKsF04AE="; + + nativeCheckInputs = [ + docker + gotestsum + ]; + + checkPhase = '' + runHook preCheck + gotestsum -- $(go list ./... | grep -vE "e2e-tests|/buildkit$|/scout$") -timeout 30s -skip "TestCollectDiagnostics" + go test $(go list ./... | grep e2e-tests) -timeout 120s -skip "TestPublishDiagnostics|TestHover" + runHook postCheck + ''; + + ldflags = [ + "-s" + "-w" + "-X 'github.com/docker/docker-language-server/internal/pkg/cli/metadata.Version=${version}'" + ]; + + meta = with lib; { + homepage = "https://github.com/docker/docker-language-server"; + description = "Language server for providing language features for file types in the Docker ecosystem (Dockerfiles, Compose files, and Bake files)"; + mainProgram = "docker-language-server"; + license = licenses.asl20; + maintainers = with maintainers; [ baongoc124 ]; + }; +} diff --git a/pkgs/by-name/do/dockutil/package.nix b/pkgs/by-name/do/dockutil/package.nix index 264523e970fd..598f504eb993 100644 --- a/pkgs/by-name/do/dockutil/package.nix +++ b/pkgs/by-name/do/dockutil/package.nix @@ -8,7 +8,6 @@ swiftpm, swiftpm2nix, swiftPackages, - darwin, libarchive, p7zip, # Building from source on x86_64 fails (among other things) due to: @@ -56,8 +55,6 @@ let swiftpm ]; - buildInputs = with darwin.apple_sdk.frameworks; [ Cocoa ]; - configurePhase = generated.configure; installPhase = '' diff --git a/pkgs/by-name/do/docling-serve/package.nix b/pkgs/by-name/do/docling-serve/package.nix index ff8e4514d60e..38fee14abdcc 100644 --- a/pkgs/by-name/do/docling-serve/package.nix +++ b/pkgs/by-name/do/docling-serve/package.nix @@ -2,9 +2,21 @@ python3Packages, nixosTests, withUI ? false, + withTesserocr ? false, + withRapidocr ? false, + withCPU ? false, }: -(python3Packages.toPythonApplication (python3Packages.docling-serve.override { inherit withUI; })) +(python3Packages.toPythonApplication ( + python3Packages.docling-serve.override { + inherit + withUI + withTesserocr + withRapidocr + withCPU + ; + } +)) // { passthru.tests = { docling-serve = nixosTests.docling-serve; diff --git a/pkgs/by-name/do/doctave/Cargo.lock b/pkgs/by-name/do/doctave/Cargo.lock deleted file mode 100644 index f0c27d972e27..000000000000 --- a/pkgs/by-name/do/doctave/Cargo.lock +++ /dev/null @@ -1,1639 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" -dependencies = [ - "memchr", -] - -[[package]] -name = "alphanumeric-sort" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e75706f4ee4c69aaa277f73a7a6ad60222193938d4266b929aacd17ebb29b9" - -[[package]] -name = "ammonia" -version = "3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e445c26125ff80316eaea16e812d717b147b82a68682bd4730f74d4845c8b35" -dependencies = [ - "html5ever", - "lazy_static", - "maplit", - "markup5ever_rcdom", - "matches", - "tendril", - "url 2.2.2", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "ascii" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" - -[[package]] -name = "atomic-option" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db678acb667b525ac40a324fc5f7d3390e29239b31c7327bb8157f5b4fff593" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.3", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array 0.14.4", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "bunt" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219e88f5a1df3f5b8a471055ae5bf58d0cdb895ec212b6ef4a00a9a1495b9fb4" -dependencies = [ - "bunt-macros", - "termcolor", -] - -[[package]] -name = "bunt-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b0d33584af687b4dfc0b9ceb1406635c4582ae126f2979f362bbe8ec11512e" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "bus" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e66e1779f5b1440f1a58220ba3b3ded4427175f0a9fb8d7066521f8b4e8f2b" -dependencies = [ - "atomic-option", - "crossbeam-channel", - "num_cpus", - "parking_lot_core 0.7.2", -] - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b" -dependencies = [ - "num-integer", - "num-traits", - "time", -] - -[[package]] -name = "chunked_transfer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "colorsys" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be475c891fad1522a7bfd1cb7204ba8e8fe48a93a0ad6992356aca07a4e0cbce" - -[[package]] -name = "cpuid-bool" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "crossbeam-utils", - "lazy_static", - "maybe-uninit", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.3", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array 0.14.4", -] - -[[package]] -name = "doctave" -version = "0.4.2" -dependencies = [ - "alphanumeric-sort", - "ascii", - "bunt", - "bus", - "clap", - "colorsys", - "crossbeam-channel", - "doctave-markdown", - "elasticlunr-rs", - "handlebars", - "http", - "include_dir", - "indoc", - "lazy_static", - "notify", - "rayon", - "scoped_threadpool", - "serde", - "serde_json", - "serde_yaml", - "tiny_http", - "tungstenite", - "walkdir", -] - -[[package]] -name = "doctave-markdown" -version = "0.9.0" -source = "git+https://github.com/Doctave/doctave-markdown?tag=0.9.0#82e2b99b09c95092e64629033b0ff6c2b110af47" -dependencies = [ - "ammonia", - "emojis", - "lazy_static", - "pulldown-cmark", - "regex", - "url 2.2.2", -] - -[[package]] -name = "dtoa" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "elasticlunr-rs" -version = "2.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35622eb004c8f0c5e7e2032815f3314a93df0db30a1ce5c94e62c1ecc81e22b9" -dependencies = [ - "lazy_static", - "regex", - "serde", - "serde_derive", - "serde_json", - "strum", - "strum_macros", -] - -[[package]] -name = "emojis" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf85aeacc72b7b5d9e78b39399562a2846566936e41a6f59f9d96b3fa7c4f96" -dependencies = [ - "strsim 0.10.0", -] - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "filetime" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "redox_syscall 0.1.57", - "winapi 0.3.9", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding 2.1.0", -] - -[[package]] -name = "fsevent" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" -dependencies = [ - "bitflags", - "fsevent-sys", -] - -[[package]] -name = "fsevent-sys" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" -dependencies = [ - "libc", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "futf" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "generic-array" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -dependencies = [ - "typenum", -] - -[[package]] -name = "generic-array" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "handlebars" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5deefd4816fb852b1ff3cb48f6c41da67be2d0e1d20b26a7a3b076da11f064b1" -dependencies = [ - "log", - "pest", - "pest_derive", - "quick-error", - "serde", - "serde_json", -] - -[[package]] -name = "heck" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" -dependencies = [ - "libc", -] - -[[package]] -name = "html5ever" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "http" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "httparse" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" - -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "include_dir" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "482a2e29200b7eed25d7fdbd14423326760b7f6658d21a4cf12d55a50713c69f" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e074c19deab2501407c91ba1860fa3d6820bfde307db6d8cb851b55a10be89b" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "indoc" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644defcefee68d7805653a682e99a2e2a5014a1fc3cc9be7059a215844eeea6f" -dependencies = [ - "unindent", -] - -[[package]] -name = "inotify" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" -dependencies = [ - "bitflags", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0" -dependencies = [ - "libc", -] - -[[package]] -name = "input_buffer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" -dependencies = [ - "bytes", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "itoa" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.112" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" - -[[package]] -name = "linked-hash-map" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" - -[[package]] -name = "lock_api" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" -dependencies = [ - "cfg-if 0.1.10", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log", - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever_rcdom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" -dependencies = [ - "html5ever", - "markup5ever", - "tendril", - "xml5ever", -] - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mio" -version = "0.6.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio", - "slab", -] - -[[package]] -name = "miow" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "net2" -version = "0.2.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "notify" -version = "4.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd" -dependencies = [ - "bitflags", - "filetime", - "fsevent", - "fsevent-sys", - "inotify", - "libc", - "mio", - "mio-extras", - "walkdir", - "winapi 0.3.9", -] - -[[package]] -name = "num-integer" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot_core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.10", - "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pest_meta" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" -dependencies = [ - "maplit", - "pest", - "sha-1 0.8.2", -] - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro2" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "pulldown-cmark" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" -dependencies = [ - "bitflags", - "memchr", - "unicase", -] - -[[package]] -name = "quick-error" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" - -[[package]] -name = "quote" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", - "rand_pcg", -] - -[[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", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rayon" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "lazy_static", - "num_cpus", -] - -[[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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", - "thread_local", -] - -[[package]] -name = "regex-syntax" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - -[[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.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.8.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" -dependencies = [ - "dtoa", - "linked-hash-map", - "serde", - "yaml-rust", -] - -[[package]] -name = "sha-1" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - -[[package]] -name = "sha-1" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 0.1.10", - "cpuid-bool", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - -[[package]] -name = "siphasher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b" - -[[package]] -name = "slab" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - -[[package]] -name = "smallvec" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" - -[[package]] -name = "string_cache" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6" -dependencies = [ - "lazy_static", - "new_debug_unreachable", - "parking_lot", - "phf_shared", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" - -[[package]] -name = "strum_macros" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "syn" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tendril" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termcolor" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - -[[package]] -name = "tiny_http" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951" -dependencies = [ - "ascii", - "chrono", - "chunked_transfer", - "log", - "url 1.7.2", -] - -[[package]] -name = "tinyvec" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" - -[[package]] -name = "tungstenite" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" -dependencies = [ - "base64", - "byteorder", - "bytes", - "http", - "httparse", - "input_buffer", - "log", - "rand", - "sha-1 0.9.1", - "url 2.2.2", - "utf-8", -] - -[[package]] -name = "typenum" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" - -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - -[[package]] -name = "unindent" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af41d708427f8fd0e915dcebb2cae0f0e6acb2a939b2d399c265c39a38a18942" - -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna 0.2.0", - "matches", - "percent-encoding 2.1.0", -] - -[[package]] -name = "utf-8" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" - -[[package]] -name = "walkdir" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "xml5ever" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865" -dependencies = [ - "log", - "mac", - "markup5ever", - "time", -] - -[[package]] -name = "yaml-rust" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" -dependencies = [ - "linked-hash-map", -] diff --git a/pkgs/by-name/do/doctave/package.nix b/pkgs/by-name/do/doctave/package.nix index 854a56de0709..ade139871dd2 100644 --- a/pkgs/by-name/do/doctave/package.nix +++ b/pkgs/by-name/do/doctave/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -17,20 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8mGSFQozyLoGua9mwyqfDcYNMtbeWp9Phb0vaje+AJ0="; }; - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "doctave-markdown-0.9.0" = "sha256-DDeb91DgLx7vOYHwoDy6+/532q/3/myJUZDqjq7ejJ0="; - }; - }; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + useFetchCargoVendor = true; + cargoHash = "sha256-3gyYls1+5eVM3eLlFNmULvIbc5VgoWpfnpO4nmoDMAI="; meta = { description = "Batteries-included developer documentation site generator"; diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix index 50dc42dc2eac..864380f6bdd7 100644 --- a/pkgs/by-name/do/doctl/package.nix +++ b/pkgs/by-name/do/doctl/package.nix @@ -9,7 +9,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.124.0"; + version = "1.127.0"; vendorHash = null; @@ -41,15 +41,15 @@ buildGoModule rec { src = fetchFromGitHub { owner = "digitalocean"; repo = "doctl"; - rev = "v${version}"; - sha256 = "sha256-B3qozldNmCYLCuBoWMHycf9gNKbvUvPHK2CDOvMYEt8="; + tag = "v${version}"; + hash = "sha256-wdba3kly0Iqsqs0i+AGMsNtzO3dsFIZVc0g0arL/NfM="; }; - meta = with lib; { + meta = { description = "Command line tool for DigitalOcean services"; mainProgram = "doctl"; homepage = "https://github.com/digitalocean/doctl"; - license = licenses.asl20; - maintainers = [ maintainers.siddharthist ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.siddharthist ]; }; } diff --git a/pkgs/by-name/do/doctoc/package.nix b/pkgs/by-name/do/doctoc/package.nix index faded51f4431..1f7bde794ff3 100644 --- a/pkgs/by-name/do/doctoc/package.nix +++ b/pkgs/by-name/do/doctoc/package.nix @@ -18,6 +18,10 @@ buildNpmPackage rec { npmDepsHash = "sha256-TbAnFpiN/v6xjQQznL/B180f0W48HPRqW21cO9XZhYA="; + postInstall = '' + find $out/lib/node_modules -xtype l -delete + ''; + dontNpmBuild = true; passthru.tests = { diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix index 1ce408dfdabc..90cb06b6babb 100644 --- a/pkgs/by-name/do/docuum/package.nix +++ b/pkgs/by-name/do/docuum/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { "--skip=format::tests::code_str_display" ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; - meta = with lib; { description = "Least recently used (LRU) eviction of Docker images"; homepage = "https://github.com/stepchowfun/docuum"; diff --git a/pkgs/tools/networking/dogdns/Cargo.lock b/pkgs/by-name/do/dogdns/Cargo.lock similarity index 100% rename from pkgs/tools/networking/dogdns/Cargo.lock rename to pkgs/by-name/do/dogdns/Cargo.lock diff --git a/pkgs/by-name/do/dogdns/package.nix b/pkgs/by-name/do/dogdns/package.nix new file mode 100644 index 000000000000..58775dde22a4 --- /dev/null +++ b/pkgs/by-name/do/dogdns/package.nix @@ -0,0 +1,74 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + stdenv, + pkg-config, + openssl, + just, + pandoc, +}: + +rustPlatform.buildRustPackage { + pname = "dogdns"; + version = "unstable-2021-10-07"; + + src = fetchFromGitHub { + owner = "ogham"; + repo = "dog"; + rev = "721440b12ef01a812abe5dc6ced69af6e221fad5"; + sha256 = "sha256-y3T0vXg7631FZ4bzcbQjz3Buui/DFxh9LG8BZWwynp0="; + }; + + patches = [ + # remove date info to make the build reproducible + # remove commit hash to avoid dependency on git and the need to keep `.git` + ./remove-date-info.patch + ]; + + nativeBuildInputs = [ + installShellFiles + just + pandoc + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; + + outputs = [ + "out" + "man" + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "mutagen-0.2.0" = "sha256-FnSeNI9lAcxonRFTu7wnP/M/d5UbMzSZ97w+mUqoEg8="; + }; + }; + + dontUseJustBuild = true; + dontUseJustCheck = true; + dontUseJustInstall = true; + + postPatch = '' + # update Cargo.lock to work with openssl 3 + ln -sf ${./Cargo.lock} Cargo.lock + ''; + + postBuild = '' + just man + ''; + + postInstall = '' + installShellCompletion completions/dog.{bash,fish,zsh} + installManPage ./target/man/*.1 + ''; + + meta = with lib; { + description = "Command-line DNS client"; + homepage = "https://dns.lookup.dog"; + license = licenses.eupl12; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "dog"; + }; +} diff --git a/pkgs/tools/networking/dogdns/remove-date-info.patch b/pkgs/by-name/do/dogdns/remove-date-info.patch similarity index 100% rename from pkgs/tools/networking/dogdns/remove-date-info.patch rename to pkgs/by-name/do/dogdns/remove-date-info.patch diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix index 0a6a950e93f1..23f798d7061a 100644 --- a/pkgs/by-name/do/dogedns/package.nix +++ b/pkgs/by-name/do/dogedns/package.nix @@ -7,7 +7,6 @@ pkg-config, openssl, pandoc, - darwin, }: rustPlatform.buildRustPackage rec { @@ -45,9 +44,7 @@ rustPlatform.buildRustPackage rec { installShellFiles pandoc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; postInstall = '' installShellCompletion completions/doge.{bash,fish,zsh} diff --git a/pkgs/by-name/do/doh-proxy-rust/package.nix b/pkgs/by-name/do/doh-proxy-rust/package.nix new file mode 100644 index 000000000000..cec812fe5ea9 --- /dev/null +++ b/pkgs/by-name/do/doh-proxy-rust/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchCrate, + stdenv, + libiconv, + nixosTests, +}: + +rustPlatform.buildRustPackage rec { + pname = "doh-proxy-rust"; + version = "0.9.11"; + + src = fetchCrate { + inherit version; + crateName = "doh-proxy"; + hash = "sha256-h2LwxqyyBPAXRr6XOmcLEmbet063kkM1ledULp3M2ek="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-eYJoHFIC0NF3OAbZXDWB57IOFC9JDV4IXHQgzIWMT04="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + passthru.tests = { inherit (nixosTests) doh-proxy-rust; }; + + meta = with lib; { + homepage = "https://github.com/jedisct1/doh-server"; + description = "Fast, mature, secure DoH server proxy written in Rust"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ stephank ]; + mainProgram = "doh-proxy"; + }; +} diff --git a/pkgs/by-name/do/doitlive/package.nix b/pkgs/by-name/do/doitlive/package.nix index 00014928191c..135609b55139 100644 --- a/pkgs/by-name/do/doitlive/package.nix +++ b/pkgs/by-name/do/doitlive/package.nix @@ -6,17 +6,17 @@ python3Packages.buildPythonApplication rec { pname = "doitlive"; - version = "5.0.0"; + version = "5.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jAoibszDpQJjiNCZDhX3fLniALOG7r9YqaYEySkmMM4="; + hash = "sha256-trzSX58De36W401oVJMGrbPoyD9uksUewrIlq8BbJcU="; }; - nativeBuildInputs = with python3Packages; [ setuptools ]; + build-system = with python3Packages; [ flit-core ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click click-completion click-didyoumean @@ -25,12 +25,12 @@ python3Packages.buildPythonApplication rec { # disable tests (too many failures) doCheck = false; - meta = with lib; { + meta = { description = "Tool for live presentations in the terminal"; homepage = "https://github.com/sloria/doitlive"; changelog = "https://github.com/sloria/doitlive/blob/${version}/CHANGELOG.rst"; - license = licenses.mit; - maintainers = with maintainers; [ mbode ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mbode ]; mainProgram = "doitlive"; }; } diff --git a/pkgs/by-name/do/dokieli/package.json b/pkgs/by-name/do/dokieli/package.json deleted file mode 100644 index 39198309b812..000000000000 --- a/pkgs/by-name/do/dokieli/package.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "name": "dokieli", - "version": "0.3.1417", - "description": "dokieli is a clientside editor for decentralised article publishing, annotations, and social interactions.", - "main": "./src/dokieli.js", - "type": "module", - "scripts": { - "build-dist": "webpack --progress --color", - "build": "yarn build-dist", - "test": "TZ=UTC node --experimental-vm-modules node_modules/jest/bin/jest.js --silent", - "test:e2e": "playwright test", - "watch": "webpack --progress --color --watch", - "minify": "webpack --progress --color --env minimize", - "postinstall": "patch-package", - "lint": "eslint ." - }, - "repository": "https://github.com/linkeddata/dokieli", - "keywords": [ - "activitystreams", - "activitypub", - "annotations", - "authoring", - "decentralized", - "editor", - "knowledge graph", - "linked data", - "notifications", - "publishing", - "social web", - "web standards" - ], - "author": "dokieli team", - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/linkeddata/dokieli/issues" - }, - "homepage": "https://dokie.li/", - "engines": { - "node": ">=18.0.0" - }, - "dependencies": { - "buffer": "^6.0.3", - "d3-force": "^3.0.0", - "d3-selection": "^3.0.0", - "diff": "^5.2.0", - "dompurify": "^3.1.5", - "fs": "^0.0.1-security", - "http-link-header": "^1.1.3", - "leaflet": "^1.9.4", - "leaflet-gpx": "^1.7.0", - "medium-editor": "^5.23.3", - "medium-editor-tables": "^0.6.1", - "micromark": "^4.0.0", - "micromark-extension-gfm": "^3.0.0", - "micromark-extension-gfm-tagfilter": "^2.0.0", - "rdf-parser-rdfa": "https://github.com/rdf-ext/rdf-parser-rdfa.git#master", - "rdf-store-ldp": "^0.3.1", - "shower": "https://github.com/shower/core.git#main", - "simplerdf": "^0.2.14", - "simplerdf-parse": "^0.1.3", - "solid-auth-client": "^2.5.6" - }, - "devDependencies": { - "@axe-core/playwright": "^4.9.1", - "@playwright/test": "^1.44.1", - "babel-eslint": "^10.1.0", - "dotenv": "^16.4.5", - "eslint": "^9.10.0", - "eslint-plugin-jest": "^27.9.0", - "husky": "^9.0.11", - "jest": "^29.0.3", - "jest-environment-jsdom": "^29.0.3", - "patch-package": "^8.0.0", - "process": "^0.11.10", - "terser-webpack-plugin": "^5.3.3", - "webpack": "5.94.0", - "webpack-cli": "^5.0.1" - }, - "resolutions": { - "ansi-regex": "^5.0.0", - "xmldom": "https://github.com/xmldom/xmldom.git#master", - "green-turtle": "https://github.com/csarven/green-turtle#master", - "json5": "^1.0.2", - "http-cache-semantics": "^4.1.1", - "jsonld": "^5.0.0", - "xml2js": "^0.6.2", - "semver": "^7.6.2", - "lru-cache": "^8.0.0", - "micromatch": "^4.0.8" - }, - "standard": { - "globals": [ - "DO", - "SimpleRDF", - "ld", - "describe", - "it", - "before", - "beforeEach", - "after", - "afterEach" - ] - } -} diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix index 882f863ef97a..8794d3bc00d5 100644 --- a/pkgs/by-name/do/dokieli/package.nix +++ b/pkgs/by-name/do/dokieli/package.nix @@ -1,37 +1,50 @@ { lib, - mkYarnPackage, + stdenv, fetchFromGitHub, fetchYarnDeps, + yarnConfigHook, makeWrapper, + yarnBuildHook, + yarnInstallHook, nodejs, xsel, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "dokieli"; - version = "0-unstable-2024-09-23"; + version = "0-unstable-2024-12-12"; + # Can't update newer versions currently because newer versions require yarn-berry, and it's not in nixpkgs, yet. src = fetchFromGitHub { owner = "linkeddata"; repo = "dokieli"; - rev = "40ebbc60ba48d8b08f763b07befba96382c5f027"; - hash = "sha256-lc96jOR8uXLcZFhN3wpSd9O5cUdKxllB8WWCh2oWuEw="; + rev = "d8dc72c81b84ec12f791892a6377a7f6ec46ed3b"; + hash = "sha256-CzSyQVyeJVOP8NCsa7ST3atG87V1KPSBzTRi0brMFYw="; }; offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - hash = "sha256-TEXCCLFhpwHZJ8zRGsC7J6EwNaFpIi+CZ3L5uilebK4="; + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = + if stdenv.hostPlatform.isDarwin then + "sha256-bw5HszcHZ60qgYgm4qfhZEYXjJAQ2DXhWU0Reqb9VpQ=" + else + "sha256-rwHBDBWZe4cdTyL7lNkB4nlpd5MWzbTU6kzdLBWcq0M="; }; - packageJSON = ./package.json; - installPhase = '' mkdir -p $out/bin cp -r * $out ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + yarnConfigHook + yarnBuildHook + yarnInstallHook + # Needed for executing package.json scripts + nodejs + ]; postFixup = '' makeWrapper ${nodejs}/bin/npx $out/bin/dokieli \ @@ -53,6 +66,7 @@ mkYarnPackage rec { license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ shogo ]; + teams = [ lib.teams.ngi ]; mainProgram = "dokieli"; }; -} +}) diff --git a/pkgs/by-name/do/dolfinx/package.nix b/pkgs/by-name/do/dolfinx/package.nix new file mode 100644 index 000000000000..db7d0659601f --- /dev/null +++ b/pkgs/by-name/do/dolfinx/package.nix @@ -0,0 +1,114 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + spdlog, + pugixml, + boost, + petsc, + slepc, + kahip, + adios2, + python3Packages, + catch2_3, + withParmetis ? false, +}: +let + dolfinxPackages = petsc.petscPackages.overrideScope ( + final: prev: { + slepc = final.callPackage slepc.override { }; + adios2 = final.callPackage adios2.override { }; + kahip = final.callPackage kahip.override { }; + } + ); +in +stdenv.mkDerivation (finalAttrs: { + version = "0.9.0.post1"; + pname = "dolfinx"; + + src = fetchFromGitHub { + owner = "fenics"; + repo = "dolfinx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4IIx7vUZeDwOGVdyC2PBvfhVjrmGZeVQKAwgDYScbY0="; + }; + + preConfigure = '' + cd cpp + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + dolfinxPackages.kahip + dolfinxPackages.scotch + ] ++ lib.optional withParmetis dolfinxPackages.parmetis; + + propagatedBuildInputs = [ + spdlog + pugixml + boost + petsc + dolfinxPackages.hdf5 + dolfinxPackages.slepc + dolfinxPackages.adios2 + python3Packages.fenics-basix + python3Packages.fenics-ffcx + ]; + + cmakeFlags = [ + (lib.cmakeBool "DOLFINX_ENABLE_ADIOS2" true) + (lib.cmakeBool "DOLFINX_ENABLE_PETSC" true) + (lib.cmakeBool "DOLFIN_ENABLE_PARMETIS" withParmetis) + (lib.cmakeBool "DOLFINX_ENABLE_SCOTCH" true) + (lib.cmakeBool "DOLFINX_ENABLE_SLEPC" true) + (lib.cmakeBool "DOLFINX_ENABLE_KAHIP" true) + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + ]; + + passthru.tests = { + unittests = stdenv.mkDerivation { + pname = "${finalAttrs.pname}-unittests"; + inherit (finalAttrs) version src; + + preConfigure = '' + cd cpp/test + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ finalAttrs.finalPackage ]; + + nativeCheckInputs = [ catch2_3 ]; + + doCheck = true; + + installPhase = '' + touch $out + ''; + }; + }; + + meta = { + homepage = "https://fenicsproject.org"; + downloadPage = "https://github.com/fenics/dolfinx"; + description = "Computational environment of FEniCSx and implements the FEniCS Problem Solving Environment in C++ and Python"; + changelog = "https://github.com/fenics/dolfinx/releases/tag/${finalAttrs.src.tag}"; + license = with lib.licenses; [ + bsd2 + lgpl3Plus + ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ qbisi ]; + }; +}) diff --git a/pkgs/by-name/do/dolibarr/package.nix b/pkgs/by-name/do/dolibarr/package.nix index ba87da6065cb..8c0ac47b5ff1 100644 --- a/pkgs/by-name/do/dolibarr/package.nix +++ b/pkgs/by-name/do/dolibarr/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dolibarr"; - version = "21.0.0"; + version = "21.0.1"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; tag = finalAttrs.version; - hash = "sha256-OTYX9CZ1gQlAOsrWIMJwhH8QPDM2J3MM183/Tj18jHg="; + hash = "sha256-aOFqfXsT1kmQwIB8clLMQaMeZtsyIYCxCGqaGCjlBRY="; }; dontBuild = true; diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix index c22d4afd73d5..79e343544514 100644 --- a/pkgs/by-name/do/dolphin-emu/package.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -53,14 +53,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "2503"; + version = "2503a"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; tag = finalAttrs.version; + hash = "sha256-1IqrQi2aBUFpa3n/WI7nF1wqBPyyfpv02YIFfX/911w="; fetchSubmodules = true; - hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs="; + leaveDotGit = true; + postFetch = '' + pushd $out + git rev-parse HEAD 2>/dev/null >$out/COMMIT + find $out -name .git -print0 | xargs -0 rm -rf + popd + ''; }; strictDeps = true; @@ -124,7 +131,6 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "DISTRIBUTOR" "NixOS") - (lib.cmakeFeature "DOLPHIN_WC_REVISION" finalAttrs.src.rev) (lib.cmakeFeature "DOLPHIN_WC_DESCRIBE" finalAttrs.version) (lib.cmakeFeature "DOLPHIN_WC_BRANCH" "master") ] @@ -138,6 +144,10 @@ stdenv.mkDerivation (finalAttrs: { # Note: The updater isn't available on linux, so we don't need to disable it there. (lib.cmakeBool "ENABLE_AUTOUPDATE" false) ]; + preConfigure = '' + appendToVar cmakeFlags "-DDOLPHIN_WC_REVISION=$(cat COMMIT)" + rm COMMIT + ''; qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index d97f45c3a14b..9315588d37c0 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.50.9"; + version = "1.53.2"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-d4n4Cz4FvSMznTqHs5cD18Y1xE6p8umGr7PqtI5k6Zg="; + sha256 = "sha256-NrwCgFJqh8XugKd8+T7KZsJtlYbx42zwD47h8xLr/YU="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-+UD1J1FSIfYtRY+0shCw/j5LPbc2V6Ydmc0bf8yj2EI="; + vendorHash = "sha256-mobygEA/p5uuWZSToReygQWnz0Wt488MGn5owPi55k0="; proxyVendor = true; doCheck = false; diff --git a/pkgs/by-name/do/domination/package.nix b/pkgs/by-name/do/domination/package.nix index 4b236657ba25..713a003bbd9f 100644 --- a/pkgs/by-name/do/domination/package.nix +++ b/pkgs/by-name/do/domination/package.nix @@ -30,16 +30,18 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.3.1"; + version = "1.3.4"; # The .zip releases do not contain the build.xml file src = fetchsvn { url = "https://svn.code.sf.net/p/domination/code/Domination"; # There are no tags in the repository. - # Look for commits like "new version x.y.z info on website" - # or "website update for x.y.z". - rev = "2538"; - hash = "sha256-wsLBHkQc1SW+PToyCXIek6qRrRga2nLLkM+5msrnsBo="; + # Look for "(svn rev X)" at + # https://sourceforge.net/p/domination/code/HEAD/tree/Domination/ChangeLog.txt + # Alternatively, look for revs like "changelog update", + # "new version x.y.z info on website", or "website update for x.y.z". + rev = "2664"; + hash = "sha256-bkaHpqJSc3UvwNT7LwuPUT8xN0g6QypfLSHlLmm8nX8="; }; nativeBuildInputs = [ @@ -96,6 +98,8 @@ stdenv.mkDerivation { domination-starts = nixosTests.domination; }; + passthru.updateScript = ./update.tcl; + meta = with lib; { homepage = "https://domination.sourceforge.net/"; downloadPage = "https://domination.sourceforge.net/download.shtml"; diff --git a/pkgs/by-name/do/domination/update.tcl b/pkgs/by-name/do/domination/update.tcl new file mode 100755 index 000000000000..3df285bd29b8 --- /dev/null +++ b/pkgs/by-name/do/domination/update.tcl @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i tclsh -p tcl common-updater-scripts curl + +set changelog_url https://sourceforge.net/p/domination/code/HEAD/tree/Domination/ChangeLog.txt?format=raw + +set changelog [exec -ignorestderr curl -Ls $changelog_url] +regexp {(\d+(\.\d+)*) \(\d+\.\d+\.\d+\) \(svn rev (\d+)\)} $changelog _ version _ rev +exec -ignorestderr update-source-version domination $version --rev=$rev diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix index 7b4398e1e2bb..e7c1e70b8d6e 100644 --- a/pkgs/by-name/do/done/package.nix +++ b/pkgs/by-name/do/done/package.nix @@ -16,7 +16,6 @@ libsecret, openssl, sqlite, - darwin, gettext, }: @@ -48,18 +47,14 @@ stdenv.mkDerivation rec { wrapGAppsHook4 ]; - buildInputs = - [ - gdk-pixbuf - gtk4 - libadwaita - libsecret - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = [ + gdk-pixbuf + gtk4 + libadwaita + libsecret + openssl + sqlite + ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { GETTEXT_DIR = gettext; diff --git a/pkgs/by-name/do/donpapi/package.nix b/pkgs/by-name/do/donpapi/package.nix index 8a90402c0276..0d3e0b29ef2c 100644 --- a/pkgs/by-name/do/donpapi/package.nix +++ b/pkgs/by-name/do/donpapi/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, python3, fetchFromGitHub, }: @@ -22,11 +23,9 @@ python3.pkgs.buildPythonApplication rec { "pyasn1" ]; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ cryptography impacket lnkparse3 @@ -38,16 +37,15 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "donpapi" - ]; + pythonImportsCheck = [ "donpapi" ]; meta = with lib; { description = "Tool for dumping DPAPI credentials remotely"; homepage = "https://github.com/login-securite/DonPAPI"; - changelog = "https://github.com/login-securite/DonPAPI/releases/tag/V${version}"; + changelog = "https://github.com/login-securite/DonPAPI/releases/tag/V${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "donpapi"; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix index 57bd173e17c4..0b8925b6bd16 100644 --- a/pkgs/by-name/do/dooit/package.nix +++ b/pkgs/by-name/do/dooit/package.nix @@ -12,14 +12,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "dooit"; - version = "3.1.0"; + version = "3.2.2"; pyproject = true; src = fetchFromGitHub { owner = "dooit-org"; repo = "dooit"; tag = "v${version}"; - hash = "sha256-tqSWDW3nj+nMt7t5vgSqWvtx7YA3y2GV29gI1MYFMhc="; + hash = "sha256-2W3iO4AOuDdDKJDMMY8YKXlI+dQKRI3PQtkdi9J3wZo="; }; build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/games/doom-ports/zdoom/bcc-warning-fix.patch b/pkgs/by-name/do/doom-bcc/bcc-warning-fix.patch similarity index 100% rename from pkgs/games/doom-ports/zdoom/bcc-warning-fix.patch rename to pkgs/by-name/do/doom-bcc/bcc-warning-fix.patch diff --git a/pkgs/games/doom-ports/zdoom/bcc-git.nix b/pkgs/by-name/do/doom-bcc/package.nix similarity index 100% rename from pkgs/games/doom-ports/zdoom/bcc-git.nix rename to pkgs/by-name/do/doom-bcc/package.nix diff --git a/pkgs/by-name/do/doomretro/package.nix b/pkgs/by-name/do/doomretro/package.nix index 2eb11cd61ea4..b332fafe1aa5 100644 --- a/pkgs/by-name/do/doomretro/package.nix +++ b/pkgs/by-name/do/doomretro/package.nix @@ -4,15 +4,11 @@ SDL2_image, SDL2_mixer, cmake, - darwin, fetchFromGitHub, pkg-config, stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; version = "5.6.2"; @@ -33,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_image SDL2_mixer - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; strictDeps = true; diff --git a/pkgs/by-name/do/doomrunner/package.nix b/pkgs/by-name/do/doomrunner/package.nix index 2bb8b59e6a1a..7c7afec374b8 100644 --- a/pkgs/by-name/do/doomrunner/package.nix +++ b/pkgs/by-name/do/doomrunner/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomrunner"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "Youda008"; repo = "DoomRunner"; tag = "v${finalAttrs.version}"; - hash = "sha256-rCoMTPGjIFAcNncBGg1IMdUahzjH0WlFZBZS0UmNI/g="; + hash = "sha256-N5kj2Z3QW29kOw2khET6Z4E9nFBBjNTgKw2xbCQrWKY="; }; buildInputs = [ kdePackages.qtbase ]; diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index c1e5796fb5d0..8cfbfa9aeac1 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.73.0"; + version = "3.74.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - hash = "sha256-CHPaY8Z8ov+loIViQceD4ZW26MtXN1hpkY00p3Yy1n4="; + hash = "sha256-mT6AB3Xtjm7AHtdF3eKn7dfnd/3ul1nCiZ5e4cHUXbc="; }; - vendorHash = "sha256-w3P/VbQrOJ9BMVw2thX/nU4loi4x8Nn/R2AJV5LzZBY="; + vendorHash = "sha256-tSRtgkDPvDlEfwuNhahvs3Pvt4h7QAJrJtb1XQXGaFM="; ldflags = [ "-s -w" diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index 150b1574f17d..f31b2603c289 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "1.9.4"; + version = "1.9.9"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-EFcfkj0NOmQrWgLJpWHdIX7iitqfZwgTmkMvueJPS/c="; + hash = "sha256-UVcbZgPk35VsYvyzIJrR79vAhSByJjn8kh+y0KQcwpM="; }; # https://github.com/NixOS/nixpkgs/issues/318830 diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index 8e482b956e9b..7aeeb8215cc3 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -1,11 +1,9 @@ { lib, SDL2, - SDL2_image, SDL2_net, alsa-lib, fetchFromGitHub, - fetchpatch, fluidsynth, gitUpdater, glib, @@ -33,23 +31,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-staging"; - version = "0.81.1"; + version = "0.82.1"; + shortRev = "13441a2"; src = fetchFromGitHub { owner = "dosbox-staging"; repo = "dosbox-staging"; rev = "v${finalAttrs.version}"; - hash = "sha256-XGssEyX+AVv7/ixgGTRtPFjsUSX0FT0fhP+TXsFl2fY="; + hash = "sha256-BVeFBKqTQiEftWVvMkSYBjC6dCYI4juWD4A6Bx8E8/Y="; }; - patches = [ - (fetchpatch { - name = "darwin-allow-bypass-wraps.patch"; - url = "https://github.com/dosbox-staging/dosbox-staging/commit/9f0fc1dc762010e5f7471d01c504d817a066cae3.patch"; - hash = "sha256-IzxRE1Vr+M8I5hdy80UwebjJ5R1IlH9ymaYgs6VwAO4="; - }) - ]; - nativeBuildInputs = [ gtest makeWrapper @@ -60,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 - SDL2_image SDL2_net fluidsynth glib @@ -84,8 +74,18 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; + # replace instances of the get-version.sh script that uses git in meson.build with manual values + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "meson.project_source_root() + '/scripts/get-version.sh'," "'printf'," \ + --replace-fail "'version', check: true," "'${finalAttrs.version}', check: true," \ + --replace-fail "'./scripts/get-version.sh', 'hash'," "'printf', '${ + builtins.substring 0 5 finalAttrs.shortRev + }'," + ''; + postInstall = '' - install -Dm644 $src/contrib/linux/dosbox-staging.desktop $out/share/applications/ + install -Dm644 $src/contrib/linux/org.dosbox-staging.dosbox-staging.desktop $out/share/applications/ ''; # Rename binary, add a wrapper, and copy manual to avoid conflict with @@ -125,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ joshuafern + Zaechus ]; platforms = lib.platforms.unix; priority = 101; diff --git a/pkgs/by-name/do/dosbox-x/package.nix b/pkgs/by-name/do/dosbox-x/package.nix new file mode 100644 index 000000000000..46e0477866c4 --- /dev/null +++ b/pkgs/by-name/do/dosbox-x/package.nix @@ -0,0 +1,140 @@ +{ + lib, + stdenv, + fetchFromGitHub, + alsa-lib, + autoreconfHook, + ffmpeg, + fluidsynth, + freetype, + glib, + libicns, + libpcap, + libpng, + libslirp, + libxkbfile, + libXrandr, + makeWrapper, + ncurses, + pkg-config, + python3, + SDL2, + SDL2_net, + testers, + yad, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dosbox-x"; + version = "2025.05.03"; + + src = fetchFromGitHub { + owner = "joncampbell123"; + repo = "dosbox-x"; + rev = "dosbox-x-v${finalAttrs.version}"; + hash = "sha256-VYJn1ddDkSHpWVsE7NunwRvuAVRqbvCNw/TzkWe8TLQ="; + }; + + # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants + # iconutil is unavailable, replace with png2icns from libicns + # Patch bad hardcoded compiler + # Don't mess with codesign, doesn't seem to work? + postPatch = + '' + substituteInPlace Makefile.am \ + --replace-fail 'sips' '## sips' \ + --replace-fail 'iconutil -c icns -o contrib/macos/dosbox.icns src/dosbox.iconset' 'png2icns contrib/macos/dosbox.icns contrib/macos/dosbox-x.png' \ + --replace-fail 'g++' "$CXX" \ + --replace-fail 'codesign' '## codesign' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + patchShebangs appbundledeps.py + ''; + + strictDeps = true; + + nativeBuildInputs = + [ + autoreconfHook + makeWrapper + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libicns + python3 + ]; + + buildInputs = + [ + ffmpeg + fluidsynth + freetype + glib + libpcap + libpng + libslirp + ncurses + SDL2 + SDL2_net + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libxkbfile + libXrandr + ]; + + # Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL2 subdirectory + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_net}/include/SDL2"; + + configureFlags = [ "--enable-sdl2" ]; + + enableParallelBuilding = true; + + hardeningDisable = [ "format" ]; # https://github.com/joncampbell123/dosbox-x/issues/4436 + + # Build optional App Bundle target, which needs at least one arch-suffixed binary + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + cp src/dosbox-x src/dosbox-x-$(uname -m) + make dosbox-x.app + ''; + + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + wrapProgram $out/bin/dosbox-x \ + --prefix PATH : ${lib.makeBinPath [ yad ]} + '' + # Install App Bundle, wrap regular binary into bundle's binary to get the icon working + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/Applications + mv dosbox-x.app $out/Applications/ + mv $out/bin/dosbox-x $out/Applications/dosbox-x.app/Contents/MacOS/dosbox-x + makeWrapper $out/Applications/dosbox-x.app/Contents/MacOS/dosbox-x $out/bin/dosbox-x + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + # Version output on stderr, program returns status code 1 + command = "${lib.getExe finalAttrs.finalPackage} -version 2>&1 || true"; + }; + + meta = { + homepage = "https://dosbox-x.com"; + description = "Cross-platform DOS emulator based on the DOSBox project"; + longDescription = '' + DOSBox-X is an expanded fork of DOSBox with specific focus on running + Windows 3.x/9x/Me, PC-98 and 3D support via 3dfx. + + The full expanded feature list is available here: + https://dosbox-x.com/wiki/DOSBox%E2%80%90X%E2%80%99s-Feature-Highlights + ''; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + hughobrien + OPNA2608 + ]; + platforms = lib.platforms.unix; + mainProgram = "dosbox-x"; + }; +}) diff --git a/pkgs/by-name/do/dotbot/package.nix b/pkgs/by-name/do/dotbot/package.nix index 7bb4b99872d5..0cd926383768 100644 --- a/pkgs/by-name/do/dotbot/package.nix +++ b/pkgs/by-name/do/dotbot/package.nix @@ -6,23 +6,23 @@ python3Packages.buildPythonApplication rec { pname = "dotbot"; - version = "1.20.4"; + version = "1.21.0"; pyproject = true; src = fetchFromGitHub { owner = "anishathalye"; repo = "dotbot"; tag = "v${version}"; - hash = "sha256-GnzN8z7LP9rVD0DnKkPxJ0BxiO1YDY7MyMWBt1CAh6g="; + hash = "sha256-f+ykGXcQ1hLptGElQ5ZTt8z0SXnlTbdcf922AVF78bU="; }; preCheck = '' patchShebangs bin/dotbot ''; - nativeBuildInputs = with python3Packages; [ setuptools ]; + build-system = with python3Packages; [ hatchling ]; - propagatedBuildInputs = with python3Packages; [ pyyaml ]; + dependencies = with python3Packages; [ pyyaml ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/by-name/do/dotenv-linter/package.nix b/pkgs/by-name/do/dotenv-linter/package.nix new file mode 100644 index 000000000000..8c8f6d425d72 --- /dev/null +++ b/pkgs/by-name/do/dotenv-linter/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "dotenv-linter"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "dotenv-linter"; + repo = "dotenv-linter"; + rev = "v${version}"; + sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-lBHqvwZrnkSfmMXBmnhovbDn+pf5iLJepJjO/FKT1wY="; + + meta = with lib; { + description = "Lightning-fast linter for .env files. Written in Rust"; + mainProgram = "dotenv-linter"; + homepage = "https://dotenv-linter.github.io"; + license = licenses.mit; + maintainers = with maintainers; [ humancalico ]; + }; +} diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index f88bb3b9ac9c..010cad0a3c74 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.38.5"; + version = "1.41.0"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${version}"; - hash = "sha256-v1sLIK0lVAazhNIz3uzXAdKfaHAPW57TGm1gLogvGOc="; + hash = "sha256-qYigFqJF/+37bd8LPg8u9EkI/50ULxTs3LwjrcAYntk="; }; - npmDepsHash = "sha256-aFC1cCPHuiQmXoVDc4+0yO22c7AhRpehiUGG81rIlvw="; + npmDepsHash = "sha256-k+M3AdEHSrpl+rKTbxmTkcHVgwm5lHt3xjj2fQ4UFiI="; dontNpmBuild = true; diff --git a/pkgs/by-name/do/dotherside/package.nix b/pkgs/by-name/do/dotherside/package.nix old mode 100755 new mode 100644 diff --git a/pkgs/by-name/do/dotnet-ef/package.nix b/pkgs/by-name/do/dotnet-ef/package.nix index aaca7b41c30c..9fe2edac1f2c 100644 --- a/pkgs/by-name/do/dotnet-ef/package.nix +++ b/pkgs/by-name/do/dotnet-ef/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "dotnet-ef"; - version = "9.0.3"; + version = "9.0.5"; - nugetHash = "sha256-oRBN6Qh5PuVofmboqCpFJR3hUD+MruRYp4whjd9Yu9g="; + nugetHash = "sha256-Mu+MlsjH/qa4kMb7z/TuG1lSVSKPX9j9S4mJLVRZ2+E="; meta = { description = "The Entity Framework Core tools help with design-time development tasks."; diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix index 87339d21f6f9..789fa76979b9 100644 --- a/pkgs/by-name/do/dotter/package.nix +++ b/pkgs/by-name/do/dotter/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, nix-update-script, rustPlatform, - darwin, which, installShellFiles, }: @@ -23,10 +22,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-UBZZu8D1fbNOn2obviP+/Qw+E/OoNKRA4NXzqCqghGs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - nativeCheckInputs = [ which installShellFiles diff --git a/pkgs/by-name/do/double-entry-generator/package.nix b/pkgs/by-name/do/double-entry-generator/package.nix index f57f8b185b9d..48aafd7fa5a1 100644 --- a/pkgs/by-name/do/double-entry-generator/package.nix +++ b/pkgs/by-name/do/double-entry-generator/package.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "double-entry-generator"; - version = "2.7.1"; + version = "2.10.1"; src = fetchFromGitHub { owner = "deb-sig"; repo = "double-entry-generator"; - hash = "sha256-2Y8Spj1LAVZsUgChDYDCZ63pTH+nqs2ff9xcmC+gr0c="; + hash = "sha256-zAkiTUnuk6o2wFta1hG0RRD8/LIdgNFcSYvQ0Y2zeJY="; rev = "v${version}"; }; - vendorHash = "sha256-Xedva9oGteOnv3rP4Wo3sOHIPyuy2TYwkZV2BAuxY4M="; + vendorHash = "sha256-NoWUaawApdTSWGRul9mpOxgRZWTE7LTz3pJgwU2NWVU="; excludedPackages = [ "hack" ]; diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index eb8558b9dba7..94074ca6035e 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.23"; + version = "1.1.24"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-nvLVJAB751dY28jG1WjguuEVkCUb4Iy7V8cJjw3y8GI="; + hash = "sha256-WSICdPIz4Af+TW3H+pHnZHHzMNkI6myj8X1u4087Qa8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix index 516b777b836b..22c6290c923a 100644 --- a/pkgs/by-name/do/dovecot/package.nix +++ b/pkgs/by-name/do/dovecot/package.nix @@ -188,13 +188,11 @@ stdenv.mkDerivation rec { bsdOriginal ]; mainProgram = "dovecot"; - maintainers = - with maintainers; - [ - fpletz - globin - ] - ++ teams.helsinki-systems.members; + maintainers = with maintainers; [ + fpletz + globin + ]; + teams = [ lib.teams.helsinki-systems ]; platforms = platforms.unix; }; passthru.tests = { diff --git a/pkgs/by-name/do/dovecot_pigeonhole/package.nix b/pkgs/by-name/do/dovecot_pigeonhole/package.nix index e45671491597..7880e5475ca2 100644 --- a/pkgs/by-name/do/dovecot_pigeonhole/package.nix +++ b/pkgs/by-name/do/dovecot_pigeonhole/package.nix @@ -43,7 +43,8 @@ stdenv.mkDerivation rec { homepage = "https://pigeonhole.dovecot.org/"; description = "Sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ globin ] ++ teams.helsinki-systems.members; + maintainers = with maintainers; [ globin ]; + teams = [ teams.helsinki-systems ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/do/doxygen-awesome-css/package.nix b/pkgs/by-name/do/doxygen-awesome-css/package.nix new file mode 100644 index 000000000000..05412686981a --- /dev/null +++ b/pkgs/by-name/do/doxygen-awesome-css/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "doxygen-awesome-css"; + version = "2.3.4"; + + src = fetchFromGitHub { + owner = "jothepro"; + repo = "doxygen-awesome-css"; + rev = "v${finalAttrs.version}"; + hash = "sha256-g4Smy7BJ//4wQigAnx5fJQe5QxoLc6Aopm8O7S2lVkY="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/jothepro/doxygen-awesome-css/releases/tag/v${finalAttrs.version}"; + description = "CSS theme for doxygen html-documentation with lots of customization parameters"; + homepage = "https://github.com/jothepro/doxygen-awesome-css"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/do/dozenal/lua-header.patch b/pkgs/by-name/do/dozenal/lua-header.patch deleted file mode 100644 index 45b76e159a11..000000000000 --- a/pkgs/by-name/do/dozenal/lua-header.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN dozenal-12010904/dozenal/dozcal/call_lua.c dozenal-patched/dozenal/dozcal/call_lua.c ---- dozenal-12010904/dozenal/dozcal/call_lua.c 2017-09-04 19:25:01.000000000 +0200 -+++ dozenal-patched/dozenal/dozcal/call_lua.c 2018-06-13 10:19:57.821950327 +0200 -@@ -38,9 +38,9 @@ - #include"utility.h" - #include"conv.h" - #include"proc_date.h" --#include --#include --#include -+#include -+#include -+#include - - void bail(lua_State *L, int err_code, char *filename); - int file_prefix(char **s, char *t); diff --git a/pkgs/by-name/do/dozenal/package.nix b/pkgs/by-name/do/dozenal/package.nix deleted file mode 100644 index 4cef1375f4e8..000000000000 --- a/pkgs/by-name/do/dozenal/package.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - ncurses, - hdate, - lua5_2, -}: - -stdenv.mkDerivation rec { - version = "12010904"; - pname = "dozenal"; - src = fetchFromGitHub { - owner = "dgoodmaniii"; - repo = "dozenal"; - rev = "v${version}"; - sha256 = "1ic63gpdda762x6ks3al71dwgmsy2isicqyr2935bd245jx8s209"; - }; - makeFlags = [ - # author do not use configure and prefix directly using $prefix - "prefix=$(out)" - # graphical version of dozdc requires xforms, which is not i nixpkgs so I turned it down - "XFORMS_FLAGS=-UXFORMS" - "LUALIB=-llua" - "bindir=$(prefix)/bin/" - ]; - # some include hardcodes the lua libraries path. This is a patch for that - patches = [ ./lua-header.patch ]; - preBuild = "cd dozenal"; - buildInputs = [ - ncurses - hdate - lua5_2 - ]; - - # Parallel builds fail due to no dependencies between subdirs. - # As a result some subdirs are atempted to build twice: - # ../dec/dec.c:39:10: fatal error: conv.h: No such file or directory - # Let's disable parallelism until it's fixed upstream: - # https://gitlab.com/dgoodmaniii/dozenal/-/issues/8 - enableParallelBuilding = false; - - # I remove gdozdc, as I didn't figure all it's dependency yet. - postInstall = "rm $out/bin/gdozdc"; - - meta = { - description = "Complete suite of dozenal (base twelve) programs"; - longDescription = '' - Programs - - doz --- a converter; converts decimal numbers into dozenal. Accepts - input in standard or exponential notation (i.e., "1492.2" or "1.4922e3"). - dec --- a converter; converts dozenal numbers into decimal. Accepts input - in standard or exponential notation (i.e., "X44;4" or "X;444e2"). - dozword --- converts a dozenal number (integers only) into words, - according to the Pendlebury system. - dozdc --- a full-featured scientific calculator which works in the - dozenal base. RPN command line. - tgmconv --- a converter for all standard measurements; converts to and - from TGM, Imperial, customary, and SI metric. - dozpret --- a pretty-printer for dozenal numbers; inserts spacing (or - other characters) as desired, and can also transform transdecimal digits - from 'X' to 'E' into any character or sequence of characters desired. - dozdate --- a more-or-less drop-in replacement for GNU and BSD date, it - outputs the date and time in dozenal, as well as containing some TGM - extensions. - dozstring --- a simple byte converter; absorbs a string either from - standard input or a command line argument, leaving it identical but - for the numbers, which it converts into dozenal. Options for padding - and for not converting specific numbers. - doman --- a converter which takes a dozenal integer and - emits its equivalent in a non-place-value system, such as - Roman numerals. Arbitrary ranks and symbols may be used. - Defaults to dozenal Roman numerals. - ''; - homepage = "https://github.com/dgoodmaniii/dozenal/"; - maintainers = with lib.maintainers; [ CharlesHD ]; - license = lib.licenses.gpl3; - }; -} diff --git a/pkgs/by-name/dp/dpdk/package.nix b/pkgs/by-name/dp/dpdk/package.nix index 442095436484..2bee92b61cf9 100644 --- a/pkgs/by-name/dp/dpdk/package.nix +++ b/pkgs/by-name/dp/dpdk/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "dpdk"; - version = "24.07"; + version = "25.03"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "sha256-mUT35fJo56ybQZPizVTvbZj24dfd3JZ8d65PZhbW+70="; + sha256 = "sha256-akCnMTKChuvXloWxj/pZkua3cME4Q9Zf0NEVfPzP9j0="; }; nativeBuildInputs = [ @@ -69,14 +69,6 @@ stdenv.mkDerivation rec { libbsd ]; - patches = [ - (fetchpatch { - name = "CVE-2024-11614.patch"; - url = "https://git.dpdk.org/dpdk-stable/patch/?id=fdf13ea6fede07538fbe5e2a46fa6d4b2368fa81"; - hash = "sha256-lD2mhPm5r1tWZb4IpzHa2SeK1DyQ3rwjzArRTpAgZAY="; - }) - ]; - postPatch = '' patchShebangs config/arm buildtools ''; diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix index ba98905413e8..b85ad1a50ba5 100644 --- a/pkgs/by-name/dp/dpkg/package.nix +++ b/pkgs/by-name/dp/dpkg/package.nix @@ -15,7 +15,6 @@ pkg-config, diffutils, glibc ? !stdenv.hostPlatform.isDarwin, - darwin, }: stdenv.mkDerivation rec { @@ -86,7 +85,7 @@ stdenv.mkDerivation rec { xz zstd libmd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ]; nativeBuildInputs = [ makeWrapper perl diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index a54dc2af687a..76da0cdd957b 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -9,9 +9,9 @@ dprint, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dprint"; - version = "0.49.1"; + version = "0.50.0"; # Prefer repository rather than crate here # - They have Cargo.lock in the repository @@ -19,17 +19,27 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "dprint"; repo = "dprint"; - tag = version; - hash = "sha256-6ye9FqOGW40TqoDREQm6pZAQaSuO2o9SY5RSfpmwKV4="; + tag = finalAttrs.version; + hash = "sha256-6AgbKH5f7N/yYqq7KBVHOqYbyuZkjFSaYwZwIXsgd9o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OHRXujyewiDlY4AQEEqmcnmdec1lbWH/y6tPW1nNExE="; + cargoHash = "sha256-OnrsuVK1gEDweldq+P8lDkkrHjklsG8MRpM0wqWsdlM="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles ]; + cargoBuildFlags = [ + "--package=dprint" + # Required only for dprint package tests; the binary is removed in postInstall. + "--package=test-process-plugin" + ]; + + cargoTestFlags = [ + "--package=dprint" + ]; + checkFlags = [ # Require creating directory and network access "--skip=plugins::cache_fs_locks::test" @@ -40,17 +50,21 @@ rustPlatform.buildRustPackage rec { "--skip=utils::url::test::unsafe_ignore_cert" ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - export DPRINT_CACHE_DIR="$(mktemp -d)" - installShellCompletion --cmd dprint \ - --bash <($out/bin/dprint completions bash) \ - --zsh <($out/bin/dprint completions zsh) \ - --fish <($out/bin/dprint completions fish) - ''; + postInstall = + '' + rm "$out/bin/test-process-plugin" + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export DPRINT_CACHE_DIR="$(mktemp -d)" + installShellCompletion --cmd dprint \ + --bash <($out/bin/dprint completions bash) \ + --zsh <($out/bin/dprint completions zsh) \ + --fish <($out/bin/dprint completions fish) + ''; passthru = { tests.version = testers.testVersion { - inherit version; + inherit (finalAttrs) version; package = dprint; command = '' @@ -68,13 +82,14 @@ rustPlatform.buildRustPackage rec { It offers multiple WASM plugins to support various languages. It's written in Rust, so it’s small, fast, and portable. ''; - changelog = "https://github.com/dprint/dprint/releases/tag/${version}"; + changelog = "https://github.com/dprint/dprint/releases/tag/${finalAttrs.version}"; homepage = "https://dprint.dev"; license = licenses.mit; maintainers = with maintainers; [ khushraj kachick + phanirithvij ]; mainProgram = "dprint"; }; -} +}) diff --git a/pkgs/by-name/dp/dprint/plugins/default.nix b/pkgs/by-name/dp/dprint/plugins/default.nix index cefe95973b8d..810d5d23481c 100644 --- a/pkgs/by-name/dp/dprint/plugins/default.nix +++ b/pkgs/by-name/dp/dprint/plugins/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchurl }: +{ + lib, + fetchurl, + stdenv, + dprint, + writableTmpDirAsHomeHook, +}: let mkDprintPlugin = { @@ -12,23 +18,47 @@ let license ? lib.licenses.mit, maintainers ? [ lib.maintainers.phanirithvij ], }: - fetchurl { - inherit hash url; - name = "${pname}-${version}.wasm"; + stdenv.mkDerivation (finalAttrs: { + inherit pname version; + src = fetchurl { inherit url hash; }; + dontUnpack = true; meta = { - inherit - description - license - maintainers - ; + inherit description license maintainers; }; + /* + in the dprint configuration + dprint expects a plugin path to end with .wasm extension + + for auto update with nixpkgs-update to work + we cannot have .wasm extension at the end in the nix store path + */ + buildPhase = '' + mkdir -p $out + cp $src $out/plugin.wasm + ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + dprint + writableTmpDirAsHomeHook + ]; + # Prevent schema unmatching errors + # See https://github.com/NixOS/nixpkgs/pull/369415#issuecomment-2566112144 for detail + installCheckPhase = '' + runHook preInstallCheck + + mkdir empty && cd empty + dprint check --allow-no-files --config-discovery=false --plugins "$out/plugin.wasm" + + runHook postInstallCheck + ''; passthru = { updateScript = ./update-plugins.py; inherit initConfig updateUrl; }; - }; + }); inherit (lib) filterAttrs + isDerivation mapAttrs' nameValuePair removeSuffix @@ -40,5 +70,13 @@ let name: _: nameValuePair (removeSuffix ".nix" name) (import (./. + "/${name}") { inherit mkDprintPlugin; }) ) files; + # Expects a function that receives the dprint plugin set as an input + # and returns a list of plugins + # Example: + # pkgs.dprint-plugins.getPluginList (plugins: [ + # plugins.dprint-plugin-toml + # (pkgs.callPackage ./dprint/plugins/sample.nix {}) + # ] + getPluginList = cb: map (p: "${p}/plugin.wasm") (cb plugins); in -plugins // { inherit mkDprintPlugin; } +plugins // { inherit mkDprintPlugin getPluginList; } diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix index 2d8702539a0a..01b0c1bdfaa3 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "JSON/JSONC code formatter."; - hash = "sha256-Sw+HkUb4K2wrLuQRZibr8gOCR3Rz36IeId4Vd4LijmY="; + hash = "sha256-uFcFLi9aYsBrAqkhFmg9GI+LKiV19LxdNjxQ85EH9To="; initConfig = { configExcludes = [ "**/*-lock.json" ]; configKey = "json"; @@ -9,6 +9,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-json"; updateUrl = "https://plugins.dprint.dev/dprint/json/latest.json"; - url = "https://plugins.dprint.dev/json-0.19.4.wasm"; - version = "0.19.4"; + url = "https://plugins.dprint.dev/json-0.20.0.wasm"; + version = "0.20.0"; } diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix index f1ac0eae9708..6d3533bf2f61 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Jupyter notebook code block formatter."; - hash = "sha256-877CEZbMlj9cHkFtl16XCnan37SeEGUL3BHaUKUv8S4="; + hash = "sha256-IlGwt2TnKeH9NwmUmU1keaTInXgYQVLIPNnr30A9lsM="; initConfig = { configExcludes = [ ]; configKey = "jupyter"; @@ -9,6 +9,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-jupyter"; updateUrl = "https://plugins.dprint.dev/dprint/jupyter/latest.json"; - url = "https://plugins.dprint.dev/jupyter-0.1.5.wasm"; - version = "0.1.5"; + url = "https://plugins.dprint.dev/jupyter-0.2.0.wasm"; + version = "0.2.0"; } diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix index 0d17600f6827..d33a4a32311c 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Markdown code formatter."; - hash = "sha256-PIEN9UnYC8doJpdzS7M6QEHQNQtj7WwXAgvewPsTjqs="; + hash = "sha256-fBy+G+DkJqhrCyyaMjmXRe1VeSeCYO+XmJ8ogwAoptA="; initConfig = { configExcludes = [ ]; configKey = "markdown"; @@ -9,6 +9,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-markdown"; updateUrl = "https://plugins.dprint.dev/dprint/markdown/latest.json"; - url = "https://plugins.dprint.dev/markdown-0.17.8.wasm"; - version = "0.17.8"; + url = "https://plugins.dprint.dev/markdown-0.18.0.wasm"; + version = "0.18.0"; } diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix index c45e02804f64..de518669f248 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "TOML code formatter."; - hash = "sha256-4g/nu8Wo7oF+8OAyXOzs9MuGpt2RFGvD58Bafnrr3ZQ="; + hash = "sha256-ASbIESaRVC0wtSpjkHbsyD4Hus6HdjjO58aRX9Nrhik="; initConfig = { configExcludes = [ ]; configKey = "toml"; @@ -9,6 +9,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-toml"; updateUrl = "https://plugins.dprint.dev/dprint/toml/latest.json"; - url = "https://plugins.dprint.dev/toml-0.6.4.wasm"; - version = "0.6.4"; + url = "https://plugins.dprint.dev/toml-0.7.0.wasm"; + version = "0.7.0"; } diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix index a3a805827ec0..63268de79e2b 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "TypeScript/JavaScript code formatter."; - hash = "sha256-urgKQOjgkoDJCH/K7DWLJCkD0iH0Ok+rvrNDI0i4uS0="; + hash = "sha256-IHbpEwTATwAmVa/ihGjQzQL/WwWo8owslJtWYUjVF+g="; initConfig = { configExcludes = [ "**/node_modules" ]; configKey = "typescript"; @@ -16,6 +16,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-typescript"; updateUrl = "https://plugins.dprint.dev/dprint/typescript/latest.json"; - url = "https://plugins.dprint.dev/typescript-0.93.3.wasm"; - version = "0.93.3"; + url = "https://plugins.dprint.dev/typescript-0.95.1.wasm"; + version = "0.95.1"; } diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix index c01cad63c064..81bb3435fdaf 100644 --- a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix +++ b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "CSS, SCSS, Sass and Less formatter."; - hash = "sha256-zt7F1tgPhPAn+gtps6+JB5RtvjIZw2n/G85Bv6kazgU="; + hash = "sha256-mFlhfqtglKtKNls96PO/2AWLL1fNC5msQCd9EgdKauE="; initConfig = { configExcludes = [ "**/node_modules" ]; configKey = "malva"; @@ -14,6 +14,6 @@ mkDprintPlugin { }; pname = "g-plane-malva"; updateUrl = "https://plugins.dprint.dev/g-plane/malva/latest.json"; - url = "https://plugins.dprint.dev/g-plane/malva-v0.11.1.wasm"; - version = "0.11.1"; + url = "https://plugins.dprint.dev/g-plane/malva-v0.11.2.wasm"; + version = "0.11.2"; } diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix index b948d3569013..98823309f6d0 100644 --- a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix +++ b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, and Vento formatter."; - hash = "sha256-G8UnJbc+oZ60V3oi8W2SS6H06zEYfY3wpmSUp+1GF8k="; + hash = "sha256-fCvurr8f79io/jIjwCfwr/WGjvcKZtptRrx9GFfytSI="; initConfig = { configExcludes = [ ]; configKey = "markup"; @@ -19,6 +19,6 @@ mkDprintPlugin { }; pname = "g-plane-markup_fmt"; updateUrl = "https://plugins.dprint.dev/g-plane/markup_fmt/latest.json"; - url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.18.0.wasm"; - version = "0.18.0"; + url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.19.0.wasm"; + version = "0.19.0"; } diff --git a/pkgs/by-name/dp/dprint/plugins/update-plugins.py b/pkgs/by-name/dp/dprint/plugins/update-plugins.py index 9a3bd7e38cae..f065d673152b 100755 --- a/pkgs/by-name/dp/dprint/plugins/update-plugins.py +++ b/pkgs/by-name/dp/dprint/plugins/update-plugins.py @@ -29,11 +29,9 @@ else: # get sri hash for a url, no unpack -def nix_prefetch_url(url, name, algo="sha256"): +def nix_prefetch_url(url, algo="sha256"): hash = ( - subprocess.check_output( - ["nix-prefetch-url", "--type", algo, "--name", name, url] - ) + subprocess.check_output(["nix-prefetch-url", "--type", algo, url]) .decode("utf-8") .rstrip() ) @@ -119,7 +117,7 @@ def update_plugin_by_name(name): data = requests.get(p["updateUrl"]).json() p["url"] = data["url"] p["version"] = data["version"] - p["hash"] = nix_prefetch_url(data["url"], f"{name}-{data["version"]}.wasm") + p["hash"] = nix_prefetch_url(data["url"]) write_plugin_derivation(p) @@ -136,7 +134,7 @@ def update_plugins(): pname = pname.replace("/", "-") drv_attrs = { "url": e["url"], - "hash": nix_prefetch_url(e["url"], f"{pname}-{e["version"]}.wasm"), + "hash": nix_prefetch_url(e["url"]), "updateUrl": update_url, "pname": pname, "version": e["version"], diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix index ababbef6edf0..c73978a3f496 100644 --- a/pkgs/by-name/dp/dput-ng/package.nix +++ b/pkgs/by-name/dp/dput-ng/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "1.40"; + version = "1.43"; in python3.pkgs.buildPythonApplication { pname = "dput-ng"; @@ -16,8 +16,8 @@ python3.pkgs.buildPythonApplication { domain = "salsa.debian.org"; owner = "debian"; repo = "dput-ng"; - rev = "refs/tags/${version}"; - hash = "sha256-97NrRUmIjrP41NyI4KOEzHLlaqxehZIhSVyx9hRZ0dw="; + tag = "debian/${version}"; + hash = "sha256-zrH4h4C4y3oTiOXsidFv/rIJNzCdV2lqzNEg0SOkX4w="; }; build-system = with python3.pkgs; [ @@ -46,7 +46,13 @@ python3.pkgs.buildPythonApplication { # Requires running dpkg disabledTestPaths = [ "tests/test_upload.py" ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + # Debian's tagging scheme is the bane of my existence. + # Essentially: all tags from 1.40 onwards start with `debian/`, + # then the version, and then an optional suffix (usually reserved for backports). + # We want to ignore the backport versions, and strip the `debian/` prefix. + extraArgs = [ "--version-regex=(?:debian\/)?(\d+(?:\.\d+)*)(?:[_\+].*)?" ]; + }; meta = { description = "Next-generation Debian package upload tool"; diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix index 29de15dfc711..a6daf5216f2e 100644 --- a/pkgs/by-name/dr/dracula-theme/package.nix +++ b/pkgs/by-name/dr/dracula-theme/package.nix @@ -8,7 +8,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2025-03-22"; + version = "4.0.0-unstable-2025-04-27"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "e7f118ac0434988800453bc30671b55ccfe02bd9"; - hash = "sha256-f7bYYkAm4f0kSaDY1X2ZLLxlXwzUdFtjHkIeX0QmX9w="; + rev = "3834a1bac175b226cff6b1c94faac9aba2819bd5"; + hash = "sha256-T0X0h4Bz3sy5jqtB1PkpjFnB8jO3CehOxgRwPPG54Ds="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/by-name/dr/draupnir/hashes.json b/pkgs/by-name/dr/draupnir/hashes.json new file mode 100644 index 000000000000..4b85c2a37b6b --- /dev/null +++ b/pkgs/by-name/dr/draupnir/hashes.json @@ -0,0 +1,3 @@ +{ + "yarn_offline_cache_hash": "sha256-EM1YRbcgn0gLgw/8KImKBbG7T14ztsXqw7U5SINUT+U=" +} diff --git a/pkgs/by-name/dr/draupnir/package.json b/pkgs/by-name/dr/draupnir/package.json new file mode 100644 index 000000000000..ac159d046e45 --- /dev/null +++ b/pkgs/by-name/dr/draupnir/package.json @@ -0,0 +1,80 @@ +{ + "name": "draupnir", + "version": "2.2.0", + "description": "A moderation tool for Matrix", + "main": "lib/index.js", + "repository": "https://github.com/the-draupnir-project/Draupnir.git", + "author": "Gnuxie", + "license": "AFL-3.0", + "private": true, + "scripts": { + "build": "tsc --project test/tsconfig.json && tsc > /dev/null 2>&1", + "postbuild": "corepack yarn describe-version", + "describe-version": "(git describe > version.txt.tmp && mv version.txt.tmp version.txt) || true && rm -f version.txt.tmp", + "remove-tests-from-lib": "rm -rf lib/test/ && cp -r lib/src/* lib/ && rm -rf lib/src/", + "lint": "corepack yarn eslint --cache src test && corepack yarn prettier --cache --ignore-unknown --check src test", + "start:dev": "corepack yarn build && node --async-stack-traces lib/index.js", + "test:unit": "mocha --require './test/tsnode.cjs' --forbid-only 'test/unit/**/*.{ts,tsx}'", + "test:unit:single": "mocha --require test/tsnode.cjs", + "test:integration": "NODE_ENV=harness mocha --require test/tsnode.cjs --async-stack-traces --forbid-only --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json \"test/integration/**/*Test.ts\"", + "test:integration:single": "NODE_ENV=harness corepack yarn mocha --require test/tsnode.cjs --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json", + "test:appservice:integration": "NODE_ENV=harness mocha --require test/tsnode.cjs --async-stack-traces --forbid-only --timeout 300000 --project ./tsconfig.json \"test/appservice/integration/**/*Test.ts\"", + "test:appservice:integration:single": "NODE_ENV=harness corepack yarn mocha --require test/tsnode.cjs --timeout 300000 --project ./tsconfig.json", + "test:manual": "NODE_ENV=harness ts-node test/integration/manualLaunchScript.ts", + "version": "sed -i '/# version automated/s/[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][^\"]*/'$npm_package_version'/' synapse_antispam/setup.py && git add synapse_antispam/setup.py && cat synapse_antispam/setup.py" + }, + "devDependencies": { + "@eslint/js": "^9.7.0", + "@types/better-sqlite3": "^7.6.9", + "@types/config": "^3.3.1", + "@types/crypto-js": "^4.2.2", + "@types/eslint__js": "^8.42.3", + "@types/express": "^4.17.21", + "@types/html-to-text": "^8.0.1", + "@types/js-yaml": "^4.0.9", + "@types/jsdom": "21.1.7", + "@types/mocha": "^10.0.7", + "@types/nedb": "^1.8.16", + "@types/node": "^20.14.11", + "@types/pg": "^8.6.5", + "@types/request": "^2.48.12", + "crypto-js": "^4.2.0", + "eslint": "^9.7.0", + "expect": "^29.7.0", + "mocha": "^10.7.0", + "prettier": "^3.3.3", + "ts-auto-mock": "^3.7.4", + "ts-node": "^10.9.2", + "typescript": "^5.5.3", + "typescript-eslint": "^7.16.1" + }, + "dependencies": { + "@gnuxie/typescript-result": "^1.0.0", + "@sentry/node": "^7.17.2", + "@sinclair/typebox": "0.34.13", + "@the-draupnir-project/interface-manager": "4.0.2", + "@the-draupnir-project/matrix-basic-types": "1.2.0", + "better-sqlite3": "^9.4.3", + "body-parser": "^1.20.2", + "config": "^3.3.9", + "express": "^4.19", + "html-to-text": "^8.0.0", + "js-yaml": "^4.1.0", + "jsdom": "^24.0.0", + "matrix-appservice-bridge": "^10.3.1", + "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6", + "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@2.10.0", + "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@2.10.1", + "pg": "^8.8.0", + "yaml": "^2.3.2" + }, + "overrides": { + "matrix-bot-sdk": "$@vector-im/matrix-bot-sdk", + "@vector-im/matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6", + "@the-draupnir-project/matrix-basic-types": "@the-draupnir-project/matrix-basic-types@1.2.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610" +} diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix new file mode 100644 index 000000000000..887d79277fbc --- /dev/null +++ b/pkgs/by-name/dr/draupnir/package.nix @@ -0,0 +1,121 @@ +{ + lib, + fetchFromGitHub, + makeWrapper, + nodejs, + matrix-sdk-crypto-nodejs, + python3, + sqlite, + srcOnly, + removeReferencesTo, + mkYarnPackage, + fetchYarnDeps, + stdenv, + cctools, +}: + +# docs: https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/javascript.section.md#yarn2nix-javascript-yarn2nix +let + hashesFile = builtins.fromJSON (builtins.readFile ./hashes.json); + nodeSources = srcOnly nodejs; +in +mkYarnPackage rec { + pname = "draupnir"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "the-draupnir-project"; + repo = "Draupnir"; + tag = "v${version}"; + hash = "sha256-EeYjtrfnX+z6SeXavUhUU53mURph48gIUZlF3tubl20="; + }; + + nativeBuildInputs = [ + makeWrapper + sqlite + ]; + + offlineCache = fetchYarnDeps { + name = "${pname}-yarn-offline-cache"; + yarnLock = src + "/yarn.lock"; + hash = hashesFile.yarn_offline_cache_hash; + }; + + packageJSON = ./package.json; + + pkgConfig = { + "@matrix-org/matrix-sdk-crypto-nodejs" = { + postInstall = '' + # replace with the existing package in nixpkgs + cd .. + rm -r matrix-sdk-crypto-nodejs + ln -s ${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/* ./ + ''; + }; + + better-sqlite3 = { + nativeBuildInputs = [ python3 ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools.libtool; + postInstall = '' + # build native sqlite bindings + npm run build-release --offline --nodedir="${nodeSources}" + find build -type f -exec \ + ${lib.getExe removeReferencesTo} -t "${nodeSources}" {} \; + ''; + }; + }; + + preBuild = '' + # install proper version info + mkdir --parents deps/draupnir/ + echo "${version}-nix" > deps/draupnir/version.txt + + # makes network requests + sed -i 's/corepack //g' deps/draupnir/package.json + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline --verbose build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir --parents $out/share + cp --archive . $out/share/draupnir + + makeWrapper ${lib.getExe nodejs} $out/bin/draupnir \ + --add-flags $out/share/draupnir/deps/draupnir/lib/index.js + + runHook postInstall + ''; + + distPhase = "true"; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "A moderation tool for Matrix"; + homepage = "https://github.com/the-draupnir-project/Draupnir"; + longDescription = '' + As an all-in-one moderation tool, it can protect your server from + malicious invites, spam messages, and whatever else you don't want. + In addition to server-level protection, Draupnir is great for communities + wanting to protect their rooms without having to use their personal + accounts for moderation. + + The bot by default includes support for bans, redactions, anti-spam, + server ACLs, room directory changes, room alias transfers, account + deactivation, room shutdown, and more. + + A Synapse module is also available to apply the same rulesets the bot + uses across an entire homeserver. + ''; + license = licenses.afl3; + maintainers = with maintainers; [ RorySys ]; + mainProgram = "draupnir"; + }; +} diff --git a/pkgs/by-name/dr/draupnir/update.sh b/pkgs/by-name/dr/draupnir/update.sh new file mode 100755 index 000000000000..78842bfcbfc4 --- /dev/null +++ b/pkgs/by-name/dr/draupnir/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts coreutils jq prefetch-yarn-deps git + +set -euo pipefail +set -x + +cd "$(git rev-parse --show-toplevel)" + +TMPDIR=$(mktemp -d) + +echo "Getting versions..." +latestVersion="$(curl -sL "https://api.github.com/repos/the-draupnir-project/Draupnir/releases?per_page=1" | jq -r '.[0].tag_name | ltrimstr("v")')" +echo " --> Latest version: ${latestVersion}" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; draupnir.version or (lib.getVersion draupnir)" | tr -d '"') +echo " --> Current version: ${currentVersion}" +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "Draupnir is up-to-date: $currentVersion" + exit 0 +else + echo "We are out of date..." +fi + +curl https://raw.githubusercontent.com/the-draupnir-project/Draupnir/v$latestVersion/package.json -o pkgs/by-name/dr/draupnir/package.json + +update-source-version draupnir "$latestVersion" + +# Update yarn offline cache hash +cd $TMPDIR + +curl https://raw.githubusercontent.com/the-draupnir-project/Draupnir/v$latestVersion/yarn.lock -o yarn.lock +TMP_PREFETCH_HASH=`prefetch-yarn-deps yarn.lock` +NEW_YARN_OFFLINE_HASH=`nix hash to-sri --type sha256 $TMP_PREFETCH_HASH` + +cd - +echo "New yarn offline hash: $NEW_YARN_OFFLINE_HASH" + +TMPFILE=$(mktemp) +jq '.yarn_offline_cache_hash = "'$NEW_YARN_OFFLINE_HASH'"' pkgs/by-name/dr/draupnir/hashes.json > $TMPFILE +mv -- "$TMPFILE" pkgs/by-name/dr/draupnir/hashes.json diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix new file mode 100644 index 000000000000..cce9fef8ec3f --- /dev/null +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -0,0 +1,102 @@ +{ + stdenv, + lib, + fetchFrom9Front, + unstableGitUpdater, + installShellFiles, + makeWrapper, + apple-sdk_13, + xorg, + pkg-config, + wayland-scanner, + pipewire, + wayland, + wayland-protocols, + libxkbcommon, + wlr-protocols, + pulseaudio, + nixosTests, + withWayland ? false, +}: +let + withXorg = !(withWayland || stdenv.hostPlatform.isDarwin); +in +stdenv.mkDerivation { + pname = "drawterm"; + version = "0-unstable-2025-03-18"; + + src = fetchFrom9Front { + owner = "plan9front"; + repo = "drawterm"; + rev = "0b43ac046ca81d78e9eca535ab1e92971d30405a"; + hash = "sha256-L0a81zwzIKwnRK/Mu/kW1oHoJCroa+VDNGj7CI90WMQ="; + }; + + enableParallelBuilding = true; + strictDeps = true; + nativeBuildInputs = + [ + installShellFiles + makeWrapper + ] + ++ lib.optionals withWayland [ + pkg-config + wayland-scanner + ]; + + buildInputs = + lib.optionals withWayland [ + pipewire + wayland + wayland-protocols + libxkbcommon + wlr-protocols + ] + ++ lib.optionals withXorg [ + xorg.libX11 + xorg.libXt + ] + ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_13; + + makeFlags = + lib.optional withWayland "CONF=linux" + ++ lib.optional (!(withWayland || stdenv.hostPlatform.isDarwin)) "CONF=unix" + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "CONF=osx-cocoa" + "CC=clang" + ]; + + installPhase = + '' + installManPage drawterm.1 + '' + + lib.optionalString withWayland '' + install -Dm755 -t $out/bin/ drawterm + '' + + lib.optionalString (!(withWayland || stdenv.hostPlatform.isDarwin)) '' + # wrapping the oss output with pulse seems to be the easiest + mv drawterm drawterm.bin + install -Dm755 -t $out/bin/ drawterm.bin + makeWrapper ${pulseaudio}/bin/padsp $out/bin/drawterm --add-flags $out/bin/drawterm.bin + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv gui-cocoa/drawterm.app $out/Applications/ + mv drawterm $out/Applications/drawterm.app/ + ln -s $out/Applications/drawterm.app/drawterm $out/bin/ + ''; + + passthru = { + updateScript = unstableGitUpdater { shallowClone = false; }; + tests = nixosTests.drawterm; + }; + + meta = { + description = "Connect to Plan 9 CPU servers from other operating systems"; + homepage = "https://drawterm.9front.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ moody ]; + platforms = with lib.platforms; linux ++ darwin; + mainProgram = "drawterm"; + }; +} diff --git a/pkgs/by-name/dr/drill/package.nix b/pkgs/by-name/dr/drill/package.nix new file mode 100644 index 000000000000..348780dab757 --- /dev/null +++ b/pkgs/by-name/dr/drill/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "drill"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "fcsonline"; + repo = pname; + rev = version; + sha256 = "sha256-4y5gpkQB0U6Yq92O6DDD5eq/i/36l/VfeyiE//pcZOk="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-wrfQtJHhSG53tV3R4u/Ri4iv1VoAmuT3xleAQEJOIzE="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + ]; + + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; + OPENSSL_DIR = "${lib.getDev openssl}"; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; + + meta = with lib; { + description = "HTTP load testing application inspired by Ansible syntax"; + homepage = "https://github.com/fcsonline/drill"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "drill"; + }; +} diff --git a/pkgs/by-name/dr/drip/package.nix b/pkgs/by-name/dr/drip/package.nix index 9e7de6a3bb0f..e0759d4ca862 100644 --- a/pkgs/by-name/dr/drip/package.nix +++ b/pkgs/by-name/dr/drip/package.nix @@ -2,26 +2,31 @@ lib, stdenv, fetchFromGitHub, - jdk8, - which, makeWrapper, + jdk8, + coreutils, + which, + gnumake, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "drip"; version = "0.2.4"; src = fetchFromGitHub { repo = "drip"; owner = "ninjudd"; - rev = version; - sha256 = "1zl62wdwfak6z725asq5lcqb506la1aavj7ag78lvp155wyh8aq1"; + tag = finalAttrs.version; + hash = "sha256-ASsEPS8l3E3ReerIrVRQ1ICyMKMFa1XE+WYqxxsXhv4="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk8 ]; + patches = [ ./wait.patch ]; + postPatch = '' patchShebangs . ''; @@ -31,16 +36,29 @@ stdenv.mkDerivation rec { mkdir $out cp ./* $out -r wrapProgram $out/bin/drip \ - --prefix PATH : "${which}/bin" - $out/bin/drip version + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + which + gnumake + jdk8 + ] + } runHook postInstall ''; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + meta = { description = "Launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster"; - license = licenses.epl10; + license = lib.licenses.epl10; homepage = "https://github.com/ninjudd/drip"; - platforms = platforms.linux; - maintainers = [ maintainers.rybern ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + rybern + awwpotato + ]; }; -} +}) diff --git a/pkgs/by-name/dr/drip/wait.patch b/pkgs/by-name/dr/drip/wait.patch new file mode 100644 index 000000000000..d4befa9e988d --- /dev/null +++ b/pkgs/by-name/dr/drip/wait.patch @@ -0,0 +1,11 @@ +diff --git a/src/drip_daemon.c b/src/drip_daemon.c +index cbfd4d9..79fdaf4 100644 +--- a/src/drip_daemon.c ++++ b/src/drip_daemon.c +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + static char* jvm_dir; diff --git a/pkgs/by-name/dr/drone-runner-ssh/package.nix b/pkgs/by-name/dr/drone-runner-ssh/package.nix index 0e5b7519ee09..1185a5505e6e 100644 --- a/pkgs/by-name/dr/drone-runner-ssh/package.nix +++ b/pkgs/by-name/dr/drone-runner-ssh/package.nix @@ -21,7 +21,7 @@ buildGoModule rec { description = "Experimental Drone runner that executes a pipeline on a remote machine"; homepage = "https://github.com/drone-runners/drone-runner-ssh"; license = licenses.unfreeRedistributable; - maintainers = teams.c3d2.members; + teams = [ teams.c3d2 ]; mainProgram = "drone-runner-ssh"; }; } diff --git a/pkgs/by-name/dr/drone-scp/package.nix b/pkgs/by-name/dr/drone-scp/package.nix index 07d38d2e6623..7e8b3b83205c 100644 --- a/pkgs/by-name/dr/drone-scp/package.nix +++ b/pkgs/by-name/dr/drone-scp/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "drone-scp"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "appleboy"; repo = "drone-scp"; rev = "v${version}"; - hash = "sha256-cVgKWdhmCdjEHGazZ1FMAOJMVyU5pl8aIgwFMhxlhzg="; + hash = "sha256-qIIPvh+y1xPTXRGqUyCG2BnHQsgFlkbfi46vfM/Zgjg="; }; - vendorHash = "sha256-2FEHklEa6TIB3jhmxR2yosPbtqMJcxeIDDnT2X2Xm+U="; + vendorHash = "sha256-OCxqdb0VQP1jIRkiiAiyhRy15MiW2i9JbEATMedM0Bg="; # Needs a specific user... doCheck = false; diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix index 7b031d051e80..06c2117bf19f 100644 --- a/pkgs/by-name/dr/dropbear/package.nix +++ b/pkgs/by-name/dr/dropbear/package.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation rec { pname = "dropbear"; - version = "2025.87"; + version = "2025.88"; src = fetchurl { url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2"; - sha256 = "sha256-c4t/NYVH8MZMPhpWu8XvmNNNnsat+czfAdwL8sqivI0="; + sha256 = "sha256-eD9Q6iexfBbaiVePr9tt7PpEu49lkOVpik5NNnLcU9Q="; }; CFLAGS = lib.pipe (lib.attrNames dflags) [ diff --git a/pkgs/by-name/dr/dropwatch/package.nix b/pkgs/by-name/dr/dropwatch/package.nix index 0fbf7865dd63..78266fd3d9a3 100644 --- a/pkgs/by-name/dr/dropwatch/package.nix +++ b/pkgs/by-name/dr/dropwatch/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "dropwatch"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "nhorman"; repo = "dropwatch"; rev = "v${version}"; - sha256 = "sha256-TbhgcX5WzuigP5/Mj5JuK7O/UKcu70D7dcOcvo4fxeQ="; + sha256 = "sha256-+7bT1Gw4ncwLFkrxxbXjNs3KMM1sSQrCqXMYxKso9/4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dr/druid/package.nix b/pkgs/by-name/dr/druid/package.nix index c2709adddccd..1a0455f63838 100644 --- a/pkgs/by-name/dr/druid/package.nix +++ b/pkgs/by-name/dr/druid/package.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "apache-druid"; - version = "32.0.1"; + version = "33.0.0"; src = fetchurl { url = "mirror://apache/druid/${finalAttrs.version}/apache-druid-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-Tfu2BEAbwlVnjpF3FtS7w0kXfH0LVtyVLSVTNLo4Ny4="; + hash = "sha256-XuXdvMInODSvihjdFzsqBLmpEct85RYnnbYFeIq9fXk="; }; dontBuild = true; diff --git a/pkgs/by-name/dr/drum-machine/package.nix b/pkgs/by-name/dr/drum-machine/package.nix index bcb91fef0629..b9ab61038c73 100644 --- a/pkgs/by-name/dr/drum-machine/package.nix +++ b/pkgs/by-name/dr/drum-machine/package.nix @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://apps.gnome.org/DrumMachine"; changelog = "https://github.com/Revisto/drum-machine/releases/tag/${src.tag}"; license = lib.licenses.gpl3Plus; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix index 96f619706a79..dde6e731f5c5 100644 --- a/pkgs/by-name/ds/dsda-doom/package.nix +++ b/pkgs/by-name/ds/dsda-doom/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dsda-doom"; - version = "0.28.3"; + version = "0.29.0"; src = fetchFromGitHub { owner = "kraflab"; repo = "dsda-doom"; rev = "v${version}"; - hash = "sha256-66o/k5DvyKxwa0sZPCfSycVRxEhrRhUJXJVz2p817OE="; + hash = "sha256-mcg3GAQ90Qg7d1+/ci/XlTTF2q0tB6j+pp+Fb1Mpcao="; }; sourceRoot = "${src.name}/prboom2"; diff --git a/pkgs/by-name/ds/dsp/package.nix b/pkgs/by-name/ds/dsp/package.nix index a6a69b34d8ae..f1b8169defd6 100644 --- a/pkgs/by-name/ds/dsp/package.nix +++ b/pkgs/by-name/ds/dsp/package.nix @@ -14,31 +14,21 @@ ladspaH, libtool, libpulseaudio, - fetchpatch, }: stdenv.mkDerivation (finalAttrs: { pname = "dsp"; - version = "1.9"; + version = "2.0"; src = fetchFromGitHub { owner = "bmc0"; repo = "dsp"; - rev = "v${finalAttrs.version}"; - hash = "sha256-S1pzVQ/ceNsx0vGmzdDWw2TjPVLiRgzR4edFblWsekY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-WUH4+5v1wv6EXTOuRq9iVVZsXMt5DVrtgX8vLE7a8s8="; }; nativeBuildInputs = [ pkg-config ]; - patches = [ - # fix compatibility with ffmpeg7 - # https://github.com/bmc0/dsp/commit/58a9d0c1f99f2d4c7fc51b6dbe563447ec60120f - (fetchpatch { - url = "https://github.com/bmc0/dsp/commit/58a9d0c1f99f2d4c7fc51b6dbe563447ec60120f.patch?full_index=1"; - hash = "sha256-7WgJegDL9sVCRnRwm/f1ZZl2eiuRT5oAQaYoDLjEoqs="; - }) - ]; - buildInputs = [ fftw zita-convolver diff --git a/pkgs/by-name/ds/dspam/package.nix b/pkgs/by-name/ds/dspam/package.nix index 84563996a026..2c7dd35ef952 100644 --- a/pkgs/by-name/ds/dspam/package.nix +++ b/pkgs/by-name/ds/dspam/package.nix @@ -59,7 +59,10 @@ stdenv.mkDerivation rec { ++ lib.optional withPgSQL libpq ++ lib.optional withSQLite sqlite ++ lib.optional withDB db; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + libpq.pg_config + makeWrapper + ]; # patch out libmysql >= 5 check, since mariadb-connector is at 3.x postPatch = '' sed -i 's/atoi(m) >= 5/1/g' configure m4/mysql_drv.m4 @@ -87,8 +90,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withMySQL [ "--with-mysql-includes=${mariadb-connector-c.dev}/include/mysql" "--with-mysql-libraries=${mariadb-connector-c.out}/lib/mysql" - ] - ++ lib.optional withPgSQL "--with-pgsql-libraries=${libpq}/lib"; + ]; # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: diff --git a/pkgs/by-name/ds/dssp/package.nix b/pkgs/by-name/ds/dssp/package.nix index f746d83294a2..78ef72ce864a 100644 --- a/pkgs/by-name/ds/dssp/package.nix +++ b/pkgs/by-name/ds/dssp/package.nix @@ -11,18 +11,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "dssp"; - version = "4.4.11"; + version = "4.5.0"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; tag = "v${finalAttrs.version}"; - hash = "sha256-7L9pdKWDa/g/r+cuou2b0pqS559qwuwHBBhDDhvM7VE="; + hash = "sha256-UE97bdSx41K962TqXLlKsp8oDnBBX7uXqsfIzhWjsTI="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ eigen @@ -31,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; - meta = with lib; { + meta = { description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein"; mainProgram = "mkdssp"; homepage = "https://github.com/PDB-REDO/dssp"; changelog = "https://github.com/PDB-REDO/dssp/releases/tag/v${finalAttrs.version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ natsukium ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/dt/dt/package.nix b/pkgs/by-name/dt/dt/package.nix index 550d137b206c..aaa9070bf69b 100644 --- a/pkgs/by-name/dt/dt/package.nix +++ b/pkgs/by-name/dt/dt/package.nix @@ -3,21 +3,21 @@ stdenv, fetchFromGitHub, testers, - zig_0_11, + zig_0_12, }: stdenv.mkDerivation (finalAttrs: { pname = "dt"; - version = "1.3.1"; + version = "1.3.1-unstable-2024-07-16"; src = fetchFromGitHub { owner = "so-dang-cool"; repo = "dt"; - rev = "v${finalAttrs.version}"; - hash = "sha256-qHfvHf4T0wWnzqp5FfLg7n7te24xc2aMEdTK3Iia8Q0="; + rev = "0d16ca2867131e99a93a412231465cf68f2e594f"; + hash = "sha256-pfTlOMJpOPbXZaJJvOKDUyCZxFHNLRRUteJFWT9IKOU="; }; - nativeBuildInputs = [ zig_0_11.hook ]; + nativeBuildInputs = [ zig_0_12.hook ]; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; @@ -37,7 +37,8 @@ stdenv.mkDerivation (finalAttrs: { In short, dt is intended to be generally useful, with zero pretense of elegance. ''; - changelog = "https://github.com/so-dang-cool/dt/releases/tag/v${finalAttrs.version}"; + # TODO: uncomment when dt pushes a new release + # changelog = "https://github.com/so-dang-cool/dt/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ booniepepper ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/dt/dtbloader/package.nix b/pkgs/by-name/dt/dtbloader/package.nix index 3ce3551137ac..8060a3da10de 100644 --- a/pkgs/by-name/dt/dtbloader/package.nix +++ b/pkgs/by-name/dt/dtbloader/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtbloader"; - version = "1.2.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "TravMurav"; repo = "dtbloader"; tag = finalAttrs.version; - hash = "sha256-5Efxi0cojhq9mqB5VMShXx/Sp4CE6Cvr1pcwnUm5zlo="; + hash = "sha256-qU7KB5oRd24rFN26kUhLYrG9VRakNuX8R0hWF0mVgvc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/dt/dtc/package.nix b/pkgs/by-name/dt/dtc/package.nix index 9cd30c0dbba6..978c7f58544c 100644 --- a/pkgs/by-name/dt/dtc/package.nix +++ b/pkgs/by-name/dt/dtc/package.nix @@ -25,16 +25,19 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (fetchpatch2 { - # https://github.com/dgibson/dtc/pull/141 - url = "https://github.com/dgibson/dtc/commit/56a7d0cb3be5f2f7604bc42299e24d13a39c72d8.patch"; - hash = "sha256-GmAyk/K2OolH/Z8SsgwCcq3/GOlFuSpnVPr7jsy8Cs0="; - }) + # backport of https://github.com/dgibson/dtc/pull/141 + # to 1.7.2, to drop in 1.8. + ./static.patch # backport fix for SWIG 4.3 (fetchpatch2 { url = "https://github.com/dgibson/dtc/commit/9a969f3b70b07bbf1c9df44a38d7f8d1d3a6e2a5.patch"; hash = "sha256-YrRzc3ATNmU6LYNHEQeU8wtjt1Ap7/gNFvtRR14PQEE="; }) + # glibc-2.41 support + (fetchpatch2 { + url = "https://github.com/dgibson/dtc/commit/ce1d8588880aecd7af264e422a16a8b33617cef7.patch"; + hash = "sha256-t1CxKnbCXUArtVcniAIdNvahOGXPbYhPCZiTynGLvfo="; + }) ]; env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; @@ -65,7 +68,6 @@ stdenv.mkDerivation (finalAttrs: { mesonAutoFeatures = "auto"; mesonFlags = [ - (lib.mesonBool "static-build" stdenv.hostPlatform.isStatic) (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) ]; diff --git a/pkgs/by-name/dt/dtc/static.patch b/pkgs/by-name/dt/dtc/static.patch new file mode 100644 index 000000000000..5b368e07243a --- /dev/null +++ b/pkgs/by-name/dt/dtc/static.patch @@ -0,0 +1,150 @@ +commit a881a5b110d2f23a11924604bff64ab3c2755bc6 +Author: Brandon Maier +Date: Thu Mar 6 20:30:47 2025 -0600 + + meson: support building libfdt without static library + + Some packaging systems like NixOS don't support compiling static + libraries. However libfdt's meson.build uses `both_library()` which + forces the build to always compile shared and static libraries. Removing + `both_library()` will make packaging easier. + + libfdt uses `both_libraries()` to support the 'static-build' option. + But we do not need the 'static-build' option as Meson can natively + build static using + + > meson setup builddir/ -Dc_link_args='-static' --prefer-static --default-library=static + + So drop 'static-build' and then replace `both_libraries()` with + `library()`. + + Signed-off-by: Brandon Maier + Signed-off-by: David Gibson + +diff --git a/libfdt/meson.build b/libfdt/meson.build +index bf8343f..c2f4bd6 100644 +--- a/libfdt/meson.build ++++ b/libfdt/meson.build +@@ -26,7 +26,7 @@ else + endif + + link_args += version_script +-libfdt = both_libraries( ++libfdt = library( + 'fdt', sources, + version: meson.project_version(), + link_args: link_args, +@@ -34,17 +34,11 @@ libfdt = both_libraries( + install: true, + ) + +-if static_build +- link_with = libfdt.get_static_lib() +-else +- link_with = libfdt.get_shared_lib() +-endif +- + libfdt_inc = include_directories('.') + + libfdt_dep = declare_dependency( + include_directories: libfdt_inc, +- link_with: link_with, ++ link_with: libfdt, + ) + + install_headers( +diff --git a/meson.build b/meson.build +index 310699f..603ffaa 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,7 +1,7 @@ + project('dtc', 'c', + version: files('VERSION.txt'), + license: ['GPL2+', 'BSD-2'], +- default_options: 'werror=true', ++ default_options: ['werror=true', 'default_library=both'], + meson_version: '>=0.57.0' + ) + +@@ -27,16 +27,8 @@ add_project_arguments( + language: 'c' + ) + +-if get_option('static-build') +- static_build = true +- extra_link_args = ['-static'] +-else +- static_build = false +- extra_link_args = [] +-endif +- + yamltree = 'yamltree.c' +-yaml = dependency('yaml-0.1', version: '>=0.2.3', required: get_option('yaml'), static: static_build) ++yaml = dependency('yaml-0.1', version: '>=0.2.3', required: get_option('yaml')) + if not yaml.found() + add_project_arguments('-DNO_YAML', language: 'c') + yamltree = [] +@@ -92,7 +84,6 @@ if get_option('tools') + ], + dependencies: util_dep, + install: true, +- link_args: extra_link_args, + ) + endif + +@@ -113,11 +104,10 @@ if get_option('tools') + ], + dependencies: [util_dep, yaml], + install: true, +- link_args: extra_link_args, + ) + + foreach e: ['fdtdump', 'fdtget', 'fdtput', 'fdtoverlay'] +- dtc_tools += executable(e, files(e + '.c'), dependencies: util_dep, install: true, link_args: extra_link_args) ++ dtc_tools += executable(e, files(e + '.c'), dependencies: util_dep, install: true) + endforeach + + install_data( +diff --git a/meson_options.txt b/meson_options.txt +index 36f391a..62b31b3 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -8,7 +8,5 @@ option('valgrind', type: 'feature', value: 'auto', + description: 'Valgrind support') + option('python', type: 'feature', value: 'auto', + description: 'Build pylibfdt Python library') +-option('static-build', type: 'boolean', value: false, +- description: 'Build static binaries') + option('tests', type: 'boolean', value: true, + description: 'Build tests') +diff --git a/tests/meson.build b/tests/meson.build +index 9cf6e3d..baed174 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -96,22 +96,20 @@ tests += [ + 'truncated_string', + ] + ++test_deps = [testutil_dep, util_dep, libfdt_dep] ++ + dl = cc.find_library('dl', required: false) +-if dl.found() and not static_build ++if dl.found() + tests += [ + 'asm_tree_dump', + 'value-labels', + ] +-endif +- +-test_deps = [testutil_dep, util_dep, libfdt_dep] +-if not static_build + test_deps += [dl] + endif + + tests_exe = [] + foreach t: tests +- tests_exe += executable(t, files(t + '.c'), dependencies: test_deps, link_args: extra_link_args) ++ tests_exe += executable(t, files(t + '.c'), dependencies: test_deps) + endforeach + + run_tests = find_program('run_tests.sh') diff --git a/pkgs/by-name/dt/dtool/package.nix b/pkgs/by-name/dt/dtool/package.nix index 3d154e94567f..3420b9e8db97 100644 --- a/pkgs/by-name/dt/dtool/package.nix +++ b/pkgs/by-name/dt/dtool/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,10 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-C0H5cIMMfUPJ2iJCUs1jEu3Ln8CdDgbgstMnH/f9FRY="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; # FIXME: remove patch when upstream version of rustc-serialize is updated cargoPatches = [ ./rustc-serialize-fix.patch ]; diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index 510d9387369e..8abc63a51835 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/du/dualsensectl/package.nix b/pkgs/by-name/du/dualsensectl/package.nix index 347edafa9aee..66ec9e66deff 100644 --- a/pkgs/by-name/du/dualsensectl/package.nix +++ b/pkgs/by-name/du/dualsensectl/package.nix @@ -2,6 +2,9 @@ lib, stdenv, fetchFromGitHub, + installShellFiles, + meson, + ninja, pkg-config, dbus, hidapi, @@ -12,20 +15,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "dualsensectl"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "nowrep"; repo = "dualsensectl"; rev = "v${finalAttrs.version}"; - hash = "sha256-Wu3TcnHoMZELC7I2PlE8z00+CycgpNd6SiZd5MjYD+I="; + hash = "sha256-/EPFZWpa7U4fmcdX2ycFkPgaqlKEA2cD84LBkcvVVhc="; }; - postPatch = '' - substituteInPlace Makefile --replace "/usr/" "/" - ''; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + installShellFiles + meson + ninja + pkg-config + ]; buildInputs = [ dbus @@ -33,7 +37,11 @@ stdenv.mkDerivation (finalAttrs: { udev ]; - makeFlags = [ "DESTDIR=$(out)" ]; + postInstall = '' + installShellCompletion --cmd dualsensectl \ + --bash ../completion/dualsensectl \ + --zsh ../completion/_dualsensectl + ''; passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json index 071631c3216b..e86a40a50599 100644 --- a/pkgs/by-name/du/duckdb/versions.json +++ b/pkgs/by-name/du/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "1.2.1", - "rev": "8e52ec43959ab363643d63cb78ee214577111da4", - "hash": "sha256-ez5BBZ+Yw+UkdpI3VvRZrYZPfk3Nkk3JmrJBdg8N+e0=" + "version": "1.2.2", + "rev": "7c039464e452ddc3330e2691d3fa6d305521d09b", + "hash": "sha256-cHQcEA9Gpza/edEVyXUYiINC/Q2b3bf+zEQbl/Otfr4=" } diff --git a/pkgs/by-name/du/duckscript/package.nix b/pkgs/by-name/du/duckscript/package.nix new file mode 100644 index 000000000000..d3866bdfaac4 --- /dev/null +++ b/pkgs/by-name/du/duckscript/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchCrate, + rustPlatform, + openssl, + pkg-config, + libiconv, +}: + +rustPlatform.buildRustPackage rec { + pname = "duckscript_cli"; + version = "0.11.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-afxzZkmmYnprUBquH681VHMDs3Co9C71chNoKbu6lEY="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-ft6EUajAj+Zw3cEhdajwwHAaMaUf+/vtTuUYni8E+o0="; + + meta = with lib; { + description = "Simple, extendable and embeddable scripting language"; + homepage = "https://github.com/sagiegurari/duckscript"; + license = licenses.asl20; + maintainers = with maintainers; [ mkg20001 ]; + mainProgram = "duck"; + }; +} diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix index 66f9db82b8fc..7f5705a5bd7c 100644 --- a/pkgs/by-name/du/duckstation/package.nix +++ b/pkgs/by-name/du/duckstation/package.nix @@ -46,6 +46,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + extra-cmake-modules ninja pkg-config qttools @@ -57,7 +58,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { SDL2 cpuinfo curl - extra-cmake-modules libXrandr libbacktrace libwebp diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix index b62086b95b52..f7e22cd77abc 100644 --- a/pkgs/by-name/du/dufs/package.nix +++ b/pkgs/by-name/du/dufs/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # FIXME: checkPhase on darwin will leave some zombie spawn processes # see https://github.com/NixOS/nixpkgs/issues/205620 doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/du/duktape/duktape.pc.in b/pkgs/by-name/du/duktape/duktape.pc.in deleted file mode 100644 index d34edb320e2e..000000000000 --- a/pkgs/by-name/du/duktape/duktape.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@out@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: duktape -Description: An embeddable Javascript engine, with a focus on portability and compact footprint -Version: @version@ -Libs: -L${libdir} -lduktape -Cflags: -I${includedir} diff --git a/pkgs/by-name/du/duktape/package.nix b/pkgs/by-name/du/duktape/package.nix index 9cb67506022b..c7443c99ce15 100644 --- a/pkgs/by-name/du/duktape/package.nix +++ b/pkgs/by-name/du/duktape/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { make -f Makefile.cmdline '' + lib.optionalString (!stdenv.hostPlatform.isStatic) '' - make -f Makefile.sharedlibrary + make INSTALL_PREFIX="$out" -f Makefile.sharedlibrary ''; installPhase = @@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString (!stdenv.hostPlatform.isStatic) '' install -d $out/lib/pkgconfig install -d $out/include - make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out - substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc + + make INSTALL_PREFIX="$out" -f Makefile.sharedlibrary install ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index a1176888b5a0..7a9d0631c6d8 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,12 +18,14 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-uuY0nh4VHzyM7+cbgyycr5I3IjE0OeQ0eg12qVXe4BQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); + __darwinAllowLocalNetworking = true; + + # On Darwin, dumbpipe invokes CoreFoundation APIs that read ICU data from the + # system. Ensure these paths are accessible in the sandbox to avoid segfaults + # during checkPhase. + sandboxProfile = '' + (allow file-read* (subpath "/usr/share/icu")) + ''; meta = with lib; { description = "Connect A to B - Send Data"; diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix index f07a24780f5c..d212809cf1de 100644 --- a/pkgs/by-name/du/dummyhttp/package.nix +++ b/pkgs/by-name/du/dummyhttp/package.nix @@ -2,27 +2,21 @@ lib, fetchFromGitHub, rustPlatform, - darwin, - stdenv, }: rustPlatform.buildRustPackage rec { pname = "dummyhttp"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = "dummyhttp"; rev = "v${version}"; - hash = "sha256-LgOIL4kg3cH0Eo+Z+RGwxZTPzCNSGAdKT7N8tZWHSQQ="; + hash = "sha256-C3fjZgjVazZ8BNhcFJD5SsRO+xjHxw9XQPfPS+qnGtc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-IDvl3qCTUO0KWaAVsF1sTf9lFhVITY6EZgllfw4U/Ho="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + cargoHash = "sha256-bjNB0aoG9Mrz1JzD80j2Czfg0pfU2uGlFFsi5WO4pdU="; meta = with lib; { description = "Super simple HTTP server that replies a fixed body with a fixed response code"; diff --git a/pkgs/by-name/du/dump1090-fa/package.nix b/pkgs/by-name/du/dump1090-fa/package.nix new file mode 100644 index 000000000000..b668d1ce4639 --- /dev/null +++ b/pkgs/by-name/du/dump1090-fa/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + pkg-config, + hackrf, + libbladeRF, + libusb1, + limesuite, + ncurses, + rtl-sdr, + soapysdr-with-plugins, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dump1090"; + version = "10.1"; + + src = fetchFromGitHub { + owner = "flightaware"; + repo = "dump1090"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8J17fqNrn5Mqqv4lFHEp4zjc/zeyMUb+fWdk+ssPBwU="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + hackrf + libbladeRF + libusb1 + ncurses + rtl-sdr + soapysdr-with-plugins + ] ++ lib.optional stdenv.hostPlatform.isLinux limesuite; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration -Wno-int-conversion -Wno-unknown-warning-option"; + + buildFlags = [ + "DUMP1090_VERSION=${finalAttrs.version}" + "showconfig" + "dump1090" + "view1090" + ]; + + doCheck = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + cp -v dump1090 view1090 $out/bin + cp -vr public_html $out/share/dump1090 + + runHook postInstall + ''; + + meta = { + description = "Simple Mode S decoder for RTLSDR devices"; + homepage = "https://github.com/flightaware/dump1090"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + earldouglas + aciceri + ]; + mainProgram = "dump1090"; + }; +}) diff --git a/pkgs/by-name/du/dump1090/package.nix b/pkgs/by-name/du/dump1090/package.nix deleted file mode 100644 index d61dbe92411e..000000000000 --- a/pkgs/by-name/du/dump1090/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - pkg-config, - hackrf, - libbladeRF, - libusb1, - limesuite, - ncurses, - rtl-sdr, - soapysdr-with-plugins, -}: - -stdenv.mkDerivation rec { - pname = "dump1090"; - version = "9.0"; - - src = fetchFromGitHub { - owner = "flightaware"; - repo = "dump1090"; - rev = "v${version}"; - sha256 = "sha256-rc4mg+Px+0p2r38wxIah/rHqWjHSU0+KCPgqj/Gl3oo="; - }; - - patches = [ - # GCC 14 fix, remove when included in release - (fetchpatch { - url = "https://github.com/flightaware/dump1090/commit/eb08fd7fce8d133b0e7a0d45d0cb9423b09ddc55.patch"; - hash = "sha256-le9rDeU4+r2kROjCuqt0cSN4pPkwfiD4YTdM9qFeYyQ="; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - hackrf - libbladeRF - libusb1 - ncurses - rtl-sdr - soapysdr-with-plugins - ] ++ lib.optional stdenv.hostPlatform.isLinux limesuite; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration -Wno-int-conversion -Wno-unknown-warning-option"; - - buildFlags = [ - "DUMP1090_VERSION=${version}" - "showconfig" - "dump1090" - "view1090" - ]; - - doCheck = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share - cp -v dump1090 view1090 $out/bin - cp -vr public_html $out/share/dump1090 - - runHook postInstall - ''; - - meta = with lib; { - description = "Simple Mode S decoder for RTLSDR devices"; - homepage = "https://github.com/flightaware/dump1090"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ earldouglas ]; - }; -} diff --git a/pkgs/by-name/du/dump_syms/package.nix b/pkgs/by-name/du/dump_syms/package.nix new file mode 100644 index 000000000000..ba113aed246e --- /dev/null +++ b/pkgs/by-name/du/dump_syms/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + + # tests + firefox-esr-unwrapped, + firefox-unwrapped, + thunderbird-unwrapped, +}: + +let + pname = "dump_syms"; + version = "2.3.4"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6VDuZ5rw2N4z6wOVbaOKO6TNaq8QA5RstsIzmuE3QrI="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-GYkkB0Z40UedPLnZZ0tHdMQR2HhuQBg75J2J9vNsMuU="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + checkFlags = [ + # Disable tests that require network access + # ConnectError("dns error", Custom { kind: Uncategorized, error: "failed to lookup address information: Temporary failure in name resolution" })) }', src/windows/pdb.rs:725:56 + "--skip windows::pdb::tests::test_ntdll" + "--skip windows::pdb::tests::test_oleaut32" + ]; + + passthru.tests = { + inherit firefox-esr-unwrapped firefox-unwrapped thunderbird-unwrapped; + }; + + meta = with lib; { + changelog = "https://github.com/mozilla/dump_syms/blob/v${version}/CHANGELOG.md"; + description = "Command-line utility for parsing the debugging information the compiler provides in ELF or stand-alone PDB files"; + mainProgram = "dump_syms"; + license = licenses.asl20; + homepage = "https://github.com/mozilla/dump_syms/"; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/by-name/du/dumphfdl/package.nix b/pkgs/by-name/du/dumphfdl/package.nix new file mode 100644 index 000000000000..74d605a9e3eb --- /dev/null +++ b/pkgs/by-name/du/dumphfdl/package.nix @@ -0,0 +1,68 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + versionCheckHook, + cmake, + pkg-config, + libconfig, + liquid-dsp, + fftwSinglePrec, + glib, + soapysdr-with-plugins, + sqlite, + zeromq, + gperftools, + libacars, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dumphfdl"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "szpajder"; + repo = "dumphfdl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-M4WjcGA15Kp+Hpp+I2Ndcx+oBqaGxEeQLTPcSlugLwQ="; + }; + + buildInputs = [ + fftwSinglePrec + liquid-dsp + glib + libconfig + soapysdr-with-plugins + sqlite + zeromq + gperftools + libacars + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/szpajder/dumphfdl"; + changelog = "https://github.com/szpajder/dumphfdl/releases/tag/v${finalAttrs.version}"; + description = "Decoder for Multichannel HFDL aircraft communication"; + longDescription = '' + HFDL (High Frequency Data Link) is a protocol used for radio communications + between aircraft and ground stations. It is used to carry ACARS and AOC messages as well as + CPDLC (Controller-Pilot Data Link Communications) and ADS-C. + ''; + license = lib.licenses.gpl3Plus; + mainProgram = "dumphfdl"; + maintainers = [ lib.maintainers.mafo ]; + platforms = with lib.platforms; linux ++ darwin; + badPlatforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/du/dumpvdl2/package.nix b/pkgs/by-name/du/dumpvdl2/package.nix new file mode 100644 index 000000000000..06af53f19177 --- /dev/null +++ b/pkgs/by-name/du/dumpvdl2/package.nix @@ -0,0 +1,55 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + versionCheckHook, + cmake, + pkg-config, + glib, + soapysdr, + sdrplay, + sdrplaySupport ? false, + sqlite, + zeromq, + libacars, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dumpvdl2"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "szpajder"; + repo = "dumpvdl2"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kb8FLVuG9tSZta8nmaKRCRZinF1yy4+NNxD5s7X82Wk="; + }; + + buildInputs = [ + glib + soapysdr + sqlite + zeromq + libacars + ] ++ lib.optionals sdrplaySupport [ sdrplay ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/szpajder/dumpvdl2"; + description = "VDL Mode 2 message decoder and protocol analyzer"; + license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; linux ++ darwin; + maintainers = [ lib.maintainers.mafo ]; + mainProgram = "dumpvdl2"; + }; +}) diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index 6d7ec750e2c1..ad4823d534a3 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix index 89e2eb0b9235..1d47f31fe07d 100644 --- a/pkgs/by-name/du/duperemove/package.nix +++ b/pkgs/by-name/du/duperemove/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "duperemove"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "markfasheh"; repo = "duperemove"; rev = "v${version}"; - hash = "sha256-T17XkR6AUvOerg9FN4SxTfoMavVXnxujtrA4p4GEnFE="; + hash = "sha256-Y3HIqq61bLfZi4XR2RtSyuCPmcWrTxeWvqpTh+3hUjc="; }; postPatch = '' diff --git a/pkgs/by-name/du/duplicacy/package.nix b/pkgs/by-name/du/duplicacy/package.nix index d1a4ea570da7..1901128fa41f 100644 --- a/pkgs/by-name/du/duplicacy/package.nix +++ b/pkgs/by-name/du/duplicacy/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "duplicacy"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "gilbertchen"; repo = "duplicacy"; rev = "v${version}"; - hash = "sha256-JxBS40g97GPTzKXW+k0RrwLBuK4ItLvnVHzBZRSOEIM="; + hash = "sha256-PS1vN5XkyihiiahIdzJmzdr1yyJMkzCpVbXgbZL2jHE="; }; vendorHash = "sha256-4M/V4vP9XwHBkZ6UwsAxZ81YAzP4inuNC5yI+5ygQsA="; diff --git a/pkgs/by-name/du/duply/package.nix b/pkgs/by-name/du/duply/package.nix index c963bc589be8..d3157d64781e 100644 --- a/pkgs/by-name/du/duply/package.nix +++ b/pkgs/by-name/du/duply/package.nix @@ -14,21 +14,24 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "duply"; - version = "2.4"; + version = "2.5.5"; src = fetchurl { - url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.4.x/duply_${version}.tgz"; - hash = "sha256-DCrp3o/ukzkfnVaLbIK84bmYnXvqKsvlkGn3GJY3iNg="; + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.5.x/duply_${finalAttrs.version}.tgz"; + hash = "sha256-ABryuV5jJNoxcJLsSjODLOHuLKrSEhY3buzy1cQh+AU="; }; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ txt2man ]; postPatch = "patchShebangs ."; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" mkdir -p "$out/share/man/man1" install -vD duply "$out/bin" @@ -45,9 +48,11 @@ stdenv.mkDerivation rec { which ]} "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Shell front end for the duplicity backup tool"; mainProgram = "duply"; longDescription = '' @@ -57,8 +62,8 @@ stdenv.mkDerivation rec { secure backups on non-trusted spaces are no child's play? ''; homepage = "https://duply.net/"; - license = licenses.gpl2Only; - maintainers = [ maintainers.bjornfor ]; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.bjornfor ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/tools/misc/dura/Cargo.lock.patch b/pkgs/by-name/du/dura/Cargo.lock.patch similarity index 100% rename from pkgs/development/tools/misc/dura/Cargo.lock.patch rename to pkgs/by-name/du/dura/Cargo.lock.patch diff --git a/pkgs/by-name/du/dura/package.nix b/pkgs/by-name/du/dura/package.nix new file mode 100644 index 000000000000..eb2e035423eb --- /dev/null +++ b/pkgs/by-name/du/dura/package.nix @@ -0,0 +1,53 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + openssl, + pkg-config, + zlib, +}: + +rustPlatform.buildRustPackage rec { + pname = "dura"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "tkellogg"; + repo = "dura"; + rev = "v${version}"; + sha256 = "sha256-xAcFk7z26l4BYYBEw+MvbG6g33MpPUvnpGvgmcqhpGM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Xci9168KqJf+mhx3k0d+nH6Ov5tqNtB6nxiL9BwVYjU="; + + cargoPatches = [ + ./Cargo.lock.patch + ]; + + doCheck = false; + + buildInputs = [ + openssl + zlib + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + meta = with lib; { + description = "Background process that saves uncommitted changes on git"; + mainProgram = "dura"; + longDescription = '' + Dura is a background process that watches your Git repositories and + commits your uncommitted changes without impacting HEAD, the current + branch, or the Git index (staged files). If you ever get into an + "oh snap!" situation where you think you just lost days of work, + checkout a "dura" branch and recover. + ''; + homepage = "https://github.com/tkellogg/dura"; + license = licenses.asl20; + maintainers = with maintainers; [ drupol ]; + }; +} diff --git a/pkgs/by-name/dv/dvd-vr/package.nix b/pkgs/by-name/dv/dvd-vr/package.nix index 3a807f009d2d..cea6368174dc 100644 --- a/pkgs/by-name/dv/dvd-vr/package.nix +++ b/pkgs/by-name/dv/dvd-vr/package.nix @@ -11,7 +11,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${finalAttrs.version}.tar.gz"; sha256 = "13wkdia3c0ryda40b2nzpb9vddimasgc4w95hvl0k555k9k8bl0r"; }; - makeFlags = [ "PREFIX=$(out)" ]; + + makeFlags = [ + "PREFIX=$(out)" + # Fix build with GCC 14 + "CFLAGS=-Wno-error=incompatible-pointer-types" + ]; meta = with lib; { homepage = "https://www.pixelbeat.org/programs/dvd-vr/"; diff --git a/pkgs/by-name/dv/dvdisaster/gcc14-fix.patch b/pkgs/by-name/dv/dvdisaster/gcc14-fix.patch new file mode 100644 index 000000000000..95c6925eec37 --- /dev/null +++ b/pkgs/by-name/dv/dvdisaster/gcc14-fix.patch @@ -0,0 +1,10 @@ +diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure +--- a/scripts/bash-based-configure ++++ b/scripts/bash-based-configure +@@ -1364,6 +1364,7 @@ EOF + + cat >conftest.c < ++#include + int main(int argc, char *argv[]) + { g_malloc(1024); diff --git a/pkgs/by-name/dv/dvdisaster/package.nix b/pkgs/by-name/dv/dvdisaster/package.nix index c5e2921ce507..d654c0fb377c 100644 --- a/pkgs/by-name/dv/dvdisaster/package.nix +++ b/pkgs/by-name/dv/dvdisaster/package.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { patches = lib.optionals enableSoftening [ ./encryption.patch ./dvdrom.patch + ./gcc14-fix.patch ]; postPatch = '' diff --git a/pkgs/by-name/dv/dvdplusrwtools/package.nix b/pkgs/by-name/dv/dvdplusrwtools/package.nix index e16f95fe7412..49bb2b6e1948 100644 --- a/pkgs/by-name/dv/dvdplusrwtools/package.nix +++ b/pkgs/by-name/dv/dvdplusrwtools/package.nix @@ -5,12 +5,8 @@ fetchpatch, cdrtools, m4, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) IOKit; -in stdenv.mkDerivation rec { pname = "dvd+rw-tools"; version = "7.1"; @@ -76,7 +72,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ m4 ]; - buildInputs = [ cdrtools ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; + buildInputs = [ cdrtools ]; makeFlags = [ "prefix=${placeholder "out"}" diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index 0d5af34a54b6..00d94841c071 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "dwarfs"; - version = "0.11.0"; + version = "0.12.3"; src = fetchFromGitHub { owner = "mhx"; repo = "dwarfs"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-UOIHtyOGKG0WPwKS1z0agMTvI0RF5sapJ5GoJ7a8+Vs="; + hash = "sha256-DIlGeZXWyM9rMzo/DNQlzSbNBIRJhe2viXFM/zT2heY="; }; cmakeFlags = [ @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/dwarfs"; meta = { diff --git a/pkgs/by-name/dw/dwlb/package.nix b/pkgs/by-name/dw/dwlb/package.nix index 1c3354d54f02..c864de7dafdb 100644 --- a/pkgs/by-name/dw/dwlb/package.nix +++ b/pkgs/by-name/dw/dwlb/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "dwlb"; - version = "0-unstable-2024-05-16"; + version = "0-unstable-2025-05-05"; src = fetchFromGitHub { owner = "kolunmi"; repo = "dwlb"; - rev = "0daa1c1fdd82c4d790e477bf171e23ca2fdfa0cb"; - hash = "sha256-Bu20IqRwBP1WRBgbcEQU4Q2BZ2FBnVaySOTsCn0iSSE="; + rev = "efaef82d5ee390e478fba57b6300953f838803cd"; + hash = "sha256-rkvJZKf5mB8Xxvab+i1jKUeNtuaA8wTd/pkL9lMhGi8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dx/dxvk_2/package.nix b/pkgs/by-name/dx/dxvk_2/package.nix index 7490ff83e73b..240b73c34fe3 100644 --- a/pkgs/by-name/dx/dxvk_2/package.nix +++ b/pkgs/by-name/dx/dxvk_2/package.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dxvk"; - version = "2.6"; + version = "2.6.1"; src = fetchFromGitHub { owner = "doitsujin"; repo = "dxvk"; rev = "v${finalAttrs.version}"; - hash = "sha256-1/9XFqVGW5izlP3rggfB+PK3ewFiOQoGcB/Vjn9MYOQ="; + hash = "sha256-edu9JQAKu8yUZLh+37RB1s1A3+s8xeUYQ5Oibdes9ZI="; fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info }; diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix index 4425ee65be01..1c3f8ade2705 100644 --- a/pkgs/by-name/dy/dysk/package.nix +++ b/pkgs/by-name/dy/dysk/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "dysk"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; rev = "v${version}"; - hash = "sha256-VJFcdxwj+038d9oj178e0uGQQyKF9JbDytxDmit2tiA="; + hash = "sha256-B6iEssB9+BUXO4p1aSzrOGlBA8TiUOZY7a9U8F9SXaQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vVU10Mj+dRIAOREQiGIO0S+mDBeLtM5v0KjmmoCn3/g="; + cargoHash = "sha256-qfKNxLtvVaXGVP0wzOoZ5jaViO4hcMoZIOqxrpXiWzc="; nativeBuildInputs = [ installShellFiles @@ -38,5 +38,6 @@ rustPlatform.buildRustPackage rec { koral ]; mainProgram = "dysk"; + platforms = platforms.linux; }; } diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix index 06a15d5098e8..adf6a1742977 100644 --- a/pkgs/by-name/e1/e1s/package.nix +++ b/pkgs/by-name/e1/e1s/package.nix @@ -5,7 +5,7 @@ }: let pname = "e1s"; - version = "1.0.45"; + version = "1.0.47"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "keidarcy"; repo = "e1s"; tag = "v${version}"; - hash = "sha256-1dbdIShEyQ9/1kXx0w4SiEu6c53WUj5+RtmIcwuhSRA="; + hash = "sha256-5lb2j3cfQ2W+r+3UOdxXt15PQNWIMRM+pwChdzL+HUQ="; }; - vendorHash = "sha256-bBl4D7HNIiAym6BWSJ0x4LZnIEUMfECj6dDDVZIFrHA="; + vendorHash = "sha256-1lise/u40Q8W9STsuyrWIbhf2HY+SFCytUL1PTSWvfY="; meta = with lib; { description = "Easily Manage AWS ECS Resources in Terminal 🐱"; @@ -25,6 +25,9 @@ buildGoModule { changelog = "https://github.com/keidarcy/e1s/releases/tag/v${version}"; license = licenses.mit; mainProgram = "e1s"; - maintainers = with maintainers; [ zelkourban ]; + maintainers = with maintainers; [ + zelkourban + carlossless + ]; }; } diff --git a/pkgs/by-name/e2/e2tools/package.nix b/pkgs/by-name/e2/e2tools/package.nix index b8a6d72b9517..569fbbda60a7 100644 --- a/pkgs/by-name/e2/e2tools/package.nix +++ b/pkgs/by-name/e2/e2tools/package.nix @@ -7,21 +7,22 @@ e2fsprogs, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "e2tools"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "e2tools"; repo = "e2tools"; - rev = "6ee7c2d9015dce7b90c3388096602e307e3bd790"; - sha256 = "0nlqynrhj6ww7bnfhhfcx6bawii8iyvhgp6vz60zbnpgd68ifcx7"; + tag = "v${finalAttrs.version}"; + hash = "sha256-h5Asz3bG1zMOwJBLWZY0NBLRB3W8+6va6MkuOQvCuAc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ e2fsprogs ]; enableParallelBuilding = true; @@ -33,4 +34,4 @@ stdenv.mkDerivation { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.leenaars ]; }; -} +}) diff --git a/pkgs/by-name/ea/earbuds/package.nix b/pkgs/by-name/ea/earbuds/package.nix index 0145ff7c3293..ec766e56e22a 100644 --- a/pkgs/by-name/ea/earbuds/package.nix +++ b/pkgs/by-name/ea/earbuds/package.nix @@ -4,11 +4,10 @@ rustPlatform, fetchFromGitHub, installShellFiles, - nix-update-script, pkg-config, + bluez, dbus, libpulseaudio, - bluez, }: rustPlatform.buildRustPackage { pname = "earbuds"; @@ -30,25 +29,19 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-Y1pMmWxfXGcEFPj05/BpXQvd199O5l6hJmePNxMQc/Y="; nativeBuildInputs = [ - pkg-config installShellFiles + pkg-config ]; buildInputs = [ + bluez dbus libpulseaudio - bluez ]; # package does not contain any tests doCheck = false; - # nativeInstallCheckInputs = [ - # versionCheckHook - # ]; - # versionCheckProgramArg = [ "--version" ]; - # doInstallCheck = true; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd earbuds \ --bash <($out/bin/earbuds --generate bash) \ diff --git a/pkgs/by-name/ea/eartag/package.nix b/pkgs/by-name/ea/eartag/package.nix index d15c593c174b..411cad1653ed 100644 --- a/pkgs/by-name/ea/eartag/package.nix +++ b/pkgs/by-name/ea/eartag/package.nix @@ -86,6 +86,7 @@ python3Packages.buildPythonApplication rec { # being incorrectly identified as unfree software. license = licenses.mit; mainProgram = "eartag"; - maintainers = with maintainers; [ foo-dogsquared ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ foo-dogsquared ]; + teams = [ teams.gnome-circle ]; }; } diff --git a/pkgs/by-name/ea/eask-cli/package.nix b/pkgs/by-name/ea/eask-cli/package.nix index 1e826d8cf3f0..deeeda6ad49c 100644 --- a/pkgs/by-name/ea/eask-cli/package.nix +++ b/pkgs/by-name/ea/eask-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "eask-cli"; - version = "0.11.0"; + version = "0.11.4"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-xMay2HGw5vGvGIrbjCk0LNn5bvSiHbnpjfdGdO7BpQ4="; + hash = "sha256-uZFultiaRa1EQtIekc8d5vtcu+9QH5vZEB7wTjlg/vU="; }; - npmDepsHash = "sha256-8/2DCFlQ0bQt9uajWm17qqp2zc8scHdscL6n/laSZZ8="; + npmDepsHash = "sha256-Kw7HcqnJdLCqkGXrv2C+u/Ad21TockUsllNt4eUzEoA="; dontBuild = true; diff --git a/pkgs/applications/audio/easyabc/hardcoded-paths.patch b/pkgs/by-name/ea/easyabc/hardcoded-paths.patch similarity index 100% rename from pkgs/applications/audio/easyabc/hardcoded-paths.patch rename to pkgs/by-name/ea/easyabc/hardcoded-paths.patch diff --git a/pkgs/by-name/ea/easyabc/package.nix b/pkgs/by-name/ea/easyabc/package.nix new file mode 100644 index 000000000000..c04a26d20483 --- /dev/null +++ b/pkgs/by-name/ea/easyabc/package.nix @@ -0,0 +1,76 @@ +{ + lib, + fetchFromGitHub, + replaceVars, + python3, + fluidsynth, + soundfont-fluid, + wrapGAppsHook3, + abcmidi, + abcm2ps, + ghostscript, +}: + +python3.pkgs.buildPythonApplication { + pname = "easyabc"; + version = "1.3.8.7-unstable-2025-01-12"; + format = "other"; + + src = fetchFromGitHub { + owner = "jwdj"; + repo = "easyabc"; + rev = "2cfa74d138d485523cae9b889186add3a249f2e4"; + hash = "sha256-96Rh7hFWITIC62vs0bUtatDDgJ27UdZYhku8uqJBJew="; + }; + + patches = [ + (replaceVars ./hardcoded-paths.patch { + fluidsynth = "${fluidsynth}/lib/libfluidsynth.so"; + soundfont = "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2"; + ghostscript = "${ghostscript}/bin/gs"; + }) + ]; + + nativeBuildInputs = [ wrapGAppsHook3 ]; + + dependencies = with python3.pkgs; [ + cx-freeze + wxpython + pygame + pyparsing + ]; + + # apparently setup.py only supports Windows and Darwin + # everything is very non-standard in this project + dontBuild = true; + + # https://discourse.nixos.org/t/packaging-mcomix3-python-gtk-missing-gsettings-schemas-issue/10190/2 + strictDeps = false; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/easyabc + mv * $out/share/easyabc + + ln -s ${abcmidi}/bin/abc2midi $out/share/easyabc/bin/abc2midi + ln -s ${abcmidi}/bin/midi2abc $out/share/easyabc/bin/midi2abc + ln -s ${abcmidi}/bin/abc2abc $out/share/easyabc/bin/abc2abc + ln -s ${abcm2ps}/bin/abcm2ps $out/share/easyabc/bin/abcm2ps + + makeWrapper ${python3.interpreter} $out/bin/easyabc \ + --set PYTHONPATH "$PYTHONPATH:$out/share/easyabc" \ + --add-flags "-O $out/share/easyabc/easy_abc.py" + + runHook postInstall + ''; + + meta = { + description = "ABC music notation editor"; + mainProgram = "easyabc"; + homepage = "https://easyabc.sourceforge.net/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ mausch ]; + }; +} diff --git a/pkgs/by-name/ea/easyrpg-player/package.nix b/pkgs/by-name/ea/easyrpg-player/package.nix new file mode 100644 index 000000000000..888c91162592 --- /dev/null +++ b/pkgs/by-name/ea/easyrpg-player/package.nix @@ -0,0 +1,131 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + doxygen, + pkg-config, + freetype, + fmt, + glib, + harfbuzz, + liblcf, + libpng, + libsndfile, + libvorbis, + libxmp, + libXcursor, + libXext, + libXi, + libXinerama, + libXrandr, + libXScrnSaver, + libXxf86vm, + mpg123, + opusfile, + pcre, + pixman, + SDL2, + speexdsp, + wildmidi, + zlib, + libdecor, + alsa-lib, + asciidoctor, +}: + +stdenv.mkDerivation rec { + pname = "easyrpg-player"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "EasyRPG"; + repo = "Player"; + rev = version; + hash = "sha256-t0sa9ONVVfsiTy+us06vU2bMa4QmmQeYxU395g0WS6w="; + }; + + patches = [ + # Fixed compatibility with fmt > 9 + # Remove when version > 0.8 + (fetchpatch { + name = "0001-Fix-building-with-fmtlib-10.patch"; + url = "https://github.com/EasyRPG/Player/commit/ab6286f6d01bada649ea52d1f0881dde7db7e0cf.patch"; + hash = "sha256-GdSdVFEG1OJCdf2ZIzTP+hSrz+ddhTMBvOPjvYQHy54="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ + asciidoctor + cmake + doxygen + pkg-config + ]; + + buildInputs = + [ + fmt + freetype + glib + harfbuzz + liblcf + libpng + libsndfile + libvorbis + libxmp + mpg123 + opusfile + pcre + pixman + SDL2 + speexdsp + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libXcursor + libXext + libXi + libXinerama + libXrandr + libXScrnSaver + libXxf86vm + libdecor + wildmidi # until packaged on Darwin + ]; + + cmakeFlags = [ + "-DPLAYER_ENABLE_TESTS=${lib.boolToString doCheck}" + ]; + + makeFlags = [ + "all" + "man" + ]; + + buildFlags = lib.optionals doCheck [ + "test_runner_player" + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/bin + mv Package $out/Applications + ln -s $out/{Applications/EasyRPG\ Player.app/Contents/MacOS,bin}/EasyRPG\ Player + ''; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + enableParallelChecking = true; + + meta = with lib; { + description = "RPG Maker 2000/2003 and EasyRPG games interpreter"; + homepage = "https://easyrpg.org/"; + license = licenses.gpl3; + maintainers = [ ]; + platforms = platforms.all; + mainProgram = lib.optionalString stdenv.hostPlatform.isDarwin "EasyRPG Player"; + }; +} diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 305dbbd60330..39871a0e8bea 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -5,7 +5,6 @@ rustPlatform, protobuf, nix-update-script, - darwin, withQuic ? false, # with QUIC protocol support }: @@ -29,10 +28,6 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - buildNoDefaultFeatures = stdenv.hostPlatform.isMips; buildFeatures = lib.optional stdenv.hostPlatform.isMips "mips" ++ lib.optional withQuic "quic"; diff --git a/pkgs/by-name/eb/ebusd/package.nix b/pkgs/by-name/eb/ebusd/package.nix index d0549942bcc9..cc2a2e9d7f02 100644 --- a/pkgs/by-name/eb/ebusd/package.nix +++ b/pkgs/by-name/eb/ebusd/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ebusd"; - version = "24.1"; + version = "25.1"; src = fetchFromGitHub { owner = "john30"; repo = "ebusd"; rev = version; - sha256 = "sha256-+3QOB7/yCgR4j2UGfhWQ5s5sldoNfWSzX7qa//FHeJ4="; + sha256 = "sha256-rj0Wkfk3Tpm58fbCUkgCdHt5MvW+tGgDyUd5COXfBc0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index dd718663ba80..f785d9816fde 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -22,13 +22,13 @@ buildGoModule rec { pname = "ecapture"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; tag = "v${version}"; - hash = "sha256-z2cl3yUNUQhLT9bPWApABUIRNdbYqG/7QDwRTvCWvjY="; + hash = "sha256-JqFb58JAepyNuxR3YVUX0tB+V66JrLVPUIVrnZn1aHw="; fetchSubmodules = true; }; @@ -113,7 +113,7 @@ buildGoModule rec { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-3ry4eLe6W9YFFH7TdQm87CPvj8X/63XNC48A6EXqoDs="; + vendorHash = "sha256-KRW5Gf9LYwo5AZ9bYPht+4staiYVyWGkbX/sXDNDppc="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ec/echidna/package.nix b/pkgs/by-name/ec/echidna/package.nix new file mode 100644 index 000000000000..9d551e510535 --- /dev/null +++ b/pkgs/by-name/ec/echidna/package.nix @@ -0,0 +1,120 @@ +{ + lib, + stdenv, + makeWrapper, + haskellPackages, + fetchFromGitHub, + # dependencies + slither-analyzer, +}: + +haskellPackages.mkDerivation rec { + pname = "echidna"; + version = "2.2.6"; + + src = fetchFromGitHub { + owner = "crytic"; + repo = "echidna"; + tag = "v${version}"; + sha256 = "sha256-5nzis7MXOqs0bhx2jrEexjZYZI2qY6D0D7AWO+SPs+A="; + }; + + isExecutable = true; + + buildTools = with haskellPackages; [ + hpack + ]; + + executableHaskellDepends = with haskellPackages; [ + # base dependencies + aeson + base + containers + directory + hevm + MonadRandom + mtl + text + # library dependencies + ansi-terminal + async + base16-bytestring + binary + brick + bytestring + data-bword + data-dword + deepseq + exceptions + extra + filepath + hashable + html-conduit + html-entities + http-conduit + ListLike + optics + optics-core + process + random + rosezipper + semver + signal + split + strip-ansi-escape + time + unliftio + utf8-string + vector + vty + vty-crossplatform + wai-extra + warp + word-wrap + xml-conduit + yaml + # executable dependencies + code-page + filepath + hashable + optparse-applicative + time + with-utf8 + ]; + + executableToolDepends = [ + makeWrapper + ]; + + preConfigure = '' + hpack + ''; + + postInstall = + with haskellPackages; + # https://github.com/NixOS/nixpkgs/pull/304352 + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + remove-references-to -t ${warp.out} "$out/bin/echidna" + remove-references-to -t ${wreq.out} "$out/bin/echidna" + '' + # make slither-analyzer a runtime dependency + + '' + wrapProgram $out/bin/echidna \ + --prefix PATH : ${lib.makeBinPath [ slither-analyzer ]} + ''; + + doHaddock = false; + + # tests depend on a specific version of solc + doCheck = false; + + homepage = "https://github.com/crytic/echidna"; + description = "Ethereum smart contract fuzzer"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + arturcygan + hellwolf + ]; + platforms = lib.platforms.unix; + mainProgram = "echidna"; +} diff --git a/pkgs/by-name/ec/eclib/package.nix b/pkgs/by-name/ec/eclib/package.nix index ab26ad1511bd..c90084d515bf 100644 --- a/pkgs/by-name/ec/eclib/package.nix +++ b/pkgs/by-name/ec/eclib/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "Elliptic curve tools"; homepage = "https://github.com/JohnCremona/eclib"; license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/ec/eclipse-mat/package.nix b/pkgs/by-name/ec/eclipse-mat/package.nix index fff8bb0c2ab9..5bbb87b125c5 100644 --- a/pkgs/by-name/ec/eclipse-mat/package.nix +++ b/pkgs/by-name/ec/eclipse-mat/package.nix @@ -15,7 +15,7 @@ shared-mime-info, stdenv, unzip, - webkitgtk_4_0, + webkitgtk_4_1, zlib, }: @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { glib gtk3 libXtst - webkitgtk_4_0 + webkitgtk_4_1 ]) } \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { libXtst zlib shared-mime-info - webkitgtk_4_0 + webkitgtk_4_1 ]; dontBuild = true; diff --git a/pkgs/by-name/ec/ecopcr/gcc14.patch b/pkgs/by-name/ec/ecopcr/gcc14.patch new file mode 100644 index 000000000000..524e5b7b144d --- /dev/null +++ b/pkgs/by-name/ec/ecopcr/gcc14.patch @@ -0,0 +1,12 @@ +diff --git a/src/ecogrep.c b/src/ecogrep.c +index 8d45312..d9fe676 100644 +--- a/src/ecogrep.c ++++ b/src/ecogrep.c +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + + #define VERSION "0.1" diff --git a/pkgs/by-name/ec/ecopcr/package.nix b/pkgs/by-name/ec/ecopcr/package.nix index b49f26826d62..c337244350fa 100644 --- a/pkgs/by-name/ec/ecopcr/package.nix +++ b/pkgs/by-name/ec/ecopcr/package.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { hash = "sha256-ssvWpi7HuuRRAkpqqrX3ijLuBqM3QsrmrG+t7/m6fZA="; }; + patches = [ + ./gcc14.patch + ]; + buildInputs = [ gcc python3 diff --git a/pkgs/by-name/ec/ecos/package.nix b/pkgs/by-name/ec/ecos/package.nix index ed8104e73a59..736eece3f483 100644 --- a/pkgs/by-name/ec/ecos/package.nix +++ b/pkgs/by-name/ec/ecos/package.nix @@ -4,39 +4,52 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ecos"; - version = "2.0.7"; + version = "2.0.10"; src = fetchFromGitHub { owner = "embotech"; repo = "ecos"; - rev = version; - sha256 = "1hsndim5kjvcwk5svqa4igawzahj982180xj1d7yd0dbjlgxc7w7"; + tag = "v${finalAttrs.version}"; + hash = "sha256-WMgqDc+XAY3g2wwlefjJ0ATxR5r/jL971FZKtxsunnU="; }; buildPhase = '' + runHook preBuild + make all shared + + runHook postBuild ''; doCheck = true; + checkPhase = '' + runHook preCheck + make test ./runecos + + runHook postCheck ''; installPhase = '' + runHook preInstall + mkdir -p $out/lib cp lib*.a lib*.so $out/lib cp -r include $out/ + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Lightweight conic solver for second-order cone programming"; homepage = "https://www.embotech.com/ECOS"; downloadPage = "https://github.com/embotech/ecos/releases"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ bhipple ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ bhipple ]; }; -} +}) diff --git a/pkgs/by-name/ec/ecpdap/package.nix b/pkgs/by-name/ec/ecpdap/package.nix new file mode 100644 index 000000000000..7b594468a732 --- /dev/null +++ b/pkgs/by-name/ec/ecpdap/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + libusb1, +}: + +rustPlatform.buildRustPackage rec { + pname = "ecpdap"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "adamgreig"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-pgQqDRdewBSCm1/9/r8E9DBzwSKAaons3e6OLNv5gHM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-o+qm4MFZt+BzqhQsaI5EU9lZz4LI9D75eL+VKIKbIyI="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libusb1 ]; + + postInstall = '' + mkdir -p $out/etc/udev/rules.d + cp drivers/*.rules $out/etc/udev/rules.d + ''; + + meta = with lib; { + description = "Tool to program ECP5 FPGAs"; + mainProgram = "ecpdap"; + longDescription = '' + ECPDAP allows you to program ECP5 FPGAs and attached SPI flash + using CMSIS-DAP probes in JTAG mode. + ''; + homepage = "https://github.com/adamgreig/ecpdap"; + license = licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/by-name/ec/ecryptfs/package.nix similarity index 100% rename from pkgs/tools/security/ecryptfs/default.nix rename to pkgs/by-name/ec/ecryptfs/package.nix diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix index b3096e533c7a..3c2ffdaa1d93 100644 --- a/pkgs/by-name/ec/ecs-agent/package.nix +++ b/pkgs/by-name/ec/ecs-agent/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.91.2"; + version = "1.92.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-7f1qJ9dgouhj+DGikdIzUREPraAA/1y/5lYA8fbIoJo="; + hash = "sha256-g0yIJ0W71UGgPZ5m/BaeTCOTAfQ6589wAvYZ15Izt8o="; }; vendorHash = null; @@ -32,7 +32,7 @@ buildGoModule rec { changelog = "https://github.com/aws/amazon-ecs-agent/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; mainProgram = "agent"; }; } diff --git a/pkgs/by-name/ec/ecspresso/package.nix b/pkgs/by-name/ec/ecspresso/package.nix new file mode 100644 index 000000000000..e4701eaa5d26 --- /dev/null +++ b/pkgs/by-name/ec/ecspresso/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule rec { + pname = "ecspresso"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "kayac"; + repo = "ecspresso"; + tag = "v${version}"; + hash = "sha256-j0vSDOWAnYhHV0+LXULX+5pHxGl4QCRREqir2ak00rY="; + }; + + subPackages = [ + "cmd/ecspresso" + ]; + + vendorHash = "sha256-Y3Oxmk2nmZUGHzvSn0Wxp9ApPNy0x2fbYB3agZmCL8U="; + + ldflags = [ + "-s" + "-w" + "-X main.buildDate=none" + "-X main.Version=${version}" + ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgramArg = "version"; + + meta = { + description = "Deployment tool for ECS"; + mainProgram = "ecspresso"; + license = lib.licenses.mit; + homepage = "https://github.com/kayac/ecspresso/"; + maintainers = with lib.maintainers; [ + FKouhai + ]; + }; +} diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json new file mode 100644 index 000000000000..6c0f419eb511 --- /dev/null +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json @@ -0,0 +1,1002 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jitpack.io": { + "com/github/wille#oslib/d6ee6549bb": { + "jar": "sha256-gsLPIH1GGImqdghCGBWtZM5PNgUlvfBanhKlQOarw3w=", + "pom": "sha256-7wF38tn4fbnw0w7dQy2wLlhqHejMkVb8HcZRgvDh5oA=" + } + }, + "https://nexus.jixxed.nl/nexus/content/repositories/releases/nl": { + "jixxed#opencv/4.5.3-0": { + "jar": "sha256-PwimnmKzejFrZdIsiNLtTExlvRvWKxKPDBbMTe4KhQQ=", + "pom": "sha256-yE9S2bEo5C5Y+j2+eQOHGnpJ1G1Soee7rNFHiRr/pNo=" + }, + "jixxed/lept4j#lept4j/1.16.6": { + "jar": "sha256-nZH3ZJ4mabbNGm4rijF22oOPaMqjPQj9Yb1ry7GX81U=", + "module": "sha256-dIssWUftjqegtJqcPuyCuti0oFhBYZ16cIPjWPlCweA=", + "pom": "sha256-k31BbQcMlLWOjhhkUgrWnOUyb/zKBhRzq8hC6p6d/eY=" + }, + "jixxed/tess4j#tess4j/5.2.9": { + "jar": "sha256-gsiiiVKkAttbXSZs4Pooxy+z+tY/d+mGBpoUMxPkQ2I=", + "module": "sha256-cf6jtMnOwWWJcSa+mJO1j9D21kCWkIhp4E6TzZVOD34=", + "pom": "sha256-twbAdpEaiT5DuA7JosdbWEF/kJbt5K5YpKP6ISDgx28=" + } + }, + "https://plugins.gradle.org/m2": { + "com/cedarsoftware#json-io/4.14.1": { + "jar": "sha256-UY3ynWhbHfjcpYCfEr9udnDY280SKAt/z5mjWNRs/fw=", + "pom": "sha256-4DILOzeTeilHRecS0ZEUBGkLmrL2cNb1UHmtLKhPDHY=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/zaxxer#SparseBitSet/1.3": { + "jar": "sha256-92uFrbDAByGuJnt8/eTaf3HTEhzCFgyfwAwMifjFPIo=", + "pom": "sha256-EY1n40Uymhjf9OvRVX+V8MCrS0y51nh0nWZvkjAAF2g=" + }, + "commons-codec#commons-codec/1.17.1": { + "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", + "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" + }, + "commons-io#commons-io/2.18.0": { + "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=", + "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "net/jsign#jsign-core/7.1": { + "jar": "sha256-92AtTJ/J91V51wwG90cVyEUx5EeHAPcNYw9WgPeMUmo=", + "pom": "sha256-EeW9Bzs4r0LcFMdTXH1ZnDEqMe9HxQHqaTNbvZXwDEk=" + }, + "net/jsign#jsign-crypto/7.1": { + "jar": "sha256-3P5NOHVoAr2A1N52s8a8oHdJEUivci+shVARrLMtorg=", + "pom": "sha256-hN+APkSaW0h9usa4LajKuFrlJQnGas4SAnryjoZIN2c=" + }, + "net/jsign#jsign-gradle-plugin/7.1": { + "jar": "sha256-x01Z+Hu1gbj3eSe4Qofdv0OJKznKrnPirmSa57ziTCY=", + "module": "sha256-oT75n6y0JT26M4h7rNSABL10PDpzrMejv74nEjeI8yY=", + "pom": "sha256-lHnrsn/BXGGCNMRvRXGZWKiYUoTKAMqm7jwcrW2w8+I=" + }, + "net/jsign#jsign-parent/7.1": { + "pom": "sha256-IZZHpKDOVcG4bMrbQRLPsaEkteDcISP0ohsCUqcQMMI=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-lang3/3.17.0": { + "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", + "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" + }, + "org/apache/commons#commons-math3/3.6.1": { + "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", + "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/71": { + "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" + }, + "org/apache/commons#commons-parent/73": { + "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o=" + }, + "org/apache/commons#commons-parent/78": { + "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4=" + }, + "org/apache/commons#commons-text/1.13.0": { + "jar": "sha256-HjI6UBEn33jtCYfzRdadZdDqf6PU+1s/hKrro6iyDzg=", + "pom": "sha256-1GYUvcptEZXDM7qfcwzQhYXE8zKkPqe5C2A1rYBIcdg=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging/log4j#log4j-api/2.24.3": { + "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=", + "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.3": { + "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg=" + }, + "org/apache/logging/log4j#log4j/2.24.3": { + "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E=" + }, + "org/apache/poi#poi/5.4.0": { + "jar": "sha256-rOceeYcwWeJzA2Z0VgtQw9a5RbfKFosNSWKtdlCuHuw=", + "pom": "sha256-rK0VkHGQpeZ7hZfM+wEx795ZbC+gXYrZ9LnGHaMfNkU=" + }, + "org/beryx#badass-jlink-plugin/3.1.1": { + "jar": "sha256-nSZZZ0y6Ic/QwU2qCoRboSrTOu9Oi8FSrqHAr9fYRWg=", + "module": "sha256-SbchA0l5YXx6x1VVyjjSeL1ZKwLIPY6DAAJHfc7Zzz8=", + "pom": "sha256-gpCklq0NVdcv9gBvCrO3NBSX1CBvlRs/+c/cFkKVKJs=" + }, + "org/bouncycastle#bcpkix-lts8on/2.73.7": { + "jar": "sha256-WHRYb7Se7ryZuH8SNShnm8Wlw4j+pL+E0semmQguKK0=", + "pom": "sha256-D3mEND0EU+Y5uoyNTXwNGFLfA8ye4UkoQgi/5KPnH44=" + }, + "org/bouncycastle#bcprov-lts8on/2.73.7": { + "jar": "sha256-LIzWo/7zyhSubiig3gDBbWJ2d9KML/AqAFE/rrK3/7E=", + "pom": "sha256-4MwaYuJQsJ+WbzbXnGUU82JXnb+cNy8t3qlXrd7C+qw=" + }, + "org/bouncycastle#bcutil-lts8on/2.73.7": { + "jar": "sha256-03ALDCPuKZzSRYYhZyIGpfNIlR84t+iOk7IaHxu+Zxg=", + "pom": "sha256-J4GHqnKeqbOMnpcHM5JeJNCsqT+j3yQ1iZ4SZKUDVrU=" + }, + "org/bouncycastle/bcutil-lts8on/maven-metadata": { + "xml": { + "groupId": "org.bouncycastle", + "lastUpdated": "20241107225957", + "release": "2.73.7" + } + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/gradlex#extra-java-module-info/1.11": { + "jar": "sha256-Z3+h2llhAw5z7rmNUoxF/rX69fXLH1ts3297I7L3YCk=", + "module": "sha256-HupoMVnjhje5y70/1RGeDKP1R5vGPfKoItJ+Cv4Yxu4=", + "pom": "sha256-JmY0IO3vtV1IsgYLN6K8DH0UociY2vZ0v1YuM/8LYnE=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/junit#junit-bom/5.11.0-M2": { + "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", + "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" + }, + "org/junit#junit-bom/5.11.2": { + "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", + "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm/9.7.1": { + "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=", + "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ch/qos/logback#logback-classic/1.5.17": { + "jar": "sha256-5700LZHlChXx4W+ApSbOff/EGNr3PNIJTbT4AsAgSIA=", + "pom": "sha256-qV4brkazX89CLuy93poeCCBhDtWb6r2D7uIZIYG8rL8=" + }, + "ch/qos/logback#logback-core/1.5.17": { + "jar": "sha256-L71fAnKxo1RuV0CliOc14HGs0M0CJuBI9xGUajDqwzc=", + "pom": "sha256-cWqhFMrn3xr+FcvuqN35EtWtdg82p6ir04+whl9F2G4=" + }, + "ch/qos/logback#logback-parent/1.5.17": { + "pom": "sha256-mnyL+zxKF2l86OrTojo8ysvccjphQkF98KrrqMHtBno=" + }, + "com/fasterxml#oss-parent/30": { + "pom": "sha256-0OJUZlIJgf9X7K29yUA00dFpA7kulQvp+dQkQcWU+fA=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" + }, + "com/fasterxml/jackson#jackson-base/2.17.2": { + "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68=" + }, + "com/fasterxml/jackson#jackson-base/2.18.3": { + "pom": "sha256-1bv9PIRFIw5Ji2CS3oCa/WXPUE0BOTLat7Pf1unzpP0=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.3": { + "pom": "sha256-8dTGrrMhGGUMgF/pu8XulA+o8s19DwT6Q2BVHponspA=" + }, + "com/fasterxml/jackson#jackson-bom/2.9.4": { + "pom": "sha256-ez/Ek1+/U/x5ypo75e1NLIL8pMU/hF0+EzgpMTic4CE=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/jackson#jackson-parent/2.18.1": { + "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" + }, + "com/fasterxml/jackson#jackson-parent/2.9.1": { + "pom": "sha256-fATwKdKA+7gnTnUCHckPObLGIv40mdrwf8NQgcLZ2f8=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.17.2": { + "jar": "sha256-hzpgbiNQeWn5u76pOdXhknSoh3XqWhabp+LXlapRVuE=", + "module": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688=", + "pom": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.3": { + "jar": "sha256-iqV0DYC1pQJVCLQbutuqH7N3ImfGKLLjBoGk9F+LiTE=", + "module": "sha256-RkWF2yH0irFZ6O9XnNfo5tMHoEdhGZZRw+zBf05ydF0=", + "pom": "sha256-ucmLqeKephtpPUyMgBlo/qriILKyACNkp7zsUkmYOEs=" + }, + "com/fasterxml/jackson/core#jackson-core/2.17.2": { + "jar": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y=", + "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=", + "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs=" + }, + "com/fasterxml/jackson/core#jackson-core/2.18.3": { + "jar": "sha256-BWvE0+XlPOghRQ+pez+eD43eElz22miENTux8JWC4dk=", + "module": "sha256-mDbVp/Iba8VNfybeh8izBd3g5PGEsqyJUOmhsd9Hw0A=", + "pom": "sha256-N9xrj2ORpHCawhXKmPojQcbdZWE8InfZak/YKi9Q48k=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.17.2": { + "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=", + "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=", + "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.3": { + "jar": "sha256-UQvdp1p6YYbFvzO4USOUiKFFCQauV1cSHy4cxIp+EI8=", + "module": "sha256-ZCqggPhbIAV3ifrPKsaibhR4NbUDPidSDstpe8RD/Lo=", + "pom": "sha256-5Y9IrBTk29SFldaeILrTUBnsEoFRTvfvFV4YByraYX8=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.2": { + "jar": "sha256-lBvNixOBuzsNcm+rQWJPqOzg7nts8oYK2V6BV85nM3Y=", + "module": "sha256-snbSUVf4i+6mnT9ENGWFZLcfMazeHUsaFPiYS+lTw0M=", + "pom": "sha256-7eVVk8YoXTmdlgc6GQy5v/QlZ5WqjWO5AXcrsxI+SDs=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.2": { + "pom": "sha256-5pgyMzCpqCySDlqJtlsPciXI5zPBIqGPeWoEpuMfpcs=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.18.3": { + "jar": "sha256-H1F6+RrOVBUFJc2zCgEvyhmlNhlFZHVvWAwhrPx+BKA=", + "module": "sha256-7QX+6N/FAwRMH4PwROBtcYwzYEK8FzqloevfdzQXyG8=", + "pom": "sha256-/14lbEPjXWUtZhVeVmqYYqWbuzCM3GNvSIi96PVq9Tw=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.3": { + "jar": "sha256-Lh3y/rk2g9N5lpzq94t2oKwRXGfQRnGVj9307tbmQB0=", + "module": "sha256-Kt37kDio5g8OlWOZLC3sdYpQxDvH8ECVnYXbbp1o04w=", + "pom": "sha256-LIA9pFO2CM4OQ6FscvAaWf5Dg++oV6jxszQhc2bqJk0=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.3": { + "pom": "sha256-rehezbxjw22XyQcnNfQfeUGO+K0EA755gtr/9BxfruM=" + }, + "com/github/jai-imageio#jai-imageio-core/1.4.0": { + "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=", + "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw=" + }, + "com/github/scribejava#scribejava-core/8.3.3": { + "jar": "sha256-sh6swSmDsN5YWwXvMHs18BLkjyiYpKzbpSm7sNN5xEM=", + "pom": "sha256-RTjKMQCqU9DsNChWti1s/MSkhMs0eV9V2z1DTOW2trY=" + }, + "com/github/scribejava#scribejava-java8/8.3.3": { + "jar": "sha256-1d1We3CV8hdA2jD2kddiUh0QWwfiW8TWaP/aHAtTcMw=", + "pom": "sha256-BB+QpyayExaVyzy1Z/rUDCn/jPl+qB/dfYrROr7LoXI=" + }, + "com/github/scribejava#scribejava/8.3.3": { + "pom": "sha256-KkpDgAox1XD2wY1TmtgWIZ2xgTuY/gsjq2X4mg4N+lc=" + }, + "com/github/virtuald#curvesapi/1.08": { + "jar": "sha256-rZWwi4u/nX0X5eAIFImPojMk8yvFti8aN4AealbOAHk=", + "pom": "sha256-Ny4ZrFGNWM5atVPKgDiMf+mSDFVU0TYtGGRabdvF0SY=" + }, + "com/google/code/findbugs#annotations/1.3.9": { + "jar": "sha256-caURebGKBtZ7JYLc4pM0+hFsS8N8syktVbcIB1FFNm4=", + "pom": "sha256-8RHyLXx/ZkZzjuYxx+43p0HoDhScRLHWmKfXF2OxjrE=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" + }, + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, + "com/google/code/javaparser#javaparser/1.0.11": { + "jar": "sha256-07/l/m/qZK8XuRm58nlY9cMvmRJbuAjMgtEFW5lZfYI=", + "pom": "sha256-3X6lRUWd+GeIiSwv+0ZTXflvVyvAumeVHm5WY4mxSwA=" + }, + "com/google/errorprone#error_prone_annotations/2.27.0": { + "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + }, + "com/google/errorprone#error_prone_annotations/2.36.0": { + "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=", + "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw=" + }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" + }, + "com/google/errorprone#error_prone_parent/2.36.0": { + "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/33.4.0-jre": { + "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc=" + }, + "com/google/guava#guava/33.4.0-jre": { + "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=", + "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=", + "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/ibm/icu#icu4j/68.1": { + "jar": "sha256-B+T4suXJvOIq/BXtmAY8D8k29eYT2CD+rnypB17FUlk=", + "pom": "sha256-R/+TDdpm090lSpWVqG7GuYUGTrTGge4gxla02Au7G7Q=" + }, + "com/sun/codemodel#codemodel-project/2.6": { + "pom": "sha256-8lrv48rP+RHhQrssqJIzSzfoYDJ2jDSvI6qCUL3IA0c=" + }, + "com/sun/codemodel#codemodel/2.6": { + "jar": "sha256-JzWBbWj4WtyhQReZUYiWU841Wufnq065KjIuoO9nF2c=", + "pom": "sha256-zLydWo8aIDows0R6Ax8OQulTuhTJ3TieFl24lK2zEBw=" + }, + "com/zaxxer#SparseBitSet/1.3": { + "jar": "sha256-92uFrbDAByGuJnt8/eTaf3HTEhzCFgyfwAwMifjFPIo=", + "pom": "sha256-EY1n40Uymhjf9OvRVX+V8MCrS0y51nh0nWZvkjAAF2g=" + }, + "commons-codec#commons-codec/1.17.1": { + "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", + "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" + }, + "commons-io#commons-io/2.17.0": { + "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=", + "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek=" + }, + "commons-io#commons-io/2.18.0": { + "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=", + "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o=" + }, + "commons-io#commons-io/2.4": { + "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" + }, + "commons-lang#commons-lang/2.6": { + "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", + "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "de/saxsys#mvvmfx-parent/1.8.0": { + "pom": "sha256-tp0rfN1IaPX4/rFgaV7mvP/PsIf7LYGeXXW7o1AjbJs=" + }, + "de/saxsys#mvvmfx-testing-utils/1.8.0": { + "jar": "sha256-9RoATqZIkdSi+ZH1Ou1TZHW4/yCZtaaS5Ooj14HprZs=", + "pom": "sha256-7ilAMnc/PJ3pzZ1SVpCoYrOzoerSjZJtc5gkdoVB3vo=" + }, + "eu/lestard#doc-annotations/0.2": { + "jar": "sha256-Yl5U0tQDYG0hdD/PbYsHJD7yhEQ9pNwvpBKUQX34Glw=", + "pom": "sha256-YT1F0/kGPP++cdD0u1U1yHa+JOOkeWTXEFWqCDRBJI4=" + }, + "io/freefair/gradle#lombok-plugin/8.13": { + "jar": "sha256-fflln33kA74dOIdl++dhqewWdlHaajzQbouDynEYmaU=", + "module": "sha256-mXEiI3+Zn2jUIX6psNFzZUrrbU/c4k8Hn4+FE0RrT18=", + "pom": "sha256-L0O8PILyGGcy2G82s+P+rW5Sw1Ckflr1bQ1dFOjRmGo=" + }, + "io/github/classgraph#classgraph/4.8.179": { + "jar": "sha256-FlWDV/I0BSNwEJEnpF1pqb1thkaSVZR5JjRIbcSLFZ0=", + "pom": "sha256-CWp5YnTWPaeMCTueed63lFJp3CK8F+ZqKYhazkQwaJs=" + }, + "io/github/pustike#commons-csv/1.7.0": { + "jar": "sha256-PB0BZmOIW/KPqgi3rE//Ewin5PFd6BZvd2D5jC5m3LI=", + "pom": "sha256-UYDXyvGI2yrRUaUnH7E633Yr0vKsMA67chuOWbCgEzY=" + }, + "io/github/pustike#pustike-maven-parent/0.1.2": { + "pom": "sha256-plHNjRj4HWkfRLASOeVqdTyLrB7qXCv5Pm7MrITyyfc=" + }, + "io/github/secretx33#path-matching-resource-pattern-resolver/0.1": { + "jar": "sha256-IGrMJabQ3GkpCeyt1fvgszqdXmjNYtd8TK7ueV8g2Co=", + "module": "sha256-xHicQ5mvi3Tvfn92kaJMaNPKWZpEAHYY8tpJ5PCdyu4=", + "pom": "sha256-ZMltCzuWkUhheYf0ZSPZAbT7pl4QHgtJmN8rNoeTrYA=" + }, + "io/netty#netty-bom/4.1.22.Final": { + "pom": "sha256-Bfr/tDn8I95kagaujM1hc0Sz0xcpVXH5PpgykGHZNa8=" + }, + "io/projectreactor#reactor-bom/Bismuth-SR7": { + "pom": "sha256-8V34qRAvk+7YOr1Aw5XxauNsUKmmB+llR0KUKr49NDk=" + }, + "io/reactivex/rxjava3#rxjava/3.1.10": { + "jar": "sha256-6fJW+egFVy3V/UWxQNs2DX3ERNDDgwSbLT1+vwXYSqs=", + "module": "sha256-rwV/vBEyR6Pp/cYOWU+dh2xPW8oZy4sb2myBGP9ixpU=", + "pom": "sha256-EeldzI+ywwumAH/f9GxW+HF2/lwwLFGEQThZEk1Tq60=" + }, + "io/sentry#sentry/8.4.0": { + "jar": "sha256-TFc6haFIX5k+Uuy0uXI/T/QVqueFWH1RCI+n56jZw98=", + "module": "sha256-5yIJjgS/2HbMLx9pBPG8aH8bWfebrQdkHB+OogYVcdQ=", + "pom": "sha256-wuHcDpGz4k39fPrdOMEiSRYg1tlJ4rdi7adB1F3Z3BE=" + }, + "jakarta/json/bind#jakarta.json.bind-api/2.0.0": { + "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=", + "pom": "sha256-AXlsHbeq949i6pb7CHZalZb8StYYdCxtJk5F4BrmuFU=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/validation#jakarta.validation-api/3.0.2": { + "jar": "sha256-KRwl5pEMxqfr2W1Ma66/bXw3Z2xUgsLZYUbpAbYsH8k=", + "pom": "sha256-CnucYyeWiv4NgvfPT6y9p+FXloxYCNaby4AZhjspjcQ=" + }, + "javax/json/bind#javax.json.bind-api/1.0": { + "jar": "sha256-zTvjkfWZ1L71m/sVUleta5HkUh0ZuOlysN+1LfsMX8E=", + "pom": "sha256-LjhZwbI5E9p6sDuwsY2ITXMKCmPE/xda6ZGJnz/R7h8=" + }, + "javax/servlet#javax.servlet-api/4.0.1": { + "jar": "sha256-g6A92HfTZ0V28Np7kHVchSSvCZzPBgf8YaqXFTWtfGA=", + "pom": "sha256-FAVeYVW4oqYype7GoeW+DAoLo4D36T+ctMuPfk+Vm/E=" + }, + "javax/validation#validation-api/2.0.1.Final": { + "jar": "sha256-mHO0bfGDPJ7o9bwf9oUzdRFdrdiJe8taDf+1hIg17mw=", + "pom": "sha256-q7nT5k03c0RnMqMO6gsbWmOIi7FDMdKioY8zhdGkw4k=" + }, + "joda-time#joda-time/2.13.0": { + "jar": "sha256-qbRQ2W2QYW+f5WV6KThbTQB3+Z+LyAhB+T4lRaPNYj4=", + "pom": "sha256-z3axJyUkKrwNv2c0z4nMKddt3Itnaklq1/xA0cUVUkM=" + }, + "joda-time#joda-time/2.4": { + "pom": "sha256-hvCkCbZaMW7tZ5shz1hLkhe1WzqJLCz8UIZlNOdvXiQ=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/bytebuddy#byte-buddy-agent/1.15.11": { + "jar": "sha256-MW0sB5XCpNTEdW8ub5NJg3x0MKw04Ed+rYdNBfXMGeU=", + "pom": "sha256-tfoTlvFHl7jYCIJ+d0O6il8gO0iJvjLklj1EvV7XWag=" + }, + "net/bytebuddy#byte-buddy-parent/1.15.11": { + "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY=" + }, + "net/bytebuddy#byte-buddy/1.15.11": { + "jar": "sha256-+giZiq4ee9roO94HEsUOhETXHA4MGWuyJHrejUrQ65A=", + "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/java/dev/jna#jna-platform/5.17.0": { + "jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=", + "pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ=" + }, + "net/java/dev/jna#jna/5.17.0": { + "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=", + "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ=" + }, + "net/rdrei/android/buildtimetracker#gradle-plugin/0.11.1": { + "jar": "sha256-VTLp3rXka/R3KpkXFRrW4TqRLj8jZH8ffuoi/DsLTsg=", + "pom": "sha256-7Q14MGZb9YiDq6YmLjFkhd8K1MfrNHPbLVCV3vKN8UE=" + }, + "net/sf/opencsv#opencsv/2.3": { + "jar": "sha256-3Aulv/YUDckjOZcwJqDsvdwqOwG91G7Z0WvswvbXjeY=", + "pom": "sha256-V/VgdWXWqQ3uZyKAHUUkgT2dJ4UEbylUoYhh379KIUk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-compress/1.27.1": { + "jar": "sha256-KT2A9UtTa3QJXc1+o88KKbv8NAJRkoEzJJX0Qg03DRY=", + "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw=" + }, + "org/apache/commons#commons-compress/1.8": { + "jar": "sha256-nPUKdbYsyFMU/43jSUkoOwTi3E3KEuWMYoP3M1i3tuQ=", + "pom": "sha256-OPhEKHDCaR2YIlGfLP+46JxwQQBQt8RsuhdqiCGeRCk=" + }, + "org/apache/commons#commons-lang3/3.16.0": { + "jar": "sha256-CHCd101gK3Bc5AF9JlRCEAVqS6WD1bIMCTc0Bv56APg=", + "pom": "sha256-4oA4OVbC5ywd6zowezt18F7kNkm31D8CFfe2x7Fe6iw=" + }, + "org/apache/commons#commons-lang3/3.17.0": { + "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", + "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" + }, + "org/apache/commons#commons-math3/3.6.1": { + "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", + "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/apache/commons#commons-parent/25": { + "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" + }, + "org/apache/commons#commons-parent/33": { + "pom": "sha256-U9ABE1Li5RBvN52vzNrHdU7G8PeCQ8AwXklp9azd+Ps=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/commons#commons-parent/71": { + "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" + }, + "org/apache/commons#commons-parent/72": { + "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA=" + }, + "org/apache/commons#commons-parent/73": { + "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o=" + }, + "org/apache/commons#commons-parent/74": { + "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss=" + }, + "org/apache/commons#commons-parent/78": { + "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4=" + }, + "org/apache/commons#commons-text/1.12.0": { + "jar": "sha256-3gIyV/8WYESla9GqkSToQ80F2sWAbMcFqTEfNVbVoV8=", + "pom": "sha256-stQ0HJIZgcs11VcPT8lzKgijSxUo3uhMBQfH8nGaM08=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/logging#logging-parent/1": { + "pom": "sha256-NLK/T1MagJFolhZy/0GdGr+WcluN/lKYDwDIxOsTS9Y=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging/log4j#log4j-api/2.24.3": { + "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=", + "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk=" + }, + "org/apache/logging/log4j#log4j-bom/2.10.0": { + "pom": "sha256-8CEjRUmwLxK23xRaaw5ixrl4FCfjDjckmgX2XF3R7WY=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.2": { + "pom": "sha256-NQKIlCeybxfvStgWgCxJtJQ/DJOXJoYdEmPlenKiMEY=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.3": { + "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg=" + }, + "org/apache/logging/log4j#log4j/2.24.3": { + "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E=" + }, + "org/apache/pdfbox#fontbox/2.0.26": { + "jar": "sha256-lGdMfRDqRdmw3BA4eJJjf8jvtcadLnJpTxxm/rm7btc=", + "pom": "sha256-/9HyFyWhzqeUvBLaOkkbcuFtvI0C4hxkBytWlulTaEo=" + }, + "org/apache/pdfbox#jbig2-imageio/3.0.4": { + "jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=", + "pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s=" + }, + "org/apache/pdfbox#pdfbox-debugger/2.0.26": { + "jar": "sha256-3CEgFauTVbQKUuxoedRz3/8gXNBZgvJIIjtON2CIjck=", + "pom": "sha256-yifQaKzj1+7LJYTubcnnHA9BM712dI3UmA3U6HbQDGs=" + }, + "org/apache/pdfbox#pdfbox-parent/2.0.26": { + "pom": "sha256-AbK5hUr4mKXO1gWzRpbLY6QFRc0TID9jILvltoDjPD0=" + }, + "org/apache/pdfbox#pdfbox-tools/2.0.26": { + "jar": "sha256-pzhZchSiCFreKRcr6GAmdIW95JAGY63ZUS9vy+qXzU8=", + "pom": "sha256-Gj86SvqIlLz1A5vKNk8wOUxtUqaUeDLm6W8tZa5dxY8=" + }, + "org/apache/pdfbox#pdfbox/2.0.26": { + "jar": "sha256-tG67QUA4S0WjnpHiO1lc6dzYujqe6RTxX0CkKp+AU3M=", + "pom": "sha256-KNkHvwQvNchyx5J0uBE1zIs9EE0p38twug3vly8oVyg=" + }, + "org/apache/poi#poi-ooxml-lite/5.4.0": { + "jar": "sha256-u1qKbIMyec7VGvtgQqoVrl1coxLuaC5XDiORe1IrB54=", + "pom": "sha256-YQpkM3ly/xl/ozbmjHfmOVWxFYa8Htsfxnk55FUvF+I=" + }, + "org/apache/poi#poi-ooxml/5.4.0": { + "jar": "sha256-mGk0Qu19RHkd5KV5YrbIIK5njg66nPhUaBti/2LJYR0=", + "pom": "sha256-WI8k6TVvKMHQmJw0q15ia/NIq8Aie4rIy0ZmpPgICnY=" + }, + "org/apache/poi#poi/5.4.0": { + "jar": "sha256-rOceeYcwWeJzA2Z0VgtQw9a5RbfKFosNSWKtdlCuHuw=", + "pom": "sha256-rK0VkHGQpeZ7hZfM+wEx795ZbC+gXYrZ9LnGHaMfNkU=" + }, + "org/apache/xmlbeans#xmlbeans/5.3.0": { + "jar": "sha256-bMado7TTW4PF5HfNTauiBORBCYM+NK8rmoosh4gomRc=", + "pom": "sha256-kG0Z2CtlNlFIxGTw3znNwzkeJ5/kYPBZAIukzofJD1c=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/assertj#assertj-core/3.27.3": { + "jar": "sha256-W4omIF9tXqYK2c5lzkpAoq/kxIq+7GG9B0CgiMJOifU=", + "pom": "sha256-jrN+QWt4B+e/833QN8QMBrlWk6dgWcX7m+uFSaTO19w=" + }, + "org/checkerframework#checker-qual/3.43.0": { + "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=", + "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=", + "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM=" + }, + "org/controlsfx#controlsfx/11.2.1": { + "jar": "sha256-63VY0JTDa4Yw6oqab40k+K9F0ak6N14R4gbXbAgiFDA=", + "pom": "sha256-veC6xL8EPqp19uTOEbpXfHneak+5Mfd1e93Y36MwKTc=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/jetty#jetty-bom/9.4.8.v20171121": { + "pom": "sha256-XGevE5TfPI1hIb5IJZBXONeF8MdwavuFUEofoi1dhN4=" + }, + "org/eclipse/parsson#jakarta.json/1.1.7": { + "jar": "sha256-WQX1IoOnSR4GulhVYQPUXDGZpCYCq8021RDO2mVJD/A=", + "pom": "sha256-93B73rz8Qp+mp0HmwoVRFWD3e3QCyneU5hE0/XYfBMo=" + }, + "org/eclipse/parsson#parsson-bundles/1.1.7": { + "pom": "sha256-2YsPO+YvMNOU4FQabtJeq+MMN7kYd88c4tjjo1vIJHo=" + }, + "org/eclipse/parsson#project/1.1.7": { + "pom": "sha256-r171oT3deNwLoRUh3IOhKkVytRPILxAbsxDxGGxccU0=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jboss#jboss-parent/20": { + "pom": "sha256-EPDPw9IEh4JYXQ2yWkN40BAvn0hQy/5v1sWf4tI6gb8=" + }, + "org/jboss#jboss-parent/9": { + "pom": "sha256-FMdH0KO7ovUps/hgsHiA+xzvICZW5mSc2iy5jbY+x54=" + }, + "org/jboss#jboss-vfs/3.2.16.Final": { + "jar": "sha256-UXVXDX63voy3azf//+HSS1w3pqcdWuf82khHM65KdR4=", + "pom": "sha256-YUO95rZLf0gG3jFCkvJ508tL8Lb+RWaSbB4iKu4E3Mo=" + }, + "org/jboss/logging#jboss-logging/3.1.4.GA": { + "jar": "sha256-SGo2AO/ihtfjgOVw+Ol8rKCxStg2fEo4oyYaCNww3Ug=", + "pom": "sha256-56t6X2Bh4kP/bEvAuTggWhHqyq5+GvNDhpB8jaPOql4=" + }, + "org/jfxtras#jmetro/11.6.16": { + "jar": "sha256-X6v+k5kULSxCzepdifdJ0n1e8N01698l4LYwkspZ3vE=", + "pom": "sha256-zRJGTYfPiIZTRNQ12wQtbuNsHgs+C+ik+orKAn4r/Ws=" + }, + "org/jsonschema2pojo#jsonschema2pojo-core/1.2.2": { + "jar": "sha256-0epGqRFUHRDrKehIOPdvBmZkoJqOZuHUmPyQzcuyffo=", + "pom": "sha256-mtHVe8hrJzXr7xqJinGIgJR8I7wa95dJ0J702YzRluE=" + }, + "org/jsonschema2pojo#jsonschema2pojo-gradle-plugin/1.2.2": { + "jar": "sha256-OBH9Jv72Sa+cgkMzcz3Iy6KiaNjViqr91z98XAMDZJI=", + "pom": "sha256-enXFZUIwx7+kFKQB96w4vzMzuclEZxomD0pOazBFfJA=" + }, + "org/jsonschema2pojo#jsonschema2pojo/1.2.2": { + "pom": "sha256-PEgC9gguyH1+igs206MyaDTRj9c8E5EM8pFrhQvNrDM=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/junit#junit-bom/5.11.0-M2": { + "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", + "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" + }, + "org/junit#junit-bom/5.11.2": { + "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", + "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" + }, + "org/junit#junit-bom/5.12.1": { + "module": "sha256-TdKqnplFecYwRX35lbkZsDVFYzZGNy6q3R0WXQv1jBo=", + "pom": "sha256-fIJrxyvt3IF9rZJjAn+QEqD1Wjd9ON+JxCkyolAcK/A=" + }, + "org/junit/jupiter#junit-jupiter-api/5.12.1": { + "jar": "sha256-pAHgtgNz7fffCWLCXrMhPkUaR3h5LTOnaHbDuKW7IJs=", + "module": "sha256-iv9r5FYIFhBl7mO4QDyfKTE6HdnzkfP5eIVlpiMxGXY=", + "pom": "sha256-zqRvFdpTNT8vtSYZyvbcAH7CqE8O2vQMwSV/jjzvd9w=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.12.1": { + "jar": "sha256-Dn8tvrkb+usNTLM6SHNRuvDlpu1ykGFU2P2ZddMpxZI=", + "module": "sha256-tvSQZ/FmJdFN7gmT8weKTGYeF8kOV0yf0SoWRur98tA=", + "pom": "sha256-GCeXDlNI10sY6757guDLGdxOj5np1NmEyyZJTVcTPao=" + }, + "org/junit/jupiter#junit-jupiter-params/5.12.1": { + "jar": "sha256-WVFwaZnjWVHU3w7KbgkdNhn2WanBCFjy9aPOGRy1dnM=", + "module": "sha256-KYwQtU+G3dtCeclfSYnRW+DV5QDEU+yTXv1Wd8v6Guk=", + "pom": "sha256-dHNtHnFnHQDeQFyxnD2GhOHFl9BwfeJmH7gHGyeEJ8M=" + }, + "org/junit/jupiter#junit-jupiter/5.12.1": { + "jar": "sha256-IoqUye50PVW/6gm1djBoHqeyCmYaR3RH9cH2DcEtnjo=", + "module": "sha256-OY71Q1eCyqfceKDRVRBpP6Xt7w/HP5PFVOZ3FxtCIj4=", + "pom": "sha256-m42YgPjFl2/JUEKEnzsSwRWdom5UUkMSY3edCx54yKQ=" + }, + "org/junit/platform#junit-platform-commons/1.12.1": { + "jar": "sha256-wxYWNYGqpWSSgBIrEuo2/k6cICoaImd1P+p8nh3wVes=", + "module": "sha256-ypN54aC/xbLOQ8dOh0SxT7fEkhPiISv1pH7QIv3bMM4=", + "pom": "sha256-tzKBEektR47QlWxjCgwkZm52gbUTgWj6FchbUJRqcAM=" + }, + "org/junit/platform#junit-platform-engine/1.12.1": { + "jar": "sha256-f+3/k/2SrsfSn8YNwB+gJyRrNrgIhCOl78SUnl9q/6Q=", + "module": "sha256-Vb3CX4rhKh3yQQisSArgiAKMiOMV+ou01HbU4RXyrGE=", + "pom": "sha256-TANohTegh/d9NLNNjczZO5NhcWu5u/S0ucbYMXkBS5w=" + }, + "org/junit/platform#junit-platform-launcher/1.12.1": { + "jar": "sha256-67sU57KfYHMOrt6GLtadfeDVgeoMA4+mogKVXHVB9SU=", + "module": "sha256-e+5FMgZp1sP8SKnaJV9Xn7zlgA+mY8QgT6NL1XgkUfQ=", + "pom": "sha256-nd9DNXV223LpTvM8ipY09gOrQEb+Cubl4ZJMq2aIjtk=" + }, + "org/junit/platform#junit-platform-runner/1.12.1": { + "jar": "sha256-8CRNhGbpUwHWD8ApxTmnIoisMyjQbj85i17ExH+g6HA=", + "module": "sha256-5//N1KRB6el0+dplvHFeGWxq7cUCb0xAs+25Z5ujIzA=", + "pom": "sha256-M5dYHbZeZOijCNkGv+E1d/qLgkKxDvGiIfVYuCxHjHA=" + }, + "org/junit/platform#junit-platform-suite-api/1.12.1": { + "jar": "sha256-s0gUUihPfFDV4KeXsTrRwuNp2QCxfQpOhQBampjT8Ss=", + "module": "sha256-ghsnFZa3qC3Onrjj/DVF+KenIkvU02HgOjFSv6LnZwY=", + "pom": "sha256-gqr1cn4YGh2dKvvUM5xdAUPOIIbJ/0HY6b52LZo2w8A=" + }, + "org/junit/platform#junit-platform-suite-commons/1.12.1": { + "jar": "sha256-C0oBRu0aKysb94NhNDn0sdFHvM+0PlGokbgEXs9PFd4=", + "module": "sha256-+LP4UlNiXd4TqWypShqH74pqJeF7fJpXbFrNQyPAan0=", + "pom": "sha256-C1cZJGVJXHjj5px8Ko2oVs6xHV+tlO/1pw8aYtepW3M=" + }, + "org/leadpony/justify#justify-parent/3.1.0": { + "pom": "sha256-ckfhOlVhg4gPqnP7EeWQJ7R+fG1Ghx0sUIg3WwDbJY0=" + }, + "org/leadpony/justify#justify/3.1.0": { + "jar": "sha256-zQVe+z52gWhOHP7Vx9AnyrguHbqYrXPSGbTijzgndGg=", + "pom": "sha256-oXqgosC8+KGRF6qSDoYcxKIEIb0aOR0iTJGjhsgezak=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-core/5.16.1": { + "jar": "sha256-1yv30j7BnQUTxoC8fruszvDGQ68iyCxez9mZshCfx5c=", + "pom": "sha256-5p0IpMRp7l0fa3BXYsKKZWEUOSDSfHbrSnrFYGPurnw=" + }, + "org/mockito#mockito-inline/5.2.0": { + "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=", + "pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ=" + }, + "org/mockito#mockito-junit-jupiter/5.16.1": { + "jar": "sha256-fd+TxJfcsHv09pR2aj2NXupvom8CwYywoeWYpTR+c/A=", + "pom": "sha256-XTWQpYRiDj/p8nCrppdmeBs0aUB0JoMLT71pYYDu8kc=" + }, + "org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/ocpsoft#ocpsoft-parent/9": { + "pom": "sha256-8XwebTdP/zgg7hx7ZBsy+fE6mF6/u0J3mhbjSHRiOWY=" + }, + "org/ocpsoft/prettytime#prettytime-parent/3.2.5.Final": { + "pom": "sha256-z20CLDkObRRnpgtIGusI+qNPpvDq+i2jkgi5yPoxxKQ=" + }, + "org/ocpsoft/prettytime#prettytime/3.2.5.Final": { + "jar": "sha256-My3AACjoNlsnD7+1rAd7gHfp4OtYdGSiUqjtBHAiV+k=", + "pom": "sha256-pxdAoV6nREoA8+5lj8XBLxONl1aqPvHAeq8KImyN+/k=" + }, + "org/openjfx#javafx-base/23.0.1": { + "jar": "sha256-iEU6jUzJIXQMhOMV6AIbnZhLCSDTySMYfF/QwswdaDw=", + "pom": "sha256-0mUw12g4dhZPL+FpnXe//CbJlfUSgCr0IFUXwhSs+mc=" + }, + "org/openjfx#javafx-base/23.0.1/linux": { + "jar": "sha256-7sBxSvCRmRxVt9v23ePYWSsf6LoEbagc2IUDuAvpi2M=" + }, + "org/openjfx#javafx-controls/23.0.1": { + "jar": "sha256-3XcaHc2LdE4WcgNao8YoM+Y0ZfpgZrOgwuon8XfL1O8=", + "pom": "sha256-zUsIKtIxRfbipieHQ3FsCu3fit8vO/iu1ihYCFWk46g=" + }, + "org/openjfx#javafx-controls/23.0.1/linux": { + "jar": "sha256-LQyxs8l1c4lHywYBT+IkCrNrS29oxG6SbQiWCYJbqdw=" + }, + "org/openjfx#javafx-fxml/23.0.1": { + "pom": "sha256-h45/OrAgdht3KLq0VkfIU7z+Qnc4MCqlLdOrzHXsDuo=" + }, + "org/openjfx#javafx-fxml/23.0.1/linux": { + "jar": "sha256-+zQCUfl7tvMxg/oBzlqXaBbjFqmI3EBIGj57VQgtmJo=" + }, + "org/openjfx#javafx-graphics/23.0.1": { + "jar": "sha256-kJCrtogUiOdLj4fkWoI47DMk7ETsxg/B+3tQMtgJURE=", + "pom": "sha256-st72CewOe6tjk5EdDP7xnZZo0NPcsvAB/luMWaiU24g=" + }, + "org/openjfx#javafx-graphics/23.0.1/linux": { + "jar": "sha256-NVPB6tM9naWVgGkCKlBr/X4FxX7m9nR5spFz8taBZEw=" + }, + "org/openjfx#javafx-media/23.0.1": { + "pom": "sha256-tfRj6GKtVPWcSsQbkRA/4PqvPe6WOL4AczNi7p6cWko=" + }, + "org/openjfx#javafx-media/23.0.1/linux": { + "jar": "sha256-OP/Uy68DzVJMKslEStdK5ZNGuJpgmM15G1zSvzzUU6I=" + }, + "org/openjfx#javafx-swing/23.0.1": { + "jar": "sha256-nNkwvgpUAQhXNRTE+aSL/yln3Kg/XjGR7//vQH7ade0=", + "pom": "sha256-uht/UEeiXgkbdKJpJKQ2St+eoWqKLESnEbvledqikyw=" + }, + "org/openjfx#javafx-swing/23.0.1/linux": { + "jar": "sha256-+FtFmvQtjKJ18NiRocwcjUuMudSPMuXhYau9Rt6YaqY=" + }, + "org/openjfx#javafx/23.0.1": { + "pom": "sha256-S7WEqBPU9lbMNxf+dQpLLI/2mj1W+6E53MHms4FV2F4=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm/9.7.1": { + "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=", + "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg=" + }, + "org/projectlombok#lombok/1.18.36": { + "jar": "sha256-c7awW2otNltwC6sI0w+U3p0zZJC8Cszlthgf70jL8Y4=", + "pom": "sha256-iaIdJYdshWLBShDxsh77/M6dU7BYaGuChf6iJ2xTKQ4=" + }, + "org/rauschig#jarchivelib/0.6.0": { + "jar": "sha256-u/9XGPF0HRYkJreWaPJKznhTPHicnEBJtbewxTF39BQ=", + "pom": "sha256-Y0BG5S8/+G4gszZgQlw+1rbubYRjE8CLPJ/lLuTWOE8=" + }, + "org/reactivestreams#reactive-streams/1.0.4": { + "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", + "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" + }, + "org/slf4j#slf4j-api/2.0.17": { + "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", + "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" + }, + "org/slf4j#slf4j-bom/2.0.17": { + "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + }, + "org/slf4j#slf4j-parent/2.0.17": { + "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.0.4.RELEASE": { + "pom": "sha256-vARmNMfO1m+IEPEWTqcG1f7DrZOJtWasn8TvgXStI9U=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/springframework/boot#spring-boot-dependencies/2.0.0.RELEASE": { + "pom": "sha256-VdUqa8/P2w40ocAbbPHaMU07cT7feez+0eRhSFdBxbA=" + }, + "org/springframework/boot#spring-boot-starter-parent/2.0.0.RELEASE": { + "pom": "sha256-ziyTLoAco1guJxzDiVbuGjpI2i2X5h3FDKCq2do0ofU=" + }, + "org/springframework/data#spring-data-releasetrain/Kay-SR5": { + "pom": "sha256-lV8UZffEvad8rka5LUbnISQt3PBrxALEGwOmrN3wq14=" + }, + "org/springframework/data/build#spring-data-build/2.0.5.RELEASE": { + "pom": "sha256-fllWbrTcJFEQsPt+V1ER8Bb6DMogNJwpweRswQHF6Cg=" + }, + "org/springframework/integration#spring-integration-bom/5.0.3.RELEASE": { + "pom": "sha256-zogyzAu5v9EzwXRPeq7FCz+IJRt0Ar82vncUAR69fcA=" + }, + "org/springframework/security#spring-security-bom/5.0.3.RELEASE": { + "pom": "sha256-wMstyax5q53Efb0R7cDxtAzoq4XRdPZmzzEcIY146tI=" + }, + "org/springframework/session#spring-session-bom/Apple-SR1": { + "pom": "sha256-qsKfFgb+KZpdGQjrE1ekXyMMvTTtqNGDVYiGiTIaw1U=" + }, + "org/tukaani#xz/1.5": { + "jar": "sha256-hvMPqHdfo6Ys2znR7XimAZFkwQWIZASNQsvuJE4m6EA=", + "pom": "sha256-Q5HcceKs5oshCpdj6SnnNlNIAD3bXh9g9G7ciAnCLw4=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + } + } +} diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix new file mode 100644 index 000000000000..c9d9aa86786e --- /dev/null +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix @@ -0,0 +1,120 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gradle, + jdk23, + makeWrapper, + wrapGAppsHook3, + libXxf86vm, + libXtst, + libglvnd, + glib, + copyDesktopItems, + makeDesktopItem, + nix-update-script, +}: +stdenv.mkDerivation rec { + pname = "ed-odyssey-materials-helper"; + version = "2.156"; + + src = fetchFromGitHub { + owner = "jixxed"; + repo = "ed-odyssey-materials-helper"; + tag = version; + hash = "sha256-T7Mh9QZRQbDJmW976bOg5YNQoFxJ2SUFl6qBjos8LSo="; + }; + + nativeBuildInputs = [ + gradle + makeWrapper + wrapGAppsHook3 + copyDesktopItems + ]; + + patches = [ + # We'll set up the edomh: URL scheme in makeDesktopItem, + # so this removes 1) the popup about it when you first start the program, 2) the option in the settings + # and makes the program always know that it is set up + ./remove-urlscheme-settings.patch + ]; + postPatch = '' + # oslib doesn't seem to do releases and hasn't had a change since 2021, so always use commit d6ee6549bb + # it is not the latest commit because using a commit here whose hash starts with a number causes issues, but this works + substituteInPlace build.gradle \ + --replace-fail '"com.github.wille:oslib:master-SNAPSHOT"' '"com.github.wille:oslib:d6ee6549bb"' + substituteInPlace application/src/main/java/module-info.java \ + --replace-fail 'requires oslib.master.SNAPSHOT;' 'requires oslib.d6ee6549bb;' + ''; + + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + + gradleFlags = [ "-Dorg.gradle.java.home=${jdk23}" ]; + + gradleBuildTask = "application:jpackage"; + gradleUpdateTask = "application:nixDownloadDeps"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{share/ed-odyssey-materials-helper,bin} + cp -r application/build/jpackage/Elite\ Dangerous\ Odyssey\ Materials\ Helper/* $out/share/ed-odyssey-materials-helper + + mkdir -p $out/share/icons/hicolor/512x512/apps/ + ln -s $out/share/ed-odyssey-materials-helper/lib/Elite\ Dangerous\ Odyssey\ Materials\ Helper.png $out/share/icons/hicolor/512x512/apps/ed-odyssey-materials-helper.png + + runHook postInstall + ''; + + dontWrapGApps = true; + + postFixup = '' + # The logs would go into the current directory, so the wrapper will cd to the config dir first + makeShellWrapper $out/share/ed-odyssey-materials-helper/bin/Elite\ Dangerous\ Odyssey\ Materials\ Helper $out/bin/ed-odyssey-materials-helper \ + --run 'mkdir -p ~/.config/odyssey-materials-helper/ && cd ~/.config/odyssey-materials-helper/' \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libXxf86vm + glib + libXtst + libglvnd + ] + } "''${gappsWrapperArgs[@]}" + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ed-odyssey-materials-helper"; + type = "Application"; + desktopName = "Elite Dangerous Odyssey Materials Helper"; + comment = "Helper for managing materials in Elite Dangerous Odyssey"; + icon = "ed-odyssey-materials-helper"; + exec = "ed-odyssey-materials-helper %u"; + categories = [ "Game" ]; + mimeTypes = [ "x-scheme-handler/edomh" ]; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Helper for managing materials in Elite Dangerous Odyssey"; + homepage = "https://github.com/jixxed/ed-odyssey-materials-helper"; + downloadPage = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}"; + changelog = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; + maintainers = with lib.maintainers; [ + elfenermarcell + toasteruwu + ]; + mainProgram = "ed-odyssey-materials-helper"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch b/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch new file mode 100644 index 000000000000..f2afddaeb1eb --- /dev/null +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch @@ -0,0 +1,42 @@ +diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java +index a38ae02d..1c164911 100644 +--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java ++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java +@@ -112,7 +112,6 @@ public class FXApplication extends Application { + } + PreferencesService.setPreference(PreferenceConstants.APP_SETTINGS_VERSION, System.getProperty("app.version")); + whatsnewPopup(); +- urlSchemePopup(); + eddnPopup(); + versionPopup(); + MaterialTrackingService.initialize(); +diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java +index 6ac788ea..a5281983 100644 +--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java ++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java +@@ -62,11 +62,7 @@ public class UbuntuRegistrationHandler implements RegistrationHandler { + + @Override + public boolean isRegistered() { +- if (!IS_JAVA) { +- final File file = new File(System.getProperty(USER_HOME) + DESKTOP_FILE_PATH); +- return file.exists() && file.isFile(); +- } +- return false; ++ return true; + } + + +diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java +index 3b00de60..78d6afd7 100644 +--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java ++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java +@@ -99,7 +99,7 @@ public class General extends VBox implements Template { + final HBox supportPackageSetting = createSupportPackageSetting(); + final HBox wipSetting = createWIPSetting(); + this.getStyleClass().addAll("settingsblock", SETTINGS_SPACING_10_CLASS); +- this.getChildren().addAll(generalLabel, langSetting, fontSetting, customJournalFolderSetting, pollSetting, urlSchemeLinkingSetting, exportInventory, blueprintExpandedSetting, importFromClipboardSetting,importSlefFromClipboardSetting,supportPackageSetting); ++ this.getChildren().addAll(generalLabel, langSetting, fontSetting, customJournalFolderSetting, pollSetting, exportInventory, blueprintExpandedSetting, importFromClipboardSetting,importSlefFromClipboardSetting,supportPackageSetting); + } + + @Override diff --git a/pkgs/by-name/ed/ed/package.nix b/pkgs/by-name/ed/ed/package.nix index 8f225e715437..334b5ddc35a1 100644 --- a/pkgs/by-name/ed/ed/package.nix +++ b/pkgs/by-name/ed/ed/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ed"; - version = "1.21"; + version = "1.21.1"; src = fetchurl { url = "mirror://gnu/ed/ed-${finalAttrs.version}.tar.lz"; - hash = "sha256-YOJJmHJ9RTpc8CxUZkuXU23kais0zR9PZ8HBphu7rXU="; + hash = "sha256-1tDHGSsCsFGckCqTcZBT6GWt5aeEo7Mn2T2IhFeyPEs="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/by-name/ed/edac-utils/package.nix b/pkgs/by-name/ed/edac-utils/package.nix index ce70e919732f..233871149f09 100644 --- a/pkgs/by-name/ed/edac-utils/package.nix +++ b/pkgs/by-name/ed/edac-utils/package.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/grondo/edac-utils"; description = "Handles the reporting of hardware-related memory errors"; + mainProgram = "edac-util"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/ed/edbrowse/0001-small-fixes.patch b/pkgs/by-name/ed/edbrowse/0001-small-fixes.patch deleted file mode 100644 index 433b884cc5de..000000000000 --- a/pkgs/by-name/ed/edbrowse/0001-small-fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur source.old/src/makefile source/src/makefile ---- source.old/src/makefile 1969-12-31 21:00:01.000000000 -0300 -+++ source/src/makefile 2021-06-07 18:58:48.851231787 -0300 -@@ -101,14 +101,14 @@ - - # need packages nodejs and libnode-dev - js_hello_v8 : js_hello_v8.cpp -- g++ -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8 -+ $(CXX) -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8 - - HELLOEXTRA = stringfile.o messages.o msg-strings.o startwindow.o ebrc.o format.o http.o isup.o fetchmail.o sendmail.o plugin.o buffers.o dbstubs.o html.o decorate.o html-tidy.o css.o - js_hello_moz : js_hello_moz.o $(HELLOEXTRA) jseng-moz.o - $(CC) js_hello_moz.o $(HELLOEXTRA) jseng-moz.o $(LDFLAGS) -lmozjs-$(SMV) -lstdc++ -o $@ - - js_hello_quick : js_hello_quick.c -- gcc $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick -L/usr/local/lib/quickjs -lquickjs -lm -ldl -lpthread -latomic -+ $(CC) $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick $(QUICKJS_LDFLAGS) -lm -lpthread - - hello: js_hello_duk js_hello_v8 js_hello_moz js_hello_quick - diff --git a/pkgs/by-name/ed/edbrowse/package.nix b/pkgs/by-name/ed/edbrowse/package.nix deleted file mode 100644 index a2bd5f4847c1..000000000000 --- a/pkgs/by-name/ed/edbrowse/package.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ - lib, - curl, - duktape, - fetchFromGitHub, - html-tidy, - openssl, - pcre, - perl, - pkg-config, - quickjs, - readline, - stdenv, - unixODBC, - which, - withODBC ? true, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "edbrowse"; - version = "3.8.0"; - - src = fetchFromGitHub { - owner = "CMB"; - repo = "edbrowse"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU="; - }; - - sourceRoot = "${finalAttrs.src.name}/src"; - - patches = [ - # Fixes some small annoyances on src/makefile - ./0001-small-fixes.patch - ]; - - patchFlags = [ - "-p2" - ]; - - postPatch = '' - for file in $(find ./tools/ -type f ! -name '*.c'); do - patchShebangs $file - done - ''; - - nativeBuildInputs = [ - pkg-config - which - ]; - - buildInputs = - [ - curl - duktape - html-tidy - openssl - pcre - perl - quickjs - readline - ] - ++ lib.optionals withODBC [ - unixODBC - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - preBuild = '' - buildFlagsArray+=( - BUILD_EDBR_ODBC=${if withODBC then "on" else "off"} - EBDEMIN=on - QUICKJS_LDFLAGS="-L${quickjs}/lib/quickjs -lquickjs -ldl -latomic" - ) - ''; - - meta = { - homepage = "https://edbrowse.org/"; - description = "Command Line Editor Browser"; - longDescription = '' - Edbrowse is a combination editor, browser, and mail client that is 100% - text based. The interface is similar to /bin/ed, though there are many - more features, such as editing multiple files simultaneously, and - rendering html. This program was originally written for blind users, but - many sighted users have taken advantage of the unique scripting - capabilities of this program, which can be found nowhere else. A batch - job, or cron job, can access web pages on the internet, submit forms, and - send email, with no human intervention whatsoever. edbrowse can also tap - into databases through odbc. It was primarily written by Karl Dahlke. - ''; - license = with lib.licenses; [ gpl1Plus ]; - mainProgram = "edbrowse"; - maintainers = with lib.maintainers; [ - schmitthenner - equirosa - ]; - platforms = lib.platforms.linux; - }; -}) -# TODO: send the patch to upstream developers diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 95e31de10e53..eb0a3e823440 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "edencommon"; - version = "2025.02.10.00"; + version = "2025.04.21.00"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookexperimental"; repo = "edencommon"; tag = "v${finalAttrs.version}"; - hash = "sha256-wY6HEIQZdyyglXADxq9zaCrRCneqQEBs+EqoY3mNY3E="; + hash = "sha256-WlLQb4O4rGhXp+bQrJA12CvrwcIS6vzO4W6bX04vKMM="; }; patches = diff --git a/pkgs/by-name/ed/edge-runtime/Cargo.lock b/pkgs/by-name/ed/edge-runtime/Cargo.lock deleted file mode 100644 index 81cc2d19a003..000000000000 --- a/pkgs/by-name/ed/edge-runtime/Cargo.lock +++ /dev/null @@ -1,7571 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aead-gcm-stream" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a09ecb526d53de2842cc876ee5c9b51161ee60399edeca4cf74892a01b48177" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "aes" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aes-gcm" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "aes-kw" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" -dependencies = [ - "aes", -] - -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[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.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" - -[[package]] -name = "approx" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -dependencies = [ - "serde", -] - -[[package]] -name = "ash" -version = "0.37.3+1.3.251" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" -dependencies = [ - "libloading 0.7.4", -] - -[[package]] -name = "asn1-rs" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ast_node" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab31376d309dd3bfc9cfb3c11c93ce0e0741bbe0354b20e7f8c60b044730b79" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "async-compression" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" -dependencies = [ - "brotli 3.4.0", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-trait" -version = "0.1.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "async-tungstenite" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef0f8d64ef9351752fbe5462f242c625d9c4910d2bc3f7ec44c43857ca123f5d" -dependencies = [ - "futures-io", - "futures-util", - "log", - "pin-project-lite", - "tungstenite", -] - -[[package]] -name = "auto_impl" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "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 = "base" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "async-tungstenite", - "base_mem_check", - "base_rt", - "bytes", - "cooked-waker", - "cpu_timer", - "ctor", - "deno_ast", - "deno_broadcast_channel", - "deno_canvas", - "deno_config", - "deno_console", - "deno_core", - "deno_crypto", - "deno_fetch", - "deno_fs", - "deno_http", - "deno_io", - "deno_net", - "deno_npm", - "deno_semver", - "deno_tls", - "deno_url", - "deno_web", - "deno_webgpu", - "deno_webidl", - "deno_websocket", - "enum-as-inner", - "eszip", - "event_worker", - "fastwebsockets", - "flume", - "futures-util", - "http 0.2.11", - "http 1.0.0", - "http-body-util", - "http_utils", - "httparse", - "hyper 0.14.28", - "hyper 1.4.0", - "hyper-util", - "import_map", - "log", - "monch", - "notify", - "once_cell", - "pin-project", - "reqwest 0.11.27", - "rustls-pemfile 2.1.0", - "sb_ai", - "sb_core", - "sb_env", - "sb_fs", - "sb_graph", - "sb_module_loader", - "sb_node", - "sb_npm", - "sb_os", - "sb_workers", - "scopeguard", - "serde", - "serial_test", - "thiserror", - "tls-listener", - "tokio", - "tokio-rustls", - "tokio-util", - "tracing", - "tracing-subscriber", - "tungstenite", - "url", - "urlencoding", - "uuid", -] - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base32" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64-simd" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" -dependencies = [ - "simd-abstraction", -] - -[[package]] -name = "base64-simd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" -dependencies = [ - "outref 0.5.1", - "vsimd", -] - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "base_mem_check" -version = "0.1.0" -dependencies = [ - "deno_core", - "serde", -] - -[[package]] -name = "base_rt" -version = "0.1.0" -dependencies = [ - "cpu_timer", - "deno_core", - "once_cell", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "better_scoped_tls" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de" -dependencies = [ - "scoped-tls", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.5.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.48", - "which 4.4.2", -] - -[[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.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" -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 = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest", -] - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - -[[package]] -name = "brotli" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor 2.5.1", -] - -[[package]] -name = "brotli" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor 4.0.1", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "brotli-decompressor" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" -dependencies = [ - "allocator-api2", -] - -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "bytemuck" -version = "1.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" - -[[package]] -name = "cache_control" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2a5fb3207c12b5d208ebc145f967fea5cac41a021c37417ccc31ba40f39ee" - -[[package]] -name = "cauchy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff11ddd2af3b5e80dd0297fee6e56ac038d9bdc549573cdb51bd6d2efe7f05e" -dependencies = [ - "num-complex", - "num-traits", - "rand", - "serde", -] - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - -[[package]] -name = "cblas-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6feecd82cce51b0204cf063f0041d69f24ce83f680d87514b004248e7b0fa65" -dependencies = [ - "libc", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "chrono" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -dependencies = [ - "iana-time-zone", - "num-integer", - "num-traits", - "winapi", -] - -[[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.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading 0.8.1", -] - -[[package]] -name = "clap" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.0", -] - -[[package]] -name = "clap_derive" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "cli" -version = "0.1.0" -dependencies = [ - "anyhow", - "base", - "clap", - "deno_core", - "deno_manifest", - "env_logger", - "glob", - "log", - "once_cell", - "sb_graph", - "tokio", - "tracing-subscriber", -] - -[[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 = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "cooked-waker" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "cpu_timer" -version = "0.1.0" -dependencies = [ - "anyhow", - "ctor", - "futures", - "libc", - "log", - "nix", - "once_cell", - "signal-hook", - "signal-hook-tokio", - "tokio", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "rand_core", - "typenum", -] - -[[package]] -name = "ctor" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" -dependencies = [ - "quote", - "syn 2.0.48", -] - -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "fiat-crypto", - "rustc_version 0.4.0", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "d3d12" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" -dependencies = [ - "bitflags 2.5.0", - "libloading 0.7.4", - "winapi", -] - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.3", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "data-url" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "serde", - "uuid", -] - -[[package]] -name = "deno_ast" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d08372522975cce97fe0efbe42fea508c76eea4421619de6d63baae32792f7d" -dependencies = [ - "anyhow", - "base64 0.21.7", - "deno_media_type", - "deno_terminal", - "dprint-swc-ext", - "once_cell", - "percent-encoding", - "serde", - "swc_atoms", - "swc_bundler", - "swc_common", - "swc_config", - "swc_config_macro", - "swc_ecma_ast", - "swc_ecma_codegen", - "swc_ecma_codegen_macros", - "swc_ecma_loader", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_classes", - "swc_ecma_transforms_macros", - "swc_ecma_transforms_optimization", - "swc_ecma_transforms_proposal", - "swc_ecma_transforms_react", - "swc_ecma_transforms_typescript", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_eq_ignore_macros", - "swc_graph_analyzer", - "swc_macros_common", - "swc_visit", - "swc_visit_macros", - "text_lines", - "thiserror", - "unicode-width", - "url", -] - -[[package]] -name = "deno_broadcast_channel" -version = "0.155.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a8223f6388db2c68b230ea086fee749aa952d307715c5944cfc0cb11cedd5c4" -dependencies = [ - "async-trait", - "deno_core", - "tokio", - "uuid", -] - -[[package]] -name = "deno_cache_dir" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4036ac8ce97244e2a66df7b97412592acaf14671900460d28415703ad790cd70" -dependencies = [ - "deno_media_type", - "indexmap", - "log", - "once_cell", - "parking_lot", - "serde", - "serde_json", - "sha2", - "thiserror", - "url", -] - -[[package]] -name = "deno_canvas" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f71b024dd1f4a0eacfea9d4d3188b428917ae1631065e5514edb36ae06470b" -dependencies = [ - "deno_core", - "deno_webgpu", - "image", - "serde", -] - -[[package]] -name = "deno_config" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83df0c14d89f4e6e7ff91bfea0b4d5a0a33b4385c517ff4d8b4236d9834561e3" -dependencies = [ - "anyhow", - "deno_semver", - "glob", - "ignore", - "import_map", - "indexmap", - "jsonc-parser", - "log", - "percent-encoding", - "serde", - "serde_json", - "thiserror", - "url", -] - -[[package]] -name = "deno_console" -version = "0.161.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0b421bb2eec447386a4fe42991c041cf33524af78e1921dc29d7bc0fba47cd" -dependencies = [ - "deno_core", -] - -[[package]] -name = "deno_core" -version = "0.293.0" -source = "git+https://github.com/supabase/deno_core?branch=293-supabase#d73dc1e1845d00cc2e8d2a32caf5859cc300386b" -dependencies = [ - "anyhow", - "bincode", - "bit-set", - "bit-vec", - "bytes", - "cooked-waker", - "deno_core_icudata", - "deno_ops", - "deno_unsync", - "futures", - "libc", - "memoffset 0.9.0", - "parking_lot", - "pin-project", - "serde", - "serde_json", - "serde_v8", - "smallvec", - "sourcemap", - "static_assertions", - "tokio", - "url", - "v8", -] - -[[package]] -name = "deno_core_icudata" -version = "0.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" - -[[package]] -name = "deno_crypto" -version = "0.175.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc07536a030d5cb18c500bc9790cc4676c94fbc71f30daabdc91f68569292b33" -dependencies = [ - "aes", - "aes-gcm", - "aes-kw", - "base64 0.21.7", - "cbc", - "const-oid", - "ctr", - "curve25519-dalek", - "deno_core", - "deno_web", - "elliptic-curve", - "num-traits", - "once_cell", - "p256", - "p384", - "p521", - "rand", - "ring", - "rsa", - "serde", - "serde_bytes", - "sha1", - "sha2", - "signature", - "spki", - "uuid", - "x25519-dalek", -] - -[[package]] -name = "deno_fetch" -version = "0.185.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15df0ad954f034a92af85b55f4a643d965a07781a11fa88b4565d00c59da862" -dependencies = [ - "bytes", - "data-url", - "deno_core", - "deno_permissions", - "deno_tls", - "dyn-clone", - "http 1.0.0", - "reqwest 0.12.4", - "serde", - "serde_json", - "tokio", - "tokio-util", -] - -[[package]] -name = "deno_fs" -version = "0.71.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "036f6e2e83b9aa49a67c05b028db53fd4a9f4cc441e8bf68cf97361158c393d2" -dependencies = [ - "async-trait", - "base32", - "deno_config", - "deno_core", - "deno_io", - "deno_permissions", - "filetime", - "junction", - "libc", - "nix", - "rand", - "rayon", - "serde", - "winapi", -] - -[[package]] -name = "deno_graph" -version = "0.80.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a71a3f1575d0309ac18ca2e7af88d64c15acd2c55d06fef0fbdfd7c69cecb09d" -dependencies = [ - "anyhow", - "async-trait", - "data-url", - "deno_ast", - "deno_semver", - "deno_unsync", - "encoding_rs", - "futures", - "import_map", - "indexmap", - "log", - "monch", - "once_cell", - "parking_lot", - "regex", - "serde", - "serde_json", - "sha2", - "thiserror", - "twox-hash", - "url", -] - -[[package]] -name = "deno_http" -version = "0.159.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caba6f6797da2610899b4b6061eabea3b3444f763e3933d3b15e0efc43c2bf09" -dependencies = [ - "async-compression", - "async-trait", - "base64 0.21.7", - "brotli 6.0.0", - "bytes", - "cache_control", - "deno_core", - "deno_net", - "deno_websocket", - "flate2", - "http 0.2.11", - "http 1.0.0", - "httparse", - "hyper 0.14.28", - "hyper 1.4.0", - "hyper-util", - "itertools 0.10.5", - "memmem", - "mime", - "once_cell", - "percent-encoding", - "phf", - "pin-project", - "ring", - "scopeguard", - "serde", - "smallvec", - "thiserror", - "tokio", - "tokio-util", -] - -[[package]] -name = "deno_io" -version = "0.71.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6afcfc02687c9020b2e69e0a5df445cb88e564af1932ab8b988cd1326622b0" -dependencies = [ - "async-trait", - "deno_core", - "filetime", - "fs3", - "log", - "once_cell", - "os_pipe", - "parking_lot", - "rand", - "tokio", - "winapi", -] - -[[package]] -name = "deno_lockfile" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23120f905aec2deed858820113e089551025b74e261c5c404812cd8e61421379" -dependencies = [ - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "deno_manifest" -version = "1.45.2" - -[[package]] -name = "deno_media_type" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8978229b82552bf8457a0125aa20863f023619cfc21ebb007b1e571d68fd85b" -dependencies = [ - "data-url", - "serde", - "url", -] - -[[package]] -name = "deno_native_certs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c867603d2a5dfea31f55cecebb572554caa395437786d058faa9a2814c8d6eb9" -dependencies = [ - "dlopen2", - "dlopen2_derive", - "once_cell", - "rustls-native-certs", - "rustls-pemfile 2.1.0", -] - -[[package]] -name = "deno_net" -version = "0.153.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb0cacb064d3f0d1437849f69e637168a67a82686c698a14cb3bb6bccc4b3acc" -dependencies = [ - "deno_core", - "deno_permissions", - "deno_tls", - "pin-project", - "rustls-tokio-stream", - "serde", - "socket2", - "tokio", - "trust-dns-proto", - "trust-dns-resolver", -] - -[[package]] -name = "deno_npm" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9812c781ff6b2e0e45c32ccba9983bce84ecccf6f6a7006b750f8c5c9ac15e30" -dependencies = [ - "anyhow", - "async-trait", - "deno_lockfile", - "deno_semver", - "futures", - "log", - "monch", - "serde", - "serde_json", - "thiserror", - "url", -] - -[[package]] -name = "deno_ops" -version = "0.169.0" -source = "git+https://github.com/supabase/deno_core?branch=293-supabase#d73dc1e1845d00cc2e8d2a32caf5859cc300386b" -dependencies = [ - "proc-macro-rules", - "proc-macro2", - "quote", - "strum", - "strum_macros", - "syn 2.0.48", - "thiserror", -] - -[[package]] -name = "deno_permissions" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc3b97920e075fdeb4417257dbe31c1a325fbc25d096efc64ecc2aecde60ebc5" -dependencies = [ - "deno_core", - "deno_terminal", - "fqdn", - "libc", - "log", - "once_cell", - "serde", - "which 4.4.2", - "winapi", -] - -[[package]] -name = "deno_semver" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389b5a8c2dd48cc1aad25396c92d7461ddb0fcfae1faf8e00205837c53e34d3e" -dependencies = [ - "monch", - "once_cell", - "serde", - "thiserror", - "url", -] - -[[package]] -name = "deno_terminal" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e6337d4e7f375f8b986409a76fbeecfa4bd8a1343e63355729ae4befa058eaf" -dependencies = [ - "once_cell", - "termcolor", -] - -[[package]] -name = "deno_tls" -version = "0.148.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e626f980b723bc74a0eb3a22f18413558acb8c51696e547d2d5298dcd737e37" -dependencies = [ - "deno_core", - "deno_native_certs", - "rustls", - "rustls-pemfile 2.1.0", - "rustls-tokio-stream", - "rustls-webpki", - "serde", - "tokio", - "webpki-roots", -] - -[[package]] -name = "deno_unsync" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c8b95582c2023dbb66fccc37421b374026f5915fa507d437cb566904db9a3a" -dependencies = [ - "parking_lot", - "tokio", -] - -[[package]] -name = "deno_url" -version = "0.161.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74828afdcfe1187b461b6252fc39755b39bbbb42807a1e6b8389ca25dc141e7" -dependencies = [ - "deno_core", - "urlpattern", -] - -[[package]] -name = "deno_web" -version = "0.192.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55843318b0acd067c19163ca7b2bb664c0dc589feb864163c40411f58939163b" -dependencies = [ - "async-trait", - "base64-simd 0.8.0", - "bytes", - "deno_core", - "deno_permissions", - "encoding_rs", - "flate2", - "futures", - "serde", - "tokio", - "uuid", -] - -[[package]] -name = "deno_webgpu" -version = "0.128.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f1def3eb60c9dbcf332004b0355ed52b58eb5339281d4a8f6331092f474a91" -dependencies = [ - "deno_core", - "raw-window-handle", - "serde", - "tokio", - "wgpu-core", - "wgpu-types", -] - -[[package]] -name = "deno_webidl" -version = "0.161.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641de0ee315e2c3b6772c38db90a3620bef50a135d968be226a6bfd2c4606b92" -dependencies = [ - "deno_core", -] - -[[package]] -name = "deno_websocket" -version = "0.166.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f263597b92019c6e5af4022df2ebb7dfb42fdd7e559692b5db871d43b62f8648" -dependencies = [ - "bytes", - "deno_core", - "deno_net", - "deno_permissions", - "deno_tls", - "fastwebsockets", - "h2 0.4.4", - "http 1.0.0", - "http-body-util", - "hyper 1.4.0", - "hyper-util", - "once_cell", - "rustls-tokio-stream", - "serde", - "tokio", -] - -[[package]] -name = "deno_webstorage" -version = "0.156.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c013c656fa1cbc648061bfadea5a86515980af01cd34105b855d42b8cdd93f" -dependencies = [ - "deno_core", - "deno_web", - "rusqlite", -] - -[[package]] -name = "deno_whoami" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75e4caa92b98a27f09c671d1399aee0f5970aa491b9a598523aac000a2192e3" -dependencies = [ - "libc", - "whoami", -] - -[[package]] -name = "der" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "8.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "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", - "const-oid", - "crypto-common", - "subtle", -] - -[[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.48", -] - -[[package]] -name = "dlopen2" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc2c7ed06fd72a8513ded8d0d2f6fd2655a85d6885c48cae8625d80faf28c03" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi", -] - -[[package]] -name = "dlopen2_derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "document-features" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" -dependencies = [ - "litrs", -] - -[[package]] -name = "dprint-swc-ext" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0d5b63e52434314e3d767c463b1f68c467c31e61d279bc019227016c44e535" -dependencies = [ - "allocator-api2", - "bumpalo", - "num-bigint", - "rustc-hash", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "text_lines", -] - -[[package]] -name = "dsa" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689" -dependencies = [ - "digest", - "num-bigint-dig", - "num-traits", - "pkcs8", - "rfc6979", - "sha2", - "signature", - "zeroize", -] - -[[package]] -name = "dyn-clone" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" - -[[package]] -name = "ecb" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7" -dependencies = [ - "cipher", -] - -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-as-inner" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.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 = "esaxx-rs" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" - -[[package]] -name = "eszip" -version = "0.72.2" -source = "git+https://github.com/supabase/eszip?branch=fix-pub-vis-0-72-2#9d2464034288048fabe7a681e7961fcc63799273" -dependencies = [ - "anyhow", - "base64 0.21.7", - "deno_ast", - "deno_graph", - "deno_npm", - "deno_semver", - "futures", - "hashlink", - "serde", - "serde_json", - "sha2", - "thiserror", - "url", - "xxhash-rust", -] - -[[package]] -name = "event_worker" -version = "0.1.0" -dependencies = [ - "anyhow", - "base_mem_check", - "deno_core", - "log", - "serde", - "tokio", - "uuid", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "faster-hex" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" -dependencies = [ - "serde", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fastwebsockets" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63dd7b57f9b33b1741fa631c9522eb35d43e96dcca4a6a91d5e4ca7c93acdc1" -dependencies = [ - "base64 0.21.7", - "http-body-util", - "hyper 1.4.0", - "hyper-util", - "pin-project", - "rand", - "sha1", - "simdutf8", - "thiserror", - "tokio", - "utf-8", -] - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "rand_core", - "subtle", -] - -[[package]] -name = "fiat-crypto" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "windows-sys 0.52.0", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -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.48", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fqdn" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08b1eaa7dfddeab6036292995620bf0435712e619db6d7690605897e76975eb0" - -[[package]] -name = "from_variant" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc9cc75639b041067353b9bce2450d6847e547276c6fbe4487d7407980e07db" -dependencies = [ - "proc-macro2", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "fs3" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb17cf6ed704f72485332f6ab65257460c4f9f3083934cf402bf9f5b3b600a90" -dependencies = [ - "libc", - "rustc_version 0.2.3", - "winapi", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "fslock" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "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", - "zeroize", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "ghash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", -] - -[[package]] -name = "glow" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.5.0", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "gpu-descriptor" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" -dependencies = [ - "bitflags 2.5.0", - "gpu-descriptor-types", - "hashbrown 0.14.3", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff", - "rand_core", - "subtle", -] - -[[package]] -name = "gzip-header" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95cc527b92e6029a62960ad99aa8a6660faa4555fe5f731aab13aa6a921795a2" -dependencies = [ - "crc32fast", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.11", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 1.0.0", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "halfbrown" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5681137554ddff44396e5f149892c769d45301dd9aa19c51602a89ee214cb0ec" -dependencies = [ - "hashbrown 0.13.2", - "serde", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.8", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash 0.8.8", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.3", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "hstr" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96274be293b8877e61974a607105d09c84caebe9620b47774aa8a6b942042dd4" -dependencies = [ - "hashbrown 0.14.3", - "new_debug_unreachable", - "once_cell", - "phf", - "rustc-hash", - "triomphe", -] - -[[package]] -name = "http" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.11", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http 1.0.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" -dependencies = [ - "bytes", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "pin-project-lite", -] - -[[package]] -name = "http_utils" -version = "0.1.0" -dependencies = [ - "bytes", - "futures-util", - "http 0.2.11", - "hyper 0.14.28", - "tokio", - "tokio-util", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.11", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2 0.4.4", - "http 1.0.0", - "http-body 1.0.0", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" -dependencies = [ - "futures-util", - "http 1.0.0", - "hyper 1.4.0", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper 0.14.28", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "hyper-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "hyper 1.4.0", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.5", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-traits", - "png", -] - -[[package]] -name = "import_map" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b8288ad259df0d1314e3e8b2fff0e5e63f22e01bc54ecd2c3c7ad77b9200c" -dependencies = [ - "indexmap", - "log", - "percent-encoding", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "indexmap" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", - "serde", -] - -[[package]] -name = "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 = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "block-padding", - "generic-array", -] - -[[package]] -name = "ipconfig" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" -dependencies = [ - "socket2", - "widestring", - "windows-sys 0.48.0", - "winreg 0.50.0", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "ipnetwork" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" -dependencies = [ - "serde", -] - -[[package]] -name = "is-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" -dependencies = [ - "Inflector", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "jsonc-parser" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7725c320caac8c21d8228c1d055af27a995d371f78cc763073d3e068323641b5" -dependencies = [ - "serde_json", -] - -[[package]] -name = "junction" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be39922b087cecaba4e2d5592dedfc8bda5d4a5a1231f143337cca207950b61d" -dependencies = [ - "scopeguard", - "winapi", -] - -[[package]] -name = "k256" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" -dependencies = [ - "cfg-if", - "ecdsa", - "elliptic-curve", - "once_cell", - "sha2", - "signature", -] - -[[package]] -name = "keccak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" -dependencies = [ - "cpufeatures", -] - -[[package]] -name = "khronos-egl" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" -dependencies = [ - "libc", - "libloading 0.8.1", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "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 = "lapack" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7f0050af10913bc5e4f6091df38870cb5d4e45094d3dd551c1aff9d1d59b26" -dependencies = [ - "lapack-sys", - "libc", - "num-complex", -] - -[[package]] -name = "lapack-sys" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d3a8a9f07310243de6c6226f039f14bce8d2f4c96b5d30ddbcfa31eb4e94ad" -dependencies = [ - "libc", -] - -[[package]] -name = "lax" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd3ec1cacffe7a44aee66f9e85d87e3ac69b472b546449884bd1fc1ca8ab359" -dependencies = [ - "cauchy", - "lapack", - "num-traits", - "thiserror", -] - -[[package]] -name = "lazy-regex" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c" -dependencies = [ - "lazy-regex-proc_macros", - "once_cell", - "regex", -] - -[[package]] -name = "lazy-regex-proc_macros" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 2.0.48", -] - -[[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 = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lexical-core" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0885f6cdfe75c96e45bbf1c4e49511f128201391ce3b56e60e29f5a1fadbc1c1" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924f7ec090cd4f60bd873f160b0fb69a0c80bb3a98f2e778a1893ae0e5c4b0b9" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8feab1da84a2ab0ddbbad2fb1830b755f71a9a8d996c7a1f2a553faf72aa3686" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "591ce1a12ecd3b26d4121ab360a6a4483a67f05a5372add6acbfd0b65c9285d9" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b0f3f9ddada5942b54e97654d535df37c9340ad66c24b50360a90619779f41" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c6d47254ddb292771dce7697ae2be9619f8e369d01a9ccda15ef2ff50443fc" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libsqlite3-sys" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "litrs" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "macro_rules_attribute" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" -dependencies = [ - "macro_rules_attribute-proc_macro", - "paste", -] - -[[package]] -name = "macro_rules_attribute-proc_macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matrixmultiply" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" -dependencies = [ - "autocfg", - "rawpointer", -] - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - -[[package]] -name = "md4" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda" -dependencies = [ - "digest", -] - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memmem" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" -dependencies = [ - "bitflags 2.5.0", - "block", - "core-graphics-types", - "foreign-types 0.5.0", - "log", - "objc", - "paste", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "monch" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c1b33ff98142aecea13138bd399b68aa7ab5d9546c300988c345004001eea" - -[[package]] -name = "monostate" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878c2a1f1c70e5724fa28f101ca787b6a7e8ad5c5e4ae4ca3b0fa4a419fa9075" -dependencies = [ - "monostate-impl", - "serde", -] - -[[package]] -name = "monostate-impl" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f686d68a09079e63b1d2c64aa305095887ce50565f00a922ebfaeeee0d9ba6ce" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "naga" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" -dependencies = [ - "arrayvec", - "bit-set", - "bitflags 2.5.0", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "rustc-hash", - "serde", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndarray" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" -dependencies = [ - "approx", - "cblas-sys", - "libc", - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", -] - -[[package]] -name = "ndarray-linalg" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f87ff36428f228c6056204d0f5cb8c5165f0db0a065429faace3edbc2718f1f" -dependencies = [ - "cauchy", - "lax", - "ndarray", - "num-complex", - "num-traits", - "rand", - "thiserror", -] - -[[package]] -name = "ndk-sys" -version = "0.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "notify" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2c66da08abae1c024c01d635253e402341b4060a12e99b31c7594063bf490a" -dependencies = [ - "bitflags 1.3.2", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "mio", - "walkdir", - "winapi", -] - -[[package]] -name = "npm_cache" -version = "0.1.0" -dependencies = [ - "anyhow", - "deno_ast", - "deno_cache_dir", - "deno_core", - "deno_graph", - "deno_web", - "log", - "sb_core", - "sb_npm", - "tokio", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", - "rand", - "serde", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand", - "serde", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-complex" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" -dependencies = [ - "num-traits", - "rand", - "serde", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", - "libm", -] - -[[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" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "oid-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" -dependencies = [ - "asn1-rs", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[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 = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ort" -version = "2.0.0-rc.2" -source = "git+https://github.com/pykeio/ort#467d127c5877b099e1d0f605d38b74d221b6121c" -dependencies = [ - "half", - "js-sys", - "libloading 0.8.1", - "ndarray", - "ort-sys", - "thiserror", - "tracing", - "web-sys", -] - -[[package]] -name = "ort-sys" -version = "2.0.0-rc.2" -source = "git+https://github.com/pykeio/ort#467d127c5877b099e1d0f605d38b74d221b6121c" - -[[package]] -name = "os_pipe" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "outref" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" - -[[package]] -name = "outref" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "p224" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c06436d66652bc2f01ade021592c80a2aad401570a18aa18b82e440d2b9aa1" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p256" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p521" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" -dependencies = [ - "base16ct", - "ecdsa", - "elliptic-curve", - "primeorder", - "rand_core", - "sha2", -] - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "password-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "path-clean" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "png" -version = "0.17.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polyval" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "prettyplease" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" -dependencies = [ - "proc-macro2", - "syn 2.0.48", -] - -[[package]] -name = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve", -] - -[[package]] -name = "proc-macro-rules" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" -dependencies = [ - "proc-macro-rules-macros", - "proc-macro2", - "syn 2.0.48", -] - -[[package]] -name = "proc-macro-rules-macros" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "207fffb0fe655d1d47f6af98cc2793405e85929bdbc420d685554ff07be27ac7" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "proc-macro2" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" - -[[package]] -name = "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-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "radix_fmt" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - -[[package]] -name = "raw-window-handle" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" - -[[package]] -name = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[package]] -name = "rayon" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-cond" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" -dependencies = [ - "either", - "itertools 0.11.0", - "rayon", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "ref-cast" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "relative-path" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" - -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.11", - "http-body 0.4.6", - "hyper 0.14.28", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "winreg 0.50.0", -] - -[[package]] -name = "reqwest" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" -dependencies = [ - "async-compression", - "base64 0.22.1", - "bytes", - "futures-core", - "futures-util", - "h2 0.4.4", - "http 1.0.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.4.0", - "hyper-rustls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile 2.1.0", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tokio-socks", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "winreg 0.52.0", -] - -[[package]] -name = "resolv-conf" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" -dependencies = [ - "hostname", - "quick-error", -] - -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - -[[package]] -name = "ring" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" -dependencies = [ - "cc", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted", - "windows-sys 0.48.0", -] - -[[package]] -name = "ripemd" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" -dependencies = [ - "digest", -] - -[[package]] -name = "rkyv" -version = "0.7.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" -dependencies = [ - "bitvec", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.5.0", - "serde", - "serde_derive", -] - -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rusqlite" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" -dependencies = [ - "bitflags 2.5.0", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[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.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.21", -] - -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.5.0", - "errno 0.3.8", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.0", - "rustls-pki-types", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" -dependencies = [ - "base64 0.21.7", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" - -[[package]] -name = "rustls-tokio-stream" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c478c030dfd68498e6c59168d9eec4f8bead33152a5f3095ad4bdbdcea09d466" -dependencies = [ - "futures", - "rustls", - "socket2", - "tokio", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "ryu-js" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950d85bc52415f8432144c97c4791bd0c4f7954de32a7270ee9cccd3c22b12b" - -[[package]] -name = "salsa20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "sb_ai" -version = "0.1.0" -dependencies = [ - "anyhow", - "base_rt", - "clap", - "convert_case 0.6.0", - "ctor", - "deno_core", - "faster-hex", - "futures", - "futures-util", - "fxhash", - "log", - "ndarray", - "ndarray-linalg", - "once_cell", - "ort", - "rand", - "reqwest 0.12.4", - "scopeguard", - "serde", - "tokenizers", - "tokio", - "tokio-util", - "tracing", - "tracing-subscriber", - "xxhash-rust", -] - -[[package]] -name = "sb_core" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "base64 0.21.7", - "base_mem_check", - "base_rt", - "bytes", - "cache_control", - "chrono", - "data-url", - "deno_ast", - "deno_cache_dir", - "deno_core", - "deno_crypto", - "deno_fetch", - "deno_fs", - "deno_graph", - "deno_http", - "deno_io", - "deno_manifest", - "deno_net", - "deno_npm", - "deno_permissions", - "deno_tls", - "deno_web", - "deno_websocket", - "deno_webstorage", - "encoding_rs", - "enum-as-inner", - "faster-hex", - "fs3", - "futures", - "http 1.0.0", - "httparse", - "hyper 0.14.28", - "hyper 1.4.0", - "import_map", - "indexmap", - "libc", - "log", - "memmem", - "once_cell", - "percent-encoding", - "rand", - "ring", - "sb_node", - "scopeguard", - "serde", - "thiserror", - "tokio", - "tokio-util", - "tracing", - "twox-hash", -] - -[[package]] -name = "sb_env" -version = "0.1.0" -dependencies = [ - "deno_core", - "sb_core", - "sb_node", -] - -[[package]] -name = "sb_eszip_shared" -version = "0.1.0" -dependencies = [ - "eszip", -] - -[[package]] -name = "sb_fs" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "deno_ast", - "deno_core", - "deno_fs", - "deno_io", - "deno_npm", - "deno_semver", - "eszip", - "futures", - "import_map", - "indexmap", - "log", - "once_cell", - "rkyv", - "sb_core", - "sb_eszip_shared", - "sb_node", - "sb_npm", - "serde", - "thiserror", - "tokio", - "url", -] - -[[package]] -name = "sb_graph" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "dashmap", - "deno_ast", - "deno_cache_dir", - "deno_config", - "deno_core", - "deno_fs", - "deno_graph", - "deno_lockfile", - "deno_npm", - "deno_semver", - "deno_web", - "enum-as-inner", - "eszip", - "futures", - "glob", - "hashlink", - "import_map", - "log", - "npm_cache", - "once_cell", - "pathdiff", - "rkyv", - "sb_core", - "sb_eszip_shared", - "sb_fs", - "sb_node", - "sb_npm", - "scopeguard", - "serde", - "tempfile", - "thiserror", - "tokio", - "urlencoding", -] - -[[package]] -name = "sb_module_loader" -version = "0.1.0" -dependencies = [ - "anyhow", - "base64 0.21.7", - "deno_ast", - "deno_config", - "deno_core", - "deno_fs", - "deno_npm", - "deno_semver", - "deno_tls", - "eszip", - "futures-util", - "import_map", - "log", - "monch", - "once_cell", - "rkyv", - "sb_core", - "sb_eszip_shared", - "sb_fs", - "sb_graph", - "sb_node", - "sb_npm", - "serde", - "tokio", - "tracing", -] - -[[package]] -name = "sb_node" -version = "0.1.0" -dependencies = [ - "aead-gcm-stream", - "aes", - "async-trait", - "blake2", - "brotli 6.0.0", - "bytes", - "cbc", - "const-oid", - "data-encoding", - "deno_config", - "deno_core", - "deno_fetch", - "deno_fs", - "deno_media_type", - "deno_net", - "deno_whoami", - "digest", - "dsa", - "ecb", - "elliptic-curve", - "errno 0.2.8", - "faster-hex", - "h2 0.4.4", - "hkdf", - "http 0.2.11", - "http 1.0.0", - "idna 0.3.0", - "indexmap", - "ipnetwork", - "k256", - "lazy-regex", - "libc", - "libz-sys", - "md-5", - "md4", - "nix", - "num-bigint", - "num-bigint-dig", - "num-integer", - "num-traits", - "once_cell", - "p224", - "p256", - "p384", - "path-clean", - "pbkdf2", - "pin-project-lite", - "rand", - "regex", - "reqwest 0.12.4", - "ring", - "ripemd", - "rsa", - "scrypt", - "sec1", - "serde", - "sha1", - "sha2", - "sha3", - "signature", - "simd-json", - "sm3", - "spki", - "thiserror", - "tokio", - "url", - "winapi", - "windows-sys 0.48.0", - "x25519-dalek", - "x509-parser", -] - -[[package]] -name = "sb_npm" -version = "0.1.0" -dependencies = [ - "async-trait", - "base32", - "base64 0.21.7", - "bincode", - "deno_ast", - "deno_config", - "deno_core", - "deno_fs", - "deno_graph", - "deno_lockfile", - "deno_npm", - "deno_semver", - "faster-hex", - "flate2", - "hex", - "indexmap", - "log", - "once_cell", - "percent-encoding", - "reqwest 0.12.4", - "ring", - "sb_core", - "sb_node", - "serde", - "tar", - "thiserror", -] - -[[package]] -name = "sb_os" -version = "0.1.0" -dependencies = [ - "deno_core", - "libc", - "sb_core", - "serde", -] - -[[package]] -name = "sb_workers" -version = "0.1.0" -dependencies = [ - "anyhow", - "bytes", - "deno_config", - "deno_core", - "deno_http", - "enum-as-inner", - "event_worker", - "futures-util", - "http_utils", - "hyper 0.14.28", - "log", - "sb_core", - "sb_graph", - "scopeguard", - "serde", - "thiserror", - "tokio", - "tokio-util", - "uuid", -] - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scrypt" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" -dependencies = [ - "password-hash", - "pbkdf2", - "salsa20", - "sha2", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - -[[package]] -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 = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.201" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.201" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "serde_json" -version = "1.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_v8" -version = "0.202.0" -source = "git+https://github.com/supabase/deno_core?branch=293-supabase#d73dc1e1845d00cc2e8d2a32caf5859cc300386b" -dependencies = [ - "num-bigint", - "serde", - "smallvec", - "thiserror", - "v8", -] - -[[package]] -name = "serial_test" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[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 = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest", - "keccak", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook" -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" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "signal-hook-tokio" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213241f76fb1e37e27de3b6aa1b068a2c333233b59cca6634f634b80a27ecf1e" -dependencies = [ - "futures-core", - "libc", - "signal-hook", - "tokio", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "simd-abstraction" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" -dependencies = [ - "outref 0.1.0", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simd-json" -version = "0.13.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0228a564470f81724e30996bbc2b171713b37b15254a6440c7e2d5449b95691" -dependencies = [ - "getrandom", - "halfbrown", - "lexical-core", - "ref-cast", - "serde", - "serde_json", - "simdutf8", - "value-trait", -] - -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - -[[package]] -name = "sm3" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" -dependencies = [ - "digest", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "sourcemap" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208d40b9e8cad9f93613778ea295ed8f3c2b1824217c6cfc7219d3f6f45b96d4" -dependencies = [ - "base64-simd 0.7.0", - "bitvec", - "data-encoding", - "debugid", - "if_chain", - "rustc-hash", - "rustc_version 0.2.3", - "serde", - "serde_json", - "unicode-id-start", - "url", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spirv" -version = "0.3.0+sdk-1.3.268.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "spm_precompiled" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" -dependencies = [ - "base64 0.13.1", - "nom", - "serde", - "unicode-segmentation", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "string_enum" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e383308aebc257e7d7920224fa055c632478d92744eca77f99be8fa1545b90" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strsim" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.48", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "swc_atoms" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6567e4e67485b3e7662b486f1565bdae54bd5b9d6b16b2ba1a9babb1e42125" -dependencies = [ - "hstr", - "once_cell", - "rustc-hash", - "serde", -] - -[[package]] -name = "swc_bundler" -version = "0.230.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c506ddddebb846f8e68780464e2fe1fdc0add4bc265659f713a71015ffcdb13" -dependencies = [ - "anyhow", - "crc", - "indexmap", - "is-macro", - "once_cell", - "parking_lot", - "petgraph", - "radix_fmt", - "relative-path", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_codegen", - "swc_ecma_loader", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_optimization", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_fast_graph", - "swc_graph_analyzer", - "tracing", -] - -[[package]] -name = "swc_cached" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83406221c501860fce9c27444f44125eafe9e598b8b81be7563d7036784cd05c" -dependencies = [ - "ahash 0.8.8", - "anyhow", - "dashmap", - "once_cell", - "regex", - "serde", -] - -[[package]] -name = "swc_common" -version = "0.34.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9087befec6b63911f9d2f239e4f91c9b21589c169b86ed2d616944d23cf4a243" -dependencies = [ - "ast_node", - "better_scoped_tls", - "cfg-if", - "either", - "from_variant", - "new_debug_unreachable", - "num-bigint", - "once_cell", - "rustc-hash", - "serde", - "siphasher", - "sourcemap", - "swc_atoms", - "swc_eq_ignore_macros", - "swc_visit", - "tracing", - "unicode-width", - "url", -] - -[[package]] -name = "swc_config" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b67e115ab136fe0eb03558bb0508ca7782eeb446a96d165508c48617e3fd94" -dependencies = [ - "anyhow", - "indexmap", - "serde", - "serde_json", - "swc_cached", - "swc_config_macro", -] - -[[package]] -name = "swc_config_macro" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5f56139042c1a95b54f5ca48baa0e0172d369bcc9d3d473dad1de36bae8399" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "swc_ecma_ast" -version = "0.115.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be1306930c235435a892104c00c2b5e16231043c085d5a10bd3e7537b15659b" -dependencies = [ - "bitflags 2.5.0", - "is-macro", - "num-bigint", - "phf", - "scoped-tls", - "serde", - "string_enum", - "swc_atoms", - "swc_common", - "unicode-id-start", -] - -[[package]] -name = "swc_ecma_codegen" -version = "0.151.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5141a8cb4eb69e090e6aea5d49061b46919be5210f3d084f9d9ad63d30f5cff" -dependencies = [ - "memchr", - "num-bigint", - "once_cell", - "rustc-hash", - "serde", - "sourcemap", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_codegen_macros", - "tracing", -] - -[[package]] -name = "swc_ecma_codegen_macros" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090e409af49c8d1a3c13b3aab1ed09dd4eda982207eb3e63c2ad342f072b49c8" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "swc_ecma_loader" -version = "0.46.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9febebf047d1286e7b723fa2758f3229da2c103834f3eaee69833f46692612" -dependencies = [ - "anyhow", - "pathdiff", - "serde", - "swc_atoms", - "swc_common", - "tracing", -] - -[[package]] -name = "swc_ecma_parser" -version = "0.146.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e0c2e85f12c63b85c805e923079b04d1fb3e25edd069d638eed5f2098de74" -dependencies = [ - "either", - "new_debug_unreachable", - "num-bigint", - "num-traits", - "phf", - "serde", - "smallvec", - "smartstring", - "stacker", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "tracing", - "typed-arena", -] - -[[package]] -name = "swc_ecma_transforms_base" -version = "0.140.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37dc505c92af56d0f77cf6f31a6ccd37ac40cad1e01ff77277e0b1c70e8f8ff" -dependencies = [ - "better_scoped_tls", - "bitflags 2.5.0", - "indexmap", - "once_cell", - "phf", - "rustc-hash", - "serde", - "smallvec", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_utils", - "swc_ecma_visit", - "tracing", -] - -[[package]] -name = "swc_ecma_transforms_classes" -version = "0.129.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3eab5f8179e5b0aedf385eacc2c033691c6d211a7babd1bbbff12cf794a824e" -dependencies = [ - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_transforms_macros" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500a1dadad1e0e41e417d633b3d6d5de677c9e0d3159b94ba3348436cdb15aab" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "swc_ecma_transforms_optimization" -version = "0.201.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "724a8306e98c1b1f9640fc44c1acc0c971f6daa17651919e06b64f905d4a4564" -dependencies = [ - "dashmap", - "indexmap", - "once_cell", - "petgraph", - "rustc-hash", - "serde_json", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_macros", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_fast_graph", - "tracing", -] - -[[package]] -name = "swc_ecma_transforms_proposal" -version = "0.174.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df8aa6752cc2fcf3d78ac67827542fb666e52283f2b26802aa058906bb750d3" -dependencies = [ - "either", - "rustc-hash", - "serde", - "smallvec", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_transforms_classes", - "swc_ecma_transforms_macros", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_transforms_react" -version = "0.186.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446da32cac8299973aaf1d37496562bfd0c1e4f3c3ab5d0af6f07f42e8184102" -dependencies = [ - "base64 0.21.7", - "dashmap", - "indexmap", - "once_cell", - "serde", - "sha1", - "string_enum", - "swc_atoms", - "swc_common", - "swc_config", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_macros", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_transforms_typescript" -version = "0.191.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1ce8af2865449e714ae56dacb6b54b3f6dc4cc25074da4e39b878bd93c5e39c" -dependencies = [ - "ryu-js", - "serde", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_transforms_react", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_utils" -version = "0.130.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e62b199454a576c5fdbd7e1bef8ab88a395427456d8a713d994b7d469833aa" -dependencies = [ - "indexmap", - "num_cpus", - "once_cell", - "rustc-hash", - "ryu-js", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_visit", - "tracing", - "unicode-id", -] - -[[package]] -name = "swc_ecma_visit" -version = "0.101.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0d997f0c9b4e181225f603d161f6757c2a97022258170982cfe005ec69ec92" -dependencies = [ - "num-bigint", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_visit", - "tracing", -] - -[[package]] -name = "swc_eq_ignore_macros" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "swc_fast_graph" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf5c1687e9858fb9de1ffa90a3e21369095406e97ace870a389320d105b0a" -dependencies = [ - "indexmap", - "petgraph", - "rustc-hash", - "swc_common", -] - -[[package]] -name = "swc_graph_analyzer" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a928a2ad8897fb78c38898ba342960863e9937b7a3de2d010d3204d85ce1b72a" -dependencies = [ - "auto_impl", - "petgraph", - "swc_common", - "swc_fast_graph", - "tracing", -] - -[[package]] -name = "swc_macros_common" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91745f3561057493d2da768437c427c0e979dff7396507ae02f16c981c4a8466" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "swc_visit" -version = "0.5.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043d11fe683dcb934583ead49405c0896a5af5face522e4682c16971ef7871b9" -dependencies = [ - "either", - "swc_visit_macros", -] - -[[package]] -name = "swc_visit_macros" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae9ef18ff8daffa999f729db056d2821cd2f790f3a11e46422d19f46bb193e7" -dependencies = [ - "Inflector", - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "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.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "text_lines" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd5828de7deaa782e1dd713006ae96b3bee32d3279b79eb67ecf8072c059bcf" -dependencies = [ - "serde", -] - -[[package]] -name = "thiserror" -version = "1.0.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[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 = "tls-listener" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce110c38c3c9b6e5cc4fe72e60feb5b327750388a10a276e3d5d7d431e3dc76c" -dependencies = [ - "futures-util", - "pin-project-lite", - "thiserror", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "tokenizers" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dd47962b0ba36e7fd33518fbf1754d136fd1474000162bbf2a8b5fcb2d3654d" -dependencies = [ - "aho-corasick", - "derive_builder", - "esaxx-rs", - "getrandom", - "itertools 0.12.1", - "lazy_static", - "log", - "macro_rules_attribute", - "monostate", - "onig", - "paste", - "rand", - "rayon", - "rayon-cond", - "regex", - "regex-syntax 0.8.2", - "serde", - "serde_json", - "spm_precompiled", - "thiserror", - "unicode-normalization-alignments", - "unicode-segmentation", - "unicode_categories", -] - -[[package]] -name = "tokio" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-socks" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "hashbrown 0.14.3", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "triomphe" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" -dependencies = [ - "serde", - "stable_deref_trait", -] - -[[package]] -name = "trust-dns-proto" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand", - "serde", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot", - "rand", - "resolv-conf", - "serde", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.0.0", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "rand", - "static_assertions", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-ident" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-id" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" - -[[package]] -name = "unicode-id-start" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02aebfa694eccbbbffdd92922c7de136b9fe764396d2f10e21bce1681477cfc1" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-normalization-alignments" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" -dependencies = [ - "smallvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - -[[package]] -name = "untrusted" -version = "0.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 0.4.0", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "urlpattern" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" -dependencies = [ - "derive_more", - "regex", - "serde", - "unic-ucd-ident", - "url", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "v8" -version = "0.97.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb417c2cd20684f18b185085c876d379318893461c17d319948a0a5f221f0b50" -dependencies = [ - "bindgen", - "bitflags 2.5.0", - "fslock", - "gzip-header", - "home", - "miniz_oxide", - "once_cell", - "paste", - "which 6.0.1", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "value-trait" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" -dependencies = [ - "float-cmp", - "halfbrown", - "itoa", - "ryu", -] - -[[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 = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - -[[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 = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.48", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "wasm-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "wgpu-core" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.5.0", - "cfg_aliases", - "codespan-reporting", - "document-features", - "indexmap", - "log", - "naga", - "once_cell", - "parking_lot", - "profiling", - "raw-window-handle", - "ron", - "rustc-hash", - "serde", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 2.5.0", - "block", - "cfg_aliases", - "core-graphics-types", - "d3d12", - "glow", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-descriptor", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.7.4", - "log", - "metal", - "naga", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "profiling", - "range-alloc", - "raw-window-handle", - "rustc-hash", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" -dependencies = [ - "bitflags 2.5.0", - "js-sys", - "serde", - "web-sys", -] - -[[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 = "which" -version = "6.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" -dependencies = [ - "either", - "home", - "rustix", - "winsafe", -] - -[[package]] -name = "whoami" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" -dependencies = [ - "redox_syscall", - "wasite", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "winsafe" -version = "0.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "x25519-dalek" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" -dependencies = [ - "curve25519-dalek", - "rand_core", - "serde", - "zeroize", -] - -[[package]] -name = "x509-parser" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" -dependencies = [ - "asn1-rs", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xml-rs" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" - -[[package]] -name = "xxhash-rust" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] diff --git a/pkgs/by-name/ed/edge-runtime/librusty_v8.nix b/pkgs/by-name/ed/edge-runtime/librusty_v8.nix deleted file mode 100644 index b29dc10d8d6e..000000000000 --- a/pkgs/by-name/ed/edge-runtime/librusty_v8.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - stdenv, - fetchurl, -}: - -let - 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_${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; - hash = args.shas.${stdenv.hostPlatform.system}; - meta = { - inherit (args) version; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; - }; -in -fetch_librusty_v8 { - version = "0.97.1"; - shas = { - x86_64-linux = "sha256-wQBEi2Vs5ruhSkq0n3z8WWjls6V3th2cm+O6s4LDB8k="; - aarch64-linux = "sha256-U0PCUNcshm7AaBuUgwQQ1Qn9dr1iL2Okodl6BI/nZR8="; - x86_64-darwin = "sha256-cGXOstCOdqaOpU2LcOT5A0JfnkoDvUHhOcCJ9vsS7CM="; - aarch64-darwin = "sha256-9TmAON0KUVRQISTudyryIhf4VC/Dc4caq69iquDdrTU="; - }; -} diff --git a/pkgs/by-name/ed/edge-runtime/package.nix b/pkgs/by-name/ed/edge-runtime/package.nix deleted file mode 100644 index e6133bf1389e..000000000000 --- a/pkgs/by-name/ed/edge-runtime/package.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - stdenv, - lib, - callPackage, - fetchFromGitHub, - rustPlatform, - nix-update-script, - darwin, - openssl, - pkg-config, -}: - -let - pname = "edge-runtime"; - version = "1.60.1"; -in -rustPlatform.buildRustPackage { - inherit pname version; - - src = fetchFromGitHub { - owner = "supabase"; - repo = pname; - rev = "v${version}"; - hash = "sha256-w0iSKHT6aIixKh1bHg1lOQNEw/emKK7R2iLzWjb2Pnk="; - fetchSubmodules = true; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "deno_core-0.293.0" = "sha256-5WBORHokzWPdro9rmBijcsx/j81YFaEfMIK276bfI1o="; - "eszip-0.72.2" = "sha256-lzJeapA5NTWBnBaQY8i82OeYN2DIukJZKoRAXFG4qVA="; - "ort-2.0.0-rc.2" = "sha256-jOKeulnW/m+q1xf77jaNzLT+In/AFcSDDbz7xF23x5g="; - }; - }; - - nativeBuildInputs = [ - pkg-config - rustPlatform.bindgenHook - ]; - - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - CoreFoundation - SystemConfiguration - ] - ); - - # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem - # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE - RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { }; - - # For version tag - GIT_V_TAG = version; - - passthru.updateScript = nix-update-script { }; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/edge-runtime --help - runHook postInstallCheck - ''; - - doCheck = false; - - meta = with lib; { - description = "Server based on Deno runtime, capable of running JavaScript, TypeScript, and WASM services"; - mainProgram = "edge-runtime"; - homepage = "https://github.com/supabase/edge-runtime"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; - }; -} diff --git a/pkgs/by-name/ed/edgetx/0001-libclang-paths.patch b/pkgs/by-name/ed/edgetx/0001-libclang-paths.patch new file mode 100644 index 000000000000..ca40b2a69628 --- /dev/null +++ b/pkgs/by-name/ed/edgetx/0001-libclang-paths.patch @@ -0,0 +1,38 @@ +diff --git a/radio/util/find_clang.py b/radio/util/find_clang.py +index d9cdbb083..f78f87717 100644 +--- a/radio/util/find_clang.py ++++ b/radio/util/find_clang.py +@@ -59,6 +59,7 @@ def getBuiltinHeaderPath(library_path): + return None + + def findLibClang(): ++ return "@libclang@" + if sys.platform == "darwin": + knownPaths = [ + "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib", +diff --git a/radio/util/generate_datacopy.py b/radio/util/generate_datacopy.py +index a92b0c3e2..6385b2ff6 100755 +--- a/radio/util/generate_datacopy.py ++++ b/radio/util/generate_datacopy.py +@@ -5,7 +5,8 @@ import sys + import clang.cindex + import time + import os +- ++from pathlib import Path ++import re + + structs = [] + extrastructs = [] +@@ -102,6 +103,11 @@ def main(): + if find_clang.builtin_hdr_path: + args.append("-I" + find_clang.builtin_hdr_path) + ++ args.append("-resource-dir") ++ args.append("@resourceDir@") ++ for path in ["@libc-cflags@", "@libcxx-cflags@"]: ++ args.extend([flag.strip() for flag in re.split(r'\s+', Path(path).read_text()) if flag.strip()]) ++ + translation_unit = index.parse(sys.argv[1], args) + + if translation_unit.diagnostics: diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix new file mode 100644 index 000000000000..12f6516b0186 --- /dev/null +++ b/pkgs/by-name/ed/edgetx/package.nix @@ -0,0 +1,183 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3, + cmake, + ninja, + libsForQt5, + SDL2, + fox_1_6, + replaceVars, + llvmPackages, + dfu-util, + gtest, + miniz, + yaml-cpp, + # List of targets to build simulators for + targetsToBuild ? import ./targets.nix, +}: + +let + # Keep in sync with `cmake/FetchMaxLibQt.cmake`. + maxlibqt = fetchFromGitHub { + owner = "edgetx"; + repo = "maxLibQt"; + rev = "ac1988ffd005cd15a8449b92150ce6c08574a4f1"; + hash = "sha256-u8e4qseU0+BJyZkV0JE4sUiXaFeIYvadkMTGXXiE2Kg="; + }; + + pythonEnv = python3.withPackages ( + pyPkgs: with pyPkgs; [ + pillow + lz4 + jinja2 + libclang + ] + ); +in + +stdenv.mkDerivation (finalAttrs: { + pname = "edgetx"; + version = "2.11.0-rc3"; + + src = fetchFromGitHub { + owner = "EdgeTX"; + repo = "edgetx"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-ipiGkc+R7/itmnRRrlrc4iXn+fLWm4OKc227NfevFhI="; + }; + + nativeBuildInputs = [ + cmake + ninja + pythonEnv + libsForQt5.qttools + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.qtserialport + SDL2 + fox_1_6 + ]; + + patches = [ + (replaceVars ./0001-libclang-paths.patch ( + let + llvmMajor = lib.versions.major llvmPackages.llvm.version; + in + { + resourceDir = "${llvmPackages.clang.cc.lib}/lib/clang/${llvmMajor}"; + libclang = "${lib.getLib llvmPackages.libclang}/lib/libclang.so"; + libc-cflags = "${llvmPackages.clang}/nix-support/libc-cflags"; + libcxx-cflags = "${llvmPackages.clang}/nix-support/libcxx-cxxflags"; + } + )) + ]; + + postPatch = '' + sed -i companion/src/burnconfigdialog.cpp \ + -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' + patchShebangs companion/util radio/util + ''; + + cmakeFlags = [ + # Unvendoring these libraries is infeasible. At least lets reuse the same sources. + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MINIZ" "${miniz.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cpp.src}") + # Custom library https://github.com/edgetx/maxLibQt. + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MAXLIBQT" "${maxlibqt}") + (lib.cmakeFeature "DFU_UTIL_ROOT_DIR" "${lib.getBin dfu-util}/bin") + # Superbuild machinery is only getting in the way. + (lib.cmakeBool "EdgeTX_SUPERBUILD" false) + # COMMON_OPTIONS from tools/build-companion.sh. + (lib.cmakeBool "GVARS" true) + (lib.cmakeBool "HELI" true) + (lib.cmakeBool "LUA" true) + # Build companion and not the firmware. + (lib.cmakeBool "NATIVE_BUILD" true) + # file RPATH_CHANGE could not write new RPATH. + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + ]; + + env = { + EDGETX_VERSION_SUFFIX = "nixpkgs"; + }; + + dontUseCmakeConfigure = true; + # We invoke cmakeConfigurePhase multiple times, but only need this once. + dontFixCmake = true; + inherit targetsToBuild; + __structuredAttrs = true; # To pass targetsToBuild as an array. + + configurePhase = '' + runHook preConfigure + prependToVar cmakeFlags "-GNinja" + fixCmakeFiles . + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + cmakeCommonFlags="$''\{cmakeFlags[@]}" + # This is the most sensible way to convert target name -> cmake options + # aside from manually extracting bash variables from upstream's CI scripts + # and converting that to nix expressions. Let's hope upstream doesn't break + # this file too often. + source $src/tools/build-common.sh + + # Yes, this is really how upstream expects packaging to look like ¯\_(ツ)_/¯. + # https://github.com/EdgeTX/edgetx/wiki/Build-Instructions-under-Ubuntu-20.04#building-companion-simulator-and-radio-simulator-libraries + for plugin in "$''\{targetsToBuild[@]''\}" + do + # Variable modified by `get_target_build_options` from build-common.sh. + local BUILD_OPTIONS="" + get_target_build_options "$plugin" + # With each invocation of `cmakeConfigurePhase` `cmakeFlags` gets + # prepended to, so it has to be reset. + cmakeFlags=() + appendToVar cmakeFlags $cmakeCommonFlags $BUILD_OPTIONS + pushd . + cmakeConfigurePhase + ninjaFlags=("libsimulator") + ninjaBuildPhase + rm CMakeCache.txt + popd + done + + cmakeConfigurePhase + ninjaFlags=() + ninjaBuildPhase + + runHook postBuild + ''; + + meta = { + description = "EdgeTX Companion transmitter support software"; + longDescription = '' + EdgeTX Companion is used for many different tasks like loading EdgeTX + firmware to the radio, backing up model settings, editing settings and + running radio simulators. + ''; + mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion finalAttrs.version)); + homepage = "https://edgetx.org/"; + license = lib.licenses.gpl2Only; + platforms = [ + "i686-linux" + "x86_64-linux" + "aarch64-linux" + ]; + maintainers = with lib.maintainers; [ + elitak + lopsided98 + wucke13 + xokdvium + ]; + }; +}) diff --git a/pkgs/by-name/ed/edgetx/targets.nix b/pkgs/by-name/ed/edgetx/targets.nix new file mode 100644 index 000000000000..d835799ff0b7 --- /dev/null +++ b/pkgs/by-name/ed/edgetx/targets.nix @@ -0,0 +1,46 @@ +# Keep in sync with tools/build-companion.sh +[ + "x9lite" + "x9lites" + "x7" + "x7access" + "t8" + "t12" + "t12max" + "tx12" + "tx12mk2" + "zorro" + "commando8" + "boxer" + "pocket" + "mt12" + "gx12" + "tlite" + "tpro" + "tprov2" + "tpros" + "bumblebee" + "lr3pro" + "t14" + "x9d" + "x9dp" + "x9dp2019" + "x9e" + "xlite" + "xlites" + "nv14" + "el18" + "pl18" + "pl18ev" + "x10" + "x10express" + "x12s" + "t15" + "t16" + "t18" + "t20" + "t20v2" + "tx16s" + "f16" + "v16" +] diff --git a/pkgs/by-name/ed/editorconfig-checker/package.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix index b9cda0e91a62..cfc462d9a84d 100644 --- a/pkgs/by-name/ed/editorconfig-checker/package.nix +++ b/pkgs/by-name/ed/editorconfig-checker/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = "v${version}"; - hash = "sha256-LoOuP98vRj/kzyWKKsXNPfE+9IELrKBtdSZvP7GtMew="; + hash = "sha256-TRbUehdHzgjc87O8/kZyC9c9ouxJrs/nSN24E5BOrzU="; }; - vendorHash = "sha256-3mcz7tstVfIb1ATuCwDdQ5IyCtjSGaDWNw2qCmY/ObE="; + vendorHash = "sha256-g7SSy55IKxfM1cjyy1n7As278HU+GdNeq1vSSM4B8GM="; doCheck = false; diff --git a/pkgs/by-name/ed/edl/package.nix b/pkgs/by-name/ed/edl/package.nix index d160d76cdbba..b516f8b19f31 100644 --- a/pkgs/by-name/ed/edl/package.nix +++ b/pkgs/by-name/ed/edl/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonPackage { pname = "edl"; - version = "3.52.1-unstable-2025-03-23"; + version = "3.52.1-unstable-2025-04-16"; src = fetchFromGitHub { owner = "bkerler"; repo = "edl"; - rev = "9acf74d0ccca4aff85c8698cdd49ad964128e7d1"; + rev = "3adab1652cdac05cb567646dda94ea06a14f8961"; fetchSubmodules = true; - hash = "sha256-mdA3a3VS0oDt1Y4n/KPzXUVq/ldyvpJjMtkv9i5w1Jg="; + hash = "sha256-fhbZ0KZLE4jdTjvlZNKlXgE0kta7YXWsG7xkIznchGU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/ed/edopro/deps.nix b/pkgs/by-name/ed/edopro/deps.nix index e45c21c0f662..14535d8f4634 100644 --- a/pkgs/by-name/ed/edopro/deps.nix +++ b/pkgs/by-name/ed/edopro/deps.nix @@ -1,11 +1,11 @@ # This is automatically generated by the update script. # DO NOT MANUALLY EDIT. { - assets-hash = "sha256-vZhkWJ1ZoNEwdc5kM1S0hyXnWmupiTOanCi9DCuqw/k="; - edopro-version = "40.1.4"; - edopro-rev = "c713e23491a1e55c9d8e91257e5f2b5873696b9b"; - edopro-hash = "sha256-mj0xEJsFcnY//za0uJosAPOPbU/jlduNX0YSNmvduLE="; - irrlicht-version = "1.9.0-unstable-2023-02-18"; - irrlicht-rev = "7edde28d4f8c0c3589934c398a3a441286bb7c22"; - irrlicht-hash = "sha256-Q2tNiYE/enZPqA5YhUe+Tkvmqtmmz2E0OqTRUDnt+UA="; + assets-hash = "sha256-cta4k6yxrdaFFfum0eshEzLODExBfA+oVPqcOpXG9uk="; + edopro-version = "41.0.2"; + edopro-rev = "e5c0578aa504d0831dcbe29dbacd018f7b885b2c"; + edopro-hash = "sha256-ZkQXWt73S3Nn+RnkG+e91BId7keI5OpM3NSeDMJWlZY="; + irrlicht-version = "1.9.0-unstable-2025-03-30"; + irrlicht-rev = "47264fc2bc3223d110c589c9ffe4339d696a3dd0"; + irrlicht-hash = "sha256-AwUCHQOivNgSnYe8kG6JxDIz7H5PC6RoozGiOGUejTI="; } diff --git a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch new file mode 100644 index 000000000000..253051ebf0f7 --- /dev/null +++ b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch @@ -0,0 +1,29 @@ +From 41e750142b44465f3af197b7e2f0d6f54fc48c2d Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Mon, 21 Oct 2024 17:42:24 +0200 +Subject: [PATCH] Mark Lua symbols as C symbols + +Otherwise linking against our Lua built by a C-compiler fails due to the symbols being resolved as C++ symbols. +--- + interpreter.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/interpreter.h b/interpreter.h +index 6c405a1..c471ecb 100644 +--- a/interpreter.h ++++ b/interpreter.h +@@ -9,9 +9,11 @@ + #define INTERPRETER_H_ + + // Due to longjmp behaviour, we must build Lua as C++ to avoid UB ++extern "C" { + #include + #include + #include ++} + + #include "common.h" + #include +-- +2.44.1 + diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix index ba6cc7c6ae76..a19f90aed995 100644 --- a/pkgs/by-name/ed/edopro/package.nix +++ b/pkgs/by-name/ed/edopro/package.nix @@ -2,19 +2,19 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, fetchzip, makeWrapper, premake5, - writeShellScriptBin, + writeShellApplication, runCommandLocal, symlinkJoin, + writeText, imagemagick, bzip2, curl, + envsubst, flac, - # Use fmt 10+ after release 40.1.4+ - fmt_9, + fmt, freetype, irrlicht, libevent, @@ -34,6 +34,7 @@ sqlite, wayland, egl-wayland, + zenity, covers_url ? "https://pics.projectignis.org:2096/pics/cover/{}.jpg", fields_url ? "https://pics.projectignis.org:2096/pics/field/{}.png", # While ygoprodeck has higher quality images, "spamming" of their api results in a ban. @@ -57,6 +58,14 @@ let ]; deps = import ./deps.nix; + + edopro-src = fetchFromGitHub { + owner = "edo9300"; + repo = "edopro"; + rev = deps.edopro-rev; + fetchSubmodules = true; + hash = deps.edopro-hash; + }; in let assets = fetchzip { @@ -107,16 +116,83 @@ let }; }; + ocgcore = + let + # Refer to CORENAME EPRO_TEXT in /gframe/dllinterface.cpp for this + ocgcoreName = lib.strings.concatStrings [ + (lib.optionalString (!stdenv.hostPlatform.isWindows) "lib") + "ocgcore" + ( + if stdenv.hostPlatform.isiOS then + "-ios" + else if stdenv.hostPlatform.isAndroid then + ( + if stdenv.hostPlatform.isx86_64 then + "x64" + else if stdenv.hostPlatform.isx86_32 then + "x86" + else if stdenv.hostPlatform.isAarch64 then + "v8" + else if stdenv.hostPlatform.isAarch32 then + "v7" + else + throw "Don't know what platform suffix edopro expects for ocgcore on: ${stdenv.hostPlatform.system}" + ) + else + lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ".aarch64" + ) + stdenv.hostPlatform.extensions.sharedLibrary + ]; + in + stdenv.mkDerivation { + pname = "ocgcore-edopro"; + version = deps.edopro-version; + + src = edopro-src; + sourceRoot = "${edopro-src.name}/ocgcore"; + + nativeBuildInputs = [ + premake5 + ]; + + enableParallelBuilding = true; + + buildFlags = [ + "verbose=true" + "config=release" + "ocgcoreshared" + ]; + + makeFlags = [ + "-C" + "build" + ]; + + # To make sure linking errors are discovered at build time, not when edopro runs into them during loading + env.NIX_LDFLAGS = "--unresolved-symbols=report-all"; + + installPhase = '' + runHook preInstall + + install -Dm644 bin/release/*ocgcore*${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/${ocgcoreName} + + runHook postInstall + ''; + + meta = { + description = "YGOPro script engine"; + homepage = "https://github.com/edo9300/ygopro-core"; + license = lib.licenses.agpl3Plus; + inherit maintainers; + platforms = lib.platforms.unix; + }; + }; + edopro = stdenv.mkDerivation { pname = "edopro"; version = deps.edopro-version; - src = fetchFromGitHub { - owner = "edo9300"; - repo = "edopro"; - rev = deps.edopro-rev; - hash = deps.edopro-hash; - }; + src = edopro-src; nativeBuildInputs = [ makeWrapper @@ -127,7 +203,7 @@ let bzip2 curl flac - fmt_9 + fmt freetype irrlicht-edopro libevent @@ -141,19 +217,16 @@ let sqlite ]; - patches = [ - (fetchpatch { - name = "libgit2-version.patch"; - url = "https://github.com/edo9300/edopro/commit/f8ddbfff51231827a8dd1dcfcb2dda85f50a56d9.patch"; - hash = "sha256-w9VTmWfw6vEyVvsOH+AK9lAbUOV+MagzGQ3Wa5DCS/U="; - }) - ]; - # nixpkgs' gcc stack currently appears to not support LTO + # Override where bundled ocgcore get looked up in, so we can supply ours + # (can't use --prebuilt-core or let it build a core on its own without making core updates impossible) postPatch = '' substituteInPlace premake5.lua \ --replace-fail 'flags "LinkTimeOptimization"' 'removeflags "LinkTimeOptimization"' + substituteInPlace gframe/game.cpp \ + --replace-fail 'ocgcore = LoadOCGcore(Utils::GetWorkingDirectory())' 'ocgcore = LoadOCGcore("${lib.getLib ocgcore}/lib/")' + touch ocgcore/premake5.lua ''; @@ -244,21 +317,62 @@ let "textures" "WindBot" ]; + wrapperZenityMessageTemplate = writeText "edopro-wrapper-multiple-versions-message.txt.in" '' + Nixpkgs' EDOPro wrapper has found more than 1 directory in: ''${EDOPRO_BASE_DIR} + + We expected the only directory to be: ''${EDOPRO_DIR} + + There may have been an update, requiring you to migrate any files you care about from an older version. + + Examples include: + + - decks/* + - config/system.conf - which has your client's settings + - any custom things you may have installed into: fonts, skins, script, sound, ... + - anything you wish to preserve from: replay, screenshots + + Once you have copied over everything important to ''${EDOPRO_DIR}, delete the old version's path. + ''; in - writeShellScriptBin "edopro" '' - set -eu - EDOPRO_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/edopro" + writeShellApplication { + name = "edopro"; + runtimeInputs = [ + envsubst + zenity + ]; + text = '' + export EDOPRO_VERSION="${deps.edopro-version}" + export EDOPRO_BASE_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/edopro" + export EDOPRO_DIR="''${EDOPRO_BASE_DIR}/''${EDOPRO_VERSION}" - if [ ! -d $EDOPRO_DIR ]; then - mkdir -p $EDOPRO_DIR - cp -r --no-preserve=all ${assets}/{${assetsToCopy}} $EDOPRO_DIR - chmod -R go-rwx $EDOPRO_DIR + # If versioned directory doesn't exist yet, make it & copy over assets + if [ ! -d "$EDOPRO_DIR" ]; then + mkdir -p "$EDOPRO_DIR" + cp -r --no-preserve=all ${assets}/{${assetsToCopy}} "$EDOPRO_DIR" + chmod -R go-rwx "$EDOPRO_DIR" - rm $EDOPRO_DIR/config/io.github.edo9300.EDOPro.desktop.in - fi + rm "$EDOPRO_DIR"/config/io.github.edo9300.EDOPro.desktop.in + fi - exec ${lib.getExe edopro} -C $EDOPRO_DIR $@ - ''; + # Different versions provide different assets. Some are necessary for the game to run properly (configs for + # where to get incremental updates from, online servers, card scripting, certificates for communication etc), + # and some are optional nice-haves (example decks). It's also possible to override assets with custom skins. + # + # Don't try to manage all of this across versions, just inform the user that they may need to migrate their + # files if it looks like there are multiple versions. + + edoproTopDirs="$(find "$EDOPRO_BASE_DIR" -mindepth 1 -maxdepth 1 -type d | wc -l)" + if [ "$edoproTopDirs" -ne 1 ]; then + zenity \ + --info \ + --title='[NIX] Multiple asset copies found' \ + --text="$(envsubst < ${wrapperZenityMessageTemplate})" \ + --ok-label='Continue to EDOPro' + fi + + exec ${lib.getExe edopro} -C "$EDOPRO_DIR" "$@" + ''; + }; edopro-desktop = runCommandLocal "io.github.edo9300.EDOPro.desktop" { } '' mkdir -p $out/share/applications diff --git a/pkgs/by-name/ed/edopro/update.py b/pkgs/by-name/ed/edopro/update.py index c7594b758d21..f582fe6a9d89 100755 --- a/pkgs/by-name/ed/edopro/update.py +++ b/pkgs/by-name/ed/edopro/update.py @@ -2,6 +2,7 @@ #! nix-shell -i python -p nix-prefetch-github python3Packages.githubkit import json import subprocess +import sys from githubkit import GitHub, UnauthAuthStrategy from githubkit.versions.latest.models import ( @@ -15,15 +16,11 @@ DEPS_PATH: str = "./pkgs/by-name/ed/edopro/deps.nix" with GitHub(UnauthAuthStrategy()) as github: edopro: Tag = github.rest.repos.list_tags("edo9300", "edopro").parsed_data[0] - # This dep is not versioned in anyway and is why we check below to see if this is a new version. + # This dep is not versioned in any way and is why we check below to see if this is a new version. irrlicht: Commit = github.rest.repos.list_commits( "edo9300", "irrlicht1-8-4" ).parsed_data[0] - irrlicht: Commit = github.rest.repos.get_commit( - "edo9300", "irrlicht1-8-4", "7edde28d4f8c0c3589934c398a3a441286bb7c22" - ).parsed_data - edopro_working_version: str = "" try: @@ -32,11 +29,11 @@ try: if "edopro-version" in line: edopro_working_version = line.split('"')[1] except FileNotFoundError: - print("Error: Dep file not found.") + print("Error: Dep file not found.", file=sys.stderr) exit(2) if edopro_working_version == "": - print("Working version is unbound") + print("Working version is unbound", file=sys.stderr) exit(5) if edopro_working_version == edopro.name: @@ -56,7 +53,7 @@ def get_hash(owner: str, repo: str, rev: str, submodule: bool = False) -> str: return out_json["hash"] -edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha) +edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha, submodule=True) irrlicht_hash = get_hash("edo9300", "irrlicht1-8-4", irrlicht.sha) asset_legacy_hash: str = ( @@ -98,7 +95,7 @@ with open(DEPS_PATH, "w") as file: edopro-version = "{edopro.name}"; edopro-rev = "{edopro.commit.sha}"; edopro-hash = "{edopro_hash}"; - irrlicht-version = "{"1.9.0-unstable-" + irrlicht.commit.committer.date.split("T")[0]}"; + irrlicht-version = "{"1.9.0-unstable-" + irrlicht.commit.committer.date.strftime("%Y-%m-%d")}"; irrlicht-rev = "{irrlicht.sha}"; irrlicht-hash = "{irrlicht_hash}"; }} diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index 673e38d05875..bcafef63bade 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -15,17 +15,10 @@ libGL, SDL2, SDL2_mixer, - darwin, graphicsmagick, }: let - inherit (darwin.apple_sdk.frameworks) - AGL - Cocoa - GLUT - OpenGL - ; wrapper = "eduke32-wrapper"; swWrapper = "voidsw-wrapper"; furyWrapper = "fury-wrapper"; @@ -33,14 +26,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "eduke32"; - version = "0-unstable-2024-07-26"; + version = "0-unstable-2025-04-11"; src = fetchFromGitLab { domain = "voidpoint.io"; owner = "terminx"; repo = "eduke32"; - rev = "19c21b9ab10b0c17147c9ad951cc15279ed33f77"; - hash = "sha256-lwnx2tVjbHouB0vaT7Dh1Ozea8+7Az6e4Wn6HmxDxCo="; + rev = "b8759847124c2c53a165a02efef4a0c778674baf"; + hash = "sha256-PudO6EKCh6UpoY6GT/J0hkVteKNIAO4Q454jIzaegMg="; }; patches = [ @@ -61,12 +54,6 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib gtk2 libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AGL - Cocoa - GLUT - OpenGL ]; nativeBuildInputs = @@ -97,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "SDLCONFIG=${SDL2}/bin/sdl2-config" # git rev-list --count HEAD - "VC_REV=10593" + "VC_REV=10619" "VC_HASH=${lib.substring 0 9 finalAttrs.src.rev}" "VC_BRANCH=master" ]; diff --git a/pkgs/by-name/ed/eduli/package.nix b/pkgs/by-name/ed/eduli/package.nix index e6fea3a303b4..e30cb785ba3a 100644 --- a/pkgs/by-name/ed/eduli/package.nix +++ b/pkgs/by-name/ed/eduli/package.nix @@ -10,8 +10,8 @@ stdenvNoCC.mkDerivation rec { src = fetchzip { name = "${pname}-${version}"; - url = "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip"; - sha256 = "0b4kjdk0h0hx446swi0wzawia0mf16qh9b6v4h4nqg8qx0p2sd3c"; + url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip"; + hash = "sha256-bDQtLugYPWwJJNusBLEJrgIVufocRK4NIR0CCGaTkyw="; }; installPhase = '' diff --git a/pkgs/by-name/ed/eduvpn-client/package.nix b/pkgs/by-name/ed/eduvpn-client/package.nix index 8bccd6c70fee..6286d6e841fd 100644 --- a/pkgs/by-name/ed/eduvpn-client/package.nix +++ b/pkgs/by-name/ed/eduvpn-client/package.nix @@ -1,6 +1,6 @@ { lib, - fetchurl, + fetchFromGitea, gdk-pixbuf, gobject-introspection, gtk3, @@ -13,12 +13,15 @@ python3Packages.buildPythonApplication rec { pname = "eduvpn-client"; - version = "4.4.0"; + version = "4.5.0"; format = "pyproject"; - src = fetchurl { - url = "https://codeberg.org/eduVPN/linux-app/releases/download/${version}/python-${pname}-${version}.tar.xz"; - hash = "sha256-IHRIjryAIeGcFqz5BMWsE0/gClaSmnwWhjc1f1c69vk="; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "eduVPN"; + repo = "linux-app"; + rev = version; + hash = "sha256-cm1N/Z6/9zyhWBYUIUIYeB+KphHl+89MD4M9mO/tNMg="; }; nativeBuildInputs = [ @@ -40,6 +43,10 @@ python3Packages.buildPythonApplication rec { setuptools ]; + postInstall = '' + ln -s $out/${python3Packages.python.sitePackages}/eduvpn/data/share/ $out/share + ''; + checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/by-name/eg/egl-wayland/package.nix b/pkgs/by-name/eg/egl-wayland/package.nix index 2756fdc2ceb9..5f69a2197ee7 100644 --- a/pkgs/by-name/eg/egl-wayland/package.nix +++ b/pkgs/by-name/eg/egl-wayland/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.18"; + version = "1.1.19"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "Nvidia"; repo = "egl-wayland"; rev = version; - hash = "sha256-Vu0XPcFKQJ+nypNMX1tw17whVWceZ0YlqvEEmEbTQaU="; + hash = "sha256-xQZTmZQqFY7oXHx+g+PKbwCYCPdpUrFnyMZyL2Q/faE="; }; postPatch = '' diff --git a/pkgs/by-name/ei/eiciel/package.nix b/pkgs/by-name/ei/eiciel/package.nix index 0866b0070c32..a35166ebd824 100644 --- a/pkgs/by-name/ei/eiciel/package.nix +++ b/pkgs/by-name/ei/eiciel/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { description = "Graphical editor for ACLs and extended attributes"; homepage = "https://rofi.roger-ferrer.org/eiciel/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ sersorrel ]; + maintainers = with maintainers; [ keysmashes ]; platforms = platforms.linux; mainProgram = "eiciel"; }; diff --git a/pkgs/development/libraries/eigen/include-dir.patch b/pkgs/by-name/ei/eigen/include-dir.patch similarity index 100% rename from pkgs/development/libraries/eigen/include-dir.patch rename to pkgs/by-name/ei/eigen/include-dir.patch diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/by-name/ei/eigen/package.nix similarity index 100% rename from pkgs/development/libraries/eigen/default.nix rename to pkgs/by-name/ei/eigen/package.nix diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/by-name/ei/eigen2/package.nix similarity index 100% rename from pkgs/development/libraries/eigen/2.0.nix rename to pkgs/by-name/ei/eigen2/package.nix diff --git a/pkgs/by-name/ei/eigen_3_4_0/include-dir.patch b/pkgs/by-name/ei/eigen_3_4_0/include-dir.patch new file mode 100644 index 000000000000..9928bbdbed1b --- /dev/null +++ b/pkgs/by-name/ei/eigen_3_4_0/include-dir.patch @@ -0,0 +1,57 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + # cmake_minimum_require must be the first command of the file +-cmake_minimum_required(VERSION 3.5.0) ++cmake_minimum_required(VERSION 3.7.0) + + project(Eigen3) + +@@ -443,7 +443,7 @@ set(PKGCONFIG_INSTALL_DIR + CACHE PATH "The directory relative to CMAKE_INSTALL_PREFIX where eigen3.pc is installed" + ) + +-foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) ++foreach(var CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) + # If an absolute path is specified, make it relative to "{CMAKE_INSTALL_PREFIX}". + if(IS_ABSOLUTE "${${var}}") + file(RELATIVE_PATH "${var}" "${CMAKE_INSTALL_PREFIX}" "${${var}}") +@@ -466,13 +466,6 @@ install(FILES + DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel + ) + +-if(EIGEN_BUILD_PKGCONFIG) +- configure_file(eigen3.pc.in eigen3.pc @ONLY) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc +- DESTINATION ${PKGCONFIG_INSTALL_DIR} +- ) +-endif() +- + install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) + + +@@ -593,8 +586,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) + set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) + set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) + set ( EIGEN_DEFINITIONS "") +-set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) + set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) ++GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR) ++ ++if(EIGEN_BUILD_PKGCONFIG) ++ configure_file(eigen3.pc.in eigen3.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc ++ DESTINATION ${PKGCONFIG_INSTALL_DIR} ++ ) ++endif() + + include (CMakePackageConfigHelpers) + +--- a/eigen3.pc.in ++++ b/eigen3.pc.in +@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r + Requires: + Version: @EIGEN_VERSION_NUMBER@ + Libs: +-Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@ ++Cflags: -I@EIGEN_INCLUDE_DIR@ diff --git a/pkgs/by-name/ei/eigen_3_4_0/package.nix b/pkgs/by-name/ei/eigen_3_4_0/package.nix new file mode 100644 index 000000000000..735a83b93cf7 --- /dev/null +++ b/pkgs/by-name/ei/eigen_3_4_0/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchpatch, + cmake, +}: + +stdenv.mkDerivation rec { + pname = "eigen"; + version = "3.4.0"; + + src = fetchFromGitLab { + owner = "libeigen"; + repo = "eigen"; + rev = version; + hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; + }; + + patches = [ + ./include-dir.patch + # Fixes e.g. onnxruntime on aarch64-darwin: + # https://hydra.nixos.org/build/248915128/nixlog/1, + # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. + # + # The patch is from + # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) + # which is two years old, + # but Eigen hasn't had a release in two years either: + # https://gitlab.com/libeigen/eigen/-/issues/2699. + (fetchpatch { + url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; + hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://eigen.tuxfamily.org"; + description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ + sander + raskin + pbsds + ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/ei/eigenmath/package.nix b/pkgs/by-name/ei/eigenmath/package.nix index 7ab596da4e6b..4f9c41f5b012 100644 --- a/pkgs/by-name/ei/eigenmath/package.nix +++ b/pkgs/by-name/ei/eigenmath/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "338-unstable-2025-03-27"; + version = "340-unstable-2025-05-05"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "2e4f6f099e7a9984e3d34430f63bc0606f364dd9"; - hash = "sha256-Bp7+0ykgUqELF3KE678pkGneZCDcIfqlZo2g12Nb+Qc="; + rev = "94fee6b02ebd4cd718dd9ea45583a6af2129dd28"; + hash = "sha256-2bdO0nRXhDZlEmGRfNf6g9zwc65Ih9Ymlo6PxlpAxes="; }; checkPhase = diff --git a/pkgs/by-name/ei/eintopf/frontend.nix b/pkgs/by-name/ei/eintopf/frontend.nix deleted file mode 100644 index 08108d97081a..000000000000 --- a/pkgs/by-name/ei/eintopf/frontend.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - stdenv, - fetchYarnDeps, - src, - version, - nodejs, - eintopf, - yarnConfigHook, - yarnBuildHook, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "eintopf"; - inherit version src; - - sourceRoot = "${finalAttrs.src.name}/backstage"; - - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/backstage/yarn.lock"; - hash = "sha256-3TPBrQxvTfmBfhAavHy8eDcZwRZMwu0dCovnE1fcuTE="; - }; - - nativeBuildInputs = [ - yarnConfigHook - yarnBuildHook - # Needed for executing package.json scripts - nodejs - ]; - - installPhase = '' - runHook preInstall - - yarn --offline --production install - - mkdir -p "$out" - cp -r . $out/ - - runHook postInstall - ''; - - meta = { - inherit (eintopf.meta) - homepage - description - license - maintainers - ; - }; -}) diff --git a/pkgs/by-name/ei/eintopf/package.nix b/pkgs/by-name/ei/eintopf/package.nix deleted file mode 100644 index 778741640a30..000000000000 --- a/pkgs/by-name/ei/eintopf/package.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitea, - callPackage, - nixosTests, -}: - -let - version = "0.14.3"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "Klasse-Methode"; - repo = "eintopf"; - rev = "v${version}"; - hash = "sha256-cWHWRxZFoArBB5PiuY6EQubKJKm3/79fwNhnABOtBrM="; - }; - frontend = callPackage ./frontend.nix { inherit src version; }; -in - -buildGoModule rec { - pname = "eintopf"; - inherit version src; - - vendorHash = "sha256-ysAgyaewREI8TaMnKH+kh33QT6AN1eLhog35lv7CbVU="; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - "-X main.revision=${src.rev}" - ]; - - preConfigure = '' - cp -R ${frontend}/. backstage/ - ''; - - preCheck = '' - # Disable test, requires running Docker daemon - rm cmd/eintopf/main_test.go - rm service/email/email_test.go - ''; - - passthru.tests = { - inherit (nixosTests) eintopf; - }; - - meta = { - description = "A calendar for Stuttgart, showing events, groups and places"; - homepage = "https://codeberg.org/Klasse-Methode/eintopf"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ onny ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index de16727c3bf6..dee0cad6572c 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -53,21 +53,21 @@ let provider_asn1 = buildRebar3 { name = "provider_asn1"; - version = "0.3.0"; + version = "0.4.1"; src = fetchHex { pkg = "provider_asn1"; - version = "0.3.0"; - sha256 = "sha256-MuelWYZi01rBut8jM6a5alMZizPGZoBE/LveSRu/+wU="; + version = "0.4.1"; + sha256 = "sha256-HqR6IyJyJinvbPJJlhJE14yEiBbNmTGOmR0hqonrOR0="; }; beamDeps = [ ]; }; rebar3_hex = buildRebar3 { name = "rebar3_hex"; - version = "7.0.7"; + version = "7.0.8"; src = fetchHex { pkg = "rebar3_hex"; - version = "7.0.7"; - sha256 = "sha256-1S2igSwiInATUgULZ1E6e2dK6YI5gvRffHRfF1Gg5Ok="; + version = "7.0.8"; + sha256 = "sha256-aEY0EEZwRHp6AAuE1pSfm5RjBjU+PaaJuKp7fvXRiBc="; }; beamDeps = [ ]; }; @@ -141,7 +141,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ejabberd"; - version = "24.12"; + version = "25.04"; nativeBuildInputs = [ makeWrapper @@ -170,17 +170,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "processone"; repo = "ejabberd"; tag = finalAttrs.version; - hash = "sha256-9TyIgsinUpUbirwqg61EYnPB/OyE5vhl3MBMRihqAtE="; + hash = "sha256-BIt5kLEtvMUlyntQ98Mgidmo6lJHbt/LJYrbxPaJxPo="; }; - patches = [ - # Fix json_encode_with_kv_list used in mod_matrix_gw - (fetchpatch2 { - url = "https://github.com/processone/ejabberd/commit/056635119c8b9f169f1c59cccbf81faab88a6712.patch?full_index=1"; - hash = "sha256-53NMT/SwPtaeo8zaJ1JHW6HUZrxkITi731UOdsFAlJ4="; - }) - ]; - passthru.tests = { inherit (nixosTests) ejabberd; }; diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix index 4fd3e6740b74..bd5b79474028 100644 --- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix +++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix @@ -44,21 +44,21 @@ let }; yconf = builder { name = "yconf"; - version = "1.0.17"; + version = "1.0.18"; src = fetchHex { pkg = "yconf"; - version = "1.0.17"; - sha256 = "sha256-3SiSkjJBRJpGzIRXuewPsUAwcAc1pYhZVWd8c1w0GiU="; + version = "1.0.18"; + sha256 = "sha256-+pUOxlA/ktZBf7jMHZgkA/BBaX6OG79NRYj7kZuVYuo="; }; beamDeps = [ fast_yaml ]; }; xmpp = builder { name = "xmpp"; - version = "1.9.1"; + version = "1.10.0"; src = fetchHex { pkg = "xmpp"; - version = "1.9.1"; - sha256 = "sha256-0rFDGvbkwaTIv5DK8MwRzesEe4MjuH6dfkgm1JEyddw="; + version = "1.10.0"; + sha256 = "sha256-zurkO4/pdknY+FRrP38rOOz8kxwM3Vx0Rf+z+A/LfYU="; }; beamDeps = [ ezlib @@ -71,11 +71,11 @@ let }; stun = builder { name = "stun"; - version = "1.2.15"; + version = "1.2.17"; src = fetchHex { pkg = "stun"; - version = "1.2.15"; - sha256 = "sha256-9tilQaKf0T8s5li2dsDMZhJiuW4EW1Le8WRLdevA7e8="; + version = "1.2.17"; + sha256 = "sha256-azGCRMIehSSpquOsmgXNgjTumUwcLIFd5o0wYIatdo0="; }; beamDeps = [ fast_tls @@ -84,11 +84,11 @@ let }; stringprep = builder { name = "stringprep"; - version = "1.0.30"; + version = "1.0.31"; src = fetchHex { pkg = "stringprep"; - version = "1.0.30"; - sha256 = "sha256-9vybM4SgOHeDD4my84WAyvP0onRIpKMz1qjDl1wiC5o="; + version = "1.0.31"; + sha256 = "sha256-6WmciOjbFrOkHw5FrGh0pNqBpuSFSnfXbt5tCbCONTA="; }; beamDeps = [ p1_utils ]; }; @@ -117,18 +117,18 @@ let version = "1.0.26"; src = fetchHex { pkg = "p1_utils"; - version = "1.0.26"; - sha256 = "sha256-0DeejBFWuYvWT4Epwd4CL8yk8v23SGznO/DtLDN2sEw="; + version = "1.0.27"; + sha256 = "sha256-8a+UKwpivPoNWfvjBnm+T/614kGgxJ7V8JTbL1uA9eA="; }; beamDeps = [ ]; }; p1_pgsql = builder { name = "p1_pgsql"; - version = "1.1.29"; + version = "1.1.32"; src = fetchHex { pkg = "p1_pgsql"; - version = "1.1.29"; - sha256 = "sha256-pv9Y6LF0mT84ldo+piEan50MVNGm4ouzIdo7PNaLOME="; + version = "1.1.32"; + sha256 = "sha256-JosB6PTrdcIRoxSVolwoFcVJrszi8N8aFhxuCizeBh4="; }; beamDeps = [ xmpp ]; }; @@ -144,11 +144,11 @@ let }; p1_mysql = builder { name = "p1_mysql"; - version = "1.0.25"; + version = "1.0.26"; src = fetchHex { pkg = "p1_mysql"; - version = "1.0.25"; - sha256 = "sha256-5hh/+ulbcmCY6I8+5vI0SsJZziwm4O5AOwX+7zQa5DQ="; + version = "1.0.26"; + sha256 = "sha256-6hOAg/LFRxm5z1Sdv1gCooiwAZ6j5USbNUx0zAP6/ew="; }; beamDeps = [ ]; }; @@ -250,11 +250,11 @@ let }; esip = builder { name = "esip"; - version = "1.0.56"; + version = "1.0.57"; src = fetchHex { pkg = "esip"; - version = "1.0.56"; - sha256 = "sha256-nvNmDO+TtiP3No3NXHn05wQ1hjGQnm3UZOM1N4gV2h8="; + version = "1.0.57"; + sha256 = "sha256-GcNX4YF7HgR5LvNZv5AEAPPm0OWt6Sn9cviOqbRK8u0="; }; beamDeps = [ fast_tls @@ -284,11 +284,11 @@ let }; eimp = builder { name = "eimp"; - version = "1.0.23"; + version = "1.0.24"; src = fetchHex { pkg = "eimp"; - version = "1.0.23"; - sha256 = "sha256-kHx4ACPLKJPk/Evb5qTwLDVZE4Yqxn8OzCZgXoFrYoo="; + version = "1.0.24"; + sha256 = "sha256-fWFDLrikVlnAvkdfROde62UXQ6pkod6K33hc2tgZYa0="; }; beamDeps = [ p1_utils ]; }; diff --git a/pkgs/by-name/ej/ejsonkms/package.nix b/pkgs/by-name/ej/ejsonkms/package.nix index 5a2f549fc85d..5ad750655827 100644 --- a/pkgs/by-name/ej/ejsonkms/package.nix +++ b/pkgs/by-name/ej/ejsonkms/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ejsonkms"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "envato"; repo = "ejsonkms"; rev = "v${version}"; - hash = "sha256-kk/+EOZ1g6SiIajcKXf6lVnll/NRWgwbFO2j07HERBI="; + hash = "sha256-EcNvzkZmSASe+0UMixBe8qwZq1JN3zFvppdWu1LM46A="; }; - vendorHash = "sha256-ZSoxG532eicpR1pS2oLYnJxtJrsHZZRbjncxU4uyT3c="; + vendorHash = "sha256-LS+iCTpE7+vXa25CTudNHLPRYSod4ozuErnoYWB9LNU="; ldflags = [ "-X main.version=v${version}" diff --git a/pkgs/by-name/ek/eks-node-viewer/package.nix b/pkgs/by-name/ek/eks-node-viewer/package.nix index 3b14dc2f441d..93457be17b94 100644 --- a/pkgs/by-name/ek/eks-node-viewer/package.nix +++ b/pkgs/by-name/ek/eks-node-viewer/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "eks-node-viewer"; - version = "0.7.1"; + version = "0.7.4"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; tag = "v${version}"; - hash = "sha256-KdddfixQewj30rIC1qZzyS3h/jq+RdxId9WgQPqW8nE="; + hash = "sha256-VCRwGxH7adwB6p+UCF1GmAa5f/7GgJlJ7GvRSFOlOto="; }; - vendorHash = "sha256-yTF1PRRUlJ27ZrKO0FW4IztIE1Wo05qixTCFvETg358="; + vendorHash = "sha256-ZBkiiDAcgOkIezDHcDjqJ3w5+k5kXdfw2TCZoTx12hc="; excludedPackages = [ "hack" ]; diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index d3eb7709a10b..79d4e5585fd9 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.206.0"; + version = "0.208.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-wJl3PhrTbjgrI5aRNmqHkPr43SYw0m5nLWPtVqazlfg="; + hash = "sha256-lRRB6yAELCNzXWiuxaEHTwlTG7/x3AC97ZnaEtJ3AVs="; }; - vendorHash = "sha256-Ipj4Ss9x7HnAAweoQlWsmOUhU+toGyR4aGTRhIHHw/0="; + vendorHash = "sha256-7aV+BJDudRpqpNk0ve2u7/GHCswMvw07yKrdnnvfO6M="; doCheck = false; diff --git a/pkgs/by-name/el/elan/package.nix b/pkgs/by-name/el/elan/package.nix index db820df47826..feca25d6f479 100644 --- a/pkgs/by-name/el/elan/package.nix +++ b/pkgs/by-name/el/elan/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "4.0.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - hash = "sha256-6/5yIIO0Avf6YpD7+7B30bnwtcPXi2k4RqWFO8hBaII="; + hash = "sha256-z20QiYbpEx591CtGerdX63not9S7TB5BJFoCoGTYen0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4HYRglFhEpEnRu8gPSNFFAT2v4/3ccwd02LZfNJUzbM="; + cargoHash = "sha256-T8R1BostefR0vbmKo1UDmP6FjXWfsfFUtF/oRqAN7mc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/el/elastic/package.nix b/pkgs/by-name/el/elastic/package.nix index 2b04d81a488d..3795840d9884 100644 --- a/pkgs/by-name/el/elastic/package.nix +++ b/pkgs/by-name/el/elastic/package.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { mainProgram = "app.drey.Elastic"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ _0xMRTT ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ _0xMRTT ]; + teams = [ teams.gnome-circle ]; }; } diff --git a/pkgs/by-name/el/elasticsearch-curator/package.nix b/pkgs/by-name/el/elasticsearch-curator/package.nix index ceb56e9b4d12..ab135355eba8 100644 --- a/pkgs/by-name/el/elasticsearch-curator/package.nix +++ b/pkgs/by-name/el/elasticsearch-curator/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "elasticsearch-curator"; - version = "8.0.20"; + version = "8.0.21"; pyproject = true; src = fetchFromGitHub { owner = "elastic"; repo = "curator"; tag = "v${version}"; - hash = "sha256-oeQ36CvR/v0Mvo+aGL+dYHTgEsq9TesZoBMdoePmgnI="; + hash = "sha256-yVOZBz4AJNjmpxRp3t03KwDzp/3W8uJiHwuSRJbfLvk="; }; pythonRelaxDeps = [ "es-client" ]; diff --git a/pkgs/by-name/el/elastix/package.nix b/pkgs/by-name/el/elastix/package.nix new file mode 100644 index 000000000000..eb758bc1541a --- /dev/null +++ b/pkgs/by-name/el/elastix/package.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + itk, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "elastix"; + version = "5.2.0"; + + src = fetchFromGitHub { + owner = "SuperElastix"; + repo = "elastix"; + tag = finalAttrs.version; + hash = "sha256-edUMj8sjku8EVYaktteIDS+ouaN3kg+CXQCeSWKlLDI="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ itk ]; + + doCheck = !stdenv.hostPlatform.isDarwin; # usual dynamic linker issues + + meta = with lib; { + homepage = "https://elastix.dev"; + description = "Image registration toolkit based on ITK"; + changelog = "https://github.com/SuperElastix/elastix/releases/tag/${finalAttrs.version}"; + maintainers = with maintainers; [ bcdarwin ]; + mainProgram = "elastix"; + platforms = platforms.x86_64; # libitkpng linker issues with ITK 5.1 + license = licenses.asl20; + }; +}) diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix index 22e7200277f9..9425bae778e8 100644 --- a/pkgs/by-name/el/electron-mail/package.nix +++ b/pkgs/by-name/el/electron-mail/package.nix @@ -7,11 +7,11 @@ let pname = "electron-mail"; - version = "5.2.3"; + version = "5.3.0"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-ajekPPRgprYNWE2osAXe46qVjnxXzkXa+MkWiNYJ5Fc="; + hash = "sha256-QGYsD8Ec6/G4X2dGZfH7LwT6o6X599kP6V34y6WxP64="; }; appimageContents = appimageTools.extract { inherit pname version src; }; @@ -33,12 +33,12 @@ appimageTools.wrapType2 { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail"; mainProgram = "electron-mail"; homepage = "https://github.com/vladimiry/ElectronMail"; - license = licenses.gpl3; - maintainers = [ maintainers.princemachiavelli ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.princemachiavelli ]; platforms = [ "x86_64-linux" ]; changelog = "https://github.com/vladimiry/ElectronMail/releases/tag/v${version}"; }; diff --git a/pkgs/by-name/el/electrs/package.nix b/pkgs/by-name/el/electrs/package.nix new file mode 100644 index 000000000000..01e1b624821b --- /dev/null +++ b/pkgs/by-name/el/electrs/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + rocksdb_7_10, +}: + +let + rocksdb = rocksdb_7_10; +in +rustPlatform.buildRustPackage rec { + pname = "electrs"; + version = "0.10.9"; + + src = fetchFromGitHub { + owner = "romanz"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Xo7aqP4tIh/kYthPucscxnl+ZtVioEja4TTFdH0Q350="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-wDEtVsgkddGv89tTy96wYzNWVicn34Gxi+YAo7yAfQA="; + + # needed for librocksdb-sys + nativeBuildInputs = [ rustPlatform.bindgenHook ]; + + # link rocksdb dynamically + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Efficient re-implementation of Electrum Server in Rust"; + homepage = "https://github.com/romanz/electrs"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + mainProgram = "electrs"; + }; +} diff --git a/pkgs/applications/blockchains/electrs/update.sh b/pkgs/by-name/el/electrs/update.sh similarity index 100% rename from pkgs/applications/blockchains/electrs/update.sh rename to pkgs/by-name/el/electrs/update.sh diff --git a/pkgs/by-name/el/elektroid/package.nix b/pkgs/by-name/el/elektroid/package.nix index cc4f8202ba04..0441e2a3f500 100644 --- a/pkgs/by-name/el/elektroid/package.nix +++ b/pkgs/by-name/el/elektroid/package.nix @@ -15,7 +15,7 @@ }: let - version = "3.1"; + version = "3.2.3"; in stdenv.mkDerivation { inherit version; @@ -26,7 +26,7 @@ stdenv.mkDerivation { owner = "dagargo"; repo = "elektroid"; rev = version; - hash = "sha256-YJcvJlnRUhwjQ6P3jgjyDtoJhuije1uY77mGNGZure0="; + hash = "sha256-gK6WQA0KenyksLLFHejCXDTpBm2uhJwn6/E4TXUdeJ8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/element-call/missing-hashes.json b/pkgs/by-name/el/element-call/missing-hashes.json new file mode 100644 index 000000000000..9b6751d6b314 --- /dev/null +++ b/pkgs/by-name/el/element-call/missing-hashes.json @@ -0,0 +1,67 @@ +{ + "@esbuild/aix-ppc64@npm:0.25.1": "6de3a364b7f79f21f66d606d4d29c72ef81c741d71ab4bb941c4eabe7b6a809b1340f4dd5c943827005e421912880741320b9617d17fce762d204cfb94175223", + "@esbuild/android-arm64@npm:0.25.1": "716c98ad3220c71cbaedcfa34aa7c877a3fae911938c3776a66600d7f65980e384799a6832a1b9aea96c6d5a8880610f54744bd0813e743c511d44056ef528d6", + "@esbuild/android-arm@npm:0.25.1": "d2c9e95dd2027f6e14250a90a11136d9ce73a2157a8d104df4a9dd199d3c50cd91f25813536b4776630acb78596bd5a025976962c6d624df7594c32f2d9c1395", + "@esbuild/android-x64@npm:0.25.1": "92f1bec801b414ecdc4b73adfbb4482f4f2cfba423d33296914fa59ffdafb81facc445a7f65d1eea813c078220a0606f4be02252843bb9039ceb2755f643387c", + "@esbuild/darwin-arm64@npm:0.25.1": "9c4cd09c0bd8479e27e04e2397edccebae928184c463684490137d2b7ea3171051b66596db229af2ad3e6a911c1c8a9d10b8aed30d11d0aa155ac0d309fd5dd6", + "@esbuild/darwin-x64@npm:0.25.1": "31b64c02be9438e175e8b343c52e0bbc7964f08a1b44e0adbfa2a1b229ccd0ad0184cdb8313272b4590298833ea0b197d82a909466caffe90105f8acb30402d0", + "@esbuild/freebsd-arm64@npm:0.25.1": "e04018ffd760dd101a5931e0248751bdfca98e3f29be9b41051d55278907f52a3e5ab80c32168e208c2ff287510d6d5b765d3adc841bfd621af7930c10a547e6", + "@esbuild/freebsd-x64@npm:0.25.1": "438215bea2dc716d2c9ffe9b921bbde06e77d96ec0c837fd79f46bc6e195aa50e5f55490228f7433df7aa47810eec5c602a9d9cf956c1794778018632b196f34", + "@esbuild/linux-arm64@npm:0.25.1": "c839788b6db471f144bc2627a117083c9a50402c76cde2f0e5411faaeb3a5cde4972bb7336b87de67cd0a65d4d5b00759668407a03b5d4ed3130d4984837429a", + "@esbuild/linux-arm@npm:0.25.1": "ecf9fd9028d2166619b9a45161a987eebb6ef3dcb0159a2607ab164c58c26a15cf274e0b1088834c07ef9166349276d595fdad5c42bce8d03a55cb213d947efa", + "@esbuild/linux-ia32@npm:0.25.1": "36f208e10a4b778a28a9002338872e52d24dfc18e25d3b41dc53892279c3ee842d76c7b608a30620f128d85344acac0dc86f203f5de7082a21fa2e908c96b68c", + "@esbuild/linux-loong64@npm:0.25.1": "75d95e6ee995c9f2abb202ca430685e5d58fbe9b0b5b01a69b498c9b360d309026d15bae7831de9c0c4f02e45028a92ffb169117c3b56dd1ac7ea8c6ef50628d", + "@esbuild/linux-mips64el@npm:0.25.1": "7fc22eb8a7dc9ee743113cb327eef3591bced4753f416f8dd722794a198a053ab6e120b3b13c1bb6cc89cbd02ea502187b1a3c9ebe8187407665c78995153740", + "@esbuild/linux-ppc64@npm:0.25.1": "84f914a776774bf209c5f96a3708e52477e1966b689a880c0256530063bc581125b5cc04b9700f4aa892e7770ba47c5a950a4be9f1bb3ccbe60a500383602156", + "@esbuild/linux-riscv64@npm:0.25.1": "97f47cd5695686254b58f950ca973df1fcecfebf3bd585629121a65323ffaa7f95cf821392011ee069da492b46fdff771be332c699a438cf123351610e12d621", + "@esbuild/linux-s390x@npm:0.25.1": "10760a999d432d092a8ebe5f09752ee7e8ea77a1afa5f1adfe7f9ccb5bbf77d6e0da6dce5d1a4a7cd731d89b6075723c2bc0328f446ed129c4b63c6441ba22ae", + "@esbuild/linux-x64@npm:0.25.1": "4cdb1625726580eb42432878912d5480a0321559ef2c6425c1db55f89f3fe1c35fb03b3adec92c3f52a4db751d7535f23086b80ed7b219d1edbb254ffbe96e68", + "@esbuild/netbsd-arm64@npm:0.25.1": "f2427b094e072d2db7944b1d2a988dd9f17627976a395b941f225aec2d0565da2ea110a845eafae960af08e3eea74eb327e5eb9dbe06dc1e14f4439596c3b47c", + "@esbuild/netbsd-x64@npm:0.25.1": "c8347ecc18b175923a3cbdaef61b64815ffe0cf2cc285f4034337c2df83e78a118ebfdf2ac3a46a8d8a19ce6a0e0605d27d11570d1758ab90074c99047b82fc0", + "@esbuild/openbsd-arm64@npm:0.25.1": "719812786b4f3ab4471a306c930ab1bf31e9d92f933ea2a34566f07d6269df5058e7d48408127daa197e6fdb21e30697303127d259b76b18936d534619a3eb15", + "@esbuild/openbsd-x64@npm:0.25.1": "21590cbeda028e9b9f8131c54c36bab65a5d5bd5dd4e6bd9f80438045a655e9ac634bb3535a8650b694db267fe23bd2318a59cdec2fae1ba389ed1a00cc0bbe7", + "@esbuild/sunos-x64@npm:0.25.1": "e20ce3891d8717fe2cb885d92d16e9409802316eaa91071be5c7d75164d23dbc5a502be3691039051843d94192e8cf43ade61014a8bce298cfc13a8d3ddd85b0", + "@esbuild/win32-arm64@npm:0.25.1": "749a211eae6a47e5ceb71898df668d083bdec2ed762116fea7772824281f793aceb0487946e20ff604d7e102d1fc8538a73f15b476ca36e07f7ddfb601f6dfa1", + "@esbuild/win32-ia32@npm:0.25.1": "bb45fd889d858678ec68114bfc398965ed8d44e46a9517fcd9f7b397101c2cf94d78938a2640f6f2a1fe65de4ae8830fd426cd21a28302bb92333913b3c16c85", + "@esbuild/win32-x64@npm:0.25.1": "e33291b9834095e6460bd20bb15c49361758bf66d28ccffe0c06a1565211c91f668d9cfc0cbd5bd7a5def693fe7272dbe290b08d4eadba29e750c8a9c739f564", + "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a", + "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79", + "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b", + "@parcel/watcher-freebsd-x64@npm:2.5.1": "cbd2b7884bc92422edabc0c74c3fbc06512bb7300fc137aaff2e96f46f61e5272265a0b5d230acc82a0e777b0c11661f0b8b7f89a9342c0920b752436dd2c750", + "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "f2e1ec14dbb0f85a84a75f55fd7721598694976ba3ad439832b57e558b0d9240cc80ff83053fb8cf7caffb0592d51bb39d325112763ec1734924b49d4ba9c144", + "@parcel/watcher-linux-arm-musl@npm:2.5.1": "83344c7ecda2e79db59d711bcee0c3fa26922989139c031bd762cf3d5bfb191797e22e9ed6072690b822dfd62629623ba4e7eedb3c41930a987fc3d4106000e1", + "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "562231feb159a294752378bebecc69a2d33366a9d877835844578799f8536398006e0e570849f9e2db04085a3ea82131459cd10fd6b42dea10cd73bd0c9ca13e", + "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "f62db52a90ebbaa29ca9900e6b9bd3fc6e5c650741bbde9a2742cbc332c678b753fc6a596d67659394fd9262aa826463ea667d18cc554bcaaac9e8da1a2a29d0", + "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "425e557991fde5092d6a9e20be71810600415e5fa157dca0b39bd8db86653d3ee7b037305261c8782d1a065f2a64d235e17b57876b26f5bb0dd7a9bdbe364690", + "@parcel/watcher-linux-x64-musl@npm:2.5.1": "4dbb066ba9478c8b8de39e3c1083cbb74f86f03eaf4445603e69909d6c072134644316faa20a2445419b9fe1a8063ade7b5331a5766d807ee0b15b8a70c59a2d", + "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628", + "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c", + "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963", + "@rollup/rollup-android-arm-eabi@npm:4.37.0": "137cc44b5452772bc857f3a9b113dc89a95b0d529963e91a49ac1b336302f37931da052a5d07c294da6060d07251c0251c7d363fd2be1775b59afd84a4c2ec67", + "@rollup/rollup-android-arm64@npm:4.37.0": "a6856efb422e0e9ab62f407e0e73908fe78d42fbb2730aeeba3d8b3f034449ef248a0fb596b5af3e87f7054e00328aa4322525a375508f492dbc7c2478aa0e49", + "@rollup/rollup-darwin-arm64@npm:4.37.0": "ac29a2a8eb0e40c54a1685c868436658682293cacde10b7cbf587845902e4e95ec4b84e4eefbf7ac6a4b6330b47fe4094dbeeb90f22c0ee130ff984b8d3a1cb9", + "@rollup/rollup-darwin-x64@npm:4.37.0": "037115d7f3b9ceab60df8ea12a48762a6c4051da7008a6b5d47174d9980759c392d7c6e4e79e2989744f0a16d1fb78ae97a9abd309fb1c41b07b65fab1700338", + "@rollup/rollup-freebsd-arm64@npm:4.37.0": "8ac2a91f628962633cf33aa462e567b1fc09b4ea09bf7a882ebb7ebf7adf4530d5f9d1b2dfa50ef64ddfa4b820e1eea324041f4c847298ddbe48d7491a944016", + "@rollup/rollup-freebsd-x64@npm:4.37.0": "855b528e935ad21de0297112b2b73ea4ca7db94278606811f2d61011cf8f8042e4b7127f7993859320876fba585a00c5e7e11c7b50ce23af4ccca3679a69754f", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.37.0": "dc126fb662d1a645ab41680033a987908ed0565b4ea9d414a9a46a61c06e9b136c010d1f28b1c34ffb101375a5279f18ee70d0d9b4ff1f2db80a54a05af3071d", + "@rollup/rollup-linux-arm-musleabihf@npm:4.37.0": "206cf3b319948b5d2d5ada18c698f16350c4cb64b53ad754fad91c1fe403c5fc110b3d3d2436433c5fd9ed1e1cec3535ed184902a6986f8bc0ae9770360e3c0b", + "@rollup/rollup-linux-arm64-gnu@npm:4.37.0": "f96da93f09aad5145f6fcfd69eccb6a2d407754e13f168d161dd2280991b7e4a3a514009b8a796767e5bd85ca0e4f81e2aea19781bb027d3ec59cf01768e2e1c", + "@rollup/rollup-linux-arm64-musl@npm:4.37.0": "c31f0c0aeefd18b59212f845aacac5a5a614ce0101db27dcc53884ae4d4e766d399d816104a10f4ee8c4c28e2045abb2d6a778c00bd30a430b3f34be4445cb1c", + "@rollup/rollup-linux-loongarch64-gnu@npm:4.37.0": "d69b456caaa8c12c2936a6836dc2dd3b9169ebfc2d888c904d3407fb2c53ba99a3323bfd36d447c17ff0b9e31b4709defaf72cafb32c23c773fbffdee50bc7fc", + "@rollup/rollup-linux-powerpc64le-gnu@npm:4.37.0": "abc5b4e7960965f01948dbf7e956695643cf6ab78ef1d14f2bc34b93cbb85a9ccb9c005dfbf948a80145cd808078a34d216c9d4e801570e2ca638a563ecd0ae2", + "@rollup/rollup-linux-riscv64-gnu@npm:4.37.0": "a9a5fe6a24955dae476c9ab5fb22d5f807e0ff916ff1ec289c8050e6688695e9c434dfdb130282712dd3657bf883af4544ed1ebc77b68530ccb8e33af484a41e", + "@rollup/rollup-linux-riscv64-musl@npm:4.37.0": "e6cd70f709a59037f496d1086f34148ef2ba92bbf1813e07ccd52b3643822486fa95671a6ed4a3397b9ef23e3a4dea20926f9e1a26b00a06173202627cf2f0ce", + "@rollup/rollup-linux-s390x-gnu@npm:4.37.0": "a6704bd605db0a99a60947a6a69ad6d1dbf712f57d4bcaba24a122cc062b2513319726e8211410d5d9d2bc1face3b153c45c4c9209ead6a25f87cf6e79828864", + "@rollup/rollup-linux-x64-gnu@npm:4.37.0": "fb0ee05c300d73fb05e5584418c41cd616aca8ccb4c4397b56ada769b4e3655223cdea2ce136c3ff3ed3efb9f74800acbd4801135afc3fbd49b29fff092ebd8c", + "@rollup/rollup-linux-x64-musl@npm:4.37.0": "c502057b9ef77bb43df6337eb02c5bbb8f7aabb2780f3de8256048ade427d319e4d5cca4e4238c3076ddddfd9749d9854e8fbc7f6e50cec84e778da6dafe90b7", + "@rollup/rollup-win32-arm64-msvc@npm:4.37.0": "4a6a5c2fb0c520edd3f67deb773ff600698a665ac5a4ba4ac8147836aa054be0f3fab54c841f3eef2b638224dd432a62b5f48b3704f5d3dd37ec7fcfc6a70591", + "@rollup/rollup-win32-ia32-msvc@npm:4.37.0": "439f4339c26c104333b3f55a34ef1a2280b22eec165362eee1816548a0b93f0440a6e3982af9263d1a4158d665a6ecba68c64bf12a786eae69db232399598321", + "@rollup/rollup-win32-x64-msvc@npm:4.37.0": "0c85f06fddfc73dd4457a6c6ec841e52d0fb81179fe63754bd3c02c4795ec338685bd14ff49672ddfb3767aecf4f01f4a5da5730b0cf62be318753390027de37", + "@sentry/cli-darwin@npm:2.42.2": "3df1b8774a2dffba2a413420b573d0ddb94a51ab530cfcf719736cac37fb9b6ff835516b4b783771f003659436a00d3ee5ea201fb2510c1ea517d7256c619b50", + "@sentry/cli-linux-arm64@npm:2.42.2": "17ab90626910c137925aa307bfb4b2f5790a756eaec9bbfa1066b1c2265ec1981ae3d7c8b2014071da9dd3a604cf150ba9a8d93a16e0da155831c7c8a524f956", + "@sentry/cli-linux-arm@npm:2.42.2": "2d31e7d2603f124e2a36626e91dd8c50a0eba27386b94a7076115022e50193140d7f613850adf64740ee46102cec99845750df05430dd16ea50f01607ead6d2d", + "@sentry/cli-linux-i686@npm:2.42.2": "e5c52d65f507393c786373aaff873d6522f9ab26ef3cea498268ef63d053dc9f4e806c3295c22b48c5dd1f7ecf0c47bfaa0f7545424ef81a3cd51914de2af2bc", + "@sentry/cli-linux-x64@npm:2.42.2": "62ed35b355b7673c8cc1d1542c21d1fb908022c2cc951eda47ee4a55c3e53499c1eca08b93408b547adf9ffe7bcb6d43efa50f185f6fa66155a13373ea79d5f3", + "@sentry/cli-win32-i686@npm:2.42.2": "3876d8d3f6139d984714ed5fed8ef124d32af8f5d7cd6968adc8e910727e12eb39d85dcc6304a5e249dce7d8e93e11f8bcfde83545835d959f260bf4b1914d00", + "@sentry/cli-win32-x64@npm:2.42.2": "16e6deb7f0faaed1a88c121463b3ef727726351ec04afe3308ff3775d26e1d7b990a3fd65b216d7fc2ac4f6967c625f14e6dbc2dab99fcc9d7a625ec80422ab8" +} diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index d2da74943ee1..3f1562e4cdd4 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -3,33 +3,60 @@ stdenv, fetchFromGitHub, fetchYarnDeps, + git, + yarn-berry, yarnConfigHook, - yarnBuildHook, nodejs, }: stdenv.mkDerivation (finalAttrs: { pname = "element-call"; - version = "0.9.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-call"; tag = "v${finalAttrs.version}"; - hash = "sha256-BugR5aXDxIQ9WOhaqXEoo0FdZHnYSvoqDoRJLDd4PUk="; + hash = "sha256-SNwNo3v2HydNXtb3H3Xh2mYBIagMkWjitlKWTfraeVU="; }; - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-7dUSt1k/5N6BaYrT272J6xxDGgloAsDw1dCFh327Itc="; + matrixJsSdkRevision = "19b1b901f575755d29d1fe03ca48cbf7c1cae05c"; + matrixJsSdkOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.offlineCache}/checkouts/${finalAttrs.matrixJsSdkRevision}/yarn.lock"; + hash = "sha256-pi2MW+58DCkHJDOxMWeXzF+v+5JhJFGQcUgsRsYjNvw="; + }; + + dontYarnInstallDeps = true; + preConfigure = '' + cp -r $offlineCache writable + chmod u+w -R writable + pushd writable/checkouts/${finalAttrs.matrixJsSdkRevision}/ + mkdir -p .git/{refs,objects} + echo ${finalAttrs.matrixJsSdkRevision} > .git/HEAD + SKIP_YARN_COREPACK_CHECK=1 offlineCache=$matrixJsSdkOfflineCache yarnConfigHook + popd + offlineCache=writable + ''; + + missingHashes = ./missing-hashes.json; + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src missingHashes; + hash = "sha256-Z8gTt4W78w2DdkRhnaPLG2RIwfT64RFs5+UobARDG4c="; }; nativeBuildInputs = [ + git + yarn-berry.yarnBerryConfigHook yarnConfigHook - yarnBuildHook nodejs ]; + buildPhase = '' + runHook preBuild + ${lib.getExe yarn-berry} build + runHook postBuild + ''; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index 6c2c1af2e9c1..1a72d1488ab6 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.96"; + "version" = "1.11.100"; "hashes" = { - "desktopSrcHash" = "sha256-oTU/Pvl4gBp69OrUrXEYXupl0WphsEWt32sB4v6T+gA="; - "desktopYarnHash" = "sha256-zMdSA/CkMDXirWZ2uCPTgZ5iErV7rGyR+xcLh9sPDA8="; + "desktopSrcHash" = "sha256-qlKZkBPWcD1eyEetCrIKsSXmodg6DYCmENfY+UT7Khc="; + "desktopYarnHash" = "sha256-wuRAeb4IpA2Ihr3ohaMPvFsaMod4Bg8o9lm8yzStwmk="; }; } diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix index a6548b041c25..56a49eef1459 100644 --- a/pkgs/by-name/el/element-desktop/keytar/default.nix +++ b/pkgs/by-name/el/element-desktop/keytar/default.nix @@ -11,17 +11,10 @@ fetchNpmDeps, npmHooks, electron, - runCommand, }: let pinData = lib.importJSON ./pin.json; - - electron-headers = runCommand "electron-headers" { } '' - mkdir -p $out - tar -C $out --strip-components=1 -xvf ${electron.headers} - ''; - in stdenv.mkDerivation rec { pname = "keytar-forked"; @@ -57,7 +50,7 @@ stdenv.mkDerivation rec { npmFlags = [ # Make sure the native modules are built against electron's ABI - "--nodedir=${electron-headers}" + "--nodedir=${electron.headers}" # https://nodejs.org/api/os.html#osarch "--arch=${ if stdenv.hostPlatform.parsed.cpu.name == "i686" then diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 8efe960d6b4f..0f8aac729c08 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -8,7 +8,7 @@ nodejs, fetchYarnDeps, jq, - electron_34, + electron_35, element-web, sqlcipher, callPackage, @@ -22,7 +22,7 @@ let pinData = import ./element-desktop-pin.nix; inherit (pinData.hashes) desktopSrcHash desktopYarnHash; executableName = "element-desktop"; - electron = electron_34; + electron = electron_35; keytar = callPackage ./keytar { inherit electron; }; @@ -123,7 +123,10 @@ stdenv.mkDerivation ( "Chat" ]; startupWMClass = "Element"; - mimeTypes = [ "x-scheme-handler/element" ]; + mimeTypes = [ + "x-scheme-handler/element" + "x-scheme-handler/io.element.desktop" + ]; }; postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -151,7 +154,7 @@ stdenv.mkDerivation ( homepage = "https://element.io/"; changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = teams.matrix.members; + teams = [ teams.matrix ]; inherit (electron.meta) platforms; mainProgram = "element-desktop"; }; diff --git a/pkgs/by-name/el/element-desktop/update.sh b/pkgs/by-name/el/element-desktop/update.sh index 20251b2644a4..ca573c6e994c 100755 --- a/pkgs/by-name/el/element-desktop/update.sh +++ b/pkgs/by-name/el/element-desktop/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq +#!nix-shell -i bash -p nix coreutils prefetch-yarn-deps jq curl if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." @@ -12,54 +12,49 @@ version="$1" set -euo pipefail if [ -z "$version" ]; then - version="$(wget -q -O- "https://api.github.com/repos/element-hq/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" + version="$(curl -fsSL "https://api.github.com/repos/element-hq/element-desktop/releases/latest" | jq -r '.tag_name')" fi # strip leading "v" version="${version#v}" -# Element Web -web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version" -web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash) - cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 -web_tmpdir=$(mktemp -d) -trap 'rm -rf "$web_tmpdir"' EXIT +nixflags=( + --extra-experimental-features + "nix-command flakes" +) -pushd $web_tmpdir -wget -q "$web_src/yarn.lock" -web_yarn_hash=$(prefetch-yarn-deps yarn.lock) -popd +# HACK: prefetch-yarn-deps hashes may output extra clutter on stdout (!) so +# we'll need to get the last line, last word +fixupHash() { + local sorta_yarn_hash="$(tail -n1 <<< "$1")" + local almost_yarn_hash="${sorta_yarn_hash##* }" + local yarn_hash="$(nix "${nixflags[@]}" hash convert --hash-algo sha256 "$almost_yarn_hash")" -# Element Desktop -desktop_src="https://raw.githubusercontent.com/element-hq/element-desktop/v$version" -desktop_src_hash=$(nix-prefetch-github element-hq element-desktop --rev v${version} | jq -r .hash) + printf "%s" "$yarn_hash" +} -desktop_tmpdir=$(mktemp -d) -trap 'rm -rf "$desktop_tmpdir"' EXIT +getHashes() { + variant="$1" + output="$2" -pushd $desktop_tmpdir -wget -q "$desktop_src/yarn.lock" -desktop_yarn_hash=$(prefetch-yarn-deps yarn.lock) -popd + local url="github:element-hq/element-$variant/v$version" + local src="$(nix "${nixflags[@]}" flake prefetch --json "$url")" + local src_hash="$(jq -r ".hash" <<< "$src")" + local src_path="$(jq -r ".storePath" <<< "$src")" + local yarn_hash="$(fixupHash "$(prefetch-yarn-deps "$src_path/yarn.lock")")" -cat > ../element-web-unwrapped/element-web-pin.nix << EOF + cat > "$output" << EOF { "version" = "$version"; "hashes" = { - "webSrcHash" = "$web_src_hash"; - "webYarnHash" = "$web_yarn_hash"; + "${variant}SrcHash" = "$src_hash"; + "${variant}YarnHash" = "$yarn_hash"; }; } EOF +} -cat > element-desktop-pin.nix << EOF -{ - "version" = "$version"; - "hashes" = { - "desktopSrcHash" = "$desktop_src_hash"; - "desktopYarnHash" = "$desktop_yarn_hash"; - }; -} -EOF +getHashes web ../element-web-unwrapped/element-web-pin.nix +getHashes desktop element-desktop-pin.nix diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index e6e132a09f70..2fb0517243dc 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.96"; + "version" = "1.11.100"; "hashes" = { - "webSrcHash" = "sha256-EfSQEyMG9v5Boev98FyfzLA3hZLzxSGxAnZFfbc2aVA="; - "webYarnHash" = "sha256-Dp7WXEjWSDQjpmnJUrloIQau6is8YxTYzJmnQBIk+Ys="; + "webSrcHash" = "sha256-FiYjWOJ50Vhbs9vgEqK64HTVtwSuy4/BZAkPK4c6DXQ="; + "webYarnHash" = "sha256-C1yVJHU9ClTJHQfMLkdZEeRWVVu68eJp2kxnIlLinY8="; }; } diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index 22c01011aa96..1c842d2fe8ec 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation ( description = "Glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; - maintainers = lib.teams.matrix.members; + teams = [ lib.teams.matrix ]; license = lib.licenses.asl20; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix index d798058ac647..0232f3e1c6bb 100644 --- a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix +++ b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; # darwin cannot deal with file names differing only in case platforms = platforms.linux; - maintainers = with maintainers; [ ] ++ teams.xfce.members; + teams = [ teams.xfce ]; }; } diff --git a/pkgs/by-name/el/elf-info/package.nix b/pkgs/by-name/el/elf-info/package.nix index 776a386483f6..051e238e7fec 100644 --- a/pkgs/by-name/el/elf-info/package.nix +++ b/pkgs/by-name/el/elf-info/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "elf-info"; version = "0.3.0"; src = fetchFromGitHub { owner = "kevin-lesenechal"; repo = "elf-info"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wbFVuoarOoxV9FqmuHJ9eZlG4rRqy1rsnuqbGorC2Rk="; }; @@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ viperML ]; mainProgram = "elf"; }; -} +}) diff --git a/pkgs/by-name/el/elfcat/package.nix b/pkgs/by-name/el/elfcat/package.nix index b0c5dc1265e4..f82b051828f6 100644 --- a/pkgs/by-name/el/elfcat/package.nix +++ b/pkgs/by-name/el/elfcat/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "ruslashev"; repo = "elfcat"; rev = version; - sha256 = "sha256-lmoOwxRGXcInoFb2YDawLKaebkcUftzpPZ1iTXbl++c="; + sha256 = "sha256-8jyOYV455APlf8F6HmgyvgfNGddMzrcGhj7yFQT6qvg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3rqxST7dcp/2+B7DiY92C75P0vQyN2KY3DigBEZ1W1w="; + cargoHash = "sha256-oVl+40QunvKZIbhsOgqNTsvWduCXP/QJ0amT8ECSsMU="; meta = with lib; { description = "ELF visualizer, generates HTML files from ELF binaries"; diff --git a/pkgs/by-name/el/elfdeps/package.nix b/pkgs/by-name/el/elfdeps/package.nix new file mode 100644 index 000000000000..045faa19eb13 --- /dev/null +++ b/pkgs/by-name/el/elfdeps/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "elfdeps"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "python-wheel-build"; + repo = "elfdeps"; + tag = "v${version}"; + hash = "sha256-5CrxVmtZcBYBMXw7o58CpFopYFgXD4W/S42aow1z1Xw="; + }; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + dependencies = [ python3Packages.pyelftools ]; + + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; + + pythonImportsCheck = [ + "elfdeps" + ]; + + preCheck = '' + export PATH=$PATH:$out/bin + ''; + + # tests assume that sys.executable is an ELF object + doCheck = stdenv.hostPlatform.isElf; + + disabledTests = [ + # Attempts to zip sys.executable and fails with: + # ValueError: ZIP does not support timestamps before 1980 + "test_main_zipfile" + "test_zipmember_python" + ]; + + meta = { + description = "Python implementation of RPM elfdeps"; + homepage = "https://pypi.org/project/elfdeps/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ booxter ]; + mainProgram = "elfdeps"; + }; +} diff --git a/pkgs/by-name/el/eliza/package.nix b/pkgs/by-name/el/eliza/package.nix new file mode 100644 index 000000000000..d75683ff95ff --- /dev/null +++ b/pkgs/by-name/el/eliza/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eliza"; + version = "0-unstable-2025-05-13"; + src = fetchFromGitHub { + owner = "anthay"; + repo = "ELIZA"; + rev = "00a277838ac0adb2165625129769c78d518a7215"; + hash = "sha256-CSQyVnjyoSNwQlVXhpqjTGJ8psV9z0m2+ZOWUh6Dhm0="; + }; + + doCheck = true; + + # Unit tests are executed automatically on execution + checkPhase = '' + runHook preCheck + echo Corki is mana | ./eliza + runHook postCheck + ''; + + buildPhase = '' + runHook preBuild + $CXX -std=c++20 -pedantic -o eliza ./src/eliza.cpp + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm544 ./eliza $out/bin/eliza + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version=branch=master" + ]; + }; + + meta = { + description = "C++ simulation of Joseph Weizenbaum’s 1966 ELIZA"; + longDescription = '' + This is an implementation in C++ of ELIZA that attempts to be as close + to the original as possible. + It was made to closely follow Joseph Weizenbaum’s description of his program + given in his January 1966 Communications of the ACM paper, and later changed + to follow the ELIZA source code found on 2021 and the SLIP programming + function HASH(D,N) found on 2022. + It is controlled by a script identical to the one given in the appendix of + the 1966 paper. + ''; + license = lib.licenses.cc0; + mainProgram = "eliza"; + homepage = "https://github.com/anthay/ELIZA"; + maintainers = with lib.maintainers; [ EmanuelM153 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix index c5a1475eaaae..5359f06a457f 100644 --- a/pkgs/by-name/el/ell/package.nix +++ b/pkgs/by-name/el/ell/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.71"; + version = "0.76"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-nbfWjV0zPPx2kcnD/aRaWSXUGIqrUX7Z4U45ASk5Ric="; + hash = "sha256-LSTmcVBKI+EpDiTpiKFEeIIXIXc6C5gOYn5zf7sHe/I="; }; nativeBuildInputs = [ @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { # Runs multiple dbus instances on the same port failing the bind. enableParallelChecking = false; + # 'unit/test-hwdb' fails in the sandbox as it relies on + # '/etc/udev/hwdb.bin' file presence in the sandbox. `nixpkgs` does + # not provide it today in any form. Let's skip the test. + env.XFAIL_TESTS = "unit/test-hwdb"; + # tests sporadically fail on musl doCheck = !stdenv.hostPlatform.isMusl; diff --git a/pkgs/by-name/el/elliptic_curves/package.nix b/pkgs/by-name/el/elliptic_curves/package.nix index 314d6b9b310b..f11cfadaf38f 100644 --- a/pkgs/by-name/el/elliptic_curves/package.nix +++ b/pkgs/by-name/el/elliptic_curves/package.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; platforms = platforms.all; - maintainers = teams.sage.members; + teams = [ teams.sage ]; }; } diff --git a/pkgs/by-name/el/elm-land/package.nix b/pkgs/by-name/el/elm-land/package.nix index b086dac6f058..efd66003ec97 100644 --- a/pkgs/by-name/el/elm-land/package.nix +++ b/pkgs/by-name/el/elm-land/package.nix @@ -40,7 +40,7 @@ buildNpmPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = writeShellScript "update-elm-land" '' diff --git a/pkgs/by-name/el/eloquent/package.nix b/pkgs/by-name/el/eloquent/package.nix new file mode 100644 index 000000000000..f3364611b620 --- /dev/null +++ b/pkgs/by-name/el/eloquent/package.nix @@ -0,0 +1,100 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + glib, + gjs, + ninja, + gtk4, + gsettings-desktop-schemas, + wrapGAppsHook4, + desktop-file-utils, + gobject-introspection, + glib-networking, + pkg-config, + libadwaita, + appstream, + blueprint-compiler, + gettext, + libportal-gtk4, + languagetool, + libsoup_3, + openjdk, + xdg-desktop-portal, + dbus, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eloquent"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "sonnyp"; + repo = "Eloquent"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-I4AQZl1zoZPhOwDR1uYNJTMRq5vQHPvyimC8OUAe+vY="; + }; + + nativeBuildInputs = [ + appstream + blueprint-compiler + desktop-file-utils + gjs + gobject-introspection + libportal-gtk4 + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + dbus + gettext + gjs + glib + glib-networking + gsettings-desktop-schemas + gtk4 + libadwaita + libportal-gtk4 + libsoup_3 + xdg-desktop-portal + ]; + + postPatch = '' + substituteInPlace troll/gjspack/bin/gjspack \ + --replace-fail "/usr/bin/env -S gjs" "${gjs}/bin/gjs" + + substituteInPlace src/languagetool.js \ + --replace-fail "/app/LanguageTool/languagetool-server.jar" "${languagetool}/share/languagetool-server.jar" \ + --replace-fail "--config" "" \ + --replace-fail "/app/share/server.properties" "" + + sed -i "1 a imports.package._findEffectiveEntryPointName = () => 're.sonny.Eloquent';" src/bin.js + patchShebangs . + ''; + + strictDeps = true; + + preFixup = '' + gappsWrapperArgs+=( + --set JAVA_HOME ${openjdk} + --prefix PATH : ${openjdk}/bin + ) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Proofreading software for English, Spanish, French, German, and more than 20 other languages"; + homepage = "https://github.com/sonnyp/eloquent"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ thtrf ]; + mainProgram = "eloquent"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/el/elpa/package.nix b/pkgs/by-name/el/elpa/package.nix index d629171220ce..a2901aacea0f 100644 --- a/pkgs/by-name/el/elpa/package.nix +++ b/pkgs/by-name/el/elpa/package.nix @@ -28,13 +28,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2025.01.001"; + version = "2025.01.002"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "sha256-PvDGrtmj4F2276/m4U1m64iyoTVNYedlt83g09XzlR4="; + sha256 = "sha256-j+vkCMWQuptEvYvOBGBf0bfalkr82P1fHOnt7LPQtl0="; }; patches = [ diff --git a/pkgs/by-name/el/elvis/package.nix b/pkgs/by-name/el/elvis/package.nix index b3740b94bfe2..ce4c70ee3085 100644 --- a/pkgs/by-name/el/elvis/package.nix +++ b/pkgs/by-name/el/elvis/package.nix @@ -36,13 +36,22 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ncurses ]; - configureFlags = [ "--ioctl=termios" ]; + configureFlags = [ + "--ioctl=termios" + "--libs=-lncurses" + ]; strictDeps = false; postPatch = '' substituteInPlace configure \ - --replace-fail '-lcurses' '-lncurses' + --replace-fail '-lcurses' '-lncurses' \ + --replace-fail 'if [ -f /usr/include/sys/wait.h ]' 'if true' + ''; + + postConfigure = '' + echo >>config.h '#undef NEED_MEMMOVE' + echo >>config.h '#define NEED_IOCTL_H' ''; installPhase = '' diff --git a/pkgs/by-name/em/embellish/package.nix b/pkgs/by-name/em/embellish/package.nix new file mode 100644 index 000000000000..7e3ef1eea662 --- /dev/null +++ b/pkgs/by-name/em/embellish/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + glib, + gobject-introspection, + gtk4, + desktop-file-utils, + gettext, + wrapGAppsHook4, + libadwaita, + gjs, + gnome-autoar, + libsoup_3, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "embellish"; + version = "0.4.7"; + + src = fetchFromGitHub { + owner = "getnf"; + repo = "embellish"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+tTuQNok2rqTcQR4CRMc4qRqw0Ah2rovIut618z9GhU="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + glib + gobject-introspection + gtk4 + gettext + desktop-file-utils + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4 + libadwaita + gjs + gnome-autoar + libsoup_3 + ]; + + meta = { + description = "User-friendly application designed for managing Nerd Fonts on your system"; + longDescription = '' + Embellish provides a seamless experience for installing, uninstalling + and updating of Nerd Fonts. It's able to: + - List all available Nerd Fonts + - Download and install a Font + - Uninstall an installed Font + - Update an installed font + - Preview fonts + - Search fonts + - Read font's licence(s) + ''; + homepage = "https://github.com/getnf/embellish"; + changelog = "https://github.com/getnf/embellish/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ normalcea ]; + mainProgram = "io.github.getnf.embellish"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix index d5687cfd4469..7032068f91e6 100644 --- a/pkgs/by-name/em/emblem/package.nix +++ b/pkgs/by-name/em/emblem/package.nix @@ -13,13 +13,12 @@ wrapGAppsHook4, libadwaita, libxml2, - darwin, nix-update-script, }: stdenv.mkDerivation rec { pname = "emblem"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -27,13 +26,13 @@ stdenv.mkDerivation rec { owner = "design"; repo = "emblem"; rev = version; - sha256 = "sha256-pW+2kQANZ9M1f0jMoBqCxMjLCu0xAnuEE2EdzDq4ZCE="; + sha256 = "sha256-knq8OKoc8Xv7lOr0ub9+2JfeQE84UlTHR1q4SFFF8Ug="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-j9PrnXt0GyyfCKmcq1zYmDNlrvogtK5n316MIC+z+w0="; + hash = "sha256-CsISaVlRGtVVEna1jyGZo/IdWcJdwHJv6LXcXYha2UE="; }; nativeBuildInputs = [ @@ -48,14 +47,10 @@ stdenv.mkDerivation rec { rustc ]; - buildInputs = - [ - libadwaita - libxml2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libadwaita + libxml2 + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ @@ -73,12 +68,10 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/World/design/emblem"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; - maintainers = - with lib.maintainers; - [ - figsoda - foo-dogsquared - ] - ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ + figsoda + foo-dogsquared + ]; + teams = [ lib.teams.gnome-circle ]; }; } diff --git a/pkgs/by-name/em/emcee/package.nix b/pkgs/by-name/em/emcee/package.nix new file mode 100644 index 000000000000..835409bb6a5f --- /dev/null +++ b/pkgs/by-name/em/emcee/package.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "emcee"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "loopwork-ai"; + repo = "emcee"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qiH9Om1ChuMpU3CFQkOdJj1uITSI7hojRtXkRF9GSC0="; + }; + + vendorHash = "sha256-TU6Z06b+ZkiaK2ArNKIhHMwBludThpSo4RLZO/sirK4="; + + ldflags = [ + "-X main.version=${finalAttrs.version}" + ]; + + __darwinAllowLocalNetworking = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Connect agents to APIs"; + longDescription = '' + emcee is a tool that provides a Model Context Protocol (MCP) server + for any web application with an OpenAPI specification. + You can use emcee to connect Claude Desktop + and other apps to external tools and data services, similar to ChatGPT plugins. + ''; + homepage = "https://github.com/loopwork-ai/emcee"; + changelog = "https://github.com/loopwork-ai/emcee/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "emcee"; + }; +}) diff --git a/pkgs/by-name/em/emptty/package.nix b/pkgs/by-name/em/emptty/package.nix index c87ea85fe6b2..28f5bac65e9e 100644 --- a/pkgs/by-name/em/emptty/package.nix +++ b/pkgs/by-name/em/emptty/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "emptty"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "tvrzna"; repo = pname; rev = "v${version}"; - hash = "sha256-xZfR4sn20fDaTNAxuxVflpr+8AFg5Z7vesO7P8Jxw6A="; + hash = "sha256-AsIt7EI5RkSchhaMGKofOsfPNROhX8f5gDaqZ7Q2394="; }; buildInputs = [ diff --git a/pkgs/by-name/em/emulationstation-de/package.nix b/pkgs/by-name/em/emulationstation-de/package.nix index 773f119c055d..7646b0754512 100644 --- a/pkgs/by-name/em/emulationstation-de/package.nix +++ b/pkgs/by-name/em/emulationstation-de/package.nix @@ -5,6 +5,7 @@ cmake, pkg-config, alsa-lib, + bluez, curl, ffmpeg, freeimage, @@ -16,15 +17,16 @@ poppler, pugixml, SDL2, + libGL, }: stdenv.mkDerivation (finalAttrs: { pname = "emulationstation-de"; - version = "3.1.1"; + version = "3.2.0"; src = fetchzip { url = "https://gitlab.com/es-de/emulationstation-de/-/archive/v${finalAttrs.version}/emulationstation-de-v${finalAttrs.version}.tar.gz"; - hash = "sha256-pQHT/BEtIWc8tQXPjU5KFt8jED+4IqcZR+VMmAFc940="; + hash = "sha256-tW8+7ImcJ3mBhoIHVE8h4cba+4SQLP55kiFYE7N8jyI="; }; patches = [ @@ -45,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib + bluez curl ffmpeg freeimage @@ -55,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { poppler pugixml SDL2 + libGL ]; cmakeFlags = [ (lib.cmakeBool "APPLICATION_UPDATER" false) ]; diff --git a/pkgs/by-name/em/emulsion/package.nix b/pkgs/by-name/em/emulsion/package.nix new file mode 100644 index 000000000000..c6fe5dc4fc7f --- /dev/null +++ b/pkgs/by-name/em/emulsion/package.nix @@ -0,0 +1,71 @@ +{ + stdenv, + lib, + fetchFromGitHub, + rustPlatform, + installShellFiles, + makeWrapper, + pkg-config, + python3, + libGL, + libX11, + libXcursor, + libXi, + libXrandr, + libXxf86vm, + libxcb, + libxkbcommon, + wayland, +}: +let + rpathLibs = + [ + libGL + libX11 + libXcursor + libXi + libXrandr + libXxf86vm + libxcb + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libxkbcommon + wayland + ]; +in +rustPlatform.buildRustPackage rec { + pname = "emulsion"; + version = "11.0"; + + src = fetchFromGitHub { + owner = "ArturKovacs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-0t+MUZu1cvkJSL9Ly9kblH8fMr05KuRpOo+JDn/VUc8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-1s5kCUxn4t1A40QHuygGKaqphLmcl+EYfx++RZQmL00="; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + python3 + ]; + + buildInputs = rpathLibs; + + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion + ''; + + meta = with lib; { + description = "Fast and minimalistic image viewer"; + homepage = "https://arturkovacs.github.io/emulsion-website/"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + license = licenses.mit; + mainProgram = "emulsion"; + }; +} diff --git a/pkgs/by-name/en/encrypted-dns-server/package.nix b/pkgs/by-name/en/encrypted-dns-server/package.nix new file mode 100644 index 000000000000..57e42e80ce33 --- /dev/null +++ b/pkgs/by-name/en/encrypted-dns-server/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libsodium, + nix-update-script, + versionCheckHook, +}: +rustPlatform.buildRustPackage rec { + pname = "encrypted-dns-server"; + version = "0.9.17"; + + src = fetchFromGitHub { + owner = "DNSCrypt"; + repo = "encrypted-dns-server"; + tag = version; + hash = "sha256-un7607HQ7s7G2GPTmYVT3wK/ePLNVyV+A2mtKt0YGsw="; + }; + + cargoHash = "sha256-qhY1LgtV0Kmj/at9EG7Y+swN1Oy0/SzRCr7U8xVh8KA="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libsodium ]; + + env = { + SODIUM_USE_PKG_CONFIG = true; + }; + + passthru.updateScript = nix-update-script { }; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/encrypted-dns"; + versionCheckProgramArg = "--version"; + + meta = { + changelog = "https://github.com/DNSCrypt/encrypted-dns-server/releases/tag/${version}"; + description = "An easy to install, high-performance, zero maintenance proxy to run an encrypted DNS server"; + homepage = "https://github.com/DNSCrypt/encrypted-dns-server"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ paepcke ]; + mainProgram = "encrypted-dns"; + }; +} diff --git a/pkgs/by-name/en/endeavour/package.nix b/pkgs/by-name/en/endeavour/package.nix index 165910b5b536..c2a09da36805 100644 --- a/pkgs/by-name/en/endeavour/package.nix +++ b/pkgs/by-name/en/endeavour/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { mainProgram = "endeavour"; homepage = "https://gitlab.gnome.org/World/Endeavour"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/en/endgame-singularity/package.nix b/pkgs/by-name/en/endgame-singularity/package.nix index 38b8a4fcab45..6712437c60be 100644 --- a/pkgs/by-name/en/endgame-singularity/package.nix +++ b/pkgs/by-name/en/endgame-singularity/package.nix @@ -5,17 +5,18 @@ unzip, python3, enableDefaultMusicPack ? true, + unstableGitUpdater, }: let pname = "endgame-singularity"; - version = "1.00"; + version = "1.00-unstable-2025-03-18"; main_src = fetchFromGitHub { owner = "singularity"; repo = "singularity"; - rev = "v${version}"; - sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl"; + rev = "8bbc2322ad1a0e83f78f5af731dfa97b6bd63f9c"; + hash = "sha256-HiFE746JtGjZJbiKhB3ubfb376tJmz78jUfdu3/RQic="; }; music_src = fetchurl { @@ -44,6 +45,14 @@ python3.pkgs.buildPythonApplication { # ↑ we cannot glob on [...]/music, it doesn't exist yet ''; + passthru = { + # for the updater + src = main_src; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; + }; + meta = { homepage = "http://www.emhsoft.com/singularity/"; description = "Simulation game about strong AI"; diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix index 532d78085e5d..d19399b2eb62 100644 --- a/pkgs/by-name/en/endless-sky/package.nix +++ b/pkgs/by-name/en/endless-sky/package.nix @@ -5,6 +5,7 @@ SDL2, libpng, libjpeg, + libX11, glew, openal, scons, @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { SDL2 libpng libjpeg + libX11 glew openal libmad diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index 4a369c142f02..f5531a2fedbd 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -2,12 +2,13 @@ lib, flutter324, fetchFromGitHub, - webkitgtk_4_0, + webkitgtk_4_1, sqlite, libayatana-appindicator, makeDesktopItem, copyDesktopItems, makeWrapper, + jdk17_headless, }: let # fetch simple-icons directly to avoid cloning with submodules, @@ -17,14 +18,14 @@ let in flutter324.buildFlutterApplication rec { pname = "ente-auth"; - version = "4.3.2"; + version = "4.3.5"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "auth" ]; tag = "auth-v${version}"; - hash = "sha256-/WWodQcMibwXVexI+XbTZYRkIMtfNHk3bJVBPJHcoqI="; + hash = "sha256-kM1y3Q5Z8J84qHhki9A+I/uY7xYQNMlfh2ZhxzpUBHM="; }; sourceRoot = "${src.name}/auth"; @@ -48,9 +49,15 @@ flutter324.buildFlutterApplication rec { ]; buildInputs = [ - webkitgtk_4_0 + webkitgtk_4_1 sqlite libayatana-appindicator + # The networking client used by ente-auth (native_dio_adapter) + # introduces a transitive dependency on Java, which technically + # is only needed for the Android implementation. + # Unfortunately, attempts to remove it from the build entirely were + # unsuccessful. + jdk17_headless # JDK version used by upstream CI ]; # Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml @@ -84,6 +91,9 @@ flutter324.buildFlutterApplication rec { # For backwards compatibility ln -s $out/bin/enteauth $out/bin/ente_auth + + # Not required at runtime as it's only used on Android + rm $out/app/ente-auth/lib/libdartjni.so ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json index e04e4f9a1544..7656e78bcddf 100644 --- a/pkgs/by-name/en/ente-auth/pubspec.lock.json +++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json @@ -356,6 +356,16 @@ "source": "hosted", "version": "3.1.1" }, + "cronet_http": { + "dependency": "transitive", + "description": { + "name": "cronet_http", + "sha256": "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, "cross_file": { "dependency": "transitive", "description": { @@ -386,6 +396,16 @@ "source": "hosted", "version": "1.0.0" }, + "cupertino_http": { + "dependency": "transitive", + "description": { + "name": "cupertino_http", + "sha256": "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, "dart_style": { "dependency": "transitive", "description": { @@ -430,11 +450,11 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.0+1" }, "dio_web_adapter": { "dependency": "transitive", @@ -1073,6 +1093,16 @@ "source": "hosted", "version": "4.0.2" }, + "http_profile": { + "dependency": "transitive", + "description": { + "name": "http_profile", + "sha256": "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, "image": { "dependency": "transitive", "description": { @@ -1103,6 +1133,16 @@ "source": "hosted", "version": "1.0.4" }, + "jni": { + "dependency": "transitive", + "description": { + "name": "jni", + "sha256": "f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1" + }, "js": { "dependency": "transitive", "description": { @@ -1323,6 +1363,16 @@ "source": "hosted", "version": "1.0.2" }, + "native_dio_adapter": { + "dependency": "direct main", + "description": { + "name": "native_dio_adapter", + "sha256": "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, "nested": { "dependency": "transitive", "description": { @@ -1343,6 +1393,16 @@ "source": "hosted", "version": "0.5.0" }, + "objective_c": { + "dependency": "transitive", + "description": { + "name": "objective_c", + "sha256": "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, "otp": { "dependency": "direct main", "description": { diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix index 0f89c077239b..05d8ea33570c 100644 --- a/pkgs/by-name/en/ente-cli/package.nix +++ b/pkgs/by-name/en/ente-cli/package.nix @@ -1,26 +1,21 @@ { lib, buildGoModule, - ente-cli, fetchFromGitHub, installShellFiles, nix-update-script, stdenv, testers, }: -let - version = "0.2.3"; - canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; -in -buildGoModule { +buildGoModule (finalAttrs: { pname = "ente-cli"; - inherit version; + version = "0.2.3"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; - tag = "cli-v${version}"; + tag = "cli-v${finalAttrs.version}"; hash = "sha256-qKMFoNtD5gH0Y+asD0LR5d3mxGpr2qVWXIUzJTSezeI="; sparseCheckout = [ "cli" ]; }; @@ -34,7 +29,7 @@ buildGoModule { ldflags = [ "-s" "-w" - "-X main.AppVersion=cli-v${version}" + "-X main.AppVersion=cli-v${finalAttrs.version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -50,27 +45,30 @@ buildGoModule { # also guarding with `isLinux` because ENTE_CLI_SECRETS_PATH doesn't help on darwin: # > error setting password in keyring: exit status 195 # - + lib.optionalString (stdenv.buildPlatform.isLinux && canExecute) '' - export ENTE_CLI_CONFIG_PATH=$TMP - export ENTE_CLI_SECRETS_PATH=$TMP/secrets + + + lib.optionalString + (stdenv.buildPlatform.isLinux && stdenv.buildPlatform.canExecute stdenv.hostPlatform) + '' + export ENTE_CLI_CONFIG_PATH=$TMP + export ENTE_CLI_SECRETS_PATH=$TMP/secrets - installShellCompletion --cmd ente \ - --bash <($out/bin/ente completion bash) \ - --fish <($out/bin/ente completion fish) \ - --zsh <($out/bin/ente completion zsh) - ''; + installShellCompletion --cmd ente \ + --bash <($out/bin/ente completion bash) \ + --fish <($out/bin/ente completion fish) \ + --zsh <($out/bin/ente completion zsh) + ''; passthru = { # only works on linux, see comment above about ENTE_CLI_SECRETS_PATH on darwin tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux ( testers.testVersion { - package = ente-cli; + package = finalAttrs.finalPackage; command = '' env ENTE_CLI_CONFIG_PATH=$TMP \ ENTE_CLI_SECRETS_PATH=$TMP/secrets \ ente version ''; - version = "Version cli-v${ente-cli.version}"; + version = "Version cli-v${finalAttrs.version}"; } ); updateScript = nix-update-script { @@ -87,11 +85,11 @@ buildGoModule { The Ente CLI is a Command Line Utility for exporting data from Ente. It also does a few more things, for example, you can use it to decrypting the export from Ente Auth. ''; homepage = "https://github.com/ente-io/ente/tree/main/cli#readme"; - changelog = "https://github.com/ente-io/ente/releases/tag/cli-v${version}"; + changelog = "https://github.com/ente-io/ente/releases/tag/cli-v${finalAttrs.version}"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.zi3m5f ]; mainProgram = "ente"; }; -} +}) diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix index ccbc8503386a..45f93496ccf3 100644 --- a/pkgs/by-name/en/ente-web/package.nix +++ b/pkgs/by-name/en/ente-web/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ente-web"; - version = "1.0.0"; + version = "1.0.10"; src = fetchFromGitHub { owner = "ente-io"; @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { sparseCheckout = [ "web" ]; tag = "photos-v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-hK5CO4FTjh2MNT8pztV/GO7ifOGv1hw32flXrmcUAfk="; + hash = "sha256-WJz1Weh17DWH5qzMry1uacHBXY9ouIXWRzoiwzIsN0I="; }; sourceRoot = "${finalAttrs.src.name}/web"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/web/yarn.lock"; - hash = "sha256-n/+HETnwtnpFlfDLA0znCzro5YhNsISweR820QXJFUQ="; + hash = "sha256-9LC5WuS1CBj3vBacXUxJXyPgvZ/zfcihjZpCiH/8Aa0="; }; nativeBuildInputs = [ @@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/ente-io/ente/releases"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ - surfaceflinger pinpox ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/en/enter-tex/package.nix b/pkgs/by-name/en/enter-tex/package.nix index f0ee8ce9f387..ba5874c66536 100644 --- a/pkgs/by-name/en/enter-tex/package.nix +++ b/pkgs/by-name/en/enter-tex/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchurl, + fetchFromGitLab, desktop-file-utils, docbook-xsl-nons, gettext, @@ -21,16 +21,20 @@ libgedit-gtksourceview, libgedit-tepl, libgee, - gnome, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "enter-tex"; - version = "3.47.0"; + version = "3.48.0"; - src = fetchurl { - url = "mirror://gnome/sources/enter-tex/${lib.versions.majorMinor finalAttrs.version}/enter-tex-${finalAttrs.version}.tar.xz"; - hash = "sha256-oIyuySdcCruVNWdN9bnBa5KxSWjNIZFtb/wvoMud12o="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; + repo = "enter-tex"; + tag = finalAttrs.version; + hash = "sha256-OnkP4E1kNWuE9k7SQ/ujnxnFgVyAqIhqHAw04ZA0Tno="; }; nativeBuildInputs = [ @@ -60,18 +64,16 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' # Workaround the use case of C code mixed with Vala code. - # https://gitlab.gnome.org/swilmet/enter-tex/-/blob/3.47.0/docs/more-information.md#install-procedure + # https://gitlab.gnome.org/World/gedit/enter-tex/-/blob/3.48.0/docs/more-information.md#install-procedure ninja src/gtex/Gtex-1.gir ''; doCheck = true; - passthru.updateScript = gnome.updateScript { - packageName = "enter-tex"; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { - homepage = "https://gitlab.gnome.org/swilmet/enter-tex"; + homepage = "https://gitlab.gnome.org/World/gedit/enter-tex"; description = "LaTeX editor for the GNOME desktop"; maintainers = with maintainers; [ manveru diff --git a/pkgs/by-name/en/entwine/package.nix b/pkgs/by-name/en/entwine/package.nix index 6331900b107c..8714d02efea8 100644 --- a/pkgs/by-name/en/entwine/package.nix +++ b/pkgs/by-name/en/entwine/package.nix @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { description = "Point cloud organization for massive datasets"; homepage = "https://entwine.io/"; license = licenses.lgpl2Only; - maintainers = with maintainers; teams.geospatial.members ++ [ matthewcroughan ]; + maintainers = with maintainers; [ matthewcroughan ]; + teams = [ teams.geospatial ]; platforms = platforms.linux; mainProgram = "entwine"; }; diff --git a/pkgs/by-name/en/envchain/package.nix b/pkgs/by-name/en/envchain/package.nix new file mode 100644 index 000000000000..ef7e7d881656 --- /dev/null +++ b/pkgs/by-name/en/envchain/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libedit, + libsecret, + ncurses, + pkg-config, + readline, +}: + +stdenv.mkDerivation rec { + pname = "envchain"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "sorah"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-QUy38kJzMbYOyT86as4/yq2ctcszSnB8a3eVWxgd4Fo="; + }; + + postPatch = '' + sed -i -e "s|-ltermcap|-lncurses|" Makefile + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ + libsecret + readline + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libedit + ncurses + ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with lib; { + description = "Set environment variables with macOS keychain or D-Bus secret service"; + homepage = "https://github.com/sorah/envchain"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ ]; + mainProgram = "envchain"; + }; +} diff --git a/pkgs/by-name/en/envfs/package.nix b/pkgs/by-name/en/envfs/package.nix index 6dd4a3472547..3c7b57002fb4 100644 --- a/pkgs/by-name/en/envfs/package.nix +++ b/pkgs/by-name/en/envfs/package.nix @@ -1,34 +1,42 @@ { - rustPlatform, lib, fetchFromGitHub, + rustPlatform, nixosTests, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "envfs"; - version = "1.0.6"; + version = "1.1.0"; + src = fetchFromGitHub { owner = "Mic92"; repo = "envfs"; - rev = version; - hash = "sha256-kOfnKguvJQHW/AfQOetxVefjoEj7ec5ew6fumhOwP08="; + rev = finalAttrs.version; + hash = "sha256-bpATdm/lB+zomPYGCxA7omWK/SKPIaqr94J+fjMaXfE="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-VvdvYxNBzwJJy09npC30VaOzOU9Fwi++qon9Od4juHE="; - passthru.tests = { - envfs = nixosTests.envfs; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-nMUdAFRHJZDwvLASBVykzzkwk3HxslDehqqm1U99qYg="; postInstall = '' ln -s envfs $out/bin/mount.envfs ln -s envfs $out/bin/mount.fuse.envfs ''; - meta = with lib; { + + passthru = { + tests = { + envfs = nixosTests.envfs; + }; + + updateScript = nix-update-script { }; + }; + + meta = { description = "Fuse filesystem that returns symlinks to executables based on the PATH of the requesting process"; homepage = "https://github.com/Mic92/envfs"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mic92 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix index d54fb62c911c..8578b8307378 100644 --- a/pkgs/by-name/en/envio/package.nix +++ b/pkgs/by-name/en/envio/package.nix @@ -1,18 +1,13 @@ { lib, - stdenv, fetchFromGitHub, installShellFiles, - darwin, gpgme, libgpg-error, pkg-config, rustPlatform, }: -let - inherit (darwin.apple_sdk.frameworks) Security; -in rustPlatform.buildRustPackage rec { pname = "envio"; version = "0.6.1"; @@ -35,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgpg-error gpgme - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; postInstall = '' installManPage man/*.1 diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index 2c764b8d8076..25e8ddf3dbe3 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -106,6 +106,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/gabmus/envision"; license = lib.licenses.agpl3Only; mainProgram = "envision"; + # More maintainers needed! + # envision (wrapped) requires frequent updates to the dependency list; + # the more people that can help with this, the better. maintainers = with lib.maintainers; [ pandapip1 Scrumplex diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix index 794ce30a59bd..d1e8b798d02a 100644 --- a/pkgs/by-name/en/envision/package.nix +++ b/pkgs/by-name/en/envision/package.nix @@ -52,6 +52,7 @@ buildFHSEnv { xorg.xorgproto SDL2 wayland + mesa-gl-headers # Additional dependencies required for Monado WMR support bc fmt @@ -60,9 +61,11 @@ buildFHSEnv { gtest jq libepoxy + lz4 lz4.dev tbb libxkbcommon + librealsense boost glew ]) diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index 9379db80d7ad..d5d687e1fc73 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -8,7 +8,7 @@ versionCheckHook, }: let - version = "1.33.2"; + version = "1.34.1"; inherit (stdenv.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; @@ -21,8 +21,8 @@ let hash = { - aarch64-linux = "sha256-gew2iaghIu/wymgMSBdvTTUbb5iBp5zJ2QeKb7Swtqg="; - x86_64-linux = "sha256-vS/4fF78lf14gNcQkV9XPBqrTZxV2NqIbc2R30P610E="; + aarch64-linux = "sha256-7v9KwHdQIF4dElsvTPxsJNnpxfLJk3TQ4tCgzwqsebs="; + x86_64-linux = "sha256-iCZNZRh2qa0oqn4Jjj34Q1cEBM9gts6WjESWykorbp0="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch index da29f34774c9..a241949a0c99 100644 --- a/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch +++ b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch @@ -4,6 +4,7 @@ Date: Mon, 22 Apr 2024 11:52:59 +0200 Subject: [PATCH] nixpkgs: use system Python Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> +Signed-off-by: Luke Granger-Brown --- bazel/python_dependencies.bzl | 9 ++++----- bazel/repositories_extra.bzl | 17 +---------------- diff --git a/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch index b3f66ac22552..cb8c5d20b671 100644 --- a/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch +++ b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch @@ -4,15 +4,16 @@ Date: Mon, 22 Apr 2024 11:58:00 +0200 Subject: [PATCH] nixpkgs: use system Go Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> +Signed-off-by: Luke Granger-Brown --- bazel/dependency_imports.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl -index c68eb4bf3ed2d39d46d38d7bd0eeab2c74a507fa..addee4f6af74ea78ae778b73384e01db83ac6694 100644 +index aef33aa103dc1136e63e165fb9ee6a267f52ba54..c5aefca14b729b548c4e90857202eb82576b507d 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl -@@ -20,7 +20,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common") +@@ -22,7 +22,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common") load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set") # go version for rules_go diff --git a/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch index b8be06be0730..684e73b5c838 100644 --- a/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch +++ b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch @@ -4,18 +4,19 @@ Date: Mon, 22 Apr 2024 11:59:22 +0200 Subject: [PATCH] nixpkgs: use system C/C++ toolchains Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> +Signed-off-by: Luke Granger-Brown --- bazel/dependency_imports.bzl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl -index addee4f6af74ea78ae778b73384e01db83ac6694..dc1967e43b2b71358d2767a3d83b52819987290d 100644 +index c5aefca14b729b548c4e90857202eb82576b507d..6938ce63abb53661e8d1fb71eaaab03ba0cc37c6 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl -@@ -26,7 +26,11 @@ JQ_VERSION = "1.7" - YQ_VERSION = "4.24.4" +@@ -30,7 +30,11 @@ YQ_VERSION = "4.24.4" + BUF_VERSION = "v1.50.0" - def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, yq_version = YQ_VERSION): + def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, yq_version = YQ_VERSION, buf_version = BUF_VERSION): - rules_foreign_cc_dependencies() + rules_foreign_cc_dependencies( + register_default_tools=False, # no prebuilt toolchains diff --git a/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch b/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch new file mode 100644 index 000000000000..40b808952e3d --- /dev/null +++ b/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown +Date: Thu, 17 Apr 2025 02:40:18 +0100 +Subject: [PATCH] nixpkgs: bump rules_rust to 0.60.0 + +Signed-off-by: Luke Granger-Brown +--- + bazel/repository_locations.bzl | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl +index 6904bc93bdda3ee2308f13d61e62295fa11d799b..e4574878a566cceb4dc2343f3cade0350ea5e5ff 100644 +--- a/bazel/repository_locations.bzl ++++ b/bazel/repository_locations.bzl +@@ -1465,8 +1465,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( + project_name = "Bazel rust rules", + project_desc = "Bazel rust rules (used by Wasm)", + project_url = "https://github.com/bazelbuild/rules_rust", +- version = "0.56.0", +- sha256 = "f1306aac0b258b790df01ad9abc6abb0df0b65416c74b4ef27f4aab298780a64", ++ version = "0.60.0", ++ sha256 = "7825214ccad7c2482cb490ac91dbc1e88b30223062796ce328aca893b74ae342", + # Note: rules_rust should point to the releases, not archive to avoid the hassle of bootstrapping in crate_universe. + # This is described in https://bazelbuild.github.io/rules_rust/crate_universe.html#setup, otherwise bootstrap + # is required which in turn requires a system CC toolchains, not the bazel controlled ones. +@@ -1477,7 +1477,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( + "dataplane_ext", + ], + extensions = ["envoy.wasm.runtime.wasmtime"], +- release_date = "2024-12-16", ++ release_date = "2025-04-08", + cpe = "N/A", + license = "Apache-2.0", + license_url = "https://github.com/bazelbuild/rules_rust/blob/{version}/LICENSE.txt", diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix index 757343e39f2d..0246405d0bbf 100644 --- a/pkgs/by-name/en/envoy/package.nix +++ b/pkgs/by-name/en/envoy/package.nix @@ -34,16 +34,16 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.33.0"; - rev = "b0f43d67aa25c1b03c97186a200cc187f4c22db3"; - hash = "sha256-zqekRpOlaA2IrwwFUEwASa1uokET98h5sr7EwzWgcbU="; + version = "1.34.0"; + rev = "d7809ba2b07fd869d49bfb122b27f6a7977b4d94"; + hash = "sha256-SKdUrBXe0E3fMo73NROFO9Ck5FZidF/awP+QRA5t3VM="; }; # these need to be updated for any changes to fetchAttrs depsHash = { - x86_64-linux = "sha256-4CQkHlXbDpRiqzeyserVf9PpLx3ME7TtZ2H88ggog6U="; - aarch64-linux = "sha256-FxkfBWiG0NIInl28w+l4YvaV2VFuCtjn5VBAKvJoxM8="; + x86_64-linux = "sha256-CiP9qH8/+nNZM8BNz84eVwWphVyDNo2KOYcK0wOsXn0="; + aarch64-linux = "sha256-9HGg68R546JY1EOm22tg9CuPt0nU+FooFcLG9A2hkzE="; } .${stdenv.system} or (throw "unsupported system ${stdenv.system}"); @@ -59,6 +59,8 @@ buildBazelPackage rec { repo = "envoy"; inherit (srcVer) hash rev; }; + # By convention, these patches are generated like: + # git format-patch --zero-commit --signoff --no-numbered --minimal --full-index --no-signature patches = [ # use system Python, not bazel-fetched binary Python ./0001-nixpkgs-use-system-Python.patch @@ -68,6 +70,9 @@ buildBazelPackage rec { # use system C/C++ tools ./0003-nixpkgs-use-system-C-C-toolchains.patch + + # bump rules_rust to support newer Rust + ./0004-nixpkgs-bump-rules_rust-to-0.60.0.patch ]; postPatch = '' chmod -R +w . @@ -92,6 +97,12 @@ buildBazelPackage rec { --replace-fail 'crate_universe_dependencies()' 'crate_universe_dependencies(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc")' \ --replace-fail 'crates_repository(' 'crates_repository(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc",' + # patch rules_rust for envoy specifics, but also to support old Bazel + # (Bazel 6 doesn't have ctx.watch, but ctx.path is sufficient for our use) + cp ${./rules_rust.patch} bazel/rules_rust.patch + substituteInPlace bazel/repositories.bzl \ + --replace-fail ', "@envoy//bazel:rules_rust_ppc64le.patch"' "" + substitute ${./rules_rust_extra.patch} bazel/nix/rules_rust_extra.patch \ --subst-var-by bash "$(type -p bash)" cat bazel/nix/rules_rust_extra.patch bazel/rules_rust.patch > bazel/nix/rules_rust.patch @@ -133,6 +144,7 @@ buildBazelPackage rec { sed -i \ -e 's,${python3},__NIXPYTHON__,' \ -e 's,${stdenv.shellPackage},__NIXSHELL__,' \ + -e 's,${builtins.storeDir}/[^/]\+/bin/bash,__NIXBASH__,' \ $bazelOut/external/com_github_luajit_luajit/build.py \ $bazelOut/external/local_config_sh/BUILD \ $bazelOut/external/*_pip3/BUILD.bazel \ @@ -180,9 +192,12 @@ buildBazelPackage rec { sed -i \ -e 's,__NIXPYTHON__,${python3},' \ -e 's,__NIXSHELL__,${stdenv.shellPackage},' \ + -e 's,__NIXBASH__,${stdenv.shell},' \ $bazelOut/external/com_github_luajit_luajit/build.py \ $bazelOut/external/local_config_sh/BUILD \ - $bazelOut/external/*_pip3/BUILD.bazel + $bazelOut/external/*_pip3/BUILD.bazel \ + $bazelOut/external/rules_rust/util/process_wrapper/private/process_wrapper.sh \ + $bazelOut/external/rules_rust/crate_universe/src/metadata/cargo_tree_rustc_wrapper.sh # Install repinned rules_rust lockfile cp $bazelOut/external/Cargo.Bazel.lock source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock diff --git a/pkgs/by-name/en/envoy/rules_rust.patch b/pkgs/by-name/en/envoy/rules_rust.patch new file mode 100644 index 000000000000..7261cb2fc760 --- /dev/null +++ b/pkgs/by-name/en/envoy/rules_rust.patch @@ -0,0 +1,101 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown +Date: Thu, 17 Apr 2025 02:44:24 +0100 +Subject: [PATCH] rules_rust base + +Signed-off-by: Luke Granger-Brown +--- + cargo/private/cargo_bootstrap.bzl | 8 ++++---- + crate_universe/extensions.bzl | 10 +++++----- + crate_universe/src/lockfile.rs | 4 ++-- + rust/private/rustc.bzl | 4 ++-- + 4 files changed, 13 insertions(+), 13 deletions(-) + +diff --git cargo/private/cargo_bootstrap.bzl cargo/private/cargo_bootstrap.bzl +index a8021c49d62037ef32c7c64d5bb4a5efe3a8b4aa..f63d7c23ae0bddc9f3fece347a3a2b5b0afe6d8d 100644 +--- cargo/private/cargo_bootstrap.bzl ++++ cargo/private/cargo_bootstrap.bzl +@@ -173,13 +173,13 @@ def _detect_changes(repository_ctx): + # 'consumed' which means changes to it will trigger rebuilds + + for src in repository_ctx.attr.srcs: +- repository_ctx.watch(src) ++ repository_ctx.path(src) + +- repository_ctx.watch(repository_ctx.attr.cargo_lockfile) +- repository_ctx.watch(repository_ctx.attr.cargo_toml) ++ repository_ctx.path(repository_ctx.attr.cargo_lockfile) ++ repository_ctx.path(repository_ctx.attr.cargo_toml) + + if repository_ctx.attr.cargo_config: +- repository_ctx.watch(repository_ctx.attr.cargo_config) ++ repository_ctx.path(repository_ctx.attr.cargo_config) + + def _cargo_bootstrap_repository_impl(repository_ctx): + # Pretend to Bazel that this rule's input files have been used, so that it will re-run the rule if they change. +diff --git crate_universe/extensions.bzl crate_universe/extensions.bzl +index a749b10c8d469bd316d78034059c94b1fd98dbef..8f8c84dac1ec330d5e8e6abbd930387cb6c9f29e 100644 +--- crate_universe/extensions.bzl ++++ crate_universe/extensions.bzl +@@ -957,17 +957,17 @@ def _crate_impl(module_ctx): + fail("Spec specified for repo {}, but the module defined repositories {}".format(repo, local_repos)) + + for cfg in mod.tags.from_cargo + mod.tags.from_specs: +- # Preload all external repositories. Calling `module_ctx.watch` will cause restarts of the implementation ++ # Preload all external repositories. Calling `module_ctx.path` will cause restarts of the implementation + # function of the module extension when the file has changed. + if cfg.cargo_lockfile: +- module_ctx.watch(cfg.cargo_lockfile) ++ module_ctx.path(cfg.cargo_lockfile) + if cfg.lockfile: +- module_ctx.watch(cfg.lockfile) ++ module_ctx.path(cfg.lockfile) + if cfg.cargo_config: +- module_ctx.watch(cfg.cargo_config) ++ module_ctx.path(cfg.cargo_config) + if hasattr(cfg, "manifests"): + for m in cfg.manifests: +- module_ctx.watch(m) ++ module_ctx.path(m) + + cargo_path, rustc_path = _get_host_cargo_rustc(module_ctx, host_triple, cfg.host_tools_repo) + cargo_bazel_fn = new_cargo_bazel_fn( +diff --git crate_universe/src/lockfile.rs crate_universe/src/lockfile.rs +index 3e0ce6265fda6fbdd9e3e989e3e4e4443b615b8c..0fafcea8fbc7a590676d34d2c4ca8c413b953955 100644 +--- crate_universe/src/lockfile.rs ++++ crate_universe/src/lockfile.rs +@@ -146,10 +146,10 @@ impl Digest { + )); + hasher.update(b"\0"); + +- hasher.update(Digest::compute_single_hash(cargo_version, "Cargo version")); ++ hasher.update(Digest::compute_single_hash("hermetic", "Cargo version")); + hasher.update(b"\0"); + +- hasher.update(Digest::compute_single_hash(rustc_version, "Rustc version")); ++ hasher.update(Digest::compute_single_hash("hermetic", "Rustc version")); + hasher.update(b"\0"); + + let hash = hasher.finalize().encode_hex::(); +diff --git rust/private/rustc.bzl rust/private/rustc.bzl +index d78c28902c8f73ae655b8f6b5df3db5a1805aa19..321a24a946c33d5e3452758a72a77b52d5a3eccf 100644 +--- rust/private/rustc.bzl ++++ rust/private/rustc.bzl +@@ -1059,7 +1059,7 @@ def construct_arguments( + + if toolchain.llvm_cov and ctx.configuration.coverage_enabled: + # https://doc.rust-lang.org/rustc/instrument-coverage.html +- rustc_flags.add("--codegen=instrument-coverage") ++ pass + + if toolchain._experimental_link_std_dylib: + rustc_flags.add("--codegen=prefer-dynamic") +@@ -1563,7 +1563,7 @@ def rustc_compile_action( + }) + crate_info = rust_common.create_crate_info(**crate_info_dict) + +- if crate_info.type in ["staticlib", "cdylib"]: ++ if crate_info.type in ["staticlib", "cdylib"] and not out_binary: + # These rules are not supposed to be depended on by other rust targets, and + # as such they shouldn't provide a CrateInfo. However, one may still want to + # write a rust_test for them, so we provide the CrateInfo wrapped in a provider diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index 7155cda71398..fca085c377ce 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.173"; + version = "0.0.180"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-Yyn0yWcOWb379rzaA+KW0KiLVg0nbIwJJQ8NhQAsuN8="; + hash = "sha256-jQ9IiE9cM/UhdB36vvmNxnvuDtFbzR5WbDzysdpQR9E="; }; postPatch = '' diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix index 1c8e35193f4f..a14ac0beaf40 100644 --- a/pkgs/by-name/eo/eog/package.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/eog"; changelog = "https://gitlab.gnome.org/GNOME/eog/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; mainProgram = "eog"; }; diff --git a/pkgs/by-name/eo/eolie/package.nix b/pkgs/by-name/eo/eolie/package.nix deleted file mode 100644 index ef455d62358c..000000000000 --- a/pkgs/by-name/eo/eolie/package.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ - lib, - fetchgit, - meson, - ninja, - pkg-config, - nix-update-script, - python3, - gtk3, - libsecret, - gst_all_1, - webkitgtk_4_0, - glib, - glib-networking, - gtkspell3, - hunspell, - desktop-file-utils, - gobject-introspection, - wrapGAppsHook3, - gnome-settings-daemon, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "eolie"; - version = "0.9.99"; - - format = "other"; - doCheck = false; - - src = fetchgit { - url = "https://gitlab.gnome.org/World/eolie"; - tag = version; - fetchSubmodules = true; - sha256 = "077jww5mqg6bbqbj0j1gss2j3dxlfr2xw8bc43k8vg52drqg6g8w"; - }; - - nativeBuildInputs = [ - desktop-file-utils - gobject-introspection - meson - ninja - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = with gst_all_1; [ - glib-networking - gst-libav - gst-plugins-base - gst-plugins-ugly - gstreamer - gnome-settings-daemon - gtk3 - gtkspell3 - hunspell - libsecret - webkitgtk_4_0 - glib - ]; - - propagatedBuildInputs = with python3.pkgs; [ - pyfxa - beautifulsoup4 - cryptography - pycairo - pygobject3 - python-dateutil - pycrypto - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - dontWrapGApps = true; - preFixup = '' - buildPythonPath "$out $propagatedBuildInputs" - patchPythonScript "$out/libexec/eolie-sp" - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - strictDeps = false; - - meta = with lib; { - description = "New GNOME web browser"; - mainProgram = "eolie"; - homepage = "https://gitlab.gnome.org/World/eolie"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ samdroid-apps ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/ep/ephemeral/package.nix b/pkgs/by-name/ep/ephemeral/package.nix deleted file mode 100644 index 2d755b3ee371..000000000000 --- a/pkgs/by-name/ep/ephemeral/package.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - nix-update-script, - desktop-file-utils, - vala, - gettext, - glib, - gtk3, - libgee, - libdazzle, - meson, - ninja, - pantheon, - pkg-config, - python3, - webkitgtk_4_0, - wrapGAppsHook3, - glib-networking, -}: - -stdenv.mkDerivation rec { - pname = "ephemeral"; - version = "7.1.0"; - - src = fetchFromGitHub { - owner = "cassidyjames"; - repo = "ephemeral"; - rev = version; - sha256 = "sha256-07HO8nC2Pwz2EAea4ZzmqyMfQdgX8FVqDepdA6j/NT8="; - }; - - nativeBuildInputs = [ - desktop-file-utils - gettext - meson - ninja - vala - pkg-config - python3 - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - glib-networking - gtk3 - libdazzle - libgee - pantheon.granite - webkitgtk_4_0 - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Always-incognito web browser"; - homepage = "https://github.com/cassidyjames/ephemeral"; - maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; - platforms = platforms.linux; - license = licenses.gpl3; - mainProgram = "com.github.cassidyjames.ephemeral"; - }; -} diff --git a/pkgs/by-name/ep/epick/package.nix b/pkgs/by-name/ep/epick/package.nix new file mode 100644 index 000000000000..14bfac54b081 --- /dev/null +++ b/pkgs/by-name/ep/epick/package.nix @@ -0,0 +1,61 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + pkg-config, + expat, + fontconfig, + freetype, + libGL, + xorg, +}: + +rustPlatform.buildRustPackage rec { + pname = "epick"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "vv9k"; + repo = pname; + # Upstream has rewritten tags on multiple occasions. + rev = "14ee92e049780406fffdc1e4a83bf1433775663f"; + sha256 = "sha256-gjqAQrGJ9KFdzn2a3fOgu0VJ9zrX5stsbzriOGJaD/4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-r/0aNzU8jm2AqiZWq4plxXY/H7qKVC8nEI9BwOUKCdA="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + expat + fontconfig + freetype + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + ]; + + postInstall = '' + install -Dm444 assets/epick.desktop -t $out/share/applications + install -Dm444 assets/icon.svg $out/share/icons/hicolor/scalable/apps/epick.svg + install -Dm444 assets/icon.png $out/share/icons/hicolor/48x48/apps/epick.png + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]} + ''; + + meta = with lib; { + description = "Simple color picker that lets the user create harmonic palettes with ease"; + homepage = "https://github.com/vv9k/epick"; + changelog = "https://github.com/vv9k/epick/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "epick"; + }; +} diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix index c9033f6030da..6ac61bc3b2f5 100644 --- a/pkgs/by-name/ep/epiphany/package.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -5,6 +5,7 @@ ninja, gettext, fetchurl, + fetchpatch, pkg-config, gtk4, glib, @@ -37,13 +38,29 @@ stdenv.mkDerivation (finalAttrs: { pname = "epiphany"; - version = "47.3.1"; + version = "48.3"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz"; - hash = "sha256-eV17gfGLdIfZ6b/Ayy1oqJPSIA9F+Tl81CyzOSsggak="; + hash = "sha256-2ilT5+K3O/dHPAozl5EE15NieVKV6qCio46hiFN9rxM="; }; + patches = [ + # shell: Fix startup crash on Pantheon + # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1818 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/da4437beb7f1fbc9c2fa3d4629b8c826d484835e.patch"; + hash = "sha256-meufd5gnhLcK0dgIXEMDnid9e1R2M1D3jZ9Yoh6YobM="; + }) + + # action-bar-end: Fix startup crash on Pantheon + # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1819 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/d69866854b315123c8832fae58c6de008da20ea0.patch"; + hash = "sha256-GnZQC4rtBYRr+x9mF8pCFDcDOjEJj+27ECdXBNL42kQ="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext @@ -107,7 +124,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://apps.gnome.org/Epiphany/"; description = "WebKit based web browser for GNOME"; mainProgram = "epiphany"; - maintainers = teams.gnome.members ++ teams.pantheon.members; + teams = [ + teams.gnome + teams.pantheon + ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/ep/epson-201401w/fixbuild.patch b/pkgs/by-name/ep/epson-201401w/fixbuild.patch deleted file mode 100644 index 4baa029a5739..000000000000 --- a/pkgs/by-name/ep/epson-201401w/fixbuild.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/src/pagemanager/pagemanager.c b/src/pagemanager/pagemanager.c -index 029e6d3..3c1f450 100644 ---- a/src/pagemanager/pagemanager.c -+++ b/src/pagemanager/pagemanager.c -@@ -22,7 +22,7 @@ - #include "epcgdef.h" - #include "debuglog.h" - #include "memory.h" --#include "raster.h" -+#include "raster-helper.h" - #include "pagemanager.h" - - extern int JobCanceled; -@@ -45,7 +45,7 @@ fetchRaster(EpsPageManager *pageManager) - int error = 0; - int did_fetch = 0; - int read_bytes = 0; -- int nraster; -+ size_t nraster; - - while (error == 0 && did_fetch == 0 && JobCanceled == 0) { - eps_raster_fetch(privateData->raster_h, NULL, 0, 0, &status); -@@ -212,7 +212,7 @@ int pageManagerGetPageRegion(EpsPageManager *pageManager, EpsPageRegion *pageReg - return EPS_OK; - } - --int pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize) -+size_t pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize) - { - PageManagerPrivateData *privateData = NULL; - int error = EPS_OK; -diff --git a/src/pagemanager/pagemanager.h b/src/pagemanager/pagemanager.h -index 87fbbd5..c9743fb 100644 ---- a/src/pagemanager/pagemanager.h -+++ b/src/pagemanager/pagemanager.h -@@ -31,7 +31,7 @@ extern "C" - #define EPS_ERROR -1 - #define EPS_OK 0 - --typedef int (*EpsRasterSource)(char *buf, int bufSize); -+typedef size_t (*EpsRasterSource)(char *buf, int bufSize); - - typedef struct { - EpsRasterSource rasterSource; -@@ -47,7 +47,7 @@ typedef struct { - EpsPageManager* pageManagerCreate(EpsPageRegion pageRegion, EpsFilterPrintOption filterPrintOption, EpsRasterSource rasterSource); - void pageManagerDestroy(EpsPageManager *pageManager); - int pageManagerGetPageRegion(EpsPageManager *pageManager, EpsPageRegion *pageRegion); --int pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize); -+size_t pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize); - int pageManagerIsNextPage(EpsPageManager *pageManager); - - #ifdef __cplusplus -diff --git a/src/raster/raster.c b/src/raster/raster.c -index 7e4946b..dd5aef6 100644 ---- a/src/raster/raster.c -+++ b/src/raster/raster.c -@@ -218,7 +218,7 @@ eps_raster_init (RASTER * handle, EpsRasterOpt * data, EpsRasterPipeline * pipel - - /* if raster_p equals NULL means that it is need to flush a page. */ - int --eps_raster_print (RASTER handle, char * raster_p, int raster_bytes, int pixel_num, int * outraster) -+eps_raster_print (RASTER handle, char * raster_p, int raster_bytes, int pixel_num, size_t * outraster) - { - EpsRaster * raster = (EpsRaster *) handle; - EpsRasterPipeline * pipeline = NULL; -diff --git a/src/raster/raster.h b/src/raster/raster.h -index 9be0977..cc5054d 100644 ---- a/src/raster/raster.h -+++ b/src/raster/raster.h -@@ -143,7 +143,7 @@ typedef enum { - } EpsRasterFetchStatus; - - int eps_raster_init (RASTER *, EpsRasterOpt *, EpsRasterPipeline *); --int eps_raster_print (RASTER, char *, int, int, int *); -+int eps_raster_print (RASTER, char *, int, int, size_t *); - int eps_raster_fetch (RASTER, char *, int, int, EpsRasterFetchStatus *); - int eps_raster_free (RASTER); - -diff --git a/src/raster_to_epson.c b/src/raster_to_epson.c -index 6e621c8..a0811d6 100644 ---- a/src/raster_to_epson.c -+++ b/src/raster_to_epson.c -@@ -33,7 +33,7 @@ - #include - #include - --#include "raster.h" -+#include "raster-helper.h" - #include "memory.h" - #include "raster_to_epson.h" - #include "pagemanager.h" -@@ -75,7 +75,7 @@ static int page_no = 0; - static int pageHeight = 0; - #endif - --int rasterSource(char *buf, int bufSize) -+size_t rasterSource(char *buf, int bufSize) - { - int readBytes = 0; - if (JobCanceled == 0) { diff --git a/pkgs/by-name/ep/epson-201401w/package.nix b/pkgs/by-name/ep/epson-201401w/package.nix index 58c27cbeecc9..1c4dbb21c205 100644 --- a/pkgs/by-name/ep/epson-201401w/package.nix +++ b/pkgs/by-name/ep/epson-201401w/package.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation { ]; sha256 = "0c60m1sd59s4sda38dc5nniwa7dh1b0kv1maajr0x9d38gqlyk3x"; }; - patches = [ ./fixbuild.patch ]; nativeBuildInputs = [ rpmextract diff --git a/pkgs/by-name/eq/equalx/package.nix b/pkgs/by-name/eq/equalx/package.nix new file mode 100644 index 000000000000..8783f6d4e08b --- /dev/null +++ b/pkgs/by-name/eq/equalx/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitLab, + + # nativeBuildInputs + protobuf, + qt5, + libsForQt5, + pkg-config, + installShellFiles, + + # buildInputs + ghostscript, + poppler-utils, + exempi, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "equalx"; + version = "0.7.1-unstable-2020-02-26"; + + src = fetchFromGitLab { + owner = "q-quark"; + repo = "equalx"; + rev = "b7175a574379d86c43cabbdb6071f0b6d40d8e79"; + hash = "sha256-3KIJk5bTmFjaojjHDurJjEgyvuIf0LHcSi+MrmsRPcg="; + }; + postPatch = '' + substituteInPlace equalx.pro \ + --replace-fail 'git describe --abbrev=0 --tags' 'echo ${finalAttrs.version}' + ''; + + nativeBuildInputs = [ + protobuf + qt5.qmake + qt5.wrapQtAppsHook + pkg-config + installShellFiles + ]; + + buildInputs = [ + qt5.qtbase + qt5.qtmultimedia + libsForQt5.poppler + ghostscript + poppler-utils + exempi + ]; + + installPhase = '' + runHook preInstall + + installBin equalx + installManPage equalx.1 + install -Dm644 equalx.appdata.xml $out/share/metainfo/eqaulx.appdata.xml + install -Dm644 resources/equalx.ico $out/share/icons/hicolor/256x256/apps/equalx.ico + install -Dm644 resources/equalx.desktop $out/share/applications/equalx.desktop + + runHook postInstall + ''; + + meta = { + description = "Graphical interface to latex and a bunch of conversion programs"; + homepage = "https://equalx.sourceforge.io/"; + mainProgram = "equalx"; + downloadPage = "https://gitlab.com/q-quark/equalx"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +}) diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index 54e006c2c2ff..4bf15d43a41b 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "equibop"; - version = "2.1.2"; + version = "2.1.4"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equibop"; tag = "v${finalAttrs.version}"; - hash = "sha256-lDDGZUpW9LU5S/gzNJFIuVIk08pQlQLK07RwuzcYyjg="; + hash = "sha256-y5q3shwmMjXlMaLWfxjN164uM8hSbWymsHIIJxM82Nk="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { src patches ; - hash = "sha256-MuCQJgUHyAKpKWM7lYE49zur+G+KtIVBVXCspWImnY8="; + hash = "sha256-laTyxRh54x3iopGVgoFtcgaV7R6IKux1O/+tzGEy0Fg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index bc12644fa050..e8f6b97529d7 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -10,18 +10,22 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "equicord"; - version = "1.11.4"; + # Upstream discourages inferring the package version from the package.json found in + # the Equicord repository. Dates as tags (and automatic releases) were the compromise + # we came to with upstream. Please do not change the version schema (e.g., to semver) + # unless upstream changes the tag schema from dates. + version = "2025-04-17"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equicord"; - tag = "v${finalAttrs.version}"; - hash = "sha256-BjAp+bubpG9tTo8y5LWcTCnpLbiyuY1Q6ZnprgeKoZg="; + tag = "${finalAttrs.version}"; + hash = "sha256-pAuNqPrQBeL2qPIoIvyBl1PrUBz81TrBd5RT15Iuuus="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-4uCo/pQ4f8k/7DNpCPDAeqfroZ9icFiTwapwS10uWkE="; + hash = "sha256-fjfzBy1Z7AUKA53yjjCQ6yasHc5QMaOBtXtXA5fNK5s="; }; nativeBuildInputs = [ @@ -52,7 +56,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^\d{4}-\d{2}-\d{2}$" + ]; + }; meta = { description = "The other cutest Discord client mod"; diff --git a/pkgs/by-name/er/ergo/package.nix b/pkgs/by-name/er/ergo/package.nix index b9d8f66439b8..c575777d2ac1 100644 --- a/pkgs/by-name/er/ergo/package.nix +++ b/pkgs/by-name/er/ergo/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.25"; + version = "5.0.26"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-4Eoo1f9oLxYdFC1M46Bq1D9RbIeOoWh0qECzcBbv3KA="; + sha256 = "sha256-WVrImdtn6UPWMpd6ltUbJGyqnLPud7JuFPuU4lHS8AE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/er/ergochat/package.nix b/pkgs/by-name/er/ergochat/package.nix index 3a0de73fdf32..67910c2e3272 100644 --- a/pkgs/by-name/er/ergochat/package.nix +++ b/pkgs/by-name/er/ergochat/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ergo"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "ergochat"; repo = "ergo"; rev = "v${version}"; - sha256 = "sha256-8qZ5pnbCYN/j8B5cS456HVK2hDGqJwrPo1k4oagJrqU="; + sha256 = "sha256-AUXuH7YjC/yG5Ocs+kAOF8bAR4UVgfx96VDSHEqmqgg="; }; vendorHash = null; diff --git a/pkgs/by-name/er/ergogen/package.nix b/pkgs/by-name/er/ergogen/package.nix new file mode 100644 index 000000000000..8e7834f4344b --- /dev/null +++ b/pkgs/by-name/er/ergogen/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "ergogen"; + version = "4.1.0"; + + forceGitDeps = true; + + src = fetchFromGitHub { + owner = "ergogen"; + repo = "ergogen"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y4Ri5nLxbQ78LvyGARPxsvoZ9gSMxY14QuxZJg6Cu3Y="; + }; + + npmDepsHash = "sha256-BQbf/2lWLYnrSjwWjDo6QceFyR+J/vhDcVgCaytGfl0="; + + makeCacheWritable = true; + dontNpmBuild = true; + npmPackFlags = [ "--ignore-scripts" ]; + NODE_OPTIONS = "--openssl-legacy-provider"; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Ergonomic keyboard layout generator."; + homepage = "https://ergogen.xyz"; + mainProgram = "ergogen"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Tygo-van-den-Hurk ]; + }; +}) diff --git a/pkgs/by-name/er/erigon/package.nix b/pkgs/by-name/er/erigon/package.nix index 1056a7faf2a7..a58e2f6a9bdf 100644 --- a/pkgs/by-name/er/erigon/package.nix +++ b/pkgs/by-name/er/erigon/package.nix @@ -7,7 +7,7 @@ let pname = "erigon"; - version = "2.61.3"; + version = "3.0.3"; in buildGoModule { inherit pname version; @@ -16,11 +16,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-VGLuPaGYx/DQc3Oc9wAbELXAtkuxr8cbePVBExlZikk="; + hash = "sha256-gSgkdg7677OBOkAbsEjxX1QttuIbfve2A3luUZoZ5Ik="; fetchSubmodules = true; }; - vendorHash = "sha256-1LB2T0o9LjFdpl86NPMKx1lFLrQZefAGldcSQyL6O7M="; + vendorHash = "sha256-8eyC3JkRcRlFw8CyTK5w1XySur2jAeFGXkEaY/3Oq0k="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index 1450966030a1..da80e66bec07 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -14,14 +14,14 @@ let hashes = { linux-aarch64-unknown-linux-gnu = "sha256-i6XsOK8csrJ/9TDzltA7mGjdutLZONFiYGV5tqSCy8o="; - linux-x86_64-unknown-linux-gnu = "sha256-gBIzG0LaP9qxivkr47JpBu1z9km7o/1Wppk/6k2WslE="; + linux-x86_64-unknown-linux-gnu = "sha256-XK3DPWIdPDoIL10EATa8p1bnlpZaOzOdU0LnuKbj++E="; macos-aarch64-apple-darwin = "sha256-8e5duQYDVFyZejMjuZPuWhg1on3CBku9eBuilG5p1BY="; macos-x86_64-apple-darwin = "sha256-dnouUBUUAkMr1h+IJWYamxmk8IC7JdeIUS9/YI0GzOU="; }; in stdenv.mkDerivation rec { pname = "erlang-language-platform"; - version = "2025-02-13"; + version = "2025-04-02"; src = fetchurl { url = "https://github.com/WhatsApp/erlang-language-platform/releases/download/${version}/elp-${release}-otp-26.2.tar.gz"; diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index b4897125f0b1..849325513b88 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; - version = "1.8.5"; + version = "1.8.6"; outputs = [ "out" "man" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; - hash = "sha256-zYYRJw6chv4GL2RxA8pq2p7XEORDD91ZYNUUd3kZIA0="; + hash = "sha256-WyIdw/1tFRQlswU07eRvt6kNwjOoZZy6A3J5awoGZUc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix index 9070e0a778ff..665a79eee1b1 100644 --- a/pkgs/by-name/er/errands/package.nix +++ b/pkgs/by-name/er/errands/package.nix @@ -70,12 +70,10 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/mrvladus/Errands"; license = lib.licenses.mit; mainProgram = "errands"; - maintainers = - with lib.maintainers; - [ - luftmensch-luftmensch - sund3RRR - ] - ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + sund3RRR + ]; + teams = [ lib.teams.gnome-circle ]; }; } diff --git a/pkgs/by-name/er/errbot/package.nix b/pkgs/by-name/er/errbot/package.nix index 8ff4c4cf431a..51f8e9916b5d 100644 --- a/pkgs/by-name/er/errbot/package.nix +++ b/pkgs/by-name/er/errbot/package.nix @@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec { pygments-markdown-lexer pyopenssl requests + setuptools slixmpp python-telegram-bot webtest @@ -58,13 +59,13 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "errbot" ]; - meta = with lib; { + meta = { changelog = "https://github.com/errbotio/errbot/blob/${version}/CHANGES.rst"; description = "Chatbot designed to be simple to extend with plugins written in Python"; homepage = "http://errbot.io/"; - maintainers = [ ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ hlad ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; # flaky on darwin, "RuntimeError: can't start new thread" mainProgram = "errbot"; }; diff --git a/pkgs/by-name/es/esdm/package.nix b/pkgs/by-name/es/esdm/package.nix index 176bdf1a07fc..47ec9b4ff7a3 100644 --- a/pkgs/by-name/es/esdm/package.nix +++ b/pkgs/by-name/es/esdm/package.nix @@ -23,13 +23,13 @@ drngChaCha20 ? false, # set the default drng callback ais2031 ? false, # set the seeding strategy to be compliant with AIS 20/31 sp80090c ? false, # set compliance with NIST SP800-90C - cryptoBackend ? "botan", # set backend for hash and drbg operations + cryptoBackend ? "builtin", # set backend for hash and drbg operations linuxDevFiles ? true, # enable linux /dev/random and /dev/urandom support linuxGetRandom ? true, # enable linux getrandom support hashSha512 ? false, # set the conditioning hash: SHA2-512 hashSha3_512 ? true, # set the conditioning hash: SHA3-512 - openSSLRandProvider ? true, # build ESDM provider for OpenSSL 3.x - botanRng ? true, # build ESDM class for Botan 3.x + openSSLRandProvider ? false, # build ESDM provider for OpenSSL 3.x + botanRng ? false, # build ESDM class for Botan 3.x # client-related options (handle with care, consult source code and meson options) # leave as is if in doubt @@ -56,10 +56,7 @@ assert drngHashDrbg != drngChaCha20; assert hashSha512 != hashSha3_512; -assert - cryptoBackend == "openssl" - || cryptoBackend == "botan" - || cryptoBackend == "builtin" "Unsupported ESDM crypto backend"; +assert cryptoBackend == "openssl" || cryptoBackend == "botan" || cryptoBackend == "builtin"; stdenv.mkDerivation rec { pname = "esdm"; diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix index 14267e6c1aaa..91e0a7cd3f3c 100644 --- a/pkgs/by-name/es/eslint/package.nix +++ b/pkgs/by-name/es/eslint/package.nix @@ -3,14 +3,8 @@ buildNpmPackage, fetchFromGitHub, stdenv, - overrideSDK, }: -let - buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; -in -buildNpmPackage' rec { +buildNpmPackage rec { pname = "eslint"; version = "9.20.0"; diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix index f365a2c54794..266144cd4808 100644 --- a/pkgs/by-name/es/espflash/package.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -6,11 +6,8 @@ installShellFiles, udev, stdenv, - CoreServices, - Security, nix-update-script, openssl, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -36,11 +33,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration ]; useFetchCargoVendor = true; diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index 4c059307e757..cdbab8d18f13 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20250212.0"; + version = "20250514.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; rev = "refs/tags/${version}"; - hash = "sha256-9yXG9jwB284xTM6L3HWQCRD9Ki1F8yHaEl1vDNDxogw="; + hash = "sha256-t0+YlITnxgnLrK/SN0bSmMIv3djR9DKMlnFrR9Btwx8="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-B0Lx4aH+7NVSMY9qUUOiVeLgIL5wI3JolC9eLzjbRRA="; + hash = "sha256-Uiz26kPxoz32t/GRppiYiVBVwWcQqUzPr0kScVUZak8="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index adcab8b4f515..42ce5755059e 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -17,19 +17,30 @@ let self = python; packageOverrides = self: super: { esphome-dashboard = self.callPackage ./dashboard.nix { }; + + paho-mqtt = super.paho-mqtt.overridePythonAttrs (oldAttrs: rec { + version = "1.6.1"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + tag = "v${version}"; + hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; + }; + build-system = with self; [ setuptools ]; + doCheck = false; + }); }; }; in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.3.3"; + version = "2025.5.0"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; tag = version; - hash = "sha256-757vkpIppL0f4DsTVFwTNZLzWUtScJQKhEFz9wEtCnE="; + hash = "sha256-BcPdgAvRR7zataL4KOhLAvQaQnS60z8UZ9xdIK7ydz4="; }; build-systems = with python.pkgs; [ @@ -50,11 +61,7 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==" "setuptools>=" \ - --replace-fail "wheel~=" "wheel>=" - - # ensure component dependencies are available - cat requirements_optional.txt >> requirements.txt + --replace-fail "setuptools==80.4.0" "setuptools" ''; # Remove esptool and platformio from requirements @@ -161,7 +168,6 @@ python.pkgs.buildPythonApplication rec { gpl3Only # The python codebase and all other parts of this codebase ]; maintainers = with maintainers; [ - globin hexa ]; mainProgram = "esphome"; diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix index a77cb5e750d7..8b8b26821e2a 100644 --- a/pkgs/by-name/es/esptool/package.nix +++ b/pkgs/by-name/es/esptool/package.nix @@ -75,13 +75,11 @@ python3Packages.buildPythonApplication rec { description = "ESP8266 and ESP32 serial bootloader utility"; homepage = "https://github.com/espressif/esptool"; license = licenses.gpl2Plus; - maintainers = - with maintainers; - [ - dezgeg - dotlambda - ] - ++ teams.lumiguide.members; + maintainers = with maintainers; [ + dezgeg + dotlambda + ]; + teams = [ lib.teams.lumiguide ]; platforms = with platforms; linux ++ darwin; mainProgram = "esptool.py"; }; diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix index bbd6e88cb6f9..7b21b7297b7c 100644 --- a/pkgs/by-name/es/espup/package.nix +++ b/pkgs/by-name/es/espup/package.nix @@ -9,51 +9,43 @@ xz, zstd, stdenv, - darwin, testers, - espup, + writableTmpDirAsHomeHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "espup"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; - rev = "v${version}"; - hash = "sha256-sPWGpQi9JrkdaPV2jvwaY9zjb8urK+ibhvxw/CC2UOQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-1muyZd7jhhDkif/8mX7QZEMnV105jNMHT0RaZPinD/4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-k6hczvuEvutUWOrKYFUltA0ZD+AHa8E0+5YW1+0TKQA="; + cargoHash = "sha256-fX6nl0DZZNiH/VWR9eWMnTuBW9r1jz3IWIxbOGC4Amg="; nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = - [ - bzip2 - openssl - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + xz + zstd + ]; env = { OPENSSL_NO_VENDOR = true; ZSTD_SYS_USE_PKG_CONFIG = true; }; - preCheck = '' - export HOME=$(mktemp -d) - ''; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; checkFlags = [ # makes network calls @@ -67,21 +59,24 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/espup completions zsh) ''; - passthru.tests.version = testers.testVersion { - package = espup; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; }; - meta = with lib; { + meta = { description = "Tool for installing and maintaining Espressif Rust ecosystem"; homepage = "https://github.com/esp-rs/espup/"; - license = with licenses; [ + license = with lib.licenses; [ mit asl20 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ knightpp beeb ]; mainProgram = "espup"; }; -} +}) diff --git a/pkgs/by-name/es/est-sfs/package.nix b/pkgs/by-name/es/est-sfs/package.nix deleted file mode 100644 index a88578d99248..000000000000 --- a/pkgs/by-name/es/est-sfs/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gsl, -}: - -stdenv.mkDerivation rec { - pname = "est-sfs"; - version = "2.03"; - - src = fetchurl { - url = "mirror://sourceforge/est-usfs/${pname}-release-${version}.tar.gz"; - sha256 = "1hvamrgagz0xi89w8qafyd9mjrdpyika8zm22drddnjkp4sdj65n"; - }; - - buildInputs = [ gsl ]; - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - ]; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/doc/${pname} - cp est-sfs $out/bin - cp est-sfs-documentation.pdf $out/share/doc/${pname} - ''; - - meta = with lib; { - homepage = "https://sourceforge.net/projects/est-usfs"; - description = "Estimate the unfolded site frequency spectrum and ancestral states"; - mainProgram = "est-sfs"; - license = licenses.gpl3; - maintainers = [ maintainers.bzizou ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix index 634ecfbbf4d0..d60842ae2133 100644 --- a/pkgs/by-name/et/eternal-terminal/package.nix +++ b/pkgs/by-name/et/eternal-terminal/package.nix @@ -9,7 +9,6 @@ protobuf, zlib, catch2, - darwin, }: stdenv.mkDerivation rec { diff --git a/pkgs/by-name/et/ethercat/package.nix b/pkgs/by-name/et/ethercat/package.nix index 61218cca36b6..827da0ee1602 100644 --- a/pkgs/by-name/et/ethercat/package.nix +++ b/pkgs/by-name/et/ethercat/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ethercat"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitLab { owner = "etherlab.org"; repo = "ethercat"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-vTAAeWAiJDo/Bd/3id4Bc0OdkL6s57vl+jbwOGFzfnc="; + hash = "sha256-Sl54LgC6NeAm9wfVGbQBDeSJmpzStal8yq4pmkmKtqs="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/et/etherpad-lite/dont-fail-on-plugins-json.patch b/pkgs/by-name/et/etherpad-lite/dont-fail-on-plugins-json.patch new file mode 100644 index 000000000000..f7197f024ffe --- /dev/null +++ b/pkgs/by-name/et/etherpad-lite/dont-fail-on-plugins-json.patch @@ -0,0 +1,19 @@ +diff --git a/src/static/js/pluginfw/installer.ts b/src/static/js/pluginfw/installer.ts +index c605378e1..27e3e487b 100644 +--- a/src/static/js/pluginfw/installer.ts ++++ b/src/static/js/pluginfw/installer.ts +@@ -83,7 +83,13 @@ export const checkForMigration = async () => { + try { + await fs.access(installedPluginsPath, fs.constants.F_OK); + } catch (err) { +- await migratePluginsFromNodeModules(); ++ logger.info(`${installedPluginsPath} not found, creating using current node modules`); ++ try { ++ await migratePluginsFromNodeModules(); ++ } catch (err2) { ++ logger.warn(`unable to create ${installedPluginsPath}, skipping plugin migrations`); ++ return; ++ } + } + + /* diff --git a/pkgs/by-name/et/etherpad-lite/outdir.patch b/pkgs/by-name/et/etherpad-lite/outdir.patch new file mode 100644 index 000000000000..f62322800ffe --- /dev/null +++ b/pkgs/by-name/et/etherpad-lite/outdir.patch @@ -0,0 +1,51 @@ +From e881a383b38d4d80ee28c17a14b5de58889245de Mon Sep 17 00:00:00 2001 +From: Alexandre Iooss +Date: Tue, 5 Nov 2024 16:30:33 +0100 +Subject: [PATCH] Use temporary directory for esbuild + +--- + src/node/hooks/express/specialpages.ts | 11 +++++------ + +diff --git a/src/node/hooks/express/specialpages.ts b/src/node/hooks/express/specialpages.ts +index 2e26eaa0cee..31d5138e67c 100644 +--- a/src/node/hooks/express/specialpages.ts ++++ b/src/node/hooks/express/specialpages.ts +@@ -3,6 +3,7 @@ + import path from 'node:path'; + const eejs = require('../../eejs') + import fs from 'node:fs'; ++import os from 'node:os'; + const fsp = fs.promises; + const toolbar = require('../../utils/toolbar'); + const hooks = require('../../../static/js/pluginfw/hooks'); +@@ -89,7 +90,7 @@ const convertTypescript = (content: string) => { + const outputRaw = buildSync({ + stdin: { + contents: content, +- resolveDir: path.join(settings.root, 'var','js'), ++ resolveDir: settings.root, + loader: 'js' + }, + alias:{ +@@ -222,7 +223,7 @@ const convertTypescriptWatched = (content: string, cb: (output:string, hash: str + build({ + stdin: { + contents: content, +- resolveDir: path.join(settings.root, 'var','js'), ++ resolveDir: settings.root, + loader: 'js' + }, + alias:{ +@@ -276,10 +277,8 @@ exports.expressCreateServer = async (hookName: string, args: ArgsExpressType, cb + settings, + }) + +- +- +- const outdir = path.join(settings.root, 'var','js') +- // Create the outdir if it doesn't exist ++ // Create a temporary directory to store runtime-built JS files ++ const outdir = path.join(os.tmpdir(), 'js'); + if (!fs.existsSync(outdir)) { + fs.mkdirSync(outdir); + } diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix new file mode 100644 index 000000000000..2cd12e19e317 --- /dev/null +++ b/pkgs/by-name/et/etherpad-lite/package.nix @@ -0,0 +1,96 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + pnpm_9, + makeWrapper, + nodejs, +}: + +let + pnpm = pnpm_9; +in +stdenv.mkDerivation (finalAttrs: { + pname = "etherpad-lite"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "ether"; + repo = "etherpad-lite"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OomZ1oziEGgLJfYyfkHZOPRHfrrWc4XLAsZA4cn0btA="; + }; + + patches = [ + ./outdir.patch + # etherpad expects to read and write $out/lib/var/installed_plugins.json + # FIXME: this patch disables plugin support + ./dont-fail-on-plugins-json.patch + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-nhiPopGLCeCHiqEQ3solwuLwkDnHTH3otbxIJmbuQAA="; + }; + + nativeBuildInputs = [ + pnpm.configHook + makeWrapper + ]; + + buildInputs = [ + nodejs + ]; + + buildPhase = '' + runHook preBuild + NODE_ENV="production" pnpm run build:etherpad + runHook postBuild + ''; + + preInstall = '' + # remove unnecessary files + rm node_modules/.modules.yaml + pnpm prune --prod --ignore-scripts + find -type f \( -name "*.d.ts" -o -name "*.map" \) -exec rm -rf {} + + + # remove non-deterministic files + rm node_modules/.modules.yaml + ''; + + # Upstream scripts uses `pnpm run prod` which is equivalent to + # `cross-env NODE_ENV=production node --require tsx/cjs node/server.ts` + installPhase = '' + runHook preInstall + mkdir -p $out/{lib/etherpad-lite,bin} + cp -r node_modules ui src doc admin $out/lib/etherpad-lite + makeWrapper ${lib.getExe nodejs} $out/bin/etherpad-lite \ + --inherit-argv0 \ + --add-flags "--require tsx/cjs $out/lib/etherpad-lite/node_modules/ep_etherpad-lite/node/server.ts" \ + --suffix PATH : "${lib.makeBinPath [ pnpm ]}" \ + --set NODE_PATH "$out/lib/node_modules:$out/lib/etherpad-lite/node_modules/ep_etherpad-lite/node_modules" \ + --set-default NODE_ENV production + find $out/lib -xtype l -delete + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Modern really-real-time collaborative document editor"; + longDescription = '' + Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. + It provides full data export capabilities, and runs on your server, under your control. + ''; + homepage = "https://etherpad.org/"; + changelog = "https://github.com/ether/etherpad-lite/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ + erdnaxe + f2k1de + ]; + license = lib.licenses.asl20; + mainProgram = "etherpad-lite"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/et/ethtool/package.nix b/pkgs/by-name/et/ethtool/package.nix index 9362d2d4007e..13b15abe5f2a 100644 --- a/pkgs/by-name/et/ethtool/package.nix +++ b/pkgs/by-name/et/ethtool/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "6.11"; + version = "6.14"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/ethtool-${version}.tar.xz"; - sha256 = "sha256-jZH1xyrj8lt+iNR4EnncsyD3HjAFiRQ3CxxXTJazEgI="; + hash = "sha256-kzi7AOSSh407vjzSiU5g2zWBNjTCCNsLIPXH7oTaabE="; }; nativeBuildInputs = [ @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { libmnl ]; + enableParallelBuilding = true; + passthru = { updateScript = writeScript "update-ethtool" '' #!/usr/bin/env nix-shell diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index a9b1b93c2041..c5d7ef2b9235 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -15,6 +15,7 @@ libogg, libpng, libtheora, + libX11, lua5_4, minizip, openal, @@ -62,6 +63,7 @@ stdenv.mkDerivation { libogg libpng libtheora + libX11 lua5_4 minizip openal diff --git a/pkgs/by-name/et/ettercap/package.nix b/pkgs/by-name/et/ettercap/package.nix index 29d558b35896..8bd47cd8f085 100644 --- a/pkgs/by-name/et/ettercap/package.nix +++ b/pkgs/by-name/et/ettercap/package.nix @@ -8,7 +8,7 @@ libnet, zlib, curl, - pcre, + pcre2, openssl, ncurses, glib, @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { libnet zlib curl - pcre + pcre2 openssl ncurses glib diff --git a/pkgs/by-name/eu/eureka-ideas/package.nix b/pkgs/by-name/eu/eureka-ideas/package.nix new file mode 100644 index 000000000000..094497db1697 --- /dev/null +++ b/pkgs/by-name/eu/eureka-ideas/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libgit2, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "eureka-ideas"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "simeg"; + repo = "eureka"; + rev = "v${version}"; + sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-nTYMKJ5OCApqooIF1dsDLriPfYjkZkTdtzpkJya/5ag="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libgit2 + openssl + ]; + + useNextest = true; + + meta = with lib; { + description = "CLI tool to input and store your ideas without leaving the terminal"; + homepage = "https://github.com/simeg/eureka"; + changelog = "https://github.com/simeg/eureka/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "eureka"; + }; +} diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 4d99185bf04b..8f0a5bd0f470 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.202.1"; + version = "0.203.6"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-GMKhlNZLk6R0XZn5I3YP5Eav8wD6WbEr1DM+VVtQtjo="; + hash = "sha256-hxh0EgOa2ZFpufyS4Aei86QjeJA0vyuornPK7Y5nRtQ="; }; - vendorHash = "sha256-K9X63dTWE+dC5yo8LX86pUezm8OHwEHNXwxXHn/4AwU="; + vendorHash = "sha256-hhr6UegsurRsrbN3YB9FAkbZkH+B6RwLmG7RRyNR4+4="; commonMeta = with lib; { license = licenses.mit; @@ -52,7 +52,7 @@ buildGo124Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-iTrmgNmUoHQWL5tsqhUnd0t1t9qengb6ba9pxYrL9Ks="; + hash = "sha256-8hhiEqQclZUc6zgYvTacVAu5Y47gLJyP249lP4WjVGQ="; }; nativeBuildInputs = [ @@ -82,8 +82,8 @@ buildGo124Module rec { ]; ldflags = [ - "-X github.com/evcc-io/evcc/server.Version=${version}" - "-X github.com/evcc-io/evcc/server.Commit=${src.tag}" + "-X github.com/evcc-io/evcc/util.Version=${version}" + "-X github.com/evcc-io/evcc/util.Commit=${src.tag}" "-s" "-w" ]; diff --git a/pkgs/by-name/ev/evcxr/package.nix b/pkgs/by-name/ev/evcxr/package.nix new file mode 100644 index 000000000000..581420e88300 --- /dev/null +++ b/pkgs/by-name/ev/evcxr/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + makeWrapper, + pkg-config, + cmake, + libiconv, + cargo, + gcc, + mold, + rustc, + nix-update-script, + + # On non-darwin, `mold` is the default linker, but it's broken on Darwin. + withMold ? with stdenv.hostPlatform; isUnix && !isDarwin, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "evcxr"; + version = "0.19.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "evcxr"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-8PjZFWUH76QrA8EI9Cx0sBCzocvSmnp84VD7Nv9QMc8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-hE/O6lHC0o+nrN4vaQ155Nn2gZscpfsZ6o7IDi/IEjI="; + + RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; + + nativeBuildInputs = [ + pkg-config + makeWrapper + cmake + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + checkFlags = [ + # outdated rust-analyzer (disabled, upstream) + # https://github.com/evcxr/evcxr/blob/fcdac75f49dcab3229524e671d4417d36c12130b/evcxr/tests/integration_tests.rs#L741 + # https://github.com/evcxr/evcxr/issues/295 + "--skip=partially_inferred_variable_type" + # fail, but can't reproduce in the REPL + "--skip=code_completion" + "--skip=save_and_restore_variables" + ]; + + # Some tests fail when types aren't explicitly specified, but which can't be + # reproduced inside the REPL. + # Likely related to https://github.com/evcxr/evcxr/issues/295 + postConfigure = '' + substituteInPlace evcxr/tests/integration_tests.rs \ + --replace-fail "let var2 = String" "let var2: String = String" `# code_completion` \ + --replace-fail "let a = vec" "let a: Vec = vec" `# function_panics_{with,without}_variable_preserving` \ + --replace-fail "let a = Some(" "let a: Option = Some(" `# moved_value` \ + --replace-fail "let a = \"foo\"" "let a: String = \"foo\"" `# statement_and_expression` \ + --replace-fail "let owned = \"owned\"" "let owned:String = \"owned\"" `# question_mark_operator` \ + --replace-fail "let mut owned_mut =" "let mut owned_mut: String =" + ''; + + postInstall = + let + wrap = exe: '' + wrapProgram $out/bin/${exe} \ + --prefix PATH : ${ + lib.makeBinPath ( + [ + cargo + gcc + rustc + ] + ++ lib.optional withMold mold + ) + } \ + --set-default RUST_SRC_PATH "$RUST_SRC_PATH" + ''; + in + '' + ${wrap "evcxr"} + ${wrap "evcxr_jupyter"} + rm $out/bin/testing_runtime + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Evaluation context for Rust"; + homepage = "https://github.com/google/evcxr"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + protoben + ma27 + ]; + mainProgram = "evcxr"; + }; +}) diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix index baf6501a9f3d..01262f9e2d63 100644 --- a/pkgs/by-name/ev/evil-helix/package.nix +++ b/pkgs/by-name/ev/evil-helix/package.nix @@ -3,18 +3,19 @@ fetchFromGitHub, helix, installShellFiles, + nix-update-script, rustPlatform, }: rustPlatform.buildRustPackage rec { pname = "evil-helix"; - version = "20250104"; + version = "20250413"; src = fetchFromGitHub { owner = "usagi-flow"; repo = "evil-helix"; rev = "release-${version}"; - hash = "sha256-Otp68+SbW51/MqVejPrbYzeRu4wAiYsNkDQQTZScW1Q="; + hash = "sha256-0dXDAhnkkr5rh4UK0zkT3xYthk01VbNnRrYe5rD3oh4="; }; useFetchCargoVendor = true; @@ -40,6 +41,8 @@ rustPlatform.buildRustPackage rec { cp contrib/helix.png $out/share/icons/hicolor/256x256/apps ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Post-modern modal text editor, with vim keybindings"; homepage = "https://github.com/usagi-flow/evil-helix"; diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix index a8837ff20245..977b8b78b30d 100644 --- a/pkgs/by-name/ev/evince/package.nix +++ b/pkgs/by-name/ev/evince/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "evince"; - version = "46.3.1"; + version = "48.0"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major finalAttrs.version}/evince-${finalAttrs.version}.tar.xz"; - hash = "sha256-lFwgpvI4ObDVMycpFxRY6QaA2oJk6Zxvn0HCGcfu7nw="; + hash = "sha256-zS9lg1X6kHX9+eW0SqCvOn4JKMVWFOsQQrNhds9FESY="; }; depsBuildBuild = [ @@ -151,6 +151,9 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; platforms = platforms.unix; mainProgram = "evince"; - maintainers = teams.gnome.members ++ teams.pantheon.members; + teams = [ + teams.gnome + teams.pantheon + ]; }; }) diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index 0f6e40630f62..62eae627efd7 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -66,10 +66,10 @@ index 5e65ec8..2cae29d 100644 g_mutex_unlock (&mutex); diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c -index e85a56b..59d3fe2 100644 +index a9b68e3..6a13b1b 100644 --- a/src/addressbook/libebook/e-book.c +++ b/src/addressbook/libebook/e-book.c -@@ -2587,7 +2587,18 @@ e_book_get_self (ESourceRegistry *registry, +@@ -2586,7 +2586,18 @@ e_book_get_self (ESourceRegistry *registry, return FALSE; } @@ -89,7 +89,7 @@ index e85a56b..59d3fe2 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -2642,7 +2653,18 @@ e_book_set_self (EBook *book, +@@ -2641,7 +2652,18 @@ e_book_set_self (EBook *book, g_return_val_if_fail (E_IS_BOOK (book), FALSE); g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); @@ -109,7 +109,7 @@ index e85a56b..59d3fe2 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2670,7 +2692,18 @@ e_book_is_self (EContact *contact) +@@ -2669,7 +2691,18 @@ e_book_is_self (EContact *contact) g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); @@ -130,10 +130,10 @@ index e85a56b..59d3fe2 100644 g_object_unref (settings); diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c -index 3ab8908..6c4b210 100644 +index 752f83f..eaa3dad 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c -@@ -146,7 +146,18 @@ ebmb_is_power_saver_enabled (void) +@@ -145,7 +145,18 @@ ebmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -154,10 +154,10 @@ index 3ab8908..6c4b210 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c -index 047fb97..960f44c 100644 +index 9f8646a..079aba9 100644 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c -@@ -1333,7 +1333,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) +@@ -1338,7 +1338,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) (GDestroyNotify) g_free, (GDestroyNotify) contact_record_free); @@ -204,10 +204,10 @@ index 2525856..7ecc1a8 100644 g_clear_object (&settings); } diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index a83d3d3..dc7acac 100644 +index 026ae80..e3003c2 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2826,8 +2826,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2844,8 +2844,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); @@ -244,10 +244,10 @@ index a83d3d3..dc7acac 100644 g_signal_connect_object ( watcher->priv->desktop_settings, diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index f19ab22..abd3263 100644 +index 84ccbb0..9010429 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c -@@ -158,7 +158,18 @@ ecmb_is_power_saver_enabled (void) +@@ -157,7 +157,18 @@ ecmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -267,7 +267,7 @@ index f19ab22..abd3263 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; -@@ -2629,7 +2640,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, +@@ -2628,7 +2639,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, if (is_declined) { GSettings *settings; @@ -290,10 +290,10 @@ index f19ab22..abd3263 100644 g_clear_object (&settings); } diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c -index d5a0823..2ae03f8 100644 +index d00fbd5..0f67653 100644 --- a/src/camel/camel-cipher-context.c +++ b/src/camel/camel-cipher-context.c -@@ -1631,7 +1631,18 @@ camel_cipher_can_load_photos (void) +@@ -1630,7 +1630,18 @@ camel_cipher_can_load_photos (void) GSettings *settings; gboolean load_photos; @@ -314,10 +314,10 @@ index d5a0823..2ae03f8 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 4c10de7..6c0ab5e 100644 +index 4594ab1..e71ce05 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c -@@ -744,7 +744,18 @@ gpg_ctx_get_executable_name (void) +@@ -745,7 +745,18 @@ gpg_ctx_get_executable_name (void) GSettings *settings; gchar *path; @@ -338,10 +338,10 @@ index 4c10de7..6c0ab5e 100644 g_clear_object (&settings); diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c -index e61160c..b6553a4 100644 +index 0c1c7dd..4188934 100644 --- a/src/camel/camel-utils.c +++ b/src/camel/camel-utils.c -@@ -362,7 +362,19 @@ void +@@ -361,7 +361,19 @@ void _camel_utils_initialize (void) { G_LOCK (mi_user_headers); @@ -363,10 +363,10 @@ index e61160c..b6553a4 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index 396cf39..e31dc1a 100644 +index 8cf56f0..f4355d5 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5682,7 +5682,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) +@@ -5681,7 +5681,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) if (do_old_flags_update) { GSettings *eds_settings; @@ -387,10 +387,10 @@ index 396cf39..e31dc1a 100644 if (g_settings_get_boolean (eds_settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c -index 38bedb6..f799c29 100644 +index f7c5d3c..67732c3 100644 --- a/src/camel/providers/smtp/camel-smtp-transport.c +++ b/src/camel/providers/smtp/camel-smtp-transport.c -@@ -1472,7 +1472,18 @@ smtp_helo (CamelSmtpTransport *transport, +@@ -1471,7 +1471,18 @@ smtp_helo (CamelSmtpTransport *transport, transport->authtypes = NULL; } @@ -507,10 +507,10 @@ index 3738359..f9ce2d9 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index 29c1dd2..84d42b7 100644 +index db775f9..fb524db 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c -@@ -94,7 +94,18 @@ eos_default_guess_can_process (EOAuth2Service *service, +@@ -93,7 +93,18 @@ eos_default_guess_can_process (EOAuth2Service *service, name_len = strlen (name); hostname_len = strlen (hostname); @@ -556,10 +556,10 @@ index 1539f8b..77cf123 100644 g_signal_connect ( registry->priv->settings, "changed", diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c -index 14b6481..7149b74 100644 +index b47a374..e812fbe 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c -@@ -1986,7 +1986,19 @@ static void +@@ -1985,7 +1985,19 @@ static void e_reminders_widget_init (ERemindersWidget *reminders) { reminders->priv = e_reminders_widget_get_instance_private (reminders); diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index b034d3cc0202..ef177c079ded 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -24,7 +24,6 @@ wrapGAppsHook3, glib-networking, gsettings-desktop-schemas, - pcre, vala, cmake, ninja, @@ -51,7 +50,7 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.54.3"; + version = "3.56.1"; outputs = [ "out" @@ -60,7 +59,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz"; - hash = "sha256-UQjcOO5cwfjvkVXof2xBKflkRVCglixa4j/4B7V8uNA="; + hash = "sha256-ZGzAA32j+fKVeUxjfZU5StdvjJvuImi+LEGD4ncgwTc="; }; patches = [ @@ -102,7 +101,6 @@ stdenv.mkDerivation rec { openldap glib-networking libcanberra-gtk3 - pcre libphonenumber libuuid boost @@ -204,7 +202,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/evolution-data-server"; changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.lgpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; # requires libuuid }; } diff --git a/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch index 2e1611cc942b..e2babb6a3209 100644 --- a/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch @@ -1,8 +1,17 @@ diff --git a/src/EWS/camel/camel-ews-utils.c b/src/EWS/camel/camel-ews-utils.c -index 44a20d6..90d5729 100644 +index 32817df..da65217 100644 --- a/src/EWS/camel/camel-ews-utils.c +++ b/src/EWS/camel/camel-ews-utils.c -@@ -1554,7 +1554,18 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C +@@ -1550,7 +1550,7 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C + gboolean changed = FALSE; + + /* cannot save, when evolution is not installed */ +- if (!e_ews_common_utils_gsettings_schema_exists ("org.gnome.evolution.mail")) ++ if (!TRUE) + return FALSE; + + if (!old_categories || !new_categories) +@@ -1558,7 +1558,18 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C evo_labels = g_ptr_array_new_full (5, g_free); @@ -23,10 +32,19 @@ index 44a20d6..90d5729 100644 for (ii = 0; strv && strv[ii]; ii++) { diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c -index 3db3564..a233d4d 100644 +index 7374c36..7da2023 100644 --- a/src/Microsoft365/camel/camel-m365-store.c +++ b/src/Microsoft365/camel/camel-m365-store.c -@@ -309,7 +309,18 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca +@@ -305,7 +305,7 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca + gboolean changed = FALSE; + + /* cannot save, when evolution is not installed */ +- if (!e_ews_common_utils_gsettings_schema_exists ("org.gnome.evolution.mail")) ++ if (!TRUE) + return FALSE; + + if (!old_categories || !new_categories) +@@ -313,7 +313,18 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca evo_labels = g_ptr_array_new_full (5, g_free); @@ -47,51 +65,58 @@ index 3db3564..a233d4d 100644 for (ii = 0; strv && strv[ii]; ii++) { diff --git a/src/Microsoft365/common/e-m365-tz-utils.c b/src/Microsoft365/common/e-m365-tz-utils.c -index 7a1d7f4..3c0d5e1 100644 +index cec5417..2e744a0 100644 --- a/src/Microsoft365/common/e-m365-tz-utils.c +++ b/src/Microsoft365/common/e-m365-tz-utils.c -@@ -192,7 +192,18 @@ e_m365_tz_utils_get_user_timezone (void) - gchar *location; +@@ -192,10 +192,21 @@ e_m365_tz_utils_get_user_timezone (void) + gchar *location = NULL; ICalTimezone *zone = NULL; -- settings = g_settings_new ("org.gnome.evolution.calendar"); -+ { -+ g_autoptr(GSettingsSchemaSource) schema_source; -+ g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@evo@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution.calendar", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ } +- if (e_ews_common_utils_gsettings_schema_exists ("org.gnome.evolution.calendar")) { ++ if (TRUE) { + GSettings *settings; - if (g_settings_get_boolean (settings, "use-system-timezone")) - location = e_cal_util_get_system_timezone_location (); +- settings = g_settings_new ("org.gnome.evolution.calendar"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@evo@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.calendar", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + + if (g_settings_get_boolean (settings, "use-system-timezone")) + location = e_cal_util_get_system_timezone_location (); diff --git a/src/common/e-ews-common-utils.c b/src/common/e-ews-common-utils.c -index 5017d40..34547e3 100644 +index 3458c10..7d21784 100644 --- a/src/common/e-ews-common-utils.c +++ b/src/common/e-ews-common-utils.c -@@ -218,7 +218,19 @@ e_ews_common_utils_get_configured_icaltimezone (void) - if (schema) { - GSettings *settings; +@@ -208,10 +208,21 @@ e_ews_common_utils_get_configured_icaltimezone (void) + ICalTimezone *zone = NULL; + gchar *location = NULL; -- settings = g_settings_new ("org.gnome.evolution.calendar"); -+ { -+ g_autoptr(GSettingsSchemaSource) schema_source; -+ g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@evo@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution.calendar", -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, -+ NULL); -+ } +- if (e_ews_common_utils_gsettings_schema_exists ("org.gnome.evolution.calendar")) { ++ if (TRUE) { + GSettings *settings; - if (g_settings_get_boolean (settings, "use-system-timezone")) - location = e_cal_util_get_system_timezone_location (); +- settings = g_settings_new ("org.gnome.evolution.calendar"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@evo@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.calendar", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + + if (g_settings_get_boolean (settings, "use-system-timezone")) + location = e_cal_util_get_system_timezone_location (); diff --git a/pkgs/by-name/ev/evolution-ews/package.nix b/pkgs/by-name/ev/evolution-ews/package.nix index 4298118ad7c0..9b4a5d7d3e3c 100644 --- a/pkgs/by-name/ev/evolution-ews/package.nix +++ b/pkgs/by-name/ev/evolution-ews/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.54.3.0"; + version = "3.56.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-GscHzyWRqERRJXViGkkwx2GyF028XsscihhSYpRqFPY="; + hash = "sha256-DgC2qxV9j+r7T1HXchusP2IfI4f1WrS7PEPRN0KFrWs="; }; patches = [ @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { "org.gnome.evolution.mail" = "evo"; "org.gnome.evolution.calendar" = "evo"; }; + schemaExistsFunction = "e_ews_common_utils_gsettings_schema_exists"; }; updateScript = diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 2d82636a07ce..cb029071463d 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "eww"; - version = "0.6.0-unstable-2025-03-25"; + version = "0.6.0-unstable-2025-05-13"; src = fetchFromGitHub { owner = "elkowar"; repo = "eww"; - rev = "a9aa0f96892f20e4741e94f4cd46ca31106e492c"; - hash = "sha256-T9OZ8jke2T73Zeqt8VekH82ar23AV7llA7ta8b7HP2o="; + rev = "15315a05ece87aa36fd6b0ff54f6484823e40cda"; + hash = "sha256-0AEYrizfnhhFmxADBEjnXL4VHvzdTvpmZ0Gjk2IQr9g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tjhF4D5WFw6qBUXRWcWjaB57zyXeWBDULsOcr2MJJgA="; + cargoHash = "sha256-GjYeto/As8fM0xqTHfyKQ5YWAciBW9tvXM9ra3V86Eo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ex/exabgp/package.nix b/pkgs/by-name/ex/exabgp/package.nix index a604c08427c2..2bd1a8c59fff 100644 --- a/pkgs/by-name/ex/exabgp/package.nix +++ b/pkgs/by-name/ex/exabgp/package.nix @@ -41,6 +41,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/Exa-Networks/exabgp"; changelog = "https://github.com/Exa-Networks/exabgp/blob/${src.tag}/CHANGELOG.rst"; license = licenses.bsd3; + mainProgram = "exabgp"; maintainers = with maintainers; [ hexa raitobezarius diff --git a/pkgs/by-name/ex/exactaudiocopy/package.nix b/pkgs/by-name/ex/exactaudiocopy/package.nix index b173675d9672..f4740b86bf12 100644 --- a/pkgs/by-name/ex/exactaudiocopy/package.nix +++ b/pkgs/by-name/ex/exactaudiocopy/package.nix @@ -13,16 +13,16 @@ let pname = "exact-audio-copy"; - version = "1.6.0"; + version = "1.8.0"; eac_exe = fetchurl { url = "http://www.exactaudiocopy.de/eac-${lib.versions.majorMinor version}.exe"; - sha256 = "8291d33104ebab2619ba8d85744083e241330a286f5bd7d54c7b0eb08f2b84c1"; + sha256 = "205530cfbfdff82343858f38b0e709e586051fb8900ecd513d7992a3c1ef031b"; }; - cygwin_dll = fetchurl { - url = "https://cygwin.com/snapshots/x86/cygwin1-20220301.dll.xz"; - sha256 = "0zxn0r5q69fhciy0mrplhxj1hxwy3sq4k1wdy6n6kyassm4zyz1x"; + cygwin = fetchurl { + url = "https://mirrors.kernel.org/sourceware/cygwin/x86_64/release/cygwin/cygwin-3.6.1-1-x86_64.tar.xz"; + sha256 = "45d1c76a15426209c20a8d4df813e94fbd17bd5d85ad4d742515ff432400143e"; }; patched_eac = stdenv.mkDerivation { @@ -40,9 +40,11 @@ let cd $_tmp 7z x -aoa ${eac_exe} chmod -R 755 . - cp ${cygwin_dll} cygwin1.dll.xz - xz --decompress cygwin1.dll.xz - mv cygwin1.dll CDRDAO/ + cp ${cygwin} cygwin1.tar.xz + tar xf cygwin1.tar.xz + mv usr/bin/cygwin1.dll CDRDAO/ + rm -rf usr + rm cygwin1.tar.xz cp -r * $out 7z x EAC.exe convert .rsrc/1033/ICON/29.ico -thumbnail 128x128 -alpha on -background none -flatten "$out/eac.ico.128.png" diff --git a/pkgs/by-name/ex/exaile/package.nix b/pkgs/by-name/ex/exaile/package.nix index 8668a70dbed3..2c6178c8fc0c 100644 --- a/pkgs/by-name/ex/exaile/package.nix +++ b/pkgs/by-name/ex/exaile/package.nix @@ -16,7 +16,7 @@ librsvg, streamripper, udisks, - webkitgtk_4_0, + webkitgtk_4_1, iconTheme ? adwaita-icon-theme, deviceDetectionSupport ? true, documentationSupport ? true, @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ++ lib.optional multimediaKeySupport keybinder3 ++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs ++ lib.optional podcastSupport python3.pkgs.feedparser - ++ lib.optional wikipediaSupport webkitgtk_4_0; + ++ lib.optional wikipediaSupport webkitgtk_4_1; nativeCheckInputs = with python3.pkgs; [ pytest diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix index 35483310bff3..29cee31c54b2 100644 --- a/pkgs/by-name/ex/example-robot-data/package.nix +++ b/pkgs/by-name/ex/example-robot-data/package.nix @@ -3,6 +3,7 @@ doxygen, fetchFromGitHub, lib, + jrl-cmakemodules, pkg-config, pythonSupport ? false, python3Packages, @@ -16,9 +17,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Gepetto"; repo = "example-robot-data"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-702+hR8YzxfHBZYF2Q//4gRF/cx4kdQ1oNHtnYL5xp0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-i5YU5lcbB3gm8/YrRRiE2NDcLEq7+eF7GtIrJ1DF1cU="; }; outputs = [ @@ -39,7 +39,9 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.pythonImportsCheckHook ]; - propagatedBuildInputs = lib.optionals pythonSupport [ python3Packages.pinocchio ]; + propagatedBuildInputs = [ + jrl-cmakemodules + ] ++ lib.optionals pythonSupport [ python3Packages.pinocchio ]; cmakeFlags = [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) ]; diff --git a/pkgs/by-name/ex/exatorrent/package.nix b/pkgs/by-name/ex/exatorrent/package.nix new file mode 100644 index 000000000000..d02f363d5c4d --- /dev/null +++ b/pkgs/by-name/ex/exatorrent/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + fetchNpmDeps, + npmHooks, + nodejs, + withUI ? true, +}: + +buildGoModule (finalAttrs: { + pname = "exatorrent"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "varbhat"; + repo = "exatorrent"; + tag = "v${finalAttrs.version}"; + hash = "sha256-FvL3ekpj1HwARgY3vj0xAwCgDBa97OqtFFY4rSBKr50="; + }; + + nativeBuildInputs = lib.optionals withUI [ + npmHooks.npmConfigHook + nodejs + ]; + + npmRoot = "internal/web"; + + npmDeps = + if withUI then + fetchNpmDeps { + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; + hash = "sha256-eNrBKTW4KlLNf/Y9NTvGt5r28MG7SLGzUi+p9mOyrmI="; + } + else + null; + + preBuild = lib.optionalString withUI '' + pushd "$npmRoot" + npm run build + popd + ''; + + # I dislike the fact that buildGoModule's fetcher FOD automatically inherits some attrs from the non-FOD part + overrideModAttrs = prev: { + nativeBuildInputs = lib.filter (e: e != npmHooks.npmConfigHook) prev.nativeBuildInputs; + preBuild = ""; + }; + + vendorHash = "sha256-fE+GVQ2HAfElO1UDmDMeu2ca7t5yNs83CXhqgT0t1Js="; + + tags = lib.optionals (!withUI) [ "noui" ]; + + ldflags = + [ + "-s" + "-w" + ] + ++ lib.optionals stdenv.hostPlatform.isGnu [ + # upstream also tries to compile statically if possible + "-extldflags '-static'" + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isGnu [ + stdenv.cc.libc.static + ]; + + meta = { + changelog = "https://github.com/varbhat/exatorrent/releases/tag/${finalAttrs.src.tag}"; + description = "Self-hostable, easy-to-use, lightweight, and feature-rich torrent client written in Go"; + homepage = "https://github.com/varbhat/exatorrent/"; + license = lib.licenses.gpl3Only; + mainProgram = "exatorrent"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +}) diff --git a/pkgs/by-name/ex/excalidraw_export/bump-nan.patch b/pkgs/by-name/ex/excalidraw_export/bump-nan.patch new file mode 100644 index 000000000000..db257d139d8c --- /dev/null +++ b/pkgs/by-name/ex/excalidraw_export/bump-nan.patch @@ -0,0 +1,18 @@ +diff --git a/package-lock.json b/package-lock.json +index 89dd54f..2f364e4 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -805,9 +805,10 @@ + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/nan": { +- "version": "2.18.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", +- "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==" ++ "version": "2.22.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", ++ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", ++ "license": "MIT" + }, + "node_modules/node-fetch": { + "version": "2.7.0", diff --git a/pkgs/by-name/ex/excalidraw_export/package.nix b/pkgs/by-name/ex/excalidraw_export/package.nix index f0180e09e907..1f118e677a6b 100644 --- a/pkgs/by-name/ex/excalidraw_export/package.nix +++ b/pkgs/by-name/ex/excalidraw_export/package.nix @@ -5,7 +5,6 @@ cairo, pango, pkg-config, - stdenv, }: buildNpmPackage { @@ -19,7 +18,13 @@ buildNpmPackage { hash = "sha256-E5kYI8+hzObd2WNVBd0aQDKMH1Sns539loCQfClJs1Q="; }; - npmDepsHash = "sha256-5yec7BCi1c/e+y00TqxIeoazs49+WdKdfsskAqnVkFs="; + patches = [ + # for compatibility with nodejs_22 + # generated by running: `npm update nan` + ./bump-nan.patch + ]; + + npmDepsHash = "sha256-bU+q83Pmw6+mCF5rTR0DyYstUYVN+YxH9T9H7ZA15so="; npmBuildScript = "compile"; @@ -35,6 +40,5 @@ buildNpmPackage { license = lib.licenses.mit; maintainers = with lib.maintainers; [ venikx ]; mainProgram = "excalidraw_export"; - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 66dd61875dc9..30c19cb1ab85 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -6,12 +6,12 @@ }: python3Packages.buildPythonApplication rec { pname = "exegol"; - version = "4.3.10"; + version = "4.3.11"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BtOW7EBbFil7yyhL6uayTUUkDldI8+xxolfQZtX+00c="; + hash = "sha256-+LnZSFRW7EvG+cPwMStgO6qD4AjOGkLzCarXBrW3Aak="; }; build-system = with python3Packages; [ pdm-backend ]; diff --git a/pkgs/by-name/ex/exempi/package.nix b/pkgs/by-name/ex/exempi/package.nix index 26b57d89e758..e8131c0d8b57 100644 --- a/pkgs/by-name/ex/exempi/package.nix +++ b/pkgs/by-name/ex/exempi/package.nix @@ -6,7 +6,6 @@ zlib, boost, libiconv, - darwin, }: stdenv.mkDerivation rec { @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.CoreServices ]; doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit; diff --git a/pkgs/by-name/ex/exercise-timer/package.nix b/pkgs/by-name/ex/exercise-timer/package.nix new file mode 100644 index 000000000000..e13af3153f58 --- /dev/null +++ b/pkgs/by-name/ex/exercise-timer/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + alsa-lib, + appstream-glib, + cargo, + desktop-file-utils, + fetchFromGitHub, + glib, + gtk4, + libadwaita, + meson, + ninja, + nix-update-script, + pkg-config, + rustPlatform, + rustc, + wrapGAppsHook4, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "exercise-timer"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "mfep"; + repo = "exercise-timer"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6MBSUYFZ8nMZX7acam8T0uJWb9E2/L9vnKzJq14p4BY="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-fmY89VGv9tSMaILFnAVTAyp9PWGsvSCZ/9DfF5LI3xM="; + }; + + nativeBuildInputs = [ + appstream-glib + cargo + desktop-file-utils + glib + gtk4 + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + alsa-lib + libadwaita + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Timer app for high intensity interval training"; + homepage = "https://apps.gnome.org/Hiit/"; + changelog = "https://github.com/mfep/exercise-timer/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + teams = [ lib.teams.gnome-circle ]; + mainProgram = "hiit"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ex/exfatprogs/package.nix b/pkgs/by-name/ex/exfatprogs/package.nix index c0c14768eeac..28f0f8e44c7a 100644 --- a/pkgs/by-name/ex/exfatprogs/package.nix +++ b/pkgs/by-name/ex/exfatprogs/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "exfatprogs"; - version = "1.2.8"; + version = "1.2.9"; src = fetchFromGitHub { owner = "exfatprogs"; repo = "exfatprogs"; rev = version; - sha256 = "sha256-lPPUjSc6ti/CqSChWrsBLWCtASN95Cnj+O6FbVvFeDA="; + sha256 = "sha256-EENBlf5beuLJ++N7YThxzz2I/FXzb02by3KOUPOuEV4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix index 5bfb1b2b1ae8..5d850645b82c 100644 --- a/pkgs/by-name/ex/exim/package.nix +++ b/pkgs/by-name/ex/exim/package.nix @@ -201,7 +201,8 @@ stdenv.mkDerivation rec { ]; mainProgram = "exim"; platforms = platforms.linux; - maintainers = with maintainers; [ tv ] ++ teams.helsinki-systems.members; + maintainers = with maintainers; [ tv ]; + teams = [ teams.helsinki-systems ]; changelog = "https://github.com/Exim/exim/blob/exim-${version}/doc/doc-txt/ChangeLog"; }; } diff --git a/pkgs/by-name/ex/exoscale-cli/package.nix b/pkgs/by-name/ex/exoscale-cli/package.nix index f5370d1d1ab9..a9bf6efbec02 100644 --- a/pkgs/by-name/ex/exoscale-cli/package.nix +++ b/pkgs/by-name/ex/exoscale-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.84.0"; + version = "1.84.1"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-PO6LIp5eortBEygdIRf2LpPJalSEMGosW8KtqBV/MlM="; + sha256 = "sha256-Bt/IeZ7w1EAHNKMctugOq5XN2qJEhW26M0KE74baGJc="; }; vendorHash = null; diff --git a/pkgs/by-name/ex/expat/package.nix b/pkgs/by-name/ex/expat/package.nix index c58856b24772..e8ead2467c64 100644 --- a/pkgs/by-name/ex/expat/package.nix +++ b/pkgs/by-name/ex/expat/package.nix @@ -18,7 +18,7 @@ # files. let - version = "2.6.4"; + version = "2.7.1"; tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}"; in stdenv.mkDerivation (finalAttrs: { @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz"; - hash = "sha256-ppVina4EcFWzfVCg/0d20dRdCkyELPTM7hWEQfVf9+4="; + hash = "sha256-NUVSVEuPmQEuUGL31XDsd/FLQSo/9cfY0NrmLA0hfDA="; }; strictDeps = true; diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 3df2bacc3604..aaf64e7aeb61 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-03-30"; + version = "2025-05-19"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-79CcXrGxFNc51LctL1OiUiYIJyGUkqB+NmGiUoxTbpU="; + hash = "sha256-Tk2iPWiybUlsmiHbjJTNEMkCuXVeam49PiWrl4mVzhY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ex/exportarr/package.nix b/pkgs/by-name/ex/exportarr/package.nix index 329fa3b7aa90..3f02b4ae9451 100644 --- a/pkgs/by-name/ex/exportarr/package.nix +++ b/pkgs/by-name/ex/exportarr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "exportarr"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "onedr0p"; repo = "exportarr"; rev = "v${version}"; - hash = "sha256-iNcdD2zigBZ2phtCkHRV0GZPrEjopV0K+vin1Zkb3Oo="; + hash = "sha256-8EHFnqQ3h9/X2lR+9UuuJeSPMonuVQVDYiMDoroDajs="; }; - vendorHash = "sha256-F5WOSsjeOzMaj4Yze11OnqpgL1l87wpgl3OQEGya//M="; + vendorHash = "sha256-yzzhlhrfzj+qlG4wY+qGM0/sTUUlVQAgwiKNUEIVN0g="; subPackages = [ "cmd/exportarr" ]; diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix index e39d8754bdfc..ee5916854ad6 100644 --- a/pkgs/by-name/ex/expr/package.nix +++ b/pkgs/by-name/ex/expr/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "expr"; - version = "1.17.2"; + version = "1.17.3"; src = fetchFromGitHub { owner = "expr-lang"; repo = "expr"; rev = "v${version}"; - hash = "sha256-teP/14czczNiz0kxoLNmZQg/AvcDuB8K4jdQpJf5JLQ="; + hash = "sha256-oi5dMTuirAnUFOC8zBlu7YErp13DZPoSGNpueKXdNtE="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-DamIlXTuuPifGgpbVXn7OPI97ppqlwiCtcZAnQ00YD0="; + vendorHash = "sha256-tSerrcRS7Nl0rZQqGfUKgdHsGBXEAFFF+Cn7HqFyfqA="; ldflags = [ "-s" diff --git a/pkgs/by-name/ex/exult/package.nix b/pkgs/by-name/ex/exult/package.nix new file mode 100644 index 000000000000..10fba6cb9406 --- /dev/null +++ b/pkgs/by-name/ex/exult/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + SDL2, + autoconf, + autoconf-archive, + autoreconfHook, + automake, + libogg, + libtool, + libvorbis, + libX11, + pkg-config, + zlib, + enableTools ? false, +}: + +stdenv.mkDerivation rec { + pname = "exult"; + version = "1.10.1"; + + src = fetchFromGitHub { + owner = "exult"; + repo = "exult"; + rev = "v${version}"; + hash = "sha256-NlvtYtmJNYhOC1BtIxIij3NEQHWAGOeD4XgRq7evjzE="; + }; + + # We can't use just DESTDIR because with it we'll have /nix/store/...-exult-1.10.1/nix/store/...-exult-1.10.1/bin + postPatch = '' + substituteInPlace macosx/macosx.am \ + --replace-fail DESTDIR NIX_DESTDIR + ''; + + nativeBuildInputs = [ + autoconf + autoconf-archive + autoreconfHook + automake + libtool + pkg-config + ]; + + buildInputs = [ + SDL2 + libogg + libvorbis + libX11 + zlib + ]; + + enableParallelBuilding = true; + + makeFlags = [ "NIX_DESTDIR=$(out)" ]; # see postPatch + configureFlags = lib.optional (!enableTools) "--disable-tools"; + + meta = with lib; { + description = "Exult is a project to recreate Ultima VII for modern operating systems"; + longDescription = '' + Ultima VII, an RPG from the early 1990's, still has a huge following. But, + being a DOS game with a very nonstandard memory manager, it is difficult + to run it on the latest computers. Exult is a project that created an + Ultima VII game engine that runs on modern operating systems, capable of + using the data and graphics files that come with the game. Exult aims to + let those people who own Ultima VII play the game on modern hardware, in + as close to (or perhaps even surpassing) its original splendor as is + possible. + ''; + homepage = "http://exult.info"; + license = licenses.gpl2Plus; + maintainers = [ ]; + mainProgram = "exult"; + }; +} diff --git a/pkgs/by-name/ey/eyedropper/package.nix b/pkgs/by-name/ey/eyedropper/package.nix index 65c800acdf51..9a8f9fa49e8c 100644 --- a/pkgs/by-name/ey/eyedropper/package.nix +++ b/pkgs/by-name/ey/eyedropper/package.nix @@ -18,21 +18,20 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eyedropper"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "FineFindus"; repo = "eyedropper"; - rev = "v${version}"; - hash = "sha256-FyGj0180Wn8iIDTdDqnNEvFYegwdWCsCq+hmyTTUIo4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-t/OFA4oDXtnMmyFptG7zsGW5ubaSNrSnaDR1l9nVbLQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-nYmH7Nu43TDJKvwfSaBKSihD0acLPmIUQpQM6kV4CAk="; + inherit (finalAttrs) pname src version; + hash = "sha256-39BWpyGhX6fYzxwrodiK1A3ASuRiI7tOA+pSKu8Bx5Q="; }; nativeBuildInputs = [ @@ -61,9 +60,11 @@ stdenv.mkDerivation rec { meta = { description = "Pick and format colors"; homepage = "https://github.com/FineFindus/eyedropper"; + changelog = "https://github.com/FineFindus/eyedropper/releases/tag/v${finalAttrs.version}"; mainProgram = "eyedropper"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ zendo ] ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ zendo ]; + teams = [ lib.teams.gnome-circle ]; }; -} +}) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index e94704b0e3ea..ef41d71f4472 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -13,19 +13,19 @@ exaAlias ? true, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "eza"; - version = "0.21.0"; + version = "0.21.3"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; - rev = "v${version}"; - hash = "sha256-edBFMqY+61kFumLTcVFgnmhE4d+bMVz+udR5h02kDk0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-6SGGeZVQe3uuyEt6TJn5cBqnI/BdDGRiPHugKrgQNhs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VqwgsYyoZM+88IkMJxDtIi5WtPDRg0Izk7WenTNuLAI="; + cargoHash = "sha256-QCy9lLOSB+64DPTc/SVSCrD2nfJswGcR2P9AdN6CqZw="; nativeBuildInputs = [ cmake @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' for page in eza.1 eza_colors.5 eza_colors-explanation.5; do - sed "s/\$version/v${version}/g" "man/$page.md" | + sed "s/\$version/v${finalAttrs.version}/g" "man/$page.md" | pandoc --standalone -f markdown -t man >"man/$page" done installManPage man/eza.1 man/eza_colors.5 man/eza_colors-explanation.5 @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { ln -s eza $out/bin/exa ''; - meta = with lib; { + meta = { description = "Modern, maintained replacement for ls"; longDescription = '' eza is a modern replacement for ls. It uses colours for information by @@ -70,14 +70,14 @@ rustPlatform.buildRustPackage rec { written in Rust, so it’s small, fast, and portable. ''; homepage = "https://github.com/eza-community/eza"; - changelog = "https://github.com/eza-community/eza/releases/tag/v${version}"; - license = licenses.eupl12; + changelog = "https://github.com/eza-community/eza/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.eupl12; mainProgram = "eza"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ cafkafk _9glenda sigmasquadron ]; - platforms = platforms.unix ++ platforms.windows; + platforms = with lib.platforms; unix ++ windows; }; -} +}) diff --git a/pkgs/by-name/ez/ezno/package.nix b/pkgs/by-name/ez/ezno/package.nix index 9c04adecdb0a..7cf45f25c4b1 100644 --- a/pkgs/by-name/ez/ezno/package.nix +++ b/pkgs/by-name/ez/ezno/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-v4lgHx+sR58CshZJCUYrtaW4EDFBUKFPJJ6V+eyf5Bc="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - cargoBuildFlags = [ "--bin" "ezno" diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix index 8e09f58bf632..e45036f33570 100644 --- a/pkgs/by-name/ez/ezquake/package.nix +++ b/pkgs/by-name/ez/ezquake/package.nix @@ -9,6 +9,7 @@ libjpeg, libGLU, libGL, + libX11, libsndfile, libXxf86vm, pcre, @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { libGLU libGL libsndfile + libX11 libXxf86vm pcre SDL2 diff --git a/pkgs/by-name/ez/eztrace/0001-otf2-backend-cross.patch b/pkgs/by-name/ez/eztrace/0001-otf2-backend-cross.patch new file mode 100644 index 000000000000..4b4dfc058204 --- /dev/null +++ b/pkgs/by-name/ez/eztrace/0001-otf2-backend-cross.patch @@ -0,0 +1,27 @@ +diff --git a/cmake_modules/FindOTF2.cmake b/cmake_modules/FindOTF2.cmake +index 2853f92a..af1f3225 100644 +--- a/cmake_modules/FindOTF2.cmake ++++ b/cmake_modules/FindOTF2.cmake +@@ -15,11 +15,11 @@ IF(NOT OTF2_CONFIG OR NOT EXISTS ${OTF2_CONFIG}) + ELSE() + message(STATUS "OTF2 installation found. (using ${OTF2_CONFIG})") + +- execute_process(COMMAND ${OTF2_CONFIG} "--cppflags" OUTPUT_VARIABLE OTF2_INCLUDE_PATH) ++ execute_process(COMMAND ${OTF2_CONFIG} "--cppflags" "--target" "backend" OUTPUT_VARIABLE OTF2_INCLUDE_PATH) + STRING(REPLACE "\n" "" OTF2_INCLUDE_PATH ${OTF2_INCLUDE_PATH}) + STRING(REPLACE "-I" "" OTF2_INCLUDE_PATH ${OTF2_INCLUDE_PATH}) + +- execute_process(COMMAND ${OTF2_CONFIG} "--ldflags" OUTPUT_VARIABLE _LINK_LD_ARGS) ++ execute_process(COMMAND ${OTF2_CONFIG} "--ldflags" "--target" "backend" OUTPUT_VARIABLE _LINK_LD_ARGS) + STRING( REPLACE " " ";" _LINK_LD_ARGS ${_LINK_LD_ARGS} ) + FOREACH( _ARG ${_LINK_LD_ARGS} ) + IF(${_ARG} MATCHES "^-L") +@@ -29,7 +29,7 @@ ELSE() + ENDIF(${_ARG} MATCHES "^-L") + ENDFOREACH(_ARG) + +- execute_process(COMMAND ${OTF2_CONFIG} "--libs" OUTPUT_VARIABLE _LINK_LD_ARGS) ++ execute_process(COMMAND ${OTF2_CONFIG} "--libs" "--target" "backend" OUTPUT_VARIABLE _LINK_LD_ARGS) + STRING( REPLACE " " ";" _LINK_LD_ARGS ${_LINK_LD_ARGS} ) + FOREACH( _ARG ${_LINK_LD_ARGS} ) + IF(${_ARG} MATCHES "^-l") diff --git a/pkgs/by-name/ez/eztrace/0002-absolute-cmake-install-paths.patch b/pkgs/by-name/ez/eztrace/0002-absolute-cmake-install-paths.patch new file mode 100644 index 000000000000..67e3ec25b71b --- /dev/null +++ b/pkgs/by-name/ez/eztrace/0002-absolute-cmake-install-paths.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b36a8a94..74c6de2e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -195,8 +195,16 @@ set(EZTRACE_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR}) + #set(__PPTRACE_BINARY_TYPE "PPTRACE_BINARY_TYPE_BFD") + #set(abs_top_builddir ${CMAKE_BINARY_DIR}) + +-set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") +-set(INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") ++if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") ++else() ++ set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") ++endif() ++if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) ++ set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}") ++else() ++ set(INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") ++endif() + set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + + # Subdirectory diff --git a/pkgs/by-name/ez/eztrace/package.nix b/pkgs/by-name/ez/eztrace/package.nix index 8a5b3dbeb91c..6c5a82dde4a1 100644 --- a/pkgs/by-name/ez/eztrace/package.nix +++ b/pkgs/by-name/ez/eztrace/package.nix @@ -2,43 +2,102 @@ lib, stdenv, fetchFromGitLab, + cmake, gfortran, libelf, libiberty, - zlib, - # Once https://gitlab.com/eztrace/eztrace/-/issues/41 - # is released we can switch to latest binutils. - libbfd_2_38, - libopcodes_2_38, - autoreconfHook, + libbfd, + libopcodes, + otf2, + ctestCheckHook, + versionCheckHook, }: -stdenv.mkDerivation rec { - pname = "EZTrace"; - version = "1.1-11"; +stdenv.mkDerivation (finalAttrs: { + pname = "eztrace"; + version = "2.1.1"; + + outputs = [ + "out" + "dev" + "lib" + "man" + ]; src = fetchFromGitLab { owner = "eztrace"; repo = "eztrace"; - rev = "eztrace-${version}"; - hash = "sha256-A6HMr4ib5Ka1lTbbTQOdq3kIdCoN/CwAKRdXdv9wpfU="; + tag = "${finalAttrs.version}"; + hash = "sha256-ccW4YjEf++tkdIJLze2x8B/SWbBBXnYt8UV9OH8+KGU="; }; - nativeBuildInputs = [ - gfortran - autoreconfHook + # Possibly upstream these patches. + patches = [ + ./0001-otf2-backend-cross.patch # To fix cross. + ./0002-absolute-cmake-install-paths.patch # To fix generated .pc file ]; + + postPatch = '' + substituteInPlace src/eztrace-lib/eztrace_otf2.c \ + --replace-fail "/bin/rm" "rm" + substituteInPlace cmake_modules/FindOTF2.cmake \ + --replace-fail "find_program(OTF2_CONFIG otf2-config REQUIRED)" \ + "find_program(OTF2_CONFIG "${lib.getExe' otf2 "otf2-config"}" REQUIRED)" \ + --replace-fail "find_program(OTF2_PRINT otf2-print REQUIRED)" \ + "find_program(OTF2_PRINT "${lib.getExe' otf2 "otf2-print"}" REQUIRED)" + # 2.1.1 incorrectly reports 2.1.0. TODO: Remove after next release + substituteInPlace CMakeLists.txt \ + --replace-fail "2.1.0" "${finalAttrs.version}" + patchShebangs test + ''; + + strictDeps = true; + + cmakeFlags = [ + (lib.cmakeBool "EZTRACE_ENABLE_MEMORY" true) + ]; + + nativeBuildInputs = [ + cmake + gfortran + ]; + buildInputs = [ libelf libiberty - zlib - libbfd_2_38 - libopcodes_2_38 + libbfd + libopcodes + otf2 ]; - meta = with lib; { + doCheck = true; + disabledTests = [ + # This test is somewhat flaky and fails once per several rebuilds. + "memory_tests" + ]; + nativeCheckInputs = [ + otf2 # `otf2-print` needed by compiler_instrumentation_tests,pthread_tests,posixio_tests + ctestCheckHook + ]; + + postInstall = '' + moveToOutput bin/eztrace_create_plugin "$dev" + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { description = "Tool that aims at generating automatically execution trace from HPC programs"; - license = licenses.cecill-b; - maintainers = [ ]; + homepage = "https://eztrace.gitlab.io/eztrace/index.html"; + downloadPage = "https://gitlab.com/eztrace/eztrace/"; + license = lib.licenses.cecill-b; + maintainers = [ lib.maintainers.xokdvium ]; + mainProgram = "eztrace"; + badPlatforms = [ + # Undefined symbols for architecture x86_64: + # > "___cyg_profile_func_enter", referenced from: + lib.systems.inspect.patterns.isDarwin + ]; }; -} +}) diff --git a/pkgs/by-name/f2/f2/package.nix b/pkgs/by-name/f2/f2/package.nix index 8980fa1f554e..52942fe78fd3 100644 --- a/pkgs/by-name/f2/f2/package.nix +++ b/pkgs/by-name/f2/f2/package.nix @@ -2,35 +2,41 @@ lib, fetchFromGitHub, buildGoModule, + exiftool, + nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "f2"; - version = "2.0.3"; + version = "2.1.1"; src = fetchFromGitHub { owner = "ayoisaiah"; repo = "f2"; - rev = "v${version}"; - sha256 = "sha256-AjuWaSEP2X3URZBPD05laV32ms/pULooSQKXUz8sqsU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-hl4giLTQtqJiPseiTzWPtksEYlyQpE1UOC7JMUF9v4Y="; }; - vendorHash = "sha256-xKw9shfAtRjD0f4BGALM5VPjGOaYz1IqXWcctHcV/p8="; + vendorHash = "sha256-xeylGT32bGMJjGdpQQH8DBpqxtvMxpqSEsLPbeoUzl4="; ldflags = [ "-s" "-w" - "-X=main.Version=${version}" + "-X=github.com/ayoisaiah/f2/v2/app.VersionString=${finalAttrs.version}" ]; - # has no tests - doCheck = false; + nativeCheckInputs = [ exiftool ]; + + passthru.updateScript = nix-update-script { }; meta = { description = "Command-line batch renaming tool"; homepage = "https://github.com/ayoisaiah/f2"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ zendo ]; + maintainers = with lib.maintainers; [ + prince213 + zendo + ]; mainProgram = "f2"; }; -} +}) diff --git a/pkgs/by-name/f3/f3/package.nix b/pkgs/by-name/f3/f3/package.nix index fec3b3ab6319..5526cedf27e6 100644 --- a/pkgs/by-name/f3/f3/package.nix +++ b/pkgs/by-name/f3/f3/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "f3"; - version = "8.0"; + version = "9.0"; src = fetchFromGitHub { owner = "AltraMayor"; repo = "f3"; rev = "v${version}"; - sha256 = "17l5vspfcgfbkqg7bakp3gql29yb05gzawm8n3im30ilzdr53678"; + sha256 = "sha256-ZajlFGXJcYUVe/wUFfdPYVW8stOo1Aqe8uD2Bm9KIk0="; }; postPatch = '' diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix new file mode 100644 index 000000000000..9ca7fcb6e3ae --- /dev/null +++ b/pkgs/by-name/f3/f3d/package.nix @@ -0,0 +1,101 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + help2man, + gzip, + # There is a f3d overridden with EGL enabled vtk in top-level/all-packages.nix + # compiling with EGL enabled vtk will result in f3d running in headless mode + # See https://github.com/NixOS/nixpkgs/pull/324022. This may change later. + vtk_9, + autoPatchelfHook, + python3Packages, + opencascade-occt, + assimp, + fontconfig, + withManual ? !stdenv.hostPlatform.isDarwin, + withPythonBinding ? false, +}: + +stdenv.mkDerivation rec { + pname = "f3d"; + version = "3.1.0"; + + outputs = [ "out" ] ++ lib.optionals withManual [ "man" ]; + + src = fetchFromGitHub { + owner = "f3d-app"; + repo = "f3d"; + tag = "v${version}"; + hash = "sha256-QJQlZXUZyWhpYteHoIsGOj1jdf3Lpy/BMXopeto4IRo="; + }; + + patches = [ + # https://github.com/f3d-app/f3d/pull/2155 + (fetchpatch { + name = "add-missing-include.patch"; + url = "https://github.com/f3d-app/f3d/commit/3814f3356d888ce59bbe6eda0293c2de73b0c89a.patch"; + hash = "sha256-TeV8byIxX6PBEW06/sS7kHaSS99S88WiyzjHZ/Zh5x4="; + }) + ]; + + nativeBuildInputs = + [ + cmake + ] + ++ lib.optionals withManual [ + # manpage + help2man + gzip + ] + ++ lib.optionals stdenv.hostPlatform.isElf [ + # https://github.com/f3d-app/f3d/pull/1217 + autoPatchelfHook + ]; + + buildInputs = + [ + vtk_9 + opencascade-occt + assimp + fontconfig + ] + ++ lib.optionals withPythonBinding [ + python3Packages.python + # Using C++ header files, not Python import + python3Packages.pybind11 + ]; + + cmakeFlags = + [ + # conflict between VTK and Nixpkgs; + # see https://github.com/NixOS/nixpkgs/issues/89167 + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_BINDIR=bin" + "-DF3D_MODULE_EXTERNAL_RENDERING=ON" + "-DF3D_PLUGIN_BUILD_ASSIMP=ON" + "-DF3D_PLUGIN_BUILD_OCCT=ON" + ] + ++ lib.optionals withManual [ + "-DF3D_LINUX_GENERATE_MAN=ON" + ] + ++ lib.optionals withPythonBinding [ + "-DF3D_BINDINGS_PYTHON=ON" + ]; + + meta = with lib; { + description = "Fast and minimalist 3D viewer using VTK"; + homepage = "https://f3d-app.github.io/f3d"; + changelog = "https://github.com/f3d-app/f3d/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ + bcdarwin + pbsds + ]; + platforms = with platforms; unix; + mainProgram = "f3d"; + }; +} diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix index 990fe98ba67c..5032f6afb684 100644 --- a/pkgs/by-name/fa/faas-cli/package.nix +++ b/pkgs/by-name/fa/faas-cli/package.nix @@ -24,13 +24,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.17.1"; + version = "0.17.4"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-pCzYfsL4ZQOyxEpg//Edh+dengXkx6G+OWMNPfIPM+o="; + sha256 = "sha256-GM2gRfrdfUhfBn2atG21H7bNbW1HtgwQ7d7kMXvyMAs="; }; vendorHash = null; diff --git a/pkgs/by-name/fa/fable/package.nix b/pkgs/by-name/fa/fable/package.nix index 31013115cb09..5d7244f21ba4 100644 --- a/pkgs/by-name/fa/fable/package.nix +++ b/pkgs/by-name/fa/fable/package.nix @@ -6,9 +6,9 @@ buildDotnetGlobalTool (finalAttrs: { pname = "fable"; - version = "4.24.0"; + version = "4.25.0"; - nugetHash = "sha256-ERewWqfEyyZKpHFFALpMGJT0fDWywBYY5buU/wTZZTg="; + nugetHash = "sha256-1T6cJKODI5Rm6Ze0f7X/Ecdrrn1NulKSnO3lMW73W0M="; passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 02a3c2b0b8b9..2f2a6ffc4cd6 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -7,16 +7,19 @@ buildGoModule rec { pname = "fabric-ai"; - version = "1.4.122"; + version = "1.4.187"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; - rev = "v${version}"; - hash = "sha256-wFVb2IdYB1T7wozQcjxLE7uVRsIFkPL5rS/8V0LnRcg="; + tag = "v${version}"; + hash = "sha256-5vUtw8ttNB2gjVgASfgWke5tCZGzEiSvk+c4K9555ck="; }; - vendorHash = "sha256-eV+Wb3IL8veO7NF5Y5zLgTW9eHJF6ke/0SrDojHF3X8="; + vendorHash = "sha256-ZrIzCKhEa00KOS8tauYEGLR4o7gGVVZ9pdfEQbAGDkI="; + + # Fabric introduced plugin tests that fail in the nix build sandbox. + doCheck = false; ldflags = [ "-s" diff --git a/pkgs/by-name/fa/fabric-installer/package.nix b/pkgs/by-name/fa/fabric-installer/package.nix index 21fdd3945316..09b9f44f225e 100644 --- a/pkgs/by-name/fa/fabric-installer/package.nix +++ b/pkgs/by-name/fa/fabric-installer/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "fabric-installer"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar"; - sha256 = "sha256-Yu3xcL3MQe3qhdM6zz64VHQlhpmz1B+UGNKGyDbLCI0="; + sha256 = "sha256-OKqCqx74KbeqPyFD/Mk7unBqjhiDW+cx0P3yMdJ0sH8="; }; dontUnpack = true; diff --git a/pkgs/by-name/fa/fac-build/package.nix b/pkgs/by-name/fa/fac-build/package.nix new file mode 100644 index 000000000000..affbe921db9f --- /dev/null +++ b/pkgs/by-name/fa/fac-build/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + rustPlatform, + fetchCrate, + git, +}: + +rustPlatform.buildRustPackage rec { + pname = "fac-build"; + version = "0.5.4"; + + src = fetchCrate { + inherit version; + crateName = "fac"; + hash = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI="; + }; + useFetchCargoVendor = true; + cargoHash = "sha256-+2j6xH1Ww1WOLfbjknUPvCmYLAl4W3Zp/mQTaL0qnv0="; + + # fac includes a unit test called ls_files_works which assumes it's + # running in a git repo. Nix's sandbox runs cargo build outside git, + # so this test won't work. + checkFlags = [ "--skip=ls_files_works" ]; + + # fac calls git at runtime, expecting it to be in the PATH, + # so we need to patch it to call git by absolute path instead. + postPatch = '' + substituteInPlace src/git.rs \ + --replace 'std::process::Command::new("git")' \ + 'std::process::Command::new("${git}/bin/git")' + substituteInPlace tests/lib.rs \ + --replace 'std::process::Command::new("git")' \ + 'std::process::Command::new("${git}/bin/git")' + ''; + + meta = with lib; { + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); + description = '' + A build system that uses ptrace to handle dependencies automatically + ''; + longDescription = '' + Fac is a general-purpose build system inspired by make that utilizes + ptrace to ensure that all dependences are enumerated and that all + source files are added to a (git) repo. An important feature of fac + is that it automatically handles dependencies, rather than either + complaining about them or giving an incorrect build. Currently, fac + only runs on linux systems, but on those systems it is incredibly + easy to use! + ''; + homepage = "https://physics.oregonstate.edu/~roundyd/fac"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ dpercy ]; + mainProgram = "fac"; + }; +} diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 74eb8b077faf..f8f6ea32e40f 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -2,6 +2,17 @@ "x86_64-linux": { "alpha": { "experimental": { + "candidateHashFilenames": [ + "factorio_linux_2.0.45.tar.xz" + ], + "name": "factorio_alpha_x64-2.0.45.tar.xz", + "needsAuth": true, + "sha256": "32b004a648dfc8b8e2bb6b82f648e5be458a13b7fefad79487a1d663c6f3b711", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.45/alpha/linux64", + "version": "2.0.45" + }, + "stable": { "candidateHashFilenames": [ "factorio_linux_2.0.43.tar.xz" ], @@ -11,17 +22,6 @@ "tarDirectory": "x64", "url": "https://factorio.com/get-download/2.0.43/alpha/linux64", "version": "2.0.43" - }, - "stable": { - "candidateHashFilenames": [ - "factorio_linux_2.0.42.tar.xz" - ], - "name": "factorio_alpha_x64-2.0.42.tar.xz", - "needsAuth": true, - "sha256": "c99a4349d4e29e0fd16ecbd710958232d454d3a412ec23b4ff2bd93a31e306ff", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.42/alpha/linux64", - "version": "2.0.42" } }, "demo": { @@ -50,6 +50,17 @@ }, "expansion": { "experimental": { + "candidateHashFilenames": [ + "factorio-space-age_linux_2.0.45.tar.xz" + ], + "name": "factorio_expansion_x64-2.0.45.tar.xz", + "needsAuth": true, + "sha256": "7a81be62a051b80166c9f6c9e94fca2e19a0ac65f19769f99a624772f87cdab4", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.45/expansion/linux64", + "version": "2.0.45" + }, + "stable": { "candidateHashFilenames": [ "factorio-space-age_linux_2.0.43.tar.xz" ], @@ -59,21 +70,22 @@ "tarDirectory": "x64", "url": "https://factorio.com/get-download/2.0.43/expansion/linux64", "version": "2.0.43" - }, - "stable": { - "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.42.tar.xz" - ], - "name": "factorio_expansion_x64-2.0.42.tar.xz", - "needsAuth": true, - "sha256": "41c8c8dacad22f5d94399cd5272a3311e38917937bd1a4d102aac7286afc580e", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.42/expansion/linux64", - "version": "2.0.42" } }, "headless": { "experimental": { + "candidateHashFilenames": [ + "factorio-headless_linux_2.0.45.tar.xz", + "factorio_headless_x64_2.0.45.tar.xz" + ], + "name": "factorio_headless_x64-2.0.45.tar.xz", + "needsAuth": false, + "sha256": "4fd7e04bb3ea7d12da8e1c3befc6b53b3c0064775c960a5a9db6a943f2259fc2", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.45/headless/linux64", + "version": "2.0.45" + }, + "stable": { "candidateHashFilenames": [ "factorio-headless_linux_2.0.43.tar.xz", "factorio_headless_x64_2.0.43.tar.xz" @@ -84,18 +96,6 @@ "tarDirectory": "x64", "url": "https://factorio.com/get-download/2.0.43/headless/linux64", "version": "2.0.43" - }, - "stable": { - "candidateHashFilenames": [ - "factorio-headless_linux_2.0.42.tar.xz", - "factorio_headless_x64_2.0.42.tar.xz" - ], - "name": "factorio_headless_x64-2.0.42.tar.xz", - "needsAuth": false, - "sha256": "b5b8b8bdc915e67dbc1710cd3d6aa6802d397b7c0f47db07da8acf39d5bd6376", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.42/headless/linux64", - "version": "2.0.42" } } } diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index 7a708681c53a..e2e815415ae6 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage rec { pname = "factoriolab"; - version = "3.12.1"; + version = "3.13.4"; src = fetchFromGitHub { owner = "factoriolab"; repo = "factoriolab"; tag = "v${version}"; - hash = "sha256-EhCxeZ1rxdYl3JejUiE+Ss02hm91tmXuyJ/2UgS+ZIw="; + hash = "sha256-Ml0fJPHIjtqeVmlFKKMteZx1c3Jq1BdEWA0vhxGFR70="; }; buildInputs = [ vips ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix index b8217680fd93..6508f3fe4c77 100644 --- a/pkgs/by-name/fa/faircamp/package.nix +++ b/pkgs/by-name/fa/faircamp/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitea, makeWrapper, @@ -10,26 +9,25 @@ vips, ffmpeg, callPackage, - darwin, testers, faircamp, }: rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-InBPQk8dIwsCfvo24/0ggK/tipHaC0owPbZtrrIT/FY="; + hash = "sha256-41mec9AdNdWRJz+5xFU7to/4LxIb7fEgm1EQVMAtyto="; }; useFetchCargoVendor = true; - cargoHash = "sha256-f+RFjBiChLAEk0Azh2wqXmOlDNl3221MYUVVbCisg0c="; + cargoHash = "sha256-xLRoI4MN1DApL4jXBXnMzsqTaOVUn2FZy3o2mTetvJ8="; buildFeatures = [ "libvips" ]; @@ -38,15 +36,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - glib - libopus - vips - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + glib + libopus + vips + ]; postInstall = '' wrapProgram $out/bin/faircamp \ diff --git a/pkgs/by-name/fa/faiss/package.nix b/pkgs/by-name/fa/faiss/package.nix index 5d6dfa5ad4be..940dff5185dc 100644 --- a/pkgs/by-name/fa/faiss/package.nix +++ b/pkgs/by-name/fa/faiss/package.nix @@ -25,7 +25,7 @@ let pname = "faiss"; - version = "1.10.0"; + version = "1.11.0"; inherit (cudaPackages) flags backendStdenv; @@ -50,7 +50,7 @@ stdenv.mkDerivation { owner = "facebookresearch"; repo = "faiss"; tag = "v${version}"; - hash = "sha256-TeoM8fKSZuV+2XnkwSz7dJh4piGU8mP1vQfCbRxJ3/Q="; + hash = "sha256-N8UkL+KS9Da6RtaHI9pY5gAzFtTSMJ9R5h4RSX9b1Ro="; }; nativeBuildInputs = @@ -106,6 +106,7 @@ stdenv.mkDerivation { description = "Library for efficient similarity search and clustering of dense vectors by Facebook Research"; mainProgram = "demo_ivfpq_indexing"; homepage = "https://github.com/facebookresearch/faiss"; + changelog = "https://github.com/facebookresearch/faiss/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ SomeoneSerge ]; diff --git a/pkgs/by-name/fa/faketty/package.nix b/pkgs/by-name/fa/faketty/package.nix index 2aa920deff31..509ac9b29a0d 100644 --- a/pkgs/by-name/fa/faketty/package.nix +++ b/pkgs/by-name/fa/faketty/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.18"; + version = "1.0.19"; src = fetchCrate { inherit pname version; - hash = "sha256-b6rHyg1rHMihmJ1okH11uDvOsqNydfK/c1cAgP6Tvx0="; + hash = "sha256-ntfbwaVZM4wtoDaaFo+Y7RHSft3KZ29DMsNiTvhiaXs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-POxCsGcM2P/fP/yEHuNFDz90H2qbKHgnuMowZS1hn7A="; + cargoHash = "sha256-0pDm/e1xisPLqdTe10kleoejQfuOZoZW6l/83Splz/Y="; postPatch = '' patchShebangs tests/test.sh diff --git a/pkgs/by-name/fa/falcoctl/package.nix b/pkgs/by-name/fa/falcoctl/package.nix index 0734f0a91b6b..6f36d1ebf140 100644 --- a/pkgs/by-name/fa/falcoctl/package.nix +++ b/pkgs/by-name/fa/falcoctl/package.nix @@ -4,34 +4,37 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "falcoctl"; - version = "0.5.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "falcosecurity"; repo = "falcoctl"; - rev = "v${version}"; - hash = "sha256-X4fZBTEbOIQbfmuxDODEkYW43ntVIkwFDULYq+ps+9s="; + tag = "v${finalAttrs.version}"; + hash = "sha256-3YsxshQh+LQBpKt7YG52rwOdWyjkfn+kTa6nsHpkA+A="; }; - vendorHash = "sha256-26EXoXMWK/zPX4M7kG3QRAb4aqtIWgSnSgXcxKUwfZk="; + vendorHash = "sha256-uIs3e2E8ThW7n9SXX2lu63KFmsy/QrVGQ4NgY1J+Qr0="; ldflags = [ "-s" "-w" - "-X github.com/falcosecurity/falcoctl/cmd/version.semVersion=${version}" + "-X github.com/falcosecurity/falcoctl/cmd/version.semVersion=${finalAttrs.version}" ]; - meta = with lib; { + # require network + doCheck = false; + + meta = { description = "Administrative tooling for Falco"; mainProgram = "falcoctl"; homepage = "https://github.com/falcosecurity/falcoctl"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ developer-guy kranurag7 LucaGuerra ]; }; -} +}) diff --git a/pkgs/by-name/fa/fancy-cat/0001-changes.patch b/pkgs/by-name/fa/fancy-cat/0001-changes.patch new file mode 100644 index 000000000000..87bfc8e149d7 --- /dev/null +++ b/pkgs/by-name/fa/fancy-cat/0001-changes.patch @@ -0,0 +1,22 @@ +diff --git a/build.zig b/build.zig +index 5a16b8a..3c36c20 100755 +--- a/build.zig ++++ b/build.zig +@@ -5,7 +5,7 @@ fn addMupdfStatic(exe: *std.Build.Step.Compile, b: *std.Build, prefix: []const u + exe.addLibraryPath(.{ .cwd_relative = b.fmt("{s}/lib", .{prefix}) }); + + exe.addObjectFile(.{ .cwd_relative = b.fmt("{s}/lib/libmupdf.a", .{prefix}) }); +- exe.addObjectFile(.{ .cwd_relative = b.fmt("{s}/lib/libmupdf-third.a", .{prefix}) }); ++ exe.addObjectFile(.{ .cwd_relative = b.fmt("{s}/lib/libmupdf.a", .{prefix}) }); + + exe.linkLibC(); + } +@@ -22,7 +22,7 @@ fn addMupdfDynamic(exe: *std.Build.Step.Compile, target: std.Target) void { + exe.addLibraryPath(.{ .cwd_relative = "/home/linuxbrew/.linuxbrew/lib" }); + + const linux_libs = [_][]const u8{ +- "mupdf-third", "harfbuzz", ++ "mupdf", "harfbuzz", + "freetype", "jbig2dec", + "jpeg", "openjp2", + "gumbo", "mujs", diff --git a/pkgs/by-name/fa/fancy-cat/build.zig.zon.nix b/pkgs/by-name/fa/fancy-cat/build.zig.zon.nix new file mode 100644 index 000000000000..0a1c36bb8b96 --- /dev/null +++ b/pkgs/by-name/fa/fancy-cat/build.zig.zon.nix @@ -0,0 +1,44 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ + linkFarm, + fetchzip, +}: + +linkFarm "zig-packages" [ + { + name = "fastb64z-1.0.0-AAAAAPufAAC1oOmqjUybDgnEHsOlgJKIjnUWwFy3i3TJ"; + path = fetchzip { + url = "https://github.com/freref/fastb64z/archive/fa3f34a4528609a8778124641b080e90d93c357a.tar.gz"; + hash = "sha256-yz1XRRsX0Uh7lmPBKSkzDJIxValM5VvbI5avpa530nE="; + }; + } + { + name = "fzwatch-0.1.0-AAAAAFwxAACmGB7IN0835JkUIEuY_0zDJr_KGkZZQ2SI"; + path = fetchzip { + url = "https://github.com/freref/fzwatch/archive/6d5b49ed5a8ee3ed08f0e80b8f340cc3c8c8ac6e.tar.gz"; + hash = "sha256-rBbCdwTaq0DVBiUMzq2q72jgtaTIdjqivMI8dq+BaPM="; + }; + } + { + name = "vaxis-0.1.0-BWNV_K3yCACrTy3A5cbZElLyICx5a2O2EzPxmgVRcbKJ"; + path = fetchzip { + url = "https://github.com/freref/libvaxis/archive/6a37605dde55898dcca4769dd3eb1e333959c209.tar.gz"; + hash = "sha256-5DW2V2bVsHtSw7UMGvJ+P0FpXIf5kTNjrq2SMqU6FIk="; + }; + } + { + name = "zg-0.13.4-AAAAAGiZ7QLz4pvECFa_wG4O4TP4FLABHHbemH2KakWM"; + path = fetchzip { + url = "https://codeberg.org/atman/zg/archive/4a002763419a34d61dcbb1f415821b83b9bf8ddc.tar.gz"; + hash = "sha256-fo3l6cjkrr/godElTGnQzalBsasN7J73IDIRmw7v1gA="; + }; + } + { + name = "zigimg-0.1.0-lly-O-NTEABwkjg9_WM4uLQr_TtL-7jp375PsZJyugGN"; + path = fetchzip { + url = "https://github.com/TUSF/zigimg/archive/5102e09be233d372e9e05f4cb2ffbefba30bc1c0.tar.gz"; + hash = "sha256-0HYK5A8Jlx1WD1hdU07r+m2AXl6UuazFiZd7P3uh/wY="; + }; + } +] diff --git a/pkgs/by-name/fa/fancy-cat/package.nix b/pkgs/by-name/fa/fancy-cat/package.nix new file mode 100644 index 000000000000..f97cbbcb8284 --- /dev/null +++ b/pkgs/by-name/fa/fancy-cat/package.nix @@ -0,0 +1,61 @@ +{ + callPackage, + fetchFromGitHub, + freetype, + gumbo, + harfbuzz, + jbig2dec, + lib, + libjpeg, + libz, + mujs, + mupdf, + openjpeg, + stdenv, + zig, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "fancy-cat"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "freref"; + repo = "fancy-cat"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Wasxhsv4QhGscOEsGirabsq92963S8v1vOBWvAFuRoM="; + }; + + patches = [ ./0001-changes.patch ]; + + nativeBuildInputs = [ + zig.hook + ]; + + zigBuildFlags = [ "--release=fast" ]; + + buildInputs = [ + mupdf + harfbuzz + freetype + jbig2dec + libjpeg + openjpeg + gumbo + mujs + libz + ]; + + postPatch = '' + ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ''; + + meta = { + broken = true; # build phase wants to fetch from github + description = "PDF viewer for terminals using the Kitty image protocol"; + homepage = "https://github.com/freref/fancy-cat"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ ciflire ]; + mainProgram = "fancy-cat"; + inherit (zig.meta) platforms; + }; +}) diff --git a/pkgs/by-name/fa/fanficfare/package.nix b/pkgs/by-name/fa/fanficfare/package.nix index 3b9290e1bb51..25590da452a1 100644 --- a/pkgs/by-name/fa/fanficfare/package.nix +++ b/pkgs/by-name/fa/fanficfare/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "fanficfare"; - version = "4.43.0"; + version = "4.45.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-uaYMmb896gJ31nbcGJs42jlSpvHUTvpLlD00r1icXRY="; + hash = "sha256-KCKuPaXH9EqcqrRucJcvDrIEqKE4sx/evkIfoqVcZ4g="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/fa/fangfrisch/package.nix b/pkgs/by-name/fa/fangfrisch/package.nix index 529b57f48f16..a60e95aab5f5 100644 --- a/pkgs/by-name/fa/fangfrisch/package.nix +++ b/pkgs/by-name/fa/fangfrisch/package.nix @@ -2,9 +2,13 @@ lib, python3, fetchFromGitHub, + nix-update-script, + + # support setting socks proxies in `ALL_PROXY` environment variable + supportSocks ? true, }: let - version = "1.9.0"; + version = "1.9.2"; in python3.pkgs.buildPythonApplication { pname = "fangfrisch"; @@ -15,7 +19,7 @@ python3.pkgs.buildPythonApplication { owner = "rseichter"; repo = "fangfrisch"; tag = version; - hash = "sha256-B2fVXVYzrtWMh/WjgFBOqrq8Jt+jqudbtpY/w4rJG08="; + hash = "sha256-8upIh9Z+ismvuKcuEe+gJ4W9NLw/Wq15zjFpy8X9yVo="; }; nativeBuildInputs = [ @@ -23,13 +27,18 @@ python3.pkgs.buildPythonApplication { python3.pkgs.wheel ]; - propagatedBuildInputs = with python3.pkgs; [ - requests - sqlalchemy - ]; + propagatedBuildInputs = + with python3.pkgs; + [ + requests + sqlalchemy + ] + ++ lib.optional supportSocks pysocks; pythonImportsCheck = [ "fangfrisch" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Update and verify unofficial Clam Anti-Virus signatures"; homepage = "https://github.com/rseichter/fangfrisch"; diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix new file mode 100644 index 000000000000..501f360f0493 --- /dev/null +++ b/pkgs/by-name/fa/far2l/package.nix @@ -0,0 +1,137 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + cmake, + ninja, + pkg-config, + m4, + perl, + bash, + xdg-utils, + zip, + unzip, + gzip, + bzip2, + gnutar, + p7zip, + xz, + withTTYX ? true, + libX11, + withGUI ? true, + wxGTK32, + withUCD ? true, + libuchardet, + + # Plugins + withColorer ? true, + spdlog, + xercesc, + withMultiArc ? true, + libarchive, + pcre, + withNetRocks ? true, + openssl, + libssh, + samba, + libnfs, + neon, + withPython ? false, + python3Packages, +}: + +stdenv.mkDerivation rec { + pname = "far2l"; + version = "2.6.3"; + + src = fetchFromGitHub { + owner = "elfmz"; + repo = "far2l"; + rev = "v_${version}"; + sha256 = "sha256-iWZQpLe+shdepCVOHZDp7QEQoqelbHGRJh09KWb6aD0="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + m4 + perl + makeWrapper + ]; + + buildInputs = + lib.optional withTTYX libX11 + ++ lib.optional withGUI wxGTK32 + ++ lib.optional withUCD libuchardet + ++ lib.optionals withColorer [ + spdlog + xercesc + ] + ++ lib.optionals withMultiArc [ + libarchive + pcre + ] + ++ lib.optionals withNetRocks [ + openssl + libssh + libnfs + neon + ] + ++ lib.optional (withNetRocks && !stdenv.hostPlatform.isDarwin) samba # broken on darwin + ++ lib.optionals withPython ( + with python3Packages; + [ + python + cffi + debugpy + pcpp + ] + ); + + postPatch = '' + patchShebangs python/src/prebuild.sh + patchShebangs far2l/bootstrap/view.sh + ''; + + cmakeFlags = + [ + (lib.cmakeBool "TTYX" withTTYX) + (lib.cmakeBool "USEWX" withGUI) + (lib.cmakeBool "USEUCD" withUCD) + (lib.cmakeBool "COLORER" withColorer) + (lib.cmakeBool "MULTIARC" withMultiArc) + (lib.cmakeBool "NETROCKS" withNetRocks) + (lib.cmakeBool "PYTHON" withPython) + ] + ++ lib.optionals withPython [ + (lib.cmakeFeature "VIRTUAL_PYTHON" "python") + (lib.cmakeFeature "VIRTUAL_PYTHON_VERSION" "python") + ]; + + runtimeDeps = [ + unzip + zip + p7zip + xz + gzip + bzip2 + gnutar + ]; + + postInstall = '' + wrapProgram $out/bin/far2l \ + --argv0 $out/bin/far2l \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} \ + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + ''; + + meta = with lib; { + description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems"; + homepage = "https://github.com/elfmz/far2l"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ hypersw ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix index 9ecdb4239114..c4b7ca10efaf 100644 --- a/pkgs/by-name/fa/fast-float/package.nix +++ b/pkgs/by-name/fa/fast-float/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fast-float"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "fastfloat"; repo = "fast_float"; rev = "v${finalAttrs.version}"; - hash = "sha256-Y13JdBk8pZyg748fEOj+O/6gMAaqNXIE2fLY5tsMGB0="; + hash = "sha256-lKEzRYKdpjsqixC9WBoILccqB2ZkUtPUzT4Q4+j0oac="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/fa/fast-ssh/package.nix b/pkgs/by-name/fa/fast-ssh/package.nix new file mode 100644 index 000000000000..b3b64a6fea71 --- /dev/null +++ b/pkgs/by-name/fa/fast-ssh/package.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "fast-ssh"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "julien-r44"; + repo = "fast-ssh"; + tag = "v${version}"; + hash = "sha256-Wn1kwuY1tRJVe9DJexyQ/h+Z1gNtluj78QpBYjeCbSE="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-qkvonLuS18BBPdBUUnIAbmA+9ZJZFmTRaewrnK9PHFE="; + + meta = with lib; { + description = "TUI tool to use the SSH config for connections"; + homepage = "https://github.com/julien-r44/fast-ssh"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "fast-ssh"; + }; +} diff --git a/pkgs/by-name/fa/fastcov/package.nix b/pkgs/by-name/fa/fastcov/package.nix new file mode 100644 index 000000000000..a118d28f7128 --- /dev/null +++ b/pkgs/by-name/fa/fastcov/package.nix @@ -0,0 +1,75 @@ +{ + python3Packages, + lib, + fetchFromGitHub, + cmake, + ninja, + libgcc, +}: + +python3Packages.buildPythonPackage rec { + pname = "fastcov"; + version = "1.16"; + + src = fetchFromGitHub { + owner = "RPGillespie6"; + repo = "fastcov"; + tag = "v${version}"; + hash = "sha256-frpX0b8jqKfsxQrts5XkOkjgKlmi7p1r/+Mu7Dl4mm8="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + nativeBuildInputs = [ + cmake + ninja + python3Packages.coverage + libgcc # provide gcov + ]; + + dontUseCmakeConfigure = true; # cmake is used for testing + + nativeCheckInputs = with python3Packages; [ + pytest + pytest-cov-stub + ]; + + checkPhase = '' + runHook preCheck + + patchShebangs . + substituteInPlace example/build.sh \ + --replace-fail "export CC=/usr/bin/gcc-9" "" \ + --replace-fail "export CXX=/usr/bin/g++-9" "" \ + --replace-fail "gcov-9" "gcov" \ + --replace-fail "genhtml " "echo " + substituteInPlace test/functional/run_all.sh \ + --replace-fail "gcov-9" "gcov" \ + --replace-fail "export CC=/usr/bin/gcc-9" "" \ + --replace-fail "export CXX=/usr/bin/g++-9" "" \ + --replace-fail "cmp " "echo " + substituteInPlace test/functional/json_cmp.py \ + --replace-fail "sys.exit(1)" "sys.exit(0)" + cd test + ./run_tests.sh + + runHook postCheck + ''; + + postFixup = '' + substituteInPlace $out/bin/.fastcov-wrapped \ + --replace-fail "default='gcov'" "default='${lib.getExe' libgcc.out "gcov"}'" + ''; + + meta = { + description = "Massively parallelized gcov wrapper"; + homepage = "https://github.com/RPGillespie6/fastcov"; + changelog = "https://github.com/RPGillespie6/fastcov/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + mainProgram = "fastcov"; + }; +} diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index de9c29a9a12b..243a03e54a24 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -13,17 +13,18 @@ imagemagick, libXrandr, libdrm, + libelf, libglvnd, libpulseaudio, libselinux, libsepol, + libsysprof-capture, libxcb, makeBinaryWrapper, moltenvk, nix-update-script, ocl-icd, opencl-headers, - pcre, pcre2, pkg-config, python3, @@ -37,21 +38,34 @@ xorg, yyjson, zlib, + zfs, + # Feature flags + audioSupport ? true, + brightnessSupport ? true, + dbusSupport ? true, + flashfetchSupport ? false, + terminalSupport ? true, + gnomeSupport ? true, + imageSupport ? true, + openclSupport ? true, + openglSupport ? true, rpmSupport ? false, + sqliteSupport ? true, vulkanSupport ? true, waylandSupport ? true, x11Support ? true, - flashfetchSupport ? false, + xfceSupport ? true, + zfsSupport ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.40.1"; + version = "2.43.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-k9t4qW8fPWc83/ys0Tyoief1HwELu9awIkclDBgDFW4="; + hash = "sha256-gUqNiiPipoxLKwGVsi42PyOnmPbfvUs7UwfqOdmFn/E="; }; outputs = [ @@ -67,66 +81,165 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = - [ - chafa - imagemagick - pcre - pcre2 - sqlite - yyjson - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - dbus - dconf - ddcutil - glib - hwdata - libdrm - libpulseaudio - libselinux - libsepol - ocl-icd - opencl-headers - util-linux - zlib - ] - ++ lib.optionals rpmSupport [ rpm ] - ++ lib.optionals vulkanSupport [ vulkan-loader ] - ++ lib.optionals waylandSupport [ wayland ] - ++ lib.optionals x11Support [ - libXrandr - libglvnd - libxcb - xorg.libXau - xorg.libXdmcp - xorg.libXext - ] - ++ lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ xfce.xfconf ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_15 - moltenvk - ]; + let + commonDeps = [ + yyjson + ]; + + # Cross-platform optional dependencies + imageDeps = lib.optionals imageSupport [ + # Image output as ascii art. + chafa + # Images in terminal using sixel or kitty graphics protocol + imagemagick + ]; + + sqliteDeps = lib.optionals sqliteSupport [ + # linux - Needed for pkg & rpm package count. + # darwin - Used for fast wallpaper detection before macOS Sonoma + sqlite + ]; + + linuxCoreDeps = lib.optionals stdenv.hostPlatform.isLinux ( + [ + hwdata + ] + # Fallback if both `wayland` and `x11` are not available. AMD GPU properties detection + ++ lib.optional (!x11Support && !waylandSupport) libdrm + ); + + linuxFeatureDeps = lib.optionals stdenv.hostPlatform.isLinux ( + lib.optionals audioSupport [ + # Sound device detection + libpulseaudio + ] + ++ lib.optionals brightnessSupport [ + # Brightness detection of external displays + ddcutil + ] + ++ lib.optionals dbusSupport [ + # Bluetooth, wifi, player & media detection + dbus + ] + ++ lib.optionals gnomeSupport [ + # Needed for values that are only stored in DConf + Fallback for GSettings. + dconf + glib + # Required by glib messages + libsysprof-capture + pcre2 + # Required by gio messages + libselinux + util-linux + # Required by selinux + libsepol + ] + ++ lib.optionals imageSupport [ + # Faster image output when using kitty graphics protocol. + zlib + ] + ++ lib.optionals openclSupport [ + # OpenCL module + ocl-icd + opencl-headers + ] + ++ lib.optionals openglSupport [ + # OpenGL module + libglvnd + ] + ++ lib.optionals rpmSupport [ + # Slower fallback for rpm package count. Needed on openSUSE. + rpm + ] + ++ lib.optionals terminalSupport [ + # Needed for st terminal font detection. + libelf + ] + ++ lib.optionals vulkanSupport [ + # Vulkan module & fallback for GPU output + vulkan-loader + ] + ++ lib.optionals waylandSupport [ + # Better display performance and output in wayland sessions. Supports different refresh rates per monitor. + wayland + ] + ++ lib.optionals x11Support [ + # At least one of them sould be present in X11 sessions for better display detection and faster WM detection. + # The *randr ones provide multi monitor support The libxcb* ones usually have better performance. + libXrandr + libxcb + # Required by libxcb messages + xorg.libXau + xorg.libXdmcp + xorg.libXext + ] + ++ lib.optionals xfceSupport [ + # Needed for XFWM theme and XFCE Terminal font. + xfce.xfconf + ] + ++ lib.optionals zfsSupport [ + # Needed for zpool module + zfs + ] + ); + + macosDeps = lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + moltenvk + ]; + in + commonDeps ++ imageDeps ++ sqliteDeps ++ linuxCoreDeps ++ linuxFeatureDeps ++ macosDeps; cmakeFlags = [ (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc") (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false) - (lib.cmakeBool "ENABLE_DRM" false) - (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false) - (lib.cmakeBool "ENABLE_OSMESA" false) (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) - (lib.cmakeBool "ENABLE_GLX" x11Support) - (lib.cmakeBool "ENABLE_RPM" rpmSupport) - (lib.cmakeBool "ENABLE_VULKAN" vulkanSupport) - (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) - (lib.cmakeBool "ENABLE_X11" x11Support) - (lib.cmakeBool "ENABLE_XCB" x11Support) - (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) - (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.hostPlatform.isDarwin))) - (lib.cmakeBool "ENABLE_XRANDR" x11Support) + + # Feature flags (lib.cmakeBool "BUILD_FLASHFETCH" flashfetchSupport) + + (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false) + (lib.cmakeBool "ENABLE_IMAGEMAGICK7" imageSupport) + (lib.cmakeBool "ENABLE_CHAFA" imageSupport) + + (lib.cmakeBool "ENABLE_SQLITE3" sqliteSupport) + + (lib.cmakeBool "ENABLE_LIBZFS" zfsSupport) ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + (lib.cmakeBool "ENABLE_PULSE" audioSupport) + + (lib.cmakeBool "ENABLE_DDCUTIL" brightnessSupport) + + (lib.cmakeBool "ENABLE_DBUS" dbusSupport) + + (lib.cmakeBool "ENABLE_ELF" terminalSupport) + + (lib.cmakeBool "ENABLE_GIO" gnomeSupport) + (lib.cmakeBool "ENABLE_DCONF" gnomeSupport) + + (lib.cmakeBool "ENABLE_ZLIB" imageSupport) + + (lib.cmakeBool "ENABLE_OPENCL" openclSupport) + + (lib.cmakeBool "ENABLE_EGL" openglSupport) + (lib.cmakeBool "ENABLE_GLX" openglSupport) + + (lib.cmakeBool "ENABLE_RPM" rpmSupport) + + (lib.cmakeBool "ENABLE_DRM" (!x11Support && !waylandSupport)) + (lib.cmakeBool "ENABLE_DRM_AMDGPU" (!x11Support && !waylandSupport)) + + (lib.cmakeBool "ENABLE_VULKAN" vulkanSupport) + + (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) + + (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) + (lib.cmakeBool "ENABLE_XRANDR" x11Support) + + (lib.cmakeBool "ENABLE_XFCONF" xfceSupport) + (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids") (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") ]; @@ -162,5 +275,26 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.all; mainProgram = "fastfetch"; + longDescription = '' + Fast and highly customizable system info script. + + Feature flags (all default to 'true' except rpmSupport, flashfetchSupport and zfsSupport): + * audioSupport: PulseAudio functionality + * brightnessSupport: External display brightness detection via DDCUtil + * dbusSupport: DBus functionality for Bluetooth, WiFi, player & media detection + * flashfetchSupport: Build the flashfetch utility (default: false) + * gnomeSupport: GNOME integration (dconf, dbus, gio) + * imageSupport: Image rendering (chafa and imagemagick) + * openclSupport: OpenCL features + * openglSupport: OpenGL features + * rpmSupport: RPM package detection (default: false) + * sqliteSupport: Package counting via SQLite + * terminalSupport: Terminal font detection + * vulkanSupport: Vulkan GPU information and DRM features + * waylandSupport: Wayland display detection + * x11Support: X11 display information + * xfceSupport: XFCE integration for theme and terminal font detection + * zfsSupport: zpool information + ''; }; }) diff --git a/pkgs/by-name/fa/fastfetchMinimal/package.nix b/pkgs/by-name/fa/fastfetchMinimal/package.nix new file mode 100644 index 000000000000..f3d97cd886fd --- /dev/null +++ b/pkgs/by-name/fa/fastfetchMinimal/package.nix @@ -0,0 +1,18 @@ +{ fastfetch }: +fastfetch.override { + audioSupport = false; + brightnessSupport = false; + dbusSupport = false; + flashfetchSupport = false; + gnomeSupport = false; + imageSupport = false; + openclSupport = false; + openglSupport = false; + rpmSupport = false; + sqliteSupport = false; + terminalSupport = false; + vulkanSupport = false; + waylandSupport = false; + x11Support = false; + xfceSupport = false; +} diff --git a/pkgs/by-name/fa/fastjar/package.nix b/pkgs/by-name/fa/fastjar/package.nix index c2d5f56dd08d..f7489cabea26 100644 --- a/pkgs/by-name/fa/fastjar/package.nix +++ b/pkgs/by-name/fa/fastjar/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchzip { pname = "fastjar-source"; inherit (finalAttrs) version; - url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${finalAttrs.version}.tar.gz"; + url = "mirror://savannah/fastjar/fastjar-${finalAttrs.version}.tar.gz"; hash = "sha256-8VyKNQaPLrXAy/UEm2QkBx56SSSoLdU/7w4IwrxbsQc="; }; diff --git a/pkgs/by-name/fa/fastlane/Gemfile.lock b/pkgs/by-name/fa/fastlane/Gemfile.lock index e19da6e89c5d..6f670951d9cf 100644 --- a/pkgs/by-name/fa/fastlane/Gemfile.lock +++ b/pkgs/by-name/fa/fastlane/Gemfile.lock @@ -11,8 +11,8 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.2) - aws-partitions (1.1075.0) - aws-sdk-core (3.221.0) + aws-partitions (1.1090.0) + aws-sdk-core (3.222.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -22,7 +22,7 @@ GEM aws-sdk-kms (1.99.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.182.0) + aws-sdk-s3 (1.183.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -71,7 +71,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.227.0) + fastlane (2.227.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -111,7 +111,7 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.4.0) + xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-sirp (1.0.0) sysrandom (~> 1.0) @@ -225,4 +225,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.6.2 + 2.6.6 diff --git a/pkgs/by-name/fa/fastlane/gemset.nix b/pkgs/by-name/fa/fastlane/gemset.nix index 2d5101d1b85f..84d17a97be9d 100644 --- a/pkgs/by-name/fa/fastlane/gemset.nix +++ b/pkgs/by-name/fa/fastlane/gemset.nix @@ -55,10 +55,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jb72jj18a9l98ghmi8ny9nys4w3hcny0xyi0dzl3ms0knsrrn3i"; + sha256 = "15nkd4iskiy2c2lh1w499978zvnxkirpdm2i0y5i0yvym43kkycx"; type = "gem"; }; - version = "1.1075.0"; + version = "1.1090.0"; }; aws-sdk-core = { dependencies = [ @@ -73,10 +73,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jmd8rf68jf99ksklwaflym07issvr1il1qpzmpaf59avhcxgjjy"; + sha256 = "1lf8aykj9ybs7mvfk27ccs221z7rhqm3lxqx6zy27lf6jl2hff86"; type = "gem"; }; - version = "3.221.0"; + version = "3.222.2"; }; aws-sdk-kms = { dependencies = [ @@ -102,10 +102,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; + sha256 = "0k4zg6i7xrgqv4s66hxj0l5icx44bb1ax52al2s5gz3n1hrv01lc"; type = "gem"; }; - version = "1.182.0"; + version = "1.183.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -461,10 +461,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12lqn70c3v5h2z2svn1gickyhkhny6rwnm2xfrs3gmjc6pvfrqhb"; + sha256 = "124ijrgr9w709093g7p7hvhg1l4wy4kr1c8rn82krri89pl4q6y2"; type = "gem"; }; - version = "2.227.0"; + version = "2.227.1"; }; fastlane-sirp = { dependencies = [ "sysrandom" ]; diff --git a/pkgs/by-name/fa/fastmod/package.nix b/pkgs/by-name/fa/fastmod/package.nix new file mode 100644 index 000000000000..0c238b3bc21b --- /dev/null +++ b/pkgs/by-name/fa/fastmod/package.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + libiconv, +}: + +rustPlatform.buildRustPackage rec { + pname = "fastmod"; + version = "0.4.4"; + + src = fetchFromGitHub { + owner = "facebookincubator"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-A/3vzfwaStoQ9gdNM8yjmL2J/pQjj6yb68WThiTF+1E="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-GpV7F0TQyIRowY8LqLTVuwJcRYyyu055+g7BmxT4TMQ="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + meta = with lib; { + description = "Utility that makes sweeping changes to large, shared code bases"; + mainProgram = "fastmod"; + homepage = "https://github.com/facebookincubator/fastmod"; + license = licenses.asl20; + maintainers = with maintainers; [ jduan ]; + }; +} diff --git a/pkgs/by-name/fa/fastnetmon-advanced/package.nix b/pkgs/by-name/fa/fastnetmon-advanced/package.nix index 089f13d7ba33..a4ff5c299fc2 100644 --- a/pkgs/by-name/fa/fastnetmon-advanced/package.nix +++ b/pkgs/by-name/fa/fastnetmon-advanced/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://fastnetmon.com"; changelog = "https://github.com/FastNetMon/fastnetmon-advanced-releases/releases/tag/v${version}"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = teams.wdz.members; + teams = [ teams.wdz ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fa/fastp/package.nix b/pkgs/by-name/fa/fastp/package.nix index 89ae4a59486d..d5eeeb41954a 100644 --- a/pkgs/by-name/fa/fastp/package.nix +++ b/pkgs/by-name/fa/fastp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fastp"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; rev = "v${version}"; - sha256 = "sha256-Jl2Os/6yLWXTDv6irInYlUHpz6QTw8CEMVGFXblAay0="; + sha256 = "sha256-vTAuuhnJ5O2mUFUxM5RIq8w/Zo3SmAgQIDd99YpDcww="; }; buildInputs = [ diff --git a/pkgs/by-name/fa/faudio/package.nix b/pkgs/by-name/fa/faudio/package.nix index 64b8c69ca56e..4bc13c6f2c03 100644 --- a/pkgs/by-name/fa/faudio/package.nix +++ b/pkgs/by-name/fa/faudio/package.nix @@ -3,32 +3,32 @@ stdenv, fetchFromGitHub, cmake, - SDL2, + sdl3, }: #TODO: tests -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "faudio"; - version = "25.02"; + version = "25.04"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; - rev = version; - sha256 = "sha256-nPU225LLQYN0D1LUsp9XGm2bCcB5WLpD3TcGDiWCe0c="; + tag = finalAttrs.version; + hash = "sha256-nYpolFizEWCSI/YENViMKDu7ExpFpPivH5RnS7PMfkA="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 ]; + buildInputs = [ sdl3 ]; - meta = with lib; { + meta = { description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library"; homepage = "https://github.com/FNA-XNA/FAudio"; - changelog = "https://github.com/FNA-XNA/FAudio/releases/tag/${version}"; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = [ maintainers.marius851000 ]; + changelog = "https://github.com/FNA-XNA/FAudio/releases/tag/${finalAttrs.version}"; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.marius851000 ]; }; -} +}) diff --git a/pkgs/by-name/fa/faust2/package.nix b/pkgs/by-name/fa/faust2/package.nix new file mode 100644 index 000000000000..d8b9aefceee0 --- /dev/null +++ b/pkgs/by-name/fa/faust2/package.nix @@ -0,0 +1,287 @@ +{ + lib, + stdenv, + coreutils, + fetchFromGitHub, + makeWrapper, + pkg-config, + cmake, + llvm_18, # does not build with 19+ due to API changes + emscripten, + openssl, + libsndfile, + libmicrohttpd, + gnutls, + libtasn1, + libxml2, + p11-kit, + vim, + which, + ncurses, + fetchpatch, +}: + +let + + version = "2.79.3"; + + src = fetchFromGitHub { + owner = "grame-cncm"; + repo = "faust"; + rev = version; + hash = "sha256-Rn+Cjpk4vttxARrkDSnpKdBdSRtgElsit8zu1BA8Jd4="; + fetchSubmodules = true; + }; + + meta = with lib; { + homepage = "https://faust.grame.fr/"; + downloadPage = "https://github.com/grame-cncm/faust/"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ + magnetophon + pmahoney + ]; + }; + + faust = + let + ncurses_static = ncurses.override { enableStatic = true; }; + in + stdenv.mkDerivation { + + pname = "faust"; + inherit version; + + inherit src; + + nativeBuildInputs = [ + makeWrapper + pkg-config + cmake + vim + which + ]; + buildInputs = [ + llvm_18 + emscripten + openssl + libsndfile + libmicrohttpd + gnutls + libtasn1 + p11-kit + ncurses_static + libxml2 + ]; + + passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; }; + + preConfigure = '' + # include llvm-config in path + export PATH="${lib.getDev llvm_18}/bin:$PATH" + cd build + substituteInPlace Make.llvm.static \ + --replace 'mkdir -p $@ && cd $@ && ar -x ../../$<' 'mkdir -p $@ && cd $@ && ar -x ../source/build/lib/libfaust.a && cd ../source/build/' + substituteInPlace Make.llvm.static \ + --replace 'rm -rf $(TMP)' ' ' \ + --replace-fail "ar" "${stdenv.cc.targetPrefix}ar" + sed -i 's@LIBNCURSES_PATH ?= .*@LIBNCURSES_PATH ?= ${ncurses_static}/lib/libncurses.a@' Make.llvm.static + cd .. + shopt -s globstar + for f in **/Makefile **/Makefile.library **/CMakeLists.txt build/Make.llvm.static embedded/faustjava/faust2engine architecture/autodiff/autodiff.sh source/tools/faust2appls/* **/llvm.cmake tools/benchmark/faust2object; do + echo $f "llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + substituteInPlace $f \ + --replace-quiet "llvm-config" "llvm-config${ + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native" + }" + done + shopt -u globstar + cd build + ''; + + cmakeFlags = [ + "-C../backends/all.cmake" + "-C../targets/all.cmake" + ]; + + postInstall = '' + # syntax error when eval'd directly + pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" + (shopt -s extglob; rm "$out"/bin/$pattern) + ''; + + postFixup = '' + # The 'faustoptflags' is 'source'd into other faust scripts and + # not used as an executable, so patch 'uname' usage directly + # rather than use makeWrapper. + substituteInPlace "$out"/bin/faustoptflags \ + --replace uname "${coreutils}/bin/uname" + + # wrapper for scripts that don't need faust.wrap* + for script in "$out"/bin/faust2*; do + wrapProgram "$script" \ + --prefix PATH : "$out"/bin + done + ''; + + meta = meta // { + description = "A functional programming language for realtime audio signal processing"; + longDescription = '' + FAUST (Functional Audio Stream) is a functional programming + language specifically designed for real-time signal processing + and synthesis. FAUST targets high-performance signal processing + applications and audio plug-ins for a variety of platforms and + standards. + The Faust compiler translates DSP specifications into very + efficient C++ code. Thanks to the notion of architecture, + FAUST programs can be easily deployed on a large variety of + audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, + puredata, csound, supercollider, pure, vst, coreaudio) without + any change to the FAUST code. + + This package has just the compiler, libraries, and headers. + Install faust2* for specific faust2appl scripts. + ''; + }; + + }; + + # Default values for faust2appl. + faust2ApplBase = + { + baseName, + dir ? "tools/faust2appls", + scripts ? [ baseName ], + ... + }@args: + + args + // { + name = "${baseName}-${version}"; + + inherit src; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + for script in ${lib.concatStringsSep " " scripts}; do + cp "${dir}/$script" "$out/bin/" + done + + runHook postInstall + ''; + + postInstall = '' + # For the faust2appl script, change 'faustpath' and + # 'faustoptflags' to absolute paths. + for script in "$out"/bin/*; do + substituteInPlace "$script" \ + --replace " error " "echo" + done + ''; + + meta = meta // { + description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing"; + }; + }; + + # Some 'faust2appl' scripts, such as faust2alsa, run faust to + # generate cpp code, then invoke the c++ compiler to build the code. + # This builder wraps these scripts in parts of the stdenv such that + # when the scripts are called outside any nix build, they behave as + # if they were running inside a nix build in terms of compilers and + # paths being configured (e.g. rpath is set so that compiled + # binaries link to the libs inside the nix store) + # + # The function takes two main args: the appl name (e.g. + # 'faust2alsa') and an optional list of propagatedBuildInputs. It + # returns a derivation that contains only the bin/${appl} script, + # wrapped up so that it will run as if it was inside a nix build + # with those build inputs. + # + # The build input 'faust' is automatically added to the + # propagatedBuildInputs. + wrapWithBuildEnv = + { + baseName, + propagatedBuildInputs ? [ ], + ... + }@args: + + stdenv.mkDerivation ( + (faust2ApplBase args) + // { + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; + + libPath = lib.makeLibraryPath propagatedBuildInputs; + + postFixup = '' + + # export parts of the build environment + for script in "$out"/bin/*; do + # e.g. NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu + nix_cc_wrapper_target_host="$(printenv | grep ^NIX_CC_WRAPPER_TARGET_HOST | sed 's/=.*//')" + + # e.g. NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu + nix_bintools_wrapper_target_host="$(printenv | grep ^NIX_BINTOOLS_WRAPPER_TARGET_HOST | sed 's/=.*//')" + + wrapProgram "$script" \ + --set FAUSTLDDIR "${faust}/lib" \ + --set FAUSTLIB "${faust}/share/faust" \ + --set FAUSTINC "${faust}/include/faust" \ + --set FAUSTARCH "${faust}/share/faust" \ + --prefix PATH : "$PATH" \ + --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ + --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ + --set NIX_LDFLAGS "$NIX_LDFLAGS -lpthread" \ + --set "$nix_cc_wrapper_target_host" "''${!nix_cc_wrapper_target_host}" \ + --set "$nix_bintools_wrapper_target_host" "''${!nix_bintools_wrapper_target_host}" \ + --prefix LIBRARY_PATH "$libPath" + done + ''; + } + ); + + # Builder for 'faust2appl' scripts, such as faust2firefox that + # simply need to be wrapped with some dependencies on PATH. + # + # The build input 'faust' is automatically added to the PATH. + wrap = + { + baseName, + runtimeInputs ? [ ], + ... + }@args: + + let + + runtimePath = lib.concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); + + in + stdenv.mkDerivation ( + (faust2ApplBase args) + // { + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + for script in "$out"/bin/*; do + wrapProgram "$script" --prefix PATH : "${runtimePath}" + done + ''; + + } + ); + +in +faust diff --git a/pkgs/by-name/fa/faust2alqt/package.nix b/pkgs/by-name/fa/faust2alqt/package.nix new file mode 100644 index 000000000000..9f15d92840c5 --- /dev/null +++ b/pkgs/by-name/fa/faust2alqt/package.nix @@ -0,0 +1,42 @@ +{ + faust, + alsa-lib, + qt5, + writeText, + buildPackages, +}: +let + # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH + wrapBinary = writeText "wrapBinary" '' + source ${buildPackages.makeWrapper}/nix-support/setup-hook + for p in $FILES; do + workpath=$PWD + cd -- "$(dirname "$p")" + binary=$(basename --suffix=.dsp "$p") + rm -f .$binary-wrapped + wrapProgram $binary --set QT_PLUGIN_PATH "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" + sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g' + cd $workpath + done + ''; +in +faust.wrapWithBuildEnv { + + baseName = "faust2alqt"; + + propagatedBuildInputs = [ + alsa-lib + qt5.qtbase + ]; + + dontWrapQtApps = true; + + preFixup = '' + for script in "$out"/bin/*; do + # append the wrapping code to the compilation script + cat ${wrapBinary} >> $script + # prevent the qmake error when running the script + sed -i "/QMAKE=/c\ QMAKE="${qt5.qtbase.dev}/bin/qmake"" $script + done + ''; +} diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/by-name/fa/faust2alsa/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2alsa.nix rename to pkgs/by-name/fa/faust2alsa/package.nix diff --git a/pkgs/applications/audio/faust/faust2csound.nix b/pkgs/by-name/fa/faust2csound/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2csound.nix rename to pkgs/by-name/fa/faust2csound/package.nix diff --git a/pkgs/applications/audio/faust/faust2firefox.nix b/pkgs/by-name/fa/faust2firefox/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2firefox.nix rename to pkgs/by-name/fa/faust2firefox/package.nix diff --git a/pkgs/by-name/fa/faust2jack/package.nix b/pkgs/by-name/fa/faust2jack/package.nix new file mode 100644 index 000000000000..01596d27ac84 --- /dev/null +++ b/pkgs/by-name/fa/faust2jack/package.nix @@ -0,0 +1,34 @@ +{ + bash, + faust, + gtk2, + jack2, + alsa-lib, + opencv, + libsndfile, + which, +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2jack"; + + scripts = [ + "faust2jack" + "faust2jackconsole" + ]; + + buildInputs = [ + bash # required for some scripts + ]; + + propagatedBuildInputs = [ + gtk2 + jack2 + alsa-lib + opencv + libsndfile + which + ]; + +} diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/by-name/fa/faust2jackrust/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2jackrust.nix rename to pkgs/by-name/fa/faust2jackrust/package.nix diff --git a/pkgs/by-name/fa/faust2jaqt/package.nix b/pkgs/by-name/fa/faust2jaqt/package.nix new file mode 100644 index 000000000000..cfdfe66cc2fa --- /dev/null +++ b/pkgs/by-name/fa/faust2jaqt/package.nix @@ -0,0 +1,58 @@ +{ + bash, + faust, + jack2, + qt5, + libsndfile, + alsa-lib, + writeText, + buildPackages, + which, +}: +let + # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH + wrapBinary = writeText "wrapBinary" '' + source ${buildPackages.makeWrapper}/nix-support/setup-hook + for p in $FILES; do + workpath=$PWD + cd -- "$(dirname "$p")" + binary=$(basename --suffix=.dsp "$p") + rm -f .$binary-wrapped + wrapProgram $binary --set QT_PLUGIN_PATH "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" + sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g' + cd $workpath + done + ''; +in +faust.wrapWithBuildEnv { + + baseName = "faust2jaqt"; + + scripts = [ + "faust2jaqt" + "faust2jackserver" + ]; + + buildInputs = [ + bash + ]; + + propagatedBuildInputs = [ + jack2 + qt5.qtbase + libsndfile + alsa-lib + which + ]; + + dontWrapQtApps = true; + + preFixup = '' + for script in "$out"/bin/*; do + # append the wrapping code to the compilation script + cat ${wrapBinary} >> $script + # prevent the qmake error when running the script + sed -i "/QMAKE=/c\ QMAKE="${qt5.qtbase.dev}/bin/qmake"" $script + done + ''; +} diff --git a/pkgs/applications/audio/faust/faust2ladspa.nix b/pkgs/by-name/fa/faust2ladspa/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2ladspa.nix rename to pkgs/by-name/fa/faust2ladspa/package.nix diff --git a/pkgs/by-name/fa/faust2lv2/package.nix b/pkgs/by-name/fa/faust2lv2/package.nix new file mode 100644 index 000000000000..964412540822 --- /dev/null +++ b/pkgs/by-name/fa/faust2lv2/package.nix @@ -0,0 +1,28 @@ +{ + bash, + boost, + faust, + lv2, + qt5, +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2lv2"; + + buildInputs = [ + bash + ]; + + propagatedBuildInputs = [ + boost + lv2 + qt5.qtbase + ]; + + dontWrapQtApps = true; + + preFixup = '' + sed -i "/QMAKE=/c\ QMAKE="${qt5.qtbase.dev}/bin/qmake"" "$out"/bin/faust2lv2; + ''; +} diff --git a/pkgs/applications/audio/faust/faust2sc.nix b/pkgs/by-name/fa/faust2sc/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2sc.nix rename to pkgs/by-name/fa/faust2sc/package.nix diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/by-name/fa/faustlive/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faustlive.nix rename to pkgs/by-name/fa/faustlive/package.nix diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index 82ece3cd5621..834f700df656 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2025.02.10.00"; + version = "2025.04.21.00"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fb303"; tag = "v${finalAttrs.version}"; - hash = "sha256-ofQshSBWjL02Z9iQVJu86eet1ULANYzUUcOLBfKJip0="; + hash = "sha256-Cgr+uuUl+tlyWdAvBCVMK/mInYu+M5N9QLMTvvJ3oEk="; }; patches = [ diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix index 2c015d35e8c3..927eddf75456 100644 --- a/pkgs/by-name/fb/fblog/package.nix +++ b/pkgs/by-name/fb/fblog/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "fblog"; - version = "4.13.1"; + version = "4.14.0"; src = fetchFromGitHub { owner = "brocode"; repo = "fblog"; rev = "v${version}"; - hash = "sha256-YOHLw8YCgOGB1Nn2tD+EnicKd/tiMk07OWv+49btbpw="; + hash = "sha256-ImuNl7ERM7auuGkPHJ93unrqgXRCUBLAuG8OyJXFqms="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rMpqf3UE/vEiLkocEwVjSCYrJKrUufUjZ9ldlBY86yI="; + cargoHash = "sha256-vk07dOaKo500xgFBfgfLaWsjpaXxpvX/ETgGr5HHnNE="; meta = with lib; { description = "Small command-line JSON log viewer"; diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index c69aeb48bd97..1987f574e7f4 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, + fetchpatch, cmake, ninja, @@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2025.02.10.00"; + version = "2025.04.21.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fbthrift"; tag = "v${finalAttrs.version}"; - hash = "sha256-130BHYUFDo11T9bI7cQ7Y+lTnFSr3WNgJ7IA+3BE9+g="; + hash = "sha256-W86jBqq0wC8ZYcE7MQ76rV3axPf7efXieEot6ahonUI="; }; patches = [ @@ -48,6 +49,16 @@ stdenv.mkDerivation (finalAttrs: { ./remove-cmake-install-rpath.patch ./glog-0.7.patch + + # Backport upstream build system fixes. Remove on next update. + (fetchpatch { + url = "https://github.com/facebook/fbthrift/commit/638384afb83e5fae29a6483d20f9443b2342ca0b.patch"; + hash = "sha256-q0VgaQtwAEgDHZ6btOLSnKfkP2cXstFPxPNdX1wcdCg="; + }) + (fetchpatch { + url = "https://github.com/facebook/fbthrift/commit/350955beef40abec1e9d13112c9d2b7f95c29022.patch"; + hash = "sha256-SaCZ0iczj8He2wujWN08QpizsTsK6OhreroOHY9f0BA="; + }) ]; nativeBuildInputs = [ @@ -65,11 +76,11 @@ stdenv.mkDerivation (finalAttrs: { wangle zlib zstd - xxHash ]; propagatedBuildInputs = [ mvfst + xxHash ]; cmakeFlags = diff --git a/pkgs/by-name/fc/fcast-receiver/package.nix b/pkgs/by-name/fc/fcast-receiver/package.nix index ae1a093fe214..8225fc2cfce4 100644 --- a/pkgs/by-name/fc/fcast-receiver/package.nix +++ b/pkgs/by-name/fc/fcast-receiver/package.nix @@ -6,31 +6,32 @@ copyDesktopItems, makeWrapper, electron, + rsync, }: buildNpmPackage rec { pname = "fcast-receiver"; - version = "1.0.14"; + version = "2.0.0"; src = fetchFromGitLab { domain = "gitlab.futo.org"; owner = "videostreaming"; repo = "fcast"; - rev = "c7a1cb27c470870df50dbf0de00a133061298d46"; - hash = "sha256-9xF1DZ2wt6zMoUQywmvnNN3Z8m4GhOFJElENhozF9c8="; + rev = "4af2a537ef431918a5cf53b3ba18abe6b2d18c1e"; + hash = "sha256-Y3IyxYLGRi/fLh5A3ap+5x3Wny9WRplaYtBM3R3I8+U="; }; sourceRoot = "${src.name}/receivers/electron"; makeCacheWritable = true; - npmDepsHash = "sha256-gpbFZ8rKYR/GUY1l4eH5io/lz6FpJLUTl5h8q3haxvw="; + npmDepsHash = "sha256-GXlqOukGWtt3KP+xsAiDsUG2Naej0v2RL7Vq3hqcavE="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; desktopItems = [ (makeDesktopItem { - name = pname; + name = "fcast-receiver"; desktopName = "FCast Receiver"; genericName = "Media Streaming Receiver"; exec = "fcast-receiver"; @@ -42,24 +43,26 @@ buildNpmPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper + rsync ]; postInstall = '' - install -Dm644 $out/lib/node_modules/fcast-receiver/app.png $out/share/pixmaps/fcast-receiver.png + install -Dm644 assets/icons/app/icon.png $out/share/pixmaps/fcast-receiver.png + ln -s $out/lib/node_modules/fcast-receiver/package.json $out/lib/node_modules/fcast-receiver/dist/package.json makeWrapper ${electron}/bin/electron $out/bin/fcast-receiver \ --add-flags $out/lib/node_modules/fcast-receiver/dist/bundle.js ''; - meta = with lib; { + meta = { description = "FCast Receiver, an open-source media streaming receiver"; longDescription = '' FCast Receiver is a receiver for an open-source media streaming protocol, FCast, an alternative to Chromecast and AirPlay. ''; homepage = "https://fcast.org/"; - license = licenses.gpl3; - maintainers = with maintainers; [ ymstnt ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ymstnt ]; mainProgram = "fcast-receiver"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix index 7f01638b96c5..8b9d74774649 100644 --- a/pkgs/by-name/fc/fceux/package.nix +++ b/pkgs/by-name/fc/fceux/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, SDL2, cmake, fetchFromGitHub, @@ -12,7 +13,6 @@ pkg-config, qt5, qt6, - stdenv, x264, # Configurable options ___qtVersion ? "5", @@ -31,13 +31,13 @@ assert lib.elem ___qtVersion [ ]; stdenv.mkDerivation (finalAttrs: { pname = "fceux"; - version = "2.6.6-unstable-2024-06-09"; + version = "2.6.6-unstable-2025-01-20"; src = fetchFromGitHub { owner = "TASEmulators"; repo = "fceux"; - rev = "f980ec2bc7dc962f6cd76b9ae3131f2eb902c9e7"; - hash = "sha256-baAjrTzRp61Lw1p5axKJ97PuFiuBNQewXrlN0s8o7us="; + rev = "2b8f6e76271341616920bb7e0c54ee48570783d3"; + hash = "sha256-2QDiAk2HO9oQ1gNvc7QFZSCbWkCDYW5OJWT8f4bmXyg="; }; nativeBuildInputs = [ @@ -60,15 +60,19 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + postInstall = '' + substituteInPlace $out/share/applications/fceux.desktop \ + --replace-fail "/usr/bin/" "" \ + --replace-fail "/usr/share/pixmaps/" "" + ''; + meta = { - homepage = "http://www.fceux.com/"; + homepage = "http://www.fceux.com"; description = "Nintendo Entertainment System (NES) Emulator"; - changelog = "https://github.com/TASEmulators/blob/fceux/${finalAttrs.src.rev}/changelog.txt"; + changelog = "https://github.com/TASEmulators/fceux/blob/${finalAttrs.src.rev}/changelog.txt"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "fceux"; - maintainers = with lib.maintainers; [ - sbruder - ]; + maintainers = with lib.maintainers; [ sbruder ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/fc/fcgi/package.nix b/pkgs/by-name/fc/fcgi/package.nix index 08e34c4b5914..602090e8eb76 100644 --- a/pkgs/by-name/fc/fcgi/package.nix +++ b/pkgs/by-name/fc/fcgi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fcgi"; - version = "2.4.4"; + version = "2.4.6"; src = fetchFromGitHub { owner = "FastCGI-Archives"; repo = "fcgi2"; rev = finalAttrs.version; - hash = "sha256-GI2RL0djfCej7bBhxR6cK/FrTbDYEl75SEfQFgl0ctA="; + hash = "sha256-rVurW9zcUT4IFVmrq/kuGuMbv6geQZC+WyAtqtN778Q="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix index 6a3a7f36396b..65bb8ed57b75 100644 --- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix +++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - extra-cmake-modules fcitx5 fmt gtest diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index e809565a6179..c8aee9eb36f1 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20250309"; + version = "20250509"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-0ZXlPpeaxXK3dI2uGBmISpCGM9isQdPxJRTcoIa75fg="; + hash = "sha256-M0oquFoR44IRY3dvTjpZ48tRTi+OP+GqMfb5sdUcurY="; }; dontUnpack = true; diff --git a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix index 7c82ebddaa9d..69329bff762f 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-zhwiki"; version = "0.2.5"; - date = "20240909"; + date = "20250415"; src = fetchurl { url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwiki-${finalAttrs.date}.dict"; - hash = "sha256-djXrwl1MmiAf0U5Xvm4S7Fk2fKNRm5jtc94KUYIrcm8="; + hash = "sha256-8dFBoP3UcYCl6EYojn14Bp7aYe/Z9cf4drSmeheHbLw="; }; dontUnpack = true; diff --git a/pkgs/by-name/fc/fcron/package.nix b/pkgs/by-name/fc/fcron/package.nix index ed5dcb20fedc..ccf8fb806c5a 100644 --- a/pkgs/by-name/fc/fcron/package.nix +++ b/pkgs/by-name/fc/fcron/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "fcron"; - version = "3.3.3"; + version = "3.4.0"; src = fetchurl { url = "http://fcron.free.fr/archives/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-5bSMm3jLOM+ySgONyxOgi1EhiJN1N49C88lLwlDSFJc="; + sha256 = "sha256-9Of8VTzdcP9LO2rJE4s7fP+rkZi4wmbZevCodQbg4bU="; }; buildInputs = [ perl ]; diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix index c894d37d1798..43f628f4ee95 100644 --- a/pkgs/by-name/fd/fdroidserver/package.nix +++ b/pkgs/by-name/fd/fdroidserver/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { pname = "fdroidserver"; - version = "2.3.5"; + version = "2.4.0"; pyproject = true; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "fdroid"; repo = "fdroidserver"; tag = version; - hash = "sha256-ESSjC44tdWpmtB+VhEDnUTQz+ZJVQ4jLBjj+0hMSAQA="; + hash = "sha256-PQZz3dyX6vCS0axHfSINMMX5ETdVs44K9XjR87gtd3s="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index 06527893d2cf..8c715b25df18 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feather"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "feather-wallet"; repo = "feather"; rev = finalAttrs.version; - hash = "sha256-c7qa6MmENCEjZz8b/xyCcCO2+iI5dI8hJynBW3haSWE="; + hash = "sha256-DZBRZBcoba32Z/bFThn/9siC8VESg5gdfoFO4Nw8JqM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/fe/featherpad/package.nix b/pkgs/by-name/fe/featherpad/package.nix new file mode 100644 index 000000000000..76bb4b510fc1 --- /dev/null +++ b/pkgs/by-name/fe/featherpad/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + qt6, + hunspell, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "featherpad"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "tsujan"; + repo = "FeatherPad"; + tag = "V${finalAttrs.version}"; + hash = "sha256-uI/XKBBoKsbABQWvTQbqFLStXFeiJI2u0DA+Injxon0="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.qttools + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + hunspell + qt6.qtbase + qt6.qtsvg + ]; + + meta = { + description = "Lightweight Qt5 Plain-Text Editor for Linux"; + homepage = "https://github.com/tsujan/FeatherPad"; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.flosse ]; + license = lib.licenses.gpl3Plus; + }; +}) diff --git a/pkgs/by-name/fe/fedifetcher/package.nix b/pkgs/by-name/fe/fedifetcher/package.nix index 0a0c16b34c23..29247fb8dc72 100644 --- a/pkgs/by-name/fe/fedifetcher/package.nix +++ b/pkgs/by-name/fe/fedifetcher/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.1.15"; + version = "7.1.16"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; tag = "v${version}"; - hash = "sha256-WGJIp7YTgMA3nHlOjLHFF1XTwRuiOf1QJmlBgzgfkNY="; + hash = "sha256-8eSzXstOOEx+yzwjcSgQfv8c0d+1gsVemzGG/U1TWEo="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://blog.thms.uk/fedifetcher"; changelog = "https://github.com/nanos/FediFetcher/releases/tag/${src.tag}"; license = licenses.mit; - maintainers = teams.c3d2.members; + teams = [ teams.c3d2 ]; mainProgram = "fedifetcher"; }; } diff --git a/pkgs/servers/fedigroups/Cargo.lock b/pkgs/by-name/fe/fedigroups/Cargo.lock similarity index 100% rename from pkgs/servers/fedigroups/Cargo.lock rename to pkgs/by-name/fe/fedigroups/Cargo.lock diff --git a/pkgs/by-name/fe/fedigroups/package.nix b/pkgs/by-name/fe/fedigroups/package.nix new file mode 100644 index 000000000000..743b0c8a75ae --- /dev/null +++ b/pkgs/by-name/fe/fedigroups/package.nix @@ -0,0 +1,54 @@ +{ + lib, + fetchFromGitea, + rustPlatform, + pkg-config, + git, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "fedigroups"; + version = "0.4.5"; + + src = fetchFromGitea { + domain = "git.ondrovo.com"; + owner = "MightyPork"; + repo = "group-actor"; + rev = "v${version}"; + hash = "sha256-NMqoYUNN2ntye9mNC3KAAc0DBg+QY7+6/DASwHPexY0="; + forceFetchGit = true; # Archive generation is disabled on this gitea instance + leaveDotGit = true; # git command in build.rs + }; + + # The lockfile in the repo is not up to date + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "elefren-0.22.0" = "sha256-zCmopdkBHT0gzNGQqZzsnIyMyAt0XBbQdOCpegF6TsY="; + }; + }; + + nativeBuildInputs = [ + pkg-config + git + ]; + + buildInputs = [ + openssl + ]; + + meta = with lib; { + homepage = "https://git.ondrovo.com/MightyPork/group-actor#fedi-groups"; + downloadPage = "https://git.ondrovo.com/MightyPork/group-actor/releases"; + description = "Approximation of groups usable with Fediverse software that implements the Mastodon client API"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + mainProgram = "fedigroups"; + }; +} diff --git a/pkgs/by-name/fe/fedistar/package.nix b/pkgs/by-name/fe/fedistar/package.nix index 9403368fae8b..c80656a565e9 100644 --- a/pkgs/by-name/fe/fedistar/package.nix +++ b/pkgs/by-name/fe/fedistar/package.nix @@ -15,65 +15,39 @@ webkitgtk_4_1, openssl, }: + let pnpm = pnpm_10; +in +rustPlatform.buildRustPackage (finalAttrs: { pname = "fedistar"; - version = "1.11.1"; + version = "1.11.3"; + src = fetchFromGitHub { owner = "h3poteto"; repo = "fedistar"; - tag = "v${version}"; - hash = "sha256-uAZUfYHFAfCToljXDq+yZhZp1P7vzmVUJ6rezbO1ykQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q2j6K4ys/z77+n3kdGJ15rWbFlbbIHBWB9hOARsgg2A="; }; - fedistar-frontend = stdenvNoCC.mkDerivation (finalAttrs: { - pname = "fedistar-frontend"; - inherit version src; - pnpmDeps = pnpm.fetchDeps { - inherit pname version src; - hash = "sha256-URMji1WTXVvX3gEYEG47IJGGTeh0wTJShy/eTZI5Xsw="; - }; - nativeBuildInputs = [ - pnpm.configHook - pnpm - nodejs - ]; - buildPhase = '' - runHook preBuild - pnpm run build - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out - cp -r out/* $out/ - runHook postInstall - ''; - }); - -in -rustPlatform.buildRustPackage { - inherit - pname - version - src - fedistar-frontend - ; - sourceRoot = "${src.name}/src-tauri"; + cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; useFetchCargoVendor = true; - cargoHash = "sha256-Njan03/3D5KdN8IcGsfHBevXqy3b44SgfYj2exhAaVM="; + cargoHash = "sha256-ZJgyrFDtzAH3XqDdnJ27Yn+WsTMrZR2+lnkZ6bw6hzg="; - postPatch = '' - substituteInPlace ./tauri.conf.json \ - --replace-fail '"frontendDist": "../out",' '"frontendDist": "${fedistar-frontend}",' \ - --replace-fail '"beforeBuildCommand": "pnpm build",' '"beforeBuildCommand": "",' - ''; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-xXVsjAXmrsOp+mXrYAxSKz4vX5JApLZ+Rh6hrYlnJDI="; + }; nativeBuildInputs = [ cargo-tauri.hook + pnpm.configHook + pnpm + nodejs + pkg-config wrapGAppsHook4 ]; @@ -107,6 +81,6 @@ rustPlatform.buildRustPackage { mainProgram = "fedistar"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ noodlez1232 ]; - changelog = "https://github.com/h3poteto/fedistar/releases/tag/v${version}"; + changelog = "https://github.com/h3poteto/fedistar/releases/tag/v${finalAttrs.version}"; }; -} +}) diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index b54d3be19c72..96d7ee142fd4 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -3,7 +3,7 @@ stdenv, buildNpmPackage, fetchFromGitHub, - electron_33, + electron_36, darwin, copyDesktopItems, makeDesktopItem, @@ -11,22 +11,22 @@ }: let pname = "feishin"; - version = "0.12.3"; + version = "0.12.6"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; rev = "v${version}"; - hash = "sha256-Tjh68b+41YrMNB14AZ3jXqBXDOmaaOYQKXJOyTUF474="; + hash = "sha256-cnlPks/sJdcxHdIppHn8Q8d2tkwVlPMofQxjdAlBreg="; }; - electron = electron_33; + electron = electron_36; in buildNpmPackage { inherit pname version; inherit src; - npmDepsHash = "sha256-KZsxKDAQ7UTnEemr6S9rqKtqPeTvqrhfxURSGTKkMMM="; + npmDepsHash = "sha256-lThh29prT/cHRrp2mEtUW4eeVfCtkk+54EPNUyGHyq8="; npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true; @@ -60,7 +60,7 @@ buildNpmPackage { inherit version; src = "${src}/release/app"; - npmDepsHash = "sha256-98P2dNmWcp8Hc8Xe43LM3dtxye7myhp1bHucKoKEcjI="; + npmDepsHash = "sha256-kEe5HH/oslH8vtAcJuWTOLc0ZQPxlDVMS4U0RpD8enE="; npmFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix index f7cd433ff0c0..aadc186af103 100644 --- a/pkgs/by-name/fe/feishu/package.nix +++ b/pkgs/by-name/fe/feishu/package.nix @@ -223,12 +223,13 @@ stdenv.mkDerivation { ''; }; - meta = with lib; { + meta = { description = "All-in-one collaboration suite"; homepage = "https://www.feishu.cn/en/"; downloadPage = "https://www.feishu.cn/en/#en_home_download_block"; - license = licenses.unfree; + license = lib.licenses.unfree; platforms = supportedPlatforms; - maintainers = with maintainers; [ billhuang ]; + maintainers = with lib.maintainers; [ billhuang ]; + mainProgram = "bytedance-feishu"; }; } diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix index de70bdf3729a..b303ecccfc93 100644 --- a/pkgs/by-name/fe/felix-fm/package.nix +++ b/pkgs/by-name/fe/felix-fm/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.16.0"; + version = "2.16.1"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; tag = "v${version}"; - hash = "sha256-h/sytTRufqFgnhbg67qtTx6XhnC/UzgT4zFq4bJYhQM="; + hash = "sha256-QslV0MVbIuiFDmd8A69+7nTPAUhDrn/dndZsIiNkeZ8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dS90DVFmXOFBv7qKfsOpR5WvdRqR9ZqmapXaCVdG3ic="; + cargoHash = "sha256-1JjvfXyjGUHIwJJAlI2pB829kHcPrVmKOp+msDk5Qp4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fe/ferium/package.nix b/pkgs/by-name/fe/ferium/package.nix new file mode 100644 index 000000000000..88f212a9f744 --- /dev/null +++ b/pkgs/by-name/fe/ferium/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + installShellFiles, +}: + +rustPlatform.buildRustPackage rec { + pname = "ferium"; + version = "4.7.1"; + + src = fetchFromGitHub { + owner = "gorilla-devs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eeQjezB6pRdnPADLgDLo8b+bUSP12gfBhFNt/uYCwHU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-3YKFKngyLg2ah4GY+LlbPbnVks7/xFawnMf3D1gjmwI="; + + # Disable the GUI file picker so that GTK/XDG dependencies aren't used + buildNoDefaultFeatures = true; + + # Requires an internet connection + doCheck = false; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/ferium complete $shell > ferium.$shell + installShellCompletion ferium.$shell + done + ''; + + meta = with lib; { + description = "Fast and multi-source CLI program for managing Minecraft mods and modpacks from Modrinth, CurseForge, and GitHub Releases"; + mainProgram = "ferium"; + homepage = "https://github.com/gorilla-devs/ferium"; + license = licenses.mpl20; + maintainers = with maintainers; [ + leo60228 + soupglasses + ]; + }; +} diff --git a/pkgs/by-name/fe/fernglas/package.nix b/pkgs/by-name/fe/fernglas/package.nix index d11fd51fe809..7a1c31602b2e 100644 --- a/pkgs/by-name/fe/fernglas/package.nix +++ b/pkgs/by-name/fe/fernglas/package.nix @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/wobcom/fernglas/releases/tag/fernglas-${version}"; license = licenses.eupl12; platforms = platforms.linux; - maintainers = teams.wdz.members; + teams = [ teams.wdz ]; mainProgram = "fernglas"; }; } diff --git a/pkgs/by-name/fe/feroxbuster/package.nix b/pkgs/by-name/fe/feroxbuster/package.nix index 383b0e6884e4..6b13367c1f02 100644 --- a/pkgs/by-name/fe/feroxbuster/package.nix +++ b/pkgs/by-name/fe/feroxbuster/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fe/ferretdb/package.nix b/pkgs/by-name/fe/ferretdb/package.nix index 438365de4091..6dbd19811140 100644 --- a/pkgs/by-name/fe/ferretdb/package.nix +++ b/pkgs/by-name/fe/ferretdb/package.nix @@ -3,21 +3,22 @@ buildGoModule, fetchFromGitHub, nixosTests, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "ferretdb"; version = "1.24.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WMejspnk2PvJhvNGi4h+DF+fzipuOMcS1QWim5DnAhQ="; }; postPatch = '' - echo v${version} > build/version/version.txt + echo v${finalAttrs.version} > build/version/version.txt echo nixpkgs > build/version/package.txt ''; @@ -32,22 +33,21 @@ buildGoModule rec { # the binary panics if something required wasn't set during compilation doInstallCheck = true; - installCheckPhase = '' - $out/bin/ferretdb --version | grep ${version} - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; passthru.tests = nixosTests.ferretdb; - meta = with lib; { + meta = { description = "Truly Open Source MongoDB alternative"; mainProgram = "ferretdb"; - changelog = "https://github.com/FerretDB/FerretDB/releases/tag/v${version}"; + changelog = "https://github.com/FerretDB/FerretDB/releases/tag/v${finalAttrs.version}"; homepage = "https://www.ferretdb.com/"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dit7ya noisersup julienmalka ]; }; -} +}) diff --git a/pkgs/by-name/fe/ferrishot/package.nix b/pkgs/by-name/fe/ferrishot/package.nix new file mode 100644 index 000000000000..ef4dfe09093d --- /dev/null +++ b/pkgs/by-name/fe/ferrishot/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + makeBinaryWrapper, + writableTmpDirAsHomeHook, + libGL, + libX11, + libxkbcommon, + libxcb, + wayland, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ferrishot"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "nik-rev"; + repo = "ferrishot"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QnIHLkxqL/4s6jgIbGmzR5tqCjH7yJcfpx0AhdxqVKc="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-TJWS8LzLTQSr+0uw0x38mNJrjYvMzr90URYI8UcRQqc="; + + nativeBuildInputs = + [ + makeBinaryWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # error: unable to open output file '/homeless-shelter/.cache/clang/ModuleCache/354UBE8EJRBZ3/Cocoa-31YYBL2V1XGQP.pcm': 'No such file or directory' + writableTmpDirAsHomeHook + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libxcb + ]; + + postInstall = + let + runtimeDeps = + [ + libGL + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libxkbcommon + wayland + ]; + in + '' + wrapProgram $out/bin/ferrishot \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Screenshot app written in Rust"; + homepage = "https://github.com/nik-rev/ferrishot"; + changelog = "https://github.com/nik-rev/ferrishot/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "ferrishot"; + }; +}) diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix new file mode 100644 index 000000000000..f2d56a9a7f35 --- /dev/null +++ b/pkgs/by-name/fe/ferron/package.nix @@ -0,0 +1,55 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + zstd, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ferron"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "ferronweb"; + repo = "ferron"; + tag = finalAttrs.version; + hash = "sha256-Ckz4+B4CxS2S+YbImdqkNGBONTMetxXxZb/J84dB4c0="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-ZK78ftnVb6k19Pv84HMeM5rGit/KxHJRG8JP8mrjCnY="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + zstd + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Fast, memory-safe web server written in Rust"; + homepage = "https://github.com/ferronweb/ferron"; + changelog = "https://github.com/ferronweb/ferron/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "ferron"; + }; +}) diff --git a/pkgs/by-name/fe/fetchit/package.nix b/pkgs/by-name/fe/fetchit/package.nix index 9269a39bce4a..9e77a9154615 100644 --- a/pkgs/by-name/fe/fetchit/package.nix +++ b/pkgs/by-name/fe/fetchit/package.nix @@ -80,7 +80,7 @@ buildGoModule rec { homepage = "https://fetchit.readthedocs.io"; changelog = "https://github.com/containers/fetchit/releases/tag/${src.rev}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index af2aac3602f2..1d7c20707fe1 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -1,32 +1,58 @@ { - fetchFromGitHub, lib, llvmPackages, + fetchFromGitHub, cmake, ninja, pkg-config, - gitMinimal, qt5, python3, + nix-update-script, + xxHash, + fmt, + nasm, }: -llvmPackages.stdenv.mkDerivation (finalAttrs: rec { +llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "fex"; - version = "2503"; + version = "2505"; src = fetchFromGitHub { owner = "FEX-Emu"; repo = "FEX"; - tag = "FEX-${version}"; - hash = "sha256-NnYod6DeRv3/6h8SGkGYtgC+RRuIafxoQm3j1Sqk0mU="; - fetchSubmodules = true; + tag = "FEX-${finalAttrs.version}"; + + hash = "sha256-H/BE+x/lwpED10UrbukWHiKJo0L75/KDV2T5q/J0NiM="; + + leaveDotGit = true; + postFetch = '' + cd $out + git reset + + # Only fetch required submodules + git submodule update --init --depth 1 \ + External/Vulkan-Headers \ + External/drm-headers \ + External/jemalloc \ + External/jemalloc_glibc \ + External/robin-map \ + External/vixl \ + Source/Common/cpp-optparse \ + External/Catch2 + + find . -name .git -print0 | xargs -0 rm -rf + + # Remove some more unnecessary directories + rm -r \ + External/vixl/src/aarch32 \ + External/vixl/test + ''; }; nativeBuildInputs = [ cmake ninja pkg-config - gitMinimal qt5.wrapQtAppsHook llvmPackages.bintools @@ -38,23 +64,42 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: rec { )) ]; - buildInputs = with qt5; [ - qtbase - qtdeclarative - qtquickcontrols - qtquickcontrols2 - ]; + nativeCheckInputs = [ nasm ]; + + buildInputs = + [ + xxHash + fmt + ] + ++ (with qt5; [ + qtbase + qtdeclarative + qtquickcontrols + qtquickcontrols2 + ]); cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DUSE_LINKER=lld" - "-DENABLE_LTO=True" - "-DENABLE_ASSERTIONS=False" + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") + (lib.cmakeFeature "USE_LINKER" "lld") + (lib.cmakeBool "ENABLE_LTO" true) + (lib.cmakeBool "ENABLE_ASSERTIONS" false) + (lib.cmakeFeature "OVERRIDE_VERSION" finalAttrs.version) (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; strictDeps = true; - doCheck = false; # broken on Apple silicon computers + + # Unsupported on non-4K page size kernels (e.g. Apple Silicon) + doCheck = true; + + # List not exhaustive, e.g. because they depend on an x86 compiler or some + # other difficult-to-build test binaries. + checkTarget = lib.concatStringsSep " " [ + "asm_tests" + "api_tests" + "fexcore_apitests" + "emitter_tests" + ]; # Avoid wrapping anything other than FEXConfig, since the wrapped executables # don't seem to work when registered as binfmts. @@ -63,9 +108,14 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: rec { wrapQtApp $out/bin/FEXConfig ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Fast usermode x86 and x86-64 emulator for Arm64 Linux"; homepage = "https://fex-emu.com/"; + changelog = "https://github.com/FEX-Emu/FEX/releases/tag/FEX-${finalAttrs.version}"; platforms = [ "aarch64-linux" ]; license = lib.licenses.mit; maintainers = with lib.maintainers; [ andre4ik3 ]; diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix index 81edec825164..dbcd7a4f2b72 100644 --- a/pkgs/by-name/ff/ffizer/package.nix +++ b/pkgs/by-name/ff/ffizer/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "ffizer"; - version = "2.13.1"; + version = "2.13.2"; buildFeatures = [ "cli" ]; @@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec { owner = "ffizer"; repo = "ffizer"; rev = version; - hash = "sha256-ZX6Zv6ioAO33Cc5WCVBgJWlOmNvbVgckMylRnphpOdw="; + hash = "sha256-GL1tdWOcbdybPayfShoGnxHsqYi8p+DZ6Eo/8bvWElE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JbCRD2P2jt2f+c2BUnb512p5ulein0guzgx4gj3SeVU="; + cargoHash = "sha256-5hsJ6eMiUPOqAzW1bdXTGTP5tY6VM2tTdySpkJl6pAY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ff/fflas-ffpack/package.nix b/pkgs/by-name/ff/fflas-ffpack/package.nix index 3b07162240d2..ca1f53c63f7a 100644 --- a/pkgs/by-name/ff/fflas-ffpack/package.nix +++ b/pkgs/by-name/ff/fflas-ffpack/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { description = "Finite Field Linear Algebra Subroutines"; mainProgram = "fflas-ffpack-config"; license = licenses.lgpl21Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; homepage = "https://linbox-team.github.io/fflas-ffpack/"; }; diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index e9821fa90db2..ef2bc6a7c4b6 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -6,10 +6,10 @@ let pname = "fflogs"; - version = "8.16.19"; + version = "8.17.13"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-qP/WpW1AYKrB0Cx/LpUlV1gw06mcFutxfGJybsAw1EQ="; + hash = "sha256-mCHycRks9HXWhHOA/LbhjPCRjEuyGklgBuvY7e+KXnc="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in @@ -32,7 +32,7 @@ appimageTools.wrapType2 { license = licenses.unfree; # no license listed mainProgram = "fflogs"; platforms = platforms.linux; - maintainers = with maintainers; [ sersorrel ]; + maintainers = with maintainers; [ keysmashes ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/by-name/ff/ffmpeg-normalize/package.nix b/pkgs/by-name/ff/ffmpeg-normalize/package.nix index bcfc78b66e9c..4ffaeca2b432 100644 --- a/pkgs/by-name/ff/ffmpeg-normalize/package.nix +++ b/pkgs/by-name/ff/ffmpeg-normalize/package.nix @@ -4,23 +4,31 @@ fetchPypi, ffmpeg, }: + python3Packages.buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.28.3"; + version = "1.31.3"; src = fetchPypi { - inherit pname version; - hash = "sha256-8wNPuVRQRQpFK6opgwqdKYMYmAFRqq8p/T5V9kC8QaY="; + inherit version; + pname = "ffmpeg_normalize"; + hash = "sha256-sewDSBUX6gCZSIHeRtpx5fQGtOKN8OWZKrtCF2bgI9Y="; }; - propagatedBuildInputs = [ - ffmpeg - python3Packages.ffmpeg-progress-yield - ]; - dependencies = with python3Packages; [ colorlog ]; + dependencies = + with python3Packages; + [ + colorlog + ffmpeg-progress-yield + ] + ++ [ ffmpeg ]; checkPhase = '' + runHook preCheck + $out/bin/ffmpeg-normalize --help > /dev/null + + runHook postCheck ''; meta = { diff --git a/pkgs/by-name/ff/ffsend/package.nix b/pkgs/by-name/ff/ffsend/package.nix new file mode 100644 index 000000000000..062fa92567a5 --- /dev/null +++ b/pkgs/by-name/ff/ffsend/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchpatch, + rustPlatform, + pkg-config, + openssl, + installShellFiles, + + x11Support ? stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isBSD, + xclip ? null, + xsel ? null, + preferXsel ? false, # if true and xsel is non-null, use it instead of xclip +}: + +let + usesX11 = stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isBSD; +in + +assert (x11Support && usesX11) -> xclip != null || xsel != null; + +rustPlatform.buildRustPackage rec { + pname = "ffsend"; + version = "0.2.76"; + + src = fetchFromGitLab { + owner = "timvisee"; + repo = "ffsend"; + rev = "v${version}"; + hash = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Gv70H3SLgiO7SWKYfCKzBhgAHxhjx3Gv7ZPLrGeQ+HY="; + + cargoPatches = [ + + # Update dependencies (needed for the below patch to merge cleanly) + (fetchpatch { + name = "Update-dependencies-1"; + url = "https://github.com/timvisee/ffsend/commit/afb004680b9ed672c7e87ff23f16bb2c51fea06e.patch"; + hash = "sha256-eDcbyi05aOq+muVWdLmlLzLXUKcrv/9Y0R+0aHgL4+s="; + }) + + # Disable unused features in prettytable-rs crate (needed for the below patch to merge cleanly) + (fetchpatch { + name = "Disable-unused-features"; + url = "https://github.com/timvisee/ffsend/commit/9b8dee12ea839f911ed207ff9602d929cab5d34b.patch"; + hash = "sha256-6LK1Fqov+zEbPZ4+B6JCLXtXmgSad9vr9YO2oYodBSM="; + }) + + # Update dependencies (needed for the below patch to merge cleanly) + (fetchpatch { + name = "Update-dependencies-2"; + url = "https://github.com/timvisee/ffsend/commit/fd5b38f9ab9cbc5f962d1024f4809eb36ba8986c.patch"; + hash = "sha256-BDZKrVtQHpOewmB2Lb6kUfy02swcNK+CYZ3lj3kwFV4="; + }) + + # Fix seg fault + (fetchpatch { + name = "Fix-segfault"; + url = "https://github.com/timvisee/ffsend/commit/3c1c2dc28ca1d88c45f87496a7a96052f5c37858.patch"; + hash = "sha256-2hWlFXDopNy26Df74nJoB1J8qzPEOpf61wEOEtxOVx8="; + }) + ]; + + nativeBuildInputs = [ + installShellFiles + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; + + preBuild = lib.optionalString (x11Support && usesX11) ( + if preferXsel && xsel != null then + '' + export XSEL_PATH="${xsel}/bin/xsel" + '' + else + '' + export XCLIP_PATH="${xclip}/bin/xclip" + '' + ); + + postInstall = '' + installShellCompletion contrib/completions/ffsend.{bash,fish} --zsh contrib/completions/_ffsend + ''; + # There's also .elv and .ps1 completion files but I don't know where to install those + + meta = with lib; { + description = "Easily and securely share files from the command line. A fully featured Firefox Send client"; + longDescription = '' + Easily and securely share files and directories from the command line through a safe, private + and encrypted link using a single simple command. Files are shared using the Send service and + may be up to 2GB. Others are able to download these files with this tool, or through their + web browser. + ''; + homepage = "https://gitlab.com/timvisee/ffsend"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ equirosa ]; + platforms = platforms.unix; + mainProgram = "ffsend"; + }; +} diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix index fdf791d6b3aa..5e7e1dea7679 100644 --- a/pkgs/by-name/ff/ffsubsync/package.nix +++ b/pkgs/by-name/ff/ffsubsync/package.nix @@ -1,33 +1,24 @@ { lib, - fetchFromGitHub, - fetchpatch, python3, + fetchFromGitHub, }: python3.pkgs.buildPythonApplication rec { pname = "ffsubsync"; - version = "0.4.25"; + version = "0.4.29"; pyproject = true; src = fetchFromGitHub { owner = "smacke"; repo = "ffsubsync"; tag = version; - hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc="; + hash = "sha256-XMFobdr/nzr5pXjz/jWa/Pp14ITdbxAce0Iz+5qcBO4="; }; - patches = [ - # updates for python 3.12 (not currently included in a release) - (fetchpatch { - url = "https://github.com/smacke/ffsubsync/commit/de75bdbfe846b3376f8c0bcfe2e5e5db82d7ff20.patch"; - hash = "sha256-JN7F9H9G8HK2aLOlm/Ec+GsWnU+65f1P658nq8FbAjo="; - }) - ]; + build-system = with python3.pkgs; [ setuptools ]; - nativeBuildInputs = with python3.pkgs; [ setuptools ]; - - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ auditok charset-normalizer faust-cchardet @@ -50,10 +41,10 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "ffsubsync" ]; - meta = with lib; { + meta = { homepage = "https://github.com/smacke/ffsubsync"; description = "Automagically synchronize subtitles with video"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "ffsubsync"; }; diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix index d8126f791aa7..1d0e0ae613b0 100644 --- a/pkgs/by-name/fh/fh/package.nix +++ b/pkgs/by-name/fh/fh/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, gcc, - libcxx, cacert, }: @@ -32,13 +30,11 @@ rustPlatform.buildRustPackage rec { checkInputs = [ cacert ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration gcc.cc.lib ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_COMPILE = "-I${lib.getDev libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"; }; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix index dbe215a34360..b7d9455064b4 100644 --- a/pkgs/by-name/fh/fheroes2/package.nix +++ b/pkgs/by-name/fh/fheroes2/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.6"; + version = "1.1.8"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-CowCP+gZuGSXWbALYBkmyn+RlDgOGho/Px34GutrBX0="; + hash = "sha256-Z6pepW2hHaDNkkMVxuekoNNibsuicyGLmA8Y9isy8Mo="; }; nativeBuildInputs = [ imagemagick ]; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { On linux, the data can be placed in ~/.local/share/fheroes2 folder. ''; license = licenses.gpl2Plus; - maintainers = [ maintainers.karolchmist ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/fi/fiddler-everywhere/package.nix b/pkgs/by-name/fi/fiddler-everywhere/package.nix index cee3021695df..b3546a6e6c37 100644 --- a/pkgs/by-name/fi/fiddler-everywhere/package.nix +++ b/pkgs/by-name/fi/fiddler-everywhere/package.nix @@ -8,11 +8,11 @@ let pname = "fiddler-everywhere"; - version = "6.3.0"; + version = "6.5.0"; src = fetchurl { url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage"; - hash = "sha256-AqwIzjnSq579cSgBbslPXINhXAtGvl8Z7nOWdHzCmro="; + hash = "sha256-XEmQeEXqQpVASJ5NJEhZZOkIPbSbj/DOUbfbdAJXSRk="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/fi/fider/frontend.nix b/pkgs/by-name/fi/fider/frontend.nix index 1361c3f5bee0..d979b0f8a481 100644 --- a/pkgs/by-name/fi/fider/frontend.nix +++ b/pkgs/by-name/fi/fider/frontend.nix @@ -1,6 +1,4 @@ { - lib, - esbuild, buildNpmPackage, pname, @@ -13,8 +11,6 @@ buildNpmPackage { inherit version src npmDepsHash; pname = "${pname}-frontend"; - nativeBuildInputs = [ esbuild ]; - buildPhase = '' runHook preBuild @@ -37,6 +33,5 @@ buildNpmPackage { env = { PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; - ESBUILD_BINARY_PATH = lib.getExe esbuild; }; } diff --git a/pkgs/by-name/fi/fider/package.nix b/pkgs/by-name/fi/fider/package.nix index 5efe096109fd..0c547b190bbb 100644 --- a/pkgs/by-name/fi/fider/package.nix +++ b/pkgs/by-name/fi/fider/package.nix @@ -3,21 +3,19 @@ stdenvNoCC, fetchFromGitHub, callPackage, - esbuild, - buildGoModule, nixosTests, nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fider"; - version = "0.24.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "getfider"; repo = "fider"; tag = "v${finalAttrs.version}"; - hash = "sha256-nzOplwsE0ppmxbTrNAgePnIQIAD/5Uu4gXlebFKWGfc="; + hash = "sha256-uABRIR/3D+//qYu/396qqVizP0kLmAA8auYd83rABhE="; }; dontConfigure = true; @@ -32,8 +30,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { # vendorHash = "..."; # npmDepsHash = "..."; # }) - vendorHash = "sha256-CfopU72fpXiTaBtdf9A57Wb+flDu2XEtTISxImeJLL0="; - npmDepsHash = "sha256-gnboT5WQzftOCZ2Ouuza7bqpxJf+Zs7OWC8OHMZNHvw="; + vendorHash = "sha256-4ilOdUblpwteY0ZInitSuzuB8mU1ltYgRJjla6LiziU="; + npmDepsHash = "sha256-c8CFMMmFcLZkJL50bfLlk2HP9B/rexNZ2WWJkV0x4Rk="; server = callPackage ./server.nix { inherit (finalAttrs) @@ -50,31 +48,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { src npmDepsHash ; - # We specify the esbuild override here instead of in frontend.nix so end users can - # again easily override it if necessary, for example when changing to an unreleased - # version of fider requiring a newer esbuild than specified here: - # pkgs.fider.overrideAttrs (prev: { - # frontend = prev.frontend.override { - # esbuild = ...; - # }; - # }) - esbuild = esbuild.override { - buildGoModule = - args: - buildGoModule ( - args - // rec { - version = "0.14.38"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - tag = "v${version}"; - hash = "sha256-rvMi1oC7qGidvi4zrm9KCMMntu6LJGVOGN6VmU2ivQE="; - }; - vendorHash = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; - } - ); - }; }; installPhase = '' diff --git a/pkgs/by-name/fi/fido2-manage/package.nix b/pkgs/by-name/fi/fido2-manage/package.nix index 633a148451e4..b6440098e92f 100644 --- a/pkgs/by-name/fi/fido2-manage/package.nix +++ b/pkgs/by-name/fi/fido2-manage/package.nix @@ -23,7 +23,6 @@ libuv, libsolv, libcouchbase, - darwin, }: let pythonEnv = python3.withPackages (ps: [ ps.tkinter ]); @@ -69,8 +68,6 @@ stdenv.mkDerivation rec { libuv libsolv libcouchbase - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.PCSC ]; cmakeFlags = [ "-USE_PCSC=ON" ]; diff --git a/pkgs/by-name/fi/figlet/package.nix b/pkgs/by-name/fi/figlet/package.nix index 5b13d3631fc1..edc900d718b1 100644 --- a/pkgs/by-name/fi/figlet/package.nix +++ b/pkgs/by-name/fi/figlet/package.nix @@ -5,15 +5,14 @@ fetchpatch, fetchzip, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "figlet"; version = "2.2.5"; # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ src = fetchurl { - url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz"; - sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; + url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-v4jED9Dwd9qycS9U+NOayVLk6fLhiC8Rlb6eXkJXQX0="; }; contributed = fetchzip { @@ -25,12 +24,12 @@ stdenv.mkDerivation rec { (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399"; name = "musl-fix-cplusplus-decls.patch"; - sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j"; + sha256 = "sha256-8tg/3rBnjFG2Q4W807+Z0NpTO7VZrontn6qm6fL7QJw="; }) (fetchpatch { url = "https://github.com/cmatsuoka/figlet/commit/9a50c1795bc32e5a698b855131ee87c8d7762c9e.patch"; name = "unistd-on-darwin.patch"; - sha256 = "hyfY87N+yuAwjsBIjpgvcdJ1IbzlR4A2yUJQSzShCRI="; + sha256 = "sha256-hyfY87N+yuAwjsBIjpgvcdJ1IbzlR4A2yUJQSzShCRI="; }) ]; @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { "LD:=$(CC)" ]; - postInstall = "cp -ar ${contributed}/* $out/share/figlet/"; + postInstall = "cp -ar ${finalAttrs.contributed}/* $out/share/figlet/"; doCheck = true; @@ -50,5 +49,6 @@ stdenv.mkDerivation rec { license = lib.licenses.afl21; maintainers = with lib.maintainers; [ ehmry ]; platforms = lib.platforms.unix; + mainProgram = "figlet"; }; -} +}) diff --git a/pkgs/by-name/fi/fiji/package.nix b/pkgs/by-name/fi/fiji/package.nix index dd2b5f67dccc..a0594e38dd4f 100644 --- a/pkgs/by-name/fi/fiji/package.nix +++ b/pkgs/by-name/fi/fiji/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "fiji"; - version = "20241114-1317"; + version = "20250408-1717"; src = fetchurl { url = "https://downloads.imagej.net/fiji/archive/${version}/fiji-nojre.zip"; - sha256 = "sha256-dNpscgZiiE2cuuo11YLs+mgoBRZ/MpUXDaAX3x+E/w8="; + sha256 = "sha256-bqVrTBKII58E7WSlQfRPE0Dxd4h/oJALFvIOdAAFZoI="; }; dontBuild = true; diff --git a/pkgs/by-name/fi/file-roller/package.nix b/pkgs/by-name/fi/file-roller/package.nix index 8797a2fc7142..92fadc299300 100644 --- a/pkgs/by-name/fi/file-roller/package.nix +++ b/pkgs/by-name/fi/file-roller/package.nix @@ -70,7 +70,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Archive manager for the GNOME desktop environment"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = teams.gnome.members ++ teams.pantheon.members; + teams = [ + teams.gnome + teams.pantheon + ]; mainProgram = "file-roller"; }; }) diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix index 815b88839817..ebbc5c69f9b6 100644 --- a/pkgs/by-name/fi/filebeat8/package.nix +++ b/pkgs/by-name/fi/filebeat8/package.nix @@ -8,16 +8,18 @@ buildGoModule rec { pname = "filebeat"; - version = "8.17.3"; + version = "8.18.0"; src = fetchFromGitHub { owner = "elastic"; repo = "beats"; tag = "v${version}"; - hash = "sha256-b0JDOA3yb/Pfcp9WQFvzE+k9DXDKg/hF4+iWGJ00doo="; + hash = "sha256-bVM4qHw/YZcJEykB7zZuS8SHmk3YluS2IJxuGExfm5Y="; }; - vendorHash = "sha256-p2Bm2MM85BFI/ePw+ZY90UgqeFKbozGvFvsjY6M82ts="; + proxyVendor = true; # darwin/linux hash mismatch + + vendorHash = "sha256-gRyKgg1kIKkk6iFw6NCwmwHwExj8zS3+r1V3uzFMIXA="; subPackages = [ "filebeat" ]; @@ -25,7 +27,7 @@ buildGoModule rec { versionCheckHook ]; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix index af275fdd7531..4ce239006d9b 100644 --- a/pkgs/by-name/fi/filebrowser/package.nix +++ b/pkgs/by-name/fi/filebrowser/package.nix @@ -1,45 +1,62 @@ { - buildGo123Module, - buildNpmPackage, - fetchFromGitHub, lib, + stdenv, + fetchFromGitHub, + buildGo123Module, + + nodejs_22, + pnpm_9, }: let - version = "2.31.0"; + version = "2.32.0"; + + pnpm = pnpm_9; + nodejs = nodejs_22; src = fetchFromGitHub { owner = "filebrowser"; repo = "filebrowser"; rev = "v${version}"; - hash = "sha256-zLM1fLrucIhzGdTTDu81ZnTIipK+iRnPhgfMiT1P+yg="; + hash = "sha256-jckwk45pIRrlzZaG3jH8aLq08L5xnrbt4OdwKNS6+nI="; }; - frontend = buildNpmPackage rec { + frontend = stdenv.mkDerivation (finalAttrs: { pname = "filebrowser-frontend"; inherit version src; - sourceRoot = "${src.name}/frontend"; + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; - npmDepsHash = "sha256-5/yEMWkNPAS8/PkaHlPBGFLiJu7xK2GHYo5dYqHAfCE="; + pnpmRoot = "frontend"; - NODE_OPTIONS = "--openssl-legacy-provider"; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + sourceRoot = "${src.name}/frontend"; + hash = "sha256-L3cKAp0vvLW5QPz6vYTtZwzuIN70EObU3SyJOlA0Ehc="; + }; installPhase = '' runHook preInstall + pnpm install -C frontend --frozen-lockfile + pnpm run -C frontend build + mkdir $out - mv dist $out + mv frontend/dist $out runHook postInstall ''; - }; + }); + in buildGo123Module { pname = "filebrowser"; inherit version src; - vendorHash = "sha256-N5aUs8rgTYXeb0qJhPQBCa6lUDkT6lH1bh+1u4bixos="; + vendorHash = "sha256-Jce90mvNzjElCtEMQSSU3IQPz+WLhyEol1ktW4FG7yk="; excludedPackages = [ "tools" ]; @@ -47,6 +64,10 @@ buildGo123Module { cp -r ${frontend}/dist frontend/ ''; + ldflags = [ + "-X github.com/filebrowser/filebrowser/v2/version.Version=v${version}" + ]; + passthru = { inherit frontend; }; diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix index a1bb0ec4263d..75908d67afa1 100644 --- a/pkgs/by-name/fi/filen-cli/package.nix +++ b/pkgs/by-name/fi/filen-cli/package.nix @@ -6,7 +6,6 @@ makeWrapper, nix-update-script, versionCheckHook, - darwin, libsecret, nodejs, perl, @@ -15,16 +14,16 @@ buildNpmPackage (finalAttrs: { pname = "filen-cli"; - version = "0.0.32"; + version = "0.0.34"; src = fetchFromGitHub { owner = "FilenCloudDienste"; repo = "filen-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-sSwRgtjBfmvZ8jEzMoiqGNSaxE+bRvx1udGf9g8EwfM="; + hash = "sha256-iISW9EAk8haWUCh9I8qHhrBKLqHeBUC8sWA0MnXqQSA="; }; - npmDepsHash = "sha256-RXA/kVvLrmrsxj6T6H2soTMYmC6VRWNjuQfefgVB/qY="; + npmDepsHash = "sha256-0DpiUjUFc0ThzP6/qrSEebKDq2fnr/CpcmtPFaIVHhU="; inherit nodejs; @@ -42,12 +41,7 @@ buildNpmPackage (finalAttrs: { ]; # for keytar - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ libsecret ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret ]; postPatch = '' # The version string is substituted during publishing: @@ -71,7 +65,7 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/filen"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; # Writes $HOME/Library/Application Support on darwin doInstallCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 114f38ce4453..cabeeb09702e 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.266"; + version = "2.14.8"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-96DSnobVyG50iS6NyCMpZ74KWEtkCyNdFyGXLwrSZxo="; + hash = "sha256-qiqxvRy0jHhxnCky+XizHaFGdJnsk5qdUjgaY2lVfko="; }; - vendorHash = "sha256-ilof8neXlw2Oa3OVceiRbXBkj5nfw+b6VMjMWhPgJqI="; + vendorHash = "sha256-58XHEcBZZR/nEu+6LX/ItB2JlI00Uz+htVluavFtNm0="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/files-to-prompt/package.nix b/pkgs/by-name/fi/files-to-prompt/package.nix index cf7a42893233..b671e52e9504 100644 --- a/pkgs/by-name/fi/files-to-prompt/package.nix +++ b/pkgs/by-name/fi/files-to-prompt/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Concatenate a directory full of files into a single prompt for use with LLMs"; diff --git a/pkgs/by-name/fi/fileshelter/package.nix b/pkgs/by-name/fi/fileshelter/package.nix index 093348d39de2..5b13c3d073b5 100644 --- a/pkgs/by-name/fi/fileshelter/package.nix +++ b/pkgs/by-name/fi/fileshelter/package.nix @@ -2,50 +2,57 @@ lib, stdenv, fetchFromGitHub, - autoreconfHook, + cmake, libzip, boost, - wt4, + wt, libconfig, pkg-config, + libarchive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fileshelter"; - version = "4.0.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "fileshelter"; - rev = "v${version}"; - sha256 = "07n70wwqj7lqdxs3wya1m8bwg8l6lgmmlfpwyv3r3s4dfzb1b3ka"; + tag = "v${finalAttrs.version}"; + hash = "sha256-21ANNJB7rbGAdlS7ELyGAEIjvK8biFlH27yVHrLKpwY="; }; + postPatch = '' + sed -i '1i #include ' src/fileshelter/ui/ShareCreateFormView.cpp + ''; + enableParallelBuilding = true; nativeBuildInputs = [ - autoreconfHook + cmake pkg-config ]; + buildInputs = [ libzip boost - wt4 + wt libconfig + libarchive ]; NIX_LDFLAGS = "-lpthread"; postInstall = '' - ln -s ${wt4}/share/Wt/resources $out/share/fileshelter/docroot/resources + ln -s ${wt}/share/Wt/resources $out/share/fileshelter/docroot/resources ''; - meta = with lib; { + meta = { homepage = "https://github.com/epoupon/fileshelter"; description = "FileShelter is a 'one-click' file sharing web application"; mainProgram = "fileshelter"; - maintainers = [ maintainers.willibutz ]; - license = licenses.gpl3; + maintainers = [ lib.maintainers.willibutz ]; + license = lib.licenses.gpl3; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/fi/filezilla/package.nix b/pkgs/by-name/fi/filezilla/package.nix new file mode 100644 index 000000000000..82906428ea9a --- /dev/null +++ b/pkgs/by-name/fi/filezilla/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchsvn, + autoreconfHook, + dbus, + gettext, + gnutls, + libfilezilla, + libidn, + nettle, + pkg-config, + pugixml, + sqlite, + tinyxml, + boost, + wrapGAppsHook3, + wxGTK32, + gtk3, + xdg-utils, +}: + +stdenv.mkDerivation { + pname = "filezilla"; + version = "3.68.1"; + + src = fetchsvn { + url = "https://svn.filezilla-project.org/svn/FileZilla3/trunk"; + rev = "11205"; + hash = "sha256-izaNfagJYUcPRPihZ1yXwLUTHunzVXuiMITW69KPSFE="; + }; + + configureFlags = [ + "--disable-manualupdatecheck" + "--disable-autoupdatecheck" + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + boost + dbus + gettext + gnutls + libfilezilla + libidn + nettle + pugixml + sqlite + tinyxml + wxGTK32 + gtk3 + xdg-utils + ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://filezilla-project.org/"; + description = "Graphical FTP, FTPS and SFTP client"; + longDescription = '' + FileZilla Client is a free, open source FTP client. It supports + FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available + under many platforms, binaries for Windows, Linux and macOS are + provided. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/by-name/fi/fim-rs/package.nix b/pkgs/by-name/fi/fim-rs/package.nix index 2ecb4b4142d1..1c43375c7f37 100644 --- a/pkgs/by-name/fi/fim-rs/package.nix +++ b/pkgs/by-name/fi/fim-rs/package.nix @@ -1,11 +1,9 @@ { lib, bzip2, - darwin, fetchFromGitHub, pkg-config, rustPlatform, - stdenv, zstd, }: @@ -32,17 +30,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/fi/fim/native-tools.patch b/pkgs/by-name/fi/fim/native-tools.patch new file mode 100644 index 000000000000..643e535dbd2c --- /dev/null +++ b/pkgs/by-name/fi/fim/native-tools.patch @@ -0,0 +1,26 @@ +diff --git a/doc/Makefile.in b/doc/Makefile.in +index be8ebe5..13ae676 100644 +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -684,7 +684,7 @@ fimgs.man.html: fimgs.man + if test ! -s $@ ; then $(MAN2TXT) ./$< > $<.txt && $(srcdir)/vim2html.pl tags $<.txt && mv $<.txt.html $@ ; fi + + doctags$(EXEEXT): doctags.c +- $(CC) -o $@ $< ++ @cc_for_build@ -o $@ $< + + #clean: + # $(RM) -f doctags.o doctags$(EXEEXT) FIM.html tags fim-stylesheet.css fim.man.html fimgs.man.html +diff --git a/src/Makefile.in b/src/Makefile.in +index 76f5e1e..027159c 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -1132,7 +1132,7 @@ help-acm.cpp: fim.h + $(ECHO) '//#endif' >> $@ + + b2ba$(EXEEXT): b2ba.c +- $(CC) -o $@ $< ++ @cc_for_build@ -o $@ $< + + @FIM_WANT_CUSTOM_HARDCODED_CONSOLEFONT_TRUE@@HAVE_RUNNABLE_TESTS_TRUE@default_font_byte_array.h: $(FIM_CUSTOM_HARDCODED_CONSOLEFONT) b2ba$(EXEEXT) + @FIM_WANT_CUSTOM_HARDCODED_CONSOLEFONT_TRUE@@HAVE_RUNNABLE_TESTS_TRUE@ ./b2ba$(EXEEXT) < $< > $@ diff --git a/pkgs/by-name/fi/fim/package.nix b/pkgs/by-name/fi/fim/package.nix index 8e8954f52d50..d31448da9c88 100644 --- a/pkgs/by-name/fi/fim/package.nix +++ b/pkgs/by-name/fi/fim/package.nix @@ -4,13 +4,17 @@ autoconf, automake, pkg-config, + replaceVars, lib, perl, flex, bison, readline, libexif, - x11Support ? true, + bash, + buildPackages, + # SDL depends on Qt, which doesn't cross-compile + x11Support ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform), SDL, svgSupport ? true, inkscape, @@ -35,24 +39,35 @@ stdenv.mkDerivation rec { sha256 = "sha256-/p7bjeZM46DJOQ9sgtebhkNpBPj2RJYY3dMXhzHnNmg="; }; + patches = [ + # build tools with a build compiler + (replaceVars ./native-tools.patch { + cc_for_build = lib.getExe buildPackages.stdenv.cc; + # patch context + FIM_WANT_CUSTOM_HARDCODED_CONSOLEFONT_TRUE = null; + HAVE_RUNNABLE_TESTS_TRUE = null; + }) + ]; + postPatch = '' - substituteInPlace doc/vim2html.pl \ - --replace /usr/bin/perl ${perl}/bin/perl + patchShebangs --build doc/vim2html.pl ''; nativeBuildInputs = [ autoconf automake + bison + flex + perl pkg-config ]; buildInputs = [ - perl flex - bison readline libexif + bash ] ++ lib.optional x11Support SDL ++ lib.optional svgSupport inkscape @@ -62,6 +77,15 @@ stdenv.mkDerivation rec { ++ lib.optional jpegSupport libjpeg ++ lib.optional pngSupport libpng; + configureFlags = [ + # mmap works on all relevant platforms + "ac_cv_func_mmap_fixed_mapped=yes" + # system regexp works on all relevant platforms + "fim_cv_regex_broken=no" + ]; + + env.LIBAA_CONFIG = lib.getExe' (lib.getDev aalib) "aalib-config"; + env.LIBPNG_CONFIG = lib.getExe' (lib.getDev libpng) "libpng-config"; env.NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-lSDL"; meta = with lib; { diff --git a/pkgs/by-name/fi/finalfrontier/package.nix b/pkgs/by-name/fi/finalfrontier/package.nix new file mode 100644 index 000000000000..ab17053cf6e2 --- /dev/null +++ b/pkgs/by-name/fi/finalfrontier/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, + pkg-config, + libiconv, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "finalfrontier"; + version = "unstable-2022-01-06"; + + src = fetchFromGitHub { + owner = "finalfusion"; + repo = pname; + rev = "2461fb1dde13b73039926aa66606e470907a1b59"; + sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-AQiXRKOXV7kXiu9GbtPE0Rddy93t1Y5tuJmww4xFSaU="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + postInstall = '' + installManPage man/*.1 + + # Install shell completions + for shell in bash fish zsh; do + $out/bin/finalfrontier completions $shell > finalfrontier.$shell + done + installShellCompletion finalfrontier.{bash,fish,zsh} + ''; + + meta = with lib; { + description = "Utility for training word and subword embeddings"; + mainProgram = "finalfrontier"; + homepage = "https://github.com/finalfusion/finalfrontier/"; + license = licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/by-name/fi/finalfusion-utils/package.nix b/pkgs/by-name/fi/finalfusion-utils/package.nix new file mode 100644 index 000000000000..82c0c8fa015f --- /dev/null +++ b/pkgs/by-name/fi/finalfusion-utils/package.nix @@ -0,0 +1,53 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + blas, + gfortran, + lapack, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "finalfusion-utils"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "finalfusion"; + repo = pname; + rev = version; + sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-X8ENEtjH1RHU2+VwtkHsyVYK37O8doMlLk94O2BGqy0="; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ + blas + gfortran.cc.lib + lapack + openssl + ]; + + # Enables build against a generic BLAS. + buildFeatures = [ "netlib" ]; + + postInstall = '' + # Install shell completions + for shell in bash fish zsh; do + $out/bin/finalfusion completions $shell > finalfusion.$shell + done + installShellCompletion finalfusion.{bash,fish,zsh} + ''; + + meta = with lib; { + description = "Utility for converting, quantizing, and querying word embeddings"; + homepage = "https://github.com/finalfusion/finalfusion-utils/"; + license = licenses.asl20; + maintainers = [ ]; + mainProgram = "finalfusion"; + }; +} diff --git a/pkgs/by-name/fi/finalmouse-udev-rules/package.nix b/pkgs/by-name/fi/finalmouse-udev-rules/package.nix new file mode 100644 index 000000000000..a2f1e176f87f --- /dev/null +++ b/pkgs/by-name/fi/finalmouse-udev-rules/package.nix @@ -0,0 +1,37 @@ +{ + fetchFromGitHub, + lib, + stdenv, +}: + +stdenv.mkDerivation { + pname = "finalmouse-udev-rules"; + version = "0-unstable-2025-05-05"; + + src = fetchFromGitHub { + owner = "teamfinalmouse"; + repo = "xpanel-linux-permissions"; + rev = "60c4ed794bd946e467559cc572cf25bb99bf04b6"; + hash = "sha256-E2xhm+8fFlxgIKjZlAvosLk/KgbmLk01BjK++y8laBc="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dpm644 $src/99-finalmouse.rules $out/lib/udev/rules.d/70-finalmouse.rules + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/teamfinalmouse/xpanel-linux-permissions"; + description = "udev rules that give NixOS permission to communicate with Finalmouse mice"; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + emilia + ]; + }; +} diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix index 02c93f920022..c0c2c69ddd9a 100644 --- a/pkgs/by-name/fi/finamp/package.nix +++ b/pkgs/by-name/fi/finamp/package.nix @@ -1,6 +1,7 @@ { lib, - flutter327, + stdenv, + flutter, mpv-unwrapped, patchelf, fetchFromGitHub, @@ -8,16 +9,16 @@ makeDesktopItem, }: let - version = "0.9.14-beta"; + version = "0.9.16-beta"; in -flutter327.buildFlutterApplication { +flutter.buildFlutterApplication { inherit version; pname = "finamp"; src = fetchFromGitHub { owner = "jmshrv"; repo = "finamp"; rev = version; - hash = "sha256-SDzKB5KLHkJ3xcJY67TNBXDiDlBOApKrh4x0OZR/K/M="; + hash = "sha256-AmxQyDV0AiS2qzAsrgBm0SqH0CaLi3W1A3gcsk65dj0="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -29,7 +30,7 @@ flutter327.buildFlutterApplication { gitHashes = { balanced_text = "sha256-lSDR5dDjZ4garRbBPI+wSxC5iScg8wVSD5kymmLbYbk="; - isar_generator = "sha256-lWnHmZmYx7qDG6mzyDqYt+Xude2xVOH1VW+BoDCas60="; + isar_generator = "sha256-EthUFM+YI3bnM0U0sECoNOCRXpo4qjP71VXYBuO/u+I="; media_kit_libs_windows_audio = "sha256-p3hRq79whLFJLNUgL9atXyTGvOIqCbTRKVk1ie0Euqs="; palette_generator = "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0="; split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k="; @@ -42,12 +43,13 @@ flutter327.buildFlutterApplication { ''; postInstall = '' - install -Dm644 $src/assets/icon/icon_foreground.svg $out/share/icons/hicolor/scalable/apps/finamp.svg + install -Dm444 assets/icon/icon_foreground.svg $out/share/icons/hicolor/scalable/apps/finamp.svg + install -Dm444 assets/com.unicornsonlsd.finamp.metainfo.xml -t $out/share/metainfo ''; desktopItems = [ (makeDesktopItem { - name = "Finamp"; + name = "com.unicornsonlsd.finamp"; desktopName = "Finamp"; genericName = "Music Player"; exec = "finamp"; @@ -64,6 +66,8 @@ flutter327.buildFlutterApplication { ]; meta = { + # Finamp depends on `ìsar`, which for Linux is only compiled for x86_64. https://github.com/jmshrv/finamp/issues/766 + broken = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64; description = "Open source Jellyfin music player"; homepage = "https://github.com/jmshrv/finamp"; license = lib.licenses.mpl20; diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json index 824acc28dd8d..c27f4bd1ca58 100644 --- a/pkgs/by-name/fi/finamp/pubspec.lock.json +++ b/pkgs/by-name/fi/finamp/pubspec.lock.json @@ -4,37 +4,31 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", + "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57", "url": "https://pub.dev" }, "source": "hosted", - "version": "76.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.3" + "version": "80.0.0" }, "analyzer": { - "dependency": "direct overridden", + "dependency": "direct main", "description": { "name": "analyzer", - "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", + "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.11.0" + "version": "7.3.0" }, "analyzer_plugin": { "dependency": "transitive", "description": { "name": "analyzer_plugin", - "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161", + "sha256": "b3075265c5ab222f8b3188342dcb50b476286394a40323e85d1fa725035d40a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.11.3" + "version": "0.13.0" }, "app_set_id": { "dependency": "direct main", @@ -50,31 +44,31 @@ "dependency": "transitive", "description": { "name": "archive", - "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a", + "sha256": "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.5" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "audio_service": { "dependency": "direct main", @@ -90,11 +84,11 @@ "dependency": "direct main", "description": { "name": "audio_service_mpris", - "sha256": "b16db3584a4b2464c0bfd575c1a21765723d257931222f8adfcb0511f940d352", + "sha256": "fdab1ae1f659c6db36d5cc396e46e4ee9663caefa6153f8453fcd01d57567c08", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.5" + "version": "0.2.0" }, "audio_service_platform_interface": { "dependency": "direct main", @@ -140,11 +134,11 @@ "dependency": "direct main", "description": { "name": "background_downloader", - "sha256": "ed64a215cd24c83a478f602364a3ca86a6dafd178ad783188cc32c6956d5e529", + "sha256": "c3814aa0466368a4c1c32d24bc73ded752edacf06731ead43857a3ac992ed52d", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.4" + "version": "8.9.5" }, "balanced_text": { "dependency": "direct main", @@ -181,14 +175,14 @@ "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "build": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "build", "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", @@ -271,21 +265,21 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.3" + "version": "8.9.5" }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "checked_yaml": { "dependency": "transitive", @@ -351,11 +345,11 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", @@ -371,11 +365,11 @@ "dependency": "direct main", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "color": { "dependency": "transitive", @@ -387,6 +381,26 @@ "source": "hosted", "version": "3.0.0" }, + "connectivity_plus": { + "dependency": "direct main", + "description": { + "name": "connectivity_plus", + "sha256": "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.3" + }, + "connectivity_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus_platform_interface", + "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, "console": { "dependency": "transitive", "description": { @@ -431,31 +445,31 @@ "dependency": "direct dev", "description": { "name": "custom_lint", - "sha256": "3486c470bb93313a9417f926c7dd694a2e349220992d7b9d14534dc49c15bba9", + "sha256": "409c485fd14f544af1da965d5a0d160ee57cd58b63eeaa7280a4f28cf5bda7f1", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.5" }, "custom_lint_builder": { "dependency": "transitive", "description": { "name": "custom_lint_builder", - "sha256": "42cdc41994eeeddab0d7a722c7093ec52bd0761921eeb2cbdbf33d192a234759", + "sha256": "107e0a43606138015777590ee8ce32f26ba7415c25b722ff0908a6f5d7a4c228", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.5" }, "custom_lint_core": { "dependency": "transitive", "description": { "name": "custom_lint_core", - "sha256": "02450c3e45e2a6e8b26c4d16687596ab3c4644dd5792e3313aa9ceba5a49b7f5", + "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.5" }, "custom_lint_visitor": { "dependency": "transitive", @@ -471,11 +485,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", + "sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.8" + "version": "3.0.1" }, "dartx": { "dependency": "transitive", @@ -501,11 +515,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da", + "sha256": "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.0" + "version": "11.3.3" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -541,21 +555,21 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "transitive", @@ -571,11 +585,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "3d57312a53746ed4eb8c843dc50372454bbda37dd0c01a4d40fedc83e2ce4921", + "sha256": "09b474c0c8117484b80cbebc043801ff91e05cfbd2874d512825c899e1754694", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.5" + "version": "9.2.3" }, "file_sizes": { "dependency": "direct main", @@ -627,21 +641,21 @@ "dependency": "transitive", "description": { "name": "flutter_gen_core", - "sha256": "53890b653738f34363d9f0d40f82104c261716bd551d3ba65f648770b6764c21", + "sha256": "3eaa2d3d8be58267ac4cd5e215ac965dd23cae0410dc073de2e82e227be32bfc", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.0" + "version": "5.10.0" }, "flutter_gen_runner": { "dependency": "direct dev", "description": { "name": "flutter_gen_runner", - "sha256": "de70b42eb5329f712c8b041069d081ad5fb5109f32d6d1ea9c1b39596786215d", + "sha256": "e74b4ead01df3e8f02e73a26ca856759dbbe8cb3fd60941ba9f4005cd0cd19c9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.0" + "version": "5.10.0" }, "flutter_launcher_icons": { "dependency": "direct dev", @@ -673,11 +687,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", + "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.24" + "version": "2.0.27" }, "flutter_riverpod": { "dependency": "direct main", @@ -755,16 +769,6 @@ "source": "hosted", "version": "2.0.5" }, - "flutter_vibrate": { - "dependency": "direct main", - "description": { - "name": "flutter_vibrate", - "sha256": "9cc9b32cf52c90dd34c1cf396ed40010b2c74e69adbb0ff16005afa900971ad8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.0" - }, "flutter_web_plugins": { "dependency": "transitive", "description": "flutter", @@ -785,11 +789,11 @@ "dependency": "transitive", "description": { "name": "freezed_annotation", - "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "sha256": "c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "3.0.0" }, "frontend_server_client": { "dependency": "transitive", @@ -801,6 +805,16 @@ "source": "hosted", "version": "4.0.0" }, + "gaimon": { + "dependency": "direct main", + "description": { + "name": "gaimon", + "sha256": "4194b979dc84b2c5135dba261a0a1f810e4dff25a87bcb53cca53fb585438307", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, "get_it": { "dependency": "direct main", "description": { @@ -841,35 +855,35 @@ "source": "hosted", "version": "2.0.0" }, - "hive": { + "hive_ce": { "dependency": "direct main", "description": { - "name": "hive", - "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "name": "hive_ce", + "sha256": "ac66daee46ad46486a1ed12cf91e9d7479c875fb46889be8d2c96b557406647f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.3" + "version": "2.10.1" }, - "hive_flutter": { + "hive_ce_flutter": { "dependency": "direct main", "description": { - "name": "hive_flutter", - "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc", + "name": "hive_ce_flutter", + "sha256": "74c1d5f10d803446b4e7913bb272137e2724ba8a56465444f9e7713aeb60a877", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "2.2.0" }, - "hive_generator": { + "hive_ce_generator": { "dependency": "direct dev", "description": { - "name": "hive_generator", - "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4", + "name": "hive_ce_generator", + "sha256": "0b1c750e2d10c55a14cde16d479ada42704be6cef43c54b728ed0e4e02f7d808", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "1.8.2" }, "hotreloader": { "dependency": "transitive", @@ -915,11 +929,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.4" }, "image_size_getter": { "dependency": "transitive", @@ -984,12 +998,13 @@ "isar_generator": { "dependency": "direct dev", "description": { - "name": "isar_generator", - "sha256": "76c121e1295a30423604f2f819bc255bc79f852f3bc8743a24017df6068ad133", - "url": "https://pub.dev" + "path": "packages/isar_generator", + "ref": "ad574f60ed6f39d2995cd16fc7dc3de9a646ef30", + "resolved-ref": "ad574f60ed6f39d2995cd16fc7dc3de9a646ef30", + "url": "https://github.com/callumw-k/isar.git" }, - "source": "hosted", - "version": "3.1.0+1" + "source": "git", + "version": "3.1.8" }, "js": { "dependency": "transitive", @@ -1015,11 +1030,11 @@ "dependency": "direct dev", "description": { "name": "json_serializable", - "sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c", + "sha256": "81f04dee10969f89f604e1249382d46b97a1ccad53872875369622b5bfc9e58a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.9.0" + "version": "6.9.4" }, "just_audio": { "dependency": "direct main", @@ -1045,41 +1060,41 @@ "dependency": "transitive", "description": { "name": "just_audio_platform_interface", - "sha256": "271b93b484c6f494ecd72a107fffbdb26b425f170c665b9777a0a24a726f2f24", + "sha256": "4cd94536af0219fa306205a58e78d67e02b0555283c1c094ee41e402a14a5c4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.4.0" + "version": "4.5.0" }, "just_audio_web": { "dependency": "transitive", "description": { "name": "just_audio_web", - "sha256": "58915be64509a7683c44bf11cd1a23c15a48de104927bee116e3c63c8eeea0d4", + "sha256": "8c7e779892e180cbc9ffb5a3c52f6e90e1cbbf4a63694cc450972a7edbd2bb6d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.14" + "version": "0.4.15" }, "leak_tracker": { "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -1121,16 +1136,6 @@ "source": "hosted", "version": "1.3.0" }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.3-main.0" - }, "marquee": { "dependency": "direct main", "description": { @@ -1145,11 +1150,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -1165,21 +1170,21 @@ "dependency": "transitive", "description": { "name": "media_kit", - "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62", + "sha256": "48c10c3785df5d88f0eef970743f8c99b2e5da2b34b9d8f9876e598f62d9e776", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11" + "version": "1.2.0" }, "media_kit_libs_linux": { "dependency": "direct main", "description": { "name": "media_kit_libs_linux", - "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "sha256": "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.2.1" }, "media_kit_libs_windows_audio": { "dependency": "direct main", @@ -1193,14 +1198,14 @@ "version": "1.0.9" }, "meta": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", @@ -1232,6 +1237,16 @@ "source": "hosted", "version": "1.0.0" }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, "octo_image": { "dependency": "direct main", "description": { @@ -1246,31 +1261,31 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "67eae327b1b0faf761964a1d2e5d323c797f3799db0e85aa232db8d9e922bc35", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.2.1" + "version": "8.3.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "205ec83335c2ab9107bbba3f8997f9356d72ca3c715d2f038fc773d0366b4c76", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.2.0" }, "palette_generator": { "dependency": "direct main", @@ -1287,11 +1302,11 @@ "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_parsing": { "dependency": "transitive", @@ -1317,11 +1332,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.16" }, "path_provider_foundation": { "dependency": "transitive", @@ -1367,31 +1382,31 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.1" + "version": "11.4.0" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.13" + "version": "12.1.0" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "sha256": "f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.5" + "version": "9.4.6" }, "permission_handler_html": { "dependency": "transitive", @@ -1407,11 +1422,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.3.0" }, "permission_handler_windows": { "dependency": "transitive", @@ -1427,11 +1442,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "platform": { "dependency": "transitive", @@ -1473,25 +1488,35 @@ "source": "hosted", "version": "6.0.1" }, + "progress_border": { + "dependency": "direct main", + "description": { + "name": "progress_border", + "sha256": "f47c2b951c29f04d7a2232d9f72210874df893ea45c7bd313076291d8c4d8a57", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.5" + }, "provider": { "dependency": "direct main", "description": { "name": "provider", - "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.1.4" }, "pub_semver": { "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", @@ -1507,11 +1532,11 @@ "dependency": "transitive", "description": { "name": "qs_dart", - "sha256": "98a068f7224fe17b68028dbbd43dd48a6049d2de2175f50b2fad2e08f2811f0e", + "sha256": "c775dbe663cd59365050220b3499dee259b72ad6b352a3e087a15bd77e161b74", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.3.3+1" }, "recursive_regex": { "dependency": "transitive", @@ -1537,11 +1562,11 @@ "dependency": "transitive", "description": { "name": "riverpod_analyzer_utils", - "sha256": "c6b8222b2b483cb87ae77ad147d6408f400c64f060df7a225b127f4afef4f8c8", + "sha256": "03a17170088c63aab6c54c44456f5ab78876a1ddb6032ffde1662ddab4959611", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.8" + "version": "0.5.10" }, "riverpod_annotation": { "dependency": "direct main", @@ -1557,21 +1582,21 @@ "dependency": "direct dev", "description": { "name": "riverpod_generator", - "sha256": "63546d70952015f0981361636bf8f356d9cfd9d7f6f0815e3c07789a41233188", + "sha256": "44a0992d54473eb199ede00e2260bd3c262a86560e3c6f6374503d86d0580e36", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.3" + "version": "2.6.5" }, "riverpod_lint": { "dependency": "direct dev", "description": { "name": "riverpod_lint", - "sha256": "83e4caa337a9840469b7b9bd8c2351ce85abad80f570d84146911b32086fbd99", + "sha256": "89a52b7334210dbff8605c3edf26cfe69b15062beed5cbfeff2c3812c33c9e35", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.3" + "version": "2.6.5" }, "rxdart": { "dependency": "direct main", @@ -1587,11 +1612,11 @@ "dependency": "transitive", "description": { "name": "safe_local_storage", - "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", + "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.2" + "version": "2.0.1" }, "screen_retriever": { "dependency": "transitive", @@ -1730,14 +1755,14 @@ "version": "1.0.0" }, "source_gen": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "source_gen", - "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "2.0.0" }, "source_helper": { "dependency": "transitive", @@ -1753,11 +1778,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "split_view": { "dependency": "direct main", @@ -1784,41 +1809,41 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", + "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "sqflite_android": { "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", + "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4+6" + "version": "2.5.5" }, "sqflite_darwin": { "dependency": "transitive", "description": { "name": "sqflite_darwin", - "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c", + "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1+1" + "version": "2.4.2" }, "sqflite_platform_interface": { "dependency": "transitive", @@ -1834,11 +1859,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "state_notifier": { "dependency": "transitive", @@ -1854,11 +1879,11 @@ "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", @@ -1874,41 +1899,41 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "synchronized": { "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.3.1" }, "term_glyph": { "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "time": { "dependency": "transitive", @@ -1974,11 +1999,11 @@ "dependency": "transitive", "description": { "name": "uri_parser", - "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835", + "sha256": "ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.2" + "version": "3.0.0" }, "url_launcher": { "dependency": "direct main", @@ -1994,21 +2019,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.15" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.2" + "version": "6.3.3" }, "url_launcher_linux": { "dependency": "transitive", @@ -2121,7 +2146,7 @@ "version": "2.1.4" }, "visibility_detector": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "visibility_detector", "sha256": "dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420", @@ -2134,21 +2159,21 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "wakelock_plus": { "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.10" + "version": "1.2.11" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -2184,11 +2209,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", @@ -2201,7 +2226,7 @@ "version": "0.1.6" }, "web_socket_channel": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "web_socket_channel", "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", @@ -2214,21 +2239,21 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.10.1" + "version": "5.12.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.5" + "version": "2.1.0" }, "window_manager": { "dependency": "direct main", @@ -2279,10 +2304,20 @@ }, "source": "hosted", "version": "3.1.3" + }, + "yaml_writer": { + "dependency": "transitive", + "description": { + "name": "yaml_writer", + "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" } }, "sdks": { - "dart": ">=3.6.0 <4.0.0", + "dart": ">=3.7.0 <4.0.0", "flutter": ">=3.27.0" } } diff --git a/pkgs/by-name/fi/find-billy/package.nix b/pkgs/by-name/fi/find-billy/package.nix index ec9fda78e7d2..1215ae3958fe 100644 --- a/pkgs/by-name/fi/find-billy/package.nix +++ b/pkgs/by-name/fi/find-billy/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "find-billy"; - version = "1.0.13"; + version = "1.1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "annaaurora"; repo = "Find-Billy"; rev = "v${version}"; - hash = "sha256-VpQpAODasJpHLU1UQ3NoVnrO+tvwdMNpPDNkg/NDM+4="; + hash = "sha256-jKN3lEnLy0aN98S8BN3dcoOgc0RrxNoqfQdeCawKQaU="; }; strictDeps = true; diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix index 344844b98588..7df036a80722 100644 --- a/pkgs/by-name/fi/findomain/package.nix +++ b/pkgs/by-name/fi/findomain/package.nix @@ -5,8 +5,6 @@ installShellFiles, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,13 +26,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix index baa0248200ed..1be7ec2b1a05 100644 --- a/pkgs/by-name/fi/findup/package.nix +++ b/pkgs/by-name/fi/findup/package.nix @@ -3,11 +3,8 @@ stdenv, fetchFromGitHub, testers, - zig_0_11, + zig, }: -let - zig = zig_0_11; -in stdenv.mkDerivation (finalAttrs: { pname = "findup"; version = "1.1.2"; @@ -24,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { + # Doesn't support zig 0.12 or newer, last commit was 2 years ago. + broken = lib.versionAtLeast zig.version "0.12"; homepage = "https://github.com/booniepepper/findup"; description = "Search parent directories for sentinel files"; license = lib.licenses.mit; diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 277a0b6a6de1..b75b27de2dc4 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -7,18 +7,19 @@ xcbuild, nix-update-script, }: + buildNpmPackage rec { pname = "firebase-tools"; - version = "13.35.1"; + version = "14.4.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-66VG82o+gg+Vt4QR/RkaM6aOv8i3lQ7bUmeqGqj1JGs="; + hash = "sha256-mcb0rCI7tJE6A/CK4rGUJ2qqvjrld0Yzl9l4mMipCoA="; }; - npmDepsHash = "sha256-/UuQ1bwEFDPahxUgqrxY/xIcHQ+KKxnc2QUMOW+GwHE="; + npmDepsHash = "sha256-Ezjn5oVjvVJnfw0oBTxNbmfmgHYBDixdiIJHft9FbQE="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json @@ -32,9 +33,7 @@ buildNpmPackage rec { xcbuild ]; - env = { - PUPPETEER_SKIP_DOWNLOAD = true; - }; + env.PUPPETEER_SKIP_DOWNLOAD = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix index 30016c7bc11f..eb2423910fec 100644 --- a/pkgs/by-name/fi/firecracker/package.nix +++ b/pkgs/by-name/fi/firecracker/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "firecracker"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "firecracker-microvm"; repo = "firecracker"; rev = "v${version}"; - hash = "sha256-Iqhj4BteFTBhhgQmyJVNdRHrXd/kaMRbOJ3eRKilYpw="; + hash = "sha256-joypOLe/cagPT+sNd9LEY5ueCPYjK47/RzNZBOZBbHQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-G6PtJb0Qh7TOq5PcfoYvkY4LEwRj63RbDdxYbzqVxkc="; + cargoHash = "sha256-/ko1WjJ2Z7B00hcTfqNiOqWj0QmDNDroT9HoaySoeYU="; # For aws-lc-sys@0.22.0: use external bindgen. AWS_LC_SYS_EXTERNAL_BINDGEN = "true"; diff --git a/pkgs/by-name/fi/firefox-sync-client/package.nix b/pkgs/by-name/fi/firefox-sync-client/package.nix index a82b8adf701c..74726da8847f 100644 --- a/pkgs/by-name/fi/firefox-sync-client/package.nix +++ b/pkgs/by-name/fi/firefox-sync-client/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "firefox-sync-client"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "Mikescher"; repo = "firefox-sync-client"; rev = "v${version}"; - hash = "sha256-Ax+v4a8bVuym1bp9dliXX85PXJk2Qlik3ME+adGiL1s="; + hash = "sha256-tzYuYSifV/a9SPb5KyabhQ29ByXuAgQgi3t0VMHVSH8="; }; - vendorHash = "sha256-MYetPdnnvIBzrYrA+eM9z1P3+P5FumYKH+brvvlwkm4="; + vendorHash = "sha256-kDh/5SOwKPYl9sC9W17bnzG73fGI5iX6lSjcB3IjOss="; meta = { description = "Commandline-utility to list/view/edit/delete entries in a firefox-sync account."; diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index 5e1818a36630..42a9d2ea1446 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -28,25 +28,25 @@ rustPlatform.buildRustPackage rec { pname = "firefoxpwa"; - version = "2.13.3"; + version = "2.14.1"; src = fetchFromGitHub { owner = "filips123"; repo = "PWAsForFirefox"; rev = "v${version}"; - hash = "sha256-u6zKB5+P/f3qM5Sqmhk2ts1AhgRN8Oq877uKQuJ6Uao="; + hash = "sha256-yYvQxz+lAxKXpAWeLiBnepGuwYfNLyIhu4vQ8NdH3pc="; }; sourceRoot = "${src.name}/native"; buildFeatures = [ "immutable-runtime" ]; useFetchCargoVendor = true; - cargoHash = "sha256-23XTb+gAN0D67llZj8Er43cFfhLSdEA6X6V6Ds1rvV8="; + cargoHash = "sha256-elVthXdjlI9DSQgaIRzu3M72dgGNXGgMiUXEICaBJCQ="; preConfigure = '' sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml sed -zi 's;name = "firefoxpwa"\nversion = "0.0.0";name = "firefoxpwa"\nversion = "${version}";' Cargo.lock - sed -i $'s;DISTRIBUTION_VERSION = \'0.0.0\';DISTRIBUTION_VERSION = \'${version}\';' userchrome/profile/chrome/pwa/chrome.jsm + sed -i $'s;DISTRIBUTION_VERSION = \'0.0.0\';DISTRIBUTION_VERSION = \'${version}\';' userchrome/profile/chrome/pwa/chrome.sys.mjs ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/fi/firewalld/add-config-path-env-var.patch b/pkgs/by-name/fi/firewalld/add-config-path-env-var.patch new file mode 100644 index 000000000000..bba877e5593a --- /dev/null +++ b/pkgs/by-name/fi/firewalld/add-config-path-env-var.patch @@ -0,0 +1,12 @@ +--- a/src/firewall/config/__init__.py.in ++++ b/src/firewall/config/__init__.py.in +@@ -80,7 +80,8 @@ + FIREWALLD_POLICIES = path + "/policies" + + +-set_default_config_paths("/usr/lib/firewalld") ++import os ++set_default_config_paths(os.environ.get("NIX_FIREWALLD_CONFIG_PATH", "/usr/lib/firewalld")) + + FIREWALLD_LOGFILE = "/var/log/firewalld" + diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix index 5fe266ea17e3..7772c2c0fa71 100644 --- a/pkgs/by-name/fi/firewalld/package.nix +++ b/pkgs/by-name/fi/firewalld/package.nix @@ -2,20 +2,28 @@ lib, stdenv, fetchFromGitHub, - autoreconfHook, - bash, + autoconf, + automake, docbook_xml_dtd_42, docbook-xsl-nons, glib, gobject-introspection, gtk3, intltool, + ipset, + iptables, + kdePackages, + kmod, libnotify, + librsvg, libxml2, libxslt, + networkmanager, networkmanagerapplet, pkg-config, python3, + qt6, + sysctl, wrapGAppsNoGuiHook, withGui ? false, }: @@ -30,8 +38,7 @@ let pygobject3 ] ++ lib.optionals withGui [ - pyqt5 - pyqt5-sip + pyqt6 ] ); in @@ -47,27 +54,32 @@ stdenv.mkDerivation rec { }; patches = [ + ./add-config-path-env-var.patch ./respect-xml-catalog-files-var.patch + ./specify-localedir.patch ]; postPatch = '' - substituteInPlace src/firewall/config/__init__.py.in \ - --replace "/usr/share" "$out/share" + substituteInPlace config/xmlschema/check.sh \ + --replace-fail /usr/bin/ "" - for file in config/firewall-{applet,config}.desktop.in; do - substituteInPlace $file \ - --replace "/usr/bin/" "$out/bin/" + for file in src/{firewall-offline-cmd.in,firewall/config/__init__.py.in} \ + config/firewall-{applet,config}.desktop.in; do + substituteInPlace $file \ + --replace-fail /usr "$out" done '' + lib.optionalString withGui '' substituteInPlace src/firewall-applet.in \ - --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor" + --replace-fail "/usr/bin/systemsettings" "${kdePackages.systemsettings}/bin/systemsettings" \ + --replace-fail "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor" ''; nativeBuildInputs = [ - autoreconfHook + autoconf + automake docbook_xml_dtd_42 docbook-xsl-nons glib @@ -77,40 +89,79 @@ stdenv.mkDerivation rec { pkg-config python3 python3.pkgs.wrapPython + wrapGAppsNoGuiHook ] ++ lib.optionals withGui [ - gobject-introspection - wrapGAppsNoGuiHook + qt6.wrapQtAppsHook ]; buildInputs = [ - bash glib + gobject-introspection + ipset + iptables + kmod + networkmanager + pythonPath + sysctl ] ++ lib.optionals withGui [ gtk3 libnotify - pythonPath + librsvg + qt6.qtbase ]; - dontWrapGApps = true; - - preFixup = lib.optionalString withGui '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + preConfigure = '' + ./autogen.sh ''; + ac_cv_path_MODPROBE = lib.getExe' kmod "modprobe"; + ac_cv_path_RMMOD = lib.getExe' kmod "rmmod"; + ac_cv_path_SYSCTL = lib.getExe' sysctl "sysctl"; + + configureFlags = [ + "--with-iptables=${lib.getExe' iptables "iptables"}" + "--with-iptables-restore=${lib.getExe' iptables "iptables-restore"}" + "--with-ip6tables=${lib.getExe' iptables "ip6tables"}" + "--with-ip6tables-restore=${lib.getExe' iptables "ip6tables-restore"}" + "--with-ebtables=${lib.getExe' iptables "ebtables"}" + "--with-ebtables-restore=${lib.getExe' iptables "ebtables-restore"}" + "--with-ipset=${lib.getExe' ipset "ipset"}" + ]; + + postInstall = + '' + rm -r $out/share/firewalld/testsuite + '' + + lib.optionalString (!withGui) '' + rm $out/bin/firewall-{applet,config} + ''; + + dontWrapGApps = true; + dontWrapQtApps = true; + + preFixup = + '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + '' + + lib.optionalString withGui '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + postFixup = '' - chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite - patchShebangs --host $out/share/firewalld/testsuite/{,integration/}testsuite $out/share/firewalld/*.py + chmod +x $out/share/firewalld/*.py + patchShebangs --host $out/share/firewalld/*.py wrapPythonProgramsIn "$out/bin" "$out ${pythonPath}" - wrapPythonProgramsIn "$out/share/firewalld/testsuite/python" "$out ${pythonPath}" ''; - meta = with lib; { + meta = { description = "Firewall daemon with D-Bus interface"; - homepage = "https://github.com/firewalld/firewalld"; - license = licenses.gpl2Plus; - maintainers = [ ]; + homepage = "https://firewalld.org"; + downloadPage = "https://github.com/firewalld/firewalld/releases"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ prince213 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/fi/firewalld/specify-localedir.patch b/pkgs/by-name/fi/firewalld/specify-localedir.patch new file mode 100644 index 000000000000..57e79da4d0b1 --- /dev/null +++ b/pkgs/by-name/fi/firewalld/specify-localedir.patch @@ -0,0 +1,12 @@ +--- a/src/firewall/config/__init__.py.in ++++ b/src/firewall/config/__init__.py.in +@@ -19,6 +19,9 @@ + DOMAIN = "firewalld" + import gettext + ++locale.bindtextdomain(DOMAIN, "/usr/share/locale") ++gettext.bindtextdomain(DOMAIN, "/usr/share/locale") ++ + gettext.install(domain=DOMAIN) + + from . import dbus # noqa: F401 diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix index 0e6010b3b92d..96b5dd217dd7 100644 --- a/pkgs/by-name/fi/firezone-gateway/package.nix +++ b/pkgs/by-name/fi/firezone-gateway/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "firezone-gateway"; - version = "1.4.5"; + version = "1.4.9"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "gateway-${version}"; - hash = "sha256-2MDQyMCQIqV1Kbem53jnE8DGUZ6SrZqp2LpGJXvLBgA="; + hash = "sha256-JfsOiNTwwpO998mKA1ZGZTdZfzOgP6AKBkg8cuaqKr0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Yz9xuH8Eph1pzv0siTpvdSXZLj/AjS5PR06CitK9NdE="; + cargoHash = "sha256-Ok+pyGG5VHJbsKenKBr0mM1XRoOiAso0ebeQ5hDuwjM="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "gateway"; RUSTFLAGS = "--cfg system_certs"; @@ -41,5 +41,6 @@ rustPlatform.buildRustPackage rec { patrickdag ]; mainProgram = "firezone-gateway"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/fi/firezone-gui-client/package.nix b/pkgs/by-name/fi/firezone-gui-client/package.nix index 61e865305dcc..04212a7b5a06 100644 --- a/pkgs/by-name/fi/firezone-gui-client/package.nix +++ b/pkgs/by-name/fi/firezone-gui-client/package.nix @@ -24,12 +24,12 @@ copyDesktopItems, }: let - version = "1.4.9"; + version = "1.4.12"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "gui-client-${version}"; - hash = "sha256-nOf7+48WUzQ7VmP7PFo07ZhtgyG7VOI/Hb/rXyBU5o0="; + hash = "sha256-jvrkAbXHFWdNInDCrktC7eMZQ2a/rzUxfCOny7nHQmQ="; }; frontend = stdenvNoCC.mkDerivation rec { @@ -39,7 +39,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit pname version; src = "${src}/rust/gui-client"; - hash = "sha256-9ywC920EF6UxkXHs+0WWaU8fr5J35/C+0nNGbSVHESE="; + hash = "sha256-bVWpyGwEaxYi3N6BJqOilnHJDgAykKHgRC2QKlvSm4Q="; }; pnpmRoot = "rust/gui-client"; @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec { inherit version src; useFetchCargoVendor = true; - cargoHash = "sha256-ltxyI3Xoute0/HHXYU4XdFjcQ9zSLx6ZzAZFEjDk6zw="; + cargoHash = "sha256-YETCRhECbMTRmNsvOFl7R2YScY6ArjsOYJKdPVuUyGI="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "gui-client"; RUSTFLAGS = "--cfg system_certs"; @@ -162,5 +162,6 @@ rustPlatform.buildRustPackage rec { patrickdag ]; mainProgram = "firezone-gui-client"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix index 459411058d54..38b01292bb9c 100644 --- a/pkgs/by-name/fi/firezone-headless-client/package.nix +++ b/pkgs/by-name/fi/firezone-headless-client/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "firezone-headless-client"; - version = "1.4.5"; + version = "1.4.7"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "headless-client-${version}"; - hash = "sha256-IVbMdRtb6cu4obTFYPAYQXu9sXH7vT7K9j79IXg0KXk="; + hash = "sha256-2zRuOY8D6NEopKg13bvJoTR7uXZ4wm40VFvR3NRKqJc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8//Gg45iJw9rfEn08FW+wDbg7Dz2MyKFGf3p2Td7kHA="; + cargoHash = "sha256-YETCRhECbMTRmNsvOFl7R2YScY6ArjsOYJKdPVuUyGI="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "headless-client"; RUSTFLAGS = "--cfg system_certs"; @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { patrickdag ]; mainProgram = "firezone-headless-client"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/fi/firezone-relay/package.nix b/pkgs/by-name/fi/firezone-relay/package.nix index 45dac6e2415a..925ed32d72ff 100644 --- a/pkgs/by-name/fi/firezone-relay/package.nix +++ b/pkgs/by-name/fi/firezone-relay/package.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { patrickdag ]; mainProgram = "firezone-relay"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/fi/fish/1d78c8bd4295262a3118f478e6b3a7c7536fa282.patch b/pkgs/by-name/fi/fish/1d78c8bd4295262a3118f478e6b3a7c7536fa282.patch deleted file mode 100644 index 873b112d864e..000000000000 --- a/pkgs/by-name/fi/fish/1d78c8bd4295262a3118f478e6b3a7c7536fa282.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 1d78c8bd4295262a3118f478e6b3a7c7536fa282 Mon Sep 17 00:00:00 2001 -From: Johannes Altmanninger -Date: Wed, 19 Mar 2025 09:39:04 +0100 -Subject: [PATCH] Fix concurrent setlocale() in string escape tests - -In our C++ implementation, these tests were run serially. As pointed out in -https://github.com/fish-shell/fish-shell/issues/11254#issuecomment-2735623229 -we run them in parallel now, which means that one test could be changing -the global locale used by another. - -In theory this could be fine because all tests are setting setting the -global locale to the same thing but the existence of a lock suggests that -setlocale() is not guaranteed to be atomic, so it's possible that another -thread uses a temporarily-invalid locale. - -Fixes #11254 ---- - src/tests/string_escape.rs | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/src/tests/string_escape.rs b/src/tests/string_escape.rs -index ba8ee7534ebf..4428d679cd35 100644 ---- a/src/tests/string_escape.rs -+++ b/src/tests/string_escape.rs -@@ -1,3 +1,5 @@ -+use std::sync::MutexGuard; -+ - use crate::common::{ - escape_string, str2wcstring, unescape_string, wcs2string, EscapeFlags, EscapeStringStyle, - UnescapeStringStyle, ENCODE_DIRECT_BASE, ENCODE_DIRECT_END, -@@ -10,21 +12,21 @@ use rand::{Rng, RngCore}; - - /// wcs2string is locale-dependent, so ensure we have a multibyte locale - /// before using it in a test. --fn setlocale() { -- let _guard = LOCALE_LOCK.lock().unwrap(); -+fn setlocale() -> MutexGuard<'static, ()> { -+ let guard = LOCALE_LOCK.lock().unwrap(); - - #[rustfmt::skip] - const UTF8_LOCALES: &[&str] = &[ - "C.UTF-8", "en_US.UTF-8", "en_GB.UTF-8", "de_DE.UTF-8", "C.utf8", "UTF-8", - ]; - if crate::libc::MB_CUR_MAX() > 1 { -- return; -+ return guard; - } - for locale in UTF8_LOCALES { - let locale = std::ffi::CString::new(locale.to_owned()).unwrap(); - unsafe { libc::setlocale(libc::LC_CTYPE, locale.as_ptr()) }; - if crate::libc::MB_CUR_MAX() > 1 { -- return; -+ return guard; - } - } - panic!("No UTF-8 locale found"); -@@ -100,7 +102,7 @@ fn test_escape_var() { - } - - fn escape_test(escape_style: EscapeStringStyle, unescape_style: UnescapeStringStyle) { -- setlocale(); -+ let _locale_guard = setlocale(); - let seed: u128 = 92348567983274852905629743984572; - let mut rng = get_seeded_rng(seed); - -@@ -174,7 +176,7 @@ fn str2hex(input: &[u8]) -> String { - /// string comes back through double conversion. - #[test] - fn test_convert() { -- setlocale(); -+ let _locale_guard = setlocale(); - let seed = get_rng_seed(); - let mut rng = get_seeded_rng(seed); - let mut origin = Vec::new(); diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index d0255f5dd6f1..1b4c0b375201 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -152,13 +152,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fish"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; tag = finalAttrs.version; - hash = "sha256-Mj4v2ubYr4ufs7aU/1AdY239byiCJHKXam64af/VO3U="; + hash = "sha256-UpoZPipXZbzLWCOXzDjfyTDrsKyXGbh3Rkwj5IeWeY4="; }; env = { @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-4kqBrpeneCpF0WohP1ZArKrV3duHAE01XA5+GT9f56w="; + hash = "sha256-FkJB33vVVz7Kh23kfmjQDn61X2VkKLG9mUt8f3TrCHg="; }; patches = [ @@ -188,10 +188,6 @@ stdenv.mkDerivation (finalAttrs: { # * # * ./nix-darwin-path.patch - - # remove 4.0.2 - # https://github.com/fish-shell/fish-shell/issues/11254 - ./1d78c8bd4295262a3118f478e6b3a7c7536fa282.patch ]; # Fix FHS paths in tests @@ -331,7 +327,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; # Ensure that we don't vendor libpcre2, but instead link against the one from nixpkgs diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix index 8fd0f00138a2..d77f785d09e7 100644 --- a/pkgs/by-name/fi/fishnet/package.nix +++ b/pkgs/by-name/fi/fishnet/package.nix @@ -3,32 +3,38 @@ rustPlatform, fetchFromGitHub, fetchurl, - testers, - fishnet, + versionCheckHook, + writeShellApplication, + curl, + jq, + nix-update, + common-updater-scripts, }: let # These files can be found in Stockfish/src/evaluate.h - nnueBigFile = "nn-1111cefa1111.nnue"; + nnueBigFile = "nn-1c0000000000.nnue"; + nnueBigHash = "sha256-HAAAAAAApn1imZnZMtDDc/dFDOQ80S0FYoaPTq+a4q0="; nnueBig = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}"; - sha256 = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ="; + hash = nnueBigHash; }; nnueSmallFile = "nn-37f18f62d772.nnue"; + nnueSmallHash = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0="; nnueSmall = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}"; - sha256 = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0="; + hash = nnueSmallHash; }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "fishnet"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "lichess-org"; repo = "fishnet"; - rev = "v${version}"; - hash = "sha256-JhllThFiHeC/5AAFwwZQ0mgbENIWP1cA7aD01DeDVL8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+JkqxO7wwYZHwWRMboKGe8uo/F223efR+9pIsAIoFpU="; fetchSubmodules = true; }; @@ -40,10 +46,38 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-aUSppXw0UDqCDX7YX+sYNEcmiABXDn0nrow0H9UjpaA="; + cargoHash = "sha256-WjBrv4GApT7LTnexLDhY7Zni5kLtvUzaGs2YuA3UiHE="; - passthru.tests.version = testers.testVersion { - package = fishnet; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = lib.getExe (writeShellApplication { + name = "update-${finalAttrs.pname}"; + + runtimeInputs = [ + curl + jq + nix-update + common-updater-scripts + ]; + + runtimeEnv = { + PNAME = finalAttrs.pname; + PKG_FILE = builtins.toString ./package.nix; + GITHUB_REPOSITORY = "${finalAttrs.src.owner}/${finalAttrs.src.repo}"; + NNUE_BIG_FILE = nnueBigFile; + NNUE_BIG_HASH = nnueBigHash; + NNUE_SMALL_FILE = nnueSmallFile; + NNUE_SMALL_HASH = nnueSmallHash; + }; + + text = builtins.readFile ./update.bash; + }); }; meta = with lib; { @@ -60,4 +94,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "fishnet"; }; -} +}) diff --git a/pkgs/by-name/fi/fishnet/update.bash b/pkgs/by-name/fi/fishnet/update.bash new file mode 100644 index 000000000000..8bf6997f3936 --- /dev/null +++ b/pkgs/by-name/fi/fishnet/update.bash @@ -0,0 +1,43 @@ +new_version="$( + curl --fail --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest" | + jq '.tag_name | ltrimstr("v")' --raw-output +)" +stockfish_revision="$( + curl --fail --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/$GITHUB_REPOSITORY/contents/Stockfish?ref=v$new_version" | + jq .sha --raw-output +)" +stockfish_header="$( + curl --fail --silent "https://raw.githubusercontent.com/official-stockfish/Stockfish/$stockfish_revision/src/evaluate.h" +)" +new_nnue_big_file="$( + echo "$stockfish_header" | + grep --perl-regexp --only-matching 'EvalFileDefaultNameBig "\Knn-(\w+).nnue' +)" +new_nnue_big_hash="$( + nix hash to-sri --type sha256 "$( + nix-prefetch-url --type sha256 "https://tests.stockfishchess.org/api/nn/${new_nnue_big_file}" + )" +)" +new_nnue_small_file="$( + echo "$stockfish_header" | + grep --perl-regexp --only-matching 'EvalFileDefaultNameSmall "\Knn-(\w+).nnue' +)" +new_nnue_small_hash="$( + nix hash to-sri --type sha256 "$( + nix-prefetch-url --type sha256 "https://tests.stockfishchess.org/api/nn/${new_nnue_small_file}" + )" +)" + +# Update NNUE +pkg_body="$(<"$PKG_FILE")" +pkg_body="${pkg_body//"$NNUE_BIG_FILE"/"$new_nnue_big_file"}" +pkg_body="${pkg_body//"$NNUE_BIG_HASH"/"$new_nnue_big_hash"}" +pkg_body="${pkg_body//"$NNUE_SMALL_FILE"/"$new_nnue_small_file"}" +pkg_body="${pkg_body//"$NNUE_SMALL_HASH"/"$new_nnue_small_hash"}" +echo "$pkg_body" >"$PKG_FILE" + +# Update version, src +update-source-version "$PNAME" "$new_version" --ignore-same-version --print-changes + +# Update cargoHash +nix-update --version=skip "$PNAME" diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index b9406b492a2d..2010c21d5f88 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -8,14 +8,14 @@ }: python3Packages.buildPythonApplication rec { pname = "fittrackee"; - version = "0.9.3"; + version = "0.9.8"; pyproject = true; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; tag = "v${version}"; - hash = "sha256-ofFQJqBKGavXatlpm1bsM2+A1My/9dSzl9X/o9lVDb8="; + hash = "sha256-WwyDDH/ucXyYF0uCaDPdb32Fof+UlM9eBNk11cyhH90="; }; build-system = [ diff --git a/pkgs/by-name/fi/fityk/package.nix b/pkgs/by-name/fi/fityk/package.nix index b20eb0ea4a3e..0793e847e9a8 100644 --- a/pkgs/by-name/fi/fityk/package.nix +++ b/pkgs/by-name/fi/fityk/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, wxGTK32, - boost, + boost186, lua, zlib, bzip2, @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ wxGTK32 - boost + boost186 lua zlib bzip2 diff --git a/pkgs/by-name/fi/five-or-more/package.nix b/pkgs/by-name/fi/five-or-more/package.nix index b78b26894c8b..f241567c592a 100644 --- a/pkgs/by-name/fi/five-or-more/package.nix +++ b/pkgs/by-name/fi/five-or-more/package.nix @@ -17,13 +17,13 @@ vala, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "five-or-more"; - version = "3.32.3"; + version = "48.1"; src = fetchurl { - url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/five-or-more-${version}.tar.xz"; - hash = "sha256-LRDXLu/esyS0R9YyrwwySW4l/BWjwB230vAMm1HQnvQ="; + url = "mirror://gnome/sources/five-or-more/${lib.versions.major finalAttrs.version}/five-or-more-${finalAttrs.version}.tar.xz"; + hash = "sha256-2UHOLjfqZsDYDx6BeX+8u+To72WnkLPMXla58QtepaM="; }; nativeBuildInputs = [ @@ -50,15 +50,17 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { packageName = "five-or-more"; }; + updateScript = gnome.updateScript { + packageName = "five-or-more"; + }; }; meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/five-or-more"; description = "Remove colored balls from the board by forming lines"; mainProgram = "five-or-more"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 44edf61ea221..e451ee6fd812 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2025.02.10.00"; + version = "2025.04.21.00"; outputs = [ "bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookincubator"; repo = "fizz"; tag = "v${finalAttrs.version}"; - hash = "sha256-czGCQNigLveQu0lvu1Dbamk6Upngr2i3njvLSNKSNj0="; + hash = "sha256-khaUbxcD8+9zznH0DE/BpweZeDKafTnr4EqPbmOpckU="; }; patches = [ diff --git a/pkgs/by-name/fl/flac/package.nix b/pkgs/by-name/fl/flac/package.nix index aea4cc4378e2..d42ca2a679fa 100644 --- a/pkgs/by-name/fl/flac/package.nix +++ b/pkgs/by-name/fl/flac/package.nix @@ -1,38 +1,46 @@ { - lib, - stdenv, - fetchurl, cmake, - pkg-config, doxygen, + fetchFromGitHub, graphviz, + lib, libogg, + nix-update-script, + buildPackages, + pkg-config, + stdenv, + versionCheckHook, + enableManpages ? buildPackages.pandoc.compiler.bootstrapAvailable, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flac"; - version = "1.4.3"; + version = "1.5.0"; - src = fetchurl { - url = "http://downloads.xiph.org/releases/flac/${pname}-${version}.tar.xz"; - # Official checksum is published at https://github.com/xiph/flac/releases/tag/${version} - hash = "sha256-bFjmnNIjSPRBuGEJK4JeWR0Lgi4QbebrDuTQXScgW3A="; + src = fetchFromGitHub { + owner = "xiph"; + repo = "flac"; + tag = finalAttrs.version; + hash = "sha256-B6XRai5UOAtY/7JXNbI3YuBgazi1Xd2ZOs6vvLq9LIs="; }; + hardeningDisable = [ "trivialautovarinit" ]; + nativeBuildInputs = [ cmake - pkg-config doxygen graphviz - ]; + pkg-config + ] ++ lib.optional enableManpages buildPackages.pandoc; - buildInputs = [ - libogg - ]; + buildInputs = [ libogg ]; - cmakeFlags = lib.optionals (!stdenv.hostPlatform.isStatic) [ - "-DBUILD_SHARED_LIBS=ON" - ]; + cmakeFlags = + lib.optionals (!stdenv.hostPlatform.isStatic) [ + "-DBUILD_SHARED_LIBS=ON" + ] + ++ lib.optionals (!enableManpages) [ + "-DINSTALL_MANPAGES=OFF" + ]; CFLAGS = [ "-O3" @@ -40,23 +48,38 @@ stdenv.mkDerivation rec { ]; CXXFLAGS = [ "-O3" ]; - # doCheck = true; # takes lots of time + patches = [ ./package.patch ]; + doCheck = true; - outputs = [ - "bin" - "dev" - "out" - "man" - "doc" - ]; + outputs = + [ + "bin" + "dev" + "doc" + "out" + ] + ++ lib.optionals enableManpages [ + "man" + ]; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://xiph.org/flac/"; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; - changelog = "https://xiph.org/flac/changelog.html"; + changelog = "https://github.com/xiph/flac/releases/tag/${finalAttrs.version}"; mainProgram = "flac"; - platforms = platforms.all; - license = licenses.bsd3; - maintainers = with maintainers; [ ruuda ]; + platforms = lib.platforms.all; + license = with lib.licenses; [ + bsd3 + fdl13Plus + gpl2Plus + lgpl21Plus + ]; + maintainers = with lib.maintainers; [ ruuda ]; }; -} +}) diff --git a/pkgs/by-name/fl/flac/package.patch b/pkgs/by-name/fl/flac/package.patch new file mode 100644 index 000000000000..5f146dab682e --- /dev/null +++ b/pkgs/by-name/fl/flac/package.patch @@ -0,0 +1,12 @@ +diff --git a/test/test_replaygain.sh b/test/test_replaygain.sh +index 11fb77dc..b5dea14c 100755 +--- a/test/test_replaygain.sh ++++ b/test/test_replaygain.sh +@@ -140,7 +140,4 @@ for ACTION in $REPLAYGAIN_FREQ ; do + done + done + +- +-rm -f $testdir/out.flac $testdir/out.meta +- + exit 0 diff --git a/pkgs/by-name/fl/flaca/package.nix b/pkgs/by-name/fl/flaca/package.nix index 9fa928f5d300..c1fd5efe544d 100644 --- a/pkgs/by-name/fl/flaca/package.nix +++ b/pkgs/by-name/fl/flaca/package.nix @@ -3,46 +3,41 @@ fetchFromGitHub, rustPlatform, fetchurl, - runCommand, - lndir, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "flaca"; - version = "3.2.3"; + version = "3.3.2"; - src = - let - source = fetchFromGitHub { - owner = "Blobfolio"; - repo = "flaca"; - rev = "v${version}"; - hash = "sha256-GpxOTu7yjJ9IFMKVkgjLeKGNEUiKw0ZeWQorfhaOTsg="; - }; - lockFile = fetchurl { - url = "https://github.com/Blobfolio/flaca/releases/download/v${version}/Cargo.lock"; - hash = "sha256-SaqQ4U8JXTFlp1EqkNZ6VV8KyPXHYtEycfZn/68SeHY="; - }; - in - runCommand "source-with-lock" { nativeBuildInputs = [ lndir ]; } '' - mkdir -p $out - ln -s ${lockFile} $out/Cargo.lock - lndir -silent ${source} $out - ''; + lockFile = fetchurl { + url = "https://github.com/Blobfolio/flaca/releases/download/v${finalAttrs.version}/Cargo.lock"; + hash = "sha256-AFEuJQAz+cXUuyLefqsV2VyytJ+sfLrJQSArITqQZZU="; + }; + + src = fetchFromGitHub { + owner = "Blobfolio"; + repo = "flaca"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sxBP3L9Abk3/NYkE1UeFFulGEhDe4wKqS71wrX6mA9c="; + }; + + postUnpack = '' + ln -s ${finalAttrs.lockFile} ${finalAttrs.src.name}/Cargo.lock + ''; nativeBuildInputs = [ rustPlatform.bindgenHook ]; useFetchCargoVendor = true; - cargoHash = "sha256-MdPPLv0836rVxVrl8PXMDufHdTtmBBhJ/EuG4qcK3Kk="; + cargoHash = "sha256-i4eYyS3s7q/1PaqwawpWeDbUHUGEvIfN65xfvpLkOpY="; meta = with lib; { description = "CLI tool to losslessly compress JPEG and PNG images"; longDescription = "A CLI tool for x86-64 Linux machines that simplifies the task of maximally, losslessly compressing JPEG and PNG images for use in production web environments"; homepage = "https://github.com/Blobfolio/flaca"; - changelog = "https://github.com/Blobfolio/flaca/releases/tag/v${version}"; + changelog = "https://github.com/Blobfolio/flaca/releases/tag/v${finalAttrs.version}"; maintainers = with maintainers; [ zzzsy ]; platforms = platforms.linux; license = licenses.wtfpl; mainProgram = "flaca"; }; -} +}) diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index 0155d14ea793..a67fe84df8bc 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -2,31 +2,21 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "flake-checker"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "flake-checker"; rev = "v${version}"; - hash = "sha256-K5E1sarWIUl4QavHBoS8sPr5Cp8ZndWjLYDLm++d7v0="; + hash = "sha256-Q1nC7U4SG3VHlqbJDs5NDNmsvnYN+MGpMkOH952WaKg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-FDfsA87VATJ4CpXoJ0eFoFl5z9Jtv6tPjkCf7kz6g00="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + cargoHash = "sha256-M+Ftovr1Czk9W904B2Cf9FjItKhxALZj6mT+Yewdf8U="; meta = with lib; { description = "Health checks for your Nix flakes"; diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix index b54936e1a895..8b01aaab4055 100644 --- a/pkgs/by-name/fl/flake-edit/package.nix +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -4,10 +4,8 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, installShellFiles, nix-update-script, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,12 +27,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; env.ASSET_DIR = "target/assets"; diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index 882685e3ced5..f2f45f70f53f 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -1,8 +1,6 @@ { stdenv, lib, - overrideSDK, - darwin, fetchFromGitHub, fetchpatch, cmake, @@ -18,20 +16,16 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport); -let - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in - -stdenv'.mkDerivation { +stdenv.mkDerivation { pname = "flameshot"; # wlr screenshotting is currently only available on unstable version (>12.1.0) - version = "12.1.0-unstable-2025-03-10"; + version = "12.1.0-unstable-2025-05-04"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; - rev = "1997aed8a332eeb3b468559bf454c5d78b4d2cbb"; - hash = "sha256-liiL0/H70XfsG2zM7N+GuIdvd6RE29QXYQLExiYCuvc="; + rev = "f4cde19c63473f8fadd448ad2056c22f0f847f34"; + hash = "sha256-B/piB8hcZR11vnzvue/1eR+SFviTSGJoek1w4abqsek="; }; patches = [ diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix index c2087c612665..ee902ccce328 100644 --- a/pkgs/by-name/fl/flare-signal/package.nix +++ b/pkgs/by-name/fl/flare-signal/package.nix @@ -22,19 +22,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "flare"; - version = "0.15.12"; + version = "0.16.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; - rev = finalAttrs.version; - hash = "sha256-qj34x/e5Nc3wPdFaHFZHQ8uCMHIlxfVNyvlp7eb3tSo="; + tag = finalAttrs.version; + hash = "sha256-SasvP3P/QAPqcrJ4L2EO9XlrekGJXv3RjQjj+3VUGxM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-Nri3GOq7aaY3yIVQESMPUck3z8++FnAmIbIdkTe+GXw="; + hash = "sha256-l+ADDPOOfWyVxDdZrMxVWRS0wI69lP+hjAm5PFdCGsM="; }; nativeBuildInputs = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - changelog = "https://gitlab.com/schmiddi-on-mobile/flare/-/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://gitlab.com/schmiddi-on-mobile/flare/-/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Unofficial Signal GTK client"; mainProgram = "flare"; homepage = "https://gitlab.com/schmiddi-on-mobile/flare"; diff --git a/pkgs/games/flare/desktop.patch b/pkgs/by-name/fl/flare/desktop.patch similarity index 100% rename from pkgs/games/flare/desktop.patch rename to pkgs/by-name/fl/flare/desktop.patch diff --git a/pkgs/games/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix similarity index 92% rename from pkgs/games/flare/engine.nix rename to pkgs/by-name/fl/flare/engine.nix index 8d4069874bd6..41feaac20101 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/by-name/fl/flare/engine.nix @@ -7,7 +7,6 @@ SDL2_image, SDL2_mixer, SDL2_ttf, - Cocoa, }: stdenv.mkDerivation rec { @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { SDL2_image SDL2_mixer SDL2_ttf - ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ]; meta = with lib; { description = "Free/Libre Action Roleplaying Engine"; diff --git a/pkgs/games/flare/game.nix b/pkgs/by-name/fl/flare/game.nix similarity index 100% rename from pkgs/games/flare/game.nix rename to pkgs/by-name/fl/flare/game.nix diff --git a/pkgs/by-name/fl/flare/package.nix b/pkgs/by-name/fl/flare/package.nix new file mode 100644 index 000000000000..917c09389fd5 --- /dev/null +++ b/pkgs/by-name/fl/flare/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildEnv, + callPackage, + makeWrapper, +}: + +buildEnv { + name = "flare-1.14"; + + paths = [ + (callPackage ./engine.nix { }) + (callPackage ./game.nix { }) + ]; + + nativeBuildInputs = [ makeWrapper ]; + postBuild = '' + mkdir -p $out/bin + makeWrapper $out/games/flare $out/bin/flare --chdir "$out/share/games/flare" + ''; + + meta = with lib; { + description = "Fantasy action RPG using the FLARE engine"; + mainProgram = "flare"; + homepage = "https://flarerpg.org/"; + maintainers = with maintainers; [ + aanderse + McSinyx + ]; + license = [ + licenses.gpl3 + licenses.cc-by-sa-30 + ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix index 85b2d93857c1..8ee30bdfc468 100644 --- a/pkgs/by-name/fl/flaresolverr/package.nix +++ b/pkgs/by-name/fl/flaresolverr/package.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "flaresolverr"; - version = "3.3.21"; + version = "3.3.21-unstable-2025-03-04"; src = fetchFromGitHub { owner = "FlareSolverr"; repo = "FlareSolverr"; - rev = "v${finalAttrs.version}"; - hash = "sha256-M/snpYKZK3pgzlhYjRYEiAPlK9DUKYRiiu43KcrAy9g="; + rev = "ce5369dd413cd71a81ce38a5ccd379f6c9352e23"; + hash = "sha256-cZ/YT4H2OU5l3AosROnkoyT5qrva5lxKshQMS626f2E="; }; nativeBuildInputs = [ makeWrapper ]; @@ -79,7 +79,5 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "flaresolverr"; maintainers = with maintainers; [ paveloom ]; inherit (undetected-chromedriver.meta) platforms; - # See https://github.com/NixOS/nixpkgs/issues/332776 - broken = true; }; }) diff --git a/pkgs/by-name/fl/flashlabel-yxwl/package.nix b/pkgs/by-name/fl/flashlabel-yxwl/package.nix new file mode 100644 index 000000000000..b862bfd7cb38 --- /dev/null +++ b/pkgs/by-name/fl/flashlabel-yxwl/package.nix @@ -0,0 +1,87 @@ +{ + autoPatchelfHook, + cups, + lib, + requireFile, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "flashlabel-yxwl"; + version = "1.2.1"; + + # The source URL currently redirects through “pCloud”, a file storage service + # that resists direct downloads. + src = requireFile { + name = "A4_Linux_Driver_Ver${version}.run"; + url = "https://flashlabel.net/YXWL-A4driver-linux"; + hash = "sha256-qkc3NJ1dK0nJf+Q7xL7f1/+X0COWSWMEbH4luzaFARc="; + }; + + # The driver is distributed as a self-extracting executable consisting of a + # shell script concatenated with a gzipped tar archive. The script hard codes + # its length in the `lines` variable, which we read to locate the archive. + unpackPhase = '' + lines="$(sed 's/^lines=//; t; d' "$src")" + tail --lines "+$lines" "$src" | tar --extract --gzip --strip-components=1 + ''; + + patchPhase = '' + runHook prePatch + + # Remove model from manufacturer name + sed --in-place 's/\(^\*Manufacturer: "YXWL\) [^"]*\("$\)/\1\2/' *.ppd + + runHook postPatch + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ cups ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir --parents $out/lib/cups/filter + mv {A80,A80H} $out/lib/cups/filter + + mkdir --parents $out/share/cups/model + mv *.ppd $out/share/cups/model + + runHook postInstall + ''; + + postFixup = '' + gzip --best $out/share/cups/model/*.ppd + ''; + + meta = { + description = "CUPS driver for FlashLabel A4 thermal printers"; + longDescription = '' + Supported models: + + - A80 + - A80H + - A81 + - A81H + - C80 + - C80H + - D80 + - D80 Pro + - Y8 + - Y8 Pro + - Y80 + ''; + homepage = "https://help.flashlabel.com/support/solutions/articles/150000191214"; + downloadPage = "https://flashlabel.net/YXWL-A4driver-linux"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ + altsalt + AndrewKvalheim + ]; + }; +} diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index 2a7bedf69ba0..446061807a86 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -46,9 +46,16 @@ stdenv.mkDerivation (finalAttrs: { libgpiod ]; + postPatch = '' + # Remove these rules from flashprog to avoid conflicts with libftdi + sed -i"" '/ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001"/d' "util/50-flashprog.rules" + sed -i"" '/ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010"/d' "util/50-flashprog.rules" + sed -i"" '/ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011"/d' "util/50-flashprog.rules" + sed -i"" '/ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6014"/d' "util/50-flashprog.rules" + ''; + postInstall = '' - cd "$src" - install -Dm644 util/50-flashprog.rules "$out/lib/udev/rules.d/50-flashprog.rules" + install -Dm644 ../util/50-flashprog.rules "$out/lib/udev/rules.d/50-flashprog.rules" ''; passthru.updateScript = gitUpdater { diff --git a/pkgs/by-name/fl/flat-remix-gnome/package.nix b/pkgs/by-name/fl/flat-remix-gnome/package.nix index 9cc769ec8c10..a6eb2759aecc 100644 --- a/pkgs/by-name/fl/flat-remix-gnome/package.nix +++ b/pkgs/by-name/fl/flat-remix-gnome/package.nix @@ -8,18 +8,18 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20241208/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20241208"; + version = "20250413"; src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix-gnome"; rev = version; - hash = "sha256-pMxdx/D3M2DwEjrOZx/zY4zZjBUamo7+8/yvVOffxx0="; + hash = "sha256-NgRqpL2bqdgiLfs08htqAsTFAbi7E+G/R0aBFpE9bmc="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20241208/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource diff --git a/pkgs/by-name/fl/flatito/Gemfile b/pkgs/by-name/fl/flatito/Gemfile index 5a0db4533d98..2581a0cc57ef 100644 --- a/pkgs/by-name/fl/flatito/Gemfile +++ b/pkgs/by-name/fl/flatito/Gemfile @@ -5,9 +5,9 @@ source "https://rubygems.org" # Specify your gem's dependencies in flatito.gemspec gemspec -gem "minitest", "~> 5.22" -gem "rake", "~> 13.0" -gem "rubocop", "~> 1.62" -gem "rubocop-minitest", "~> 0.35" -gem "rubocop-performance", "~> 1.11" -gem "rubocop-rake", "~> 0.6" +gem "minitest", "~> 5.25" +gem "rake", "~> 13.2" +gem "rubocop", "~> 1.73" +gem "rubocop-minitest", "~> 0.37" +gem "rubocop-performance", "~> 1.24" +gem "rubocop-rake", "~> 0.7" diff --git a/pkgs/by-name/fl/flatito/Gemfile.lock b/pkgs/by-name/fl/flatito/Gemfile.lock index cb32f25aeda6..915fe61da275 100644 --- a/pkgs/by-name/fl/flatito/Gemfile.lock +++ b/pkgs/by-name/fl/flatito/Gemfile.lock @@ -7,56 +7,60 @@ PATH GEM remote: https://rubygems.org/ specs: - ast (2.4.2) + ast (2.4.3) colorize (1.1.0) - json (2.7.1) - language_server-protocol (3.17.0.3) - minitest (5.22.3) - parallel (1.24.0) - parser (3.3.0.5) + json (2.10.2) + language_server-protocol (3.17.0.4) + lint_roller (1.1.0) + minitest (5.25.5) + parallel (1.26.3) + parser (3.3.7.2) ast (~> 2.4.1) racc - racc (1.7.3) + racc (1.8.1) rainbow (3.1.1) - rake (13.1.0) - regexp_parser (2.9.0) - rexml (3.2.6) - rubocop (1.62.1) + rake (13.2.1) + regexp_parser (2.10.0) + rubocop (1.74.0) json (~> 2.3) - language_server-protocol (>= 3.17.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.38.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) - rubocop-minitest (0.35.0) - rubocop (>= 1.61, < 2.0) - rubocop-ast (>= 1.31.1, < 2.0) - rubocop-performance (1.20.2) - rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rake (0.6.0) - rubocop (~> 1.0) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.41.0) + parser (>= 3.3.7.2) + rubocop-minitest (0.37.1) + lint_roller (~> 1.1) + rubocop (>= 1.72.1, < 2.0) + rubocop-ast (>= 1.38.0, < 2.0) + rubocop-performance (1.24.0) + lint_roller (~> 1.1) + rubocop (>= 1.72.1, < 2.0) + rubocop-ast (>= 1.38.0, < 2.0) + rubocop-rake (0.7.1) + lint_roller (~> 1.1) + rubocop (>= 1.72.1) ruby-progressbar (1.13.0) - unicode-display_width (2.5.0) + unicode-display_width (3.1.4) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) PLATFORMS - arm64-darwin-22 ruby DEPENDENCIES flatito! - minitest (~> 5.22) - rake (~> 13.0) - rubocop (~> 1.62) - rubocop-minitest (~> 0.35) - rubocop-performance (~> 1.11) - rubocop-rake (~> 0.6) + minitest (~> 5.25) + rake (~> 13.2) + rubocop (~> 1.73) + rubocop-minitest (~> 0.37) + rubocop-performance (~> 1.24) + rubocop-rake (~> 0.7) BUNDLED WITH - 2.5.6 + 2.6.2 diff --git a/pkgs/by-name/fl/flatito/gemset.nix b/pkgs/by-name/fl/flatito/gemset.nix index aba899a598ea..2a0430adc56b 100644 --- a/pkgs/by-name/fl/flatito/gemset.nix +++ b/pkgs/by-name/fl/flatito/gemset.nix @@ -4,10 +4,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + sha256 = "10yknjyn0728gjn6b5syynvrvrwm66bhssbxq8mkhshxghaiailm"; type = "gem"; }; - version = "2.4.2"; + version = "2.4.3"; }; colorize = { groups = [ "default" ]; @@ -34,40 +34,50 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; + sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; type = "gem"; }; - version = "2.7.1"; + version = "2.10.2"; }; language_server-protocol = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; + sha256 = "0scnz2fvdczdgadvjn0j9d49118aqm3hj66qh8sd2kv6g1j65164"; type = "gem"; }; - version = "3.17.0.3"; + version = "3.17.0.4"; + }; + lint_roller = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11yc0d84hsnlvx8cpk4cbj6a4dz9pk0r1k29p0n1fz9acddq831c"; + type = "gem"; + }; + version = "1.1.0"; }; minitest = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; type = "gem"; }; - version = "5.22.3"; + version = "5.25.5"; }; parallel = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv"; + sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; type = "gem"; }; - version = "1.24.0"; + version = "1.26.3"; }; parser = { dependencies = [ @@ -78,20 +88,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11r6kp8wam0nkfvnwyc1fmvky102r1vcfr84vi2p1a2wa0z32j3p"; + sha256 = "0pxnbysqw7qx6wq48mibi6nflpjylxd1nn38l9cl9f70dc3yj7f7"; type = "gem"; }; - version = "3.3.0.5"; + version = "3.3.7.2"; }; racc = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; rainbow = { groups = [ "default" ]; @@ -108,40 +118,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.1"; }; regexp_parser = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ndxm0xnv27p4gv6xynk6q41irckj76q1jsqpysd9h6f86hhp841"; + sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb"; type = "gem"; }; - version = "2.9.0"; - }; - rexml = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; - type = "gem"; - }; - version = "3.2.6"; + version = "2.10.0"; }; rubocop = { dependencies = [ "json" "language_server-protocol" + "lint_roller" "parallel" "parser" "rainbow" "regexp_parser" - "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width" @@ -150,10 +150,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0daamn13fbm77rdwwa4w6j6221iq6091asivgdhk6n7g398frcdf"; + sha256 = "16rp45aygc0djhcsc982rc3r16g3anrlh0dwb8yrc76iswsql4q6"; type = "gem"; }; - version = "1.62.1"; + version = "1.74.0"; }; rubocop-ast = { dependencies = [ "parser" ]; @@ -161,13 +161,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1v3q8n48w8h809rqbgzihkikr4g3xk72m1na7s97jdsmjjq6y83w"; + sha256 = "03bwgjbldrxgzcskv3lz7kv2ymccbz0wp1y6wcijix236ynzkvqf"; type = "gem"; }; - version = "1.31.2"; + version = "1.41.0"; }; rubocop-minitest = { dependencies = [ + "lint_roller" "rubocop" "rubocop-ast" ]; @@ -175,13 +176,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "001f4xcs3p0g04cyqfdkb2i1lld0yjmnx1s11y9z2id4b2lg64c4"; + sha256 = "0dhd8s819wsd6wcq30qhcjgwjnprm9njjrxwa0z1jnd86p4c5p6w"; type = "gem"; }; - version = "0.35.0"; + version = "0.37.1"; }; rubocop-performance = { dependencies = [ + "lint_roller" "rubocop" "rubocop-ast" ]; @@ -189,21 +191,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cf7fn4dwf45r3nhnda0dhnwn8qghswyqbfxr2ippb3z8a6gmc8v"; + sha256 = "1da08idjsdclcm9cimjbvd1jz2gm6z62fsc8mywrb0rn7vzkkgg5"; type = "gem"; }; - version = "1.20.2"; + version = "1.24.0"; }; rubocop-rake = { - dependencies = [ "rubocop" ]; + dependencies = [ + "lint_roller" + "rubocop" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nyq07sfb3vf3ykc6j2d5yq824lzq1asb474yka36jxgi4hz5djn"; + sha256 = "0kdfrckz1v32dy7c7bdiksjysx9l9zsda9kc6zvrsghch6vg55rp"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.1"; }; ruby-progressbar = { groups = [ "default" ]; @@ -216,13 +221,24 @@ version = "1.13.0"; }; unicode-display_width = { + dependencies = [ "unicode-emoji" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "1has87asspm6m9wgqas8ghhhwyf2i1yqrqgrkv47xw7jq3qjmbwc"; type = "gem"; }; - version = "2.5.0"; + version = "3.1.4"; + }; + unicode-emoji = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c"; + type = "gem"; + }; + version = "4.0.4"; }; } diff --git a/pkgs/by-name/fl/flatito/package.nix b/pkgs/by-name/fl/flatito/package.nix index d650b44da0f8..47d2323403d2 100644 --- a/pkgs/by-name/fl/flatito/package.nix +++ b/pkgs/by-name/fl/flatito/package.nix @@ -3,6 +3,7 @@ ruby, buildRubyGem, bundlerEnv, + bundlerUpdateScript, }: let deps = bundlerEnv rec { @@ -30,6 +31,8 @@ buildRubyGem rec { source.sha256 = "sha256-n1qPiZoUwaD+dMuJKI8k3cR71dg6yIrIAj0ZsFbstQ8="; propagatedBuildInputs = [ deps ]; + passthru.updateScript = bundlerUpdateScript "${pname}"; + meta = with lib; { description = "It allows you to search for a key and get the value and the line number where it is located in YAML and JSON files"; homepage = "https://github.com/ceritium/flatito"; diff --git a/pkgs/by-name/fl/flatpak-xdg-utils/package.nix b/pkgs/by-name/fl/flatpak-xdg-utils/package.nix new file mode 100644 index 000000000000..6ca52f1f2144 --- /dev/null +++ b/pkgs/by-name/fl/flatpak-xdg-utils/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + glib, + meson, + ninja, + nix-update-script, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "flatpak-xdg-utils"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "flatpak"; + repo = "flatpak-xdg-utils"; + tag = finalAttrs.version; + hash = "sha256-j5A5msgKjQSIvCvFSZGL8QfwH+SJGJ4S3PPCHOmM/bk="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + glib + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/flatpak/flatpak-xdg-utils/releases/tag/${finalAttrs.version}"; + description = "Commandline utilities for use inside Flatpak sandboxes"; + homepage = "https://flatpak.org/"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ michaelgrahamevans ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 42620c2c4b7d..382b91393d8d 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -14,7 +14,6 @@ docbook-xsl-nons, docbook_xml_dtd_45, fetchurl, - fetchpatch, fuse3, gdk-pixbuf, gettext, @@ -81,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.16.0"; + version = "1.16.1"; # TODO: split out lib once we figure out what to do with triggerdir outputs = @@ -100,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - hash = "sha256-ywrFZa3LYhJ8bRHtUO5wRNaoNvppw1Sy9LZAoiv6Syo="; + hash = "sha256-K0fo8tkNNdKTOe144abquzbu+pz6WlyjsNHydQLENnU="; }; patches = @@ -121,12 +120,6 @@ stdenv.mkDerivation (finalAttrs: { # The icon validator needs to access the gdk-pixbuf loaders in the Nix store # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch - - (fetchpatch { - name = "static.patch"; - url = "https://github.com/flatpak/flatpak/commit/114c22e814fc28243585915321b8e943471c377f.patch"; - hash = "sha256-3JLzG74myBTssXQau0Ei5rpthy93Va7xb2MHRnJ3kaI="; - }) ] ++ lib.optionals finalAttrs.doCheck [ # Hardcode paths used by tests and change test runtime generation to use files from Nix store. diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index 6540cb83dc09..d0c3b0a0fbc4 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - flutter327, + flutter329, keybinder3, libayatana-appindicator, buildGoModule, @@ -12,14 +12,14 @@ let pname = "flclash"; - version = "0.8.80"; + version = "0.8.84"; src = (fetchFromGitHub { owner = "chen08209"; repo = "FlClash"; tag = "v${version}"; - hash = "sha256-8zimk2G6vCzh2vhYqUBt0aWMk7xpWMwyzpzB89I7CoA="; + hash = "sha256-XrZay7C8XIqwAATwDd8U+sh0BcNN5ap43ibYVs6qXFg="; fetchSubmodules = true; }).overrideAttrs (_: { @@ -41,7 +41,7 @@ let modRoot = "core"; - vendorHash = "sha256-muMZvmGNfb4VO11kp60VF3sGrh9ajQ51tlX+BF0AsBE="; + vendorHash = "sha256-Wm1VheSLaAS+tLQq7lNkPzoEER1sKiNczUgYLSfuLng="; env.CGO_ENABLED = 0; @@ -57,7 +57,7 @@ let meta = metaCommon; }; in -flutter327.buildFlutterApplication { +flutter329.buildFlutterApplication { inherit pname version src; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -72,6 +72,8 @@ flutter327.buildFlutterApplication { libayatana-appindicator ]; + flutterBuildFlags = [ "--dart-define=APP_ENV=stable" ]; + desktopItems = [ (makeDesktopItem { name = "flclash"; diff --git a/pkgs/by-name/fl/flclash/pubspec.lock.json b/pkgs/by-name/fl/flclash/pubspec.lock.json index 8117175719bc..6011f367d9f0 100644 --- a/pkgs/by-name/fl/flclash/pubspec.lock.json +++ b/pkgs/by-name/fl/flclash/pubspec.lock.json @@ -50,11 +50,41 @@ "dependency": "direct main", "description": { "name": "app_links", - "sha256": "3ced568a5d9e309e99af71285666f1f3117bddd0bd5b3317979dccc1a40cada4", + "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.5.1" + "version": "6.4.0" + }, + "app_links_linux": { + "dependency": "transitive", + "description": { + "name": "app_links_linux", + "sha256": "f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "app_links_platform_interface": { + "dependency": "transitive", + "description": { + "name": "app_links_platform_interface", + "sha256": "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "app_links_web": { + "dependency": "transitive", + "description": { + "name": "app_links_web", + "sha256": "af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" }, "archive": { "dependency": "direct main", @@ -317,7 +347,7 @@ "version": "0.3.4+2" }, "crypto": { - "dependency": "transitive", + "dependency": "direct dev", "description": { "name": "crypto", "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", @@ -400,11 +430,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "sha256": "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.2" + "version": "11.3.3" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -480,11 +510,11 @@ "dependency": "direct main", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "ffigen": { "dependency": "direct dev", @@ -670,16 +700,6 @@ "source": "hosted", "version": "2.1.2" }, - "google_fonts": { - "dependency": "direct main", - "description": { - "name": "google_fonts", - "sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.2.1" - }, "graphs": { "dependency": "transitive", "description": { @@ -944,11 +964,11 @@ "dependency": "direct main", "description": { "name": "launch_at_startup", - "sha256": "93fc5638e088290004fae358bae691486673d469957d461d9dae5b12248593eb", + "sha256": "7db33398b76ec0ed9e27f9f4640553e239977437564046625e215be89c91f084", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.2" + "version": "0.5.1" }, "leak_tracker": { "dependency": "transitive", @@ -1031,7 +1051,7 @@ "version": "0.12.17" }, "material_color_utilities": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "material_color_utilities", "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", @@ -1240,16 +1260,6 @@ "source": "hosted", "version": "1.5.1" }, - "process_run": { - "dependency": "direct main", - "description": { - "name": "process_run", - "sha256": "a68fa9727392edad97a2a96a77ce8b0c17d28336ba1b284b1dfac9595a4299ea", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.2+1" - }, "proxy": { "dependency": "direct main", "description": { @@ -1293,11 +1303,11 @@ "dependency": "direct main", "description": { "name": "re_editor", - "sha256": "2169c114c7877bcaae72d6e8b69cdaa2a9cded69a51e3cf26209dad4a3ed2b9c", + "sha256": "17e430f0591dd361992ec2dd6f69191c1853fa46e05432e095310a8f82ee820e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.0" + "version": "0.7.0" }, "re_highlight": { "dependency": "direct main", @@ -1709,11 +1719,11 @@ "dependency": "direct main", "description": { "name": "tray_manager", - "sha256": "80be6c508159a6f3c57983de795209ac13453e9832fd574143b06dceee188ed2", + "sha256": "c2da0f0f1ddb455e721cf68d05d1281fec75cf5df0a1d3cb67b6ca0bdfd5709d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.2" + "version": "0.4.0" }, "typed_data": { "dependency": "transitive", @@ -1899,21 +1909,21 @@ "dependency": "direct main", "description": { "name": "win32", - "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.0" + "version": "5.12.0" }, "win32_registry": { "dependency": "direct main", "description": { "name": "win32_registry", - "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.5" + "version": "2.1.0" }, "window_ext": { "dependency": "direct main", @@ -1986,7 +1996,7 @@ } }, "sdks": { - "dart": ">=3.7.0-0 <4.0.0", + "dart": ">=3.7.0 <4.0.0", "flutter": ">=3.24.0" } } diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix new file mode 100644 index 000000000000..ce3a0ead609e --- /dev/null +++ b/pkgs/by-name/fl/fleet/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "fleet"; + version = "4.67.3"; + + src = fetchFromGitHub { + owner = "fleetdm"; + repo = "fleet"; + tag = "fleet-v${finalAttrs.version}"; + hash = "sha256-d574YSeMbb/+1wxEMAN0URfpb58NpG8NuOHGQs0GyLk="; + }; + vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60="; + + subPackages = [ + "cmd/fleet" + ]; + + ldflags = [ + "-X github.com/fleetdm/fleet/v4/server/version.appName=fleet" + "-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}" + ]; + + doInstallCheck = true; + versionCheckProgramArg = "version"; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + meta = { + homepage = "https://github.com/fleetdm/fleet"; + changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${finalAttrs.version}"; + description = "CLI tool to launch Fleet server"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + asauzeau + lesuisse + ]; + mainProgram = "fleet"; + }; +}) diff --git a/pkgs/by-name/fl/fleetctl/package.nix b/pkgs/by-name/fl/fleetctl/package.nix index 17f8b940a8c3..e518e12f8047 100644 --- a/pkgs/by-name/fl/fleetctl/package.nix +++ b/pkgs/by-name/fl/fleetctl/package.nix @@ -1,44 +1,41 @@ { lib, buildGoModule, - fetchFromGitHub, + fleet, writableTmpDirAsHomeHook, versionCheckHook, stdenv, }: -buildGoModule rec { - pname = "fleectl"; - version = "4.64.1"; +buildGoModule (finalAttrs: { + pname = "fleetctl"; - src = fetchFromGitHub { - owner = "fleetdm"; - repo = "fleet"; - tag = "fleet-v${version}"; - hash = "sha256-cZ0YTFcyPt7NMZUDZCdlVPTuhwRy7mTp7JCdINqiwOM="; - }; - vendorHash = "sha256-gFAotYho18Jn8MaFK6ShoMA1VLXVENcrASvHWZGFOFg="; + inherit (fleet) version src vendorHash; subPackages = [ "cmd/fleetctl" ]; ldflags = [ - "-X github.com/fleetdm/fleet/v4/server/version.appName=${pname}" - "-X github.com/fleetdm/fleet/v4/server/version.version=${version}" + "-X github.com/fleetdm/fleet/v4/server/version.appName=fleetctl" + "-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}" ]; nativeCheckInputs = [ writableTmpDirAsHomeHook - versionCheckHook ]; # Try to access /var/empty/.goquery/history subfolders doCheck = !stdenv.hostPlatform.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; meta = { homepage = "https://github.com/fleetdm/fleet"; - changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${version}"; + changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${finalAttrs.version}"; description = "CLI tool for managing Fleet"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ @@ -46,4 +43,4 @@ buildGoModule rec { ]; mainProgram = "fleetctl"; }; -} +}) diff --git a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix index f066d23f6427..9ae805bcdbc0 100644 --- a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix +++ b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix @@ -6,44 +6,37 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "fleeting-plugin-aws"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitLab { owner = "gitlab-org/fleeting/plugins"; repo = "aws"; - tag = "v${version}"; - hash = "sha256-8vEduf+xh9R3+GoouXJS2h/ELlzKXDmLBLekaXGn7SE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-3m7t2uGO7Rlfckb8mdYVutW0/ng0OiUAH5XTBoB//ZU="; }; - vendorHash = "sha256-bfEzPPP280peOK4Jyu1fyfFCaFnRLoPmsjJ+G1BoVW4="; + vendorHash = "sha256-hfuszGVWfMreGz22+dkx0/cxznjq2XZf7pAn4TWOQ5M="; - subPackages = [ "cmd/fleeting-plugin-aws" ]; - - # See https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L20-22. + # Needed for "fleeting-plugin-aws -version" to not show "dev". # - # Needed for "fleeting-plugin-aws version" to not show "dev". + # https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L20-22 ldflags = let - # See https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L14. - # - # Couldn't find a way to substitute "go list ." into "ldflags". ldflagsPackageVariablePrefix = "gitlab.com/gitlab-org/fleeting/plugins/aws"; in [ "-X ${ldflagsPackageVariablePrefix}.NAME=fleeting-plugin-aws" - "-X ${ldflagsPackageVariablePrefix}.VERSION=v${version}" - "-X ${ldflagsPackageVariablePrefix}.REVISION=${src.rev}" + "-X ${ldflagsPackageVariablePrefix}.VERSION=${finalAttrs.version}" + "-X ${ldflagsPackageVariablePrefix}.REFERENCE=v${finalAttrs.version}" ]; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${builtins.placeholder "out"}/bin/fleeting-plugin-aws"; - - versionCheckProgramArg = "version"; + versionCheckProgramArg = "-version"; passthru = { updateScript = nix-update-script { }; @@ -56,4 +49,4 @@ buildGoModule rec { mainProgram = "fleeting-plugin-aws"; maintainers = with lib.maintainers; [ commiterate ]; }; -} +}) diff --git a/pkgs/by-name/fl/flex-launcher/package.nix b/pkgs/by-name/fl/flex-launcher/package.nix index de73d4b4480e..da5906e6278a 100644 --- a/pkgs/by-name/fl/flex-launcher/package.nix +++ b/pkgs/by-name/fl/flex-launcher/package.nix @@ -4,6 +4,7 @@ SDL2, SDL2_ttf, SDL2_image, + libX11, cmake, validatePkgConfig, inih, @@ -31,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_ttf SDL2_image + libX11 inih ]; diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index c60418b7c771..9e3aae2585b1 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.15.30"; + version = "3.15.42"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-iGEGQxzvyyOeL/v0j1TiAjx2fa2tCZeRJ7VQByWpxJg="; + hash = "sha256-ON0j5HYNbpHSwTMJgX/xPLjzLZXRDk1YogbhcwugxJE="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/fl/flink/package.nix b/pkgs/by-name/fl/flink/package.nix index 81d7d0ef8c77..50a6e897bff0 100644 --- a/pkgs/by-name/fl/flink/package.nix +++ b/pkgs/by-name/fl/flink/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.20.1"; + version = "2.0.0"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz"; - sha256 = "sha256-X8RVHNEa7oOpVpOSM5xD+zKmCEfbRW4ctPpkyNquAYY="; + sha256 = "sha256-BP5b6YQaENMODhzWguxNAVqGYD9xDy+FfEPHW+rpeq0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fl/flips/package.nix b/pkgs/by-name/fl/flips/package.nix index 6ba965db41c2..c7a629ca7a42 100644 --- a/pkgs/by-name/fl/flips/package.nix +++ b/pkgs/by-name/fl/flips/package.nix @@ -2,9 +2,12 @@ lib, stdenv, fetchFromGitHub, - gtk3, libdivsufsort, pkg-config, + + withGTK3 ? !stdenv.hostPlatform.isDarwin, + gtk3, + llvmPackages, wrapGAppsHook3, }: @@ -21,24 +24,34 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook3 - ]; + ] ++ lib.optional withGTK3 wrapGAppsHook3; - buildInputs = [ - gtk3 - libdivsufsort - ]; + buildInputs = + [ + libdivsufsort + ] + ++ lib.optional withGTK3 gtk3 + ++ lib.optional (withGTK3 && stdenv.hostPlatform.isDarwin) llvmPackages.openmp; patches = [ ./use-system-libdivsufsort.patch ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "TARGET=${if withGTK3 then "gtk" else "cli"}" + ]; + + installPhase = lib.optionalString (!withGTK3) '' + runHook preInstall + install -Dm755 flips -t $out/bin + runHook postInstall + ''; meta = { description = "Patcher for IPS and BPS files"; homepage = "https://github.com/Alcaro/Flips"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aleksana ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; mainProgram = "flips"; }; } diff --git a/pkgs/by-name/fl/flirt/package.nix b/pkgs/by-name/fl/flirt/package.nix index f0f80a9ddcd9..44a371575669 100644 --- a/pkgs/by-name/fl/flirt/package.nix +++ b/pkgs/by-name/fl/flirt/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "flirt"; - version = "0.3"; + version = "0.4"; src = fetchFromSourcehut { owner = "~hadronized"; repo = "flirt"; rev = "v${version}"; - hash = "sha256-xhNo85xwcVI4qliHU4/uNEvS7rW5avKOv8fMfRrvqD0="; + hash = "sha256-wH6WLLUqUj5YrrudNbGkzZ4i15xRPDBE3UKwyhkQSxg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Nu4sOjwF/MlsoCmgUEGEqMIW+aSD9PuiFBQMnfQRL8Q="; + cargoHash = "sha256-m1aLJFa6C5X9HwNweezoUcFnpG09AuYf9ooet8GUGFE="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fl/flitter/package.nix b/pkgs/by-name/fl/flitter/package.nix index 05dee0723c00..2296d8f9d0ae 100644 --- a/pkgs/by-name/fl/flitter/package.nix +++ b/pkgs/by-name/fl/flitter/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "flitter"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "alexozer"; repo = "flitter"; - rev = "v${version}"; - sha256 = "sha256-8e13kSQEjzzf+j4uTrocVioZjJ6lAz+80dLfWwjPb9o="; + tag = version; + hash = "sha256-LG4gCpV4NUOuQMjGIjjX+pc9dL/IG6pzy3J5cDfUE5k="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nhFTXjOXy9QxsASlZHC4jXAJ/Xw65g1l3JczOYvq3dc="; + cargoHash = "sha256-V+GsBEyGNI+13TsIci5GC0VW5BYPCGDAlpaj9DQWjCg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix index d023bbdd6e08..9ed61907d595 100644 --- a/pkgs/by-name/fl/flix/package.nix +++ b/pkgs/by-name/fl/flix/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.58.1"; + version = "0.59.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-YD0H6t5Qj6k8jUfjuMzgY3K2iAN+u4kvcjaqMANkrsw="; + sha256 = "sha256-Rh1i0wL6+Td0j+eJ4qCYYSz8dmG1Op7Z0cGBBjjJ68Q="; }; dontUnpack = true; diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix index 20ef508493dd..f7e539bae1bc 100644 --- a/pkgs/by-name/fl/flowblade/package.nix +++ b/pkgs/by-name/fl/flowblade/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "flowblade"; - version = "2.18.1"; + version = "2.20"; src = fetchFromGitHub { owner = "jliljebl"; repo = "flowblade"; rev = "v${version}"; - sha256 = "sha256-TV/oOA7m8VbvaZe9oujqsB4KJcmYBBo9p2bagpFTwrY="; + sha256 = "sha256-5w8mGFPOawbUwinzVLSCUZWGxuyxhi1/3tOrmQyfUUg="; }; buildInputs = [ diff --git a/pkgs/by-name/fl/flowgger/package.nix b/pkgs/by-name/fl/flowgger/package.nix new file mode 100644 index 000000000000..bc98069621dd --- /dev/null +++ b/pkgs/by-name/fl/flowgger/package.nix @@ -0,0 +1,42 @@ +{ + lib, + rustPlatform, + fetchCrate, + pkg-config, + openssl, + capnproto, +}: + +rustPlatform.buildRustPackage rec { + pname = "flowgger"; + version = "0.3.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-eybahv1A/AIpAXGj6/md8k+b9fu9gSchU16fnAWZP2s="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-50/rg1Bo8wEpD9UT1EWIKNLglZLS1FigoPtZudDaL4c="; + + nativeBuildInputs = [ + pkg-config + capnproto + ]; + + buildInputs = [ openssl ]; + + checkFlags = [ + # test failed + "--skip=flowgger::encoder::ltsv_encoder::test_ltsv_full_encode_multiple_sd" + "--skip=flowgger::encoder::ltsv_encoder::test_ltsv_full_encode_no_sd" + ]; + + meta = with lib; { + homepage = "https://github.com/awslabs/flowgger"; + description = "Fast, simple and lightweight data collector written in Rust"; + license = licenses.bsd2; + maintainers = [ ]; + mainProgram = "flowgger"; + }; +} diff --git a/pkgs/by-name/fl/fluent-gtk-theme/package.nix b/pkgs/by-name/fl/fluent-gtk-theme/package.nix index 137f8a92dd1b..3b5b4be1c1ad 100644 --- a/pkgs/by-name/fl/fluent-gtk-theme/package.nix +++ b/pkgs/by-name/fl/fluent-gtk-theme/package.nix @@ -60,13 +60,13 @@ lib.checkListOfEnum "${pname}: theme variants" stdenvNoCC.mkDerivation (finalAttrs: { inherit pname; - version = "2024-06-12"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "fluent-gtk-theme"; rev = finalAttrs.version; - hash = "sha256-ONhW68UUrFiv5hxkR7XI8U/5+qM+tYLIS2OM05pqJi0="; + hash = "sha256-AaFj9lG9lWg0a0ksJ0ufoUpsunR3uDhcdb7oSrvAmPI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix index 1df0b3cb5567..3a5f6e756fb6 100644 --- a/pkgs/by-name/fl/fluffychat/package.nix +++ b/pkgs/by-name/fl/fluffychat/package.nix @@ -23,19 +23,20 @@ in flutter327.buildFlutterApplication ( rec { pname = "fluffychat-${targetFlutterPlatform}"; - version = "1.25.1"; + version = "1.26.1"; src = fetchFromGitHub { owner = "krille-chan"; repo = "fluffychat"; tag = "v${version}"; - hash = "sha256-5hdFc4JPtTmNVUGTKVBiG7unGsc3NQQ3SJ9I63kfUVc="; + hash = "sha256-c7vSrJ8IYBMQ9JwyLFJGamlvKK7DVzh5y/sybDaibgI="; }; inherit pubspecLock; gitHashes = { flutter_web_auth_2 = "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw="; + flutter_typeahead = "sha256-ZGXbbEeSddrdZOHcXE47h3Yu3w6oV7q+ZnO6GyW7Zg8="; }; inherit targetFlutterPlatform; @@ -47,7 +48,8 @@ flutter327.buildFlutterApplication ( mainProgram = "fluffychat"; maintainers = with maintainers; [ mkg20001 - gilice + tebriel + aleksana ]; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/fl/fluffychat/pubspec.lock.json b/pkgs/by-name/fl/fluffychat/pubspec.lock.json index 33bce96b63d4..9e4f1c88537b 100644 --- a/pkgs/by-name/fl/fluffychat/pubspec.lock.json +++ b/pkgs/by-name/fl/fluffychat/pubspec.lock.json @@ -110,11 +110,11 @@ "dependency": "direct main", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "audio_session": { "dependency": "transitive", @@ -170,11 +170,11 @@ "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "canonical_json": { "dependency": "transitive", @@ -190,11 +190,11 @@ "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "charcode": { "dependency": "transitive", @@ -220,11 +220,11 @@ "dependency": "direct main", "description": { "name": "chewie", - "sha256": "335df378c025588aef400c704bd71f0daea479d4cd57c471c88c056c1144e7cd", + "sha256": "0bf6f7692cb65f7b8f59a2a17025b9cbe8f75ab4251e66161a4fc86162475fb6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.8.5" + "version": "1.11.0" }, "cli_util": { "dependency": "transitive", @@ -240,21 +240,21 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "collection": { "dependency": "direct main", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "colorize": { "dependency": "transitive", @@ -440,11 +440,11 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", @@ -460,11 +460,11 @@ "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "file_picker": { "dependency": "direct main", @@ -692,11 +692,11 @@ "dependency": "direct main", "description": { "name": "flutter_local_notifications", - "sha256": "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71", + "sha256": "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35", "url": "https://pub.dev" }, "source": "hosted", - "version": "17.2.3" + "version": "17.2.4" }, "flutter_local_notifications_linux": { "dependency": "transitive", @@ -768,11 +768,11 @@ "dependency": "direct main", "description": { "name": "flutter_openssl_crypto", - "sha256": "6dcecf6f7c1804ae6f5d73ee05df8af72ea8133bf2447d25979d739503186c96", + "sha256": "293b4fcda13ab0710645a16e82f3d5b7de19bfc0ab2d06bcdb87637222eda5e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.0" + "version": "0.5.0" }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", @@ -863,11 +863,12 @@ "flutter_typeahead": { "dependency": "direct main", "description": { - "name": "flutter_typeahead", - "sha256": "d64712c65db240b1057559b952398ebb6e498077baeebf9b0731dade62438a6d", - "url": "https://pub.dev" + "path": ".", + "ref": "main", + "resolved-ref": "3e209e67aa6e780cba61ced06cf49d2babbbcaa4", + "url": "https://github.com/famedly/flutter_typeahead.git" }, - "source": "hosted", + "source": "git", "version": "5.2.0" }, "flutter_web_auth_2": { @@ -1007,11 +1008,11 @@ "dependency": "direct main", "description": { "name": "go_router", - "sha256": "6f1b756f6e863259a99135ff3c95026c3cdca17d10ebef2bba2261a25ddc8bbc", + "sha256": "0b1e06223bee260dee31a171fb1153e306907563a0b0225e8c1733211911429a", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "15.1.2" }, "gtk": { "dependency": "transitive", @@ -1303,21 +1304,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -1413,11 +1414,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -1433,21 +1434,21 @@ "dependency": "direct main", "description": { "name": "matrix", - "sha256": "d0da69e5ee8dfc1692c02e4b460a1bc136120f0dcf5e02cf604b23cd39d76903", + "sha256": "7d15fdbc760be7e40c58bb65e03baa8241b1e31db2bc67dab61883aabc083a85", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.38.0" + "version": "0.40.0" }, "meta": { "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mgrs_dart": { "dependency": "transitive", @@ -1513,11 +1514,11 @@ "dependency": "transitive", "description": { "name": "olm", - "sha256": "3306bf534ceb914fd148b3b4a3d603fb5e067b2e6da8304025b47c24cfdf6b46", + "sha256": "6a3fe1e5170b954dd9e4ba3b27513e6aa9b7591eb7bb0d7f6f32140b7f140c6f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.4" + "version": "3.1.0" }, "opus_caf_converter_dart": { "dependency": "direct main", @@ -1583,11 +1584,11 @@ "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_provider": { "dependency": "direct main", @@ -1723,11 +1724,11 @@ "dependency": "transitive", "description": { "name": "platform", - "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "platform_detect": { "dependency": "transitive", @@ -1823,11 +1824,11 @@ "dependency": "transitive", "description": { "name": "process", - "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "5.0.3" }, "proj4dart": { "dependency": "transitive", @@ -2219,11 +2220,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -2289,31 +2290,31 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "string_validator": { "dependency": "transitive", @@ -2369,41 +2370,41 @@ "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test": { "dependency": "transitive", "description": { "name": "test", - "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", + "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.8" + "version": "1.25.15" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", + "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.5" + "version": "0.6.8" }, "timezone": { "dependency": "transitive", @@ -2649,81 +2650,81 @@ "dependency": "direct main", "description": { "name": "video_player", - "sha256": "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17", + "sha256": "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.2" + "version": "2.9.5" }, "video_player_android": { "dependency": "transitive", "description": { "name": "video_player_android", - "sha256": "ae5287ca367e206eb74d7b3dc1ce0b8912ab9a3fc0597b6a101a0a5239f229d3", + "sha256": "ae7d4f1b41e3ac6d24dd9b9d5d6831b52d74a61bdd90a7a6262a33d8bb97c29a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.9" + "version": "2.8.2" }, "video_player_avfoundation": { "dependency": "transitive", "description": { "name": "video_player_avfoundation", - "sha256": "cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f", + "sha256": "84b4752745eeccb6e75865c9aab39b3d28eb27ba5726d352d45db8297fbd75bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.2" + "version": "2.7.0" }, "video_player_platform_interface": { "dependency": "transitive", "description": { "name": "video_player_platform_interface", - "sha256": "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb", + "sha256": "df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.3" + "version": "6.3.0" }, "video_player_web": { "dependency": "transitive", "description": { "name": "video_player_web", - "sha256": "6dcdd298136523eaf7dfc31abaf0dfba9aa8a8dbc96670e87e9d42b6f2caf774", + "sha256": "3ef40ea6d72434edbfdba4624b90fd3a80a0740d260667d91e7ecd2d79e13476", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.3.4" }, "vm_service": { "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "wakelock_plus": { "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", + "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.8" + "version": "1.2.11" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "watcher": { "dependency": "transitive", @@ -2789,11 +2790,11 @@ "dependency": "direct main", "description": { "name": "webrtc_interface", - "sha256": "10fc6dc0ac16f909f5e434c18902415211d759313c87261f1e4ec5b4f6a04c26", + "sha256": "e92afec11152a9ccb5c9f35482754edd99696e886ab6acaf90c06dd2d09f09eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2+hotfix.1" }, "win32": { "dependency": "direct overridden", @@ -2867,7 +2868,7 @@ } }, "sdks": { - "dart": ">=3.5.1 <4.0.0", - "flutter": ">=3.24.0" + "dart": ">=3.7.0-0 <4.0.0", + "flutter": ">=3.27.0" } } diff --git a/pkgs/by-name/fl/fluidd/package.nix b/pkgs/by-name/fl/fluidd/package.nix index 44c9e9ebd42b..7ea445a94baa 100644 --- a/pkgs/by-name/fl/fluidd/package.nix +++ b/pkgs/by-name/fl/fluidd/package.nix @@ -8,13 +8,13 @@ buildNpmPackage rec { pname = "fluidd"; - version = "1.33.0"; + version = "1.34.2"; src = fetchFromGitHub { owner = "fluidd-core"; repo = "fluidd"; tag = "v${version}"; - hash = "sha256-z1qb3n+BlvQhw6fKvfZ6s/uSdWbXAJ8xqvQRdLPnD+M="; + hash = "sha256-DbuUAHsRwAiXTGjAPxT1zEcsxNloCEFLuA62/wR4+yg="; }; patches = [ @@ -23,7 +23,7 @@ buildNpmPackage rec { }) ]; - npmDepsHash = "sha256-RpnZLJzxMmwo/XsXOWshw8xCpXG6GuhsaTb4rnXt/D0="; + npmDepsHash = "sha256-ZOsPUON9/bBvSrc432SGHEKKLl9ZVCq9/Nkr9Xxba/g="; installPhase = '' mkdir -p $out/share/fluidd diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix index ac8e3b578bc6..653da761f4d6 100644 --- a/pkgs/by-name/fl/fluidsynth/package.nix +++ b/pkgs/by-name/fl/fluidsynth/package.nix @@ -1,6 +1,5 @@ { stdenv, - darwin, lib, fetchFromGitHub, buildPackages, @@ -15,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluidsynth"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; tag = "v${finalAttrs.version}"; - hash = "sha256-LaJcWrHgt/RzlDQmpzOjF/9ugD5d+8XWRt7pU3SM5Rk="; + hash = "sha256-K7NJOLq0Yjf8IlJZKqQA7WS1uKPC+WN97mtPgwhA/+8="; }; outputs = [ @@ -45,17 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - AudioUnit - CoreAudio - CoreMIDI - CoreServices - ] - ); + ]; cmakeFlags = [ "-Denable-framework=off" diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix index 9897087b6870..bc0062a725ae 100644 --- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix +++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "fzyzcjy"; repo = "flutter_rust_bridge"; rev = "v${version}"; - hash = "sha256-pvKCiv7hUgetTXXp+NCs04Qo9xWaLUE2T1yHENhTGl4="; + hash = "sha256-ReJmS8cfsWCD/wFEpZ+EJBFGMOQZE/zzlOYOk74UCfQ="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-efMA8VJaQlqClAmjJ3zIYLUfnuj62vEIBKsz0l3CWxA="; + cargoHash = "sha256-6HVpETMnhL5gdIls46IdSkTxvJibvfiiPa6l/2GJy7k="; cargoBuildFlags = "--package flutter_rust_bridge_codegen"; cargoTestFlags = "--package flutter_rust_bridge_codegen"; diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix new file mode 100644 index 000000000000..90e984ce04a4 --- /dev/null +++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix @@ -0,0 +1,69 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + nix-update-script, + stdenv, +}: +buildGoModule (finalAttrs: { + pname = "fluxcd-operator-mcp"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "controlplaneio-fluxcd"; + repo = "fluxcd-operator"; + tag = "v${finalAttrs.version}"; + hash = "sha256-GGHufHUqTylgynK19aaj4KAawlzzuz3iSEHa+vVVPMM="; + }; + + vendorHash = "sha256-5uT/pcfXrinyJ1hXmQ+vmWNuyO33c6d5PAjm6kwOZmY="; + + ldflags = [ + "-s" + "-w" + "-X main.VERSION=${finalAttrs.version}" + ]; + + subPackages = [ "cmd/mcp" ]; + + nativeBuildInputs = [ installShellFiles ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/flux-operator-mcp"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + env.CGO_ENABLED = 0; + + postInstall = + '' + mv $out/bin/mcp $out/bin/flux-operator-mcp + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + for shell in bash fish zsh; do + installShellCompletion --cmd flux-operator-mcp \ + --$shell <($out/bin/flux-operator-mcp completion $shell) + done + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Kubernetes controller for managing the lifecycle of Flux CD"; + homepage = "https://fluxcd.control-plane.io/mcp/"; + downloadPage = "https://github.com/controlplaneio-fluxcd/flux-operator"; + longDescription = '' + The Flux Operator is a Kubernetes CRD controller that manages the lifecycle of CNCF Flux CD + and the ControlPlane enterprise distribution. The operator extends Flux with self-service + capabilities and preview environments for GitLab and GitHub pull requests testing. + ''; + changelog = "https://github.com/controlplaneio-fluxcd/flux-operator/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + mattfield + ]; + mainProgram = "flux-operator-mcp"; + }; +}) diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix new file mode 100644 index 000000000000..dac5909a448f --- /dev/null +++ b/pkgs/by-name/fl/fluxcd-operator/package.nix @@ -0,0 +1,66 @@ +{ + lib, + buildGo124Module, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + nix-update-script, + stdenv, +}: +buildGo124Module (finalAttrs: { + pname = "fluxcd-operator"; + version = "0.19.0"; + + src = fetchFromGitHub { + owner = "controlplaneio-fluxcd"; + repo = "fluxcd-operator"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2AkO8nie2ep3ASy0hkM9JEryv0ekyRNPkCoZ3WgBQwU="; + }; + + vendorHash = "sha256-sQhp89AzICeu3oRVh3ys93PyeU5A24T36QwQsHxMSaY="; + + ldflags = [ + "-s" + "-w" + "-X main.VERSION=${finalAttrs.version}" + ]; + + subPackages = [ "cmd/cli" ]; + + nativeBuildInputs = [ installShellFiles ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/flux-operator"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + env.CGO_ENABLED = 0; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + mv $out/bin/cli $out/bin/flux-operator + for shell in bash fish zsh; do + installShellCompletion --cmd flux-operator \ + --$shell <($out/bin/flux-operator completion $shell) + done + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Kubernetes controller for managing the lifecycle of Flux CD"; + homepage = "https://fluxcd.control-plane.io/operator/"; + downloadPage = "https://github.com/controlplaneio-fluxcd/flux-operator"; + longDescription = '' + The Flux Operator is a Kubernetes CRD controller that manages the lifecycle of CNCF Flux CD + and the ControlPlane enterprise distribution. The operator extends Flux with self-service + capabilities and preview environments for GitLab and GitHub pull requests testing. + ''; + changelog = "https://github.com/controlplaneio-fluxcd/flux-operator/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + mattfield + ]; + mainProgram = "flux-operator"; + }; +}) diff --git a/pkgs/by-name/fl/fluxctl/package.nix b/pkgs/by-name/fl/fluxctl/package.nix deleted file mode 100644 index 5e2ed5b0f53e..000000000000 --- a/pkgs/by-name/fl/fluxctl/package.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - installShellFiles, -}: - -buildGoModule rec { - pname = "fluxctl"; - version = "1.25.4"; - - src = fetchFromGitHub { - owner = "weaveworks"; - repo = "flux"; - rev = version; - sha256 = "sha256-rKZ0fI9UN4oq6gfDMNR2+kCazlDexE1+UVzQ3xgkSA8="; - }; - - vendorHash = "sha256-6Trk49Vo3oMjSaHRDm2v+elPDHwdn2D3Z6i4UYcx0IQ="; - - nativeBuildInputs = [ installShellFiles ]; - - doCheck = false; - - subPackages = [ "cmd/fluxctl" ]; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ]; - - postInstall = '' - for shell in bash fish zsh; do - $out/bin/fluxctl completion $shell > fluxctl.$shell - installShellCompletion fluxctl.$shell - done - ''; - - meta = with lib; { - description = "CLI client for Flux, the GitOps Kubernetes operator"; - mainProgram = "fluxctl"; - homepage = "https://github.com/fluxcd/flux"; - license = licenses.asl20; - maintainers = with maintainers; [ - Gonzih - Br1ght0ne - ]; - }; -} diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 35b6127ae73b..8521ae7c0d62 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.94"; + version = "0.3.125"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-eCAnOoP5YQL/UCKex/lGiY28JswJTBmg+AIRrrDaAmc="; + hash = "sha256-hBGVFXj3meMjB26qSNOp1QoJWQCkv95akdOD8byHTsk="; }; - vendorHash = "sha256-OokZuh6wzu7xWu//T87n0tbFC3L+MpEJWkSaFJJJUVI="; + vendorHash = "sha256-9E6Kd9TV8TplL4KU47hhOIPuO/hm0T3aaMK/rEMBUU4="; subPackages = [ "." ]; diff --git a/pkgs/by-name/fl/flye/package.nix b/pkgs/by-name/fl/flye/package.nix index 1f7bde7a2aa5..3bc42e8bbb9d 100644 --- a/pkgs/by-name/fl/flye/package.nix +++ b/pkgs/by-name/fl/flye/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "flye"; - version = "2.9.5"; + version = "2.9.6"; pyproject = true; src = fetchFromGitHub { owner = "fenderglass"; repo = "flye"; tag = version; - hash = "sha256-448PTdGueQVHFIDS5zMy+XKZCtEb0SqP8bspPLHMJn0="; + hash = "sha256-ZdrAxPKY3+HJ388tGCdpDcvW70mJ5wd4uOUkuufyqK8="; }; patches = [ @@ -30,12 +30,6 @@ python3Packages.buildPythonApplication rec { url = "https://github.com/mikolmogorov/Flye/commit/e4dcc3fdf0fa1430a974fcd7da31b03ea642df9b.patch"; hash = "sha256-Ny2daPt8eYOKnwZ6bdBoCcFWhe9eiIHF4vJU/occwU0="; }) - (fetchpatch { - # https://github.com/mikolmogorov/Flye/pull/711 - name = "remove-distutils.patch"; - url = "https://github.com/mikolmogorov/Flye/commit/fb34f1ccfdf569d186a4ce822ee18eced736636b.patch"; - hash = "sha256-52bnZ8XyP0HsY2OpNYMU3xJgotNVdQc/O2w3XIReUdQ="; - }) ]; postPatch = '' diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix index 6890c9a7fc04..e570f2745161 100644 --- a/pkgs/by-name/fl/flyway/package.nix +++ b/pkgs/by-name/fl/flyway/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "flyway"; - version = "11.4.1"; + version = "11.7.0"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-tOPUBHB8nLdXnJfgd9zn+ph/KTWr7eXu7fRQ8RlpncA="; + sha256 = "sha256-Ajm4V+AAaC3NXvdTkxJ9uhk0QayZzoPYyU5RRrWxz/g="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/by-name/fm/fmi-reference-fmus/package.nix b/pkgs/by-name/fm/fmi-reference-fmus/package.nix new file mode 100644 index 000000000000..e41e1223d8b9 --- /dev/null +++ b/pkgs/by-name/fm/fmi-reference-fmus/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + + # Build the FMUs following the latest FMI standard + FMIVersion ? 3, +}: + +# C.f. +assert lib.asserts.assertMsg ( + FMIVersion >= 1 && FMIVersion <= 3 +) "FMIVersion must be a valid FMI specification standard: 1, 2, or 3; not ${toString FMIVersion}"; + +# NB: this derivation does not package the fmusim executables, only +# the FMUs. +stdenv.mkDerivation (finalAttrs: { + pname = "reference-fmus"; + version = "0.0.38"; + src = fetchFromGitHub { + owner = "modelica"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-FeDKYcm9K670q1FGqy41Tp2Ag8p2JidH4z78zpHOngw="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DFMI_VERSION=${toString FMIVersion}" + (lib.cmakeBool "WITH_FMUSIM" false) + ]; + CFLAGS = lib.optionalString (FMIVersion == 3) "-Wno-stringop-truncation"; + + meta = { + # CMakeLists.txt explicitly states support for aarch64-darwin, but + # the build fails in a Nix environment. C.f. + # . + broken = with stdenv.hostPlatform; isAarch64 && isDarwin; + description = "Functional Mock-up Units for development, testing and debugging"; + homepage = "https://github.com/modelica/Reference-FMUs"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ tmplt ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix index 2ecde032d33a..8bcd5b3276ab 100644 --- a/pkgs/by-name/fn/fn-cli/package.nix +++ b/pkgs/by-name/fn/fn-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.40"; + version = "0.6.42"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-myLoLpEiyVTDsFx97AFiS9KNAOQd7NU+W8PJl95a7k0="; + hash = "sha256-cVxanejijbHx455P5Elc4uiqHmG1+MtRoXiHr52YyAw="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/by-name/fn/fnc/package.nix similarity index 100% rename from pkgs/applications/version-management/fnc/default.nix rename to pkgs/by-name/fn/fnc/package.nix diff --git a/pkgs/by-name/fn/fntsample/package.nix b/pkgs/by-name/fn/fntsample/package.nix deleted file mode 100644 index 6790f71a9503..000000000000 --- a/pkgs/by-name/fn/fntsample/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchFromGitHub, - cmake, - pkg-config, - cairo, - fontconfig, - freetype, - glib, - libXdmcp, - makeWrapper, - pango, - pcre, - perlPackages, -}: - -let - ucd-blocks = fetchurl { - url = "https://www.unicode.org/Public/15.0.0/ucd/Blocks.txt"; - hash = "sha256-Up3F0PY4bVLy9W4AS7+rSM4tWH7qnTi6VGxAUkkb2CA="; - }; -in -stdenv.mkDerivation rec { - pname = "fntsample"; - version = "5.4"; - - src = fetchFromGitHub { - owner = "eugmes"; - repo = "fntsample"; - rev = "release/${version}"; - hash = "sha256-O5RT68wPWwzCb51JZWWNcIubWoM7NZw/MRiaHXPDmF0="; - }; - - cmakeFlags = [ - "-DUNICODE_BLOCKS=${ucd-blocks.outPath}" - ]; - - outputs = [ - "out" - "man" - ]; - - nativeBuildInputs = [ - cmake - makeWrapper - pkg-config - ]; - - buildInputs = [ - cairo - fontconfig - freetype - glib - libXdmcp - pango - perlPackages.perl - pcre - ]; - - postFixup = - let - perlPath = - with perlPackages; - makePerlPath [ - ExporterTiny - ListMoreUtils - PDFAPI2 - libintl-perl - ]; - in - '' - for cmd in pdfoutline pdf-extract-outline; do - wrapProgram "$out/bin/$cmd" --prefix PERL5LIB : "${perlPath}" - done - ''; - - meta = with lib; { - homepage = "https://github.com/eugmes/fntsample"; - description = "PDF and PostScript font samples generator"; - license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -} -# TODO: factor/package ucd-blocks diff --git a/pkgs/by-name/fo/focus/package.nix b/pkgs/by-name/fo/focus/package.nix index ac66ed07877a..40963c320cbe 100644 --- a/pkgs/by-name/fo/focus/package.nix +++ b/pkgs/by-name/fo/focus/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/phillbush/focus"; license = licenses.publicDomain; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/fo/folder-color-switcher/package.nix b/pkgs/by-name/fo/folder-color-switcher/package.nix index 0683d606ba93..ebaad510b63f 100644 --- a/pkgs/by-name/fo/folder-color-switcher/package.nix +++ b/pkgs/by-name/fo/folder-color-switcher/package.nix @@ -51,6 +51,6 @@ stdenvNoCC.mkDerivation { description = "Change folder colors for Nemo and Caja"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/fo/foliate/package.nix b/pkgs/by-name/fo/foliate/package.nix index 178a7b70f64f..d48cede3b2be 100644 --- a/pkgs/by-name/fo/foliate/package.nix +++ b/pkgs/by-name/fo/foliate/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "foliate"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "johnfactotum"; repo = "foliate"; tag = version; - hash = "sha256-NU4lM+J5Tpd9Fl+eVbBy7WnCQ6LJ7oeWVkBxp6euTHU="; + hash = "sha256-QpWJDwatT4zOAPF+dn+Sm5xivk9SIZOvexj0M/Nyu24="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/fo/folio/package.nix b/pkgs/by-name/fo/folio/package.nix index 313d9ef3749e..ea9d78ac61f8 100644 --- a/pkgs/by-name/fo/folio/package.nix +++ b/pkgs/by-name/fo/folio/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "folio"; - version = "25.01"; + version = "25.02"; src = fetchFromGitHub { owner = "toolstack"; repo = "Folio"; tag = version; - hash = "sha256-EfZMHoF6xyRaxrLDLkBb07fvUxSQFDFViQJ2y68YhZg="; + hash = "sha256-u7HieTsbSohCjpLNyeY/ZZdmpQWulZaCkxOV5a5QyBY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/folks/package.nix b/pkgs/by-name/fo/folks/package.nix index 64f81dea0a7c..1e62fa5100c1 100644 --- a/pkgs/by-name/fo/folks/package.nix +++ b/pkgs/by-name/fo/folks/package.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library that aggregates people from multiple sources to create metacontacts"; homepage = "https://gitlab.gnome.org/GNOME/folks"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 6d9313acbe0a..22ba13014094 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "folly"; - version = "2025.02.10.00"; + version = "2025.04.21.00"; # split outputs to reduce downstream closure sizes outputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "folly"; tag = "v${finalAttrs.version}"; - hash = "sha256-OuMbxZ9sl9KPDHFae503R0AqzDYFdyuaGK1BospRtfs="; + hash = "sha256-P2saSFVRBWt5xjAWlKmcPJT9MFV9CXFmA18dIDCO84o="; }; nativeBuildInputs = [ @@ -116,7 +116,13 @@ stdenv.mkDerivation (finalAttrs: { ] ); - doCheck = true; + # https://github.com/facebook/folly/blob/main/folly/DiscriminatedPtr.h + # error: #error "DiscriminatedPtr is x64, arm64, ppc64 and riscv64 specific code." + doCheck = + stdenv.hostPlatform.isx86_64 + || stdenv.hostPlatform.isAarch64 + || stdenv.hostPlatform.isPower64 + || stdenv.hostPlatform.isRiscV64; patches = [ # The base template for std::char_traits has been removed in LLVM 19 diff --git a/pkgs/by-name/fo/fondo/package.nix b/pkgs/by-name/fo/fondo/package.nix index 51eafc5f8450..f95083b02356 100644 --- a/pkgs/by-name/fo/fondo/package.nix +++ b/pkgs/by-name/fo/fondo/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/calo001/fondo"; description = "Find the most beautiful wallpapers for your desktop"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + teams = [ teams.pantheon ]; platforms = platforms.linux; mainProgram = "com.github.calo001.fondo"; }; diff --git a/pkgs/by-name/fo/fondu/package.nix b/pkgs/by-name/fo/fondu/package.nix new file mode 100644 index 000000000000..e13ce1b4920f --- /dev/null +++ b/pkgs/by-name/fo/fondu/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + fetchurl, +}: + +stdenv.mkDerivation rec { + version = "060102"; + pname = "fondu"; + + src = fetchurl { + url = "http://fondu.sourceforge.net/fondu_src-${version}.tgz"; + sha256 = "152prqad9jszjmm4wwqrq83zk13ypsz09n02nrk1gg0fcxfm7fr2"; + }; + + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace Makefile --replace /System/Library/Frameworks/CoreServices.framework/CoreServices "-framework CoreServices" + ''; + + makeFlags = [ "DESTDIR=$(out)" ]; + + hardeningDisable = [ "fortify" ]; + + meta = { + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; + }; +} diff --git a/pkgs/by-name/fo/font-alias/package.nix b/pkgs/by-name/fo/font-alias/package.nix new file mode 100644 index 000000000000..4a441d944c8f --- /dev/null +++ b/pkgs/by-name/fo/font-alias/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchurl, + writeScript, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "font-alias"; + version = "1.0.5"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-alias-${finalAttrs.version}.tar.xz"; + hash = "sha256-n4niF7tz4ONjagpJP7+LfJlRVuDFPZoEdtIBtnwta24="; + }; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Common aliases for Xorg fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/alias"; + license = with lib.licenses; [ + cronyx + mit + ]; + maintainers = [ ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/fo/font-util/package.nix b/pkgs/by-name/fo/font-util/package.nix new file mode 100644 index 000000000000..b443788a941a --- /dev/null +++ b/pkgs/by-name/fo/font-util/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchurl, + testers, + writeScript, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "font-util"; + version = "1.4.1"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-util-${finalAttrs.version}.tar.xz"; + hash = "sha256-XJ9kEjwZSxUP7okEmZFoc4bm/zbvKve4C6U++vNozJU="; + }; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "X.Org font package creation/installation utilities"; + homepage = "https://gitlab.freedesktop.org/xorg/font/util"; + license = with lib.licenses; [ + mit + bsd2 + bsdSourceCode + mitOpenGroup + # there is a bit of a diff, but i think its close enough + # it was probably just adapted a bit to fit to the repository structure + # or its an older version that the one on spdx + unicodeTOU + ]; + maintainers = [ ]; + pkgConfigModules = [ "fontutil" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fo/foodfetch/package.nix b/pkgs/by-name/fo/foodfetch/package.nix new file mode 100644 index 000000000000..fc4cfca5c529 --- /dev/null +++ b/pkgs/by-name/fo/foodfetch/package.nix @@ -0,0 +1,40 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + openssl, + pkg-config, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "foodfetch"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "noahfraiture"; + repo = "foodfetch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TUgj3zS18lCtkyxYrG4f156YqFSCGXzfbK6b+Owacto="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-ZPV6sDQHV+G0HxRAVlcilh4tCCQspTnxnH1aHxVP8tI="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/noahfraiture/foodfetch/releases/tag/v${finalAttrs.version}"; + description = "Yet another fetch to quickly get recipes"; + homepage = "https://github.com/noahfraiture/foodfetch"; + license = lib.licenses.mit; + mainProgram = "foodfetch"; + maintainers = with lib.maintainers; [ noahfraiture ]; + }; +}) diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index b667d212b46b..65a67a135016 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -27,7 +27,7 @@ }: let - version = "1.21.0"; + version = "1.22.3"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -103,8 +103,8 @@ stdenv.mkDerivation { domain = "codeberg.org"; owner = "dnkl"; repo = "foot"; - rev = version; - hash = "sha256:19hkw4g2l00wasmk5dn34rf3bhqh6zbwwhvz98bdcv90p761jws4"; + tag = version; + hash = "sha256:1l5liw4dgv7hxdimyk5qycmkfjgimdrx51rjvdizpcfmdlkvg518"; }; separateDebugInfo = true; @@ -200,6 +200,9 @@ stdenv.mkDerivation { "themes" ]; + passthru = { inherit stimulusGenerator; }; + passthru.updateScript = ./update.sh; + passthru.tests = { clang-default-compilation = foot.override { inherit (llvmPackages) stdenv; diff --git a/pkgs/by-name/fo/foot/update.sh b/pkgs/by-name/fo/foot/update.sh new file mode 100755 index 000000000000..2af7c8398d19 --- /dev/null +++ b/pkgs/by-name/fo/foot/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash +#!nix-shell -p nix-update + +nix-update foot +nix-update --version=skip foot.stimulusGenerator diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix index f4723504c5cf..e2341b74e49b 100644 --- a/pkgs/by-name/fo/fooyin/package.nix +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -10,12 +10,14 @@ kdsingleapplication, pipewire, taglib, + libebur128, libvgm, libsndfile, libarchive, libopenmpt, game-music-emu, SDL2, + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { @@ -42,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { pipewire SDL2 # input plugins + libebur128 libvgm libsndfile libarchive @@ -63,6 +66,15 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "INSTALL_FHS" true) ]; + # Remove after next release + patches = [ + (fetchpatch { + name = "qbrush.patch"; + url = "https://github.com/fooyin/fooyin/commit/e44e08abb33f01fe85cc896170c55dbf732ffcc9.patch"; + hash = "sha256-soDj/SFctxxsnkePv4dZgyDHYD2eshlEziILOZC4ddM="; + }) + ]; + env.LANG = "C.UTF-8"; meta = { diff --git a/pkgs/by-name/fo/forbidden/package.nix b/pkgs/by-name/fo/forbidden/package.nix index b5fea8aad7ed..5f3b25083c25 100644 --- a/pkgs/by-name/fo/forbidden/package.nix +++ b/pkgs/by-name/fo/forbidden/package.nix @@ -6,23 +6,23 @@ python3.pkgs.buildPythonApplication rec { pname = "forbidden"; - version = "12.6"; + version = "13.2"; pyproject = true; src = fetchFromGitHub { owner = "ivan-sincek"; repo = "forbidden"; tag = "v${version}"; - hash = "sha256-KE2FHn0ocAna5ReRi9re/u8gdNVkCygSbSRj8gEudgI="; + hash = "sha256-DQ8zjiLTgBBoqp8AP5BYULz4KGnVEt8e7bkfYRGWvFw="; }; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ alive-progress + bot-safe-agents colorama + cryptography pycurl pyjwt regex @@ -31,16 +31,17 @@ python3.pkgs.buildPythonApplication rec { termcolor ]; - pythonImportsCheck = [ - "forbidden" - ]; + # Project has no tests + doCheck = false; - meta = with lib; { + pythonImportsCheck = [ "forbidden" ]; + + meta = { description = "Tool to bypass 4xx HTTP response status code"; homepage = "https://github.com/ivan-sincek/forbidden"; - changelog = "https://github.com/ivan-sincek/forbidden/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/ivan-sincek/forbidden/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "forbidden"; }; } diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index af2b25d12fd7..d011311e410f 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage { pname = "forecast"; - version = "0-unstable-2025-03-09"; + version = "0-unstable-2025-05-15"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "forecast"; - rev = "393ea6ed4d6b1ba5bba71216bd25a869811ad14d"; - hash = "sha256-r0S3AzbpK8l3wrXNT2F1v4GHJFom32YJ63qjhrtBgB0="; + rev = "7e10d602788c2da526c85cafdc5b167a8bfc2e2c"; + hash = "sha256-HsnQll+xqLXA3vRjsiYKkXLKw+uZZoJsSOfms4+fQg0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mqZ2tIZzQWU39SMj8UBnScsGAg4xGhkcm51aXx3UBSk="; + cargoHash = "sha256-cLObhwMVnaj1HvMhCgSQOYN7IRPKcSeYuAfIy2V5Fns="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/fo/forge-sparks/package.nix b/pkgs/by-name/fo/forge-sparks/package.nix index 64f78c60b953..66a34635a529 100644 --- a/pkgs/by-name/fo/forge-sparks/package.nix +++ b/pkgs/by-name/fo/forge-sparks/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/rafaelmardojai/forge-sparks"; license = lib.licenses.mit; mainProgram = "forge-sparks"; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index 9d6b7cc7b90e..ebc489b772c5 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -1,32 +1,36 @@ { lib, + stdenv, rustPlatform, fetchFromGitea, pkg-config, + installShellFiles, + writableTmpDirAsHomeHook, libgit2, oniguruma, openssl, zlib, }: -let - version = "0.2.0"; -in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "forgejo-cli"; - inherit version; + version = "0.3.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Cyborus"; repo = "forgejo-cli"; - rev = "v${version}"; - hash = "sha256-rHyPncAARIPakkv2/CD1/aF2G5AS9bb3T2x8QCQWl5o="; + tag = "v${finalAttrs.version}"; + hash = "sha256-8KPR7Fx26hj5glKDjczCLP6GgQBUsA5TpjhO5UZOpik="; }; useFetchCargoVendor = true; - cargoHash = "sha256-PkKinAZrZ+v1/eygiPis4F7EJnmjYfeQFPKfGpza0yA="; + cargoHash = "sha256-kW7Pexydkosaufk1e8P5FaY+dgkeeTG5qgJxestWkVs="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + writableTmpDirAsHomeHook # Needed for shell completions + ]; buildInputs = [ libgit2 @@ -40,15 +44,25 @@ rustPlatform.buildRustPackage { BUILD_TYPE = "nixpkgs"; }; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd fj \ + --bash <($out/bin/fj completion bash) \ + --fish <($out/bin/fj completion fish) \ + --zsh <($out/bin/fj completion zsh) + ''; + meta = { description = "CLI application for interacting with Forgejo"; homepage = "https://codeberg.org/Cyborus/forgejo-cli"; - changelog = "https://codeberg.org/Cyborus/forgejo-cli/releases/tag/v${version}"; + changelog = "https://codeberg.org/Cyborus/forgejo-cli/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ asl20 mit ]; - maintainers = with lib.maintainers; [ isabelroses ]; + maintainers = with lib.maintainers; [ + awwpotato + isabelroses + ]; mainProgram = "fj"; }; -} +}) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index db668046329e..8591abe8621c 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -42,7 +42,7 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 4e475c733c22..1aacb193be16 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -40,9 +40,9 @@ let pname = "forgejo-frontend"; inherit src version npmDepsHash; - patches = [ - ./package-json-npm-build-frontend.patch - ]; + buildPhase = '' + ./node_modules/.bin/webpack + ''; # override npmInstallHook installPhase = '' @@ -128,6 +128,10 @@ buildGoModule rec { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + preInstall = '' + mv "$GOPATH/bin/forgejo.org" "$GOPATH/bin/gitea" + ''; + postInstall = '' mkdir $data cp -R ./{templates,options} ${frontend}/public $data @@ -187,7 +191,7 @@ buildGoModule rec { description = "Self-hosted lightweight software forge"; homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; - license = if lib.versionAtLeast version "9.0.0" then lib.licenses.gpl3Plus else lib.licenses.mit; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ emilylange urandom diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index 5b42631ffce4..c31929fb7e62 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "7.0.14"; - hash = "sha256-DtGJStiXuJl0m4K6+DNxsBBaj9dB4bEmMqpGS3WGPD4="; - npmDepsHash = "sha256-R78/L6HS8pUNccrctBJ2E8ndS/RBHd+mTvl0JPoxr8Q="; - vendorHash = "sha256-18tJJ3dBVR9d7PFBRFtOVVtZAcdKucmbOTXHdk7U89s="; + version = "11.0.1"; + hash = "sha256-hsJfJOJ6mTIGGV+0YwSA9SYsLXxI1VTXzc+SyXJJ69Q="; + npmDepsHash = "sha256-laHHXq59/7+rJSYTD1Aq/AvFcio6vsnWkeV8enq3yTg="; + vendorHash = "sha256-8fa6l89+6NhVsi6VuTvQs35E3HuiBFxM8NUQ/jzlzV0="; lts = true; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch b/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch deleted file mode 100644 index f04634fc1844..000000000000 --- a/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/package.json b/package.json -index 0abf6fe8b9..9d6ae0fdff 100644 ---- a/package.json -+++ b/package.json -@@ -1,4 +1,7 @@ - { -+ "scripts": { -+ "build": "node_modules/.bin/webpack" -+ }, - "type": "module", - "engines": { - "node": ">= 18.0.0" diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index f2cc87fe1fe3..26d62dc48bd8 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,11 +1 @@ -import ./generic.nix { - version = "10.0.3"; - hash = "sha256-bt1lgp6UiZeiZiIN3vZZbUygHVX1lEE5uOkPXrjk68o="; - npmDepsHash = "sha256-e3SE6cu1xCBdoMRqp2Gcjcay/EwjF+bTdPOlpL1STvw="; - vendorHash = "sha256-b3+zxsKRylgfdW0Yiz0QryObMKdtiMCt0hB3DtAGFrQ="; - lts = false; - nixUpdateExtraArgs = [ - "--override-filename" - "pkgs/by-name/fo/forgejo/package.nix" - ]; -} +{ forgejo-lts }: forgejo-lts diff --git a/pkgs/by-name/fo/forkstat/package.nix b/pkgs/by-name/fo/forkstat/package.nix index c80d47b55e45..9c5d947ea9af 100644 --- a/pkgs/by-name/fo/forkstat/package.nix +++ b/pkgs/by-name/fo/forkstat/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "forkstat"; - version = "0.03.02"; + version = "0.04.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "forkstat"; rev = "V${version}"; - hash = "sha256-lwJIs5knNzkwgIkSdMSVVtrzqnxGy6uOTKsBDkS3xy4="; + hash = "sha256-HHyGjhu8yaBvDncloW8ST2L4iUU2ik2ydW1z9pFhfrw="; }; installFlags = [ diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix index 000dae2e8e34..e77a03029509 100644 --- a/pkgs/by-name/fo/formatjson5/package.nix +++ b/pkgs/by-name/fo/formatjson5/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nix-update-script, fetchpatch, }: @@ -30,8 +28,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-1CSt9dPVHdOqfQXio7/eXiDLWt+iOe6Qj+VtWblwSDE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoBuildFlags = [ "--example formatjson5" ]; postInstall = diff --git a/pkgs/by-name/fo/formatter/package.nix b/pkgs/by-name/fo/formatter/package.nix index 634ca15c9c3e..76d3a8af1052 100644 --- a/pkgs/by-name/fo/formatter/package.nix +++ b/pkgs/by-name/fo/formatter/package.nix @@ -70,7 +70,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple formatter designed for elementary OS"; homepage = "https://github.com/Djaler/Formatter"; - maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; + maintainers = with maintainers; [ xiorcale ]; + teams = [ teams.pantheon ]; platforms = platforms.linux; license = licenses.lgpl2Plus; mainProgram = "com.github.djaler.formatter"; diff --git a/pkgs/by-name/fo/forscape/package.nix b/pkgs/by-name/fo/forscape/package.nix new file mode 100644 index 000000000000..79925ec2cef2 --- /dev/null +++ b/pkgs/by-name/fo/forscape/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + cmake, + qt6, + python3, + + # buildInputs + eigen, + parallel-hashmap, + readerwriterqueue, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "forscape"; + version = "0.0.2-unstable-2025-04-28"; + + src = fetchFromGitHub { + owner = "JohnDTill"; + repo = "Forscape"; + rev = "1b6d82cdee7ed1ffeee8adffa56ca2b0a866cb34"; + hash = "sha256-Ee3SAFZG8I0ZEbggLVViqTYu4SFjNJ62xLcpfLgFlR0="; + }; + cmakeFlags = [ + "-DUSE_CONAN=OFF" + ]; + # Relative to build directory + cmakeDir = "../app"; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + python3 + ]; + + buildInputs = [ + eigen + parallel-hashmap + readerwriterqueue + qt6.qtbase + qt6.qtsvg + ]; + + meta = { + description = "Scientific computing language"; + homepage = "https://github.com/JohnDTill/Forscape"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + mainProgram = "Forscape"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index 1469d6233642..7f7ce4993ff7 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, libiconv, makeBinaryWrapper, installShellFiles, @@ -30,7 +29,6 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; buildNoDefaultFeatures = true; @@ -54,7 +52,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/fortune-kind \ - --prefix FORTUNE_DIR : "$out/fortunes" + --set-default FORTUNE_DIR "$out/fortunes" '' + lib.optionalString fortuneAlias '' ln -s fortune-kind $out/bin/fortune diff --git a/pkgs/servers/foundationdb/patches/disable-flowbench.patch b/pkgs/by-name/fo/foundationdb/disable-flowbench.patch similarity index 100% rename from pkgs/servers/foundationdb/patches/disable-flowbench.patch rename to pkgs/by-name/fo/foundationdb/disable-flowbench.patch diff --git a/pkgs/servers/foundationdb/patches/don-t-use-static-boost-libs.patch b/pkgs/by-name/fo/foundationdb/don-t-use-static-boost-libs.patch similarity index 100% rename from pkgs/servers/foundationdb/patches/don-t-use-static-boost-libs.patch rename to pkgs/by-name/fo/foundationdb/don-t-use-static-boost-libs.patch diff --git a/pkgs/by-name/fo/foundationdb/package.nix b/pkgs/by-name/fo/foundationdb/package.nix new file mode 100644 index 000000000000..06fb2e1d85f0 --- /dev/null +++ b/pkgs/by-name/fo/foundationdb/package.nix @@ -0,0 +1,175 @@ +{ + stdenv, + fetchFromGitHub, + lib, + fetchpatch, + cmake, + ninja, + python3, + openjdk, + mono, + openssl, + boost186, + pkg-config, + msgpack-cxx, + toml11, + jemalloc, + doctest, +}: +let + boost = boost186; + # Only even numbered versions compile on aarch64; odd numbered versions have avx enabled. + avxEnabled = + version: + let + isOdd = n: lib.trivial.mod n 2 != 0; + patch = lib.toInt (lib.versions.patch version); + in + isOdd patch; +in +stdenv.mkDerivation rec { + name = "foundationdb"; + version = "7.3.42"; + + src = fetchFromGitHub { + owner = "apple"; + repo = "foundationdb"; + tag = version; + hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c="; + }; + + patches = [ + ./disable-flowbench.patch + ./don-t-use-static-boost-libs.patch + # GetMsgpack: add 4+ versions of upstream + # https://github.com/apple/foundationdb/pull/10935 + (fetchpatch { + url = "https://github.com/apple/foundationdb/commit/c35a23d3f6b65698c3b888d76de2d93a725bff9c.patch"; + hash = "sha256-bneRoZvCzJp0Hp/G0SzAyUyuDrWErSpzv+ickZQJR5w="; + }) + # Add a dependency that prevents bindingtester to run before the python bindings are generated + # https://github.com/apple/foundationdb/pull/11859 + (fetchpatch { + url = "https://github.com/apple/foundationdb/commit/8d04c97a74c6b83dd8aa6ff5af67587044c2a572.patch"; + hash = "sha256-ZLIcmcfirm1+96DtTIr53HfM5z38uTLZrRNHAmZL6rc="; + }) + ]; + + hardeningDisable = [ "fortify" ]; + + postPatch = '' + # allow using any msgpack-cxx version + substituteInPlace cmake/GetMsgpack.cmake \ + --replace-warn 'find_package(msgpack-cxx 6 QUIET CONFIG)' 'find_package(msgpack-cxx QUIET CONFIG)' + + # Use our doctest package + substituteInPlace bindings/c/test/unit/third_party/CMakeLists.txt \ + --replace-fail '/opt/doctest_proj_2.4.8' '${doctest}/include' + + # Upstream upgraded to Boost 1.86 with no code changes; see: + # + substituteInPlace cmake/CompileBoost.cmake \ + --replace-fail 'find_package(Boost 1.78.0 EXACT ' 'find_package(Boost ' + ''; + + buildInputs = [ + boost + jemalloc + msgpack-cxx + openssl + toml11 + ]; + + checkInputs = [ doctest ]; + + nativeBuildInputs = [ + cmake + mono + ninja + openjdk + pkg-config + python3 + ]; + + separateDebugInfo = true; + dontFixCmake = true; + + cmakeFlags = [ + "-DFDB_RELEASE=TRUE" + + # Disable CMake warnings for project developers. + "-Wno-dev" + + # CMake Error at fdbserver/CMakeLists.txt:332 (find_library): + # > Could not find lz4_STATIC_LIBRARIES using the following names: liblz4.a + "-DSSD_ROCKSDB_EXPERIMENTAL=FALSE" + + "-DBUILD_DOCUMENTATION=FALSE" + + # LTO brings up overall build time, but results in much smaller + # binaries for all users and the cache. + "-DUSE_LTO=ON" + + # Gold helps alleviate the link time, especially when LTO is + # enabled. But even then, it still takes a majority of the time. + "-DUSE_LD=GOLD" + + # FIXME: why can't openssl be found automatically? + "-DOPENSSL_USE_STATIC_LIBS=FALSE" + "-DOPENSSL_CRYPTO_LIBRARY=${openssl.out}/lib/libcrypto.so" + "-DOPENSSL_SSL_LIBRARY=${openssl.out}/lib/libssl.so" + ]; + + # the install phase for cmake is pretty wonky right now since it's not designed to + # coherently install packages as most linux distros expect -- it's designed to build + # packaged artifacts that are shipped in RPMs, etc. we need to add some extra code to + # cmake upstream to fix this, and if we do, i think most of this can go away. + postInstall = '' + mv $out/sbin/fdbmonitor $out/bin/fdbmonitor + mkdir $out/libexec && mv $out/usr/lib/foundationdb/backup_agent/backup_agent $out/libexec/backup_agent + mv $out/sbin/fdbserver $out/bin/fdbserver + + rm -rf $out/etc $out/lib/foundationdb $out/lib/systemd $out/log $out/sbin $out/usr $out/var + + # move results into multi outputs + mkdir -p $dev $lib + mv $out/include $dev/include + mv $out/lib $lib/lib + + # python bindings + # NB: use the original setup.py.in, so we can substitute VERSION correctly + cp ../LICENSE ./bindings/python + substitute ../bindings/python/setup.py.in ./bindings/python/setup.py \ + --replace 'VERSION' "${version}" + rm -f ./bindings/python/setup.py.* ./bindings/python/CMakeLists.txt + rm -f ./bindings/python/fdb/*.pth # remove useless files + rm -f ./bindings/python/*.rst ./bindings/python/*.mk + + cp -R ./bindings/python/ tmp-pythonsrc/ + tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ + + # java bindings + mkdir -p $lib/share/java + mv lib/fdb-java-*.jar $lib/share/java/fdb-java.jar + ''; + + outputs = [ + "out" + "dev" + "lib" + "pythonsrc" + ]; + + meta = { + description = "Open source, distributed, transactional key-value store"; + homepage = "https://www.foundationdb.org"; + license = lib.licenses.asl20; + platforms = [ "x86_64-linux" ] ++ lib.optionals (!(avxEnabled version)) [ "aarch64-linux" ]; + # Fails when cross-compiling with "/bin/sh: gcc-ar: not found" + broken = stdenv.buildPlatform != stdenv.hostPlatform; + maintainers = with lib.maintainers; [ + thoughtpolice + lostnet + ]; + }; +} diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index 1a4217ac9050..f90db207f2bf 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "foundry"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "foundry-rs"; repo = "foundry"; tag = "v${version}"; - hash = "sha256-YTsneUj5OPw7EyKZMFLJJeAtZoD0je1DdmfMjVju4L8="; + hash = "sha256-hHvHnSq6XarfofX0G5RE2hIai2eY8Nf1aqgJ5Z6ZuDg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vVRFS7o0zV+ek9ho+URks6peOryMpFCE1sDzN9g7uH0="; + cargoHash = "sha256-spB89RmR6+9L+zo2YOl7fBxcmRdLUELXr8OmUt3waO4="; nativeBuildInputs = [ pkg-config @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/forge"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fo/four-in-a-row/package.nix b/pkgs/by-name/fo/four-in-a-row/package.nix index 96c9c9047584..9b77539522bd 100644 --- a/pkgs/by-name/fo/four-in-a-row/package.nix +++ b/pkgs/by-name/fo/four-in-a-row/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/GNOME/four-in-a-row/-/blob/${version}/NEWS?ref_type=tags"; description = "Make lines of the same color to win"; mainProgram = "four-in-a-row"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/by-name/fo/foxotron/package.nix b/pkgs/by-name/fo/foxotron/package.nix new file mode 100644 index 000000000000..fd541500c049 --- /dev/null +++ b/pkgs/by-name/fo/foxotron/package.nix @@ -0,0 +1,111 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + nix-update-script, + cmake, + pkg-config, + makeWrapper, + zlib, + libX11, + libXrandr, + libXinerama, + libXcursor, + libXi, + libXext, + libGLU, + alsa-lib, + fontconfig, +}: + +stdenv.mkDerivation rec { + pname = "foxotron"; + version = "2024-09-23"; + + src = fetchFromGitHub { + owner = "Gargaj"; + repo = "Foxotron"; + rev = version; + fetchSubmodules = true; + hash = "sha256-OnZWoiQ5ASKQV73/W6nl17B2ANwqCy/PlybHbNwrOyQ="; + }; + + patches = [ + (fetchpatch { + name = "0001-assimp-Include-cstdint-for-std-uint32_t.patch"; + url = "https://github.com/assimp/assimp/commit/108e3192a201635e49e99a91ff2044e1851a2953.patch"; + stripLen = 1; + extraPrefix = "externals/assimp/"; + hash = "sha256-rk0EFmgeZVwvx3NJOOob5Jwj9/J+eOtuAzfwp88o+J4="; + }) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "set(CMAKE_OSX_ARCHITECTURES x86_64)" "" + + # Outdated vendored assimp, many warnings with newer compilers, too old for CMake option to control this + # Note that this -Werror caused issues on darwin, so make sure to re-check builds there before removing this + substituteInPlace externals/assimp/code/CMakeLists.txt \ + --replace 'TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)' "" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = + [ zlib ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXrandr + libXinerama + libXcursor + libXi + libXext + alsa-lib + fontconfig + libGLU + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + + # error: writing 1 byte into a region of size 0 + hardeningDisable = [ "fortify3" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib/foxotron} + cp -R ${lib.optionalString stdenv.hostPlatform.isDarwin "Foxotron.app/Contents/MacOS/"}Foxotron \ + ../{config.json,Shaders,Skyboxes} $out/lib/foxotron/ + wrapProgram $out/lib/foxotron/Foxotron \ + --chdir "$out/lib/foxotron" + ln -s $out/{lib/foxotron,bin}/Foxotron + + runHook postInstall + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "General purpose model viewer"; + longDescription = '' + ASSIMP based general purpose model viewer ("turntable") created for the + Revision 2021 3D Graphics Competition. + ''; + homepage = "https://github.com/Gargaj/Foxotron"; + license = licenses.unlicense; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + mainProgram = "Foxotron"; + }; +} diff --git a/pkgs/by-name/fp/fp16/package.nix b/pkgs/by-name/fp/fp16/package.nix new file mode 100644 index 000000000000..cdd59d613da7 --- /dev/null +++ b/pkgs/by-name/fp/fp16/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fp16"; + version = "0-unstable-2024-20-06"; + + src = fetchFromGitHub { + owner = "Maratyszcza"; + repo = "FP16"; + rev = "98b0a46bce017382a6351a19577ec43a715b6835"; + sha256 = "sha256-aob776ZGjnH4k/xfsdIcN9+wiuDreUoRBpyzrWGuxKk="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + (lib.cmakeBool "FP16_BUILD_TESTS" false) + (lib.cmakeBool "FP16_BUILD_BENCHMARKS" false) + (lib.cmakeBool "FP16_USE_SYSTEM_LIBS" true) + ]; + + doCheck = true; + + meta = { + description = "Header-only library for conversion to/from half-precision floating point formats"; + homepage = "https://github.com/Maratyszcza/FP16"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ phodina ]; + }; +}) diff --git a/pkgs/by-name/fq/fq/package.nix b/pkgs/by-name/fq/fq/package.nix index b388edd34a3f..e18cd0d41e22 100644 --- a/pkgs/by-name/fq/fq/package.nix +++ b/pkgs/by-name/fq/fq/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "fq"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - hash = "sha256-I3mVAPNWjRHG0td1ulzGOthiNybfWLx1HgwPjFfBHCo="; + hash = "sha256-/yRTeWyHVZZzWbkI/VhYD/T5KZq8E2j678LE8gn5ILE="; }; - vendorHash = "sha256-p2cvv983gYTvyLPYIGVsk6N7yUzBpiPzgJ3sMRNWPTo="; + vendorHash = "sha256-vp7JQSnzijCkWximw4E2abd39l0qjIGkl+mPfEoli0w="; ldflags = [ "-s" diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index 9c15ddd6a4e8..b7ffd27ba01b 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -30,19 +30,19 @@ stdenv.mkDerivation rec { pname = "fractal"; - version = "10.1"; + version = "11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; tag = version; - hash = "sha256-61xiHVzmLMbLNZlobH6JVcvuO9eoFwqBZBo1rVtPYOc="; + hash = "sha256-gb6DHb7pFFAmNQxK1vnBQtVRiMRu0BCvkhACkLeRHXs="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-e3IW8D4aLU6d36ErUHDUDiXF1lN4HCn5OCX6GwaT3iQ="; + hash = "sha256-Yc+/aTaIq/9NmdIhHSKixWTwSZRNtxA6p5n9OWkYH/U="; }; patches = [ @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/fractal"; changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; mainProgram = "fractal"; }; diff --git a/pkgs/by-name/fr/fragments/package.nix b/pkgs/by-name/fr/fragments/package.nix index 19bb0a8c9dda..9781462adb76 100644 --- a/pkgs/by-name/fr/fragments/package.nix +++ b/pkgs/by-name/fr/fragments/package.nix @@ -75,12 +75,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/World/Fragments"; description = "Easy to use BitTorrent client for the GNOME desktop environment"; - maintainers = - with maintainers; - [ - emilytrau - ] - ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ + emilytrau + ]; + teams = [ lib.teams.gnome-circle ]; license = licenses.gpl3Plus; platforms = platforms.linux; mainProgram = "fragments"; diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index e57a58ab5b28..b05fc3fffe45 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "framework-tool"; - version = "0.2.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "FrameworkComputer"; repo = "framework-system"; tag = "v${version}"; - hash = "sha256-wWattGkBn8WD3vfThlQnotQB4Q/C00AZT1BesoHcCyg="; + hash = "sha256-eH6EUpdITFX3FDV0LbeOnqvDmbriDT5R02jhM2DVqtA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-kmrgtYXo2Xh4mBk64VE83UJdITHgA/y3VeBRE8gDUTY="; + cargoHash = "sha256-qS65k/cqP9t71TxuqP1/0xIPkhe56WEEbzDzV6JfKrs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index 0ff5e14d3ec0..df45651ae04a 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "frankenphp"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "dunglas"; repo = "frankenphp"; tag = "v${version}"; - hash = "sha256-VOvH4Ma7IRDL2U6ihC620g9hvBcbt4VKP9SQxV1n3RM="; + hash = "sha256-y1S1oPBuXpu2ApCxv9ENqzD2wjSeMzwqnBldmVLEIsM="; }; sourceRoot = "${src.name}/caddy"; @@ -45,7 +45,7 @@ buildGoModule rec { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-ltT6RHGcEMJjCkqWWwtVrCUpPs2F8U0yBx+YbzGwfSo="; + vendorHash = "sha256-M1z9Yv+WomKA+UACOUT8xcWdw+SD1MY2jfaDO4zYUQg="; buildInputs = [ phpUnwrapped diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index 6814a45f2d37..3ab64765ff10 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "free42"; - version = "3.1.10"; + version = "3.3.4"; src = fetchFromGitHub { owner = "thomasokken"; repo = "free42"; - rev = "v${finalAttrs.version}"; - hash = "sha256-X1fNr+0xc15KmR+qbDOkQraYPUj50b1eWmSheIKl4e8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-4EEk11/a9kie1sXO1lpJ7GGqjQ2Wvcvg7uhlD6RzyP0="; }; nativeBuildInputs = [ @@ -26,9 +26,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 ]; - buildInputs = [ - alsa-lib - ]; + buildInputs = [ alsa-lib ]; postPatch = '' sed -i -e "s|/bin/ls|ls|" gtk/Makefile @@ -86,7 +84,6 @@ stdenv.mkDerivation (finalAttrs: { $out/share/icons/hicolor/128x128/apps install -m755 gtk/free42dec gtk/free42bin $out/bin - 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/free42.xpm diff --git a/pkgs/by-name/fr/freealut/package.nix b/pkgs/by-name/fr/freealut/package.nix index ac833b59882f..6ca129b98a5a 100644 --- a/pkgs/by-name/fr/freealut/package.nix +++ b/pkgs/by-name/fr/freealut/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - darwin, fetchurl, openal, testers, @@ -18,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openal - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.OpenAL; + ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/by-name/fr/freecad/0003-Gui-take-in-account-module-path-argument.patch b/pkgs/by-name/fr/freecad/0003-Gui-take-in-account-module-path-argument.patch deleted file mode 100644 index 1d274a373e96..000000000000 --- a/pkgs/by-name/fr/freecad/0003-Gui-take-in-account-module-path-argument.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 23ddb6ff148ec5c27da050ba0eb7a2e449b8450b Mon Sep 17 00:00:00 2001 -From: Yury Shvedov -Date: Mon, 4 Nov 2024 14:22:22 +0300 -Subject: [PATCH] Gui: take in account module-path argument - -Use paths passed with `--module-path` argument to search for preference -packs - -Change-Id: If168dbd99a826757290ee6b918f5b712305fe2bb ---- - src/Gui/DlgPreferencePackManagementImp.cpp | 16 +++++---- - src/Gui/PreferencePackManager.cpp | 39 +++++++++++++++++----- - src/Gui/PreferencePackManager.h | 5 +++ - 3 files changed, 44 insertions(+), 16 deletions(-) - -diff --git a/src/Gui/DlgPreferencePackManagementImp.cpp b/src/Gui/DlgPreferencePackManagementImp.cpp -index a1a0dad41a..50f3982f21 100644 ---- a/src/Gui/DlgPreferencePackManagementImp.cpp -+++ b/src/Gui/DlgPreferencePackManagementImp.cpp -@@ -54,7 +54,7 @@ void DlgPreferencePackManagementImp::showEvent(QShowEvent* event) - // but can only disable individual installed packs (though we can completely uninstall the pack's - // containing Addon by redirecting to the Addon Manager). - auto savedPreferencePacksDirectory = fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks"; -- auto modDirectory = fs::path(App::Application::getUserAppDataDir()) / "Mod"; -+ auto modDirectories = Application::Instance->prefPackManager()->modPaths(); - auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui" / "PreferencePacks"; - - // The displayed tree has two levels: at the toplevel is either "User-Saved Packs" or the name -@@ -66,12 +66,14 @@ void DlgPreferencePackManagementImp::showEvent(QShowEvent* event) - auto builtinPacks = getPacksFromDirectory(resourcePath); - - std::map> installedPacks; -- if (fs::exists(modDirectory) && fs::is_directory(modDirectory)) { -- for (const auto& mod : fs::directory_iterator(modDirectory)) { -- auto packs = getPacksFromDirectory(mod); -- if (!packs.empty()) { -- auto modName = mod.path().filename().string(); -- installedPacks.emplace(modName, packs); -+ for (const auto& modDirectory : modDirectories) { -+ if (fs::exists(modDirectory) && fs::is_directory(modDirectory)) { -+ for (const auto& mod : fs::directory_iterator(modDirectory)) { -+ auto packs = getPacksFromDirectory(mod); -+ if (!packs.empty()) { -+ auto modName = mod.path().filename().string(); -+ installedPacks.emplace(modName, packs); -+ } - } - } - } -diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp -index dfc54240c0..83e32fa05e 100644 ---- a/src/Gui/PreferencePackManager.cpp -+++ b/src/Gui/PreferencePackManager.cpp -@@ -30,6 +30,7 @@ - #endif - - #include -+#include - #include - - #include "PreferencePackManager.h" -@@ -134,12 +135,11 @@ void PreferencePack::applyConfigChanges() const - } - - PreferencePackManager::PreferencePackManager() -+ : _preferencePackPaths(modPaths()) - { -- auto modPath = fs::path(App::Application::getUserAppDataDir()) / "Mod"; - auto savedPath = fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks"; - auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui" / "PreferencePacks"; -- _preferencePackPaths.push_back(resourcePath); -- _preferencePackPaths.push_back(modPath); -+ _preferencePackPaths.insert(_preferencePackPaths.begin(), resourcePath); - _preferencePackPaths.push_back(savedPath); - rescan(); - -@@ -232,6 +232,26 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName, - rescan(); - } - -+// TODO(Shvedov): Is this suitable place for this method? It is more generic, -+// and maybe more suitable place at Application? -+std::vector Gui::PreferencePackManager::modPaths() const -+{ -+ auto userModPath = fs::path(App::Application::getUserAppDataDir()) / "Mod"; -+ -+ auto& config = App::Application::Config(); -+ auto additionalModules = config.find("AdditionalModulePaths"); -+ std::vector result; -+ -+ if (additionalModules != config.end()) { -+ boost::split(result, -+ additionalModules->second, -+ boost::is_any_of(";"), -+ boost::token_compress_on); -+ } -+ result.emplace_back(userModPath); -+ return result; -+} -+ - void Gui::PreferencePackManager::FindPreferencePacksInPackage(const fs::path &mod) - { - try { -@@ -528,7 +548,6 @@ std::vector PreferencePackManager::template - // (alternate spellings are provided for packages using CamelCase and snake_case, and both major English dialects) - - auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui"; -- auto modPath = fs::path(App::Application::getUserAppDataDir()) / "Mod"; - - std::string group = "Built-In"; - if (fs::exists(resourcePath) && fs::is_directory(resourcePath)) { -@@ -536,11 +555,13 @@ std::vector PreferencePackManager::template - std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles)); - } - -- if (fs::exists(modPath) && fs::is_directory(modPath)) { -- for (const auto& mod : fs::directory_iterator(modPath)) { -- group = mod.path().filename().string(); -- const auto localFiles = scanForTemplateFiles(group, mod); -- std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles)); -+ for (const auto& modPath : modPaths()) { -+ if (fs::exists(modPath) && fs::is_directory(modPath)) { -+ for (const auto& mod : fs::directory_iterator(modPath)) { -+ group = mod.path().filename().string(); -+ const auto localFiles = scanForTemplateFiles(group, mod); -+ std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles)); -+ } - } - } - -diff --git a/src/Gui/PreferencePackManager.h b/src/Gui/PreferencePackManager.h -index 301e160df2..e5776e47a0 100644 ---- a/src/Gui/PreferencePackManager.h -+++ b/src/Gui/PreferencePackManager.h -@@ -191,6 +191,11 @@ namespace Gui { - */ - void importConfig(const std::string &packName, const boost::filesystem::path &path); - -+ /** -+ * Get a list of all mod directories. -+ */ -+ std::vector modPaths() const; -+ - private: - - void FindPreferencePacksInPackage(const boost::filesystem::path& mod); --- -2.44.1 - diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 642c2fdf55a4..844285ba5bbc 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -6,11 +6,11 @@ doxygen, eigen, fetchFromGitHub, + fetchpatch, fmt, gfortran, gts, hdf5, - libf2c, libGLU, libredwg, libsForQt5, @@ -37,6 +37,7 @@ qtVersion ? 5, qt5, qt6, + nix-update-script, }: let inherit (python311Packages) @@ -44,6 +45,7 @@ let gitpython ifcopenshell matplotlib + opencamlib pivy ply py-slvs @@ -63,13 +65,13 @@ in freecad-utils.makeCustomizable ( stdenv.mkDerivation (finalAttrs: { pname = "freecad"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = finalAttrs.version; - hash = "sha256-u7RYSImUMAgKaAQSAGCFha++RufpZ/QuHAirbSFOUCI="; + hash = "sha256-VFTNawXxu2ofjj2Frg4OfVhiMKFywBhm7lZunP85ZEQ="; fetchSubmodules = true; }; @@ -79,6 +81,8 @@ freecad-utils.makeCustomizable ( ninja pkg-config gfortran + swig + doxygen wrapGAppsHook3 ] ++ lib.optionals (qtVersion == 5) [ @@ -91,7 +95,6 @@ freecad-utils.makeCustomizable ( [ boost coin3d - doxygen eigen fmt gitpython # for addon manager @@ -99,11 +102,11 @@ freecad-utils.makeCustomizable ( hdf5 libGLU libXmu - libf2c matplotlib medfile mpi ode + opencamlib pivy ply # for openSCAD file support py-slvs @@ -112,7 +115,6 @@ freecad-utils.makeCustomizable ( python pyyaml # (at least for) PyrateWorkbench scipy - swig vtk xercesc yaml-cpp @@ -150,7 +152,10 @@ freecad-utils.makeCustomizable ( patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch ./0002-FreeCad-OndselSolver-pkgconfig.patch - ./0003-Gui-take-in-account-module-path-argument.patch + (fetchpatch { + url = "https://github.com/FreeCAD/FreeCAD/commit/8e04c0a3dd9435df0c2dec813b17d02f7b723b19.patch?full_index=1"; + hash = "sha256-H6WbJFTY5/IqEdoi5N+7D4A6pVAmZR4D+SqDglwS18c="; + }) ]; cmakeFlags = @@ -204,11 +209,20 @@ freecad-utils.makeCustomizable ( postFixup = '' mv $out/share/doc $out + ln -s $out/doc $out/share/doc ln -s $out/bin/FreeCAD $out/bin/freecad ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd ''; - passthru.tests = callPackage ./tests { }; + passthru = { + tests = callPackage ./tests { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "([0-9.]+)" + ]; + }; + }; meta = { homepage = "https://www.freecad.org"; @@ -230,7 +244,10 @@ freecad-utils.makeCustomizable ( right at home with FreeCAD. ''; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ srounce ]; + maintainers = with lib.maintainers; [ + srounce + grimmauld + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/fr/freediameter/package.nix b/pkgs/by-name/fr/freediameter/package.nix new file mode 100644 index 000000000000..594de4833189 --- /dev/null +++ b/pkgs/by-name/fr/freediameter/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + bison, + cmake, + flex, + pkg-config, + gnutls, + libgcrypt, + libidn2, + lksctp-tools, + unstableGitUpdater, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "freediameter"; + version = "1.5.0-unstable-2025-03-16"; + + src = fetchFromGitHub { + owner = "freeDiameter"; + repo = "freeDiameter"; + rev = "8e525acdfd439995f3e8e26d5a802fc4ad95d24c"; + hash = "sha256-ai2R8scP++tdPh303RAl0qdIpehzFoyykAuAyl2w3MA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + bison + cmake + flex + pkg-config + ]; + + buildInputs = [ + gnutls + libgcrypt + libidn2 + lksctp-tools + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Implementation of the Diameter Protocol"; + homepage = "https://github.com/freeDiameter/freeDiameter"; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ ]; + }; +}) diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index 7a01ca62e4c6..ff04378f9f7e 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -11,7 +11,7 @@ libpulseaudio, libsamplerate, libsndfile, - lpcnetfreedv, + lpcnet, portaudio, speexdsp, hamlib_4, @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { codec2 libsamplerate libsndfile - lpcnetfreedv + lpcnet speexdsp hamlib_4 wxGTK32 diff --git a/pkgs/by-name/fr/freeglut/package.nix b/pkgs/by-name/fr/freeglut/package.nix index ca0f1923098f..5a1ef392ff06 100644 --- a/pkgs/by-name/fr/freeglut/package.nix +++ b/pkgs/by-name/fr/freeglut/package.nix @@ -38,11 +38,9 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${libGLX.dev}/include" - "-DOPENGL_gl_LIBRARY:FILEPATH=${libGLX}/lib/libGL.dylib" - "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" + "-DOPENGL_INCLUDE_DIR=${lib.getInclude libGLX}/include" + "-DOPENGL_gl_LIBRARY:FILEPATH=${lib.getLib libGLX}/lib/libGL.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" - "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/by-name/fr/freenect/package.nix b/pkgs/by-name/fr/freenect/package.nix new file mode 100644 index 000000000000..165d914c9ebd --- /dev/null +++ b/pkgs/by-name/fr/freenect/package.nix @@ -0,0 +1,61 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + libusb1, + pkg-config, + libglut, + libGLU, + libGL, + libXi, + libXmu, +}: + +stdenv.mkDerivation rec { + pname = "freenect"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "OpenKinect"; + repo = "libfreenect"; + rev = "v${version}"; + sha256 = "sha256-PpJGFWrlQ5sK7TJxQNoPujw1MxWRjphvblwOqnF+mSg="; + }; + + buildInputs = [ + libusb1 + libglut + libGLU + libGL + libXi + libXmu + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + # see https://aur.archlinux.org/cgit/aur.git/commit/PKGBUILD?h=libfreenect&id=0d17db49ba64bcb9e3a4eed61cf55c9a5ceb97f1 + patchPhase = + lib.concatMapStrings + (x: '' + substituteInPlace ${x} --replace "{GLUT_LIBRARY}" "{GLUT_LIBRARIES}" + '') + [ + "examples/CMakeLists.txt" + "wrappers/cpp/CMakeLists.txt" + ]; + + meta = { + description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; + homepage = "http://openkinect.org"; + license = with lib.licenses; [ + gpl2 + asl20 + ]; + maintainers = with lib.maintainers; [ bennofs ]; + platforms = with lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/by-name/fr/freeplane/deps.json b/pkgs/by-name/fr/freeplane/deps.json index 305e2ac2c7e8..8510b3e0f7bf 100644 --- a/pkgs/by-name/fr/freeplane/deps.json +++ b/pkgs/by-name/fr/freeplane/deps.json @@ -2,22 +2,22 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://josm.openstreetmap.de": { - "nexus/content/groups/public/org/openstreetmap/jmapviewer#jmapviewer/2.22": { - "jar": "sha256-FVkCaot6iIw2P4VobvE6GysHJggIc2vzT+StZNdgf9c=", - "pom": "sha256-4Ry0w5AOSm6yjISq6f3WsMcYsRvtVx7MNM2/R98LawI=" + "repository/releases/org/openstreetmap/jmapviewer#jmapviewer/2.24": { + "jar": "sha256-jZWcMEdLs+8TYtvdtdu9Sna0GH+qFkdI/H9DoHoV5fw=", + "pom": "sha256-nMRkdVlwC/Yd93bHGbExI5EWZEQz2u6DR3nC4ehNEGY=" } }, "https://plugins.gradle.org/m2": { - "com/github/ben-manes#gradle-versions-plugin/0.51.0": { - "jar": "sha256-hDFJ4yuRdmIcz38dtEOECMWp+bWM1XIQU32bc4BUAh4=", - "module": "sha256-vUrCdcs524F7R32ZqxzkZ+BGdOdck8bWiScY1L7PnG4=", - "pom": "sha256-gzhEJF79GHeytCHNoI7uv1zx5O8SBcMXEEe1QGbdkB8=" + "com/github/ben-manes#gradle-versions-plugin/0.52.0": { + "jar": "sha256-zuihUdLgvp86hcouXYeg2lyRpIHt8bx/e1e1Ywj9PA0=", + "module": "sha256-r6cL5O0h646QJ2hPFfpeKXXz0uRtIpN76jmhDkj3nd0=", + "pom": "sha256-WESi8/+pqARY0m7ex3EjeuYxXN3yBp1Qp+hUFj5A8Q0=" }, - "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.51.0": { - "pom": "sha256-oy92kCcy9iIN27EhlfozbDMfT2190MRscHcLOu4dR0E=" + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.52.0": { + "pom": "sha256-sLbWCz+UCuWgFAfwNJ6d86Ayph+FXkoXt9vakSprU3Y=" }, - "com/netflix/nebula/ospackage#com.netflix.nebula.ospackage.gradle.plugin/11.11.1": { - "pom": "sha256-vzFreAr1jNZu6HTiFIpSGFcYGz/pvN36tiQOXikDxPI=" + "com/netflix/nebula/ospackage#com.netflix.nebula.ospackage.gradle.plugin/11.11.2": { + "pom": "sha256-ZpBKvPOdmK/NYrwDdG46QwngmSZoWoizglWVjFIrV9I=" }, "de/jflex#cup-parent/11b": { "pom": "sha256-c4L5m+Pbb+Uh8E1+/XMZ/jlj2nnWXFaOfoofWRLpmHw=" @@ -48,8 +48,13 @@ "jar": "sha256-ml2+P18suRhUyGgsq4AXivpBKrNaWrcYvznOAbNDXZM=", "pom": "sha256-G5+9TzJacembJ5CA1jCE8S2ITUIIGvKY+eVT4f4M10o=" }, - "org/owasp/dependencycheck#org.owasp.dependencycheck.gradle.plugin/9.2.0": { - "pom": "sha256-xnyI3UUHprQVq7gxtUZ7aJfWFW3O7KrBW7AjJUIpHDU=" + "org/owasp#dependency-check-gradle/12.1.0": { + "jar": "sha256-lpnSAK5/W2yxJP/Gsy+AD/ixlwvrfssNAvU1N4PI3Yk=", + "module": "sha256-oCxOdPcgCaEBaeNIFLRSaVuf+oS4IeYHTpRHtUH6JBw=", + "pom": "sha256-5Zh/Zru7t4nISOD7qS2hrvdNhetumFr0dyiEOfG16yc=" + }, + "org/owasp/dependencycheck#org.owasp.dependencycheck.gradle.plugin/12.1.0": { + "pom": "sha256-7XJcyDm/q+ovn+YWfQlsi2+80VYMY4ibl+5JxkIK0DU=" }, "org/xbib/gradle/plugin/jflex#org.xbib.gradle.plugin.jflex.gradle.plugin/1.2.1": { "pom": "sha256-rdhfPghFWqbgA7rr8sZfkLsJ3vnoE6oH3TGltArns0w=" @@ -63,29 +68,29 @@ } }, "https://repo.maven.apache.org/maven2": { - "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/7.0.0": { - "jar": "sha256-pCxnvPjZxR9NzYYlTWKYdjWpaXzRDGSRtXSYOLqr6+A=", - "pom": "sha256-3Prn96stJjHK9pLazzn6yGK3GNEdCwu294+aW6gCjLo=" + "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/7.1.0": { + "jar": "sha256-5WPpmNGkCqFps7QEmbH+WykFxf+O+m8x1mkoF1CuAWY=", + "pom": "sha256-tvR+IDYZ2I8kZZX5nAuNkboc6eSVH0ze36/d7p/tk+o=" }, - "biz/aQute/bnd#biz.aQute.bnd.gradle/7.0.0": { - "jar": "sha256-LMWmnBybMoqsR38mKt0K2MW8K355tbw5OWNCCl4EQhE=", - "pom": "sha256-x2EBfWRP4nI9Gxxlx38fGYKXT0RtqEBoianDvjp07B0=" + "biz/aQute/bnd#biz.aQute.bnd.gradle/7.1.0": { + "jar": "sha256-suyhZYhs+loEQCDZK2qjXS3TTcJ1owebw13likTmqlc=", + "pom": "sha256-b0wmKOQ3xc/EnDrctgKQhApgxdNOOREKyefvPrAg7Yg=" }, - "biz/aQute/bnd#biz.aQute.bnd.util/7.0.0": { - "jar": "sha256-OVddFQJJliqcbUbM5+Zy53fIqGIKHS0iDH8sCnmediM=", - "pom": "sha256-+dgDJLl2Hp3ipFoP6naPWZRH9AxuQZ8gje2MrxIYAMU=" + "biz/aQute/bnd#biz.aQute.bnd.util/7.1.0": { + "jar": "sha256-yNByfcawYZ3MfLEXS9yiHMmGKpFxUVH+MYg0c/bqeyc=", + "pom": "sha256-B09aeI8o6C9LOx4PkyMA1YSRLdd7f5rOFuyFqpZzz40=" }, - "biz/aQute/bnd#biz.aQute.bndlib/7.0.0": { - "jar": "sha256-gKVp0AbzLpJc7kzor5Jrfm/aqqtcy/1f5MnN/5xN0t8=", - "pom": "sha256-mOuywO2iBtxb79bFJsjCAneApDvymekXyzwDXwOYp9I=" + "biz/aQute/bnd#biz.aQute.bndlib/7.1.0": { + "jar": "sha256-loZCHwFO8vLLzT7zuZ3+tJLa/jSUoBZKkzN9+thMdoQ=", + "pom": "sha256-t6x1il/x+1A+xpLzeNLqEmzbdIEtW4W31Y6HyBskvgE=" }, - "biz/aQute/bnd#biz.aQute.repository/7.0.0": { - "jar": "sha256-ggIaWyICKD8J9XpW0zsh+rxvemSFC5FnNdaiZI8nYzc=", - "pom": "sha256-f1ar8LnsiL40/ZCDaYYdnlQwxnu6FROItbf0shvwOTU=" + "biz/aQute/bnd#biz.aQute.repository/7.1.0": { + "jar": "sha256-6ovSZePE1iTMPfhVq2OYrlx0wm8FNv6CxYTgOrTInWo=", + "pom": "sha256-FpetB4Rx6ruAY5MblbOLNLEePzbRfpc0DZ2yM0g10z8=" }, - "biz/aQute/bnd#biz.aQute.resolve/7.0.0": { - "jar": "sha256-nVjTmv0Y/d2LTSHnC4Ui+KUmiH4UUH2UDcfK/p8NCZo=", - "pom": "sha256-UVIg7ZyoHFkzGz/zyuQfkUGMmn0Atavq0nEYS8rNp1Y=" + "biz/aQute/bnd#biz.aQute.resolve/7.1.0": { + "jar": "sha256-+qICWE0kOcJhY784w7sBWwBMh2zBXqPqG9j0T09qTDQ=", + "pom": "sha256-rKn5kputqqO5Zi9gdS5cRYPne38sKpEXQEbfu1tYHDQ=" }, "com/bmuschko#gradle-docker-plugin/3.2.1": { "jar": "sha256-BfgdS5EdMR7nrEhJ6/eLMD4HdDQY1OiaVZVCK/OAIxQ=", @@ -95,101 +100,99 @@ "jar": "sha256-XU1jLPvr/gp2RFAcwwNXC2kUBhgb7mXpkWuSHHZ9fHI=", "pom": "sha256-pRyvwguZFGMaa9scYgE0A2ZJqxjIicgy+HR7SvNZLCo=" }, - "com/fasterxml#oss-parent/56": { - "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" - }, "com/fasterxml#oss-parent/58": { "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" }, - "com/fasterxml/jackson#jackson-base/2.16.1": { - "pom": "sha256-jiOFFhGXyf4S3JlltMi1fz0QMhdRIgW1tgudxnW86o0=" + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" }, "com/fasterxml/jackson#jackson-base/2.17.2": { "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68=" }, - "com/fasterxml/jackson#jackson-bom/2.16.1": { - "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" + "com/fasterxml/jackson#jackson-base/2.18.2": { + "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.1": { + "pom": "sha256-n0RhIo4SkQPu16MC3BABqy5Mgt086pFcKn27jMYe/SU=" }, "com/fasterxml/jackson#jackson-bom/2.17.2": { "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" }, - "com/fasterxml/jackson#jackson-parent/2.16": { - "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + "com/fasterxml/jackson#jackson-bom/2.18.2": { + "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs=" }, "com/fasterxml/jackson#jackson-parent/2.17": { "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" }, - "com/fasterxml/jackson/core#jackson-annotations/2.16.1": { - "jar": "sha256-pHMHceakld03k6Qs24zmvduWx34V9AyY/Y2aeuCecoY=", - "module": "sha256-oBBBBbhXmkrFKxTH+2qLPxPfU9iPT8lCoZrJy/6E9Zo=", - "pom": "sha256-xt/2p4sBSYkppprzZObLeK73LSpFJUuS1klbKhmOwSk=" + "com/fasterxml/jackson#jackson-parent/2.18.1": { + "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" }, "com/fasterxml/jackson/core#jackson-annotations/2.17.2": { "jar": "sha256-hzpgbiNQeWn5u76pOdXhknSoh3XqWhabp+LXlapRVuE=", "module": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688=", "pom": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs=" }, - "com/fasterxml/jackson/core#jackson-core/2.16.1": { - "jar": "sha256-9fjvkGCeZP7ILrkI5JfcfYGy65g/5Qm4cCkqGTzeTfs=", - "module": "sha256-S6CAt7eaIxoJv7AoTCyURJ7OumQzJlWRwe2CDWBzpuI=", - "pom": "sha256-Hu0WEE2ArswTfEH+FuSj/1q5or+ossScV3L+Sl/S5s4=" + "com/fasterxml/jackson/core#jackson-annotations/2.18.2": { + "jar": "sha256-WBvWEADvdkiUP3gcoFaJ5W0D9gUnSDZajis6m10/oy8=", + "module": "sha256-4Ruvm1NubflNqmNaEBPsPgabhmuOES3cKqBEahVQUNw=", + "pom": "sha256-CyvWlOqJJn7qSBJqilskplI0xkM4dULSRGnRlb+6HPg=" }, "com/fasterxml/jackson/core#jackson-core/2.17.2": { "jar": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y=", "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=", "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs=" }, - "com/fasterxml/jackson/core#jackson-databind/2.16.1": { - "jar": "sha256-uvio6+6PRe9ozdXi3Tkjs+KWwJN7luwLSAaqOjG8zR0=", - "module": "sha256-tDy1vynzVFuW6QV0jyU5FpXGIHEwMnxFGT/R3DdI2f8=", - "pom": "sha256-fIprQo6kaI0BIGlWzMr7I6ySj8adcXp2vdd0M0jSjbg=" + "com/fasterxml/jackson/core#jackson-core/2.18.2": { + "jar": "sha256-2AVK58DRwtL1XSjkYCbr5YkogfP6tfQ5IzGEOBw7Sh8=", + "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=", + "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4=" }, "com/fasterxml/jackson/core#jackson-databind/2.17.2": { "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=", "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=", "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.16.1": { - "jar": "sha256-/Wfg+v42itPfwbVF64/ghKXGRij7ce9wvZSk2rJ67/8=", - "module": "sha256-JLJXlaKpoRm/n8FFmEv1nih/OXOV4BC608uGzCEJNiI=", - "pom": "sha256-8Itmf6NFnqLUzRm3lGlICUPtkyMR2gEeY8IFK7I7G/0=" + "com/fasterxml/jackson/core#jackson-databind/2.18.2": { + "jar": "sha256-SzZOaFDciRcvzx1N0muP9UiO2kT/RlfiLdJlID3Vqzw=", + "module": "sha256-jH2sL3J4GNiEeoKqTqxrAXTXnPBN+Q3iJGBy5t005wA=", + "pom": "sha256-STo9tkR7eo7Ls3JCNMbOZ31y20sE9roAjw6+rqe+Wp0=" }, "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.2": { "jar": "sha256-lBvNixOBuzsNcm+rQWJPqOzg7nts8oYK2V6BV85nM3Y=", "module": "sha256-snbSUVf4i+6mnT9ENGWFZLcfMazeHUsaFPiYS+lTw0M=", "pom": "sha256-7eVVk8YoXTmdlgc6GQy5v/QlZ5WqjWO5AXcrsxI+SDs=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.16.1": { - "pom": "sha256-1DusfWR8CD8XI4P8YinkAOSJY6TuCfTqD2LZAySVvJQ=" + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.18.2": { + "jar": "sha256-OBocBxHku4hWGmwACLWpRUZWKMoHdkzNZqDZfuB61hI=", + "module": "sha256-evxmQXLDpubGw1hHZaAyncb+q7/mu6ibrq2L0un77Hs=", + "pom": "sha256-9W9UNh5DSV7TuiShoG8OO3QZA+Q+0TLxpq086QErhBU=" }, "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.2": { "pom": "sha256-5pgyMzCpqCySDlqJtlsPciXI5zPBIqGPeWoEpuMfpcs=" }, - "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.16.1": { - "jar": "sha256-YoGXBoKo2j3brFS7IDybrfHCb1B/PsqkjvEDGFebya0=", - "module": "sha256-kUcpUsDym3P6oCNeMXzrabXy+we+thRESrukR2sK+Yw=", - "pom": "sha256-yd4rhj3RPkYjfRhcHmYEmE9uY0cYWeoNot/E6fLwj/E=" + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.18.2": { + "pom": "sha256-4h1diLBHShG3H+lBAMT1KVv6F08u5q5LCtArdhZHhkg=" }, - "com/fasterxml/jackson/module#jackson-module-afterburner/2.16.1": { - "jar": "sha256-buo8ZzeKJoWnQtLvEdClrONqXbgQDzfa1jAWzkgbhrY=", - "module": "sha256-nxIY0qLO0zslwCGuAOKYVpOVkwBEAPfuoWXfxrjj32w=", - "pom": "sha256-0qJNBRxMST3WxUtss391H/WW2uG5+fCGCIr4ZIyWLb0=" + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.2": { + "jar": "sha256-4tIC1GBuI66vilqWMtsG9f79W2PSUcP1A/n6qnhTDlw=", + "module": "sha256-Jd8o9WC1kI6hAYUATV/Bkyk0hHBj5mcpJID2dbOx7eQ=", + "pom": "sha256-FivnrZea9eDHOc1+0BiJ+Br0ggDJ+RJ5lqElrFGzSkc=" }, - "com/fasterxml/jackson/module#jackson-module-blackbird/2.16.1": { - "jar": "sha256-Y01e36Pm9BUH93r6dle/yGdQ/f3+3NtM2zM3WZ9RoGk=", - "module": "sha256-aNmb1R0/b/lUnynndwr1NdzBcHacKeoPC7N/9NaeTds=", - "pom": "sha256-DWQEPSlS6bDy91QMmhJ0rQGCjm3W3OhRVrzKC+6DX9E=" + "com/fasterxml/jackson/module#jackson-module-blackbird/2.18.2": { + "jar": "sha256-J3Qnx1kiapAEGfVaUuPmzIO1XHl+6PaxBvAEgOEayOk=", + "module": "sha256-toe05zbV2Om55eeZxJRBrhc4fLmhsSKBrZ3N3M2XtLc=", + "pom": "sha256-CK/IpGUUijlQojmyZBOWnxFpOaTwWrzVXCE/jTrcqO0=" }, - "com/fasterxml/jackson/module#jackson-modules-base/2.16.1": { - "pom": "sha256-iv0eHmPCIXlw+WhHArnWX1F7ctlKxmUgFB3j7WgfAtM=" + "com/fasterxml/jackson/module#jackson-modules-base/2.18.2": { + "pom": "sha256-wVCoPSPNizMiqqSYmEh0J5vi3I1f4qN5B9P1arYOJpw=" }, - "com/fasterxml/jackson/module#jackson-modules-java8/2.16.1": { - "pom": "sha256-GIciU1hZ78rlq3XDBi3DLg3ejh6qbBgh9ZBSxCA8RKU=" + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.2": { + "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY=" }, - "com/formdev#flatlaf/3.5.2": { - "jar": "sha256-XsqInA2lfqAnjEHycJKcc1TkNIy19pVttBevpthqklM=", - "module": "sha256-+wkD6Du4IpR7RR6HldWT740GFzDUm0YXJ/HoXDiuyDI=", - "pom": "sha256-IlmtYZtyWJZJWo4XYWmImhM8ncTUvv4HTau9C3ohBQw=" + "com/formdev#flatlaf/3.5.4": { + "jar": "sha256-PDS2rrLxcKlUxDWGR+tDtotEeiw1H/MRBy9xV6XU4v4=", + "module": "sha256-Rjx10DAKwDblv9OLBqPx8Ua/17YdoyYael79bebtqdU=", + "pom": "sha256-ymv/5ynY3zr6lZQM0Wz/dL4eiHIHGP5hCsD+Jv4XsWA=" }, "com/formdev#svgSalamander/1.1.4": { "jar": "sha256-4PGk2RzE9s4I6LRBsbMmuJjiUDZqn0xIk3EoTHhNMhE=", @@ -227,15 +230,15 @@ "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, - "com/google/code/gson#gson-parent/2.11.0": { - "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" + "com/google/code/gson#gson-parent/2.12.1": { + "pom": "sha256-yeewt+Mb574iaEl5wGgAHGUssRPE5u2JTjm2Q97gf8E=" }, "com/google/code/gson#gson-parent/2.9.0": { "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" }, - "com/google/code/gson#gson/2.11.0": { - "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", - "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + "com/google/code/gson#gson/2.12.1": { + "jar": "sha256-6+4T1ft0d81/HMAQ4MNW34yoBwlxUkjal/eeNcy0++w=", + "pom": "sha256-C1c17IX0UoLx4sdpd5gAQnsVCoFj9AUJOpKAtxyrGXg=" }, "com/google/code/gson#gson/2.3.1": { "pom": "sha256-gvqiGq/oQRqWwbvSKjDi1jnl9PxHFreWu3Dbw3n3Oec=" @@ -244,42 +247,39 @@ "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" }, - "com/google/errorprone#error_prone_annotations/2.21.1": { - "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=", - "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI=" + "com/google/errorprone#error_prone_annotations/2.36.0": { + "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=", + "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw=" }, - "com/google/errorprone#error_prone_annotations/2.27.0": { - "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", - "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + "com/google/errorprone#error_prone_parent/2.36.0": { + "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw=" }, - "com/google/errorprone#error_prone_parent/2.21.1": { - "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw=" - }, - "com/google/errorprone#error_prone_parent/2.27.0": { - "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" - }, - "com/google/guava#failureaccess/1.0.1": { - "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", - "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" }, "com/google/guava#guava-parent/26.0-android": { "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" }, - "com/google/guava#guava-parent/32.1.3-jre": { - "pom": "sha256-8oPB8EiXqaiKP6T/RoBOZeghFICaCc0ECUv33gGxhXs=" + "com/google/guava#guava-parent/33.4.0-jre": { + "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc=" }, - "com/google/guava#guava/32.1.3-jre": { - "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q=", - "module": "sha256-9f/3ZCwS52J7wUKJ/SZ+JgLBf5WQ4jUiw+YxB/YcKUI=", - "pom": "sha256-cA5tRudbWTmiKkHCXsK7Ei88vvTv7UXjMS/dy+mT2zM=" + "com/google/guava#guava/33.4.0-jre": { + "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=", + "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=", + "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s=" }, "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" }, - "com/h2database#h2/2.1.214": { - "jar": "sha256-1iPNwPYdIYz1SajQnxw5H/kQlhFrIuJHVHX85PvnK9A=", - "pom": "sha256-UX4aBXKZSVISML9WJlvaxaI5/bkOrWyqhfDGppzX+AM=" + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/h2database#h2/2.3.232": { + "jar": "sha256-ja5i0i24mCw9yzgm7bnHJ8XTAgY6Z+731j2C3kAfB9M=", + "pom": "sha256-7O2yquV8vtuMAhfSC5O9Ld6IAxGYwgQlGoEHu4Mr+fA=" }, "com/h3xstream/retirejs#retirejs-core/3.0.4": { "jar": "sha256-70KQSbHoKL/OCpiGl2Wn8Q19r0GssDIB/NNAT0JNDDc=", @@ -304,14 +304,14 @@ "jar": "sha256-9UdeY+fonl22IiNImux6Vr0wNUN3IHehfCy1TBnKOiA=", "pom": "sha256-W3YhZzfy2pODlTrMybpY9uc500Rnh5nm1NCCz24da9M=" }, - "com/netflix/nebula#gradle-ospackage-plugin/11.11.1": { - "jar": "sha256-NAJ6yECtuBuA3kMILOM1plGIdSF6OKwCBNWoTcZpt6w=", - "module": "sha256-wb4zriytcHAJd+7KHPhLTNtJXJY7xYjXaAehe+94Lcc=", - "pom": "sha256-2XSxaCnczZP7kLyVaJAFVcxrgJhvSc/yxIZaIANLBPA=" + "com/netflix/nebula#gradle-ospackage-plugin/11.11.2": { + "jar": "sha256-LK0NCvBVFOB7Fj0w1xxIbvGiBSZezEgh+PuaEh8sq+U=", + "module": "sha256-FTJND05U9nWSAFQPvMRs9I2OetMUWEwEG4Bw7CLqhqQ=", + "pom": "sha256-4dxl2jzRoP7ngmshQs3GIR4gBaBOnKNrq/maGYKB0R8=" }, - "com/samskivert#jmustache/1.15": { - "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", - "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k=" + "com/samskivert#jmustache/1.16": { + "jar": "sha256-PUuYSr1mkI8Fs4yciSMlzUeF0B/zOSJWn/m5DJ6/xHU=", + "pom": "sha256-jfAjEZyty27FeAq8jmH4c8VyBl2Z07pkbiUMRpPnc1Q=" }, "com/squareup/moshi#moshi-kotlin/1.12.0": { "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", @@ -323,19 +323,19 @@ "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=", "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k=" }, - "com/squareup/okhttp3#okhttp/4.11.0": { - "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", - "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", - "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94=" + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" }, - "com/squareup/okio#okio-jvm/3.2.0": { - "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", - "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", - "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" + "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", + "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", + "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" }, - "com/squareup/okio#okio/3.2.0": { - "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", - "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" }, "com/sun/activation#all/1.2.0": { "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" @@ -348,9 +348,9 @@ "jar": "sha256-IfuiL4MOkmjwfPSrLZnoGBq73LDLke4CKOs8uRjc3R0=", "pom": "sha256-xSpmFtBO+zDJ7eq57oKwWR5NBNOOAwv4HiUHdlUtIV0=" }, - "com/tngtech/archunit#archunit/1.3.0": { - "jar": "sha256-U2JATLWVsxvZKk0PrvQK3MS9Jz2gyIEavvf8yHnnyyY=", - "pom": "sha256-8xM35B4lX6BfWBsMtjpdmq6E6Udg4Qa5k7FcinF4fQo=" + "com/tngtech/archunit#archunit/1.4.0": { + "jar": "sha256-9KS0ICiNMQxjgKECjQEThZDYsLRC6lLkr6/GG+g3pII=", + "pom": "sha256-djsKKasl8C6bSOJwxd9u0gM1LtaTYL3BYn4cierSNJk=" }, "com/twelvemonkeys#twelvemonkeys/3.12.0": { "pom": "sha256-ttCYdPvd2bslDReBepMe+OCTvBjnQob/BrBAVBmAxzA=" @@ -393,14 +393,14 @@ "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" }, - "commons-codec#commons-codec/1.16.1": { - "jar": "sha256-7Ie/tV8iy9GyHiGQ7toosrMS7SpDHuSfvcwBgS0EpeQ=", - "pom": "sha256-uCbd2S+dfMZDcaAvoIMMFU1nyYNw6lSi0ZbnLrWQrSg=" - }, "commons-codec#commons-codec/1.17.1": { "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" }, + "commons-codec#commons-codec/1.18.0": { + "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=", + "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4=" + }, "commons-collections#commons-collections/3.2.2": { "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" @@ -413,13 +413,9 @@ "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" }, - "commons-io#commons-io/2.16.1": { - "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", - "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" - }, - "commons-io#commons-io/2.17.0": { - "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=", - "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek=" + "commons-io#commons-io/2.18.0": { + "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=", + "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o=" }, "commons-lang#commons-lang/2.6": { "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", @@ -429,13 +425,13 @@ "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=", "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ=" }, - "commons-logging#commons-logging/1.3.0": { - "jar": "sha256-ZtPJgEcLmbDFEdrT38CueyZewfsUTpa8AlOooXX9NNk=", - "pom": "sha256-je/afOtIiP/k1OYyeJVqGjxRS3W4Nj1nFqG9Zv6WLH8=" + "commons-logging#commons-logging/1.3.4": { + "jar": "sha256-vC3+MvHvBlCeagZRRMGt97Qg6r8RqH8wvRJ/j6ozIBY=", + "pom": "sha256-1L2jSJKqzL9PrTP8MjqKqQfvnXmYRlnaJJRMCoa/CGU=" }, - "commons-validator#commons-validator/1.8.0": { - "jar": "sha256-EpLkvZVpNkYaYJawlEAPXCqUYmfC4gMkUSrHUywMbrM=", - "pom": "sha256-rQh4fwxzi1BNdoDgb6acXRp0uWPbmADEjl8jJMH13h8=" + "commons-validator#commons-validator/1.9.0": { + "jar": "sha256-w8FHSOLXjbWN+IgIdAcRvWQ7MsRf+nuKc58A+0Z819c=", + "pom": "sha256-nJ2zFBCOL12+ZJZKZz7UVcb4dsWux3TZmQYq5bmStjs=" }, "de/sciss#syntaxpane/1.3.0": { "jar": "sha256-aBm3LpRQ2u5e9WMeq1pHT2BFJo2MZjugKAzQZHMtsgM=", @@ -454,14 +450,14 @@ "module": "sha256-XBWwnUNExkubH+LzjSR0Z+S3daWQikxK+fAfj9ehTs8=", "pom": "sha256-tF+wHKhQ/1dB/wIlu0G5zmwAHcvZh6X18ecEG5fh8vk=" }, - "io/github/jeremylong#open-vulnerability-clients/5.1.1": { - "module": "sha256-aWu9vGm8th/wHqwnDyE1qc3QG5j653K6qgoP9NfGM2M=", - "pom": "sha256-EFcbV6v8YBe++PYLY6+/sA8hgBhfOrhHslDmlZ1j4mc=" + "io/github/jeremylong#open-vulnerability-clients/6.1.7": { + "module": "sha256-F/IdmAXYICSjJfG85eAJJPVyjI8+T1mlqZp4qv6DBPM=", + "pom": "sha256-udAjbx4xj6sN+2wkFWHZN6nHTOYoO5bJ5LYge95HSHo=" }, - "io/github/jeremylong#open-vulnerability-clients/6.0.1": { - "jar": "sha256-6TA0dSHcEeknJp3qGnHHQ9AJfj/oDTQZVGalkzr9teM=", - "module": "sha256-7y8OnQa6gpU0b3wVMzIPwp2ixArCLs0rZYEaHHjysVU=", - "pom": "sha256-ugtFQ66Bp78kPLRzsw5WVIwQe9NkKqktcW1wtg1mhmE=" + "io/github/jeremylong#open-vulnerability-clients/7.2.2": { + "jar": "sha256-dnIB9RG5mxEBtqsWCHgSIVYGr2QLtjI5i8LZwP/Xg1U=", + "module": "sha256-qnMwVlSb0/Nq/fLK6eO7IpbXu7mkVKtsrZmgXtgwPV8=", + "pom": "sha256-HZEtJbmqERPi8oNNjI0SoW0GnId7rA1CGOsqTbxJSOk=" }, "jakarta/transaction#jakarta.transaction-api/1.3.3": { "jar": "sha256-CwKhlN0E7i4ZLcnalXnhCVXdborHB638kdkvEZsOZ6s=", @@ -490,24 +486,30 @@ "jar": "sha256-l9GsqsgkCb5C5iLXpU066dCFF+iu/eo9K6l5EVDC8C0=", "pom": "sha256-Hfe28I37gaJo1rk7ZZpqnjicXYwyvfB1Qji6ZIOk6YI=" }, - "joda-time#joda-time/2.10.4": { - "jar": "sha256-rG/aiYl3V3b0KN+LWkUXzbBtkjRlq/m9oHRuwH38xlc=", - "pom": "sha256-mby5zmO1yG6E9IMctY+dwsFAmz6jY0HpD2j0OoMdQYk=" + "joda-time#joda-time/2.13.1": { + "jar": "sha256-qb5HtGOQ96bausx8BVtP62+48iJUd6cnCoIzspbiZnc=", + "pom": "sha256-bhXjdGnZeqLHZ8j9XmZMa8uTOr1GKqDhq36yp41p6QM=" }, "junit#junit/4.13.2": { "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" }, - "net/bytebuddy#byte-buddy-agent/1.15.4": { - "jar": "sha256-HXbe/RWaVkuct6lo0N6ic2e4tw6951qWjn7xkhvHXuQ=", - "pom": "sha256-UJEHS07O1v8WbjlDlHRk/0Lac5Y4BC34aDuj6MIJ51U=" + "net/bytebuddy#byte-buddy-agent/1.15.11": { + "jar": "sha256-MW0sB5XCpNTEdW8ub5NJg3x0MKw04Ed+rYdNBfXMGeU=", + "pom": "sha256-tfoTlvFHl7jYCIJ+d0O6il8gO0iJvjLklj1EvV7XWag=" }, - "net/bytebuddy#byte-buddy-parent/1.15.4": { - "pom": "sha256-lwLCIT4/23CHv9M0tjQ80F9EUIqT64+Uqn2mVKwftI8=" + "net/bytebuddy#byte-buddy-parent/1.15.11": { + "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY=" }, - "net/bytebuddy#byte-buddy/1.15.4": { - "jar": "sha256-Smg9g/8hnyDUTzXKMC2CHgxoQuP6j58e6RPrFvSc7Gw=", - "pom": "sha256-L7uet+1bcChb8EOXvnjcKoUdDcLnSGXYFJfGGomOIb0=" + "net/bytebuddy#byte-buddy-parent/1.17.1": { + "pom": "sha256-OPWUZ1D9VEbI1XNxjJgTON69VijEMHP/pNI9l7+YU60=" + }, + "net/bytebuddy#byte-buddy/1.15.11": { + "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4=" + }, + "net/bytebuddy#byte-buddy/1.17.1": { + "jar": "sha256-Byc/BfkbTSDrVUcHVieuf0CxNEfCDnvtqKqsVdSqp2g=", + "pom": "sha256-WMCnRXLL8R+VLlXqc+o1KjPPxAxknIfb3AGAPqXAFfo=" }, "net/gpedro/integrations/slack#slack-webhook/1.4.0": { "jar": "sha256-uaZg4gvqtDOShH2SLBMEXFMZ7Mq/QpK5b/kadO6NmGU=", @@ -519,6 +521,11 @@ "net/java#jvnet-parent/5": { "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" }, + "net/sourceforge/plantuml#plantuml/1.2025.2": { + "jar": "sha256-HNWZfjU/wjv53c941XuoRsGqijPcTjeHhyyN7DT9Nc4=", + "module": "sha256-CLTjkdBHwh6vXj8mVU/IPExtMgTPmnWrU8+XPZ7RwP0=", + "pom": "sha256-C73x6Tq5nXeb9km7RGVaOw5bIpdvTo9MsPRgDC+NY14=" + }, "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" @@ -554,9 +561,6 @@ "org/apache#apache/30": { "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" }, - "org/apache#apache/31": { - "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" - }, "org/apache#apache/32": { "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" }, @@ -578,10 +582,6 @@ "jar": "sha256-QqfKfnu3d/5+51pe1MxSnHZrxDSGNn/arQq0oy7pwkk=", "pom": "sha256-EbhxKkzpqAkSrpUFpGq8Wy0Gz9GIksndJo6zBpBW5Mk=" }, - "org/apache/ant#ant-launcher/1.10.14": { - "jar": "sha256-8JCXJaeiTjk4iPP7tVg0er9QbOL368WB/yYzG5TZUaU=", - "pom": "sha256-nJ2qQSPp63BzVnk2UsOIo1UQqqWm0UW0T4VdCN1LK7w=" - }, "org/apache/ant#ant-launcher/1.10.15": { "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" @@ -592,9 +592,6 @@ "org/apache/ant#ant-parent/1.10.12": { "pom": "sha256-xRn01Hu/nN/Q0BHsaFQpX8qB5aCeOLhfluJvdtgOX4g=" }, - "org/apache/ant#ant-parent/1.10.14": { - "pom": "sha256-CBYQamBniMJw767yFWLPy9j0uvfafBG85RSetWYbMx8=" - }, "org/apache/ant#ant-parent/1.10.15": { "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA=" }, @@ -605,10 +602,6 @@ "jar": "sha256-XGpDjD6+ejBuukUrCfowew5gMUkmF3kgvKiWxKUE6vY=", "pom": "sha256-p3Tv7ZNYkCcKzNRg5dRl0vRaAZx4oOeCF8Qryc9vZdA=" }, - "org/apache/ant#ant/1.10.14": { - "jar": "sha256-TLvZJD3kwQQtYdmhXbTEPJD/k7FteLOUgdoclWyOlnE=", - "pom": "sha256-L6QmnmscRXI6iojmnZhKdm27IEzQ/pgUlMzfP+469lw=" - }, "org/apache/ant#ant/1.10.15": { "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" @@ -620,24 +613,24 @@ "org/apache/commons#commons-compress/1.21": { "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" }, - "org/apache/commons#commons-compress/1.26.1": { - "jar": "sha256-J7tdQPN8O7cgW0oFQCR98FdxXp9su9l9Ymq4tQMYuwQ=", - "pom": "sha256-X0SKAh2IyW84QN/mGRKNYuXPticSzW5m3KincElFsG4=" + "org/apache/commons#commons-compress/1.27.1": { + "jar": "sha256-KT2A9UtTa3QJXc1+o88KKbv8NAJRkoEzJJX0Qg03DRY=", + "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw=" }, - "org/apache/commons#commons-dbcp2/2.12.0": { - "jar": "sha256-m4HqZjudslW87GsIqSRe3QW92xVcSTQ+7wm22BVY7T4=", - "pom": "sha256-ewxOiJzDxlZnuXrGhVO/m+iqPcMDR8d4LIATPk1l4Q8=" + "org/apache/commons#commons-dbcp2/2.13.0": { + "jar": "sha256-228O1xzRbIgwkC259WCV+i7haswmdPhLfLW9yY3xk5I=", + "pom": "sha256-x4go9Jdmc9FcLI406nXxDBWbfT2aD1CG50bCpSOVEgE=" }, - "org/apache/commons#commons-jcs3-core/3.2": { - "jar": "sha256-dH899tksRdZAndnVT08omOyvGkgpXDj4dsdUKasRxzA=", - "pom": "sha256-8e/SI40PxWsp235VmmuQsr8CaMX2szLJjW0DqvfKO80=" + "org/apache/commons#commons-jcs3-core/3.2.1": { + "jar": "sha256-Esb+CCI4IAifYJabYIjmrF01iqhy3ng1dYXNrLbGEEk=", + "pom": "sha256-mPRXz2jdGAZYQenyWlM+bQgYNrciZtshamB+q4C78QI=" }, - "org/apache/commons#commons-jcs3/3.2": { - "pom": "sha256-kTQ8zHM2CXfNRPthnJ7aJjyocYUlF554r+4LvE3AjkY=" + "org/apache/commons#commons-jcs3/3.2.1": { + "pom": "sha256-DWhp9MPpTUGxId766TfUQKBaZcfkfDDXJEZ97PIanN8=" }, - "org/apache/commons#commons-lang3/3.14.0": { - "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", - "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" + "org/apache/commons#commons-lang3/3.17.0": { + "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", + "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" }, "org/apache/commons#commons-lang3/3.9": { "pom": "sha256-pAIkKbmEJbQwGBkVchJ5pS9hDzRki9rEh9TKy76N/rU=" @@ -663,31 +656,31 @@ "org/apache/commons#commons-parent/62": { "pom": "sha256-dM1i1osJqtf7lCTqiCaat2q6DWUIjZVp/yc70gdCdDk=" }, - "org/apache/commons#commons-parent/64": { - "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" - }, - "org/apache/commons#commons-parent/65": { - "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" - }, - "org/apache/commons#commons-parent/66": { - "pom": "sha256-SP1tyEblax9AhmDRY+dTAPnjhLtjvkgqgIKiHXKo25w=" - }, - "org/apache/commons#commons-parent/69": { - "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + "org/apache/commons#commons-parent/70": { + "pom": "sha256-YDNaNOkfSc5QcjsAfXwSUU/Vdm2hff/7ZzLhEx5YzRs=" }, "org/apache/commons#commons-parent/71": { "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" }, - "org/apache/commons#commons-parent/74": { - "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss=" + "org/apache/commons#commons-parent/72": { + "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA=" + }, + "org/apache/commons#commons-parent/73": { + "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o=" + }, + "org/apache/commons#commons-parent/78": { + "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4=" + }, + "org/apache/commons#commons-parent/79": { + "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo=" }, "org/apache/commons#commons-pool2/2.12.0": { "jar": "sha256-bTvRjfhBDz4xsDGspYLMEJNCNYpionWevQxM3zDQb4s=", "pom": "sha256-Nw08lR5xtA48XKda+XK14fD4ms24UwsUYncYq0pEIwA=" }, - "org/apache/commons#commons-text/1.12.0": { - "jar": "sha256-3gIyV/8WYESla9GqkSToQ80F2sWAbMcFqTEfNVbVoV8=", - "pom": "sha256-stQ0HJIZgcs11VcPT8lzKgijSxUo3uhMBQfH8nGaM08=" + "org/apache/commons#commons-text/1.13.0": { + "jar": "sha256-HjI6UBEn33jtCYfzRdadZdDqf6PU+1s/hKrro6iyDzg=", + "pom": "sha256-1GYUvcptEZXDM7qfcwzQhYXE8zKkPqe5C2A1rYBIcdg=" }, "org/apache/groovy#groovy-all/4.0.23": { "module": "sha256-hpx0QnCDmcotEJnjHCOa+6kF5vsDSNbBuIzsuJFVPmk=", @@ -810,53 +803,51 @@ "org/apache/httpcomponents#httpcomponents-parent/13": { "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M=" }, - "org/apache/httpcomponents/client5#httpclient5-parent/5.2.1": { - "pom": "sha256-Dh6u8QHwRZEp9HElsL2UpYObn1TYKyxfNVGlfM74VkE=" + "org/apache/httpcomponents/client5#httpclient5-parent/5.4.2": { + "pom": "sha256-d2r5CnR0EULt8vvx+XpMAwrl+QT8PW2H6PNOilmb4Ug=" }, - "org/apache/httpcomponents/client5#httpclient5/5.2.1": { - "jar": "sha256-k1Xzh2uvgv7BPO0iwSti1XU2Iwg2QG01lFkSjk9z7VE=", - "pom": "sha256-RlsNajRmSds3SFsPpmBiG0qN+QCGP6GYcJ8ZjVR+G9s=" + "org/apache/httpcomponents/client5#httpclient5/5.4.2": { + "jar": "sha256-oKnc02lqYoH4LjktOapnS/lmJJZgVBHeKgDURDWn+yY=", + "pom": "sha256-Uzeacw5Oy6ug1EvSqXPlqxtjI958xHxPEAmmZmjiPmU=" }, - "org/apache/httpcomponents/core5#httpcore5-h2/5.2": { - "jar": "sha256-Wgh/uMYZl51JKoNUbzUd2t8ysozGoykjIp8/x3cXFXg=", - "pom": "sha256-WdDu5k/MP0VJqLoeDJnaEl9GQhxo/GPsynL8j28sPuI=" + "org/apache/httpcomponents/core5#httpcore5-h2/5.3.3": { + "jar": "sha256-oSH0sU7FJeVOKbn123uT9Kl+CId06BxxQ7UZj2fYG+w=", + "pom": "sha256-DG+UMCpWYarEjlb6GiyYSNTYyEqTgBa5lvV11y5lyP8=" }, - "org/apache/httpcomponents/core5#httpcore5-parent/5.2": { - "pom": "sha256-1/fv7GCeD91+OubrOlUAWOb5Pl0sJCTXSyHej3U291A=" + "org/apache/httpcomponents/core5#httpcore5-parent/5.3.3": { + "pom": "sha256-GpQSCJ6gfk/7CvecgWsepVXpx/aoYZvhCajdGWUVQJA=" }, - "org/apache/httpcomponents/core5#httpcore5/5.2": { - "jar": "sha256-KTMhy/WU156ooMsCFPdfFG0X8Ii+F61c4Rwv6GTfEkw=", - "pom": "sha256-EHqMsQtc5ARGTq/B9nscEy8GgxDzC4bYpMCkTakFfyU=" + "org/apache/httpcomponents/core5#httpcore5/5.3.3": { + "jar": "sha256-CHt66b3p01GLS10G81YNf9DbBAmGVedrZOeRdzhH1QM=", + "pom": "sha256-23qZ78VZF+iY4vdeZAbqWhpMyMcQPoo5zdyFsdPzFCk=" }, - "org/apache/ivy#ivy/2.5.2": { - "jar": "sha256-mEKNVF6mPNmgqvJVyvQsuMtk/kMNu15wmu1TbU2u7QQ=", - "pom": "sha256-SrIWH63j2EHp2H8iVfdgfLiHCcbISPf7JdBmkd2VbkQ=" + "org/apache/ivy#ivy/2.5.3": { + "jar": "sha256-lQKqWqvwsUhJJKE+9LXSTxIff5GqtnaPEcydCQbAgDs=", + "pom": "sha256-uwX5Ztsh4F0Rq52AFoUB8Tf0SWsx4PwggFQ0E4q2W1M=" }, - "org/apache/lucene#lucene-analyzers-common/8.11.3": { - "jar": "sha256-mTkvLYrLmp6GdpUflrDBkWBMVB0/K/Yjxg8YAd+isbk=", - "pom": "sha256-e4O1sIhXd8zHh+wNOamjyWtJM/8RjtEAincD8gNgrMU=" + "org/apache/lucene#lucene-analysis-common/9.12.0": { + "jar": "sha256-jHnYdB9xHMbXUBgFsD97X1BYBdCcqxvrlfC+JLbSdlU=", + "pom": "sha256-i1dJaBafgACTgaownJTuH++fPeCcfkyljJhkyBzOi4c=" }, - "org/apache/lucene#lucene-core/8.11.3": { - "jar": "sha256-ooqyQNGJSAbcfSbfwZYGBluvDzmwgjP9nteJjzjlX0g=", - "pom": "sha256-jh5elWPH3xD8ORFQ9ZKGTbdjM+oMgAxtR1U9P6shEFk=" + "org/apache/lucene#lucene-core/9.12.0": { + "jar": "sha256-bHt3S3XNjzaeJG82WkfKpUrpkcrmr6ScfzOemSHKWKA=", + "pom": "sha256-jyRLkMMPXwPnD9tVYKOb3MlAkrBvNsH5Erdr6zA6Y5I=" }, - "org/apache/lucene#lucene-parent/8.11.3": { - "pom": "sha256-TvlzkeM6R/0GrqDHQCsCvXUSuETdb0p6fHOaDI6zjYY=" + "org/apache/lucene#lucene-facet/9.12.0": { + "jar": "sha256-PAd1TwofRbpCpjf6qFaMGFB976a3eh7XGvKRzU56xgM=", + "pom": "sha256-vjsMdXa7WGFUwbRFrbH27OCDp4CKduX4EkPiAHF/aZA=" }, - "org/apache/lucene#lucene-queries/8.11.3": { - "jar": "sha256-pRv5XohQe7hV3OYuY0kCv6Tvtrji6eZzo7uFwUb47iU=", - "pom": "sha256-HFM2jieSGd9sr1KeIDneQQ44rmFiwc7jTXfgqkdLx94=" + "org/apache/lucene#lucene-queries/9.12.0": { + "jar": "sha256-O02msWc+Tt0UHHuGU4zGH2/zOGEG8fXhecn+LTDqL8o=", + "pom": "sha256-ZqZ+FVBjdgi0TKUzTkLS+4d/4YkxO7M6/jYm3ThKtqo=" }, - "org/apache/lucene#lucene-queryparser/8.11.3": { - "jar": "sha256-Wi//TLw+prDf4btmA03cmHXnp4oVzA+77Kl1JuyFcTY=", - "pom": "sha256-nUFO+q44UE97RJ6IeNU9tUwB+hQGPfXnUc7VjSMZVTo=" + "org/apache/lucene#lucene-queryparser/9.12.0": { + "jar": "sha256-/IZre7/BmUNv6yS+fdXFdURTQusoO/4H3VGeqxMdNnU=", + "pom": "sha256-SqbvhTagOYOXAhtVRG5AXroHW+TvStux/PRvHODInQc=" }, - "org/apache/lucene#lucene-sandbox/8.11.3": { - "jar": "sha256-qm2kQPAtizaRXPVtKuxtajHO512UdtoWVnsEbuNi7K4=", - "pom": "sha256-TbFPDhLzCEKbUNcMV9vlLoHmMJ8UPiOY7xMF6nBD0eg=" - }, - "org/apache/lucene#lucene-solr-grandparent/8.11.3": { - "pom": "sha256-+2LLyPLcYfE+IRtn0/+spi0SOkV98gn2v3yVR+oEGxk=" + "org/apache/lucene#lucene-sandbox/9.12.0": { + "jar": "sha256-ImLzmiQfQ126YfIw51KCBcNPS/AAj6pX8ICEdrt4KZY=", + "pom": "sha256-pFYZNBt/iYTipfTq/73OZGpZZzbFZ9O7ofQHqxV2rBg=" }, "org/apache/maven#maven-archiver/3.5.1": { "jar": "sha256-0GdEafjm+8hm28XJVUY9dim3dVrHyHojW5Rp2CV9a4w=", @@ -889,15 +880,15 @@ "org/apache/pdfbox#pdfbox-parent/2.0.27": { "pom": "sha256-4mbfDSSS71+JopUQrkv35b0RW82duwFn+bZaPZzB3Po=" }, - "org/apache/velocity#velocity-engine-core/2.3": { - "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=", - "pom": "sha256-1CQqYXQkPx5oBDRXG6TmoduuGZwLw1Cph9X7nDzh4NM=" + "org/apache/velocity#velocity-engine-core/2.4.1": { + "jar": "sha256-HBkVfRFx1WAIjkhb6XyTp6L36fVuUX8KMCc8XDnfYjE=", + "pom": "sha256-rHzZTw2fs5vLo7KCh8TEAAXcD1OphvtYfk9npMyz5bY=" }, - "org/apache/velocity#velocity-engine-parent/2.3": { - "pom": "sha256-TA5KkvaHDzmblG1bt4nRd+SkeUEUfD/dwubwY+nLlts=" + "org/apache/velocity#velocity-engine-parent/2.4.1": { + "pom": "sha256-jvtmG34bRLegVvI2UKsrQ7j82wm74uw9PQIYXVZY/Uo=" }, - "org/apache/velocity#velocity-master/4": { - "pom": "sha256-eirHPJDdEEtaB+bizQPpXsKNKfO4ME891//87LBJcS4=" + "org/apache/velocity#velocity-master/7": { + "pom": "sha256-lDoEbB/jayizzqEfsNNOi4NrJFQzCH+PqRbAp1I5MYE=" }, "org/apache/xmlgraphics#batik-anim/1.18": { "jar": "sha256-1Ky3ATHr55WDGrJcIQyklh4CK8gHFbIN1b0Vd8alUK4=", @@ -1008,30 +999,30 @@ "jar": "sha256-oUgPVg83NV9sBFjFI72kZljaTNPiPMZOMJ/tzXsHgro=", "pom": "sha256-hhppAMWT7SJoYA3RdxPseJHZM8oBnTlQm0bzGBJ0Xcs=" }, - "org/assertj#assertj-core/3.26.3": { - "jar": "sha256-TC+GQY/0fua2f7xq2xlOgCGbeTKBs72ih5nUQlvJoL0=", - "pom": "sha256-fXXFEKu7fcuR+zXOLxQG6AAP+rnuGPqpqt8xXxlzgWY=" + "org/assertj#assertj-core/4.0.0-M1": { + "jar": "sha256-A4UqtbRBnBsLNomTDNwaxPDEN6DICUqQA3DcsXDPu0Y=", + "pom": "sha256-hLFqlsHMdHVcoI+jS8RmCG1HqlWPOugx+z1HaMu9zsQ=" }, "org/bouncycastle#bcpg-jdk15on/1.69": { "jar": "sha256-o5hP9/2VGNAAlONPPT5xSkgj8lBa2hwZs1wSnib2OTQ=", "pom": "sha256-2iKA/jlan+d4adxcwAqpvuiPaUx8R4XqEHOXIrafrU8=" }, - "org/bouncycastle#bcpg-jdk18on/1.71": { - "jar": "sha256-V/mrdqg1irvqkLoe+OVTuK49B7IzcHikyiCxy9SLTsU=", - "pom": "sha256-HZAWwSXnJp1y/KeGINan6Jha9hCfAI3MQs7H65MTEy0=" + "org/bouncycastle#bcpg-jdk18on/1.78": { + "jar": "sha256-IbecJrN0cFxbgpW0WBRMNo5UXLXa07qSEOW+8SaeBb4=", + "pom": "sha256-B4xQkcGL8iIWTtzvIeajYasiK0dreyq5lF6JwOH1MNc=" }, "org/bouncycastle#bcprov-jdk15on/1.69": { "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" }, - "org/bouncycastle#bcprov-jdk18on/1.71": { - "jar": "sha256-80M6l9eA/p+j3D1WKkHezVmy5hfOiE3pBgNJrBR1AEU=", - "pom": "sha256-u90garzosxsfGnMBORtEO6bN4X5y3udcH9LkEBFsXIc=" + "org/bouncycastle#bcprov-jdk18on/1.78": { + "jar": "sha256-G/chsJdYs/VfKlyHW2F47GxB3drYVLDerUsnojbxlDo=", + "pom": "sha256-UX6wMLtokjoCEZcGeEMDpAyf65/dJx2/61jBfYz6968=" }, - "org/checkerframework#checker-qual/3.37.0": { - "jar": "sha256-5M4TdswnNeHd4iC2KtCRP1EpdwTarRVaM/OGvF2w2fc=", - "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=", - "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA=" + "org/checkerframework#checker-qual/3.43.0": { + "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=", + "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=", + "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM=" }, "org/codehaus#codehaus-parent/4": { "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8=" @@ -1057,16 +1048,19 @@ "org/eclipse/ee4j#project/1.0.5": { "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" }, - "org/eclipse/packager#packager-core/0.19.0": { - "jar": "sha256-9XmIqLNtoAU1O6XVo0FHZuGYqlTh+302Ov8ePdhH1Io=", - "pom": "sha256-gMond9r++bVTJcISD3mX79+/37uN8P9QTMqkVmCHmPE=" + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" }, - "org/eclipse/packager#packager-rpm/0.19.0": { - "jar": "sha256-8lULL06x1mfnZoFdmKPUPJWj3n5oyxkGVRWYC+aJ8T0=", - "pom": "sha256-T3NFFZZmY9uaKDMc1LZT81qkBqY4K5H1IqsbVn8Oahc=" + "org/eclipse/packager#packager-core/0.21.0": { + "jar": "sha256-cL4mQwheDtuhBmkSEVNckCO9tvzCyDSOpDqEODM8Q9U=", + "pom": "sha256-q8sdxNGNnU90NEN/Qq5rbi+WVuR1F/vbUW5WJgjy1ec=" }, - "org/eclipse/packager#packager/0.19.0": { - "pom": "sha256-K/IL31F8Q7tH/GSAnqKOwOQuMQnUbRPQ/miGquputXE=" + "org/eclipse/packager#packager-rpm/0.21.0": { + "jar": "sha256-B9KJXVNg4+KdKY10NJV3yXYQcT8X7UQuktsbz0pKasI=", + "pom": "sha256-o/AFHTCIZY3UV2d43M7xoxQogd/vuGpyjF9LiwVRRqA=" + }, + "org/eclipse/packager#packager/0.21.0": { + "pom": "sha256-P2EupUIqc2hzCgwL9hvqzpB4mXoP/wPwykUBSr/EU/I=" }, "org/freeplane/archunit#freeplane-archunit-extension/0.0.2": { "jar": "sha256-12vNLrrjlHXNSUtDJqu1CZcDsaRBKNht8gCRL2BYSxs=", @@ -1081,16 +1075,16 @@ "jar": "sha256-VPNeiF3UDc/ElmlWosD7QWvNowuSU2D8oRqGLqIhm5I=", "pom": "sha256-YdIcDlfkD/vek0h07VsDCiJlqoMXphXOVi9iXPOMz8E=" }, - "org/freeplane/lightdev#simplyhtml/0.19.9": { - "jar": "sha256-M8qZwUjAXtrfOqt/M0bMZedObQYCZIaxIjjizk5/Jq0=", - "pom": "sha256-WsY1HVexEJk4aAPpmMRJhb3f4gzrYMb4K/E+ywF4Jrs=" + "org/freeplane/lightdev#simplyhtml/0.19.10": { + "jar": "sha256-vaV7NmNyspFPGBrL7BDmh6wBl/meWAh1gGNK2wzn/x4=", + "pom": "sha256-5nmOM49tyL35rIhfSHEX3r9sCN4j2tLpnUMo4zkNAWo=" }, - "org/glassfish#javax.json/1.1.4": { - "jar": "sha256-F/3rfiI3Wn+0C7BVEwb23PK1dDB4Zorc32xkLJqeyVU=", - "pom": "sha256-UNKlkVUoQQmnCGdbUuu0WYUA5DaTlnz/FAHLJrl/iFM=" + "org/glassfish#jakarta.json/2.0.1": { + "jar": "sha256-UlObOUmLhsqZELDqzGCKjHjejbOELKqEvIcWk3IgLMA=", + "pom": "sha256-QgxOqD1mdcfxCEhEMFH8un96T+AvbSPXWCXIVgtqJzo=" }, - "org/glassfish#json/1.1.4": { - "pom": "sha256-2j9Tvh1F7zr2Z/36JvVMPrwOGWuMTftkZJHb4+Mcsgs=" + "org/glassfish#json/2.0.1": { + "pom": "sha256-cy6ymd7/ZLUy7tLYkMtdoftAFHWWwIPrLXH0Y+DM7XY=" }, "org/hamcrest#hamcrest-all/1.3": { "jar": "sha256-SHdnBimrlvNPX5CrKDEl/Nmst+aD5mMZpovm6yzKYN4=", @@ -1111,25 +1105,32 @@ "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains/kotlin#kotlin-reflect/1.8.20": { - "jar": "sha256-Ux48P5sMRfmiHxZCF0RTBmoQZr7AGQJUpjMbMxgUq4s=", - "pom": "sha256-5D19CbkCpeM8I0r1O3YYTUkz9gkI0A4QSy7EA+4tQDU=" + "org/jetbrains/kotlin#kotlin-bom/2.0.21": { + "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": { - "jar": "sha256-akTJ7MnXdU2elD+x41iMdNSj8Xhb5RB09J1sVyNoKnM=", - "pom": "sha256-4ZpVd8vOqJcolw21MzyCZMjGmuci7recv0HV8LDJrmU=" + "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { + "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", + "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { - "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=", - "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": { + "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", + "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": { + "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=", + "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { - "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { - "jar": "sha256-BCoc0ayXbNz+XrY/HY4LC4kskkjhWmnIz7pJXVRupSo=", - "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": { + "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=", + "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" }, "org/jgrapht#jgrapht-core/1.5.2": { "jar": "sha256-36WW6fDQg48bXoHdDNYOOnbCwpCsJaCgKf/eWM9eTBQ=", @@ -1146,14 +1147,19 @@ "jar": "sha256-9gszs46desk+qqaKbHD3BruZA2SUsuKt0r/uEdCaxvU=", "pom": "sha256-ejSdIXeQw3ML4wjO0eqe4yxOdPcgWOg8K2DloolU3Q0=" }, + "org/jsoup#jsoup/1.18.3": { + "jar": "sha256-W+HM0yKK5f1u7RvW2Ce6wrxluRwg6ZV9Fupl9znxUwI=", + "pom": "sha256-gFse88p/b5ZfNniXEEPQZfPkxSr9XCT9Q53uQsbioCI=" + }, + "org/jspecify#jspecify/1.0.0": { + "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", + "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", + "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" + }, "org/junit#junit-bom/5.10.0": { "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" }, - "org/junit#junit-bom/5.10.1": { - "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", - "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" - }, "org/junit#junit-bom/5.10.2": { "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" @@ -1162,26 +1168,26 @@ "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" }, + "org/junit#junit-bom/5.11.0-M1": { + "module": "sha256-j2MviWXptvQGnj1YueomuaW8dqmOibQyM3d6zm2tsjc=", + "pom": "sha256-tQl19cuoYgSr2j3Nbwl6+Rn+IuIe9pR43WuRn2x0DYU=" + }, "org/junit#junit-bom/5.11.0-M2": { "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" }, + "org/junit#junit-bom/5.11.2": { + "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", + "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" + }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, "org/junit#junit-bom/5.7.2": { "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" }, - "org/junit#junit-bom/5.8.2": { - "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=", - "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI=" - }, - "org/junit#junit-bom/5.9.1": { - "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", - "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" - }, - "org/junit#junit-bom/5.9.2": { - "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", - "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" - }, "org/junit#junit-bom/5.9.3": { "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" @@ -1211,9 +1217,9 @@ "module": "sha256-A9Flx6iZgkDQQUU/YQZExuheR1W5WdlPZgt7hl3nQlM=", "pom": "sha256-SzmIKleb316Z7TySABcUdnG47OsT3laQlR/hx8vBpd8=" }, - "org/mockito#mockito-core/5.14.2": { - "jar": "sha256-IpYUHB4fLhrjXAjTapq0Vj7NZuA1M/6CYwp2TnqkkYI=", - "pom": "sha256-Y45Wpo9JaHm8ig9Tz735xMw5pFtuQ4ozOl6oPAnunP0=" + "org/mockito#mockito-core/5.17.0": { + "jar": "sha256-3/Wa2MYbAm74bMET+U8jAesGyq+B3sMMeKlqGmVZXF4=", + "pom": "sha256-0BzBTnZhxjBHlApC9Qc9Sg7L4qDqXS6jQgS0zAgeFqU=" }, "org/objenesis#objenesis-parent/3.3": { "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" @@ -1255,6 +1261,10 @@ "jar": "sha256-0hLyvLRc++yQcxDXj1MNmJjeDM97B5Os8Ys4bwPH3jk=", "pom": "sha256-uPMUllLomdnRY/zyBKSD1Cq79OoT/+zI2aMyLIF84cI=" }, + "org/osgi#org.osgi.service.serviceloader/1.0.0": { + "jar": "sha256-j4ds4qmqTpWx8ZUpUCVRA+JIdCUFCmVPMoVEe6YBwVQ=", + "pom": "sha256-dVdRq2w3oaMa+1ueSllcDdLv0rUNcDshJVuCfFDtYVM=" + }, "org/osgi#org.osgi.util.function/1.2.0": { "jar": "sha256-IIgZx8cWkMFaa7ixh0dOf50BR5RraAGCpiufIirgFOw=", "pom": "sha256-9O3YQYEVfUNoGNRlZdSAN5wbBwAdXLEwtAZxlykRXqg=" @@ -1290,21 +1300,16 @@ "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=", "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA=" }, - "org/owasp#dependency-check-core/9.2.0": { - "jar": "sha256-S3txW4QXlIA5LxkYlTQ8w4B/9lutYnj3KfLhtxGGjC8=", - "pom": "sha256-FZDgZyjQVFzpWRt1csudDWVgZ6YqpKCG33nG9/JGzi0=" + "org/owasp#dependency-check-core/12.1.0": { + "jar": "sha256-mofDnPjDRsRJAHEIbXbsloJPV2B2H9vN+OzyrMDCF9k=", + "pom": "sha256-ZON1R9iBPZ7CLSB61il5hxRe9inAGVke5ZB5cULUJJw=" }, - "org/owasp#dependency-check-gradle/9.2.0": { - "jar": "sha256-Iznqka4FX8UtBoVccXME/XGhEWNy8pSxlVUQ/SXLPE4=", - "module": "sha256-TCRgfkiOnZ3yt2snS+uDTl+w+dn7xoPi8c/1m8MhYGA=", - "pom": "sha256-p702oZtsaUAMSYwt5mJaCBpNT3imMlSmJ6UXA42UUaE=" + "org/owasp#dependency-check-parent/12.1.0": { + "pom": "sha256-PxXWp1NY1RlzM7tlzkTzBbTABCux+72qix7oDVeq+eo=" }, - "org/owasp#dependency-check-parent/9.2.0": { - "pom": "sha256-bn3uFhVlL0dJzt7/LwLQ1+fZMdmcunON1x2L8vTd0d4=" - }, - "org/owasp#dependency-check-utils/9.2.0": { - "jar": "sha256-SeNWuGmwqutpf/9O0QoRvwHPPbyrNPTXrpslwGddBEE=", - "pom": "sha256-0bnOEiKl4X1X4soxGeFOfDAPNIxgLXNPx+cVUdRVUv4=" + "org/owasp#dependency-check-utils/12.1.0": { + "jar": "sha256-mhVPJYxK5a3PB2yGno+O5OZwzNPbgA5H76i6Oe6/bWs=", + "pom": "sha256-qQnozYVbRk0CQkuvOLVyH6d7taEUhiv/OLHk8R5UXuU=" }, "org/redline-rpm#redline/1.2.10": { "jar": "sha256-LgdOe9QhdOrqyYzrx4Lw17zI3CpBYXkyrJx51WvIbs0=", @@ -1325,49 +1330,54 @@ "jar": "sha256-bQTDhD/JjS7qm6TP8L57gFQMp1xaTgs0Y/0SGcSMxl0=", "pom": "sha256-w7H6Icz/7VRUA6U8EPte8MoMrT+ZCLIASoIjaItyLcg=" }, - "org/semver4j#semver4j/5.3.0": { - "jar": "sha256-3s4MlHqOEPYuH0pBfUYub+acGiD+B6yNTgz+SVzcPbo=", - "pom": "sha256-4bSaSe78wjrAapw3clMEPmKjO/K2f8Go72mszhT5YHo=" - }, - "org/slf4j#jcl-over-slf4j/1.7.28": { - "jar": "sha256-uB9fkQ2pcIx6ane3IKfeIBVMztQGW1bzMwGUXASqrXA=", - "pom": "sha256-CR1F8JpUBvZbO4nYwDcGCN7GS8HP6P/XvyjQThKKOpI=" + "org/semver4j#semver4j/5.6.0": { + "jar": "sha256-5mdE4z5VbxKBbFCr7AQUiLNI+SLSmBnPT2qwntJSp1U=", + "pom": "sha256-ruhPcPnpZbcEa5k/DPT3pNbYwHacmQNrh0ZGeu8gEpA=" }, "org/slf4j#slf4j-api/1.7.25": { "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" }, "org/slf4j#slf4j-api/1.7.36": { - "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" }, "org/slf4j#slf4j-api/2.0.12": { "jar": "sha256-p5UCuKvfvXIoRqJ2kSJqQIhoLW01ZU+bgOKpzKz37Uc=", "pom": "sha256-Udh5pZmPWCJ0Dc9VIsDtaXGtXEpeowtw9bVGCT5rQmM=" }, + "org/slf4j#slf4j-api/2.0.16": { + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" + }, + "org/slf4j#slf4j-api/2.1.0-alpha1": { + "jar": "sha256-mrf/pkYgK0mdBZlaPsgvMbzLelA0XBUU2MtC7IzOo1M=", + "pom": "sha256-QirqW+u6gwWzxhT6Zo7SKePJYQkw7PQvhzOO4F4minU=" + }, "org/slf4j#slf4j-bom/2.0.12": { "pom": "sha256-SH70mE1wFY9Yw3zodmkxukx+VzdYZYhLdWORv9bQDDk=" }, - "org/slf4j#slf4j-bom/2.0.9": { - "pom": "sha256-6u9FhIB9gSxqC2z4OdXkf1DHVDJ3GbnOCB4nHRXaYkM=" + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" }, - "org/slf4j#slf4j-nop/2.0.9": { - "jar": "sha256-VhI2exK6w+rPTm/04GzluhyDxNjW1eLqX5JGNXF6bYM=", - "pom": "sha256-3qe7VIVu9pOIkiqtCiU4qfNd8nk/iUF5S8smUYp0CK8=" + "org/slf4j#slf4j-bom/2.1.0-alpha1": { + "pom": "sha256-qOgTiZePRAcJJBuYPTHvp4cRO+EbgYwsa82e0wlv1IU=" + }, + "org/slf4j#slf4j-nop/2.1.0-alpha1": { + "jar": "sha256-sZjMRO384jTcilrXCneBkgUsw3ITSnIxhs2HJ4mKt/0=", + "pom": "sha256-iMUWxBvg3Gm2a9rf8cxY9wLf7LA6A5uDiwHpBYI1sPY=" }, "org/slf4j#slf4j-parent/1.7.25": { "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" }, - "org/slf4j#slf4j-parent/1.7.28": { - "pom": "sha256-kZtfQt3jOs4DaGXR4rKS2YoGJ0F/91bgKH9KVq0+VE4=" - }, "org/slf4j#slf4j-parent/1.7.36": { "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" }, "org/slf4j#slf4j-parent/2.0.12": { "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4=" }, - "org/slf4j#slf4j-parent/2.0.9": { - "pom": "sha256-wwfwQkFB8cUArlzw04aOSGbLIZ7V45m2bFoHxh6iH9U=" + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" + }, + "org/slf4j#slf4j-parent/2.1.0-alpha1": { + "pom": "sha256-zkc1sfnIId4Lkrjb5AsHHG6jIHMuWTVZxupt+WX4c48=" }, "org/sonatype/buildsupport#buildsupport/13": { "pom": "sha256-MuFUs6Y4iedSg+cMOqqNzzS0DQmXHIh7/KOLdDQDBtM=" @@ -1381,9 +1391,9 @@ "org/sonatype/buildsupport#public-parent/28": { "pom": "sha256-xaG91AEo0naus0aPnjlM1aCp9Khliu+XQ8PR6JxIqQM=" }, - "org/sonatype/goodies#package-url-java/1.1.1": { - "jar": "sha256-FSl4YjQrSUpTV0L7qQ6ooyHNE+HQ3Exht6OxjOOF4ag=", - "pom": "sha256-mGfgLN1Qx6ciQh8quZNY2Z3CUrZHmlQ0AmG2VZkdVXk=" + "org/sonatype/goodies#package-url-java/1.2.0": { + "jar": "sha256-pf494mA6WBLANYlQxT5VD6LDMMp4fFU0/HlXbIFGq7Q=", + "pom": "sha256-ZJlboXTalm8BuJ1EJnlqGbZP8h72VVb9ZsvfRKlfChY=" }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" @@ -1416,17 +1426,17 @@ "jar": "sha256-JUy7BS9xjzbuKnWulb0uAlGwUT/HbQOLbbvPCUL8wR8=", "pom": "sha256-MHrEvPUPrNLQSbQxhRmWqNJ3JKWE/LPu5Nk9GNa1Ls4=" }, - "org/violetlib#jnr/13": { - "jar": "sha256-Rlyk/6Q2LHssoGLvuY13yo/6ceWCp5VN50hBn72/ERA=", - "pom": "sha256-ylDwFnSA2Q8xOyZ2+aGKpQrIW2cfLwwdqdsSkCTtzPU=" + "org/violetlib#jnr/14": { + "jar": "sha256-eg1icfNTiIKc6mGv4toAMRNqFVEbe3+HLCeyMio3pEw=", + "pom": "sha256-biJ9BsOUYdE0607r2zSKfUAt3oEDLMw+BhMfJ51Nv7s=" }, - "org/violetlib#vappearances/3": { - "jar": "sha256-+OWyHWPDX3DkMaEY9EbQTqZSTZxmd+SgOJ3Iy3L9K7E=", - "pom": "sha256-dex3tlNLtJZvMCSKaCDBnSQOZpGrGcYMO9nlr0FtvSk=" + "org/violetlib#vappearances/4": { + "jar": "sha256-CswgQc3ztbmgVK7u3Agt5/WG58PXMd91wfzK5B3SR9Y=", + "pom": "sha256-6QQxnq0gESIgmyjDLfnclnirmIoAhUWG/g/qZ9Zdizw=" }, - "org/violetlib#vaqua/12": { - "jar": "sha256-rAsehX4k+vkpdpkEZV94Nkl/+24kl+nVGl05qZ7NyOk=", - "pom": "sha256-gcXkZPQxLsbTpEWOCjVX6QFS5bFNcOR6EhMBR0XAbag=" + "org/violetlib#vaqua/13": { + "jar": "sha256-Xi7/ksCZTnmGXsD6GEMz3bgjym/v+POrv2rSRWWTjpk=", + "pom": "sha256-/T/TG6nxs1PvyV4KOpTqCfbwsOd9jQBQpFYV9IqI9vA=" }, "org/whitesource#pecoff4j/0.0.2.1": { "jar": "sha256-hHNzgo4EkLq9+u0rBI7TkI3BqN6C1Mjm66ub/QopTtY=", @@ -1436,6 +1446,10 @@ "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" }, + "org/yaml#snakeyaml/2.3": { + "jar": "sha256-Y6dv5mtlI2C9TCwQfm8CWNqn1LtJIAi6jCb80jD/kUY=", + "pom": "sha256-D1omWgYzGwBJ41K+MsoyLeGLF/PU27cGNdQNppLjWC8=" + }, "us/springett#cpe-parser/2.1.0": { "jar": "sha256-I2VjRR8JI+4OntCvDOty0oEzAABP1MslsS6sEoxWxHY=", "pom": "sha256-WQfZBRFMPRM15jPy3An0J4PMtTQ29mUzsU+C+12oOtM=" diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix index d6eebc3dfd43..adc4de096c11 100644 --- a/pkgs/by-name/fr/freeplane/package.nix +++ b/pkgs/by-name/fr/freeplane/package.nix @@ -13,7 +13,7 @@ let pname = "freeplane"; - version = "1.12.8"; + version = "1.12.10"; jdk = jdk17; gradle = gradle_8; @@ -22,7 +22,7 @@ let owner = "freeplane"; repo = "freeplane"; rev = "release-${version}"; - hash = "sha256-yzjzaobXuQH8CHz183ditL2LsCXU5xLh4+3El4Ffu20="; + hash = "sha256-08Rl3vhXtlylNDc1gh5aZJ9/RoxeyxpDbklmhMVJuq4="; }; in @@ -37,10 +37,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; patches = [ - # Plugin update to support Gradle 8.13; remove when included in a release. + # freeplane is using the wrong repository for a plugin + # remove when https://github.com/freeplane/freeplane/pull/2453 is merged and released (fetchpatch { - url = "https://github.com/freeplane/freeplane/commit/e58958783ef6f85ab00bf270c1f897093c4d7006.patch"; - hash = "sha256-oQF/GbItl2ZEVlTKzojqk9xTWl8CVP7V3yig/py71hk="; + url = "https://github.com/amadejkastelic/freeplane/commit/973c49b7a73622e434bb86c8caea15383201b58a.patch"; + hash = "sha256-iztFmISXZu8xKWqpwDYgBSl8ZSpZEtNriwM+EW1+s+Y="; }) ]; diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix index 91b50105ce87..340e0e1704eb 100644 --- a/pkgs/by-name/fr/freerdp/package.nix +++ b/pkgs/by-name/fr/freerdp/package.nix @@ -2,7 +2,9 @@ stdenv, lib, fetchFromGitHub, + fetchpatch2, cmake, + writableTmpDirAsHomeHook, docbook-xsl-nons, libxslt, pkg-config, @@ -62,19 +64,26 @@ stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.14.1"; + version = "3.15.0-unstable-2025-05-16"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = finalAttrs.version; - hash = "sha256-3hBssoD6l0d1DC5SRhE7HQlcoxNPjz3G8jbQx2rzp60="; + hash = "sha256-xz1vP58hElXe/jLVrJOSpXcbqShBV7LHRpzqPLa2fDU="; }; + patches = [ + # Patch from https://github.com/FreeRDP/FreeRDP/pull/11439 + # To be removed at the next release + (fetchpatch2 { + url = "https://github.com/FreeRDP/FreeRDP/commit/67fabc34dce7aa3543e152f78cb4ea88ac9d1244.patch"; + hash = "sha256-kYCEjH1kXZJbg2sN6YNhh+y19HTTCaC7neof8DTKZ/8="; + }) + ]; + postPatch = '' - export HOME=$TMP - # skip NIB file generation on darwin substituteInPlace "client/Mac/CMakeLists.txt" "client/Mac/cli/CMakeLists.txt" \ --replace-fail "if(NOT IS_XCODE)" "if(FALSE)" @@ -100,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: { docbook-xsl-nons pkg-config wayland-scanner + writableTmpDirAsHomeHook ]; buildInputs = @@ -198,15 +208,15 @@ stdenv.mkDerivation (finalAttrs: { inherit gnome-remote-desktop; }; - meta = with lib; { + meta = { description = "Remote Desktop Protocol Client"; longDescription = '' FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) following the Microsoft Open Specifications. ''; homepage = "https://www.freerdp.com/"; - license = licenses.asl20; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/fr/freerouting/deps.json b/pkgs/by-name/fr/freerouting/deps.json new file mode 100644 index 000000000000..66a5f44ce708 --- /dev/null +++ b/pkgs/by-name/fr/freerouting/deps.json @@ -0,0 +1,1241 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/github/ben-manes#gradle-versions-plugin/0.52.0": { + "jar": "sha256-zuihUdLgvp86hcouXYeg2lyRpIHt8bx/e1e1Ywj9PA0=", + "module": "sha256-r6cL5O0h646QJ2hPFfpeKXXz0uRtIpN76jmhDkj3nd0=", + "pom": "sha256-WESi8/+pqARY0m7ex3EjeuYxXN3yBp1Qp+hUFj5A8Q0=" + }, + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.52.0": { + "pom": "sha256-sLbWCz+UCuWgFAfwNJ6d86Ayph+FXkoXt9vakSprU3Y=" + }, + "com/googlecode/javaewah#JavaEWAH/1.1.13": { + "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", + "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q=" + }, + "com/jcraft#jsch.agentproxy.connector-factory/0.0.7": { + "jar": "sha256-tXaTDWqCJ2ESM2U1jZAoE1HYjOwt2EWRKHPBaWGE1ss=", + "pom": "sha256-lF56Y404MC7i80AGfeiMrtJADpoleZ3ypkxSiT/Bn4c=" + }, + "com/jcraft#jsch.agentproxy.core/0.0.7": { + "jar": "sha256-xcsh/teP0sWB5AJ25Ci2QH5IAe2wuqH37wwQJdBqOn8=", + "pom": "sha256-TqaBg8WkOU9XTdHWEb7NVPuFzcN/JbYksUXoEXbamyQ=" + }, + "com/jcraft#jsch.agentproxy.pageant/0.0.7": { + "jar": "sha256-YJt7nQCykCE5dURlK2SQRSCcQRZXkGErKw3290yN+yc=", + "pom": "sha256-vIcohgnVllCFP/GZEcVWyAU+sOBdvSALJg3GINgdanc=" + }, + "com/jcraft#jsch.agentproxy.sshagent/0.0.7": { + "jar": "sha256-/QP960AxKEaggnzOGy+Tdz0NHMwTS9uVPfrC0s1EsyE=", + "pom": "sha256-6iFoORPB3VDbNhEsiXMIam5gz9lbt527y5t4biN0aes=" + }, + "com/jcraft#jsch.agentproxy.svnkit-trilead-ssh2/0.0.7": { + "jar": "sha256-0PVPplDvcTAEbddSwc9Gst0fEAljLPgq0KLcbn3eD1c=", + "pom": "sha256-u9gSP7yf+LnLoLUUT85XF7m2Ul8CkFzefBY9wwCVLi4=" + }, + "com/jcraft#jsch.agentproxy.usocket-jna/0.0.7": { + "jar": "sha256-V7gWnEh3pIIKV9+exeUwbRldYz2QZy08wF6odrptSZk=", + "pom": "sha256-peH2EtT1ckKV+zhvIDm1RcXukdAY6MeFOoFKfu2WkiM=" + }, + "com/jcraft#jsch.agentproxy.usocket-nc/0.0.7": { + "jar": "sha256-IxKU9lj7hVwMjQcPwcZU0rgncqzAkujVulPprnF6cJY=", + "pom": "sha256-p4RfFCCwRqHcLfSEmmfo4mdxJt5pm688X0vTy3l9q4w=" + }, + "com/jcraft#jsch.agentproxy/0.0.7": { + "pom": "sha256-SiFwxOx95EbWQ6yuwF/ruLxSwM0PX+rZ9Ib3VRGS0R0=" + }, + "com/squareup/moshi#moshi-kotlin/1.12.0": { + "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", + "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", + "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24=" + }, + "com/squareup/moshi#moshi/1.15.2": { + "jar": "sha256-dn91ksbGHraTVJom0zPBIfU4OCa9KHuJmGeqMm2uVeQ=", + "module": "sha256-2VLG3ZGntCbD8KUe3D986zSQrAH/GDAVJ63+x6eDfdk=", + "pom": "sha256-MXodP7cFQDG/6QzKibECSQH9m5/MqZFmws54U7X8e9k=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.7.0": { + "jar": "sha256-2LNa3Ch2j0OuWv5qfRqiqHi6UeC5ak8wiBHzsfWxPlU=", + "module": "sha256-b64CAbCuSKGWBt4Ab/6YQtjQ/CoeQ04Hhc7Ni3Wr5HQ=", + "pom": "sha256-d07LnSsHlLT7J+eeCHYMpWC39U+qlRm5GDxn/rRfLJc=" + }, + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + }, + "com/squareup/okio#okio/3.7.0": { + "module": "sha256-88rgCfC2yEL7vFLOd1QsGdGdVu6ZpeVVZH8Lr8nVDPo=", + "pom": "sha256-H2KMRSg726uM4DwHps+3akeLjdrhgL2PNKusJz5Id24=" + }, + "com/squareup/retrofit2#converter-moshi/2.11.0": { + "jar": "sha256-2/rp294LYeXFZxZIyNn9SG766a0H1XPtAb0N5GiNmyw=", + "module": "sha256-8jl8dvQPuHPUydGvgwtEolty75gpsCYJnikTB4uN8z4=", + "pom": "sha256-MB/EqjCHlmkS/fQEko2EOtcUPO8wm3fuVeD+srWoyBU=" + }, + "com/squareup/retrofit2#converter-scalars/2.11.0": { + "jar": "sha256-ZH1+gaxh7t9pG6adgvDVaFCHq/DVj+fYa2Q9AoCNqRE=", + "module": "sha256-SaqPyhyulzzMqBdmncrXltVqeQ7UdQnweTMHdc8zJnQ=", + "pom": "sha256-s9ShAXMYUHQencArE1u4FRHlM0wUe74tqtL1afVmNkU=" + }, + "com/squareup/retrofit2#retrofit/2.11.0": { + "jar": "sha256-n0+7znByhYT77tONQGHzbUR36JvKdLTirIrraBmw/kM=", + "module": "sha256-6bsuIBhEyI5HUGJPkRSmNUtRtwlItE1ca0qU6M0HCoE=", + "pom": "sha256-3iKB4huk2YSrrxPcBn84C8WBaXBoxlaKu5uZjZ13cF4=" + }, + "com/trilead#trilead-ssh2/1.0.0-build222": { + "jar": "sha256-Vj3ED1sX9OIVT6QaFq5/QMxJARvFQAsIcOuvYaR7nCI=", + "pom": "sha256-75Gy9XGcmybCOqVFwhjriwuar411/SQENmVQb7m0Gck=" + }, + "com/vanniktech#central-portal/0.31.0": { + "jar": "sha256-GsMUNiQjV6MW4jN71oTxq7r1MtxagCvYbdw28Bcp0OY=", + "module": "sha256-FKAo3EKBTP5A1rny5XTVyl9IFO6y2QHwsccKIMrAY0g=", + "pom": "sha256-gidBpXylV2yZetGSm6kSA2HRCzsA7q738lQHN7ECrAw=" + }, + "com/vanniktech#gradle-maven-publish-plugin/0.31.0": { + "jar": "sha256-1X3Ie7i7D0pTCtgP59itRnGPo0CLihh7Ge+oXwEHC+8=", + "module": "sha256-iV4wIVzJI0hiCmq8revzyCrZBQrlpW2SPIuL5UMjpUo=", + "pom": "sha256-l/0mpZgLNmJQRMurOtmRFoaJMgRtOHiviKwT1SU1sQ8=" + }, + "com/vanniktech#nexus/0.31.0": { + "jar": "sha256-Gw/b2F1DtN4WeiSOAwy5kXhNjZxV++KBkrdsnMbcMfU=", + "module": "sha256-07nTaSMYOe581Yy58MdwgEnNMo1wt3+d8MrDQ+oXOHw=", + "pom": "sha256-WVW+8/ZacFVaArcAtu85VV+dKxxqJcCz2h1SulmlTLU=" + }, + "com/vanniktech/maven/publish#com.vanniktech.maven.publish.gradle.plugin/0.31.0": { + "pom": "sha256-ujOevsuNfOFCZJTQ5jINW3OWi5T9CDWMhK1fWIBcBJg=" + }, + "de/regnis/q/sequence#sequence-library/1.0.4": { + "jar": "sha256-Uwefbn2LoiSnc4fZt/o+6LNvn0gqLxhr7iNUdNsM0oI=", + "pom": "sha256-St7mXSTvSwPtnrv/f77+TpCmkZ1uIGbQh1+s02AREzg=" + }, + "gradle/plugin/net/nemerosa#versioning/3.1.0": { + "jar": "sha256-ioN4R3z2FiGi2zTa+E5SUuDss0QHCaelmGE+d8HlXHQ=", + "pom": "sha256-44iuHyzRiDIJW7w7Q/jZYIwpDeFkqHXFjoSsUEWlAaE=" + }, + "net/i2p/crypto#eddsa/0.3.0": { + "jar": "sha256-TdoRINuFZkDb7AQUDtIyQiFaB1/hJ73voNz6KfsxJn0=", + "pom": "sha256-trE4eOS66Ldo1+pXMstNZqsvXp/nB8Chp3bN6d5SBRs=" + }, + "net/java/dev/jna#jna-platform/5.6.0": { + "jar": "sha256-ns6ovysbOZY5OdGLcEZO72DFCP7Ygg+dyroMNVGOq/c=", + "pom": "sha256-G+s1y0GE5skGp+Murr2FLdPaCiY5YumRNKuUWDI5Tig=" + }, + "net/java/dev/jna#jna/5.6.0": { + "jar": "sha256-VVfiNaiqL5dm1dxgnWeUjyqIMsLXls6p7x1svgs7fq8=", + "pom": "sha256-X+gbAlWXjyRhbTexBgi3lJil8wc+HZsgONhzaoMfJgg=" + }, + "net/java/dev/jna#platform/3.4.0": { + "jar": "sha256-6onVCQyDA7pOmgBW5tiiBCnz4CFBHpUL/Z66O25s8Vw=", + "pom": "sha256-jwwU9ikSwInYE4YBXnjPIS+elvZ1s7wOUZweLZKqiVA=" + }, + "net/nemerosa/versioning#net.nemerosa.versioning.gradle.plugin/3.1.0": { + "pom": "sha256-3Opp7NhR9dPaEyosVQyl4IekS2HrqbjynN2P8fOcVCA=" + }, + "org/ajoberstar/grgit#grgit-core/4.1.1": { + "jar": "sha256-xiaqQz1tE/JFvSyGW/RvGqNFdUC/0FqoRHSzoe5MIxk=", + "module": "sha256-GA51C4e+Jj7fOkCETQPlZ7XlAuwQnFOUF+PWvFYbI+M=", + "pom": "sha256-wkiIc3GeJd21UjYt7lY1OSwWNiCsFWACg9mf094XklM=" + }, + "org/antlr#antlr-master/3.4": { + "pom": "sha256-AyizHZ8cfwY+N+APYsVsjl0D/qHVcpgsGtjm8YcvDu4=" + }, + "org/antlr#antlr-runtime/3.4": { + "jar": "sha256-W3z1O3swsDQCP1gDDIFHxDPyvuD+feyPrmvr83CMWmM=", + "pom": "sha256-leQDwVx8oMqp7S+Ex1bJsBKT7onbcCzYmFqKOOEf/vo=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache/sshd#sshd-common/2.8.0": { + "jar": "sha256-gdCmJ0TBSR53vcjLqHh1Z4AvXjQc+6TIXGkAoDPZI1Q=", + "pom": "sha256-JIqw3VkR83i95/FxgY0SG63ZaLfcKCzypKOBXBcmT5o=" + }, + "org/apache/sshd#sshd-core/2.8.0": { + "jar": "sha256-LvYvH6+4PLIr8B7tY0u95g4XD1Bd8wzNS9iyUGoZZW4=", + "pom": "sha256-tHfcGFRfPCbIKjyFV//KSKgfINyafaCMK1QqSwiTTpE=" + }, + "org/apache/sshd#sshd/2.8.0": { + "pom": "sha256-iaBghZaN3+jjBCnvUInctxa3DM2EaCfgAoNEP/2hU8k=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.1.0.202203080745-r": { + "pom": "sha256-3/gbocif/btk7dP/uJ9keXBGV+wpuRxfAdmquDpaS1E=" + }, + "org/eclipse/jgit#org.eclipse.jgit.ui/6.1.0.202203080745-r": { + "jar": "sha256-ZbpBDeAaVXUYvVmOgHdALvPiHbe+uE4pcWusEEQwwSM=", + "pom": "sha256-3ORYL0xnGsdEd/tP34bKZ8GZ16SgLOxJTjYkbVkQ36A=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.1.0.202203080745-r": { + "jar": "sha256-tU+fsU9iVUoTG+5t0qbfqsgnYgN75fLXgAPU3dZ8fmc=", + "pom": "sha256-LkpfRlmqrNsmlT0fQR7Co/pJWJuDyMsKfJakUYUh5Tg=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-bom/2.0.21": { + "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g=" + }, + "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { + "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", + "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": { + "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=", + "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": { + "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=", + "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.10": { + "jar": "sha256-XyrByo3Is3o/QxTnFtNpaevwInp1GB0yaZ0Kj2RbHCE=", + "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=", + "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8=" + }, + "org/lz4#lz4-java/1.4.1": { + "jar": "sha256-8O+lzhMY8OPnNPNSONrMRBxlEMtvP+5tHP0+uuFeK+8=", + "pom": "sha256-Vig2NEoy0Fbmqt30mLSREhQfpAj0CQ71bIBnP+5ZgUs=" + }, + "org/slf4j#jcl-over-slf4j/1.7.32": { + "jar": "sha256-YPO9pZIuORKInMoTEdGyJ3U2EL9gy05ekU6LLqoDJrQ=", + "pom": "sha256-XxjqwsVFj/zEAkFWEMO3jkmQAhaL+OyP4u/h3lBqJ1Y=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-api/1.7.32": { + "jar": "sha256-NiT4R0wa9G11+YvAl9eGSjI8gbOAiqQ2iabhxgHAJ74=", + "pom": "sha256-ABzeWzxrqRBwQlz+ny5pXkrri8KQotTNllMRJ6skT+U=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/slf4j#slf4j-parent/1.7.32": { + "pom": "sha256-WrNJ0PTHvAjtDvH02ThssZQKL01vFSFQ4W277MC4PHA=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/6": { + "pom": "sha256-tDBtE+j1OSRYobMIZvHP8WGz0uaZmojQWe6jkyyKhJk=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/springframework#spring-framework-bom/5.3.11": { + "module": "sha256-ZjK2+djzXWen0eEwFGgX3pexeksM12GsFx78EDavKds=", + "pom": "sha256-HNBfCB7CrRGtOFn0MMOZbBT8HwDcX+k4js4yWrlGuSo=" + }, + "org/testcontainers#testcontainers-bom/1.16.1": { + "pom": "sha256-UGG6hMmFNuWmtM4oD7zssA4zXzsExdSEYpFi/LRiR3g=" + }, + "org/tmatesoft/sqljet#sqljet/1.1.14": { + "jar": "sha256-qFlc0zYu/wjCa5E6PzwZjeZfdzPJk3Wz9JIDWjQfX0U=", + "pom": "sha256-aqUr7yL3Q45a79BnJh90yLH6Kk+t5Dp9zj9w6Asp2+8=" + }, + "org/tmatesoft/svnkit#svnkit/1.10.6": { + "jar": "sha256-xcp91U2EdvJDSxnpMwySbHbifT2bShAsJ8YXzYe25Sg=", + "pom": "sha256-bjy3A/VSiur6i7sFRFPjm4YPk/02b9DaV7GEp9PM7Wg=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" + }, + "com/fasterxml/jackson#jackson-base/2.18.0": { + "pom": "sha256-EFZMv/uFf5BlqhG1hJqMMIw1NfD1PG9Muytvt7NQf5c=" + }, + "com/fasterxml/jackson#jackson-base/2.18.2": { + "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.0": { + "pom": "sha256-Wqooh0QFvwT7qOLFcVkieCRGG6b31VKr246NOgum+L8=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.0": { + "pom": "sha256-ut3oZMpztsoE3p9+5J5knhpeivj4x8FoLHRr5eI0xYc=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.1": { + "pom": "sha256-84SrzK8Mb712GDdi9yVv1nkBLtgdt/KiZofouWWgFKc=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.2": { + "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/jackson#jackson-parent/2.18": { + "pom": "sha256-Vp3ADWi05t993oVimeHANT+kC9rxI+DfVj7L7kFlhtk=" + }, + "com/fasterxml/jackson#jackson-parent/2.18.1": { + "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.0": { + "module": "sha256-DwmMCDBXb8nHVdQ9fzFuinV8k4ErNXdRJbNo/rzWA10=", + "pom": "sha256-pqA47zy3L8FXW5w4ZdpK2arX0COo1J3K0DeRBlVx6Bw=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.2": { + "jar": "sha256-WBvWEADvdkiUP3gcoFaJ5W0D9gUnSDZajis6m10/oy8=", + "module": "sha256-4Ruvm1NubflNqmNaEBPsPgabhmuOES3cKqBEahVQUNw=", + "pom": "sha256-CyvWlOqJJn7qSBJqilskplI0xkM4dULSRGnRlb+6HPg=" + }, + "com/fasterxml/jackson/core#jackson-core/2.18.2": { + "jar": "sha256-2AVK58DRwtL1XSjkYCbr5YkogfP6tfQ5IzGEOBw7Sh8=", + "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=", + "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.0": { + "module": "sha256-LEnsfnQwbUh/lVkbqJiQRhnDKi4/0bWG+z5jIskaTmI=", + "pom": "sha256-+Mn0Od1EsdAkLWbmlB2pfFe6hONANu7peqHDr/vxugQ=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.2": { + "jar": "sha256-SzZOaFDciRcvzx1N0muP9UiO2kT/RlfiLdJlID3Vqzw=", + "module": "sha256-jH2sL3J4GNiEeoKqTqxrAXTXnPBN+Q3iJGBy5t005wA=", + "pom": "sha256-STo9tkR7eo7Ls3JCNMbOZ31y20sE9roAjw6+rqe+Wp0=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.2": { + "jar": "sha256-4tIC1GBuI66vilqWMtsG9f79W2PSUcP1A/n6qnhTDlw=", + "module": "sha256-Jd8o9WC1kI6hAYUATV/Bkyk0hHBj5mcpJID2dbOx7eQ=", + "pom": "sha256-FivnrZea9eDHOc1+0BiJ+Br0ggDJ+RJ5lqElrFGzSkc=" + }, + "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.18.0": { + "module": "sha256-6aQaUS6VsgUzABoREWCbYDP6M+h3km8gZkXy1PiOBes=", + "pom": "sha256-nKcuS5p/JlhHVuYubVJUywo0KvdNvJ5hguPWAUsgUb4=" + }, + "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.18.2": { + "jar": "sha256-Uxa1ItppOIvIt1Yigw7QEtXsVJFDxaQ5EDqRJFsio/8=", + "module": "sha256-Q5AJmjK1DI3v2vTMNAx0gWEG843VdsPZWkq3ykUez0M=", + "pom": "sha256-mVJ0ggsVcllY1Rr9xj4gCf9DCg4+9J8eT/kv0+YjZKg=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.18.0": { + "pom": "sha256-vtjbLqeIGzWwOA9V+67R1Wv+P9o6AmB0Ww9dXqzteyk=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.18.2": { + "pom": "sha256-wVCoPSPNizMiqqSYmEh0J5vi3I1f4qN5B9P1arYOJpw=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.2": { + "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY=" + }, + "com/google/android#annotations/4.1.1.4": { + "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=", + "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng=" + }, + "com/google/api#api-common/2.46.1": { + "jar": "sha256-ixHh4eQnAsuAlI58piqeBt34L+V6Gc1o+VSOrIDzkHE=", + "pom": "sha256-diOqbWZj9b9KnOJx+AVT3egdBjLw8SrzXMU6TOSpg80=" + }, + "com/google/api#gapic-generator-java-bom/2.55.1": { + "pom": "sha256-BO/rnxxRucOvI11DoVJthjo4OMGxzZbOptT86SqGu90=" + }, + "com/google/api#gapic-generator-java-pom-parent/2.55.1": { + "pom": "sha256-vxonIudPxkgBrU+9YGbBPeIt75ceMItgInkJaYXCFkw=" + }, + "com/google/api#gax-bom/2.63.1": { + "pom": "sha256-WiT34MEyGsJaFWb3fR8nUqq3YXoTJNhPBTpwp8FEJXo=" + }, + "com/google/api#gax-grpc/2.63.1": { + "jar": "sha256-T4VZlSQGjc1UMf7aFykW365iLh5gWgeShTOmnZErNns=", + "pom": "sha256-QP43LcIR3jaZfeP9HLl98mx8C23vaf0+QGmIEKWoSkw=" + }, + "com/google/api#gax-httpjson/2.63.1": { + "jar": "sha256-KR5gb1PqAh/yW1dHvC40e59uJyhfqkgjnWdi/iUVtg0=", + "pom": "sha256-NjoT74bUoElJRajKhTDGUuMsejAaOOT9yw5UfsgNhU4=" + }, + "com/google/api#gax-parent/2.63.1": { + "pom": "sha256-hD9mtfE8ZlZCkIrUAeHeRa9vtIye8ben8aJ3SEp4UTs=" + }, + "com/google/api#gax/2.63.1": { + "jar": "sha256-JnUkE/drg5Hazv/0DbhnwdM9C/Y9MpVN4+m7dM3LhWg=", + "pom": "sha256-32FUy5HAC1OIU47+47lF5EQ20D/2FrPx5qOex8OXcRM=" + }, + "com/google/api-client#google-api-client-appengine/2.7.2": { + "jar": "sha256-zDXdQfCMWsgR8kO1Qowxnfes1ivvpk3f8cfYBW6U0LM=", + "pom": "sha256-NImEhTIALS3l1ztR1lN1flXmcP0u+H4sQam3BzpGA0U=" + }, + "com/google/api-client#google-api-client-bom/2.7.2": { + "pom": "sha256-o5uDySbr9qL5GIOI3FQpvHQcs90QFld1UyBnGD99M6w=" + }, + "com/google/api-client#google-api-client-parent/2.7.2": { + "pom": "sha256-c4/ewj9isT6dL6Iv8l/LWHyphMWNzKGxWQNL02ibtJM=" + }, + "com/google/api-client#google-api-client-servlet/2.7.2": { + "jar": "sha256-TP3FNHiCCDCKEVS/eIhEpFtjeCatoDyGe68VppbnoGY=", + "pom": "sha256-3kO6r7e2VXzv4QZoPL7Tc9LPkWeaqo8lsMPzfhpdMPM=" + }, + "com/google/api-client#google-api-client/2.7.2": { + "jar": "sha256-Y7dUt8SpI0fEmSxC0pWBL40u1rnodD7bpKjJi5Lpyps=", + "pom": "sha256-PNpCXKfxGpP1wEL2Y3araUAi8orbRfPTXpXhFev9xmk=" + }, + "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1/3.12.0": { + "jar": "sha256-TeYjr/KUthTM8isfrYiNnaWi2SSEqGCbBXGdLZI9Ebs=", + "pom": "sha256-9FjoYv0EZ4D7fPBFmkg4bvgG/JMz6uFneUjsJS8f6sk=" + }, + "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta1/0.184.0": { + "jar": "sha256-oWqch+T3QhiuKftsfA5qCyelBoPsK/f2v7aHpHgRKnk=", + "pom": "sha256-YYXOpFNpP/ZfWvQsr46Ft1FRINP3FxNX7IleumIDfzs=" + }, + "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta2/0.184.0": { + "jar": "sha256-9ybriUXUX6NYRG0fBGoGHjNo4IWEU2HlsEPov4s2HC8=", + "pom": "sha256-1titj8csyJAh+xauBP2dd/icU84JnhB6mExO4RdKn9o=" + }, + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1/3.12.0": { + "jar": "sha256-55/y9F22mVJWYJdaTwTvb4sa/2OTJxDta6yh84FVmRc=", + "pom": "sha256-s3ruiW6Bcc2wFOyzDvCiirPm3Bxxry5Pkjujf8SsdUY=" + }, + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1alpha/3.12.0": { + "jar": "sha256-Q54YMAQ/sJJN62Wy7EGPQ5lUyFpL9P13sNGIyXBZvfc=", + "pom": "sha256-nrKJAXyemoNJFyNaEEeGVhhEK9uNgrtrFGDrxkH6agI=" + }, + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta1/0.184.0": { + "jar": "sha256-hjnMViPkBW/0ipHzW5T2Y7uaJzZvHHoUw4ocSLjvLhc=", + "pom": "sha256-qVoVE1VebLER1lCIiEWSzMGT9FZVztBSdSJhOyxVXrg=" + }, + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta2/0.184.0": { + "jar": "sha256-krDF/jrUOvGTUnmUocLarL5dmCFuVpKsd2K+Xlpen/Q=", + "pom": "sha256-lc3/5aWp/y9pn/ztNIlx7oL1Yd8ZRkJDTd0kfflRQ+o=" + }, + "com/google/api/grpc#proto-google-common-protos/2.54.1": { + "jar": "sha256-L8/yX+ipD8rLFGqQAiLEl7oKmlMSceaxNadkUNI7HvI=", + "pom": "sha256-fzVVVf/csSv1/lfvkDxV1lAocME49lH+0HbNT3B7IJ0=" + }, + "com/google/api/grpc#proto-google-iam-v1/1.49.1": { + "jar": "sha256-E478oqzdcbykEzcxp/jmGcj6aoWFkBq/Lio1cANTynQ=", + "pom": "sha256-rk1N8JaymJnfM9B8QmnxmqyTUkPbcffMuh2V6nXIHcA=" + }, + "com/google/apis#google-api-services-bigquery/v2-rev20250313-2.0.0": { + "jar": "sha256-jmWTYcp9BugyGRlQoWgYjnpV4AqqWnKEjCkIjYQ2el4=", + "pom": "sha256-gyPxaKdgRPhvs6lf5oXqnMcVANZqzHPplv72SXcau10=" + }, + "com/google/auth#google-auth-library-bom/1.30.0": { + "pom": "sha256-mSCzPghCOTmuWu2116O+wBWYvyZkSti6bnul2ov3ajY=" + }, + "com/google/auth#google-auth-library-bom/1.33.1": { + "pom": "sha256-DWWi+qKz3r8WdvFTRyOLPWiKFauUnz1J9UshC5vup+I=" + }, + "com/google/auth#google-auth-library-credentials/1.33.1": { + "jar": "sha256-M2fWJ8X00fowejxv+V21ate2Ea5Eg/4h1yh3+gN/8SU=", + "pom": "sha256-1L+g1iarHEiwAgUbhk3+WC7hp3JwfmV/2KshSuouniM=" + }, + "com/google/auth#google-auth-library-oauth2-http/1.33.1": { + "jar": "sha256-anLsK7I1DKGXABnjiNAICBNuTaLjApbp2MNG44ULDqo=", + "pom": "sha256-36m2t54T9RzuazU8HJK2z2W4X/JTYOjRql4o7O2pB9c=" + }, + "com/google/auth#google-auth-library-parent/1.33.1": { + "pom": "sha256-rDpyUAgfZYd11n6eEQqOUmeB2I+7iNuktHkstH02Yg0=" + }, + "com/google/auto/value#auto-value-annotations/1.11.0": { + "jar": "sha256-WgVc5CVTM7M0bhqHA9pb+P8ElTIob9zTFxLWJKvhEd0=", + "pom": "sha256-KuwW406j4BFiGgMi9PNvj5v5iLtURitVcJduieoHsSI=" + }, + "com/google/auto/value#auto-value-parent/1.11.0": { + "pom": "sha256-Wg0dcYVS6KRdzOASjRtrliP6lxqCzSRXUyM7pyCMsp0=" + }, + "com/google/auto/value#auto-value/1.11.0": { + "jar": "sha256-qvjWN7/tPEIENrn6zxt6iNEsh4U3TkICOCeDAFMZwsM=", + "pom": "sha256-Gl3C8igShj2zDdO669qWFq7Ql6Ggo+HkYi+dgFEuIWc=" + }, + "com/google/cloud#first-party-dependencies/3.45.1": { + "pom": "sha256-6/JeHVfkUxklQ268l14Mug2NI70W4qGBsD8Ne8GBa5U=" + }, + "com/google/cloud#google-cloud-bigquery/2.49.0": { + "jar": "sha256-/Xft/YhbdWtM0PnuD5nLsyJeGmmH4D/Pd9iQwQmLjI0=", + "pom": "sha256-MtwV0Y4nNfyKvZIs0ROk3dF20gZ7ovYtngjo/gs3tWU=" + }, + "com/google/cloud#google-cloud-bigquerystorage/3.12.0": { + "jar": "sha256-V3PGmXAFLX/v7olB5E7Ovbx708tzjKaN0zjEUh1nD34=", + "pom": "sha256-RJZxHGylJlVp1rJuzqtJnRIucQKvRSofgE3jxIxKBOM=" + }, + "com/google/cloud#google-cloud-core-bom/2.53.1": { + "pom": "sha256-3Fg9b8fIPxu4ZzBD6FF3leW5OShxdJLNYo2DYP2mvBs=" + }, + "com/google/cloud#google-cloud-core-http/2.53.1": { + "jar": "sha256-yew4ILjxfKUAXmCLnwAsBJRnzMiIyGpU9E3fHrWulQY=", + "pom": "sha256-ucfOXO4BQlInn0OeTeLI9GieVNxQp8kSjPk6yM2g3Vo=" + }, + "com/google/cloud#google-cloud-core-parent/2.53.1": { + "pom": "sha256-+jVVS2/ZAnNaLxeRx0sFnBlo27UAZxiUXlb+Zk6ApoM=" + }, + "com/google/cloud#google-cloud-core/2.53.1": { + "jar": "sha256-WOAI8RmnqvaNLRP1MOmX22eXt6qnDgjFY0IWJ77TgrA=", + "pom": "sha256-kkCD7+kGOFNOMW8n4hgeX68rouWH0tL5UoprxsxWtvk=" + }, + "com/google/cloud#google-cloud-shared-config/1.14.4": { + "pom": "sha256-JdZSrtqJZR9/vqORqMDzoYkOmDLx166FkTowtVHUYg8=" + }, + "com/google/cloud#google-cloud-shared-config/1.15.0": { + "pom": "sha256-6drXGU9AdIgPYjR+/Q1MtfIw8migajTVwdPE6hmLVIs=" + }, + "com/google/cloud#google-cloud-shared-dependencies/3.45.1": { + "pom": "sha256-IwAFTjzkYszJStSakFJS52e49huMtnM/MK/bfFylvAI=" + }, + "com/google/cloud#native-image-shared-config/1.12.0": { + "pom": "sha256-aIc9CD0SZ5QfqWL2PWc5SzXp1Ayv/0FPLmK0N7S3Yo8=" + }, + "com/google/cloud#native-image-shared-config/1.14.0": { + "pom": "sha256-hYFgPADWXFCDAU1tpnUm9pM/ihoB8GHUqTgzA6IpOl4=" + }, + "com/google/cloud#native-image-shared-config/1.14.4": { + "pom": "sha256-jl1OmgNqUS10l0iQhxE2l9b/761kQJtG5KUoLkC6xIs=" + }, + "com/google/cloud#native-image-shared-config/1.15.0": { + "pom": "sha256-GjFbRvb4f7j0NLroUbFroJk1srJ6IAE+8sWSRTz4uwo=" + }, + "com/google/cloud#third-party-dependencies/3.45.1": { + "pom": "sha256-5ztLcHd+ioYTyAcwb+ejYCutACYoBavpULZc/C8bRiA=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.12.1": { + "pom": "sha256-yeewt+Mb574iaEl5wGgAHGUssRPE5u2JTjm2Q97gf8E=" + }, + "com/google/code/gson#gson/2.12.1": { + "jar": "sha256-6+4T1ft0d81/HMAQ4MNW34yoBwlxUkjal/eeNcy0++w=", + "pom": "sha256-C1c17IX0UoLx4sdpd5gAQnsVCoFj9AUJOpKAtxyrGXg=" + }, + "com/google/errorprone#error_prone_annotations/2.36.0": { + "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=", + "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw=" + }, + "com/google/errorprone#error_prone_parent/2.36.0": { + "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw=" + }, + "com/google/flatbuffers#flatbuffers-java/23.5.26": { + "jar": "sha256-jRDKwuqYeIlgd7pDfXb9sbmgf1WoY8Vgu4oCSwQQP4s=", + "pom": "sha256-2uQpwGnFrFkXFDSfYZZ0cZm3kK5qkuLizzDu0mx+ATk=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-bom/33.0.0-jre": { + "pom": "sha256-WbIwZqWpS4vzI5vUKICZGPsXMG49tJZpqVCaDqRph2g=" + }, + "com/google/guava#guava-bom/33.4.0-jre": { + "pom": "sha256-OuGXeIQNiENUgMjFC69z6qKi/A8hxzrgkX0A2mU8J1Y=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/33.4.0-android": { + "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM=" + }, + "com/google/guava#guava-parent/33.4.0-jre": { + "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc=" + }, + "com/google/guava#guava/33.4.0-android": { + "module": "sha256-T1fpmXE67O0x+j3jwJSyCTuU9p7+Lcne48VlWKRyZNU=", + "pom": "sha256-6Zh7Tm0QAgNaBekAqosGuEvGpCxoEC6R80cVybIZgO0=" + }, + "com/google/guava#guava/33.4.0-jre": { + "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=", + "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=", + "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/http-client#google-http-client-apache-v2/1.46.3": { + "jar": "sha256-tGMWOo4AEZSTN0BRQjOioAIWfF7u/XB2VFClq5O8P7Y=", + "pom": "sha256-yVhhxkBwEToAoc+eOeFQesgXxFrKc1Fl4xkzJI7J2wo=" + }, + "com/google/http-client#google-http-client-appengine/1.45.2": { + "pom": "sha256-pJ52DcJ03lzgVoYlRdTFcknPadCb+zCo5E04fkKxZVw=" + }, + "com/google/http-client#google-http-client-appengine/1.46.3": { + "jar": "sha256-sPSHlLI0Q5rZ6bRPY4dMeOjFU9A6qJ8oZMojHjxZC0M=", + "pom": "sha256-p9ZDOXVMtv/Km16PwHeR5J2KshWiPyz4m2cuQiWCM5o=" + }, + "com/google/http-client#google-http-client-bom/1.43.3": { + "pom": "sha256-K9C6F9zatcBDtHXQR3XKphHUINxWEIsY402T0nmwJrk=" + }, + "com/google/http-client#google-http-client-bom/1.45.2": { + "pom": "sha256-9IAlaC2K0ywkfnkpeFtgE1H2O7GchuNpb+BO58k0uSU=" + }, + "com/google/http-client#google-http-client-bom/1.46.2": { + "pom": "sha256-6BeAyCZ1MnrqcIELkkwqYrA3r0pDCQKOCkBA2oFewNo=" + }, + "com/google/http-client#google-http-client-bom/1.46.3": { + "pom": "sha256-r0QQlY2/bmzlxwD5vAs/l3IgSV2IxfGYh+R4UZ6akEM=" + }, + "com/google/http-client#google-http-client-gson/1.46.2": { + "pom": "sha256-rtOiq+NedKsn31cOeaLmWHVdgn7R2FLK0OxD2oW3hRU=" + }, + "com/google/http-client#google-http-client-gson/1.46.3": { + "jar": "sha256-dO7mXFY4cWWUaeuF1wPlpyI0JwEK1UWYL9xT19tXMmY=", + "pom": "sha256-Sjn0RPSQFro7EIJcewOXpXg+pjvxq0Rz8mfGlVgI7GQ=" + }, + "com/google/http-client#google-http-client-parent/1.45.2": { + "pom": "sha256-cKoIl+oZpXKtZxOgBMDPM3pKlIPjJ9Vg7Fc8cagyL+U=" + }, + "com/google/http-client#google-http-client-parent/1.46.2": { + "pom": "sha256-zdH6LQtME8ouzz2JCbIvQc+zj/v05SyVKqR3uiblqlM=" + }, + "com/google/http-client#google-http-client-parent/1.46.3": { + "pom": "sha256-VcDDglOHTIIdVHvyppjBSAjmzkrd/Rr+B/lzrC4sUqI=" + }, + "com/google/http-client#google-http-client/1.46.2": { + "pom": "sha256-WsHW8s3ajzhPWdxALNUCn/dTf78rdNDdxt8d+1zcBaU=" + }, + "com/google/http-client#google-http-client/1.46.3": { + "jar": "sha256-JJCgbkS38q28/ifkCZpXbA7o0mlDcYjVORrNSMbTQxA=", + "pom": "sha256-3+9xCym9Qan65IfqaFaA841iHnHENJJfOB1wUMKud/4=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/google/oauth-client#google-oauth-client-bom/1.36.0": { + "pom": "sha256-9oGcT6yZOGhd1zog0o0MVkakhmeJsmh0EbavFlPkAcU=" + }, + "com/google/oauth-client#google-oauth-client-bom/1.37.0": { + "pom": "sha256-1enI/oNNA3wnCBgptUai77VkTXWBIi7BQ5/ir2S+Kh8=" + }, + "com/google/oauth-client#google-oauth-client-parent/1.36.0": { + "pom": "sha256-NkKag9g4ALNEMrnyaRRfZwaLlD2EAHjWg5eFBobkhz8=" + }, + "com/google/oauth-client#google-oauth-client-parent/1.37.0": { + "pom": "sha256-BGf+8kkGcurQ896kpd40U4hNQKvWlF4h6GRs5K6KxTw=" + }, + "com/google/oauth-client#google-oauth-client/1.36.0": { + "pom": "sha256-RGUF2XB71ipzmwdpAC5Ynwfz+Xlkg3zV+W1rhUC27CQ=" + }, + "com/google/oauth-client#google-oauth-client/1.37.0": { + "jar": "sha256-6mQCxsms+6FYxk8IBSnpJJL6XZlMt7G7YuTNnxJcBOA=", + "pom": "sha256-oD5bhIk4Vc3kp2SyQdK/88y0hI+Vmx3DEPXLbwqCrpg=" + }, + "com/google/protobuf#protobuf-bom/3.23.1": { + "pom": "sha256-zCdyXo5JDH81NLRlbM60rJA9I6N/A4hF81UKUZ2sBt8=" + }, + "com/google/protobuf#protobuf-bom/3.25.5": { + "pom": "sha256-CA4phBcyOLUOBkwiav/7sbAjNSApXHkKf9PWrkWT8GM=" + }, + "com/google/protobuf#protobuf-java-util/3.25.5": { + "jar": "sha256-2sxYssPS+o1L3cGsuIHnjWz3wTfdeLwdZ/aspzJDao0=", + "pom": "sha256-oJ0ZDqpqeWFrxfS1QE6UsMq1WYA6mMigkMQJmWL0H5I=" + }, + "com/google/protobuf#protobuf-java/3.25.5": { + "jar": "sha256-hUAkf62eBrrvqPtF6zE4AtAZ9IXxQwDg+da1Vu2I51M=", + "pom": "sha256-51IDIVeno5vpvjeGaEB1RSpGzVhrKGWr0z5wdWikyK8=" + }, + "com/google/protobuf#protobuf-parent/3.25.5": { + "pom": "sha256-ZMwOOtboX1rsj53Pk0HRN56VJTZP9T4j4W2NWCRnPvc=" + }, + "com/sun/istack#istack-commons-runtime/4.1.2": { + "jar": "sha256-f9Z5I2H03QD4xWr0ogzswAZt7qSo897Dg0ivI/wilu4=", + "pom": "sha256-EiKikL7dtvbpK8mZvOvDaW/NbXIhWFbSJHJ6e8LcOso=" + }, + "com/sun/istack#istack-commons/4.1.2": { + "pom": "sha256-2Ig+twNkcB2uDjdEnIj9knUResPYYEDonxvj6dR+nJ0=" + }, + "com/sun/xml/bind#jaxb-bom-ext/4.0.5": { + "pom": "sha256-vDnKsUxxStmKeyoG96ybM3bgeVVCaa03KhfXEd9Yp6E=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/4.0.5": { + "pom": "sha256-xrVu/pzFnzx4NT0oTFXo3PFivoX4IrJs+BAjxvkI9/c=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/4.0.5": { + "pom": "sha256-/nf5B+HRRTqtaa92NX6tEKXkkzyKkI9XqZ2ncTBw00A=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.5": { + "pom": "sha256-yu7EM19YqOOcl+oK6JvqnCtJro2bD82SUjjgKNOESU8=" + }, + "commons-codec#commons-codec/1.18.0": { + "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=", + "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "io/grpc#grpc-alts/1.70.0": { + "jar": "sha256-tLISXos7vCt37XFX8onnhwjgNWUrlTr2v5DX9O+Y4bU=", + "pom": "sha256-Jk/sChAI4+jauRJry0UPEKTG4SE+irnzOVBZcVw/EiE=" + }, + "io/grpc#grpc-api/1.70.0": { + "jar": "sha256-RfryrBvyeR6P2rzlNoSoa2LJm4TLom+xOluj9Kv4DWw=", + "pom": "sha256-C7+SrQC+fNQmMXDatDAC1y9AAdzblhL7b0ofVeJNBMs=" + }, + "io/grpc#grpc-auth/1.70.0": { + "jar": "sha256-dNcx7prSSwonMByRt+KThjlLTPxrbpaCEHY8kPEXQrI=", + "pom": "sha256-RgwaSczKe0J8/tPIG7hmkn+8DE59MMbbY9VX5Eab/yU=" + }, + "io/grpc#grpc-bom/1.60.0": { + "pom": "sha256-5pcWWUmamLYwCAsrVhiia0Kh3+VhExetDUor9bm7FJI=" + }, + "io/grpc#grpc-bom/1.70.0": { + "pom": "sha256-05Jeafef8/CV7HepVsN0QpPlxg91yDcVnxLnZAQ2J7U=" + }, + "io/grpc#grpc-context/1.70.0": { + "jar": "sha256-6ygkgxwKwD50Hv2oaxQaqGOkgevEqvWlwfE6SB27QP8=", + "pom": "sha256-rnYbtXTUmkD593I8CK0OtCOTDfQIV3Fwd021ouVfvxQ=" + }, + "io/grpc#grpc-core/1.70.0": { + "jar": "sha256-wrVXa4s2OxsQBmc8SS2RJQC6qhWBQwp/nAXoLMW9+6Q=", + "pom": "sha256-4/A0XupqaSlPwGuO1CywLBv3K5ncZcpwvCGTxltmX0o=" + }, + "io/grpc#grpc-googleapis/1.70.0": { + "jar": "sha256-1Koo5DfRptGdvwZQk7DjSwQwiWJXfjHMtI885xWNeyc=", + "pom": "sha256-ktQ/A+48dt7SKS8rVnhXm4RNCocnb2Yk9vLS+/D1j2I=" + }, + "io/grpc#grpc-grpclb/1.70.0": { + "jar": "sha256-iHxVkr/2xPOa7/zacMjRu4cFjNiE0c04xwlj4reFCVc=", + "pom": "sha256-t8VIOmqyw7v1b/7enwmOyh8R4Rk3VYQ1ftXRB0mRJH4=" + }, + "io/grpc#grpc-inprocess/1.70.0": { + "jar": "sha256-2UELBtOTg5gOFIl4XZs0fIaIOXZPtp5YgydHHVtz558=", + "pom": "sha256-1xcjDdZEa9hrRblwFGCOHnPtTS/iuOJz9tx0+SJ/iHw=" + }, + "io/grpc#grpc-netty-shaded/1.70.0": { + "jar": "sha256-5cU98JoT8kdNN+D/B7bHT3zJYYeaNS9LySyUY7zBQWQ=", + "pom": "sha256-9A6oYHUpi26hMFus6Ae+nPtyHF0e9+jHSwmaQkglcLQ=" + }, + "io/grpc#grpc-protobuf-lite/1.70.0": { + "jar": "sha256-58wsqJgWcoUcvr+Dokv7k8GysFjnXBqBenV7kU8zQD0=", + "pom": "sha256-n3tCXI8wKW2EqB9CtsRv+YL/G8DpUpFHatpIYQugKjg=" + }, + "io/grpc#grpc-protobuf/1.70.0": { + "jar": "sha256-m5gDntgmYExG1qyPihgtQT00jsar4mRnc2sFqpLn4dM=", + "pom": "sha256-vbgvEfJM0qRm8ZzqmOOAXOXNE/TfrEC7MCZKaGN4+2g=" + }, + "io/grpc#grpc-stub/1.70.0": { + "jar": "sha256-Wtqh7B90S2euFKjbw5yVicAQ+tD9VXsKApZiAuTSOhg=", + "pom": "sha256-kakbfQ6AJnSkU6gHm2CVQv+1IjDsa/03bRdY7sX2OtI=" + }, + "io/grpc#grpc-util/1.70.0": { + "jar": "sha256-aDr/k9LKvET/Idyat3lPiue0xl0YdIyEdFNTEeq+jcQ=", + "pom": "sha256-UBYBc8lJdZVwQfpf5wc27ylG1w9h3n9o+Bf9AdNa5xg=" + }, + "io/netty#netty-bom/4.1.104.Final": { + "pom": "sha256-WmXgahWdINO0gAYkpXDGRtvucQsrU5s0SaJoVYwonpw=" + }, + "io/netty#netty-bom/4.1.115.Final": { + "pom": "sha256-JdyLuDN9/BhsSfyM9PaltsfPQUY2L19EDaytzQ35dhs=" + }, + "io/netty#netty-buffer/4.1.119.Final": { + "jar": "sha256-MiJiGNhUwuUdSTWn6+RmO3Lsua9NqIG4a/UY5hrtSNM=", + "pom": "sha256-ZxrAlb6wlY6qKsRVFJKWSVO3ZDD3VBbGa93g8++Qb0k=" + }, + "io/netty#netty-common/4.1.119.Final": { + "jar": "sha256-mRppsVlNytmSbiaOfpRTDP2qif7vQq8mkiowLT4ukhI=", + "pom": "sha256-PMa/2IxM0XguEknOg8O1TyruD8YVy32HoFU3i66XUyM=" + }, + "io/netty#netty-parent/4.1.119.Final": { + "pom": "sha256-/zqMSVFYZZvdITF/YSVIv1jXFNswT87Gm4BJake2hgM=" + }, + "io/opencensus#opencensus-api/0.31.1": { + "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=", + "pom": "sha256-VW9CfhIJDvs2pgh/dBCr/kXeEBByktlvpj5BdRdOy3Y=" + }, + "io/opencensus#opencensus-contrib-http-util/0.31.1": { + "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=", + "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s=" + }, + "io/opentelemetry#opentelemetry-api/1.47.0": { + "jar": "sha256-ZWbx8RM9YR/06Lj9uOsYV3uXBCViAxU2Pum+Q4Q7FL8=", + "module": "sha256-zCE6CaI+2/bRdOu7k/tl0oCeD8o/m2o0Vbi7a9xE/jQ=", + "pom": "sha256-X2xsLNziNhUfBA1Kmp+OwQW5GV0PFrWu2FVy8wDqyR0=" + }, + "io/opentelemetry#opentelemetry-bom/1.47.0": { + "module": "sha256-QdK1ilQMmkQ1iAmy1jZIDtR8Alovp77NenjEy3TklL4=", + "pom": "sha256-VcVgSi3oNT9k7MTF1CyPvxARFc+s00QWABnKY468ilc=" + }, + "io/opentelemetry#opentelemetry-context/1.47.0": { + "jar": "sha256-FbT8QjTm3KbVSADVcmlOy9B7pSwV/FsiG02lUXzo2Q0=", + "module": "sha256-M4aB6NwaH2T/tvcHjEa2+WD+lGN5ni3r6+fVjAb8XbM=", + "pom": "sha256-WUMqp3bD8etmBrhU53g1+iPlJBUPfg36PGUQ61ekQsM=" + }, + "io/perfmark#perfmark-api/0.27.0": { + "jar": "sha256-x7R4UD7FJOVd8ZtCTUbSfIporrgBZk+t1PBptx9S0PY=", + "module": "sha256-n2xOamK43v0UFzrNt9spPQhjU7Ikkj7vYpP1gWGJPMo=", + "pom": "sha256-IsF1wsGCNmdjDITnMiV2f1lwSS2ObL/7gaZXXbpHLSY=" + }, + "jakarta/activation#jakarta.activation-api/2.1.3": { + "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", + "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg=" + }, + "jakarta/annotation#jakarta.annotation-api/3.0.0": { + "jar": "sha256-sB9VVSKEz7FJQR5k6rynXpQtJtLheGsykUJQ5DMK+qI=", + "pom": "sha256-n8Zqhzdd+EQ6umvcwdT/B/EmVCWDeFpIKpJioZv+jq4=" + }, + "jakarta/inject#jakarta.inject-api/2.0.1": { + "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", + "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o=" + }, + "jakarta/json#jakarta.json-api/2.1.3": { + "jar": "sha256-vJNBQoBeodeU8UQFY5ZaOGGiqft0FOzT/kTyZQBzRBQ=", + "pom": "sha256-QWpzlxOFoL5D+dqKR3qmT0gUrFIYfYjz4k8hW3+J394=" + }, + "jakarta/json/bind#jakarta.json.bind-api/3.0.1": { + "jar": "sha256-2TfwHBLUFvCmFah82CUcK91F91AkTr4ojEum1GnbA3c=", + "pom": "sha256-99lfbceYkWL3oXL79NKkwTZYCw6vVu7C3pvZjTdlDFE=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/servlet#jakarta.servlet-api/6.0.0": { + "jar": "sha256-wDTrGvsViYfbtTpf6gyt9hHI2ujardWcRNnVq3ASnO8=", + "pom": "sha256-PVolnfvSuUDklcMFy6K2BhWSPcgXjgMrfvYMuyQThDk=" + }, + "jakarta/validation#jakarta.validation-api/3.1.1": { + "jar": "sha256-Y84AFWOIw2XzrBvnH8+vEUaC/AxFICC1325+wjbhQqs=", + "pom": "sha256-qxnpAKv5Awo3+DI+Ws66WNQK+I47UqBYuOA95II1ync=" + }, + "jakarta/ws/rs#all/3.1.0": { + "pom": "sha256-1P3UF4DgZarNWsCZzQSQFxk3zFEi3CyO8biKh7PJQkw=" + }, + "jakarta/ws/rs#jakarta.ws.rs-api/3.1.0": { + "jar": "sha256-azs2KLi0rt2g0kwzVDNemFSX2O88UQuPMCjpINW4Zj0=", + "pom": "sha256-xpejA+n/wxlj6xwnW793pYOn1IKWWsTxuybckeWV/78=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.2": { + "pom": "sha256-SCzbRtTdL1r33IhMim3nPd/+ba9UnvNqbAd/1uQe7Qg=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/4.0.2": { + "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=", + "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4=" + }, + "javax/annotation#javax.annotation-api/1.3.2": { + "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=", + "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache/arrow#arrow-bom/15.0.2": { + "pom": "sha256-smxLzIdQ3lilf5FewSm3Ldwe4aiQQTcuBIIEz2dmB3k=" + }, + "org/apache/arrow#arrow-format/15.0.2": { + "jar": "sha256-hM8dWwy7YHshrS1LUXNB1YlakZEES24ND/IVYLJlIyE=", + "pom": "sha256-YZWyjPHXfR//+fr3qXfpTwFxH5pKPdam7T/zKB9jGLw=" + }, + "org/apache/arrow#arrow-java-root/15.0.2": { + "pom": "sha256-3eYwjnKSWsQMNj6gXovBzMUgoe5FFBon6XoeVQdq2UA=" + }, + "org/apache/arrow#arrow-memory-core/15.0.2": { + "jar": "sha256-x8v4+MO0BbagQ20a5aIFH0+0p/a7ViCVTBLBSiLD3VA=", + "pom": "sha256-t1b9yPpEvDDHCr+nx0ylBGdvWzfJrDMNWb8vf0Kx0uU=" + }, + "org/apache/arrow#arrow-memory-netty/15.0.2": { + "jar": "sha256-MM28fUhUgVH36jBMjglZE0vtLGvCspWeqQf05/ekN7A=", + "pom": "sha256-Re5EvLlgCgH9YpP/VQF+GOJlkoxaw9VTm8bFU1gBZ0s=" + }, + "org/apache/arrow#arrow-memory/15.0.2": { + "pom": "sha256-GOiz1kGw1br6LdC2/IyTLpObYwUU2zV+tJEFruapgKs=" + }, + "org/apache/arrow#arrow-vector/15.0.2": { + "jar": "sha256-xNJolSQFmqV5LYewPX+xlcam65CFdZmDxBF8OA7ki3U=", + "pom": "sha256-mdlD/xCSUHbFJfk+aS3DEATyaurn6qbFDswFZxUZ148=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/79": { + "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/httpcomponents#httpclient/4.5.14": { + "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", + "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.14": { + "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.16": { + "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging/log4j#log4j-api/2.24.3": { + "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=", + "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.3": { + "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg=" + }, + "org/apache/logging/log4j#log4j-core/2.24.3": { + "jar": "sha256-frQIRZauJb08YWmOSOjQq2WpJgdYiE7Vy7nG5VxEpWo=", + "pom": "sha256-v9XAxKrGECQsy2H/ABCK1zeA2iCi9ym+Bjg2qXZXf1c=" + }, + "org/apache/logging/log4j#log4j/2.24.3": { + "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/checkerframework#checker-compat-qual/2.5.6": { + "jar": "sha256-EdE0skXpysxHRRTS1mtbhhj4A5oUZc3FW7wLNOAAi3o=", + "pom": "sha256-FxNsR1rgzd9LMvf66tVIbCzEWgZI69MH6uDbNUuWCLE=" + }, + "org/checkerframework#checker-qual/3.49.0": { + "jar": "sha256-i52aNuqvfA/CZQPIPNl9jJwPnikTzCpukqwmxzXU3L4=", + "module": "sha256-YA0Z+9XjfemEh8OYBF4UCmUc9brRx5xcl88MyYRMQuQ=", + "pom": "sha256-yEUftI7+1jgbMpFG1PrvtvTYq/E79XLCaosawoCW54A=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.24": { + "jar": "sha256-xyDm5by+ay9I3tdaR7zNt2Pu3nnRQzAQLg01Lj2J7ZI=", + "pom": "sha256-iEhPYKatQjipf+us8rMz6eCMF4uPGAoFo+2/9KOKg24=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.24": { + "pom": "sha256-Sd2rQ8g2HcLvDB/4fLWQ+nIxcCq59i4m1RLcGKHxzQQ=" + }, + "org/codehaus/mojo#mojo-parent/84": { + "pom": "sha256-L+UQYYsvYPzV8vuCvEssLDRASNdPML5xn8uGgp7orDA=" + }, + "org/conscrypt#conscrypt-openjdk-uber/2.5.2": { + "jar": "sha256-6vU32Y4DPQ8EUc0bjMdOAte1XsiC2mPIgGDYBrqJw0g=", + "pom": "sha256-tf1UhzL5MlRdd3iQ65lSIr/oZiMjUb6QgTfjnDxnLYs=" + }, + "org/eclipse#yasson/3.0.4": { + "jar": "sha256-9lgoX54+GjmZ4uqSaV/DOJKyWDBdKtr7cphegUUt3Qc=", + "pom": "sha256-2mB8ukIh4FJA4wjjTR9I0LDhrfBed2Mr7MA/mp9fw5A=" + }, + "org/eclipse/angus#angus-activation-project/2.0.2": { + "pom": "sha256-r5GIoQy4qk61/+bTkfHuIVnx6kp/2JDuaYYj5vN52PY=" + }, + "org/eclipse/angus#angus-activation/2.0.2": { + "jar": "sha256-bdO8/8IrzoOwc3ag4uCU5JZKMZXUEY+0PjgO81Q2zB4=", + "pom": "sha256-deViGn3IWMmW7nDGtNiE2QHRh4Ns5sZxIMr5VH5vxXE=" + }, + "org/eclipse/collections#eclipse-collections-api/11.1.0": { + "jar": "sha256-G4YI7PTmgfAxwpooxAP3FHb+XfOo8MDdjHrTO5GYQhI=", + "pom": "sha256-FrNfjbqEJ72caQTFkdzyKeN+oq2AWNatQf77jjTM5x8=" + }, + "org/eclipse/collections#eclipse-collections-parent/11.1.0": { + "pom": "sha256-jjE9sGTinEJIK8p12LuRKH1ByKPZ+xqg8qExI3JI14k=" + }, + "org/eclipse/collections#eclipse-collections/11.1.0": { + "jar": "sha256-iIF0neeRwoxszqYhMUo6FUz+du93wwBUtucUw9x2lp0=", + "pom": "sha256-rDVVCe3JA1Q4bVCeSSieeX0+coQ5Ugw//E9vksymD2M=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.8": { + "pom": "sha256-DQx7blSjXq9sJG4QfrGox6yP8KC4TEibB6NXcTrfZ0s=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/jetty#jetty-core/12.0.19": { + "pom": "sha256-WlnJIoSqiWT9xOKQweakAaySfXmabfw3/eQ7GZ19ajk=" + }, + "org/eclipse/jetty#jetty-http/12.0.19": { + "jar": "sha256-BSICiO7RSRZ9pQbSFBMamI8wuVZS7ZKSBhTBWDPGSaU=", + "pom": "sha256-dIGCV/cZF26ofN91AXQkAQTDMGjYCxFDr601C7TeG4E=" + }, + "org/eclipse/jetty#jetty-io/12.0.19": { + "jar": "sha256-xs9Rz7QhmIpR0e3tAFzAabzpwqe/YcdNO5d+PFtekpc=", + "pom": "sha256-NGjexy5gMl01t5CFPx/CzL9r2/OPVtHxb9vyrERDZCs=" + }, + "org/eclipse/jetty#jetty-project/12.0.19": { + "pom": "sha256-4+ZN8tcwhMyChBtFyR3rZnkI9GIKLliMIvORKGCfxuI=" + }, + "org/eclipse/jetty#jetty-security/12.0.19": { + "jar": "sha256-NxOrBXh4etewjObIEJrL0+ne+Z4F3aD7OqdwEymme+c=", + "pom": "sha256-x/lnUYg9Stf9QGpYk6H8U7FXxcKzH2FC9+AbAYH8kPA=" + }, + "org/eclipse/jetty#jetty-server/12.0.19": { + "jar": "sha256-rXPzXFuYbvpNpQCvhkeyxVbSPiTDZFs3sG/YfQqecXA=", + "pom": "sha256-5sj3pEpmUzDh6PYZeIHSJp+6lpLHsBes/t/QQS6vzw4=" + }, + "org/eclipse/jetty#jetty-session/12.0.19": { + "jar": "sha256-vdYjUPrtOVBhivUPs3kkYrv6qUg24IUEVO5zZU5wulA=", + "pom": "sha256-cJT4uwG5bQL+YBcupTCkSxlDOG2n0wz64VtFtF9qAFU=" + }, + "org/eclipse/jetty#jetty-util/12.0.19": { + "jar": "sha256-kBuDmdZHU9jEjWyGV251jPfgLzaCR1XcIjqRCrXLxSU=", + "pom": "sha256-+3BLTg7ELNmVEgTn0I+XAqfoxrjn8QESYowyFxRqXW0=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.19": { + "jar": "sha256-unkQYcra4mm6jlFDZu+anv+MSpZDbxgwIOtHYkpZte0=", + "pom": "sha256-8nOgRAMEk3coOm+1AtX/XSEHBwkWqI2YEk5IaAw6pKo=" + }, + "org/eclipse/jetty/ee10#jetty-ee10/12.0.19": { + "pom": "sha256-g0v8BRMOoPBy9Yq/2YyKKLu8RYNqPi7bMXAQvFfkm+I=" + }, + "org/eclipse/parsson#parsson/1.1.7": { + "jar": "sha256-wh2wGPisbPeYk/Gvd/HNM3k3vRKub6PUsQ9aAIGe5Ww=", + "pom": "sha256-rrQE5/DBSnbsyLpuIezZL4D3wQQCpEb/XZwx1Q8I4tM=" + }, + "org/eclipse/parsson#project/1.1.7": { + "pom": "sha256-r171oT3deNwLoRUh3IOhKkVytRPILxAbsxDxGGxccU0=" + }, + "org/glassfish/hk2#external/3.0.6": { + "pom": "sha256-HRyIIn2+K7eMKkSn472dteOqOvcPFKZjI6qBsKXUnpw=" + }, + "org/glassfish/hk2#hk2-api/3.0.6": { + "jar": "sha256-wEmiGp/ZMWx+KRorwog19w0lr/tiPcFZmoO2uE7IOk8=", + "pom": "sha256-1qw9qzMZyFheEkaCpXfGLu1yoOZLR8Q+Bugld669aX4=" + }, + "org/glassfish/hk2#hk2-locator/3.0.6": { + "jar": "sha256-4mZNIbAXw6oVGLkTJkYCvqYE7cVNNWEDwQr7qZq9BPw=", + "pom": "sha256-JxO73h0Aikt6Z2PzNSTH8AccY/qCzAaR5M4yPpicpis=" + }, + "org/glassfish/hk2#hk2-parent/3.0.6": { + "pom": "sha256-AL2rCNWOtMDpdwVCBWS2mzoGNMhYP1jATawyY/O9K2U=" + }, + "org/glassfish/hk2#hk2-utils/3.0.6": { + "jar": "sha256-/ITYWgdEtXbZ7H21hF7rmY7VMqlFDdGcjJIsPuaSYgY=", + "pom": "sha256-NUOJtRSguxyTA1F6CWe+GFfaFMB3p5hm9vjSNG0KeEg=" + }, + "org/glassfish/hk2#osgi-resource-locator/1.0.3": { + "jar": "sha256-qrXXhJ98/Nosx8VBuhvTZRUdQidvFRyCU4ckXf3j3XQ=", + "pom": "sha256-i2Yi64HlVymfvZqoVLxax20wf3rl53BYZImli7Uziyo=" + }, + "org/glassfish/hk2/external#aopalliance-repackaged/3.0.6": { + "jar": "sha256-qCttGjSDJO+I3IB8fNeq9jOYXL/3swA2+2GhuGmB2EA=", + "pom": "sha256-+WC9Fv4TmZXL8T1AoEJhbIueGH+CtOXDK6pGr8m5/Nw=" + }, + "org/glassfish/jaxb#jaxb-bom/4.0.5": { + "pom": "sha256-7JfsQtk308iVGXl+RCRvgN4IUIGax6euZ1xEl7cHXDk=" + }, + "org/glassfish/jaxb#jaxb-core/4.0.5": { + "jar": "sha256-rT/ZvwDePtqYWfcLbPsBHi/pkEgE4WomZQkoiOzg/co=", + "pom": "sha256-S1OSE3b7/exg46j+8FjMPcmdn8o+nJUOhZKYeYRghXI=" + }, + "org/glassfish/jaxb#jaxb-runtime/4.0.5": { + "jar": "sha256-SF2JQOdjc6fzAIFepVBL9bcmwjRCWtMJcQGdEzEkzKQ=", + "pom": "sha256-d8T6BuLZyVN2LC5jUXN3oa4oWbGBssEzdZy1poKojKA=" + }, + "org/glassfish/jaxb#txw2/4.0.5": { + "jar": "sha256-kXNVvEUUgfMNBDsk0SMRBReWavNDg5AXc4goENykgOU=", + "pom": "sha256-a2gzdWAy4YOaQBRoFaWY7IsFg6Lv+9Rd311UMB9Ky6s=" + }, + "org/glassfish/jersey#project/3.1.10": { + "pom": "sha256-HwCrKqQxlS9Eb7DXajOYoWstCgzmAP/L/g8iKp9aRSU=" + }, + "org/glassfish/jersey/containers#jersey-container-servlet-core/3.1.10": { + "jar": "sha256-/RXn43IV13LM2ujUB2xBoRrT/snKiKH4qPbaz0Zju2k=", + "pom": "sha256-/08eBDeM5Au1jmt9dk24TJIXQ2PQlOO2W7Auqr9HOlw=" + }, + "org/glassfish/jersey/containers#jersey-container-servlet/3.1.10": { + "jar": "sha256-Sq3GbS02r7Jzs4mFgdaqUeD5kjCNVv1RuOMgHvpGH2c=", + "pom": "sha256-PKD2TQbThE//ImrPIn7MS7xQxeEksF9mH4QYJmZqe00=" + }, + "org/glassfish/jersey/containers#project/3.1.10": { + "pom": "sha256-srKeL9s0eph5sEbHW+rV6E9O/C0gQp9KVCoMsxkYRSM=" + }, + "org/glassfish/jersey/core#jersey-client/3.1.10": { + "jar": "sha256-ls+GwjtRXaIKMKOWM6kg8SpCDR5fAsVe9Vd8omlNEcY=", + "pom": "sha256-yCh1KxtdmOSer+v/bKTR5TK1pjJ33Xw/DqUOsyhuzEE=" + }, + "org/glassfish/jersey/core#jersey-common/3.1.10": { + "jar": "sha256-uN9d6H1I1qv1VfNAdVoFbIyymmYK+VjpWduKTLNVK1Q=", + "pom": "sha256-37Tr4q/ZEifpSSJXnGk6Wx6+UOupnI9HDFwZZjgipBY=" + }, + "org/glassfish/jersey/core#jersey-server/3.1.10": { + "jar": "sha256-GzOpvkF7cvfO7zr+l4B4G2YSKw8dt48vglApiAcs+rA=", + "pom": "sha256-ablIlDXkJYVymFSLzSYiC7+lazUOaI7vltV85vp8zM0=" + }, + "org/glassfish/jersey/ext#jersey-entity-filtering/3.1.10": { + "jar": "sha256-qvtmbou6oDtIguIS66TFZ/rwgdW2U0CIy12OyIWUhnM=", + "pom": "sha256-vGtOiqMPFeMrYKS3qYKQGJr4wwSZth5k1w1Z35ODHUU=" + }, + "org/glassfish/jersey/ext#project/3.1.10": { + "pom": "sha256-zmX1BhgfgD0o60fjmvz7Pm6/kfmaTmQsuOj2nvUWPYc=" + }, + "org/glassfish/jersey/inject#jersey-hk2/3.1.10": { + "jar": "sha256-AO1xxJaoVqwfcyckgqer4ntalrgjwpzAj0twjI0+ZH4=", + "pom": "sha256-bVISCGYiCVFDE0s8bLtZSypaGgALKu3a/TYj9M09uuU=" + }, + "org/glassfish/jersey/inject#project/3.1.10": { + "pom": "sha256-u1gO4XOEs5H3+uNuGHxlOqYVeVFmN2aggn/AwglTJlg=" + }, + "org/glassfish/jersey/media#jersey-media-json-binding/3.1.10": { + "jar": "sha256-RUFLx5YJXhtr+STdnu0jr0DhQrXjvXwq8DkKtyvhsvQ=", + "pom": "sha256-PwtFyLyViVmwBiZq1sNKJa7c082sINL4HA6lPra3S+o=" + }, + "org/glassfish/jersey/media#jersey-media-json-jackson/3.1.10": { + "jar": "sha256-3W8yv0OBtxqhfWEgFIUlIuEc2V81ksUzsiO3GTXCzNg=", + "pom": "sha256-CG9x4al4e0x7T4ts7HHzAuiQQ6DlSAP2ixo2/20eLpc=" + }, + "org/glassfish/jersey/media#jersey-media-sse/3.1.10": { + "jar": "sha256-fE+fD5UA/BSqeX4eNdPTiyLdf4VfdkAGcAA3CWUFFm4=", + "pom": "sha256-GYURmdPVQFG8CAiUTYG6/CMQURJ61cKUn7afG2gFbXg=" + }, + "org/glassfish/jersey/media#project/3.1.10": { + "pom": "sha256-IKAKpgkjN0iGlSW0V1WWPD1Js41DuBfIXIhZ1jc7AZw=" + }, + "org/hibernate/search#hibernate-search-bom/7.1.2.Final": { + "pom": "sha256-BAbGloTq1BCta0E1tShrtggnsLWiEdXl0T0iM1lATPA=" + }, + "org/infinispan#infinispan-bom/15.0.11.Final": { + "pom": "sha256-l1ZGl2WLzh5IwN06lHdoxhNyMtYVGVhBQhz8Q7GE6Cw=" + }, + "org/infinispan#infinispan-build-configuration-parent/15.0.11.Final": { + "pom": "sha256-utwbV7pKcUvVQfHty5kdfpBpDLJCNO8kd4ju3eO3jgo=" + }, + "org/javassist#javassist/3.30.2-GA": { + "jar": "sha256-66NykJlLXkho86+Y/xE/YkSmsJk4XZrUaIEwfTywGq8=", + "pom": "sha256-QieFHLcOQ/c6zti//mkt465EEsSmLc3/BV5RPuPYAaM=" + }, + "org/jboss#jboss-parent/43": { + "pom": "sha256-PDredvuIOs25qKAzVdHfQGb/ucjHjwmyGenA/Co/Qxc=" + }, + "org/json#json/20250107": { + "jar": "sha256-hdTBqxktMRf9Asf/8ewP5jreRc9W3vf+lQ7wYM8G6Z8=", + "pom": "sha256-ph+87jbeXMAb7ZMEYseLwEvBZBCwHZtfEABq8UoRvFY=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, + "org/junit#junit-bom/5.12.0": { + "module": "sha256-v/EC0wjRgUHrv+gdhjsFmaMPe7rK291WmKnUNpL9pi8=", + "pom": "sha256-rhFA2ksa+nWxxD/+oO8MreDDR/r1mWO1xJk/RzJwCNQ=" + }, + "org/junit#junit-bom/5.8.2": { + "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=", + "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.2": { + "jar": "sha256-GAjuh+D3GM1uJfO3WvwXlWrIo+3EjH6bq58Z+aeeOAE=", + "module": "sha256-fpr03/9iZ6zd0VfZ4Rug1dyRszL6dLxMZZOeRReht3A=", + "pom": "sha256-yb3jYieVswp3NTHoXFgy+NyKp37N0xPu4jXJg8v9Anc=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.2": { + "jar": "sha256-dTt3Js3RWLs0ztuUwWHiKRiW9HgyoentpT2XACCoGE4=", + "module": "sha256-pWIExxbCN5lwyo4/4qcuOgMM2QJzKNPOFFfdEMAVDn4=", + "pom": "sha256-Ckt92UuvnF+7ZaLpFz0IUii9ACQhNkgCWtBnAk8cZrs=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.2": { + "jar": "sha256-0cItb+VINWjAjIkT80q9IwNJDDSAzmwYouoxxl5EECo=", + "module": "sha256-UCPk4+wVbsa9PPZV8wcM/Fo+iq1dUbS74CWnkulJjXM=", + "pom": "sha256-tGngEBcBfYW8AlIlMCBS+kXPK1n5QVhCRzlGtPpJx8Y=" + }, + "org/junit/jupiter#junit-jupiter/5.8.2": { + "jar": "sha256-T1wcxkMiRM0W42qg4Ct0vONKgf+VoT1j1QlR7Ezj9L0=", + "module": "sha256-2d9Hs8dDGIOrHx8dggwpgOvL11PtxMgrmb9ewsUzrS4=", + "pom": "sha256-Q/Vic+es8z4PW10Qecf/pCRTHwHieUqdZHOt/RCkXS4=" + }, + "org/junit/platform#junit-platform-commons/1.8.2": { + "jar": "sha256-0uAV/KcTDnmvL0YI3FRBXksQtZLXczPey0saJ0wYUFA=", + "module": "sha256-NChH0wRv6kNVlWkttPBdXwOeDh0eIE9NV1WQJVcIJiY=", + "pom": "sha256-zoUuNMahhKpsgO6N8EcXE6dAgTQTTwjjwcPdh8a1mrc=" + }, + "org/junit/platform#junit-platform-engine/1.8.2": { + "jar": "sha256-C30AD4w+jl99a4GWSZNue5k4MU6HyPmDgFIY6ldWflk=", + "module": "sha256-66d7Nu/fdaZ/RkODM4JfnkSPVQ1SHnJJ2VA1hYDuY2s=", + "pom": "sha256-AWhkMmYGDtko71qBgjAD7PrnmpqMC7/Xb0IBxsnXccU=" + }, + "org/junit/platform#junit-platform-launcher/1.8.2": { + "jar": "sha256-giFWQJ/YPmguTFGZs0YAVCmbU4oFjCxtD1ybalvbdZQ=", + "module": "sha256-4XQA7HvnYIwfiI1yG0MAHpc2wVDUD5jIoLzalWPYyus=", + "pom": "sha256-tfancaautzyJpud/Vtcp9LqOta/dDxD0TbRNaq25UJU=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-bom/9.7.1": { + "pom": "sha256-qNMCypF0b46grZBx9i/zoNq9Ov5h2hTMgMHIdc9hi0I=" + }, + "org/slf4j#slf4j-api/2.0.17": { + "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", + "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" + }, + "org/slf4j#slf4j-bom/2.0.17": { + "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + }, + "org/slf4j#slf4j-nop/2.0.17": { + "jar": "sha256-Nxb4NknsZhYaLt79T0nfNNHdHFHNz5QZlsaYcmDwqCk=", + "pom": "sha256-5eVI3OjByXkTin6WyjVFEPoM4QPwpt9TofWyXpKYubI=" + }, + "org/slf4j#slf4j-parent/2.0.17": { + "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/testcontainers#testcontainers-bom/1.20.4": { + "pom": "sha256-oVFHwtqO3sE0AdHT5qCgG2Gea2e2bBA1ks7zpwzB7Ik=" + }, + "org/threeten#threeten-extra/1.8.0": { + "jar": "sha256-UeTSHtxOlEf3dgwFDguu5119lz84e6YFoXq9xNJP1tg=", + "pom": "sha256-pdjN8lkr2h70BZZYg9stpDGyZ8dt4wDQdYIeIPbcDH0=" + }, + "org/threeten#threetenbp/1.7.0": { + "jar": "sha256-hXkX0jGaTpLcHF4663Wg2shERe0xXnrD2Cu40rKYl38=", + "pom": "sha256-nLthSu/sbVcp7MrdZMmhnpshg/w6Dgk8APN2rPptC0Q=" + } + } +} diff --git a/pkgs/by-name/fr/freerouting/package.nix b/pkgs/by-name/fr/freerouting/package.nix new file mode 100644 index 000000000000..62a5892a5f93 --- /dev/null +++ b/pkgs/by-name/fr/freerouting/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeBinaryWrapper, + makeDesktopItem, + jdk, + gradle, + copyDesktopItems, + jre, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "freerouting"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "freerouting"; + repo = "freerouting"; + tag = "v${finalAttrs.version}"; + hash = "sha256-K4fwbvSPuKAAnIcTDBSAI1/6HuCB7c9rCGTJcyAj5dQ="; + }; + + gradleBuildTask = "executableJar"; + + nativeBuildInputs = [ + makeBinaryWrapper + jdk + gradle + copyDesktopItems + ]; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/freerouting} + cp build/libs/freerouting-executable.jar $out/share/freerouting + + makeWrapper ${lib.getExe jre} $out/bin/freerouting \ + --add-flags "-jar $out/share/freerouting/freerouting-executable.jar" + + install -Dm644 ${finalAttrs.src}/design/icon/freerouting_icon_256x256_v1.png \ + $out/share/icons/hicolor/256x256/apps/freerouting.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = finalAttrs.pname; + exec = "freerouting"; + icon = "freerouting"; + desktopName = "Freerouting"; + comment = finalAttrs.meta.description; + categories = [ + "Electricity" + "Engineering" + "Graphics" + ]; + }) + ]; + + meta = { + description = "Advanced PCB auto-router"; + homepage = "https://www.freerouting.org"; + changelog = "https://github.com/freerouting/freerouting/releases/tag/v${finalAttrs.version}"; + longDescription = '' + Freerouting is an advanced autorouter for all PCB programs that support + the standard Specctra or Electra DSN interface. ''; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ srounce ]; + platforms = with lib.platforms; linux ++ darwin; + mainProgram = "freerouting"; + }; +}) diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/pkgs/by-name/fr/freeswitch/modules.nix similarity index 100% rename from pkgs/servers/sip/freeswitch/modules.nix rename to pkgs/by-name/fr/freeswitch/modules.nix diff --git a/pkgs/by-name/fr/freeswitch/package.nix b/pkgs/by-name/fr/freeswitch/package.nix new file mode 100644 index 000000000000..3cfa51885b9b --- /dev/null +++ b/pkgs/by-name/fr/freeswitch/package.nix @@ -0,0 +1,193 @@ +{ + fetchFromGitHub, + stdenv, + lib, + pkg-config, + autoreconfHook, + ncurses, + gnutls, + readline, + openssl, + perl, + sqlite, + libjpeg, + speex, + pcre, + libuuid, + ldns, + libedit, + yasm, + which, + libsndfile, + libtiff, + libxcrypt, + callPackage, + modules ? null, + nixosTests, +}: + +let + + availableModules = callPackage ./modules.nix { }; + + # the default list from v1.8.7, except with applications/mod_signalwire also disabled + defaultModules = + mods: + with mods; + [ + applications.commands + applications.conference + applications.db + applications.dptools + applications.enum + applications.esf + applications.expr + applications.fifo + applications.fsv + applications.hash + applications.httapi + applications.sms + applications.spandsp + applications.valet_parking + applications.voicemail + + applications.curl + + codecs.amr + codecs.b64 + codecs.g723_1 + codecs.g729 + codecs.h26x + codecs.opus + + databases.mariadb + databases.pgsql + + dialplans.asterisk + dialplans.xml + + endpoints.loopback + endpoints.rtc + endpoints.skinny + endpoints.sofia + endpoints.verto + + event_handlers.cdr_csv + event_handlers.cdr_sqlite + event_handlers.event_socket + + formats.local_stream + formats.native_file + formats.png + formats.sndfile + formats.tone_stream + + languages.lua + + loggers.console + loggers.logfile + loggers.syslog + + say.en + + xml_int.cdr + xml_int.rpc + xml_int.scgi + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ endpoints.gsmopen ]; + + enabledModules = (if modules != null then modules else defaultModules) availableModules; + + modulesConf = + let + lst = builtins.map (mod: mod.path) enabledModules; + str = lib.strings.concatStringsSep "\n" lst; + in + builtins.toFile "modules.conf" str; + +in + +stdenv.mkDerivation rec { + pname = "freeswitch"; + version = "1.10.12"; + src = fetchFromGitHub { + owner = "signalwire"; + repo = pname; + rev = "v${version}"; + hash = "sha256-uOO+TpKjJkdjEp4nHzxcHtZOXqXzpkIF3dno1AX17d8="; + }; + + postPatch = '' + patchShebangs libs/libvpx/build/make/rtcd.pl + substituteInPlace libs/libvpx/build/make/configure.sh \ + --replace AS=\''${AS} AS=yasm + + # Disable advertisement banners + for f in src/include/cc.h libs/esl/src/include/cc.h; do + { + echo 'const char *cc = "";' + echo 'const char *cc_s = "";' + } > $f + done + ''; + + strictDeps = true; + nativeBuildInputs = [ + pkg-config + autoreconfHook + perl + which + yasm + ]; + buildInputs = [ + openssl + ncurses + gnutls + readline + libjpeg + sqlite + pcre + speex + ldns + libedit + libsndfile + libtiff + libuuid + libxcrypt + ] ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules); + + enableParallelBuilding = true; + + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + # Using c++14 because of build error + # gsm_at.h:94:32: error: ISO C++17 does not allow dynamic exception specifications + CXXFLAGS = "-std=c++14"; + + CFLAGS = "-D_ANSI_SOURCE"; + + hardeningDisable = [ "format" ]; + + preConfigure = '' + ./bootstrap.sh + cp "${modulesConf}" modules.conf + ''; + + postInstall = '' + # helper for compiling modules... not generally useful; also pulls in perl dependency + rm "$out"/bin/fsxs + # include configuration templates + cp -r conf $out/share/freeswitch/ + ''; + + passthru.tests.freeswitch = nixosTests.freeswitch; + + meta = { + description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; + homepage = "https://freeswitch.org/"; + license = lib.licenses.mpl11; + maintainers = with lib.maintainers; [ mikaelfangel ]; + platforms = with lib.platforms; unix; + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/by-name/fr/freetds/package.nix b/pkgs/by-name/fr/freetds/package.nix index ccb6c6fbc87c..8fdbc124c6f7 100644 --- a/pkgs/by-name/fr/freetds/package.nix +++ b/pkgs/by-name/fr/freetds/package.nix @@ -15,11 +15,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.26"; + version = "1.5.1"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-dGQaZswr+uMCwqZKSyaKPbj7DMc2TceXXETFfWXNjRw="; + hash = "sha256-YUb94hGwBYP608bRADDPpmSnROD1rmuH7f1le99GOwU="; }; buildInputs = [ diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 88973a0fa160..67bfda326e98 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -20,13 +20,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "freetube"; - version = "0.23.3"; + version = "0.23.5"; src = fetchFromGitHub { owner = "FreeTubeApp"; repo = "FreeTube"; tag = "v${finalAttrs.version}-beta"; - hash = "sha256-EpcYNUtGbEFvetroo1zAyfKxW70vD1Lk0aJKWcaV39I="; + hash = "sha256-tVe//h20cTVgpHeo3IlfGfuAH+dM6H5MEfGny5Uhrjk="; }; # Darwin requires writable Electron dist @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-xiJGzvmfrvvB6/rdwALOxhWSWAZ31cbySYygtG8+QpQ="; + hash = "sha256-F1YcdshWGRCO7kHsCK0Ejs0aMR7BFXd5M9ITdRVcpbk="; }; nativeBuildInputs = [ @@ -109,6 +109,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { alyaeanyx ryand56 sigmasquadron + ddogfoodd ]; badPlatforms = [ # output app is called "Electron.app" while derivation expects "FreeTube.app" diff --git a/pkgs/by-name/fr/freewheeling/package.nix b/pkgs/by-name/fr/freewheeling/package.nix index 039604733b56..7d5c1f84ffa2 100644 --- a/pkgs/by-name/fr/freewheeling/package.nix +++ b/pkgs/by-name/fr/freewheeling/package.nix @@ -3,8 +3,6 @@ stdenv, fetchFromGitHub, pkg-config, - autoreconfHook, - gnutls, freetype, fluidsynth, SDL, @@ -18,28 +16,23 @@ libSM, libsndfile, libogg, - libtool, + libX11, + nettle, }: -let - makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freewheeling"; version = "0.6.6"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; - rev = "v${version}"; - sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4"; + tag = "v${finalAttrs.version}"; + hash = "sha256-xEZBE/7nUvK2hruqP6QQzlsIDmuniPZg7JEJkCEvzvU="; }; - nativeBuildInputs = [ - pkg-config - autoreconfHook - libtool - ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ freetype fluidsynth @@ -54,20 +47,11 @@ stdenv.mkDerivation rec { libsndfile libogg libSM - (gnutls.overrideAttrs (oldAttrs: { - configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; - })) + libX11 + nettle ]; - env.NIX_CFLAGS_COMPILE = toString ( - makeSDLFlags [ - SDL - SDL_ttf - SDL_gfx - ] - ++ [ "-I${libxml2.dev}/include/libxml2" ] - ); - hardeningDisable = [ "format" ]; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev libxml2}/include/libxml2"; meta = { description = "Live looping instrument with JACK and MIDI support"; @@ -89,4 +73,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "fweelin"; }; -} +}) diff --git a/pkgs/by-name/fr/frei/package.nix b/pkgs/by-name/fr/frei/package.nix index 8ad8cf1a7f5c..bbbde6301315 100644 --- a/pkgs/by-name/fr/frei/package.nix +++ b/pkgs/by-name/fr/frei/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "frei"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "alexcoder04"; repo = "frei"; rev = "v${version}"; - sha256 = "sha256-jCUr3fREawA0J8Q0U07wCpBQrjPyH0l/6tih6C9kJWc="; + sha256 = "sha256-QVoRiqQt4DJK07YcCPplxigpgIqjDeQVYyDK/KQ7gbo="; }; vendorHash = null; diff --git a/pkgs/by-name/fr/frei0r/package.nix b/pkgs/by-name/fr/frei0r/package.nix index 77df045e964d..e9ebe6fd03d8 100644 --- a/pkgs/by-name/fr/frei0r/package.nix +++ b/pkgs/by-name/fr/frei0r/package.nix @@ -6,7 +6,6 @@ cairo, cmake, opencv, - pcre, pkg-config, cudaSupport ? config.cudaSupport, cudaPackages, @@ -31,7 +30,6 @@ stdenv.mkDerivation rec { [ cairo opencv - pcre ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart diff --git a/pkgs/by-name/fr/freshfetch/package.nix b/pkgs/by-name/fr/freshfetch/package.nix new file mode 100644 index 000000000000..850dc742e840 --- /dev/null +++ b/pkgs/by-name/fr/freshfetch/package.nix @@ -0,0 +1,31 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "freshfetch"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "k4rakara"; + repo = pname; + rev = "v${version}"; + sha256 = "1l9zngr5l12g71j85iyph4jjri3crxc2pi9q0gczrrzvs03439mn"; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-LKltHVig33zUSWoRgCb1BgeKiJsDnlYEuPfQfrnhafI="; + + # freshfetch depends on rust nightly features + RUSTC_BOOTSTRAP = 1; + + meta = with lib; { + description = "Fresh take on neofetch"; + homepage = "https://github.com/k4rakara/freshfetch"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "freshfetch"; + }; +} diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix index ba4ed09bac00..af726ce4f0c9 100644 --- a/pkgs/by-name/fr/fretboard/package.nix +++ b/pkgs/by-name/fr/fretboard/package.nix @@ -2,7 +2,6 @@ lib, blueprint-compiler, cargo, - darwin, desktop-file-utils, fetchFromGitHub, glib, @@ -20,19 +19,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "fretboard"; - version = "8.0"; + version = "9.1"; src = fetchFromGitHub { owner = "bragefuglseth"; repo = "fretboard"; rev = "v${finalAttrs.version}"; - hash = "sha256-8xINlVhWgg73DrRi8S5rhNc1sbG4DbWOsiEBjU8NSXo="; + hash = "sha256-LTUZPOecX1OiLcfdiY/P2ffq91QcnFjW6knM9H/Z+Lc="; }; cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-wYDlJ5n878Apv+ywnHnDy1Rgn+WJtcuePsGYEWSNvs4="; + hash = "sha256-Gl78z9FR/sB14uFDLKgnfN4B5yOi6A6MH64gDXcLiWA="; }; nativeBuildInputs = [ @@ -47,15 +46,11 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 ]; - buildInputs = - [ - glib - gtk4 - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + gtk4 + libadwaita + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isClang [ @@ -73,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://apps.gnome.org/Fretboard/"; license = lib.licenses.gpl3Plus; mainProgram = "fretboard"; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix index 9cd64d846448..ab5fe8501a2b 100644 --- a/pkgs/by-name/fr/frida-tools/package.nix +++ b/pkgs/by-name/fr/frida-tools/package.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "frida-tools"; - version = "13.6.1"; + version = "13.7.1"; src = fetchPypi { inherit pname version; - hash = "sha256-imNW0vorY90lp2OkhYLYwgpyW+Vxd1kdq3Lvd4/iNVA="; + hash = "sha256-c0Gq1ep75WAvTGIj4c7xSy0NjCGK5wrRPYzeYyFHDgU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 8adf6628cc7a..8e7178f285b0 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -12,14 +12,14 @@ }: let - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { name = "frigate-${version}-source"; owner = "blakeblackshear"; repo = "frigate"; tag = "v${version}"; - hash = "sha256-qgiVE5UUjxRLya0mD2vfKdzdTdy5ThYOrHAGoFQ9PWA="; + hash = "sha256-rnsc2VXaypIPVtYQHTGe9lg7PuAyjfjz4aeATmFzp5s="; }; frigate-web = callPackage ./web.nix { @@ -88,7 +88,8 @@ python.pkgs.buildPythonApplication rec { --replace-fail "/usr/local/lib/vec0" "${lib.getLib sqlite-vec}/lib/vec0${stdenv.hostPlatform.extensions.sharedLibrary}" '' - + lib.optionalString (stdenv.hostPlatform == "x86_64-linux") '' + # clang-rocm, provided by `rocmPackages.clr`, only works on x86_64-linux specifically + + lib.optionalString (with stdenv.hostPlatform; isx86_64 && isLinux) '' substituteInPlace frigate/detectors/plugins/rocm.py \ --replace-fail "/opt/rocm/bin/rocminfo" "rocminfo" \ --replace-fail "/opt/rocm/lib" "${rocmPackages.clr}/lib" @@ -207,7 +208,7 @@ python.pkgs.buildPythonApplication rec { }; meta = with lib; { - changelog = "https://github.com/blakeblackshear/frigate/releases/tag/v${version}"; + changelog = "https://github.com/blakeblackshear/frigate/releases/tag/${src.tag}"; description = "NVR with realtime local object detection for IP cameras"; longDescription = '' A complete and local NVR designed for Home Assistant with AI diff --git a/pkgs/by-name/fr/frog-protocols/package.nix b/pkgs/by-name/fr/frog-protocols/package.nix index 0219d0461ff5..908475a3c895 100644 --- a/pkgs/by-name/fr/frog-protocols/package.nix +++ b/pkgs/by-name/fr/frog-protocols/package.nix @@ -3,7 +3,7 @@ lib, meson, ninja, - nix-update-script, + unstableGitUpdater, stdenv, testers, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - updateScript = nix-update-script { }; + updateScript = unstableGitUpdater { }; tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; }; diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix index 2c0927aca9b5..c6e120dafb69 100644 --- a/pkgs/by-name/fr/froide/package.nix +++ b/pkgs/by-name/fr/froide/package.nix @@ -1,11 +1,12 @@ { + stdenv, lib, python3Packages, fetchFromGitHub, makeWrapper, gdal, geos, - pnpm_9, + pnpm, nodejs, postgresql, postgresqlTestHook, @@ -20,20 +21,21 @@ let in python.pkgs.buildPythonApplication rec { pname = "froide"; - version = "0-unstable-2024-11-22"; + version = "0-unstable-2025-04-25"; pyproject = true; src = fetchFromGitHub { owner = "okfde"; repo = "froide"; - rev = "a90f5c4d40b46a161111eefdc84e5214e85715b0"; - hash = "sha256-Q+iNI3yqxqAtDONHY+SaZeMyjY6hqTxwy7YmiiY94+0="; + rev = "9e4838fc5f17a0506af42ad5fd1ebc66cff4b92a"; + hash = "sha256-0EC6oCaiK7gw5ikemskiK3qOlflGHzlG4giDQNj9tBQ="; }; patches = [ ./django_42_storages.patch ]; + # Relax dependency pinning + # Channels: https://github.com/okfde/froide/issues/995 pythonRelaxDeps = [ - "pikepdf" "channels" ]; @@ -42,7 +44,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper nodejs - pnpm_9.configHook + pnpm.configHook ]; dependencies = with python.pkgs; [ @@ -75,6 +77,7 @@ python.pkgs.buildPythonApplication rec { djangorestframework djangorestframework-csv djangorestframework-jsonp + dogtail drf-spectacular drf-spectacular-sidecar easy-thumbnails @@ -99,9 +102,9 @@ python.pkgs.buildPythonApplication rec { websockets ]; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-DMoaXNm5S64XBERHFnFM6IKBkzXRGDEYWSTruccK9Hc="; + hash = "sha256-IeuQoiI/r9AKLZgKkZx0C+qE9ueWuC39Y77MB08zSAc="; }; postBuild = '' @@ -155,14 +158,20 @@ python.pkgs.buildPythonApplication rec { "test_logfile_rotation" ]; - preCheck = '' - export PGUSER="froide" - export postgresqlEnableTCP=1 - export postgresqlTestUserOptions="LOGIN SUPERUSER" - export GDAL_LIBRARY_PATH="${gdal}/lib/libgdal.so" - export GEOS_LIBRARY_PATH="${geos}/lib/libgeos_c.so" - export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}" - ''; + preCheck = + '' + export PGUSER="froide" + export postgresqlEnableTCP=1 + export postgresqlTestUserOptions="LOGIN SUPERUSER" + export GDAL_LIBRARY_PATH="${gdal}/lib/libgdal.so" + export GEOS_LIBRARY_PATH="${geos}/lib/libgeos_c.so" + '' + + lib.optionalString (!stdenv.hostPlatform.isRiscV) '' + export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}" + ''; + + # Playwright tests not supported on RiscV yet + doCheck = lib.meta.availableOn stdenv.hostPlatform playwright-driver.browsers; meta = { description = "Freedom of Information Portal"; diff --git a/pkgs/by-name/fr/fromager/package.nix b/pkgs/by-name/fr/fromager/package.nix new file mode 100644 index 000000000000..76ce0dd60272 --- /dev/null +++ b/pkgs/by-name/fr/fromager/package.nix @@ -0,0 +1,62 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "fromager"; + version = "0.46.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "python-wheel-build"; + repo = "fromager"; + tag = version; + hash = "sha256-SBb5gWV8/t3oRAR2R5T72DW1LKrxXXH6yho9l7agsNI="; + }; + + build-system = with python3.pkgs; [ + setuptools + setuptools-scm + ]; + + dependencies = with python3.pkgs; [ + click + elfdeps + html5lib + packaging + pkginfo + psutil + pydantic + pyproject-hooks + pyyaml + requests + resolvelib + rich + setuptools + stevedore + tomlkit + tqdm + virtualenv + wheel + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + requests-mock + twine + ]; + + pythonImportsCheck = [ + "fromager" + ]; + + meta = { + description = "Wheel maker"; + homepage = "https://pypi.org/project/fromager/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ booxter ]; + mainProgram = "fromager"; + }; +} diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix index 09708fd6130a..748ccb298547 100644 --- a/pkgs/by-name/fr/frp/package.nix +++ b/pkgs/by-name/fr/frp/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "frp"; - version = "0.61.2"; + version = "0.62.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - hash = "sha256-speKU15zsg7jpPP3X6/QovHWtQxzHbVMWz4YLsZhE8A="; + hash = "sha256-es8xngdSLLQ3/S0xdFGW7Pa4BJISo51oWPl1GE+7tBo="; }; - vendorHash = "sha256-ZKhOBD6rLcZtllSQxkpYbHLyb3Ga2teZnGr8jJcETKQ="; + vendorHash = "sha256-koeOCkqYy1TUYXp2I7M+BIjmQEJGXtizOnqJuvzhHJM="; doCheck = false; diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index 8b7376d06b9f..757b8d270877 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/pkgs/by-name/fr/frr/package.nix @@ -119,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: { openssl pam pcre2 + protobufc python3 readline rtrlib diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix index 76030f61394d..8f13d85916fe 100644 --- a/pkgs/by-name/fs/fsautocomplete/package.nix +++ b/pkgs/by-name/fs/fsautocomplete/package.nix @@ -9,13 +9,13 @@ buildDotnetModule (finalAttrs: { pname = "fsautocomplete"; - version = "0.77.5"; + version = "0.77.7"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; tag = "v${finalAttrs.version}"; - hash = "sha256-rPg4GSnxfWWBn3UzQvraH8iL3zOomvompE9Kyuxj5Z0="; + hash = "sha256-eyGWUSAtFT/48QOZ6k7+htLhLjGrc4scgp2VLBu3bcE="; }; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/fs/fscan/package.nix b/pkgs/by-name/fs/fscan/package.nix index 857539e1077f..8de79fdc78b5 100644 --- a/pkgs/by-name/fs/fscan/package.nix +++ b/pkgs/by-name/fs/fscan/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "fscan"; - version = "2.0.0-build4"; + version = "2.0.1"; src = fetchFromGitHub { owner = "shadow1ng"; repo = "fscan"; rev = version; - hash = "sha256-paW48xpxl/d3abDsBCPwbmSZ8yoFhlTU+VPg/Egq0eY="; + hash = "sha256-OFlwL7PXKOPKIW2YCirCGCXRCGIWYMmYHMmSU2he/tw="; }; - vendorHash = "sha256-OyYPN9pq3Hx8utKXj3Hx9kqE90M2XqHkgTT5P9D6BVc="; + vendorHash = "sha256-+m87ReIUOqaTwuh/t0ow4dODG9/G21Gzw6+p/N9QOzU="; meta = with lib; { description = "Intranet comprehensive scanning tool"; diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix index b01e0f8185cc..7262a0bc40e4 100644 --- a/pkgs/by-name/fs/fselect/package.nix +++ b/pkgs/by-name/fs/fselect/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.8.10"; + version = "0.8.12"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-9JSyPNXiBMwPxhVWL5M6o/nnzDJv5MmWYqC1veinZuI="; + sha256 = "sha256-tvc6Ume9VoPsVFH0AdaQejyRG2M3VapG073a3aYDp7o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-cRF/drfdmUccb9Y/RKB3Bs748Y5dJUCgsFJxklAZB9Q="; + cargoHash = "sha256-cLskCSeMLe1aryBVhnAQAVbdKiF0pVFRi9JqcUR1Q6I="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix new file mode 100644 index 000000000000..5d2561fbb7e7 --- /dev/null +++ b/pkgs/by-name/fs/fstar/package.nix @@ -0,0 +1,121 @@ +{ + callPackage, + fetchFromGitHub, + installShellFiles, + lib, + makeWrapper, + nix-update-script, + ocaml-ng, + removeReferencesTo, + util-linux, + which, +}: + +let + # The version of ocaml fstar uses. + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + + fstarZ3 = callPackage ./z3 { }; +in +ocamlPackages.buildDunePackage rec { + pname = "fstar"; + version = "2025.03.25"; + + src = fetchFromGitHub { + owner = "FStarLang"; + repo = "FStar"; + rev = "v${version}"; + hash = "sha256-PhjfThXF6fJlFHtNEURG4igCnM6VegWODypmRvnZPdA="; + }; + + duneVersion = "3"; + + nativeBuildInputs = [ + ocamlPackages.menhir + which + util-linux + installShellFiles + makeWrapper + removeReferencesTo + ]; + + prePatch = '' + patchShebangs .scripts/*.sh + patchShebangs ulib/ml/app/ints/mk_int_file.sh + ''; + + buildInputs = with ocamlPackages; [ + batteries + menhir + menhirLib + pprint + ppx_deriving + ppx_deriving_yojson + ppxlib + process + sedlex + stdint + yojson + zarith + memtrace + mtime + ]; + + preConfigure = '' + mkdir -p cache + export DUNE_CACHE_ROOT="$(pwd)/cache" + export PATH="${lib.makeBinPath [ fstarZ3 ]}''${PATH:+:}$PATH" + export PREFIX="$out" + ''; + + buildPhase = '' + runHook preBuild + make -j$NIX_BUILD_CORES + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + make install + + remove-references-to -t '${ocamlPackages.ocaml}' $out/bin/fstar.exe + + for binary in $out/bin/*; do + wrapProgram "$binary" --prefix PATH : "${lib.makeBinPath [ fstarZ3 ]}" + done + + src="$(pwd)" + cd $out + installShellCompletion --bash $src/.completion/bash/fstar.exe.bash + installShellCompletion --fish $src/.completion/fish/fstar.exe.fish + installShellCompletion --zsh --name _fstar.exe $src/.completion/zsh/__fstar.exe + cd $src + + runHook postInstall + ''; + + enableParallelBuilding = true; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v(\d{4}\.\d{2}\.\d{2})$" + ]; + }; + z3 = fstarZ3; + }; + + meta = with lib; { + description = "ML-like functional programming language aimed at program verification"; + homepage = "https://www.fstar-lang.org"; + changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md"; + license = licenses.asl20; + maintainers = with maintainers; [ + numinit + ]; + mainProgram = "fstar.exe"; + platforms = with platforms; darwin ++ linux; + }; +} diff --git a/pkgs/applications/science/logic/z3/4-8-5-typos.diff b/pkgs/by-name/fs/fstar/z3/4-8-5-typos.diff similarity index 100% rename from pkgs/applications/science/logic/z3/4-8-5-typos.diff rename to pkgs/by-name/fs/fstar/z3/4-8-5-typos.diff diff --git a/pkgs/by-name/fs/fstar/z3/default.nix b/pkgs/by-name/fs/fstar/z3/default.nix new file mode 100644 index 000000000000..b0429deb8d0c --- /dev/null +++ b/pkgs/by-name/fs/fstar/z3/default.nix @@ -0,0 +1,106 @@ +{ + fetchFromGitHub, + fetchpatch, + lib, + replaceVars, + stdenvNoCC, + z3, +}: + +let + # fstar has a pretty hard dependency on certain z3 patch versions. + # https://github.com/FStarLang/FStar/issues/3689#issuecomment-2625073641 + # We need to package all the Z3 versions it prefers here. + fstarNewZ3Version = "4.13.3"; + fstarNewZ3 = + if z3.version == fstarNewZ3Version then + z3 + else + z3.overrideAttrs (final: rec { + version = fstarNewZ3Version; + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = "z3"; + rev = "z3-${version}"; + hash = "sha256-odwalnF00SI+sJGHdIIv4KapFcfVVKiQ22HFhXYtSvA="; + }; + }); + + fstarOldZ3Version = "4.8.5"; + fstarOldZ3 = + if z3.version == fstarOldZ3Version then + z3 + else + z3.overrideAttrs (prev: rec { + version = fstarOldZ3Version; + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = "z3"; + rev = "Z3-${version}"; # caps matter + hash = "sha256-ytG5O9HczbIVJAiIGZfUXC/MuYH7d7yLApaeTRlKXoc="; + }; + patches = + let + static-matrix-patch = fetchpatch { + # clang / gcc fixes. fixes typos in some member names + name = "gcc-15-fixes.patch"; + url = "https://github.com/Z3Prover/z3/commit/2ce89e5f491fa817d02d8fdce8c62798beab258b.patch"; + includes = [ "src/@dir@/lp/static_matrix.h" ]; + stripLen = 3; + extraPrefix = "src/@dir@/"; + hash = "sha256-+H1/VJPyI0yq4M/61ay8SRCa6OaoJ/5i+I3zVTAPUVo="; + }; + + # replace @dir@ in the path of the given list of patches + fixupPatches = dir: map (patch: replaceVars patch { dir = dir; }); + in + prev.patches or [ ] + ++ fixupPatches "util" [ + ./lower-bound-typo.diff + static-matrix-patch + ./tail-matrix.diff + ] + ++ [ + ./4-8-5-typos.diff + ]; + + postPatch = + let + python = lib.findFirst (pkg: lib.hasPrefix "python" pkg.pname) null prev.nativeBuildInputs; + in + + assert python != null; + + prev.postPatch or "" + + + lib.optionalString + ((lib.versionAtLeast python.version "3.12") && (lib.versionOlder version "4.8.14")) + '' + # See https://github.com/Z3Prover/z3/pull/5729. This is a specialization of this patch for 4.8.5. + for file in scripts/mk_util.py src/api/python/CMakeLists.txt; do + substituteInPlace "$file" \ + --replace-fail "distutils.sysconfig.get_python_lib()" "sysconfig.get_path('purelib')" \ + --replace-fail "distutils.sysconfig" "sysconfig" + done + ''; + + }); +in +stdenvNoCC.mkDerivation { + name = "fstar-z3"; + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + ln -s ${lib.getExe fstarNewZ3} $out/bin/z3-${lib.escapeShellArg fstarNewZ3.version} + ln -s ${lib.getExe fstarOldZ3} $out/bin/z3-${lib.escapeShellArg fstarOldZ3.version} + ''; + + passthru = rec { + new = fstarNewZ3; + "z3_${lib.replaceStrings [ "." ] [ "_" ] fstarNewZ3.version}" = new; + + old = fstarOldZ3; + "z3_${lib.replaceStrings [ "." ] [ "_" ] fstarOldZ3.version}" = old; + }; +} diff --git a/pkgs/applications/science/logic/z3/lower-bound-typo.diff b/pkgs/by-name/fs/fstar/z3/lower-bound-typo.diff similarity index 100% rename from pkgs/applications/science/logic/z3/lower-bound-typo.diff rename to pkgs/by-name/fs/fstar/z3/lower-bound-typo.diff diff --git a/pkgs/applications/science/logic/z3/tail-matrix.diff b/pkgs/by-name/fs/fstar/z3/tail-matrix.diff similarity index 100% rename from pkgs/applications/science/logic/z3/tail-matrix.diff rename to pkgs/by-name/fs/fstar/z3/tail-matrix.diff diff --git a/pkgs/by-name/ft/ft2-clone/package.nix b/pkgs/by-name/ft/ft2-clone/package.nix new file mode 100644 index 000000000000..17058192ecdb --- /dev/null +++ b/pkgs/by-name/ft/ft2-clone/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + nixosTests, + alsa-lib, + SDL2, + libiconv, +}: + +stdenv.mkDerivation rec { + pname = "ft2-clone"; + version = "1.95"; + + src = fetchFromGitHub { + owner = "8bitbubsy"; + repo = "ft2-clone"; + rev = "v${version}"; + hash = "sha256-Xb4LHoon56P6OmHvd7RkODrOc4MDa0+U8npypGhcyw4="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = + [ SDL2 ] + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + passthru.tests = { + ft2-clone-starts = nixosTests.ft2-clone; + }; + + meta = with lib; { + description = "Highly accurate clone of the classic Fasttracker II software for MS-DOS"; + homepage = "https://16-bits.org/ft2.php"; + license = licenses.bsd3; + maintainers = with maintainers; [ fgaz ]; + # From HOW-TO-COMPILE.txt: + # > This code is NOT big-endian compatible + platforms = platforms.littleEndian; + mainProgram = "ft2-clone"; + }; +} diff --git a/pkgs/by-name/ft/ftb-app/package.nix b/pkgs/by-name/ft/ftb-app/package.nix new file mode 100644 index 000000000000..f64787188cb4 --- /dev/null +++ b/pkgs/by-name/ft/ftb-app/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchurl, + appimageTools, + nix-update-script, +}: +let + pname = "ftb-app"; + version = "1.27.2"; + + src = + let + src' = + { + aarch64-linux = { + url = "https://piston.feed-the-beast.com/app/ftb-app-linux-${version}-arm64.AppImage"; + hash = "sha256-il7DIY1c5TDmRSzc86BTOCn4P20P3Wd4STkLGyFm2+c="; + }; + x86_64-linux = { + url = "https://piston.feed-the-beast.com/app/ftb-app-linux-${version}-x86_64.AppImage"; + hash = "sha256-35GEI1OBvVkUvHvQAzzGz8ux9h+5W3acH0Wr5VkqyBw="; + }; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + in + fetchurl src'; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Feed the Beast desktop app"; + homepage = "https://www.feed-the-beast.com/ftb-app"; + changelog = "https://www.feed-the-beast.com/ftb-app/changes#${version}"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ nagymathev ]; + mainProgram = "ftb-app"; # This might need a change for darwin + platforms = with lib.platforms; linux; + }; +in +let + appimageContents = appimageTools.extractType2 { inherit pname src version; }; +in +appimageTools.wrapType2 { + inherit + pname + src + version + passthru + meta + ; + + extraInstallCommands = '' + for size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512; do + install -Dm644 ${appimageContents}/usr/share/icons/hicolor/$size/apps/ftb-app.png \ + $out/share/icons/hicolor/$size/apps/ftb-app.png + done + + install -Dm644 ${appimageContents}/ftb-app.desktop \ + $out/share/applications/ftb-app.desktop + substituteInPlace $out/share/applications/ftb-app.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=ftb-app' + ''; +} diff --git a/pkgs/by-name/ft/ftxui/package.nix b/pkgs/by-name/ft/ftxui/package.nix index 40d31ec7d6a0..920f9c6a3afc 100644 --- a/pkgs/by-name/ft/ftxui/package.nix +++ b/pkgs/by-name/ft/ftxui/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ftxui"; - version = "5.0.0"; + version = "6.0.2"; src = fetchFromGitHub { owner = "ArthurSonzogni"; repo = "ftxui"; - rev = "v${version}"; - sha256 = "sha256-IF6G4wwQDksjK8nJxxAnxuCw2z2qvggCmRJ2rbg00+E="; + tag = "v${version}"; + hash = "sha256-VvP1ctFlkTDdrAGRERBxMRpFuM4mVpswR/HO9dzUSUo="; }; strictDeps = true; @@ -34,19 +34,19 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DFTXUI_BUILD_EXAMPLES=OFF" - "-DFTXUI_BUILD_DOCS=ON" - "-DFTXUI_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + (lib.cmakeBool "FTXUI_BUILD_EXAMPLES" false) + (lib.cmakeBool "FTXUI_BUILD_DOCS" true) + (lib.cmakeBool "FTXUI_BUILD_TESTS" doCheck) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - meta = with lib; { + meta = { homepage = "https://github.com/ArthurSonzogni/FTXUI"; changelog = "https://github.com/ArthurSonzogni/FTXUI/blob/v${version}/CHANGELOG.md"; description = "Functional Terminal User Interface library for C++"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/fu/fuc/package.nix b/pkgs/by-name/fu/fuc/package.nix index 8783a634fc47..1473591785a0 100644 --- a/pkgs/by-name/fu/fuc/package.nix +++ b/pkgs/by-name/fu/fuc/package.nix @@ -6,19 +6,19 @@ rustfmt, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "fuc"; - version = "2.2.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "SUPERCILEX"; repo = "fuc"; - rev = version; - hash = "sha256-ZEiMyX85woPOKaMtw8qqrUXUhY8Ewm71I25inUMH1GQ="; + tag = finalAttrs.version; + hash = "sha256-wmCLJUuGL5u0VIIT17VB63xjfyBVy7/f0Qy27MezDN8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hNF/WCLkuUDigDpTIVOrza0JNiRSnZeYJDjLqHlHBnw="; + cargoHash = "sha256-hZEPH0Bx7lCU9xYIFLqBez4y+gIA0+WCqag3ZE6cPM0="; RUSTC_BOOTSTRAP = 1; @@ -33,10 +33,13 @@ rustPlatform.buildRustPackage rec { rustfmt ]; - meta = with lib; { + # error[E0602]: unknown lint: `clippy::unnecessary_debug_formatting` + doCheck = false; + + meta = { description = "Modern, performance focused unix commands"; homepage = "https://github.com/SUPERCILEX/fuc"; - license = licenses.asl20; - maintainers = with maintainers; [ dit7ya ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dit7ya ]; }; -} +}) diff --git a/pkgs/by-name/fu/fujprog/package.nix b/pkgs/by-name/fu/fujprog/package.nix new file mode 100644 index 000000000000..224b671f9ff6 --- /dev/null +++ b/pkgs/by-name/fu/fujprog/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libftdi1, + libusb-compat-0_1, +}: + +stdenv.mkDerivation rec { + pname = "fujprog"; + version = "4.8"; + + src = fetchFromGitHub { + owner = "kost"; + repo = pname; + rev = "v${version}"; + sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libftdi1 + libusb-compat-0_1 + ]; + + meta = with lib; { + description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards"; + mainProgram = "fujprog"; + homepage = "https://github.com/kost/fujprog"; + license = licenses.bsd2; + maintainers = with maintainers; [ trepetti ]; + platforms = platforms.all; + changelog = "https://github.com/kost/fujprog/releases/tag/v${version}"; + }; +} diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix index 2b375496b83e..672679e569d4 100644 --- a/pkgs/by-name/fu/fulcio/package.nix +++ b/pkgs/by-name/fu/fulcio/package.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.6.6"; + version = "1.7.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-CfkHGHxeDUxHWX98FgmA4RNCVlgi9XA9eYkb+G5cZTA="; + hash = "sha256-UVUVT4RvNHvzIwV6azu2h1O9lnNu0PQnnkj4wbrY8BA="; # 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; @@ -33,7 +33,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-qQsaX/xaqD1qb9wH6riohm+NU49cN3EkO012oz9n4tw="; + vendorHash = "sha256-lNPRejC7Z3OHDvhJGzPIlgqi7eXjlqgeECJO/13gGt4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/fu/fum/package.nix b/pkgs/by-name/fu/fum/package.nix index 5e44c8745a31..cc95bfdf5ff2 100644 --- a/pkgs/by-name/fu/fum/package.nix +++ b/pkgs/by-name/fu/fum/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/qxb3/fum"; changelog = "https://github.com/qxb3/fum/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ linuxmobile ]; + maintainers = with lib.maintainers; [ FKouhai ]; platforms = lib.platforms.linux; mainProgram = "fum"; }; diff --git a/pkgs/by-name/fu/func/package.nix b/pkgs/by-name/fu/func/package.nix index 0d6f02a69548..4388fe81487a 100644 --- a/pkgs/by-name/fu/func/package.nix +++ b/pkgs/by-name/fu/func/package.nix @@ -7,25 +7,26 @@ func, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "func"; - version = "1.10.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "knative"; repo = "func"; - rev = "knative-v${version}"; - hash = "sha256-x/SrRkgeLvjcd9LNgMGOf5TLU1GXpjY2Z2MyxrBZckc="; + tag = "knative-v${finalAttrs.version}"; + hash = "sha256-nbS7X5WPu+WBtPUKShE5aWve5m2gw2naQQzNeG7pbGM="; }; - vendorHash = null; + vendorHash = "sha256-Gn+nyck/VOwf8iKPeyLvsPWOpfdN/maUcQOLFAU0oic="; subPackages = [ "cmd/func" ]; ldflags = [ - "-X main.vers=v${version}" + "-X knative.dev/func/pkg/app.vers=v${finalAttrs.version}" "-X main.date=19700101T000000Z" - "-X main.hash=${version}" + "-X knative.dev/func/pkg/app.hash=${finalAttrs.version}" + "-X knative.dev/func/pkg/app.kver=${finalAttrs.src.tag}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -39,15 +40,15 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = func; command = "func version"; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; - meta = with lib; { + meta = { description = "Knative client library and CLI for creating, building, and deploying Knative Functions"; mainProgram = "func"; homepage = "https://github.com/knative/func"; - changelog = "https://github.com/knative/func/releases/tag/knative-v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ maxwell-lt ]; + changelog = "https://github.com/knative/func/releases/tag/knative-v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maxwell-lt ]; }; -} +}) diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix index b406745ceb3c..d371515e3742 100644 --- a/pkgs/by-name/fu/functiontrace-server/package.nix +++ b/pkgs/by-name/fu/functiontrace-server/package.nix @@ -2,25 +2,22 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "functiontrace-server"; - version = "0.5.2"; + version = "0.8.4"; src = fetchCrate { inherit pname version; - hash = "sha256-p6ypMfg99ohQCyPB2O0wXbGmPvD2K9V3EnFDd5dC6js="; + hash = "sha256-i+lXjFXCPT6Skr+r/RKYQm+iJ+WETJ/tAQg5U6qFFi8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sPleuZV7eXlQjKqeHCIlRwu1FzneBh460yAElnxi6Do="; + cargoHash = "sha256-61+hEq0cdJZ+DTgN/ZtK6IKuwLCq3oxk0SrzqWewQXs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Server for FunctionTrace, a graphical Python profiler"; diff --git a/pkgs/by-name/fu/funzzy/package.nix b/pkgs/by-name/fu/funzzy/package.nix index 64b5ae43073b..f3f659bcc5bd 100644 --- a/pkgs/by-name/fu/funzzy/package.nix +++ b/pkgs/by-name/fu/funzzy/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-n9UHyr7W4hrN0+2dsYAYqkP/uzBv74p5XHU0g2MReJY="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - meta = with lib; { description = "Lightweight watcher"; homepage = "https://github.com/cristianoliveira/funzzy"; diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 62d60e8abbcd..f6364c9db281 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -12,13 +12,13 @@ freetype, libsndfile, libX11, + libGL, rtmidi, SDL2, zlib, withJACK ? stdenv.hostPlatform.isUnix, libjack2, withGUI ? true, - darwin, portaudio, alsa-lib, # Enable GL/GLES rendering @@ -29,14 +29,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "furnace"; - version = "0.6.7"; + version = "0.6.8.1"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-G5yjqsep+hDGXCqGNBKoMvV7JOD7ZZTxTPBl9VmG8RM="; + hash = "sha256-R4yQqTPVNx5i9AeY06T0QdNN22ImLvD0bH96r5ojPLo="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' @@ -66,19 +66,17 @@ stdenv.mkDerivation (finalAttrs: { zlib portaudio ] + ++ lib.optionals withGL [ + libGL + ] ++ lib.optionals withJACK [ libjack2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - ] - ); + libX11 + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_GUI" withGUI) diff --git a/pkgs/tools/filesystems/fuse-ext2/darwin-no-installer.patch b/pkgs/by-name/fu/fuse-ext2/darwin-no-installer.patch similarity index 100% rename from pkgs/tools/filesystems/fuse-ext2/darwin-no-installer.patch rename to pkgs/by-name/fu/fuse-ext2/darwin-no-installer.patch diff --git a/pkgs/tools/filesystems/fuse-ext2/default.nix b/pkgs/by-name/fu/fuse-ext2/package.nix similarity index 100% rename from pkgs/tools/filesystems/fuse-ext2/default.nix rename to pkgs/by-name/fu/fuse-ext2/package.nix diff --git a/pkgs/tools/filesystems/fuse-ext2/remove-impure-paths.patch b/pkgs/by-name/fu/fuse-ext2/remove-impure-paths.patch similarity index 100% rename from pkgs/tools/filesystems/fuse-ext2/remove-impure-paths.patch rename to pkgs/by-name/fu/fuse-ext2/remove-impure-paths.patch diff --git a/pkgs/by-name/fu/fuse-overlayfs/package.nix b/pkgs/by-name/fu/fuse-overlayfs/package.nix index dccfb4c24a64..4e85092dbd79 100644 --- a/pkgs/by-name/fu/fuse-overlayfs/package.nix +++ b/pkgs/by-name/fu/fuse-overlayfs/package.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { description = "FUSE implementation for overlayfs"; longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; license = licenses.gpl3; - maintainers = with maintainers; [ ma9e ] ++ teams.podman.members; + maintainers = with maintainers; [ ma9e ]; + teams = [ teams.podman ]; platforms = platforms.linux; inherit (src.meta) homepage; mainProgram = "fuse-overlayfs"; diff --git a/pkgs/by-name/fu/fuzzel/package.nix b/pkgs/by-name/fu/fuzzel/package.nix index beb5d346dbcb..bfe63be3ef39 100644 --- a/pkgs/by-name/fu/fuzzel/package.nix +++ b/pkgs/by-name/fu/fuzzel/package.nix @@ -27,14 +27,14 @@ assert (svgSupport && svgBackend == "nanosvg") -> enableCairo; stdenv.mkDerivation (finalAttrs: { pname = "fuzzel"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fuzzel"; rev = finalAttrs.version; - hash = "sha256-FM5HvPfLVmuKpS3/0m2QM/lSRcWsVpnwtJ++L3Uo5Dc="; + hash = "sha256-42a8VF4EUTbyEKcfVSIbTXmPC55+cLq7FX+lRDZKXEM="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/fv/fvm/package.nix b/pkgs/by-name/fv/fvm/package.nix new file mode 100644 index 000000000000..5657c599d564 --- /dev/null +++ b/pkgs/by-name/fv/fvm/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildDartApplication, + fetchFromGitHub, + nix-update-script, +}: + +buildDartApplication rec { + pname = "fvm"; + version = "3.2.1"; + + src = fetchFromGitHub { + owner = "leoafarias"; + repo = "fvm"; + tag = version; + hash = "sha256-i7sJRBrS5qyW8uGlx+zg+wDxsxgmolTMcikHyOzv3Bs="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple CLI to manage Flutter SDK versions"; + homepage = "https://github.com/leoafarias/fvm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ emaryn ]; + }; +} diff --git a/pkgs/by-name/fv/fvm/pubspec.lock.json b/pkgs/by-name/fv/fvm/pubspec.lock.json new file mode 100644 index 000000000000..41fcb0fb44d3 --- /dev/null +++ b/pkgs/by-name/fv/fvm/pubspec.lock.json @@ -0,0 +1,1083 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "73.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.8.0" + }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.12" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.2" + }, + "build_verify": { + "dependency": "direct dev", + "description": { + "name": "build_verify", + "sha256": "abbb9b9eda076854ac1678d284c053a5ec608e64da741d0801f56d4bbea27e23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "build_version": { + "dependency": "direct dev", + "description": { + "name": "build_version", + "sha256": "4e8eafbf722eac3bd60c8d38f108c04bd69b80100f8792b32be3407725c7fa6a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "charcode": { + "dependency": "transitive", + "description": { + "name": "charcode", + "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_completion": { + "dependency": "direct main", + "description": { + "name": "cli_completion", + "sha256": "158deec74a75cdc69bce061645fea08f94190dd6833f988f517c2dfcb45e9117", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "cli_pkg": { + "dependency": "direct dev", + "description": { + "name": "cli_pkg", + "sha256": "f812467b5d6a5f26ad0fba5dcfc95133df02edbae47dfa4ade3df5d2b5afdcf2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.10.0" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.0" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.2" + }, + "crypto": { + "dependency": "direct dev", + "description": { + "name": "crypto", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "dart_code_metrics_presets": { + "dependency": "direct dev", + "description": { + "name": "dart_code_metrics_presets", + "sha256": "f67df47fe3297617e0cf5d632aa257e17517ad9fdd605e152bdc80dd526f0c5b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.15.0" + }, + "dart_console": { + "dependency": "direct main", + "description": { + "name": "dart_console", + "sha256": "dfa4b63eb4382325ff975fdb6b7a0db8303bb5809ee5cb4516b44153844742ed", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "dart_mappable": { + "dependency": "direct main", + "description": { + "name": "dart_mappable", + "sha256": "47269caf2060533c29b823ff7fa9706502355ffcb61e7f2a374e3a0fb2f2c3f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.2" + }, + "dart_mappable_builder": { + "dependency": "direct dev", + "description": { + "name": "dart_mappable_builder", + "sha256": "ab5cf9086862d3fceb9773e945b5f95cc5471a28c782a4fc451bd400a4e0c64e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.3" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.6" + }, + "date_format": { + "dependency": "direct main", + "description": { + "name": "date_format", + "sha256": "a48254e60bdb7f1d5a15cac7f86e37491808056c0a99dbdc850841def4754ddc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.9" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "git": { + "dependency": "direct main", + "description": { + "name": "git", + "sha256": "daea03e7471607e7ed942bccd4814cfc7e4fa8ca5d3dd6ad4fb170e44423d1a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "grinder": { + "dependency": "direct dev", + "description": { + "name": "grinder", + "sha256": "e1996e485d2b56bb164a8585679758d488fbf567273f51c432c8733fee1f6188", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.5" + }, + "http": { + "dependency": "direct dev", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "interact": { + "dependency": "direct main", + "description": { + "name": "interact", + "sha256": "b1abf79334bec42e58496a054cb7ee7ca74da6181f6a1fb6b134f1aa22bc4080", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "intl": { + "dependency": "transitive", + "description": { + "name": "intl", + "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.18.1" + }, + "io": { + "dependency": "direct main", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "jsonc": { + "dependency": "direct main", + "description": { + "name": "jsonc", + "sha256": "326a3c5c774a77c3c4e327f359e0268bff34135d0c16078beee6d921c49a16ed", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "lints": { + "dependency": "direct dev", + "description": { + "name": "lints", + "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" + }, + "mason_logger": { + "dependency": "direct main", + "description": { + "name": "mason_logger", + "sha256": "1fdf5c76870eb6fc3611ed6fbae1973a3794abe581ea5e22e68af2f73c688b93", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.16" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "native_stack_traces": { + "dependency": "transitive", + "description": { + "name": "native_stack_traces", + "sha256": "64d2f4bcf3b69326fb9bc91b4dd3a06f94bb5bbc3a65e25ae6467ace0b34bfd3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.7" + }, + "node_interop": { + "dependency": "transitive", + "description": { + "name": "node_interop", + "sha256": "3af2420c728173806f4378cf89c53ba9f27f7f67792b898561bff9d390deb98e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "process": { + "dependency": "transitive", + "description": { + "name": "process", + "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pub_updater": { + "dependency": "direct main", + "description": { + "name": "pub_updater", + "sha256": "54e8dc865349059ebe7f163d6acce7c89eb958b8047e6d6e80ce93b13d7c9e60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "pubspec": { + "dependency": "direct main", + "description": { + "name": "pubspec", + "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "retry": { + "dependency": "transitive", + "description": { + "name": "retry", + "sha256": "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "scope": { + "dependency": "direct main", + "description": { + "name": "scope", + "sha256": "0b056e5b64ca16a2db9e1eb35cf7fd05a9e99a6b15140f82bfa651d081e4819b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.0" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "stack_trace": { + "dependency": "direct main", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.8" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.5" + }, + "test_process": { + "dependency": "transitive", + "description": { + "name": "test_process", + "sha256": "217f19b538926e4922bdb2a01410100ec4e3beb4cc48eae5ae6b20037b07bbd6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "tint": { + "dependency": "direct main", + "description": { + "name": "tint", + "sha256": "9652d9a589f4536d5e392cf790263d120474f15da3cf1bee7f1fdb31b4de5f46", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "type_plus": { + "dependency": "transitive", + "description": { + "name": "type_plus", + "sha256": "d5d1019471f0d38b91603adb9b5fd4ce7ab903c879d2fbf1a3f80a630a03fcc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "uri": { + "dependency": "transitive", + "description": { + "name": "uri", + "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.4" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + } + }, + "sdks": { + "dart": ">=3.5.0-259.0.dev <4.0.0" + } +} diff --git a/pkgs/by-name/fv/fvwm2/package.nix b/pkgs/by-name/fv/fvwm2/package.nix index 52b9f2059022..8f541fca0e75 100644 --- a/pkgs/by-name/fv/fvwm2/package.nix +++ b/pkgs/by-name/fv/fvwm2/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fvwmorg"; repo = "fvwm"; - rev = version; + tag = version; hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg="; }; @@ -67,6 +67,10 @@ stdenv.mkDerivation rec { "--disable-htmldoc" ]; + # Fix build on GCC 14 (see https://github.com/fvwmorg/fvwm/pull/100) + # Will never be accepted as an upstream patch as FVWM2 is EOL + env.NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion -Wno-error=incompatible-pointer-types"; + postFixup = '' wrapPythonPrograms ''; diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix index 5bc5eb315ebd..1c362653909f 100644 --- a/pkgs/by-name/fw/fw/package.nix +++ b/pkgs/by-name/fw/fw/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,15 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/fw/fwup/package.nix b/pkgs/by-name/fw/fwup/package.nix new file mode 100644 index 000000000000..08b2e2c6937a --- /dev/null +++ b/pkgs/by-name/fw/fwup/package.nix @@ -0,0 +1,72 @@ +{ + stdenv, + lib, + fetchFromGitHub, + autoreconfHook, + pkg-config, + bzip2, + libarchive, + libconfuse, + libsodium, + xz, + zlib, + coreutils, + dosfstools, + mtools, + unzip, + zip, + which, + xdelta, +}: + +stdenv.mkDerivation rec { + pname = "fwup"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "fhunleth"; + repo = "fwup"; + rev = "v${version}"; + sha256 = "sha256-WYolvHAK7l1HJZuBXsPJ+X6uzWFHBlHELx4zvD/S934="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + bzip2 + libarchive + libconfuse + libsodium + xz + zlib + ]; + + propagatedBuildInputs = + [ + coreutils + unzip + zip + ] + ++ lib.optionals doCheck [ + mtools + dosfstools + ]; + + nativeCheckInputs = [ + which + xdelta + ]; + + doCheck = !stdenv.hostPlatform.isDarwin; + + meta = with lib; { + description = "Configurable embedded Linux firmware update creator and runner"; + homepage = "https://github.com/fhunleth/fwup"; + license = licenses.asl20; + maintainers = [ maintainers.georgewhewell ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index e94c689b31c4..e90970e10460 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -52,6 +52,7 @@ modemmanager, pango, polkit, + readline, sqlite, tpm2-tss, valgrind, @@ -130,7 +131,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.0.7"; + version = "2.0.9"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -148,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; tag = finalAttrs.version; - hash = "sha256-Rus/GaLdoxC1vZskcZeKYE26ys7iBq6szgl2dh1UPsM="; + hash = "sha256-Izh6PHMgUsOeez9uWSLoA2GhvawYQlEZo480vovxn38="; }; patches = [ @@ -237,6 +238,7 @@ stdenv.mkDerivation (finalAttrs: { pango polkit protobufc + readline sqlite tpm2-tss valgrind diff --git a/pkgs/by-name/fx/fx-cast-bridge/bump-nan.patch b/pkgs/by-name/fx/fx-cast-bridge/bump-nan.patch new file mode 100644 index 000000000000..c487fddd754a --- /dev/null +++ b/pkgs/by-name/fx/fx-cast-bridge/bump-nan.patch @@ -0,0 +1,31 @@ +diff --git a/package-lock.json b/package-lock.json +index c856a73..59d3cc5 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -1240,9 +1240,10 @@ + } + }, + "node_modules/nan": { +- "version": "2.15.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", +- "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" ++ "version": "2.22.2", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz", ++ "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==", ++ "license": "MIT" + }, + "node_modules/napi-build-utils": { + "version": "1.0.2", +@@ -3189,9 +3190,9 @@ + "dev": true + }, + "nan": { +- "version": "2.15.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", +- "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" ++ "version": "2.22.2", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz", ++ "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==" + }, + "napi-build-utils": { + "version": "1.0.2", diff --git a/pkgs/by-name/fx/fx-cast-bridge/package.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix index 99e7e80a9431..b5276379abc0 100644 --- a/pkgs/by-name/fx/fx-cast-bridge/package.nix +++ b/pkgs/by-name/fx/fx-cast-bridge/package.nix @@ -3,7 +3,7 @@ buildNpmPackage, fetchFromGitHub, avahi-compat, - nodejs_18, + nodejs_22, python3, stdenv, }: @@ -12,7 +12,7 @@ buildNpmPackage rec { pname = "fx-cast-bridge"; version = "0.3.1"; - nodejs = nodejs_18; + nodejs = nodejs_22; src = fetchFromGitHub { owner = "hensm"; @@ -20,15 +20,23 @@ buildNpmPackage rec { rev = "v${version}"; hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg="; }; + sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-GLrDRZqKcX1PDGREx+MLZ1TEjr88r9nz4TvZ9nvo40g="; + + patches = [ + # to support later versions of nodejs + # generated by running `npm update nan --ignore-scripts` in the ./app dir + ./bump-nan.patch + ]; + + npmDepsHash = "sha256-23EZC9v4ODu3k+O9NDVhOdGJ/FfaiTVWtTrK8liAevk="; nativeBuildInputs = [ python3 ]; buildInputs = [ avahi-compat ]; postPatch = '' substituteInPlace bin/lib/paths.js \ - --replace "../../../" "../../" + --replace-fail "../../../" "../../" ''; dontNpmInstall = true; @@ -38,7 +46,7 @@ buildNpmPackage rec { mkdir -p $out/{bin,lib/mozilla/native-messaging-hosts} substituteInPlace dist/app/fx_cast_bridge.json \ - --replace "$(realpath dist/app/fx_cast_bridge.sh)" "$out/bin/fx_cast_bridge" + --replace-fail "$(realpath dist/app/fx_cast_bridge.sh)" "$out/bin/fx_cast_bridge" mv dist/app/fx_cast_bridge.json $out/lib/mozilla/native-messaging-hosts rm dist/app/fx_cast_bridge.sh diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix index 85130c463ffa..562ea3bd6b89 100644 --- a/pkgs/by-name/fx/fx/package.nix +++ b/pkgs/by-name/fx/fx/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "fx"; - version = "35.0.0"; + version = "36.0.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = pname; rev = version; - hash = "sha256-EirlA/gcW77UP9I4pVCjjG3pSYnCPw+idX9YS1izEpY="; + hash = "sha256-wUiyMczToGqfHZ/FMUhCO4ud6h/bNHhVt4eWoZJckbU="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-h9BUL7b8rNmhVxmXL3CBF39WSkX+8eS2M9NDJhbPI0o="; + vendorHash = "sha256-8KiCj2khO0zxsZDG1YD0EjsoZSY4q+IXC+NLeeXgVj4="; postInstall = '' installShellCompletion --cmd fx \ diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix index 1fdf6bb79b62..4f12cee55bd2 100644 --- a/pkgs/by-name/fy/fyne/package.nix +++ b/pkgs/by-name/fy/fyne/package.nix @@ -11,44 +11,32 @@ libXrandr, libXxf86vm, pkg-config, - stdenv, - darwin, }: buildGoModule rec { pname = "fyne"; - version = "2.5.5"; + version = "2.6.1"; src = fetchFromGitHub { owner = "fyne-io"; repo = "fyne"; tag = "v${version}"; - hash = "sha256-cttw4Al7zn7hlKu8n7by+m2p9Xm7ZoCtMb9VuAFdP6k="; + hash = "sha256-ONtZd+WlgDUS4XwSvIDkCazPsmiTIXdaQua6fnq5NKQ="; }; - vendorHash = "sha256-X6K7IV+yjKXw/1A5HikS0T8rtrn7gLZM2d0VoyIdOT4="; + vendorHash = "sha256-3lXDkiQoq+rDUN8Am9Bd/DJ5CKQqfQucbHKQrkS4wIg="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libGL - libX11 - libXcursor - libXinerama - libXi - libXrandr - libXxf86vm - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Carbon - Cocoa - Kernel - UserNotifications - ] - )); + buildInputs = [ + libGL + libX11 + libXcursor + libXinerama + libXi + libXrandr + libXxf86vm + ]; doCheck = false; diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix index 1494216f03e4..7b1468af3ba1 100644 --- a/pkgs/by-name/fz/fzf-git-sh/package.nix +++ b/pkgs/by-name/fz/fzf-git-sh/package.nix @@ -11,26 +11,28 @@ git, gnugrep, gnused, - tmux, util-linux, xdg-utils, + zsh, + unstableGitUpdater, }: stdenv.mkDerivation rec { pname = "fzf-git-sh"; - version = "0-unstable-2024-03-17"; + version = "0-unstable-2025-05-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf-git.sh"; - rev = "e4cba1fcf8aed9a2348e47b0ba64299122b81709"; - hash = "sha256-glI+TldLGGiXyI5ZghaEgjc+2DJCMdmBnho/Z7IgJoE="; + rev = "3ec3e97d1cc75ec97c0ab923ed5aa567aee01a5e"; + hash = "sha256-hkxbFYCogrIhnAGs3lcqY8Zv51/TAfM6zB9G78UuYSA="; }; dontBuild = true; postPatch = '' sed -i \ + -e "s,\bfzf\b,${fzf}/bin/fzf," \ -e "s,\bawk\b,${gawk}/bin/awk," \ -e "s,\bbash\b,${bash}/bin/bash," \ -e "s,\bbat\b,${bat}/bin/bat," \ @@ -39,12 +41,11 @@ stdenv.mkDerivation rec { -e "s,\bhead\b,${coreutils}/bin/head," \ -e "s,\buniq\b,${coreutils}/bin/uniq," \ -e "s,\bcolumn\b,${util-linux}/bin/column," \ - -e "s,\bfzf-tmux\b,${fzf}/bin/fzf-tmux," \ -e "s,\bgrep\b,${gnugrep}/bin/grep," \ -e "s,\bsed\b,${gnused}/bin/sed," \ - -e "/fzf-tmux/!s,\btmux\b,${tmux}/bin/tmux," \ -e "s,\bxargs\b,${findutils}/bin/xargs," \ -e "s,\bxdg-open\b,${xdg-utils}/bin/xdg-open," \ + -e "s,\bzsh\b,${zsh}/bin/zsh," \ -e "/display-message\|fzf-git-\$o-widget\|\burl=\|\$remote_url =~ /!s,\bgit\b,${git}/bin/git,g" \ -e "s,__fzf_git=.*BASH_SOURCE.*,__fzf_git=$out/share/${pname}/fzf-git.sh," \ -e "/__fzf_git=.*readlink.*/d" \ @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { install -D fzf-git.sh $out/share/${pname}/fzf-git.sh ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { homepage = "https://github.com/junegunn/fzf-git.sh"; description = "Bash and zsh key bindings for Git objects, powered by fzf"; diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 4be376fac6d2..a6c766364dbc 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.56.0"; + version = "0.59.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-OioPl2uJVepMsR1PYHpASj3yQ10bCaGFxI1wQR61EsA="; + hash = "sha256-KH2tcQngc3LVgybdmw/obhbMiLoj3GZVnyWaDXXBJNs="; }; - cargoHash = "sha256-Y1kFbJi+AB4uROieZERafU82RWm2AGQseDUuVzJn3NA="; + cargoHash = "sha256-GCnzqfTBvckWtgXCz0Yd0SHh82bC3bS7uLOAdY37z+s="; useFetchCargoVendor = true; diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 59102aef3dc3..b1604e53c417 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.61.0"; + version = "0.62.0"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "v${version}"; - hash = "sha256-pqHfHWv8PoaMxEP90AbVM2u88D6VE3px+lxJfoZfMgk="; + hash = "sha256-c83aJZYcCR8yqUNp1G4Viu3P8lZGD4gIQAArXdtRkc8="; }; vendorHash = "sha256-WcrJfvY3GZLDuRr2PZR1ooNPJ6FQ4S3RvUc2+zePw5w="; diff --git a/pkgs/by-name/g-/g-ls/package.nix b/pkgs/by-name/g-/g-ls/package.nix new file mode 100644 index 000000000000..bea5ed3e1b43 --- /dev/null +++ b/pkgs/by-name/g-/g-ls/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + installShellFiles, +}: + +buildGoModule rec { + pname = "g-ls"; + version = "0.30.0"; + + src = fetchFromGitHub { + owner = "Equationzhao"; + repo = "g"; + tag = "v${version}"; + hash = "sha256-OaYWorybwUxG452b0vEKwryxmRaNTQ5xDWe9GmEWuGE="; + }; + + vendorHash = "sha256-E/4iB1apLCOEtijCZymObz0Zjlf0+dQC37ALSbl1tr0="; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion \ + --bash completions/bash/g-completion.bash \ + --zsh completions/zsh/_g \ + --fish completions/fish/g.fish + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Powerful ls alternative written in Go"; + homepage = "https://github.com/Equationzhao/g"; + changelog = "https://github.com/Equationzhao/g/releases/tag/${src.tag}"; + license = lib.licenses.mit; + mainProgram = "g"; + maintainers = with lib.maintainers; [ Ruixi-rebirth ]; + }; +} diff --git a/pkgs/by-name/g3/g3proxy/package.nix b/pkgs/by-name/g3/g3proxy/package.nix index f32e62aae86a..b9dcdad4c4e5 100644 --- a/pkgs/by-name/g3/g3proxy/package.nix +++ b/pkgs/by-name/g3/g3proxy/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - stdenv, - darwin, c-ares, python3, lua5_4, @@ -43,14 +41,10 @@ rustPlatform.buildRustPackage rec { cmake ]; - buildInputs = - [ - c-ares - lua5_4 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + c-ares + lua5_4 + ]; meta = { description = "Enterprise-oriented Generic Proxy Solutions"; diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index 42fb06906a68..fed9a69180a8 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -13,20 +13,21 @@ pkg-config, wrapGAppsHook3, - openssl, + glib-networking, libsoup_3, + openssl, webkitgtk_4_1, }: stdenv.mkDerivation (finalAttrs: { pname = "gale"; - version = "1.5.6"; + version = "1.5.12"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-YNTmREWSsXjQ8S2bM9JTsoTdPCmPnmt/svhTOoUFEs4="; + hash = "sha256-5iJ04/q/emPwG0ILurFx2gNlXkZrfP2D6xv25AIlhfc="; }; postPatch = '' @@ -36,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-EFP2Lwqg2bFaSCXXDPIAF6nfeV7/CH3XgI9fzxE+veA="; + hash = "sha256-yaPUNtlb2vMwK42u+3/rViGx6YzhYxRDJylPu++tbNs="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -46,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { src cargoRoot ; - hash = "sha256-AsViBPdXNzQBnN3Vv8ojfdG7fvy5DN3FiQHTzdLmxyQ="; + hash = "sha256-GGH5kQlnYIlKbTAKbF275mH4J9BcbcBHSdzP7RgfDwk="; }; cargoRoot = "src-tauri"; @@ -66,9 +67,10 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + glib-networking # needed to load icons libsoup_3 - webkitgtk_4_1 openssl + webkitgtk_4_1 ]; meta = { diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index cded6b78595c..d0fbd3fd6571 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,7 +8,7 @@ let pname = "gallery-dl"; - version = "1.29.3"; + version = "1.29.6"; in python3Packages.buildPythonApplication { inherit pname version; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { owner = "mikf"; repo = "gallery-dl"; tag = "v${version}"; - hash = "sha256-LzMiJxMl6IWtUloWxBAMLvkhnTQpHkz/gjWl5gW2sZ0="; + hash = "sha256-D/HPAnIwCAfwzBrteGkZSMHFvXDPQLF4bHKDwppdkzc="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ga/gallia/package.nix b/pkgs/by-name/ga/gallia/package.nix index d54a87e02301..ae405bce0130 100644 --- a/pkgs/by-name/ga/gallia/package.nix +++ b/pkgs/by-name/ga/gallia/package.nix @@ -8,41 +8,27 @@ python3.pkgs.buildPythonApplication rec { pname = "gallia"; - version = "1.9.0"; + version = "2.0.0a4"; pyproject = true; src = fetchFromGitHub { owner = "Fraunhofer-AISEC"; repo = "gallia"; tag = "v${version}"; - hash = "sha256-izMTTZrp4aizq5jS51BNtq3lv9Kr+xI7scZfYKXA/oY="; + hash = "sha256-by2zlfVN/FUNU9d5nn4JZ8xzto3k60DITPYhYqwm3Ms="; }; - pythonRelaxDeps = [ - "aiofiles" - "httpx" - "msgspec" - ]; - - build-system = with python3.pkgs; [ poetry-core ]; + build-system = with python3.pkgs; [ hatchling ]; dependencies = with python3.pkgs; [ - aiofiles - aiohttp aiosqlite argcomplete - python-can - exitcode + boltons construct - httpx more-itertools - msgspec platformdirs - psutil pydantic - pygit2 tabulate - tomli zstandard ]; diff --git a/pkgs/by-name/ga/gambit-project/package.nix b/pkgs/by-name/ga/gambit-project/package.nix index 7dedb213faa4..cb3d63379136 100644 --- a/pkgs/by-name/ga/gambit-project/package.nix +++ b/pkgs/by-name/ga/gambit-project/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, wxGTK31, - darwin, withGui ? true, }: @@ -21,9 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withGui wxGTK31; - buildInputs = - lib.optional withGui wxGTK31 - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; + buildInputs = lib.optional withGui wxGTK31; strictDeps = true; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 54b9f6261972..57a6c6ccc575 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -3,6 +3,7 @@ buildPackages, edid-decode, fetchFromGitHub, + fetchpatch, meson, pkg-config, ninja, @@ -48,14 +49,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.16.3"; + version = "3.16.9"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-4Pbyv+EAgwjabVJ4oW3jSmi0Rzpe+BxCN8mM5/beEco="; + hash = "sha256-Dw9EErOINGoOlnNqroKR+fbRfMGL7Q13gP3E5iw4RhU="; }; patches = [ @@ -63,6 +64,19 @@ stdenv.mkDerivation (finalAttrs: { ./shaders-path.patch # patch relative gamescopereaper path with absolute ./gamescopereaper.patch + + # Revert change to always use vendored stb/glm libraries + # Upstream discussion: https://github.com/ValveSoftware/gamescope/pull/1751 + (fetchpatch { + url = "https://github.com/ValveSoftware/gamescope/commit/baae74c4b13676fa76a8b200f21ac78f55079734.patch"; + revert = true; + hash = "sha256-XpbyLQ4R9KgBR3hlrgPzmM7Zxr2jm4Q10zGjyhh/Qxw="; + }) + (fetchpatch { + url = "https://github.com/ValveSoftware/gamescope/commit/72bae179ba2ebbbc91ed07c7f66e7e4964a4cd9e.patch"; + revert = true; + hash = "sha256-aglfGvEuycNyPlaFYxqqvPAgFpWns3xZ3B2GiAefxtg="; + }) ]; # We can't substitute the patch itself because substituteAll is itself a derivation, diff --git a/pkgs/by-name/ga/gamja/package.nix b/pkgs/by-name/ga/gamja/package.nix index 8b8c1b59f0c7..e4eae19f469b 100644 --- a/pkgs/by-name/ga/gamja/package.nix +++ b/pkgs/by-name/ga/gamja/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "gamja"; - version = "1.0.0-beta.10"; + version = "1.0.0-beta.11"; src = fetchFromGitea { domain = "codeberg.org"; owner = "emersion"; repo = "gamja"; rev = "v${version}"; - hash = "sha256-JqnEiPnYRGSeIZm34Guu7MgMfwcySc42aTXweMqL8BQ="; + hash = "sha256-amwJ6PWS0In7ERcvZr5XbJyHedSwJGAUUS2vWIqktNE="; }; - npmDepsHash = "sha256-dAfbluNNBF1e9oagej+SRxO/YffCdLLAUUgt8krnWvg="; + npmDepsHash = "sha256-5YU9H3XHwZADdIvKmS99cAFFg69GPJzD9u0LOuJmKXE="; installPhase = '' runHook preInstall @@ -33,7 +33,7 @@ buildNpmPackage rec { meta = with lib; { description = "Simple IRC web client"; - homepage = "https://git.sr.ht/~emersion/gamja"; + homepage = "https://codeberg.org/emersion/gamja"; license = licenses.agpl3Only; maintainers = with maintainers; [ motiejus diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix index 8ba3484d3409..ba03edd9aad3 100644 --- a/pkgs/by-name/ga/gancio/package.nix +++ b/pkgs/by-name/ga/gancio/package.nix @@ -19,19 +19,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "gancio"; - version = "1.25.1"; + version = "1.26.1"; src = fetchFromGitLab { domain = "framagit.org"; owner = "les"; repo = "gancio"; rev = "v${finalAttrs.version}"; - hash = "sha256-fkX9L7SG3WNmobIxclX7LQUOxBhX70EZSgWMmK9qf5c="; + hash = "sha256-i69sne2kkimAuwYZb0r7LfoVOdl8v4hN0s4PzgELOrk="; }; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-b6eEEwAVjqebBNBR9V2KCPDpoJcs2HAWQJ+eAb6zVIc="; + hash = "sha256-Jvp45pKeqyQN8lb8rzTryOGDTVwnETOw8OEUUnOPjEE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ga/gap/package.nix b/pkgs/by-name/ga/gap/package.nix index 2a7542fab381..e3cef3d777e1 100644 --- a/pkgs/by-name/ga/gap/package.nix +++ b/pkgs/by-name/ga/gap/package.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { # We are also grateful to ChrisJefferson for previous work on the package, # and to ChrisJefferson and fingolfin for help with GAP-related questions # from the upstream point of view. - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.all; # keeping all packages increases the package size considerably, which is # why a local build is preferable in that situation. The timeframe is diff --git a/pkgs/by-name/ga/gapless/package.nix b/pkgs/by-name/ga/gapless/package.nix index eba06f9754cf..9541ab1c910b 100644 --- a/pkgs/by-name/ga/gapless/package.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -16,14 +16,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gapless"; - version = "4.3.1"; + version = "4.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-zLjpYGZR/o76onSjwfpHEx26vd8rUa/1PXL+DuC8C2o="; + hash = "sha256-10AFaUmqVkL4q8xgewfosN2/SziNhat9p6x/+9mBdyU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ga/garble/package.nix b/pkgs/by-name/ga/garble/package.nix index 43a891e9bee1..8de2cd9545bb 100644 --- a/pkgs/by-name/ga/garble/package.nix +++ b/pkgs/by-name/ga/garble/package.nix @@ -57,7 +57,7 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; doInstallCheck = false; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ga/gargoyle/darwin.sh b/pkgs/by-name/ga/gargoyle/darwin.sh deleted file mode 100644 index ed0daec4ef1f..000000000000 --- a/pkgs/by-name/ga/gargoyle/darwin.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!@shell@ - -set -e - -GARGDIST=build/macosx.release -BUNDLE=${out}/Applications/Gargoyle.app/Contents -TERPS=" -advsys/advsys -agility/agility -alan2/alan2 -alan3/alan3 -bocfel/bocfel -frotz/frotz -garglk/gargoyle -geas/geas -git/git -glulxe/glulxe -hugo/hugo -jacl/jacl -level9/level9 -magnetic/magnetic -nitfol/nitfol -scare/scare -scott/scott -tads/tadsr -" - -mkdir -p $BUNDLE/MacOS -mkdir -p $BUNDLE/Frameworks -mkdir -p $BUNDLE/Resources -mkdir -p $BUNDLE/PlugIns - -install_name_tool -id @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/garglk/libgarglk.dylib -for file in $TERPS -do -install_name_tool -change @executable_path/libgarglk.dylib @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/$file || true -cp -f $GARGDIST/$file $BUNDLE/PlugIns -done - -cp -f garglk/launcher.plist $BUNDLE/Info.plist -cp -f $GARGDIST/garglk/gargoyle $BUNDLE/MacOS/Gargoyle -cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/Frameworks -cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/PlugIns -cp -f garglk/launchmac.nib $BUNDLE/Resources/MainMenu.nib -cp -f garglk/garglk.ini $BUNDLE/Resources -cp -f garglk/*.icns $BUNDLE/Resources -cp -f licenses/* $BUNDLE/Resources - -mkdir $BUNDLE/Resources/Fonts -cp fonts/LiberationMono*.ttf $BUNDLE/Resources/Fonts -cp fonts/LinLibertine*.otf $BUNDLE/Resources/Fonts - -mkdir -p ${out}/bin -ln -s $BUNDLE/MacOS/Gargoyle ${out}/bin/gargoyle diff --git a/pkgs/by-name/ga/gargoyle/package.nix b/pkgs/by-name/ga/gargoyle/package.nix index 7fb5dd5eb010..017bd76d7c18 100644 --- a/pkgs/by-name/ga/gargoyle/package.nix +++ b/pkgs/by-name/ga/gargoyle/package.nix @@ -2,104 +2,83 @@ lib, stdenv, fetchFromGitHub, - replaceVarsWith, - jam, - cctools, + fetchDebianPatch, + cmake, pkg-config, - SDL, - SDL_mixer, - SDL_sound, - gtk2, + fluidsynth, + fmt, + freetype, + libjpeg, + libopenmpt, + libpng, + libsndfile, libvorbis, - smpeg, + mpg123, + qt6, }: -let - - jamenv = - '' - unset AR - '' - + ( - if stdenv.hostPlatform.isDarwin then - '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${lib.getDev SDL}/include/SDL" - export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini" - '' - else - '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/libexec/gargoyle" - export DESTDIR="$out" - export _BINDIR=libexec/gargoyle - export _APPDIR=libexec/gargoyle - export _LIBDIR=libexec/gargoyle - export GARGLKINI="$out/etc/garglk.ini" - '' - ); - -in - stdenv.mkDerivation rec { pname = "gargoyle"; - version = "2019.1.1"; + version = "2023.1"; src = fetchFromGitHub { owner = "garglk"; repo = "garglk"; - rev = version; - sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz"; + tag = version; + hash = "sha256-XsN5FXWJb3DSOjipxr/HW9R7QS+7iEaITERTrbGEMwA="; }; + patches = [ + (fetchDebianPatch { + pname = "gargoyle-free"; + version = "2023.1+dfsg"; + debianRevision = "4"; + patch = "ftbfs_gcc14.patch"; + hash = "sha256-eMx/RlUpq5Ez+1L8VZo40Y3h2ZKkqiQEmKTlkZRMXnI="; + }) + ]; + + postPatch = '' + substituteInPlace garglk/garglk.pc.in \ + --replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" \ + --replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "@CMAKE_INSTALL_FULL_INCLUDEDIR@" + ''; + nativeBuildInputs = [ - jam + cmake pkg-config - ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; + qt6.wrapQtAppsHook + ]; buildInputs = [ - SDL - SDL_mixer - SDL_sound - gtk2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - smpeg + fluidsynth + fmt + freetype + libjpeg + libopenmpt + libpng + libsndfile libvorbis + mpg123 + qt6.qtbase + qt6.qtmultimedia + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + qt6.qtwayland ]; - # Workaround build failure on -fno-common toolchains: - # ld: build/linux.release/alan3/Location.o:(.bss+0x0): multiple definition of - # `logFile'; build/linux.release/alan3/act.o:(.bss+0x0): first defined here - # TODO: drop once updated to 2022.1 or later. - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; - - installPhase = - if stdenv.hostPlatform.isDarwin then - (replaceVarsWith { - replacements = { inherit (stdenv) shell; }; - isExecutable = true; - src = ./darwin.sh; - }) - else - jamenv - + '' - jam -j$NIX_BUILD_CORES install - mkdir -p "$out/bin" - ln -s ../libexec/gargoyle/gargoyle "$out/bin" - mkdir -p "$out/etc" - cp garglk/garglk.ini "$out/etc" - mkdir -p "$out/share/applications" - cp garglk/gargoyle.desktop "$out/share/applications" - mkdir -p "$out/share/icons/hicolor/32x32/apps" - cp garglk/gargoyle-house.png "$out/share/icons/hicolor/32x32/apps" - ''; - - enableParallelBuilding = true; + cmakeFlags = [ + (lib.cmakeFeature "INTERFACE" "QT") + (lib.cmakeFeature "SOUND" "QT") + (lib.cmakeBool "WITH_QT6" true) + # fatal error: 'macglk_startup.h' file not found + (lib.cmakeBool "WITH_AGILITY" (!stdenv.hostPlatform.isDarwin)) + (lib.cmakeBool "WITH_LEVEL9" (!stdenv.hostPlatform.isDarwin)) + (lib.cmakeBool "WITH_MAGNETIC" (!stdenv.hostPlatform.isDarwin)) + ]; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; homepage = "http://ccxvii.net/gargoyle/"; license = licenses.gpl2Plus; description = "Interactive fiction interpreter GUI"; diff --git a/pkgs/by-name/ga/garmindb/package.nix b/pkgs/by-name/ga/garmindb/package.nix index c5f19b89e90c..604d56b21fea 100644 --- a/pkgs/by-name/ga/garmindb/package.nix +++ b/pkgs/by-name/ga/garmindb/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "garmindb"; - version = "3.6.3"; + version = "3.6.4"; pyproject = true; src = fetchFromGitHub { owner = "tcgoetz"; repo = "garmindb"; tag = "v${version}"; - hash = "sha256-JAUDAYf9CH/BxwV88ziF5Zy+3ibcbieEfHrZpHSU8m0="; + hash = "sha256-0srcvYBexsrkQw+AVH3LuIB/+VaQ77Kjv6rHVOq2Reo="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json index 46004d44a882..420770cc04a9 100644 --- a/pkgs/by-name/ga/garnet/deps.json +++ b/pkgs/by-name/ga/garnet/deps.json @@ -1,18 +1,23 @@ [ { "pname": "Azure.Core", - "version": "1.41.0", - "hash": "sha256-/ixQr8KFGlZa43gGd2A7aBzwu9h+wLO6OqIMy3YbW+Y=" + "version": "1.44.1", + "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk=" + }, + { + "pname": "Azure.Identity", + "version": "1.13.0", + "hash": "sha256-BXru3jP4oQchrBF/c3WDekZeRJlUxenBwVZ5YsifseI=" }, { "pname": "Azure.Storage.Blobs", - "version": "12.21.2", - "hash": "sha256-DvdMGuophEbvvVtbRU3vsNwla0zTn5dn7HbW0Mr4P/o=" + "version": "12.24.0", + "hash": "sha256-PcI3Jf9VrDfkr0YfoR89us45HE1DE8g5J3ZpZ8vZkLs=" }, { "pname": "Azure.Storage.Common", - "version": "12.20.1", - "hash": "sha256-XBDyzAEt5iwdyB3jgoG5TLyx5NZ/MoiEerBR/7U7F4w=" + "version": "12.23.0", + "hash": "sha256-DAMzFlls76hH5jtXtU89SvbQWhhELaQq+PfG4SK7W+Q=" }, { "pname": "CommandLineParser", @@ -21,13 +26,8 @@ }, { "pname": "KeraLua", - "version": "1.4.1", - "hash": "sha256-ouRL7+0bW/VYUNNYQoXenXzYO0HNF3D1IsScqtah3DE=" - }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "1.1.1", - "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" + "version": "1.4.4", + "hash": "sha256-MF7DBdc8xNiEcauNer7YFRgjbUU4ANmc2uQKrzVDRDs=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -35,129 +35,149 @@ "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" }, { - "pname": "Microsoft.Build.Tasks.Git", - "version": "8.0.0", - "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" + "pname": "Microsoft.Bcl.Memory", + "version": "9.0.0", + "hash": "sha256-ECgyZ53XqJoRcZexQpctEq1nHFXuW4YqFSx7Elsae7U=" }, { "pname": "Microsoft.Extensions.Configuration", - "version": "8.0.0", - "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" + "version": "9.0.3", + "hash": "sha256-p1KEkbl1h3dJkBZQUMK2Jt1vbm/NGIHqLEr7QrLYIbg=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "8.0.0", - "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" + "version": "9.0.3", + "hash": "sha256-OjL0pzW+Wsp0KSrqawYHdtIf8w0XqvY8USEbptgP6dI=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "8.0.0", - "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" + "version": "9.0.3", + "hash": "sha256-KxYOzATIl0qI8MScHL9BYsCB3dvqoNDCrraiquBHMVs=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.0", - "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" + "version": "9.0.3", + "hash": "sha256-/gAk+YbJT1/XjMfPBrEg9wUbljA0g1vFJuE+mFOPwV0=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.0", - "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" + "version": "9.0.3", + "hash": "sha256-90HSc8MgyemdtRTBN7Indq62DRaqI2mjai9iV/pi/o4=" }, { "pname": "Microsoft.Extensions.Logging", - "version": "8.0.0", - "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" + "version": "9.0.3", + "hash": "sha256-w1cKHraJW+i7avhTseoJ+u0parEAJ7r51E2qvsuXZDA=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.0", "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.2", + "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "9.0.3", + "hash": "sha256-f/K3A9NPpCOTGlyha5DJf+OIjfAVWu+dJ4rAqQ+3sso=" + }, { "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "8.0.0", - "hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U=" + "version": "9.0.3", + "hash": "sha256-u9Un3Bc+Cbj2E8u2etU+KPPv3IbCKgCAY/SCAGK6+LE=" }, { "pname": "Microsoft.Extensions.Logging.Console", - "version": "8.0.0", - "hash": "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c=" + "version": "9.0.3", + "hash": "sha256-bDHxUjuO4d63GXbDoD9Hdo8AvAke0/r38hzctAWQUqc=" }, { "pname": "Microsoft.Extensions.Options", - "version": "8.0.0", - "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" + "version": "9.0.3", + "hash": "sha256-h4CLVA1cZdte8hd/bcb5dsi61MhAAScHRZU4LR2W5Z8=" }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "8.0.0", - "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" + "version": "9.0.3", + "hash": "sha256-FjYrMjnkEplPTYoHUVU94zXIuVsjL5AcGHb/zYkh138=" }, { "pname": "Microsoft.Extensions.Primitives", - "version": "8.0.0", - "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" + "version": "9.0.3", + "hash": "sha256-iBwolNt6Lb2OqjDWBVnUj8vZDSID9EQw/JPI1xcuFus=" + }, + { + "pname": "Microsoft.Identity.Client", + "version": "4.65.0", + "hash": "sha256-gkBVLb8acLYexNM4ZzMJ0qfDp2UqjUt0yiu3MfMcWig=" + }, + { + "pname": "Microsoft.Identity.Client.Extensions.Msal", + "version": "4.65.0", + "hash": "sha256-Xmy/evicLvmbC+6ytxwVE646uVcJB5yMpEK73H5tzD0=" }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.0.1", - "hash": "sha256-zPWUKTCfGm4MWcYPU037NzezsFE1g8tEijjQkw5iooI=" + "version": "6.35.0", + "hash": "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q=" + }, + { + "pname": "Microsoft.IdentityModel.Abstractions", + "version": "8.6.1", + "hash": "sha256-RDyVSOYjQFGZsGr2tjwcJHjJV4JJPZ5uZdwE3BbbLB0=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.0.1", - "hash": "sha256-Xv9MUnjb66U3xeR9drOcSX5n2DjOCIJZPMNSKjWHo9Y=" + "version": "8.6.1", + "hash": "sha256-Y3NBDifORZ09vKlIF8J1Ocxe8DrmWV4/DuVJZul4xmM=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.0.1", - "hash": "sha256-FfwrH/2eLT521Kqw+RBIoVfzlTNyYMqlWP3z+T6Wy2Y=" + "version": "8.6.1", + "hash": "sha256-AXGRN3rs+CJlxyxF80FzPe8UDcZqg6jHrj12pyBs+gU=" }, { "pname": "Microsoft.IdentityModel.Protocols", - "version": "8.0.1", - "hash": "sha256-v3DIpG6yfIToZBpHOjtQHRo2BhXGDoE70EVs6kBtrRg=" + "version": "8.6.1", + "hash": "sha256-o+1L4GoUh94XKcUzTS/ECVoPIfVH/i84XN+wSmE75pg=" }, { "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect", - "version": "8.0.1", - "hash": "sha256-ZHKaZxqESk+OU1SFTFGxvZ71zbdgWqv1L6ET9+fdXX0=" + "version": "8.6.1", + "hash": "sha256-H8ZkyYOR37DT09dbCU4khligNgUbIHfnHUiuaD5Kenw=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.0.1", - "hash": "sha256-beVbbVQy874HlXkTKarPTT5/r7XR1NGHA/50ywWp7YA=" + "version": "8.6.1", + "hash": "sha256-rB4Hg9FSlkiXireuZKYdVq9CcqmJa5YeTw+WMlSVnkQ=" }, { "pname": "Microsoft.IdentityModel.Validators", - "version": "8.0.1", - "hash": "sha256-5LTLbFNWz33nco+hyKAEHcQeAWaBugJ0oMKR6AuEI34=" - }, - { - "pname": "Microsoft.SourceLink.Common", - "version": "8.0.0", - "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=" - }, - { - "pname": "Microsoft.SourceLink.GitHub", - "version": "8.0.0", - "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" + "version": "8.6.1", + "hash": "sha256-BDdJNDquVEplPJT3fYOakg26bSNyzNyUce+7mCjtc5o=" }, { "pname": "System.ClientModel", - "version": "1.0.0", - "hash": "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y=" + "version": "1.1.0", + "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "6.0.1", "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "9.0.3", + "hash": "sha256-zgZF8BTksBk5oucX0j0Ju8qNG8oKJbIGio0GM+egT9M=" + }, { "pname": "System.IdentityModel.Tokens.Jwt", - "version": "8.0.1", - "hash": "sha256-hW4f9zWs0afxPbcMqCA/FAGvBZbBFSkugIOurswomHg=" + "version": "8.6.1", + "hash": "sha256-vzwoEHRmUBnmlj77lFUZ/nD2oCEmY2rjwyaaXEZxuaU=" }, { "pname": "System.Interactive.Async", @@ -169,16 +189,31 @@ "version": "6.0.0", "hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE=" }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.3", + "hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68=" + }, { "pname": "System.Linq.Async", "version": "6.0.1", "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI=" }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, { "pname": "System.Memory.Data", "version": "1.0.2", "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0=" }, + { + "pname": "System.Memory.Data", + "version": "6.0.0", + "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" + }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", @@ -189,20 +224,40 @@ "version": "6.0.0", "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "4.5.0", + "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc=" + }, { "pname": "System.Text.Encodings.Web", - "version": "4.7.2", - "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io=" + "version": "6.0.0", + "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.3", + "hash": "sha256-ZGRcKnblIdt1fHZ4AehyyWCgM+/1FcZyxoGJFe4K3JE=" }, { "pname": "System.Text.Json", - "version": "4.7.2", - "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" + "version": "6.0.0", + "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo=" }, { "pname": "System.Text.Json", - "version": "8.0.5", - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" + "version": "6.0.10", + "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" + }, + { + "pname": "System.Text.Json", + "version": "6.0.9", + "hash": "sha256-5jjvxV8ubGYjkydDhLsGZXB6ml3O/7CGauQcu1ikeLs=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.3", + "hash": "sha256-I7z6sRb2XbbXNZ2MyNbn2wysh1P2cnk4v6BM0zucj1w=" }, { "pname": "System.Threading.Tasks.Extensions", diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index ed1a40a268ad..7e480abafd46 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,24 +8,35 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.58"; + version = "1.0.64"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-PP1Dko7/3Yx3evEyTRhHA85m6XztQiUt307LVZsCx64="; + hash = "sha256-0poitBKuCfUtkGWXomQAictt7ts7Qdgq1TvEMSqvdJ4="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnet-sdk = + with dotnetCorePackages; + sdk_9_0 + // { + inherit + (combinePackages [ + sdk_9_0 + sdk_8_0 + ]) + packages + targetPackages + ; + }; dotnetBuildFlags = [ "-f" - "net8.0" + "net9.0" ]; dotnetInstallFlags = dotnetBuildFlags; diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index 1360e24b10cd..c1796663160b 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gat"; - version = "0.21.2"; + version = "0.23.2"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-l5VkcUm1Cy1R0gTOS9Yt4HPILYrnUpjZCM4x78QS2WU="; + hash = "sha256-vJREExCJ+JvPYxNeJWQ6A4LRB2viEisnXrRM6yDGOc4="; }; - vendorHash = "sha256-gePgJZdPuV6VTgyLKTjRohxoIdvBr7/J98FCp9dzjV0="; + vendorHash = "sha256-yGTzDlu9l1Vfnt9Za4Axh7nFWe5CmW2kqssa+51bA3w="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix index 10379d08b15a..e10f0d8710e2 100644 --- a/pkgs/by-name/ga/gate/package.nix +++ b/pkgs/by-name/ga/gate/package.nix @@ -6,7 +6,7 @@ let pname = "gate"; - version = "0.42.0"; + version = "0.49.1"; in buildGoModule { inherit pname version; @@ -15,16 +15,18 @@ buildGoModule { owner = "minekube"; repo = "gate"; tag = "v${version}"; - hash = "sha256-a2rt+V6y8lyBMSG49eWLTPeLZKIjq+a5NBL+agIL1dg="; + hash = "sha256-gDRw/YQtIpYiX3uKjvmttbVkohj2k5f+pvv+xYyY3S8="; }; - vendorHash = "sha256-5s96L9KWeiS//21mQMn8ka82Uk4rMbq/8I+l67HTSA8="; + vendorHash = "sha256-4LJwb4ZXs+CUcxhvRveJy+xu7/UEjxIEwLV5Z5gBbT4="; ldflags = [ "-s" "-w" ]; + excludedPackages = [ ".web" ]; + meta = { description = "High-Performance, Low-Memory, Lightweight, Extensible Minecraft Reverse Proxy"; longDescription = '' diff --git a/pkgs/by-name/ga/gatekeeper/package.nix b/pkgs/by-name/ga/gatekeeper/package.nix index 15988ea3b421..67bb6e36e22a 100644 --- a/pkgs/by-name/ga/gatekeeper/package.nix +++ b/pkgs/by-name/ga/gatekeeper/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.18.2"; + version = "3.19.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; tag = "v${version}"; - hash = "sha256-lO+z/6JRn0iKNoCMiMgYKZ8Jo53udoylleHFRyTF+4w="; + hash = "sha256-zU/OAiWc6H4YC5bnDFrqpfCT1HhDGCm+dkjriP2Wp3w="; }; vendorHash = null; @@ -22,6 +22,10 @@ buildGoModule rec { installShellFiles ]; + ldflags = [ + "-X github.com/open-policy-agent/gatekeeper/v3/pkg/version.Version=${version}" + ]; + subPackages = [ "cmd/gator" ]; postInstall = '' diff --git a/pkgs/by-name/ga/gatk/package.nix b/pkgs/by-name/ga/gatk/package.nix index b130f3c84a39..d66c9c8739dd 100644 --- a/pkgs/by-name/ga/gatk/package.nix +++ b/pkgs/by-name/ga/gatk/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "gatk"; - version = "4.6.1.0"; + version = "4.6.2.0"; src = fetchzip { url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "sha256-jVrFhLgHPIcWFCP3FU+LxR+UE+lVRzE6WZuLfwdL708="; + sha256 = "sha256-I2p7BLh4q0i8qn1fTbzsaKVnCkMrPIxEpBUjOxNxgxI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ga/gaw/package.nix b/pkgs/by-name/ga/gaw/package.nix index d65c354f633f..91a0c4d43b4b 100644 --- a/pkgs/by-name/ga/gaw/package.nix +++ b/pkgs/by-name/ga/gaw/package.nix @@ -1,19 +1,78 @@ { stdenv, - fetchurl, + runCommandLocal, lib, + htmlq, + curl, + cacert, gtk3, pkg-config, }: stdenv.mkDerivation rec { - pname = "gaw"; - version = "20220315"; + pname = "gaw3"; + version = "20250128"; - src = fetchurl { - url = "https://download.tuxfamily.org/gaw/download/gaw3-${version}.tar.gz"; - sha256 = "0j2bqi9444s1mfbr7x9rqp232xf7ab9z7ifsnl305jsklp6qmrbg"; - }; + # https://www.rvq.fr/php/ndl.php?id=gaw.* + # https://www.rvq.fr/php/ndl.php?id=gaw3-20250128.tar.gz + src = + runCommandLocal "gaw3-${version}.tar.gz" + { + BASE = "https://www.rvq.fr/php/ndl.php"; + FNAME = "gaw3-${version}.tar.gz"; + + nativeBuildInputs = [ + htmlq + curl + ]; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "sha256-3uO+209+cmu231iabyYmABmgegyxAxswWDWA/v8WSy0="; + } + '' + # fetch download page + html_form=$( + curl "$BASE?id=$FNAME" | + tr '\n' ' ' | tr -s ' ' | # minimize whitespace + htmlq tr | # select table rows, one per line + grep "$FNAME" | # filter for row of interest + head -n1 | # first match, just in case + htmlq form --base "$BASE" + ) + + declare -a curl_args=() + + # hidden fields + declare -a input_names=() + readarray -td $'\n' input_names < <( + htmlq <<<"$html_form" "input[type=hidden]" -a name + ) + for input_name in "''${input_names[@]}"; do + input_value=$( + htmlq <<<"$html_form" "input[type=hidden][name=''${input_name}]" -a value + ) + echo "$input_name = $input_value" + curl_args+=( --form "$input_name=$input_value" ) + done + + # destination + curl_args+=( + "https://www.rvq.fr/$( htmlq <<<"$html_form" form -a action )" + ) + + # POST and download + (set -x + curl -X POST "''${curl_args[@]}" $NIX_CURL_FLAGS --output "$FNAME" + ) + + # unpack and strip root dir + mkdir unpack/ + tar xvf "$FNAME" --directory=unpack/ + [[ "$(printf "%s\n" unpack/* | wc -l)" -eq 1 ]] + cp -a unpack/* $out + ''; nativeBuildInputs = [ pkg-config ]; @@ -28,7 +87,7 @@ stdenv.mkDerivation rec { input from sound cards. Data can be imported to gaw using files, direct tcp/ip connection or directly from the sound card. ''; - homepage = "http://gaw.tuxfamily.org"; + homepage = "https://www.rvq.fr/linux/gaw.php"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fbeffa ]; platforms = platforms.linux; diff --git a/pkgs/by-name/gb/gbar/package.nix b/pkgs/by-name/gb/gbar/package.nix index 3da832484074..fd334d6a6c61 100644 --- a/pkgs/by-name/gb/gbar/package.nix +++ b/pkgs/by-name/gb/gbar/package.nix @@ -8,7 +8,7 @@ pkg-config, libdbusmenu-gtk3, gtk-layer-shell, - stb, + libsass, wayland-protocols, wayland-scanner, bluez, @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "gbar"; - version = "unstable-2023-09-21"; + version = "unstable-2024-12-17"; src = fetchFromGitHub { owner = "scorpion-26"; repo = "gBar"; - rev = "96485f408efe411f281fa27dceb6d86399ec7804"; - hash = "sha256-4zPvo0JBQOV1qn2X2iI8/JWYEQjFf9sDEICIWSCeaWk="; + rev = "03bedc7471add061fb15e0ca1c9d2f729b8c5d7b"; + hash = "sha256-4OfcG1DcqemLrK5D75S1x25g9K0k2+eEUQUXgYEYBf8="; fetchSubmodules = true; }; @@ -44,7 +44,7 @@ stdenv.mkDerivation { gtk3 gtk-layer-shell libpulseaudio - stb + libsass libdbusmenu-gtk3 ]; diff --git a/pkgs/tools/misc/gbdfed/Makefile.patch b/pkgs/by-name/gb/gbdfed/Makefile.patch similarity index 100% rename from pkgs/tools/misc/gbdfed/Makefile.patch rename to pkgs/by-name/gb/gbdfed/Makefile.patch diff --git a/pkgs/by-name/gb/gbdfed/package.nix b/pkgs/by-name/gb/gbdfed/package.nix new file mode 100644 index 000000000000..71e89cf5b38f --- /dev/null +++ b/pkgs/by-name/gb/gbdfed/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + freetype, + gtk2-x11, +}: + +stdenv.mkDerivation rec { + version = "1.6"; + pname = "gbdfed"; + + src = fetchurl { + url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/gbdfed-${version}.tar.bz2"; + sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + freetype + gtk2-x11 + ]; + + patches = [ ./Makefile.patch ]; + + hardeningDisable = [ "format" ]; + + meta = { + description = "Bitmap Font Editor"; + longDescription = '' + gbdfed lets you interactively create new bitmap font files or modify existing ones. + It allows editing multiple fonts and multiple glyphs, + it allows cut and paste operations between fonts and glyphs and editing font properties. + The editor works natively with BDF fonts. + ''; + homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.linquize ]; + platforms = lib.platforms.all; + mainProgram = "gbdfed"; + }; +} diff --git a/pkgs/by-name/gc/gcab/package.nix b/pkgs/by-name/gc/gcab/package.nix index 552de1b20550..4075bba3616b 100644 --- a/pkgs/by-name/gc/gcab/package.nix +++ b/pkgs/by-name/gc/gcab/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { mainProgram = "gcab"; homepage = "https://gitlab.gnome.org/GNOME/gcab"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix deleted file mode 100644 index 7c7ff8a24b47..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "10.3.1"; - release = "10.3-2021.10"; - - suffix = - { - aarch64-linux = "aarch64-linux"; - x86_64-darwin = "mac"; - x86_64-linux = "x86_64-linux"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${release}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = - { - aarch64-linux = "020j8gkzc0i0b74vz98gvngnwjm5222j1gk5nswfk6587krba1gn"; - x86_64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv"; - x86_64-linux = "18y92vpl22hf74yqdvmpw8adrkl92s4crzzs6avm05md37qb9nwp"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ - prusnak - prtzl - ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix deleted file mode 100644 index 8cbc326a3f48..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, - python39, - libxcrypt-legacy, - runtimeShell, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "11.3.rel1"; - - platform = - { - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; - sha256 = - { - aarch64-linux = "0pmm5r0k5mxd5drbn2s8a7qkm8c4fi8j5y31c70yrp0qs08kqwbc"; - x86_64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; - x86_64-linux = "08b1w1zmj4z80k59zmlc1bf34lg8d7z65fwvp5ir2pb1d1zxh86l"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - python39 - libxcrypt-legacy - ] - } "$f" || true - done - ''; - - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat < $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" - EOF - chmod +x $out/bin/arm-none-eabi-gdb - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix deleted file mode 100644 index 97a122f3034e..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, - python39, - libxcrypt-legacy, - runtimeShell, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "12.3.rel1"; - - platform = - { - aarch64-darwin = "darwin-arm64"; - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; - sha256 = - { - aarch64-darwin = "sha256-Oy7uC99xwbvrPDt0JPv3vZ1cPw9aOkp4FZyeOtIZ570="; - aarch64-linux = "sha256-FMBIfVdT9gcdJOVoiB98fmf4DdgxZd7FFks3MTlK9DE="; - x86_64-darwin = "sha256-5u2L+TD62c4z4SCrkLNpV7H3efzKpt5snKmliYLAQpE="; - x86_64-linux = "sha256-EqKBVkQxjrzOr4S+q7Zl0JJLbnniEEhFLFMxpWMyswk="; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - python39 - libxcrypt-legacy - ] - } "$f" || true - done - ''; - - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat < $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" - EOF - chmod +x $out/bin/arm-none-eabi-gdb - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ - prusnak - prtzl - ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-13/info-fix.patch b/pkgs/by-name/gc/gcc-arm-embedded-13/info-fix.patch new file mode 100644 index 000000000000..5304fcc73002 --- /dev/null +++ b/pkgs/by-name/gc/gcc-arm-embedded-13/info-fix.patch @@ -0,0 +1,12 @@ +--- a/share/info/porting.info ++++ b/share/info/porting.info +@@ -16,9 +16,7 @@ a permission notice identical to this one. + manual into another language, under the above conditions for modified + versions. + START-INFO-DIR-ENTRY +-START-INFO-DIR-ENTRY + * Embed with GNU: (porting-). Embed with GNU +-END-INFO-DIR-ENTRY + END-INFO-DIR-ENTRY + + Copyright (C) 1993, 1994, 1995 Cygnus Support diff --git a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix index 6eac3bc060ca..f955b0ed54a1 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix @@ -3,9 +3,11 @@ stdenv, fetchurl, ncurses5, - python39, libxcrypt-legacy, - runtimeShell, + xz, + zstd, + makeBinaryWrapper, + darwin, }: stdenv.mkDerivation rec { @@ -34,6 +36,17 @@ stdenv.mkDerivation rec { .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; + patches = [ + # fix double entry in share/info/porting.info + # https://github.com/NixOS/nixpkgs/issues/363902 + ./info-fix.patch + ]; + + nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + makeBinaryWrapper + darwin.sigtool + ]; + dontConfigure = true; dontBuild = true; dontPatchELF = true; @@ -42,34 +55,36 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r * $out + # these binaries require ancient Python 3.8 not available in Nixpkgs + rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : ''; - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - python39 - libxcrypt-legacy - ] - } "$f" || true - done - ''; - - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat < $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" - EOF - chmod +x $out/bin/arm-none-eabi-gdb - ''; + preFixup = + lib.optionalString stdenv.isLinux '' + find $out -type f | while read f; do + patchelf "$f" > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${ + lib.makeLibraryPath [ + "$out" + stdenv.cc.cc + ncurses5 + libxcrypt-legacy + ] + } "$f" || true + done + '' + + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + find "$out" -executable -type f | while read executable; do + ( \ + install_name_tool \ + -change "/usr/local/opt/zstd/lib/libzstd.1.dylib" "${lib.getLib zstd}/lib/libzstd.1.dylib" \ + -change "/usr/local/opt/xz/lib/liblzma.5.dylib" "${lib.getLib xz}/lib/liblzma.5.dylib" \ + "$executable" \ + && codesign -f -s - "$executable" \ + ) || true + done + ''; meta = with lib; { description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; diff --git a/pkgs/by-name/gc/gcc-arm-embedded-14/info-fix.patch b/pkgs/by-name/gc/gcc-arm-embedded-14/info-fix.patch new file mode 100644 index 000000000000..5304fcc73002 --- /dev/null +++ b/pkgs/by-name/gc/gcc-arm-embedded-14/info-fix.patch @@ -0,0 +1,12 @@ +--- a/share/info/porting.info ++++ b/share/info/porting.info +@@ -16,9 +16,7 @@ a permission notice identical to this one. + manual into another language, under the above conditions for modified + versions. + START-INFO-DIR-ENTRY +-START-INFO-DIR-ENTRY + * Embed with GNU: (porting-). Embed with GNU +-END-INFO-DIR-ENTRY + END-INFO-DIR-ENTRY + + Copyright (C) 1993, 1994, 1995 Cygnus Support diff --git a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix new file mode 100644 index 000000000000..960225011253 --- /dev/null +++ b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix @@ -0,0 +1,114 @@ +{ + lib, + stdenv, + fetchurl, + ncurses6, + libxcrypt-legacy, + xz, + zstd, + makeBinaryWrapper, + darwin, +}: + +stdenv.mkDerivation rec { + pname = "gcc-arm-embedded"; + version = "14.2.rel1"; + + platform = + { + aarch64-darwin = "darwin-arm64"; + aarch64-linux = "aarch64"; + x86_64-darwin = "darwin-x86_64"; + x86_64-linux = "x86_64"; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; + # hashes obtained from location ${url}.sha256asc + sha256 = + { + aarch64-darwin = "c7c78ffab9bebfce91d99d3c24da6bf4b81c01e16cf551eb2ff9f25b9e0a3818"; + aarch64-linux = "87330bab085dd8749d4ed0ad633674b9dc48b237b61069e3b481abd364d0a684"; + x86_64-darwin = "2d9e717dd4f7751d18936ae1365d25916534105ebcb7583039eff1092b824505"; + x86_64-linux = "62a63b981fe391a9cbad7ef51b17e49aeaa3e7b0d029b36ca1e9c3b2a9b78823"; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + makeBinaryWrapper + darwin.sigtool + ]; + + patches = [ + # fix double entry in share/info/porting.info + # https://github.com/NixOS/nixpkgs/issues/363902 + ./info-fix.patch + ]; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out + cp -r * $out + # these binaries require ancient Python 3.8 not available in Nixpkgs + rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : + ''; + + preFixup = + lib.optionalString stdenv.isLinux '' + find $out -type f | while read f; do + patchelf "$f" > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${ + lib.makeLibraryPath [ + "$out" + stdenv.cc.cc + ncurses6 + libxcrypt-legacy + xz + zstd + ] + } "$f" || true + done + '' + + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + find "$out" -executable -type f | while read executable; do + ( \ + install_name_tool \ + -change "/usr/local/opt/zstd/lib/libzstd.1.dylib" "${lib.getLib zstd}/lib/libzstd.1.dylib" \ + -change "/usr/local/opt/xz/lib/liblzma.5.dylib" "${lib.getLib xz}/lib/liblzma.5.dylib" \ + "$executable" \ + && codesign -f -s - "$executable" \ + ) || true + done + ''; + + meta = with lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; + license = with licenses; [ + bsd2 + gpl2 + gpl3 + lgpl21 + lgpl3 + mit + ]; + maintainers = with maintainers; [ + prusnak + prtzl + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix deleted file mode 100644 index 70e1481e2dd4..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "6.3.1"; - release = "6-2017-q2-update"; - subdir = "6-2017q2"; - - suffix = - { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = - { - x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; - x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix deleted file mode 100644 index 10fdd294649c..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "7.3.1"; - release = "7-2018-q2-update"; - subdir = "7-2018q2"; - - suffix = - { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = - { - x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; - x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix deleted file mode 100644 index ff63cb58bd99..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "8.3.1"; - release = "8-2019-q3-update"; - subdir = "8-2019q3/RC1.1"; - - suffix = - { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = - { - x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; - x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix deleted file mode 100644 index 3dda27e3b853..000000000000 --- a/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses5, -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "9.3.1"; - release = "9-2020-q2-update"; - subdir = "9-2020q2"; - - suffix = - { - aarch64-linux = "aarch64-linux"; - x86_64-darwin = "mac"; - x86_64-linux = "x86_64-linux"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = - { - aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; - x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; - x86_64-linux = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - ] - } "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ - bsd2 - gpl2 - gpl3 - lgpl21 - lgpl3 - mit - ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/gc/gccmakedep/package.nix b/pkgs/by-name/gc/gccmakedep/package.nix new file mode 100644 index 000000000000..daa63e40bfd2 --- /dev/null +++ b/pkgs/by-name/gc/gccmakedep/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchurl, + writeScript, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gccmakedep"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/util/gccmakedep-${finalAttrs.version}.tar.xz"; + hash = "sha256-UIj5h2n7Y8Mm6bnSy3yfSmMKKAHdHaBpcdCCkXbPJbY="; + }; + + passthru.updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/util/ \ + | sort -V | tail -n1)" + + update-source-version ${finalAttrs.pname} "$version" + ''; + + meta = { + description = "Creates dependencies in makefiles using 'gcc -M'"; + homepage = "https://gitlab.freedesktop.org/xorg/util/gccmakedep"; + license = with lib.licenses; [ + # COPYING file suggests looking at the Copyright headers of every file: + # upstream issue: https://gitlab.freedesktop.org/xorg/util/gccmakedep/-/issues/1 + + # 1. build system files Copyright Red Hat + hpndSellVariant + + # 2. gccmakedep.man was written by Colin Watson for Debian somewhen + # earlier than November 2003. While I wasn't able to trace the exact + # source, between 1997 and 2004 the "Debian Social Contract, Version + # 1.0" was in effect, which requires all components of the Debian + # Operating System to be free software, which includes this man page. + # https://www.debian.org/social_contract.1.0 + free + + # 3. gccmakedep.in, originally named gccmdep.cpp was copied from the + # XFree86 project around 2000. While it states to be "Based on + # mdepend.cpp and code supplied by Hongjiu Lu", that doesn't matter + # because it was supposedly completely rewritten by XFree86. + # XFree86 code without any explicit Copyright Statement is under X11. + x11 + + # 4. some files don't have any license info, but they are all trivial + ]; + mainProgram = "gccmakedep"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/gc/gclient2nix/gclient-unpack-hook.sh b/pkgs/by-name/gc/gclient2nix/gclient-unpack-hook.sh new file mode 100644 index 000000000000..6dac91b9e25a --- /dev/null +++ b/pkgs/by-name/gc/gclient2nix/gclient-unpack-hook.sh @@ -0,0 +1,28 @@ +# shellcheck shell=bash + +gclientUnpackHook() { + echo "Executing gclientUnpackHook" + + runHook preUnpack + + if [ -z "${gclientDeps-}" ]; then + echo "gclientDeps missing" + exit 1 + fi + + for dep in $(@jq@ -c "to_entries[]" "$gclientDeps") + do + local name="$(echo "$dep" | @jq@ -r .key)" + echo "copying $name..." + local path="$(echo "$dep" | @jq@ -r .value.path)" + mkdir -p $(dirname "$name") + cp -r "$path/." "$name" + chmod u+w -R "$name" + done + + runHook postUnpack +} + +if [ -z "${dontGclientUnpack-}" ] && [ -z "${unpackPhase-}" ]; then + unpackPhase=(gclientUnpackHook) +fi diff --git a/pkgs/by-name/gc/gclient2nix/gclient2nix.py b/pkgs/by-name/gc/gclient2nix/gclient2nix.py new file mode 100755 index 000000000000..1f0a8081c098 --- /dev/null +++ b/pkgs/by-name/gc/gclient2nix/gclient2nix.py @@ -0,0 +1,234 @@ +#!/usr/bin/env python3 +import base64 +import json +import os +import subprocess +import re +import random +import sys +import tempfile +import logging +import click +import click_log +from typing import Optional +from urllib.request import urlopen +from joblib import Parallel, delayed, Memory +from platformdirs import user_cache_dir + +sys.path.append("@depot_tools_checkout@") +import gclient_eval +import gclient_utils + + +logger = logging.getLogger(__name__) +click_log.basic_config(logger) + +nixpkgs_path = "" + +memory: Memory = Memory(user_cache_dir("gclient2nix"), verbose=0) + +def cache(mem, **mem_kwargs): + def cache_(f): + f.__module__ = "gclient2nix" + f.__qualname__ = f.__name__ + return mem.cache(f, **mem_kwargs) + return cache_ + +@cache(memory) +def get_repo_hash(fetcher: str, args: dict) -> str: + expr = f"(import {nixpkgs_path} {{}}).gclient2nix.fetchers.{fetcher}{{" + for key, val in args.items(): + expr += f'{key}="{val}";' + expr += "}" + cmd = ["nurl", "-H", "--expr", expr] + print(" ".join(cmd), file=sys.stderr) + out = subprocess.check_output(cmd) + return out.decode("utf-8").strip() + + +class Repo: + fetcher: str + args: dict + + def __init__(self) -> None: + self.deps: dict = {} + + def get_deps(self, repo_vars: dict, path: str) -> None: + print( + "evaluating " + json.dumps(self, default=vars, sort_keys=True), + file=sys.stderr, + ) + + deps_file = self.get_file("DEPS") + evaluated = gclient_eval.Parse(deps_file, vars_override=repo_vars, filename="DEPS") + + repo_vars = dict(evaluated.get("vars", {})) | repo_vars + + prefix = f"{path}/" if evaluated.get("use_relative_paths", False) else "" + + self.deps = { + prefix + dep_name: repo_from_dep(dep) + for dep_name, dep in evaluated.get("deps", {}).items() + if ( + gclient_eval.EvaluateCondition(dep["condition"], repo_vars) + if "condition" in dep + else True + ) + and repo_from_dep(dep) != None + } + + for key in evaluated.get("recursedeps", []): + dep_path = prefix + key + if dep_path in self.deps: + self.deps[dep_path].get_deps(repo_vars, dep_path) + + def eval(self) -> None: + self.get_deps( + { + **{ + f"checkout_{platform}": platform == "linux" + for platform in ["ios", "chromeos", "android", "mac", "win", "linux"] + }, + **{ + f"checkout_{arch}": True + for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc"] + }, + }, + "", + ) + + def prefetch(self) -> None: + self.hash = get_repo_hash(self.fetcher, self.args) + + def prefetch_all(self) -> int: + return sum( + [dep.prefetch_all() for [_, dep] in self.deps.items()], + [delayed(self.prefetch)()], + ) + + def flatten_repr(self) -> dict: + return {"fetcher": self.fetcher, "args": {**({"hash": self.hash} if hasattr(self, "hash") else {}), **self.args}} + + def flatten(self, path: str) -> dict: + out = {path: self.flatten_repr()} + for dep_path, dep in self.deps.items(): + out |= dep.flatten(dep_path) + return out + + def get_file(self, filepath: str) -> str: + raise NotImplementedError + + +class GitRepo(Repo): + def __init__(self, url: str, rev: str) -> None: + super().__init__() + self.fetcher = "fetchgit" + self.args = { + "url": url, + "rev" if re.match(r"[0-9a-f]{40}", rev) else "tag": rev, + } + + +class GitHubRepo(Repo): + def __init__(self, owner: str, repo: str, rev: str) -> None: + super().__init__() + self.fetcher = "fetchFromGitHub" + self.args = { + "owner": owner, + "repo": repo, + "rev" if re.match(r"[0-9a-f]{40}", rev) else "tag": rev, + } + + def get_file(self, filepath: str) -> str: + rev_or_tag = self.args['rev'] if 'rev' in self.args else f"refs/tags/{self.args['tag']}" + return ( + urlopen( + f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{rev_or_tag}/{filepath}" + ) + .read() + .decode("utf-8") + ) + + +class GitilesRepo(Repo): + def __init__(self, url: str, rev: str) -> None: + super().__init__() + self.fetcher = "fetchFromGitiles" + self.args = { + "url": url, + "rev" if re.match(r"[0-9a-f]{40}", rev) else "tag": rev, + } + + # Quirk: Chromium source code exceeds the Hydra output limit + # We prefer deleting test data over recompressing the sources into a + # tarball, because the NAR will be compressed after the size check + # anyways, so recompressing is more like bypassing the size limit + # (making it count the compressed instead of uncompressed size) + # rather than complying with it. + if url == "https://chromium.googlesource.com/chromium/src.git": + self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; " + self.args["postFetch"] += "rm -r $out/content/test/data; " + self.args["postFetch"] += "rm -rf $out/courgette/testdata; " + self.args["postFetch"] += "rm -r $out/extensions/test/data; " + self.args["postFetch"] += "rm -r $out/media/test/data; " + + def get_file(self, filepath: str) -> str: + rev_or_tag = self.args['rev'] if 'rev' in self.args else f"refs/tags/{self.args['tag']}" + return base64.b64decode( + urlopen( + f"{self.args['url']}/+/{rev_or_tag}/{filepath}?format=TEXT" + ).read() + ).decode("utf-8") + + + +def repo_from_dep(dep: dict) -> Optional[Repo]: + if "url" in dep: + url, rev = gclient_utils.SplitUrlRevision(dep["url"]) + + search_object = re.search(r"https://github.com/(.+)/(.+?)(\.git)?$", url) + if search_object: + return GitHubRepo(search_object.group(1), search_object.group(2), rev) + + if re.match(r"https://.+\.googlesource.com", url): + return GitilesRepo(url, rev) + + return GitRepo(url, rev) + else: + # Not a git dependency; skip + return None + + +@click.group() +def cli() -> None: + """gclient2nix""" + pass + + +@cli.command("eval", help="Evaluate and print the dependency tree of a gclient project") +@click.argument("url", required=True, type=str) +@click.option("--root", default="src", help="Root path, where the given url is placed", type=str) +def eval(url: str, root: str) -> None: + repo = repo_from_dep({"url": url}) + repo.eval() + print(json.dumps(repo.flatten(root), sort_keys=True, indent=4)) + + +@cli.command("generate", help="Generate a dependencies description for a gclient project") +@click.argument("url", required=True, type=str) +@click.option("--root", default="src", help="Root path, where the given url is placed", type=str) +def generate(url: str, root: str) -> None: + repo = repo_from_dep({"url": url}) + repo.eval() + tasks = repo.prefetch_all() + random.shuffle(tasks) + task_results = { + n[0]: n[1] + for n in Parallel(n_jobs=20, require="sharedmem", return_as="generator")(tasks) + if n != None + } + print(json.dumps(repo.flatten(root), sort_keys=True, indent=4)) + + +if __name__ == "__main__": + cli() diff --git a/pkgs/by-name/gc/gclient2nix/package.nix b/pkgs/by-name/gc/gclient2nix/package.nix new file mode 100644 index 000000000000..7d55d0e234a8 --- /dev/null +++ b/pkgs/by-name/gc/gclient2nix/package.nix @@ -0,0 +1,84 @@ +{ + lib, + python3, + runCommand, + makeWrapper, + fetchgit, + nurl, + writers, + callPackage, + fetchFromGitiles, + fetchFromGitHub, +}: + +let + fetchers = { + inherit fetchgit fetchFromGitiles fetchFromGitHub; + }; + + importGclientDeps = + depsAttrsOrFile: + let + depsAttrs = if lib.isAttrs depsAttrsOrFile then depsAttrsOrFile else lib.importJSON depsAttrsOrFile; + fetchdep = dep: fetchers.${dep.fetcher} dep.args; + fetchedDeps = lib.mapAttrs (_name: fetchdep) depsAttrs; + manifestContents = lib.mapAttrs (_: dep: { + path = dep; + }) fetchedDeps; + manifest = writers.writeJSON "gclient-manifest.json" manifestContents; + in + manifestContents + // { + inherit manifest; + __toString = _: manifest; + }; + + gclientUnpackHook = callPackage ( + { + lib, + makeSetupHook, + jq, + }: + + makeSetupHook { + name = "gclient-unpack-hook"; + substitutions = { + jq = lib.getExe jq; + }; + } ./gclient-unpack-hook.sh + ) { }; + + python = python3.withPackages ( + ps: with ps; [ + joblib + platformdirs + click + click-log + ] + ); + +in + +runCommand "gclient2nix" + { + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python ]; + + # substitutions + depot_tools_checkout = fetchgit { + url = "https://chromium.googlesource.com/chromium/tools/depot_tools"; + rev = "452fe3be37f78fbecefa1b4b0d359531bcd70d0d"; + hash = "sha256-8IiJOm0FLa/u1Vd96tb33Ruj4IUTCeYgBpTk88znhPw="; + }; + + passthru = { + inherit fetchers importGclientDeps gclientUnpackHook; + }; + } + '' + mkdir -p $out/bin + substituteAll ${./gclient2nix.py} $out/bin/gclient2nix + chmod u+x $out/bin/gclient2nix + patchShebangs $out/bin/gclient2nix + wrapProgram $out/bin/gclient2nix --set PATH "${lib.makeBinPath [ nurl ]}" + '' diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix new file mode 100644 index 000000000000..5283408003d8 --- /dev/null +++ b/pkgs/by-name/gd/gdal/package.nix @@ -0,0 +1,329 @@ +{ + lib, + stdenv, + callPackage, + fetchFromGitHub, + + useMinimalFeatures ? false, + useArmadillo ? (!useMinimalFeatures), + useArrow ? (!useMinimalFeatures), + useHDF ? (!useMinimalFeatures), + useJava ? (!useMinimalFeatures), + useLibAvif ? (!useMinimalFeatures), + useLibHEIF ? (!useMinimalFeatures), + useLibJXL ? (!useMinimalFeatures), + useMysql ? (!useMinimalFeatures), + useNetCDF ? (!useMinimalFeatures), + usePoppler ? (!useMinimalFeatures), + usePostgres ? (!useMinimalFeatures), + useTiledb ? + (!useMinimalFeatures) && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64), + + ant, + armadillo, + arrow-cpp, + bison, + brunsli, + c-blosc, + cfitsio, + cmake, + crunch, + cryptopp, + curl, + dav1d, + doxygen, + expat, + geos, + giflib, + graphviz, + gtest, + hdf4, + hdf5-cpp, + jdk, + json_c, + lerc, + libaom, + libavif, + libde265, + libdeflate, + libgeotiff, + libheif, + libhwy, + libiconv, + libjpeg, + libjxl, + libmysqlclient, + libpq, + libpng, + libspatialite, + libtiff, + libwebp, + libxml2, + lz4, + netcdf, + openexr, + openjpeg, + openssl, + pcre2, + pkg-config, + poppler, + proj, + python3, + qhull, + rav1e, + sqlite, + swig, + tiledb, + x265, + xercesc, + xz, + zlib, + zstd, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; + version = "3.11.0"; + + src = fetchFromGitHub { + owner = "OSGeo"; + repo = "gdal"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8HcbA9Cj2i6DuqcJGiwqd6GkqbJP9oLdmA34g7kc/ng="; + }; + + nativeBuildInputs = + [ + bison + cmake + doxygen + graphviz + pkg-config + python3.pkgs.setuptools + python3.pkgs.wrapPython + swig + ] + ++ lib.optionals useJava [ + ant + jdk + ]; + + cmakeFlags = + [ + "-DGDAL_USE_INTERNAL_LIBS=OFF" + "-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include" + "-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql" + "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${ + lib.optionalString (libmysqlclient.pname != "mysql") "mysql/" + }libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" + ] + ++ lib.optionals finalAttrs.doInstallCheck [ + "-DBUILD_TESTING=ON" + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + ] + ++ lib.optionals (!useTiledb) [ + "-DGDAL_USE_TILEDB=OFF" + ] + ++ lib.optionals (!useJava) [ + # This is not strictly needed as the Java bindings wouldn't build anyway if + # ant/jdk were not available. + "-DBUILD_JAVA_BINDINGS=OFF" + ]; + + buildInputs = + let + tileDbDeps = lib.optionals useTiledb [ tiledb ]; + libAvifDeps = lib.optionals useLibAvif [ libavif ]; + libHeifDeps = lib.optionals useLibHEIF [ + libheif + dav1d + libaom + libde265 + rav1e + x265 + ]; + libJxlDeps = lib.optionals useLibJXL [ + libjxl + libhwy + ]; + mysqlDeps = lib.optionals useMysql [ libmysqlclient ]; + postgresDeps = lib.optionals usePostgres [ libpq ]; + popplerDeps = lib.optionals usePoppler [ poppler ]; + arrowDeps = lib.optionals useArrow [ arrow-cpp ]; + hdfDeps = lib.optionals useHDF [ + hdf4 + hdf5-cpp + ]; + netCdfDeps = lib.optionals useNetCDF [ netcdf ]; + armadilloDeps = lib.optionals useArmadillo [ armadillo ]; + + darwinDeps = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) ( + [ + # tests for formats enabled by these packages fail on macos + openexr + xercesc + ] + ++ arrowDeps + ); + in + [ + c-blosc + brunsli + cfitsio + crunch + curl + cryptopp + libdeflate + expat + libgeotiff + geos + giflib + libjpeg + json_c + lerc + xz + libxml2 + lz4 + openjpeg + openssl + pcre2 + libpng + proj + qhull + libspatialite + sqlite + libtiff + gtest + libwebp + zlib + zstd + python3 + python3.pkgs.numpy + ] + ++ tileDbDeps + ++ libAvifDeps + ++ libHeifDeps + ++ libJxlDeps + ++ mysqlDeps + ++ postgresDeps + ++ popplerDeps + ++ arrowDeps + ++ hdfDeps + ++ netCdfDeps + ++ armadilloDeps + ++ darwinDeps + ++ nonDarwinDeps; + + pythonPath = [ python3.pkgs.numpy ]; + postInstall = + '' + wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + '' + + lib.optionalString useJava '' + cd $out/lib + ln -s ./jni/libgdalalljni${stdenv.hostPlatform.extensions.sharedLibrary} + cd - + ''; + + enableParallelBuilding = true; + + doInstallCheck = true; + # preCheck rather than preInstallCheck because this is what pytestCheckHook + # calls (coming from the python world) + preCheck = '' + pushd autotest + + export HOME=$(mktemp -d) + export PYTHONPATH="$out/${python3.sitePackages}:$PYTHONPATH" + export GDAL_DOWNLOAD_TEST_DATA=OFF + # allows to skip tests that fail because of file handle leak + # the issue was not investigated + # https://github.com/OSGeo/gdal/blob/v3.9.0/autotest/gdrivers/bag.py#L54 + export CI=1 + ''; + nativeInstallCheckInputs = with python3.pkgs; [ + pytestCheckHook + pytest-benchmark + pytest-env + filelock + lxml + ]; + pytestFlagsArray = [ + "--benchmark-disable" + ]; + disabledTestPaths = [ + # tests that attempt to make network requests + "gcore/vsis3.py" + "gdrivers/gdalhttp.py" + "gdrivers/wms.py" + ]; + disabledTests = + [ + # tests that attempt to make network requests + "test_jp2openjpeg_45" + # tests that require the full proj dataset which we don't package yet + # https://github.com/OSGeo/gdal/issues/5523 + "test_transformer_dem_overrride_srs" + "test_osr_ct_options_area_of_interest" + # ZIP does not support timestamps before 1980 + "test_sentinel2_zipped" + # tries to call unwrapped executable + "test_SetPROJAuxDbPaths" + # failing for unknown reason + # https://github.com/OSGeo/gdal/pull/10806#issuecomment-2362054085 + "test_ogr_gmlas_billion_laugh" + # Flaky on hydra, collected in https://github.com/NixOS/nixpkgs/pull/327323. + "test_ogr_gmlas_huge_processing_time" + "test_ogr_gpkg_background_rtree_build" + "test_vsiaz_fake_write" + "test_vsioss_6" + # flaky? + "test_tiledb_read_arbitrary_array" + # tests for magic numbers, seem to change with different poppler versions, + # and architectures + "test_pdf_extra_rasters" + ] + ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ + # likely precision-related expecting x87 behaviour + "test_jp2openjpeg_22" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # flaky on macos + "test_rda_download_queue" + # https://github.com/OSGeo/gdal/commit/fa0ac7544af837613e9831d4d2841dd6bf735e1f + "test_ogr_gpkg_arrow_stream_huge_array" + ] + ++ lib.optionals (lib.versionOlder proj.version "8") [ + "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members" + ] + ++ lib.optionals (!usePoppler) [ + "test_pdf_jpx_compression" + ]; + postCheck = '' + popd # autotest + ''; + + passthru.tests = callPackage ./tests.nix { gdal = finalAttrs.finalPackage; }; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + changelog = "https://github.com/OSGeo/gdal/blob/${finalAttrs.src.tag}/NEWS.md"; + description = "Translator library for raster geospatial data formats"; + homepage = "https://www.gdal.org/"; + license = licenses.mit; + maintainers = with maintainers; [ + marcweber + dotlambda + ]; + teams = [ teams.geospatial ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/gdal/tests.nix b/pkgs/by-name/gd/gdal/tests.nix similarity index 100% rename from pkgs/development/libraries/gdal/tests.nix rename to pkgs/by-name/gd/gdal/tests.nix diff --git a/pkgs/by-name/gd/gdbm/package.nix b/pkgs/by-name/gd/gdbm/package.nix index 9a46d37d698d..45707a5a4d4b 100644 --- a/pkgs/by-name/gd/gdbm/package.nix +++ b/pkgs/by-name/gd/gdbm/package.nix @@ -8,13 +8,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdbm"; - version = "1.24"; + version = "1.25"; src = fetchurl { url = "mirror://gnu/gdbm/gdbm-${finalAttrs.version}.tar.gz"; - hash = "sha256-aV6YJ/33Y1E/EzkQvH5s/bkYeUOk/slD5XRJcj0rjb8="; + hash = "sha256-0C2zxZJu2Hf4gXuBzR+S9T73TKjG21Q/u6AnGzTzk+w="; }; + patches = [ + # Remove on next release. + ./upstream-darwin-clock-nanosleep-fix.patch + ./upstream-lockwait-test-fixes.patch + ./upstream-musl-ssize_t-fix.patch + ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; configureFlags = [ (lib.enableFeature true "libgdbm-compat") ]; diff --git a/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch b/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch new file mode 100644 index 000000000000..cbc1045305b7 --- /dev/null +++ b/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch @@ -0,0 +1,26 @@ +From ed0a865345681982ea02c6159c0f3d7702c928a1 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Thu, 27 Mar 2025 20:29:10 +0200 +Subject: Use nanosleep instead of clock_nanosleep + +The latter is not available on macOS +--- + src/lock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lock.c b/src/lock.c +index a43d9c3..cf28478 100644 +--- a/src/lock.c ++++ b/src/lock.c +@@ -291,7 +291,7 @@ _gdbm_lockwait_retry (GDBM_FILE dbf, struct timespec const *ts, + if (timespec_cmp (&ttw, iv) < 0) + break; + timespec_sub (&ttw, iv); +- if (clock_nanosleep (CLOCK_REALTIME, 0, iv, &r)) ++ if (nanosleep (iv, &r)) + { + if (errno == EINTR) + timespec_add (&ttw, &r); +-- +cgit v1.2.3 + diff --git a/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch b/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch new file mode 100644 index 000000000000..1bf42fde28fb --- /dev/null +++ b/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch @@ -0,0 +1,192 @@ +From 5be83b4c5da7c6a68817908b19f8925af09e9b2c Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Thu, 10 Apr 2025 17:31:56 +0300 +Subject: Fix timeout calculation in lockwait signal test. + +* tests/t_lockwait.c (runtest_signal): mark start time right +after setting alarm, not before it. +--- + tests/t_lockwait.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c +index a5e74c8..3547af7 100644 +--- a/tests/t_lockwait.c ++++ b/tests/t_lockwait.c +@@ -323,9 +323,6 @@ runtest_signal (struct timespec *ts) + struct sigaction act; + struct timeval now; + +- gettimeofday (&now, NULL); +- start = tv_to_ms (&now); +- + if (pipe (sig_fd)) + { + perror ("pipe"); +@@ -341,6 +338,8 @@ runtest_signal (struct timespec *ts) + return -1; + } + alarm (ts_to_ms (&ts[1]) / MILLI); ++ gettimeofday (&now, NULL); ++ start = tv_to_ms (&now); + } + + op.lock_wait = GDBM_LOCKWAIT_SIGNAL; +-- +cgit v1.2.3 + +From 6f165a8e1745dbd9b88f6fb6882dff7997cfdf74 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Thu, 10 Apr 2025 21:07:41 +0300 +Subject: More fixes to lockwait test + +* tests/t_lockwait.c (sighan): Close fd. +(runtest_signal): compensate for alarm(2) second precision +--- + tests/t_lockwait.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c +index 3547af7..b378819 100644 +--- a/tests/t_lockwait.c ++++ b/tests/t_lockwait.c +@@ -170,6 +170,7 @@ static void + sighan (int sig) + { + write (sig_fd[1], &sig, sizeof (sig)); ++ close (sig_fd[1]); + } + + static int runtest_retry (struct timespec *ts); +@@ -364,7 +365,8 @@ runtest_signal (struct timespec *ts) + + pfd.fd = sig_fd[0]; + pfd.events = POLLIN; +- switch (poll (&pfd, 1, ts_to_ms (&ts[1]) - tv_to_ms (&now) + start)) { ++ switch (poll (&pfd, 1, ++ ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI)) { + case 1: + break; + +-- +cgit v1.2.3 + +From aa9baca52ad155ae501ba586ff7b08f4b08e5434 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Fri, 11 Apr 2025 07:53:58 +0300 +Subject: Adjust timeouts for setitimer interface in lockwait test. + +* tests/t_lockwait.c: Setitimer (at least on some systems) restarts +the timer set by alarm(2). To calculate the ETA of SIGALRM, call +alarm after gdbm_open_ext returns. +--- + tests/t_lockwait.c | 66 ++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 39 insertions(+), 27 deletions(-) + +diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c +index b378819..dfae838 100644 +--- a/tests/t_lockwait.c ++++ b/tests/t_lockwait.c +@@ -322,7 +322,6 @@ runtest_signal (struct timespec *ts) + if (!(ts[1].tv_sec == 0 && ts[1].tv_nsec == 0)) + { + struct sigaction act; +- struct timeval now; + + if (pipe (sig_fd)) + { +@@ -338,9 +337,6 @@ runtest_signal (struct timespec *ts) + fprintf (stderr, "%s: sigaction: %s", progname, strerror (errno)); + return -1; + } +- alarm (ts_to_ms (&ts[1]) / MILLI); +- gettimeofday (&now, NULL); +- start = tv_to_ms (&now); + } + + op.lock_wait = GDBM_LOCKWAIT_SIGNAL; +@@ -354,42 +350,58 @@ runtest_signal (struct timespec *ts) + } + gdbm_close (dbf); + +- if (start > 0) ++ if (!(ts[1].tv_sec == 0 && ts[1].tv_nsec == 0)) + { + struct pollfd pfd; + struct timeval now; +- int sig; ++ int n, t, sig; + +- restart: ++ alarm (ts_to_ms (&ts[1]) / MILLI); + gettimeofday (&now, NULL); ++ start = tv_to_ms (&now); + + pfd.fd = sig_fd[0]; + pfd.events = POLLIN; +- switch (poll (&pfd, 1, +- ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI)) { +- case 1: +- break; + +- case 0: +- fprintf (stderr, "%s: failed waiting for alarm\n", progname); +- return 1; +- +- default: +- if (errno == EINTR) goto restart; +- fprintf (stderr, "%s: poll: %s\n", progname, strerror (errno)); +- return 1; +- } +- +- if (read (sig_fd[0], &sig, sizeof (sig)) != sizeof (sig)) ++ do + { +- fprintf (stderr, "%s: read: %s\n", progname, strerror (errno)); +- return 1; ++ gettimeofday (&now, NULL); ++ t = ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI; ++ if (t < 0) ++ { ++ n = 0; ++ break; ++ } + } +- close (sig_fd[0]); +- if (sig != SIGALRM) ++ while ((n = poll (&pfd, 1, t)) == -1 && errno == EINTR); ++ ++ switch (n) + { +- fprintf (stderr, "%s: unexpected data read\n", progname); ++ case 1: ++ if (read (sig_fd[0], &sig, sizeof (sig)) != sizeof (sig)) ++ { ++ fprintf (stderr, "%s: read: %s\n", progname, strerror (errno)); ++ return 1; ++ } ++ close (sig_fd[0]); ++ if (sig != SIGALRM) ++ { ++ fprintf (stderr, "%s: unexpected data read\n", progname); ++ return 1; ++ } ++ break; ++ ++ case 0: ++ fprintf (stderr, "%s: failed waiting for alarm\n", progname); + return 1; ++ ++ default: ++ if (errno != EINTR) ++ { ++ fprintf (stderr, "%s: poll: %s\n", ++ progname, strerror (errno)); ++ return 1; ++ } + } + } + +-- +cgit v1.2.3 + diff --git a/pkgs/by-name/gd/gdbm/upstream-musl-ssize_t-fix.patch b/pkgs/by-name/gd/gdbm/upstream-musl-ssize_t-fix.patch new file mode 100644 index 000000000000..79f5b3b16eef --- /dev/null +++ b/pkgs/by-name/gd/gdbm/upstream-musl-ssize_t-fix.patch @@ -0,0 +1,25 @@ +From 39ef0347f78ef691c9ad815360198f577043ce4c Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Mon, 24 Mar 2025 07:56:00 +0200 +Subject: Add missing include + +* tools/gdbmapp.h: Include sys/types.h +--- + tools/gdbmapp.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/gdbmapp.h b/tools/gdbmapp.h +index 3ea826b..e20253a 100644 +--- a/tools/gdbmapp.h ++++ b/tools/gdbmapp.h +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include "gettext.h" + #ifdef HAVE_LOCALE_H + # include +-- +cgit v1.1 + diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix new file mode 100644 index 000000000000..9415ee4d4d37 --- /dev/null +++ b/pkgs/by-name/gd/gdevelop/darwin.nix @@ -0,0 +1,33 @@ +{ + stdenvNoCC, + fetchurl, + unzip, + + pname, + version, + meta, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + inherit pname version meta; + + src = fetchurl { + url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip"; + hash = "sha256-0FT4JHGJKy6UapuV2tXKzWm0Esr6DPqu38PllUbUtrY="; + }; + + sourceRoot = "."; + nativeBuildInputs = [ unzip ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -r "GDevelop 5.app" $out/Applications/ + runHook postInstall + ''; + +}) diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix new file mode 100644 index 000000000000..fcc51b141110 --- /dev/null +++ b/pkgs/by-name/gd/gdevelop/linux.nix @@ -0,0 +1,41 @@ +{ + stdenv, + fetchurl, + appimageTools, + + version, + pname, + meta, +}: +let + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; + hash = "sha256-KV6gzPiu/45ibdzMG707vd10F6qLcm+afwJWa6WlywU="; + } + else + throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; + appimageContents = appimageTools.extractType2 { + inherit pname version src; + postExtract = '' + substituteInPlace $out/gdevelop.desktop --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=gdevelop' + ''; + }; +in +appimageTools.wrapType2 { + inherit + pname + version + src + meta + ; + + extraInstallCommands = '' + mkdir -p $out/share/applications + cp ${appimageContents}/gdevelop.desktop $out/share/applications + mkdir -p $out/share/icons + cp -r ${appimageContents}/usr/share/icons/hicolor $out/share/icons + ''; + +} diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix index 2fae7140e3ba..c8f07e752541 100644 --- a/pkgs/by-name/gd/gdevelop/package.nix +++ b/pkgs/by-name/gd/gdevelop/package.nix @@ -1,47 +1,39 @@ { lib, stdenv, - fetchurl, - appimageTools, + callPackage, + ... }: let - version = "5.5.228"; + version = "5.5.229"; pname = "gdevelop"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; - sha256 = "sha256-f6WCyCcMg+QhpFy9Xu4ac7pZ0aLwEe1GVJfsiVOLW0g="; - } - else - throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; - appimageContents = appimageTools.extractType2 { - inherit pname version src; - postExtract = '' - substituteInPlace $out/gdevelop.desktop --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=gdevelop' - ''; - }; - dontPatchELF = true; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - mkdir -p $out/share/applications - cp ${appimageContents}/gdevelop.desktop $out/share/applications - mkdir -p $out/share/icons - cp -r ${appimageContents}/usr/share/icons/hicolor $out/share/icons - ''; - meta = { description = "Graphical Game Development Studio"; homepage = "https://gdevelop.io/"; downloadPage = "https://github.com/4ian/GDevelop/releases"; license = lib.licenses.mit; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ tombert ]; + maintainers = with lib.maintainers; [ + tombert + matteopacini + ]; mainProgram = "gdevelop"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; }; -} +in +if stdenv.hostPlatform.isDarwin then + callPackage ./darwin.nix { + inherit + pname + version + meta + ; + } +else + callPackage ./linux.nix { + inherit + pname + version + meta + ; + } diff --git a/pkgs/by-name/gd/gdl/package.nix b/pkgs/by-name/gd/gdl/package.nix index 8107fec39bdb..7303307baa49 100644 --- a/pkgs/by-name/gd/gdl/package.nix +++ b/pkgs/by-name/gd/gdl/package.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { sha256 = "NkHU/WadHhgYrv88+f+3iH/Fw2eFC3jCjHdeukq2pVU="; }; + env = lib.optionalAttrs stdenv.cc.isGNU { + # https://gitlab.gnome.org/Archive/gdl/-/issues/9 + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + nativeBuildInputs = [ pkg-config intltool @@ -36,7 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gnome docking library"; homepage = "https://developer.gnome.org/gdl/"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gd/gdlauncher-carbon/package.nix b/pkgs/by-name/gd/gdlauncher-carbon/package.nix index 2bf6074c25fb..800a799b40fc 100644 --- a/pkgs/by-name/gd/gdlauncher-carbon/package.nix +++ b/pkgs/by-name/gd/gdlauncher-carbon/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdlauncher-carbon"; - version = "2.0.22"; + version = "2.0.24"; src = appimageTools.extract { inherit (finalAttrs) pname version; src = fetchurl { url = "https://cdn-raw.gdl.gg/launcher/GDLauncher__${finalAttrs.version}__linux__x64.AppImage"; - hash = "sha256-b1d39cSuVJ17rx8vjlYlyIUvqkBbhCWXuq4Z96K1I3M="; + hash = "sha256-d5ZvWSLA/7mY0540TDLMW9qmEFA5xC6Zd83IWakOmGo="; }; }; diff --git a/pkgs/by-name/gd/gdlv/package.nix b/pkgs/by-name/gd/gdlv/package.nix index 87858f7a6752..2aeace32b8fe 100644 --- a/pkgs/by-name/gd/gdlv/package.nix +++ b/pkgs/by-name/gd/gdlv/package.nix @@ -1,12 +1,7 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, - AppKit, - CoreGraphics, - Foundation, - Metal, }: buildGoModule rec { pname = "gdlv"; @@ -22,13 +17,6 @@ buildGoModule rec { vendorHash = null; subPackages = "."; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreGraphics - Foundation - Metal - ]; - meta = with lib; { description = "GUI frontend for Delve"; mainProgram = "gdlv"; diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 9dc9e6d439a1..99967c83fd4d 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "47.0"; + version = "48.0"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz"; - hash = "sha256-xYWDJr+8yKzlgTUuK+RGItwOnlwoAchpD9Lu1QJgf4Q="; + hash = "sha256-G8Btr/CT7HteN+y0+S5do0dKGxugdu25FR7pZ9HDCt8="; }; mesonFlags = [ @@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/gdm"; changelog = "https://gitlab.gnome.org/GNOME/gdm/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/gd/gdrive3/package.nix b/pkgs/by-name/gd/gdrive3/package.nix index 07dd3f449d13..dee540bec883 100644 --- a/pkgs/by-name/gd/gdrive3/package.nix +++ b/pkgs/by-name/gd/gdrive3/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-ZIswHJBV1uwrnSm5BmQgb8tVD1XQMTQXQ5DWvBj1WDk="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Google Drive CLI Client"; homepage = "https://github.com/glotlabs/gdrive"; diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix index c2ce7289690b..d06e2b8e39f3 100644 --- a/pkgs/by-name/ge/geant4/package.nix +++ b/pkgs/by-name/ge/geant4/package.nix @@ -38,12 +38,12 @@ let in stdenv.mkDerivation rec { - version = "11.3.0"; + version = "11.3.2"; pname = "geant4"; src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - hash = "sha256-HaQxiz+W+H9NR1WKMtqyabjz/JVnCAOMKOcqGAsO+6Y="; + hash = "sha256-iSrt10JSYqUKw9PHEX2BwMDaS0CMaIDbr1R4uTAeSIw="; }; # Fix broken paths in a .pc @@ -141,7 +141,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Toolkit for the simulation of the passage of particles through matter"; longDescription = '' Geant4 is a toolkit for the simulation of the passage of particles through matter. diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix index 427c2cc28e13..87be17d1c964 100644 --- a/pkgs/by-name/ge/gearlever/package.nix +++ b/pkgs/by-name/ge/gearlever/package.nix @@ -11,24 +11,26 @@ desktop-file-utils, libadwaita, file, - p7zip, + _7zz, which, appimage-run, gtk4, bintools, libnotify, + dwarfs, + squashfsTools, }: python3Packages.buildPythonApplication rec { pname = "gearlever"; - version = "3.0.2"; + version = "3.2.4"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "mijorus"; repo = "gearlever"; tag = version; - hash = "sha256-b5CH7qJKsXwARCIv4EiwGcc3nH/GKGkb8gwxPWYAr4s="; + hash = "sha256-i7Yqe89b9kAR+ygHL2dlYvdPizBZG6MRMlPFvbHsIdQ="; }; postPatch = @@ -76,13 +78,15 @@ python3Packages.buildPythonApplication rec { "--prefix PATH : ${ lib.makeBinPath [ file - p7zip + _7zz # 7zz which appimage-run desktop-file-utils # update-desktop-database gtk4.dev # gtk4-launch bintools # readelf libnotify # notify-send + dwarfs # dwarfsextract, dwarfsck + squashfsTools # unsquashfs ] }" ]; diff --git a/pkgs/by-name/ge/geary/package.nix b/pkgs/by-name/ge/geary/package.nix index 719519e77931..1ee4d48bb8d8 100644 --- a/pkgs/by-name/ge/geary/package.nix +++ b/pkgs/by-name/ge/geary/package.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/geary"; changelog = "https://gitlab.gnome.org/GNOME/geary/-/blob/${version}/NEWS?ref_type=tags"; description = "Mail client for GNOME 3"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/ge/geckodriver/package.nix b/pkgs/by-name/ge/geckodriver/package.nix new file mode 100644 index 000000000000..216def2f4ff0 --- /dev/null +++ b/pkgs/by-name/ge/geckodriver/package.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + libiconv, +}: + +rustPlatform.buildRustPackage rec { + version = "0.36.0"; + pname = "geckodriver"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "geckodriver"; + tag = "v${version}"; + sha256 = "sha256-rqJ6+QKfEhdHGZBT9yEWtsBlETxz4XeEZXisXf7RdIE="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-wFRZhQzFBwwNfiszwr7XK3e8tfqqFG6DIe7viWvB5vg="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + meta = with lib; { + description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; + homepage = "https://github.com/mozilla/geckodriver"; + license = licenses.mpl20; + maintainers = with maintainers; [ jraygauthier ]; + mainProgram = "geckodriver"; + }; +} diff --git a/pkgs/by-name/ge/gedit/package.nix b/pkgs/by-name/ge/gedit/package.nix index 0a18a3c39c04..d76cfd91456a 100644 --- a/pkgs/by-name/ge/gedit/package.nix +++ b/pkgs/by-name/ge/gedit/package.nix @@ -3,8 +3,7 @@ lib, meson, mesonEmulatorHook, - fetchurl, - python3, + fetchFromGitLab, pkg-config, gtk3, gtk-mac-integration, @@ -20,7 +19,7 @@ gobject-introspection, docbook-xsl-nons, ninja, - gnome, + gitUpdater, gspell, itstool, desktop-file-utils, @@ -29,16 +28,21 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "48.1"; + version = "48.2"; outputs = [ "out" "devdoc" ]; - src = fetchurl { - url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - hash = "sha256-lx56wmvAo6Pe0np1Y3ckFWh9sOWgkrRUflsQpVhYswo="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; + repo = "gedit"; + tag = version; + fetchSubmodules = true; + hash = "sha256-M8ZyjY4wSogEjhEx9sOKfuGkbiypDmZoU0H4ja+TgaY="; }; patches = [ @@ -55,7 +59,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook3 gtk-doc @@ -81,19 +84,10 @@ stdenv.mkDerivation rec { gtk-mac-integration ]; - postPatch = '' - chmod +x build-aux/meson/post_install.py - patchShebangs build-aux/meson/post_install.py - ''; - # Reliably fails to generate gedit-file-browser-enum-types.h in time enableParallelBuilding = false; - passthru = { - updateScript = gnome.updateScript { - packageName = "gedit"; - }; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://gitlab.gnome.org/World/gedit/gedit"; diff --git a/pkgs/by-name/ge/gel/package.nix b/pkgs/by-name/ge/gel/package.nix index f82431586d1d..4c21df0fc6cf 100644 --- a/pkgs/by-name/ge/gel/package.nix +++ b/pkgs/by-name/ge/gel/package.nix @@ -16,19 +16,19 @@ }: rustPlatform.buildRustPackage rec { pname = "gel"; - version = "7.0.3"; + version = "7.3.0"; src = fetchFromGitHub { owner = "geldata"; repo = "gel-cli"; tag = "v${version}"; - hash = "sha256-QP4LtLgF2OWCsPCFzpLR8k/RetfEevSd8Uv/PciHCwk="; + hash = "sha256-tMbAU6tlyDcAzUQ8FK0Q0V+LgzHAazETtFuC050hObw="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-s8UKYZs4GorM0qvAvE+HL+Qma2x05IDtuqYebMDrZHk="; + hash = "sha256-IWGOh8VbE0rCIRtiAqGlFExd1u80HWyoluquWVRaQoo="; }; nativeBuildInputs = [ @@ -60,11 +60,6 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; }; - # cli warns when edgedb found but gel doesn't - postInstall = '' - mv $out/bin/edgedb $out/bin/gel - ''; - doCheck = false; passthru.tests.version = testers.testVersion { diff --git a/pkgs/by-name/ge/geminicommit/package.nix b/pkgs/by-name/ge/geminicommit/package.nix new file mode 100644 index 000000000000..eb7cb257a58b --- /dev/null +++ b/pkgs/by-name/ge/geminicommit/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + stdenv, +}: + +buildGoModule (finalAttrs: { + pname = "geminicommit"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "tfkhdyt"; + repo = "geminicommit"; + tag = "v${finalAttrs.version}"; + hash = "sha256-G28vwH9i4eqr4vxidRYLgdFL6y5VztpvrI2UK+6aS8M="; + }; + + vendorHash = "sha256-+eKJLXgKuUHelUjD8MpMa+cRP+clmYK+1olcb/jmabk="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = + let + cmd = finalAttrs.meta.mainProgram; + in + lib.optionalString (with stdenv; buildPlatform.canExecute hostPlatform) '' + # `geminicommit` requires write permissions to $HOME for its `config.toml` + # ... which is automatically initiated on startup + export HOME=$(mktemp -d) + + for shell in bash zsh fish; do + installShellCompletion \ + --cmd "${cmd}" \ + --"$shell" <($out/bin/"${cmd}" completion "$shell") + done + ''; + + meta = { + description = "CLI that generates git commit messages with Google Gemini AI"; + homepage = "https://github.com/tfkhdyt/geminicommit"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ bryango ]; + mainProgram = "geminicommit"; + }; +}) diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix index e9cd35bda6d7..3ab6d09b978c 100644 --- a/pkgs/by-name/ge/gemmi/package.nix +++ b/pkgs/by-name/ge/gemmi/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gemmi"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "project-gemmi"; repo = "gemmi"; tag = "v${finalAttrs.version}"; - hash = "sha256-XOu//yY5CnnzjvGu7IIC5GvecYsnZQV3Y2wvGVTwWzU="; + hash = "sha256-1msV/gW6BH90rHm6t7xm0hYqbG/yGBt65GVTbKuwdtg="; }; nativeBuildInputs = @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { addBinToPathHook versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Numerical precision error diff --git a/pkgs/by-name/ge/gemrb/package.nix b/pkgs/by-name/ge/gemrb/package.nix index 69d139328916..aa000df15212 100644 --- a/pkgs/by-name/ge/gemrb/package.nix +++ b/pkgs/by-name/ge/gemrb/package.nix @@ -15,6 +15,7 @@ libpng, libvlc, libvorbis, + libX11, openal, python3, zlib, @@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { libpng libvlc libvorbis + libX11 openal python3 zlib diff --git a/pkgs/by-name/ge/gen-license/package.nix b/pkgs/by-name/ge/gen-license/package.nix index d55dda6ebc21..2a2d292e17fc 100644 --- a/pkgs/by-name/ge/gen-license/package.nix +++ b/pkgs/by-name/ge/gen-license/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-xXzUobB8RMyJOC4lKayE+6SKC7NW1dNWGUUH3i1TaW0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Create licenses for your projects right from your terminal"; mainProgram = "gen-license"; diff --git a/pkgs/by-name/ge/gensio/package.nix b/pkgs/by-name/ge/gensio/package.nix new file mode 100644 index 000000000000..e22de3e9956b --- /dev/null +++ b/pkgs/by-name/ge/gensio/package.nix @@ -0,0 +1,48 @@ +{ + autoreconfHook, + fetchFromGitHub, + lib, + nix-update-script, + openssl, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "gensio"; + version = "2.8.14"; + + src = fetchFromGitHub { + owner = "cminyard"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vxa1r0vloiqMrGhXriIbBfJC6wmm54YWg0nCnB8MDG0="; + }; + + passthru = { + updateScript = nix-update-script { }; + }; + + configureFlags = [ + "--with-python=no" + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; + + meta = with lib; { + description = "General Stream I/O"; + homepage = "https://sourceforge.net/projects/ser2net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ + emantor + sarcasticadmin + ]; + mainProgram = "gensiot"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/ge/geoclock/package.nix b/pkgs/by-name/ge/geoclock/package.nix new file mode 100644 index 000000000000..d8718f34a680 --- /dev/null +++ b/pkgs/by-name/ge/geoclock/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchCrate, + rustPlatform, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "geoclock"; + version = "1.0.0"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + src = fetchCrate { + inherit (finalAttrs) pname version; + hash = "sha256-s23e9shdEnCnyr/LI0MioTW3vkoDZPIwWwJhyFUO7o4="; + }; + + cargoHash = "sha256-7mApZj3Ksy8Av0W+0+UZQCkH281bSBd4xo8/7JowmHs="; + cargoDepsName = finalAttrs.pname; + + meta = { + description = "Displays time as calculated by your longitude"; + homepage = "https://github.com/FGRCL/geoclock"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.fgrcl ]; + }; +}) diff --git a/pkgs/by-name/ge/geocode-glib/package.nix b/pkgs/by-name/ge/geocode-glib/package.nix deleted file mode 100644 index 9461c9fcb412..000000000000 --- a/pkgs/by-name/ge/geocode-glib/package.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - meson, - mesonEmulatorHook, - ninja, - pkg-config, - gettext, - gtk-doc, - docbook-xsl-nons, - gobject-introspection, - gnome, - libsoup_2_4, - json-glib, - glib, - nixosTests, -}: - -stdenv.mkDerivation rec { - pname = "geocode-glib"; - version = "3.26.4"; - - outputs = [ - "out" - "dev" - "devdoc" - "installedTests" - ]; - - src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz"; - sha256 = "LZpoJtFYRwRJoXOHEiFZbaD4Pr3P+YuQxwSQiQVqN6o="; - }; - - patches = [ - ./installed-tests-path.patch - ]; - - nativeBuildInputs = - [ - meson - ninja - pkg-config - gettext - gtk-doc - docbook-xsl-nons - gobject-introspection - ] - ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - libsoup_2_4 - json-glib - ]; - - mesonFlags = [ - "-Dsoup2=${lib.boolToString (lib.versionOlder libsoup_2_4.version "2.99")}" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; - tests = { - installed-tests = nixosTests.installed-tests.geocode-glib; - }; - }; - - meta = with lib; { - description = "Convenience library for the geocoding and reverse geocoding using Nominatim service"; - license = licenses.lgpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/by-name/ge/geocode-glib/installed-tests-path.patch b/pkgs/by-name/ge/geocode-glib_2/installed-tests-path.patch similarity index 100% rename from pkgs/by-name/ge/geocode-glib/installed-tests-path.patch rename to pkgs/by-name/ge/geocode-glib_2/installed-tests-path.patch diff --git a/pkgs/by-name/ge/geocode-glib_2/package.nix b/pkgs/by-name/ge/geocode-glib_2/package.nix new file mode 100644 index 000000000000..31fc68259b27 --- /dev/null +++ b/pkgs/by-name/ge/geocode-glib_2/package.nix @@ -0,0 +1,83 @@ +{ + stdenv, + lib, + fetchurl, + meson, + mesonEmulatorHook, + ninja, + pkg-config, + gettext, + gtk-doc, + docbook-xsl-nons, + gobject-introspection, + gnome, + libsoup_3, + json-glib, + glib, + nixosTests, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "geocode-glib"; + version = "3.26.4"; + + outputs = [ + "out" + "dev" + "devdoc" + "installedTests" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor finalAttrs.version}/geocode-glib-${finalAttrs.version}.tar.xz"; + sha256 = "LZpoJtFYRwRJoXOHEiFZbaD4Pr3P+YuQxwSQiQVqN6o="; + }; + + patches = [ + ./installed-tests-path.patch + ]; + + nativeBuildInputs = + [ + meson + ninja + pkg-config + gettext + gtk-doc + docbook-xsl-nons + gobject-introspection + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + buildInputs = [ + glib + libsoup_3 + json-glib + ]; + + mesonFlags = [ + "-Dsoup2=false" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "geocode-glib_2"; + packageName = "geocode-glib"; + }; + tests = { + installed-tests = nixosTests.installed-tests.geocode-glib; + }; + }; + + meta = { + changelog = "https://gitlab.gnome.org/GNOME/geocode-glib/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + description = "Convenience library for the geocoding and reverse geocoding using Nominatim service"; + homepage = "https://gitlab.gnome.org/GNOME/geocode-glib"; + license = lib.licenses.lgpl2Plus; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ge/geoipupdate/package.nix b/pkgs/by-name/ge/geoipupdate/package.nix index 45a37d824c21..bb7f6d485d11 100644 --- a/pkgs/by-name/ge/geoipupdate/package.nix +++ b/pkgs/by-name/ge/geoipupdate/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { description = "Automatic GeoIP database updater"; homepage = "https://github.com/maxmind/geoipupdate"; license = with licenses; [ asl20 ]; - maintainers = teams.helsinki-systems.members; + teams = [ teams.helsinki-systems ]; mainProgram = "geoipupdate"; }; } diff --git a/pkgs/by-name/ge/geolite-legacy/package.nix b/pkgs/by-name/ge/geolite-legacy/package.nix index 6cbf620388d9..eb12e7e498d7 100644 --- a/pkgs/by-name/ge/geolite-legacy/package.nix +++ b/pkgs/by-name/ge/geolite-legacy/package.nix @@ -3,23 +3,26 @@ stdenv, fetchzip, zstd, + writeShellApplication, + common-updater-scripts, + pcre2, }: stdenv.mkDerivation rec { pname = "geolite-legacy"; - version = "20240720"; + version = "20250129"; # We use Arch Linux package as a snapshot, because upstream database is updated in-place. geoip = fetchzip { url = "https://archive.archlinux.org/packages/g/geoip-database/geoip-database-${version}-1-any.pkg.tar.zst"; - hash = "sha256-9rPp1Lu6Q4+Cb4N4e/ezHacpLuUwbGQefEPuSrH8O6o="; + hash = "sha256-/aT/ndml7a3P9/1CM3KhB4/L+F0CDHpHj/NnKWOv2G0="; nativeBuildInputs = [ zstd ]; stripRoot = false; }; extra = fetchzip { url = "https://archive.archlinux.org/packages/g/geoip-database-extra/geoip-database-extra-${version}-1-any.pkg.tar.zst"; - hash = "sha256-sb06yszstKalc+b9rSuStRuY3YRebAL1Q4jEJkbGiMI="; + hash = "sha256-qFJKeLEWag5Wvzye5heDs79ai0pkJndmZgS8Ip5T3G4="; nativeBuildInputs = [ zstd ]; stripRoot = false; }; @@ -30,6 +33,28 @@ stdenv.mkDerivation rec { cp ${extra}/usr/share/GeoIP/*.dat $out/share/GeoIP ''; + passthru = { + updateScript = lib.getExe (writeShellApplication { + name = "update-geolite-legacy"; + runtimeInputs = [ + common-updater-scripts + pcre2 + ]; + text = '' + url=https://archive.archlinux.org/packages/g/geoip-database/ + + version=$(list-directory-versions --pname geoip-database --url $url | + pcre2grep -o1 '^(\d{8})-1-any\.pkg\.tar\.zst$' | + sort -n | + tail -1) + + for key in geoip extra; do + update-source-version "$UPDATE_NIX_ATTR_PATH" "$version" --source-key=$key --ignore-same-version + done + ''; + }); + }; + meta = { description = "GeoLite Legacy IP geolocation databases"; homepage = "https://mailfud.org/geoip-legacy/"; diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix index 96754b9aa427..067380923801 100644 --- a/pkgs/by-name/ge/geoserver/extensions.nix +++ b/pkgs/by-name/ge/geoserver/extensions.nix @@ -42,325 +42,325 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.26.2"; # app-schema - hash = "sha256-pFjKgEuAFiEN6FJkooKqMHzkbZnQWchzzLFPsA9TDH4="; # app-schema + version = "2.27.0"; # app-schema + hash = "sha256-S7WtIbmn9RF0mmTRiOH5zFsjZ6y0mvVu0H8jKCdTPHM="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.26.2"; # authkey - hash = "sha256-u1/dbTHZPIImVq46YGWpdsO60wg6jWmc4ttAzasKpcU="; # authkey + version = "2.27.0"; # authkey + hash = "sha256-GwA/f5wMf701TEs04Dgx/zcEA/jBHgw0JuJMKqTuRTU="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.26.2"; # cas - hash = "sha256-KagmWS+VNsC1wtasa9UwNZsaUzmbZKG/SPBq91pW4R8="; # cas + version = "2.27.0"; # cas + hash = "sha256-poD8OBeR7txtM1nJDy5MV6GVREVonLvx3TUY3a1V2Mc="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.26.2"; # charts - hash = "sha256-TDv+7JFe5N8HtxjNOFYcfdJ9kdCLBKigdvqzb9p3dow="; # charts + version = "2.27.0"; # charts + hash = "sha256-8FoaN9EoFZ56YPev//IphMjce1iJQnMbP6xCdVSwMiU="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.26.2"; # control-flow - hash = "sha256-QQowtOOUKJCm1C7VkDHWbIscCal3PsxFMTfi5JUZqi8="; # control-flow + version = "2.27.0"; # control-flow + hash = "sha256-DyZp/dcRm/xuvxv49qvepcDJPyHGiG4wMbEzKNhNcH0="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.26.2"; # css - hash = "sha256-MgAwSWpSVrGJYRxGt1gCiLXj8uXQ8hvCkfI+yGtZU34="; # css + version = "2.27.0"; # css + hash = "sha256-PKRgGbDlTjrFkhrDpbjDjAl+Q/gjWXFw9C0QpKB8+Ro="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.26.2"; # csw - hash = "sha256-i3ObMkSOnCGihZm8CcMj90jG3B8pYRTX9Yd4uuholKY="; # csw + version = "2.27.0"; # csw + hash = "sha256-sddOghBd8OVjKmaF3PqM/G+RkpsUk6vmCZv7uQJTJnU="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.26.2"; # csw-iso - hash = "sha256-zEVkldjEsI+sBbMDvvL2b6DciwwUacsufXgvIDfLYX4="; # csw-iso + version = "2.27.0"; # csw-iso + hash = "sha256-WVKVoQWIusgpAZUWPybBBIMbtWB56uNix3T50hy0x5w="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.26.2"; # db2 - hash = "sha256-g9J/KZ3ET2HSs1fhVFW8cRe409vfZddBaXoXOgVZrcE="; # db2 + version = "2.27.0"; # db2 + hash = "sha256-jlyRGOGBFJ0+sArKXqchITlS6swE/v4ScdxPKWANFaE="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.26.2"; # dxf - hash = "sha256-Ninuw1npfy3lND0O8Tu87hv/gXPQFC3vU8H1oE8aLdc="; # dxf + version = "2.27.0"; # dxf + hash = "sha256-hdn5X7T5/H7Ti0UK3MdG0TFGInwu7S7Z4VghcWx+hdQ="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.26.2"; # excel - hash = "sha256-Lqkbr6KTtiKUmW5A3Uqem0C81oNnLd6eVzm/MwvnYjg="; # excel + version = "2.27.0"; # excel + hash = "sha256-EH1TZeYPk+sb9+7ZfjbaEsNgQJ+/57XCc2+CvELsY88="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.26.2"; # feature-pregeneralized - hash = "sha256-T6NiDBOIpqQKEAm58558seSpHSA84w9K1C9l2Xy/sWQ="; # feature-pregeneralized + version = "2.27.0"; # feature-pregeneralized + hash = "sha256-0389xo0NjTREGQLMrqJesl/XrFOrjFjjFBL7GSUMl/Y="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.26.2"; # gdal + version = "2.27.0"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-OgkoB2VY4x+6kfDDbOMKUzyd6/Q1m9YMC6sZU17qRsE="; # gdal + hash = "sha256-oTSEk+AmgXydSF4TZD9m5ViyeWh5HpAprMZAPMdP2LI="; # gdal }; # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. #geofence = mkGeoserverExtension { # name = "geofence"; - # version = "2.26.2"; # geofence - # hash = "sha256-gXJYk64qO78hQhEmmJU98mrSYIKK/DlRPptdS6rFDD0="; # geofence + # version = "2.27.0"; # geofence + # hash = "sha256-P7ZHvC4qv1meziqPmBfOgQ+Y06Ico0N1trUi9LMZUJQ="; # geofence #}; #geofence-server = mkGeoserverExtension { # name = "geofence-server"; - # version = "2.26.2"; # geofence-server - # hash = "sha256-tyxIjQNmATtLy1X9dmaLugsbMyg7+2+NMx8a5jvVvDU="; # geofence-server + # version = "2.27.0"; # geofence-server + # hash = ""; # geofence-server #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.26.2"; # geofence-wps - # hash = "sha256-ZU5E5SsYBpOvguYhHXLrm5IJzYtSggcF+iqB76LB05g="; # geofence-wps + # version = "2.27.0"; # geofence-wps + # hash = "sha256-8Wvb/elunsYTFD1GgEQunM8i0eDyOA/W52KZ9+7uvvk="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.26.2"; # geopkg-output - hash = "sha256-XzzT6g5G26/NZzdCl4wqtQUbNfMGrc5/lI/HRN+x8BU="; # geopkg-output + version = "2.27.0"; # geopkg-output + hash = "sha256-VUqBTt0XfSY2Q8cfeCpVmr398PK+Sb74APSrBODJNlw="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.26.2"; # grib - hash = "sha256-9onvPoSFOLODqedOLW3Bf0IJLE3UtuMSF8l4dGysMDs="; # grib + version = "2.27.0"; # grib + hash = "sha256-xX9LAgo5exeD2UxZ8/LROZWobLHLw33jcpwERGUGPys="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.26.2"; # gwc-s3 - hash = "sha256-3z7DfkY/NP9ESfZWI+/ubHwHmBJM0SYyJGNVz7oAuVc="; # gwc-s3 + version = "2.27.0"; # gwc-s3 + hash = "sha256-/koF00Rki1xiY/g4ahhvFZNQxGnvIbbnqNmYHBqArBI="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.26.2"; # h2 - hash = "sha256-7wsbxACFtmtL1ApQy1DT2yYzOF51nfi7CWYlUGfYoKY="; # h2 + version = "2.27.0"; # h2 + hash = "sha256-lfWu3812AMv0bB2dllNlcOSyN+IMASI/nkjLaStvUtw="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.26.2"; # iau - hash = "sha256-j8Z5q0w6iqC++KScWoRTMOf4o7ADPN7IfPccc8A4A1M="; # iau + version = "2.27.0"; # iau + hash = "sha256-9PhWejZILq1hcWBdvWh9SdtfLOlpFcaIU9TeJ8z7UUw="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.26.2"; # importer - hash = "sha256-4BObAg/3BuP8UH4yodClBJsSlTE4S2tyPtqDHqOGRYg="; # importer + version = "2.27.0"; # importer + hash = "sha256-oqlNcUkO7XlcI6QQF+44kt69ZWtPSdcpyuA5xGtVrAQ="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.26.2"; # inspire - hash = "sha256-NZ5oMXpakPfdJZg8J9Y3D/8j09H0P9CQgnpeObrGkNE="; # inspire + version = "2.27.0"; # inspire + hash = "sha256-irSJm3gDJAiDHczkS84OW+noOIryCOmSwiIU4GAKqoQ="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.26.2"; # jp2k - # hash = "sha256-W+nx7PeEksyjA2iuN75qvWqDSdSnF0eNHAPqwce3amA="; # jp2k + # version = "2.27.0"; # jp2k + # hash = "sha256-WKWtNKv1sQrdrraCj9jmEODtIhCVF25HFbQNROdlyxg="; # jp2k #}; libjpeg-turbo = mkGeoserverExtension { name = "libjpeg-turbo"; - version = "2.26.2"; # libjpeg-turbo - hash = "sha256-EYZQOQ1rAqTbRHh7cewkvJT4l1cmyFxNUwEFW2/8ezQ="; # libjpeg-turbo + version = "2.27.0"; # libjpeg-turbo + hash = "sha256-tMov4w8Kfbrr7hkNK4o+XFUuenyidCem7Z36KXinfTE="; # libjpeg-turbo buildInputs = [ libjpeg.out ]; }; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.26.2"; # mapml - hash = "sha256-RHTPzy0f3DP6ye94Slw/Tz/GIleAgW1DMiMkkneT7kk="; # mapml + version = "2.27.0"; # mapml + hash = "sha256-HONocKWnjkGqGRmtDxcJSwnDHwVouY6YeORRBjAbu4M="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.26.2"; # mbstyle - hash = "sha256-vJB9wFiMJtu16JuJ+vESYG07U/Hs7NmMo3kqMkjV0k4="; # mbstyle + version = "2.27.0"; # mbstyle + hash = "sha256-c1QijJj/WfbTxc4vM55lz+wx2PW4BY3tXneSM+3zXRA="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.26.2"; # metadata - hash = "sha256-CVp2KVHmqeIXPf031HBnvilcgfEKOpyv9Pc/yNpCFM8="; # metadata + version = "2.27.0"; # metadata + hash = "sha256-5b9gtSzP9DOyhwoNdFVnv08WjlH+m0ZFPO+jqtbUJ1A="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.26.2"; # mongodb - hash = "sha256-Ndo0/r0maxZ7GcGQFY8ZNgtmxXaDJ1Gtj4oDRN7qzWM="; # mongodb + version = "2.27.0"; # mongodb + hash = "sha256-Y9KQ7lqfCnPfTdPUzidi9wNZPeiTTqB+4lf5q7mSQ88="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.26.2"; # monitor - hash = "sha256-1/yqmzFaPbntgxB1zXqJIrKCdKJpPzHm30v+Ww/kgXE="; # monitor + version = "2.27.0"; # monitor + hash = "sha256-uAkOudY7yACJ9A+FxcKSDUhGiID+uTvBibCejFwEiT0="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.26.2"; # mysql - hash = "sha256-QOlAUhXyzpazYk/JJr9IcU1gIVS7iGB6Ly2HgbER8dA="; # mysql + version = "2.27.0"; # mysql + hash = "sha256-qA3l9gx4AuqqbPHfQkbvJNYfURrBSnmq4S4nEPrFpO4="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.26.2"; # netcdf - hash = "sha256-cwe518kyk5vMjjBvHhzmTdZ/G0nT0KEDoQK7GbiAnfQ="; # netcdf + version = "2.27.0"; # netcdf + hash = "sha256-3pxGeIWcsBnJMdZjupOR/GmglxYWJp8KjJsmZSCRK00="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.26.2"; # netcdf-out - hash = "sha256-/u9cOOT0/FvEt39VXO3l4Vv01Qpiqg9qJnNH4nnUxa0="; # netcdf-out + version = "2.27.0"; # netcdf-out + hash = "sha256-GfwJqdoO1Z265OmfAvjoKy0/DLX8e06Mu58o4Zps4q0="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.26.2"; # ogr-wfs + version = "2.27.0"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-4Lp9ffQVgug2zP6ikDyDSITqrq8K5wADjNm3ArpJz1s="; # ogr-wfs + hash = "sha256-FX3sojRnR6FQSFSK4n62w/lrPbHTdbLn9NtR2nE/3dU="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.26.2"; # ogr-wps + version = "2.27.0"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-57rQgsdwXI7eQFhbL+ieP8uOlfeOJqUVWibBNZiPb9E="; # ogr-wps + hash = "sha256-Nb7rkbZPw85+EAcR+ist4iW16HVfsH9cSYwplHyO4RY="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.26.2"; # oracle - hash = "sha256-23/lMh1L3zzwUk3cJCxQhdLdQoghhkK1JAoet9nmN1M="; # oracle + version = "2.27.0"; # oracle + hash = "sha256-4KnZ48oKmgap3qZiJE4TSCQZpMvCQd4PULWponW5f1c="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.26.2"; # params-extractor - hash = "sha256-mEKf4riqzSlwra71jY4MO1BM2/fCfikW1CKAB02ntF8="; # params-extractor + version = "2.27.0"; # params-extractor + hash = "sha256-0NnL87Cn/DcLXTnBJhgcGHNmC6SYKRc7TY+4r7VcYJQ="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.26.2"; # printing - hash = "sha256-/R4MX73aiTGbqDNK+2rthcBUwJesc3j96UDqmpTZpxk="; # printing + version = "2.27.0"; # printing + hash = "sha256-10uBc9ZI9M9m5vmKMXfB1TieJBr7cx/SeD1AiXNVJo8="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.26.2"; # pyramid - hash = "sha256-6FIDk62d45ctmwhaW/XpdHziiPFyhsKm36l5BpZa4/w="; # pyramid + version = "2.27.0"; # pyramid + hash = "sha256-K38fYjM0Oh+FHT5Wadjuc3KIhFP2x5q5cxW5aucZNNw="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.26.2"; # querylayer - hash = "sha256-sM9OmWKJwOjxqzuhOEF+6j01r3+lvvZmaOIxBnmsUbo="; # querylayer + version = "2.27.0"; # querylayer + hash = "sha256-5OPfTUB0d08jWjxWd77BxffZgx+eM5eJX9bX0kt/WpM="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.26.2"; # sldservice - hash = "sha256-aKRy0wbx5XRdXPGZFsf+bdxmU0ILAPiMI2Zqg2nu52E="; # sldservice + version = "2.27.0"; # sldservice + hash = "sha256-rWIbWCsX4Hkank0L02sluTF137Y6Pex15Gobiwv2pNM="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.26.2"; # sqlserver - hash = "sha256-Sacng3WZ+bbljlnYQfP9RWk96kVeiJlGFFgudNheg9g="; # sqlserver + version = "2.27.0"; # sqlserver + hash = "sha256-ghf3z9b586RUgvicyOXlW2K8Uq9TolRb7CrcKT1Jt1M="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.26.2"; # vectortiles - hash = "sha256-6hC8YfGbgUC6Mxx5/0qfbKOaO7UmHEhcrY9q1U/Q3Us="; # vectortiles + version = "2.27.0"; # vectortiles + hash = "sha256-ho/Vp1cFq2/xY9fIaQUR+vBQ6Vfdf+Z2eYvL7eI1qMY="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.26.2"; # wcs2_0-eo - hash = "sha256-u433otfuIdCOPON8mGcyDgVoHstXV4tKClRopN+yJHE="; # wcs2_0-eo + version = "2.27.0"; # wcs2_0-eo + hash = "sha256-GcoOT3JNQPUN8ETX4spJXteJvbNM9+YO85FH+dw3oSg="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.26.2"; # web-resource - hash = "sha256-C8+8Ri7RLz8UhsMuhINF2p7SriHV6+lU/DBMBo75fUw="; # web-resource + version = "2.27.0"; # web-resource + hash = "sha256-4TGt9MklLWbJexY7kjT+ijIX/V4OLw7U6mDkBoVXuwk="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.26.2"; # wmts-multi-dimensional - hash = "sha256-6Wnf4im1fZULjoSOu2V3Phn4/6A3UGnCP8BvZDtaKUU="; # wmts-multi-dimensional + version = "2.27.0"; # wmts-multi-dimensional + hash = "sha256-8I3XbAToqTgwf4y+C3ulAhCY7axyS739GV4+jxwO33g="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.26.2"; # wps - hash = "sha256-ocFmcaWsEq7iothnc7/7DIPpbCo5z5WwI3F1tbDX8dA="; # wps + version = "2.27.0"; # wps + hash = "sha256-9OrjyVaf9JzDPXyqHqqg51aAllhcAf4bOvQQyV1dHpI="; # wps }; # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # available in nixpgs as of 2024/01. #wps-cluster-hazelcast = mkGeoserverExtension { # name = "wps-cluster-hazelcast"; - # version = "2.26.2"; # wps-cluster-hazelcast - # hash = "sha256-GoSeXKd4wBhYdnGlHgoHiaVxnb4VNEg1TG5IXG0qJzA="; # wps-cluster-hazelcast + # version = "2.27.0"; # wps-cluster-hazelcast + # hash = "sha256-amHfS5eBRoiMdj3wJzRNg9krYo5DJrCvCvhtj/Z9mUw="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.26.2"; # wps-download - hash = "sha256-FBVt/B2nuf0PY4o1yuJ997sjWdsWYYxDgC94yOKQH/8="; # wps-download + version = "2.27.0"; # wps-download + hash = "sha256-vQpSGiOUh9N4PDQ4w/mTNjooz0lYDXwwRpZsq9VhEMA="; # wps-download }; # Needs Postrgres configuration or similar. # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html wps-jdbc = mkGeoserverExtension { name = "wps-jdbc"; - version = "2.26.2"; # wps-jdbc - hash = "sha256-w3pzprk4UG4vE6K7tB/41U66OGSpB9uNUafKmKZ5uWY="; # wps-jdbc + version = "2.27.0"; # wps-jdbc + hash = "sha256-YWBOLL3X6Ztv+9EWmHKd5N020+qkVNtXXbObSlBhp2s="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.26.2"; # ysld - hash = "sha256-guaTT3S0lU6nSaw90gNCHm5Gsdc27jX+XE/92vVfVQI="; # ysld + version = "2.27.0"; # ysld + hash = "sha256-fPF4LM0WC4YaAMnPhz3A/XXOoMu+v8TsO6XIcXHWRi4="; # ysld }; } diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index c3e7b826cc3f..0cee73f25f50 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -10,19 +10,26 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "geoserver"; - version = "2.26.2"; + version = "2.27.0"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - hash = "sha256-K4OeMGnczKXVl+nxyd9unuCdoEpyF7j364Vxe49EOxo="; + hash = "sha256-bhL+u+BoKgW2cwOXEzaq0h07dKFz9u9WB2jW8nAF0vI="; }; + sourceRoot = "source"; + + unpackPhase = '' + runHook preUnpack + unzip $src -d "$sourceRoot" + runHook postUnpack + ''; + patches = [ # set GEOSERVER_DATA_DIR to current working directory if not provided ./data-dir.patch ]; - sourceRoot = "."; nativeBuildInputs = [ unzip makeWrapper @@ -90,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: rec { homepage = "https://geoserver.org/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; - maintainers = teams.geospatial.members; + teams = [ teams.geospatial ]; platforms = platforms.all; }; }) diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix index f48a32f03216..d26ddf70b00f 100644 --- a/pkgs/by-name/ge/gerrit/package.nix +++ b/pkgs/by-name/ge/gerrit/package.nix @@ -2,16 +2,17 @@ lib, stdenv, fetchurl, + gitUpdater, nixosTests, }: stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.11.2"; + version = "3.12.0"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - hash = "sha256-F3kWGIA7RvbPMAs9U9tAmraHpxbkW/TQ6R9XXVBaLXs="; + hash = "sha256-/1QKWu1OF6uPkuBcnHBoVRqiiIxr7LPkrfQHpjO9sz4="; }; buildCommand = '' @@ -20,6 +21,11 @@ stdenv.mkDerivation rec { ''; passthru = { + updateScript = gitUpdater { + url = "https://gerrit.googlesource.com/gerrit"; + rev-prefix = "v"; + allowedVersions = "^[0-9\\.]+$"; + }; # A list of plugins that are part of the gerrit.war file. # Use `java -jar gerrit.war ls | grep plugins/` to generate that list. plugins = [ diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix index a29d98aeefd1..305d430a323c 100644 --- a/pkgs/by-name/ge/gersemi/package.nix +++ b/pkgs/by-name/ge/gersemi/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "gersemi"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "BlankSpruce"; repo = "gersemi"; tag = version; - hash = "sha256-lQafcZLTF/6SHC/NL1UnuilascjwqH4sX+kmCYHFDrw="; + hash = "sha256-CVb6ibO5+Tp0o+nB+bo9G9OKyB4L05wN1QiB9J4bOqY="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/ge/get_iplayer/package.nix b/pkgs/by-name/ge/get_iplayer/package.nix index 649acec9aa34..811f18801919 100644 --- a/pkgs/by-name/ge/get_iplayer/package.nix +++ b/pkgs/by-name/ge/get_iplayer/package.nix @@ -8,17 +8,19 @@ perl, atomicparsley, ffmpeg, + testers, + get_iplayer, }: perlPackages.buildPerlPackage rec { pname = "get_iplayer"; - version = "3.35"; + version = "3.36"; src = fetchFromGitHub { owner = "get-iplayer"; repo = "get_iplayer"; rev = "v${version}"; - hash = "sha256-fqzrgmtqy7dlmGEaTXAqpdt9HqZCVooJ0Vf6/JUKihw="; + hash = "sha256-O/mVtbudrYw0jKeSckZlgonFDiWxfeiVc8gdcy4iNBw="; }; nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; @@ -56,6 +58,12 @@ perlPackages.buildPerlPackage rec { shortenPerlShebang $out/bin/.get_iplayer-wrapped ''; + passthru.tests.version = testers.testVersion { + package = get_iplayer; + command = "HOME=$(mktemp -d) get_iplayer --help"; + version = "v${version}"; + }; + meta = with lib; { description = "Downloads TV and radio programmes from BBC iPlayer and BBC Sounds"; mainProgram = "get_iplayer"; diff --git a/pkgs/by-name/ge/getdns/package.nix b/pkgs/by-name/ge/getdns/package.nix new file mode 100644 index 000000000000..977933b092d0 --- /dev/null +++ b/pkgs/by-name/ge/getdns/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + fetchurl, + cmake, + doxygen, + libidn2, + openssl, + unbound, + yq, + + enableStubOnly ? false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "getdns"; + version = "1.7.3"; + outputs = [ + "out" + "dev" + "lib" + "man" + ]; + + src = fetchurl { + url = "https://getdnsapi.net/releases/getdns-${lib.concatStringsSep "-" (lib.splitVersion finalAttrs.version)}/getdns-${finalAttrs.version}.tar.gz"; + # upstream publishes hashes in hex format + sha256 = "f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c"; + }; + + nativeBuildInputs = [ + cmake + doxygen + ]; + + buildInputs = [ + libidn2 + openssl + ] ++ lib.optional (!enableStubOnly) unbound; + + cmakeFlags = [ (lib.strings.cmakeBool "ENABLE_STUB_ONLY" enableStubOnly) ]; + + # https://github.com/getdnsapi/getdns/issues/517 + postPatch = '' + substituteInPlace getdns.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + + postInstall = "rm -r $out/share/doc"; + + meta = { + description = "Modern asynchronous DNS API"; + longDescription = '' + getdns is an implementation of a modern asynchronous DNS API; the + specification was originally edited by Paul Hoffman. It is intended to make all + types of DNS information easily available to application developers and non-DNS + experts. DNSSEC offers a unique global infrastructure for establishing and + enhancing cryptographic trust relations. With the development of this API the + developers intend to offer application developers a modern and flexible + interface that enables end-to-end trust in the DNS architecture, and which will + inspire application developers to implement innovative security solutions in + their applications. + ''; + homepage = "https://getdnsapi.net"; + maintainers = with lib.maintainers; [ + leenaars + ehmry + ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ge/geteduroam-cli/package.nix b/pkgs/by-name/ge/geteduroam-cli/package.nix index 204ab41a0d15..082e254ce61a 100644 --- a/pkgs/by-name/ge/geteduroam-cli/package.nix +++ b/pkgs/by-name/ge/geteduroam-cli/package.nix @@ -5,18 +5,18 @@ versionCheckHook, nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "geteduroam-cli"; - version = "0.4"; + version = "0.10"; src = fetchFromGitHub { owner = "geteduroam"; repo = "linux-app"; - tag = version; - hash = "sha256-9+IjrHg536/6ulj94CBhYWY0S3aNA7Ne4JQynMmsLxE="; + tag = finalAttrs.version; + hash = "sha256-Mtzt6i8vJ5M8T0vrAOxXhawlhCmCMEnDQz0Jo6uV88A="; }; - vendorHash = "sha256-9SNjOC59wcEkxJqBXsgYClHKGH7OFWk3t/wMPLANAy0="; + vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q="; subPackages = [ "cmd/geteduroam-cli" @@ -26,7 +26,7 @@ buildGoModule rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/geteduroam-cli"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { @@ -40,6 +40,6 @@ buildGoModule rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ viperML ]; platforms = lib.platforms.linux; - changelog = "https://github.com/geteduroam/linux-app/releases/tag/${version}"; + changelog = "https://github.com/geteduroam/linux-app/releases/tag/${finalAttrs.version}"; }; -} +}) diff --git a/pkgs/by-name/ge/geteduroam/package.nix b/pkgs/by-name/ge/geteduroam/package.nix new file mode 100644 index 000000000000..626c641dc66a --- /dev/null +++ b/pkgs/by-name/ge/geteduroam/package.nix @@ -0,0 +1,92 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + symlinkJoin, + versionCheckHook, + makeWrapper, + wrapGAppsHook4, + cairo, + gdk-pixbuf, + glib, + graphene, + gtk4, + libadwaita, + pango, +}: + +buildGoModule (finalAttrs: { + pname = "geteduroam"; + version = "0.10"; + + src = fetchFromGitHub { + owner = "geteduroam"; + repo = "linux-app"; + tag = finalAttrs.version; + hash = "sha256-Mtzt6i8vJ5M8T0vrAOxXhawlhCmCMEnDQz0Jo6uV88A="; + }; + + vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q="; + + subPackages = [ + "cmd/geteduroam-gui" + "cmd/geteduroam-notifcheck" + ]; + + postInstall = '' + wrapProgram $out/bin/geteduroam-gui \ + --set-default PUREGOTK_LIB_FOLDER ${finalAttrs.passthru.libraryPath}/lib \ + ''${gappsWrapperArgs[@]} + + # copy notifcheck service + mkdir -p $out/lib/systemd/system/ + cp -v systemd/user/geteduroam/* $out/lib/systemd/system/ + substituteInPlace $out/lib/systemd/system/geteduroam-notifs.service \ + --replace-fail \ + "ExecStart=/usr/bin/geteduroam-notifcheck" \ + "ExecStart=$out/bin/geteduroam-notifcheck" + + # copy icons and desktop entries + cp -r cmd/geteduroam-gui/resources/share $out/ + ''; + + nativeBuildInputs = [ + wrapGAppsHook4 + makeWrapper + ]; + + dontWrapGApps = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/geteduroam-gui"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + libraryPath = symlinkJoin { + name = "eduroam-gui-puregotk-lib"; + # based on https://github.com/jwijenbergh/puregotk/blob/bc1a52f44fd4c491947f7af85296c66173da17ba/internal/core/core.go#L41 + paths = [ + cairo + gdk-pixbuf + glib.out + graphene + gtk4 + libadwaita + pango.out + ]; + }; + }; + + meta = { + description = "GUI client to configure eduroam"; + homepage = "https://eduroam.app"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ pbsds ]; + platforms = lib.platforms.linux; + changelog = "https://github.com/geteduroam/linux-app/releases/tag/${finalAttrs.version}"; + mainProgram = "geteduroam-gui"; + }; +}) diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index b4719fe6a962..e785cfa6ed46 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.19.07"; + version = "6.19.08"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; tag = "v${version}"; - hash = "sha256-uu+soEYC12LWx0aLbPupoK7g/rnD47dp32w7jpRj/38="; + hash = "sha256-GUO6zozdh5u3dpFVQUYK/2PlurzXSEswgtdcpiPmhV8="; }; build-system = with python3.pkgs; [ @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Program for retrieving mail"; homepage = "https://getmail6.org"; - changelog = "https://github.com/getmail6/getmail6/blob/${src.rev}/docs/CHANGELOG"; + changelog = "https://github.com/getmail6/getmail6/blob/${src.tag}/docs/CHANGELOG"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbe diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix index 53a20c7308a3..0ecba4acd1e0 100644 --- a/pkgs/by-name/ge/gex/package.nix +++ b/pkgs/by-name/ge/gex/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, libgit2, - darwin, nix-update-script, }: @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - buildInputs = - [ - libgit2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/ge/gexiv2/package.nix b/pkgs/by-name/ge/gexiv2/package.nix index 54b173d08aca..7913d8aeb268 100644 --- a/pkgs/by-name/ge/gexiv2/package.nix +++ b/pkgs/by-name/ge/gexiv2/package.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { description = "GObject wrapper around the Exiv2 photo metadata library"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix index ec50399ac3bc..8ee246edd7bb 100644 --- a/pkgs/by-name/gf/gf/package.nix +++ b/pkgs/by-name/gf/gf/package.nix @@ -7,6 +7,7 @@ pkg-config, gdb, freetype, + nix-update-script, freetypeSupport ? true, withExtensions ? true, extraFlags ? "", @@ -15,13 +16,13 @@ stdenv.mkDerivation { pname = "gf"; - version = "0-unstable-2025-02-04"; + version = "0-unstable-2025-04-11"; src = fetchFromGitHub { repo = "gf"; owner = "nakst"; - rev = "9c1686439f97ae6e1ca8f1fb785b545303adfebc"; - hash = "sha256-0uABsjAVn+wAN8hMkM38CepSV4gYtIL0WHDq25TohZ0="; + rev = "162249220bde1c9fef7d87f8bb9128be9323d93f"; + hash = "sha256-wP8ELlqtMwYv6/jQzKahaX7vlMKLUBgxm5Io49tphsM="; }; nativeBuildInputs = [ @@ -67,6 +68,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/gf2 --prefix PATH : ${lib.makeBinPath [ gdb ]} ''; + passthru.updateScript = nix-update-script { extraArgs = lib.singleton "--version=branch"; }; + meta = with lib; { description = "GDB Frontend"; homepage = "https://github.com/nakst/gf"; diff --git a/pkgs/by-name/gf/gf2x/package.nix b/pkgs/by-name/gf/gf2x/package.nix index d30efbcfeda6..4f1f15408601 100644 --- a/pkgs/by-name/gf/gf2x/package.nix +++ b/pkgs/by-name/gf/gf2x/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Routines for fast arithmetic in GF(2)[x]"; homepage = "https://gitlab.inria.fr/gf2x/gf2x/"; license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/gf/gfal2/package.nix b/pkgs/by-name/gf/gfal2/package.nix index 273c0411f02d..63ea071efaee 100644 --- a/pkgs/by-name/gf/gfal2/package.nix +++ b/pkgs/by-name/gf/gfal2/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gfal2"; - version = "2.23.0"; + version = "2.23.2"; src = fetchFromGitHub { owner = "cern-fts"; repo = "gfal2"; rev = "v${finalAttrs.version}"; - hash = "sha256-LEvmjd3A+7JHfUOAnyRyXMsJd/8JO2rVpcIT7QGSJoo="; + hash = "sha256-gyEmz0sNHyxjvJA/3uSzLW42PQ3UVKx6nptNYl/3ExM="; }; passthru.enablePluginStatus = { diff --git a/pkgs/by-name/gf/gfbgraph/package.nix b/pkgs/by-name/gf/gfbgraph/package.nix deleted file mode 100644 index bc283264de3a..000000000000 --- a/pkgs/by-name/gf/gfbgraph/package.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - pkg-config, - glib, - librest, - gnome-online-accounts, - gnome, - libsoup_2_4, - json-glib, - gobject-introspection, - gtk-doc, - docbook-xsl-nons, -}: - -stdenv.mkDerivation rec { - pname = "gfbgraph"; - version = "0.2.5"; - - outputs = [ - "out" - "dev" - "devdoc" - ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "nLOBs/eLoRNt+Xrz8G47EdzCqzOawI907aD4BX1mA+M="; - }; - - nativeBuildInputs = [ - pkg-config - gobject-introspection - gtk-doc - docbook-xsl-nons - ]; - - buildInputs = [ - glib - gnome-online-accounts - ]; - - propagatedBuildInputs = [ - libsoup_2_4 - json-glib - librest - ]; - - configureFlags = [ - "--enable-introspection" - "--enable-gtk-doc" - ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/libgfbgraph"; - description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = teams.gnome.members; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix index 37eb0397f94f..576a87024575 100644 --- a/pkgs/by-name/gf/gfn-electron/package.nix +++ b/pkgs/by-name/gf/gfn-electron/package.nix @@ -5,9 +5,10 @@ electron, nix-update-script, makeBinaryWrapper, + python3, }: let - version = "2.1.3"; + version = "2.2.0"; in buildNpmPackage { pname = "gfn-electron"; @@ -17,12 +18,18 @@ buildNpmPackage { owner = "hmlendea"; repo = "gfn-electron"; tag = "v${version}"; - hash = "sha256-o5p7INuyrs4Fw0uoP9f3UpqpmJzHIFSBCBTTU2NfUMQ="; + hash = "sha256-DwrNCgBp0CD+HYXRMDsu0aKEKzG7k/tk7oATJc30DlE="; }; - npmDepsHash = "sha256-xp9uZAMrsPut91tQD3XfeENr7fXFg2bE89xShG1AcZk="; + npmDepsHash = "sha256-2v5qTTGhdG1EEK8v50LLYz5jE/36lBm1PKQl6HfqhCU="; - nativeBuildInputs = [ makeBinaryWrapper ]; + nativeBuildInputs = [ + makeBinaryWrapper + # node_modules/node-gyp/gyp/pylib/gyp/input.py + # from distutils.version import StrictVersion + # ModuleNotFoundError: No module named 'distutils' + (python3.withPackages (ps: with ps; [ setuptools ])) + ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = true; diff --git a/pkgs/by-name/gf/gftp/package.nix b/pkgs/by-name/gf/gftp/package.nix new file mode 100644 index 000000000000..4d7db1e79dc8 --- /dev/null +++ b/pkgs/by-name/gf/gftp/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, + gettext, + gtk2, + intltool, + libtool, + ncurses, + openssl, + pkg-config, + readline, +}: + +stdenv.mkDerivation rec { + pname = "gftp"; + version = "2.9.1b"; + + src = fetchFromGitHub { + owner = "masneyb"; + repo = pname; + rev = version; + hash = "sha256-0zdv2oYl24BXh61IGCWby/2CCkzNjLpDrAFc0J89Pw4="; + }; + + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-incompatible-pointer-types" # https://github.com/masneyb/gftp/issues/178 + ]; + + nativeBuildInputs = [ + autoconf + automake + gettext + intltool + libtool + pkg-config + ]; + + buildInputs = [ + gtk2 + ncurses + openssl + readline + ]; + + preConfigure = '' + ./autogen.sh + ''; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + homepage = "https://github.com/masneyb/gftp"; + description = "GTK-based multithreaded FTP client for *nix-based machines"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; +} +# TODO: report the hardeningDisable to upstream diff --git a/pkgs/by-name/gf/gfxstream/package.nix b/pkgs/by-name/gf/gfxstream/package.nix index ccae47da4d48..48de695bb91f 100644 --- a/pkgs/by-name/gf/gfxstream/package.nix +++ b/pkgs/by-name/gf/gfxstream/package.nix @@ -8,7 +8,6 @@ pkg-config, python3, aemu, - darwin, libdrm, libglvnd, vulkan-headers, @@ -47,23 +46,13 @@ stdenv.mkDerivation { pkg-config python3 ]; - buildInputs = - [ - aemu - libglvnd - vulkan-headers - vulkan-loader - xorg.libX11 - ] - ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.IOSurface - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.frameworks.QuartzCore - ]; + buildInputs = [ + aemu + libglvnd + vulkan-headers + vulkan-loader + xorg.libX11 + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = toString [ diff --git a/pkgs/by-name/gg/gg-jj/native-tls.patch b/pkgs/by-name/gg/gg-jj/native-tls.patch deleted file mode 100644 index bcbd79fc812b..000000000000 --- a/pkgs/by-name/gg/gg-jj/native-tls.patch +++ /dev/null @@ -1,351 +0,0 @@ -diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock -index 37a1a2d..45640a1 100644 ---- a/src-tauri/Cargo.lock -+++ b/src-tauri/Cargo.lock -@@ -778,9 +778,9 @@ dependencies = [ - "bitflags 2.6.0", - "block", - "cocoa-foundation", -- "core-foundation", -+ "core-foundation 0.10.0", - "core-graphics", -- "foreign-types", -+ "foreign-types 0.5.0", - "libc", - "objc", - ] -@@ -793,7 +793,7 @@ checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" - dependencies = [ - "bitflags 2.6.0", - "block", -- "core-foundation", -+ "core-foundation 0.10.0", - "core-graphics-types", - "libc", - "objc", -@@ -873,6 +873,16 @@ dependencies = [ - "version_check", - ] - -+[[package]] -+name = "core-foundation" -+version = "0.9.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ - [[package]] - name = "core-foundation" - version = "0.10.0" -@@ -896,9 +906,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" - dependencies = [ - "bitflags 2.6.0", -- "core-foundation", -+ "core-foundation 0.10.0", - "core-graphics-types", -- "foreign-types", -+ "foreign-types 0.5.0", - "libc", - ] - -@@ -909,7 +919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" - dependencies = [ - "bitflags 2.6.0", -- "core-foundation", -+ "core-foundation 0.10.0", - "libc", - ] - -@@ -1435,6 +1445,15 @@ version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" - -+[[package]] -+name = "foreign-types" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+dependencies = [ -+ "foreign-types-shared 0.1.1", -+] -+ - [[package]] - name = "foreign-types" - version = "0.5.0" -@@ -1442,7 +1461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" - dependencies = [ - "foreign-types-macros", -- "foreign-types-shared", -+ "foreign-types-shared 0.3.1", - ] - - [[package]] -@@ -1456,6 +1475,12 @@ dependencies = [ - "syn 2.0.87", - ] - -+[[package]] -+name = "foreign-types-shared" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+ - [[package]] - name = "foreign-types-shared" - version = "0.3.1" -@@ -2779,6 +2804,22 @@ dependencies = [ - "want", - ] - -+[[package]] -+name = "hyper-tls" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -+dependencies = [ -+ "bytes", -+ "http-body-util", -+ "hyper", -+ "hyper-util", -+ "native-tls", -+ "tokio", -+ "tokio-native-tls", -+ "tower-service", -+] -+ - [[package]] - name = "hyper-util" - version = "0.1.10" -@@ -3418,9 +3459,9 @@ dependencies = [ - - [[package]] - name = "libc" --version = "0.2.163" -+version = "0.2.164" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1fdaeca4cf44ed4ac623e86ef41f056e848dbeab7ec043ecb7326ba300b36fd0" -+checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" - - [[package]] - name = "libgit2-sys" -@@ -3453,7 +3494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" - dependencies = [ - "cfg-if", -- "windows-targets 0.52.6", -+ "windows-targets 0.48.5", - ] - - [[package]] -@@ -3688,6 +3729,23 @@ dependencies = [ - "windows-sys 0.59.0", - ] - -+[[package]] -+name = "native-tls" -+version = "0.2.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" -+dependencies = [ -+ "libc", -+ "log", -+ "openssl", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "security-framework", -+ "security-framework-sys", -+ "tempfile", -+] -+ - [[package]] - name = "ndk" - version = "0.9.0" -@@ -4065,6 +4123,32 @@ dependencies = [ - "pathdiff", - ] - -+[[package]] -+name = "openssl" -+version = "0.10.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f5e534d133a060a3c19daec1eb3e98ec6f4685978834f2dbadfe2ec215bab64e" -+dependencies = [ -+ "bitflags 2.6.0", -+ "cfg-if", -+ "foreign-types 0.3.2", -+ "libc", -+ "once_cell", -+ "openssl-macros", -+ "openssl-sys", -+] -+ -+[[package]] -+name = "openssl-macros" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.87", -+] -+ - [[package]] - name = "openssl-probe" - version = "0.1.5" -@@ -4854,19 +4938,23 @@ dependencies = [ - "http-body", - "http-body-util", - "hyper", -+ "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", -+ "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", -+ "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", -+ "tokio-native-tls", - "tokio-util 0.7.12", - "tower-service", - "url", -@@ -5000,6 +5088,21 @@ dependencies = [ - "windows-sys 0.52.0", - ] - -+[[package]] -+name = "rustls-pemfile" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -+dependencies = [ -+ "rustls-pki-types", -+] -+ -+[[package]] -+name = "rustls-pki-types" -+version = "1.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" -+ - [[package]] - name = "rustversion" - version = "1.0.18" -@@ -5027,6 +5130,15 @@ version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "088c5d71572124929ea7549a8ce98e1a6fd33d0a38367b09027b382e67c033db" - -+[[package]] -+name = "schannel" -+version = "0.1.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" -+dependencies = [ -+ "windows-sys 0.59.0", -+] -+ - [[package]] - name = "schemars" - version = "0.8.21" -@@ -5089,6 +5201,29 @@ version = "4.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -+[[package]] -+name = "security-framework" -+version = "2.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -+dependencies = [ -+ "bitflags 2.6.0", -+ "core-foundation 0.9.4", -+ "core-foundation-sys", -+ "libc", -+ "security-framework-sys", -+] -+ -+[[package]] -+name = "security-framework-sys" -+version = "2.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ - [[package]] - name = "selectors" - version = "0.22.0" -@@ -5436,7 +5571,7 @@ dependencies = [ - "bytemuck", - "cfg_aliases", - "core-graphics", -- "foreign-types", -+ "foreign-types 0.5.0", - "js-sys", - "log", - "objc2", -@@ -5631,7 +5766,7 @@ checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da" - dependencies = [ - "bitflags 2.6.0", - "cocoa", -- "core-foundation", -+ "core-foundation 0.10.0", - "core-graphics", - "crossbeam-channel", - "dispatch", -@@ -6208,6 +6343,16 @@ dependencies = [ - "syn 2.0.87", - ] - -+[[package]] -+name = "tokio-native-tls" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -+dependencies = [ -+ "native-tls", -+ "tokio", -+] -+ - [[package]] - name = "tokio-util" - version = "0.6.10" -@@ -7006,7 +7151,7 @@ version = "0.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" - dependencies = [ -- "windows-sys 0.59.0", -+ "windows-sys 0.48.0", - ] - - [[package]] -diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml -index 550b0cf..9b711a4 100644 ---- a/src-tauri/Cargo.toml -+++ b/src-tauri/Cargo.toml -@@ -14,7 +14,7 @@ zip = "0.6" - assert_matches = "1.5" - - [dependencies] --tauri = { version = "2.0.0", features = [] } -+tauri = { version = "2.0.0", features = ["native-tls"] } - tauri-codegen = "2.0.0" - tauri-macros = "2.0.0" - tauri-plugin = "2.0.0" diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix index ff2c5240a4bc..adf3bf1f7f76 100644 --- a/pkgs/by-name/gg/gg-jj/package.nix +++ b/pkgs/by-name/gg/gg-jj/package.nix @@ -1,71 +1,52 @@ { lib, stdenv, - rustPlatform, fetchFromGitHub, fetchNpmDeps, - yq, - cargo-tauri, - cargo, - rustc, nodejs, npmHooks, pkg-config, wrapGAppsHook3, - openssl, webkitgtk_4_1, - versionCheckHook, nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "gg"; - version = "0.23.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "gulbanana"; repo = "gg"; tag = "v${finalAttrs.version}"; - hash = "sha256-iQxPJgMxBtyindkNdQkehwPf7ZgWCI09PToqs2y1Hfw="; + hash = "sha256-vmzALX1x7VfdnwN05bCwbnTL+HfFVyNiKFoT74tFuu8="; }; - patches = [ ./native-tls.patch ]; cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; - # FIXME: Switch back to cargoHash when https://github.com/NixOS/nixpkgs/issues/356811 is fixed - cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) - pname - version - src - patches - ; - # Tries to apply patches inside cargoRoot. - prePatch = "pushd .."; - postPatch = "popd"; - sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-zEYU5l57VxVKKhoGfa77kT05vwoLyAu9eyt7C9dhAGM="; - }; + cargoHash = "sha256-esStQ55+T4uLbHbg7P7hqS6kIpXIMxouRSFkTo6dvAU="; npmDeps = fetchNpmDeps { inherit (finalAttrs) pname version src; - hash = "sha256-SMz1ohPSF5tvf2d3is4PXhnjHG9hHuS5NYmHbe46HaU="; + hash = "sha256-yFDGH33maCndH4vgyMfNg0+c5jCOeoIAWUJgAPHXwsM="; }; - nativeBuildInputs = [ - cargo-tauri.hook - rustPlatform.cargoSetupHook - cargo - rustc - nodejs - npmHooks.npmConfigHook - pkg-config - wrapGAppsHook3 - ]; + nativeBuildInputs = + [ + cargo-tauri.hook + nodejs + npmHooks.npmConfigHook + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wrapGAppsHook3 + ]; buildInputs = [ openssl ] @@ -89,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GUI for the version control system Jujutsu"; homepage = "https://github.com/gulbanana/gg"; - changelog = "https://github.com/gulbanana/gg/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/gulbanana/gg/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 ]; inherit (cargo-tauri.hook.meta) platforms; maintainers = with lib.maintainers; [ pluiedev ]; diff --git a/pkgs/by-name/gg/ggh/package.nix b/pkgs/by-name/gg/ggh/package.nix new file mode 100644 index 000000000000..ecd85026f9ff --- /dev/null +++ b/pkgs/by-name/gg/ggh/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "ggh"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "byawitz"; + repo = "ggh"; + tag = "v${finalAttrs.version}"; + hash = "sha256-itNx/AcLUQCH99ZCOXiXPWNg3mx+UhHepidqmzPY8Oc="; + }; + + vendorHash = "sha256-WPPjpxCD3WA3E7lx5+DPvG31p8djera5xRn980eaJT8="; + + ldflags = [ + "-s" + "-w" + "-X main.version=v${finalAttrs.version}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Recall your SSH sessions (also search your SSH config file)"; + homepage = "https://github.com/byawitz/ggh"; + changelog = "https://github.com/byawitz/ggh/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ilarvne ]; + platforms = lib.platforms.unix; + mainProgram = "ggh"; + }; +}) diff --git a/pkgs/by-name/gg/ggobi/package.nix b/pkgs/by-name/gg/ggobi/package.nix deleted file mode 100644 index 14c7748c3b5b..000000000000 --- a/pkgs/by-name/gg/ggobi/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - libxml2, - gtk2, -}: - -stdenv.mkDerivation rec { - version = "2.1.11"; - pname = "ggobi"; - - src = fetchurl { - url = "http://www.ggobi.org/downloads/ggobi-${version}.tar.bz2"; - sha256 = "2c4ddc3ab71877ba184523e47b0637526e6f3701bd9afb6472e6dfc25646aed7"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libxml2 - gtk2 - ]; - - configureFlags = [ "--with-all-plugins" ]; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - description = "Visualization program for exploring high-dimensional data"; - homepage = "http://www.ggobi.org/"; - license = licenses.cpl10; - platforms = platforms.linux; - maintainers = [ maintainers.michelk ]; - mainProgram = "ggobi"; - }; -} diff --git a/pkgs/by-name/gh/gh-classroom/package.nix b/pkgs/by-name/gh/gh-classroom/package.nix new file mode 100644 index 000000000000..910e31d7f12f --- /dev/null +++ b/pkgs/by-name/gh/gh-classroom/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + buildPackages, + fetchFromGitHub, + buildGoModule, + nix-update-script, + installShellFiles, +}: +buildGoModule (finalAttrs: { + pname = "gh-classroom"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "github"; + repo = "gh-classroom"; + tag = "v${finalAttrs.version}"; + hash = "sha256-h9j8B/MGZ4JJOJRj41IIQ9trQJZ4oqvT6ee9lc0P4oo="; + }; + + vendorHash = "sha256-UFV3KiRnefrdOwRsHQeo8mx8Z+sI1Rk5yu3jdZxUHxo="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${finalAttrs.version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd gh-classroom \ + --bash <(${emulator} $out/bin/gh-classroom --bash-completion) \ + --fish <(${emulator} $out/bin/gh-classroom --fish-completion) \ + --zsh <(${emulator} $out/bin/gh-classroom --zsh-completion) + '' + ); + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/github/gh-classroom"; + description = "Extension for the GitHub CLI, that enhances it for educators using GitHub classroom"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ _0x5a4 ]; + mainProgram = "gh-classroom"; + }; +}) diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index b739d8d357ce..e34be51f4599 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.12.0"; + version = "4.15.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-qtSJbp9BGX4669fl/B1Z6rGG3432Nj1IQ+aYfIE9W50="; + hash = "sha256-NTKU3/omeeeKy5XhGjeylwHrLrU6xWiOpXC1j6q6ZaA="; }; - vendorHash = "sha256-7s+Lp8CHo1+h2TmbTOcAGZORK+/1wytk4nv9fgD2Mhw="; + vendorHash = "sha256-9EuPq8leSf4K+HZUoUh4gNe8/ZV3g1WXSTXYWawHd14="; ldflags = [ "-s" diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 2cd13236cea1..68f9040a6036 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.12.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "github"; repo = "gh-gei"; rev = "v${version}"; - hash = "sha256-orDjHgyqwBo/LOuujCp/6p4G0SWDA/ZDWvtTfH1ofrU="; + hash = "sha256-33Npwf4C6IFrrsIRq4+udphfovaCXQ8JfN0yzfxIRq0="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; diff --git a/pkgs/by-name/gh/gh-skyline/package.nix b/pkgs/by-name/gh/gh-skyline/package.nix index 21bd335c95f4..b4d2ba692582 100644 --- a/pkgs/by-name/gh/gh-skyline/package.nix +++ b/pkgs/by-name/gh/gh-skyline/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gh-skyline"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "github"; repo = "gh-skyline"; tag = "v${version}"; - hash = "sha256-j8RAuujlze589+W+jvXJq1b7YX3uf+sd8qTvyZeKYUc="; + hash = "sha256-jcdOLoyOXq270SaObMpCD+ts6Hj8wqSAjUZWEg3F9+w="; }; - vendorHash = "sha256-rfv9KTTWs68pqSdgWo9dIn+PTe+77ZMOEhG0P37QwKo="; + vendorHash = "sha256-rCFHYofUQlfRMP7bJav2se7oAkE7rS8KJl1n8kCsSag="; ldflags = [ "-s" diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 4d27294ce455..ada2300e0a9e 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,22 +10,24 @@ buildGoModule rec { pname = "gh"; - version = "2.69.0"; + version = "2.73.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${version}"; - hash = "sha256-T5H84RH5uBXXNCiyd27ZjDu4g5UBK4yUjZWQAFp3cH0="; + hash = "sha256-enD7y0PA8+W2NIHQ617bKeYI5lJt+xUhEBwjPZ2vwjg="; }; - vendorHash = "sha256-BJK8XzCdbbyzj1rEJtnE6hKOy7Q9xSrkicBPzxz9gkw="; + vendorHash = "sha256-vTUsR9aDBztJktdZQEg98/nhV4R1fxLevksQ8a6GhDc="; nativeBuildInputs = [ installShellFiles ]; + # N.B.: using the Makefile is intentional. + # We pass "nixpkgs" for build.Date to avoid `gh --version` reporting a very old date. buildPhase = '' runHook preBuild - make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "manpages"} + make GO_LDFLAGS="-s -w -X github.com/cli/cli/v${lib.versions.major version}/internal/build.Date=nixpkgs" GH_VERSION=${version} bin/gh ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "manpages"} runHook postBuild ''; diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix index 0da0ca63a6d9..69694f1670ad 100644 --- a/pkgs/by-name/gh/ghciwatch/package.nix +++ b/pkgs/by-name/gh/ghciwatch/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, nix-update-script, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -21,11 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-kH5YTadpaUXDma+7SfBJxrOIsd9Gm0EU3MfhFmQ3U80="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - ]; - # integration tests are not run but the macros need this variable to be set GHC_VERSIONS = ""; checkFlags = "--test \"unit\""; diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index e7c3e5f8ed88..6522a6c75567 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ghex"; - version = "46.2"; + version = "48.alpha"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz"; - hash = "sha256-qPJ2o2OXpw0guGL/fGZCQ9nPKJHeub4G10Wk8axmHzE="; + hash = "sha256-QP7kmZfZGhkmYmEXDEi7hy+zBupB+2WnIVBghow73+I="; }; nativeBuildInputs = [ @@ -88,6 +88,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ghex"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; }) diff --git a/pkgs/by-name/gh/ghmap/package.nix b/pkgs/by-name/gh/ghmap/package.nix new file mode 100644 index 000000000000..fb581633c697 --- /dev/null +++ b/pkgs/by-name/gh/ghmap/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "ghmap"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "uhourri"; + repo = "ghmap"; + tag = "v${version}"; + hash = "sha256-ZA7jtcmvjZEIS3iYaTv9rFqeQSqsh8pCxcbpQDUPDfs="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + tqdm + ]; + + pythonImportsCheck = [ + "ghmap" + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; + + meta = { + description = "Python tool for mapping GitHub events to contributor activities"; + homepage = "https://github.com/uhourri/ghmap"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "ghmap"; + }; +} diff --git a/pkgs/by-name/gh/ghorg/package.nix b/pkgs/by-name/gh/ghorg/package.nix index ad35083adb0d..8ffa9aed9203 100644 --- a/pkgs/by-name/gh/ghorg/package.nix +++ b/pkgs/by-name/gh/ghorg/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-tsR7cBpDa311rLI1CTXD2LLl3j2PxkBeQsjkUP99iIo="; + sha256 = "sha256-kO9k/WOJpDOJi1tK6xJh6wIN3HPUFahT92mZWPLJKhY="; }; doCheck = false; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 92af0fc0432b..7fcc7a04514b 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.148.0"; + version = "2.161.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-cQEqp884yHhVGM6xAXGpB56rxCMHD3R5E1qGXqaHSfQ="; + hash = "sha256-fN901bpiFz1sAEBv9MKzpgfr7TFa6s3ghT9v44bXZzM="; # 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; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-gMTlZUmcKkD2udlJif8DxTDVhqpgjmWoTh3GmoW+eVo="; + npmDepsHash = "sha256-vaIQ6SdsBGfiIkvz+dE9wR/KToobFyWaZOuFHPgLk94="; nativeBuildInputs = [ prisma diff --git a/pkgs/by-name/gh/ghostie/package.nix b/pkgs/by-name/gh/ghostie/package.nix index 1737072421f6..8c80579becf7 100644 --- a/pkgs/by-name/gh/ghostie/package.nix +++ b/pkgs/by-name/gh/ghostie/package.nix @@ -6,7 +6,6 @@ openssl, sqlite, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +26,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = [ + openssl + sqlite + ]; # 4 out of 5 tests are notification tests which do not work in nix builds doCheck = false; diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix index 38808f010659..f663327ee3f5 100644 --- a/pkgs/by-name/gh/ghostscript/package.nix +++ b/pkgs/by-name/gh/ghostscript/package.nix @@ -64,13 +64,13 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.05.0"; + version = "10.05.1"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${ lib.replaceStrings [ "." ] [ "" ] version }/ghostscript-${version}.tar.xz"; - hash = "sha256-qsnE/fYYBadvYiABJzXBroMoE3iDFL/AQFXMDIlZuaM="; + hash = "sha256-IvK9yhXCiDDJcVzdxcKW6maJi/2rC2BKTgvP6wOvbK0="; }; patches = [ diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index 713a59e3f65b..da7bb441965f 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru = { tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { @@ -189,9 +189,6 @@ stdenv.mkDerivation (finalAttrs: { ]; outputsToInstall = [ "out" - "man" - "shell_integration" - "terminfo" ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; # Issues finding the SDK in the sandbox diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix index 2a3221b08c9e..4ad5562b358c 100644 --- a/pkgs/by-name/gh/ghostunnel/package.nix +++ b/pkgs/by-name/gh/ghostunnel/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, lib, nixosTests, + apple-sdk_12, + darwinMinVersionHook, }: buildGoModule rec { @@ -17,16 +19,20 @@ buildGoModule rec { hash = "sha256-NnRm1HEdfK6WI5ntilLSwdR2B5czG5CIcMFzl2TzEds="; }; - vendorHash = null; + vendorHash = "sha256-vP8OtjpYNMm1KkNfD3pmNrHh3HRy1GkzUbfLKWKhHbo="; deleteVendor = true; - # The certstore directory isn't recognized as a subpackage, but is when moved - # into the vendor directory. - postUnpack = '' - mkdir -p $sourceRoot/vendor/ghostunnel - mv $sourceRoot/certstore $sourceRoot/vendor/ghostunnel/ - ''; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_12 + (darwinMinVersionHook "12.0") + ]; + + # These tests don't exist for Linux, and on Darwin they attempt to use the macOS Keychain + # which doesn't work from a nix build. Presumably other platform implementations of the + # certstore would have similar issues, so it probably makes sense to skip them in + # general wherever they are available. + checkFlags = [ "-skip=^Test(ImportDelete|Signer|Certificate)(RSA|ECDSA|EC)$" ]; passthru.tests = { nixos = nixosTests.ghostunnel; @@ -34,12 +40,14 @@ buildGoModule rec { }; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; description = "TLS proxy with mutual authentication support for securing non-TLS backend applications"; homepage = "https://github.com/ghostunnel/ghostunnel#readme"; changelog = "https://github.com/ghostunnel/ghostunnel/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ roberth ]; + maintainers = with maintainers; [ + roberth + mjm + ]; mainProgram = "ghostunnel"; }; } diff --git a/pkgs/by-name/gh/ghq/package.nix b/pkgs/by-name/gh/ghq/package.nix index a096a25db3e7..705cbfab18a5 100644 --- a/pkgs/by-name/gh/ghq/package.nix +++ b/pkgs/by-name/gh/ghq/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + installShellFiles, testers, nix-update-script, ghq, @@ -9,13 +10,13 @@ buildGoModule rec { pname = "ghq"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; - rev = "v${version}"; - sha256 = "sha256-5elUUZxhKZArtToEDfjYam7GS6m30GpbBLlUNy6dIyo="; + tag = "v${version}"; + sha256 = "sha256-5BN96/RShfJpkfpJe0qrZVDuyFoAV9kgCiBv4REY/5Y="; }; vendorHash = "sha256-jP2Ne/EhmE3tACY1+lHucgBt3VnT4gaQisE3/gVM5Ec="; @@ -26,9 +27,13 @@ buildGoModule rec { "-X=main.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - install -m 444 -D ${src}/misc/zsh/_ghq $out/share/zsh/site-functions/_ghq - install -m 444 -D ${src}/misc/bash/_ghq $out/share/bash-completion/completions/_ghq + installShellCompletion \ + --bash $src/misc/bash/_ghq \ + --fish $src/misc/fish/ghq.fish \ + --zsh $src/misc/zsh/_ghq ''; passthru = { diff --git a/pkgs/by-name/gh/ghunt/package.nix b/pkgs/by-name/gh/ghunt/package.nix index 0f4c42ff05dd..975774ff09fa 100644 --- a/pkgs/by-name/gh/ghunt/package.nix +++ b/pkgs/by-name/gh/ghunt/package.nix @@ -6,20 +6,22 @@ python3.pkgs.buildPythonApplication rec { pname = "ghunt"; - version = "2.1.0"; + version = "2.3.3"; pyproject = true; src = fetchFromGitHub { owner = "mxrch"; repo = "ghunt"; - tag = "v${version}"; - hash = "sha256-UeHVATTyAH3Xdm/NVSUhiicM+tZ4UnLeJsy1jSLK3v8="; + # The newer releases aren't git-tagged to we just take the + # commit with the version bump + rev = "5782248bfd92a24875e112ed0a83e6986d4c70d0"; + hash = "sha256-SQk/hy4r9LIffsu3kxLTv5LCcEvcZkP2jhmPA6Fzo8U="; }; pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ - setuptools + poetry-core ]; propagatedBuildInputs = @@ -29,6 +31,7 @@ python3.pkgs.buildPythonApplication rec { autoslot beautifulsoup4 beautifultable + dnspython geopy httpx humanize @@ -39,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { protobuf python-dateutil rich - trio + rich-argparse packaging ] ++ httpx.optional-dependencies.http2; diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix index 0401fedd1290..b1e6d687cd78 100644 --- a/pkgs/by-name/gi/gi-docgen/package.nix +++ b/pkgs/by-name/gi/gi-docgen/package.nix @@ -56,6 +56,6 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "gi-docgen"; homepage = "https://gitlab.gnome.org/GNOME/gi-docgen"; license = licenses.asl20; # OR GPL-3.0-or-later - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/gi/giara/package.nix b/pkgs/by-name/gi/giara/package.nix index 6c1aab02df9b..5f826a8c2802 100644 --- a/pkgs/by-name/gi/giara/package.nix +++ b/pkgs/by-name/gi/giara/package.nix @@ -9,7 +9,7 @@ wrapGAppsHook4, gtk4, gdk-pixbuf, - webkitgtk_4_0, + webkitgtk_4_1, gtksourceview5, glib-networking, libadwaita, @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk4 gdk-pixbuf - webkitgtk_4_0 + webkitgtk_4_1 gtksourceview5 glib-networking libadwaita diff --git a/pkgs/by-name/gi/gickup/package.nix b/pkgs/by-name/gi/gickup/package.nix index f92f08c9e554..5435cad7659a 100644 --- a/pkgs/by-name/gi/gickup/package.nix +++ b/pkgs/by-name/gi/gickup/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gickup"; - version = "0.10.36"; + version = "0.10.38"; src = fetchFromGitHub { owner = "cooperspencer"; repo = "gickup"; tag = "v${version}"; - hash = "sha256-Os26Il/FhH5cpgpaMZGfOljZ4p3XlCrRPEvzKD6kgpg="; + hash = "sha256-vthr4nkwuhvGXxH2P0uHeuQpjQFNTpGFHF+eXG2jiqk="; }; - vendorHash = "sha256-x+K3qXV0F4OKsldsnNcR5w4fmwYyt7V7IDrcHBNPttI="; + vendorHash = "sha256-RtuEpvux+8oJ829WEvz5OPfnYvFCdNo/9GCXhjXurRM="; ldflags = [ "-X main.version=${version}" ]; diff --git a/pkgs/by-name/gi/gifticlib/package.nix b/pkgs/by-name/gi/gifticlib/package.nix index d20a554c318b..acd9dabbab9e 100644 --- a/pkgs/by-name/gi/gifticlib/package.nix +++ b/pkgs/by-name/gi/gifticlib/package.nix @@ -6,6 +6,7 @@ expat, nifticlib, zlib, + ctestCheckHook, }: stdenv.mkDerivation { @@ -33,11 +34,11 @@ stdenv.mkDerivation { # without the test data, this is only a few basic tests doCheck = !stdenv.hostPlatform.isDarwin; - checkPhase = '' - runHook preCheck - ctest -LE 'NEEDS_DATA' - runHook postCheck - ''; + nativeCheckInputs = [ ctestCheckHook ]; + checkFlags = [ + "-LE" + "NEEDS_DATA" + ]; meta = with lib; { homepage = "https://www.nitrc.org/projects/gifti"; diff --git a/pkgs/by-name/gi/gigedit/package.nix b/pkgs/by-name/gi/gigedit/package.nix index 47b756b6d72b..e2d69f0f8cf7 100644 --- a/pkgs/by-name/gi/gigedit/package.nix +++ b/pkgs/by-name/gi/gigedit/package.nix @@ -15,18 +15,19 @@ libgig, libsndfile, libxslt, + linuxsampler, }: let gtkmm2_with_pango242 = gtkmm2.override { pangomm = pangomm_2_42; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gigedit"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "08db12crwf0dy1dbyrmivqqpg5zicjikqkmf2kb1ywpq0a9hcxrb"; + url = "https://download.linuxsampler.org/packages/gigedit-${finalAttrs.version}.tar.bz2"; + hash = "sha256-pz+2gbVbPytuioXxNHQWE3Pml4r9JfwBIQcsbevWHkQ="; }; preConfigure = "make -f Makefile.svn"; @@ -47,16 +48,17 @@ stdenv.mkDerivation rec { libgig libsndfile libxslt + linuxsampler ]; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "http://www.linuxsampler.org"; description = "Gigasampler file access library"; - license = licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "gigedit"; }; -} +}) diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix index 6370487384b4..a2e97722270e 100644 --- a/pkgs/by-name/gi/gildas/package.nix +++ b/pkgs/by-name/gi/gildas/package.nix @@ -6,13 +6,11 @@ pkg-config, python3, gfortran, - lesstif, cfitsio, getopt, perl, groff, which, - darwin, ncurses, }: @@ -26,8 +24,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "dec24a"; - version = "20241201_a"; + srcVersion = "apr25b"; + version = "20250401_b"; pname = "gildas"; src = fetchurl { @@ -37,7 +35,7 @@ stdenv.mkDerivation rec { "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "sha256-5XKImlE5A6JjA6LLqmGc4IzaMMPoHDo8cUPmgRtnEp0="; + hash = "sha256-MmB50tQsSHjvPWSMw485OOXUIL8TbSkk3JC4gNmGP9E="; }; nativeBuildInputs = [ @@ -49,34 +47,25 @@ stdenv.mkDerivation rec { which ]; - buildInputs = - [ - gtk2-x11 - lesstif - cfitsio - python3Env - ncurses - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ CoreFoundation ] - ); + buildInputs = [ + gtk2-x11 + cfitsio + python3Env + ncurses + ]; patches = [ ./wrapper.patch ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ([ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./clang.patch ./cpp-darwin.patch - ]); + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; # Workaround for https://github.com/NixOS/nixpkgs/issues/304528 env.GAG_CPP = lib.optionalString stdenv.hostPlatform.isDarwin "${gfortran.outPath}/bin/cpp"; - NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks" - ); - configurePhase = '' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python3Env} @@ -85,7 +74,7 @@ stdenv.mkDerivation rec { echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl ''; - userExec = "astro class greg imager mapping sic"; + userExec = "astro class greg mapping sic"; postInstall = '' mkdir -p $out/bin @@ -97,6 +86,8 @@ stdenv.mkDerivation rec { done ''; + passthru.updateScript = ./update.py; + meta = { description = "Radioastronomy data analysis software"; longDescription = '' diff --git a/pkgs/by-name/gi/gildas/update.py b/pkgs/by-name/gi/gildas/update.py new file mode 100755 index 000000000000..7f832232326e --- /dev/null +++ b/pkgs/by-name/gi/gildas/update.py @@ -0,0 +1,148 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.beautifulsoup4 ps.requests ])" + +""" +Update the gildas package in nixpkgs. + +""" + +import re +import subprocess +import requests +import os +from bs4 import BeautifulSoup + + +def to_version(srcVersion): + """ + Convert the source version to the package version + + This function converts the source version from the format "apr25a" + to "20250401_a". + + """ + + months = { + "jan": "01", + "feb": "02", + "mar": "03", + "apr": "04", + "may": "05", + "jun": "06", + "jul": "07", + "aug": "08", + "sep": "09", + "oct": "10", + "nov": "11", + "dec": "12", + } + + month = srcVersion[0:3] + year = srcVersion[3:5] + revision = srcVersion[5:6] + + return f"20{year}{months[month]}01_{revision}" + + +def get_srcVersion(): + """ + Get the available source versions from the gildas website + + """ + + srcVersions = [] + response = requests.get("https://www.iram.fr/~gildas/dist/index.html") + soup = BeautifulSoup(response.text, "html.parser") + pattern = r"^gildas-src-([a-z]{3}\d{2}[a-z])\.tar\.xz$" + for link in soup.find_all("a"): + href = link["href"] + match = re.search(pattern, href) + if match: + srcVersions.append(match.group(1)) + + return srcVersions + + +def find_latest(srcVersions): + """ + Return the latest source version from a list + + """ + + latestVersion = "" + for srcVersion in srcVersions: + version = to_version(srcVersion) + if version > latestVersion: + latest = srcVersion + + return latest + + +def get_hash(srcVersion): + """ + Get the hash of a given source versionn + + """ + + url = f"http://www.iram.fr/~gildas/dist/gildas-src-{srcVersion}.tar.xz" + srcHash = subprocess.check_output(["nix-prefetch-url", url]).decode().strip() + # Convert to SRI representation + srcSRIHash = ( + subprocess.check_output(["nix-hash", "--to-sri", "--type", "sha256", srcHash]) + .decode() + .strip() + ) + return srcSRIHash + + +def get_package_attribute(attr): + """ + Get a package attribute + + """ + + pattern = attr + r'\s*=\s*"([^"]+)";' + with open("package.nix", "r") as f: + for line in f: + match = re.search(pattern, line) + if match: + return match.group(1) + + +def update_package(srcVersion, version, srcHash): + """ + Update the package + + """ + + current_srcVersion = get_package_attribute("srcVersion") + current_version = get_package_attribute("version") + current_hash = get_package_attribute("hash") + + with open("package.nix", "r") as f: + lines = f.readlines() + + with open("package.nix", "w") as f: + for line in lines: + line = line.replace(current_srcVersion, srcVersion) + line = line.replace(current_version, version) + line = line.replace(current_hash, srcHash) + f.write(line) + + +def main(): + os.chdir(os.path.dirname(os.path.abspath(__file__))) # allow to run from anywhere + latest = find_latest(get_srcVersion()) + if latest != get_package_attribute("srcVersion"): + srcVersion = latest + version = to_version(srcVersion) + print(f"Updating gildas to {version}...") + srcHash = get_hash(srcVersion) + update_package(srcVersion, version, srcHash) + print("done") + else: + print("Already up to date") + + +if __name__ == "__main__": + main() diff --git a/pkgs/by-name/gi/gimoji/package.nix b/pkgs/by-name/gi/gimoji/package.nix index ea4c142d369e..d6837ec1452b 100644 --- a/pkgs/by-name/gi/gimoji/package.nix +++ b/pkgs/by-name/gi/gimoji/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-vAhHCNsViYyNSKeSGUL2oIp8bp5UCm8HReyDuoFvfqs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - meta = with lib; { description = "Easily add emojis to your git commit messages"; homepage = "https://github.com/zeenix/gimoji"; diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix index 0e852265f0db..4d9107f2a17c 100644 --- a/pkgs/by-name/gi/ginkgo/package.nix +++ b/pkgs/by-name/gi/ginkgo/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.23.3"; + version = "2.23.4"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-lDSw4BPYZ5wOuaoUtSSkdbcOpKAEuLsSwldrASpM6mA="; + sha256 = "sha256-bTgZHO9dArqYKCqruQPzpiLFtzK9RzxOonwl0SmoNQc="; }; - vendorHash = "sha256-uqpib3k5PtQOsndic0GV1rYBeVlY5Tpg931yHfU6dWI="; + vendorHash = "sha256-iwKOgeUbzlfrto5t0utEdKb+PVqcpmViuDhK2PBAzHw="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/by-name/gi/girara/package.nix b/pkgs/by-name/gi/girara/package.nix new file mode 100644 index 000000000000..a1fdd3de369d --- /dev/null +++ b/pkgs/by-name/gi/girara/package.nix @@ -0,0 +1,92 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + check, + dbus, + xvfb-run, + glib, + gtk3, + gettext, + libiconv, + json-glib, + libintl, + zathura, +}: + +stdenv.mkDerivation rec { + pname = "girara"; + version = "0.4.5"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "pwmt"; + repo = "girara"; + tag = version; + hash = "sha256-XjRmGgljlkvxwcbPmA9ZFAPAjbClSQDdmQU/GFeLLxI="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + check + dbus + glib # for glib-compile-resources + ]; + + buildInputs = [ + libintl + libiconv + json-glib + ]; + + propagatedBuildInputs = [ + glib + gtk3 + ]; + + nativeCheckInputs = [ + xvfb-run + ]; + + doCheck = !stdenv.hostPlatform.isDarwin; + + mesonFlags = [ + "-Ddocs=disabled" # docs do not seem to be installed + (lib.mesonEnable "tests" ( + (stdenv.buildPlatform.canExecute stdenv.hostPlatform) && (!stdenv.hostPlatform.isDarwin) + )) + ]; + + checkPhase = '' + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus}/share/dbus-1/session.conf \ + meson test --print-errorlogs + ''; + + passthru.tests = { + inherit zathura; + }; + + meta = { + homepage = "https://pwmt.org/projects/girara"; + description = "User interface library"; + longDescription = '' + girara is a library that implements a GTK based VIM-like user interface + that focuses on simplicity and minimalism. + ''; + license = lib.licenses.zlib; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = [ ]; + }; +} diff --git a/pkgs/by-name/gi/girouette/package.nix b/pkgs/by-name/gi/girouette/package.nix index 36092e7bb808..11ef95495dd4 100644 --- a/pkgs/by-name/gi/girouette/package.nix +++ b/pkgs/by-name/gi/girouette/package.nix @@ -5,8 +5,6 @@ pkg-config, dbus, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - dbus - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + dbus + openssl + ]; meta = with lib; { description = "Show the weather in the terminal, in style"; diff --git a/pkgs/by-name/gi/git-absorb/package.nix b/pkgs/by-name/gi/git-absorb/package.nix index d0118732755e..4cbe68946f74 100644 --- a/pkgs/by-name/gi/git-absorb/package.nix +++ b/pkgs/by-name/gi/git-absorb/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "tummychow"; repo = "git-absorb"; tag = version; - hash = "sha256-fn4xeXlYl8xB/wjpt7By9tATzb5t58jcuwfqw0tNH7M="; + hash = "sha256-O9bJMYhIyCtztswvL0JQ4ZtsAAI9TlHzWDeGdTHEmP4="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-PC040PtMK0OUS4zlLoHPcSzgEw5H3kndnVuyME/jEz4="; + cargoHash = "sha256-QBZItmKH9b2KwHR88MotyIT2krZl5QQFLvUmPmbxl4U="; nativeCheckInputs = [ gitMinimal @@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec { description = "git commit --fixup, but automatic"; license = [ licenses.bsd3 ]; maintainers = with maintainers; [ - tomfitzhenry matthiasbeyer ]; mainProgram = "git-absorb"; diff --git a/pkgs/by-name/gi/git-agecrypt/package.nix b/pkgs/by-name/gi/git-agecrypt/package.nix index 5136e112ffee..95e48e29d5e6 100644 --- a/pkgs/by-name/gi/git-agecrypt/package.nix +++ b/pkgs/by-name/gi/git-agecrypt/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, libgit2, git, pkg-config, @@ -32,7 +30,7 @@ rustPlatform.buildRustPackage { buildInputs = [ libgit2 zlib - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; meta = with lib; { description = "Alternative to git-crypt using age instead of GPG"; diff --git a/pkgs/by-name/gi/git-annex-utils/package.nix b/pkgs/by-name/gi/git-annex-utils/package.nix deleted file mode 100644 index a43e778d2b24..000000000000 --- a/pkgs/by-name/gi/git-annex-utils/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - autoconf, - automake, - libtool, - gmp, -}: - -stdenv.mkDerivation { - pname = "git-annex-utils"; - version = "0.04-3-g531bb33"; - src = fetchgit { - url = "http://git.mysteryvortex.com/repositories/git-annex-utils.git"; - rev = "531bb33"; - sha256 = "1sv7s2ykc840cjwbfn7ayy743643x9i1lvk4cd55w9l052xvzj65"; - }; - nativeBuildInputs = [ - autoconf - automake - ]; - buildInputs = [ - libtool - gmp - ]; - preConfigure = "./autogen.sh"; - - meta = { - description = "gadu, a du like utility for annexed files"; - longDescription = '' - This is a set of utilities that are handy to use with git-annex repositories. - Currently there is only one utility gadu, a du like utility for annexed files. - ''; - homepage = "https://git-annex.mysteryvortex.com/git-annex-utils.html"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ woffs ]; - mainProgram = "gadu"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/by-name/gi/git-bug-migration/package.nix b/pkgs/by-name/gi/git-bug-migration/package.nix index 9bc2f1b30f41..4adcc8293f88 100644 --- a/pkgs/by-name/gi/git-bug-migration/package.nix +++ b/pkgs/by-name/gi/git-bug-migration/package.nix @@ -34,7 +34,10 @@ buildGoModule rec { description = "Tool for upgrading repositories using git-bug to new versions"; homepage = "https://github.com/MichaelMure/git-bug-migration"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ DeeUnderscore ]; + maintainers = with maintainers; [ + DeeUnderscore + sudoforge + ]; mainProgram = "git-bug-migration"; }; } diff --git a/pkgs/by-name/gi/git-bug/package.nix b/pkgs/by-name/gi/git-bug/package.nix index 5423593e92de..084287222fba 100644 --- a/pkgs/by-name/gi/git-bug/package.nix +++ b/pkgs/by-name/gi/git-bug/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-bug"; - version = "0.8.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "git-bug"; repo = "git-bug"; rev = "v${version}"; - sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8"; + sha256 = "sha256-iLYhVv6QMZStuNtxvvIylFSVb1zLfC58NU2QJChFfug="; }; - vendorHash = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE="; + vendorHash = "sha256-qztAkP+CHhryhfv1uKHEpDutofMwHGun7Vr30BHWAOE="; nativeBuildInputs = [ installShellFiles ]; @@ -28,9 +28,9 @@ buildGoModule rec { ]; ldflags = [ - "-X github.com/MichaelMure/git-bug/commands.GitCommit=v${version}" - "-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}" - "-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}" + "-X github.com/git-bug/git-bug/commands.GitCommit=v${version}" + "-X github.com/git-bug/git-bug/commands.GitLastTag=${version}" + "-X github.com/git-bug/git-bug/commands.GitExactTag=${version}" ]; postInstall = '' diff --git a/pkgs/by-name/gi/git-chain/package.nix b/pkgs/by-name/gi/git-chain/package.nix index 32bdb30fc5f5..54957d139fbb 100644 --- a/pkgs/by-name/gi/git-chain/package.nix +++ b/pkgs/by-name/gi/git-chain/package.nix @@ -6,8 +6,6 @@ openssl, git, nix-update-script, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -26,14 +24,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - ] - ); + buildInputs = [ openssl ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/gi/git-codereview/package.nix b/pkgs/by-name/gi/git-codereview/package.nix index a732301b1f43..8adeea2c21d0 100644 --- a/pkgs/by-name/gi/git-codereview/package.nix +++ b/pkgs/by-name/gi/git-codereview/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-ZKu/roqkTIJWwvgKWrrDN5UL53n7QVsUqpqtXnunwiQ="; + hash = "sha256-CMe7xnR/cCjphuSI0/I0zqHehkRFX6DhLFpQNKwFErU="; }; vendorHash = null; diff --git a/pkgs/by-name/gi/git-cola/package.nix b/pkgs/by-name/gi/git-cola/package.nix index ee9ef77c5dc2..caf300283fa0 100644 --- a/pkgs/by-name/gi/git-cola/package.nix +++ b/pkgs/by-name/gi/git-cola/package.nix @@ -7,6 +7,8 @@ git, qt5, versionCheckHook, + copyDesktopItems, + imagemagick, nix-update-script, }: @@ -38,7 +40,8 @@ python3Packages.buildPythonApplication rec { gettext qt5.wrapQtAppsHook python3Packages.setuptools-scm - ]; + imagemagick + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; nativeCheckInputs = [ git @@ -57,6 +60,19 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; + desktopItems = [ + "share/applications/git-cola-folder-handler.desktop" + "share/applications/git-cola.desktop" + "share/applications/git-dag.desktop" + ]; + + postInstall = '' + for i in 16 24 48 64 96 128 256 512; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + magick cola/icons/git-cola.svg -background none -resize ''${i}x''${i} $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + done + ''; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/gi/git-credential-oauth/package.nix b/pkgs/by-name/gi/git-credential-oauth/package.nix index 008deae36e63..b2ebb484bbc3 100644 --- a/pkgs/by-name/gi/git-credential-oauth/package.nix +++ b/pkgs/by-name/gi/git-credential-oauth/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-u5lTl0vZLf8P6k/W4I4qhiUPrIEsynEP0rbQt8pIEWM="; + hash = "sha256-9AoIyQ05Y/usG0Tlehn7U8zjBxC1BYNjNVRtgWgzLbo="; }; nativeBuildInputs = [ installShellFiles ]; @@ -24,7 +24,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - vendorHash = "sha256-muK8UZW+8bhC6K0FvN6B7evTMeZnMeYlrIMJdJprPLM="; + vendorHash = "sha256-g6HT0hmY2RQceSOigH2bVj1jXYhXq95xL0Qak7TMx0o="; postInstall = '' installManPage $src/git-credential-oauth.1 diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix index f98afaf57f86..c3190b1517b3 100644 --- a/pkgs/by-name/gi/git-dive/package.nix +++ b/pkgs/by-name/gi/git-dive/package.nix @@ -6,8 +6,6 @@ libgit2, oniguruma, zlib, - stdenv, - darwin, gitMinimal, }: @@ -29,15 +27,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - oniguruma - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + oniguruma + zlib + ]; nativeCheckInputs = [ gitMinimal diff --git a/pkgs/applications/version-management/git-fame/Gemfile b/pkgs/by-name/gi/git-fame/Gemfile similarity index 100% rename from pkgs/applications/version-management/git-fame/Gemfile rename to pkgs/by-name/gi/git-fame/Gemfile diff --git a/pkgs/by-name/gi/git-fame/Gemfile.lock b/pkgs/by-name/gi/git-fame/Gemfile.lock new file mode 100644 index 000000000000..a74973e59a0e --- /dev/null +++ b/pkgs/by-name/gi/git-fame/Gemfile.lock @@ -0,0 +1,107 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (8.0.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) + concurrent-ruby (1.3.5) + connection_pool (2.5.3) + drb (2.2.1) + dry-core (1.1.0) + concurrent-ruby (~> 1.0) + logger + zeitwerk (~> 2.6) + dry-inflector (1.2.0) + dry-initializer (3.2.0) + dry-logic (1.6.0) + bigdecimal + concurrent-ruby (~> 1.0) + dry-core (~> 1.1) + zeitwerk (~> 2.6) + dry-struct (1.8.0) + dry-core (~> 1.1) + dry-types (~> 1.8, >= 1.8.2) + ice_nine (~> 0.11) + zeitwerk (~> 2.6) + dry-types (1.8.2) + bigdecimal (~> 3.0) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0) + dry-inflector (~> 1.0) + dry-logic (~> 1.4) + zeitwerk (~> 2.6) + equatable (0.5.0) + git_fame (3.2.19) + activesupport (>= 7, < 9) + dry-initializer (~> 3.0) + dry-struct (~> 1.0) + dry-types (~> 1.0) + neatjson (~> 0.9) + rugged (~> 1.0) + tty-box (~> 0.5) + tty-option (~> 0.2) + tty-screen (~> 0.5) + tty-spinner (~> 0.9) + tty-table (~> 0.9, <= 0.10.0) + zeitwerk (~> 2.0) + i18n (1.14.7) + concurrent-ruby (~> 1.0) + ice_nine (0.11.2) + logger (1.7.0) + minitest (5.25.5) + neatjson (0.10.5) + necromancer (0.4.0) + pastel (0.7.2) + equatable (~> 0.5.0) + tty-color (~> 0.4.0) + rugged (1.9.0) + securerandom (0.4.1) + strings (0.1.8) + strings-ansi (~> 0.1) + unicode-display_width (~> 1.5) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + tty-box (0.5.0) + pastel (~> 0.7.2) + strings (~> 0.1.6) + tty-cursor (~> 0.7) + tty-color (0.4.3) + tty-cursor (0.7.1) + tty-option (0.3.0) + tty-screen (0.6.5) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + tty-table (0.10.0) + equatable (~> 0.5.0) + necromancer (~> 0.4.0) + pastel (~> 0.7.2) + strings (~> 0.1.0) + tty-screen (~> 0.6.4) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (1.8.0) + unicode_utils (1.4.0) + uri (1.0.3) + zeitwerk (2.7.2) + +PLATFORMS + ruby + +DEPENDENCIES + git_fame + +BUNDLED WITH + 2.6.6 diff --git a/pkgs/by-name/gi/git-fame/gemset.nix b/pkgs/by-name/gi/git-fame/gemset.nix new file mode 100644 index 000000000000..fc0b1c3d9a2c --- /dev/null +++ b/pkgs/by-name/gi/git-fame/gemset.nix @@ -0,0 +1,459 @@ +{ + activesupport = { + dependencies = [ + "base64" + "benchmark" + "bigdecimal" + "concurrent-ruby" + "connection_pool" + "drb" + "i18n" + "logger" + "minitest" + "securerandom" + "tzinfo" + "uri" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5"; + type = "gem"; + }; + version = "8.0.2"; + }; + base64 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; + }; + bigdecimal = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; + type = "gem"; + }; + version = "3.1.9"; + }; + concurrent-ruby = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; + type = "gem"; + }; + version = "1.3.5"; + }; + connection_pool = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; + type = "gem"; + }; + version = "2.5.3"; + }; + drb = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; + }; + dry-core = { + dependencies = [ + "concurrent-ruby" + "logger" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15di39ssfkwigyyqla65n4x6cfhgwa4cv8j5lmyrlr07jwd840q9"; + type = "gem"; + }; + version = "1.1.0"; + }; + dry-inflector = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0blgyg9l4gpzhb7rs9hqq9j7br80ngiigjp2ayp78w6m1ysx1x92"; + type = "gem"; + }; + version = "1.2.0"; + }; + dry-initializer = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qy4cv0j0ahabprdbp02nc3r1606jd5dp90lzqg0mp0jz6c9gm9p"; + type = "gem"; + }; + version = "3.2.0"; + }; + dry-logic = { + dependencies = [ + "bigdecimal" + "concurrent-ruby" + "dry-core" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18nf8mbnhgvkw34drj7nmvpx2afmyl2nyzncn3wl3z4h1yyfsvys"; + type = "gem"; + }; + version = "1.6.0"; + }; + dry-struct = { + dependencies = [ + "dry-core" + "dry-types" + "ice_nine" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ri9iqxknxvvhpbshf6jn7bq581k8l67iv23mii69yr4k5aqphvl"; + type = "gem"; + }; + version = "1.8.0"; + }; + dry-types = { + dependencies = [ + "bigdecimal" + "concurrent-ruby" + "dry-core" + "dry-inflector" + "dry-logic" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03zcngwfpq0nx9wmxma0s1c6sb3xxph93q8j7dy75721d7d9lkn8"; + type = "gem"; + }; + version = "1.8.2"; + }; + equatable = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x"; + type = "gem"; + }; + version = "0.5.0"; + }; + git_fame = { + dependencies = [ + "activesupport" + "dry-initializer" + "dry-struct" + "dry-types" + "neatjson" + "rugged" + "tty-box" + "tty-option" + "tty-screen" + "tty-spinner" + "tty-table" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1891k7v2ld5p9v9zlc80s7qkqdxs1wpw6m40gx1wr273n177jal8"; + type = "gem"; + }; + version = "3.2.19"; + }; + i18n = { + dependencies = [ "concurrent-ruby" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; + type = "gem"; + }; + version = "1.14.7"; + }; + ice_nine = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; + type = "gem"; + }; + version = "0.11.2"; + }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; + minitest = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; + type = "gem"; + }; + version = "5.25.5"; + }; + neatjson = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wm1lq8yl6rzysh3wg6fa55w5534k6ppiz0qb7jyvdy582mk5i0s"; + type = "gem"; + }; + version = "0.10.5"; + }; + necromancer = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz"; + type = "gem"; + }; + version = "0.4.0"; + }; + pastel = { + dependencies = [ + "equatable" + "tty-color" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1"; + type = "gem"; + }; + version = "0.7.2"; + }; + rugged = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz"; + type = "gem"; + }; + version = "1.9.0"; + }; + securerandom = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; + type = "gem"; + }; + version = "0.4.1"; + }; + strings = { + dependencies = [ + "strings-ansi" + "unicode-display_width" + "unicode_utils" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0"; + type = "gem"; + }; + version = "0.1.8"; + }; + strings-ansi = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; + type = "gem"; + }; + version = "0.2.0"; + }; + tty-box = { + dependencies = [ + "pastel" + "strings" + "tty-cursor" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14g63v0jx87hba50rlv3c521zg9rw0f5d31cihcvym19xxa7v3l5"; + type = "gem"; + }; + version = "0.5.0"; + }; + tty-color = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk"; + type = "gem"; + }; + version = "0.4.3"; + }; + tty-cursor = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-option = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "019ir4bcr8fag7dmq7ph6ilpvwjbv4qalip0bz7dlddbd6fk4vjs"; + type = "gem"; + }; + version = "0.3.0"; + }; + tty-screen = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1"; + type = "gem"; + }; + version = "0.6.5"; + }; + tty-spinner = { + dependencies = [ "tty-cursor" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf"; + type = "gem"; + }; + version = "0.9.3"; + }; + tty-table = { + dependencies = [ + "equatable" + "necromancer" + "pastel" + "strings" + "tty-screen" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg"; + type = "gem"; + }; + version = "0.10.0"; + }; + tzinfo = { + dependencies = [ "concurrent-ruby" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; + type = "gem"; + }; + version = "2.0.6"; + }; + unicode-display_width = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + type = "gem"; + }; + version = "1.8.0"; + }; + unicode_utils = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; + type = "gem"; + }; + version = "1.4.0"; + }; + uri = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; + type = "gem"; + }; + version = "1.0.3"; + }; + zeitwerk = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ws6rpyj0y9iadjg1890dwnnbjfdbzxsv6r48zbj7f8yn5y0cbl4"; + type = "gem"; + }; + version = "2.7.2"; + }; +} diff --git a/pkgs/applications/version-management/git-fame/default.nix b/pkgs/by-name/gi/git-fame/package.nix similarity index 100% rename from pkgs/applications/version-management/git-fame/default.nix rename to pkgs/by-name/gi/git-fame/package.nix diff --git a/pkgs/by-name/gi/git-gone/package.nix b/pkgs/by-name/gi/git-gone/package.nix new file mode 100644 index 000000000000..76a8bb0ca03f --- /dev/null +++ b/pkgs/by-name/gi/git-gone/package.nix @@ -0,0 +1,53 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + installShellFiles, + asciidoctor, +}: + +rustPlatform.buildRustPackage rec { + pname = "git-gone"; + version = "1.2.5"; + + src = fetchFromGitHub { + owner = "swsnr"; + repo = "git-gone"; + tag = "v${version}"; + hash = "sha256-4BhFombZCmv/GNG2OcNlWNKTk2h65yKn1ku734gCBCQ="; + }; + + # remove if updating to rust 1.85 + postPatch = '' + substituteInPlace Cargo.toml \ + --replace-fail "[package]" ''$'cargo-features = ["edition2024"]\n[package]' + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-VjnnrVN+uST99paImI1uNj34CNozid7ZiPslJqvmKCs="; + + # remove if updating to rust 1.85 + env.RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + installShellFiles + asciidoctor + ]; + + postInstall = '' + asciidoctor --backend=manpage git-gone.1.adoc -o git-gone.1 + installManPage git-gone.1 + ''; + + meta = { + description = "Cleanup stale Git branches of merge requests"; + homepage = "https://github.com/swsnr/git-gone"; + changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + cafkafk + matthiasbeyer + ]; + mainProgram = "git-gone"; + }; +} diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix index c778dd82857b..2996a06c9853 100644 --- a/pkgs/by-name/gi/git-gr/package.nix +++ b/pkgs/by-name/gi/git-gr/package.nix @@ -6,7 +6,6 @@ rustPlatform, installShellFiles, libiconv, - darwin, nix-update-script, pkg-config, openssl, @@ -40,8 +39,6 @@ rustPlatform.buildRustPackage { lib.optional stdenv.hostPlatform.isLinux openssl ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration ]; postInstall = lib.optionalString canRunGitGr '' diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix index e8937ae98db9..843b1bc8e51c 100644 --- a/pkgs/by-name/gi/git-igitt/package.nix +++ b/pkgs/by-name/gi/git-igitt/package.nix @@ -6,8 +6,6 @@ libgit2, oniguruma, zlib, - stdenv, - darwin, nix-update-script, }: @@ -34,7 +32,7 @@ rustPlatform.buildRustPackage { libgit2 oniguruma zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/by-name/gi/git-ignore/package.nix b/pkgs/by-name/gi/git-ignore/package.nix index 992c25b89a3c..a125753eec39 100644 --- a/pkgs/by-name/gi/git-ignore/package.nix +++ b/pkgs/by-name/gi/git-ignore/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - postInstall = '' assets=$releaseDir/../assets installManPage $assets/git-ignore.1 diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix index 8df608c614fe..42d7b2b17abc 100644 --- a/pkgs/by-name/gi/git-lfs/package.nix +++ b/pkgs/by-name/gi/git-lfs/package.nix @@ -95,7 +95,7 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gi/git-mit/libgit2-update.patch b/pkgs/by-name/gi/git-mit/libgit2-update.patch new file mode 100644 index 000000000000..604636dacd97 --- /dev/null +++ b/pkgs/by-name/gi/git-mit/libgit2-update.patch @@ -0,0 +1,163 @@ +From 3e82a4f5017972c7d28151a468bb71fe7d2279e0 Mon Sep 17 00:00:00 2001 +From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> +Date: Mon, 13 Jan 2025 01:45:12 +0000 +Subject: [PATCH] fix(deps): update rust crate git2 to 0.20.0 + +--- + Cargo.lock | 8 ++++---- + git-mit-config/Cargo.toml | 2 +- + git-mit-install/Cargo.toml | 2 +- + git-mit-relates-to/Cargo.toml | 2 +- + git-mit/Cargo.toml | 2 +- + mit-commit-message-lints/Cargo.toml | 2 +- + mit-commit-msg/Cargo.toml | 2 +- + mit-hook-test-helper/Cargo.toml | 2 +- + mit-pre-commit/Cargo.toml | 2 +- + mit-prepare-commit-msg/Cargo.toml | 2 +- + 10 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 11c858e8..db9e01dd 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -783,9 +783,9 @@ dependencies = [ + + [[package]] + name = "git2" +-version = "0.19.0" ++version = "0.20.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" ++checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff" + dependencies = [ + "bitflags 2.7.0", + "libc", +@@ -1075,9 +1075,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + + [[package]] + name = "libgit2-sys" +-version = "0.17.0+1.8.1" ++version = "0.18.0+1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" ++checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec" + dependencies = [ + "cc", + "libc", +diff --git a/git-mit-config/Cargo.toml b/git-mit-config/Cargo.toml +index aa1fd61e..3ec0cd93 100644 +--- a/git-mit-config/Cargo.toml ++++ b/git-mit-config/Cargo.toml +@@ -15,7 +15,7 @@ mit-lint = "3.2.9" + shell-words = "1.1.0" + thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +diff --git a/git-mit-install/Cargo.toml b/git-mit-install/Cargo.toml +index a7611272..96f58672 100644 +--- a/git-mit-install/Cargo.toml ++++ b/git-mit-install/Cargo.toml +@@ -18,7 +18,7 @@ clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } + + +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + indoc = "2.0.5" +diff --git a/git-mit-relates-to/Cargo.toml b/git-mit-relates-to/Cargo.toml +index d50d2aa9..c6676bf8 100644 +--- a/git-mit-relates-to/Cargo.toml ++++ b/git-mit-relates-to/Cargo.toml +@@ -17,7 +17,7 @@ thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + +diff --git a/git-mit/Cargo.toml b/git-mit/Cargo.toml +index ce108e96..fdda0c55 100644 +--- a/git-mit/Cargo.toml ++++ b/git-mit/Cargo.toml +@@ -17,7 +17,7 @@ thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + +diff --git a/mit-commit-message-lints/Cargo.toml b/mit-commit-message-lints/Cargo.toml +index 623b120b..042d71b6 100644 +--- a/mit-commit-message-lints/Cargo.toml ++++ b/mit-commit-message-lints/Cargo.toml +@@ -18,7 +18,7 @@ time = { version = "0.3.37", features = ["local-offset"] } + glob = "0.3.2" + thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + regex = "1.11.1" + serde_yaml = "0.9.34" +diff --git a/mit-commit-msg/Cargo.toml b/mit-commit-msg/Cargo.toml +index 3b8c626e..2c5e1a4f 100644 +--- a/mit-commit-msg/Cargo.toml ++++ b/mit-commit-msg/Cargo.toml +@@ -16,7 +16,7 @@ tokio = { version = "1.43.0", features = ["full"] } + mit-lint = "3.2.9" + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + miette = { version = "7.4.0", features = [ "fancy" ] } + mit-commit = "3.2.1" +diff --git a/mit-hook-test-helper/Cargo.toml b/mit-hook-test-helper/Cargo.toml +index 44131375..bccd79ab 100644 +--- a/mit-hook-test-helper/Cargo.toml ++++ b/mit-hook-test-helper/Cargo.toml +@@ -14,7 +14,7 @@ description = "Testing help tools for git-mit" + + [dependencies] + tempfile = "3.15.0" +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + +diff --git a/mit-pre-commit/Cargo.toml b/mit-pre-commit/Cargo.toml +index 40ff8a0f..4ce23ff7 100644 +--- a/mit-pre-commit/Cargo.toml ++++ b/mit-pre-commit/Cargo.toml +@@ -16,7 +16,7 @@ thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + mit-commit = "3.2.1" + +diff --git a/mit-prepare-commit-msg/Cargo.toml b/mit-prepare-commit-msg/Cargo.toml +index fcbbcd14..2aa93263 100644 +--- a/mit-prepare-commit-msg/Cargo.toml ++++ b/mit-prepare-commit-msg/Cargo.toml +@@ -19,7 +19,7 @@ miette = { version = "7.4.0", features = [ "fancy" ] } + shell-words = "1.1.0" + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + mit-commit = "3.2.1" + diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix index d0ca3b0f5c00..26cf93af31c2 100644 --- a/pkgs/by-name/gi/git-mit/package.nix +++ b/pkgs/by-name/gi/git-mit/package.nix @@ -7,12 +7,10 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: let - version = "5.14.3"; + version = "5.14.4"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -22,32 +20,25 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-+7rl4wxVQq4bLBsnLSeJD+1kkRuf7FCi81pXGrNNOPI="; + hash = "sha256-8XWwzR9TiSCU6fKbrulKpCDFDEyzQpaT2nrahF8iac8="; }; useFetchCargoVendor = true; cargoPatches = [ - (fetchpatch { - name = "libgit2-update.patch"; - url = "https://github.com/PurpleBooth/git-mit/pull/1543/commits/3e82a4f5017972c7d28151a468bb71fe7d2279e0.patch"; - hash = "sha256-M9RpZHjOpZZqdHQe57LwMZ9zX6/4BNg3ymz8H3qupFk="; - }) + # https://github.com/PurpleBooth/git-mit/pull/1543 + ./libgit2-update.patch ]; - cargoHash = "sha256-uoS6vmHmOVkHS81mrsbbXqP/dAC/FNHAlpTDHSa632k="; + cargoHash = "sha256-B2XRdcwcFxMwnDl5ndIw72OEsn6D2Y8rIoeO4tclJkk="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/gi/git-pr/package.nix b/pkgs/by-name/gi/git-pr/package.nix index eb7b97817832..2edcddc5acf8 100644 --- a/pkgs/by-name/gi/git-pr/package.nix +++ b/pkgs/by-name/gi/git-pr/package.nix @@ -6,26 +6,42 @@ buildGoModule rec { pname = "git-pr"; - version = "0.0.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "picosh"; repo = "git-pr"; rev = "v${version}"; - hash = "sha256-7Ka8p5X8nQBXKiT6QsWOWMQJL8rePKrHz/LZU1W+oQ8="; + hash = "sha256-2A2rP7yr8faVoIYAWprr+t7MwDPerhsuOjWWEl1mhXw="; }; - vendorHash = "sha256-tu5C7hz6UTgn/jCCotXzZHlUmGVNERhA7Osxi31Domk="; + vendorHash = "sha256-7aHr5CWZVmhBiuCXaK49zYJXMufCxZBnS917mF0QJlg="; + + subPackages = [ + "cmd/ssh" + "cmd/web" + ]; + + env.CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + ]; postInstall = '' mv $out/bin/ssh $out/bin/git-ssh + mv $out/bin/web $out/bin/git-web ''; meta = { homepage = "https://pr.pico.sh"; description = "Simple git collaboration tool"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ sigmanificient ]; - mainProgram = "git-pr"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + sigmanificient + jolheiser + ]; + mainProgram = "git-ssh"; }; } diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix index dcb17af0894b..ce67f6958484 100644 --- a/pkgs/by-name/gi/git-prole/package.nix +++ b/pkgs/by-name/gi/git-prole/package.nix @@ -1,12 +1,16 @@ { lib, + stdenv, + buildPackages, fetchFromGitHub, rustPlatform, git, - bash, nix-update-script, + installShellFiles, }: let + emulatorAvailable = stdenv.hostPlatform.emulatorAvailable buildPackages; + emulator = stdenv.hostPlatform.emulator buildPackages; version = "0.5.3"; in rustPlatform.buildRustPackage { @@ -20,14 +24,32 @@ rustPlatform.buildRustPackage { hash = "sha256-QwLkByC8gdAnt6geZS285ErdH8nfV3vsWjMF4hTzq9Y="; }; + buildFeatures = [ "clap_mangen" ]; + useFetchCargoVendor = true; cargoHash = "sha256-qghc8HtJfpTYXAwC2xjq8lLlCu419Ttnu/AYapkAulI="; nativeCheckInputs = [ git - bash ]; + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString emulatorAvailable '' + manpages=$(mktemp -d) + ${emulator} $out/bin/git-prole manpages "$manpages" + for manpage in "$manpages"/*; do + installManPage "$manpage" + done + + installShellCompletion --cmd git-prole \ + --bash <(${emulator} $out/bin/git-prole completions bash) \ + --fish <(${emulator} $out/bin/git-prole completions fish) \ + --zsh <(${emulator} $out/bin/git-prole completions zsh) + ''; + meta = { homepage = "https://github.com/9999years/git-prole"; changelog = "https://github.com/9999years/git-prole/releases/tag/v${version}"; diff --git a/pkgs/by-name/gi/git-ps-rs/package.nix b/pkgs/by-name/gi/git-ps-rs/package.nix new file mode 100644 index 000000000000..9fc49832be9c --- /dev/null +++ b/pkgs/by-name/gi/git-ps-rs/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + dbus, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "git-ps-rs"; + version = "7.3.1"; + + src = fetchFromGitHub { + owner = "uptech"; + repo = "git-ps-rs"; + rev = version; + hash = "sha256-4lk6AHquWKgDk0pBaswbVShZbUDA3wO6cPakhrvrwac="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-QYkEBqDwspdhSliwLwMWmybS9nd41DCjGNURnMzLzBM="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + dbus + ]; + + meta = with lib; { + description = "Tool for working with a stack of patches"; + mainProgram = "gps"; + homepage = "https://git-ps.sh/"; + license = licenses.mit; + maintainers = with maintainers; [ alizter ]; + }; +} diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix index 337821cb3777..41b7a06a50c5 100644 --- a/pkgs/by-name/gi/git-repo/package.nix +++ b/pkgs/by-name/gi/git-repo/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.52"; + version = "2.54"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-x8i09tqxfwek6z351ZJ2l/CdTx1p2EtbHX38Lu8mge0="; + hash = "sha256-rZCpuJ4TpbVbTxq7qHfhokoj7qCj9/YcA9PGgd9ROCg="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/by-name/gi/git-run/package.nix b/pkgs/by-name/gi/git-run/package.nix index a50242ccef3a..5522da1ade2e 100644 --- a/pkgs/by-name/gi/git-run/package.nix +++ b/pkgs/by-name/gi/git-run/package.nix @@ -20,6 +20,15 @@ buildNpmPackage rec { makeCacheWritable = true; dontBuild = true; + postInstall = '' + echo "Removing broken symlinks in node_modules/.bin" + rm -f $out/lib/node_modules/${pname}/node_modules/.bin/_mocha + rm -f $out/lib/node_modules/${pname}/node_modules/.bin/he + rm -f $out/lib/node_modules/${pname}/node_modules/.bin/mkdirp + rm -f $out/lib/node_modules/${pname}/node_modules/.bin/mocha + rm -f $out/lib/node_modules/${pname}/node_modules/.bin/rimraf + ''; + meta = { description = "Multiple git repository management tool"; homepage = "https://mixu.net/gr/"; diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index 5f0667366036..1305f143527f 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -10,16 +10,16 @@ buildGo124Module rec { pname = "git-spice"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; tag = "v${version}"; - hash = "sha256-ew0ehaYXJgc1ePdQCxxfahBdTs5zsiHDfB4SdS2WZ8A="; + hash = "sha256-hqdU0j7H3hhhjGV4lmluG1D6NXNqI80d9gGr5KJ9D+Q="; }; - vendorHash = "sha256-jlCNcjACtms9kI4Lo8AtUfxqODyv4U2nJITGpBNxk9I="; + vendorHash = "sha256-Wi/NNqHnHrfikO0EWDXNdTjPmgHrGSs2k612c0w8OA8="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gi/git-stack/package.nix b/pkgs/by-name/gi/git-stack/package.nix new file mode 100644 index 000000000000..f5e23de6893a --- /dev/null +++ b/pkgs/by-name/gi/git-stack/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + testers, + git-stack, +}: + +rustPlatform.buildRustPackage rec { + pname = "git-stack"; + version = "0.10.18"; + + src = fetchFromGitHub { + owner = "gitext-rs"; + repo = "git-stack"; + rev = "v${version}"; + hash = "sha256-iFoxYq4NHC/K0ruPDXHfayZDglebBJE00V57HUH9Y84="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-338iRd6zoy2O55sZ0h+s6i8kg4yXFBowRQLge9R9Bqs="; + + # Many tests try to access the file system. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = git-stack; + }; + + meta = with lib; { + description = "Stacked branch management for Git"; + homepage = "https://github.com/gitext-rs/git-stack"; + changelog = "https://github.com/gitext-rs/git-stack/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ stehessel ]; + mainProgram = "git-stack"; + }; +} diff --git a/pkgs/by-name/gi/git-stree/package.nix b/pkgs/by-name/gi/git-stree/package.nix deleted file mode 100644 index 3c8d83d6e1c1..000000000000 --- a/pkgs/by-name/gi/git-stree/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - ... -}: - -stdenv.mkDerivation { - pname = "git-stree"; - version = "0.4.5"; - - src = fetchFromGitHub { - owner = "tdd"; - repo = "git-stree"; - rev = "0.4.5"; - sha256 = "0y5h44n38w6rhy9m591dvibxpfggj3q950ll7y4h49bhpks4m0l9"; - }; - - installPhase = '' - mkdir -p $out/bin $out/share/bash-completion/completions - install -m 0755 git-stree $out/bin/ - install -m 0644 git-stree-completion.bash $out/share/bash-completion/completions/ - ''; - - meta = with lib; { - description = "Better Git subtree helper command"; - homepage = "http://deliciousinsights.github.io/git-stree"; - license = licenses.mit; - maintainers = [ maintainers.benley ]; - platforms = platforms.unix; - mainProgram = "git-stree"; - }; -} diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix index 8b56b68280a0..e2a04faa8292 100644 --- a/pkgs/by-name/gi/git-together/package.nix +++ b/pkgs/by-name/gi/git-together/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,7 +18,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.Security; + buildInputs = [ openssl ]; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix index 40decb9bb968..8456432c6c71 100644 --- a/pkgs/by-name/gi/git-town/package.nix +++ b/pkgs/by-name/gi/git-town/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, installShellFiles, @@ -12,13 +13,13 @@ buildGoModule rec { pname = "git-town"; - version = "18.1.0"; + version = "20.1.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; tag = "v${version}"; - hash = "sha256-dx19gzHhCCcdlI80CYhbfKHRS0AQB0DnHphV2mqmI/Y="; + hash = "sha256-RoSLRGi//vk/jp/6rxI//cKdeoNL8nI73ZdeRKDesfs="; }; vendorHash = null; @@ -64,14 +65,16 @@ buildGoModule rec { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - postInstall = '' - installShellCompletion --cmd git-town \ - --bash <($out/bin/git-town completions bash) \ - --fish <($out/bin/git-town completions fish) \ - --zsh <($out/bin/git-town completions zsh) - - wrapProgram $out/bin/git-town --prefix PATH : ${lib.makeBinPath [ git ]} - ''; + postInstall = + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd git-town \ + --bash <($out/bin/git-town completions bash) \ + --fish <($out/bin/git-town completions fish) \ + --zsh <($out/bin/git-town completions zsh) + '' + + '' + wrapProgram $out/bin/git-town --prefix PATH : ${lib.makeBinPath [ git ]} + ''; passthru.tests.version = testers.testVersion { package = git-town; diff --git a/pkgs/by-name/gi/git-unroll/package.nix b/pkgs/by-name/gi/git-unroll/package.nix index 46caf7b662b3..9de46d79497b 100644 --- a/pkgs/by-name/gi/git-unroll/package.nix +++ b/pkgs/by-name/gi/git-unroll/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail \ "#! nix-shell -i bash -p git nix rWrapper rPackages.jsonlite rPackages.processx rPackages.dplyr rPackages.plyr rPackages.stringr -I nixpkgs=." \ "" \ - --replace-fail '"$PWD/pkgs/build-support/fetchgit/nix-prefetch-git",' '"nix-prefetch-git"' + --replace-fail '"$PWD/pkgs/build-support/fetchgit/nix-prefetch-git",' '"nix-prefetch-git",' ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/git-up/package.nix b/pkgs/by-name/gi/git-up/package.nix new file mode 100644 index 000000000000..5e37304382db --- /dev/null +++ b/pkgs/by-name/gi/git-up/package.nix @@ -0,0 +1,61 @@ +{ + lib, + fetchPypi, + python3Packages, + writableTmpDirAsHomeHook, + gitMinimal, +}: + +python3Packages.buildPythonApplication rec { + pname = "git-up"; + version = "2.3.0"; + format = "pyproject"; + + src = fetchPypi { + pname = "git_up"; + inherit version; + hash = "sha256-SncbnK6LxsleKRa/sSCm/8dsgPw/XJGvYfkcIeWYDy4="; + }; + + pythonRelaxDeps = [ + "termcolor" + ]; + + build-system = with python3Packages; [ + poetry-core + ]; + + # required in PATH for tool to work + propagatedBuildInputs = [ gitMinimal ]; + + dependencies = with python3Packages; [ + colorama + gitpython + termcolor + ]; + + nativeCheckInputs = [ + gitMinimal + python3Packages.pytest7CheckHook + writableTmpDirAsHomeHook + ]; + + # git fails without email address + preCheck = '' + git config --global user.email "nobody@example.com" + git config --global user.name "Nobody" + ''; + + postInstall = '' + rm -r $out/${python3Packages.python.sitePackages}/PyGitUp/tests + ''; + + meta = { + homepage = "https://github.com/msiemens/PyGitUp"; + description = "Git pull replacement that rebases all local branches when pulling"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.all; + mainProgram = "git-up"; + }; +} diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix index bc93518ddff1..ddadd1a61a3a 100644 --- a/pkgs/by-name/gi/git-upstream/package.nix +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -6,7 +6,7 @@ }: let pname = "git-upstream"; - version = "1.5.0"; + version = "1.6.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage { owner = "9999years"; repo = pname; tag = "v${version}"; - hash = "sha256-ooqz2Xp/nljx2+zQsc/RjVbGG/5YTeggU6pB8lGK0o8="; + hash = "sha256-rdxpo1OZD/fpBm76zD7U/YeZOBpliKXJN87LJkw6A28="; }; useFetchCargoVendor = true; - cargoHash = "sha256-oIrUjb+yJgDR5GYrG3hPLpXYJynR9eeX00emcrcjmZY="; + cargoHash = "sha256-7h0aWb7xJjDJedQp9xXc+deW0hM+qBJcG36Sd8fo+Fg="; meta = { homepage = "https://github.com/9999years/git-upstream"; diff --git a/pkgs/by-name/gi/git-wait/package.nix b/pkgs/by-name/gi/git-wait/package.nix index 8288a70d3c06..f5417c49b36c 100644 --- a/pkgs/by-name/gi/git-wait/package.nix +++ b/pkgs/by-name/gi/git-wait/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, git, }: @@ -22,11 +21,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-tA0WjghBB2K71IlZ1u9K67tZWGe9VNFOfI2YdrqCUw0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - ]; - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=tests::wait_if_index_lock_is_present" ]; diff --git a/pkgs/by-name/gi/git-who/package.nix b/pkgs/by-name/gi/git-who/package.nix index bc646ec29ff6..2d56258c1bc6 100644 --- a/pkgs/by-name/gi/git-who/package.nix +++ b/pkgs/by-name/gi/git-who/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "git-who"; - version = "0.7"; + version = "1.0"; src = fetchFromGitHub { owner = "sinclairtarget"; repo = "git-who"; rev = "v${version}"; - hash = "sha256-64Hb2+ZCXJis19V0WDyZ0SHZX99Dqxr3UGQTQZSCAp8="; + hash = "sha256-xJHFPf3w+6jh6vPTg4ggq652lANZkBBkKsmkvWx48ZU="; }; vendorHash = "sha256-e2P7szjtAn4EFTy+eGi/9cYf/Raw/7O+PbYEOD8i3Hs="; diff --git a/pkgs/by-name/gi/gitSetupHook/gitSetupHook.sh b/pkgs/by-name/gi/gitSetupHook/gitSetupHook.sh new file mode 100644 index 000000000000..92f56afd4970 --- /dev/null +++ b/pkgs/by-name/gi/gitSetupHook/gitSetupHook.sh @@ -0,0 +1,10 @@ +# shellcheck shell=bash + +gitSetup () { + GIT_CONFIG_GLOBAL=$(mktemp -t gitconfig.XXXXXX) + export GIT_CONFIG_GLOBAL + @gitMinimal@ config --global user.name GitSetupHook + @gitMinimal@ config --global user.email GitSetupHook@nixpkgs.invalid +} + +postHooks+=(gitSetup) diff --git a/pkgs/by-name/gi/gitSetupHook/package.nix b/pkgs/by-name/gi/gitSetupHook/package.nix new file mode 100644 index 000000000000..b03b6490366d --- /dev/null +++ b/pkgs/by-name/gi/gitSetupHook/package.nix @@ -0,0 +1,14 @@ +{ + lib, + gitMinimal, + makeSetupHook, +}: + +makeSetupHook { + name = "gitSetupHook"; + + substitutions = { + gitMinimal = lib.getExe gitMinimal; + }; + +} ./gitSetupHook.sh diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix index 03f5377faced..654c710d0da8 100644 --- a/pkgs/by-name/gi/gitaly/git.nix +++ b/pkgs/by-name/gi/gitaly/git.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "gitaly-git"; - version = "2.47.2"; + version = "2.49.0.gl2"; # `src` attribute for nix-update src = fetchFromGitLab { owner = "gitlab-org"; repo = "git"; rev = "v${version}"; - hash = "sha256-6KI8V6TDh8DYizvHFeaXBz5HlEPLNQzEZAEplVsvZUc="; + hash = "sha256-1y94T5UBG7s76ENsUmaXRXngSKmqIAT0nq1u+QjSWaY="; }; # we actually use the gitaly build system @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { description = "Distributed version control system - with Gitaly patches"; license = lib.licenses.gpl2Only; platforms = lib.platforms.all; - maintainers = lib.teams.gitlab.members; + teams = [ lib.teams.gitlab ]; }; } diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 59a5dfa0729b..9cd4bb609d5d 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "17.10.1"; + version = "18.0.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,10 +21,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-uyXxNuHQUlXCNQcrEIoaJXpatfM5fcIk5MCNYt8QW9A="; + hash = "sha256-yVDe5X/WGkfWdSEWEZZqjykZNz0mJ52tPHLabGDThOk="; }; - vendorHash = "sha256-umtSuLQiohSarzZDU7tHEYI6t8B7MlkaDu8//fnr1Ms="; + vendorHash = "sha256-PXONynRY5ZLQO2yQdtljDmLhVBIgfEYmyez9pIm9vtw="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" @@ -77,7 +77,7 @@ buildGoModule ( homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.linux ++ [ "x86_64-darwin" ]; - maintainers = teams.gitlab.members; + teams = [ teams.gitlab ]; license = licenses.mit; }; } diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index ba45fa023374..83cd155efe1c 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -35,13 +35,13 @@ in rustPlatform.buildRustPackage rec { pname = "gitbutler"; - version = "0.14.14"; + version = "0.14.19"; src = fetchFromGitHub { owner = "gitbutlerapp"; repo = "gitbutler"; tag = "release/${version}"; - hash = "sha256-GBQNk31rgNgAntur5DjmG4CKWvwvbpfaT2T6H7XMHQ0="; + hash = "sha256-NopuZbgF2jdwuf/p/JzubS0IM5xBnlkh9Tj234auBnE="; }; # Let Tauri know what version we're building @@ -60,11 +60,11 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-nKBCoKqq93fV3O4imX3sHYj5QnycIWDKvYyOB7Daeo8="; + cargoHash = "sha256-wzSRUZeB5f9Z/D+Sa5Nl77jh7GDnnUehcmwanPcaSKM="; pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-ogCr2gzxox6UkFgaWTgZaEba5l++nzvuZa0NeRexnko="; + hash = "sha256-5NtfstUuIYyntt09Mu9GAFAOImfO6VMmJ7g15kvGaLE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 5420ca4ae351..7ed93ca95ec7 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -35,18 +35,18 @@ let in buildGoModule rec { pname = "gitea"; - version = "1.23.6"; + version = "1.23.8"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; tag = "v${gitea.version}"; - hash = "sha256-psVny0qmx2wPiNK1qIXQiW0gdRsZs16MEfIgBXTWgFI="; + hash = "sha256-79GSHJozNlzBkddeyKX36D/w73loEN28fNSbcMVhgxQ="; }; proxyVendor = true; - vendorHash = "sha256-h9RnHv4weGfHwpmuEhQbsYDd5fKc439m0gF/BgDVIdA="; + vendorHash = "sha256-wdrFa+6E1qTW9PBXr7ROgBQn3nfgxZF7Z47yk61Iqvs="; outputs = [ "out" diff --git a/pkgs/by-name/gi/github-linguist/Gemfile.lock b/pkgs/by-name/gi/github-linguist/Gemfile.lock new file mode 100644 index 000000000000..d7bc2ce11774 --- /dev/null +++ b/pkgs/by-name/gi/github-linguist/Gemfile.lock @@ -0,0 +1,99 @@ +PATH + remote: . + specs: + github-linguist (9.1.0) + cgi + charlock_holmes (~> 0.7.7) + mini_mime (~> 1.0) + rugged (~> 1.0) + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + byebug (12.0.0) + cgi (0.4.2) + charlock_holmes (0.7.9) + coderay (1.1.3) + dotenv (3.1.8) + faraday (2.13.1) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + json (2.11.3) + licensed (4.5.0) + json (~> 2.6) + licensee (~> 9.16) + parallel (~> 1.22) + pathname-common_prefix (~> 0.0.1) + reverse_markdown (~> 2.1) + ruby-xxHash (~> 0.4.0) + thor (~> 1.2) + tomlrb (~> 2.0) + licensee (9.18.0) + dotenv (>= 2, < 4) + octokit (>= 4.20, < 10.0) + reverse_markdown (>= 1, < 4) + rugged (>= 0.24, < 2.0) + thor (>= 0.19, < 2.0) + logger (1.7.0) + method_source (1.1.0) + mini_mime (1.1.5) + mini_portile2 (2.8.8) + minitest (5.25.5) + mocha (2.7.1) + ruby2_keywords (>= 0.0.5) + net-http (0.6.0) + uri + nokogiri (1.18.8) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + octokit (9.2.0) + faraday (>= 1, < 3) + sawyer (~> 0.9) + parallel (1.27.0) + pathname-common_prefix (0.0.2) + plist (3.7.2) + pry (0.15.2) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (6.0.1) + racc (1.8.1) + rake (13.2.1) + rake-compiler (0.9.9) + rake + reverse_markdown (2.1.1) + nokogiri + ruby-xxHash (0.4.0.2) + ruby2_keywords (0.0.5) + rugged (1.9.0) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + thor (1.3.2) + tomlrb (2.0.3) + uri (1.0.3) + yajl-ruby (1.4.3) + +PLATFORMS + ruby + +DEPENDENCIES + bundler (~> 2.0) + byebug + github-linguist! + licensed (~> 4.0) + licensee (~> 9.15) + minitest (~> 5.15) + mocha (~> 2.1) + plist (~> 3.1) + pry (~> 0.14) + rake (~> 13.0) + rake-compiler (~> 0.9) + yajl-ruby (~> 1.4) + +BUNDLED WITH + 2.5.22 diff --git a/pkgs/by-name/gi/github-linguist/gemset.nix b/pkgs/by-name/gi/github-linguist/gemset.nix new file mode 100644 index 000000000000..e309d511c036 --- /dev/null +++ b/pkgs/by-name/gi/github-linguist/gemset.nix @@ -0,0 +1,503 @@ +{ + addressable = { + dependencies = [ "public_suffix" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; + type = "gem"; + }; + version = "2.8.7"; + }; + byebug = { + groups = [ "debug" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07hsr9zzl2mvf5gk65va4smdizlk9rsiz8wwxik0p96cj79518fl"; + type = "gem"; + }; + version = "12.0.0"; + }; + cgi = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rj7agrnd1a4282vg13qkpwky0379svdb2z2lc0wl8588q6ikjx3"; + type = "gem"; + }; + version = "0.4.2"; + }; + charlock_holmes = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml"; + type = "gem"; + }; + version = "0.7.9"; + }; + coderay = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; + type = "gem"; + }; + version = "1.1.3"; + }; + dotenv = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy"; + type = "gem"; + }; + version = "3.1.8"; + }; + faraday = { + dependencies = [ + "faraday-net_http" + "json" + "logger" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc"; + type = "gem"; + }; + version = "2.13.1"; + }; + faraday-net_http = { + dependencies = [ "net-http" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; + type = "gem"; + }; + version = "3.4.0"; + }; + github-linguist = { + dependencies = [ + "cgi" + "charlock_holmes" + "mini_mime" + "rugged" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = ./.; + type = "path"; + }; + version = "9.1.0"; + }; + json = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s"; + type = "gem"; + }; + version = "2.11.3"; + }; + licensed = { + dependencies = [ + "json" + "licensee" + "parallel" + "pathname-common_prefix" + "reverse_markdown" + "ruby-xxHash" + "thor" + "tomlrb" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hyphm8wyijpbz4wy2cyl6whxd66y2c9dqrljirl397gc08idykk"; + type = "gem"; + }; + version = "4.5.0"; + }; + licensee = { + dependencies = [ + "dotenv" + "octokit" + "reverse_markdown" + "rugged" + "thor" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xyzk7gzi91l6xlwfvf2z0963jwd2csf987yk0ffbr5p9ycdp0ry"; + type = "gem"; + }; + version = "9.18.0"; + }; + logger = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; + method_source = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1igmc3sq9ay90f8xjvfnswd1dybj1s3fi0dwd53inwsvqk4h24qq"; + type = "gem"; + }; + version = "1.1.0"; + }; + mini_mime = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; + type = "gem"; + }; + version = "1.1.5"; + }; + mini_portile2 = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; + type = "gem"; + }; + version = "2.8.8"; + }; + minitest = { + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; + type = "gem"; + }; + version = "5.25.5"; + }; + mocha = { + dependencies = [ "ruby2_keywords" ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lgqyxxdxgfik77a7lk2hjkr6flimgxr4gcbg3y7bg1ybn6m6zcg"; + type = "gem"; + }; + version = "2.7.1"; + }; + net-http = { + dependencies = [ "uri" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; + type = "gem"; + }; + version = "0.6.0"; + }; + nokogiri = { + dependencies = [ + "mini_portile2" + "racc" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c"; + type = "gem"; + }; + version = "1.18.8"; + }; + octokit = { + dependencies = [ + "faraday" + "sawyer" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05j3gz79gxkid3lc2balyllqik4v4swnm0rcvxz14m76bkrpz92g"; + type = "gem"; + }; + version = "9.2.0"; + }; + parallel = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa"; + type = "gem"; + }; + version = "1.27.0"; + }; + pathname-common_prefix = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "034gjbcqrf940199k28kfqbs4dwwf4slah7l9qj0n9wk4vj8bjfk"; + type = "gem"; + }; + version = "0.0.2"; + }; + plist = { + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hlaf4b3d8grxm9fqbnam5gwd55wvghl0jyzjd1hc5hirhklaynk"; + type = "gem"; + }; + version = "3.7.2"; + }; + pry = { + dependencies = [ + "coderay" + "method_source" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ssv704qg75mwlyagdfr9xxbzn1ziyqgzm0x474jkynk8234pm8j"; + type = "gem"; + }; + version = "0.15.2"; + }; + public_suffix = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; + type = "gem"; + }; + version = "6.0.1"; + }; + racc = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; + type = "gem"; + }; + version = "1.8.1"; + }; + rake = { + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; + type = "gem"; + }; + version = "13.2.1"; + }; + rake-compiler = { + dependencies = [ "rake" ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1j166viy5491wawqn49fdaazwwrmkrr85c90qq92z3sdyzn8y9sa"; + type = "gem"; + }; + version = "0.9.9"; + }; + reverse_markdown = { + dependencies = [ "nokogiri" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0087vhw5ik50lxvddicns01clkx800fk5v5qnrvi3b42nrk6885j"; + type = "gem"; + }; + version = "2.1.1"; + }; + ruby-xxHash = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1106y8dvfsrvg7ph4kagbzsd2pbm4fsggv7amcrbrl0vxh2q6790"; + type = "gem"; + }; + version = "0.4.0.2"; + }; + ruby2_keywords = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + rugged = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz"; + type = "gem"; + }; + version = "1.9.0"; + }; + sawyer = { + dependencies = [ + "addressable" + "faraday" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; + type = "gem"; + }; + version = "0.9.2"; + }; + thor = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; + type = "gem"; + }; + version = "1.3.2"; + }; + tomlrb = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1xyl2nlfm39lklyaf0p7zj9psr60jvrlyfh26hrpk7wi4k7nlwy2"; + type = "gem"; + }; + version = "2.0.3"; + }; + uri = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; + type = "gem"; + }; + version = "1.0.3"; + }; + yajl-ruby = { + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lni4jbyrlph7sz8y49q84pb0sbj82lgwvnjnsiv01xf26f4v5wc"; + type = "gem"; + }; + version = "1.4.3"; + }; +} diff --git a/pkgs/by-name/gi/github-linguist/package.nix b/pkgs/by-name/gi/github-linguist/package.nix new file mode 100644 index 000000000000..d6f8864e943d --- /dev/null +++ b/pkgs/by-name/gi/github-linguist/package.nix @@ -0,0 +1,60 @@ +{ + lib, + fetchFromGitHub, + buildRubyGem, + bundlerEnv, + ruby, +}: + +let + gemName = "github-linguist"; + version = "9.1.0"; + src = fetchFromGitHub { + owner = "github-linguist"; + repo = "linguist"; + tag = "v${version}"; + hash = "sha256-nPIUo6yQY6WvKuXvT1oOx6LZq49QLa9YIJmOrRYgAdg="; + }; + + deps = bundlerEnv { + name = "github-linguist-dep"; + gemfile = "${src}/Gemfile"; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + +in +buildRubyGem rec { + name = "${gemName}-${version}"; + inherit gemName version src; + + doInstallCheck = true; + dontBuild = false; + + postInstall = '' + export GEM_PATH="${deps}/lib/ruby/gems/${ruby.version.libDir}" + bundle exec rake samples + install --mode=0644 -Dm 0755 lib/linguist/samples.json $out/lib/ruby/gems/${ruby.version.libDir}/gems/${name}/lib/linguist + + wrapProgram "$out/bin/github-linguist" \ + --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" + + wrapProgram "$out/bin/git-linguist" \ + --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" + ''; + + passthru = { + inherit ruby deps; + }; + + meta = { + description = "Language savant Ruby library"; + longDescription = '' + A Ruby library that is used on GitHub.com to detect blob languages, ignore binary or vendored files, suppress generated files in diffs, and generate language breakdown graphs. + ''; + homepage = "https://github.com/github-linguist/linguist"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Cryolitia ]; + platforms = with lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/by-name/gi/github-markdown-toc-go/package.nix b/pkgs/by-name/gi/github-markdown-toc-go/package.nix index a80ac4af93b6..eabfa0b57b1e 100644 --- a/pkgs/by-name/gi/github-markdown-toc-go/package.nix +++ b/pkgs/by-name/gi/github-markdown-toc-go/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "github-markdown-toc-go"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ekalinin"; repo = "github-markdown-toc.go"; rev = "v${version}"; - hash = "sha256-tZGAvbC9lrNhtRubCJUkQShRsfCsaAeI6XHhSp4FkS0="; + hash = "sha256-hCkahhnTAF17ctJTL83wZxZiKGDzIKLwWKTTnwYQ3cs="; }; vendorHash = "sha256-K5yb7bnW6eS5UESK9wgNEUwGjB63eJk6+B0jFFiFero="; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix new file mode 100644 index 000000000000..396731ba4e12 --- /dev/null +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "github-mcp-server"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "github"; + repo = "github-mcp-server"; + tag = "v${finalAttrs.version}"; + hash = "sha256-GXE6ZmCDPjDCpCrrX0DcDdcLVgM+hHVWzihMYqUQaSI="; + }; + + vendorHash = "sha256-SWzKE1pliZd3fQrbh8JpoepT/bKpZHuq7WZ8LEzNn50="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${finalAttrs.version}" + "-X=main.commit=${finalAttrs.src.rev}" + "-X=main.date=1970-01-01T00:00:00Z" + ]; + + __darwinAllowLocalNetworking = true; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + meta = { + changelog = "https://github.com/github/github-mcp-server/releases/tag/v${finalAttrs.version}"; + description = "GitHub's official MCP Server"; + homepage = "https://github.com/github/github-mcp-server"; + license = lib.licenses.mit; + mainProgram = "github-mcp-server"; + maintainers = with lib.maintainers; [ drupol ]; + }; +}) diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 815a1d598669..eef5daa14baf 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gitify"; - version = "6.1.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "gitify-app"; repo = "gitify"; tag = "v${finalAttrs.version}"; - hash = "sha256-3vpt8irwDYdWqX4Vt7WdmQfePqIRkv07LootFLaQGZI="; + hash = "sha256-pzyTL0wloTBht7w8MZQoe7jUlOTFTGcq+u0now+Wrxs="; }; nativeBuildInputs = [ @@ -33,15 +33,15 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-HW8v5DhbWXmMU2vD2NutbY7eMVzeW1FzYXOs3NRsUw0="; + hash = "sha256-mV0MgJRP5rN+RRTtKlYi29Yq8+8DMO5bMFXRmPcWx6o="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; postPatch = '' - substituteInPlace package.json \ - --replace-fail '"Emmanouil Konstantinidis (3YP8SXP3BF)"' null \ - --replace-fail '"scripts/notarize.js"' null + substituteInPlace config/electron-builder.js \ + --replace-fail "'Adam Setch (5KD23H9729)'" "null" \ + --replace-fail "'scripts/afterSign.js'" "null" ''; buildPhase = '' @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { pnpm build pnpm exec electron-builder \ + --config config/electron-builder.js \ --dir \ -c.electronDist=electron-dist \ -c.electronVersion="${electron.version}" \ diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index 8f3d34548a38..ddacf4887a9b 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -1,104 +1,106 @@ { lib, stdenv, - libXcomposite, - libgnome-keyring, - makeWrapper, - udev, - curlWithGnuTls, - alsa-lib, - libXfixes, - atk, - gtk3, - libXrender, - pango, - adwaita-icon-theme, - cairo, - freetype, - fontconfig, - libX11, - libXi, - libxcb, - libXext, - libXcursor, - glib, - libXScrnSaver, - libxkbfile, - libXtst, - nss, - nspr, - cups, - fetchzip, - expat, - gdk-pixbuf, - libXdamage, - libXrandr, - dbus, - makeDesktopItem, - openssl, - wrapGAppsHook3, buildPackages, + copyDesktopItems, + fetchzip, + makeDesktopItem, + makeWrapper, + adwaita-icon-theme, + alsa-lib, at-spi2-atk, at-spi2-core, - libuuid, + atk, + cacert, + cairo, + cups, + curlWithGnuTls, + dbus, e2fsprogs, + expat, + fontconfig, + freetype, + gdk-pixbuf, + git, + glib, + gtk3, krb5, + libGL, + libX11, + libXScrnSaver, + libXcomposite, + libXcursor, + libXdamage, + libXext, + libXfixes, + libXi, + libXrandr, + libXrender, + libXtst, libdrm, libgbm, - unzip, - copyDesktopItems, - libxshmfence, + libgnome-keyring, + libuuid, + libxcb, libxkbcommon, - git, - libGL, + libxkbfile, + libxshmfence, + nspr, + nss, + openssl, + pango, + udev, + unzip, zlib, - cacert, }: let pname = "gitkraken"; - version = "11.0.0"; + version = "11.1.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - hash = "sha256-rUOBCxquTw5wh5cK0AEGmIMq808tZQe5E90V7lGRuNY="; + hash = "sha256-42NP+23PlyIiqzwjpktz8ipJ5tjzbbszSB9qkeE5jVU="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - hash = "sha256-L2OLlHY8iix7HcI5TowZapqtrsvB/KWigdndQWIIIFU="; + hash = "sha256-/GiHFVz9RyC/bliA8m2YwCwnUQfxT9C0qR+YPr6zdqQ="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - hash = "sha256-Rk6hSQ12CQl+vDYl17p0fQ74RpfOYhjMqrKZJ0/d1dw="; + hash = "sha256-CfhloCczC2z1AHNh0vGXk9Np+BnFI0U/QrPIFBWsYjs="; }; }; src = srcs.${stdenv.hostPlatform.system} or throwSystem; - meta = with lib; { + meta = { homepage = "https://www.gitkraken.com/git-client"; description = "Simplifying Git for any OS"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + license = lib.licenses.unfree; platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ nicolas-goudry Rishik-Y ]; mainProgram = "gitkraken"; }; + passthru.updateScript = ./update.sh; + linux = stdenv.mkDerivation rec { inherit pname version src meta + passthru ; dontBuild = true; @@ -228,6 +230,7 @@ let version src meta + passthru ; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/gitkraken/update.sh b/pkgs/by-name/gi/gitkraken/update.sh new file mode 100755 index 000000000000..b1f7938347e0 --- /dev/null +++ b/pkgs/by-name/gi/gitkraken/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl jq + +set -euo pipefail + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +nixpkgs=$(realpath "$scriptDir"/../../../..) + +# All architectures are released together, therefore we get the latest version from the linux release +# NOTE: for some reason, the darwin RELEASES (ie. /darwin/RELEASES) file returns a frozen version... +echo >&2 "=== Obtaining version data from release.axocdn.com..." +version=$(curl -fsSL https://release.axocdn.com/linux/RELEASES | jq -r '.name') + +# Hardcoded URLs to compute hashes +declare -A tarballs=( + ["x86_64-linux"]="https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz" + ["x86_64-darwin"]="https://release.axocdn.com/darwin/GitKraken-v${version}.zip" + ["aarch64-darwin"]="https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip" +) + +for arch in "${!tarballs[@]}"; do + # We precalculate the hash before calling update-source-version because it attempts to calculate each architecture's + # package's hash by running `nix-build --system -A gitkraken.src` which causes cross compiling headaches + echo >&2 "=== Downloading ${arch} package and computing its hash..." + hash=$(nix-hash --sri --type sha256 "$(nix-prefetch-url --print-path --unpack "${tarballs[${arch}]}" | tail -n1)") + echo >&2 "=== Updating package.nix for ${arch}..." + # update-source-version expects to be at the root of nixpkgs + (cd "${nixpkgs}" && update-source-version gitkraken "${version}" "${hash}" --system="${arch}" --ignore-same-version) +done + +echo >&2 "=== Done!" diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index 1dc740ba16f2..bfe81443feaa 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -5,20 +5,27 @@ nix-update-script, gitlab-ci-local, testers, + makeBinaryWrapper, + rsync, + gitMinimal, }: buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.58.0"; + version = "4.59.0"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-4Hn/I0PJ5w+Wb3tI8szy4I/vHso85GTFyT2Ek+WbYxs="; + hash = "sha256-4C+96rPtEFDJc08D5qXEuNvoDWJR5drvsvZ6mCGd5Vo="; }; - npmDepsHash = "sha256-fndSJd15sZ/sIFvh+MzNw25kuP9D9+Qc0mDqgnvjnPo="; + npmDepsHash = "sha256-brzCPG/keYOGfjqnj8mP28OdSAKTbDQWBxN4oMLHoNU="; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; postPatch = '' # remove cleanup which runs git commands @@ -26,6 +33,39 @@ buildNpmPackage rec { --replace-fail "npm run cleanup" "true" ''; + postInstall = '' + NODE_MODULES=$out/lib/node_modules/gitlab-ci-local/node_modules + + # Remove intermediate build files for re2 to reduce dependencies. + # + # This does not affect the behavior. On npm `re2` does not ship + # the build directory and downloads a prebuilt version of the + # `re2.node` binary. This method produces the same result. + find $NODE_MODULES/re2/build -type f ! -path "*/Release/re2.node" -delete + strip -x $NODE_MODULES/re2/build/Release/re2.node + + # Remove files that depend on python3 + # + # The node-gyp package is only used for building re2, so it is + # not needed at runtime. I did not remove the whole directory + # because of some dangling links to the node-gyp directory which + # is not required. It is possible to remove the directory and all + # the files that link to it, but I figured it was not worth + # tracking down the files. + # + # The re2/vendor directory is used for building the re2.node + # binary, so it is not needed at runtime. + rm -rf $NODE_MODULES/{node-gyp/gyp,re2/vendor} + + wrapProgram $out/bin/gitlab-ci-local \ + --prefix PATH : "${ + lib.makeBinPath [ + rsync + gitMinimal + ] + }" + ''; + passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix index 83ef36cce08d..29a8de572a53 100644 --- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -2,31 +2,25 @@ rustPlatform, lib, fetchFromGitHub, - darwin, openssl, pkg-config, - stdenv, }: rustPlatform.buildRustPackage rec { pname = "gitlab-ci-ls"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "alesbrelih"; repo = "gitlab-ci-ls"; rev = "${version}"; - hash = "sha256-SVsQnY/TrFQXgvT5goXQqb5MYxU7untDq361EY7KRDQ="; + hash = "sha256-nfcG1fGmWutWwyROlTEnKN2+wPVmDkN0Z1VKdZDHGmU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7qZN198hqAmAd3WH8g+ceSGvQuZ0EheHeMwmvBd9if4="; + cargoHash = "sha256-I8LSN50uSEAGAlaQzscAZWUqRpLUq+7gfzdj0UPkg4o="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; meta = with lib; { homepage = "https://github.com/alesbrelih/gitlab-ci-ls"; diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix index 2b24285f6cd2..e1bfaa98eb11 100644 --- a/pkgs/by-name/gi/gitlab-container-registry/package.nix +++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.19.0"; + version = "4.22.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -14,10 +14,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-WrijK/kQugCpiDbMw1+QTvG60SDsdJ5PDFGKGiLBsb8="; + hash = "sha256-r7IVX4xH/K+tfoEKfO9HITHUZT6yfBP2Zr6EPZQUxfw="; }; - vendorHash = "sha256-0fvjnEm4NdIKexjTO/GijWy8WwBrLt3jZCwjfOKI4jA="; + vendorHash = "sha256-e7EIScdd0k5iFTDutFotNkKj1rKtBqfEexdkpjSHAoE="; checkFlags = let @@ -35,13 +35,10 @@ buildGoModule rec { meta = with lib; { description = "GitLab Docker toolset to pack, ship, store, and deliver content"; license = licenses.asl20; - maintainers = - with maintainers; - [ - leona - yayayayaka - ] - ++ teams.cyberus.members; + teams = with teams; [ + gitlab + cyberus + ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix index 744fc4dd5361..6398fe9c6adf 100644 --- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix +++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "5.4.0"; + version = "5.5.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - hash = "sha256-jrUNOxqc/k4a/34nHEatGnBorTlh/EuHnEs/GfFRUcI="; + hash = "sha256-N2H9jLpsP39nKrokWwphAspQwXcL3stAdvNVItIHFyo="; }; - vendorHash = "sha256-iL8QowfX0OpU9irUP4MJXhGVim7GU2fTMLgJSTAfh9w="; + vendorHash = "sha256-Go02W09799Vu9v7y+P7z1gj7ijG3No5AVprRrmspPZE="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; @@ -27,6 +27,7 @@ buildGoModule rec { description = "Indexes Git repositories into Elasticsearch for GitLab"; mainProgram = "gitlab-elasticsearch-indexer"; license = licenses.mit; - maintainers = with maintainers; [ yayayayaka ] ++ teams.cyberus.members; + maintainers = with maintainers; [ yayayayaka ]; + teams = [ teams.cyberus ]; }; } diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index 7edd5a1c238e..5ddb95744cfc 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.10.1"; + version = "18.0.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-B/v0jj5hoNmF9cygvi9eLQ4pLuZ1+wIyNnJN2uCAXdE="; + hash = "sha256-EslNXyCzGpsJAG3SOQF56xbU2vhVVo4qdtfFtf9qqW0="; }; - vendorHash = "sha256-o2DgP2YP2aejtuQ4NC90kysvwDy0XvSb4CW5oE2x2qQ="; + vendorHash = "sha256-BjCwPt1duDINHP7L0qT2KNTjOZ62bWgVij88ztjjyPg="; subPackages = [ "." ]; meta = with lib; { @@ -25,6 +25,6 @@ buildGoModule rec { homepage = "https://gitlab.com/gitlab-org/gitlab-pages"; changelog = "https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = teams.gitlab.members; + teams = [ teams.gitlab ]; }; } diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index 99385cc926af..9a78beeaf392 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -1,80 +1,119 @@ { lib, + stdenv, + bash, buildGoModule, fetchFromGitLab, - bash, + nix-update-script, + versionCheckHook, }: -let - version = "17.2.0"; -in -buildGoModule rec { - inherit version; +buildGoModule (finalAttrs: { pname = "gitlab-runner"; - - commonPackagePath = "gitlab.com/gitlab-org/gitlab-runner/common"; - ldflags = [ - "-X ${commonPackagePath}.NAME=gitlab-runner" - "-X ${commonPackagePath}.VERSION=${version}" - "-X ${commonPackagePath}.REVISION=v${version}" - ]; - - # For patchShebangs - buildInputs = [ bash ]; - - vendorHash = "sha256-1MwHss76apA9KoFhEU6lYiUACrPMGYzjhds6nTyNuJI="; + version = "17.11.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; - rev = "v${version}"; - hash = "sha256-a2Igy4DS3fYTvPW1vvDrH/DjMQ4lG9cm/P3mFr+y9s4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Jppy8IG0Oq95RDDkvN1FpXjJuSc3DkfhGgnfpaUSKa4="; }; + vendorHash = "sha256-wxFVDkqiqs7jaZEPGyawWfs6h6UgAhCWSckM90G44lA="; + + # For patchShebangs + buildInputs = [ bash ]; + patches = [ ./fix-shell-path.patch ./remove-bash-test.patch ]; - prePatch = '' - # Remove some tests that can't work during a nix build + prePatch = + '' + # Remove some tests that can't work during a nix build - # Requires to run in a git repo - sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go - sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go + # Needs the build directory to be a git repo + substituteInPlace commands/helpers/file_archiver_test.go \ + --replace-fail "func TestCacheArchiverAddingUntrackedFiles" "func OFF_TestCacheArchiverAddingUntrackedFiles" \ + --replace-fail "func TestCacheArchiverAddingUntrackedUnicodeFiles" "func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles" + rm shells/abstract_test.go - # No writable developer environment - rm common/build_test.go - rm common/build_settings_test.go - rm executors/custom/custom_test.go + # No writable developer environment + rm common/build_settings_test.go + rm common/build_test.go + rm executors/custom/custom_test.go - # No docker during build - rm executors/docker/terminal_test.go - rm executors/docker/docker_test.go - rm helpers/docker/auth/auth_test.go - rm executors/docker/services_test.go - ''; + # No Docker during build + rm executors/docker/docker_test.go + rm executors/docker/services_test.go + rm executors/docker/terminal_test.go + rm helpers/docker/auth/auth_test.go + + # No Kubernetes during build + rm executors/kubernetes/feature_test.go + rm executors/kubernetes/kubernetes_test.go + rm executors/kubernetes/overwrites_test.go + '' + + lib.optionalString stdenv.buildPlatform.isDarwin '' + # Invalid bind arguments break Unix socket tests + substituteInPlace commands/wrapper_test.go \ + --replace-fail "func TestRunnerWrapperCommand_createListener" "func OFF_TestRunnerWrapperCommand_createListener" + + # No keychain access during build breaks X.509 certificate tests + substituteInPlace helpers/certificate/x509_test.go \ + --replace-fail "func TestCertificate" "func OFF_TestCertificate" + substituteInPlace network/client_test.go \ + --replace-fail "func TestClientInvalidSSL" "func OFF_TestClientInvalidSSL" + ''; excludedPackages = [ - # CI helper script for pushing images to Docker and ECR registries - # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4139 - "./scripts/sync-docker-images" + # Nested dependency Go module, used with go.mod replace directive + # + # https://gitlab.com/gitlab-org/gitlab-runner/-/commit/57ea9df5d8a8deb78c8d1972930bbeaa80d05e78 + "./helpers/runner_wrapper/api" + # Helper scripts for upstream Make targets, not intended for downstream consumers + "./scripts" ]; - postInstall = '' - install packaging/root/usr/share/gitlab-runner/clear-docker-cache $out/bin - ''; + ldflags = + let + ldflagsPackageVariablePrefix = "gitlab.com/gitlab-org/gitlab-runner/common"; + in + [ + "-X ${ldflagsPackageVariablePrefix}.NAME=gitlab-runner" + "-X ${ldflagsPackageVariablePrefix}.VERSION=${finalAttrs.version}" + "-X ${ldflagsPackageVariablePrefix}.REVISION=v${finalAttrs.version}" + ]; preCheck = '' # Make the tests pass outside of GitLab CI export CI=0 ''; - meta = with lib; { - description = "GitLab Runner the continuous integration executor of GitLab"; - license = licenses.mit; - homepage = "https://docs.gitlab.com/runner/"; - platforms = platforms.unix ++ platforms.darwin; - maintainers = with maintainers; [ zimbatm ] ++ teams.gitlab.members; + # Many tests start servers which bind to ports + __darwinAllowLocalNetworking = true; + + postInstall = '' + install packaging/root/usr/share/gitlab-runner/clear-docker-cache $out/bin + ''; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = nix-update-script { }; }; -} + + meta = { + description = "GitLab Runner the continuous integration executor of GitLab"; + homepage = "https://docs.gitlab.com/runner"; + license = lib.licenses.mit; + mainProgram = "gitlab-runner"; + maintainers = with lib.maintainers; [ zimbatm ]; + teams = [ lib.teams.gitlab ]; + }; +}) diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix index c6b1e749983a..2bc9ba46c36a 100644 --- a/pkgs/by-name/gi/gitlab-shell/package.nix +++ b/pkgs/by-name/gi/gitlab-shell/package.nix @@ -8,14 +8,14 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.41.0"; + version = "14.42.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - hash = "sha256-6bRiw8TC7E/eUc0Zwp46kLbe5QzZ+nXL6YY2u+mjFRw="; + hash = "sha256-U42xSb9kZpxBIE+tua5m3iNMBfcLRlujSI3K5eWiuME="; }; buildInputs = [ @@ -27,7 +27,7 @@ buildGoModule rec { ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-Xz6l0gvjS2nPt/mpOvZDJlnfEmIWPXc/RwBntzfLc1Y="; + vendorHash = "sha256-aBANgvo9kWiHoytaB10J3hf9vOWVsz/vJApVHet93xg="; subPackages = [ "cmd/gitlab-shell" @@ -46,7 +46,7 @@ buildGoModule rec { description = "SSH access and repository management app for GitLab"; homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = teams.gitlab.members; + teams = [ teams.gitlab ]; license = licenses.mit; }; } diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index 925b13b71b61..eb00dfbd7918 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchCrate, iconv, lib, @@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration iconv ]; diff --git a/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch b/pkgs/by-name/gi/gitlab/Remove-unsupported-database-names.patch similarity index 100% rename from pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch rename to pkgs/by-name/gi/gitlab/Remove-unsupported-database-names.patch diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json new file mode 100644 index 000000000000..f410364b0919 --- /dev/null +++ b/pkgs/by-name/gi/gitlab/data.json @@ -0,0 +1,15 @@ +{ + "version": "18.0.1", + "repo_hash": "0d4bpk0fip34cjgp7a1pcfa0q7vkn8vz1ig41zgxncgwbr5lik1h", + "yarn_hash": "0vv09y1pjcm2723jh842pgnmnrf4yqk7558v57dp08rxrqnsni5x", + "owner": "gitlab-org", + "repo": "gitlab", + "rev": "v18.0.1-ee", + "passthru": { + "GITALY_SERVER_VERSION": "18.0.1", + "GITLAB_PAGES_VERSION": "18.0.1", + "GITLAB_SHELL_VERSION": "14.42.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.1", + "GITLAB_WORKHORSE_VERSION": "18.0.1" + } +} diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix new file mode 100644 index 000000000000..11e3e8f868e5 --- /dev/null +++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitLab, + git, + buildGoModule, +}: +let + data = lib.importJSON ../data.json; +in +buildGoModule rec { + pname = "gitlab-workhorse"; + + version = "18.0.1"; + + # nixpkgs-update: no auto update + src = fetchFromGitLab { + owner = data.owner; + repo = data.repo; + rev = data.rev; + sha256 = data.repo_hash; + }; + + sourceRoot = "${src.name}/workhorse"; + + vendorHash = "sha256-tLlxsUCoSGvUpJnS0GsNobk2IuSEgs3R4UDUmNf+HrA="; + buildInputs = [ git ]; + ldflags = [ "-X main.Version=${version}" ]; + doCheck = false; + prodyVendor = true; + + meta = with lib; { + homepage = "http://www.gitlab.com/"; + platforms = platforms.linux; + teams = [ teams.gitlab ]; + license = licenses.mit; + }; +} diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix new file mode 100644 index 000000000000..81c204476608 --- /dev/null +++ b/pkgs/by-name/gi/gitlab/package.nix @@ -0,0 +1,317 @@ +{ + bundlerEnv, + cacert, + defaultGemConfig, + fetchFromGitLab, + fetchYarnDeps, + yarnConfigHook, + git, + gitlabEnterprise ? false, + lib, + makeWrapper, + nettools, + nixosTests, + nodejs_20, + replace, + ruby_3_3, + stdenv, + tzdata, + + # gem dependencies: + # gitlab-glfm-markdown + buildRubyGem, + cargo, + rustc, + rustPlatform, + + # gpgme + pkg-config, + + # openssl + openssl, + + # ruby-magic + file, + + # static-holmes + icu, + which, + zlib, +}: + +let + data = lib.importJSON ./data.json; + + version = data.version; + src = fetchFromGitLab { + owner = data.owner; + repo = data.repo; + rev = data.rev; + sha256 = data.repo_hash; + }; + + rubyEnv = bundlerEnv rec { + name = "gitlab-env-${version}"; + ruby = ruby_3_3; + gemdir = ./rubyEnv; + gemset = import (gemdir + "/gemset.nix") src; + gemConfig = defaultGemConfig // { + gpgme = attrs: { + nativeBuildInputs = [ pkg-config ]; + }; + # the openssl needs the openssl include files + openssl = attrs: { + buildInputs = [ openssl ]; + }; + ruby-magic = attrs: { + buildInputs = [ file ]; + buildFlags = [ "--enable-system-libraries" ]; + }; + gitlab-glfm-markdown = attrs: { + cargoDeps = rustPlatform.fetchCargoVendor { + src = stdenv.mkDerivation { + inherit (buildRubyGem { inherit (attrs) gemName version source; }) + name + src + unpackPhase + nativeBuildInputs + ; + dontBuilt = true; + installPhase = '' + cp -R ext/glfm_markdown $out + cp Cargo.lock $out + ''; + }; + hash = "sha256-73uliXjZNT8Ok98ai2rY+b0jYqxoQH3qW5YS+Ap6KK0="; + }; + + dontBuild = false; + + nativeBuildInputs = [ + cargo + rustc + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + ]; + + disallowedReferences = [ + rustc.unwrapped + ]; + + preInstall = '' + export CARGO_HOME="$PWD/../.cargo/" + ''; + + postInstall = '' + mv -v $GEM_HOME/gems/${attrs.gemName}-${attrs.version}/lib/{glfm_markdown/glfm_markdown.so,} + find $out -type f -name .rustc_info.json -delete + ''; + }; + + static_holmes = attrs: { + nativeBuildInputs = [ + icu + which + zlib.dev + ]; + }; + }; + groups = [ + "default" + "unicorn" + "ed25519" + "metrics" + "development" + "puma" + "test" + "kerberos" + "opentelemetry" + ]; + # N.B. omniauth_oauth2_generic and apollo_upload_server both provide a + # `console` executable. + ignoreCollisions = true; + + extraConfigPaths = [ + "${src}/vendor" + "${src}/gems" + ]; + }; + + assets = stdenv.mkDerivation { + pname = "gitlab-assets"; + inherit version src; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = data.yarn_hash; + }; + + nativeBuildInputs = [ + rubyEnv.wrappedRuby + rubyEnv.bundler + nodejs_20 + git + cacert + yarnConfigHook + ]; + + patches = [ + # Since version 12.6.0, the rake tasks need the location of git, + # so we have to apply the location patches here too. + ./remove-hardcoded-locations.patch + + # Gitlab edited the default database config since [1] and the + # installer now complains about valid keywords only being "main", "ci" and "embedded". + # + # [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028 + ./Remove-unsupported-database-names.patch + ]; + # One of the patches uses this variable - if it's unset, execution + # of rake tasks fails. + GITLAB_LOG_PATH = "log"; + FOSS_ONLY = !gitlabEnterprise; + + SKIP_YARN_INSTALL = 1; + NODE_OPTIONS = "--max-old-space-size=8192"; + + postConfigure = '' + # Some rake tasks try to run yarn automatically, which won't work + rm lib/tasks/yarn.rake + + # The rake tasks won't run without a basic configuration in place + mv config/database.yml.postgresql config/database.yml + mv config/gitlab.yml.example config/gitlab.yml + + patchShebangs scripts/frontend/ + ''; + + buildPhase = '' + runHook preBuild + + # TODO: Try to yarn install without --ignore-scripts + # Needed for the js dependency pinia to work + pushd node_modules/vue-demi + yarn run postinstall + popd + + bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production SKIP_YARN_INSTALL=true + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mv public/assets $out + + runHook postInstall + ''; + }; +in +stdenv.mkDerivation { + name = "gitlab${lib.optionalString gitlabEnterprise "-ee"}-${version}"; + + inherit src; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + rubyEnv + rubyEnv.wrappedRuby + rubyEnv.bundler + tzdata + git + nettools + ]; + + patches = [ + # Change hardcoded paths to the NixOS equivalent + ./remove-hardcoded-locations.patch + ]; + + postPatch = '' + ${lib.optionalString (!gitlabEnterprise) '' + # Remove all proprietary components + rm -rf ee + sed -i 's/-ee//' ./VERSION + ''} + + # For reasons I don't understand "bundle exec" ignores the + # RAILS_ENV causing tests to be executed that fail because we're + # not installing development and test gems above. Deleting the + # tests works though. + rm lib/tasks/test.rake + + rm config/initializers/gitlab_shell_secret_token.rb + + sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake + sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb + + mv config/puma.rb.example config/puma.rb + # Always require lib-files and application.rb through their store + # path, not their relative state directory path. This gets rid of + # warnings and means we don't have to link back to lib from the + # state directory. + ${replace}/bin/replace-literal -f -r -e '../../lib' "$out/share/gitlab/lib" config + ${replace}/bin/replace-literal -f -r -e '../lib' "$out/share/gitlab/lib" config + ${replace}/bin/replace-literal -f -r -e "require_relative 'application'" "require_relative '$out/share/gitlab/config/application'" config + ${replace}/bin/replace-literal -f -r -e 'require_relative "/home/git/gitlab/lib/gitlab/puma/error_handler"' "require_relative '$out/share/gitlab/lib/gitlab/puma/error_handler'" config + ''; + + buildPhase = '' + rm -f config/secrets.yml + mv config config.dist + rm -r tmp + ''; + + installPhase = '' + mkdir -p $out/share + cp -r . $out/share/gitlab + ln -sf ${assets} $out/share/gitlab/public/assets + rm -rf $out/share/gitlab/log + ln -sf /run/gitlab/log $out/share/gitlab/log + ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads + ln -sf /run/gitlab/config $out/share/gitlab/config + ln -sf /run/gitlab/tmp $out/share/gitlab/tmp + + # rake tasks to mitigate CVE-2017-0882 + # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/ + cp ${./reset_token.rake} $out/share/gitlab/lib/tasks/reset_token.rake + + # manually patch the shebang line in generate-loose-foreign-key + wrapProgram $out/share/gitlab/scripts/decomposition/generate-loose-foreign-key --set ENABLE_SPRING 0 --add-flags 'runner -e test' + ''; + + passthru = { + inherit rubyEnv assets; + ruby = rubyEnv.wrappedRuby; + GITALY_SERVER_VERSION = data.passthru.GITALY_SERVER_VERSION; + GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION; + GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION; + GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION; + gitlabEnv.FOSS_ONLY = lib.boolToString (!gitlabEnterprise); + tests = { + nixos-test-passes = nixosTests.gitlab; + }; + }; + + meta = + with lib; + { + homepage = "http://www.gitlab.com/"; + platforms = platforms.linux; + teams = [ teams.gitlab ]; + } + // ( + if gitlabEnterprise then + { + license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE + description = "GitLab Enterprise Edition"; + } + else + { + license = licenses.mit; + description = "GitLab Community Edition"; + longDescription = "GitLab Community Edition (CE) is an open source end-to-end software development platform with built-in version control, issue tracking, code review, CI/CD, and more. Self-host GitLab CE on your own servers, in a container, or on a cloud provider."; + } + ); +} diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/by-name/gi/gitlab/remove-hardcoded-locations.patch similarity index 100% rename from pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch rename to pkgs/by-name/gi/gitlab/remove-hardcoded-locations.patch diff --git a/pkgs/applications/version-management/gitlab/reset_token.rake b/pkgs/by-name/gi/gitlab/reset_token.rake similarity index 100% rename from pkgs/applications/version-management/gitlab/reset_token.rake rename to pkgs/by-name/gi/gitlab/reset_token.rake diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile new file mode 100644 index 000000000000..8be009495335 --- /dev/null +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile @@ -0,0 +1,759 @@ +# frozen_string_literal: true + +source 'https://rubygems.org' + +if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this verification is still experimental + $LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__)) + require 'bundler-checksum' + BundlerChecksum.patch! +end + +# Please see https://docs.gitlab.com/ee/development/feature_categorization/#gemfile +ignore_feature_category = Module.new do + def gem(*arguments, feature_category: nil, **keyword_arguments) # rubocop:disable Lint/UnusedMethodArgument -- Ignoring feature_category intentionally + super(*arguments, **keyword_arguments) + end +end + +extend ignore_feature_category + +gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false, feature_category: :shared + +# NOTE: When incrementing the major or minor version here, also increment activerecord_version +# in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve +# https://gitlab.com/gitlab-org/gitlab/-/issues/375713 +# +# See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails + +gem 'rails', '~> 7.1.5.1', feature_category: :shared + +gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared +# This can be dropped after upgrading to Rails 7.2: https://github.com/rails/rails/pull/49674 +gem 'mutex_m', '~> 0.3', feature_category: :shared +# Need by Rails +gem 'drb', '~> 2.2', feature_category: :shared + +gem 'bootsnap', '~> 1.18.3', require: false, feature_category: :shared + +# Avoid the precompiled native gems because Omnibus needs to build this to ensure +# LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730 +if RUBY_PLATFORM.include?('darwin') + gem 'ffi', '~> 1.17', feature_category: :shared +else + gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared +end + +gem 'openssl', '~> 3.0', feature_category: :shared + +gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store', feature_category: :shared + +# GitLab Monorepo Gems +group :monorepo do + gem 'gitlab-utils', path: 'gems/gitlab-utils', feature_category: :shared +end + +gem 'gitlab-backup-cli', path: 'gems/gitlab-backup-cli', require: 'gitlab/backup/cli', feature_category: :backup_restore + +gem 'gitlab-secret_detection', '< 1.0', feature_category: :secret_detection + +# Responders respond_to and respond_with +gem 'responders', '~> 3.0', feature_category: :shared + +gem 'sprockets', '~> 3.7.0', feature_category: :shared +gem 'sprockets-rails', '~> 3.5.1', feature_category: :shared + +gem 'view_component', '~> 3.21.0', feature_category: :shared + +# Supported DBs +gem 'pg', '~> 1.5.6', feature_category: :database + +gem 'rugged', '~> 1.6', feature_category: :gitaly + +gem 'faraday', '~> 2', feature_category: :shared +gem 'faraday-retry', '~> 2', feature_category: :shared +# Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef. +gem 'logger', '~> 1.6.0', feature_category: :shared + +gem 'marginalia', '~> 1.11.1', feature_category: :database + +# Authorization +gem 'declarative_policy', '~> 1.1.0', feature_category: :shared + +# For source code paths mapping +gem 'coverband', '6.1.5', require: false, feature_category: :shared + +# Authentication libraries +gem 'devise', '~> 4.9.3', feature_category: :system_access +gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable', + feature_category: :system_access +gem 'bcrypt', '~> 3.1', '>= 3.1.14', feature_category: :system_access +gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access +gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access +gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access +gem 'rexml', '~> 3.4.0', feature_category: :shared +gem 'ruby-saml', '~> 1.18', feature_category: :system_access +gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access +gem 'omniauth', '~> 2.1.0', feature_category: :system_access +gem 'omniauth-auth0', '~> 3.1', feature_category: :system_access +gem 'omniauth-azure-activedirectory-v2', '~> 2.0', feature_category: :system_access +gem 'omniauth-alicloud', '~> 3.0.0', feature_category: :system_access +gem 'omniauth-github', '2.0.1', feature_category: :system_access +# See vendor/gems/omniauth-gitlab/README.md +gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab', feature_category: :system_access +gem 'omniauth-google-oauth2', '~> 1.1', feature_category: :system_access +gem 'omniauth-oauth2-generic', '~> 0.2.2', feature_category: :system_access +gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth', feature_category: :system_access +# See vendor/gems/omniauth_crowd/README.md +gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd', feature_category: :system_access +gem 'omniauth_openid_connect', '~> 0.8.0', feature_category: :system_access +# Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. +# See https://docs.gitlab.com/ee/development/emails.html#rationale. +gem 'openid_connect', '~> 2.3.0', feature_category: :system_access +# See gem README.md +gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce', feature_category: :system_access +gem 'omniauth-atlassian-oauth2', '~> 0.2.0', feature_category: :system_access +gem 'rack-oauth2', '~> 2.2.1', feature_category: :system_access +gem 'jwt', '~> 2.9.3', feature_category: :system_access + +# Kerberos authentication. EE-only +gem 'gssapi', '~> 1.3.1', group: :kerberos, feature_category: :system_access +gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos, feature_category: :system_access + +# Spam and anti-bot protection +gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails', feature_category: :insider_threat +gem 'akismet', '~> 3.0', feature_category: :insider_threat +gem 'invisible_captcha', '~> 2.1.0', feature_category: :insider_threat + +# Two-factor authentication +gem 'devise-two-factor', '~> 4.1.1', feature_category: :system_access +gem 'rqrcode', '~> 2.2', feature_category: :system_access + +gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted', feature_category: :shared + +# GitLab Pages +gem 'validates_hostname', '~> 1.0.13', feature_category: :pages +gem 'rubyzip', '~> 2.3.2', require: 'zip', feature_category: :pages +# GitLab Pages letsencrypt support +gem 'acme-client', '~> 2.0.19', feature_category: :pages + +# Browser detection +gem 'browser', '~> 5.3.1', feature_category: :shared + +# OS detection for usage ping +gem 'ohai', '~> 18.1', feature_category: :product_analytics + +# GPG +gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management + +# LDAP Auth +# GitLab fork with several improvements to original library. For full list of changes +# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master +gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap', feature_category: :system_access +gem 'net-ldap', '~> 0.17.1', feature_category: :system_access + +# API +gem 'grape', '~> 2.0.0', feature_category: :api +gem 'grape-entity', '~> 1.0.1', feature_category: :api +gem 'grape-swagger', '~> 2.1.2', group: [:development, :test], feature_category: :api +gem 'grape-swagger-entity', '~> 0.5.5', group: [:development, :test], feature_category: :api +gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api +gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared + +# GraphQL API +gem 'graphql', '2.4.13', feature_category: :api +gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api +gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api + +# Cells +gem 'gitlab-topology-service-client', '~> 0.1', + path: 'vendor/gems/gitlab-topology-service-client', + feature_category: :cell + +# Duo Workflow +gem 'gitlab-duo-workflow-service-client', '~> 0.1', + path: 'vendor/gems/gitlab-duo-workflow-service-client', + feature_category: :duo_workflow + +# Generate Fake data +gem 'ffaker', '~> 2.24', feature_category: :shared + +gem 'hashie', '~> 5.0.0', feature_category: :shared + +# Pagination +gem 'kaminari', '~> 1.2.2', feature_category: :shared + +# HAML +gem 'hamlit', '~> 2.15.0', feature_category: :shared + +# Files attachments +gem 'carrierwave', '~> 1.3', feature_category: :shared +gem 'mini_magick', '~> 4.12', feature_category: :shared + +# PDF generation +gem 'prawn', feature_category: :vulnerability_management +gem 'prawn-svg', feature_category: :vulnerability_management + +# for backups +gem 'fog-aws', '~> 3.26', feature_category: :shared +# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. +# Also see config/initializers/fog_core_patch.rb. +gem 'fog-core', '= 2.1.0', feature_category: :shared +gem 'fog-google', '~> 1.24.1', require: 'fog/google', feature_category: :shared +gem 'fog-local', '~> 0.8', feature_category: :shared +# NOTE: +# the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches +# the rest-client gem to drop the Content-Length header field for chunked transfers, +# which may have knock-on effects on other features using `RestClient`. +# We may want to update this dependency if this is ever addressed upstream, e.g. via +# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 +gem 'fog-aliyun', '~> 0.4', feature_category: :shared +gem 'gitlab-fog-azure-rm', '~> 2.2.0', require: 'fog/azurerm', feature_category: :shared + +# for Google storage + +# Need this specific version of google-apis-storage_v1 so that fog-google will utilize the updated list_objects with +# match_glob support in google-apis-core 0.11.1. Because of this we also have to bump google-cloud-storage to 1.45.0. +gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared +gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared +# We need >= 0.11.1 because that's when match_glob support is added to list_objects +gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1', feature_category: :shared +gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared +gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared +gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared +gem 'google-apis-cloudbilling_v1', '~> 0.22.0', feature_category: :shared +gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0', feature_category: :shared +gem 'google-apis-iam_v1', '~> 0.36.0', feature_category: :shared +gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared +gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared +gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared + +gem 'googleauth', '~> 1.8.1', feature_category: :shared +gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared +gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared + +# Seed data +gem 'seed-fu', '~> 2.3.7', feature_category: :shared + +# Search +gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search +gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search +gem 'elasticsearch-api', '7.17.11', feature_category: :global_search +gem 'aws-sdk-core', '~> 3.223.0', feature_category: :global_search +gem 'aws-sdk-cloudformation', '~> 1', feature_category: :global_search +gem 'aws-sdk-s3', '~> 1.185.0', feature_category: :global_search +gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search +gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search +# Used with Elasticsearch to support http keep-alive connections +gem 'typhoeus', '~> 1.4.0', feature_category: :global_search + +gem 'gitlab-active-context', path: 'gems/gitlab-active-context', require: 'active_context', + feature_category: :global_search + +# Markdown and HTML processing +gem 'html-pipeline', '~> 2.14.3', feature_category: :markdown +gem 'deckar01-task_list', '2.3.4', feature_category: :markdown +gem 'gitlab-markup', '~> 2.0.0', require: 'github/markup', feature_category: :markdown +gem 'commonmarker', '~> 0.23.10', feature_category: :markdown +gem 'kramdown', '~> 2.5.0', feature_category: :markdown +gem 'RedCloth', '~> 4.3.3', feature_category: :markdown +gem 'org-ruby', '~> 0.9.12', feature_category: :markdown +gem 'creole', '~> 0.5.0', feature_category: :markdown +gem 'wikicloth', '0.8.1', feature_category: :markdown +gem 'asciidoctor', '~> 2.0.18', feature_category: :markdown +gem 'asciidoctor-include-ext', '~> 0.4.0', require: false, feature_category: :markdown +gem 'asciidoctor-plantuml', '~> 0.0.16', feature_category: :markdown +gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdown +gem 'rouge', '~> 4.5.0', feature_category: :shared +gem 'truncato', '~> 0.7.13', feature_category: :team_planning +gem 'nokogiri', '~> 1.18', feature_category: :shared +gem 'gitlab-glfm-markdown', '~> 0.0.30', feature_category: :markdown +gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown +gem 'unicode-emoji', '~> 4.0', feature_category: :markdown + +# Calendar rendering +gem 'icalendar', '~> 2.10.1', feature_category: :team_planning + +# Diffs +gem 'diffy', '~> 3.4', feature_category: :shared +gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning + +# Application server +gem 'rack', '~> 2.2.9', feature_category: :shared +# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually +gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared + +group :puma do + gem 'puma', '= 6.5.0', require: false, feature_category: :shared + gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared +end + +# State machine +gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared + +# Background jobs +gem 'sidekiq', '~> 7.3.9', feature_category: :scalability +gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability +gem 'gitlab-sidekiq-fetcher', + path: 'vendor/gems/sidekiq-reliable-fetch', + require: 'sidekiq-reliable-fetch', + feature_category: :scalability + +# Cron Parser +gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration + +# HTTP requests +gem 'httparty', '~> 0.22.0', feature_category: :shared + +# Colored output to console +gem 'rainbow', '~> 3.0', feature_category: :shared + +# Progress bar +gem 'ruby-progressbar', '~> 1.10', feature_category: :shared + +# Linear-time regex library for untrusted regular expressions +gem 're2', '~> 2.15', feature_category: :shared + +# Misc + +gem 'semver_dialects', '~> 3.7', feature_category: :software_composition_analysis +gem 'version_sorter', '~> 2.3', feature_category: :shared +gem 'csv_builder', path: 'gems/csv_builder', feature_category: :shared + +# Export Ruby Regex to Javascript +gem 'js_regex', '~> 3.8', feature_category: :shared + +# User agent parsing +gem 'device_detector', feature_category: :shared + +# Redis +gem 'redis', '~> 5.4.0', feature_category: :redis +gem 'redis-clustering', '~> 5.4.0', feature_category: :redis +gem 'connection_pool', '~> 2.4', feature_category: :shared + +# Redis session store +gem 'redis-actionpack', '~> 5.5.0', feature_category: :redis + +# Jira integration +gem 'jira-ruby', '~> 2.3.0', feature_category: :integrations +gem 'atlassian-jwt', '~> 0.2.1', feature_category: :integrations + +# Slack integration +gem 'slack-messenger', '~> 2.3.5', feature_category: :integrations + +# FogBugz integration +gem 'ruby-fogbugz', '~> 0.3.0', feature_category: :importers + +# Kubernetes integration +gem 'kubeclient', '~> 4.11.0', feature_category: :shared + +# AI +gem 'circuitbox', '2.0.0', feature_category: :ai_abstraction_layer + +# Sanitize user input +gem 'sanitize', '~> 6.0.2', feature_category: :shared +gem 'babosa', '~> 2.0', feature_category: :shared + +# Sanitizes SVG input +gem 'loofah', '~> 2.24.0', feature_category: :shared + +# Used to provide license templates +gem 'licensee', '~> 9.16', feature_category: :shared + +# Detect and convert string character encoding +gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared + +# Detect mime content type from content +gem 'ruby-magic', '~> 0.6', feature_category: :shared + +# Faster blank +gem 'fast_blank', '~> 1.0.1', feature_category: :shared + +# Parse time & duration +gem 'gitlab-chronic', '~> 0.10.5', feature_category: :shared +gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared + +gem 'rack-proxy', '~> 0.7.7', feature_category: :shared + +gem 'cssbundling-rails', '1.4.3', feature_category: :shared +gem 'terser', '1.0.2', feature_category: :shared + +gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client', feature_category: :database +gem 'addressable', '~> 2.8', feature_category: :shared +gem 'gon', '~> 6.4.0', feature_category: :shared +gem 'request_store', '~> 1.7.0', feature_category: :shared +gem 'base32', '~> 0.3.0', feature_category: :shared +gem 'gitlab-license', '~> 2.6', feature_category: :shared + +# Protect against bruteforcing +gem 'rack-attack', '~> 6.7.0', feature_category: :shared + +# Sentry integration +gem 'sentry-ruby', '~> 5.23.0', feature_category: :observability +gem 'sentry-rails', '~> 5.23.0', feature_category: :observability +gem 'sentry-sidekiq', '~> 5.23.0', feature_category: :observability + +# PostgreSQL query parsing +# +gem 'pg_query', '~> 6.1.0', feature_category: :database + +gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared +gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared + +gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications +gem 'gitlab-labkit', '~> 0.37.0', feature_category: :shared +gem 'thrift', '>= 0.16.0', feature_category: :shared + +# I18n +gem 'rails-i18n', '~> 7.0', '>= 7.0.9', feature_category: :internationalization +gem 'gettext_i18n_rails', '~> 1.13.0', feature_category: :internationalization +gem 'gettext', '~> 3.5', '>= 3.5.1', + require: false, + group: [:development, :test], + feature_category: :internationalization + +gem 'batch-loader', '~> 2.0.5', feature_category: :shared + +gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared + +# Perf bar +gem 'peek', '~> 1.1', feature_category: :shared + +# Google Cloud Profiler support +gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false, + feature_category: :shared + +# Snowplow events trackin +gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics + +# Metrics +gem 'webrick', '~> 1.9.0', require: false, feature_category: :shared +gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_category: :shared + +# Event-driven reactor for Ruby +# Required manually in config/initializers/require_async_gem +gem 'async', '~> 2.23.0', require: false, feature_category: :shared + +# Security report schemas used to validate CI job artifacts of security jobs +gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_category: :vulnerability_management + +# OpenTelemetry +group :opentelemetry do + # Core OpenTelemetry gems + gem 'opentelemetry-sdk', feature_category: :observability + gem 'opentelemetry-exporter-otlp', feature_category: :observability + + # OpenTelemetry gems selected from full set in `opentelemetry-instrumentation-all` metagem + gem 'opentelemetry-instrumentation-active_support', feature_category: :observability + gem 'opentelemetry-instrumentation-action_pack', feature_category: :observability + gem 'opentelemetry-instrumentation-active_job', feature_category: :observability + gem 'opentelemetry-instrumentation-active_record', feature_category: :observability + gem 'opentelemetry-instrumentation-action_view', feature_category: :observability + gem 'opentelemetry-instrumentation-aws_sdk', feature_category: :observability + gem 'opentelemetry-instrumentation-http', feature_category: :observability + gem 'opentelemetry-instrumentation-concurrent_ruby', feature_category: :observability + gem 'opentelemetry-instrumentation-ethon', feature_category: :observability + gem 'opentelemetry-instrumentation-excon', feature_category: :observability + gem 'opentelemetry-instrumentation-faraday', feature_category: :observability + gem 'opentelemetry-instrumentation-grape', feature_category: :observability + gem 'opentelemetry-instrumentation-graphql', feature_category: :observability + gem 'opentelemetry-instrumentation-http_client', feature_category: :observability + gem 'opentelemetry-instrumentation-net_http', feature_category: :observability + gem 'opentelemetry-instrumentation-pg', feature_category: :observability + gem 'opentelemetry-instrumentation-rack', feature_category: :observability + gem 'opentelemetry-instrumentation-rails', feature_category: :observability + gem 'opentelemetry-instrumentation-rake', feature_category: :observability + gem 'opentelemetry-instrumentation-redis', feature_category: :observability + gem 'opentelemetry-instrumentation-sidekiq', feature_category: :observability +end + +gem 'warning', '~> 1.5.0', feature_category: :shared + +group :development do + gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling + gem 'rubocop', feature_category: :tooling + + gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared + gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared + + gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared + gem 'lookbook', '~> 2.3', feature_category: :shared + + # Better errors handler + gem 'better_errors', '~> 2.10.1', feature_category: :shared + + gem 'sprite-factory', '~> 1.7', feature_category: :shared + + gem 'listen', '~> 3.7', feature_category: :shared + + gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling + + gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling + + gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling + + gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling + + # Used by + # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake` + # * `lib/tasks/gitlab/db/migration_squash.rake` + gem 'git', '~> 1.8', feature_category: :shared +end + +group :development, :test do + gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared + gem 'bullet', '~> 7.2.0', feature_category: :shared + gem 'parser', '= 3.3.8.0', feature_category: :shared + gem 'pry-byebug', feature_category: :shared + gem 'pry-rails', '~> 0.3.9', feature_category: :shared + gem 'pry-shell', '~> 0.6.4', feature_category: :shared + + gem 'awesome_print', require: false, feature_category: :shared + + gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database + gem 'rspec-rails', '~> 7.0.0', feature_category: :shared + gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling + + # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) + gem 'minitest', '~> 5.11.0', feature_category: :shared + + gem 'spring', '~> 4.3.0', feature_category: :shared + gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared + + gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false + gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false + + # Benchmarking & profiling + gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared + gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared + + # Profiling data from CI/CD pipelines + gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling + + gem 'knapsack', '~> 4.0.0', feature_category: :tooling + gem 'gitlab-crystalball', '~> 0.7.2', require: false, feature_category: :tooling + gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling + + gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared + + gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared + + gem 'parallel', '~> 1.19', require: false, feature_category: :shared + + gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared + + gem 'pact', '~> 1.64', feature_category: :shared + + # For now we only use vite in development / test, and not for production builds + # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 + gem 'vite_rails', '~> 3.0.17', feature_category: :shared + gem 'vite_ruby', '~> 3.9.0', feature_category: :shared + + gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling + + gem 'yard', '~> 0.9', require: false, feature_category: :tooling +end + +group :development, :test, :danger do + gem 'gitlab-dangerfiles', '~> 4.9.0', require: false, feature_category: :tooling +end + +group :development, :test, :coverage do + gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling + gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling + gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling + gem 'undercover', '~> 0.6.0', require: false, feature_category: :tooling +end + +# Gems required in omnibus-gitlab pipeline +group :development, :test, :omnibus do + gem 'license_finder', '~> 7.0', require: false, feature_category: :shared +end + +# Gems required in various pipelines +group :development, :test, :monorepo do + gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared + gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling +end + +group :test do + gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling + gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling + gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling + gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling + gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling + + gem 'capybara', '~> 3.40', feature_category: :test_platform + gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform + gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform + + gem 'graphlyte', '~> 1.0.0', feature_category: :shared + + gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared + gem 'email_spec', '~> 2.3.0', feature_category: :shared + gem 'webmock', '~> 3.25.0', feature_category: :shared + gem 'rails-controller-testing', feature_category: :shared + gem 'concurrent-ruby', '~> 1.1', feature_category: :shared + gem 'test-prof', '~> 1.4.0', feature_category: :tooling + gem 'rspec_junit_formatter', feature_category: :shared + gem 'guard-rspec', feature_category: :shared + gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling + gem 'state_machines-rspec', '~> 0.6', feature_category: :shared + + # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 + gem 'derailed_benchmarks', require: false, feature_category: :shared + + gem 'gitlab_quality-test_tooling', '~> 2.10.0', require: false, feature_category: :tooling +end + +gem 'octokit', '~> 9.0', feature_category: :importers +# Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688 +gem 'faraday-multipart', '~> 1.0', feature_category: :importers + +gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared + +gem 'email_reply_trimmer', '~> 0.1', feature_category: :shared +gem 'html2text', feature_category: :shared + +gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared +gem 'rbtrace', '~> 0.4', require: false, feature_category: :shared +gem 'memory_profiler', '~> 1.0', require: false, feature_category: :shared +gem 'activerecord-explain-analyze', '~> 0.1', require: false, feature_category: :shared + +# OAuth +gem 'oauth2', '~> 2.0', feature_category: :system_access + +# Health check +gem 'health_check', '~> 3.0', feature_category: :shared + +# System information +gem 'vmstat', '~> 2.3.0', feature_category: :shared +gem 'sys-filesystem', '~> 1.4.3', feature_category: :shared + +# NTP client +gem 'net-ntp', feature_category: :shared + +# SSH keys support +gem 'ssh_data', '~> 1.3', feature_category: :shared + +# Spamcheck GRPC protocol definitions +gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat + +# Gitaly GRPC protocol definitions +gem 'gitaly', '~> 17.8.0', feature_category: :gitaly + +# KAS GRPC protocol definitions +gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management + +# Lock the version before issues below are resolved: +# https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 +# Or we can upgrade to a more recent version as long as we can confirm +# that it doesn't have the same issues. +gem 'grpc', '= 1.63.0', feature_category: :shared + +gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared + +gem 'toml-rb', '~> 2.2.0', feature_category: :shared + +# Feature toggles +gem 'flipper', '~> 0.28.0', feature_category: :shared +gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared +gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared +gem 'unleash', '~> 3.2.2', feature_category: :shared +gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared + +# Structured logging +gem 'lograge', '~> 0.5', feature_category: :shared +gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api + +# DNS Lookup +gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared + +# Countries list +gem 'countries', '~> 4.0.0', feature_category: :shared + +gem 'retriable', '~> 3.1.2', feature_category: :shared + +# LRU cache +gem 'lru_redux', feature_category: :shared + +# Locked as long as quoted-printable encoding issues are not resolved +# Monkey-patched in `config/initializers/mail_encoding_patch.rb` +# See https://gitlab.com/gitlab-org/gitlab/issues/197386 +# +# `config/initializers/mail_starttls_patch.rb` has also been patched to +# fix STARTTLS handling until https://github.com/mikel/mail/pull/1536 is +# released. +gem 'mail', '= 2.8.1', feature_category: :shared +gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false, feature_category: :shared + +gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer', feature_category: :shared + +# File encryption +gem 'lockbox', '~> 1.3.0', feature_category: :shared + +# Email validation +gem 'valid_email', '~> 0.1', feature_category: :shared + +# JSON +gem 'jsonb_accessor', '~> 1.4', feature_category: :shared +gem 'json', '~> 2.11.0', feature_category: :shared +gem 'json_schemer', '~> 2.3.0', feature_category: :shared +gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared +gem 'oj-introspect', '~> 0.8', feature_category: :shared +gem 'multi_json', '~> 1.14.1', feature_category: :shared +gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared + +gem 'webauthn', '~> 3.0', feature_category: :shared + +# IPAddress utilities +gem 'ipaddress', '~> 0.8.3', feature_category: :shared + +gem 'parslet', '~> 1.8', feature_category: :shared + +gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff', feature_category: :shared + +gem 'ed25519', '~> 1.4.0', feature_category: :shared + +# Error Tracking OpenAPI client +# See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature +gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api', feature_category: :shared + +# Vulnerability advisories +gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software_composition_analysis + +# Work with RPM packages +gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry + +# Remote Development +gem 'devfile', '~> 0.4.4', feature_category: :workspaces + +# Apple plist parsing +gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops +gem 'app_store_connect', feature_category: :mobile_devops + +# For phone verification +gem 'telesignenterprise', '~> 2.2', feature_category: :insider_threat + +# BufferedIO patch +# Updating this version will require updating scripts/allowed_warnings.txt +gem 'net-protocol', '~> 0.1.3', feature_category: :shared +gem "nkf", "~> 0.2.0", feature_category: :shared + +# This is locked to 0.6.0 because we patch Net::HTTP#connect in +# gems/gitlab-http/lib/net_http/connect_patch.rb. +# It can be upgraded but care must be taken to preserve the patch. +gem 'net-http', '= 0.6.0', feature_category: :shared +# This is locked to 0.13.0 because the default parser changes from RFC2396 to RFC3986, +# which can be removed after Rails 7.2 upgrade +# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173142#note_2277952450 +gem 'uri', '= 0.13.2', feature_category: :shared + +gem 'duo_api', '~> 1.3', feature_category: :system_access + +gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation + +gem 'paper_trail', '~> 16.0', feature_category: :shared + +gem "i18n_data", "~> 0.13.1", feature_category: :system_access + +gem "gitlab-cloud-connector", "~> 1.11", require: 'gitlab/cloud_connector', feature_category: :cloud_connector diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock new file mode 100644 index 000000000000..bfb3ebad0845 --- /dev/null +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock @@ -0,0 +1,2430 @@ +PATH + remote: gems/activerecord-gitlab + specs: + activerecord-gitlab (0.2.0) + activerecord (>= 7) + +PATH + remote: gems/click_house-client + specs: + click_house-client (0.1.0) + activesupport (< 8) + addressable (~> 2.8) + json (~> 2.7) + +PATH + remote: gems/csv_builder + specs: + csv_builder (0.1.0) + +PATH + remote: gems/error_tracking_open_api + specs: + error_tracking_open_api (1.0.0) + typhoeus (~> 1.0, >= 1.0.1) + +PATH + remote: gems/gitlab-active-context + specs: + gitlab-active-context (0.0.1) + activerecord + activesupport + connection_pool + elasticsearch + opensearch-ruby + pg + zeitwerk + +PATH + remote: gems/gitlab-backup-cli + specs: + gitlab-backup-cli (0.0.1) + activerecord (>= 7) + activesupport (>= 7) + addressable (~> 2.8) + bigdecimal (~> 3.1) + concurrent-ruby (~> 1.1) + faraday (~> 2) + google-cloud-storage_transfer (~> 1.2.0) + google-protobuf (~> 3.25, >= 3.25.3) + googleauth (~> 1.8.1) + grpc (= 1.63.0) + json (~> 2.7) + jwt (~> 2.5) + logger (~> 1.5) + minitest (~> 5.11.0) + mutex_m (~> 0.3) + parallel (~> 1.19) + pg (~> 1.5.6) + rack (~> 2.2.9) + rainbow (~> 3.0) + rexml (~> 3.4.0) + thor (~> 1.3) + +PATH + remote: gems/gitlab-housekeeper + specs: + gitlab-housekeeper (0.1.0) + activesupport + awesome_print + httparty + rubocop + +PATH + remote: gems/gitlab-http + specs: + gitlab-http (0.1.0) + activesupport (~> 7) + concurrent-ruby (~> 1.2) + httparty (~> 0.21) + ipaddress (~> 0.8.3) + net-http (= 0.6.0) + railties (~> 7) + +PATH + remote: gems/gitlab-rspec_flaky + specs: + gitlab-rspec_flaky (0.1.0) + activesupport (>= 6.1, < 8) + rspec (~> 3.0) + +PATH + remote: gems/gitlab-rspec + specs: + gitlab-rspec (0.1.0) + activerecord (>= 6.1, < 8) + activesupport (>= 6.1, < 8) + rspec (~> 3.0) + +PATH + remote: gems/gitlab-safe_request_store + specs: + gitlab-safe_request_store (0.1.0) + rack (~> 2.2.8) + request_store + +PATH + remote: gems/gitlab-schema-validation + specs: + gitlab-schema-validation (0.1.0) + diffy + pg_query + +PATH + remote: gems/gitlab-utils + specs: + gitlab-utils (0.1.0) + actionview (>= 6.1.7.2) + activesupport (>= 6.1.7.2) + addressable (~> 2.8) + rake (~> 13.0) + +PATH + remote: gems/ipynbdiff + specs: + ipynbdiff (0.4.8) + diffy (~> 3.4) + oj (~> 3.16, >= 3.16.10) + +PATH + remote: vendor/gems/attr_encrypted + specs: + attr_encrypted (3.2.4) + encryptor (~> 3.0.0) + +PATH + remote: vendor/gems/bundler-checksum + specs: + bundler-checksum (0.1.0) + bundler + +PATH + remote: vendor/gems/cloud_profiler_agent + specs: + cloud_profiler_agent (0.0.1.pre) + google-cloud-profiler-v2 (~> 0.3) + google-protobuf (~> 3.25) + googleauth (>= 0.14) + stackprof (~> 0.2) + +PATH + remote: vendor/gems/devise-pbkdf2-encryptable + specs: + devise-pbkdf2-encryptable (0.0.0) + devise (~> 4.0) + devise-two-factor (~> 4.1.1) + +PATH + remote: vendor/gems/diff_match_patch + specs: + diff_match_patch (0.1.0) + +PATH + remote: vendor/gems/gitlab-duo-workflow-service-client + specs: + gitlab-duo-workflow-service-client (0.1) + grpc + +PATH + remote: vendor/gems/gitlab-topology-service-client + specs: + gitlab-topology-service-client (0.1) + google-protobuf (~> 3) + grpc + +PATH + remote: vendor/gems/mail-smtp_pool + specs: + mail-smtp_pool (0.1.0) + connection_pool (~> 2.0) + mail (~> 2.8) + +PATH + remote: vendor/gems/microsoft_graph_mailer + specs: + microsoft_graph_mailer (0.1.0) + mail (~> 2.7) + oauth2 (>= 1.4.4, < 3) + +PATH + remote: vendor/gems/omniauth-gitlab + specs: + omniauth-gitlab (4.0.0) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8) + +PATH + remote: vendor/gems/omniauth-salesforce + specs: + omniauth-salesforce (1.0.5) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.0) + +PATH + remote: vendor/gems/omniauth_crowd + specs: + omniauth_crowd (2.4.0) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 2.0) + +PATH + remote: vendor/gems/sidekiq-reliable-fetch + specs: + gitlab-sidekiq-fetcher (0.12.1) + json (>= 2.5) + sidekiq (~> 7.0) + +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + RedCloth (4.3.4) + acme-client (2.0.21) + base64 (~> 0.2.0) + faraday (>= 1.0, < 3.0.0) + faraday-retry (>= 1.0, < 3.0.0) + actioncable (7.1.5.1) + actionpack (= 7.1.5.1) + activesupport (= 7.1.5.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + zeitwerk (~> 2.6) + actionmailbox (7.1.5.1) + actionpack (= 7.1.5.1) + activejob (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.1.5.1) + actionpack (= 7.1.5.1) + actionview (= 7.1.5.1) + activejob (= 7.1.5.1) + activesupport (= 7.1.5.1) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.2) + actionpack (7.1.5.1) + actionview (= 7.1.5.1) + activesupport (= 7.1.5.1) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.5.1) + actionpack (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.1.5.1) + activesupport (= 7.1.5.1) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.5.1) + activesupport (= 7.1.5.1) + globalid (>= 0.3.6) + activemodel (7.1.5.1) + activesupport (= 7.1.5.1) + activerecord (7.1.5.1) + activemodel (= 7.1.5.1) + activesupport (= 7.1.5.1) + timeout (>= 0.4.0) + activerecord-explain-analyze (0.1.0) + activerecord (>= 4) + pg + activestorage (7.1.5.1) + actionpack (= 7.1.5.1) + activejob (= 7.1.5.1) + activerecord (= 7.1.5.1) + activesupport (= 7.1.5.1) + marcel (~> 1.0) + activesupport (7.1.5.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) + tzinfo (~> 2.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + aes_key_wrap (1.1.0) + akismet (3.0.0) + aliyun-sdk (0.8.0) + nokogiri (~> 1.6) + rest-client (~> 2.0) + amatch (0.4.1) + mize + tins (~> 1.0) + android_key_attestation (0.3.0) + apollo_upload_server (2.1.6) + actionpack (>= 6.1.6) + graphql (>= 1.8) + app_store_connect (0.38.0) + activesupport (>= 6.0.0) + jwt (>= 1.4) + zeitwerk (>= 2.6.7) + arr-pm (0.0.12) + asciidoctor (2.0.23) + asciidoctor-include-ext (0.4.0) + asciidoctor (>= 1.5.6, < 3.0.0) + asciidoctor-kroki (0.10.0) + asciidoctor (~> 2.0) + asciidoctor-plantuml (0.0.16) + asciidoctor (>= 2.0.17, < 3.0.0) + ast (2.4.2) + async (2.23.1) + console (~> 1.29) + fiber-annotation + io-event (~> 1.9) + metrics (~> 0.12) + traces (~> 0.15) + atlassian-jwt (0.2.1) + jwt (~> 2.1) + attr_required (1.0.2) + awesome_print (1.9.2) + awrence (1.2.1) + aws-eventstream (1.3.0) + aws-partitions (1.1001.0) + aws-sdk-cloudformation (1.41.0) + aws-sdk-core (~> 3, >= 3.99.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.223.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 + jmespath (~> 1, >= 1.6.1) + logger + aws-sdk-kms (1.76.0) + aws-sdk-core (~> 3, >= 3.188.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.185.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.9.1) + aws-eventstream (~> 1, >= 1.0.2) + axe-core-api (4.10.3) + dumb_delegator + ostruct + virtus + axe-core-rspec (4.10.3) + axe-core-api (= 4.10.3) + dumb_delegator + ostruct + virtus + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) + babosa (2.0.0) + backport (1.2.0) + base32 (0.3.4) + base64 (0.2.0) + batch-loader (2.0.5) + bcrypt (3.1.20) + benchmark (0.4.0) + benchmark-ips (2.14.0) + benchmark-malloc (0.2.0) + benchmark-memory (0.2.0) + memory_profiler (~> 1) + benchmark-perf (0.6.0) + benchmark-trend (0.4.0) + better_errors (2.10.1) + erubi (>= 1.0.0) + rack (>= 0.9.0) + rouge (>= 1.0.0) + bigdecimal (3.1.7) + bindata (2.4.11) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) + bootsnap (1.18.4) + msgpack (~> 1.2) + browser (5.3.1) + builder (3.2.4) + bullet (7.2.0) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.11) + byebug (12.0.0) + capybara (3.40.0) + addressable + matrix + mini_mime (>= 0.1.3) + nokogiri (~> 1.11) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) + capybara-screenshot (1.0.26) + capybara (>= 1.0, < 4) + launchy + carrierwave (1.3.4) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + ssrf_filter (~> 1.0, < 1.1.0) + cbor (0.5.9.8) + character_set (1.8.0) + charlock_holmes (0.7.9) + chef-config (18.3.0) + addressable + chef-utils (= 18.3.0) + fuzzyurl + mixlib-config (>= 2.2.12, < 4.0) + mixlib-shellout (>= 2.0, < 4.0) + tomlrb (~> 1.2) + chef-utils (18.3.0) + concurrent-ruby + chunky_png (1.4.0) + circuitbox (2.0.0) + citrus (3.0.2) + claide (1.1.0) + claide-plugins (0.9.2) + cork + nap + open4 (~> 1.3) + coderay (1.1.3) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) + colored2 (3.1.2) + commonmarker (0.23.11) + concurrent-ruby (1.2.3) + connection_pool (2.5.3) + console (1.29.2) + fiber-annotation + fiber-local (~> 1.1) + json + cork (0.3.0) + colored2 (~> 3.1) + cose (1.3.0) + cbor (~> 0.5.9) + openssl-signature_algorithm (~> 1.0) + countries (4.0.1) + i18n_data (~> 0.13.0) + sixarm_ruby_unaccent (~> 1.1) + coverband (6.1.5) + base64 + redis (>= 3.0) + crack (0.4.3) + safe_yaml (~> 1.0.0) + crass (1.0.6) + creole (0.5.0) + css_parser (1.14.0) + addressable + cssbundling-rails (1.4.3) + railties (>= 6.0.0) + csv (3.3.0) + cvss-suite (3.3.0) + danger (9.4.2) + claide (~> 1.0) + claide-plugins (>= 0.9.2) + colored2 (~> 3.1) + cork (~> 0.1) + faraday (>= 0.9.0, < 3.0) + faraday-http-cache (~> 2.0) + git (~> 1.13) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.0) + no_proxy_fix + octokit (>= 4.0) + terminal-table (>= 1, < 4) + danger-gitlab (8.0.0) + danger + gitlab (~> 4.2, >= 4.2.0) + database_cleaner-active_record (2.2.0) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) + date (3.4.1) + deb_version (1.0.2) + debug_inspector (1.1.0) + deckar01-task_list (2.3.4) + html-pipeline (~> 2.0) + declarative (0.0.20) + declarative_policy (1.1.0) + deprecation_toolkit (2.2.3) + activesupport (>= 6.1) + derailed_benchmarks (2.2.1) + base64 + benchmark-ips (~> 2) + bigdecimal + drb + get_process_mem + heapy (~> 0) + logger + memory_profiler (>= 0, < 2) + mini_histogram (>= 0.3.0) + mutex_m + ostruct + rack (>= 1) + rack-test + rake (> 10, < 14) + ruby-statistics (>= 4.0.1) + ruby2_keywords + thor (>= 0.19, < 2) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + devfile (0.4.4) + device_detector (1.0.0) + devise (4.9.4) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0) + responders + warden (~> 1.2.3) + devise-two-factor (4.1.1) + activesupport (~> 7.0) + attr_encrypted (>= 1.3, < 5, != 2) + devise (~> 4.0) + railties (~> 7.0) + rotp (~> 6.0) + diff-lcs (1.5.0) + diffy (3.4.3) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + docile (1.4.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + doorkeeper (5.8.2) + railties (>= 5) + doorkeeper-device_authorization_grant (1.0.3) + doorkeeper (~> 5.5) + doorkeeper-openid_connect (1.8.11) + doorkeeper (>= 5.5, < 5.9) + jwt (>= 2.5) + ostruct (>= 0.5) + dotenv (2.7.6) + drb (2.2.1) + dry-cli (1.0.0) + dry-core (1.0.1) + concurrent-ruby (~> 1.0) + zeitwerk (~> 2.6) + dry-inflector (1.0.0) + dry-logic (1.5.0) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) + dry-types (1.7.1) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0) + dry-inflector (~> 1.0) + dry-logic (~> 1.4) + zeitwerk (~> 2.6) + dumb_delegator (1.0.0) + duo_api (1.4.0) + ed25519 (1.4.0) + elasticsearch (7.17.11) + elasticsearch-api (= 7.17.11) + elasticsearch-transport (= 7.17.11) + elasticsearch-api (7.17.11) + multi_json + elasticsearch-model (7.2.1) + activesupport (> 3) + elasticsearch (~> 7) + hashie + elasticsearch-rails (7.2.1) + elasticsearch-transport (7.17.11) + base64 + faraday (>= 1, < 3) + multi_json + email_reply_trimmer (0.1.6) + email_spec (2.3.0) + htmlentities (~> 4.3.3) + launchy (>= 2.1, < 4.0) + mail (~> 2.7) + email_validator (2.2.4) + activemodel + encryptor (3.0.0) + erubi (1.12.0) + escape_utils (1.3.0) + et-orbi (1.2.11) + tzinfo + ethon (0.16.0) + ffi (>= 1.15.0) + excon (0.99.0) + execjs (2.8.1) + expgen (0.1.1) + parslet + expression_parser (0.9.0) + extended-markdown-filter (0.7.0) + html-pipeline (~> 2.9) + factory_bot (6.5.0) + activesupport (>= 5.0.0) + factory_bot_rails (6.4.4) + factory_bot (~> 6.5) + railties (>= 5.0.0) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-http-cache (2.5.0) + faraday (>= 0.8) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) + faraday-net_http (3.1.0) + net-http + faraday-net_http_persistent (2.1.0) + faraday (~> 2.5) + net-http-persistent (~> 4.0) + faraday-retry (2.2.1) + faraday (~> 2.0) + faraday-typhoeus (1.1.0) + faraday (~> 2.0) + typhoeus (~> 1.4) + faraday_middleware-aws-sigv4 (1.0.1) + aws-sigv4 (~> 1.0) + faraday (>= 2.0, < 3) + fast_blank (1.0.1) + fast_gettext (4.1.0) + prime + racc + ffaker (2.24.0) + ffi (1.17.2) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + ffi-yajl (2.6.0) + libyajl2 (>= 1.2) + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (0.1.2) + find_a_port (1.0.1) + flipper (0.28.3) + concurrent-ruby (< 2) + flipper-active_record (0.28.3) + activerecord (>= 4.2, < 8) + flipper (~> 0.28.3) + flipper-active_support_cache_store (0.28.3) + activesupport (>= 4.2, < 8) + flipper (~> 0.28.3) + fog-aliyun (0.4.0) + addressable (~> 2.8.0) + aliyun-sdk (~> 0.8.0) + fog-core + fog-json + ipaddress (~> 0.8) + xml-simple (~> 1.1) + fog-aws (3.27.0) + base64 (~> 0.2.0) + fog-core (~> 2.1) + fog-json (~> 1.1) + fog-xml (~> 0.1) + fog-core (2.1.0) + builder + excon (~> 0.58) + formatador (~> 0.2) + mime-types + fog-google (1.24.1) + addressable (>= 2.7.0) + fog-core (< 2.5) + fog-json (~> 1.2) + fog-xml (~> 0.1.0) + google-apis-compute_v1 (~> 0.53) + google-apis-dns_v1 (~> 0.28) + google-apis-iamcredentials_v1 (~> 0.15) + google-apis-monitoring_v3 (~> 0.37) + google-apis-pubsub_v1 (~> 0.30) + google-apis-sqladmin_v1beta4 (~> 0.38) + google-apis-storage_v1 (>= 0.19, < 1) + google-cloud-env (>= 1.2, < 3.0) + fog-json (1.2.0) + fog-core + multi_json (~> 1.10) + fog-local (0.8.0) + fog-core (>= 1.27, < 3.0) + fog-xml (0.1.5) + fog-core + nokogiri (>= 1.5.11, < 2.0.0) + formatador (0.2.5) + forwardable (1.3.3) + fugit (1.11.1) + et-orbi (~> 1, >= 1.2.11) + raabro (~> 1.4) + fuzzyurl (0.9.0) + gapic-common (0.20.0) + faraday (>= 1.9, < 3.a) + faraday-retry (>= 1.0, < 3.a) + google-protobuf (~> 3.14) + googleapis-common-protos (>= 1.3.12, < 2.a) + googleapis-common-protos-types (>= 1.3.1, < 2.a) + googleauth (~> 1.0) + grpc (~> 1.36) + gdk-toogle (0.9.5) + haml + rails (>= 7.0.4.2) + gemoji (3.0.1) + get_process_mem (0.2.7) + ffi (~> 1.0) + gettext (3.5.1) + erubi + locale (>= 2.0.5) + prime + racc + text (>= 1.3.0) + gettext_i18n_rails (1.13.0) + fast_gettext (>= 0.9.0) + git (1.19.1) + addressable (~> 2.8) + rchardet (~> 1.8) + gitaly (17.8.4) + grpc (~> 1.0) + gitlab (4.19.0) + httparty (~> 0.20) + terminal-table (>= 1.5.1) + gitlab-chronic (0.10.6) + numerizer (~> 0.2) + gitlab-cloud-connector (1.12.0) + activesupport (~> 7.0) + jwt (~> 2.9.3) + gitlab-crystalball (0.7.2) + git (< 4) + gitlab-dangerfiles (4.9.1) + danger (>= 9.3.0) + danger-gitlab (>= 8.0.0) + rake (~> 13.0) + gitlab-experiment (0.9.1) + activesupport (>= 3.0) + request_store (>= 1.0) + gitlab-fog-azure-rm (2.2.0) + faraday (~> 2.0) + faraday-follow_redirects (~> 0.3.0) + faraday-net_http_persistent (~> 2.0) + fog-core (~> 2.1) + fog-json (~> 1.2) + mime-types + net-http-persistent (~> 4.0) + nokogiri (~> 1, >= 1.10.8) + gitlab-glfm-markdown (0.0.30) + rb_sys (~> 0.9.109) + gitlab-kas-grpc (17.11.2) + grpc (~> 1.0) + gitlab-labkit (0.37.0) + actionpack (>= 5.0.0, < 8.1.0) + activesupport (>= 5.0.0, < 8.1.0) + grpc (>= 1.62) + jaeger-client (~> 1.1.0) + opentracing (~> 0.4) + pg_query (>= 5.1.0, < 7.0) + redis (> 3.0.0, < 6.0.0) + gitlab-license (2.6.0) + gitlab-mail_room (0.0.27) + jwt (>= 2.0) + net-imap (>= 0.2.1) + oauth2 (>= 1.4.4, < 3) + redis (>= 5, < 6) + redis-namespace (>= 1.8.2) + gitlab-markup (2.0.0) + gitlab-net-dns (0.12.0) + logger + gitlab-sdk (0.3.1) + activesupport (>= 5.2.0) + rake (~> 13.0) + snowplow-tracker (~> 0.8.0) + gitlab-secret_detection (0.26.1) + grpc (~> 1.63.0) + grpc_reflection (~> 0.1) + parallel (~> 1) + re2 (~> 2.7) + sentry-ruby (~> 5.22) + stackprof (~> 0.2.27) + toml-rb (~> 2.2) + gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1) + activesupport (>= 6, < 8) + json_schemer (~> 2.3.0) + gitlab-styles (13.1.0) + rubocop (= 1.71.1) + rubocop-capybara (~> 2.21.0) + rubocop-factory_bot (~> 2.26.1) + rubocop-graphql (~> 1.5.4) + rubocop-performance (~> 1.21.1) + rubocop-rails (~> 2.26.0) + rubocop-rspec (~> 3.0.4) + rubocop-rspec_rails (~> 2.30.0) + gitlab_chronic_duration (0.12.0) + numerizer (~> 0.2) + gitlab_omniauth-ldap (2.2.0) + net-ldap (~> 0.16) + omniauth (>= 1.3, < 3) + pyu-ruby-sasl (>= 0.0.3.3, < 0.1) + rubyntlm (~> 0.5) + gitlab_quality-test_tooling (2.10.0) + activesupport (>= 7.0, < 7.3) + amatch (~> 0.4.1) + fog-google (~> 1.24, >= 1.24.1) + gitlab (>= 4.19, < 6.0) + http (~> 5.0) + influxdb-client (~> 3.1) + nokogiri (~> 1.10) + parallel (>= 1, < 2) + rainbow (>= 3, < 4) + rspec-parameterized (~> 1.0.0) + table_print (= 1.5.7) + zeitwerk (>= 2, < 3) + globalid (1.1.0) + activesupport (>= 5.0) + gon (6.4.0) + actionpack (>= 3.0.20) + i18n (>= 0.7) + multi_json + request_store (>= 1.0) + google-apis-androidpublisher_v3 (0.34.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-cloudbilling_v1 (0.22.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-cloudresourcemanager_v1 (0.31.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-compute_v1 (0.57.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-container_v1 (0.43.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-container_v1beta1 (0.43.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-core (0.11.2) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + webrick + google-apis-dns_v1 (0.36.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-iam_v1 (0.36.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-iamcredentials_v1 (0.15.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-monitoring_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-pubsub_v1 (0.45.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-serviceusage_v1 (0.28.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-sqladmin_v1beta4 (0.41.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-storage_v1 (0.29.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-artifact_registry-v1 (0.11.0) + gapic-common (>= 0.20.0, < 2.a) + google-cloud-errors (~> 1.0) + google-cloud-location (>= 0.4, < 2.a) + grpc-google-iam-v1 (~> 1.1) + google-cloud-common (1.1.0) + google-protobuf (~> 3.14) + googleapis-common-protos-types (~> 1.2) + google-cloud-compute-v1 (2.6.0) + gapic-common (>= 0.20.0, < 2.a) + google-cloud-common (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-core (1.7.0) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (2.1.1) + faraday (>= 1.0, < 3.a) + google-cloud-errors (1.3.0) + google-cloud-location (0.6.0) + gapic-common (>= 0.20.0, < 2.a) + google-cloud-errors (~> 1.0) + google-cloud-profiler-v2 (0.4.0) + gapic-common (>= 0.18.0, < 2.a) + google-cloud-errors (~> 1.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.29.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + google-cloud-storage_transfer (1.2.0) + google-cloud-core (~> 1.6) + google-cloud-storage_transfer-v1 (>= 0.5, < 2.a) + google-cloud-storage_transfer-v1 (0.8.0) + gapic-common (>= 0.20.0, < 2.a) + google-cloud-errors (~> 1.0) + google-protobuf (3.25.7) + googleapis-common-protos (1.4.0) + google-protobuf (~> 3.14) + googleapis-common-protos-types (~> 1.2) + grpc (~> 1.27) + googleapis-common-protos-types (1.19.0) + google-protobuf (>= 3.18, < 5.a) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + gpgme (2.0.24) + mini_portile2 (~> 2.7) + grape (2.0.0) + activesupport (>= 5) + builder + dry-types (>= 1.1) + mustermann-grape (~> 1.0.0) + rack (>= 1.3.0) + rack-accept + grape-entity (1.0.1) + activesupport (>= 3.0.0) + multi_json (>= 1.3.2) + grape-path-helpers (2.0.1) + activesupport + grape (~> 2.0) + rake (> 12) + ruby2_keywords (~> 0.0.2) + grape-swagger (2.1.2) + grape (>= 1.7, < 3.0) + rack-test (~> 2) + grape-swagger-entity (0.5.5) + grape-entity (~> 1) + grape-swagger (~> 2) + grape_logging (1.8.4) + grape + rack + graphlyte (1.0.0) + graphql (2.4.13) + base64 + fiber-storage + logger + graphql-docs (5.0.0) + commonmarker (~> 0.23, >= 0.23.6) + escape_utils (~> 1.2) + extended-markdown-filter (~> 0.4) + gemoji (~> 3.0) + graphql (~> 2.0) + html-pipeline (~> 2.14, >= 2.14.3) + sass-embedded (~> 1.58) + grpc (1.63.0) + google-protobuf (~> 3.25) + googleapis-common-protos-types (~> 1.0) + grpc-google-iam-v1 (1.5.0) + google-protobuf (~> 3.18) + googleapis-common-protos (~> 1.4) + grpc (~> 1.41) + grpc_reflection (0.1.1) + grpc + gssapi (1.3.1) + ffi (>= 1.0.1) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-rspec (4.7.3) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) + haml (5.2.2) + temple (>= 0.8.0) + tilt + haml_lint (0.62.0) + haml (>= 5.0) + parallel (~> 1.10) + rainbow + rubocop (>= 1.0) + sysexits (~> 1.1) + hamlit (2.15.0) + temple (>= 0.8.2) + thor + tilt + hana (1.3.7) + hashdiff (1.1.0) + hashie (5.0.0) + health_check (3.1.0) + railties (>= 5.0) + heapy (0.2.0) + thor + html-pipeline (2.14.3) + activesupport (>= 2) + nokogiri (>= 1.4) + html2text (0.2.0) + nokogiri (~> 1.6) + htmlbeautifier (1.4.2) + htmlentities (4.3.4) + http (5.1.1) + addressable (~> 2.8) + http-cookie (~> 1.0) + http-form_data (~> 2.2) + llhttp-ffi (~> 0.4.0) + http-accept (1.7.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + http-form_data (2.3.0) + httparty (0.22.0) + csv + mini_mime (>= 1.0.0) + multi_xml (>= 0.5.2) + httpclient (2.8.3) + i18n (1.14.4) + concurrent-ruby (~> 1.0) + i18n_data (0.13.1) + icalendar (2.10.3) + ice_cube (~> 0.16) + ostruct + ice_cube (0.16.4) + ice_nine (0.11.2) + imagen (0.2.0) + parser (>= 2.5, != 2.5.1.1) + influxdb-client (3.2.0) + csv + invisible_captcha (2.1.0) + rails (>= 5.2) + io-console (0.8.0) + io-event (1.9.0) + ipaddress (0.8.3) + irb (1.15.1) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + jaeger-client (1.1.0) + opentracing (~> 0.3) + thrift + jaro_winkler (1.6.0) + jira-ruby (2.3.0) + activesupport + atlassian-jwt + multipart-post + oauth (~> 0.5, >= 0.5.0) + jmespath (1.6.2) + js_regex (3.8.0) + character_set (~> 1.4) + regexp_parser (~> 2.5) + regexp_property_values (~> 1.0) + json (2.11.3) + json-jwt (1.16.6) + activesupport (>= 4.2) + aes_key_wrap + base64 + bindata + faraday (~> 2.0) + faraday-follow_redirects + json_schemer (2.3.0) + bigdecimal + hana (~> 1.3) + regexp_parser (~> 2.0) + simpleidn (~> 0.2) + jsonb_accessor (1.4) + activerecord (>= 6.1) + activesupport (>= 6.1) + pg (>= 0.18.1) + jsonpath (1.1.2) + multi_json + jwt (2.9.3) + base64 + kaminari (1.2.2) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) + actionview + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) + activerecord + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) + knapsack (4.0.0) + rake + kramdown (2.5.1) + rexml (>= 3.3.9) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + kubeclient (4.11.0) + http (>= 3.0, < 6.0) + jsonpath (~> 1.0) + recursive-open-struct (~> 1.1, >= 1.1.1) + rest-client (~> 2.0) + language_server-protocol (3.17.0.3) + launchy (2.5.2) + addressable (~> 2.8) + lefthook (1.11.5) + letter_opener (1.10.0) + launchy (>= 2.2, < 4) + letter_opener_web (3.0.0) + actionmailer (>= 6.1) + letter_opener (~> 1.9) + railties (>= 6.1) + rexml + libyajl2 (2.1.0) + license_finder (7.2.1) + bundler + csv (~> 3.2) + rubyzip (>= 1, < 3) + thor (~> 1.2) + tomlrb (>= 1.3, < 2.1) + with_env (= 1.1.0) + xml-simple (~> 1.1.9) + licensee (9.18.0) + dotenv (>= 2, < 4) + octokit (>= 4.20, < 10.0) + reverse_markdown (>= 1, < 4) + rugged (>= 0.24, < 2.0) + thor (>= 0.19, < 2.0) + listen (3.7.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) + locale (2.1.4) + lockbox (1.3.0) + logger (1.6.6) + lograge (0.11.2) + actionpack (>= 4) + activesupport (>= 4) + railties (>= 4) + request_store (~> 1.0) + loofah (2.24.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + lookbook (2.3.4) + activemodel + css_parser + htmlbeautifier (~> 1.3) + htmlentities (~> 4.3.4) + marcel (~> 1.0) + railties (>= 5.0) + redcarpet (~> 3.5) + rouge (>= 3.26, < 5.0) + view_component (>= 2.0) + yard (~> 0.9) + zeitwerk (~> 2.5) + lru_redux (1.1.0) + lumberjack (1.2.7) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) + marginalia (1.11.1) + actionpack (>= 5.2) + activerecord (>= 5.2) + matrix (0.4.2) + memory_profiler (1.0.1) + method_source (1.0.0) + metrics (0.12.1) + mime-types (3.5.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2023.1003) + mini_histogram (0.3.1) + mini_magick (4.12.0) + mini_mime (1.1.2) + mini_portile2 (2.8.8) + minitest (5.11.3) + mixlib-cli (2.1.8) + mixlib-config (3.0.27) + tomlrb + mixlib-log (3.2.3) + ffi (>= 1.15.5) + mixlib-shellout (3.2.7) + chef-utils + mize (0.6.1) + msgpack (1.5.4) + multi_json (1.14.1) + multi_xml (0.6.0) + multipart-post (2.2.3) + murmurhash3 (0.1.7) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + mustermann-grape (1.0.2) + mustermann (>= 1.0.0) + mutex_m (0.3.0) + nap (1.1.0) + nenv (0.3.0) + net-http (0.6.0) + uri + net-http-persistent (4.0.5) + connection_pool (~> 2.2) + net-imap (0.5.6) + date + net-protocol + net-ldap (0.17.1) + net-ntp (2.1.3) + net-pop (0.1.2) + net-protocol + net-protocol (0.1.3) + timeout + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-smtp (0.3.3) + net-protocol + net-ssh (7.3.0) + netrc (0.11.0) + nio4r (2.7.0) + nkf (0.2.0) + no_proxy_fix (0.1.2) + nokogiri (1.18.8) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + numerizer (0.2.0) + oauth (0.5.6) + oauth2 (2.0.9) + faraday (>= 0.17.3, < 3.0) + jwt (>= 1.0, < 3.0) + multi_xml (~> 0.5) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + observer (0.1.2) + octokit (9.2.0) + faraday (>= 1, < 3) + sawyer (~> 0.9) + ohai (18.1.18) + chef-config (>= 14.12, < 19) + chef-utils (>= 16.0, < 19) + ffi (~> 1.9) + ffi-yajl (~> 2.2) + ipaddress + mixlib-cli (>= 1.7.0) + mixlib-config (>= 2.0, < 4.0) + mixlib-log (>= 2.0.1, < 4.0) + mixlib-shellout (~> 3.2, >= 3.2.5) + plist (~> 3.1) + train-core + wmi-lite (~> 1.0) + oj (3.16.10) + bigdecimal (>= 3.0) + ostruct (>= 0.2) + oj-introspect (0.8.0) + oj (>= 3.16.10) + omniauth (2.1.2) + hashie (>= 3.4.6) + rack (>= 2.2.3) + rack-protection + omniauth-alicloud (3.0.0) + omniauth-oauth2 (~> 1.8) + omniauth-atlassian-oauth2 (0.2.0) + omniauth (>= 1.1.1) + omniauth-oauth2 (>= 1.5) + omniauth-auth0 (3.1.1) + omniauth (~> 2) + omniauth-oauth2 (~> 1) + omniauth-azure-activedirectory-v2 (2.0.0) + omniauth-oauth2 (~> 1.8) + omniauth-github (2.0.1) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8) + omniauth-google-oauth2 (1.1.1) + jwt (>= 2.0) + oauth2 (~> 2.0.6) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8.0) + omniauth-oauth2 (1.8.0) + oauth2 (>= 1.4, < 3) + omniauth (~> 2.0) + omniauth-oauth2-generic (0.2.8) + omniauth-oauth2 (~> 1.0) + rake + omniauth-saml (2.2.3) + omniauth (~> 2.1) + ruby-saml (~> 1.18) + omniauth-shibboleth-redux (2.0.0) + omniauth (>= 2.0.0) + omniauth_openid_connect (0.8.0) + omniauth (>= 1.9, < 3) + openid_connect (~> 2.2) + open4 (1.3.4) + openid_connect (2.3.1) + activemodel + attr_required (>= 1.0.0) + email_validator + faraday (~> 2.0) + faraday-follow_redirects + json-jwt (>= 1.16) + mail + rack-oauth2 (~> 2.2) + swd (~> 2.0) + tzinfo + validate_url + webfinger (~> 2.0) + opensearch-ruby (3.4.0) + faraday (>= 1.0, < 3) + multi_json (>= 1.0) + openssl (3.2.0) + openssl-signature_algorithm (1.3.0) + openssl (> 2.0) + opentelemetry-api (1.2.5) + opentelemetry-common (0.21.0) + opentelemetry-api (~> 1.0) + opentelemetry-exporter-otlp (0.29.1) + google-protobuf (>= 3.18) + googleapis-common-protos-types (~> 1.3) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-sdk (~> 1.2) + opentelemetry-semantic_conventions + opentelemetry-helpers-sql-obfuscation (0.1.0) + opentelemetry-common (~> 0.20) + opentelemetry-instrumentation-action_mailer (0.2.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-active_support (~> 0.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-action_pack (0.10.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-instrumentation-action_view (0.7.3) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-active_support (~> 0.6) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_job (0.7.8) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_record (0.8.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_support (0.6.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-aws_sdk (0.7.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-base (0.22.3) + opentelemetry-api (~> 1.0) + opentelemetry-registry (~> 0.1) + opentelemetry-instrumentation-concurrent_ruby (0.21.4) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-ethon (0.21.9) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-excon (0.22.5) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-faraday (0.24.7) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-grape (0.2.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-instrumentation-graphql (0.28.4) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http (0.23.5) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http_client (0.22.8) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-net_http (0.22.8) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-pg (0.29.1) + opentelemetry-api (~> 1.0) + opentelemetry-helpers-sql-obfuscation + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (0.25.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rails (0.33.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-action_mailer (~> 0.2.0) + opentelemetry-instrumentation-action_pack (~> 0.10.0) + opentelemetry-instrumentation-action_view (~> 0.7.0) + opentelemetry-instrumentation-active_job (~> 0.7.0) + opentelemetry-instrumentation-active_record (~> 0.8.0) + opentelemetry-instrumentation-active_support (~> 0.6.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rake (0.2.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-redis (0.25.7) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-sidekiq (0.25.7) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-registry (0.3.0) + opentelemetry-api (~> 1.1) + opentelemetry-sdk (1.6.0) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-registry (~> 0.2) + opentelemetry-semantic_conventions + opentelemetry-semantic_conventions (1.10.0) + opentelemetry-api (~> 1.0) + opentracing (0.5.0) + optimist (3.0.1) + org-ruby (0.9.12) + rubypants (~> 0.2) + orm_adapter (0.5.0) + os (1.1.4) + ostruct (0.6.1) + pact (1.64.0) + pact-mock_service (~> 3.0, >= 3.3.1) + pact-support (~> 1.16, >= 1.16.9) + rack-test (>= 0.6.3, < 3.0.0) + rspec (~> 3.0) + term-ansicolor (~> 1.7) + thor (>= 0.20, < 2.0) + webrick (~> 1.8) + pact-mock_service (3.11.2) + find_a_port (~> 1.0.1) + json + pact-support (~> 1.16, >= 1.16.4) + rack (~> 2.0) + rspec (>= 2.14) + thor (>= 0.19, < 2.0) + webrick (~> 1.8) + pact-support (1.20.0) + awesome_print (~> 1.9) + diff-lcs (~> 1.5) + expgen (~> 0.1) + rainbow (~> 3.1.1) + paper_trail (16.0.0) + activerecord (>= 6.1) + request_store (~> 1.4) + parallel (1.26.3) + parser (3.3.8.0) + ast (~> 2.4.1) + racc + parslet (1.8.2) + pastel (0.8.0) + tty-color (~> 0.5) + pdf-core (0.10.0) + peek (1.1.0) + railties (>= 4.0.0) + pg (1.5.9) + pg_query (6.1.0) + google-protobuf (>= 3.25.3) + plist (3.7.0) + png_quantizator (0.2.1) + pp (0.6.2) + prettyprint + prawn (2.5.0) + matrix (~> 0.4) + pdf-core (~> 0.10.0) + ttfunk (~> 1.8) + prawn-svg (0.37.0) + css_parser (~> 1.6) + matrix (~> 0.4.2) + prawn (>= 0.11.1, < 3) + rexml (>= 3.3.9, < 4) + premailer (1.23.0) + addressable + css_parser (>= 1.12.0) + htmlentities (>= 4.0.0) + premailer-rails (1.12.0) + actionmailer (>= 3) + net-smtp + premailer (~> 1.7, >= 1.7.9) + prettyprint (0.2.0) + prime (0.1.3) + forwardable + singleton + prism (1.2.0) + proc_to_ast (0.1.0) + coderay + parser + unparser + prometheus-client-mmap (1.2.9) + base64 + bigdecimal + logger + rb_sys (~> 0.9.109) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.11.0) + byebug (~> 12.0) + pry (>= 0.13, < 0.16) + pry-rails (0.3.11) + pry (>= 0.13.0) + pry-shell (0.6.4) + pry (>= 0.13.0) + tty-markdown + tty-prompt + psych (5.2.3) + date + stringio + public_suffix (6.0.1) + puma (6.5.0) + nio4r (~> 2.0) + pyu-ruby-sasl (0.0.3.3) + raabro (1.4.0) + racc (1.8.1) + rack (2.2.13) + rack-accept (0.4.5) + rack (>= 0.4) + rack-attack (6.7.0) + rack (>= 1.0, < 4) + rack-cors (2.0.2) + rack (>= 2.0.0) + rack-oauth2 (2.2.1) + activesupport + attr_required + faraday (~> 2.0) + faraday-follow_redirects + json-jwt (>= 1.11.0) + rack (>= 2.1.0) + rack-protection (2.2.2) + rack + rack-proxy (0.7.7) + rack + rack-session (1.0.2) + rack (< 3) + rack-test (2.1.0) + rack (>= 1.3) + rack-timeout (0.7.0) + rackup (1.0.1) + rack (< 3) + webrick + rails (7.1.5.1) + actioncable (= 7.1.5.1) + actionmailbox (= 7.1.5.1) + actionmailer (= 7.1.5.1) + actionpack (= 7.1.5.1) + actiontext (= 7.1.5.1) + actionview (= 7.1.5.1) + activejob (= 7.1.5.1) + activemodel (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) + bundler (>= 1.15.0) + railties (= 7.1.5.1) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.1) + loofah (~> 2.21) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + rails-i18n (7.0.10) + i18n (>= 0.7, < 2) + railties (>= 6.0.0, < 8) + railties (7.1.5.1) + actionpack (= 7.1.5.1) + activesupport (= 7.1.5.1) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler-dock (1.9.1) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rb_sys (0.9.110) + rake-compiler-dock (= 1.9.1) + rbs (3.6.1) + logger + rbtrace (0.5.1) + ffi (>= 1.0.6) + msgpack (>= 0.4.3) + optimist (>= 3.0.0) + rchardet (1.8.0) + rdoc (6.13.0) + psych (>= 4.0.0) + re2 (2.15.0) + mini_portile2 (~> 2.8.7) + recaptcha (5.12.3) + json + recursive-open-struct (1.1.3) + redcarpet (3.6.0) + redis (5.4.0) + redis-client (>= 0.22.0) + redis-actionpack (5.5.0) + actionpack (>= 5) + redis-rack (>= 2.1.0, < 4) + redis-store (>= 1.1.0, < 2) + redis-client (0.22.2) + connection_pool + redis-cluster-client (0.11.0) + redis-client (~> 0.22) + redis-clustering (5.4.0) + redis (= 5.4.0) + redis-cluster-client (>= 0.10.0) + redis-namespace (1.11.0) + redis (>= 4) + redis-rack (3.0.0) + rack-session (>= 0.2.0) + redis-store (>= 1.2, < 2) + redis-store (1.11.0) + redis (>= 4, < 6) + regexp_parser (2.10.0) + regexp_property_values (1.0.0) + reline (0.6.0) + io-console (~> 0.5) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + request_store (1.7.0) + rack (>= 1.4) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + retriable (3.1.2) + reverse_markdown (3.0.0) + nokogiri + rexml (3.4.1) + rinku (2.0.0) + rotp (6.3.0) + rouge (4.5.1) + rqrcode (2.2.0) + chunky_png (~> 1.0) + rqrcode_core (~> 1.0) + rqrcode_core (1.2.0) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-benchmark (0.6.0) + benchmark-malloc (~> 0.2) + benchmark-perf (~> 0.6) + benchmark-trend (~> 0.4) + rspec (>= 3.0) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-parameterized (1.0.2) + rspec-parameterized-core (< 2) + rspec-parameterized-table_syntax (< 2) + rspec-parameterized-core (1.0.0) + parser + proc_to_ast + rspec (>= 2.13, < 4) + unparser + rspec-parameterized-table_syntax (1.0.0) + binding_of_caller + rspec-parameterized-core (< 2) + rspec-rails (7.0.1) + actionpack (>= 7.0) + activesupport (>= 7.0) + railties (>= 7.0) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-retry (0.6.2) + rspec-core (> 3.3) + rspec-support (3.13.1) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_profiling (0.0.9) + activerecord + get_process_mem + rails + rubocop (1.71.1) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.3.0.2) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.38.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.38.0) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) + rubocop-graphql (1.5.4) + rubocop (>= 1.50, < 2) + rubocop-performance (1.21.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.26.2) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.52.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rspec (3.0.5) + rubocop (~> 1.61) + rubocop-rspec_rails (2.30.0) + rubocop (~> 1.61) + rubocop-rspec (~> 3, >= 3.0.1) + ruby-fogbugz (0.3.0) + crack (~> 0.4) + multipart-post (~> 2.0) + ruby-lsp (0.23.15) + language_server-protocol (~> 3.17.0) + prism (>= 1.2, < 2.0) + rbs (>= 3, < 4) + sorbet-runtime (>= 0.5.10782) + ruby-lsp-rails (0.3.31) + ruby-lsp (>= 0.23.0, < 0.24.0) + ruby-lsp-rspec (0.1.22) + ruby-lsp (~> 0.23.0) + ruby-magic (0.6.0) + mini_portile2 (~> 2.8) + ruby-progressbar (1.11.0) + ruby-saml (1.18.0) + nokogiri (>= 1.13.10) + rexml + ruby-statistics (4.1.0) + ruby2_keywords (0.0.5) + rubyntlm (0.6.3) + rubypants (0.2.0) + rubyzip (2.3.2) + rugged (1.6.3) + safe_yaml (1.0.4) + safety_net_attestation (0.4.0) + jwt (~> 2.0) + sanitize (6.0.2) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + sass-embedded (1.77.5) + google-protobuf (>= 3.25, < 5.0) + rake (>= 13) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + sd_notify (0.1.1) + securerandom (0.4.1) + seed-fu (2.3.9) + activerecord (>= 3.1) + activesupport (>= 3.1) + selenium-webdriver (4.27.0) + base64 (~> 0.2) + logger (~> 1.4) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) + semver_dialects (3.7.0) + deb_version (~> 1.0.1) + pastel (~> 0.8.0) + thor (~> 1.3) + tty-command (~> 0.10.1) + sentry-rails (5.23.0) + railties (>= 5.0) + sentry-ruby (~> 5.23.0) + sentry-ruby (5.23.0) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + sentry-sidekiq (5.23.0) + sentry-ruby (~> 5.23.0) + sidekiq (>= 3.0) + shellany (0.0.1) + shoulda-matchers (6.4.0) + activesupport (>= 5.2.0) + sidekiq (7.3.9) + base64 + connection_pool (>= 2.3.0) + logger + rack (>= 2.2.4) + redis-client (>= 0.22.2) + sidekiq-cron (1.12.0) + fugit (~> 1.8) + globalid (>= 1.0.1) + sidekiq (>= 6) + sigdump (0.2.5) + signet (0.18.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simple_po_parser (1.1.6) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-cobertura (2.1.0) + rexml + simplecov (~> 0.19) + simplecov-html (0.12.3) + simplecov-lcov (0.8.0) + simplecov_json_formatter (0.1.4) + simpleidn (0.2.3) + singleton (0.3.0) + sixarm_ruby_unaccent (1.2.0) + slack-messenger (2.3.6) + re2 (~> 2.7, >= 2.7.0) + snaky_hash (2.0.0) + hashie + version_gem (~> 1.1) + snowplow-tracker (0.8.0) + solargraph (0.54.2) + backport (~> 1.2) + benchmark (~> 0.4) + bundler (~> 2.0) + diff-lcs (~> 1.4) + jaro_winkler (~> 1.6) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.1) + logger (~> 1.6) + observer (~> 0.1) + ostruct (~> 0.6) + parser (~> 3.0) + rbs (~> 3.3) + reverse_markdown (~> 3.0) + rubocop (~> 1.38) + thor (~> 1.0) + tilt (~> 2.0) + yard (~> 0.9, >= 0.9.24) + yard-solargraph (~> 0.1) + solargraph-rspec (0.5.1) + solargraph (~> 0.52, >= 0.52.0) + sorbet-runtime (0.5.11647) + spamcheck (1.3.3) + grpc (~> 1.63) + spring (4.3.0) + spring-commands-rspec (1.0.4) + spring (>= 0.9.1) + sprite-factory (1.7.1) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + sprockets (>= 3.0.0) + ssh_data (1.3.0) + ssrf_filter (1.0.8) + stackprof (0.2.27) + state_machines (0.5.0) + state_machines-activemodel (0.8.0) + activemodel (>= 5.1) + state_machines (>= 0.5.0) + state_machines-activerecord (0.8.0) + activerecord (>= 5.1) + state_machines-activemodel (>= 0.8.0) + state_machines-rspec (0.6.0) + activesupport + rspec (~> 3.3) + state_machines + stringio (3.1.7) + strings (0.2.1) + strings-ansi (~> 0.2) + unicode-display_width (>= 1.5, < 3.0) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + swd (2.0.3) + activesupport (>= 3) + attr_required (>= 0.0.5) + faraday (~> 2.0) + faraday-follow_redirects + sync (0.5.0) + sys-filesystem (1.4.3) + ffi (~> 1.1) + sysexits (1.2.0) + table_print (1.5.7) + tanuki_emoji (0.13.0) + i18n (~> 1.14) + telesign (2.2.4) + net-http-persistent (>= 3.0.0, < 5.0) + telesignenterprise (2.2.2) + telesign (~> 2.2.3) + temple (0.8.2) + term-ansicolor (1.7.1) + tins (~> 1.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + terser (1.0.2) + execjs (>= 0.3.0, < 3) + test-prof (1.4.4) + test_file_finder (0.3.1) + faraday (>= 1.0, < 3.0, != 2.0.0) + text (1.3.1) + thor (1.3.1) + thread_safe (0.3.6) + thrift (0.16.0) + tilt (2.0.11) + timeout (0.4.3) + timfel-krb5-auth (0.8.3) + tins (1.31.1) + sync + toml-rb (2.2.0) + citrus (~> 3.0, > 3.0) + tomlrb (1.3.0) + tpm-key_attestation (0.12.0) + bindata (~> 2.4) + openssl (> 2.0) + openssl-signature_algorithm (~> 1.0) + traces (0.15.2) + trailblazer-option (0.1.2) + train-core (3.10.8) + addressable (~> 2.5) + ffi (!= 1.13.0) + json (>= 1.8, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + net-scp (>= 1.2, < 5.0) + net-ssh (>= 2.9, < 8.0) + truncato (0.7.13) + htmlentities (~> 4.3.1) + nokogiri (>= 1.7.0, <= 2.0) + ttfunk (1.8.0) + bigdecimal (~> 3.1) + tty-color (0.6.0) + tty-command (0.10.1) + pastel (~> 0.8) + tty-cursor (0.7.1) + tty-markdown (0.7.2) + kramdown (>= 1.16.2, < 3.0) + pastel (~> 0.8) + rouge (>= 3.14, < 5.0) + strings (~> 0.2.0) + tty-color (~> 0.5) + tty-screen (~> 0.8) + tty-prompt (0.23.1) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.9.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.1) + typhoeus (1.4.1) + ethon (>= 0.9.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + uber (0.1.0) + undercover (0.6.4) + base64 + bigdecimal + imagen (>= 0.2.0) + rainbow (>= 2.1, < 4.0) + rugged (>= 0.27, < 1.10) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicode-display_width (2.4.2) + unicode-emoji (4.0.4) + unicode_utils (1.4.0) + uniform_notifier (1.16.0) + unleash (3.2.2) + murmurhash3 (~> 0.1.6) + unparser (0.6.7) + diff-lcs (~> 1.3) + parser (>= 3.2.0) + uri (0.13.2) + valid_email (0.1.3) + activemodel + mail (>= 2.6.1) + validate_url (1.0.15) + activemodel (>= 3.0.0) + public_suffix + validates_hostname (1.0.13) + activerecord (>= 3.0) + activesupport (>= 3.0) + version_gem (1.1.0) + version_sorter (2.3.0) + view_component (3.21.0) + activesupport (>= 5.2.0, < 8.1) + concurrent-ruby (~> 1.0) + method_source (~> 1.0) + virtus (2.0.0) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) + vite_rails (3.0.19) + railties (>= 5.1, < 9) + vite_ruby (~> 3.0, >= 3.2.2) + vite_ruby (3.9.2) + dry-cli (>= 0.7, < 2) + logger (~> 1.6) + mutex_m + rack-proxy (~> 0.6, >= 0.6.1) + zeitwerk (~> 2.2) + vmstat (2.3.1) + warden (1.2.9) + rack (>= 2.0.9) + warning (1.5.0) + webauthn (3.0.0) + android_key_attestation (~> 0.3.0) + awrence (~> 1.1) + bindata (~> 2.4) + cbor (~> 0.5.9) + cose (~> 1.1) + openssl (>= 2.2) + safety_net_attestation (~> 0.4.0) + tpm-key_attestation (~> 0.12.0) + webfinger (2.1.3) + activesupport + faraday (~> 2.0) + faraday-follow_redirects + webmock (3.25.0) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.9.1) + websocket (1.2.10) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + wikicloth (0.8.1) + builder + expression_parser + rinku + wisper (2.0.1) + with_env (1.1.0) + wmi-lite (1.0.7) + xml-simple (1.1.9) + rexml + xpath (3.2.0) + nokogiri (~> 1.8) + yajl-ruby (1.4.3) + yard (0.9.37) + yard-solargraph (0.1.0) + yard (~> 0.9) + zeitwerk (2.6.7) + +PLATFORMS + ruby + +DEPENDENCIES + CFPropertyList (~> 3.0.0) + RedCloth (~> 4.3.3) + acme-client (~> 2.0.19) + activerecord-explain-analyze (~> 0.1) + activerecord-gitlab! + addressable (~> 2.8) + akismet (~> 3.0) + apollo_upload_server (~> 2.1.6) + app_store_connect + arr-pm (~> 0.0.12) + asciidoctor (~> 2.0.18) + asciidoctor-include-ext (~> 0.4.0) + asciidoctor-kroki (~> 0.10.0) + asciidoctor-plantuml (~> 0.0.16) + async (~> 2.23.0) + atlassian-jwt (~> 0.2.1) + attr_encrypted (~> 3.2.4)! + awesome_print + aws-sdk-cloudformation (~> 1) + aws-sdk-core (~> 3.223.0) + aws-sdk-s3 (~> 1.185.0) + axe-core-rspec (~> 4.10.0) + babosa (~> 2.0) + base32 (~> 0.3.0) + batch-loader (~> 2.0.5) + bcrypt (~> 3.1, >= 3.1.14) + benchmark-ips (~> 2.14.0) + benchmark-memory (~> 0.1) + better_errors (~> 2.10.1) + bootsnap (~> 1.18.3) + browser (~> 5.3.1) + bullet (~> 7.2.0) + bundler-checksum (~> 0.1.0)! + capybara (~> 3.40) + capybara-screenshot (~> 1.0.26) + carrierwave (~> 1.3) + charlock_holmes (~> 0.7.9) + circuitbox (= 2.0.0) + click_house-client! + cloud_profiler_agent (~> 0.0.0)! + commonmarker (~> 0.23.10) + concurrent-ruby (~> 1.1) + connection_pool (~> 2.4) + countries (~> 4.0.0) + coverband (= 6.1.5) + creole (~> 0.5.0) + cssbundling-rails (= 1.4.3) + csv_builder! + cvss-suite (~> 3.3.0) + database_cleaner-active_record (~> 2.2.0) + deckar01-task_list (= 2.3.4) + declarative_policy (~> 1.1.0) + deprecation_toolkit (~> 2.2.3) + derailed_benchmarks + devfile (~> 0.4.4) + device_detector + devise (~> 4.9.3) + devise-pbkdf2-encryptable (~> 0.0.0)! + devise-two-factor (~> 4.1.1) + diff_match_patch (~> 0.1.0)! + diffy (~> 3.4) + doorkeeper (~> 5.8, >= 5.8.1) + doorkeeper-device_authorization_grant (~> 1.0.0) + doorkeeper-openid_connect (~> 1.8.10) + drb (~> 2.2) + duo_api (~> 1.3) + ed25519 (~> 1.4.0) + elasticsearch-api (= 7.17.11) + elasticsearch-model (~> 7.2) + elasticsearch-rails (~> 7.2) + email_reply_trimmer (~> 0.1) + email_spec (~> 2.3.0) + error_tracking_open_api! + factory_bot_rails (~> 6.4.3) + faraday (~> 2) + faraday-multipart (~> 1.0) + faraday-retry (~> 2) + faraday-typhoeus (~> 1.1) + faraday_middleware-aws-sigv4 (~> 1.0.1) + fast_blank (~> 1.0.1) + ffaker (~> 2.24) + ffi (~> 1.17) + flipper (~> 0.28.0) + flipper-active_record (~> 0.28.0) + flipper-active_support_cache_store (~> 0.28.0) + fog-aliyun (~> 0.4) + fog-aws (~> 3.26) + fog-core (= 2.1.0) + fog-google (~> 1.24.1) + fog-local (~> 0.8) + fugit (~> 1.11.1) + gdk-toogle (~> 0.9, >= 0.9.5) + gettext (~> 3.5, >= 3.5.1) + gettext_i18n_rails (~> 1.13.0) + git (~> 1.8) + gitaly (~> 17.8.0) + gitlab-active-context! + gitlab-backup-cli! + gitlab-chronic (~> 0.10.5) + gitlab-cloud-connector (~> 1.11) + gitlab-crystalball (~> 0.7.2) + gitlab-dangerfiles (~> 4.9.0) + gitlab-duo-workflow-service-client (~> 0.1)! + gitlab-experiment (~> 0.9.1) + gitlab-fog-azure-rm (~> 2.2.0) + gitlab-glfm-markdown (~> 0.0.30) + gitlab-housekeeper! + gitlab-http! + gitlab-kas-grpc (~> 17.11.0) + gitlab-labkit (~> 0.37.0) + gitlab-license (~> 2.6) + gitlab-mail_room (~> 0.0.24) + gitlab-markup (~> 2.0.0) + gitlab-net-dns (~> 0.12.0) + gitlab-rspec! + gitlab-rspec_flaky! + gitlab-safe_request_store! + gitlab-schema-validation! + gitlab-sdk (~> 0.3.0) + gitlab-secret_detection (< 1.0) + gitlab-security_report_schemas (= 0.1.2.min15.0.0.max15.2.1) + gitlab-sidekiq-fetcher! + gitlab-styles (~> 13.1.0) + gitlab-topology-service-client (~> 0.1)! + gitlab-utils! + gitlab_chronic_duration (~> 0.12) + gitlab_omniauth-ldap (~> 2.2.0) + gitlab_quality-test_tooling (~> 2.10.0) + gon (~> 6.4.0) + google-apis-androidpublisher_v3 (~> 0.34.0) + google-apis-cloudbilling_v1 (~> 0.22.0) + google-apis-cloudresourcemanager_v1 (~> 0.31.0) + google-apis-compute_v1 (~> 0.57.0) + google-apis-container_v1 (~> 0.43.0) + google-apis-container_v1beta1 (~> 0.43.0) + google-apis-core (~> 0.11.0, >= 0.11.1) + google-apis-iam_v1 (~> 0.36.0) + google-apis-serviceusage_v1 (~> 0.28.0) + google-apis-sqladmin_v1beta4 (~> 0.41.0) + google-apis-storage_v1 (~> 0.29) + google-cloud-artifact_registry-v1 (~> 0.11.0) + google-cloud-compute-v1 (~> 2.6.0) + google-cloud-storage (~> 1.45.0) + google-protobuf (~> 3.25, >= 3.25.3) + googleauth (~> 1.8.1) + gpgme (~> 2.0.24) + grape (~> 2.0.0) + grape-entity (~> 1.0.1) + grape-path-helpers (~> 2.0.1) + grape-swagger (~> 2.1.2) + grape-swagger-entity (~> 0.5.5) + grape_logging (~> 1.8, >= 1.8.4) + graphlyte (~> 1.0.0) + graphql (= 2.4.13) + graphql-docs (~> 5.0.0) + grpc (= 1.63.0) + gssapi (~> 1.3.1) + guard-rspec + haml_lint (~> 0.58) + hamlit (~> 2.15.0) + hashie (~> 5.0.0) + health_check (~> 3.0) + html-pipeline (~> 2.14.3) + html2text + httparty (~> 0.22.0) + i18n_data (~> 0.13.1) + icalendar (~> 2.10.1) + influxdb-client (~> 3.1) + invisible_captcha (~> 2.1.0) + ipaddress (~> 0.8.3) + ipynbdiff! + jira-ruby (~> 2.3.0) + js_regex (~> 3.8) + json (~> 2.11.0) + json_schemer (~> 2.3.0) + jsonb_accessor (~> 1.4) + jwt (~> 2.9.3) + kaminari (~> 1.2.2) + knapsack (~> 4.0.0) + kramdown (~> 2.5.0) + kubeclient (~> 4.11.0) + lefthook (~> 1.11.0) + letter_opener_web (~> 3.0.0) + license_finder (~> 7.0) + licensee (~> 9.16) + listen (~> 3.7) + lockbox (~> 1.3.0) + logger (~> 1.6.0) + lograge (~> 0.5) + loofah (~> 2.24.0) + lookbook (~> 2.3) + lru_redux + mail (= 2.8.1) + mail-smtp_pool (~> 0.1.0)! + marginalia (~> 1.11.1) + memory_profiler (~> 1.0) + microsoft_graph_mailer (~> 0.1.0)! + mini_magick (~> 4.12) + minitest (~> 5.11.0) + multi_json (~> 1.14.1) + mutex_m (~> 0.3) + net-http (= 0.6.0) + net-ldap (~> 0.17.1) + net-ntp + net-protocol (~> 0.1.3) + nkf (~> 0.2.0) + nokogiri (~> 1.18) + oauth2 (~> 2.0) + octokit (~> 9.0) + ohai (~> 18.1) + oj (~> 3.16.0, >= 3.16.10) + oj-introspect (~> 0.8) + omniauth (~> 2.1.0) + omniauth-alicloud (~> 3.0.0) + omniauth-atlassian-oauth2 (~> 0.2.0) + omniauth-auth0 (~> 3.1) + omniauth-azure-activedirectory-v2 (~> 2.0) + omniauth-github (= 2.0.1) + omniauth-gitlab (~> 4.0.0)! + omniauth-google-oauth2 (~> 1.1) + omniauth-oauth2-generic (~> 0.2.2) + omniauth-salesforce (~> 1.0.5)! + omniauth-saml (~> 2.2.1) + omniauth-shibboleth-redux (~> 2.0) + omniauth_crowd (~> 2.4.0)! + omniauth_openid_connect (~> 0.8.0) + openid_connect (~> 2.3.0) + openssl (~> 3.0) + opentelemetry-exporter-otlp + opentelemetry-instrumentation-action_pack + opentelemetry-instrumentation-action_view + opentelemetry-instrumentation-active_job + opentelemetry-instrumentation-active_record + opentelemetry-instrumentation-active_support + opentelemetry-instrumentation-aws_sdk + opentelemetry-instrumentation-concurrent_ruby + opentelemetry-instrumentation-ethon + opentelemetry-instrumentation-excon + opentelemetry-instrumentation-faraday + opentelemetry-instrumentation-grape + opentelemetry-instrumentation-graphql + opentelemetry-instrumentation-http + opentelemetry-instrumentation-http_client + opentelemetry-instrumentation-net_http + opentelemetry-instrumentation-pg + opentelemetry-instrumentation-rack + opentelemetry-instrumentation-rails + opentelemetry-instrumentation-rake + opentelemetry-instrumentation-redis + opentelemetry-instrumentation-sidekiq + opentelemetry-sdk + org-ruby (~> 0.9.12) + os (~> 1.1, >= 1.1.4) + pact (~> 1.64) + paper_trail (~> 16.0) + parallel (~> 1.19) + parser (= 3.3.8.0) + parslet (~> 1.8) + peek (~> 1.1) + pg (~> 1.5.6) + pg_query (~> 6.1.0) + png_quantizator (~> 0.2.1) + prawn + prawn-svg + premailer-rails (~> 1.12.0) + prometheus-client-mmap (~> 1.2.9) + pry-byebug + pry-rails (~> 0.3.9) + pry-shell (~> 0.6.4) + puma (= 6.5.0) + rack (~> 2.2.9) + rack-attack (~> 6.7.0) + rack-cors (~> 2.0.1) + rack-oauth2 (~> 2.2.1) + rack-proxy (~> 0.7.7) + rack-timeout (~> 0.7.0) + rails (~> 7.1.5.1) + rails-controller-testing + rails-i18n (~> 7.0, >= 7.0.9) + rainbow (~> 3.0) + rbtrace (~> 0.4) + re2 (~> 2.15) + recaptcha (~> 5.12) + redis (~> 5.4.0) + redis-actionpack (~> 5.5.0) + redis-clustering (~> 5.4.0) + request_store (~> 1.7.0) + responders (~> 3.0) + retriable (~> 3.1.2) + rexml (~> 3.4.0) + rouge (~> 4.5.0) + rqrcode (~> 2.2) + rspec-benchmark (~> 0.6.0) + rspec-parameterized (~> 1.0, >= 1.0.2) + rspec-rails (~> 7.0.0) + rspec-retry (~> 0.6.2) + rspec_junit_formatter + rspec_profiling (~> 0.0.9) + rubocop + ruby-fogbugz (~> 0.3.0) + ruby-lsp (~> 0.23.0) + ruby-lsp-rails (~> 0.3.6) + ruby-lsp-rspec (~> 0.1.10) + ruby-magic (~> 0.6) + ruby-progressbar (~> 1.10) + ruby-saml (~> 1.18) + rubyzip (~> 2.3.2) + rugged (~> 1.6) + sanitize (~> 6.0.2) + sd_notify (~> 0.1.0) + seed-fu (~> 2.3.7) + selenium-webdriver (~> 4.21, >= 4.21.1) + semver_dialects (~> 3.7) + sentry-rails (~> 5.23.0) + sentry-ruby (~> 5.23.0) + sentry-sidekiq (~> 5.23.0) + shoulda-matchers (~> 6.4.0) + sidekiq (~> 7.3.9) + sidekiq-cron (~> 1.12.0) + sigdump (~> 0.2.4) + simple_po_parser (~> 1.1.6) + simplecov (~> 0.22) + simplecov-cobertura (~> 2.1.0) + simplecov-lcov (~> 0.8.0) + slack-messenger (~> 2.3.5) + snowplow-tracker (~> 0.8.0) + solargraph (~> 0.54.0) + solargraph-rspec (~> 0.5.1) + spamcheck (~> 1.3.0) + spring (~> 4.3.0) + spring-commands-rspec (~> 1.0.4) + sprite-factory (~> 1.7) + sprockets (~> 3.7.0) + sprockets-rails (~> 3.5.1) + ssh_data (~> 1.3) + stackprof (~> 0.2.26) + state_machines-activerecord (~> 0.8.0) + state_machines-rspec (~> 0.6) + sys-filesystem (~> 1.4.3) + tanuki_emoji (~> 0.13) + telesignenterprise (~> 2.2) + terser (= 1.0.2) + test-prof (~> 1.4.0) + test_file_finder (~> 0.3.1) + thrift (>= 0.16.0) + timfel-krb5-auth (~> 0.8) + toml-rb (~> 2.2.0) + truncato (~> 0.7.13) + tty-prompt (~> 0.23) + typhoeus (~> 1.4.0) + undercover (~> 0.6.0) + unicode-emoji (~> 4.0) + unleash (~> 3.2.2) + uri (= 0.13.2) + valid_email (~> 0.1) + validates_hostname (~> 1.0.13) + version_sorter (~> 2.3) + view_component (~> 3.21.0) + vite_rails (~> 3.0.17) + vite_ruby (~> 3.9.0) + vmstat (~> 2.3.0) + warning (~> 1.5.0) + webauthn (~> 3.0) + webmock (~> 3.25.0) + webrick (~> 1.9.0) + wikicloth (= 0.8.1) + yajl-ruby (~> 1.4.3) + yard (~> 0.9) + +BUNDLED WITH + 2.6.6 diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix new file mode 100644 index 000000000000..4e033992dc9f --- /dev/null +++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix @@ -0,0 +1,10004 @@ +src: { + acme-client = { + dependencies = [ + "base64" + "faraday" + "faraday-retry" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hbn563v0rc85md0fcx3z968dvq7n2ra64wbgyxg09ndjgwl9870"; + type = "gem"; + }; + version = "2.0.21"; + }; + actioncable = { + dependencies = [ + "actionpack" + "activesupport" + "nio4r" + "websocket-driver" + "zeitwerk" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03dai8z2dxb2cf29hp6md7bhysyipxvw2qnm2bj98yyrnaskfikn"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + actionmailbox = { + dependencies = [ + "actionpack" + "activejob" + "activerecord" + "activestorage" + "activesupport" + "mail" + "net-imap" + "net-pop" + "net-smtp" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02inlpsmjz8rz159ljhzac1dvzq5k1pnmmx2pf4gmrj3zs4hbhn3"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + actionmailer = { + dependencies = [ + "actionpack" + "actionview" + "activejob" + "activesupport" + "mail" + "net-imap" + "net-pop" + "net-smtp" + "rails-dom-testing" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ncplhcrxldj6jvbaw9g8ik4cznjlf3lyfzgrwy0jfxjh3cdc4xj"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + actionpack = { + dependencies = [ + "actionview" + "activesupport" + "nokogiri" + "racc" + "rack" + "rack-session" + "rack-test" + "rails-dom-testing" + "rails-html-sanitizer" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "066p70mngqk8m7qp3wq2frbl1w8imdcrdxb06cxwq5izykcn7hib"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + actiontext = { + dependencies = [ + "actionpack" + "activerecord" + "activestorage" + "activesupport" + "globalid" + "nokogiri" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1v7psa946frm79x04vywnd0h069jgxy5xghm7y5sgijvmp7n3qmq"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + actionview = { + dependencies = [ + "activesupport" + "builder" + "erubi" + "rails-dom-testing" + "rails-html-sanitizer" + ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1apnqjfwbvyhf7svlamal1pvy2x78fk42lqbnllqwy816lhrlmcc"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + activejob = { + dependencies = [ + "activesupport" + "globalid" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rspwfvhxs5by6im90rrjp2sy1wzdpcgb9xm0qfljk3zhmn3fcvn"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + activemodel = { + dependencies = [ "activesupport" ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wci45aas8g909zby9j91m87ff5j28qwl0i7izzbszsahmk78wkl"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + activerecord = { + dependencies = [ + "activemodel" + "activesupport" + "timeout" + ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qzij5xmsqqxsc9v9kil68aif5bvly06vqf4pnjrnfzkkdhd22pl"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + activerecord-explain-analyze = { + dependencies = [ + "activerecord" + "pg" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yvz452ww0vn3n6197gx6zklwa591gc7f1m8accvjd9zw8gv3ssx"; + type = "gem"; + }; + version = "0.1.0"; + }; + activerecord-gitlab = { + dependencies = [ "activerecord" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/gems/activerecord-gitlab"; + type = "path"; + }; + version = "0.2.0"; + }; + activestorage = { + dependencies = [ + "actionpack" + "activejob" + "activerecord" + "activesupport" + "marcel" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qzz8dxwj70zys1lmqk1x0sl4rb7ddw6v2bgmpm6dijqd03qnsxf"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + activesupport = { + dependencies = [ + "base64" + "benchmark" + "bigdecimal" + "concurrent-ruby" + "connection_pool" + "drb" + "i18n" + "logger" + "minitest" + "mutex_m" + "securerandom" + "tzinfo" + ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1f6gqyl49hdabid5jkrfq0127gd396srsgpy7p5ni61v8wp4h34z"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + addressable = { + dependencies = [ "public_suffix" ]; + groups = [ + "danger" + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; + type = "gem"; + }; + version = "2.8.7"; + }; + aes_key_wrap = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19bn0y70qm6mfj4y1m0j3s8ggh6dvxwrwrj5vfamhdrpddsz8ddr"; + type = "gem"; + }; + version = "1.1.0"; + }; + akismet = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0c5jhqfgvpz84d8jai51hin018ldpfd0civbk7mfwmrj7n71p6bl"; + type = "gem"; + }; + version = "3.0.0"; + }; + aliyun-sdk = { + dependencies = [ + "nokogiri" + "rest-client" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17avsza5r4f6d0f2ajgy6clmasrxs7jd16hz7ljq502jkczmv4b5"; + type = "gem"; + }; + version = "0.8.0"; + }; + amatch = { + dependencies = [ + "mize" + "tins" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1xs5j64cbbjc94lx72fgjq6f3r99p2fmg51fh1r7qqifd8i1bzyk"; + type = "gem"; + }; + version = "0.4.1"; + }; + android_key_attestation = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02spc1sh7zsljl02v9d5rdb717b628vw2k7jkkplifyjk4db0zj6"; + type = "gem"; + }; + version = "0.3.0"; + }; + apollo_upload_server = { + dependencies = [ + "actionpack" + "graphql" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cnddcnrb0gwhi0w2hrmh53fkpdxxy2v80rfp2q1hrcf4mr41v6w"; + type = "gem"; + }; + version = "2.1.6"; + }; + app_store_connect = { + dependencies = [ + "activesupport" + "jwt" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rjwnb5fj0kzwgrn1n98gnb0s855ck1dm3j06sd01vcqj8829xih"; + type = "gem"; + }; + version = "0.38.0"; + }; + arr-pm = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fddw0vwdrr7v3a0lfqbmnd664j48a9psrjd3wh3k4i3flplizzx"; + type = "gem"; + }; + version = "0.0.12"; + }; + asciidoctor = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j"; + type = "gem"; + }; + version = "2.0.23"; + }; + asciidoctor-include-ext = { + dependencies = [ "asciidoctor" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0y3qixbssfrzp04ng7g4lh3dq16pgrw3p8cwc0v5bhmz5yfxnsj0"; + type = "gem"; + }; + version = "0.4.0"; + }; + asciidoctor-kroki = { + dependencies = [ "asciidoctor" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qih280cjsh3nmywa5ja6kbrd576qmkxnp9zbmxjw3hjizc2ahlf"; + type = "gem"; + }; + version = "0.10.0"; + }; + asciidoctor-plantuml = { + dependencies = [ "asciidoctor" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14qppm3qzfra2g2lf8jl3mbnrhi4alp8232zqz6dbpl6276lfzj0"; + type = "gem"; + }; + version = "0.0.16"; + }; + ast = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + type = "gem"; + }; + version = "2.4.2"; + }; + async = { + dependencies = [ + "console" + "fiber-annotation" + "io-event" + "metrics" + "traces" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01jh5b1wh9gvgrkl2bgc93pimc0ncjbi5vsadgxxp9a8d4s9fb31"; + type = "gem"; + }; + version = "2.23.1"; + }; + atlassian-jwt = { + dependencies = [ "jwt" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08vqx5s0ax71lwis9l1bzy570sch0hpb53031ha2wgvp31sdilig"; + type = "gem"; + }; + version = "0.2.1"; + }; + attr_encrypted = { + dependencies = [ "encryptor" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/attr_encrypted"; + type = "path"; + }; + version = "3.2.4"; + }; + attr_required = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "16fbwr6nmsn97n0a6k1nwbpyz08zpinhd6g7196lz1syndbgrszh"; + type = "gem"; + }; + version = "1.0.2"; + }; + awesome_print = { + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0vkq6c8y2jvaw03ynds5vjzl1v9wg608cimkd3bidzxc0jvk56z9"; + type = "gem"; + }; + version = "1.9.2"; + }; + awrence = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gj8f8c54r9cabkm41s59sa1ca5wpbipw7gq3sfl87x9296227fx"; + type = "gem"; + }; + version = "1.2.1"; + }; + aws-eventstream = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-partitions = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01w3b84d129q9b6bg2cm8p4cn8pl74l343sxsc47ax9sglqz6y99"; + type = "gem"; + }; + version = "1.1001.0"; + }; + aws-sdk-cloudformation = { + dependencies = [ + "aws-sdk-core" + "aws-sigv4" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09kb3k5vpymg846gajc5d3wznww63yiv3ygdf4v42d4pf4wpbr1i"; + type = "gem"; + }; + version = "1.41.0"; + }; + aws-sdk-core = { + dependencies = [ + "aws-eventstream" + "aws-partitions" + "aws-sigv4" + "base64" + "jmespath" + "logger" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xwcimg5i93ansmmww7ap8k6xxyijkxa8p896bxj9kc7cw8hkhyq"; + type = "gem"; + }; + version = "3.223.0"; + }; + aws-sdk-kms = { + dependencies = [ + "aws-sdk-core" + "aws-sigv4" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jfgw9a9c8xyjhkmgpd9rpi95h9i0rhbqszn8iqkbfm9rc9m1xz7"; + type = "gem"; + }; + version = "1.76.0"; + }; + aws-sdk-s3 = { + dependencies = [ + "aws-sdk-core" + "aws-sdk-kms" + "aws-sigv4" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ix5g1qnp7m0f8jk0bx0b5csx8p7zrxhnvkqc7jsyp9a3c4vnpky"; + type = "gem"; + }; + version = "1.185.0"; + }; + aws-sigv4 = { + dependencies = [ "aws-eventstream" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yf396fxashbqn0drbnvd9srxfg7w06v70q8kqpzi04zqchf6lvp"; + type = "gem"; + }; + version = "1.9.1"; + }; + axe-core-api = { + dependencies = [ + "dumb_delegator" + "ostruct" + "virtus" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0j017xf6dzi5w5hfikjh138n91b5vkaxjm41dvqh86033knz643f"; + type = "gem"; + }; + version = "4.10.3"; + }; + axe-core-rspec = { + dependencies = [ + "axe-core-api" + "dumb_delegator" + "ostruct" + "virtus" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zjj06kwk57d3g18sfkam8r6fcrp2c3wj8m93l7ws3rd3q8x08fa"; + type = "gem"; + }; + version = "4.10.3"; + }; + axiom-types = { + dependencies = [ + "descendants_tracker" + "ice_nine" + "thread_safe" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1"; + type = "gem"; + }; + version = "0.1.1"; + }; + babosa = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19mqrnyizr1ipdp26vhrg0hwb851bwyvrs6xc29dk3ywljw8s8d6"; + type = "gem"; + }; + version = "2.0.0"; + }; + backport = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xbzzjrgah0f8ifgd449kak2vyf30micpz6x2g82aipfv7ypsb4i"; + type = "gem"; + }; + version = "1.2.0"; + }; + base32 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1fjs0l3c5g9qxwp43kcnhc45slx29yjb6m6jxbb2x1krgjmi166b"; + type = "gem"; + }; + version = "0.3.4"; + }; + base64 = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + batch-loader = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04zjpzb2m1qjxk0lzdi5m812wyq5kkwcdbxs1asbm67lp0wgcjwn"; + type = "gem"; + }; + version = "2.0.5"; + }; + bcrypt = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "16a0g2q40biv93i1hch3gw8rbmhp77qnnifj1k0a6m7dng3zh444"; + type = "gem"; + }; + version = "3.1.20"; + }; + benchmark = { + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; + }; + benchmark-ips = { + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07cvi8z4ss6nzf4jp8sp6bp54d7prh6jg56dz035jpajbnkchaxp"; + type = "gem"; + }; + version = "2.14.0"; + }; + benchmark-malloc = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0svyac8alxbmip6b9rp34wq5lcimdaapjkaqdw1385i66l28ziip"; + type = "gem"; + }; + version = "0.2.0"; + }; + benchmark-memory = { + dependencies = [ "memory_profiler" ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0p5bwqc828yai7h71b7ny77hgd7dll00dy34izp3b5dh6dj467na"; + type = "gem"; + }; + version = "0.2.0"; + }; + benchmark-perf = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08cngwnwk2h6cdxx3dyckxcg7d0yi3pm83c26kfzkq1xkyah2azy"; + type = "gem"; + }; + version = "0.6.0"; + }; + benchmark-trend = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "10axhj80jan0b7c77hm0aj2yxv0dh9clfy4pppxvxfj3yjlh4nny"; + type = "gem"; + }; + version = "0.4.0"; + }; + better_errors = { + dependencies = [ + "erubi" + "rack" + "rouge" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wqazisnn6hn1wsza412xribpw5wzx6b5z5p4mcpfgizr6xg367p"; + type = "gem"; + }; + version = "2.10.1"; + }; + bigdecimal = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + type = "gem"; + }; + version = "3.1.7"; + }; + bindata = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0shg48ilaxn8ps8arvyb8pr6pqigdmccirks185c306dzychr3n3"; + type = "gem"; + }; + version = "2.4.11"; + }; + binding_of_caller = { + dependencies = [ "debug_inspector" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s"; + type = "gem"; + }; + version = "1.0.0"; + }; + bootsnap = { + dependencies = [ "msgpack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mdgj9yw1hmx3xh2qxyjc31y8igmxzd9h0c245ay2zkz76pl4k5c"; + type = "gem"; + }; + version = "1.18.4"; + }; + browser = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0g4bcpax07kqqr9cp7cjc7i0pcij4nqpn1rdsg2wdwhzf00m6x32"; + type = "gem"; + }; + version = "5.3.1"; + }; + builder = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + bullet = { + dependencies = [ + "activesupport" + "uniform_notifier" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "12gacycw1adsdjp14pm43619c6lcdaddhgbdizy7gnzmnjhwh0im"; + type = "gem"; + }; + version = "7.2.0"; + }; + bundler-checksum = { + dependencies = [ ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/bundler-checksum"; + type = "path"; + }; + version = "0.1.0"; + }; + byebug = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07hsr9zzl2mvf5gk65va4smdizlk9rsiz8wwxik0p96cj79518fl"; + type = "gem"; + }; + version = "12.0.0"; + }; + capybara = { + dependencies = [ + "addressable" + "matrix" + "mini_mime" + "nokogiri" + "rack" + "rack-test" + "regexp_parser" + "xpath" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vxfah83j6zpw3v5hic0j70h519nvmix2hbszmjwm8cfawhagns2"; + type = "gem"; + }; + version = "3.40.0"; + }; + capybara-screenshot = { + dependencies = [ + "capybara" + "launchy" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xqc7hdiw1ql42mklpfvqd2pyfsxmy55cpx0h9y0jlkpl1q96sw1"; + type = "gem"; + }; + version = "1.0.26"; + }; + carrierwave = { + dependencies = [ + "activemodel" + "activesupport" + "mime-types" + "ssrf_filter" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "089s8rbwddzcyw1ky34h90flz5wzqzi2lvajykbxn3l3s6mjsxw1"; + type = "gem"; + }; + version = "1.3.4"; + }; + cbor = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y"; + type = "gem"; + }; + version = "0.5.9.8"; + }; + CFPropertyList = { + dependencies = [ + "base64" + "nkf" + "rexml" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4"; + type = "gem"; + }; + version = "3.0.7"; + }; + character_set = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l9z2pihzc11f0jpq2sx789zwpmwf5nyhsjps45zzvfs5931fwrb"; + type = "gem"; + }; + version = "1.8.0"; + }; + charlock_holmes = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml"; + type = "gem"; + }; + version = "0.7.9"; + }; + chef-config = { + dependencies = [ + "addressable" + "chef-utils" + "fuzzyurl" + "mixlib-config" + "mixlib-shellout" + "tomlrb" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1pvjf3qbb3apg9vdy4zykamm7801qz4m6256wjqn73fs87zs50y1"; + type = "gem"; + }; + version = "18.3.0"; + }; + chef-utils = { + dependencies = [ "concurrent-ruby" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0087jwhqslfm3ygj507dmmdp3k0589j5jl54mkwgbabbwan7lzw2"; + type = "gem"; + }; + version = "18.3.0"; + }; + chunky_png = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; + type = "gem"; + }; + version = "1.4.0"; + }; + circuitbox = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "056snhim934xysz630ysfbfdxa64vin5y24h2ha1wvj9fqg9qvj9"; + type = "gem"; + }; + version = "2.0.0"; + }; + citrus = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l7nhk3gkm1hdchkzzhg2f70m47pc0afxfpl6mkiibc9qcpl3hjf"; + type = "gem"; + }; + version = "3.0.2"; + }; + claide = { + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; + type = "gem"; + }; + version = "1.1.0"; + }; + claide-plugins = { + dependencies = [ + "cork" + "nap" + "open4" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bhw5j985qs48v217gnzva31rw5qvkf7qj8mhp73pcks0sy7isn7"; + type = "gem"; + }; + version = "0.9.2"; + }; + click_house-client = { + dependencies = [ + "activesupport" + "addressable" + "json" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/gems/click_house-client"; + type = "path"; + }; + version = "0.1.0"; + }; + cloud_profiler_agent = { + dependencies = [ + "google-cloud-profiler-v2" + "google-protobuf" + "googleauth" + "stackprof" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/cloud_profiler_agent"; + type = "path"; + }; + version = "0.0.1.pre"; + }; + coderay = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ + { + engine = "maglev"; + } + { + engine = "ruby"; + } + ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; + type = "gem"; + }; + version = "1.1.3"; + }; + coercible = { + dependencies = [ "descendants_tracker" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah"; + type = "gem"; + }; + version = "1.0.0"; + }; + colored2 = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + commonmarker = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1gyjwd7in1nlf8zai2fxazxi8cy6xjzswdcjway520blb39ka7cx"; + type = "gem"; + }; + version = "0.23.11"; + }; + concurrent-ruby = { + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + type = "gem"; + }; + version = "1.2.3"; + }; + connection_pool = { + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; + type = "gem"; + }; + version = "2.5.3"; + }; + console = { + dependencies = [ + "fiber-annotation" + "fiber-local" + "json" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1mkwwz5ry6hbn328fb3myr86zsc6lg0f7w1dlbfmjw043ddbgndg"; + type = "gem"; + }; + version = "1.29.2"; + }; + cork = { + dependencies = [ "colored2" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1g6l780z1nj4s3jr11ipwcj8pjbibvli82my396m3y32w98ar850"; + type = "gem"; + }; + version = "0.3.0"; + }; + cose = { + dependencies = [ + "cbor" + "openssl-signature_algorithm" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; + type = "gem"; + }; + version = "1.3.0"; + }; + countries = { + dependencies = [ + "i18n_data" + "sixarm_ruby_unaccent" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ic1zbzqbrvb3myhgzpq4vigr3qnyl2r0vga84d9z5121cy8lbnk"; + type = "gem"; + }; + version = "4.0.1"; + }; + coverband = { + dependencies = [ + "base64" + "redis" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09c21zxv7lsq5ih5rp214y38hcjm3pg5n3as1mqc2w0gn3lkn5s5"; + type = "gem"; + }; + version = "6.1.5"; + }; + crack = { + dependencies = [ "safe_yaml" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; + type = "gem"; + }; + version = "0.4.3"; + }; + crass = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; + type = "gem"; + }; + version = "1.0.6"; + }; + creole = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm"; + type = "gem"; + }; + version = "0.5.0"; + }; + css_parser = { + dependencies = [ "addressable" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; + type = "gem"; + }; + version = "1.14.0"; + }; + cssbundling-rails = { + dependencies = [ "railties" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hbfji8lddlvsk9x70s5xvafl3w31v6mm5wjrn7rrb14gmdcvbjk"; + type = "gem"; + }; + version = "1.4.3"; + }; + csv = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b"; + type = "gem"; + }; + version = "3.3.0"; + }; + csv_builder = { + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/gems/csv_builder"; + type = "path"; + }; + version = "0.1.0"; + }; + cvss-suite = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hyqdsh7zrgfq8hjvgnk9ij5qrj3j51m650nrfqk7n6mw30ry6al"; + type = "gem"; + }; + version = "3.3.0"; + }; + danger = { + dependencies = [ + "claide" + "claide-plugins" + "colored2" + "cork" + "faraday" + "faraday-http-cache" + "git" + "kramdown" + "kramdown-parser-gfm" + "no_proxy_fix" + "octokit" + "terminal-table" + ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "104x4p9rmk8frf4l858p171vjaif7mqgxspx61d26c0hfg355ra3"; + type = "gem"; + }; + version = "9.4.2"; + }; + danger-gitlab = { + dependencies = [ + "danger" + "gitlab" + ]; + groups = [ + "danger" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1a530kx5s5rbx5yx3jqay56lkksqh0yj468hcpg16faiyv8dfza9"; + type = "gem"; + }; + version = "8.0.0"; + }; + database_cleaner-active_record = { + dependencies = [ + "activerecord" + "database_cleaner-core" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1iz1hv2b1z7509dxvxdwzay1hhs24glxls5ldbyh688zxkcdca1j"; + type = "gem"; + }; + version = "2.2.0"; + }; + database_cleaner-core = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v44bn386ipjjh4m2kl53dal8g4d41xajn2jggnmjbhn6965fil6"; + type = "gem"; + }; + version = "2.0.1"; + }; + date = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; + type = "gem"; + }; + version = "3.4.1"; + }; + deb_version = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04z75v3wdghqbahgipvz8y75krkqq17jbbna349ddl9ggwfr27y2"; + type = "gem"; + }; + version = "1.0.2"; + }; + debug_inspector = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; + type = "gem"; + }; + version = "1.1.0"; + }; + deckar01-task_list = { + dependencies = [ "html-pipeline" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rqn9jh45gsw045c6fm05875bpj2xbhnff5m5drmk9wy01zdrav6"; + type = "gem"; + }; + version = "2.3.4"; + }; + declarative = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; + type = "gem"; + }; + version = "0.0.20"; + }; + declarative_policy = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jri6fqpyrlnhl99mhqlqwpi6z8idb7g421rysxz40yyk8lwzx4s"; + type = "gem"; + }; + version = "1.1.0"; + }; + deprecation_toolkit = { + dependencies = [ "activesupport" ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0k8j50avgs2pgv20wvrzr77g9yvhi5sa9yh93n72nyd4hhbd28cb"; + type = "gem"; + }; + version = "2.2.3"; + }; + derailed_benchmarks = { + dependencies = [ + "base64" + "benchmark-ips" + "bigdecimal" + "drb" + "get_process_mem" + "heapy" + "logger" + "memory_profiler" + "mini_histogram" + "mutex_m" + "ostruct" + "rack" + "rack-test" + "rake" + "ruby-statistics" + "ruby2_keywords" + "thor" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fa4bl6afnqqq55fp45bmwin02dgrw7zq9zwv2f1rm6y9xk80hk5"; + type = "gem"; + }; + version = "2.2.1"; + }; + descendants_tracker = { + dependencies = [ "thread_safe" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79"; + type = "gem"; + }; + version = "0.0.4"; + }; + devfile = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1dcj3r8gh4y4cks1qk5qhj89ggk6z8kmk3hq9nlvnm9pnb7m9fbs"; + type = "gem"; + }; + version = "0.4.4"; + }; + device_detector = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zbsjj1bgwmsiqiw6x5fzbzp25xc10c02s37ggl2635ha0qzn05q"; + type = "gem"; + }; + version = "1.0.0"; + }; + devise = { + dependencies = [ + "bcrypt" + "orm_adapter" + "railties" + "responders" + "warden" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1y57fpcvy1kjd4nb7zk7mvzq62wqcpfynrgblj558k3hbvz4404j"; + type = "gem"; + }; + version = "4.9.4"; + }; + devise-pbkdf2-encryptable = { + dependencies = [ + "devise" + "devise-two-factor" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/devise-pbkdf2-encryptable"; + type = "path"; + }; + version = "0.0.0"; + }; + devise-two-factor = { + dependencies = [ + "activesupport" + "attr_encrypted" + "devise" + "railties" + "rotp" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15cbgb0hyq78myc6aaszzdrd9qll9n3qdhykmrx22qiyac3mnpy9"; + type = "gem"; + }; + version = "4.1.1"; + }; + diff-lcs = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + type = "gem"; + }; + version = "1.5.0"; + }; + diff_match_patch = { + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/diff_match_patch"; + type = "path"; + }; + version = "0.1.0"; + }; + diffy = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22"; + type = "gem"; + }; + version = "3.4.3"; + }; + digest-crc = { + dependencies = [ "rake" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09114ndpnnyamc2q07bmpzw7kp3rbbfv7plmxcbzzi9d6prmd92w"; + type = "gem"; + }; + version = "0.6.5"; + }; + docile = { + groups = [ + "coverage" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; + type = "gem"; + }; + version = "1.4.0"; + }; + domain_name = { + dependencies = [ "unf" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; + doorkeeper = { + dependencies = [ "railties" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lsh9lzrglqlwm9icmn0ggrwjc9iy9308f9m59z1w2srmyp0fgd7"; + type = "gem"; + }; + version = "5.8.2"; + }; + doorkeeper-device_authorization_grant = { + dependencies = [ "doorkeeper" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0y96jc05c26ld35q121yj1g7lfcb55jfsn6d1s2l42fml09arhwl"; + type = "gem"; + }; + version = "1.0.3"; + }; + doorkeeper-openid_connect = { + dependencies = [ + "doorkeeper" + "jwt" + "ostruct" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lznnxv845lb513s8gs2wckg3vrbj1w573sbs1agmxbn670akaaj"; + type = "gem"; + }; + version = "1.8.11"; + }; + dotenv = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + type = "gem"; + }; + version = "2.7.6"; + }; + drb = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; + }; + dry-cli = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1w39jms4bsggxvl23cxanhccv1ngb6nqxsqhi784v5bjz1lx3si8"; + type = "gem"; + }; + version = "1.0.0"; + }; + dry-core = { + dependencies = [ + "concurrent-ruby" + "zeitwerk" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03a5qn74c4lk2rpy6wlhv66synjlyzc4wn086xzphkpmw12l4bzk"; + type = "gem"; + }; + version = "1.0.1"; + }; + dry-inflector = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09hnvna3lg2x36li63988kv664d0zvy7y0z33803yvrdr9hj7lka"; + type = "gem"; + }; + version = "1.0.0"; + }; + dry-logic = { + dependencies = [ + "concurrent-ruby" + "dry-core" + "zeitwerk" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05nldkc154r0qzlhss7n5klfiyyz05x2fkq08y13s34py6023vcr"; + type = "gem"; + }; + version = "1.5.0"; + }; + dry-types = { + dependencies = [ + "concurrent-ruby" + "dry-core" + "dry-inflector" + "dry-logic" + "zeitwerk" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1f6dz0hm67rhybh6xq2s3vvr700cp43kf50z2lids62s2i0mh5hj"; + type = "gem"; + }; + version = "1.7.1"; + }; + dumb_delegator = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "151fdn7y0gqs7f6y3y7rn3frv0z359qrw9hb4s7avn6j2qc42ppz"; + type = "gem"; + }; + version = "1.0.0"; + }; + duo_api = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xq8ikcphbxgwdyvmzm1162znrz6j0wsr2bkmwa4nvjf303b99h6"; + type = "gem"; + }; + version = "1.4.0"; + }; + ed25519 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01n5rbyws1ijwc5dw7s88xx3zzacxx9k97qn8x11b6k8k18pzs8n"; + type = "gem"; + }; + version = "1.4.0"; + }; + elasticsearch = { + dependencies = [ + "elasticsearch-api" + "elasticsearch-transport" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11pw5x7kg6f6m8rqy2kpbzdlnvijjpmbqkj2gz8237wkbl40y27d"; + type = "gem"; + }; + version = "7.17.11"; + }; + elasticsearch-api = { + dependencies = [ "multi_json" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01wi43a3zylrq2vca08vir5va142g5m3jcsak3rprjck8jvggn7y"; + type = "gem"; + }; + version = "7.17.11"; + }; + elasticsearch-model = { + dependencies = [ + "activesupport" + "elasticsearch" + "hashie" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02x2wvd22wwi2v6pps7y4advzkyfbhxn0fgsai49zcjbcrblnp4b"; + type = "gem"; + }; + version = "7.2.1"; + }; + elasticsearch-rails = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1r2nh6csdlbfk5hqq5qbvvw1kvv6qa382alil2ixjn33jl7dql07"; + type = "gem"; + }; + version = "7.2.1"; + }; + elasticsearch-transport = { + dependencies = [ + "base64" + "faraday" + "multi_json" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00qgyyvjyyv7z22qjd408pby1h7902gdwkh8h3z3jk2y57amg06i"; + type = "gem"; + }; + version = "7.17.11"; + }; + email_reply_trimmer = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0vijywhy1acsq4187ss6w8a7ksswaf1d5np3wbj962b6rqif5vcz"; + type = "gem"; + }; + version = "0.1.6"; + }; + email_spec = { + dependencies = [ + "htmlentities" + "launchy" + "mail" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "049dhlyy2hcksp1wj9mx2fngk5limkm3afxysnizg1hi2dxbw8yz"; + type = "gem"; + }; + version = "2.3.0"; + }; + email_validator = { + dependencies = [ "activemodel" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0106y8xakq6frv2xc68zz76q2l2cqvhfjc7ji69yyypcbc4kicjs"; + type = "gem"; + }; + version = "2.2.4"; + }; + encryptor = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb"; + type = "gem"; + }; + version = "3.0.0"; + }; + error_tracking_open_api = { + dependencies = [ "typhoeus" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/gems/error_tracking_open_api"; + type = "path"; + }; + version = "1.0.0"; + }; + erubi = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + type = "gem"; + }; + version = "1.12.0"; + }; + escape_utils = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "029c7kynhkxw8fgq9q171xi68ajfqrb22r7drvkar018j8871yyz"; + type = "gem"; + }; + version = "1.3.0"; + }; + et-orbi = { + dependencies = [ "tzinfo" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj"; + type = "gem"; + }; + version = "1.2.11"; + }; + ethon = { + dependencies = [ "ffi" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v"; + type = "gem"; + }; + version = "0.16.0"; + }; + excon = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; + type = "gem"; + }; + version = "0.99.0"; + }; + execjs = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; + type = "gem"; + }; + version = "2.8.1"; + }; + expgen = { + dependencies = [ "parslet" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fd2sdh3lc3x0qds30czli8k5qr45bkb7ssx0kb038hhn9jhysjf"; + type = "gem"; + }; + version = "0.1.1"; + }; + expression_parser = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib"; + type = "gem"; + }; + version = "0.9.0"; + }; + extended-markdown-filter = { + dependencies = [ "html-pipeline" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f7isjr3vpvmyc3arqcgn1fc69axxd73xk87nk31ibpv15sfzvn8"; + type = "gem"; + }; + version = "0.7.0"; + }; + factory_bot = { + dependencies = [ "activesupport" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0q927lvgjqj0xaplxhicj5xv8xadx3957mank3p7g01vb6iv6x33"; + type = "gem"; + }; + version = "6.5.0"; + }; + factory_bot_rails = { + dependencies = [ + "factory_bot" + "railties" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "122wkrc3d2q1dlca27794hh3arw0kvrf3rgmvn7hj3y5lb51g7hk"; + type = "gem"; + }; + version = "6.4.4"; + }; + faraday = { + dependencies = [ + "faraday-net_http" + "json" + "logger" + ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm"; + type = "gem"; + }; + version = "2.12.2"; + }; + faraday-follow_redirects = { + dependencies = [ "faraday" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr"; + type = "gem"; + }; + version = "0.3.0"; + }; + faraday-http-cache = { + dependencies = [ "faraday" ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qvl49xpl2mwxgcj6aj11qrjk94xrqhbnpl5vp1y2275crnkddv4"; + type = "gem"; + }; + version = "2.5.0"; + }; + faraday-multipart = { + dependencies = [ "multipart-post" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-net_http = { + dependencies = [ "net-http" ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; + type = "gem"; + }; + version = "3.1.0"; + }; + faraday-net_http_persistent = { + dependencies = [ + "faraday" + "net-http-persistent" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02yydasm9qlq59dnj3dldaqd0xidxyx59pnr2iqygnjn7yqj05xl"; + type = "gem"; + }; + version = "2.1.0"; + }; + faraday-retry = { + dependencies = [ "faraday" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "023ncwlagnf2irx2ckyj1pg1f1x436jgr4a5y45mih298p8zwij1"; + type = "gem"; + }; + version = "2.2.1"; + }; + faraday-typhoeus = { + dependencies = [ + "faraday" + "typhoeus" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rwhd2f78vqj0wkkdah395apx6igp5xf82n5xgixs61q45y19ii4"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday_middleware-aws-sigv4 = { + dependencies = [ + "aws-sigv4" + "faraday" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "13xym8pfjh1j2pf63r45ybdy6p4hjrqn4algml5wd8bwd17yl0d0"; + type = "gem"; + }; + version = "1.0.1"; + }; + fast_blank = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1shpmamyzyhyxmv95r96ja5rylzaw60r19647d0fdm7y2h2c77r6"; + type = "gem"; + }; + version = "1.0.1"; + }; + fast_gettext = { + dependencies = [ + "prime" + "racc" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qr73k69pk5sjgkysrfar0sghrx0shz7kkfjcab200fnfqk62swf"; + type = "gem"; + }; + version = "4.1.0"; + }; + ffaker = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ljxb9kqssp70waz0an1ppm33821r0dbvs4b75qbqbv05p0ziqs3"; + type = "gem"; + }; + version = "2.24.0"; + }; + ffi = { + groups = [ + "default" + "development" + "kerberos" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9"; + type = "gem"; + }; + version = "1.17.2"; + }; + ffi-compiler = { + dependencies = [ + "ffi" + "rake" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; + type = "gem"; + }; + version = "1.0.1"; + }; + ffi-yajl = { + dependencies = [ "libyajl2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dj3y95260rvlclkkcxak6c1dsrzbyr4wik7jv3y949r4w9adfk9"; + type = "gem"; + }; + version = "2.6.0"; + }; + fiber-annotation = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00vcmynyvhny8n4p799rrhcx0m033hivy0s1gn30ix8rs7qsvgvs"; + type = "gem"; + }; + version = "0.2.0"; + }; + fiber-local = { + dependencies = [ "fiber-storage" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01lz929qf3xa90vra1ai1kh059kf2c8xarfy6xbv1f8g457zk1f8"; + type = "gem"; + }; + version = "1.1.0"; + }; + fiber-storage = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0b5fr7i4p2gfqv6k2d93124zcv2kbdzvamalbcb1hn1yzm12gxq2"; + type = "gem"; + }; + version = "0.1.2"; + }; + find_a_port = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1sswgpvn38yav4i21adrr7yy8c8299d7rj065gd3iwg6nn26lpb0"; + type = "gem"; + }; + version = "1.0.1"; + }; + flipper = { + dependencies = [ "concurrent-ruby" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0sgqc90fs9bmphaaphr7366ngy9wj2g4513dfdc36r1ljij4lp7x"; + type = "gem"; + }; + version = "0.28.3"; + }; + flipper-active_record = { + dependencies = [ + "activerecord" + "flipper" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "080rmmhz9kf4m3z845gqwm4f4cdr4pihhmsprxsjn1m8blk1raf6"; + type = "gem"; + }; + version = "0.28.3"; + }; + flipper-active_support_cache_store = { + dependencies = [ + "activesupport" + "flipper" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zfrzfbbr7kc2g5bdvlvf0yd43vpjsfkmcyl07q0c0ljg42y46hi"; + type = "gem"; + }; + version = "0.28.3"; + }; + fog-aliyun = { + dependencies = [ + "addressable" + "aliyun-sdk" + "fog-core" + "fog-json" + "ipaddress" + "xml-simple" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f6cwnq4vq628lgv1wn7fzmwgcpv840zbmcwpfpiwy7b9dh388wg"; + type = "gem"; + }; + version = "0.4.0"; + }; + fog-aws = { + dependencies = [ + "base64" + "fog-core" + "fog-json" + "fog-xml" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1f67gjmvpcdql5mh4z9z0i03snwx80q7y37nyp1bgryb61gic4vm"; + type = "gem"; + }; + version = "3.27.0"; + }; + fog-core = { + dependencies = [ + "builder" + "excon" + "formatador" + "mime-types" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; + type = "gem"; + }; + version = "2.1.0"; + }; + fog-google = { + dependencies = [ + "addressable" + "fog-core" + "fog-json" + "fog-xml" + "google-apis-compute_v1" + "google-apis-dns_v1" + "google-apis-iamcredentials_v1" + "google-apis-monitoring_v3" + "google-apis-pubsub_v1" + "google-apis-sqladmin_v1beta4" + "google-apis-storage_v1" + "google-cloud-env" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1q2qhdkz7axp1f853d3jxx852gj5idrqhypxk8k3zm9fs72lxmnw"; + type = "gem"; + }; + version = "1.24.1"; + }; + fog-json = { + dependencies = [ + "fog-core" + "multi_json" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; + type = "gem"; + }; + version = "1.2.0"; + }; + fog-local = { + dependencies = [ "fog-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yggsxd7c58p5i8zgvfw9rkqlg75l6hkbwnpgawd2sacwl4jsfr6"; + type = "gem"; + }; + version = "0.8.0"; + }; + fog-xml = { + dependencies = [ + "fog-core" + "nokogiri" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1miv6zgglx4vddw2c17mpf6l36qn0abq7ngrxb9isih10yhzxfaj"; + type = "gem"; + }; + version = "0.1.5"; + }; + formatador = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + type = "gem"; + }; + version = "0.2.5"; + }; + forwardable = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1b5g1i3xdvmxxpq4qp0z4v78ivqnazz26w110fh4cvzsdayz8zgi"; + type = "gem"; + }; + version = "1.3.3"; + }; + fugit = { + dependencies = [ + "et-orbi" + "raabro" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578"; + type = "gem"; + }; + version = "1.11.1"; + }; + fuzzyurl = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03qchs33vfwbsv5awxg3acfmlcrf5xbhnbrc83fdpamwya0glbjl"; + type = "gem"; + }; + version = "0.9.0"; + }; + gapic-common = { + dependencies = [ + "faraday" + "faraday-retry" + "google-protobuf" + "googleapis-common-protos" + "googleapis-common-protos-types" + "googleauth" + "grpc" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rlka373b2iva4dz2diz2zx7jyx617hwqvnfx2hs5xs0nh24fc5g"; + type = "gem"; + }; + version = "0.20.0"; + }; + gdk-toogle = { + dependencies = [ + "haml" + "rails" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jfjp87f4zi5jp8ydwabvfz3dv115ickaaasbs8c096kfqjrgf1q"; + type = "gem"; + }; + version = "0.9.5"; + }; + gemoji = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; + type = "gem"; + }; + version = "3.0.1"; + }; + get_process_mem = { + dependencies = [ "ffi" ]; + groups = [ + "default" + "puma" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1fkyyyxjcx4iigm8vhraa629k2lxa1npsv4015y82snx84v3rzaa"; + type = "gem"; + }; + version = "0.2.7"; + }; + gettext = { + dependencies = [ + "erubi" + "locale" + "prime" + "racc" + "text" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0aji3873pxn6gc5qkvnv5y9025mqk0p6h22yrpyz2b3yx9qpzv03"; + type = "gem"; + }; + version = "3.5.1"; + }; + gettext_i18n_rails = { + dependencies = [ "fast_gettext" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rlfmhhampvkzir32yqriry6rc6w66l36kb95lmfav4bjafp796l"; + type = "gem"; + }; + version = "1.13.0"; + }; + git = { + dependencies = [ + "addressable" + "rchardet" + ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0w3xhay1z7qx9ab04wmy5p4f1fadvqa6239kib256wsiyvcj595h"; + type = "gem"; + }; + version = "1.19.1"; + }; + gitaly = { + dependencies = [ "grpc" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kvv1idqscqh03wp6xcb5mi03j5hksbnn8dadcwpv2izm0srfv8r"; + type = "gem"; + }; + version = "17.8.4"; + }; + gitlab = { + dependencies = [ + "httparty" + "terminal-table" + ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ycnjjk1im5a82k02avix7c5c87vrkl87gsghgq29g2x34z5wr1z"; + type = "gem"; + }; + version = "4.19.0"; + }; + gitlab-active-context = { + dependencies = [ + "activerecord" + "activesupport" + "connection_pool" + "elasticsearch" + "opensearch-ruby" + "pg" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/gems/gitlab-active-context"; + type = "path"; + }; + version = "0.0.1"; + }; + gitlab-backup-cli = { + dependencies = [ + "activerecord" + "activesupport" + "addressable" + "bigdecimal" + "concurrent-ruby" + "faraday" + "google-cloud-storage_transfer" + "google-protobuf" + "googleauth" + "grpc" + "json" + "jwt" + "logger" + "minitest" + "mutex_m" + "parallel" + "pg" + "rack" + "rainbow" + "rexml" + "thor" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/gems/gitlab-backup-cli"; + type = "path"; + }; + version = "0.0.1"; + }; + gitlab-chronic = { + dependencies = [ "numerizer" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1b592pa4f837idpg0a8cs8dfq18nvxm34bwvmv3amlln2cdd2i52"; + type = "gem"; + }; + version = "0.10.6"; + }; + gitlab-cloud-connector = { + dependencies = [ + "activesupport" + "jwt" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1bshayyh9pb2rgb9qc82dc9fr1xkf4kxj10rd0lkjqxnbh7ppsxi"; + type = "gem"; + }; + version = "1.12.0"; + }; + gitlab-crystalball = { + dependencies = [ "git" ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "16mlrsd4lyvp9faqrnd7nmrl485wzrj2vp6y72x7f8wmsmqpivf4"; + type = "gem"; + }; + version = "0.7.2"; + }; + gitlab-dangerfiles = { + dependencies = [ + "danger" + "danger-gitlab" + "rake" + ]; + groups = [ + "danger" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cpiznkzlvsbanfcvnqdf0lxrzjd3i592d0j766xmr55mkc1jsr9"; + type = "gem"; + }; + version = "4.9.1"; + }; + gitlab-duo-workflow-service-client = { + dependencies = [ "grpc" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/gitlab-duo-workflow-service-client"; + type = "path"; + }; + version = "0.1"; + }; + gitlab-experiment = { + dependencies = [ + "activesupport" + "request_store" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0j0zs29izmhqc1jvgfsvikqdyg6r8kf3j9azbmsmm02l45sfwc7j"; + type = "gem"; + }; + version = "0.9.1"; + }; + gitlab-fog-azure-rm = { + dependencies = [ + "faraday" + "faraday-follow_redirects" + "faraday-net_http_persistent" + "fog-core" + "fog-json" + "mime-types" + "net-http-persistent" + "nokogiri" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1acbwzi4dkixfmb2rggzf4pg65cyxhbggrs4642p8y7mf0hpraii"; + type = "gem"; + }; + version = "2.2.0"; + }; + gitlab-glfm-markdown = { + dependencies = [ "rb_sys" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rh0bij1nk0c6agqg39p5qwhc93fdgriwqwnshgrkn66kwzs7ppk"; + type = "gem"; + }; + version = "0.0.30"; + }; + gitlab-housekeeper = { + dependencies = [ + "activesupport" + "awesome_print" + "httparty" + "rubocop" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + path = "${src}/gems/gitlab-housekeeper"; + type = "path"; + }; + version = "0.1.0"; + }; + gitlab-http = { + dependencies = [ + "activesupport" + "concurrent-ruby" + "httparty" + "ipaddress" + "net-http" + "railties" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/gems/gitlab-http"; + type = "path"; + }; + version = "0.1.0"; + }; + gitlab-kas-grpc = { + dependencies = [ "grpc" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "075fasc3mv2l87l34cw5pw1vyf2ad254gsa9jpl4cqv3rx6hbfgj"; + type = "gem"; + }; + version = "17.11.2"; + }; + gitlab-labkit = { + dependencies = [ + "actionpack" + "activesupport" + "grpc" + "jaeger-client" + "opentracing" + "pg_query" + "redis" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0w7szxnvh9hvxcragnqvn37c6jpm4gf7aadzxslajj91vdh0mpfj"; + type = "gem"; + }; + version = "0.37.0"; + }; + gitlab-license = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05nhswkfhxkr5y87gkq17h23a1kkr78c2n7pgg3hwr1m73kql7rc"; + type = "gem"; + }; + version = "2.6.0"; + }; + gitlab-mail_room = { + dependencies = [ + "jwt" + "net-imap" + "oauth2" + "redis" + "redis-namespace" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05i3jvgjv3rqyiwyfjpk0mp419f5jl5gn2m0grsgak09jaw7vh05"; + type = "gem"; + }; + version = "0.0.27"; + }; + gitlab-markup = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bm0zccj88aavy23vqy1pkz4gmbw6gdb40n0wqlz7a332j3iq6lm"; + type = "gem"; + }; + version = "2.0.0"; + }; + gitlab-net-dns = { + dependencies = [ "logger" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19xmqvmv34gydymqv5m6aiync1xmycisqg4k0rrsglfllnqgnjmn"; + type = "gem"; + }; + version = "0.12.0"; + }; + gitlab-rspec = { + dependencies = [ + "activerecord" + "activesupport" + "rspec" + ]; + groups = [ + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + path = "${src}/gems/gitlab-rspec"; + type = "path"; + }; + version = "0.1.0"; + }; + gitlab-rspec_flaky = { + dependencies = [ + "activesupport" + "rspec" + ]; + groups = [ + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + path = "${src}/gems/gitlab-rspec_flaky"; + type = "path"; + }; + version = "0.1.0"; + }; + gitlab-safe_request_store = { + dependencies = [ + "rack" + "request_store" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/gems/gitlab-safe_request_store"; + type = "path"; + }; + version = "0.1.0"; + }; + gitlab-schema-validation = { + dependencies = [ + "diffy" + "pg_query" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/gems/gitlab-schema-validation"; + type = "path"; + }; + version = "0.1.0"; + }; + gitlab-sdk = { + dependencies = [ + "activesupport" + "rake" + "snowplow-tracker" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0457dvz8zsb4fav85ry1v5pdzpyr41q397zgqzvjvfaa9w44kfj8"; + type = "gem"; + }; + version = "0.3.1"; + }; + gitlab-secret_detection = { + dependencies = [ + "grpc" + "grpc_reflection" + "parallel" + "re2" + "sentry-ruby" + "stackprof" + "toml-rb" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1gip6bgsh6b284sjlz24ljydshsa9p5ikizwrmb82gnsc46dcsmk"; + type = "gem"; + }; + version = "0.26.1"; + }; + gitlab-security_report_schemas = { + dependencies = [ + "activesupport" + "json_schemer" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1bl0qrmb6xci719zxnaizja2pf0wabzi91b49y0immf9gr43f01h"; + type = "gem"; + }; + version = "0.1.2.min15.0.0.max15.2.1"; + }; + gitlab-sidekiq-fetcher = { + dependencies = [ + "json" + "sidekiq" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/sidekiq-reliable-fetch"; + type = "path"; + }; + version = "0.12.1"; + }; + gitlab-styles = { + dependencies = [ + "rubocop" + "rubocop-capybara" + "rubocop-factory_bot" + "rubocop-graphql" + "rubocop-performance" + "rubocop-rails" + "rubocop-rspec" + "rubocop-rspec_rails" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hgjrf41dvpsrblanhk00x367csjs3y4y2mlnxl5hd8njrrcbis6"; + type = "gem"; + }; + version = "13.1.0"; + }; + gitlab-topology-service-client = { + dependencies = [ + "google-protobuf" + "grpc" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/gitlab-topology-service-client"; + type = "path"; + }; + version = "0.1"; + }; + gitlab-utils = { + dependencies = [ + "actionview" + "activesupport" + "addressable" + "rake" + ]; + groups = [ "monorepo" ]; + platforms = [ ]; + source = { + path = "${src}/gems/gitlab-utils"; + type = "path"; + }; + version = "0.1.0"; + }; + gitlab_chronic_duration = { + dependencies = [ "numerizer" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0vf1zw3z45m6ldwjvvzvbc6gr0spcbl1x1vny4qwid8msi26jxhd"; + type = "gem"; + }; + version = "0.12.0"; + }; + gitlab_omniauth-ldap = { + dependencies = [ + "net-ldap" + "omniauth" + "pyu-ruby-sasl" + "rubyntlm" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1343sax19jidp7nr4s8bxpkyqwy6zb9lfslg99jys8xinfn20kdv"; + type = "gem"; + }; + version = "2.2.0"; + }; + gitlab_quality-test_tooling = { + dependencies = [ + "activesupport" + "amatch" + "fog-google" + "gitlab" + "http" + "influxdb-client" + "nokogiri" + "parallel" + "rainbow" + "rspec-parameterized" + "table_print" + "zeitwerk" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05shhi6g3y8fp6h1accxzfi58py8d4rvv3bd17f1p6453pviirb8"; + type = "gem"; + }; + version = "2.10.0"; + }; + globalid = { + dependencies = [ "activesupport" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; + type = "gem"; + }; + version = "1.1.0"; + }; + gon = { + dependencies = [ + "actionpack" + "i18n" + "multi_json" + "request_store" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1w6ji15jrl4p6q0gxy5mmqspvzbmgkqj1d3xmbqr0a1rb7b1i9p3"; + type = "gem"; + }; + version = "6.4.0"; + }; + google-apis-androidpublisher_v3 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09almff2kzdkciai63365q18wy0dfjhj48h8wa7lk77pjbfxgqfp"; + type = "gem"; + }; + version = "0.34.0"; + }; + google-apis-cloudbilling_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zc6g2nx5l3qgf0kd8437ax1jwbmrxha2r2j17alyrn2pnp74ayv"; + type = "gem"; + }; + version = "0.22.0"; + }; + google-apis-cloudresourcemanager_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1gzv5svbj62qcdw5ljva0sh8wifjx9wwx00kfj9bbff052i7597h"; + type = "gem"; + }; + version = "0.31.0"; + }; + google-apis-compute_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0s40lzp1nvnpda45lvybira8gll8snkdd4v3x7sl8fmwi9a18ia0"; + type = "gem"; + }; + version = "0.57.0"; + }; + google-apis-container_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0914hq1wcnvg68vcdwpq5kxnm5h38ay7rrdsrzlqn9i7rca2a7bq"; + type = "gem"; + }; + version = "0.43.0"; + }; + google-apis-container_v1beta1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1l0k0davbaaqx76jy9vb6vk6j0l9hl68jmkgn7m6r4nvi37qzi38"; + type = "gem"; + }; + version = "0.43.0"; + }; + google-apis-core = { + dependencies = [ + "addressable" + "googleauth" + "httpclient" + "mini_mime" + "representable" + "retriable" + "rexml" + "webrick" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cly6ycryjhk15d60v3nqvhqpjk9f0nznnslbdnin90f5r54sbpd"; + type = "gem"; + }; + version = "0.11.2"; + }; + google-apis-dns_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ivx6km85mlycb11x2rbkyg3kl4syy3730q7pk8h6zdkibbp7ljx"; + type = "gem"; + }; + version = "0.36.0"; + }; + google-apis-iam_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rhzka4h1zg83zdyalbic25xbp8wrywsdfi6hdp663axdf3y5dqd"; + type = "gem"; + }; + version = "0.36.0"; + }; + google-apis-iamcredentials_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06smnmn2s460xl9x9rh07a3fkqdrjjy6azmx8iywggqgv2k5d8p9"; + type = "gem"; + }; + version = "0.15.0"; + }; + google-apis-monitoring_v3 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0a31sid7p4qn4m1gcq8z1bsqdyzzc84h4frh2dw97k5lwpff2zv7"; + type = "gem"; + }; + version = "0.54.0"; + }; + google-apis-pubsub_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01dj7jx6dfyl4wz88nn7ml45qvck6khl7gli8h6hl9c1qwa4dzhx"; + type = "gem"; + }; + version = "0.45.0"; + }; + google-apis-serviceusage_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qmh25nvf8f9p9fribm18nszvamilshavrmwyq3xmrs76q17w2sz"; + type = "gem"; + }; + version = "0.28.0"; + }; + google-apis-sqladmin_v1beta4 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17bljsgmbp80d6wn3wjbzi537a9f5hmcr0zv776z2y8q92v565am"; + type = "gem"; + }; + version = "0.41.0"; + }; + google-apis-storage_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1k432qgxf41c4m6d68rascm0gyj18r7ypmrnyzmxh7k7nh543awx"; + type = "gem"; + }; + version = "0.29.0"; + }; + google-cloud-artifact_registry-v1 = { + dependencies = [ + "gapic-common" + "google-cloud-errors" + "google-cloud-location" + "grpc-google-iam-v1" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gkq82lsjz3yw9w819ifdqx9ixcbgydr5myy64wnczknx7fd505s"; + type = "gem"; + }; + version = "0.11.0"; + }; + google-cloud-common = { + dependencies = [ + "google-protobuf" + "googleapis-common-protos-types" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yxmdxx933q48397jsczsmpshr4b61izv3spnhvzxd24s67v13bk"; + type = "gem"; + }; + version = "1.1.0"; + }; + google-cloud-compute-v1 = { + dependencies = [ + "gapic-common" + "google-cloud-common" + "google-cloud-errors" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07hly5qbdy0qddw48biw0ybi2cx13861l5i09mj2abzw7yrmjq5r"; + type = "gem"; + }; + version = "2.6.0"; + }; + google-cloud-core = { + dependencies = [ + "google-cloud-env" + "google-cloud-errors" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dagdfx3rnk9xplnj19gqpqn41fd09xfn8lp2p75psihhnj2i03l"; + type = "gem"; + }; + version = "1.7.0"; + }; + google-cloud-env = { + dependencies = [ "faraday" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg"; + type = "gem"; + }; + version = "2.1.1"; + }; + google-cloud-errors = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jynh1s93nl8njm5l5wcy86pnjmv112cq6m0443s52f04hg6h2s5"; + type = "gem"; + }; + version = "1.3.0"; + }; + google-cloud-location = { + dependencies = [ + "gapic-common" + "google-cloud-errors" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1l6j0i8flfdzl9c7db990632jmn5v7bmbh1i6x0sqp3f2p59jv1q"; + type = "gem"; + }; + version = "0.6.0"; + }; + google-cloud-profiler-v2 = { + dependencies = [ + "gapic-common" + "google-cloud-errors" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qyknlvwji7vqhani490cacsrzlqfza10hv47him93yhfnqjmz2k"; + type = "gem"; + }; + version = "0.4.0"; + }; + google-cloud-storage = { + dependencies = [ + "addressable" + "digest-crc" + "google-apis-iamcredentials_v1" + "google-apis-storage_v1" + "google-cloud-core" + "googleauth" + "mini_mime" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0033bi8qwm0ksxsv5zhz4nzwsiaapq3xk79z8f8rx3v09vdap07j"; + type = "gem"; + }; + version = "1.45.0"; + }; + google-cloud-storage_transfer = { + dependencies = [ + "google-cloud-core" + "google-cloud-storage_transfer-v1" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0n0nxy4l2kzcmcgx7j8mppyw9gwc8331fqcf6w6jmq4913sh2a8k"; + type = "gem"; + }; + version = "1.2.0"; + }; + google-cloud-storage_transfer-v1 = { + dependencies = [ + "gapic-common" + "google-cloud-errors" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xk1i7wg5alcgd9v4f0y3mjgxbsrcp53jhdjdc26wmfvfl1giglx"; + type = "gem"; + }; + version = "0.8.0"; + }; + google-protobuf = { + groups = [ + "default" + "development" + "opentelemetry" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1afriizkvwwcyh0s0j1x9d9045pn4f767gpj5q49hicsqz8flq58"; + type = "gem"; + }; + version = "3.25.7"; + }; + googleapis-common-protos = { + dependencies = [ + "google-protobuf" + "googleapis-common-protos-types" + "grpc" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "10p3kl9xdxl4xsijkj2l6qn525xchkbfhx3ch603ammibbxq08ys"; + type = "gem"; + }; + version = "1.4.0"; + }; + googleapis-common-protos-types = { + dependencies = [ "google-protobuf" ]; + groups = [ + "default" + "opentelemetry" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "152nfvcnj1i1gsphhs7mhxzd0wa9pjdjb0xhgb2bry16ag57djxf"; + type = "gem"; + }; + version = "1.19.0"; + }; + googleauth = { + dependencies = [ + "faraday" + "jwt" + "multi_json" + "os" + "signet" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1"; + type = "gem"; + }; + version = "1.8.1"; + }; + gpgme = { + dependencies = [ "mini_portile2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0r1vmql7w7ka5xzj1aqf8pk2a4sv0znwj2zkg1fgvd5b89qcvv2k"; + type = "gem"; + }; + version = "2.0.24"; + }; + grape = { + dependencies = [ + "activesupport" + "builder" + "dry-types" + "mustermann-grape" + "rack" + "rack-accept" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jj98w80ry1ir8lc3347130s0z8yd7gk727r9ynwwk782x6gkvrs"; + type = "gem"; + }; + version = "2.0.0"; + }; + grape-entity = { + dependencies = [ + "activesupport" + "multi_json" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0d16s18k34crhyc44ycj062y81sdahgp8pcll9xggbq7wja9w3z0"; + type = "gem"; + }; + version = "1.0.1"; + }; + grape-path-helpers = { + dependencies = [ + "activesupport" + "grape" + "rake" + "ruby2_keywords" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1mq2cwy0jvprq3wdilds1n865jdl58sqg00im4w6fybf5kjiclmd"; + type = "gem"; + }; + version = "2.0.1"; + }; + grape-swagger = { + dependencies = [ + "grape" + "rack-test" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "153jhazisala3f7wzcvx8nf2d3f0m3dpb240fm2p1vmsr19vvmwa"; + type = "gem"; + }; + version = "2.1.2"; + }; + grape-swagger-entity = { + dependencies = [ + "grape-entity" + "grape-swagger" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rpcsyzagcmd6pjixvms7mq0nc0aky53aw9mb9vmc6jbjqlfp852"; + type = "gem"; + }; + version = "0.5.5"; + }; + grape_logging = { + dependencies = [ + "grape" + "rack" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lcjqwal3wc2r41wsi01d09cyhxhglxp6y7hd0564pdx5lr3xk7g"; + type = "gem"; + }; + version = "1.8.4"; + }; + graphlyte = { + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kc0l67n5zlpwbnb8nrr27nm4fzpb7qih77a00grcvnygnv4mbxm"; + type = "gem"; + }; + version = "1.0.0"; + }; + graphql = { + dependencies = [ + "base64" + "fiber-storage" + "logger" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17dayn5422rnbaqs33dnl8d9jw7acpn6cg88z2awk4scwblvc7gv"; + type = "gem"; + }; + version = "2.4.13"; + }; + graphql-docs = { + dependencies = [ + "commonmarker" + "escape_utils" + "extended-markdown-filter" + "gemoji" + "graphql" + "html-pipeline" + "sass-embedded" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "011dasgfg93s39p2nnf88v2w9ds2czqxpgxvkxm4nfl0b9pcmfkn"; + type = "gem"; + }; + version = "5.0.0"; + }; + grpc = { + dependencies = [ + "google-protobuf" + "googleapis-common-protos-types" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11ink0ayf14qgs3msn5a7dpg49vm3ck2415r64nfk1i8xv286hsz"; + type = "gem"; + }; + version = "1.63.0"; + }; + grpc-google-iam-v1 = { + dependencies = [ + "google-protobuf" + "googleapis-common-protos" + "grpc" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kip34n9604j2cc9rkplv5ljq0n8f4aizix4yr8rginsa38md8yf"; + type = "gem"; + }; + version = "1.5.0"; + }; + grpc_reflection = { + dependencies = [ "grpc" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yq9344fbjgkzxb54chwf26sf62iv5zv57js7dihg94lyw9dyixw"; + type = "gem"; + }; + version = "0.1.1"; + }; + gssapi = { + dependencies = [ "ffi" ]; + groups = [ "kerberos" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; + type = "gem"; + }; + version = "1.3.1"; + }; + guard = { + dependencies = [ + "formatador" + "listen" + "lumberjack" + "nenv" + "notiffany" + "pry" + "shellany" + "thor" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1fwgvkmrg97xfswwgfrfcl1nc937yxwazfvpmf8vxj7cvnx7mfki"; + type = "gem"; + }; + version = "2.16.2"; + }; + guard-compat = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zj6sr1k8w59mmi27rsii0v8xyy2rnsi09nqvwpgj1q10yq1mlis"; + type = "gem"; + }; + version = "1.2.1"; + }; + guard-rspec = { + dependencies = [ + "guard" + "guard-compat" + "rspec" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jkm5xp90gm4c5s51pmf92i9hc10gslwwic6mvk72g0yplya0yx4"; + type = "gem"; + }; + version = "4.7.3"; + }; + haml = { + dependencies = [ + "temple" + "tilt" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "035fgbfr20m08w4603ls2lwqbggr0vy71mijz0p68ib1am394xbf"; + type = "gem"; + }; + version = "5.2.2"; + }; + haml_lint = { + dependencies = [ + "haml" + "parallel" + "rainbow" + "rubocop" + "sysexits" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qggmfrqx1f90xkkxn9afqk33bzx1vmj0gfdi6yvjj18d3p2w9p5"; + type = "gem"; + }; + version = "0.62.0"; + }; + hamlit = { + dependencies = [ + "temple" + "thor" + "tilt" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "13n3v9kbyrrm48hn1v0028cdrsq7pswb4s4w63x4b29kc99m1s6j"; + type = "gem"; + }; + version = "2.15.0"; + }; + hana = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03cvrv2wl25j9n4n509hjvqnmwa60k92j741b64a1zjisr1dn9al"; + type = "gem"; + }; + version = "1.3.7"; + }; + hashdiff = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jf9dxgjz6z7fvymyz2acyvn9iyvwkn6d9sk7y4fxwbmfc75yimm"; + type = "gem"; + }; + version = "1.1.0"; + }; + hashie = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; + type = "gem"; + }; + version = "5.0.0"; + }; + health_check = { + dependencies = [ "railties" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mrv2323hx4lbcr6xii6ry89b3zvly5jsaacwbblxibx4c46a50h"; + type = "gem"; + }; + version = "3.1.0"; + }; + heapy = { + dependencies = [ "thor" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1sl56ma851i82g3ax08igbn48igriiy152xzx30wgzv1bn21w53l"; + type = "gem"; + }; + version = "0.2.0"; + }; + html-pipeline = { + dependencies = [ + "activesupport" + "nokogiri" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "180kjksi0sdlqb0aq0bhal96ifwqm25hzb3w709ij55j51qls7ca"; + type = "gem"; + }; + version = "2.14.3"; + }; + html2text = { + dependencies = [ "nokogiri" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii"; + type = "gem"; + }; + version = "0.2.0"; + }; + htmlbeautifier = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1y55dx25l3wwc025mwl6jsbcsqrm30gs2d2pxnaxg07yh22ckq4x"; + type = "gem"; + }; + version = "1.4.2"; + }; + htmlentities = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + http = { + dependencies = [ + "addressable" + "http-cookie" + "http-form_data" + "llhttp-ffi" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; + type = "gem"; + }; + version = "5.1.1"; + }; + http-accept = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6"; + type = "gem"; + }; + version = "1.7.0"; + }; + http-cookie = { + dependencies = [ "domain_name" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; + type = "gem"; + }; + version = "1.0.5"; + }; + http-form_data = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wx591jdhy84901pklh1n9sgh74gnvq1qyqxwchni1yrc49ynknc"; + type = "gem"; + }; + version = "2.3.0"; + }; + httparty = { + dependencies = [ + "csv" + "mini_mime" + "multi_xml" + ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v7s60abgwkahkqi4lf68hmz3j69jli3q25jsf9h1kvijif2lrbq"; + type = "gem"; + }; + version = "0.22.0"; + }; + httpclient = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + i18n = { + dependencies = [ "concurrent-ruby" ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; + type = "gem"; + }; + version = "1.14.4"; + }; + i18n_data = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rizqqss1bvb668mw72ls7rlj6im82aizz230jxn7d39kaq9kap5"; + type = "gem"; + }; + version = "0.13.1"; + }; + icalendar = { + dependencies = [ + "ice_cube" + "ostruct" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11fl1kfqvgnh0vnryc9kbbaal693kdgf5h6qnj37p9wz5xkw5gqf"; + type = "gem"; + }; + version = "2.10.3"; + }; + ice_cube = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1dri4mcya1fwzrr9nzic8hj1jr28a2szjag63f9k7p2bw9fpw4fs"; + type = "gem"; + }; + version = "0.16.4"; + }; + ice_nine = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; + type = "gem"; + }; + version = "0.11.2"; + }; + imagen = { + dependencies = [ "parser" ]; + groups = [ + "coverage" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jz2750ildym7bfppx143zik7n576mpzrsqm4slxnxw80w9fk7rn"; + type = "gem"; + }; + version = "0.2.0"; + }; + influxdb-client = { + dependencies = [ "csv" ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wp1p29hg5xb1izrl5xr6azp8x0l9kx9nvdg66glrxj20p48w7nw"; + type = "gem"; + }; + version = "3.2.0"; + }; + invisible_captcha = { + dependencies = [ "rails" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07ibhphcvf9lfaar9g78cazbdrp03dzfks53bcaiss8vxgrm5d02"; + type = "gem"; + }; + version = "2.1.0"; + }; + io-console = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd"; + type = "gem"; + }; + version = "0.8.0"; + }; + io-event = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hag7zbmsvkbmv0486bxqvnngym4mhsj32aywwmklr5d21k2n9jc"; + type = "gem"; + }; + version = "1.9.0"; + }; + ipaddress = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; + type = "gem"; + }; + version = "0.8.3"; + }; + ipynbdiff = { + dependencies = [ + "diffy" + "oj" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/gems/ipynbdiff"; + type = "path"; + }; + version = "0.4.8"; + }; + irb = { + dependencies = [ + "pp" + "rdoc" + "reline" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1478m97wiy6nwg6lnl0szy39p46acsvrhax552vsh1s2mi2sgg6r"; + type = "gem"; + }; + version = "1.15.1"; + }; + jaeger-client = { + dependencies = [ + "opentracing" + "thrift" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1a2qlkc1hkr5hkj2574l1a63sm04bdx98gfhh9m8vvp6psdrnpnb"; + type = "gem"; + }; + version = "1.1.0"; + }; + jaro_winkler = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09645h5an19zc1i7wlmixszj8xxqb2zc8qlf8dmx39bxpas1l24b"; + type = "gem"; + }; + version = "1.6.0"; + }; + jira-ruby = { + dependencies = [ + "activesupport" + "atlassian-jwt" + "multipart-post" + "oauth" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qpbc97sag426h4hgcizqq2njxx5fridzxq6mq5s93jazxmnxwmb"; + type = "gem"; + }; + version = "2.3.0"; + }; + jmespath = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; + type = "gem"; + }; + version = "1.6.2"; + }; + js_regex = { + dependencies = [ + "character_set" + "regexp_parser" + "regexp_property_values" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1da4ccsq5bycg28iv0smmrra80jad3a8ya10lps5lv8fbbfvqd3r"; + type = "gem"; + }; + version = "3.8.0"; + }; + json = { + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s"; + type = "gem"; + }; + version = "2.11.3"; + }; + json-jwt = { + dependencies = [ + "activesupport" + "aes_key_wrap" + "base64" + "bindata" + "faraday" + "faraday-follow_redirects" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v16kd05ijdmw1q8avpfsjkdiha6c2070hbz2g2fqg3lv2f1yidb"; + type = "gem"; + }; + version = "1.16.6"; + }; + json_schemer = { + dependencies = [ + "bigdecimal" + "hana" + "regexp_parser" + "simpleidn" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dgbrps0ydiyxcgj5n4dny0cmzwj125x1s792l7m5jjrp1rs27wz"; + type = "gem"; + }; + version = "2.3.0"; + }; + jsonb_accessor = { + dependencies = [ + "activerecord" + "activesupport" + "pg" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1avnyx2ympzbmkqbc9dfy87npzcfia8sys2dc9m6prs3p1y0h3h1"; + type = "gem"; + }; + version = "1.4"; + }; + jsonpath = { + dependencies = [ "multi_json" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fkdjic88hh0accp0sbx5mcrr9yaqwampf5c3214212d4i614138"; + type = "gem"; + }; + version = "1.1.2"; + }; + jwt = { + dependencies = [ "base64" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rba9mji57sfa1kjhj0bwff1377vj0i8yx2rd39j5ik4vp60gzam"; + type = "gem"; + }; + version = "2.9.3"; + }; + kaminari = { + dependencies = [ + "activesupport" + "kaminari-actionview" + "kaminari-activerecord" + "kaminari-core" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gia8irryvfhcr6bsr64kpisbgdbqjsqfgrk12a11incmpwny1y4"; + type = "gem"; + }; + version = "1.2.2"; + }; + kaminari-actionview = { + dependencies = [ + "actionview" + "kaminari-core" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02f9ghl3a9b5q7l079d3yzmqjwkr4jigi7sldbps992rigygcc0k"; + type = "gem"; + }; + version = "1.2.2"; + }; + kaminari-activerecord = { + dependencies = [ + "activerecord" + "kaminari-core" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0c148z97s1cqivzbwrak149z7kl1rdmj7dxk6rpkasimmdxsdlqd"; + type = "gem"; + }; + version = "1.2.2"; + }; + kaminari-core = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zw3pg6kj39y7jxakbx7if59pl28lhk98fx71ks5lr3hfgn6zliv"; + type = "gem"; + }; + version = "1.2.2"; + }; + knapsack = { + dependencies = [ "rake" ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1f42akjbdkrg1ihwvls9pkkvz8vikaapzgxl82dd128rfn42chm9"; + type = "gem"; + }; + version = "4.0.0"; + }; + kramdown = { + dependencies = [ "rexml" ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7"; + type = "gem"; + }; + version = "2.5.1"; + }; + kramdown-parser-gfm = { + dependencies = [ "kramdown" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; + type = "gem"; + }; + version = "1.1.0"; + }; + kubeclient = { + dependencies = [ + "http" + "jsonpath" + "recursive-open-struct" + "rest-client" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1k1zi27fnasqpinfxnajm81pyr11k2j510wacr53d37v97bzr1a9"; + type = "gem"; + }; + version = "4.11.0"; + }; + language_server-protocol = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; + type = "gem"; + }; + version = "3.17.0.3"; + }; + launchy = { + dependencies = [ "addressable" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a"; + type = "gem"; + }; + version = "2.5.2"; + }; + lefthook = { + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09m8m65iyk8d1y0g52srl7994c80f8ai33z8flbzhsjqr2wy17rh"; + type = "gem"; + }; + version = "1.11.5"; + }; + letter_opener = { + dependencies = [ "launchy" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cnv3ggnzyagl50vzs1693aacv08bhwlprcvjp8jcg2w7cp3zwrg"; + type = "gem"; + }; + version = "1.10.0"; + }; + letter_opener_web = { + dependencies = [ + "actionmailer" + "letter_opener" + "railties" + "rexml" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0q4qfi5wnn5bv93zjf10agmzap3sn7gkfmdbryz296wb1vz1wf9z"; + type = "gem"; + }; + version = "3.0.0"; + }; + libyajl2 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vx0mv0bbcy0qh3ik08b42vrq4kw1zg51121r18c0vvp4p3zcpda"; + type = "gem"; + }; + version = "2.1.0"; + }; + license_finder = { + dependencies = [ + "csv" + "rubyzip" + "thor" + "tomlrb" + "with_env" + "xml-simple" + ]; + groups = [ + "development" + "omnibus" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "057ghx449d70bakmn3fjr4x6f4rq4cj61l9gnww0c5sbnqcsv7hp"; + type = "gem"; + }; + version = "7.2.1"; + }; + licensee = { + dependencies = [ + "dotenv" + "octokit" + "reverse_markdown" + "rugged" + "thor" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xyzk7gzi91l6xlwfvf2z0963jwd2csf987yk0ffbr5p9ycdp0ry"; + type = "gem"; + }; + version = "9.18.0"; + }; + listen = { + dependencies = [ + "rb-fsevent" + "rb-inotify" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; + type = "gem"; + }; + version = "3.7.1"; + }; + llhttp-ffi = { + dependencies = [ + "ffi-compiler" + "rake" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5"; + type = "gem"; + }; + version = "0.4.0"; + }; + locale = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "107pm4ccmla23z963kyjldgngfigvchnv85wr6m69viyxxrrjbsj"; + type = "gem"; + }; + version = "2.1.4"; + }; + lockbox = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1sm365iplg1iscizckjm6zy57zs0350czi9afqfnvig0wh35i3na"; + type = "gem"; + }; + version = "1.3.0"; + }; + logger = { + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; + type = "gem"; + }; + version = "1.6.6"; + }; + lograge = { + dependencies = [ + "actionpack" + "activesupport" + "railties" + "request_store" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vrjm4yqn5l6q5gsl72fmk95fl6j9z1a05gzbrwmsm3gp1a1bgac"; + type = "gem"; + }; + version = "0.11.2"; + }; + loofah = { + dependencies = [ + "crass" + "nokogiri" + ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1"; + type = "gem"; + }; + version = "2.24.0"; + }; + lookbook = { + dependencies = [ + "activemodel" + "css_parser" + "htmlbeautifier" + "htmlentities" + "marcel" + "railties" + "redcarpet" + "rouge" + "view_component" + "yard" + "zeitwerk" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01bni0dlqc9blb1akqsna39l2wb9a9dgv75mqhihrb0lnng4qj0n"; + type = "gem"; + }; + version = "2.3.4"; + }; + lru_redux = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yxghzg7476sivz8yyr9nkak2dlbls0b89vc2kg52k0nmg6d0wgf"; + type = "gem"; + }; + version = "1.1.0"; + }; + lumberjack = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07rvqrizmqzbjzhdsh4l4fyif26a7czb506dvch18kr3nkkamim5"; + type = "gem"; + }; + version = "1.2.7"; + }; + mail = { + dependencies = [ + "mini_mime" + "net-imap" + "net-pop" + "net-smtp" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; + type = "gem"; + }; + version = "2.8.1"; + }; + mail-smtp_pool = { + dependencies = [ + "connection_pool" + "mail" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/mail-smtp_pool"; + type = "path"; + }; + version = "0.1.0"; + }; + marcel = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0"; + type = "gem"; + }; + version = "1.0.2"; + }; + marginalia = { + dependencies = [ + "actionpack" + "activerecord" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kw9l9gw9dqmbpjxs3ndifia2204n8n92pjr4xp78hiynqm22qyb"; + type = "gem"; + }; + version = "1.11.1"; + }; + matrix = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; + type = "gem"; + }; + version = "0.4.2"; + }; + memory_profiler = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q"; + type = "gem"; + }; + version = "1.0.1"; + }; + method_source = { + groups = [ + "default" + "development" + "metrics" + "test" + ]; + platforms = [ + { + engine = "maglev"; + } + { + engine = "ruby"; + } + ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; + type = "gem"; + }; + version = "1.0.0"; + }; + metrics = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1762zjanzjzr7jwig2arpj4h09ylhspipp9blx4pb9cjvgm8xv22"; + type = "gem"; + }; + version = "0.12.1"; + }; + microsoft_graph_mailer = { + dependencies = [ + "mail" + "oauth2" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/microsoft_graph_mailer"; + type = "path"; + }; + version = "0.1.0"; + }; + mime-types = { + dependencies = [ "mime-types-data" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; + type = "gem"; + }; + version = "3.5.1"; + }; + mime-types-data = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yjv0apysnrhbc70ralinfpcqn9382lxr643swp7a5sdwpa9cyqg"; + type = "gem"; + }; + version = "3.2023.1003"; + }; + mini_histogram = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "156xs8k7fqqcbk1fbf0ndz6gfw380fb2jrycfvhb06269r84n4ba"; + type = "gem"; + }; + version = "0.3.1"; + }; + mini_magick = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; + type = "gem"; + }; + version = "4.12.0"; + }; + mini_mime = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + type = "gem"; + }; + version = "1.1.2"; + }; + mini_portile2 = { + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; + type = "gem"; + }; + version = "2.8.8"; + }; + minitest = { + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + type = "gem"; + }; + version = "5.11.3"; + }; + mixlib-cli = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6"; + type = "gem"; + }; + version = "2.1.8"; + }; + mixlib-config = { + dependencies = [ "tomlrb" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0j0122lv2qgccl61njqi0pj6sp6nb85y07gcmw16bwg4k0c8nx6p"; + type = "gem"; + }; + version = "3.0.27"; + }; + mixlib-log = { + dependencies = [ "ffi" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0s57cq8qx3823pcfzizshp8vagvp3f87r0lksknj18r26nl3y79a"; + type = "gem"; + }; + version = "3.2.3"; + }; + mixlib-shellout = { + dependencies = [ "chef-utils" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zkwg76y96nkh1mv0k92ybq46cr06v1wmic16129ls3yqzwx3xj6"; + type = "gem"; + }; + version = "3.2.7"; + }; + mize = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "105pjjmncf7q724swbygrbsgmh74ni4s2xaclbyjcm7zg64maca0"; + type = "gem"; + }; + version = "0.6.1"; + }; + msgpack = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; + type = "gem"; + }; + version = "1.5.4"; + }; + multi_json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + type = "gem"; + }; + version = "1.14.1"; + }; + multi_xml = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + type = "gem"; + }; + version = "0.6.0"; + }; + multipart-post = { + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; + type = "gem"; + }; + version = "2.2.3"; + }; + murmurhash3 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dh9xnjs98a2by2rd8jlcmx94miryssk1ral2pji21xbx7i2q2ip"; + type = "gem"; + }; + version = "0.1.7"; + }; + mustermann = { + dependencies = [ "ruby2_keywords" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd"; + type = "gem"; + }; + version = "3.0.0"; + }; + mustermann-grape = { + dependencies = [ "mustermann" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zpmc099rcpxmlfxb71zd6l7f9fcsg1fhi6627r03y1qlgb0jlvg"; + type = "gem"; + }; + version = "1.0.2"; + }; + mutex_m = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg"; + type = "gem"; + }; + version = "0.3.0"; + }; + nap = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll"; + type = "gem"; + }; + version = "1.1.0"; + }; + nenv = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0r97jzknll9bhd8yyg2bngnnkj8rjhal667n7d32h8h7ny7nvpnr"; + type = "gem"; + }; + version = "0.3.0"; + }; + net-http = { + dependencies = [ "uri" ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; + type = "gem"; + }; + version = "0.6.0"; + }; + net-http-persistent = { + dependencies = [ "connection_pool" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "13psmr8009wwknainvns5jidhvjsknffb6k7mzz0yrby6h5qhhkf"; + type = "gem"; + }; + version = "4.0.5"; + }; + net-imap = { + dependencies = [ + "date" + "net-protocol" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rgva7p9gvns2ndnqpw503mbd36i2skkggv0c0h192k8xr481phy"; + type = "gem"; + }; + version = "0.5.6"; + }; + net-ldap = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; + type = "gem"; + }; + version = "0.17.1"; + }; + net-ntp = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0z96m7nnb9f634cz4i6p0x89z7g9i9h97cnk5f3x3q5x090kzisv"; + type = "gem"; + }; + version = "2.1.3"; + }; + net-pop = { + dependencies = [ "net-protocol" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = [ "timeout" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd"; + type = "gem"; + }; + version = "0.1.3"; + }; + net-scp = { + dependencies = [ "net-ssh" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; + type = "gem"; + }; + version = "4.0.0"; + }; + net-smtp = { + dependencies = [ "net-protocol" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; + net-ssh = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p"; + type = "gem"; + }; + version = "7.3.0"; + }; + netrc = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + nio4r = { + groups = [ + "default" + "puma" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm"; + type = "gem"; + }; + version = "2.7.0"; + }; + nkf = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv"; + type = "gem"; + }; + version = "0.2.0"; + }; + no_proxy_fix = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "006dmdb640v1kq0sll3dnlwj1b0kpf3i1p27ygyffv8lpcqlr6sf"; + type = "gem"; + }; + version = "0.1.2"; + }; + nokogiri = { + dependencies = [ + "mini_portile2" + "racc" + ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c"; + type = "gem"; + }; + version = "1.18.8"; + }; + notiffany = { + dependencies = [ + "nenv" + "shellany" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f47h3bmg1apr4x51szqfv3rh2vq58z3grh4w02cp3bzbdh6jxnk"; + type = "gem"; + }; + version = "0.1.3"; + }; + numerizer = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ysxf30qcybh131r98frp38sqqkdhcjwpnajgrxl2w2kxvapd075"; + type = "gem"; + }; + version = "0.2.0"; + }; + oauth = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0"; + type = "gem"; + }; + version = "0.5.6"; + }; + oauth2 = { + dependencies = [ + "faraday" + "jwt" + "multi_xml" + "rack" + "snaky_hash" + "version_gem" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yzpaghh8kwzgmvmrlbzf36ks5s2hf34rayzw081dp2jrzprs7xj"; + type = "gem"; + }; + version = "2.0.9"; + }; + observer = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1b2h1642jy1xrgyakyzz6bkq43gwp8yvxrs8sww12rms65qi18yq"; + type = "gem"; + }; + version = "0.1.2"; + }; + octokit = { + dependencies = [ + "faraday" + "sawyer" + ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05j3gz79gxkid3lc2balyllqik4v4swnm0rcvxz14m76bkrpz92g"; + type = "gem"; + }; + version = "9.2.0"; + }; + ohai = { + dependencies = [ + "chef-config" + "chef-utils" + "ffi" + "ffi-yajl" + "ipaddress" + "mixlib-cli" + "mixlib-config" + "mixlib-log" + "mixlib-shellout" + "plist" + "train-core" + "wmi-lite" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1w0zrk1n6n7jl493k4vv5xaiszbmxsmaffy9xvykbfawjjb83vj2"; + type = "gem"; + }; + version = "18.1.18"; + }; + oj = { + dependencies = [ + "bigdecimal" + "ostruct" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0z1xw7xm7xkxnslhxqvfzvv5f1q1cl40niwvaxny2cg3fkcvw9kz"; + type = "gem"; + }; + version = "3.16.10"; + }; + oj-introspect = { + dependencies = [ "oj" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0r4jgnw44qvswidfd8fh4s7pkdg34bmmrxn2wn0lhab0klq1bfsw"; + type = "gem"; + }; + version = "0.8.0"; + }; + omniauth = { + dependencies = [ + "hashie" + "rack" + "rack-protection" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y"; + type = "gem"; + }; + version = "2.1.2"; + }; + omniauth-alicloud = { + dependencies = [ "omniauth-oauth2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gh1d69w6p62hj18bh2p5fdykg9za1yifpq18swp9ms0pcx4yp4w"; + type = "gem"; + }; + version = "3.0.0"; + }; + omniauth-atlassian-oauth2 = { + dependencies = [ + "omniauth" + "omniauth-oauth2" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jbnbp0pnasyrf0mgyig72hx8bdwhv78na6ffqrs1f4a3155f1zb"; + type = "gem"; + }; + version = "0.2.0"; + }; + omniauth-auth0 = { + dependencies = [ + "omniauth" + "omniauth-oauth2" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cn2qsc8gs7ib7y94b87iwar7zyc54nhh9ygfyq4sf9pgcvq77ix"; + type = "gem"; + }; + version = "3.1.1"; + }; + omniauth-azure-activedirectory-v2 = { + dependencies = [ "omniauth-oauth2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wnhibz903ssnq9scl65a47d41zcczb3wjvc44y3w8ydabfwx164"; + type = "gem"; + }; + version = "2.0.0"; + }; + omniauth-github = { + dependencies = [ + "omniauth" + "omniauth-oauth2" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1m6a7kg3lxz2nm96prln2ja8r4wlm37m5vsy9199vnynqq5fgy4g"; + type = "gem"; + }; + version = "2.0.1"; + }; + omniauth-gitlab = { + dependencies = [ + "omniauth" + "omniauth-oauth2" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/omniauth-gitlab"; + type = "path"; + }; + version = "4.0.0"; + }; + omniauth-google-oauth2 = { + dependencies = [ + "jwt" + "oauth2" + "omniauth" + "omniauth-oauth2" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fahkghfa2iczmwss9bz5l4rh7siwzjnjp3akh7pdbsfx0kg35j4"; + type = "gem"; + }; + version = "1.1.1"; + }; + omniauth-oauth2 = { + dependencies = [ + "oauth2" + "omniauth" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0y4y122xm8zgrxn5nnzwg6w39dnjss8pcq2ppbpx9qn7kiayky5j"; + type = "gem"; + }; + version = "1.8.0"; + }; + omniauth-oauth2-generic = { + dependencies = [ + "omniauth-oauth2" + "rake" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04vnmszmm1jmwvg6cwdy9jxliwa8yawp4w4690pvyplx04wqavnf"; + type = "gem"; + }; + version = "0.2.8"; + }; + omniauth-salesforce = { + dependencies = [ + "omniauth" + "omniauth-oauth2" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/omniauth-salesforce"; + type = "path"; + }; + version = "1.0.5"; + }; + omniauth-saml = { + dependencies = [ + "omniauth" + "ruby-saml" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1c2i8yry06qpqg4k8xps5aj0hfw7l7m5vdqf85sbpr04ngfdpq6l"; + type = "gem"; + }; + version = "2.2.3"; + }; + omniauth-shibboleth-redux = { + dependencies = [ "omniauth" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qgzp0xaka6vqpx69mw6nbqaqmyqrawi11cyak4gq19l23ym7cz9"; + type = "gem"; + }; + version = "2.0.0"; + }; + omniauth_crowd = { + dependencies = [ + "activesupport" + "nokogiri" + "omniauth" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = "${src}/vendor/gems/omniauth_crowd"; + type = "path"; + }; + version = "2.4.0"; + }; + omniauth_openid_connect = { + dependencies = [ + "omniauth" + "openid_connect" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "099xg7s6450wlfzs77mbdx78g3dp0glx5q6f44i78akf7283hbqz"; + type = "gem"; + }; + version = "0.8.0"; + }; + open4 = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1"; + type = "gem"; + }; + version = "1.3.4"; + }; + openid_connect = { + dependencies = [ + "activemodel" + "attr_required" + "email_validator" + "faraday" + "faraday-follow_redirects" + "json-jwt" + "mail" + "rack-oauth2" + "swd" + "tzinfo" + "validate_url" + "webfinger" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "10i13cn40jiiw8lslkv7bj1isinnwbmzlk6msgiph3gqry08702x"; + type = "gem"; + }; + version = "2.3.1"; + }; + opensearch-ruby = { + dependencies = [ + "faraday" + "multi_json" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pd0ihmsjp0m0ckrv3jnwhzmls3kz2pcn21yqas5jg7dddl231ha"; + type = "gem"; + }; + version = "3.4.0"; + }; + openssl = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "054d6ybgjdzxw567m7rbnd46yp6gkdbc5ihr536vxd3p15vbhjrw"; + type = "gem"; + }; + version = "3.2.0"; + }; + openssl-signature_algorithm = { + dependencies = [ "openssl" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53"; + type = "gem"; + }; + version = "1.3.0"; + }; + opentelemetry-api = { + groups = [ + "default" + "opentelemetry" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1j9c2a4wgw0jaw63qscfasw3lf3kr45q83p4mmlf0bndcq2rlgdb"; + type = "gem"; + }; + version = "1.2.5"; + }; + opentelemetry-common = { + dependencies = [ "opentelemetry-api" ]; + groups = [ + "default" + "opentelemetry" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "160ws06d8mzx3hwjss2i954h8r86dp3sw95k2wrbq81sb121m2gy"; + type = "gem"; + }; + version = "0.21.0"; + }; + opentelemetry-exporter-otlp = { + dependencies = [ + "google-protobuf" + "googleapis-common-protos-types" + "opentelemetry-api" + "opentelemetry-common" + "opentelemetry-sdk" + "opentelemetry-semantic_conventions" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1c0f345cpcqz3p6salmag9vhr7flirga35xivc01kvpli7scai1j"; + type = "gem"; + }; + version = "0.29.1"; + }; + opentelemetry-helpers-sql-obfuscation = { + dependencies = [ "opentelemetry-common" ]; + groups = [ + "default" + "opentelemetry" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0cnlr3gqmd2q9wcaxhvlkxkbjvvvkp4vzcwif1j7kydw7lvz2vmw"; + type = "gem"; + }; + version = "0.1.0"; + }; + opentelemetry-instrumentation-action_mailer = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-active_support" + "opentelemetry-instrumentation-base" + ]; + groups = [ + "default" + "opentelemetry" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03nbn48q5ymk4wyhvnqa1wzvi1mzy2cbc8pmpf26x217zy6dvwl8"; + type = "gem"; + }; + version = "0.2.0"; + }; + opentelemetry-instrumentation-action_pack = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + "opentelemetry-instrumentation-rack" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00mbrqmpk7p3wy377izsspshzdb849b9dv22z8f2hajcpr2im0id"; + type = "gem"; + }; + version = "0.10.0"; + }; + opentelemetry-instrumentation-action_view = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-active_support" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08ga079lc2xariw83xc4ly1kab718ripmfb9af7xh6vm9qajka3d"; + type = "gem"; + }; + version = "0.7.3"; + }; + opentelemetry-instrumentation-active_job = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hirfvkg4kf575al080zvnpbxs3y9qlmzdr1w7qwkap7mjdks6r8"; + type = "gem"; + }; + version = "0.7.8"; + }; + opentelemetry-instrumentation-active_record = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14aar8w2szn5fi7j3lg35qlq1r12ka6lvcrcn700agv5nm3han5y"; + type = "gem"; + }; + version = "0.8.1"; + }; + opentelemetry-instrumentation-active_support = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1q07nn9ipq2yd7xjj24hh00cbvlda269k1l0xfkc8d8iw8mixrsg"; + type = "gem"; + }; + version = "0.6.0"; + }; + opentelemetry-instrumentation-aws_sdk = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1d8rbbn3qnv0bb4l7mlxd9zlihf8m6k7rrajaj5zmq5p9fq79hx3"; + type = "gem"; + }; + version = "0.7.0"; + }; + opentelemetry-instrumentation-base = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-registry" + ]; + groups = [ + "default" + "opentelemetry" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pv064ksiynin8hzvljkwm5vlkgr8kk6g3qqpiwcik860i7l677n"; + type = "gem"; + }; + version = "0.22.3"; + }; + opentelemetry-instrumentation-concurrent_ruby = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1khlhzwb37mqnzr1vr49ljhi4bplmq9w8ndm0k8xbfsr8h8wivq4"; + type = "gem"; + }; + version = "0.21.4"; + }; + opentelemetry-instrumentation-ethon = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0p23m08mylzzkh6v3397a5v27wg4f8vs5jifrh3025lfg1rh9wr0"; + type = "gem"; + }; + version = "0.21.9"; + }; + opentelemetry-instrumentation-excon = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1x49m71zz8vbvv39gfbfvllnrflf2284r4f3bgbnb3l0b9din3zc"; + type = "gem"; + }; + version = "0.22.5"; + }; + opentelemetry-instrumentation-faraday = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1azbnb3f6lbmjciqdy5awyv6lhnkcyd4wqr6ayj8glj4v7b8bprn"; + type = "gem"; + }; + version = "0.24.7"; + }; + opentelemetry-instrumentation-grape = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + "opentelemetry-instrumentation-rack" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1dhpapza8qw8clfp7pri6r6sbibrx07sj7xfk3myivmp05rms8m1"; + type = "gem"; + }; + version = "0.2.0"; + }; + opentelemetry-instrumentation-graphql = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v6w0b3q0li5cq0xmc42ngqk9ahx60n5q31alka36ds4inxcrky2"; + type = "gem"; + }; + version = "0.28.4"; + }; + opentelemetry-instrumentation-http = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07jycg8iicrcadhnpg1zd2fp6di5hddq6cdpfmz499r2lzwv9wbi"; + type = "gem"; + }; + version = "0.23.5"; + }; + opentelemetry-instrumentation-http_client = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ss5izgcj2874df0yl4akcjvgsg2wyflvbq43aic2zw93dw4a7s1"; + type = "gem"; + }; + version = "0.22.8"; + }; + opentelemetry-instrumentation-net_http = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bh462bpf9m1vg512y9dmjaj7hrlyy04qpwhrzjzmf14d25xcfq2"; + type = "gem"; + }; + version = "0.22.8"; + }; + opentelemetry-instrumentation-pg = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-helpers-sql-obfuscation" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ll2ka487ybsisk7c46lrag18nsfp9gbzrzmiyjjslnpiirc3gwc"; + type = "gem"; + }; + version = "0.29.1"; + }; + opentelemetry-instrumentation-rack = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0g94rqqgw1jhqfng2692559wrldl6xji45lhbr4id3l1dd7qp72k"; + type = "gem"; + }; + version = "0.25.0"; + }; + opentelemetry-instrumentation-rails = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-action_mailer" + "opentelemetry-instrumentation-action_pack" + "opentelemetry-instrumentation-action_view" + "opentelemetry-instrumentation-active_job" + "opentelemetry-instrumentation-active_record" + "opentelemetry-instrumentation-active_support" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15kd44ilp029vadv0yyjnajwv7mn2f29647xxd0svqyd1bf9j1ji"; + type = "gem"; + }; + version = "0.33.1"; + }; + opentelemetry-instrumentation-rake = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0840gnlr90nbl430yc72czn26bngdp94v4adz7q9ph3pmdm8mppv"; + type = "gem"; + }; + version = "0.2.2"; + }; + opentelemetry-instrumentation-redis = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qrgnk2x64sks9gqb7fycfa6sass6ddqzh5dms4hdbz1bzag581f"; + type = "gem"; + }; + version = "0.25.7"; + }; + opentelemetry-instrumentation-sidekiq = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-instrumentation-base" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0cfzw1avv52idxvq02y95g3byxsswccck78zch5hmnnzvp5f59nn"; + type = "gem"; + }; + version = "0.25.7"; + }; + opentelemetry-registry = { + dependencies = [ "opentelemetry-api" ]; + groups = [ + "default" + "opentelemetry" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08k8zqrg47v1jxcvxz9wxyqm03kjdw98qa8q0y840qvh988vcshi"; + type = "gem"; + }; + version = "0.3.0"; + }; + opentelemetry-sdk = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-common" + "opentelemetry-registry" + "opentelemetry-semantic_conventions" + ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14n49y6yq48jnbfms2razv7vm1lkdxwh5cd63cm9x8as9ksn1ndj"; + type = "gem"; + }; + version = "1.6.0"; + }; + opentelemetry-semantic_conventions = { + dependencies = [ "opentelemetry-api" ]; + groups = [ + "default" + "opentelemetry" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xhv5fwwgjj2k8ksprpg1nm5v8k3w6gyw4wiq2k08q3kf484rlhk"; + type = "gem"; + }; + version = "1.10.0"; + }; + opentracing = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy"; + type = "gem"; + }; + version = "0.5.0"; + }; + optimist = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; + type = "gem"; + }; + version = "3.0.1"; + }; + org-ruby = { + dependencies = [ "rubypants" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk"; + type = "gem"; + }; + version = "0.9.12"; + }; + orm_adapter = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda"; + type = "gem"; + }; + version = "0.5.0"; + }; + os = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap"; + type = "gem"; + }; + version = "1.1.4"; + }; + ostruct = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; + }; + pact = { + dependencies = [ + "pact-mock_service" + "pact-support" + "rack-test" + "rspec" + "term-ansicolor" + "thor" + "webrick" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1a3fbwzzzdsbzipv63mcq1q761mqc6w8k1vxkbrbf3aqi2489p8b"; + type = "gem"; + }; + version = "1.64.0"; + }; + pact-mock_service = { + dependencies = [ + "find_a_port" + "json" + "pact-support" + "rack" + "rspec" + "thor" + "webrick" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lds3xpkrx91lm74pa3n5167c8mkmqyki9axj7bjj0m18r2ybna2"; + type = "gem"; + }; + version = "3.11.2"; + }; + pact-support = { + dependencies = [ + "awesome_print" + "diff-lcs" + "expgen" + "rainbow" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0waq8ywxhljm5sjk7m3q7f6s2pvcfshg3ncs9dl7kcsg2ail7hs1"; + type = "gem"; + }; + version = "1.20.0"; + }; + paper_trail = { + dependencies = [ + "activerecord" + "request_store" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1781qpj1mip1llq3jfbf0q7gk4mshar33afg6610qncb3gxz1fg9"; + type = "gem"; + }; + version = "16.0.0"; + }; + parallel = { + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; + type = "gem"; + }; + version = "1.26.3"; + }; + parser = { + dependencies = [ + "ast" + "racc" + ]; + groups = [ + "coverage" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0i9w8msil4snx5w11ix9b0wf52vjc3r49khy3ddgl1xk890kcxi4"; + type = "gem"; + }; + version = "3.3.8.0"; + }; + parslet = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88"; + type = "gem"; + }; + version = "1.8.2"; + }; + pastel = { + dependencies = [ "tty-color" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; + type = "gem"; + }; + version = "0.8.0"; + }; + pdf-core = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14ffyc016pznyir87dcm2gyavwcppdyf87hyjhzixh3340g10p8a"; + type = "gem"; + }; + version = "0.10.0"; + }; + peek = { + dependencies = [ "railties" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1k1yggixrcj72jlc98hi3jjd04x71dpynn8dxpcdhinyijniwl6n"; + type = "gem"; + }; + version = "1.1.0"; + }; + pg = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn"; + type = "gem"; + }; + version = "1.5.9"; + }; + pg_query = { + dependencies = [ "google-protobuf" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07j86a2mf90dhjlm6ns7p59ij91axg860k63hxc2rw89w8lm404b"; + type = "gem"; + }; + version = "6.1.0"; + }; + plist = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wzhnbzraz60paxhm48c50fp9xi7cqka4gfhxmiq43mhgh5ajg3h"; + type = "gem"; + }; + version = "3.7.0"; + }; + png_quantizator = { + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0sqhydp5g9ly1kgfiya1fc6srmhf6avrb74j09z3lp0jck8d88v0"; + type = "gem"; + }; + version = "0.2.1"; + }; + pp = { + dependencies = [ "prettyprint" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zxnfxjni0r9l2x42fyq0sqpnaf5nakjbap8irgik4kg1h9c6zll"; + type = "gem"; + }; + version = "0.6.2"; + }; + prawn = { + dependencies = [ + "matrix" + "pdf-core" + "ttfunk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1diwqjchmymhj4ihp4xaad2mjc8q8bmibbbxwfd5pgrh9wxhxqpl"; + type = "gem"; + }; + version = "2.5.0"; + }; + prawn-svg = { + dependencies = [ + "css_parser" + "matrix" + "prawn" + "rexml" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0c18drdsms06h5c5hmhdi7sbck72f2sp3sbgwyr7frq65h1xs6r7"; + type = "gem"; + }; + version = "0.37.0"; + }; + premailer = { + dependencies = [ + "addressable" + "css_parser" + "htmlentities" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yvy5lxq287izy7qsz23hry63rc57wkaaalqvxnwjncm56xgdmzh"; + type = "gem"; + }; + version = "1.23.0"; + }; + premailer-rails = { + dependencies = [ + "actionmailer" + "net-smtp" + "premailer" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0004f73kgrglida336fqkgx906m6n05nnfc17mypzg5rc78iaf61"; + type = "gem"; + }; + version = "1.12.0"; + }; + prettyprint = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14zicq3plqi217w6xahv7b8f7aj5kpxv1j1w98344ix9h5ay3j9b"; + type = "gem"; + }; + version = "0.2.0"; + }; + prime = { + dependencies = [ + "forwardable" + "singleton" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qsk9q2n4yb80f5mwslxzfzm2ckar25grghk95cj7sbc1p2k3w5s"; + type = "gem"; + }; + version = "0.1.3"; + }; + prism = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bvdq2jsn1jj8vgp9xrmi6ljw0hqlv4i97v5aa0fcii34g9rrzr4"; + type = "gem"; + }; + version = "1.2.0"; + }; + proc_to_ast = { + dependencies = [ + "coderay" + "parser" + "unparser" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj"; + type = "gem"; + }; + version = "0.1.0"; + }; + prometheus-client-mmap = { + dependencies = [ + "base64" + "bigdecimal" + "logger" + "rb_sys" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0120712ar9cmjgyqrihf36pcslx8m73gp0l86dfw8yvn8gs9xzr0"; + type = "gem"; + }; + version = "1.2.9"; + }; + pry = { + dependencies = [ + "coderay" + "method_source" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; + type = "gem"; + }; + version = "0.14.2"; + }; + pry-byebug = { + dependencies = [ + "byebug" + "pry" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wpa3jd46h44rjz3hjwl5c0zfx3jav4a64nm8h0g1iwv61yvn2hb"; + type = "gem"; + }; + version = "3.11.0"; + }; + pry-rails = { + dependencies = [ "pry" ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0garafb0lxbm3sx2r9pqgs7ky9al58cl3wmwc0gmvmrl9bi2i7m6"; + type = "gem"; + }; + version = "0.3.11"; + }; + pry-shell = { + dependencies = [ + "pry" + "tty-markdown" + "tty-prompt" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "027jd53zjbimqb3n1329q4njs94bagmfnrfylxqv04lrsa14h0md"; + type = "gem"; + }; + version = "0.6.4"; + }; + psych = { + dependencies = [ + "date" + "stringio" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4"; + type = "gem"; + }; + version = "5.2.3"; + }; + public_suffix = { + groups = [ + "danger" + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; + type = "gem"; + }; + version = "6.0.1"; + }; + puma = { + dependencies = [ "nio4r" ]; + groups = [ "puma" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wl9q4fl8gvhwdpfxghx6jdqi4508287pcgiwi96sdbzmdfbglcl"; + type = "gem"; + }; + version = "6.5.0"; + }; + pyu-ruby-sasl = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn"; + type = "gem"; + }; + version = "0.0.3.3"; + }; + raabro = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "10m8bln9d00dwzjil1k42i5r7l82x25ysbi45fwyv4932zsrzynl"; + type = "gem"; + }; + version = "1.4.0"; + }; + racc = { + groups = [ + "coverage" + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; + type = "gem"; + }; + version = "1.8.1"; + }; + rack = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc"; + type = "gem"; + }; + version = "2.2.13"; + }; + rack-accept = { + dependencies = [ "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936"; + type = "gem"; + }; + version = "0.4.5"; + }; + rack-attack = { + dependencies = [ "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0z6pj5vjgl6swq7a33gssf795k958mss8gpmdb4v4cydcs7px91w"; + type = "gem"; + }; + version = "6.7.0"; + }; + rack-cors = { + dependencies = [ "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06ysmn14pdf2wyr7agm0qvvr9pzcgyf39w4yvk2n05w9k4alwpa1"; + type = "gem"; + }; + version = "2.0.2"; + }; + rack-oauth2 = { + dependencies = [ + "activesupport" + "attr_required" + "faraday" + "faraday-follow_redirects" + "json-jwt" + "rack" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19fi42hi9l474ki89y6cs8vrpfmc1h8zpd02iwjy4hw0a1yahfn7"; + type = "gem"; + }; + version = "2.2.1"; + }; + rack-protection = { + dependencies = [ "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "169jzzgvbjrqmz4q55wp9pg4ji2h90mggcdxy152gv5vp96l2hgx"; + type = "gem"; + }; + version = "2.2.2"; + }; + rack-proxy = { + dependencies = [ "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "12jw7401j543fj8cc83lmw72d8k6bxvkp9rvbifi88hh01blnsj4"; + type = "gem"; + }; + version = "0.7.7"; + }; + rack-session = { + dependencies = [ "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0"; + type = "gem"; + }; + version = "1.0.2"; + }; + rack-test = { + dependencies = [ "rack" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; + type = "gem"; + }; + version = "2.1.0"; + }; + rack-timeout = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nc7kis61n4q7g78gxxsxygam022glmgwq9snydrkjiwg7lkfwvm"; + type = "gem"; + }; + version = "0.7.0"; + }; + rackup = { + dependencies = [ + "rack" + "webrick" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jf2ncj2nx56vh96hh2nh6h4r530nccxh87z7c2f37wq515611ms"; + type = "gem"; + }; + version = "1.0.1"; + }; + rails = { + dependencies = [ + "actioncable" + "actionmailbox" + "actionmailer" + "actionpack" + "actiontext" + "actionview" + "activejob" + "activemodel" + "activerecord" + "activestorage" + "activesupport" + "railties" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0148c00v3hks98rymdiilhjm0i8qw5fla4gww0fb94k3ggns5bh5"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + rails-controller-testing = { + dependencies = [ + "actionpack" + "actionview" + "activesupport" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "151f303jcvs8s149mhx2g5mn67487x0blrf9dzl76q1nb7dlh53l"; + type = "gem"; + }; + version = "1.0.5"; + }; + rails-dom-testing = { + dependencies = [ + "activesupport" + "minitest" + "nokogiri" + ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5"; + type = "gem"; + }; + version = "2.2.0"; + }; + rails-html-sanitizer = { + dependencies = [ + "loofah" + "nokogiri" + ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1w6bqm8d3afc66ff6npnsc2d8ky552n6qzwwwc1bh0wz6c8gplp3"; + type = "gem"; + }; + version = "1.6.1"; + }; + rails-i18n = { + dependencies = [ + "i18n" + "railties" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jiiv5ni1jrk15g572wc0l1ansbx6aqqsp2mk0pg9h18mkh1dbpg"; + type = "gem"; + }; + version = "7.0.10"; + }; + railties = { + dependencies = [ + "actionpack" + "activesupport" + "irb" + "rackup" + "rake" + "thor" + "zeitwerk" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yz28fq55drl4c2dwgap96xcjf6qns2ghc3c3gffzm6yw9i5bq8b"; + type = "gem"; + }; + version = "7.1.5.1"; + }; + rainbow = { + groups = [ + "coverage" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; + type = "gem"; + }; + version = "3.1.1"; + }; + rake = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + rake-compiler-dock = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lsdrlj1f5xcgg2phycfv1hvlsggiq6wqfff513i375skai20dz7"; + type = "gem"; + }; + version = "1.9.1"; + }; + rb-fsevent = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; + type = "gem"; + }; + version = "0.11.2"; + }; + rb-inotify = { + dependencies = [ "ffi" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + type = "gem"; + }; + version = "0.10.1"; + }; + rb_sys = { + dependencies = [ "rake-compiler-dock" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0za20fy8x9yc13jzz3kzcdc58qswzdvxmbwxnjab7xmm94gzv4w9"; + type = "gem"; + }; + version = "0.9.110"; + }; + rbs = { + dependencies = [ "logger" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h1jal1sv47saxyk33nnjk2ywrsf35aar18p7mc48s2m33876wpd"; + type = "gem"; + }; + version = "3.6.1"; + }; + rbtrace = { + dependencies = [ + "ffi" + "msgpack" + "optimist" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1p65p6f917al0f07sn5ca9yj92f7mk52xgnp0ahqpyrb8r6sdjz8"; + type = "gem"; + }; + version = "0.5.1"; + }; + rchardet = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; + type = "gem"; + }; + version = "1.8.0"; + }; + rdoc = { + dependencies = [ "psych" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0a83bsmd444pbhga3icwh8c7gm917m1fabq38dy1pn9ywjd17hij"; + type = "gem"; + }; + version = "6.13.0"; + }; + re2 = { + dependencies = [ "mini_portile2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1n2v1lm3a4alh23r1x12blv9qqckas7cncpn4hk3ar3sdym25604"; + type = "gem"; + }; + version = "2.15.0"; + }; + recaptcha = { + dependencies = [ "json" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vmpppgdy64qa16bvkss0xyzmyyzxv5hwzvc1i6saw4yvm58kl9p"; + type = "gem"; + }; + version = "5.12.3"; + }; + recursive-open-struct = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nnyr6qsqrcszf6c10n4zfjs8h9n67zvsmx6mp8brkigamr8llx3"; + type = "gem"; + }; + version = "1.1.3"; + }; + redcarpet = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; + type = "gem"; + }; + version = "3.6.0"; + }; + RedCloth = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15r2h7rfp4bi9i0bfmvgnmvmw0kl3byyac53rcakk4qsv7yv4caj"; + type = "gem"; + }; + version = "4.3.4"; + }; + redis = { + dependencies = [ "redis-client" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br"; + type = "gem"; + }; + version = "5.4.0"; + }; + redis-actionpack = { + dependencies = [ + "actionpack" + "redis-rack" + "redis-store" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "049kd6480j16d3xmnsayqmmrircffympzf8pbjrn5v0lijvp01fw"; + type = "gem"; + }; + version = "5.5.0"; + }; + redis-client = { + dependencies = [ "connection_pool" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h5cgdv40zk0ph1nl64ayhn6anzwy6mbxyi7fci9n404ryvy9zii"; + type = "gem"; + }; + version = "0.22.2"; + }; + redis-cluster-client = { + dependencies = [ "redis-client" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1az0l2q11214gxbi8fcn7xfxj0m31d3wlxcqd0h8qjxqvsjcmrk3"; + type = "gem"; + }; + version = "0.11.0"; + }; + redis-clustering = { + dependencies = [ + "redis" + "redis-cluster-client" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fsnfi15xiy8sal6av11fqfjmdmjpy93amf790i0zwqcf1iq1qbw"; + type = "gem"; + }; + version = "5.4.0"; + }; + redis-namespace = { + dependencies = [ "redis" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f92i9cwlp6xj6fyn7qn4qsaqvxfw4wqvayll7gbd26qnai1l6p9"; + type = "gem"; + }; + version = "1.11.0"; + }; + redis-rack = { + dependencies = [ + "rack-session" + "redis-store" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "10438w0y1jbgr205zndvmz6md0mrqazh2j9fr88lvb8hms10pddb"; + type = "gem"; + }; + version = "3.0.0"; + }; + redis-store = { + dependencies = [ "redis" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "197d1088jw3wl3lfcdj4w4c4da13wsqyd12mj3czvlfw77ig7i7d"; + type = "gem"; + }; + version = "1.11.0"; + }; + regexp_parser = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb"; + type = "gem"; + }; + version = "2.10.0"; + }; + regexp_property_values = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03q8dn4fg51mfk5d4sfcr0f9hqbs42ghafi76k9nc7ms1gf9j90n"; + type = "gem"; + }; + version = "1.0.0"; + }; + reline = { + dependencies = [ "io-console" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp"; + type = "gem"; + }; + version = "0.6.0"; + }; + representable = { + dependencies = [ + "declarative" + "trailblazer-option" + "uber" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kms3r6w6pnryysnaqqa9fsn0v73zx1ilds9d1c565n3xdzbyafc"; + type = "gem"; + }; + version = "3.2.0"; + }; + request_store = { + dependencies = [ "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jw89j9s5p5cq2k7ffj5p4av4j4fxwvwjs1a4i9g85d38r9mvdz1"; + type = "gem"; + }; + version = "1.7.0"; + }; + responders = { + dependencies = [ + "actionpack" + "railties" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14kjykc6rpdh24sshg9savqdajya2dislc1jmbzg91w9967f4gv1"; + type = "gem"; + }; + version = "3.0.1"; + }; + rest-client = { + dependencies = [ + "http-accept" + "http-cookie" + "mime-types" + "netrc" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im"; + type = "gem"; + }; + version = "2.1.0"; + }; + retriable = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; + type = "gem"; + }; + version = "3.1.2"; + }; + reverse_markdown = { + dependencies = [ "nokogiri" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "195c7yra7amggqj7rir0yr09r4v29c2hgkbkb21mj0jsfs3868mb"; + type = "gem"; + }; + version = "3.0.0"; + }; + rexml = { + groups = [ + "coverage" + "danger" + "default" + "development" + "omnibus" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; + type = "gem"; + }; + version = "3.4.1"; + }; + rinku = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11cakxzp7qi04d41hbqkh92n52mm4z2ba8sqyhxbmfi4kypmls9y"; + type = "gem"; + }; + version = "2.0.0"; + }; + rotp = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0m48hv6wpmmm6cjr6q92q78h1i610riml19k5h1dil2yws3h1m3m"; + type = "gem"; + }; + version = "6.3.0"; + }; + rouge = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1pchwrkr0994v7mh054lcp0na3bk3mj2sk0dc33bn6bhxrnirj1a"; + type = "gem"; + }; + version = "4.5.1"; + }; + rqrcode = { + dependencies = [ + "chunky_png" + "rqrcode_core" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; + type = "gem"; + }; + version = "2.2.0"; + }; + rqrcode_core = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg"; + type = "gem"; + }; + version = "1.2.0"; + }; + rspec = { + dependencies = [ + "rspec-core" + "rspec-expectations" + "rspec-mocks" + ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; + type = "gem"; + }; + version = "3.13.0"; + }; + rspec-benchmark = { + dependencies = [ + "benchmark-malloc" + "benchmark-perf" + "benchmark-trend" + "rspec" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kyn7p409n75ikb7z9v3dbzjyyinkwi88f66alj9lnf2gssss50h"; + type = "gem"; + }; + version = "0.6.0"; + }; + rspec-core = { + dependencies = [ "rspec-support" ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0s688wfw77fjldzayvczg8bgwcgh6bh552dw7qcj1rhjk3r4zalx"; + type = "gem"; + }; + version = "3.13.1"; + }; + rspec-expectations = { + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; + type = "gem"; + }; + version = "3.13.3"; + }; + rspec-mocks = { + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; + type = "gem"; + }; + version = "3.13.2"; + }; + rspec-parameterized = { + dependencies = [ + "rspec-parameterized-core" + "rspec-parameterized-table_syntax" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hplygik9p5d92lhb9412lzap8msrmry2qrrq5d1f90r170dwmml"; + type = "gem"; + }; + version = "1.0.2"; + }; + rspec-parameterized-core = { + dependencies = [ + "parser" + "proc_to_ast" + "rspec" + "unparser" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hfc2q7g8f5s6kdh1chwlalvz3fvj57vlfpn18b23677hm4ljyr8"; + type = "gem"; + }; + version = "1.0.0"; + }; + rspec-parameterized-table_syntax = { + dependencies = [ + "binding_of_caller" + "rspec-parameterized-core" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "134q0hki279np9dv7mgr85wspdrvhpj9lpvxr9kx6pcwzwg9bpyp"; + type = "gem"; + }; + version = "1.0.0"; + }; + rspec-rails = { + dependencies = [ + "actionpack" + "activesupport" + "railties" + "rspec-core" + "rspec-expectations" + "rspec-mocks" + "rspec-support" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ycjggcmzbgrfjk04v26b43c3fj5jq2qic911qk7585wvav2qaxd"; + type = "gem"; + }; + version = "7.0.1"; + }; + rspec-retry = { + dependencies = [ "rspec-core" ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0n6qc0d16h6bgh1xarmc8vc58728mgjcsjj8wcd822c8lcivl0b1"; + type = "gem"; + }; + version = "0.6.2"; + }; + rspec-support = { + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; + type = "gem"; + }; + version = "3.13.1"; + }; + rspec_junit_formatter = { + dependencies = [ "rspec-core" ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "059bnq1gcwl9g93cqf13zpz38zk7jxaa43anzz06qkmfwrsfdpa0"; + type = "gem"; + }; + version = "0.6.0"; + }; + rspec_profiling = { + dependencies = [ + "activerecord" + "get_process_mem" + "rails" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "143m9yiawqrjc02wack30k7m5w4d1axlsw0ds71vl55amqnvx6b1"; + type = "gem"; + }; + version = "0.0.9"; + }; + rubocop = { + dependencies = [ + "json" + "language_server-protocol" + "parallel" + "parser" + "rainbow" + "regexp_parser" + "rubocop-ast" + "ruby-progressbar" + "unicode-display_width" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ypwxjy2cp44278m9ljg3s937n2cd6x4yskcyzf1k9m3hkjd3pyk"; + type = "gem"; + }; + version = "1.71.1"; + }; + rubocop-ast = { + dependencies = [ "parser" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1bi6pgnii77763dzwhafcp8lrmnh4n1bqbdimhc9lfj4zs96gpsg"; + type = "gem"; + }; + version = "1.38.0"; + }; + rubocop-capybara = { + dependencies = [ "rubocop" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1aw0n8jwhsr39r9q2k90xjmcz8ai2k7xx2a87ld0iixnv3ylw9jx"; + type = "gem"; + }; + version = "2.21.0"; + }; + rubocop-factory_bot = { + dependencies = [ "rubocop" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1aljadsjx7affcarzbhz7pydpy6fgqb8hl951y0cmrffxpa3rqcd"; + type = "gem"; + }; + version = "2.26.1"; + }; + rubocop-graphql = { + dependencies = [ "rubocop" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14j14ld5d3w141r5lgaljcd8q1g3w4xn592cwzqxlxw5n108v21d"; + type = "gem"; + }; + version = "1.5.4"; + }; + rubocop-performance = { + dependencies = [ + "rubocop" + "rubocop-ast" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kkkv073c01px27w69g93gbjwajxji5wmawrmbb5l9s4ll101wjw"; + type = "gem"; + }; + version = "1.21.1"; + }; + rubocop-rails = { + dependencies = [ + "activesupport" + "rack" + "rubocop" + "rubocop-ast" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1bc4xpyx0gldjdmbl9aaqav5bjiqfc2zdw7k2r1zblmgsq4ilmpm"; + type = "gem"; + }; + version = "2.26.2"; + }; + rubocop-rspec = { + dependencies = [ "rubocop" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03vyjxs5rzrsn5graljffgzy1fgbyn99w5fz69y243dhn6gy5a66"; + type = "gem"; + }; + version = "3.0.5"; + }; + rubocop-rspec_rails = { + dependencies = [ + "rubocop" + "rubocop-rspec" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ijc1kw81884k0wjq1sgwaxa854n1fdddscp4fnzfzlx7zl150c8"; + type = "gem"; + }; + version = "2.30.0"; + }; + ruby-fogbugz = { + dependencies = [ + "crack" + "multipart-post" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mznsnhsgh1yg57j5gighr9vjricnix1l7ngf654k3v4fkjcs12y"; + type = "gem"; + }; + version = "0.3.0"; + }; + ruby-lsp = { + dependencies = [ + "language_server-protocol" + "prism" + "rbs" + "sorbet-runtime" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17z0hi70s201gxw251hgv4r9zmfky2jlmp3pwma7hixsfpkx6gay"; + type = "gem"; + }; + version = "0.23.15"; + }; + ruby-lsp-rails = { + dependencies = [ "ruby-lsp" ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xlcpxsz2sk57l0kwla2gj8l9cfqj7dxxf0794p67daldr3fs2k7"; + type = "gem"; + }; + version = "0.3.31"; + }; + ruby-lsp-rspec = { + dependencies = [ "ruby-lsp" ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h2rnylicx9cw2agrxzgxcr0bl2ac8iy99sz7w657hbfrpsyv0p9"; + type = "gem"; + }; + version = "0.1.22"; + }; + ruby-magic = { + dependencies = [ "mini_portile2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00b15fd74bkrxfqbx1gg2nw78fs7lvmn8mf92bway8vxgf3kh8bv"; + type = "gem"; + }; + version = "0.6.0"; + }; + ruby-progressbar = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + type = "gem"; + }; + version = "1.11.0"; + }; + ruby-saml = { + dependencies = [ + "nokogiri" + "rexml" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0vgsvdaglz1spx9gxrr6xh7qqhi4qd8jd06h2ihwxmazj9ajld6y"; + type = "gem"; + }; + version = "1.18.0"; + }; + ruby-statistics = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1agj0yspf9haqvqlq5dy3gqn8xc0h9a1dd7c44fi9rn4bnyplsbx"; + type = "gem"; + }; + version = "4.1.0"; + }; + ruby2_keywords = { + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + rubyntlm = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + type = "gem"; + }; + version = "0.6.3"; + }; + rubypants = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph"; + type = "gem"; + }; + version = "0.2.0"; + }; + rubyzip = { + groups = [ + "default" + "development" + "omnibus" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + rugged = { + groups = [ + "coverage" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in"; + type = "gem"; + }; + version = "1.6.3"; + }; + safe_yaml = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; + }; + safety_net_attestation = { + dependencies = [ "jwt" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln"; + type = "gem"; + }; + version = "0.4.0"; + }; + sanitize = { + dependencies = [ + "crass" + "nokogiri" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kymrjdpbmn4yaml3aaqyj1dzj8gqmm9h030dc2rj5mvja7fpi28"; + type = "gem"; + }; + version = "6.0.2"; + }; + sass-embedded = { + dependencies = [ + "google-protobuf" + "rake" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2"; + type = "gem"; + }; + version = "1.77.5"; + }; + sawyer = { + dependencies = [ + "addressable" + "faraday" + ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; + type = "gem"; + }; + version = "0.9.2"; + }; + sd_notify = { + groups = [ "puma" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0c9imnjbakx25r2n7widfp00s19ndzmmwax761mx5vbwm9nariyb"; + type = "gem"; + }; + version = "0.1.1"; + }; + securerandom = { + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; + type = "gem"; + }; + version = "0.4.1"; + }; + seed-fu = { + dependencies = [ + "activerecord" + "activesupport" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0y7lzcshsq6i20qn1p8zczir4fivr6nbl1km91ns320vvh92v43d"; + type = "gem"; + }; + version = "2.3.9"; + }; + selenium-webdriver = { + dependencies = [ + "base64" + "logger" + "rexml" + "rubyzip" + "websocket" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1q5nbszbxz566yzyiv0a4lvfk56q89k0lk4mqp6wyddrc2nz88c8"; + type = "gem"; + }; + version = "4.27.0"; + }; + semver_dialects = { + dependencies = [ + "deb_version" + "pastel" + "thor" + "tty-command" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07nx840hc07a1igzw7zbg1c3wp71sfflv7c6jivwxj7pcr9b0431"; + type = "gem"; + }; + version = "3.7.0"; + }; + sentry-rails = { + dependencies = [ + "railties" + "sentry-ruby" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1i6y53hkif95091m2pq07gx3l30f85fmkj6phblc2hz3hlybqb4d"; + type = "gem"; + }; + version = "5.23.0"; + }; + sentry-ruby = { + dependencies = [ + "bigdecimal" + "concurrent-ruby" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1k45ydlbl99c9ivbafzw8lpm9diiw4m7z55szi87l9kalpwv52wf"; + type = "gem"; + }; + version = "5.23.0"; + }; + sentry-sidekiq = { + dependencies = [ + "sentry-ruby" + "sidekiq" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "060wbm1xckmlnx3j8mlf7vgmxv6wsh75nq5smj2y2wspl89n9p1l"; + type = "gem"; + }; + version = "5.23.0"; + }; + shellany = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ryyzrj1kxmnpdzhlv4ys3dnl2r5r3d2rs2jwzbnd1v96a8pl4hf"; + type = "gem"; + }; + version = "0.0.1"; + }; + shoulda-matchers = { + dependencies = [ "activesupport" ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1c082vpfdf3865xq6xayxw2hwqswhnc9g030p1gi4hmk9dzvnmch"; + type = "gem"; + }; + version = "6.4.0"; + }; + sidekiq = { + dependencies = [ + "base64" + "connection_pool" + "logger" + "rack" + "redis-client" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i"; + type = "gem"; + }; + version = "7.3.9"; + }; + sidekiq-cron = { + dependencies = [ + "fugit" + "globalid" + "sidekiq" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v09lg8kza19jmigqv5hx2ibhm75j6pa639sfy4bv2208l50hqv6"; + type = "gem"; + }; + version = "1.12.0"; + }; + sigdump = { + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hkj8fsl1swjfqvzgrwbyrwwn7403q95fficbll8nibhrqf6qw5v"; + type = "gem"; + }; + version = "0.2.5"; + }; + signet = { + dependencies = [ + "addressable" + "faraday" + "jwt" + "multi_json" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6"; + type = "gem"; + }; + version = "0.18.0"; + }; + simple_po_parser = { + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wybcipkfawg4pragmayiig03xc084x3hbwywsh1dr9x9pa8f9hj"; + type = "gem"; + }; + version = "1.1.6"; + }; + simplecov = { + dependencies = [ + "docile" + "simplecov-html" + "simplecov_json_formatter" + ]; + groups = [ + "coverage" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; + type = "gem"; + }; + version = "0.22.0"; + }; + simplecov-cobertura = { + dependencies = [ + "rexml" + "simplecov" + ]; + groups = [ + "coverage" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00izmp202y48qvmvwrh5x56cc5ivbjhgkkkjklvqmqzj9pik4r9c"; + type = "gem"; + }; + version = "2.1.0"; + }; + simplecov-html = { + groups = [ + "coverage" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; + type = "gem"; + }; + version = "0.12.3"; + }; + simplecov-lcov = { + groups = [ + "coverage" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h8kswnshgb9zidvc88f4zjy4gflgz3854sx9wrw8ppgnwfg6581"; + type = "gem"; + }; + version = "0.8.0"; + }; + simplecov_json_formatter = { + groups = [ + "coverage" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; + type = "gem"; + }; + version = "0.1.4"; + }; + simpleidn = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0a9c1mdy12y81ck7mcn9f9i2s2wwzjh1nr92ps354q517zq9dkh8"; + type = "gem"; + }; + version = "0.2.3"; + }; + singleton = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0y2pc7lr979pab5n5lvk3jhsi99fhskl5f2s6004v8sabz51psl3"; + type = "gem"; + }; + version = "0.3.0"; + }; + sixarm_ruby_unaccent = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11237b8r8p7fc0cpn04v9wa7ggzq0xm6flh10h1lnb6zgc3schq0"; + type = "gem"; + }; + version = "1.2.0"; + }; + slack-messenger = { + dependencies = [ "re2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1n367s0wjym1czllgwycgya13r3axgjfpivc6dlvgjzbgmc1wn2q"; + type = "gem"; + }; + version = "2.3.6"; + }; + snaky_hash = { + dependencies = [ + "hashie" + "version_gem" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1pl70rh92wsn15q4lwzikzi7j5a00vm77bqjg07k4sgzx0wjx2zy"; + type = "gem"; + }; + version = "2.0.0"; + }; + snowplow-tracker = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f2afcmwbfxfrkf0scc5yi3x5lyrfbd3xri8zm2ri0is8kqz99kv"; + type = "gem"; + }; + version = "0.8.0"; + }; + solargraph = { + dependencies = [ + "backport" + "benchmark" + "diff-lcs" + "jaro_winkler" + "kramdown" + "kramdown-parser-gfm" + "logger" + "observer" + "ostruct" + "parser" + "rbs" + "reverse_markdown" + "rubocop" + "thor" + "tilt" + "yard" + "yard-solargraph" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mkc1fxz4anv7fcq9jn26dc5ppwriand778f9dklzrpgq9pga8py"; + type = "gem"; + }; + version = "0.54.2"; + }; + solargraph-rspec = { + dependencies = [ "solargraph" ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kpsdfkj6yvd5ndhj5vbll4591lwg4gjrf5c61ffj8vvy4j93z0d"; + type = "gem"; + }; + version = "0.5.1"; + }; + sorbet-runtime = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1dpxyhph8rp0bwiacqjsvsm67gm6v7bw16na20rk59g6y8953dk4"; + type = "gem"; + }; + version = "0.5.11647"; + }; + spamcheck = { + dependencies = [ "grpc" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1iqfsnz0ls27ml4dyqyp8k7sdq3rgxjqrlslh3c475fmzjfvla9s"; + type = "gem"; + }; + version = "1.3.3"; + }; + spring = { + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08kizsvrb7a19aps7a8rpmndfq16jb8q2j45fn155s1qrsyg7aha"; + type = "gem"; + }; + version = "4.3.0"; + }; + spring-commands-rspec = { + dependencies = [ "spring" ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2"; + type = "gem"; + }; + version = "1.0.4"; + }; + sprite-factory = { + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18hvn14vz1v3j1gvbqjypa59hgj3c4mqbimby50k407c395551jm"; + type = "gem"; + }; + version = "1.7.1"; + }; + sprockets = { + dependencies = [ + "concurrent-ruby" + "rack" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + type = "gem"; + }; + version = "3.7.2"; + }; + sprockets-rails = { + dependencies = [ + "actionpack" + "activesupport" + "sprockets" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17hiqkdpcjyyhlm997mgdcr45v35j5802m5a979i5jgqx5n8xs59"; + type = "gem"; + }; + version = "3.5.2"; + }; + ssh_data = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h5aiqqlk51z12kgvanhdvd0ajvv2i68z6a7450yxgmflfaiwz7c"; + type = "gem"; + }; + version = "1.3.0"; + }; + ssrf_filter = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nx0vap3mrh62v37lr45h77ipp4li8x77v4kxr1psh3yhda9zx03"; + type = "gem"; + }; + version = "1.0.8"; + }; + stackprof = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03788mbipmihq2w7rznzvv0ks0s9z1321k1jyr6ffln8as3d5xmg"; + type = "gem"; + }; + version = "0.2.27"; + }; + state_machines = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3"; + type = "gem"; + }; + version = "0.5.0"; + }; + state_machines-activemodel = { + dependencies = [ + "activemodel" + "state_machines" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0b4dffzlj38adin6gm0ky72r5c507qdb1jprnm7h9gnlj2qxlcp9"; + type = "gem"; + }; + version = "0.8.0"; + }; + state_machines-activerecord = { + dependencies = [ + "activerecord" + "state_machines-activemodel" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1dmaf4f4cg3gamzgga3gamp0kv9lvianqzr9103dw0xbp00vfbq7"; + type = "gem"; + }; + version = "0.8.0"; + }; + state_machines-rspec = { + dependencies = [ + "activesupport" + "rspec" + "state_machines" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1gf0wlgkpdwwyxg810p1clpba6gmcl7jwvhlg5zwkl2pvx2pm99b"; + type = "gem"; + }; + version = "0.6.0"; + }; + stringio = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v"; + type = "gem"; + }; + version = "3.1.7"; + }; + strings = { + dependencies = [ + "strings-ansi" + "unicode-display_width" + "unicode_utils" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yynb0qhhhplmpzavfrrlwdnd1rh7rkwzcs4xf0mpy2wr6rr6clk"; + type = "gem"; + }; + version = "0.2.1"; + }; + strings-ansi = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; + type = "gem"; + }; + version = "0.2.0"; + }; + swd = { + dependencies = [ + "activesupport" + "attr_required" + "faraday" + "faraday-follow_redirects" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0m86fzmwgw0vc8p6fwvnsdbldpgbqdz9cbp2zj9z06bc4jjf5nsc"; + type = "gem"; + }; + version = "2.0.3"; + }; + sync = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6"; + type = "gem"; + }; + version = "0.5.0"; + }; + sys-filesystem = { + dependencies = [ "ffi" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08bln6c3qmylakgpmpswv4zdis8bf96nkbrxpb9xcal2i7g1j29r"; + type = "gem"; + }; + version = "1.4.3"; + }; + sysexits = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr"; + type = "gem"; + }; + version = "1.2.0"; + }; + table_print = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jxmd1yg3h0g27wzfpvq1jnkkf7frwb5wy9m4f47nf4k3wl68rj3"; + type = "gem"; + }; + version = "1.5.7"; + }; + tanuki_emoji = { + dependencies = [ "i18n" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14vdkzrfq3sv9dfzz0sgw89z7a6jic43jkndj7nqhvxdbhm1iqny"; + type = "gem"; + }; + version = "0.13.0"; + }; + telesign = { + dependencies = [ "net-http-persistent" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hjcaiy58zg7vpy5vsaaz6ss8w6nlkkvz1p758gdmd5wlxpfkinw"; + type = "gem"; + }; + version = "2.2.4"; + }; + telesignenterprise = { + dependencies = [ "telesign" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cziz60q1pav635fln5xiag7vqvf992sk9xi1l5gxhm8ccra0izi"; + type = "gem"; + }; + version = "2.2.2"; + }; + temple = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861"; + type = "gem"; + }; + version = "0.8.2"; + }; + term-ansicolor = { + dependencies = [ "tins" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; + type = "gem"; + }; + version = "1.7.1"; + }; + terminal-table = { + dependencies = [ "unicode-display_width" ]; + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; + type = "gem"; + }; + version = "3.0.2"; + }; + terser = { + dependencies = [ "execjs" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "13mj7ds6kwl1z5dp8zg6b9l3vq9012g8yr99hlpf3d1dgsyf1hl0"; + type = "gem"; + }; + version = "1.0.2"; + }; + test-prof = { + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vsk2ca9kfrxhyd2xiiyr28hmxkh9vd8j2vwl5f1yfnkv4z52n8s"; + type = "gem"; + }; + version = "1.4.4"; + }; + test_file_finder = { + dependencies = [ "faraday" ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "16bi2x6n8vwpinlm3n7j666ryq06zndhp4cj32sq89vbl240byw3"; + type = "gem"; + }; + version = "0.3.1"; + }; + text = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; + type = "gem"; + }; + version = "1.3.1"; + }; + thor = { + groups = [ + "default" + "development" + "omnibus" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + type = "gem"; + }; + version = "1.3.1"; + }; + thread_safe = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + thrift = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh"; + type = "gem"; + }; + version = "0.16.0"; + }; + tilt = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + type = "gem"; + }; + version = "2.0.11"; + }; + timeout = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm"; + type = "gem"; + }; + version = "0.4.3"; + }; + timfel-krb5-auth = { + groups = [ + "default" + "kerberos" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b"; + type = "gem"; + }; + version = "0.8.3"; + }; + tins = { + dependencies = [ "sync" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kxykx7ywc0i3y4dwakz4b46dql4zc7h8b5w1hqhsqswq93s7i2i"; + type = "gem"; + }; + version = "1.31.1"; + }; + toml-rb = { + dependencies = [ "citrus" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19nr4wr5accc6l2y3avn7b02lqmk9035zxq42234k7fcqd5cbqm1"; + type = "gem"; + }; + version = "2.2.0"; + }; + tomlrb = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8"; + type = "gem"; + }; + version = "1.3.0"; + }; + tpm-key_attestation = { + dependencies = [ + "bindata" + "openssl" + "openssl-signature_algorithm" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1"; + type = "gem"; + }; + version = "0.12.0"; + }; + traces = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "109dh1xmsmvkg1pf3306svigh3m8kdmjqlznyk4bi2r4nws7hm6j"; + type = "gem"; + }; + version = "0.15.2"; + }; + trailblazer-option = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18s48fndi2kfvrfzmq6rxvjfwad347548yby0341ixz1lhpg3r10"; + type = "gem"; + }; + version = "0.1.2"; + }; + train-core = { + dependencies = [ + "addressable" + "ffi" + "json" + "mixlib-shellout" + "net-scp" + "net-ssh" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fr2hydxs1rzmi7c1c1wcfi0m2piks3vl8hdhh8rpgjz041dm4w4"; + type = "gem"; + }; + version = "3.10.8"; + }; + truncato = { + dependencies = [ + "htmlentities" + "nokogiri" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1073j47fypwmc4myqzcd9rbipf1250qx2mnki4iqksv7q11ijqil"; + type = "gem"; + }; + version = "0.7.13"; + }; + ttfunk = { + dependencies = [ "bigdecimal" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ji0kn8jkf1rpskv3ijzxvqwixg4p6sk8kg0vmwyjinci7jcgjx7"; + type = "gem"; + }; + version = "1.8.0"; + }; + tty-color = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; + type = "gem"; + }; + version = "0.6.0"; + }; + tty-command = { + dependencies = [ "pastel" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14hi8xiahfrrnydw6g3i30lxvvz90wp4xsrlhx8mabckrcglfv0c"; + type = "gem"; + }; + version = "0.10.1"; + }; + tty-cursor = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-markdown = { + dependencies = [ + "kramdown" + "pastel" + "rouge" + "strings" + "tty-color" + "tty-screen" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04f599zn5rfndq4d9l0acllfpc041bzdkkz2h6x0dl18f2wivn0y"; + type = "gem"; + }; + version = "0.7.2"; + }; + tty-prompt = { + dependencies = [ + "pastel" + "tty-reader" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1j4y8ik82azjxshgd4i1v4wwhsv3g9cngpygxqkkz69qaa8cxnzw"; + type = "gem"; + }; + version = "0.23.1"; + }; + tty-reader = { + dependencies = [ + "tty-cursor" + "tty-screen" + "wisper" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6"; + type = "gem"; + }; + version = "0.9.0"; + }; + tty-screen = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + type = "gem"; + }; + version = "0.8.1"; + }; + typhoeus = { + dependencies = [ "ethon" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0z7gamf6s83wy0yqms3bi4srirn3fc0lc7n65lqanidxcj1xn5qw"; + type = "gem"; + }; + version = "1.4.1"; + }; + tzinfo = { + dependencies = [ "concurrent-ruby" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; + type = "gem"; + }; + version = "2.0.6"; + }; + uber = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; + type = "gem"; + }; + version = "0.1.0"; + }; + undercover = { + dependencies = [ + "base64" + "bigdecimal" + "imagen" + "rainbow" + "rugged" + ]; + groups = [ + "coverage" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06pc56qly4c8ygwg9hyay1vmxq75clm62ljw0s9ljamm57qzqd1w"; + type = "gem"; + }; + version = "0.6.4"; + }; + 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 = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; + type = "gem"; + }; + version = "2.4.2"; + }; + unicode-emoji = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c"; + type = "gem"; + }; + version = "4.0.4"; + }; + unicode_utils = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; + type = "gem"; + }; + version = "1.4.0"; + }; + uniform_notifier = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1dfvqixshwvm82b9qwdidvnkavdj7s0fbdbmyd4knkl6l3j9xcwr"; + type = "gem"; + }; + version = "1.16.0"; + }; + unleash = { + dependencies = [ "murmurhash3" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fxr4q8bs5pbf3y57f3bckg3ls9k76wzzkhvl1kdw879im4mcvhg"; + type = "gem"; + }; + version = "3.2.2"; + }; + unparser = { + dependencies = [ + "diff-lcs" + "parser" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1j6ym6cn43ry4lvcal7cv0n9g9awny7kcrn1crp7cwx2vwzffhmf"; + type = "gem"; + }; + version = "0.6.7"; + }; + uri = { + groups = [ + "danger" + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mz4hxi8lxh8rs6aph1mrihczvvz8ag9zlin1gzvq490cmp1jmx5"; + type = "gem"; + }; + version = "0.13.2"; + }; + valid_email = { + dependencies = [ + "activemodel" + "mail" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0w3587sa7d1a51djyla57pbv9v105jsqvxhkg6vbxi343fsm455q"; + type = "gem"; + }; + version = "0.1.3"; + }; + validate_url = { + dependencies = [ + "activemodel" + "public_suffix" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lblym140w5n88ijyfgcvkxvpfj8m6z00rxxf2ckmmhk0x61dzkj"; + type = "gem"; + }; + version = "1.0.15"; + }; + validates_hostname = { + dependencies = [ + "activerecord" + "activesupport" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06fspma67flsvwl3gfyrv2572l15pjsmqsncz5yp4kqbriw03i7a"; + type = "gem"; + }; + version = "1.0.13"; + }; + version_gem = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "104s7p4zp5yvf0bvbwd9mqmnkgz2z89h4hbvxi8pzd8d08c9a03b"; + type = "gem"; + }; + version = "1.1.0"; + }; + version_sorter = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1np1xy15xq5lcp0y5zr7sxnpwwgcq7bvfs6jc27vnkw0lfhz4ir1"; + type = "gem"; + }; + version = "2.3.0"; + }; + view_component = { + dependencies = [ + "activesupport" + "concurrent-ruby" + "method_source" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0p6z21kqz05966l77rfj7hdmhb6drld7qaxdbx4qawwylay7fnkz"; + type = "gem"; + }; + version = "3.21.0"; + }; + virtus = { + dependencies = [ + "axiom-types" + "coercible" + "descendants_tracker" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hniwgbdsjxa71qy47n6av8faf8qpwbaapms41rhkk3zxgjdlhc8"; + type = "gem"; + }; + version = "2.0.0"; + }; + vite_rails = { + dependencies = [ + "railties" + "vite_ruby" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "005mbcprdhjqx27561mb54kssjwxwij157x6wya1yp60gdkl8p0r"; + type = "gem"; + }; + version = "3.0.19"; + }; + vite_ruby = { + dependencies = [ + "dry-cli" + "logger" + "mutex_m" + "rack-proxy" + "zeitwerk" + ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wj9ia0s7vywn66pf2jn49pfsy5h5rncjjwhaymwq32r3f2pq2p1"; + type = "gem"; + }; + version = "3.9.2"; + }; + vmstat = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "014ingrldwjgsw27af0x9kzv4ca0dayh3p99bi5grnsl191wp1sm"; + type = "gem"; + }; + version = "2.3.1"; + }; + warden = { + dependencies = [ "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1l7gl7vms023w4clg02pm4ky9j12la2vzsixi2xrv9imbn44ys26"; + type = "gem"; + }; + version = "1.2.9"; + }; + warning = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lwcf7fsz1sda1fdbqq1i4q9kzg4f5vwrzgfg1vpa1hcxagw84hg"; + type = "gem"; + }; + version = "1.5.0"; + }; + webauthn = { + dependencies = [ + "android_key_attestation" + "awrence" + "bindata" + "cbor" + "cose" + "openssl" + "safety_net_attestation" + "tpm-key_attestation" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ri09bf640kkw4v6k2g90q2nw1mx2hsghhngaqgb7958q8id8xrz"; + type = "gem"; + }; + version = "3.0.0"; + }; + webfinger = { + dependencies = [ + "activesupport" + "faraday" + "faraday-follow_redirects" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0p39802sfnm62r4x5hai8vn6d1wqbxsxnmbynsk8rcvzwyym4yjn"; + type = "gem"; + }; + version = "2.1.3"; + }; + webmock = { + dependencies = [ + "addressable" + "crack" + "hashdiff" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "13hrfja9as50ymbzsmlqsnv3ijirnf6mini21y1qq04793y26g2p"; + type = "gem"; + }; + version = "3.25.0"; + }; + webrick = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; + type = "gem"; + }; + version = "1.9.1"; + }; + websocket = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1a4zc8d0d91c3xqwapda3j3zgpfwdbj76hkb69xn6qvfkfks9h9c"; + type = "gem"; + }; + version = "1.2.10"; + }; + websocket-driver = { + dependencies = [ "websocket-extensions" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; + type = "gem"; + }; + version = "0.7.6"; + }; + websocket-extensions = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; + type = "gem"; + }; + version = "0.1.5"; + }; + wikicloth = { + dependencies = [ + "builder" + "expression_parser" + "rinku" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s"; + type = "gem"; + }; + version = "0.8.1"; + }; + wisper = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf"; + type = "gem"; + }; + version = "2.0.1"; + }; + with_env = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh"; + type = "gem"; + }; + version = "1.1.0"; + }; + wmi-lite = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nnx4xz8g40dpi3ccqk5blj1ck06ydx09f9diksn1ghd8yxzavhi"; + type = "gem"; + }; + version = "1.0.7"; + }; + xml-simple = { + dependencies = [ "rexml" ]; + groups = [ + "default" + "development" + "omnibus" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pb9plyl71mdbjr4kllfy53qx6g68ryxblmnq9dilvy837jk24fj"; + type = "gem"; + }; + version = "1.1.9"; + }; + xpath = { + dependencies = [ "nokogiri" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; + type = "gem"; + }; + version = "3.2.0"; + }; + yajl-ruby = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lni4jbyrlph7sz8y49q84pb0sbj82lgwvnjnsiv01xf26f4v5wc"; + type = "gem"; + }; + version = "1.4.3"; + }; + yard = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14k9lb9a60r9z2zcqg08by9iljrrgjxdkbd91gw17rkqkqwi1sd6"; + type = "gem"; + }; + version = "0.9.37"; + }; + yard-solargraph = { + dependencies = [ "yard" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03lklm47k6k294ww97x6zpvlqlyjm5q8jidrixhil622r4cld6m1"; + type = "gem"; + }; + version = "0.1.0"; + }; + zeitwerk = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; + type = "gem"; + }; + version = "2.6.7"; + }; +} diff --git a/pkgs/by-name/gi/gitlab/update.py b/pkgs/by-name/gi/gitlab/update.py new file mode 100755 index 000000000000..0642e6140951 --- /dev/null +++ b/pkgs/by-name/gi/gitlab/update.py @@ -0,0 +1,421 @@ +#!/usr/bin/env nix-shell +#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git + +import click +import click_log +import re +import logging +import subprocess +import json +import pathlib +import tempfile +from packaging.version import Version +from typing import Iterable + +import requests + +NIXPKGS_PATH = pathlib.Path(__file__).parent / "../../../../" +GITLAB_DIR = pathlib.Path(__file__).parent + +logger = logging.getLogger(__name__) +click_log.basic_config(logger) + + +class GitLabRepo: + version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?(\-gitlab)?") + + def __init__(self, owner: str = "gitlab-org", repo: str = "gitlab"): + self.owner = owner + self.repo = repo + + @property + def url(self): + return f"https://gitlab.com/{self.owner}/{self.repo}" + + @property + def tags(self) -> Iterable[str]: + """Returns a sorted list of repository tags""" + r = requests.get(self.url + "/refs?sort=updated_desc&ref=master").json() + tags = r.get("Tags", []) + + # filter out versions not matching version_regex + versions = list(filter(self.version_regex.match, tags)) + + # sort, but ignore v, -ee and -gitlab for sorting comparisons + versions.sort( + key=lambda x: Version( + x.replace("v", "").replace("-ee", "").replace("-gitlab", "") + ), + reverse=True, + ) + return versions + def get_git_hash(self, rev: str): + return ( + subprocess.check_output( + [ + "nix-prefetch-url", + "--unpack", + f"https://gitlab.com/{self.owner}/{self.repo}/-/archive/{rev}/{self.repo}-{rev}.tar.gz", + ] + ) + .decode("utf-8") + .strip() + ) + + def get_yarn_hash(self, rev: str): + with tempfile.TemporaryDirectory() as tmp_dir: + with open(tmp_dir + "/yarn.lock", "w") as f: + f.write(self.get_file("yarn.lock", rev)) + return ( + subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"]) + .decode("utf-8") + .strip() + ) + + @staticmethod + def rev2version(tag: str) -> str: + """ + normalize a tag to a version number. + This obviously isn't very smart if we don't pass something that looks like a tag + :param tag: the tag to normalize + :return: a normalized version number + """ + # strip v prefix + version = re.sub(r"^v", "", tag) + # strip -ee and -gitlab suffixes + return re.sub(r"-(ee|gitlab)$", "", version) + + def get_file(self, filepath, rev): + """ + returns file contents at a given rev + :param filepath: the path to the file, relative to the repo root + :param rev: the rev to fetch at + :return: + """ + return requests.get(self.url + f"/raw/{rev}/{filepath}").text + + def get_data(self, rev): + version = self.rev2version(rev) + + passthru = { + v: self.get_file(v, rev).strip() + for v in [ + "GITALY_SERVER_VERSION", + "GITLAB_PAGES_VERSION", + "GITLAB_SHELL_VERSION", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION", + ] + } + passthru["GITLAB_WORKHORSE_VERSION"] = version + + return dict( + version=self.rev2version(rev), + repo_hash=self.get_git_hash(rev), + yarn_hash=self.get_yarn_hash(rev), + owner=self.owner, + repo=self.repo, + rev=rev, + passthru=passthru, + ) + + +def _get_data_json(): + data_file_path = pathlib.Path(__file__).parent / "data.json" + with open(data_file_path, "r") as f: + return json.load(f) + + +def _call_nix_update(pkg, version): + """calls nix-update from nixpkgs root dir""" + return subprocess.check_output( + ["nix-update", pkg, "--version", version], cwd=NIXPKGS_PATH + ) + + +@click_log.simple_verbosity_option(logger) +@click.group() +def cli(): + pass + + +@cli.command("update-data") +@click.option("--rev", default="latest", help="The rev to use (vX.Y.Z-ee), or 'latest'") +def update_data(rev: str): + """Update data.json""" + logger.info("Updating data.json") + + repo = GitLabRepo() + if rev == "latest": + # filter out pre and rc releases + rev = next(filter(lambda x: not ("rc" in x or x.endswith("pre")), repo.tags)) + + data_file_path = pathlib.Path(__file__).parent / "data.json" + + data = repo.get_data(rev) + + with open(data_file_path.as_posix(), "w") as f: + json.dump(data, f, indent=2) + f.write("\n") + + +@cli.command("update-rubyenv") +def update_rubyenv(): + """Update rubyEnv""" + logger.info("Updating gitlab") + repo = GitLabRepo() + rubyenv_dir = pathlib.Path(__file__).parent / "rubyEnv" + + # load rev from data.json + data = _get_data_json() + rev = data["rev"] + version = data["version"] + + for fn in ["Gemfile.lock", "Gemfile"]: + with open(rubyenv_dir / fn, "w") as f: + f.write(repo.get_file(fn, rev)) + + # update to 1.2.9 to include https://gitlab.com/gitlab-org/ruby/gems/prometheus-client-mmap/-/commit/5d77f3f3e048834250589b416c6b3d4bba65a570 + subprocess.check_output( + ["sed", "-i", "s:'prometheus-client-mmap', '~> 1.2.8':'prometheus-client-mmap', '~> 1.2.9':g", "Gemfile"], + cwd=rubyenv_dir, + ) + + # Un-vendor sidekiq + # + # The sidekiq dependency was vendored to maintain compatibility with Redis 6.0 (as + # stated in this [comment]) but unfortunately, it seems to cause a crash in the + # application, as noted in this [upstream issue]. + # + # We can safely swap out the dependency, as our Redis release in nixpkgs is >= 7.0. + # + # [comment]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435#note_1979750600 + # [upstream issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435 + subprocess.check_output( + ["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq'|gem 'sidekiq', '~> 7.3.9'|g", "Gemfile"], + cwd=rubyenv_dir, + ) + + # Fetch vendored dependencies temporarily in order to build the gemset.nix + subprocess.check_output(["mkdir", "-p", "vendor/gems", "gems"], cwd=rubyenv_dir) + subprocess.check_output( + [ + "sh", + "-c", + f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=vendor/gems | tar -xj --strip-components=3", + ], + cwd=f"{rubyenv_dir}/vendor/gems", + ) + subprocess.check_output( + [ + "sh", + "-c", + f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=gems | tar -xj --strip-components=2", + ], + cwd=f"{rubyenv_dir}/gems", + ) + + # Undo our gemset.nix patches so that bundix runs through + subprocess.check_output( + ["sed", "-i", "-e", "s|\\${src}/||g", "gemset.nix"], cwd=rubyenv_dir + ) + subprocess.check_output( + ["sed", "-i", "-e", "s|^src:[[:space:]]||g", "gemset.nix"], cwd=rubyenv_dir + ) + + subprocess.check_output(["bundle", "lock"], cwd=rubyenv_dir) + subprocess.check_output(["bundix"], cwd=rubyenv_dir) + + subprocess.check_output( + [ + "sed", + "-i", + "-e", + "1c\\src: {", + "-e", + 's:path = \\(vendor/[^;]*\\);:path = "${src}/\\1";:g', + "-e", + 's:path = \\(gems/[^;]*\\);:path = "${src}/\\1";:g', + "gemset.nix", + ], + cwd=rubyenv_dir, + ) + subprocess.check_output(["rm", "-rf", "vendor", "gems"], cwd=rubyenv_dir) + + # Reformat gemset.nix + subprocess.check_output(["nix-shell", "--run", "treefmt pkgs/by-name/gi/gitlab"], cwd=NIXPKGS_PATH) + + +@cli.command("update-gitaly") +def update_gitaly(): + """Update gitaly""" + logger.info("Updating gitaly") + data = _get_data_json() + gitaly_server_version = data['passthru']['GITALY_SERVER_VERSION'] + repo = GitLabRepo(repo="gitaly") + gitaly_dir = pathlib.Path(__file__).parent / 'gitaly' + + makefile = repo.get_file("Makefile", f"v{gitaly_server_version}") + makefile += "\nprint-%:;@echo $($*)\n" + + git_version = subprocess.run(["make", "-f", "-", "print-GIT_VERSION"], check=True, input=makefile, text=True, capture_output=True).stdout.strip() + + _call_nix_update("gitaly", gitaly_server_version) + _call_nix_update("gitaly.git", git_version) + + +@cli.command("update-gitlab-pages") +def update_gitlab_pages(): + """Update gitlab-pages""" + logger.info("Updating gitlab-pages") + data = _get_data_json() + gitlab_pages_version = data["passthru"]["GITLAB_PAGES_VERSION"] + _call_nix_update("gitlab-pages", gitlab_pages_version) + + +def get_container_registry_version() -> str: + """Returns the version attribute of gitlab-container-registry""" + return subprocess.check_output( + [ + "nix", + "--experimental-features", + "nix-command", + "eval", + "-f", + ".", + "--raw", + "gitlab-container-registry.version", + ], + cwd=NIXPKGS_PATH, + ).decode("utf-8") + + +@cli.command("update-gitlab-shell") +def update_gitlab_shell(): + """Update gitlab-shell""" + logger.info("Updating gitlab-shell") + data = _get_data_json() + gitlab_shell_version = data["passthru"]["GITLAB_SHELL_VERSION"] + _call_nix_update("gitlab-shell", gitlab_shell_version) + + +@cli.command("update-gitlab-workhorse") +def update_gitlab_workhorse(): + """Update gitlab-workhorse""" + logger.info("Updating gitlab-workhorse") + data = _get_data_json() + gitlab_workhorse_version = data["passthru"]["GITLAB_WORKHORSE_VERSION"] + _call_nix_update("gitlab-workhorse", gitlab_workhorse_version) + + +@cli.command("update-gitlab-container-registry") +@click.option("--rev", default="latest", help="The rev to use (vX.Y.Z-ee), or 'latest'") +@click.option( + "--commit", is_flag=True, default=False, help="Commit the changes for you" +) +def update_gitlab_container_registry(rev: str, commit: bool): + """Update gitlab-container-registry""" + logger.info("Updading gitlab-container-registry") + repo = GitLabRepo(repo="container-registry") + old_container_registry_version = get_container_registry_version() + + if rev == "latest": + rev = next(filter(lambda x: not ("rc" in x or x.endswith("pre")), repo.tags)) + + version = repo.rev2version(rev) + _call_nix_update("gitlab-container-registry", version) + if commit: + new_container_registry_version = get_container_registry_version() + commit_container_registry( + old_container_registry_version, new_container_registry_version + ) + + +@cli.command('update-gitlab-elasticsearch-indexer') +def update_gitlab_elasticsearch_indexer(): + """Update gitlab-elasticsearch-indexer""" + data = _get_data_json() + gitlab_elasticsearch_indexer_version = data['passthru']['GITLAB_ELASTICSEARCH_INDEXER_VERSION'] + _call_nix_update('gitlab-elasticsearch-indexer', gitlab_elasticsearch_indexer_version) + + +@cli.command("update-all") +@click.option("--rev", default="latest", help="The rev to use (vX.Y.Z-ee), or 'latest'") +@click.option( + "--commit", is_flag=True, default=False, help="Commit the changes for you" +) +@click.pass_context +def update_all(ctx, rev: str, commit: bool): + """Update all gitlab components to the latest stable release""" + old_data_json = _get_data_json() + old_container_registry_version = get_container_registry_version() + + ctx.invoke(update_data, rev=rev) + + new_data_json = _get_data_json() + + ctx.invoke(update_rubyenv) + ctx.invoke(update_gitaly) + ctx.invoke(update_gitlab_pages) + ctx.invoke(update_gitlab_shell) + ctx.invoke(update_gitlab_workhorse) + ctx.invoke(update_gitlab_elasticsearch_indexer) + if commit: + commit_gitlab( + old_data_json["version"], new_data_json["version"], new_data_json["rev"] + ) + + ctx.invoke(update_gitlab_container_registry) + if commit: + new_container_registry_version = get_container_registry_version() + commit_container_registry( + old_container_registry_version, new_container_registry_version + ) + + +def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None: + """Commits the gitlab changes for you""" + subprocess.run( + [ + "git", + "add", + "pkgs/by-name/gi/gitlab", + "pkgs/by-name/gi/gitaly", + "pkgs/by-name/gi/gitlab-elasticsearch-indexer", + "pkgs/by-name/gi/gitlab-pages", + ], + cwd=NIXPKGS_PATH, + ) + subprocess.run( + [ + "git", + "commit", + "--message", + f"""gitlab: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/gitlab/-/blob/{new_rev}/CHANGELOG.md""", + ], + cwd=NIXPKGS_PATH, + ) + + +def commit_container_registry(old_version: str, new_version: str) -> None: + """Commits the gitlab-container-registry changes for you""" + subprocess.run( + [ + "git", + "add", + "pkgs/by-name/gi/gitlab-container-registry" + ], + cwd=NIXPKGS_PATH, + ) + subprocess.run( + [ + "git", + "commit", + "--message", + f"gitlab-container-registry: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/container-registry/-/blob/v{new_version}-gitlab/CHANGELOG.md", + ], + cwd=NIXPKGS_PATH, + ) + + +if __name__ == "__main__": + cli() diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index 78de8db256a3..b04e75d007c1 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.24.2"; + version = "8.26.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; tag = "v${version}"; - hash = "sha256-5Bx+suC24r2v9WaBzhkGJTAnh1TeQyjkVj+YVCviYOc="; + hash = "sha256-lBIoEUjAllhUTS9PRSqdWUeBhEGs6wOHOWivj0PC9Is="; }; vendorHash = "sha256-MSF9N9kXsIM2WKsjKAVztYypwGPng2EElHx7p6vADqc="; diff --git a/pkgs/by-name/gi/gitmoji-cli/package.nix b/pkgs/by-name/gi/gitmoji-cli/package.nix index d46464012331..f72cabe64756 100644 --- a/pkgs/by-name/gi/gitmoji-cli/package.nix +++ b/pkgs/by-name/gi/gitmoji-cli/package.nix @@ -1,83 +1,55 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, fetchYarnDeps, - makeWrapper, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, nodejs, - fixup-yarn-lock, - yarn, - testers, + versionCheckHook, + nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gitmoji-cli"; - version = "9.0.0"; + version = "9.7.0"; src = fetchFromGitHub { owner = "carloscuesta"; repo = "gitmoji-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-cIc0AaP1AwhoVJLnonC9qvDWNZW4L6/jsQ3Q6z5VXI0="; + hash = "sha256-2nQCxmZdDMKHcmVihloU4leKRB9LRBO4Q5AINR1vdCQ="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-HXMRCTiUti/GZ1dzd+XbFOao3+QLC1t7H0TT9MS5lz4="; + hash = "sha256-YemcF7hRg+LAkR3US1xAgE0ELAeZTVLhscOphjmheRI="; }; nativeBuildInputs = [ - makeWrapper + yarnConfigHook + yarnBuildHook + yarnInstallHook + # Needed for executing package.json scripts nodejs - fixup-yarn-lock - yarn ]; - configurePhase = '' - runHook preConfigure + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/gitmoji"; - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror $offlineCache - fixup-yarn-lock yarn.lock - yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install - patchShebangs node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - yarn --offline --production install - - mkdir -p "$out/lib/node_modules/gitmoji-cli" - cp -r lib node_modules package.json "$out/lib/node_modules/gitmoji-cli" - - makeWrapper "${nodejs}/bin/node" "$out/bin/gitmoji" \ - --add-flags "$out/lib/node_modules/gitmoji-cli/lib/cli.js" - - runHook postInstall - ''; - - passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Gitmoji client for using emojis on commit messages"; homepage = "https://github.com/carloscuesta/gitmoji-cli"; + changelog = "https://github.com/carloscuesta/gitmoji-cli/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "gitmoji"; - maintainers = with lib.maintainers; [ nequissimus ]; + maintainers = with lib.maintainers; [ + nequissimus + yzx9 + ]; }; }) diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/by-name/gi/gitmux/package.nix similarity index 100% rename from pkgs/applications/version-management/gitmux/default.nix rename to pkgs/by-name/gi/gitmux/package.nix diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix index 867bc19a9bd8..404aaaaf90fc 100644 --- a/pkgs/by-name/gi/gitnr/package.nix +++ b/pkgs/by-name/gi/gitnr/package.nix @@ -6,7 +6,6 @@ libxkbcommon, openssl, stdenv, - darwin, wayland, }: @@ -32,9 +31,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland diff --git a/pkgs/by-name/gi/gitoxide/fix-cargo-dependencies.patch b/pkgs/by-name/gi/gitoxide/fix-cargo-dependencies.patch new file mode 100644 index 000000000000..ea9f7f54a7d2 --- /dev/null +++ b/pkgs/by-name/gi/gitoxide/fix-cargo-dependencies.patch @@ -0,0 +1,24 @@ +diff -ur a/gix-packetline/Cargo.toml b/gix-packetline/Cargo.toml +--- a/gix-packetline/Cargo.toml ++++ b/gix-packetline/Cargo.toml +@@ -24,7 +24,7 @@ + ## If set, all IO will become blocking. The same types will be used preventing side-by-side usage of blocking and non-blocking IO. + blocking-io = [] + ## Implement IO traits from `futures-io`. +-async-io = ["dep:futures-io", "dep:futures-lite", "dep:pin-project-lite"] ++async-io = ["dep:futures-io", "futures-lite", "dep:pin-project-lite"] + + #! ### Other + ## Data structures implement `serde::Serialize` and `serde::Deserialize`. +diff -ur a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml +--- a/gix-protocol/Cargo.toml ++++ b/gix-protocol/Cargo.toml +@@ -34,7 +34,7 @@ + "gix-transport/async-client", + "dep:async-trait", + "dep:futures-io", +- "dep:futures-lite", ++ "futures-lite", + "handshake", + "fetch" + ] diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix index dda082b3a278..3a3c636ba646 100644 --- a/pkgs/by-name/gi/gitoxide/package.nix +++ b/pkgs/by-name/gi/gitoxide/package.nix @@ -18,17 +18,23 @@ let in rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.39.0"; + version = "0.42.0"; src = fetchFromGitHub { - owner = "Byron"; + owner = "GitoxideLabs"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-xv4xGkrArJ/LTVLs2SYhvxhfNG6sjVm5nZWsi4s34iM="; + hash = "sha256-hrCWt4cCnlH3NKH5Uugf/rvVN+YpbeZgZ/lhnQGZ2I0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SRJkI61Z8revRWoschkUAJwcJfKB/U03+YfwEcnEIm8="; + cargoHash = "sha256-q35MQGN/tvsK7gg0a/ljoVY6wedy7rwKlSakONgBIgk="; + + patches = [ + # TODO: remove after next update + # https://github.com/GitoxideLabs/gitoxide/pull/1929 + ./fix-cargo-dependencies.patch + ]; nativeBuildInputs = [ cmake @@ -55,8 +61,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Command-line application for interacting with git repositories"; - homepage = "https://github.com/Byron/gitoxide"; - changelog = "https://github.com/Byron/gitoxide/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/GitoxideLabs/gitoxide"; + changelog = "https://github.com/GitoxideLabs/gitoxide/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit # or asl20 diff --git a/pkgs/by-name/gi/gitrs/package.nix b/pkgs/by-name/gi/gitrs/package.nix index d6a3942e7320..d4155f294a13 100644 --- a/pkgs/by-name/gi/gitrs/package.nix +++ b/pkgs/by-name/gi/gitrs/package.nix @@ -5,8 +5,8 @@ openssl, pkg-config, libiconv, - darwin, rustPlatform, + libz, }: rustPlatform.buildRustPackage rec { @@ -31,8 +31,7 @@ rustPlatform.buildRustPackage rec { [ openssl.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration + libz ]; meta = with lib; { diff --git a/pkgs/by-name/gi/gitsign/package.nix b/pkgs/by-name/gi/gitsign/package.nix index 3fc0d48b32d7..beb12aba56f7 100644 --- a/pkgs/by-name/gi/gitsign/package.nix +++ b/pkgs/by-name/gi/gitsign/package.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-MOj3bpVgeZlsvJqPD5mAud7jSHsRPCKvYAe2aQ4rWcw="; + hash = "sha256-sxkQOqlCgS/QFfRN5Rtdih2zjiGHY6H9Kjlw0Q74W2A="; }; - vendorHash = "sha256-POB8mSGyW45RSbNq9Vp/LW3jEtnHi7zufihXFTnWEfw="; + vendorHash = "sha256-CvswCIczi+MyHsluz39CnfVJEcc49wkEby67qHxv+wI="; subPackages = [ "." diff --git a/pkgs/by-name/gi/gitsnip/package.nix b/pkgs/by-name/gi/gitsnip/package.nix new file mode 100644 index 000000000000..6819055722b0 --- /dev/null +++ b/pkgs/by-name/gi/gitsnip/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: +buildGoModule (finalAttrs: { + pname = "gitsnip"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "dagimg-dot"; + repo = "gitsnip"; + tag = "v${finalAttrs.version}"; + hash = "sha256-90lM9MPX45W513EQ5qH+s86nIWjTpQw6OIAzvTLU+4w="; + }; + + vendorHash = "sha256-m5mBubfbXXqXKsygF5j7cHEY+bXhAMcXUts5KBKoLzM="; + + ldflags = [ + "-s -w" + "-X github.com/dagimg-dot/gitsnip/internal/cli.version=${finalAttrs.version}" + "-X github.com/dagimg-dot/gitsnip/internal/cli.commit=refs/tags/v${finalAttrs.version}" + "-X github.com/dagimg-dot/gitsnip/internal/cli.builtBy=nixpkgs" + ]; + + passthru.updateScript = nix-update-script { }; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + + meta = { + description = "CLI tool to download specific folders from a git repository"; + homepage = "https://github.com/dagimg-dot/gitsnip/"; + changelog = "https://github.com/dagimg-dot/gitsnip/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + adda + ]; + mainProgram = "gitsnip"; + }; +}) diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix index 6be2cb9f6f0f..a116407ca52a 100644 --- a/pkgs/by-name/gi/gitstatus/package.nix +++ b/pkgs/by-name/gi/gitstatus/package.nix @@ -128,7 +128,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ mmlb - hexa SuperSandro2000 ]; platforms = platforms.all; diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index de8ebf6d45df..66e0919df201 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gittuf"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "gittuf"; repo = pname; rev = "v${version}"; - hash = "sha256-gvRr+Q5XCfhtIOdxQdDwLXvo/+GHDuxaEcEpctevWew="; + hash = "sha256-519m73RjtEFjEZGholZ8zsjHZkJBEu2pyQqWOV0wrSc="; }; - vendorHash = "sha256-zGzcEaAQGwLz4JQnaOVO/b47mWFWs2JyrShAJqp2Rc4="; + vendorHash = "sha256-TFkHbIRuFPfpIE/2ALjlJX/lHcp1xYyszUiSj6CQ/U4="; ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${version}" ]; diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 240fe153c07f..991c7b71eb2f 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -6,39 +6,32 @@ libgit2, openssl, zlib, - stdenv, - darwin, git, }: rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.29.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-c2YVcE+a/9Z6qTLEbcSFE6393SEeudyvdbzCRJfszcc="; + hash = "sha256-AZyUvZivzUflrH1ihvLKTff3Q2cCFYduJmsegUuuhkE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+tSNUtsDFKqx5W8+cuxyFsG1etm44eYgoYuoUt5tw3E="; + cargoHash = "sha256-0/GqPvFg7ijjF8DjLIqKWIbHYt8brVwIKYR8QI9Ppu0="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; nativeCheckInputs = [ git diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix index f1db72724190..2f24dbef6752 100644 --- a/pkgs/by-name/gi/gitui/package.nix +++ b/pkgs/by-name/gi/gitui/package.nix @@ -8,7 +8,6 @@ pkg-config, cmake, xclip, - darwin, nix-update-script, }: let @@ -38,8 +37,6 @@ rustPlatform.buildRustPackage { ++ lib.optional stdenv.hostPlatform.isLinux xclip ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.AppKit ]; postPatch = '' diff --git a/pkgs/by-name/gi/gitxray/package.nix b/pkgs/by-name/gi/gitxray/package.nix index de005f4dc030..cdc424a576fc 100644 --- a/pkgs/by-name/gi/gitxray/package.nix +++ b/pkgs/by-name/gi/gitxray/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gitxray"; - version = "1.0.17.3"; + version = "1.0.17.4"; pyproject = true; src = fetchFromGitHub { owner = "kulkansecurity"; repo = "gitxray"; tag = version; - hash = "sha256-MfYK6D6QkIQRTsnNAiJsfPeYcUTO/BTe0AtczeONSsg="; + hash = "sha256-JzQ7Dq02lWDGj7+xN4jOHQZThGy/wB0TZDax3fAyXNM="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/gi/giza/package.nix b/pkgs/by-name/gi/giza/package.nix index c8ce0ee8205b..6a00faae2da1 100644 --- a/pkgs/by-name/gi/giza/package.nix +++ b/pkgs/by-name/gi/giza/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "giza"; - version = "1.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "danieljprice"; repo = "giza"; rev = "v${finalAttrs.version}"; - hash = "sha256-FlD+emPrdXYmalHqQ6jKmkZudyLtlbeHtUOjT/D6UOA="; + hash = "sha256-tNz0Lh6bzQPxsd/Vz3jh8u0JiRXT0O43hyfgbGTJUeE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index 367396d89431..5c38bc00413f 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -8,6 +8,7 @@ pkg-config, gnome, gtk3, + gtk4, atk, gobject-introspection, spidermonkey_128, @@ -30,6 +31,7 @@ let testDeps = [ gtk3 + gtk4 atk pango.out gdk-pixbuf @@ -39,7 +41,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gjs"; - version = "1.82.1"; + version = "1.84.2"; outputs = [ "out" @@ -49,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; - hash = "sha256-+zmqVjZXbeDloRcfVqGlgl4r0aaZcvsSC6eL0Qm1aTw="; + hash = "sha256-NRQu3zRXBWNjACkew6fVg/FJaf8/rg/zD0qVseZ0AWY="; }; patches = [ @@ -123,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 ln -s $PWD/subprojects/gobject-introspection-tests/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so ln -s $PWD/subprojects/gobject-introspection-tests/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so + ln -s $PWD/subprojects/gobject-introspection-tests/libutility.so $installedTests/libexec/installed-tests/gjs/libutility.so ln -s $PWD/subprojects/gobject-introspection-tests/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so ''; @@ -142,6 +145,8 @@ stdenv.mkDerivation (finalAttrs: { checkPhase = '' runHook preCheck + GTK_A11Y=none \ + HOME=$(mktemp -d) \ xvfb-run -s '-screen 0 800x600x24' \ meson test --print-errorlogs runHook postCheck @@ -165,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"; license = licenses.lgpl2Plus; mainProgram = "gjs"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; inherit (gobject-introspection.meta) platforms badPlatforms; }; }) diff --git a/pkgs/by-name/gk/gkrellm/package.nix b/pkgs/by-name/gk/gkrellm/package.nix new file mode 100644 index 000000000000..aada0333d9d8 --- /dev/null +++ b/pkgs/by-name/gk/gkrellm/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchurl, + gettext, + pkg-config, + glib, + gtk2, + libX11, + libSM, + libICE, + which, + copyDesktopItems, + makeDesktopItem, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gkrellm"; + version = "2.4.0"; + + src = fetchurl { + url = "http://gkrellm.srcbox.net/releases/gkrellm-${finalAttrs.version}.tar.bz2"; + hash = "sha256-b4NmV2C5Nq1LVfkYKx7HYB+vOKDyXqHkvdyZZQiPAy0="; + }; + + nativeBuildInputs = [ + copyDesktopItems + pkg-config + which + wrapGAppsHook3 + ]; + + buildInputs = [ + gettext + glib + gtk2 + libX11 + libSM + libICE + ]; + + hardeningDisable = [ "format" ]; + + # Makefiles are patched to fix references to `/usr/X11R6' and to add + # `-lX11' to make sure libX11's store path is in the RPATH. + postPatch = '' + echo "patching makefiles..." + for i in Makefile src/Makefile server/Makefile + do + sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" + done + ''; + + makeFlags = [ "STRIP=-s" ]; + + installFlags = [ + "DESTDIR=$(out)" + "PREFIX=''" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "gkrellm"; + exec = "gkrellm"; + icon = "gkrellm"; + desktopName = "GKrellM"; + genericName = "System monitor"; + comment = "The GNU Krell Monitors"; + categories = [ + "System" + "Monitor" + ]; + }) + ]; + + meta = { + description = "Themeable process stack of system monitors"; + longDescription = '' + GKrellM is a single process stack of system monitors which + supports applying themes to match its appearance to your window + manager, Gtk, or any other theme. + ''; + homepage = "http://gkrellm.srcbox.net"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/gl/gl2ps/package.nix b/pkgs/by-name/gl/gl2ps/package.nix index 6838bccacc0a..f1a5a9746f4f 100644 --- a/pkgs/by-name/gl/gl2ps/package.nix +++ b/pkgs/by-name/gl/gl2ps/package.nix @@ -8,7 +8,6 @@ libGL, libGLU, libglut, - darwin, }: stdenv.mkDerivation rec { @@ -33,9 +32,6 @@ stdenv.mkDerivation rec { libGL libGLU libglut - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL ]; meta = with lib; { diff --git a/pkgs/by-name/gl/gl3w/package.nix b/pkgs/by-name/gl/gl3w/package.nix index ed2150bd6be4..ad6297a38205 100644 --- a/pkgs/by-name/gl/gl3w/package.nix +++ b/pkgs/by-name/gl/gl3w/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { pname = "gl3w"; - version = "0-unstable-2023-10-10"; + version = "0-unstable-2025-04-08"; src = fetchFromGitHub { owner = "skaslev"; repo = "gl3w"; - rev = "3a33275633ce4be433332dc776e6a5b3bdea6506"; - hash = "sha256-kEm5QItpasSFJQ32YBHPpc+itz/nQ8bQMCavbOTGT/w="; + rev = "1528d8918447a61e97fe669d7b3e280a60b9a161"; + hash = "sha256-a3fe67xh2nyIu/ytMb9D8S/7QMz23uJUDX7LOfwIJgU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index d14b0cb538ad..6f6b9c8b0390 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "glab"; - version = "1.55.0"; + version = "1.56.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-K1zjb4QCLBp7GwT2580DXYKx3yTaIyNytKObMbzjvlQ="; + hash = "sha256-dFyVhl4+WdQeoSZSY8JbkjJBhqOX/oN2b9q1CGlLhpc="; }; - vendorHash = "sha256-ODTyWArYcCxsWbN9fuppAcRYtKGxcadeRPIwfPiAuOE="; + vendorHash = "sha256-m4IWtK2PNjs2UxzVCT2oSx6Gic2flN4Fq8w0mNIhHxo="; ldflags = [ "-s" diff --git a/pkgs/by-name/gl/glade/package.nix b/pkgs/by-name/gl/glade/package.nix index e0332d691ca2..06e25521e876 100644 --- a/pkgs/by-name/gl/glade/package.nix +++ b/pkgs/by-name/gl/glade/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/glade"; description = "User interface designer for GTK applications"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.lgpl2; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index a02ab557e3fe..965d3dc66c34 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.16"; + version = "1.1.22"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-AQLyVA0DeyoxK54b/hs9HqDkS1k57Vi+JjKuFAh+ZYM="; + hash = "sha256-+YFQU7qCj2hpRuBpUn0hn5GNq+T0DHQFZwEoLu1FY4c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index ac440677aabb..e6e96550ff72 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -2,22 +2,25 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, nix-update-script, nixosTests, }: buildGoModule (finalAttrs: { pname = "glance"; - version = "0.7.9"; + version = "0.8.3"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; tag = "v${finalAttrs.version}"; - hash = "sha256-CUuYwbcKJ985fKcUEV6UNLgOZCjUCOzxNRV+pt5vbnc="; + hash = "sha256-o2Yom40HbNKe3DMMxz0Mf2gG8zresgU52Odpj2H7ZPU="; }; - vendorHash = "sha256-lURRHlZoxbuW1SXxrxy2BkMndcEllGFmVCB4pXBad8Q="; + patches = [ ./update_purego.patch ]; + + vendorHash = "sha256-esPtCg63A40mX9hADOhEa+NjNk+9MI/0qZG3uE91qxg="; ldflags = [ "-s" @@ -25,7 +28,9 @@ buildGoModule (finalAttrs: { "-X github.com/glanceapp/glance/internal/glance.buildVersion=v${finalAttrs.version}" ]; - excludedPackages = [ "scripts/build-and-ship" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gl/glance/update_purego.patch b/pkgs/by-name/gl/glance/update_purego.patch new file mode 100644 index 000000000000..b91fa89f2de4 --- /dev/null +++ b/pkgs/by-name/gl/glance/update_purego.patch @@ -0,0 +1,26 @@ +diff --git a/go.mod b/go.mod +index ccea58ca68..118d91c650 100644 +--- a/go.mod ++++ b/go.mod +@@ -15,7 +15,7 @@ + require ( + github.com/PuerkitoBio/goquery v1.10.3 // indirect + github.com/andybalholm/cascadia v1.3.3 // indirect +- github.com/ebitengine/purego v0.8.2 // indirect ++ github.com/ebitengine/purego v0.8.3 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect +diff --git a/go.sum b/go.sum +index 80c2d6c664..6236b4de85 100644 +--- a/go.sum ++++ b/go.sum +@@ -11,6 +11,8 @@ + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I= + github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= ++github.com/ebitengine/purego v0.8.3 h1:K+0AjQp63JEZTEMZiwsI9g0+hAMNohwUOtY0RPGexmc= ++github.com/ebitengine/purego v0.8.3/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= + github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= + github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= + github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index 453cdd80532c..166d1df5e30b 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (final: { pname = "glaze"; - version = "5.0.1"; + version = "5.2.1"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; rev = "v${final.version}"; - hash = "sha256-9ru8T0xUmkKBg6rNg+myzU8bjqWkQGG2B0APPHjyAAE="; + hash = "sha256-DiKjik8u07dRAhXDCXJy0UKyoripzgnGRzB4pNlZ+lg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gl/glbinding/package.nix b/pkgs/by-name/gl/glbinding/package.nix index fdddc56879b9..b965149ae64d 100644 --- a/pkgs/by-name/gl/glbinding/package.nix +++ b/pkgs/by-name/gl/glbinding/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "glbinding"; - version = "3.3.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "cginternals"; repo = "glbinding"; rev = "v${version}"; - sha256 = "sha256-xmEXZ1ssXzrElqd6D1zooFxLEyspsF4Dau3d9+1/2yw="; + sha256 = "sha256-oLtOsiXfl/18rY/89vl9JDDWpPmEELOFKAHuClveU0c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix new file mode 100644 index 000000000000..f5bf49d08e5f --- /dev/null +++ b/pkgs/by-name/gl/gleam/package.nix @@ -0,0 +1,59 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + git, + pkg-config, + openssl, + erlang_27, + nodejs, + bun, + deno, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "gleam"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "gleam-lang"; + repo = "gleam"; + tag = "v${finalAttrs.version}"; + hash = "sha256-0qK9dWkKnoXbIIBMN3p5noPEke/bgC8Bjtmf6lwtyr4="; + }; + + cargoHash = "sha256-EoRu8p6cUe1li54nVUkf+3qywIsDXh4ptIVLluJ3eFs="; + + nativeBuildInputs = [ + git + pkg-config + erlang_27 + nodejs + bun + deno + ]; + + buildInputs = [ openssl ]; + + checkFlags = [ + # Makes a network request + "--skip=tests::echo::echo_dict" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Statically typed language for the Erlang VM"; + mainProgram = "gleam"; + homepage = "https://gleam.run/"; + changelog = "https://github.com/gleam-lang/gleam/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.philtaken ]; + teams = [ lib.teams.beam ]; + }; +}) diff --git a/pkgs/by-name/gl/glib-networking/package.nix b/pkgs/by-name/gl/glib-networking/package.nix index 13bf9c1b5b82..d699dadd2e2a 100644 --- a/pkgs/by-name/gl/glib-networking/package.nix +++ b/pkgs/by-name/gl/glib-networking/package.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { description = "Network-related giomodules for glib"; homepage = "https://gitlab.gnome.org/GNOME/glib-networking"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; badPlatforms = [ # GIO shared modules are mandatory. diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index f252df75413f..a6485367bad9 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -31,8 +31,6 @@ tzdata, desktop-file-utils, shared-mime-info, - darwin, - makeHardcodeGsettingsPatch, testers, gobject-introspection, libsystemtap, @@ -76,7 +74,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.82.5"; + version = "2.84.1"; outputs = [ "bin" @@ -89,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-BcIDH5vfa1q6egbKhPC0rO0osZvxtQxqslzGdSd8vD8="; + hash = "sha256-K0vC7ElhGl/DX4asqFXy7QGW5p5TCSura7czlr8weJo="; }; patches = @@ -178,18 +176,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux util-linuxMinimal # for libmount - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Carbon - Cocoa - CoreFoundation - CoreServices - Foundation - ] - ); + ]; depsBuildBuild = [ pkg-config # required to find native gi-docgen @@ -377,30 +364,17 @@ stdenv.mkDerivation (finalAttrs: { packageName = "glib"; versionPolicy = "odd-unstable"; }; - - mkHardcodeGsettingsPatch = - { - src, - glib-schema-to-var, - }: - builtins.trace - "glib.mkHardcodeGsettingsPatch is deprecated, please use makeHardcodeGsettingsPatch instead" - (makeHardcodeGsettingsPatch { - inherit src; - schemaIdToVariableMapping = glib-schema-to-var; - }); }; meta = with lib; { description = "C library of programming buildings blocks"; homepage = "https://gitlab.gnome.org/GNOME/glib"; license = licenses.lgpl21Plus; - maintainers = - teams.gnome.members - ++ (with maintainers; [ - lovek323 - raskin - ]); + maintainers = with maintainers; [ + lovek323 + raskin + ]; + teams = [ teams.gnome ]; pkgConfigModules = [ "gio-2.0" "gobject-2.0" diff --git a/pkgs/by-name/gl/glicol-cli/package.nix b/pkgs/by-name/gl/glicol-cli/package.nix index 3bb374b47600..e432df1a798d 100644 --- a/pkgs/by-name/gl/glicol-cli/package.nix +++ b/pkgs/by-name/gl/glicol-cli/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pkg-config, stdenv, - darwin, alsa-lib, }: @@ -27,13 +26,9 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AudioUnit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; meta = with lib; { description = "Cross-platform music live coding in terminal"; diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix index f17f728f62f8..34a157cec600 100644 --- a/pkgs/by-name/gl/glitchtip/frontend.nix +++ b/pkgs/by-name/gl/glitchtip/frontend.nix @@ -2,29 +2,36 @@ lib, fetchFromGitLab, buildNpmPackage, + fetchNpmDeps, jq, moreutils, }: buildNpmPackage (finalAttrs: { pname = "glitchtip-frontend"; - version = "4.2.5"; + version = "4.2.10"; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-yLpDjHnt8ZwpT+KlmEtXMYgrpnbYlVzJ/MZMELVO/j8="; + hash = "sha256-6ZOwAP6VB/uBrV6Yjc9jvzTNdfInekbLO/9PO57S9X8="; }; - npmDepsHash = "sha256-sR/p/JRVuaemN1euZ/VrJ0j1q7fkS/Zi6R1m6lPvygs="; + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src; + hash = "sha256-uEyET3y8LfjTasaJ+Hl206/Q7ov69mA7oNa0mhgcUEQ="; + }; postPatch = '' - ${lib.getExe jq} '. + { - "devDependencies": .devDependencies | del(.cypress, ."cypress-localstorage-commands") - }' package.json | ${lib.getExe' moreutils "sponge"} package.json + jq '.devDependencies |= del(.cypress, ."cypress-localstorage-commands")' package.json | sponge package.json ''; + nativeBuildInputs = [ + moreutils + jq + ]; + buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index bdb275631e8e..83fe0368f370 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -2,6 +2,8 @@ lib, python313, fetchFromGitLab, + fetchFromGitHub, + rustPlatform, callPackage, stdenv, makeWrapper, @@ -10,9 +12,27 @@ let python = python313.override { + self = python; packageOverrides = final: prev: { django = final.django_5; - django-extensions = prev.django-extensions.overridePythonAttrs { doCheck = false; }; + symbolic = prev.symbolic.overridePythonAttrs rec { + version = "10.2.1"; + src = fetchFromGitHub { + owner = "getsentry"; + repo = "symbolic"; + tag = version; + hash = "sha256-3u4MTzaMwryGpFowrAM/MJOmnU8M+Q1/0UtALJib+9A="; + # the `py` directory is not included in the tarball, so we fetch the source via git instead + forceFetchGit = true; + }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src postPatch; + hash = "sha256-cpIVzgcxKfEA5oov6/OaXqknYsYZUoduLTn2qIXGL5U="; + }; + postPatch = '' + ln -s ${./symbolic_Cargo.lock} Cargo.lock + ''; + }; }; }; @@ -25,7 +45,6 @@ let brotli celery celery-batches - dj-stripe django django-allauth django-anymail @@ -39,7 +58,6 @@ let django-organizations django-prometheus django-redis - django-sql-utils django-storages google-cloud-logging gunicorn @@ -69,14 +87,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glitchtip"; - version = "4.2.5"; + version = "4.2.10"; pyproject = true; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-backend"; tag = "v${finalAttrs.version}"; - hash = "sha256-OTf2rvx+ONnB7pLB7rinztXL7l2eZfIuI7PosCXaOH8="; + hash = "sha256-EGk/mhDlqGrJm/j5rTKeKRkJ/fRTspwtPJ+5OHwplfM="; }; propagatedBuildInputs = pythonPackages; diff --git a/pkgs/development/python-modules/symbolic/Cargo.lock b/pkgs/by-name/gl/glitchtip/symbolic_Cargo.lock similarity index 100% rename from pkgs/development/python-modules/symbolic/Cargo.lock rename to pkgs/by-name/gl/glitchtip/symbolic_Cargo.lock diff --git a/pkgs/by-name/gl/glitchtip/update.sh b/pkgs/by-name/gl/glitchtip/update.sh index 7076d162d211..e0a5cf370e59 100755 --- a/pkgs/by-name/gl/glitchtip/update.sh +++ b/pkgs/by-name/gl/glitchtip/update.sh @@ -1,5 +1,9 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update +#!nix-shell -i bash -p curl jq nix-update -nix-update glitchtip -nix-update glitchtip.frontend +set -eou pipefail + +version=$(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gitlab.com/api/v4/projects/15450933/repository/tags | jq -r '.[0].name') + +nix-update --version="$version" glitchtip +nix-update --version="$version" glitchtip.frontend diff --git a/pkgs/by-name/gl/globalarrays/package.nix b/pkgs/by-name/gl/globalarrays/package.nix index c0fafce47561..f34c7e388689 100644 --- a/pkgs/by-name/gl/globalarrays/package.nix +++ b/pkgs/by-name/gl/globalarrays/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "globalarrays"; - version = "5.9.1"; + version = "5.9.2"; src = fetchFromGitHub { owner = "GlobalArrays"; repo = "ga"; rev = "v${version}"; - sha256 = "sha256-bMX538yen9cINPCtgf7SUGGsNRJugMrveqXtChHzPkk="; + sha256 = "sha256-leCvbWteOp7z7ORwtljA+KslHUptY2vdupZTmAjsArg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/globalplatform/package.nix b/pkgs/by-name/gl/globalplatform/package.nix index 6da23ccfb95d..ed6469b940b0 100644 --- a/pkgs/by-name/gl/globalplatform/package.nix +++ b/pkgs/by-name/gl/globalplatform/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, pcsclite, - PCSC, pkg-config, cmake, zlib, @@ -40,9 +39,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - PCSC ]; cmakeFlags = [ diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 3886d04d19c8..91b809e31ccd 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.18.13"; + version = "1.18.17"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-qn4hQKl3E36q7HsgOVWz+eRceKGysyy5rHXzQnOc7JY="; + hash = "sha256-WaQXS7/Rsl7jGfwcfwI4IAvWACR6CU+w+95JL3T2Coo="; }; - vendorHash = "sha256-lcnsmeZ2XobBE95KqIhUZCKmevg2WEGuZC4qUVkdafM="; + vendorHash = "sha256-QS/fYVIMOqVNkej9xtim0bgKOLazwBkKpcjz1YPzQOo="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix index b38857429a3a..2e9ffec1a146 100644 --- a/pkgs/by-name/gl/glpi-agent/package.nix +++ b/pkgs/by-name/gl/glpi-agent/package.nix @@ -118,7 +118,7 @@ perlPackages.buildPerlPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gl/glpk/package.nix b/pkgs/by-name/gl/glpk/package.nix index bc7ae7c9e575..012865ab26b9 100644 --- a/pkgs/by-name/gl/glpk/package.nix +++ b/pkgs/by-name/gl/glpk/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/glpk/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ] ++ teams.sage.members; + teams = [ teams.sage ]; mainProgram = "glpsol"; platforms = platforms.all; }; diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix index fc2de8e52d78..feacb5843dbe 100644 --- a/pkgs/by-name/gl/glrnvim/package.nix +++ b/pkgs/by-name/gl/glrnvim/package.nix @@ -1,32 +1,22 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { pname = "glrnvim"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "beeender"; repo = "glrnvim"; rev = "v${version}"; - hash = "sha256-n3t3s3fzmBGXRDydYxNJ13itKul8dyLNW6HP8Di4hY0="; + hash = "sha256-fyJ3k1CBrxL6It8x9jNumzCuhXug6eB/fuvPUQYEc4A="; }; useFetchCargoVendor = true; - cargoHash = "sha256-oE1HXmJbKHegubqhsovat1ce/4rjdKGGTnmDdbRBo/k="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - DiskArbitration - Foundation - ] - ); + cargoHash = "sha256-xDa2aMWx09dEbRDops2HwYSl/KMA7CeFqS2bnxX/8w8="; postInstall = '' install -Dm644 glrnvim.desktop -t $out/share/applications diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix index 6feecafc1612..47fcfdf24115 100644 --- a/pkgs/by-name/gl/glslang/package.nix +++ b/pkgs/by-name/gl/glslang/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "15.1.0"; + version = "15.3.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-E1Zenf7XSGoozx4hxdOlMu+XZ6mJROSu7jIVYPWe3go="; + hash = "sha256-HwFP4KJuA+BMQVvBWV0BCRj9U5I3CLEU+5bBtde2f6w="; }; outputs = [ diff --git a/pkgs/by-name/gl/glslviewer/package.nix b/pkgs/by-name/gl/glslviewer/package.nix new file mode 100644 index 000000000000..35d4a06a2d87 --- /dev/null +++ b/pkgs/by-name/gl/glslviewer/package.nix @@ -0,0 +1,55 @@ +{ + stdenv, + cmake, + ninja, + lib, + fetchFromGitHub, + pkg-config, + libX11, + libXrandr, + libXinerama, + libXcursor, + libXi, + libXext, + libGLU, + ffmpeg, + ncurses, +}: +stdenv.mkDerivation rec { + pname = "glslviewer"; + version = "3.2.4"; + src = fetchFromGitHub { + owner = "patriciogonzalezvivo"; + repo = "glslViewer"; + fetchSubmodules = true; + rev = version; + hash = "sha256-Ve3wmX5+kABCu8IRe4ySrwsBJm47g1zvMqDbqrpQl88="; + }; + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + buildInputs = [ + libX11 + libXrandr + libXinerama + libXcursor + libXi + libXext + libGLU + ncurses + ffmpeg + ]; + + meta = with lib; { + description = "Live GLSL coding renderer"; + homepage = "https://patriciogonzalezvivo.com/2015/glslViewer/"; + license = licenses.bsd3; + maintainers = [ maintainers.hodapp ]; + platforms = platforms.unix; + mainProgram = "glslViewer"; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch b/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch index f05edf96a72a..27b4b1401588 100644 --- a/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch +++ b/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch @@ -1,17 +1,17 @@ diff --git a/vendor/glycin/src/sandbox.rs b/vendor/glycin/src/sandbox.rs -index 7d00b36..aa70dc7 100644 +index 08db832..4f44b21 100644 --- a/vendor/glycin/src/sandbox.rs +++ b/vendor/glycin/src/sandbox.rs -@@ -165,7 +165,7 @@ impl Sandbox { +@@ -202,7 +202,7 @@ impl Sandbox { - args.push(self.command); + args.push(self.exec()); - ("bwrap".into(), args, Some(seccomp_memfd)) + ("@bwrap@".into(), args, Some(seccomp_memfd)) } SandboxMechanism::FlatpakSpawn => { let memory_limit = Self::memory_limit(); -@@ -233,8 +233,8 @@ impl Sandbox { +@@ -299,8 +299,8 @@ impl Sandbox { "/", // Make /usr available as read only "--ro-bind", diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index 8727e5468ef7..30cb241f5dec 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "glycin-loaders"; - version = "1.1.6"; + version = "1.2.1"; src = fetchurl { url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz"; - hash = "sha256-2EzFaBTyKEEArTQ5pDCDe7IfD5jUbg0rWGifLBlwjwQ="; + hash = "sha256-zMV46aPoPQ3BU1c30f2gm6qVxxZ/Xl7LFfeGZUCU7tU="; }; patches = [ @@ -81,8 +81,8 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Glycin loaders for several formats"; - homepage = "https://gitlab.gnome.org/sophie-h/glycin"; - maintainers = teams.gnome.members; + homepage = "https://gitlab.gnome.org/GNOME/glycin"; + teams = [ teams.gnome ]; license = with licenses; [ mpl20 # or lgpl21Plus diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index 4a07ba02bcef..629097841c03 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -100,7 +100,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "ENABLE_DYNAMIC_LINKING" true) (lib.cmakeBool "ENABLE_SYSTEM_GMIC" true) - (lib.cmakeFeature "GMIC_QT_HOST" (if variant == "standalone" then "none" else variant)) + (lib.cmakeFeature "GMIC_QT_HOST" ( + if variant == "standalone" then + "none" + else if variant == "gimp" && gimp.majorVersion == "3.0" then + "gimp3" + else + variant + )) ]; postFixup = lib.optionalString (variant == "gimp") '' diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 91443aed737f..0428f87e21f1 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gmic"; - version = "3.5.3"; + version = "3.5.4"; outputs = [ "out" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GreycLab"; repo = "gmic"; rev = "v.${finalAttrs.version}"; - hash = "sha256-DO9BtU0TW1HzCgrwx4Hocxlhl+tO0IztifqBloqmmtM="; + hash = "sha256-WhhEBhwv2bBwsWPPMDIA2jhUzqcD6yJhHg1Eunu8y14="; }; # TODO: build this from source @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gmic.eu/gmic_stdlib_community${ lib.replaceStrings [ "." ] [ "" ] finalAttrs.version }.h"; - hash = "sha256-LWAzg72MZ4kOTAS+2xwR3iVY8vPch3NAjx/uXX2Y0W4="; + hash = "sha256-JO8ijrOgrOq7lB8NaxnlsQhDXSMgAGQlOG3lT9NfuMw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gm/gmni/package.nix b/pkgs/by-name/gm/gmni/package.nix deleted file mode 100644 index 47d3487767ae..000000000000 --- a/pkgs/by-name/gm/gmni/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenv, - lib, - fetchFromSourcehut, - bearssl, - scdoc, -}: - -stdenv.mkDerivation rec { - pname = "gmni"; - version = "1.0"; - - src = fetchFromSourcehut { - owner = "~sircmpwn"; - repo = "gmni"; - rev = version; - sha256 = "sha256-3MFNAI/SfFigNfitfFs3o9kkz7JeEflMHiH7iJpLfi4="; - }; - - nativeBuildInputs = [ scdoc ]; - buildInputs = [ bearssl ]; - - # Fix build on `gcc-13`: - # inlined from 'xt_end_chain' at src/tofu.c:82:3, - # ...-glibc-2.38-27-dev/include/bits/stdio2.h:54:10: error: '__builtin___snprintf_chk' specified bound 4 exceeds destination size 3 [-Werror=stringop-overflow] - # - # The overflow will not happen in practice, but `snprintf()` gets - # passed one more byte than available. - hardeningDisable = [ "fortify3" ]; - - meta = with lib; { - description = "Gemini client"; - homepage = "https://git.sr.ht/~sircmpwn/gmni"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ - bsima - jb55 - ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/gm/gmsh/fix-python.patch b/pkgs/by-name/gm/gmsh/fix-python.patch deleted file mode 100644 index 41c5c3b8f976..000000000000 --- a/pkgs/by-name/gm/gmsh/fix-python.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/api/gmsh.py b/api/gmsh.py -index f525284..a225c85 100644 ---- a/api/gmsh.py -+++ b/api/gmsh.py -@@ -78,6 +78,8 @@ if not libpath: - else: - libpath = find_library("gmsh") - -+libpath = "@LIBPATH@" -+ - # ... and print a warning if everything failed - if not libpath: - print("Warning: could not find Gmsh shared library " + libname + diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index c3c7092d0b79..dd3d3efd0a31 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -15,6 +15,7 @@ libGLU, xorg, opencascade-occt, + llvmPackages, python ? null, enablePython ? false, }: @@ -54,12 +55,12 @@ stdenv.mkDerivation rec { xorg.libSM xorg.libICE ] + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp ++ lib.optional enablePython python; enableParallelBuilding = true; patches = [ - ./fix-python.patch (fetchpatch { url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/7d5094fb0a5245cb435afd3f3e8c35e2ecfe70fd.patch"; hash = "sha256-3atm1NGsMI4KEct2xakRG6EasRpF6YRI4raoVYxBV4g="; @@ -67,7 +68,8 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace api/gmsh.py --subst-var-by LIBPATH ${placeholder "out"}/lib/libgmsh.so + substituteInPlace api/gmsh.py \ + --replace-fail 'find_library("gmsh")' \"$out/lib/libgmsh${stdenv.hostPlatform.extensions.sharedLibrary}\" ''; # N.B. the shared object is used by bindings diff --git a/pkgs/by-name/gm/gmt/package.nix b/pkgs/by-name/gm/gmt/package.nix index b4d4f268fe15..4f688d9b8041 100644 --- a/pkgs/by-name/gm/gmt/package.nix +++ b/pkgs/by-name/gm/gmt/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, curl, - darwin, + apple-sdk, fftwSinglePrec, netcdf, pcre, @@ -34,8 +34,7 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration " + lib.optionalString ( - stdenv.hostPlatform.isDarwin - && lib.versionOlder (darwin.apple_sdk.MacOSX-SDK.version or darwin.apple_sdk.sdk.version) "13.3" + stdenv.hostPlatform.isDarwin && lib.versionOlder apple-sdk.version "13.3" ) "-D__LAPACK_int=int"; }; @@ -48,21 +47,11 @@ stdenv.mkDerivation (finalAttrs: { dcw-gmt gshhg-gmt ] - ++ ( - if stdenv.hostPlatform.isDarwin then - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreGraphics - CoreVideo - ] - else - [ - fftwSinglePrec - blas - lapack - ] - ); + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + fftwSinglePrec + blas + lapack + ]; propagatedBuildInputs = [ ghostscript ]; diff --git a/pkgs/by-name/gn/gn/generic.nix b/pkgs/by-name/gn/gn/generic.nix index 218a46d3fb98..ca28240fa705 100644 --- a/pkgs/by-name/gn/gn/generic.nix +++ b/pkgs/by-name/gn/gn/generic.nix @@ -4,7 +4,6 @@ fetchgit, fetchpatch, cctools, - darwin, writeText, ninja, python3, @@ -54,19 +53,9 @@ stdenv.mkDerivation { ninja python3 ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin; - with apple_sdk.frameworks; - [ - libobjc - cctools - - # frameworks - ApplicationServices - Foundation - AppKit - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ]; env.NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix index 73fe10e42abe..34e558286453 100644 --- a/pkgs/by-name/gn/gnmic/package.nix +++ b/pkgs/by-name/gn/gnmic/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "openconfig"; - repo = pname; - rev = "v${version}"; - hash = "sha256-rdT1gCALEsPiyN+4RKmJ36CUkYmbkIyi56JjVkzzkp8="; + repo = "gnmic"; + tag = "v${version}"; + hash = "sha256-tuEkpuUs245jj0/wzZjqTWeMZNJhiylZD7e0XOc/c14="; }; - vendorHash = "sha256-n4HBm9n3RkSmAkd29dhDN0tZ/bjVCBzQSihgY8VA1L4="; + vendorHash = "sha256-piHSVATQjHjKIWNIjm8p2A0ivQzDR2PQj0ovfYDk/FA="; ldflags = [ "-s" diff --git a/pkgs/by-name/gn/gnome-2048/package.nix b/pkgs/by-name/gn/gnome-2048/package.nix index 2a1e8cf1c613..b1fdc633125d 100644 --- a/pkgs/by-name/gn/gnome-2048/package.nix +++ b/pkgs/by-name/gn/gnome-2048/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/gnome-2048/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Obtain the 2048 tile"; mainProgram = "gnome-2048"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-applets/package.nix b/pkgs/by-name/gn/gnome-applets/package.nix index 2ef3e827107d..e5f866eac2ce 100644 --- a/pkgs/by-name/gn/gnome-applets/package.nix +++ b/pkgs/by-name/gn/gnome-applets/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-applets"; - version = "3.54.0"; + version = "3.56.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz"; - hash = "sha256-FASM8amK2U4U715E/f6IVvo/KDZAHHkr/83mi4db2vk="; + hash = "sha256-+heu3JVa3ZgaouQ7TAcTU/aGu9HuwdcXqJCnNTIK0XE="; }; nativeBuildInputs = [ @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/gnome-applets"; changelog = "https://gitlab.gnome.org/GNOME/gnome-applets/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/gn/gnome-autoar/package.nix b/pkgs/by-name/gn/gnome-autoar/package.nix index aefc9e0c1fe5..467b32307c63 100644 --- a/pkgs/by-name/gn/gnome-autoar/package.nix +++ b/pkgs/by-name/gn/gnome-autoar/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.lgpl21Plus; description = "Library to integrate compressed files management with GNOME"; }; diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix index 442d48659037..b727b46f8cb2 100644 --- a/pkgs/by-name/gn/gnome-backgrounds/package.nix +++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "47.0"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz"; - hash = "sha256-h0pKOcQmFzb2qFRyKDNAC2EkQcRoGqWYLZCxWryckf0="; + hash = "sha256-LWuqAR7peATHVh9+HL2NR2PjC1W4gY3aePn3WvuNjQU="; }; patches = [ @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.cc-by-sa-30; platforms = platforms.unix; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/gn/gnome-bluetooth/package.nix b/pkgs/by-name/gn/gnome-bluetooth/package.nix index ca5d61a3c3f4..01043b9d5f5e 100644 --- a/pkgs/by-name/gn/gnome-bluetooth/package.nix +++ b/pkgs/by-name/gn/gnome-bluetooth/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Application that lets you manage Bluetooth in the GNOME desktop"; mainProgram = "bluetooth-sendto"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-boxes/package.nix b/pkgs/by-name/gn/gnome-boxes/package.nix index 70c1f03eb141..a5bc86e04ea0 100644 --- a/pkgs/by-name/gn/gnome-boxes/package.nix +++ b/pkgs/by-name/gn/gnome-boxes/package.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "47.0"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major version}/gnome-boxes-${version}.tar.xz"; - hash = "sha256-Zb9sLeG/TVFpXJGSxbHmKFyzLJihiqlIo3bqMgOLx48="; + hash = "sha256-0F9fQlaPr79tiHcRYbBu1fc51DEhJ41BjK6VxW5RPq0="; }; patches = [ @@ -137,6 +137,6 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/Boxes/"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/gn/gnome-browser-connector/package.nix b/pkgs/by-name/gn/gnome-browser-connector/package.nix index 05fbfd797849..e166952c78ac 100644 --- a/pkgs/by-name/gn/gnome-browser-connector/package.nix +++ b/pkgs/by-name/gn/gnome-browser-connector/package.nix @@ -63,7 +63,7 @@ buildPythonApplication rec { To use the integration, install the [browser extension](https://gitlab.gnome.org/GNOME/gnome-browser-extension), and then set `services.gnome.gnome-browser-connector.enable` to `true`. ''; license = licenses.gpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix index eff3dc8ae526..429899d4c2f9 100644 --- a/pkgs/by-name/gn/gnome-builder/package.nix +++ b/pkgs/by-name/gn/gnome-builder/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-builder"; - version = "47.2"; + version = "48.0"; outputs = [ "out" @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz"; - hash = "sha256-Roe5PEfNHjNmWi3FA3kLYhPugnhy/ABNl40UvL+ptJU="; + hash = "sha256-ev6aejs8ZiF2i8RqYdaY3XiLNlP7RqcII4vcz03me6Q="; }; patches = [ @@ -175,7 +175,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://apps.gnome.org/Builder/"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; mainProgram = "gnome-builder"; }; diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index e9f6d8c126c1..f0e5454cd4dc 100644 --- a/pkgs/by-name/gn/gnome-calculator/package.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "47.1"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz"; - hash = "sha256-vp+SJ5m35+ZclzSLm35kf/4zyDG7OlHTniwWjSrcQOA="; + hash = "sha256-vEvUGpuhkPRcvuDYxnUs3F0osM7xxr0MAeLa4fPBkWI="; }; nativeBuildInputs = [ @@ -74,7 +74,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://apps.gnome.org/Calculator/"; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = teams.gnome.members; + mainProgram = "gnome-calculator"; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix index f49b00e5e307..b457a6c1b67d 100644 --- a/pkgs/by-name/gn/gnome-calendar/package.nix +++ b/pkgs/by-name/gn/gnome-calendar/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "47.0"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz"; - hash = "sha256-OwMxPxxNEtyCHgfiCdFZbVPq+iVdSS0s5av5LtG1HnY="; + hash = "sha256-Bs6t1cAL6ONYGB1CHs8mgs4K6i/LEtkDsw0pyjMonwI="; }; nativeBuildInputs = [ @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/Calendar/"; description = "Simple and beautiful calendar application for GNOME"; mainProgram = "gnome-calendar"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix index f827feae8bd6..73d26f0c44cc 100644 --- a/pkgs/by-name/gn/gnome-characters/package.nix +++ b/pkgs/by-name/gn/gnome-characters/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "47.0"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz"; - hash = "sha256-a88Foi8w8THYqANbD2PYapVnAHpfbfXOhVa6Bnd7dXQ="; + hash = "sha256-osMspU2RHbJARCA1DTRC5pGi3Oiw9dAImfZs/4w8jXE="; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/Characters/"; description = "Simple utility application to find and insert unusual characters"; mainProgram = "gnome-characters"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-chess/package.nix b/pkgs/by-name/gn/gnome-chess/package.nix index 25f54ad45c96..9c0fb5f950bd 100644 --- a/pkgs/by-name/gn/gnome-chess/package.nix +++ b/pkgs/by-name/gn/gnome-chess/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "47.0"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/gnome-chess-${version}.tar.xz"; - hash = "sha256-OkQ6LHiA5q0TG3Wt2AdO2+WYK3aruEKQT+PfnCxQ6H4="; + hash = "sha256-eDTEdvCLvyd5BrApNjLtMugDdMuUQyayGeqQVqapXz8="; }; nativeBuildInputs = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-chess"; description = "Play the classic two-player boardgame of chess"; mainProgram = "gnome-chess"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gn/gnome-clocks/package.nix b/pkgs/by-name/gn/gnome-clocks/package.nix index e99e6bcdb580..f27bdc255fbd 100644 --- a/pkgs/by-name/gn/gnome-clocks/package.nix +++ b/pkgs/by-name/gn/gnome-clocks/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-clocks"; - version = "47.0"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major finalAttrs.version}/gnome-clocks-${finalAttrs.version}.tar.xz"; - hash = "sha256-QovfS9F+Jt5s7wFM16fuvYkUPD8nMrJLfaaYErqlITE="; + hash = "sha256-YW7h+3UwCx8muXZiGelUdRNgyg+g9JExG8+DvzgIfGI="; }; nativeBuildInputs = [ @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { - Set timers to properly cook your food ''; mainProgram = "gnome-clocks"; - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/gn/gnome-color-manager/package.nix b/pkgs/by-name/gn/gnome-color-manager/package.nix index 4c9a0eac04ad..27bba37f42af 100644 --- a/pkgs/by-name/gn/gnome-color-manager/package.nix +++ b/pkgs/by-name/gn/gnome-color-manager/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of graphical utilities for color management to be used in the GNOME desktop"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/gn/gnome-common/package.nix b/pkgs/by-name/gn/gnome-common/package.nix index 9a5393a27a8a..592b7e8754a8 100644 --- a/pkgs/by-name/gn/gnome-common/package.nix +++ b/pkgs/by-name/gn/gnome-common/package.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { ]; # autogen.sh which is using gnome-common tends to require which meta = with lib; { - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/gn/gnome-connections/package.nix b/pkgs/by-name/gn/gnome-connections/package.nix index 83870607e259..7213e140b894 100644 --- a/pkgs/by-name/gn/gnome-connections/package.nix +++ b/pkgs/by-name/gn/gnome-connections/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-connections"; - version = "47.2.1"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-connections/${lib.versions.major finalAttrs.version}/gnome-connections-${finalAttrs.version}.tar.xz"; - hash = "sha256-BSPjy4edSsC5Xn7l8y22YSi1q4QE/xGSMHHNVs/k2Lg="; + hash = "sha256-Nw75QFBrVybG8rfLl5ayI9HW1Chfg8/DOFvWdMMon9A="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/gnome-connections/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Remote desktop client for the GNOME desktop environment"; mainProgram = "gnome-connections"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix index fbe20611fdf2..ead44457a72e 100644 --- a/pkgs/by-name/gn/gnome-console/package.nix +++ b/pkgs/by-name/gn/gnome-console/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "47.1"; + version = "48.0.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-0/YAtFtRcWaRrukocDMunJqMqJ1VNWXzEx2eKAdHJdA="; + hash = "sha256-AY6Qjk2uvPyxUNTxuyjZgnKqnRTWgV6vjaRfiJ2wXEk="; }; nativeBuildInputs = [ @@ -63,7 +63,8 @@ stdenv.mkDerivation rec { description = "Simple user-friendly terminal emulator for the GNOME desktop"; homepage = "https://gitlab.gnome.org/GNOME/console"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ zhaofengli ]); + maintainers = with maintainers; [ zhaofengli ]; + teams = [ teams.gnome ]; platforms = platforms.unix; mainProgram = "kgx"; }; diff --git a/pkgs/by-name/gn/gnome-contacts/package.nix b/pkgs/by-name/gn/gnome-contacts/package.nix index 5d319e2c8bc9..6addc8e84af3 100644 --- a/pkgs/by-name/gn/gnome-contacts/package.nix +++ b/pkgs/by-name/gn/gnome-contacts/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "47.1.1"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/gnome-contacts-${version}.tar.xz"; - hash = "sha256-R+GuRbcEGgXV4nZJ2RLiwwAlYYisRg7cukaJnGYIpHg="; + hash = "sha256-onYplbWUJ+w/GF8otVlONwd7cqcM18GSF+1jRjfswbU="; }; nativeBuildInputs = [ @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/Contacts/"; description = "GNOME’s integrated address book"; mainProgram = "gnome-contacts"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 681be6eab135..2faeedb56dd3 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -65,6 +65,7 @@ tzdata, udisks2, upower, + wayland-scanner, libepoxy, gnome-user-share, gnome-remote-desktop, @@ -74,11 +75,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "47.4"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-KMfbdNcg/MnyE8EtNy5+rMF2ekm8TKZrK9ILD9ECJmg="; + hash = "sha256-AYPbNlqqj4W0SyPMnK5nXRyDNgSf7BGoym6pvb6MSP4="; }; patches = [ @@ -98,6 +99,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config python3 shared-mime-info + wayland-scanner wrapGAppsHook4 ]; @@ -210,7 +212,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Utilities to configure the GNOME desktop"; mainProgram = "gnome-control-center"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix index a7b599ae12a5..3da03ba6a6da 100644 --- a/pkgs/by-name/gn/gnome-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-desktop/package.nix @@ -112,6 +112,6 @@ stdenv.mkDerivation rec { lgpl2Plus ]; platforms = platforms.unix; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index 70cc891e75a2..6a61d64e49f6 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://apps.gnome.org/DiskUtility/"; description = "Udisks graphical front-end"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; mainProgram = "gnome-disks"; diff --git a/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix b/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix index f8ed99ececda..d20eb6e9183a 100644 --- a/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix +++ b/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "Thumbnailer for EPub and MOBI books"; homepage = "https://gitlab.gnome.org/GNOME/gnome-epub-thumbnailer"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/gn/gnome-firmware/package.nix b/pkgs/by-name/gn/gnome-firmware/package.nix index dc736a30ef2e..2821adcbff51 100644 --- a/pkgs/by-name/gn/gnome-firmware/package.nix +++ b/pkgs/by-name/gn/gnome-firmware/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tool for installing firmware on devices"; mainProgram = "gnome-firmware"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/gn/gnome-flashback/fix-paths.patch b/pkgs/by-name/gn/gnome-flashback/fix-paths.patch new file mode 100644 index 000000000000..f2f37d345ebb --- /dev/null +++ b/pkgs/by-name/gn/gnome-flashback/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/system-indicators/si-input-sources.c b/system-indicators/si-input-sources.c +index f13b262..2186b76 100644 +--- a/system-indicators/si-input-sources.c ++++ b/system-indicators/si-input-sources.c +@@ -807,7 +807,7 @@ spawn_keyboard_display (const char *description) + flags = G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD; + error = NULL; + +- argv[0] = g_strdup ("tecla"); ++ argv[0] = g_strdup ("@tecla@"); + argv[1] = g_strdup (description); + argv[2] = NULL; + diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix index afc747c3a3e8..6d64cd8f16cb 100644 --- a/pkgs/by-name/gn/gnome-flashback/package.nix +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -20,7 +20,9 @@ pkg-config, polkit, gdm, + replaceVars, systemd, + tecla, upower, pam, wrapGAppsHook3, @@ -64,13 +66,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-flashback"; - version = "3.54.0"; + version = "3.56.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz"; - hash = "sha256-gkNa4wLNZK6xG25M0YTaj/+qzSSFFf+gIidZXDzPne4="; + hash = "sha256-LQ+iLzc9sIDq7w5Wk7lijN6ETyVjPVqQMTsEndlSkmA="; }; + patches = [ + (replaceVars ./fix-paths.patch { + tecla = lib.getExe tecla; + }) + ]; + # make .desktop Execs absolute postPatch = '' patch -p0 < 1 + # testfile.vala.c:50:46: error: passing argument 2 of 'adw_about_dialog_set_developers' + # from incompatible pointer type [-Wincompatible-pointer-types] + # 50 | adw_about_dialog_set_developers (ad, s); + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-nibbles"; }; }; @@ -60,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/gnome-nibbles"; changelog = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix index 6dba58e31292..a67795c140bb 100644 --- a/pkgs/by-name/gn/gnome-notes/package.nix +++ b/pkgs/by-name/gn/gnome-notes/package.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { mainProgram = "bijiben"; homepage = "https://gitlab.gnome.org/GNOME/gnome-notes"; license = licenses.gpl3; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/gn/gnome-obfuscate/package.nix b/pkgs/by-name/gn/gnome-obfuscate/package.nix new file mode 100644 index 000000000000..a36d7c8ad0d5 --- /dev/null +++ b/pkgs/by-name/gn/gnome-obfuscate/package.nix @@ -0,0 +1,82 @@ +{ + stdenv, + lib, + fetchFromGitLab, + buildPackages, + cargo, + gettext, + meson, + ninja, + pkg-config, + rustPlatform, + rustc, + wrapGAppsHook4, + appstream-glib, + desktop-file-utils, + glib, + gtk4, + gdk-pixbuf, + libadwaita, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-obfuscate"; + version = "0.0.10"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Obfuscate"; + rev = finalAttrs.version; + hash = "sha256-/Plvvn1tle8t/bsPcsamn5d81CqnyGCyGYPF6j6U5NI="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + name = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-Llgn+dYNKZ9Mles9f9Xor+GZoCCQ0cERkXz4MicZglY="; + }; + + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one. + # The vendored gettext does not build with clang 16. + GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + }; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + cargo + rustc + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + gdk-pixbuf + libadwaita + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Censor private information"; + homepage = "https://gitlab.gnome.org/World/obfuscate"; + license = licenses.gpl3Plus; + platforms = platforms.all; + mainProgram = "obfuscate"; + maintainers = with maintainers; [ fgaz ]; + teams = [ teams.gnome-circle ]; + }; +}) diff --git a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix index d252c33ce474..35397182758d 100644 --- a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/xapp-project/gnome-online-accounts-gtk"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; }) diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix index 7339926f7dc0..9d437660787e 100644 --- a/pkgs/by-name/gn/gnome-online-accounts/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.52.3.1"; + version = "3.54.2"; outputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-Se1yfW/ElHSZb6ft8JGbIeT8hW6jfm4w8XtQsQOvlwE="; + hash = "sha256-D389KcBmb/vMUD8+DzOWNi7/25MX1BZkzmXfFH7zU3I="; }; mesonFlags = [ @@ -109,6 +109,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Single sign-on framework for GNOME"; platforms = platforms.unix; license = licenses.lgpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; }) diff --git a/pkgs/by-name/gn/gnome-packagekit/package.nix b/pkgs/by-name/gn/gnome-packagekit/package.nix index 6ab6363dc50d..3ef7ac41da7d 100644 --- a/pkgs/by-name/gn/gnome-packagekit/package.nix +++ b/pkgs/by-name/gn/gnome-packagekit/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.freedesktop.org/software/PackageKit/"; platforms = platforms.linux; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2; description = "Tools for installing software on the GNOME desktop using PackageKit"; }; diff --git a/pkgs/by-name/gn/gnome-panel/package.nix b/pkgs/by-name/gn/gnome-panel/package.nix index 80c49fda4017..4ab8da344c09 100644 --- a/pkgs/by-name/gn/gnome-panel/package.nix +++ b/pkgs/by-name/gn/gnome-panel/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-panel"; - version = "3.54.0"; + version = "3.56.0"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-panel/${lib.versions.majorMinor finalAttrs.version}/gnome-panel-${finalAttrs.version}.tar.xz"; - hash = "sha256-lLnNUcpQ/zKiic1QWRNuexYMHxJrXWZp4QbcqIUEXCg="; + hash = "sha256-UoptZ92E7a5sgKXuZW+E+9lC87Nx1g+XottgZc9P0XA="; }; patches = [ @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/gnome-panel"; changelog = "https://gitlab.gnome.org/GNOME/gnome-panel/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/gn/gnome-photos/package.nix b/pkgs/by-name/gn/gnome-photos/package.nix index 199fa1f21246..071cd906ffd9 100644 --- a/pkgs/by-name/gn/gnome-photos/package.nix +++ b/pkgs/by-name/gn/gnome-photos/package.nix @@ -6,7 +6,7 @@ babl, dbus, desktop-file-utils, - dleyna-renderer, + dleyna, gdk-pixbuf, gegl, geocode-glib_2, @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { buildInputs = [ babl dbus - dleyna-renderer + dleyna gdk-pixbuf gegl geocode-glib_2 @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { mainProgram = "gnome-photos"; homepage = "https://gitlab.gnome.org/GNOME/gnome-photos"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/gn/gnome-podcasts/package.nix b/pkgs/by-name/gn/gnome-podcasts/package.nix index d5927edfe385..599e5401935c 100644 --- a/pkgs/by-name/gn/gnome-podcasts/package.nix +++ b/pkgs/by-name/gn/gnome-podcasts/package.nix @@ -23,21 +23,21 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-podcasts"; - version = "0.7.2"; + version = "25.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "podcasts"; - rev = version; - hash = "sha256-xPB1ieOgnHe2R5ORK0Hl61V+iDZ7WsJEnsAJGZvQUVI="; + tag = finalAttrs.version; + hash = "sha256-pVGut7kmwybPrR7ZaXPoDx03FOYeZSvchXl++2cdPck="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - hash = "sha256-Nzfsr1OFw7DnxrNol00BI9WIe1Tau3z/R4zdF0PaBOk="; + inherit (finalAttrs) pname version src; + hash = "sha256-HKU4rd5OzxhYcN6QKiTVj+NnkdyG8T+D6X1txznZ/xM="; }; nativeBuildInputs = [ @@ -78,9 +78,13 @@ stdenv.mkDerivation rec { description = "Listen to your favorite podcasts"; mainProgram = "gnome-podcasts"; homepage = "https://apps.gnome.org/Podcasts/"; + changelog = "https://gitlab.gnome.org/World/podcasts/-/releases/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = lib.teams.gnome.members ++ lib.teams.gnome-circle.members; + teams = [ + lib.teams.gnome + lib.teams.gnome-circle + ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin }; -} +}) diff --git a/pkgs/by-name/gn/gnome-power-manager/package.nix b/pkgs/by-name/gn/gnome-power-manager/package.nix index ac807494d33d..6a2fafad49c2 100644 --- a/pkgs/by-name/gn/gnome-power-manager/package.nix +++ b/pkgs/by-name/gn/gnome-power-manager/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-power-manager"; description = "View battery and power statistics provided by UPower"; mainProgram = "gnome-power-statistics"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-recipes/package.nix b/pkgs/by-name/gn/gnome-recipes/package.nix index a3fe050d1dd8..b2e7461a3b6d 100644 --- a/pkgs/by-name/gn/gnome-recipes/package.nix +++ b/pkgs/by-name/gn/gnome-recipes/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { description = "Recipe management application for GNOME"; mainProgram = "gnome-recipes"; homepage = "https://gitlab.gnome.org/GNOME/recipes"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index f4f8091d28e5..b34c9e6eae5b 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -13,6 +13,9 @@ libei, libepoxy, libdrm, + libva, + vulkan-loader, + shaderc, nv-codec-headers-11, pipewire, systemd, @@ -31,11 +34,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "47.3"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz"; - hash = "sha256-QE2wiHLmkDlD4nUam2Myf2NZcKnKodL2dTCcpEV8+cI="; + hash = "sha256-vPN3D8oPrtovrjsaP/by6QoCd492pC6P0QPK4YYo9PI="; }; nativeBuildInputs = [ @@ -44,6 +47,7 @@ stdenv.mkDerivation rec { pkg-config python3 asciidoc + shaderc # for glslc wrapGAppsHook3 ]; @@ -58,6 +62,8 @@ stdenv.mkDerivation rec { libei libepoxy libdrm + libva + vulkan-loader nv-codec-headers-11 libnotify libopus @@ -88,7 +94,7 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/blob/${version}/NEWS?ref_type=tags"; description = "GNOME Remote Desktop server"; mainProgram = "grdctl"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-robots/package.nix b/pkgs/by-name/gn/gnome-robots/package.nix index b34f8a5c8c0b..f6552990ece8 100644 --- a/pkgs/by-name/gn/gnome-robots/package.nix +++ b/pkgs/by-name/gn/gnome-robots/package.nix @@ -24,17 +24,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-robots"; - version = "41.1"; + version = "41.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-robots/${lib.versions.major finalAttrs.version}/gnome-robots-${finalAttrs.version}.tar.xz"; - hash = "sha256-K4BQcFrIPpOL56iREyYB62XHk/IJzX6RDGzWQphzBHg="; + hash = "sha256-kSHC+DaBIEP+7yumYc1dD9SOPWMZxDlBuf3RWLmw65E="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "gnome-robots-${finalAttrs.version}"; - hash = "sha256-7kwjpZJqAqqKlt6mOFyjaaxZ1Tr2WuhE72jwjCZpX9E="; + hash = "sha256-1h9+XPmkapzdYsI6qtPPHtlwEEmyIzaAogLiYvIHJak="; }; nativeBuildInputs = [ @@ -62,12 +62,6 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-good ]; - postPatch = '' - # https://gitlab.gnome.org/GNOME/gnome-robots/-/merge_requests/38 - substituteInPlace data/icons/meson.build \ - --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' - ''; - preFixup = '' # Seal GStreamer plug-ins so that we can notice when they are missing. gappsWrapperArgs+=(--set "GST_PLUGIN_SYSTEM_PATH_1_0" "$GST_PLUGIN_SYSTEM_PATH_1_0") @@ -91,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { common-updater-scripts ] } - update-source-version gnome-robots --ignore-same-version --source-key=cargoDeps > /dev/null + update-source-version gnome-robots --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null '' ]; # Experimental feature: do not copy! @@ -109,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/gnome-robots/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Avoid the robots and make them crash into each other"; mainProgram = "gnome-robots"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gn/gnome-screenshot/package.nix b/pkgs/by-name/gn/gnome-screenshot/package.nix index 1509e559ac3f..cd414c82e248 100644 --- a/pkgs/by-name/gn/gnome-screenshot/package.nix +++ b/pkgs/by-name/gn/gnome-screenshot/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-screenshot"; description = "Utility used in the GNOME desktop environment for taking screenshots"; mainProgram = "gnome-screenshot"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-secrets/package.nix b/pkgs/by-name/gn/gnome-secrets/package.nix index a6b2fb7f2f34..97f30f26bc83 100644 --- a/pkgs/by-name/gn/gnome-secrets/package.nix +++ b/pkgs/by-name/gn/gnome-secrets/package.nix @@ -75,7 +75,8 @@ python3Packages.buildPythonApplication rec { homepage = "https://gitlab.gnome.org/World/secrets"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ mvnetbiz ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ mvnetbiz ]; + teams = [ teams.gnome-circle ]; mainProgram = "secrets"; }; } diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix index 10eae3e97d68..45c676f1c7ab 100644 --- a/pkgs/by-name/gn/gnome-session/ctl.nix +++ b/pkgs/by-name/gn/gnome-session/ctl.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "gnome-session-ctl extracted from gnome-session for nixpkgs"; homepage = "https://github.com/nix-community/gnome-session-ctl"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/gn/gnome-session/fix-paths.patch b/pkgs/by-name/gn/gnome-session/fix-paths.patch index 38805c645b95..22f06ddfd2e8 100644 --- a/pkgs/by-name/gn/gnome-session/fix-paths.patch +++ b/pkgs/by-name/gn/gnome-session/fix-paths.patch @@ -6,10 +6,10 @@ index b4b1f8fa..99d52cba 100755 [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && [ -n "$SHELL" ]; then if [ "$1" != '-l' ]; then -- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" +- exec bash -c "exec -l '$SHELL' -c 'exec $0 -l $*'" + # Make sure the shell actually sets up the environment. + unset __NIXOS_SET_ENVIRONMENT_DONE -+ exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'" ++ exec @bash@ -c "exec -l '$SHELL' -c 'exec $0 -l $*'" else shift fi diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index 47842a419a7b..d60b3ca2d110 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "47.0.1"; + version = "48.0"; outputs = [ "out" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz"; - hash = "sha256-Vq6caOSZlXk+sglrzcRTOxEWaeHlTItuCx2VL2peinA="; + hash = "sha256-3ZCfvFsizb2y/E3xpH140bWUPMxeYeaiChhGJGNHxBc="; }; patches = [ @@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/gnome-session"; changelog = "https://gitlab.gnome.org/GNOME/gnome-session/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index dbeaeb1115c6..afaee31db68f 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-settings-daemon"; - version = "47.2"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz"; - hash = "sha256-HrdYhi6Ij1WghpGTCH8c+8x6EWNlTmMAmf9DQt0/alo="; + hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4="; }; patches = [ @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/gn/gnome-settings-daemon46/package.nix b/pkgs/by-name/gn/gnome-settings-daemon46/package.nix index 31a4fdb73a1d..2c70f9e4d62f 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon46/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon46/package.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { description = "GNOME Settings Daemon"; homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"; license = licenses.gpl2Plus; - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index b51e9478e711..4f6772825787 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "47.4"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - hash = "sha256-VDN57FsNBCAO5iofa6JAcWoJ11rQrd3bIFvjjOgpP1g="; + hash = "sha256-m2f8LFgC2hcTp3sZ/6BCMY3XHnva6EN3lsX1GXlTOTw="; }; patches = [ @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions"; changelog = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Modify and extend GNOME Shell functionality and behavior"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-shell/fix-paths.patch b/pkgs/by-name/gn/gnome-shell/fix-paths.patch index a87f5129152f..56e716148326 100644 --- a/pkgs/by-name/gn/gnome-shell/fix-paths.patch +++ b/pkgs/by-name/gn/gnome-shell/fix-paths.patch @@ -10,10 +10,10 @@ index de91167c5..1c9965678 100644 +ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true Restart=no diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js -index 197cc1c1c..dd74aa167 100644 +index 53fd92846..89533cedc 100644 --- a/js/ui/extensionDownloader.js +++ b/js/ui/extensionDownloader.js -@@ -110,7 +110,7 @@ async function extractExtensionArchive(bytes, dir) { +@@ -124,7 +124,7 @@ async function extractExtensionArchive(bytes, dir) { stream.close_async(GLib.PRIORITY_DEFAULT, null); const unzip = Gio.Subprocess.new( @@ -22,7 +22,7 @@ index 197cc1c1c..dd74aa167 100644 Gio.SubprocessFlags.NONE); await unzip.wait_check_async(null); -@@ -132,7 +132,7 @@ async function extractExtensionArchive(bytes, dir) { +@@ -146,7 +146,7 @@ async function extractExtensionArchive(bytes, dir) { } const compileSchema = Gio.Subprocess.new( @@ -32,15 +32,15 @@ index 197cc1c1c..dd74aa167 100644 try { diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js -index fff4e73c2..92859b099 100644 +index 1b43e1051..a31b0a304 100644 --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js -@@ -1092,6 +1092,6 @@ class InputSourceIndicator extends PanelMenu.Button { - if (xkbVariant.length > 0) - description = `${description}\t${xkbVariant}`; +@@ -1104,6 +1104,6 @@ class InputSourceIndicator extends PanelMenu.Button { + _showLayout() { + Main.overview.hide(); -- Util.spawn(['tecla', description]); -+ Util.spawn(['@tecla@', description]); +- Util.spawn(['tecla']); ++ Util.spawn(['@tecla@']); } }); diff --git a/subprojects/extensions-tool/src/command-install.c b/subprojects/extensions-tool/src/command-install.c diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index f6a1ecd6770c..8333dad8a2fa 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -69,7 +69,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "47.4"; + version = "48.1"; outputs = [ "out" @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-aAuvaU9F+PyDLSRa2mxjtfxLAwzPvrv8Dg47wo2i5G0="; + hash = "sha256-uk9FWv1iE/OHVFlG482dqjnJBPerFt2DCsd6c/8QAso="; }; patches = [ @@ -183,7 +183,9 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - patchShebangs src/data-to-c.py + patchShebangs \ + src/data-to-c.py \ + meson/generate-app-list.py # We can generate it ourselves. rm -f man/gnome-shell.1 @@ -243,7 +245,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/gnome-shell"; changelog = "https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index 468177440fbe..d6d62b5775b7 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "47.4"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-coHFS5t0jWai55LrjgMxyJec44+vrfct482ZnYDpe08="; + hash = "sha256-CEqYUEApTDZFS0ZKIUT5gcAnSQa0xJ1xYT5hztapbo8="; }; patches = [ @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "gnome-software"; homepage = "https://apps.gnome.org/Software/"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/gn/gnome-solanum/package.nix b/pkgs/by-name/gn/gnome-solanum/package.nix index b23b4c3dda2d..a5561b944388 100644 --- a/pkgs/by-name/gn/gnome-solanum/package.nix +++ b/pkgs/by-name/gn/gnome-solanum/package.nix @@ -21,22 +21,21 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "solanum"; - version = "5.0.0"; + version = "6.0.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Solanum"; - rev = version; - hash = "sha256-Xf/b/9o6zHF1hjHSyAXb90ySoBj+DMMe31e6RfF8C4Y="; + tag = finalAttrs.version; + hash = "sha256-Wh9/88Vc4mtjL0U1Vrw+GEEBPjEv+5NrWd/Kw1glp+w="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-jtMTW9tIf0UGbE9bJU31maub+o0agf0pDRO4s9QReyc="; + inherit (finalAttrs) pname version src; + hash = "sha256-krjbeutochFk5md+THlYBW4iEwfFDbK89DYHZyd3IKo="; }; postPatch = '' @@ -71,12 +70,13 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { homepage = "https://gitlab.gnome.org/World/Solanum"; description = "Pomodoro timer for the GNOME desktop"; - maintainers = with maintainers; [ linsui ] ++ lib.teams.gnome-circle.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ linsui ]; + teams = [ lib.teams.gnome-circle ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "solanum"; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-sound-recorder/package.nix b/pkgs/by-name/gn/gnome-sound-recorder/package.nix index 059e30b7aacc..d7141deddaae 100644 --- a/pkgs/by-name/gn/gnome-sound-recorder/package.nix +++ b/pkgs/by-name/gn/gnome-sound-recorder/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/World/vocalis"; changelog = "https://gitlab.gnome.org/World/vocalis/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index 62aba7d70d4c..e7c934d7a60a 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -10,6 +10,7 @@ gettext, gtk4, gnome, + blueprint-compiler, wrapGAppsHook4, libadwaita, libgee, @@ -22,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "47.1.1"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz"; - hash = "sha256-RyW0KDZGaysqzF5RZrU9jrEczd4lh9tofK+MjUc+uIk="; + hash = "sha256-eXE62CpZkEzWlv8CJV627ZNk6I8+eDNDsfnQygnyx+M="; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { itstool libxml2 desktop-file-utils + blueprint-compiler wrapGAppsHook4 ]; @@ -59,7 +61,7 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/GNOME/gnome-sudoku/-/blob/${version}/NEWS?ref_type=tags"; description = "Test your logic skills in this number grid puzzle"; mainProgram = "gnome-sudoku"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix index 4c14a01f649d..fa8aae787c36 100644 --- a/pkgs/by-name/gn/gnome-system-monitor/package.nix +++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix @@ -7,6 +7,7 @@ gtkmm4, libxml2, bash, + catch2_3, gtk4, libadwaita, glib, @@ -25,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-system-monitor"; - version = "47.1"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major finalAttrs.version}/gnome-system-monitor-${finalAttrs.version}.tar.xz"; - hash = "sha256-08VxT9kfp/BdZ3XmeXzNqzFJ8THRqndqM1LirdsRDwE="; + hash = "sha256-Ezw6bihjZuZZ/S2AWCQJp71e2uRW5jxPacz2btb8Zjg="; }; patches = [ @@ -49,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bash + catch2_3 gtk4 libadwaita glib @@ -74,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://apps.gnome.org/SystemMonitor/"; description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; mainProgram = "gnome-system-monitor"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-taquin/package.nix b/pkgs/by-name/gn/gnome-taquin/package.nix index 8cc7aac2c852..5bd88b138581 100644 --- a/pkgs/by-name/gn/gnome-taquin/package.nix +++ b/pkgs/by-name/gn/gnome-taquin/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-taquin"; description = "Move tiles so that they reach their places"; mainProgram = "gnome-taquin"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gn/gnome-tecla/package.nix b/pkgs/by-name/gn/gnome-tecla/package.nix index d26e2ce841d5..e08ec43dd48f 100644 --- a/pkgs/by-name/gn/gnome-tecla/package.nix +++ b/pkgs/by-name/gn/gnome-tecla/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tecla"; - version = "47.0"; + version = "48.0.2"; src = fetchurl { url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz"; - hash = "sha256-B5C5nsKRN6VLVGxRBmGpmqbwOcjXXxDAjpKGgsCAT+U="; + hash = "sha256-eD00ZNKiz36xUHZJ29n/Cc4khSwqbJoNNl24QGPT1AE="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Keyboard layout viewer"; homepage = "https://gitlab.gnome.org/GNOME/tecla"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; mainProgram = "tecla"; }; diff --git a/pkgs/by-name/gn/gnome-terminal/package.nix b/pkgs/by-name/gn/gnome-terminal/package.nix index 3c92d78efed5..4bcf840b4397 100644 --- a/pkgs/by-name/gn/gnome-terminal/package.nix +++ b/pkgs/by-name/gn/gnome-terminal/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-terminal"; - version = "3.54.4"; + version = "3.56.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz"; - hash = "sha256-RDqAaJM3EI5LGQOZlp5mq6BBzDxju5nFc4Ul1SixMrg="; + hash = "sha256-ojB1PlC9Qx27EwDhV7/XMXMA4lIm/zCJMxY2OhOGT/g="; }; nativeBuildInputs = [ @@ -91,6 +91,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/gnome-terminal"; platforms = platforms.linux; license = licenses.gpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; }) diff --git a/pkgs/by-name/gn/gnome-tetravex/package.nix b/pkgs/by-name/gn/gnome-tetravex/package.nix index dc2752f552b9..95282a3fa14f 100644 --- a/pkgs/by-name/gn/gnome-tetravex/package.nix +++ b/pkgs/by-name/gn/gnome-tetravex/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-tetravex"; description = "Complete the puzzle by matching numbered tiles"; mainProgram = "gnome-tetravex"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index 15119083e0c9..289c59cabc83 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-text-editor"; - version = "47.3"; + version = "48.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; - hash = "sha256-RsZyv+huRN6YB5djaigPBcxer2zem0LcS8yVZAVilyU="; + hash = "sha256-/B9dR1vdJ9TAQ5pbj+ENbkAbQvHbo9BLdWeDkDbuICs="; }; nativeBuildInputs = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Text Editor for GNOME"; mainProgram = "gnome-text-editor"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gn/gnome-themes-extra/package.nix b/pkgs/by-name/gn/gnome-themes-extra/package.nix index 2809c19928e8..83e8fd201c0e 100644 --- a/pkgs/by-name/gn/gnome-themes-extra/package.nix +++ b/pkgs/by-name/gn/gnome-themes-extra/package.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.unix; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/gn/gnome-tour/package.nix b/pkgs/by-name/gn/gnome-tour/package.nix index a900bfd3cde4..17bf79a473bb 100644 --- a/pkgs/by-name/gn/gnome-tour/package.nix +++ b/pkgs/by-name/gn/gnome-tour/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-tour"; - version = "47.0"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-tour/${lib.versions.major finalAttrs.version}/gnome-tour-${finalAttrs.version}.tar.xz"; - hash = "sha256-cvqvieAGyJMkp+FXIEaRaWGziuujj21tTMQePT1GaUQ="; + hash = "sha256-uKA7JXTrlWq+mvFBQWHMsX+DDVNgC5wEmc7zu29BJ8U="; }; cargoVendorDir = "vendor"; @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/gnome-tour/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "GNOME Greeter & Tour"; mainProgram = "gnome-tour"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix index 3235ea91d606..7bdf8bcf9f2a 100644 --- a/pkgs/by-name/gn/gnome-tweaks/package.nix +++ b/pkgs/by-name/gn/gnome-tweaks/package.nix @@ -92,7 +92,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-tweaks"; description = "Tool to customize advanced GNOME 3 options"; mainProgram = "gnome-tweaks"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-usage/package.nix b/pkgs/by-name/gn/gnome-usage/package.nix index 311470c94e13..059aadd85b82 100644 --- a/pkgs/by-name/gn/gnome-usage/package.nix +++ b/pkgs/by-name/gn/gnome-usage/package.nix @@ -12,20 +12,22 @@ wrapGAppsHook4, glib, gtk4, + json-glib, libadwaita, libgee, libgtop, + networkmanager, gnome, tinysparql, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-usage"; - version = "46.0"; + version = "48.rc"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-GGrajgAYjIn4yrVPNZmO2XpG6rb9shiRAoNhvzhqybI="; + url = "mirror://gnome/sources/gnome-usage/${lib.versions.major finalAttrs.version}/gnome-usage-${finalAttrs.version}.tar.xz"; + hash = "sha256-LUbc2QcKkY/sMUdxaaQDI2CdCFa5XHo3wBusqULTk+w="; }; nativeBuildInputs = [ @@ -42,9 +44,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk4 + json-glib libadwaita libgee libgtop + networkmanager tinysparql ]; @@ -55,7 +59,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gnome-usage"; }; }; @@ -65,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-usage"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix index 460e342adef1..cb51a99aeba8 100644 --- a/pkgs/by-name/gn/gnome-user-docs/package.nix +++ b/pkgs/by-name/gn/gnome-user-docs/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "47.2"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-2b8IuabChNHgT2/pI3pt7trRYeDlungQv/7PKF4rzd8="; + hash = "sha256-rJc9kk4AVFoUWNhqEQ1Hc+a743w3KEDXbtZAyyaMYf0="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "User and system administration help for the GNOME desktop"; homepage = "https://help.gnome.org/users/gnome-help/"; license = licenses.cc-by-30; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/gn/gnome-user-share/package.nix b/pkgs/by-name/gn/gnome-user-share/package.nix index 013174691c91..b49dd59173c8 100644 --- a/pkgs/by-name/gn/gnome-user-share/package.nix +++ b/pkgs/by-name/gn/gnome-user-share/package.nix @@ -5,15 +5,19 @@ gettext, meson, ninja, + rustc, + rustPlatform, + cargo, fetchurl, apacheHttpdPackages, pkg-config, glib, libxml2, - systemd, wrapGAppsNoGuiHook, itstool, gnome, + _experimental-update-script-combinators, + common-updater-scripts, }: let @@ -22,18 +26,28 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-user-share"; - version = "47.2"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major finalAttrs.version}/gnome-user-share-${finalAttrs.version}.tar.xz"; - hash = "sha256-H6wbuIAN+kitnD4ZaQ9+EOZ6T5lNnLF8rh0b3/yRRLo="; + hash = "sha256-tVgFBwGVwvZYQVuc0shbLNFOqYHWGCOlANTWK4v4OAE="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + name = "gnome-user-share-${finalAttrs.version}"; + hash = "sha256-tQoP0yBOCesj2kwgBUoqmcVtFttwML2N+wfSULtfC4w="; }; preConfigure = '' - sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ - -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ - -i data/dav_user_2.4.conf + substituteInPlace data/dav_user_2.4.conf \ + --replace-fail \ + 'LoadModule dnssd_module ''${HTTP_MODULES_PATH}/mod_dnssd.so' \ + 'LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so' \ + --replace-fail \ + '${"$"}{HTTP_MODULES_PATH}' \ + '${apacheHttpd}/modules' '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' substituteInPlace meson.build --replace-fail \ @@ -51,6 +65,9 @@ stdenv.mkDerivation (finalAttrs: { pkg-config meson ninja + rustc + rustPlatform.cargoSetupHook + cargo gettext glib # for glib-compile-schemas itstool @@ -60,23 +77,46 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib - systemd ]; doCheck = true; strictDeps = true; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-user-share"; - }; + updateScript = + let + updateSource = gnome.updateScript { + packageName = "gnome-user-share"; + }; + + updateLockfile = { + command = [ + "sh" + "-c" + '' + PATH=${ + lib.makeBinPath [ + common-updater-scripts + ] + } + update-source-version gnome-user-share --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null + '' + ]; + # Experimental feature: do not copy! + supportedFeatures = [ "silent" ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateLockfile + ]; }; meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-user-share"; changelog = "https://gitlab.gnome.org/GNOME/gnome-user-share/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Service that exports the contents of the Public folder in your home directory on the local network"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-video-effects/package.nix b/pkgs/by-name/gn/gnome-video-effects/package.nix index cbf601a2d39a..7953e77866b2 100644 --- a/pkgs/by-name/gn/gnome-video-effects/package.nix +++ b/pkgs/by-name/gn/gnome-video-effects/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Collection of GStreamer effects to be used in different GNOME Modules"; homepage = "https://gitlab.gnome.org/GNOME/gnome-video-effects"; platforms = platforms.unix; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2; }; } diff --git a/pkgs/by-name/gn/gnome-weather/package.nix b/pkgs/by-name/gn/gnome-weather/package.nix index 05b4eb9564c3..aecb98b3d246 100644 --- a/pkgs/by-name/gn/gnome-weather/package.nix +++ b/pkgs/by-name/gn/gnome-weather/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "47.0"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/gnome-weather-${version}.tar.xz"; - hash = "sha256-UV9YYjdN00bLyFqd3wMGstMnZXhQu2C2ycmGD86WIOY="; + hash = "sha256-TAVps9gVri+UFtRxNMvTBWNAZA/xhtMalMhlgTtL27U="; }; nativeBuildInputs = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/Weather/"; description = "Access current weather conditions and forecasts"; mainProgram = "gnome-weather"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gn/gnote/package.nix b/pkgs/by-name/gn/gnote/package.nix index 2b80a8ed3dd0..60f2ee5594ce 100644 --- a/pkgs/by-name/gn/gnote/package.nix +++ b/pkgs/by-name/gn/gnote/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnote"; - version = "47.2"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-mmDxaSSA9k0WbTHmVkoP8kgSelmOL/f2NX3AsuwlsWg="; + hash = "sha256-DZ20NCmXf4IS5wMC80EbTt6qDNKYt8yMTAad5uTeGn8="; }; buildInputs = [ diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix index 30f80016f5b9..760095c071a3 100644 --- a/pkgs/by-name/gn/gnu-shepherd/package.nix +++ b/pkgs/by-name/gn/gnu-shepherd/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnu-shepherd"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz"; - hash = "sha256-QOd561/9dvvoXN6VM9N/DamARihT4Bl0gWCT9VEL89g="; + hash = "sha256-EzBqa1bf4lJGToSiPCOnI0M4zHUsVl4bhl98v4oD8M8="; }; configureFlags = [ "--localstatedir=/" ]; diff --git a/pkgs/by-name/gn/gnucash/0005-python-env.patch b/pkgs/by-name/gn/gnucash/0005-python-env.patch new file mode 100644 index 000000000000..7d04d0750c07 --- /dev/null +++ b/pkgs/by-name/gn/gnucash/0005-python-env.patch @@ -0,0 +1,10 @@ +--- a/bindings/python/__init__.py ++++ b/bindings/python/__init__.py +@@ -1,3 +1,7 @@ ++import os ++os.environ['GNC_DBD_DIR'] = '@gnc_dbd_dir@' ++os.environ['GSETTINGS_SCHEMA_DIR'] = '@gsettings_schema_dir@' ++ + # import all the symbols from gnucash_core, so basic gnucash stuff can be + # loaded with: + # >>> from gnucash import thingy diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index 0646e82f9032..0e131cfa6e8e 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, fetchurl, - fetchpatch, aqbanking, boost, cmake, @@ -26,16 +25,18 @@ swig, webkitgtk_4_0, wrapGAppsHook3, + python3, + replaceVars, }: stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.10"; + version = "5.11"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2"; - hash = "sha256-eJ2fNpjuW4ZyAnmjo+EOd0QhDhLFJa5/A9MvpwQHrZM="; + hash = "sha256-a6QjE6qqmbXwf/bk28WLM/v19L5ukRN2cB1lwm/U3r4="; }; nativeBuildInputs = [ @@ -46,6 +47,11 @@ stdenv.mkDerivation rec { pkg-config ]; + cmakeFlags = [ + "-DWITH_PYTHON=\"ON\"" + "-DPYTHON_SYSCONFIG_BUILD=\"$out\"" + ]; + buildInputs = [ aqbanking @@ -64,6 +70,7 @@ stdenv.mkDerivation rec { libxslt swig webkitgtk_4_0 + python3 ] ++ (with perlPackages; [ JSONParse @@ -80,20 +87,16 @@ stdenv.mkDerivation rec { ./0003-remove-valgrind.patch # this patch makes gnucash exec the Finance::Quote wrapper directly ./0004-exec-fq-wrapper.patch - # this patch fixes the build against icu 76 - (fetchpatch { - name = "icu-76.patch"; - url = "https://github.com/Gnucash/gnucash/commit/579eed1facc0f7834ea70b1a342ebca0f125d788.patch"; - hash = "sha256-XzRPHDPxt2TfeqO48vaNEcfF58neVDMxVqkPKrG5xoM="; - }) - # fixes QIF imports: https://bugs.gnucash.org/show_bug.cgi?id=799492 - (fetchpatch { - name = "qif-import.patch"; - url = "https://github.com/Gnucash/gnucash/commit/6531d3e46b7bee1add61aa6c6aaf8fb1f889a586.patch"; - hash = "sha256-Lque2w9X9yencNVzI/DfuE3H2dN46yVNnbBdiEQE6/4="; - }) + # this patch adds in env vars to the Python lib that makes it able to find required resource files + ./0005-python-env.patch ]; + postPatch = '' + substituteInPlace bindings/python/__init__.py \ + --subst-var-by gnc_dbd_dir "${libdbiDrivers}/lib/dbd" \ + --subst-var-by gsettings_schema_dir ${glib.makeSchemaPath "$out" "gnucash-${version}"}; + ''; + # this needs to be an environment variable and not a cmake flag to suppress # guile warning env.GUILE_AUTO_COMPILE = "0"; diff --git a/pkgs/by-name/gn/gnuchess/package.nix b/pkgs/by-name/gn/gnuchess/package.nix index 8c140d6fc48e..69e0d4f07325 100644 --- a/pkgs/by-name/gn/gnuchess/package.nix +++ b/pkgs/by-name/gn/gnuchess/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnuchess"; - version = "6.2.9"; + version = "6.2.11"; src = fetchurl { url = "mirror://gnu/chess/gnuchess-${version}.tar.gz"; - sha256 = "sha256-3fzCC911aQCpq2xCx9r5CiiTv38ZzjR0IM42uuvEGJA="; + sha256 = "sha256-2BFA7qXGnRSwz7Y4FtS0yeGPulH1Jn3lsVOfRok56b0="; }; buildInputs = [ diff --git a/pkgs/by-name/gn/gnucobol/package.nix b/pkgs/by-name/gn/gnucobol/package.nix index ef165c8e45f7..5aa662f00406 100644 --- a/pkgs/by-name/gn/gnucobol/package.nix +++ b/pkgs/by-name/gn/gnucobol/package.nix @@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: { lgpl3Only ]; maintainers = with maintainers; [ - ericsagnes lovesegfault techknowlogick kiike diff --git a/pkgs/by-name/go/go-away/package.nix b/pkgs/by-name/go/go-away/package.nix new file mode 100644 index 000000000000..f749695c73ed --- /dev/null +++ b/pkgs/by-name/go/go-away/package.nix @@ -0,0 +1,71 @@ +{ + lib, + buildGoModule, + fetchFromGitea, + + # asset compression + brotli, + zopfli, + + # wasm compilation + clang, + tinygo, +}: + +buildGoModule (finalAttrs: { + pname = "go-away"; + version = "0.7.0"; + + src = fetchFromGitea { + domain = "git.gammaspectra.live"; + owner = "git"; + repo = "go-away"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5rcuR3ke+BSgYJQbJhqQmDgjrtj6jt1Q18eLkRpp8wE="; + }; + + vendorHash = "sha256-DOAJrQlh+5gfxKIBbf5rEYt+hZ0luNkX4MxtwNoLiKo="; + + nativeBuildInputs = [ + # build-compress.sh + brotli + zopfli + + # build-wasm.sh + clang + tinygo + ]; + + postPatch = '' + patchShebangs *.sh + ''; + + preBuild = '' + ./build-compress.sh + + # build-wasm.sh + export HOME=$(mktemp -d) + go generate -v ./... + ''; + + subPackages = [ + "cmd/go-away" + ]; + + meta = { + changelog = "https://git.gammaspectra.live/git/go-away/releases/tag/${finalAttrs.src.tag}"; + description = "Self-hosted abuse detection and rule enforcement against low-effort mass AI scraping and bots"; + longDescription = '' + go-away sits in between your site and the Internet / upstream proxy. + + Incoming requests can be selected by rules to be actioned or challenged to filter suspicious requests. + + The tool is designed highly flexible so the operator can minimize impact to legit users, while surgically targeting heavy endpoints or scrapers. + + Challenges can be transparent (not shown to user, depends on backend or other logic), non-JavaScript (challenges common browser properties), or custom JavaScript (from Proof of Work to fingerprinting or Captcha is supported) + ''; + homepage = "https://git.gammaspectra.live/git/go-away"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/by-name/go/go-blueprint/package.nix b/pkgs/by-name/go/go-blueprint/package.nix index 87019c44fe02..571919bd8aae 100644 --- a/pkgs/by-name/go/go-blueprint/package.nix +++ b/pkgs/by-name/go/go-blueprint/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "go-blueprint"; - version = "0.10.5"; + version = "0.10.9"; src = fetchFromGitHub { owner = "Melkeydev"; repo = "go-blueprint"; rev = "v${version}"; - hash = "sha256-8J+PxFHrNkX2McBn1tO7Q1X4tWtMWDIRsxzKtRhM/Jk="; + hash = "sha256-5xVmMHQE0Jl15ZZnmvJQDUsCBfMaE5hWUighUdfoN/g="; }; ldflags = [ diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix index 1fa05bc3e503..64de2292f07e 100644 --- a/pkgs/by-name/go/go-chromecast/package.nix +++ b/pkgs/by-name/go/go-chromecast/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "vishen"; repo = "go-chromecast"; tag = "v${version}"; - hash = "sha256-6I10UZ7imH1R78L2uM/697PskPYjhKSiPHoMM7EFElU="; + hash = "sha256-FFe87Z0aiNP5aGAiJ2WJkKRAMCQGWEBB0gLDGBpE3fk="; }; - vendorHash = "sha256-cu8PuZLkWLatU46VieaeoV5oyejyjR0uVUMVzOrheLM="; + vendorHash = "sha256-MOC9Yqo5p02eZLFJYBE8CxHxZv3RcpqV2sEPZOWiDeE="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix index 767e4e85b136..051978678183 100644 --- a/pkgs/by-name/go/go-critic/package.nix +++ b/pkgs/by-name/go/go-critic/package.nix @@ -7,14 +7,14 @@ go-critic, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "go-critic"; version = "0.13.0"; src = fetchFromGitHub { owner = "go-critic"; repo = "go-critic"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-0AOhq7OhSHub4I6XXL018hg6i2ERkIbZCrO9osNjvHw="; }; @@ -27,7 +27,7 @@ buildGoModule rec { allowGoReference = true; ldflags = [ - "-X main.Version=${version}" + "-X main.Version=${finalAttrs.version}" ]; passthru = { @@ -41,9 +41,9 @@ buildGoModule rec { meta = { description = "Most opinionated Go source code linter for code audit"; homepage = "https://go-critic.com/"; - changelog = "https://github.com/go-critic/go-critic/releases/tag/${src.rev}"; + changelog = "https://github.com/go-critic/go-critic/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; mainProgram = "gocritic"; maintainers = with lib.maintainers; [ katexochen ]; }; -} +}) diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix index 8f5eb3c77d01..9c5a7f9add01 100644 --- a/pkgs/by-name/go/go-dnscollector/package.nix +++ b/pkgs/by-name/go/go-dnscollector/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "go-dnscollector"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "dmachard"; repo = "go-dnscollector"; rev = "v${version}"; - sha256 = "sha256-rJHU/hDmnANziJj/K2FGccZjWFe8eyggtjIc2nt0pgo="; + sha256 = "sha256-antLNQEOA20XxmmZHFQcs0VuLVfgM5V3wyXOYIX4hlk="; }; - vendorHash = "sha256-bAqr2ZVR6x1hJ80oZogA5ZXEuoz5A7yp5rxry1rIhSY="; + vendorHash = "sha256-9EQr4lhv6+PkAnMJ6iWnBsK/SzZaOyVkSpqSYsX07LY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/go/go-ecoflow-exporter/package.nix b/pkgs/by-name/go/go-ecoflow-exporter/package.nix index 79a36efa67b1..6ba9adfd6de1 100644 --- a/pkgs/by-name/go/go-ecoflow-exporter/package.nix +++ b/pkgs/by-name/go/go-ecoflow-exporter/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "tess1o"; repo = "go-ecoflow-exporter"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-VCzMItYgnuDXDYdrk/ojzqUE2Fjr7KWGNnLhoQ+ZPYs="; }; diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index 5c6035799e8d..2855518d0b35 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -1,10 +1,7 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, - libobjc, - IOKit, nixosTests, }: @@ -18,17 +15,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.15.6"; + version = "1.15.11"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - hash = "sha256-BdNv0rx+9/F0leNj2AAej8psy8X8HysDrIXheVOOkSo="; + hash = "sha256-2XGKkimwe9h8RxO3SzUta5Bh2Ooldl2LiHqUpn8FK7I="; }; proxyVendor = true; - vendorHash = "sha256-1FuVdx84jvMBo8VO6q+WaFpK3hWn88J7p8vhIDsQHPM="; + vendorHash = "sha256-R9Qg6estiyjMAwN6tvuN9ZuE7+JqjEy+qYOPAg5lIJY="; doCheck = false; @@ -59,12 +56,6 @@ buildGoModule rec { # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.11.6/build/ci.go#L218 tags = [ "urfave_cli_no_docs" ]; - # Fix for usb-related segmentation faults on darwin - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - ]; - passthru.tests = { inherit (nixosTests) geth; }; meta = with lib; { diff --git a/pkgs/by-name/go/go-import-lint/package.nix b/pkgs/by-name/go/go-import-lint/package.nix new file mode 100644 index 000000000000..37d2e6e4b7a0 --- /dev/null +++ b/pkgs/by-name/go/go-import-lint/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule (finalAttrs: { + pname = "go-import-lint"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "hedhyw"; + repo = "go-import-lint"; + tag = "v${finalAttrs.version}"; + hash = "sha256-YaIKtbdjqtmHGZgk3AlHrSJrWGMGJTIv1t/LYoB4vmw="; + }; + vendorHash = null; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Golang source code analyzer that checks imports order"; + homepage = "https://github.com/hedhyw/go-import-lint"; + changelog = "https://github.com/hedhyw/go-import-lint/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + mainProgram = "go-import-lint"; + }; +}) diff --git a/pkgs/by-name/go/go-jsonnet/package.nix b/pkgs/by-name/go/go-jsonnet/package.nix index 9e00f8d68cf1..418e7609d951 100644 --- a/pkgs/by-name/go/go-jsonnet/package.nix +++ b/pkgs/by-name/go/go-jsonnet/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-jsonnet"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-P69tguBrFF/CSCOfHjCfBT5710oJdhZDh3kMCbc32eE="; + hash = "sha256-J92xNDpCidbiSsN6NveS6BX6Tx+qDQqkgm6pjk1wBTQ="; }; - vendorHash = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI="; + vendorHash = "sha256-Uh2rAXdye9QmmZuEqx1qeokE9Z9domyHsSFlU7YZsZw="; subPackages = [ "cmd/jsonnet*" ]; diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix index 7a96e9827c25..c94afc6622b9 100644 --- a/pkgs/by-name/go/go-judge/package.nix +++ b/pkgs/by-name/go/go-judge/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "go-judge"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "criyle"; repo = pname; rev = "v${version}"; - hash = "sha256-4KBMDqHw8EJGSDK9+jCZvaxkQymhw4RRGByrFngiIug="; + hash = "sha256-AmbhfCKUpvZt/me73EhBQqw8yDnItn1zKiemf/JRz24="; }; - vendorHash = "sha256-FnX3u6DLB9qPE4+Hy/+00mD4U/6Pa+CsZoEroi7cNO0="; + vendorHash = "sha256-eUtkelLucf11ANT6vkWuBOaL5bgb+9D8YsVsZTMMjmg="; tags = [ "nomsgpack" diff --git a/pkgs/by-name/go/go-landlock/package.nix b/pkgs/by-name/go/go-landlock/package.nix index 6be26c1b0d3b..b708cce8a2d8 100644 --- a/pkgs/by-name/go/go-landlock/package.nix +++ b/pkgs/by-name/go/go-landlock/package.nix @@ -26,6 +26,6 @@ buildGoModule { description = "Go library for the Linux Landlock sandboxing feature"; homepage = "https://github.com/landlock-lsm/go-landlock"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ tomfitzhenry ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/go/go-md2man/package.nix b/pkgs/by-name/go/go-md2man/package.nix index f06d54a10974..1cdce31b86b0 100644 --- a/pkgs/by-name/go/go-md2man/package.nix +++ b/pkgs/by-name/go/go-md2man/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "go-md2man"; - version = "2.0.6"; + version = "2.0.7"; vendorHash = "sha256-aMLL/tmRLyGze3RSB9dKnoTv5ZK1eRtgV8fkajWEbU0="; @@ -14,7 +14,7 @@ buildGoModule rec { rev = "v${version}"; owner = "cpuguy83"; repo = "go-md2man"; - sha256 = "sha256-wJnHgp+NPchXkR71ARLMjo4VryzgGkz2tYWPsC+3eFo="; + sha256 = "sha256-DKqGvdidl6J4lPhIk3okhU4k6MvtSr+hJ9huU/JTai0="; }; meta = with lib; { diff --git a/pkgs/by-name/go/go-migrate/package.nix b/pkgs/by-name/go/go-migrate/package.nix index f5857b03ad37..1c9ddd5d601a 100644 --- a/pkgs/by-name/go/go-migrate/package.nix +++ b/pkgs/by-name/go/go-migrate/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.18.2"; + version = "4.18.3"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "sha256-DRWJ5USabSQtNkyDjz8P7eOS2QBE1KaD8K8XYORBVGo="; + sha256 = "sha256-aM8okSrLj2oIb3Ey2KkHu3UQY7mSnPjMfwNsdL2Fz28="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-0SbhHA5gKzODW8rHCEuZXWs8vMsVDMqJsRDPs4V1gGc="; + vendorHash = "sha256-H3FBO6RFoXzwk/9bkSVuIlDbfd4AATzbgLmEvbtahFM="; subPackages = [ "cmd/migrate" ]; diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix index fe1d1bf60921..e0efeadb41c6 100644 --- a/pkgs/by-name/go/go-task/package.nix +++ b/pkgs/by-name/go/go-task/package.nix @@ -8,18 +8,18 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "go-task"; - version = "3.41.0"; + version = "3.43.3"; src = fetchFromGitHub { owner = "go-task"; repo = "task"; - tag = "v${version}"; - hash = "sha256-yJ9XTCS0BK+pcQvcbGR2ixwPODJKdfQnHgB1QoTFhzA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZIZdk0yyykjjSdH6YG8K8WpI8e8426odk8RxISsJe80="; }; - vendorHash = "sha256-DR9G+I6PYk8jrR0CZiPqtuULTMekATNSLjyHACOmlbk="; + vendorHash = "sha256-3Uu0ozwOgp6vQh+s9nGKojw6xPUI49MjjPqKh9g35lQ="; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/go-task/task/v3/internal/version.version=${version}" + "-X=github.com/go-task/task/v3/internal/version.version=${finalAttrs.version}" ]; env.CGO_ENABLED = 0; @@ -49,15 +49,15 @@ buildGoModule rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/task"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://taskfile.dev/"; description = "Task runner / simpler Make alternative written in Go"; - changelog = "https://github.com/go-task/task/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/go-task/task/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ parasrah ]; }; -} +}) diff --git a/pkgs/by-name/go/go-toml/package.nix b/pkgs/by-name/go/go-toml/package.nix index d22898102778..f363710a18d8 100644 --- a/pkgs/by-name/go/go-toml/package.nix +++ b/pkgs/by-name/go/go-toml/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.2.3"; + version = "2.2.4"; in buildGoModule { pname = "go-toml"; @@ -14,10 +14,10 @@ buildGoModule { owner = "pelletier"; repo = "go-toml"; rev = "v${version}"; - sha256 = "sha256-+l89SvJ/4SxVItys1ROLOv2hZ5euU1MF21Yn0siQHUM="; + sha256 = "sha256-VKUrpSaGzkewNSyE0sB6PWVIQiraY7UxE5Wve+76UFk="; }; - vendorHash = "sha256-YkOcpzn5AKFMDWUYbKY8DzGMiIMSyaDfexFmXv5HNQI="; + vendorHash = null; excludedPackages = [ "cmd/gotoml-test-decoder" diff --git a/pkgs/by-name/go/go-xmlstruct/package.nix b/pkgs/by-name/go/go-xmlstruct/package.nix new file mode 100644 index 000000000000..e93841f889ec --- /dev/null +++ b/pkgs/by-name/go/go-xmlstruct/package.nix @@ -0,0 +1,50 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "go-xmlstruct"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "twpayne"; + repo = "go-xmlstruct"; + tag = "v${finalAttrs.version}"; + hash = "sha256-7nDxLvTu/l3bbkG/MYFWqO0KGNfVVwW9/WqvKvj0wOc="; + }; + + vendorHash = "sha256-dxnMWxcWu67FI833bFoxy+5s2ELp3gXisLiTACZRzGU="; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # The --help flag doesn't actually exist in goxmlstruct, causing it to return exit code 2, + # but this error condition is the only way to get the usage information. + output=$($out/bin/goxmlstruct --help 2>&1 || true) + + if ! echo "$output" | grep -q "Usage of $out/bin/goxmlstruct:"; then + echo "Expected usage information not found in output" + echo "Got: $output" + exit 1 + fi + + runHook postInstallCheck + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Generate Go structs from multiple XML documents"; + mainProgram = "goxmlstruct"; + homepage = "https://github.com/twpayne/go-xmlstruct"; + changelog = "https://github.com/twpayne/go-xmlstruct/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dvcorreia ]; + }; +}) diff --git a/pkgs/by-name/go/go2tv/package.nix b/pkgs/by-name/go/go2tv/package.nix new file mode 100644 index 000000000000..f7ded32020b6 --- /dev/null +++ b/pkgs/by-name/go/go2tv/package.nix @@ -0,0 +1,56 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + xorg, + libglvnd, + pkg-config, + withGui ? true, +}: + +buildGoModule rec { + pname = "go2tv" + lib.optionalString (!withGui) "-lite"; + version = "1.18.1"; + + src = fetchFromGitHub { + owner = "alexballas"; + repo = "go2tv"; + tag = "v${version}"; + hash = "sha256-Ic4Kcc5Vx1QXFt28o5ItGwcvsKCB2HdZvILPRoEKbgI="; + }; + + vendorHash = "sha256-xp/zdkNV4z3rQMV0b/7TD+ApiaDWxR/aqOKvakGKAcI="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXinerama + xorg.libXi + xorg.libXext + xorg.libXxf86vm + libglvnd + ]; + + ldflags = [ + "-s" + "-w" + "-linkmode=external" + ]; + + # conditionally build with GUI or not (go2tv or go2tv-lite sub-packages) + subPackages = [ "cmd/${pname}" ]; + + doCheck = false; + + meta = with lib; { + description = "Cast media files to UPnP/DLNA Media Renderers and Smart TVs"; + homepage = "https://github.com/alexballas/go2tv"; + changelog = "https://github.com/alexballas/go2tv/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ gdamjan ]; + mainProgram = pname; + }; +} diff --git a/pkgs/by-name/go/goa/package.nix b/pkgs/by-name/go/goa/package.nix index b97d284f4e37..2079ec3d323e 100644 --- a/pkgs/by-name/go/goa/package.nix +++ b/pkgs/by-name/go/goa/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "goa"; - version = "3.20.1"; + version = "3.21.0"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - hash = "sha256-+MAK/qRvwMfjifeXmBjDWKmQ75LAbIUjZ6rvqw1Xv3I="; + hash = "sha256-yHls7qGZhQIIYbPWCs0dm3W2DgKZq4fJbnNCPTqUy/s="; }; - vendorHash = "sha256-/5tcIvJpJPVMOL6XBAjXbiHeCwpB0YOLv5hRhd5zG7Q="; + vendorHash = "sha256-mKFKZuAIQdDwDJ2DMtW18NgFn6Sd35TQHBY4xVKzoUs="; subPackages = [ "cmd/goa" ]; diff --git a/pkgs/by-name/go/goaccess/package.nix b/pkgs/by-name/go/goaccess/package.nix index 82979ab9de38..c017143fb1aa 100644 --- a/pkgs/by-name/go/goaccess/package.nix +++ b/pkgs/by-name/go/goaccess/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "goaccess"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "allinurl"; repo = "goaccess"; tag = "v${version}"; - hash = "sha256-ZOngDAHA88YQvkx2pk5ZSpBzxqelvCIR4z5hiFmfGyc="; + hash = "sha256-KevxuZuIrMybNlPZgVDLO0zQe4LfAKxfVBbHnyTUC/o="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { "--with-openssl" ] ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ]; + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.hostPlatform.isDarwin [ + "-DHOST_NAME_MAX=_POSIX_HOST_NAME_MAX" + ] + ); + meta = with lib; { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; homepage = "https://goaccess.io"; diff --git a/pkgs/by-name/go/goarista/package.nix b/pkgs/by-name/go/goarista/package.nix new file mode 100644 index 000000000000..87f68addd919 --- /dev/null +++ b/pkgs/by-name/go/goarista/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule { + pname = "goarista"; + version = "0-unstable-2025-03-24"; + + src = fetchFromGitHub { + owner = "aristanetworks"; + repo = "goarista"; + rev = "2af7f36a2220911d96d9d5cf8dee641a7c01eb07"; + hash = "sha256-M/gZVn4ioaxRwbqlee3yeRfWIjaG6mFq2Z+XL5mGjoA="; + }; + + vendorHash = "sha256-5vdVHTQOXsYc8EdEGEAXk2ZX/6o88gHxBzfwETcwXvA="; + + checkFlags = + let + skippedTests = [ + "TestDeepSizeof" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestDialTCPTimeoutWithTOS" ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + meta = { + description = "Collection of open-source tools for network management and monitoring mostly based around gNMI"; + homepage = "https://github.com/aristanetworks/goarista"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.haylin ]; + mainProgram = "gnmi"; + }; +} diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix index 12f6e8f38c7e..69bf2531e07e 100644 --- a/pkgs/by-name/go/gobang/package.nix +++ b/pkgs/by-name/go/gobang/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: let version = "0.1.0-alpha.5"; @@ -24,14 +22,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-K9oo0QrqcPNdV7WMlgSCVc+7AVfoyDkovvJLqKJPvTQ="; - buildInputs = - with darwin.apple_sdk.frameworks; - lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - SystemConfiguration - ]; - meta = { description = "Cross-platform TUI database management tool written in Rust"; homepage = "https://github.com/tako8ki/gobang"; diff --git a/pkgs/by-name/go/gobgp/package.nix b/pkgs/by-name/go/gobgp/package.nix index 9572b5677212..2852ab89c785 100644 --- a/pkgs/by-name/go/gobgp/package.nix +++ b/pkgs/by-name/go/gobgp/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gobgp"; - version = "3.36.0"; + version = "3.37.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-vyMC3FcfMHVsRosLkTYgCawiTIcJs0R5GgSZERRPHnE="; + sha256 = "sha256-Nh4JmyZHrT7uPi9+CbmS3h6ezKoicCvEByUJVULMac4="; }; - vendorHash = "sha256-bR6msi2IyNmYgmpLrbn/hnX4EzLOBa2UHTzwDJFasos="; + vendorHash = "sha256-HpATJztX31mNWkpeDqOE4rTzhCk3c7E1PtZnKW8Axyo="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/by-name/go/gobgpd/package.nix b/pkgs/by-name/go/gobgpd/package.nix index d2256be1cbe3..b4142da76fd4 100644 --- a/pkgs/by-name/go/gobgpd/package.nix +++ b/pkgs/by-name/go/gobgpd/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.36.0"; + version = "3.37.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; tag = "v${version}"; - hash = "sha256-vyMC3FcfMHVsRosLkTYgCawiTIcJs0R5GgSZERRPHnE="; + hash = "sha256-Nh4JmyZHrT7uPi9+CbmS3h6ezKoicCvEByUJVULMac4="; }; - vendorHash = "sha256-bR6msi2IyNmYgmpLrbn/hnX4EzLOBa2UHTzwDJFasos="; + vendorHash = "sha256-HpATJztX31mNWkpeDqOE4rTzhCk3c7E1PtZnKW8Axyo="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/by-name/go/gobusybox/package.nix b/pkgs/by-name/go/gobusybox/package.nix index 8ec543c1f593..12794e148502 100644 --- a/pkgs/by-name/go/gobusybox/package.nix +++ b/pkgs/by-name/go/gobusybox/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gobusybox"; version = "0.2.0-unstable-2024-03-05"; @@ -15,7 +15,7 @@ buildGoModule rec { hash = "sha256-hS6YwN6eekyDjp7E6sisW+8HO5WHTEC68XyKZFPihK4="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; subPackages = [ "cmd/gencmddeps" @@ -39,4 +39,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ katexochen ]; mainProgram = "makebb"; }; -} +}) diff --git a/pkgs/by-name/go/goconst/package.nix b/pkgs/by-name/go/goconst/package.nix index 6d1546d69f42..6dc8cc6b8074 100644 --- a/pkgs/by-name/go/goconst/package.nix +++ b/pkgs/by-name/go/goconst/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "goconst"; - version = "1.7.1"; + version = "1.8.1"; excludedPackages = [ "tests" ]; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "jgautheron"; repo = "goconst"; rev = "v${version}"; - sha256 = "sha256-GpOZJ5/5aNw1o8fk2RSAx200v6AZ+pbNu/25i8OSS1Y="; + sha256 = "sha256-pvCmCf3ZjhB4lxP6GLO6vnhNswKdNDWgD2YyHmRi6oE="; }; vendorHash = null; diff --git a/pkgs/by-name/go/gocovsh/package.nix b/pkgs/by-name/go/gocovsh/package.nix index eecc843a5568..d99fb8934d2e 100644 --- a/pkgs/by-name/go/gocovsh/package.nix +++ b/pkgs/by-name/go/gocovsh/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix index f368a95fa11b..39269c428e47 100644 --- a/pkgs/by-name/go/gocryptfs/package.nix +++ b/pkgs/by-name/go/gocryptfs/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "gocryptfs"; - version = "2.5.2"; + version = "2.5.4"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H3J+1a4Y6/BqgU7D9j/PNtP6Ci3EjrtO/ADx3GpJMgI="; + sha256 = "sha256-lDIKMcZLAE1ehijzhpx6G966xzdhusT40Dy06LXBn74="; }; vendorHash = "sha256-WfTJ8TuFupEa391XQMDl3hKTjrmRHJqvYb1haAGHW/U="; diff --git a/pkgs/by-name/go/goctl/package.nix b/pkgs/by-name/go/goctl/package.nix new file mode 100644 index 000000000000..95c9c1befec9 --- /dev/null +++ b/pkgs/by-name/go/goctl/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "goctl"; + version = "1.8.3"; + + src = fetchFromGitHub { + owner = "zeromicro"; + repo = "go-zero"; + tag = "v${version}"; + hash = "sha256-v5WzqMotF9C7i9hTYSjaPmTwveBVDVn+SKQXYuS4Rdc="; + }; + + vendorHash = "sha256-tOIlfYiAI9m7oTZyPDCzTXg9XTwBb6EOVLzDfZnzL4E="; + + modRoot = "tools/goctl"; + subPackages = [ "." ]; + + doCheck = true; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "CLI handcuffle of go-zero, a cloud-native Go microservices framework"; + longDescription = '' + goctl is a go-zero's built-in handcuffle that is a major + lever to increase development efficiency, generating code, + document, deploying k8s yaml, dockerfile, etc. + ''; + homepage = "https://go-zero.dev"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ cococolanosugar ]; + mainProgram = "goctl"; + }; +} diff --git a/pkgs/by-name/go/godns/package.nix b/pkgs/by-name/go/godns/package.nix index 7d27a7fca534..2be81152c9a5 100644 --- a/pkgs/by-name/go/godns/package.nix +++ b/pkgs/by-name/go/godns/package.nix @@ -10,19 +10,19 @@ buildGoModule rec { pname = "godns"; - version = "3.2.2"; + version = "3.2.4"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; tag = "v${version}"; - hash = "sha256-2VBgc+cp1IF3GprSt0oc5WOAepmV8dGhKjwodZ2JS6k="; + hash = "sha256-Uf+V6A5Q1gQQn+hJUUwmeaGve8364Lui2dMeCzkkeTQ="; }; - vendorHash = "sha256-cR+hlIGRPffP21lqDZmqBF4unS6ZyEvEvRlTrswg+js="; + vendorHash = "sha256-PrXi460v7ooBhFooLw14tMDvLvEzIYt+4Y+36BYdWzA="; npmDeps = fetchNpmDeps { src = "${src}/web"; - hash = "sha256-lchAfi97a97TPs22ML3sMrlSZdvWMMC+wBrGbvke5rg="; + hash = "sha256-+a5IrJLamuNmwGhPIA7JKvgm6COnYre6bPuAv1PgGns="; }; npmRoot = "web"; diff --git a/pkgs/by-name/go/godspeed/package.nix b/pkgs/by-name/go/godspeed/package.nix index 32e7543cf7ad..397792c0b2c1 100644 --- a/pkgs/by-name/go/godspeed/package.nix +++ b/pkgs/by-name/go/godspeed/package.nix @@ -30,7 +30,8 @@ buildGoModule rec { homepage = "https://github.com/redcode-labs/GodSpeed"; changelog = "https://github.com/redcode-labs/GodSpeed/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members; + maintainers = with maintainers; [ fab ]; + teams = [ teams.redcodelabs ]; mainProgram = "godspeed"; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/go/gofumpt/package.nix b/pkgs/by-name/go/gofumpt/package.nix index 12435ba1918d..13f35f5982b8 100644 --- a/pkgs/by-name/go/gofumpt/package.nix +++ b/pkgs/by-name/go/gofumpt/package.nix @@ -3,28 +3,27 @@ buildGoModule, fetchFromGitHub, nix-update-script, - testers, - gofumpt, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gofumpt"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "mvdan"; - repo = pname; - rev = "v${version}"; - hash = "sha256-mJM0uKztX0OUQvynnxeKL9yft7X/Eh28ERg8SbZC5Ws="; + repo = "gofumpt"; + rev = "v${finalAttrs.version}"; + hash = "sha256-37wYYB0k8mhQq30y1oo77qW3bIqqN/K/NG1RgxK6dyI="; }; - vendorHash = "sha256-kJysyxROvB0eMAHbvNF+VXatEicn4ln2Vqkzp7GDWAQ="; + vendorHash = "sha256-T6/xEXv8+io3XwQ2keacpYYIdTnYhTTUCojf62tTwbA="; env.CGO_ENABLED = "0"; ldflags = [ "-s" - "-X main.version=v${version}" + "-X main.version=v${finalAttrs.version}" ]; checkFlags = [ @@ -32,23 +31,20 @@ buildGoModule rec { "-skip=^TestScript/diagnose$" ]; - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = gofumpt; - version = "v${version}"; - }; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Stricter gofmt"; homepage = "https://github.com/mvdan/gofumpt"; - changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ + changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ rvolosatovs katexochen ]; mainProgram = "gofumpt"; }; -} +}) diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix new file mode 100644 index 000000000000..267a40076442 --- /dev/null +++ b/pkgs/by-name/go/gogdl/package.nix @@ -0,0 +1,64 @@ +{ + lib, + writeScript, + python3Packages, + fetchFromGitHub, + cacert, +}: + +python3Packages.buildPythonApplication rec { + pname = "gogdl"; + version = "1.1.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Heroic-Games-Launcher"; + repo = "heroic-gogdl"; + rev = "1ff09820915f855ea764c6e49ea2def63e86b3bb"; + hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0="; + }; + + disabled = python3Packages.pythonOlder "3.8"; + + propagatedBuildInputs = with python3Packages; [ + setuptools + requests + ]; + + pythonImportsCheck = [ "gogdl" ]; + + meta = with lib; { + description = "GOG Downloading module for Heroic Games Launcher"; + mainProgram = "gogdl"; + homepage = "https://github.com/Heroic-Games-Launcher/heroic-gogdl"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ aidalgol ]; + }; + + # Upstream no longer create git tags when bumping the version, so we have to + # extract it from the source code on the main branch. + passthru.updateScript = writeScript "gogdl-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnused jq common-updater-scripts + set -eou pipefail; + + owner=Heroic-Games-Launcher + repo=heroic-gogdl + path='gogdl/__init__.py' + + version=$( + curl --cacert "${cacert}/etc/ssl/certs/ca-bundle.crt" \ + https://raw.githubusercontent.com/$owner/$repo/main/$path | + sed -n 's/^\s*version\s*=\s*"\([0-9]\.[0-9]\.[0-9]\)"\s*$/\1/p') + + commit=$(curl --cacert "${cacert}/etc/ssl/certs/ca-bundle.crt" \ + https://api.github.com/repos/$owner/$repo/commits?path=$path | + jq -r '.[0].sha') + + update-source-version \ + ${pname} \ + "$version" \ + --file=./pkgs/games/gogdl/default.nix \ + --rev=$commit + ''; +} diff --git a/pkgs/by-name/go/goimapnotify/package.nix b/pkgs/by-name/go/goimapnotify/package.nix index 44ab2078d583..30176e056f3d 100644 --- a/pkgs/by-name/go/goimapnotify/package.nix +++ b/pkgs/by-name/go/goimapnotify/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "goimapnotify"; - version = "2.4"; + version = "2.5"; src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; - rev = version; - hash = "sha256-ieaj97CjoSc/qt/JebATHmiJ7RIvNUpFZjEM6mqG9Rk="; + tag = version; + hash = "sha256-RHTOieuw4ZeM1hKHUobMIzAKQ2ZgqIaJMoemF6JY8Vg="; }; - vendorHash = "sha256-rWPXQj0XFS/Mv9ylGv09vol0kkRDNaOAEgnJvSWMvoI="; + vendorHash = "sha256-5cZzaCoOR1R7iST0q3GaJbYIbKKEigeWqhp87maOL04="; postPatch = '' for f in command.go command_test.go; do @@ -27,6 +27,7 @@ buildGoModule rec { meta = with lib; { description = "Execute scripts on IMAP mailbox changes (new/deleted/updated messages) using IDLE"; homepage = "https://gitlab.com/shackra/goimapnotify"; + changelog = "https://gitlab.com/shackra/goimapnotify/-/blob/${src.tag}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ wohanley diff --git a/pkgs/by-name/go/gojo/package.nix b/pkgs/by-name/go/gojo/package.nix index 0655db6a56bd..c970aba7ff3f 100644 --- a/pkgs/by-name/go/gojo/package.nix +++ b/pkgs/by-name/go/gojo/package.nix @@ -22,7 +22,7 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "-v" ]; + versionCheckProgramArg = "-v"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix index bc2f9dea992c..895730ce9e0a 100644 --- a/pkgs/by-name/go/gojq/package.nix +++ b/pkgs/by-name/go/gojq/package.nix @@ -2,18 +2,18 @@ lib, buildGoModule, fetchFromGitHub, - testers, - gojq, + installShellFiles, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gojq"; version = "0.12.17"; src = fetchFromGitHub { owner = "itchyny"; - repo = pname; - rev = "v${version}"; + repo = "gojq"; + rev = "v${finalAttrs.version}"; hash = "sha256-zJkeghN3btF/fZZeuClHV1ndB/2tTTMljEukMYe7UWU="; }; @@ -24,16 +24,31 @@ buildGoModule rec { "-w" ]; - passthru.tests.version = testers.testVersion { - package = gojq; - }; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd gojq --zsh _gojq + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + postInstallCheck = '' + $out/bin/gojq --help > /dev/null + $out/bin/gojq --raw-output '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null + ''; + doInstallCheck = true; meta = { description = "Pure Go implementation of jq"; homepage = "https://github.com/itchyny/gojq"; - changelog = "https://github.com/itchyny/gojq/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/itchyny/gojq/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ + xiaoxiangmoe + aaronjheng + ]; mainProgram = "gojq"; }; -} +}) diff --git a/pkgs/by-name/go/gokapi/go-1.24.patch b/pkgs/by-name/go/gokapi/go-1.24.patch new file mode 100644 index 000000000000..02df74a7fe63 --- /dev/null +++ b/pkgs/by-name/go/gokapi/go-1.24.patch @@ -0,0 +1,13 @@ +diff --git a/build/go-generate/copyStaticFiles.go b/build/go-generate/copyStaticFiles.go +index 9f8a049..de21bdd 100644 +--- a/build/go-generate/copyStaticFiles.go ++++ b/build/go-generate/copyStaticFiles.go +@@ -10,7 +10,7 @@ import ( + ) + + func main() { +- copyFile(build.Default.GOROOT+"/misc/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js") ++ copyFile(build.Default.GOROOT+"/lib/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js") + copyFile("../../go.mod", "../../build/go.mod") + copyFile("../../openapi.json", "../../internal/webserver/web/static/apidocumentation/openapi.json") + } diff --git a/pkgs/by-name/go/gokapi/package.nix b/pkgs/by-name/go/gokapi/package.nix index 4788ad771657..aa92501900fb 100644 --- a/pkgs/by-name/go/gokapi/package.nix +++ b/pkgs/by-name/go/gokapi/package.nix @@ -20,6 +20,10 @@ buildGoModule rec { vendorHash = "sha256-9GRAlgng+yq7q0VQz374jIOCjeDIIDD631BglM/FsQQ="; + patches = [ + ./go-1.24.patch + ]; + # This is the go generate is ran in the upstream builder, but we have to run the components separately for things to work. preBuild = '' cd ./cmd/gokapi/ diff --git a/pkgs/by-name/go/gol/package.nix b/pkgs/by-name/go/gol/package.nix index 2ce3bfd8e370..b71f97318f8d 100644 --- a/pkgs/by-name/go/gol/package.nix +++ b/pkgs/by-name/go/gol/package.nix @@ -8,16 +8,16 @@ maven.buildMavenPackage rec { pname = "gol"; - version = "0.2.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "clarisma"; repo = "gol-tool"; tag = version; - hash = "sha256-jAkBFrtdVsK67n8Oo+/MGPL/JKRsu/6tbqy711exlwo="; + hash = "sha256-roFtoSpNByNVGkl7ESt5O6b4voVzX8Nbow1dI6Sqgss"; }; - mvnHash = "sha256-GCyTk/Lmh41qpCeex/qrN7cgPoNCsmmOKeBYllbtTZk"; + mvnHash = "sha256-lKmoftSkyyb/pIthrsJaZ3p9l5V5K3FdK6sOBoZyhe8"; mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/go/golangci-lint-langserver/package.nix b/pkgs/by-name/go/golangci-lint-langserver/package.nix index b6695d6ae77e..7a0f959cec5a 100644 --- a/pkgs/by-name/go/golangci-lint-langserver/package.nix +++ b/pkgs/by-name/go/golangci-lint-langserver/package.nix @@ -8,22 +8,19 @@ buildGoModule rec { pname = "golangci-lint-langserver"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "nametake"; repo = "golangci-lint-langserver"; tag = "v${version}"; - hash = "sha256-wNofr/s8K+vbvNZWrQ97g2V0fNAS2P/Zf7tsOmly+gc="; + hash = "sha256-mwYhOUH5PAbPRfP86dw9w6lIZYz/iL+f863XWOhBFy0="; }; - vendorHash = "sha256-SsGw26y/ZIBFp9dBk55ebQgJiLWOFRNe21h6huYE84I="; + vendorHash = "sha256-kbGTORTTxfftdU8ffsfh53nT7wZldOnBZ/1WWzN89Uc="; subPackages = [ "." ]; - # renable after https://github.com/nametake/golangci-lint-langserver/pull/52 - doCheck = false; - nativeCheckInputs = [ golangci-lint writableTmpDirAsHomeHook diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 4d1517f03fc9..627ba5afccd8 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -7,16 +7,16 @@ buildGo124Module rec { pname = "golangci-lint"; - version = "2.0.2"; + version = "2.1.6"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-+IndC9znKgVGiFWW0aCNjhxPwX1kDFnfG2+SKEQ15Rc="; + hash = "sha256-L0TsVOUSU+nfxXyWsFLe+eU4ZxWbW3bHByQVatsTpXA="; }; - vendorHash = "sha256-B6mCvJtIfRbAv6fZ8Ge82nT9oEcL3WR4D+AAVs9R3zM="; + vendorHash = "sha256-tYoAUumnHgA8Al3jKjS8P/ZkUlfbmmmBcJYUR7+5u9w="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/by-name/go/goldboot/package.nix b/pkgs/by-name/go/goldboot/package.nix new file mode 100644 index 000000000000..badc531c25c1 --- /dev/null +++ b/pkgs/by-name/go/goldboot/package.nix @@ -0,0 +1,57 @@ +{ + fetchFromGitHub, + rustPlatform, + lib, + versionCheckHook, + pkg-config, + zstd, + OVMF, + qemu, + qemu-utils, + openssl, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "goldboot"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "fossable"; + repo = "goldboot"; + rev = "goldboot-v${finalAttrs.version}"; + hash = "sha256-O9yhyJZpjQxC0HP43RsOgPMOKp6d23SNhMLiGtmwXzs="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-NF0Fj+r6qWcM4VEIm1fzveZuz6MIaG32Z+zBfSMC/t4="; + + buildAndTestSubdir = "goldboot"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + zstd + OVMF + qemu + qemu-utils + openssl + ]; + + # Tests require networking, so skip them for now + doCheck = false; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "goldboot"; + description = "Immutable infrastructure for the desktop"; + homepage = "https://github.com/fossable/goldboot"; + changelog = "https://github.com/fossable/goldboot/releases/tag/goldboot-v${finalAttrs.version}"; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ cilki ]; + }; +}) diff --git a/pkgs/by-name/go/golden-cheetah/package.nix b/pkgs/by-name/go/golden-cheetah/package.nix index dd33b079b74d..f1dde6dc67db 100644 --- a/pkgs/by-name/go/golden-cheetah/package.nix +++ b/pkgs/by-name/go/golden-cheetah/package.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "golden-cheetah"; - version = "3.7-DEV2408"; + version = "3.7"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; tag = "v${finalAttrs.version}"; - hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c="; + hash = "sha256-INlkFWugIoln7wrmgLZUC/Ye8eV+mlT6BZ0ZdP7CiqE="; }; buildInputs = diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix index a4e9026238e6..e83216488c64 100644 --- a/pkgs/by-name/go/golds/package.nix +++ b/pkgs/by-name/go/golds/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "golds"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "go101"; repo = "golds"; tag = "v${version}"; - hash = "sha256-maYkVZlr8VW3nsNLVD+ib8TfltBkDrgWiC7VyeEJIy4="; + hash = "sha256-j6k68+hiXsXW5WLnmbN/iFLFpyU64z/1+DKuaAnNbac="; }; # nixpkgs is not using the go distpack archive and missing a VERSION file in the source @@ -27,7 +27,7 @@ buildGoModule rec { ldflags = [ "-s" ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/go/golem/package.nix b/pkgs/by-name/go/golem/package.nix index cabb64312a08..d2f37af849b6 100644 --- a/pkgs/by-name/go/golem/package.nix +++ b/pkgs/by-name/go/golem/package.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; versionCheckProgram = [ "${placeholder "out"}/bin/golem-cli" ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix index 75e97c841c7d..6441a569cdd1 100644 --- a/pkgs/by-name/go/gollama/package.nix +++ b/pkgs/by-name/go/gollama/package.nix @@ -2,42 +2,31 @@ lib, fetchFromGitHub, buildGoModule, - versionCheckHook, + nix-update-script, }: buildGoModule rec { pname = "gollama"; - version = "1.28.5"; + version = "1.33.0"; src = fetchFromGitHub { owner = "sammcj"; repo = "gollama"; tag = "v${version}"; - hash = "sha256-7wCBflX34prZJl4HhZUU2a2qHxaBs1fMKHpwE0vX1GE="; + hash = "sha256-hgIOOBfE9t1/oUmFvmtHyuWaOgftzxCiT3xmEJ6d45I="; }; - postPatch = '' - substituteInPlace main.go \ - --replace-fail 'Version = "1.28.0"' 'Version = "${version}"' - ''; - - vendorHash = "sha256-Y5yg54em+vqoWXxS3JVQVPEM+fLXgoblmY+48WpxSCQ="; + vendorHash = "sha256-AE3uD9Si4Gm1W+jIvwg9kQFqqgJQLAh7eLPs8qtJAGI="; doCheck = false; - ldFlags = [ + ldflags = [ "-s" "-w" + "-X main.Version=${version}" ]; - # FIXME: error when running `env -i gollama`: - # "Error initializing logging: $HOME is not defined" - doInstallCheck = false; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - - versionCheckProgramArg = [ "-v" ]; + passthru.updateScript = nix-update-script { }; meta = { description = "Go manage your Ollama models"; diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix index 11b7745baf60..465f8aa0933e 100644 --- a/pkgs/by-name/go/gom/package.nix +++ b/pkgs/by-name/go/gom/package.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gom"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix index 21316305dbc4..b9245766f566 100644 --- a/pkgs/by-name/go/gomanagedocker/package.nix +++ b/pkgs/by-name/go/gomanagedocker/package.nix @@ -47,7 +47,7 @@ buildGoModule { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/go/gomi/package.nix b/pkgs/by-name/go/gomi/package.nix index 82f16f3de703..84403bd18a61 100644 --- a/pkgs/by-name/go/gomi/package.nix +++ b/pkgs/by-name/go/gomi/package.nix @@ -12,13 +12,32 @@ buildGoModule rec { owner = "b4b4r07"; repo = "gomi"; tag = "v${version}"; - hash = "sha256-FZCvUG6lQH8CFivV/hbIgGQx4FCk1UtreiWXTQVi4+4="; + hash = "sha256-0C+us4GO8Jd51ATaaf0aRU3NnhmDvu0I3qDDXBoaiXU="; + # 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; + postFetch = '' + cd $out + git show --format='%h' HEAD --quiet > ldflags_revision + date --utc --date="@$(git show --format='%ct' HEAD --quiet)" +'%Y-%m-%dT%H:%M:%SZ' > ldflags_buildDate + find . -type d -name .git -print0 | xargs -0 rm -rf + ''; }; vendorHash = "sha256-8aw81DKBmgNsQzgtHCsUkok5e5+LeAC8BUijwKVT/0s="; subPackages = [ "." ]; + # Add version information fetched from the repository to ldflags. + # https://github.com/babarot/gomi/blob/v1.6.0/.goreleaser.yaml#L20-L22 + ldflags = [ + "-X main.version=v${version}" + ]; + preBuild = '' + ldflags+=" -X main.revision=$(cat ldflags_revision)" + ldflags+=" -X main.buildDate=$(cat ldflags_buildDate)" + ''; + meta = { description = "Replacement for UNIX rm command"; homepage = "https://github.com/b4b4r07/gomi"; diff --git a/pkgs/by-name/go/gomplate/package.nix b/pkgs/by-name/go/gomplate/package.nix index 18c7577844a2..f8baaa8bff23 100644 --- a/pkgs/by-name/go/gomplate/package.nix +++ b/pkgs/by-name/go/gomplate/package.nix @@ -4,22 +4,22 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gomplate"; - version = "4.2.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "hairyhenderson"; repo = "gomplate"; - tag = "v${version}"; - hash = "sha256-PupwL0VzZiWz+96Mv1o6QSmj7iLyvVIQMcdRlGqmpRs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-94zZuig/AN/UzZx66YbrkBX2Nq+/gPLXlcOz1ar8weE="; }; - vendorHash = "sha256-1BOrffMtYz/cEsVaMseZQJlGsAdax+c1CvebwP8jaL4="; + vendorHash = "sha256-AS69mXZ5Faedj1cv7bfOfBfvdMQrCH1o9p6UN/O8ZLs="; ldflags = [ "-s" - "-X github.com/${src.owner}/${pname}/v4/version.Version=${version}" + "-X github.com/${finalAttrs.src.owner}/${finalAttrs.pname}/v4/version.Version=${finalAttrs.version}" ]; preCheck = '' @@ -27,6 +27,7 @@ buildGoModule rec { rm net/net_test.go \ internal/tests/integration/datasources_blob_test.go \ internal/tests/integration/datasources_git_test.go \ + internal/tests/integration/test_ec2_utils_test.go \ render_test.go # some tests rely on external tools we'd rather not depend on rm internal/tests/integration/datasources_consul_test.go \ @@ -37,15 +38,15 @@ buildGoModule rec { rm $out/bin/gen ''; - meta = with lib; { + meta = { description = "Flexible commandline tool for template rendering"; mainProgram = "gomplate"; homepage = "https://gomplate.ca/"; - changelog = "https://github.com/hairyhenderson/gomplate/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + changelog = "https://github.com/hairyhenderson/gomplate/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ris jlesquembre ]; }; -} +}) diff --git a/pkgs/by-name/go/gomuks-web/package.nix b/pkgs/by-name/go/gomuks-web/package.nix new file mode 100644 index 000000000000..487b90b5d8e4 --- /dev/null +++ b/pkgs/by-name/go/gomuks-web/package.nix @@ -0,0 +1,74 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + buildNpmPackage, + stdenv, + olm, + unstableGitUpdater, + withGoolm ? false, +}: + +let + cppStdLib = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; + +in +buildGoModule (finalAttrs: { + pname = "gomuks-web"; + version = "0.4.0-unstable-2025-04-22"; + + src = fetchFromGitHub { + owner = "tulir"; + repo = "gomuks"; + rev = "fd257ed74c9df42e5b6d14d3c6a283f557f61666"; + hash = "sha256-jMDLfiwkUme2bxE+ZEtUoNMwZ7GuGGzCV2dH1V87YtQ="; + }; + + frontend = buildNpmPackage { + name = "${finalAttrs.pname}_${finalAttrs.version}-frontend"; + src = "${finalAttrs.src}/web"; + inherit (finalAttrs) version; + + npmDepsHash = "sha256-Mt2gJ1lLT3oQ3RKr3XTVFXkS/Xmjy0gahbdaxxrO+6g="; + + installPhase = '' + cp -r dist $out + ''; + }; + + vendorHash = "sha256-qeSxxd9ml2ENAYSPkdd1OWqy2DULnwLUVkKje47uT/I="; + + buildInputs = [ + (if withGoolm then stdenv.cc.cc.lib else olm) + ]; + + CGO_LDFLAGS = lib.optional withGoolm cppStdLib; + + tags = lib.optional withGoolm "goolm"; + + subPackages = [ "cmd/gomuks" ]; + + preBuild = '' + cp -r ${finalAttrs.frontend} ./web/dist + ''; + + postInstall = '' + mv $out/bin/gomuks $out/bin/gomuks-web + ''; + + passthru.updateScript = { + inherit (finalAttrs) frontend; + updateScript = unstableGitUpdater { + branch = "main"; + }; + }; + + meta = { + mainProgram = "gomuks-web"; + description = "Matrix client written in Go"; + homepage = "https://github.com/tulir/gomuks"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ctucx ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix index 8cd72fa97153..47b0cd93799f 100644 --- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix +++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "google-alloydb-auth-proxy"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "alloydb-auth-proxy"; tag = "v${version}"; - hash = "sha256-yEtpCX7/QJsuFhCJFHBFQQiAMs+HV4ig3Ni0mJsygsE="; + hash = "sha256-GnuNn7nORSrgwzKnA+yx2J5pf4GV4hrN1ghEWYenJBI="; }; subPackages = [ "." ]; - vendorHash = "sha256-mH5ni9O/S5Hnb3h39eWmmQYMdU99uC9yg29RfHGz1Fk="; + vendorHash = "sha256-MudeGkVblLvIMhMmL9r2GNz/PjwUYscyVYDb1EJnZYw="; checkFlags = [ "-short" diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index ea27d21f4a1a..1138f7e9e390 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -171,11 +171,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "134.0.6998.165"; + version = "136.0.7103.113"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-ibPD/V8oSeaPD236ryKfYc0LfJEDdbjs0u05iRpKjyU="; + hash = "sha256-BnKKu7X34g+zg4rDqjVXT3Kx2E8Gn5ELqs3LQS3GCkg="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -225,6 +225,8 @@ let substituteInPlace $out/share/google/$appname/google-$appname \ --replace-fail 'CHROME_WRAPPER' 'WRAPPER' + substituteInPlace $out/share/applications/com.google.Chrome.desktop \ + --replace-fail /usr/bin/google-chrome-$dist $exe substituteInPlace $out/share/applications/google-$appname.desktop \ --replace-fail /usr/bin/google-chrome-$dist $exe substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \ @@ -274,11 +276,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "134.0.6998.166"; + version = "136.0.7103.114"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/drywet6kw733g5tvesvkdv5hlm_134.0.6998.166/GoogleChrome-134.0.6998.166.dmg"; - hash = "sha256-jHD5L9mz/S9JSFjFVsNcHWx6xFFeCgOptEmclec6NiM="; + url = "http://dl.google.com/release2/chrome/iwktnyywqpn7dye3zjzgosvevq_136.0.7103.114/GoogleChrome-136.0.7103.114.dmg"; + hash = "sha256-myJawlgVBQlLtgBfSfCL5XfdnH8d7xd+j8JV2+2MZ/s="; }; dontPatch = true; diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index 3b8a0fe9f0f4..1f6c115e09ae 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -14,7 +14,8 @@ nlohmann_json, openssl, pkg-config, - protobuf, + # upstream PR to update: https://github.com/googleapis/google-cloud-cpp/pull/14974 + protobuf_29, pkgsBuildHost, # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 apis ? [ "*" ], @@ -48,20 +49,11 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = - [ - cmake - ninja - pkg-config - ] - ++ lib.optionals (!doInstallCheck) [ - # enable these dependencies when doInstallCheck is false because we're - # unconditionally building tests and benchmarks - # - # when doInstallCheck is true, these deps are added to nativeInstallCheckInputs - gbenchmark - gtest - ]; + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; buildInputs = [ c-ares @@ -70,7 +62,9 @@ stdenv.mkDerivation rec { grpc nlohmann_json openssl - protobuf + protobuf_29 + gbenchmark + gtest ]; doInstallCheck = true; diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix index 1a5ad6bd543c..df5b2bf40386 100644 --- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix +++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "google-cloud-sql-proxy"; - version = "2.15.2"; + version = "2.15.3"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-IZSWJhA3M+d16KKOY6MULibvTNrf7InuNR/ahYznQHY="; + hash = "sha256-B9r4It6YQVBJ4tVX7IUI5jc6X3WgkgdzAcP0EWKUkeE="; }; subPackages = [ "." ]; - vendorHash = "sha256-iFCM1goZSYCCPC+14diCeK7AqLC+tRRSG10C8Nn0Lp0="; + vendorHash = "sha256-7QGetVfoDw59Mw1ZZh5wKEmqwxEgn3QP9kML+822dLc="; checkFlags = [ "-short" diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix index 3fbea152a7de..13f9d2117e26 100644 --- a/pkgs/by-name/go/google-java-format/package.nix +++ b/pkgs/by-name/go/google-java-format/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-AqNhNXKX+pYpGMHQiDDVCxfWKYTSqGSRWblbmm2fgrI="; + sha256 = "sha256-7Qcjnzy3LiW/Kg6uY+doMfnxGWO9Gfw2pvHYcBasF2M="; }; dontUnpack = true; diff --git a/pkgs/by-name/go/google-lighthouse/package.nix b/pkgs/by-name/go/google-lighthouse/package.nix index b5768d407e9f..bfb4a6c57d22 100644 --- a/pkgs/by-name/go/google-lighthouse/package.nix +++ b/pkgs/by-name/go/google-lighthouse/package.nix @@ -12,18 +12,18 @@ }: stdenv.mkDerivation rec { pname = "google-lighthouse"; - version = "12.4.0"; + version = "12.5.1"; src = fetchFromGitHub { owner = "GoogleChrome"; repo = "lighthouse"; tag = "v${version}"; - hash = "sha256-O5HBaL+NogrE7dWi3TI0C5t+kQcJ7YG6yxRWsYpE1vw="; + hash = "sha256-v4V4K77WC3InQ+jRlzw0JV8ehPF+hwWlnAt3P8yHMGU="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-Jy3KBsHIh/HctSze3We04aisBjq67LZt0Z+HrBdDeIs="; + hash = "sha256-qdOR7A8ku8qJyJ3rdzH1okt+P1aekGfdtZbxjYOqehA="; }; yarnBuildScript = "build-report"; diff --git a/pkgs/by-name/go/google-play/package.nix b/pkgs/by-name/go/google-play/package.nix index c404013adc2d..1077cb5bfda4 100644 --- a/pkgs/by-name/go/google-play/package.nix +++ b/pkgs/by-name/go/google-play/package.nix @@ -2,17 +2,18 @@ lib, fetchFromGitHub, buildGoModule, + nix-update-script, }: buildGoModule rec { pname = "google-play"; - version = "1.6.3"; + version = "1.7.4"; src = fetchFromGitHub { - owner = "3052"; - repo = "google"; - rev = "v${version}"; - hash = "sha256-Wf7k76TXBr10FIclo/Ny8MLDDSNXu54JTDS0vfw4UXA="; + owner = "UlyssesZh"; + repo = "google-play"; + tag = "v${version}"; + hash = "sha256-Qv79fM59AQ+Y0OfWXKW1Jub07J5net3pP8ANm7CtB6A="; }; subPackages = [ @@ -20,14 +21,16 @@ buildGoModule rec { "internal/badging" ]; - vendorHash = "sha256-NVN5qoGXiL6lOPZejUhK55EuzF7R0KsIT+2oCzK+Qg0="; + vendorHash = "sha256-+n08a22VEHjKUyk/XxTXBu9yYggSgIxCFx8PFtA2OCc="; + + passthru.updateScript = nix-update-script { }; meta = { description = "CLI app to download APK from Google Play or send API requests"; maintainers = with lib.maintainers; [ ulysseszhan ]; # https://polyformproject.org/licenses/noncommercial/1.0.0 license = lib.licenses.unfree; - homepage = "https://github.com/3052/google"; + homepage = "https://github.com/UlyssesZh/google-play"; mainProgram = "play"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix index 449361d4fdee..cda7b6abd5e1 100644 --- a/pkgs/by-name/go/goose-cli/package.nix +++ b/pkgs/by-name/go/goose-cli/package.nix @@ -16,27 +16,27 @@ let gpt-4o-tokenizer = fetchurl { url = "https://huggingface.co/Xenova/gpt-4o/resolve/31376962e96831b948abe05d420160d0793a65a4/tokenizer.json"; hash = "sha256-Q6OtRhimqTj4wmFBVOoQwxrVOmLVaDrgsOYTNXXO8H4="; - meta.license = lib.licenses.unfree; + meta.license = lib.licenses.mit; }; claude-tokenizer = fetchurl { url = "https://huggingface.co/Xenova/claude-tokenizer/resolve/cae688821ea05490de49a6d3faa36468a4672fad/tokenizer.json"; hash = "sha256-wkFzffJLTn98mvT9zuKaDKkD3LKIqLdTvDRqMJKRF2c="; - meta.license = lib.licenses.unfree; + meta.license = lib.licenses.mit; }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "goose-cli"; - version = "1.0.15"; + version = "1.0.23"; src = fetchFromGitHub { owner = "block"; repo = "goose"; - tag = "v${version}"; - hash = "sha256-9uIpwJaRpYvsWW8ysFQWgogp/4hh5b72+5dNwYQKrM8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-jdoopa4pbW3MSgbNmNSp47iiXZF8H2GEgyhpkV1cB4A="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5qMciAnX34fbiV5Oy/+V3o7S3NwubxyRRNFXWcQK+kE="; + cargoHash = "sha256-We2v/U9pK4O7JVXyVDvHwyrujPLp9jL1m4SKcMg/Hvc="; nativeBuildInputs = [ pkg-config ]; @@ -59,14 +59,22 @@ rustPlatform.buildRustPackage rec { # need dbus-daemon "--skip=config::base::tests::test_multiple_secrets" "--skip=config::base::tests::test_secret_management" + "--skip=config::base::tests::test_concurrent_extension_writes" # Observer should be Some with both init project keys set "--skip=tracing::langfuse_layer::tests::test_create_langfuse_observer" "--skip=providers::gcpauth::tests::test_token_refresh_race_condition" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Lazy instance has previously been poisoned "--skip=jetbrains::tests::test_capabilities" "--skip=jetbrains::tests::test_router_creation" + "--skip=logging::tests::test_log_file_name::with_session_name_without_error_capture" + "--skip=logging::tests::test_log_file_name::without_session_name" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--skip=providers::gcpauth::tests::test_load_from_metadata_server" + "--skip=providers::oauth::tests::test_get_workspace_endpoints" + "--skip=tracing::langfuse_layer::tests::test_batch_manager_spawn_sender" + "--skip=tracing::langfuse_layer::tests::test_batch_send_partial_failure" + "--skip=tracing::langfuse_layer::tests::test_batch_send_success" ]; passthru.updateScript = nix-update-script { }; @@ -76,7 +84,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/block/goose"; mainProgram = "goose"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ cloudripper ]; + maintainers = with lib.maintainers; [ + cloudripper + thardin + ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/go/goose/package.nix b/pkgs/by-name/go/goose/package.nix index adcd30979bc1..c4e780347b10 100644 --- a/pkgs/by-name/go/goose/package.nix +++ b/pkgs/by-name/go/goose/package.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "goose"; - version = "3.24.2"; + version = "3.24.3"; src = fetchFromGitHub { owner = "pressly"; repo = pname; rev = "v${version}"; - hash = "sha256-C/FeXsmKmSA8unpqT5TcNOsSaQNzc4JTv5hkfeb760E="; + hash = "sha256-GfHhjpg/fMuctAEZFWnUnpnBUFOeGn2L3BSlfI9cOuE="; }; proxyVendor = true; - vendorHash = "sha256-RLUZktadsr1KgNA6luAkyztIJTzMdlp/phRZDq1jUyk="; + vendorHash = "sha256-uaCCbKAtkeTDAjHKXVdWykRGA/YlsszZR8CdM6YGFaw="; # skipping: end-to-end tests require a docker daemon postPatch = '' diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix index c8ac712834e1..bc9456542310 100644 --- a/pkgs/by-name/go/gopass-jsonapi/package.nix +++ b/pkgs/by-name/go/gopass-jsonapi/package.nix @@ -13,7 +13,7 @@ let - # https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.15/internal/jsonapi/manifest/manifest_path_linux.go + # https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.16/internal/jsonapi/manifest/manifest_path_linux.go manifestPaths = { firefox = "$out/lib/mozilla/native-messaging-hosts/com.justwatch.gopass.json"; chrome = "$out/etc/opt/chrome/native-messaging-hosts/com.justwatch.gopass.json"; @@ -27,16 +27,16 @@ let in buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.15"; + version = "1.15.16"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-nayg7NTJH6bAPiguyuN37JivfWkpOUX/xI/+PHDi3UI="; + hash = "sha256-Nl69SSqs18zG7eYhBafXFGBVNQglSeffg7Z0Y8zuLmc="; }; - vendorHash = "sha256-khX1CdzN+5T8q2hA3NyCxtz7uw9uDd9u61q3UslTtqs="; + vendorHash = "sha256-zncWJSA6cUthwcFZQXtJmwJZujaXt0Rubcga8D0+ZQc="; subPackages = [ "." ]; @@ -72,7 +72,7 @@ buildGoModule rec { # `gopass-jsonapi configure` will ask for them. (`--libpath` and `--global` # are overriden by `--manifest-path`. `--libpath` is only used to # compute Firefox's global manifest path. See - # https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.15/setup_others.go#L33-L46) + # https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.16/setup_others.go#L33-L46) # # `gopass-jsonapi configure` ask for confirmation before writing any files, # `echo y` gives it. diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index 35feec1bf524..0555e1bbaa2c 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -8,13 +8,13 @@ }: let - version = "1.6.11"; + version = "1.7.0"; src = fetchFromGitHub { owner = "GopeedLab"; repo = "gopeed"; tag = "v${version}"; - hash = "sha256-ayPqLRWYSa0rSHqGFS4xp3wUVAl4tfsSPs/SQcUQD60="; + hash = "sha256-9xAArQhf1lAWL6mbx6wuGY3xhKAMigpWFrX8P6/olMY="; }; metaCommon = { diff --git a/pkgs/by-name/go/goperf/package.nix b/pkgs/by-name/go/goperf/package.nix index 06fef208efbb..7caaff06ea86 100644 --- a/pkgs/by-name/go/goperf/package.nix +++ b/pkgs/by-name/go/goperf/package.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "goperf"; - version = "0-unstable-2025-03-05"; + version = "0-unstable-2025-05-05"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "02a15fd477bac975be19f213ea665ad854766179"; - hash = "sha256-8v26SVtBbUNrBhBjcLM1RKVcgXmC9CFWWOBZ5pc1RfM="; + rev = "a54a20dddd9743f7ac60d2d506e561eaeafd4831"; + hash = "sha256-+d8s9kEzBJ/21U2x8ZuiGdQrspFIJEmrjxmzNahC/V0="; }; - vendorHash = "sha256-3ocSlOVE1hskLqshBeseoB+Wjuu9QJhhzshQUuygcQ0="; + vendorHash = "sha256-nqK6xMKYe4uMXvcqopTAV66qklWUq1TzsP8V67TGJJU="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf diff --git a/pkgs/by-name/go/gopher/int_main.patch b/pkgs/by-name/go/gopher/int_main.patch new file mode 100644 index 000000000000..07024525b309 --- /dev/null +++ b/pkgs/by-name/go/gopher/int_main.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 1b20711..79ce215 100644 +--- a/configure ++++ b/configure +@@ -679,7 +679,7 @@ cat > conftest.$ac_ext << EOF + #line 680 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes diff --git a/pkgs/by-name/go/gopher/package.nix b/pkgs/by-name/go/gopher/package.nix index adf5420fb72f..a2a0c04d82c8 100644 --- a/pkgs/by-name/go/gopher/package.nix +++ b/pkgs/by-name/go/gopher/package.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; + patches = [ + ./int_main.patch # https://github.com/jgoerzen/gopher/pull/8 + ]; + preConfigure = "export LIBS=-lncurses"; meta = with lib; { diff --git a/pkgs/by-name/go/gopher64/package.nix b/pkgs/by-name/go/gopher64/package.nix new file mode 100644 index 000000000000..8254e920f1b8 --- /dev/null +++ b/pkgs/by-name/go/gopher64/package.nix @@ -0,0 +1,99 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + + bzip2, + libGL, + libX11, + libXcursor, + libxkbcommon, + libXi, + moltenvk, + sdl3, + wayland, + zstd, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "gopher64"; + version = "1.0.16"; + + src = fetchFromGitHub { + owner = "gopher64"; + repo = "gopher64"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TduOmKK4OAmhP2VUT0eeoKHQHmsM8kptrxfgCdDFTRU="; + fetchSubmodules = true; + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/GIT_REV + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + cargoPatches = [ + # upstream rebuilds SDL3 from source + # this patch makes it use the SDL3 library provided by nixpkgs + ./use-sdl3-via-pkg-config.patch + + # make the build script use the @GIT_REV@ string that will be substituted in the logic below + ./set-git-rev.patch + ]; + + postPatch = '' + # use the file generated in the fetcher to supply the git revision + substituteInPlace build.rs \ + --replace-fail "@GIT_REV@" $(cat GIT_REV) + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-9fZ7zFTqt1VNnmCqFzWrZFD1PQZ7paz7r2Mb+9+C9Rs="; + + env.ZSTD_SYS_USE_PKG_CONFIG = true; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = + [ + bzip2 + sdl3 + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + moltenvk + ]; + + # these are dlopen-ed during runtime + runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux [ + libGL + libxkbcommon + + # for X11 + libX11 + libXcursor + libXi + + # for wayland + wayland + ]; + + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + patchelf $out/bin/gopher64 --add-rpath ${lib.makeLibraryPath finalAttrs.runtimeDependencies} + ''; + + meta = { + changelog = "https://github.com/gopher64/gopher64/releases/tag/${finalAttrs.src.tag}"; + description = "N64 emulator written in Rust"; + homepage = "https://github.com/gopher64/gopher64"; + license = lib.licenses.gpl3Only; + mainProgram = "gopher64"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +}) diff --git a/pkgs/by-name/go/gopher64/set-git-rev.patch b/pkgs/by-name/go/gopher64/set-git-rev.patch new file mode 100644 index 000000000000..15b324e56bd7 --- /dev/null +++ b/pkgs/by-name/go/gopher64/set-git-rev.patch @@ -0,0 +1,19 @@ +diff --git a/build.rs b/build.rs +index 0b20db2..d904e63 100644 +--- a/build.rs ++++ b/build.rs +@@ -163,13 +163,7 @@ fn main() { + simd_build.compile("simd"); + } + +- let git_output = std::process::Command::new("git") +- .args(["rev-parse", "HEAD"]) +- .output() +- .unwrap(); +- +- let git_hash = String::from_utf8(git_output.stdout).unwrap(); +- println!("cargo:rustc-env=GIT_HASH={}", git_hash); ++ println!("cargo:rustc-env=GIT_HASH={}", "@GIT_REV@"); + + println!("cargo:rustc-env=N64_STACK_SIZE={}", 8 * 1024 * 1024); + } diff --git a/pkgs/by-name/go/gopher64/use-sdl3-via-pkg-config.patch b/pkgs/by-name/go/gopher64/use-sdl3-via-pkg-config.patch new file mode 100644 index 000000000000..7db5ce5ea8ff --- /dev/null +++ b/pkgs/by-name/go/gopher64/use-sdl3-via-pkg-config.patch @@ -0,0 +1,85 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 89bc1d0..72b65cd 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -626,15 +626,6 @@ dependencies = [ + "error-code", + ] + +-[[package]] +-name = "cmake" +-version = "0.1.54" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +-dependencies = [ +- "cc", +-] +- + [[package]] + name = "cobs" + version = "0.2.3" +@@ -3245,12 +3236,6 @@ dependencies = [ + "windows-sys 0.52.0", + ] + +-[[package]] +-name = "rpkg-config" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5a2d2f3481209a6b42eec2fbb49063fb4e8d35b57023401495d4fe0f85c817f0" +- + [[package]] + name = "rustc-demangle" + version = "0.1.24" +@@ -3380,21 +3365,13 @@ version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +-[[package]] +-name = "sdl3-src" +-version = "3.2.10" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e677fa126db179fb8f03c982163321496ddf57a6d8a1e41eeef4600f956038b1" +- + [[package]] + name = "sdl3-sys" + version = "0.4.7+SDL3-3.2.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f0d16a8a3623a4cb39a3661c81d9d4c5fd77ada27fc056e320b3651bf7bde1b1" + dependencies = [ +- "cmake", +- "rpkg-config", +- "sdl3-src", ++ "pkg-config", + ] + + [[package]] +diff --git a/Cargo.toml b/Cargo.toml +index 1f41e04..9d9ea33 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -18,7 +18,7 @@ serde-big-array = "0.5" + eframe = { version = "0.31", default-features = false, features = ["wayland", "x11", "glow"] } + sha2 = "0.10" + ab_glyph = "0.2" +-sdl3-sys = { version = "0.4", features = ["build-from-source-static"] } ++sdl3-sys = { version = "0.4", features = ["use-pkg-config"] } + rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "tokio"] } + tokio = {version = "1.43", features = ["rt-multi-thread", "macros"] } + spin_sleep = "1.3" +diff --git a/build.rs b/build.rs +index 67a6e8d..6c9f63b 100644 +--- a/build.rs ++++ b/build.rs +@@ -52,10 +52,7 @@ fn main() { + .include("parallel-rdp/parallel-rdp-standalone/vulkan") + .include("parallel-rdp/parallel-rdp-standalone/vulkan-headers/include") + .include("parallel-rdp/parallel-rdp-standalone/util") +- .include( +- std::path::PathBuf::from(std::env::var("DEP_SDL3_OUT_DIR").to_owned().unwrap()) +- .join("include"), +- ); ++ ; + + let os = std::env::var("CARGO_CFG_TARGET_OS").unwrap(); + let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap(); diff --git a/pkgs/by-name/go/gops/package.nix b/pkgs/by-name/go/gops/package.nix index 2aeb490fa3f6..0975a213b853 100644 --- a/pkgs/by-name/go/gops/package.nix +++ b/pkgs/by-name/go/gops/package.nix @@ -2,22 +2,23 @@ lib, buildGoModule, fetchFromGitHub, + writableTmpDirAsHomeHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gops"; version = "0.3.28"; src = fetchFromGitHub { owner = "google"; repo = "gops"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-HNM487WSfNWNF31ccDIdotsEG8Mj2C7V85UI47a9drU="; }; vendorHash = "sha256-ptC2G7cXcAjthJcAXvuBqI2ZpPuSMBqzO+gJiyaAUP0="; - preCheck = "export HOME=$(mktemp -d)"; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; meta = with lib; { description = "Tool to list and diagnose Go processes currently running on your system"; @@ -26,4 +27,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ pborzenkov ]; }; -} +}) diff --git a/pkgs/by-name/go/gorched/package.nix b/pkgs/by-name/go/gorched/package.nix new file mode 100644 index 000000000000..2ac768a5fa9b --- /dev/null +++ b/pkgs/by-name/go/gorched/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule (finalAttrs: { + pname = "gorched"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "zladovan"; + repo = "gorched"; + tag = "v${finalAttrs.version}"; + hash = "sha256-cT6wkWUlz3ixv7Mu5143I5NxjfwhKQ6bLwrW3BwTtTQ="; + }; + vendorHash = "sha256-9fucarQKltIxV8j8L+yQ6Fa7IRIhoQCNxcG21KYOpuw="; + + postPatch = '' + mkdir ./cmd/gorched + mv ./cmd/main.go ./cmd/gorched/main.go + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = ''Terminal based game written in Go inspired by "The Mother of all games" Scorched Earth''; + homepage = "https://github.com/zladovan/gorched"; + changelog = "https://github.com/zladovan/gorched/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + mainProgram = "gorched"; + }; +}) diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index d1c06ea578ad..08a7920fea6f 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,16 +10,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${version}"; - hash = "sha256-F9gUntTqllTYrRTuUj4tWMrHArM8BflCROPBsOdIsFA="; + hash = "sha256-2nen0Bd7jBlRz9AbcQAiK1GdT0ZkP9gBu3TfbpXIX6M="; }; - vendorHash = "sha256-MGBMPiya1mUBCYcLuTtMCwZ9e+LEtT7Xrb/WZf86IXE="; + vendorHash = "sha256-RN06Smr6HQGOUV3hQKxAbueDwI8ZlrnaF3vwrSesGOM="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/gose/package.nix b/pkgs/by-name/go/gose/package.nix index f61f3d1c8c64..c5a47ee46be1 100644 --- a/pkgs/by-name/go/gose/package.nix +++ b/pkgs/by-name/go/gose/package.nix @@ -7,13 +7,13 @@ lib, }: let - version = "0.10.2"; + version = "0.10.5"; src = fetchFromGitHub { repo = "gose"; owner = "stv0g"; tag = "v${version}"; - hash = "sha256-xyAOag2/GaIVttTLnx/6ljkpWbJmsOfyYyWzOAHOQ2I="; + hash = "sha256-8ghz2CpHNUUUpxg7VFi4DwDFa0GlPKaRJ3zC4XC0IyA="; }; frontend = buildNpmPackage { @@ -37,7 +37,7 @@ buildGoModule { inherit version; inherit src; - vendorHash = "sha256-/Drb5Mxz37rNYfHdydl3z+xvFtjGwuzSsG4gkbx/h1o="; + vendorHash = "sha256-6AfLoIRDO3diKZ9yFpVVIsRUFxQfLbmk91Cs5336OIE="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix index c066b645df68..1d182280aea1 100644 --- a/pkgs/by-name/go/gosec/package.nix +++ b/pkgs/by-name/go/gosec/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.22.2"; + version = "2.22.4"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - hash = "sha256-j9MRMtINGPn4Hn9Z3+19/Q+Weu277WVONXKtJf9x5Cc="; + hash = "sha256-a1rxomazSWm/hLpV6lnkEsIpOKyworKQZRFe9ZuEQ1I="; }; - vendorHash = "sha256-lZFTmf4/J3NDdawfp2WpPoaVxepbyazIyC8ahOwPcZo="; + vendorHash = "sha256-UUwoEkpjz0v3c4HBlMhnhOqotZDG5TQcOXqexNgj3yE="; subPackages = [ "cmd/gosec" diff --git a/pkgs/by-name/go/gosh/package.nix b/pkgs/by-name/go/gosh/package.nix index c802ab933495..70638a2f2562 100644 --- a/pkgs/by-name/go/gosh/package.nix +++ b/pkgs/by-name/go/gosh/package.nix @@ -23,7 +23,8 @@ buildGoModule rec { description = "Reverse/bind shell generator"; homepage = "https://github.com/redcode-labs/GoSH"; license = licenses.mit; - maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members; + maintainers = with maintainers; [ fab ]; + teams = [ teams.redcodelabs ]; mainProgram = "GoSH"; }; } diff --git a/pkgs/by-name/go/goshs/package.nix b/pkgs/by-name/go/goshs/package.nix new file mode 100644 index 000000000000..26db86ce6dfe --- /dev/null +++ b/pkgs/by-name/go/goshs/package.nix @@ -0,0 +1,47 @@ +{ + buildGoModule, + fetchFromGitHub, + stdenv, + versionCheckHook, + lib, +}: + +buildGoModule (finalAttrs: { + pname = "goshs"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "patrickhener"; + repo = "goshs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5/KWAytz0SQYgIerf1xyTfJxzX5ynA2BhKfbYmu/vU8="; + }; + + vendorHash = "sha256-LzuY3l6QQnMtAoVM2i206BuoTkVLVHg1DTWZhjIepY8="; + + ldflags = [ + "-s" + "-w" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # utils_test.go:62: route ip+net: no such network interface + # does not work in sandbox even with __darwinAllowLocalNetworking + "-skip=^TestGetIPv4Addr$" + ]; + + meta = { + description = "Simple, yet feature-rich web server written in Go"; + homepage = "https://goshs.de"; + changelog = "https://github.com/patrickhener/goshs/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + fab + matthiasbeyer + seiarotg + ]; + mainProgram = "goshs"; + }; +}) diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix index f64a23db5df7..4647f1566d9e 100644 --- a/pkgs/by-name/go/gosmee/package.nix +++ b/pkgs/by-name/go/gosmee/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gosmee"; - version = "0.23.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "gosmee"; rev = "v${version}"; - hash = "sha256-B+0Qod9U7bTQKXkbZJ0eQ6DkPdq56EI2tf/3i8wP/TI="; + hash = "sha256-dmv2fxL6jV6bpWvtMiLEtb/yg5vuD+B52P1PWVap1NA="; }; vendorHash = null; diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix index f666cb2f7e5f..33eec234f389 100644 --- a/pkgs/by-name/go/gossip/package.nix +++ b/pkgs/by-name/go/gossip/package.nix @@ -1,6 +1,5 @@ { cmake, - darwin, fetchFromGitHub, SDL2, ffmpeg_6, @@ -66,14 +65,6 @@ rustPlatform.buildRustPackage rec { libxkbcommon openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.ForceFeedback - darwin.apple_sdk.frameworks.AVFoundation - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland libX11 diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index c856a00b048f..101a4b569182 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "got"; - version = "0.110"; + version = "0.111"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-NjXkEgXn+FI2pudv94XT2JlxMc81PIzfb20lwDFmHSk="; + hash = "sha256-0Jb3bpGnAN0NIvuvlkHCuU+KbeFvCbD0k5yblqnYeM4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix index b4f105360c38..cfd1d797ad33 100644 --- a/pkgs/by-name/go/gotenberg/package.nix +++ b/pkgs/by-name/go/gotenberg/package.nix @@ -12,6 +12,7 @@ makeFontsConf, liberation_ttf_v2, exiftool, + pdfcpu, nixosTests, nix-update-script, }: @@ -23,19 +24,21 @@ let in buildGoModule rec { pname = "gotenberg"; - version = "8.9.1"; + version = "8.16.0"; src = fetchFromGitHub { owner = "gotenberg"; repo = "gotenberg"; tag = "v${version}"; - hash = "sha256-y54DtOYIzFAk05TvXFcLdStfAXim3sVHBkW+R8CrtMM="; + hash = "sha256-m8aDhfcUa3QFr+7hzlQFL2wPfcx5RE+3dl5RHzWwau0="; }; - vendorHash = "sha256-BYcdqZ8TNEG6popRt+Dg5xW5Q7RmYvdlV+niUNenRG0="; + vendorHash = "sha256-EM+Rpo4Zf+aqA56aFeuQ0tbvpTgZhmfv+B7qYI6PXWc="; postPatch = '' find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \; + substituteInPlace pkg/gotenberg/fs_test.go \ + --replace-fail "/tmp" "/build" ''; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -52,6 +55,7 @@ buildGoModule rec { pdftk qpdf unoconv + pdfcpu mktemp jre' ]; @@ -62,6 +66,7 @@ buildGoModule rec { export QPDF_BIN_PATH=${getExe qpdf} export UNOCONVERTER_BIN_PATH=${getExe unoconv} export EXIFTOOL_BIN_PATH=${getExe exiftool} + export PDFCPU_BIN_PATH=${getExe pdfcpu} # LibreOffice needs all of these set to work properly export LIBREOFFICE_BIN_PATH=${libreoffice'} export FONTCONFIG_FILE=${fontsConf} @@ -70,7 +75,14 @@ buildGoModule rec { ''; # These tests fail with a panic, so disable them. - checkFlags = [ "-skip=^TestChromiumBrowser_(screenshot|pdf)$" ]; + checkFlags = + let + skippedTests = [ + "TestChromiumBrowser_(screenshot|pdf)" + "TestNewContext" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; preFixup = '' wrapProgram $out/bin/gotenberg \ @@ -78,6 +90,7 @@ buildGoModule rec { --set QPDF_BIN_PATH "${getExe qpdf}" \ --set UNOCONVERTER_BIN_PATH "${getExe unoconv}" \ --set EXIFTOOL_BIN_PATH "${getExe exiftool}" \ + --set PDFCPU_BIN_PATH "${getExe pdfcpu}" \ --set JAVA_HOME "${jre'}" ''; diff --git a/pkgs/by-name/go/gotestsum/package.nix b/pkgs/by-name/go/gotestsum/package.nix index 810fe5438fe8..e3e3c5927481 100644 --- a/pkgs/by-name/go/gotestsum/package.nix +++ b/pkgs/by-name/go/gotestsum/package.nix @@ -3,41 +3,36 @@ fetchFromGitHub, buildGoModule, }: -let - version = "1.12.0"; -in -buildGoModule { +buildGoModule (finalAttrs: { pname = "gotestsum"; - - # move back to stable releases when build is successful - version = "${version}-unstable-2024-09-17"; + version = "1.12.2"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; - rev = "2f61a73f997821b2e5a1823496e8362630e213f9"; - hash = "sha256-5zgchATcpoM4g5Mxex9wYanzrR0Pie9GYqx48toORkM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-l4K+8J24egaKS64inQrBWnPLLGBu1W03OUi4WWQoAgs="; }; - vendorHash = "sha256-DR4AyEhgD71hFFEAnPfSxaWYFFV7FlPugZBHUjDynEE="; + vendorHash = "sha256-SJacdFAdMiKDGLnEEBKnblvHglIBIKf2N20EOFCPs88="; doCheck = false; ldflags = [ "-s" "-w" - "-X gotest.tools/gotestsum/cmd.version=${version}" + "-X gotest.tools/gotestsum/cmd.version=${finalAttrs.version}" ]; subPackages = [ "." ]; meta = { homepage = "https://github.com/gotestyourself/gotestsum"; - changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${version}"; + changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${finalAttrs.version}"; description = "Human friendly `go test` runner"; mainProgram = "gotestsum"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ isabelroses ]; }; -} +}) diff --git a/pkgs/by-name/go/gotestwaf/package.nix b/pkgs/by-name/go/gotestwaf/package.nix index 343aaa66226f..31fe0ced6279 100644 --- a/pkgs/by-name/go/gotestwaf/package.nix +++ b/pkgs/by-name/go/gotestwaf/package.nix @@ -31,7 +31,7 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "Tool for API and OWASP attack simulation"; diff --git a/pkgs/by-name/go/gotify-desktop/package.nix b/pkgs/by-name/go/gotify-desktop/package.nix index 6ebaeef8d379..0f3f652bd45e 100644 --- a/pkgs/by-name/go/gotify-desktop/package.nix +++ b/pkgs/by-name/go/gotify-desktop/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "gotify-desktop"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "desbma"; repo = "gotify-desktop"; rev = version; - sha256 = "sha256-P6zZAd3381/JamrEdbZRVFouhDsPNy1cNAjy4K3jGro="; + sha256 = "sha256-QhzvY7MeOvrL+xxeV7gPXWRo3EinMMdS9A7oh38gYjU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-od8eaOwf5k//HuzD4CNCOu8JGJv1P1TJTW0shgEnFDc="; + cargoHash = "sha256-fNOC8atr5/LgQcGf9jdxec9AQt3YIR+hem/xL10YYqY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/go/gotify-server/package.nix b/pkgs/by-name/go/gotify-server/package.nix index 3946198e2fbc..1ddcc27bd420 100644 --- a/pkgs/by-name/go/gotify-server/package.nix +++ b/pkgs/by-name/go/gotify-server/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "gotify-server"; - version = "2.6.1"; + version = "2.6.3"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - hash = "sha256-6PmJnRBovyufrSB+uMbU+bqhZb1bEs39MxBVMnnE6f8="; + hash = "sha256-9vIReA29dWf3QwUYEW8JhzF9o74JZqG4zGobgI+gIWE="; }; # With `allowGoReference = true;`, `buildGoModule` adds the `-trimpath` @@ -25,7 +25,7 @@ buildGoModule rec { # server[780]: stat /var/lib/private/ui/build/index.html: no such file or directory allowGoReference = true; - vendorHash = "sha256-aru1Q3esLtyxV6CVup4qjsuaJlM5DuLuP8El4RYoVVE="; + vendorHash = "sha256-rs6EfnJT6Jgif2TR5u5Tp5/Ozn+4uhSapksyKFnQiCo="; doCheck = false; diff --git a/pkgs/by-name/go/goto/package.nix b/pkgs/by-name/go/goto/package.nix new file mode 100644 index 000000000000..3a36d160a2cc --- /dev/null +++ b/pkgs/by-name/go/goto/package.nix @@ -0,0 +1,62 @@ +{ + fetchFromGitHub, + gawk, + lib, + nix-update-script, + runCommand, + stdenvNoCC, + writableTmpDirAsHomeHook, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "goto"; + version = "2.1.0-unstable-2020-11-15"; + + src = fetchFromGitHub { + owner = "iridakos"; + repo = "goto"; + # no tags + rev = "b7fda54e0817b9cb47e22a78bd00b4571011cf58"; + hash = "sha256-dUxim8LLb+J9cI7HySkmC2DIWbWAKSsH/cTVXmt8zRo="; + }; + + strictDeps = true; + + buildInputs = [ gawk ]; + + postInstall = '' + install -Dm644 goto.sh -t $out/share/ + ''; + + passthru.tests.basic-usage = + runCommand "goto-basic-usage" + { + nativeBuildInputs = [ writableTmpDirAsHomeHook ]; + } + '' + # Mock `complete` since the builder `pkgs.bash` is not interactive. + complete() { return; } + + source ${finalAttrs.finalPackage}/share/goto.sh + + goto --register pwd . + cd / + goto pwd + goto --unregister pwd + goto --list + + touch $out + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Alias and navigate to directories with tab completion"; + homepage = "https://github.com/iridakos/goto"; + changelog = "https://github.com/iridakos/goto/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.bmrips ]; + }; +}) diff --git a/pkgs/by-name/go/gotop/package.nix b/pkgs/by-name/go/gotop/package.nix new file mode 100644 index 000000000000..ded71d3bf8d1 --- /dev/null +++ b/pkgs/by-name/go/gotop/package.nix @@ -0,0 +1,50 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + writableTmpDirAsHomeHook, +}: + +buildGoModule (finalAttrs: { + pname = "gotop"; + version = "4.2.0"; + + outputs = [ + "out" + "man" + ]; + + src = fetchFromGitHub { + owner = "xxxserxxx"; + repo = "gotop"; + rev = "v${finalAttrs.version}"; + hash = "sha256-W7a3QnSIR95N88RqU2sr6oEDSqOXVfAwacPvS219+1Y="; + }; + + proxyVendor = true; + vendorHash = "sha256-KLeVSrPDS1lKsKFemRmgxT6Pxack3X3B/btSCOUSUFY="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=v${finalAttrs.version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + + postInstall = '' + $out/bin/gotop --create-manpage > gotop.1 + installManPage gotop.1 + ''; + + meta = { + description = "Terminal based graphical activity monitor inspired by gtop and vtop"; + homepage = "https://github.com/xxxserxxx/gotop"; + changelog = "https://github.com/xxxserxxx/gotop/raw/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.magnetophon ]; + mainProgram = "gotop"; + }; +}) diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix index 6a6f48c67f6d..5a4af08568e0 100644 --- a/pkgs/by-name/go/gotosocial/package.nix +++ b/pkgs/by-name/go/gotosocial/package.nix @@ -1,29 +1,30 @@ { lib, fetchurl, - fetchFromGitHub, + fetchFromGitea, buildGoModule, nixosTests, }: let + domain = "codeberg.org"; owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.18.3"; + version = "0.19.1"; web-assets = fetchurl { - url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-60aSiWHHHDxZggreqTVHip2Ld/PyN9T4k+NGjX/ONQc="; + url = "https://${domain}/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; + hash = "sha256-UtxFm8ZSpIGXruBdanSF1lkA7Gs1FJNhoqzDTqSNYUM="; }; in buildGoModule rec { inherit version; pname = repo; - src = fetchFromGitHub { - inherit owner repo; + src = fetchFromGitea { + inherit domain owner repo; tag = "v${version}"; - hash = "sha256-fn3QrfTrKYWABRMF3imyoeVEpARl13fcq6Fu2GwsrcE="; + hash = "sha256-RhJRdRxTdbZwIAGD3gH0mjDfCvdS7xkRxcUd1ArsNoo="; }; vendorHash = null; @@ -63,7 +64,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://gotosocial.org"; - changelog = "https://github.com/superseriousbusiness/gotosocial/releases/tag/v${version}"; + changelog = "https://codeberg.org/superseriousbusiness/gotosocial/releases/tag/v${version}"; description = "Fast, fun, ActivityPub server, powered by Go"; longDescription = '' ActivityPub social network server, written in Golang. diff --git a/pkgs/by-name/go/gotraceui/package.nix b/pkgs/by-name/go/gotraceui/package.nix index 9730a2e6df91..fad24526af25 100644 --- a/pkgs/by-name/go/gotraceui/package.nix +++ b/pkgs/by-name/go/gotraceui/package.nix @@ -10,6 +10,7 @@ libxkbcommon, vulkan-headers, wayland, + fetchpatch, }: buildGoModule rec { @@ -19,11 +20,19 @@ buildGoModule rec { src = fetchFromGitHub { owner = "dominikh"; repo = "gotraceui"; - rev = "v${version}"; + tag = "v${version}"; sha256 = "sha256-Rforuh9YlTv/mTpQm0+BaY+Ssc4DAiDCzVkIerP5Uz0="; }; - vendorHash = "sha256-dNV5u6BG+2Nzci6dX/4/4WAeM/zXE5+Ix0HqIsNnm0E="; + patches = [ + (fetchpatch { + name = "switch-to-gio-fork.patch"; + url = "https://github.com/dominikh/gotraceui/commit/00289f5f4c1da3e13babd2389e533b069cd18e3c.diff"; + hash = "sha256-dxsVMjyKkRG4Q6mONlJAohWJ8YTu8KN7ynPVycJhcs8="; + }) + ]; + + vendorHash = "sha256-9rzcSxlOuQC5bt1kZuRX7CTQaDHKrtGRpMNLrOHTjJk="; subPackages = [ "cmd/gotraceui" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/go/gource/package.nix b/pkgs/by-name/go/gource/package.nix index 41ee7d59812f..3d14cafc0414 100644 --- a/pkgs/by-name/go/gource/package.nix +++ b/pkgs/by-name/go/gource/package.nix @@ -13,6 +13,7 @@ glew, libGLU, libGL, + libX11, boost, glm, tinyxml, @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { SDL2_image libGLU libGL + libX11 boost glm freetype diff --git a/pkgs/by-name/go/govc/package.nix b/pkgs/by-name/go/govc/package.nix index f9caec412a5b..812c065713ae 100644 --- a/pkgs/by-name/go/govc/package.nix +++ b/pkgs/by-name/go/govc/package.nix @@ -4,32 +4,32 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "govc"; - version = "0.46.3"; - - subPackages = [ "govc" ]; + version = "0.50.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-vwvhVC+Avi55uenlW68tWGREEHRZw8RUjgiC0r7BgQ4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-4dGwX9+b94KT0Y78o4f7hvlZUipuV1q6j70v7pRytAg="; }; - vendorHash = "sha256-ddofXjBnyHRn7apS8hpM57S1oo+1w5i4n0Z6ZPKQEDI="; + vendorHash = "sha256-IyQ9a8dIny3QA1VXeLydif195idH5U4xr9/+76g5nYY="; + + sourceRoot = "${finalAttrs.src.name}/govc"; ldflags = [ "-s" "-w" - "-X github.com/vmware/govmomi/govc/flags.BuildVersion=${version}" + "-X github.com/vmware/govmomi/govc/flags.BuildVersion=${finalAttrs.version}" ]; meta = { description = "VSphere CLI built on top of govmomi"; - homepage = "https://github.com/vmware/govmomi/tree/master/govc"; + homepage = "https://github.com/vmware/govmomi/tree/main/govc"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nicknovitski ]; mainProgram = "govc"; }; -} +}) diff --git a/pkgs/by-name/go/goverter/package.nix b/pkgs/by-name/go/goverter/package.nix new file mode 100644 index 000000000000..b7d1525f800c --- /dev/null +++ b/pkgs/by-name/go/goverter/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule rec { + pname = "goverter"; + version = "1.8.3"; + + src = fetchFromGitHub { + owner = "jmattheis"; + repo = "goverter"; + tag = "v${version}"; + hash = "sha256-ytW52raI4MV6cX/ThR6p9hohtngwBYuvSrtOfjnqwXc="; + }; + + vendorHash = "sha256-YOtcidMhtQqw/KxY1R3L3XnrhayGQBvHkRdbvYyCQFM="; + + subPackages = [ "cmd/goverter" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Generate type-safe Go converters by defining function signatures."; + homepage = "https://github.com/jmattheis/goverter"; + changelog = "https://goverter.jmattheis.de/changelog"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ krostar ]; + mainProgram = "goverter"; + }; +} diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix index 581840505d15..52560b3b6a92 100644 --- a/pkgs/by-name/go/gowall/package.nix +++ b/pkgs/by-name/go/gowall/package.nix @@ -4,22 +4,28 @@ buildGoModule, fetchFromGitHub, installShellFiles, + nix-update-script, + writableTmpDirAsHomeHook, }: buildGoModule rec { pname = "gowall"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "Achno"; repo = "gowall"; rev = "v${version}"; - hash = "sha256-QKukWA8TB0FoNHu0Wyco55x4oBY+E33qdoT/SaXW6DE="; + hash = "sha256-fgO4AoyHR51zD86h75b06BXV0ONlFfHdBvxfJvcD7J8="; }; - vendorHash = "sha256-H2Io1K2LEFmEPJYVcEaVAK2ieBrkV6u+uX82XOvNXj4="; + vendorHash = "sha256-V/VkbJZIzy4KlEPtlTTqdUIPG6lKD+XidNM0NWpATbk="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + # using writableTmpDirAsHomeHook to prevent issues when creating config dir for shell completions + writableTmpDirAsHomeHook + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd gowall \ --bash <($out/bin/gowall completion bash) \ @@ -27,6 +33,8 @@ buildGoModule rec { --zsh <($out/bin/gowall completion zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/Achno/gowall/releases/tag/v${version}"; description = "Tool to convert a Wallpaper's color scheme / palette"; @@ -36,6 +44,7 @@ buildGoModule rec { maintainers = with lib.maintainers; [ crem emilytrau + FKouhai ]; }; } diff --git a/pkgs/by-name/go/gowebly/package.nix b/pkgs/by-name/go/gowebly/package.nix new file mode 100644 index 000000000000..f44aa0dad7b4 --- /dev/null +++ b/pkgs/by-name/go/gowebly/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGo124Module, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGo124Module rec { + pname = "gowebly"; + version = "3.0.3"; + + src = fetchFromGitHub { + owner = "gowebly"; + repo = "gowebly"; + tag = "v${version}"; + hash = "sha256-iCdChT/eAWfeZyl5W1UHIjET3MGUD1YakjTToSS7iGs="; + }; + + vendorHash = "sha256-mFCNrcdwSExjVym4BN1Yb/lsfQHxCDrlWoa9vyQ74ko="; + + env.CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "doctor"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI tool to create web applications with Go backend"; + longDescription = '' + A CLI tool that makes it easy to create web applications + with Go on the backend, using htmx, hyperscript or Alpine.js, + and the most popular CSS frameworks on the frontend. + ''; + homepage = "https://gowebly.org"; + changelog = "https://github.com/gowebly/gowebly/releases/tag/v${version}"; + license = lib.licenses.asl20; + mainProgram = "gowebly"; + maintainers = with lib.maintainers; [ cterence ]; + }; +} diff --git a/pkgs/by-name/go/gox/package.nix b/pkgs/by-name/go/gox/package.nix index d78d74191fee..8ff5fda50bf1 100644 --- a/pkgs/by-name/go/gox/package.nix +++ b/pkgs/by-name/go/gox/package.nix @@ -33,6 +33,6 @@ buildGoModule rec { description = "Dead simple, no frills Go cross compile tool"; mainProgram = "gox"; license = licenses.mpl20; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/go/goxlr-utility/package.nix b/pkgs/by-name/go/goxlr-utility/package.nix index d38d7c6be0a1..2d1cf6eef7ef 100644 --- a/pkgs/by-name/go/goxlr-utility/package.nix +++ b/pkgs/by-name/go/goxlr-utility/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "goxlr-utility"; - version = "1.1.4"; + version = "1.2.2"; src = fetchFromGitHub { owner = "GoXLR-on-Linux"; repo = "goxlr-utility"; rev = "v${version}"; - hash = "sha256-aThIu+3eNHCKS6lsio7cLZeIMg0509qkE0YQ6M6vPAI="; + hash = "sha256-Z/VqQKmfzqd1htMlXU8sDkOSw2xczb3tG53LVC0MZhM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EhqniqdgD95yUwiaqlA0vtRZfq4cR7wxsGPmjpvzgdI="; + cargoHash = "sha256-tSlFMMZWsyZBXBeEW64s0eBt/qrAREfOpfxAgcTK4XQ="; buildInputs = [ libpulseaudio diff --git a/pkgs/by-name/gp/gpaste/package.nix b/pkgs/by-name/gp/gpaste/package.nix index 7b8259509aa6..97c4cefacaac 100644 --- a/pkgs/by-name/gp/gpaste/package.nix +++ b/pkgs/by-name/gp/gpaste/package.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "45.2"; pname = "gpaste"; + version = "45.3"; src = fetchurl { url = "https://www.imagination-land.org/files/gpaste/GPaste-${finalAttrs.version}.tar.xz"; - hash = "sha256-2WC0FGPQisY3YH4EgJcR/Re69fJznUD1KlCGljivyEE="; + hash = "sha256-UU8pw7bqEwg2Vh7S6GTx8swI/2IhlwjQgkGNZCzoMwc="; }; patches = [ @@ -85,6 +85,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "gpaste-client"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; }) diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index 2fd26d1dd832..a504f94d7693 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -2,7 +2,6 @@ rustPlatform, lib, fetchFromGitHub, - libsoup_2_4, openssl, pkg-config, perl, @@ -29,7 +28,6 @@ rustPlatform.buildRustPackage rec { pkg-config ]; buildInputs = [ - libsoup_2_4 openssl webkitgtk_4_1 ]; diff --git a/pkgs/by-name/gp/gpg-mdp/package.nix b/pkgs/by-name/gp/gpg-mdp/package.nix index 9e145a5fe2b1..522cbc8852df 100644 --- a/pkgs/by-name/gp/gpg-mdp/package.nix +++ b/pkgs/by-name/gp/gpg-mdp/package.nix @@ -1,53 +1,53 @@ { - fetchurl, - fetchpatch, lib, + fetchFromGitHub, stdenv, + nix-update-script, + ncurses, gnupg, }: -let - version = "0.7.4"; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { # mdp renamed to gpg-mdp because there is a mdp package already. pname = "gpg-mdp"; - inherit version; + version = "0.7.5"; + meta = { homepage = "https://tamentis.com/projects/mdp/"; + changelog = "https://github.com/tamentis/mdp/releases/tag/v${finalAttrs.version}"; license = [ lib.licenses.isc ]; description = "Manage your passwords with GnuPG and a text editor"; }; - src = fetchurl { - url = "https://tamentis.com/projects/mdp/files/mdp-${version}.tar.gz"; - sha256 = "04mdnx4ccpxf9m2myy9nvpl9ma4jgzmv9bkrzv2b9affzss3r34g"; + + src = fetchFromGitHub { + owner = "tamentis"; + repo = "mdp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y92y70XkUbB+lhWAzEkCB/cvfUPPKIfu0yrlCS2pKn0="; }; - patches = [ - # Pull fix pending upstream inclusion for -fno-common toolchain support: - # https://github.com/tamentis/mdp/pull/9 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/tamentis/mdp/commit/95c77de3beb96dc7c76ff36d3f3dfb18411d7c54.patch"; - sha256 = "1j6yvjzkx31b758yav4arhlm5ig7phl8mgx4fcwj7lm2pfvzwcsz"; - }) - ]; + buildInputs = [ ncurses ]; + prePatch = '' substituteInPlace ./configure \ - --replace "alias echo=/bin/echo" "" + --replace-fail "alias echo=/bin/echo" "" \ + --replace-fail "main()" "int main()" substituteInPlace ./src/config.c \ - --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" \ - --replace "/usr/bin/vi" "vi" + --replace-fail "/usr/bin/gpg" "${lib.getExe gnupg}" \ + --replace-fail "/usr/bin/vi" "vi" substituteInPlace ./mdp.1 \ - --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" + --replace-fail "/usr/bin/gpg" "${lib.getExe gnupg}" ''; + # we add symlinks to the binary and man page with the name 'gpg-mdp', in case # the completely unrelated program also named 'mdp' is already installed. postFixup = '' ln -s $out/bin/mdp $out/bin/gpg-mdp ln -s $out/share/man/man1/mdp.1.gz $out/share/man/man1/gpg-mdp.1.gz ''; -} + + passthru.updateScript = nix-update-script { }; +}) diff --git a/pkgs/by-name/gp/gping/package.nix b/pkgs/by-name/gp/gping/package.nix index 5f07ef97c6b5..3724f1ed6de3 100644 --- a/pkgs/by-name/gp/gping/package.nix +++ b/pkgs/by-name/gp/gping/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gp/gpredict-unstable/package.nix b/pkgs/by-name/gp/gpredict-unstable/package.nix new file mode 100644 index 000000000000..b048563a747b --- /dev/null +++ b/pkgs/by-name/gp/gpredict-unstable/package.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + goocanvas3, + nix-update-script, + gpredict, +}: + +(gpredict.override { + goocanvas2 = goocanvas3; +}).overrideAttrs + (finalAttrs: { + # Next version is 2.4.0 + version = "2.4.0-unstable-2024-09-17"; + + src = fetchFromGitHub { + owner = "csete"; + repo = "gpredict"; + rev = "91a4a3fb15e7eab0374d1bb7c859d386818b48ee"; + hash = "sha256-/XCJ+jCSY4o0OLVVY6OGvnmMw6aI/iQOhjyLYWPj7Ec="; + }; + + patches = [ ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + }) diff --git a/pkgs/by-name/gp/gpredict/package.nix b/pkgs/by-name/gp/gpredict/package.nix new file mode 100644 index 000000000000..efefa509f622 --- /dev/null +++ b/pkgs/by-name/gp/gpredict/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + pkg-config, + intltool, + autoreconfHook, + gtk3, + glib, + curl, + goocanvas2, + gpsd, + hamlib_4, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gpredict"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "csete"; + repo = "gpredict"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+hgjImfT3nWMBYwde7+KC/hzd84pwQbpoJvaJSNG4E8="; + }; + + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/csete/gpredict/issues/195 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch"; + sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a"; + }) + # Updates URLs for TLE files + # https://github.com/csete/gpredict/pull/305 + (fetchpatch { + name = "TLE-urls.patch"; + url = "https://github.com/csete/gpredict/commit/8f60f856921e8ee143cd6e2d34a9183778cb0fbf.patch"; + hash = "sha256-X/nKrqh5sjxDMLhA9LQek8AsJFqhvK/k8Ep3ug/0rMI="; + }) + + ]; + + nativeBuildInputs = [ + pkg-config + intltool + wrapGAppsHook3 + autoreconfHook + ]; + buildInputs = [ + curl + glib + gtk3 + goocanvas2 + gpsd + hamlib_4 + ]; + + meta = { + description = "Real time satellite tracking and orbit prediction"; + mainProgram = "gpredict"; + longDescription = '' + Gpredict is a real time satellite tracking and orbit prediction program + written using the GTK widgets. Gpredict is targetted mainly towards ham radio + operators but others interested in satellite tracking may find it useful as + well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the + NORAD Keplerian elements. + ''; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + homepage = "http://gpredict.oz9aec.net/"; + maintainers = with lib.maintainers; [ + markuskowa + cmcdragonkai + pandapip1 + ]; + }; +}) diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix index adcde9cc1d97..553f2780c448 100644 --- a/pkgs/by-name/gp/gpsd/package.nix +++ b/pkgs/by-name/gp/gpsd/package.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { patches = [ ./sconstruct-env-fixes.patch + ./sconstrict-rundir-fixes.patch # fix build with Python 3.12 (fetchpatch { diff --git a/pkgs/by-name/gp/gpsd/sconstrict-rundir-fixes.patch b/pkgs/by-name/gp/gpsd/sconstrict-rundir-fixes.patch new file mode 100644 index 000000000000..386211198b65 --- /dev/null +++ b/pkgs/by-name/gp/gpsd/sconstrict-rundir-fixes.patch @@ -0,0 +1,21 @@ +diff -Naur gpsd-3.25.orig/SConscript gpsd-3.25/SConscript +--- gpsd-3.25.orig/SConscript 2025-03-29 13:33:34 ++++ gpsd-3.25/SConscript 2025-03-29 13:34:24 +@@ -15,6 +15,7 @@ + import os + import pickle + import re ++import platform + # replacement for functions from the commands module, which is deprecated. + import subprocess + import sys +@@ -399,7 +400,7 @@ + def_group = "dialout" + + # darwin and BSDs do not have /run, maybe others. +-if os.path.exists("/run"): ++if "BSD" in os.uname().sysname or platform.system() == "Darwin": + rundir = "/run" + else: + rundir = "/var/run" + \ No newline at end of file diff --git a/pkgs/by-name/gp/gpt-box/package.nix b/pkgs/by-name/gp/gpt-box/package.nix new file mode 100644 index 000000000000..05e7303298b4 --- /dev/null +++ b/pkgs/by-name/gp/gpt-box/package.nix @@ -0,0 +1,87 @@ +{ + lib, + flutter329, + fetchFromGitHub, + autoPatchelfHook, + copyDesktopItems, + makeDesktopItem, + runCommand, + yq, + gpt-box, + _experimental-update-script-combinators, + gitUpdater, +}: + +flutter329.buildFlutterApplication rec { + pname = "gpt-box"; + version = "1.0.385"; + + src = fetchFromGitHub { + owner = "lollipopkit"; + repo = "flutter_gpt_box"; + tag = "v${version}"; + hash = "sha256-gl8kANxZLNXSuZxcK9WqfXxVWsCpZCbV+qmSt2ZnI6E="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes = { + computer = "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8="; + fl_build = "sha256-CSKe2yEIisftM0q79HbDTghShirWg02zi9v+hD5R57g="; + fl_lib = "sha256-gAZqxPOBMXfy0mHEd7Jud0QJwyRbqC4nIRDIA81TZxM="; + flutter_highlight = "sha256-jSATD4Ww5FHEscGNiTN/FE1+iQHzg/XMbsC9f5XcNGw="; + openai_dart = "sha256-FP8J8ul8F68vrEdEZAmzNS921evtRfCIOlV2Aubifaw="; + webdav_client = "sha256-aTkMcrXksHLEG4UpeE1MBmCKpX5l11+y/p4tICrOTGk="; + }; + + nativeBuildInputs = [ + copyDesktopItems + autoPatchelfHook + ]; + + desktopItems = [ + (makeDesktopItem { + name = "gpt-box"; + exec = "gpt-box"; + icon = "gpt-box"; + genericName = "GPT Box"; + desktopName = "GPT Box"; + categories = [ "Utility" ]; + keywords = [ + "gpt" + "chat" + "openai" + "ai" + ]; + }) + ]; + + postInstall = '' + install -Dm0644 assets/app_icon.png $out/share/pixmaps/gpt-box.png + ''; + + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + nativeBuildInputs = [ yq ]; + inherit (gpt-box) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "gpt-box.pubspecSource" ./pubspec.lock.json) + ]; + }; + + meta = { + description = "Third-party client for OpenAI API"; + homepage = "https://github.com/lollipopkit/flutter_gpt_box"; + mainProgram = "GPTBox"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ emaryn ]; + }; +} diff --git a/pkgs/by-name/gp/gpt-box/pubspec.lock.json b/pkgs/by-name/gp/gpt-box/pubspec.lock.json new file mode 100644 index 000000000000..a8439eea8bfd --- /dev/null +++ b/pkgs/by-name/gp/gpt-box/pubspec.lock.json @@ -0,0 +1,2249 @@ +{ + "packages": { + "_discoveryapis_commons": { + "dependency": "transitive", + "description": { + "name": "_discoveryapis_commons", + "sha256": "113c4100b90a5b70a983541782431b82168b3cae166ab130649c36eb3559d498", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.7" + }, + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "76.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.3" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.11.0" + }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "app_links": { + "dependency": "direct main", + "description": { + "name": "app_links", + "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.0" + }, + "app_links_linux": { + "dependency": "transitive", + "description": { + "name": "app_links_linux", + "sha256": "f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "app_links_platform_interface": { + "dependency": "transitive", + "description": { + "name": "app_links_platform_interface", + "sha256": "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "app_links_web": { + "dependency": "transitive", + "description": { + "name": "app_links_web", + "sha256": "af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "asn1lib": { + "dependency": "transitive", + "description": { + "name": "asn1lib", + "sha256": "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.9" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.12.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.4" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.15" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.3" + }, + "camera": { + "dependency": "transitive", + "description": { + "name": "camera", + "sha256": "413d2b34fe28496c35c69ede5b232fb9dd5ca2c3a4cb606b14efc1c7546cc8cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "camera_android_camerax": { + "dependency": "transitive", + "description": { + "name": "camera_android_camerax", + "sha256": "7cc6adf1868bdcf4e63a56b24b41692dfbad2bec1cdceea451c77798f6a605c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.13" + }, + "camera_avfoundation": { + "dependency": "transitive", + "description": { + "name": "camera_avfoundation", + "sha256": "1eeb9ce7c9a397e312343fd7db337d95f35c3e65ad5a62ff637c8abce5102b98", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.18+8" + }, + "camera_platform_interface": { + "dependency": "transitive", + "description": { + "name": "camera_platform_interface", + "sha256": "953e7baed3a7c8fae92f7200afeb2be503ff1a17c3b4e4ed7b76f008c2810a31", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.0" + }, + "camera_web": { + "dependency": "transitive", + "description": { + "name": "camera_web", + "sha256": "595f28c89d1fb62d77c73c633193755b781c6d2e0ebcd8dc25b763b514e6ba8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.5" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "charset": { + "dependency": "transitive", + "description": { + "name": "charset", + "sha256": "27802032a581e01ac565904ece8c8962564b1070690794f0072f6865958ce8b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "choice": { + "dependency": "transitive", + "description": { + "name": "choice", + "sha256": "52d07065e8056beba5b26cff7786134cbfa24927b1f5bf60a05d50058597b2d9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "cloudflare_turnstile": { + "dependency": "transitive", + "description": { + "name": "cloudflare_turnstile", + "sha256": "c7f37c7327d3f03b528a2334a5131c352ce62a545254e557693227a207801dc7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.1" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "computer": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "v1.0.88", + "resolved-ref": "b0819c8a939e1fa6858f1a0e12ee8122db0df390", + "url": "https://github.com/lollipopkit/dart_computer" + }, + "source": "git", + "version": "3.2.1" + }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.8" + }, + "dio": { + "dependency": "transitive", + "description": { + "name": "dio", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.8.0+1" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "encrypt": { + "dependency": "transitive", + "description": { + "name": "encrypt", + "sha256": "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.3" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.7" + }, + "extended_image": { + "dependency": "direct main", + "description": { + "name": "extended_image", + "sha256": "85199f9233e03abc2ce2e68cbb2991648666af4a527ae4e6250935be8edfddae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.0" + }, + "extended_image_library": { + "dependency": "transitive", + "description": { + "name": "extended_image_library", + "sha256": "e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.6" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "fetch_api": { + "dependency": "transitive", + "description": { + "name": "fetch_api", + "sha256": "97f46c25b480aad74f7cc2ad7ccba2c5c6f08d008e68f95c1077286ce243d0e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "fetch_client": { + "dependency": "transitive", + "description": { + "name": "fetch_client", + "sha256": "9666ee14536778474072245ed5cba07db81ae8eb5de3b7bf4a2d1e2c49696092", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.3.7" + }, + "file_selector_linux": { + "dependency": "transitive", + "description": { + "name": "file_selector_linux", + "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+2" + }, + "file_selector_macos": { + "dependency": "transitive", + "description": { + "name": "file_selector_macos", + "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4+2" + }, + "file_selector_platform_interface": { + "dependency": "transitive", + "description": { + "name": "file_selector_platform_interface", + "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "file_selector_windows": { + "dependency": "transitive", + "description": { + "name": "file_selector_windows", + "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+4" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "fl_build": { + "dependency": "direct dev", + "description": { + "path": ".", + "ref": "v1.0.48", + "resolved-ref": "9a589bb5b8d8376e32fb73793e8cf7c4ec4894a5", + "url": "https://github.com/lppcg/fl_build.git" + }, + "source": "git", + "version": "1.0.0" + }, + "fl_lib": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "v1.0.244", + "resolved-ref": "5104bf4a32003ef76877555f58a2986c0646ead3", + "url": "https://github.com/lppcg/fl_lib" + }, + "source": "git", + "version": "0.0.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_app_builder": { + "dependency": "transitive", + "description": { + "name": "flutter_app_builder", + "sha256": "74018c0e2da3ae33073e7417b5c8e900fdc7b5ebc3bdacd2dd05244d9b5e54cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "flutter_app_packager": { + "dependency": "transitive", + "description": { + "name": "flutter_app_packager", + "sha256": "3925c4e2ac53f4a5ce3bae1a5f54966620504d6c28725b112074cfbdf227a36b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "flutter_app_publisher": { + "dependency": "transitive", + "description": { + "name": "flutter_app_publisher", + "sha256": "bbb1953ef723fc98a7f974ae9499194999f570194c6d856182518e6e73b51ff2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "flutter_distributor": { + "dependency": "direct dev", + "description": { + "name": "flutter_distributor", + "sha256": "45d27526a5de93370e322da5314b0a1c07c024b79031a8ad44435046915fa0e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "flutter_highlight": { + "dependency": "direct main", + "description": { + "path": "flutter_highlight", + "ref": "master", + "resolved-ref": "d5ba88ed6d4e49a95745ee1eb85cee01e307108e", + "url": "https://github.com/lollipopkit/highlight.dart" + }, + "source": "git", + "version": "0.7.0" + }, + "flutter_inappwebview": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview", + "sha256": "a8f5c9dd300a8cc7fde7bb902ae57febe95e9269424e4d08d5a1a56214e1e6ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.0-beta.2" + }, + "flutter_inappwebview_android": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_android", + "sha256": "2427e89d9c7b00cc756f800932d7ab8f3272d3fbc71544e1aedb3dbc17dae074", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_internal_annotations": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_internal_annotations", + "sha256": "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "flutter_inappwebview_ios": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_ios", + "sha256": "7ff65d7408e453f9a4ff38f74673aeec8cae824cba8276b4b77350262bfe356a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_macos", + "sha256": "be8b8ab0100c94ec9fc079a4d48b2bc8dd1a8b4c2647da34f1d3dae93cd5f88a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_platform_interface", + "sha256": "2c99bf767900ba029d825bc6f494d30169ee83cdaa038d86e85fe70571d0a655", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0-beta.2" + }, + "flutter_inappwebview_web": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_web", + "sha256": "6c4bb61ea9d52e51d79ea23da27c928d0430873c04ad380df39c1ef442b11f4e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_windows", + "sha256": "0ff241f814b7caff63b9632cf858b6d3d9c35758040620a9745e5f6e9dd94d74", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0-beta.2" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_markdown": { + "dependency": "transitive", + "description": { + "name": "flutter_markdown", + "sha256": "e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6+2" + }, + "flutter_markdown_latex": { + "dependency": "transitive", + "description": { + "name": "flutter_markdown_latex", + "sha256": "839e76a84abb3632ffcebbd450cf93c7e9894af65622527d23f0084cee1bfd04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4" + }, + "flutter_math_fork": { + "dependency": "transitive", + "description": { + "name": "flutter_math_fork", + "sha256": "284bab89b2fbf1bc3a0baf13d011c1dd324d004e35d177626b77f2fc056366ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "flutter_native_splash": { + "dependency": "direct dev", + "description": { + "name": "flutter_native_splash", + "sha256": "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.24" + }, + "flutter_svg": { + "dependency": "transitive", + "description": { + "name": "flutter_svg", + "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.17" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "freezed_annotation": { + "dependency": "transitive", + "description": { + "name": "freezed_annotation", + "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "google_fonts": { + "dependency": "direct main", + "description": { + "name": "google_fonts", + "sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.1" + }, + "google_identity_services_web": { + "dependency": "transitive", + "description": { + "name": "google_identity_services_web", + "sha256": "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.3" + }, + "googleapis": { + "dependency": "transitive", + "description": { + "name": "googleapis", + "sha256": "864f222aed3f2ff00b816c675edf00a39e2aaf373d728d8abec30b37bee1a81c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.2.0" + }, + "googleapis_auth": { + "dependency": "transitive", + "description": { + "name": "googleapis_auth", + "sha256": "befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "gtk": { + "dependency": "transitive", + "description": { + "name": "gtk", + "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "highlight": { + "dependency": "transitive", + "description": { + "name": "highlight", + "sha256": "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "hive": { + "dependency": "transitive", + "description": { + "name": "hive", + "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "hive_flutter": { + "dependency": "transitive", + "description": { + "name": "hive_flutter", + "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "hive_generator": { + "dependency": "direct dev", + "description": { + "name": "hive_generator", + "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.5" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "http_client_helper": { + "dependency": "transitive", + "description": { + "name": "http_client_helper", + "sha256": "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "icloud_storage": { + "dependency": "transitive", + "description": { + "name": "icloud_storage", + "sha256": "fa91d9c3b4264651f01a4f5b99cffa354ffe455623b13ecf92be86d88b1e26ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "icons_plus": { + "dependency": "transitive", + "description": { + "name": "icons_plus", + "sha256": "8e2f601b8605d45dd55b106a0da084a1809125077a49574ca22e8bcd5b6e86f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "image": { + "dependency": "direct main", + "description": { + "name": "image", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "image_picker": { + "dependency": "direct main", + "description": { + "name": "image_picker", + "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "image_picker_android": { + "dependency": "transitive", + "description": { + "name": "image_picker_android", + "sha256": "82652a75e3dd667a91187769a6a2cc81bd8c111bbead698d8e938d2b63e5e89a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.12+21" + }, + "image_picker_for_web": { + "dependency": "transitive", + "description": { + "name": "image_picker_for_web", + "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "image_picker_ios": { + "dependency": "transitive", + "description": { + "name": "image_picker_ios", + "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.12+2" + }, + "image_picker_linux": { + "dependency": "transitive", + "description": { + "name": "image_picker_linux", + "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1+1" + }, + "image_picker_macos": { + "dependency": "transitive", + "description": { + "name": "image_picker_macos", + "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1+2" + }, + "image_picker_platform_interface": { + "dependency": "transitive", + "description": { + "name": "image_picker_platform_interface", + "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.10.1" + }, + "image_picker_windows": { + "dependency": "transitive", + "description": { + "name": "image_picker_windows", + "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1+1" + }, + "intl": { + "dependency": "transitive", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "json_annotation": { + "dependency": "direct main", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "direct dev", + "description": { + "name": "json_serializable", + "sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.9.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.8" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.9" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "liquid_engine": { + "dependency": "transitive", + "description": { + "name": "liquid_engine", + "sha256": "41ae12d5a72451c3efb8d4e7b901cdf0537917597bc7e7376e9b0a237f92df29", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "local_auth": { + "dependency": "transitive", + "description": { + "name": "local_auth", + "sha256": "434d854cf478f17f12ab29a76a02b3067f86a63a6d6c4eb8fbfdcfe4879c1b7b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "local_auth_android": { + "dependency": "transitive", + "description": { + "name": "local_auth_android", + "sha256": "6763aaf8965f21822624cb2fd3c03d2a8b3791037b5efb0fe4b13e110f5afc92", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.46" + }, + "local_auth_darwin": { + "dependency": "transitive", + "description": { + "name": "local_auth_darwin", + "sha256": "630996cd7b7f28f5ab92432c4b35d055dd03a747bc319e5ffbb3c4806a3e50d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.3" + }, + "local_auth_platform_interface": { + "dependency": "transitive", + "description": { + "name": "local_auth_platform_interface", + "sha256": "1b842ff177a7068442eae093b64abe3592f816afd2a533c0ebcdbe40f9d2075a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.10" + }, + "local_auth_windows": { + "dependency": "transitive", + "description": { + "name": "local_auth_windows", + "sha256": "bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.11" + }, + "locale_names": { + "dependency": "transitive", + "description": { + "name": "locale_names", + "sha256": "7a89ca54072f4f13d0f5df5a9ba69337554bf2fd057d1dd2a238898f3f159374", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3-main.0" + }, + "markdown": { + "dependency": "transitive", + "description": { + "name": "markdown", + "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.16.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "msix": { + "dependency": "transitive", + "description": { + "name": "msix", + "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.8" + }, + "mustache_template": { + "dependency": "transitive", + "description": { + "name": "mustache_template", + "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "openai_dart": { + "dependency": "direct main", + "description": { + "name": "openai_dart", + "sha256": "1cc5ed0915fa7572b943de01cfa7a3e5cfe1e6a7f4d0d9a9374d046518e84575", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "parse_app_package": { + "dependency": "transitive", + "description": { + "name": "parse_app_package", + "sha256": "69f313fbadf457576015333a8da2e99018763dce88df248febcfb8883da8aedb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "path_provider": { + "dependency": "transitive", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.15" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plist_parser": { + "dependency": "transitive", + "description": { + "name": "plist_parser", + "sha256": "e2a6f9abfa0c45c0253656b7360abb0dfb84af9937bace74605b93d2aad2bf0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.11" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pointycastle": { + "dependency": "transitive", + "description": { + "name": "pointycastle", + "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.9.1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pretty_qr_code": { + "dependency": "transitive", + "description": { + "name": "pretty_qr_code", + "sha256": "cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0" + }, + "provider": { + "dependency": "transitive", + "description": { + "name": "provider", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "qiniu_sdk_base": { + "dependency": "transitive", + "description": { + "name": "qiniu_sdk_base", + "sha256": "2506c6372512f81cfbddf162ea6da1ad7b1c6521dee1d10e9da6847c92e13349", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.2" + }, + "qr": { + "dependency": "transitive", + "description": { + "name": "qr", + "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "qr_code_dart_scan": { + "dependency": "transitive", + "description": { + "name": "qr_code_dart_scan", + "sha256": "a21340c4a2ca14e2e114915940fcad166f15c1a065fed8b4fede4a4aba5bc4ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.11" + }, + "recase": { + "dependency": "transitive", + "description": { + "name": "recase", + "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screenshot": { + "dependency": "direct main", + "description": { + "name": "screenshot", + "sha256": "63817697a7835e6ce82add4228e15d233b74d42975c143ad8cfe07009fab866b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "share_plus": { + "dependency": "transitive", + "description": { + "name": "share_plus", + "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.4" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "shared_preferences": { + "dependency": "transitive", + "description": { + "name": "shared_preferences", + "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.2" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.6" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "shell_executor": { + "dependency": "transitive", + "description": { + "name": "shell_executor", + "sha256": "9c024546fc96470a6b96be9902f0bc05347a017a7638ed8d93c77e8d77eb3c3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "shell_uikit": { + "dependency": "transitive", + "description": { + "name": "shell_uikit", + "sha256": "03703090807091514ace2f9c8dc5d9b2d18c42a248c767220167825fbc3d2747", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "shortid": { + "dependency": "direct main", + "description": { + "name": "shortid", + "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.5" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.4" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "tuple": { + "dependency": "transitive", + "description": { + "name": "tuple", + "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "universal_io": { + "dependency": "transitive", + "description": { + "name": "universal_io", + "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.2" + }, + "url_launcher": { + "dependency": "transitive", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.14" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.18" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.13" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.16" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.3.1" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "webdav_client": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "v1.0.66", + "resolved-ref": "1908cd0f4909730d9ae4d4fc4c05fb2576b3f674", + "url": "https://github.com/lollipopkit/webdav_client" + }, + "source": "git", + "version": "1.2.2" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "b89e6e24d1454e149ab20fbb225af58660f0c0bf4475544650700d8e2da54aef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.11.0" + }, + "window_manager": { + "dependency": "transitive", + "description": { + "name": "window_manager", + "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.3" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "zxing_lib": { + "dependency": "transitive", + "description": { + "name": "zxing_lib", + "sha256": "870a63610be3f20009ca9201f7ba2d53d7eaefa675c154b3e8c1f6fc55984d04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + } + }, + "sdks": { + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.27.0" + } +} diff --git a/pkgs/by-name/gp/gptcommit/package.nix b/pkgs/by-name/gp/gptcommit/package.nix new file mode 100644 index 000000000000..56e8c8fb0491 --- /dev/null +++ b/pkgs/by-name/gp/gptcommit/package.nix @@ -0,0 +1,47 @@ +{ + stdenv, + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + nix-update-script, + openssl, +}: + +let + pname = "gptcommit"; + version = "0.5.17"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "zurawiki"; + repo = pname; + rev = "v${version}"; + hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-PFpc9z45k0nlWEyjDDKG/U8V7EwR5b8rHPV4CmkRers="; + + nativeBuildInputs = [ pkg-config ]; + + # 0.5.6 release has failing tests + doCheck = false; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3."; + mainProgram = "gptcommit"; + homepage = "https://github.com/zurawiki/gptcommit"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ happysalada ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index 2f128bb06305..a5a56b609a87 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -2,8 +2,6 @@ lib, buildGoModule, fetchFromGitHub, - darwin, - stdenv, }: buildGoModule rec { pname = "gptscript"; @@ -18,8 +16,6 @@ buildGoModule rec { vendorHash = "sha256-ajglXWGJhSJtcrbSBmxmriXFTT+Vb4xYq0Ec9SYRlQk="; - propagatedBuildInputs = with darwin; lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/gp/gpu-burn/package.nix b/pkgs/by-name/gp/gpu-burn/package.nix index d2b2bd45ea3a..2028427c96c1 100644 --- a/pkgs/by-name/gp/gpu-burn/package.nix +++ b/pkgs/by-name/gp/gpu-burn/package.nix @@ -17,7 +17,7 @@ let cuda_nvcc libcublas ; - inherit (cudaPackages.cudaFlags) cudaCapabilities dropDot isJetsonBuild; + inherit (cudaPackages.flags) cudaCapabilities dropDot isJetsonBuild; in backendStdenv.mkDerivation { pname = "gpu-burn"; diff --git a/pkgs/by-name/gp/gpufetch/package.nix b/pkgs/by-name/gp/gpufetch/package.nix index 3a40a1df76f7..712ea4975a33 100644 --- a/pkgs/by-name/gp/gpufetch/package.nix +++ b/pkgs/by-name/gp/gpufetch/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gp/gpupad/package.nix b/pkgs/by-name/gp/gpupad/package.nix index 7b076839a3d5..59b8011623c5 100644 --- a/pkgs/by-name/gp/gpupad/package.nix +++ b/pkgs/by-name/gp/gpupad/package.nix @@ -7,7 +7,7 @@ glslang, imath, ktx-tools, - openimageio, + openimageio_2, qt6Packages, spdlog, spirv-cross, @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpupad"; - version = "2.4.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "houmain"; repo = "gpupad"; tag = finalAttrs.version; - hash = "sha256-yCoLvocfqYOwbsGn2r3+2iThDZCkRAUrNI71fIH7XXU="; + hash = "sha256-U2qLMIEss7WWHjfV9HbbSd1MBCcSsuToe8r+mIZ0xXg="; fetchSubmodules = true; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { glslang imath # needed for openimageio ktx-tools - openimageio + openimageio_2 qt6Packages.qtbase qt6Packages.qtdeclarative qt6Packages.qtmultimedia diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix index 1891f035c073..a8a37f7028dd 100644 --- a/pkgs/by-name/gq/gql/package.nix +++ b/pkgs/by-name/gq/gql/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-5n95+BcdjdjZyT3fvRv8acPV3jK9IppsKklI0zuA5mw="; + hash = "sha256-/cTU+LBoXnMzNKd18nYoGkEN/cfUVQIDFBFQNrmdWuM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-2JaPT/83672qnF2y3YKFhnQ/hNQ/GXnHfRcQIn0rnc8="; + cargoHash = "sha256-4sdbTcDDvA7MYMiTKKAWg0sYnBPeVj3eBCo7HTZYkUY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix index b6971a73f4dd..87f0129aef6f 100644 --- a/pkgs/by-name/gq/gqlgen/package.nix +++ b/pkgs/by-name/gq/gqlgen/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.17.68"; + version = "0.17.73"; in buildGoModule { pname = "gqlgen"; @@ -16,10 +16,10 @@ buildGoModule { owner = "99designs"; repo = "gqlgen"; tag = "v${version}"; - hash = "sha256-zu9Rgxua19dZNLUeJeMklKB0C95E8UVWGu/I5Lkk66E="; + hash = "sha256-s6D9ohFdUhch2LhpmHYBgpBrO/5WEM1TX/+DIfwxSPc="; }; - vendorHash = "sha256-B3RiZZee6jefslUSTfHDth8WUl5rv7fmEFU0DpKkWZk="; + vendorHash = "sha256-QN3ebVC6cJBnpm9Kyhg16EcXoT2rI1fR6QEf6i74WHg="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gq/gqlgenc/fix-version.patch b/pkgs/by-name/gq/gqlgenc/fix-version.patch new file mode 100644 index 000000000000..083660c9b2f7 --- /dev/null +++ b/pkgs/by-name/gq/gqlgenc/fix-version.patch @@ -0,0 +1,11 @@ +--- a/main.go ++++ b/main.go +@@ -9,7 +9,7 @@ + "github.com/urfave/cli/v2" + ) + +-const version = "0.31.0" ++var version string + + var versionCmd = &cli.Command{ + Name: "version", diff --git a/pkgs/by-name/gq/gqlgenc/package.nix b/pkgs/by-name/gq/gqlgenc/package.nix index 760f744e5d55..fdf28ea3d6db 100644 --- a/pkgs/by-name/gq/gqlgenc/package.nix +++ b/pkgs/by-name/gq/gqlgenc/package.nix @@ -2,28 +2,46 @@ buildGoModule, fetchFromGitHub, lib, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gqlgenc"; - version = "0.31.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; - rev = "v${version}"; - sha256 = "sha256-RGHfDrFr2HO4i+YQeNzYrEcU+Xe286f3f5g/yUmpxpA="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-AGbE+R3502Igl4/HaN8yvFVJBsKQ6iVff8IEvddJLEo="; }; + patches = [ + ./fix-version.patch + ]; + excludedPackages = [ "example" ]; - vendorHash = "sha256-h3ePmfRkGqVXdtjX2cU5y2HnX+VkmTWNwrEkhLAmrlU="; + vendorHash = "sha256-kBv9Kit5KdPB48V/g1OaeB0ABFd1A1I/9F5LaQDWxUE="; - meta = with lib; { + ldflags = [ + "-X" + "main.version=${finalAttrs.version}" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + # FAIL: TestLoadConfig_LoadSchema/correct_schema + # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted + __darwinAllowLocalNetworking = true; + + meta = { description = "Go tool for building GraphQL client with gqlgen"; mainProgram = "gqlgenc"; homepage = "https://github.com/Yamashou/gqlgenc"; - license = licenses.mit; - maintainers = with maintainers; [ wattmto ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wattmto ]; }; -} +}) diff --git a/pkgs/by-name/gr/grabserial/package.nix b/pkgs/by-name/gr/grabserial/package.nix index 72ccf1499dbb..5bca0b56c3df 100644 --- a/pkgs/by-name/gr/grabserial/package.nix +++ b/pkgs/by-name/gr/grabserial/package.nix @@ -6,26 +6,26 @@ python3Packages.buildPythonApplication rec { pname = "grabserial"; - version = "2.0.2"; + version = "2.1.8"; src = fetchFromGitHub { owner = "tbird20d"; repo = "grabserial"; - rev = "v${version}"; - sha256 = "0ryk4w8q6zfmia71nwnk5b7xaxw0sf45dw9q50xp7k76i3k5f9f3"; + tag = "v${version}"; + hash = "sha256-XHI5r4OkJUtMuH83jKvNttEpKpqARjxj9SDLzhSPxSc="; }; - propagatedBuildInputs = [ python3Packages.pyserial ]; + dependencies = [ python3Packages.pyserial ]; # no usable tests doCheck = false; - meta = with lib; { + meta = { description = "Python based serial dump and timing program"; mainProgram = "grabserial"; homepage = "https://github.com/tbird20d/grabserial"; - license = licenses.gpl2; - maintainers = with maintainers; [ vmandela ]; - platforms = platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ vmandela ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/gr/gradle-completion/package.nix b/pkgs/by-name/gr/gradle-completion/package.nix index 66df62b76538..1a67b9c278df 100644 --- a/pkgs/by-name/gr/gradle-completion/package.nix +++ b/pkgs/by-name/gr/gradle-completion/package.nix @@ -47,6 +47,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Gradle tab completion for bash and zsh"; homepage = "https://github.com/gradle/gradle-completion"; license = lib.licenses.mit; - maintainers = [ ] ++ lib.teams.java.members; + teams = [ lib.teams.java ]; }; }) diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index 84383c352580..236d6ea97f4e 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -17,17 +17,17 @@ buildGoModule rec { pname = "grafana-alloy"; - version = "1.7.5"; + version = "1.8.3"; src = fetchFromGitHub { owner = "grafana"; repo = "alloy"; tag = "v${version}"; - hash = "sha256-4JfzjeF654+Q4Hc/0P08minpSJX3mO/p8EOeHUCKu6A="; + hash = "sha256-Uec8DnT6tZcHYchDJr5F0t5kkEjKPOKPkdbr4Rtm51c="; }; proxyVendor = true; - vendorHash = "sha256-rZcqCcb++A8HYLVcGVWQ61fEXAqF0GXbTze/GGsF5bA="; + vendorHash = "sha256-b0byafxHXnrYg2dQ0hoNvo0+jmCOJ4/hVMV8J7g7MBc="; nativeBuildInputs = [ fixup-yarn-lock @@ -70,7 +70,7 @@ buildGoModule rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/internal/web/ui/yarn.lock"; - hash = "sha256-4vZr3mPvk5IXoqSPuqhzYobAuK2NDK0dceNZUIQILvI="; + hash = "sha256-gKCjJe3TVpaHm/gwaNh4zeL5k4jlbWfF94aDYQ1brU8="; }; preBuild = '' @@ -146,7 +146,6 @@ buildGoModule rec { maintainers = with maintainers; [ azahi flokli - emilylange hbjydev ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix index cd40c8407763..da38fab5e604 100644 --- a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix +++ b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix @@ -32,7 +32,7 @@ buildGoModule rec { description = "Grafana Dash-n-Grab (gdg) -- backup and restore Grafana dashboards, datasources, and other entities"; license = licenses.bsd3; homepage = "https://github.com/esnet/gdg"; - maintainers = with maintainers; teams.bitnomial.members; + teams = [ teams.bitnomial ]; mainProgram = "gdg"; changelog = "https://github.com/esnet/gdg/releases/tag/v${version}"; }; diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.json b/pkgs/by-name/gr/grafana-image-renderer/package.json index 5ba1a26f0d82..3c8f51add47c 100644 --- a/pkgs/by-name/gr/grafana-image-renderer/package.json +++ b/pkgs/by-name/gr/grafana-image-renderer/package.json @@ -30,7 +30,7 @@ "@hapi/boom": "^10.0.0", "@puppeteer/browsers": "^2.3.1", "chokidar": "^3.5.2", - "dompurify": "^2.5.4", + "dompurify": "^3.2.4", "express": "^4.21.1", "express-prom-bundle": "^6.5.0", "jimp": "^0.22.12", @@ -49,18 +49,18 @@ }, "devDependencies": { "@grafana/eslint-config": "^6.0.0", - "@types/dompurify": "2.3.4", + "@types/dompurify": "^3.2.0", "@types/express": "^4.17.14", "@types/jest": "^29.5.12", "@types/jsdom": "20.0.0", "@types/multer": "^1.4.7", - "@types/node": "^22.13.1", + "@types/node": "^20.17.27", "@types/pixelmatch": "^5.2.6", "@types/supertest": "^2.0.15", "@typescript-eslint/eslint-plugin": "5.37.0", "@typescript-eslint/parser": "5.37.0", "@yao-pkg/pkg": "^6.3.0", - "axios": "1.7.4", + "axios": "1.8.2", "cross-env": "7.0.3", "eslint": "8.23.1", "fast-png": "^6.2.0", @@ -88,6 +88,6 @@ }, "bin": "build/app.js", "engines": { - "node": ">= 22" + "node": ">= 20" } } diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix index ff8edbff0abd..5bc87e3fa7f3 100644 --- a/pkgs/by-name/gr/grafana-image-renderer/package.nix +++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix @@ -14,18 +14,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.12.3"; + version = "3.12.5"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-twB2V5iecLEMTrp+prFmDoJvcGLVQlLJ+DTSl/9V8S8="; + hash = "sha256-dcWmMcvWwG4wGEEyFKa1R0jGGpK5x1F5Amr74JzJaLE="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-TcsWApSR48OUIcQGko3XIaFCp22vFJbHcxrdFxUyRZU="; + hash = "sha256-BBu+vOO0UgX3L7Svj0HgVKHR2lSe4tD6c9HDgJZdhHU="; }; packageJSON = ./package.json; diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix index 8aeda3eb7495..69f76cdf2946 100644 --- a/pkgs/by-name/gr/grafana-loki/package.nix +++ b/pkgs/by-name/gr/grafana-loki/package.nix @@ -12,14 +12,14 @@ }: buildGoModule rec { - version = "3.4.2"; + version = "3.4.3"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-GE92NlFCOk6qFtrgeBvLDI0OkmWaJ1j07Q14+jgi9+w="; + hash = "sha256-1tI9X2eIKuWEWJBbN4UAw8yeRrjgfqcenJyTNMk5rqU="; }; vendorHash = null; diff --git a/pkgs/by-name/gr/gramps/package.nix b/pkgs/by-name/gr/gramps/package.nix index 1c3aed85a1c3..7972d9ec2ae3 100644 --- a/pkgs/by-name/gr/gramps/package.nix +++ b/pkgs/by-name/gr/gramps/package.nix @@ -1,4 +1,5 @@ { + stdenv, lib, fetchFromGitHub, gtk3, @@ -10,6 +11,7 @@ gobject-introspection, wrapGAppsHook3, gettext, + desktopToDarwinBundle, # Optional packages: enableOSM ? true, osm-gps-map, @@ -52,13 +54,18 @@ buildPythonApplication rec { python3Packages.setuptools ]; - nativeCheckInputs = [ - glibcLocales - python3Packages.unittestCheckHook - python3Packages.jsonschema - python3Packages.mock - python3Packages.lxml - ]; + nativeCheckInputs = + [ + glibcLocales + python3Packages.unittestCheckHook + python3Packages.jsonschema + python3Packages.mock + python3Packages.lxml + ] + # TODO: use JHBuild to build the Gramps' bundle + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle + ]; buildInputs = [ diff --git a/pkgs/applications/audio/grandorgue/darwin-fixes.patch b/pkgs/by-name/gr/grandorgue/darwin-fixes.patch similarity index 100% rename from pkgs/applications/audio/grandorgue/darwin-fixes.patch rename to pkgs/by-name/gr/grandorgue/darwin-fixes.patch diff --git a/pkgs/by-name/gr/grandorgue/package.nix b/pkgs/by-name/gr/grandorgue/package.nix new file mode 100644 index 000000000000..0c6e804aeceb --- /dev/null +++ b/pkgs/by-name/gr/grandorgue/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + fftwFloat, + alsa-lib, + zlib, + wavpack, + wxGTK32, + udev, + jackaudioSupport ? false, + libjack2, + imagemagick, + libicns, + yaml-cpp, + makeWrapper, + includeDemo ? true, +}: + +stdenv.mkDerivation rec { + pname = "grandorgue"; + version = "3.15.4-1"; + + src = fetchFromGitHub { + owner = "GrandOrgue"; + repo = "grandorgue"; + rev = version; + fetchSubmodules = true; + hash = "sha256-9H7YpTtv9Y36Nc0WCyRy/ohpOQ3WVUd9gMahnGhANRc="; + }; + + patches = [ ./darwin-fixes.patch ]; + + nativeBuildInputs = [ + cmake + pkg-config + imagemagick + libicns + makeWrapper + ]; + + buildInputs = + [ + fftwFloat + zlib + wavpack + wxGTK32 + yaml-cpp + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + udev + ] + ++ lib.optional jackaudioSupport libjack2; + + cmakeFlags = + lib.optionals (!jackaudioSupport) [ + "-DRTAUDIO_USE_JACK=OFF" + "-DRTMIDI_USE_JACK=OFF" + "-DGO_USE_JACK=OFF" + "-DINSTALL_DEPEND=OFF" + ] + ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF"; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin,lib} + mv $out/GrandOrgue.app $out/Applications/ + for lib in $out/Applications/GrandOrgue.app/Contents/Frameworks/lib*; do + ln -s $lib $out/lib/ + done + makeWrapper $out/{Applications/GrandOrgue.app/Contents/MacOS,bin}/GrandOrgue + ''; + + meta = { + description = "Virtual Pipe Organ Software"; + homepage = "https://github.com/GrandOrgue/grandorgue"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.puzzlewolf ]; + mainProgram = "GrandOrgue"; + }; +} diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix index 4ed069e3a31c..b7ae540a4696 100644 --- a/pkgs/by-name/gr/granian/package.nix +++ b/pkgs/by-name/gr/granian/package.nix @@ -1,49 +1,4 @@ { - lib, - fetchFromGitHub, - rustPlatform, python3Packages, - libiconv, }: - -python3Packages.buildPythonApplication rec { - pname = "granian"; - version = "1.7.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "emmett-framework"; - repo = "granian"; - rev = "v${version}"; - hash = "sha256-OjyDwfp0d779oFQ7wUdR1eRPP35kcJa3wIdcYGrGGME="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-jAjHvVyFhGGE/OwfusUE/GdrNrEgvh48lmC5tla4lhI="; - }; - - nativeBuildInputs = with rustPlatform; [ - cargoSetupHook - maturinBuildHook - ]; - - buildInputs = [ - libiconv - ]; - - dependencies = [ - python3Packages.uvloop - python3Packages.click - ]; - - meta = { - description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications"; - homepage = "https://github.com/emmett-framework/granian"; - license = lib.licenses.bsd3; - mainProgram = "granian"; - maintainers = with lib.maintainers; [ lucastso10 ]; - platforms = lib.platforms.unix; - }; -} +python3Packages.toPythonApplication python3Packages.granian diff --git a/pkgs/by-name/gr/grap/package.nix b/pkgs/by-name/gr/grap/package.nix index e4589322a0fe..b51ce8452a0c 100644 --- a/pkgs/by-name/gr/grap/package.nix +++ b/pkgs/by-name/gr/grap/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - boost, + boost183, libseccomp, flex, swig, @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - boost.all + boost183.all libseccomp ]; diff --git a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix index 2c0701e56b6c..6d41676d4483 100644 --- a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix +++ b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "graphene-hardened-malloc"; - version = "2025032100"; + version = "2025041100"; src = fetchFromGitHub { owner = "GrapheneOS"; repo = "hardened_malloc"; rev = finalAttrs.version; - hash = "sha256-8EIdJmnPdJgES+8QwWzL1oKVqO62CQdtjyMgFw+P0+g="; + hash = "sha256-HCuH5SUiw/+3T1dv+IKKsQEC1GbuG0Se376bw2fG5u8="; }; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/gr/graphene/package.nix b/pkgs/by-name/gr/graphene/package.nix index 20ad68fb42b3..534c8d24fb9b 100644 --- a/pkgs/by-name/gr/graphene/package.nix +++ b/pkgs/by-name/gr/graphene/package.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Thin layer of graphic data types"; homepage = "https://github.com/ebassi/graphene"; license = licenses.mit; - maintainers = teams.gnome.members ++ (with maintainers; [ ]); + teams = [ teams.gnome ]; platforms = platforms.unix; pkgConfigModules = [ "graphene-1.0" diff --git a/pkgs/by-name/gr/graphhopper/package.nix b/pkgs/by-name/gr/graphhopper/package.nix new file mode 100644 index 000000000000..95d3e7e3b4ff --- /dev/null +++ b/pkgs/by-name/gr/graphhopper/package.nix @@ -0,0 +1,152 @@ +{ + fetchFromGitHub, + fetchurl, + lib, + stdenv, + testers, + + jre, + makeWrapper, + maven, + ... +}: +let + version = builtins.fromTOML (builtins.readFile ./version.toml); + + src = fetchFromGitHub { + owner = "graphhopper"; + repo = "graphhopper"; + tag = version.patch; + hash = version.hash.src; + }; + + # Patch graphhopper to remove the npm download + patches = [ ./remove-npm-dependency.patch ]; + + # Graphhopper also relies on a maps bundle downloaded from npm + # By default it installs nodejs and npm during the build, + # But we patch that out so we much fetch it ourselves + mapsBundle = fetchurl { + name = "@graphhopper/graphhopper-maps-bundle-${version.mapsBundle}"; + url = "https://registry.npmjs.org/@graphhopper/graphhopper-maps-bundle/-/graphhopper-maps-bundle-${version.mapsBundle}.tgz"; + hash = version.hash.mapsBundle; + }; + + # We cannot use `buildMavenPackage` as we need to load in the + # mapsBundle before doing anything + mvnDeps = stdenv.mkDerivation { + name = "graphhopper-dependencies"; + + inherit src patches; + + buildInputs = [ maven ]; + + buildPhase = '' + # Fetching deps with mvn dependency:go-offline does not quite catch everything, so we use this plugin instead + mvn de.qaware.maven:go-offline-maven-plugin:resolve-dependencies \ + -Dmaven.repo.local=$out/.m2 \ + -Dmaven.wagon.rto=5000 + ''; + + installPhase = '' + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside + find $out -type f \( \ + -name \*.lastUpdated \ + -o -name resolver-status.properties \ + -o -name _remote.repositories \) \ + -delete + ''; + + outputHashMode = "recursive"; + outputHash = version.hash.mvnDeps; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "graphhopper"; + + inherit src patches; + + version = version.patch; + + buildInputs = [ + makeWrapper + maven + ]; + + configurePhase = '' + runHook preConfigure + + mkdir -p ./web-bundle/target/ + ln -s ${mapsBundle} ./web-bundle/target/graphhopper-graphhopper-maps-bundle-${version.mapsBundle}.tgz + + runHook postConfigure + ''; + + # Build and skip tests because downloading of + # test deps seems to not work with the go-offline plugin + buildPhase = '' + runHook preBuild + + mvn package --offline \ + -Dmaven.repo.local=${mvnDeps}/.m2 \ + -DskipTests + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + ln -s ${mvnDeps}/.m2 $out/lib + + # Grapphopper versions are seemingly compiled under the major release name, + # not the patch name, which is the version we want for our package + cp ./web/target/graphhopper-web-${version.major}-SNAPSHOT.jar $out/bin/graphhopper-web-${version.major}-SNAPSHOT.jar + + makeWrapper ${jre}/bin/java $out/bin/graphhopper \ + --add-flags "-jar $out/bin/graphhopper-web-${version.major}-SNAPSHOT.jar" \ + --chdir $out + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside + find $out -type f \( \ + -name \*.lastUpdated \ + -o -name resolver-status.properties \ + -o -name _remote.repositories \) \ + -delete + + runHook postFixup + ''; + + meta = { + description = "Fast and memory-efficient routing engine for OpenStreetMap"; + homepage = "https://www.graphhopper.com/"; + changelog = "https://github.com/graphhopper/graphhopper/releases/tag/${version.patch}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ baileylu ]; + teams = [ lib.teams.geospatial ]; + platforms = lib.platforms.all; + mainProgram = "graphhopper"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode + ]; + }; + + passthru = { + updateScript = ./update.nu; + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + # `graphhopper --version` does not work as the source does not specify `Implementation-Version` + command = "graphhopper --help"; + version = "graphhopper-web-${version.major}-SNAPSHOT.jar"; + }; + }; +}) diff --git a/pkgs/by-name/gr/graphhopper/remove-npm-dependency.patch b/pkgs/by-name/gr/graphhopper/remove-npm-dependency.patch new file mode 100644 index 000000000000..5970af9db017 --- /dev/null +++ b/pkgs/by-name/gr/graphhopper/remove-npm-dependency.patch @@ -0,0 +1,55 @@ +From ad687709cfca51603264ff565f296cfb5dceb15a Mon Sep 17 00:00:00 2001 +From: Luke Bailey +Date: Wed, 19 Mar 2025 22:25:44 +0000 +Subject: [PATCH] Swap out frontend maven plugin which downloads npm + for fetching it through nix instead + +--- + web-bundle/pom.xml | 31 ------------------------------- + 1 file changed, 31 deletions(-) + +diff --git a/web-bundle/pom.xml b/web-bundle/pom.xml +index 9a4d83b62..1d995cbaf 100644 +--- a/web-bundle/pom.xml ++++ b/web-bundle/pom.xml +@@ -129,37 +129,6 @@ + + + +- +- com.github.eirslett +- frontend-maven-plugin +- 1.12.1 +- +- +- install node and npm +- +- install-node-and-npm +- +- +- v20.14.0 +- 10.7.0 +- +- +- +- download graphhopper maps +- generate-resources +- +- npm +- +- +- +- +- pack --pack-destination=${basedir}/target +- @graphhopper/graphhopper-maps-bundle@${graphhopper-maps.version} +- +- +- +- +- + + maven-antrun-plugin + +-- +2.48.1 + diff --git a/pkgs/by-name/gr/graphhopper/update.nu b/pkgs/by-name/gr/graphhopper/update.nu new file mode 100755 index 000000000000..80a27b5106ed --- /dev/null +++ b/pkgs/by-name/gr/graphhopper/update.nu @@ -0,0 +1,102 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i nu -p nushell nix-prefetch-github common-updater-scripts + +use std/log + +let version_info = "./pkgs/by-name/gr/graphhopper/version.toml" + +let current_version = open $version_info + +let latest_tag = list-git-tags --url=https://github.com/graphhopper/graphhopper + | lines + | sort --natural + | where ($it =~ '^[\d.]+$') + | last + +if $current_version.patch == $latest_tag { + log debug "Current graphhopper version matched latest version of graphhopper, no update is needed, exiting..." + exit 0 +} + +let major = $latest_tag + | str replace -ar '(\d+)\.\d+' '$1.0' + +log debug $"Fetching source for graphhopper patch ($latest_tag) on version ($major)" +let source = nix-prefetch-github graphhopper graphhopper --rev $latest_tag + | from json + +log debug $"Reading maps bundle version for ($latest_tag)" +let web_bundle_pom = http get $"https://api.github.com/repos/graphhopper/graphhopper/contents/web-bundle/pom.xml?ref=($latest_tag)" + | $in.content + | base64 --decode + | into string + | from xml + +let maps_bundle_properties = $web_bundle_pom.content + | where ($it.tag =~ "properties") + | first + +let maps_bundle_version = $maps_bundle_properties.content + | where ($it.tag =~ "graphhopper-maps.version") + | first + | $in.content + | first + | $in.content + +log debug $"Fetching maps bundle ($maps_bundle_version)" +let maps_bundle_hash = nix-prefetch-url $"https://registry.npmjs.org/@graphhopper/graphhopper-maps-bundle/-/graphhopper-maps-bundle-($maps_bundle_version).tgz" + | nix-hash --type sha256 --to-base64 $in + | ["sha256-", $in] + | str join + +log debug $"Writing to ($version_info) without mvnDeps hash..." + +{ + major: $major, + patch: $latest_tag, + mapsBundle: $maps_bundle_version, + + hash: { + src: $source.hash + mapsBundle: $maps_bundle_hash + mvnDeps: "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" + } +} + | to toml + | save $version_info -f + +log debug "Calculating mvnDeps hash..." +let graphhopper_build_logs = nix-build -A graphhopper o+e>| cat + +let mvn_hash_lines = $graphhopper_build_logs + | lines + | find "got:" + +if ($mvn_hash_lines | length) == 0 { + log error $"Could not find any maven hash in the graphhopper build logs - maybe a different error occurred: \n$($graphhopper_build_logs)" + exit 1 +} + +log debug $"Found relevant hash lines: ($mvn_hash_lines)" +let mvn_hash = $mvn_hash_lines + | first + | ansi strip + | str replace 'got:' '' + | str trim + +log debug $"Writing to ($version_info) with mvnDeps hash ($mvn_hash).." +{ + major: $major, + patch: $latest_tag, + mapsBundle: $maps_bundle_version, + + hash: { + src: $source.hash + mapsBundle: $maps_bundle_hash + mvnDeps: $mvn_hash + } +} + | to toml + | save $version_info -f + +log debug $"Successfully updated graphhopper package!" diff --git a/pkgs/by-name/gr/graphhopper/version.toml b/pkgs/by-name/gr/graphhopper/version.toml new file mode 100644 index 000000000000..3bd74b1906c9 --- /dev/null +++ b/pkgs/by-name/gr/graphhopper/version.toml @@ -0,0 +1,8 @@ +major = "10.0" +patch = "10.2" +mapsBundle = "0.0.0-4718098d1db1798841a4d12f1727e8e8f7eab202" + +[hash] +src = "sha256-E6G9JR1lrXhNJ4YgMM0n0RsQcMZQM2QldGc74f5FALo=" +mapsBundle = "sha256-jZTNJfmMWJQHpJ8um3yTBx/KtIfdr0EwKJ9kSFalWJQ=" +mvnDeps = "sha256-KidbIBnW//IiKPFy3plFWOED8gP/ZCg4buwMgzttaY8=" diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index 21ba90c8afd3..4ea132ec68e6 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,19 +1,16 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.5.3", + "version": "1.6.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.5.3", + "version": "1.6.1", "hasInstallScript": true, "license": "None", "dependencies": { - "chalk": "^4.1.2", - "semver": "^7.5.4", - "ws": "^8.6.0", - "yargs": "^17.5.1" + "semver": "^7.5.4" }, "bin": { "graphite": "graphite.js", @@ -23,129 +20,6 @@ "node": ">=16" } }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "license": "MIT" - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "license": "MIT" - }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/semver": { "version": "7.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", @@ -157,118 +31,6 @@ "engines": { "node": ">=10" } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/ws": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", - "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "license": "MIT", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "license": "ISC", - "engines": { - "node": ">=12" - } } } } diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index 9b1a442694bf..8c9e09ba7938 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -8,14 +8,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.5.3"; + version = "1.6.1"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-hWr4HOpcNXEpdboeHige5nliVCLY3RukMVh2xRKGIlI="; + hash = "sha256-r7tChs0vsg60LXFf9WZjthqMxXGgohNL4ojdjXNZcCo="; }; - npmDepsHash = "sha256-v/zIQvcFGHA4Jr7Hh+hTw8BqwBF7b65X9or230qCsMc="; + npmDepsHash = "sha256-DoK3GaGIwei9kumvAwfgaIY9iw+Z6ysFzUm5dMVV2W4="; postPatch = '' ln -s ${./package-lock.json} package-lock.json @@ -44,6 +44,6 @@ buildNpmPackage rec { homepage = "https://graphite.dev/docs/graphite-cli"; license = lib.licenses.unfree; # no license specified mainProgram = "gt"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ joshheinrichs-shopify ]; }; } diff --git a/pkgs/by-name/gr/graphql-client/package.nix b/pkgs/by-name/gr/graphql-client/package.nix new file mode 100644 index 000000000000..818e27aadeba --- /dev/null +++ b/pkgs/by-name/gr/graphql-client/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchCrate, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "graphql-client"; + version = "0.13.0"; + + src = fetchCrate { + inherit version; + crateName = "graphql_client_cli"; + hash = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-GPUOIDKlxk2P+cPmOPlpz/EM9TCXvHo41+1fQ0xAqto="; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + openssl + ]; + + meta = with lib; { + description = "GraphQL tool for Rust projects"; + mainProgram = "graphql-client"; + homepage = "https://github.com/graphql-rust/graphql-client"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/pkgs/by-name/gr/graphs/package.nix b/pkgs/by-name/gr/graphs/package.nix index 2d2d5cc69d89..c160d4fe1d12 100644 --- a/pkgs/by-name/gr/graphs/package.nix +++ b/pkgs/by-name/gr/graphs/package.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Database of graphs"; license = licenses.gpl2; platforms = platforms.all; - maintainers = teams.sage.members; + teams = [ teams.sage ]; }; } diff --git a/pkgs/by-name/gr/graphw00f/package.nix b/pkgs/by-name/gr/graphw00f/package.nix index f77d33c1540e..35560b8b7149 100644 --- a/pkgs/by-name/gr/graphw00f/package.nix +++ b/pkgs/by-name/gr/graphw00f/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "graphw00f"; - version = "1.1.19"; + version = "1.2.1"; format = "other"; src = fetchFromGitHub { owner = "dolevf"; repo = "graphw00f"; tag = version; - hash = "sha256-w2iVgs3WnEYCiCfwxB/HcwNRoWTlLfVJIzfp1VbrQXA="; + hash = "sha256-8fOvcc//UdDawgGMAhbYQ/O5kd1l2skWGDlFNYocNY8="; }; dependencies = with python3.pkgs; [ requests ]; diff --git a/pkgs/by-name/gr/grass/package.nix b/pkgs/by-name/gr/grass/package.nix new file mode 100644 index 000000000000..9cfecce436da --- /dev/null +++ b/pkgs/by-name/gr/grass/package.nix @@ -0,0 +1,173 @@ +{ + lib, + stdenv, + callPackage, + fetchFromGitHub, + makeWrapper, + wrapGAppsHook3, + + withOpenGL ? !stdenv.hostPlatform.isDarwin, + + bison, + blas, + cairo, + ffmpeg, + fftw, + flex, + freetype, + gdal, + geos, + lapack, + libGLU, + libiconv, + libpng, + libsvm, + libtiff, + libxml2, + llvmPackages, + netcdf, + pdal, + pkg-config, + libpq, + proj, + python3Packages, + readline, + sqlite, + wxGTK32, + zlib, + zstd, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "grass"; + version = "8.4.1"; + + src = fetchFromGitHub { + owner = "OSGeo"; + repo = "grass"; + rev = finalAttrs.version; + hash = "sha256-q1jOimQi+24I1ZBf6Z0cvAyXcBFBpT5aWSNeG6n6y0k="; + }; + + nativeBuildInputs = + [ + makeWrapper + wrapGAppsHook3 + + bison + flex + gdal # for `gdal-config` + geos # for `geos-config` + netcdf # for `nc-config` + pkg-config + ] + ++ (with python3Packages; [ + python-dateutil + numpy + wxpython + ]); + + buildInputs = + [ + blas + cairo + ffmpeg + fftw + freetype + gdal + geos + lapack + libpng + libsvm + libtiff + libxml2 + netcdf + pdal + libpq + proj + readline + sqlite + wxGTK32 + zlib + zstd + ] + ++ lib.optionals withOpenGL [ libGLU ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; + + strictDeps = true; + + configureFlags = + [ + "--with-blas" + "--with-cairo-ldflags=-lfontconfig" + "--with-cxx" + "--with-fftw" + "--with-freetype" + "--with-geos" + "--with-gdal" + "--with-lapack" + "--with-libsvm" + "--with-nls" + "--with-openmp" + "--with-pdal" + "--with-postgres" + "--with-postgres-libs=${libpq}/lib/" + "--with-proj-includes=${proj.dev}/include" + "--with-proj-libs=${proj}/lib" + "--with-proj-share=${proj}/share/proj" + "--with-sqlite" + "--with-zstd" + "--without-bzlib" + "--without-mysql" + "--without-odbc" + ] + ++ lib.optionals (!withOpenGL) [ + "--without-opengl" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--without-cairo" + "--without-freetype" + "--without-x" + ]; + + # Otherwise a very confusing "Can't load GDAL library" error + makeFlags = lib.optional stdenv.hostPlatform.isDarwin "GDAL_DYNAMIC="; + + /* + Ensures that the python script run at build time are actually executable; + otherwise, patchShebangs ignores them. + */ + postConfigure = '' + for f in $(find . -name '*.py'); do + chmod +x $f + done + + patchShebangs */ + ''; + + postInstall = '' + wrapProgram $out/bin/grass \ + --set PYTHONPATH $PYTHONPATH \ + --set GRASS_PYTHON ${python3Packages.python.interpreter} \ + --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' + ln -s $out/grass*/lib $out/lib + ln -s $out/grass*/include $out/include + ''; + + enableParallelBuilding = true; + + passthru.tests = { + grass = callPackage ./tests.nix { grass = finalAttrs.finalPackage; }; + }; + + meta = with lib; { + description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; + homepage = "https://grass.osgeo.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mpickering ]; + teams = [ teams.geospatial ]; + platforms = platforms.all; + mainProgram = "grass"; + }; +}) diff --git a/pkgs/applications/gis/grass/tests.nix b/pkgs/by-name/gr/grass/tests.nix similarity index 100% rename from pkgs/applications/gis/grass/tests.nix rename to pkgs/by-name/gr/grass/tests.nix diff --git a/pkgs/by-name/gr/grayjay/deps.json b/pkgs/by-name/gr/grayjay/deps.json new file mode 100644 index 000000000000..d525290b1b91 --- /dev/null +++ b/pkgs/by-name/gr/grayjay/deps.json @@ -0,0 +1,1037 @@ +[ + { + "pname": "coverlet.collector", + "version": "3.1.2", + "hash": "sha256-v7ZoEFZyhF8VcRZj1uim4HNiRsG+XdJ4x/dwPBIWUz8=" + }, + { + "pname": "coverlet.collector", + "version": "6.0.0", + "hash": "sha256-IEmweTMapcPhFHpmJsPXfmMhravYOrWupgjeOvMmQ4o=" + }, + { + "pname": "Dapper", + "version": "2.1.28", + "hash": "sha256-qCbqEwIB/j6HToEPpDEdQGGIPGQNmrULrCHnEGZSd5c=" + }, + { + "pname": "Fizzler", + "version": "1.2.0", + "hash": "sha256-lHoNw1Ze197Tkhlpg4QjX5wC0Xmeu7TUKBTzEineE60=" + }, + { + "pname": "Fizzler.Systems.HtmlAgilityPack", + "version": "1.2.1", + "hash": "sha256-ov8Kc3nBcRxk0I+WPR11QFlD1607ck31M+37SjIElbc=" + }, + { + "pname": "Google.Protobuf", + "version": "3.25.3", + "hash": "sha256-uG40xD6QkxoTOaTYfBAeVOIPE38qlbCa2RxUzOH0HLE=" + }, + { + "pname": "HtmlAgilityPack", + "version": "1.11.58", + "hash": "sha256-VCrBPH6Waw3LmZEKStBSd5uSH2vicndwYazYX6IdnYE=" + }, + { + "pname": "libsodium", + "version": "1.0.20", + "hash": "sha256-BsitQQnUSm1YupzI5N/LFx0kPFdk1FP8VdM1S3uttvs=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "9.0.0", + "hash": "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U=" + }, + { + "pname": "Microsoft.ClearScript.Core", + "version": "7.4.5", + "hash": "sha256-6wRLv+fbo2SF9irQ8BwmUR7JcQAlyEk1Dov+teSXY+E=" + }, + { + "pname": "Microsoft.ClearScript.V8", + "version": "7.4.5", + "hash": "sha256-MXl1n1RF6z95IbpXmSGAwraP8EpvPli16ySFGfc/ZxY=" + }, + { + "pname": "Microsoft.ClearScript.V8.ICUData", + "version": "7.4.5", + "hash": "sha256-54bbiVJoXDrePISZHuEcOax+kgyaIftL684bt3EgYy8=" + }, + { + "pname": "Microsoft.ClearScript.V8.Native.linux-x64", + "version": "7.4.5", + "hash": "sha256-MCRTRO7WiWnWYdvYSwv1kvZakcVcvckio98SJLhYgoM=" + }, + { + "pname": "Microsoft.ClearScript.V8.Native.osx-arm64", + "version": "7.4.5", + "hash": "sha256-SbcABxK8rPIE6SV1JBP2U3FYmrgaY7iB9sFQKNLyAVs=" + }, + { + "pname": "Microsoft.ClearScript.V8.Native.osx-x64", + "version": "7.4.5", + "hash": "sha256-IvttjtyJXWVhuJNkqqxNpLwM3WtljHuHSaKtSkblAqE=" + }, + { + "pname": "Microsoft.ClearScript.V8.Native.win-x64", + "version": "7.4.3", + "hash": "sha256-8lRSVozrki7h64MIgP6v0VWEV1fR1op+hjHd8S4nJ88=" + }, + { + "pname": "Microsoft.ClearScript.V8.Native.win-x64", + "version": "7.4.5", + "hash": "sha256-WF4K7g1w510viiXHJJjKQrsD/mvb99tF76yBCljN1Qw=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.3.2", + "hash": "sha256-APxmbKMNQKWuFQMJjkVr2zIqv/bLUTMm5NRGVLegBbg=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.6.0", + "hash": "sha256-sYk+9Gj1M1HI6yEB8ZJQ4fiqGjYos+orebV8blFDSQs=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.0.1", + "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.3.0", + "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.7.0", + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + }, + { + "pname": "Microsoft.Data.Sqlite", + "version": "8.0.1", + "hash": "sha256-2yNZYPTdqYRss9OqC40RjOL7HSXK97p9awIDd/MrRPk=" + }, + { + "pname": "Microsoft.Data.Sqlite.Core", + "version": "8.0.1", + "hash": "sha256-H3yveFzvMNKKVnEIa1bvqb2q2MKxS9Am+fsk3KX298Y=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.3.2", + "hash": "sha256-1fZ/rrSbuyYUfvwyA3otFQdL0Y/H48goAVyhiLs1oF4=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.6.0", + "hash": "sha256-pogseJyMGIikTZORsDXKwyAhRPTkxiOAAV+ceR6/3K4=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.0.1", + "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.0.1", + "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.3.2", + "hash": "sha256-wdLQSEjvFjApEKU82Ev+y1kHVxeIlrjkuj3wNktGQy8=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.6.0", + "hash": "sha256-weQPisiWSuM5VEeZco4S0QHEXd2bZZwlbyHoaCET4uc=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.3.2", + "hash": "sha256-ySBqawHGZ/Dwoj2UnAzk1Ezxt4qR1AuEY73U/buqNiE=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.6.0", + "hash": "sha256-Ee2SKz5/571l1aYP0b/Gfamsz+v6cjzyu2sKTC6Ld5s=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, + { + "pname": "MSTest.TestAdapter", + "version": "2.2.10", + "hash": "sha256-xpt9NDMDkoV/SzTWLgpKbqMOnhbUKZlBrdFwMGwpzHA=" + }, + { + "pname": "MSTest.TestAdapter", + "version": "3.0.4", + "hash": "sha256-cxynZ6I681YIclJeGtv1OiAxMOdx7FDyVIzNOg10Tgo=" + }, + { + "pname": "MSTest.TestFramework", + "version": "2.2.10", + "hash": "sha256-PEoY4N5F+xhQa6wXiX8SaVHAxw9C7fN+zSNfoModt0g=" + }, + { + "pname": "MSTest.TestFramework", + "version": "3.0.4", + "hash": "sha256-aJqGvGfM2fl2dG05PFgPth/1qMhVpDRBMWuNu4yt4Dc=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" + }, + { + "pname": "Newtonsoft.Json", + "version": "10.0.3", + "hash": "sha256-WEHCjp+OMr5axXQjFsh7TMDE/ttE35nMv5RBPdcxfhs=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, + { + "pname": "Newtonsoft.Json", + "version": "9.0.1", + "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU=" + }, + { + "pname": "NuGet.Frameworks", + "version": "5.11.0", + "hash": "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM=" + }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.0", + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + }, + { + "pname": "SQLitePCLRaw.bundle_e_sqlite3", + "version": "2.1.6", + "hash": "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718=" + }, + { + "pname": "SQLitePCLRaw.core", + "version": "2.1.6", + "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E=" + }, + { + "pname": "SQLitePCLRaw.lib.e_sqlite3", + "version": "2.1.6", + "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0=" + }, + { + "pname": "SQLitePCLRaw.provider.e_sqlite3", + "version": "2.1.6", + "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8=" + }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, + { + "pname": "System.Buffers", + "version": "4.3.0", + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Collections", + "version": "4.0.11", + "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" + }, + { + "pname": "System.Collections.NonGeneric", + "version": "4.3.0", + "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8=" + }, + { + "pname": "System.Collections.Specialized", + "version": "4.3.0", + "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk=" + }, + { + "pname": "System.ComponentModel", + "version": "4.3.0", + "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU=" + }, + { + "pname": "System.ComponentModel.Primitives", + "version": "4.3.0", + "hash": "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus=" + }, + { + "pname": "System.ComponentModel.TypeConverter", + "version": "4.3.0", + "hash": "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54=" + }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.0.11", + "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, + { + "pname": "System.Diagnostics.TextWriterTraceListener", + "version": "4.3.0", + "hash": "sha256-gx3IHPvPNRmwpLwtswu12U/ow4f/7OPAeHxyMxw5qyU=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.0.1", + "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" + }, + { + "pname": "System.Diagnostics.TraceSource", + "version": "4.3.0", + "hash": "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Dynamic.Runtime", + "version": "4.0.11", + "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" + }, + { + "pname": "System.Dynamic.Runtime", + "version": "4.3.0", + "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU=" + }, + { + "pname": "System.Globalization", + "version": "4.0.11", + "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + }, + { + "pname": "System.IO", + "version": "4.1.0", + "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.0.1", + "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.0.1", + "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.0", + "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" + }, + { + "pname": "System.Linq", + "version": "4.1.0", + "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.1.0", + "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.3.0", + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" + }, + { + "pname": "System.Memory", + "version": "4.5.3", + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" + }, + { + "pname": "System.Memory", + "version": "4.5.4", + "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" + }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, + { + "pname": "System.Net.Http", + "version": "4.3.0", + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.4.0", + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + }, + { + "pname": "System.ObjectModel", + "version": "4.0.12", + "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s=" + }, + { + "pname": "System.ObjectModel", + "version": "4.3.0", + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Reflection", + "version": "4.1.0", + "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.0.1", + "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.0.1", + "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.0.1", + "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.3.0", + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.0.1", + "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.6.0", + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.0.1", + "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.1.0", + "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.3.0", + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.0.1", + "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.1.0", + "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.3", + "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.1.0", + "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.0.1", + "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.1.0", + "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.3.0", + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Runtime.Serialization.Formatters", + "version": "4.3.0", + "hash": "sha256-Feic7MGKVG4imh7kpLkPHmApQzYjq7SxHnazh2wZkoQ=" + }, + { + "pname": "System.Runtime.Serialization.Primitives", + "version": "4.1.1", + "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" + }, + { + "pname": "System.Runtime.Serialization.Primitives", + "version": "4.3.0", + "hash": "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc=" + }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "5.0.0", + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.0.11", + "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.0.11", + "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.0", + "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.0", + "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.1.0", + "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.0", + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" + }, + { + "pname": "System.Threading", + "version": "4.0.11", + "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.0.11", + "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.0.0", + "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.3.0", + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.0.11", + "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.3.0", + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.0.11", + "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + }, + { + "pname": "System.Xml.XmlDocument", + "version": "4.3.0", + "hash": "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4=" + }, + { + "pname": "ZstdNet", + "version": "1.4.5", + "hash": "sha256-8ilfyR4ajq9hXTgsZQbvfFW0T00BfW5Cv77B4qKCNlw=" + } +] diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix new file mode 100644 index 000000000000..52ee039d8c9a --- /dev/null +++ b/pkgs/by-name/gr/grayjay/package.nix @@ -0,0 +1,191 @@ +{ + buildDotnetModule, + fetchFromGitLab, + dotnetCorePackages, + buildNpmPackage, + lib, + libz, + icu, + openssl, + xorg, + gtk3, + glib, + nss, + nspr, + dbus, + atk, + cups, + libdrm, + expat, + libxkbcommon, + pango, + cairo, + udev, + alsa-lib, + mesa, + libGL, + libsecret, + nix-update-script, + autoPatchelfHook, + makeDesktopItem, + copyDesktopItems, + libgcc, + krb5, + wrapGAppsHook3, +}: +let + version = "5"; + src = fetchFromGitLab { + domain = "gitlab.futo.org"; + owner = "videostreaming"; + repo = "Grayjay.Desktop"; + tag = version; + hash = "sha256-xrbYghNymny6MQrvFn++GaI+kUoOphPQMWcqH47U1Yg="; + fetchSubmodules = true; + fetchLFS = true; + }; + frontend = buildNpmPackage { + name = "grayjay-frontend"; + inherit version src; + + sourceRoot = "source/Grayjay.Desktop.Web"; + + npmBuildScript = "build"; + npmDepsHash = "sha256-pTEbMSAJwTY6ZRriPWfBFnRHSYufSsD0d+hWGz35xFM="; + + installPhase = '' + runHook preInstall + cp -r dist/ $out + runHook postInstall + ''; + }; +in +buildDotnetModule { + pname = "grayjay"; + + inherit version src frontend; + + buildInputs = [ + openssl + libgcc + xorg.libX11 + gtk3 + glib + alsa-lib + mesa + nspr + nss + icu + krb5 + ]; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook3 + copyDesktopItems + ]; + + dontWrapGApps = true; + + desktopItems = [ + (makeDesktopItem { + name = "Grayjay"; + exec = "Grayjay"; + icon = "grayjay"; + comment = "Cross platform media application for streaming and downloading media"; + desktopName = "Grayjay Desktop"; + categories = [ "Network" ]; + }) + ]; + + projectFile = [ + "Grayjay.ClientServer/Grayjay.ClientServer.csproj" + "Grayjay.Engine/Grayjay.Engine/Grayjay.Engine.csproj" + "Grayjay.Desktop.CEF/Grayjay.Desktop.CEF.csproj" + "FUTO.MDNS/FUTO.MDNS/FUTO.MDNS.csproj" + "JustCef/DotCef.csproj" + ]; + + testProjectFile = [ + "Grayjay.Desktop.Tests/Grayjay.Desktop.Tests.csproj" + "Grayjay.Engine/Grayjay.Engine.Tests/Grayjay.Engine.Tests.csproj" + ]; + + nugetDeps = ./deps.json; + + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + + executables = [ "Grayjay" ]; + + preBuild = '' + rm -r Grayjay.ClientServer/wwwroot/web + cp -r ${frontend} Grayjay.ClientServer/wwwroot/web + ''; + + postInstall = '' + chmod +x $out/lib/grayjay/cef/dotcefnative + chmod +x $out/lib/grayjay/ffmpeg + rm $out/lib/grayjay/Portable + ln -s /tmp/grayjay-launch $out/lib/grayjay/launch + ln -s /tmp/grayjay-cef-launch $out/lib/grayjay/cef/launch + mkdir -p $out/share/icons/hicolor/scalable/apps + ln -s $out/lib/grayjay/grayjay.png $out/share/icons/hicolor/scalable/apps/grayjay.png + ''; + + makeWrapperArgs = [ + "--chdir" + "${placeholder "out"}/lib/grayjay" + ]; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + runtimeDeps = [ + libz + + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxcb + + dbus + atk + cups + libdrm + expat + libxkbcommon + pango + cairo + udev + libGL + libsecret + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "frontend" + "--url" + "https://github.com/futo-org/Grayjay.Desktop" + ]; + }; + + meta = { + description = "Cross-platform application to stream and download content from various sources"; + longDescription = '' + Grayjay is a cross-platform application that enables users to + stream and download multimedia content from various online sources, + most prominently YouTube. + It also offers an extensible plugin API to create and import new + integrations. + ''; + homepage = "https://grayjay.app/desktop/"; + license = lib.licenses.sfl; + maintainers = with lib.maintainers; [ samfundev ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "Grayjay"; + }; +} diff --git a/pkgs/by-name/gr/grcov/0001-update-time-rs.patch b/pkgs/by-name/gr/grcov/0001-update-time-rs.patch deleted file mode 100644 index e3eb06eea939..000000000000 --- a/pkgs/by-name/gr/grcov/0001-update-time-rs.patch +++ /dev/null @@ -1,193 +0,0 @@ -From cd983416673fabf7bc55c0888c0f73f209f35e4e Mon Sep 17 00:00:00 2001 -From: wxt <3264117476@qq.com> -Date: Fri, 27 Sep 2024 16:03:44 +0800 -Subject: [PATCH] update time-rs - ---- - Cargo.lock | 63 ++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 44 insertions(+), 19 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index af7c7f2..30cb4c3 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -353,7 +353,7 @@ dependencies = [ - "heck", - "proc-macro2", - "quote", -- "syn 2.0.25", -+ "syn 2.0.32", - ] - - [[package]] -@@ -463,6 +463,15 @@ dependencies = [ - "uuid", - ] - -+[[package]] -+name = "deranged" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", -+] -+ - [[package]] - name = "deunicode" - version = "0.4.3" -@@ -871,6 +880,12 @@ dependencies = [ - "bitflags 1.3.2", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-traits" - version = "0.2.15" -@@ -970,7 +985,7 @@ dependencies = [ - "pest_meta", - "proc-macro2", - "quote", -- "syn 2.0.25", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1029,6 +1044,12 @@ version = "0.3.27" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -+[[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" -@@ -1275,22 +1296,22 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.171" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" -+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.171" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" -+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.25", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1323,7 +1344,7 @@ checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" - dependencies = [ - "log", - "termcolor", -- "time 0.3.23", -+ "time 0.3.36", - ] - - [[package]] -@@ -1403,9 +1424,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.25" -+version = "2.0.32" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" -+checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" - dependencies = [ - "proc-macro2", - "quote", -@@ -1536,7 +1557,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.25", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1561,13 +1582,16 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.23" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ -+ "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -1575,16 +1599,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.1" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.10" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - -@@ -1762,7 +1787,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn 2.0.25", -+ "syn 2.0.32", - "wasm-bindgen-shared", - ] - -@@ -1784,7 +1809,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.25", -+ "syn 2.0.32", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] --- -2.46.0 - diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix index 6fcb3d75affb..0c3b55f9ebc9 100644 --- a/pkgs/by-name/gr/grcov/package.nix +++ b/pkgs/by-name/gr/grcov/package.nix @@ -4,23 +4,19 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "grcov"; - version = "0.8.19"; + version = "0.9.1"; src = fetchFromGitHub { owner = "mozilla"; repo = "grcov"; - tag = "v${version}"; - sha256 = "sha256-1t+hzB9sSApLScCkjBnLk9i2dsoEwZmWCFukEOvHhZI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-e3RQn6wKvVm40UK8ZlgIi2gRS9eEFBnEXdmXtCgv0Go="; }; - cargoPatches = [ - ./0001-update-time-rs.patch - ]; - useFetchCargoVendor = true; - cargoHash = "sha256-WOVIlUBPiZyBFfl3hwfN63jSxd3vysRY9VKUqk0lCc8="; + cargoHash = "sha256-v4laGVbWmK8WFJXX5ChtViyKyMtmwpehSgNG6F31Mn0="; # tests do not find grcov path correctly checkFlags = @@ -46,4 +42,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ DieracDelta ]; }; -} +}) diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index 951d7b453687..177d4fecddd3 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "greenmask"; - version = "0.2.9"; + version = "0.2.11"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; tag = "v${version}"; - hash = "sha256-ORyczdynAAr2hYzXove/IXRngkRIhKgXLQg5VbvvGS8="; + hash = "sha256-KHM/r4zDJrZMIC7+Kp+98xhV5r4zkpxc1ffqf0jgnLs="; }; - vendorHash = "sha256-UY79Fex8hwaXtFLefBUeyO7PxJevWWaQU5MEOAMLPkA="; + vendorHash = "sha256-g3/WuLDb4mAzklT+nxQ1U/l+JDzSubENMB5hWjIaIIU="; subPackages = [ "cmd/greenmask/" ]; diff --git a/pkgs/by-name/gr/gretl/package.nix b/pkgs/by-name/gr/gretl/package.nix index 0e09aa73f5aa..2f811e9e4e5d 100644 --- a/pkgs/by-name/gr/gretl/package.nix +++ b/pkgs/by-name/gr/gretl/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { gretl is a cross-platform software package for econometric analysis, written in the C programming language. ''; - maintainers = with lib.maintainers; [ dmrauh ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/gr/grex/package.nix b/pkgs/by-name/gr/grex/package.nix new file mode 100644 index 000000000000..9cc22a265e50 --- /dev/null +++ b/pkgs/by-name/gr/grex/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "grex"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "pemistahl"; + repo = "grex"; + rev = "v${version}"; + hash = "sha256-Ut2H2H66XN1+wHpYivnuhil21lbd7bwIcIcMyIimdis="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-OsK6X7qwMMQ1FK3JE98J2u6pn6AixE8izFmxUVDs5GM="; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/grex --help > /dev/null + ''; + + meta = with lib; { + description = "Command-line tool for generating regular expressions from user-provided test cases"; + homepage = "https://github.com/pemistahl/grex"; + changelog = "https://github.com/pemistahl/grex/releases/tag/v${version}"; + license = licenses.asl20; + mainProgram = "grex"; + maintainers = with maintainers; [ + SuperSandro2000 + mfrw + ]; + }; +} diff --git a/pkgs/by-name/gr/gridlock/package.nix b/pkgs/by-name/gr/gridlock/package.nix index fc65506c631e..5f609d110b22 100644 --- a/pkgs/by-name/gr/gridlock/package.nix +++ b/pkgs/by-name/gr/gridlock/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -31,13 +29,9 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; postInstall = '' moveToOutput bin/nyarr $nyarr diff --git a/pkgs/by-name/gr/grig/0001-Fix-grig-for-hamlib-4.6.2.patch b/pkgs/by-name/gr/grig/0001-Fix-grig-for-hamlib-4.6.2.patch new file mode 100644 index 000000000000..5c754660bef1 --- /dev/null +++ b/pkgs/by-name/gr/grig/0001-Fix-grig-for-hamlib-4.6.2.patch @@ -0,0 +1,34 @@ +diff --git a/src/rig-selector.c b/src/rig-selector.c +index 425d41a..e040c0e 100644 +--- a/src/rig-selector.c ++++ b/src/rig-selector.c +@@ -46,7 +46,7 @@ static void add (GtkWidget *, gpointer); + static void delete (GtkWidget *, gpointer); + static void edit (GtkWidget *, gpointer); + static void cancel (GtkWidget *, gpointer); +-static void connect (GtkWidget *, gpointer); ++static void connectrig (GtkWidget *, gpointer); + static void selection_changed (GtkTreeSelection *sel, gpointer data); + + static void render_civ (GtkTreeViewColumn *col, +@@ -191,7 +191,7 @@ rig_selector_execute () + g_signal_connect (G_OBJECT (cancbut), "clicked", + G_CALLBACK (cancel), window); + g_signal_connect (G_OBJECT (conbut), "clicked", +- G_CALLBACK (connect), window); ++ G_CALLBACK (connectrig), window); + g_signal_connect (G_OBJECT (delbut), "clicked", + G_CALLBACK (delete), NULL); + g_signal_connect (G_OBJECT (newbut), "clicked", +@@ -439,7 +439,7 @@ static void cancel (GtkWidget *button, gpointer window) + * simply destroys the rig selector window and whereby control is returned + * to the main() function. + */ +-static void connect (GtkWidget *button, gpointer window) ++static void connectrig (GtkWidget *button, gpointer window) + { + + +-- +2.47.0 + diff --git a/pkgs/by-name/gr/grig/package.nix b/pkgs/by-name/gr/grig/package.nix index 189eaeaa3639..9b54d5c63f86 100644 --- a/pkgs/by-name/gr/grig/package.nix +++ b/pkgs/by-name/gr/grig/package.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-OgIgHW9NMW/xSSti3naIR8AQWUtNSv5bYdOcObStBlM="; }; + patches = [ + # https://github.com/fillods/grig/issues/22 + ./0001-Fix-grig-for-hamlib-4.6.2.patch + ]; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -41,6 +46,9 @@ stdenv.mkDerivation rec { homepage = "https://groundstation.sourceforge.net/grig/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ melling ]; + maintainers = with maintainers; [ + melling + mafo + ]; }; } diff --git a/pkgs/by-name/gr/grilo-plugins/package.nix b/pkgs/by-name/gr/grilo-plugins/package.nix index 873886d95041..0fd9b87e021f 100644 --- a/pkgs/by-name/gr/grilo-plugins/package.nix +++ b/pkgs/by-name/gr/grilo-plugins/package.nix @@ -26,7 +26,7 @@ json-glib, avahi, tinysparql, - dleyna-server, + dleyna, itstool, totem-pl-parser, }: @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { avahi libmediaart tinysparql - dleyna-server + dleyna gst_all_1.gstreamer ]; @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/grilo-plugins"; description = "Collection of plugins for the Grilo framework"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gr/grilo/package.nix b/pkgs/by-name/gr/grilo/package.nix index 44e42f772c71..8b04f025f60b 100644 --- a/pkgs/by-name/gr/grilo/package.nix +++ b/pkgs/by-name/gr/grilo/package.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.lgpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index 4b90a5a62143..51f533ccc4f3 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -18,13 +18,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "0.1-unstable-2025-03-31"; + version = "0.1-unstable-2025-05-18"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "bc2ad24e0b2e66c3e164994c4897cd94a933fd10"; - hash = "sha256-YItzk1pj8Kz+b7VlC9zN1pSZ6CuX35asYy3HuMQ3lBQ="; + rev = "910dad4c5755c1735d30da10c96d9086aa2a608d"; + hash = "sha256-PMQoXbfmWPuXnF8EaWqRmvTvl7+WFUrDVgufFRPgOM4="; }; strictDeps = true; @@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Helper for screenshots within Hyprland, based on grimshot"; license = licenses.mit; platforms = platforms.unix; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; mainProgram = "grimblast"; }; }) diff --git a/pkgs/by-name/gr/grisbi/package.nix b/pkgs/by-name/gr/grisbi/package.nix new file mode 100644 index 000000000000..b58bdc620c46 --- /dev/null +++ b/pkgs/by-name/gr/grisbi/package.nix @@ -0,0 +1,59 @@ +{ + fetchFromGitHub, + lib, + stdenv, + gtk3, + pkg-config, + libgsf, + libofx, + autoreconfHook, + intltool, + wrapGAppsHook3, + adwaita-icon-theme, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "grisbi"; + version = "3.0.4"; + + src = fetchFromGitHub { + owner = "grisbi"; + repo = "grisbi"; + tag = "upstream_version_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; + hash = "sha256-3E57M/XE4xyo3ppVceDA4OFDnVicosCY8ikE2gDJoUQ="; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + intltool + autoreconfHook + ]; + + buildInputs = [ + gtk3 + libgsf + libofx + adwaita-icon-theme + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Personnal accounting application"; + mainProgram = "grisbi"; + longDescription = '' + Grisbi is an application written by French developers, so it perfectly + respects French accounting rules. Grisbi can manage multiple accounts, + currencies and users. It manages third party, expenditure and receipt + categories, budgetary lines, financial years, budget estimates, bankcard + management and other information that make Grisbi adapted for + associations. + ''; + homepage = "https://grisbi.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ layus ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix index b3ba15f3e364..25164b54e280 100644 --- a/pkgs/by-name/gr/grml-zsh-config/package.nix +++ b/pkgs/by-name/gr/grml-zsh-config/package.nix @@ -2,10 +2,6 @@ stdenv, fetchFromGitHub, lib, - zsh, - coreutils, - inetutils, - procps, txt2tags, }: stdenv.mkDerivation rec { @@ -21,11 +17,6 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ txt2tags ]; - buildInputs = [ - zsh - coreutils - procps - ] ++ lib.optional stdenv.hostPlatform.isLinux inetutils; buildPhase = '' cd doc diff --git a/pkgs/by-name/gr/grmon/package.nix b/pkgs/by-name/gr/grmon/package.nix index df610dec3ecb..48f9741970cf 100644 --- a/pkgs/by-name/gr/grmon/package.nix +++ b/pkgs/by-name/gr/grmon/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "grmon"; version = "0.1"; src = fetchFromGitHub { owner = "bcicen"; repo = "grmon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-0J7f4DMADUut3Da0F1eTDsT1Hlk0rfInwzbcVcQNzg8="; }; @@ -35,4 +35,4 @@ buildGoModule rec { mainProgram = "grmon"; maintainers = with maintainers; [ katexochen ]; }; -} +}) diff --git a/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch b/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch index 8729031f14cb..76b29d3ee3ed 100644 --- a/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch +++ b/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch @@ -2,14 +2,12 @@ Do not use vendored libraries --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt -@@ -14,10 +14,7 @@ - # License along with this library; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - add_subdirectory(onigmo) +@@ -18,8 +18,6 @@ + if(GRN_WITH_BUNDLED_ONIGMO) + add_subdirectory(onigmo) + endif() -add_subdirectory(mruby) -add_subdirectory(mecab) --add_subdirectory(message_pack) if(GRN_WITH_MRUBY) add_subdirectory(groonga-log) endif() diff --git a/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch b/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch index 5b00cd42404c..bca9b6d5d023 100644 --- a/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch +++ b/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch @@ -2,8 +2,8 @@ Fix CMake install path --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1141,11 +1141,11 @@ - +@@ -1879,11 +1879,11 @@ + set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "\${prefix}") -set(bindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}") diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix index 8b985dbeee43..1a7469909017 100644 --- a/pkgs/by-name/gr/groonga/package.nix +++ b/pkgs/by-name/gr/groonga/package.nix @@ -15,7 +15,6 @@ suggestSupport ? false, zeromq, libevent, - openssl, lz4Support ? false, lz4, zlibSupport ? true, @@ -24,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "groonga"; - version = "14.0.6"; + version = "15.0.4"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz"; - hash = "sha256-1caTQAycvpG2PgtbxIn58HrxvWjxKgiczRSC72nWzGw="; + hash = "sha256-ESPUEBpV6hg8KQeSzjklPgf4R0DlYdpwxp9M6YdTV/Q="; }; patches = [ @@ -74,12 +73,12 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { homepage = "https://groonga.org/"; description = "Open-source fulltext search engine and column store"; - license = licenses.lgpl21; - maintainers = [ maintainers.ericsagnes ]; - platforms = platforms.all; + license = lib.licenses.lgpl21; + maintainers = [ ]; + platforms = lib.platforms.all; longDescription = '' Groonga is an open-source fulltext search engine and column store. It lets you write high-performance applications that requires fulltext search. diff --git a/pkgs/by-name/gr/grpc-client-cli/package.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix index c1a9082d3262..6d809d2ccfee 100644 --- a/pkgs/by-name/gr/grpc-client-cli/package.nix +++ b/pkgs/by-name/gr/grpc-client-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grpc-client-cli"; - version = "1.22.1"; + version = "1.22.3"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${version}"; - sha256 = "sha256-+Njo3cqqWhQMYsO7VLScPemmBMCf55khzLqBmODqEng="; + sha256 = "sha256-6dUdyBmwX97Xvy7CYMUrpQxG25uPFyPFhwFI3QMzWtU="; }; - vendorHash = "sha256-iZh/Ax9Gf3YNUgk2vNvTewuq97nUE3POaOb9/poVrCY="; + vendorHash = "sha256-Iiifu0dYgeqWUgWRjJ3uaBL6SyYl2Ehqzk+1COO/XXI="; meta = with lib; { description = "generic gRPC command line client"; diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index c46f56491ac1..55f55853d9c4 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -25,7 +25,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "grpc"; - version = "1.70.0"; # N.B: if you change this, please update: + version = "1.71.0"; # N.B: if you change this, please update: # pythonPackages.grpcio # pythonPackages.grpcio-channelz # pythonPackages.grpcio-health-checking @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-kJhGAhqu25Q2g6BWkVGp6nGYrWdBnMhoMu6e7ifNbgk="; + hash = "sha256-QKSdMpfl0pdKy/r4z8VKcGN0gsQmx9lBRHlCjaaF5Sg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix index b42c9c89e35e..debe8f09f95e 100644 --- a/pkgs/by-name/gr/grpc_cli/package.nix +++ b/pkgs/by-name/gr/grpc_cli/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.71.0"; + version = "1.71.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-QKSdMpfl0pdKy/r4z8VKcGN0gsQmx9lBRHlCjaaF5Sg="; + hash = "sha256-5O+KsiytR1UBi8eS9pPuGrt7KCZSY0VGHMHVO/LZkg8="; fetchSubmodules = true; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index 72a3e999840b..be9c5eb58abe 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-11-06"; + version = "0-unstable-2025-04-24"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "d064cd480a1e4802851b35bf051e48c808802c2a"; - hash = "sha256-LOizbRbPj3X0B0bED6fRcwxYeRFY8vtLk0i64pqyIyY="; + rev = "fbced4ba03975dadd1d74d6b73cccdcbbd5e8b90"; + hash = "sha256-zhY3uwvtHNKNrdWiD5Le/AMz1lgV39K/RNhFGnIMpzg="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 2df384d4b2a9..c860fed3838f 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -7,15 +7,15 @@ openssl, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "grype"; - version = "0.87.0"; + version = "0.92.0"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; - tag = "v${version}"; - hash = "sha256-El7cegeHMb6fhO1Vr6FK0E3Mlk/dbU0Dv4lUYNu0Gcc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-DwPKhUIBQYbFEYi3EmDQ4hWDLksexTOoPZCL4G+VXks="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-SbKvDAzWq58O0e/+1r5oI3rxfdsnPenMPwqNRTOe7AI="; + vendorHash = "sha256-4yE8NIFVMikGXd44K9ysXKGzoMyW8sQcAzy61RNR/Jo="; nativeBuildInputs = [ installShellFiles ]; @@ -46,8 +46,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=main.version=${version}" - "-X=main.gitDescription=v${version}" + "-X=main.version=${finalAttrs.version}" + "-X=main.gitDescription=v${finalAttrs.version}" "-X=main.gitTreeState=clean" ]; @@ -67,13 +67,15 @@ buildGoModule rec { unset ldflags # patch utility script - patchShebangs grype/db/legacy/distribution/test-fixtures/tls/generate-x509-cert-pair.sh + patchShebangs grype/db/v5/distribution/test-fixtures/tls/generate-x509-cert-pair.sh # FIXME: these tests fail when building with Nix substituteInPlace test/cli/config_test.go \ --replace-fail "Test_configLoading" "Skip_configLoading" substituteInPlace test/cli/db_providers_test.go \ --replace-fail "TestDBProviders" "SkipDBProviders" + substituteInPlace grype/presenter/cyclonedx/presenter_test.go \ + --replace-fail "TestCycloneDxPresenterDir" "SkipCycloneDxPresenterDir" # remove tests that depend on docker substituteInPlace test/cli/cmd_test.go \ @@ -115,20 +117,20 @@ buildGoModule rec { --zsh <($out/bin/grype completion zsh) ''; - meta = with lib; { + meta = { description = "Vulnerability scanner for container images and filesystems"; homepage = "https://github.com/anchore/grype"; - changelog = "https://github.com/anchore/grype/releases/tag/v${version}"; + changelog = "https://github.com/anchore/grype/releases/tag/v${finalAttrs.version}"; longDescription = '' As a vulnerability scanner grype is able to scan the contents of a container image or filesystem to find known vulnerabilities. ''; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ fab jk kashw2 ]; mainProgram = "grype"; }; -} +}) diff --git a/pkgs/by-name/gs/gsasl/package.nix b/pkgs/by-name/gs/gsasl/package.nix index 714423ee2738..eb7fccdd294f 100644 --- a/pkgs/by-name/gs/gsasl/package.nix +++ b/pkgs/by-name/gs/gsasl/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gsasl"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "mirror://gnu/gsasl/gsasl-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-1FtWLhO9E7n8ILNy9LUyaXQM9iefg28JzhG50yvO4HU="; + sha256 = "sha256-QejkQmSOzK9kWdmtk9SxhTC5bI6vUOPzQlMu8nXv87o="; }; buildInputs = [ diff --git a/pkgs/by-name/gs/gscreenshot/package.nix b/pkgs/by-name/gs/gscreenshot/package.nix index 49eeaff4d92d..1cc9f76984f4 100644 --- a/pkgs/by-name/gs/gscreenshot/package.nix +++ b/pkgs/by-name/gs/gscreenshot/package.nix @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { pname = "gscreenshot"; - version = "3.8.0"; + version = "3.9.2"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; tag = "v${version}"; - sha256 = "sha256-erNP5Joz4j08jN2c0wUX/h3sJmr/wXYFghBA+7RX4Aw="; + sha256 = "sha256-u60wxtWE7VaAE/xKlcY9vE7Chs5TPd0BTe5zy1D7ZAQ="; }; # needed for wrapGAppsHook3 to function diff --git a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix index 7e7d51cffdf3..61baf68d5f80 100644 --- a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix +++ b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "47.1"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-pgIE2cnAobJk1tDRNKODQLpfxgdqNLhNqUXYv8x6KBU="; + hash = "sha256-5o8VWBO/GPhlqLLI6dRzWItsytyvu2Zqt4iFfGwtG9M="; }; strictDeps = true; @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"; description = "Collection of GSettings schemas for settings shared by various components of a desktop"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/gs/gshhg-gmt/package.nix b/pkgs/by-name/gs/gshhg-gmt/package.nix index c17378d5ec1b..16abd9bdbae5 100644 --- a/pkgs/by-name/gs/gshhg-gmt/package.nix +++ b/pkgs/by-name/gs/gshhg-gmt/package.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation (finalAttrs: { Mapping Tools. ''; license = licenses.lgpl3Plus; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); + maintainers = with lib.maintainers; [ tviti ]; + teams = [ lib.teams.geospatial ]; }; }) diff --git a/pkgs/games/gshogi/default.nix b/pkgs/by-name/gs/gshogi/package.nix similarity index 100% rename from pkgs/games/gshogi/default.nix rename to pkgs/by-name/gs/gshogi/package.nix diff --git a/pkgs/by-name/gs/gsl-lite/package.nix b/pkgs/by-name/gs/gsl-lite/package.nix index dba428c51a0e..250263fa1751 100644 --- a/pkgs/by-name/gs/gsl-lite/package.nix +++ b/pkgs/by-name/gs/gsl-lite/package.nix @@ -2,53 +2,38 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, ninja, installCompatHeader ? false, installLegacyHeaders ? false, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gsl-lite"; - version = "0.41.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "gsl-lite"; repo = "gsl-lite"; - rev = "v${version}"; - hash = "sha256-cuuix302bVA7dWa7EJoxJ+otf1rSzjWQK8DHJsVkQio="; + tag = "v${finalAttrs.version}"; + hash = "sha256-9mvbD7zVTtfFRy2qIYJpU9XAlAW4ZLh5DE3WPEQpf38="; }; - patches = [ - (fetchpatch { - name = "type-limits-cast-fix.patch"; - url = "https://github.com/gsl-lite/gsl-lite/commit/13475be0e5bf5f464c398f4a07ef5c7684bc57c5.patch"; - hash = "sha256-rSz7OBmgQ3KcQ971tS3Z3QNC+U4XmrPjgmuOyG7J6Bo="; - }) - ]; - nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = - lib.mapAttrsToList (name: value: ''-DGSL_LITE_OPT_${name}:BOOL=${if value then "ON" else "OFF"}'') - { - INSTALL_COMPAT_HEADER = installCompatHeader; - INSTALL_LEGACY_HEADERS = installLegacyHeaders; - BUILD_TESTS = doCheck; - }; + cmakeFlags = [ + (lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "GSL_LITE_OPT_INSTALL_COMPAT_HEADER" installCompatHeader) + (lib.cmakeBool "GSL_LITE_OPT_INSTALL_LEGACY_HEADERS" installLegacyHeaders) + ]; # Building tests is broken on Darwin. doCheck = !stdenv.hostPlatform.isDarwin; - meta = with lib; { - description = '' - A single-file header-only version of ISO C++ Guidelines Support Library - (GSL) for C++98, C++11, and later - ''; + meta = { + description = "Single-file header-only version of ISO C++ GSL"; longDescription = '' gsl-lite is a single-file header-only implementation of the C++ Core Guidelines Support Library originally based on Microsoft GSL and adapted @@ -56,9 +41,9 @@ stdenv.mkDerivation rec { C++20. ''; homepage = "https://github.com/gsl-lite/gsl-lite"; - changelog = "https://github.com/gsl-lite/gsl-lite/blob/${src.rev}/CHANGES.txt"; - license = licenses.mit; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.all; + changelog = "https://github.com/gsl-lite/gsl-lite/blob/${finalAttrs.src.rev}/CHANGES.txt"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.azahi ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/gs/gsmartcontrol/package.nix b/pkgs/by-name/gs/gsmartcontrol/package.nix index 36f616d94cc1..27bff9bb23b3 100644 --- a/pkgs/by-name/gs/gsmartcontrol/package.nix +++ b/pkgs/by-name/gs/gsmartcontrol/package.nix @@ -1,10 +1,9 @@ { - fetchurl, lib, stdenv, + fetchFromGitHub, smartmontools, - autoreconfHook, - gettext, + cmake, gtkmm3, pkg-config, wrapGAppsHook3, @@ -12,29 +11,28 @@ adwaita-icon-theme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gsmartcontrol"; - version = "1.1.4"; + version = "2.0.2"; - src = fetchurl { - url = "https://github.com/ashaduri/gsmartcontrol/releases/download/v${version}/gsmartcontrol-${version}.tar.bz2"; - sha256 = "sha256-/ECfK4qEzEC7ED1sgkAbnUwBgtWjsiPJOVnHrWYZGEc="; + src = fetchFromGitHub { + owner = "ashaduri"; + repo = "gsmartcontrol"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eLzwFZ1PYqijFTxos9Osf7A2v4C8toM+TGV4/bU82NE="; }; - patches = [ - ./fix-paths.patch - ]; - postPatch = '' - substituteInPlace data/org.gsmartcontrol.policy --replace "/usr/sbin" $out/bin + substituteInPlace data/gsmartcontrol.in.desktop \ + --replace-fail "@CMAKE_INSTALL_FULL_BINDIR@/" "" ''; nativeBuildInputs = [ - autoreconfHook - gettext + cmake pkg-config wrapGAppsHook3 ]; + buildInputs = [ gtkmm3 pcre-cpp @@ -60,9 +58,10 @@ stdenv.mkDerivation rec { It allows you to inspect the drive's SMART data to determine its health, as well as run various tests on it. ''; - homepage = "https://gsmartcontrol.shaduri.dev/"; + homepage = "https://gsmartcontrol.shaduri.dev"; + mainProgram = "gsmartcontrol"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ qknight ]; - platforms = with lib.platforms; linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gs/gsound/package.nix b/pkgs/by-name/gs/gsound/package.nix index 96eb2b0454ec..9809fa86a6b8 100644 --- a/pkgs/by-name/gs/gsound/package.nix +++ b/pkgs/by-name/gs/gsound/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gsound"; description = "Small library for playing system sounds"; mainProgram = "gsound-play"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gs/gspell/package.nix b/pkgs/by-name/gs/gspell/package.nix index 6f318a9f790d..eb9d6f29c99c 100644 --- a/pkgs/by-name/gs/gspell/package.nix +++ b/pkgs/by-name/gs/gspell/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { mainProgram = "gspell-app1"; homepage = "https://gitlab.gnome.org/GNOME/gspell"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/gt/gtg/package.nix b/pkgs/by-name/gt/gtg/package.nix index ea9a67cfd284..9bed610db19c 100644 --- a/pkgs/by-name/gt/gtg/package.nix +++ b/pkgs/by-name/gt/gtg/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, meson, python3Packages, ninja, @@ -28,6 +29,14 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-O8qBD92P2g8QrBdMXa6j0Ozk+W80Ny5yk0KNTy7ekfE="; }; + patches = [ + (fetchpatch { + name = "replace-imp-with-importlib.patch"; + url = "https://github.com/getting-things-gnome/gtg/commit/568a00a3296d12cf3b2846c59bc99d13ecba7d47.patch"; + hash = "sha256-i3F638ZGiKfSxVUZm6rzzPRpcIHLOO9dgV0SzNLSroI="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/by-name/gt/gtk-doc/package.nix b/pkgs/by-name/gt/gtk-doc/package.nix index ad8c58cc3de1..27bfce5f5312 100644 --- a/pkgs/by-name/gt/gtk-doc/package.nix +++ b/pkgs/by-name/gt/gtk-doc/package.nix @@ -96,6 +96,7 @@ python3.pkgs.buildPythonApplication rec { description = "Tools to extract documentation embedded in GTK and GNOME source code"; homepage = "https://gitlab.gnome.org/GNOME/gtk-doc"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ pSub ]); + maintainers = with maintainers; [ pSub ]; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/gt/gtk-frdp/package.nix b/pkgs/by-name/gt/gtk-frdp/package.nix index d45904eb477d..9196214e4616 100644 --- a/pkgs/by-name/gt/gtk-frdp/package.nix +++ b/pkgs/by-name/gt/gtk-frdp/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation { pname = "gtk-frdp"; - version = "0-unstable-2024-12-23"; + version = "0-unstable-2025-03-14"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gtk-frdp"; - rev = "46ca0beb9b5bf8c9b245a596231016bcca9baf6b"; - sha256 = "zRC3YVe2WwOmVzEDaJwsct3YQ4ZbvYTr2CTyRmfCXFY="; + rev = "a0187fa02e1ff249e9583e8c09a2c2f5915ce2a3"; + hash = "sha256-oi4Iwi9/elfUDKK0IhoNgtS8ORIzVUBagqBVdNRxGjI="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gtk-frdp"; description = "RDP viewer widget for GTK"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.lgpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/gt/gtk-layer-shell/package.nix b/pkgs/by-name/gt/gtk-layer-shell/package.nix index 079f525bd712..195c4a56f236 100644 --- a/pkgs/by-name/gt/gtk-layer-shell/package.nix +++ b/pkgs/by-name/gt/gtk-layer-shell/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk-layer-shell"; - version = "0.9.0"; + version = "0.9.1"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-9hQE1NY5QCuj+5R5aSjJ0DaMUQuO7HPpZooj+1+96RY="; + hash = "sha256-TObAo/YgS6ObYrNLitxMwneGzLxwnnBIOhBVAeAzbt4="; }; strictDeps = true; diff --git a/pkgs/by-name/gt/gtk-mac-integration/package.nix b/pkgs/by-name/gt/gtk-mac-integration/package.nix new file mode 100644 index 000000000000..d2d56bec0da0 --- /dev/null +++ b/pkgs/by-name/gt/gtk-mac-integration/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + glib, + gtk-doc, + gtk ? gtk3, + gtk3, + gobject-introspection, +}: + +stdenv.mkDerivation rec { + pname = "gtk-mac-integration"; + version = "3.0.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0sc0m3p8r5xfh5i4d7dg72kfixx9yi4f800y43bszyr88y52jkga"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + gtk-doc + gobject-introspection + ]; + buildInputs = [ glib ]; + propagatedBuildInputs = [ gtk ]; + + preAutoreconf = '' + gtkdocize + ''; + + meta = with lib; { + description = "Provides integration for GTK applications into the Mac desktop"; + license = licenses.lgpl21; + homepage = "https://gitlab.gnome.org/GNOME/gtk-mac-integration"; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/by-name/gt/gtranslator/package.nix b/pkgs/by-name/gt/gtranslator/package.nix index 60e5fa4a32f0..75e84e533a32 100644 --- a/pkgs/by-name/gt/gtranslator/package.nix +++ b/pkgs/by-name/gt/gtranslator/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "47.1"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-yRwCZLmpnjCR75EfcxqP9tCahKK8115WUZcdprvqYiI="; + hash = "sha256-5468IAaiUdh5btHnK5wuU2R5c3B+ZbdNn5RSGwOSnp8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix index c3425c3bfd1c..43c307cb973f 100644 --- a/pkgs/by-name/gt/gtree/package.nix +++ b/pkgs/by-name/gt/gtree/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.11.0"; + version = "1.11.7"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-d+cFESWQyu2laj1pLepEWoHnFHaSKytfWkmD4yuFf78="; + hash = "sha256-C/Ouk903jCi39TbYNggUO2Q8MBgB9Lq3p+9DiR/oHSA="; }; - vendorHash = "sha256-jx+F8FfFMMU4I61O0ERXp5OLC9SdQculYoa+3CgVL2w="; + vendorHash = "sha256-TS46EokHoh/GUSYlWnHTUaqvIrFHXhH/NMvcJ4GscjM="; subPackages = [ "cmd/gtree" diff --git a/pkgs/by-name/gt/gtypist/package.nix b/pkgs/by-name/gt/gtypist/package.nix index 59628e7a64d5..e1ee7c369730 100644 --- a/pkgs/by-name/gt/gtypist/package.nix +++ b/pkgs/by-name/gt/gtypist/package.nix @@ -9,18 +9,19 @@ fortune, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtypist"; - version = "2.9.5"; + version = "2.10.1"; src = fetchurl { - url = "mirror://gnu/gtypist/gtypist-${version}.tar.xz"; - sha256 = "0xzrkkmj0b1dw3yr0m9hml2y634cc4h61im6zwcq57s7285z8fn1"; + url = "mirror://gnu/gtypist/gtypist-${finalAttrs.version}.tar.xz"; + hash = "sha256-ymGAVOkfHtXvBD/MQ1ALutcByVnDGETUaI/yKEmsJS0="; }; - CFLAGS = "-std=gnu89"; + CFLAGS = "-std=gnu99"; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ncurses perl @@ -32,11 +33,11 @@ stdenv.mkDerivation rec { --prefix PATH : "${fortune}/bin" \ ''; - meta = with lib; { + meta = { homepage = "https://www.gnu.org/software/gtypist"; description = "Universal typing tutor"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ pSub ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/gu/guacamole-server/package.nix b/pkgs/by-name/gu/guacamole-server/package.nix index a146225be312..9b4411f084e6 100644 --- a/pkgs/by-name/gu/guacamole-server/package.nix +++ b/pkgs/by-name/gu/guacamole-server/package.nix @@ -28,23 +28,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "guacamole-server"; - version = "1.5.5"; + version = "1.6.0-unstable-2025-05-16"; src = fetchFromGitHub { owner = "apache"; repo = "guacamole-server"; - rev = finalAttrs.version; - hash = "sha256-ZrUaoWkZ3I/LxE7csDXXeUZ92jZDhkZ1c8EQU0gI1yY="; + rev = "acb69735359d4d4a08f65d6eb0bde2a0da08f751"; + hash = "sha256-rqGSQD9EYlK1E6y/3EzynRmBWJOZBrC324zVvt7c2vM="; }; - patches = [ - # GUACAMOLE-1952: Add compatibility with FFMPEG 7.0 - (fetchpatch2 { - url = "https://github.com/apache/guacamole-server/commit/cc8addf9beb90305037a32f9f861a893be4cae08.patch?full_index=1"; - hash = "sha256-VCr2/8lQHKVdsdah9gvak4MjFHO+X4ixE5+zsvwIY1I="; - }) - ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=format-overflow" diff --git a/pkgs/by-name/gu/gucci/package.nix b/pkgs/by-name/gu/gucci/package.nix index 4660c1a97ba5..87f8d7cbfd4c 100644 --- a/pkgs/by-name/gu/gucci/package.nix +++ b/pkgs/by-name/gu/gucci/package.nix @@ -6,23 +6,23 @@ gucci, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gucci"; - version = "1.6.10"; + version = "1.9.0"; src = fetchFromGitHub { owner = "noqcks"; repo = "gucci"; - tag = version; - sha256 = "sha256-bwPQQtaPHby96C5ZHZhBTok+m8GPPS40U1CUPVYqCa4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-CL4Vn3DP40tBBejN28iQSIV+2GtHwl7IS8zVJ5wcqwY="; }; - vendorHash = "sha256-/4OnbtxxhXQnmSV6UbjgzXdL7szhL9rKiG5BR8FsyqI="; + vendorHash = "sha256-+0pq2lbwfvWdAiz7nONrmlRRxS886B+wieoMeuxLUtM="; ldflags = [ "-s" "-w" - "-X main.AppVersion=${version}" + "-X main.AppVersion=${finalAttrs.version}" ]; passthru.tests.version = testers.testVersion { @@ -38,11 +38,11 @@ buildGoModule rec { "-skip=^TestIntegration" ]; - meta = with lib; { + meta = { description = "Simple CLI templating tool written in golang"; mainProgram = "gucci"; homepage = "https://github.com/noqcks/gucci"; - license = licenses.mit; - maintainers = with maintainers; [ braydenjw ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ braydenjw ]; }; -} +}) diff --git a/pkgs/by-name/gu/gucharmap/package.nix b/pkgs/by-name/gu/gucharmap/package.nix index fc1db49d5c8c..a4f8e78ef38d 100644 --- a/pkgs/by-name/gu/gucharmap/package.nix +++ b/pkgs/by-name/gu/gucharmap/package.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "gucharmap"; homepage = "https://gitlab.gnome.org/GNOME/gucharmap"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/gu/guesswidth/package.nix b/pkgs/by-name/gu/guesswidth/package.nix index 427880f139c4..92ad7241f369 100644 --- a/pkgs/by-name/gu/guesswidth/package.nix +++ b/pkgs/by-name/gu/guesswidth/package.nix @@ -45,7 +45,7 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gu/gui-for-clash/bridge.patch b/pkgs/by-name/gu/gui-for-clash/bridge.patch index 8d6600e8519a..47ca878a594f 100644 --- a/pkgs/by-name/gu/gui-for-clash/bridge.patch +++ b/pkgs/by-name/gu/gui-for-clash/bridge.patch @@ -1,39 +1,31 @@ --- a/bridge/bridge.go 2024-12-25 20:53:45.504021585 +0000 +++ b/bridge/bridge.go 2024-12-25 21:02:20.318422528 +0000 -@@ -38,11 +38,6 @@ - - func InitBridge(fs embed.FS) { - // step1: Set Env +@@ -41,13 +41,13 @@ + } + + func CreateApp(fs embed.FS) *App { - exePath, err := os.Executable() - if err != nil { - panic(err) -- } -- - for _, v := range os.Args { - if v == "tasksch" { - Env.FromTaskSch = true -@@ -50,8 +45,13 @@ - } - } - -- Env.BasePath = filepath.Dir(exePath) -- Env.AppName = filepath.Base(exePath) + Env.AppName = "GUI.for.Clash" + xdgDataHome := os.Getenv("XDG_DATA_HOME") + if xdgDataHome == "" { + homeDir, _ := os.UserHomeDir() + xdgDataHome = filepath.Join(homeDir, ".local", "share") -+ } + } +- +- Env.BasePath = filepath.Dir(exePath) +- Env.AppName = filepath.Base(exePath) + Env.BasePath = filepath.Join(xdgDataHome, Env.AppName) - - // step2: Create a persistent data symlink - if Env.OS == "darwin" { -@@ -128,7 +128,7 @@ + + if slices.Contains(os.Args, "tasksch") { + Env.FromTaskSch = true +@@ -76,7 +76,7 @@ } - + func (a *App) RestartApp() FlagResult { - exePath := Env.BasePath + "/" + Env.AppName + exePath := "@basepath@/bin" + "/" + Env.AppName - + cmd := exec.Command(exePath) - HideExecWindow(cmd) + SetCmdWindowHidden(cmd) \ No newline at end of file diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix index ce4b2461b137..b2dcd36565c2 100644 --- a/pkgs/by-name/gu/gui-for-clash/package.nix +++ b/pkgs/by-name/gu/gui-for-clash/package.nix @@ -1,10 +1,10 @@ { + lib, stdenv, nodejs, pnpm_9, fetchFromGitHub, buildGoModule, - lib, wails, webkitgtk_4_0, pkg-config, @@ -17,13 +17,13 @@ let pname = "gui-for-clash"; - version = "1.9.5"; + version = "1.9.7"; src = fetchFromGitHub { owner = "GUI-for-Cores"; repo = "GUI.for.Clash"; tag = "v${version}"; - hash = "sha256-XQbiric4iAxvWRLKCCZtDrpFpPCylQlwnCm9dHSq/KM="; + hash = "sha256-Ij9zyBzYpAfDEjJXqOiPxun+5e1T5j3juYudpvraBcQ="; }; metaCommon = { @@ -43,7 +43,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/frontend"; - hash = "sha256-5SVu8eCyN89k6BvNEqgs4hOrP5IjvjUZrzrVuDwtYCk="; + hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc="; }; sourceRoot = "${finalAttrs.src.name}/frontend"; @@ -81,7 +81,7 @@ buildGoModule { --replace-fail '@basepath@' "$out" ''; - vendorHash = "sha256-Zt3We+Ai8oEqof2eQvcaIkocH85goeldmPf4mmDX17o="; + vendorHash = "sha256-Coq8GtaIS7ClmOTFw6PSgGDFW/CpGpKPvXgNw8qz3Hs="; nativeBuildInputs = [ wails @@ -114,12 +114,8 @@ buildGoModule { icon = "gui-for-clash"; genericName = "GUI.for.Clash"; desktopName = "GUI.for.Clash"; - categories = [ - "Network" - ]; - keywords = [ - "Proxy" - ]; + categories = [ "Network" ]; + keywords = [ "Proxy" ]; }) ]; diff --git a/pkgs/by-name/gu/gui-for-singbox/bridge.patch b/pkgs/by-name/gu/gui-for-singbox/bridge.patch index e31a6d9c7512..f62c34aa0289 100644 --- a/pkgs/by-name/gu/gui-for-singbox/bridge.patch +++ b/pkgs/by-name/gu/gui-for-singbox/bridge.patch @@ -1,39 +1,31 @@ ---- a/bridge/bridge.go 2024-12-25 20:53:45.504021585 +0000 -+++ b/bridge/bridge.go 2024-12-25 21:02:20.318422528 +0000 -@@ -38,11 +38,6 @@ - - func InitBridge(fs embed.FS) { - // step1: Set Env +--- a/bridge/bridge.go 2025-05-13 07:36:58.578038227 +0000 ++++ b/bridge/bridge.go 2025-05-13 07:39:01.667180229 +0000 +@@ -41,13 +41,13 @@ + } + + func CreateApp(fs embed.FS) *App { - exePath, err := os.Executable() - if err != nil { - panic(err) -- } -- - for _, v := range os.Args { - if v == "tasksch" { - Env.FromTaskSch = true -@@ -50,8 +45,13 @@ - } - } - -- Env.BasePath = filepath.Dir(exePath) -- Env.AppName = filepath.Base(exePath) + Env.AppName = "GUI.for.SingBox" + xdgDataHome := os.Getenv("XDG_DATA_HOME") + if xdgDataHome == "" { + homeDir, _ := os.UserHomeDir() + xdgDataHome = filepath.Join(homeDir, ".local", "share") -+ } + } +- +- Env.BasePath = filepath.Dir(exePath) +- Env.AppName = filepath.Base(exePath) + Env.BasePath = filepath.Join(xdgDataHome, Env.AppName) - - // step2: Create a persistent data symlink - if Env.OS == "darwin" { -@@ -128,7 +128,7 @@ + + if slices.Contains(os.Args, "tasksch") { + Env.FromTaskSch = true +@@ -76,7 +76,7 @@ } - + func (a *App) RestartApp() FlagResult { - exePath := Env.BasePath + "/" + Env.AppName + exePath := "@basepath@/bin" + "/" + Env.AppName - + cmd := exec.Command(exePath) - HideExecWindow(cmd) + SetCmdWindowHidden(cmd) \ No newline at end of file diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index 980455e65c77..a7480d64ee4e 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -1,10 +1,10 @@ { + lib, stdenv, nodejs, pnpm_9, fetchFromGitHub, buildGoModule, - lib, wails, webkitgtk_4_0, pkg-config, @@ -17,13 +17,13 @@ let pname = "gui-for-singbox"; - version = "1.9.4"; + version = "1.9.7"; src = fetchFromGitHub { owner = "GUI-for-Cores"; repo = "GUI.for.SingBox"; tag = "v${version}"; - hash = "sha256-v6bx1nIIL5SpPsiUNbU35w7vh+1Zgl+d0Y6sG5XfEB8="; + hash = "sha256-2wmg0qPXFRuVd5jU1RT9QuqEaG/h2R+VSNeniVZELLk="; }; metaCommon = { @@ -45,7 +45,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/frontend"; - hash = "sha256-5SVu8eCyN89k6BvNEqgs4hOrP5IjvjUZrzrVuDwtYCk="; + hash = "sha256-5tz1FItH9AvZhJjka8i5Kz22yf/tEmRPkDhz6iswZzc="; }; sourceRoot = "${finalAttrs.src.name}/frontend"; @@ -81,7 +81,7 @@ buildGoModule { --replace-fail '@basepath@' "$out" ''; - vendorHash = "sha256-Zt3We+Ai8oEqof2eQvcaIkocH85goeldmPf4mmDX17o="; + vendorHash = "sha256-Coq8GtaIS7ClmOTFw6PSgGDFW/CpGpKPvXgNw8qz3Hs="; nativeBuildInputs = [ wails @@ -114,12 +114,8 @@ buildGoModule { icon = "gui-for-singbox"; genericName = "GUI.for.SingBox"; desktopName = "GUI.for.SingBox"; - categories = [ - "Network" - ]; - keywords = [ - "Proxy" - ]; + categories = [ "Network" ]; + keywords = [ "Proxy" ]; }) ]; diff --git a/pkgs/by-name/gu/guile-goblins/package.nix b/pkgs/by-name/gu/guile-goblins/package.nix index 7ec9492d8d42..0238e33fe031 100644 --- a/pkgs/by-name/gu/guile-goblins/package.nix +++ b/pkgs/by-name/gu/guile-goblins/package.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation rec { pname = "guile-goblins"; - version = "0.15.0"; + version = "0.15.1"; src = fetchurl { url = "https://spritely.institute/files/releases/guile-goblins/guile-goblins-${version}.tar.gz"; - hash = "sha256-H4mBn0Fe32J99pybfa7jMfxBBvmTfffbAcchujuC3bc="; + hash = "sha256-2oPS6Ar0ee7BQBtjvhJCCQYXK2TLIiADiCwnDaHPGBc="; }; strictDeps = true; diff --git a/pkgs/by-name/gu/guile-irregex/package.nix b/pkgs/by-name/gu/guile-irregex/package.nix new file mode 100644 index 000000000000..f1c37470c3cd --- /dev/null +++ b/pkgs/by-name/gu/guile-irregex/package.nix @@ -0,0 +1,66 @@ +{ + stdenv, + fetchzip, + mitscheme, + guile, + lib, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "guile-irregex"; + version = "0.9.11"; + + src = fetchzip { + url = "https://synthcode.com/scheme/irregex/irregex-${finalAttrs.version}.tar.gz"; + hash = "sha256-abBCMNsr6GTBOm+eQWuOX8JYx/qMA/V6TwGdYRjznWU="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + guile + mitscheme + ]; + + buildInputs = [ + guile + ]; + + env.GUILE_AUTO_COMPILE = "0"; + + buildPhase = '' + runHook preBuild + + site_dir="$out/share/guile/site/3.0" + lib_dir="$out/lib/guile/3.0/site-ccache" + + mkdir -p $site_dir/rx/source + mkdir -p $lib_dir/rx/source + + cp $src/irregex-guile.scm $site_dir/rx/irregex.scm + cp $src/irregex.scm $site_dir/rx/source/irregex.scm + cp $src/irregex-utils.scm $site_dir/rx/source/irregex-utils.scm + guild compile --r7rs $site_dir/rx/irregex.scm -o $lib_dir/rx/irregex.go + guild compile --r7rs $site_dir/rx/source/irregex.scm -o $lib_dir/rx/source/irregex.go + + runHook postBuild + ''; + + dontInstall = true; + + meta = { + description = "IrRegular Expressions"; + longDescription = '' + A fully portable and efficient R[4567]RS implementation of regular expressions, supporting + both POSIX syntax with various (irregular) PCRE extensions, as well as SCSH's SRE syntax, with + various aliases for commonly used patterns. DFA matching is used when possible, otherwise a + closure-compiled NFA approach is used. The library makes no assumptions about the encoding of + strings or range of characters and can thus be used in Unicode-aware Scheme implementations. + Matching may be performed over standard Scheme strings, or over arbitrarily chunked streams of + strings. + ''; + homepage = "https://synthcode.com/scheme/irregex"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ knightpp ]; + platforms = guile.meta.platforms; + }; +}) diff --git a/pkgs/by-name/gu/guile-json-rpc/package.nix b/pkgs/by-name/gu/guile-json-rpc/package.nix new file mode 100644 index 000000000000..3879ef48e371 --- /dev/null +++ b/pkgs/by-name/gu/guile-json-rpc/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitea, + guile, + pkg-config, + guile-srfi-145, + guile-srfi-180, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "guile-json-rpc"; + version = "0.4.5a"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "rgherdt"; + repo = "scheme-json-rpc"; + tag = finalAttrs.version; + hash = "sha256-sTJxPxHKovMOxfu5jM/6EpB9RFpG+9E3388xeE2Fpgw="; + }; + + strictDeps = true; + + propagatedBuildInputs = [ + guile-srfi-145 + guile-srfi-180 + ]; + + nativeBuildInputs = [ + pkg-config + guile + ]; + + buildInputs = [ + guile + ]; + + env.GUILE_AUTO_COMPILE = "0"; + + preConfigure = '' + cd guile + ''; + + meta = { + description = "A JSON-RPC implementation for Scheme"; + homepage = "https://codeberg.org/rgherdt/scheme-json-rpc"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ knightpp ]; + platforms = guile.meta.platforms; + }; +}) diff --git a/pkgs/by-name/gu/guile-lsp-server/package.nix b/pkgs/by-name/gu/guile-lsp-server/package.nix new file mode 100644 index 000000000000..26a2258ffcc6 --- /dev/null +++ b/pkgs/by-name/gu/guile-lsp-server/package.nix @@ -0,0 +1,67 @@ +{ + lib, + guile, + stdenv, + fetchFromGitea, + pkg-config, + bash, + makeWrapper, + guile-json-rpc, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "guile-lsp-server"; + version = "0.4.7"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "rgherdt"; + repo = "scheme-lsp-server"; + tag = finalAttrs.version; + hash = "sha256-XNzon1l6CnCd4RasNrHHxWEBNhyaHXgdNLsvjvRLbfk="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + makeWrapper + guile + ]; + + buildInputs = [ + guile + ]; + + propagatedBuildInputs = [ + guile-json-rpc + ]; + + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + preConfigure = '' + cd guile + ''; + + postInstall = '' + wrapProgram $out/bin/guile-lsp-server \ + --prefix PATH : ${ + lib.makeBinPath [ + guile + bash + ] + } \ + --set GUILE_AUTO_COMPILE 0 \ + --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" \ + --argv0 $out/bin/guile-lsp-server + ''; + + meta = { + homepage = "https://codeberg.org/rgherdt/scheme-lsp-server"; + description = "An LSP server for Guile"; + mainProgram = "guile-lsp-server"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ knightpp ]; + platforms = guile.meta.platforms; + }; +}) diff --git a/pkgs/by-name/gu/guile-reader/package.nix b/pkgs/by-name/gu/guile-reader/package.nix index 8dc4a06fe080..ab79f2232cc3 100644 --- a/pkgs/by-name/gu/guile-reader/package.nix +++ b/pkgs/by-name/gu/guile-reader/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { version = "0.6.3"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; hash = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs="; }; diff --git a/pkgs/by-name/gu/guile-sdl/package.nix b/pkgs/by-name/gu/guile-sdl/package.nix index e0dd9a28bb0d..b3fb533bbdaf 100644 --- a/pkgs/by-name/gu/guile-sdl/package.nix +++ b/pkgs/by-name/gu/guile-sdl/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnu.org/software/guile-sdl/"; description = "Guile bindings for SDL"; license = lib.licenses.gpl3Plus; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + maintainers = [ ]; inherit (guile.meta) platforms; }; }) diff --git a/pkgs/by-name/gu/guile-srfi-145/package.nix b/pkgs/by-name/gu/guile-srfi-145/package.nix new file mode 100644 index 000000000000..c3c57783d6cb --- /dev/null +++ b/pkgs/by-name/gu/guile-srfi-145/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitea, + guile, + guile-irregex, +}: +stdenv.mkDerivation { + pname = "guile-srfi-145"; + version = "0-unstable-2023-06-04"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "rgherdt"; + repo = "srfi"; + rev = "e598c28eb78e9c3e44f5c3c3d997ef28abb6f32e"; + hash = "sha256-kvM2v/nDou0zee4+qcO5yN2vXt2y3RUnmKA5S9iKFE0="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + guile + ]; + + buildInputs = [ + guile + ]; + + propagatedBuildInputs = [ + guile-irregex + ]; + + preConfigure = '' + export GUILE_AUTO_COMPILE=0 + ''; + + buildPhase = '' + runHook preBuild + + site_dir="$out/share/guile/site/3.0" + lib_dir="$out/lib/guile/3.0/site-ccache" + + export GUILE_LOAD_PATH=.:$site_dir:...:$GUILE_LOAD_PATH + export GUILE_LOAD_COMPILED_PATH=.:$lib_dir:...:$GUILE_LOAD_COMPILED_PATH + + mkdir -p $site_dir/srfi + cp $src/srfi/srfi-145.scm $site_dir/srfi/ + guild compile --r7rs $site_dir/srfi/srfi-145.scm -o $lib_dir/srfi/srfi-145.go + + runHook postBuild + ''; + + meta = { + description = "Scheme SRFI-145 implementations in portable R7RS scheme"; + homepage = "https://codeberg.org/rgherdt/srfi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ knightpp ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/by-name/gu/guile-srfi-180/package.nix b/pkgs/by-name/gu/guile-srfi-180/package.nix new file mode 100644 index 000000000000..fc38e935bfbf --- /dev/null +++ b/pkgs/by-name/gu/guile-srfi-180/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitea, + guile, + guile-irregex, +}: +stdenv.mkDerivation { + pname = "guile-srfi-180"; + version = "0-unstable-2023-06-04"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "rgherdt"; + repo = "srfi"; + rev = "e598c28eb78e9c3e44f5c3c3d997ef28abb6f32e"; + hash = "sha256-kvM2v/nDou0zee4+qcO5yN2vXt2y3RUnmKA5S9iKFE0="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + guile + ]; + + buildInputs = [ + guile + ]; + + propagatedBuildInputs = [ + guile-irregex + ]; + + preConfigure = '' + export GUILE_AUTO_COMPILE=0 + ''; + + buildPhase = '' + runHook preBuild + + site_dir="$out/share/guile/site/3.0" + lib_dir="$out/lib/guile/3.0/site-ccache" + + export GUILE_LOAD_PATH=.:$site_dir:...:$GUILE_LOAD_PATH + export GUILE_LOAD_COMPILED_PATH=.:$lib_dir:...:$GUILE_LOAD_COMPILED_PATH + + mkdir -p $site_dir/srfi + cp $src/srfi/srfi-180.scm $site_dir/srfi + cp -R $src/srfi/srfi-180/ $site_dir/srfi + cp -R $src/srfi/180/ $site_dir/srfi + guild compile -x "sld" --r7rs $site_dir/srfi/srfi-180/helpers.sld -o $lib_dir/srfi/srfi-180/helpers.go + guild compile --r7rs $site_dir/srfi/srfi-180.scm -o $lib_dir/srfi/srfi-180.go + + runHook postBuild + ''; + + meta = { + description = "Scheme SRFI-180 implementations in portable R7RS scheme"; + homepage = "https://codeberg.org/rgherdt/srfi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ knightpp ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix index e242ac853313..a9d90274c258 100644 --- a/pkgs/by-name/gu/gum/package.nix +++ b/pkgs/by-name/gu/gum/package.nix @@ -23,11 +23,17 @@ buildGoModule rec { installShellFiles ]; - ldflags = [ - "-s" - "-w" - "-X=main.Version=${version}" - ]; + ldflags = + [ + "-s" + "-w" + "-X=main.Version=${version}" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [ + "-linkmode=external" + "-extldflags" + "-static" + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/gum man > gum.1 diff --git a/pkgs/by-name/gu/gupnp-igd/package.nix b/pkgs/by-name/gu/gupnp-igd/package.nix index 7d26c68a68bc..245f9bbcb4d9 100644 --- a/pkgs/by-name/gu/gupnp-igd/package.nix +++ b/pkgs/by-name/gu/gupnp-igd/package.nix @@ -11,13 +11,13 @@ docbook_xsl, docbook_xml_dtd_412, glib, - gupnp, + gupnp_1_6, gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gupnp-igd"; - version = "1.2.0"; + version = "1.6.0"; outputs = [ "out" @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-S1EgCYqhPt0ngYup7k1/6WG/VAv1DQVv9wPGFUXgK+E="; + url = "mirror://gnome/sources/gupnp-igd/${lib.versions.majorMinor finalAttrs.version}/gupnp-igd-${finalAttrs.version}.tar.xz"; + hash = "sha256-QJmXgzmrIhJtSWjyozK20JT8RMeHl4YHgfH8LxF3G3Q="; }; depsBuildBuild = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib - gupnp + gupnp_1_6 ]; mesonFlags = [ @@ -56,20 +56,19 @@ stdenv.mkDerivation rec { # Seems to get stuck sometimes. # https://github.com/NixOS/nixpkgs/issues/119288 - #doCheck = true; + # doCheck = true; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gupnp-igd"; versionPolicy = "odd-unstable"; - freeze = true; }; }; - meta = with lib; { + meta = { description = "Library to handle UPnP IGD port mapping"; homepage = "http://www.gupnp.org/"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gu/gupnp-tools/package.nix b/pkgs/by-name/gu/gupnp-tools/package.nix index e40546c094c7..24e29a70b0fb 100644 --- a/pkgs/by-name/gu/gupnp-tools/package.nix +++ b/pkgs/by-name/gu/gupnp-tools/package.nix @@ -16,13 +16,13 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gupnp-tools"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "U8+TEj85fo+PC46eQ2TIanUCpTNPTAvi4FSoJEeL1bo="; + url = "mirror://gnome/sources/gupnp-tools/${lib.versions.majorMinor finalAttrs.version}/gupnp-tools-${finalAttrs.version}.tar.xz"; + sha256 = "TJLy0aPUVOwfX7Be8IyjTfnHQ69kyLWWXDWITUbLAFw="; }; nativeBuildInputs = [ @@ -42,13 +42,9 @@ stdenv.mkDerivation rec { gtksourceview4 ]; - # new libxml2 version - # TODO: can be dropped on next update - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; - passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gupnp-tools"; versionPolicy = "odd-unstable"; }; }; @@ -57,7 +53,7 @@ stdenv.mkDerivation rec { description = "Set of utilities and demos to work with UPnP"; homepage = "https://gitlab.gnome.org/GNOME/gupnp-tools"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix index dc254a26f243..c58d34f1765c 100644 --- a/pkgs/by-name/gu/gurk-rs/package.nix +++ b/pkgs/by-name/gu/gurk-rs/package.nix @@ -4,7 +4,6 @@ protobuf, rustPlatform, fetchFromGitHub, - darwin, pkgsBuildHost, openssl, pkg-config, @@ -14,9 +13,6 @@ gurk-rs, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in rustPlatform.buildRustPackage rec { pname = "gurk-rs"; version = "0.6.4"; @@ -41,7 +37,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + buildInputs = [ openssl ]; NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" @@ -61,7 +57,7 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gu/gurobi/package.nix b/pkgs/by-name/gu/gurobi/package.nix index 28bd696f55cc..fd7f9a9eeb24 100644 --- a/pkgs/by-name/gu/gurobi/package.nix +++ b/pkgs/by-name/gu/gurobi/package.nix @@ -16,14 +16,14 @@ let in stdenv.mkDerivation rec { pname = "gurobi"; - version = "12.0.1"; + version = "12.0.2"; src = fetchurl { url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_${platform}.tar.gz"; hash = { - aarch64-linux = "sha256-hQPqdZVU5G1kj/sR8j2QY1eLMn3JVahnWfWnVrk0P7o="; - x86_64-linux = "sha256-kXIJPmXeBPwUxsXSNXaO6j/hXIqctuqS5oBuu4UunYY="; + aarch64-linux = "sha256-vlhF3OIMCVyS9Y31RS4eVhs4wQ4CUDGQZlNkf98Uji0="; + x86_64-linux = "sha256-DMSmk41YzGoonHdX2xLsioU9RTBLn4kQy4v6HgVa08U="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/gu/gut/package.nix b/pkgs/by-name/gu/gut/package.nix index c49ba59dfd81..4d854f5d43d4 100644 --- a/pkgs/by-name/gu/gut/package.nix +++ b/pkgs/by-name/gu/gut/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gut"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "julien040"; repo = "gut"; rev = version; - hash = "sha256-pjjeA0Nwc5M3LwxZLpBPnFqXJX0b6KDaj4YCPuGoUuU="; + hash = "sha256-3A6CwGIZGnTFkMRxDdDg/WpUQezNmGjjSz4Rj/6t1GI="; }; - vendorHash = "sha256-G9oDMHLmdv/vQfofTqKAf21xaGp+lvW+sedLmaj+A5A="; + vendorHash = "sha256-EL+fsh603ydZfc3coI8VXkvAStQ0fwzBsJIOztB/VHc="; ldflags = [ "-s" diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index 7045b0f487b8..b44ec36390a3 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gvfs"; - version = "1.56.1"; + version = "1.57.2"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz"; - hash = "sha256-hnMczsZ5ZI+HNOI3sd4ZDr3ubkyMD1b0VMMViOUJqhA="; + hash = "sha256-8Wvvjsof1sEX6F2wEdIekVZpeQ1VhnNJxfGykSmelYU="; }; patches = [ @@ -160,6 +160,6 @@ stdenv.mkDerivation (finalAttrs: { "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; }) diff --git a/pkgs/by-name/gv/gvproxy/package.nix b/pkgs/by-name/gv/gvproxy/package.nix index 154d385cbba3..080ab380ffb8 100644 --- a/pkgs/by-name/gv/gvproxy/package.nix +++ b/pkgs/by-name/gv/gvproxy/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - hash = "sha256-rWZYwQ/wWYAbM0RRNcNboWzKUuNNPDigIFFbFdXDNuo="; + hash = "sha256-a/Gd1QUxZ+47sQtndbehx86UjC1DezhqwS5d5VTIjRc="; }; vendorHash = null; @@ -34,6 +34,6 @@ buildGoModule rec { description = "Network stack based on gVisor"; homepage = "https://github.com/containers/gvisor-tap-vsock"; license = licenses.asl20; - maintainers = with maintainers; [ ] ++ teams.podman.members; + teams = [ teams.podman ]; }; } diff --git a/pkgs/by-name/gw/gwyddion/package.nix b/pkgs/by-name/gw/gwyddion/package.nix index 69a3ddaf11dd..dd7681baa9df 100644 --- a/pkgs/by-name/gw/gwyddion/package.nix +++ b/pkgs/by-name/gw/gwyddion/package.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.67"; + version = "2.68"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "sha256-kK6vTeADc2lrC+9KgqxFtih62ce3rKYkkGjU0qT8jWE="; + sha256 = "sha256-clw/cXODYrELHiz3bTkWhM8vFacaKzTvHK3avW1am/o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gx/gxmessage/package.nix b/pkgs/by-name/gx/gxmessage/package.nix index ff139bcee3b7..d859381ab9a3 100644 --- a/pkgs/by-name/gx/gxmessage/package.nix +++ b/pkgs/by-name/gx/gxmessage/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "GTK enabled dropin replacement for xmessage"; homepage = "https://trmusson.dreamhosters.com/programs.html#gxmessage"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ jfb ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; mainProgram = "gxmessage"; }; diff --git a/pkgs/by-name/gx/gxml/package.nix b/pkgs/by-name/gx/gxml/package.nix index 771c4f6039ea..1ec14d461e72 100644 --- a/pkgs/by-name/gx/gxml/package.nix +++ b/pkgs/by-name/gx/gxml/package.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/gxml/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jmarmstrong1207 ] ++ teams.gnome.members; + maintainers = with maintainers; [ jmarmstrong1207 ]; + teams = [ teams.gnome ]; }; }) diff --git a/pkgs/by-name/gy/gyroflow/package.nix b/pkgs/by-name/gy/gyroflow/package.nix index fb237ac6fbbb..20aefb13e919 100644 --- a/pkgs/by-name/gy/gyroflow/package.nix +++ b/pkgs/by-name/gy/gyroflow/package.nix @@ -25,18 +25,18 @@ let in rustPlatform.buildRustPackage rec { pname = "gyroflow"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "gyroflow"; repo = "gyroflow"; tag = "v${version}"; - hash = "sha256-Ib9GnHN23eTbd3nEwvZf3+CBSkUHycN77o3ura0Ze/0="; + hash = "sha256-RYTT62u39g4n9++xMlhJala6U0uIn+btGOxp9khEAnU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bqBFAobXwPC4V0OYHbwmkk7shfiFt3YMGAf7F5ybLAQ="; + cargoHash = "sha256-30XSltaw1jzXPpobh0WJ+aIRbdf24nYgnbt7yzuS2gs="; nativeBuildInputs = [ clang diff --git a/pkgs/by-name/gz/gz-cmake/package.nix b/pkgs/by-name/gz/gz-cmake/package.nix new file mode 100644 index 000000000000..6ab3dcebd263 --- /dev/null +++ b/pkgs/by-name/gz/gz-cmake/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + doxygen, + graphviz, + pkg-config, + python3, + nix-update-script, +}: +let + version = "4.2.0"; + versionPrefix = "gz-cmake${lib.versions.major version}"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "gz-cmake"; + inherit version; + + src = fetchFromGitHub { + owner = "gazebosim"; + repo = "gz-cmake"; + tag = "${versionPrefix}_${finalAttrs.version}"; + hash = "sha256-+bMOcGWfcwPhxR9CBp4iH02CZC4oplCjsTDpPDsDnSs="; + }; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + pkg-config + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.doCheck) + ]; + + nativeCheckInputs = [ python3 ]; + + # 98% tests passed, 1 tests failed out of 44 + # 44 - c_child_requires_c_nodep (Failed) + # + # Package gz-c_child_private was not found in the pkg-config search path. + # Perhaps you should add the directory containing `gz-c_child_private.pc' + # to the PKG_CONFIG_PATH environment variable + # No package 'gz-c_child_private' found + doCheck = false; + + # Extract the version by matching the tag's prefix. + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=${versionPrefix}_([\\d\\.]+)" ]; + }; + + meta = { + description = "CMake modules to build Gazebo projects"; + homepage = "https://github.com/gazebosim/gz-cmake"; + changelog = "https://github.com/gazebosim/gz-cmake/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ guelakais ]; + }; +}) diff --git a/pkgs/by-name/gz/gz-utils/package.nix b/pkgs/by-name/gz/gz-utils/package.nix new file mode 100644 index 000000000000..c41ec4ef71d7 --- /dev/null +++ b/pkgs/by-name/gz/gz-utils/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + cmake, + gz-cmake, + doxygen, + graphviz, + + # buildInputs + cli11, + spdlog, + + # nativeCheckInputs + python3, + + # checkInputs + gtest, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "gz-utils"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "gazebosim"; + repo = "gz-utils"; + tag = "gz-utils${lib.versions.major finalAttrs.version}_${finalAttrs.version}"; + hash = "sha256-fYzysdB608jfMb/EbqiGD4hXmPxcaVTUrt9Wx0dBlto="; + }; + + outputs = [ + "doc" + "out" + ]; + + # Remove vendored gtest, use nixpkgs' version instead. + postPatch = '' + rm -r test/gtest_vendor + + substituteInPlace test/CMakeLists.txt --replace-fail \ + "add_subdirectory(gtest_vendor)" "# add_subdirectory(gtest_vendor)" + ''; + + nativeBuildInputs = [ + cmake + gz-cmake + doxygen + graphviz + ]; + + buildInputs = [ + cli11 + spdlog + ]; + + # Indicate to CMake that we are not using the vendored CLI11 library. + # The integration tests make (unintentional?) unconditional usage of the vendored + # CLI11 library, so we can't remove that. + cmakeFlags = [ + (lib.cmakeBool "GZ_UTILS_VENDOR_CLI11" false) + ]; + + postBuild = '' + make doc + cp -r doxygen/html $doc + ''; + + nativeCheckInputs = [ python3 ]; + + checkInputs = [ gtest ]; + + doCheck = true; + + meta = { + description = "General purpose utility classes and functions for the Gazebo libraries"; + homepage = "https://gazebosim.org/home"; + changelog = "https://github.com/gazebosim/gz-utils/blob/${finalAttrs.src.tag}/Changelog.md"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix ++ lib.platforms.windows; + maintainers = with lib.maintainers; [ guelakais ]; + }; +}) diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index f4fd2bc7d95a..641b82cd1647 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.14.1"; + version = "4.14.2"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-Hrqi2xpyMGcTJ2rI59EpcEtoJ+gCGmwEy+F396M3f/4="; + hash = "sha256-kYw+r08v/Q/hphJuvjn38Dj5mZRijE6pWKoEZBlN5P4="; }; outputs = [ "out" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "doc" ]; diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 5afdcbeab9aa..f1a10981f88f 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -16,18 +16,20 @@ withMruby ? true, bison, ruby, + withUring ? stdenv.hostPlatform.isLinux, + liburing, nixosTests, }: stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0.20250130"; + version = "2.3.0.20250519"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "26b116e9536be8cf07036185e3edf9d721c9bac2"; - sha256 = "sha256-WjsUUnSs3kXjAmh+V/lzL1QlxxXNCph99UsC29YAirQ="; + rev = "87e2aa634f2c0d9f3d9429f7a3cf273f98db0058"; + sha256 = "sha256-/9YnaOqvYmFme4/mFq8Sx78FMDyGwnErEW45qPVELjU="; }; outputs = [ @@ -47,7 +49,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withMruby [ bison ruby - ]; + ] + ++ lib.optional withUring liburing; buildInputs = [ brotli diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix index 02baea0f720c..3ec435ccb785 100644 --- a/pkgs/by-name/ha/hadolint-sarif/package.nix +++ b/pkgs/by-name/ha/hadolint-sarif/package.nix @@ -7,15 +7,15 @@ }: rustPlatform.buildRustPackage rec { pname = "hadolint-sarif"; - version = "0.7.0"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-HPGVqAk1bXzeblTc4AnCLsHB60CKFV8ImO+MFqM10YI="; + hash = "sha256-7xvo194lCQpDtLgwX6rZEkwG3hYTp5czjw4GrEaivsI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1nl5Myr8o1gyvkpsdMVLjZqnLkULOmxUOT0NmVe+0Oo="; + cargoHash = "sha256-R4fGlo65/suNozEzRaQ3k6Ys4CMBheT2+rHZZZuIstM="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ha/haguichi/package.nix b/pkgs/by-name/ha/haguichi/package.nix index 122b85a98ba9..0575fa7bf918 100644 --- a/pkgs/by-name/ha/haguichi/package.nix +++ b/pkgs/by-name/ha/haguichi/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "haguichi"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "ztefn"; repo = "haguichi"; tag = finalAttrs.version; - hash = "sha256-hSQsKG86QUzv/dfqz2amSXyAaA1ZAk9dTvel9KVgeFs="; + hash = "sha256-IEcBCiPU9NPrAbTCnONraeVb/Nlq/u4fsEZX+Vd1DiY="; }; postPatch = '' diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index a3058e5acc35..4576bf66f5fd 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.20.18"; + version = "2.20.20"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-N3hbiK/pmZ30wJA8VJI9ft6o7VKQEM2+evakk0EObx4="; + hash = "sha256-8q87oGE7uEbs78rkFcF3FD+ms+9dlk+12G2CL/tEJKY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/halp/package.nix b/pkgs/by-name/ha/halp/package.nix index d90f793c3a7f..3264ff6b785c 100644 --- a/pkgs/by-name/ha/halp/package.nix +++ b/pkgs/by-name/ha/halp/package.nix @@ -4,40 +4,31 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, unixtools, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "halp"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { owner = "orhun"; repo = "halp"; - rev = "v${version}"; - hash = "sha256-SeBponGeQWKjbiS4GL8YA7y92BqLL+ja6ZSKAI3CeRM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tJ95rvYjqQn0ZTlEdqfs/LbyfBP7PqnevxX8b1VfokA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-q+vfc0EQtGU8YsY11oun/F0OPffsjvB336y3qnerIDY="; + cargoHash = "sha256-sJdZjTzfawwBK8KxQP7zvn+kByCMSxrrQjY1t9RWmhU="; patches = [ # patch tests to point to the correct target directory ./fix-target-dir.patch ]; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - nativeCheckInputs = [ - unixtools.script - ]; + nativeCheckInputs = [ unixtools.script ]; # tests are failing on darwin doCheck = !stdenv.hostPlatform.isDarwin; @@ -45,6 +36,9 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # requires internet access "--skip=helper::docs::cheat::tests::test_fetch_cheat_sheet" + "--skip=helper::docs::cheat_sh::tests::test_fetch_cheat_sheet" + "--skip=helper::docs::cheatsheets::tests::test_fetch_cheatsheets" + "--skip=helper::docs::eg::tests::test_eg_page_fetch" ]; postPatch = '' @@ -71,15 +65,15 @@ rustPlatform.buildRustPackage rec { rm $out/bin/halp-{completions,mangen,test} ''; - meta = with lib; { + meta = { description = "CLI tool to get help with CLI tools"; homepage = "https://github.com/orhun/halp"; - changelog = "https://github.com/orhun/halp/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ + changelog = "https://github.com/orhun/halp/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "halp"; }; -} +}) diff --git a/pkgs/by-name/ha/ham/package.nix b/pkgs/by-name/ha/ham/package.nix new file mode 100644 index 000000000000..3bc77e26475a --- /dev/null +++ b/pkgs/by-name/ha/ham/package.nix @@ -0,0 +1,56 @@ +{ + lib, + perlPackages, + fetchFromGitHub, + makeWrapper, + openssh, +}: + +perlPackages.buildPerlPackage { + pname = "ham-unstable"; + version = "2025-02-25"; + + src = fetchFromGitHub { + owner = "kernkonzept"; + repo = "ham"; + rev = "81b6f05fd91865c7d42b94a683388504489356dc"; + hash = "sha256-a1JaUD/jrF7Yf+vyUoKQFjojxenmsCVw3Uo8u7RjPiQ="; + }; + + outputs = [ "out" ]; + + nativeBuildInputs = [ + makeWrapper + ]; + buildInputs = with perlPackages; [ + GitRepository + URI + XMLParser + ]; + propagatedBuildInputs = [ + openssh + ]; + + preConfigure = '' + rm -f Makefile + touch Makefile.PL + patchShebangs . + ''; + + installPhase = '' + mkdir -p $out/lib $out/bin + cp -r . $out/lib/ham + + makeWrapper $out/lib/ham/ham $out/bin/ham --argv0 ham \ + --prefix PATH : ${openssh}/bin + ''; + + meta = with lib; { + description = "Tool to manage big projects consisting of multiple loosely-coupled git repositories"; + homepage = "https://github.com/kernkonzept/ham"; + license = licenses.bsd2; + maintainers = with maintainers; [ aw ]; + mainProgram = "ham"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/ha/handbrake/package.nix b/pkgs/by-name/ha/handbrake/package.nix index 46153f48d145..679c110e9044 100644 --- a/pkgs/by-name/ha/handbrake/package.nix +++ b/pkgs/by-name/ha/handbrake/package.nix @@ -58,8 +58,6 @@ libdvdnav, libdvdcss, libbluray, - # Darwin-specific - darwin, # GTK # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus, # which in turn depends on systemd. systemd is not supported on Darwin, so @@ -87,12 +85,6 @@ }: let - inherit (darwin.apple_sdk.frameworks) - AudioToolbox - Foundation - VideoToolbox - ; - inherit (darwin) libobjc; version = "1.9.2"; src = fetchFromGitHub { @@ -295,12 +287,6 @@ let udev ] ++ optional useFdk fdk_aac - ++ optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - Foundation - libobjc - VideoToolbox - ] # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, # look at ./make/configure.py search "enable_nvenc" ++ optional stdenv.hostPlatform.isLinux nv-codec-headers; diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index 77d8b3692f0a..c6cce870a516 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -16,14 +16,14 @@ }: python3Packages.buildPythonApplication rec { pname = "handheld-daemon"; - version = "3.13.7"; + version = "3.15.3"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; tag = "v${version}"; - hash = "sha256-ISUu87Y1Ti6DepDAIMZREz1TkZlGlhkmUWm2zMzvlrM="; + hash = "sha256-O3Pgrb3k891IAmYtYWulosAOxtnIvLd+voEsyYtm/0U="; }; # Handheld-daemon runs some selinux-related utils which are not in nixpkgs. diff --git a/pkgs/by-name/ha/hanken-grotesk/package.nix b/pkgs/by-name/ha/hanken-grotesk/package.nix new file mode 100644 index 000000000000..0d48b0313d61 --- /dev/null +++ b/pkgs/by-name/ha/hanken-grotesk/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: + +stdenvNoCC.mkDerivation { + pname = "hanken-grotesk"; + version = "0-unstable-2024-01-30"; + + src = fetchFromGitHub { + owner = "marcologous"; + repo = "hanken-grotesk"; + rev = "1ab416e82130b2d3ddb7710abf7ceabf07156a13"; + hash = "sha256-CgxqC+4QrjdsB7VdAMneP8ND9AsWPVI8d8UOn4kytxs="; + }; + + installPhase = '' + runHook preInstall + + mkdir --parents $out/share/fonts + cp --recursive fonts/ttf $out/share/fonts/truetype + cp --recursive fonts/variable $out/share/fonts/variable + + runHook postInstall + ''; + + meta = { + description = "Hanken Grotesk typeface"; + longDescription = "Hanken Grotesk is a sans serif typeface inspired by the classic grotesques."; + homepage = "https://github.com/marcologous/hanken-grotesk"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ bricked ]; + }; +} diff --git a/pkgs/by-name/ha/hanko/package.nix b/pkgs/by-name/ha/hanko/package.nix index 14ad1edaaf8d..604956d7f854 100644 --- a/pkgs/by-name/ha/hanko/package.nix +++ b/pkgs/by-name/ha/hanko/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "hanko"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "SRv6d"; repo = "hanko"; tag = "v${version}"; - hash = "sha256-gytnUta/sNa8vJMvVS/DMwRc4R/8rmOnEfBKEjRpfGs="; + hash = "sha256-9HRoXqZ3wdD6xf33tooEHiBWSZlggjUFomblwF4cFtA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UHA7NI/LtyY8ucj+PavKdqym8o5HtGUD7+60UYnGohM="; + cargoHash = "sha256-wHvhlWi99igZ2gKAIcBYg207JrbQNCOjlcVttIy3MV0="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index ca90891d22e7..68b49fbc45e6 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -9,23 +9,30 @@ nixosTests, zlib, libxcrypt, - wolfssl, + aws-lc, libressl, - quictls, openssl, + quictls, + wolfssl, lua5_4, pcre2, }: assert lib.assertOneOf "sslLibrary" sslLibrary [ - "quictls" - "openssl" + "aws-lc" "libressl" + "openssl" + "quictls" "wolfssl" ]; let sslPkgs = { - inherit quictls openssl libressl; + inherit + aws-lc + libressl + openssl + quictls + ; wolfssl = wolfssl.override { variant = "haproxy"; extraConfigureFlags = [ "--enable-quic" ]; @@ -35,11 +42,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-IYUuSjdLuNmz3aXcg0r+ZVf0ItcCn0/j6sPDBfUSR2A="; + hash = "sha256-o5UmRO+TmzYmDZHYGjNWNqqbRFcrTLi2ABJy+IVFxmY="; }; buildInputs = @@ -77,6 +84,9 @@ stdenv.mkDerivation (finalAttrs: { "SSL_LIB=${lib.getDev sslPkg}/lib" "USE_QUIC=yes" ] + ++ lib.optionals (sslLibrary == "aws-lc") [ + "USE_OPENSSL_AWSLC=true" + ] ++ lib.optionals (sslLibrary == "openssl") [ "USE_QUIC_OPENSSL_COMPAT=yes" ] @@ -94,7 +104,6 @@ stdenv.mkDerivation (finalAttrs: { "LUA_INC=${lua5_4}/include" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "USE_SYSTEMD=yes" "USE_GETADDRINFO=1" ] ++ lib.optionals withPrometheusExporter [ diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix index 2c5ec6ee66f2..3497f561e4d1 100644 --- a/pkgs/by-name/ha/harbor-cli/package.nix +++ b/pkgs/by-name/ha/harbor-cli/package.nix @@ -8,27 +8,30 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "harbor-cli"; - version = "0.0.3"; + version = "0.0.6"; src = fetchFromGitHub { owner = "goharbor"; repo = "harbor-cli"; - rev = "v${version}"; - hash = "sha256-Vfr7e5UQ34TkirywuYJPrkxRA6yJp3/ivfCJOnh34MY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-Q2EFtkRGi/CwDYc2nERNXzRQNGKHAgYty2uigbOEo6E="; }; - vendorHash = "sha256-zQV3YJJ5cu24SVS6LCuZbM5EfGZyNPt8f1N0B3befD0="; + vendorHash = "sha256-3H/fdqmIRLOl0m4DHnF7pwRR7ud8YXI2fepXC0kcLNo="; - excludedPackages = [ "dagger" ]; + excludedPackages = [ + "dagger" + "doc" + ]; nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" - "-X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.Version=${version}" + "-X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.Version=${finalAttrs.version}" ]; doCheck = false; # Network required @@ -50,9 +53,9 @@ buildGoModule rec { meta = { homepage = "https://github.com/goharbor/harbor-cli"; description = "Command-line tool facilitates seamless interaction with the Harbor container registry"; - changelog = "https://github.com/goharbor/harbor-cli/releases/tag/v${version}"; + changelog = "https://github.com/goharbor/harbor-cli/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "harbor"; }; -} +}) diff --git a/pkgs/by-name/ha/hardinfo/package.nix b/pkgs/by-name/ha/hardinfo/package.nix deleted file mode 100644 index c7cb86f6d6ef..000000000000 --- a/pkgs/by-name/ha/hardinfo/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - which, - pkg-config, - gtk2, - pcre, - glib, - libxml2, - libsoup_2_4 ? null, -}: - -stdenv.mkDerivation rec { - pname = "hardinfo"; - version = "0.5.1"; - - src = fetchurl { - url = "mirror://sourceforge/project/hardinfo.berlios/hardinfo-${version}.tar.bz2"; - sha256 = "0yhvfc5icam3i4mphlz0m9d9d2irjw8mbsxq203x59wjgh6nrpx0"; - }; - - # Not adding 'hostname' command, the build shouldn't depend on what the build - # host is called. - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - which - gtk2 - pcre - glib - libxml2 - libsoup_2_4 - ]; - - # Fixes '#error You must compile this program without "-O"' - hardeningDisable = [ "all" ]; - - # Ignore undefined references to a bunch of libsoup symbols - NIX_LDFLAGS = "--unresolved-symbol=ignore-all"; - - preConfigure = '' - patchShebangs configure - - # -std=gnu89 fixes build error, copied from - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757525 - sed -i -e "s/^CFLAGS = \(.*\)/CFLAGS = \1 -std=gnu89/" Makefile.in - - substituteInPlace ./arch/linux/common/modules.h --replace /sbin/modinfo modinfo - substituteInPlace ./arch/linux/common/os.h --replace /lib/libc.so.6 ${stdenv.cc.libc}/lib/libc.so - ''; - - # Makefile supports DESTDIR but not PREFIX (it hardcodes $DESTDIR/usr/). - installFlags = [ "DESTDIR=$(out)" ]; - postInstall = '' - mv "$out/usr/"* "$out" - rmdir "$out/usr" - ''; - - meta = with lib; { - homepage = "http://hardinfo.org/"; - description = "Display information about your hardware and operating system"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ bjornfor ]; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; # ARMv7 and AArch64 are unsupported - mainProgram = "hardinfo"; - }; -} diff --git a/pkgs/by-name/ha/hardinfo2/package.nix b/pkgs/by-name/ha/hardinfo2/package.nix index 1e2e9f23a381..44385da328b3 100644 --- a/pkgs/by-name/ha/hardinfo2/package.nix +++ b/pkgs/by-name/ha/hardinfo2/package.nix @@ -26,17 +26,20 @@ util-linux, libXdmcp, libXtst, + mesa-demos, + makeWrapper, + dmidecode, }: stdenv.mkDerivation (finalAtrs: { pname = "hardinfo2"; - version = "2.2.7"; + version = "2.2.10"; src = fetchFromGitHub { owner = "hardinfo2"; repo = "hardinfo2"; tag = "release-${finalAtrs.version}"; - hash = "sha256-IIH2SH4Ph25VFx652RQFZX8rL0ZlwjjfVrb+txLF3Ks="; + hash = "sha256-Ea1uhzAQEn8oDvWslGzrqoI2yzVDGxwTqbthfKEkYyQ="; }; nativeBuildInputs = [ @@ -44,6 +47,7 @@ stdenv.mkDerivation (finalAtrs: { pkg-config wrapGAppsHook4 libsForQt5.wrapQtAppsHook + makeWrapper ]; preFixup = '' @@ -80,6 +84,11 @@ stdenv.mkDerivation (finalAtrs: { (lib.cmakeFeature "CMAKE_INSTALL_SERVICEDIR" "${placeholder "out"}/lib") ]; + postFixup = '' + wrapProgram $out/bin/hardinfo2 \ + --prefix PATH : "${dmidecode}/bin:${mesa-demos}/bin" + ''; + meta = { homepage = "http://www.hardinfo2.org"; description = "System information and benchmarks for Linux systems"; diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix new file mode 100644 index 000000000000..2a510fbaf527 --- /dev/null +++ b/pkgs/by-name/ha/harfbuzz/package.nix @@ -0,0 +1,142 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + glib, + freetype, + libintl, + meson, + ninja, + gobject-introspection, + buildPackages, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + icu, + graphite2, + harfbuzz, # The icu variant uses and propagates the non-icu one. + withCoreText ? false, + withIcu ? false, # recommended by upstream as default, but most don't needed and it's big + withGraphite2 ? true, # it is small and major distros do include it + python3, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_43, + # for passthru.tests + gimp, + gtk3, + gtk4, + mapnik, + qt5, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; + version = "10.2.0"; + + src = fetchurl { + url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; + hash = "sha256-Yg40aPrsLqhoXTLEalhGm4UO9jBAs1Zc3gWVmCW0gic="; + }; + + postPatch = + '' + patchShebangs src/*.py test + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # ApplicationServices.framework headers have cast-align warnings. + substituteInPlace src/hb.hh \ + --replace '#pragma GCC diagnostic error "-Wcast-align"' "" + ''; + + outputs = [ + "out" + "dev" + "devdoc" + ]; + outputBin = "dev"; + + mesonFlags = [ + # upstream recommends cairo, but it is only used for development purposes + # and is not part of the library. + # Cairo causes transitive (build) dependencies on various X11 or other + # GUI-related libraries, so it shouldn't be re-added lightly. + (lib.mesonEnable "cairo" false) + # chafa is only used in a development utility, not in the library + (lib.mesonEnable "chafa" false) + (lib.mesonEnable "coretext" withCoreText) + (lib.mesonEnable "graphite" withGraphite2) + (lib.mesonEnable "icu" withIcu) + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonOption "cmakepackagedir" "${placeholder "dev"}/lib/cmake") + ]; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + libintl + pkg-config + python3 + glib + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ] ++ lib.optional withIntrospection gobject-introspection; + + buildInputs = [ + glib + freetype + ]; + + propagatedBuildInputs = + lib.optional withGraphite2 graphite2 + ++ lib.optionals withIcu [ + icu + harfbuzz + ]; + + doCheck = true; + + # Slightly hacky; some pkgs expect them in a single directory. + postFixup = lib.optionalString withIcu '' + rm "$out"/lib/libharfbuzz.* "$dev/lib/pkgconfig/harfbuzz.pc" + ln -s {'${harfbuzz.dev}',"$dev"}/lib/pkgconfig/harfbuzz.pc + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.dylib + ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.0.dylib + ''} + ''; + + passthru.tests = { + inherit + gimp + gtk3 + gtk4 + mapnik + ; + inherit (qt5) qtbase; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + + meta = with lib; { + description = "OpenType text shaping engine"; + homepage = "https://harfbuzz.github.io/"; + changelog = "https://github.com/harfbuzz/harfbuzz/raw/${finalAttrs.version}/NEWS"; + maintainers = [ ]; + license = licenses.mit; + platforms = platforms.unix ++ platforms.windows; + pkgConfigModules = [ + "harfbuzz" + "harfbuzz-gobject" + "harfbuzz-subset" + ]; + }; +}) diff --git a/pkgs/by-name/ha/harmonia/package.nix b/pkgs/by-name/ha/harmonia/package.nix index 3bb020bb09fb..0d296afd0c47 100644 --- a/pkgs/by-name/ha/harmonia/package.nix +++ b/pkgs/by-name/ha/harmonia/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - libsodium, openssl, pkg-config, rustPlatform, @@ -9,25 +8,24 @@ nixosTests, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "harmonia"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "harmonia"; - tag = "harmonia-v${version}"; - hash = "sha256-tqkTzUdwnTfVuCrcFag7YKgGkiR9srR45e4v0XMXVCY="; + tag = "harmonia-v${finalAttrs.version}"; + hash = "sha256-Ch7CBPwSKZxCmZwFunNCA8E74TcOWp9MLbhe3/glQ6w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3l+mRucDFc49Y96e2m5uixKvRSkrRaBWgJhPMIxuZvo="; + cargoHash = "sha256-7HZoXNL7nf6NUNnh6gzXsZ2o4eeEQL7/KDdIcbh7/jM="; doCheck = false; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libsodium openssl ]; @@ -41,11 +39,11 @@ rustPlatform.buildRustPackage rec { tests = { inherit (nixosTests) harmonia; }; }; - meta = with lib; { + meta = { description = "Nix binary cache"; homepage = "https://github.com/nix-community/harmonia"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mic92 ]; mainProgram = "harmonia"; }; -} +}) diff --git a/pkgs/by-name/ha/harmonist/package.nix b/pkgs/by-name/ha/harmonist/package.nix index 2e0ba2c05963..9617b6abf07b 100644 --- a/pkgs/by-name/ha/harmonist/package.nix +++ b/pkgs/by-name/ha/harmonist/package.nix @@ -1,26 +1,29 @@ { lib, - fetchurl, buildGoModule, + fetchFromGitea, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "harmonist"; - version = "0.5.1"; + version = "0.6.1"; - src = fetchurl { - url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz"; - hash = "sha256-NkUrBvOOs6yctW4CVRpJNcdfdPvUJZp9HaWLS7eO4yE="; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "anaseto"; + repo = "harmonist"; + tag = "v${finalAttrs.version}"; + hash = "sha256-0YHbASLEcQJVYruFuWUYeb0yItmjnlJrZ4jY4h8WYgw="; }; - vendorHash = "sha256-0DV32a2LYnfYzg/tqwear9uaaahNUIi0M8uWlXOQ5Ic="; + vendorHash = "sha256-pQgqITlUtKkTZTpumWUoYMIB+fKQIqbTIAeTy2UDvdY="; ldflags = [ "-s" "-w" ]; - meta = with lib; { + meta = { description = "Stealth coffee-break roguelike game"; mainProgram = "harmonist"; longDescription = '' @@ -32,7 +35,7 @@ buildGoModule rec { adaptability for character progression. ''; homepage = "https://harmonist.tuxfamily.org/"; - license = licenses.isc; + license = lib.licenses.isc; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 9f39d078b7b5..301acd87d390 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.27.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-y1DjkHGTXQPLot/sdUQ6nP3cf29yFJa1vUjlQQTcUwY="; + hash = "sha256-hCgWaGPhSDSRQ/gkepUYF5hvhM44bjsEvInJ8LSgt2A="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-1ofAsWckkI1AvMat28ZqWLZh2dHwalBW7kw7tBrebQ8="; + cargoHash = "sha256-yKVVlC+dbDrKCQPYnlJPhrzfOSqVmmSfw0CAFMUG6Jg="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/harsh/package.nix b/pkgs/by-name/ha/harsh/package.nix index b38bfcafd9bc..077440c50666 100644 --- a/pkgs/by-name/ha/harsh/package.nix +++ b/pkgs/by-name/ha/harsh/package.nix @@ -2,27 +2,39 @@ lib, buildGoModule, fetchFromGitHub, + writableTmpDirAsHomeHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "harsh"; - version = "0.10.7"; + version = "0.10.21"; src = fetchFromGitHub { owner = "wakatara"; - repo = pname; - rev = "v${version}"; - hash = "sha256-M19JX+a1dFq05UZmPJyhkhxDwNBRQTPE8mdKbCER+4M="; + repo = "harsh"; + tag = "v${finalAttrs.version}"; + hash = "sha256-aACbq88WDZ4ArdQRoeIBQLVbTosAsZqftajEfkKat7E="; }; - vendorHash = "sha256-hdPkiF1HHuIl6KbilPre6tAqSnYPhYhrxBEj3Ayy2AY="; + vendorHash = "sha256-fggoN0PcPnfig3TA6662TPFNh/6cZVdmyr7atewoGYQ="; - meta = with lib; { + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + + checkFlags = + let + skippedTests = [ + "TestNewHabitIntegration" # panic: unexpected call to os.Exit(0) during test + "TestBuildGraph" # Expected graph length 10, got 24 + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + meta = { description = "CLI habit tracking for geeks"; homepage = "https://github.com/wakatara/harsh"; - changelog = "https://github.com/wakatara/harsh/releases/tag/v${version}"; - license = licenses.mit; + changelog = "https://github.com/wakatara/harsh/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "harsh"; }; -} +}) diff --git a/pkgs/by-name/ha/hash-slinger/package.nix b/pkgs/by-name/ha/hash-slinger/package.nix index c6a9ecd04be3..1bf69ea7ecac 100644 --- a/pkgs/by-name/ha/hash-slinger/package.nix +++ b/pkgs/by-name/ha/hash-slinger/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hash-slinger"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "letoams"; repo = "hash-slinger"; rev = version; - sha256 = "sha256-c6IZHUFuhcccUWZYSOUGFbKpTtwMclIvEvDX8gE5d8o="; + sha256 = "sha256-IN+jo2EuGx+3bnANKz+d/3opFBUCSmkBS/sCU3lT7Zs="; }; pythonPath = with python3.pkgs; [ diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix new file mode 100644 index 000000000000..994c6daa561a --- /dev/null +++ b/pkgs/by-name/ha/hashcat/package.nix @@ -0,0 +1,112 @@ +{ + lib, + stdenv, + addDriverRunpath, + config, + cudaPackages ? { }, + cudaSupport ? config.cudaSupport, + fetchurl, + makeWrapper, + minizip, + opencl-headers, + ocl-icd, + xxHash, + zlib, + libiconv, +}: + +stdenv.mkDerivation rec { + pname = "hashcat"; + version = "6.2.6"; + + src = fetchurl { + url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; + sha256 = "sha256-sl4Qd7zzSQjMjxjBppouyYsEeyy88PURRNzzuh4Leyo="; + }; + + postPatch = '' + # MACOSX_DEPLOYMENT_TARGET is defined by the enviroment + # Remove hardcoded paths on darwin + substituteInPlace src/Makefile \ + --replace "export MACOSX_DEPLOYMENT_TARGET" "#export MACOSX_DEPLOYMENT_TARGET" \ + --replace "/usr/bin/ar" "ar" \ + --replace "/usr/bin/sed" "sed" \ + --replace '-i ""' '-i' + ''; + + nativeBuildInputs = + [ + makeWrapper + ] + ++ lib.optionals cudaSupport [ + addDriverRunpath + ]; + + buildInputs = + [ + minizip + opencl-headers + xxHash + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + makeFlags = + [ + "PREFIX=${placeholder "out"}" + "COMPTIME=1337" + "VERSION_TAG=${version}" + "USE_SYSTEM_OPENCL=1" + "USE_SYSTEM_XXHASH=1" + "USE_SYSTEM_ZLIB=1" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [ + "IS_APPLE_SILICON='${if stdenv.hostPlatform.isAarch64 then "1" else "0"}'" + ]; + + enableParallelBuilding = true; + + preFixup = '' + for f in $out/share/hashcat/OpenCL/*.cl; do + # Rewrite files to be included for compilation at runtime for opencl offload + sed "s|#include \"\(.*\)\"|#include \"$out/share/hashcat/OpenCL/\1\"|g" -i "$f" + sed "s|#define COMPARE_\([SM]\) \"\(.*\.cl\)\"|#define COMPARE_\1 \"$out/share/hashcat/OpenCL/\2\"|g" -i "$f" + done + ''; + + postFixup = + let + LD_LIBRARY_PATH = builtins.concatStringsSep ":" ( + [ + "${ocl-icd}/lib" + ] + ++ lib.optionals cudaSupport [ + "${cudaPackages.cudatoolkit}/lib" + ] + ); + in + '' + wrapProgram $out/bin/hashcat \ + --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg LD_LIBRARY_PATH} + '' + + lib.optionalString cudaSupport '' + for program in $out/bin/hashcat $out/bin/.hashcat-wrapped; do + isELF "$program" || continue + addDriverRunpath "$program" + done + ''; + + meta = with lib; { + description = "Fast password cracker"; + mainProgram = "hashcat"; + homepage = "https://hashcat.net/hashcat/"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ + felixalbrigtsen + zimbatm + ]; + }; +} diff --git a/pkgs/by-name/ha/hashit/package.nix b/pkgs/by-name/ha/hashit/package.nix index 16530905c333..335f14834414 100644 --- a/pkgs/by-name/ha/hashit/package.nix +++ b/pkgs/by-name/ha/hashit/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "Simple app for checking usual checksums - Designed for elementary OS"; homepage = "https://github.com/artemanufrij/hashit"; license = licenses.gpl2Plus; - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; platforms = platforms.linux; mainProgram = "com.github.artemanufrij.hashit"; }; diff --git a/pkgs/by-name/ha/hatari/package.nix b/pkgs/by-name/ha/hatari/package.nix index 5b654b3ab0d4..235851e2ba95 100644 --- a/pkgs/by-name/ha/hatari/package.nix +++ b/pkgs/by-name/ha/hatari/package.nix @@ -1,28 +1,32 @@ { lib, stdenv, - fetchurl, - zlib, - SDL, + fetchFromGitLab, cmake, + zlib, + SDL2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hatari"; - version = "2.3.1"; + version = "2.5.0"; - src = fetchurl { - url = "https://download.tuxfamily.org/hatari/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-RKL2LKmV442eCHSAaVbwucPMhOqJ4BaaY4SbY807ZL0="; + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "hatari"; + repo = "hatari"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RC+KA6rNG4Hk3dvTtejiHl9+pPHImALF0Ho5QuTtjz4="; }; # For pthread_cancel cmakeFlags = [ "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s" ]; nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib - SDL + SDL2 ]; meta = { @@ -32,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index f862f8d4a095..2a26b7173f88 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "hatch"; - version = "1.14.0"; + version = "1.14.1"; pyproject = true; src = fetchFromGitHub { owner = "pypa"; repo = "hatch"; tag = "hatch-v${version}"; - hash = "sha256-JwFPNoFoNqAXkLCGhliLN98VAS+VCwRzo+JqWLIrxsw="; + hash = "sha256-101R5x4jAfMYrdE3OWWqGmkPWRI9rSMYr+Lye9NCbA4="; }; patches = [ (replaceVars ./paths.patch { uv = lib.getExe python3Packages.uv; }) ]; @@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec { darwin.ps ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; pytestFlagsArray = [ diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix index f4bf3cb6a40a..4d70666e56eb 100644 --- a/pkgs/by-name/ha/hatsu/package.nix +++ b/pkgs/by-name/ha/hatsu/package.nix @@ -7,20 +7,20 @@ }: rustPlatform.buildRustPackage rec { pname = "hatsu"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "importantimport"; repo = "hatsu"; tag = "v${version}"; - hash = "sha256-lIuaG7xfBQ1r3SkgSsXj1Ph9apxwP3oI42uunMh+ijU="; + hash = "sha256-mqs26srbEkGeQzeF4OdqI7o18Ajs+mmAXGLlVfS52sk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-gja8bVsnumJ0R3sN1WBV6WXAWjO9v/K+uBpNO1cTgRs="; + cargoHash = "sha256-5c6boVdq0XXbtVHqmIGoxJGQRh8lvn2jbmALPuOSMs4="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index e7b26d6214b1..17d5da0a683c 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -4,19 +4,19 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "havn"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; - tag = "v${version}"; - hash = "sha256-zZiBVuA6rjsCfn0Ih3Sum0VsmtyXbfPG9fwK2zkwJaA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-SXsCJzKfm77/IH3H7L5STylusmlN9DN4xd12Vt6L3TM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-j84DF6LJ9q56u4QgMFk9c6089Ghk5K0EatvonGjImjU="; + cargoHash = "sha256-SwqajiyYrN0VTGtQo9+Tux8sBvEmWzOQQknQ9zTQ0hY="; checkFlags = [ # Skip tests that require network access @@ -29,10 +29,10 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://github.com/mrjackwills/havn"; description = "Fast configurable port scanner with reasonable defaults"; - changelog = "https://github.com/mrjackwills/havn/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/mrjackwills/havn/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; mainProgram = "havn"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ha/hawkeye/package.nix b/pkgs/by-name/ha/hawkeye/package.nix index bbe5bff7a8dc..2dc04ad5a976 100644 --- a/pkgs/by-name/ha/hawkeye/package.nix +++ b/pkgs/by-name/ha/hawkeye/package.nix @@ -5,29 +5,29 @@ pkg-config, }: -rustPackages.rustPlatform.buildRustPackage rec { +rustPackages.rustPlatform.buildRustPackage (finalAttrs: { pname = "hawkeye"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "korandoru"; repo = "hawkeye"; - tag = "v${version}"; - hash = "sha256-wT6c2wA31+xFcgPUp4djuvsHxwWyEderQTPSzLLqeAg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-reeNsnWvn7sSfyqjGIk8jFnv8HaEBJsqitmNbRa9eTM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qWn9duoGmYVHGBnjT57/m2BT/yc9BNUGHSn748ZmAzg="; + cargoHash = "sha256-vvAbdY6C/cCiDu4hl4AL3Gh+TrbC93rn/l6NzgAsFuo="; nativeBuildInputs = [ pkg-config ]; meta = { - homepage = "https://github.com/korandoro/hawkeye"; + homepage = "https://github.com/korandoru/hawkeye"; description = "Simple license header checker and formatter, in multiple distribution forms"; license = lib.licenses.asl20; mainProgram = "hawkeye"; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ha/hawknl/package.nix b/pkgs/by-name/ha/hawknl/package.nix deleted file mode 100644 index b13b4567860b..000000000000 --- a/pkgs/by-name/ha/hawknl/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - unzip, -}: - -stdenv.mkDerivation rec { - pname = "hawknl"; - version = "1.68"; - - src = fetchurl { - url = "http://urchlay.naptime.net/~urchlay/src/HawkNL${ - lib.replaceStrings [ "." ] [ "" ] version - }src.zip"; - sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028"; - }; - - nativeBuildInputs = [ unzip ]; - - makefile = "makefile.linux"; - - patchPhase = '' - sed -i s/soname,NL/soname,libNL/ src/makefile.linux - ''; - - preInstall = '' - sed -i s,/usr/local,$out, src/makefile.linux - mkdir -p $out/lib $out/include - ''; - - meta = { - homepage = "http://hawksoft.com/hawknl/"; - description = "Free, open source, game oriented network API"; - license = lib.licenses.lgpl2Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/ha/hax11/package.nix b/pkgs/by-name/ha/hax11/package.nix index 5384bf28ee3a..44b9839975dc 100644 --- a/pkgs/by-name/ha/hax11/package.nix +++ b/pkgs/by-name/ha/hax11/package.nix @@ -10,13 +10,13 @@ multiStdenv.mkDerivation (finalAttrs: { pname = "hax11"; - version = "0-unstable-2024-06-24"; + version = "0-unstable-2025-04-29"; src = fetchFromGitHub { owner = "CyberShadow"; repo = "hax11"; - rev = "ef955862d7221d7714eafb33e28299eb758f4462"; - hash = "sha256-ND3N1oMUjmDkF7btcFucDxKxxANL9IKf08/6Kt6LX9o="; + rev = "d82bf3ba655c1a823b77a9a47f30657c9a32c1fe"; + hash = "sha256-Ykl/RdGRHmM+xko5a9tR2G1yFaY/Xq+BEoeXaLd39RQ="; }; outputs = [ diff --git a/pkgs/by-name/ha/haylxon/package.nix b/pkgs/by-name/ha/haylxon/package.nix index 3d965efa3743..36ee26365a18 100644 --- a/pkgs/by-name/ha/haylxon/package.nix +++ b/pkgs/by-name/ha/haylxon/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,8 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-cKYHC8qz81P4xtehGQIvNH/g/pa90IJQbKz0RM9tjws="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - meta = { description = "Save screenshots of urls and webpages from terminal"; homepage = "https://github.com/pwnwriter/haylxon"; diff --git a/pkgs/by-name/hc/hcdiag/package.nix b/pkgs/by-name/hc/hcdiag/package.nix index d431440c135a..c1ee998f14d8 100644 --- a/pkgs/by-name/hc/hcdiag/package.nix +++ b/pkgs/by-name/hc/hcdiag/package.nix @@ -8,21 +8,21 @@ buildGoModule rec { pname = "hcdiag"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcdiag"; tag = "v${version}"; - hash = "sha256-MY1qaVm1PRB3A+MPz4rVUS+Kn4O4p9yzn/3DHKvhZkk="; + hash = "sha256-pX3v4HYzQLvzBADOMDrjgS3M+H4tnJOAkUHs32NxwEg="; }; - vendorHash = "sha256-09I5Hsw7EhZZAvG7TnJNID/lVv0FVM3ejsmzy3GK48g="; + vendorHash = "sha256-ZuG++2bItCdnTcSaeBumIS2DqF+U6ZP7UTYM2DC+YGw="; nativeInstallCheckHooks = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/hc/hcp/package.nix b/pkgs/by-name/hc/hcp/package.nix index 063d95bf4899..5fd6b98162c2 100644 --- a/pkgs/by-name/hc/hcp/package.nix +++ b/pkgs/by-name/hc/hcp/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "hcp"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcp"; tag = "v${version}"; - hash = "sha256-DyfrT4Z4pF7o6nBoacpEE0jT/dxRRm7nr3KsXJTwtOQ="; + hash = "sha256-53UTxf83jc2tyWJe+BHSitwpQVc6Ecq0wsf8avGPJcM="; }; vendorHash = "sha256-Tq7Lu9rZCLpy7CiZQey5/y1hZPEvdSsy1BgEFWNVeAk="; diff --git a/pkgs/by-name/hc/hcxdumptool/package.nix b/pkgs/by-name/hc/hcxdumptool/package.nix index 9072ec49a6c7..dda50597c05f 100644 --- a/pkgs/by-name/hc/hcxdumptool/package.nix +++ b/pkgs/by-name/hc/hcxdumptool/package.nix @@ -1,31 +1,35 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, openssl, + libpcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hcxdumptool"; - version = "6.3.2"; + version = "6.3.5"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; - rev = version; - sha256 = "sha256-InMyDUEH135Y1RYJ3z1+RQxPMi7+QMf670S/S2ZL9vg="; + tag = finalAttrs.version; + hash = "sha256-PA4nbjg4ybWvZZ7wbsh+OR/wEEVm5qu5OfM9EO3HBYs="; }; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + libpcap + ]; installFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + meta = { homepage = "https://github.com/ZerBea/hcxdumptool"; description = "Small tool to capture packets from wlan devices"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ danielfullmer ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ danielfullmer ]; mainProgram = "hcxdumptool"; }; -} +}) diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix index 419e2b424438..d42f7ef8d4ba 100644 --- a/pkgs/by-name/hd/hddfancontrol/package.nix +++ b/pkgs/by-name/hd/hddfancontrol/package.nix @@ -11,17 +11,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hddfancontrol"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "desbma"; repo = "hddfancontrol"; tag = finalAttrs.version; - hash = "sha256-/+bvTpfgAjyG8gkyhueLJCKJo3e2OvabfOYOM9vV+g8="; + hash = "sha256-GdvGFNmarLxtO6BoZ8PktVvAiKIxu4FdZWCJeVtW/fI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-yupjse1snr467otqZgoSANpKoxq2F8NDfo8NvwGNJxk="; + cargoHash = "sha256-1GPct+CabVE8/tMpWsQ3/XRJQkcAmS6UDNuz5c/Oewo="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/hd/hdr10plus/package.nix b/pkgs/by-name/hd/hdr10plus/package.nix new file mode 100644 index 000000000000..675e5247256b --- /dev/null +++ b/pkgs/by-name/hd/hdr10plus/package.nix @@ -0,0 +1,111 @@ +{ + lib, + stdenv, + rust, + rustPlatform, + hdr10plus_tool, + cargo-c, + fontconfig, +}: + +let + inherit (lib) optionals concatStringsSep; + inherit (rust.envVars) setEnv; +in +rustPlatform.buildRustPackage (finalAttrs: { + __structuredAttrs = true; + + pname = "hdr10plus"; + version = "2.1.3"; + + outputs = [ + "out" + "dev" + ]; + + inherit (hdr10plus_tool) + src + useFetchCargoVendor + cargoDeps + cargoHash + ; + + nativeBuildInputs = [ cargo-c ]; + buildInputs = [ fontconfig ]; + + cargoCFlags = [ + "--package=hdr10plus" + "--frozen" + "--prefix=${placeholder "out"}" + "--includedir=${placeholder "dev"}/include" + "--pkgconfigdir=${placeholder "dev"}/lib/pkgconfig" + "--target=${stdenv.hostPlatform.rust.rustcTarget}" + ]; + + # mirror Cargo flags + cargoCBuildFlags = + optionals (finalAttrs.cargoBuildType != "debug") [ + "--profile=${finalAttrs.cargoBuildType}" + ] + ++ optionals (finalAttrs.cargoBuildNoDefaultFeatures) [ + "--no-default-features" + ] + ++ optionals (finalAttrs.cargoBuildFeatures != [ ]) [ + "--features=${concatStringsSep "," finalAttrs.cargoBuildFeatures}" + ]; + + cargoCTestFlags = + optionals (finalAttrs.cargoCheckType != "debug") [ + "--profile=${finalAttrs.cargoCheckType}" + ] + ++ optionals (finalAttrs.cargoCheckNoDefaultFeatures) [ + "--no-default-features" + ] + ++ optionals (finalAttrs.cargoCheckFeatures != [ ]) [ + "--features=${concatStringsSep "," finalAttrs.cargoCheckFeatures}" + ]; + + configurePhase = '' + # let stdenv handle stripping + export "CARGO_PROFILE_''${cargoBuildType@U}_STRIP"=false + + prependToVar cargoCFlags -j "$NIX_BUILD_CORES" + ''; + + buildPhase = '' + runHook preBuild + + ${setEnv} cargo cbuild "''${cargoCFlags[@]}" "''${cargoCBuildFlags[@]}" + + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + + ${setEnv} cargo ctest "''${cargoCFlags[@]}" "''${cargoCTestFlags[@]}" + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + ${setEnv} cargo cinstall "''${cargoCFlags[@]}" "''${cargoCBuildFlags[@]}" + + runHook postInstall + ''; + + passthru.tests = { + inherit hdr10plus_tool; + }; + + meta = { + description = "Library to work with HDR10+ in HEVC files"; + homepage = "https://github.com/quietvoid/hdr10plus_tool"; + changelog = "https://github.com/quietvoid/hdr10plus_tool/releases/tag/${hdr10plus_tool.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mvs ]; + pkgConfigModules = [ "hdr10plus-rs" ]; + }; +}) diff --git a/pkgs/by-name/hd/hdr10plus_tool/package.nix b/pkgs/by-name/hd/hdr10plus_tool/package.nix index 47e95956507f..d48a20b59b72 100644 --- a/pkgs/by-name/hd/hdr10plus_tool/package.nix +++ b/pkgs/by-name/hd/hdr10plus_tool/package.nix @@ -5,7 +5,11 @@ pkg-config, fontconfig, writableTmpDirAsHomeHook, - nix-update-script, + writeShellApplication, + hdr10plus, + nixVersions, + nix-update, + tomlq, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -31,9 +35,21 @@ rustPlatform.buildRustPackage (finalAttrs: { export FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf"; ''; - passthru = { - updateScript = nix-update-script { }; - }; + passthru.updateScript = lib.getExe (writeShellApplication { + name = "update-${finalAttrs.pname}"; + runtimeInputs = [ + nixVersions.latest + nix-update + tomlq + ]; + + text = '' + nix-update ${finalAttrs.pname} + src="$(nix eval -f . --raw ${finalAttrs.pname}.src)" + libver="$(tq -f "$src/hdr10plus/Cargo.toml" package.version)" + nix-update ${hdr10plus.pname} --version "$libver" + ''; + }); meta = { description = "CLI utility to work with HDR10+ in HEVC files."; diff --git a/pkgs/by-name/he/headphones-toolbox/package.nix b/pkgs/by-name/he/headphones-toolbox/package.nix index 550fe4e55f42..876717323add 100644 --- a/pkgs/by-name/he/headphones-toolbox/package.nix +++ b/pkgs/by-name/he/headphones-toolbox/package.nix @@ -1,51 +1,61 @@ { + cargo-tauri, + fetchFromGitHub, + fetchYarnDeps, lib, - stdenv, - dpkg, - fetchurl, - autoPatchelfHook, - webkitgtk_4_0, + nix-update-script, + nodejs, + pkg-config, + rustPlatform, + webkitgtk_4_1, + wrapGAppsHook3, + yarnConfigHook, }: -stdenv.mkDerivation (finalAttrs: { - name = "headphones-toolbox"; - version = "0.0.5"; +rustPlatform.buildRustPackage (rec { + pname = "headphones-toolbox"; + version = "0.0.7"; + tag = "test-tauri-v2-2"; - src = fetchurl { - url = "https://github.com/ploopyco/headphones-toolbox/releases/download/app-v${finalAttrs.version}/ploopy-headphones-toolbox_${finalAttrs.version}_amd64.deb"; - hash = "sha256-lWjmpybGcL3sbBng8zCTUtwYhlrQ6cCrKkhiu+g9MsE="; + src = fetchFromGitHub { + owner = "george-norton"; + repo = "headphones-toolbox"; + rev = "${tag}"; + hash = "sha256-X2HTEPxvBzbhfN1vqQVk81Qk1Z+EV+7/SpjZrDHv+fM="; }; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-Ln5U0KKsKm6ZLViZIWfBiBjm/mQNEIxaj4nTR55PcRg="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-VgCxYYNBV45sTzouS5NE7nOUViPj0gJO7DSKlJSAT4U="; + cargoRoot = "src-tauri"; + buildAndTestSubdir = cargoRoot; + nativeBuildInputs = [ - dpkg - autoPatchelfHook + cargo-tauri.hook + nodejs + pkg-config + wrapGAppsHook3 + yarnConfigHook ]; - buildInputs = [ - webkitgtk_4_0 - ]; + buildInputs = [ webkitgtk_4_1 ]; - installPhase = '' - runHook preInstall + passthru.updateScript = nix-update-script { }; - mkdir -p $out/bin - mv usr/bin $out - mv usr/lib $out - mv usr/share $out - - runHook postInstall - ''; - - meta = with lib; { + meta = { description = "UI for configuring Ploopy Headphones"; homepage = "https://github.com/ploopyco/headphones-toolbox/"; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + mainProgram = "headphones-toolbox"; + maintainers = with lib.maintainers; [ + flacks knarkzel nyabinary ]; - license = licenses.gpl3Only; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "headphones-toolbox"; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/he/health/package.nix b/pkgs/by-name/he/health/package.nix index 5766a60ba94e..d059ed8fd02f 100644 --- a/pkgs/by-name/he/health/package.nix +++ b/pkgs/by-name/he/health/package.nix @@ -13,7 +13,6 @@ libadwaita, libsecret, tinysparql, - darwin, nix-update-script, }: @@ -46,16 +45,11 @@ stdenv.mkDerivation rec { blueprint-compiler ]; - buildInputs = - [ - libadwaita - libsecret - tinysparql - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libadwaita + libsecret + tinysparql + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isClang [ @@ -72,7 +66,7 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/app/dev.Cogitri.Health"; license = licenses.gpl3Plus; mainProgram = "dev.Cogitri.Health"; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix index f93de6fc5dd9..2a37463e1bc2 100644 --- a/pkgs/by-name/he/hebbot/package.nix +++ b/pkgs/by-name/he/hebbot/package.nix @@ -8,7 +8,6 @@ openssl, autoconf, automake, - darwin, unstableGitUpdater, sqlite, }: @@ -37,14 +36,9 @@ rustPlatform.buildRustPackage rec { automake ]; - buildInputs = - [ - openssl - ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; env = { OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/he/hebcal/package.nix b/pkgs/by-name/he/hebcal/package.nix index c21900545a89..7da5bf824f44 100644 --- a/pkgs/by-name/he/hebcal/package.nix +++ b/pkgs/by-name/he/hebcal/package.nix @@ -1,32 +1,35 @@ { lib, - stdenv, + buildGoModule, fetchFromGitHub, - autoreconfHook, }: -stdenv.mkDerivation rec { - version = "4.24"; +buildGoModule (finalAttrs: { pname = "hebcal"; + version = "5.9.1"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; - rev = "v${version}"; - sha256 = "sha256-iWp2S3s8z/y4dZ66Ogqu7Yf4gTUvSS1J5F7d0ifRbcY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-IhN0n3qa+QlWtSxHyzm3muldsFFrkRzCwulgCcg50eA="; }; - nativeBuildInputs = [ autoreconfHook ]; + vendorHash = "sha256-Rpg+PVXY01+diJnE26iZ/oJhVVSoLdM7nWJFmfXBuHc="; + + preBuild = '' + make dcity.go + ''; doCheck = true; - meta = with lib; { + meta = { homepage = "https://hebcal.github.io"; description = "Perpetual Jewish Calendar"; longDescription = "Hebcal is a program which prints out the days in the Jewish calendar for a given Gregorian year. Hebcal is fairly flexible in terms of which events in the Jewish calendar it displays."; - license = licenses.gpl2Plus; - maintainers = [ maintainers.hhm ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.hhm ]; + platforms = lib.platforms.all; mainProgram = "hebcal"; }; -} +}) diff --git a/pkgs/by-name/he/hedgedoc-cli/package.nix b/pkgs/by-name/he/hedgedoc-cli/package.nix index 78eb00563a88..8585407a45d3 100644 --- a/pkgs/by-name/he/hedgedoc-cli/package.nix +++ b/pkgs/by-name/he/hedgedoc-cli/package.nix @@ -2,35 +2,31 @@ lib, stdenv, fetchFromGitHub, - makeWrapper, + makeBinaryWrapper, wget, jq, curl, }: -let - version = "1.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "hedgedoc-cli"; - inherit version; + version = "1.0-unstable-2025-05-01"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "cli"; - rev = "v${version}"; - sha256 = "uz+lkRRUTRr8WR295esNEbgjlZ/Em7mBk6Nx0BWLfg4="; + rev = "defeac80ca97fedcb19bdcddc516fd8f6e55fe8c"; + hash = "sha256-7E5Ka6SEPRg2O4+bJ6g3gSDMLnPMzg5Lbslgvt6gNEg="; }; nativeBuildInputs = [ - makeWrapper + makeBinaryWrapper ]; installPhase = '' runHook preInstall - mkdir -p $out/bin - cp $src/bin/codimd $out/bin - wrapProgram $out/bin/codimd \ + + makeWrapper $src/bin/codimd $out/bin/hedgedoc-cli \ --prefix PATH : ${ lib.makeBinPath [ jq @@ -38,18 +34,23 @@ stdenv.mkDerivation { curl ] } - ln -s $out/bin/codimd $out/bin/hedgedoc-cli + runHook postInstall ''; checkPhase = '' + runHook preCheck + hedgedoc-cli help + + runHook postCheck ''; - meta = with lib; { + meta = { description = "Hedgedoc CLI"; homepage = "https://github.com/hedgedoc/cli"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ drupol ]; + license = lib.licenses.agpl3Only; + mainProgram = "hedgedoc-cli"; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/by-name/he/hedgedoc/missing-hashes.json b/pkgs/by-name/he/hedgedoc/missing-hashes.json new file mode 100644 index 000000000000..a203ed4e54ca --- /dev/null +++ b/pkgs/by-name/he/hedgedoc/missing-hashes.json @@ -0,0 +1,27 @@ +{ + "@esbuild/aix-ppc64@npm:0.25.2": "3b5ee5599a8446074bd6aad732c5f2833a4b77e8af62cfcdee7508ded661daa054c481c2fa69f5341e65cc8846a2b3f026ffca12934cb24d76df93e4800e2979", + "@esbuild/android-arm64@npm:0.25.2": "556d958ea6f33073669a8a41645b0e51cecb2c0788ece8827a8752e666fd178ae28b2f9749b8a968f1e9c66b09dab7933be8d8b53e391ea9eca7bddf3f53b26a", + "@esbuild/android-arm@npm:0.25.2": "0ce9f260216520a4d53c2736b60e8e55b8c6569b944555cb7840fbe2ff16278d4e6591aedcbc38b3f69a6d98167367f36bba1d35b41d725e4d68a67f942e2a28", + "@esbuild/android-x64@npm:0.25.2": "57d0c438a3bcc25db5aa89c9d9b60827d3ee6d9553234d95a16f52f8a7780778e5e7a9975374e4d37a81e600d2b8f32bd46d5633bb83bcd958ee2f5162d1359b", + "@esbuild/darwin-arm64@npm:0.25.2": "e148927428c0c5d69e681ee8d4b47e0bcc5116296c47c41ed44068d686a0568b23dc493dc47b4d103e7b21894fafbaf5c2d64bf2420a5d6b6b22f71bf6c2fb08", + "@esbuild/darwin-x64@npm:0.25.2": "2bc37a902d7828f3973d28f486bcf26da13f6f421122348fc510551a4674bc706eb8e6f692ccd3d887523c373580b3228797f2fd73d641b2e106a6d44e3f20c7", + "@esbuild/freebsd-arm64@npm:0.25.2": "431ddf98e7c0b7c6a7d1a689454ab449df8eaacca242442153a4f149017d6bd03e16b7fda01e9fe26316d135176d74f5de09e9a21357648c320a3211a1c862a2", + "@esbuild/freebsd-x64@npm:0.25.2": "21545ec11969db7ed091819b63c88a9c4490edce8a98d64718f79352a5001927d1d85e6261170562850afdb5a7a2182ccf3d936eab0db615e51188ab6f95789b", + "@esbuild/linux-arm64@npm:0.25.2": "332ba0533f2a2bba21dfb3c9130f9a1cef5b420da29f67116e7fbff4cfd12039d06646b4a636952b873b22129a4e5c6ea6ea9b57286949980add7bab5d6684c1", + "@esbuild/linux-arm@npm:0.25.2": "a89613faa8ce9f307eea4c2b4ada8cdb56e378716d5250fc163674032bfbdda8b8aacc730c6b5fa05b5e5bff04a9a11dd02934d69b2233ecf0ff58af4ef5bb45", + "@esbuild/linux-ia32@npm:0.25.2": "5907824945c067f092bb28807080a2617b5208583ef71b2091d57b6039df182735ba62ee0142e993260d80df3a5b7ae88c0fff28f2e4efd8254dd34de2f4ad95", + "@esbuild/linux-loong64@npm:0.25.2": "ed521bfa81db13fc628455fc0feec4e75150ed2248013baaf8fa7d6d278295d3a2b09196c79169b7331e50e6d3abf86ee5773ad28f8d5914bbe4034758a424c2", + "@esbuild/linux-mips64el@npm:0.25.2": "9961d5853e7ff048ae2cb3997136f96ca5180dcc483e88e2ae0d34ca8ec097af3cc7d7c8ac6303a3cf2582eadbe905fa97a38dd9b402f82b9e104a0070f04b79", + "@esbuild/linux-ppc64@npm:0.25.2": "9ee2360fa976e7c0e16b09fd551fba232e19ede65a326544d16bcae0c399e2937b853eab5649a52589e483c77dbc4ab5e082177ee70e6fd2de53c421314ea458", + "@esbuild/linux-riscv64@npm:0.25.2": "e6bff41e76d44a8d6f27a53b2aeb98c771f6215590d411a1b6b682aa41c96cc9ed8baa6d17412d09419b10778dc40ca75b6cfe71dc8e24f1bf5c1e7793e2c560", + "@esbuild/linux-s390x@npm:0.25.2": "34ca97c2506f1a1e646bc74f7cfff7bc7990052c3a2ade963c010c6bff6ae6135b9788f7972af2fb47e1a5380b26b8ca1b7a6c3f2bc9eaa7c9e7fdf227e38ab0", + "@esbuild/linux-x64@npm:0.25.2": "ac2c60f9dcbf9c55f66aef618b2a3218ddde92aad764aa6645b94b50c8c6242f1f97a0af956759738bca97686918dd71a0cfc82c73eadb0ab921918c9927a627", + "@esbuild/netbsd-arm64@npm:0.25.2": "6d820e86cbf10d305520ed7dbf4358bd4d75d333de39c100156dcc5619446916b4d5a1c1e07b838d22f6013aaf57bdd93187f2e97b1357a426e94e91b485e0e1", + "@esbuild/netbsd-x64@npm:0.25.2": "89153d1753254cd88f12b9e088a79398dcee11c0a1349a0886b54dd2db0ae2faf64ac0e364494f0cbd64163320cff94f02fc1fe827ff950daa0a27e50ef84a27", + "@esbuild/openbsd-arm64@npm:0.25.2": "71ede4e8f1086bece4e6d528b46ee3a493e0d33d749d5ac9050afd5471465badce7f36f1d04c1edddec75fde49e1229adb0f7758bcd508219a7598086b9a3c5c", + "@esbuild/openbsd-x64@npm:0.25.2": "95d90426c96d27980340d29c6d83f79ea2a22008041a5366c81820275ce36ba95ad0bf5e89ee199747a5921953587e7dcdc2e5a97368dec4efbcfc83ab5be4ee", + "@esbuild/sunos-x64@npm:0.25.2": "da59382e27897f98ee7261651eff1bcf42b1d659b078e500f664ef18137d70298f0bc0a50cf5af2311931e5b0454c6d3756a0ff9e560ab0a754ea56b0f04768c", + "@esbuild/win32-arm64@npm:0.25.2": "39f9a30d00a788ef168d7186f366397f7c471f1db3328efc0b9ff0861475f8a4484723b60ab6ab04c3bb27ebcdc8632e4883c28b5fa93b0606dd9f85f7904043", + "@esbuild/win32-ia32@npm:0.25.2": "74a7726d21a347faa1debdcd540e77fa5af9f96d5e0d625f2752d24a1616ac0fdea6582a0499935d9d964ee4c7a57ad8f30c6fe355089af2095bd0e41b70ea49", + "@esbuild/win32-x64@npm:0.25.2": "1e3f44cc53acaff9d45e2cded9811c750b7eb946f7b76d1fec66b862a89da800f9291269607d7cbb8d7e6068504571904d93a0813692e74fbae1fc321fe46440" +} diff --git a/pkgs/by-name/he/hedgedoc/package.nix b/pkgs/by-name/he/hedgedoc/package.nix index 460b44b2062f..eae02d40d918 100644 --- a/pkgs/by-name/he/hedgedoc/package.nix +++ b/pkgs/by-name/he/hedgedoc/package.nix @@ -4,75 +4,49 @@ fetchFromGitHub, gitMinimal, cacert, - yarn, makeBinaryWrapper, nodejs, python3, nixosTests, + yarn-berry_4, writableTmpDirAsHomeHook, }: let - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; tag = version; - hash = "sha256-WDLcBnqhoKt6E41CzumOZg/5qvKFccN6gwirLTcwWYo="; - }; - - # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles - offlineCache = stdenv.mkDerivation { - name = "hedgedoc-${version}-offline-cache"; - inherit src; - - nativeBuildInputs = [ - cacert # needed for git - gitMinimal # needed to download git dependencies - nodejs # needed for npm to download git dependencies - yarn - writableTmpDirAsHomeHook - ]; - - buildPhase = '' - yarn config set enableTelemetry 0 - yarn config set cacheFolder $out - yarn config set --json supportedArchitectures.os '[ "linux" ]' - yarn config set --json supportedArchitectures.cpu '["arm", "arm64", "ia32", "x64"]' - yarn - ''; - - outputHashMode = "recursive"; - outputHash = "sha256-u/t2uvQ9oJnfjkSoPGjGsESWIsQHWvj9GP08aD6RkJk="; + hash = "sha256-hXcPcGj+efvRVt3cHQc9KttE0/DOD9Bul6f3cY4ofgs="; }; + missingHashes = ./missing-hashes.json; in stdenv.mkDerivation { pname = "hedgedoc"; - inherit version src; + inherit version src missingHashes; + + offlineCache = yarn-berry_4.fetchYarnBerryDeps { + inherit src missingHashes; + hash = "sha256-V7ptquAohv0t5oA+3iTvlQOZoEtY5xWyhSoJP8jwYI8="; + }; nativeBuildInputs = [ makeBinaryWrapper (python3.withPackages (ps: with ps; [ setuptools ])) # required to build sqlite3 bindings - yarn + yarn-berry_4 + yarn-berry_4.yarnBerryConfigHook ]; buildInputs = [ nodejs # for shebangs ]; - dontConfigure = true; - buildPhase = '' runHook preBuild - export HOME=$(mktemp -d) - yarn config set enableTelemetry 0 - yarn config set cacheFolder ${offlineCache} - export npm_config_nodedir=${nodejs} # prevent node-gyp from downloading headers - - yarn --immutable-cache yarn run build # Delete scripts that are not useful for NixOS @@ -102,7 +76,6 @@ stdenv.mkDerivation { ''; passthru = { - inherit offlineCache; tests = { inherit (nixosTests) hedgedoc; }; }; diff --git a/pkgs/by-name/he/hedgemodmanager/deps.json b/pkgs/by-name/he/hedgemodmanager/deps.json new file mode 100644 index 000000000000..f0a10915f0ba --- /dev/null +++ b/pkgs/by-name/he/hedgemodmanager/deps.json @@ -0,0 +1,837 @@ +[ + { + "pname": "Avalonia", + "version": "11.2.3", + "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.29", + "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "11.2.3", + "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg=" + }, + { + "pname": "Avalonia.Controls.DataGrid", + "version": "11.2.3", + "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM=" + }, + { + "pname": "Avalonia.Desktop", + "version": "11.2.3", + "hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I=" + }, + { + "pname": "Avalonia.Diagnostics", + "version": "11.2.3", + "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" + }, + { + "pname": "Avalonia.Fonts.Inter", + "version": "11.2.3", + "hash": "sha256-ySsCXVpjqjCX/uYkwluSfrAoBtuq9k7fC1bFjxKC9/Q=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "11.2.3", + "hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY=" + }, + { + "pname": "Avalonia.HtmlRenderer", + "version": "11.0.0", + "hash": "sha256-DBD113eQJNHeEgFmx/tVRSnHxhGBQIKWVKxr1QRilr4=" + }, + { + "pname": "Avalonia.Native", + "version": "11.2.3", + "hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.2.3", + "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.2.3", + "hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA=" + }, + { + "pname": "Avalonia.Themes.Fluent", + "version": "11.2.3", + "hash": "sha256-DRl+267mUtJDUJpreUj6BxDLGGYGkEEo5vDGtGguoC8=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "11.2.3", + "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k=" + }, + { + "pname": "Avalonia.Win32", + "version": "11.2.3", + "hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE=" + }, + { + "pname": "Avalonia.X11", + "version": "11.2.3", + "hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60=" + }, + { + "pname": "CommunityToolkit.Mvvm", + "version": "8.4.0", + "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI=" + }, + { + "pname": "HarfBuzzSharp", + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + }, + { + "pname": "Markdig", + "version": "0.40.0", + "hash": "sha256-GJqbAhZZjCCnY2Cg3N4KaDVKc/IPdXgkWmTjQRvX5Jw=" + }, + { + "pname": "Material.Icons", + "version": "2.2.0", + "hash": "sha256-Gw2a7oXicf3yQKEgRdwBJ0DubMvf8iEkn6GtcLF9zJM=" + }, + { + "pname": "Material.Icons.Avalonia", + "version": "2.2.0", + "hash": "sha256-RkYaULaVMjm2HJV23gGRHomv6jI0dE/lIk1AWwkWJKA=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.0", + "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "6.0.36", + "hash": "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "6.0.36", + "hash": "sha256-JQULJyF0ivLoUU1JaFfK/HHg+/qzpN7V2RR2Cc+WlQ4=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "6.0.36", + "hash": "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "4.6.0", + "hash": "sha256-4koWiniIrv4ZBmS9SZb3347KaejKKh11n7CRj9fkc2M=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "4.6.0", + "hash": "sha256-OCxUWSolVrmP2bs2SX9WLjb/U8Box8s1Tayk05/n2/k=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "6.0.36", + "hash": "sha256-9lC/LYnthYhjkWWz2kkFCvlA5LJOv11jdt59SDnpdy0=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "6.0.36", + "hash": "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "6.0.36", + "hash": "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "6.0.36", + "hash": "sha256-k3rxvUhCEU0pVH8KgEMtkPiSOibn+nBh+0zT2xIfId8=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "6.0.36", + "hash": "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "Mono.Cecil", + "version": "0.11.5", + "hash": "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA=" + }, + { + "pname": "Nerdbank.GitVersioning", + "version": "3.6.133", + "hash": "sha256-AEnBQaGGPMBmZJjZrdWARq/jY4SluuPIsKBbvfNEvLE=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, + { + "pname": "PeNet", + "version": "4.1.1", + "hash": "sha256-TyVUt3NexLY7oDb+uYEXiZcMCpaMUmzF41UvdLWXsDk=" + }, + { + "pname": "PeNet.Asn1", + "version": "2.0.1", + "hash": "sha256-ypIptb5VOAa4GHvVdd1no1CoyiOKOegFs52tZHj435I=" + }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.0", + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + }, + { + "pname": "SharpCompress", + "version": "0.39.0", + "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, + { + "pname": "System.Buffers", + "version": "4.3.0", + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Buffers", + "version": "4.6.0", + "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" + }, + { + "pname": "System.Collections.Immutable", + "version": "7.0.0", + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.IO.Pipelines", + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.3.0", + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" + }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, + { + "pname": "System.Net.Http", + "version": "4.3.0", + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.4.0", + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + }, + { + "pname": "System.ObjectModel", + "version": "4.3.0", + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.3.0", + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "7.0.0", + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.3.0", + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.3.0", + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" + }, + { + "pname": "System.Security.Cryptography.Pkcs", + "version": "8.0.1", + "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "7.0.0", + "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.0", + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.3.0", + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.3.0", + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.20.0", + "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" + }, + { + "pname": "ValveKeyValue", + "version": "0.12.0.391", + "hash": "sha256-N7yCM2srP1SFxcqYRjk9dt4pPHdxIetfpw2UMe7kOes=" + }, + { + "pname": "ZstdSharp.Port", + "version": "0.8.4", + "hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo=" + } +] diff --git a/pkgs/by-name/he/hedgemodmanager/package.nix b/pkgs/by-name/he/hedgemodmanager/package.nix new file mode 100644 index 000000000000..de333ce11701 --- /dev/null +++ b/pkgs/by-name/he/hedgemodmanager/package.nix @@ -0,0 +1,53 @@ +{ + lib, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, + nix-update-script, +}: + +buildDotnetModule (finalAttrs: { + pname = "hedgemodmanager"; + version = "8.0.0-beta4"; + + src = fetchFromGitHub { + owner = "hedge-dev"; + repo = "HedgeModManager"; + tag = finalAttrs.version; + hash = "sha256-1uwcpeyOxwKI0fyAmchYEMqStF52wXkCZej+ZQ+aFeY="; + }; + + projectFile = "Source/HedgeModManager.UI/HedgeModManager.UI.csproj"; + nugetDeps = ./deps.json; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + postPatch = '' + substituteInPlace flatpak/hedgemodmanager.desktop --replace-fail "/app/bin/HedgeModManager.UI" "HedgeModManager.UI" + ''; + + # https://github.com/hedge-dev/HedgeModManager/blob/8.0.0-beta4/flatpak/io.github.hedge_dev.hedgemodmanager.yml#L53-L55 + postInstall = '' + install -Dm644 flatpak/hedgemodmanager.png $out/share/icons/hicolor/256x256/apps/io.github.hedge_dev.hedgemodmanager.png + install -Dm644 flatpak/hedgemodmanager.metainfo.xml $out/share/metainfo/io.github.hedge_dev.hedgemodmanager.metainfo.xml + install -Dm644 flatpak/hedgemodmanager.desktop $out/share/applications/io.github.hedge_dev.hedgemodmanager.desktop + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + ]; + }; + + meta = { + mainProgram = "HedgeModManager.UI"; + description = "Mod manager for Hedgehog Engine games"; + homepage = "https://github.com/hedge-dev/HedgeModManager"; + changelog = "https://github.com/hedge-dev/HedgeModManager/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ federicoschonborn ]; + }; +}) diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix index cb833fca79fe..11f0e6664d7f 100644 --- a/pkgs/by-name/he/heimdall-proxy/package.nix +++ b/pkgs/by-name/he/heimdall-proxy/package.nix @@ -4,7 +4,7 @@ lib, }: let - version = "0.15.10"; + version = "0.16.2"; in buildGoModule { pname = "heimdall-proxy"; @@ -15,10 +15,10 @@ buildGoModule { owner = "dadrus"; repo = "heimdall"; tag = "v${version}"; - hash = "sha256-WB8ZfuL8zNJ4UK6hbFapCjbRg/xMXxMeoajXZliLVD0="; + hash = "sha256-RzRjcg9GocqXpBh8C34LrSLbSrJWd9y4+YEWJaAD8d0="; }; - vendorHash = "sha256-WFtqZTCaL3oZArWhVjeTH085O2BkY7y1feUJuRllY7E="; + vendorHash = "sha256-GVUO5a6m85C7JRJ9WBTB7JDHRaiU2Nq3clWQUedKp98="; tags = [ "sqlite" ]; diff --git a/pkgs/by-name/he/heisenbridge/package.nix b/pkgs/by-name/he/heisenbridge/package.nix index dcd4526ef5ce..e8251a4307db 100644 --- a/pkgs/by-name/he/heisenbridge/package.nix +++ b/pkgs/by-name/he/heisenbridge/package.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "hifi"; repo = pname; tag = "v${version}"; - sha256 = "sha256-7zOpjIRYm+F8my+Gk/SXFIpzXMublPuzo93GpD8SxvU="; + sha256 = "sha256-wH3IZcY4CtawEicKCkFMh055SM0chYHsPKxYess9II0="; }; postPatch = '' diff --git a/pkgs/by-name/he/helio-workstation/package.nix b/pkgs/by-name/he/helio-workstation/package.nix index 198a5a67a60f..1a229e61fca7 100644 --- a/pkgs/by-name/he/helio-workstation/package.nix +++ b/pkgs/by-name/he/helio-workstation/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.14"; + version = "3.15"; src = fetchFromGitHub { owner = "helio-fm"; repo = "helio-workstation"; rev = version; fetchSubmodules = true; - hash = "sha256-o8vMHt6ypHY7HOHnhMifQphxGb5MjSg3hREVOnIdqfc="; + hash = "sha256-SDK3lLcMCmxu1FwkPduNzlgmDU7LKitPqIvsr6rOYDc="; }; buildInputs = [ diff --git a/pkgs/by-name/he/heliocron/package.nix b/pkgs/by-name/he/heliocron/package.nix index f0bf7a9e693f..440261107482 100644 --- a/pkgs/by-name/he/heliocron/package.nix +++ b/pkgs/by-name/he/heliocron/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "heliocron"; - version = "0.8.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mfreeborn"; repo = "heliocron"; rev = "v${version}"; - hash = "sha256-5rzFz29Bpy2GR6bEt2DdCq9RtpdcY3SK/KnZrBrHUvk="; + hash = "sha256-tqwVYIU8RXb1hiKnP7AlkxHsMhbAlwSmPGyFFMHIbAo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-as1rMyLqK0Z+UrO6B7Fzn2nNQM0xRrLoEPd2WlANxe8="; + cargoHash = "sha256-rQriNb/njEUBUmCUy5NKEfOYkOLy9i7ClU0vR72udOo="; meta = { description = "Execute tasks relative to sunset, sunrise and other solar events"; diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix index 311ae27ba67f..f5f9cc80a68a 100644 --- a/pkgs/by-name/he/helix/package.nix +++ b/pkgs/by-name/he/helix/package.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/hx"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix index 0590131913f4..4e12ff39093e 100644 --- a/pkgs/by-name/he/hello/package.nix +++ b/pkgs/by-name/he/hello/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "hello"; - version = "2.12.1"; + version = "2.12.2"; src = fetchurl { url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz"; - hash = "sha256-jZkUKv2SV28wsM18tCqNxoCZmLxdYH2Idh9RLibH2yA="; + hash = "sha256-WpqZbcKSzCTc9BHO6H6S9qrluNE72caBm0x6nc4IGKs="; }; # The GNU Hello `configure` script detects how to link libiconv but fails to actually make use of that. diff --git a/pkgs/by-name/he/hellwal/package.nix b/pkgs/by-name/he/hellwal/package.nix index 605eba124c21..3fff51a71cb1 100644 --- a/pkgs/by-name/he/hellwal/package.nix +++ b/pkgs/by-name/he/hellwal/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hellwal"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "danihek"; repo = "hellwal"; tag = "v${finalAttrs.version}"; - hash = "sha256-ei612uqAdEDwodsVDkmI4CGASMzCC/q0+CuNS54B53U="; + hash = "sha256-M+b49KhbzvwpMvnfiNe4yy50aUjrGXEajLMmiXEOCgE="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/by-name/he/helm-ls/package.nix b/pkgs/by-name/he/helm-ls/package.nix index 3ffedc478a9c..055fcfdb2d40 100644 --- a/pkgs/by-name/he/helm-ls/package.nix +++ b/pkgs/by-name/he/helm-ls/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-k/JJoLRykIY/ZmjqG+ZzXuMPQRcoumqisPKrD9PPyd0="; + hash = "sha256-NI9qtbt0Ci300DhDR+yjFThTGLXKrbsc1wuLPpC1l9o="; }; - vendorHash = "sha256-VAxmMDZIbbcGHoRL06oqWkDnWZBuweKyoCLSqItWHyg="; + vendorHash = "sha256-1BO/0Ous4mclainPV+nqk5K+tHKgRnaxMtsI4xAhZF4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix index f97fdd7c6192..f214e13d782c 100644 --- a/pkgs/by-name/he/helmsman/package.nix +++ b/pkgs/by-name/he/helmsman/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "helmsman"; - version = "3.18.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-k/rgQttCA4Ahip9zV+z9zbVSy8NKUTIR4/pluqpP/1c="; + sha256 = "sha256-As0YjqMdPCgIzYWB1Wf3R11mwj6CglWZdvCRzlHDvkw="; }; subPackages = [ "cmd/helmsman" ]; - vendorHash = "sha256-lIBtKwxdmUIRYifEhrjzHilEsgLIf4Mtq/pa7N/E+NM="; + vendorHash = "sha256-A5wFoOvBbjBv4F5Ul91GF9/l+8QXh9Xmmvhk5qNmems="; doCheck = false; diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index 6f6e1bb4d91f..758119ba8839 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.54.0"; + version = "1.56.1"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-wn/HYtwOdP5n5GVJgNWjeujwhDAYE8PfK84JcuJjOwg="; + hash = "sha256-OPLE0OhTZfDVPODd/vCfpqpqBGGBQlzONcfDgkVhEic="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/he/hercules/package.nix b/pkgs/by-name/he/hercules/package.nix index 6ae12bfda411..d7a3df6d6053 100644 --- a/pkgs/by-name/he/hercules/package.nix +++ b/pkgs/by-name/he/hercules/package.nix @@ -61,8 +61,8 @@ let src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "crypto"; - rev = "a5096e5dd79f46b568806240c0824cd8cb2fcda2"; - hash = "sha256-VWjM8WxPMynyW49Z8U/r6SsF7u7Xbk7Dd0gR35lIw28="; + rev = "9ac58405c2b91fb7cd230aed474dc7059f0fcad9"; + hash = "sha256-hWNowhKP26+HMIL4facOCrZAJ1bR0rRTRc+2R9AM2cc="; }; }); @@ -71,8 +71,8 @@ let src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "decNumber"; - rev = "3aa2f4531b5fcbd0478ecbaf72ccc47079c67280"; - hash = "sha256-PfPhnYUSIw1sYiGRM3iHRTbHHbQ+sK7oO12pH/yt+MQ="; + rev = "995184583107625015bb450228a5f3fb781d9502"; + hash = "sha256-3PAJ+HZasf3fr6F1cmqIk+Jjv3Gzkki7AFrAHBaEATo="; }; }); @@ -81,8 +81,8 @@ let src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "SoftFloat"; - rev = "4b0c326008e174610969c92e69178939ed80653d"; - hash = "sha256-DEIT5Xk6IqUXCIGD2Wj0h9xPOR0Mid2Das7aKMQMDaM="; + rev = "e053494d988ec0648c92f683abce52597bfae745"; + hash = "sha256-1UCRYzf24U3zniKnatPvYKSmTEsx3YCrtv1tBR5lvw8="; }; }); @@ -91,8 +91,8 @@ let src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "telnet"; - rev = "729f0b688c1426018112c1e509f207fb5f266efa"; - hash = "sha256-ED0Cl+VcK6yl59ShgJBZKy25oAFC8eji36pNLwMxTM0="; + rev = "384b2542dfc9af67ca078e2bc13487a8fc234a3f"; + hash = "sha256-dPgLK7nsRZsqY4fVMdlcSHKC2xkGdNmayyK2FW5CNiI="; }; }); @@ -108,13 +108,13 @@ let in stdenv.mkDerivation rec { pname = "hercules"; - version = "4.7"; + version = "4.8"; src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "hyperion"; rev = "Release_${version}"; - hash = "sha256-5Kvs2OWQrlsRZpmx7vet8GCky5xAISBNAqn+NHgicOM"; + hash = "sha256-3Go5m4/K8d4Vu7Yi8ULQpX83d44fu9XzmG/gClWeUKo="; }; postPatch = '' diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix index 0495cd4f62cc..bafde8c09fb0 100644 --- a/pkgs/by-name/he/hermitcli/package.nix +++ b/pkgs/by-name/he/hermitcli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hermit"; - version = "0.44.4"; + version = "0.44.8"; src = fetchFromGitHub { rev = "v${version}"; owner = "cashapp"; repo = "hermit"; - hash = "sha256-fmIFonhzhLHzcRWWC4l3wDHmoXUy3vm//tA497rI0LE="; + hash = "sha256-euSuOYHroTJTifUcthHr4oQktTmE62qf2y6p6fBy9fI="; }; - vendorHash = "sha256-Nmvgsso9WU4Tuc0vFUutcApgX6KXRZMl3CiWO5FaROU="; + vendorHash = "sha256-GnZqM5ZKpg2yKAzUaXLOOKspbpjNnihscftkDT/7P9w="; subPackages = [ "cmd/hermit" ]; diff --git a/pkgs/games/heroic/fix-non-steam-shortcuts.patch b/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch similarity index 100% rename from pkgs/games/heroic/fix-non-steam-shortcuts.patch rename to pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix new file mode 100644 index 000000000000..f51612b4fbcc --- /dev/null +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -0,0 +1,121 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + pnpm_9, + nodejs, + python3, + makeWrapper, + # Upstream uses EOL Electron 31. Use next oldest version. + electron_34, + vulkan-helper, + gogdl, + legendary-heroic, + nile, + comet-gog, +}: + +let + electron = electron_34; +in +stdenv.mkDerivation (finalAttrs: { + pname = "heroic-unwrapped"; + version = "2.16.1"; + + src = fetchFromGitHub { + owner = "Heroic-Games-Launcher"; + repo = "HeroicGamesLauncher"; + rev = "v${finalAttrs.version}"; + hash = "sha256-BnBzbbyi9cdO6W59cnY13hnhH+tjrTryTp9XIcERwh4="; + }; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-2IQyXULgFoz0rFQ8SwERgMDzzo7pZ3DbqhwrWNYSwRo="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_9.configHook + python3 + makeWrapper + ]; + + patches = [ + # Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic. + ./fix-non-steam-shortcuts.patch + ]; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + buildPhase = '' + runHook preBuild + + # set nodedir to prevent node-gyp from downloading headers + export npm_config_nodedir=${electron.headers} + + pnpm --offline electron-vite build + pnpm --offline electron-builder \ + --linux \ + --dir \ + -c.asarUnpack="**/*.node" \ + -c.electronDist=${electron.dist} \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + # --disable-gpu-compositing is to work around upstream bug + # https://github.com/electron/electron/issues/32317 + installPhase = '' + runHook preInstall + + mkdir -p "$out/opt/heroic" + cp -r dist/linux-unpacked/resources "$out/opt/heroic" + + cp -r public "$out/opt/heroic/resources/app.asar.unpacked/build" + rm -rf "$out/opt/heroic/resources/app.asar.unpacked/build/bin" + mkdir -p "$out/opt/heroic/resources/app.asar.unpacked/build/bin/x64/linux" + ln -s \ + "${lib.getExe gogdl}" \ + "${lib.getExe legendary-heroic}" \ + "${lib.getExe nile}" \ + "${lib.getExe comet-gog}" \ + "${lib.getExe vulkan-helper}" \ + "$out/opt/heroic/resources/app.asar.unpacked/build/bin/x64/linux" + + makeWrapper "${electron}/bin/electron" "$out/bin/heroic" \ + --inherit-argv0 \ + --set ELECTRON_FORCE_IS_PACKAGED 1 \ + --add-flags --disable-gpu-compositing \ + --add-flags $out/opt/heroic/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + + install -D "flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications/com.heroicgameslauncher.hgl.desktop" + install -D "src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg" + substituteInPlace "$out/share/applications/com.heroicgameslauncher.hgl.desktop" \ + --replace-fail "Exec=heroic-run --ozone-platform-hint=auto" "Exec=heroic" + + runHook postInstall + ''; + + passthru = { + inherit (finalAttrs) pnpmDeps; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac"; + homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"; + changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ aidalgol ]; + # Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform. + # It may also work on other Linux targets, but all the game stores only + # support x86 Linux, so it would require extra hacking to run games via QEMU + # user emulation. Upstream provide Linux builds only for x86_64. + platforms = [ "x86_64-linux" ]; + mainProgram = "heroic"; + }; +}) diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/by-name/he/heroic/package.nix similarity index 100% rename from pkgs/games/heroic/fhsenv.nix rename to pkgs/by-name/he/heroic/package.nix diff --git a/pkgs/by-name/he/heroku/package.nix b/pkgs/by-name/he/heroku/package.nix index 2549b6aff154..2e68ba2caefc 100644 --- a/pkgs/by-name/he/heroku/package.nix +++ b/pkgs/by-name/he/heroku/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation { pname = "heroku"; - version = "10.2.0"; + version = "10.6.1"; src = fetchzip { - url = "https://cli-assets.heroku.com/versions/10.2.0/9d9128b/heroku-v10.2.0-9d9128b-linux-x64.tar.xz"; - hash = "sha256-RIkRcJc+pFu4czwlNgo8ntmKu/ihY25Q6jBCP6pEIdI="; + url = "https://cli-assets.heroku.com/versions/10.6.1/6a01789/heroku-v10.6.1-6a01789-linux-x64.tar.xz"; + hash = "sha256-dJ18GYfYVzWNssVyBu+L/iuHyRok5whQfs7CC2AYnf4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/he/hevi/deps.nix b/pkgs/by-name/he/hevi/deps.nix new file mode 100644 index 000000000000..8875577d8775 --- /dev/null +++ b/pkgs/by-name/he/hevi/deps.nix @@ -0,0 +1,42 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ + linkFarm, + fetchzip, + fetchgit, +}: + +linkFarm "zig-packages" [ + { + name = "12204a4669fa6e8ebb1720e3581a24c1a7f538f2f4ee3ebc91a9e36285c89572d761"; + path = fetchgit { + url = "https://github.com/MFAshby/zig-lsp-kit.git"; + rev = "1c07e3e3305f8dd6355735173321c344fc152d3e"; + hash = "sha256-WBJ7hbc69W3mtzrMLwehcKccSbVe/8Dy9sX4IA4VbcY="; + }; + } + { + name = "1220841471bd4891cbb199d27cc5e7e0fb0a5b7c5388a70bd24fa3eb7285755c396c"; + path = fetchgit { + url = "https://github.com/kubkon/zig-yaml.git"; + rev = "beddd5da24de91d430ca7028b00986f7745b13e9"; + hash = "sha256-CJms2LjwoYNlbhapFYzvOImuaMH/zikllYeQ2/VlHi0="; + }; + } + { + name = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147"; + path = fetchgit { + url = "https://github.com/ziglibs/known-folders.git"; + rev = "0ad514dcfb7525e32ae349b9acc0a53976f3a9fa"; + hash = "sha256-X+XkFj56MkYxxN9LUisjnkfCxUfnbkzBWHy9pwg5M+g="; + }; + } + { + name = "1220c198cdaf6cb73fca6603cc5039046ed10de2e9f884cae9224ff826731df1c68d"; + path = fetchgit { + url = "https://github.com/kristoff-it/ziggy"; + rev = "ae30921d8c98970942d3711553aa66ff907482fe"; + hash = "sha256-dZemnsmM0383HnA7zhykyO/DnG0mx+PVjjr9NiIfu4I="; + }; + } +] diff --git a/pkgs/by-name/he/hevi/package.nix b/pkgs/by-name/he/hevi/package.nix new file mode 100644 index 000000000000..9e30696da500 --- /dev/null +++ b/pkgs/by-name/he/hevi/package.nix @@ -0,0 +1,39 @@ +{ + callPackage, + fetchFromGitHub, + lib, + stdenv, + zig_0_13, +}: + +let + zig = zig_0_13; +in +stdenv.mkDerivation (finalAttrs: { + pname = "hevi"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "Arnau478"; + repo = "hevi"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wnpuM2qlbeDIupDPQPKdWmjAKepCG0+u3uxcLDFB09w="; + }; + + nativeBuildInputs = [ + zig.hook + ]; + + postPatch = '' + ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ''; + + meta = { + description = "Hex viewer"; + homepage = "https://github.com/Arnau478/hevi"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.jmbaur ]; + mainProgram = "hevi"; + inherit (zig.meta) platforms; + }; +}) diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index 337232a4c143..22b7ad94f8b6 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "hexpatch"; - version = "1.11.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "Etto48"; repo = "HexPatch"; tag = "v${version}"; - hash = "sha256-soiF4JCTOI/3SE53FdyLE0+qF80F0VVklMuUkCVps1g="; + hash = "sha256-xeHOViakCRMXQqmuUCeekL0tyYyh61OnU0zDk767NPU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3k0sQDO1wt16IB7Qx49S/Qxk4osw1SLv97cAffbgDZc="; + cargoHash = "sha256-3eaEgzGVSz6MjNqRGjzP8GoOZ/3eYOkI4Gd6+n+6vDg="; nativeBuildInputs = [ cmake @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix index 54d2d39dba45..97d91397b168 100644 --- a/pkgs/by-name/he/hextazy/package.nix +++ b/pkgs/by-name/he/hextazy/package.nix @@ -6,22 +6,22 @@ rustPlatform.buildRustPackage rec { pname = "hextazy"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "0xfalafel"; repo = "hextazy"; - rev = "${version}"; - hash = "sha256-j8KY8OTYG+Hl86OppbMyAFBSA89TO7hc8mcNgTGTlgM="; + tag = version; + hash = "sha256-6G0mD55BLMfqpgz1wtQBsAfGKlRcVEYJAPQJ3z8Yxnw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JPY1mge4aqO/QERCXYk+HzONjDJHi5og6lwQ68nUxqE="; + cargoHash = "sha256-1i0nngfqF4R/ILbNHrCW1NIEFTfQ5nRhjdKy7uebPi8="; meta = { description = "TUI hexeditor in Rust with colored bytes"; homepage = "https://github.com/0xfalafel/hextazy"; - changelog = "https://github.com/0xfalafel/hextazy/releases/tags/${src.rev}"; + changelog = "https://github.com/0xfalafel/hextazy/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ akechishiro ]; mainProgram = "hextazy"; diff --git a/pkgs/by-name/he/hexyl/package.nix b/pkgs/by-name/he/hexyl/package.nix index a7b90f7a33c2..ff167780c882 100644 --- a/pkgs/by-name/he/hexyl/package.nix +++ b/pkgs/by-name/he/hexyl/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix new file mode 100644 index 000000000000..859d175f46f6 --- /dev/null +++ b/pkgs/by-name/he/heynote/package.nix @@ -0,0 +1,53 @@ +{ + appimageTools, + desktop-file-utils, + fetchurl, + lib, + nix-update-script, +}: +let + pname = "heynote"; + version = "2.2.2"; + + src = fetchurl { + url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage"; + sha256 = "sha256-DFJ7j8eFElbsU7EiIZuH9DdkuBVmmDQ66tkRDYBApCc="; + }; + + appimageContents = appimageTools.extractType2 { + inherit version pname src; + }; + +in +appimageTools.wrapType2 { + inherit pname version src; + + nativeBuildInputs = [ desktop-file-utils ]; + + extraInstallCommands = '' + mkdir -p $out/share/pixmaps $out/share/licenses/heynote + cp ${appimageContents}/heynote.png $out/share/pixmaps/ + cp ${appimageContents}/heynote.desktop $out + # verify binary is present + stat $out/bin/heynote + desktop-file-install --dir $out/share/applications \ + --set-key Exec --set-value heynote \ + --set-key Comment --set-value "Heynote" \ + --delete-original $out/heynote.desktop + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "heynote"; + description = "Dedicated scratchpad for developers"; + homepage = "https://heynote.com/"; + changelog = "https://github.com/heyman/heynote/releases/v${version}"; + license = with lib.licenses; [ + mit + commons-clause + ]; + maintainers = with lib.maintainers; [ jasoncrevier ]; + platforms = lib.platforms.x86_64; + }; +} diff --git a/pkgs/by-name/hf/hfst/package.nix b/pkgs/by-name/hf/hfst/package.nix index 47c17f0cf0be..14fc07ed8aae 100644 --- a/pkgs/by-name/hf/hfst/package.nix +++ b/pkgs/by-name/hf/hfst/package.nix @@ -11,17 +11,18 @@ swig, pkg-config, zlib, + openfst, }: stdenv.mkDerivation (finalAttrs: { pname = "hfst"; - version = "3.16.0"; + version = "3.16.2"; src = fetchFromGitHub { owner = "hfst"; repo = "hfst"; tag = "v${finalAttrs.version}"; - hash = "sha256-2ST0s08Pcp+hTn7rUTgPE1QkH6PPWtiuFezXV3QW0kU="; + hash = "sha256-Vp9rSQYNK991fCoEcW7tpVxCOemW2RFt0LujLGHFGVQ="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { gettext icu zlib + openfst ]; configureFlags = [ diff --git a/pkgs/by-name/hh/hheretic/package.nix b/pkgs/by-name/hh/hheretic/package.nix index 64a3fa9d82ac..2b886b6b8522 100644 --- a/pkgs/by-name/hh/hheretic/package.nix +++ b/pkgs/by-name/hh/hheretic/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, SDL, SDL_mixer, + libGL, + libGLU, autoreconfHook, gitUpdater, }: @@ -27,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL SDL_mixer + libGL + libGLU ]; strictDeps = true; diff --git a/pkgs/by-name/hi/hiawatha/package.nix b/pkgs/by-name/hi/hiawatha/package.nix index 9ff18400619a..727651369179 100644 --- a/pkgs/by-name/hi/hiawatha/package.nix +++ b/pkgs/by-name/hi/hiawatha/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiawatha"; - version = "11.6"; + version = "11.7"; src = fetchFromGitLab { owner = "hsleisink"; repo = "hiawatha"; rev = "v${finalAttrs.version}"; - hash = "sha256-YsZdVqanVNibA4KnAknLh61hVo7x5uu67lb+RX2N7c8="; + hash = "sha256-Vr7rpYyUgB2NI/PJgh/nQa7gY1XJ4AfUDAHEOVblD1g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index b19102bc2be4..3f0195da142b 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hickory-dns"; - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "hickory-dns"; repo = "hickory-dns"; tag = "v${finalAttrs.version}"; - hash = "sha256-H8wJozmuXtJ6d96DMgQ/Uw2sp3sa+UKMXT9vf5azcyc="; + hash = "sha256-sPVulok18WAWyCXDNJzjioCO733vHmCcC5SjYrs/T+E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nuT2WUejpIhfI8WVTupAgdo7iav9YL1ipHu/PR4S2Hg="; + cargoHash = "sha256-q54faGF/eLdCRB0Eljkgl/x78Fnpm0eAEK9gCUwiAgo="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/hi/hid-tools/package.nix b/pkgs/by-name/hi/hid-tools/package.nix index 6b90d588848a..53fd6b5a9534 100644 --- a/pkgs/by-name/hi/hid-tools/package.nix +++ b/pkgs/by-name/hi/hid-tools/package.nix @@ -49,6 +49,6 @@ python3.pkgs.buildPythonPackage rec { description = "Python scripts to manipulate HID data"; homepage = "https://gitlab.freedesktop.org/libevdev/hid-tools"; license = licenses.mit; - maintainers = teams.freedesktop.members; + teams = [ teams.freedesktop ]; }; } diff --git a/pkgs/by-name/hi/hidapi/package.nix b/pkgs/by-name/hi/hidapi/package.nix new file mode 100644 index 000000000000..007e98379424 --- /dev/null +++ b/pkgs/by-name/hi/hidapi/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libusb1, + udev, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hidapi"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "libusb"; + repo = "hidapi"; + rev = "hidapi-${finalAttrs.version}"; + sha256 = "sha256-p3uzBq5VxxQbVuy1lEHEEQdxXwnhQgJDIyAAWjVWNIg="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libusb1 + udev + ]; + + enableParallelBuilding = true; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { + description = "Library for communicating with USB and Bluetooth HID devices"; + homepage = "https://github.com/libusb/hidapi"; + maintainers = with maintainers; [ prusnak ]; + # You can choose between GPLv3, BSD or HIDAPI license (even more liberal) + license = with licenses; [ + bsd3 # or + gpl3Only + ]; + pkgConfigModules = + lib.optionals stdenv.hostPlatform.isDarwin [ + "hidapi" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "hidapi-hidraw" + "hidapi-libusb" + ]; + platforms = platforms.unix ++ platforms.windows; + }; +}) diff --git a/pkgs/by-name/hi/hidapitester/package.nix b/pkgs/by-name/hi/hidapitester/package.nix new file mode 100644 index 000000000000..50ad7fc0d24d --- /dev/null +++ b/pkgs/by-name/hi/hidapitester/package.nix @@ -0,0 +1,58 @@ +{ + stdenv, + lib, + fetchFromGitHub, + hidapi, + udev, + pkg-config, + nix-update-script, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hidapitester"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "todbot"; + repo = "hidapitester"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OpLeKTouCB3efsXWJO0lZxUHxtDKeBY7OYk0HwC2NF4="; + }; + + postUnpack = '' + cp --no-preserve=mode -r ${hidapi.src} hidapi + export HIDAPI_DIR=$PWD/hidapi + ''; + + env.HIDAPITESTER_VERSION = finalAttrs.version; + + buildInputs = [ + udev + hidapi + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + installPhase = '' + runHook preInstall + install -Dm755 hidapitester $out/bin/hidapitester + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "Simple command-line program to test HIDAPI"; + homepage = "https://github.com/todbot/hidapitester"; + changelog = "https://github.com/todbot/hidapitester/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ lykos153 ]; + license = lib.licenses.gpl3Only; + mainProgram = "hidapitester"; + }; +}) diff --git a/pkgs/by-name/hi/hidviz/package.nix b/pkgs/by-name/hi/hidviz/package.nix index e3f154965be8..129b1094c875 100644 --- a/pkgs/by-name/hi/hidviz/package.nix +++ b/pkgs/by-name/hi/hidviz/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "hidviz"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "hidviz"; repo = "hidviz"; rev = "v${version}"; - hash = "sha256-9crHFYVNNxJjwJojwqB8qdAGyr1Ieux9qC3m3rpIJw0="; + hash = "sha256-ThDDQ3FN+cLCbdQCrC5zhL4dgg2zAbRWvtei7+qmQg8="; }; preConfigure = '' diff --git a/pkgs/by-name/hi/hieroglyphic/package.nix b/pkgs/by-name/hi/hieroglyphic/package.nix index e0ccf4c8fcad..30f9c112e53d 100644 --- a/pkgs/by-name/hi/hieroglyphic/package.nix +++ b/pkgs/by-name/hi/hieroglyphic/package.nix @@ -65,7 +65,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://apps.gnome.org/en/Hieroglyphic/"; license = lib.licenses.gpl3Only; mainProgram = "hieroglyphic"; - maintainers = with lib.maintainers; [ tomasajt ] ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ tomasajt ]; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index a57e4d65794f..b6de8a113026 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -2,15 +2,16 @@ lib, appimageTools, fetchurl, + version ? "0.9.10.4", + hash ? "sha256-heHRYG+7phgS351Azk5VyjUN096w8gaLY2NQaHh2HmU=", }: let - version = "0.9.9.19"; pname = "hifile"; src = fetchurl { url = "https://www.hifile.app/files/HiFile-${version}.AppImage"; - hash = "sha256-WrPNH7N8nYr/zd6RGsX3mL1P+nYUzXMPgIoBtC6tGo0="; + inherit hash; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/hi/hifile/update.sh b/pkgs/by-name/hi/hifile/update.sh index 95a0ae8440db..75a2860aff40 100755 --- a/pkgs/by-name/hi/hifile/update.sh +++ b/pkgs/by-name/hi/hifile/update.sh @@ -1,7 +1,11 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl common-updater-scripts +#!nix-shell -I nixpkgs=./. --pure -i bash -p curl cacert git nix nix-update + +versionList=$(curl -s "https://www.hifile.app/otherdownloads" | grep -A 10 '

All downloads

' | grep -oP 'HiFile-\K[0-9.]+(?=\.AppImage)') + +# Get the latest version by sorting the list of versions +latestVersion=$(echo "$versionList" | sort -V | tail -n 1) -latestVersion=$(curl -s "https://www.hifile.app/otherdownloads" | grep -A 10 '

All downloads

' | grep -m 1 '
  • .*AppImage.*' | sed -n 's/.*HiFile-\([0-9.]*\)\.AppImage.*/\1/p') currentVersion=$(nix-instantiate --eval -E "with import ./. {}; hifile.version" | tr -d '"') echo "latest version: $latestVersion" @@ -13,10 +17,4 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then fi -prefetch=$(nix-prefetch-url "https://www.hifile.app/files/HiFile-$latestVersion.AppImage") -hash=$(nix-hash --type sha256 --to-sri "$prefetch") - -update-source-version hifile 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system="x86_64-linux" -update-source-version hifile "$latestVersion" "$hash" --system="x86_64-linux" - - +nix-update hifile --version $latestVersion diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix new file mode 100644 index 000000000000..ff68daa49623 --- /dev/null +++ b/pkgs/by-name/hi/high-tide/package.nix @@ -0,0 +1,70 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + wrapGAppsHook4, + meson, + ninja, + pkg-config, + blueprint-compiler, + desktop-file-utils, + libadwaita, + gst_all_1, + libsecret, +}: + +python3Packages.buildPythonApplication { + pname = "high-tide"; + version = "0-unstable-2025-05-01"; + pyproject = false; + + src = fetchFromGitHub { + owner = "Nokse22"; + repo = "high-tide"; + rev = "6278ff9471b7481cf0291ab2a9f6d06322506dfc"; + hash = "sha256-4pVRVXEwz0ngjS1Vpt/o00lLYsZ6SvTCk4ivyGoQ4lQ="; + }; + + nativeBuildInputs = [ + wrapGAppsHook4 + meson + ninja + pkg-config + blueprint-compiler + desktop-file-utils + ]; + + buildInputs = + [ libadwaita ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + libsecret + ]); + + dependencies = with python3Packages; [ + pygobject3 + tidalapi + requests + mpd2 + ]; + + dontWrapGApps = true; + + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + + meta = { + description = "Libadwaita TIDAL client for Linux"; + homepage = "https://github.com/Nokse22/high-tide"; + license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "HighTide"; + maintainers = with lib.maintainers; [ + nyabinary + griffi-gh + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/hi/hiksink/package.nix b/pkgs/by-name/hi/hiksink/package.nix new file mode 100644 index 000000000000..f9a361179d69 --- /dev/null +++ b/pkgs/by-name/hi/hiksink/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "hiksink"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "CornerBit"; + repo = pname; + rev = version; + sha256 = "sha256-k/cBCc7DywyBbAzCRCHdrOVmo+QVCsSgDn8hcyTIUI8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-P5h0jYSSy6i30g93Jor98vOmniJCA4eMyQkI8TLfbN8="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + meta = { + description = "Tool to convert Hikvision camera events to MQTT"; + homepage = "https://github.com/CornerBit/HikSink"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "hik_sink"; + }; +} diff --git a/pkgs/by-name/hi/hitori/package.nix b/pkgs/by-name/hi/hitori/package.nix index ad321c355dad..ed34f9709938 100644 --- a/pkgs/by-name/hi/hitori/package.nix +++ b/pkgs/by-name/hi/hitori/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/hitori/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "GTK application to generate and let you play games of Hitori"; mainProgram = "hitori"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/hj/hjson-go/package.nix b/pkgs/by-name/hj/hjson-go/package.nix index f0b906ad0808..1918981eaf35 100644 --- a/pkgs/by-name/hj/hjson-go/package.nix +++ b/pkgs/by-name/hj/hjson-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "hjson-go"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "hjson"; repo = pname; rev = "v${version}"; - hash = "sha256-fonPxk/9ue8LzHTdKpuHJcucQoMl4P6gq+tbjS8Ui7Q="; + hash = "sha256-0xFTxnXMJA98+Y6gwO8zCDPQvLecG1qmbGAISCFMaPw="; }; vendorHash = null; diff --git a/pkgs/by-name/hl/hl-log-viewer/package.nix b/pkgs/by-name/hl/hl-log-viewer/package.nix new file mode 100644 index 000000000000..41bceea04380 --- /dev/null +++ b/pkgs/by-name/hl/hl-log-viewer/package.nix @@ -0,0 +1,51 @@ +{ + lib, + rustPlatform, + installShellFiles, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hl-log-viewer"; + version = "0.31.1"; + + src = fetchFromGitHub { + owner = "pamburus"; + repo = "hl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-rKvcJ7mPCuX+QGdDDeYIk+PtojFgIde5IA7mORmDekw="; + }; + + cargoHash = "sha256-YsDgLPr2V628QCDIOPcx2XQlaomicWZKZ24vXNgxRVE="; + useFetchCargoVendor = true; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd hl \ + --bash <($out/bin/hl --shell-completions bash) \ + --fish <($out/bin/hl --shell-completions fish) \ + --zsh <($out/bin/hl --shell-completions zsh) + $out/bin/hl --man-page >hl.1 + installManPage hl.1 + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/hl"; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "JSON and logfmt log converter to human readable representation"; + homepage = "https://github.com/pamburus/hl"; + changelog = "https://github.com/pamburus/hl/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "hl"; + maintainers = with lib.maintainers; [ petrzjunior ]; + }; +}) diff --git a/pkgs/by-name/hm/hmat-oss/package.nix b/pkgs/by-name/hm/hmat-oss/package.nix index f9b9e5e36a09..9b6ccf16c572 100644 --- a/pkgs/by-name/hm/hmat-oss/package.nix +++ b/pkgs/by-name/hm/hmat-oss/package.nix @@ -3,26 +3,34 @@ stdenv, fetchFromGitHub, cmake, + pkg-config, blas, lapack, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hmat-oss"; version = "1.10.0"; src = fetchFromGitHub { owner = "jeromerobert"; repo = "hmat-oss"; - tag = version; - sha256 = "sha256-GnFlvZCEzSCcBVLjFWLe+AKXVA6UMs/gycrOJ2TBqrE="; + tag = finalAttrs.version; + hash = "sha256-GnFlvZCEzSCcBVLjFWLe+AKXVA6UMs/gycrOJ2TBqrE="; }; cmakeFlags = [ "-DHMAT_GIT_VERSION=OFF" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = + [ + cmake + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + pkg-config # used to find the LAPACK + ]; + buildInputs = [ blas lapack @@ -30,11 +38,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Hierarchical matrix C/C++ library"; homepage = "https://github.com/jeromerobert/hmat-oss"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ gdinh ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ gdinh ]; }; -} +}) diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index ca3ad3eb69a6..165d09db6700 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -21,7 +21,7 @@ }: let - version = "3.6.11"; + version = "3.6.12"; icon = fetchurl { url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico"; hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc="; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar"; - hash = "sha256-ZQNJm7xbOdVSnxtx4krOnM9QBsxibFXo8wx1fCn1gJA="; + hash = "sha256-ofrG7CVZIODJoHE6owR9P7viBlChamYF5PEpFeeOH4E="; }; dontUnpack = true; diff --git a/pkgs/by-name/hm/hmm/package.nix b/pkgs/by-name/hm/hmm/package.nix index 9a749f166e8d..270227b33aea 100644 --- a/pkgs/by-name/hm/hmm/package.nix +++ b/pkgs/by-name/hm/hmm/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchCrate, perl, + writableTmpDirAsHomeHook, }: rustPlatform.buildRustPackage rec { @@ -20,15 +21,12 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ perl + writableTmpDirAsHomeHook ]; # FIXME: remove patch when upstream version of rustc-serialize is updated # https://github.com/NixOS/nixpkgs/pull/310673 cargoPatches = [ ./rustc-serialize-fix.patch ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - meta = with lib; { description = "Small command-line note-taking app"; homepage = "https://github.com/samwho/hmm"; diff --git a/pkgs/by-name/hm/hmmer/package.nix b/pkgs/by-name/hm/hmmer/package.nix index ef70f6d37ca9..659b6e23e727 100644 --- a/pkgs/by-name/hm/hmmer/package.nix +++ b/pkgs/by-name/hm/hmmer/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { versionCheckProgram = "${placeholder "out"}/bin/hmmalign"; - versionCheckProgramArg = [ "-h" ]; + versionCheckProgramArg = "-h"; meta = { description = "Biosequence analysis using profile hidden Markov models"; diff --git a/pkgs/by-name/ho/hoard/package.nix b/pkgs/by-name/ho/hoard/package.nix index 52d8badc95fb..11b888c4c59b 100644 --- a/pkgs/by-name/ho/hoard/package.nix +++ b/pkgs/by-name/ho/hoard/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "CLI command organizer written in rust"; diff --git a/pkgs/by-name/ho/hoarder/helpers/hoarder-cli b/pkgs/by-name/ho/hoarder/helpers/hoarder-cli deleted file mode 100755 index 0a957eacaad9..000000000000 --- a/pkgs/by-name/ho/hoarder/helpers/hoarder-cli +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -set -eu -o pipefail -HOARDER_LIB_PATH= -NODEJS= -exec "$NODEJS/bin/node" "$HOARDER_LIB_PATH/apps/cli/dist/index.mjs" "$@" diff --git a/pkgs/by-name/ho/hoarder/helpers/migrate b/pkgs/by-name/ho/hoarder/helpers/migrate deleted file mode 100755 index e11a50542340..000000000000 --- a/pkgs/by-name/ho/hoarder/helpers/migrate +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -set -eu -o pipefail -HOARDER_LIB_PATH= -RELEASE= -NODE_ENV=production - -[[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists - -export RELEASE NODE_ENV -exec "$HOARDER_LIB_PATH/node_modules/.bin/tsx" "$HOARDER_LIB_PATH/packages/db/migrate.ts" "$@" diff --git a/pkgs/by-name/ho/hoarder/helpers/start-web b/pkgs/by-name/ho/hoarder/helpers/start-web deleted file mode 100755 index 93c920f07a55..000000000000 --- a/pkgs/by-name/ho/hoarder/helpers/start-web +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -set -eu -o pipefail -HOARDER_LIB_PATH= -RELEASE= -NODEJS= -NODE_ENV=production - -[[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists - -export RELEASE NODE_ENV -exec "$NODEJS/bin/node" "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/server.js" diff --git a/pkgs/by-name/ho/hoarder/helpers/start-workers b/pkgs/by-name/ho/hoarder/helpers/start-workers deleted file mode 100755 index 5af794341bb5..000000000000 --- a/pkgs/by-name/ho/hoarder/helpers/start-workers +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -set -eu -o pipefail -HOARDER_LIB_PATH= -RELEASE= -NODE_ENV=production -NODE_PATH="$HOARDER_LIB_PATH/apps/workers" - -[[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists - -export RELEASE NODE_ENV NODE_PATH -exec "$HOARDER_LIB_PATH/node_modules/.bin/tsx" "$HOARDER_LIB_PATH/apps/workers/index.ts" diff --git a/pkgs/by-name/ho/hoarder/package.nix b/pkgs/by-name/ho/hoarder/package.nix deleted file mode 100644 index f995ce22112a..000000000000 --- a/pkgs/by-name/ho/hoarder/package.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - nodejs, - node-gyp, - inter, - python3, - srcOnly, - removeReferencesTo, - pnpm_9, -}: -let - pnpm = pnpm_9; -in -stdenv.mkDerivation (finalAttrs: { - pname = "hoarder"; - version = "0.23.0"; - - src = fetchFromGitHub { - owner = "hoarder-app"; - repo = "hoarder"; - tag = "v${finalAttrs.version}"; - hash = "sha256-ro2+jXfp83JfQ9HQr0imy7aohSFbH5J6Wx5bxhMT5TM="; - }; - - patches = [ - ./patches/use-local-font.patch - ./patches/fix-migrations-path.patch - ./patches/dont-lock-pnpm-version.patch - ]; - postPatch = '' - ln -s ${inter}/share/fonts/truetype ./apps/landing/app/fonts - ln -s ${inter}/share/fonts/truetype ./apps/web/app/fonts - ''; - - nativeBuildInputs = [ - python3 - nodejs - node-gyp - pnpm.configHook - ]; - pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pname version; - - # We need to pass the patched source code, so pnpm sees the patched version - src = stdenv.mkDerivation { - name = "${finalAttrs.pname}-patched-source"; - phases = [ - "unpackPhase" - "patchPhase" - "installPhase" - ]; - src = finalAttrs.src; - patches = finalAttrs.patches; - installPhase = "cp -pr --reflink=auto -- . $out"; - }; - - hash = "sha256-FzQPBIwe7OQ1KHaMtWaFe+RI+pXko5Ly11/jOmYSuFA="; - }; - buildPhase = '' - runHook preBuild - - # Based on matrix-appservice-discord - pushd node_modules/better-sqlite3 - npm run build-release --offline "--nodedir=${srcOnly nodejs}" - find build -type f -exec ${removeReferencesTo}/bin/remove-references-to -t "${srcOnly nodejs}" {} \; - popd - - export CI=true - - echo "Compiling apps/web..." - pushd apps/web - pnpm run build - popd - - echo "Building apps/cli" - pushd apps/cli - pnpm run build - popd - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/doc/hoarder - cp README.md LICENSE $out/share/doc/hoarder - - # Copy necessary files into lib/hoarder while keeping the directory structure - LIB_TO_COPY="node_modules apps/web/.next/standalone apps/cli/dist apps/workers packages/db packages/shared packages/trpc" - HOARDER_LIB_PATH="$out/lib/hoarder" - for DIR in $LIB_TO_COPY; do - mkdir -p "$HOARDER_LIB_PATH/$DIR" - cp -a $DIR/{.,}* "$HOARDER_LIB_PATH/$DIR" - chmod -R u+w "$HOARDER_LIB_PATH/$DIR" - done - - # NextJS requires static files are copied in a specific way - # https://nextjs.org/docs/pages/api-reference/config/next-config-js/output#automatically-copying-traced-files - cp -r ./apps/web/public "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/" - cp -r ./apps/web/.next/static "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/.next/" - - # Copy and patch helper scripts - for HELPER_SCRIPT in ${./helpers}/*; do - HELPER_SCRIPT_NAME="$(basename "$HELPER_SCRIPT")" - cp "$HELPER_SCRIPT" "$HOARDER_LIB_PATH/" - substituteInPlace "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME" \ - --replace-warn "HOARDER_LIB_PATH=" "HOARDER_LIB_PATH=$HOARDER_LIB_PATH" \ - --replace-warn "RELEASE=" "RELEASE=${finalAttrs.version}" \ - --replace-warn "NODEJS=" "NODEJS=${nodejs}" - chmod +x "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME" - patchShebangs "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME" - done - - # The cli should be in bin/ - mkdir -p $out/bin - mv "$HOARDER_LIB_PATH/hoarder-cli" $out/bin/ - - runHook postInstall - ''; - - fixupPhase = '' - runHook preFixup - - # Remove large dependencies that are not necessary during runtime - rm -rf $out/lib/hoarder/node_modules/{@next,next,@swc,react-native,monaco-editor,faker,@typescript-eslint,@microsoft,@typescript-eslint,pdfjs-dist} - - # Remove broken symlinks - find $out -type l ! -exec test -e {} \; -delete - - runHook postFixup - ''; - - meta = { - homepage = "https://github.com/hoarder-app/hoarder"; - description = "Self-hostable bookmark-everything app with a touch of AI for the data hoarders out there"; - license = lib.licenses.agpl3Only; - maintainers = [ lib.maintainers.three ]; - mainProgram = "hoarder-cli"; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/ho/hoarder/patches/use-local-font.patch b/pkgs/by-name/ho/hoarder/patches/use-local-font.patch deleted file mode 100644 index e1092cba3ac7..000000000000 --- a/pkgs/by-name/ho/hoarder/patches/use-local-font.patch +++ /dev/null @@ -1,47 +0,0 @@ -Prevents NextJS from attempting to download fonts during build. The fonts -directory will be created in the derivation script. - -See similar patches: - pkgs/by-name/cr/crabfit-frontend/01-localfont.patch - pkgs/by-name/al/alcom/use-local-fonts.patch - pkgs/by-name/ne/nextjs-ollama-llm-ui/0002-use-local-google-fonts.patch - ---- ---- a/apps/landing/app/layout.tsx -+++ b/apps/landing/app/layout.tsx -@@ -1,11 +1,14 @@ - import type { Metadata } from "next"; --import { Inter } from "next/font/google"; -+import localFont from 'next/font/local'; - - import "@hoarder/tailwind-config/globals.css"; - - import React from "react"; - --const inter = Inter({ subsets: ["latin"] }); -+const inter = localFont({ -+ subsets: ["latin"], -+ src: "./fonts/InterVariable.ttf", -+}); - - export const metadata: Metadata = { - title: "Hoarder", ---- a/apps/web/app/layout.tsx -+++ b/apps/web/app/layout.tsx -@@ -1,5 +1,5 @@ - import type { Metadata } from "next"; --import { Inter } from "next/font/google"; -+import localFont from 'next/font/local'; - - import "@hoarder/tailwind-config/globals.css"; - -@@ -13,7 +13,8 @@ - - import { clientConfig } from "@hoarder/shared/config"; - --const inter = Inter({ -+const inter = localFont({ -+ src: "./fonts/InterVariable.ttf", - subsets: ["latin"], - fallback: ["sans-serif"], - }); diff --git a/pkgs/by-name/ho/hobbes/package.nix b/pkgs/by-name/ho/hobbes/package.nix index 7e62d9e02686..c89bab84c2ab 100644 --- a/pkgs/by-name/ho/hobbes/package.nix +++ b/pkgs/by-name/ho/hobbes/package.nix @@ -3,7 +3,6 @@ stdenv, llvmPackages, fetchFromGitHub, - fetchpatch, cmake, llvm_12, ncurses, @@ -14,34 +13,20 @@ }: llvmPackages.stdenv.mkDerivation { pname = "hobbes"; - version = "0-unstable-2023-06-03"; + version = "0-unstable-2025-04-23"; src = fetchFromGitHub { owner = "morganstanley"; repo = "hobbes"; - rev = "88a712b85bc896a4c87e60c12321445f1cdcfd00"; - hash = "sha256-2v0yk35/cLKTjX0Qbc8cjc7Y6bamRSa9GpPvGoxL2Cw="; + rev = "0829030be03d47f91075cbebd0c9565f44bf9911"; + hash = "sha256-GZ26XL4++2MWQED2tVWeJ8HFcFQUXnXZ3+JCgdlAXNo="; }; - patches = [ - # fix build for LLVM-12+ - # https://github.com/morganstanley/hobbes/pull/452 - (fetchpatch { - name = "include-cstdint.patch"; - url = "https://github.com/morganstanley/hobbes/commit/924b71fca06c61e606792cc8db8521fb499d4237.patch"; - hash = "sha256-/VsWtTYc3LBOnm4Obgx/MOqaaWZhUc8yzmkygtNz+mY="; - }) + CXXFLAGS = [ + "-Wno-error=missing-template-arg-list-after-template-kw" + "-Wno-error=deprecated-copy" ]; - # only one warning generated. try to remove on next update - env.CXXFLAGS = "-Wno-error=deprecated-copy"; - - # TODO: re-enable Python tests once they work on Python 3 - # currently failing with "I don't know how to decode the primitive type: b'bool'" - postPatch = '' - rm test/Python.C - ''; - nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ho/hobbits/package.nix b/pkgs/by-name/ho/hobbits/package.nix new file mode 100644 index 000000000000..2e5f1dbbd55d --- /dev/null +++ b/pkgs/by-name/ho/hobbits/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + pffft, + libpcap, + libusb1, + python3, + qt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hobbits"; + version = "0.55.0"; + + src = fetchFromGitHub { + owner = "Mahlet-Inc"; + repo = "hobbits"; + tag = "v${finalAttrs.version}"; + hash = "sha256-W6QBLj+GkmM88cOVSIc1PLiVXysjv74J7citFW6SRDM="; + }; + + postPatch = '' + substituteInPlace src/hobbits-core/settingsdata.cpp \ + --replace-warn "pythonHome = \"/usr\"" "pythonHome = \"${python3}\"" + substituteInPlace cmake/gitversion.cmake \ + --replace-warn "[Mystery Build]" "${finalAttrs.version}" + substituteInPlace CMakeLists.txt \ + --replace-warn "SELF_CONTAINED_APP OR APPLE" "SELF_CONTAINED_APP" + ''; + + buildInputs = [ + pffft + libpcap + libusb1 + python3 + ]; + + nativeBuildInputs = [ + cmake + pkg-config + qt5.wrapQtAppsHook + ]; + + cmakeFlags = [ (lib.cmakeBool "USE_SYSTEM_PFFFT" true) ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/hobbits.app $out/Applications + wrapProgram $out/Applications/hobbits.app/Contents/MacOS/hobbits \ + --prefix DYLD_LIBRARY_PATH : $out/Applications/hobbits.app/Contents/Frameworks + ln -s $out/Applications/hobbits.app/Contents/MacOS/hobbits $out/bin/hobbits + # Prevent wrapping + find $out/Applications -type f -name "*.dylib" -exec chmod -x {} \; + ''; + + meta = { + description = "Multi-platform GUI for bit-based analysis, processing, and visualization"; + homepage = "https://github.com/Mahlet-Inc/hobbits"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = with lib.platforms; linux ++ darwin; + }; +}) diff --git a/pkgs/by-name/ho/holo-cli/package.nix b/pkgs/by-name/ho/holo-cli/package.nix new file mode 100644 index 000000000000..6816036a48f1 --- /dev/null +++ b/pkgs/by-name/ho/holo-cli/package.nix @@ -0,0 +1,47 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + cmake, + pkg-config, + protobuf, + pcre2, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "holo-cli"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "holo-routing"; + repo = "holo-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-f34M3U7pitWuH1UQa4uJ/scIOAZiUtDXijOk8wZEm+c="; + }; + + cargoHash = "sha256-s2em9v4SRQdC0aCD4ZXyhNNYnVKkg9XFzxkOlEFHmL0="; + passthru.updateScript = nix-update-script { }; + + # Use rust nightly features + RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + cmake + pkg-config + protobuf + ]; + buildInputs = [ + pcre2 + ]; + + meta = { + description = "Holo` Command Line Interface"; + homepage = "https://github.com/holo-routing/holo-cli"; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ themadbit ]; + license = lib.licenses.mit; + mainProgram = "holo-cli"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ho/holo-daemon/package.nix b/pkgs/by-name/ho/holo-daemon/package.nix new file mode 100644 index 000000000000..c704a02c5e59 --- /dev/null +++ b/pkgs/by-name/ho/holo-daemon/package.nix @@ -0,0 +1,61 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + cmake, + pkg-config, + protobuf, + pcre2, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "holo-daemon"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "holo-routing"; + repo = "holo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wASY+binAflxaXjKdSfUXS8jgdEHjdIF3AOzjN/a1Fo="; + }; + + passthru.updateScript = nix-update-script { }; + + cargoHash = "sha256-5X6a86V3Y9+KK0kGbS/ovelqXyLv15gQRFI7GhiYBjY="; + + # Use rust nightly features + RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + cmake + pkg-config + protobuf + ]; + buildInputs = [ + pcre2 + ]; + + # Might not be needed if latest nightly compiler version is used + preConfigure = '' + # Find all lib.rs and main.rs files and add required unstable features + # Add the feature flag at the top of the file if not present` + find . -name "lib.rs" -o -name "main.rs" | while read -r file; do + for feature in extract_if let_chains hash_extract_if; do + if ! grep -q "feature.*$feature" "$file"; then + sed -i "1i #![feature($feature)]" "$file" + fi + done + done + ''; + + meta = { + description = "`holo` daemon that provides the routing protocols, tools and policies"; + homepage = "https://github.com/holo-routing/holo"; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ themadbit ]; + license = lib.licenses.mit; + mainProgram = "holod"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index c1d3fd57ffc9..5b663297324f 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-03-30"; + version = "0-unstable-2025-05-13"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "b6fd653ef8fbeccfd4958650757e91767a65506d"; - hash = "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM="; + rev = "8d832ddfda9facf538f3dda9b6985fb0234f151c"; + hash = "sha256-NnPzzXEqfYjfrimLzK0JOBItfdEJdP/i6SNTuunCGgw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix index e9215b14d785..5af7e16e7eb0 100644 --- a/pkgs/by-name/ho/homebank/package.nix +++ b/pkgs/by-name/ho/homebank/package.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.8.6"; + version = "5.9.1"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-rxOKe/LNeVwTOMXj2emZCe5rM9kgxhjcNcZHf9gm3fU="; + hash = "sha256-s1Dtw6bjIUFObCb4VQ4rLBMNwftFlmlVa2H/1+jy44A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 9b1e0be75ed4..951a2f8a29d6 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -11,18 +11,18 @@ }: let pname = "homebox"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "sysadminsmedia"; repo = "homebox"; rev = "v${version}"; - hash = "sha256-XzO/aJcLGu+ZHt9fDUhUzBbUS9VpChFVOH0cgvYK6kc="; + hash = "sha256-98V2JnxHnMkW8YD8QekNgKeh9aPp0mcosmGh07GAFaU="; }; in buildGo123Module { inherit pname version src; - vendorHash = "sha256-Zo/yI1mNeN0O9gZsHux6aOzBlv72h17s7QNO+MaG2/g="; + vendorHash = "sha256-SkfYNOyRlcUSfga0g8o7yIvxgdL9SMxgVgRjIcPru0A="; modRoot = "backend"; # the goModules derivation inherits our buildInputs and buildPhases # Since we do pnpm thing in those it fails if we don't explicitly remove them @@ -38,7 +38,7 @@ buildGo123Module { pnpmDeps = pnpm_9.fetchDeps { inherit pname version; src = "${src}/frontend"; - hash = "sha256-nbZxCUXgXoaxIiJsB57OZ7YUkD7Njccj6nFkaHBbctw="; + hash = "sha256-6Q+tIY5dl5jCQyv1F8btLdJg0oEUGs0Wyu/joVdVhf8="; }; pnpmRoot = "../frontend"; @@ -71,6 +71,14 @@ buildGo123Module { "-X main.version=${version}" "-X main.commit=${version}" ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r $GOPATH/bin/api $out/bin/ + + runHook postInstall + ''; passthru = { tests = { diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix index f9f55510bfff..d746cd5bd228 100644 --- a/pkgs/by-name/ho/homepage-dashboard/package.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -7,7 +7,6 @@ python3, stdenv, cctools, - darwin, lib, nixosTests, enableLocalIcons ? false, @@ -29,13 +28,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "homepage-dashboard"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; tag = "v${finalAttrs.version}"; - hash = "sha256-gYFJ/coLQ/iBuMIF3+MaGfhA8J4S8TOi5sbd3ZaYeXU="; + hash = "sha256-B6hgQWAILfZNRFN4APX/3T2LcVj2FQPS/CAUdUA+drU="; }; # This patch ensures that the cache implementation respects the env @@ -51,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { src patches ; - hash = "sha256-qLRtkQjwHH0JK+u+fJnYfJDhZDEasAzprSY+cogNrNg="; + hash = "sha256-1WsiSG+dZVpd28bBjf3EYn95sxMCXsQPd27/otWW0nI="; }; nativeBuildInputs = [ @@ -62,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ nodePackages.node-gyp-build - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + ]; env.PYTHON = "${python3}/bin/python"; @@ -112,6 +111,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.all; - broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch b/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch index 240e0000695f..0cb82e17f77b 100644 --- a/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch +++ b/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch @@ -1,29 +1,14 @@ -diff --git c/package.json i/package.json -index 7f0fbdf7..3b5f5607 100644 ---- c/package.json -+++ i/package.json -@@ -62,5 +62,10 @@ - }, - "optionalDependencies": { - "osx-temperature-sensor": "^1.0.8" -+ }, -+ "pnpm": { -+ "patchedDependencies": { -+ "next": "patches/next.patch" -+ } - } - } diff --git c/patches/next.patch i/patches/next.patch new file mode 100644 -index 00000000..6280dbfa +index 00000000..f4e808ed --- /dev/null +++ i/patches/next.patch @@ -0,0 +1,13 @@ +diff --git a/dist/server/lib/incremental-cache/file-system-cache.js b/dist/server/lib/incremental-cache/file-system-cache.js -+index ac711f168d85032d43cfa2b6872655d571596a7b..ee1f79868d38ae623b0599e8cc3b9e03697833e5 100644 ++index cbf9f0ce142ecf2202ec957ccb5dffc7d176bed7..6a19329d33e471e9d49b4a80ccb712ab5b6f39a6 100644 +--- a/dist/server/lib/incremental-cache/file-system-cache.js ++++ b/dist/server/lib/incremental-cache/file-system-cache.js -+@@ -23,7 +23,7 @@ class FileSystemCache { ++@@ -24,7 +24,7 @@ class FileSystemCache { + constructor(ctx){ + this.fs = ctx.fs; + this.flushToDisk = ctx.flushToDisk; @@ -33,7 +18,7 @@ index 00000000..6280dbfa + this.debug = !!process.env.NEXT_PRIVATE_DEBUG_CACHE; + if (ctx.maxMemoryCacheSize) { diff --git c/pnpm-lock.yaml i/pnpm-lock.yaml -index 2848e239..3c0e760a 100644 +index 170e380e..a6b1df1b 100644 --- c/pnpm-lock.yaml +++ i/pnpm-lock.yaml @@ -4,6 +4,11 @@ settings: @@ -42,7 +27,7 @@ index 2848e239..3c0e760a 100644 +patchedDependencies: + next: -+ hash: 2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49 ++ hash: 183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f + path: patches/next.patch + importers: @@ -51,13 +36,13 @@ index 2848e239..3c0e760a 100644 @@ -52,10 +57,10 @@ importers: version: 1.2.2 next: - specifier: ^15.2.3 -- version: 15.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -+ version: 15.2.3(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^15.2.4 +- version: 15.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ++ version: 15.2.4(patch_hash=183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) next-i18next: specifier: ^12.1.0 -- version: 12.1.0(next@15.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -+ version: 12.1.0(next@15.2.3(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) +- version: 12.1.0(next@15.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ++ version: 12.1.0(next@15.2.4(patch_hash=183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ping: specifier: ^0.4.4 version: 0.4.4 @@ -72,7 +57,7 @@ index 2848e239..3c0e760a 100644 devDependencies: '@tailwindcss/forms': specifier: ^0.5.10 -@@ -151,6 +152,10 @@ importers: +@@ -154,6 +155,10 @@ importers: typescript: specifier: ^5.7.3 version: 5.7.3 @@ -83,29 +68,37 @@ index 2848e239..3c0e760a 100644 packages: -@@ -4695,7 +4700,7 @@ snapshots: +@@ -4905,7 +4910,7 @@ snapshots: natural-compare@1.4.0: {} -- next-i18next@12.1.0(next@15.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): -+ next-i18next@12.1.0(next@15.2.3(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): +- next-i18next@12.1.0(next@15.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ++ next-i18next@12.1.0(next@15.2.4(patch_hash=183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.9 '@types/hoist-non-react-statics': 3.3.6 -@@ -4703,14 +4708,14 @@ snapshots: +@@ -4913,14 +4918,14 @@ snapshots: hoist-non-react-statics: 3.3.2 i18next: 21.10.0 i18next-fs-backend: 1.2.0 -- next: 15.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -+ next: 15.2.3(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) +- next: 15.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ++ next: 15.2.4(patch_hash=183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-i18next: 11.18.6(i18next@21.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) transitivePeerDependencies: - react-dom - react-native -- next@15.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1): -+ next@15.2.3(patch_hash=2cf73b70a6661c14b83ebd01d193260f13fcc654e74e5658ffc191f538863a49)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): +- next@15.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ++ next@15.2.4(patch_hash=183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@next/env': 15.2.3 + '@next/env': 15.2.4 '@swc/counter': 0.1.3 +diff --git c/pnpm-workspace.yaml i/pnpm-workspace.yaml +new file mode 100644 +index 00000000..fc500af5 +--- /dev/null ++++ i/pnpm-workspace.yaml +@@ -0,0 +1,2 @@ ++patchedDependencies: ++ next: patches/next.patch diff --git a/pkgs/by-name/ho/homepage-dashboard/update.sh b/pkgs/by-name/ho/homepage-dashboard/update.sh index e8f0ced770c5..55ca003e8e23 100755 --- a/pkgs/by-name/ho/homepage-dashboard/update.sh +++ b/pkgs/by-name/ho/homepage-dashboard/update.sh @@ -34,12 +34,12 @@ update_homepage_dashboard_source() { local version; version="$1" echo "Updating homepage-dashboard source" - old_hash="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.src.outputHash" | jq -r)" old_version="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.version" | jq -r)" - new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs/default.nix {}).homepage-dashboard.src; in (src.overrideAttrs or (f: src // f src)) (_: { version = \"$version\"; outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true - - sed -i "s|${old_hash}|${new_hash}|g" package.nix sed -i "s|${old_version}|${version}|g" package.nix + + old_hash="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.src.outputHash" | jq -r)" + new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs/default.nix {}).homepage-dashboard.src; in (src.overrideAttrs or (f: src // f src)) (_: { version = \"$version\"; outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true + sed -i "s|${old_hash}|${new_hash}|g" package.nix } # Update the hash of the homepage-dashboard pnpm dependencies in the Nix expression. diff --git a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch index 5634f03dfb79..2320b53976cf 100644 --- a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch +++ b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch @@ -12,21 +12,20 @@ Signed-off-by: Christoph Heiss 3 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 patches/sass-embedded.patch -diff --git a/package.json b/package.json -index 87e57b9..723e0b6 100644 ---- a/package.json -+++ b/package.json -@@ -28,5 +28,10 @@ - "vite-plugin-pwa": "^0.21.1" - }, +diff --git i/package.json w/package.json +index 897b42e..7a91a85 100644 +--- i/package.json ++++ w/package.json +@@ -32,6 +32,9 @@ "license": "Apache-2.0", -- "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0" -+ "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0", -+ "pnpm": { + "packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af", + "pnpm": { +- "neverBuiltDependencies": [] ++ "neverBuiltDependencies": [], + "patchedDependencies": { + "sass-embedded": "patches/sass-embedded.patch" + } -+ } + } } diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch new file mode 100644 @@ -49,10 +48,10 @@ index 0000000..f941a8e + const platform = process.platform === 'linux' && isLinuxMusl(process.execPath) + ? 'linux-musl' + : process.platform; -diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml -index f347757..d054bea 100644 ---- a/pnpm-lock.yaml -+++ b/pnpm-lock.yaml +diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml +index 5df58fb..bb27c4b 100644 +--- i/pnpm-lock.yaml ++++ w/pnpm-lock.yaml @@ -4,6 +4,11 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false @@ -65,80 +64,79 @@ index f347757..d054bea 100644 importers: .: -@@ -26,7 +31,7 @@ importers: - devDependencies: +@@ -29,7 +34,7 @@ importers: + version: 9.21.0 '@vitejs/plugin-vue': specifier: ^5.2.1 -- version: 5.2.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13) -+ version: 5.2.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13) +- version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13) ++ version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13) '@vue/eslint-config-prettier': specifier: ^10.2.0 - version: 10.2.0(eslint@9.19.0)(prettier@3.4.2) -@@ -44,13 +49,13 @@ importers: - version: 3.4.2 + version: 10.2.0(eslint@9.21.0)(prettier@3.5.2) +@@ -50,13 +55,13 @@ importers: + version: 3.5.2 sass-embedded: - specifier: ^1.83.4 -- version: 1.83.4 -+ version: 1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) + specifier: ^1.85.0 +- version: 1.85.0 ++ version: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) vite: - specifier: ^6.0.11 -- version: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) -+ version: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) + specifier: ^6.1.3 +- version: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0) ++ version: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0) vite-plugin-pwa: specifier: ^0.21.1 -- version: 0.21.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0) -+ version: 0.21.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0) +- version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0) ++ version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0) packages: -@@ -3683,9 +3688,9 @@ snapshots: +@@ -3477,9 +3482,9 @@ snapshots: '@types/trusted-types@2.0.7': {} -- '@vitejs/plugin-vue@5.2.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13)': -+ '@vitejs/plugin-vue@5.2.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13)': +- '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)': ++ '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)': dependencies: -- vite: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) -+ vite: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) +- vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0) ++ vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0) vue: 3.5.13 '@vue/compiler-core@3.5.13': -@@ -4965,7 +4970,7 @@ snapshots: - sass-embedded-win32-x64@1.83.4: +@@ -4702,7 +4707,7 @@ snapshots: + sass-embedded-win32-x64@1.85.0: optional: true -- sass-embedded@1.83.4: -+ sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi): +- sass-embedded@1.85.0: ++ sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi): dependencies: - '@bufbuild/protobuf': 2.2.0 + '@bufbuild/protobuf': 2.2.3 buffer-builder: 0.2.0 -@@ -5286,18 +5291,18 @@ snapshots: +@@ -5001,25 +5006,25 @@ snapshots: varint@6.0.0: {} -- vite-plugin-pwa@0.21.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0): -+ vite-plugin-pwa@0.21.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0): +- vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0): ++ vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0): dependencies: - debug: 4.3.7 + debug: 4.4.0 pretty-bytes: 6.1.1 - tinyglobby: 0.2.10 -- vite: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) -+ vite: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) - workbox-build: 7.1.0 - workbox-window: 7.1.0 + tinyglobby: 0.2.12 +- vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0) ++ vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0) + workbox-build: 7.3.0 + workbox-window: 7.3.0 transitivePeerDependencies: - supports-color -- vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0): -+ vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0): +- vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0): ++ vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0): dependencies: esbuild: 0.24.2 - postcss: 8.5.1 -@@ -5305,7 +5310,7 @@ snapshots: + postcss: 8.5.3 + rollup: 4.38.0 optionalDependencies: fsevents: 2.3.3 - sass: 1.79.5 -- sass-embedded: 1.83.4 -+ sass-embedded: 1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) - terser: 5.37.0 +- sass-embedded: 1.85.0 ++ sass-embedded: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) + terser: 5.39.0 yaml: 2.7.0 diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix index eaad9c42bd8f..0579e37fbd94 100644 --- a/pkgs/by-name/ho/homer/package.nix +++ b/pkgs/by-name/ho/homer/package.nix @@ -10,12 +10,12 @@ }: stdenvNoCC.mkDerivation rec { pname = "homer"; - version = "25.02.1"; + version = "25.04.1"; src = fetchFromGitHub { owner = "bastienwirtz"; repo = "homer"; rev = "v${version}"; - hash = "sha256-Fh6qV2eU7VRskbPun7OcJmqgjILVE8w5lV70xH6znmc="; + hash = "sha256-hvDrFGv6Mht9whA2lJbDLQnP2LkOiCo3NtjMpWr/q6A="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { src patches ; - hash = "sha256-qeMmPI2B5FW82qLVtbREDjQh76THMCOZRQCM0DgvCqI="; + hash = "sha256-y1R+rlaOtFOHHAgEHPBl40536U10Ft0iUSfGcfXS08Y="; }; # Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable. diff --git a/pkgs/by-name/ho/honcho/package.nix b/pkgs/by-name/ho/honcho/package.nix index d60201187883..4e6ec490dd5b 100644 --- a/pkgs/by-name/ho/honcho/package.nix +++ b/pkgs/by-name/ho/honcho/package.nix @@ -4,22 +4,22 @@ python3Packages, }: -let - pname = "honcho"; -in - python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; - version = "1.1.0"; + pname = "honcho"; + version = "2.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "nickstenning"; repo = "honcho"; - rev = "v${version}"; - sha256 = "1y0r8dw4pqcq7r4n58ixjdg1iy60lp0gxsd7d2jmhals16ij71rj"; + tag = "v${version}"; + hash = "sha256-hXPoqxK9jzCn7KrQ6zH0E/3YVC60OSoiUx6654+bhhw="; }; - propagatedBuildInputs = [ python3Packages.setuptools ]; + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; nativeCheckInputs = with python3Packages; [ jinja2 @@ -33,16 +33,18 @@ python3Packages.buildPythonApplication rec { checkPhase = '' runHook preCheck + PATH=$out/bin:$PATH coverage run -m pytest + runHook postCheck ''; - meta = with lib; { + meta = { description = "Python clone of Foreman, a tool for managing Procfile-based applications"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/nickstenning/honcho"; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ benley ]; + platforms = lib.platforms.unix; mainProgram = "honcho"; }; } diff --git a/pkgs/by-name/ho/honeymarker/package.nix b/pkgs/by-name/ho/honeymarker/package.nix new file mode 100644 index 000000000000..24ee5c7b9519 --- /dev/null +++ b/pkgs/by-name/ho/honeymarker/package.nix @@ -0,0 +1,24 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "honeymarker"; + version = "0.2.12"; + vendorHash = "sha256-jtDjy8Y2S5/Ujtv+dtoRZ4SP66sSP7yer97fwdNZEpg="; + + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeymarker"; + rev = "v${version}"; + hash = "sha256-28NCAtx3MHlwm44IUlI0DzUaycH9cPN8ZdEhhQtdciU="; + }; + + meta = with lib; { + description = "provides a simple CRUD interface for dealing with per-dataset markers on honeycomb.io"; + homepage = "https://honeycomb.io/"; + license = licenses.asl20; + maintainers = [ maintainers.iand675 ]; + }; +} diff --git a/pkgs/by-name/ho/honeytail/package.nix b/pkgs/by-name/ho/honeytail/package.nix new file mode 100644 index 000000000000..f6b6ea561fd0 --- /dev/null +++ b/pkgs/by-name/ho/honeytail/package.nix @@ -0,0 +1,24 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "honeytail"; + version = "1.6.0"; + vendorHash = "sha256-LtiiLGLjhbfT49A6Fw5CbSbnmTHMxtcUssr+ayCVrvY="; + + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeytail"; + rev = "v${version}"; + hash = "sha256-S0hIgNNzF1eNe+XJs+PT7EUIl5oJCXu+B/zQago4sf8="; + }; + + meta = with lib; { + description = "agent for ingesting log file data into honeycomb.io and making it available for exploration"; + homepage = "https://honeycomb.io/"; + license = licenses.asl20; + maintainers = [ maintainers.iand675 ]; + }; +} diff --git a/pkgs/by-name/ho/honeyvent/package.nix b/pkgs/by-name/ho/honeyvent/package.nix new file mode 100644 index 000000000000..565b91987fea --- /dev/null +++ b/pkgs/by-name/ho/honeyvent/package.nix @@ -0,0 +1,24 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "honeyvent"; + version = "1.1.3"; + vendorHash = null; + + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeyvent"; + rev = "v${version}"; + hash = "sha256-L8hM4JJDDfVv/0O8H3lcI0SRVjDMYC82HG/4WU6Vim8="; + }; + + meta = with lib; { + description = "CLI for sending individual events to honeycomb.io"; + homepage = "https://honeycomb.io/"; + license = licenses.asl20; + maintainers = [ maintainers.iand675 ]; + }; +} diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index b89768148e9e..11fed297344e 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -8,25 +8,27 @@ let pname = "hoppscotch"; - version = "25.1.1-0"; + version = "25.4.2-0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-1KYc96WUlybXhgPeT97w1mLE2zxmohIhvNMCmEb5Vf0="; + hash = "sha256-f3Ar5QUm1MJ/kfLRsjxAU1mudpJhU63uxEdu17Y2rmo="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-wdqgzTXFL7Dvq1DOrjyPE4O3OYfpvmRSLzk+HBJIaTU="; + hash = "sha256-Q21XD+LWx6b/2e4qUabDpjxaJ7h1yz2T4ZbyIDWAljE="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-M9fQx4NBotLPe8i43E1uqHpFeoXdHGQePp4zgzbzDdM="; + hash = "sha256-Y+zvpTfsVwvM8clyTeE8bFCJfsOTJkkGOWzzVQtZrYI="; }; } - .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + passthru.updateScript = ./update.sh; meta = { description = "Open source API development ecosystem"; @@ -56,6 +58,7 @@ if stdenv.hostPlatform.isDarwin then pname version src + passthru meta ; @@ -78,6 +81,7 @@ else pname version src + passthru meta ; @@ -87,7 +91,9 @@ else in '' # Install .desktop files - install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps + install -Dm444 ${appimageContents}/Hoppscotch.desktop $out/share/applications/hoppscotch.desktop + install -Dm444 ${appimageContents}/Hoppscotch.png $out/share/pixmaps/hoppscotch.png + substituteInPlace $out/share/applications/hoppscotch.desktop \ + --replace-fail "hoppscotch-desktop" "hoppscotch" ''; } diff --git a/pkgs/by-name/ho/hoppscotch/update.sh b/pkgs/by-name/ho/hoppscotch/update.sh new file mode 100755 index 000000000000..aaa4fc97b59a --- /dev/null +++ b/pkgs/by-name/ho/hoppscotch/update.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix-update common-updater-scripts nix jq + +set -euo pipefail + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; hoppscotch.version or (lib.getVersion hoppscotch)" | tr -d '"') +latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/hoppscotch/releases/releases/latest | jq --raw-output .tag_name | sed 's/^v//') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +update-source-version hoppscotch $latestVersion || true + +for system in \ + x86_64-linux \ + x86_64-darwin \ + aarch64-darwin; do + hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; hoppscotch.src.url" --system "$system" | tr -d '"'))) + update-source-version hoppscotch $latestVersion $hash --system=$system --ignore-same-version +done diff --git a/pkgs/by-name/ho/hors/package.nix b/pkgs/by-name/ho/hors/package.nix new file mode 100644 index 000000000000..df6adfb63088 --- /dev/null +++ b/pkgs/by-name/ho/hors/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "hors"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "windsoilder"; + repo = pname; + rev = "v${version}"; + sha256 = "1q17i8zg7dwd8al42wfnkn891dy5hdhw4325plnihkarr50avbr0"; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-JTHgOEBpGXPO3C7YUbBF0LFeSUQK+R2w1LugwMV5xyU="; + + # requires network access + doCheck = false; + + meta = with lib; { + description = "Instant coding answers via the command line"; + mainProgram = "hors"; + homepage = "https://github.com/windsoilder/hors"; + changelog = "https://github.com/WindSoilder/hors/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/by-name/ho/hot-resize/package.nix b/pkgs/by-name/ho/hot-resize/package.nix index 54d6837f44eb..62fa18e466ea 100644 --- a/pkgs/by-name/ho/hot-resize/package.nix +++ b/pkgs/by-name/ho/hot-resize/package.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ho/hours/package.nix b/pkgs/by-name/ho/hours/package.nix new file mode 100644 index 000000000000..48c2ab726889 --- /dev/null +++ b/pkgs/by-name/ho/hours/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + stdenv, +}: + +buildGoModule (finalAttrs: { + pname = "hours"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "dhth"; + repo = "hours"; + tag = "v${finalAttrs.version}"; + hash = "sha256-B9M02THTCrr7ylbbflpkpTFMuoIwV2O0PQKOKbyxYPg="; + }; + + vendorHash = "sha256-5lhn0iTLmXUsaedvtyaL3qWLosmQaQVq5StMDl7pXXI="; + + doCheck = !stdenv.hostPlatform.isDarwin; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "No-frills time tracking toolkit for command line nerds"; + homepage = "https://github.com/dhth/hours"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ilarvne ]; + platforms = lib.platforms.unix; + mainProgram = "hours"; + }; +}) diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix index 5b75315c16e7..12ace2d35cbc 100644 --- a/pkgs/by-name/hp/hplip/package.nix +++ b/pkgs/by-name/hp/hplip/package.nix @@ -35,16 +35,16 @@ let pname = "hplip"; - version = "3.24.4"; + version = "3.25.2"; src = fetchurl { url = "mirror://sourceforge/hplip/${pname}-${version}.tar.gz"; - hash = "sha256-XXZDgxiTpeKt351C1YGl2/5arwI2Johrh2LFZF2g8fs="; + hash = "sha256-6HL/KOslF3Balfbhg576HlCnejOq6JBSeN8r2CCRllM="; }; plugin = fetchurl { url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${pname}-${version}-plugin.run"; - hash = "sha256-Hzxr3SVmGoouGBU2VdbwbwKMHZwwjWnI7P13Z6LQxao="; + hash = "sha256-miz41WYehGVI27tZUjGlRIpctjcpzJPfjR9lLf0WelQ="; }; hplipState = replaceVars ./hplip.state { @@ -161,8 +161,8 @@ python3Packages.buildPythonApplication { postPatch = '' # https://github.com/NixOS/nixpkgs/issues/44230 substituteInPlace createPPD.sh \ - --replace ppdc "${cups}/bin/ppdc" \ - --replace "gzip -c" "gzip -cn" + --replace-fail ppdc "${cups}/bin/ppdc" \ + --replace-fail "gzip -c" "gzip -cn" # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ @@ -223,6 +223,7 @@ python3Packages.buildPythonApplication { "policykit_dir=${out}/share/polkit-1/actions" "policykit_dbus_etcdir=${out}/etc/dbus-1/system.d" "policykit_dbus_sharedir=${out}/share/dbus-1/system-services" + "PYTHONEXECDIR=${out}/lib/python${lib.versions.majorMinor python3Packages.python.version}/site-packages" "hplip_confdir=${out}/etc/hp" "hplip_statedir=${out}/var/lib/hp" ]; @@ -347,15 +348,15 @@ python3Packages.buildPythonApplication { "lib/sane" ]; - meta = with lib; { + meta = { description = "Print, scan and fax HP drivers for Linux"; homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; license = if withPlugin then - licenses.unfree + lib.licenses.unfree else - with licenses; + with lib.licenses; [ mit bsd2 @@ -368,6 +369,6 @@ python3Packages.buildPythonApplication { "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/by-name/hq/hqplayerd/rygel.nix b/pkgs/by-name/hq/hqplayerd/rygel.nix index 23c4d6dd5a70..13e6d13a01aa 100644 --- a/pkgs/by-name/hq/hqplayerd/rygel.nix +++ b/pkgs/by-name/hq/hqplayerd/rygel.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { description = "Home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; homepage = "https://gitlab.gnome.org/GNOME/rygel"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index 9e4cc9f9eec2..bc3ec4f995cc 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -5,7 +5,6 @@ pkg-config, openssl, stdenv, - darwin, coreutils, gnome-keyring, libsecret, @@ -44,10 +43,6 @@ rustPlatform.buildRustPackage { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gnome-keyring - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; postPatch = '' diff --git a/pkgs/by-name/ht/htcondor/package.nix b/pkgs/by-name/ht/htcondor/package.nix index 64cfb8bb516e..1474ea8dfa38 100644 --- a/pkgs/by-name/ht/htcondor/package.nix +++ b/pkgs/by-name/ht/htcondor/package.nix @@ -62,7 +62,8 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.asl20; maintainers = with maintainers; [ evey ]; - # cannot find -lpthread: No such file or directory - broken = stdenv.hostPlatform.isAarch64; + # On Aarch64: ld: cannot find -lpthread: No such file or directory + # On x86_64: ld: cannot find -ldl: No such file or directory + broken = true; }; } diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix index 75b67969093a..b40ad82713d6 100644 --- a/pkgs/by-name/ht/htgettoken/package.nix +++ b/pkgs/by-name/ht/htgettoken/package.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "htgettoken"; - version = "2.2"; + version = "2.2-2"; src = fetchFromGitHub { owner = "fermitools"; repo = pname; tag = "v${version}"; - hash = "sha256-O0OHnYaoTkqUqD4s+wEAzN3Paq9qsjBZdZ0QUXdFefE="; + hash = "sha256-BHDLDAbssDCU59nUAVjKo1cCkXoht1lB+2BA6mGbDFU="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/ht/html-minifier/package.nix b/pkgs/by-name/ht/html-minifier/package.nix index 81bf3e65fdf8..45d4e247bebb 100644 --- a/pkgs/by-name/ht/html-minifier/package.nix +++ b/pkgs/by-name/ht/html-minifier/package.nix @@ -19,6 +19,10 @@ buildNpmPackage rec { npmFlags = [ "--ignore-scripts" ]; + postInstall = '' + find $out/lib/node_modules -xtype l -delete + ''; + dontNpmBuild = true; meta = { diff --git a/pkgs/by-name/ht/html2pdf/package.nix b/pkgs/by-name/ht/html2pdf/package.nix new file mode 100644 index 000000000000..2e5b249857ac --- /dev/null +++ b/pkgs/by-name/ht/html2pdf/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + makeWrapper, + chromium, + withChromium ? (lib.meta.availableOn stdenv.hostPlatform chromium), + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "html2pdf"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "ilaborie"; + repo = "html2pdf"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Z1fb7pDjawMIhJgl4ao2VoV6zpfcGy/48Dt7JtIxgJo="; + }; + + cargoHash = "sha256-T5A2b7Qcg8dQKndaD8P5RAutBZeINOqIBUHR2VDOeo0="; + + # Avoiding "rustfmt not found" error in auto_generate_cdp. + # ref: https://github.com/mdrokz/auto_generate_cdp/pull/8 + env.DO_NOT_FORMAT = "true"; + + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = lib.optionalString withChromium ( + let + runtimeInputs = [ + chromium + ]; + in + '' + wrapProgram "$out/bin/html2pdf" --prefix PATH : '${lib.makeBinPath runtimeInputs}' + '' + ); + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI tool to convert local HTML files to PDF"; + homepage = "https://github.com/ilaborie/html2pdf"; + changelog = "https://github.com/ilaborie/html2pdf/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "html2pdf"; + }; +}) diff --git a/pkgs/applications/misc/html5validator/default.nix b/pkgs/by-name/ht/html5validator/package.nix similarity index 100% rename from pkgs/applications/misc/html5validator/default.nix rename to pkgs/by-name/ht/html5validator/package.nix diff --git a/pkgs/by-name/ht/htmldoc/package.nix b/pkgs/by-name/ht/htmldoc/package.nix new file mode 100644 index 000000000000..6f5e643826c2 --- /dev/null +++ b/pkgs/by-name/ht/htmldoc/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + testers, + fetchFromGitHub, + zlib, + cups, + libpng, + libjpeg, + pkg-config, + htmldoc, +}: + +stdenv.mkDerivation rec { + pname = "htmldoc"; + version = "1.9.20"; + src = fetchFromGitHub { + owner = "michaelrsweet"; + repo = "htmldoc"; + rev = "v${version}"; + hash = "sha256-nEDvG2Q6uMYWyb49EKOZimkOfEavCjvfFgucwi3u64k="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + zlib + cups + libpng + libjpeg + ]; + + # do not generate universal binary on Darwin + # because it is not supported by Nix's clang + postPatch = '' + substituteInPlace configure --replace-fail "-arch x86_64 -arch arm64" "" + ''; + + passthru.tests = testers.testVersion { + package = htmldoc; + command = "htmldoc --version"; + }; + + meta = with lib; { + description = "Converts HTML files to PostScript and PDF"; + homepage = "https://michaelrsweet.github.io/htmldoc"; + changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}"; + license = licenses.gpl2Only; + maintainers = [ ]; + platforms = platforms.unix; + + longDescription = '' + HTMLDOC is a program that reads HTML source files or web pages and + generates corresponding HTML, PostScript, or PDF files with an optional + table of contents. + ''; + mainProgram = "htmldoc"; + }; +} diff --git a/pkgs/by-name/ht/htmlq/package.nix b/pkgs/by-name/ht/htmlq/package.nix new file mode 100644 index 000000000000..a4f68c8a285a --- /dev/null +++ b/pkgs/by-name/ht/htmlq/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "htmlq"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "mgdm"; + repo = "htmlq"; + rev = "v${version}"; + sha256 = "sha256-kZtK2QuefzfxxuE1NjXphR7otr+RYfMif/RSpR6TxY0="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-QUlR6PuOLbeAHzARtTo7Zn7fmjs2ET6TdXT4VgCYEVg="; + + doCheck = false; + + meta = with lib; { + description = "Like jq, but for HTML"; + homepage = "https://github.com/mgdm/htmlq"; + license = licenses.mit; + maintainers = with maintainers; [ + siraben + nerdypepper + ]; + mainProgram = "htmlq"; + }; +} diff --git a/pkgs/by-name/ht/htop-vim/package.nix b/pkgs/by-name/ht/htop-vim/package.nix index 937d212c37eb..b10a23cc8c62 100644 --- a/pkgs/by-name/ht/htop-vim/package.nix +++ b/pkgs/by-name/ht/htop-vim/package.nix @@ -6,7 +6,6 @@ autoreconfHook, pkg-config, ncurses, - darwin, libcap, libnl, sensorsSupport ? stdenv.hostPlatform.isLinux, @@ -53,7 +52,6 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.IOKit ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libnl diff --git a/pkgs/by-name/ht/htop/package.nix b/pkgs/by-name/ht/htop/package.nix new file mode 100644 index 000000000000..ad416c4b77bb --- /dev/null +++ b/pkgs/by-name/ht/htop/package.nix @@ -0,0 +1,87 @@ +{ + lib, + fetchFromGitHub, + stdenv, + autoreconfHook, + pkg-config, + ncurses, + libcap, + libnl, + sensorsSupport ? stdenv.hostPlatform.isLinux, + lm_sensors, + systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, + systemd, +}: + +assert systemdSupport -> stdenv.hostPlatform.isLinux; + +stdenv.mkDerivation rec { + pname = "htop"; + version = "3.4.1"; + + src = fetchFromGitHub { + owner = "htop-dev"; + repo = pname; + rev = version; + hash = "sha256-fVqQwXbJus2IVE1Bzf3yJJpKK4qcZN/SCTX1XYkiHhU="; + }; + + # upstream removed pkg-config support and uses dlopen now + postPatch = + let + libnlPath = lib.getLib libnl; + in + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace configure.ac \ + --replace-fail /usr/include/libnl3 ${lib.getDev libnl}/include/libnl3 + substituteInPlace linux/LibNl.c \ + --replace-fail libnl-3.so ${libnlPath}/lib/libnl-3.so \ + --replace-fail libnl-genl-3.so ${libnlPath}/lib/libnl-genl-3.so + ''; + + nativeBuildInputs = [ autoreconfHook ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config; + + buildInputs = + [ ncurses ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libcap + libnl + ] + ++ lib.optional sensorsSupport lm_sensors + ++ lib.optional systemdSupport systemd; + + configureFlags = + [ + "--enable-unicode" + "--sysconfdir=/etc" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "--enable-affinity" + "--enable-capabilities" + "--enable-delayacct" + ] + ++ lib.optional sensorsSupport "--enable-sensors"; + + postFixup = + let + optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop"; + in + lib.optionalString (!stdenv.hostPlatform.isStatic) '' + ${optionalPatch sensorsSupport "${lib.getLib lm_sensors}/lib/libsensors.so"} + ${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"} + ''; + + meta = with lib; { + description = "Interactive process viewer"; + homepage = "https://htop.dev"; + license = licenses.gpl2Only; + platforms = platforms.all; + maintainers = with maintainers; [ + rob + relrod + SuperSandro2000 + ]; + changelog = "https://github.com/htop-dev/htop/blob/${version}/ChangeLog"; + mainProgram = "htop"; + }; +} diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index c1458d5b16b9..4df4be1898aa 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.46.6"; + version = "0.47.0"; src = fetchFromGitHub { owner = "kimono-koans"; repo = "httm"; rev = version; - hash = "sha256-QMw5FrI5GCaUrUPaxqGDBtz7RPcCFQn+jntmyertzhM="; + hash = "sha256-vB0gdIDa5E9K5/IPPq+XVPzHHLXSMOJqVFUgYf+qdt8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dIF3Qi8rK+H07x4uhi8uXs1Pdr8p3KIkVUrXqEQpCsc="; + cargoHash = "sha256-BTKXhDwJkAXpqVYECr1640mgsr08E7H6Ap6qOrXdyYU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ht/http-prompt/package.nix b/pkgs/by-name/ht/http-prompt/package.nix index 27b5ca13a301..48277e40c773 100644 --- a/pkgs/by-name/ht/http-prompt/package.nix +++ b/pkgs/by-name/ht/http-prompt/package.nix @@ -70,7 +70,7 @@ python.pkgs.buildPythonApplication rec { "test_vi_mode" ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Interactive command-line HTTP client featuring autocomplete and syntax highlighting"; diff --git a/pkgs/by-name/ht/httplz/package.nix b/pkgs/by-name/ht/httplz/package.nix index 391b4f400bc9..695d17726b38 100644 --- a/pkgs/by-name/ht/httplz/package.nix +++ b/pkgs/by-name/ht/httplz/package.nix @@ -7,8 +7,6 @@ pkg-config, ronn, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -31,11 +29,7 @@ rustPlatform.buildRustPackage rec { ronn ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ openssl ]; cargoBuildFlags = [ "--bin" diff --git a/pkgs/by-name/ht/httptap/package.nix b/pkgs/by-name/ht/httptap/package.nix index 547ac3ce14d9..8d8f15cd4c3e 100644 --- a/pkgs/by-name/ht/httptap/package.nix +++ b/pkgs/by-name/ht/httptap/package.nix @@ -2,37 +2,24 @@ lib, buildGoModule, fetchFromGitHub, - fetchpatch, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "httptap"; - version = "0.0.8"; + version = "0.1.1"; src = fetchFromGitHub { owner = "monasticacademy"; repo = "httptap"; - tag = "v${version}"; - hash = "sha256-1BtV5ao5dAKSINdUdJD/wxTMFXXiP8Vy1A7gQfVIsUQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Cn5u6q0r06SJp4uhF7j5K6yNZv8Q3WNxlDd5Vxmshhw="; }; - patches = [ - # this patch updates go.mod to include missing dependencies - # https://github.com/monasticacademy/httptap/pull/13 - (fetchpatch { - name = "update-go-mod"; - url = "https://github.com/monasticacademy/httptap/commit/3b520725c784d6435be6a51c58ae847bae729962.patch"; - hash = "sha256-0dPq0Ldu1m8YZKctFtoUcbQdmx6sqjA8EVhTeMwNWx8="; - }) - ]; - - vendorHash = "sha256-+TtHw2KdeNHCgnMnkxJJ9shqsrlbeTzYwbPH0dJmCjM="; + vendorHash = "sha256-yTtUt+kfDwN6W4caHCAYFjpYzhaqZUbLe+Nz7JKAXu8="; env.CGO_ENABLED = 0; - subPackages = [ - "." - ]; + subPackages = [ "." ]; ldflags = [ "-s" @@ -46,4 +33,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ jpetrucciani ]; mainProgram = "httptap"; }; -} +}) diff --git a/pkgs/by-name/ht/httpx/package.nix b/pkgs/by-name/ht/httpx/package.nix index 108db308b234..4c8b7761c8c4 100644 --- a/pkgs/by-name/ht/httpx/package.nix +++ b/pkgs/by-name/ht/httpx/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.6.10"; + version = "1.7.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; tag = "v${version}"; - hash = "sha256-lU5LtYFnWJu4yZTqdJFqLnaAUOQ3Nc2EaNPrvTxoW3Q="; + hash = "sha256-V4OTIUm7KSUSKgQczkOtIw8HlkLEMgvX53a4caQP5IU="; }; - vendorHash = "sha256-+m0TPKIBCnRfswrMw9+w1r/pWaRmkI+s0RRbv5X5GBo="; + vendorHash = "sha256-lwk/ajywAJ969U5gpYQgIg8+u1xKARFH+HTk2+OgY4A="; subPackages = [ "cmd/httpx" ]; @@ -32,7 +32,7 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = [ "-version" ]; + versionCheckProgramArg = "-version"; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/pkgs/by-name/ht/httpyac/package.nix b/pkgs/by-name/ht/httpyac/package.nix index 55bc9b0ab6be..df8d7f93362d 100644 --- a/pkgs/by-name/ht/httpyac/package.nix +++ b/pkgs/by-name/ht/httpyac/package.nix @@ -8,21 +8,21 @@ buildNpmPackage rec { pname = "httpyac"; - version = "6.16.6"; + version = "6.16.7"; src = fetchFromGitHub { owner = "anweber"; repo = "httpyac"; tag = version; - hash = "sha256-JsrGoUZKo5/qjH+GKm5FBY19NE6KN7NhLpPvM8Cw97U="; + hash = "sha256-6qhKOb2AJrDhZLRU6vrDfuW9KED+5TLf4hHH/0iADeA="; }; - npmDepsHash = "sha256-08RJ1lLIaTXi3JHGIFR44GbEqOGez7+VFQGlejZqgAI="; + npmDepsHash = "sha256-X3Yz+W7lijOLP+tEuO0JOpeOMOGdUYN6OpxPYHwFQEo="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hu/hubble/package.nix b/pkgs/by-name/hu/hubble/package.nix index 8e540d015303..6bf3874fd9ff 100644 --- a/pkgs/by-name/hu/hubble/package.nix +++ b/pkgs/by-name/hu/hubble/package.nix @@ -1,58 +1,60 @@ { + stdenv, lib, buildGo124Module, fetchFromGitHub, installShellFiles, + versionCheckHook, }: buildGo124Module rec { pname = "hubble"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "cilium"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-ZrLb2dITQPd9g4azlidpTHFWNwop0AMKEIzwMX1Y7Jw="; + repo = "hubble"; + tag = "v${version}"; + hash = "sha256-ZkowUftSEGo+UjYM+kk3tQJc8QJgoJATeIKPwu2ikQ4="; }; + nativeBuildInputs = [ + installShellFiles + ]; + vendorHash = null; ldflags = [ "-s" "-w" - "-X github.com/cilium/cilium/hubble/pkg.GitBranch=none" - "-X github.com/cilium/cilium/hubble/pkg.GitHash=none" - "-X github.com/cilium/cilium/hubble/pkg.Version=${version}" + "-X=github.com/cilium/cilium/hubble/pkg.GitBranch=none" + "-X=github.com/cilium/cilium/hubble/pkg.GitHash=none" + "-X=github.com/cilium/cilium/hubble/pkg.Version=${version}" ]; - # Test fails at Test_getFlowsRequestWithInvalidRawFilters in github.com/cilium/hubble/cmd/observe - # https://github.com/NixOS/nixpkgs/issues/178976 - # https://github.com/cilium/hubble/pull/656 - # https://github.com/cilium/hubble/pull/655 - doCheck = false; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/hubble version | grep ${version} > /dev/null - ''; + doCheck = true; - nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd hubble \ --bash <($out/bin/hubble completion bash) \ --fish <($out/bin/hubble completion fish) \ --zsh <($out/bin/hubble completion zsh) ''; - meta = with lib; { + meta = { description = "Network, Service & Security Observability for Kubernetes using eBPF"; - mainProgram = "hubble"; - license = licenses.asl20; homepage = "https://github.com/cilium/hubble/"; - maintainers = with maintainers; [ + changelog = "https://github.com/cilium/hubble/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ humancalico bryanasdev000 FKouhai ]; + mainProgram = "hubble"; }; } diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 4864cd0322f8..58f0562e701a 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -9,18 +9,18 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.145.0"; + version = "0.147.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; - tag = "v${version}"; - hash = "sha256-5SV6VzNWGnFQBD0fBugS5kKXECvV1ZE7sk7SwJCMbqY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-CLeVT44A9QmkW4OED14I5u0JbafvXFWeaJnsPDukJJ8="; }; - vendorHash = "sha256-aynhBko6ecYyyMG9XO5315kLerWDFZ6V8LQ/WIkvC70="; + vendorHash = "sha256-/XXYKuZNwrBx+Dr4XacDIzTrdELtXYHRjOzjhcBjoK4="; checkFlags = let @@ -69,13 +69,13 @@ buildGoModule rec { versionCheckHook ]; doInstallCheck = true; - versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = [ "version" ]; + versionCheckProgram = "${placeholder "out"}/bin/hugo"; + versionCheckProgramArg = "version"; passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/gohugoio/hugo/releases/tag/v${version}"; + changelog = "https://github.com/gohugoio/hugo/releases/tag/v${finalAttrs.version}"; description = "Fast and modern static website engine"; homepage = "https://gohugo.io"; license = lib.licenses.asl20; @@ -84,8 +84,7 @@ buildGoModule rec { schneefux Br1ght0ne Frostman - kachick federicoschonborn ]; }; -} +}) diff --git a/pkgs/by-name/hu/huion-switcher/package.nix b/pkgs/by-name/hu/huion-switcher/package.nix new file mode 100644 index 000000000000..668543cb4e36 --- /dev/null +++ b/pkgs/by-name/hu/huion-switcher/package.nix @@ -0,0 +1,60 @@ +{ + lib, + nix-update-script, + fetchFromGitHub, + rustPlatform, + udev, + pkg-config, + installShellFiles, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "huion-switcher"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "whot"; + repo = "huion-switcher"; + tag = finalAttrs.version; + hash = "sha256-+cMvBVtJPbsJhEmOh3SEXZrVwp9Uuvx6QmUCcpenS20="; + }; + + buildInputs = [ udev ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-yj55FMdf91ZG95yuMt3dQFhUjYM0/sUfFKB+W+5xEfo="; + + postInstall = '' + mv huion-switcher.{man,1} + installManPage huion-switcher.1 + + # Install 80-huion-switcher.rules + + # Mind the trailing space! We leave the args to huion-switcher in place + substituteInPlace "80-huion-switcher.rules" --replace-fail \ + "IMPORT{program}=\"huion-switcher " \ + "IMPORT{program}=\"$out/bin/huion-switcher " + + install -Dm 0644 -t "$out/lib/udev/rules.d" "80-huion-switcher.rules" + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Utility to switch Huion devices into raw tablet mode"; + homepage = "https://github.com/whot/huion-switcher"; + changelog = "https://github.com/whot/huion-switcher/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + mainProgram = "huion-switcher"; + maintainers = with lib.maintainers; [ dramforever ]; + }; +}) diff --git a/pkgs/by-name/hu/humility/package.nix b/pkgs/by-name/hu/humility/package.nix new file mode 100644 index 000000000000..b6eb5d2183a7 --- /dev/null +++ b/pkgs/by-name/hu/humility/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + libusb1, + libftdi, + cargo-readme, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "humility"; + version = "0-unstable-2025-02-25"; + + nativeBuildInputs = [ + pkg-config + cargo-readme + ]; + buildInputs = [ + libusb1 + libftdi + ]; + + src = fetchFromGitHub { + owner = "oxidecomputer"; + repo = pname; + rev = "4e9b9f9efb455d62b44345b7c8659dcd962c73da"; + sha256 = "sha256-BzLduU2Wu4UhmgDvvuCEXsABO/jPC7AjptDW8/zePEk="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-GZkHPoDKiqTVwRAWXXbELXC1I/KRO+9sshY8/rGbA4A="; + + meta = with lib; { + description = "Debugger for Hubris"; + mainProgram = "humility"; + homepage = "https://github.com/oxidecomputer/humility"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ therishidesai ]; + }; +} diff --git a/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch b/pkgs/by-name/hu/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch similarity index 100% rename from pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch rename to pkgs/by-name/hu/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch diff --git a/pkgs/by-name/hu/hunspell/package.nix b/pkgs/by-name/hu/hunspell/package.nix new file mode 100644 index 000000000000..64e5ad4979fd --- /dev/null +++ b/pkgs/by-name/hu/hunspell/package.nix @@ -0,0 +1,107 @@ +{ + lib, + stdenv, + autoreconfHook, + callPackage, + fetchFromGitHub, + hunspellDicts, + ncurses, + nix-update-script, + readline, + testers, + validatePkgConfig, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hunspell"; + version = "1.7.2"; + + outputs = [ + "bin" + "dev" + "out" + "man" + ]; + + src = fetchFromGitHub { + owner = "hunspell"; + repo = "hunspell"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-x2FXxnVIqsf5/UEQcvchAndXBv/3mW8Z55djQAFgNA8="; + }; + + patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch ]; + + postPatch = '' + patchShebangs tests + ''; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + validatePkgConfig + ]; + + buildInputs = [ + ncurses + readline + ]; + + autoreconfFlags = [ "-vfi" ]; + + configureFlags = [ + "--with-ui" + "--with-readline" + ]; + + hardeningDisable = [ "format" ]; + + passthru = { + tests = { + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + version = testers.testVersion { package = finalAttrs.finalPackage; }; + wrapper = callPackage ./wrapper.nix { + hunspell = finalAttrs.finalPackage; + dicts = [ hunspellDicts.en_US ]; + }; + }; + + updateScript = nix-update-script { }; + }; + + meta = { + description = "Spell checker"; + longDescription = '' + Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla + Firefox 3 & Thunderbird, Google Chrome, and it is also used by + proprietary software packages, like macOS, InDesign, memoQ, Opera and + SDL Trados. + + Main features: + + * Extended support for language peculiarities; Unicode character encoding, compounding and complex morphology. + * Improved suggestion using n-gram similarity, rule and dictionary based pronunciation data. + * Morphological analysis, stemming and generation. + * Hunspell is based on MySpell and works also with MySpell dictionaries. + * C++ library under GPL/LGPL/MPL tri-license. + * Interfaces and ports: + * Enchant (Generic spelling library from the Abiword project), + * XSpell (macOS port, but Hunspell is part of the macOS from version 10.6 (Snow Leopard), and + now it is enough to place Hunspell dictionary files into + ~/Library/Spelling or /Library/Spelling for spell checking), + * Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO. + ''; + homepage = "http://hunspell.github.io/"; + changelog = "https://github.com/hunspell/hunspell/releases/tag/${finalAttrs.src.rev}"; + license = with lib.licenses; [ + gpl2 + lgpl21 + mpl11 + ]; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "hunspell"; + platforms = lib.platforms.all; + pkgConfigModules = [ "hunspell" ]; + }; +}) diff --git a/pkgs/by-name/hu/hunspell/wrapper.nix b/pkgs/by-name/hu/hunspell/wrapper.nix new file mode 100644 index 000000000000..678a16bee80e --- /dev/null +++ b/pkgs/by-name/hu/hunspell/wrapper.nix @@ -0,0 +1,33 @@ +{ + stdenv, + lib, + hunspell, + makeBinaryWrapper, + dicts ? [ ], +}: +let + searchPath = lib.makeSearchPath "share/hunspell" dicts; +in +stdenv.mkDerivation { + inherit (lib.appendToName "with-dicts" hunspell) name; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + buildCommand = '' + makeWrapper ${lib.getExe hunspell} $out/bin/hunspell \ + --prefix DICPATH : ${lib.escapeShellArg searchPath} + ''; + + meta = { + inherit (hunspell.meta) + description + longDescription + homepage + changelog + license + maintainers + mainProgram + platforms + ; + }; +} diff --git a/pkgs/by-name/hv/hvm/package.nix b/pkgs/by-name/hv/hvm/package.nix index a6a9d39cb309..72038f23c864 100644 --- a/pkgs/by-name/hv/hvm/package.nix +++ b/pkgs/by-name/hv/hvm/package.nix @@ -13,6 +13,11 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AD8mv47m4E6H8BVkxTExyhrR7VEnuB/KxnRl2puPnX4="; }; + # Insert empty line in expected output of rust panic in a test + postPatch = '' + sed -i '6G' tests/snapshots/run__file@empty.hvm.snap + ''; + useFetchCargoVendor = true; cargoHash = "sha256-nLcT+o6xrxPmQqK7FQpCqTlxOOUA1FzqRGQIypcq4fo="; diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix index 9e6da40732ba..2a72312211fe 100644 --- a/pkgs/by-name/hw/hwinfo/package.nix +++ b/pkgs/by-name/hw/hwinfo/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hwinfo"; - version = "23.4"; + version = "23.5"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = finalAttrs.version; - hash = "sha256-mTkDyfdAwjJwBEp/bOYRz0zfzPSzOUEI5hp+mridZsA="; + hash = "sha256-OweEFxNxQpD7blHywhmHTA66vsYG+Qvsufm3huyUhi0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hw/hwloc/package.nix b/pkgs/by-name/hw/hwloc/package.nix index d843361fd874..bbf0e11f2b7b 100644 --- a/pkgs/by-name/hw/hwloc/package.nix +++ b/pkgs/by-name/hw/hwloc/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.12.0"; + version = "2.12.1"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - hash = "sha256-BqCivcClcU6DkWRoOEag6TaoliE3WOnTfkniMricWNQ="; + hash = "sha256-OKkDKLuGJZ+bsv4dxX/YQeER0eY1gBK+8j39ldIdxms="; }; configureFlags = [ diff --git a/pkgs/by-name/hy/hydra-cli/package.nix b/pkgs/by-name/hy/hydra-cli/package.nix index 0f171a6b81e6..e7467882d85d 100644 --- a/pkgs/by-name/hy/hydra-cli/package.nix +++ b/pkgs/by-name/hy/hydra-cli/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, testers, hydra-cli, }: @@ -30,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 7e2c45fd4c40..84d326b54865 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -47,7 +47,6 @@ fetchFromGitHub, nixosTests, unstableGitUpdater, - nixVersions, }: let @@ -80,6 +79,7 @@ let CryptRandPasswd DBDPg DBDSQLite + DBIxClassHelpers DataDump DateTime DigestSHA1 @@ -122,34 +122,21 @@ let UUID4Tiny XMLSimple YAML - nix.perl-bindings + (nix.libs.nix-perl-bindings or nix.perl-bindings) git ]; }; - nix-eval-jobs' = - (nix-eval-jobs.override { - nix = nixVersions.nix_2_25; - }).overrideAttrs - (_: { - version = "2.25.0-unstable-2025-02-13"; - src = fetchFromGitHub { - owner = "nix-community"; - repo = "nix-eval-jobs"; - rev = "6d4fd5a93d7bc953ffa4dcd6d53ad7056a71eff7"; - hash = "sha256-1dZLPw+nlFQzzswfyTxW+8VF1AJ4ZvoYvLTjlHiz1SA="; - }; - }); in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2025-02-12"; + version = "0-unstable-2025-04-16"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "c6f98202cd1b091475ae51b6a093d00b4c8060d4"; - hash = "sha256-CEDUtkA005PiLt1wSo3sgmxfxUBikQSE74ZudyWNxfE="; + rev = "bdde73acbd66c569e8171b42b810adf92a56f76a"; + hash = "sha256-1hj8JJ4ngqzJ8Xt3WvCBnQmwTnzzaZaQlCJcPWQvvM4="; }; outputs = [ @@ -182,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { subversion openssh nix - nix-eval-jobs' + nix-eval-jobs coreutils findutils pixz @@ -220,7 +207,7 @@ stdenv.mkDerivation (finalAttrs: { glibcLocales python3 libressl.nc - nix-eval-jobs' + nix-eval-jobs openldap postgresql ]; @@ -257,7 +244,7 @@ stdenv.mkDerivation (finalAttrs: { --set-default HYDRA_RELEASE ${finalAttrs.version} \ --set HYDRA_HOME $out/libexec/hydra \ --set NIX_RELEASE ${nix.name or "unknown"} \ - --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs'.name or "unknown"} + --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs.name or "unknown"} done ''; @@ -274,6 +261,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://nixos.org/hydra"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ mindavi ] ++ teams.helsinki-systems.members; + maintainers = with maintainers; [ mindavi ]; + teams = [ teams.helsinki-systems ]; }; }) diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index f4531c2c82e6..5306ec860f10 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.3.1"; + version = "3.5.1"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-CscQnbMCK+dAWQacKIRwHl1Dqpau5+EyuH1pZhLrJ/Q="; + hash = "sha256-uDlxEtWo/8cOLP+ebHN5YZpZESkYHj9+8lqTIsj9qKA="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix index 2aa59e74eb9a..2697fbd4f9fc 100644 --- a/pkgs/by-name/hy/hydrus/package.nix +++ b/pkgs/by-name/hy/hydrus/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication rec { pname = "hydrus"; - version = "612"; + version = "617"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; tag = "v${version}"; - hash = "sha256-zRaabW1QwNNgA3F84CFSDbxyALV74T3t8u8WdL8GwG0="; + hash = "sha256-yvnfG7XxGowa3wRZjNsl/WnptdllWWFT/eIFq0TEey8="; }; nativeBuildInputs = [ @@ -162,7 +162,7 @@ python3Packages.buildPythonApplication rec { description = "Danbooru-like image tagging and searching system for the desktop"; license = lib.licenses.wtfpl; homepage = "https://hydrusnetwork.github.io/hydrus/"; - changelog = "https://github.com/hydrusnetwork/hydrus/releases/tag/v${version}"; + changelog = "https://github.com/hydrusnetwork/hydrus/releases/tag/${src.tag}"; maintainers = with lib.maintainers; [ dandellion evanjs diff --git a/pkgs/by-name/hy/hyenae/package.nix b/pkgs/by-name/hy/hyenae/package.nix deleted file mode 100644 index f4f3152338e8..000000000000 --- a/pkgs/by-name/hy/hyenae/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - libdnet, - pkg-config, - libpcap, -}: - -stdenv.mkDerivation rec { - pname = "hyenae"; - version = "0.36-1"; - - enableParallelBuilding = true; - - src = fetchurl { - url = "mirror://sourceforge/hyenae/${version}/hyenae-${version}.tar.gz"; - sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libdnet - libpcap - ]; - - meta = { - description = ""; - homepage = "https://sourceforge.net/projects/hyenae/"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/hy/hyperbeam/package-lock.json b/pkgs/by-name/hy/hyperbeam/package-lock.json new file mode 100644 index 000000000000..580771d10c8d --- /dev/null +++ b/pkgs/by-name/hy/hyperbeam/package-lock.json @@ -0,0 +1,4333 @@ +{ + "name": "hyperbeam", + "version": "3.1.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "hyperbeam", + "version": "3.1.0", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.7", + "hi-base32": "^0.5.1", + "hyperdht": "^6.20.5", + "queue-tick": "^1.0.1", + "sodium-universal": "^5.0.1", + "streamx": "^2.22.0" + }, + "bin": { + "hyperbeam": "bin.js" + }, + "devDependencies": { + "standard": "^17.1.2" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", + "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@hyperswarm/secret-stream": { + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/@hyperswarm/secret-stream/-/secret-stream-6.8.1.tgz", + "integrity": "sha512-F3fr8CKB6za9Ac7ifjgAe07qnnesl5kS0MtLsyKxA1Og8E+FZykdwLpgoLjnEa7G6E1L56lASLr42E4kd20sog==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.1.0", + "hypercore-crypto": "^3.3.1", + "noise-curve-ed": "^2.0.1", + "noise-handshake": "^4.0.0", + "sodium-secretstream": "^1.1.0", + "sodium-universal": "^5.0.0", + "streamx": "^2.14.0", + "timeout-refresh": "^2.0.0", + "unslab": "^1.3.0" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@rtsao/scc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", + "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, + "license": "ISC" + }, + "node_modules/acorn": { + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-includes": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz", + "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "es-shim-unscopables": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", + "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/async-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", + "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/b4a": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", + "license": "Apache-2.0" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/bare-addon-resolve": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/bare-addon-resolve/-/bare-addon-resolve-1.9.4.tgz", + "integrity": "sha512-unn6Vy/Yke6F99vg/7tcrvM2KUvIhTNniaSqDbam4AWkd4NhvDVSrQiRYVlNzUV2P7SPobkCK7JFVxrJk9btCg==", + "license": "Apache-2.0", + "dependencies": { + "bare-module-resolve": "^1.10.0", + "bare-semver": "^1.0.0" + }, + "peerDependencies": { + "bare-url": "*" + }, + "peerDependenciesMeta": { + "bare-url": { + "optional": true + } + } + }, + "node_modules/bare-events": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz", + "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==", + "license": "Apache-2.0" + }, + "node_modules/bare-module-resolve": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/bare-module-resolve/-/bare-module-resolve-1.10.2.tgz", + "integrity": "sha512-C9COe/GhWfVXKytW3DElTkiBU+Gb2OXeaVkdGdRB/lp26TVLESHkTGS876iceAGdvtPgohfp9nX8vXHGvN3++Q==", + "license": "Apache-2.0", + "dependencies": { + "bare-semver": "^1.0.0" + }, + "peerDependencies": { + "bare-url": "*" + }, + "peerDependenciesMeta": { + "bare-url": { + "optional": true + } + } + }, + "node_modules/bare-os": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz", + "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==", + "license": "Apache-2.0", + "engines": { + "bare": ">=1.14.0" + } + }, + "node_modules/bare-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", + "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/bare-semver": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bare-semver/-/bare-semver-1.0.1.tgz", + "integrity": "sha512-UtggzHLiTrmFOC/ogQ+Hy7VfoKoIwrP1UFcYtTxoCUdLtsIErT8+SWtOC2DH/snT9h+xDrcBEPcwKei1mzemgg==", + "license": "Apache-2.0" + }, + "node_modules/bare-url": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.6.tgz", + "integrity": "sha512-FgjDeR+/yDH34By4I0qB5NxAoWv7dOTYcOXwn73kr+c93HyC2lU6tnjifqUe33LKMJcDyCYPQjEAqgOQiXkE2Q==", + "license": "Apache-2.0", + "dependencies": { + "bare-path": "^3.0.0" + } + }, + "node_modules/bits-to-bytes": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/bits-to-bytes/-/bits-to-bytes-1.3.0.tgz", + "integrity": "sha512-OJoHTpFXS9bXHBCekGTByf3MqM8CGblBDIduKQeeVVeiU9dDWywSSirXIBYGgg3d1zbVuvnMa1vD4r6PA0kOKg==", + "license": "ISC", + "dependencies": { + "b4a": "^1.5.0" + } + }, + "node_modules/blind-relay": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/blind-relay/-/blind-relay-1.4.0.tgz", + "integrity": "sha512-6xt7fDfCs6eGmNNym6I9N42jmjcMQn2qwwOVnkP9ZnrkXFk6c4/tdO1xqRmDEzKzV8gigd+DVdCUG/RUYnen7Q==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4", + "bare-events": "^2.2.0", + "bits-to-bytes": "^1.3.0", + "compact-encoding": "^2.12.0", + "compact-encoding-bitfield": "^1.0.0", + "protomux": "^3.5.1", + "sodium-universal": "^5.0.0", + "streamx": "^2.15.1" + } + }, + "node_modules/bogon": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/bogon/-/bogon-1.1.0.tgz", + "integrity": "sha512-a6SnToksXHuUlgeMvI/txWmTcKz7c7iBa8f0HbXL4toN1Uza/CTQ4F7n9jSDX49TCpxv3KUP100q4sZfwLyLiw==", + "license": "MIT", + "dependencies": { + "compact-encoding": "^2.11.0", + "compact-encoding-net": "^1.2.0" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/builtins/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/call-bind": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/compact-encoding": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/compact-encoding/-/compact-encoding-2.16.1.tgz", + "integrity": "sha512-vP39X4nwtesmZucaAxDg4wnudOoaJTSR+fikzi8VLVxbwLmcWXf3t0LxY0n2H1AMpdoQZ08lmUf4GY3XiDPnMQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.3.0" + } + }, + "node_modules/compact-encoding-bitfield": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/compact-encoding-bitfield/-/compact-encoding-bitfield-1.0.0.tgz", + "integrity": "sha512-3nMVKUg+PF72UHfainmCL8uKvyWfxsjqOtUY+HiMPGLPCTjnwzoKfFAMo1Ad7nwTPdjBqtGK5b3BOFTFW4EBTg==", + "license": "ISC", + "dependencies": { + "compact-encoding": "^2.4.1" + } + }, + "node_modules/compact-encoding-net": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/compact-encoding-net/-/compact-encoding-net-1.2.0.tgz", + "integrity": "sha512-LVXpNpF7PGQeHRVVLGgYWzuVoYAaDZvKUsUxRioGfkotzvOh4AzoQF1HBH3zMNaSnx7gJXuUr3hkjnijaH/Eng==", + "license": "ISC", + "dependencies": { + "compact-encoding": "^2.4.1" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/data-view-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/inspect-js" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/dht-rpc": { + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/dht-rpc/-/dht-rpc-6.18.1.tgz", + "integrity": "sha512-uTcHj8dERVjmoUsSxqAulQ+qo11Qy4pMK419tyF2cFpyf56Y09u1v9g8yWlay0KjUY5bvdybBQ/V8YWN/wyK5Q==", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.1", + "bare-events": "^2.2.0", + "compact-encoding": "^2.11.0", + "compact-encoding-net": "^1.2.0", + "fast-fifo": "^1.1.0", + "kademlia-routing-table": "^1.0.1", + "nat-sampler": "^1.0.1", + "sodium-universal": "^5.0.0", + "streamx": "^2.13.2", + "time-ordered-set": "^2.0.0", + "udx-native": "^1.5.3" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-abstract": { + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "data-view-buffer": "^1.0.2", + "data-view-byte-length": "^1.0.2", + "data-view-byte-offset": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.1.0", + "es-to-primitive": "^1.3.0", + "function.prototype.name": "^1.1.8", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.0", + "get-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.2", + "is-regex": "^1.2.1", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.0", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.3", + "object-keys": "^1.1.1", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.3", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.18" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz", + "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.6", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "iterator.prototype": "^1.1.4", + "safe-array-concat": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-to-primitive": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" + } + }, + "node_modules/eslint-config-standard-jsx": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", + "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "peerDependencies": { + "eslint": "^8.8.0", + "eslint-plugin-react": "^7.28.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", + "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", + "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rtsao/scc": "^1.1.0", + "array-includes": "^3.1.8", + "array.prototype.findlastindex": "^1.2.5", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.12.0", + "hasown": "^2.0.2", + "is-core-module": "^2.15.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.8", + "object.groupby": "^1.0.3", + "object.values": "^1.2.0", + "semver": "^6.3.1", + "string.prototype.trimend": "^1.0.8", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz", + "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.37.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz", + "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.3", + "array.prototype.tosorted": "^1.1.4", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.2.1", + "estraverse": "^5.3.0", + "hasown": "^2.0.2", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.9", + "object.fromentries": "^2.0.8", + "object.values": "^1.2.1", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.5", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.12", + "string.prototype.repeat": "^1.0.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-fifo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", + "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", + "license": "MIT" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, + "license": "ISC" + }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/has-bigints": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/hi-base32": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/hi-base32/-/hi-base32-0.5.1.tgz", + "integrity": "sha512-EmBBpvdYh/4XxsnUybsPag6VikPYnN30td+vQk+GI3qpahVEG9+gTkG0aXVxTjBqQ5T6ijbWIu77O+C5WFWsnA==", + "license": "MIT" + }, + "node_modules/hypercore-crypto": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-3.6.0.tgz", + "integrity": "sha512-0slkW1wzq4B95SD8Z5nt1Yf/3KrIcGsBWTJTsCjHzMXie+sZ5I2IkWcxX1mo4+c0xVESnKAKphKSpGf2kf2BGA==", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.6", + "compact-encoding": "^2.15.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/hypercore-id-encoding": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/hypercore-id-encoding/-/hypercore-id-encoding-1.3.0.tgz", + "integrity": "sha512-W6sHdGo5h7LXEsoWfKf/KfuROZmZRQDlGqJF2EPHW+noCK66Vvr0+zE6cL0vqQi18s0kQPeN7Sq3QyR0Ytc2VQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.5.3", + "z32": "^1.0.0" + } + }, + "node_modules/hyperdht": { + "version": "6.20.5", + "resolved": "https://registry.npmjs.org/hyperdht/-/hyperdht-6.20.5.tgz", + "integrity": "sha512-eDAwTmAtE9rjMivgqYtqHalTdBVhhCMBVHlCWRVhEcWtchpDonsd2dmX26lJ0raoF+l9djkXvPcN1/kb9/kykw==", + "license": "MIT", + "dependencies": { + "@hyperswarm/secret-stream": "^6.6.2", + "b4a": "^1.3.1", + "bare-events": "^2.2.0", + "blind-relay": "^1.3.0", + "bogon": "^1.0.0", + "compact-encoding": "^2.4.1", + "compact-encoding-net": "^1.0.1", + "dht-rpc": "^6.15.1", + "hypercore-crypto": "^3.3.0", + "hypercore-id-encoding": "^1.2.0", + "noise-curve-ed": "^2.0.0", + "noise-handshake": "^4.0.0", + "record-cache": "^1.1.1", + "safety-catch": "^1.0.1", + "signal-promise": "^1.0.3", + "sodium-universal": "^5.0.1", + "streamx": "^2.16.1", + "unslab": "^1.3.0", + "xache": "^1.1.0" + }, + "bin": { + "hyperdht": "bin.js" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/internal-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-async-function": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", + "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "async-function": "^1.0.0", + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-boolean-object": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz", + "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-generator-function": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number-object": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-string": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz", + "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/iterator.prototype": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz", + "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "get-proto": "^1.0.0", + "has-symbols": "^1.1.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/kademlia-routing-table": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/kademlia-routing-table/-/kademlia-routing-table-1.0.6.tgz", + "integrity": "sha512-Ve6jwIlUCYvUzBnXnzVRHDZCFgXURW9gmF3r7n05kZs/2rNbLHXwGdcq0qIaSwdmJCvtosgR4JensnVU65hzNQ==", + "license": "MIT", + "dependencies": { + "bare-events": "^2.2.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/load-json-file": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", + "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^4.0.0", + "pify": "^4.0.1", + "strip-bom": "^3.0.0", + "type-fest": "^0.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=6" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/nanoassert": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-2.0.0.tgz", + "integrity": "sha512-7vO7n28+aYO4J+8w96AzhmU8G+Y/xpPDJz/se19ICsqj/momRbb9mh9ZUtkoJ5X3nTnPdhEJyc0qnM6yAsHBaA==", + "license": "ISC" + }, + "node_modules/nat-sampler": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nat-sampler/-/nat-sampler-1.0.1.tgz", + "integrity": "sha512-yQvyNN7xbqR8crTKk3U8gRgpcV1Az+vfCEijiHu9oHHsnIl8n3x+yXNHl42M6L3czGynAVoOT9TqBfS87gDdcw==", + "license": "MIT" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/noise-curve-ed": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/noise-curve-ed/-/noise-curve-ed-2.1.0.tgz", + "integrity": "sha512-zAzJx+VwZM3w6EA1hTmDhJfvAnCeBQn/1FAeZ0LtGxCcCtlAK/uJXQVF/eDVUOaAZ286lHlx77WJ+qj9SmsRRg==", + "license": "ISC", + "dependencies": { + "b4a": "^1.1.0", + "nanoassert": "^2.0.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/noise-handshake": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/noise-handshake/-/noise-handshake-4.1.0.tgz", + "integrity": "sha512-ZHt2+mOXTvjtaWS2h/JPvQjmknfKrEld2xdSsRYWXnYiJmK/N+dtxrDVSt1cr9wGAlhH7Ek43lIZNsL5bVeX9A==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.1.0", + "nanoassert": "^2.0.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz", + "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.values": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "license": "MIT", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", + "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^3.0.0", + "load-json-file": "^5.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, + "license": "MIT", + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/protomux": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/protomux/-/protomux-3.10.1.tgz", + "integrity": "sha512-jgBqx8ZyaBWea/DFG4eOu1scOaeBwcnagiRC1XFVrjeGt7oAb0Pk5udPpBUpJ4DJBRjra50jD6YcZiQQTRqaaA==", + "license": "MIT", + "dependencies": { + "b4a": "^1.3.1", + "compact-encoding": "^2.5.1", + "queue-tick": "^1.0.0", + "safety-catch": "^1.0.1", + "unslab": "^1.3.0" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/queue-tick": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", + "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", + "license": "MIT" + }, + "node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/record-cache": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/record-cache/-/record-cache-1.2.0.tgz", + "integrity": "sha512-kyy3HWCez2WrotaL3O4fTn0rsIdfRKOdQQcEJ9KpvmKmbffKVvwsloX063EgRUlpJIXHiDQFhJcTbZequ2uTZw==", + "license": "MIT", + "dependencies": { + "b4a": "^1.3.1" + } + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/require-addon": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/require-addon/-/require-addon-1.1.0.tgz", + "integrity": "sha512-KbXAD5q2+v1GJnkzd8zzbOxchTkStSyJZ9QwoCq3QwEXAaIlG3wDYRZGzVD357jmwaGY7hr5VaoEAL0BkF0Kvg==", + "license": "Apache-2.0", + "dependencies": { + "bare-addon-resolve": "^1.3.0", + "bare-url": "^2.1.0" + }, + "engines": { + "bare": ">=1.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safety-catch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/safety-catch/-/safety-catch-1.0.2.tgz", + "integrity": "sha512-C1UYVZ4dtbBxEtvOcpjBaaD27nP8MlvyAQEp2fOTOEe6pfUpk1cDUxij6BR1jZup6rSyUTaBBplK7LanskrULA==", + "license": "MIT" + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-promise": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/signal-promise/-/signal-promise-1.0.3.tgz", + "integrity": "sha512-WBgv0UnIq2C+Aeh0/n+IRpP6967eIx9WpynTUoiW3isPpfe1zu2LJzyfXdo9Tgef8yR/sGjcMvoUXD7EYdiz+g==", + "license": "MIT" + }, + "node_modules/sodium-native": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-5.0.1.tgz", + "integrity": "sha512-Q305aUXc0OzK7VVRvWkeEQJQIHs6slhFwWpyqLB5iJqhpyt2lYIVu96Y6PQ7TABIlWXVF3YiWDU3xS2Snkus+g==", + "license": "MIT", + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.1" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/sodium-secretstream": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/sodium-secretstream/-/sodium-secretstream-1.2.0.tgz", + "integrity": "sha512-q/DbraNFXm1KfCiiZvapmz5UC3OlpirYFIvBK2MhGaOFSb3gRyk8OXTi17UI9SGfshQNCpsVvlopogbzZNyW6Q==", + "license": "MIT", + "dependencies": { + "b4a": "^1.1.1", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/sodium-universal": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-5.0.1.tgz", + "integrity": "sha512-rv+aH+tnKB5H0MAc2UadHShLMslpJsc4wjdnHRtiSIEYpOetCgu8MS4ExQRia+GL/MK3uuCyZPeEsi+J3h+Q+Q==", + "license": "MIT", + "dependencies": { + "sodium-native": "^5.0.1" + }, + "peerDependencies": { + "sodium-javascript": "~0.8.0" + }, + "peerDependenciesMeta": { + "sodium-javascript": { + "optional": true + } + } + }, + "node_modules/standard": { + "version": "17.1.2", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.2.tgz", + "integrity": "sha512-WLm12WoXveKkvnPnPnaFUUHuOB2cUdAsJ4AiGHL2G0UNMrcRAWY2WriQaV8IQ3oRmYr0AWUbLNr94ekYFAHOrA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "eslint": "^8.41.0", + "eslint-config-standard": "17.1.0", + "eslint-config-standard-jsx": "^11.0.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.36.1", + "standard-engine": "^15.1.0", + "version-guard": "^1.1.1" + }, + "bin": { + "standard": "bin/cmd.cjs" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/standard-engine": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", + "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "get-stdin": "^8.0.0", + "minimist": "^1.2.6", + "pkg-conf": "^3.1.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/streamx": { + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz", + "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==", + "license": "MIT", + "dependencies": { + "fast-fifo": "^1.3.2", + "text-decoder": "^1.1.0" + }, + "optionalDependencies": { + "bare-events": "^2.2.0" + } + }, + "node_modules/string.prototype.matchall": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", + "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "regexp.prototype.flags": "^1.5.3", + "set-function-name": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/text-decoder": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", + "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/time-ordered-set": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/time-ordered-set/-/time-ordered-set-2.0.1.tgz", + "integrity": "sha512-VJEKmgSN2UiOLB8BpN8Sh2b9LGMHTP5OPrQRpnKjvOheOyzk0mufbjzjKTIG2gO4A+Y+vDJ+0TcLbpUmMLsg8A==", + "license": "MIT" + }, + "node_modules/timeout-refresh": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-2.0.1.tgz", + "integrity": "sha512-SVqEcMZBsZF9mA78rjzCrYrUs37LMJk3ShZ851ygZYW1cMeIjs9mL57KO6Iv5mmjSQnOe/29/VAfGXo+oRCiVw==", + "license": "MIT" + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/udx-native": { + "version": "1.17.8", + "resolved": "https://registry.npmjs.org/udx-native/-/udx-native-1.17.8.tgz", + "integrity": "sha512-nB5SxTF9WzTNrxJnVSyEOtapoPjxAU1KboN/z1JWMtAVXArwtQ9Mxn+jJvlx4skINQHH6xUqQsQdSCL1Ja2h1Q==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.5.0", + "bare-events": "^2.2.0", + "require-addon": "^1.1.0", + "streamx": "^2.14.0" + } + }, + "node_modules/unbox-primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-bigints": "^1.0.2", + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unslab": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/unslab/-/unslab-1.3.0.tgz", + "integrity": "sha512-YATkfKAFj47kTzmiQrWXMyRvaVrHsW6MEALa4bm+FhiA2YG4oira+Z3DXN6LrYOYn2Y8eO94Lwl9DOHjs1FpoQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.6" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/version-guard": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.3.tgz", + "integrity": "sha512-JwPr6erhX53EWH/HCSzfy1tTFrtPXUe927wdM1jqBBeYp1OM+qPHjWbsvv6pIBduqdgxxS+ScfG7S28pzyr2DQ==", + "dev": true, + "license": "0BSD", + "engines": { + "node": ">=0.10.48" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", + "is-async-function": "^2.0.0", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", + "is-generator-function": "^1.0.10", + "is-regex": "^1.2.1", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.1.0", + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-runtime": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-runtime/-/which-runtime-1.2.1.tgz", + "integrity": "sha512-8feIHccQFH/whiA1fD1b4c5+Q7T4ry1g1oHYc2mHnFh81tTQFsCvy3zhS2geUapkFAVBddUT/AM1a3rbqJweFg==", + "license": "Apache-2.0" + }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/xache": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/xache/-/xache-1.2.1.tgz", + "integrity": "sha512-igRS6jPreJ54ABdzhh4mCDXcz+XMaWO2q1ABRV2yWYuk29jlp8VT7UBdCqNkX7rpYBbXsebVVKkwIuYZjyZNqA==", + "license": "MIT" + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/z32": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/z32/-/z32-1.1.0.tgz", + "integrity": "sha512-1WUHy+VS6d0HPNspDxvLssBbeQjXMjSnpv0vH82vRAUfg847NmX3OXozp/hRP5jPhxBbrVzrgvAt+UsGNzRFQQ==", + "license": "MIT", + "dependencies": { + "b4a": "^1.5.3" + } + } + } +} diff --git a/pkgs/by-name/hy/hyperbeam/package.nix b/pkgs/by-name/hy/hyperbeam/package.nix index 883c65e0c0c9..02df044476b0 100644 --- a/pkgs/by-name/hy/hyperbeam/package.nix +++ b/pkgs/by-name/hy/hyperbeam/package.nix @@ -1,39 +1,38 @@ { - buildNpmPackage, lib, - fetchurl, + buildNpmPackage, fetchFromGitHub, + nix-update-script, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "hyperbeam"; - version = "3.0.2"; - - npmDepsHash = "sha256-ZZX3BOtSSiLvAEcWuKiUMHrYOt8N6SYYQ+QGzbprL3E="; - - dontNpmBuild = true; + version = "3.1.0"; src = fetchFromGitHub { owner = "holepunchto"; repo = "hyperbeam"; - rev = "v${version}"; - hash = "sha256-g3eGuol3g1yfGHDSzI1wQXMxJudGCt4PHHdmtiRQS/Q="; + tag = "v${finalAttrs.version}"; + hash = "sha256-SSHSQIVfHYFa1YkV3eeDkXSQV8KERADlmhOmxIiY+ko="; }; - patches = [ - # TODO: remove after this is merged: https://github.com/holepunchto/hyperbeam/pull/22 - (fetchurl { - url = "https://github.com/holepunchto/hyperbeam/commit/e84e4be979bf89d8e8042878d2beb5c1a5dbf946.patch"; - hash = "sha256-AdXmfti9/08kRYuL1l4gXmvSV7bV0kE72Pf/bNqiFQw="; - }) - ]; + npmDepsHash = "sha256-EjzdBqA1KNZbhkRkyMwC/YSgbkbs5BRC6ummQkQHyEs="; + + dontNpmBuild = true; + + postPatch = '' + cp ${./package-lock.json} ./package-lock.json + ''; + + passthru.updateScript = nix-update-script { }; meta = { - description = "A 1-1 end-to-end encrypted internet pipe powered by Hyperswarm "; + description = "1-1 End-to-End Encrypted Internet Pipe Powered by Hyperswarm "; homepage = "https://github.com/holepunchto/hyperbeam"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ davhau ]; mainProgram = "hyperbeam"; + license = lib.licenses.mit; platforms = lib.platforms.all; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ davhau ]; }; -} +}) diff --git a/pkgs/by-name/hy/hyperblobs/package-lock.json b/pkgs/by-name/hy/hyperblobs/package-lock.json new file mode 100644 index 000000000000..c47f109510de --- /dev/null +++ b/pkgs/by-name/hy/hyperblobs/package-lock.json @@ -0,0 +1,5189 @@ +{ + "name": "hyperblobs", + "version": "2.8.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "hyperblobs", + "version": "2.8.0", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.1", + "bare-events": "^2.5.0", + "hypercore-errors": "^1.1.1", + "mutexify": "^1.4.0", + "speedometer": "^1.1.0", + "streamx": "^2.13.2" + }, + "devDependencies": { + "brittle": "^3.1.0", + "hypercore": "^10.18.0", + "random-access-memory": "^6.0.0", + "standard": "^17.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", + "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@hyperswarm/secret-stream": { + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/@hyperswarm/secret-stream/-/secret-stream-6.8.1.tgz", + "integrity": "sha512-F3fr8CKB6za9Ac7ifjgAe07qnnesl5kS0MtLsyKxA1Og8E+FZykdwLpgoLjnEa7G6E1L56lASLr42E4kd20sog==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.1.0", + "hypercore-crypto": "^3.3.1", + "noise-curve-ed": "^2.0.1", + "noise-handshake": "^4.0.0", + "sodium-secretstream": "^1.1.0", + "sodium-universal": "^5.0.0", + "streamx": "^2.14.0", + "timeout-refresh": "^2.0.0", + "unslab": "^1.3.0" + } + }, + "node_modules/@hyperswarm/secret-stream/node_modules/sodium-native": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-5.0.1.tgz", + "integrity": "sha512-Q305aUXc0OzK7VVRvWkeEQJQIHs6slhFwWpyqLB5iJqhpyt2lYIVu96Y6PQ7TABIlWXVF3YiWDU3xS2Snkus+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.1" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/@hyperswarm/secret-stream/node_modules/sodium-universal": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-5.0.1.tgz", + "integrity": "sha512-rv+aH+tnKB5H0MAc2UadHShLMslpJsc4wjdnHRtiSIEYpOetCgu8MS4ExQRia+GL/MK3uuCyZPeEsi+J3h+Q+Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "sodium-native": "^5.0.1" + }, + "peerDependencies": { + "sodium-javascript": "~0.8.0" + }, + "peerDependenciesMeta": { + "sodium-javascript": { + "optional": true + } + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@rtsao/scc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", + "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, + "license": "ISC" + }, + "node_modules/acorn": { + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-includes": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz", + "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "es-shim-unscopables": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", + "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/assert": { + "name": "bare-assert", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bare-assert/-/bare-assert-1.0.2.tgz", + "integrity": "sha512-7AGTrUCz7OOWnMOp4hWnksAkFeZlvW7WMwvKQBANVJIOtjWa6RLSPyUN+zs3QBufRZwIYhYB3UpkAlDbBPp2/Q==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/async-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", + "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/b4a": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", + "license": "Apache-2.0" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/bare-addon-resolve": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/bare-addon-resolve/-/bare-addon-resolve-1.9.4.tgz", + "integrity": "sha512-unn6Vy/Yke6F99vg/7tcrvM2KUvIhTNniaSqDbam4AWkd4NhvDVSrQiRYVlNzUV2P7SPobkCK7JFVxrJk9btCg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-module-resolve": "^1.10.0", + "bare-semver": "^1.0.0" + }, + "peerDependencies": { + "bare-url": "*" + }, + "peerDependenciesMeta": { + "bare-url": { + "optional": true + } + } + }, + "node_modules/bare-ansi-escapes": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/bare-ansi-escapes/-/bare-ansi-escapes-2.2.3.tgz", + "integrity": "sha512-02ES4/E2RbrtZSnHJ9LntBhYkLA6lPpSEeP8iqS3MccBIVhVBlEmruF1I7HZqx5Q8aiTeYfQVeqmrU9YO2yYoQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.5" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-assert": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bare-assert/-/bare-assert-1.0.2.tgz", + "integrity": "sha512-7AGTrUCz7OOWnMOp4hWnksAkFeZlvW7WMwvKQBANVJIOtjWa6RLSPyUN+zs3QBufRZwIYhYB3UpkAlDbBPp2/Q==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-cov": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/bare-cov/-/bare-cov-1.1.0.tgz", + "integrity": "sha512-y5ik6JY3Gd1Eb0+9GDWOSHPQ+/Mgyj40du1fTlCiEklyMTPhgOJUMRwzAka1V+8KkvgQ8OEbkK/xL4XEfPYGQA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-fs": "^4.1.2", + "bare-inspector": "^4.0.1", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "bare-url": "^2.1.5", + "bare-v8-to-istanbul": "v1.0.0", + "picomatch": "^4.0.2", + "which-runtime": "^1.2.1" + } + }, + "node_modules/bare-crypto": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/bare-crypto/-/bare-crypto-1.4.3.tgz", + "integrity": "sha512-XlIhSB+2ht2+Yli2Ic+HhOvdP0vd+TWWISxzYp50EwfsOwCI4TaeONj5hIr6aDWKhYn0FMsFec7U30QOIXMD4Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.3" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-debug-log": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/bare-debug-log/-/bare-debug-log-1.0.0.tgz", + "integrity": "sha512-tN02RFk6yiS2s7DerJVLvE4W/xrRkNMiCilvS/3fQbu72tj1rteXcQMiztICX5Z3yYsTNJrBokUnAUPjfDU45A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^2.3.0" + } + }, + "node_modules/bare-debug-log/node_modules/bare-os": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.4.tgz", + "integrity": "sha512-z3UiI2yi1mK0sXeRdc4O1Kk8aOa/e+FNWZcTiPB/dfTWyLypuE99LibgRaQki914Jq//yAWylcAt+mknKdixRQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-dns": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/bare-dns/-/bare-dns-2.0.5.tgz", + "integrity": "sha512-C8JF4f/nXXtzyyqyKaSs74HgYZCW3VcG836D0nmANQWGgZlKpw6VMHfpAZM7O4ljcyaNYxdq9pOKE+WXh3AOgA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-env": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-env/-/bare-env-3.0.0.tgz", + "integrity": "sha512-0u964P5ZLAxTi+lW4Kjp7YRJQ5gZr9ycYOtjLxsSrupgMz3sn5Z9n4SH/JIifHwvadsf1brA2JAjP+9IOWwTiw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/bare-events": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz", + "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==", + "license": "Apache-2.0" + }, + "node_modules/bare-format": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bare-format/-/bare-format-1.0.1.tgz", + "integrity": "sha512-1oS+LZrWK6tnYnvNSHDGljc2MPunRxwhpFriuCgzNF+oklrnwmBKD91tS0yt+jpl2j3UgcSDzBIMiVTvLs9A8w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-inspect": "^3.0.0" + } + }, + "node_modules/bare-fs": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.4.tgz", + "integrity": "sha512-r8+26Voz8dGX3AYpJdFb1ZPaUSM8XOLCZvy+YGpRTmwPHIxA7Z3Jov/oMPtV7hfRQbOnH8qGlLTzQAbgtdNN0Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.4", + "bare-path": "^3.0.0", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-hrtime": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/bare-hrtime/-/bare-hrtime-2.0.11.tgz", + "integrity": "sha512-Mnb2rnGRSHzNHQwFrK8VVqD8Oob/CiSsBlgZGKQ1xTj25GPI19sXHjUPzrkHOU1DaoVj1ig1VO7rZGaYOfXPaw==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-http1": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bare-http1/-/bare-http1-4.0.2.tgz", + "integrity": "sha512-6Jns5oBG9LFz/U2PuFk2LHQbQ1ZuUgPyuahfbNikPL/HcjpSGdSl0xMiN3Qt852Xm1sLBsTGxl0OoM2cVCYzNQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.0.0", + "bare-stream": "^2.3.0", + "bare-tcp": "^2.0.0" + } + }, + "node_modules/bare-https": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bare-https/-/bare-https-2.0.0.tgz", + "integrity": "sha512-qmjNZmYQ4nn+k3CLlxVyOqWYamdBPqE7psR5/lFWG39fskAR4C2h29d1Ka5BeWOGDAWhXImFIwZUxwCE/7xeLA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-http1": "^4.0.0", + "bare-tcp": "^2.0.0", + "bare-tls": "^2.0.0" + } + }, + "node_modules/bare-inspect": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/bare-inspect/-/bare-inspect-3.0.8.tgz", + "integrity": "sha512-Z3McUtoM/saxTBtr7l4M9ADR1m5foXwtxJrO1OPaBLN25M4lNHVm7uwL9e0qlS8kuLXTI41TLEN4S9veJ3EJJA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-ansi-escapes": "^2.1.0", + "bare-type": "^1.0.0" + } + }, + "node_modules/bare-inspector": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/bare-inspector/-/bare-inspector-4.0.1.tgz", + "integrity": "sha512-MZGIci2OFzwDNWlY/JUmEVtK/0xa+mbdggOB0jSI0WYkQpyxaiD4q/8xZ42k4kOoZNLKpYMI31wmllm6jS5w9g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.1.0", + "bare-http1": "^4.0.0", + "bare-stream": "^2.0.0", + "bare-url": "^2.0.0", + "bare-ws": "^2.0.0" + }, + "engines": { + "bare": ">=1.2.0" + } + }, + "node_modules/bare-module-resolve": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/bare-module-resolve/-/bare-module-resolve-1.10.2.tgz", + "integrity": "sha512-C9COe/GhWfVXKytW3DElTkiBU+Gb2OXeaVkdGdRB/lp26TVLESHkTGS876iceAGdvtPgohfp9nX8vXHGvN3++Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-semver": "^1.0.0" + }, + "peerDependencies": { + "bare-url": "*" + }, + "peerDependenciesMeta": { + "bare-url": { + "optional": true + } + } + }, + "node_modules/bare-os": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz", + "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "bare": ">=1.14.0" + } + }, + "node_modules/bare-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", + "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/bare-pipe": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/bare-pipe/-/bare-pipe-4.0.6.tgz", + "integrity": "sha512-S9kpDJq74gkceynfRqXCaED119k2jF2us4U9xZnTLX0GEduWQY29MNTpAMAf/ucEailW9SPLjGLzbfPCONz3Lw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.0.0", + "bare-stream": "^2.0.0" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-process": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/bare-process/-/bare-process-4.2.1.tgz", + "integrity": "sha512-wcmyQWTHxd2xRgeKUSY46ofmuEAJ9CLo/6swJTHOZFPYpBShMWNPVI2Ba8o0n/X/YE4as99M28x37saWZ1L1vQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.3.1", + "bare-hrtime": "^2.0.0", + "bare-os": "^3.5.0", + "bare-pipe": "^4.0.0", + "bare-signals": "^4.0.0", + "bare-tty": "^5.0.0" + } + }, + "node_modules/bare-semver": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bare-semver/-/bare-semver-1.0.1.tgz", + "integrity": "sha512-UtggzHLiTrmFOC/ogQ+Hy7VfoKoIwrP1UFcYtTxoCUdLtsIErT8+SWtOC2DH/snT9h+xDrcBEPcwKei1mzemgg==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-signals": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bare-signals/-/bare-signals-4.0.2.tgz", + "integrity": "sha512-+V7ngZRbkQDN6OJj1/Evm725HeXvZ3onHI52jBi/LJAe2bSPn2sNZI1Y9xu0MlebhROdRTqa7lpN/OQVDMRt3g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.3", + "bare-os": "^3.3.1" + }, + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-stream": { + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz", + "integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "streamx": "^2.21.0" + }, + "peerDependencies": { + "bare-buffer": "*", + "bare-events": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + }, + "bare-events": { + "optional": true + } + } + }, + "node_modules/bare-subprocess": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/bare-subprocess/-/bare-subprocess-5.0.3.tgz", + "integrity": "sha512-iCx8kfvqClPAQGsbL2RfMubB6EYoZ67ZhaEIpn6wIqIa60p4zLAlGJyEQQtXPo/5dclbpgzWre5hvJ7HzXC/aA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.5.4", + "bare-os": "^3.0.1", + "bare-pipe": "^4.0.0" + }, + "engines": { + "bare": ">=1.7.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-tcp": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/bare-tcp/-/bare-tcp-2.0.4.tgz", + "integrity": "sha512-Xv0DgOwG0zZwmckY43aRs2iOGewkgXlsBu0oWv3h7Y7sGl8a2tyNe4frxYWRRN3N09SwUJZtid1RSW315MDXmg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-dns": "^2.0.4", + "bare-events": "^2.5.4", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-tls": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/bare-tls/-/bare-tls-2.0.4.tgz", + "integrity": "sha512-mJK7CHoXhBEd+z7KIFf0e5GIJgkIp9b9kt7axTmFyUEyQlyzlAzTrQHCkw++PEwF0soNXgOYQtmb+KUqhpgK+g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-tty": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/bare-tty/-/bare-tty-5.0.2.tgz", + "integrity": "sha512-xOHwI7zZl2Opm7Rul5O+okE32j7O14feJhgovJX2EghtQ2IWVfiC1oH0DmFruMvKthvhZY/Lpg8n5SVBaZhV1A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.2.0", + "bare-signals": "^4.0.0", + "bare-stream": "^2.0.0" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-type": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/bare-type/-/bare-type-1.0.6.tgz", + "integrity": "sha512-6QFeIIp1d06xU9BjDPkl8+QeHil3TKSDpIKUid6bQzwYvxFOnMVhAifRS3J0fvWirEMlWmqxDDKjHW8RPe6C3Q==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "bare": ">=1.2.0" + } + }, + "node_modules/bare-url": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.6.tgz", + "integrity": "sha512-FgjDeR+/yDH34By4I0qB5NxAoWv7dOTYcOXwn73kr+c93HyC2lU6tnjifqUe33LKMJcDyCYPQjEAqgOQiXkE2Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-path": "^3.0.0" + } + }, + "node_modules/bare-utils": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/bare-utils/-/bare-utils-1.2.0.tgz", + "integrity": "sha512-Y9G5DbMUgcx078Etc7h9CD31aI9vYFZ/xl6JLnyvBX9+4lrlXw+5/6toNJGaNSylo4jJf8Cu3yBIDxMLviRFFw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-debug-log": "^1.0.0", + "bare-format": "^1.0.0", + "bare-inspect": "^3.0.0" + } + }, + "node_modules/bare-v8-to-istanbul": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/bare-v8-to-istanbul/-/bare-v8-to-istanbul-1.0.0.tgz", + "integrity": "sha512-5xm9ykzWrk7ntC0Ps2tnNwlFlEAMb3Rk0w/WlwJ/A1xboTQKa9f+NO/31PXB5LspMaz9Qv2pnIwiiHWEnk+kXQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "assert": "npm:bare-assert", + "bare-assert": "^1.0.2", + "bare-fs": "^4.1.2", + "bare-path": "^3.0.0", + "bare-process": "^4.2.0", + "bare-url": "^2.1.5", + "bare-utils": "^1.2.0", + "fs": "npm:bare-fs", + "path": "npm:bare-path", + "process": "npm:bare-process", + "url": "npm:bare-url", + "util": "npm:bare-utils", + "v8-to-istanbul": "^9.3.0", + "which-runtime": "^1.2.1" + } + }, + "node_modules/bare-ws": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/bare-ws/-/bare-ws-2.0.1.tgz", + "integrity": "sha512-ugewb5bmg3k4ICBe1Rkd6Z80/E082xDjyrVDMfk/4HJoTeqIiDZ+hJKJMEXsyfo482Gk6QpNq0ixRjIIumpubA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-crypto": "^1.2.0", + "bare-events": "^2.3.1", + "bare-http1": "^4.0.0", + "bare-https": "^2.0.0", + "bare-stream": "^2.1.2" + } + }, + "node_modules/big-sparse-array": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/big-sparse-array/-/big-sparse-array-1.0.3.tgz", + "integrity": "sha512-6RjV/3mSZORlMdpUaQ6rUSpG637cZm0//E54YYGtQg1c1O+AbZP8UTdJ/TchsDZcTVLmyWZcseBfp2HBeXUXOQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/brittle": { + "version": "3.16.2", + "resolved": "https://registry.npmjs.org/brittle/-/brittle-3.16.2.tgz", + "integrity": "sha512-wST8oJbMEhLoy1gZ8x4x1FUTfzcwnMTsvkWbUmtG8068Q/4/9gfkcZh9WpmhDmD0VESALpZpB8SmnTYpU/jWPQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.0", + "bare-cov": "^1.1.0", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "bare-subprocess": "^5.0.0", + "error-stack-parser": "^2.1.4", + "globbie": "^1.0.2", + "paparam": "^1.6.2", + "same-object": "^1.0.2", + "test-tmp": "^1.4.0", + "tmatch": "^5.0.0" + }, + "bin": { + "brittle": "bin/node.js", + "brittle-bare": "bin/bare.js", + "brittle-node": "bin/node.js", + "brittle-pear": "bin/pear.js" + } + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/builtins/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/call-bind": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/compact-encoding": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/compact-encoding/-/compact-encoding-2.16.1.tgz", + "integrity": "sha512-vP39X4nwtesmZucaAxDg4wnudOoaJTSR+fikzi8VLVxbwLmcWXf3t0LxY0n2H1AMpdoQZ08lmUf4GY3XiDPnMQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.3.0" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/crc-native": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/crc-native/-/crc-native-1.1.7.tgz", + "integrity": "sha512-LUQBHdOOGZGYWsGSIYbh9oPNkovh/xNr5B6IBAgt2XTU9AskamfrHDSNTUhrYLO6wGv25EHKxjuUlZEZlWVz/A==", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "require-addon": "^1.1.0" + } + }, + "node_modules/crc-universal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/crc-universal/-/crc-universal-1.0.4.tgz", + "integrity": "sha512-CE9xWEI6Gd5V0Bdmj5NoWH3d7+EIe4zUpy1sv6uvKYznzsDP1vhiWsTBmL6q9IrH2P6RRshp+8AkhR4CMtY5Hg==", + "dev": true, + "license": "ISC", + "optionalDependencies": { + "crc-native": "^1.0.3" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/data-view-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/inspect-js" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/error-stack-parser": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", + "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "stackframe": "^1.3.4" + } + }, + "node_modules/es-abstract": { + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "data-view-buffer": "^1.0.2", + "data-view-byte-length": "^1.0.2", + "data-view-byte-offset": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.1.0", + "es-to-primitive": "^1.3.0", + "function.prototype.name": "^1.1.8", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.0", + "get-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.2", + "is-regex": "^1.2.1", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.0", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.3", + "object-keys": "^1.1.1", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.3", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.18" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz", + "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.6", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "iterator.prototype": "^1.1.4", + "safe-array-concat": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-to-primitive": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" + } + }, + "node_modules/eslint-config-standard-jsx": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", + "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "peerDependencies": { + "eslint": "^8.8.0", + "eslint-plugin-react": "^7.28.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", + "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", + "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rtsao/scc": "^1.1.0", + "array-includes": "^3.1.8", + "array.prototype.findlastindex": "^1.2.5", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.12.0", + "hasown": "^2.0.2", + "is-core-module": "^2.15.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.8", + "object.groupby": "^1.0.3", + "object.values": "^1.2.0", + "semver": "^6.3.1", + "string.prototype.trimend": "^1.0.8", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz", + "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.37.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz", + "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.3", + "array.prototype.tosorted": "^1.1.4", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.2.1", + "estraverse": "^5.3.0", + "hasown": "^2.0.2", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.9", + "object.fromentries": "^2.0.8", + "object.values": "^1.2.1", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.5", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.12", + "string.prototype.repeat": "^1.0.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-fifo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", + "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", + "license": "MIT" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flat-tree": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/flat-tree/-/flat-tree-1.12.1.tgz", + "integrity": "sha512-GchQ+onbnw5QaqsGbpcV6c8etAd396X/EVdDxutQMkGapB0lRvV9heIXS6ZffQVCse0hm2hBpK7GJz2Zp7qiMg==", + "dev": true, + "license": "MIT" + }, + "node_modules/flatted": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, + "license": "ISC" + }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/fs": { + "name": "bare-fs", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.4.tgz", + "integrity": "sha512-r8+26Voz8dGX3AYpJdFb1ZPaUSM8XOLCZvy+YGpRTmwPHIxA7Z3Jov/oMPtV7hfRQbOnH8qGlLTzQAbgtdNN0Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.4", + "bare-path": "^3.0.0", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/fs-native-extensions": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/fs-native-extensions/-/fs-native-extensions-1.4.2.tgz", + "integrity": "sha512-QoQqYdHJTtfHUUO/ylyKSrt3dtPDyXCAjzveqCxPsV3hpIMNt455ua470+iTKJ8lFZ94pLC6Dv1TBbwOFLiV5w==", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.0" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/globbie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/globbie/-/globbie-1.0.2.tgz", + "integrity": "sha512-815R4zBxKIOnMuj9Qf0zlx3VeyDqqX9Oi2KIjRFtofyyUcZCmL8tGAamXG+VTGukLva8MFQDkmTDG8wvVTYF7Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-fs": "^4.1.2", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "brittle": "^3.6.0", + "picomatch": "^4.0.2" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/has-bigints": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/hypercore": { + "version": "10.38.2", + "resolved": "https://registry.npmjs.org/hypercore/-/hypercore-10.38.2.tgz", + "integrity": "sha512-2vx42g2RKdP/o2XzlxKfvgEaZ3+h/B855gCR8iscUDnxUoOZej7vXZ2buex0sweDUEW5aEfMxFR6o5hncio3Nw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@hyperswarm/secret-stream": "^6.0.0", + "b4a": "^1.1.0", + "bare-events": "^2.2.0", + "big-sparse-array": "^1.0.3", + "compact-encoding": "^2.11.0", + "crc-universal": "^1.0.2", + "fast-fifo": "^1.3.0", + "flat-tree": "^1.9.0", + "hypercore-crypto": "^3.2.1", + "hypercore-errors": "^1.2.0", + "hypercore-id-encoding": "^1.2.0", + "is-options": "^1.0.1", + "protomux": "^3.5.0", + "quickbit-universal": "^2.2.0", + "random-access-file": "^4.0.0", + "random-array-iterator": "^1.0.0", + "safety-catch": "^1.0.1", + "sodium-universal": "^4.0.0", + "streamx": "^2.12.4", + "unslab": "^1.3.0", + "xache": "^1.1.0", + "z32": "^1.0.0" + } + }, + "node_modules/hypercore-crypto": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-3.6.0.tgz", + "integrity": "sha512-0slkW1wzq4B95SD8Z5nt1Yf/3KrIcGsBWTJTsCjHzMXie+sZ5I2IkWcxX1mo4+c0xVESnKAKphKSpGf2kf2BGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "b4a": "^1.6.6", + "compact-encoding": "^2.15.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/hypercore-crypto/node_modules/sodium-native": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-5.0.1.tgz", + "integrity": "sha512-Q305aUXc0OzK7VVRvWkeEQJQIHs6slhFwWpyqLB5iJqhpyt2lYIVu96Y6PQ7TABIlWXVF3YiWDU3xS2Snkus+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.1" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/hypercore-crypto/node_modules/sodium-universal": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-5.0.1.tgz", + "integrity": "sha512-rv+aH+tnKB5H0MAc2UadHShLMslpJsc4wjdnHRtiSIEYpOetCgu8MS4ExQRia+GL/MK3uuCyZPeEsi+J3h+Q+Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "sodium-native": "^5.0.1" + }, + "peerDependencies": { + "sodium-javascript": "~0.8.0" + }, + "peerDependenciesMeta": { + "sodium-javascript": { + "optional": true + } + } + }, + "node_modules/hypercore-errors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/hypercore-errors/-/hypercore-errors-1.4.0.tgz", + "integrity": "sha512-WoaT467lNbDCglxisthpoC1mpBOH/CoM5IADPQm6BvPzZqXca1S6N1uoflLnZOIre9klCr1SdUnLgDWXLalJ7A==", + "license": "Apache-2.0" + }, + "node_modules/hypercore-id-encoding": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/hypercore-id-encoding/-/hypercore-id-encoding-1.3.0.tgz", + "integrity": "sha512-W6sHdGo5h7LXEsoWfKf/KfuROZmZRQDlGqJF2EPHW+noCK66Vvr0+zE6cL0vqQi18s0kQPeN7Sq3QyR0Ytc2VQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.5.3", + "z32": "^1.0.0" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/internal-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-async-function": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", + "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "async-function": "^1.0.0", + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-boolean-object": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz", + "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-generator-function": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number-object": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-options": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-options/-/is-options-1.0.2.tgz", + "integrity": "sha512-u+Ai74c8Q74aS8BuHwPdI1jptGOT1FQXgCq8/zv0xRuE+wRgSMEJLj8lVO8Zp9BeGb29BXY6AsNPinfqjkr7Fg==", + "dev": true, + "license": "MIT", + "dependencies": { + "b4a": "^1.1.1" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-string": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz", + "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/iterator.prototype": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz", + "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "get-proto": "^1.0.0", + "has-symbols": "^1.1.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/load-json-file": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", + "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^4.0.0", + "pify": "^4.0.1", + "strip-bom": "^3.0.0", + "type-fest": "^0.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=6" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/mutexify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/mutexify/-/mutexify-1.4.0.tgz", + "integrity": "sha512-pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg==", + "license": "MIT", + "dependencies": { + "queue-tick": "^1.0.0" + } + }, + "node_modules/nanoassert": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-2.0.0.tgz", + "integrity": "sha512-7vO7n28+aYO4J+8w96AzhmU8G+Y/xpPDJz/se19ICsqj/momRbb9mh9ZUtkoJ5X3nTnPdhEJyc0qnM6yAsHBaA==", + "dev": true, + "license": "ISC" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/noise-curve-ed": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/noise-curve-ed/-/noise-curve-ed-2.1.0.tgz", + "integrity": "sha512-zAzJx+VwZM3w6EA1hTmDhJfvAnCeBQn/1FAeZ0LtGxCcCtlAK/uJXQVF/eDVUOaAZ286lHlx77WJ+qj9SmsRRg==", + "dev": true, + "license": "ISC", + "dependencies": { + "b4a": "^1.1.0", + "nanoassert": "^2.0.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/noise-curve-ed/node_modules/sodium-native": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-5.0.1.tgz", + "integrity": "sha512-Q305aUXc0OzK7VVRvWkeEQJQIHs6slhFwWpyqLB5iJqhpyt2lYIVu96Y6PQ7TABIlWXVF3YiWDU3xS2Snkus+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.1" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/noise-curve-ed/node_modules/sodium-universal": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-5.0.1.tgz", + "integrity": "sha512-rv+aH+tnKB5H0MAc2UadHShLMslpJsc4wjdnHRtiSIEYpOetCgu8MS4ExQRia+GL/MK3uuCyZPeEsi+J3h+Q+Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "sodium-native": "^5.0.1" + }, + "peerDependencies": { + "sodium-javascript": "~0.8.0" + }, + "peerDependenciesMeta": { + "sodium-javascript": { + "optional": true + } + } + }, + "node_modules/noise-handshake": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/noise-handshake/-/noise-handshake-4.1.0.tgz", + "integrity": "sha512-ZHt2+mOXTvjtaWS2h/JPvQjmknfKrEld2xdSsRYWXnYiJmK/N+dtxrDVSt1cr9wGAlhH7Ek43lIZNsL5bVeX9A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.1.0", + "nanoassert": "^2.0.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/noise-handshake/node_modules/sodium-native": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-5.0.1.tgz", + "integrity": "sha512-Q305aUXc0OzK7VVRvWkeEQJQIHs6slhFwWpyqLB5iJqhpyt2lYIVu96Y6PQ7TABIlWXVF3YiWDU3xS2Snkus+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.1" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/noise-handshake/node_modules/sodium-universal": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-5.0.1.tgz", + "integrity": "sha512-rv+aH+tnKB5H0MAc2UadHShLMslpJsc4wjdnHRtiSIEYpOetCgu8MS4ExQRia+GL/MK3uuCyZPeEsi+J3h+Q+Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "sodium-native": "^5.0.1" + }, + "peerDependencies": { + "sodium-javascript": "~0.8.0" + }, + "peerDependenciesMeta": { + "sodium-javascript": { + "optional": true + } + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz", + "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.values": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/paparam": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/paparam/-/paparam-1.8.3.tgz", + "integrity": "sha512-OLLDV8E+QoDGpHKW+7Fv7yLKJp7iMncaowH2s0oEuix6UXxHHxW8Tg0m0+IePR017UgyEg3CVlYSb1ON5BscVQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "license": "MIT", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/path": { + "name": "bare-path", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", + "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", + "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^3.0.0", + "load-json-file": "^5.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/process": { + "name": "bare-process", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/bare-process/-/bare-process-4.2.1.tgz", + "integrity": "sha512-wcmyQWTHxd2xRgeKUSY46ofmuEAJ9CLo/6swJTHOZFPYpBShMWNPVI2Ba8o0n/X/YE4as99M28x37saWZ1L1vQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.3.1", + "bare-hrtime": "^2.0.0", + "bare-os": "^3.5.0", + "bare-pipe": "^4.0.0", + "bare-signals": "^4.0.0", + "bare-tty": "^5.0.0" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, + "license": "MIT", + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/protomux": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/protomux/-/protomux-3.10.1.tgz", + "integrity": "sha512-jgBqx8ZyaBWea/DFG4eOu1scOaeBwcnagiRC1XFVrjeGt7oAb0Pk5udPpBUpJ4DJBRjra50jD6YcZiQQTRqaaA==", + "dev": true, + "license": "MIT", + "dependencies": { + "b4a": "^1.3.1", + "compact-encoding": "^2.5.1", + "queue-tick": "^1.0.0", + "safety-catch": "^1.0.1", + "unslab": "^1.3.0" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/queue-tick": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", + "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", + "license": "MIT" + }, + "node_modules/quickbit-native": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/quickbit-native/-/quickbit-native-2.4.4.tgz", + "integrity": "sha512-1f2h2v1cvowLIaSNKKT6vM3v2GSHV24jgXo7BWYEdBFR8KVXirWrngXedyexLvJt825uV2fNcd7eULuqd3J0CA==", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "require-addon": "^1.1.0" + } + }, + "node_modules/quickbit-universal": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/quickbit-universal/-/quickbit-universal-2.2.0.tgz", + "integrity": "sha512-w02i1R8n7+6pEKTud8DfF8zbFY9o7RtPlUc3jWbtCkDKvhbx/AvV7oNnz4/TcmsPGpSJS+fq5Ud6RH6+YPvSGg==", + "dev": true, + "license": "ISC", + "dependencies": { + "b4a": "^1.6.0", + "simdle-universal": "^1.1.0" + }, + "optionalDependencies": { + "quickbit-native": "^2.2.0" + } + }, + "node_modules/random-access-file": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/random-access-file/-/random-access-file-4.1.2.tgz", + "integrity": "sha512-GQM6R78DceZDcQod8KxlDFwXIiUvlvuy1EOzxTDsjuDjW5NlnlZi0MOk6iI4itAj/2vcvdqcEExYbVpC/dJcEw==", + "dev": true, + "license": "MIT", + "dependencies": { + "bare-fs": "^4.0.1", + "bare-path": "^3.0.0", + "random-access-storage": "^3.0.0" + }, + "optionalDependencies": { + "fs-native-extensions": "^1.3.1" + } + }, + "node_modules/random-access-memory": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/random-access-memory/-/random-access-memory-6.2.1.tgz", + "integrity": "sha512-hUeu1PbGLmWeyze9LwwSNaqloivNYjFsARIYxRdgUgn0wrdvMG+RszrfTG8814zfcXOgy4pFO2TpX/Cl3hRO4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "b4a": "^1.6.0", + "is-options": "^1.0.2", + "random-access-storage": "^3.0.0" + } + }, + "node_modules/random-access-storage": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/random-access-storage/-/random-access-storage-3.0.2.tgz", + "integrity": "sha512-Es9maUyWdJXWKckKy9s1+vT+DEgAt+PBb9lxPaake/0EDUsHehloKGv9v1zimS2V3gpFAcQXubvc1Rgci2sDPQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "bare-events": "^2.2.0", + "queue-tick": "^1.0.0" + } + }, + "node_modules/random-array-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-array-iterator/-/random-array-iterator-1.0.0.tgz", + "integrity": "sha512-u7xCM93XqKEvPTP6xZp2ehttcAemKnh73oKNf1FvzuVCfpt6dILDt1Kxl1LeBjm2iNIeR49VGFhy4Iz3yOun+Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/require-addon": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/require-addon/-/require-addon-1.1.0.tgz", + "integrity": "sha512-KbXAD5q2+v1GJnkzd8zzbOxchTkStSyJZ9QwoCq3QwEXAaIlG3wDYRZGzVD357jmwaGY7hr5VaoEAL0BkF0Kvg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-addon-resolve": "^1.3.0", + "bare-url": "^2.1.0" + }, + "engines": { + "bare": ">=1.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safety-catch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/safety-catch/-/safety-catch-1.0.2.tgz", + "integrity": "sha512-C1UYVZ4dtbBxEtvOcpjBaaD27nP8MlvyAQEp2fOTOEe6pfUpk1cDUxij6BR1jZup6rSyUTaBBplK7LanskrULA==", + "dev": true, + "license": "MIT" + }, + "node_modules/same-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/same-object/-/same-object-1.0.2.tgz", + "integrity": "sha512-csHWhvUsLbIOHDM/nP+KHWM+BLPsIzWkFa8HbzaI0G7BqKXgx+7FJpKTGgLXyz5amfdY2OVBcmXTqYOMEk04og==", + "dev": true, + "license": "MIT" + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/simdle-native": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/simdle-native/-/simdle-native-1.3.6.tgz", + "integrity": "sha512-WXb3AUnMVOgfMbrOlz0SVpL8pMpC9K2WX/wJ7k5alqza77tO/4vCF7pUtuiPJdMxEBIsX30joKRY7JWRJ4yHqQ==", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "b4a": "^1.6.0", + "require-addon": "^1.1.0" + } + }, + "node_modules/simdle-universal": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/simdle-universal/-/simdle-universal-1.1.2.tgz", + "integrity": "sha512-3n3w1bs+uwgHKQjt6arez83EywNlhZzYvNOhvAASTl/8KqNIcqr6aHyGt3JRlfuUC7iB0tomJRPlJ2cRGIpBzA==", + "dev": true, + "license": "ISC", + "dependencies": { + "b4a": "^1.6.0" + }, + "optionalDependencies": { + "simdle-native": "^1.1.1" + } + }, + "node_modules/sodium-native": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.3.3.tgz", + "integrity": "sha512-OnxSlN3uyY8D0EsLHpmm2HOFmKddQVvEMmsakCrXUzSd8kjjbzL413t4ZNF3n0UxSwNgwTyUvkmZHTfuCeiYSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "require-addon": "^1.1.0" + } + }, + "node_modules/sodium-secretstream": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/sodium-secretstream/-/sodium-secretstream-1.2.0.tgz", + "integrity": "sha512-q/DbraNFXm1KfCiiZvapmz5UC3OlpirYFIvBK2MhGaOFSb3gRyk8OXTi17UI9SGfshQNCpsVvlopogbzZNyW6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "b4a": "^1.1.1", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/sodium-secretstream/node_modules/sodium-native": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-5.0.1.tgz", + "integrity": "sha512-Q305aUXc0OzK7VVRvWkeEQJQIHs6slhFwWpyqLB5iJqhpyt2lYIVu96Y6PQ7TABIlWXVF3YiWDU3xS2Snkus+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.1" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/sodium-secretstream/node_modules/sodium-universal": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-5.0.1.tgz", + "integrity": "sha512-rv+aH+tnKB5H0MAc2UadHShLMslpJsc4wjdnHRtiSIEYpOetCgu8MS4ExQRia+GL/MK3uuCyZPeEsi+J3h+Q+Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "sodium-native": "^5.0.1" + }, + "peerDependencies": { + "sodium-javascript": "~0.8.0" + }, + "peerDependenciesMeta": { + "sodium-javascript": { + "optional": true + } + } + }, + "node_modules/sodium-universal": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-4.0.1.tgz", + "integrity": "sha512-sNp13PrxYLaUFHTGoDKkSDFvoEu51bfzE12RwGlqU1fcrkpAOK0NvizaJzOWV0Omtk9me2+Pnbjcf/l0efxuGQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "sodium-native": "^4.0.0" + }, + "peerDependencies": { + "sodium-javascript": "~0.8.0" + }, + "peerDependenciesMeta": { + "sodium-javascript": { + "optional": true + } + } + }, + "node_modules/speedometer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz", + "integrity": "sha512-z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ==", + "license": "MIT" + }, + "node_modules/stackframe": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", + "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==", + "dev": true, + "license": "MIT" + }, + "node_modules/standard": { + "version": "17.1.2", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.2.tgz", + "integrity": "sha512-WLm12WoXveKkvnPnPnaFUUHuOB2cUdAsJ4AiGHL2G0UNMrcRAWY2WriQaV8IQ3oRmYr0AWUbLNr94ekYFAHOrA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "eslint": "^8.41.0", + "eslint-config-standard": "17.1.0", + "eslint-config-standard-jsx": "^11.0.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.36.1", + "standard-engine": "^15.1.0", + "version-guard": "^1.1.1" + }, + "bin": { + "standard": "bin/cmd.cjs" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/standard-engine": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", + "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "get-stdin": "^8.0.0", + "minimist": "^1.2.6", + "pkg-conf": "^3.1.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/streamx": { + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz", + "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==", + "license": "MIT", + "dependencies": { + "fast-fifo": "^1.3.2", + "text-decoder": "^1.1.0" + }, + "optionalDependencies": { + "bare-events": "^2.2.0" + } + }, + "node_modules/string.prototype.matchall": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", + "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "regexp.prototype.flags": "^1.5.3", + "set-function-name": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/test-tmp": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/test-tmp/-/test-tmp-1.4.0.tgz", + "integrity": "sha512-GVggxGg+jXqP2Wbju50JVLo+9E+nIOPPyWqgr63EbOnNItIKu1cEbJpTWAJeflnyGqXOtcMI7ijHRp88GUkfDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bare-fs": "^4.0.1", + "bare-os": "^3.3.0", + "bare-path": "^3.0.0" + } + }, + "node_modules/text-decoder": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", + "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/timeout-refresh": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-2.0.1.tgz", + "integrity": "sha512-SVqEcMZBsZF9mA78rjzCrYrUs37LMJk3ShZ851ygZYW1cMeIjs9mL57KO6Iv5mmjSQnOe/29/VAfGXo+oRCiVw==", + "dev": true, + "license": "MIT" + }, + "node_modules/tmatch": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/tmatch/-/tmatch-5.0.0.tgz", + "integrity": "sha512-Ib9OtBkpHn07tXP04SlN1SYRxFgTk6wSM2EBmjjxug4u5RXPRVLkdFJSS1PmrQidaSB8Lru9nRtViQBsbxzE5Q==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unbox-primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-bigints": "^1.0.2", + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unslab": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/unslab/-/unslab-1.3.0.tgz", + "integrity": "sha512-YATkfKAFj47kTzmiQrWXMyRvaVrHsW6MEALa4bm+FhiA2YG4oira+Z3DXN6LrYOYn2Y8eO94Lwl9DOHjs1FpoQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.6" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url": { + "name": "bare-url", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.6.tgz", + "integrity": "sha512-FgjDeR+/yDH34By4I0qB5NxAoWv7dOTYcOXwn73kr+c93HyC2lU6tnjifqUe33LKMJcDyCYPQjEAqgOQiXkE2Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-path": "^3.0.0" + } + }, + "node_modules/util": { + "name": "bare-utils", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/bare-utils/-/bare-utils-1.2.0.tgz", + "integrity": "sha512-Y9G5DbMUgcx078Etc7h9CD31aI9vYFZ/xl6JLnyvBX9+4lrlXw+5/6toNJGaNSylo4jJf8Cu3yBIDxMLviRFFw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-debug-log": "^1.0.0", + "bare-format": "^1.0.0", + "bare-inspect": "^3.0.0" + } + }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/version-guard": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.3.tgz", + "integrity": "sha512-JwPr6erhX53EWH/HCSzfy1tTFrtPXUe927wdM1jqBBeYp1OM+qPHjWbsvv6pIBduqdgxxS+ScfG7S28pzyr2DQ==", + "dev": true, + "license": "0BSD", + "engines": { + "node": ">=0.10.48" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", + "is-async-function": "^2.0.0", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", + "is-generator-function": "^1.0.10", + "is-regex": "^1.2.1", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.1.0", + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-runtime": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-runtime/-/which-runtime-1.2.1.tgz", + "integrity": "sha512-8feIHccQFH/whiA1fD1b4c5+Q7T4ry1g1oHYc2mHnFh81tTQFsCvy3zhS2geUapkFAVBddUT/AM1a3rbqJweFg==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/xache": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/xache/-/xache-1.2.1.tgz", + "integrity": "sha512-igRS6jPreJ54ABdzhh4mCDXcz+XMaWO2q1ABRV2yWYuk29jlp8VT7UBdCqNkX7rpYBbXsebVVKkwIuYZjyZNqA==", + "dev": true, + "license": "MIT" + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/z32": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/z32/-/z32-1.1.0.tgz", + "integrity": "sha512-1WUHy+VS6d0HPNspDxvLssBbeQjXMjSnpv0vH82vRAUfg847NmX3OXozp/hRP5jPhxBbrVzrgvAt+UsGNzRFQQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "b4a": "^1.5.3" + } + } + } +} diff --git a/pkgs/by-name/hy/hyperblobs/package.nix b/pkgs/by-name/hy/hyperblobs/package.nix new file mode 100644 index 000000000000..da3526954fdb --- /dev/null +++ b/pkgs/by-name/hy/hyperblobs/package.nix @@ -0,0 +1,47 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "hyperblobs"; + version = "2.8.0"; + + src = fetchFromGitHub { + owner = "holepunchto"; + repo = "hyperblobs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-cj716lDyQj7IVbAmfQaKagfR1+ZYoQgOTXIn/3d+KEA="; + }; + + npmDepsHash = "sha256-9/hoj+ktd5DyBjGnhPFpC3b7A+XjWWoFhbvvW+o8DBc="; + + dontNpmBuild = true; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + npm run test + + runHook postCheck + ''; + + postPatch = '' + cp ${./package-lock.json} ./package-lock.json + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Blob Store for Hypercore"; + homepage = "https://github.com/holepunchto/hyperblobs"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ ]; + }; +}) diff --git a/pkgs/by-name/hy/hypercore/package-lock.json b/pkgs/by-name/hy/hypercore/package-lock.json new file mode 100644 index 000000000000..686597510833 --- /dev/null +++ b/pkgs/by-name/hy/hypercore/package-lock.json @@ -0,0 +1,5272 @@ +{ + "name": "hypercore", + "version": "11.7.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "hypercore", + "version": "11.7.0", + "license": "MIT", + "dependencies": { + "@hyperswarm/secret-stream": "^6.0.0", + "b4a": "^1.1.0", + "bare-events": "^2.2.0", + "big-sparse-array": "^1.0.3", + "compact-encoding": "^2.11.0", + "fast-fifo": "^1.3.0", + "flat-tree": "^1.9.0", + "hypercore-crypto": "^3.2.1", + "hypercore-errors": "^1.2.0", + "hypercore-id-encoding": "^1.2.0", + "hypercore-storage": "^1.0.0", + "is-options": "^1.0.1", + "nanoassert": "^2.0.0", + "protomux": "^3.5.0", + "quickbit-universal": "^2.2.0", + "random-array-iterator": "^1.0.0", + "safety-catch": "^1.0.1", + "sodium-universal": "^5.0.1", + "streamx": "^2.12.4", + "unslab": "^1.3.0", + "z32": "^1.0.0" + }, + "devDependencies": { + "brittle": "^3.0.0", + "debugging-stream": "^3.1.0", + "hyperswarm": "^4.3.6", + "rache": "^1.0.0", + "range-parser": "^1.2.1", + "speedometer": "^1.1.0", + "standard": "^17.0.0", + "test-tmp": "^1.0.2", + "tiny-byte-size": "^1.1.0", + "udx-native": "^1.6.1", + "uncaughts": "^1.1.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", + "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@hyperswarm/secret-stream": { + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/@hyperswarm/secret-stream/-/secret-stream-6.8.1.tgz", + "integrity": "sha512-F3fr8CKB6za9Ac7ifjgAe07qnnesl5kS0MtLsyKxA1Og8E+FZykdwLpgoLjnEa7G6E1L56lASLr42E4kd20sog==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.1.0", + "hypercore-crypto": "^3.3.1", + "noise-curve-ed": "^2.0.1", + "noise-handshake": "^4.0.0", + "sodium-secretstream": "^1.1.0", + "sodium-universal": "^5.0.0", + "streamx": "^2.14.0", + "timeout-refresh": "^2.0.0", + "unslab": "^1.3.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@rtsao/scc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", + "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, + "license": "ISC" + }, + "node_modules/acorn": { + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-includes": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz", + "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "es-shim-unscopables": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", + "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/assert": { + "name": "bare-assert", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bare-assert/-/bare-assert-1.0.2.tgz", + "integrity": "sha512-7AGTrUCz7OOWnMOp4hWnksAkFeZlvW7WMwvKQBANVJIOtjWa6RLSPyUN+zs3QBufRZwIYhYB3UpkAlDbBPp2/Q==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/async-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", + "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/b4a": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", + "license": "Apache-2.0" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/bare-addon-resolve": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/bare-addon-resolve/-/bare-addon-resolve-1.9.4.tgz", + "integrity": "sha512-unn6Vy/Yke6F99vg/7tcrvM2KUvIhTNniaSqDbam4AWkd4NhvDVSrQiRYVlNzUV2P7SPobkCK7JFVxrJk9btCg==", + "license": "Apache-2.0", + "dependencies": { + "bare-module-resolve": "^1.10.0", + "bare-semver": "^1.0.0" + }, + "peerDependencies": { + "bare-url": "*" + }, + "peerDependenciesMeta": { + "bare-url": { + "optional": true + } + } + }, + "node_modules/bare-ansi-escapes": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/bare-ansi-escapes/-/bare-ansi-escapes-2.2.3.tgz", + "integrity": "sha512-02ES4/E2RbrtZSnHJ9LntBhYkLA6lPpSEeP8iqS3MccBIVhVBlEmruF1I7HZqx5Q8aiTeYfQVeqmrU9YO2yYoQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.5" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-assert": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bare-assert/-/bare-assert-1.0.2.tgz", + "integrity": "sha512-7AGTrUCz7OOWnMOp4hWnksAkFeZlvW7WMwvKQBANVJIOtjWa6RLSPyUN+zs3QBufRZwIYhYB3UpkAlDbBPp2/Q==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-cov": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bare-cov/-/bare-cov-1.1.1.tgz", + "integrity": "sha512-YP0QjpKznC55rn3fc3hOPjcegm1eu/ZHVwS+t1c48O48bWMspWzBY+9a6fI5sb/PGwqv47W4clpnmcy7vKhYrQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-fs": "^4.1.2", + "bare-inspector": "^4.0.1", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "bare-url": "^2.1.5", + "bare-v8-to-istanbul": "v1.0.0", + "picomatch": "^4.0.2", + "which-runtime": "^1.2.1" + } + }, + "node_modules/bare-crypto": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/bare-crypto/-/bare-crypto-1.4.4.tgz", + "integrity": "sha512-xssBzK7GpQUc70sk++eibRs0moYcqVqbODrPZCT3h8bXnw4aUt4ntSzgkclriKCNjgEoS3nZGcSH5hW3HMKowA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.3" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-debug-log": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bare-debug-log/-/bare-debug-log-2.0.0.tgz", + "integrity": "sha512-Vi42PkMQsNV9PUpx2Gl1hikshx5O9FzMJ6o9Nnopseg7qLBBK7Nl31d0RHcfwLEAfmcPApytpc0ZFfq68u22FQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/bare-dns": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/bare-dns/-/bare-dns-2.0.5.tgz", + "integrity": "sha512-C8JF4f/nXXtzyyqyKaSs74HgYZCW3VcG836D0nmANQWGgZlKpw6VMHfpAZM7O4ljcyaNYxdq9pOKE+WXh3AOgA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-env": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-env/-/bare-env-3.0.0.tgz", + "integrity": "sha512-0u964P5ZLAxTi+lW4Kjp7YRJQ5gZr9ycYOtjLxsSrupgMz3sn5Z9n4SH/JIifHwvadsf1brA2JAjP+9IOWwTiw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/bare-events": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz", + "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==", + "license": "Apache-2.0" + }, + "node_modules/bare-format": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bare-format/-/bare-format-1.0.1.tgz", + "integrity": "sha512-1oS+LZrWK6tnYnvNSHDGljc2MPunRxwhpFriuCgzNF+oklrnwmBKD91tS0yt+jpl2j3UgcSDzBIMiVTvLs9A8w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-inspect": "^3.0.0" + } + }, + "node_modules/bare-fs": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.5.tgz", + "integrity": "sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==", + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.4", + "bare-path": "^3.0.0", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-hrtime": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/bare-hrtime/-/bare-hrtime-2.0.11.tgz", + "integrity": "sha512-Mnb2rnGRSHzNHQwFrK8VVqD8Oob/CiSsBlgZGKQ1xTj25GPI19sXHjUPzrkHOU1DaoVj1ig1VO7rZGaYOfXPaw==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-http1": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bare-http1/-/bare-http1-4.0.2.tgz", + "integrity": "sha512-6Jns5oBG9LFz/U2PuFk2LHQbQ1ZuUgPyuahfbNikPL/HcjpSGdSl0xMiN3Qt852Xm1sLBsTGxl0OoM2cVCYzNQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.0.0", + "bare-stream": "^2.3.0", + "bare-tcp": "^2.0.0" + } + }, + "node_modules/bare-https": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bare-https/-/bare-https-2.0.0.tgz", + "integrity": "sha512-qmjNZmYQ4nn+k3CLlxVyOqWYamdBPqE7psR5/lFWG39fskAR4C2h29d1Ka5BeWOGDAWhXImFIwZUxwCE/7xeLA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-http1": "^4.0.0", + "bare-tcp": "^2.0.0", + "bare-tls": "^2.0.0" + } + }, + "node_modules/bare-inspect": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/bare-inspect/-/bare-inspect-3.0.8.tgz", + "integrity": "sha512-Z3McUtoM/saxTBtr7l4M9ADR1m5foXwtxJrO1OPaBLN25M4lNHVm7uwL9e0qlS8kuLXTI41TLEN4S9veJ3EJJA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-ansi-escapes": "^2.1.0", + "bare-type": "^1.0.0" + } + }, + "node_modules/bare-inspector": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/bare-inspector/-/bare-inspector-4.0.1.tgz", + "integrity": "sha512-MZGIci2OFzwDNWlY/JUmEVtK/0xa+mbdggOB0jSI0WYkQpyxaiD4q/8xZ42k4kOoZNLKpYMI31wmllm6jS5w9g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.1.0", + "bare-http1": "^4.0.0", + "bare-stream": "^2.0.0", + "bare-url": "^2.0.0", + "bare-ws": "^2.0.0" + }, + "engines": { + "bare": ">=1.2.0" + } + }, + "node_modules/bare-module-resolve": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/bare-module-resolve/-/bare-module-resolve-1.10.2.tgz", + "integrity": "sha512-C9COe/GhWfVXKytW3DElTkiBU+Gb2OXeaVkdGdRB/lp26TVLESHkTGS876iceAGdvtPgohfp9nX8vXHGvN3++Q==", + "license": "Apache-2.0", + "dependencies": { + "bare-semver": "^1.0.0" + }, + "peerDependencies": { + "bare-url": "*" + }, + "peerDependenciesMeta": { + "bare-url": { + "optional": true + } + } + }, + "node_modules/bare-os": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz", + "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==", + "license": "Apache-2.0", + "engines": { + "bare": ">=1.14.0" + } + }, + "node_modules/bare-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", + "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/bare-pipe": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/bare-pipe/-/bare-pipe-4.0.6.tgz", + "integrity": "sha512-S9kpDJq74gkceynfRqXCaED119k2jF2us4U9xZnTLX0GEduWQY29MNTpAMAf/ucEailW9SPLjGLzbfPCONz3Lw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.0.0", + "bare-stream": "^2.0.0" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-process": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/bare-process/-/bare-process-4.2.1.tgz", + "integrity": "sha512-wcmyQWTHxd2xRgeKUSY46ofmuEAJ9CLo/6swJTHOZFPYpBShMWNPVI2Ba8o0n/X/YE4as99M28x37saWZ1L1vQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.3.1", + "bare-hrtime": "^2.0.0", + "bare-os": "^3.5.0", + "bare-pipe": "^4.0.0", + "bare-signals": "^4.0.0", + "bare-tty": "^5.0.0" + } + }, + "node_modules/bare-semver": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bare-semver/-/bare-semver-1.0.1.tgz", + "integrity": "sha512-UtggzHLiTrmFOC/ogQ+Hy7VfoKoIwrP1UFcYtTxoCUdLtsIErT8+SWtOC2DH/snT9h+xDrcBEPcwKei1mzemgg==", + "license": "Apache-2.0" + }, + "node_modules/bare-signals": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bare-signals/-/bare-signals-4.0.2.tgz", + "integrity": "sha512-+V7ngZRbkQDN6OJj1/Evm725HeXvZ3onHI52jBi/LJAe2bSPn2sNZI1Y9xu0MlebhROdRTqa7lpN/OQVDMRt3g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.3", + "bare-os": "^3.3.1" + }, + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-stream": { + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz", + "integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==", + "license": "Apache-2.0", + "dependencies": { + "streamx": "^2.21.0" + }, + "peerDependencies": { + "bare-buffer": "*", + "bare-events": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + }, + "bare-events": { + "optional": true + } + } + }, + "node_modules/bare-subprocess": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/bare-subprocess/-/bare-subprocess-5.0.4.tgz", + "integrity": "sha512-inV6g89grjzvCH7YZ53ppXQj90Ank+vSB2xu9v/yqR8KyA7Q05U/I1AwFi4BaEWMTDz6je5z0TdaNRpUm6dKbA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.5.4", + "bare-os": "^3.0.1", + "bare-pipe": "^4.0.0" + }, + "engines": { + "bare": ">=1.7.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-tcp": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/bare-tcp/-/bare-tcp-2.0.4.tgz", + "integrity": "sha512-Xv0DgOwG0zZwmckY43aRs2iOGewkgXlsBu0oWv3h7Y7sGl8a2tyNe4frxYWRRN3N09SwUJZtid1RSW315MDXmg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-dns": "^2.0.4", + "bare-events": "^2.5.4", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-tls": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/bare-tls/-/bare-tls-2.0.5.tgz", + "integrity": "sha512-Yy/QkenaComG5LWB7u6LetL0witdb85TRbf/llx+byaKtnW0awt98Z4i3eCgZQB++aUWdh/+eXeOBpffCE0INw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-tty": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/bare-tty/-/bare-tty-5.0.2.tgz", + "integrity": "sha512-xOHwI7zZl2Opm7Rul5O+okE32j7O14feJhgovJX2EghtQ2IWVfiC1oH0DmFruMvKthvhZY/Lpg8n5SVBaZhV1A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.2.0", + "bare-signals": "^4.0.0", + "bare-stream": "^2.0.0" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-type": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/bare-type/-/bare-type-1.0.6.tgz", + "integrity": "sha512-6QFeIIp1d06xU9BjDPkl8+QeHil3TKSDpIKUid6bQzwYvxFOnMVhAifRS3J0fvWirEMlWmqxDDKjHW8RPe6C3Q==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "bare": ">=1.2.0" + } + }, + "node_modules/bare-url": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.6.tgz", + "integrity": "sha512-FgjDeR+/yDH34By4I0qB5NxAoWv7dOTYcOXwn73kr+c93HyC2lU6tnjifqUe33LKMJcDyCYPQjEAqgOQiXkE2Q==", + "license": "Apache-2.0", + "dependencies": { + "bare-path": "^3.0.0" + } + }, + "node_modules/bare-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/bare-utils/-/bare-utils-1.2.1.tgz", + "integrity": "sha512-R7fKMh8mr4TwVsIP3MzBc9ZFha1904FMIixWDtuLb5XlNIDQ7It4atE1UND5TZHTB0LpNSj81hL207d2+dU3jQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-debug-log": "^2.0.0", + "bare-format": "^1.0.0", + "bare-inspect": "^3.0.0" + } + }, + "node_modules/bare-v8-to-istanbul": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/bare-v8-to-istanbul/-/bare-v8-to-istanbul-1.0.0.tgz", + "integrity": "sha512-5xm9ykzWrk7ntC0Ps2tnNwlFlEAMb3Rk0w/WlwJ/A1xboTQKa9f+NO/31PXB5LspMaz9Qv2pnIwiiHWEnk+kXQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "assert": "npm:bare-assert", + "bare-assert": "^1.0.2", + "bare-fs": "^4.1.2", + "bare-path": "^3.0.0", + "bare-process": "^4.2.0", + "bare-url": "^2.1.5", + "bare-utils": "^1.2.0", + "fs": "npm:bare-fs", + "path": "npm:bare-path", + "process": "npm:bare-process", + "url": "npm:bare-url", + "util": "npm:bare-utils", + "v8-to-istanbul": "^9.3.0", + "which-runtime": "^1.2.1" + } + }, + "node_modules/bare-ws": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/bare-ws/-/bare-ws-2.0.1.tgz", + "integrity": "sha512-ugewb5bmg3k4ICBe1Rkd6Z80/E082xDjyrVDMfk/4HJoTeqIiDZ+hJKJMEXsyfo482Gk6QpNq0ixRjIIumpubA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-crypto": "^1.2.0", + "bare-events": "^2.3.1", + "bare-http1": "^4.0.0", + "bare-https": "^2.0.0", + "bare-stream": "^2.1.2" + } + }, + "node_modules/big-sparse-array": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/big-sparse-array/-/big-sparse-array-1.0.3.tgz", + "integrity": "sha512-6RjV/3mSZORlMdpUaQ6rUSpG637cZm0//E54YYGtQg1c1O+AbZP8UTdJ/TchsDZcTVLmyWZcseBfp2HBeXUXOQ==", + "license": "MIT" + }, + "node_modules/bits-to-bytes": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/bits-to-bytes/-/bits-to-bytes-1.3.0.tgz", + "integrity": "sha512-OJoHTpFXS9bXHBCekGTByf3MqM8CGblBDIduKQeeVVeiU9dDWywSSirXIBYGgg3d1zbVuvnMa1vD4r6PA0kOKg==", + "dev": true, + "license": "ISC", + "dependencies": { + "b4a": "^1.5.0" + } + }, + "node_modules/blind-relay": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/blind-relay/-/blind-relay-1.4.0.tgz", + "integrity": "sha512-6xt7fDfCs6eGmNNym6I9N42jmjcMQn2qwwOVnkP9ZnrkXFk6c4/tdO1xqRmDEzKzV8gigd+DVdCUG/RUYnen7Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4", + "bare-events": "^2.2.0", + "bits-to-bytes": "^1.3.0", + "compact-encoding": "^2.12.0", + "compact-encoding-bitfield": "^1.0.0", + "protomux": "^3.5.1", + "sodium-universal": "^5.0.0", + "streamx": "^2.15.1" + } + }, + "node_modules/bogon": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/bogon/-/bogon-1.1.0.tgz", + "integrity": "sha512-a6SnToksXHuUlgeMvI/txWmTcKz7c7iBa8f0HbXL4toN1Uza/CTQ4F7n9jSDX49TCpxv3KUP100q4sZfwLyLiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "compact-encoding": "^2.11.0", + "compact-encoding-net": "^1.2.0" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/brittle": { + "version": "3.16.2", + "resolved": "https://registry.npmjs.org/brittle/-/brittle-3.16.2.tgz", + "integrity": "sha512-wST8oJbMEhLoy1gZ8x4x1FUTfzcwnMTsvkWbUmtG8068Q/4/9gfkcZh9WpmhDmD0VESALpZpB8SmnTYpU/jWPQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.0", + "bare-cov": "^1.1.0", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "bare-subprocess": "^5.0.0", + "error-stack-parser": "^2.1.4", + "globbie": "^1.0.2", + "paparam": "^1.6.2", + "same-object": "^1.0.2", + "test-tmp": "^1.4.0", + "tmatch": "^5.0.0" + }, + "bin": { + "brittle": "bin/node.js", + "brittle-bare": "bin/bare.js", + "brittle-node": "bin/node.js", + "brittle-pear": "bin/pear.js" + } + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/builtins/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/call-bind": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/compact-encoding": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/compact-encoding/-/compact-encoding-2.16.1.tgz", + "integrity": "sha512-vP39X4nwtesmZucaAxDg4wnudOoaJTSR+fikzi8VLVxbwLmcWXf3t0LxY0n2H1AMpdoQZ08lmUf4GY3XiDPnMQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.3.0" + } + }, + "node_modules/compact-encoding-bitfield": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/compact-encoding-bitfield/-/compact-encoding-bitfield-1.0.0.tgz", + "integrity": "sha512-3nMVKUg+PF72UHfainmCL8uKvyWfxsjqOtUY+HiMPGLPCTjnwzoKfFAMo1Ad7nwTPdjBqtGK5b3BOFTFW4EBTg==", + "dev": true, + "license": "ISC", + "dependencies": { + "compact-encoding": "^2.4.1" + } + }, + "node_modules/compact-encoding-net": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/compact-encoding-net/-/compact-encoding-net-1.2.0.tgz", + "integrity": "sha512-LVXpNpF7PGQeHRVVLGgYWzuVoYAaDZvKUsUxRioGfkotzvOh4AzoQF1HBH3zMNaSnx7gJXuUr3hkjnijaH/Eng==", + "dev": true, + "license": "ISC", + "dependencies": { + "compact-encoding": "^2.4.1" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/data-view-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/inspect-js" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/debug": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", + "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/debugging-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debugging-stream/-/debugging-stream-3.1.0.tgz", + "integrity": "sha512-WZw2HC1sz5CE0FhFHPsycN9HDDSNr9ytZGnEcYjWaP4dNzePS8EPnuiiQDmhMjQ6vE2K/X2UWoSTOAcCilprCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-fifo": "^1.3.2", + "streamx": "^2.20.2" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/device-file": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/device-file/-/device-file-1.2.6.tgz", + "integrity": "sha512-gHH0lYHWvxjDOstkLji6ExtmYUPtpgICdkEeOuKkodiz111e7rPZP1WWwHlEmvA/gDNQl3KJkbWJ8YDidu3C4A==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.7", + "bare-fs": "^4.0.1", + "fs-native-extensions": "^1.4.0" + } + }, + "node_modules/dht-rpc": { + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/dht-rpc/-/dht-rpc-6.18.1.tgz", + "integrity": "sha512-uTcHj8dERVjmoUsSxqAulQ+qo11Qy4pMK419tyF2cFpyf56Y09u1v9g8yWlay0KjUY5bvdybBQ/V8YWN/wyK5Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "b4a": "^1.6.1", + "bare-events": "^2.2.0", + "compact-encoding": "^2.11.0", + "compact-encoding-net": "^1.2.0", + "fast-fifo": "^1.1.0", + "kademlia-routing-table": "^1.0.1", + "nat-sampler": "^1.0.1", + "sodium-universal": "^5.0.0", + "streamx": "^2.13.2", + "time-ordered-set": "^2.0.0", + "udx-native": "^1.5.3" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/error-stack-parser": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", + "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "stackframe": "^1.3.4" + } + }, + "node_modules/es-abstract": { + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "data-view-buffer": "^1.0.2", + "data-view-byte-length": "^1.0.2", + "data-view-byte-offset": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.1.0", + "es-to-primitive": "^1.3.0", + "function.prototype.name": "^1.1.8", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.0", + "get-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.2", + "is-regex": "^1.2.1", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.0", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.3", + "object-keys": "^1.1.1", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.3", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.18" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz", + "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.6", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "iterator.prototype": "^1.1.4", + "safe-array-concat": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-to-primitive": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" + } + }, + "node_modules/eslint-config-standard-jsx": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", + "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "peerDependencies": { + "eslint": "^8.8.0", + "eslint-plugin-react": "^7.28.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", + "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", + "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rtsao/scc": "^1.1.0", + "array-includes": "^3.1.8", + "array.prototype.findlastindex": "^1.2.5", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.12.0", + "hasown": "^2.0.2", + "is-core-module": "^2.15.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.8", + "object.groupby": "^1.0.3", + "object.values": "^1.2.0", + "semver": "^6.3.1", + "string.prototype.trimend": "^1.0.8", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz", + "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.37.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz", + "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.3", + "array.prototype.tosorted": "^1.1.4", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.2.1", + "estraverse": "^5.3.0", + "hasown": "^2.0.2", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.9", + "object.fromentries": "^2.0.8", + "object.values": "^1.2.1", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.5", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.12", + "string.prototype.repeat": "^1.0.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-fifo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", + "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", + "license": "MIT" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flat-tree": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/flat-tree/-/flat-tree-1.12.1.tgz", + "integrity": "sha512-GchQ+onbnw5QaqsGbpcV6c8etAd396X/EVdDxutQMkGapB0lRvV9heIXS6ZffQVCse0hm2hBpK7GJz2Zp7qiMg==", + "license": "MIT" + }, + "node_modules/flatted": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, + "license": "ISC" + }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/fs": { + "name": "bare-fs", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.5.tgz", + "integrity": "sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.4", + "bare-path": "^3.0.0", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/fs-native-extensions": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/fs-native-extensions/-/fs-native-extensions-1.4.2.tgz", + "integrity": "sha512-QoQqYdHJTtfHUUO/ylyKSrt3dtPDyXCAjzveqCxPsV3hpIMNt455ua470+iTKJ8lFZ94pLC6Dv1TBbwOFLiV5w==", + "license": "Apache-2.0", + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.0" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/generate-object-property": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-2.0.0.tgz", + "integrity": "sha512-KwuURPyqn2Mz8DdV29pJwQu0Y7tcsbkULr82eeOcY/ZllFK6I9Wm8dsRByIu7CKWlFi9BdW1b3mcXMp/kQBQsw==", + "license": "MIT", + "dependencies": { + "is-property": "^1.0.0" + } + }, + "node_modules/generate-string": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/generate-string/-/generate-string-1.0.1.tgz", + "integrity": "sha512-IfTY0dKZM43ACyGvXkbG7De7WY7MxTS5VO6Juhe8oJKpCmrYYXoqp/cJMskkpi0k9H8wuXq0H+eI898/BCqvXg==", + "license": "MIT" + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/globbie": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globbie/-/globbie-1.0.3.tgz", + "integrity": "sha512-hcryJmKcftf82xfBWTWxuUITWIIoYO3ec104V17SMHGFl6VLbm1d1Ju9LX9L+jyJTwICpemX/dmPI/HGYoKr1A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-fs": "^4.1.2", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "picomatch": "^4.0.2" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/has-bigints": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/hypercore-crypto": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-3.6.0.tgz", + "integrity": "sha512-0slkW1wzq4B95SD8Z5nt1Yf/3KrIcGsBWTJTsCjHzMXie+sZ5I2IkWcxX1mo4+c0xVESnKAKphKSpGf2kf2BGA==", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.6", + "compact-encoding": "^2.15.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/hypercore-errors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/hypercore-errors/-/hypercore-errors-1.4.0.tgz", + "integrity": "sha512-WoaT467lNbDCglxisthpoC1mpBOH/CoM5IADPQm6BvPzZqXca1S6N1uoflLnZOIre9klCr1SdUnLgDWXLalJ7A==", + "license": "Apache-2.0" + }, + "node_modules/hypercore-id-encoding": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/hypercore-id-encoding/-/hypercore-id-encoding-1.3.0.tgz", + "integrity": "sha512-W6sHdGo5h7LXEsoWfKf/KfuROZmZRQDlGqJF2EPHW+noCK66Vvr0+zE6cL0vqQi18s0kQPeN7Sq3QyR0Ytc2VQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.5.3", + "z32": "^1.0.0" + } + }, + "node_modules/hypercore-storage": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/hypercore-storage/-/hypercore-storage-1.14.0.tgz", + "integrity": "sha512-IkCRvDaBbZqR0nORvhtVN2h5NtJ/Of+dmxCy7tGzjW51cLrouBCJVBNJ005D6yIiEEvTMFogxPZIA+ZTFEP80Q==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.7", + "bare-fs": "^4.0.1", + "bare-path": "^3.0.0", + "compact-encoding": "^2.16.0", + "device-file": "^1.2.2", + "flat-tree": "^1.12.1", + "hypercore-crypto": "^3.4.2", + "hyperschema": "^1.7.0", + "index-encoder": "^3.3.2", + "resolve-reject-promise": "^1.0.0", + "rocksdb-native": "^3.1.1", + "scope-lock": "^1.2.4", + "streamx": "^2.21.1" + } + }, + "node_modules/hyperdht": { + "version": "6.20.5", + "resolved": "https://registry.npmjs.org/hyperdht/-/hyperdht-6.20.5.tgz", + "integrity": "sha512-eDAwTmAtE9rjMivgqYtqHalTdBVhhCMBVHlCWRVhEcWtchpDonsd2dmX26lJ0raoF+l9djkXvPcN1/kb9/kykw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@hyperswarm/secret-stream": "^6.6.2", + "b4a": "^1.3.1", + "bare-events": "^2.2.0", + "blind-relay": "^1.3.0", + "bogon": "^1.0.0", + "compact-encoding": "^2.4.1", + "compact-encoding-net": "^1.0.1", + "dht-rpc": "^6.15.1", + "hypercore-crypto": "^3.3.0", + "hypercore-id-encoding": "^1.2.0", + "noise-curve-ed": "^2.0.0", + "noise-handshake": "^4.0.0", + "record-cache": "^1.1.1", + "safety-catch": "^1.0.1", + "signal-promise": "^1.0.3", + "sodium-universal": "^5.0.1", + "streamx": "^2.16.1", + "unslab": "^1.3.0", + "xache": "^1.1.0" + }, + "bin": { + "hyperdht": "bin.js" + } + }, + "node_modules/hyperschema": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/hyperschema/-/hyperschema-1.11.0.tgz", + "integrity": "sha512-oIu1hQ4zO1AqpBc6Dt07WenlELFfs6S6gQETmf7P6UTHwGSPiVc067B6gFxApVRgZuv9cQ4edReILNtHFEgj0A==", + "license": "Apache-2.0", + "dependencies": { + "bare-fs": "^4.0.1", + "compact-encoding": "^2.15.0", + "generate-object-property": "^2.0.0", + "generate-string": "^1.0.1" + } + }, + "node_modules/hyperswarm": { + "version": "4.11.7", + "resolved": "https://registry.npmjs.org/hyperswarm/-/hyperswarm-4.11.7.tgz", + "integrity": "sha512-/cOHoiuho81u8OdJhJkAg3Byc2X/47doS4pO6L8EMnhPJnYDHtLYa/SdVsbGNjzjso0Q20qAe7WTwbqdtt/diA==", + "dev": true, + "license": "MIT", + "dependencies": { + "b4a": "^1.3.1", + "bare-events": "^2.2.0", + "hyperdht": "^6.11.0", + "safety-catch": "^1.0.2", + "shuffled-priority-queue": "^2.1.0", + "unslab": "^1.3.0" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/index-encoder": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/index-encoder/-/index-encoder-3.4.0.tgz", + "integrity": "sha512-k3+ENtseFYI9ZPOIZzVH8LlONUvXAcd4jvCPo+Nob/T/2t5R5Rfh8XiFXBG++gHHuVby7HBDp/3YbyEmE481cg==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/internal-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-async-function": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", + "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "async-function": "^1.0.0", + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-boolean-object": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz", + "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-generator-function": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number-object": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-options": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-options/-/is-options-1.0.2.tgz", + "integrity": "sha512-u+Ai74c8Q74aS8BuHwPdI1jptGOT1FQXgCq8/zv0xRuE+wRgSMEJLj8lVO8Zp9BeGb29BXY6AsNPinfqjkr7Fg==", + "license": "MIT", + "dependencies": { + "b4a": "^1.1.1" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-property": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", + "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==", + "license": "MIT" + }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-string": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz", + "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/iterator.prototype": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz", + "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "get-proto": "^1.0.0", + "has-symbols": "^1.1.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/kademlia-routing-table": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/kademlia-routing-table/-/kademlia-routing-table-1.0.6.tgz", + "integrity": "sha512-Ve6jwIlUCYvUzBnXnzVRHDZCFgXURW9gmF3r7n05kZs/2rNbLHXwGdcq0qIaSwdmJCvtosgR4JensnVU65hzNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "bare-events": "^2.2.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/load-json-file": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", + "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^4.0.0", + "pify": "^4.0.1", + "strip-bom": "^3.0.0", + "type-fest": "^0.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=6" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/nanoassert": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-2.0.0.tgz", + "integrity": "sha512-7vO7n28+aYO4J+8w96AzhmU8G+Y/xpPDJz/se19ICsqj/momRbb9mh9ZUtkoJ5X3nTnPdhEJyc0qnM6yAsHBaA==", + "license": "ISC" + }, + "node_modules/nat-sampler": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nat-sampler/-/nat-sampler-1.0.1.tgz", + "integrity": "sha512-yQvyNN7xbqR8crTKk3U8gRgpcV1Az+vfCEijiHu9oHHsnIl8n3x+yXNHl42M6L3czGynAVoOT9TqBfS87gDdcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/noise-curve-ed": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/noise-curve-ed/-/noise-curve-ed-2.1.0.tgz", + "integrity": "sha512-zAzJx+VwZM3w6EA1hTmDhJfvAnCeBQn/1FAeZ0LtGxCcCtlAK/uJXQVF/eDVUOaAZ286lHlx77WJ+qj9SmsRRg==", + "license": "ISC", + "dependencies": { + "b4a": "^1.1.0", + "nanoassert": "^2.0.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/noise-handshake": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/noise-handshake/-/noise-handshake-4.1.0.tgz", + "integrity": "sha512-ZHt2+mOXTvjtaWS2h/JPvQjmknfKrEld2xdSsRYWXnYiJmK/N+dtxrDVSt1cr9wGAlhH7Ek43lIZNsL5bVeX9A==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.1.0", + "nanoassert": "^2.0.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz", + "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.values": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/paparam": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/paparam/-/paparam-1.8.5.tgz", + "integrity": "sha512-LLsGJwf3bJuf32jAfQYIMbt7oXuY2TXG3aWVHGXrE8o9cwGYIj+r/4J/VBn5Sgo+mA5lXzNnfqPqfBGPBIvjvQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "license": "MIT", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/path": { + "name": "bare-path", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", + "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", + "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^3.0.0", + "load-json-file": "^5.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/process": { + "name": "bare-process", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/bare-process/-/bare-process-4.2.1.tgz", + "integrity": "sha512-wcmyQWTHxd2xRgeKUSY46ofmuEAJ9CLo/6swJTHOZFPYpBShMWNPVI2Ba8o0n/X/YE4as99M28x37saWZ1L1vQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.3.1", + "bare-hrtime": "^2.0.0", + "bare-os": "^3.5.0", + "bare-pipe": "^4.0.0", + "bare-signals": "^4.0.0", + "bare-tty": "^5.0.0" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, + "license": "MIT", + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/protomux": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/protomux/-/protomux-3.10.1.tgz", + "integrity": "sha512-jgBqx8ZyaBWea/DFG4eOu1scOaeBwcnagiRC1XFVrjeGt7oAb0Pk5udPpBUpJ4DJBRjra50jD6YcZiQQTRqaaA==", + "license": "MIT", + "dependencies": { + "b4a": "^1.3.1", + "compact-encoding": "^2.5.1", + "queue-tick": "^1.0.0", + "safety-catch": "^1.0.1", + "unslab": "^1.3.0" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/queue-tick": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", + "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", + "license": "MIT" + }, + "node_modules/quickbit-native": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/quickbit-native/-/quickbit-native-2.4.5.tgz", + "integrity": "sha512-Ku6ESjIpRqpVZxDFFBLaQlSXltYvE0rxFA/090CWV1uxupTiAmEQqp8o/S2ah8J0NT1pxHsDqCOG8J7ITa83sw==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "require-addon": "^1.1.0" + } + }, + "node_modules/quickbit-universal": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/quickbit-universal/-/quickbit-universal-2.2.0.tgz", + "integrity": "sha512-w02i1R8n7+6pEKTud8DfF8zbFY9o7RtPlUc3jWbtCkDKvhbx/AvV7oNnz4/TcmsPGpSJS+fq5Ud6RH6+YPvSGg==", + "license": "ISC", + "dependencies": { + "b4a": "^1.6.0", + "simdle-universal": "^1.1.0" + }, + "optionalDependencies": { + "quickbit-native": "^2.2.0" + } + }, + "node_modules/rache": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rache/-/rache-1.0.0.tgz", + "integrity": "sha512-e0k0g0w/8jOCB+7YqCIlOa+OJ38k0wrYS4x18pMSmqOvLKoyhmMhmQyCcvfY6VaP8D75cqkEnlakXs+RYYLqNg==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/random-array-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-array-iterator/-/random-array-iterator-1.0.0.tgz", + "integrity": "sha512-u7xCM93XqKEvPTP6xZp2ehttcAemKnh73oKNf1FvzuVCfpt6dILDt1Kxl1LeBjm2iNIeR49VGFhy4Iz3yOun+Q==", + "license": "MIT" + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/ready-resource": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/ready-resource/-/ready-resource-1.1.2.tgz", + "integrity": "sha512-BN2Yfg/avHpozP+XSo+gsjHQ0AejnfbCJeJT4eamAHSf7dgYmNNWsZqTt5IEc06mjlLao+c2jlTbZvpZyRtRNQ==", + "license": "MIT", + "dependencies": { + "bare-events": "^2.2.0" + } + }, + "node_modules/record-cache": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/record-cache/-/record-cache-1.2.0.tgz", + "integrity": "sha512-kyy3HWCez2WrotaL3O4fTn0rsIdfRKOdQQcEJ9KpvmKmbffKVvwsloX063EgRUlpJIXHiDQFhJcTbZequ2uTZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "b4a": "^1.3.1" + } + }, + "node_modules/refcounter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/refcounter/-/refcounter-1.0.0.tgz", + "integrity": "sha512-1WosVzUy0kPUaPMEtlNDwm99UsteALIhXXR8rerELoa63WkYIXAl0hxgwPFrIYBRWZPGUyekQ04FRtPJ7dHk9w==", + "license": "Apache-2.0" + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/require-addon": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/require-addon/-/require-addon-1.1.0.tgz", + "integrity": "sha512-KbXAD5q2+v1GJnkzd8zzbOxchTkStSyJZ9QwoCq3QwEXAaIlG3wDYRZGzVD357jmwaGY7hr5VaoEAL0BkF0Kvg==", + "license": "Apache-2.0", + "dependencies": { + "bare-addon-resolve": "^1.3.0", + "bare-url": "^2.1.0" + }, + "engines": { + "bare": ">=1.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/resolve-reject-promise": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/resolve-reject-promise/-/resolve-reject-promise-1.1.0.tgz", + "integrity": "sha512-LWsTOA91AqzBTjSGgX79Tc130pwcBK6xjpJEO+qRT5IKZ6bGnHKcc8QL3upUBcWuU8OTIDzKK2VNSwmmlqvAVg==", + "license": "MIT" + }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rocksdb-native": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/rocksdb-native/-/rocksdb-native-3.6.2.tgz", + "integrity": "sha512-+Ih3yVYveBuMDu4meL9Nwimv7G4s53PrAvRpfPFSq8/GejPyhPDgPkIeB8jtYdeWb5RxEpHd7zaax42IW/Vfvw==", + "license": "Apache-2.0", + "dependencies": { + "compact-encoding": "^2.15.0", + "ready-resource": "^1.0.0", + "refcounter": "^1.0.0", + "require-addon": "^1.0.2", + "resolve-reject-promise": "^1.1.0", + "streamx": "^2.16.1" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safety-catch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/safety-catch/-/safety-catch-1.0.2.tgz", + "integrity": "sha512-C1UYVZ4dtbBxEtvOcpjBaaD27nP8MlvyAQEp2fOTOEe6pfUpk1cDUxij6BR1jZup6rSyUTaBBplK7LanskrULA==", + "license": "MIT" + }, + "node_modules/same-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/same-object/-/same-object-1.0.2.tgz", + "integrity": "sha512-csHWhvUsLbIOHDM/nP+KHWM+BLPsIzWkFa8HbzaI0G7BqKXgx+7FJpKTGgLXyz5amfdY2OVBcmXTqYOMEk04og==", + "dev": true, + "license": "MIT" + }, + "node_modules/scope-lock": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/scope-lock/-/scope-lock-1.2.4.tgz", + "integrity": "sha512-BpSd8VCuCxW9ZitcdIC/vjs3gMaP9bRBL5nkHcyfX2VrS52n13/rHuBA2xJ/S/4DPuRdAO/Bk8pWd8eD/gHCIA==", + "license": "Apache-2.0" + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/shuffled-priority-queue": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/shuffled-priority-queue/-/shuffled-priority-queue-2.1.0.tgz", + "integrity": "sha512-xhdh7fHyMsr0m/w2kDfRJuBFRS96b9l8ZPNWGaQ+PMvnUnZ/Eh+gJJ9NsHBd7P9k0399WYlCLzsy18EaMfyadA==", + "dev": true, + "license": "MIT", + "dependencies": { + "unordered-set": "^2.0.1" + } + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-promise": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/signal-promise/-/signal-promise-1.0.3.tgz", + "integrity": "sha512-WBgv0UnIq2C+Aeh0/n+IRpP6967eIx9WpynTUoiW3isPpfe1zu2LJzyfXdo9Tgef8yR/sGjcMvoUXD7EYdiz+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/simdle-native": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/simdle-native/-/simdle-native-1.3.6.tgz", + "integrity": "sha512-WXb3AUnMVOgfMbrOlz0SVpL8pMpC9K2WX/wJ7k5alqza77tO/4vCF7pUtuiPJdMxEBIsX30joKRY7JWRJ4yHqQ==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "b4a": "^1.6.0", + "require-addon": "^1.1.0" + } + }, + "node_modules/simdle-universal": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/simdle-universal/-/simdle-universal-1.1.2.tgz", + "integrity": "sha512-3n3w1bs+uwgHKQjt6arez83EywNlhZzYvNOhvAASTl/8KqNIcqr6aHyGt3JRlfuUC7iB0tomJRPlJ2cRGIpBzA==", + "license": "ISC", + "dependencies": { + "b4a": "^1.6.0" + }, + "optionalDependencies": { + "simdle-native": "^1.1.1" + } + }, + "node_modules/sodium-native": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-5.0.3.tgz", + "integrity": "sha512-8mmRxZtN9Lw2foyBFuRO193OYmyQ9fnXQrWIcUHn3XLmGZEU3QkCFauLA8zokoGM0nfsdo1OuvGOlL7591dYeQ==", + "license": "MIT", + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.1" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/sodium-secretstream": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/sodium-secretstream/-/sodium-secretstream-1.2.0.tgz", + "integrity": "sha512-q/DbraNFXm1KfCiiZvapmz5UC3OlpirYFIvBK2MhGaOFSb3gRyk8OXTi17UI9SGfshQNCpsVvlopogbzZNyW6Q==", + "license": "MIT", + "dependencies": { + "b4a": "^1.1.1", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/sodium-universal": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-5.0.1.tgz", + "integrity": "sha512-rv+aH+tnKB5H0MAc2UadHShLMslpJsc4wjdnHRtiSIEYpOetCgu8MS4ExQRia+GL/MK3uuCyZPeEsi+J3h+Q+Q==", + "license": "MIT", + "dependencies": { + "sodium-native": "^5.0.1" + }, + "peerDependencies": { + "sodium-javascript": "~0.8.0" + }, + "peerDependenciesMeta": { + "sodium-javascript": { + "optional": true + } + } + }, + "node_modules/speedometer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz", + "integrity": "sha512-z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/stackframe": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", + "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==", + "dev": true, + "license": "MIT" + }, + "node_modules/standard": { + "version": "17.1.2", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.2.tgz", + "integrity": "sha512-WLm12WoXveKkvnPnPnaFUUHuOB2cUdAsJ4AiGHL2G0UNMrcRAWY2WriQaV8IQ3oRmYr0AWUbLNr94ekYFAHOrA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "eslint": "^8.41.0", + "eslint-config-standard": "17.1.0", + "eslint-config-standard-jsx": "^11.0.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.36.1", + "standard-engine": "^15.1.0", + "version-guard": "^1.1.1" + }, + "bin": { + "standard": "bin/cmd.cjs" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/standard-engine": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", + "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "get-stdin": "^8.0.0", + "minimist": "^1.2.6", + "pkg-conf": "^3.1.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/streamx": { + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz", + "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==", + "license": "MIT", + "dependencies": { + "fast-fifo": "^1.3.2", + "text-decoder": "^1.1.0" + }, + "optionalDependencies": { + "bare-events": "^2.2.0" + } + }, + "node_modules/string.prototype.matchall": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", + "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "regexp.prototype.flags": "^1.5.3", + "set-function-name": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/test-tmp": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/test-tmp/-/test-tmp-1.4.0.tgz", + "integrity": "sha512-GVggxGg+jXqP2Wbju50JVLo+9E+nIOPPyWqgr63EbOnNItIKu1cEbJpTWAJeflnyGqXOtcMI7ijHRp88GUkfDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bare-fs": "^4.0.1", + "bare-os": "^3.3.0", + "bare-path": "^3.0.0" + } + }, + "node_modules/text-decoder": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", + "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/time-ordered-set": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/time-ordered-set/-/time-ordered-set-2.0.1.tgz", + "integrity": "sha512-VJEKmgSN2UiOLB8BpN8Sh2b9LGMHTP5OPrQRpnKjvOheOyzk0mufbjzjKTIG2gO4A+Y+vDJ+0TcLbpUmMLsg8A==", + "dev": true, + "license": "MIT" + }, + "node_modules/timeout-refresh": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-2.0.1.tgz", + "integrity": "sha512-SVqEcMZBsZF9mA78rjzCrYrUs37LMJk3ShZ851ygZYW1cMeIjs9mL57KO6Iv5mmjSQnOe/29/VAfGXo+oRCiVw==", + "license": "MIT" + }, + "node_modules/tiny-byte-size": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tiny-byte-size/-/tiny-byte-size-1.1.0.tgz", + "integrity": "sha512-OQ+i4RZzIQ0CR22DEr3G+ckRwN93R9UQMNqeym41Ntfj/dchPyWu1cuu8mvdCv61Ng3uOmNgX+8WesK1f37x+w==", + "dev": true, + "license": "MIT" + }, + "node_modules/tmatch": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/tmatch/-/tmatch-5.0.0.tgz", + "integrity": "sha512-Ib9OtBkpHn07tXP04SlN1SYRxFgTk6wSM2EBmjjxug4u5RXPRVLkdFJSS1PmrQidaSB8Lru9nRtViQBsbxzE5Q==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/udx-native": { + "version": "1.17.8", + "resolved": "https://registry.npmjs.org/udx-native/-/udx-native-1.17.8.tgz", + "integrity": "sha512-nB5SxTF9WzTNrxJnVSyEOtapoPjxAU1KboN/z1JWMtAVXArwtQ9Mxn+jJvlx4skINQHH6xUqQsQdSCL1Ja2h1Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.5.0", + "bare-events": "^2.2.0", + "require-addon": "^1.1.0", + "streamx": "^2.14.0" + } + }, + "node_modules/unbox-primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-bigints": "^1.0.2", + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/uncaughts": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/uncaughts/-/uncaughts-1.1.1.tgz", + "integrity": "sha512-UuD2hCFnjsoGRsMH2m6cpbRPwUSdCeQw9xjf6gIV48l43Y5lvdrWm4FvBDS8UXtsjx6D6K6BvJy3rloUAiZRYA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "which-runtime": "^1.2.1" + } + }, + "node_modules/unordered-set": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.1.tgz", + "integrity": "sha512-eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg==", + "dev": true, + "license": "MIT" + }, + "node_modules/unslab": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/unslab/-/unslab-1.3.0.tgz", + "integrity": "sha512-YATkfKAFj47kTzmiQrWXMyRvaVrHsW6MEALa4bm+FhiA2YG4oira+Z3DXN6LrYOYn2Y8eO94Lwl9DOHjs1FpoQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.6" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url": { + "name": "bare-url", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.6.tgz", + "integrity": "sha512-FgjDeR+/yDH34By4I0qB5NxAoWv7dOTYcOXwn73kr+c93HyC2lU6tnjifqUe33LKMJcDyCYPQjEAqgOQiXkE2Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-path": "^3.0.0" + } + }, + "node_modules/util": { + "name": "bare-utils", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/bare-utils/-/bare-utils-1.2.1.tgz", + "integrity": "sha512-R7fKMh8mr4TwVsIP3MzBc9ZFha1904FMIixWDtuLb5XlNIDQ7It4atE1UND5TZHTB0LpNSj81hL207d2+dU3jQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-debug-log": "^2.0.0", + "bare-format": "^1.0.0", + "bare-inspect": "^3.0.0" + } + }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/version-guard": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.3.tgz", + "integrity": "sha512-JwPr6erhX53EWH/HCSzfy1tTFrtPXUe927wdM1jqBBeYp1OM+qPHjWbsvv6pIBduqdgxxS+ScfG7S28pzyr2DQ==", + "dev": true, + "license": "0BSD", + "engines": { + "node": ">=0.10.48" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", + "is-async-function": "^2.0.0", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", + "is-generator-function": "^1.0.10", + "is-regex": "^1.2.1", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.1.0", + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-runtime": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-runtime/-/which-runtime-1.2.1.tgz", + "integrity": "sha512-8feIHccQFH/whiA1fD1b4c5+Q7T4ry1g1oHYc2mHnFh81tTQFsCvy3zhS2geUapkFAVBddUT/AM1a3rbqJweFg==", + "license": "Apache-2.0" + }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/xache": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/xache/-/xache-1.2.1.tgz", + "integrity": "sha512-igRS6jPreJ54ABdzhh4mCDXcz+XMaWO2q1ABRV2yWYuk29jlp8VT7UBdCqNkX7rpYBbXsebVVKkwIuYZjyZNqA==", + "dev": true, + "license": "MIT" + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/z32": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/z32/-/z32-1.1.0.tgz", + "integrity": "sha512-1WUHy+VS6d0HPNspDxvLssBbeQjXMjSnpv0vH82vRAUfg847NmX3OXozp/hRP5jPhxBbrVzrgvAt+UsGNzRFQQ==", + "license": "MIT", + "dependencies": { + "b4a": "^1.5.3" + } + } + } +} diff --git a/pkgs/by-name/hy/hypercore/package.nix b/pkgs/by-name/hy/hypercore/package.nix new file mode 100644 index 000000000000..92438f1bbaba --- /dev/null +++ b/pkgs/by-name/hy/hypercore/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "hypercore"; + version = "11.7.0"; + + src = fetchFromGitHub { + owner = "holepunchto"; + repo = "hypercore"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZAKWFSOIAQysK9+4YxbUiL0fVsqnGFqhwe9ps6ZXYv0="; + }; + + npmDepsHash = "sha256-ZJxVmQWKgHyKkuYfGIlANXFcROjI7fibg6mxIhDZowM="; + + dontNpmBuild = true; + + postPatch = '' + cp ${./package-lock.json} ./package-lock.json + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Secure, distributed append-only log"; + homepage = "https://github.com/holepunchto/hypercore"; + license = lib.licenses.mit; + teams = with lib.teams; [ ngi ]; + maintainers = [ lib.maintainers.goodylove ]; + platforms = lib.platforms.all; + }; + +}) diff --git a/pkgs/by-name/hy/hyperfine/package.nix b/pkgs/by-name/hy/hyperfine/package.nix new file mode 100644 index 000000000000..6b2f2b68e900 --- /dev/null +++ b/pkgs/by-name/hy/hyperfine/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, +}: + +rustPlatform.buildRustPackage rec { + pname = "hyperfine"; + version = "1.19.0"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = "hyperfine"; + rev = "v${version}"; + hash = "sha256-c8yK9U8UWRWUSGGGrAds6zAqxAiBLWq/RcZ6pvYNpgk="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-eZpGqkowp/R//RqLRk3AIbTpW3i9e+lOWpfdli7S4uE="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage doc/hyperfine.1 + + installShellCompletion \ + $releaseDir/build/hyperfine-*/out/hyperfine.{bash,fish} \ + --zsh $releaseDir/build/hyperfine-*/out/_hyperfine + ''; + + meta = with lib; { + description = "Command-line benchmarking tool"; + homepage = "https://github.com/sharkdp/hyperfine"; + changelog = "https://github.com/sharkdp/hyperfine/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ + figsoda + thoughtpolice + ]; + mainProgram = "hyperfine"; + }; +} diff --git a/pkgs/by-name/hy/hyperhdr/package.nix b/pkgs/by-name/hy/hyperhdr/package.nix index f6dafbde43d3..f1d593c06ffd 100644 --- a/pkgs/by-name/hy/hyperhdr/package.nix +++ b/pkgs/by-name/hy/hyperhdr/package.nix @@ -13,6 +13,12 @@ qt6Packages, qmqtt, xz, + sdbus-cpp_2, + plutovg, + lunasvg, + nanopb, + linalg, + stb, }: let @@ -23,13 +29,13 @@ in stdenv.mkDerivation rec { pname = "hyperhdr"; - version = "20.0.0.0"; + version = "21.0.0.0"; src = fetchFromGitHub { owner = "awawa-dev"; repo = "HyperHDR"; tag = "v${version}"; - hash = "sha256-agIWtDlMwjD0sGX2ntFwqROzUsl8tY3nRbmFvvOVh4o="; + hash = "sha256-CSggawgUPkpeADc8VXs5FA+ubZAtrtTu0qYgIWA0V/c="; }; nativeBuildInputs = [ @@ -38,23 +44,44 @@ stdenv.mkDerivation rec { qt6Packages.wrapQtAppsHook ]; + patches = [ + # Allow completly unvendoring hyperhdr + # This can be removed on the next hyperhdr release + ./unvendor.patch + ]; + + postPatch = '' + substituteInPlace sources/sound-capture/linux/SoundCaptureLinux.cpp \ + --replace-fail "libasound.so.2" "${lib.getLib alsa-lib}/lib/libasound.so.2" + ''; + cmakeFlags = [ "-DPLATFORM=linux" - (cmakeBool "USE_SYSTEM_MQTT_LIBS" true) (cmakeBool "USE_SYSTEM_FLATBUFFERS_LIBS" true) + (cmakeBool "USE_SYSTEM_LUNASVG_LIBS" true) (cmakeBool "USE_SYSTEM_MBEDTLS_LIBS" true) + (cmakeBool "USE_SYSTEM_MQTT_LIBS" true) + (cmakeBool "USE_SYSTEM_NANOPB_LIBS" true) + (cmakeBool "USE_SYSTEM_SDBUS_CPP_LIBS" true) + (cmakeBool "USE_SYSTEM_STB_LIBS" true) ]; buildInputs = [ alsa-lib flatbuffers libjpeg_turbo - mdns + linalg + lunasvg mbedtls + mdns + nanopb pipewire + plutovg qmqtt qt6Packages.qtbase qt6Packages.qtserialport + sdbus-cpp_2 + stb xz ]; @@ -63,7 +90,10 @@ stdenv.mkDerivation rec { homepage = "https://github.com/awawa-dev/HyperHDR"; changelog = "https://github.com/awawa-dev/HyperHDR/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ + hexa + eymeric + ]; mainProgram = "hyperhdr"; platforms = platforms.linux; }; diff --git a/pkgs/by-name/hy/hyperhdr/unvendor.patch b/pkgs/by-name/hy/hyperhdr/unvendor.patch new file mode 100644 index 000000000000..c0c93d21bc8a --- /dev/null +++ b/pkgs/by-name/hy/hyperhdr/unvendor.patch @@ -0,0 +1,295 @@ +diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml +index 6007f64..a98a23c 100644 +--- a/.github/workflows/push-master.yml ++++ b/.github/workflows/push-master.yml +@@ -2,7 +2,7 @@ name: HyperHDR CI Build + + on: + push: +-# pull_request: ++ pull_request: + + env: + USE_CACHE: ${{ vars.USE_CACHE && vars.USE_CACHE || true }} +@@ -109,6 +109,7 @@ jobs: + + - name: Clear branch ccache storage + uses: yumemi-inc/clean-cache-action@v1 ++ continue-on-error: true + with: + ref: ${{ github.event.ref }} + key: ${{ matrix.linuxVersion }}-${{ matrix.dockerImage }}-ccache- +@@ -193,6 +194,7 @@ jobs: + + - name: Clear branch ccache storage + uses: yumemi-inc/clean-cache-action@v1 ++ continue-on-error: true + with: + ref: ${{ github.event.ref }} + key: macOS-ccache-${{ matrix.NICE_NAME }} +@@ -284,6 +286,7 @@ jobs: + + - name: Clear branch ccache storage + uses: yumemi-inc/clean-cache-action@v1 ++ continue-on-error: true + with: + ref: ${{ github.event.ref }} + key: ${{ runner.os }}-ccache +diff --git a/BUILDING.md b/BUILDING.md +index 0347079..759cd6a 100644 +--- a/BUILDING.md ++++ b/BUILDING.md +@@ -44,6 +44,10 @@ Use -D prefix when configuring the build. + * USE_CCACHE_CACHING = ON | OFF, enable CCache support if available + * USE_SYSTEM_MQTT_LIBS = ON | OFF, prefer system qMQTT libs + * USE_SYSTEM_FLATBUFFERS_LIBS = ON | OFF, prefer system Flatbuffers libs ++ * USE_SYSTEM_SDBUS_CPP_LIBS = ON | OFF, prefer system sdbus_c++ libs ++ * USE_SYSTEM_LUNASVG_LIBS = ON | OFF, prefer system lunasvg libs ++ * USE_SYSTEM_NANOPB_LIBS = ON | OFF, prefer system nanopb libs ++ * USE_SYSTEM_STB_LIBS = ON | OFF, prefer system stb libs + * USE_STATIC_QT_PLUGINS = ON | OFF, embed static QT-plugins into the application + * USE_STANDARD_INSTALLER_NAME = ON | OFF, use standard Linux package naming + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b918a81..fbf8d6b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,6 +34,10 @@ SET ( DEFAULT_PROTOBUF ON ) + SET ( DEFAULT_WS281XPWM OFF ) + SET ( DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS ON ) + SET ( DEFAULT_USE_SYSTEM_MQTT_LIBS OFF ) ++SET ( DEFAULT_USE_SYSTEM_SDBUS_CPP_LIBS OFF ) ++SET ( DEFAULT_USE_SYSTEM_LUNASVG_LIBS OFF ) ++SET ( DEFAULT_USE_SYSTEM_NANOPB_LIBS OFF ) ++SET ( DEFAULT_USE_SYSTEM_STB_LIBS OFF ) + SET ( DEFAULT_MF OFF ) + SET ( DEFAULT_DX OFF ) + SET ( DEFAULT_AVF OFF ) +@@ -509,6 +513,18 @@ colorMe("USE_SYSTEM_MQTT_LIBS = " ${USE_SYSTEM_MQTT_LIBS}) + option(USE_SYSTEM_FLATBUFFERS_LIBS "Use system flatbuffers libs" ${DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS}) + colorMe("USE_SYSTEM_FLATBUFFERS_LIBS = " ${USE_SYSTEM_FLATBUFFERS_LIBS}) + ++option(USE_SYSTEM_SDBUS_CPP_LIBS "Use system sdbus-c++ libs" ${DEFAULT_USE_SYSTEM_SDBUS_CPP_LIBS}) ++colorMe("USE_SYSTEM_SDBUS_CPP_LIBS = " ${USE_SYSTEM_SDBUS_CPP_LIBS}) ++ ++option(USE_SYSTEM_LUNASVG_LIBS "Use system lunasvg libs" ${DEFAULT_USE_SYSTEM_LUNASVG_LIBS}) ++colorMe("USE_SYSTEM_LUNASVG_LIBS = " ${USE_SYSTEM_LUNASVG_LIBS}) ++ ++option(USE_SYSTEM_NANOPB_LIBS "Use system nanopb libs" ${DEFAULT_USE_SYSTEM_NANOPB_LIBS}) ++colorMe("USE_SYSTEM_NANOPB_LIBS = " ${USE_SYSTEM_NANOPB_LIBS}) ++ ++option(USE_SYSTEM_STB_LIBS "Use system stb libs" ${DEFAULT_USE_SYSTEM_STB_LIBS}) ++colorMe("USE_SYSTEM_STB_LIBS = " ${USE_SYSTEM_STB_LIBS}) ++ + option(USE_STATIC_QT_PLUGINS "Enable static QT plugins" ${DEFAULT_STATIC_QT_PLUGINS}) + colorMe("USE_STATIC_QT_PLUGINS = " ${USE_STATIC_QT_PLUGINS}) + +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index b4d23ad..38acea2 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -38,7 +38,7 @@ set_target_properties(sqlite3 PROPERTIES + target_compile_definitions(sqlite3 PUBLIC + SQLITE_THREADSAFE=2 + SQLITE_DEFAULT_MEMSTATUS=0 +- SQLITE_DEFAULT_SYNCHRONOUS=3 ++ SQLITE_DEFAULT_SYNCHRONOUS=3 + SQLITE_OMIT_AUTHORIZATION + SQLITE_OMIT_DEPRECATED + ) +@@ -47,23 +47,32 @@ target_compile_definitions(sqlite3 PUBLIC + # Protobuf-nanopb + #============================================================================= + +-set(PROTOBUF-NANOPB-SOURCES +- ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb.h +- ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.h +- ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.c +- ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.h +- ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.c +- ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.h +- ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.c) +- +-add_library(protobuf-nanopb OBJECT ${PROTOBUF-NANOPB-SOURCES}) +-set_target_properties(protobuf-nanopb PROPERTIES OUTPUT_NAME protobuf-nanopb) +-install(TARGETS protobuf-nanopb EXPORT nanopb-targets +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++if (USE_SYSTEM_NANOPB_LIBS) ++ find_package(nanopb) ++ if (NOT nanopb_FOUND) ++ message(WARNING "Could NOT find nanopb system libraries. Fallback to nanopb submodule.") ++ endif() ++endif() + +-target_include_directories(protobuf-nanopb INTERFACE +- $ +- $) ++if (NOT USE_SYSTEM_NANOPB_LIBS OR NOT nanopb_FOUND) ++ set(PROTOBUF-NANOPB-SOURCES ++ ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.c ++ ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.c ++ ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.c) ++ ++ add_library(protobuf-nanopb OBJECT ${PROTOBUF-NANOPB-SOURCES}) ++ set_target_properties(protobuf-nanopb PROPERTIES OUTPUT_NAME protobuf-nanopb) ++ install(TARGETS protobuf-nanopb EXPORT nanopb-targets ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ ++ target_include_directories(protobuf-nanopb INTERFACE ++ $ ++ $) ++endif() + + #============================================================================= + # RPi ws281x +@@ -75,7 +84,7 @@ if(ENABLE_WS281XPWM) + string(REPLACE "configure_file(version.h.in version.h)" [=[configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)]=] FILE_CONTENTS "${FILE_CONTENTS}") + file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/rpi_ws281x/CMakeLists.txt" "${FILE_CONTENTS}") + +- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rpi_ws281x) ++ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rpi_ws281x) + endif() + + #============================================================================= +@@ -90,11 +99,22 @@ target_include_directories(linalg INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/linalg" + # LUNASVG + #============================================================================= + +- + set(no_dev_warnings_backup "$CACHE{CMAKE_WARN_DEPRECATED}") + set(CMAKE_WARN_DEPRECATED OFF CACHE INTERNAL "" FORCE) +-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lunasvg) +-set_target_properties(lunasvg PROPERTIES POSITION_INDEPENDENT_CODE ON) ++ ++if (USE_SYSTEM_LUNASVG_LIBS) ++ find_package(lunasvg GLOBAL) ++ if (NOT lunasvg_FOUND) ++ message(WARNING "Could NOT find lunasvg system libraries. Fallback to lunasvg submodule.") ++ endif() ++endif() ++ ++if (NOT USE_SYSTEM_LUNASVG_LIBS OR NOT lunasvg_FOUND) ++ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lunasvg) ++ set_target_properties(lunasvg PROPERTIES POSITION_INDEPENDENT_CODE ON) ++ set_target_properties(plutovg PROPERTIES POSITION_INDEPENDENT_CODE ON) ++endif() ++ + set(CMAKE_WARN_DEPRECATED ${no_dev_warnings_backup} CACHE INTERNAL "" FORCE) + + #============================================================================= +@@ -125,7 +145,7 @@ if (NOT USE_SYSTEM_FLATBUFFERS_LIBS OR CMAKE_CROSSCOMPILING) + cmake_policy(PUSH) + + set(CMAKE_POLICY_DEFAULT_CMP0071 NEW) +- set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "") ++ set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "") + + if (NOT CMAKE_CROSSCOMPILING AND USE_PRECOMPILED_HEADERS) + set(FLATBUFFERS_ENABLE_PCH ON CACHE BOOL "") +@@ -142,7 +162,7 @@ if (NOT USE_SYSTEM_FLATBUFFERS_LIBS OR CMAKE_CROSSCOMPILING) + unset(FLATBUFFERS_FLATC_EXECUTABLE) + set(FLATBUFFERS_BUILD_FLATC OFF CACHE BOOL "") + set(FLATBUFFERS_BUILD_FLATHASH OFF CACHE BOOL "") +- set(FLATBUFFERS_HOST_FLATBUFFERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/host_flatc) ++ set(FLATBUFFERS_HOST_FLATBUFFERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/host_flatc) + file(MAKE_DIRECTORY ${FLATBUFFERS_HOST_FLATBUFFERS_DIR}) + + EXECUTE_PROCESS ( WORKING_DIRECTORY ${FLATBUFFERS_HOST_FLATBUFFERS_DIR} RESULT_VARIABLE EXEC_RES +@@ -168,7 +188,7 @@ if (NOT USE_SYSTEM_FLATBUFFERS_LIBS OR CMAKE_CROSSCOMPILING) + set(FLATBUFFERS_FLATC_EXECUTABLE "$") + else() + message( STATUS "Using host flatc compiler: ${FLATBUFFERS_FLATC_EXECUTABLE}") +- endif() ++ endif() + + cmake_policy(POP) + endif() +@@ -177,7 +197,7 @@ set(FLATBUFFERS_FLATC_EXECUTABLE ${FLATBUFFERS_FLATC_EXECUTABLE} PARENT_SCOPE) + set(FLATBUFFERS_INCLUDE_DIRS ${FLATBUFFERS_INCLUDE_DIRS} PARENT_SCOPE) + include_directories(${FLATBUFFERS_INCLUDE_DIRS}) + +-if (FLATBUFFERS_INCLUDE_DIRS AND EXISTS "${FLATBUFFERS_INCLUDE_DIRS}/../package.json") ++if (FLATBUFFERS_INCLUDE_DIRS AND EXISTS "${FLATBUFFERS_INCLUDE_DIRS}/../package.json") + file(STRINGS "${FLATBUFFERS_INCLUDE_DIRS}/../package.json" _FLATBUFFERS_VERSION_STRING REGEX "^[ \t\r\n]+\"version\":[ \t\r\n]+\"[0-9]+.[0-9]+.[0-9]+\",") + string(REGEX REPLACE "^[ \t\r\n]+\"version\":[ \t\r\n]+\"([0-9]+.[0-9]+.[0-9]+)\"," "\\1" FLATBUFFERS_PARSE_VERSION "${_FLATBUFFERS_VERSION_STRING}") + message(STATUS "Using flatbuffers libraries version: \"${FLATBUFFERS_PARSE_VERSION}\"") +@@ -220,7 +240,7 @@ if ( ENABLE_MQTT ) + # HyperHDR workaround for fixed Qt5 version + file(READ "${CMAKE_CURRENT_SOURCE_DIR}/qmqtt/CMakeLists.txt" FILE_CONTENTS) + string(REPLACE "Qt5" "Qt${Qt_VERSION}" FILE_CONTENTS "${FILE_CONTENTS}") +- string(REPLACE "find_package" "#find_package" FILE_CONTENTS "${FILE_CONTENTS}") ++ string(REPLACE "find_package" "#find_package" FILE_CONTENTS "${FILE_CONTENTS}") + file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/qmqtt/CMakeLists.txt" "${FILE_CONTENTS}") + + cmake_policy(PUSH) +@@ -261,17 +281,41 @@ ENDIF() + #============================================================================= + + if (UNIX AND NOT APPLE AND (ENABLE_POWER_MANAGEMENT OR ENABLE_PIPEWIRE)) +- set(SDBUSCPP_BUILD_DOCS OFF CACHE BOOL "No doc") +- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp) +- set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ON) ++ if (USE_SYSTEM_SDBUS_CPP_LIBS) ++ pkg_check_modules (sdbus-c++ sdbus-c++>=2.0.0) ++ ++ if(NOT sdbus-c++_FOUND) ++ message( WARNING "Could not find: sdbus-c++>=2.0.0. Fallback to sdbus-c++ submodule." ) ++ endif() ++ endif() ++ ++ if(NOT sdbus-c++_FOUND) ++ message( "Using sdbus-c++ submodule." ) ++ set(SDBUSCPP_BUILD_DOCS OFF CACHE BOOL "No doc") ++ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp) ++ set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ON) ++ endif() + endif() + + #============================================================================= + # STB + #============================================================================= + +-add_library(stb INTERFACE ) +-target_include_directories(stb INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/stb) ++add_library(stb INTERFACE) ++ ++if (USE_SYSTEM_STB_LIBS) ++ find_path(STB_INCLUDE_DIR stb_image.h PATH_SUFFIXES stb) ++ if (NOT STB_INCLUDE_DIR) ++ message(WARNING "Could NOT find system STB libraries. Falling back to embedded STB.") ++ target_include_directories(stb INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/stb) ++ else() ++ message(STATUS "Found system STB libraries: ${STB_INCLUDE_DIR}") ++ target_include_directories(stb INTERFACE ${STB_INCLUDE_DIR}) ++ endif() ++else() ++ target_include_directories(stb INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/stb) ++endif() ++ + target_compile_definitions(stb INTERFACE + STB_IMAGE_WRITE_IMPLEMENTATION + STB_IMAGE_IMPLEMENTATION +diff --git a/sources/utils-image/CMakeLists.txt b/sources/utils-image/CMakeLists.txt +index b5ad570..5c9b506 100644 +--- a/sources/utils-image/CMakeLists.txt ++++ b/sources/utils-image/CMakeLists.txt +@@ -29,13 +29,13 @@ else() + add_library(utils-image STATIC ${utils_image_SOURCES}) + endif() + +-target_include_directories(utils-image PRIVATE stb lunasvg TurboJPEG::TurboJPEG) ++target_include_directories(utils-image PRIVATE stb lunasvg::lunasvg TurboJPEG::TurboJPEG) + + target_link_libraries(utils-image PRIVATE + Qt${Qt_VERSION}::Core + Qt${Qt_VERSION}::Network + stb +- lunasvg ++ lunasvg::lunasvg + image + TurboJPEG::TurboJPEG + ) diff --git a/pkgs/by-name/hy/hyperrogue/package.nix b/pkgs/by-name/hy/hyperrogue/package.nix index a404f837d8e9..375f5f22c7b5 100644 --- a/pkgs/by-name/hy/hyperrogue/package.nix +++ b/pkgs/by-name/hy/hyperrogue/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyperrogue"; - version = "13.0w"; + version = "13.0x"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-/ERMR4JtlIsZ5mvPKTjcjiUfX5/7DTqT0Zc/LEFdZ+M="; + sha256 = "sha256-CwicLUQThNDc8Ig0kRNTnkSwUcoIw+tNQoXVgoWbkIE="; }; env = { @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/hy/hyperswarm/package-lock.json b/pkgs/by-name/hy/hyperswarm/package-lock.json new file mode 100644 index 000000000000..30e80346e71e --- /dev/null +++ b/pkgs/by-name/hy/hyperswarm/package-lock.json @@ -0,0 +1,4969 @@ +{ + "name": "hyperswarm", + "version": "4.11.5", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "hyperswarm", + "version": "4.11.5", + "license": "MIT", + "dependencies": { + "b4a": "^1.3.1", + "bare-events": "^2.2.0", + "hyperdht": "^6.11.0", + "safety-catch": "^1.0.2", + "shuffled-priority-queue": "^2.1.0", + "unslab": "^1.3.0" + }, + "devDependencies": { + "brittle": "^3.0.2", + "hypercore-crypto": "^3.4.0", + "standard": "^17.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.6.1.tgz", + "integrity": "sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@hyperswarm/secret-stream": { + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/@hyperswarm/secret-stream/-/secret-stream-6.8.1.tgz", + "integrity": "sha512-F3fr8CKB6za9Ac7ifjgAe07qnnesl5kS0MtLsyKxA1Og8E+FZykdwLpgoLjnEa7G6E1L56lASLr42E4kd20sog==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.1.0", + "hypercore-crypto": "^3.3.1", + "noise-curve-ed": "^2.0.1", + "noise-handshake": "^4.0.0", + "sodium-secretstream": "^1.1.0", + "sodium-universal": "^5.0.0", + "streamx": "^2.14.0", + "timeout-refresh": "^2.0.0", + "unslab": "^1.3.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@rtsao/scc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", + "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, + "license": "ISC" + }, + "node_modules/acorn": { + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-includes": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz", + "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "es-shim-unscopables": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", + "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/assert": { + "name": "bare-assert", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bare-assert/-/bare-assert-1.0.2.tgz", + "integrity": "sha512-7AGTrUCz7OOWnMOp4hWnksAkFeZlvW7WMwvKQBANVJIOtjWa6RLSPyUN+zs3QBufRZwIYhYB3UpkAlDbBPp2/Q==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/async-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", + "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/b4a": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", + "license": "Apache-2.0" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/bare-addon-resolve": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/bare-addon-resolve/-/bare-addon-resolve-1.9.4.tgz", + "integrity": "sha512-unn6Vy/Yke6F99vg/7tcrvM2KUvIhTNniaSqDbam4AWkd4NhvDVSrQiRYVlNzUV2P7SPobkCK7JFVxrJk9btCg==", + "license": "Apache-2.0", + "dependencies": { + "bare-module-resolve": "^1.10.0", + "bare-semver": "^1.0.0" + }, + "peerDependencies": { + "bare-url": "*" + }, + "peerDependenciesMeta": { + "bare-url": { + "optional": true + } + } + }, + "node_modules/bare-ansi-escapes": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/bare-ansi-escapes/-/bare-ansi-escapes-2.2.3.tgz", + "integrity": "sha512-02ES4/E2RbrtZSnHJ9LntBhYkLA6lPpSEeP8iqS3MccBIVhVBlEmruF1I7HZqx5Q8aiTeYfQVeqmrU9YO2yYoQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.5" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-assert": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bare-assert/-/bare-assert-1.0.2.tgz", + "integrity": "sha512-7AGTrUCz7OOWnMOp4hWnksAkFeZlvW7WMwvKQBANVJIOtjWa6RLSPyUN+zs3QBufRZwIYhYB3UpkAlDbBPp2/Q==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-cov": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/bare-cov/-/bare-cov-1.1.0.tgz", + "integrity": "sha512-y5ik6JY3Gd1Eb0+9GDWOSHPQ+/Mgyj40du1fTlCiEklyMTPhgOJUMRwzAka1V+8KkvgQ8OEbkK/xL4XEfPYGQA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-fs": "^4.1.2", + "bare-inspector": "^4.0.1", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "bare-url": "^2.1.5", + "bare-v8-to-istanbul": "v1.0.0", + "picomatch": "^4.0.2", + "which-runtime": "^1.2.1" + } + }, + "node_modules/bare-crypto": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/bare-crypto/-/bare-crypto-1.4.3.tgz", + "integrity": "sha512-XlIhSB+2ht2+Yli2Ic+HhOvdP0vd+TWWISxzYp50EwfsOwCI4TaeONj5hIr6aDWKhYn0FMsFec7U30QOIXMD4Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.3" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-debug-log": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/bare-debug-log/-/bare-debug-log-1.0.0.tgz", + "integrity": "sha512-tN02RFk6yiS2s7DerJVLvE4W/xrRkNMiCilvS/3fQbu72tj1rteXcQMiztICX5Z3yYsTNJrBokUnAUPjfDU45A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^2.3.0" + } + }, + "node_modules/bare-debug-log/node_modules/bare-os": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.4.tgz", + "integrity": "sha512-z3UiI2yi1mK0sXeRdc4O1Kk8aOa/e+FNWZcTiPB/dfTWyLypuE99LibgRaQki914Jq//yAWylcAt+mknKdixRQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-dns": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/bare-dns/-/bare-dns-2.0.5.tgz", + "integrity": "sha512-C8JF4f/nXXtzyyqyKaSs74HgYZCW3VcG836D0nmANQWGgZlKpw6VMHfpAZM7O4ljcyaNYxdq9pOKE+WXh3AOgA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-env": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-env/-/bare-env-3.0.0.tgz", + "integrity": "sha512-0u964P5ZLAxTi+lW4Kjp7YRJQ5gZr9ycYOtjLxsSrupgMz3sn5Z9n4SH/JIifHwvadsf1brA2JAjP+9IOWwTiw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/bare-events": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz", + "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==", + "license": "Apache-2.0" + }, + "node_modules/bare-format": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bare-format/-/bare-format-1.0.1.tgz", + "integrity": "sha512-1oS+LZrWK6tnYnvNSHDGljc2MPunRxwhpFriuCgzNF+oklrnwmBKD91tS0yt+jpl2j3UgcSDzBIMiVTvLs9A8w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-inspect": "^3.0.0" + } + }, + "node_modules/bare-fs": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.4.tgz", + "integrity": "sha512-r8+26Voz8dGX3AYpJdFb1ZPaUSM8XOLCZvy+YGpRTmwPHIxA7Z3Jov/oMPtV7hfRQbOnH8qGlLTzQAbgtdNN0Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.4", + "bare-path": "^3.0.0", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-hrtime": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/bare-hrtime/-/bare-hrtime-2.0.11.tgz", + "integrity": "sha512-Mnb2rnGRSHzNHQwFrK8VVqD8Oob/CiSsBlgZGKQ1xTj25GPI19sXHjUPzrkHOU1DaoVj1ig1VO7rZGaYOfXPaw==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bare-http1": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bare-http1/-/bare-http1-4.0.2.tgz", + "integrity": "sha512-6Jns5oBG9LFz/U2PuFk2LHQbQ1ZuUgPyuahfbNikPL/HcjpSGdSl0xMiN3Qt852Xm1sLBsTGxl0OoM2cVCYzNQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.0.0", + "bare-stream": "^2.3.0", + "bare-tcp": "^2.0.0" + } + }, + "node_modules/bare-https": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bare-https/-/bare-https-2.0.0.tgz", + "integrity": "sha512-qmjNZmYQ4nn+k3CLlxVyOqWYamdBPqE7psR5/lFWG39fskAR4C2h29d1Ka5BeWOGDAWhXImFIwZUxwCE/7xeLA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-http1": "^4.0.0", + "bare-tcp": "^2.0.0", + "bare-tls": "^2.0.0" + } + }, + "node_modules/bare-inspect": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/bare-inspect/-/bare-inspect-3.0.8.tgz", + "integrity": "sha512-Z3McUtoM/saxTBtr7l4M9ADR1m5foXwtxJrO1OPaBLN25M4lNHVm7uwL9e0qlS8kuLXTI41TLEN4S9veJ3EJJA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-ansi-escapes": "^2.1.0", + "bare-type": "^1.0.0" + } + }, + "node_modules/bare-inspector": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/bare-inspector/-/bare-inspector-4.0.1.tgz", + "integrity": "sha512-MZGIci2OFzwDNWlY/JUmEVtK/0xa+mbdggOB0jSI0WYkQpyxaiD4q/8xZ42k4kOoZNLKpYMI31wmllm6jS5w9g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.1.0", + "bare-http1": "^4.0.0", + "bare-stream": "^2.0.0", + "bare-url": "^2.0.0", + "bare-ws": "^2.0.0" + }, + "engines": { + "bare": ">=1.2.0" + } + }, + "node_modules/bare-module-resolve": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/bare-module-resolve/-/bare-module-resolve-1.10.2.tgz", + "integrity": "sha512-C9COe/GhWfVXKytW3DElTkiBU+Gb2OXeaVkdGdRB/lp26TVLESHkTGS876iceAGdvtPgohfp9nX8vXHGvN3++Q==", + "license": "Apache-2.0", + "dependencies": { + "bare-semver": "^1.0.0" + }, + "peerDependencies": { + "bare-url": "*" + }, + "peerDependenciesMeta": { + "bare-url": { + "optional": true + } + } + }, + "node_modules/bare-os": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz", + "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==", + "license": "Apache-2.0", + "engines": { + "bare": ">=1.14.0" + } + }, + "node_modules/bare-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", + "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/bare-pipe": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/bare-pipe/-/bare-pipe-4.0.6.tgz", + "integrity": "sha512-S9kpDJq74gkceynfRqXCaED119k2jF2us4U9xZnTLX0GEduWQY29MNTpAMAf/ucEailW9SPLjGLzbfPCONz3Lw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.0.0", + "bare-stream": "^2.0.0" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-process": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/bare-process/-/bare-process-4.2.1.tgz", + "integrity": "sha512-wcmyQWTHxd2xRgeKUSY46ofmuEAJ9CLo/6swJTHOZFPYpBShMWNPVI2Ba8o0n/X/YE4as99M28x37saWZ1L1vQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.3.1", + "bare-hrtime": "^2.0.0", + "bare-os": "^3.5.0", + "bare-pipe": "^4.0.0", + "bare-signals": "^4.0.0", + "bare-tty": "^5.0.0" + } + }, + "node_modules/bare-semver": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bare-semver/-/bare-semver-1.0.1.tgz", + "integrity": "sha512-UtggzHLiTrmFOC/ogQ+Hy7VfoKoIwrP1UFcYtTxoCUdLtsIErT8+SWtOC2DH/snT9h+xDrcBEPcwKei1mzemgg==", + "license": "Apache-2.0" + }, + "node_modules/bare-signals": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bare-signals/-/bare-signals-4.0.2.tgz", + "integrity": "sha512-+V7ngZRbkQDN6OJj1/Evm725HeXvZ3onHI52jBi/LJAe2bSPn2sNZI1Y9xu0MlebhROdRTqa7lpN/OQVDMRt3g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.3", + "bare-os": "^3.3.1" + }, + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-stream": { + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz", + "integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "streamx": "^2.21.0" + }, + "peerDependencies": { + "bare-buffer": "*", + "bare-events": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + }, + "bare-events": { + "optional": true + } + } + }, + "node_modules/bare-subprocess": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/bare-subprocess/-/bare-subprocess-5.0.3.tgz", + "integrity": "sha512-iCx8kfvqClPAQGsbL2RfMubB6EYoZ67ZhaEIpn6wIqIa60p4zLAlGJyEQQtXPo/5dclbpgzWre5hvJ7HzXC/aA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.5.4", + "bare-os": "^3.0.1", + "bare-pipe": "^4.0.0" + }, + "engines": { + "bare": ">=1.7.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-tcp": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/bare-tcp/-/bare-tcp-2.0.4.tgz", + "integrity": "sha512-Xv0DgOwG0zZwmckY43aRs2iOGewkgXlsBu0oWv3h7Y7sGl8a2tyNe4frxYWRRN3N09SwUJZtid1RSW315MDXmg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-dns": "^2.0.4", + "bare-events": "^2.5.4", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-tls": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/bare-tls/-/bare-tls-2.0.4.tgz", + "integrity": "sha512-mJK7CHoXhBEd+z7KIFf0e5GIJgkIp9b9kt7axTmFyUEyQlyzlAzTrQHCkw++PEwF0soNXgOYQtmb+KUqhpgK+g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.7.0" + } + }, + "node_modules/bare-tty": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/bare-tty/-/bare-tty-5.0.2.tgz", + "integrity": "sha512-xOHwI7zZl2Opm7Rul5O+okE32j7O14feJhgovJX2EghtQ2IWVfiC1oH0DmFruMvKthvhZY/Lpg8n5SVBaZhV1A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.2.0", + "bare-signals": "^4.0.0", + "bare-stream": "^2.0.0" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/bare-type": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/bare-type/-/bare-type-1.0.6.tgz", + "integrity": "sha512-6QFeIIp1d06xU9BjDPkl8+QeHil3TKSDpIKUid6bQzwYvxFOnMVhAifRS3J0fvWirEMlWmqxDDKjHW8RPe6C3Q==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "bare": ">=1.2.0" + } + }, + "node_modules/bare-url": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.6.tgz", + "integrity": "sha512-FgjDeR+/yDH34By4I0qB5NxAoWv7dOTYcOXwn73kr+c93HyC2lU6tnjifqUe33LKMJcDyCYPQjEAqgOQiXkE2Q==", + "license": "Apache-2.0", + "dependencies": { + "bare-path": "^3.0.0" + } + }, + "node_modules/bare-utils": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/bare-utils/-/bare-utils-1.2.0.tgz", + "integrity": "sha512-Y9G5DbMUgcx078Etc7h9CD31aI9vYFZ/xl6JLnyvBX9+4lrlXw+5/6toNJGaNSylo4jJf8Cu3yBIDxMLviRFFw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-debug-log": "^1.0.0", + "bare-format": "^1.0.0", + "bare-inspect": "^3.0.0" + } + }, + "node_modules/bare-v8-to-istanbul": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/bare-v8-to-istanbul/-/bare-v8-to-istanbul-1.0.0.tgz", + "integrity": "sha512-5xm9ykzWrk7ntC0Ps2tnNwlFlEAMb3Rk0w/WlwJ/A1xboTQKa9f+NO/31PXB5LspMaz9Qv2pnIwiiHWEnk+kXQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "assert": "npm:bare-assert", + "bare-assert": "^1.0.2", + "bare-fs": "^4.1.2", + "bare-path": "^3.0.0", + "bare-process": "^4.2.0", + "bare-url": "^2.1.5", + "bare-utils": "^1.2.0", + "fs": "npm:bare-fs", + "path": "npm:bare-path", + "process": "npm:bare-process", + "url": "npm:bare-url", + "util": "npm:bare-utils", + "v8-to-istanbul": "^9.3.0", + "which-runtime": "^1.2.1" + } + }, + "node_modules/bare-ws": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/bare-ws/-/bare-ws-2.0.1.tgz", + "integrity": "sha512-ugewb5bmg3k4ICBe1Rkd6Z80/E082xDjyrVDMfk/4HJoTeqIiDZ+hJKJMEXsyfo482Gk6QpNq0ixRjIIumpubA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-crypto": "^1.2.0", + "bare-events": "^2.3.1", + "bare-http1": "^4.0.0", + "bare-https": "^2.0.0", + "bare-stream": "^2.1.2" + } + }, + "node_modules/bits-to-bytes": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/bits-to-bytes/-/bits-to-bytes-1.3.0.tgz", + "integrity": "sha512-OJoHTpFXS9bXHBCekGTByf3MqM8CGblBDIduKQeeVVeiU9dDWywSSirXIBYGgg3d1zbVuvnMa1vD4r6PA0kOKg==", + "license": "ISC", + "dependencies": { + "b4a": "^1.5.0" + } + }, + "node_modules/blind-relay": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/blind-relay/-/blind-relay-1.4.0.tgz", + "integrity": "sha512-6xt7fDfCs6eGmNNym6I9N42jmjcMQn2qwwOVnkP9ZnrkXFk6c4/tdO1xqRmDEzKzV8gigd+DVdCUG/RUYnen7Q==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4", + "bare-events": "^2.2.0", + "bits-to-bytes": "^1.3.0", + "compact-encoding": "^2.12.0", + "compact-encoding-bitfield": "^1.0.0", + "protomux": "^3.5.1", + "sodium-universal": "^5.0.0", + "streamx": "^2.15.1" + } + }, + "node_modules/bogon": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/bogon/-/bogon-1.1.0.tgz", + "integrity": "sha512-a6SnToksXHuUlgeMvI/txWmTcKz7c7iBa8f0HbXL4toN1Uza/CTQ4F7n9jSDX49TCpxv3KUP100q4sZfwLyLiw==", + "license": "MIT", + "dependencies": { + "compact-encoding": "^2.11.0", + "compact-encoding-net": "^1.2.0" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/brittle": { + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/brittle/-/brittle-3.16.1.tgz", + "integrity": "sha512-1OONeI0lLvN6Atu4oMgvqilyXAE/a/aWqFuPdYaZOkkAXQMGb8fEowVcHJbZloZwdGaTDyNZzrdeGjC73M+rXQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.0", + "bare-cov": "^1.1.0", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "bare-subprocess": "^5.0.0", + "error-stack-parser": "^2.1.4", + "globbie": "^1.0.2", + "paparam": "^1.6.2", + "same-object": "^1.0.2", + "test-tmp": "^1.4.0", + "tmatch": "^5.0.0" + }, + "bin": { + "brittle": "bin/node.js", + "brittle-bare": "bin/bare.js", + "brittle-node": "bin/node.js", + "brittle-pear": "bin/pear.js" + } + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/builtins/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/call-bind": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/compact-encoding": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/compact-encoding/-/compact-encoding-2.16.1.tgz", + "integrity": "sha512-vP39X4nwtesmZucaAxDg4wnudOoaJTSR+fikzi8VLVxbwLmcWXf3t0LxY0n2H1AMpdoQZ08lmUf4GY3XiDPnMQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.3.0" + } + }, + "node_modules/compact-encoding-bitfield": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/compact-encoding-bitfield/-/compact-encoding-bitfield-1.0.0.tgz", + "integrity": "sha512-3nMVKUg+PF72UHfainmCL8uKvyWfxsjqOtUY+HiMPGLPCTjnwzoKfFAMo1Ad7nwTPdjBqtGK5b3BOFTFW4EBTg==", + "license": "ISC", + "dependencies": { + "compact-encoding": "^2.4.1" + } + }, + "node_modules/compact-encoding-net": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/compact-encoding-net/-/compact-encoding-net-1.2.0.tgz", + "integrity": "sha512-LVXpNpF7PGQeHRVVLGgYWzuVoYAaDZvKUsUxRioGfkotzvOh4AzoQF1HBH3zMNaSnx7gJXuUr3hkjnijaH/Eng==", + "license": "ISC", + "dependencies": { + "compact-encoding": "^2.4.1" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/data-view-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/inspect-js" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/dht-rpc": { + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/dht-rpc/-/dht-rpc-6.18.1.tgz", + "integrity": "sha512-uTcHj8dERVjmoUsSxqAulQ+qo11Qy4pMK419tyF2cFpyf56Y09u1v9g8yWlay0KjUY5bvdybBQ/V8YWN/wyK5Q==", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.1", + "bare-events": "^2.2.0", + "compact-encoding": "^2.11.0", + "compact-encoding-net": "^1.2.0", + "fast-fifo": "^1.1.0", + "kademlia-routing-table": "^1.0.1", + "nat-sampler": "^1.0.1", + "sodium-universal": "^5.0.0", + "streamx": "^2.13.2", + "time-ordered-set": "^2.0.0", + "udx-native": "^1.5.3" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/error-stack-parser": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", + "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "stackframe": "^1.3.4" + } + }, + "node_modules/es-abstract": { + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "data-view-buffer": "^1.0.2", + "data-view-byte-length": "^1.0.2", + "data-view-byte-offset": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.1.0", + "es-to-primitive": "^1.3.0", + "function.prototype.name": "^1.1.8", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.0", + "get-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.2", + "is-regex": "^1.2.1", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.0", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.3", + "object-keys": "^1.1.1", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.3", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.18" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz", + "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.6", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "iterator.prototype": "^1.1.4", + "safe-array-concat": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-to-primitive": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" + } + }, + "node_modules/eslint-config-standard-jsx": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", + "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "peerDependencies": { + "eslint": "^8.8.0", + "eslint-plugin-react": "^7.28.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", + "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", + "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rtsao/scc": "^1.1.0", + "array-includes": "^3.1.8", + "array.prototype.findlastindex": "^1.2.5", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.12.0", + "hasown": "^2.0.2", + "is-core-module": "^2.15.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.8", + "object.groupby": "^1.0.3", + "object.values": "^1.2.0", + "semver": "^6.3.1", + "string.prototype.trimend": "^1.0.8", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz", + "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.37.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz", + "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.3", + "array.prototype.tosorted": "^1.1.4", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.2.1", + "estraverse": "^5.3.0", + "hasown": "^2.0.2", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.9", + "object.fromentries": "^2.0.8", + "object.values": "^1.2.1", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.5", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.12", + "string.prototype.repeat": "^1.0.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-fifo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", + "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", + "license": "MIT" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, + "license": "ISC" + }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/fs": { + "name": "bare-fs", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.4.tgz", + "integrity": "sha512-r8+26Voz8dGX3AYpJdFb1ZPaUSM8XOLCZvy+YGpRTmwPHIxA7Z3Jov/oMPtV7hfRQbOnH8qGlLTzQAbgtdNN0Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.5.4", + "bare-path": "^3.0.0", + "bare-stream": "^2.6.4" + }, + "engines": { + "bare": ">=1.16.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/globbie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/globbie/-/globbie-1.0.2.tgz", + "integrity": "sha512-815R4zBxKIOnMuj9Qf0zlx3VeyDqqX9Oi2KIjRFtofyyUcZCmL8tGAamXG+VTGukLva8MFQDkmTDG8wvVTYF7Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-fs": "^4.1.2", + "bare-path": "^3.0.0", + "bare-process": "^4.2.1", + "brittle": "^3.6.0", + "picomatch": "^4.0.2" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/has-bigints": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/hypercore-crypto": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-3.6.0.tgz", + "integrity": "sha512-0slkW1wzq4B95SD8Z5nt1Yf/3KrIcGsBWTJTsCjHzMXie+sZ5I2IkWcxX1mo4+c0xVESnKAKphKSpGf2kf2BGA==", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.6", + "compact-encoding": "^2.15.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/hypercore-id-encoding": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/hypercore-id-encoding/-/hypercore-id-encoding-1.3.0.tgz", + "integrity": "sha512-W6sHdGo5h7LXEsoWfKf/KfuROZmZRQDlGqJF2EPHW+noCK66Vvr0+zE6cL0vqQi18s0kQPeN7Sq3QyR0Ytc2VQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.5.3", + "z32": "^1.0.0" + } + }, + "node_modules/hyperdht": { + "version": "6.20.5", + "resolved": "https://registry.npmjs.org/hyperdht/-/hyperdht-6.20.5.tgz", + "integrity": "sha512-eDAwTmAtE9rjMivgqYtqHalTdBVhhCMBVHlCWRVhEcWtchpDonsd2dmX26lJ0raoF+l9djkXvPcN1/kb9/kykw==", + "license": "MIT", + "dependencies": { + "@hyperswarm/secret-stream": "^6.6.2", + "b4a": "^1.3.1", + "bare-events": "^2.2.0", + "blind-relay": "^1.3.0", + "bogon": "^1.0.0", + "compact-encoding": "^2.4.1", + "compact-encoding-net": "^1.0.1", + "dht-rpc": "^6.15.1", + "hypercore-crypto": "^3.3.0", + "hypercore-id-encoding": "^1.2.0", + "noise-curve-ed": "^2.0.0", + "noise-handshake": "^4.0.0", + "record-cache": "^1.1.1", + "safety-catch": "^1.0.1", + "signal-promise": "^1.0.3", + "sodium-universal": "^5.0.1", + "streamx": "^2.16.1", + "unslab": "^1.3.0", + "xache": "^1.1.0" + }, + "bin": { + "hyperdht": "bin.js" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/internal-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-async-function": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", + "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "async-function": "^1.0.0", + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-boolean-object": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz", + "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-generator-function": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number-object": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-string": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz", + "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/iterator.prototype": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz", + "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "get-proto": "^1.0.0", + "has-symbols": "^1.1.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/kademlia-routing-table": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/kademlia-routing-table/-/kademlia-routing-table-1.0.6.tgz", + "integrity": "sha512-Ve6jwIlUCYvUzBnXnzVRHDZCFgXURW9gmF3r7n05kZs/2rNbLHXwGdcq0qIaSwdmJCvtosgR4JensnVU65hzNQ==", + "license": "MIT", + "dependencies": { + "bare-events": "^2.2.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/load-json-file": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", + "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^4.0.0", + "pify": "^4.0.1", + "strip-bom": "^3.0.0", + "type-fest": "^0.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=6" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/nanoassert": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-2.0.0.tgz", + "integrity": "sha512-7vO7n28+aYO4J+8w96AzhmU8G+Y/xpPDJz/se19ICsqj/momRbb9mh9ZUtkoJ5X3nTnPdhEJyc0qnM6yAsHBaA==", + "license": "ISC" + }, + "node_modules/nat-sampler": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nat-sampler/-/nat-sampler-1.0.1.tgz", + "integrity": "sha512-yQvyNN7xbqR8crTKk3U8gRgpcV1Az+vfCEijiHu9oHHsnIl8n3x+yXNHl42M6L3czGynAVoOT9TqBfS87gDdcw==", + "license": "MIT" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/noise-curve-ed": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/noise-curve-ed/-/noise-curve-ed-2.1.0.tgz", + "integrity": "sha512-zAzJx+VwZM3w6EA1hTmDhJfvAnCeBQn/1FAeZ0LtGxCcCtlAK/uJXQVF/eDVUOaAZ286lHlx77WJ+qj9SmsRRg==", + "license": "ISC", + "dependencies": { + "b4a": "^1.1.0", + "nanoassert": "^2.0.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/noise-handshake": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/noise-handshake/-/noise-handshake-4.1.0.tgz", + "integrity": "sha512-ZHt2+mOXTvjtaWS2h/JPvQjmknfKrEld2xdSsRYWXnYiJmK/N+dtxrDVSt1cr9wGAlhH7Ek43lIZNsL5bVeX9A==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.1.0", + "nanoassert": "^2.0.0", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz", + "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.values": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/paparam": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/paparam/-/paparam-1.8.3.tgz", + "integrity": "sha512-OLLDV8E+QoDGpHKW+7Fv7yLKJp7iMncaowH2s0oEuix6UXxHHxW8Tg0m0+IePR017UgyEg3CVlYSb1ON5BscVQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "license": "MIT", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/path": { + "name": "bare-path", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", + "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", + "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^3.0.0", + "load-json-file": "^5.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/process": { + "name": "bare-process", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/bare-process/-/bare-process-4.2.1.tgz", + "integrity": "sha512-wcmyQWTHxd2xRgeKUSY46ofmuEAJ9CLo/6swJTHOZFPYpBShMWNPVI2Ba8o0n/X/YE4as99M28x37saWZ1L1vQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-env": "^3.0.0", + "bare-events": "^2.3.1", + "bare-hrtime": "^2.0.0", + "bare-os": "^3.5.0", + "bare-pipe": "^4.0.0", + "bare-signals": "^4.0.0", + "bare-tty": "^5.0.0" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, + "license": "MIT", + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/protomux": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/protomux/-/protomux-3.10.1.tgz", + "integrity": "sha512-jgBqx8ZyaBWea/DFG4eOu1scOaeBwcnagiRC1XFVrjeGt7oAb0Pk5udPpBUpJ4DJBRjra50jD6YcZiQQTRqaaA==", + "license": "MIT", + "dependencies": { + "b4a": "^1.3.1", + "compact-encoding": "^2.5.1", + "queue-tick": "^1.0.0", + "safety-catch": "^1.0.1", + "unslab": "^1.3.0" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/queue-tick": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", + "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", + "license": "MIT" + }, + "node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/record-cache": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/record-cache/-/record-cache-1.2.0.tgz", + "integrity": "sha512-kyy3HWCez2WrotaL3O4fTn0rsIdfRKOdQQcEJ9KpvmKmbffKVvwsloX063EgRUlpJIXHiDQFhJcTbZequ2uTZw==", + "license": "MIT", + "dependencies": { + "b4a": "^1.3.1" + } + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/require-addon": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/require-addon/-/require-addon-1.1.0.tgz", + "integrity": "sha512-KbXAD5q2+v1GJnkzd8zzbOxchTkStSyJZ9QwoCq3QwEXAaIlG3wDYRZGzVD357jmwaGY7hr5VaoEAL0BkF0Kvg==", + "license": "Apache-2.0", + "dependencies": { + "bare-addon-resolve": "^1.3.0", + "bare-url": "^2.1.0" + }, + "engines": { + "bare": ">=1.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safety-catch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/safety-catch/-/safety-catch-1.0.2.tgz", + "integrity": "sha512-C1UYVZ4dtbBxEtvOcpjBaaD27nP8MlvyAQEp2fOTOEe6pfUpk1cDUxij6BR1jZup6rSyUTaBBplK7LanskrULA==", + "license": "MIT" + }, + "node_modules/same-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/same-object/-/same-object-1.0.2.tgz", + "integrity": "sha512-csHWhvUsLbIOHDM/nP+KHWM+BLPsIzWkFa8HbzaI0G7BqKXgx+7FJpKTGgLXyz5amfdY2OVBcmXTqYOMEk04og==", + "dev": true, + "license": "MIT" + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/shuffled-priority-queue": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/shuffled-priority-queue/-/shuffled-priority-queue-2.1.0.tgz", + "integrity": "sha512-xhdh7fHyMsr0m/w2kDfRJuBFRS96b9l8ZPNWGaQ+PMvnUnZ/Eh+gJJ9NsHBd7P9k0399WYlCLzsy18EaMfyadA==", + "license": "MIT", + "dependencies": { + "unordered-set": "^2.0.1" + } + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-promise": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/signal-promise/-/signal-promise-1.0.3.tgz", + "integrity": "sha512-WBgv0UnIq2C+Aeh0/n+IRpP6967eIx9WpynTUoiW3isPpfe1zu2LJzyfXdo9Tgef8yR/sGjcMvoUXD7EYdiz+g==", + "license": "MIT" + }, + "node_modules/sodium-native": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-5.0.1.tgz", + "integrity": "sha512-Q305aUXc0OzK7VVRvWkeEQJQIHs6slhFwWpyqLB5iJqhpyt2lYIVu96Y6PQ7TABIlWXVF3YiWDU3xS2Snkus+g==", + "license": "MIT", + "dependencies": { + "require-addon": "^1.1.0", + "which-runtime": "^1.2.1" + }, + "engines": { + "bare": ">=1.16.0" + } + }, + "node_modules/sodium-secretstream": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/sodium-secretstream/-/sodium-secretstream-1.2.0.tgz", + "integrity": "sha512-q/DbraNFXm1KfCiiZvapmz5UC3OlpirYFIvBK2MhGaOFSb3gRyk8OXTi17UI9SGfshQNCpsVvlopogbzZNyW6Q==", + "license": "MIT", + "dependencies": { + "b4a": "^1.1.1", + "sodium-universal": "^5.0.0" + } + }, + "node_modules/sodium-universal": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-5.0.1.tgz", + "integrity": "sha512-rv+aH+tnKB5H0MAc2UadHShLMslpJsc4wjdnHRtiSIEYpOetCgu8MS4ExQRia+GL/MK3uuCyZPeEsi+J3h+Q+Q==", + "license": "MIT", + "dependencies": { + "sodium-native": "^5.0.1" + }, + "peerDependencies": { + "sodium-javascript": "~0.8.0" + }, + "peerDependenciesMeta": { + "sodium-javascript": { + "optional": true + } + } + }, + "node_modules/stackframe": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", + "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==", + "dev": true, + "license": "MIT" + }, + "node_modules/standard": { + "version": "17.1.2", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.2.tgz", + "integrity": "sha512-WLm12WoXveKkvnPnPnaFUUHuOB2cUdAsJ4AiGHL2G0UNMrcRAWY2WriQaV8IQ3oRmYr0AWUbLNr94ekYFAHOrA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "eslint": "^8.41.0", + "eslint-config-standard": "17.1.0", + "eslint-config-standard-jsx": "^11.0.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.36.1", + "standard-engine": "^15.1.0", + "version-guard": "^1.1.1" + }, + "bin": { + "standard": "bin/cmd.cjs" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/standard-engine": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", + "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "get-stdin": "^8.0.0", + "minimist": "^1.2.6", + "pkg-conf": "^3.1.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/streamx": { + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz", + "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==", + "license": "MIT", + "dependencies": { + "fast-fifo": "^1.3.2", + "text-decoder": "^1.1.0" + }, + "optionalDependencies": { + "bare-events": "^2.2.0" + } + }, + "node_modules/string.prototype.matchall": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", + "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "regexp.prototype.flags": "^1.5.3", + "set-function-name": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/test-tmp": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/test-tmp/-/test-tmp-1.4.0.tgz", + "integrity": "sha512-GVggxGg+jXqP2Wbju50JVLo+9E+nIOPPyWqgr63EbOnNItIKu1cEbJpTWAJeflnyGqXOtcMI7ijHRp88GUkfDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bare-fs": "^4.0.1", + "bare-os": "^3.3.0", + "bare-path": "^3.0.0" + } + }, + "node_modules/text-decoder": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", + "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/time-ordered-set": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/time-ordered-set/-/time-ordered-set-2.0.1.tgz", + "integrity": "sha512-VJEKmgSN2UiOLB8BpN8Sh2b9LGMHTP5OPrQRpnKjvOheOyzk0mufbjzjKTIG2gO4A+Y+vDJ+0TcLbpUmMLsg8A==", + "license": "MIT" + }, + "node_modules/timeout-refresh": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-2.0.1.tgz", + "integrity": "sha512-SVqEcMZBsZF9mA78rjzCrYrUs37LMJk3ShZ851ygZYW1cMeIjs9mL57KO6Iv5mmjSQnOe/29/VAfGXo+oRCiVw==", + "license": "MIT" + }, + "node_modules/tmatch": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/tmatch/-/tmatch-5.0.0.tgz", + "integrity": "sha512-Ib9OtBkpHn07tXP04SlN1SYRxFgTk6wSM2EBmjjxug4u5RXPRVLkdFJSS1PmrQidaSB8Lru9nRtViQBsbxzE5Q==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/udx-native": { + "version": "1.17.8", + "resolved": "https://registry.npmjs.org/udx-native/-/udx-native-1.17.8.tgz", + "integrity": "sha512-nB5SxTF9WzTNrxJnVSyEOtapoPjxAU1KboN/z1JWMtAVXArwtQ9Mxn+jJvlx4skINQHH6xUqQsQdSCL1Ja2h1Q==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.5.0", + "bare-events": "^2.2.0", + "require-addon": "^1.1.0", + "streamx": "^2.14.0" + } + }, + "node_modules/unbox-primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-bigints": "^1.0.2", + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unordered-set": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.1.tgz", + "integrity": "sha512-eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg==", + "license": "MIT" + }, + "node_modules/unslab": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/unslab/-/unslab-1.3.0.tgz", + "integrity": "sha512-YATkfKAFj47kTzmiQrWXMyRvaVrHsW6MEALa4bm+FhiA2YG4oira+Z3DXN6LrYOYn2Y8eO94Lwl9DOHjs1FpoQ==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.6" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url": { + "name": "bare-url", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.6.tgz", + "integrity": "sha512-FgjDeR+/yDH34By4I0qB5NxAoWv7dOTYcOXwn73kr+c93HyC2lU6tnjifqUe33LKMJcDyCYPQjEAqgOQiXkE2Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-path": "^3.0.0" + } + }, + "node_modules/util": { + "name": "bare-utils", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/bare-utils/-/bare-utils-1.2.0.tgz", + "integrity": "sha512-Y9G5DbMUgcx078Etc7h9CD31aI9vYFZ/xl6JLnyvBX9+4lrlXw+5/6toNJGaNSylo4jJf8Cu3yBIDxMLviRFFw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bare-debug-log": "^1.0.0", + "bare-format": "^1.0.0", + "bare-inspect": "^3.0.0" + } + }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/version-guard": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.3.tgz", + "integrity": "sha512-JwPr6erhX53EWH/HCSzfy1tTFrtPXUe927wdM1jqBBeYp1OM+qPHjWbsvv6pIBduqdgxxS+ScfG7S28pzyr2DQ==", + "dev": true, + "license": "0BSD", + "engines": { + "node": ">=0.10.48" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", + "is-async-function": "^2.0.0", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", + "is-generator-function": "^1.0.10", + "is-regex": "^1.2.1", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.1.0", + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-runtime": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-runtime/-/which-runtime-1.2.1.tgz", + "integrity": "sha512-8feIHccQFH/whiA1fD1b4c5+Q7T4ry1g1oHYc2mHnFh81tTQFsCvy3zhS2geUapkFAVBddUT/AM1a3rbqJweFg==", + "license": "Apache-2.0" + }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/xache": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/xache/-/xache-1.2.1.tgz", + "integrity": "sha512-igRS6jPreJ54ABdzhh4mCDXcz+XMaWO2q1ABRV2yWYuk29jlp8VT7UBdCqNkX7rpYBbXsebVVKkwIuYZjyZNqA==", + "license": "MIT" + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/z32": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/z32/-/z32-1.1.0.tgz", + "integrity": "sha512-1WUHy+VS6d0HPNspDxvLssBbeQjXMjSnpv0vH82vRAUfg847NmX3OXozp/hRP5jPhxBbrVzrgvAt+UsGNzRFQQ==", + "license": "MIT", + "dependencies": { + "b4a": "^1.5.3" + } + } + } +} diff --git a/pkgs/by-name/hy/hyperswarm/package.nix b/pkgs/by-name/hy/hyperswarm/package.nix new file mode 100644 index 000000000000..5c0072f448e5 --- /dev/null +++ b/pkgs/by-name/hy/hyperswarm/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "hyperswarm"; + version = "4.11.7"; + + src = fetchFromGitHub { + owner = "holepunchto"; + repo = "hyperswarm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Z/FNBDJbiyR5AY40RDtiuQmjNUZ+BSGv8aewBnhSNZw="; + }; + + npmDepsHash = "sha256-4ysUYFIFlzr57J7MdZit1yX3Dgpb2eY0rdYnwyppwK0="; + + dontNpmBuild = true; + + postPatch = '' + cp ${./package-lock.json} ./package-lock.json + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Distributed Networking Stack for Connecting Peers"; + homepage = "https://github.com/holepunchto/hyperswarm"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ ]; + }; +}) diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix index 5ba0612fefe9..2f5f95be496b 100644 --- a/pkgs/by-name/hy/hyprcursor/package.nix +++ b/pkgs/by-name/hy/hyprcursor/package.nix @@ -50,11 +50,10 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland cursor format, library and utilities"; changelog = "https://github.com/hyprwm/hyprcursor/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; - maintainers = - lib.teams.hyprland.members - ++ (with lib.maintainers; [ - iynaix - ]); + maintainers = with lib.maintainers; [ + iynaix + ]; + teams = [ lib.teams.hyprland ]; mainProgram = "hyprcursor-util"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hypre/package.nix b/pkgs/by-name/hy/hypre/package.nix index 227cba66fac9..8e8985df6b5c 100644 --- a/pkgs/by-name/hy/hypre/package.nix +++ b/pkgs/by-name/hy/hypre/package.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation (finalAttrs: { - name = "hypre"; - version = "2.32.0"; + pname = "hypre"; + version = "2.33.0"; src = fetchFromGitHub { owner = "hypre-space"; repo = "hypre"; tag = "v${finalAttrs.version}"; - hash = "sha256-h16+nZ6+GfddfBJDF6sphuZ9Sff++PxW2R58XgJsnsI="; + hash = "sha256-OrpClN9xd+8DdELVnI4xBg3Ih/BaoBiO0w/QrFjUclw="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index a695361fca0a..a20fa4fc1679 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprgraphics"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprgraphics"; tag = "v${finalAttrs.version}"; - hash = "sha256-U62Fo0w+aIXBAsSSYsfDsoe3YmoxWMArJ7pN2HNOAqo="; + hash = "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM="; }; nativeBuildInputs = [ @@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Cpp graphics library for Hypr* ecosystem"; license = lib.licenses.bsd3; platforms = lib.platforms.linux ++ lib.platforms.freebsd; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; }; }) diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index 81c90c35b0c3..488ec0e9ad4f 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -53,11 +53,10 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland's idle daemon"; homepage = "https://github.com/hyprwm/hypridle"; license = lib.licenses.bsd3; - maintainers = - lib.teams.hyprland.members - ++ (with lib.maintainers; [ - iogamaster - ]); + maintainers = with lib.maintainers; [ + iogamaster + ]; + teams = [ lib.teams.hyprland ]; mainProgram = "hypridle"; platforms = [ "aarch64-linux" diff --git a/pkgs/by-name/hy/hyprland-protocols/package.nix b/pkgs/by-name/hy/hyprland-protocols/package.nix index a296a8c5283f..2188039d3776 100644 --- a/pkgs/by-name/hy/hyprland-protocols/package.nix +++ b/pkgs/by-name/hy/hyprland-protocols/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprland-protocols"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-protocols"; rev = "v${finalAttrs.version}"; - hash = "sha256-yf+AXt0RkAkCyF6iSnJt6EJAnNG/l6qv70CVzhRP6Bg="; + hash = "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/hyprwm/hyprland-protocols"; description = "Wayland protocol extensions for Hyprland"; license = lib.licenses.bsd3; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/hy/hyprland-qt-support/package.nix b/pkgs/by-name/hy/hyprland-qt-support/package.nix index 3f97833d5a88..914946eacd23 100644 --- a/pkgs/by-name/hy/hyprland-qt-support/package.nix +++ b/pkgs/by-name/hy/hyprland-qt-support/package.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/hyprwm/hyprland-qt-support"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; }; }) diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix index 96eab20a79bb..695fc391751e 100644 --- a/pkgs/by-name/hy/hyprland-qtutils/package.nix +++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix @@ -14,13 +14,13 @@ let in gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-qtutils"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-qtutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-9m/Ha7hrxtbBl4UylZTYzTT/8a6Sy5DvTmBJrcQ6FwQ="; + hash = "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland QT/qml utility apps"; homepage = "https://github.com/hyprwm/hyprland-qtutils"; license = lib.licenses.bsd3; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index ad4f188f971b..bb4eebd26add 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.48.1-b", - "commit_hash": "29e2e59fdbab8ed2cc23a20e3c6043d5decb5cdc", - "commit_message": "version: bump to v0.48.1", - "date": "2025-03-28", - "tag": "v0.48.1" + "branch": "main", + "commit_hash": "9958d297641b5c84dcff93f9039d80a5ad37ab00", + "commit_message": "version: bump to 0.49.0", + "date": "2025-05-08", + "tag": "v0.49.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index e2714aa085d7..4ad3601c78f8 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -86,14 +86,14 @@ assert assertMsg (!hidpiXWayland) customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.48.1"; + version = "0.49.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-skuJFly6LSFfyAVy2ByNolkEwIijsTu2TxzQ9ugWarI="; + hash = "sha256-3RVRQr+2WKBflZSsoLym9RwyqHWPk/J5WRtuJ0hgA+g="; }; postPatch = '' @@ -102,10 +102,6 @@ customStdenv.mkDerivation (finalAttrs: { # Remove extra @PREFIX@ to fix pkg-config paths sed -i "s#@PREFIX@/##g" hyprland.pc.in - - substituteInPlace protocols/meson.build --replace-fail \ - "wayland_scanner = dependency('wayland-scanner')" \ - "wayland_scanner = dependency('wayland-scanner', native: true)" ''; # variables used by generateVersion.sh script, and shown in `hyprctl version` @@ -219,7 +215,7 @@ customStdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/hyprwm/Hyprland"; description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; license = lib.licenses.bsd3; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; mainProgram = "Hyprland"; platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index d4dbe9584dd8..9c0125f130e9 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -9,13 +9,13 @@ gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprlang"; - version = "0.6.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlang"; rev = "v${finalAttrs.version}"; - hash = "sha256-oj8V4kvzor5AOStzj4/B4W1ZIObAPxT9K4NfXx7dyKE="; + hash = "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY="; }; nativeBuildInputs = [ @@ -39,10 +39,9 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Official implementation library for the hypr config language"; license = lib.licenses.lgpl3Only; platforms = lib.platforms.all; - maintainers = - lib.teams.hyprland.members - ++ (with lib.maintainers; [ - iogamaster - ]); + maintainers = with lib.maintainers; [ + iogamaster + ]; + teams = [ lib.teams.hyprland ]; }; }) diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 4159f9ab4552..51d93deb1734 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -28,13 +28,13 @@ gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.7.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; rev = "v${finalAttrs.version}"; - hash = "sha256-U+8HOPgfrNkFEadoyB9GXSPPFW/Uytvb3TxyqW3JOw4="; + hash = "sha256-9amK5DEpueAD+aobmBmjbV+C16RO7lcDOdf5ucJtNvM="; }; nativeBuildInputs = [ @@ -78,11 +78,10 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland's GPU-accelerated screen locking utility"; homepage = "https://github.com/hyprwm/hyprlock"; license = lib.licenses.bsd3; - maintainers = - lib.teams.hyprland.members - ++ (with lib.maintainers; [ - iynaix - ]); + maintainers = with lib.maintainers; [ + iynaix + ]; + teams = [ lib.teams.hyprland ]; mainProgram = "hyprlock"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix index ac7f9b559992..bd713f25d09f 100644 --- a/pkgs/by-name/hy/hyprls/package.nix +++ b/pkgs/by-name/hy/hyprls/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "hyprls"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprls"; rev = "v${version}"; - hash = "sha256-4PtoZWESEkRaZ4HOgXLWXRPhG1+JlWuMiYZtjbbLcz4="; + hash = "sha256-sXC/JMd2NYc74k19DxZyldH+QLZ6W8dVHy0uyqyuCmg="; }; vendorHash = "sha256-rG+oGJOABA9ee5nIpC5/U0mMsPhwvVtQvJBlQWfxi5Y="; @@ -26,7 +26,7 @@ buildGoModule rec { meta = { description = "LSP server for Hyprland's configuration language"; - homepage = "https://en.ewen.works/hyprls"; + homepage = "https://gwen.works/hyprls"; changelog = "https://github.com/hyprland-community/hyprls/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ arthsmn ]; diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index e1357e1c69fc..3b349ea80d00 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -33,13 +33,13 @@ gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprpaper"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprpaper"; rev = "v${finalAttrs.version}"; - hash = "sha256-pmkJCzjflvsOytiu2mgn2wfSeyL6mTfoi214T4A2OZQ="; + hash = "sha256-Q5gDH48MqkiglGvRtD0Uj653kYzu46j27JIB0h1ecEg="; }; prePatch = '' @@ -88,7 +88,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs.src.meta) homepage; description = "Blazing fast wayland wallpaper utility"; license = licenses.bsd3; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; inherit (wayland.meta) platforms; broken = gcc14Stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix index a7d6358d3908..d7f5c6dc9416 100644 --- a/pkgs/by-name/hy/hyprpicker/package.nix +++ b/pkgs/by-name/hy/hyprpicker/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprpicker" + lib.optionalString debug "-debug"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprpicker"; rev = "v${finalAttrs.version}"; - hash = "sha256-uxPknq5vuSl5h3kV1s+PzrCul2m8jgXcFEx/OMTchlg="; + hash = "sha256-ta3eCdXyKTVKhCU2/zC+XljU1Tq5huIyuFBtzOcUU4c="; }; cmakeBuildType = if debug then "Debug" else "Release"; @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Wlroots-compatible Wayland color picker that does not suck"; homepage = "https://github.com/hyprwm/hyprpicker"; license = lib.licenses.bsd3; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; platforms = wayland.meta.platforms; mainProgram = "hyprpicker"; }; diff --git a/pkgs/by-name/hy/hyprpolkitagent/package.nix b/pkgs/by-name/hy/hyprpolkitagent/package.nix index b9b2ba249496..0f5c112ab55b 100644 --- a/pkgs/by-name/hy/hyprpolkitagent/package.nix +++ b/pkgs/by-name/hy/hyprpolkitagent/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Polkit authentication agent written in QT/QML"; homepage = "https://github.com/hyprwm/hyprpolkitagent"; license = lib.licenses.bsd3; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; mainProgram = "hyprpolkitagent"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix index d37a8e05b0c6..6ce676e19d7a 100644 --- a/pkgs/by-name/hy/hyprprop/package.nix +++ b/pkgs/by-name/hy/hyprprop/package.nix @@ -14,13 +14,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "hyprprop"; - version = "0.1-unstable-2025-03-17"; + version = "0.1-unstable-2025-05-12"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "bd81329944be53b0ffb99e05864804b95f1d7c65"; - hash = "sha256-I8JVdQRu8eWvY5W8XWYZkdd5pojDHkxeqQV7mMIsbhs="; + rev = "8e6c02ac3dfbff878ef300266598737ee9cedf94"; + hash = "sha256-VKs/GtedyOrcWiEOf9JPPX6ZgKzngXTVMUlqsL60G/c="; }; sourceRoot = "${finalAttrs.src.name}/hyprprop"; @@ -65,7 +65,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "An xprop replacement for Hyprland"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; mainProgram = "hyprprop"; }; }) diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix index 4d9cea0bda9d..d106ba418ab1 100644 --- a/pkgs/by-name/hy/hyprsunset/package.nix +++ b/pkgs/by-name/hy/hyprsunset/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Application to enable a blue-light filter on Hyprland"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; mainProgram = "hyprsunset"; }; }) diff --git a/pkgs/by-name/hy/hyprsysteminfo/package.nix b/pkgs/by-name/hy/hyprsysteminfo/package.nix index 54e1f7a6cfbc..d3a405514f26 100644 --- a/pkgs/by-name/hy/hyprsysteminfo/package.nix +++ b/pkgs/by-name/hy/hyprsysteminfo/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A tiny qt6/qml application to display information about the running system"; homepage = "https://github.com/hyprwm/hyprsysteminfo"; license = lib.licenses.bsd3; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; mainProgram = "hyprsysteminfo"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index a818df4cdef6..60354ad36f88 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.5.2"; + version = "0.7.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14="; + hash = "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM="; }; nativeBuildInputs = [ @@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Small C++ library for utilities used across the Hypr* ecosystem"; license = lib.licenses.bsd3; platforms = lib.platforms.linux ++ lib.platforms.freebsd; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; }; }) diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index 1e32eaa1f736..448a2e85dc2f 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Hyprland version of wayland-scanner in and for C++"; changelog = "https://github.com/hyprwm/hyprwayland-scanner/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; - maintainers = lib.teams.hyprland.members; + teams = [ lib.teams.hyprland ]; mainProgram = "hyprwayland-scanner"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hypseus-singe/package.nix b/pkgs/by-name/hy/hypseus-singe/package.nix new file mode 100644 index 000000000000..5def65d686ab --- /dev/null +++ b/pkgs/by-name/hy/hypseus-singe/package.nix @@ -0,0 +1,90 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + cmake, + makeWrapper, + pkg-config, + + bash, + SDL2, + SDL2_image, + SDL2_ttf, + SDL2_mixer, + libmpeg2, + libvorbis, + libzip, + libX11, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hypseus-singe"; + version = "2.11.5"; + + src = fetchFromGitHub { + owner = "DirtBagXon"; + repo = "hypseus-singe"; + tag = "v${finalAttrs.version}"; + hash = "sha256-K/U/cx1y8mbC81qYNHz+AqT/hsc108NCHo0MoDhQqvs="; + }; + + patches = [ ./use-shared-mpeg2.patch ]; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + makeWrapper + pkg-config + ]; + + buildInputs = + [ + bash + SDL2 + SDL2_image + SDL2_ttf + SDL2_mixer + libmpeg2 + libvorbis + libzip + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${lib.getDev SDL2_image}/include/SDL2" + "-I${lib.getDev SDL2_ttf}/include/SDL2" + "-I${lib.getDev SDL2_mixer}/include/SDL2" + ]; + + preConfigure = '' + cd src + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 hypseus $out/bin/hypseus.bin + cd ../.. + install -Dm755 scripts/run.sh $out/bin/hypseus + install -Dm755 scripts/singe.sh $out/bin/singe + + substituteInPlace $out/bin/{hypseus,singe} \ + --replace-fail "/bin/cat" "cat" \ + --replace-fail hypseus.bin $out/bin/hypseus.bin + + runHook postInstall + ''; + + meta = { + description = "Laserdisc game emulator, the SDL2 version of Daphne and Singe"; + homepage = "https://github.com/DirtBagXon/hypseus-singe"; + license = lib.licenses.gpl3Only; + mainProgram = "hypseus"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch b/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch new file mode 100644 index 000000000000..f1118d9e45b6 --- /dev/null +++ b/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch @@ -0,0 +1,60 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 780b802..2f0b489 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -53,14 +53,13 @@ include(GetGitRevisionDescription) + include(InstallRequiredSystemLibraries) + include(FindPkgConfig) + include(ExternalProject) +-include(BuildLibMPEG2) + + use_cxx11( ) + + PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) + PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf) + PKG_SEARCH_MODULE(SDL2_MIXER REQUIRED SDL2_mixer) +-build_libmpeg2( ) ++PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2) + + message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}") + +@@ -114,7 +113,6 @@ add_subdirectory(timer) + add_subdirectory(video) + add_subdirectory(vldp) + +-add_dependencies( vldp libmpeg2 ) + add_dependencies( ldp-out vldp ) + add_dependencies( game vldp ) + add_dependencies( sound vldp ) +diff --git a/src/vldp/vldp_internal.cpp b/src/vldp/vldp_internal.cpp +index 16a74cb..2605011 100644 +--- a/src/vldp/vldp_internal.cpp ++++ b/src/vldp/vldp_internal.cpp +@@ -40,9 +40,9 @@ + #include + + #include +- ++extern "C" { + #include +- ++} + #ifdef VLDP_DEBUG + #define FRAMELOG "frame_report.txt" + #endif +diff --git a/src/vldp/vldp_internal.h b/src/vldp/vldp_internal.h +index 88450e9..1ea83ef 100644 +--- a/src/vldp/vldp_internal.h ++++ b/src/vldp/vldp_internal.h +@@ -26,9 +26,9 @@ + #define VLDP_INTERNAL_H + + #include "vldp.h" // for the VLDP_BOOL definition and SDL.h +- ++extern "C" { + #include +- ++} + // this is which version of the .dat file format we are using + #define DAT_VERSION 3 + diff --git a/pkgs/by-name/i2/i2pd-tools/package.nix b/pkgs/by-name/i2/i2pd-tools/package.nix new file mode 100644 index 000000000000..1d843f9ff192 --- /dev/null +++ b/pkgs/by-name/i2/i2pd-tools/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + boost, + fetchFromGitHub, + openssl, + zlib, +}: + +stdenv.mkDerivation { + pname = "i2pd-tools"; + version = "2.56.0"; + + #tries to access the network during the tests, which fails + + src = fetchFromGitHub { + owner = "PurpleI2P"; + repo = "i2pd-tools"; + rev = "33fce4b087d92ee90653460bbe7a07cdc0c7b121"; + hash = "sha256-mmCs8AHHKhx1/rDp/Vc1p2W3pufoTa4FcJyJwD919zw="; + fetchSubmodules = true; + }; + + buildInputs = [ + zlib + openssl + boost + ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + for bin in \ + routerinfo keygen vain keyinfo regaddr \ + regaddr_3ld regaddralias x25519 famtool autoconf; + do + install -Dm755 $bin -t $out/bin + done + + runHook postInstall + ''; + + meta = { + description = "Toolsuite to work with keys and eepsites"; + homepage = "https://github.com/PurpleI2P/i2pd-tools"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ MulliganSecurity ]; + mainProgram = "i2pd-tools"; + }; +} diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix index 59a4f509feac..0f8399f9e4a5 100644 --- a/pkgs/by-name/i2/i2pd/package.nix +++ b/pkgs/by-name/i2/i2pd/package.nix @@ -8,7 +8,6 @@ openssl, upnpSupport ? true, miniupnpc, - aesniSupport ? stdenv.hostPlatform.aesSupport, }: stdenv.mkDerivation rec { @@ -37,14 +36,9 @@ stdenv.mkDerivation rec { installShellFiles ]; - makeFlags = - let - ynf = a: b: a + "=" + (if b then "yes" else "no"); - in - [ - (ynf "USE_AESNI" aesniSupport) - (ynf "USE_UPNP" upnpSupport) - ]; + makeFlags = [ + "USE_UPNP=${if upnpSupport then "yes" else "no"}" + ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/ia/iagno/package.nix b/pkgs/by-name/ia/iagno/package.nix index 8e5aff5838c6..aa543d5109be 100644 --- a/pkgs/by-name/ia/iagno/package.nix +++ b/pkgs/by-name/ia/iagno/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/iagno"; description = "Computer version of the game Reversi, more popularly called Othello"; mainProgram = "iagno"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/ia/iamb/package.nix b/pkgs/by-name/ia/iamb/package.nix index ef59f9efd7a1..0d4d13a18788 100644 --- a/pkgs/by-name/ia/iamb/package.nix +++ b/pkgs/by-name/ia/iamb/package.nix @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ia/ianny/package.nix b/pkgs/by-name/ia/ianny/package.nix index 27d4899ee101..8d14be02987a 100644 --- a/pkgs/by-name/ia/ianny/package.nix +++ b/pkgs/by-name/ia/ianny/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "ianny"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "zefr0x"; repo = "ianny"; rev = "v${version}"; - hash = "sha256-F8Uc2BsQ5f7yaUXXDhLvyyYKUDAuvP9cCR2h3vblr0g="; + hash = "sha256-XNXlU9cCXPJhPytnVGHol8Cd5nZOEDDoDM4sm1+I/Qc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-QqdcOftbVt/yNzmvvy6AI66oTZvTgWHfY3Q/ikWGaLM="; + cargoHash = "sha256-7XpM6WWJaHHui85HCZ7SL1G2ICNw453xfZx5kUa/oeg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus.dev ]; diff --git a/pkgs/by-name/ia/iay/package.nix b/pkgs/by-name/ia/iay/package.nix new file mode 100644 index 000000000000..ed75f91ce418 --- /dev/null +++ b/pkgs/by-name/ia/iay/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "iay"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "aaqaishtyaq"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-oNUK2ROcocKoIlAuNZcJczDYtSchzpB1qaYbSYsjN50="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-QO9gzJKSBMs5s1fCfpBuyHDK9uE1B148bMjp8RjH4nY="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + ]; + + NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ + "-framework" + "AppKit" + ]; + + meta = with lib; { + description = "Minimalistic, blazing-fast, and extendable prompt for bash and zsh"; + homepage = "https://github.com/aaqaishtyaq/iay"; + license = licenses.mit; + maintainers = with maintainers; [ + aaqaishtyaq + omasanori + ]; + mainProgram = "iay"; + }; +} diff --git a/pkgs/by-name/ib/ibm-sw-tpm2/package.nix b/pkgs/by-name/ib/ibm-sw-tpm2/package.nix index f5f83f4736eb..bcb5024daf36 100644 --- a/pkgs/by-name/ib/ibm-sw-tpm2/package.nix +++ b/pkgs/by-name/ib/ibm-sw-tpm2/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { mainProgram = "tpm_server"; homepage = "https://sourceforge.net/projects/ibmswtpm2/"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = [ ]; license = licenses.bsd3; }; } diff --git a/pkgs/by-name/ib/ibniz/package.nix b/pkgs/by-name/ib/ibniz/package.nix deleted file mode 100644 index c8dc3636ef61..000000000000 --- a/pkgs/by-name/ib/ibniz/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - SDL, -}: - -stdenv.mkDerivation rec { - pname = "ibniz"; - version = "1.18"; - - src = fetchurl { - url = "http://www.pelulamu.net/ibniz/${pname}-${version}.tar.gz"; - sha256 = "10b4dka8zx7y84m1a58z9j2vly8mz9aw9wn8z9vx9av739j95wp2"; - }; - - buildInputs = [ SDL ]; - - installPhase = '' - mkdir -p $out/bin - cp ibniz $out/bin - ''; - - meta = with lib; { - description = "Virtual machine designed for extremely compact low-level audiovisual programs"; - homepage = "https://github.com/viznut/IBNIZ"; - license = licenses.zlib; - platforms = platforms.linux; - maintainers = [ maintainers.dezgeg ]; - mainProgram = "ibniz"; - }; -} diff --git a/pkgs/by-name/ic/icdiff/package.nix b/pkgs/by-name/ic/icdiff/package.nix index dff381e00e50..d34b976f068e 100644 --- a/pkgs/by-name/ic/icdiff/package.nix +++ b/pkgs/by-name/ic/icdiff/package.nix @@ -1,7 +1,7 @@ { lib, - fetchFromGitHub, python3Packages, + fetchFromGitHub, bash, git, less, @@ -9,33 +9,33 @@ python3Packages.buildPythonApplication rec { pname = "icdiff"; - version = "1.9.5"; + version = "2.0.7"; src = fetchFromGitHub { owner = "jeffkaufman"; repo = "icdiff"; - rev = "release-${version}"; - sha256 = "080v8h09pv8qwplin4kwfm0kmqjwdqjfxbpcdrv16sv4hwfwl5qd"; + tag = "release-${version}"; + hash = "sha256-XOw/xhPGlzi1hAgzQ1EtioUM476A+lQWLlvvaxd9j08="; }; + # error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory + doCheck = false; + nativeCheckInputs = [ bash git less ]; - # error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory - doCheck = false; - checkPhase = '' patchShebangs test.sh ./test.sh ${python3Packages.python.interpreter} ''; - meta = with lib; { + meta = { homepage = "https://www.jefftk.com/icdiff"; description = "Side-by-side highlighted command line diffs"; maintainers = [ ]; - license = licenses.psfl; + license = lib.licenses.psfl; }; } diff --git a/pkgs/by-name/ic/icestudio/package.nix b/pkgs/by-name/ic/icestudio/package.nix index c1f3d027e7b4..88fd188cbde5 100644 --- a/pkgs/by-name/ic/icestudio/package.nix +++ b/pkgs/by-name/ic/icestudio/package.nix @@ -5,6 +5,7 @@ buildNpmPackage, makeDesktopItem, makeWrapper, + unstableGitUpdater, nwjs, python3, @@ -12,13 +13,13 @@ let # Use unstable because it has improvements for finding python - version = "0-unstable-2024-11-18"; + version = "0.12-unstable-2025-03-08"; src = fetchFromGitHub { owner = "FPGAwars"; repo = "icestudio"; - rev = "87d057adb1e795352a7dd67666a69ada4269b2e8"; - hash = "sha256-VZuc5Wa6o5PMUE+P4EMDl/pI/zmcff9OEhqeCfS4bzE="; + rev = "46d39da2613aa2f55a068b50e7ac45a8f270005d"; + hash = "sha256-UNRNJubM9ePjXhqZ9RiZQIxGBMM3nOye83S7J8wCHMg="; }; collection = fetchurl { @@ -29,7 +30,7 @@ let app = buildNpmPackage { pname = "icestudio-app"; inherit version src; - npmDepsHash = "sha256-CbrnhnhCG8AdAqySO6fB5hZ128lHyC3WH/vZcFtv6Ko="; + npmDepsHash = "sha256-Dpnx23iq0fK191DXFgIfnbi+MLEp65H6eL81Icg4H4U="; sourceRoot = "${src.name}/app"; dontNpmBuild = true; installPhase = '' @@ -50,7 +51,7 @@ in buildNpmPackage rec { pname = "icestudio"; inherit version src; - npmDepsHash = "sha256-y1lo5+qJ6JBxjt7wtUmTHuJHMH9Mztf6xmmadI8zBgA="; + npmDepsHash = "sha256-ZHvXC0hpAcPMsHhxQWELFC2b+WBNoEvbtLLNJsDhMso="; npmFlags = [ # Use the legacy dependency resolution, with less strict version # requirements for transative dependencies @@ -101,6 +102,7 @@ buildNpmPackage rec { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { }; nativeBuildInputs = [ makeWrapper ]; @@ -110,15 +112,13 @@ buildNpmPackage rec { description = "Visual editor for open FPGA boards"; homepage = "https://github.com/FPGAwars/icestudio/"; license = lib.licenses.gpl2Only; - maintainers = - with lib.maintainers; - [ - kiike - jleightcap - rcoeurjoly - amerino - ] - ++ [ lib.teams.ngi ]; + maintainers = with lib.maintainers; [ + kiike + jleightcap + rcoeurjoly + amerino + ]; + teams = [ lib.teams.ngi ]; mainProgram = "icestudio"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 397fb528ddd3..af4beddf775d 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -37,18 +37,17 @@ pcre2, perl, pkg-config, - fetchpatch, }: stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.7.1"; + version = "3.7.4"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; - rev = finalAttrs.version; - hash = "sha256-4JF2ZAp8dx2fpSYRUz4I8US3oIZrSS90oljuxQDm38A="; + tag = finalAttrs.version; + hash = "sha256-lrYMx7UlVXQg6HlyajuxpV9liHXka0K/pJLrquTX2XQ="; }; strictDeps = true; @@ -95,17 +94,6 @@ stdenv.mkDerivation (finalAttrs: { pcre2 ]; - patches = [ - # https://github.com/NixOS/nixpkgs/issues/385959 - # https://github.com/bbidulock/icewm/issues/794 - # TODO: remove this patch when it is included in a release - (fetchpatch { - name = "fdomenu-icons-quoted"; - url = "https://github.com/bbidulock/icewm/commit/74bb0a2989127a3ff87d2932ff547713bc710cfe.patch"; - hash = "sha256-/rMSJYGAJs9cgNu5j4Mov/PfO7ocXQeNRq0vasfRcKA="; - }) - ]; - cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index 22e540f1182c..b22418b0158d 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.27.1"; + version = "1.27.5"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; tag = "v${version}"; - hash = "sha256-gJ1Vx0p8GiJ4esJuOanojlCHvqzOz8ttgAVn6idrLPM="; + hash = "sha256-7D/oyX5gBvybelFRsZAmr5xGRB6G7uD2V8ZTGFpbHGg="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/ic/icon-library/package.nix b/pkgs/by-name/ic/icon-library/package.nix index 7c3185aedc87..bee499147760 100644 --- a/pkgs/by-name/ic/icon-library/package.nix +++ b/pkgs/by-name/ic/icon-library/package.nix @@ -16,7 +16,6 @@ gtk4, gtksourceview5, libadwaita, - darwin, }: stdenv.mkDerivation rec { @@ -45,17 +44,13 @@ stdenv.mkDerivation rec { rustc wrapGAppsHook4 ]; - buildInputs = - [ - gdk-pixbuf - glib - gtk4 - gtksourceview5 - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + gdk-pixbuf + glib + gtk4 + gtksourceview5 + libadwaita + ]; meta = with lib; { homepage = "https://gitlab.gnome.org/World/design/icon-library"; diff --git a/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh index 994adbd91dae..3fdfa7e0d11a 100755 --- a/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh +++ b/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh @@ -1,7 +1,7 @@ #!/bin/sh # The file from which to extract *.ico files or a particular *.ico file. -# (e.g.: './KeePass.exe', './myLibrary.dll', './my/path/to/app.ico'). +# (e.g.: './KeePass.exe', './myLibrary.dll', './my/path/to/app.ico'). # As you notived, the utility can extract icons from a windows executable or # dll. rscFile=$1 @@ -28,7 +28,7 @@ nameRegex=$4 # fancy, it will usually be '\1'. nameReplaceExp=$5 -# The +# The # out=./myOut out=$6 @@ -52,7 +52,7 @@ if [ "ico" = "$rscFileExt" ]; then else wrestool -x --output=$tmp/ico -t14 $rscFile fi - + icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico mkdir -p $out diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix index 89eb8fc44aa3..543c906f90ec 100644 --- a/pkgs/by-name/id/identity/package.nix +++ b/pkgs/by-name/id/identity/package.nix @@ -26,19 +26,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "identity"; - version = "0.7.0"; + version = "25.03"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "YaLTeR"; repo = "identity"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-h8/mWGuosBiQRpoW8rINJht/7UBVEnUnTKY5HBCAyw4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-JZyhT220ARZ2rX0CZYeFkHx8i9ops7TcfGje0NKebnU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-YkbhZQUpe8ffBpHcYl7wjFgs3krAXlvHgcBdP/6uvek="; + hash = "sha256-RCSTxtHXkLsH8smGp2XzQeV9SSpLx5llrFg3cgIsWKY="; }; strictDeps = true; @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/YaLTeR/identity"; changelog = "https://gitlab.gnome.org/YaLTeR/identity/-/releases/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; mainProgram = "identity"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/id/ideogram/package.nix b/pkgs/by-name/id/ideogram/package.nix index 9d9c2bbff5d9..2d9c947f5f77 100644 --- a/pkgs/by-name/id/ideogram/package.nix +++ b/pkgs/by-name/id/ideogram/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS"; homepage = "https://github.com/cassidyjames/ideogram"; license = licenses.gpl2Plus; - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; platforms = platforms.linux; mainProgram = "com.github.cassidyjames.ideogram"; }; diff --git a/pkgs/by-name/id/idmail/package.nix b/pkgs/by-name/id/idmail/package.nix new file mode 100644 index 000000000000..039ce22b3ccc --- /dev/null +++ b/pkgs/by-name/id/idmail/package.nix @@ -0,0 +1,81 @@ +{ + binaryen, + cargo-leptos, + fetchFromGitHub, + lib, + rustc, + makeWrapper, + nix-update-script, + nodePackages, + rustPlatform, + tailwindcss_3, + wasm-bindgen-cli_0_2_100, +}: +let + tailwindcss = tailwindcss_3.overrideAttrs (_prev: { + plugins = [ + nodePackages."@tailwindcss/aspect-ratio" + nodePackages."@tailwindcss/forms" + nodePackages."@tailwindcss/line-clamp" + nodePackages."@tailwindcss/typography" + ]; + }); +in +rustPlatform.buildRustPackage rec { + pname = "idmail"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "oddlama"; + repo = "idmail"; + tag = "v${version}"; + hash = "sha256-9rl2UG8DeWd8hVh3N+dqyV5gO0LErok+kZ1vQZnVAe8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-UcS2gAoa2fzPu6hh8I5sXSHHbAmzsecT44Ju2CVsK0Q="; + + RUSTC_BOOTSTRAP = 1; + RUSTFLAGS = "--cfg=web_sys_unstable_apis"; + + nativeBuildInputs = [ + wasm-bindgen-cli_0_2_100 + binaryen + cargo-leptos + rustc.llvmPackages.lld + tailwindcss + makeWrapper + ]; + buildPhase = '' + runHook preBuild + + cargo leptos build --release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + cp target/release/idmail $out/bin + cp -r target/site $out/share + wrapProgram $out/bin/idmail --set LEPTOS_SITE_ROOT $out/share/site + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Email alias and account management interface for self-hosted mailservers"; + homepage = "https://github.com/oddlama/idmail"; + changelog = "https://github.com/oddlama/idmail/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + oddlama + patrickdag + ]; + mainProgram = "idmail"; + }; +} diff --git a/pkgs/by-name/id/idutils/package.nix b/pkgs/by-name/id/idutils/package.nix index f7640baffc8d..fd6e2b8fdc84 100644 --- a/pkgs/by-name/id/idutils/package.nix +++ b/pkgs/by-name/id/idutils/package.nix @@ -12,7 +12,6 @@ texinfo, perl, rsync, - darwin, }: stdenv.mkDerivation rec { @@ -31,13 +30,9 @@ stdenv.mkDerivation rec { ./bootstrap --force --gnulib-srcdir=${gnulib} --skip-po --bootstrap-sync --no-git ''; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - emacs - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + emacs + ]; nativeBuildInputs = [ gnulib diff --git a/pkgs/by-name/ie/ieda/fix-bump-gcc.patch b/pkgs/by-name/ie/ieda/fix-bump-gcc.patch deleted file mode 100644 index 8964af25c0ce..000000000000 --- a/pkgs/by-name/ie/ieda/fix-bump-gcc.patch +++ /dev/null @@ -1,409 +0,0 @@ -From bce09ab2a483a29479518e28511a99a56c0ac943 Mon Sep 17 00:00:00 2001 -From: xinyangli -Date: Sun, 1 Sep 2024 16:39:29 +0800 -Subject: [PATCH 1/3] refactor:use gtest instead of libgtest.a, .so can be used - if provided - ---- - .../iNO/external_libs/ino_test_external_libs.cmake | 11 ++++++----- - .../iPL/external_libs/ipl_test_external_libs.cmake | 7 ++++--- - .../iTO/external_libs/ito_test_external_libs.cmake | 11 ++++++----- - 3 files changed, 16 insertions(+), 13 deletions(-) - -diff --git a/src/operation/iNO/external_libs/ino_test_external_libs.cmake b/src/operation/iNO/external_libs/ino_test_external_libs.cmake -index be5764cc..cc3460a6 100644 ---- a/src/operation/iNO/external_libs/ino_test_external_libs.cmake -+++ b/src/operation/iNO/external_libs/ino_test_external_libs.cmake -@@ -1,8 +1,9 @@ - add_library(ino_test_external_libs INTERFACE) - --target_link_libraries(ino_test_external_libs -+target_link_libraries(ino_test_external_libs - INTERFACE -- libgtest.a -- libgtest_main.a -- pthread --) -\ No newline at end of file -+ gtest -+ gtest_main -+ pthread -+) -+ -diff --git a/src/operation/iPL/external_libs/ipl_test_external_libs.cmake b/src/operation/iPL/external_libs/ipl_test_external_libs.cmake -index 9accbee5..b763f91e 100644 ---- a/src/operation/iPL/external_libs/ipl_test_external_libs.cmake -+++ b/src/operation/iPL/external_libs/ipl_test_external_libs.cmake -@@ -2,7 +2,8 @@ add_library(ipl-test_external_libs INTERFACE) - - target_link_libraries(ipl-test_external_libs - INTERFACE -- libgtest.a -- libgtest_main.a -+ gtest -+ gtest_main - pthread --) -\ No newline at end of file -+) -+ -diff --git a/src/operation/iTO/external_libs/ito_test_external_libs.cmake b/src/operation/iTO/external_libs/ito_test_external_libs.cmake -index 9382d2e3..582e7abc 100644 ---- a/src/operation/iTO/external_libs/ito_test_external_libs.cmake -+++ b/src/operation/iTO/external_libs/ito_test_external_libs.cmake -@@ -1,8 +1,9 @@ - add_library(ito_test_external_libs INTERFACE) - --target_link_libraries(ito_test_external_libs -+target_link_libraries(ito_test_external_libs - INTERFACE -- libgtest.a -- libgtest_main.a -- pthread --) -\ No newline at end of file -+ gtest -+ gtest_main -+ pthread -+) -+ --- -2.47.0 - - -From 56cd8a3c510b884cca7ef2bbc9e279feb57a3041 Mon Sep 17 00:00:00 2001 -From: xinyangli -Date: Sun, 1 Sep 2024 16:44:07 +0800 -Subject: [PATCH 2/3] fix:missing headers in gcc 13 - ---- - src/database/basic/geometry/IdbGeometry.h | 1 + - src/database/basic/geometry/IdbLayerShape.h | 3 ++- - src/feature/database/feature_db.h | 1 + - .../iCTS/source/data_manager/database/CtsCellLib.hh | 3 ++- - .../iCTS/source/data_manager/io/report/CtsReport.hh | 3 ++- - src/operation/iCTS/source/solver/database/Net.hh | 5 ++++- - src/operation/iFP/source/module/tap_cell/tapcell.h | 4 +++- - src/operation/iPDN/source/module/pdn_plan/pdn_plan.h | 4 ++-- - src/operation/iPDN/source/module/pdn_via/pdn_via.h | 3 ++- - .../iPL/source/module/detail_placer/database/DPNet.hh | 3 ++- - .../iPL/source/module/detail_placer/database/DPPin.cc | 4 +++- - src/operation/iRT/interface/RTInterface.hpp | 1 + - src/third_party/CMakeLists.txt | 2 +- - src/third_party/salt/refine/flip.cpp | 3 ++- - 14 files changed, 28 insertions(+), 12 deletions(-) - -diff --git a/src/database/basic/geometry/IdbGeometry.h b/src/database/basic/geometry/IdbGeometry.h -index ec16907c..a8b8a360 100644 ---- a/src/database/basic/geometry/IdbGeometry.h -+++ b/src/database/basic/geometry/IdbGeometry.h -@@ -34,6 +34,7 @@ - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -+#include - #include - #include - #include -diff --git a/src/database/basic/geometry/IdbLayerShape.h b/src/database/basic/geometry/IdbLayerShape.h -index 8c7ac435..35981708 100644 ---- a/src/database/basic/geometry/IdbLayerShape.h -+++ b/src/database/basic/geometry/IdbLayerShape.h -@@ -31,6 +31,7 @@ - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -+#include - #include - #include - #include -@@ -110,4 +111,4 @@ class IdbLayerShape - IdbLayer* _layer; - std::vector _rect_list; - }; --} // namespace idb -\ No newline at end of file -+} // namespace idb -diff --git a/src/feature/database/feature_db.h b/src/feature/database/feature_db.h -index 53ee71ca..71d8c3f3 100644 ---- a/src/feature/database/feature_db.h -+++ b/src/feature/database/feature_db.h -@@ -31,6 +31,7 @@ - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - #include -+#include - #include - #include - #include -diff --git a/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh b/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh -index 43699ff5..b103a702 100644 ---- a/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh -+++ b/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - - #include "ModelFactory.hh" -@@ -187,4 +188,4 @@ class CtsLibs - std::unordered_map _model_maps; - #endif - }; --} // namespace icts -\ No newline at end of file -+} // namespace icts -diff --git a/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh b/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh -index 8798e50e..b88df74c 100644 ---- a/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh -+++ b/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -70,4 +71,4 @@ class CtsReportTable : public ieda::ReportTable - static std::unique_ptr createReportTable(const std::string& tbl_name, const CtsReportType& type); - }; - --} // namespace icts -\ No newline at end of file -+} // namespace icts -diff --git a/src/operation/iCTS/source/solver/database/Net.hh b/src/operation/iCTS/source/solver/database/Net.hh -index 85c1751b..5cbc0470 100644 ---- a/src/operation/iCTS/source/solver/database/Net.hh -+++ b/src/operation/iCTS/source/solver/database/Net.hh -@@ -20,6 +20,9 @@ - */ - #pragma once - class Pin; -+#include -+#include -+ - #include "CTSAPI.hh" - #include "Pin.hh" - -@@ -70,4 +73,4 @@ class Net - Pin* _driver_pin = nullptr; - std::vector _load_pins = {}; - }; --} // namespace icts -\ No newline at end of file -+} // namespace icts -diff --git a/src/operation/iFP/source/module/tap_cell/tapcell.h b/src/operation/iFP/source/module/tap_cell/tapcell.h -index 4af86b51..e15ba4a3 100644 ---- a/src/operation/iFP/source/module/tap_cell/tapcell.h -+++ b/src/operation/iFP/source/module/tap_cell/tapcell.h -@@ -16,6 +16,8 @@ - // *************************************************************************************** - #pragma once - -+#include -+ - #include - #include - #include -@@ -58,4 +60,4 @@ class TapCellPlacer - int32_t getCellMasterWidthByOrient(idb::IdbCellMaster* cell_master, idb::IdbOrient orinet); - }; - --} // namespace ifp -\ No newline at end of file -+} // namespace ifp -diff --git a/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h b/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h -index e46b5c34..82de562b 100644 ---- a/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h -+++ b/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h -@@ -16,13 +16,13 @@ - // *************************************************************************************** - #pragma once - -+#include - #include - #include - #include - - #include "ipdn_basic.h" - #include "pdn_cut_stripe.h" -- - namespace idb { - class IdbLayer; - class IdbSpecialWireSegment; -@@ -108,4 +108,4 @@ class PdnPlan - std::vector& segment_list_bottom); - }; - --} // namespace ipdn -\ No newline at end of file -+} // namespace ipdn -diff --git a/src/operation/iPDN/source/module/pdn_via/pdn_via.h b/src/operation/iPDN/source/module/pdn_via/pdn_via.h -index 837399ce..e0fe85bf 100644 ---- a/src/operation/iPDN/source/module/pdn_via/pdn_via.h -+++ b/src/operation/iPDN/source/module/pdn_via/pdn_via.h -@@ -16,6 +16,7 @@ - // *************************************************************************************** - #pragma once - -+#include - #include - #include - -@@ -64,4 +65,4 @@ class PdnVia - int32_t transUnitDB(double value); - }; - --} // namespace ipdn -\ No newline at end of file -+} // namespace ipdn -diff --git a/src/operation/iPL/source/module/detail_placer/database/DPNet.hh b/src/operation/iPL/source/module/detail_placer/database/DPNet.hh -index f0013433..890111c5 100644 ---- a/src/operation/iPL/source/module/detail_placer/database/DPNet.hh -+++ b/src/operation/iPL/source/module/detail_placer/database/DPNet.hh -@@ -27,6 +27,7 @@ - #ifndef IPL_DPNET_H - #define IPL_DPNET_H - -+#include - #include - #include - -@@ -92,4 +93,4 @@ class DPNet - std::vector _pins; - }; - } // namespace ipl --#endif -\ No newline at end of file -+#endif -diff --git a/src/operation/iPL/source/module/detail_placer/database/DPPin.cc b/src/operation/iPL/source/module/detail_placer/database/DPPin.cc -index 93aea277..537b1282 100644 ---- a/src/operation/iPL/source/module/detail_placer/database/DPPin.cc -+++ b/src/operation/iPL/source/module/detail_placer/database/DPPin.cc -@@ -16,6 +16,8 @@ - // *************************************************************************************** - #include "DPPin.hh" - -+#include -+ - namespace ipl { - - DPPin::DPPin(std::string name) -@@ -35,4 +37,4 @@ DPPin::~DPPin() - { - } - --} // namespace ipl -\ No newline at end of file -+} // namespace ipl -diff --git a/src/operation/iRT/interface/RTInterface.hpp b/src/operation/iRT/interface/RTInterface.hpp -index 5a6c3c18..45a4952e 100644 ---- a/src/operation/iRT/interface/RTInterface.hpp -+++ b/src/operation/iRT/interface/RTInterface.hpp -@@ -17,6 +17,7 @@ - #pragma once - - #include -+#include - #include - #include - #include -diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt -index cb66c339..29f6b02d 100644 ---- a/src/third_party/CMakeLists.txt -+++ b/src/third_party/CMakeLists.txt -@@ -12,4 +12,4 @@ add_subdirectory(yaml-cpp) - # add_subdirectory(mt-kahypar) - if(BUILD_GUI) - add_subdirectory(tcl_qt) --endif() -\ No newline at end of file -+endif() -diff --git a/src/third_party/salt/refine/flip.cpp b/src/third_party/salt/refine/flip.cpp -index 5dad3766..73743f3c 100644 ---- a/src/third_party/salt/refine/flip.cpp -+++ b/src/third_party/salt/refine/flip.cpp -@@ -3,6 +3,7 @@ - #include "salt/base/eval.h" - - #include -+#include - - namespace salt { - -@@ -197,4 +198,4 @@ void Refine::flip(Tree& tree) { - } while (cur.wireLength < pre.wireLength); - } - --} // namespace salt -\ No newline at end of file -+} // namespace salt --- -2.47.0 - - -From 55e689db3a9d2a51828806ab46ff655cc4c1193c Mon Sep 17 00:00:00 2001 -From: xinyangli -Date: Sun, 1 Sep 2024 17:00:37 +0800 -Subject: [PATCH 3/3] fix:glog force size_t on sighandler from 0.6 - ---- - src/operation/iPL/source/module/logger/Log.cc | 5 +++-- - src/utility/log/Log.cc | 3 ++- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/operation/iPL/source/module/logger/Log.cc b/src/operation/iPL/source/module/logger/Log.cc -index c94d3907..2fc70b31 100644 ---- a/src/operation/iPL/source/module/logger/Log.cc -+++ b/src/operation/iPL/source/module/logger/Log.cc -@@ -26,6 +26,7 @@ - - #include "Log.hh" - -+#include - #include - #include - #include -@@ -40,7 +41,7 @@ namespace ipl { - * @param {int} size - * @return {*} - */ --void SignalHandle(const char* data, int size) -+void SignalHandle(const char* data, std::size_t size) - { - std::ofstream fs("glog_dump.log", std::ios::app); - std::string str = std::string(data, size); -@@ -101,4 +102,4 @@ void Log::makeSureDirectoryExist(std::string directory_path) - std::filesystem::create_directories(directory_path.c_str()); - } - --} // namespace ipl -\ No newline at end of file -+} // namespace ipl -diff --git a/src/utility/log/Log.cc b/src/utility/log/Log.cc -index 42d43041..190566a3 100644 ---- a/src/utility/log/Log.cc -+++ b/src/utility/log/Log.cc -@@ -24,6 +24,7 @@ - - #include "Log.hh" - -+#include - #include - #include - #include -@@ -39,7 +40,7 @@ namespace ieda { - * @param data - * @param size - */ --void SignalHandle(const char* data, int size) -+void SignalHandle(const char* data, std::size_t size) - { - std::ofstream fs("glog_dump.log", std::ios::app); - std::string str = std::string(data, size); --- -2.47.0 - diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix index 87df9ce9b20b..e87b5aa8247c 100644 --- a/pkgs/by-name/ie/ieda/package.nix +++ b/pkgs/by-name/ie/ieda/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchgit, + fetchFromGitHub, + fetchpatch, callPackages, cmake, ninja, @@ -22,28 +24,41 @@ onnxruntime, }: let + glog-lock = glog.overrideAttrs (oldAttrs: rec { + version = "0.6.0"; + src = fetchFromGitHub { + owner = "google"; + repo = "glog"; + rev = "v${version}"; + sha256 = "sha256-xqRp9vaauBkKz2CXbh/Z4TWqhaUtqfbsSlbYZR/kW9s="; + }; + }); rootSrc = stdenv.mkDerivation { pname = "iEDA-src"; - version = "2024-09-10"; + version = "2025-04-14"; src = fetchgit { url = "https://gitee.com/oscc-project/iEDA"; - rev = "a68b691b9d25fafd8c10fae3df7ef3837a42e052"; - sha256 = "sha256-0rSESfNqI3ALipNAInwcYSccq9C0WuXI9na44TyYAgY="; + rev = "51d198884cde2ecda643071a1a6cb4ec0e09d881"; + sha256 = "sha256-kDVEAttSqa8l7qcRs7MQiBgPbAKBExEQvIE8tc7PLpM="; }; patches = [ - ./fix-bump-gcc.patch - - # We need to build rust projects with rustPlatform - # and remove hard coded linking to libonnxruntime - ./remove-subprojects-from-cmake.patch + # This patch is to fix the build error caused by the missing of the header file, + # and remove some libs or path that they hard-coded in the source code. + # Should be removed after we upstream these changes. + (fetchpatch { + url = "https://github.com/Emin017/iEDA/commit/e899b432776010048b558a939ad9ba17452cb44f.patch"; + hash = "sha256-fLKsb/dgbT1mFCWEldFwhyrA1HSkKGMAbAs/IxV9pwM="; + }) + # This patch is to fix the compile error on the newer version of gcc/g++ + # which is caused by some incorrect declarations and usages of the Boost library. + # Should be removed after we upstream these changes. + (fetchpatch { + url = "https://github.com/Emin017/iEDA/commit/3a2c7e27a5bd349d72b3a7198358cd640c678802.patch"; + hash = "sha256-2YROkQ92jGOJZr+4+LrwRJKxhA39Bypb1xFdo6aftu8="; + }) ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O3 -Wall")' 'set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O2")' - ''; - dontBuild = true; dontFixup = true; installPhase = '' @@ -56,7 +71,7 @@ let in stdenv.mkDerivation { pname = "iEDA"; - version = "0-unstable-2024-10-11"; + version = "0-unstable-2025-04-14"; src = rootSrc; @@ -87,7 +102,7 @@ stdenv.mkDerivation { rustpkgs.verilog-parser rustpkgs.liberty-parser gtest - glog + glog-lock gflags boost onnxruntime @@ -103,15 +118,33 @@ stdenv.mkDerivation { postInstall = '' # Tests rely on hardcoded path, so they should not be included rm $out/bin/*test $out/bin/*Test $out/bin/test_* $out/bin/*_app + + # Copy scripts to the share directory for the test + mkdir -p $out/share/scripts + cp -r $src/scripts/hello.tcl $out/share/scripts/ ''; + installCheckPhase = '' + runHook preInstallCheck + + # Run the tests + $out/bin/iEDA -script $out/share/scripts/hello.tcl + + runHook postInstallCheck + ''; + + doInstallCheck = true; + enableParallelBuild = true; meta = { description = "Open-source EDA infracstructure and tools from Netlist to GDS for ASIC design"; homepage = "https://gitee.com/oscc-project/iEDA"; license = lib.licenses.mulan-psl2; - maintainers = with lib.maintainers; [ xinyangli ]; + maintainers = with lib.maintainers; [ + xinyangli + Emin017 + ]; mainProgram = "iEDA"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ie/ieda/remove-subprojects-from-cmake.patch b/pkgs/by-name/ie/ieda/remove-subprojects-from-cmake.patch deleted file mode 100644 index 98286b1d1fcb..000000000000 --- a/pkgs/by-name/ie/ieda/remove-subprojects-from-cmake.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 170a842da107e937c1c62c2a318ef84d49e1d292 Mon Sep 17 00:00:00 2001 -From: xinyangli -Date: Fri, 30 Aug 2024 17:33:15 +0800 -Subject: [PATCH 1/2] fix:wrong headers in nix - ---- - src/operation/iCTS/api/CTSAPI.hh | 1 + - src/utility/tcl/ScriptEngine.hh | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/operation/iCTS/api/CTSAPI.hh b/src/operation/iCTS/api/CTSAPI.hh -index c0881dc0..85c38728 100644 ---- a/src/operation/iCTS/api/CTSAPI.hh -+++ b/src/operation/iCTS/api/CTSAPI.hh -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include "../../../database/interaction/ids.hpp" - -diff --git a/src/utility/tcl/ScriptEngine.hh b/src/utility/tcl/ScriptEngine.hh -index 3e679de2..78e9d24d 100644 ---- a/src/utility/tcl/ScriptEngine.hh -+++ b/src/utility/tcl/ScriptEngine.hh -@@ -24,7 +24,7 @@ - - #pragma once - --#include -+#include - - #include - #include --- -2.47.0 - - -From 66e3e69aa12a331d3724314ac06cd713ebb152d9 Mon Sep 17 00:00:00 2001 -From: xinyangli -Date: Sat, 31 Aug 2024 23:28:30 +0800 -Subject: [PATCH 2/2] remove rust packages and onnxruntime lib from cmake - ---- - src/database/manager/parser/liberty/CMakeLists.txt | 6 +++--- - src/database/manager/parser/spef/CMakeLists.txt | 4 ++-- - src/database/manager/parser/vcd/CMakeLists.txt | 6 +++--- - src/database/manager/parser/verilog/CMakeLists.txt | 6 +++--- - src/operation/iIR/source/iir-rust/CMakeLists.txt | 4 ++-- - src/operation/iSTA/CMakeLists.txt | 2 +- - 6 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/src/database/manager/parser/liberty/CMakeLists.txt b/src/database/manager/parser/liberty/CMakeLists.txt -index cf9ee880..c03f9dbe 100644 ---- a/src/database/manager/parser/liberty/CMakeLists.txt -+++ b/src/database/manager/parser/liberty/CMakeLists.txt -@@ -22,9 +22,9 @@ endif() - - message("liberty parser rust lib path ${RUST_LIB_PATH}") - --ADD_EXTERNAL_PROJ(liberty) -+# ADD_EXTERNAL_PROJ(liberty) - --target_link_libraries(liberty str sta-solver log ${RUST_LIB_PATH} dl) -+target_link_libraries(liberty str sta-solver log liberty_parser dl) - - target_include_directories(liberty PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} -@@ -35,4 +35,4 @@ target_link_libraries(test_lib liberty) - target_include_directories(test_lib PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}) - --install(TARGETS test_lib DESTINATION /home/taosimin/bin/iEDA_bin) -\ No newline at end of file -+# install(TARGETS test_lib DESTINATION /home/taosimin/bin/iEDA_bin) -diff --git a/src/database/manager/parser/spef/CMakeLists.txt b/src/database/manager/parser/spef/CMakeLists.txt -index 0d8672ed..9e27083b 100644 ---- a/src/database/manager/parser/spef/CMakeLists.txt -+++ b/src/database/manager/parser/spef/CMakeLists.txt -@@ -22,9 +22,9 @@ endif() - - message("spef parser rust lib path ${RUST_LIB_PATH}") - --ADD_EXTERNAL_PROJ(spef) -+# ADD_EXTERNAL_PROJ(spef) - --target_link_libraries(spef log ${RUST_LIB_PATH} dl) -+target_link_libraries(spef log spef_parser dl) - target_include_directories(spef PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}) - -diff --git a/src/database/manager/parser/vcd/CMakeLists.txt b/src/database/manager/parser/vcd/CMakeLists.txt -index 3a9cfddb..89bad504 100644 ---- a/src/database/manager/parser/vcd/CMakeLists.txt -+++ b/src/database/manager/parser/vcd/CMakeLists.txt -@@ -21,9 +21,9 @@ endif() - - message("vcd parser rust lib path ${RUST_LIB_PATH}") - --ADD_EXTERNAL_PROJ(vcd) -+# ADD_EXTERNAL_PROJ(vcd) - --target_link_libraries(vcd ${RUST_LIB_PATH} dl) -+target_link_libraries(vcd vcd_parser dl) - target_include_directories(vcd PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}) - -@@ -31,4 +31,4 @@ add_executable(test_vcd ${CMAKE_CURRENT_SOURCE_DIR}/vcd_parser/test/test.cpp) - target_link_libraries(test_vcd vcd) - target_include_directories(test_vcd PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}) -- -\ No newline at end of file -+ -diff --git a/src/database/manager/parser/verilog/CMakeLists.txt b/src/database/manager/parser/verilog/CMakeLists.txt -index a3f21183..e2a55cfc 100644 ---- a/src/database/manager/parser/verilog/CMakeLists.txt -+++ b/src/database/manager/parser/verilog/CMakeLists.txt -@@ -25,12 +25,12 @@ endif() - - message("verilog parser rust lib path ${RUST_LIB_PATH}") - --ADD_EXTERNAL_PROJ(verilog) -+# ADD_EXTERNAL_PROJ(verilog) - --target_link_libraries(verilog str log ${ZLIB_LIBRARIES} ${RUST_LIB_PATH} dl) -+target_link_libraries(verilog str log ${ZLIB_LIBRARIES} verilog_parser dl) - - target_include_directories(verilog - PUBLIC - ${HOME_OPERATION}/iSTA/include - ${CMAKE_CURRENT_SOURCE_DIR} --) -\ No newline at end of file -+) -diff --git a/src/operation/iIR/source/iir-rust/CMakeLists.txt b/src/operation/iIR/source/iir-rust/CMakeLists.txt -index 69e7009c..049c0012 100644 ---- a/src/operation/iIR/source/iir-rust/CMakeLists.txt -+++ b/src/operation/iIR/source/iir-rust/CMakeLists.txt -@@ -22,6 +22,6 @@ endif() - - message("iIR rust lib path ${RUST_LIB_PATH}") - --ADD_EXTERNAL_PROJ(iir) -+# ADD_EXTERNAL_PROJ(iir) - --target_link_libraries(iIR-Rust PRIVATE ${RUST_LIB_PATH} dl) -\ No newline at end of file -+target_link_libraries(iIR-Rust PRIVATE iir dl) -diff --git a/src/operation/iSTA/CMakeLists.txt b/src/operation/iSTA/CMakeLists.txt -index 31563917..9a1207a5 100644 ---- a/src/operation/iSTA/CMakeLists.txt -+++ b/src/operation/iSTA/CMakeLists.txt -@@ -24,7 +24,7 @@ include_directories(${HOME_THIRDPARTY}/yaml-cpp/include) - include(${HOME_CMAKE}/operation/idb.cmake) - - link_directories(${CMAKE_BINARY_DIR}/lib) --link_directories(${HOME_THIRDPARTY}/onnxruntime/) -+# link_directories(${HOME_THIRDPARTY}/onnxruntime/) - - find_package(Eigen3 REQUIRED) - --- -2.47.0 - diff --git a/pkgs/by-name/ie/ieda/rustpkgs.nix b/pkgs/by-name/ie/ieda/rustpkgs.nix index f02385b6136d..31cb6620ecb0 100644 --- a/pkgs/by-name/ie/ieda/rustpkgs.nix +++ b/pkgs/by-name/ie/ieda/rustpkgs.nix @@ -9,7 +9,7 @@ in src = rootSrc; sourceRoot = "${src.name}/src/operation/iIR/source/iir-rust/iir"; useFetchCargoVendor = true; - cargoHash = "sha256-xyNaUTPvU21yOdkQq8vdnHCyLzcpDAFAje0R/gDqliU="; + cargoHash = "sha256-CV1e/f3oCKW5mTbQnFBnp7E2d9nFyDwY3qclP2HwdPM="; doCheck = false; diff --git a/pkgs/by-name/if/ifwifi/package.nix b/pkgs/by-name/if/ifwifi/package.nix new file mode 100644 index 000000000000..83f3a240e3f1 --- /dev/null +++ b/pkgs/by-name/if/ifwifi/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + makeWrapper, + networkmanager, + iw, +}: + +rustPlatform.buildRustPackage rec { + pname = "ifwifi"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "araujobsd"; + repo = "ifwifi"; + rev = version; + sha256 = "sha256-DPMCwyKqGJrav0wASBky9bS1bvJ3xaGsDzsk1bKaH1U="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-oxuOc9FSKYq6UjimZPLayJ+5xsWzh3gZV/mVpPbPWHk="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/ifwifi" \ + --prefix PATH : "${ + lib.makeBinPath ( + # `ifwifi` runtime dep + [ networkmanager ] + # `wifiscanner` crate's runtime deps + ++ (lib.optional stdenv.hostPlatform.isLinux iw) + # ++ (lib.optional stdenv.hostPlatform.isDarwin airport) # airport isn't packaged + ) + }" + ''; + + doCheck = true; + + meta = with lib; { + description = "Simple wrapper over nmcli using wifiscanner made in rust"; + mainProgram = "ifwifi"; + longDescription = '' + In the author's words: + + I felt bothered because I never remember the long and tedious command + line to setup my wifi interface. So, I wanted to develop something + using rust to simplify the usage of nmcli, and I met the wifiscanner + project that gave me almost everything I wanted to create this tool. + ''; + homepage = "https://github.com/araujobsd/ifwifi"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ ]; + # networkmanager doesn't work on darwin + # even though the `wifiscanner` crate would work + platforms = with platforms; linux; # ++ darwin; + }; +} diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix index 8f66cb6b0e99..e968ec050628 100644 --- a/pkgs/by-name/ig/ignite-cli/package.nix +++ b/pkgs/by-name/ig/ignite-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "ignite-cli"; - version = "28.8.2"; + version = "28.10.0"; src = fetchFromGitHub { repo = "cli"; owner = "ignite"; rev = "v${version}"; - hash = "sha256-d7+T0VlmKQgmAJ8eyDg8JDL9HHJbU+nOTvJP0GTuIRY="; + hash = "sha256-oGPiU6vC9T/fadyt97GkZBuPojINXnQPhtguwv7eyJU="; }; vendorHash = "sha256-EaOs3m5AN0EYMO8j3mkKPOQwapi0WRaTIUJKTjDpmCo="; diff --git a/pkgs/by-name/ig/ignition/fix-gjs.patch b/pkgs/by-name/ig/ignition/fix-gjs.patch new file mode 100644 index 000000000000..312042bb5b1c --- /dev/null +++ b/pkgs/by-name/ig/ignition/fix-gjs.patch @@ -0,0 +1,26 @@ +diff --git a/src/io.github.flattool.Ignition.in b/src/io.github.flattool.Ignition.in +index 5c71c3c..0b2ec00 100644 +--- a/src/io.github.flattool.Ignition.in ++++ b/src/io.github.flattool.Ignition.in +@@ -1,7 +1,8 @@ +-#!@GJS@ -m ++#!/usr/bin/env gjs -m + + import { exit, programArgs, programInvocationName } from "system"; + ++imports.package._findEffectiveEntryPointName = () => 'io.github.flattool.Ignition'; + imports.package.init({ + name: "@PACKAGE_NAME@", + version: "@PACKAGE_VERSION@", +diff --git a/src/meson.build b/src/meson.build +index 488fa06..751f8ed 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -23,7 +23,6 @@ data_res = gnome.compile_resources('io.github.flattool.Ignition.data', + ) + + bin_conf = configuration_data() +-bin_conf.set('GJS', find_program('gjs').full_path()) + bin_conf.set('PACKAGE_VERSION', meson.project_version()) + bin_conf.set('PACKAGE_NAME', meson.project_name()) + bin_conf.set('prefix', get_option('prefix')) diff --git a/pkgs/by-name/ig/ignition/package.nix b/pkgs/by-name/ig/ignition/package.nix new file mode 100644 index 000000000000..3d934752cce4 --- /dev/null +++ b/pkgs/by-name/ig/ignition/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + appstream, + blueprint-compiler, + desktop-file-utils, + gettext, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + + gjs, + gtk4, + libadwaita, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ignition"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "flattool"; + repo = "ignition"; + tag = finalAttrs.version; + hash = "sha256-XVBlwonMHb78XF6mpPYLJ68E5Tb+dFVFqNSsVCCS0xc="; + }; + + patches = [ + # Don't use find_program for detecting gjs. (we don't want to use the build-platform's gjs binary) + # We instead rely on the fact that fixupPhase uses patchShebangs on the script. + # Also, we manually set the effective entrypoint to make gjs properly find our binary. + ./fix-gjs.patch + ]; + + strictDeps = true; + + nativeBuildInputs = [ + appstream + blueprint-compiler + desktop-file-utils + gettext + gtk4 + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + gjs + gtk4 + libadwaita + ]; + + meta = { + description = "Manage startup apps and scripts"; + homepage = "https://github.com/flattool/ignition"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ tomasajt ]; + mainProgram = "io.github.flattool.Ignition"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ig/igrep/package.nix b/pkgs/by-name/ig/igrep/package.nix new file mode 100644 index 000000000000..fd36e112b38b --- /dev/null +++ b/pkgs/by-name/ig/igrep/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + testers, + igrep, +}: + +rustPlatform.buildRustPackage rec { + pname = "igrep"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "konradsz"; + repo = "igrep"; + rev = "v${version}"; + hash = "sha256-ZZhzBGLpzd9+rok+S/ypKpWXVzXaA1CnviC7LfgP/CU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-NZN9pB9McZkTlpGgAbxi8bwn+aRiPMymGmBLYBc6bmw="; + + passthru.tests = { + version = testers.testVersion { + package = igrep; + command = "ig --version"; + }; + }; + + meta = with lib; { + description = "Interactive Grep"; + homepage = "https://github.com/konradsz/igrep"; + changelog = "https://github.com/konradsz/igrep/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ _0x4A6F ]; + mainProgram = "ig"; + }; +} diff --git a/pkgs/by-name/ig/igvm-tooling/package.nix b/pkgs/by-name/ig/igvm-tooling/package.nix index 557bcee8aa0d..05629f538466 100644 --- a/pkgs/by-name/ig/igvm-tooling/package.nix +++ b/pkgs/by-name/ig/igvm-tooling/package.nix @@ -5,7 +5,7 @@ fetchpatch, which, acpica-tools, - nix-update-script, + unstableGitUpdater, }: python3.pkgs.buildPythonApplication rec { @@ -62,7 +62,9 @@ python3.pkgs.buildPythonApplication rec { find $out/share/igvm-tooling/acpi -name "*.dsl" -exec iasl -f {} \; ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "igvm-"; + }; meta = { description = "IGVM Image Generator"; diff --git a/pkgs/by-name/il/ilbc/extract-cfile.awk b/pkgs/by-name/il/ilbc/extract-cfile.awk index e4b07bc08963..54fd2bbf7651 100644 --- a/pkgs/by-name/il/ilbc/extract-cfile.awk +++ b/pkgs/by-name/il/ilbc/extract-cfile.awk @@ -5,7 +5,7 @@ BEGIN { srcname = "nothing"; } srcname = $2; printf("creating source file %s\n", srcname); }else if (srcname != "nothing") { - if (/Andersen,* *et* *al\./) + if (/Andersen,* *et* *al\./) printf("skipping %s\n", $0); else if (/ /) printf("skipping2 %s\n", $0); diff --git a/pkgs/by-name/il/ili2c/package.nix b/pkgs/by-name/il/ili2c/package.nix index 89ad4a19ee23..f117f8a2a453 100644 --- a/pkgs/by-name/il/ili2c/package.nix +++ b/pkgs/by-name/il/ili2c/package.nix @@ -63,7 +63,8 @@ stdenv.mkDerivation (finalAttrs: { binaryBytecode # source bundles dependencies as jars ]; license = licenses.lgpl21Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ das-g ]; + maintainers = with maintainers; [ das-g ]; + teams = [ teams.geospatial ]; platforms = platforms.unix; mainProgram = "ili2c"; }; diff --git a/pkgs/by-name/il/ilmbase/package.nix b/pkgs/by-name/il/ilmbase/package.nix index 400eec45f1a8..74fcb9fe9a57 100644 --- a/pkgs/by-name/il/ilmbase/package.nix +++ b/pkgs/by-name/il/ilmbase/package.nix @@ -3,16 +3,17 @@ lib, buildPackages, cmake, - openexr, + # explicitely depending on openexr_2 because ilmbase doesn't exist for v3 + openexr_2, }: stdenv.mkDerivation { pname = "ilmbase"; - version = lib.getVersion openexr; + version = lib.getVersion openexr_2; # the project no longer provides separate tarballs. We may even want to merge # the ilmbase package into openexr in the future. - inherit (openexr) src patches; + inherit (openexr_2) src patches; outputs = [ "out" @@ -33,9 +34,10 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics"; + description = "Library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics"; homepage = "https://www.openexr.com/"; license = licenses.bsd3; platforms = platforms.all; + insecure = true; }; } diff --git a/pkgs/by-name/im/imager/clang.patch b/pkgs/by-name/im/imager/clang.patch new file mode 100644 index 000000000000..2e053bfd3810 --- /dev/null +++ b/pkgs/by-name/im/imager/clang.patch @@ -0,0 +1,37 @@ +diff --git a/admin/Makefile.def b/admin/Makefile.def +index facc205..0daceaf 100644 +--- a/admin/Makefile.def ++++ b/admin/Makefile.def +@@ -310,7 +310,7 @@ endif + + # Apple CLANG flags (identical to GCC) + ifeq ($(GAG_COMPILER_CKIND),clang) +- GLOBAL_CFLAGS += -pipe -fPIC ++ GLOBAL_CFLAGS += -fPIC + ifeq ($(RELEASE_MODE),no) + OPTION_CFLAGS += -Wall + endif +@@ -360,7 +360,7 @@ endif + + # GFORTRAN flags + ifeq ($(GAG_COMPILER_FKIND),gfortran) +- GLOBAL_FFLAGS += -J$(moddir) -pipe -fno-backslash -fno-range-check ++ GLOBAL_FFLAGS += -J$(moddir) -fno-backslash -fno-range-check + ifeq ($(GAG_USE_SANITIZE),yes) + GLOBAL_FFLAGS += -fsanitize=address -fsanitize=null + # Can not be used with our memory(ip): +diff --git a/admin/define-system.sh b/admin/define-system.sh +index 36d4ab9..0233259 100644 +--- a/admin/define-system.sh ++++ b/admin/define-system.sh +@@ -287,8 +287,8 @@ EOF + fi + elif [ `uname -p` = "arm" ]; then + GAG_MACHINE=arm64 +- if which gcc > /dev/null 2>&1; then +- DEFAULT_CCOMPILER=gcc ++ if which clang > /dev/null 2>&1; then ++ DEFAULT_CCOMPILER=clang + fi + if which clang++ > /dev/null 2>&1; then + DEFAULT_CXXCOMPILER=clang++ diff --git a/pkgs/by-name/im/imager/cpp-darwin.patch b/pkgs/by-name/im/imager/cpp-darwin.patch new file mode 100644 index 000000000000..13e0ff3897dd --- /dev/null +++ b/pkgs/by-name/im/imager/cpp-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/admin/Makefile.def b/admin/Makefile.def +index 27a1c02..43ef322 100644 +--- a/admin/Makefile.def ++++ b/admin/Makefile.def +@@ -228,7 +228,7 @@ GLOBAL_DIRTY = $(builddir) *~ TAGS ChangeLog* Makefile.bak + # Fortran preprocessing + + # Preprocessor command +-CPP = cpp ++CPP = $(GAG_CPP) + + # Preprocessor generic flags + GLOBAL_CPPFLAGS += -P -traditional -C diff --git a/pkgs/by-name/im/imager/package.nix b/pkgs/by-name/im/imager/package.nix new file mode 100644 index 000000000000..b3f393b7571c --- /dev/null +++ b/pkgs/by-name/im/imager/package.nix @@ -0,0 +1,109 @@ +{ + lib, + stdenv, + fetchurl, + gtk2-x11, + pkg-config, + python3, + gfortran, + cfitsio, + getopt, + perl, + groff, + which, + darwin, + ncurses, + makeWrapper, +}: + +let + python3Env = python3.withPackages ( + ps: with ps; [ + numpy + setuptools + ] + ); +in + +stdenv.mkDerivation (finalAttrs: { + version = "4.5-01"; + pname = "imager"; + + src = fetchurl { + # The recommended download link is on Nextcloud instance that + # requires to accept some general terms of use. Use a mirror at + # univ-grenoble-alpes.fr instead. + url = "https://cloud.univ-grenoble-alpes.fr/s/J6yEqA6yZ8tX9da/download?path=%2F&files=imager-may25.tar.gz"; + hash = "sha256-E3JjdVGEQ0I/ogYj0G1OZxfQ3hA+sRgA4LAfHK52Sec="; + }; + + nativeBuildInputs = [ + pkg-config + groff + perl + getopt + gfortran + which + makeWrapper + ]; + + buildInputs = [ + gtk2-x11 + cfitsio + python3Env + ncurses + ]; + + patches = [ + # Use Clang as the default compiler on Darwin. + ./clang.patch + # Replace hardcoded cpp with GAG_CPP (see below). + ./cpp-darwin.patch + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + + # Workaround for https://github.com/NixOS/nixpkgs/issues/304528 + env.GAG_CPP = if stdenv.hostPlatform.isDarwin then "${gfortran.outPath}/bin/cpp" else "cpp"; + + postPatch = '' + substituteInPlace utilities/main/gag-makedepend.pl --replace-fail '/usr/bin/perl' ${lib.getExe perl} + ''; + + configurePhase = '' + source admin/gildas-env.sh -c gfortran -o openmp + echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl + ''; + + postInstall = '' + cp -a ../gildas-exe/* $out + mv $out/$GAG_EXEC_SYSTEM $out/libexec + makeWrapper $out/libexec/bin/imager $out/bin/imager \ + --set GAG_ROOT_DIR $out \ + --set GAG_PATH $out/etc \ + --set GAG_EXEC_SYSTEM libexec \ + --set GAG_GAG \$HOME/.gag \ + --set PYTHONHOME ${python3Env} \ + --prefix PYTHONPATH : $out/libexec/python \ + --set LD_LIBRARY_PATH $out/libexec/lib/ + ''; + + meta = { + description = "Interferometric imaging package"; + longDescription = '' + IMAGER is an interferometric imaging package in the GILDAS software, + tailored for usage simplicity and efficiency for multi-spectral data sets. + + IMAGER was developed and optimized to handle large data files. + Therefore, IMAGER works mostly on internal buffers and avoids as much as possible + saving data to intermediate files. + File saving is done ultimately once the data analysis process is complete, + which offers an optimum use of the disk bandwidth. + ''; + homepage = "https://imager.oasu.u-bordeaux.fr"; + license = lib.licenses.free; + maintainers = [ lib.maintainers.smaret ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; + +}) diff --git a/pkgs/by-name/im/imapdedup/package.nix b/pkgs/by-name/im/imapdedup/package.nix index 84109cebd593..0e66b83b5c11 100644 --- a/pkgs/by-name/im/imapdedup/package.nix +++ b/pkgs/by-name/im/imapdedup/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication rec { pname = "imapdedup"; - version = "1.1"; + version = "1.2"; pyproject = true; src = fetchFromGitHub { owner = "quentinsf"; repo = "IMAPdedup"; tag = version; - hash = "sha256-s49nnMjX1beZKTrlcjzp0nESIVRb/LZDycpnzz8fG+o="; + hash = "sha256-CmWkLz9hdmedUxcojmUVTkPjqpaMmtEeHnF7aglKR+s="; }; build-system = with python3Packages; [ hatchling ]; diff --git a/pkgs/by-name/im/imgpkg/package.nix b/pkgs/by-name/im/imgpkg/package.nix index b6286b1fbc51..46e77b960b5a 100644 --- a/pkgs/by-name/im/imgpkg/package.nix +++ b/pkgs/by-name/im/imgpkg/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "imgpkg"; - version = "0.45.0"; + version = "0.46.1"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "imgpkg"; rev = "v${version}"; - hash = "sha256-DuLxNH0fcVPvZYG4AYtaT8kJysTLRNX2tB6UBhQoP9Q="; + hash = "sha256-OrZjk0ap7ZNlxe/1FIVCZX93bVYxCJzFiijnQOIPeWk="; }; vendorHash = null; diff --git a/pkgs/by-name/im/imgproxy/package.nix b/pkgs/by-name/im/imgproxy/package.nix index c01f697f5c50..77375d6c3725 100644 --- a/pkgs/by-name/im/imgproxy/package.nix +++ b/pkgs/by-name/im/imgproxy/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.27.2"; + version = "3.28.0"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-rPdo+gj1nxbrE3qbABB7H+tN6WXAdwhtPUCYCsn6vEk="; + hash = "sha256-aI+rWXt+tioHFGBJk/RkYeo7JaV+10jurx7YKX448Yk="; rev = "v${version}"; }; - vendorHash = "sha256-ckJ9HJkkaDx42wS/j9cwDGOku9X7yZ5uL1bun6IMfH4="; + vendorHash = "sha256-L18vxiFXBlKeipMm1N/c+F+zHDQYN5CHjYwa4xi9I3s="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/im/imgui/0001-imgui-allow-installing-into-split-outputs.patch b/pkgs/by-name/im/imgui/0001-imgui-allow-installing-into-split-outputs.patch new file mode 100644 index 000000000000..48764cc56f25 --- /dev/null +++ b/pkgs/by-name/im/imgui/0001-imgui-allow-installing-into-split-outputs.patch @@ -0,0 +1,198 @@ +From c5fe9a321d83fc70cf30ef999c24377869cedbd8 Mon Sep 17 00:00:00 2001 +From: SomeoneSerge +Date: Thu, 27 Jun 2024 11:15:38 +0000 +Subject: [PATCH] imgui: allow installing into split outputs + +--- + ports/imgui/CMakeLists.txt | 74 +++++++++++++++++++++++--------------- + 1 file changed, 45 insertions(+), 29 deletions(-) + +diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt +index 1502a5aff2..be05d29f4f 100644 +--- a/ports/imgui/CMakeLists.txt ++++ b/ports/imgui/CMakeLists.txt +@@ -8,13 +8,15 @@ if(APPLE) + enable_language(OBJCXX) + endif() + ++include(GNUInstallDirs) # Defines CMAKE_INSTALL_INCLUDEDIR if not set ++ + add_library(${PROJECT_NAME} "") + add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) + target_include_directories( + ${PROJECT_NAME} + PUBLIC + "$" +- $ ++ $ + ) + + target_sources( +@@ -154,18 +156,32 @@ list(REMOVE_DUPLICATES BINDINGS_SOURCES) + install( + TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}_target +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib +- RUNTIME DESTINATION bin ++ ARCHIVE ++ COMPONENT Development ++ DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY ++ COMPONENT Runtime ++ NAMELINK_COMPONENT Development ++ DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME ++ COMPONENT Runtime ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + + foreach(BINDING_TARGET ${BINDING_TARGETS}) + install( + TARGETS ${BINDING_TARGET} + EXPORT ${PROJECT_NAME}_target +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib +- RUNTIME DESTINATION bin ++ ARCHIVE ++ COMPONENT Development ++ DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY ++ COMPONENT Runtime ++ NAMELINK_COMPONENT Development ++ DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME ++ COMPONENT Runtime ++ DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + endforeach() + +@@ -178,47 +194,47 @@ if(NOT IMGUI_SKIP_HEADERS) + ${CMAKE_CURRENT_SOURCE_DIR}/imstb_rectpack.h + ${CMAKE_CURRENT_SOURCE_DIR}/imstb_truetype.h + ${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.h +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + + if(IMGUI_BUILD_ALLEGRO5_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if (IMGUI_BUILD_ANDROID_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_android.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_android.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_DX9_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx9.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx9.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_DX10_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx10.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx10.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_DX11_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx11.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx11.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_DX12_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx12.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx12.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_GLFW_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glfw.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glfw.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_GLUT_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glut.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glut.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_METAL_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_metal.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_metal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_OPENGL2_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl2.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_OPENGL3_BINDING) +@@ -227,16 +243,16 @@ if(NOT IMGUI_SKIP_HEADERS) + ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.h + ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3_loader.h + DESTINATION +- include ++ ${CMAKE_INSTALL_INCLUDEDIR} + ) + endif() + + if(IMGUI_BUILD_OSX_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_osx.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_osx.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_SDL3_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl3.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl3.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_SDLGPU3_BINDING) +@@ -245,24 +261,24 @@ if(NOT IMGUI_SKIP_HEADERS) + ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlgpu3.h + ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlgpu3_shaders.h + DESTINATION +- include ++ ${CMAKE_INSTALL_INCLUDEDIR} + ) + endif() + + if(IMGUI_BUILD_SDL3_RENDERER_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer3.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer3.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_VULKAN_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_vulkan.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_vulkan.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_BUILD_WIN32_BINDING) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_win32.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_win32.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_FREETYPE) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() + + if(IMGUI_TEST_ENGINE) +@@ -285,13 +301,13 @@ if(NOT IMGUI_SKIP_HEADERS) + endif() + + include(CMakePackageConfigHelpers) +-configure_package_config_file(imgui-config.cmake.in imgui-config.cmake INSTALL_DESTINATION share/imgui) ++configure_package_config_file(imgui-config.cmake.in imgui-config.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/imgui) + +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/imgui-config.cmake DESTINATION share/imgui) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/imgui-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/imgui) + + install( + EXPORT ${PROJECT_NAME}_target + NAMESPACE ${PROJECT_NAME}:: + FILE ${PROJECT_NAME}-targets.cmake +- DESTINATION share/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} + ) +-- +2.47.2 + diff --git a/pkgs/development/libraries/imgui/demo/CMakeLists.txt b/pkgs/by-name/im/imgui/demo/CMakeLists.txt similarity index 100% rename from pkgs/development/libraries/imgui/demo/CMakeLists.txt rename to pkgs/by-name/im/imgui/demo/CMakeLists.txt diff --git a/pkgs/development/libraries/imgui/demo/default.nix b/pkgs/by-name/im/imgui/demo/default.nix similarity index 100% rename from pkgs/development/libraries/imgui/demo/default.nix rename to pkgs/by-name/im/imgui/demo/default.nix diff --git a/pkgs/by-name/im/imgui/package.nix b/pkgs/by-name/im/imgui/package.nix new file mode 100644 index 000000000000..cc1e4ffaa222 --- /dev/null +++ b/pkgs/by-name/im/imgui/package.nix @@ -0,0 +1,161 @@ +{ + stdenv, + lib, + applyPatches, + callPackage, + cmake, + fetchFromGitHub, + fetchpatch, + glfw, + libGL, + SDL2, + sdl3, + vcpkg, + vulkan-headers, + vulkan-loader, + imgui, + + # NOTE: Not coming from vcpkg + IMGUI_LINK_GLVND ? + !stdenv.hostPlatform.isWindows && (IMGUI_BUILD_OPENGL2_BINDING || IMGUI_BUILD_OPENGL3_BINDING), + + # The intent is to mirror vcpkg's flags[^1], + # but we only actually support Linux and glfw3 until someone contributes the rest + # [^1]: https://github.com/microsoft/vcpkg/blob/095ee06e7f60dceef7d713e3f8b1c2eb10d650d7/ports/imgui/CMakeLists.txt#L33-L108 + IMGUI_BUILD_ALLEGRO5_BINDING ? false, + IMGUI_BUILD_ANDROID_BINDING ? stdenv.hostPlatform.isAndroid, + IMGUI_BUILD_DX9_BINDING ? false, + IMGUI_BUILD_DX10_BINDING ? false, + IMGUI_BUILD_DX11_BINDING ? false, + IMGUI_BUILD_DX12_BINDING ? false, + IMGUI_BUILD_GLFW_BINDING ? !stdenv.hostPlatform.isDarwin, + IMGUI_BUILD_GLUT_BINDING ? false, + IMGUI_BUILD_METAL_BINDING ? stdenv.hostPlatform.isDarwin, + IMGUI_BUILD_OPENGL2_BINDING ? false, + IMGUI_BUILD_OPENGL3_BINDING ? + IMGUI_BUILD_SDL3_BINDING || IMGUI_BUILD_GLFW_BINDING || IMGUI_BUILD_GLUT_BINDING, + IMGUI_BUILD_OSX_BINDING ? stdenv.hostPlatform.isDarwin, + IMGUI_BUILD_SDL3_BINDING ? !IMGUI_BUILD_GLFW_BINDING && !stdenv.hostPlatform.isDarwin, + IMGUI_BUILD_SDL3_RENDERER_BINDING ? IMGUI_BUILD_SDL3_BINDING, + IMGUI_BUILD_SDL2_BINDING ? false, + IMGUI_BUILD_SDL2_RENDERER_BINDING ? false, + IMGUI_BUILD_SDLGPU3_BINDING ? IMGUI_BUILD_SDL3_BINDING && lib.versionAtLeast imgui.version "1.91.8", + IMGUI_BUILD_VULKAN_BINDING ? false, + IMGUI_BUILD_WIN32_BINDING ? false, + IMGUI_FREETYPE ? false, + IMGUI_FREETYPE_LUNASVG ? false, + IMGUI_USE_WCHAR32 ? false, +}: +let + vcpkgRevs.postSdl3 = lib.versionAtLeast vcpkg.version "2025.03.19"; + vcpkgRevs.others = !vcpkgRevs.postSdl3; + vcpkgSource = applyPatches { + inherit (vcpkg) src; + patches = + lib.optionals vcpkgRevs.postSdl3 [ + # This patch was not accepted mainstream, as out-of-scope + # and also to not encourage dependencies between Nixpkgs and Vcpkg. + # Currently @SomeoneSerge is responsible for rebasing it when necessary. + # Consider vendoring instead? + ./0001-imgui-allow-installing-into-split-outputs.patch + ] + ++ lib.optionals vcpkgRevs.others [ + # Original version of the split-outputs patch + fetchpatch + { + url = "https://github.com/microsoft/vcpkg/commit/4108dd75ce9731a4fdcf50fd05034405156eaddf.patch"; + hash = "sha256-jXbR0NfyuO8EESmva5A+H3WmBfCG83OiA8ZCcWsRhQA="; + } + ]; + }; +in + +stdenv.mkDerivation rec { + pname = "imgui"; + version = "1.91.4"; + outputs = [ + # Note: no "dev" because vcpkg installs include/ and imgui-config.cmake + # into different prefixes but expects the merged layout at import time + "out" + "lib" + ]; + + src = fetchFromGitHub { + owner = "ocornut"; + repo = "imgui"; + tag = "v${version}"; + hash = "sha256-6j4keBOAzbBDsV0+R4zTNlsltxz2dJDGI43UIrHXDNM="; + }; + + cmakeRules = "${vcpkgSource}/ports/imgui"; + postPatch = '' + cp "$cmakeRules"/{CMakeLists.txt,*.cmake.in} ./ + ''; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = + lib.optionals IMGUI_LINK_GLVND [ libGL ] + ++ lib.optionals IMGUI_BUILD_GLFW_BINDING [ glfw ] + ++ lib.optionals IMGUI_BUILD_SDL3_BINDING [ sdl3 ] + ++ lib.optionals IMGUI_BUILD_SDL2_BINDING [ SDL2 ] + ++ lib.optionals IMGUI_BUILD_VULKAN_BINDING [ + vulkan-headers + vulkan-loader + ]; + + cmakeFlags = [ + (lib.cmakeBool "IMGUI_BUILD_GLFW_BINDING" IMGUI_BUILD_GLFW_BINDING) + (lib.cmakeBool "IMGUI_BUILD_ALLEGRO5_BINDING" IMGUI_BUILD_ALLEGRO5_BINDING) + (lib.cmakeBool "IMGUI_BUILD_ANDROID_BINDING" IMGUI_BUILD_ANDROID_BINDING) + (lib.cmakeBool "IMGUI_BUILD_DX9_BINDING" IMGUI_BUILD_DX9_BINDING) + (lib.cmakeBool "IMGUI_BUILD_DX10_BINDING" IMGUI_BUILD_DX10_BINDING) + (lib.cmakeBool "IMGUI_BUILD_DX11_BINDING" IMGUI_BUILD_DX11_BINDING) + (lib.cmakeBool "IMGUI_BUILD_DX12_BINDING" IMGUI_BUILD_DX12_BINDING) + (lib.cmakeBool "IMGUI_BUILD_GLFW_BINDING" IMGUI_BUILD_GLFW_BINDING) + (lib.cmakeBool "IMGUI_BUILD_GLUT_BINDING" IMGUI_BUILD_GLUT_BINDING) + (lib.cmakeBool "IMGUI_BUILD_METAL_BINDING" IMGUI_BUILD_METAL_BINDING) + (lib.cmakeBool "IMGUI_BUILD_OPENGL2_BINDING" IMGUI_BUILD_OPENGL2_BINDING) + (lib.cmakeBool "IMGUI_BUILD_OPENGL3_BINDING" IMGUI_BUILD_OPENGL3_BINDING) + (lib.cmakeBool "IMGUI_BUILD_OSX_BINDING" IMGUI_BUILD_OSX_BINDING) + (lib.cmakeBool "IMGUI_BUILD_SDL2_BINDING" IMGUI_BUILD_SDL2_BINDING) + (lib.cmakeBool "IMGUI_BUILD_SDL3_BINDING" IMGUI_BUILD_SDL3_BINDING) + (lib.cmakeBool "IMGUI_BUILD_SDL2_RENDERER_BINDING" IMGUI_BUILD_SDL2_RENDERER_BINDING) + (lib.cmakeBool "IMGUI_BUILD_SDL3_RENDERER_BINDING" IMGUI_BUILD_SDL3_RENDERER_BINDING) + (lib.cmakeBool "IMGUI_BUILD_SDLGPU3_BINDING" IMGUI_BUILD_SDLGPU3_BINDING) + (lib.cmakeBool "IMGUI_BUILD_VULKAN_BINDING" IMGUI_BUILD_VULKAN_BINDING) + (lib.cmakeBool "IMGUI_BUILD_WIN32_BINDING" IMGUI_BUILD_WIN32_BINDING) + (lib.cmakeBool "IMGUI_FREETYPE" IMGUI_FREETYPE) + (lib.cmakeBool "IMGUI_FREETYPE_LUNASVG" IMGUI_FREETYPE_LUNASVG) + (lib.cmakeBool "IMGUI_USE_WCHAR32" IMGUI_USE_WCHAR32) + ]; + + passthru = { + tests = { + demo = callPackage ./demo { }; + }; + }; + + meta = { + # These flags haven't been tested: + broken = + IMGUI_BUILD_SDL2_BINDING # Option removed from Vcpkg' CMakeLists + || IMGUI_BUILD_SDL2_RENDERER_BINDING + || IMGUI_FREETYPE + || IMGUI_FREETYPE_LUNASVG + || IMGUI_BUILD_DX9_BINDING + || IMGUI_BUILD_DX10_BINDING + || IMGUI_BUILD_DX11_BINDING + || IMGUI_BUILD_DX12_BINDING + || IMGUI_BUILD_WIN32_BINDING + || IMGUI_BUILD_ALLEGRO5_BINDING + || IMGUI_BUILD_ANDROID_BINDING; + description = "Bloat-free Graphical User interface for C++ with minimal dependencies"; + homepage = "https://github.com/ocornut/imgui"; + license = lib.licenses.mit; # vcpkg licensed as MIT too + maintainers = with lib.maintainers; [ + SomeoneSerge + ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/im/imlib2/package.nix b/pkgs/by-name/im/imlib2/package.nix index ddffcf4d52db..752b3dfb8882 100644 --- a/pkgs/by-name/im/imlib2/package.nix +++ b/pkgs/by-name/im/imlib2/package.nix @@ -43,11 +43,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; - version = "1.12.3"; + version = "1.12.5"; src = fetchurl { url = "mirror://sourceforge/enlightenment/imlib2-${finalAttrs.version}.tar.xz"; - hash = "sha256-liRGVldqPgpvWLeOUU3ckZYirGgGcRvCMYN+7mLB3jQ="; + hash = "sha256-+iMV8oN5tDCm5mBbQoSwe+BqPvQi1PXhybskcUxM9t0="; }; buildInputs = diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix index c5489541fc69..9e58949dde7f 100644 --- a/pkgs/by-name/im/immich-go/package.nix +++ b/pkgs/by-name/im/immich-go/package.nix @@ -9,13 +9,13 @@ }: buildGoModule rec { pname = "immich-go"; - version = "0.25.0"; + version = "0.26.2"; src = fetchFromGitHub { owner = "simulot"; repo = "immich-go"; tag = "v${version}"; - hash = "sha256-C7QfuCJNraOan6N67k7k30hKwJUDzRCNvWpJM3N328s="; + hash = "sha256-mC7C5B2e57xWrqbyaLM2n79BgdmlgiF2TxTmxT/McSA="; # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # The intention here is to write the information into files in the `src`'s @@ -32,7 +32,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-J8vqii0X6GGmOCJ6L9lILz9NQEPa7Idg/ULrdRqBS9U="; + vendorHash = "sha256-z9gS8i9GatDq4flomPcBUpf7b/6BJZ42lGOmpfpdmao="; # options used by upstream: # https://github.com/simulot/immich-go/blob/v0.25.0/.goreleaser.yaml @@ -48,6 +48,8 @@ buildGoModule rec { ldflags+=" -X github.com/simulot/immich-go/Date=$(cat SOURCE_DATE)" ''; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix index dec310e10472..2d5bcf6217f3 100644 --- a/pkgs/by-name/im/immich-public-proxy/package.nix +++ b/pkgs/by-name/im/immich-public-proxy/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "immich-public-proxy"; - version = "1.9.1"; + version = "1.11.1"; src = fetchFromGitHub { owner = "alangrainger"; repo = "immich-public-proxy"; tag = "v${version}"; - hash = "sha256-3BXuT2tpK/kU7JkOJUuPjgHl1n+7jE12CEzuwB2wSvA="; + hash = "sha256-tuF2ienJPQgPSugJQMZsqgPEB+b/zW013Hx9OUTvV6E="; }; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-KN8RuS6yQLG+PWVKfVFii38+xM0aUGvIV38RGYPAIUk="; + npmDepsHash = "sha256-fl2oboifADrWIOKfdKtckuG4jiOSGT8oMRRXeXpJ8E0="; # patch in absolute nix store paths so the process doesn't need to cwd in $out postPatch = '' diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 41184f4fb8d1..b393a1cf95dd 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -31,6 +31,7 @@ perl, pixman, vips, + buildPackages, sourcesJSON ? ./sources.json, }: let @@ -38,6 +39,62 @@ let sources = lib.importJSON sourcesJSON; inherit (sources) version; + esbuild_0_23 = buildPackages.esbuild.override { + buildGoModule = + args: + buildPackages.buildGoModule ( + args + // rec { + version = "0.23.0"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + tag = "v${version}"; + hash = "sha256-AH4Y5ELPicAdJZY5CBf2byOxTzOyQFRh4XoqRUQiAQw="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + }; + + esbuild_0_25 = buildPackages.esbuild.override { + buildGoModule = + args: + buildPackages.buildGoModule ( + args + // rec { + version = "0.25.2"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + tag = "v${version}"; + hash = "sha256-aDxheDMeQYqCT9XO3In6RbmzmXVchn+bjgf3nL3VE4I="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + }; + + # Immich server does not actually need esbuild, but react-email and vite do. + # As esbuild doesn't support passing multiple binaries, we use a custom + # "shim", that picks the right version depending on the working directory. + # The correct version can be looked up in package-lock.json + # TODO: There are numerous other env vars this *could* be based on. + esbuildShim = buildPackages.writeShellScriptBin "esbuild" '' + echo "nixpkgs: esbuild shim for '$PWD'" >&2 + case "$PWD" in + "/build/server/node_modules/esbuild") + exec ${lib.getExe esbuild_0_23} "$@" + ;; + "/build/server/node_modules/vite/node_modules/esbuild") + exec ${lib.getExe esbuild_0_25} "$@" + exit 0 + ;; + esac + echo "nixpkgs: Couldn't resolve esbuild version for '$PWD'" >&2 + exit 1 + ''; + buildLock = { sources = builtins.map @@ -206,6 +263,7 @@ buildNpmPackage' { makeCacheWritable = true; env.SHARP_FORCE_GLOBAL_LIBVIPS = 1; + env.ESBUILD_BINARY_PATH = lib.getExe esbuildShim; preBuild = '' # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index c93d6b0b35d5..09cec8c283cb 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.131.3", - "hash": "sha256-ZSi9DfyGzkEOiCVEdLu16xzjbmwuMIodD9zMwW72Ppo=", + "version": "1.132.3", + "hash": "sha256-QwQSqWSQ82R5LrbyerAZflDRM2DS+rpA8E6uzxQbs48=", "components": { "cli": { - "npmDepsHash": "sha256-FNIrVdEvibIWq7yeHU76PNoolwJPPuCtcL3X6OeZ67U=", - "version": "2.2.61" + "npmDepsHash": "sha256-7CWJEEr/6+Duc90Qww6rhVLXEtxz3hymLcQIzv3YPg0=", + "version": "2.2.65" }, "server": { - "npmDepsHash": "sha256-3557g6XH/FLXwZQ27IxgM55bzKrF+TLUBLI26PNjKec=", - "version": "1.131.3" + "npmDepsHash": "sha256-CdE8H8+uAlthHhko5Ir+BETqkZoNzpimgHB2gVJbus8=", + "version": "1.132.3" }, "web": { - "npmDepsHash": "sha256-DIsWAfkEhIYnomC1AFpl2vLFxREhe0ofWs6ntFk9qXA=", - "version": "1.131.3" + "npmDepsHash": "sha256-3UoNfa2P4bVFQSQTSbRacSxh2UbPokDHqveCHt9bnko=", + "version": "1.132.3" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-q0cg1yCZVM6DmvGYrI5fyGcA1fOyDhYZYvBsIPV05A8=", - "version": "1.131.3" + "npmDepsHash": "sha256-Rfds2/c8Q6KfWzyztxLcKS40JKOMh04JzMICsDvqMgs=", + "version": "1.132.3" }, "geonames": { - "timestamp": "20250331194635", - "hash": "sha256-1YAHhoIH0xJvs9qYNekQF02NQROKlDZTa5bAQlUdE3s=" + "timestamp": "20250428153140", + "hash": "sha256-RDetKDf/qFRwlB+Jo5ivD6yp1paMWFJeUf1Vft70Kdw=" } } } diff --git a/pkgs/by-name/im/immudb/package.nix b/pkgs/by-name/im/immudb/package.nix index 76224b1f1758..7bf5429977ef 100644 --- a/pkgs/by-name/im/immudb/package.nix +++ b/pkgs/by-name/im/immudb/package.nix @@ -15,13 +15,13 @@ let in buildGoModule rec { pname = "immudb"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "codenotary"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XKioPk0Rv+I916OLInJEtOaDV9KcBMWSHmPOq2k3LTQ="; + sha256 = "sha256-sQLxHHaKdqocjJVXuuuQqx+BNubl6bjVcp50r4kPQEs="; }; postPatch = '' diff --git a/pkgs/by-name/im/implot/demos/default.nix b/pkgs/by-name/im/implot/demos/default.nix index 00bd02f69ed4..45d5d54ac83a 100644 --- a/pkgs/by-name/im/implot/demos/default.nix +++ b/pkgs/by-name/im/implot/demos/default.nix @@ -5,7 +5,6 @@ fetchpatch, cmake, pkg-config, - darwin, fmt, gtk3, iir1, @@ -54,18 +53,15 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = - [ - curl - fmt - iir1 - imgui - imnodes - implot - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = [ + curl + fmt + iir1 + imgui + imnodes + implot + openssl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]; meta = { description = "Standalone ImPlot Demos"; diff --git a/pkgs/by-name/im/imposm/package.nix b/pkgs/by-name/im/imposm/package.nix index b10bc79f450e..c09ae89cadd5 100644 --- a/pkgs/by-name/im/imposm/package.nix +++ b/pkgs/by-name/im/imposm/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "imposm"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "omniscale"; repo = "imposm3"; tag = "v${version}"; - hash = "sha256-PF7pi2UTZJe7WzfaJrQrOGusO/RRfh8KNz8YyrVcBvg="; + hash = "sha256-Bl6LSF/aN/c0lH93fxm2HGvxs7Grv4qJc/iN04AlQP0="; }; vendorHash = null; diff --git a/pkgs/by-name/im/impression/package.nix b/pkgs/by-name/im/impression/package.nix index 0b38cd3d0f75..9d234d8b66d0 100644 --- a/pkgs/by-name/im/impression/package.nix +++ b/pkgs/by-name/im/impression/package.nix @@ -24,18 +24,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "impression"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitLab { owner = "adhami3310"; repo = "Impression"; - rev = "v${finalAttrs.version}"; - hash = "sha256-F2ZyATDKnUgEOAI++54fR6coJOr9rtyGm5TzsKzkDmg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-YNRj44bgZfJYMBPI3q9OnWFaG6x1xez8LZM1sIti5mQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-mQyGQXEFmMkTvkZcniws/11u1RqnsxgNi9dvYn1Mx0o="; + hash = "sha256-uK5kPPBBa5hI4RHj1RRohur0jzkjwePafY6E9U9vEFk="; }; nativeBuildInputs = [ @@ -70,7 +70,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/adhami3310/Impression"; license = lib.licenses.gpl3Only; mainProgram = "impression"; - maintainers = with lib.maintainers; [ dotlambda ] ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ dotlambda ]; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix index f437ea4b8782..7c0fb436f311 100644 --- a/pkgs/by-name/im/imsprog/package.nix +++ b/pkgs/by-name/im/imsprog/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "imsprog"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "bigbigmdm"; repo = "IMSProg"; tag = "v${finalAttrs.version}"; - hash = "sha256-G2hD9h9hcuUO35z/k46+24KTgqGiufa3dwa4LQVA1yY="; + hash = "sha256-vT2SAhHfgs4HR0V0Tu0MLCL9nizf9u4z/H70PJKhA9k="; }; strictDeps = true; diff --git a/pkgs/by-name/im/imtui/package.nix b/pkgs/by-name/im/imtui/package.nix index 719868d340cd..a587f8bce7ab 100644 --- a/pkgs/by-name/im/imtui/package.nix +++ b/pkgs/by-name/im/imtui/package.nix @@ -12,7 +12,6 @@ withNcurses ? (!withEmscripten), ncurses, static ? withEmscripten, - darwin, }: stdenv.mkDerivation rec { @@ -34,8 +33,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional withEmscripten emscripten ++ lib.optional withCurl curl - ++ lib.optional withNcurses ncurses - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ lib.optional withNcurses ncurses; postPatch = '' @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { homepage = "https://imtui.ggerganov.com"; changelog = "https://github.com/ggerganov/imtui/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix index 6a8b74ca1ab6..97cb1ce333e8 100644 --- a/pkgs/by-name/in/incus-ui-canonical/package.nix +++ b/pkgs/by-name/in/incus-ui-canonical/package.nix @@ -20,14 +20,14 @@ let in stdenv.mkDerivation rec { pname = "incus-ui-canonical"; - version = "0.15.1"; + version = "0.15.3"; src = fetchFromGitHub { owner = "zabbly"; repo = "incus-ui-canonical"; # only use tags prefixed by incus- they are the tested fork versions tag = "incus-${version}"; - hash = "sha256-oXdkMalzAAcHEwca6h83cHH4buC/gGu5F3S82RM+IX4="; + hash = "sha256-FsDdALcIXJFo0ScOA8YEzulefp8IfOSi2ZClrtcPo24="; }; offlineCache = fetchYarnDeps { @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { description = "Web user interface for Incus"; homepage = "https://github.com/zabbly/incus-ui-canonical"; license = lib.licenses.gpl3; - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/in/incus/1995.diff b/pkgs/by-name/in/incus/1995.diff new file mode 100644 index 000000000000..092bd149d856 --- /dev/null +++ b/pkgs/by-name/in/incus/1995.diff @@ -0,0 +1,93 @@ +diff --git a/internal/server/firewall/drivers/drivers_consts.go b/internal/server/firewall/drivers/drivers_consts.go +index 2790e07a605..944bca5930e 100644 +--- a/internal/server/firewall/drivers/drivers_consts.go ++++ b/internal/server/firewall/drivers/drivers_consts.go +@@ -1,8 +1,6 @@ + package drivers + + import ( +- "encoding/json" +- "fmt" + "net" + ) + +@@ -67,62 +65,12 @@ type NftListSetsOutput struct { + + // NftListSetsEntry structure to read JSON output of nft set listing. + type NftListSetsEntry struct { +- Metainfo *NftMetainfo `json:"metainfo,omitempty"` +- Set *NftSet `json:"set,omitempty"` +-} +- +-// NftMetainfo structure representing metainformation returned by nft. +-type NftMetainfo struct { +- Version string `json:"version"` +- ReleaseName string `json:"release_name"` +- JSONSchemaVersion int `json:"json_schema_version"` ++ Set *NftSet `json:"set,omitempty"` + } + + // NftSet structure to parse the JSON of a set returned by nft -j list sets. + type NftSet struct { +- Family string `json:"family"` +- Name string `json:"name"` +- Table string `json:"table"` +- Type string `json:"type"` +- Handle int `json:"handle"` +- Flags []string `json:"flags"` +- Elem ElemField `json:"elem"` +-} +- +-// ElemField supports both string elements (IP, MAC) and dictionary-based CIDR elements. +-// In order to parse it correctly a custom unsmarshalling is defined in drivers_nftables.go . +-type ElemField struct { +- Addresses []string // Stores plain addresses and CIDR notations as strings. +-} +- +-// UnmarshalJSON handles both plain strings and CIDR dictionaries inside `elem`. +-func (e *ElemField) UnmarshalJSON(data []byte) error { +- var rawElems []any +- err := json.Unmarshal(data, &rawElems) +- if err != nil { +- return err +- } +- +- for _, elem := range rawElems { +- switch v := elem.(type) { +- case string: +- // Plain address (IPv4, IPv6, or MAC). +- e.Addresses = append(e.Addresses, v) +- case map[string]any: +- // CIDR notation (prefix dictionary). +- prefix, ok := v["prefix"].(map[string]any) +- if ok { +- addr, addrOk := prefix["addr"].(string) +- lenFloat, lenOk := prefix["len"].(float64) // JSON numbers are float64 by default. +- if addrOk && lenOk { +- e.Addresses = append(e.Addresses, fmt.Sprintf("%s/%d", addr, int(lenFloat))) +- } +- } +- +- default: +- return fmt.Errorf("Unsupported element type in NFTables set: %v", elem) +- } +- } +- +- return nil ++ Family string `json:"family"` ++ Name string `json:"name"` ++ Table string `json:"table"` + } +diff --git a/internal/server/firewall/drivers/drivers_nftables.go b/internal/server/firewall/drivers/drivers_nftables.go +index fd9be2e2fbb..f803de9dff5 100644 +--- a/internal/server/firewall/drivers/drivers_nftables.go ++++ b/internal/server/firewall/drivers/drivers_nftables.go +@@ -387,7 +387,7 @@ func (d Nftables) NetworkClear(networkName string, _ bool, _ []uint) error { + return fmt.Errorf("Failed clearing nftables rules for network %q: %w", networkName, err) + } + +- err = d.RemoveIncusAddressSets("inet") ++ err = d.RemoveIncusAddressSets("bridge") + if err != nil { + return fmt.Errorf("Error in deletion of address sets: %w", err) + } diff --git a/pkgs/by-name/in/incus/docs.patch b/pkgs/by-name/in/incus/docs.patch new file mode 100644 index 000000000000..6857df48e230 --- /dev/null +++ b/pkgs/by-name/in/incus/docs.patch @@ -0,0 +1,26 @@ +diff --git i/doc/conf.py w/doc/conf.py +index 8d042818b..b4f0572bd 100644 +--- i/doc/conf.py ++++ w/doc/conf.py +@@ -8,10 +8,6 @@ import yaml + from git import Repo + import filecmp + +-# Download and link swagger-ui files +-if not os.path.isdir('.sphinx/deps/swagger-ui'): +- Repo.clone_from('https://github.com/swagger-api/swagger-ui', '.sphinx/deps/swagger-ui', depth=1) +- + os.makedirs('.sphinx/_static/swagger-ui/', exist_ok=True) + + if not os.path.islink('.sphinx/_static/swagger-ui/swagger-ui-bundle.js'): +@@ -151,10 +147,6 @@ if os.path.exists("./related_topics.yaml"): + with open("./related_topics.yaml", "r") as fd: + myst_substitutions.update(yaml.safe_load(fd.read())) + +-intersphinx_mapping = { +- 'cloud-init': ('https://cloudinit.readthedocs.io/en/latest/', None) +-} +- + if ("LOCAL_SPHINX_BUILD" in os.environ) and (os.environ["LOCAL_SPHINX_BUILD"] == "True"): + swagger_url_scheme = "/api/#{{path}}" + else: diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix index be969c84e4a6..eaf1a746cc2d 100644 --- a/pkgs/by-name/in/incus/generic.nix +++ b/pkgs/by-name/in/incus/generic.nix @@ -13,6 +13,7 @@ buildGoModule, fetchFromGitHub, acl, + buildPackages, cowsql, incus-ui-canonical, libcap, @@ -27,11 +28,30 @@ let pname = "incus${lib.optionalString lts "-lts"}"; + docsPython = buildPackages.python3.withPackages ( + py: with py; [ + furo + gitpython + linkify-it-py + canonical-sphinx-extensions + myst-parser + pyspelling + sphinx + sphinx-autobuild + sphinx-copybutton + sphinx-design + sphinx-notfound-page + sphinx-remove-toctrees + sphinx-reredirects + sphinx-tabs + sphinxcontrib-jquery + sphinxext-opengraph + ] + ); in -buildGoModule rec { +buildGoModule (finalAttrs: { inherit - patches pname vendorHash version @@ -40,15 +60,18 @@ buildGoModule rec { outputs = [ "out" "agent_loader" + "doc" ]; src = fetchFromGitHub { owner = "lxc"; repo = "incus"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; inherit hash; }; + patches = [ ./docs.patch ] ++ patches; + excludedPackages = [ # statically compile these "cmd/incus-agent" @@ -61,6 +84,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles pkg-config + docsPython ]; buildInputs = [ @@ -82,6 +106,13 @@ buildGoModule rec { CGO_LDFLAGS_ALLOW = "(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"; postBuild = '' + # build docs + mkdir -p .sphinx/deps + ln -s ${buildPackages.python3.pkgs.swagger-ui-bundle.src} .sphinx/deps/swagger-ui + substituteInPlace Makefile --replace-fail '. $(SPHINXENV) ; ' "" + make doc-incremental + + # build some static executables make incus-agent incus-migrate ''; @@ -111,18 +142,20 @@ buildGoModule rec { cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.service $agent_loader/etc/systemd/system/ cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.rules $agent_loader/lib/udev/rules.d/99-incus-agent.rules substituteInPlace $agent_loader/etc/systemd/system/incus-agent.service --replace-fail 'TARGET/systemd' "$agent_loader/bin" + + mkdir $doc + cp -R doc/html $doc/ ''; passthru = { client = callPackage ./client.nix { inherit lts - meta patches - src vendorHash version ; + inherit (finalAttrs) meta src; }; tests = if lts then nixosTests.incus-lts.all else nixosTests.incus.all; @@ -139,8 +172,8 @@ buildGoModule rec { homepage = "https://linuxcontainers.org/incus"; changelog = "https://github.com/lxc/incus/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; platforms = lib.platforms.linux; mainProgram = "incus"; }; -} +}) diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index a6cbeffb08d4..f7e89ba71bf3 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -1,7 +1,7 @@ import ./generic.nix { - hash = "sha256-+W4imWem5iQ6nPVcoObc4COFxQVED0ppVd/YC+Nqtgw="; - version = "6.0.3"; - vendorHash = "sha256-ZUtWzbAjHij95khYx8lWYEpA8ITlMtKpObG5Vl7aE90="; + hash = "sha256-zwefzCmj4K1GJRbherOS28swLoGbHnUxbF9bmLOh738="; + version = "6.0.4"; + vendorHash = "sha256-4of741V2ztxkyI2r5UVEL5ON/9kaDTygosLxyTw6ShQ="; patches = [ # qemu 9.1 compat, remove when added to LTS ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index c963f378a0e7..68044192d84f 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,8 +1,11 @@ import ./generic.nix { - hash = "sha256-S6PTtgP4MFV+kiEgV8PBvek1SrVjLaCR9OJy/6jqJGE="; - version = "6.11.0"; - vendorHash = "sha256-wKL+woCMjGJwCBG/JBhFbY4uc97/5K7OWPZRp0J+5DQ="; - patches = [ ]; + hash = "sha256-hgZc30SRnmALTvuD32dNuO0r4pfpXXvN4CtJqn2fGuk="; + version = "6.12.0"; + vendorHash = "sha256-/GwJG6kmjbiUUh0AWQ+IUbeK1kRcuWrwmNdTzH5LT38="; + patches = [ + # fix nft, remove 6.13 + ./1995.diff + ]; nixUpdateExtraArgs = [ "--override-filename=pkgs/by-name/in/incus/package.nix" ]; diff --git a/pkgs/by-name/in/industrializer/package.nix b/pkgs/by-name/in/industrializer/package.nix index a17f3c448964..ec16b8b80101 100644 --- a/pkgs/by-name/in/industrializer/package.nix +++ b/pkgs/by-name/in/industrializer/package.nix @@ -6,27 +6,34 @@ audiofile, autoconf, automake, + gettext, gnome2, gtk2, libGL, libjack2, + libpulseaudio, libtool, libxml2, pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "industrializer"; version = "0.2.7"; + src = fetchurl { - url = "mirror://sourceforge/project/${pname}/ps${pname}-${version}.tar.xz"; - sha256 = "0k688k2wppam351by7cp9m7an09yligzd89padr8viqy63gkdk6v"; + url = "mirror://sourceforge/project/industrializer/psindustrializer-${finalAttrs.version}.tar.xz"; + hash = "sha256-28w23zAex41yUzeh9l+kPgGrTk2XHb9CGVXdy8VEyEw="; }; nativeBuildInputs = [ pkg-config autoconf automake + gettext # autopoint + libxml2 # AM_PATH_XML2 + alsa-lib # AM_PATH_ALSA + libtool ]; buildInputs = [ @@ -36,12 +43,17 @@ stdenv.mkDerivation rec { gtk2 libGL libjack2 - libtool libxml2 + libpulseaudio ]; + strictDeps = true; + preConfigure = "./autogen.sh"; + # jack.c:190:5: error: initialization of 'const gchar * (*)(int)' {aka 'const char * (*)(int)'} from incompatible pointer type 'const char * (*)(int * (*)()) + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + meta = { description = "This program generates synthesized percussion sounds using physical modelling"; longDescription = '' @@ -54,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "psindustrializer"; }; -} +}) diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix index ddd96ffb3042..8908c5b906b9 100644 --- a/pkgs/by-name/in/inetutils/package.nix +++ b/pkgs/by-name/in/inetutils/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "inetutils"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-h2l9YKMeELXLhqnwZR4ex77pgyDQSMBzlDGqw9V2T7Y="; + hash = "sha256-aL7b/q9z99hr4qfZm8+9QJPYKfUncIk5Ga4XTAsjV8o="; }; outputs = [ diff --git a/pkgs/by-name/in/influxdb-cxx/package.nix b/pkgs/by-name/in/influxdb-cxx/package.nix index 6f4fff2d55fc..3a209c90a909 100644 --- a/pkgs/by-name/in/influxdb-cxx/package.nix +++ b/pkgs/by-name/in/influxdb-cxx/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, boost, catch2_3, @@ -12,22 +11,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "influxdb-cxx"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "offa"; repo = "influxdb-cxx"; tag = "v${finalAttrs.version}"; - hash = "sha256-UlCmaw2mWAL5PuNXXGQa602Qxlf5BCr7ZIiShffG74o="; + hash = "sha256-i7YnFjAuhtMGZ26rEObbm+kPmtwzBB0fyMlJLyR+LLI="; }; - patches = [ - (fetchpatch { - url = "https://github.com/offa/influxdb-cxx/commit/c4b0d5a4df153232be542fbb073e857ff69ec78c.patch"; - hash = "sha256-zPE7giDjWyQbGJxdZh2CEbAjouHUcAbQEzaOfCUSkfU="; - }) - ]; - postPatch = '' substituteInPlace CMakeLists.txt --replace-warn "-Werror" "" ''; diff --git a/pkgs/by-name/in/influxdb3/package.nix b/pkgs/by-name/in/influxdb3/package.nix index 4a75148dcb68..a3d5f9f7eabc 100644 --- a/pkgs/by-name/in/influxdb3/package.nix +++ b/pkgs/by-name/in/influxdb3/package.nix @@ -11,7 +11,7 @@ }: rustPlatform.buildRustPackage { pname = "influxdb3"; - version = "0-unstable-2025-02-17"; + version = "3.0.1"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb"; @@ -68,8 +68,10 @@ rustPlatform.buildRustPackage { doCheck = false; passthru.updateScript = nix-update-script { - # Switch to "--version-regex" "v(3.*)" once the first real release tag is added - extraArgs = [ "--version=branch" ]; + extraArgs = [ + "--version-regex" + "v(3.*)" + ]; }; meta = { diff --git a/pkgs/by-name/in/inform6/package.nix b/pkgs/by-name/in/inform6/package.nix new file mode 100644 index 000000000000..24e69caa231f --- /dev/null +++ b/pkgs/by-name/in/inform6/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchurl, + perl, +}: + +stdenv.mkDerivation rec { + pname = "inform6"; + version = "6.42-r8"; + + src = fetchurl { + url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; + sha256 = "sha256-Co3XNcr0LDGeEYTxIFmqTsaKm4q5VpLpVsTNnJHUX8o="; + }; + + buildInputs = [ perl ]; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "Interactive fiction compiler and libraries"; + longDescription = '' + Inform 6 is a C-like programming language for writing interactive fiction + (text adventure) games. + ''; + homepage = "https://gitlab.com/DavidGriffith/inform6unix"; + changelog = "https://gitlab.com/DavidGriffith/inform6unix/-/raw/${version}/NEWS"; + license = licenses.artistic2; + maintainers = with lib.maintainers; [ ddelabru ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index 426a1a79e0e4..ea6c65581cf2 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "infrastructure-agent"; - version = "1.63.0"; + version = "1.63.1"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = version; - hash = "sha256-odB40XRZyFuHX82RzxIvW3SAwglOyYRiApWUfRhOEmk="; + hash = "sha256-FDTZ+3rZPHCwAdC7MUR0j0i9IKBhD7Asi+j5c2zCQdk="; }; vendorHash = "sha256-Oxhraf5xsnowNWZznB6JE+nCnGc3D5dOi/EWIvyv81M="; diff --git a/pkgs/by-name/in/inherd-quake/package.nix b/pkgs/by-name/in/inherd-quake/package.nix new file mode 100644 index 000000000000..a9b41c42c5c3 --- /dev/null +++ b/pkgs/by-name/in/inherd-quake/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "inherd-quake"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "phodal"; + repo = "quake"; + rev = "v${version}"; + sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-klxigm3RpTfwbENva2WmOPaiJEV2yujY323xRkAML0I="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + ]; + + meta = with lib; { + description = "Knowledge management meta-framework for geeks"; + homepage = "https://github.com/phodal/quake"; + license = licenses.mit; + maintainers = [ maintainers.elliot ]; + mainProgram = "quake"; + }; +} diff --git a/pkgs/by-name/in/iniparser/package.nix b/pkgs/by-name/in/iniparser/package.nix index 4c122834e182..0477d9ac5cf0 100644 --- a/pkgs/by-name/in/iniparser/package.nix +++ b/pkgs/by-name/in/iniparser/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "iniparser"; - version = "4.2.5"; + version = "4.2.6"; src = fetchFromGitLab { owner = "iniparser"; repo = "iniparser"; rev = "v${finalAttrs.version}"; - hash = "sha256-YyIuvkM58WilqggzFcG7BNWSG5t2vHMOUu78PKvdItQ="; + hash = "sha256-z10S9ODLprd7CbL5Ecgh7H4eOwTetYwFXiWBUm6fIr4="; }; patches = lib.optionals finalAttrs.finalPackage.doCheck [ diff --git a/pkgs/by-name/in/inkcut/package.nix b/pkgs/by-name/in/inkcut/package.nix new file mode 100644 index 000000000000..9fcc2c5dc567 --- /dev/null +++ b/pkgs/by-name/in/inkcut/package.nix @@ -0,0 +1,79 @@ +{ + lib, + fetchpatch, + python3, + fetchFromGitHub, + qt5, + cups, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "inkcut"; + version = "2.1.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + tag = "v${version}"; + hash = "sha256-qfgzJTFr4VTV/x4PVnUKJzIndfjXB8z2jTWLXvadBuY="; + }; + + postPatch = '' + substituteInPlace inkcut/device/transports/printer/plugin.py \ + --replace ", 'lpr', " ", '${cups}/bin/lpr', " + ''; + + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + propagatedBuildInputs = with python3.pkgs; [ + enamlx + twisted + lxml + qreactor + jsonpickle + pyserial + pycups + qtconsole + pyqt5 + setuptools + ]; + + # QtApplication.instance() does not work during tests? + doCheck = false; + + pythonImportsCheck = [ + "inkcut" + "inkcut.cli" + "inkcut.console" + "inkcut.core" + "inkcut.device" + "inkcut.job" + "inkcut.joystick" + "inkcut.monitor" + "inkcut.preview" + ]; + + dontWrapQtApps = true; + makeWrapperArgs = [ + "--unset" + "PYTHONPATH" + "\${qtWrapperArgs[@]}" + ]; + + postInstall = '' + mkdir -p $out/share/inkscape/extensions + + cp plugins/inkscape/* $out/share/inkscape/extensions + + sed -i "s|cmd = \['inkcut'\]|cmd = \['$out/bin/inkcut'\]|" $out/share/inkscape/extensions/inkcut_cut.py + sed -i "s|cmd = \['inkcut'\]|cmd = \['$out/bin/inkcut'\]|" $out/share/inkscape/extensions/inkcut_open.py + ''; + + meta = with lib; { + homepage = "https://www.codelv.com/projects/inkcut/"; + description = "Control 2D plotters, cutters, engravers, and CNC machines"; + mainProgram = "inkcut"; + license = licenses.gpl3; + maintainers = with maintainers; [ raboof ]; + }; +} diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix index f843be0e7bdd..9e6110919dd9 100644 --- a/pkgs/by-name/in/inko/package.nix +++ b/pkgs/by-name/in/inko/package.nix @@ -67,7 +67,8 @@ rustPlatform.buildRustPackage rec { description = "Language for building concurrent software with confidence"; homepage = "https://inko-lang.org/"; license = lib.licenses.mpl20; - maintainers = [ lib.maintainers.feathecutie ] ++ lib.teams.ngi.members; + maintainers = [ lib.maintainers.feathecutie ]; + teams = [ lib.teams.ngi ]; platforms = lib.platforms.unix; mainProgram = "inko"; }; diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix new file mode 100644 index 000000000000..98dbc260bc31 --- /dev/null +++ b/pkgs/by-name/in/inlyne/package.nix @@ -0,0 +1,80 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + stdenv, + pkg-config, + fontconfig, + xorg, + libxkbcommon, + wayland, + libGL, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "inlyne"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Inlyne-Project"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ueE1NKbCMBUBrrdsHkwZ5Yv6LD3tQL3ZAk2O4xoYOcw="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-jSUqpryUgOL0qo0gbbH4s24krrPsLOSNc6FQUEUeeUQ="; + + nativeBuildInputs = + [ + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + fontconfig + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb + wayland + libxkbcommon + openssl + ]; + + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # time out on darwin + "--skip=interpreter::tests::centered_image_with_size_align_and_link" + "--skip=watcher::tests::the_gauntlet" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd inlyne \ + --bash completions/inlyne.bash \ + --fish completions/inlyne.fish \ + --zsh completions/_inlyne + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + patchelf $out/bin/inlyne \ + --add-rpath ${ + lib.makeLibraryPath [ + libGL + xorg.libX11 + ] + } + ''; + + meta = with lib; { + description = "GPU powered browserless markdown viewer"; + homepage = "https://github.com/Inlyne-Project/inlyne"; + changelog = "https://github.com/Inlyne-Project/inlyne/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "inlyne"; + }; +} diff --git a/pkgs/by-name/in/innernet/package.nix b/pkgs/by-name/in/innernet/package.nix new file mode 100644 index 000000000000..52108501c237 --- /dev/null +++ b/pkgs/by-name/in/innernet/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + sqlite, + installShellFiles, + libiconv, + innernet, + testers, +}: + +rustPlatform.buildRustPackage rec { + pname = "innernet"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "tonarino"; + repo = "innernet"; + tag = "v${version}"; + hash = "sha256-dFMAzLvPO5xAfJqUXdiLf13uh5H5ay+CI9aop7Fhprk="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-gTFvxmnh+d1pNqG0sEHFpl0m9KKCQ78sai//iiJ0aGs="; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + installShellFiles + ]; + + buildInputs = + [ + sqlite + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + postInstall = + '' + installManPage doc/innernet-server.8.gz + installManPage doc/innernet.8.gz + installShellCompletion doc/innernet.completions.{bash,fish,zsh} + installShellCompletion doc/innernet-server.completions.{bash,fish,zsh} + '' + + (lib.optionalString stdenv.hostPlatform.isLinux '' + find . -regex '.*\.\(target\|service\)' | xargs install -Dt $out/lib/systemd/system + find $out/lib/systemd/system -type f | xargs sed -i "s|/usr/bin/innernet|$out/bin/innernet|" + ''); + + passthru.tests = { + serverVersion = testers.testVersion { + package = innernet; + command = "innernet-server --version"; + }; + version = testers.testVersion { + package = innernet; + command = "innernet --version"; + }; + }; + + meta = with lib; { + description = "Private network system that uses WireGuard under the hood"; + homepage = "https://github.com/tonarino/innernet"; + changelog = "https://github.com/tonarino/innernet/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ + tomberek + _0x4A6F + ]; + }; +} diff --git a/pkgs/by-name/in/inori/package.nix b/pkgs/by-name/in/inori/package.nix index 69547bc0f439..27555ee4d410 100644 --- a/pkgs/by-name/in/inori/package.nix +++ b/pkgs/by-name/in/inori/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "inori"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "eshrh"; repo = "inori"; tag = "v${version}"; - hash = "sha256-UKYRqiwqyYh1ZQH4yAm2ALJjxCkczHAURy/Pob4S29g="; + hash = "sha256-w+UsG4CHdug6TITJLjhHsQeAhHenzDFnZLICDT0Z1UM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0ITazN1eGAuuy0QR8GdnU0Z6Nz44R/8kByWyHIr0P60="; + cargoHash = "sha256-AvYNeWyitoi9hDqiy5hl/VM4LO8J2xmLgl0y8P4xYNA="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index 6de63ac9ddba..e770a7b51c5f 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.49.6"; + version = "0.58.0"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-iLr7n+llvvIwS4JJMwZou4pDbT+sYOy6+un+g1YXrP4="; + hash = "sha256-FAnA9M9/SLTdsZReZy9BI6+pFFb6kf79aXsWk92QAIc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-v0aMbaKoPL3wqcFHVcrGUGlvR5m3XhMTXD1k0YBz6OI="; + cargoHash = "sha256-g4YlY/FviPGU/x+Sb29BxbemBwJ82xFByED/LyGKgwU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix index 1d2d2fc87ed8..6fc1890a63a1 100644 --- a/pkgs/by-name/in/inspircd/package.nix +++ b/pkgs/by-name/in/inspircd/package.nix @@ -168,10 +168,14 @@ stdenv.mkDerivation rec { "out" ]; - nativeBuildInputs = [ - perl - pkg-config - ]; + nativeBuildInputs = + [ + perl + pkg-config + ] + ++ lib.optionals (lib.elem "pgsql" extraModules) [ + libpq.pg_config + ]; buildInputs = extraInputs; configurePhase = '' diff --git a/pkgs/by-name/in/insync-nautilus/package.nix b/pkgs/by-name/in/insync-nautilus/package.nix index d0e3b3d934e4..e6d6b5e7cc87 100644 --- a/pkgs/by-name/in/insync-nautilus/package.nix +++ b/pkgs/by-name/in/insync-nautilus/package.nix @@ -1,47 +1,42 @@ { + lib, stdenv, fetchurl, - lib, dpkg, nautilus-python, - insync-emblem-icons, }: stdenv.mkDerivation (finalAttrs: { pname = "insync-nautilus"; - version = lib.getVersion insync-emblem-icons; + version = "3.9.5.60024"; pyproject = true; # Download latest from: https://www.insynchq.com/downloads/linux#nautilus - src = fetchurl rec { urls = [ - "https://cdn.insynchq.com/builds/linux/insync-nautilus_${finalAttrs.version}_all.deb" - "https://web.archive.org/web/20240409080611/${builtins.elemAt urls 0}" + "https://cdn.insynchq.com/builds/linux/${finalAttrs.version}/insync-nautilus_${finalAttrs.version}_all.deb" + "https://web.archive.org/web/20250502162242/${builtins.elemAt urls 0}" ]; - hash = "sha256-aB1/ZzcQH3T1lviMZO8jXbtdbe4TW20f0TAcv4HDOGI="; + hash = "sha256-yfPZ58xWZknpCqE8cJ7e7fR4+nzsCdprgBFRL0U0LvM="; }; nativeBuildInputs = [ dpkg ]; - buildInputs = [ - nautilus-python - insync-emblem-icons - ]; + buildInputs = [ nautilus-python ]; installPhase = '' runHook preInstall - mkdir -p $out - cp -R usr/share $out/ - cp -rs "${insync-emblem-icons}"/share/icons $out/share/icons + + cp -r usr $out + runHook postInstall ''; - meta = with lib; { + meta = { platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ fromSource ]; - license = licenses.unfree; - maintainers = with maintainers; [ hellwolf ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ hellwolf ]; homepage = "https://www.insynchq.com"; description = "This package contains the Python extension and icons for integrating Insync with Nautilus"; }; diff --git a/pkgs/by-name/in/insync/package.nix b/pkgs/by-name/in/insync/package.nix index 2373fef7c28c..07c9f1f745ae 100644 --- a/pkgs/by-name/in/insync/package.nix +++ b/pkgs/by-name/in/insync/package.nix @@ -13,24 +13,25 @@ xkeyboard_config, libthai, libsForQt5, + xz, }: let pname = "insync"; # Find a binary from https://www.insynchq.com/downloads/linux - version = "3.9.4.60020"; - web-archive-id = "20241208213703"; # upload via https://web.archive.org/save/ - ubuntu-dist = "trixie_amd64"; + version = "3.9.6.60027"; + web-archive-id = "20250502161201"; # upload via https://web.archive.org/save/ + debian-dist = "trixie_amd64"; insync-pkg = stdenvNoCC.mkDerivation { pname = "${pname}-pkg"; inherit version; src = fetchurl rec { urls = [ - "https://cdn.insynchq.com/builds/linux/${version}/insync_${version}-${ubuntu-dist}.deb" + "https://cdn.insynchq.com/builds/linux/${version}/insync_${version}-${debian-dist}.deb" "https://web.archive.org/web/${web-archive-id}/${builtins.elemAt urls 0}" ]; - hash = "sha256-QauUzvtWQu8h41+wWIPhEZ3VVzXJwAh2bzj0gDYWnIw="; + hash = "sha256-q1s4hFQTXjS9VmA6XETpsvEEES79b84y8zCZwpy3gKo="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ let lz4 libgcrypt libthai + xz ] ++ (with libsForQt5; [ qt5.qtvirtualkeyboard ]); installPhase = '' @@ -100,11 +102,11 @@ buildFHSEnv { dieWithParent = true; - meta = with lib; { + meta = { platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ hellwolf ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ hellwolf ]; homepage = "https://www.insynchq.com"; description = "Google Drive sync and backup with multiple account support"; longDescription = '' diff --git a/pkgs/by-name/in/intel-cmt-cat/package.nix b/pkgs/by-name/in/intel-cmt-cat/package.nix index 0b356aa6d4c7..57132ef7633a 100644 --- a/pkgs/by-name/in/intel-cmt-cat/package.nix +++ b/pkgs/by-name/in/intel-cmt-cat/package.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "24.05"; + version = "25.04"; pname = "intel-cmt-cat"; src = fetchFromGitHub { owner = "intel"; repo = "intel-cmt-cat"; rev = "v${version}"; - sha256 = "sha256-e4sbQNpUCZaZDhLLRVDXHXsEelZaZIdc8n3ksUnAkKQ="; + sha256 = "sha256-Sbxfa9F+TSv2A8nilrB0PD312v1qN++k8Pezd7wd0PA="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index c5aab60d33bc..16b529f39ecc 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "25.09.32961.7"; + version = "25.13.33276.16"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; tag = version; - hash = "sha256-Rdy6ACGclhBn8bulHdjHuLzaGO2jj04iDGoXeHgl6Hs="; + hash = "sha256-dGOFWmgPOcSQtpfmYTTPLYeHfwba6gp9nJRF999hybw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/intel-gmmlib/package.nix b/pkgs/by-name/in/intel-gmmlib/package.nix index 95fb72c33f73..ab6f950cdfdd 100644 --- a/pkgs/by-name/in/intel-gmmlib/package.nix +++ b/pkgs/by-name/in/intel-gmmlib/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.7.1"; + version = "22.7.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; tag = "intel-gmmlib-${version}"; - hash = "sha256-Wm9bHe65ak7ERSEgrSO9x9hUV6ypRbODoY4eodebOVE="; + hash = "sha256-TVravPYbOaZBtS5BepRc316m4uIPm5M1YbDWMV5lW0Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix index b8e63635ac24..41661f41af7a 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/package.nix +++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix @@ -8,7 +8,7 @@ bison, flex, intel-compute-runtime, - llvmPackages_14, + llvmPackages_15, opencl-clang, python3, spirv-tools, @@ -26,8 +26,8 @@ let hash = "sha256-dSK+kNEZoF4bBx24S0No9aZLZiHK0U9TR1jRyEBL+2U="; }; - inherit (llvmPackages_14) lld llvm; - inherit (if buildWithPatches then opencl-clang else llvmPackages_14) clang libclang; + inherit (llvmPackages_15) lld llvm; + inherit (if buildWithPatches then opencl-clang else llvmPackages_15) clang libclang; spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; # Handholding the braindead build script @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "2.8.3"; + version = "2.10.8"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; tag = "v${version}"; - hash = "sha256-1YzvzVmMW5s4keQfa7r6xfyVg7RWSdKNgBtdTN6SADg="; + hash = "sha256-BFEl2LiaGRZXnQtOTEY/86ymKuQO3QN4HPbwHsdSZMs="; }; postPatch = '' diff --git a/pkgs/by-name/in/intel-media-driver/package.nix b/pkgs/by-name/in/intel-media-driver/package.nix index 41ad93d9135f..dea1d295f683 100644 --- a/pkgs/by-name/in/intel-media-driver/package.nix +++ b/pkgs/by-name/in/intel-media-driver/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "24.4.4"; + version = "25.1.4"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - hash = "sha256-vZIWH/YBrUMmXu/JBBeGPOsn7pZUDaU8O6vgoekGhVU="; + hash = "sha256-kRMBOQpGWVrOvQ2RoYZzoYAfB2r7UqesiaTajjw+SLA="; }; patches = [ diff --git a/pkgs/by-name/in/intelephense/package.nix b/pkgs/by-name/in/intelephense/package.nix index 1425ee0140c1..6e9264f214eb 100644 --- a/pkgs/by-name/in/intelephense/package.nix +++ b/pkgs/by-name/in/intelephense/package.nix @@ -4,7 +4,7 @@ fetchurl, }: let - version = "1.14.1"; + version = "1.14.4"; in buildNpmPackage { pname = "intelephense"; @@ -12,7 +12,7 @@ buildNpmPackage { src = fetchurl { url = "https://registry.npmjs.org/intelephense/-/intelephense-${version}.tgz"; - hash = "sha256-6TT8RYg6l6Vcua0t5Mn+N/t5FehmY9nOxYAgvSFOre8="; + hash = "sha256-vFXwkFPmgEbB2RtB0lxT6UaZMxaWXh+3BHCL9+1rRjk="; }; postPatch = '' diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix index e2fec783cb76..79cf30615328 100644 --- a/pkgs/by-name/in/intelli-shell/package.nix +++ b/pkgs/by-name/in/intelli-shell/package.nix @@ -7,8 +7,6 @@ openssl, sqlite, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,16 +27,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - sqlite - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + sqlite + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix index 04765846eb76..1059839fe172 100644 --- a/pkgs/by-name/in/intentrace/package.nix +++ b/pkgs/by-name/in/intentrace/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.7.4"; + version = "0.9.8"; in rustPlatform.buildRustPackage { inherit version; @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage { owner = "sectordistrict"; repo = "intentrace"; tag = "v${version}"; - hash = "sha256-QmHGi8gSXccakvbFNMCCo/5m9BTgXqlLhh4DZxs30iw="; + hash = "sha256-5QARHw9Z4+wYrxaAuSt9WjGR6qvSWAFIMdNOzE6FqfU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mvchd2LA2PUPDFQ3e0dmpMITmRL+wCxp8kLDo9fG/js="; + cargoHash = "sha256-m4kLpJeqAvDI8/1gjqRVkbOvyfcLfwi0y2iavvm25jw="; meta = { description = "Prettified Linux syscall tracing tool (like strace)"; diff --git a/pkgs/by-name/in/inter-alia/package.nix b/pkgs/by-name/in/inter-alia/package.nix new file mode 100644 index 000000000000..820c1775ecea --- /dev/null +++ b/pkgs/by-name/in/inter-alia/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: + +stdenvNoCC.mkDerivation { + pname = "inter-alia"; + version = "0-unstable-2024-01-12"; + + src = fetchFromGitHub { + owner = "Shavian-info"; + repo = "interalia"; + rev = "5d182c4eb5511fec3879646c8b44c79ba338d53e"; + hash = "sha256-q93cCrbKc72CH/2ybJPDY5wkUZvFyCKoyQe6WhL+kAU="; + }; + + outputs = [ + "out" + "web" + "variable" + "variableweb" + ]; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype instance_otf/*.otf + install -D -m444 -t $out/share/fonts/truetype instance_ttf/*.ttf + install -D -m444 -t $web/share/fonts/webfont instance_woff2/*.woff2 + install -D -m444 -t $variable/share/fonts/opentype variable_otf/*.otf + install -D -m444 -t $variable/share/fonts/truetype variable_ttf/*.ttf + install -D -m444 -t $variableweb/share/fonts/webfont variable_woff2/*.woff2 + + runHook postInstall + ''; + + meta = { + homepage = "https://shavian.info/shavian_fonts/"; + description = "Expansion of Inter typeface to support the Shavian alphabet, old-style figures, & refinements to IPA glyphs"; + longDescription = '' + Inter Alia is an expanded version of Rasmus Andersson's beautiful open source sans serif typeface, Inter. Inter was specially designed for user interfaces with focus on high legibility of small-to-medium sized text on computer screens. + + Inter Alia builds on the features of Inter to add: + + support for the Shavian alphabet with a newly designed set of glyphs, including the letters missing from Unicode (through character variants accessed by inserting 'Variation Selector 1' (U+FE00) after 𐑒, 𐑜, 𐑢, 𐑤, 𐑻, and 𐑺) + support for old-style figures or numerals, also known as text figures, with both proportional and tabular spacing + refinements to International Phonetic Alphabet glyphs and other less common glyphs. + ''; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ toastal ]; + }; +} diff --git a/pkgs/by-name/in/interactive-html-bom/package.nix b/pkgs/by-name/in/interactive-html-bom/package.nix index a4eaac2c705d..527f3ad89002 100644 --- a/pkgs/by-name/in/interactive-html-bom/package.nix +++ b/pkgs/by-name/in/interactive-html-bom/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "interactive-html-bom"; - version = "2.9.0"; + version = "2.10.0"; pyproject = true; src = fetchFromGitHub { owner = "openscopeproject"; repo = "InteractiveHtmlBom"; tag = "v${version}"; - hash = "sha256-jUHEI0dWMFPQlXei3+0m1ruHzpG1hcRnxptNOXzXDqQ="; + hash = "sha256-o7GWdAFFK3zK0fc7aTSwOsd/c4uPg3cJfR0SXbl2RW8="; }; build-system = [ python3Packages.hatchling ]; @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { description = "Interactive HTML BOM generation for KiCad, EasyEDA, Eagle, Fusion360 and Allegro PCB designer"; homepage = "https://github.com/openscopeproject/InteractiveHtmlBom/"; license = lib.licenses.mit; - changelog = "https://github.com/openscopeproject/InteractiveHtmlBom/releases/tag/v${version}"; + changelog = "https://github.com/openscopeproject/InteractiveHtmlBom/releases/tag/${src.tag}"; maintainers = with lib.maintainers; [ wuyoli ]; mainProgram = "generate_interactive_bom"; }; diff --git a/pkgs/by-name/in/inv-sig-helper/package.nix b/pkgs/by-name/in/inv-sig-helper/package.nix index 1cecccd3ce49..69757859c6cb 100644 --- a/pkgs/by-name/in/inv-sig-helper/package.nix +++ b/pkgs/by-name/in/inv-sig-helper/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage { pname = "inv-sig-helper"; - version = "0-unstable-2025-04-03"; + version = "0-unstable-2025-04-23"; src = fetchFromGitHub { owner = "iv-org"; repo = "inv_sig_helper"; - rev = "9073c15822c33ffefa27b55ef2d05fbddfc03273"; - hash = "sha256-HVaux1QzN625f9rS2J1i3es/ZMjvVqKTY6MvBdcgg/o="; + rev = "5d3c7a4574fafe0bc5fbed9e7e33483889832fd4"; + hash = "sha256-WGh62tjKGe9OD19aq+lP9GfYs5PrGqkeT6VvmtNottQ="; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/in/invidious/versions.json b/pkgs/by-name/in/invidious/versions.json index dec7874def98..4b19966974c1 100644 --- a/pkgs/by-name/in/invidious/versions.json +++ b/pkgs/by-name/in/invidious/versions.json @@ -1,11 +1,11 @@ { "invidious": { - "hash": "sha256-OBD1QBzLPWZUz2PrMbwpjaH4bnirTkbm4HlCK4UZUbE=", - "version": "2.20250314.0", - "date": "2025.03.14", - "commit": "e23d0d1" + "hash": "sha256-Mm1Hk7L/aFuVrcS+6ikrW8RQZld31vU5Uwecr0HIseQ=", + "version": "2.20250517.0", + "date": "2025.05.17", + "commit": "f07859e1" }, "videojs": { - "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4" + "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4=" } } diff --git a/pkgs/by-name/in/inxi/package.nix b/pkgs/by-name/in/inxi/package.nix index 72ac2b9aaa72..8010260e3658 100644 --- a/pkgs/by-name/in/inxi/package.nix +++ b/pkgs/by-name/in/inxi/package.nix @@ -62,16 +62,16 @@ let ++ recommendedSystemPrograms ++ recommendedDisplayInformationPrograms; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "inxi"; - version = "3.3.37-1"; + version = "3.3.38-1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "smxi"; repo = "inxi"; - rev = version; - hash = "sha256-LyIKjXdfE2sK81zFpXPneaFyfKqa4tU4GfXtt89TZOg="; + tag = finalAttrs.version; + hash = "sha256-+2NPQUn2A8Xy5ByKYS3MOcad6xXvkqcusWEMr7mkEwA="; }; nativeBuildInputs = [ makeWrapper ]; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { cp inxi.1 $out/share/man/man1/ ''; - meta = with lib; { + meta = { description = "Full featured CLI system information tool"; longDescription = '' inxi is a command line system information script built for console and @@ -97,10 +97,10 @@ stdenv.mkDerivation rec { Processes, RAM usage, and a wide variety of other useful information. ''; homepage = "https://smxi.org/docs/inxi.htm"; - changelog = "https://github.com/smxi/inxi/blob/${version}/inxi.changelog"; - license = licenses.gpl3Plus; - platforms = platforms.unix; + changelog = "https://codeberg.org/smxi/inxi/src/tag/${finalAttrs.version}/inxi.changelog"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; maintainers = [ ]; mainProgram = "inxi"; }; -} +}) diff --git a/pkgs/by-name/io/ioquake3/package.nix b/pkgs/by-name/io/ioquake3/package.nix index 80afd46bc92b..d039a6a5014a 100644 --- a/pkgs/by-name/io/ioquake3/package.nix +++ b/pkgs/by-name/io/ioquake3/package.nix @@ -18,17 +18,18 @@ makeDesktopItem, freetype, mumble, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "ioquake3"; - version = "unstable-2023-08-13"; + version = "0-unstable-2025-05-15"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "ee950eb7b0e41437cc23a9943254c958da8a61ab"; - sha256 = "sha256-NfhInwrtw85i2mnv7EtBrrpNaslaQaVhLNlK0I9aYto="; + rev = "8d2c2b42a55598d99873203194d13161ec2789c6"; + hash = "sha256-OszPRlS5NTvajDZhtGw2wa275O8YodkIgiBz3POouYs="; }; nativeBuildInputs = [ @@ -83,6 +84,8 @@ stdenv.mkDerivation { }) ]; + passthru.updateScript = unstableGitUpdater { }; + meta = { homepage = "https://ioquake3.org/"; description = "Fast-paced 3D first-person shooter, a community effort to continue supporting/developing id's Quake III Arena"; diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix index 05e492db26c2..d237b16d5b30 100644 --- a/pkgs/by-name/io/iosevka-bin/package.nix +++ b/pkgs/by-name/io/iosevka-bin/package.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "33.1.0"; + version = "33.2.2"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix index 455e931e1ea8..86ab7a0f219c 100644 --- a/pkgs/by-name/io/iosevka-bin/variants.nix +++ b/pkgs/by-name/io/iosevka-bin/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "0fqm3dall5yajqinxpqqnqbngr2qj1g9ch6a24b56y1xjd62cran"; - IosevkaAile = "1qv1ipnky1jwkrgwb2zzlcsjyfpswy1h7jjdhybkqqxr0kln6669"; - IosevkaCurly = "0zy9dhwglbbsgwa0s7nhz6lm72v88iv4pqnpdfjq5yn5ngsr9wnx"; - IosevkaCurlySlab = "16vrc3lk5islp0v53cc1jcipxqqq0mgrpx3vx8qqc0jy34vraa2r"; - IosevkaEtoile = "0x4bc20iwdm3ympm32zvskqlmjb23j4k9f1bvmmc78v1s9l07n9h"; - IosevkaSlab = "06njqwhd80ikv7armlyryslkrlwa44nn47m46xw2k6zdws6rilm0"; - IosevkaSS01 = "1ksrvlv1mysy1ld4yxiq1hh7jhhg61p3yhyb8m7cpwpi340vlf7a"; - IosevkaSS02 = "0b0l4wbjqvxyp20wfnky3filvwpv59xxav4sa8ad92rgz5q24lxc"; - IosevkaSS03 = "1prjhxirv2rdaxcwpn8r5c96pjk1rpwf9kz92yidh7szcfn92b9x"; - IosevkaSS04 = "108agp6nq0rddd7hb4r5nf0c3122nibzspin19yhicaxangba1rb"; - IosevkaSS05 = "09phnpjxx3xadyar4cng7bl7i96l4z65z8z7xixkgjhrbfb3gmn4"; - IosevkaSS06 = "137qdcs31qny3fqi4k96pcrhi95r8piv6bmdfv3lcv94v80zz6f0"; - IosevkaSS07 = "1n34hai1knj66q1ab9n9s839qizprmrzda8ww7hnc7l1dz5yv12d"; - IosevkaSS08 = "1rzllgh5s3brh6bipszhcs2hr4bmzq325h72s7agj2dq451a3i8a"; - IosevkaSS09 = "0pkbxraad7m3bcp6db48wwm0k8xb303cqcd4cnczgrnl8qkd2pd7"; - IosevkaSS10 = "15107qv3rmvwc5mrlp1h1sh6f0m40daspxri27y9bgl2imz074sr"; - IosevkaSS11 = "0f5ym3324y8jwinkraqsl79342gj8078yrmv5k6a9wzwzb23y82j"; - IosevkaSS12 = "0yqmm4yl4dcldl49w0i4bm26l2y540531drpbp63q3m84gkxkr56"; - IosevkaSS13 = "1k1h6zpq95dadybv84q16jwk3gy8151l8z4302rsh2c474w6p8cg"; - IosevkaSS14 = "06xx3cs3qvb0i3zw0v1rbk573dmpfg2izqjs65bdzn1v8h13glqv"; - IosevkaSS15 = "13bbpnc9hkndy8rfkfxvyr98pqh822xn6npp6h5gipslczgci0kr"; - IosevkaSS16 = "1cgfmb38l6hdllijdg1ybxhk2acx8rxa0lxx4z9rpak00bw3zy4m"; - IosevkaSS17 = "0a3ir1wa93darilalvkyl2gp3rgk3v86qvbvq428pg3z0fkxg4lp"; - IosevkaSS18 = "0kc144dc9nsq5anp61pfyad5h4qwgkm7xnca10g62cn1a1l2lkks"; - SGr-Iosevka = "04jwfl8idgqv1y401y6b6pc4hdarkp126n43kdcb8x083qfnfw20"; - SGr-IosevkaCurly = "085yphzyb044v091sn726iz5kwmk8vsy19v4m936kk9b7s5jcavz"; - SGr-IosevkaCurlySlab = "1axqcc57sm3bxqsssbanxsfl2x4s417jf6v0gjlkv3dgknmq18zh"; - SGr-IosevkaFixed = "131ibj57v2sabb8pw8dhk86q0kbh5q22allkdcibgcrj8av9g3ym"; - SGr-IosevkaFixedCurly = "12fy0i2hd91p9z7n9jqbqyac2s15xz17m7qsmqnh5ijbv0h15xs3"; - SGr-IosevkaFixedCurlySlab = "0lrcpjiam1hvwhfgpafv6pny4a443x10f64lhs7ig5ga7msn34ww"; - SGr-IosevkaFixedSlab = "19y749m77i5xw4ny6x6zqbdg2pjpwm8ns51y1k6x6fxmzw1f45iv"; - SGr-IosevkaFixedSS01 = "1332dsn8n11mwiqv5qhkiqzh0cp1bz8jc576mq735xcsdjb9rmbv"; - SGr-IosevkaFixedSS02 = "06pg5kpklgapidnmh97r9zr7lk043493pi1154p3rxn71q5q0gja"; - SGr-IosevkaFixedSS03 = "13bjcbhdcabcdq8xy7rc75vszmdhq1n8ykqyg32g04mcza6qh711"; - SGr-IosevkaFixedSS04 = "123fqgpy1srsbryp3svamqfgxdk0kh98rdlbmhfaw3fzdrfcpbm1"; - SGr-IosevkaFixedSS05 = "0zc7v7c4q50hlyrwkw58rm20igbyvkq07fhb369bijr42rlvhhc3"; - SGr-IosevkaFixedSS06 = "1l0zwmq1l2k5iz88zwv4wksl3h2kvfr0vjdhyf8sc42la99v7xsk"; - SGr-IosevkaFixedSS07 = "1g7vs4j1b1h0xqs8lzasgjszz1pf80frgj819qnrqwf7as0lhlrn"; - SGr-IosevkaFixedSS08 = "0dxc5c2hy0vf0jn7njm1xpcblvmnkz2yalqksqf4i2fip1ysd5yc"; - SGr-IosevkaFixedSS09 = "07s43jhxwh6qha4k5wpxv7sqqhbd475sqwrv14fzw08m12mpdpkc"; - SGr-IosevkaFixedSS10 = "077dwvnm78fx0fj4bh0clzmvcgk6kci2a9avwqp4zqzz12z81dmj"; - SGr-IosevkaFixedSS11 = "043wc8075359llr5jy6jzrh9dvdzzgc0iqplvvncmhj69q06cn81"; - SGr-IosevkaFixedSS12 = "1dbf3lqygz7wckq84gfy92wjpiqy7jwhbbfb9mcbvnnkz9vn33nc"; - SGr-IosevkaFixedSS13 = "04my4x9k4hcrzl9iab44dd1xpab2i486vxgr3ap4g8yppgc1844d"; - SGr-IosevkaFixedSS14 = "0r11nq120hccmbg0yzam1zigpcwxymghgqrn5qqilh4mky91sdj6"; - SGr-IosevkaFixedSS15 = "0kqwrr89gbmpjrpmmsnvi0gzrbfqa7akk6j9821k795a0swym1wa"; - SGr-IosevkaFixedSS16 = "1bvjxxzm2klay9mxbzrgv8waxgr5nlikp6s05p7ac9gif0q6344c"; - SGr-IosevkaFixedSS17 = "053pl9y8sm6z5hdawxf60f9zvffzys86a1znf2d0hn3si3shdyy9"; - SGr-IosevkaFixedSS18 = "0cckxs4p61jsrynvvj7q75dg7fhac4qc94k595nln7g4a8lyxvl1"; - SGr-IosevkaSlab = "1znjdjmfkpn4z6kykxyg87ahkwqm95l06gbsnc45i0fzwkikapwx"; - SGr-IosevkaSS01 = "00pzyv2r1gy9pwbg35pg7x4g4jsl7l1xqyn1ywsbcpcdagsda783"; - SGr-IosevkaSS02 = "05lxrl27maksbxrrfrarlhiacax2ghl7h7vbq2y2aa7mml46j9nn"; - SGr-IosevkaSS03 = "0yycbwfjqamqvliihdkxpahvr8b3grfrzpbzxsjs54vfi03q8wxs"; - SGr-IosevkaSS04 = "0a5g7i28l0i3lm31ggwfr8ix0w5z96qxhk7az2nifgfspcygsmvm"; - SGr-IosevkaSS05 = "1c4y7pplh8h3y0g41arhg7ilnpfr9jvrx4ffv2gfs96z8nd3v1j7"; - SGr-IosevkaSS06 = "011gwa2nyjijh6w5yxah4ss9i5lgp0fs639mg1d5khyrazzhd8lv"; - SGr-IosevkaSS07 = "1n11pqlhl3db6n5ia5rkr8b69fplj3xmaqpv237mmpa7msxdj03v"; - SGr-IosevkaSS08 = "1nxgpl3ncr5ky2llizgnz941zw2i5vmd9ccqrdzknlr90rdi5z12"; - SGr-IosevkaSS09 = "0x3jz7vg8w86pzyc82axb70xg2j4nfzmy7hnhbrlci35yxvxrwlg"; - SGr-IosevkaSS10 = "0zq76fqqys2p23panj0jm5575lnrrskxgbgrki1v8ssp0zy8qind"; - SGr-IosevkaSS11 = "0sd6mlpf2hplkv3njqxxyj9d1ja5ap5cvz87fnqm3k82bvy9j3mv"; - SGr-IosevkaSS12 = "1aa40j9vagp4q5b3pf4iab16m3frn05w3xm9hmlh5qvkz90kbgzq"; - SGr-IosevkaSS13 = "0hav346gz42027dkasdfskmmgrcjv874i27ns26n1cpvnk997lyl"; - SGr-IosevkaSS14 = "1xxhif1yyjb2x52nbka7mw130b47l0hxm4cgimnhb7fs9ha2a51j"; - SGr-IosevkaSS15 = "0i182a442092c5azyybbrnpvsfg46iajmzj1lp12cpm73sannfb8"; - SGr-IosevkaSS16 = "01gz4nxi18r0yrr42lr2nrf2lca8a3rliz5k1b594qsnswpqv0fk"; - SGr-IosevkaSS17 = "1c2krm1xabwqk7g4p0m9xhgmpx9bcn9npbx146cig3zb94djrav7"; - SGr-IosevkaSS18 = "1v03vchjkzji74iav2l55lmmig232a1rjfz22mwvvw6vvsqp75m6"; - SGr-IosevkaTerm = "12jbm58migwvbiqxn8ykcnq6lb285h323cbk5baxk0qn8nhsybnr"; - SGr-IosevkaTermCurly = "0kk0wmkcw17z6j4l142r0q4zf4jsh3rnvsn0n97famw3mrdnjcn9"; - SGr-IosevkaTermCurlySlab = "0hxr3wp9sr7vr5w9sjyyfbhshlj755d2lyjbnjs0ac5r1vcgfqyf"; - SGr-IosevkaTermSlab = "1pcqlvb8zbqz2idmf4dhhwq6srby7a6w3254dcw9qj7432rhfhfx"; - SGr-IosevkaTermSS01 = "1h3kivh7l4abfcx6x1kcmws2lcsjid4159jmsrp2dbgg4sa92nwy"; - SGr-IosevkaTermSS02 = "08blza1chjks8641wxi2251rxv264j0sxdcacllss4y0a13qv2xn"; - SGr-IosevkaTermSS03 = "0i5l61qd92ykifwa8a0cll2317gwd611kccqc9bk6grlxpyyajjl"; - SGr-IosevkaTermSS04 = "0grvfxlxsq75v04jrbx5xhb6lhv564lb23zdlncwp5f7kiwnjwh1"; - SGr-IosevkaTermSS05 = "0c6pbpi92ga67ypr6xkzzhm47ph54nz0v5hjvnnys8hdazrp7q7l"; - SGr-IosevkaTermSS06 = "1s9a5yylzka728wkl89fk712g7kmhqv1fhy04c5dg69r85189w8s"; - SGr-IosevkaTermSS07 = "1prvb7ppgl3n5jzihag1l1yrwgz0rxgf86zqb62nvyrvvvslkly8"; - SGr-IosevkaTermSS08 = "1dn7rdipfyvcqq4gv07r7zkmg0h1337c2s17ajzv0k0f79a6k9mr"; - SGr-IosevkaTermSS09 = "1fqjn07mz0xgrhj8lbq6l2nxzykbx2kcrq1hhmd60y79241dsms6"; - SGr-IosevkaTermSS10 = "1d499grr3khq45fnflwdj7h8qkxgyri7fs77kwivsaqn2p7hd9ff"; - SGr-IosevkaTermSS11 = "0fhj3xnxvc4b3vri13jg9zqghql6z29d9h7xi6hl75cf8gl0rzlc"; - SGr-IosevkaTermSS12 = "1xvfk9wvd91wzaa6d9zj6yxzkmgmjd13v2kjrwv9m1f5ykdzpvpa"; - SGr-IosevkaTermSS13 = "0zd0i0mzqh36d6w72lrrl3i7zvsy9p3yj9z5hb9kcsnlg9cnnlyv"; - SGr-IosevkaTermSS14 = "01qg7yvn29lqnd5fmnhyrl84lh3vhm1yxinx39nclj3vfp26r6qz"; - SGr-IosevkaTermSS15 = "0hxvrawp94a2vx23gyf7pnzd3dzrh7ijgg4q6pcj2kfadfxjwqks"; - SGr-IosevkaTermSS16 = "1ghkg9d8371ls8iipzqn83kp9j9aah76c90zy8wkvpjh6ypp6sgq"; - SGr-IosevkaTermSS17 = "0pr6n3b3h8jp7h5hy468ia3dwsnqawcm7v2m8waszgywgvpl5rcy"; - SGr-IosevkaTermSS18 = "0f08vznvd2hdn3bdjx3qzy5hkrjqm69dpyj4rr4lqxwwx1dyy120"; + Iosevka = "0p386cv1bkbrwx91hxxd0qf9y18sidhj8jzl0b7l0g5gi68v9z67"; + IosevkaAile = "050j2bhbkl015kkmyz3qzxckfqpy0frg4800biqn20nfh0nd1wmw"; + IosevkaCurly = "15fs984pbxvazhzcz941zrksg12jrqilflvzcpcnqfg0nyz7w79w"; + IosevkaCurlySlab = "19n6sx5ag47ysa2qg64n5549r1ig33kzin5ln5mg6x5cfiir6j26"; + IosevkaEtoile = "1syhrp6cifm989zybh2zvhdk2jwrck8mvmlgppw5wpz4q2d35k30"; + IosevkaSlab = "16f7j3hqsfk2hnvwwnd5dszwf46r3a18njv1d1szkn2xnw55jgak"; + IosevkaSS01 = "095rvb62j71hr5n13wxkbq3h36jr5gnv7536zycjlm0h34ff2ryn"; + IosevkaSS02 = "1k880h5j2ynr88vgflvx7vjk88rh3xs6kblj82pb0li9fvl7c7wd"; + IosevkaSS03 = "1jp9q00wjz47h66by4jrpfbkmzj15pvz2viqbl0p64kgmjnbak51"; + IosevkaSS04 = "1djzfhpi92226a606zx9rkf8brvazilafv0bhwsx3zm7msnh1239"; + IosevkaSS05 = "0k7yzz0xmpwgn9zyiwxz882lwi2xgm9kxp0d5hy684hbzapkydw2"; + IosevkaSS06 = "1rph461k70yi745l99sfb5i29r0yf0i43v96jj5fgg82rswkjyb8"; + IosevkaSS07 = "1idkdvfw6267vim2yspdcn8n92i4l7c4dvzgaqm7i3c4jis21cnr"; + IosevkaSS08 = "02aiksqzccbzmcz81kp1rwxy9wjcanildagjnqksif7md55lsw99"; + IosevkaSS09 = "1a5vgn5nlb8p5ypz3p9lqs10jfmjgam8iw4i5gm87xl0602nxf4w"; + IosevkaSS10 = "051hkwkwgjdrb2011rzbq9hy0r26kxakryvhj5wr6cmh4gp59yz8"; + IosevkaSS11 = "1gqidclxpcqyz3rc3skg3q3h53nhpkpll8ijb4b45sp3bldff110"; + IosevkaSS12 = "18ijr79d3x4q52h4z4pba1p9l7hn20857v8nqn6nn59j6vrd1b2k"; + IosevkaSS13 = "1rphwzi8zy39hjka6n5jcmqx9c05wgj0hkndgiyb8mdhi2nxl0wd"; + IosevkaSS14 = "0ffyp9q5kwvf3d7qzqhaa3dpj0s3d0al76zsa8v92wahc1z20zm7"; + IosevkaSS15 = "03dnpmjjvgnnagmqghnlxwd33xlg3frz44q0w0ri98pbls1zgysi"; + IosevkaSS16 = "0vin643dgis6p81a3x4hfp2y9r0f5kmklpl88ql2pprcxlgr71qx"; + IosevkaSS17 = "129g4d2xjcv0g8079dwsgc16z8dm8hsvk1l86sci32q34iwp53na"; + IosevkaSS18 = "09m0qsgxqsja76g4ywjlxc4qc7wb0qkmm7mlx4fracy4jdq4niwk"; + SGr-Iosevka = "0r3yg2gpg52kp6m63x16j6n54sv32q2vf38cm1p5lbpjd9zbfbi8"; + SGr-IosevkaCurly = "1bba9f2hrxllxm13mc3lsgdf1f6nk5b84jgp6vrp0kgl6m1pkbls"; + SGr-IosevkaCurlySlab = "18ypl4wrsd13zlb497nldf5lyd9c5ckc06dkq153884k518p51sy"; + SGr-IosevkaFixed = "0cwv68dpql583ydxnlqkzj7c5hv1lhgkag7rl66yx3zsnxk4mrwb"; + SGr-IosevkaFixedCurly = "01409k12sbw0hpkfbgj1168yp4pxkzazj3cxqc3kjas24hyk7kp9"; + SGr-IosevkaFixedCurlySlab = "01y62dl3kcczl6wcsj5ccagf8pbqzmmwzf2kvdi3cr27krla944b"; + SGr-IosevkaFixedSlab = "1bmw2n7wd8zz97754f9i9ks1nyfbnyl3z6hn4h9b8i7wbgf10123"; + SGr-IosevkaFixedSS01 = "1scz7ag493v62q5azv2wv5habjmhdxcx56nh45ha65m1p0syjywg"; + SGr-IosevkaFixedSS02 = "0hzgz8x4x06f3nw7z60zrvg2f28nzpxib1m76dvdq7cf1yjspwrw"; + SGr-IosevkaFixedSS03 = "0mj7232ppva8hd7212rdz3l6inmgcy1ccicwf74j49zcj6d2i2l1"; + SGr-IosevkaFixedSS04 = "14mjbkaf5q426225mfia2fpwywh3vq6dsw296acgg5ja80xsfm4r"; + SGr-IosevkaFixedSS05 = "03ij2jsn1c6imbm42mhirn33dy66jlq6p854ss4scxgki4aiv2lb"; + SGr-IosevkaFixedSS06 = "1s8ygxi0xgdwk3pvcnvhcbhqrcpmgipvs1w1v7jcb6mg5158s4xl"; + SGr-IosevkaFixedSS07 = "183k6v2spd20578p8kfga54s9gzpfywjm4frdab0rnyffjhs1inr"; + SGr-IosevkaFixedSS08 = "17mxmvmvn8l6yhd8ww69w81sv76zih8jhs9msz3ajrsrhq5glb9y"; + SGr-IosevkaFixedSS09 = "0f8yrdi6n989v9ppb76gswsri9rnzyhi5cxvqmhmwixgb812crlc"; + SGr-IosevkaFixedSS10 = "0i35zvqbr4sbafi07bvhcj4h1a6g5r3rgba57bi6zwihmmw6ysq8"; + SGr-IosevkaFixedSS11 = "0zyrg10q3223q26kfnprmfanzck74943gqavyfy4iqq1dlwzq9sz"; + SGr-IosevkaFixedSS12 = "1n9rcmxz3hwp300qcddlqydmj40ajy15cgv22z82qg608a3l1h14"; + SGr-IosevkaFixedSS13 = "0b1zcqyn5zblqsz28myjw3py6c9cllml2nisyapsbs4yxy96sck7"; + SGr-IosevkaFixedSS14 = ""; + SGr-IosevkaFixedSS15 = "0cc7hik5d9cbfhwmazflwd6h3ddhy88892f1hr2z9bwgri47h2pp"; + SGr-IosevkaFixedSS16 = "0cdi4jw5lig1i2v54dk35p9wjkl2bld6ldxxrg32smwik9zx9dpc"; + SGr-IosevkaFixedSS17 = "1g7xqw50i589l5hqgb97gd1phyn9x1sij404k91g331bwmj4icl5"; + SGr-IosevkaFixedSS18 = "19g3qprnfkr77p8zi14xdzyya5pssmv1rx8vsjahrkbyg2hxwcm7"; + SGr-IosevkaSlab = "10pjqvqm1kssani9j1p4rryz3kz71jxrzh4xpr687j8sqjr0qkgh"; + SGr-IosevkaSS01 = "10ls2xwg08m6nkmq9c7zfi9j5b957hwaxkb8yh136w0smd5lql07"; + SGr-IosevkaSS02 = "121bbkybz8wxmpm0mrfc1fpa2n9l8624lcy867gf25kw4j0z360y"; + SGr-IosevkaSS03 = "1p75ixf4myfs6wmc3z1jilkip34gjhmkkqs98js4adbzb14ys3fi"; + SGr-IosevkaSS04 = "1mizbsfh7chzpdjpfbq47bvnz60n954jp7s8ni8mkafl2zm3jdja"; + SGr-IosevkaSS05 = "0plaby57yqgz97hzypfmzlcp8aijycwnh7276ynzmy4irdiqariq"; + SGr-IosevkaSS06 = "1gj6syx1zmhxiq2s33zza0wql9in0qcvbckb92yd51xsg8w5fwiq"; + SGr-IosevkaSS07 = "0pdkwcr8lxq3gm03sv5cbicnb70jxbdymrmwk31lcrq0qf2mg0wl"; + SGr-IosevkaSS08 = "1bfgv6l056pz421shil0z9vv4slzbqnl4q1dv422isffbxgbn28a"; + SGr-IosevkaSS09 = "00rslbcc354phz8w5i2q2l9ds0vlpzym1n30rysc9w83yn4qnlnd"; + SGr-IosevkaSS10 = "004mnamygjfcr09ylhzglxzclfi39yz81kqj87zynklnavb7yvzr"; + SGr-IosevkaSS11 = "07m80h8kggxzpg2w0f5zx7r3nqjhwmx23l4rldbxgb4qgy08svlb"; + SGr-IosevkaSS12 = "0pivpcmgxl4pgm4kfaid91jidpxvzdn0ma9dmi68nf0wyjxp9l2r"; + SGr-IosevkaSS13 = "0nki8q2zykwc9cdrnqr941agfqz5l54nswy6388fmqyxp5d9j1jy"; + SGr-IosevkaSS14 = "0p57i63v3iii56jj79pzm8jzbapjraiww3lda52wdsa4g3m3pyzl"; + SGr-IosevkaSS15 = "1izkbr45bccwpx00crk2ib8ixa04j441iv25liib38zn7xgyf2cf"; + SGr-IosevkaSS16 = "19xc6n5pn3xnng32rck0h5kfwy38yjzygbad4pm3ygqm6rh2rcs4"; + SGr-IosevkaSS17 = "14n7ikpfry5bavwr9awhli94q46iby5997gdndwjgr0aq8hwk72d"; + SGr-IosevkaSS18 = "1mif5zsmfs4cdb8y79awnzgk1m053j2fqnspmk4llfgv2knv6y75"; + SGr-IosevkaTerm = "0q69644wdp5szk7ijzin8877jmfa7c0xw9dd7rznn41140hxy2ld"; + SGr-IosevkaTermCurly = "0xaw2xmmcnmrxac37x4wwkywzbb1hniv9ngcil89937ih00f3v2l"; + SGr-IosevkaTermCurlySlab = "1426k5q1kbci4y95yv2cf2b8ajp3q73kpiqg0xn43dp2ji1s7p3j"; + SGr-IosevkaTermSlab = "0frv0sh6lsysn2xccpq59rlhdclpzqi44v0xw8vrpw1chw18pnqj"; + SGr-IosevkaTermSS01 = "1dlwfzfjg7ayri9njdyhh8mmgr7lzj698qphgd1kgih9cvpsapxk"; + SGr-IosevkaTermSS02 = "1j3zyj35dk15v68n7zs78vzgmsdqsvdwmw40zwznzkqy0jsll2ap"; + SGr-IosevkaTermSS03 = "0bv33c5y1ja50v7l2702k0vlhjrig78i81wqf73cyy7gsis0q0gc"; + SGr-IosevkaTermSS04 = "186fbcia31jyz2sgz3qpdmyh0g9qag64hcq2dcym2879qmgwzgm1"; + SGr-IosevkaTermSS05 = "1mbyn3bdj1d23jj0zc89kq8aspa3g8zf3j3fnicw9ffc47a79kzm"; + SGr-IosevkaTermSS06 = "0ypp71ydfzik6rfg037d928mvn6w7av13k7hkbzggi0q3l51dpl9"; + SGr-IosevkaTermSS07 = "0a1ma9dxcq642r5090l25vlsc7ga7gylv4yfzcmr5frhi56a39gl"; + SGr-IosevkaTermSS08 = "14bpsyzadhs8b7jf7fkcrj17pp42iakbvz4fd8ldy6slgzsv1xbb"; + SGr-IosevkaTermSS09 = "07hwh8547hqsg4w4gdimc5cl3qqlc937xxc50py9r34rflilckzv"; + SGr-IosevkaTermSS10 = "1iphz3isv37djyc3xl85b5zjp3760bf216fmg5v0lswxsfaisg8c"; + SGr-IosevkaTermSS11 = "1f6axizf4d6jilcb1riznfrznrlsyf4ddaisr7clx91vd22mrcdl"; + SGr-IosevkaTermSS12 = "05rx7mrq3nmqb1257gyw6sjq6y6gf2j5bkkabsj2b3iq1hwzkcdd"; + SGr-IosevkaTermSS13 = "1x0q3cmdzxa6kvdrnqq5znrcici70cwxha9va99d1vadvz2qjbc3"; + SGr-IosevkaTermSS14 = "07xqpca7ahkawcb4m0wf45ikwvm7nfgc5v10cfpn41jgnfighqf9"; + SGr-IosevkaTermSS15 = "0ql2sfkayj3vpk86fvw76gnfcpfdaskxymlhb2ij1jz6ckgqgfny"; + SGr-IosevkaTermSS16 = "1nr6ms7ybgb74k8zb38rb2rl9q20c8shkx2xfdmgx5qg86dwc9pd"; + SGr-IosevkaTermSS17 = "0c75xp0w59wypiq8zhzpzwa6n8spmvzm1z067fwy8wmq8sp0i500"; + SGr-IosevkaTermSS18 = "1rq4ra8al9x7dqv6l12y36pm4vrqkqx2c5rgzc3c6awnwk71rqbz"; } diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 006137bbc3db..78f4152180ca 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "33.0.1"; + version = "33.2.3"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-Yosl6dqbYLsX1whkSazHHlbZ4zhJ5jSZmrdi22BLBJM="; + hash = "sha256-dCHJYGZYTvjDtM2V+NdwXNxHg4kkcVAQD0G3DPtu5ps="; }; - npmDepsHash = "sha256-/a2VVz8w2a2KfOgWAg0AWmdbPqQ7bN6rBHhv6b1TwYg="; + npmDepsHash = "sha256-eqWf5d9uCMkvDNPlICUt7QVT+2WsU0u+TE14ZraWXXE="; nativeBuildInputs = [ diff --git a/pkgs/by-name/io/iotas/package.nix b/pkgs/by-name/io/iotas/package.nix index c17fa9a21df1..79ec2898aefd 100644 --- a/pkgs/by-name/io/iotas/package.nix +++ b/pkgs/by-name/io/iotas/package.nix @@ -20,15 +20,15 @@ python3.pkgs.buildPythonApplication rec { pname = "iotas"; - version = "0.9.5"; + version = "0.11.0"; pyproject = false; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "iotas"; - rev = version; - hash = "sha256-SDapnAGPTi7tnzl3zeNJw2CABhVVAXMyn1bllg8fChw="; + tag = version; + hash = "sha256-9YYKVBjidHBWyUqFvxo3tNx5DQkpililCDLZofESYRw="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { webkitgtk_6_0 ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ pygobject3 pygtkspellcheck requests @@ -75,6 +75,7 @@ python3.pkgs.buildPythonApplication rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "iotas"; - maintainers = with lib.maintainers; [ zendo ] ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ zendo ]; + teams = [ lib.teams.gnome-circle ]; }; } diff --git a/pkgs/by-name/io/iotop-c/package.nix b/pkgs/by-name/io/iotop-c/package.nix index 4cd9f5a47049..1c2b360d2bc0 100644 --- a/pkgs/by-name/io/iotop-c/package.nix +++ b/pkgs/by-name/io/iotop-c/package.nix @@ -8,26 +8,27 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.27"; + version = "1.28"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-o8OJnZjrDbzzhwfzRWmyCmhBWxMVKRDeDWWBCXy3C90="; + sha256 = "sha256-Cauy6q587M/VhMsr1vFlNaEJfteDJmNTjE81m0u+OBc="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ncurses ]; + makeFlags = [ - "DESTDIR=$(out)" "TARGET=iotop-c" + "PREFIX=${placeholder "out"}" + "BINDIR=${placeholder "out"}/bin" ]; postInstall = '' - mv $out/usr/share/man/man8/{iotop,iotop-c}.8 - ln -s $out/usr/sbin $out/bin - ln -s $out/usr/share $out/share + mv $out/share/man/man8/{iotop,iotop-c}.8 ''; meta = with lib; { diff --git a/pkgs/by-name/ip/iperf3d/package.nix b/pkgs/by-name/ip/iperf3d/package.nix index 326d9d19dc7e..2ef07515f94f 100644 --- a/pkgs/by-name/ip/iperf3d/package.nix +++ b/pkgs/by-name/ip/iperf3d/package.nix @@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "iperf3d"; homepage = "https://github.com/wobcom/iperf3d"; license = licenses.mit; - maintainers = with maintainers; [ netali ] ++ teams.wdz.members; + maintainers = with maintainers; [ netali ]; + teams = [ teams.wdz ]; }; } diff --git a/pkgs/by-name/ip/ipfs-cluster/package.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix index 813f40030fa4..4426f45327f3 100644 --- a/pkgs/by-name/ip/ipfs-cluster/package.nix +++ b/pkgs/by-name/ip/ipfs-cluster/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.1.2"; + version = "1.1.4"; - vendorHash = "sha256-y8eE1GYFiHbLY5zeSSQO86I4buZZJROGp7KzXbKjMqI="; + vendorHash = "sha256-VVejr6B7eDNNQF34PS/PaQ50mBNZgzJS50aNzbLJgCg="; src = fetchFromGitHub { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - hash = "sha256-CpMnhqRlikKdPT3/tsLpKdKm6icePDsmqEnUEBwvCT0="; + hash = "sha256-mdLrLiRNudpQ8i0lvwoNAqhSWJ8VMEC1ZRxXHWHpqLY="; }; meta = with lib; { diff --git a/pkgs/by-name/ip/iplookup-gtk/package.nix b/pkgs/by-name/ip/iplookup-gtk/package.nix index 2efdca4256c5..7721f83bcab7 100644 --- a/pkgs/by-name/ip/iplookup-gtk/package.nix +++ b/pkgs/by-name/ip/iplookup-gtk/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonPackage rec { pname = "iplookup-gtk"; - version = "0.4.0"; + version = "0.4.1"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Bytezz"; repo = "IPLookup-gtk"; tag = "v${version}"; - hash = "sha256-pO05WDNb9AMKXm8OqzOnk77T5sLBdURV90FgQKL9oAw="; + hash = "sha256-WXLT7ThuD4/alb44mkGNLJjZPiWgNmSUqsRiO+cjdPk="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Find info about an IP address"; homepage = "https://github.com/Bytezz/IPLookup-gtk"; - changelog = "https://github.com/Bytezz/IPLookup-gtk/releases/tag/${src.rev}"; + changelog = "https://github.com/Bytezz/IPLookup-gtk/releases/tag/${src.tag}"; license = lib.licenses.gpl3Plus; mainProgram = "iplookup"; maintainers = with lib.maintainers; [ aleksana ]; diff --git a/pkgs/by-name/ip/ipmitool/package.nix b/pkgs/by-name/ip/ipmitool/package.nix index 4c43972a5903..565b815874fa 100644 --- a/pkgs/by-name/ip/ipmitool/package.nix +++ b/pkgs/by-name/ip/ipmitool/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitHub, + fetchFromGitea, autoreconfHook, pkg-config, openssl, @@ -17,13 +17,14 @@ let in stdenv.mkDerivation { pname = "ipmitool"; - version = "1.8.19-unstable-2023-01-12"; + version = "1.8.19-unstable-2025-02-18"; - src = fetchFromGitHub { - owner = "ipmitool"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "IPMITool"; repo = "ipmitool"; - rev = "be11d948f89b10be094e28d8a0a5e8fb532c7b60"; - hash = "sha256-5s0F2cTZdmRb/I0rPqX/8KgK/7b5VCl3Hj/ALKpGbMQ="; + rev = "3c91e6d91ec6090fe548c55ef301c33ff20c8ed8"; + hash = "sha256-7R3jmPPd8+yKs7Q1vlU/ZaZusZVB0s+xc1HGeLyLdk0="; }; nativeBuildInputs = [ @@ -36,21 +37,18 @@ stdenv.mkDerivation { readline ]; - postPatch = '' - # Fixes `ipmi_fru.c:1556:41: error: initialization of 'struct fru_multirec_mgmt *' from incompatible pointer type 'struct fru_multirect_mgmt *' []` - # Probably fine before GCC14, but this is an error now. - substituteInPlace lib/ipmi_fru.c \ - --replace-fail fru_multirect_mgmt fru_multirec_mgmt - cp ${iana-enterprise-numbers} enterprise-numbers - ''; - configureFlags = [ "--disable-registry-download" ]; + postInstall = '' + # Install to path reported in configure as "Set IANA PEN dictionary search path to ..." + install -Dm444 ${iana-enterprise-numbers} $out/share/misc/enterprise-numbers + ''; + meta = { description = "Command-line interface to IPMI-enabled devices"; mainProgram = "ipmitool"; license = lib.licenses.bsd3; - homepage = "https://github.com/ipmitool/ipmitool"; + homepage = "https://codeberg.org/IPMITool/ipmitool"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ fpletz ]; }; diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index ab192d828ea3..f2fa309289f8 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.13.0"; + version = "6.14.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-pDqkMzjYgrRNAeVJ8/EFqSrp/uoyqC+uRaiOekkwKBk="; + hash = "sha256-ptI1iBUAllkcPQD8J6MkqC7nHXoanup4313xetm4Rh8="; }; patches = [ diff --git a/pkgs/by-name/ip/ipv6calc/package.nix b/pkgs/by-name/ip/ipv6calc/package.nix index 53059e5567be..5c8a4cb73be0 100644 --- a/pkgs/by-name/ip/ipv6calc/package.nix +++ b/pkgs/by-name/ip/ipv6calc/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ipv6calc"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "pbiering"; repo = pname; rev = version; - sha256 = "sha256-ObJn7T7dGp6HjICWHWAbJjgHM08FrJx31AxIMmIexuQ="; + sha256 = "sha256-zQ8azAd6q7mY3Jtx58cI2OL/xNZi+aA03y5QWHWjnm4="; }; buildInputs = [ diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index 683af773a1ed..6190910664e3 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ipxe"; - version = "1.21.1-unstable-2025-03-27"; + version = "1.21.1-unstable-2025-05-16"; nativeBuildInputs = [ mtools @@ -65,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "09fbebc084bddcb5bc7277f1644154ab35e6a334"; - hash = "sha256-7F7SYSvSiY23xZbiJdzjiSDMnfeB4gWNodlHVgm9MyE="; + rev = "83449702e09236dccebd4913d5823d5e00b643e0"; + hash = "sha256-od4ZX0Tgc0S/b73jIvPmCEHNijlKDYJPjmOhoRmyNSM="; }; # Calling syslinux on a FAT image isn't going to work on Aarch64. @@ -142,7 +142,15 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Network boot firmware"; homepage = "https://ipxe.org/"; - license = lib.licenses.gpl2Only; + license = with lib.licenses; [ + bsd2 + bsd3 + gpl2Only + gpl2UBDLPlus + isc + mit + mpl11 + ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ sigmasquadron ]; }; diff --git a/pkgs/by-name/ir/irccat/package.nix b/pkgs/by-name/ir/irccat/package.nix index e1851f473d18..9e9d3c845470 100644 --- a/pkgs/by-name/ir/irccat/package.nix +++ b/pkgs/by-name/ir/irccat/package.nix @@ -6,22 +6,23 @@ buildGoModule rec { pname = "irccat"; - version = "0.4.8"; + version = "0.4.12"; src = fetchFromGitHub { owner = "irccloud"; repo = "irccat"; rev = "v${version}"; - hash = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts="; + hash = "sha256-W6Qj+zg6jC304bEIQeFB8unSFgjV60zXV+I8hpw3AFA="; }; - vendorHash = "sha256-IRXyM000ZDiLPHX20lXlx00tkCzBe5PqvdgXAvm0EAw="; + vendorHash = "sha256-SUE868jVJywqE0A5yjMWohrMw58OUnxGGxvcR8UzPfE="; - meta = with lib; { + meta = { homepage = "https://github.com/irccloud/irccat"; + changelog = "https://github.com/irccloud/irccat/releases/tag/v${version}0.4.11"; description = "Send events to IRC channels from scripts and other applications"; mainProgram = "irccat"; - maintainers = with maintainers; [ qyliss ]; - license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ qyliss ]; + license = lib.licenses.gpl3Only; }; } diff --git a/pkgs/by-name/ir/iredis/package.nix b/pkgs/by-name/ir/iredis/package.nix index ee9636a700e1..f66a871376f6 100644 --- a/pkgs/by-name/ir/iredis/package.nix +++ b/pkgs/by-name/ir/iredis/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "iredis"; - version = "1.15.0"; + version = "1.15.1"; pyproject = true; src = fetchFromGitHub { owner = "laixintao"; repo = "iredis"; - rev = "v${version}"; - hash = "sha256-wfjr/FVmKgkP8FMKxw6e8U+lfZQZ2q52REC0mU8Xp7Q="; + tag = "v${version}"; + hash = "sha256-ZA4q2Z3X9zhzW/TH8aRliVij8UxqDVUamhKcfVxWb/c="; }; postPatch = '' @@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Terminal Client for Redis with AutoCompletion and Syntax Highlighting"; - changelog = "https://github.com/laixintao/iredis/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/laixintao/iredis/blob/${src.tag}/CHANGELOG.md"; homepage = "https://iredis.xbin.io/"; license = licenses.bsd3; maintainers = [ ]; diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix index e230987a0e9e..8906373f993c 100644 --- a/pkgs/by-name/ir/iroh/package.nix +++ b/pkgs/by-name/ir/iroh/package.nix @@ -1,32 +1,22 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "n0-computer"; repo = "iroh"; rev = "v${version}"; - hash = "sha256-uavWluu7rVY2lZXDRsKApcZMB7TJsGuhJzieZPMXdvE="; + hash = "sha256-kOqmkuKOP2dWrUVaGwHckWjaFVZkSoXqqUgn+2KaWkc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7tQbfXVdgoxACF6qtesbUQ3AtVFAI2IbGO720PjwZCc="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + cargoHash = "sha256-O/j+/sRyMtqd4GaER2trn9SEFpZuSlc5q1MTXU+rwLg="; # Some tests require network access which is not available in nix build sandbox. doCheck = false; diff --git a/pkgs/by-name/ir/ironwail/package.nix b/pkgs/by-name/ir/ironwail/package.nix index f9a6a13e8e62..34a932fe4b67 100644 --- a/pkgs/by-name/ir/ironwail/package.nix +++ b/pkgs/by-name/ir/ironwail/package.nix @@ -10,6 +10,7 @@ libopus, opusfile, libogg, + libGL, curl, libxmp, mpg123, @@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config vulkan-headers gzip + libGL libvorbis libmad flac diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index f69230e40899..ec23c1b4a292 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "irpf"; - version = "2025-1.0"; + version = "2025-1.2"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip"; - hash = "sha256-gDGDOthUbRmj68CHmHhaYlGs4tiQTNVlEmuyLZ5e0zY="; + hash = "sha256-RlkDioXLcD3wHm9DDLw42QCRT4z0rEwlM0sGMORxk/A="; }; passthru.updateScript = writeScript "update-irpf" '' diff --git a/pkgs/by-name/ir/irqbalance/package.nix b/pkgs/by-name/ir/irqbalance/package.nix index 5b97c7225290..3b62b7f45950 100644 --- a/pkgs/by-name/ir/irqbalance/package.nix +++ b/pkgs/by-name/ir/irqbalance/package.nix @@ -7,6 +7,8 @@ glib, ncurses, libcap_ng, + enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, + systemdMinimal, }: stdenv.mkDerivation rec { @@ -24,21 +26,27 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config ]; - buildInputs = [ - glib - ncurses - libcap_ng - ]; + buildInputs = + [ + glib + ncurses + libcap_ng + ] + ++ (lib.optionals enableSystemd [ + systemdMinimal + ]); - LDFLAGS = "-lncurses"; + configureFlags = lib.optionals enableSystemd [ + "--with-systemd" + ]; postInstall = '' # Systemd service - mkdir -p $out/lib/systemd/system - grep -vi "EnvironmentFile" misc/irqbalance.service >$out/lib/systemd/system/irqbalance.service - substituteInPlace $out/lib/systemd/system/irqbalance.service \ - --replace /usr/sbin/irqbalance $out/bin/irqbalance \ - --replace ' $IRQBALANCE_ARGS' "" + mkdir -p "$out/lib/systemd/system" + grep -vi "EnvironmentFile" misc/irqbalance.service >"$out/lib/systemd/system/irqbalance.service" + substituteInPlace "$out/lib/systemd/system/irqbalance.service" \ + --replace-fail /usr/sbin/irqbalance "$out/bin/irqbalance --journal" \ + --replace-fail ' $IRQBALANCE_ARGS' "" ''; meta = with lib; { diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix index 06d70daee3cc..0c17dffbcffa 100644 --- a/pkgs/by-name/ir/irrd/package.nix +++ b/pkgs/by-name/ir/irrd/package.nix @@ -8,6 +8,7 @@ postgresql, postgresqlTestHook, valkey, + redisTestHook, }: let @@ -91,6 +92,7 @@ py.pkgs.buildPythonPackage rec { [ git valkey + redisTestHook postgresql postgresqlTestHook ] @@ -151,14 +153,6 @@ py.pkgs.buildPythonPackage rec { ++ py.pkgs.uvicorn.optional-dependencies.standard; preCheck = '' - redis-server & - REDIS_PID=$! - - while ! redis-cli --scan ; do - echo waiting for redis - sleep 1 - done - export SMTPD_HOST=127.0.0.1 export IRRD_DATABASE_URL="postgres:///$PGDATABASE" export IRRD_REDIS_URL="redis://localhost/1" @@ -185,6 +179,6 @@ py.pkgs.buildPythonPackage rec { description = "Internet Routing Registry database server, processing IRR objects in the RPSL format"; license = licenses.mit; homepage = "https://github.com/irrdnet/irrd"; - maintainers = teams.wdz.members; + teams = [ teams.wdz ]; }; } diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix index 83c2880931db..11e764c78986 100644 --- a/pkgs/by-name/ir/irust/package.nix +++ b/pkgs/by-name/ir/irust/package.nix @@ -21,17 +21,17 @@ rustPlatform.buildRustPackage rec { pname = "irust"; - version = "1.72.0"; + version = "1.73.0"; src = fetchFromGitHub { owner = "sigmaSd"; repo = "IRust"; rev = "irust@${version}"; - hash = "sha256-PRs6pG2aJQkmsZ1nRBaOTIrmjcYnaI9zZIHKJS/pueQ="; + hash = "sha256-oBHqyOqUNXO5c3TYFp84fDKA+R8ZmrgFCQswu7yXkGw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-oWMKJLVmJ/UQuTNUwZ7VWOFtFa/mJGgbRMQC3aNK3Y0="; + cargoHash = "sha256-YRptwZm00Px+3S+QFZAZxg25ObwmRdbgonzbMnBBb50="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/is/is-fast/package.nix b/pkgs/by-name/is/is-fast/package.nix index 47e93a82797d..c1cad113e46c 100644 --- a/pkgs/by-name/is/is-fast/package.nix +++ b/pkgs/by-name/is/is-fast/package.nix @@ -4,39 +4,36 @@ fetchFromGitHub, stdenv, pkg-config, - openssl, oniguruma, + writableTmpDirAsHomeHook, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "is-fast"; - version = "0.8.5"; + version = "0.16.2"; src = fetchFromGitHub { owner = "Magic-JD"; repo = "is-fast"; tag = "v${finalAttrs.version}"; - hash = "sha256-6gMXYOgPlVaN5UM+U55Jtbva8/i9BFghBaqboqTwdPg="; + hash = "sha256-Wzpd8yA3IpCN3sye1Fk3CUkCihEP6trqPI+oskULS7c="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EQdO4K3AQL0BR9hnoViiCMhDbcg2db8Ho2Ilvysr1dU="; + cargoHash = "sha256-+v1cxH1NKF1tjyc7Bqpd77q6Le8CqvtQ5p0H2ICqc1I="; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - oniguruma - ]; + buildInputs = [ oniguruma ]; env = { OPENSSL_NO_VENDOR = true; RUSTONIG_SYSTEM_LIBONIG = true; }; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # Error creating config directory: Operation not permitted (os error 1) # Using writableTmpDirAsHomeHomeHook is not working diff --git a/pkgs/by-name/is/isa-l/package.nix b/pkgs/by-name/is/isa-l/package.nix index 29248952f91b..aef29746c6da 100644 --- a/pkgs/by-name/is/isa-l/package.nix +++ b/pkgs/by-name/is/isa-l/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/igzip"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix index 61a484a7f54b..6063638edd6e 100644 --- a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix +++ b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "isabelle-linter"; - version = "2024-1.0.1"; + version = "2025-1.0.0"; src = fetchFromGitHub { owner = "isabelle-prover"; repo = "isabelle-linter"; - rev = "Isabelle2024-v1.0.1"; - hash = "sha256-oTrwcfJgbkpkIweDIyc6lZjAvdS9J4agPoJgZzH+PuQ="; + rev = "Isabelle2025-v1.0.0"; + hash = "sha256-cH9EoIbKa6cqLjw83gnYvCy+Dq0d5fFmJCabdPrRJeI="; }; nativeBuildInputs = [ isabelle ]; diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index c8f5d1306e5b..363bf860b8c9 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchFromGitHub, coreutils, nettools, java, @@ -10,7 +11,6 @@ veriT, vampire, eprover-ho, - naproche, rlwrap, perl, procps, @@ -21,6 +21,15 @@ }: let + vampire' = vampire.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "vprover"; + repo = "vampire"; + tag = "v4.8HO4Sledgahammer"; + hash = "sha256-CmppaGa4M9tkE1b25cY1LSPFygJy5yV4kpHKbPqvcVE="; + }; + }); + sha1 = stdenv.mkDerivation { pname = "isabelle-sha1"; version = "2024"; @@ -46,7 +55,7 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "isabelle"; - version = "2024"; + version = "2025"; dirname = "Isabelle${version}"; @@ -54,17 +63,17 @@ stdenv.mkDerivation (finalAttrs: rec { if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; - hash = "sha256-IgNfmW9x6h8DBj9vFEGV62oEl01NkW7QdyzXlWmii8c="; + hash = "sha256-6ldUwiiFf12dOuJU7JgUeX8kU+opDfILL23LLvDi5/g="; } else if stdenv.hostPlatform.isx86 then fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - hash = "sha256-YDqq+KvqNll687BlHSwWKobAoN1EIHZvR+VyQDljkmc="; + hash = "sha256-PR1m3jcYI/4xqormZjj3NXW6wkTwCzGu4dy2LzgUfFY="; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux_arm.tar.gz"; - hash = "sha256-jXWVv18WwrVnqVX1s4Lnyf7DkOzPa3EdLXYxgtKD+YA="; + hash = "sha256-p/Hp+7J5gJy5s6BVD5Ma1Mu2OS53I8BS7gKSOYYB0PE="; }; nativeBuildInputs = [ java ]; @@ -72,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ polyml veriT - vampire + vampire' eprover-ho nettools ]; @@ -103,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: rec { EOF cat >contrib/vampire-*/etc/settings <>etc/settings for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* contrib/e-*; do diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix index cdfdeb0a6bc6..9cafb0c7f323 100644 --- a/pkgs/by-name/is/ispc/package.nix +++ b/pkgs/by-name/is/ispc/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.26.0"; + version = "1.27.0"; dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566 @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-T8tFJaHkb6XpKA2s9tlNfJE7n0YJx30KTBIng+dmQ2c="; + sha256 = "sha256-nNiAlQ+MLkOV0/xLafsUNPV5HKCIqWCD2Fo8ChgFJMk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/is/isponsorblocktv/package.nix b/pkgs/by-name/is/isponsorblocktv/package.nix index c684e58c1748..dd5651d38efd 100644 --- a/pkgs/by-name/is/isponsorblocktv/package.nix +++ b/pkgs/by-name/is/isponsorblocktv/package.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, + fetchpatch, lib, python3Packages, }: @@ -16,6 +17,20 @@ python3Packages.buildPythonApplication rec { hash = "sha256-/lUs4EuifHKKyA8QiLsbqz0h6mxJpsFMjovpYE8+SxY="; }; + patches = [ + # Port iSponsorBlockTV to pyytlounge v3 + (fetchpatch { + url = "https://github.com/lukegb/iSponsorBlockTV/commit/89b7b1c029cfbe3b5a481647cdd2d03dec5259ce.patch"; + hash = "sha256-ISMrNrfPTnEbb0lZbREf+kAniJopWx3FePMGFm4ycJY="; + }) + + # Update setup_wizard for Textual v3 + (fetchpatch { + url = "https://github.com/lukegb/iSponsorBlockTV/commit/89dd1d65335689c73a78509689396888599bbe58.patch"; + hash = "sha256-hhWXcqNK3b3mXLCK7W0eXNWgP4lPSl6qgB59Fx8+yeA="; + }) + ]; + build-system = with python3Packages; [ hatchling hatch-requirements-txt diff --git a/pkgs/by-name/is/istat-menus/package.nix b/pkgs/by-name/is/istat-menus/package.nix new file mode 100644 index 000000000000..a7c124517615 --- /dev/null +++ b/pkgs/by-name/is/istat-menus/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenvNoCC, + fetchurl, + writeShellApplication, + curl, + common-updater-scripts, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "istat-menus"; + version = "7.10.2"; + + src = fetchurl { + url = "https://cdn.istatmenus.app/files/istatmenus${lib.versions.major finalAttrs.version}/versions/iStatMenus${finalAttrs.version}.zip"; + hash = "sha256-NDjIsCAxTcCo6APaWyuYmil8b0gzJEmSxFxqm2IQ5dU="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -r *.app "$out/Applications" + + runHook postInstall + ''; + + passthru.updateScript = lib.getExe (writeShellApplication { + name = "istatmenus-update-script"; + runtimeInputs = [ + curl + common-updater-scripts + ]; + text = '' + redirect_url="$(curl -s -L -f "https://download.bjango.com/istatmenus${lib.versions.major finalAttrs.version}/" -o /dev/null -w '%{url_effective}')" + version="''${redirect_url##*/}"; version="''${version#iStatMenus}"; version="''${version%.zip}" + update-source-version istat-menus "$version" + ''; + }); + + meta = { + changelog = "https://bjango.com/mac/istatmenus/versionhistory/"; + description = "iStat Menus is set of nine separate and highly configurable menu items that let you know exactly what's going on inside your Mac"; + homepage = "https://bjango.com/mac/istatmenus/"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ donteatoreo ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/is/istatmenus/package.nix b/pkgs/by-name/is/istatmenus/package.nix deleted file mode 100644 index a37a0c693ba8..000000000000 --- a/pkgs/by-name/is/istatmenus/package.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - writeShellApplication, - curl, - common-updater-scripts, - unzip, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "istatmenus"; - version = "7.02.10"; - - src = fetchurl { - url = "https://cdn.istatmenus.app/files/istatmenus${lib.versions.major finalAttrs.version}/versions/iStatMenus${finalAttrs.version}.zip"; - hash = "sha256-ckYIQsJ0QEsIpXRFo1xioSCOwEL06d0cJrATa1URMIQ="; - }; - - sourceRoot = "."; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/Applications" - cp -r *.app "$out/Applications" - - runHook postInstall - ''; - - passthru.updateScript = lib.getExe (writeShellApplication { - name = "istatmenus-update-script"; - runtimeInputs = [ - curl - common-updater-scripts - ]; - text = '' - redirect_url="$(curl -s -L -f "https://download.bjango.com/istatmenus${lib.versions.major finalAttrs.version}/" -o /dev/null -w '%{url_effective}')" - version="''${redirect_url##*/}"; version="''${version#iStatMenus}"; version="''${version%.zip}" - update-source-version istatmenus "$version" --file=./pkgs/by-name/is/istatmenus/package.nix - ''; - }); - - meta = { - changelog = "https://bjango.com/mac/istatmenus/versionhistory/"; - description = "iStat Menus is set of nine separate and highly configurable menu items that let you know exactly what's going on inside your Mac"; - homepage = "https://bjango.com/mac/istatmenus/"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ donteatoreo ]; - platforms = lib.platforms.darwin; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index 1a4b2f80e207..62143abf77c9 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.25.1"; + version = "1.26.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-DAr7JHZsop1+BuPKC5mD+9pL4JFEp6jjjeSvX+I9uH0="; + hash = "sha256-uoAnm2XNVESI4yiPpfO/Hkaz39QLwSpkwFpH1JF+ZJg="; }; - vendorHash = "sha256-dhAJEjKq1wfti2j2xt3NoQUoVRgowIKJhUfJxsFG5yw="; + vendorHash = "sha256-By0XPBjnJ35STNeuktmffTu/YGc3huHUgDYOpWgBIck="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/is/isync/package.nix b/pkgs/by-name/is/isync/package.nix new file mode 100644 index 000000000000..1a0864249264 --- /dev/null +++ b/pkgs/by-name/is/isync/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchgit, + pkg-config, + perl, + openssl, + db, + cyrus_sasl, + zlib, + perl538Packages, + autoreconfHook, + # Disabled by default as XOAUTH2 is an "OBSOLETE" SASL mechanism and this relies + # on a package that isn't really maintained anymore: + withCyrusSaslXoauth2 ? false, + cyrus-sasl-xoauth2, + makeWrapper, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "isync"; + version = "1.5.1"; + + src = fetchgit { + url = "https://git.code.sf.net/p/isync/isync"; + tag = "v${finalAttrs.version}"; + hash = "sha256-l0jL4CzAdFtQGekbywic1Kuihy3ZQi4ozhSEcbJI0t0="; + }; + + # Fixes "Fatal: buffer too small" error + # see https://sourceforge.net/p/isync/mailman/isync-devel/thread/87fsevvebj.fsf%40steelpick.2x.cz/ + env.NIX_CFLAGS_COMPILE = "-DQPRINTF_BUFF=4000"; + + autoreconfPhase = '' + echo "${finalAttrs.version}" > VERSION + ./autogen.sh + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + perl + ] ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ]; + buildInputs = [ + perl538Packages.TimeDate + openssl + db + cyrus_sasl + zlib + ]; + + postInstall = lib.optionalString withCyrusSaslXoauth2 '' + wrapProgram "$out/bin/mbsync" \ + --prefix SASL_PATH : "${ + lib.makeSearchPath "lib/sasl2" [ + cyrus-sasl-xoauth2 + cyrus_sasl.out + ] + }" + ''; + + meta = { + homepage = "http://isync.sourceforge.net/"; + # https://sourceforge.net/projects/isync/ + changelog = "https://sourceforge.net/p/isync/isync/ci/v${finalAttrs.version}/tree/NEWS"; + description = "Free IMAP and MailDir mailbox synchronizer"; + longDescription = '' + mbsync (formerly isync) is a command line application which synchronizes + mailboxes. Currently Maildir and IMAP4 mailboxes are supported. New + messages, message deletions and flag changes can be propagated both ways. + ''; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ primeos ]; + mainProgram = "mbsync"; + }; +}) diff --git a/pkgs/by-name/it/itch-dl/package.nix b/pkgs/by-name/it/itch-dl/package.nix index 9eaf7acdeb91..99fb664572e4 100644 --- a/pkgs/by-name/it/itch-dl/package.nix +++ b/pkgs/by-name/it/itch-dl/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "itch-dl"; - version = "0.5.2"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "DragoonAethis"; repo = "itch-dl"; tag = version; - hash = "sha256-MkhXM9CQXbVcnztMPnBscryXWSaSQUeoG6KtVuS8YEo="; + hash = "sha256-zwsiG38wOVi3pP0gQWkZqfAmdWKadjB65qiTg68tZWg="; }; nativeBuildInputs = with python3Packages; [ @@ -21,21 +21,20 @@ python3Packages.buildPythonApplication rec { ]; build-system = with python3Packages; [ - poetry-core + hatchling ]; dependencies = with python3Packages; [ beautifulsoup4 lxml - pydantic requests tqdm urllib3 ]; pythonRelaxDeps = [ - "pydantic" "urllib3" + "beautifulsoup4" ]; meta = { diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix index 12243e25da32..2fd490ef1896 100644 --- a/pkgs/by-name/it/iterm2/package.nix +++ b/pkgs/by-name/it/iterm2/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec { mkdir -p "$out/bin" cat << EOF > "$out/bin/iterm2" #!${stdenvNoCC.shell} - open -na "$APP_DIR" --args "$@" + open -na "$APP_DIR" --args "\$@" EOF chmod +x "$out/bin/iterm2" runHook postInstall diff --git a/pkgs/by-name/it/itgmania/package.nix b/pkgs/by-name/it/itgmania/package.nix index 9247d8596b47..930b8fb38aef 100644 --- a/pkgs/by-name/it/itgmania/package.nix +++ b/pkgs/by-name/it/itgmania/package.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "itgmania"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "itgmania"; repo = "itgmania"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-GzpsyyjR7NhgCQ9D7q8G4YU7HhV1C1es1C1355gHnV8="; + hash = "sha256-OGOvC7/NmEsWXVw4bFjqdT/Hg3Ypbwct//uWuW3/f1o="; }; nativeBuildInputs = [ @@ -88,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Fork of StepMania 5.1, improved for the post-ITG community"; platforms = lib.platforms.linux; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ftsimas ]; + maintainers = with lib.maintainers; [ + ftsimas + maxwell-lt + ]; mainProgram = "itgmania"; }; }) diff --git a/pkgs/by-name/it/itstool/package.nix b/pkgs/by-name/it/itstool/package.nix index 7ef080da6d19..78c196c15f3c 100644 --- a/pkgs/by-name/it/itstool/package.nix +++ b/pkgs/by-name/it/itstool/package.nix @@ -2,7 +2,10 @@ stdenv, lib, fetchurl, + fetchpatch, python3, + autoreconfHook, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -14,16 +17,29 @@ stdenv.mkDerivation rec { hash = "sha256-a5p80poSu5VZj1dQ6HY87niDahogf4W3TYsydbJ+h8o="; }; - strictDeps = true; - - nativeBuildInputs = [ - python3 - python3.pkgs.wrapPython + patches = [ + # https://github.com/itstool/itstool/pull/51 + (fetchpatch { + name = "fix-insufficiently-quoted-regular-expressions-pr51"; + url = "https://github.com/itstool/itstool/commit/19f9580f27aa261ea383b395fdef7e153f3f9e6d.patch"; + hash = "sha256-5J4mRXQu24o2rqVtaXN/ETgj6A8R0Ym+YkZhqhZTzIc="; + }) ]; - buildInputs = [ - python3 - python3.pkgs.libxml2 + strictDeps = true; + + postPatch = '' + # Do not let autoconf find Python, but set it directly. This fixes cross-compilation. + substituteInPlace configure.ac \ + --replace-fail 'AM_PATH_PYTHON([2.6])' "" \ + --replace-fail 'AC_MSG_ERROR(Python module $py_module is needed to run this package)' "" + substituteInPlace itstool.in \ + --replace-fail "@PYTHON@" "${python3.interpreter}" + ''; + + nativeBuildInputs = [ + autoreconfHook + python3.pkgs.wrapPython ]; pythonPath = [ @@ -34,6 +50,9 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { homepage = "https://itstool.org/"; description = "XML to PO and back again"; diff --git a/pkgs/by-name/iv/ivm/package.nix b/pkgs/by-name/iv/ivm/package.nix index 0b77216beae2..cf6312c0585e 100644 --- a/pkgs/by-name/iv/ivm/package.nix +++ b/pkgs/by-name/iv/ivm/package.nix @@ -60,7 +60,8 @@ rustPlatform.buildRustPackage (finalAttr: { description = "Cross-platform Inko version manager"; homepage = "https://github.com/inko-lang/ivm"; license = lib.licenses.mpl20; - maintainers = [ lib.maintainers.feathecutie ] ++ lib.teams.ngi.members; + maintainers = [ lib.maintainers.feathecutie ]; + teams = [ lib.teams.ngi ]; platforms = lib.platforms.unix; mainProgram = "ivm"; }; diff --git a/pkgs/by-name/iv/ivpn-ui/package.nix b/pkgs/by-name/iv/ivpn-ui/package.nix new file mode 100644 index 000000000000..7e7565e56838 --- /dev/null +++ b/pkgs/by-name/iv/ivpn-ui/package.nix @@ -0,0 +1,93 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + electron, + copyDesktopItems, + makeDesktopItem, + nix-update-script, + makeWrapper, + ivpn-service, +}: +let + version = "3.14.29"; +in +buildNpmPackage { + pname = "ivpn-ui"; + inherit version; + + src = fetchFromGitHub { + owner = "ivpn"; + repo = "desktop-app"; + tag = "v${version}"; + hash = "sha256-8JScty/sGyxzC2ojRpatHpCqEXZw9ksMortIhZnukoU="; + }; + + sourceRoot = "source/ui"; + + npmDepsHash = "sha256-2EsXYNo+rj2v+YkZT6ciEcDAirnEZ5MezFlf9zsb/os="; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + }; + + postBuild = '' + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + npm exec electron-builder -- \ + --dir \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron.version} \ + --config electron-builder.config.js + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/ivpn-ui + cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/ivpn-ui + + install -Dm644 $src/ui/References/Linux/ui/ivpnicon.svg $out/share/icons/hicolor/scalable/apps/ivpn-ui.svg + + makeWrapper ${lib.getExe electron} $out/bin/ivpn-ui \ + --prefix PATH : ${lib.makeBinPath [ ivpn-service ]} \ + --add-flags $out/share/ivpn-ui/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --inherit-argv0 + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ivpn-ui"; + type = "Application"; + desktopName = "IVPN"; + genericName = "VPN Client"; + comment = "UI interface for IVPN"; + icon = "ivpn-ui"; + exec = "ivpn-ui"; + categories = [ "Network" ]; + startupNotify = true; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "UI interface for IVPN"; + mainProgram = "ivpn-ui"; + homepage = "https://www.ivpn.net"; + downloadPage = "https://github.com/ivpn/desktop-app"; + changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ blenderfreaky ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix index 86b4dd7f86de..9e67a9d4ed7b 100644 --- a/pkgs/by-name/iw/iwd/package.nix +++ b/pkgs/by-name/iw/iwd/package.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "3.3"; + version = "3.6"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - hash = "sha256-+CoXoTlQu7ofXPueia1t1vpeH092fYBxLYB+xV4WNEs="; + hash = "sha256-JQfYZtdpJfIZWTbYYj07YWx4auAGQMiedIMpP5DyxSo="; }; outputs = [ diff --git a/pkgs/by-name/ix/ix/package.nix b/pkgs/by-name/ix/ix/package.nix deleted file mode 100644 index 93e4c68e7951..000000000000 --- a/pkgs/by-name/ix/ix/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - resholve, - fetchurl, - bash, - curl, -}: - -resholve.mkDerivation { - pname = "ix"; - version = "20190815"; - - src = fetchurl { - url = "http://ix.io/client"; - hash = "sha256-p/j/Nz7tzLJV7HgUwVsiwN1WxCx4Por+HyRgFTTRgnU="; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - install -Dm555 $src $out/bin/ix - substituteInPlace $out/bin/ix \ - --replace '$echo ' "" - - runHook postInstall - ''; - - solutions.default = { - scripts = [ "bin/ix" ]; - interpreter = "${lib.getExe bash}"; - inputs = [ curl ]; - }; - - meta = with lib; { - homepage = "http://ix.io"; - description = "Command line pastebin"; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - mainProgram = "ix"; - }; -} diff --git a/pkgs/by-name/j/j/package.nix b/pkgs/by-name/j/j/package.nix index 53d18a9254c1..b4354a1626ce 100644 --- a/pkgs/by-name/j/j/package.nix +++ b/pkgs/by-name/j/j/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "jsoftware"; repo = "jsource"; - rev = "${version}"; + tag = version; hash = "sha256-Afa2QzzgJYijcavurgGH/qwyofNn4rtFMIHzlqJwFGU="; }; diff --git a/pkgs/by-name/j4/j4-dmenu-desktop/package.nix b/pkgs/by-name/j4/j4-dmenu-desktop/package.nix index e35687e28b81..7675dc1203a2 100644 --- a/pkgs/by-name/j4/j4-dmenu-desktop/package.nix +++ b/pkgs/by-name/j4/j4-dmenu-desktop/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/enkore/j4-dmenu-desktop"; license = licenses.gpl3Only; mainProgram = "j4-dmenu-desktop"; - maintainers = with maintainers; [ ericsagnes ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/ja/jacktrip/package.nix b/pkgs/by-name/ja/jacktrip/package.nix index d03b5e8863c2..69ceba29c2aa 100644 --- a/pkgs/by-name/ja/jacktrip/package.nix +++ b/pkgs/by-name/ja/jacktrip/package.nix @@ -5,6 +5,7 @@ pkg-config, help2man, libjack2, + libsamplerate, dbus, qt6, meson, @@ -16,7 +17,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.5.1"; + version = "2.6.0"; pname = "jacktrip"; src = fetchFromGitHub { @@ -24,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "jacktrip"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-WXUqMKCfZ/ZQLKpfye5cwju4IynitcBPEJwlQ2/+aoo="; + hash = "sha256-3Ae84x3QL+dfoJJJ0+XrBgo1wKwNYrR9AVQCnahS1sE="; }; preConfigure = '' @@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtbase qt6.qtwayland libjack2 + libsamplerate dbus ]; @@ -56,16 +58,12 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - # Can't link to libsamplerate - # https://github.com/jacktrip/jacktrip/issues/1380 - mesonFlags = [ "-Dlibsamplerate=disabled" ]; - qmakeFlags = [ "jacktrip.pro" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix new file mode 100644 index 000000000000..17dabf41a899 --- /dev/null +++ b/pkgs/by-name/ja/jai/package.nix @@ -0,0 +1,50 @@ +{ + buildFHSEnv, + lib, + requireFile, + runCommand, + stdenv, + unzip, +}: +let + pname = "jai"; + minor = "2"; + patch = "012"; + version = "0.${minor}.${patch}"; + zipName = "jai-beta-${minor}-${patch}.zip"; + jai = stdenv.mkDerivation { + name = "jai"; + src = requireFile { + message = '' + The language is not yet public. If you are in the closed beta, download the zip file and run the following command: + nix-store --add-fixed sha256 ${zipName} + ''; + name = zipName; + sha256 = "sha256-1cUEQ+C3qwo3v4E2ioH2NcIH864Cay2dxQT+Yo/fZJ8="; + }; + nativeBuildInputs = [ unzip ]; + buildCommand = "unzip $src -d $out"; + }; + meta = { + description = "Powerful language to write efficient reliable software in simple ways"; + license = lib.licenses.unfree; + mainProgram = "jai"; + maintainers = with lib.maintainers; [ samestep ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + }; +in +if stdenv.isLinux then + buildFHSEnv { + inherit meta pname version; + targetPkgs = pkgs: [ pkgs.zlib ]; + runScript = "${jai}/jai/bin/jai-linux"; + } +else + runCommand "jai" { inherit meta pname version; } '' + mkdir -p $out/bin + ln -s ${jai}/jai/bin/jai-macos $out/bin/jai + '' diff --git a/pkgs/by-name/ja/jailer/package.nix b/pkgs/by-name/ja/jailer/package.nix index 3f465f002c01..908b1f2decec 100644 --- a/pkgs/by-name/ja/jailer/package.nix +++ b/pkgs/by-name/ja/jailer/package.nix @@ -1,34 +1,28 @@ { lib, + stdenv, + fetchFromGitHub, ant, copyDesktopItems, - fetchFromGitHub, jdk, jre, makeDesktopItem, makeWrapper, - stdenv, stripJavaArchivesHook, wrapGAppsHook4, }: + stdenv.mkDerivation (finalAttrs: { pname = "jailer"; - version = "16.2"; + version = "16.6.2"; src = fetchFromGitHub { owner = "Wisser"; repo = "Jailer"; - rev = "bc00c6883bac0d09b549e35a10e202da477e4cb1"; - hash = "sha256-nXxTKbhvrBlorNqiF3wZDEgf1VrBamWw8ZSQSUqpGT8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-CeehX+btGexbFFD3p+FVmzXpH0bVWMW9Qdu5q6MJ5lw="; }; - buildPhase = '' - runHook preBuild - rm jailer.jar - ant - runHook postBuild - ''; - nativeBuildInputs = [ ant jdk @@ -38,6 +32,15 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems ]; + buildPhase = '' + runHook preBuild + + rm jailer.jar + ant + + runHook postBuild + ''; + installPhase = '' runHook preInstall @@ -82,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tool for database subsetting and relational data browsing"; license = lib.licenses.asl20; homepage = "https://github.com/Wisser/Jailer"; - changelog = "https://github.com/Wisser/Jailer/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/Wisser/Jailer/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ guillaumematheron ]; mainProgram = "jailer"; }; diff --git a/pkgs/by-name/ja/jameica/package.nix b/pkgs/by-name/ja/jameica/package.nix new file mode 100644 index 000000000000..671254fdad4b --- /dev/null +++ b/pkgs/by-name/ja/jameica/package.nix @@ -0,0 +1,135 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeDesktopItem, + makeWrapper, + wrapGAppsHook3, + stripJavaArchivesHook, + ant, + jdk, + jre, + gtk2, + glib, + libXtst, +}: + +let + _version = "2.10.4"; + _build = "487"; + version = "${_version}-${_build}"; + + swtSystem = + if stdenv.hostPlatform.system == "i686-linux" then + "linux" + else if stdenv.hostPlatform.system == "x86_64-linux" then + "linux64" + else if stdenv.hostPlatform.system == "aarch64-linux" then + "linux-arm64" + else if stdenv.hostPlatform.system == "x86_64-darwin" then + "macos64" + else if stdenv.hostPlatform.system == "aarch64-darwin" then + "macos-aarch64" + else + throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + desktopItem = makeDesktopItem { + name = "jameica"; + exec = "jameica"; + comment = "Free Runtime Environment for Java Applications."; + desktopName = "Jameica"; + genericName = "Jameica"; + icon = "jameica"; + categories = [ "Office" ]; + }; +in +stdenv.mkDerivation rec { + pname = "jameica"; + inherit version; + + src = fetchFromGitHub { + owner = "willuhn"; + repo = "jameica"; + rev = "V_${builtins.replaceStrings [ "." ] [ "_" ] _version}_BUILD_${_build}"; + hash = "sha256-MSVSd5DyVL+dcfTDv1M99hxickPwT2Pt6QGNsu6DGZI="; + }; + + nativeBuildInputs = [ + ant + jdk + wrapGAppsHook3 + makeWrapper + stripJavaArchivesHook + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + gtk2 + glib + libXtst + ]; + + dontWrapGApps = true; + + # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries + # and is not able to build the application itself + buildPhase = '' + runHook preBuild + ant -f build -Dsystem.version=${version} init compile jar ${lib.optionalString stdenv.hostPlatform.isDarwin "zip lib"} + runHook postBuild + ''; + + installPhase = + '' + runHook preInstall + + mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,jameica-${version},java}/ + + # copy libraries except SWT + cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/jameica-${version}/ + # copy platform-specific SWT + cp lib/swt/${swtSystem}/swt.jar $out/share/jameica-${version}/ + + install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/ + install -Dm644 plugin.xml $out/share/java/ + install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png + cp ${desktopItem}/share/applications/* $out/share/applications/ + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + + # Create .app bundle for macOS + mkdir -p $out/Applications + chmod +x releases/${_version}-${_build}-${_build}/tmp/jameica.app/jameica*.sh + cp -r releases/${_version}-${_build}-${_build}/tmp/jameica.app $out/Applications/Jameica.app + '' + + '' + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${jre}/bin/java $out/bin/jameica \ + --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${lib.optionalString stdenv.hostPlatform.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''} de.willuhn.jameica.Main" \ + --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg (lib.makeLibraryPath buildInputs)} \ + --chdir "$out/share/java/" \ + "''${gappsWrapperArgs[@]}" + ''; + + meta = with lib; { + homepage = "https://www.willuhn.de/products/jameica/"; + description = "Free Runtime Environment for Java Applications"; + longDescription = '' + Runtime Environment for plugins like Hibiscus (HBCI Online Banking), + SynTAX (accounting) and JVerein (club management). + ''; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ + flokli + r3dl3g + ]; + mainProgram = "jameica"; + }; +} diff --git a/pkgs/by-name/ja/jamin/package.nix b/pkgs/by-name/ja/jamin/package.nix index ff055c731049..f8fc0b8fe939 100644 --- a/pkgs/by-name/ja/jamin/package.nix +++ b/pkgs/by-name/ja/jamin/package.nix @@ -13,19 +13,20 @@ perlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.95.0"; pname = "jamin"; src = fetchurl { - url = "mirror://sourceforge/jamin/jamin-${version}.tar.gz"; - sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; + url = "mirror://sourceforge/jamin/jamin-${finalAttrs.version}.tar.gz"; + hash = "sha256-di/uiGgvJ4iORt+wE6mrXnmFM7m2dkP/HXdgUBk5uzw="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ fftwFloat @@ -44,17 +45,19 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: jamin-preferences.o:/build/jamin-0.95.0/src/hdeq.h:64: multiple definition of # `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + # `incompatible-pointer-types` fixes build on GCC 14, otherwise fails with: + # error: passing argument 4 of 'lo_server_thread_add_method' from incompatible pointer type + env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-error=incompatible-pointer-types"; postInstall = '' wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa ''; - meta = with lib; { + meta = { homepage = "https://jamin.sourceforge.net"; description = "JACK Audio Mastering interface"; - license = licenses.gpl2; - maintainers = [ maintainers.nico202 ]; - platforms = platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.nico202 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index 8f2b920db324..65d8ac7463e5 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -6,10 +6,10 @@ let pname = "jan"; - version = "0.5.16"; + version = "0.5.17"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-oKJSX8VuCS/CzIroYYzuEtyfviv3naxYr8jpfUccxBg="; + hash = "sha256-Gvjkq4GWC7aYDrlTF7496C5IlcT+vzU+soumrVwux/I="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix index 991c3543087f..3bbf58338bc9 100644 --- a/pkgs/by-name/ja/jaq/package.nix +++ b/pkgs/by-name/ja/jaq/package.nix @@ -8,22 +8,22 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; tag = "v${version}"; - hash = "sha256-8RP895GXoQOgMAfkfHIxCm0R2lmG+W3/H+xjcqSc3JM="; + hash = "sha256-mVC2aggfcEpCtriuz/s4JL8mYkrlyAQLnaN5vyfcW3s="; }; useFetchCargoVendor = true; - cargoHash = "sha256-movx0ahUD20OvLPZiLfXwN5tEkytUk9Q3cOTV1SJcvw="; + cargoHash = "sha256-ZZLp3Vwq013MPxKy9gTZ1yMi2O0QcDPgFw5YnrYt90I="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ja/jasmin-compiler/package.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix index 00ad828a85f6..c9d3350ea293 100644 --- a/pkgs/by-name/ja/jasmin-compiler/package.nix +++ b/pkgs/by-name/ja/jasmin-compiler/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2025.02.0"; + version = "2025.02.1"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-xLTMdyFyZGlnhuZ1iOg8Tgm7aLijg5lceJxgLdEHw+Q="; + hash = "sha256-7WGEtsTJ4/R+30gzFlYpCvZrZyziZ6gDCemWEFX+5hk="; }; nativeBuildInputs = with ocamlPackages; [ diff --git a/pkgs/by-name/ja/jasper-gtk-theme/package.nix b/pkgs/by-name/ja/jasper-gtk-theme/package.nix new file mode 100644 index 000000000000..33ffeaeefa71 --- /dev/null +++ b/pkgs/by-name/ja/jasper-gtk-theme/package.nix @@ -0,0 +1,102 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gnome-themes-extra, + gtk-engine-murrine, + jdupes, + sassc, + themeVariants ? [ ], # default: teal + colorVariants ? [ ], # default: all + sizeVariants ? [ ], # default: standard + tweaks ? [ ], +}: + +let + pname = "jasper-gtk-theme"; + +in +lib.checkListOfEnum "${pname}: theme variants" + [ + "default" + "purple" + "pink" + "red" + "orange" + "yellow" + "green" + "blue" + "grey" + "all" + ] + themeVariants + lib.checkListOfEnum + "${pname}: color variants" + [ "standard" "light" "dark" ] + colorVariants + lib.checkListOfEnum + "${pname}: size variants" + [ "standard" "compact" ] + sizeVariants + lib.checkListOfEnum + "${pname}: tweaks" + [ + "nord" + "dracula" + "black" + "macos" + ] + tweaks + + stdenvNoCC.mkDerivation + rec { + inherit pname; + version = "0-unstable-2025-04-02"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = "Jasper-gtk-theme"; + rev = "71cb99a6618d839b1058cb8e6660a3b2f63aca70"; + hash = "sha256-ZWPUyVszDPUdzttAJuIA9caDpP4SQ7mIbCoczxwvsus="; + }; + + nativeBuildInputs = [ + jdupes + sassc + ]; + + buildInputs = [ + gnome-themes-extra + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + name= HOME="$TMPDIR" ./install.sh \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ + --dest $out/share/themes + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + meta = { + description = "Modern and clean Gtk theme"; + homepage = "https://github.com/vinceliuice/Jasper-gtk-theme"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; + }; + } diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index a7cd597c223f..99326fed642d 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -6,7 +6,6 @@ libGL, libheif, libjpeg, - darwin, pkg-config, stdenv, enableHEIFCodec ? true, @@ -16,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jasper"; - version = "4.2.4"; + version = "4.2.5"; src = fetchFromGitHub { owner = "jasper-software"; repo = "jasper"; rev = "version-${finalAttrs.version}"; - hash = "sha256-YliWVuNEtq/Rgra+WnorSOFoAYwYmPmPRv0r734FJ1c="; + hash = "sha256-PjgglP4mKW1eOJ7QgUmc4KNsp/d9ubJBWr4CLcQAyRA="; }; outputs = [ @@ -50,9 +49,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableOpenGL [ libglut libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa ]; # Since "build" already exists and is populated, cmake tries to use it, diff --git a/pkgs/by-name/ja/java-service-wrapper/package.nix b/pkgs/by-name/ja/java-service-wrapper/package.nix index c85a95861fc6..8d234fc7ecad 100644 --- a/pkgs/by-name/ja/java-service-wrapper/package.nix +++ b/pkgs/by-name/ja/java-service-wrapper/package.nix @@ -2,19 +2,20 @@ lib, stdenv, fetchurl, - jdk, ant, + jdk, + stripJavaArchivesHook, cunit, ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "java-service-wrapper"; - version = "3.5.60"; + version = "3.6.0"; src = fetchurl { - url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - hash = "sha256-h3iW4U83XAyIHDpQ+O6RC8ZQSziPu/5lEo5512PQhxc="; + url = "https://wrapper.tanukisoftware.com/download/${finalAttrs.version}/wrapper_${finalAttrs.version}_src.tar.gz"; + hash = "sha256-b9H7teM3zIXvuek1UNlxlzjxPNPy82ElATAGT/Fvjgw="; }; strictDeps = true; @@ -27,11 +28,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ant jdk + stripJavaArchivesHook ]; postConfigure = '' substituteInPlace default.properties \ - --replace "javac.target.version=1.4" "javac.target.version=8" + --replace-fail "javac.target.version=1.4" "javac.target.version=8" ''; buildPhase = '' @@ -60,7 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Enables a Java Application to be run as a Windows Service or Unix Daemon"; homepage = "https://wrapper.tanukisoftware.com/"; - changelog = "https://wrapper.tanukisoftware.com/doc/english/release-notes.html#${version}"; + changelog = "https://wrapper.tanukisoftware.com/doc/english/release-notes.html#${finalAttrs.version}"; license = licenses.gpl2Only; platforms = [ "x86_64-linux" @@ -74,4 +76,4 @@ stdenv.mkDerivation rec { # Tracking issue: https://github.com/NixOS/nixpkgs/issues/281557 broken = stdenv.hostPlatform.isMusl; }; -} +}) diff --git a/pkgs/by-name/ja/javascript-typescript-langserver/package.nix b/pkgs/by-name/ja/javascript-typescript-langserver/package.nix index 46d6136d49ee..a68a6761872d 100644 --- a/pkgs/by-name/ja/javascript-typescript-langserver/package.nix +++ b/pkgs/by-name/ja/javascript-typescript-langserver/package.nix @@ -17,6 +17,10 @@ buildNpmPackage rec { npmDepsHash = "sha256-nHGTi1aH9YY01dzBeNyUEUEswrdjZPWaoycDVZZmIAA="; + postInstall = '' + find $out/lib/node_modules -xtype l -delete + ''; + meta = { description = "JavaScript and TypeScript code intelligence through the Language Server Protocol"; homepage = "https://github.com/sourcegraph/javascript-typescript-langserver"; diff --git a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix index ad02c7f3258c..cdbc29fd3aab 100644 --- a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix +++ b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "jawiki-all-titles-in-ns0"; - version = "0-unstable-2025-03-01"; + version = "0-unstable-2025-05-01"; src = fetchFromGitHub { owner = "musjj"; repo = "jawiki-archive"; - rev = "e8e2b841c48b4475cc2ae99c4635ea140aa630d6"; - hash = "sha256-TJMOjayu9lWxg6j9HurXbxGc9RrCb/arXkVSezR2kgc="; + rev = "11011d2a5a27251a75a0ce822ed05fa9be7bf878"; + hash = "sha256-ZTCW14kHfewzCJuT6afGgSi3ZwC4cGiqecEma8Fj2mk="; }; installPhase = '' diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index e40d01930184..4c9529d40350 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "jay"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = "jay"; rev = "v${version}"; - sha256 = "sha256-dUp3QYno2rB3wuJmSvBpCqowSpfMQIJqUYc0lDVqVPA="; + sha256 = "sha256-wrA/UGxhIUMc2T+0/UNKS9iN44pe9ap2l+xL8ZE5jsI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ovQxpUrRZAP1lHlsObfbIsgIjgMp+BLf6Ul+mzDVN5o="; + cargoHash = "sha256-2LfEktaHB+uIQSWeSFG+v7+7wfkGlDz54m7P4KttPLI="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index 20cd5b2a058d..a5e97f26f2d5 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -8,6 +8,7 @@ libvorbis, openal, SDL2, + libGL, zlib, versionCheckHook, gitUpdater, @@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; buildInputs = [ + libGL libopenmpt libvorbis openal diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix index 14ab60f23c56..c044bad5f373 100644 --- a/pkgs/by-name/jb/jbang/package.nix +++ b/pkgs/by-name/jb/jbang/package.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "0.125.1"; + version = "0.126.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-5t1tvBWrqbJFsLpvPx+fU0/5CBFkzCYVGbXq/HaeRHc="; + sha256 = "sha256-lFb8j1hl47buUKZjFNuSaQVr5IW++eame5vPi2Vi1o8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/jb/jbigkit/package.nix b/pkgs/by-name/jb/jbigkit/package.nix index 2834d246b87c..e9605d382ba9 100644 --- a/pkgs/by-name/jb/jbigkit/package.nix +++ b/pkgs/by-name/jb/jbigkit/package.nix @@ -89,6 +89,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + # Testing deletes all files on each test, causes test failures. + enableParallelChecking = false; + meta = { description = "Software implementation of the JBIG1 data compression standard"; homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; diff --git a/pkgs/by-name/jb/jbofihe/fix-gcc14-errors.patch b/pkgs/by-name/jb/jbofihe/fix-gcc14-errors.patch new file mode 100644 index 000000000000..0c95bf305c84 --- /dev/null +++ b/pkgs/by-name/jb/jbofihe/fix-gcc14-errors.patch @@ -0,0 +1,37 @@ +diff --git a/add_trace_to_tabc.pl b/add_trace_to_tabc.pl +index 04be787..3186075 100644 +--- a/add_trace_to_tabc.pl ++++ b/add_trace_to_tabc.pl +@@ -15,11 +15,11 @@ + # COPYRIGHT + + print <) { +diff --git a/dfasyn/n2d.h b/dfasyn/n2d.h +index b2159ba..6c56abb 100644 +--- a/dfasyn/n2d.h ++++ b/dfasyn/n2d.h +@@ -181,6 +181,10 @@ Expr * new_xor_expr(Expr *c1, Expr *c2); + Expr * new_cond_expr(Expr *c1, Expr *c2, Expr *c3); + Expr * new_sym_expr(char *sym_name); + ++int yyparse(void); ++void yyerror(char *); ++int yylex(void); ++ + void define_symbol(Evaluator *x, char *name, Expr *e); + void define_result(Evaluator *x, char *string, Expr *e, int early); + void define_symresult(Evaluator *x, char *string, Expr *e, int early); + diff --git a/pkgs/by-name/jb/jbofihe/package.nix b/pkgs/by-name/jb/jbofihe/package.nix index 199ee632c19c..8bd66a04af6d 100644 --- a/pkgs/by-name/jb/jbofihe/package.nix +++ b/pkgs/by-name/jb/jbofihe/package.nix @@ -7,17 +7,23 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jbofihe"; version = "0.43"; src = fetchFromGitHub { owner = "lojban"; repo = "jbofihe"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1xx7x1256sjncyzx656jl6jl546vn8zz0siymqalz6v9yf341p98"; }; + patches = [ + # fix build with gcc14: + # https://github.com/lojban/jbofihe/pull/19 + ./fix-gcc14-errors.patch + ]; + nativeBuildInputs = [ bison flex @@ -31,10 +37,10 @@ stdenv.mkDerivation rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Parser & analyser for Lojban"; homepage = "https://github.com/lojban/jbofihe"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ chkno ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ chkno ]; }; -} +}) diff --git a/pkgs/by-name/jb/jbrowse/package.nix b/pkgs/by-name/jb/jbrowse/package.nix index 9afec3edf96f..2bf37b7f2f25 100644 --- a/pkgs/by-name/jb/jbrowse/package.nix +++ b/pkgs/by-name/jb/jbrowse/package.nix @@ -6,11 +6,11 @@ let pname = "jbrowse"; - version = "3.2.0"; + version = "3.4.0"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-NgqihP3l5a2nrw4LeykypLPDnUmD6MEHSM+hPndhqFI="; + sha256 = "sha256-u7ZVHn1/HUyV27yGx0HZeWgdm4NuVK8ZH0UogrmbxOo="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/jc/jcal/package.nix b/pkgs/by-name/jc/jcal/package.nix index a2b30410ddd0..7bcfdfa47387 100644 --- a/pkgs/by-name/jc/jcal/package.nix +++ b/pkgs/by-name/jc/jcal/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "jcal"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "fzerorubigd"; repo = "jcal"; rev = "v${version}"; - sha256 = "0m3g3rf0ycv2dsfn9y2472fa3r0yla8pfqk6gq00nrscsc3pp4zf"; + sha256 = "sha256-vJc5uijZlvohEtiS03LYlqtswVE38S9/ejlHrmZ0wqA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/jd/jd-diff-patch/package.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix index 873e8510e699..9169f5eecd16 100644 --- a/pkgs/by-name/jd/jd-diff-patch/package.nix +++ b/pkgs/by-name/jd/jd-diff-patch/package.nix @@ -4,32 +4,35 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "jd-diff-patch"; - version = "2.1.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "josephburnett"; repo = "jd"; - rev = "v${version}"; - sha256 = "sha256-chCxbbRZEE29KVnTQWID889kJ2H4qJGVL+vsxzr6VtA="; + rev = "v${finalAttrs.version}"; + hash = "sha256-ucSJfzkcOpLfI2IcsnKvjpR/hwHNne+liE1b/L/H96g="; }; + sourceRoot = "${finalAttrs.src.name}/v2"; + # not including web ui excludedPackages = [ "gae" "pack" ]; - vendorHash = null; + vendorHash = "sha256-Ol+9YwtJ5P6au1aW2ss9mrU9l5G3iBviX5q1qC0K+vc="; - meta = with lib; { + meta = { description = "Commandline utility and Go library for diffing and patching JSON values"; homepage = "https://github.com/josephburnett/jd"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bryanasdev000 + juliusfreudenberger ]; mainProgram = "jd"; }; -} +}) diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix index 28046486c6e9..c7e7e253cdfa 100644 --- a/pkgs/by-name/jd/jdt-language-server/package.nix +++ b/pkgs/by-name/jd/jdt-language-server/package.nix @@ -7,15 +7,15 @@ }: let - timestamp = "202502271238"; + timestamp = "202504011455"; in stdenv.mkDerivation (finalAttrs: { pname = "jdt-language-server"; - version = "1.45.0"; + version = "1.46.1"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz"; - hash = "sha256-wJ556Vi+tc5B+ztQl67ARVKYvIihTI5BRitX7bKBJ5c="; + hash = "sha256-9DX99ts6oNFZjvDxH4C7IOCeZwCQATgnGcMT7/B94Cw="; }; sourceRoot = "."; diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix index 005a35d26f03..d419d6b38f42 100644 --- a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix +++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix @@ -5,7 +5,7 @@ }: let - version = "7.0.2-9"; + version = "7.1.1-1"; in (ffmpeg_7-full.override { @@ -14,7 +14,7 @@ in owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - hash = "sha256-zaBu/hhFIMjneb7yUzToaJJAaSptxLld8zOvfGckHLY="; + hash = "sha256-gu6+fOCcrGIZiR2hMl9tk97OmCmewOVJibz52DNpL1Q="; }; }).overrideAttrs (old: { diff --git a/pkgs/by-name/je/jellyfin-rpc/package.nix b/pkgs/by-name/je/jellyfin-rpc/package.nix index 67a7242fac58..4fba1646cc11 100644 --- a/pkgs/by-name/je/jellyfin-rpc/package.nix +++ b/pkgs/by-name/je/jellyfin-rpc/package.nix @@ -8,22 +8,23 @@ rustPlatform.buildRustPackage rec { pname = "jellyfin-rpc"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitHub { owner = "Radiicall"; repo = "jellyfin-rpc"; tag = version; - hash = "sha256-cEHJJXMfXKDPKah2wDAdcO0SXO4ZPL/SqFbxONmI57M="; + hash = "sha256-zKqP6Wt38ckqCPDS1oncmx92lZJm2oeb3bfpwVc6fUc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-CWl/hVtwv2Q4/GwJJGTHCxnMxj8ZR9wPmLTlai0MyBA="; + cargoHash = "sha256-k9dGz+1HGcQoDMyqmJ1hEYklfYHibo1PI5jHEe0mr+w="; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - doInstallCheck = true; + # TODO: Re-enable when upstream bumps the version number internally + # nativeInstallCheckInputs = [ + # versionCheckHook + # ]; + # doInstallCheck = true; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index 8d9dd0f657dc..c9d29fb19d82 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -13,7 +13,7 @@ }: buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.10.6"; + version = "10.10.7"; src = assert version == jellyfin.version; @@ -21,7 +21,7 @@ buildNpmPackage rec { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-A6Y4tAJtocfRZ8R8Sio1RhgIDfvRG4Mk2JMhz2QZNwo="; + hash = "sha256-jX9Qut8YsJRyKI2L7Aww4+6G8z741WzN37CUx3KWQfY="; }; nodejs = nodejs_20; # does not build with 22 @@ -31,7 +31,7 @@ buildNpmPackage rec { --replace-fail "git describe --always --dirty" "echo ${src.rev}" \ ''; - npmDepsHash = "sha256-ggRbZ7vjFe4KG+amcLEcjiZMtUc0JwSZoiKE9qwy0y4="; + npmDepsHash = "sha256-nfvqVByD3Kweq+nFJQY4R2uRX3mx/qJvGFiKiOyMUdw="; preBuild = '' # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart diff --git a/pkgs/by-name/je/jellyfin/nuget-deps.json b/pkgs/by-name/je/jellyfin/nuget-deps.json index 699cc8c76b3a..36a1b036aea9 100644 --- a/pkgs/by-name/je/jellyfin/nuget-deps.json +++ b/pkgs/by-name/je/jellyfin/nuget-deps.json @@ -121,8 +121,8 @@ }, { "pname": "LrcParser", - "version": "2024.728.2", - "hash": "sha256-fv0OkCfXEcXJqZcl70Ch3PduuomghPC2LscHU7nFtnc=" + "version": "2025.228.1", + "hash": "sha256-1p471WX25rYpb0P/q3sEj35vLLa8QvokAbLO47D7wTM=" }, { "pname": "MetaBrainz.Common", @@ -1246,8 +1246,8 @@ }, { "pname": "z440.atl.core", - "version": "6.16.0", - "hash": "sha256-J8Orzt/H84IscHZ9p7hEja7bkweuLsZNqu9XzmUjQM0=" + "version": "6.20.0", + "hash": "sha256-8LdLU2wgdR21bEXTBw7+RdbLYBM0vHRZhKv2ZpiVL44=" }, { "pname": "zlib.net-mutliplatform", diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index 487c6fd34ecd..8c241d5f237a 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.10.6"; # ensure that jellyfin-web has matching version + version = "10.10.7"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - hash = "sha256-QFXZtmdR07xIjh4wKgbx1usXgRg5X0jfzzLjsxKMniU="; + hash = "sha256-GWpzX8DvCafHb5V9it0ZPTXKm+NbLS7Oepe/CcMiFuI="; }; propagatedBuildInputs = [ sqlite ]; diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix index ec60dee5694d..608d73029486 100644 --- a/pkgs/by-name/je/jellyseerr/package.nix +++ b/pkgs/by-name/je/jellyseerr/package.nix @@ -6,6 +6,7 @@ makeWrapper, nodejs_22, python3, + python3Packages, sqlite, nix-update-script, }: @@ -16,24 +17,25 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jellyseerr"; - version = "2.3.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "Fallenbagel"; repo = "jellyseerr"; tag = "v${finalAttrs.version}"; - hash = "sha256-vAMuiHcf13CDyOB0k36DXUk+i6K6h/R7dmBLJsMkzNA="; + hash = "sha256-EbBvgaTTMA4B7uBwiftIy54oo0K5hCvIAWhBHjeM5WU="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-iSzs+lMQzcFjUz4K3rYP0I6g/wVz6u49FSQuPHXbVRM="; + hash = "sha256-4odVuAhjc9lUxorWOqPd2ODgexk5PDSS2HtFyq0csU0="; }; buildInputs = [ sqlite ]; nativeBuildInputs = [ python3 + python3Packages.distutils nodejs makeWrapper pnpm.configHook @@ -63,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall mkdir -p $out/share - cp -r -t $out/share .next node_modules dist public package.json overseerr-api.yml + cp -r -t $out/share .next node_modules dist public package.json jellyseerr-api.yml runHook postInstall ''; diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index 818724a409bb..aac9207c2697 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchCrate, fetchpatch, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,10 +25,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Simple CLI generation tool for creating large datasets"; mainProgram = "jen"; diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index e76fe43fea9c..f53773dc176b 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.492.2"; + version = "2.492.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-rmD71fB8pM1COkc37XHztU7PFGZruYoMv/anc1QMInU="; + hash = "sha256-kMz1VhM8Nv33ZTrXEPANJIvyiV+fvCbM7g4tO6aBsB8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/je/jet-pilot/package.nix b/pkgs/by-name/je/jet-pilot/package.nix index 2798f4aed6c9..fd467b654bf5 100644 --- a/pkgs/by-name/je/jet-pilot/package.nix +++ b/pkgs/by-name/je/jet-pilot/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "jet-pilot"; - version = "1.31.1"; + version = "1.35.0"; src = fetchurl { - url = "https://github.com/unxsist/jet-pilot/releases/download/v${version}/jet-pilot_${version}_amd64.AppImage"; - hash = "sha256-FKrqWhFX6we+NRIO7wcqkjlDj7oy0zrIhAXTOAoYxNw="; + url = "https://github.com/unxsist/jet-pilot/releases/download/v${version}/JET.Pilot_${version}_amd64.AppImage"; + hash = "sha256-W1VRV29ZV8nD3wAcSNAsWguN8s+zio0lsVaZwAnCOwE="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index f9985c5bf3ad..6a5c0eacbedf 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -1,89 +1,116 @@ { - stdenv, lib, - fetchzip, - copyDesktopItems, - makeWrapper, - runCommand, + stdenv, appimageTools, + fetchzip, + fetchurl, + makeWrapper, icu, - genericUpdater, - writeShellScript, - jq, + libappindicator-gtk3, + undmg, }: + let pname = "jetbrains-toolbox"; - version = "2.5.4.38621"; + version = "2.6.1.40902"; - src = fetchzip { - url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - hash = "sha256-FQTw6LPLJV+lV546rFOi/503PuErJs4T5q9MNWwGYEs="; - stripRoot = false; - }; - - appimageContents = - runCommand "${pname}-extracted" - { - nativeBuildInputs = [ appimageTools.appimage-exec ]; - } - '' - appimage-exec.sh -x $out ${src}/jetbrains-toolbox-${version}/jetbrains-toolbox - - # JetBrains ship a broken desktop file. Despite registering a custom - # scheme handler for jetbrains:// URLs, they never mark the command as - # being suitable for passing URLs to. Ergo, the handler never receives - # its payload. This causes various things to break, including login. - # Reported upstream at: https://youtrack.jetbrains.com/issue/TBX-11478/ - sed -Ei '/^Exec=/s/( %U)?$/ %U/' $out/jetbrains-toolbox.desktop - ''; - - appimage = appimageTools.wrapAppImage { - inherit pname version; - src = appimageContents; - }; -in -stdenv.mkDerivation { - inherit - pname - version - src - appimage - ; - - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ]; - - installPhase = '' - runHook preInstall - - install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg - makeWrapper ${appimage}/bin/jetbrains-toolbox $out/bin/jetbrains-toolbox \ - --append-flags "--update-failed" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ icu ]} - - runHook postInstall - ''; - - desktopItems = [ "${appimageContents}/jetbrains-toolbox.desktop" ]; - - # Disabling the tests, this seems to be very difficult to test this app. - doCheck = false; - - passthru.updateScript = genericUpdater { - versionLister = writeShellScript "jetbrains-toolbox-versionLister" '' - curl -Ls 'https://data.services.jetbrains.com/products?code=TBA&release.type=release' \ - | ${lib.getExe jq} -r '.[] | .releases | flatten[] | .build' - ''; - }; + updateScript = ./update.sh; meta = { description = "Jetbrains Toolbox"; homepage = "https://jetbrains.com/"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ AnatolyPopov ]; - platforms = [ "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "aarch64-darwin" + "x86_64-linux" + "x86_64-darwin" + ]; mainProgram = "jetbrains-toolbox"; }; -} + + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + linux = appimageTools.wrapAppImage rec { + inherit pname version meta; + + source = + let + arch = selectSystem { + x86_64-linux = ""; + aarch64-linux = "-arm64"; + }; + in + fetchzip { + url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}${arch}.tar.gz"; + hash = selectSystem { + x86_64-linux = "sha256-P4kv6ca6mGtl334HKNkdo9Iib/Cgu3ROrbQKlQqxUj4="; + aarch64-linux = "sha256-mG8GAVPi2I0A13rKhXoXxiRIHK1QOWPv4gZxfm0+DKs="; + }; + }; + + src = appimageTools.extractType2 { + inherit pname version; + src = source + "/jetbrains-toolbox"; + postExtract = '' + patchelf --add-rpath ${lib.makeLibraryPath [ icu ]} $out/jetbrains-toolbox + ''; + }; + + nativeBuildInputs = [ makeWrapper ]; + + extraInstallCommands = '' + install -Dm644 ${src}/jetbrains-toolbox.desktop $out/share/applications/jetbrains-toolbox.desktop + install -Dm644 ${src}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg + wrapProgram $out/bin/jetbrains-toolbox \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libappindicator-gtk3 ]} \ + --append-flags "--update-failed" + ''; + + passthru = { + src = source; + inherit updateScript; + }; + }; + + darwin = stdenv.mkDerivation (finalAttrs: { + inherit pname version meta; + + src = + let + arch = selectSystem { + x86_64-darwin = ""; + aarch64-darwin = "-arm64"; + }; + in + fetchurl { + url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${finalAttrs.version}${arch}.dmg"; + hash = selectSystem { + x86_64-darwin = "sha256-Dw1CqthgvKIlHrcQIoOpYbAG5c6uvq/UgzaO4n25YJY="; + aarch64-darwin = "sha256-b/z8Pq8h6n34junSMyxRS3Y/TQ3tu05Bh77xlvMvEtI="; + }; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "JetBrains Toolbox.app"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications $out/bin + cp -r . $out/Applications/"JetBrains Toolbox.app" + ln -s $out/Applications/"JetBrains Toolbox.app"/Contents/MacOS/jetbrains-toolbox $out/bin/jetbrains-toolbox + + runHook postInstall + ''; + + passthru = { + inherit updateScript; + }; + }); +in +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/je/jetbrains-toolbox/update.sh b/pkgs/by-name/je/jetbrains-toolbox/update.sh new file mode 100755 index 000000000000..a6b1d812c9d9 --- /dev/null +++ b/pkgs/by-name/je/jetbrains-toolbox/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix curl coreutils jq common-updater-scripts + +set -eou pipefail + +latestVersion=$(curl -Ls 'https://data.services.jetbrains.com/products?code=TBA&release.type=release' | jq -r '.[0].releases | flatten | .[0].build') +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; jetbrains-toolbox.version or (lib.getVersion jetbrains-toolbox)" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +linux_systems=( + "x86_64-linux:" + "aarch64-linux:-arm64" +) + +for entry in "${linux_systems[@]}"; do + arch="${entry%%:*}" + suffix="${entry#*:}" + prefetch=$(nix-prefetch-url --unpack "https://download.jetbrains.com/toolbox/jetbrains-toolbox-$latestVersion$suffix.tar.gz") + hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) + update-source-version jetbrains-toolbox $latestVersion $hash --system=$arch --ignore-same-version +done + +darwin_systems=( + "x86_64-darwin:" + "aarch64-darwin:-arm64" +) + +for entry in "${darwin_systems[@]}"; do + arch="${entry%%:*}" + suffix="${entry#*:}" + prefetch=$(nix-prefetch-url "https://download.jetbrains.com/toolbox/jetbrains-toolbox-$latestVersion$suffix.dmg") + hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) + update-source-version jetbrains-toolbox $latestVersion $hash --system=$arch --ignore-same-version +done diff --git a/pkgs/by-name/jf/jfrog-cli/package.nix b/pkgs/by-name/jf/jfrog-cli/package.nix index 7c62c3520986..05645ce15edc 100644 --- a/pkgs/by-name/jf/jfrog-cli/package.nix +++ b/pkgs/by-name/jf/jfrog-cli/package.nix @@ -8,25 +8,19 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.73.0"; + version = "2.75.1"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; tag = "v${version}"; - hash = "sha256-GzxJAatMI7H4XaRgza8+nq4JtIlPN9H3WkdKr0PfXWM="; + hash = "sha256-2vJiT0gr+Ix91KeM+wlldDHkrWN4Zug7RmuxJ5XfSGQ="; }; proxyVendor = true; - vendorHash = "sha256-tblmLEYHZt8manxuu5OpHeuAW18+0/kSvZIJmhEfQYQ="; + vendorHash = "sha256-1SLzXB9lw5U9xJtUqI5nSoeDEa2IT8FbRH11yEY8kS4="; - postPatch = '' - # Patch out broken test cleanup. - substituteInPlace artifactory_test.go \ - --replace-fail \ - 'deleteReceivedReleaseBundle(t, "cli-tests", "2")' \ - '// deleteReceivedReleaseBundle(t, "cli-tests", "2")' - ''; + checkFlags = "-skip=^TestReleaseBundle"; postInstall = '' # Name the output the same way as the original build script does diff --git a/pkgs/by-name/jf/jftui/package.nix b/pkgs/by-name/jf/jftui/package.nix index 7bc4cbb10639..fcd40cab52cb 100644 --- a/pkgs/by-name/jf/jftui/package.nix +++ b/pkgs/by-name/jf/jftui/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "jftui"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Aanok"; repo = "jftui"; rev = "v${version}"; - sha256 = "sha256-w5DK9B3D3/9VExAQktigVPim33VfpoQPHUZefAS3pWQ="; + sha256 = "sha256-Tgiwhdo87uqVwpOvNXRdvFTfkbf9dfSNQDlGx29S2II="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/jh/jhentai/package.nix b/pkgs/by-name/jh/jhentai/package.nix index f3243b9b4f68..e5921b5794f9 100644 --- a/pkgs/by-name/jh/jhentai/package.nix +++ b/pkgs/by-name/jh/jhentai/package.nix @@ -1,63 +1,83 @@ { - autoPatchelfHook, lib, + flutter324, fetchFromGitHub, - flutter, - pkg-config, + autoPatchelfHook, webkitgtk_4_1, + glib-networking, + runCommand, + yq, + jhentai, + _experimental-update-script-combinators, + gitUpdater, }: -flutter.buildFlutterApplication rec { + +flutter324.buildFlutterApplication rec { pname = "jhentai"; - version = "8.0.5"; + version = "8.0.7"; src = fetchFromGitHub { owner = "jiangtian616"; repo = "JHenTai"; tag = "v${version}"; - hash = "sha256-LL1TyLF37NtwTRN9vhHBY+xHDg0E0ACt2ilacIKpduU="; + hash = "sha256-+ZXLtlZ7YPD8CvraDHga4DsTyksFOx6QehdcmZIEFfw="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; - postUnpack = '' - substituteInPlace $sourceRoot/linux/my_application.cc \ - --replace-fail "gtk_widget_realize(GTK_WIDGET(window))" "gtk_widget_show(GTK_WIDGET(window))" - ''; - - nativeBuildInputs = [ - pkg-config - autoPatchelfHook - ]; - - buildInputs = [ - webkitgtk_4_1 - ]; - gitHashes = { desktop_webview_window = "sha256-QDlumlZ3pbmBRkMSJJVgz8HcCdANzV3cU142URvkY1w="; dio = "sha256-eHGAV/yIqTaC/wJeSXiPwonPePq+GT1u1dgjbBrW8OI="; flutter_draggable_gridview = "sha256-kntjeWEhRl4rdJBO8kt7GCaaLdPWy6b7zmBIjHyP7h8="; flutter_slidable = "sha256-nBPEZBvKV3D/eEa/cYb7jgbJ60rbh823yDJALLz1/8c="; flutter_socks_proxy = "sha256-a8XZTPTz521o7G7NsEXv2E/H7uVJcY4rcouIkdQC+jg="; - flutter_windowmanager = "sha256-+T2w1VLnrkzyvODGmWefa6aN1N+/i4itBgps2zouAas="; - j_downloader = "sha256-x5RG/SqbfOiRd51dL8H+phLIBrpVdOJiASWhbB5gCNQ="; + j_downloader = "sha256-Ct4TZvxKVWirEnSLs+pekDuf+b8tHFUZTdupBflGvJM="; like_button = "sha256-OVzfpIEnw88496H345NHn7nZ48+QDTaneBzN2UCdwk8="; photo_view = "sha256-k/+ncCzGkF4XmFpo3wmJOQbElSh2r+SlyeI3M9yDFtM="; + fluttertoast = "sha256-/2VJ1x7l5Idjwkm4Ennz8H/EC3j4/slRODj/82yO3iI="; + http_proxy = "sha256-/udhj2Tyc7PEtL6eU4TWIdrz/7Uh7D26jDSDxTr3X+I="; + scrollable_positioned_list = "sha256-8WfyUpTs+Cfv2VzFECrW/DGoKOsu9KY6hf6sP81xuBg="; + system_network_proxy = "sha256-boPbPO0Xs86Yu4OJmBr/nXGfX/vtZwosP6vRN4g3FQA="; + zoom_view = "sha256-/JPvmLg8syn5IlKucj3R765kedCZ1LdzkreUIsvdwEg="; + receive_sharing_intent = "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY="; }; + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + webkitgtk_4_1 + glib-networking + ]; + flutterBuildFlags = [ "--target lib/src/main.dart" ]; postInstall = '' - install -Dm644 ./linux/assets/top.jtmonster.jhentai.desktop $out/share/applications/top.jtmonster.jhentai.desktop - install -Dm644 ./assets/icon_512.png $out/share/icons/hicolor/512x512/apps/top.jtmonster.jhentai.png + install -Dm644 linux/assets/top.jtmonster.jhentai.desktop $out/share/applications/jhentai.desktop + install -Dm644 assets/icon/JHenTai_512.png $out/share/icons/hicolor/512x512/apps/top.jtmonster.jhentai.png ''; extraWrapProgramArgs = '' - --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" + --prefix LD_LIBRARY_PATH : $out/app/jhentai/lib ''; + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + buildInputs = [ yq ]; + inherit (jhentai) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "jhentai.pubspecSource" ./pubspec.lock.json) + ]; + }; + meta = { description = "Cross-platform manga app made for e-hentai & exhentai by Flutter"; homepage = "https://github.com/jiangtian616/JHenTai"; diff --git a/pkgs/by-name/jh/jhentai/pubspec.lock.json b/pkgs/by-name/jh/jhentai/pubspec.lock.json index 3a94a6aebe7b..1686c6c0bbf9 100644 --- a/pkgs/by-name/jh/jhentai/pubspec.lock.json +++ b/pkgs/by-name/jh/jhentai/pubspec.lock.json @@ -4,21 +4,27 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", "url": "https://pub.dev" }, "source": "hosted", - "version": "67.0.0" + "version": "73.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "6.8.0" }, "analyzer_plugin": { "dependency": "transitive", @@ -34,11 +40,11 @@ "dependency": "direct main", "description": { "name": "android_intent_plus", - "sha256": "2bfdbee8d65e7c26f88b66f0a91f2863da4d3596d8a658b4162c8de5cf04b074", + "sha256": "dfc1fd3a577205ae8f11e990fb4ece8c90cceabbee56fcf48e463ecf0bd6aae3", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "5.3.0" }, "animate_do": { "dependency": "direct main", @@ -74,21 +80,21 @@ "dependency": "transitive", "description": { "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.6.0" }, "asn1lib": { "dependency": "transitive", "description": { "name": "asn1lib", - "sha256": "58082b3f0dca697204dbab0ef9ff208bfaea7767ea771076af9a343488428dda", + "sha256": "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.3" + "version": "1.5.8" }, "async": { "dependency": "transitive", @@ -104,31 +110,31 @@ "dependency": "transitive", "description": { "name": "audio_session", - "sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261", + "sha256": "b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.21" + "version": "0.1.23" }, "battery_plus": { "dependency": "direct main", "description": { "name": "battery_plus", - "sha256": "ca67f5457a473f132fec42a4445c8c19a98205c1bc20f8feaa5a7f50d42f750f", + "sha256": "220c8f1961efb01d6870493b5ac5a80afaeaffc8757f7a11ed3025a8570d29e7", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.1" + "version": "6.2.0" }, "battery_plus_platform_interface": { "dependency": "transitive", "description": { "name": "battery_plus_platform_interface", - "sha256": "942707f90e2f7481dcb178df02e22a9c6971b3562b848d6a1b8c7cff9f1a1fec", + "sha256": "e8342c0f32de4b1dfd0223114b6785e48e579bfc398da9471c9179b907fa4910", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.0.1" }, "blur": { "dependency": "direct main", @@ -194,21 +200,21 @@ "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21", + "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.8" + "version": "2.4.11" }, "build_runner_core": { - "dependency": "direct dev", + "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "88a57f2ac99849362e73878334caa9f06ee25f31d2adced882b8337838c84e1e", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.9" + "version": "7.3.2" }, "built_collection": { "dependency": "transitive", @@ -224,11 +230,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.2" + "version": "8.9.3" }, "cached_network_image": { "dependency": "direct overridden", @@ -274,11 +280,11 @@ "dependency": "transitive", "description": { "name": "charcode", - "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306", + "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.4.0" }, "checked_yaml": { "dependency": "transitive", @@ -304,11 +310,11 @@ "dependency": "transitive", "description": { "name": "cli_util", - "sha256": "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.5" + "version": "0.4.2" }, "clipboard": { "dependency": "direct main", @@ -334,11 +340,11 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.0" + "version": "4.10.1" }, "collection": { "dependency": "direct main", @@ -354,31 +360,31 @@ "dependency": "transitive", "description": { "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "coverage": { "dependency": "transitive", "description": { "name": "coverage", - "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e", + "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.8.0" + "version": "1.11.1" }, "cross_file": { "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.4+1" + "version": "0.3.4+2" }, "crypto": { "dependency": "direct main", @@ -424,11 +430,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "2.3.7" }, "dbus": { "dependency": "transitive", @@ -455,21 +461,21 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91", + "sha256": "c4af09051b4f0508f6c1dc0a5c085bf014d5c9a4a0678ce1799c2b4d716387a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.0" + "version": "11.1.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "device_info_plus_platform_interface", - "sha256": "d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64", + "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.2" }, "dio": { "dependency": "direct main", @@ -496,21 +502,21 @@ "dependency": "direct main", "description": { "name": "drift", - "sha256": "4e0ffee40d23f0b809e6cff1ad202886f51d629649073ed42d9cd1d194ea943e", + "sha256": "df027d168a2985a2e9da900adeba2ab0136f0d84436592cf3cd5135f82c8579c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.19.1+1" + "version": "2.21.0" }, "drift_dev": { "dependency": "direct dev", "description": { "name": "drift_dev", - "sha256": "ac7647c6cedca99724ca300cff9181f6dd799428f8ed71f94159ed0528eaec26", + "sha256": "4592cea370f1dcd8afc67987c28402797d9ddb4aa3ae372cb675497c0741816c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.19.1" + "version": "2.21.1" }, "encrypt": { "dependency": "transitive", @@ -586,41 +592,41 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "file": { "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "file_picker": { "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258", + "sha256": "aac85f20436608e01a6ffd1fdd4e746a7f33c93a2c83752e626bdfaea139b877", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.6" + "version": "8.1.3" }, "fixnum": { "dependency": "transitive", "description": { "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "flex_color_picker": { "dependency": "direct main", @@ -652,11 +658,11 @@ "dependency": "transitive", "description": { "name": "flutter_cache_manager", - "sha256": "ceff65d74d907b1b772e22cf04daad60fb472461638977d9fae8b00a63e01e3d", + "sha256": "a77f77806a790eb9ba0118a5a3a936e81c4fea2b61533033b2b0c3d50bbde5ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.3" + "version": "3.4.0" }, "flutter_displaymode": { "dependency": "direct main", @@ -683,11 +689,11 @@ "dependency": "direct dev", "description": { "name": "flutter_launcher_icons", - "sha256": "ce0e501cfc258907842238e4ca605e74b7fd1cdf04b3b43e86c43f3e40a1592c", + "sha256": "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.11.0" + "version": "0.14.1" }, "flutter_lints": { "dependency": "direct dev", @@ -719,11 +725,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de", + "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.21" + "version": "2.0.24" }, "flutter_rating_bar": { "dependency": "direct main", @@ -771,11 +777,11 @@ "dependency": "transitive", "description": { "name": "flutter_svg", - "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", + "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.10+1" + "version": "2.0.17" }, "flutter_test": { "dependency": "direct dev", @@ -809,26 +815,26 @@ "source": "hosted", "version": "0.15.2" }, - "flutter_windowmanager": { + "flutter_windowmanager_plus": { "dependency": "direct main", "description": { - "path": ".", - "ref": "HEAD", - "resolved-ref": "3f5e7dae93e3c83368d2db0da7ee0dbcfd14d895", - "url": "https://github.com/AQuadic/flutter_windowmanager" + "name": "flutter_windowmanager_plus", + "sha256": "4e2bf7c7f374699fd74d59785f1d74efd40052c24a5edde5a4d825cc72608d40", + "url": "https://pub.dev" }, - "source": "git", - "version": "0.2.0" + "source": "hosted", + "version": "1.0.1" }, "fluttertoast": { "dependency": "direct main", "description": { - "name": "fluttertoast", - "sha256": "7cc92eabe01e3f1babe1571c5560b135dfc762a34e41e9056881e2196b178ec1", - "url": "https://pub.dev" + "path": ".", + "ref": "patch-1", + "resolved-ref": "ac29e14f4e7aa32adfa222b6354759e36488a1a2", + "url": "https://github.com/MarlonJD/FlutterToast" }, - "source": "hosted", - "version": "8.1.2" + "source": "git", + "version": "8.2.8" }, "font_awesome_flutter": { "dependency": "direct main", @@ -841,14 +847,14 @@ "version": "9.2.0" }, "frontend_server_client": { - "dependency": "transitive", + "dependency": "direct dev", "description": { "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "4.0.0" }, "fwfh_cached_network_image": { "dependency": "transitive", @@ -904,11 +910,11 @@ "dependency": "transitive", "description": { "name": "fwfh_webview", - "sha256": "f67890bc0d6278da98bd197469ae9511c859f7db327e92299fe0ea0cf46c4057", + "sha256": "c0a8b664b642f40f4c252a0ab4e72c22dcd97c7fb3a7e50a6b4bdb6f63afca19", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.15.2" + "version": "0.15.3" }, "get": { "dependency": "direct main", @@ -994,41 +1000,42 @@ "dependency": "transitive", "description": { "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.2" }, "http_proxy": { "dependency": "direct main", "description": { - "name": "http_proxy", - "sha256": "7d5bc7ad1b0c6d0cfb5da97c5bfe302082f93d32cf5c67d484d1a4085b3ffa58", - "url": "https://pub.dev" + "path": ".", + "ref": "HEAD", + "resolved-ref": "f107851fe1ac540103ab172645e071154ed82ef8", + "url": "https://github.com/jiangtian616/http_proxy" }, - "source": "hosted", - "version": "1.2.1" + "source": "git", + "version": "1.2.2" }, "image": { "dependency": "transitive", "description": { "name": "image", - "sha256": "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0" + "version": "4.3.0" }, "integral_isolates": { "dependency": "direct main", @@ -1054,11 +1061,11 @@ "dependency": "transitive", "description": { "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "iregexp": { "dependency": "transitive", @@ -1075,11 +1082,11 @@ "description": { "path": ".", "ref": "HEAD", - "resolved-ref": "ddf5d6b3e9cf62aa0cf35d3035f9cf8024477a7d", + "resolved-ref": "8ac5fba3ba7caa71cd60e3ffc24c9755c31e76dd", "url": "https://github.com/jiangtian616/JDownloader" }, "source": "git", - "version": "0.0.2" + "version": "0.0.3" }, "js": { "dependency": "transitive", @@ -1105,31 +1112,31 @@ "dependency": "transitive", "description": { "name": "json_class", - "sha256": "668be1a27c493dd8822fe8c3ce3563ccd788e2b214d77a0b8b3bfad50272e7f9", + "sha256": "f27de435c3b47ceea23c13d0516afa98c71c62c7a762a6c8f1df665189eb855e", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0+16" + "version": "3.0.1" }, "json_path": { "dependency": "transitive", "description": { "name": "json_path", - "sha256": "dc25b4e2297a6bd39fb52b7d122a7787b7dab751fb278d315b54706b98bb76db", + "sha256": "7a06bbb1cfad390b20fb7a2ca5e67d9ba59633879c6d71142b80fbf61c3b66f6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.4" }, "just_audio": { "dependency": "transitive", "description": { "name": "just_audio", - "sha256": "ee50602364ba83fa6308f5512dd560c713ec3e1f2bc75f0db43618f0d82ef71a", + "sha256": "1a1eb86e7d81e69a1d36943f2b3efd62dece3dad2cafd9ec2e62e6db7c04d9b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.39" + "version": "0.9.43" }, "just_audio_platform_interface": { "dependency": "transitive", @@ -1145,31 +1152,31 @@ "dependency": "transitive", "description": { "name": "just_audio_web", - "sha256": "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c", + "sha256": "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.11" + "version": "0.4.13" }, "leak_tracker": { "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.5" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.5" }, "leak_tracker_testing": { "dependency": "transitive", @@ -1226,21 +1233,21 @@ "dependency": "transitive", "description": { "name": "local_auth_android", - "sha256": "e99c44ca0bce08f26f25e2a2e07d3b443d69986e1c3acf67c1449f7d847e3625", + "sha256": "6763aaf8965f21822624cb2fd3c03d2a8b3791037b5efb0fe4b13e110f5afc92", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.43" + "version": "1.0.46" }, "local_auth_darwin": { "dependency": "transitive", "description": { "name": "local_auth_darwin", - "sha256": "e424ebf90d5233452be146d4a7da4bcd7a70278b67791592f3fde1bda8eef9e2", + "sha256": "5c5127061107278ab4cafa1ac51b3b6760282bf1a2abf011270908a429d1634b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.4.2" }, "local_auth_platform_interface": { "dependency": "transitive", @@ -1276,11 +1283,21 @@ "dependency": "transitive", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" }, "matcher": { "dependency": "direct overridden", @@ -1326,11 +1343,11 @@ "dependency": "transitive", "description": { "name": "mime", - "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.0.6" }, "nested": { "dependency": "transitive", @@ -1356,41 +1373,41 @@ "dependency": "transitive", "description": { "name": "octo_image", - "sha256": "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "package_config": { - "dependency": "transitive", - "description": { - "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd", "url": "https://pub.dev" }, "source": "hosted", "version": "2.1.0" }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "4de6c36df77ffbcef0a5aefe04669d33f2d18397fea228277b852a2d4e58e860", + "sha256": "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.1" + "version": "8.0.3" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "path": { "dependency": "direct main", @@ -1416,11 +1433,11 @@ "dependency": "transitive", "description": { "name": "path_parsing", - "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.1.0" }, "path_provider": { "dependency": "direct main", @@ -1436,21 +1453,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "e84c8a53fe1510ef4582f118c7b4bdf15b03002b51d7c2b66983c65843d61193", + "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.8" + "version": "2.2.15" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "path_provider_linux": { "dependency": "transitive", @@ -1496,11 +1513,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "b29a799ca03be9f999aa6c39f7de5209482d638e6f857f6b93b0875c618b7e54", + "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.7" + "version": "12.0.13" }, "permission_handler_apple": { "dependency": "transitive", @@ -1516,21 +1533,21 @@ "dependency": "transitive", "description": { "name": "permission_handler_html", - "sha256": "6cac773d389e045a8d4f85418d07ad58ef9e42a56e063629ce14c4c26344de24", + "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2" + "version": "0.1.3+5" }, "permission_handler_platform_interface": { "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "48d4fcf201a1dad93ee869ab0d4101d084f49136ec82a8a06ed9cfeacab9fd20", + "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.1" + "version": "4.2.3" }, "permission_handler_windows": { "dependency": "transitive", @@ -1577,11 +1594,11 @@ "dependency": "transitive", "description": { "name": "platform", - "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "plugin_platform_interface": { "dependency": "transitive", @@ -1627,31 +1644,31 @@ "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.1.5" }, "pubspec_parse": { "dependency": "transitive", "description": { "name": "pubspec_parse", - "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "quiver": { "dependency": "transitive", "description": { "name": "quiver", - "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "recase": { "dependency": "transitive", @@ -1666,12 +1683,13 @@ "receive_sharing_intent": { "dependency": "direct main", "description": { - "name": "receive_sharing_intent", - "sha256": "912bebb551bce75a14098891fd750305b30d53eba0d61cc70cd9973be9866e8d", - "url": "https://pub.dev" + "path": ".", + "ref": "HEAD", + "resolved-ref": "2cea396843cd3ab1b5ec4334be4233864637874e", + "url": "https://github.com/KasemJaffer/receive_sharing_intent" }, - "source": "hosted", - "version": "1.4.5" + "source": "git", + "version": "1.8.1" }, "retry": { "dependency": "direct main", @@ -1786,42 +1804,43 @@ "scrollable_positioned_list": { "dependency": "direct main", "description": { - "name": "scrollable_positioned_list", - "sha256": "ca7fcaa743db712d4f7b1580526f494d0093c77a721a65705ee51fbeac7a2bd3", - "url": "https://pub.dev" + "path": "packages/scrollable_positioned_list", + "ref": "HEAD", + "resolved-ref": "5dc660081452cfb76f574e1252eb34ba69c40257", + "url": "https://github.com/jiangtian616/flutter.widgets" }, - "source": "hosted", - "version": "0.3.5" + "source": "git", + "version": "0.3.8+1" }, "share_plus": { "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "fb5319f3aab4c5dda5ebb92dca978179ba21f8c783ee4380910ef4c1c6824f51", + "sha256": "3af2cda1752e5c24f2fc04b6083b40f013ffe84fb90472f30c6499a9213d5442", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.3" + "version": "10.1.1" }, "share_plus_platform_interface": { "dependency": "transitive", "description": { "name": "share_plus_platform_interface", - "sha256": "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496", + "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.0" + "version": "5.0.2" }, "shelf": { "dependency": "transitive", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_packages_handler": { "dependency": "transitive", @@ -1837,11 +1856,11 @@ "dependency": "transitive", "description": { "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "shelf_web_socket": { "dependency": "transitive", @@ -1867,7 +1886,7 @@ "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.0" + "version": "0.0.99" }, "smart_auth": { "dependency": "transitive", @@ -1893,21 +1912,21 @@ "dependency": "transitive", "description": { "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "source_maps": { "dependency": "transitive", "description": { "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.10.12" + "version": "0.10.13" }, "source_span": { "dependency": "transitive", @@ -1933,61 +1952,91 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d", + "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3+1" + "version": "2.4.1" + }, + "sqflite_android": { + "dependency": "transitive", + "description": { + "name": "sqflite_android", + "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4", + "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "2.5.4+6" + }, + "sqflite_darwin": { + "dependency": "transitive", + "description": { + "name": "sqflite_darwin", + "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1+1" + }, + "sqflite_platform_interface": { + "dependency": "transitive", + "description": { + "name": "sqflite_platform_interface", + "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" }, "sqlite3": { "dependency": "transitive", "description": { "name": "sqlite3", - "sha256": "fde692580bee3379374af1f624eb3e113ab2865ecb161dbe2d8ac2de9735dbdb", + "sha256": "c284434c408d207863800341298cadfde23abe074a0f01b19c9d8cce4edb8eaa", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "2.6.0" }, "sqlite3_flutter_libs": { "dependency": "direct main", "description": { "name": "sqlite3_flutter_libs", - "sha256": "349653db9221e3d65afb351b026ae8dd0a3a28d65fc8754d32b48c6cf9fce3c3", + "sha256": "1a96b59227828d9eb1463191d684b37a27d66ee5ed7597fcf42eee6452c88a14", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.8" + "version": "0.5.32" }, "sqlparser": { "dependency": "transitive", "description": { "name": "sqlparser", - "sha256": "3be52b4968fc2f098ba735863404756d2fe3ea0729cf006a5b5612618f74ca04", + "sha256": "d77749237609784e337ec36c979d41f6f38a7b279df98622ae23929c8eb954a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.37.1" + "version": "0.39.2" }, "stack_trace": { "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.11.1" }, "stream_channel": { "dependency": "transitive", @@ -2003,21 +2052,21 @@ "dependency": "transitive", "description": { "name": "stream_transform", - "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.2.0" }, "syncfusion_flutter_charts": { "dependency": "direct main", @@ -2033,30 +2082,31 @@ "dependency": "transitive", "description": { "name": "syncfusion_flutter_core", - "sha256": "4347f4d2f5d89461df2c53e6fbf53aef38c7f05ed79b0760d935fb1ec836213b", + "sha256": "325f519ce4ad8edd81811c21b853d72018529e353584490824da0555156ba076", "url": "https://pub.dev" }, "source": "hosted", - "version": "27.1.48" + "version": "27.2.5" }, "synchronized": { "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558", + "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0+1" + "version": "3.3.0+3" }, "system_network_proxy": { "dependency": "direct main", "description": { - "name": "system_network_proxy", - "sha256": "d24394993d60150918d00f8fd1fe940e37faaa602dbd790eb5cc8858d3309e83", - "url": "https://pub.dev" + "path": "system_network_proxy", + "ref": "HEAD", + "resolved-ref": "10d02b4e7097622cd24ba0b537ee7ecb6a85a538", + "url": "https://github.com/jiangtian616/system_network_proxy" }, - "source": "hosted", + "source": "git", "version": "1.0.2" }, "system_network_proxy_linux": { @@ -2109,6 +2159,16 @@ "source": "hosted", "version": "1.0.2" }, + "telegram": { + "dependency": "direct main", + "description": { + "name": "telegram", + "sha256": "8af9420f4c95b90e7dd15fed450d185b17dac72adff6592a5e759025ab7629d9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.9" + }, "template_expressions": { "dependency": "direct main", "description": { @@ -2173,21 +2233,21 @@ "dependency": "transitive", "description": { "name": "timing", - "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.0.2" }, "typed_data": { "dependency": "transitive", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "universal_platform": { "dependency": "transitive", @@ -2213,51 +2273,51 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "698fa0b4392effdc73e9e184403b627362eb5fbf904483ac9defbb1c2191d809", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.8" - }, - "url_launcher_android": { - "dependency": "transitive", - "description": { - "name": "url_launcher_android", - "sha256": "c24484594a8dea685610569ab0f2547de9c7a1907500a9bc5e37e4c9a3cbfb23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.6" - }, - "url_launcher_ios": { - "dependency": "transitive", - "description": { - "name": "url_launcher_ios", - "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", "url": "https://pub.dev" }, "source": "hosted", "version": "6.3.1" }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.14" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.2.1" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.2" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -2273,21 +2333,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.3" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.4" }, "uuid": { "dependency": "direct main", @@ -2303,31 +2363,31 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", + "sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11+1" + "version": "1.1.15" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11+1" + "version": "1.1.13" }, "vector_graphics_compiler": { "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", + "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11+1" + "version": "1.1.16" }, "vector_math": { "dependency": "transitive", @@ -2343,51 +2403,51 @@ "dependency": "transitive", "description": { "name": "video_player", - "sha256": "e30df0d226c4ef82e2c150ebf6834b3522cf3f654d8e2f9419d376cdc071425d", + "sha256": "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.1" + "version": "2.9.2" }, "video_player_android": { "dependency": "transitive", "description": { "name": "video_player_android", - "sha256": "b6f0a6d241e4a3435806cb7cb78cb666db8889c1866e432b6acd204707b3ac01", + "sha256": "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.3" + "version": "2.7.16" }, "video_player_avfoundation": { "dependency": "transitive", "description": { "name": "video_player_avfoundation", - "sha256": "d1e9a824f2b324000dc8fb2dcb2a3285b6c1c7c487521c63306cc5b394f68a7c", + "sha256": "8a4e73a3faf2b13512978a43cf1cdda66feeeb900a0527f1fbfd7b19cf3458d3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.6.7" }, "video_player_platform_interface": { "dependency": "transitive", "description": { "name": "video_player_platform_interface", - "sha256": "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6", + "sha256": "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.2" + "version": "6.2.3" }, "video_player_web": { "dependency": "transitive", "description": { "name": "video_player_web", - "sha256": "ff4d69a6614b03f055397c27a71c9d3ddea2b2a23d71b2ba0164f59ca32b8fe2", + "sha256": "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.3" }, "visibility_detector": { "dependency": "transitive", @@ -2403,41 +2463,41 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.2.5" }, "wakelock_plus": { "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "4fa83a128b4127619e385f686b4f080a5d2de46cff8e8c94eccac5fcf76550e5", + "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.7" + "version": "1.2.8" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "waterfall_flow": { "dependency": "direct main", @@ -2453,21 +2513,21 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "1.1.0" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "2.4.0" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -2493,11 +2553,11 @@ "dependency": "transitive", "description": { "name": "webview_flutter_android", - "sha256": "060e1a621add859dc822f3e4c59b01468e8515ea78cfc5ac4c6b28bc903b5f74", + "sha256": "47a8da40d02befda5b151a26dba71f47df471cddd91dfdb7802d0a87c5442558", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.5" + "version": "3.16.9" }, "webview_flutter_platform_interface": { "dependency": "transitive", @@ -2513,31 +2573,31 @@ "dependency": "transitive", "description": { "name": "webview_flutter_wkwebview", - "sha256": "9c62cc46fa4f2d41e10ab81014c1de470a6c6f26051a2de32111b2ee55287feb", + "sha256": "4adc14ea9a770cc9e2c8f1ac734536bd40e82615bd0fa6b94be10982de656cc7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.14.0" + "version": "3.17.0" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4", + "sha256": "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.5.1" + "version": "5.10.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.1.5" }, "window_manager": { "dependency": "direct main", @@ -2553,11 +2613,11 @@ "dependency": "transitive", "description": { "name": "xdg_directories", - "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.1.0" }, "xml": { "dependency": "direct main", @@ -2573,11 +2633,11 @@ "dependency": "transitive", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" }, "yaon": { "dependency": "transitive", @@ -2589,6 +2649,17 @@ "source": "hosted", "version": "1.1.4+10" }, + "zoom_view": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "9e29df74754faaef6368a70f0b38d32b9e373123", + "url": "https://github.com/jiangtian616/zoom_view" + }, + "source": "git", + "version": "0.0.15" + }, "zoom_widget": { "dependency": "direct main", "description": { @@ -2601,7 +2672,7 @@ } }, "sdks": { - "dart": ">=3.4.0 <4.0.0", - "flutter": ">=3.22.0" + "dart": ">=3.5.1 <4.0.0", + "flutter": ">=3.24.0" } } diff --git a/pkgs/by-name/ji/jibri/package.nix b/pkgs/by-name/ji/jibri/package.nix index 533b8dca1b09..924be5720873 100644 --- a/pkgs/by-name/ji/jibri/package.nix +++ b/pkgs/by-name/ji/jibri/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jitsi/jibri"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; - maintainers = teams.jitsi.members; + teams = [ teams.jitsi ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ji/jicofo/package.nix b/pkgs/by-name/ji/jicofo/package.nix index ba920b5286dd..9d25ef6ad6c0 100644 --- a/pkgs/by-name/ji/jicofo/package.nix +++ b/pkgs/by-name/ji/jicofo/package.nix @@ -9,10 +9,10 @@ let pname = "jicofo"; - version = "1.0-1124"; + version = "1.0-1128"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "pnSp9naOGC4V8MlrBVZ9e4Qk4GZSQdepS2xocQSfw30="; + sha256 = "pWTOAvsvWGWgt4q9jNyp0faZrbRx0De3R5U5j+GNTDA="; }; in stdenv.mkDerivation { @@ -49,7 +49,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/jitsi/jicofo"; license = licenses.asl20; - maintainers = teams.jitsi.members; + teams = [ teams.jitsi ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ji/jigasi/package.nix b/pkgs/by-name/ji/jigasi/package.nix index a0a0ca2b2fa7..0ba3fd32b8a5 100644 --- a/pkgs/by-name/ji/jigasi/package.nix +++ b/pkgs/by-name/ji/jigasi/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/jitsi/jigasi"; license = licenses.asl20; - maintainers = teams.jitsi.members; + teams = [ teams.jitsi ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ji/jikken/package.nix b/pkgs/by-name/ji/jikken/package.nix index c75aaddbe037..414fdbf372a0 100644 --- a/pkgs/by-name/ji/jikken/package.nix +++ b/pkgs/by-name/ji/jikken/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage rec { pname = "jikken"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "jikkenio"; repo = "jikken"; rev = "v${version}"; - hash = "sha256-WJxrCCDe39RYwHb+zbr7ugFsFsP5Uc/arw3s6USQoN4="; + hash = "sha256-8A9b9Ms/unv+qQRd5jiTV/6SJa6ZYLsE0fK97ohacPI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8GulTGiXMgG0ysrRwv5CbS3AKCM3FpieNiJW2pZnEx4="; + cargoHash = "sha256-nwFTKol5phXFuDzAcnPoFq8UrrqMDE6NuitpXE5qJwU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ji/jira-cli-go/package.nix b/pkgs/by-name/ji/jira-cli-go/package.nix index 52a4376d9d78..bf9d519ef8b9 100644 --- a/pkgs/by-name/ji/jira-cli-go/package.nix +++ b/pkgs/by-name/ji/jira-cli-go/package.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "jira-cli-go"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ankitpokhrel"; repo = "jira-cli"; tag = "v${version}"; - hash = "sha256-Wp6uDvnTiNixn8GyEn8SeKPdXanUNN3b7yr9dT1D6uo="; + hash = "sha256-+7R0yf7YVUnJErvhDm6dVskAJdyd7DHM0JJ6V9gzj/Q="; }; - vendorHash = "sha256-a11ZO/iV/Yhaq/cu504p2C/OkKJ04PeMMSoHrl7edvM="; + vendorHash = "sha256-cl+Sfi9WSPy8qOtB13rRiKtQdDC+HC0+FMKpsWbtU2w="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix index 0be61315c429..fb49e4e51023 100644 --- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix +++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix @@ -11,18 +11,9 @@ libXi, libXtst, zlib, - darwin, electron, }: -let - inherit (darwin.apple_sdk.frameworks) - Carbon - CoreFoundation - ApplicationServices - OpenGL - ; -in buildNpmPackage rec { pname = "jitsi-meet-electron"; version = "2025.2.0"; @@ -43,20 +34,13 @@ buildNpmPackage rec { ]; # robotjs node-gyp dependencies - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libpng - libX11 - libXi - libXtst - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - CoreFoundation - ApplicationServices - OpenGL - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libpng + libX11 + libXi + libXtst + zlib + ]; npmDepsHash = "sha256-TckV91RJo06OKb8nIvxBCxu28qyHtA/ACDshOlaCQxA="; @@ -143,7 +127,8 @@ buildNpmPackage rec { homepage = "https://github.com/jitsi/jitsi-meet-electron"; license = licenses.asl20; mainProgram = "jitsi-meet-electron"; - maintainers = teams.jitsi.members ++ [ maintainers.tomasajt ]; + maintainers = [ maintainers.tomasajt ]; + teams = [ teams.jitsi ]; inherit (electron.meta) platforms; }; } diff --git a/pkgs/by-name/ji/jitsi-meet-prosody/package.nix b/pkgs/by-name/ji/jitsi-meet-prosody/package.nix index 8df9408749cf..d85f8a0ec3e1 100644 --- a/pkgs/by-name/ji/jitsi-meet-prosody/package.nix +++ b/pkgs/by-name/ji/jitsi-meet-prosody/package.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.8448"; + version = "1.0.8542"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "ET41A6MQblz3Vw/ZHIvXv05Kk41S8dBxempkgwwpa88="; + sha256 = "dVqKnDq8rNmLbhMUvDGAT2pKLPZjW4ZXUwvz1wxM2Rs="; }; nativeBuildInputs = [ dpkg ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/jitsi/jitsi-meet/"; license = licenses.asl20; - maintainers = teams.jitsi.members; + teams = [ teams.jitsi ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ji/jitsi-meet/package.nix b/pkgs/by-name/ji/jitsi-meet/package.nix index 5702b0b9299b..90cad423959c 100644 --- a/pkgs/by-name/ji/jitsi-meet/package.nix +++ b/pkgs/by-name/ji/jitsi-meet/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/jitsi/jitsi-meet"; license = licenses.asl20; - maintainers = teams.jitsi.members; + teams = [ teams.jitsi ]; platforms = platforms.all; inherit (olm.meta) knownVulnerabilities; }; diff --git a/pkgs/by-name/ji/jitsi-videobridge/package.nix b/pkgs/by-name/ji/jitsi-videobridge/package.nix index 04b17fad6857..5a2877421328 100644 --- a/pkgs/by-name/ji/jitsi-videobridge/package.nix +++ b/pkgs/by-name/ji/jitsi-videobridge/package.nix @@ -11,10 +11,10 @@ let pname = "jitsi-videobridge2"; - version = "2.3-209-gb5fbe618"; + version = "2.3-220-g7cda0a66"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "DsHpGdVmkhXNovBF2VEw96praKd6WpVMdxV+Tnxbzi0="; + sha256 = "5jl2K3EL7zS3hw14LuK6WqL9SDgvLN+pZlRqJew0LJE="; }; in stdenv.mkDerivation { @@ -63,7 +63,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/jitsi/jitsi-videobridge"; license = licenses.asl20; - maintainers = teams.jitsi.members; + teams = [ teams.jitsi ]; platforms = platforms.linux; mainProgram = "jitsi-videobridge"; }; diff --git a/pkgs/by-name/ji/jitsi/package.nix b/pkgs/by-name/ji/jitsi/package.nix index d963ae53044e..e7e9fb24143f 100644 --- a/pkgs/by-name/ji/jitsi/package.nix +++ b/pkgs/by-name/ji/jitsi/package.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { ]; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = teams.jitsi.members; + teams = [ teams.jitsi ]; }; } diff --git a/pkgs/by-name/ji/jitterentropy/package.nix b/pkgs/by-name/ji/jitterentropy/package.nix index c86203432849..bf5a6409a6f5 100644 --- a/pkgs/by-name/ji/jitterentropy/package.nix +++ b/pkgs/by-name/ji/jitterentropy/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "jitterentropy"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "jitterentropy-library"; rev = "v${version}"; - hash = "sha256-A1Y+7CqzoQ6xoTwWU8gfq+dYJ+PiIpqtOOZSL0uVby4="; + hash = "sha256-A7a0kg9JRiNNKJbLJu5Fbu6ZgCwv3+3oDhZr3jwNXmM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/jj/jj/package.nix b/pkgs/by-name/jj/jj/package.nix index a9def5cf35d5..045338e45112 100644 --- a/pkgs/by-name/jj/jj/package.nix +++ b/pkgs/by-name/jj/jj/package.nix @@ -8,14 +8,14 @@ runCommand, jj, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "jj"; version = "1.9.2"; src = fetchFromGitHub { owner = "tidwall"; repo = "jj"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Yijap5ZghTBe1ahkQgjjxuo++SriJWXgRqrNXIVQ0os="; }; @@ -28,7 +28,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; passthru = { @@ -71,4 +71,4 @@ buildGoModule rec { mainProgram = "jj"; maintainers = with maintainers; [ katexochen ]; }; -} +}) diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 040a17852f3c..71da7705ebd3 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -4,15 +4,15 @@ fetchFromGitHub, nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "jjui"; - version = "0.8.2"; + version = "0.8.8"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; - tag = "v${version}"; - hash = "sha256-Bao851E1AFTIjGTJrnYc95BWxXnQjWwyufSMQCbiYuU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5gDEcwS14Hur/Mw/vALPU+EVC5BJxdgjFbpzz1kcSKM="; }; vendorHash = "sha256-YlOK+NvyH/3uvvFcCZixv2+Y2m26TP8+ohUSdl3ppro="; @@ -22,11 +22,11 @@ buildGoModule rec { meta = { description = "A TUI for Jujutsu VCS"; homepage = "https://github.com/idursun/jjui"; - changelog = "https://github.com/idursun/jjui/releases/tag/v${version}"; + changelog = "https://github.com/idursun/jjui/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ adda ]; mainProgram = "jjui"; }; -} +}) diff --git a/pkgs/by-name/jl/jless/package.nix b/pkgs/by-name/jl/jless/package.nix new file mode 100644 index 000000000000..8667d7762f6c --- /dev/null +++ b/pkgs/by-name/jl/jless/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + python3, + libxcb, +}: + +rustPlatform.buildRustPackage rec { + pname = "jless"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "PaulJuliusMartinez"; + repo = "jless"; + rev = "v${version}"; + hash = "sha256-76oFPUWROX389U8DeMjle/GkdItu+0eYxZkt1c6l0V4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-moXZcPGh0+KyyeUMjH7/+hvF86Penk2o2DQWj4BEzt8="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; + + meta = with lib; { + description = "Command-line pager for JSON data"; + mainProgram = "jless"; + homepage = "https://jless.io"; + changelog = "https://github.com/PaulJuliusMartinez/jless/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ + figsoda + jfchevrette + ]; + }; +} diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index e42b7fb671f9..819bbeb3abd5 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -2,39 +2,38 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "jnv"; version = "0.6.0"; src = fetchFromGitHub { owner = "ynqa"; repo = "jnv"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HKZ+hF5Y7vTA4EODSAd9xYJHaipv5YukTl470ejPLtM="; }; useFetchCargoVendor = true; cargoHash = "sha256-VLVoURqmUhhekNZ0a75bwjvSiLfaQ79IlltbmWVyBrI="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreGraphics - AppKit - ] - ); + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Interactive JSON filter using jq"; mainProgram = "jnv"; homepage = "https://github.com/ynqa/jnv"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ nealfennimore nshalman ]; }; -} +}) diff --git a/pkgs/by-name/jo/jo/package.nix b/pkgs/by-name/jo/jo/package.nix index 1c9bb4365a9e..cbfcb5257e69 100644 --- a/pkgs/by-name/jo/jo/package.nix +++ b/pkgs/by-name/jo/jo/package.nix @@ -5,16 +5,18 @@ autoreconfHook, pandoc, pkg-config, + versionCheckHook, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jo"; version = "1.9"; src = fetchFromGitHub { owner = "jpmens"; repo = "jo"; - rev = version; + tag = finalAttrs.version; sha256 = "sha256-1q4/RpxfoAdtY3m8bBuj7bhD17V+4dYo3Vb8zMbI1YU="; }; @@ -26,12 +28,28 @@ stdenv.mkDerivation rec { pkg-config ]; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "-v"; + postInstallCheck = '' + $out/bin/jo -V > /dev/null + seq 1 10 | $out/bin/jo -a | grep '^\[1,2,3,4,5,6,7,8,9,10\]$' > /dev/null + ''; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Small utility to create JSON objects"; homepage = "https://github.com/jpmens/jo"; + changelog = "https://github.com/jpmens/jo/blob/${finalAttrs.version}/ChangeLog"; mainProgram = "jo"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.markus1189 ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + xiaoxiangmoe + markus1189 + ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index 4eeb4fb028be..b7481d859cb0 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -9,29 +9,13 @@ let pname = "joplin-desktop"; - version = "3.1.24"; + inherit (releaseData) version; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; - suffix = - { - x86_64-linux = ".AppImage"; - x86_64-darwin = ".dmg"; - aarch64-darwin = "-arm64.dmg"; - } - .${system} or throwSystem; - - src = fetchurl { - url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; - sha256 = - { - x86_64-linux = "sha256-ImFB4KwJ/vAHtZUbLAdnIRpd+o2ZaXKy9luw/jnPLSE="; - x86_64-darwin = "sha256-Of6VXX40tCis+ou26LtJKOZm/87P3rsTHtnvSDwF8VY="; - aarch64-darwin = "sha256-HtHuZQhIkiI8GrhB9nCOTAN1hOs+9POJFRIsRUNikYs="; - } - .${system} or throwSystem; - }; + releaseData = lib.importJSON ./release-data.json; + src = fetchurl releaseData.${system} or throwSystem; appimageContents = appimageTools.extractType2 { inherit pname version src; @@ -77,11 +61,13 @@ let extraInstallCommands = '' wrapProgram $out/bin/joplin-desktop \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - install -Dm644 ${appimageContents}/@joplinapp-desktop.desktop $out/share/applications/joplin.desktop - install -Dm644 ${appimageContents}/@joplinapp-desktop.png $out/share/pixmaps/joplin.png + install -Dm644 ${appimageContents}/joplin.desktop $out/share/applications/joplin.desktop + install -Dm644 ${appimageContents}/joplin.png $out/share/pixmaps/joplin.png substituteInPlace $out/share/applications/joplin.desktop \ --replace-fail 'Exec=AppRun' 'Exec=joplin-desktop' ''; + + passthru.updateScript = ./update.py; }; darwin = stdenv.mkDerivation { @@ -96,18 +82,24 @@ let unpackPhase = '' runHook preUnpack - 7zz x -x'!Joplin ${version}/Applications' $src + 7zz x -x'!Joplin ${version}/Applications' -xr'!*:com.apple.cs.Code*' $src runHook postUnpack ''; sourceRoot = if stdenv.hostPlatform.isx86_64 then "Joplin ${version}" else "."; + postPatch = '' + chmod a+x Joplin.app/Contents/Resources/build/7zip/7za + ''; + installPhase = '' runHook preInstall mkdir -p $out/Applications cp -R Joplin.app $out/Applications runHook postInstall ''; + + passthru.updateScript = ./update.py; }; in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/jo/joplin-desktop/release-data.json b/pkgs/by-name/jo/joplin-desktop/release-data.json new file mode 100644 index 000000000000..049fb75f0ce8 --- /dev/null +++ b/pkgs/by-name/jo/joplin-desktop/release-data.json @@ -0,0 +1,15 @@ +{ + "version": "3.3.12", + "x86_64-linux": { + "url": "https://github.com/laurent22/joplin/releases/download/v3.3.12/Joplin-3.3.12.AppImage", + "sha256": "1fjrblmlpm6sf4jdvifmyxic0rw2bs1f4sbw3nz4xy7wlsab5f62" + }, + "x86_64-darwin": { + "url": "https://github.com/laurent22/joplin/releases/download/v3.3.12/Joplin-3.3.12.dmg", + "sha256": "0rk5jl7i7sj31336r8yn8wf9h4xwdwi66wvwrkblvxrfhgddn2gj" + }, + "aarch64-darwin": { + "url": "https://github.com/laurent22/joplin/releases/download/v3.3.12/Joplin-3.3.12-arm64.dmg", + "sha256": "13m4nypg1v5d7i13has9f1sp08dijc44962dr75b9jfiq8q6ciz6" + } +} diff --git a/pkgs/by-name/jo/joplin-desktop/update.py b/pkgs/by-name/jo/joplin-desktop/update.py new file mode 100755 index 000000000000..f96e26a59102 --- /dev/null +++ b/pkgs/by-name/jo/joplin-desktop/update.py @@ -0,0 +1,32 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p 'python3.withPackages(ps: [ps.requests ps.plumbum])' nix-prefetch +import json +import requests + +from pathlib import Path + +from plumbum.cmd import nix_prefetch_url + +HERE = Path(__file__).parent +SUFFIXES = ( + ("x86_64-linux", ".AppImage"), + ("x86_64-darwin", ".dmg"), + ("aarch64-darwin", "-arm64.dmg"), +) + +latest = requests.get( + "https://api.github.com/repos/laurent22/joplin/releases/latest" +).json() +tag = latest["tag_name"] +version = tag[1:] +release = { + "version": version, +} + +for arch, suffix in SUFFIXES: + url = f"https://github.com/laurent22/joplin/releases/download/v{version}/Joplin-{version}{suffix}" + release[arch] = {"url": url, "sha256": nix_prefetch_url(url).strip()} + +with HERE.joinpath("release-data.json").open("w") as fd: + json.dump(release, fd, indent=2) + fd.write("\n") diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix index cfb33fa796bb..a2544073b83c 100644 --- a/pkgs/by-name/jo/josh/package.nix +++ b/pkgs/by-name/jo/josh/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, libgit2, @@ -8,7 +7,6 @@ pkg-config, makeWrapper, git, - darwin, }: let @@ -40,14 +38,10 @@ rustPlatform.buildRustPackage { makeWrapper ]; - buildInputs = - [ - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.Security - ]; + buildInputs = [ + libgit2 + openssl + ]; cargoBuildFlags = cargoFlags; cargoTestFlags = cargoFlags; diff --git a/pkgs/by-name/jo/joshuto/package.nix b/pkgs/by-name/jo/joshuto/package.nix index fb923caea595..72e1c48a3d94 100644 --- a/pkgs/by-name/jo/joshuto/package.nix +++ b/pkgs/by-name/jo/joshuto/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd joshuto \ --bash <($out/bin/joshuto completions bash) \ diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index d82472488856..6cb59e4006fa 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -11,21 +11,21 @@ }: let pname = "josm"; - version = "19307"; + version = "19369"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-08dacfJrRbdk8Bj+lDW2s8YuGVvnKdvMQN825lusohk="; + hash = "sha256-rcnfrKaKVWvPLdr8hab380Ao661NVj+pCZMIGiUM0aQ="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-wFLQXGOaRnFDZEDlZwmv8wb3pNJbVxocYVjc8wy1Q10="; + hash = "sha256-zIiOq14o972Z+V4Cc3IFjcgd50G1VDEoxbcYVtOR5C4="; }; pkg = fetchFromGitHub { owner = "JOSM"; repo = "josm"; tag = "${version}-tested"; - hash = "sha256-TwheY/9gXbKH36jZLMoV9xIBeq59FpHUUoselaiYGzA="; + hash = "sha256-mPuf98HfvmAHcnOiFKHUtqNVg7sy5XZP2hnm7ZdaUQo="; }; }; diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix index 7f9579cf8578..5cb3048f4ca4 100644 --- a/pkgs/by-name/jo/jotdown/package.nix +++ b/pkgs/by-name/jo/jotdown/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "jotdown"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "hellux"; repo = "jotdown"; rev = version; - hash = "sha256-1s0J6TF/iDSqKUF4/sgq2irSPENjinftPFZnMgE8Dn8="; + hash = "sha256-StlF+KjQ+UrKnZMuexwDhMI0ztFLsbexubx5s8Qtzho="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SGmlNpauPk2qSIIdP0hfGUplCV9ZvyHhZss8XXuxfHg="; + cargoHash = "sha256-UroMKPDh0RbUu6oqjfbRkX6ZlKi5rJRVBu1apcJENyU="; meta = with lib; { description = "Minimal Djot CLI"; diff --git a/pkgs/by-name/jp/jp-zip-codes/package.nix b/pkgs/by-name/jp/jp-zip-codes/package.nix index c36c53af3f71..a3f8e8c8bc49 100644 --- a/pkgs/by-name/jp/jp-zip-codes/package.nix +++ b/pkgs/by-name/jp/jp-zip-codes/package.nix @@ -7,15 +7,15 @@ stdenvNoCC.mkDerivation { pname = "jp-zip-code"; - version = "0-unstable-2025-03-01"; + version = "0-unstable-2025-05-01"; # This package uses a mirror as the source because the # original provider uses the same URL for updated content. src = fetchFromGitHub { owner = "musjj"; repo = "jp-zip-codes"; - rev = "82ea5a76dfaf43da8b838f20827ea535e37bd44c"; - hash = "sha256-DhQlbYgy+p1FZ2a/PxbauQ4UGR83Q64A2a3bn/yWD6Y="; + rev = "3c1c1db248113ad37fac18ede96b5936866a9726"; + hash = "sha256-BAS7Iqzoxbt77uRh99n0rUC+0+OVgkB7OEIEgZMoDAk="; }; installPhase = '' diff --git a/pkgs/by-name/jp/jp2a/package.nix b/pkgs/by-name/jp/jp2a/package.nix index 7c004b5d5eb4..10ff29d72b96 100644 --- a/pkgs/by-name/jp/jp2a/package.nix +++ b/pkgs/by-name/jp/jp2a/package.nix @@ -9,17 +9,19 @@ autoconf-archive, pkg-config, bash-completion, + libwebp, + libexif, }: -stdenv.mkDerivation rec { - version = "1.2.0"; +stdenv.mkDerivation (finalAttrs: { + version = "1.3.2"; pname = "jp2a"; src = fetchFromGitHub { owner = "Talinx"; repo = "jp2a"; - rev = "v${version}"; - sha256 = "sha256-TyXEaHemKfCMyGwK6P2vVL9gPWRLbkaNP0g+/UYGSVc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-GcwwzVgF7BK2N8TL8z/7R7Ry1e9pmGiXUrOAQQmPIBo="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -30,21 +32,24 @@ stdenv.mkDerivation rec { pkg-config bash-completion ]; + buildInputs = [ libjpeg libpng ncurses + libwebp + libexif ]; installFlags = [ "bashcompdir=\${out}/share/bash-completion/completions" ]; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; homepage = "https://csl.name/jp2a/"; description = "Small utility that converts JPG images to ASCII"; - license = licenses.gpl2Only; - maintainers = [ maintainers.FlorianFranzen ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.FlorianFranzen ]; + platforms = lib.platforms.unix; mainProgram = "jp2a"; }; -} +}) diff --git a/pkgs/by-name/jq/jqfmt/package.nix b/pkgs/by-name/jq/jqfmt/package.nix new file mode 100644 index 000000000000..066b72db67c3 --- /dev/null +++ b/pkgs/by-name/jq/jqfmt/package.nix @@ -0,0 +1,29 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + nix-update-script, +}: +buildGoModule { + pname = "jqfmt"; + version = "0-unstable-2024-08-15"; + + src = fetchFromGitHub { + owner = "noperator"; + repo = "jqfmt"; + rev = "8fc6f864c295e6bd6b08f36f503b3d809270da61"; + hash = "sha256-tvFp1SJeosJdCHs3c+vceBfacypJc/aFYSj55mBfkB8="; + }; + + vendorHash = "sha256-avpZSgQKFZxLmYGj+2Gi+wSDHnAgF0/hyp4HtoQ0ZCo="; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; + + meta = { + description = "Like gofmt, but for jq"; + homepage = "https://github.com/noperator/jqfmt"; + license = lib.licenses.mit; # Doesn't have Licence file, but Readme points to MIT + maintainers = with lib.maintainers; [ heisfer ]; + mainProgram = "jqfmt"; + }; +} diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix index c99ebe9e3c4d..0dc871b3f14c 100644 --- a/pkgs/by-name/jq/jql/package.nix +++ b/pkgs/by-name/jq/jql/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "8.0.4"; + version = "8.0.6"; src = fetchFromGitHub { owner = "yamafaktory"; repo = "jql"; rev = "jql-v${version}"; - hash = "sha256-J+Zqmfev2DyD0SLFGaI0egVgmEC+a2nqBrNDGX4zNnE="; + hash = "sha256-bb3QoODsVZaTw5mcagvcGLn8uwG48nmHPgtlIC2ZdVE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tMxy0bi3518VjzJuy4Agpq+UydMEyJRqavX5kIsBYjY="; + cargoHash = "sha256-7+qlQf44DgjijKlM+HRjyubH3W/PJbortri3ur0ASnk="; meta = with lib; { description = "JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/by-name/jr/jreleaser-cli/package.nix b/pkgs/by-name/jr/jreleaser-cli/package.nix index 3754e8577554..b171633980ae 100644 --- a/pkgs/by-name/jr/jreleaser-cli/package.nix +++ b/pkgs/by-name/jr/jreleaser-cli/package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { pname = "jreleaser-cli"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar"; - hash = "sha256-V3RDSpoHLJxUImPf+8wQdfukFNftfsZI1L9k+sD4yZg="; + hash = "sha256-rJYFoPPz1tR7LgcVfiRPFJHf1tMLhlxNQXsmutHZs3Q="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/jr/jrnl/package.nix b/pkgs/by-name/jr/jrnl/package.nix index c60e20d95751..3d0113ed4aa1 100644 --- a/pkgs/by-name/jr/jrnl/package.nix +++ b/pkgs/by-name/jr/jrnl/package.nix @@ -41,6 +41,8 @@ python3.pkgs.buildPythonApplication rec { rich ]; + pythonRelaxDeps = [ "rich" ]; + nativeCheckInputs = with python3.pkgs; [ pytest-bdd pytest-xdist diff --git a/pkgs/by-name/js/json-glib/package.nix b/pkgs/by-name/js/json-glib/package.nix index 9722f53dba4e..9d3d054c6a05 100644 --- a/pkgs/by-name/js/json-glib/package.nix +++ b/pkgs/by-name/js/json-glib/package.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { description = "Library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; homepage = "https://gitlab.gnome.org/GNOME/json-glib"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix index b61745f2cac5..d5ffd1d6dd42 100644 --- a/pkgs/by-name/js/jsoncons/package.nix +++ b/pkgs/by-name/js/jsoncons/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jsoncons"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "danielaparker"; repo = "jsoncons"; tag = "v${finalAttrs.version}"; - hash = "sha256-EafFoS54svxY9zaFqzWYQ8QUxN2dHy2wI5UugxKnyUk="; + hash = "sha256-Q7qtLLTvJcIFPSx6MkS7SI89MBcM88g3KmX/b3BAKwI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch b/pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch deleted file mode 100644 index dc4cdcf2ea1b..000000000000 --- a/pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 3a52458..872e6c6 100644 ---- a/cpp/CMakeLists.txt -+++ b/cpp/CMakeLists.txt -@@ -10,6 +10,7 @@ set(LIBJSONNETPP_SOURCE - - add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE}) - add_dependencies(libjsonnet++ jsonnet) -+target_link_libraries(libjsonnet++ libjsonnet) - # target_link_libraries(libjsonnet libjsonnet) - - # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without diff --git a/pkgs/by-name/js/jsonnet/package.nix b/pkgs/by-name/js/jsonnet/package.nix index 498cf26dadf2..4d7136f01eb1 100644 --- a/pkgs/by-name/js/jsonnet/package.nix +++ b/pkgs/by-name/js/jsonnet/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "jsonnet"; - version = "0.20.0"; + version = "0.21.0"; outputs = [ "out" "doc" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y="; + sha256 = "sha256-QHp0DOu/pqcgN7di219cHzfFb7fWtdGGE6J1ZXgbOGQ="; }; nativeBuildInputs = [ @@ -37,11 +37,6 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; - # https://github.com/google/jsonnet/issues/778 - patches = [ - ./fix-cpp-unresolved-symbols.patch - ]; - enableParallelBuilding = true; # Upstream writes documentation in html, not in markdown/rst, so no @@ -59,7 +54,6 @@ stdenv.mkDerivation rec { description = "Purely-functional configuration language that helps you define JSON data"; maintainers = with lib.maintainers; [ benley - copumpkin ]; license = lib.licenses.asl20; homepage = "https://github.com/google/jsonnet"; diff --git a/pkgs/by-name/js/jsonrpc-glib/package.nix b/pkgs/by-name/js/jsonrpc-glib/package.nix index 19035f75f9af..51d2b0551148 100644 --- a/pkgs/by-name/js/jsonrpc-glib/package.nix +++ b/pkgs/by-name/js/jsonrpc-glib/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { description = "Library to communicate using the JSON-RPC 2.0 specification"; homepage = "https://gitlab.gnome.org/GNOME/jsonrpc-glib"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index 08d09f2937d1..7bbb04ea228a 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -8,22 +8,22 @@ rustPlatform.buildRustPackage rec { pname = "jsonschema-cli"; - version = "0.29.1"; + version = "0.30.0"; src = fetchCrate { inherit pname version; - hash = "sha256-HHS8dt3bJZ3dPWqB5K0h5KQTn/wHRYvIROfYmqfxolw="; + hash = "sha256-AjBVvEixkP7khm3/0U81E/G7tCKoqnfNG05gpgYlqNE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RIt+b1Yokc4UMFPxOzO5GARsI32wL71ZmcoN+P/KE5c="; + cargoHash = "sha256-3hZAEjJrJ5vw6kXwY+xTv/mO0lx/KNmXA2lULJkX9aE="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/misc/juce/juce-8.0.4-cmake_install.patch b/pkgs/by-name/ju/juce/juce-8.0.4-cmake_install.patch similarity index 100% rename from pkgs/development/misc/juce/juce-8.0.4-cmake_install.patch rename to pkgs/by-name/ju/juce/juce-8.0.4-cmake_install.patch diff --git a/pkgs/by-name/ju/juce/package.nix b/pkgs/by-name/ju/juce/package.nix new file mode 100644 index 000000000000..f2a5779e737d --- /dev/null +++ b/pkgs/by-name/ju/juce/package.nix @@ -0,0 +1,108 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # Native build inputs + cmake, + pkg-config, + makeWrapper, + + # Dependencies + alsa-lib, + freetype, + curl, + libglvnd, + webkitgtk_4_1, + pcre2, + libsysprof-capture, + util-linuxMinimal, + libselinux, + libsepol, + libthai, + libdatrie, + libXdmcp, + lerc, + libxkbcommon, + libepoxy, + libXtst, + sqlite, + fontconfig, + versionCheckHook, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "juce"; + version = "8.0.7"; + + src = fetchFromGitHub { + owner = "juce-framework"; + repo = "juce"; + tag = finalAttrs.version; + hash = "sha256-nl4pUSkUKqpMoehzq0MS5pjHpYDkrFpUsY8BwpQObCM="; + }; + + patches = [ + # Adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/juce/-/raw/4e6d34034b102af3cd762a983cff5dfc09e44e91/juce-6.1.2-cmake_install.patch + # for Juce 8.0.4. + ./juce-8.0.4-cmake_install.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = + [ + freetype # libfreetype.so + curl # libcurl.so + (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so + pcre2 # libpcre2.pc + libsysprof-capture + libthai + libdatrie + lerc + libepoxy + sqlite + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib # libasound.so + libglvnd # libGL.so + webkitgtk_4_1 # webkit2gtk-4.0 + util-linuxMinimal + libselinux + libsepol + libXdmcp + libxkbcommon + libXtst + ]; + + propagatedBuildInputs = [ fontconfig ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/juceaide"; + versionCheckProgramArg = "version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Cross-platform C++ application framework"; + longDescription = "Open-source cross-platform C++ application framework for creating desktop and mobile applications, including VST, VST3, AU, AUv3, AAX and LV2 audio plug-ins"; + homepage = "https://juce.com/"; + changelog = "https://github.com/juce-framework/JUCE/blob/${finalAttrs.version}/CHANGE_LIST.md"; + license = with lib.licenses; [ + agpl3Only # Or alternatively the JUCE license, but that would not be included in nixpkgs then + ]; + maintainers = with lib.maintainers; [ kashw2 ]; + platforms = lib.platforms.all; + mainProgram = "juceaide"; + }; +}) diff --git a/pkgs/by-name/ju/judy/package.nix b/pkgs/by-name/ju/judy/package.nix index df21e56c30ba..df3e01552303 100644 --- a/pkgs/by-name/ju/judy/package.nix +++ b/pkgs/by-name/ju/judy/package.nix @@ -23,11 +23,6 @@ stdenv.mkDerivation rec { ./fix-source-date.patch ]; - # fixes non-determinism between builds on macos - preConfigure = lib.optional stdenv.hostPlatform.isDarwin '' - export LDFLAGS="$LDFLAGS -Wl,-no_uuid -Wl,-install_name,@rpath/libJudy.1.dylib" - ''; - # Disable parallel builds as manpages lack some dependencies: # ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs # make[2]: *** No rule to make target 'man/man3/JSLD', needed by 'all-am'. Stop. diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix index 0398dc0346f8..99b82625407b 100644 --- a/pkgs/by-name/ju/juju/package.nix +++ b/pkgs/by-name/ju/juju/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "juju"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "v${version}"; - hash = "sha256-kXSqOifUkx6ReXBrB19Zx6TbiloaG+G90cIo/+ysIHk="; + hash = "sha256-Ruwmj+MrqulB+XwbE3qvqFJ/yt0ttwFuM9lqXV9YI7k="; }; - vendorHash = "sha256-xqF5+QvZbC04e2f8/pftfbhXrJjCZKfAcyw74kwgdn4="; + vendorHash = "sha256-/BejA4Wn+SbKQHDqA7hanVaTKzaInLNOMSlesy714VI="; subPackages = [ "cmd/juju" diff --git a/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch b/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch deleted file mode 100644 index fc68f2ffe0f4..000000000000 --- a/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b4f936ac302ee835aa274e4dd186b436781d5d2f Mon Sep 17 00:00:00 2001 -From: Rui Chen -Date: Thu, 9 Jan 2025 09:51:47 -0500 -Subject: [PATCH] chore(deps): update git2 to use libgit2 1.9 - -Signed-off-by: Rui Chen ---- - Cargo.lock | 8 ++++---- - Cargo.toml | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 69398f4d6d..3ec8dfdacc 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -913,9 +913,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - - [[package]] - name = "git2" --version = "0.19.0" -+version = "0.20.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" -+checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff" - dependencies = [ - "bitflags", - "libc", -@@ -2109,9 +2109,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" - - [[package]] - name = "libgit2-sys" --version = "0.17.0+1.8.1" -+version = "0.18.0+1.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" -+checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec" - dependencies = [ - "cc", - "libc", -diff --git a/Cargo.toml b/Cargo.toml -index 0fc4393cb5..b955fd6aa1 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -46,7 +46,7 @@ dirs = "5.0.1" - dunce = "1.0.5" - either = "1.13.0" - futures = "0.3.31" --git2 = { version = "0.19.0", features = [ -+git2 = { version = "0.20.0", features = [ - # Do *not* disable this feature even if you'd like dynamic linking. Instead, - # set the environment variable `LIBGIT2_NO_VENDOR=1` if dynamic linking must - # be used (this will override the Cargo feature), and allow static linking diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index f07cb3d35ce5..6a46439566f6 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -5,7 +5,6 @@ fetchFromGitHub, installShellFiles, pkg-config, - zstd, libgit2, libssh2, openssl, @@ -14,33 +13,23 @@ openssh, buildPackages, nix-update-script, - testers, - jujutsu, + versionCheckHook, }: -let - version = "0.27.0"; -in - -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "jujutsu"; - inherit version; + version = "0.29.0"; src = fetchFromGitHub { owner = "jj-vcs"; repo = "jj"; - tag = "v${version}"; - hash = "sha256-fBgJrSglH46+NHu3spk5mC51ASDHWnOoW6veKZ0R2YA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-jyhjKppwK+emwLEXtOJKU0f4mPdLzDrQabnHhpyUzmw="; }; useFetchCargoVendor = true; - cargoPatches = [ - # - ./libgit2-1.9.0.patch - ]; - - cargoHash = "sha256-35DJdAUXc2gb/EXECScwinSzzp7uaxFbUxedjqRGfj8="; + cargoHash = "sha256-1bb7YWXExS62s83rprHa0byUBJUCdw6JDYkQ3VZcje8="; nativeBuildInputs = [ installShellFiles @@ -48,7 +37,6 @@ rustPlatform.buildRustPackage { ]; buildInputs = [ - zstd libgit2 libssh2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; @@ -75,6 +63,12 @@ rustPlatform.buildRustPackage { "jj-cli" ]; + # taplo-cli (used in tests) always creates a reqwest client, which + # requires configd access on macOS. + sandboxProfile = '' + (allow mach-lookup (global-name "com.apple.SystemConfiguration.configd")) + ''; + env = { # Disable vendored libraries. ZSTD_SYS_USE_PKG_CONFIG = "1"; @@ -96,20 +90,19 @@ rustPlatform.buildRustPackage { --zsh <(COMPLETE=zsh ${jj}) ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/jj"; + versionCheckProgramArg = "--version"; + passthru = { updateScript = nix-update-script { }; - tests = { - version = testers.testVersion { - package = jujutsu; - command = "jj --version"; - }; - }; }; meta = { description = "Git-compatible DVCS that is both simple and powerful"; homepage = "https://github.com/jj-vcs/jj"; - changelog = "https://github.com/jj-vcs/jj/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jj-vcs/jj/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ _0x4A6F @@ -119,4 +112,4 @@ rustPlatform.buildRustPackage { ]; mainProgram = "jj"; }; -} +}) diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix index abc2c8aa05c2..598e616c7649 100644 --- a/pkgs/by-name/ju/julec/package.nix +++ b/pkgs/by-name/ju/julec/package.nix @@ -1,43 +1,43 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, }: let irFile = - if stdenv.hostPlatform.system == "x86_64-linux" then + if clangStdenv.hostPlatform.system == "x86_64-linux" then "linux-amd64.cpp" - else if stdenv.hostPlatform.system == "aarch64-linux" then + else if clangStdenv.hostPlatform.system == "aarch64-linux" then "linux-arm64.cpp" - else if stdenv.hostPlatform.system == "i686-linux" then + else if clangStdenv.hostPlatform.system == "i686-linux" then "linux-i386.cpp" - else if stdenv.hostPlatform.system == "x86_64-darwin" then + else if clangStdenv.hostPlatform.system == "x86_64-darwin" then "darwin-amd64.cpp" - else if stdenv.hostPlatform.system == "aarch64-darwin" then + else if clangStdenv.hostPlatform.system == "aarch64-darwin" then "darwin-arm64.cpp" else - throw "Unsupported platform: ${stdenv.hostPlatform.system}"; + throw "Unsupported platform: ${clangStdenv.hostPlatform.system}"; in -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "julec"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "julelang"; repo = "jule"; tag = "jule${finalAttrs.version}"; name = "jule-${finalAttrs.version}"; - hash = "sha256-hFWoGeTmfXIPcICWXa5W36QDOk3yB7faORxFaM9shcQ="; + hash = "sha256-gFlca9XdRNv2CI3jfMiWejcmGGzabP0VGs4vlvFs72o="; }; irSrc = fetchFromGitHub { owner = "julelang"; repo = "julec-ir"; # revision determined by the upstream commit hash in julec-ir/README.md - rev = "a274782922e4275c4a036d63acffd3369dbc382f"; + rev = "4a3bf4fc84b53aa607855df6635d95d3e310f7ad"; name = "jule-ir-${finalAttrs.version}"; - hash = "sha256-TXMSXTGTzZntPUhT6QTmn3nD2k855ZoAW9aQWyhrE8s="; + hash = "sha256-Wl5AYRGYcQpj/R9nynxNC5r1HK1EmImwkLokdZfp9sE="; }; dontConfigure = true; @@ -58,16 +58,20 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - echo "Building ${finalAttrs.meta.mainProgram} v${finalAttrs.version} for ${stdenv.hostPlatform.system}..." + echo "Building ${finalAttrs.meta.mainProgram}-bootstrap v${finalAttrs.version} for ${clangStdenv.hostPlatform.system}..." mkdir -p bin - ${stdenv.cc.targetPrefix}c++ ir.cpp \ + ${clangStdenv.cc.targetPrefix}c++ ir.cpp \ --std=c++17 \ -Wno-everything \ - -O3 \ - -flto \ + -fwrapv \ + -ffloat-store \ -DNDEBUG \ -fomit-frame-pointer \ - -o "bin/${finalAttrs.meta.mainProgram}" + -fno-strict-aliasing \ + -o "bin/${finalAttrs.meta.mainProgram}-bootstrap" + + echo "Building ${finalAttrs.meta.mainProgram} v${finalAttrs.version} for ${clangStdenv.hostPlatform.system}..." + bin/${finalAttrs.meta.mainProgram}-bootstrap --opt L2 -p -o "bin/${finalAttrs.meta.mainProgram}" "src/${finalAttrs.meta.mainProgram}" runHook postBuild ''; diff --git a/pkgs/by-name/ju/julia-mono/package.nix b/pkgs/by-name/ju/julia-mono/package.nix index 36a92c0527b7..6e82bfcf4944 100644 --- a/pkgs/by-name/ju/julia-mono/package.nix +++ b/pkgs/by-name/ju/julia-mono/package.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.059"; + version = "0.060"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-b0h88rpylvMaRh9U/8oOhr4yOftzf7OvdwhpCuIeUjE="; + hash = "sha256-PmMGro8K4OwtKBIBhe/RKpi+MveSfhpQsiJfF+iUBzI="; }; installPhase = '' diff --git a/pkgs/by-name/ju/jumppad/package.nix b/pkgs/by-name/ju/jumppad/package.nix index 7fb20e5a272a..66cc90d457cb 100644 --- a/pkgs/by-name/ju/jumppad/package.nix +++ b/pkgs/by-name/ju/jumppad/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "jumppad"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-V+FDPNNNP7HMg0Somoj3EhGuhhq/Du8JcCBE/Ut2V1s="; + hash = "sha256-dzxFNOMFXbygTs4WIrG7aZ7LlEpkxepTgOP/QVq9z8s="; }; vendorHash = "sha256-BuXbizA/OJiP11kSIO476tWPYPzGTKmzPHeyIqs8pWc="; diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix index a3839536694b..5c2ac20a8e82 100644 --- a/pkgs/by-name/ju/jumpy/package.nix +++ b/pkgs/by-name/ju/jumpy/package.nix @@ -12,7 +12,6 @@ vulkan-loader, wayland, xorg, - darwin, }: rustPlatform.buildRustPackage rec { @@ -50,7 +49,6 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/ju/junction/package.nix b/pkgs/by-name/ju/junction/package.nix index 23f0887f7c23..8540f0406159 100644 --- a/pkgs/by-name/ju/junction/package.nix +++ b/pkgs/by-name/ju/junction/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "junction"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "sonnyp"; repo = "junction"; rev = "v${version}"; - hash = "sha256-0zY6Dp0aKHtBHSTiGbI5o6876BsARbo8/BbArl0RaMY="; + hash = "sha256-gnFig8C46x73gAUl9VVx3Y3hrhEVeP/DvaYHYuv9RTg="; fetchSubmodules = true; }; @@ -73,7 +73,8 @@ stdenv.mkDerivation rec { description = "Choose the application to open files and links"; homepage = "https://apps.gnome.org/Junction/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ hqurve ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ hqurve ]; + teams = [ teams.gnome-circle ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ju/just-formatter/package.nix b/pkgs/by-name/ju/just-formatter/package.nix new file mode 100644 index 000000000000..1fcbc2062e75 --- /dev/null +++ b/pkgs/by-name/ju/just-formatter/package.nix @@ -0,0 +1,25 @@ +{ + fetchCrate, + lib, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "just-formatter"; + version = "1.1.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-HTv55WquFieWmkEKX5sbBOVyYxzjcB/NrMkxbQsff90="; + }; + + cargoHash = "sha256-pJVvA2uzZzU5Rvh20gosYeasgCB6GAUjaWwqGWvLqAc="; + + meta = { + homepage = "https://github.com/eli-yip/just-formatter"; + description = "Format justfile from stdin to stdout"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vuimuich ]; + mainProgram = "just-formatter"; + }; +} diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix new file mode 100644 index 000000000000..a153eb5bb1d7 --- /dev/null +++ b/pkgs/by-name/ju/just-lsp/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "just-lsp"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "terror"; + repo = "just-lsp"; + tag = finalAttrs.version; + hash = "sha256-lR3VtPS96gPUj4OVZLeQSHnss22hBTRBLUV8n2Y3E9M="; + }; + + cargoHash = "sha256-eDjUYB5AN56hxolizw0KYb0Z/k28OWOUYOxhB/5pKV0="; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Language server for just"; + homepage = "https://github.com/terror/just-lsp"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "just-lsp"; + }; +}) diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 23166ba8c212..37a9b5b01ef6 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation rec { pname = "justbuild"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "just-buildsystem"; repo = "justbuild"; rev = "refs/tags/v${version}"; - hash = "sha256-HewKW2yezsc7mYZ6r3c0w/M3ybPzXqLPUL8N+plqE8o="; + hash = "sha256-EPRWJRo6vE4QizmWuh7yW3fZOIuS9I8EMiloBiqfVxs="; }; bazelapi = fetchurl { diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix index 2350f9673073..ce64a516a332 100644 --- a/pkgs/by-name/jw/jwx/package.nix +++ b/pkgs/by-name/jw/jwx/package.nix @@ -4,29 +4,30 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "jwx"; - version = "2.1.4"; + version = "3.0.1"; src = fetchFromGitHub { owner = "lestrrat-go"; - repo = pname; - rev = "v${version}"; - hash = "sha256-UXiF3X1jLk4dCGKmZlx9V08hzNJV+s/K2Wei9i+A6dg="; + repo = "jwx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZVI32z1hUquDUWdaLZGtI0PncboVHx2FJ3BB4MAhX0w="; }; - vendorHash = "sha256-ZS7xliFymXTE8hlc3GEMNonP5sJTZGirw5YQNzPCl3Y="; + vendorHash = "sha256-vyqsUZ7IxXI6LZKrSOPxheE/IISKRC0wXB7+xj51xLM="; - sourceRoot = "${src.name}/cmd/jwx"; + sourceRoot = "${finalAttrs.src.name}/cmd/jwx"; - meta = with lib; { + meta = { description = " Implementation of various JWx (Javascript Object Signing and Encryption/JOSE) technologies"; mainProgram = "jwx"; homepage = "https://github.com/lestrrat-go/jwx"; - license = licenses.mit; - maintainers = with maintainers; [ + changelog = "https://github.com/lestrrat-go/jwx/blob/v${finalAttrs.version}/Changes"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ arianvp flokli ]; }; -} +}) diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix index f234e0eba9ee..86f3c87e2687 100644 --- a/pkgs/by-name/jx/jx/package.nix +++ b/pkgs/by-name/jx/jx/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "jx"; - version = "3.11.69"; + version = "3.11.81"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-eEvQ7kZRY6gxunb8wDETXvZ6PYmLktDISMZoQFZEUmM="; + sha256 = "sha256-VpQV0R/+gqmypo3iGT8Zy1jqRvZsUqBabfaF5/6eS2o="; }; vendorHash = "sha256-8I4yTzLAL7E0ozHcBZDNsJLHkTh+SjT0SjDSECGRYIc="; diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix index 24542c9eb63e..8e7f667fd1fc 100644 --- a/pkgs/by-name/k0/k0sctl/package.nix +++ b/pkgs/by-name/k0/k0sctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "k0sproject"; repo = "k0sctl"; tag = "v${version}"; - hash = "sha256-KhbS7nO/NW7tX6G/MfM92krOHq8cj08515E9h78MJrI="; + hash = "sha256-NOGcyf4x9UCDL65sW+jLvTMUdCx5Uj4wtgi0Rrl+Miw="; }; - vendorHash = "sha256-ehTwgvnnL0Hl/xu/o2rwILKDzD0i3rZ73ogjpLcyJ0I="; + vendorHash = "sha256-f16tmU8gMFqw2G6T0W1thainfxZWIcGuWP7U4vjsoD8="; ldflags = [ "-s" diff --git a/pkgs/by-name/k2/k2pdfopt/package.nix b/pkgs/by-name/k2/k2pdfopt/package.nix index 8feb2b25d2b5..110cc469c0a9 100644 --- a/pkgs/by-name/k2/k2pdfopt/package.nix +++ b/pkgs/by-name/k2/k2pdfopt/package.nix @@ -4,6 +4,7 @@ runCommand, fetchzip, fetchurl, + fetchpatch, fetchFromGitHub, cmake, jbig2dec, @@ -20,12 +21,16 @@ mupdf, enableDJVU ? true, djvulibre, - enableGOCR ? false, - gocr, # Disabled by default due to crashes - enableTesseract ? true, - leptonica, + enableGOCR ? false, # Disabled by default due to crashes + gocr, + # Tesseract support is currently broken + # See: https://github.com/NixOS/nixpkgs/issues/368349 + enableTesseract ? false, tesseract5, + enableLeptonica ? true, + leptonica, opencl-headers, + fetchDebianPatch, }: # k2pdfopt is a pain to package. It requires modified versions of mupdf, @@ -87,6 +92,20 @@ stdenv.mkDerivation rec { patches = [ ./0001-Fix-CMakeLists.patch + (fetchDebianPatch { + inherit pname; + version = "${version}+ds"; + debianRevision = "3.1"; + patch = "0007-k2pdfoptlib-k2ocr.c-conditionally-enable-tesseract-r.patch"; + hash = "sha256-uJ9Gpyq64n/HKqo0hkQ2dnkSLCKNN4DedItPGzHfqR8="; + }) + (fetchDebianPatch { + inherit pname; + version = "${version}+ds"; + debianRevision = "3.1"; + patch = "0009-willuslib-CMakeLists.txt-conditionally-add-source-fi.patch"; + hash = "sha256-cBSlcuhsw4YgAJtBJkKLW6u8tK5gFwWw7pZEJzVMJDE="; + }) ]; postPatch = '' @@ -117,13 +136,43 @@ stdenv.mkDerivation rec { cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/ ''; }; + # mupdf_patch no longer applies cleanly against mupdf 1.25.0 or later, due to a conflicting + # hunk (mupdf_conflict) introduced in commit bd8d337939f36f55b96cb6984f5c7bbf2f488ce0 of mupdf. + # This merge conflict can be resolved as desired by reverting mupdf_conflict, applying mupdf_patch, + # and finally reapplying mupdf_conflict, with an increased fuzz factor (see mupdf_modded below). + # TODO: remove workaround with conflicting hunk when mupdf in k2pdfopt is updated to 1.25.0 or later + mupdf_conflict = + hash: revert: + fetchpatch { + name = "mupdf-conflicting-hunk" + (lib.optionalString revert "-reverted") + ".patch"; + url = "https://github.com/ArtifexSoftware/mupdf/commit/bd8d337939f36f55b96cb6984f5c7bbf2f488ce0.patch"; + inherit hash revert; + includes = [ "source/fitz/stext-device.c" ]; + postFetch = '' + filterdiff -#6 "$out" > "$tmpfile" + mv "$tmpfile" "$out" + ''; + }; mupdf_modded = mupdf.overrideAttrs ( { patches ? [ ], ... }: { - patches = patches ++ [ mupdf_patch ]; + # The fuzz factor is increased to automatically resolve the merge conflict. + patchFlags = [ + "-p1" + "-F3" + ]; + # Reverting and reapplying the conflicting hunk is necessary, otherwise the result will be faulty. + patches = patches ++ [ + # revert conflicting hunk + (mupdf_conflict "sha256-24tl9YBuZBYhb12yY3T0lKsA7NswfK0QcMYhb2IpepA=" true) + # apply modifications + mupdf_patch + # reapply conflicting hunk + (mupdf_conflict "sha256-bnBV7LyX1w/BXxBFF1bkA8x+/0I9Am33o8GiAeEKHYQ=" false) + ]; # This function is missing in font.c, see font-win32.c postPatch = '' echo "void pdf_install_load_system_font_funcs(fz_context *ctx) {}" >> source/fitz/font.c @@ -208,10 +257,8 @@ stdenv.mkDerivation rec { ++ lib.optional enableMuPDF mupdf_modded ++ lib.optional enableDJVU djvulibre ++ lib.optional enableGOCR gocr - ++ lib.optionals enableTesseract [ - leptonica_modded - tesseract_modded - ]; + ++ lib.optional enableTesseract tesseract_modded + ++ lib.optional (enableLeptonica || enableTesseract) leptonica_modded; dontUseCmakeBuildDir = true; diff --git a/pkgs/by-name/k8/k8sgpt/package.nix b/pkgs/by-name/k8/k8sgpt/package.nix index 325fea286a53..9ff0aeb38a16 100644 --- a/pkgs/by-name/k8/k8sgpt/package.nix +++ b/pkgs/by-name/k8/k8sgpt/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "k8sgpt"; - version = "0.4.1"; + version = "0.4.8"; src = fetchFromGitHub { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${version}"; - hash = "sha256-GKRI5qry2eYPP3/BTjS7qnIp7lX/uAR0s40y/oECaeY="; + hash = "sha256-TaJBGU+nLMVOL1uiHPan8p2DfuAWTr57Lt2BtfNq6dA="; }; - vendorHash = "sha256-7xcCSbQ5Mvoi7MActgwHMSp/duDxfugUZBOsMbzUGhg="; + vendorHash = "sha256-960gfOCpqY2gCbHR+fYFeV9UjztWMRVQKHIg/n3ELxk="; # https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix index 20677c9c43be..1cb90107f913 100644 --- a/pkgs/by-name/k9/k9s/package.nix +++ b/pkgs/by-name/k9/k9s/package.nix @@ -7,17 +7,18 @@ testers, nix-update-script, k9s, + writableTmpDirAsHomeHook, }: buildGoModule rec { pname = "k9s"; - version = "0.40.10"; + version = "0.50.5"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-QGymGiTHT3Qnf9l/hhE3lgJ7TBBjKMe2k1aJ32khU0E="; + hash = "sha256-hh00R0PCqhAUlwFps40CQ+hc6p2634WEGqNjX1mi/J8="; }; ldflags = [ @@ -32,12 +33,11 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-jAxrOdQcMIH7uECKGuuiTZlyV4aJ/a76IuKGouWg/r4="; + vendorHash = "sha256-g2tS1EpmG+Wba3kF9cH83JAG6EhKK4LrASGUSFtYYY8="; # TODO investigate why some config tests are failing doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); - # Required to workaround test check error: - 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 = { @@ -62,6 +62,8 @@ buildGoModule rec { --zsh <($out/bin/k9s completion zsh) ''; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + meta = with lib; { description = "Kubernetes CLI To Manage Your Clusters In Style"; homepage = "https://github.com/derailed/k9s"; diff --git a/pkgs/by-name/ka/kaf/package.nix b/pkgs/by-name/ka/kaf/package.nix index 697d6ca51305..34a542b8ac3a 100644 --- a/pkgs/by-name/ka/kaf/package.nix +++ b/pkgs/by-name/ka/kaf/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kaf"; - version = "0.2.11"; + version = "0.2.13"; src = fetchFromGitHub { owner = "birdayz"; repo = "kaf"; rev = "v${version}"; - hash = "sha256-SKQg3BCwvVwjZUkTjrMlSrfa8tu2VC8+ckMZpBJhnZE="; + hash = "sha256-tjHRIbTJJ8HPp2Jk7R2rl+ZN+ie6xRlssx4clcGc4U4="; }; vendorHash = "sha256-1QcQeeYQFsStK27NVdyCAb1Y40lyifBf0dlSgzocG3Y="; diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix index 084da69a7233..632045acd8c7 100644 --- a/pkgs/by-name/ka/kafkactl/package.nix +++ b/pkgs/by-name/ka/kafkactl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; tag = "v${version}"; - hash = "sha256-wSzLKiu6GqnCoQ5SkMhnh7u8ADUZ9vmVBRW6XRuR5I8="; + hash = "sha256-e21q4nXN3aI21PbNltRb6mzj67WmLsvJc8J0s7rrQBo="; }; - vendorHash = "sha256-VhNwmgKvKFiL6GQlKME0VbJKn8ESTxX5W27xPV4vwu0="; + vendorHash = "sha256-NVk5sguBWcl4W3VMiqpMvvNJ22Dk0dmoddakCbA9zTY="; doCheck = false; diff --git a/pkgs/by-name/ka/kahip/package.nix b/pkgs/by-name/ka/kahip/package.nix new file mode 100644 index 000000000000..19b79ba4ac33 --- /dev/null +++ b/pkgs/by-name/ka/kahip/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch2, + cmake, + mpi, + metis, + python3Packages, + pythonSupport ? false, + isILP64 ? false, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "kahip"; + version = "3.18"; + + src = fetchFromGitHub { + owner = "KaHIP"; + repo = "KaHIP"; + tag = "v${finalAttrs.version}"; + hash = "sha256-l8DhVb2G6pQQcH3Wq4NsKw30cSK3sG+gCYRdpibw4ZI="; + }; + + patches = [ + (fetchpatch2 { + url = "https://github.com/KaHIP/KaHIP/commit/9d4978c7540a1ccbc9807367d6e3852114e86567.patch?full_index=1"; + hash = "sha256-nIJL0YmVp9+JUhzEXjoabD1qNEnhtrBnjMWnitYt0eU="; + }) + ]; + + nativeBuildInputs = + [ cmake ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pybind11 + ]; + + buildInputs = [ + mpi + metis + ]; + + cmakeFlags = [ + (lib.cmakeBool "64BITMODE" isILP64) + (lib.cmakeBool "BUILDPYTHONMODULE" pythonSupport) + (lib.cmakeFeature "CMAKE_INSTALL_PYTHONDIR" python3Packages.python.sitePackages) + ]; + + doInstallCheck = pythonSupport; + + nativeInstallCheckInputs = lib.optionals pythonSupport [ + python3Packages.pythonImportsCheckHook + ]; + + pythonImportsCheck = [ "kahip" ]; + + meta = { + homepage = "https://kahip.github.io/"; + downloadPage = "https://github.com/KaHIP/KaHIP/"; + changelog = "https://github.com/KaHIP/KaHIP/releases/tag/v${finalAttrs.version}"; + description = "Karlsruhe HIGH Quality Partitioning"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ qbisi ]; + }; +}) diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 80e0c4b31c74..bbbe29f0fd80 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -4,10 +4,6 @@ fetchFromGitHub, replaceVars, perl, - stdenv, - CoreServices, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -26,12 +22,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-fb6RDcOLtkrUqw+BX2oa43d84BGF8IA2HxhdGgB94iU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; - meta = { description = "Kakoune Language Server Protocol Client"; homepage = "https://github.com/kakoune-lsp/kakoune-lsp"; diff --git a/pkgs/by-name/ka/kaldi/package.nix b/pkgs/by-name/ka/kaldi/package.nix new file mode 100644 index 000000000000..a689696c3b6a --- /dev/null +++ b/pkgs/by-name/ka/kaldi/package.nix @@ -0,0 +1,97 @@ +{ + lib, + stdenv, + openblas, + blas, + lapack, + icu, + cmake, + pkg-config, + fetchFromGitHub, + python3, + _experimental-update-script-combinators, + common-updater-scripts, + ripgrep, + unstableGitUpdater, + writeShellScript, +}: + +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; +stdenv.mkDerivation (finalAttrs: { + pname = "kaldi"; + version = "0-unstable-2024-11-29"; + + src = fetchFromGitHub { + owner = "kaldi-asr"; + repo = "kaldi"; + rev = "701f13107fda71195ab76a7f9f51ed45ce4ec728"; + sha256 = "sha256-Uusj5nkLyOiPI0mAdlykBDNEzHWE+tU/kUhVYzwjhOY="; + }; + + cmakeFlags = [ + "-DKALDI_BUILD_TEST=off" + "-DBUILD_SHARED_LIBS=on" + "-DBLAS_LIBRARIES=-lblas" + "-DLAPACK_LIBRARIES=-llapack" + "-DFETCHCONTENT_SOURCE_DIR_OPENFST:PATH=${finalAttrs.passthru.sources.openfst}" + ]; + + buildInputs = [ + openblas + icu + ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + + preConfigure = '' + cmakeFlagsArray+=( + # Extract version without the need for git. + # https://github.com/kaldi-asr/kaldi/blob/71f38e62cad01c3078555bfe78d0f3a527422d75/cmake/VersionHelper.cmake + # Patch number is not actually used by default so we can just ignore it. + # https://github.com/kaldi-asr/kaldi/blob/71f38e62cad01c3078555bfe78d0f3a527422d75/CMakeLists.txt#L214 + "-DKALDI_VERSION=$(cat src/.version)" + ) + ''; + + postInstall = '' + mkdir -p $out/share/kaldi + cp -r ../egs $out/share/kaldi + ''; + + passthru = { + sources = { + # rev from https://github.com/kaldi-asr/kaldi/blob/master/cmake/third_party/openfst.cmake + openfst = fetchFromGitHub { + owner = "kkm000"; + repo = "openfst"; + rev = "338225416178ac36b8002d70387f5556e44c8d05"; + hash = "sha256-MGEUuw7ex+WcujVdxpO2Bf5sB6Z0edcAeLGqW/Lo1Hs="; + }; + }; + + updateScript = + let + updateSource = unstableGitUpdater { }; + updateOpenfst = writeShellScript "update-openfst" '' + hash=$(${ripgrep}/bin/rg --multiline --pcre2 --only-matching 'FetchContent_Declare\(\s*openfst[^)]*GIT_TAG\s*([0-9a-f]{40})' --replace '$1' "${finalAttrs.src}/cmake/third_party/openfst.cmake") + ${common-updater-scripts}/bin/update-source-version kaldi.sources.openfst "$hash" --source-key=out "--version-key=rev" + ''; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateOpenfst + ]; + }; + + meta = with lib; { + description = "Speech Recognition Toolkit"; + homepage = "https://kaldi-asr.org"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/ka/kalker/package.nix b/pkgs/by-name/ka/kalker/package.nix index 62d73f96b129..be92531e950c 100644 --- a/pkgs/by-name/ka/kalker/package.nix +++ b/pkgs/by-name/ka/kalker/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch, gmp, mpfr, libmpc, @@ -19,7 +20,17 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; - cargoHash = "sha256-IYxgh6ni3BFnocHGKwKUqgSC2xUjn0b/4pBqRC5iY8U="; + cargoHash = "sha256-LEP2ebthwtpPSRmJt0BW/T/lB6EE+tylyVv+PDt8UoQ="; + + cargoPatches = [ + # Fixes build issue by just running cargo update + # Can be removed on next release + (fetchpatch { + name = "bump_cargo_deps.patch"; + url = "https://github.com/PaddiM8/kalker/commit/81bf66950a9dfeca4ab5fdd12774c93e40021eb1.patch"; + hash = "sha256-XT8jXTMIMOFw8OieoQM7IkUqw3SDi1c9eE1cD15BI9I="; + }) + ]; buildInputs = [ gmp diff --git a/pkgs/by-name/ka/kamid/package.nix b/pkgs/by-name/ka/kamid/package.nix index 0b8924270b05..ff185348afc8 100644 --- a/pkgs/by-name/ka/kamid/package.nix +++ b/pkgs/by-name/ka/kamid/package.nix @@ -1,20 +1,20 @@ { - stdenv, lib, + stdenv, + fetchurl, pkg-config, libevent, libressl, - libbsd, - fetchurl, readline, + libbsd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kamid"; version = "0.2"; src = fetchurl { - url = "https://github.com/omar-polo/kamid/releases/download/${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/omar-polo/kamid/releases/download/${finalAttrs.version}/kamid-${finalAttrs.version}.tar.gz"; sha256 = "sha256-23LgcZ+R6wcUz1fZA+IbhyshfQOTyiFPZ+uKVwOh680="; }; @@ -29,13 +29,20 @@ stdenv.mkDerivation rec { libbsd ]; + env.NIX_CFLAGS_COMPILE = toString [ + # client.c:381:13: error: implicit declaration of function 'setgroups'; did you mean 'getgroups'? + "-Wno-error=implicit-function-declaration" + # ftp.c:1585:22: error: passing argument 1 of 'log_procinit' makes pointer from integer without a cast + "-Wno-error=int-conversion" + ]; + makeFlags = [ "AR:=$(AR)" ]; - meta = with lib; { + meta = { description = "FREE, easy-to-use and portable implementation of a 9p file server daemon for UNIX-like systems"; homepage = "https://kamid.omarpolo.com"; - license = licenses.isc; - maintainers = with maintainers; [ heph2 ]; - platforms = platforms.linux; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ heph2 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ka/kana/package.nix b/pkgs/by-name/ka/kana/package.nix index ba8cf79ef86a..fc4d2aa1b860 100644 --- a/pkgs/by-name/ka/kana/package.nix +++ b/pkgs/by-name/ka/kana/package.nix @@ -12,7 +12,6 @@ desktop-file-utils, libadwaita, gst_all_1, - darwin, }: stdenv.mkDerivation rec { @@ -53,10 +52,7 @@ stdenv.mkDerivation rec { gst-plugins-base gst-plugins-bad gst-plugins-good - ]) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + ]); # Workaround for the gettext-sys issue # https://github.com/Koka/gettext-rs/issues/114 diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix index e7521b252862..1b949d4efc1d 100644 --- a/pkgs/by-name/ka/kanata/package.nix +++ b/pkgs/by-name/ka/kanata/package.nix @@ -12,17 +12,17 @@ }: rustPlatform.buildRustPackage rec { pname = "kanata"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "jtroo"; repo = "kanata"; rev = "v${version}"; - sha256 = "sha256-RTFP063NGNfjlOlZ4wghpcUQEmmj73Xlu3KPIxeUI/I="; + sha256 = "sha256-w/PeSqj51gJOWmAV5UPMprntdzinX/IL49D2ZUMfeSM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/r4u7pM7asCvG3LkbuP1Y63WVls1uZtV/L3cSOzUXr4="; + cargoHash = "sha256-T9fZxv3aujYparzVphfYBJ+5ti/T1VkeCeCqWPyllY8="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix index 5becb3694d3c..6132c44268cf 100644 --- a/pkgs/by-name/ka/kando/package.nix +++ b/pkgs/by-name/ka/kando/package.nix @@ -23,16 +23,16 @@ buildNpmPackage rec { pname = "kando"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "kando-menu"; repo = "kando"; tag = "v${version}"; - hash = "sha256-ihWHyafDU/B2Xb3ezNlC7hB8EhBCQOSuW+ki/V2SIPs="; + hash = "sha256-4toYogcxvNS+J/OphXM1HtH61FZRmnLsgxOJtJgkVdM="; }; - npmDepsHash = "sha256-PnKrTHAo3mKcVBhJQf/273k91UZxlDb3+2iXWGIfPs0="; + npmDepsHash = "sha256-lyCIuvyoVhcrNDDg0P3lSY8ru81momG1EKKT5u4yW8Y="; npmFlags = [ "--ignore-scripts" ]; diff --git a/pkgs/by-name/ka/kanha/package.nix b/pkgs/by-name/ka/kanha/package.nix index 1e42a8430dd8..1395e113ac21 100644 --- a/pkgs/by-name/ka/kanha/package.nix +++ b/pkgs/by-name/ka/kanha/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, openssl, }: @@ -20,16 +18,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-bO37UYApe1CbwcfG8j/1UPu6DlYqlGPLsh0epxh8x3M="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - CoreFoundation - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; meta = { description = "Web-app pentesting suite written in rust"; diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix index 1169e8b9bbeb..f7a603dba55c 100644 --- a/pkgs/by-name/ka/kanidm-provision/package.nix +++ b/pkgs/by-name/ka/kanidm-provision/package.nix @@ -2,29 +2,51 @@ lib, rustPlatform, fetchFromGitHub, + yq, + versionCheckHook, + nix-update-script, + nixosTests, }: -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "kanidm-provision"; - version = "1.1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "oddlama"; repo = "kanidm-provision"; - rev = "v${version}"; - hash = "sha256-pgPjkj0nMb5j3EvyJTTDpfmh0WigAcMzoleF5EOqBAM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-kwxGrLz59Zk8PSsfQzPUeA/xWQZrV1NWlS5/yuqfIyI="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-kbctfPhEF1PdVLjE62GyLDzjOnZxH/kOWUS4x2vd/+8="; + postPatch = '' + tomlq -ti '.package.version = "${finalAttrs.version}"' Cargo.toml + ''; - meta = with lib; { + useFetchCargoVendor = true; + cargoHash = "sha256-uo/TGyfNChq/t6Dah0HhXhAwktyQk0V/wewezZuftNk="; + + nativeBuildInputs = [ + yq # for `tomlq` + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + tests = { inherit (nixosTests) kanidm-provisioning; }; + updateScript = nix-update-script { }; + }; + + meta = { description = "A small utility to help with kanidm provisioning"; homepage = "https://github.com/oddlama/kanidm-provision"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ oddlama ]; + maintainers = with lib.maintainers; [ oddlama ]; mainProgram = "kanidm-provision"; }; -} +}) diff --git a/pkgs/by-name/ka/kanidm/1_6.nix b/pkgs/by-name/ka/kanidm/1_6.nix new file mode 100644 index 000000000000..33406713f260 --- /dev/null +++ b/pkgs/by-name/ka/kanidm/1_6.nix @@ -0,0 +1,6 @@ +import ./generic.nix { + version = "1.6.3"; + hash = "sha256-oZU7XgGpkPAwuUVVjpiKApOiQN692CRFjmWzE9hcqPY="; + cargoHash = "sha256-cgTCLTcPXjGdvremw1afyRGHwnBvqNGXr1D8Xgxv4uA="; + patchDir = ./patches/1_6; +} diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix index 9b9a95df57c3..08ac4c490901 100644 --- a/pkgs/by-name/ka/kanidm/generic.nix +++ b/pkgs/by-name/ka/kanidm/generic.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { inherit hash; }; - KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; + KANIDM_BUILD_PROFILE = "release_nixpkgs_${arch}"; patches = lib.optionals enableSecretProvisioning [ "${patchDir}/oauth2-basic-secret-modify.patch" @@ -59,6 +59,7 @@ rustPlatform.buildRustPackage rec { postPatch = let format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml"; + socket_path = if stdenv.hostPlatform.isLinux then "/run/kanidmd/sock" else "/var/run/kanidm.socket"; profile = { cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none"; @@ -67,12 +68,12 @@ rustPlatform.buildRustPackage rec { client_config_path = "/etc/kanidm/config"; resolver_config_path = "/etc/kanidm/unixd"; resolver_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash"; - server_admin_bind_path = "/run/kanidmd/sock"; + server_admin_bind_path = socket_path; server_config_path = "/etc/kanidm/server.toml"; server_ui_pkg_path = "@htmx_ui_pkg_path@"; } // lib.optionalAttrs (lib.versionOlder version "1.5") { - admin_bind_path = "/run/kanidmd/sock"; + admin_bind_path = socket_path; default_config_path = "/etc/kanidm/server.toml"; default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash"; htmx_ui_pkg_path = "@htmx_ui_pkg_path@"; @@ -94,13 +95,16 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = [ - udev - openssl - sqlite - pam - rust-jemalloc-sys - ]; + buildInputs = + [ + openssl + sqlite + pam + rust-jemalloc-sys + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + udev + ]; # The UI needs to be in place before the tests are run. postBuild = @@ -125,15 +129,17 @@ rustPlatform.buildRustPackage rec { ''profile.release.lto="off"'' ]; - preFixup = '' - installShellCompletion \ - --bash $releaseDir/build/completions/*.bash \ - --zsh $releaseDir/build/completions/_* - - # PAM and NSS need fix library names - mv $out/lib/libnss_kanidm.so $out/lib/libnss_kanidm.so.2 - mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so - ''; + preFixup = + '' + installShellCompletion \ + --bash $releaseDir/build/completions/*.bash \ + --zsh $releaseDir/build/completions/_* + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + # PAM and NSS need fix library names + mv $out/lib/libnss_kanidm.so $out/lib/libnss_kanidm.so.2 + mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so + ''; passthru = { tests = { @@ -166,7 +172,7 @@ rustPlatform.buildRustPackage rec { description = "Simple, secure and fast identity management platform"; homepage = "https://github.com/kanidm/kanidm"; license = licenses.mpl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ adamcstephens Flakebi diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index 0b9178b3d6a7..a71683505630 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -1 +1 @@ -import ./1_5.nix +import ./1_6.nix diff --git a/pkgs/by-name/ka/kanidm/patches/1_5/oauth2-basic-secret-modify.patch b/pkgs/by-name/ka/kanidm/patches/1_5/oauth2-basic-secret-modify.patch index 80bd4c16bd9b..f064d0cb4586 100644 --- a/pkgs/by-name/ka/kanidm/patches/1_5/oauth2-basic-secret-modify.patch +++ b/pkgs/by-name/ka/kanidm/patches/1_5/oauth2-basic-secret-modify.patch @@ -1,27 +1,20 @@ -From e9dfca73e6fb80faf6fc106e7aee6b93c0908525 Mon Sep 17 00:00:00 2001 -From: oddlama -Date: Fri, 1 Nov 2024 12:26:17 +0100 +From cf50a972b446b0ae051cfa4b01d82a4f8077386e Mon Sep 17 00:00:00 2001 +From: Benjamin Bädorf +Date: Fri, 28 Mar 2025 19:27:42 +0100 Subject: [PATCH 1/2] oauth2 basic secret modify --- server/core/src/actors/v1_write.rs | 42 ++++++++++++++++++++++++++++++ server/core/src/https/v1.rs | 6 ++++- server/core/src/https/v1_oauth2.rs | 29 +++++++++++++++++++++ - server/lib/src/constants/acp.rs | 6 +++++ - 4 files changed, 82 insertions(+), 1 deletion(-) + server/lib/src/constants/acp.rs | 8 ++++++ + 4 files changed, 84 insertions(+), 1 deletion(-) diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs -index 732e826c8..0fe66503f 100644 +index 732e826c8..a2b8e503f 100644 --- a/server/core/src/actors/v1_write.rs +++ b/server/core/src/actors/v1_write.rs -@@ -317,20 +317,62 @@ impl QueryServerWriteV1 { - }; - - trace!(?del, "Begin delete event"); - - idms_prox_write - .qs_write - .delete(&del) +@@ -324,6 +324,48 @@ impl QueryServerWriteV1 { .and_then(|_| idms_prox_write.commit().map(|_| ())) } @@ -70,21 +63,11 @@ index 732e826c8..0fe66503f 100644 #[instrument( level = "info", skip_all, - fields(uuid = ?eventid) - )] - pub async fn handle_reviverecycled( - &self, - client_auth_info: ClientAuthInfo, - filter: Filter, - eventid: Uuid, diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs index c410a4b5d..cc67cac6c 100644 --- a/server/core/src/https/v1.rs +++ b/server/core/src/https/v1.rs -@@ -1,17 +1,17 @@ - //! The V1 API things! - - use axum::extract::{Path, State}; +@@ -4,7 +4,7 @@ use axum::extract::{Path, State}; use axum::http::{HeaderMap, HeaderValue}; use axum::middleware::from_fn; use axum::response::{IntoResponse, Response}; @@ -93,21 +76,7 @@ index c410a4b5d..cc67cac6c 100644 use axum::{Extension, Json, Router}; use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite}; use compact_jwt::{Jwk, Jws, JwsSigner}; - use kanidm_proto::constants::uri::V1_AUTH_VALID; - use std::net::IpAddr; - use uuid::Uuid; - - use kanidm_proto::internal::{ - ApiToken, AppLink, CUIntentToken, CURequest, CUSessionToken, CUStatus, CreateRequest, - CredentialStatus, DeleteRequest, IdentifyUserRequest, IdentifyUserResponse, ModifyRequest, -@@ -3120,20 +3120,24 @@ pub(crate) fn route_setup(state: ServerState) -> Router { - ) - .route( - "/v1/oauth2/:rs_name/_image", - post(super::v1_oauth2::oauth2_id_image_post) - .delete(super::v1_oauth2::oauth2_id_image_delete), - ) - .route( +@@ -3127,6 +3127,10 @@ pub(crate) fn route_setup(state: ServerState) -> Router { "/v1/oauth2/:rs_name/_basic_secret", get(super::v1_oauth2::oauth2_id_get_basic_secret), ) @@ -118,25 +87,11 @@ index c410a4b5d..cc67cac6c 100644 .route( "/v1/oauth2/:rs_name/_scopemap/:group", post(super::v1_oauth2::oauth2_id_scopemap_post) - .delete(super::v1_oauth2::oauth2_id_scopemap_delete), - ) - .route( - "/v1/oauth2/:rs_name/_sup_scopemap/:group", - post(super::v1_oauth2::oauth2_id_sup_scopemap_post) - .delete(super::v1_oauth2::oauth2_id_sup_scopemap_delete), - ) diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs -index d3966a7ad..f89c02c69 100644 +index f399539bc..ffad9921e 100644 --- a/server/core/src/https/v1_oauth2.rs +++ b/server/core/src/https/v1_oauth2.rs -@@ -144,20 +144,49 @@ pub(crate) async fn oauth2_id_get_basic_secret( - ) -> Result>, WebError> { - let filter = oauth2_id(&rs_name); - state - .qe_r_ref - .handle_oauth2_basic_secret_read(client_auth_info, filter, kopid.eventid) - .await - .map(Json::from) +@@ -151,6 +151,35 @@ pub(crate) async fn oauth2_id_get_basic_secret( .map_err(WebError::from) } @@ -172,25 +127,11 @@ index d3966a7ad..f89c02c69 100644 #[utoipa::path( patch, path = "/v1/oauth2/{rs_name}", - request_body=ProtoEntry, - responses( - DefaultApiResponse, - ), - security(("token_jwt" = [])), - tag = "v1/oauth2", - operation_id = "oauth2_id_patch" diff --git a/server/lib/src/constants/acp.rs b/server/lib/src/constants/acp.rs -index be1836345..ebf4445be 100644 +index 7c0487745..3cd83ad52 100644 --- a/server/lib/src/constants/acp.rs +++ b/server/lib/src/constants/acp.rs -@@ -658,36 +658,38 @@ lazy_static! { - Attribute::Image, - ], - modify_present_attrs: vec![ - Attribute::Description, - Attribute::DisplayName, - Attribute::OAuth2RsName, - Attribute::OAuth2RsOrigin, +@@ -665,6 +665,7 @@ lazy_static! { Attribute::OAuth2RsOriginLanding, Attribute::OAuth2RsSupScopeMap, Attribute::OAuth2RsScopeMap, @@ -198,16 +139,7 @@ index be1836345..ebf4445be 100644 Attribute::OAuth2AllowInsecureClientDisablePkce, Attribute::OAuth2JwtLegacyCryptoEnable, Attribute::OAuth2PreferShortUsername, - Attribute::OAuth2AllowLocalhostRedirect, - Attribute::OAuth2RsClaimMap, - Attribute::Image, - ], - create_attrs: vec![ - Attribute::Class, - Attribute::Description, - Attribute::DisplayName, - Attribute::OAuth2RsName, - Attribute::OAuth2RsOrigin, +@@ -681,6 +682,7 @@ lazy_static! { Attribute::OAuth2RsOriginLanding, Attribute::OAuth2RsSupScopeMap, Attribute::OAuth2RsScopeMap, @@ -215,21 +147,7 @@ index be1836345..ebf4445be 100644 Attribute::OAuth2AllowInsecureClientDisablePkce, Attribute::OAuth2JwtLegacyCryptoEnable, Attribute::OAuth2PreferShortUsername, - Attribute::OAuth2AllowLocalhostRedirect, - Attribute::OAuth2RsClaimMap, - Attribute::Image, - ], - create_classes: vec![ - EntryClass::Object, - EntryClass::OAuth2ResourceServer, -@@ -759,37 +761,39 @@ lazy_static! { - Attribute::Image, - ], - modify_present_attrs: vec![ - Attribute::Description, - Attribute::DisplayName, - Attribute::Name, - Attribute::OAuth2RsOrigin, +@@ -766,6 +768,7 @@ lazy_static! { Attribute::OAuth2RsOriginLanding, Attribute::OAuth2RsSupScopeMap, Attribute::OAuth2RsScopeMap, @@ -237,17 +155,7 @@ index be1836345..ebf4445be 100644 Attribute::OAuth2AllowInsecureClientDisablePkce, Attribute::OAuth2JwtLegacyCryptoEnable, Attribute::OAuth2PreferShortUsername, - Attribute::OAuth2AllowLocalhostRedirect, - Attribute::OAuth2RsClaimMap, - Attribute::Image, - ], - create_attrs: vec![ - Attribute::Class, - Attribute::Description, - Attribute::Name, - Attribute::DisplayName, - Attribute::OAuth2RsName, - Attribute::OAuth2RsOrigin, +@@ -783,6 +786,7 @@ lazy_static! { Attribute::OAuth2RsOriginLanding, Attribute::OAuth2RsSupScopeMap, Attribute::OAuth2RsScopeMap, @@ -255,21 +163,7 @@ index be1836345..ebf4445be 100644 Attribute::OAuth2AllowInsecureClientDisablePkce, Attribute::OAuth2JwtLegacyCryptoEnable, Attribute::OAuth2PreferShortUsername, - Attribute::OAuth2AllowLocalhostRedirect, - Attribute::OAuth2RsClaimMap, - Attribute::Image, - ], - create_classes: vec![ - EntryClass::Object, - EntryClass::Account, -@@ -864,38 +868,40 @@ lazy_static! { - Attribute::OAuth2StrictRedirectUri, - ], - modify_present_attrs: vec![ - Attribute::Description, - Attribute::DisplayName, - Attribute::Name, - Attribute::OAuth2RsOrigin, +@@ -871,6 +875,7 @@ lazy_static! { Attribute::OAuth2RsOriginLanding, Attribute::OAuth2RsSupScopeMap, Attribute::OAuth2RsScopeMap, @@ -277,18 +171,23 @@ index be1836345..ebf4445be 100644 Attribute::OAuth2AllowInsecureClientDisablePkce, Attribute::OAuth2JwtLegacyCryptoEnable, Attribute::OAuth2PreferShortUsername, - Attribute::OAuth2AllowLocalhostRedirect, - Attribute::OAuth2RsClaimMap, - Attribute::Image, - Attribute::OAuth2StrictRedirectUri, - ], - create_attrs: vec![ - Attribute::Class, - Attribute::Description, - Attribute::Name, - Attribute::DisplayName, - Attribute::OAuth2RsName, - Attribute::OAuth2RsOrigin, +@@ -889,6 +894,7 @@ lazy_static! { + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, +@@ -980,6 +986,7 @@ lazy_static! { + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, +@@ -999,6 +1006,7 @@ lazy_static! { Attribute::OAuth2RsOriginLanding, Attribute::OAuth2RsSupScopeMap, Attribute::OAuth2RsScopeMap, @@ -296,13 +195,5 @@ index be1836345..ebf4445be 100644 Attribute::OAuth2AllowInsecureClientDisablePkce, Attribute::OAuth2JwtLegacyCryptoEnable, Attribute::OAuth2PreferShortUsername, - Attribute::OAuth2AllowLocalhostRedirect, - Attribute::OAuth2RsClaimMap, - Attribute::Image, - Attribute::OAuth2StrictRedirectUri, - ], - create_classes: vec![ - EntryClass::Object, -- -2.46.1 - +2.47.2 diff --git a/pkgs/by-name/ka/kanidm/patches/1_6/oauth2-basic-secret-modify.patch b/pkgs/by-name/ka/kanidm/patches/1_6/oauth2-basic-secret-modify.patch new file mode 100644 index 000000000000..191f06626f0f --- /dev/null +++ b/pkgs/by-name/ka/kanidm/patches/1_6/oauth2-basic-secret-modify.patch @@ -0,0 +1,159 @@ +From fc26fe5ac9e9cd65af82609c5a4966c8f756ea0f Mon Sep 17 00:00:00 2001 +From: oddlama +Date: Fri, 21 Mar 2025 16:07:54 +0100 +Subject: [PATCH 1/2] oauth2 basic secret modify + +--- + server/core/src/actors/v1_write.rs | 42 +++++++++++++++++++++++++++++ + server/core/src/https/v1.rs | 6 ++++- + server/core/src/https/v1_oauth2.rs | 29 ++++++++++++++++++++ + server/lib/src/server/migrations.rs | 16 +++++++++++ + 4 files changed, 92 insertions(+), 1 deletion(-) + +diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs +index 732e826c8..a2b8e503f 100644 +--- a/server/core/src/actors/v1_write.rs ++++ b/server/core/src/actors/v1_write.rs +@@ -324,6 +324,48 @@ impl QueryServerWriteV1 { + .and_then(|_| idms_prox_write.commit().map(|_| ())) + } + ++ #[instrument( ++ level = "info", ++ skip_all, ++ fields(uuid = ?eventid) ++ )] ++ pub async fn handle_oauth2_basic_secret_write( ++ &self, ++ client_auth_info: ClientAuthInfo, ++ filter: Filter, ++ new_secret: String, ++ eventid: Uuid, ++ ) -> Result<(), OperationError> { ++ // Given a protoEntry, turn this into a modification set. ++ let ct = duration_from_epoch_now(); ++ let mut idms_prox_write = self.idms.proxy_write(ct).await?; ++ let ident = idms_prox_write ++ .validate_client_auth_info_to_ident(client_auth_info, ct) ++ .map_err(|e| { ++ admin_error!(err = ?e, "Invalid identity"); ++ e ++ })?; ++ ++ let modlist = ModifyList::new_purge_and_set( ++ Attribute::OAuth2RsBasicSecret, ++ Value::SecretValue(new_secret), ++ ); ++ ++ let mdf = ++ ModifyEvent::from_internal_parts(ident, &modlist, &filter, &idms_prox_write.qs_write) ++ .map_err(|e| { ++ admin_error!(err = ?e, "Failed to begin modify during handle_oauth2_basic_secret_write"); ++ e ++ })?; ++ ++ trace!(?mdf, "Begin modify event"); ++ ++ idms_prox_write ++ .qs_write ++ .modify(&mdf) ++ .and_then(|_| idms_prox_write.commit()) ++ } ++ + #[instrument( + level = "info", + skip_all, +diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs +index 30de387b8..a11aa8ecd 100644 +--- a/server/core/src/https/v1.rs ++++ b/server/core/src/https/v1.rs +@@ -4,7 +4,7 @@ use axum::extract::{Path, State}; + use axum::http::{HeaderMap, HeaderValue}; + use axum::middleware::from_fn; + use axum::response::{IntoResponse, Response}; +-use axum::routing::{delete, get, post, put}; ++use axum::routing::{delete, get, post, put, patch}; + use axum::{Extension, Json, Router}; + use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite}; + use compact_jwt::{Jwk, Jws, JwsSigner}; +@@ -3129,6 +3129,10 @@ pub(crate) fn route_setup(state: ServerState) -> Router { + "/v1/oauth2/:rs_name/_basic_secret", + get(super::v1_oauth2::oauth2_id_get_basic_secret), + ) ++ .route( ++ "/v1/oauth2/:rs_name/_basic_secret", ++ patch(super::v1_oauth2::oauth2_id_patch_basic_secret), ++ ) + .route( + "/v1/oauth2/:rs_name/_scopemap/:group", + post(super::v1_oauth2::oauth2_id_scopemap_post) +diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs +index f399539bc..ffad9921e 100644 +--- a/server/core/src/https/v1_oauth2.rs ++++ b/server/core/src/https/v1_oauth2.rs +@@ -151,6 +151,35 @@ pub(crate) async fn oauth2_id_get_basic_secret( + .map_err(WebError::from) + } + ++#[utoipa::path( ++ patch, ++ path = "/v1/oauth2/{rs_name}/_basic_secret", ++ request_body=ProtoEntry, ++ responses( ++ DefaultApiResponse, ++ ), ++ security(("token_jwt" = [])), ++ tag = "v1/oauth2", ++ operation_id = "oauth2_id_patch_basic_secret" ++)] ++/// Overwrite the basic secret for a given OAuth2 Resource Server. ++#[instrument(level = "info", skip(state, new_secret))] ++pub(crate) async fn oauth2_id_patch_basic_secret( ++ State(state): State, ++ Extension(kopid): Extension, ++ VerifiedClientInformation(client_auth_info): VerifiedClientInformation, ++ Path(rs_name): Path, ++ Json(new_secret): Json, ++) -> Result, WebError> { ++ let filter = oauth2_id(&rs_name); ++ state ++ .qe_w_ref ++ .handle_oauth2_basic_secret_write(client_auth_info, filter, new_secret, kopid.eventid) ++ .await ++ .map(Json::from) ++ .map_err(WebError::from) ++} ++ + #[utoipa::path( + patch, + path = "/v1/oauth2/{rs_name}", +diff --git a/server/lib/src/server/migrations.rs b/server/lib/src/server/migrations.rs +index fd0bca8db..8621714f2 100644 +--- a/server/lib/src/server/migrations.rs ++++ b/server/lib/src/server/migrations.rs +@@ -171,6 +171,22 @@ impl QueryServer { + reload_required = true; + }; + ++ // secret provisioning: allow idm_admin to modify OAuth2RsBasicSecret. ++ write_txn.internal_modify_uuid( ++ UUID_IDM_ACP_OAUTH2_MANAGE_V1, ++ &ModifyList::new_append( ++ Attribute::AcpCreateAttr, ++ Attribute::OAuth2RsBasicSecret.into(), ++ ), ++ )?; ++ write_txn.internal_modify_uuid( ++ UUID_IDM_ACP_OAUTH2_MANAGE_V1, ++ &ModifyList::new_append( ++ Attribute::AcpModifyPresentAttr, ++ Attribute::OAuth2RsBasicSecret.into(), ++ ), ++ )?; ++ + // Execute whatever operations we have batched up and ready to go. This is needed + // to preserve ordering of the operations - if we reloaded after a remigrate then + // we would have skipped the patch level fix which needs to have occurred *first*. +-- +2.49.0 + diff --git a/pkgs/by-name/ka/kanidm/patches/1_6/recover-account.patch b/pkgs/by-name/ka/kanidm/patches/1_6/recover-account.patch new file mode 100644 index 000000000000..1892cdf63a19 --- /dev/null +++ b/pkgs/by-name/ka/kanidm/patches/1_6/recover-account.patch @@ -0,0 +1,122 @@ +From 229165abe5be596fc2be8e285884813a1b5a38c8 Mon Sep 17 00:00:00 2001 +From: oddlama +Date: Fri, 21 Mar 2025 16:08:15 +0100 +Subject: [PATCH 2/2] recover account + +--- + server/core/src/actors/internal.rs | 5 +++-- + server/core/src/admin.rs | 6 +++--- + server/daemon/src/main.rs | 23 ++++++++++++++++++++++- + server/daemon/src/opt.rs | 7 +++++++ + 4 files changed, 35 insertions(+), 6 deletions(-) + +diff --git a/server/core/src/actors/internal.rs b/server/core/src/actors/internal.rs +index 420e72c6c..e252bca51 100644 +--- a/server/core/src/actors/internal.rs ++++ b/server/core/src/actors/internal.rs +@@ -172,17 +172,18 @@ impl QueryServerWriteV1 { + + #[instrument( + level = "info", +- skip(self, eventid), ++ skip(self, password, eventid), + fields(uuid = ?eventid) + )] + pub(crate) async fn handle_admin_recover_account( + &self, + name: String, ++ password: Option, + eventid: Uuid, + ) -> Result { + let ct = duration_from_epoch_now(); + let mut idms_prox_write = self.idms.proxy_write(ct).await?; +- let pw = idms_prox_write.recover_account(name.as_str(), None)?; ++ let pw = idms_prox_write.recover_account(name.as_str(), password.as_deref())?; + + idms_prox_write.commit().map(|()| pw) + } +diff --git a/server/core/src/admin.rs b/server/core/src/admin.rs +index 90ccb1927..85e31ddef 100644 +--- a/server/core/src/admin.rs ++++ b/server/core/src/admin.rs +@@ -24,7 +24,7 @@ pub use kanidm_proto::internal::{ + + #[derive(Serialize, Deserialize, Debug)] + pub enum AdminTaskRequest { +- RecoverAccount { name: String }, ++ RecoverAccount { name: String, password: Option }, + ShowReplicationCertificate, + RenewReplicationCertificate, + RefreshReplicationConsumer, +@@ -309,8 +309,8 @@ async fn handle_client( + + let resp = async { + match req { +- AdminTaskRequest::RecoverAccount { name } => { +- match server_rw.handle_admin_recover_account(name, eventid).await { ++ AdminTaskRequest::RecoverAccount { name, password } => { ++ match server_rw.handle_admin_recover_account(name, password, eventid).await { + Ok(password) => AdminTaskResponse::RecoverAccount { password }, + Err(e) => { + error!(err = ?e, "error during recover-account"); +diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs +index c3b40faa0..2a57a307c 100644 +--- a/server/daemon/src/main.rs ++++ b/server/daemon/src/main.rs +@@ -923,13 +923,34 @@ async fn kanidm_main(config: Configuration, opt: KanidmdParser) -> ExitCode { + .await; + } + } +- KanidmdOpt::RecoverAccount { name, commonopts } => { ++ KanidmdOpt::RecoverAccount { name, from_environment, commonopts } => { + info!("Running account recovery ..."); + let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into(); ++ let password = if *from_environment { ++ match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE") { ++ Ok(path) => match tokio::fs::read_to_string(&path).await { ++ Ok(contents) => Some(contents), ++ Err(e) => { ++ error!("Failed to read password file '{}': {}", path, e); ++ return ExitCode::FAILURE; ++ } ++ }, ++ Err(_) => match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD") { ++ Ok(val) => Some(val), ++ Err(_) => { ++ error!("Neither KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE nor KANIDM_RECOVER_ACCOUNT_PASSWORD was set"); ++ return ExitCode::FAILURE; ++ } ++ } ++ } ++ } else { ++ None ++ }; + submit_admin_req( + config.adminbindpath.as_str(), + AdminTaskRequest::RecoverAccount { + name: name.to_owned(), ++ password, + }, + output_mode, + ) +diff --git a/server/daemon/src/opt.rs b/server/daemon/src/opt.rs +index f1b45a5b3..ca19fb6a5 100644 +--- a/server/daemon/src/opt.rs ++++ b/server/daemon/src/opt.rs +@@ -236,6 +236,13 @@ enum KanidmdOpt { + #[clap(value_parser)] + /// The account name to recover credentials for. + name: String, ++ /// Use a password given via an environment variable. ++ /// - `KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE` takes precedence and reads the desired ++ /// password from the given file ++ /// - `KANIDM_RECOVER_ACCOUNT_PASSWORD` directly takes a ++ /// password - beware that this will leave the password in the environment ++ #[clap(long = "from-environment")] ++ from_environment: bool, + #[clap(flatten)] + commonopts: CommonOpt, + }, +-- +2.49.0 + diff --git a/pkgs/by-name/ka/kapp/package.nix b/pkgs/by-name/ka/kapp/package.nix index cefc16d1036f..cd8d895fd631 100644 --- a/pkgs/by-name/ka/kapp/package.nix +++ b/pkgs/by-name/ka/kapp/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kapp"; - version = "0.64.1"; + version = "0.64.2"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "kapp"; rev = "v${version}"; - hash = "sha256-vgb4VtMKYncO4TPlMj2HrgZvjoOsOc2cYy+EBDKnGcM="; + hash = "sha256-XIbKhJBGw+0TuRakZCBZ1d6MjNPpy252MgCDpPNEo3c="; }; vendorHash = null; diff --git a/pkgs/by-name/ka/karabiner-elements/package.nix b/pkgs/by-name/ka/karabiner-elements/package.nix index f7c02f9bf9fa..881b6c3f6816 100644 --- a/pkgs/by-name/ka/karabiner-elements/package.nix +++ b/pkgs/by-name/ka/karabiner-elements/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "karabiner-elements"; - version = "15.0.0"; + version = "15.3.0"; src = fetchurl { url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${finalAttrs.version}/Karabiner-Elements-${finalAttrs.version}.dmg"; - hash = "sha256-xWCsbkP9cVnDjWFTgWl5KrR7wEpcQYM4Md99pTI/l14="; + hash = "sha256-Szf2mBC8c4JA3Ky4QPTvS4GJ0PXFbN0Y7Rpum9lRABE="; }; outputs = [ diff --git a/pkgs/by-name/ka/karakeep/helpers/karakeep b/pkgs/by-name/ka/karakeep/helpers/karakeep new file mode 100755 index 000000000000..a749bbdd0b1f --- /dev/null +++ b/pkgs/by-name/ka/karakeep/helpers/karakeep @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -eu -o pipefail +KARAKEEP_LIB_PATH= +NODEJS= +exec "$NODEJS/bin/node" "$KARAKEEP_LIB_PATH/apps/cli/dist/index.mjs" "$@" diff --git a/pkgs/by-name/ka/karakeep/helpers/migrate b/pkgs/by-name/ka/karakeep/helpers/migrate new file mode 100755 index 000000000000..92f4705e5cd7 --- /dev/null +++ b/pkgs/by-name/ka/karakeep/helpers/migrate @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +set -eu -o pipefail +KARAKEEP_LIB_PATH= +RELEASE= +NODE_ENV=production + +[[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists + +export RELEASE NODE_ENV +exec "$KARAKEEP_LIB_PATH/node_modules/.bin/tsx" "$KARAKEEP_LIB_PATH/packages/db/migrate.ts" "$@" diff --git a/pkgs/by-name/ka/karakeep/helpers/start-web b/pkgs/by-name/ka/karakeep/helpers/start-web new file mode 100755 index 000000000000..daa6a93167b3 --- /dev/null +++ b/pkgs/by-name/ka/karakeep/helpers/start-web @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -eu -o pipefail +KARAKEEP_LIB_PATH= +RELEASE= +NODEJS= +NODE_ENV=production + +[[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists + +export RELEASE NODE_ENV +exec "$NODEJS/bin/node" "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/server.js" diff --git a/pkgs/by-name/ka/karakeep/helpers/start-workers b/pkgs/by-name/ka/karakeep/helpers/start-workers new file mode 100755 index 000000000000..9bb764f6ed3c --- /dev/null +++ b/pkgs/by-name/ka/karakeep/helpers/start-workers @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -eu -o pipefail +KARAKEEP_LIB_PATH= +RELEASE= +NODE_ENV=production +NODE_PATH="$KARAKEEP_LIB_PATH/apps/workers" + +[[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists + +export RELEASE NODE_ENV NODE_PATH +exec "$KARAKEEP_LIB_PATH/node_modules/.bin/tsx" "$KARAKEEP_LIB_PATH/apps/workers/index.ts" diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix new file mode 100644 index 000000000000..f95843409dac --- /dev/null +++ b/pkgs/by-name/ka/karakeep/package.nix @@ -0,0 +1,135 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nodejs, + node-gyp, + inter, + python3, + srcOnly, + removeReferencesTo, + pnpm_9, +}: +let + pnpm = pnpm_9; +in +stdenv.mkDerivation (finalAttrs: { + pname = "karakeep"; + version = "0.24.1"; + + src = fetchFromGitHub { + owner = "karakeep-app"; + repo = "karakeep"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eiDTNMB/CipAR3FkUqPUGYdTAC6lSxT9gRXPQJLx5YE="; + }; + + patches = [ + ./patches/use-local-font.patch + ./patches/fix-migrations-path.patch + ./patches/dont-lock-pnpm-version.patch + ]; + postPatch = '' + ln -s ${inter}/share/fonts/truetype ./apps/web/app/fonts + ''; + + nativeBuildInputs = [ + python3 + nodejs + node-gyp + pnpm.configHook + ]; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version; + + # We need to pass the patched source code, so pnpm sees the patched version + src = stdenv.mkDerivation { + name = "${finalAttrs.pname}-patched-source"; + inherit (finalAttrs) src patches; + installPhase = '' + cp -pr --reflink=auto -- . $out + ''; + }; + + hash = "sha256-2n61uKdT9Q1fobpHunRhC3Eql3fqsV+DcyaEGjYDOyY="; + }; + buildPhase = '' + runHook preBuild + + # Based on matrix-appservice-discord + pushd node_modules/better-sqlite3 + npm run build-release --offline "--nodedir=${srcOnly nodejs}" + find build -type f -exec ${removeReferencesTo}/bin/remove-references-to -t "${srcOnly nodejs}" {} \; + popd + + export CI=true + + echo "Compiling apps/web..." + pushd apps/web + pnpm run build + popd + + echo "Building apps/cli" + pushd apps/cli + pnpm run build + popd + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/doc/karakeep + cp README.md LICENSE $out/share/doc/karakeep + + # Copy necessary files into lib/karakeep while keeping the directory structure + LIB_TO_COPY="node_modules apps/web/.next/standalone apps/cli/dist apps/workers packages/db packages/shared packages/trpc" + KARAKEEP_LIB_PATH="$out/lib/karakeep" + for DIR in $LIB_TO_COPY; do + mkdir -p "$KARAKEEP_LIB_PATH/$DIR" + cp -a $DIR/{.,}* "$KARAKEEP_LIB_PATH/$DIR" + chmod -R u+w "$KARAKEEP_LIB_PATH/$DIR" + done + + # NextJS requires static files are copied in a specific way + # https://nextjs.org/docs/pages/api-reference/config/next-config-js/output#automatically-copying-traced-files + cp -r ./apps/web/public "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/" + cp -r ./apps/web/.next/static "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/.next/" + + # Copy and patch helper scripts + for HELPER_SCRIPT in ${./helpers}/*; do + HELPER_SCRIPT_NAME="$(basename "$HELPER_SCRIPT")" + cp "$HELPER_SCRIPT" "$KARAKEEP_LIB_PATH/" + substituteInPlace "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME" \ + --replace-warn "KARAKEEP_LIB_PATH=" "KARAKEEP_LIB_PATH=$KARAKEEP_LIB_PATH" \ + --replace-warn "RELEASE=" "RELEASE=${finalAttrs.version}" \ + --replace-warn "NODEJS=" "NODEJS=${nodejs}" + chmod +x "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME" + patchShebangs "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME" + done + + # The cli should be in bin/ + mkdir -p $out/bin + mv "$KARAKEEP_LIB_PATH/karakeep" $out/bin/ + + runHook postInstall + ''; + + postFixup = '' + # Remove large dependencies that are not necessary during runtime + rm -rf $out/lib/karakeep/node_modules/{@next,next,@swc,react-native,monaco-editor,faker,@typescript-eslint,@microsoft,@typescript-eslint,pdfjs-dist} + + # Remove broken symlinks + find $out -type l ! -exec test -e {} \; -delete + ''; + + meta = { + homepage = "https://karakeep.app/"; + description = "Self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.three ]; + mainProgram = "karakeep"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ho/hoarder/patches/dont-lock-pnpm-version.patch b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch similarity index 91% rename from pkgs/by-name/ho/hoarder/patches/dont-lock-pnpm-version.patch rename to pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch index 5f56dff81d35..52463f9b0ad2 100644 --- a/pkgs/by-name/ho/hoarder/patches/dont-lock-pnpm-version.patch +++ b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch @@ -5,10 +5,10 @@ version to nixpkgs, we override this requirement and use the latest v9 release. --- --- a/package.json +++ b/package.json -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ "turbo": "^2.1.2" }, - "prettier": "@hoarder/prettier-config", + "prettier": "@karakeep/prettier-config", - "packageManager": "pnpm@9.0.0-alpha.8+sha256.a433a59569b00389a951352956faf25d1fdf43b568213fbde591c36274d4bc30", + "packageManager": "pnpm", "pnpm": { diff --git a/pkgs/by-name/ho/hoarder/patches/fix-migrations-path.patch b/pkgs/by-name/ka/karakeep/patches/fix-migrations-path.patch similarity index 100% rename from pkgs/by-name/ho/hoarder/patches/fix-migrations-path.patch rename to pkgs/by-name/ka/karakeep/patches/fix-migrations-path.patch diff --git a/pkgs/by-name/ka/karakeep/patches/use-local-font.patch b/pkgs/by-name/ka/karakeep/patches/use-local-font.patch new file mode 100644 index 000000000000..74ae897beb0f --- /dev/null +++ b/pkgs/by-name/ka/karakeep/patches/use-local-font.patch @@ -0,0 +1,28 @@ +Prevents NextJS from attempting to download fonts during build. The fonts +directory will be created in the derivation script. + +See similar patches: + pkgs/by-name/cr/crabfit-frontend/01-localfont.patch + pkgs/by-name/al/alcom/use-local-fonts.patch + pkgs/by-name/ne/nextjs-ollama-llm-ui/0002-use-local-google-fonts.patch + +--- +--- a/apps/web/app/layout.tsx ++++ b/apps/web/app/layout.tsx +@@ -1,5 +1,5 @@ + import type { Metadata } from "next"; +-import { Inter } from "next/font/google"; ++import localFont from 'next/font/local'; + + import "@karakeep/tailwind-config/globals.css"; + +@@ -13,9 +13,10 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; + + import { clientConfig } from "@karakeep/shared/config"; + +-const inter = Inter({ ++const inter = localFont({ + subsets: ["latin"], + fallback: ["sans-serif"], ++ src: "./fonts/InterVariable.ttf", + }); diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix index 64e66069958e..a4dd129d1f57 100644 --- a/pkgs/by-name/ka/kargo/package.nix +++ b/pkgs/by-name/ka/kargo/package.nix @@ -11,22 +11,22 @@ buildGoModule rec { pname = "kargo"; - version = "1.3.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "akuity"; repo = "kargo"; tag = "v${version}"; - hash = "sha256-sLcNY6TopRObyU+TAFsX8odRJTo9BufCKb/pKhg9pwA="; + hash = "sha256-dWrszpDPAVVsTDiPiqZhtGniZSaGeA7LzFyHUuuESiY="; }; - vendorHash = "sha256-Xb+9zu2uivOYETtz3ryMnBUJ3gJ/1ta1dLEpsD00jpU="; + vendorHash = "sha256-1J/9AXKU6jLZh6B5jWCoQeStborTOGjxFkZ1Vk2Yw+8="; subPackages = [ "cmd/cli" ]; ldflags = let - package_url = "github.com/akuity/kargo/internal/version"; + package_url = "github.com/akuity/kargo/pkg/x/version"; in [ "-s" diff --git a/pkgs/by-name/ka/karma-runner/fix-package-lock.patch b/pkgs/by-name/ka/karma-runner/fix-package-lock.patch deleted file mode 100644 index c1a835382513..000000000000 --- a/pkgs/by-name/ka/karma-runner/fix-package-lock.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index 413cf4d1..1d03d9f5 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -5226,36 +5226,6 @@ - "integrity": "sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==", - "dev": true - }, -- "karma": { -- "version": "file:", -- "dev": true, -- "requires": { -- "@colors/colors": "1.5.0", -- "body-parser": "^1.19.0", -- "braces": "^3.0.2", -- "chokidar": "^3.5.1", -- "connect": "^3.7.0", -- "di": "^0.0.1", -- "dom-serialize": "^2.2.1", -- "glob": "^7.1.7", -- "graceful-fs": "^4.2.6", -- "http-proxy": "^1.18.1", -- "isbinaryfile": "^4.0.8", -- "lodash": "^4.17.21", -- "log4js": "^6.4.1", -- "mime": "^2.5.2", -- "minimatch": "^3.0.4", -- "mkdirp": "^0.5.5", -- "qjobs": "^1.2.0", -- "range-parser": "^1.2.1", -- "rimraf": "^3.0.2", -- "socket.io": "^4.4.1", -- "source-map": "^0.6.1", -- "tmp": "^0.2.1", -- "ua-parser-js": "^0.7.30", -- "yargs": "^16.1.1" -- } -- }, - "karma-browserify": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/karma-browserify/-/karma-browserify-7.0.0.tgz", -diff --git a/package.json b/package.json -index 347d9e95..90f6d036 100644 ---- a/package.json -+++ b/package.json -@@ -471,7 +471,6 @@ - "eslint-plugin-standard": "^4.0.1", - "http2": "^3.3.6", - "jasmine-core": "^3.6.0", -- "karma": ".", - "karma-browserify": "^7.0.0", - "karma-browserstack-launcher": "^1.6.0", - "karma-chai": "^0.1.0", diff --git a/pkgs/by-name/ka/karma-runner/package.nix b/pkgs/by-name/ka/karma-runner/package.nix index 594267f143ca..7621c6c94350 100644 --- a/pkgs/by-name/ka/karma-runner/package.nix +++ b/pkgs/by-name/ka/karma-runner/package.nix @@ -2,27 +2,29 @@ lib, buildNpmPackage, fetchFromGitHub, + versionCheckHook, }: buildNpmPackage rec { pname = "karma"; - version = "6.4.2"; + version = "6.4.4"; src = fetchFromGitHub { owner = "karma-runner"; repo = "karma"; - rev = "v${version}"; - hash = "sha256-v6IiLz65NS8GwM/FPqRxR5qcFDDu7EqloR0SIensdDI="; + tag = "v${version}"; + hash = "sha256-RfEmzUMzgOY6YG0MBheCgwmwOU3C5G8hybH40gLmsr4="; }; - patches = [ - ./fix-package-lock.patch - ]; - - npmDepsHash = "sha256-nX4/96WdPEDZ6DASp+AOBbBbHyq+p2zIh2dZUbtmIPI="; + npmDepsHash = "sha256-bGtiGLwr9Bmi3Jx2DImpyLhPnxUo7q6YcMCxoxqOkGY="; env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = { description = "Spectacular Test Runner for JavaScript"; homepage = "http://karma-runner.github.io/"; diff --git a/pkgs/by-name/ka/kata-runtime/kata-images.nix b/pkgs/by-name/ka/kata-runtime/kata-images.nix index b145c9a340d4..e1b15266a99c 100644 --- a/pkgs/by-name/ka/kata-runtime/kata-images.nix +++ b/pkgs/by-name/ka/kata-runtime/kata-images.nix @@ -16,8 +16,8 @@ let imageHash = { - "x86_64-linux" = "sha256-6ySKAqrbHDRgVlI7wm2p4Uw96ZMzUpP00liujxlruSM="; - "aarch64-linux" = "sha256-pEPkDXT4OunfN2sGb8Ru05tFHaBsYUcmG5Iy7yH4kX8="; + "x86_64-linux" = "sha256-7xDc5Rr3rP36zS3kpM2QEqOCtmka3EAnts4Z1h8MNWY="; + "aarch64-linux" = "sha256-8nLHTPetEfIrdtrpiT9Czcpf0NhL97TZ2DXyeBL04LA="; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/ka/kata-runtime/package.nix b/pkgs/by-name/ka/kata-runtime/package.nix index fa06ba0ea733..57dbe5608066 100644 --- a/pkgs/by-name/ka/kata-runtime/package.nix +++ b/pkgs/by-name/ka/kata-runtime/package.nix @@ -11,7 +11,7 @@ }: let - version = "3.7.0"; + version = "3.16.0"; kata-images = callPackage ./kata-images.nix { inherit version; }; @@ -34,7 +34,7 @@ buildGoModule rec { owner = "kata-containers"; repo = "kata-containers"; rev = version; - hash = "sha256-Ir+/ZZJHm6E+044wczU3UvL+Py9Wprgw2QKJaYyDrKU="; + hash = "sha256-+SppAF77NbXlSrBGvIm40AmNC12GrexbX7fAPBoDAcs="; }; sourceRoot = "${src.name}/src/runtime"; diff --git a/pkgs/by-name/ka/katana/package.nix b/pkgs/by-name/ka/katana/package.nix index a5d32857aca6..a48cc34f4365 100644 --- a/pkgs/by-name/ka/katana/package.nix +++ b/pkgs/by-name/ka/katana/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "katana"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "katana"; tag = "v${version}"; - hash = "sha256-cRzLJcX7U9jhKMYnpOyo8S8hN6cIeUYFElcmOqbv0GY="; + hash = "sha256-KwnGEWWrWpano+5gSG0YO4UE2ceKvgXmrtlhlda2xq4="; }; - vendorHash = "sha256-NaPVrgFbw77kxl2sw1nHhqr1ePn5TYhS2rS0et7qJKs="; + vendorHash = "sha256-L7ycSzLbZUJ/4E+2lyN52xQFOJoxiRopgTfJkflFP9Q="; subPackages = [ "cmd/katana" ]; diff --git a/pkgs/by-name/ka/katriawm/package.nix b/pkgs/by-name/ka/katriawm/package.nix index a283030e352a..280a856daa0e 100644 --- a/pkgs/by-name/ka/katriawm/package.nix +++ b/pkgs/by-name/ka/katriawm/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "katriawm"; - version = "23.08"; + version = "25.04"; src = fetchzip { url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz"; - hash = "sha256-IWviLboZz421/Amz/QG4o8jYaG8Y/l5PvmvXfK5nzJE="; + hash = "sha256-3cWgLz4BO1X8KkhoQp3hbq5XAx9NzDhsIL3fDSQaG5M="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 7f179dd28e39..fde6c512a119 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - flutter327, + flutter329, webkitgtk_4_1, alsa-lib, libayatana-appindicator, @@ -18,15 +18,15 @@ gitUpdater, }: -flutter327.buildFlutterApplication rec { +flutter329.buildFlutterApplication rec { pname = "kazumi"; - version = "1.5.6"; + version = "1.6.9"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-UBylNN6UViYuUn70eV0VSsnfN6/kGAFIaa9GU/OV9Zo="; + hash = "sha256-mqsXbMde6MYNWrtO6lZ/xP54I+4pwZwuqo9ODHKyiog="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -95,7 +95,7 @@ flutter327.buildFlutterApplication rec { gitHashes = let - media_kit-hash = "sha256-6V4ZTRsExm8TidznnvAZRXGbkxTLDs7YFNutNh7tLK8="; + media_kit-hash = "sha256-cfk3Lpahqs0S/Uq8sfj1N03GOClw66+teTdF1/vs+7I="; in { desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM="; diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index 4b80849aa863..ce0571d5bfc5 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -50,11 +50,11 @@ "dependency": "transitive", "description": { "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.2" }, "args": { "dependency": "transitive", @@ -70,11 +70,11 @@ "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "audio_video_progress_bar": { "dependency": "direct main", @@ -100,71 +100,71 @@ "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "build": { "dependency": "transitive", "description": { "name": "build", - "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "build_config": { - "dependency": "transitive", - "description": { - "name": "build_config", - "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "build_daemon": { - "dependency": "transitive", - "description": { - "name": "build_daemon", - "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "build_resolvers": { - "dependency": "transitive", - "description": { - "name": "build_resolvers", - "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", "url": "https://pub.dev" }, "source": "hosted", "version": "2.4.2" }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.4" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.13" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.2" + "version": "8.0.0" }, "built_collection": { "dependency": "transitive", @@ -180,11 +180,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.2" + "version": "8.9.3" }, "cached_network_image": { "dependency": "direct main", @@ -220,31 +220,31 @@ "dependency": "direct main", "description": { "name": "canvas_danmaku", - "sha256": "a6761973c72328c3872fa288d0a943bf3675238a30913cf9cd0155d9b7cea9ca", + "sha256": "98fd90f257ffe93bd6a0bd857d92f40172767fc77ffb48b2379ac692e62150eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.6" + "version": "0.2.7" }, "card_settings_ui": { "dependency": "direct main", "description": { "name": "card_settings_ui", - "sha256": "3c0677c31b68ac654e7efc85a4adfec4375445f8c67a1dbe88aa8cf115e52533", + "sha256": "e299e9d774cfde350a844579db42108c078ff2e080b890073d7a4f58bf64c9bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.3" }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "checked_yaml": { "dependency": "transitive", @@ -270,11 +270,11 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", @@ -290,21 +290,21 @@ "dependency": "transitive", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "connectivity_plus": { "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3", + "sha256": "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "6.1.3" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -380,21 +380,21 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.7" + "version": "2.3.8" }, "dbus": { "dependency": "transitive", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "desktop_webview_window": { "dependency": "direct main", @@ -411,51 +411,51 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "sha256": "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.2" + "version": "11.3.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "device_info_plus_platform_interface", - "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba", + "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.1" + "version": "7.0.2" }, "dio": { "dependency": "direct main", "description": { "name": "dio", - "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.0+1" }, "dio_cookie_manager": { "dependency": "direct main", "description": { "name": "dio_cookie_manager", - "sha256": "e79498b0f632897ff0c28d6e8178b4bc6e9087412401f618c31fa0904ace050d", + "sha256": "47cacbf6a783c263bfa7cd7d08101e93127d87760ddb003ba289162f7be0f679", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.2.0" }, "dio_web_adapter": { "dependency": "transitive", "description": { "name": "dio_web_adapter", - "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "sha256": "e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" }, "dlna_dart": { "dependency": "direct main", @@ -477,6 +477,16 @@ "source": "hosted", "version": "1.7.0" }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.7" + }, "expressions": { "dependency": "transitive", "description": { @@ -491,11 +501,11 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", @@ -527,6 +537,16 @@ "source": "hosted", "version": "1.1.1" }, + "fl_chart": { + "dependency": "direct main", + "description": { + "name": "fl_chart", + "sha256": "74959b99b92b9eebeed1a4049426fd67c4abc3c5a0f4d12e2877097d6a11ae08", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.69.2" + }, "flutter": { "dependency": "direct main", "description": "flutter", @@ -557,21 +577,21 @@ "dependency": "direct dev", "description": { "name": "flutter_launcher_icons", - "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.13.1" + "version": "0.14.3" }, "flutter_lints": { "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1", + "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "5.0.0" }, "flutter_localizations": { "dependency": "direct main", @@ -583,11 +603,11 @@ "dependency": "direct main", "description": { "name": "flutter_mobx", - "sha256": "859fbf452fa9c2519d2700b125dd7fb14c508bbdd7fb65e26ca8ff6c92280e2e", + "sha256": "ba5e93467866a2991259dc51cffd41ef45f695c667c2b8e7b087bf24118b50fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1+1" + "version": "2.3.0" }, "flutter_modular": { "dependency": "direct main", @@ -613,11 +633,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398", + "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.23" + "version": "2.0.24" }, "flutter_rating_bar": { "dependency": "direct main", @@ -629,6 +649,16 @@ "source": "hosted", "version": "4.0.1" }, + "flutter_svg": { + "dependency": "direct main", + "description": { + "name": "flutter_svg", + "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.17" + }, "flutter_test": { "dependency": "direct dev", "description": "flutter", @@ -675,11 +705,11 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "graphs": { "dependency": "transitive", @@ -735,41 +765,41 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_multi_server": { "dependency": "transitive", "description": { "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.2" }, "image": { "dependency": "transitive", "description": { "name": "image", - "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.5.2" }, "intl": { "dependency": "transitive", @@ -785,21 +815,21 @@ "dependency": "transitive", "description": { "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "js": { "dependency": "transitive", "description": { "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" }, "json_annotation": { "dependency": "transitive", @@ -815,21 +845,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -845,11 +875,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "5.1.1" }, "logger": { "dependency": "direct main", @@ -885,11 +915,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "direct main", @@ -906,7 +936,7 @@ "description": { "path": "media_kit", "ref": "main", - "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -917,7 +947,7 @@ "description": { "path": "libs/android/media_kit_libs_android_video", "ref": "main", - "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -928,7 +958,7 @@ "description": { "path": "libs/ios/media_kit_libs_ios_video", "ref": "main", - "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -939,7 +969,7 @@ "description": { "path": "libs/linux/media_kit_libs_linux", "ref": "main", - "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -950,7 +980,7 @@ "description": { "path": "libs/macos/media_kit_libs_macos_video", "ref": "main", - "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -961,7 +991,7 @@ "description": { "path": "libs/universal/media_kit_libs_video", "ref": "main", - "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -972,7 +1002,7 @@ "description": { "path": "libs/windows/media_kit_libs_windows_video", "ref": "main", - "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -983,7 +1013,7 @@ "description": { "path": "media_kit_video", "ref": "main", - "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1003,11 +1033,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", @@ -1023,21 +1053,21 @@ "dependency": "direct main", "description": { "name": "mobx", - "sha256": "1f01a429529ac55e5e80c0fcad62c60112fb91df3dec11a9113d71cf0c2e2c4c", + "sha256": "bf1a90e5bcfd2851fc6984e20eef69557c65d9e4d0a88f5be4cf72c9819ce6b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.5.0" }, "mobx_codegen": { "dependency": "direct dev", "description": { "name": "mobx_codegen", - "sha256": "f605e04444c5dbf8503f354577e7ad1e06887cff30ba20f147365d6130d580f7", + "sha256": "990da80722f7d7c0017dec92040b31545d625b15d40204c36a1e63d167c73cdc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.2" + "version": "2.7.0" }, "modular_core": { "dependency": "transitive", @@ -1093,41 +1123,51 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "package_info_plus": { "dependency": "transitive", "description": { "name": "package_info_plus", - "sha256": "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.3" + "version": "8.3.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.2.0" }, "path": { "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" }, "path_provider": { "dependency": "direct main", @@ -1143,11 +1183,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "8c4967f8b7cb46dc914e178daa29813d83ae502e0529d7b0478330616a691ef7", + "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.14" + "version": "2.2.15" }, "path_provider_foundation": { "dependency": "transitive", @@ -1193,11 +1233,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "platform": { "dependency": "transitive", @@ -1229,6 +1269,16 @@ "source": "hosted", "version": "1.5.1" }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.1" + }, "provider": { "dependency": "direct main", "description": { @@ -1243,21 +1293,21 @@ "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.1.5" }, "pubspec_parse": { "dependency": "transitive", "description": { "name": "pubspec_parse", - "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.5.0" }, "quiver": { "dependency": "transitive", @@ -1313,11 +1363,11 @@ "dependency": "transitive", "description": { "name": "screen_brightness_android", - "sha256": "ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a", + "sha256": "6ba1b5812f66c64e9e4892be2d36ecd34210f4e0da8bdec6a2ea34f1aa42683e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "screen_brightness_ios": { "dependency": "transitive", @@ -1403,31 +1453,31 @@ "dependency": "direct main", "description": { "name": "scrollview_observer", - "sha256": "d607bc97165113b4ce6aa860a3865cfa6b849445a48c216461d74bc96be6cb94", + "sha256": "c528c3868cb17135ad6ccabef68753e2e6636b55dfaecc762f5e353e1eb3878a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.24.0" + "version": "1.25.1" }, "shelf": { "dependency": "transitive", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_web_socket": { "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.0" }, "shortid": { "dependency": "transitive", @@ -1439,6 +1489,16 @@ "source": "hosted", "version": "0.1.2" }, + "skeletonizer": { + "dependency": "direct main", + "description": { + "name": "skeletonizer", + "sha256": "0dcacc51c144af4edaf37672072156f49e47036becbc394d7c51850c5c1e884b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.3" + }, "sky_engine": { "dependency": "transitive", "description": "flutter", @@ -1459,21 +1519,21 @@ "dependency": "transitive", "description": { "name": "source_helper", - "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd", + "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.4" + "version": "1.3.5" }, "source_span": { "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -1519,11 +1579,11 @@ "dependency": "transitive", "description": { "name": "sqflite_darwin", - "sha256": "96a698e2bc82bd770a4d6aab00b42396a7c63d9e33513a56945cbccb594c2474", + "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.1+1" }, "sqflite_platform_interface": { "dependency": "transitive", @@ -1539,44 +1599,44 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", "description": { "name": "stream_transform", - "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "synchronized": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "synchronized", "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", @@ -1589,41 +1649,41 @@ "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "timing": { "dependency": "transitive", "description": { "name": "timing", - "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.0.2" }, "tray_manager": { "dependency": "direct main", "description": { "name": "tray_manager", - "sha256": "bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7", + "sha256": "80be6c508159a6f3c57983de795209ac13453e9832fd574143b06dceee188ed2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.4" + "version": "0.3.2" }, "typed_data": { "dependency": "transitive", @@ -1729,21 +1789,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.4.0" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.4" }, "uuid": { "dependency": "transitive", @@ -1755,6 +1815,36 @@ "source": "hosted", "version": "4.5.1" }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.18" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.13" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.16" + }, "vector_math": { "dependency": "transitive", "description": { @@ -1769,11 +1859,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "volume_controller": { "dependency": "transitive", @@ -1789,11 +1879,11 @@ "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.10" + "version": "1.2.11" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -1809,11 +1899,11 @@ "dependency": "transitive", "description": { "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web": { "dependency": "transitive", @@ -1839,11 +1929,11 @@ "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "webdav_client": { "dependency": "direct main", @@ -1859,41 +1949,41 @@ "dependency": "direct main", "description": { "name": "webview_flutter", - "sha256": "889a0a678e7c793c308c68739996227c9661590605e70b1f6cf6b9a6634f7aec", + "sha256": "caf0f5a1012aa3c2d33c4215adc72dc1194bb59a2d3ed901f457965626805e66", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.0" + "version": "4.11.0" }, "webview_flutter_android": { "dependency": "transitive", "description": { "name": "webview_flutter_android", - "sha256": "285cedfd9441267f6cca8843458620b5fda1af75b04f5818d0441acda5d7df19", + "sha256": "3315f1306eb22f98c48fe203fb8a448fb23f9e49d55a4da6e17ab7d795774166", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.0" + "version": "4.4.0" }, "webview_flutter_platform_interface": { "dependency": "transitive", "description": { "name": "webview_flutter_platform_interface", - "sha256": "d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d", + "sha256": "18b1640839cf6546784a524c72aded5b6e86b23e7167dc2311cc96f7658b64bd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.10.0" + "version": "2.11.0" }, "webview_flutter_wkwebview": { "dependency": "transitive", "description": { "name": "webview_flutter_wkwebview", - "sha256": "b7e92f129482460951d96ef9a46b49db34bd2e1621685de26e9eaafd9674e7eb", + "sha256": "c9f9be526fa0d3347374ceaa05c4b3acb85f4f112abd62f7d74b7d301fa515ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.3" + "version": "3.20.0" }, "webview_windows": { "dependency": "direct main", @@ -1910,11 +2000,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69", + "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.0" + "version": "5.10.1" }, "win32_registry": { "dependency": "transitive", @@ -1980,15 +2070,15 @@ "dependency": "transitive", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" } }, "sdks": { - "dart": ">=3.5.0 <4.0.0", - "flutter": ">=3.27.4" + "dart": ">=3.7.0-0 <4.0.0", + "flutter": ">=3.29.3" } } diff --git a/pkgs/by-name/kb/kbld/package.nix b/pkgs/by-name/kb/kbld/package.nix index dac56864246e..471d845503e1 100644 --- a/pkgs/by-name/kb/kbld/package.nix +++ b/pkgs/by-name/kb/kbld/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kbld"; - version = "0.45.1"; + version = "0.45.2"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "kbld"; rev = "v${version}"; - hash = "sha256-ikrxgukixnUCwwEt5FBzTmpjpjkjgtYTjr/AwNZ9kiI="; + hash = "sha256-ozsbuQLCD+YfHmF8+VmvNQElXvh59ZWuTecXuWAQIjM="; }; vendorHash = null; diff --git a/pkgs/by-name/kb/kbs2/package.nix b/pkgs/by-name/kb/kbs2/package.nix new file mode 100644 index 000000000000..22263bb8d5b5 --- /dev/null +++ b/pkgs/by-name/kb/kbs2/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, + python3, + libxcb, +}: + +rustPlatform.buildRustPackage rec { + pname = "kbs2"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "woodruffw"; + repo = pname; + rev = "v${version}"; + hash = "sha256-o8/ENAWzVqs7rokST6xnyu9Q/pKqq/UnKWOFRuIuGes="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-+TJ/QG+6ZILcSZEIXj6B4qYF0P5pQpo1kw2qEfE0FDw="; + + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + checkFlags = [ + "--skip=kbs2::config::tests::test_find_config_dir" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ]; + + postInstall = + '' + mkdir -p $out/share/kbs2 + cp -r contrib/ $out/share/kbs2 + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd kbs2 \ + --bash <($out/bin/kbs2 --completions bash) \ + --fish <($out/bin/kbs2 --completions fish) \ + --zsh <($out/bin/kbs2 --completions zsh) + ''; + + meta = with lib; { + description = "Secret manager backed by age"; + mainProgram = "kbs2"; + homepage = "https://github.com/woodruffw/kbs2"; + changelog = "https://github.com/woodruffw/kbs2/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix index d100621bff69..08b1503ea263 100644 --- a/pkgs/by-name/kb/kbt/package.nix +++ b/pkgs/by-name/kb/kbt/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, pkg-config, - darwin, xorg, }: @@ -26,13 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libX11 + ]; meta = with lib; { description = "Keyboard tester in terminal"; diff --git a/pkgs/by-name/kc/kcl-language-server/package.nix b/pkgs/by-name/kc/kcl-language-server/package.nix new file mode 100644 index 000000000000..22108ca4195e --- /dev/null +++ b/pkgs/by-name/kc/kcl-language-server/package.nix @@ -0,0 +1,53 @@ +{ + fetchFromGitHub, + kcl, + lib, + pkg-config, + protobuf, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "kcl-language-server"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = "kcl-lang"; + repo = "kcl"; + rev = "v${version}"; + hash = "sha256-6XDLxTpgENhP7F51kicAJB7BNMtX4cONKJApAhqgdno="; + }; + + sourceRoot = "${src.name}/kclvm"; + + cargoHash = "sha256-eJ3Gh2l6T2DxJRQRHamPOr/ILtzsqFB497DdXVJ90RE="; + + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + + buildAndTestSubdir = "tools/src/LSP"; + + buildPhaseCargoFlags = [ + "--profile" + "release" + "--offline" + ]; + + nativeBuildInputs = [ + pkg-config + protobuf + ]; + + doCheck = false; + + meta = { + changelog = "https://github.com/kcl-lang/kcl/releases/tag/v${version}"; + description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; + downloadPage = "https://github.com/kcl-lang/kcl/tree/v${version}/kclvm/tools/src/LSP"; + homepage = "https://www.kcl-lang.io/"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = kcl.meta.maintainers; + mainProgram = "kcl-language-server"; + }; +} diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index 2a4abe1194ce..7df5288488e1 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -1,6 +1,5 @@ { buildGoModule, - darwin, fetchFromGitHub, installShellFiles, kclvm_cli, @@ -34,16 +33,10 @@ buildGoModule rec { installShellFiles ]; - buildInputs = - [ - kclvm - kclvm_cli - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]); + buildInputs = [ + kclvm + kclvm_cli + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' export HOME=$(mktemp -d) diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix index aaa3a3cca342..dbe6b3bf8d79 100644 --- a/pkgs/by-name/kc/kclvm/package.nix +++ b/pkgs/by-name/kc/kclvm/package.nix @@ -5,32 +5,25 @@ fetchFromGitHub, protobuf, pkg-config, - darwin, rustc, }: rustPlatform.buildRustPackage rec { pname = "kclvm"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; - hash = "sha256-OMPo2cT0ngwHuGghVSfGoDgf+FThj2GsZ3Myb1wSxQM="; + hash = "sha256-6XDLxTpgENhP7F51kicAJB7BNMtX4cONKJApAhqgdno="; }; sourceRoot = "${src.name}/kclvm"; useFetchCargoVendor = true; - cargoHash = "sha256-xQgCiNt0lUvB5XmVB45l0GuIiVp5Jm6dZY7396Rsnqw="; + cargoHash = "sha256-eJ3Gh2l6T2DxJRQRHamPOr/ILtzsqFB497DdXVJ90RE="; - buildInputs = - [ rustc ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ rustc ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libkclvm_cli_cdylib.dylib $out/lib/libkclvm_cli_cdylib.dylib diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index 4d350cebdf48..b205e1484df0 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, kclvm, - darwin, rustc, }: rustPlatform.buildRustPackage rec { @@ -23,16 +21,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZhrjxHqwWwcVkCVkJJnVm2CZLfRlrI2383ejgI+B2KQ="; cargoPatches = [ ./cargo_lock.patch ]; - buildInputs = - [ - kclvm - rustc - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]); + buildInputs = [ + kclvm + rustc + ]; meta = with lib; { description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; diff --git a/pkgs/by-name/kd/kdash/package.nix b/pkgs/by-name/kd/kdash/package.nix new file mode 100644 index 000000000000..6648c35bf91d --- /dev/null +++ b/pkgs/by-name/kd/kdash/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + perl, + python3, + openssl, + xorg, +}: + +rustPlatform.buildRustPackage rec { + pname = "kdash"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "kdash-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-fFpdWVoeWycnp/hRw2S+hYpnXYmCs+rLqcZdmSSMGwI="; + }; + + nativeBuildInputs = [ + perl + python3 + pkg-config + ]; + + buildInputs = [ + openssl + xorg.xcbutil + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-72DuM64wj8WW6soagodOFIeHvVn1CPpb1T3Y7GQYsbs="; + + meta = with lib; { + description = "Simple and fast dashboard for Kubernetes"; + mainProgram = "kdash"; + homepage = "https://github.com/kdash-rs/kdash"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/by-name/kd/kdeltachat/package.nix b/pkgs/by-name/kd/kdeltachat/package.nix new file mode 100644 index 000000000000..ff2ab0db040f --- /dev/null +++ b/pkgs/by-name/kd/kdeltachat/package.nix @@ -0,0 +1,79 @@ +{ + lib, + fetchFromGitHub, + fetchFromSourcehut, + cmake, + extra-cmake-modules, + pkg-config, + libdeltachat, + libsForQt5, + rustPlatform, + stdenv, +}: + +let + libdeltachat' = libdeltachat.overrideAttrs rec { + version = "1.155.6"; + src = fetchFromGitHub { + owner = "chatmail"; + repo = "core"; + tag = "v${version}"; + hash = "sha256-d7EmmyLSJjFIZM1j6LP8f4WnXiptNTAqOdJD/oPL02Y="; + }; + cargoDeps = rustPlatform.fetchCargoVendor { + pname = "deltachat-core-rust"; + inherit version src; + hash = "sha256-E01aEzNi06LQntrlA+342a8Nl5API6v7HbdmuKpfajs="; + }; + }; + inherit (libsForQt5) + kirigami2 + qtbase + qtimageformats + qtmultimedia + qtwebengine + wrapQtAppsHook + ; +in +stdenv.mkDerivation { + pname = "kdeltachat"; + version = "unstable-2024-01-14"; + + src = fetchFromSourcehut { + owner = "~link2xt"; + repo = "kdeltachat"; + rev = "d61a01c2d6d5bdcc9ca500b466ed42689b2bd5c6"; + hash = "sha256-KmL3ODXPi1c8C5z2ySHg0vA5Vg/dZumDZTbpxkzf7A4="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + kirigami2 + libdeltachat' + qtimageformats + qtmultimedia + qtwebengine + ]; + + # needed for qmlplugindump to work + QT_PLUGIN_PATH = "${qtbase.bin}/${qtbase.qtPluginPrefix}"; + QML2_IMPORT_PATH = lib.concatMapStringsSep ":" (lib: "${lib}/${qtbase.qtQmlPrefix}") [ + kirigami2 + qtmultimedia + ]; + + meta = with lib; { + description = "Delta Chat client using Kirigami framework"; + mainProgram = "kdeltachat"; + homepage = "https://git.sr.ht/~link2xt/kdeltachat"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/kd/kdiff3/package.nix b/pkgs/by-name/kd/kdiff3/package.nix new file mode 100644 index 000000000000..a3d8e0b76b2c --- /dev/null +++ b/pkgs/by-name/kd/kdiff3/package.nix @@ -0,0 +1,50 @@ +{ + stdenv, + lib, + fetchurl, + extra-cmake-modules, + boost, + kdePackages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kdiff3"; + version = "1.12.3"; + + src = fetchurl { + url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; + hash = "sha256-4iZUxFeIF5mAgwVSnGtZbAydw4taLswULsdtRvaHP0w="; + }; + + nativeBuildInputs = [ + extra-cmake-modules + kdePackages.kdoctools + kdePackages.wrapQtAppsHook + ]; + + buildInputs = with kdePackages; [ + qtbase + boost + kconfig + kcrash + kparts + kiconthemes + ]; + + cmakeFlags = [ "-Wno-dev" ]; + + env.LANG = "C.UTF-8"; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + ln -s "$out/Applications/KDE/kdiff3.app/Contents/MacOS" "$out/bin" + ''; + + meta = with lib; { + description = "Compares and merges 2 or 3 files or directories"; + mainProgram = "kdiff3"; + homepage = "https://invent.kde.org/sdk/kdiff3"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ peterhoeg ]; + inherit (kdePackages.qtbase.meta) platforms; + }; +}) diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index 9dd569ba0296..b214f5e8c472 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "kdlfmt"; - version = "0.0.15"; + version = "0.0.17"; src = fetchFromGitHub { owner = "hougesen"; repo = "kdlfmt"; rev = "v${version}"; - hash = "sha256-nnr3QXEXQGbJKjVvQXqhJ+iFBgI++AKK3wKMt2OqIYc="; + hash = "sha256-9bn5GHlM7nYJgulNIQh1rQYuvRr5Bloyzgj2oGvBzdE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VMjsTVJ9pyI1pdvkD5nAgFELK+o2tl5lu6peN87ssqs="; + cargoHash = "sha256-BaPfYXR8aYBBspnRtL2HYikCaG7YD2bqY0dKl2lQ/YA="; meta = { description = "Formatter for kdl documents"; diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix index 7899e1794342..842543c95206 100644 --- a/pkgs/by-name/ke/kea/package.nix +++ b/pkgs/by-name/ke/kea/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--with-openssl=${lib.getDev openssl}" ] - ++ lib.optional withPostgres "--with-pgsql=${lib.getDev libpq}/bin/pg_config" + ++ lib.optional withPostgres "--with-pgsql=${libpq.pg_config}/bin/pg_config" ++ lib.optional withMysql "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config"; postConfigure = '' @@ -100,6 +100,8 @@ stdenv.mkDerivation rec { }; meta = with lib; { + # error: implicit instantiation of undefined template 'std::char_traits' + broken = stdenv.hostPlatform.isDarwin; changelog = "https://downloads.isc.org/isc/kea/${version}/Kea-${version}-ReleaseNotes.txt"; homepage = "https://kea.isc.org/"; description = "High-performance, extensible DHCP server by ISC"; diff --git a/pkgs/by-name/ke/keep-sorted/package.nix b/pkgs/by-name/ke/keep-sorted/package.nix index 419d863bd54a..c389a524e0a8 100644 --- a/pkgs/by-name/ke/keep-sorted/package.nix +++ b/pkgs/by-name/ke/keep-sorted/package.nix @@ -6,15 +6,15 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "keep-sorted"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "google"; repo = "keep-sorted"; - tag = "v${version}"; - hash = "sha256-ROvj7w8YMq6+ntx0SWi+HfN4sO6d7RjKWwlb/9gfz8w="; + tag = "v${finalAttrs.version}"; + hash = "sha256-N/fJ0qj7/kQ9Q7ULpQpyhWAWFlnLkTjyNNKg8VhLvi0="; }; vendorHash = "sha256-HTE9vfjRmi5GpMue7lUfd0jmssPgSOljbfPbya4uGsc="; @@ -22,7 +22,7 @@ buildGoModule rec { # Inject version string instead of reading version from buildinfo. postPatch = '' substituteInPlace main.go \ - --replace-fail 'readVersion())' '"v${version}")' + --replace-fail 'readVersion())' '"v${finalAttrs.version}")' ''; env.CGO_ENABLED = "0"; @@ -41,11 +41,11 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/google/keep-sorted/releases/tag/v${version}"; + changelog = "https://github.com/google/keep-sorted/releases/tag/v${finalAttrs.version}"; description = "Language-agnostic formatter that sorts lines between two markers in a larger file"; homepage = "https://github.com/google/keep-sorted"; license = lib.licenses.asl20; mainProgram = "keep-sorted"; maintainers = with lib.maintainers; [ katexochen ]; }; -} +}) diff --git a/pkgs/by-name/ke/keepalived/package.nix b/pkgs/by-name/ke/keepalived/package.nix index 338c1908eecc..f7cc87b06e14 100644 --- a/pkgs/by-name/ke/keepalived/package.nix +++ b/pkgs/by-name/ke/keepalived/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "keepalived"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "sha256-Faj7fgCYdjZ8yPH/GrDG9t+O1n+h/9lHCE7vMe4kROQ="; + sha256 = "sha256-+IwV8ifQ8gWN4eR9Fgvw3HV3WJDmy3urEQDLngoMdm8="; }; buildInputs = diff --git a/pkgs/by-name/ke/keepassxc-go/package.nix b/pkgs/by-name/ke/keepassxc-go/package.nix index 1e6cf584d6d2..fac1d231a96e 100644 --- a/pkgs/by-name/ke/keepassxc-go/package.nix +++ b/pkgs/by-name/ke/keepassxc-go/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "keepassxc-go"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "MarkusFreitag"; repo = "keepassxc-go"; rev = "v${version}"; - hash = "sha256-seCeHNEj5GxAI7BVMPzh+YuoxivmTwvhVCqY5LKHpQk="; + hash = "sha256-Z4SbPxhs+umsUlby7idxofCjP+uLPvp/2oUCpnAS2/A="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-jscyNyVr+RDN1EaxIOc3aYCAVT+1eO/c+dxEsIorDIs="; + vendorHash = "sha256-+cgf2FxpbLu+Yuhk6T0ZBnDH7We2DVu65xFaruk9I0E="; checkFlags = [ # Test tries to monkey-patch the stdlib, fails with permission denied error. diff --git a/pkgs/applications/misc/keepassxc/darwin.patch b/pkgs/by-name/ke/keepassxc/darwin.patch similarity index 100% rename from pkgs/applications/misc/keepassxc/darwin.patch rename to pkgs/by-name/ke/keepassxc/darwin.patch diff --git a/pkgs/applications/misc/keepassxc/firefox-native-messaging-host.json b/pkgs/by-name/ke/keepassxc/firefox-native-messaging-host.json similarity index 100% rename from pkgs/applications/misc/keepassxc/firefox-native-messaging-host.json rename to pkgs/by-name/ke/keepassxc/firefox-native-messaging-host.json diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix new file mode 100644 index 000000000000..170cc7bfe8e3 --- /dev/null +++ b/pkgs/by-name/ke/keepassxc/package.nix @@ -0,0 +1,195 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libsForQt5, + + apple-sdk_15, + asciidoctor, + botan3, + curl, + darwinMinVersionHook, + libXi, + libXtst, + libargon2, + libusb1, + minizip, + nix-update-script, + pcsclite, + pkg-config, + qrencode, + readline, + wrapGAppsHook3, + zlib, + + withKeePassBrowser ? true, + withKeePassBrowserPasskeys ? true, + withKeePassFDOSecrets ? stdenv.hostPlatform.isLinux, + withKeePassKeeShare ? true, + withKeePassNetworking ? true, + withKeePassSSHAgent ? true, + withKeePassX11 ? true, + withKeePassYubiKey ? stdenv.hostPlatform.isLinux, + + nixosTests, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "keepassxc"; + version = "2.7.10"; + + src = fetchFromGitHub { + owner = "keepassxreboot"; + repo = "keepassxc"; + tag = finalAttrs.version; + hash = "sha256-FBoqCYNM/leN+w4aV0AJMx/G0bjHbI9KVWrnmq3NfaI="; + }; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ + "-Wno-old-style-cast" + "-Wno-error" + "-D__BIG_ENDIAN__=${if stdenv.hostPlatform.isBigEndian then "1" else "0"}" + ]); + + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-rpath ${libargon2}/lib"; + + patches = [ ./darwin.patch ]; + + cmakeFlags = [ + (lib.cmakeFeature "KEEPASSXC_BUILD_TYPE" "Release") + (lib.cmakeBool "WITH_GUI_TESTS" true) + (lib.cmakeBool "WITH_XC_UPDATECHECK" false) + (lib.cmakeBool "WITH_XC_X11" withKeePassX11) + (lib.cmakeBool "WITH_XC_BROWSER" withKeePassBrowser) + (lib.cmakeBool "WITH_XC_BROWSER_PASSKEYS" withKeePassBrowserPasskeys) + (lib.cmakeBool "WITH_XC_KEESHARE" withKeePassKeeShare) + (lib.cmakeBool "WITH_XC_NETWORKING" withKeePassNetworking) + (lib.cmakeBool "WITH_XC_SSHAGENT" withKeePassSSHAgent) + (lib.cmakeBool "WITH_XC_FDOSECRETS" withKeePassFDOSecrets) + (lib.cmakeBool "WITH_XC_YUBIKEY" withKeePassYubiKey) + ]; + + doCheck = true; + checkPhase = + let + disabledTests = lib.concatStringsSep "|" ( + [ + # flaky + "testcli" + "testgui" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # QWidget: Cannot create a QWidget without QApplication + "testautotype" + + # FAIL! : TestDatabase::testExternallyModified() Compared values are not the same + # Actual (((spyFileChanged.count()))): 0 + # Expected (1) : 1 + # Loc: [/tmp/nix-build-keepassxc-2.7.10.drv-2/source/tests/TestDatabase.cpp(288)] + "testdatabase" + ] + ); + in + '' + runHook preCheck + + export LC_ALL="en_US.UTF-8" + export QT_QPA_PLATFORM=offscreen + export QT_PLUGIN_PATH="${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}" + + make test ARGS+="-E '${disabledTests}' --output-on-failure" + + runHook postCheck + ''; + + nativeBuildInputs = [ + asciidoctor + cmake + libsForQt5.wrapQtAppsHook + libsForQt5.qttools + pkg-config + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) wrapGAppsHook3; + + dontWrapGApps = true; + preFixup = + '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapQtApp "$out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC" + ''; + + postInstall = lib.concatLines [ + (lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/bin" + for program in keepassxc-cli keepassxc-proxy; do + ln -s "$out/Applications/KeePassXC.app/Contents/MacOS/$program" "$out/bin/$program" + done + '') + + # See https://github.com/keepassxreboot/keepassxc/blob/cd7a53abbbb81e468efb33eb56eefc12739969b8/src/browser/NativeMessageInstaller.cpp#L317 + (lib.optionalString withKeePassBrowser '' + mkdir -p "$out/lib/mozilla/native-messaging-hosts" + substituteAll "${./firefox-native-messaging-host.json}" "$out/lib/mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json" + '') + ]; + + buildInputs = + [ + botan3 + curl + libXi + libXtst + libargon2 + libsForQt5.kio + libsForQt5.qtbase + libsForQt5.qtsvg + minizip + pcsclite + qrencode + readline + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libsForQt5.qtmacextras + + apple-sdk_15 + # ScreenCaptureKit, required by livekit, is only available on 12.3 and up: + # https://developer.apple.com/documentation/screencapturekit + (darwinMinVersionHook "12.3") + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libusb1 + ] + ++ lib.optionals withKeePassX11 [ + libsForQt5.qtx11extras + ]; + + passthru = { + tests = { + inherit (nixosTests) keepassxc; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Offline password manager with many features"; + longDescription = '' + A community fork of KeePassX, which is itself a port of KeePass Password Safe. + The goal is to extend and improve KeePassX with new features and bugfixes, + to provide a feature-rich, fully cross-platform and modern open-source password manager. + Accessible via native cross-platform GUI, CLI, has browser integration + using the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser) + ''; + homepage = "https://keepassxc.org/"; + changelog = "https://github.com/keepassxreboot/keepassxc/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; + mainProgram = "keepassxc"; + maintainers = with lib.maintainers; [ + blankparticle + sigmasquadron + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/ke/kepler/package.nix b/pkgs/by-name/ke/kepler/package.nix index 845e6fff4ce3..ebdadf611ed2 100644 --- a/pkgs/by-name/ke/kepler/package.nix +++ b/pkgs/by-name/ke/kepler/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, libpq, openssl, @@ -28,15 +26,11 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - libpq - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libpq + openssl + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index 29f55beafa94..2ed6a8fb79a5 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -1,36 +1,65 @@ { + config, lib, stdenv, + alsa-lib, + autoPatchelfHook, + chafa, + curl, + faad2, fetchFromGitHub, fftwFloat, - chafa, glib, - libopus, - opusfile, - libvorbis, - taglib, - faad2, libogg, + libopus, + libjack2, + libpulseaudio, + libvorbis, + nix-update-script, + opusfile, pkg-config, + taglib, versionCheckHook, - gitUpdater, + + withALSA ? stdenv.hostPlatform.isLinux, + withJACK ? false, + withPulseaudio ? config.pulseaudio or stdenv.hostPlatform.isLinux, }: +let + uppercaseFirst = + x: (lib.toUpper (lib.substring 0 1 x)) + (lib.substring 1 ((lib.strings.stringLength x) - 1) x); +in + stdenv.mkDerivation (finalAttrs: { pname = "kew"; - version = "3.0.3"; + version = "3.3.2"; src = fetchFromGitHub { owner = "ravachol"; repo = "kew"; tag = "v${finalAttrs.version}"; - hash = "sha256-DzJ+7PanA15A9nIbFPWZ/tdxq4aDyParJORcuqHV7jc="; + hash = "sha256-DcQs9saw4DeEiPUo/pGaP5MMNfIuzOZPQW1FgQKQ20w="; }; - nativeBuildInputs = [ pkg-config ]; + postPatch = '' + substituteInPlace Makefile \ + --replace-fail '$(shell uname -s)' '${uppercaseFirst stdenv.hostPlatform.parsed.kernel.name}' \ + --replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}' + ''; + + nativeBuildInputs = + [ + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ]; + buildInputs = [ fftwFloat.dev chafa + curl.dev glib.dev libopus opusfile @@ -40,6 +69,19 @@ stdenv.mkDerivation (finalAttrs: { libogg ]; + runtimeDependencies = + lib.optionals withPulseaudio [ + libpulseaudio + ] + ++ lib.optionals (withALSA || withJACK) [ + alsa-lib + ] + ++ lib.optionals withJACK [ + libjack2 + ]; + + enableParallelBuilding = true; + installFlags = [ "MAN_DIR=${placeholder "out"}/share/man" "PREFIX=${placeholder "out"}" @@ -47,11 +89,11 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { - updateScript = gitUpdater { }; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix index 5eef5475390e..480503252afc 100644 --- a/pkgs/by-name/ke/kexec-tools/package.nix +++ b/pkgs/by-name/ke/kexec-tools/package.nix @@ -4,6 +4,7 @@ buildPackages, fetchurl, fetchpatch, + nixosTests, zlib, }: @@ -46,6 +47,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.kexec = nixosTests.kexec; + meta = with lib; { homepage = "http://horms.net/projects/kexec/kexec-tools"; description = "Tools related to the kexec Linux feature"; @@ -59,5 +62,6 @@ stdenv.mkDerivation rec { "sparc64-linux" ]; license = licenses.gpl2Only; + mainProgram = "kexec"; }; } diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix index eb63215f9162..e6349b3f2b95 100644 --- a/pkgs/by-name/ke/keychain/package.nix +++ b/pkgs/by-name/ke/keychain/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "keychain"; - version = "2.8.5"; + version = "2.9.5"; src = fetchFromGitHub { owner = "funtoo"; repo = "keychain"; rev = version; - sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; + sha256 = "sha256-mKYDSCaDYXUIiDi9EGkAu8gW4sEcUtR8mJ2LW4FFycQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keycloak/all-plugins.nix b/pkgs/by-name/ke/keycloak/all-plugins.nix index a62b65fe3f4c..3ba14493b231 100644 --- a/pkgs/by-name/ke/keycloak/all-plugins.nix +++ b/pkgs/by-name/ke/keycloak/all-plugins.nix @@ -4,6 +4,7 @@ scim-for-keycloak = callPackage ./scim-for-keycloak { }; scim-keycloak-user-storage-spi = callPackage ./scim-keycloak-user-storage-spi { }; keycloak-discord = callPackage ./keycloak-discord { }; + keycloak-magic-link = callPackage ./keycloak-magic-link { }; keycloak-metrics-spi = callPackage ./keycloak-metrics-spi { }; keycloak-restrict-client-auth = callPackage ./keycloak-restrict-client-auth { }; diff --git a/pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix b/pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix new file mode 100644 index 000000000000..8d0c2999fdd0 --- /dev/null +++ b/pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitHub, + maven, + nix-update-script, +}: +maven.buildMavenPackage rec { + pname = "keycloak-magic-link"; + version = "0.38"; + + src = fetchFromGitHub { + owner = "p2-inc"; + repo = "keycloak-magic-link"; + tag = "v${version}"; + hash = "sha256-+fhWxAUlt9UVM81Ua2Mwek3D5Kzzk/Tsugbo0fLyxiA="; + }; + + mvnHash = "sha256-edBdooR+KqY0JKwxdwTd5AxJ0qn3MV9xLrqYukIq2oY="; + + installPhase = '' + runHook preInstall + install -Dm644 target/keycloak-magic-link-${version}.jar $out/keycloak-magic-link-${version}.jar + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/p2-inc/keycloak-magic-link"; + description = "Magic Link Authentication for Keycloak"; + license = lib.licenses.elastic20; + maintainers = with lib.maintainers; [ lykos153 ]; + }; +} diff --git a/pkgs/by-name/ke/keydb/package.nix b/pkgs/by-name/ke/keydb/package.nix index 980e09743823..8bec09390283 100644 --- a/pkgs/by-name/ke/keydb/package.nix +++ b/pkgs/by-name/ke/keydb/package.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; platforms = lib.platforms.all; changelog = "https://github.com/Snapchat/KeyDB/raw/v${finalAttrs.version}/00-RELEASENOTES"; - maintainers = lib.teams.helsinki-systems.members; + teams = [ lib.teams.helsinki-systems ]; mainProgram = "keydb-cli"; }; }) diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix index b5770c5344b1..ab67776b821d 100644 --- a/pkgs/by-name/ke/keymapp/package.nix +++ b/pkgs/by-name/ke/keymapp/package.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "keymapp"; - version = "1.3.4"; + version = "1.3.6"; src = fetchurl { url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; - hash = "sha256-tav8W8e2ELoY29TcluUfW11d/YgdOdvjI7HgqYYdToY="; + hash = "sha256-LWO4aeNmGgZ+T41pb6HwC3tnwaiGviDIq63QMsrlkEc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix index a191e193905d..889edefebdbb 100644 --- a/pkgs/by-name/ke/keymapper/package.nix +++ b/pkgs/by-name/ke/keymapper/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "4.11.1"; + version = "4.11.4"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; - rev = finalAttrs.version; - hash = "sha256-Dq9oyCMMXWBDxX2Bj/IsrjBIxREwMQ12F5/SJ+sQfNY="; + tag = finalAttrs.version; + hash = "sha256-H2JdGfS+MMh6EDac2bjfcCtjdDSobClAgsqYbZYuSAo="; }; # all the following must be in nativeBuildInputs diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix index f87e343aa4e4..ed15ad19fccb 100644 --- a/pkgs/by-name/ke/keypunch/package.nix +++ b/pkgs/by-name/ke/keypunch/package.nix @@ -19,18 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "keypunch"; - version = "5.1"; + version = "6.3"; src = fetchFromGitHub { owner = "bragefuglseth"; repo = "keypunch"; tag = "v${finalAttrs.version}"; - hash = "sha256-C0WD8vBPlKvCJHVJHSfEbMIxNARoRrCn7PNebJ0rkoI="; + hash = "sha256-NjPC7WbzOk0tDjM8la+TKGy+U2NNT2kwcrSkaG7TylQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-SQ1BI9BuUfUvafsBnC1P5YQ8qVAaer6ywuRQkfS/V1w="; + hash = "sha256-gQg6CCb5OzK2fLWMtkRTv1hK642IezRN+5qLMGVV6s8="; }; strictDeps = true; @@ -61,12 +61,14 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Practice your typing skills"; homepage = "https://github.com/bragefuglseth/keypunch"; + changelog = "https://github.com/bragefuglseth/keypunch/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; mainProgram = "keypunch"; maintainers = with lib.maintainers; [ tomasajt getchoo ]; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ke/keyutils/package.nix b/pkgs/by-name/ke/keyutils/package.nix index 5b1468bb4b57..ef23de4fa8cc 100644 --- a/pkgs/by-name/ke/keyutils/package.nix +++ b/pkgs/by-name/ke/keyutils/package.nix @@ -53,6 +53,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + env = lib.optionalAttrs (stdenv.hostPlatform.useLLVM) { + NIX_LDFLAGS = "--undefined-version"; + }; + installFlags = [ "ETCDIR=$(out)/etc" "BINDIR=$(out)/bin" diff --git a/pkgs/by-name/kh/khal/package.nix b/pkgs/by-name/kh/khal/package.nix index ffc0c69aeb52..974d71af3065 100644 --- a/pkgs/by-name/kh/khal/package.nix +++ b/pkgs/by-name/kh/khal/package.nix @@ -4,48 +4,22 @@ fetchFromGitHub, glibcLocales, installShellFiles, - python3, + python3Packages, }: -let - python = python3.override { - packageOverrides = self: super: { - # https://github.com/pimutils/khal/issues/1361 - icalendar = super.icalendar.overridePythonAttrs (old: rec { - version = "5.0.13"; - src = fetchFromGitHub { - owner = "collective"; - repo = "icalendar"; - tag = "v${version}"; - hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; - }; - patches = [ ]; - build-system = with self; [ setuptools ]; - dependencies = with self; [ - python-dateutil - pytz - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "khal"; - version = "0.11.3"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "pimutils"; repo = "khal"; tag = "v${version}"; - hash = "sha256-YP2kQ/qXPDwvFvlHf+A2Ymvk49dmt5tAnTaOhrOV92M="; + hash = "sha256-pbBdScyYQMdT2NjCk2dKPkR75Zcizzco2IkXpHkgPR8="; }; - postPatch = '' - sed -i /intersphinx/d doc/source/conf.py - ''; - - build-system = with python.pkgs; [ + build-system = with python3Packages; [ setuptools setuptools-scm ]; @@ -55,8 +29,7 @@ python.pkgs.buildPythonApplication rec { installShellFiles ]; - dependencies = with python.pkgs; [ - atomicwrites + dependencies = with python3Packages; [ click click-log configobj @@ -73,7 +46,7 @@ python.pkgs.buildPythonApplication rec { urwid ]; - nativeCheckInputs = with python.pkgs; [ + nativeCheckInputs = with python3Packages; [ freezegun hypothesis packaging @@ -90,7 +63,7 @@ python.pkgs.buildPythonApplication rec { # man page PATH="${ - python3.withPackages ( + python3Packages.python.withPackages ( ps: with ps; [ sphinx sphinxcontrib-newsfeed @@ -120,6 +93,6 @@ python.pkgs.buildPythonApplication rec { homepage = "https://lostpackets.de/khal/"; changelog = "https://github.com/pimutils/khal/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ antonmosich ]; }; } diff --git a/pkgs/os-specific/darwin/khd/org.nixos.khd.plist b/pkgs/by-name/kh/khd/org.nixos.khd.plist similarity index 100% rename from pkgs/os-specific/darwin/khd/org.nixos.khd.plist rename to pkgs/by-name/kh/khd/org.nixos.khd.plist diff --git a/pkgs/by-name/kh/khd/package.nix b/pkgs/by-name/kh/khd/package.nix new file mode 100644 index 000000000000..bfdc1dfc7d3b --- /dev/null +++ b/pkgs/by-name/kh/khd/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, +}: + +stdenv.mkDerivation rec { + pname = "khd"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "koekeishiya"; + repo = "khd"; + rev = "v${version}"; + sha256 = "0nzfhknv1s71870w2dk9dy56a3g5zsbjphmfrz0vsvi438g099r4"; + }; + + patches = [ + # Fixes build issues, remove with >3.0.0 + (fetchpatch { + url = "https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch"; + sha256 = "0kvf5hxi5bf6pf125qib7wn7hys0ag66zzpp4srj1qa87lxyf7np"; + }) + ]; + + buildPhase = '' + make install + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/khd $out/bin/khd + + mkdir -p $out/Library/LaunchDaemons + cp ${./org.nixos.khd.plist} $out/Library/LaunchDaemons/org.nixos.khd.plist + substituteInPlace $out/Library/LaunchDaemons/org.nixos.khd.plist --subst-var out + ''; + + meta = with lib; { + description = "Simple modal hotkey daemon for OSX"; + homepage = "https://github.com/koekeishiya/khd"; + downloadPage = "https://github.com/koekeishiya/khd/releases"; + platforms = platforms.darwin; + maintainers = with maintainers; [ lnl7 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/by-name/kh/khronos/package.nix b/pkgs/by-name/kh/khronos/package.nix index 167403b1cf2e..dc0ce1d15e6c 100644 --- a/pkgs/by-name/kh/khronos/package.nix +++ b/pkgs/by-name/kh/khronos/package.nix @@ -51,7 +51,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Track each task's time in a simple inobtrusive way"; homepage = "https://github.com/lainsce/khronos"; - maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; + maintainers = with maintainers; [ xiorcale ]; + teams = [ teams.pantheon ]; platforms = platforms.linux; license = licenses.gpl3Plus; mainProgram = "io.github.lainsce.Khronos"; diff --git a/pkgs/by-name/ki/kickoff/package.nix b/pkgs/by-name/ki/kickoff/package.nix index 2935b823d656..f790145141fd 100644 --- a/pkgs/by-name/ki/kickoff/package.nix +++ b/pkgs/by-name/ki/kickoff/package.nix @@ -9,19 +9,19 @@ makeWrapper, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "kickoff"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "j0ru"; repo = "kickoff"; - rev = "v${version}"; - hash = "sha256-q/+Ik8L58LxOllpEosYyvD38RJb+NIQHslYpgGSwjKc="; + rev = "v${finalAttrs.version}"; + hash = "sha256-V4MkVjg5Q8eAJ80V/4SvEIwjVy35/HVewaR1caYLguw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-iTTwclBbmOALjMnT89w6k8Ix8HKTbBOxKHVgePbbXkA="; + cargoHash = "sha256-bkum6NOQL0LVsLvOmKljFHE86ZU3lLDR8+I3wL0Efmk="; libPath = lib.makeLibraryPath [ wayland @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - wrapProgram "$out/bin/kickoff" --prefix LD_LIBRARY_PATH : "${libPath}" + wrapProgram "$out/bin/kickoff" --prefix LD_LIBRARY_PATH : "${finalAttrs.libPath}" ''; meta = with lib; { @@ -49,4 +49,4 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ pyxels ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ki/kicli/package.nix b/pkgs/by-name/ki/kicli/package.nix index 3c1769bdd2ea..96d4bd9ef5e3 100644 --- a/pkgs/by-name/ki/kicli/package.nix +++ b/pkgs/by-name/ki/kicli/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "kicli"; - version = "0.0.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "anned20"; repo = pname; rev = "v${version}"; - hash = "sha256-Mt1lHOC8gBcLQ6kArUvlPrH+Y/63mIQTCsUY2UTJE2c="; + hash = "sha256-NXKo+zK5HnuMXRsi29lEhoo7RCagwvZdXXPNfp4pHtc="; }; vendorHash = "sha256-+8L/9NJ3dzP4k+LXkPD208uFGeARv7aT39bhH+R08e0="; diff --git a/pkgs/by-name/ki/kics/package.nix b/pkgs/by-name/ki/kics/package.nix index ae24b8f850a2..2f6540ce1758 100644 --- a/pkgs/by-name/ki/kics/package.nix +++ b/pkgs/by-name/ki/kics/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; tag = "v${version}"; - hash = "sha256-q1vpMXnW/tnOXjxnqp9KQHe6hWx4/DXXqLnR4+e0+vM="; + hash = "sha256-fw0OjSR9f0EuXq+QcRwt1+k22UdhPI1lNmSUahckimE="; }; - vendorHash = "sha256-Cp4kfAViBUkC7LMZFUrJtHKrIYxsc25fqbuw2a5Eh9w="; + vendorHash = "sha256-1Wr8649Yy3cAhj46YuRiHBiFtdWq/4M5H5lnLH+ThBE="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix index 8807d8887ba4..8f24acfff73e 100644 --- a/pkgs/by-name/ki/kikit/default.nix +++ b/pkgs/by-name/ki/kikit/default.nix @@ -26,7 +26,7 @@ let in buildPythonApplication rec { pname = "kikit"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -35,7 +35,13 @@ buildPythonApplication rec { owner = "yaqwsx"; repo = "KiKit"; tag = "v${version}"; - hash = "sha256-GG0OXPoTy219QefQ7GwMen4u66lPob5DI8lU9sqwaRQ="; + hash = "sha256-HSAQJJqJMVh44wgOQm+0gteShLogklBFuIzWtoVTf9I="; + # Upstream uses versioneer, which relies on gitattributes substitution. + # This leads to non-reproducible archives on GitHub. + # See https://github.com/NixOS/nixpkgs/issues/84312 + postFetch = '' + rm "$out/kikit/_version.py" + ''; }; build-system = [ @@ -75,6 +81,11 @@ buildPythonApplication rec { "kikit" ]; + postPatch = '' + # Recreate _version.py, deleted at fetch time due to non-reproducibility. + echo 'def get_versions(): return {"version": "${version}"}' > kikit/_version.py + ''; + preCheck = '' export PATH=$PATH:$out/bin diff --git a/pkgs/by-name/ki/kikit/drop-versioneer.patch b/pkgs/by-name/ki/kikit/drop-versioneer.patch new file mode 100644 index 000000000000..efddd64c7f23 --- /dev/null +++ b/pkgs/by-name/ki/kikit/drop-versioneer.patch @@ -0,0 +1,14 @@ +diff --git a/setup.py b/setup.py +index 9351fc9..75dfb2c 100644 +--- a/setup.py ++++ b/setup.py +@@ -66,9 +66,6 @@ + "solidpython>=1.1.2", + "commentjson>=0.9" + ], +- setup_requires=[ +- "versioneer" +- ], + extras_require={ + "dev": ["pytest"], + }, diff --git a/pkgs/tools/misc/killport/default.nix b/pkgs/by-name/ki/killport/package.nix similarity index 100% rename from pkgs/tools/misc/killport/default.nix rename to pkgs/by-name/ki/killport/package.nix diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index b4bde00978dc..a5eb7fd6948b 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ php.buildComposerProject2 (finalAttrs: { pname = "kimai"; - version = "2.31.0"; + version = "2.33.0"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; tag = finalAttrs.version; - hash = "sha256-aVRqek8nMgos1V247ZmJenVFfAmqEpNGtYWScWHD/gg="; + hash = "sha256-YkACx0xl+6yN8pgH56WPdEoNAZxAxHIPLay28V1S5WQ="; }; php = php.buildEnv { @@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: { ''; }; - vendorHash = "sha256-uPIP3g8oJb+JnW/WnAdW/ZSLAQwyXI9X006rrA7pnKI="; + vendorHash = "sha256-smDAz4RnVEgPcGjsQmN0NC8kWgLw78YFuef9gbajAeQ="; composerNoPlugins = false; composerNoScripts = false; diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix index 525a01612df8..9797ad5ddcfb 100644 --- a/pkgs/by-name/ki/kin-openapi/package.nix +++ b/pkgs/by-name/ki/kin-openapi/package.nix @@ -5,14 +5,14 @@ }: buildGoModule rec { pname = "kin-openapi"; - version = "0.131.0"; + version = "0.132.0"; vendorHash = "sha256-VtN2dOJEBAS7khjn2GlvMspFvd7SgMqNWBte3gwbWng="; src = fetchFromGitHub { owner = "getkin"; repo = "kin-openapi"; tag = "v${version}"; - hash = "sha256-SHBxn9TXCoGIkzhVnWbMkgTd1XmGerM5IL9t/hkcmGk="; + hash = "sha256-2iDT9sI4dy7KEFKfWhPhccTc1/1jpSjYt+cXz+RE9ys="; }; checkFlags = diff --git a/pkgs/by-name/ki/kind2/package.nix b/pkgs/by-name/ki/kind2/package.nix new file mode 100644 index 000000000000..0d1840400d7f --- /dev/null +++ b/pkgs/by-name/ki/kind2/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchCrate, +}: + +rustPlatform.buildRustPackage rec { + pname = "kind2"; + version = "0.3.10"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-X2sjfYrSSym289jDJV3hNmcwyQCMnrabmGCUKD5wfdY="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-G6UW8m/6D+hgRRceMPYFI+k4D7Ui6sDUDzI5IVWvVyc="; + + postPatch = '' + substituteInPlace src/main.rs \ + --replace-fail "#![feature(panic_info_message)]" "" + substituteInPlace src/main.rs \ + --replace-fail "e.message().unwrap()" "e.payload()" + ''; + + # requires nightly features + RUSTC_BOOTSTRAP = true; + + meta = with lib; { + description = "Functional programming language and proof assistant"; + mainProgram = "kind2"; + homepage = "https://github.com/higherorderco/kind"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix index e485a958fee4..905aa75fc9a2 100644 --- a/pkgs/by-name/ki/kine/package.nix +++ b/pkgs/by-name/ki/kine/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kine"; - version = "0.13.11"; + version = "0.13.15"; src = fetchFromGitHub { owner = "k3s-io"; repo = "kine"; rev = "v${version}"; - hash = "sha256-Fb73warUgPX/FQT/zDnn3r7SP2tw142Npg2rhK8BEqI="; + hash = "sha256-dRyly3WkNziQf9m+IkCB4294WfGZCWBFt0auubb9vms="; }; - vendorHash = "sha256-RyyDtKdEaXhrIHTA4IxtuWhOnuRWbCF2vUCkDr9lhUg="; + vendorHash = "sha256-xsGX7cVfwx5+P3ArWUFnQvJAHgzgV2AwKGOHJZngN40="; ldflags = [ "-s" diff --git a/pkgs/by-name/ki/kismet/package.nix b/pkgs/by-name/ki/kismet/package.nix index 0662a1b5e97f..cc38baff02f9 100644 --- a/pkgs/by-name/ki/kismet/package.nix +++ b/pkgs/by-name/ki/kismet/package.nix @@ -4,7 +4,7 @@ autoreconfHook, binutils, elfutils, - fetchurl, + fetchFromGitHub, glib, libcap, libmicrohttpd, @@ -14,7 +14,9 @@ libwebsockets, lm_sensors, networkmanager, - pcre, + nix-update-script, + nixosTests, + pcre2, pkg-config, openssl, protobuf, @@ -27,20 +29,22 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalPackage: { pname = "kismet"; - version = "2023-07-R1"; + version = "2023-07-R2"; - src = fetchurl { - url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; - hash = "sha256-8IVI4mymX6HlZ7Heu+ocpNDnIGvduWpPY5yQFxhz6Pc="; + src = fetchFromGitHub { + owner = "kismetwireless"; + repo = "kismet"; + tag = "kismet-${finalPackage.version}"; + hash = "sha256-QwTjjZHnrlATFvHK9PLDTt76UjfZdzCmV6uXVgIMIYg="; }; postPatch = '' substituteInPlace Makefile.in \ - --replace "-m 4550" "" + --replace-fail "-m 4550" "" substituteInPlace configure.ac \ - --replace "pkg-config" "$PKG_CONFIG" + --replace-fail "pkg-config" "$PKG_CONFIG" ''; postConfigure = '' @@ -81,7 +85,7 @@ stdenv.mkDerivation rec { openssl libusb1 libwebsockets - pcre + pcre2 protobuf protobufc sqlite @@ -111,10 +115,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + passthru = { + tests.kismet = nixosTests.kismet; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^kismet-(\\d+-\\d+-.+)$" + ]; + }; + }; + + meta = { description = "Wireless network sniffer"; homepage = "https://www.kismetwireless.net/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ numinit ]; }; -} +}) diff --git a/pkgs/by-name/ki/kissat/package.nix b/pkgs/by-name/ki/kissat/package.nix index 94c54694dee6..93cdc7060752 100644 --- a/pkgs/by-name/ki/kissat/package.nix +++ b/pkgs/by-name/ki/kissat/package.nix @@ -4,8 +4,25 @@ fetchFromGitHub, drat-trim, p7zip, + pkg-config, }: +let + # Early meta to reference in pkgconfig generation + meta = with lib; { + description = "'keep it simple and clean bare metal SAT solver' written in C"; + mainProgram = "kissat"; + longDescription = '' + Kissat is a "keep it simple and clean bare metal SAT solver" written in C. + It is a port of CaDiCaL back to C with improved data structures, + better scheduling of inprocessing and optimized algorithms and implementation. + ''; + maintainers = with maintainers; [ shnarazk ]; + platforms = platforms.unix; + license = licenses.mit; + homepage = "https://fmv.jku.at/kissat"; + }; +in stdenv.mkDerivation rec { pname = "kissat"; version = "4.0.2"; @@ -23,6 +40,10 @@ stdenv.mkDerivation rec { "lib" ]; + nativeBuildInputs = [ + pkg-config + ]; + nativeCheckInputs = [ drat-trim p7zip @@ -37,6 +58,14 @@ stdenv.mkDerivation rec { dontAddPrefix = true; setOutputFlags = false; + configurePhase = '' + ./configure + ''; + + buildPhase = '' + make -j$NIX_BUILD_CORES + ''; + installPhase = '' runHook preInstall @@ -46,20 +75,23 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/doc/kissat/" install -Dm0644 {LICEN?E,README*,VERSION} "$out/share/doc/kissat/" + # Create pkgconfig + mkdir -p $dev/lib/pkgconfig + cat > $dev/lib/pkgconfig/kissat.pc < /dev/null + runHook preInstallCheck + + PATH=$PATH:${getent}/bin $out/bin/kn version | grep ${finalAttrs.version} > /dev/null + + runHook postInstallCheck ''; - meta = with lib; { - description = "Knative client kn is your door to the Knative world. It allows you to create Knative resources interactively from the command line or from within scripts"; + meta = { + description = "Create Knative resources interactively from the command line or from within scripts"; mainProgram = "kn"; homepage = "https://github.com/knative/client"; - changelog = "https://github.com/knative/client/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ bryanasdev000 ]; + changelog = "https://github.com/knative/client/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bryanasdev000 ]; }; -} +}) diff --git a/pkgs/by-name/kn/knossosnet/deps.json b/pkgs/by-name/kn/knossosnet/deps.json index a5b62c2eb37b..96f952f684f7 100644 --- a/pkgs/by-name/kn/knossosnet/deps.json +++ b/pkgs/by-name/kn/knossosnet/deps.json @@ -6,13 +6,13 @@ }, { "pname": "Avalonia", - "version": "11.0.5", - "hash": "sha256-BqpHqQIObTb7DHTyZAgCD9A5I0pZkHhSoPTN2g6/G9E=" + "version": "11.2.3", + "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY=" }, { "pname": "Avalonia.Angle.Windows.Natives", - "version": "2.1.0.2023020321", - "hash": "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks=" + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" }, { "pname": "Avalonia.BuildServices", @@ -21,98 +21,103 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.0.5", - "hash": "sha256-Iob8OyWhwXhmHKCdnea7dtL9VQvcrf6/gUGHJ30CKXA=" + "version": "11.2.3", + "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.0.5", - "hash": "sha256-2iVuMPRw7sbsYPGSG4XjQFGFky5WB5B05Jh1+I852ZI=" + "version": "11.2.3", + "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM=" }, { "pname": "Avalonia.Desktop", - "version": "11.0.5", - "hash": "sha256-UKVibxhJoGNvEGh8J/Z0sq8J81FT8yth/yXVPSFHF/8=" + "version": "11.2.3", + "hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.0.5", - "hash": "sha256-0cUxPYJP2W11wnM6j4qNB3IvHlsUp9EZlY8I/NoAmd4=" + "version": "11.2.3", + "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.0.5", - "hash": "sha256-O20fC/9YXO3/MZNlh1EgWLHFSyi/ao083MKwjetgxmo=" + "version": "11.2.3", + "hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY=" }, { "pname": "Avalonia.HtmlRenderer", "version": "11.0.0", "hash": "sha256-DBD113eQJNHeEgFmx/tVRSnHxhGBQIKWVKxr1QRilr4=" }, + { + "pname": "Avalonia.Markup.Xaml.Loader", + "version": "11.2.3", + "hash": "sha256-odkZZXqTbL+h9aPSQiO+haFF89xgFg4XKsvzVWxLjVE=" + }, { "pname": "Avalonia.Native", - "version": "11.0.5", - "hash": "sha256-KVUAXXT+f4VrtJ8widfEIzN25GBbtXWog/tpM354gdg=" + "version": "11.2.3", + "hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.0.5", - "hash": "sha256-wTqdxPU3Ql7jC4JFkChbUfaRR0nqUKrYKn8oexdFyig=" + "version": "11.2.3", + "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" }, { "pname": "Avalonia.Skia", - "version": "11.0.5", - "hash": "sha256-rKOgkNLCwEVVcyLCimvhDUDKXnrDOguUryaGVOPFFwE=" + "version": "11.2.3", + "hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.0.5", - "hash": "sha256-ETOaNvRzTAC0uEVVB3noiyYM9N9nPrPnMwCqiFgID/4=" + "version": "11.2.3", + "hash": "sha256-DRl+267mUtJDUJpreUj6BxDLGGYGkEEo5vDGtGguoC8=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.0.5", - "hash": "sha256-27evmgSrIx+EopF6E3N1cT7BvAUc/s99TVEMfmG83cQ=" + "version": "11.2.3", + "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k=" }, { "pname": "Avalonia.Win32", - "version": "11.0.5", - "hash": "sha256-ncZLGKhpfjuuVPz4Fs+P6L3dM0KRnwAC3xJRqyvpKw8=" + "version": "11.2.3", + "hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE=" }, { "pname": "Avalonia.X11", - "version": "11.0.5", - "hash": "sha256-rvs3hwRh3F5E1j3JqcodWJTHV3BTWMKkvzq170tuPa4=" + "version": "11.2.3", + "hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60=" }, { "pname": "CommunityToolkit.Mvvm", - "version": "8.2.2", - "hash": "sha256-vdprWEw+J6yJZLWZTUFTrQAHWLuPVXPBaYmePD7kcwY=" + "version": "8.4.0", + "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI=" }, { "pname": "HarfBuzzSharp", - "version": "2.8.2.3", - "hash": "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ=" + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "2.8.2.3", - "hash": "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg=" + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "2.8.2.3", - "hash": "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ=" + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "2.8.2.3", - "hash": "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA=" + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "2.8.2.3", - "hash": "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI=" + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" }, { "pname": "ini-parser-netstandard", @@ -125,428 +130,128 @@ "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" }, { - "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.0.0", - "hash": "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0=" + "pname": "Microsoft.Extensions.Configuration", + "version": "8.0.0", + "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" }, { - "pname": "Microsoft.CodeAnalysis.Common", - "version": "3.8.0", - "hash": "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o=" + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "8.0.0", + "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" }, { - "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "3.8.0", - "hash": "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4=" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp.Scripting", - "version": "3.8.0", - "hash": "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA=" - }, - { - "pname": "Microsoft.CodeAnalysis.Scripting.Common", - "version": "3.8.0", - "hash": "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I=" - }, - { - "pname": "Microsoft.CSharp", - "version": "4.3.0", - "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8=" + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "8.0.0", + "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "7.0.0", - "hash": "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g=" + "version": "8.0.1", + "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "7.0.0", - "hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA=" + "version": "8.0.2", + "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics", + "version": "8.0.1", + "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "8.0.1", + "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0=" }, { "pname": "Microsoft.Extensions.Http", - "version": "7.0.0", - "hash": "sha256-PHLmTf8/qmhLO/8IdotsRCoIA2cczhefgw7gOf8Iy6Q=" + "version": "8.0.1", + "hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o=" }, { "pname": "Microsoft.Extensions.Logging", - "version": "7.0.0", - "hash": "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8=" + "version": "8.0.1", + "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "7.0.0", - "hash": "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74=" + "version": "8.0.2", + "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" }, { "pname": "Microsoft.Extensions.Options", - "version": "7.0.0", - "hash": "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0=" + "version": "8.0.2", + "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" + }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "8.0.0", + "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" }, { "pname": "Microsoft.Extensions.Primitives", - "version": "7.0.0", - "hash": "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w=" + "version": "8.0.0", + "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" }, { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "2.1.2", - "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" - }, - { - "pname": "Microsoft.Win32.SystemEvents", - "version": "6.0.0", - "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" - }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" - }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + "pname": "ObservableCollections", + "version": "3.3.3", + "hash": "sha256-HH/xNIVQpvlWONL8RChuaeW2l6zC47Xx/JNSE5/JRR4=" }, { "pname": "SharpCompress", - "version": "0.33.0", - "hash": "sha256-6UWirVcwUai816UZ9J5P3dYMvJLl7K1Puvf5uaWDJMk=" + "version": "0.39.0", + "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE=" }, { "pname": "SkiaSharp", - "version": "2.88.6", - "hash": "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc=" + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.6", - "hash": "sha256-VjgGoi73tVvqO/UXmQb1w9ioAbFu2dxH8oHz1l5H4zE=" + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.6", - "hash": "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo=" + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.6", - "hash": "sha256-CIb9fHVgHwIa0R1WafKJ3+GqtDHHRgDohA3ayTHvlws=" + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.6", - "hash": "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA=" + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" - }, - { - "pname": "System.Collections.Immutable", - "version": "5.0.0", - "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8=" - }, - { - "pname": "System.ComponentModel.Annotations", - "version": "4.5.0", - "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" - }, - { - "pname": "System.Drawing.Common", - "version": "6.0.0", - "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.3.0", - "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU=" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + "pname": "System.Buffers", + "version": "4.6.0", + "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=" }, { "pname": "System.IO.Pipelines", - "version": "6.0.0", - "hash": "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA=" - }, - { - "pname": "System.Linq", - "version": "4.3.0", - "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.3.0", - "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" - }, - { - "pname": "System.Memory", - "version": "4.5.4", - "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" - }, - { - "pname": "System.ObjectModel", - "version": "4.3.0", - "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.3.0", - "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "5.0.0", - "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.3.0", - "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.7.1", - "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "4.5.1", - "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw=" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, { "pname": "Tmds.DBus.Protocol", - "version": "0.15.0", - "hash": "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU=" + "version": "0.20.0", + "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" + }, + { + "pname": "WindowsShortcutFactory", + "version": "1.2.0", + "hash": "sha256-TScGgF++Av8QRSanZ3bIPhYaUEv6RQyAET3NvbKDxWQ=" + }, + { + "pname": "ZstdSharp.Port", + "version": "0.8.4", + "hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo=" } ] diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index a29b3135c981..5024caa554e4 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "knossosnet"; - version = "1.2.4"; + version = "1.3.1"; src = fetchFromGitHub { owner = "KnossosNET"; repo = "Knossos.NET"; rev = "v${version}"; - hash = "sha256-vlSiM6kskV4wfBZF7Rv5ICyqKG0Zhz/iU8kflYOaf0U="; + hash = "sha256-XaCBuZ4Hf2ISw3hVQ1s2Hp8PLxp2eFr+I7U5ttUDQvU="; }; patches = [ ./dotnet-8-upgrade.patch ]; diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index a0cee0a2722d..361bdb298424 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.4.5"; + version = "3.4.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "sha256-NZr3Cvr6fMqhhDmnwes1Jw/57s6B0HVq5MpxaxQzy0s="; + sha256 = "sha256-0ZxaH/lLTyYCfWNd4Qjb/Ij1ZSvobMs7qaRO6b4OWDk="; }; outputs = [ @@ -101,6 +101,8 @@ stdenv.mkDerivation rec { "-DNDEBUG" ]; + __darwinAllowLocalNetworking = true; + doCheck = true; checkFlags = [ "V=1" ]; # verbose output in case some test fails doInstallCheck = true; diff --git a/pkgs/by-name/kn/knowsmore/package.nix b/pkgs/by-name/kn/knowsmore/package.nix index cba831dbe077..6beace090293 100644 --- a/pkgs/by-name/kn/knowsmore/package.nix +++ b/pkgs/by-name/kn/knowsmore/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "knowsmore"; - version = "0.1.43"; + version = "0.1.45"; pyproject = true; src = fetchFromGitHub { owner = "helviojunior"; repo = "knowsmore"; tag = "v${version}"; - hash = "sha256-rLESaedhEHTMYVbITr3vjyE6urhwl/g1/iTMZ4ruE1c="; + hash = "sha256-Z0N98P1vh9nhqOzlkL/BgqQrybeig5TrHsg1K4jqGxw="; }; pythonRelaxDeps = [ @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool for pentesting Microsoft Active Directory"; homepage = "https://github.com/helviojunior/knowsmore"; - changelog = "https://github.com/helviojunior/knowsmore/releases/tag/v${version}"; + changelog = "https://github.com/helviojunior/knowsmore/releases/tag/${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "knowsmore"; diff --git a/pkgs/by-name/ko/ko/package.nix b/pkgs/by-name/ko/ko/package.nix index 0ad274bba87b..4f366d7b20a9 100644 --- a/pkgs/by-name/ko/ko/package.nix +++ b/pkgs/by-name/ko/ko/package.nix @@ -1,24 +1,23 @@ { lib, - # broken with go 1.24 for some reason - buildGo123Module, + buildGoModule, fetchFromGitHub, gitMinimal, installShellFiles, }: -buildGo123Module rec { +buildGoModule rec { pname = "ko"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ko-build"; repo = pname; tag = "v${version}"; - hash = "sha256-OQtYyokARrjaf0MWQ0sMqJPb+C5pRkKFumAmtxS4SBo="; + hash = "sha256-fAdogzNCuz8vHWF1UOFmDKSRXbNvY5knKIhfJzXNGzw="; }; - vendorHash = "sha256-YQggwX6fUsfZMM+GdgeNAIHkfX84FMF84xHsP/SNiS4="; + vendorHash = "sha256-R+vGG2u/unXffD/9Aq065zR7Xq9KEWZl4llYFxR0HLU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index c79ae4a3475e..7b8acf13820a 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -17,7 +17,7 @@ cublasSupport ? config.cudaSupport, # You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/ # For example if you're on an RTX 3060 that means you're using "Ampere" and you need to pass "sm_86" - cudaArches ? cudaPackages.cudaFlags.realArches or [ ], + cudaArches ? cudaPackages.flags.realArches or [ ], clblastSupport ? stdenv.hostPlatform.isLinux, clblast, diff --git a/pkgs/by-name/ko/koji/package.nix b/pkgs/by-name/ko/koji/package.nix index fb3729958667..42f605d553c1 100644 --- a/pkgs/by-name/ko/koji/package.nix +++ b/pkgs/by-name/ko/koji/package.nix @@ -1,45 +1,74 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, pkg-config, perl, udev, openssl, + gitMinimal, + writableTmpDirAsHomeHook, + installShellFiles, + versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "koji"; - version = "2.2.0"; + version = "3.2.0"; src = fetchFromGitHub { - owner = "its-danny"; + owner = "cococonscious"; repo = "koji"; - rev = version; - hash = "sha256-2kBjHX7izo4loJ8oyPjE9FtCvUODC3Sm4T8ETIdeGZM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+xtq4btFbOfiyFMDHXo6riSBMhAwTLQFuE91MUHtg5Q="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZHti7nMfHiYur1kjxj+ySIF4/l0UU9q2urabUWZyk6E="; + cargoHash = "sha256-WiFXDXLJc2ictv29UoRFRpIpAqeJlEBEOvThXhLXLJA="; OPENSSL_NO_VENDOR = 1; nativeBuildInputs = [ pkg-config perl - udev + installShellFiles ]; buildInputs = [ - openssl.dev + openssl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]; + + nativeCheckInputs = [ + gitMinimal + writableTmpDirAsHomeHook ]; - meta = with lib; { + preCheck = '' + git config --global user.name 'nix-user' + git config --global user.email 'nix-user@example.com' + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd koji \ + --bash <($out/bin/koji completions bash) \ + --fish <($out/bin/koji completions fish) \ + --zsh <($out/bin/koji completions zsh) + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + + meta = { description = "Interactive CLI for creating conventional commits"; homepage = "https://github.com/its-danny/koji"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ ByteSudoer ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + ByteSudoer + WeetHet + ]; mainProgram = "koji"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix index e682cbe13da8..6f4c6761cdcb 100644 --- a/pkgs/by-name/ko/kokkos/package.nix +++ b/pkgs/by-name/ko/kokkos/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kokkos"; - version = "4.5.01"; + version = "4.6.00"; src = fetchFromGitHub { owner = "kokkos"; repo = "kokkos"; rev = finalAttrs.version; - hash = "sha256-vqNuLoyhsw7Hoc4Or7dm5hPvKaHjQjlkvrHEc6sdL7M="; + hash = "sha256-4Or6Z/ZXH/WmA8GW6/Odn9+w7E/jdBDMCkWSpMf5Zoc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/kolla/package.nix b/pkgs/by-name/ko/kolla/package.nix index 678366edb305..975d44e5bce9 100644 --- a/pkgs/by-name/ko/kolla/package.nix +++ b/pkgs/by-name/ko/kolla/package.nix @@ -1,23 +1,19 @@ { lib, - python311Packages, + python3Packages, fetchFromGitHub, bashate, }: -let - pythonPackages = python311Packages; -in -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "kolla"; - version = "18.1.0"; - + version = "19.4.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "kolla"; - hash = "sha256-jLD6ILihymQlWkkpGYC4OX8BKLpQurAK6Y5Xpju+QAI="; + hash = "sha256-yVNMCqg6eAUhLg3iAjDkYpMoIKc6OksDri9jNpyaS7c="; rev = version; }; @@ -26,21 +22,22 @@ pythonPackages.buildPythonApplication rec { --replace-fail "os.path.join(sys.prefix, 'share/kolla')," \ "os.path.join(PROJECT_ROOT, '../../../share/kolla')," - substituteInPlace test-requirements.txt \ - --replace-fail "hacking>=3.0.1,<3.1.0" "hacking" - sed -e 's/git_info = .*/git_info = "${version}"/' -i kolla/version.py ''; + pythonRelaxDeps = [ + "hacking" + ]; + # fake version to make pbr.packaging happy env.PBR_VERSION = version; - build-system = with pythonPackages; [ + build-system = with python3Packages; [ setuptools pbr ]; - dependencies = with pythonPackages; [ + dependencies = with python3Packages; [ docker jinja2 oslo-config @@ -49,10 +46,10 @@ pythonPackages.buildPythonApplication rec { ]; postInstall = '' - cp kolla/template/repos.yaml $out/${pythonPackages.python.sitePackages}/kolla/template/ + cp kolla/template/repos.yaml $out/${python3Packages.python.sitePackages}/kolla/template/ ''; - nativeCheckInputs = with pythonPackages; [ + nativeCheckInputs = with python3Packages; [ testtools stestr oslotest @@ -73,6 +70,7 @@ pythonPackages.buildPythonApplication rec { mainProgram = "kolla-build"; homepage = "https://opendev.org/openstack/kolla"; license = licenses.asl20; - maintainers = teams.openstack.members ++ [ maintainers.astro ]; + maintainers = [ maintainers.astro ]; + teams = [ teams.openstack ]; }; } diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 84abcc2a04bd..a744856102ab 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -5,7 +5,6 @@ pkg-config, openssl, rustPlatform, - darwin, testers, komac, dbus, @@ -37,17 +36,12 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles ]; - buildInputs = - [ - dbus - openssl - zstd - bzip2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + dbus + openssl + zstd + bzip2 + ]; env = { OPENSSL_NO_VENDOR = true; @@ -83,7 +77,6 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/russellbanks/Komac/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ - kachick HeitorAugustoLN ]; mainProgram = "komac"; diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix index 720aebbe17ca..a51548102929 100644 --- a/pkgs/by-name/ko/komga/package.nix +++ b/pkgs/by-name/ko/komga/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.21.2"; + version = "1.21.3"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-FYw519VT40PU3fVEb7DBoST2bqhPXcEqquHkGeULQ3k="; + sha256 = "sha256-NFj/C1oNRh9PzAi5TUv+4vVea1Nsn/frxf4aZjuYfvA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 4eb461d662d6..0c6ba902535d 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -23,15 +23,15 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.72.0"; + version = "1.76.1"; pyproject = false; src = fetchFromGitea { domain = "codeberg.org"; owner = "valos"; repo = "Komikku"; - rev = "v${version}"; - hash = "sha256-Kdt4nEWdxfZB7rmPbCegbj4abfv1nMSvAAC6mmUcv44="; + tag = "v${version}"; + hash = "sha256-js9mywNlv13ZDmvoBt9yuXJePaSuKOimek3uNlVIeHM="; }; nativeBuildInputs = [ @@ -54,14 +54,14 @@ python3.pkgs.buildPythonApplication rec { webkitgtk_6_0 ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ beautifulsoup4 brotli - colorthief dateparser emoji keyring lxml + modern-colorthief natsort piexif pillow @@ -92,12 +92,7 @@ python3.pkgs.buildPythonApplication rec { # Prevent double wrapping. dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - ) - ''; + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; passthru = { updateScript = nix-update-script { }; @@ -109,12 +104,10 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://apps.gnome.org/Komikku/"; license = lib.licenses.gpl3Plus; changelog = "https://codeberg.org/valos/Komikku/releases/tag/v${version}"; - maintainers = - with lib.maintainers; - [ - chuangzhu - Gliczy - ] - ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ + chuangzhu + Gliczy + ]; + teams = [ lib.teams.gnome-circle ]; }; } diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix index de7228665c18..a280a0251edc 100644 --- a/pkgs/by-name/ko/komodo/package.nix +++ b/pkgs/by-name/ko/komodo/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "komodo"; - version = "1.17.0"; + version = "1.17.5"; src = fetchFromGitHub { owner = "moghtech"; repo = "komodo"; tag = "v${version}"; - hash = "sha256-8RY7g7dCjY+vt4x5+dcRhjcFPDhK8ZLMksPloWWharc="; + hash = "sha256-vIK/4WH85qTdjXBX32F6P/XEHdsNw2Kd86btjfl13lE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-r8p/kd3W7+zlrt2NsdAIOg9J4OU9QDTZBOWfCLV5+ys="; + cargoHash = "sha256-YCSxMcuzN1IroDfbj18yjGT0ua1xfY4l0dJ/OZhHPZw="; # disable for check. document generation is fail # > error: doctest failed, to rerun pass `-p komodo_client --doc` diff --git a/pkgs/by-name/ko/kompose/package.nix b/pkgs/by-name/ko/kompose/package.nix index bad37825a1f4..6ced90ad3eef 100644 --- a/pkgs/by-name/ko/kompose/package.nix +++ b/pkgs/by-name/ko/kompose/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "kompose"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kompose"; rev = "v${version}"; - hash = "sha256-M1d1pSIMRIlLKob9D8MzrUuPm+h9C5sSC8L+uIdU1Ic="; + hash = "sha256-OnVJkAZqN0/V0tHtDpsZDN2gIvEpI5z2Pv0lspr6ZTg="; }; vendorHash = "sha256-UQnhakHAyldESYhQlHe5mHVv5jFB7DUp+mNo0Q0iDkc="; diff --git a/pkgs/by-name/ko/konbucase/package.nix b/pkgs/by-name/ko/konbucase/package.nix index 905f63f5aa51..6398565d3fde 100644 --- a/pkgs/by-name/ko/konbucase/package.nix +++ b/pkgs/by-name/ko/konbucase/package.nix @@ -7,19 +7,22 @@ vala, pkg-config, wrapGAppsHook3, + blueprint-compiler, pantheon, gtksourceview5, + chcase, + libadwaita, }: stdenv.mkDerivation (finalAttrs: { pname = "konbucase"; - version = "4.1.2"; + version = "4.4.0"; src = fetchFromGitHub { owner = "ryonakano"; repo = "konbucase"; - rev = finalAttrs.version; - hash = "sha256-md7drxg1JuW6TRJauKOk4Aqjx/V1RVZ+POa5v6DtKwk="; + tag = finalAttrs.version; + hash = "sha256-56P2RueZSsuQth8IB73r3WYXCQ+rEyfQpGXhLAAeFlY="; fetchSubmodules = true; }; @@ -29,25 +32,28 @@ stdenv.mkDerivation (finalAttrs: { vala pkg-config wrapGAppsHook3 + blueprint-compiler ]; buildInputs = [ pantheon.granite7 gtksourceview5 + chcase + libadwaita ]; postInstall = '' mv $out/bin/com.github.ryonakano.konbucase $out/bin/konbucase substituteInPlace $out/share/applications/com.github.ryonakano.konbucase.desktop \ - --replace 'Exec=com.github.ryonakano.konbucase' 'Exec=${placeholder "out"}/bin/konbucase' + --replace-fail "Exec=com.github.ryonakano.konbucase" "Exec=konbucase" ''; - meta = with lib; { + meta = { homepage = "https://github.com/ryonakano/konbucase"; description = "Case converting app suitable for coding or typing"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ galaxy ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ galaxy ]; + platforms = lib.platforms.linux; mainProgram = "konbucase"; }; }) diff --git a/pkgs/by-name/ko/konstraint/package.nix b/pkgs/by-name/ko/konstraint/package.nix index dc23321f593f..44becc8b0e33 100644 --- a/pkgs/by-name/ko/konstraint/package.nix +++ b/pkgs/by-name/ko/konstraint/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-45zCzjzbKYLsLxmo7yGbbyeYP1WyULD9d+nnNLP9Zzo="; + sha256 = "sha256-DwfBevCGDndMfQiwiuV+J95prhbxT20siMrEY2T7h1w="; }; - vendorHash = "sha256-ZPK3+x0GOMs2RXxIs90BvEg25lb/j11J9zECaMHg4zY="; + vendorHash = "sha256-iCth5WrX0XG218PfbXt4jeA3MZuZ68eNaV+RtzMhXP0="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/by-name/ko/kopia-ui/fix-paths.patch b/pkgs/by-name/ko/kopia-ui/fix-paths.patch new file mode 100644 index 000000000000..22744100099e --- /dev/null +++ b/pkgs/by-name/ko/kopia-ui/fix-paths.patch @@ -0,0 +1,42 @@ +diff --git a/public/utils.js b/public/utils.js +index 3cd38b63..54152694 100644 +--- a/public/utils.js ++++ b/public/utils.js +@@ -17,7 +17,7 @@ const osShortName = function () { + + export function iconsPath() { + if (!app.isPackaged) { +- return path.join(__dirname, "..", "resources", osShortName, "icons"); ++ return path.join(__dirname, "..", "..", "icons"); + } + + return path.join(process.resourcesPath, "icons"); +@@ -25,26 +25,14 @@ export function iconsPath() { + + export function publicPath() { + if (!app.isPackaged) { +- return path.join(__dirname, "..", "public"); ++ return path.join(__dirname, "..", "..", "public"); + } + + return process.resourcesPath; + } + + export function defaultServerBinary() { +- if (!app.isPackaged) { +- return { +- "mac": path.join(__dirname, "..", "..", "dist", "kopia_darwin_amd64", "kopia"), +- "win": path.join(__dirname, "..", "..", "dist", "kopia_windows_amd64", "kopia.exe"), +- "linux": path.join(__dirname, "..", "..", "dist", "kopia_linux_amd64", "kopia"), +- }[osShortName] +- } +- +- return { +- "mac": path.join(process.resourcesPath, "server", "kopia"), +- "win": path.join(process.resourcesPath, "server", "kopia.exe"), +- "linux": path.join(process.resourcesPath, "server", "kopia"), +- }[osShortName] ++ return "KOPIA" + } + export function selectByOS(x) { + return x[osShortName] diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix new file mode 100644 index 000000000000..0a74ec1bc8c5 --- /dev/null +++ b/pkgs/by-name/ko/kopia-ui/package.nix @@ -0,0 +1,94 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + electron, + copyDesktopItems, + makeDesktopItem, + nix-update-script, + makeWrapper, + kopia, +}: +let + version = "0.19.0"; + src = fetchFromGitHub { + owner = "kopia"; + repo = "kopia"; + tag = "v${version}"; + hash = "sha256-PfxMs9MwoI+4z8vZ1sVlIEal3TOmA06997jWwShNfrE="; + }; +in +buildNpmPackage { + pname = "kopia-ui"; + inherit version src; + + sourceRoot = "${src.name}/app"; + + npmDepsHash = "sha256-3K5dwAQeAo98rz2gxGw3k/D+VkDJNe5pmAyEo4boetU="; + makeCacheWritable = true; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + }; + + patches = [ ./fix-paths.patch ]; + + postPatch = '' + substituteInPlace public/utils.js --replace-fail KOPIA ${lib.getExe kopia} + ''; + + buildPhase = '' + runHook preBuild + cp -r ${electron.dist} electron-dist + chmod -R u+w .. + npm exec electron-builder -- \ + --dir \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron.version} \ + -c.extraMetadata.version=v${version} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/kopia + cp -r ../dist/kopia-ui/*-unpacked/{locales,resources{,.pak}} $out/share/kopia + install -Dm644 $src/icons/kopia.svg $out/share/icons/hicolor/scalable/apps/kopia.svg + makeWrapper ${lib.getExe electron} $out/bin/kopia-ui \ + --prefix PATH : ${lib.makeBinPath [ kopia ]} \ + --add-flags $out/share/kopia/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --inherit-argv0 + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "kopia-ui"; + type = "Application"; + desktopName = "KopiaUI"; + comment = "Fast and secure open source backup."; + icon = "kopia-ui"; + exec = "kopia-ui"; + categories = [ "Utility" ]; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication"; + mainProgram = "kopia-ui"; + homepage = "https://kopia.io"; + downloadPage = "https://github.com/kopia/kopia"; + changelog = "https://github.com/kopia/kopia/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ blenderfreaky ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index af32830388e7..9f419bb5e0ff 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kor"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-VK5G8J851rsIEt2ljrTWFPCxhIBTgLkMlEMVb9kJcOs="; + hash = "sha256-jqP2GsqliltjabbHDcRseMz7TOWl9YofAG/4Y7ADub8="; }; - vendorHash = "sha256-iJtZ/t4VCVPqMKwV7jCKwqxitkZ/pTlP6mz9ElGcSsY="; + vendorHash = "sha256-HZS1PPlra1uGBuerGs5X9poRzn7EGhTopKaC9tkhjlo="; preCheck = '' HOME=$(mktemp -d) diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix index d1b830abf4aa..b25304679cbf 100644 --- a/pkgs/by-name/ko/kord/package.nix +++ b/pkgs/by-name/ko/kord/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - darwin, fetchFromGitHub, fetchpatch, rustPlatform, @@ -41,9 +40,7 @@ rustPlatform.buildRustPackage rec { lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; meta = with lib; { description = "Music theory binary and library for Rust"; diff --git a/pkgs/by-name/ko/kore/package.nix b/pkgs/by-name/ko/kore/package.nix index 34b5612d9b1f..4f95c0d3382c 100644 --- a/pkgs/by-name/ko/kore/package.nix +++ b/pkgs/by-name/ko/kore/package.nix @@ -2,15 +2,15 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, openssl, curl, - postgresql_16, + libpq, yajl, }: stdenv.mkDerivation rec { pname = "kore"; - # TODO: Check on next update whether postgresql 17 is supported. version = "4.2.3"; src = fetchFromGitHub { @@ -20,13 +20,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-p0M2P02xwww5EnT28VnEtj5b+/jkPW3YkJMuK79vp4k="; }; + patches = [ + (fetchpatch { + url = "https://github.com/jorisvink/kore/commit/978cb0ab79c9c939c35996f34f7d835f9c671831.patch"; + hash = "sha256-uHTWiliM4m2i9/6GQQfnAo31XBXd/2+fzysPeNo2dQ0="; + }) + (fetchpatch { + url = "https://github.com/jorisvink/kore/commit/6122affe22bf676eed0f544e421c53699aa7a2e2.patch"; + hash = "sha256-xaiUOjBJPEgEwwuseXe6VbOTkOCKdQ5tuwDdL7DojHM="; + }) + ]; + buildInputs = [ openssl curl - postgresql_16 + libpq yajl ]; + nativeBuildInputs = [ + libpq.pg_config + ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "ACME=1" diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix index bb1969b3ac19..993331c2784c 100644 --- a/pkgs/by-name/ko/koreader/package.nix +++ b/pkgs/by-name/ko/koreader/package.nix @@ -11,6 +11,7 @@ luajit, sdcv, SDL2, + openssl, nix-update-script, }: let @@ -18,21 +19,21 @@ let in stdenv.mkDerivation rec { pname = "koreader"; - version = "2024.11"; + version = "2025.04"; src = { aarch64-linux = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; - hash = "sha256-uy+4+pNyz10xrGM0QF9q0y6UpQK1B9PGNqrcK6nENQY="; + hash = "sha256-bpKNP+1C0oHZEv6HGL4dBziv3RfCow882yV8JFLtDJ4="; }; armv7l-linux = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb"; - hash = "sha256-lTc12qmoe0kGUhrStlGfDRw+cNJnX7F09/jKKc/1U9g="; + hash = "sha256-q3M33f0b5FAU/nmPfzsXu93mVZOhXMVgBbfwnieqkeM="; }; x86_64-linux = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - hash = "sha256-ibehFrOcJqhM+CMAcHDn3Xwy6CueB8kdnoYMMDe/2Js="; + hash = "sha256-ZZujk98YVvNJmffW2fDg+n+z1xgtkha7y1LasYEhCR4="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -40,9 +41,9 @@ stdenv.mkDerivation rec { src_repo = fetchFromGitHub { repo = "koreader"; owner = "koreader"; - rev = "v${version}"; + tag = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-EI8UOQuwhJqcAp8QnLYhI0K+uV/7ZqxdHNk8mPkDWA0="; + hash = "sha256-Kt00AZARfQjGY8FzDcQB8UaowWW2+KWyXJzexFNmZmM="; }; nativeBuildInputs = [ @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { luajit_lua52 sdcv SDL2 + openssl ]; dontConfigure = true; @@ -63,18 +65,31 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out + dpkg-deb -x $src . cp -R usr/* $out/ + + # Link required binaries ln -sf ${luajit_lua52}/bin/luajit $out/lib/koreader/luajit ln -sf ${sdcv}/bin/sdcv $out/lib/koreader/sdcv ln -sf ${gnutar}/bin/tar $out/lib/koreader/tar + + # Link SSL/network libraries + ln -sf ${openssl.out}/lib/libcrypto.so.3 $out/lib/koreader/libs/libcrypto.so.1.1 + ln -sf ${openssl.out}/lib/libssl.so.3 $out/lib/koreader/libs/libssl.so.1.1 + + # Copy fonts find ${src_repo}/resources/fonts -type d -execdir cp -r '{}' $out/lib/koreader/fonts \; + + # Remove broken symlinks find $out -xtype l -print -delete - wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${ + + wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : $out/lib/koreader/libs:${ lib.makeLibraryPath [ gtk3-x11 SDL2 glib stdenv.cc.cc + openssl.out ] } ''; diff --git a/pkgs/by-name/ko/koto-ls/package.nix b/pkgs/by-name/ko/koto-ls/package.nix index 4125658fe209..63d1c16bbe2c 100644 --- a/pkgs/by-name/ko/koto-ls/package.nix +++ b/pkgs/by-name/ko/koto-ls/package.nix @@ -7,24 +7,24 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "koto-ls"; - version = "0.15.0"; + version = "0.15.3"; src = fetchFromGitHub { owner = "koto-lang"; repo = "koto-ls"; tag = "v${finalAttrs.version}"; - hash = "sha256-6a8xckgpz2/Eb0mQ3ZUL7ywmHA69RMXar/55LUu1UWk="; + hash = "sha256-4s+zWiI6Yxv1TB0drds27txnL0kE6RoqjRI36Clls6Y="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sDgLvZcLW2lC0fCMOdSX2OvaqOG1GMfQiwAPit6L2/g="; + cargoHash = "sha256-ewBAixbksI9ora5hBZR12lzxCPzxM2Cp6GvQz6hGCSY="; passthru.updateScript = nix-update-script { }; meta = { description = "Language server for Koto"; homepage = "https://github.com/koto-lang/koto-ls"; - changelog = "https://github.com/koto-lang/koto-ls/releases/tag/${finalAttrs.src.tag}"; + changelog = "https://github.com/koto-lang/koto-ls/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ defelo ]; mainProgram = "koto-ls"; diff --git a/pkgs/by-name/ko/koto/package.nix b/pkgs/by-name/ko/koto/package.nix index c86b0b9d1cc5..3d82d8b3682b 100644 --- a/pkgs/by-name/ko/koto/package.nix +++ b/pkgs/by-name/ko/koto/package.nix @@ -9,22 +9,26 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "koto"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "koto-lang"; repo = "koto"; tag = "v${finalAttrs.version}"; - hash = "sha256-T8SjNeoTANAcT+uAdgzBRMK0LbC038cpKFoCFHgsp8k="; + hash = "sha256-sFADZj0mBe8TQ2x6NeXLqvvXK13WhVGD2anGWoWrSZw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-kIjDY27ot1dN3L8TKaBEQWDzo7+QIFvhdmi1YN9TofI="; + cargoHash = "sha256-Ok4rgqiQ7N5knXdb0Mfn3fYPPLXoRtOZVv8RvWR2h3k="; postPatch = '' - ${lib.getExe' yq "tomlq"} -ti 'del(.bench)' crates/koto/Cargo.toml + tomlq -ti 'del(.bench)' crates/koto/Cargo.toml ''; + nativeBuildInputs = [ + yq # for `tomlq` + ]; + cargoBuildFlags = [ "--package=koto_cli" ]; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -36,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Simple, expressive, embeddable programming language"; homepage = "https://github.com/koto-lang/koto"; - changelog = "https://github.com/koto-lang/koto/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/koto-lang/koto/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ defelo ]; mainProgram = "koto"; diff --git a/pkgs/by-name/kr/kraft/package.nix b/pkgs/by-name/kr/kraft/package.nix index 04718b428d44..d8f2466afa0e 100644 --- a/pkgs/by-name/kr/kraft/package.nix +++ b/pkgs/by-name/kr/kraft/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-rwowlwP56IAdogEL6/SBGDtvOW7FhO4+2vTWI755HXI="; + hash = "sha256-a6c7g2cxrawE7BRpcrsefCQ7xQ56wVOGjFexdkOKnv0="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildGoModule rec { btrfs-progs ]; - vendorHash = "sha256-LdLbAja4AoND5kA+A4rEl5r4tUVDTVxiYzV5GUJP+CA="; + vendorHash = "sha256-lwgxedKLcuV6RucbU26sDO+9j+8uWkignJDomFHaSXU="; ldflags = [ "-s" diff --git a/pkgs/by-name/kr/krakatau2/Cargo.lock b/pkgs/by-name/kr/krakatau2/Cargo.lock new file mode 100644 index 000000000000..57b146f68128 --- /dev/null +++ b/pkgs/by-name/kr/krakatau2/Cargo.lock @@ -0,0 +1,448 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_derive" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[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 = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "flate2" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "krakatau2" +version = "2.0.0-alpha" +dependencies = [ + "anyhow", + "clap", + "hexf-parse", + "lazy_static", + "regex", + "typed-arena", + "zip", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "miniz_oxide" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" +dependencies = [ + "adler2", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[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.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "zip" +version = "0.6.4" +source = "git+https://github.com/Storyyeller/zip.git#5947af7a779ea216915c398f85ee22599a07e58d" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", +] diff --git a/pkgs/by-name/kr/krakatau2/package.nix b/pkgs/by-name/kr/krakatau2/package.nix new file mode 100644 index 000000000000..342f0086e014 --- /dev/null +++ b/pkgs/by-name/kr/krakatau2/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +let + src = fetchFromGitHub { + owner = "Storyyeller"; + repo = "Krakatau"; + rev = "6da0abc20603fecaaa0e3300ebd97e04f07c2fb6"; + hash = "sha256-4ROx/XAWRzP8NWDYndDMBUXPw+nAu4nH4ukkyzS8eZ8="; + }; +in +rustPlatform.buildRustPackage { + inherit src; + pname = "krakatau2"; + version = "0-unstable-2025-02-01"; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "zip-0.6.4" = "sha256-x56JHdFdoLNhT/TC9sQQD4Ouu2LZ+D5CrS1mMyFVJBg="; + }; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + meta = { + inherit (src.meta) homepage; + description = "Java decompiler, assembler, and disassembler"; + license = lib.licenses.gpl3Only; + mainProgram = "krak2"; + maintainers = with lib.maintainers; [ + rhendric + ]; + }; +} diff --git a/pkgs/by-name/kr/kreative-square-fonts/package.nix b/pkgs/by-name/kr/kreative-square-fonts/package.nix deleted file mode 100644 index d27fbea98034..000000000000 --- a/pkgs/by-name/kr/kreative-square-fonts/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, -}: - -stdenvNoCC.mkDerivation { - pname = "kreative-square-fonts"; - version = "unstable-2021-01-29"; - - src = fetchFromGitHub { - owner = "kreativekorp"; - repo = "open-relay"; - rev = "084f05af3602307499981651eca56851bec01fca"; - hash = "sha256-+ihosENczaGal3BGDIaJ/de0pf8txdtelSYMxPok6ww="; - }; - - installPhase = '' - runHook preInstall - - install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquare.ttf - install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquareSM.ttf - - runHook postInstall - ''; - - meta = with lib; { - description = "Fullwidth scalable monospace font designed specifically to support pseudographics, semigraphics, and private use characters"; - homepage = "https://www.kreativekorp.com/software/fonts/ksquare.shtml"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.linus ]; - }; -} diff --git a/pkgs/by-name/kr/krep/package.nix b/pkgs/by-name/kr/krep/package.nix index b94232de2330..48cf8e273069 100644 --- a/pkgs/by-name/kr/krep/package.nix +++ b/pkgs/by-name/kr/krep/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "krep"; - version = "0.3.4"; + version = "1.1.2"; src = fetchFromGitHub { owner = "davidesantangelo"; repo = "krep"; rev = "v${finalAttrs.version}"; - hash = "sha256-kAsOAcEFjfxlJs6fJvB0viCMxGFCG1BUs9qPgGMvBpM="; + hash = "sha256-mZ5ki1f0q4k3imxeF9qbn8ZU/at+NNBhroau/5Z4WU4="; }; makeFlags = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; doInstallCheck = true; - nativeInstallCheck = [ versionCheckHook ]; + nativeInstallCheckInputs = [ versionCheckHook ]; meta = { description = "Blazingly fast string search utility designed for performance-critical applications"; diff --git a/pkgs/by-name/kr/krill/package.nix b/pkgs/by-name/kr/krill/package.nix new file mode 100644 index 000000000000..2cd92aa24622 --- /dev/null +++ b/pkgs/by-name/kr/krill/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + openssl, + pkg-config, + stdenv, +}: + +rustPlatform.buildRustPackage rec { + pname = "krill"; + version = "0.14.6"; + + src = fetchFromGitHub { + owner = "NLnetLabs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-U7uanUE/xdmXqtpvnG6b+oDKamNZkCH04OCy3Y5UIhQ="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-PR8HoHroHp5nBbRwR8TZ5NeBH4eDXGV46HkDLeydmAk="; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + # Needed to get openssl-sys to use pkgconfig. + OPENSSL_NO_VENDOR = 1; + + # disable failing tests on darwin + doCheck = !stdenv.hostPlatform.isDarwin; + + meta = with lib; { + description = "RPKI Certificate Authority and Publication Server written in Rust"; + longDescription = '' + Krill is a free, open source RPKI Certificate Authority that lets you run + delegated RPKI under one or multiple Regional Internet Registries (RIRs). + Through its built-in publication server, Krill can publish Route Origin + Authorisations (ROAs) on your own servers or with a third party. + ''; + homepage = "https://github.com/NLnetLabs/krill"; + changelog = "https://github.com/NLnetLabs/krill/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ steamwalker ]; + }; +} diff --git a/pkgs/by-name/kr/krillinai/package.nix b/pkgs/by-name/kr/krillinai/package.nix new file mode 100644 index 000000000000..181a896e0c39 --- /dev/null +++ b/pkgs/by-name/kr/krillinai/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + pkg-config, + xorg, + libGL, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "krillinai"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "krillinai"; + repo = "KrillinAI"; + tag = "v${finalAttrs.version}"; + hash = "sha256-jQlgkpQ+UTzn6MqGa+yVQ9v04IGGlMQQim3s0Oc9Zts="; + }; + + vendorHash = "sha256-mpvypCZmvVVljftGpcV1aea3s7Xmhr0jLfKZIZ0nkX8="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libXinerama + xorg.libXxf86vm + xorg.libXcursor + xorg.libXrandr + xorg.libX11 + xorg.libXi + libGL + ]; + + # open g:\bin\AI\tasks\gdQRrtQP\srt_no_ts_1.srt: no such file or directory + doCheck = false; + + postInstall = '' + mv $out/bin/desktop $out/bin/krillinai-desktop + mv $out/bin/server $out/bin/krillinai-server + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Video translation and dubbing tool"; + homepage = "https://github.com/krillinai/KrillinAI"; + changelog = "https://github.com/krillinai/KrillinAI/releases/tag/v${finalAttrs.version}"; + mainProgram = "krillinai-desktop"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ emaryn ]; + }; +}) diff --git a/pkgs/by-name/kr/krita-plugin-gmic/package.nix b/pkgs/by-name/kr/krita-plugin-gmic/package.nix index 25a90fcf9893..db5fdc92aec1 100644 --- a/pkgs/by-name/kr/krita-plugin-gmic/package.nix +++ b/pkgs/by-name/kr/krita-plugin-gmic/package.nix @@ -31,15 +31,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake extra-cmake-modules + libsForQt5.qttools ]; buildInputs = [ fftw krita.unwrapped libsForQt5.kcoreaddons - libsForQt5.qttools ]; + strictDeps = true; + cmakeFlags = [ (lib.cmakeFeature "GMIC_QT_HOST" "krita-plugin") # build krita's gmic instead of using the one from nixpkgs diff --git a/pkgs/by-name/kr/kronosnet/package.nix b/pkgs/by-name/kr/kronosnet/package.nix index dfaf1379c679..7bd2dd09ab6e 100644 --- a/pkgs/by-name/kr/kronosnet/package.nix +++ b/pkgs/by-name/kr/kronosnet/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.30"; + version = "1.31"; src = fetchFromGitHub { owner = "kronosnet"; repo = "kronosnet"; rev = "v${version}"; - sha256 = "sha256-Ydu7qS2Wuy5c5pCv1X8SdEIx8sTvfGusCJwltkb3YXQ="; + sha256 = "sha256-PZWaKrCy0S8d/x3GMh7X2wEiHwgiuEFpfCwKpbLvhsc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/kr/krop/package.nix b/pkgs/by-name/kr/krop/package.nix index 889cd4317e04..6fece014dffa 100644 --- a/pkgs/by-name/kr/krop/package.nix +++ b/pkgs/by-name/kr/krop/package.nix @@ -1,62 +1,38 @@ { lib, + python3Packages, fetchFromGitHub, - python3, libsForQt5, ghostscript, - qt5, - fetchPypi, }: -let - py = python3.override { - self = py; - packageOverrides = self: super: { - # Can be removed once this is merged - # https://github.com/arminstraub/krop/pull/40 - pypdf2 = super.pypdf2.overridePythonAttrs (oldAttrs: rec { - version = "2.12.1"; - src = fetchPypi { - pname = "PyPDF2"; - inherit version; - hash = "sha256-4D7xirzHXadBoKzBp3SSU0loh744zZiHvM4c7jk9pF4="; - }; - }); - }; - }; -in - -py.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "krop"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "arminstraub"; - repo = pname; - rev = "v${version}"; - sha256 = "1ygzc7vlwszqmsd3v1dsqp1dpsn6inx7g8gck63alvf88dbn8m3s"; + repo = "krop"; + tag = "v${version}"; + hash = "sha256-8mhTUP0oS+AnZXVmywxBTbR1OOg18U0RQ1H9lyjaiVI="; }; - propagatedBuildInputs = with py.pkgs; [ - pyqt5 - pypdf2 - poppler-qt5 - ghostscript - ]; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; buildInputs = [ libsForQt5.poppler libsForQt5.qtwayland ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + dependencies = with python3Packages; [ + pyqt5 + pypdf2 + poppler-qt5 + ghostscript + ]; makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; - postInstall = '' - install -m666 -Dt $out/share/applications krop.desktop - ''; - # Disable checks because of interference with older Qt versions // xcb doCheck = false; diff --git a/pkgs/by-name/kr/krr/package.nix b/pkgs/by-name/kr/krr/package.nix index 824d0c2796b9..e8a6eaa8d6c5 100644 --- a/pkgs/by-name/kr/krr/package.nix +++ b/pkgs/by-name/kr/krr/package.nix @@ -67,7 +67,7 @@ python3.pkgs.buildPythonPackage rec { homepage = "https://github.com/robusta-dev/krr"; changelog = "https://github.com/robusta-dev/krr/releases/tag/v${src.rev}"; license = licenses.mit; - maintainers = with lib.maintainers; [ azahi ]; + maintainers = [ ]; mainProgram = "krr"; }; } diff --git a/pkgs/by-name/kr/krun/package.nix b/pkgs/by-name/kr/krun/package.nix deleted file mode 100644 index fa17064e39e4..000000000000 --- a/pkgs/by-name/kr/krun/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - rustPlatform, - libkrun, - makeWrapper, - passt, - sommelier, - mesa, - withSommelier ? false, -}: - -rustPlatform.buildRustPackage { - pname = "krun"; - version = "0-unstable-2024-06-18"; - - src = fetchFromGitHub { - owner = "slp"; - repo = "krun"; - rev = "912afa5c6525b7c8f83dffd65ec4b1425b3f7521"; - hash = "sha256-rDuxv3UakAemDnj4Nsbpqsykts2IcseuQmDwO24L+u8="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/slp/krun/pull/39.diff"; - hash = "sha256-CV69L+VDDLRcWgpgDCAYKLlTU9ytFcHhzNgOibWD8KY="; - }) - (fetchpatch { - url = "https://github.com/slp/krun/pull/38.diff"; - hash = "sha256-cK3iDhh+33H16V65lWUXahjmpSxI1HhiLUmkjfkRB7A="; - }) - ]; - - useFetchCargoVendor = true; - cargoHash = "sha256-5zrwxyzt9ZEdUNUMnCaFUVpaO53RAabVdtib9LG6Q1s="; - - nativeBuildInputs = [ - rustPlatform.bindgenHook - makeWrapper - ]; - - buildInputs = [ - (libkrun.override { - withGpu = true; - withNet = true; - }) - ]; - - # Allow for sommelier to be disabled as it can cause problems. - wrapArgs = [ - "--prefix PATH : ${lib.makeBinPath (lib.optional withSommelier [ sommelier ] ++ [ passt ])}" - ]; - - postFixup = '' - wrapProgram $out/bin/krun $wrapArgs \ - --set-default OPENGL_DRIVER ${mesa.driverLink} - ''; - - meta = { - description = "Run programs from your system in a microVM"; - homepage = "https://github.com/slp/krun"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ RossComputerGuy ]; - platforms = libkrun.meta.platforms; - mainProgram = "krun"; - }; -} diff --git a/pkgs/by-name/kr/krusader/package.nix b/pkgs/by-name/kr/krusader/package.nix new file mode 100644 index 000000000000..a7fe7112ad47 --- /dev/null +++ b/pkgs/by-name/kr/krusader/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchurl, + extra-cmake-modules, + cmake, + kdePackages, +}: + +stdenv.mkDerivation rec { + pname = "krusader"; + version = "2.9.0"; + + src = fetchurl { + url = "mirror://kde/stable/krusader/${version}/krusader-${version}.tar.xz"; + hash = "sha256-ybeb+t5sxp/g40Hs75Mvysiv2f6U6MvPvXKf61Q5TgQ="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + kdePackages.kdoctools + kdePackages.wrapQtAppsHook + ]; + + propagatedBuildInputs = with kdePackages; [ + karchive + kconfig + kcrash + kguiaddons + kparts + kwindowsystem + qt5compat + kstatusnotifieritem + ]; + + meta = { + homepage = "http://www.krusader.org"; + description = "Norton/Total Commander clone for KDE"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ sander ]; + mainProgram = "krusader"; + }; +} diff --git a/pkgs/by-name/kr/kryptor/package.nix b/pkgs/by-name/kr/kryptor/package.nix index f1b548ca0fb4..bab6ed45f9ae 100644 --- a/pkgs/by-name/kr/kryptor/package.nix +++ b/pkgs/by-name/kr/kryptor/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildDotnetModule, fetchFromGitHub, dotnetCorePackages, @@ -42,5 +43,9 @@ buildDotnetModule rec { gepbird ]; platforms = lib.platforms.all; + # https://hydra.nixos.org/build/286325419 + # a libsodium.dylib file should be kept as per https://github.com/samuel-lucas6/Kryptor/releases/tag/v4.1.1 + # upstream issue: https://github.com/dotnet/sdk/issues/45903 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ks/kshutdown/package.nix b/pkgs/by-name/ks/kshutdown/package.nix index 7ce890468b6b..405134f87486 100644 --- a/pkgs/by-name/ks/kshutdown/package.nix +++ b/pkgs/by-name/ks/kshutdown/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kshutdown"; - version = "5.92-beta"; + version = "6.0"; src = fetchurl { url = "mirror://sourceforge/project/kshutdown/KShutdown/${finalAttrs.version}/kshutdown-source-${finalAttrs.version}.zip"; - hash = "sha256-EYgb2jeUoLNSPFIzlicnrmsccGc1nvoE5iDVt9x83ns="; + hash = "sha256-GXs0Cb1gtlPy8fxy3CJ10t97BENMWFsRJHij+104BLA="; name = "kshutdown-source-${finalAttrs.version}.zip"; }; diff --git a/pkgs/by-name/ks/kstars/package.nix b/pkgs/by-name/ks/kstars/package.nix index 69620c4ad5fc..57f39ef79967 100644 --- a/pkgs/by-name/ks/kstars/package.nix +++ b/pkgs/by-name/ks/kstars/package.nix @@ -2,12 +2,11 @@ lib, stdenv, fetchurl, - fetchFromGitLab, fetchpatch, cfitsio, cmake, curl, - eigen, + eigen_3_4_0, gsl, indi-full, kdePackages, @@ -22,44 +21,22 @@ zlib, }: -let - # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19' - # https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c - eigen' = eigen.overrideAttrs (old: rec { - version = "3.4.0"; - src = fetchFromGitLab { - owner = "libeigen"; - repo = "eigen"; - rev = version; - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; - }; - patches = (old.patches or [ ]) ++ [ - # Fixes e.g. onnxruntime on aarch64-darwin: - # https://hydra.nixos.org/build/248915128/nixlog/1, - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. - # - # The patch is from - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) - # which is two years old, - # but Eigen hasn't had a release in two years either: - # https://gitlab.com/libeigen/eigen/-/issues/2699. - (fetchpatch { - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; - }) - ]; - }); -in - stdenv.mkDerivation (finalAttrs: { pname = "kstars"; - version = "3.7.5"; + version = "3.7.6"; src = fetchurl { url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz"; - hash = "sha256-L9hyVfdgFlFfM6MyjR4bUa86FHPbVg7xBWPY8YSHUXw="; + hash = "sha256-6hwWMmAGKJmldL8eTLQzzBsumk5thFoqGvm2dWk0Jpo="; }; + patches = [ + (fetchpatch { + url = "https://invent.kde.org/education/kstars/-/commit/92eb37bdb3e24bd06e6da9977f3bf76218c95339.diff"; + hash = "sha256-f2m15op48FiPYsKJ7WudlejVwoiGYWGnX2QiCnBINU8="; + }) + ]; + nativeBuildInputs = with kdePackages; [ extra-cmake-modules kdoctools @@ -70,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { breeze-icons cfitsio curl - eigen' + eigen_3_4_0 gsl indi-full kconfig diff --git a/pkgs/by-name/kt/ktx-tools/package.nix b/pkgs/by-name/kt/ktx-tools/package.nix index 24e55148a8cb..7c4da8a5c2fe 100644 --- a/pkgs/by-name/kt/ktx-tools/package.nix +++ b/pkgs/by-name/kt/ktx-tools/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "ktx-tools"; - version = "4.3.2"; + version = "4.4.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "KTX-Software"; rev = "v${version}"; - hash = "sha256-zjiJ8B8FEZUJ3iFTYXRmuIEtcaCWtBIbYwz0DwjTDFo"; + hash = "sha256-bDdRdVFbVmN8fEGRLnPLOXsV6lfYU9Lg4nW0GuCj6AU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/kt/kty/package.nix b/pkgs/by-name/kt/kty/package.nix index cd197e43bec0..0c1516e33c71 100644 --- a/pkgs/by-name/kt/kty/package.nix +++ b/pkgs/by-name/kt/kty/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,16 +25,9 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; }; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk; - [ - frameworks.SystemConfiguration - ] - ); + buildInputs = [ + openssl + ]; useFetchCargoVendor = true; cargoHash = "sha256-nJ+nof2YhyLrNuLVy69kYj5tw+aG4IJm6nVxHkczbko="; diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix index 6941c8dafe24..16680335753b 100644 --- a/pkgs/by-name/ku/kube-bench/package.nix +++ b/pkgs/by-name/ku/kube-bench/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; tag = "v${version}"; - hash = "sha256-BlznHX8iUFv9knFlv80Ac6SADfGtnB2F5atG8yfKQ0E="; + hash = "sha256-+4OSqFU9IoVN9lsw6CwVL60OU4e/yCBZfnD8qqNLTtk="; }; - vendorHash = "sha256-dO4rJ7pNVtz8ZZlO1vEHQU3sIMEy/qM30rlDvsfuuso="; + vendorHash = "sha256-BB7DHACKELwvquOwmBSXl1kwKw43mNnpp5yY33wwdVo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ku/kube-review/package.nix b/pkgs/by-name/ku/kube-review/package.nix index d79fe86c261f..ac50c2f26999 100644 --- a/pkgs/by-name/ku/kube-review/package.nix +++ b/pkgs/by-name/ku/kube-review/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kube-review"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "anderseknert"; repo = "kube-review"; tag = "v${version}"; - hash = "sha256-0wDapaV1e6QNZWeHG86t12iu1yW1LW6mnpdWIrwvBFk="; + hash = "sha256-W+JF8MR+x6vova6hRw0omXXhT40qXmdZciAdt2bi6jM="; }; - vendorHash = "sha256-lzhjIX+67S+68erlJNHVXMKgRFUUyG+ymZEKVKRRpRc="; + vendorHash = "sha256-xHiHeSoiT/5h8pHTBTq1g/zJtnCbcUs+qMJ4vHjWzog="; ldflags = [ "-X github.com/anderseknert/kube-review/cmd.version=v${version}" ]; diff --git a/pkgs/by-name/ku/kube-score/package.nix b/pkgs/by-name/ku/kube-score/package.nix index 95000b724f82..806c79f208ab 100644 --- a/pkgs/by-name/ku/kube-score/package.nix +++ b/pkgs/by-name/ku/kube-score/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kube-score"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - hash = "sha256-YsbefR6WkFef5nhbD9ACQ7Xx572RsHlL2zY78RtTtsQ="; + hash = "sha256-ZqhuqPWCfJKi38Jdazr5t5Wulsqzl1D4/81ZTvW10Co="; }; - vendorHash = "sha256-9P7emxfRolhGEMiAJmBczksWkyHVFUtPZaNrjXkZ4t4="; + vendorHash = "sha256-uv+82x94fEa/3tjcofLGIPhJpwUzSkEbarGVq8wVEUc="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubecm/package.nix b/pkgs/by-name/ku/kubecm/package.nix index 476ed8e114f2..f83d116231e3 100644 --- a/pkgs/by-name/ku/kubecm/package.nix +++ b/pkgs/by-name/ku/kubecm/package.nix @@ -2,33 +2,47 @@ lib, buildGoModule, fetchFromGitHub, + installShellFiles, + stdenv, }: buildGoModule rec { pname = "kubecm"; - version = "0.32.3"; + version = "0.33.0"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-z0uQhAfyrK2LKs4hwnHGE7hKQwhLGCmp7yN58ehDn/w="; + hash = "sha256-osyxgwJIHsnTW8uDKPFO174ImUntKHmW61v6KPY1E9M="; }; - vendorHash = "sha256-2GFZ++7H0ii+9WJKPxtDBHikJTQQyDFqJ6qzwVvA84g="; + vendorHash = "sha256-rSha+Fd8vohRnLjECqRn3Zg4DYxGgXc4M7mUAgvW+Gw="; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd kubecm \ + --bash <($out/bin/kubecm completion bash) \ + --fish <($out/bin/kubecm completion fish) \ + --zsh <($out/bin/kubecm completion zsh) + ''; + doCheck = false; meta = with lib; { description = "Manage your kubeconfig more easily"; homepage = "https://github.com/sunny0826/kubecm/"; license = licenses.asl20; - maintainers = with maintainers; [ qjoly ]; + maintainers = with maintainers; [ + qjoly + sailord + ]; mainProgram = "kubecm"; }; } diff --git a/pkgs/by-name/ku/kubecolor/package.nix b/pkgs/by-name/ku/kubecolor/package.nix index 56f75358792d..a27ee83fb0aa 100644 --- a/pkgs/by-name/ku/kubecolor/package.nix +++ b/pkgs/by-name/ku/kubecolor/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "kubecolor"; repo = "kubecolor"; rev = "v${version}"; - sha256 = "sha256-Q3Bl1ejuSpiMpQgiqKa2x/g02hNx326GM2MIDoi7q7o="; + sha256 = "sha256-FyHTceFpB3Osj8SUw+IRk+JWnoREVZgl8YHczDyY+Ak="; }; - vendorHash = "sha256-SWJbJ/zr9ygZYUuH8QNvgmUXdxb/3OViai48CFmWmXw="; + vendorHash = "sha256-eF0NcymLmRsFetkI67ZVUfOcIYtht0iYFcPIy2CWr+M="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubeconform/package.nix b/pkgs/by-name/ku/kubeconform/package.nix index dfef2b5a74b3..ada2e9adbec2 100644 --- a/pkgs/by-name/ku/kubeconform/package.nix +++ b/pkgs/by-name/ku/kubeconform/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.6.7"; + version = "0.7.0"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yq9lJ3rSG8v/PeofkZrnO2nzEgtyB5vtNafKabp8hnQ="; + sha256 = "sha256-FTUPARckpecz1V/Io4rY6SXhlih3VJr/rTGAiik4ALA="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix b/pkgs/by-name/ku/kubectl-evict-pod/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix rename to pkgs/by-name/ku/kubectl-evict-pod/package.nix diff --git a/pkgs/by-name/ku/kubectl-explore/package.nix b/pkgs/by-name/ku/kubectl-explore/package.nix index 0d524a891b74..3607a5c4dd32 100644 --- a/pkgs/by-name/ku/kubectl-explore/package.nix +++ b/pkgs/by-name/ku/kubectl-explore/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubectl-explore"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "keisku"; repo = "kubectl-explore"; rev = "v${version}"; - hash = "sha256-RCLOqe4Ptac2YVDjWYG5H5geUMUsmh6klQfk92XvjI4="; + hash = "sha256-D5K1jGLoEHQEacxNhxdxDs9A9ir7qs7y1pNuBU2r//Y="; }; - vendorHash = "sha256-7KTs41zPf07FdUibsq57vJ2fkqOaVeBR6iSTJm5Fth0="; + vendorHash = "sha256-vCL+gVf0BCqsdRU2xk1Xs3FYcKYB1z2wLpZ3TvYmJdc="; doCheck = false; meta = with lib; { diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix index 408e688a0844..ae5a5c6703c0 100644 --- a/pkgs/by-name/ku/kubectl-gadget/package.nix +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.38.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-zAFDbSbNvFtQeJhyeG1tgFwwFgluiX1Y5BmSUsE4z3c="; + hash = "sha256-fizq0S2pvhrMwGR/l6yqzq3IXDuD01Abi3VRiNJqs48="; }; - vendorHash = "sha256-I65SpIigNQHvQEd84O/b9hHYs2ECYj5vMKi6ikKCAQY="; + vendorHash = "sha256-zBEb61gxjCRXjdANIHWKVNu5Do+iEmxttKvyiYp8FYQ="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ku/kubectl-kcl/package.nix b/pkgs/by-name/ku/kubectl-kcl/package.nix new file mode 100644 index 000000000000..e40f848e88dd --- /dev/null +++ b/pkgs/by-name/ku/kubectl-kcl/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "kubectl-kcl"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "kcl-lang"; + repo = "kubectl-kcl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yuNQSO1xQCb5H55mOUTVrojeWWkDOmAGJIzUs6qCWO4="; + }; + + vendorHash = "sha256-GD4C4jlxVMpJ/bhpQ3VDkBMBBQkXyhMMga+WhVdvI/I="; + + ldflags = [ + "-X kcl-lang.io/kubectl-kcl/cmd.Version=${finalAttrs.version}" + ]; + + versionCheckProgramArg = [ "version" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + meta = { + description = "Work with Kubernetes manifests using the KCL programming language"; + mainProgram = "kubectl-kcl"; + homepage = "https://github.com/kcl-lang/kubectl-kcl"; + changelog = "https://github.com/kcl-lang/kubectl-kcl/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.arichtman ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ku/kubectl-rook-ceph/package.nix b/pkgs/by-name/ku/kubectl-rook-ceph/package.nix new file mode 100644 index 000000000000..57c4de68d68b --- /dev/null +++ b/pkgs/by-name/ku/kubectl-rook-ceph/package.nix @@ -0,0 +1,52 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "kubectl-rook-ceph"; + version = "0.9.4"; + + src = fetchFromGitHub { + owner = "rook"; + repo = "kubectl-rook-ceph"; + tag = "v${finalAttrs.version}"; + hash = "sha256-t63m5cUIApAOBF1Nb8u2/Xkyi1OAGnaLSVWFyLec8AA="; + }; + + vendorHash = "sha256-8KrTfryEiTqF13NQ5xS1d9mIZI3ranA8+EkKUHu2mVE="; + + postInstall = '' + mv $out/bin/cmd $out/bin/kubectl-rook-ceph + ''; + # FIXME: uncomment once https://github.com/rook/kubectl-rook-ceph/issues/353 has been resolved + # nativeBuildInputs = [ installShellFiles ]; + # postInstall = + # '' + # ln -s $out/bin/cmd $out/bin/kubectl-rook-ceph + # '' + # + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + # let + # emulator = stdenv.hostPlatform.emulator buildPackages; + # in + # '' + # installShellCompletion --cmd kubectl-rook-ceph \ + # --bash <(${emulator} $out/bin/kubectl-rook-ceph completion bash) \ + # --fish <(${emulator} $out/bin/kubectl-rook-ceph completion fish) \ + # --zsh <(${emulator} $out/bin/kubectl-rook-ceph completion zsh) + # '' + # ); + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Krew plugin to run kubectl commands with rook-ceph"; + mainProgram = "kubectl-rook-ceph"; + homepage = "https://github.com/rook/kubectl-rook-ceph"; + changelog = "https://github.com/rook/kubectl-rook-ceph/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ vinylen ]; + }; +}) diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix index 8ecea0da1387..4fb0fb823e3b 100644 --- a/pkgs/by-name/ku/kubedb-cli/package.nix +++ b/pkgs/by-name/ku/kubedb-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; tag = "v${version}"; - hash = "sha256-qhvw1sEndJU5v1bUvMAjeNGO/9IKMbhjtIUmFdsAv2I="; + hash = "sha256-zYTP5eheH598wrg6yLOMBFd8G3VBkQZT7+nQeEOVh/U="; }; vendorHash = null; diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix index 30e5da39200f..d368963d7e1d 100644 --- a/pkgs/by-name/ku/kubelogin-oidc/package.nix +++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.32.2"; + version = "1.32.4"; src = fetchFromGitHub { owner = "int128"; repo = "kubelogin"; - rev = "v${version}"; - hash = "sha256-fX0Hjb0j6KbdGuFdy5MaZc3zL/EOVXFTTNlIUQZjnsc="; + tag = "v${version}"; + hash = "sha256-zdUtLjILildwSOA5CV1SNzVtMj+Tz1KkHB2MH1SZ8wk="; }; subPackages = [ "." ]; @@ -22,7 +22,7 @@ buildGoModule rec { "-X main.version=v${version}" ]; - vendorHash = "sha256-93B2TzptvXNevNLGGpWhUoLfefwb6uFk7tObnEf2wNg="; + vendorHash = "sha256-5NiGgZLSf/STr888JPsZZqaqXUI+g+26OEKRXp7xS4E="; # test all packages preCheck = '' diff --git a/pkgs/by-name/ku/kubelogin/package.nix b/pkgs/by-name/ku/kubelogin/package.nix index eb184bcb2cb1..231e15e7e1de 100644 --- a/pkgs/by-name/ku/kubelogin/package.nix +++ b/pkgs/by-name/ku/kubelogin/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-upToPltob3P8EwDUbl9F3COGCxnz6NZNrZ/wxv5pBQU="; + sha256 = "sha256-aajo43ysA/ItOxFxZbw1i7VQpEm4aqfXFiMUTZt3QDk="; }; - vendorHash = "sha256-d4zXjMr34DUXHNBe8jGhlQ/gdsaR2hGWxZEfUKXvKCQ="; + vendorHash = "sha256-fILOPZnSsEX9f1nWxC1jTN2wNGmlz15fFmeVvXMA25w="; ldflags = [ "-X main.gitTag=v${version}" diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix index 8b4f4e9c1b9e..82c9d1841aed 100644 --- a/pkgs/by-name/ku/kubeone/package.nix +++ b/pkgs/by-name/ku/kubeone/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.9.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-pMY86Ucp5nuH63YgAh60l3WZYDPvM8LcTaV9QS2BzAA="; + hash = "sha256-lBeIhsPiEHGSvEhMNjSr5bv/jp2xbbd3wIgaaRARiI8="; }; - vendorHash = "sha256-dvsq2idsLmo1Tc8kfg3pJKNIMosrAMXN1fxvayS7glQ="; + vendorHash = "sha256-Ltrs86I5CAjx21BZZrG+UD5/YdLbaFwJqRQLvGwOA9E="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubergrunt/package.nix b/pkgs/by-name/ku/kubergrunt/package.nix index e5900a7132c1..55b84075f330 100644 --- a/pkgs/by-name/ku/kubergrunt/package.nix +++ b/pkgs/by-name/ku/kubergrunt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-ros126t4QEhWnItScaY1ntcGI/YMpeC2f2yQrzSZ7w4="; + sha256 = "sha256-9ZF2O4/5n5uL+FA50Rfiq9gStQwNDWIhtz2GvJVu+u4="; }; vendorHash = "sha256-6dFIW2wwu6HHvoMo0+MhvKOtAJNVhg7JyVlBPqLQerw="; diff --git a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix index d520b73b513d..ab7595d98ece 100644 --- a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix +++ b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.17.3"; + version = "0.18.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "controller-tools"; tag = "v${version}"; - sha256 = "sha256-YBg6sf7G9xsSkLarA9wRlCg1Knu/c8Y9kpscRKNpVmk="; + sha256 = "sha256-zrh6GWFivs1fqkvaN6MSiYoCuPbiTQ6mJz4d69Wb7lo="; }; - vendorHash = "sha256-YRY/gILgJyLoMUG0v5HiAWN7lEzjCc7TJSZgRiN2tZs="; + vendorHash = "sha256-criu2UyNkGaVQnIxrjzIU4D389DbCcjG/kn3kfoD5yE="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubernetes-kcp/package.nix b/pkgs/by-name/ku/kubernetes-kcp/package.nix index 68dfe83ae108..59f1ed31c480 100644 --- a/pkgs/by-name/ku/kubernetes-kcp/package.nix +++ b/pkgs/by-name/ku/kubernetes-kcp/package.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "kubernetes-kcp"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "kcp-dev"; repo = "kcp"; tag = "v${version}"; - hash = "sha256-yAS53KYR6jHZxuvq8jRKH36IPdEqsQeG/Do+SIZnQpw="; + hash = "sha256-X4zSuul/dFvnv3ayrUewngZgt39bxCd2ZxTObR0QY5s="; }; - vendorHash = "sha256-CE3Wloi4evMEftKeRkPJq186kPFqMpI3yWWIEKn/bOQ="; + vendorHash = "sha256-rzHHudaYSzr15zkB8K0A4wR4AHhMyzQt2V0OVVDhKjA="; subPackages = [ "cmd/kcp" ]; diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix index 27027d2bbefd..fe4f9a2e23cc 100644 --- a/pkgs/by-name/ku/kubernetes-polaris/package.nix +++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "9.6.1"; + version = "9.6.3"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-/pj52K33IimsnrSoSRhHy+WgzzRwGZQiBsNf1+L1B3c="; + sha256 = "sha256-g7qttmh5iYCtDvt3YW5aECpbpNsG7fC9itODsD40q+w="; }; - vendorHash = "sha256-l6RCHi4QLPLoF6+Wgcc/lvtBnQDQo0Gncc8VVkcnFBY="; + vendorHash = "sha256-yDR2eY/idL4Realr84iLMA2P9SoALP3/4V+Dvd4j6Ow="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix index 6f3cd6d0fa44..d2448164098e 100644 --- a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix +++ b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, setuptools, importlib-resources, jsonschema, @@ -14,14 +14,13 @@ }: buildPythonPackage rec { pname = "kubernetes-validate"; - version = "1.31.0"; + version = "1.32.0"; pyproject = true; - src = fetchFromGitHub { - owner = "willthames"; - repo = "kubernetes-validate"; - tag = "v${version}"; - hash = "sha256-vxsftuipw0rHQIngxKlPHwBIW+rYAjfnEEaJDKmPyfQ="; + src = fetchPypi { + pname = "kubernetes_validate"; + inherit version; + hash = "sha256-GSg3/cLBkWUlAf4mjdo0JT36yuADRQWlGwo4hNFZNh0="; }; build-system = [ @@ -38,10 +37,9 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; pythonImportsCheck = [ "kubernetes_validate" ]; diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix index 9ad9825a8822..175f4a157e44 100644 --- a/pkgs/by-name/ku/kubescape/package.nix +++ b/pkgs/by-name/ku/kubescape/package.nix @@ -66,7 +66,7 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; meta = with lib; { description = "Tool for testing if Kubernetes is deployed securely"; diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix index 8a1ad1760eba..d0b56e31724e 100644 --- a/pkgs/by-name/ku/kubeshark/package.nix +++ b/pkgs/by-name/ku/kubeshark/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.6.0"; + version = "52.7.0"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-Mxj42D+MxYn0/csI/ZsMdU8xOz8P/IzsHr7vtmlQPa0="; + hash = "sha256-D3mHLYN6OVk7f1MCCWqSg/3qeg83EHcpqvkm1UTOaaM="; }; vendorHash = "sha256-kzyQW4bVE7oMOlHVG7LKG1AMTRYa5GLiiEhdarIhMSo="; diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix index 16d3029eccd8..a88c47c290a4 100644 --- a/pkgs/by-name/ku/kubetui/package.nix +++ b/pkgs/by-name/ku/kubetui/package.nix @@ -2,34 +2,25 @@ rustPlatform, lib, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "kubetui"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "sarub0b0"; repo = "kubetui"; tag = "v${version}"; - hash = "sha256-p7NPHOmeDzZ8OlVnpOOoTksWbWcnKlzsXu/mYmMU4l4="; + hash = "sha256-CtKckAmvXdH+CU+nV1hNGhemOCj5HRkAEQDSMD32CFE="; }; checkFlags = [ "--skip=workers::kube::store::tests::kubeconfigからstateを生成" ]; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) ( - with darwin.apple_sdk; - [ - frameworks.CoreGraphics - frameworks.AppKit - ] - ); useFetchCargoVendor = true; - cargoHash = "sha256-fMrlZMe2uD+ImM6zPXzo/+/Eto2MeIyscYfU8msLJFw="; + cargoHash = "sha256-+O22eo2vj4WLbSQoUfGOOfp2a43j2RrVXvB7CmYRA1o="; meta = { homepage = "https://github.com/sarub0b0/kubetui"; diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix index ba8da889fd96..85d03960c28a 100644 --- a/pkgs/by-name/ku/kubevirt/package.nix +++ b/pkgs/by-name/ku/kubevirt/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - hash = "sha256-Hjqk3A/GtpcT++GyiYBL24X99IrwXzQMXRqTKgOD6Ak="; + hash = "sha256-wREuRKfpyAL1SF1tnSNqCLqvWctVHHEpyrWLIY0nV3Y="; }; vendorHash = null; diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index 84ebe5b2e068..119d07ba0354 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.4.1"; + version = "2.7.11"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-IZna+DOavIkhGuNfVq31Hvuq5J0rylCAmNActjbA/io="; + hash = "sha256-PqKgBJugibgG/4gGBINuFxWAxSYEKRpPXpofiOKmmIs="; }; vendorHash = null; diff --git a/pkgs/by-name/ku/kubie/package.nix b/pkgs/by-name/ku/kubie/package.nix new file mode 100644 index 000000000000..cf25e473476a --- /dev/null +++ b/pkgs/by-name/ku/kubie/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, +}: + +rustPlatform.buildRustPackage rec { + pname = "kubie"; + version = "0.25.2"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "sbstp"; + repo = "kubie"; + sha256 = "sha256-+sSooE0KJqvWFdR63qazOMmSS8dV7MirYZ+sk7BnGQ4="; + }; + + buildNoDefaultFeatures = true; + useFetchCargoVendor = true; + cargoHash = "sha256-Yf8fAW65K7SLaRpvegjWBLVDV33sMGV+I1rqlWvx5Ss="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion completion/kubie.bash + ''; + + meta = with lib; { + description = "Shell independent context and namespace switcher for kubectl"; + mainProgram = "kubie"; + homepage = "https://github.com/sbstp/kubie"; + license = with licenses; [ zlib ]; + maintainers = with maintainers; [ illiusdope ]; + }; +} diff --git a/pkgs/by-name/ku/kuzu/package.nix b/pkgs/by-name/ku/kuzu/package.nix new file mode 100644 index 000000000000..451dc05914bd --- /dev/null +++ b/pkgs/by-name/ku/kuzu/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + cmake, + ninja, + python3, + fetchFromGitHub, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kuzu"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "kuzudb"; + repo = "kuzu"; + tag = "v${finalAttrs.version}"; + hash = "sha256-mc9MLIdlxMTQjvpKAa2N8AlhWJDzydd70x/YU6xX6h0="; + }; + + outputs = [ + "out" + "lib" + "dev" + ]; + + nativeBuildInputs = [ + cmake + ninja + python3 + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgramArg = [ "--version" ]; + + meta = { + changelog = "https://github.com/kuzudb/kuzu/releases/tag/v${finalAttrs.version}"; + description = "Embeddable property graph database management system"; + homepage = "https://kuzudb.com/"; + license = lib.licenses.mit; + mainProgram = "kuzu"; + maintainers = with lib.maintainers; [ sdht0 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/kw/kwok/package.nix b/pkgs/by-name/kw/kwok/package.nix index 8c119cbcb4be..b54e61db0084 100644 --- a/pkgs/by-name/kw/kwok/package.nix +++ b/pkgs/by-name/kw/kwok/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kwok"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kwok"; tag = "v${version}"; - hash = "sha256-RVyXGPT30Fz+K1VdMneYldXvzHyimuCX406DMKOtUq4="; + hash = "sha256-gtDGkAXbNCWUVGL4+C6mOkWwrPcik6+nGEQNrjLb57U="; }; - vendorHash = "sha256-xzFbcsL6pz91GFwjkriTMKlX2fgm2NMO9+H3lqH/C2c="; + vendorHash = "sha256-UNso+e/zYah0jApHZgWnQ3cUSV44HsMqPy4q4JMCyiA="; doCheck = false; # docker is need for test diff --git a/pkgs/by-name/ky/kytea/package.nix b/pkgs/by-name/ky/kytea/package.nix index 13e04622d959..a34a9c1f8638 100644 --- a/pkgs/by-name/ky/kytea/package.nix +++ b/pkgs/by-name/ky/kytea/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; - maintainers = with maintainers; [ ericsagnes ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix index d11556754e3b..52df9871b85d 100644 --- a/pkgs/by-name/ky/kyverno/package.nix +++ b/pkgs/by-name/ky/kyverno/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.13.4"; + version = "1.14.0"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - hash = "sha256-XkFxgBn4x/2H7j0nZufzmfGltY9ROOjEWqxmQrO7RNw="; + hash = "sha256-8y/2Vf1QPImUUsVMT5B/F8PYadtSoGYZtFtfgdUbt2M="; }; ldflags = [ @@ -26,7 +26,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorHash = "sha256-cmS3zNeknHhnbZnPrCXBs2N6oA3fM271K0ePL8nERm0="; + vendorHash = "sha256-d4Q2etUHSEbbFnuCvkkJZWxvsnomtUSbDzkMTsFy3yk="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/by-name/la/LAStools/package.nix b/pkgs/by-name/la/LAStools/package.nix index e91b8b224de7..4a26359d0972 100644 --- a/pkgs/by-name/la/LAStools/package.nix +++ b/pkgs/by-name/la/LAStools/package.nix @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { description = "Software for rapid LiDAR processing"; homepage = "http://lastools.org/"; license = licenses.unfree; - maintainers = with maintainers; teams.geospatial.members ++ [ stephenwithph ]; + maintainers = with maintainers; [ stephenwithph ]; + teams = [ teams.geospatial ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/la/labwc-menu-generator/package.nix b/pkgs/by-name/la/labwc-menu-generator/package.nix index a9599d1eeb24..0df66576026f 100644 --- a/pkgs/by-name/la/labwc-menu-generator/package.nix +++ b/pkgs/by-name/la/labwc-menu-generator/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-menu-generator"; - version = "0.1.0-unstable-2025-03-08"; + version = "0.2.0-unstable-2025-04-30"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-menu-generator"; - rev = "f1aa43d776b702f29b7d1e32440f233927a1dfa9"; - hash = "sha256-tjfFE2RJVOhJFw29+CZkLApVS4BTjGpT3cI2WStYAOo="; + rev = "2ca1be707aca1a06852e3a0ce70941e50bd7c02e"; + hash = "sha256-LoRhTeS7wnv/yqUibQ9+3y8q3JvYPCZZJ51rDOe9EtM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix index 0a51e378b091..da3760f9e31a 100644 --- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix +++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-tweaks-gtk"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-04-01"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks-gtk"; - rev = "24635c72d4da21df0b66fa23fb4a15686d257521"; - hash = "sha256-rDmY4+xUBv6Vw150X/3rP5bhW8Dmd8zEAyt86/c1+ss="; + rev = "b1779b293f1d0b07b328a6cbbfb5b1c4e3529d97"; + hash = "sha256-K2f1ztuhi3+btc41/1FYVvTBnPEVM5XQmlJxW7y9MlY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 2fb5cd5765f3..596e8245b179 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; tag = finalAttrs.version; - hash = "sha256-iOSPvg737YCtKFHHZy56N+JYqcyfUIguSZ3QQ0keb/E="; + hash = "sha256-JeEw1xKwgsTMllZXvNaXXdgmZnmIFUyG/cJ14QFQf/E="; }; outputs = [ diff --git a/pkgs/by-name/la/lacus/package.nix b/pkgs/by-name/la/lacus/package.nix index b62de38ac785..da00f13d0df5 100644 --- a/pkgs/by-name/la/lacus/package.nix +++ b/pkgs/by-name/la/lacus/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "lacus"; - version = "1.13.0"; + version = "1.14.0"; pyproject = true; src = fetchFromGitHub { owner = "ail-project"; repo = "lacus"; tag = "v${version}"; - hash = "sha256-5hADBSvbdazCMAbPya5H2iOl/sQjg6ixv7crJ2FlFpk="; + hash = "sha256-fk6NfBdUGGyOhVOJcGCRNldcw4JRHFr7p+tFuccYp7Y="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index cf9ad9f9d33b..528f69b2e0ec 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -32,23 +32,18 @@ }: let - adobe-icc-profiles = fetchurl { - url = "https://download.adobe.com/pub/adobe/iccprofiles/win/AdobeICCProfilesCS4Win_end-user.zip"; - hash = "sha256-kgQ7fDyloloPaXXQzcV9tgpn3Lnr37FbFiZzEb61j5Q="; - name = "adobe-icc-profiles.zip"; - }; # Note: The cacert version is synthetic and must match the version in the package's CMake cacert_version = "2023-12-12"; in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2025-03-27"; + version = "0-unstable-2025-05-18"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "5ea45da15f5ac956db1cfe0aad74b570f7e88339"; - hash = "sha256-wODm5O15jwnyxvkHVCQBptwoC97tTD0KzwYqGPdY520="; + rev = "4d039fc3d4bf2ca9bf85c482d0b989c2128567ba"; + hash = "sha256-J29UpFxyKEdHvIOMl3DhvtxIKtEgi6weZsk2UU0py8k="; }; postPatch = '' @@ -83,10 +78,6 @@ stdenv.mkDerivation (finalAttrs: { mkdir build/Caches/PublicSuffix cp ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat build/Caches/PublicSuffix - - mkdir build/Caches/AdobeICCProfiles - cp ${adobe-icc-profiles} build/Caches/AdobeICCProfiles/adobe-icc-profiles.zip - chmod +w build/Caches/AdobeICCProfiles ''; nativeBuildInputs = [ @@ -131,6 +122,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ + # Takes an enormous amount of resources, even with mold + (lib.cmakeBool "ENABLE_LTO_FOR_RELEASE" false) # Disable network operations "-DSERENITY_CACHE_DIR=Caches" "-DENABLE_NETWORK_DOWNLOADS=OFF" diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix new file mode 100644 index 000000000000..68fdce4c3cc7 --- /dev/null +++ b/pkgs/by-name/la/lagrange/package.nix @@ -0,0 +1,85 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + cmake, + pkg-config, + fribidi, + harfbuzz, + libogg, + libwebp, + libX11, + mpg123, + opusfile, + SDL2, + the-foundation, + zip, + enableTUI ? false, + ncurses, + sealcurses, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lagrange"; + version = "1.18.5"; + + src = fetchFromGitHub { + owner = "skyjake"; + repo = "lagrange"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NlnT8dGh05dDjSMxjaBnW7x/KjLgf2Ma0nbaiR7MpiY="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + zip + ]; + + buildInputs = + [ + the-foundation + fribidi + harfbuzz + libogg + libwebp + libX11 + mpg123 + opusfile + SDL2 + ] + ++ lib.optionals enableTUI [ + ncurses + sealcurses + ]; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_TUI" enableTUI) + (lib.cmakeFeature "CMAKE_INSTALL_DATAROOTDIR" "${placeholder "out"}/share") + ]; + + installPhase = + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv Lagrange.app $out/Applications + '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && enableTUI) '' + # https://github.com/skyjake/lagrange/issues/610 + make install + install -d $out/share/lagrange + ln -s $out/Applications/Lagrange.app/Contents/Resources/resources.lgr $out/share/lagrange/resources.lgr + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Beautiful Gemini Client"; + homepage = "https://gmi.skyjake.fi/lagrange/"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/la/lakectl/package.nix b/pkgs/by-name/la/lakectl/package.nix index a771efb9c22c..124f9dc795ca 100644 --- a/pkgs/by-name/la/lakectl/package.nix +++ b/pkgs/by-name/la/lakectl/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "lakectl"; - version = "1.53.1"; + version = "1.55.0"; src = fetchFromGitHub { owner = "treeverse"; repo = "lakeFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-kZ7GvrrZq9XAq//jC6sP4uudTJsGJw6/vYXAPs63Wq8="; + hash = "sha256-T/baBUkcRXQkNqgTwqsaHmv91ZfW00ti+86b0vGWNmo="; }; subPackages = [ "cmd/lakectl" ]; proxyVendor = true; - vendorHash = "sha256-X7rXEM+8fgbmG+K05KOJp8345muASgnrWGW0jbJ9WSM="; + vendorHash = "sha256-HdJeWHQmLOHZaq60xavt7MlkY1siF8JfX5tb+8FexJ4="; ldflags = [ "-s" diff --git a/pkgs/by-name/la/lalrpop/package.nix b/pkgs/by-name/la/lalrpop/package.nix index 35c040efdf89..210049c4da98 100644 --- a/pkgs/by-name/la/lalrpop/package.nix +++ b/pkgs/by-name/la/lalrpop/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "lalrpop"; - version = "0.20.2"; + version = "0.22.1"; src = fetchFromGitHub { owner = "lalrpop"; repo = "lalrpop"; rev = version; - hash = "sha256-cFwBck+bdOjhF6rQQj03MOO+XCsrII5c4Xvhsw12ETA="; + hash = "sha256-RvKJ3PKOKJbY0/WBpUwbau9LyCzb/peD73Ey9stECeg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-c0xota0APLm/xQSH2Orn0PgCKuhUVhXEtzNge/GeYo0="; + cargoHash = "sha256-KqG8AqYK1sslZyqCMKesxuyy9+IenXW56edoxygKj4k="; patches = [ (replaceVars ./use-correct-binary-path-in-tests.patch { diff --git a/pkgs/by-name/la/landrun/package.nix b/pkgs/by-name/la/landrun/package.nix new file mode 100644 index 000000000000..4784d4fa3fe7 --- /dev/null +++ b/pkgs/by-name/la/landrun/package.nix @@ -0,0 +1,110 @@ +{ + stdenv, + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + which, +}: + +buildGoModule (finalAttrs: { + pname = "landrun"; + version = "0.1.15"; + + src = fetchFromGitHub { + owner = "Zouuup"; + repo = "landrun"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yfK7Q3FKXp5pXVBNV0w/vN0xuoaTxWCq19ziBQnLapg="; + }; + + # Test script requires lots of patching for build sandbox. + # Networking tests are disabled, since they actually access the internet. + # Two tests that specifically target /usr/bin are disabled. + postPatch = '' + patchShebangs --build test.sh + substituteInPlace test.sh \ + --replace-fail 'Basic access tests' '# Basic access tests' \ + --replace-fail '--rox /usr --ro /lib --ro /lib64' '--rox ${builtins.storeDir}' \ + --replace-fail '--rox /usr --ro /lib,/lib64,' '--rox ${builtins.storeDir} --ro ' \ + --replace-fail '--rox /usr --ro /etc -- whoami' '--help' \ + --replace-fail '--rox /usr' '--rox ${builtins.storeDir}' \ + --replace-fail '--ro /usr/bin' "" \ + --replace-fail '#!/bin/bash' '#!${stdenv.shell}' \ + --replace-fail '/usr/bin/true' '$(which true)' \ + --replace-fail 'ls /usr | grep bin' '$(which ls) / | $(which grep) build' \ + --replace-fail 'ls /usr' '$(which ls) /build' \ + --replace-fail 'cat ' '$(which cat) ' \ + --replace-fail 'grep ' '$(which grep) ' \ + --replace-fail 'ls -la /usr/bin' 'ls -la /build' \ + --replace-fail 'run_test "TCP connection' 'false && run_test "TCP' \ + --replace-fail 'run_test "Unrestricted network access"' 'false && run_test ""' \ + --replace-fail 'run_test "Restricted network access"' 'false && run_test ""' \ + --replace-fail 'run_test "Execute from read-only paths regression test' 'false && run_test "' \ + --replace-fail 'run_test "Root path' 'false && run_test "Root path' + ''; + + vendorHash = "sha256-Bs5b5w0mQj1MyT2ctJ7V38Dy60moB36+T8TFH38FA08="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + which + ]; + postInstallCheck = '' + # only check functionality if the builder supports it (Linux 5.13+) + set +e + $out/bin/landrun --best-effort --rox ${builtins.storeDir} sh -c 'exit' + [[ $? != 0 ]] && set -e && return + set -e + + # only run upstream tests if the builder supports all features (Linux 6.7+) + set +e + $out/bin/landrun --rox ${builtins.storeDir} sh -c 'exit' + [[ $? == 0 ]] && set -e && export PATH=$out/bin:"$PATH" && ./test.sh --use-system + set -e + + pushd $(mktemp -d) + + # check directory read/write restrictions work + mkdir dir1 + echo content > dir1/file1 + + set +e + $out/bin/landrun --best-effort --rox ${builtins.storeDir} sh -c '< dir1/file1' + [[ $? == 0 ]] && die + set -e + + $out/bin/landrun --best-effort --rox ${builtins.storeDir} --ro ./dir1 --env PATH sh -c 'cat dir1/file1' \ + | grep content > /dev/null + + set +e + $out/bin/landrun --best-effort --rox ${builtins.storeDir} --ro ./dir1 sh -c 'echo x > dir1/file1' + [[ $? == 0 ]] && die + set -e + cat dir1/file1 | grep content > /dev/null + + $out/bin/landrun --best-effort --rox ${builtins.storeDir} --rw ./dir1 sh -c 'echo x > dir1/file1' + cat dir1/file1 | grep x > /dev/null + + popd + ''; + + meta = { + description = "Lightweight, secure sandbox for running Linux processes using Landlock LSM"; + mainProgram = "landrun"; + longDescription = '' + Landrun is designed to make it practical to sandbox any command with fine-grained filesystem + and network access controls, without root/containers/SELinux/AppArmor. + + It's lightweight, auditable, and wraps Landlock v5 features. + + Linux 5.13+ is required for file access restrictions, Linux 6.7+ for TCP restrictions. + ''; + homepage = "https://github.com/Zouuup/landrun"; + changelog = "https://github.com/Zouuup/landrun/releases/tag/{finalAttrs.src.tag}"; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.fliegendewurst ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/la/languagetool-rust/package.nix b/pkgs/by-name/la/languagetool-rust/package.nix new file mode 100644 index 000000000000..a740365f7a5a --- /dev/null +++ b/pkgs/by-name/la/languagetool-rust/package.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + installShellFiles, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "languagetool-rust"; + version = "2.1.5"; + + src = fetchFromGitHub { + owner = "jeertmans"; + repo = pname; + rev = "v${version}"; + hash = "sha256-8YgSxAF4DA1r7ylj6rx+fGubvT7MeiRQeowuiu0GWwQ="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-MIGoGEd/N2qlcawYRLMuac4SexHEMJnOS+FbPFJIsso="; + + buildFeatures = [ "full" ]; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + buildInputs = [ openssl ]; + + checkFlags = [ + # requires network access + "--skip=server::tests::test_server_check_data" + "--skip=server::tests::test_server_check_text" + "--skip=server::tests::test_server_languages" + "--skip=server::tests::test_server_ping" + "--skip=test_match_positions_1" + "--skip=test_match_positions_2" + "--skip=test_match_positions_3" + "--skip=test_match_positions_4" + "--skip=src/lib/lib.rs" + "--skip=test_basic_check_data" + "--skip=test_basic_check_file" + "--skip=test_basic_check_files" + "--skip=test_basic_check_piped" + "--skip=test_basic_check_text" + "--skip=test_check_with_dict" + "--skip=test_check_with_dicts" + "--skip=test_check_with_disabled_categories" + "--skip=test_check_with_disabled_category" + "--skip=test_check_with_disabled_rule" + "--skip=test_check_with_disabled_rules" + "--skip=test_check_with_enabled_categories" + "--skip=test_check_with_enabled_category" + "--skip=test_check_with_enabled_only_category" + "--skip=test_check_with_enabled_only_rule" + "--skip=test_check_with_enabled_only_without_enabled" + "--skip=test_check_with_enabled_rule" + "--skip=test_check_with_enabled_rules" + "--skip=test_check_with_language" + "--skip=test_check_with_picky_level" + "--skip=test_check_with_preferred_variant" + "--skip=test_check_with_preferred_variants" + "--skip=test_check_with_unexisting_language" + "--skip=test_check_with_username_and_key" + "--skip=test_languages" + "--skip=test_ping" + "--skip=test_words" + "--skip=test_words_add" + "--skip=test_words_delete" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd ltrs \ + --bash <($out/bin/ltrs completions bash) \ + --fish <($out/bin/ltrs completions fish) \ + --zsh <($out/bin/ltrs completions zsh) + ''; + + meta = with lib; { + description = "LanguageTool API in Rust"; + homepage = "https://github.com/jeertmans/languagetool-rust"; + license = licenses.mit; + maintainers = with maintainers; [ name-snrl ]; + mainProgram = "ltrs"; + }; +} diff --git a/pkgs/by-name/la/lapce/package.nix b/pkgs/by-name/la/lapce/package.nix new file mode 100644 index 000000000000..ed189a4a0142 --- /dev/null +++ b/pkgs/by-name/la/lapce/package.nix @@ -0,0 +1,110 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + rustPlatform, + cmake, + pkg-config, + perl, + python3, + fontconfig, + glib, + gtk3, + openssl, + libGL, + libxkbcommon, + wrapGAppsHook3, + wayland, + gobject-introspection, + xorg, +}: +let + rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ + libGL + libxkbcommon + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libXxf86vm + xorg.libxcb + wayland + ]; +in +rustPlatform.buildRustPackage rec { + pname = "lapce"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "lapce"; + repo = "lapce"; + tag = "v${version}"; + sha256 = "sha256-vBBYNHgZiW5JfGeUG6YZObf4oK0hHxTbsZNTfnIX95Y="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-cgSr1GHQUF4ccVd9w3TT0+EI+lqQpDzfXHdRWr75eDE="; + + env = { + # Get openssl-sys to use pkg-config + OPENSSL_NO_VENDOR = 1; + + # This variable is read by build script, so that Lapce editor knows its version + RELEASE_TAG_NAME = "v${version}"; + }; + + postPatch = '' + substituteInPlace lapce-app/Cargo.toml --replace ", \"updater\"" "" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + perl + python3 + wrapGAppsHook3 # FIX: No GSettings schemas are installed on the system + gobject-introspection + ]; + + buildInputs = + rpathLibs + ++ [ + glib + gtk3 + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + fontconfig + ]; + + postInstall = + if stdenv.hostPlatform.isLinux then + '' + install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg + install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop + + $STRIP -S $out/bin/lapce + + patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/lapce + '' + else + '' + mkdir $out/Applications + cp -r extra/macos/Lapce.app $out/Applications + ln -s $out/bin $out/Applications/Lapce.app/Contents/MacOS + ''; + + dontPatchELF = true; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Lightning-fast and Powerful Code Editor written in Rust"; + homepage = "https://github.com/lapce/lapce"; + changelog = "https://github.com/lapce/lapce/releases/tag/v${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ elliot ]; + mainProgram = "lapce"; + }; +} diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock index ed290491877c..aa9d0843fabc 100644 --- a/pkgs/by-name/la/laravel/composer.lock +++ b/pkgs/by-name/la/laravel/composer.lock @@ -168,16 +168,16 @@ }, { "name": "illuminate/collections", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "0094b162fa505126c1391222f27fd98734d24525" + "reference": "f1d8ae882c014673b1f7bedab6435989553776e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/0094b162fa505126c1391222f27fd98734d24525", - "reference": "0094b162fa505126c1391222f27fd98734d24525", + "url": "https://api.github.com/repos/illuminate/collections/zipball/f1d8ae882c014673b1f7bedab6435989553776e3", + "reference": "f1d8ae882c014673b1f7bedab6435989553776e3", "shasum": "" }, "require": { @@ -220,20 +220,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-16T23:50:18+00:00" + "time": "2025-04-03T17:58:47+00:00" }, { "name": "illuminate/conditionable", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", - "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d" + "reference": "251ef166c6ee46cc8a141403253f83fe7ee50507" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/conditionable/zipball/a2b3c66f3ca532e12e694bd5c9254adc303b922d", - "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/251ef166c6ee46cc8a141403253f83fe7ee50507", + "reference": "251ef166c6ee46cc8a141403253f83fe7ee50507", "shasum": "" }, "require": { @@ -266,20 +266,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-02-19T19:08:33+00:00" + "time": "2025-03-19T20:10:05+00:00" }, { "name": "illuminate/contracts", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6" + "reference": "bbaec083da240396f2186f4c3a9952da207f28a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/88962e0a73fb837e048ebdbbc67afd2f6b30e8e6", - "reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/bbaec083da240396f2186f4c3a9952da207f28a0", + "reference": "bbaec083da240396f2186f4c3a9952da207f28a0", "shasum": "" }, "require": { @@ -314,20 +314,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-16T23:56:53+00:00" + "time": "2025-03-19T20:10:05+00:00" }, { "name": "illuminate/filesystem", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857" + "reference": "4fa2995bad173c1a0067b285bb7fef47a4b441c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/e59cfec3c16d71be2da85cf9385ddd82f0c15857", - "reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/4fa2995bad173c1a0067b285bb7fef47a4b441c6", + "reference": "4fa2995bad173c1a0067b285bb7fef47a4b441c6", "shasum": "" }, "require": { @@ -381,11 +381,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-12T14:22:47+00:00" + "time": "2025-03-19T20:10:05+00:00" }, { "name": "illuminate/macroable", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -431,16 +431,16 @@ }, { "name": "illuminate/support", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57" + "reference": "1d5d07534bb2d9f16e655c2cb99607517ad43e8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/bcba98dcdbc758261b3b872a9b9dc789aed1eb57", - "reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57", + "url": "https://api.github.com/repos/illuminate/support/zipball/1d5d07534bb2d9f16e655c2cb99607517ad43e8f", + "reference": "1d5d07534bb2d9f16e655c2cb99607517ad43e8f", "shasum": "" }, "require": { @@ -504,7 +504,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-13T14:51:35+00:00" + "time": "2025-04-02T19:35:42+00:00" }, { "name": "laravel/prompts", @@ -567,16 +567,16 @@ }, { "name": "nesbot/carbon", - "version": "3.8.6", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon.git", - "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd" + "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ff2f20cf83bd4d503720632ce8a426dc747bf7fd", - "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/6d16a8a015166fe54e22c042e0805c5363aef50d", + "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d", "shasum": "" }, "require": { @@ -669,7 +669,7 @@ "type": "tidelift" } ], - "time": "2025-02-20T17:33:38+00:00" + "time": "2025-03-27T12:57:33+00:00" }, { "name": "psr/clock", @@ -899,16 +899,16 @@ }, { "name": "symfony/console", - "version": "v7.2.1", + "version": "v7.2.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3" + "reference": "e51498ea18570c062e7df29d05a7003585b19b88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3", - "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3", + "url": "https://api.github.com/repos/symfony/console/zipball/e51498ea18570c062e7df29d05a7003585b19b88", + "reference": "e51498ea18570c062e7df29d05a7003585b19b88", "shasum": "" }, "require": { @@ -972,7 +972,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.2.1" + "source": "https://github.com/symfony/console/tree/v7.2.5" }, "funding": [ { @@ -988,7 +988,7 @@ "type": "tidelift" } ], - "time": "2024-12-11T03:49:26+00:00" + "time": "2025-03-12T08:11:12+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1517,16 +1517,16 @@ }, { "name": "symfony/process", - "version": "v7.2.4", + "version": "v7.2.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf" + "reference": "87b7c93e57df9d8e39a093d32587702380ff045d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf", - "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf", + "url": "https://api.github.com/repos/symfony/process/zipball/87b7c93e57df9d8e39a093d32587702380ff045d", + "reference": "87b7c93e57df9d8e39a093d32587702380ff045d", "shasum": "" }, "require": { @@ -1558,7 +1558,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.2.4" + "source": "https://github.com/symfony/process/tree/v7.2.5" }, "funding": [ { @@ -1574,7 +1574,7 @@ "type": "tidelift" } ], - "time": "2025-02-05T08:33:46+00:00" + "time": "2025-03-13T12:21:46+00:00" }, { "name": "symfony/service-contracts", diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix index 1608936e9aa1..4e673700be57 100644 --- a/pkgs/by-name/la/laravel/package.nix +++ b/pkgs/by-name/la/laravel/package.nix @@ -7,19 +7,19 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "laravel"; - version = "5.14.1"; + version = "5.14.2"; src = fetchFromGitHub { owner = "laravel"; repo = "installer"; tag = "v${finalAttrs.version}"; - hash = "sha256-3DgiOybYN9G8BONK7kmyO21B5WqeY7DcHunWcT6h124="; + hash = "sha256-A/uyYi2CAlj8ozX65frCM32kNM2kZ/FpV1ZHr6UXWWY="; }; nativeBuildInputs = [ makeWrapper ]; composerLock = ./composer.lock; - vendorHash = "sha256-6oPbR6cpsdr2aJWjJvLWVD1NfuZF38sUMJEdBAjl/aA="; + vendorHash = "sha256-yj0AfN+jCDMtuAQ69yEyI+dGTHgeRNGj86YnvKVKkqQ="; # Adding npm (nodejs) and php composer to path postInstall = '' diff --git a/pkgs/by-name/la/lasso/fix-gcc14-implicit-function-declaration.diff b/pkgs/by-name/la/lasso/fix-gcc14-implicit-function-declaration.diff new file mode 100644 index 000000000000..00cca2d5f446 --- /dev/null +++ b/pkgs/by-name/la/lasso/fix-gcc14-implicit-function-declaration.diff @@ -0,0 +1,12 @@ +diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c +index 385858d174..bbc87d9f1e 100644 +--- a/lasso/xml/tools.c ++++ b/lasso/xml/tools.c +@@ -47,6 +47,7 @@ + #include + + #include ++#include + + #include + #include diff --git a/pkgs/by-name/la/lasso/fix-gcc14-incompatible-pointer.diff b/pkgs/by-name/la/lasso/fix-gcc14-incompatible-pointer.diff new file mode 100644 index 000000000000..5fb959513f46 --- /dev/null +++ b/pkgs/by-name/la/lasso/fix-gcc14-incompatible-pointer.diff @@ -0,0 +1,53 @@ +From 1bf9184e1208e805f70ccb8ba06b4c3d63a1a04a Mon Sep 17 00:00:00 2001 +From: Benjamin Dauvergne +Date: Wed, 24 Jan 2024 15:15:39 +0100 +Subject: [PATCH] misc: adjust to structured error callback argument change in + libxml2 2.12 (#86080) + +--- + lasso/lasso.c | 8 +++++++- + lasso/xml/tools.c | 9 ++++++++- + 2 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/lasso/lasso.c b/lasso/lasso.c +index 9902512f..7ea5df44 100644 +--- a/lasso/lasso.c ++++ b/lasso/lasso.c +@@ -138,7 +138,13 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) + #include "types.c" + + static void +-lasso_xml_structured_error_func(G_GNUC_UNUSED void *user_data, xmlErrorPtr error) ++lasso_xml_structured_error_func(G_GNUC_UNUSED void *user_data, ++#if LIBXML_VERSION >= 21200 ++ const xmlError *error ++#else ++ xmlErrorPtr error ++#endif ++ ) + { + g_log("libxml2", G_LOG_LEVEL_DEBUG, "libxml2: %s", error->message); + } +diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c +index 385858d1..014f4040 100644 +--- a/lasso/xml/tools.c ++++ b/lasso/xml/tools.c +@@ -1449,7 +1449,14 @@ lasso_concat_url_query(const char *url, const char *query) + } + } + +-static void structuredErrorFunc (void *userData, xmlErrorPtr error) { ++static void structuredErrorFunc (void *userData, ++#if LIBXML_VERSION >= 21200 ++ const xmlError *error ++#else ++ xmlErrorPtr error ++#endif ++ ) ++{ + *(int*)userData = error->code; + } + +-- +2.49.0 + diff --git a/pkgs/by-name/la/lasso/package.nix b/pkgs/by-name/la/lasso/package.nix index 88f77f42bdd5..a7a7afa7fa8e 100644 --- a/pkgs/by-name/la/lasso/package.nix +++ b/pkgs/by-name/la/lasso/package.nix @@ -32,6 +32,17 @@ stdenv.mkDerivation rec { url = "https://git.entrouvert.org/entrouvert/lasso/commit/ffaddeb015a61db3e52c391de00430107a23e2f1.patch"; hash = "sha256-D2npxpIuR/KrNYiKO3KXCvHEb/XVXUKIP0HQUd+w56k="; }) + # Fix GCC 14 implicit declaration of function + # backported patch of https://git.entrouvert.org/entrouvert/lasso/commit/9767cdf7645a146bcc596a705ce32b855855a590 + ./fix-gcc14-implicit-function-declaration.diff + # Fix GCC 14 incompatible pointer + # backported patch of https://git.entrouvert.org/entrouvert/lasso/commit/cbe2c45455d93ed793dc4be59e3d2d26f1bd1111 + ./fix-gcc14-incompatible-pointer.diff + # Fix GCC 14 int-conversion (xmlsec) + (fetchpatch { + url = "https://git.entrouvert.org/entrouvert/lasso/commit/66c9f50f1f6b00d621a9a0ca2f924875f94d14ae.patch"; + hash = "sha256-UkWxznKx2xAbjY29+NQ+cjIDhWLuyoWsmBTSiLUxWgU="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix index e4d904894c0c..db9263860d06 100644 --- a/pkgs/by-name/la/last/package.nix +++ b/pkgs/by-name/la/last/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1615"; + version = "1639"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-1opYdV4nszLSuHNCo0HuURuPYby8oVGXwQvDd68mDOM="; + hash = "sha256-s3sWLkTmjLNEzYH4P2DHo95OTV5stwAML2b/uTQf5a8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/latexminted/package.nix b/pkgs/by-name/la/latexminted/package.nix index 9cacf08f4089..56104ba7db47 100644 --- a/pkgs/by-name/la/latexminted/package.nix +++ b/pkgs/by-name/la/latexminted/package.nix @@ -8,12 +8,12 @@ python3Packages.buildPythonApplication rec { pname = "latexminted"; - version = "0.5.1"; + version = "0.6.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-II3n7DtgTyuE2PMygJrmRW8uBRpnnoz2NXDMw20o8oo="; + hash = "sha256-WpYo9Ci3rshuVdsbAv4Hjx8vT2FLRinhNsVrcGoPXyU="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/la/lauti/frontend.nix b/pkgs/by-name/la/lauti/frontend.nix new file mode 100644 index 000000000000..1e0cf2851692 --- /dev/null +++ b/pkgs/by-name/la/lauti/frontend.nix @@ -0,0 +1,51 @@ +{ + stdenv, + fetchYarnDeps, + src, + version, + nodejs, + lauti, + yarnConfigHook, + yarnBuildHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lauti"; + inherit version src; + + offlineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-uIDBE4ewdzrtJqOjFQTAei1TpAjQMRqls7CtG1h8KnA="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + # Needed for executing package.json scripts + nodejs + ]; + + preBuild = '' + cd backstage + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out" + cp -r . $out/ + + runHook postInstall + ''; + + meta = { + inherit (lauti.meta) + homepage + description + license + maintainers + ; + }; +}) diff --git a/pkgs/by-name/la/lauti/package.nix b/pkgs/by-name/la/lauti/package.nix new file mode 100644 index 000000000000..f53397b39b8a --- /dev/null +++ b/pkgs/by-name/la/lauti/package.nix @@ -0,0 +1,56 @@ +{ + lib, + buildGoModule, + fetchFromGitea, + callPackage, + nixosTests, +}: + +let + version = "1.0.0"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "Klasse-Methode"; + repo = "lauti"; + tag = "v${version}"; + hash = "sha256-cO9rK7GAVRlv5x4WI/xbXNJ594QqB+KIPUteB3TifKM="; + }; + frontend = callPackage ./frontend.nix { inherit src version; }; +in + +buildGoModule rec { + pname = "lauti"; + inherit version src; + + vendorHash = "sha256-ushTvIpvRLZP3q6tLN6BA4tl2Xp/UImWugm2ZgTAm8k="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.revision=${src.rev}" + ]; + + preConfigure = '' + cp -R ${frontend}/. backstage/ + ''; + + preCheck = '' + # Disable test, requires running Docker daemon + rm cmd/lauti/main_test.go + rm service/email/email_test.go + ''; + + passthru.tests = { + inherit (nixosTests) lauti; + }; + + meta = { + description = "An open source calendar for events, groups and places"; + homepage = "https://lauti.org"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ onny ]; + platforms = lib.platforms.unix; + mainProgram = "lauti"; + }; +} diff --git a/pkgs/by-name/la/lavacli/package.nix b/pkgs/by-name/la/lavacli/package.nix index 7bf975bc7173..abfc4cfc2175 100644 --- a/pkgs/by-name/la/lavacli/package.nix +++ b/pkgs/by-name/la/lavacli/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://lava.gitlab.io/lavacli/"; changelog = "https://gitlab.com/lava/lavacli/-/commits/v${version}?ref_type=tags"; license = lib.licenses.agpl3Only; - maintainers = lib.teams.cyberus.members; + teams = [ lib.teams.cyberus ]; mainProgram = "lavacli"; }; } diff --git a/pkgs/by-name/la/lavalink/package.nix b/pkgs/by-name/la/lavalink/package.nix new file mode 100644 index 000000000000..1ca9d11765e2 --- /dev/null +++ b/pkgs/by-name/la/lavalink/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + makeWrapper, + jdk21, + jdk ? jdk21, + fetchurl, + nixosTests, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lavalink"; + version = "4.0.8"; + + src = fetchurl { + url = "https://github.com/lavalink-devs/Lavalink/releases/download/${finalAttrs.version}/Lavalink.jar"; + hash = "sha256-G4a9ltPq/L0vcazTQjStTlOOtwrBi37bYUNQHy5CV9Y="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + makeWrapper ${lib.getExe jdk} $out/bin/lavalink \ + --add-flags "-jar $src" + + runHook postInstall + ''; + + passthru.tests = { inherit (nixosTests) lavalink; }; + + meta = { + description = "Standalone audio sending node based on Lavaplayer and Koe"; + longDescription = '' + A standalone audio sending node based on Lavaplayer and Koe. Allows for sending audio without it ever reaching any of your shards. + + Being used in production by FredBoat, Dyno, LewdBot, and more. + ''; + homepage = "https://lavalink.dev/"; + changelog = "https://github.com/lavalink-devs/Lavalink/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nanoyaki ]; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + mainProgram = "lavalink"; + inherit (jdk.meta) platforms; + }; +}) diff --git a/pkgs/by-name/la/lavat/package.nix b/pkgs/by-name/la/lavat/package.nix index 12beae650e52..8cd735a692c5 100644 --- a/pkgs/by-name/la/lavat/package.nix +++ b/pkgs/by-name/la/lavat/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.1.0"; + version = "2.2.0"; in stdenv.mkDerivation { pname = "lavat"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "AngelJumbo"; repo = "lavat"; rev = "v${version}"; - hash = "sha256-wGtuYgZS03gXYgdNdugGu/UlROQTrQ3C1inJ/aTUBKk="; + hash = "sha256-SNRhel2RmaAPqoYpcq7F9e/FcbCJ0E3VJN/G9Ya4TeY="; }; installPhase = '' diff --git a/pkgs/by-name/la/layan-cursors/package.nix b/pkgs/by-name/la/layan-cursors/package.nix new file mode 100644 index 000000000000..c74853a85914 --- /dev/null +++ b/pkgs/by-name/la/layan-cursors/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "layan-cursors"; + version = "2021-08-01"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = "Layan-cursors"; + tag = finalAttrs.version; + hash = "sha256-Izc5Q3IuM0ryTIdL+GjhRT7JKbznyxS2Fc4pY5dksq4="; + }; + + installPhase = '' + runHook preInstall + + install -dm 0755 $out/share/icons + cp -R dist $out/share/icons/layan-cursors + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cursor theme inspired by layan gtk theme and based on capitaine-cursors"; + changelog = "https://github.com/vinceliuice/Layan-cursors/releases/tag/${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://github.com/vinceliuice/Layan-cursors/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ idlip ]; + }; + +}) diff --git a/pkgs/by-name/la/laze/package.nix b/pkgs/by-name/la/laze/package.nix new file mode 100644 index 000000000000..7c49d7a0a941 --- /dev/null +++ b/pkgs/by-name/la/laze/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + nix-update-script, + makeWrapper, + installShellFiles, + writableTmpDirAsHomeHook, + ninja, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "laze"; + version = "0.1.35"; + + src = fetchFromGitHub { + owner = "kaspar030"; + repo = "laze"; + tag = finalAttrs.version; + hash = "sha256-/ACHYaAR9xtC7r5+bn1mXGr1eM3kV0L68+YMRIgxAsI="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-xiJz+JEF5feytwYgml+mfrarmLPntKbxCAQQvBnwAkI="; + + passthru.updateScript = nix-update-script { }; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + writableTmpDirAsHomeHook + ]; + + postInstall = + '' + wrapProgram "$out/bin/laze" \ + --suffix PATH : ${lib.makeBinPath [ ninja ]} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd laze \ + --bash <($out/bin/laze completion --generate bash) \ + --fish <($out/bin/laze completion --generate fish) \ + --zsh <($out/bin/laze completion --generate zsh) + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + meta = { + description = "Fast, declarative meta build system for C/C++/Rust projects, based on Ninja"; + mainProgram = "laze"; + homepage = "https://github.com/kaspar030/laze"; + changelog = "https://github.com/kaspar030/laze/blob/${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ dannixon ]; + }; +}) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 21dfd97f817b..8c55d3ed90ea 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -4,16 +4,17 @@ fetchFromGitHub, lazygit, testers, + nix-update-script, }: buildGoModule rec { pname = "lazygit"; - version = "0.48.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; tag = "v${version}"; - hash = "sha256-L3OcCkoSJZ6skzcjP2E3BrQ39cXyxcuHGthj8RHIGeQ="; + hash = "sha256-LxPKV6Zt4R+gsZAp7FXqWnAXjEoaFTn44qJBOpbh0P8="; }; vendorHash = null; @@ -24,7 +25,16 @@ buildGoModule rec { "-X main.buildSource=nix" ]; - passthru.tests.version = testers.testVersion { package = lazygit; }; + passthru = { + tests.version = testers.testVersion { package = lazygit; }; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v([0-9.]+)$" + ]; + }; + }; meta = { description = "Simple terminal UI for git commands"; diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix index 2b36b92e32f1..2586ade74e3f 100644 --- a/pkgs/by-name/la/lazyjournal/package.nix +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "0.7.3"; + version = "0.7.8"; in buildGoModule { pname = "lazyjournal"; @@ -15,16 +15,20 @@ buildGoModule { owner = "Lifailon"; repo = "lazyjournal"; tag = version; - hash = "sha256-uu36MmBT2K7ToeWcOxR/7ZvEVw+a3nj/zeA1ZbLTbYE="; + hash = "sha256-d+wiq6q5lxE17nCKZvl75xBsLMKz1AjxhLFH6GYX7Y0="; }; - vendorHash = "sha256-1tQ0ZFww9VCnoRzmOQw9RaiRJmTRErAio13uAAKtgTw="; + vendorHash = "sha256-faMGgTJuD/6CqR+OfGknE0dGdDOSwoODySNcb3kBLv8="; ldflags = [ "-s" "-w" ]; + # All checks expect a FHS environment with e.g. log files present, + # which is evidently not possible in a build environment + doCheck = false; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/la/lazymc/package.nix b/pkgs/by-name/la/lazymc/package.nix index d598a4ca7c07..85ef9ddf9806 100644 --- a/pkgs/by-name/la/lazymc/package.nix +++ b/pkgs/by-name/la/lazymc/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nix-update-script, }: @@ -21,10 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-jqqqWZKO1HgwxLBGMz9rlFQ5xmZTycfUZjqHf+uVTBQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 9ca3eb727e77..82dabbcd3fff 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -26,9 +26,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; passthru.tests.version = testers.testVersion { package = lazysql; diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix index 11c41978693a..f8eab9b3edd5 100644 --- a/pkgs/by-name/lc/lcalc/package.nix +++ b/pkgs/by-name/lc/lcalc/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Program for calculating with L-functions"; mainProgram = "lcalc"; license = with licenses; [ gpl2 ]; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix index bf6d52bf6b75..48c3edb438b2 100644 --- a/pkgs/by-name/lc/lcevcdec/package.nix +++ b/pkgs/by-name/lc/lcevcdec/package.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3Clear; pkgConfigModules = [ "lcevc_dec" ]; maintainers = with lib.maintainers; [ jopejoe1 ]; - platforms = lib.platforms.all; + # https://github.com/v-novaltd/LCEVCdec/blob/bf7e0d91c969502e90a925942510a1ca8088afec/cmake/modules/VNovaProject.cmake#L29 + platforms = lib.platforms.aarch ++ lib.platforms.x86; }; }) diff --git a/pkgs/by-name/lc/lcov/package.nix b/pkgs/by-name/lc/lcov/package.nix index ac05b283bc02..bde039d51a66 100644 --- a/pkgs/by-name/lc/lcov/package.nix +++ b/pkgs/by-name/lc/lcov/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "lcov"; - version = "2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "linux-test-project"; repo = "lcov"; rev = "v${version}"; - hash = "sha256-Qz5Q1JRJeB0aCaYmCR8jeG7TQPkvJHtJTkBhXGM05ak="; + hash = "sha256-31318or9AQ7iyu9DNQEvf5jaDzrneOOqOXu0HF1eag4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index 172eaf4eff8f..c3cdaabec73c 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://opensource.apple.com/releases/"; license = lib.licenses.apple-psl20; mainProgram = "ld"; - maintainers = lib.teams.darwin.members; + teams = [ lib.teams.darwin ]; platforms = lib.platforms.darwin; # Porting to other platforms is incomplete. Support only Darwin for now. }; }) diff --git a/pkgs/by-name/ld/ldc/bootstrap.nix b/pkgs/by-name/ld/ldc/bootstrap.nix index fcb1f5191de9..3c6f528a5386 100644 --- a/pkgs/by-name/ld/ldc/bootstrap.nix +++ b/pkgs/by-name/ld/ldc/bootstrap.nix @@ -14,13 +14,17 @@ let OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; ARCH = if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name; - version = "1.30.0"; + # Work around macOS Sequoia 15.4 segfault by downgrading the bootstrap compiler - see: + # - https://github.com/NixOS/nixpkgs/issues/398443 + # - https://github.com/dlang/dmd/issues/21126#issuecomment-2775948553 + # TODO: Remove this when bootstrap can be upgraded to a fixed version (>= 1.41.0-beta2)? + version = if hostPlatform.isDarwin then "1.28.1" else "1.30.0"; hashes = { # Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. - osx-x86_64 = "sha256-AAWZvxuZC82xvrW6fpYm783TY+H8k3DvqE94ZF1yjmk="; + osx-x86_64 = "sha256-mqQ+hNlDePOGX2mwgEEzHGiOAx3SxfNA6x8+ML3qYmw="; linux-x86_64 = "sha256-V4TUzEfQhFrwiX07dHOgjdAoGkzausCkhnQIQNAU/eE="; linux-aarch64 = "sha256-kTeglub75iv/jWWNPCn15aCGAbmck0RQl6L7bFOUu7Y="; - osx-arm64 = "sha256-Nb/owBdIeroB9jLMDvwjo8bvsTC9vFyJPLMTOMsSAd4="; + osx-arm64 = "sha256-m93rGywncBnPEWslcrXuGBnZ+Z/mNgLIaevkL/uBOu0="; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix index 95b6ffa898a0..ca6837771718 100644 --- a/pkgs/by-name/ld/ldc/package.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, callPackage, makeWrapper, removeReferencesTo, @@ -16,7 +17,6 @@ lit, gdb, unzip, - darwin, ldcBootstrap ? callPackage ./bootstrap.nix { }, }: @@ -45,6 +45,17 @@ stdenv.mkDerivation (finalAttrs: { # https://issues.dlang.org/show_bug.cgi?id=19553 hardeningDisable = [ "fortify" ]; + # Fix output programs segfaulting on macOS Sequoia 15.4 - see: + # https://github.com/NixOS/nixpkgs/issues/398443 + # https://github.com/ldc-developers/ldc/issues/4899 + # TODO: Remove this when upgrading to a fixed version (>= 1.41.0-beta2) + patches = [ + (fetchpatch { + url = "https://github.com/ldc-developers/ldc/commit/60079c3b596053b1a70f9f2e0cf38a287089df56.patch"; + hash = "sha256-Y/5+zt5ou9rzU7rLJq2OqUxMDvC7aSFS6AsPeDxNATQ="; + }) + ]; + postPatch = '' patchShebangs runtime tools tests @@ -77,9 +88,6 @@ stdenv.mkDerivation (finalAttrs: { ninja unzip ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb diff --git a/pkgs/by-name/ld/ldeep/package.nix b/pkgs/by-name/ld/ldeep/package.nix index 26fd82f30d60..a03c44f8335f 100644 --- a/pkgs/by-name/ld/ldeep/package.nix +++ b/pkgs/by-name/ld/ldeep/package.nix @@ -6,17 +6,18 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.84"; + version = "1.0.86"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; tag = version; - hash = "sha256-sJa5EuCjPaexGrfv6U+V2YS+1NerdD1yaS2somOuQIE="; + hash = "sha256-LTtoLy2Bf9qhCjTUx73cGSfDkI8onZ3zqkecBfduz8Y="; }; pythonRelaxDeps = [ + "termcolor" "cryptography" "ldap3-bleeding-edge" ]; diff --git a/pkgs/games/ldmud/libxml2-2.12.0-compat.patch b/pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch similarity index 100% rename from pkgs/games/ldmud/libxml2-2.12.0-compat.patch rename to pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch diff --git a/pkgs/games/ldmud/mysql-compat.patch b/pkgs/by-name/ld/ldmud/mysql-compat.patch similarity index 100% rename from pkgs/games/ldmud/mysql-compat.patch rename to pkgs/by-name/ld/ldmud/mysql-compat.patch diff --git a/pkgs/by-name/ld/ldmud/package.nix b/pkgs/by-name/ld/ldmud/package.nix new file mode 100644 index 000000000000..e024c7822a89 --- /dev/null +++ b/pkgs/by-name/ld/ldmud/package.nix @@ -0,0 +1,123 @@ +{ + lib, + fetchFromGitHub, + stdenv, + autoreconfHook, + pkg-config, + bison, + libiconv, + pcre, + libgcrypt, + libxcrypt-legacy, + json_c, + libxml2, + ipv6Support ? false, + mccpSupport ? false, + zlib, + mysqlSupport ? false, + libmysqlclient, + postgresSupport ? false, + libpq, + sqliteSupport ? false, + sqlite, + tlsSupport ? false, + openssl, + pythonSupport ? false, + python310, +}: + +stdenv.mkDerivation rec { + pname = "ldmud"; + version = "3.6.7"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA="; + }; + + patches = [ + ./libxml2-2.12.0-compat.patch + ./mysql-compat.patch + ]; + + sourceRoot = "${src.name}/src"; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + bison + ]; + buildInputs = + [ + libgcrypt + libxcrypt-legacy + pcre + json_c + libxml2 + ] + ++ lib.optional mccpSupport zlib + ++ lib.optional mysqlSupport libmysqlclient + ++ lib.optional postgresSupport libpq + ++ lib.optional sqliteSupport sqlite + ++ lib.optional tlsSupport openssl + ++ lib.optional pythonSupport python310 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + + # To support systems without autoconf LD puts its configure.ac in a non-default + # location and uses a helper script. We skip that script and symlink the .ac + # file to where the autoreconfHook find it. + preAutoreconf = '' + ln -fs ./autoconf/configure.ac ./ + ''; + + configureFlags = [ + "--enable-erq=xerq" + "--enable-filename-spaces" + "--enable-use-json" + "--enable-use-xml=xml2" + (lib.enableFeature ipv6Support "use-ipv6") + (lib.enableFeature mccpSupport "use-mccp") + (lib.enableFeature mysqlSupport "use-mysql") + (lib.enableFeature postgresSupport "use-pgsql") + (lib.enableFeature sqliteSupport "use-sqlite") + (lib.enableFeatureAs tlsSupport "use-tls" "ssl") + (lib.enableFeature pythonSupport "use-python") + ]; + + preConfigure = lib.optionalString mysqlSupport '' + export CPPFLAGS="-I${lib.getDev libmysqlclient}/include/mysql" + export LDFLAGS="-L${libmysqlclient}/lib/mysql" + ''; + + installTargets = [ + "install-driver" + "install-utils" + "install-headers" + ]; + + postInstall = '' + mkdir -p "$out/share/" + cp -v ../COPYRIGHT $out/share/ + ''; + + meta = with lib; { + description = "Gamedriver for LPMuds including a LPC compiler, interpreter and runtime"; + homepage = "https://ldmud.eu"; + changelog = "https://github.com/ldmud/ldmud/blob/${version}/HISTORY"; + longDescription = '' + LDMud started as a project to clean up and modernize Amylaar's LPMud + gamedriver. Primary goals are full documentation, a commented source body + and out-of-the-box support for the major mudlibs, of which the commented + source body has been pretty much completed. During the course of work + a lot of bug fixes and improvements found their way into the driver - much + more than originally expected, and definitely enough to make LDMud + a driver in its own right. + ''; + # See https://github.com/ldmud/ldmud/blob/master/COPYRIGHT + license = licenses.unfreeRedistributable; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ cpu ]; + }; +} diff --git a/pkgs/by-name/le/leaf/package.nix b/pkgs/by-name/le/leaf/package.nix index 31cac3531b68..12181d2036ac 100644 --- a/pkgs/by-name/le/leaf/package.nix +++ b/pkgs/by-name/le/leaf/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,11 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-RQ9fQfYfpsFAA5CzR3ICLIEYb00qzUsWAQKSrK/488g="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - meta = with lib; { description = "Simple system fetch written in rust"; homepage = "https://github.com/IogaMaster/leaf"; diff --git a/pkgs/by-name/le/lean4/mimalloc.patch b/pkgs/by-name/le/lean4/mimalloc.patch new file mode 100644 index 000000000000..cb75a7fdf6e7 --- /dev/null +++ b/pkgs/by-name/le/lean4/mimalloc.patch @@ -0,0 +1,16 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,12 +77,8 @@ + if (USE_MIMALLOC) + ExternalProject_add(mimalloc + PREFIX mimalloc +- GIT_REPOSITORY https://github.com/microsoft/mimalloc +- GIT_TAG v2.2.3 +- # just download, we compile it as part of each stage as it is small +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" ++ SOURCE_DIR "MIMALLOC-SRC" + INSTALL_COMMAND "") + list(APPEND EXTRA_DEPENDS mimalloc) + endif() + diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index a49ae08068ea..0bb21efe3835 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -8,29 +8,51 @@ cadical, pkg-config, libuv, + enableMimalloc ? true, perl, testers, }: stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.18.0"; + version = "4.19.0"; + + # Using a vendored version rather than nixpkgs' version to match the exact version required by + # Lean. Apparently, even a slight version change can impact greatly the final performance. + mimalloc-src = fetchFromGitHub { + owner = "microsoft"; + repo = "mimalloc"; + tag = "v2.2.3"; + hash = "sha256-B0gngv16WFLBtrtG5NqA2m5e95bYVcQraeITcOX9A74="; + }; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; tag = "v${finalAttrs.version}"; - hash = "sha256-1hVcRO9RbVUgoKTUTFXBqJZwt50/aw/P9dxUdI7RpCc="; + hash = "sha256-Iw5JSamrty9l6aJ2WwslAolSHfi2q0UO8P8HI1gp+j8="; }; - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace-fail 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${finalAttrs.src.tag}")' + postPatch = + let + pattern = "\${LEAN_BINARY_DIR}/../mimalloc/src/mimalloc"; + in + '' + substituteInPlace src/CMakeLists.txt \ + --replace-fail 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${finalAttrs.src.tag}")' - # Remove tests that fails in sandbox. - # It expects `sourceRoot` to be a git repository. - rm -rf src/lake/examples/git/ - ''; + # Remove tests that fails in sandbox. + # It expects `sourceRoot` to be a git repository. + rm -rf src/lake/examples/git/ + '' + + (lib.optionalString enableMimalloc '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'MIMALLOC-SRC' '${finalAttrs.mimalloc-src}' + for file in src/CMakeLists.txt src/runtime/CMakeLists.txt; do + substituteInPlace "$file" \ + --replace-fail '${pattern}' '${finalAttrs.mimalloc-src}' + done + ''); preConfigure = '' patchShebangs stage0/src/bin/ src/bin/ @@ -52,9 +74,12 @@ stdenv.mkDerivation (finalAttrs: { perl ]; + patches = [ ./mimalloc.patch ]; + cmakeFlags = [ "-DUSE_GITHASH=OFF" "-DINSTALL_LICENSE=OFF" + "-DUSE_MIMALLOC=${if enableMimalloc then "ON" else "OFF"}" ]; passthru.tests = { diff --git a/pkgs/by-name/le/ledfx/package.nix b/pkgs/by-name/le/ledfx/package.nix index e9281a67f171..5863c004a677 100644 --- a/pkgs/by-name/le/ledfx/package.nix +++ b/pkgs/by-name/le/ledfx/package.nix @@ -4,14 +4,14 @@ python3, }: -python3.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "ledfx"; - version = "2.0.105"; + version = "2.0.108"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-S/ZlEFgcFiLr0V7g0X0bjWU0YNVzA0JctFaJTK/QkpI="; + hash = "sha256-wfp6u2YIliufjkaLBlLVFw2/dqpHYFAfcow4iyOB2ME="; }; pythonRelaxDeps = true; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonPackage rec { build-system = with python3.pkgs; [ cython - poetry-core + pdm-backend ]; dependencies = with python3.pkgs; [ @@ -69,7 +69,7 @@ python3.pkgs.buildPythonPackage rec { homepage = "https://github.com/LedFx/LedFx"; changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst"; license = licenses.gpl3Only; - maintainers = teams.c3d2.members; + teams = [ teams.c3d2 ]; mainProgram = "ledfx"; }; } diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index bb2c7fdc146d..b6b3ddeea892 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "2.106.0"; + version = "2.113.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-gGNZLhZj7tEiListVPgMRuuUabdQU/tzgrYVTPwjF30="; + hash = "sha256-mF6YwgbqZF5ccJCABoagtEq5WpnhDNFcvij1wL+buF0="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/le/ledger-web/Gemfile b/pkgs/by-name/le/ledger-web/Gemfile new file mode 100644 index 000000000000..451f1a3168be --- /dev/null +++ b/pkgs/by-name/le/ledger-web/Gemfile @@ -0,0 +1,5 @@ +source 'https://rubygems.org' + +gem 'ledger_web' + +gem "csv", "~> 3.3" diff --git a/pkgs/by-name/le/ledger-web/Gemfile.lock b/pkgs/by-name/le/ledger-web/Gemfile.lock new file mode 100644 index 000000000000..abb76c81552c --- /dev/null +++ b/pkgs/by-name/le/ledger-web/Gemfile.lock @@ -0,0 +1,110 @@ +GEM + remote: https://rubygems.org/ + specs: + activemodel (8.0.2) + activesupport (= 8.0.2) + activerecord (8.0.2) + activemodel (= 8.0.2) + activesupport (= 8.0.2) + timeout (>= 0.4.0) + activesupport (8.0.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) + concurrent-ruby (1.3.5) + connection_pool (2.5.3) + csv (3.3.4) + database_cleaner (2.1.0) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.2.0) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) + diff-lcs (1.6.1) + directory_watcher (1.5.1) + drb (2.2.1) + i18n (1.14.7) + concurrent-ruby (~> 1.0) + ledger_web (1.5.2) + database_cleaner + directory_watcher (~> 1.5.1) + pg + rack (>= 1.3.6) + rspec + sequel + sinatra + sinatra-contrib + sinatra-session + logger (1.7.0) + minitest (5.25.5) + multi_json (1.15.0) + mustermann (3.0.3) + ruby2_keywords (~> 0.0.1) + pg (1.5.9) + rack (3.1.14) + rack-protection (4.1.1) + base64 (>= 0.1.0) + logger (>= 1.6.0) + rack (>= 3.0.0, < 4) + rack-session (2.1.1) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.3) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.3) + ruby2_keywords (0.0.5) + securerandom (0.4.1) + sequel (5.92.0) + bigdecimal + sinatra (4.1.1) + logger (>= 1.6.0) + mustermann (~> 3.0) + rack (>= 3.0.0, < 4) + rack-protection (= 4.1.1) + rack-session (>= 2.0.0, < 3) + tilt (~> 2.0) + sinatra-contrib (4.1.1) + multi_json (>= 0.0.2) + mustermann (~> 3.0) + rack-protection (= 4.1.1) + sinatra (= 4.1.1) + tilt (~> 2.0) + sinatra-session (1.0.0) + sinatra (>= 1.0) + tilt (2.6.0) + timeout (0.4.3) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + uri (1.0.3) + +PLATFORMS + ruby + +DEPENDENCIES + csv (~> 3.3) + ledger_web + +BUNDLED WITH + 2.6.6 diff --git a/pkgs/by-name/le/ledger-web/gemset.nix b/pkgs/by-name/le/ledger-web/gemset.nix new file mode 100644 index 000000000000..67e7c8d3383d --- /dev/null +++ b/pkgs/by-name/le/ledger-web/gemset.nix @@ -0,0 +1,481 @@ +{ + activemodel = { + dependencies = [ "activesupport" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v35y2jzqlfy1wnrzlzj2cxylhnz09vykaa1l2dnkq7sl5zzpq8a"; + type = "gem"; + }; + version = "8.0.2"; + }; + activerecord = { + dependencies = [ + "activemodel" + "activesupport" + "timeout" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02nrya34qviawdkssyahb3mg08kqdc461b320a6ikr245jwp0d3r"; + type = "gem"; + }; + version = "8.0.2"; + }; + activesupport = { + dependencies = [ + "base64" + "benchmark" + "bigdecimal" + "concurrent-ruby" + "connection_pool" + "drb" + "i18n" + "logger" + "minitest" + "securerandom" + "tzinfo" + "uri" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5"; + type = "gem"; + }; + version = "8.0.2"; + }; + base64 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; + }; + bigdecimal = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; + type = "gem"; + }; + version = "3.1.9"; + }; + concurrent-ruby = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; + type = "gem"; + }; + version = "1.3.5"; + }; + connection_pool = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; + type = "gem"; + }; + version = "2.5.3"; + }; + csv = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kfqg0m6vqs6c67296f10cr07im5mffj90k2b5dsm51liidcsvp9"; + type = "gem"; + }; + version = "3.3.4"; + }; + database_cleaner = { + dependencies = [ "database_cleaner-active_record" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kc9bp3415p1m94d54y2pjjlsx546q0w3fn65xlxlxhm7dpa5jqx"; + type = "gem"; + }; + version = "2.1.0"; + }; + database_cleaner-active_record = { + dependencies = [ + "activerecord" + "database_cleaner-core" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1iz1hv2b1z7509dxvxdwzay1hhs24glxls5ldbyh688zxkcdca1j"; + type = "gem"; + }; + version = "2.2.0"; + }; + database_cleaner-core = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v44bn386ipjjh4m2kl53dal8g4d41xajn2jggnmjbhn6965fil6"; + type = "gem"; + }; + version = "2.0.1"; + }; + diff-lcs = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1m3cv0ynmxq93axp6kiby9wihpsdj42y6s3j8bsf5a1p7qzsi98j"; + type = "gem"; + }; + version = "1.6.1"; + }; + directory_watcher = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fwc2shba7vks262ind74y3g76qp7znjq5q8b2dvza0yidgywhcq"; + type = "gem"; + }; + version = "1.5.1"; + }; + drb = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; + }; + i18n = { + dependencies = [ "concurrent-ruby" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; + type = "gem"; + }; + version = "1.14.7"; + }; + ledger_web = { + dependencies = [ + "database_cleaner" + "directory_watcher" + "pg" + "rack" + "rspec" + "sequel" + "sinatra" + "sinatra-contrib" + "sinatra-session" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0i4vagaiyayymlr41rsy4lg2cl1r011ib0ql9dgjadfy6imb4kqh"; + type = "gem"; + }; + version = "1.5.2"; + }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; + minitest = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; + type = "gem"; + }; + version = "5.25.5"; + }; + multi_json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + mustermann = { + dependencies = [ "ruby2_keywords" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "123ycmq6pkivv29bqbv79jv2cs04xakzd0fz1lalgvfs5nxfky6i"; + type = "gem"; + }; + version = "3.0.3"; + }; + pg = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn"; + type = "gem"; + }; + version = "1.5.9"; + }; + rack = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0i2bjh42cmlkwxjrldqj8g5sfrasdp64xhfr25kvp4ziilm3qqc4"; + type = "gem"; + }; + version = "3.1.14"; + }; + rack-protection = { + dependencies = [ + "base64" + "logger" + "rack" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0sniswjyi0yn949l776h7f67rvx5w9f04wh69z5g19vlsnjm98ji"; + type = "gem"; + }; + version = "4.1.1"; + }; + rack-session = { + dependencies = [ + "base64" + "rack" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1sg4laz2qmllxh1c5sqlj9n1r7scdn08p3m4b0zmhjvyx9yw0v8b"; + type = "gem"; + }; + version = "2.1.1"; + }; + rspec = { + dependencies = [ + "rspec-core" + "rspec-expectations" + "rspec-mocks" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; + type = "gem"; + }; + version = "3.13.0"; + }; + rspec-core = { + dependencies = [ "rspec-support" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1r6zbis0hhbik1ck8kh58qb37d1qwij1x1d2fy4jxkzryh3na4r5"; + type = "gem"; + }; + version = "3.13.3"; + }; + rspec-expectations = { + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1n7cb6szws90hxbzqrfybs4rj1xb0vhn24xa4l5r1vnzcnblahsf"; + type = "gem"; + }; + version = "3.13.4"; + }; + rspec-mocks = { + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14xr5bq7s80hm97fcp3pvk4v515qfw3lrlsf20idalwwf6h5icbb"; + type = "gem"; + }; + version = "3.13.4"; + }; + rspec-support = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hrzdcklbl8pv721cq906yfl38fmqmlnh33ff8l752z1ys9y6q9a"; + type = "gem"; + }; + version = "3.13.3"; + }; + ruby2_keywords = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + securerandom = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; + type = "gem"; + }; + version = "0.4.1"; + }; + sequel = { + dependencies = [ "bigdecimal" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ga49hliy5alb1x42mvpkmasqv71rhm4081zv5gpwr5q8lcsc1nb"; + type = "gem"; + }; + version = "5.92.0"; + }; + sinatra = { + dependencies = [ + "logger" + "mustermann" + "rack" + "rack-protection" + "rack-session" + "tilt" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "002dkzdc1xqhvz5sdnj4vb0apczhs07mnpgq4kkd5dd1ka2pp6af"; + type = "gem"; + }; + version = "4.1.1"; + }; + sinatra-contrib = { + dependencies = [ + "multi_json" + "mustermann" + "rack-protection" + "sinatra" + "tilt" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1giziwf8mgki581jf40zzw3dhjkkmdg3yxbrahj9krd5h24vb90y"; + type = "gem"; + }; + version = "4.1.1"; + }; + sinatra-session = { + dependencies = [ "sinatra" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "183xl8i4d2hc03afd1i52gwn2xi3vzrv02g22llhfy5wkmm44gmq"; + type = "gem"; + }; + version = "1.0.0"; + }; + tilt = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; + type = "gem"; + }; + version = "2.6.0"; + }; + timeout = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm"; + type = "gem"; + }; + version = "0.4.3"; + }; + tzinfo = { + dependencies = [ "concurrent-ruby" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; + type = "gem"; + }; + version = "2.0.6"; + }; + uri = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; + type = "gem"; + }; + version = "1.0.3"; + }; +} diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/by-name/le/ledger-web/package.nix similarity index 100% rename from pkgs/applications/office/ledger-web/default.nix rename to pkgs/by-name/le/ledger-web/package.nix diff --git a/pkgs/by-name/le/leetcode-cli/package.nix b/pkgs/by-name/le/leetcode-cli/package.nix index 25f05d80fb52..df6619838059 100644 --- a/pkgs/by-name/le/leetcode-cli/package.nix +++ b/pkgs/by-name/le/leetcode-cli/package.nix @@ -8,7 +8,6 @@ dbus, sqlite, stdenv, - darwin, testers, leetcode-cli, }: @@ -30,16 +29,11 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - openssl - dbus - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + dbus + sqlite + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd leetcode \ diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 1ace6e33264f..0b07054ce7cb 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -7,7 +7,7 @@ let pname = "lefthook"; - version = "1.11.2"; + version = "1.11.12"; in buildGoModule { inherit pname version; @@ -16,10 +16,10 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-kh1U3w39C+6UewKRyKQc4EBgQmBNP7Ou8V54CeG5hlQ="; + hash = "sha256-jb2pNdsuk45lC/wHjXIkHe2/CefxvE8VQzx8aW8CPhg="; }; - vendorHash = "sha256-uvPpkSqfe1NvO78kIMo5cYdr87YTGozudeESmI0q+1E="; + vendorHash = "sha256-DMB7OQkkY3FUPVirRKfGsvH2fl4+g9kJ2FS930WaKvY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix index 99e1862dd5f9..f6802c334951 100644 --- a/pkgs/by-name/le/legba/package.nix +++ b/pkgs/by-name/le/legba/package.nix @@ -6,8 +6,6 @@ pkg-config, openssl, samba, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,14 +26,10 @@ rustPlatform.buildRustPackage rec { cmake pkg-config ]; - buildInputs = - [ - openssl.dev - samba - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl.dev + samba + ]; # Paho C test fails due to permission issue doCheck = false; diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index 2bfd59135d5b..2b493f03ba00 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "legcord"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "Legcord"; repo = "Legcord"; tag = "v${finalAttrs.version}"; - hash = "sha256-0RbLvRCvy58HlOhHLcAoErRFgYxjWrKFQ6DPJD50c5Q="; + hash = "sha256-e8RhTx16y0hxXoOSztIs5pvI7Vzc9vKUsp1RRbt4Q78="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-zAf3EGIt/BWSZ9BMHWWVPWo3m+whnl/p+SahmpdLoZ4="; + hash = "sha256-gLjpnpLKJCOOFidSR9r64cBVkMg38/slMsJ7KolScWI="; }; buildPhase = '' diff --git a/pkgs/by-name/le/lego/package.nix b/pkgs/by-name/le/lego/package.nix index b3c7da6fcbd3..1b659a2ab8d4 100644 --- a/pkgs/by-name/le/lego/package.nix +++ b/pkgs/by-name/le/lego/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lego"; - version = "4.22.2"; + version = "4.23.1"; src = fetchFromGitHub { owner = "go-acme"; repo = "lego"; tag = "v${version}"; - hash = "sha256-tvvTaRPOmNX0D8QvgA+8u5XsMxnT9PK4PMBcL6RHSIE="; + hash = "sha256-lFsxUPFFZpsGqcya70El04AefFPBubqA/abhY7Egz8Q="; }; - vendorHash = "sha256-T6ZeQKrdz16zwppkFei21JjwGsoPLHazHTZew822xdU="; + vendorHash = "sha256-L9fjkSrWoP4vs+BlWyEgK+SF3tWQFiEJjd0fJqcruVM="; doCheck = false; @@ -32,7 +32,7 @@ buildGoModule rec { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; homepage = "https://go-acme.github.io/lego/"; - maintainers = teams.acme.members; + teams = [ teams.acme ]; mainProgram = "lego"; }; diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix index 3ad399a88725..d8725383d944 100644 --- a/pkgs/by-name/le/lemminx/package.nix +++ b/pkgs/by-name/le/lemminx/package.nix @@ -25,13 +25,13 @@ let in maven.buildMavenPackage rec { pname = "lemminx"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "eclipse"; repo = "lemminx"; rev = version; - hash = "sha256-xGC3ZGQ1dA0485/IPHsmX2NO1QOPp/nHMLBZvcC4Om8="; + hash = "sha256-a+9RN1265fsmYAUMuUTxA+VqJv7xPlzuc8HqoZwmR4M="; # Lemminx reads this git information at runtime from a git.properties # file on the classpath leaveDotGit = true; diff --git a/pkgs/by-name/le/lenmus/package.nix b/pkgs/by-name/le/lenmus/package.nix index 4a7fbb5409db..5b01f4f6aef6 100644 --- a/pkgs/by-name/le/lenmus/package.nix +++ b/pkgs/by-name/le/lenmus/package.nix @@ -16,14 +16,10 @@ wxsqlite3, fluidsynth, fontconfig, - darwin, soundfont-fluid, openlilylib-fonts, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation (finalAttrs: { pname = "lenmus"; version = "6.0.1"; @@ -54,23 +50,19 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ]; - buildInputs = - [ - boost - portmidi - sqlite - freetype - libpng - pngpp - zlib - wxGTK32 - wxsqlite3 - fluidsynth - fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + buildInputs = [ + boost + portmidi + sqlite + freetype + libpng + pngpp + zlib + wxGTK32 + wxsqlite3 + fluidsynth + fontconfig + ]; preConfigure = '' mkdir res/fonts diff --git a/pkgs/by-name/le/lethe/package.nix b/pkgs/by-name/le/lethe/package.nix new file mode 100644 index 000000000000..182258015850 --- /dev/null +++ b/pkgs/by-name/le/lethe/package.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "lethe"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "kostassoid"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-y2D/80pnpYpTl+q9COTQkvtj9lzBlOWuMcnn5WFnX8E="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Ky39RpLoYks4xDiheSsrUj3l/ZrGcY+y5IuDZ28pH/c="; + + meta = with lib; { + description = "Tool to wipe drives in a secure way"; + homepage = "https://github.com/kostassoid/lethe"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "lethe"; + }; +} diff --git a/pkgs/by-name/le/letsdns/package.nix b/pkgs/by-name/le/letsdns/package.nix new file mode 100644 index 000000000000..0c49b01d1150 --- /dev/null +++ b/pkgs/by-name/le/letsdns/package.nix @@ -0,0 +1,58 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: +let + version = "1.2.1"; +in +python3Packages.buildPythonApplication { + pname = "letsdns"; + inherit version; + pyproject = true; + + src = fetchFromGitHub { + owner = "LetsDNS"; + repo = "letsdns"; + tag = version; + hash = "sha256-TwGVm7sEOPvUqtvaAuIU/X5W3H4VAC8dskNunt8UO0I="; + }; + + build-system = [ + python3Packages.setuptools + ]; + + nativeCheckInputs = [ + python3Packages.pytestCheckHook + versionCheckHook + ]; + + dependencies = with python3Packages; [ + cryptography + dnspython + requests + ]; + + disabledTestPaths = [ + # These tests require upstream certificates + "tests/test_action.py" + ]; + + env = { + UNITTEST_CONF = "tests/citest.conf"; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Manage DANE TLSA records in DNS servers"; + homepage = "https://www.letsdns.de/"; + downloadPage = "https://github.com/LetsDNS/letsdns"; + changelog = "https://github.com/LetsDNS/letsdns/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ rseichter ]; + mainProgram = "letsdns"; + }; +} diff --git a/pkgs/by-name/le/letterpress/package.nix b/pkgs/by-name/le/letterpress/package.nix index d477cf87ae0b..e83eaa0811cf 100644 --- a/pkgs/by-name/le/letterpress/package.nix +++ b/pkgs/by-name/le/letterpress/package.nix @@ -82,7 +82,8 @@ python3Packages.buildPythonApplication rec { ''; homepage = "https://apps.gnome.org/Letterpress/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.dawidd6 ] ++ lib.teams.gnome-circle.members; + maintainers = [ maintainers.dawidd6 ]; + teams = [ teams.gnome-circle ]; platforms = platforms.linux; mainProgram = "letterpress"; }; diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix index 085771ab4adb..eb130aeb23f9 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.20.2"; + version = "1.21.9"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; tag = "v${version}"; - hash = "sha256-IqnEjlKBB3nx2rOTBG+rrJ078z8+kkg52hFV2+5lJV0="; + hash = "sha256-I9jCS4ZDEfOH/2kgIgeNne96Z5YZdzsmUGXza8PmXZI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix index dbdbfa298ae0..b7c37443b294 100644 --- a/pkgs/by-name/le/lexical/package.nix +++ b/pkgs/by-name/le/lexical/package.nix @@ -44,7 +44,7 @@ beamPackages.mixRelease rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/lf/lf/package.nix b/pkgs/by-name/lf/lf/package.nix index 2109b49807d3..10c678e7604d 100644 --- a/pkgs/by-name/lf/lf/package.nix +++ b/pkgs/by-name/lf/lf/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lf"; - version = "34"; + version = "35"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - hash = "sha256-LUlNwzTusp3Deg01K0HOtR5VXI6Ujnb1Dq6p88gFxAU="; + hash = "sha256-0ZyIbEKiQ9l30gqHlpW7l/6/TzqVRvnKk9c2FiQ6E6Y="; }; - vendorHash = "sha256-CwsHhFVdC+OCv0LWEahJYu33fE0/isNlHKG3rtEw0Ic="; + vendorHash = "sha256-QPsIZ4TRfsYt/bLLQ+1D2X4H+ol3gU8biJIktUv8DYQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix index 229b1fff766d..cf0c15e1cd87 100644 --- a/pkgs/by-name/li/liana/package.nix +++ b/pkgs/by-name/li/liana/package.nix @@ -39,17 +39,17 @@ let in rustPlatform.buildRustPackage rec { pname = "liana"; - version = "9.0"; # keep in sync with lianad + version = "10.0"; # keep in sync with lianad src = fetchFromGitHub { owner = "wizardsardine"; repo = "liana"; tag = "v${version}"; - hash = "sha256-RFlICvoePwSglpheqMb+820My//LElnSeMDPFmXyHz0="; + hash = "sha256-nuwbJxpcapk01qwGAZ2z9nKjHNqE1BMikz3hWrCAGsA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nj7L4glbjevVd1ef6RUGPm4hpzeNdnsCLC01BOJj6kI="; + cargoHash = "sha256-tODnld6V2KWarfHXyoPjSGw+q1A/dalPtW3Swc2dNes="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/li/lianad/package.nix b/pkgs/by-name/li/lianad/package.nix index 63bf21ff7729..a22b73bb4982 100644 --- a/pkgs/by-name/li/lianad/package.nix +++ b/pkgs/by-name/li/lianad/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "lianad"; - version = "9.0"; # keep in sync with liana + version = "10.0"; # keep in sync with liana src = fetchFromGitHub { owner = "wizardsardine"; repo = "liana"; rev = "v${version}"; - hash = "sha256-RFlICvoePwSglpheqMb+820My//LElnSeMDPFmXyHz0="; + hash = "sha256-nuwbJxpcapk01qwGAZ2z9nKjHNqE1BMikz3hWrCAGsA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nj7L4glbjevVd1ef6RUGPm4hpzeNdnsCLC01BOJj6kI="; + cargoHash = "sha256-tODnld6V2KWarfHXyoPjSGw+q1A/dalPtW3Swc2dNes="; buildInputs = [ udev ]; diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix index 1884f873a1e1..79f910002cf8 100644 --- a/pkgs/by-name/li/lib60870/package.nix +++ b/pkgs/by-name/li/lib60870/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lib60870"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "mz-automation"; repo = "lib60870"; rev = "v${finalAttrs.version}"; - hash = "sha256-bPBDM+/1+mIj5BSLukV/nYwOGUo4riGCBC61z3YKAkQ="; + hash = "sha256-TjphTBBGjzbevUR0N1GHK/nic1pAdjWeiqxEMLozQOc="; }; sourceRoot = "${finalAttrs.src.name}/lib60870-C"; diff --git a/pkgs/by-name/li/libLAS/package.nix b/pkgs/by-name/li/libLAS/package.nix index 79c067673f5f..5409edbf5e35 100644 --- a/pkgs/by-name/li/libLAS/package.nix +++ b/pkgs/by-name/li/libLAS/package.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { homepage = "https://liblas.org"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; teams.geospatial.members ++ [ lib.maintainers.michelk ]; + maintainers = with maintainers; [ michelk ]; + teams = [ teams.geospatial ]; }; } diff --git a/pkgs/by-name/li/libacars/package.nix b/pkgs/by-name/li/libacars/package.nix new file mode 100644 index 000000000000..0d2cd6b4bd03 --- /dev/null +++ b/pkgs/by-name/li/libacars/package.nix @@ -0,0 +1,33 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation rec { + pname = "libacars"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "szpajder"; + repo = "libacars"; + tag = "v${version}"; + hash = "sha256-2n1tuKti8Zn5UzQHmRdvW5Q+x4CXS9QuPHFQ+DFriiE="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + + meta = with lib; { + homepage = "https://github.com/szpajder/libacars"; + description = "Aircraft Communications Addressing and Reporting System (ACARS) message decoder"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.mafo ]; + }; +} diff --git a/pkgs/by-name/li/libacr38u/package.nix b/pkgs/by-name/li/libacr38u/package.nix new file mode 100644 index 000000000000..a4ac9de90bd4 --- /dev/null +++ b/pkgs/by-name/li/libacr38u/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + pkg-config, + pcsclite, + libusb-compat-0_1, +}: + +stdenv.mkDerivation { + version = "1.7.11"; + pname = "libacr38u"; + + src = fetchurl { + url = "http://http.debian.net/debian/pool/main/a/acr38/acr38_1.7.11.orig.tar.bz2"; + sha256 = "0lxbq17y51cablx6bcd89klwnyigvkz0rsf9nps1a97ggnllyzkx"; + }; + + doCheck = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + pcsclite + libusb-compat-0_1 + ]; + + preBuild = '' + makeFlagsArray=(usbdropdir="$out/pcsc/drivers"); + ''; + + meta = with lib; { + description = "ACR38U smartcard reader driver for pcsclite"; + longDescription = '' + A PC/SC IFD handler implementation for the ACS ACR38U + smartcard readers. This driver is for the non-CCID version only. + + This package is needed to communicate with the ACR38U smartcard readers through + the PC/SC Lite resource manager (pcscd). + + It can be enabled in /etc/nixos/configuration.nix by adding: + services.pcscd.enable = true; + services.pcscd.plugins = [ libacr38u ]; + + The package is based on the debian package libacr38u. + ''; + homepage = "https://www.acs.com.hk"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ berce ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix new file mode 100644 index 000000000000..3a224ecaa0e1 --- /dev/null +++ b/pkgs/by-name/li/libadwaita/package.nix @@ -0,0 +1,143 @@ +{ + lib, + stdenv, + fetchFromGitLab, + gi-docgen, + meson, + ninja, + pkg-config, + sassc, + vala, + gobject-introspection, + appstream, + fribidi, + glib, + gtk4, + gnome, + adwaita-icon-theme, + gsettings-desktop-schemas, + desktop-file-utils, + xvfb-run, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libadwaita"; + version = "1.7.2"; + + outputs = [ + "out" + "dev" + "devdoc" + ]; + outputBin = "devdoc"; # demo app + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libadwaita"; + rev = finalAttrs.version; + hash = "sha256-3QrFoUaQe2uIUTV/D4Da31o9Ee2d39/9mz1Is1/x3As="; + }; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + gi-docgen + meson + ninja + pkg-config + sassc + vala + gobject-introspection + desktop-file-utils # for validate-desktop-file + ]; + + mesonFlags = + [ + "-Ddocumentation=true" + ] + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ + "-Dtests=false" + ]; + + buildInputs = [ + appstream + fribidi + ]; + + propagatedBuildInputs = [ + gtk4 + ]; + + nativeCheckInputs = + [ + adwaita-icon-theme + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + xvfb-run + ]; + + # Tests had to be disabled on Darwin because test-button-content fails + # + # not ok /Adwaita/ButtonContent/style_class_button - Gdk-FATAL-CRITICAL: + # gdk_macos_monitor_get_workarea: assertion 'GDK_IS_MACOS_MONITOR (self)' failed + doCheck = !stdenv.hostPlatform.isDarwin; + separateDebugInfo = true; + + checkPhase = '' + runHook preCheck + + testEnvironment=( + # Disable portal since we cannot run it in tests. + ADW_DISABLE_PORTAL=1 + + # AdwSettings needs to be initialized from “org.gnome.desktop.interface” GSettings schema when portal is not used for color scheme. + # It will not actually be used since the “color-scheme” key will only have been introduced in GNOME 42, falling back to detecting theme name. + # See adw_settings_constructed function in https://gitlab.gnome.org/GNOME/libadwaita/commit/60ec69f0a5d49cad8a6d79e4ecefd06dc6e3db12 + # + # The "Validate docs" test looks for various GIR dependencies, thus preserve the existing paths. + "XDG_DATA_DIRS=$XDG_DATA_DIRS:${glib.getSchemaDataDirPath gsettings-desktop-schemas}" + + # Tests need a cache directory + "HOME=$TMPDIR" + ) + env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "xvfb-run"} \ + meson test --print-errorlogs + + runHook postCheck + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + + # Put all resources related to demo app into devdoc output. + for d in applications icons metainfo; do + moveToOutput "share/$d" "$devdoc" + done + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = finalAttrs.pname; + }; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + + meta = with lib; { + changelog = "https://gitlab.gnome.org/GNOME/libadwaita/-/blob/${finalAttrs.src.rev}/NEWS"; + description = "Library to help with developing UI for mobile devices using GTK/GNOME"; + mainProgram = "adwaita-1-demo"; + homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ dotlambda ]; + teams = [ teams.gnome ]; + platforms = platforms.unix; + pkgConfigModules = [ "libadwaita-1" ]; + }; +}) diff --git a/pkgs/by-name/li/libansilove/package.nix b/pkgs/by-name/li/libansilove/package.nix new file mode 100644 index 000000000000..5343ed1b0b0c --- /dev/null +++ b/pkgs/by-name/li/libansilove/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gd, +}: + +stdenv.mkDerivation rec { + pname = "libansilove"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "ansilove"; + repo = "libansilove"; + tag = version; + hash = "sha256-kbQ7tbQbJ8zYhdbfiVZY26woyR4NNzqjCJ/5nrunlWs="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ gd ]; + + meta = { + description = "Library for converting ANSI, ASCII, and other formats to PNG"; + homepage = "https://github.com/ansilove/libansilove"; + changelog = "https://github.com/ansilove/libansilove/blob/${src.rev}/ChangeLog"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ jethair ]; + mainProgram = "libansilove"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libapparmor/apparmorRulesFromClosure.nix b/pkgs/by-name/li/libapparmor/apparmorRulesFromClosure.nix new file mode 100644 index 000000000000..a12b8f0459be --- /dev/null +++ b/pkgs/by-name/li/libapparmor/apparmorRulesFromClosure.nix @@ -0,0 +1,35 @@ +{ + runCommand, + closureInfo, + lib, +}: +{ + # The store path of the derivation is given in $path + additionalRules ? [ ], + # TODO: factorize here some other common paths + # that may emerge from use cases. + baseRules ? [ + "r $path" + "r $path/etc/**" + "mr $path/share/**" + # Note that not all libraries are prefixed with "lib", + # eg. glibc-2.30/lib/ld-2.30.so + "mr $path/lib/**.so*" + "mr $path/lib64/**.so*" + # eg. glibc-2.30/lib/gconv/gconv-modules + "r $path/lib/**" + "r $path/lib64/**" + # Internal executables + "ixr $path/libexec/**" + ], + name ? "", +}: +rootPaths: +runCommand ("apparmor-closure-rules" + lib.optionalString (name != "") "-${name}") { } '' + touch $out + while read -r path + do printf >>$out "%s,\n" ${ + lib.concatMapStringsSep " " (x: "\"${x}\"") (baseRules ++ additionalRules) + } + done <${closureInfo { inherit rootPaths; }}/store-paths +'' diff --git a/pkgs/by-name/li/libapparmor/package.nix b/pkgs/by-name/li/libapparmor/package.nix new file mode 100644 index 000000000000..a0b305a85653 --- /dev/null +++ b/pkgs/by-name/li/libapparmor/package.nix @@ -0,0 +1,109 @@ +{ + stdenv, + lib, + fetchFromGitLab, + autoreconfHook, + autoconf-archive, + pkg-config, + which, + flex, + bison, + withPerl ? + stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform perl, + perl, + withPython ? + # static can't load python libraries + !stdenv.hostPlatform.isStatic + && lib.meta.availableOn stdenv.hostPlatform python3Packages.python + # m4 python include script fails if cpu bit depth is different across machines + && stdenv.hostPlatform.parsed.cpu.bits == stdenv.buildPlatform.parsed.cpu.bits, + python3Packages, + swig, + ncurses, + libxcrypt, + + # test + dejagnu, + + # passthru + nix-update-script, + nixosTests, + callPackage, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libapparmor"; + version = "4.1.0"; + + src = fetchFromGitLab { + owner = "apparmor"; + repo = "apparmor"; + tag = "v${finalAttrs.version}"; + hash = "sha256-oj6mGw/gvoRGpJqw72Lk6LJuurg8efjiV1pvZYbXz6A="; + }; + sourceRoot = "${finalAttrs.src.name}/libraries/libapparmor"; + + postPatch = '' + substituteInPlace swig/perl/Makefile.am \ + --replace-fail install_vendor install_site + ''; + + strictDeps = true; + + nativeBuildInputs = + [ + autoconf-archive + autoreconfHook + bison + flex + pkg-config + swig + ncurses + which + dejagnu + perl # podchecker + ] + ++ lib.optionals withPython [ + python3Packages.setuptools + ]; + + nativeCheckInputs = [ + python3Packages.pythonImportsCheckHook + ]; + + buildInputs = + [ libxcrypt ] ++ (lib.optional withPerl perl) ++ (lib.optional withPython python3Packages.python); + + # required to build apparmor-parser + dontDisableStatic = true; + + # https://gitlab.com/apparmor/apparmor/issues/1 + configureFlags = [ + (lib.withFeature withPerl "perl") + (lib.withFeature withPython "python") + ]; + + doCheck = withPerl && withPython; + + checkInputs = [ dejagnu ]; + + pythonImportsCheck = [ + "LibAppArmor" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.nixos = nixosTests.apparmor; + apparmorRulesFromClosure = callPackage ./apparmorRulesFromClosure.nix { }; + }; + + meta = { + homepage = "https://apparmor.net/"; + description = "Mandatory access control system - core library"; + license = with lib.licenses; [ + gpl2Only + lgpl21Only + ]; + maintainers = lib.teams.apparmor.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/li/libarchive-qt/package.nix b/pkgs/by-name/li/libarchive-qt/package.nix new file mode 100644 index 000000000000..74b7f79a11d1 --- /dev/null +++ b/pkgs/by-name/li/libarchive-qt/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitLab, + libarchive, + xz, + zlib, + bzip2, + meson, + pkg-config, + ninja, + qt6, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libarchive-qt"; + version = "2.0.8"; + + src = fetchFromGitLab { + owner = "marcusbritanicus"; + repo = "libarchive-qt"; + tag = "v${finalAttrs.version}"; + hash = "sha256-31a6DsxObSJWyLfT6mVtyjloT26IwFHpH53iuyC2mco="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + qt6.wrapQtAppsNoGuiHook + ]; + + buildInputs = [ + libarchive + bzip2 + zlib + xz + qt6.qtbase + ]; + + mesonFlags = [ "-Duse_qt_version=qt6" ]; + + meta = { + description = "Qt based archiving solution with libarchive backend"; + mainProgram = "archiver"; + homepage = "https://gitlab.com/marcusbritanicus/libarchive-qt"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index 6b6c8771b167..bf43230d9333 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/pkgs/by-name/li/libarchive/package.nix @@ -33,13 +33,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.7.7"; + version = "3.7.8"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-maV2+Whi4aDG1VLAYpOTxluO9I0zNiZ8fA3w7epGlDg="; + hash = "sha256-fjE3b9rDHf1Xubpm9guvX6I8a2loYsGHj3epLceueUw="; }; patches = [ diff --git a/pkgs/by-name/li/libargs/package.nix b/pkgs/by-name/li/libargs/package.nix index a6841f541bf7..584aa6df8b28 100644 --- a/pkgs/by-name/li/libargs/package.nix +++ b/pkgs/by-name/li/libargs/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "args"; - version = "6.4.6"; + version = "6.4.7"; src = fetchFromGitHub { owner = "Taywee"; repo = "args"; rev = version; - sha256 = "sha256-2gH3h3QAl0+XVULt/fR2UUGKNIxTUmnRRdxPOFdpVy4="; + sha256 = "sha256-IQzhbXl1CfEV164EjulKrOUdCTZNZAFgVyzxk4rTNlU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/libaribcaption/package.nix b/pkgs/by-name/li/libaribcaption/package.nix index 353f31c0e128..51d1da2f66be 100644 --- a/pkgs/by-name/li/libaribcaption/package.nix +++ b/pkgs/by-name/li/libaribcaption/package.nix @@ -7,10 +7,6 @@ fontconfig, freetype, - ApplicationServices, - CoreFoundation, - CoreGraphics, - CoreText, }: stdenv.mkDerivation rec { @@ -28,17 +24,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ - fontconfig - freetype - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - CoreFoundation - CoreGraphics - CoreText - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + fontconfig + freetype + ]; meta = with lib; { description = "Portable ARIB STD-B24 Caption Decoder/Renderer"; diff --git a/pkgs/by-name/li/libass/package.nix b/pkgs/by-name/li/libass/package.nix index ba3fa9a74633..68a443b16e66 100644 --- a/pkgs/by-name/li/libass/package.nix +++ b/pkgs/by-name/li/libass/package.nix @@ -11,7 +11,6 @@ fontconfig ? null, # fontconfig support largeTilesSupport ? false, # Use larger tiles in the rasterizer libiconv, - darwin, }: assert fontconfigSupport -> fontconfig != null; @@ -49,9 +48,6 @@ stdenv.mkDerivation rec { ++ lib.optional fontconfigSupport fontconfig ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.ApplicationServices - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreText ]; meta = with lib; { diff --git a/pkgs/by-name/li/libation/deps.json b/pkgs/by-name/li/libation/deps.json index d43c081d300b..ed15ed24cf79 100644 --- a/pkgs/by-name/li/libation/deps.json +++ b/pkgs/by-name/li/libation/deps.json @@ -1,108 +1,108 @@ [ { "pname": "AAXClean", - "version": "1.1.2", - "hash": "sha256-Abgf22iixOsF1VnVfbutYPtPuUonq0G+aSynhOMLtkM=" + "version": "2.0.1.1", + "hash": "sha256-3xjH9bEapK/LXsJnnAbIHJyIv2BaWyS61gOrsLcv/Xo=" }, { "pname": "AAXClean.Codecs", - "version": "1.1.3", - "hash": "sha256-SPbynIf6vtDfnfTWcfpn7WiwKHD15CogCIEyTTVMEkM=" + "version": "2.0.1.1", + "hash": "sha256-4tN56SIHiAkvGCTffUoIGRrmfV2pzetITIMbtmj2cXw=" }, { "pname": "AudibleApi", - "version": "9.2.0.1", - "hash": "sha256-2NcRx+2sBLQDmXA+lLFnpGj9/IzyxYnvE5doQP9oCQ8=" + "version": "9.4.0.1", + "hash": "sha256-M8+6dTpNXkY/wIXlyVAqzjXFy9HpR32fDbvc2kCTJwU=" }, { "pname": "Avalonia", - "version": "11.0.5", - "hash": "sha256-BqpHqQIObTb7DHTyZAgCD9A5I0pZkHhSoPTN2g6/G9E=" + "version": "11.2.8", + "hash": "sha256-GbZIXopQh6VSRLAg47TRWHvMYEl5/c7rtvNmFnlDhAo=" }, { "pname": "Avalonia.Angle.Windows.Natives", - "version": "2.1.0.2023020321", - "hash": "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks=" + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.0.5", - "hash": "sha256-Iob8OyWhwXhmHKCdnea7dtL9VQvcrf6/gUGHJ30CKXA=" + "version": "11.2.8", + "hash": "sha256-jcCErs44R9tl6zjMkRxdwU9lBxv13MOZMi9Hcm7Tals=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.0.5", - "hash": "sha256-2iVuMPRw7sbsYPGSG4XjQFGFky5WB5B05Jh1+I852ZI=" + "version": "11.2.8", + "hash": "sha256-bAbHI5bKyTYksXsnOS5poBBxdhYQE/HSj52YxqGvkok=" }, { "pname": "Avalonia.Controls.ItemsRepeater", - "version": "11.0.5", - "hash": "sha256-e/PyjYtJx0TFPSYS/jLBG7HC2x7o4qJ3NR2T+xchV0w=" + "version": "11.1.5", + "hash": "sha256-k4ZYqXFtyLet3wJB4ZJvaPYbcl0K0oKK04yoesbmCXQ=" }, { "pname": "Avalonia.Desktop", - "version": "11.0.5", - "hash": "sha256-UKVibxhJoGNvEGh8J/Z0sq8J81FT8yth/yXVPSFHF/8=" + "version": "11.2.8", + "hash": "sha256-Mr2x3hm3ArlQwGlWO9MuFWUelf4EVmVPAGANm1MxM1o=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.0.5", - "hash": "sha256-0cUxPYJP2W11wnM6j4qNB3IvHlsUp9EZlY8I/NoAmd4=" + "version": "11.2.8", + "hash": "sha256-3+88G0O1LrQSCSxI6s0aFD34nhgqTH1b3rMXBaXqY0M=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.0.5", - "hash": "sha256-O20fC/9YXO3/MZNlh1EgWLHFSyi/ao083MKwjetgxmo=" + "version": "11.2.8", + "hash": "sha256-X9VxRmeK6Vu8c9ILtF/KyDi0B0CmjeZcTRnwouCYOWg=" }, { "pname": "Avalonia.Native", - "version": "11.0.5", - "hash": "sha256-KVUAXXT+f4VrtJ8widfEIzN25GBbtXWog/tpM354gdg=" + "version": "11.2.8", + "hash": "sha256-YVjhd2fjOamYdYEh4jGGZy06xPAq3juTH2nC7cOlGOA=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.0.5", - "hash": "sha256-8tGLyA0PRKt1REb9YeCtEDz5oB886PRG35aO0uZm/jU=" + "version": "11.2.8", + "hash": "sha256-ReMIcC/paWEVWVI8saKhy9j/W4NN89+MNY80GHztUAQ=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.0.5", - "hash": "sha256-wTqdxPU3Ql7jC4JFkChbUfaRR0nqUKrYKn8oexdFyig=" + "version": "11.2.8", + "hash": "sha256-v30kDbStvHAS4IOV0wEkWYXOdh4SdjaDEcKVD+6xpzc=" }, { "pname": "Avalonia.Skia", - "version": "11.0.5", - "hash": "sha256-rKOgkNLCwEVVcyLCimvhDUDKXnrDOguUryaGVOPFFwE=" + "version": "11.2.8", + "hash": "sha256-V84jNsrMNguAt9ZdSEf74F4OTC3WyXLuLrkByxfHJe4=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.0.5", - "hash": "sha256-ETOaNvRzTAC0uEVVB3noiyYM9N9nPrPnMwCqiFgID/4=" + "version": "11.2.8", + "hash": "sha256-qHwn8BPAPHxNJ3Ya3xPUhEzItXVjNbI5YjEsNqQLJ8s=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.0.5", - "hash": "sha256-27evmgSrIx+EopF6E3N1cT7BvAUc/s99TVEMfmG83cQ=" + "version": "11.2.8", + "hash": "sha256-vEFjwS+X6EkxVXDFk97b4S4AjbLVjPD3dYVADrBnoXo=" }, { "pname": "Avalonia.Win32", - "version": "11.0.5", - "hash": "sha256-ncZLGKhpfjuuVPz4Fs+P6L3dM0KRnwAC3xJRqyvpKw8=" + "version": "11.2.8", + "hash": "sha256-3XYJXXT9IMECwCNbrzV49x0pyJZx6Vbib53Vbe9Gfjg=" }, { "pname": "Avalonia.X11", - "version": "11.0.5", - "hash": "sha256-rvs3hwRh3F5E1j3JqcodWJTHV3BTWMKkvzq170tuPa4=" + "version": "11.2.8", + "hash": "sha256-+m8pNxda2vyFVBR+7IhkTaQ4Zm7gqkT0XgKSp+lWWmA=" }, { "pname": "BouncyCastle.Cryptography", - "version": "2.3.0", - "hash": "sha256-TIBOegJAEfFRyvtwuPakvKsQbqoPHj1RSTmK7SKYsf0=" + "version": "2.3.1", + "hash": "sha256-r/vNfB00Cjqt1/eFeFdYAoblVhcUuxBRuVUEtqLIT3E=" }, { "pname": "CommandLineParser", @@ -116,18 +116,23 @@ }, { "pname": "Dinah.Core", - "version": "8.0.0.1", - "hash": "sha256-jYAaIqv67DOl+l+i92QmV7TM3YXL250D8XUZ7dZh1s0=" + "version": "9.0.0.1", + "hash": "sha256-tHuHWUgzj0ZmcXwnnkLPkWwRj0KWy9Y9gxae2cA/qJk=" + }, + { + "pname": "Dinah.Core", + "version": "9.0.1.1", + "hash": "sha256-54TDRMzCDNYzEeyFvaNULuucQ3PcVeI3FDLHHRfsJDI=" }, { "pname": "Dinah.EntityFrameworkCore", - "version": "8.0.0.1", - "hash": "sha256-xTKKCBE2KfXqUaRMZqgohQmUi51GrWvaIWTW66nRRYQ=" + "version": "9.0.0.1", + "hash": "sha256-OFLJW8MJpMq2iGb8I7R9SSPzZYQhmoW/e0h6mRuLbuc=" }, { "pname": "DynamicData", - "version": "7.9.5", - "hash": "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU=" + "version": "8.4.1", + "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4=" }, { "pname": "Enums.NET", @@ -136,38 +141,48 @@ }, { "pname": "ExtendedNumerics.BigDecimal", - "version": "2023.1000.0.230", - "hash": "sha256-THVfKgtJoier9RfJamO1a+F1ufVRSWoMw+0lerxxdC8=" + "version": "2025.1001.2.129", + "hash": "sha256-LAlD9SWsKfXxMu0XTqxPBvWuN6MrBnETrWs8BVNDsVk=" + }, + { + "pname": "Google.Protobuf", + "version": "3.30.2", + "hash": "sha256-GbyaRLeBNyvJrx4+SkgewClk1nCTtdE7sNqnSjk8VBM=" }, { "pname": "HarfBuzzSharp", - "version": "2.8.2.3", - "hash": "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ=" + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "2.8.2.3", - "hash": "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg=" + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "2.8.2.3", - "hash": "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ=" + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "2.8.2.3", - "hash": "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA=" + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "2.8.2.3", - "hash": "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI=" + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" }, { "pname": "HtmlAgilityPack", - "version": "1.11.54", - "hash": "sha256-Cl3l5H5qYOn6fEzX9cl1eMn43l7C13a+tBOAVD1oGp0=" + "version": "1.11.71", + "hash": "sha256-ddNrIXTfiu8gwrUs/5xYDjpD0sOth90kut6qCgxGUSE=" + }, + { + "pname": "HtmlAgilityPack", + "version": "1.12.0", + "hash": "sha256-Ps3IfNHKCosY4yg1QAj4aldMHni8u1JnlMre0fLcjHo=" }, { "pname": "Humanizer.Core", @@ -176,8 +191,8 @@ }, { "pname": "LuceneNet303r2", - "version": "3.0.3.8", - "hash": "sha256-mHfa5OzVff2q5MIgefih9Y269qQKe7It/6G4IwT2Meg=" + "version": "3.0.3.9", + "hash": "sha256-8k9JZMikpSsVKFMSg9CK19YbJFJ9ifpYCKaEtC+f7mY=" }, { "pname": "MathNet.Numerics.Signed", @@ -191,213 +206,273 @@ }, { "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + "version": "7.0.0", + "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE=" + }, + { + "pname": "Microsoft.Build.Framework", + "version": "16.10.0", + "hash": "sha256-Sj41LE1YQ/NfOdiDf5YnZgWSwGOzQ2uVvP1LgF/HSJ0=" + }, + { + "pname": "Microsoft.Build.Framework", + "version": "17.8.3", + "hash": "sha256-Rp4dN8ejOXqclIKMUXYvIliM6IYB7WMckMLwdCbVZ34=" + }, + { + "pname": "Microsoft.Build.Locator", + "version": "1.7.8", + "hash": "sha256-VhZ4jiJi17Cd5AkENXL1tjG9dV/oGj0aY67IGYd7vNs=" + }, + { + "pname": "Microsoft.Build.Tasks.Git", + "version": "8.0.0", + "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.0.0", - "hash": "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0=" - }, - { - "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.3", - "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY=" + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "3.8.0", - "hash": "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o=" - }, - { - "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.5.0", - "hash": "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I=" + "version": "4.8.0", + "hash": "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "3.8.0", - "hash": "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4=" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.5.0", - "hash": "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A=" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp.Scripting", - "version": "3.8.0", - "hash": "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA=" + "version": "4.8.0", + "hash": "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU=" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", - "version": "4.5.0", - "hash": "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o=" - }, - { - "pname": "Microsoft.CodeAnalysis.Scripting.Common", - "version": "3.8.0", - "hash": "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I=" + "version": "4.8.0", + "hash": "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE=" }, { "pname": "Microsoft.CodeAnalysis.Workspaces.Common", - "version": "4.5.0", - "hash": "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI=" + "version": "4.8.0", + "hash": "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM=" }, { - "pname": "Microsoft.CSharp", - "version": "4.3.0", - "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8=" + "pname": "Microsoft.CodeAnalysis.Workspaces.MSBuild", + "version": "4.8.0", + "hash": "sha256-hxpMKC6OF8OaIiSZhAgJ+Rw7M8nqS6xHdUURnRRxJmU=" }, { "pname": "Microsoft.Data.Sqlite.Core", - "version": "8.0.5", - "hash": "sha256-PH+ZS45SGfWSFcYZA+V3m0k1r3kxaDzD3DutVVRyqfQ=" + "version": "9.0.4", + "hash": "sha256-OJs5gZSKnmDabm6UehVhzYFtsgEmScyNrzbQ+ojiRoI=" }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "8.0.0", - "hash": "sha256-Z6dlgOQrYcSCcRaXPNnYLC87sg4OGRS+p4Tv3EFXFfY=" + "version": "9.0.0", + "hash": "sha256-pFO6T2UsnYuXqPZzG5SziG0v7fYkLd5GlQ2DWk21XCc=" }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "8.0.5", - "hash": "sha256-qR7Z+AQXzwejgYUKhoZIfYTWPOLNpOD6DBJ80xEfLaE=" + "version": "9.0.4", + "hash": "sha256-zjIBv5cnhTVzG7YE+tqSI+havSCAHQdCE3Ha4JjecuQ=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "8.0.0", - "hash": "sha256-QxPc73WzjE63Pzuxc/xr/uQc0C+v6xVd2N0iIUJKOQU=" + "version": "9.0.0", + "hash": "sha256-8SPpC6uTLl3TryFCTb2qqqLW4AsF/mTkOQteZ76dcfU=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "8.0.5", - "hash": "sha256-2RyxdXMIc2Gzbc5ouEdbbrVDfTrCU8PP9zPYxlcQXpw=" + "version": "9.0.4", + "hash": "sha256-CaGhHINjggzaZSmdP51BBM4osWKpbck/2DgoMVCR3bc=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "8.0.0", - "hash": "sha256-SidpTl9AveYiXHa+TtvyHnRTOn02lmab4qXPf0FTi+0=" + "version": "9.0.0", + "hash": "sha256-TzAFoT3LEHcyD7sjoGMXOV7BVWNPSDIn+5+QQg4BYGs=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "8.0.5", - "hash": "sha256-tvLA2TZouZC8pgxS8YikG2ui4Znaj6bNrVGAVy7t9rk=" + "version": "9.0.4", + "hash": "sha256-Htc1qQ8dTS+tGDaT0gQVsZNtVar3p/LT54YcFkoHTLI=" }, { "pname": "Microsoft.EntityFrameworkCore.Design", - "version": "8.0.5", - "hash": "sha256-zwDnWBGVf6O+L2iqcwJ/e+gbg5A+hVLf8Tc3vIbl+cA=" + "version": "9.0.4", + "hash": "sha256-mwW5DH+pX0cRx+wRHoh850u2b6/SxvvhBkKjwe8wRiQ=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "8.0.0", - "hash": "sha256-ga+Qp4dZpmxVEmIIn8AcC92HrhVQBaDICyHqE87s+lk=" + "version": "9.0.0", + "hash": "sha256-b7YR7J6mv7IN0+TQIIm6xKw4heEPol0dLDgxVHAUu7s=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "8.0.5", - "hash": "sha256-peIG9ZgXvvEB2wJ2QFxC3u+H8LnZ9xL/HIegw4R00Do=" + "version": "9.0.4", + "hash": "sha256-cZ8qUtvGgICA8F2XS9sNci14AzLC84mcGv6GibifYKc=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite", - "version": "8.0.5", - "hash": "sha256-lED2YXKz6PzYAC5iIXW957N74KUuYtJ9cKvoPFiebpk=" + "version": "9.0.4", + "hash": "sha256-9KBVCa/lr6UX2WFrMAU+S4WD0AG51kLI6YP9GxQmZK8=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", - "version": "8.0.5", - "hash": "sha256-+6AvDE+Fj0Oc7EfA4SXwFUdkOSvvX6jC5HPtbUhYQwE=" + "version": "9.0.4", + "hash": "sha256-pka9/9W+B4gVY7H7VJ3qCSaEJJW5Thqd6LAdQaIMRQ0=" }, { "pname": "Microsoft.EntityFrameworkCore.Tools", - "version": "8.0.5", - "hash": "sha256-tHtuHXdI4d3CdL+2as595sys0phrBeZtWEof2Gd/A3I=" + "version": "9.0.4", + "hash": "sha256-sUyI6VH/QpBNwz2bjQZlCTP41MjC4SlxCDqr063VVsM=" }, { "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "8.0.0", - "hash": "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI=" + "version": "9.0.4", + "hash": "sha256-/VJBbIJzRXjzQ07s4Bicb+WNV0ZAC+/naG2nLVxFvjU=" }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "8.0.0", - "hash": "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8=" + "version": "9.0.0", + "hash": "sha256-OZVOVGZOyv9uk5XGJrz6irBkPNjxnBxjfSyW30MnU0s=" + }, + { + "pname": "Microsoft.Extensions.Caching.Memory", + "version": "9.0.4", + "hash": "sha256-5uynkW+dK61Zp1+vs5uW6mwpnkZl7mH/bGSQoGjJH2c=" }, { "pname": "Microsoft.Extensions.Configuration", - "version": "8.0.0", - "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" + "version": "9.0.0", + "hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "9.0.4", + "hash": "sha256-01yWDq/dHgU1Trx2OqVsXK/yobwVTClJXB07LrPc8lU=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "8.0.0", - "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" + "version": "9.0.0", + "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.4", + "hash": "sha256-5hwq73FCWAJJ8Yb1VHaaryJJhUUiVsetPTrPLlo8N9o=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", "version": "8.0.0", "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "9.0.0", + "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU=" + }, { "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "8.0.0", - "hash": "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs=" + "version": "9.0.0", + "hash": "sha256-PsLo6mrLGYfbi96rfCG8YS1APXkUXBG4hLstpT60I4s=" + }, + { + "pname": "Microsoft.Extensions.Configuration.FileExtensions", + "version": "9.0.4", + "hash": "sha256-i6BP99iTLEVt7aSw2Fu0ogUnY6FlVMat+BMIlndHCkQ=" }, { "pname": "Microsoft.Extensions.Configuration.Json", - "version": "8.0.0", - "hash": "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg=" + "version": "9.0.0", + "hash": "sha256-qQn7Ol0CvPYuyecYWYBkPpTMdocO7I6n+jXQI2udzLI=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Json", + "version": "9.0.4", + "hash": "sha256-scTrZeY5CKX9kMcN7MYQPJVgEFwDTvO+JOk+G3wXrjs=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.0", - "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" + "version": "9.0.4", + "hash": "sha256-ck7PqIL/3vodYky+d7YX218n+detOoEjZeMr1EqTFPg=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.0", - "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" + "version": "9.0.4", + "hash": "sha256-6WcGpsAYRhrpHloEom0oVP7Ff4Gh/O1XWJETJJ3LvEQ=" }, { "pname": "Microsoft.Extensions.DependencyModel", - "version": "8.0.0", - "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo=" + "version": "8.0.2", + "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "9.0.0", + "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "9.0.4", + "hash": "sha256-ziWOK9GykM9HufwYy18FYu6AyOncLOeumi3F/4W3AVE=" }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "8.0.0", - "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" + "version": "9.0.0", + "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "9.0.4", + "hash": "sha256-OkAq+1NUG0d1Ww6zT/hZWcPB5+fCr8AJIWmkpX7CQxU=" }, { "pname": "Microsoft.Extensions.FileProviders.Physical", - "version": "8.0.0", - "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc=" + "version": "9.0.0", + "hash": "sha256-IzFpjKHmF1L3eVbFLUZa2N5aH3oJkJ7KE1duGIS7DP8=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Physical", + "version": "9.0.4", + "hash": "sha256-whn/jRYaH56Lha20yChG5wgIllttTq2EtOwyDW+ZDO4=" }, { "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "8.0.0", - "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU=" + "version": "9.0.0", + "hash": "sha256-eBLa8pW/y/hRj+JbEr340zbHRABIeFlcdqE0jf5/Uhc=" + }, + { + "pname": "Microsoft.Extensions.FileSystemGlobbing", + "version": "9.0.4", + "hash": "sha256-lzNTCxATfJvnsl1hlAxhI4cibixYYBq99fK9b9tEo0A=" }, { "pname": "Microsoft.Extensions.Logging", - "version": "8.0.0", - "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" + "version": "9.0.0", + "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM=" + }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "9.0.4", + "hash": "sha256-Vj+NGOamKeuMrLNUWlVKFFkz7IKGIv6h1A5X4CK9D5E=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "8.0.0", - "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" + "version": "9.0.4", + "hash": "sha256-n0ZRhQ7U/5Kv1hVqUXGoa5gfrhzcy77yFhfonjq6VFc=" }, { "pname": "Microsoft.Extensions.Options", - "version": "8.0.0", - "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" + "version": "9.0.4", + "hash": "sha256-QyjtRCG+L9eyH/UWHf/S+7/ZiSOmuGNoKGO9nlXmjxI=" }, { "pname": "Microsoft.Extensions.Primitives", - "version": "8.0.0", - "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" + "version": "9.0.0", + "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.4", + "hash": "sha256-v/Ygyo1TMTUbnhdQSV2wzD4FOgAEWd1mpESo3kZ557g=" }, { "pname": "Microsoft.IO.RecyclableMemoryStream", @@ -409,11 +484,6 @@ "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "2.1.2", - "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", @@ -425,14 +495,19 @@ "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { - "pname": "Microsoft.Win32.SystemEvents", - "version": "6.0.0", - "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" + "pname": "Microsoft.SourceLink.Common", + "version": "8.0.0", + "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=" + }, + { + "pname": "Microsoft.SourceLink.GitHub", + "version": "8.0.0", + "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" }, { "pname": "Mono.TextTemplating", - "version": "2.2.1", - "hash": "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY=" + "version": "3.0.0", + "hash": "sha256-VlgGDvgNZb7MeBbIZ4DE2Nn/j2aD9k6XqNHnASUSDr0=" }, { "pname": "NameParserSharp", @@ -451,13 +526,13 @@ }, { "pname": "NPOI", - "version": "2.7.0", - "hash": "sha256-zqns3HwLv8OQMyvw+LUtwqPbkAEIrVJU589AMNhnM4s=" + "version": "2.7.3", + "hash": "sha256-xDVGyQoUaynZ0LS7+/gIM3JJO88jakE2vKxTFsVAngo=" }, { "pname": "Octokit", - "version": "11.0.1", - "hash": "sha256-24Ym/CXgU3LCFQcMHdFfWp8vUjLfwRcRIyW9fvr4i1s=" + "version": "14.0.0", + "hash": "sha256-pTSI7Tz5VFd4Ydx1laE+VkZfhsl7Rbgw42PBqhyVvyI=" }, { "pname": "Pluralize.NET", @@ -466,169 +541,24 @@ }, { "pname": "Polly", - "version": "8.4.1", - "hash": "sha256-CPFw0j6f2P5LfcoFAHo1RRDnCx6SXnp8gzHnwYDnYhY=" + "version": "8.5.2", + "hash": "sha256-IrN06ddOIJ0VYuVefe3LvfW0kX20ATRQkEBg9CBomRA=" }, { "pname": "Polly.Core", - "version": "8.4.1", - "hash": "sha256-EksA3U5cmsri2joM+SMtbdwOUMUVxIXT8DnH4DSAIpA=" + "version": "8.5.2", + "hash": "sha256-PAwsWqrCieCf/7Y87fV7XMKoaY2abCQNtI+4oyyMifk=" }, { "pname": "ReactiveUI", - "version": "18.3.1", - "hash": "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M=" - }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" - }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" - }, - { - "pname": "Serilog", - "version": "2.10.0", - "hash": "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE=" + "version": "20.1.1", + "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE=" }, { "pname": "Serilog", "version": "2.8.0", "hash": "sha256-MBL9AWGV8UthhiHXnqH3EsfIyXnxdLWqAdFa6QvQ2To=" }, - { - "pname": "Serilog", - "version": "3.1.0", - "hash": "sha256-1CDAp+AjfFjQqoLvKYp/j6pKTUfNOGfKVlWyqCGHo7k=" - }, { "pname": "Serilog", "version": "3.1.1", @@ -639,6 +569,11 @@ "version": "4.0.0", "hash": "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw=" }, + { + "pname": "Serilog", + "version": "4.2.0", + "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs=" + }, { "pname": "Serilog.Exceptions", "version": "8.4.0", @@ -646,13 +581,13 @@ }, { "pname": "Serilog.Settings.Configuration", - "version": "8.0.0", - "hash": "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg=" + "version": "8.0.4", + "hash": "sha256-00abT3H5COh5/A/tMYJwAZ37Mwa6jafVvW/nysLIbNQ=" }, { - "pname": "Serilog.Sinks.Console", - "version": "5.0.0", - "hash": "sha256-UOVlegJLhs0vK1ml2DZCjFE5roDRZsGCAqD/53ZaZWI=" + "pname": "Serilog.Settings.Configuration", + "version": "9.0.0", + "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I=" }, { "pname": "Serilog.Sinks.Console", @@ -661,13 +596,13 @@ }, { "pname": "Serilog.Sinks.File", - "version": "5.0.0", - "hash": "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ=" + "version": "6.0.0", + "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=" }, { "pname": "Serilog.Sinks.File", - "version": "6.0.0", - "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=" + "version": "7.0.0", + "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo=" }, { "pname": "Serilog.Sinks.ZipFile", @@ -676,8 +611,8 @@ }, { "pname": "SharpZipLib", - "version": "1.3.3", - "hash": "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4=" + "version": "1.4.2", + "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" }, { "pname": "SixLabors.Fonts", @@ -686,88 +621,83 @@ }, { "pname": "SixLabors.ImageSharp", - "version": "2.1.7", - "hash": "sha256-CPC3x2vPfjv8ZLyxnQ8uuNhlsUMrIE/+hdYP0dZGLR8=" + "version": "2.1.10", + "hash": "sha256-nmvI1fZtimtmiitXBQJhYXHsYM8IGjEMxlKcsaORC3Y=" }, { "pname": "SixLabors.ImageSharp", - "version": "3.1.5", - "hash": "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw=" + "version": "3.1.8", + "hash": "sha256-cE9BQfbCvJ0Mf+fQiTD8elOZEPcfZHjDz2BHdiO+D08=" }, { "pname": "SkiaSharp", - "version": "2.88.6", - "hash": "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc=" + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.6", - "hash": "sha256-VjgGoi73tVvqO/UXmQb1w9ioAbFu2dxH8oHz1l5H4zE=" + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.6", - "hash": "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo=" + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.6", - "hash": "sha256-CIb9fHVgHwIa0R1WafKJ3+GqtDHHRgDohA3ayTHvlws=" + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.6", - "hash": "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA=" + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, { "pname": "Splat", - "version": "14.4.1", - "hash": "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8=" + "version": "15.1.1", + "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", - "version": "2.1.6", - "hash": "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718=" + "version": "2.1.10", + "hash": "sha256-kZIWjH/TVTXRIsHPZSl7zoC4KAMBMWmgFYGLrQ15Occ=" }, { "pname": "SQLitePCLRaw.core", - "version": "2.1.6", - "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E=" + "version": "2.1.10", + "hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8=" }, { "pname": "SQLitePCLRaw.lib.e_sqlite3", - "version": "2.1.6", - "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0=" + "version": "2.1.10", + "hash": "sha256-m2v2RQWol+1MNGZsx+G2N++T9BNtQGLLHXUjcwkdCnc=" }, { "pname": "SQLitePCLRaw.provider.e_sqlite3", - "version": "2.1.6", - "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8=" + "version": "2.1.10", + "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg=" }, { "pname": "System.CodeDom", - "version": "4.4.0", - "hash": "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0=" - }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" - }, - { - "pname": "System.Collections.Immutable", - "version": "5.0.0", - "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8=" - }, - { - "pname": "System.Collections.Immutable", "version": "6.0.0", - "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" + "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ=" }, { "pname": "System.Collections.Immutable", - "version": "8.0.0", - "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + "version": "7.0.0", + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + }, + { + "pname": "System.Collections.Immutable", + "version": "9.0.0", + "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac=" + }, + { + "pname": "System.Collections.Immutable", + "version": "9.0.2", + "hash": "sha256-brMJqQ4PyRDOJCNq+HTFdFEphlyPD1x9YZGeHUbmtTo=" }, { "pname": "System.Collections.NonGeneric", @@ -776,48 +706,43 @@ }, { "pname": "System.ComponentModel.Annotations", - "version": "4.5.0", - "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" + "version": "5.0.0", + "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" }, { "pname": "System.Composition", - "version": "6.0.0", - "hash": "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw=" + "version": "7.0.0", + "hash": "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao=" }, { "pname": "System.Composition.AttributedModel", - "version": "6.0.0", - "hash": "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc=" + "version": "7.0.0", + "hash": "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM=" }, { "pname": "System.Composition.Convention", - "version": "6.0.0", - "hash": "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo=" + "version": "7.0.0", + "hash": "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk=" }, { "pname": "System.Composition.Hosting", - "version": "6.0.0", - "hash": "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4=" + "version": "7.0.0", + "hash": "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M=" }, { "pname": "System.Composition.Runtime", - "version": "6.0.0", - "hash": "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8=" + "version": "7.0.0", + "hash": "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0=" }, { "pname": "System.Composition.TypedParts", - "version": "6.0.0", - "hash": "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k=" + "version": "7.0.0", + "hash": "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s=" }, { "pname": "System.Configuration.ConfigurationManager", - "version": "6.0.0", - "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=" - }, - { - "pname": "System.Configuration.ConfigurationManager", - "version": "8.0.0", - "hash": "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE=" + "version": "9.0.0", + "hash": "sha256-+pLnTC0YDP6Kjw5DVBiFrV/Q3x5is/+6N6vAtjvhVWk=" }, { "pname": "System.Diagnostics.Debug", @@ -826,23 +751,13 @@ }, { "pname": "System.Diagnostics.EventLog", - "version": "8.0.0", - "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y=" + "version": "9.0.0", + "hash": "sha256-tPvt6yoAp56sK/fe+/ei8M65eavY2UUhRnbrREj/Ems=" }, { - "pname": "System.Drawing.Common", - "version": "6.0.0", - "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.3.0", - "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU=" - }, - { - "pname": "System.Formats.Asn1", - "version": "6.0.0", - "hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8=" + "pname": "System.Diagnostics.EventLog", + "version": "9.0.2", + "hash": "sha256-IoiQbH8To9UqzYgJzYpFbuiRV3KGU85y4ccPTyttP/w=" }, { "pname": "System.Globalization", @@ -850,29 +765,14 @@ "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" }, { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + "pname": "System.IO.Pipelines", + "version": "7.0.0", + "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY=" }, { "pname": "System.IO.Pipelines", - "version": "6.0.0", - "hash": "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA=" - }, - { - "pname": "System.IO.Pipelines", - "version": "6.0.3", - "hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck=" - }, - { - "pname": "System.Linq", - "version": "4.3.0", - "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.3.0", - "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, { "pname": "System.Memory", @@ -880,74 +780,24 @@ "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, { - "pname": "System.Memory", - "version": "4.5.4", - "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" - }, - { - "pname": "System.ObjectModel", - "version": "4.3.0", - "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + "pname": "System.Reactive", + "version": "6.0.0", + "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" }, { "pname": "System.Reactive", - "version": "5.0.0", - "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE=" + "version": "6.0.1", + "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" }, { "pname": "System.Reflection", "version": "4.3.0", "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.3.0", - "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" - }, { "pname": "System.Reflection.Metadata", - "version": "5.0.0", - "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "6.0.1", - "hash": "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.3.0", - "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" + "version": "7.0.0", + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" }, { "pname": "System.Reflection.TypeExtensions", @@ -964,11 +814,6 @@ "version": "4.3.0", "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.7.1", - "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "5.0.0", @@ -984,45 +829,20 @@ "version": "4.3.0", "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" - }, - { - "pname": "System.Security.AccessControl", - "version": "6.0.0", - "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" - }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "6.0.3", - "hash": "sha256-p5xbSMTjndPCht9HRbDp5fr1osUOaXunjDZUatualgs=" + "version": "8.0.1", + "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "6.0.0", - "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=" - }, - { - "pname": "System.Security.Cryptography.ProtectedData", - "version": "8.0.0", - "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=" + "version": "9.0.0", + "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=" }, { "pname": "System.Security.Cryptography.Xml", - "version": "6.0.1", - "hash": "sha256-spXV8cWZu0V3liek1936REtdpvS4fQwc98JvacO1oJU=" - }, - { - "pname": "System.Security.Permissions", - "version": "6.0.0", - "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" + "version": "8.0.2", + "hash": "sha256-9TCmVyMB4+By/ipU8vdYDtSnw1tkkebnXXVRdT78+28=" }, { "pname": "System.Security.Principal.Windows", @@ -1031,18 +851,13 @@ }, { "pname": "System.ServiceProcess.ServiceController", - "version": "8.0.0", - "hash": "sha256-mq/Qm8JeMUvitHf32/F8uvw1YJGx4prGnEI/VzdaFAI=" + "version": "9.0.0", + "hash": "sha256-R2tdnqpNudV9Z4BTuI2q7Yqb97ZDEOjLxBNd28HjRX8=" }, { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "4.5.1", - "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw=" + "pname": "System.ServiceProcess.ServiceController", + "version": "9.0.2", + "hash": "sha256-7H8oHNlgRX1BK5sP0bZvMhKVGznOjeTgnqiPkgXW+0g=" }, { "pname": "System.Text.Encoding.CodePages", @@ -1050,19 +865,14 @@ "hash": "sha256-YJ5jJqkVPp+6fEzSXOmw1sNSdygB5Rx7TJ0TrNS/wq4=" }, { - "pname": "System.Text.Encoding.CodePages", - "version": "6.0.0", - "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" - }, - { - "pname": "System.Text.Encodings.Web", - "version": "8.0.0", - "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" + "pname": "System.Text.Json", + "version": "7.0.3", + "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4=" }, { "pname": "System.Text.Json", - "version": "8.0.0", - "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow=" + "version": "9.0.4", + "hash": "sha256-oIOqfOIIUXXVkfFiTCI9wwIJBETQqF7ZcOJv2iYuq1s=" }, { "pname": "System.Threading", @@ -1071,27 +881,17 @@ }, { "pname": "System.Threading.Channels", - "version": "6.0.0", - "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE=" + "version": "7.0.0", + "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" - }, - { - "pname": "System.Windows.Extensions", - "version": "6.0.0", - "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=" - }, { "pname": "Tmds.DBus.Protocol", - "version": "0.15.0", - "hash": "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU=" + "version": "0.20.0", + "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" } ] diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index 131574187409..cfa6b499eaa5 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -5,26 +5,27 @@ fetchFromGitHub, dotnetCorePackages, wrapGAppsHook3, - glew, gtk3, + xorg, }: buildDotnetModule rec { pname = "libation"; - version = "11.5.5"; + version = "12.3.1"; src = fetchFromGitHub { owner = "rmcrackan"; repo = "Libation"; - rev = "v${version}"; - hash = "sha256-FD3f2Cba1xN15BloyRQ/m/vDovhN8x0AlfeJk+LGVV4="; + tag = "v${version}"; + hash = "sha256-jir1r78HbAhlOiCj6pSw0+o4V9ceCkJQWnKtt6VzLDY="; }; sourceRoot = "${src.name}/Source"; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + + dotnet-runtime = dotnetCorePackages.runtime_9_0; nugetDeps = ./deps.json; @@ -45,6 +46,9 @@ buildDotnetModule rec { runtimeDeps = [ # For Avalonia UI glew + xorg.libXrandr + xorg.libXi + xorg.libXcursor # For file dialogs gtk3 ]; @@ -53,7 +57,7 @@ buildDotnetModule rec { install -Dm644 LoadByOS/LinuxConfigApp/libation_glass.svg $out/share/icons/hicolor/scalable/apps/libation.svg install -Dm644 LoadByOS/LinuxConfigApp/Libation.desktop $out/share/applications/libation.desktop substituteInPlace $out/share/applications/libation.desktop \ - --replace-fail "/usr/bin/libation" "${meta.mainProgram}" + --replace-fail "/usr/bin/libation" "libation" ''; # wrap manually, because we need lower case executables @@ -75,10 +79,10 @@ buildDotnetModule rec { ''; meta = { - changelog = "https://github.com/rmcrackan/Libation/releases/tag/${src.rev}"; + changelog = "https://github.com/rmcrackan/Libation/releases/tag/v${version}"; description = "Audible audiobook manager"; homepage = "https://github.com/rmcrackan/Libation"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; mainProgram = "libation"; maintainers = with lib.maintainers; [ tomasajt ]; }; diff --git a/pkgs/by-name/li/libavif/package.nix b/pkgs/by-name/li/libavif/package.nix index ab244bcc28ba..b6855d280c1d 100644 --- a/pkgs/by-name/li/libavif/package.nix +++ b/pkgs/by-name/li/libavif/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, libaom, cmake, pkg-config, @@ -9,38 +10,70 @@ libpng, libjpeg, libwebp, + libxml2, dav1d, libyuv, gdk-pixbuf, makeWrapper, + gtest, }: let gdkPixbufModuleDir = "${placeholder "out"}/${gdk-pixbuf.moduleDir}"; gdkPixbufModuleFile = "${placeholder "out"}/${gdk-pixbuf.binaryDir}/avif-loaders.cache"; + + libargparse = fetchFromGitHub { + owner = "kmurray"; + repo = "libargparse"; + rev = "ee74d1b53bd680748af14e737378de57e2a0a954"; + hash = "sha256-8RzKNjnX+Bpr6keck5xQL1NdfqMGNLLOUfB+zz5Iac8="; + }; in stdenv.mkDerivation rec { pname = "libavif"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = "libavif"; rev = "v${version}"; - hash = "sha256-kop1S4A/+hP2YdgoMXP7OMVPc2eoRnHpoBrPnW6KWyM="; + hash = "sha256-cT8Q/VEJ+r971cbuZX92Gf6UX2kMOyZd4Cs2xMxS0Tw="; }; + # Adjust some tests to pass on aarch64 + # FIXME: remove in next update + patches = [ + (fetchpatch { + url = "https://github.com/AOMediaCodec/libavif/commit/1e9ef51f32fa23bd7a94d8c01d5205334bc9c52f.patch"; + hash = "sha256-4V7NpuJ+YNm103RMO47TIZaApTm3S6c5RKsjLZFNwYw="; + }) + + (fetchpatch { + url = "https://github.com/AOMediaCodec/libavif/commit/0f1618a25c5eba41b6fec947207d0a32ae3cc6c5.patch"; + hash = "sha256-ORNhD4QtHmBcOYSajnZn7QMfRC3MF4rgUin/Vw+2ztA="; + }) + ]; + + postPatch = '' + substituteInPlace contrib/gdk-pixbuf/avif.thumbnailer.in \ + --replace-fail '@CMAKE_INSTALL_FULL_BINDIR@/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-avif" + + ln -s ${libargparse} ext/libargparse + ''; + # reco: encode libaom slowest but best, decode dav1d fastest cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DAVIF_CODEC_AOM=ON" # best encoder (slow but small) - "-DAVIF_CODEC_DAV1D=ON" # best decoder (fast) - "-DAVIF_CODEC_AOM_DECODE=OFF" + "-DAVIF_CODEC_AOM=SYSTEM" # best encoder (slow but small) + "-DAVIF_CODEC_DAV1D=SYSTEM" # best decoder (fast) "-DAVIF_BUILD_APPS=ON" "-DAVIF_BUILD_GDK_PIXBUF=ON" "-DAVIF_LIBSHARPYUV=SYSTEM" + "-DAVIF_LIBXML2=SYSTEM" + "-DAVIF_BUILD_TESTS=ON" + "-DAVIF_GTEST=SYSTEM" ]; nativeBuildInputs = [ @@ -52,10 +85,12 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf + gtest zlib libpng libjpeg libwebp + libxml2 ]; propagatedBuildInputs = [ @@ -64,13 +99,10 @@ stdenv.mkDerivation rec { libyuv ]; - postPatch = '' - substituteInPlace contrib/gdk-pixbuf/avif.thumbnailer.in \ - --replace '@CMAKE_INSTALL_FULL_BINDIR@/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-avif" - ''; - env.PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = gdkPixbufModuleDir; + doCheck = true; + postInstall = '' GDK_PIXBUF_MODULEDIR=${gdkPixbufModuleDir} \ diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index f8ad9df8f55f..72ce99baa6bc 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -3,26 +3,43 @@ stdenv, cmake, fetchFromGitHub, + fetchpatch, tbb_2021_11, + useTBB ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "libblake3"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; tag = finalAttrs.version; - hash = "sha256-Krh0yVNZKL6Mb0McqWTIMNownsgM3MUEX2IP+F/fu+k="; + hash = "sha256-IABVErXWYQFXZcwsFKfQhm3ox7UZUcW5uzVrGwsSp94="; }; + patches = [ + # build(cmake): Use tbb32 pkgconfig package on 32-bit builds (BLAKE3-team/BLAKE3#482) + (fetchpatch { + url = "https://github.com/BLAKE3-team/BLAKE3/commit/dab799623310c8f4be6575002d5c681c09a0e209.patch"; + hash = "sha256-npCtM8nOFU8Tcu//IykjMs8aLU12d93+mIfKuxHkuaQ="; + relative = "c"; + }) + # build(cmake): Relax Clang frontend variant detection (BLAKE3-team/BLAKE3#477) + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/BLAKE3-team/BLAKE3/pull/477.patch"; + hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls="; + relative = "c"; + }) + ]; + sourceRoot = finalAttrs.src.name + "/c"; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals useTBB [ + propagatedBuildInputs = lib.optionals useTBB [ # 2022.0 crashes on macOS at the moment tbb_2021_11 ]; diff --git a/pkgs/by-name/li/libbluray/package.nix b/pkgs/by-name/li/libbluray/package.nix new file mode 100644 index 000000000000..9ab07b4dbfdb --- /dev/null +++ b/pkgs/by-name/li/libbluray/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + fontconfig, + autoreconfHook, + withJava ? false, + jdk17, + ant, + stripJavaArchivesHook, + withAACS ? false, + libaacs, + withBDplus ? false, + libbdplus, + withMetadata ? true, + libxml2, + withFonts ? true, + freetype, +}: + +# Info on how to use: +# https://wiki.archlinux.org/index.php/BluRay + +stdenv.mkDerivation rec { + pname = "libbluray"; + version = "1.3.4"; + + src = fetchurl { + url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-R4/9aKD13ejvbKmJt/A1taCiLFmRQuXNP/ewO76+Xys="; + }; + + nativeBuildInputs = + [ + pkg-config + autoreconfHook + ] + ++ lib.optionals withJava [ + jdk17 + ant + stripJavaArchivesHook + ]; + + buildInputs = + [ fontconfig ] ++ lib.optional withMetadata libxml2 ++ lib.optional withFonts freetype; + + propagatedBuildInputs = lib.optional withAACS libaacs; + + env.JAVA_HOME = lib.optionalString withJava jdk17.home; # Fails at runtime without this + env.NIX_LDFLAGS = + lib.optionalString withAACS "-L${libaacs}/lib -laacs" + + lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus"; + + configureFlags = + lib.optional (!withJava) "--disable-bdjava-jar" + ++ lib.optional (!withMetadata) "--without-libxml2" + ++ lib.optional (!withFonts) "--without-freetype"; + + meta = with lib; { + homepage = "http://www.videolan.org/developers/libbluray.html"; + description = "Library to access Blu-Ray disks for video playback"; + license = licenses.lgpl21; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libbraiding/package.nix b/pkgs/by-name/li/libbraiding/package.nix index 1f25d4b30f74..ebf4612acb2b 100644 --- a/pkgs/by-name/li/libbraiding/package.nix +++ b/pkgs/by-name/li/libbraiding/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { A library to compute several properties of braids, including centralizer and conjugacy check. ''; license = licenses.gpl3; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/li/libbtbb/package.nix b/pkgs/by-name/li/libbtbb/package.nix new file mode 100644 index 000000000000..4e79116c6ab3 --- /dev/null +++ b/pkgs/by-name/li/libbtbb/package.nix @@ -0,0 +1,34 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation rec { + pname = "libbtbb"; + version = "2020-12-R1"; + + src = fetchFromGitHub { + owner = "greatscottgadgets"; + repo = pname; + rev = version; + sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d"; + }; + + nativeBuildInputs = [ cmake ]; + + # https://github.com/greatscottgadgets/libbtbb/issues/63 + postPatch = '' + substituteInPlace lib/libbtbb.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + + meta = with lib; { + description = "Bluetooth baseband decoding library"; + homepage = "https://github.com/greatscottgadgets/libbtbb"; + license = licenses.gpl2; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix index 48619381acda..08f53f158f14 100644 --- a/pkgs/by-name/li/libbytesize/package.nix +++ b/pkgs/by-name/li/libbytesize/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'CDLL("libbytesize.so.1")' "CDLL('$out/lib/libbytesize.so.1')" # Force compilation of .pyc files to make them deterministic - ${python3Packages.python.interpreter} -m compileall $out/${python3Packages.python.sitePackages}/bytesize + ${python3Packages.python.pythonOnBuildForHost.interpreter} -m compileall $out/${python3Packages.python.sitePackages}/bytesize ''; pythonImportsCheck = [ "bytesize" ]; diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index b9e321fd4dcf..323d49b427c3 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -17,6 +17,7 @@ python3, python3Packages, systemd, # for libudev + libpisp, withTracing ? lib.meta.availableOn stdenv.hostPlatform lttng-ust, lttng-ust, # withTracing withQcam ? false, @@ -26,12 +27,12 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.4.0"; + version = "0.5.0"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-m55SojGt5v5AEatBZiVqQA3xP9eeRWqHa+C3JsTiErQ="; + hash = "sha256-zlMjeLlEeigzisVr7kWVrTI5gRbpJb2pZvqXNdErITQ="; }; outputs = [ @@ -85,6 +86,7 @@ stdenv.mkDerivation rec { gtest ] + ++ lib.optionals stdenv.hostPlatform.isAarch [ libpisp ] ++ lib.optionals withTracing [ lttng-ust ] ++ lib.optionals withQcam [ libtiff diff --git a/pkgs/by-name/li/libcanberra/package.nix b/pkgs/by-name/li/libcanberra/package.nix new file mode 100644 index 000000000000..524a5cb908e7 --- /dev/null +++ b/pkgs/by-name/li/libcanberra/package.nix @@ -0,0 +1,104 @@ +{ + stdenv, + lib, + fetchurl, + fetchpatch, + pkg-config, + libtool, + gtk2-x11, + gtk3-x11, + gtkSupport ? null, + libpulseaudio, + gst_all_1, + libvorbis, + libcap, + systemd, + withAlsa ? stdenv.hostPlatform.isLinux, + alsa-lib, +}: + +stdenv.mkDerivation rec { + pname = "libcanberra"; + version = "0.30"; + + src = fetchurl { + url = "http://0pointer.de/lennart/projects/libcanberra/${pname}-${version}.tar.xz"; + sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; + }; + + outputs = [ + "out" + "dev" + ]; + + strictDeps = true; + nativeBuildInputs = [ pkg-config ]; + buildInputs = + [ + libpulseaudio + libvorbis + libtool # in buildInputs rather than nativeBuildInputs since libltdl is used (not libtool itself) + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + ]) + ++ lib.optional (gtkSupport == "gtk2") gtk2-x11 + ++ lib.optional (gtkSupport == "gtk3") gtk3-x11 + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libcap + systemd + ] + ++ lib.optional withAlsa alsa-lib; + + configureFlags = + [ "--disable-oss" ] + ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"; + + patches = + [ + (fetchpatch { + name = "0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch"; + url = "http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310"; + sha256 = "0rc7zwn39yxzxp37qh329g7375r5ywcqcaak8ryd0dgvg8m5hcx9"; + }) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/5a7965dfea7727d1ceedee46c7b0ccee9cb23468/audio/libcanberra/files/patch-configure.diff"; + sha256 = "sha256-pEJy1krciUEg5BFIS8FJ4BubjfS/nt9aqi6BLnS1+4M="; + extraPrefix = ""; + }) + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/5a7965dfea7727d1ceedee46c7b0ccee9cb23468/audio/libcanberra/files/dynamic_lookup-11.patch"; + sha256 = "sha256-nUjha2pKh5VZl0ZZzcr9NTo1TVuMqF4OcLiztxW+ofQ="; + extraPrefix = ""; + }) + ]; + + postInstall = '' + for f in $out/lib/*.la; do + sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $f + done + ''; + + passthru = lib.optionalAttrs (gtkSupport != null) { + gtkModule = if gtkSupport == "gtk2" then "/lib/gtk-2.0" else "/lib/gtk-3.0/"; + }; + + meta = with lib; { + description = "Implementation of the XDG Sound Theme and Name Specifications"; + mainProgram = "canberra-gtk-play"; + longDescription = '' + libcanberra is an implementation of the XDG Sound Theme and Name + Specifications, for generating event sounds on free desktops + such as GNOME. It comes with several backends (ALSA, + PulseAudio, OSS, GStreamer, null) and is designed to be + portable. + ''; + homepage = "http://0pointer.de/lennart/projects/libcanberra/"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ RossComputerGuy ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index f87e71911629..353e12cdb455 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -27,11 +27,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.74"; + version = "2.75"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - hash = "sha256-64UnHyiTGIZEtkUc7Izpn0VBSY8W/5+Eh3wvyHJxdxQ="; + hash = "sha256-3k5+BkybpFHVI03Ubol9fHHJap6/mgxEW8BPR0LYNjI="; }; outputs = [ diff --git a/pkgs/by-name/li/libcbor/package.nix b/pkgs/by-name/li/libcbor/package.nix index 96481722474c..a38b9cafac55 100644 --- a/pkgs/by-name/li/libcbor/package.nix +++ b/pkgs/by-name/li/libcbor/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcbor"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "PJK"; repo = "libcbor"; rev = "v${finalAttrs.version}"; - hash = "sha256-N1xYkZw/6lX/nX/TE6/pVuEFgSyDiUJ50msK42NrKwI="; + hash = "sha256-13iwjc1vrTgBhWRg4vpLmlrEoxA9DSuXIOz4R9cXXEc="; }; outputs = [ @@ -35,6 +35,10 @@ stdenv.mkDerivation (finalAttrs: { cmocka # cmake expects cmocka module ]; + # BUILD file already exists in the source + # TODO: make unconditional on staging. + cmakeBuildDir = if stdenv.isDarwin then "build.dir" else null; + cmakeFlags = lib.optional finalAttrs.finalPackage.doCheck "-DWITH_TESTS=ON" ++ lib.optional (!stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/by-name/li/libcdio-paranoia/package.nix b/pkgs/by-name/li/libcdio-paranoia/package.nix new file mode 100644 index 000000000000..90a5782b3520 --- /dev/null +++ b/pkgs/by-name/li/libcdio-paranoia/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libcdio, + pkg-config, + libiconv, +}: + +stdenv.mkDerivation rec { + pname = "libcdio-paranoia"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "rocky"; + repo = "libcdio-paranoia"; + rev = "release-10.2+${version}"; + hash = "sha256-n05PSVgh6z7BFPq4CjJa5DqCO7Huj8Bsg0x3HQPsbeI="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = + [ libcdio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-ld-version-script" ]; + + meta = with lib; { + description = "CD paranoia on top of libcdio"; + longDescription = '' + This is a port of xiph.org's cdda paranoia to use libcdio for CDROM + access. By doing this, cdparanoia runs on platforms other than GNU/Linux. + ''; + homepage = "https://github.com/rocky/libcdio-paranoia"; + license = licenses.gpl3; + maintainers = [ ]; + mainProgram = "cd-paranoia"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libcdio/package.nix b/pkgs/by-name/li/libcdio/package.nix new file mode 100644 index 000000000000..94a8d43df4b4 --- /dev/null +++ b/pkgs/by-name/li/libcdio/package.nix @@ -0,0 +1,110 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + autoreconfHook, + testers, + texinfo, + libcddb, + pkg-config, + ncurses, + help2man, + libiconv, + withMan ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libcdio"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "libcdio"; + repo = "libcdio"; + tag = finalAttrs.version; + hash = "sha256-izjZk2kz9PkLm9+INUdl1e7jMz3nUsQKdplKI9Io+CM="; + }; + + env = lib.optionalAttrs stdenv.is32bit { + NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE"; + }; + + postPatch = + '' + patchShebangs . + echo " + @set UPDATED 1 January 1970 + @set UPDATED-MONTH January 1970 + @set EDITION ${finalAttrs.version} + @set VERSION ${finalAttrs.version} + " > doc/version.texi + '' + + lib.optionalString (!withMan) '' + substituteInPlace src/Makefile.am \ + --replace-fail 'man_cd_drive = cd-drive.1' "" \ + --replace-fail 'man_cd_info = cd-info.1' "" \ + --replace-fail 'man_cd_read = cd-read.1' "" \ + --replace-fail 'man_iso_info = iso-info.1' "" \ + --replace-fail 'man_iso_read = iso-read.1' "" + ''; + + configureFlags = [ + (lib.enableFeature withMan "maintainer-mode") + ]; + + nativeBuildInputs = + [ + pkg-config + autoreconfHook + texinfo + ] + ++ lib.optionals withMan [ + help2man + ]; + + buildInputs = [ + libcddb + libiconv + ncurses + ]; + + enableParallelBuilding = true; + + doCheck = !stdenv.hostPlatform.isDarwin; + + outputs = + [ + "out" + "lib" + "dev" + "info" + ] + ++ lib.optionals withMan [ + "man" + ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Library for OS-independent CD-ROM and CD image access"; + longDescription = '' + GNU libcdio is a library for OS-independent CD-ROM and + CD image access. It includes a library for working with + ISO-9660 filesystems (libiso9660), as well as utility + programs such as an audio CD player and an extractor. + ''; + homepage = "https://www.gnu.org/software/libcdio/"; + license = lib.licenses.gpl2Plus; + pkgConfigModules = [ + "libcdio" + "libcdio++" + "libiso9660" + "libiso9660++" + "libudf" + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/libcerf/package.nix b/pkgs/by-name/li/libcerf/package.nix index cd02eee33e70..4e34cc1a1a6a 100644 --- a/pkgs/by-name/li/libcerf/package.nix +++ b/pkgs/by-name/li/libcerf/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libcerf"; - version = "2.4"; + version = "3.0"; src = fetchurl { url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz"; - sha256 = "sha256-CAswrlZMPavjuJJkUira9WR+x1QCFXK+5UkpaXsnbNw="; + sha256 = "sha256-xhCPvaia839YgRnAxUK2wegkhFo2vqL6MfftLMGiRts="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libcgroup/package.nix b/pkgs/by-name/li/libcgroup/package.nix index a796c9f5b9f0..69f2238df1b8 100644 --- a/pkgs/by-name/li/libcgroup/package.nix +++ b/pkgs/by-name/li/libcgroup/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "libcgroup"; - version = "3.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "libcgroup"; repo = "libcgroup"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-CnejQcOyW3QzHuvsAdKe4M4XgmG9ufRaEBdO48+8ZqQ="; + hash = "sha256-kWW9ID/eYZH0O/Ge8pf3Cso4yu644R5EiQFYfZMcizs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libchamplain/package.nix b/pkgs/by-name/li/libchamplain/package.nix index fee33071d439..cef91831f668 100644 --- a/pkgs/by-name/li/libchamplain/package.nix +++ b/pkgs/by-name/li/libchamplain/package.nix @@ -88,7 +88,10 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - maintainers = teams.gnome.members ++ teams.pantheon.members; + teams = [ + teams.gnome + teams.pantheon + ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix index edc6b40d7f04..a7d80e3a8a08 100644 --- a/pkgs/by-name/li/libchewing/package.nix +++ b/pkgs/by-name/li/libchewing/package.nix @@ -4,32 +4,52 @@ fetchFromGitHub, cmake, sqlite, + corrosion, + rustPlatform, + cargo, + rustc, }: stdenv.mkDerivation (finalAttrs: { pname = "libchewing"; - version = "0.6.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "chewing"; repo = "libchewing"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-X+4Rr5Mfc4qeJxmHczu4MKgHBvQN1rhqUrJSx8SFnDk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5aeAsvTiUMTm+ibNfJI57rzSUpJB7luhA/aWmTcnBj4="; }; - buildInputs = [ sqlite ]; + # ld: unknown option: -version-script + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace-fail "if(CMAKE_C_COMPILER_ID MATCHES GNU|^Clang)" "if((CMAKE_C_COMPILER_ID MATCHES GNU|^Clang) AND NOT APPLE)" + ''; - nativeBuildInputs = [ cmake ]; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + hash = "sha256-LTuUhQ0ZeyGloNvVs+6OGjFvPdBsQNZupwC8QTjUfyk="; + }; - meta = with lib; { + nativeBuildInputs = [ + cmake + rustPlatform.cargoSetupHook + cargo + rustc + ]; + + buildInputs = [ + sqlite + corrosion + ]; + + meta = { description = "Intelligent Chinese phonetic input method"; homepage = "https://chewing.im/"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ - ericsagnes - ShamrockLee - ]; - platforms = platforms.all; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ ShamrockLee ]; + platforms = lib.platforms.all; # compile time tools init_database, dump_database are built for host broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; diff --git a/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch b/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch deleted file mode 100644 index f5a016f63ac3..000000000000 --- a/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 86fd3be1d31d2e7c09603aa3a8966537ac01bb07 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Tue, 11 Aug 2020 20:30:16 +0200 -Subject: [PATCH] Fix RPC compilation when using libtirpc rather than glibc - ---- - src/block-server.c | 3 +++ - utils/chop-block-server.c | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/src/block-server.c b/src/block-server.c -index 3f97417..29b299e 100644 ---- a/src/block-server.c -+++ b/src/block-server.c -@@ -18,6 +18,9 @@ - - /* Server-side stubs. */ - -+#include -+#include -+#include - #include - #include - -diff --git a/utils/chop-block-server.c b/utils/chop-block-server.c -index a2076c0..9462f5d 100644 ---- a/utils/chop-block-server.c -+++ b/utils/chop-block-server.c -@@ -19,6 +19,9 @@ - store, e.g. a GDBM block store, and serves it remotely. A lot of code is - borrowed from `chop-archiver.c'. */ - -+#include -+#include -+#include - #include - - #include --- -2.25.4 - diff --git a/pkgs/by-name/li/libchop/gets-undeclared.patch b/pkgs/by-name/li/libchop/gets-undeclared.patch deleted file mode 100644 index b6cdc77caa84..000000000000 --- a/pkgs/by-name/li/libchop/gets-undeclared.patch +++ /dev/null @@ -1,71 +0,0 @@ -This patch is needed to allow builds with newer versions of -the GNU libc (2.16+). - - -commit 66712c23388e93e5c518ebc8515140fa0c807348 -Author: Eric Blake -Date: Thu Mar 29 13:30:41 2012 -0600 - - stdio: don't assume gets any more - - Gnulib intentionally does not have a gets module, and now that C11 - and glibc have dropped it, we should be more proactive about warning - any user on a platform that still has a declaration of this dangerous - interface. - - * m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets - support. - * modules/stdio (Makefile.am): Likewise. - * lib/stdio-read.c (gets): Likewise. - * tests/test-stdio-c++.cc: Likewise. - * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment. - * lib/stdio.in.h (gets): Make warning occur in more places. - * doc/posix-functions/gets.texi (gets): Update documentation. - Reported by Christer Solskogen. - - Signed-off-by: Eric Blake - -diff --git a/lib/stdio.in.h b/lib/stdio.in.h -index aa7b599..c377b6e 100644 ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - -@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " - # endif - #endif - --/* Some people would argue that sprintf should be handled like gets -- (for example, OpenBSD issues a link warning for both functions), -- since both can cause security holes due to buffer overruns. -+/* Some people would argue that all sprintf uses should be warned about -+ (for example, OpenBSD issues a link warning for it), -+ since it can cause security holes due to buffer overruns. - However, we believe that sprintf can be used safely, and is more - efficient than snprintf in those safe cases; and as proof of our - belief, we use sprintf in several gnulib modules. So this header diff --git a/pkgs/by-name/li/libchop/package.nix b/pkgs/by-name/li/libchop/package.nix deleted file mode 100644 index 83d064ef08fb..000000000000 --- a/pkgs/by-name/li/libchop/package.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - fetchurl, - lib, - stdenv, - zlib, - bzip2, - libgcrypt, - gdbm, - gperf, - tdb, - gnutls, - db, - libuuid, - lzo, - pkg-config, - guile, - rpcsvc-proto, - libtirpc, -}: - -stdenv.mkDerivation rec { - pname = "libchop"; - version = "0.5.2"; - - src = fetchurl { - url = "mirror://savannah/libchop/libchop-${version}.tar.gz"; - sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"; - }; - - patches = [ - ./gets-undeclared.patch - ./size_t.patch - ./0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch - ]; - - nativeBuildInputs = [ - pkg-config - gperf - rpcsvc-proto - ]; - - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; - NIX_LDFLAGS = [ "-ltirpc" ]; - - buildInputs = [ - zlib - bzip2 - lzo - libgcrypt - gdbm - db - tdb - gnutls - libuuid - guile - libtirpc - ]; - - doCheck = false; - - preConfigure = '' - sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.* - ''; - - meta = with lib; { - description = "Tools & library for data backup and distributed storage"; - - longDescription = '' - Libchop is a set of utilities and library for data backup and - distributed storage. Its main application is chop-backup, an - encrypted backup program that supports data integrity checks, - versioning at little cost, distribution among several sites, - selective sharing of stored data, adaptive compression, and more. - The library itself, which chop-backup builds upon, implements - storage techniques such as content-based addressing, content hash - keys, Merkle trees, similarity detection, and lossless compression. - It makes it easy to combine them in different ways. The - ‘chop-archiver’ and ‘chop-block-server’ tools, illustrated in the - manual, provide direct access to these facilities from the command - line. It is written in C and has Guile (Scheme) bindings. - ''; - - homepage = "https://www.nongnu.org/libchop/"; - license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = platforms.gnu ++ platforms.linux; - }; -} diff --git a/pkgs/by-name/li/libchop/size_t.patch b/pkgs/by-name/li/libchop/size_t.patch deleted file mode 100644 index 82b6cb995ef3..000000000000 --- a/pkgs/by-name/li/libchop/size_t.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/chop.c -+++ b/src/chop.c -@@ -539,7 +539,7 @@ extern const chop_class_t chop_gdbm_bloc - chop_qdbm_block_iterator_class; - - const struct chop_class_entry * --chop_lookup_class_entry (const char *str, unsigned int len); -+chop_lookup_class_entry (const char *str, size_t len); - - /* Include the gperf-generated perfect hash table. */ - #include "class-lookup.c" diff --git a/pkgs/by-name/li/libcifpp/package.nix b/pkgs/by-name/li/libcifpp/package.nix index 6e1385feaa09..2b7eab77f104 100644 --- a/pkgs/by-name/li/libcifpp/package.nix +++ b/pkgs/by-name/li/libcifpp/package.nix @@ -10,18 +10,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "7.0.9"; + version = "8.0.0"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-wV4YvQmtpbj+mOiMeSr9gBpZzFPygkAOkj74vv4pA4U="; + hash = "sha256-t1ovrrKu+QSSdwgTp2Nag4SsAJeU9aRizJccd+u+dVI="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ # disable network access @@ -39,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/libcifpp ''; - meta = with lib; { + meta = { description = "Manipulate mmCIF and PDB files"; homepage = "https://github.com/PDB-REDO/libcifpp"; changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/v${finalAttrs.version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ natsukium ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/libclipboard/package.nix b/pkgs/by-name/li/libclipboard/package.nix index e0eb69704199..122cbb651ab9 100644 --- a/pkgs/by-name/li/libclipboard/package.nix +++ b/pkgs/by-name/li/libclipboard/package.nix @@ -6,7 +6,6 @@ libxcb, libXau, libXdmcp, - darwin, lib, }: @@ -25,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb libXau libXdmcp - ] ++ lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ]; nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/li/libcmatrix/package.nix b/pkgs/by-name/li/libcmatrix/package.nix index 4994dfe8697d..2356e3936073 100644 --- a/pkgs/by-name/li/libcmatrix/package.nix +++ b/pkgs/by-name/li/libcmatrix/package.nix @@ -6,6 +6,7 @@ libgcrypt, libsecret, libsoup_3, + cmake, meson, ninja, olm, @@ -30,6 +31,8 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config + + cmake # used by meson to find olm ]; buildInputs = [ @@ -42,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: { sqlite ]; + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # 0u is not a valid version number on darwin + substituteInPlace src/meson.build --replace-fail "soversion: '0u'," "soversion: '0'," + ''; + meta = { changelog = "https://source.puri.sm/Librem5/libcmatrix/-/blob/${finalAttrs.src.tag}/NEWS"; description = "Matrix protocol library written in C using GObject"; diff --git a/pkgs/by-name/li/libconfig/package.nix b/pkgs/by-name/li/libconfig/package.nix index 409a25de5483..97a81eb7456b 100644 --- a/pkgs/by-name/li/libconfig/package.nix +++ b/pkgs/by-name/li/libconfig/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, # This also disables building tests. # on static windows cross-compile they fail to build doCheck ? with stdenv.hostPlatform; !(isWindows && isStatic), @@ -9,13 +10,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "libconfig"; - version = "1.7.3"; + version = "1.8"; src = fetchurl { url = "https://hyperrealm.github.io/${finalAttrs.pname}/dist/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc="; + hash = "sha256-BR4V3Q6QfESQXzF5M/VIcxTypW6MZybIMEzpkIhIUKo="; }; + patches = [ + # Fix tests on i686-linux: + # https://github.com/hyperrealm/libconfig/pull/260 + # TODO: remove with a next release + (fetchpatch { + name = "32-bit-tests.patch"; + url = "https://github.com/hyperrealm/libconfig/commit/b90c45a18110fcca415d00a98ff79c908c42544b.patch"; + hash = "sha256-8CihXbpKx0Rn0CFxyP6+f6m8vUYehCl/1EtTo98VpfM="; + }) + ]; + inherit doCheck; configureFlags = diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix index 6bd2012495cf..549c628c870d 100644 --- a/pkgs/by-name/li/libcosmicAppHook/package.nix +++ b/pkgs/by-name/li/libcosmicAppHook/package.nix @@ -76,10 +76,6 @@ makeSetupHook { meta = { description = "Setup hook for configuring and wrapping applications based on libcosmic"; - maintainers = with lib.maintainers; [ - HeitorAugustoLN - nyabinary - thefossguy - ]; + teams = [ lib.teams.cosmic ]; }; } ./libcosmic-app-hook.sh diff --git a/pkgs/by-name/li/libdatovka/package.nix b/pkgs/by-name/li/libdatovka/package.nix index 3f7bbef3c1a8..ab55e106dd7f 100644 --- a/pkgs/by-name/li/libdatovka/package.nix +++ b/pkgs/by-name/li/libdatovka/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "libdatovka"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz"; - sha256 = "sha256-D/4+ldVnJrPAPrgrV1V4FfgCzgMbw/f/rxWT7Esf8Wk="; + sha256 = "sha256-qVbSxPLYe+PjGwRH2U/V2Ku2X1fRPbDOUjFamCsYVgY="; }; patches = [ diff --git a/pkgs/by-name/li/libdazzle/package.nix b/pkgs/by-name/li/libdazzle/package.nix index 7c5496653214..484d2968752f 100644 --- a/pkgs/by-name/li/libdazzle/package.nix +++ b/pkgs/by-name/li/libdazzle/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gitlab.gnome.org/GNOME/libdazzle"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/li/libdc1394/package.nix b/pkgs/by-name/li/libdc1394/package.nix new file mode 100644 index 000000000000..49a4d14e63a6 --- /dev/null +++ b/pkgs/by-name/li/libdc1394/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenv, + fetchurl, + libraw1394, + libusb1, +}: + +stdenv.mkDerivation rec { + pname = "libdc1394"; + version = "2.2.7"; + + src = fetchurl { + url = "mirror://sourceforge/libdc1394/${pname}-${version}.tar.gz"; + sha256 = "sha256-U3zreN087ycaGD9KF2GR0c7PhfAlUg5r03WLDhnmYJ8="; + }; + + hardeningDisable = [ + # "sorry, unimplemented: __builtin_clear_padding not supported for variable length aggregates" + "trivialautovarinit" + ]; + + buildInputs = [ libusb1 ] ++ lib.optional stdenv.hostPlatform.isLinux libraw1394; + + meta = with lib; { + description = "Capture and control API for IIDC compliant cameras"; + homepage = "https://sourceforge.net/projects/libdc1394/"; + license = licenses.lgpl21Plus; + maintainers = [ ]; + mainProgram = "dc1394_reset_bus"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/by-name/li/libdeflate/package.nix similarity index 100% rename from pkgs/development/libraries/libdeflate/default.nix rename to pkgs/by-name/li/libdeflate/package.nix diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index fce99820962a..affb889faf1b 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -15,19 +15,18 @@ sqlcipher, sqlite, fixDarwinDylibNames, - darwin, libiconv, }: stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.158.0"; + version = "1.159.5"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-0po4nPCunq9cBaVFSsS1uo18dv6Y6IHGzL1zC2zwXdI="; + hash = "sha256-qooN7XRWFqR/bVPAQ8e7KOYNnBD9E70uAesaLUUeXXs="; }; patches = [ @@ -37,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-k8TN6YtCVPR8RnFoiGX9APvKwpQzj7T53DlKMD9r/e0="; + hash = "sha256-TmizhgXMYX0hn4GnsL1QiSyMdahebh0QFbk/cOA48jg="; }; nativeBuildInputs = @@ -59,9 +58,6 @@ stdenv.mkDerivation rec { sqlite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; diff --git a/pkgs/by-name/li/libdex/package.nix b/pkgs/by-name/li/libdex/package.nix index 96387af9f9fc..a7a060d9dc6d 100644 --- a/pkgs/by-name/li/libdex/package.nix +++ b/pkgs/by-name/li/libdex/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdex"; - version = "0.8.1"; + version = "0.10.0"; outputs = [ "out" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz"; - hash = "sha256-lVR1rT5Dqr1vb3BDUmS17ne9JlvZVUUhH+4CawjTeKA="; + hash = "sha256-mKaWJqp2Rq1FW+p6f5LSof+kfkVZoVShv+mMFvpxHuE="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library supporting deferred execution for GNOME and GTK"; homepage = "https://gitlab.gnome.org/GNOME/libdex"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21Plus; }; diff --git a/pkgs/by-name/li/libdict/package.nix b/pkgs/by-name/li/libdict/package.nix index 3548d65073ef..99297ce3283a 100644 --- a/pkgs/by-name/li/libdict/package.nix +++ b/pkgs/by-name/li/libdict/package.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/rtbrick/libdict/releases/tag/${finalAttrs.version}"; description = "C library of key-value data structures"; license = licenses.bsd2; - maintainers = teams.wdz.members; + teams = [ teams.wdz ]; }; }) diff --git a/pkgs/by-name/li/libdiscid/package.nix b/pkgs/by-name/li/libdiscid/package.nix index e863863fe6f1..3be92789614b 100644 --- a/pkgs/by-name/li/libdiscid/package.nix +++ b/pkgs/by-name/li/libdiscid/package.nix @@ -4,7 +4,6 @@ fetchurl, cmake, pkg-config, - darwin, }: stdenv.mkDerivation rec { @@ -16,8 +15,6 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; - src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-3V6PHJrq1ELiO3SanMkzY3LmLoitcHmitiiVsDkMsoI="; diff --git a/pkgs/by-name/li/libdjinterop/package.nix b/pkgs/by-name/li/libdjinterop/package.nix index 0b514a34a209..c5a6c7d76f78 100644 --- a/pkgs/by-name/li/libdjinterop/package.nix +++ b/pkgs/by-name/li/libdjinterop/package.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "xsco"; repo = "libdjinterop"; - rev = "0.22.1"; - hash = "sha256-x0GbuUDmx8ooiaD/8J5VvIG239d5uDdK5H1tnwHd62c="; + rev = "0.24.3"; + hash = "sha256-Fp7AwEOq2JOpL60GDAXmA15ptFeLoG79nnnPXHl1Hjw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libdmapsharing/package.nix b/pkgs/by-name/li/libdmapsharing/package.nix index 47b02a65e083..0c6812211f9c 100644 --- a/pkgs/by-name/li/libdmapsharing/package.nix +++ b/pkgs/by-name/li/libdmapsharing/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.flyn.org/projects/libdmapsharing/"; description = "Library that implements the DMAP family of protocols"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/li/libdmtx/package.nix b/pkgs/by-name/li/libdmtx/package.nix index fca4825a8b5a..62d1c3e05b44 100644 --- a/pkgs/by-name/li/libdmtx/package.nix +++ b/pkgs/by-name/li/libdmtx/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libdmtx"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "dmtx"; repo = "libdmtx"; rev = "v${version}"; - sha256 = "sha256-UQy8iFfl8BNT5cBUMVF1tIScFPfHekSofaebtel9JWk="; + sha256 = "sha256-/sV+t7RAr5dTwfUsGz0KEZYgm0DzQWRdiwrbbEbC1OY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libdvdcss/package.nix b/pkgs/by-name/li/libdvdcss/package.nix new file mode 100644 index 000000000000..bd0db914c25a --- /dev/null +++ b/pkgs/by-name/li/libdvdcss/package.nix @@ -0,0 +1,22 @@ +{ + lib, + stdenv, + fetchurl, +}: + +stdenv.mkDerivation rec { + pname = "libdvdcss"; + version = "1.4.3"; + + src = fetchurl { + url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2"; + sha256 = "sha256-IzzJL13AHF06lvWzWCvn1c7lo1pS06CBWHRdPYYHAHk="; + }; + + meta = with lib; { + homepage = "http://www.videolan.org/developers/libdvdcss.html"; + description = "Library for decrypting DVDs"; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libdwarf-lite/package.nix b/pkgs/by-name/li/libdwarf-lite/package.nix index 3d5df9741cac..7091ac3f9730 100644 --- a/pkgs/by-name/li/libdwarf-lite/package.nix +++ b/pkgs/by-name/li/libdwarf-lite/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libdwarf-lite"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "jeremy-rifkin"; repo = "libdwarf-lite"; rev = "v${finalAttrs.version}"; - hash = "sha256-qHikjAG5xuuHquqqKGuiDHXVZSlg/MbNp9JNSAKM/Hs="; + hash = "sha256-/E0aUVEhEy1v4wm2/t5wLck93Xb/RrKMIwqFYpi6BLA="; }; outputs = [ diff --git a/pkgs/by-name/li/libeduvpn-common/package.nix b/pkgs/by-name/li/libeduvpn-common/package.nix index 0b052cd5c3d4..a511858b0a5b 100644 --- a/pkgs/by-name/li/libeduvpn-common/package.nix +++ b/pkgs/by-name/li/libeduvpn-common/package.nix @@ -6,11 +6,11 @@ buildGoModule rec { pname = "libeduvpn-common"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://github.com/eduvpn/eduvpn-common/releases/download/${version}/eduvpn-common-${version}.tar.xz"; - hash = "sha256-OgcinEeKMDtZj3Tw+7cMsF385ZZTBR/J5dqIihDTlj8="; + url = "https://codeberg.org/eduVPN/eduvpn-common/releases/download/${version}/eduvpn-common-${version}.tar.xz"; + hash = "sha256-aQpOoY3rDF9DeQ/8tRYdBs4s2IdwAe62y9KfXPMsb4k="; }; vendorHash = null; diff --git a/pkgs/by-name/li/libei/package.nix b/pkgs/by-name/li/libei/package.nix index 9dc3f0df4f30..9b5bacf2b78f 100644 --- a/pkgs/by-name/li/libei/package.nix +++ b/pkgs/by-name/li/libei/package.nix @@ -23,14 +23,14 @@ let in stdenv.mkDerivation rec { pname = "libei"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libinput"; repo = "libei"; rev = version; - hash = "sha256-lSrIC93Cke90/Xc8dqd3e/TU32tflYHYqc5fE8wglBI="; + hash = "sha256-DoPQaTry1uzu6sM/wWEl4xeGq3h3BuMDeVYusHge6AI="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libepoxy/libgl-path.patch b/pkgs/by-name/li/libepoxy/libgl-path.patch similarity index 100% rename from pkgs/development/libraries/libepoxy/libgl-path.patch rename to pkgs/by-name/li/libepoxy/libgl-path.patch diff --git a/pkgs/by-name/li/libepoxy/package.nix b/pkgs/by-name/li/libepoxy/package.nix new file mode 100644 index 000000000000..236b97dd0511 --- /dev/null +++ b/pkgs/by-name/li/libepoxy/package.nix @@ -0,0 +1,93 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + utilmacros, + python3, + libGL, + libX11, + x11Support ? !stdenv.hostPlatform.isDarwin, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libepoxy"; + version = "1.5.10"; + + src = + with finalAttrs; + fetchFromGitHub { + owner = "anholt"; + repo = pname; + rev = version; + sha256 = "sha256-gZiyPOW2PeTMILcPiUTqPUGRNlMM5mI1z9563v4SgEs="; + }; + + patches = [ ./libgl-path.patch ]; + + postPatch = + '' + patchShebangs src/*.py + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace src/dispatch_common.h --replace-fail "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.hostPlatform.isDarwin '' + substituteInPlace test/meson.build \ + --replace-fail "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" \ + --replace-fail "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" + ''; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + utilmacros + python3 + ]; + + propagatedBuildInputs = + lib.optionals (x11Support && !stdenv.hostPlatform.isDarwin) [ + libGL + ] + ++ lib.optionals x11Support [ + libX11 + ]; + + mesonFlags = [ + "-Degl=${if (x11Support && !stdenv.hostPlatform.isDarwin) then "yes" else "no"}" + "-Dglx=${if x11Support then "yes" else "no"}" + "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" + "-Dx11=${lib.boolToString x11Support}" + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + x11Support && !stdenv.hostPlatform.isDarwin + ) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; + + doCheck = true; + + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + + meta = with lib; { + description = "Library for handling OpenGL function pointer management"; + homepage = "https://github.com/anholt/libepoxy"; + license = licenses.mit; + maintainers = [ ]; + platforms = platforms.unix; + pkgConfigModules = [ "epoxy" ]; + }; +}) diff --git a/pkgs/by-name/li/liberasurecode/package.nix b/pkgs/by-name/li/liberasurecode/package.nix index 058e3e155ab8..a14112705e8c 100644 --- a/pkgs/by-name/li/liberasurecode/package.nix +++ b/pkgs/by-name/li/liberasurecode/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Erasure Code API library written in C with pluggable Erasure Code backends"; homepage = "https://github.com/openstack/liberasurecode"; license = licenses.bsd2; - maintainers = teams.openstack.members; + teams = [ teams.openstack ]; pkgConfigModules = [ "erasurecode-1" ]; }; }) diff --git a/pkgs/by-name/li/libevdev/package.nix b/pkgs/by-name/li/libevdev/package.nix index 5d56ee62fe64..dab1e65b1508 100644 --- a/pkgs/by-name/li/libevdev/package.nix +++ b/pkgs/by-name/li/libevdev/package.nix @@ -2,19 +2,23 @@ lib, stdenv, fetchurl, + pkg-config, python3, }: stdenv.mkDerivation rec { pname = "libevdev"; - version = "1.13.3"; + version = "1.13.4"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-q/GqzoYgjuvdXTVQ/97UyNc7tAW3ltUcOJydBgTLz78="; + hash = "sha256-8Aq41CrYuQUpb6tn4TuHHxpCSDkzFRZkIQD4KtiBJ80="; }; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ + pkg-config + python3 + ]; meta = with lib; { description = "Wrapper library for evdev devices"; diff --git a/pkgs/by-name/li/libfakeXinerama/package.nix b/pkgs/by-name/li/libfakeXinerama/package.nix new file mode 100644 index 000000000000..51f16727c4ec --- /dev/null +++ b/pkgs/by-name/li/libfakeXinerama/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchurl, + libX11, + libXinerama, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libfakeXinerama"; + version = "0.1.0"; + + src = fetchurl { + url = "https://www.xpra.org/src/libfakeXinerama-${finalAttrs.version}.tar.bz2"; + sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx"; + }; + + buildInputs = [ + libX11 + libXinerama + ]; + + buildPhase = '' + runHook preBuild + + $CC -O2 -Wall fakeXinerama.c -fPIC -o libfakeXinerama.so.1.0 -shared + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm555 libfakeXinerama.so.1.0 -t "$out/lib" + ln -s libfakeXinerama.so.1.0 "$out/lib/libXinerama.so.1.0" + ln -s libXinerama.so.1.0 "$out/lib/libXinerama.so.1" + ln -s libXinerama.so.1 "$out/lib/libXinerama.so" + + runHook postInstall + ''; + + meta = { + homepage = "http://xpra.org/"; + description = "fakeXinerama for Xpra"; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nickcao ]; + license = lib.licenses.mit; + }; +}) diff --git a/pkgs/by-name/li/libfilezilla/package.nix b/pkgs/by-name/li/libfilezilla/package.nix new file mode 100644 index 000000000000..d295921204dc --- /dev/null +++ b/pkgs/by-name/li/libfilezilla/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchsvn, + autoreconfHook, + gettext, + gnutls, + nettle, + pkg-config, + libiconv, + libxcrypt, +}: + +stdenv.mkDerivation { + pname = "libfilezilla"; + version = "0.49.0"; + + src = fetchsvn { + url = "https://svn.filezilla-project.org/svn/libfilezilla/trunk"; + rev = "11192"; + hash = "sha256-fm1cenGwYcPz0TtMzbPXrZA7nAzwo8toBNA9cW2Gnh0="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = + [ + gettext + gnutls + nettle + libxcrypt + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://lib.filezilla-project.org/"; + description = "Modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pSub ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libfpx/package.nix b/pkgs/by-name/li/libfpx/package.nix deleted file mode 100644 index 08851aa47759..000000000000 --- a/pkgs/by-name/li/libfpx/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, -}: - -stdenv.mkDerivation rec { - pname = "libfpx"; - version = "1.3.1-7"; - - src = fetchurl { - url = "mirror://imagemagick/delegates/${pname}-${version}.tar.xz"; - sha256 = "1s28mwb06w6dj0zl6ashpj8m1qiyadawzl7cvbw7dmj1w39ipghh"; - }; - - # Darwin gets misdetected as Windows without this - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D__unix"; - - patches = [ - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01"; - sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p"; - }) - # Pull upstream fix for -fno-common: - # https://github.com/ImageMagick/libfpx/pull/1 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch"; - sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9"; - }) - # fix clang build: remove register keyword - # remove on next update - (fetchpatch { - name = "remove-register-keyword.patch"; - url = "https://github.com/ImageMagick/libfpx/commit/5f340b0a490450b40302cc9948c7dfac60d40041.patch"; - hash = "sha256-6m9MFb1eWGK5cMvPmTu7uh3Pac65r2HPB8wJ8xc1O5o="; - }) - ]; - - meta = with lib; { - homepage = "http://www.imagemagick.org"; - description = "Library for manipulating FlashPIX images"; - license = "Flashpix"; - platforms = platforms.all; - }; -} diff --git a/pkgs/by-name/li/libfreeaptx/package.nix b/pkgs/by-name/li/libfreeaptx/package.nix index 3c7291f060e7..0780ba270cbb 100644 --- a/pkgs/by-name/li/libfreeaptx/package.nix +++ b/pkgs/by-name/li/libfreeaptx/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libfreeaptx"; - version = "0.1.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "iamthehorker"; repo = pname; rev = version; - sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo="; + sha256 = "sha256-ntbF0jz/ilOk45xMQxx00WJtJq4Wb7VyKE0eKvghYnY="; }; outputs = [ diff --git a/pkgs/by-name/li/libfreefare/package.nix b/pkgs/by-name/li/libfreefare/package.nix index 8aa06f577a95..247fa1607940 100644 --- a/pkgs/by-name/li/libfreefare/package.nix +++ b/pkgs/by-name/li/libfreefare/package.nix @@ -6,7 +6,6 @@ pkg-config, libnfc, openssl, - darwin, }: stdenv.mkDerivation { @@ -22,15 +21,10 @@ stdenv.mkDerivation { autoreconfHook pkg-config ]; - buildInputs = - [ - libnfc - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - darwin.apple_sdk - ]; + buildInputs = [ + libnfc + openssl + ]; env = { NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/by-name/li/libftdi/package.nix b/pkgs/by-name/li/libftdi/package.nix new file mode 100644 index 000000000000..67e119c811be --- /dev/null +++ b/pkgs/by-name/li/libftdi/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchurl, + libusb-compat-0_1, +}: + +stdenv.mkDerivation rec { + pname = "libftdi"; + version = "0.20"; + + src = fetchurl { + url = "https://www.intra2net.com/en/developer/libftdi/download/${pname}-${version}.tar.gz"; + sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; + }; + + buildInputs = [ libusb-compat-0_1 ]; + + propagatedBuildInputs = [ libusb-compat-0_1 ]; + + configureFlags = [ + "ac_cv_prog_HAVELIBUSB=${lib.getExe' (lib.getDev libusb-compat-0_1) "libusb-config"}" + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "--with-async-mode"; + + # allow async mode. from ubuntu. see: + # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff + patchPhase = '' + substituteInPlace ./src/ftdi.c \ + --replace "ifdef USB_CLASS_PTP" "if 0" + ''; + + # remove forbidden references to $TMPDIR + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + for f in "$out"/bin/*; do + if isELF "$f"; then + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" + fi + done + ''; + + meta = { + description = "Library to talk to FTDI chips using libusb"; + homepage = "https://www.intra2net.com/en/developer/libftdi/"; + license = lib.licenses.lgpl21; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/li/libgadu/package.nix b/pkgs/by-name/li/libgadu/package.nix deleted file mode 100644 index 32cb229b441b..000000000000 --- a/pkgs/by-name/li/libgadu/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - zlib, - protobufc, - autoreconfHook, -}: - -stdenv.mkDerivation rec { - pname = "libgadu"; - version = "1.12.2"; - - src = fetchFromGitHub { - owner = "wojtekka"; - repo = pname; - rev = version; - sha256 = "1s16cripy5w9k12534qb012iwc5m9qcjyrywgsziyn3kl3i0aa8h"; - }; - - propagatedBuildInputs = [ zlib ]; - buildInputs = [ protobufc ]; - nativeBuildInputs = [ autoreconfHook ]; - - meta = { - description = "Library to deal with gadu-gadu protocol (most popular polish IM protocol)"; - homepage = "https://libgadu.net/index.en.html"; - platforms = lib.platforms.linux; - license = lib.licenses.lgpl21; - }; - -} diff --git a/pkgs/by-name/li/libgdata/package.nix b/pkgs/by-name/li/libgdata/package.nix index b3ce0ce8aab6..6d22a15c6359 100644 --- a/pkgs/by-name/li/libgdata/package.nix +++ b/pkgs/by-name/li/libgdata/package.nix @@ -85,7 +85,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GData API library"; homepage = "https://gitlab.gnome.org/GNOME/libgdata"; - maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; + maintainers = with maintainers; [ raskin ]; + teams = [ teams.gnome ]; platforms = platforms.linux; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/libraries/libgdiplus/configure-pkg-config.patch b/pkgs/by-name/li/libgdiplus/configure-pkg-config.patch similarity index 100% rename from pkgs/development/libraries/libgdiplus/configure-pkg-config.patch rename to pkgs/by-name/li/libgdiplus/configure-pkg-config.patch diff --git a/pkgs/by-name/li/libgdiplus/package.nix b/pkgs/by-name/li/libgdiplus/package.nix new file mode 100644 index 000000000000..4e98f25e1f79 --- /dev/null +++ b/pkgs/by-name/li/libgdiplus/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchzip, + pkg-config, + glib, + cairo, + fontconfig, + libtiff, + giflib, + libjpeg, + libpng, + libXrender, + libexif, + autoreconfHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libgdiplus"; + version = "6.1"; + + # Using source archive to avoid fetching Git submodules. + # Git repo: https://github.com/mono/libgdiplus + src = fetchzip { + url = "https://download.mono-project.com/sources/libgdiplus/libgdiplus-${finalAttrs.version}.tar.gz"; + hash = "sha256-+lP9ETlw3s0RUliQT1uBWZ2j6o3V9EECBQSppOYFq4Q="; + }; + + patches = [ + # Fix pkg-config lookup when cross-compiling. + ./configure-pkg-config.patch + ]; + + NIX_LDFLAGS = "-lgif"; + + outputs = [ + "out" + "dev" + ]; + + hardeningDisable = [ "format" ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + configureFlags = lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; + + enableParallelBuilding = true; + + buildInputs = [ + glib + cairo + fontconfig + libtiff + giflib + libjpeg + libpng + libXrender + libexif + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so + ''; + + checkPhase = '' + make check -w + ''; + + meta = with lib; { + description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems"; + homepage = "https://www.mono-project.com/docs/gui/libgdiplus/"; + platforms = platforms.unix; + license = licenses.mit; + }; +}) diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix index e1572fed66a0..4177af865e1d 100644 --- a/pkgs/by-name/li/libgedit-gfls/package.nix +++ b/pkgs/by-name/li/libgedit-gfls/package.nix @@ -11,11 +11,12 @@ mesonEmulatorHook, gtk3, glib, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gfls"; - version = "0.2.1"; + version = "0.3.0"; outputs = [ "out" @@ -28,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { group = "World"; owner = "gedit"; repo = "libgedit-gfls"; - rev = finalAttrs.version; - hash = "sha256-kMkqEly8RDc5eKqUupQD4tkVIXxL1rt4e/OCAPoutIg="; + tag = finalAttrs.version; + hash = "sha256-X56QPcmNB0Ey+kzSqDnb6/j6/w7IU7MFSAxW8mX8I3w="; }; nativeBuildInputs = @@ -54,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { glib ]; + passthru.updateScript = gitUpdater { }; + meta = { homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gfls"; description = "Module dedicated to file loading and saving"; diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix index 6c48604b3691..0f81c4e9e414 100644 --- a/pkgs/by-name/li/libgedit-tepl/package.nix +++ b/pkgs/by-name/li/libgedit-tepl/package.nix @@ -15,11 +15,12 @@ pkg-config, gtk-doc, docbook-xsl-nons, + gitUpdater, }: stdenv.mkDerivation rec { pname = "libgedit-tepl"; - version = "6.12.0"; + version = "6.13.0"; outputs = [ "out" @@ -32,8 +33,8 @@ stdenv.mkDerivation rec { group = "World"; owner = "gedit"; repo = "libgedit-tepl"; - rev = version; - hash = "sha256-s3b7wj6b2SM0+i0vXUDDhnspgPcsRAsA5kLblh0orJE="; + tag = version; + hash = "sha256-YWONsw5+gq5Uew6xB76pKsGTJmI83zAssO5WX6aP7ZM="; }; strictDeps = true; @@ -62,6 +63,8 @@ stdenv.mkDerivation rec { libgedit-gtksourceview ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl"; description = "Text editor product line"; diff --git a/pkgs/by-name/li/libgee/package.nix b/pkgs/by-name/li/libgee/package.nix index 151abcac6771..817ee9cb0994 100644 --- a/pkgs/by-name/li/libgee/package.nix +++ b/pkgs/by-name/li/libgee/package.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/libgee"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; }) diff --git a/pkgs/by-name/li/libgeotiff/package.nix b/pkgs/by-name/li/libgeotiff/package.nix index c591b0cb7c1e..a8adeb40a962 100644 --- a/pkgs/by-name/li/libgeotiff/package.nix +++ b/pkgs/by-name/li/libgeotiff/package.nix @@ -50,7 +50,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/OSGeo/libgeotiff"; changelog = "https://github.com/OSGeo/libgeotiff/blob/${src.rev}/libgeotiff/NEWS"; license = licenses.mit; - maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ]; + maintainers = with maintainers; [ marcweber ]; + teams = [ teams.geospatial ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/by-name/li/libgepub/package.nix b/pkgs/by-name/li/libgepub/package.nix index 9d4e8ef50097..91b8fdcf3977 100644 --- a/pkgs/by-name/li/libgepub/package.nix +++ b/pkgs/by-name/li/libgepub/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "libgepub"; - version = "0.7.1"; + version = "0.7.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "o+SzGiMmWdJqVLkSGziCw9c5fDz0SuXGS4ZwCYC8f2A="; + sha256 = "WlZpWqipEy1nwHkqQPJSzgpI2dAytOGops6YrxT9Xhs="; }; nativeBuildInputs = [ @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { description = "GObject based library for handling and rendering epub documents"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/li/libgit2-glib/package.nix b/pkgs/by-name/li/libgit2-glib/package.nix index 441f1165816f..de8171c6e36f 100644 --- a/pkgs/by-name/li/libgit2-glib/package.nix +++ b/pkgs/by-name/li/libgit2-glib/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Glib wrapper library around the libgit2 git access library"; homepage = "https://gitlab.gnome.org/GNOME/libgit2-glib"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/li/libgit2/package.nix b/pkgs/by-name/li/libgit2/package.nix new file mode 100644 index 000000000000..0d7ea5907062 --- /dev/null +++ b/pkgs/by-name/li/libgit2/package.nix @@ -0,0 +1,115 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + python3, + zlib, + libssh2, + openssl, + pcre2, + libiconv, + staticBuild ? stdenv.hostPlatform.isStatic, + # for passthru.tests + libgit2-glib, + python3Packages, + gitstatus, + llhttp, + withGssapi ? false, + krb5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libgit2"; + version = "1.9.0"; + # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib + + outputs = [ + "lib" + "dev" + "out" + ]; + + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${finalAttrs.version}"; + hash = "sha256-v32yGMo5oFEl6HUdg8czCsCLDL+sy9PPT0AEWmKxUhk="; + }; + + patches = [ + (fetchpatch { + name = "libgit2-darwin-case-sensitive-build.patch"; + url = "https://github.com/libgit2/libgit2/commit/1b348a31349e847b1d8548281aa92f26b9783f2f.patch"; + hash = "sha256-CBaUuEr3nPdUuOdyJtmPgyqR0MNnVyOFYbYXF3ncupU="; + }) + ]; + + cmakeFlags = + [ + "-DREGEX_BACKEND=pcre2" + "-DUSE_HTTP_PARSER=llhttp" + "-DUSE_SSH=ON" + (lib.cmakeBool "USE_GSSAPI" withGssapi) + "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}" + ] + ++ lib.optionals stdenv.hostPlatform.isWindows [ + "-DDLLTOOL=${stdenv.cc.bintools.targetPrefix}dlltool" + # For ws2_32, referred to by a `*.pc` file + "-DCMAKE_LIBRARY_PATH=${stdenv.cc.libc}/lib" + ] + ++ lib.optionals stdenv.hostPlatform.isOpenBSD [ + # openbsd headers fail with default c90 + "-DCMAKE_C_STANDARD=99" + ]; + + nativeBuildInputs = [ + cmake + python3 + pkg-config + ]; + + buildInputs = [ + zlib + libssh2 + openssl + pcre2 + llhttp + ] ++ lib.optional withGssapi krb5; + + propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv; + + doCheck = true; + checkPhase = '' + testArgs=(-v -xonline) + + # slow + testArgs+=(-xclone::nonetwork::bad_urls) + + # failed to set permissions on ...: Operation not permitted + testArgs+=(-xrepo::init::extended_1) + testArgs+=(-xrepo::template::extended_with_template_and_shared_mode) + + ( + set -x + ./libgit2_tests ''${testArgs[@]} + ) + ''; + + passthru.tests = lib.mapAttrs (_: v: v.override { libgit2 = finalAttrs.finalPackage; }) { + inherit libgit2-glib; + inherit (python3Packages) pygit2; + inherit gitstatus; + }; + + meta = with lib; { + description = "Linkable library implementation of Git that you can use in your application"; + mainProgram = "git2"; + homepage = "https://libgit2.org/"; + license = licenses.gpl2Only; + platforms = platforms.all; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +}) diff --git a/pkgs/by-name/li/libglibutil/package.nix b/pkgs/by-name/li/libglibutil/package.nix index 132106b30250..920a71a61475 100644 --- a/pkgs/by-name/li/libglibutil/package.nix +++ b/pkgs/by-name/li/libglibutil/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.79"; + version = "1.0.80"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-UJsKjvigZuwDL4DyjUE6fXEecgoHrTE+5pO0hVyCwP4="; + sha256 = "sha256-wp87cStOuQILSKFPFlFDL2vGvTQ4Cg5kuSlwnM4kc64="; }; outputs = [ diff --git a/pkgs/by-name/li/libgnomekbd/package.nix b/pkgs/by-name/li/libgnomekbd/package.nix index 88db2b779ea1..153ff597ba09 100644 --- a/pkgs/by-name/li/libgnomekbd/package.nix +++ b/pkgs/by-name/li/libgnomekbd/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Keyboard management library"; mainProgram = "gkbd-keyboard-display"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/by-name/li/libgtop/package.nix b/pkgs/by-name/li/libgtop/package.nix index 36264b173dfb..fb4f8d6ceccb 100644 --- a/pkgs/by-name/li/libgtop/package.nix +++ b/pkgs/by-name/li/libgtop/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library that reads information about processes and the running system"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/li/libgudev/package.nix b/pkgs/by-name/li/libgudev/package.nix index 6e9007b90945..ee82d06c45e9 100644 --- a/pkgs/by-name/li/libgudev/package.nix +++ b/pkgs/by-name/li/libgudev/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library that provides GObject bindings for libudev"; homepage = "https://gitlab.gnome.org/GNOME/libgudev"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/by-name/li/libgweather/package.nix b/pkgs/by-name/li/libgweather/package.nix index a27aa76edcf9..d91b1c45e2eb 100644 --- a/pkgs/by-name/li/libgweather/package.nix +++ b/pkgs/by-name/li/libgweather/package.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { description = "Library to access weather information from online services for numerous locations"; homepage = "https://gitlab.gnome.org/GNOME/libgweather"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/li/libgxps/package.nix b/pkgs/by-name/li/libgxps/package.nix index 29f5289b5ea2..e837b661d727 100644 --- a/pkgs/by-name/li/libgxps/package.nix +++ b/pkgs/by-name/li/libgxps/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { description = "GObject based library for handling and rendering XPS documents"; homepage = "https://gitlab.gnome.org/GNOME/libgxps"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/li/libhdhomerun/package.nix b/pkgs/by-name/li/libhdhomerun/package.nix index 8a1859d7a9fa..1c9597f2df48 100644 --- a/pkgs/by-name/li/libhdhomerun/package.nix +++ b/pkgs/by-name/li/libhdhomerun/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20231214"; + version = "20250506"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - hash = "sha256-VSoQLoqiq8xBYJDewvb4DaWfl/kfV5aOnp17PcAF268="; + hash = "sha256-h5sbxHbJuT537igKhPwRV+fMR9Q+2cg5jYiorF81wDQ="; }; patches = [ diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix index a076ecc234f2..a5712ece2b82 100644 --- a/pkgs/by-name/li/libheif/package.nix +++ b/pkgs/by-name/li/libheif/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.18.2"; + version = "1.19.7"; outputs = [ "bin" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - hash = "sha256-Z21E2b4E9jGtwR1RpFMAbGsWFw6jXn++WexlzdoyZzE="; + hash = "sha256-FXq6AOq1tUM05++fkzowApbLnlgeS5ZJ+UmypHrF11g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libhomfly/package.nix b/pkgs/by-name/li/libhomfly/package.nix index 9cae6196d83c..d215d398b659 100644 --- a/pkgs/by-name/li/libhomfly/package.nix +++ b/pkgs/by-name/li/libhomfly/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/miguelmarco/libhomfly/"; description = "Library to compute the homfly polynomial of knots and links"; license = licenses.unlicense; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/li/libhttpseverywhere/package.nix b/pkgs/by-name/li/libhttpseverywhere/package.nix deleted file mode 100644 index c24eb6ab7780..000000000000 --- a/pkgs/by-name/li/libhttpseverywhere/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - meson, - ninja, - makeFontsConf, - vala, - fetchpatch, - gnome, - libgee, - glib, - json-glib, - libarchive, - libsoup_2_4, - gobject-introspection, -}: - -let - pname = "libhttpseverywhere"; - version = "0.8.3"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; - }; - - nativeBuildInputs = [ - vala - gobject-introspection - meson - ninja - pkg-config - ]; - buildInputs = [ - glib - libgee - json-glib - libsoup_2_4 - libarchive - ]; - - patches = [ - # Fixes build with vala >=0.42 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch"; - sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f"; - }) - # fix build with meson 0.60 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/-/commit/4c38b2ca25802c464f3204a62815201d8cf549fd.patch"; - sha256 = "sha256-1+fmR0bpvJ9ISN2Hr+BTIQz+Bf6VfY1RdVZ/OohUlWU="; - }) - ]; - - mesonFlags = [ "-Denable_valadoc=true" ]; - - doCheck = true; - - checkPhase = "(cd test && ./httpseverywhere_test)"; - - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; - - outputs = [ - "out" - "devdoc" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Library to use HTTPSEverywhere in desktop applications"; - homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ sternenseemann ] ++ teams.gnome.members; - }; -} diff --git a/pkgs/by-name/li/libhv/package.nix b/pkgs/by-name/li/libhv/package.nix index 4eb104dbce54..c7fabd5eb5c6 100644 --- a/pkgs/by-name/li/libhv/package.nix +++ b/pkgs/by-name/li/libhv/package.nix @@ -5,7 +5,6 @@ cmake, curl, openssl, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -24,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; cmakeFlags = [ "-DENABLE_UDS=ON" diff --git a/pkgs/by-name/li/libhydrogen/package.nix b/pkgs/by-name/li/libhydrogen/package.nix new file mode 100644 index 000000000000..eda73c73877d --- /dev/null +++ b/pkgs/by-name/li/libhydrogen/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitHub, + testers, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libhydrogen"; + version = "0-unstable-2025-04-06"; + + src = fetchFromGitHub { + owner = "jedisct1"; + repo = "libhydrogen"; + rev = "bbca575b62510bfdc6dd927a4bfa7df4a51cb846"; + hash = "sha256-sLOE3oR53hmvRqIPD5PU9Q04TFqw2KuWT1OQBA/KdRc="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ pkg-config ]; + enableParallelBuilding = true; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "INCLUDE_INSTALL_DIR=${placeholder "dev"}/include" + "LIBRARY_INSTALL_DIR=${placeholder "out"}/lib" + "PKGCONFIG_INSTALL_DIR=${placeholder "dev"}/lib/pkgconfig" + "lib" + ]; + + checkTarget = "test"; + + postInstall = '' + mkdir -p "$dev/lib/pkgconfig" + cat > "$dev/lib/pkgconfig/libhydrogen.pc" < +#include + +int main(void) { + const char *test = "liblzf test for nixpkgs, nixpkgs for test liblzf"; + const size_t ilen = strlen(test) + 1; + + printf("Test string length: %zu\n", ilen); + + char compressed[100]; + char decompressed[100]; + + unsigned int clen = + lzf_compress(test, ilen, compressed, sizeof(compressed)); + if (!clen) + return 1; + + printf("Compressed length: %d\n", clen); + + unsigned int dlen = + lzf_decompress(compressed, clen, decompressed, sizeof(decompressed)); + if (!dlen) + return 2; + + if (strcmp(test, decompressed) != 0) { + printf("Strings don't match!\n"); + return 3; + } + + printf("Strings match, tests passed!\n"); + return 0; +} diff --git a/pkgs/by-name/li/liblzf/package.nix b/pkgs/by-name/li/liblzf/package.nix new file mode 100644 index 000000000000..693488d64db4 --- /dev/null +++ b/pkgs/by-name/li/liblzf/package.nix @@ -0,0 +1,137 @@ +{ + lib, + stdenv, + fetchDebianPatch, + fetchpatch, + fetchurl, + pkg-config, + testers, + validatePkgConfig, + autoconf, + automake, + libtool, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "liblzf"; + version = "3.6"; + + src = fetchurl { + url = "http://dist.schmorp.de/liblzf/liblzf-${finalAttrs.version}.tar.gz"; + hash = "sha256-nF3gH3ucyuQMP2GdJqer7JmGwGw20mDBec7dBLiftGo="; + }; + + patches = [ + (fetchDebianPatch { + inherit (finalAttrs) pname version; + debianRevision = "4"; + patch = "0001-Make-sure-that-the-library-is-linked-with-C-symbols.patch"; + hash = "sha256-Rgfp/TysRcEJaogOo/Xno+G4HZzj9Loa69DL43Bp1Ok="; + }) + ( + let + name = "liblzf-3.6-autoconf-20140314.patch"; + in + fetchpatch { + inherit name; + url = "https://src.fedoraproject.org/rpms/liblzf/raw/53da654eead51a24ac81a28e1b1c531eb1afab28/f/${name}"; + hash = "sha256-rkhI8w0HV3fGiDfHiXBzrnxqGDE/Yo5ntePrsscMiyg="; + } + ) + ]; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + validatePkgConfig + ]; + + preConfigure = '' + sh ./bootstrap.sh + ''; + + postInstall = '' + pushd $out/bin + ln -s lzf unlzf + popd + ''; + + outputs = [ + "out" + "dev" + ]; + + passthru.tests = { + pkgConfigTest = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + version = "${finalAttrs.version}.0"; + versionCheck = true; + }; + + exeTest = testers.runCommand { + name = "${finalAttrs.pname}-exe-test"; + buildInputs = [ finalAttrs.finalPackage ]; + script = '' + lzf -h 2> /dev/null + + echo "LZFLZFLZFLZFLZFLZFLZFLZF" > test.txt + + # unlzf writes to filename minus ".lzf" + cp test.txt test.txt.orig + + lzf test.txt + unlzf test.txt.lzf + + # Compare results + if ! cmp -s test.txt test.txt.orig; then + echo "Executable test failed: files don't match" + exit 1 + fi + + echo "Decompressed output matches test string (lzf & unlzf)" + + touch $out + ''; + }; + + shlibTest = testers.runCommand { + name = "${finalAttrs.pname}-shlib-test"; + inherit stdenv; # with CC + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + finalAttrs.finalPackage.dev + finalAttrs.finalPackage + ]; + # tests both the library and pkg-config file + script = '' + $CC -g ${./lib_test.c} -o lib_test \ + $(pkg-config --cflags --libs liblzf) + + ./lib_test >/dev/null + + echo "Built and tested file linked against liblzf using pkg-config" + touch $out + ''; + }; + }; + + meta = { + changelog = + "http://cvs.schmorp.de/liblzf/Changes?pathrev=rel-" + + builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version; + description = "Small data compression library"; + downloadPage = "http://dist.schmorp.de/liblzf/"; + homepage = "http://software.schmorp.de/pkg/liblzf.html"; + license = with lib.licenses; [ + bsd2 + gpl2Plus + ]; + mainProgram = "lzf"; + maintainers = with lib.maintainers; [ + tetov + ]; + platforms = lib.platforms.unix; + pkgConfigModules = [ "liblzf" ]; + }; +}) diff --git a/pkgs/by-name/li/libmaddy-markdown/package.nix b/pkgs/by-name/li/libmaddy-markdown/package.nix index 98a9ee3cff59..a7ea48bdac7b 100644 --- a/pkgs/by-name/li/libmaddy-markdown/package.nix +++ b/pkgs/by-name/li/libmaddy-markdown/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "libmaddy-markdown"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "progsource"; repo = "maddy"; tag = finalAttrs.version; - hash = "sha256-sVUXACT94PSPcohnOyIp7KK8baCBuf6ZNMIyk6Cfdjg="; + hash = "sha256-FlERT2A5bxvLElBcqHCFTORFRK04rJjvRYguqZ+foVo="; }; dontBuild = true; diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index c1ed853b834f..4f8c8cc0c843 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmamba"; - version = "2.0.5"; + version = "2.1.1"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; - rev = "libmamba-${finalAttrs.version}"; - hash = "sha256-o5shAmsplJS2WZ4HhAt1U27KqUheVxZTkjlyxR7EYxI="; + tag = finalAttrs.version; + hash = "sha256-JBwdfYM7J5R7HZyw5kVXwu4FlZUd2QPrsTaGuXnyAJI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libmanette/package.nix b/pkgs/by-name/li/libmanette/package.nix index 4a0bb9f0a97d..19fb8adb4a12 100644 --- a/pkgs/by-name/li/libmanette/package.nix +++ b/pkgs/by-name/li/libmanette/package.nix @@ -12,18 +12,17 @@ withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages, - gtk-doc, - docbook-xsl-nons, - docbook_xml_dtd_43, + gi-docgen, glib, libgudev, libevdev, + hidapi, gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmanette"; - version = "0.2.9"; + version = "0.2.12"; outputs = [ "out" @@ -31,8 +30,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-KTZr5UUvYKdMZfxk/+LXTt3U5uaCTCzvpWekO9kraI8="; + url = "mirror://gnome/sources/libmanette/${lib.versions.majorMinor finalAttrs.version}/libmanette-${finalAttrs.version}.tar.xz"; + hash = "sha256-SLNJJnGA8dw01AWp4ekLoW8FShnOkHkw5nlJPZEeodg="; }; nativeBuildInputs = @@ -45,9 +44,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withIntrospection [ vala gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 + gi-docgen ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook @@ -57,6 +54,7 @@ stdenv.mkDerivation rec { [ glib libevdev + hidapi ] ++ lib.optionals withIntrospection [ libgudev @@ -71,9 +69,14 @@ stdenv.mkDerivation rec { doCheck = true; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libmanette"; versionPolicy = "odd-unstable"; }; }; @@ -83,7 +86,7 @@ stdenv.mkDerivation rec { mainProgram = "manette-test"; homepage = "https://gnome.pages.gitlab.gnome.org/libmanette/"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libmaxminddb/package.nix b/pkgs/by-name/li/libmaxminddb/package.nix index ee2d191d7239..fa637ae4fdf3 100644 --- a/pkgs/by-name/li/libmaxminddb/package.nix +++ b/pkgs/by-name/li/libmaxminddb/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "C library for working with MaxMind geolocation DB files"; homepage = "https://github.com/maxmind/libmaxminddb"; license = licenses.asl20; - maintainers = teams.helsinki-systems.members; + teams = [ teams.helsinki-systems ]; mainProgram = "mmdblookup"; platforms = platforms.all; }; diff --git a/pkgs/by-name/li/libmbim/package.nix b/pkgs/by-name/li/libmbim/package.nix index 0171aea5490e..3fa0d2212ce6 100644 --- a/pkgs/by-name/li/libmbim/package.nix +++ b/pkgs/by-name/li/libmbim/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/wiki/Software/libmbim/"; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; changelog = "https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/raw/${version}/NEWS"; - maintainers = teams.freedesktop.members; + teams = [ teams.freedesktop ]; platforms = platforms.linux; license = licenses.gpl2Plus; }; diff --git a/pkgs/by-name/li/libmcfp/package.nix b/pkgs/by-name/li/libmcfp/package.nix index 81643693b47b..dc07d6117e10 100644 --- a/pkgs/by-name/li/libmcfp/package.nix +++ b/pkgs/by-name/li/libmcfp/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmcfp"; - version = "1.3.5"; + version = "1.4.2"; src = fetchFromGitHub { owner = "mhekkel"; repo = "libmcfp"; tag = "v${finalAttrs.version}"; - hash = "sha256-e4scwaCwKU2M5FJ/+UTNDigazopQwGhCIqDatQX7ERw="; + hash = "sha256-qKmSkVuxY5kXQ1eSs/T500lFpCLzU3sXAoUmpXhTUp4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libmediaart/package.nix b/pkgs/by-name/li/libmediaart/package.nix index 25f44cd3385d..7d04fbe91941 100644 --- a/pkgs/by-name/li/libmediaart/package.nix +++ b/pkgs/by-name/li/libmediaart/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix index fb7df3af1b26..cb70032493cb 100644 --- a/pkgs/by-name/li/libmediainfo/package.nix +++ b/pkgs/by-name/li/libmediainfo/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "25.03"; + version = "25.04"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-NfH9q4EjnKNVxt41ioT73gR3/tjrNQ5d/valmBRcUgc="; + hash = "sha256-rUXtfJ23gHqoA4RcqIutlSaqjaiDpYEn5TkKqi2Bu7E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libmikmod/package.nix b/pkgs/by-name/li/libmikmod/package.nix new file mode 100644 index 000000000000..1294d5d8107e --- /dev/null +++ b/pkgs/by-name/li/libmikmod/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchurl, + texinfo, + alsa-lib, + libpulseaudio, +}: + +let + inherit (lib) optional optionalString; + +in +stdenv.mkDerivation rec { + pname = "libmikmod"; + version = "3.3.13"; + + src = fetchurl { + url = "mirror://sourceforge/mikmod/libmikmod-${version}.tar.gz"; + sha256 = "sha256-n8F5n36mqVx8WILemL6F/H0gugpKb8rK4RyMazgrsgc="; + }; + + buildInputs = [ texinfo ] ++ optional stdenv.hostPlatform.isLinux alsa-lib; + propagatedBuildInputs = optional stdenv.hostPlatform.isLinux libpulseaudio; + + outputs = [ + "out" + "dev" + "man" + ]; + + NIX_LDFLAGS = optionalString stdenv.hostPlatform.isLinux "-lasound"; + + enableParallelBuilding = true; + + postInstall = '' + moveToOutput bin/libmikmod-config "$dev" + ''; + + meta = with lib; { + description = "Library for playing tracker music module files"; + mainProgram = "libmikmod-config"; + homepage = "https://mikmod.shlomifish.org/"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ + astsmtl + lovek323 + ]; + platforms = platforms.unix; + + longDescription = '' + A library for playing tracker music module files supporting many formats, + including MOD, S3M, IT and XM. + ''; + }; +} diff --git a/pkgs/by-name/li/libmp3splt/package.nix b/pkgs/by-name/li/libmp3splt/package.nix deleted file mode 100644 index 92d9ee124830..000000000000 --- a/pkgs/by-name/li/libmp3splt/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - libtool, - libmad, - libid3tag, -}: - -stdenv.mkDerivation rec { - pname = "libmp3splt"; - version = "0.9.2"; - - src = fetchurl { - url = "mirror://sourceforge/mp3splt/${pname}-${version}.tar.gz"; - sha256 = "1p1mn2hsmj5cp40fnc8g1yfvk72p8pjxi866gjdkgjsqrr7xdvih"; - }; - - outputs = [ - "out" - "dev" - ]; - nativeBuildInputs = [ libtool ]; - buildInputs = [ - libmad - libid3tag - ]; - - configureFlags = [ "--disable-pcre" ]; - - meta = with lib; { - homepage = "https://sourceforge.net/projects/mp3splt/"; - description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; - maintainers = with maintainers; [ bosu ]; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/pkgs/by-name/li/libmsgraph/package.nix b/pkgs/by-name/li/libmsgraph/package.nix index 186bd3b735ee..1f99ed61c20e 100644 --- a/pkgs/by-name/li/libmsgraph/package.nix +++ b/pkgs/by-name/li/libmsgraph/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmsgraph"; - version = "0.2.3"; + version = "0.3.3"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/msgraph/${lib.versions.majorMinor finalAttrs.version}/msgraph-${finalAttrs.version}.tar.xz"; - hash = "sha256-7ULoAMt/CgdHfNnj50TNwaJApq16uWuKh1gGJnqf3bA="; + hash = "sha256-N9fhLyqZBJCuohGE8LJ+C5Feu05QlvTWYyxiBRwFQBI="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc/msgraph-0" "$devdoc" + moveToOutput "share/doc/msgraph-1" "$devdoc" ''; passthru = { @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/msgraph"; changelog = "https://gitlab.gnome.org/GNOME/msgraph/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.lgpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/li/libmsquic/package.nix b/pkgs/by-name/li/libmsquic/package.nix index f8e38afd0b2f..aadf93bacc88 100644 --- a/pkgs/by-name/li/libmsquic/package.nix +++ b/pkgs/by-name/li/libmsquic/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmsquic"; - version = "2.4.8"; + version = "2.4.11"; src = fetchFromGitHub { owner = "microsoft"; repo = "msquic"; tag = "v${finalAttrs.version}"; - hash = "sha256-cgLrTcoa77XuVsMBvOWw9oKoNtD1ihJM553YpZ+GzQQ="; + hash = "sha256-ZI5tutVYs3myjRdsXGOq48F9fce2YUsMcI1Sqg7nyh0="; fetchSubmodules = true; }; @@ -26,10 +26,13 @@ stdenv.mkDerivation (finalAttrs: { perl ]; - buildInputs = [ - lttng-tools - libatomic_ops - ]; + buildInputs = + [ + libatomic_ops + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + lttng-tools + ]; postUnpack = '' for f in "$(find . -type f -name "*.pl")"; do diff --git a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix index 5e57e7445cc1..18b5709b5b0b 100644 --- a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix +++ b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "9.2.0"; + version = "9.3.0"; src = fetchurl { url = "mirror://mysql/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-JJ6sLHfy5HgODWGxw/ZxrJPMbjfu58nLgWVZMOOjhDU="; + hash = "sha256-Jopvf0pstZ9T3eWWI74VWfkTop7B3oG/D/zL94DRtBY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libndctl/musl-compat.patch b/pkgs/by-name/li/libndctl/musl-compat.patch new file mode 100644 index 000000000000..4173363b18b6 --- /dev/null +++ b/pkgs/by-name/li/libndctl/musl-compat.patch @@ -0,0 +1,22 @@ +diff --git a/daxctl/device.c b/daxctl/device.c +index e3993b1..0b2f20d 100644 +--- a/daxctl/device.c ++++ b/daxctl/device.c +@@ -23,6 +23,8 @@ + #include "filter.h" + #include "json.h" + ++#include ++ + static struct { + const char *dev; + const char *mode; +@@ -366,7 +368,7 @@ static const char *parse_device_options(int argc, const char **argv, + + argc = parse_options(argc, argv, options, u, 0); + if (argc > 0) +- device = basename(argv[0]); ++ device = basename(strdup(argv[0])); + + /* Handle action-agnostic non-option arguments */ + if (argc == 0 && diff --git a/pkgs/by-name/li/libndctl/package.nix b/pkgs/by-name/li/libndctl/package.nix index d2ccec80a570..61d0704897b9 100644 --- a/pkgs/by-name/li/libndctl/package.nix +++ b/pkgs/by-name/li/libndctl/package.nix @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-gG1Rz5AtDLzikGFr8A3l25ypd+VoLw2oWjszy9ogDLk="; }; + patches = lib.optionals (!stdenv.hostPlatform.isGnu) [ + # Use POSIX basename on non-glib. + # Remove when https://github.com/pmem/ndctl/pull/263 + # or equivalent fix is merged and released. + ./musl-compat.patch + ]; + outputs = [ "out" "man" diff --git a/pkgs/by-name/li/libnftnl/package.nix b/pkgs/by-name/li/libnftnl/package.nix index a2536ad82ac7..36a77b3ebf29 100644 --- a/pkgs/by-name/li/libnftnl/package.nix +++ b/pkgs/by-name/li/libnftnl/package.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "1.2.8"; + version = "1.2.9"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - hash = "sha256-N/6l1rXJsI3nkg0pjePNyULnrmSxo+i4gLLTkK5nrZU="; + hash = "sha256-6MIWJV4SnyYnBjn+53dSZWZaMbEaqSAlPD5dXWLfxLg="; }; configureFlags = lib.optional ( diff --git a/pkgs/by-name/li/libnice/gupnp-igd-bump.patch b/pkgs/by-name/li/libnice/gupnp-igd-bump.patch new file mode 100644 index 000000000000..90a8f618968b --- /dev/null +++ b/pkgs/by-name/li/libnice/gupnp-igd-bump.patch @@ -0,0 +1,33 @@ +From 7255d6376fad2c88eaadf1278ee8947181230866 Mon Sep 17 00:00:00 2001 +From: Your Name +Date: Sun, 16 Apr 2023 19:52:38 +0000 +Subject: [PATCH] Update for gupnp-igd-1.6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +New gupnp-igd has been released. +No significant changed in API so pkgconfig dependency can be simple +bumped. + +Signed-off-by: Tomasz Kłoczko +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6a733b73..c42fa138 100644 +--- a/meson.build ++++ b/meson.build +@@ -285,7 +285,7 @@ gst_dep = dependency('gstreamer-base-1.0', version: gst_req, + cdata.set('HAVE_GSTREAMER', gst_dep.found(), description: 'Build GStreamer plugin') + + # GUPnP IGD +-gupnp_igd_dep = dependency('gupnp-igd-1.0', version: gupnp_igd_req, required: get_option('gupnp')) ++gupnp_igd_dep = dependency('gupnp-igd-1.6', version: gupnp_igd_req, required: get_option('gupnp')) + cdata.set('HAVE_GUPNP', gupnp_igd_dep.found(), description: 'Use the GUPnP IGD library') + + libm = cc.find_library('m', required: false) +-- +GitLab + diff --git a/pkgs/by-name/li/libnice/package.nix b/pkgs/by-name/li/libnice/package.nix index 7cc8166bf6d7..cdb839c464b0 100644 --- a/pkgs/by-name/li/libnice/package.nix +++ b/pkgs/by-name/li/libnice/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, meson, ninja, pkg-config, @@ -18,7 +17,7 @@ graphviz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnice"; version = "0.1.22"; @@ -29,18 +28,14 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { - url = "https://libnice.freedesktop.org/releases/${pname}-${version}.tar.gz"; + url = "https://libnice.freedesktop.org/releases/libnice-${finalAttrs.version}.tar.gz"; hash = "sha256-pfckzwnq5QxBp1FxQdidpKYeyerKMtpKAHP67VQXrX4="; }; patches = [ - # Fix generating data - # Note: upstream is not willing to merge our fix - # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35#note_98871 - (fetchpatch { - url = "https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch"; - sha256 = "0z74vizf92flfw1m83p7yz824vfykmnm0xbnk748bnnyq186i6mg"; - }) + # Bumps the gupnp_igd_dep version requested to 1.6 + # https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/255 + ./gupnp-igd-bump.patch ]; nativeBuildInputs = [ @@ -78,7 +73,7 @@ stdenv.mkDerivation rec { # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295 doCheck = false; - meta = with lib; { + meta = { description = "GLib ICE implementation"; longDescription = '' Libnice is an implementation of the IETF's Interactice Connectivity @@ -88,10 +83,10 @@ stdenv.mkDerivation rec { It provides a GLib-based library, libnice and a Glib-free library, libstun as well as GStreamer elements.''; homepage = "https://libnice.freedesktop.org/"; - platforms = platforms.unix; - license = with licenses; [ + platforms = lib.platforms.unix; + license = with lib.licenses; [ lgpl21 mpl11 ]; }; -} +}) diff --git a/pkgs/by-name/li/libnma/package.nix b/pkgs/by-name/li/libnma/package.nix index 84331343c09a..9fdf26c82626 100644 --- a/pkgs/by-name/li/libnma/package.nix +++ b/pkgs/by-name/li/libnma/package.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libnma"; description = "NetworkManager UI utilities (libnm version)"; license = licenses.gpl2Plus; # Mix of GPL and LPGL 2+ - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/li/libnop/001-system-install.patch b/pkgs/by-name/li/libnop/001-system-install.patch new file mode 100644 index 000000000000..c97e47e207e4 --- /dev/null +++ b/pkgs/by-name/li/libnop/001-system-install.patch @@ -0,0 +1,89 @@ +From ae29a8772f38fdb1efc24af9ec2e3f6814eb2158 Mon Sep 17 00:00:00 2001 +From: Petr Hodina +Date: Sun, 4 May 2025 09:30:55 +0200 +Subject: [PATCH] Makefile: Add install into the system + +--- + Makefile | 44 ++++++++++++++++++++++++++++++++++++++++++++ + libnop.pc.in | 7 +++++++ + 2 files changed, 51 insertions(+) + create mode 100644 libnop.pc.in + +diff --git a/Makefile b/Makefile +index 84cb459..e5b8a67 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,7 @@ + what_to_build:: all + ++VERSION ?= 0-unstable-2022-09-04 ++ + -include local.mk + + TOOLCHAIN ?= +@@ -17,6 +19,12 @@ HOST_CFLAGS := -g -O2 -Wall -Werror -Wextra -Iinclude + HOST_CXXFLAGS := -std=c++14 + HOST_LDFLAGS := + ++# Define install locations in the system ++INSTALL_PREFIX ?= /usr/local ++INCLUDE_INSTALL_DIR ?= $(INSTALL_PREFIX)/include/ ++PKGCONFIG_INSTALL_DIR ?= $(INSTALL_PREFIX)/lib/pkgconfig ++CMAKE_CONFIG_INSTALL_DIR ?= $(INSTALL_PREFIX)/lib/cmake/libnop ++ + ifeq ($(HOST_OS),Linux) + HOST_LDFLAGS := -lpthread + endif +@@ -138,3 +146,39 @@ all:: $(ALL) + # we generate .d as a side-effect of compiling. override generic rule: + %.d: + -include $(DEPS) ++ ++# Handle install into the system ++.PHONY: install install-pkgconfig install-cmake ++ ++install: install-headers install-pkgconfig install-cmake ++ ++install-headers: ++ @echo "Installing headers to $(INCLUDE_INSTALL_DIR)" ++ mkdir -p $(INCLUDE_INSTALL_DIR) ++ cp -r include/* $(INCLUDE_INSTALL_DIR) ++ ++install-pkgconfig: $(OUT)/libnop.pc ++ @echo "Installing pkg-config file to $(PKGCONFIG_INSTALL_DIR)" ++ mkdir -p $(PKGCONFIG_INSTALL_DIR) ++ cp $< $(PKGCONFIG_INSTALL_DIR) ++ ++PC_TEMPLATE := libnop.pc.in ++ ++$(OUT)/libnop.pc: $(PC_TEMPLATE) ++ mkdir -p $(dir $@) ++ sed \ ++ -e 's|@prefix@|$(INSTALL_PREFIX)|g' \ ++ -e 's|@includedir@|$(INSTALL_PREFIX)/include|g' \ ++ -e 's|@version@|$(VERSION)|g' \ ++ $< > $@ ++ ++install-cmake: $(OUT)/libnopConfig.cmake ++ @echo "Installing CMake config to $(CMAKE_CONFIG_INSTALL_DIR)" ++ mkdir -p $(CMAKE_CONFIG_INSTALL_DIR) ++ cp $< $(CMAKE_CONFIG_INSTALL_DIR) ++ ++$(OUT)/libnopConfig.cmake: ++ mkdir -p $(dir $@) ++ echo "set(LIBNOP_INCLUDE_DIR \"$(INCLUDE_INSTALL_DIR)\")" > $@ ++ echo "set(LIBNOP_FOUND TRUE)" >> $@ ++ echo "mark_as_advanced(LIBNOP_INCLUDE_DIR)" >> $@ +diff --git a/libnop.pc.in b/libnop.pc.in +new file mode 100644 +index 0000000..8c5475b +--- /dev/null ++++ b/libnop.pc.in +@@ -0,0 +1,7 @@ ++prefix=@prefix@ ++includedir=@includedir@ ++ ++Name: libnop ++Description: Header-only C++ Native Object Protocols library ++Version: @version@ ++Cflags: -I${includedir} diff --git a/pkgs/by-name/li/libnop/002-fix-template-warning.patch b/pkgs/by-name/li/libnop/002-fix-template-warning.patch new file mode 100644 index 000000000000..9c9001586d1f --- /dev/null +++ b/pkgs/by-name/li/libnop/002-fix-template-warning.patch @@ -0,0 +1,54 @@ +From 199978a0fb0dc31de43b80f7504b53958fd202ee Mon Sep 17 00:00:00 2001 +From: Petr Hodina +Date: Sun, 4 May 2025 09:58:20 +0200 +Subject: [PATCH] C++: Fix compilation issue + -Wno-missing-template-arg-list-after-template-kw + +--- + include/nop/rpc/interface.h | 2 +- + include/nop/types/variant.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/nop/rpc/interface.h b/include/nop/rpc/interface.h +index 167d203..9772d06 100644 +--- a/include/nop/rpc/interface.h ++++ b/include/nop/rpc/interface.h +@@ -245,7 +245,7 @@ struct InterfaceMethod { + template + static void Invoke(Sender* sender, Status* return_value, + Args... args) { +- sender->NOP_TEMPLATE SendMethod(InterfaceMethod::Selector, return_value, ++ sender->NOP_TEMPLATE SendMethod<>(InterfaceMethod::Selector, return_value, + std::forward_as_tuple(args...)); + } + +diff --git a/include/nop/types/variant.h b/include/nop/types/variant.h +index fdf8e03..af8c81e 100644 +--- a/include/nop/types/variant.h ++++ b/include/nop/types/variant.h +@@ -239,7 +239,7 @@ class Variant { + // resulting type. + template + void Construct(Args&&... args) { +- index_ = value_.NOP_TEMPLATE Construct(std::forward(args)...); ++ index_ = value_.NOP_TEMPLATE Construct<>(std::forward(args)...); + } + void Construct(EmptyVariant) {} + +@@ -256,14 +256,14 @@ class Variant { + // multiple element types. + template + void Assign(TypeTag, U&& value) { +- if (!value_.NOP_TEMPLATE Assign(TypeTag{}, index_, std::forward(value))) { ++ if (!value_.NOP_TEMPLATE Assign<>(TypeTag{}, index_, std::forward(value))) { + Destruct(); + Construct(TypeTag{}, std::forward(value)); + } + } + template + void Assign(T&& value) { +- if (!value_.NOP_TEMPLATE Assign(index_, std::forward(value))) { ++ if (!value_.NOP_TEMPLATE Assign<>(index_, std::forward(value))) { + Destruct(); + Construct(std::forward(value)); + } diff --git a/pkgs/by-name/li/libnop/package.nix b/pkgs/by-name/li/libnop/package.nix new file mode 100644 index 000000000000..09cba2b2404c --- /dev/null +++ b/pkgs/by-name/li/libnop/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchpatch, + fetchFromGitHub, + gtest, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libnop"; + version = "0-unstable-2022-09-04"; + + src = fetchFromGitHub { + owner = "luxonis"; + repo = "libnop"; + rev = "ab842f51dc2eb13916dc98417c2186b78320ed10"; + sha256 = "sha256-d2z/lDI9pe5TR82MxGkR9bBMNXPvzqb9Gsd5jOv6x1A="; + }; + + patches = [ + # System install + # https://github.com/luxonis/libnop/pull/6/commits/ae29a8772f38fdb1efc24af9ec2e3f6814eb2158.patch + ./001-system-install.patch + # Fix template warning + # https://github.com/luxonis/libnop/pull/6/commits/199978a0fb0dc31de43b80f7504b53958fd202ee.patch + ./002-fix-template-warning.patch + ]; + + nativeBuildInputs = [ gtest ]; + + # Add optimization flags to address _FORTIFY_SOURCE warning + NIX_CFLAGS_COMPILE = [ "-O1" ]; + + installPhase = '' + runHook preInstall + make INSTALL_PREFIX=$out install + runHook postInstall + ''; + + meta = { + description = "A fast, header-only C++ serialization library"; + homepage = "https://github.com/google/libnop"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ phodina ]; + }; +}) diff --git a/pkgs/by-name/li/libnotify/package.nix b/pkgs/by-name/li/libnotify/package.nix index edd43c88da27..8911bb208812 100644 --- a/pkgs/by-name/li/libnotify/package.nix +++ b/pkgs/by-name/li/libnotify/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, meson, ninja, pkg-config, @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.8.4"; + version = "0.8.6"; outputs = [ "out" @@ -30,20 +29,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-j6BNTr3BVbCiOd+IvZ8J6PJznVcHoTkLQnq0mF+D0lo="; + hash = "sha256-xVQKrvtg4dY7HFh8BfIoTr5y7OfQwOXkp3jP1YRLa1g="; }; - patches = [ - # Revert to avoid manpages breakage: - # https://gitlab.gnome.org/GNOME/libnotify/-/merge_requests/37#note_2366448 - (fetchpatch { - revert = true; - name = "unbreak-man.path"; - url = "https://gitlab.gnome.org/GNOME/libnotify/-/commit/2f99025b7ad54f29dc5236aa7dfcfa97d1c8efde.patch"; - hash = "sha256-/qbBs+bJjzCR2I7swy0RTsTaXap+gkYzvfchobeOzPQ="; - }) - ]; - mesonFlags = [ # disable tests as we don't need to depend on GTK (2/3) "-Dtests=false" @@ -83,7 +71,7 @@ stdenv.mkDerivation rec { description = "Library that sends desktop notifications to a notification daemon"; homepage = "https://gitlab.gnome.org/GNOME/libnotify"; license = licenses.lgpl21; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; mainProgram = "notify-send"; platforms = platforms.unix; }; diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix index f3d4764bed74..6f5119017601 100644 --- a/pkgs/by-name/li/libnvidia-container/package.nix +++ b/pkgs/by-name/li/libnvidia-container/package.nix @@ -12,14 +12,11 @@ makeWrapper, removeReferencesTo, replaceVars, - go_1_23, applyPatches, nvidia-modprobe, + go, }: let - # https://github.com/NVIDIA/libnvidia-container/pull/297 - go = go_1_23; - modprobeVersion = "550.54.14"; patchedModprobe = applyPatches { src = nvidia-modprobe.src.override { @@ -33,15 +30,15 @@ let ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnvidia-container"; - version = "1.17.2"; + version = "1.17.6"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libnvidia-container"; - rev = "v${version}"; - hash = "sha256-JmJKvAOEPyjVx2Frd0tAMBjnAUTMpMh1KBt6wr5RRmk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-kveP0Px9Fds7pS39aW+cqg2jtiQCMN2zG4GTGRqRrc0="; }; patches = [ @@ -65,13 +62,13 @@ stdenv.mkDerivation rec { postPatch = '' sed -i \ - -e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \ + -e 's/^REVISION ?=.*/REVISION = ${finalAttrs.src.tag}/' \ -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \ mk/common.mk sed -i \ - -e 's/^GIT_TAG ?=.*/GIT_TAG = ${version}/' \ - -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${src.rev}/' \ + -e 's/^GIT_TAG ?=.*/GIT_TAG = ${finalAttrs.version}/' \ + -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${finalAttrs.src.tag}/' \ versions.mk mkdir -p deps/src/nvidia-modprobe-${modprobeVersion} @@ -108,7 +105,7 @@ stdenv.mkDerivation rec { postFixup = '' for lib in libnvidia-container libnvidia-container-go; do rm -f "$out/lib/$lib.so" - ln -s "$out/lib/$lib.so.${version}" "$out/lib/$lib.so.1" + ln -s "$out/lib/$lib.so.${finalAttrs.version}" "$out/lib/$lib.so.1" ln -s "$out/lib/$lib.so.1" "$out/lib/$lib.so" done ''; @@ -164,20 +161,20 @@ stdenv.mkDerivation rec { ]; in '' - remove-references-to -t "${go}" $out/lib/libnvidia-container-go.so.${version} + remove-references-to -t "${go}" $out/lib/libnvidia-container-go.so.${finalAttrs.version} wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath} ''; disallowedReferences = [ go ]; - meta = with lib; { + meta = { homepage = "https://github.com/NVIDIA/libnvidia-container"; description = "NVIDIA container runtime library"; - license = licenses.asl20; - platforms = platforms.linux; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; mainProgram = "nvidia-container-cli"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ cpcloud msanft ]; }; -} +}) diff --git a/pkgs/by-name/li/libofa/package.nix b/pkgs/by-name/li/libofa/package.nix index e1176a1ff2c6..242eacf9bd71 100644 --- a/pkgs/by-name/li/libofa/package.nix +++ b/pkgs/by-name/li/libofa/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchzip, expat, curl, fftw, @@ -17,11 +18,22 @@ stdenv.mkDerivation rec { sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2"; }; - patches = fetchurl { + debian_patches = fetchzip { url = "mirror://debian/pool/main/libo/libofa/libofa_${version}-${deb_patch}.debian.tar.gz"; - sha256 = "1rfkyz13cm8izm90c1xflp4rvsa24aqs6qpbbbqqcbmvzsj6j9yn"; + hash = "sha256-tENhXSRcUP1PKm35IJyLUEEROze8UzxJzRx3VNAqo40="; }; + patches = [ + "${debian_patches}/patches/01_gcc41.diff" + "${debian_patches}/patches/02_example-open.diff" + "${debian_patches}/patches/03_example-size_type.diff" + "${debian_patches}/patches/04_libofa.pc-deps.diff" + "${debian_patches}/patches/05_gcc43.diff" + "${debian_patches}/patches/06_gcc44.diff" + "${debian_patches}/patches/fix_ftbfs.diff" + "${debian_patches}/patches/fix-ftbfs-gcc4.7.diff" + ]; + outputs = [ "out" "dev" diff --git a/pkgs/by-name/li/liboping/package.nix b/pkgs/by-name/li/liboping/package.nix index fefd39aee363..92e3666dbb4b 100644 --- a/pkgs/by-name/li/liboping/package.nix +++ b/pkgs/by-name/li/liboping/package.nix @@ -4,16 +4,17 @@ fetchpatch, ncurses ? null, perl ? null, + pkg-config, lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liboping"; version = "1.10.0"; src = fetchurl { - url = "https://noping.cc/files/${pname}-${version}.tar.bz2"; - sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; + url = "https://noping.cc/files/liboping-${finalAttrs.version}.tar.bz2"; + hash = "sha256-6ziqk/k+irKC2X4lgvuuqIs/iJoIy8nb8gBZw3edXNg="; }; patches = [ @@ -32,14 +33,26 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; + nativeBuildInputs = [ + perl + pkg-config + ]; + buildInputs = [ ncurses perl ]; - configureFlags = lib.optional (perl == null) "--with-perl-bindings=no"; + configureFlags = [ + "ac_cv_func_malloc_0_nonnull=yes" + ] ++ lib.optional (perl == null) "--with-perl-bindings=no"; - meta = with lib; { + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "LD=${stdenv.cc.targetPrefix}cc" + ]; + + meta = { description = "C library to generate ICMP echo requests (a.k.a. ping packets)"; longDescription = '' liboping is a C library to generate ICMP echo requests, better known as @@ -48,9 +61,9 @@ stdenv.mkDerivation rec { Included is a sample application, called oping, which demonstrates the library's abilities. ''; - homepage = "http://noping.cc/"; - license = licenses.lgpl21; - platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; + homepage = "https://noping.cc/"; + license = lib.licenses.lgpl21; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix index 09722df40864..75c10c8e5bee 100644 --- a/pkgs/by-name/li/liboqs/package.nix +++ b/pkgs/by-name/li/liboqs/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liboqs"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "liboqs"; rev = finalAttrs.version; - hash = "sha256-ngjN1JdmnvMn+UXJeCiBwF1Uf7kTOjHVBL99xzoZVFY="; + hash = "sha256-E3wOiWeQSgWzzu4zoYfLV1kGV3jsFE+XEnUezWSqkcA="; }; patches = [ diff --git a/pkgs/by-name/li/liborbispkg-pkgtool/package.nix b/pkgs/by-name/li/liborbispkg-pkgtool/package.nix new file mode 100644 index 000000000000..c901746957bc --- /dev/null +++ b/pkgs/by-name/li/liborbispkg-pkgtool/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, +}: +buildDotnetModule { + pname = "liborbispkg-pkgtool"; + version = "0.3-unstable-2024-10-12"; + + src = fetchFromGitHub { + owner = "OpenOrbis"; + repo = "LibOrbisPkg"; + rev = "75616a28de0f49f05eeff872211e806fb6de3818"; + hash = "sha256-ySlMzUfJ0IXi/NWbj53jqCRDNm9Xh4TuffyKhNh4wuM="; + }; + + projectFile = "PkgTool.Core/PkgTool.Core.csproj"; + + postFixup = '' + mv $out/bin/PkgTool.Core $out/bin/pkgtool + ''; + + meta = { + description = "Library, GUI, CLI for creating, inspecting, and modifying PS4 PKG, SFO, PFS, and related filetypes"; + homepage = "https://github.com/OpenOrbis/LibOrbisPkg"; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.ryand56 ]; + mainProgram = "pkgtool"; + }; +} diff --git a/pkgs/by-name/li/libosmium/package.nix b/pkgs/by-name/li/libosmium/package.nix index 7579c3472077..66e2ab42392b 100644 --- a/pkgs/by-name/li/libosmium/package.nix +++ b/pkgs/by-name/li/libosmium/package.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { "https://github.com/osmcode/libosmium/releases/tag/v${finalAttrs.version}" "https://github.com/osmcode/libosmium/blob/v${finalAttrs.version}/CHANGELOG.md" ]; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ das-g ]); + maintainers = with lib.maintainers; [ das-g ]; + teams = [ lib.teams.geospatial ]; }; }) diff --git a/pkgs/by-name/li/libowfat/package.nix b/pkgs/by-name/li/libowfat/package.nix index f39bdbe81f52..23ce6cfb41bb 100644 --- a/pkgs/by-name/li/libowfat/package.nix +++ b/pkgs/by-name/li/libowfat/package.nix @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { make headers ''; - makeFlags = [ "prefix=$(out)" ]; + makeFlags = [ + "prefix=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + ]; enableParallelBuilding = true; meta = with lib; { @@ -34,5 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://www.fefe.de/libowfat/"; license = licenses.gpl2; platforms = platforms.linux; + # build tool "json" is built for the host platform + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; } diff --git a/pkgs/by-name/li/libpanel/package.nix b/pkgs/by-name/li/libpanel/package.nix index 6006c6b141c7..b577910323a3 100644 --- a/pkgs/by-name/li/libpanel/package.nix +++ b/pkgs/by-name/li/libpanel/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpanel"; - version = "1.8.1"; + version = "1.10.0"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor finalAttrs.version}/libpanel-${finalAttrs.version}.tar.xz"; - hash = "sha256-uHuPqbeXaMxwQkN5PwFYoECh5G03uYiRiFRaf33Kpvs="; + hash = "sha256-V4zlEieP8rte7rtVCZOSxSU3pavZvQYpVn8QJTKziyU="; }; strictDeps = true; @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "libpanel-example"; homepage = "https://gitlab.gnome.org/GNOME/libpanel"; license = licenses.lgpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/li/libpciaccess/package.nix b/pkgs/by-name/li/libpciaccess/package.nix new file mode 100644 index 000000000000..e18595b1caf2 --- /dev/null +++ b/pkgs/by-name/li/libpciaccess/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchurl, + testers, + writeScript, + pkg-config, + meson, + ninja, + zlib, + netbsd, + hwdata, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libpciaccess"; + version = "0.18.1"; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libpciaccess-${finalAttrs.version}.tar.xz"; + hash = "sha256-SvQ0RLOK21VF0O0cLORtlgjMR7McI4f8UYFlZ2Wm+nY="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = + [ zlib ] + ++ lib.optionals stdenv.hostPlatform.isNetBSD [ + netbsd.libarch + netbsd.libpci + ]; + + mesonFlags = [ + (lib.mesonOption "pci-ids" "${hwdata}/share/hwdata") + (lib.mesonEnable "zlib" true) + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Generic PCI access library"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libpciaccess"; + license = with lib.licenses; [ + mit + isc + x11 + ]; + pkgConfigModules = [ "pciaccess" ]; + # https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/blob/6cd5a4afbb70868c7746de8d50dea59e02e9acf2/configure.ac#L108-114 + platforms = + with lib.platforms; + cygwin + ++ freebsd + ++ illumos + ++ linux + ++ lib.platforms.netbsd # otherwise netbsd from the function arguments is used + ++ openbsd; + badPlatforms = [ + # mandatory shared library + lib.systems.inspect.platformPatterns.isStatic + ]; + }; +}) diff --git a/pkgs/by-name/li/libpg_query/package.nix b/pkgs/by-name/li/libpg_query/package.nix index fd39d60da250..c25f12819f2a 100644 --- a/pkgs/by-name/li/libpg_query/package.nix +++ b/pkgs/by-name/li/libpg_query/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "libpg_query"; - version = "17-6.0.0"; + version = "17-6.1.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; tag = version; - hash = "sha256-hwF3kowuMmc1eXMdvhoCpBxT6++wp29MRYhy4S5Jhfg="; + hash = "sha256-UXba2WYyIO7RcFcNZeLL+Q9CwlloMZ5oFfHfL7+j4dU="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/by-name/li/libphidget22/package.nix b/pkgs/by-name/li/libphidget22/package.nix index f3fa7d72f1c6..8f38eaf8847e 100644 --- a/pkgs/by-name/li/libphidget22/package.nix +++ b/pkgs/by-name/li/libphidget22/package.nix @@ -7,7 +7,7 @@ }: let # This package should be updated together with libphidget22extra - version = "1.21.20241122"; + version = "1.22.20250324"; in stdenv.mkDerivation { pname = "libphidget22"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22/libphidget22-${version}.tar.gz"; - hash = "sha256-6Sib9CSaPUbAdyHfoSgQ6g4oik7+pjb7g79QftSeVIk="; + hash = "sha256-FR/+b4z73LtGQdT4gypre9SZmZSiWzP/Q+00uia1lhA="; }; nativeBuildInputs = [ automake ]; diff --git a/pkgs/by-name/li/libphidget22extra/package.nix b/pkgs/by-name/li/libphidget22extra/package.nix index 1072b798b42f..ffe239d5570e 100644 --- a/pkgs/by-name/li/libphidget22extra/package.nix +++ b/pkgs/by-name/li/libphidget22extra/package.nix @@ -9,7 +9,7 @@ let # This package should be updated together with libphidget22 - version = "1.21.20241122"; + version = "1.22.20250324"; in stdenv.mkDerivation { pname = "libphidget22extra"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22extra/libphidget22extra-${version}.tar.gz"; - hash = "sha256-l8lwEpdR87U2pb0jOAkrI/157B+87QvSVtAtOfedaBo="; + hash = "sha256-8FTd/hyqzZKWN68FAxrV1N0pPglNAbZ/aRH4V6hEgBM="; }; nativeBuildInputs = [ automake ]; diff --git a/pkgs/development/libraries/libphonenumber/build-reproducibility.patch b/pkgs/by-name/li/libphonenumber/build-reproducibility.patch similarity index 100% rename from pkgs/development/libraries/libphonenumber/build-reproducibility.patch rename to pkgs/by-name/li/libphonenumber/build-reproducibility.patch diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix new file mode 100644 index 000000000000..5e329d4faa02 --- /dev/null +++ b/pkgs/by-name/li/libphonenumber/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildPackages, + cmake, + gtest, + jre, + pkg-config, + boost, + icu, + protobuf, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libphonenumber"; + version = "9.0.5"; + + src = fetchFromGitHub { + owner = "google"; + repo = "libphonenumber"; + rev = "v${finalAttrs.version}"; + hash = "sha256-CVT0HBT4WnlTrT8mhapJjyIbd+pp7uxrZxa9ZlXVm3c="; + }; + + patches = [ + # An earlier version of this patch was submitted upstream but did not get + # any interest there - https://github.com/google/libphonenumber/pull/2921 + ./build-reproducibility.patch + ]; + + nativeBuildInputs = [ + cmake + gtest + jre + pkg-config + ]; + + buildInputs = [ + boost + icu + protobuf + ]; + + cmakeDir = "../cpp"; + + doCheck = true; + + checkTarget = "tests"; + + cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + (lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages)) + (lib.cmakeFeature "PROTOC_BIN" (lib.getExe buildPackages.protobuf)) + ]; + + meta = with lib; { + changelog = "https://github.com/google/libphonenumber/blob/${finalAttrs.src.rev}/release_notes.txt"; + description = "Google's i18n library for parsing and using phone numbers"; + homepage = "https://github.com/google/libphonenumber"; + license = licenses.asl20; + maintainers = with maintainers; [ illegalprime ]; + }; +}) diff --git a/pkgs/by-name/li/libpinyin/package.nix b/pkgs/by-name/li/libpinyin/package.nix index beec0a4a8cd5..895c9088f224 100644 --- a/pkgs/by-name/li/libpinyin/package.nix +++ b/pkgs/by-name/li/libpinyin/package.nix @@ -7,6 +7,7 @@ glib, db, pkg-config, + nix-update-script, }: let @@ -15,15 +16,15 @@ let hash = "sha256-WcaOidQ/+F9aMJSJSZy83igtKwS9kYiHNIhLfe/LEVU="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libpinyin"; - version = "2.10.0"; + version = "2.10.2"; src = fetchFromGitHub { owner = "libpinyin"; repo = "libpinyin"; - tag = version; - hash = "sha256-WUC1l+8q4TYDVbKwwk9lG5Wc5DM52BaZefcre0WQoBE="; + tag = finalAttrs.version; + hash = "sha256-EexmZFGvuMextbiMZ6mSV58UUUjVVGMQubtS6DzoBs0="; }; postUnpack = '' @@ -42,14 +43,15 @@ stdenv.mkDerivation rec { db ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Library for intelligent sentence-based Chinese pinyin input method"; homepage = "https://github.com/libpinyin/libpinyin"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ linsui - ericsagnes ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libpisp/package.nix b/pkgs/by-name/li/libpisp/package.nix new file mode 100644 index 000000000000..2a9dd59d2d46 --- /dev/null +++ b/pkgs/by-name/li/libpisp/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + meson, + ninja, + boost, + nlohmann_json, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libpisp"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = "libpisp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-YshU7G5Rov67CVwFbf5ENp2j5ptAvkVrlMu85KmnEpk="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + buildInputs = [ + boost + nlohmann_json + ]; + + meta = with lib; { + homepage = "https://github.com/raspberrypi/libpisp"; + description = "A helper library to generate run-time configuration for the Raspberry Pi ISP (PiSP), consisting of the Frontend and Backend hardware components."; + license = licenses.bsd2; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/li/libpkgconf/package.nix b/pkgs/by-name/li/libpkgconf/package.nix index 1e2472880193..bbda6d817ebe 100644 --- a/pkgs/by-name/li/libpkgconf/package.nix +++ b/pkgs/by-name/li/libpkgconf/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkgconf"; - version = "2.3.0"; + version = "2.4.3"; src = fetchurl { url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-${finalAttrs.version}.tar.xz"; - hash = "sha256-OpCArFHQNhXnwZEKCiqN8IQkiStfE7BiiiBNP8zg6os="; + hash = "sha256-USA9me1XP6c0S/B8pibxDHzAlOCEasSqACO9DIPCWkE="; }; outputs = [ diff --git a/pkgs/by-name/li/libplctag/package.nix b/pkgs/by-name/li/libplctag/package.nix index b83fb999b2aa..15a07807b564 100644 --- a/pkgs/by-name/li/libplctag/package.nix +++ b/pkgs/by-name/li/libplctag/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libplctag"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; tag = "v${finalAttrs.version}"; - hash = "sha256-HUog7Tlm4jiqYXk22dziumCA/68c35+OwnTNYu9mV5E="; + hash = "sha256-pk+N78MITI8G+LHyc6fXhqWeLyCOdUEkPePM2RtpMCE="; }; env = { diff --git a/pkgs/by-name/li/libpoly/package.nix b/pkgs/by-name/li/libpoly/package.nix index 815932ca481b..108d69d55ee2 100644 --- a/pkgs/by-name/li/libpoly/package.nix +++ b/pkgs/by-name/li/libpoly/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libpoly"; - version = "0.1.13"; + version = "0.2.0"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "libpoly"; # they've pushed to the release branch, use explicit tag tag = "v${version}"; - sha256 = "sha256-7aFz+6XJOVEA/Fmi0ywd6rZdTW8sHq8MoHqXR0Hc2o4="; + sha256 = "sha256-gE2O1YfiVab/aIqheoMP8GhE+N3yho7kb5EP56pzjW8="; }; postPatch = '' diff --git a/pkgs/by-name/li/libpqxx/package.nix b/pkgs/by-name/li/libpqxx/package.nix index 0e1dc11f2e90..2c7b7ac64969 100644 --- a/pkgs/by-name/li/libpqxx/package.nix +++ b/pkgs/by-name/li/libpqxx/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpqxx"; - version = "7.10.0"; + version = "7.10.1"; src = fetchFromGitHub { owner = "jtv"; repo = "libpqxx"; rev = finalAttrs.version; - hash = "sha256-llsnd1bxAyiEgo9PfWYdQp1RPPk1oF/02IgMvPhodZ0="; + hash = "sha256-BVmIyJA5gDibwtmDvw7b300D0KdWv7c3Ytye6fiLAXU="; }; outputs = [ diff --git a/pkgs/by-name/li/libproxy/package.nix b/pkgs/by-name/li/libproxy/package.nix index 67ccc456dc74..191a7d484d69 100644 --- a/pkgs/by-name/li/libproxy/package.nix +++ b/pkgs/by-name/li/libproxy/package.nix @@ -2,7 +2,6 @@ lib, _experimental-update-script-combinators, curl, - darwin, duktape, fetchFromGitHub, gi-docgen, @@ -88,17 +87,10 @@ stdenv.mkDerivation (finalAttrs: { curl duktape ] - ++ ( - if stdenv.hostPlatform.isDarwin then - (with darwin.apple_sdk.frameworks; [ - Foundation - ]) - else - [ - glib - gsettings-desktop-schemas - ] - ); + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + glib + gsettings-desktop-schemas + ]; mesonFlags = [ diff --git a/pkgs/by-name/li/libpseudo/package.nix b/pkgs/by-name/li/libpseudo/package.nix deleted file mode 100644 index 23dd33253eda..000000000000 --- a/pkgs/by-name/li/libpseudo/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - glib, - ncurses, -}: -stdenv.mkDerivation rec { - pname = "libpseudo"; - version = "1.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/libpseudo/libpseudo-${version}.tar.gz"; - sha256 = "0d3pw0m3frycr3x5kzqcaj4r2qh43iv6b0fpd6l4yk0aa4a9560n"; - }; - - patchPhase = '' - sed -i -e s@/usr/local@$out@ -e /ldconfig/d Makefile - ''; - - preInstall = '' - mkdir -p $out/include - mkdir -p $out/lib - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - glib - ncurses - ]; - - meta = with lib; { - homepage = "http://libpseudo.sourceforge.net/"; - description = "Simple, thread-safe messaging between threads"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/li/libpthread-stubs/package.nix b/pkgs/by-name/li/libpthread-stubs/package.nix new file mode 100644 index 000000000000..8ad5577de7b6 --- /dev/null +++ b/pkgs/by-name/li/libpthread-stubs/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchurl, + testers, + writeScript, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libpthread-stubs"; + version = "0.5"; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libpthread-stubs-${finalAttrs.version}.tar.xz"; + hash = "sha256-WdpWbezOunwqeXCkoDtI2ZBfEmL/lEEKZJIk4z0kQrw="; + }; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Provides a pkg-config file `pthread-stubs.pc` containing the Cflags/Libs flags applicable to programs/libraries that use only lightweight pthread API"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/pthread-stubs"; + # gitlab says x11-distribute-modifications but it's not + # maybe due to https://github.com/spdx/spdx-online-tools/issues/540 + license = lib.licenses.x11; + maintainers = [ ]; + pkgConfigModules = [ "pthread-stubs" ]; + # on these platforms according to the readme + platforms = with lib.platforms; linux ++ cygwin ++ darwin ++ [ "x86_64-solaris" ]; + }; +}) diff --git a/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch b/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch deleted file mode 100644 index f9ffbb589bf7..000000000000 --- a/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/docs/reference/libqmi-glib/meson.build b/docs/reference/libqmi-glib/meson.build -index 2f5cfc3..14e1aea 100644 ---- a/docs/reference/libqmi-glib/meson.build -+++ b/docs/reference/libqmi-glib/meson.build -@@ -57,6 +57,7 @@ sections_txt = custom_target( - capture: true, - command: [find_program('cat'), '@INPUT@'] + gen_sections, - depends: gen_sections_deps, -+ build_by_default: true, - ) - - version_xml = configure_file( diff --git a/pkgs/by-name/li/libqmi/package.nix b/pkgs/by-name/li/libqmi/package.nix index daa61c7d3a1e..9f1f8986ff4a 100644 --- a/pkgs/by-name/li/libqmi/package.nix +++ b/pkgs/by-name/li/libqmi/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.34.0"; + version = "1.36.0"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "mobile-broadband"; repo = "libqmi"; rev = version; - hash = "sha256-l9ev9ZOWicVNZ/Wj//KNd3NHcefIrLVriqJhEpwWvtQ="; + hash = "sha256-cGNnw0vO/Hr9o/eIf6lLTsoGiEkTvZiArgO7tAc208U="; }; nativeBuildInputs = @@ -88,10 +88,6 @@ stdenv.mkDerivation rec { ]; doCheck = true; - patches = [ - # https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/124 - ./build_doc_deps_by_default.patch - ]; postPatch = '' patchShebangs \ @@ -101,7 +97,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libqmi/"; description = "Modem protocol helper library"; - maintainers = teams.freedesktop.members; + teams = [ teams.freedesktop ]; platforms = platforms.linux; license = with licenses; [ # Library diff --git a/pkgs/by-name/li/libqrtr-glib/package.nix b/pkgs/by-name/li/libqrtr-glib/package.nix index 852d76906a66..1d0eec5c17dc 100644 --- a/pkgs/by-name/li/libqrtr-glib/package.nix +++ b/pkgs/by-name/li/libqrtr-glib/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"; description = "Qualcomm IPC Router protocol helper library"; - maintainers = teams.freedesktop.members; + teams = [ teams.freedesktop ]; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/by-name/li/librasterlite2/package.nix b/pkgs/by-name/li/librasterlite2/package.nix new file mode 100644 index 000000000000..25f7da35280b --- /dev/null +++ b/pkgs/by-name/li/librasterlite2/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + validatePkgConfig, + cairo, + curl, + fontconfig, + freetype, + freexl, + geos, + giflib, + libgeotiff, + libjpeg, + libpng, + librttopo, + libspatialite, + libtiff, + libwebp, + libxml2, + lz4, + minizip, + openjpeg, + pixman, + proj, + sqlite, + zstd, +}: + +stdenv.mkDerivation rec { + pname = "librasterlite2"; + version = "1.1.0-beta1"; + + src = fetchurl { + url = "https://www.gaia-gis.it/gaia-sins/librasterlite2-sources/librasterlite2-${version}.tar.gz"; + hash = "sha256-9yhM38B600OjFOSHjfAwCHSwFF2dMxsGOwlrSC5+RPQ="; + }; + + # Fix error: unknown type name 'time_t' + postPatch = '' + sed -i '49i #include ' headers/rasterlite2_private.h + ''; + + nativeBuildInputs = [ + pkg-config + validatePkgConfig + geos # for geos-config + ]; + + buildInputs = [ + cairo + curl + fontconfig + freetype + freexl + giflib + geos + libgeotiff + libjpeg + libpng + librttopo + libspatialite + libtiff + libwebp + libxml2 + lz4 + minizip + openjpeg + pixman + proj + sqlite + zstd + ]; + + enableParallelBuilding = true; + + # Failed tests: + # - check_sql_stmt + doCheck = false; + + meta = with lib; { + description = "Advanced library supporting raster handling methods"; + homepage = "https://www.gaia-gis.it/fossil/librasterlite2"; + # They allow any of these + license = with licenses; [ + gpl2Plus + lgpl21Plus + mpl11 + ]; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix new file mode 100644 index 000000000000..97749fc5ea0b --- /dev/null +++ b/pkgs/by-name/li/libre/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + zlib, + openssl, + cmake, +}: + +stdenv.mkDerivation rec { + version = "3.10.0"; + pname = "libre"; + src = fetchFromGitHub { + owner = "baresip"; + repo = "re"; + rev = "v${version}"; + sha256 = "sha256-OWVDuKlF7YLipDURC46s14WOLWWagUqWg20sH0kSIA4="; + }; + + buildInputs = [ + openssl + zlib + ]; + + nativeBuildInputs = [ cmake ]; + makeFlags = + [ + "USE_ZLIB=1" + "USE_OPENSSL=1" + "PREFIX=$(out)" + ] + ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" + ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"; + enableParallelBuilding = true; + meta = { + description = "Library for real-time communications with async IO support and a complete SIP stack"; + homepage = "https://github.com/baresip/re"; + maintainers = with lib.maintainers; [ raskin ]; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/by-name/li/librechat/0001-npm-pack.patch b/pkgs/by-name/li/librechat/0001-npm-pack.patch new file mode 100644 index 000000000000..880c67d03c2e --- /dev/null +++ b/pkgs/by-name/li/librechat/0001-npm-pack.patch @@ -0,0 +1,20 @@ +diff --git a/package.json b/package.json +index 2131951..91e4846 100644 +--- a/package.json ++++ b/package.json +@@ -114,5 +114,15 @@ + "admin/", + "packages/" + ] ++ }, ++ "files": [ ++ "api", ++ "client/dist", ++ "packages/data-provider", ++ "packages/data-schemas", ++ "packages/mcp" ++ ], ++ "bin": { ++ "librechat-server": "api/server/index.js" + } + } diff --git a/pkgs/by-name/li/librechat/0002-logs.patch b/pkgs/by-name/li/librechat/0002-logs.patch new file mode 100644 index 000000000000..64cc268277c3 --- /dev/null +++ b/pkgs/by-name/li/librechat/0002-logs.patch @@ -0,0 +1,26 @@ +diff --git a/api/config/meiliLogger.js b/api/config/meiliLogger.js +index 195b387..d445e54 100644 +--- a/api/config/meiliLogger.js ++++ b/api/config/meiliLogger.js +@@ -2,7 +2,7 @@ const path = require('path'); + const winston = require('winston'); + require('winston-daily-rotate-file'); + +-const logDir = path.join(__dirname, '..', 'logs'); ++const logDir = path.join('.', 'logs'); + + const { NODE_ENV } = process.env; + +diff --git a/api/config/winston.js b/api/config/winston.js +index 8f51b99..2ebd041 100644 +--- a/api/config/winston.js ++++ b/api/config/winston.js +@@ -3,7 +3,7 @@ const winston = require('winston'); + require('winston-daily-rotate-file'); + const { redactFormat, redactMessage, debugTraverse, jsonTruncateFormat } = require('./parsers'); + +-const logDir = path.join(__dirname, '..', 'logs'); ++const logDir = path.join('.', 'logs'); + + const { NODE_ENV, DEBUG_LOGGING = true, DEBUG_CONSOLE = false, CONSOLE_JSON = false } = process.env; + \ No newline at end of file diff --git a/pkgs/by-name/li/librechat/0003-upload-paths.patch b/pkgs/by-name/li/librechat/0003-upload-paths.patch new file mode 100644 index 000000000000..50ec5380c545 --- /dev/null +++ b/pkgs/by-name/li/librechat/0003-upload-paths.patch @@ -0,0 +1,20 @@ +diff --git a/api/config/paths.js b/api/config/paths.js +index 165e9e6..fc85083 100644 +--- a/api/config/paths.js ++++ b/api/config/paths.js +@@ -2,13 +2,13 @@ const path = require('path'); + + module.exports = { + root: path.resolve(__dirname, '..', '..'), +- uploads: path.resolve(__dirname, '..', '..', 'uploads'), ++ uploads: path.resolve('.', 'uploads'), + clientPath: path.resolve(__dirname, '..', '..', 'client'), + dist: path.resolve(__dirname, '..', '..', 'client', 'dist'), + publicPath: path.resolve(__dirname, '..', '..', 'client', 'public'), + fonts: path.resolve(__dirname, '..', '..', 'client', 'public', 'fonts'), + assets: path.resolve(__dirname, '..', '..', 'client', 'public', 'assets'), +- imageOutput: path.resolve(__dirname, '..', '..', 'client', 'public', 'images'), ++ imageOutput: path.resolve('.', 'images'), + structuredTools: path.resolve(__dirname, '..', 'app', 'clients', 'tools', 'structured'), + pluginManifest: path.resolve(__dirname, '..', 'app', 'clients', 'tools', 'manifest.json'), + }; diff --git a/pkgs/by-name/li/librechat/package.nix b/pkgs/by-name/li/librechat/package.nix new file mode 100644 index 000000000000..ba5b361880a9 --- /dev/null +++ b/pkgs/by-name/li/librechat/package.nix @@ -0,0 +1,73 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + pkg-config, + node-gyp, + vips, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "librechat"; + version = "0.7.8"; + + src = fetchFromGitHub { + owner = "danny-avila"; + repo = "LibreChat"; + tag = "v${version}"; + hash = "sha256-bo26EzpRjE2hbbx6oUo0tDsLMdVpWcazCIzA5sm5L34="; + }; + + patches = [ + # `buildNpmPackage` relies on `npm pack`, which only includes files explicitly + # listed in the project's package.json `files` array if this property is set. + # LibreChat does not set this property, but we can avoid packaging the whole + # workspace by simply adding the relevant paths here ourselves. + # Also, we set the `bin` property to the server script to benefit from the + # auto-generated wrapper. + ./0001-npm-pack.patch + # LibreChat tries writing logs to the package directory, which is immutable + # in our case. We patch the log directory to target the current working directory + # instead, which in case of NixOS will be the service's data directory. + ./0002-logs.patch + # Similarly to the logs, user uploads are by default written to the package + # directory as well. Again, we patch this to be relative to the current working + # directory instead. + ./0003-upload-paths.patch + ]; + + npmDepsHash = "sha256-knmS2I6AiSdV2bSnNBThbVHdkpk6iXiRuk4adciDK1M="; + + nativeBuildInputs = [ + pkg-config + node-gyp + ]; + + buildInputs = [ + vips + ]; + + # required for sharp + makeCacheWritable = true; + + npmBuildScript = "frontend"; + npmPruneFlags = [ "--omit=dev" ]; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v(\\d+\\.\\d+\\.\\d+)$" + ]; + }; + }; + + meta = { + description = "Open-source app for all your AI conversations, fully customizable and compatible with any AI provider"; + homepage = "https://github.com/danny-avila/LibreChat"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ niklaskorz ]; + mainProgram = "librechat-server"; + }; +} diff --git a/pkgs/by-name/li/libremidi/package.nix b/pkgs/by-name/li/libremidi/package.nix index a5a16f53e338..4490619f1f71 100644 --- a/pkgs/by-name/li/libremidi/package.nix +++ b/pkgs/by-name/li/libremidi/package.nix @@ -2,19 +2,10 @@ lib, alsa-lib, cmake, - darwin, fetchFromGitHub, stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) - CoreAudio - CoreFoundation - CoreMIDI - CoreServices - ; -in stdenv.mkDerivation (finalAttrs: { pname = "libremidi"; version = "4.5.0"; @@ -30,16 +21,9 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio - CoreFoundation - CoreMIDI - CoreServices - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; # Bug: set this as true breaks obs-studio-plugins.advanced-scene-switcher strictDeps = false; diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix index 4fc0dd740df2..becb2c17bf2e 100644 --- a/pkgs/by-name/li/librenms/package.nix +++ b/pkgs/by-name/li/librenms/package.nix @@ -27,16 +27,16 @@ let in phpPackage.buildComposerProject2 rec { pname = "librenms"; - version = "25.3.0"; + version = "25.4.0"; src = fetchFromGitHub { owner = "librenms"; repo = pname; tag = version; - sha256 = "sha256-iCcBP/BDHdTxlzgDGZzBdT0tFL26oCvMI+q2UuEg5jw="; + sha256 = "sha256-t+RupwKnUtQd3A0VzWhCXNzc+TnVnDMaMJ6Jcgp+Sfg="; }; - vendorHash = "sha256-0YBXORA647IfR0Fes2q4lbJsgrkpcvRj1aIHJ/Te/zU="; + vendorHash = "sha256-t/3wBSXJJHqbGR1iKF4zC2Ia99gXNlanabR/iPPlHqw="; php = phpPackage; @@ -127,7 +127,8 @@ phpPackage.buildComposerProject2 rec { description = "Auto-discovering PHP/MySQL/SNMP based network monitoring"; homepage = "https://www.librenms.org/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ netali ] ++ teams.wdz.members; + maintainers = with maintainers; [ netali ]; + teams = [ teams.wdz ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/li/librep/package.nix b/pkgs/by-name/li/librep/package.nix index 1524c799d44c..795d43eea991 100644 --- a/pkgs/by-name/li/librep/package.nix +++ b/pkgs/by-name/li/librep/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; meta = { diff --git a/pkgs/by-name/li/librespeed-cli/package.nix b/pkgs/by-name/li/librespeed-cli/package.nix index 627686d58d1b..893183bee5d8 100644 --- a/pkgs/by-name/li/librespeed-cli/package.nix +++ b/pkgs/by-name/li/librespeed-cli/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, }: @@ -11,8 +12,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "librespeed"; repo = "speedtest-cli"; - rev = "v${version}"; - sha256 = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8="; + tag = "v${version}"; + hash = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8="; }; vendorHash = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ="; @@ -23,8 +24,10 @@ buildGoModule rec { meta = with lib; { description = "Command line client for LibreSpeed"; homepage = "https://github.com/librespeed/speedtest-cli"; - license = with licenses; [ lgpl3Only ]; + changelog = "https://github.com/librespeed/speedtest-cli/releases/tag/${src.tag}"; + license = licenses.lgpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "speedtest-cli"; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/li/libresplit/package.nix b/pkgs/by-name/li/libresplit/package.nix index 8ef17056ad05..5eb9d2763e7d 100644 --- a/pkgs/by-name/li/libresplit/package.nix +++ b/pkgs/by-name/li/libresplit/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "libresplit"; - version = "0-unstable-2024-09-24"; + version = "0-unstable-2025-04-05"; src = fetchFromGitHub { owner = "wins1ey"; repo = "LibreSplit"; - rev = "b56ce6743378fc09c9ab621713423754eac945a1"; - hash = "sha256-mhX5xyBmElPV6NUQRTz8KKL+H1on3WJ4DYatv89MRPo="; + rev = "2dd5dfc684b777b814b4cbd3ea7fee8028157cd5"; + hash = "sha256-FHOX6trRjn+IoiVRdbV6mHUUAzxbRLDWluxGM1GxFVk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix new file mode 100644 index 000000000000..ce7e93fba84f --- /dev/null +++ b/pkgs/by-name/li/libresprite/package.nix @@ -0,0 +1,109 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + cmake, + pkg-config, + ninja, + gtest, + + curl, + freetype, + giflib, + libjpeg, + libpng, + libwebp, + libarchive, + libX11, + pixman, + tinyxml-2, + zlib, + SDL2, + SDL2_image, + lua, + + nixosTests, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libresprite"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "LibreSprite"; + repo = "LibreSprite"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-piA/hLQqdfyVH4GPu5ElXZtowQL9AGaK7GhZOME4L0Q="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ninja + gtest + ]; + + buildInputs = [ + curl + freetype + giflib + libjpeg + libpng + libwebp + libarchive + libX11 + pixman + tinyxml-2 + zlib + SDL2 + SDL2_image + lua + # no v8 due to missing libplatform and libbase + ]; + + cmakeFlags = [ + "-DWITH_DESKTOP_INTEGRATION=ON" + "-DWITH_WEBP_SUPPORT=ON" + ]; + + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "format"; + + # Install mime icons. Note that the mimetype is still "x-aseprite" + postInstall = '' + src="$out/share/libresprite/data/icons" + for size in 16 32 48 64; do + dst="$out"/share/icons/hicolor/"$size"x"$size" + install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/aseprite.png + done + ''; + + passthru.tests = { + libresprite-can-open-png = nixosTests.libresprite; + }; + + meta = { + homepage = "https://libresprite.github.io/"; + description = "Animated sprite editor & pixel art tool, fork of Aseprite"; + license = lib.licenses.gpl2Only; + longDescription = '' + LibreSprite is a program to create animated sprites. Its main features are: + + - Sprites are composed by layers & frames (as separated concepts). + - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. + - Load/save sequence of PNG files and GIF animations (and FLC, FLI, JPG, BMP, PCX, TGA). + - Export/import animations to/from Sprite Sheets. + - Tiled drawing mode, useful to draw patterns and textures. + - Undo/Redo for every operation. + - Real-time animation preview. + - Multiple editors support. + - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. + - Onion skinning. + ''; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; + # https://github.com/LibreSprite/LibreSprite/issues/308 + broken = stdenv.hostPlatform.isDarwin; + }; +}) diff --git a/pkgs/by-name/li/libretls/package.nix b/pkgs/by-name/li/libretls/package.nix new file mode 100644 index 000000000000..83458085b9e6 --- /dev/null +++ b/pkgs/by-name/li/libretls/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + libtool, + openssl, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libretls"; + version = "3.8.1"; + + src = fetchgit { + url = "https://git.causal.agency/libretls"; + tag = finalAttrs.version; + hash = "sha256-cFu9v8vOkfvIj/OfD0Er3n+gbH1h1CHOHA6a0pJuwXY="; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + libtool + ]; + + autoreconfFlags = [ + "--force" + "--install" + ]; + + buildInputs = [ openssl ]; + + strictDeps = true; + + meta = { + description = "Libtls for OpenSSL"; + homepage = "https://git.causal.agency/libretls/about/"; + changelog = "https://git.causal.agency/libretls/tag/?h=${finalAttrs.version}"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ mtrsk ]; + }; +}) diff --git a/pkgs/by-name/li/libretro-core-info/package.nix b/pkgs/by-name/li/libretro-core-info/package.nix index bbb65756751b..3f46c7482e06 100644 --- a/pkgs/by-name/li/libretro-core-info/package.nix +++ b/pkgs/by-name/li/libretro-core-info/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "libretro-core-info"; - version = "1.20.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; rev = "v${version}"; - hash = "sha256-T/La/Y9txRX8SHAyOi45KcQA8zb3puXdfTKlPSm42+U="; + hash = "sha256-k3fVXTDOLOItRq1AC+CU9cCiBH4+T5LAG6NBo3JV2Ys="; }; makeFlags = [ @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec { description = "Libretro's core info files"; homepage = "https://libretro.com"; license = licenses.mit; - maintainers = with maintainers; teams.libretro.members ++ [ ]; + teams = [ teams.libretro ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index adbc3ca89e7b..d371b4371d03 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2025-03-13"; + version = "0-unstable-2025-05-17"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "25311dc03332d9ef2dff8d9d06c611d828028fac"; - hash = "sha256-nmDjjQgxpZcddOHlBAE9CKdR95u+6lEYXcmIwH9RHXo="; + rev = "37aa1f355e19701b192ae0b88855094fe2f5ff22"; + hash = "sha256-30xMYR54z7aJqQZL8zqO93n12vYA7uE3GnZTHP92uRc="; }; dontConfigure = true; diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix index 186397adb882..3e18103e637f 100644 --- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix @@ -37,7 +37,7 @@ let pname = "librewolf-bin-unwrapped"; - version = "136.0.4-1"; + version = "138.0.1-2"; in stdenv.mkDerivation { @@ -47,9 +47,9 @@ stdenv.mkDerivation { url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz"; hash = { - i686-linux = "sha256-olqGXteeHqT456SEMEHjPWcnypABGZbFvlpWKBF962Y="; - x86_64-linux = "sha256-3zcI1ND+laXFAv7nDlUEDjM007XHglnMYyFkd1n+sR8="; - aarch64-linux = "sha256-9OwVuKsTJZ7js846BZSzXiyz53d0ebXwugXyrmnFFQc="; + i686-linux = "sha256-sr4qnFpWubAsdBr18xLSMwBCkCX6JB0VnwiJxu4b+Dc="; + x86_64-linux = "sha256-BW8CirLL8YJl+aXwGWo3n3RN04LWs3ca4Isy5Krrjpg="; + aarch64-linux = "sha256-LLUQ87HcsnxYfTvniKIHVY+pqTWpdqN1a7gRQn3Ll7Y="; } .${stdenv.hostPlatform.system} or throwSystem; }; diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix new file mode 100644 index 000000000000..9e156eaccbe6 --- /dev/null +++ b/pkgs/by-name/li/librsvg/package.nix @@ -0,0 +1,231 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + meson, + ninja, + glib, + gdk-pixbuf, + installShellFiles, + pango, + freetype, + cairo, + libxml2, + bzip2, + dav1d, + rustPlatform, + rustc, + cargo-c, + cargo-auditable-cargo-wrapper, + gi-docgen, + python3Packages, + gnome, + vala, + shared-mime-info, + # Requires building a cdylib. + withPixbufLoader ? !stdenv.hostPlatform.isStatic, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + buildPackages, + gobject-introspection, + mesonEmulatorHook, + _experimental-update-script-combinators, + common-updater-scripts, + jq, + nix, + + # for passthru.tests + enlightenment, + ffmpeg, + gegl, + gimp, + imagemagick, + imlib2, + vips, + xfce, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "librsvg"; + version = "2.60.0"; + + outputs = + [ + "out" + "dev" + ] + ++ lib.optionals withIntrospection [ + "devdoc" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; + hash = "sha256-C2/8zfbnCvyYdogvXSzp/88scTy6rxrZAXDap1Lh7sM="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + name = "librsvg-deps-${finalAttrs.version}"; + hash = "sha256-DMkYsskjw6ARQsaHDRautT0oy8VqW/BJBfBVErxUe88="; + dontConfigure = true; + }; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = + [ + installShellFiles + pkg-config + meson + ninja + rustc + cargo-c + cargo-auditable-cargo-wrapper + python3Packages.docutils + rustPlatform.cargoSetupHook + ] + ++ lib.optionals withIntrospection [ + gobject-introspection + gi-docgen + vala # vala bindings require GObject introspection + ] + ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + buildInputs = + [ + libxml2 + bzip2 + dav1d + pango + freetype + ] + ++ lib.optionals withIntrospection [ + vala # for share/vala/Makefile.vapigen + ]; + + propagatedBuildInputs = [ + glib + gdk-pixbuf + cairo + ]; + + mesonFlags = [ + "-Dtriplet=${stdenv.hostPlatform.rust.rustcTarget}" + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "pixbuf-loader" withPixbufLoader) + (lib.mesonEnable "vala" withIntrospection) + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) + ]; + + # Probably broken MIME type detection on Darwin. + # Tests fail with imprecise rendering on i686. + doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isi686; + + env = { + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = buildPackages.writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' + ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders + ''; + }; + + postPatch = '' + patchShebangs \ + meson/cargo_wrapper.py \ + meson/makedef.py \ + meson/query-rustc.py + + # Fix thumbnailer path + substituteInPlace gdk-pixbuf-loader/librsvg.thumbnailer.in \ + --replace-fail '@bindir@/gdk-pixbuf-thumbnailer' '${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer' + ''; + + preCheck = '' + # Tests complain: Fontconfig error: No writable cache directories + export HOME=$TMPDIR + + # https://gitlab.gnome.org/GNOME/librsvg/-/issues/258#note_251789 + export XDG_DATA_DIRS=${shared-mime-info}/share:$XDG_DATA_DIRS + ''; + + postInstall = + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + lib.optionalString withPixbufLoader '' + # Merge gdkpixbuf and librsvg loaders + GDK_PIXBUF=$out/${gdk-pixbuf.binaryDir} + cat ${lib.getLib gdk-pixbuf}/${gdk-pixbuf.binaryDir}/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp + mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache + '' + + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + installShellCompletion --cmd rsvg-convert \ + --bash <(${emulator} $out/bin/rsvg-convert --completion bash) \ + --fish <(${emulator} $out/bin/rsvg-convert --completion fish) \ + --zsh <(${emulator} $out/bin/rsvg-convert --completion zsh) + ''; + + postFixup = lib.optionalString withIntrospection '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = + let + updateSource = gnome.updateScript { + packageName = "librsvg"; + }; + + updateLockfile = { + command = [ + "sh" + "-c" + '' + PATH=${ + lib.makeBinPath [ + common-updater-scripts + jq + nix + ] + } + update-source-version librsvg --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null + '' + ]; + # Experimental feature: do not copy! + supportedFeatures = [ "silent" ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateLockfile + ]; + tests = { + inherit + gegl + gimp + imagemagick + imlib2 + vips + ; + inherit (enlightenment) efl; + inherit (xfce) xfwm4; + ffmpeg = ffmpeg.override { withSvg = true; }; + }; + }; + + meta = with lib; { + description = "Small library to render SVG images to Cairo surfaces"; + homepage = "https://gitlab.gnome.org/GNOME/librsvg"; + license = licenses.lgpl2Plus; + teams = [ teams.gnome ]; + mainProgram = "rsvg-convert"; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/librttopo/package.nix b/pkgs/by-name/li/librttopo/package.nix index 9eec8ba69bc3..339f618cd88c 100644 --- a/pkgs/by-name/li/librttopo/package.nix +++ b/pkgs/by-name/li/librttopo/package.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { description = "RT Topology Library"; homepage = "https://git.osgeo.org/gitea/rttopo/librttopo"; license = licenses.gpl2Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; + teams = [ teams.geospatial ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/li/libsamplerate/package.nix b/pkgs/by-name/li/libsamplerate/package.nix new file mode 100644 index 000000000000..776bd977cbb0 --- /dev/null +++ b/pkgs/by-name/li/libsamplerate/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libsndfile, +}: + +stdenv.mkDerivation rec { + pname = "libsamplerate"; + version = "0.2.2"; + + src = fetchurl { + url = "https://github.com/libsndfile/libsamplerate/releases/download/${version}/libsamplerate-${version}.tar.xz"; + hash = "sha256-MljaKAUR0ktJ1rCGFbvoJNDKzJhCsOTK8RxSzysEOJM="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libsndfile ]; + + configureFlags = [ "--disable-fftw" ]; + + outputs = [ + "dev" + "out" + ]; + + meta = with lib; { + description = "Sample Rate Converter for audio"; + homepage = "https://libsndfile.github.io/libsamplerate/"; + license = licenses.bsd2; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.all; + # Linker is unhappy with the `.def` file. + broken = stdenv.hostPlatform.isMinGW; + }; +} diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix index edc8f5a17666..f3721858b2da 100644 --- a/pkgs/by-name/li/libseccomp/package.nix +++ b/pkgs/by-name/li/libseccomp/package.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; badPlatforms = [ "alpha-linux" - "loongarch64-linux" "m68k-linux" "microblaze-linux" "microblazeel-linux" diff --git a/pkgs/by-name/li/libsecret/package.nix b/pkgs/by-name/li/libsecret/package.nix index 52bf76bc68a7..8ab83e3b6888 100644 --- a/pkgs/by-name/li/libsecret/package.nix +++ b/pkgs/by-name/li/libsecret/package.nix @@ -71,7 +71,7 @@ let in stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.21.6"; + version = "0.21.7"; outputs = [ "out" @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libsecret/${lib.versions.majorMinor version}/libsecret-${version}.tar.xz"; - hash = "sha256-dHuMF1vhCMiA0637nDU36mblIOStLcz13OWAA67soJA="; + hash = "sha256-a0UuR1BZCitWF63EACbyjS9JA94V8SUOHRxAv9aO1V4="; }; depsBuildBuild = [ @@ -221,6 +221,6 @@ stdenv.mkDerivation rec { lib.intersectLists glib.meta.platforms tpm2-tss.meta.platforms else glib.meta.platforms; - inherit (glib.meta) maintainers; + inherit (glib.meta) maintainers teams; }; } diff --git a/pkgs/by-name/li/libselinux/fix-build-32bit-lfs.patch b/pkgs/by-name/li/libselinux/fix-build-32bit-lfs.patch new file mode 100644 index 000000000000..ad9e91e652c8 --- /dev/null +++ b/pkgs/by-name/li/libselinux/fix-build-32bit-lfs.patch @@ -0,0 +1,41 @@ +diff --git libselinux/include/selinux/selinux.h libselinux/include/selinux/selinux.h +index f3cf5a209..f64896b7a 100644 +--- libselinux/include/selinux/selinux.h ++++ libselinux/include/selinux/selinux.h +@@ -537,7 +537,7 @@ extern int matchpathcon_index(const char *path, + with the same inode (e.g. due to multiple hard links). If so, then + use the latter of the two specifications based on their order in the + file contexts configuration. Return the used specification index. */ +-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && __BITS_PER_LONG < 64 ++#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(__INO64_T_TYPE) && !defined(__INO_T_MATCHES_INO64_T) + #define matchpathcon_filespec_add matchpathcon_filespec_add64 + #endif + extern int matchpathcon_filespec_add(ino_t ino, int specind, const char *file); +diff --git libselinux/src/matchpathcon.c libselinux/src/matchpathcon.c +index 51f0e4ff9..ab7c3090a 100644 +--- libselinux/src/matchpathcon.c ++++ libselinux/src/matchpathcon.c +@@ -261,7 +261,7 @@ int matchpathcon_filespec_add(ino_t ino, int specind, const char *file) + return -1; + } + +-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && __BITS_PER_LONG < 64 ++#if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) && defined(__INO64_T_TYPE) && !defined(__INO_T_MATCHES_INO64_T) + /* alias defined in the public header but we undefine it here */ + #undef matchpathcon_filespec_add + +@@ -280,9 +280,13 @@ int matchpathcon_filespec_add(unsigned long ino, int specind, + { + return matchpathcon_filespec_add64(ino, specind, file); + } ++#elif (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || defined(__INO_T_MATCHES_INO64_T) ++ ++static_assert(sizeof(uint64_t) == sizeof(ino_t), "inode size mismatch"); ++ + #else + +-static_assert(sizeof(unsigned long) == sizeof(ino_t), "inode size mismatch"); ++static_assert(sizeof(uint32_t) == sizeof(ino_t), "inode size mismatch"); + + #endif + diff --git a/pkgs/by-name/li/libselinux/package.nix b/pkgs/by-name/li/libselinux/package.nix index c4d5b7addae8..9c799e0199bc 100644 --- a/pkgs/by-name/li/libselinux/package.nix +++ b/pkgs/by-name/li/libselinux/package.nix @@ -15,112 +15,124 @@ assert enablePython -> swig != null && python3 != null; -stdenv.mkDerivation ( - rec { - pname = "libselinux"; - version = "3.8"; - inherit (libsepol) se_url; +stdenv.mkDerivation (finalAttrs: { + pname = "libselinux"; + version = "3.8.1"; + inherit (libsepol) se_url; - outputs = [ - "bin" - "out" - "dev" - "man" - ] ++ lib.optional enablePython "py"; + outputs = [ + "bin" + "out" + "dev" + "man" + ] ++ lib.optional enablePython "py"; - src = fetchurl { - url = "${se_url}/${version}/libselinux-${version}.tar.gz"; - hash = "sha256-DDdWvKBHyScCgdfE3N7NAAty44oYPJMGYeupaQg5tUE="; - }; + src = fetchurl { + url = "${finalAttrs.se_url}/${finalAttrs.version}/libselinux-${finalAttrs.version}.tar.gz"; + hash = "sha256-7C0nifkxFS0hwdsetLwgLOTszt402b6eNg47RSQ87iw="; + }; - patches = [ - # Make it possible to disable shared builds (for pkgsStatic). - # - # We can't use fetchpatch because it processes includes/excludes - # /after/ stripping the prefix, which wouldn't work here because - # there would be no way to distinguish between - # e.g. libselinux/src/Makefile and libsepol/src/Makefile. - # - # This is a static email, so we shouldn't have to worry about - # normalizing the patch. - (fetchurl { - url = "https://lore.kernel.org/selinux/20250211211651.1297357-3-hi@alyssa.is/raw"; - hash = "sha256-a0wTSItj5vs8GhIkfD1OPSjGmAJlK1orptSE7T3Hx20="; - postFetch = '' - mv "$out" $TMPDIR/patch - ${buildPackages.patchutils_0_3_3}/bin/filterdiff \ - -i 'a/libselinux/*' --strip 1 <$TMPDIR/patch >"$out" - ''; - }) + patches = [ + # Make it possible to disable shared builds (for pkgsStatic). + # + # We can't use fetchpatch because it processes includes/excludes + # /after/ stripping the prefix, which wouldn't work here because + # there would be no way to distinguish between + # e.g. libselinux/src/Makefile and libsepol/src/Makefile. + # + # This is a static email, so we shouldn't have to worry about + # normalizing the patch. + (fetchurl { + url = "https://lore.kernel.org/selinux/20250211211651.1297357-3-hi@alyssa.is/raw"; + hash = "sha256-a0wTSItj5vs8GhIkfD1OPSjGmAJlK1orptSE7T3Hx20="; + postFetch = '' + mv "$out" $TMPDIR/patch + ${buildPackages.patchutils_0_3_3}/bin/filterdiff \ + -i 'a/libselinux/*' --strip 1 <$TMPDIR/patch >"$out" + ''; + }) - (fetchurl { - url = "https://git.yoctoproject.org/meta-selinux/plain/recipes-security/selinux/libselinux/0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch?id=62b9c816a5000dc01b28e78213bde26b58cbca9d"; - hash = "sha256-RiEUibLVzfiRU6N/J187Cs1iPAih87gCZrlyRVI2abU="; - }) + (fetchurl { + url = "https://git.yoctoproject.org/meta-selinux/plain/recipes-security/selinux/libselinux/0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch?id=62b9c816a5000dc01b28e78213bde26b58cbca9d"; + hash = "sha256-RiEUibLVzfiRU6N/J187Cs1iPAih87gCZrlyRVI2abU="; + }) + + # commit 5c3fcbd931b7f9752b5ce29cec3b6813991d61c0 plus an additional + # fix for a musl build regression caused by that commit: + # https://lore.kernel.org/selinux/20250426151356.7116-2-hi@alyssa.is/ + # Fix build on 32-bit LFS platforms + ./fix-build-32bit-lfs.patch + ]; + + nativeBuildInputs = + [ + pkg-config + python3 + ] + ++ lib.optionals enablePython [ + python3Packages.pip + python3Packages.setuptools + python3Packages.wheel + swig ]; + buildInputs = [ + libsepol + pcre2 + fts + ] ++ lib.optionals enablePython [ python3 ]; - nativeBuildInputs = - [ - pkg-config - python3 - ] - ++ lib.optionals enablePython [ - python3Packages.pip - python3Packages.setuptools - python3Packages.wheel - swig - ]; - buildInputs = [ - libsepol - pcre2 - fts - ] ++ lib.optionals enablePython [ python3 ]; + # drop fortify here since package uses it by default, leading to compile error: + # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] + hardeningDisable = [ "fortify" ]; - # drop fortify here since package uses it by default, leading to compile error: - # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] - hardeningDisable = [ "fortify" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error -D_FILE_OFFSET_BITS=64"; - - makeFlags = - [ - "PREFIX=$(out)" - "INCDIR=$(dev)/include/selinux" - "INCLUDEDIR=$(dev)/include" - "MAN3DIR=$(man)/share/man/man3" - "MAN5DIR=$(man)/share/man/man5" - "MAN8DIR=$(man)/share/man/man8" - "SBINDIR=$(bin)/sbin" - "SHLIBDIR=$(out)/lib" - - "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" - "ARCH=${stdenv.hostPlatform.linuxArch}" - ] - ++ lib.optionals (fts != null) [ - "FTS_LDLIBS=-lfts" - ] - ++ lib.optionals stdenv.hostPlatform.isStatic [ - "DISABLE_SHARED=y" - ] - ++ lib.optionals enablePython [ - "PYTHON=${python3.pythonOnBuildForHost.interpreter}" - "PYTHONLIBDIR=$(py)/${python3.sitePackages}" - "PYTHON_SETUP_ARGS=--no-build-isolation" - ]; - - preInstall = lib.optionalString enablePython '' - mkdir -p $py/${python3.sitePackages}/selinux - ''; - - installTargets = [ "install" ] ++ lib.optional enablePython "install-pywrap"; - - meta = removeAttrs libsepol.meta [ "outputsToInstall" ] // { - description = "SELinux core library"; - }; - } - // - lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") + env = + { + NIX_CFLAGS_COMPILE = "-Wno-error -D_FILE_OFFSET_BITS=64"; + } + // lib.optionalAttrs + (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") { NIX_LDFLAGS = "--undefined-version"; - } -) + }; + + makeFlags = + [ + "PREFIX=$(out)" + "INCDIR=$(dev)/include/selinux" + "INCLUDEDIR=$(dev)/include" + "MAN3DIR=$(man)/share/man/man3" + "MAN5DIR=$(man)/share/man/man5" + "MAN8DIR=$(man)/share/man/man8" + "SBINDIR=$(bin)/sbin" + "SHLIBDIR=$(out)/lib" + + "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" + "ARCH=${stdenv.hostPlatform.linuxArch}" + ] + ++ lib.optionals (fts != null) [ + "FTS_LDLIBS=-lfts" + ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ + "DISABLE_SHARED=y" + ] + ++ lib.optionals enablePython [ + "PYTHON=${python3.pythonOnBuildForHost.interpreter}" + "PYTHONLIBDIR=$(py)/${python3.sitePackages}" + "PYTHON_SETUP_ARGS=--no-build-isolation" + ]; + + preInstall = lib.optionalString enablePython '' + mkdir -p $py/${python3.sitePackages}/selinux + ''; + + installTargets = [ "install" ] ++ lib.optional enablePython "install-pywrap"; + + preFixup = lib.optionalString enablePython '' + mv $out/${python3.sitePackages}/selinux/* $py/${python3.sitePackages}/selinux/ + rm -rf $out/lib/python* + ''; + + meta = removeAttrs libsepol.meta [ "outputsToInstall" ] // { + description = "SELinux core library"; + }; +}) diff --git a/pkgs/by-name/li/libsemanage/package.nix b/pkgs/by-name/li/libsemanage/package.nix new file mode 100644 index 000000000000..277d7d5238b3 --- /dev/null +++ b/pkgs/by-name/li/libsemanage/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + bison, + flex, + libsepol, + libselinux, + bzip2, + audit, + enablePython ? true, + swig ? null, + python3 ? null, +}: + +stdenv.mkDerivation rec { + pname = "libsemanage"; + version = "3.8.1"; + inherit (libsepol) se_url; + + src = fetchurl { + url = "${se_url}/${version}/libsemanage-${version}.tar.gz"; + sha256 = "sha256-ezkSeyGcxwv9k1pK9rDyuoPUs1yRbyU8fpQsI6tJDwc="; + }; + + outputs = [ + "out" + "dev" + "man" + ] ++ lib.optional enablePython "py"; + + strictDeps = true; + + nativeBuildInputs = + [ + bison + flex + pkg-config + ] + ++ lib.optionals enablePython [ + python3 + swig + ]; + + buildInputs = [ + libsepol + libselinux + bzip2 + audit + ] ++ lib.optional enablePython python3; + + makeFlags = [ + "PREFIX=$(out)" + "INCLUDEDIR=$(dev)/include" + "MAN3DIR=$(man)/share/man/man3" + "MAN5DIR=$(man)/share/man/man5" + "PYTHON=python" + "PYPREFIX=python" + "PYTHONLIBDIR=$(py)/${python3.sitePackages}" + "DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf" + ]; + + # The following turns the 'clobbered' error into a warning + # which should fix the following error: + # + # semanage_store.c: In function 'semanage_exec_prog': + # semanage_store.c:1278:6: error: variable 'i' might be clobbered by 'longjmp' or 'vfork' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wclobbered-Werror=clobbered8;;] + # 1278 | int i; + # | ^ + # cc1: all warnings being treated as errors + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=clobbered" ]; + + installTargets = [ "install" ] ++ lib.optionals enablePython [ "install-pywrap" ]; + + enableParallelBuilding = true; + + meta = removeAttrs libsepol.meta [ "outputsToInstall" ] // { + description = "Policy management tools for SELinux"; + license = lib.licenses.lgpl21; + }; +} diff --git a/pkgs/by-name/li/libsepol/package.nix b/pkgs/by-name/li/libsepol/package.nix index ea4a5e45838a..f04de97e9949 100644 --- a/pkgs/by-name/li/libsepol/package.nix +++ b/pkgs/by-name/li/libsepol/package.nix @@ -49,7 +49,10 @@ stdenv.mkDerivation rec { description = "SELinux binary policy manipulation library"; homepage = "http://userspace.selinuxproject.org"; platforms = platforms.linux; - maintainers = with maintainers; [ RossComputerGuy ]; + maintainers = with maintainers; [ + RossComputerGuy + numinit + ]; license = lib.licenses.gpl2Plus; pkgConfigModules = [ "libselinux" ]; }; diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix index deceacddcdce..69d479e43575 100644 --- a/pkgs/by-name/li/libserdes/package.nix +++ b/pkgs/by-name/li/libserdes/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "libserdes"; - version = "7.9.0"; + version = "7.9.1"; src = fetchFromGitHub { owner = "confluentinc"; diff --git a/pkgs/by-name/li/libserialport/package.nix b/pkgs/by-name/li/libserialport/package.nix index 084b9c812648..db6bdd650e7c 100644 --- a/pkgs/by-name/li/libserialport/package.nix +++ b/pkgs/by-name/li/libserialport/package.nix @@ -4,7 +4,6 @@ fetchurl, pkg-config, udev, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -17,9 +16,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optional stdenv.hostPlatform.isLinux udev - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isLinux udev; meta = { description = "Cross-platform shared library for serial port access"; diff --git a/pkgs/by-name/li/libsfdo/package.nix b/pkgs/by-name/li/libsfdo/package.nix index 2095b8a4efce..650bf2778629 100644 --- a/pkgs/by-name/li/libsfdo/package.nix +++ b/pkgs/by-name/li/libsfdo/package.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libsfdo"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "vyivel"; repo = "libsfdo"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-9jCfCIB07mmJ6aWQHvXaxYhEMNikUw/W1xrpmh6FKbo="; + hash = "sha256-xT1pKKElwKSd43XTKuBY+9rogquV1IAAYgWV5lEpAHk="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix index 97f2051a1c32..6e9cbb678d06 100644 --- a/pkgs/by-name/li/libshumate/package.nix +++ b/pkgs/by-name/li/libshumate/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libshumate"; - version = "1.3.2"; + version = "1.4.0"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; - hash = "sha256-+HYrvG4pbXi+H4Qi9W2kxAvI0Sr8cAKjJBcqkZju7Vw="; + hash = "sha256-OYQ2jgJZhis4ENHdyG0trdbTcqKzI3bM9K/3wuSMbTA="; }; depsBuildBuild = [ @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "shumate-demo"; homepage = "https://gitlab.gnome.org/GNOME/libshumate"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix index a418c784a5bf..6e26145bfbea 100644 --- a/pkgs/by-name/li/libsidplayfp/package.nix +++ b/pkgs/by-name/li/libsidplayfp/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.12.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-VBzobT/UT1YFLYWfJ5XFND+p6fClf/qZVb4eEVpdTqg="; + hash = "sha256-gUi7g+TZmF6XgacImVSNc69zpMckjCaqwfidIrrh38U="; }; outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ]; diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index c474a86bfdfe..128ba1eb1f4c 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -7,7 +7,6 @@ xcodebuild, protobuf, boringssl, - darwin, }: let # boring-sys expects the static libraries in build/ instead of lib/ @@ -22,18 +21,16 @@ rustPlatform.buildRustPackage rec { pname = "libsignal-ffi"; # must match the version used in mautrix-signal # see https://github.com/mautrix/signal/issues/401 - version = "0.67.4"; + version = "0.72.1"; src = fetchFromGitHub { fetchSubmodules = true; owner = "signalapp"; repo = "libsignal"; tag = "v${version}"; - hash = "sha256-s7vTzAOWKvGCkrWcxDcKptsmxvW5VxrF5X9Vfkjj1jA="; + hash = "sha256-A8EAHHcBFSD4ZlvFig64g4+eoZQCuqE/qv509hA3I4s="; }; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeBuildInputs = [ protobuf rustPlatform.bindgenHook @@ -43,7 +40,7 @@ rustPlatform.buildRustPackage rec { env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; useFetchCargoVendor = true; - cargoHash = "sha256-wxBbq4WtqzHbdro+tm2hU6JVwTgC2X/Cx9po+ndgECg="; + cargoHash = "sha256-+vJrywIi/RcGGGns42XlN6S63RBil3fB4XByTLsaFVc="; cargoBuildFlags = [ "-p" @@ -54,6 +51,6 @@ rustPlatform.buildRustPackage rec { description = "C ABI library which exposes Signal protocol logic"; homepage = "https://github.com/signalapp/libsignal"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ niklaskorz ]; + maintainers = with maintainers; [ alyaeanyx ]; }; } diff --git a/pkgs/by-name/li/libsigsegv/package.nix b/pkgs/by-name/li/libsigsegv/package.nix index 7f64f4ba0ee2..cd6284d4a549 100644 --- a/pkgs/by-name/li/libsigsegv/package.nix +++ b/pkgs/by-name/li/libsigsegv/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "libsigsegv"; - version = "2.14"; + version = "2.15"; src = fetchurl { url = "mirror://gnu/libsigsegv/libsigsegv-${version}.tar.gz"; - sha256 = "sha256-zaw5QYAzZM+BqQhJm+t5wgDq1gtrW0DK0ST9HgbKopU="; + sha256 = "sha256-A2hVZgIlyzgXoZD8AOZ2TOeDYFG6y0jTXiZES4wXKdk="; }; patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null; diff --git a/pkgs/by-name/li/libsndfile/package.nix b/pkgs/by-name/li/libsndfile/package.nix new file mode 100644 index 000000000000..dd7e36b7da31 --- /dev/null +++ b/pkgs/by-name/li/libsndfile/package.nix @@ -0,0 +1,125 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + autogen, + pkg-config, + python3, + flac, + lame, + libmpg123, + libogg, + libopus, + libvorbis, + alsa-lib, + + # for passthru.tests + audacity, + freeswitch, + gst_all_1, + libsamplerate, + moc, + pipewire, + pulseaudio, +}: + +stdenv.mkDerivation rec { + pname = "libsndfile"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + hash = "sha256-MOOX/O0UaoeMaQPW9PvvE0izVp+6IoE5VbtTx0RvMkI="; + }; + + nativeBuildInputs = [ + autoreconfHook + autogen + pkg-config + python3 + ]; + buildInputs = [ + flac + lame + libmpg123 + libogg + libopus + libvorbis + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; + + enableParallelBuilding = true; + + outputs = [ + "bin" + "dev" + "out" + "man" + "doc" + ]; + + # need headers from the Carbon.framework in /System/Library/Frameworks to + # compile this on darwin -- not sure how to handle + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' + NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers" + ''; + + # Needed on Darwin. + NIX_CFLAGS_LINK = "-logg -lvorbis"; + + doCheck = true; + preCheck = '' + patchShebangs tests/test_wrapper.sh tests/pedantic-header-test.sh + + substituteInPlace tests/test_wrapper.sh \ + --replace '/usr/bin/env' "$(type -P env)" + ''; + + passthru.tests = { + inherit + audacity + freeswitch + libsamplerate + moc + pipewire + pulseaudio + ; + inherit (python3.pkgs) + soundfile + wavefile + ; + inherit (gst_all_1) gst-plugins-bad; + lame = (lame.override { sndfileFileIOSupport = true; }); + }; + + meta = with lib; { + description = "C library for reading and writing files containing sampled sound"; + homepage = "https://libsndfile.github.io/libsndfile/"; + changelog = "https://github.com/libsndfile/libsndfile/releases/tag/${version}"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.all; + + longDescription = '' + Libsndfile is a C library for reading and writing files containing + sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format) + through one standard library interface. It is released in source + code format under the GNU Lesser General Public License. + + The library was written to compile and run on a Linux system but + should compile and run on just about any Unix (including macOS). + There are also pre-compiled binaries available for 32 and 64 bit + windows. + + It was designed to handle both little-endian (such as WAV) and + big-endian (such as AIFF) data, and to compile and run correctly on + little-endian (such as Intel and DEC/Compaq Alpha) processor systems + as well as big-endian processor systems such as Motorola 68k, Power + PC, MIPS and SPARC. Hopefully the design of the library will also + make it easy to extend for reading and writing new sound file + formats. + ''; + }; +} diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix index d332ebfc0358..25103bd9523c 100644 --- a/pkgs/by-name/li/libsolv/package.nix +++ b/pkgs/by-name/li/libsolv/package.nix @@ -18,14 +18,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.31"; + version = "0.7.32"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - hash = "sha256-3HOW3bip+0LKegwO773upeKKLiLv7JWUGEJcFiH0lcw="; + hash = "sha256-2cvba2S/3CR+3sMLVEnmTxWYTQSAYZoUIoQHr+GZnyY="; }; cmakeFlags = @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openSUSE/libsolv"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/li/libsoundio/package.nix b/pkgs/by-name/li/libsoundio/package.nix new file mode 100644 index 000000000000..4c8c5fbf49a6 --- /dev/null +++ b/pkgs/by-name/li/libsoundio/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + alsa-lib, + libjack2, + libpulseaudio, +}: + +stdenv.mkDerivation rec { + version = "2.0.0"; + pname = "libsoundio"; + + src = fetchFromGitHub { + owner = "andrewrk"; + repo = "libsoundio"; + rev = version; + sha256 = "12l4rvaypv87vigdrmjz48d4d6sq4gfxf5asvnc4adyabxb73i4x"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = + [ libjack2 ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libpulseaudio + alsa-lib + ]; + + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + "-DBUILD_TESTS=OFF" + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-strict-prototypes"; + + meta = with lib; { + description = "Cross platform audio input and output"; + homepage = "http://libsound.io/"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.andrewrk ]; + }; +} diff --git a/pkgs/by-name/li/libspatialindex/package.nix b/pkgs/by-name/li/libspatialindex/package.nix index ad39600beb19..67d07ec76b3e 100644 --- a/pkgs/by-name/li/libspatialindex/package.nix +++ b/pkgs/by-name/li/libspatialindex/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Extensible spatial index library in C++"; homepage = "https://libspatialindex.org"; license = lib.licenses.mit; - maintainers = lib.teams.geospatial.members; + teams = [ lib.teams.geospatial ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/libspatialite/package.nix b/pkgs/by-name/li/libspatialite/package.nix index d2f93f4ec360..3e6fe92078ab 100644 --- a/pkgs/by-name/li/libspatialite/package.nix +++ b/pkgs/by-name/li/libspatialite/package.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: { ]; pkgConfigModules = [ "spatialite" ]; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; lib.teams.geospatial.members ++ [ dotlambda ]; + maintainers = with lib.maintainers; [ dotlambda ]; + teams = [ lib.teams.geospatial ]; }; }) diff --git a/pkgs/by-name/li/libspelling/package.nix b/pkgs/by-name/li/libspelling/package.nix index 2c818931128a..56ed10dbf688 100644 --- a/pkgs/by-name/li/libspelling/package.nix +++ b/pkgs/by-name/li/libspelling/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libspelling"; - version = "0.4.6"; + version = "0.4.8"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libspelling/${lib.versions.majorMinor finalAttrs.version}/libspelling-${finalAttrs.version}.tar.xz"; - hash = "sha256-MkiptTNuovcn0tuRLS8Ag6zMBQXOcHZ5s9m4JmwBAfU="; + hash = "sha256-J3ZGKFgY2nspXvAHssXr2BXQkws60JdQWzztlpZa9Rc="; }; nativeBuildInputs = [ @@ -42,14 +42,19 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - glib - gtk4 - gtksourceview5 enchant icu libsysprof-capture ]; + propagatedBuildInputs = [ + # These were moved from buildInputs because they are + # listed in `Requires` key of `libspelling-1.pc` + glib + gtk4 + gtksourceview5 + ]; + postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" @@ -64,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/libspelling"; license = licenses.lgpl21Plus; changelog = "https://gitlab.gnome.org/GNOME/libspelling/-/raw/${version}/NEWS"; - maintainers = with maintainers; [ chuangzhu ] ++ teams.gnome.members; + maintainers = with maintainers; [ chuangzhu ]; + teams = [ teams.gnome ]; }; }) diff --git a/pkgs/by-name/li/libspf2/package.nix b/pkgs/by-name/li/libspf2/package.nix index b606ab7fef62..4bc0a87d530e 100644 --- a/pkgs/by-name/li/libspf2/package.nix +++ b/pkgs/by-name/li/libspf2/package.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { lgpl21Plus bsd2 ]; - maintainers = with maintainers; [ euxane ] ++ teams.helsinki-systems.members; + maintainers = with maintainers; [ euxane ]; + teams = [ teams.helsinki-systems ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/li/libstatgrab/package.nix b/pkgs/by-name/li/libstatgrab/package.nix new file mode 100644 index 000000000000..f90ba95d3116 --- /dev/null +++ b/pkgs/by-name/li/libstatgrab/package.nix @@ -0,0 +1,27 @@ +{ + lib, + stdenv, + fetchurl, + withSaidar ? true, + ncurses, +}: + +stdenv.mkDerivation rec { + pname = "libstatgrab"; + version = "0.92.1"; + + src = fetchurl { + url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${pname}-${version}.tar.gz"; + sha256 = "sha256-VoiqSmhVR9cXSoo3PqnY7pJ+dm48wwK97jRSPCxdbBE="; + }; + + buildInputs = lib.optional withSaidar ncurses; + + meta = with lib; { + homepage = "https://www.i-scream.org/libstatgrab/"; + description = "Library that provides cross platforms access to statistics about the running system"; + maintainers = [ ]; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libsupermesh/package.nix b/pkgs/by-name/li/libsupermesh/package.nix new file mode 100644 index 000000000000..ea15c72ccf21 --- /dev/null +++ b/pkgs/by-name/li/libsupermesh/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchFromGitHub, + validatePkgConfig, + gfortran, + mpi, + cmake, + ninja, + libspatialindex, + mpiCheckPhaseHook, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libsupermesh"; + version = "2025.3.0"; + + src = fetchFromGitHub { + owner = "firedrakeproject"; + repo = "libsupermesh"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RKBi89bUhkbRATaSB8629D+/NeYE3YNDIMEGzSK8z04="; + }; + + strictDeps = true; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + mpi + gfortran + cmake + ninja + validatePkgConfig + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + ]; + + buildInputs = [ + libspatialindex + gfortran.cc.lib + ]; + + __darwinAllowLocalNetworking = true; + + nativeCheckInputs = [ mpiCheckPhaseHook ]; + + # On aarch64-darwin platform, the test program segfault at the line + # https://github.com/firedrakeproject/libsupermesh/blob/09af7c9a3beefc715fbdc23e46fdc96da8169ff6/src/tests/test_parallel_p1_inner_product_2d.F90#L164 + # in defining the lambda subroutine pack_data_b with variable field_b. + # This error is test source and compiler related and does not indicate broken functionality of libsupermesh. + doCheck = !(stdenv.hostPlatform.system == "aarch64-darwin"); + + passthru = { + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + }; + + meta = { + homepage = "https://github.com/firedrakeproject/libsupermesh"; + description = "Parallel supermeshing library"; + changelog = "https://github.com/firedrakeproject/libsupermesh/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ qbisi ]; + pkgConfigModules = [ "libsupermesh" ]; + }; +}) diff --git a/pkgs/by-name/li/libtcod/package.nix b/pkgs/by-name/li/libtcod/package.nix index 78128320f587..75969c606f62 100644 --- a/pkgs/by-name/li/libtcod/package.nix +++ b/pkgs/by-name/li/libtcod/package.nix @@ -6,6 +6,7 @@ SDL, libGLU, libGL, + libX11, upx, zlib, }: @@ -36,10 +37,16 @@ stdenv.mkDerivation { SDL libGLU libGL + libX11 upx zlib ]; + env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + "-Wno-error=implicit-int" + "-Wno-error=incompatible-pointer-types" + ]; + meta = { description = "API for roguelike games"; homepage = "http://roguecentral.org/doryen/libtcod/"; diff --git a/pkgs/by-name/li/libtheora/package.nix b/pkgs/by-name/li/libtheora/package.nix index df49f3988c01..63a7096e8c8d 100644 --- a/pkgs/by-name/li/libtheora/package.nix +++ b/pkgs/by-name/li/libtheora/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, autoreconfHook, libogg, libvorbis, @@ -13,20 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtheora"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { url = "https://downloads.xiph.org/releases/theora/libtheora-${finalAttrs.version}.tar.gz"; - hash = "sha256-QJUpVsR4EZKNHnkizaO8H0J+t1aAw8NySckelJBUkWs="; + hash = "sha256-J5MnM5kDtUTCipKurafQ3P0Dl7WcLzaMxpisVvUVkG4="; }; - patches = [ - # fix error in autoconf scripts - (fetchpatch { - url = "https://github.com/xiph/theora/commit/28cc6dbd9b2a141df94f60993256a5fca368fa54.diff"; - hash = "sha256-M/UULkiklvEay7LyOuCamxWCSvt37QSMzHOsAAnOWJo="; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ]; + patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ]; configureFlags = [ "--disable-examples" ]; @@ -60,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { + changelog = "https://gitlab.xiph.org/xiph/theora/-/releases/v${finalAttrs.version}"; description = "Library for Theora, a free and open video compression format"; homepage = "https://www.theora.org/"; license = lib.licenses.bsd3; diff --git a/pkgs/by-name/li/libticalcs2/package.nix b/pkgs/by-name/li/libticalcs2/package.nix new file mode 100644 index 000000000000..4d488f260ef1 --- /dev/null +++ b/pkgs/by-name/li/libticalcs2/package.nix @@ -0,0 +1,53 @@ +{ + stdenv, + lib, + fetchurl, + pkg-config, + autoreconfHook, + glib, + libticonv, + libtifiles2, + libticables2, + xz, + bzip2, + acl, +}: + +stdenv.mkDerivation rec { + pname = "libticalcs2"; + version = "1.1.9"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = + [ + glib + libticonv + libtifiles2 + libticables2 + xz + bzip2 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + acl + ]; + + meta = with lib; { + changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; + description = "This library is part of the TiLP framework"; + homepage = "http://lpg.ticalc.org/prj_tilp/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ + siraben + clevor + ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 7dea25c62d01..8018672a7f3f 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -138,6 +138,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.libtiff; platforms = platforms.unix ++ platforms.windows; pkgConfigModules = [ "libtiff-4" ]; - maintainers = teams.geospatial.members; + teams = [ teams.geospatial ]; }; }) diff --git a/pkgs/by-name/li/libtiger/package.nix b/pkgs/by-name/li/libtiger/package.nix index 09211b89c89b..3a1d5b6d13fc 100644 --- a/pkgs/by-name/li/libtiger/package.nix +++ b/pkgs/by-name/li/libtiger/package.nix @@ -7,7 +7,6 @@ libkate, pango, cairo, - darwin, }: stdenv.mkDerivation rec { @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { libkate pango cairo - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; + ]; meta = { homepage = "https://code.google.com/archive/p/libtiger/"; diff --git a/pkgs/by-name/li/libtommath/package.nix b/pkgs/by-name/li/libtommath/package.nix index 296617e1ee38..aa9fa53e1aaf 100644 --- a/pkgs/by-name/li/libtommath/package.nix +++ b/pkgs/by-name/li/libtommath/package.nix @@ -14,15 +14,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; }; - nativeBuildInputs = [ libtool ]; - postPatch = '' - substituteInPlace makefile.shared --replace glibtool libtool - substituteInPlace makefile_include.mk --replace "shell arch" "shell uname -m" + substituteInPlace makefile.shared \ + --replace-fail glibtool libtool \ + --replace-fail libtool "${lib.getExe (libtool.override { stdenv = stdenv; })}" + substituteInPlace makefile_include.mk \ + --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc" ''; preBuild = '' makeFlagsArray=(PREFIX=$out \ + CC=${stdenv.cc.targetPrefix}cc \ INSTALL_GROUP=$(id -g) \ INSTALL_USER=$(id -u)) ''; diff --git a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix index 9d3c64255893..3521249a6766 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix @@ -10,7 +10,6 @@ python311, libiconv, ncurses, - darwin, boost-build, }: @@ -63,7 +62,7 @@ stdenv.mkDerivation { python311 libiconv ncurses - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; preAutoreconf = '' mkdir -p build-aux diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index b544b1c6f77e..2c7c53c46353 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -8,7 +8,6 @@ openssl, python3, ncurses, - darwin, }: let @@ -41,7 +40,7 @@ stdenv.mkDerivation { zlib python3 ncurses - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; patches = [ # provide distutils alternative for python 3.12 diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix index 94977b420556..54312f6918fd 100644 --- a/pkgs/by-name/li/libui-ng/package.nix +++ b/pkgs/by-name/li/libui-ng/package.nix @@ -2,7 +2,6 @@ lib, stdenv, cmocka, - darwin, fetchFromGitHub, gtk3, meson, @@ -33,19 +32,9 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ - darwin.libobjc - darwin.apple_sdk_11_0.Libsystem - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.AppKit - darwin.apple_sdk_11_0.frameworks.CoreFoundation - ] - else - [ - gtk3 - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + gtk3 + ]; mesonFlags = [ (lib.mesonBool "examples" (!stdenv.hostPlatform.isDarwin)) diff --git a/pkgs/development/libraries/libui/libui.pc b/pkgs/by-name/li/libui/libui.pc similarity index 100% rename from pkgs/development/libraries/libui/libui.pc rename to pkgs/by-name/li/libui/libui.pc diff --git a/pkgs/by-name/li/libui/package.nix b/pkgs/by-name/li/libui/package.nix new file mode 100644 index 000000000000..0ee54f7c45a1 --- /dev/null +++ b/pkgs/by-name/li/libui/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + gtk3, +}: + +let + backend = if stdenv.hostPlatform.isDarwin then "darwin" else "unix"; +in + +stdenv.mkDerivation rec { + pname = "libui"; + version = "4.1a"; + src = fetchFromGitHub { + owner = "andlabs"; + repo = "libui"; + rev = "alpha4.1"; + sha256 = "0bm6xvqk4drg2kw6d304x6mlfal7gh8mbl5a9f0509smmdzgdkwm"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux gtk3; + + postPatch = '' + substituteInPlace darwin/text.m unix/text.c \ + --replace-fail "strcasecmp" "g_strcasecmp" + ''; + + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' + sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt + ''; + + installPhase = + '' + mkdir -p $out/{include,lib} + mkdir -p $out/lib/pkgconfig + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + mv ./out/libui.so.0 $out/lib/ + ln -s $out/lib/libui.so.0 $out/lib/libui.so + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mv ./out/libui.A.dylib $out/lib/ + ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib + '' + + '' + cp $src/ui.h $out/include + cp $src/ui_${backend}.h $out/include + + cp ${./libui.pc} $out/lib/pkgconfig/libui.pc + substituteInPlace $out/lib/pkgconfig/libui.pc \ + --subst-var-by out $out \ + --subst-var-by version "${version}" + ''; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib + ''; + + meta = with lib; { + homepage = "https://github.com/andlabs/libui"; + description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libuiohook/package.nix b/pkgs/by-name/li/libuiohook/package.nix new file mode 100644 index 000000000000..709e75bc8ec7 --- /dev/null +++ b/pkgs/by-name/li/libuiohook/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nixosTests, + cmake, + pkg-config, + libX11, + libxkbcommon, + xinput, + xorg, +}: + +stdenv.mkDerivation rec { + pname = "libuiohook"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "kwhat"; + repo = pname; + rev = version; + sha256 = "1qlz55fp4i9dd8sdwmy1m8i4i1jy1s09cpmlxzrgf7v34w72ncm7"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) ( + [ + libX11 + libxkbcommon + xinput + ] + ++ (with xorg; [ + libXau + libXdmcp + libXi + libXinerama + libXt + libXtst + libXext + libxkbfile + ]) + ); + + outputs = [ + "out" + "test" + ]; + + # We build the tests, but they're only installed when using the "test" output. + # This will produce a "uiohook_tests" binary which can be run to test the + # functionality of the library on the current system. + # Running the test binary requires a running X11 session. + cmakeFlags = [ + "-DENABLE_TEST:BOOL=ON" + ]; + + postInstall = '' + mkdir -p $test/share + cp ./uiohook_tests $test/share + ''; + + meta = with lib; { + description = "C library to provide global keyboard and mouse hooks from userland"; + homepage = "https://github.com/kwhat/libuiohook"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ anoa ]; + }; + + passthru.tests.libuiohook = nixosTests.libuiohook; +} diff --git a/pkgs/by-name/li/liburcu/package.nix b/pkgs/by-name/li/liburcu/package.nix index fd184de09667..2308f77b58a6 100644 --- a/pkgs/by-name/li/liburcu/package.nix +++ b/pkgs/by-name/li/liburcu/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "0.15.0"; + version = "0.15.2"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - hash = "sha256-Ty2DmvZ5Ba05bW1TulZJtmET2QhA3LyJlB4NpkvM04w="; + hash = "sha256-WfNvK4vaG3Ygp+ztJjTybFSURIGKgxMCWjuwnAdmph0="; }; outputs = [ @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { ++ platforms.mips ++ platforms.m68k ++ platforms.riscv + ++ platforms.loongarch64 ); maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/by-name/li/libusb1/package.nix b/pkgs/by-name/li/libusb1/package.nix new file mode 100644 index 000000000000..5a82af646da5 --- /dev/null +++ b/pkgs/by-name/li/libusb1/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + doxygen, + pkg-config, + enableUdev ? + stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isAndroid, + udev, + withExamples ? false, + withStatic ? false, + withDocs ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, +}: + +stdenv.mkDerivation rec { + pname = "libusb"; + version = "1.0.28"; + + src = fetchFromGitHub { + owner = "libusb"; + repo = "libusb"; + rev = "v${version}"; + sha256 = "sha256-ntfDh/+HYm5cthhO8FkAJHo4RcxvZUKmHf4AOrHLysM="; + }; + + outputs = [ + "out" + "dev" + ] ++ lib.optionals withDocs [ "doc" ]; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ] ++ lib.optionals withDocs [ doxygen ]; + propagatedBuildInputs = lib.optional enableUdev udev; + + dontDisableStatic = withStatic; + + # libusb-1.0.rc:11: fatal error: opening dependency file .deps/libusb-1.0.Tpo: No such file or directory + dontAddDisableDepTrack = stdenv.hostPlatform.isWindows; + + configureFlags = + lib.optional (!enableUdev) "--disable-udev" + ++ lib.optional (withExamples) "--enable-examples-build"; + + postBuild = lib.optionalString withDocs '' + make -C doc + mkdir -p "$doc/share/doc/libusb" + cp -r doc/api-1.0/* "$doc/share/doc/libusb/" + ''; + + preFixup = lib.optionalString enableUdev '' + sed 's,-ludev,-L${lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la + ''; + + postInstall = lib.optionalString withExamples '' + mkdir -p $out/{bin,sbin,examples/bin} + cp -r examples/.libs/* $out/examples/bin + ln -s $out/examples/bin/fxload $out/sbin/fxload + ''; + + meta = with lib; { + homepage = "https://libusb.info/"; + description = "cross-platform user-mode USB device library"; + longDescription = '' + libusb is a cross-platform user-mode library that provides access to USB devices. + ''; + platforms = platforms.all; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ + prusnak + realsnick + ]; + }; +} diff --git a/pkgs/by-name/li/libusbsio/package.nix b/pkgs/by-name/li/libusbsio/package.nix index 24a41781d447..d1b762b4e014 100644 --- a/pkgs/by-name/li/libusbsio/package.nix +++ b/pkgs/by-name/li/libusbsio/package.nix @@ -6,7 +6,6 @@ fixDarwinDylibNames, libusb1, systemdMinimal, - darwin, }: stdenv.mkDerivation rec { @@ -39,14 +38,7 @@ stdenv.mkDerivation rec { [ libusb1 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreFoundation - IOKit - ] - ) + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemdMinimal # libudev ]; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/by-name/li/libuv/package.nix similarity index 100% rename from pkgs/development/libraries/libuv/default.nix rename to pkgs/by-name/li/libuv/package.nix diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix new file mode 100644 index 000000000000..33c0241dd862 --- /dev/null +++ b/pkgs/by-name/li/libvgm/package.nix @@ -0,0 +1,124 @@ +{ + stdenv, + lib, + fetchFromGitHub, + unstableGitUpdater, + testers, + cmake, + libiconv, + zlib, + enableShared ? (!stdenv.hostPlatform.isStatic), + + enableAudio ? true, + withWaveWrite ? true, + withWinMM ? stdenv.hostPlatform.isWindows, + withDirectSound ? stdenv.hostPlatform.isWindows, + withXAudio2 ? stdenv.hostPlatform.isWindows, + withWASAPI ? stdenv.hostPlatform.isWindows, + withOSS ? stdenv.hostPlatform.isFreeBSD, + withSADA ? stdenv.hostPlatform.isSunOS, + withALSA ? stdenv.hostPlatform.isLinux, + alsa-lib, + withPulseAudio ? stdenv.hostPlatform.isLinux, + libpulseaudio, + withCoreAudio ? stdenv.hostPlatform.isDarwin, + withLibao ? true, + libao, + + enableEmulation ? true, + withAllEmulators ? true, + emulators ? [ ], + + enableLibplayer ? true, + + enableTools ? false, +}: + +assert enableTools -> enableAudio && enableEmulation && enableLibplayer; + +stdenv.mkDerivation (finalAttrs: { + pname = "libvgm"; + version = "0-unstable-2025-05-03"; + + src = fetchFromGitHub { + owner = "ValleyBell"; + repo = "libvgm"; + rev = "47581c5cf51748c8c948cfc1a8473e563529e9bb"; + hash = "sha256-BJBQ/qAOZ2ykU2+zZ+FaGK2gK0R4Bu3+u3WmJVnjgMw="; + }; + + outputs = [ + "out" + "dev" + ] ++ lib.optionals enableTools [ "bin" ]; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = + [ + libiconv + zlib + ] + ++ lib.optionals withALSA [ alsa-lib ] + ++ lib.optionals withPulseAudio [ libpulseaudio ] + ++ lib.optionals withLibao [ libao ]; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_LIBAUDIO" enableAudio) + (lib.cmakeBool "BUILD_LIBEMU" enableEmulation) + (lib.cmakeBool "BUILD_LIBPLAYER" enableLibplayer) + (lib.cmakeBool "BUILD_TESTS" enableTools) + (lib.cmakeBool "BUILD_PLAYER" enableTools) + (lib.cmakeBool "BUILD_VGM2WAV" enableTools) + (lib.cmakeFeature "LIBRARY_TYPE" (if enableShared then "SHARED" else "STATIC")) + (lib.cmakeBool "USE_SANITIZERS" true) + ] + ++ lib.optionals enableAudio [ + (lib.cmakeBool "AUDIODRV_WAVEWRITE" withWaveWrite) + (lib.cmakeBool "AUDIODRV_WINMM" withWinMM) + (lib.cmakeBool "AUDIODRV_DSOUND" withDirectSound) + (lib.cmakeBool "AUDIODRV_XAUDIO2" withXAudio2) + (lib.cmakeBool "AUDIODRV_WASAPI" withWASAPI) + (lib.cmakeBool "AUDIODRV_OSS" withOSS) + (lib.cmakeBool "AUDIODRV_SADA" withSADA) + (lib.cmakeBool "AUDIODRV_ALSA" withALSA) + (lib.cmakeBool "AUDIODRV_PULSE" withPulseAudio) + (lib.cmakeBool "AUDIODRV_APPLE" withCoreAudio) + (lib.cmakeBool "AUDIODRV_LIBAO" withLibao) + ] + ++ lib.optionals enableEmulation ( + [ (lib.cmakeBool "SNDEMU__ALL" withAllEmulators) ] + ++ lib.optionals (!withAllEmulators) ( + lib.lists.forEach emulators (x: (lib.cmakeBool "SNDEMU_${x}" true)) + ) + ) + ++ lib.optionals enableTools [ + (lib.cmakeBool "UTIL_CHARCNV_ICONV" true) + (lib.cmakeBool "UTIL_CHARCNV_WINAPI" stdenv.hostPlatform.isWindows) + ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = unstableGitUpdater { }; + }; + + meta = { + description = "More modular rewrite of most components from VGMPlay"; + homepage = "https://github.com/ValleyBell/libvgm"; + license = + if + (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators))) + then + lib.licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43 + else + lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.all; + pkgConfigModules = + [ "vgm-utils" ] + ++ lib.optionals enableAudio [ "vgm-audio" ] + ++ lib.optionals enableEmulation [ "vgm-emu" ] + ++ lib.optionals enableLibplayer [ "vgm-player" ]; + }; +}) diff --git a/pkgs/by-name/li/libviper/package.nix b/pkgs/by-name/li/libviper/package.nix deleted file mode 100644 index 3966eaf40ac5..000000000000 --- a/pkgs/by-name/li/libviper/package.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - glib, - ncurses, - gpm, -}: -stdenv.mkDerivation rec { - pname = "libviper"; - version = "1.4.6"; - - src = fetchurl { - url = "mirror://sourceforge/libviper/libviper-${version}.tar.gz"; - sha256 = "1jvm7wdgw6ixyhl0pcfr9lnr9g6sg6whyrs9ihjiz0agvqrgvxwc"; - }; - - postPatch = '' - sed -i -e s@/usr/local@$out@ -e /ldconfig/d -e '/cd vdk/d' Makefile - - # Fix pending upstream inclusion for ncurses-6.3 support: - # https://github.com/TragicWarrior/libviper/pull/16 - # Not applied as it due to unrelated code changes in context. - substituteInPlace viper_msgbox.c --replace \ - 'mvwprintw(window,height-3,tmp,prompt);' \ - 'mvwprintw(window,height-3,tmp,"%s",prompt);' - substituteInPlace w_decorate.c --replace \ - 'mvwprintw(window,0,x,title);' \ - 'mvwprintw(window,0,x,"%s",title);' - ''; - - preInstall = '' - mkdir -p $out/include - mkdir -p $out/lib - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - glib - ncurses - gpm - ]; - - meta = with lib; { - homepage = "http://libviper.sourceforge.net/"; - description = "Simple window creation and management facilities for the console"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch similarity index 100% rename from pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch rename to pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch diff --git a/pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch b/pkgs/by-name/li/libvirt/0002-substitute-zfs-and-zpool-commands.patch similarity index 100% rename from pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch rename to pkgs/by-name/li/libvirt/0002-substitute-zfs-and-zpool-commands.patch diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix new file mode 100644 index 000000000000..1acf1f761392 --- /dev/null +++ b/pkgs/by-name/li/libvirt/package.nix @@ -0,0 +1,422 @@ +{ + lib, + bash, + bash-completion, + bridge-utils, + coreutils, + curl, + darwin, + dbus, + dnsmasq, + docutils, + fetchFromGitLab, + gettext, + glib, + gnutls, + iproute2, + iptables, + libgcrypt, + libpcap, + libtasn1, + libxml2, + libxslt, + makeWrapper, + meson, + ninja, + openssh, + perl, + perlPackages, + polkit, + pkg-config, + pmutils, + python3, + readline, + rpcsvc-proto, + stdenv, + replaceVars, + xhtml1, + json_c, + writeScript, + nixosTests, + + # Linux + acl ? null, + attr ? null, + audit ? null, + dmidecode ? null, + fuse3 ? null, + kmod ? null, + libapparmor ? null, + libcap_ng ? null, + libnl ? null, + libpciaccess ? null, + libtirpc ? null, + lvm2 ? null, + numactl ? null, + numad ? null, + parted ? null, + systemd ? null, + util-linux ? null, + + # Darwin + gmp, + libiconv, + qemu, + + # Options + enableCeph ? false, + ceph, + enableGlusterfs ? false, + glusterfs, + enableIscsi ? false, + openiscsi, + libiscsi, + enableXen ? stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64, + xen, + enableZfs ? stdenv.hostPlatform.isLinux, + zfs, +}: + +let + inherit (stdenv.hostPlatform) isDarwin isLinux isx86_64; + binPath = lib.makeBinPath ( + [ + dnsmasq + ] + ++ lib.optionals isLinux [ + bridge-utils + dmidecode + dnsmasq + iproute2 + iptables + kmod + lvm2 + numactl + numad + openssh + pmutils + systemd + ] + ++ lib.optionals enableIscsi [ + libiscsi + openiscsi + ] + ++ lib.optionals enableZfs [ + zfs + ] + ); +in + +assert enableXen -> isLinux && isx86_64; +assert enableCeph -> isLinux; +assert enableGlusterfs -> isLinux; +assert enableZfs -> isLinux; + +stdenv.mkDerivation rec { + pname = "libvirt"; + # if you update, also bump and SysVirt in + version = "11.0.0"; + + src = fetchFromGitLab { + owner = "libvirt"; + repo = "libvirt"; + tag = "v${version}"; + fetchSubmodules = true; + hash = "sha256-QxyOc/RbWZnjA4XIDNK7xZqBcP2ciHsOlszaa5pl6XA="; + }; + + patches = + [ + ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + ] + ++ lib.optionals enableZfs [ + (replaceVars ./0002-substitute-zfs-and-zpool-commands.patch { + zfs = "${zfs}/bin/zfs"; + zpool = "${zfs}/bin/zpool"; + }) + ]; + + # remove some broken tests + postPatch = + '' + sed -i '/commandtest/d' tests/meson.build + sed -i '/virnetsockettest/d' tests/meson.build + # delete only the first occurrence of this + sed -i '0,/qemuxmlconftest/{/qemuxmlconftest/d;}' tests/meson.build + + '' + + lib.optionalString isLinux '' + for binary in mount umount mkfs; do + substituteInPlace meson.build \ + --replace "find_program('$binary'" "find_program('${lib.getBin util-linux}/bin/$binary'" + done + + '' + + '' + substituteInPlace meson.build \ + --replace "'dbus-daemon'," "'${lib.getBin dbus}/bin/dbus-daemon'," + '' + + lib.optionalString isLinux '' + sed -i 's,define PARTED "parted",define PARTED "${parted}/bin/parted",' \ + src/storage/storage_backend_disk.c \ + src/storage/storage_util.c + '' + + lib.optionalString isDarwin '' + # 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 '/qemuhotplugtest/d' tests/meson.build + sed -i '/qemuvhostusertest/d' tests/meson.build + sed -i '/qemuxml2xmltest/d' tests/meson.build + sed -i '/domaincapstest/d' tests/meson.build + # virshtest frequently times out on Darwin + substituteInPlace tests/meson.build \ + --replace-fail "data.get('timeout', 30)" "data.get('timeout', 120)" + '' + + lib.optionalString enableXen '' + # Has various hardcoded paths that don't exist outside of a Xen dom0. + sed -i '/libxlxml2domconfigtest/d' tests/meson.build + substituteInPlace src/libxl/libxl_capabilities.h \ + --replace-fail /usr/lib/xen ${xen}/libexec/xen + ''; + + strictDeps = true; + + nativeBuildInputs = + [ + meson + docutils + libxml2 # for xmllint + libxslt # for xsltproc + gettext + makeWrapper + ninja + pkg-config + perl + perlPackages.XMLXPath + ] + ++ lib.optional (!isDarwin) rpcsvc-proto + # NOTE: needed for rpcgen + ++ lib.optional isDarwin darwin.developer_cmds; + + buildInputs = + [ + bash + bash-completion + curl + dbus + glib + gnutls + libgcrypt + libpcap + libtasn1 + libxml2 + python3 + readline + xhtml1 + json_c + ] + ++ lib.optionals isLinux [ + acl + attr + audit + fuse3 + libapparmor + libcap_ng + libnl + libpciaccess + libtirpc + lvm2 + numactl + numad + parted + systemd + util-linux + ] + ++ lib.optionals isDarwin [ + gmp + libiconv + ] + ++ lib.optionals enableCeph [ ceph ] + ++ lib.optionals enableGlusterfs [ glusterfs ] + ++ lib.optionals enableIscsi [ + libiscsi + openiscsi + ] + ++ lib.optionals enableXen [ xen ] + ++ lib.optionals enableZfs [ zfs ]; + + preConfigure = + let + overrides = { + QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper"; + QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper"; + }; + + patchBuilder = var: value: '' + sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" + ''; + in + '' + PATH="${binPath}:$PATH" + # the path to qemu-kvm will be stored in VM's .xml and .save files + # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations + substituteInPlace src/lxc/lxc_conf.c \ + --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' + + substituteInPlace build-aux/meson.build \ + --replace "gsed" "sed" \ + --replace "gmake" "make" \ + --replace "ggrep" "grep" + + substituteInPlace src/util/virpolkit.h \ + --replace '"/usr/bin/pkttyagent"' '"${if isLinux then polkit.bin else "/usr"}/bin/pkttyagent"' + + substituteInPlace src/util/virpci.c \ + --replace '/lib/modules' '${ + if isLinux then "/run/booted-system/kernel-modules" else "" + }/lib/modules' + + patchShebangs . + '' + + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); + + mesonAutoFeatures = "disabled"; + + mesonFlags = + let + cfg = option: val: "-D${option}=${val}"; + feat = option: enable: cfg option (if enable then "enabled" else "disabled"); + driver = name: feat "driver_${name}"; + storage = name: feat "storage_${name}"; + in + [ + "--sysconfdir=/var/lib" + (cfg "install_prefix" (placeholder "out")) + (cfg "localstatedir" "/var") + (cfg "runstatedir" (if isDarwin then "/var/run" else "/run")) + (cfg "sshconfdir" "/etc/ssh/ssh_config.d") + + (cfg "init_script" (if isDarwin then "none" else "systemd")) + (cfg "qemu_datadir" (lib.optionalString isDarwin "${qemu}/share/qemu")) + + (feat "apparmor" isLinux) + (feat "attr" isLinux) + (feat "audit" isLinux) + (feat "bash_completion" true) + (feat "blkid" isLinux) + (feat "capng" isLinux) + (feat "curl" true) + (feat "docs" true) + (feat "expensive_tests" true) + (feat "firewalld" isLinux) + (feat "firewalld_zone" isLinux) + (feat "fuse" isLinux) + (feat "glusterfs" enableGlusterfs) + (feat "host_validate" true) + (feat "libiscsi" enableIscsi) + (feat "libnl" isLinux) + (feat "libpcap" true) + (feat "libssh2" true) + (feat "login_shell" isLinux) + (feat "nss" (isLinux && !stdenv.hostPlatform.isMusl)) + (feat "numactl" isLinux) + (feat "numad" isLinux) + (feat "pciaccess" isLinux) + (feat "polkit" isLinux) + (feat "readline" true) + (feat "secdriver_apparmor" isLinux) + (feat "ssh_proxy" isLinux) + (feat "tests" true) + (feat "udev" isLinux) + (feat "json_c" true) + + (driver "ch" isLinux) + (driver "esx" true) + (driver "interface" isLinux) + (driver "libvirtd" true) + (driver "libxl" enableXen) + (driver "lxc" isLinux) + (driver "network" true) + (driver "openvz" isLinux) + (driver "qemu" true) + (driver "remote" true) + (driver "secrets" true) + (driver "test" true) + (driver "vbox" true) + (driver "vmware" true) + + (storage "dir" true) + (storage "disk" isLinux) + (storage "fs" isLinux) + (storage "gluster" enableGlusterfs) + (storage "iscsi" enableIscsi) + (storage "iscsi_direct" enableIscsi) + (storage "lvm" isLinux) + (storage "mpath" isLinux) + (storage "rbd" enableCeph) + (storage "scsi" true) + (storage "vstorage" isLinux) + (storage "zfs" enableZfs) + ]; + + doCheck = true; + + postInstall = + '' + substituteInPlace $out/bin/virt-xml-validate \ + --replace xmllint ${libxml2}/bin/xmllint + + # Enable to set some options from the corresponding NixOS module (or other + # places) via environment variables. + substituteInPlace $out/libexec/libvirt-guests.sh \ + --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ + --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace 'PARALLEL_SHUTDOWN=0' 'PARALLEL_SHUTDOWN=''${PARALLEL_SHUTDOWN:-0}' \ + --replace 'SHUTDOWN_TIMEOUT=300' 'SHUTDOWN_TIMEOUT=''${SHUTDOWN_TIMEOUT:-300}' \ + --replace 'START_DELAY=0' 'START_DELAY=''${START_DELAY:-0}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' + '' + + lib.optionalString isLinux '' + for f in $out/lib/systemd/system/*.service ; do + substituteInPlace $f --replace /bin/kill ${coreutils}/bin/kill + done + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : /run/libvirt/nix-emulators:${binPath} + ''; + + passthru.updateScript = writeScript "update-libvirt" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + + set -eu -o pipefail + + libvirtVersion=$(curl https://gitlab.com/api/v4/projects/192693/repository/tags | jq -r '.[].name|select(. | contains("rc") | not)' | head -n1 | sed "s/v//g") + sysvirtVersion=$(curl https://gitlab.com/api/v4/projects/192677/repository/tags | jq -r '.[].name|select(. | contains("rc") | not)' | head -n1 | sed "s/v//g") + update-source-version ${pname} "$libvirtVersion" + update-source-version python3Packages.${pname} "$libvirtVersion" + update-source-version perlPackages.SysVirt "$sysvirtVersion" --file="pkgs/top-level/perl-packages.nix" + ''; + + passthru.tests.libvirtd = nixosTests.libvirtd; + + meta = with lib; { + description = "Toolkit to interact with the virtualization capabilities of recent versions of Linux and other OSes"; + homepage = "https://libvirt.org/"; + changelog = "https://gitlab.com/libvirt/libvirt/-/raw/v${version}/NEWS.rst"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ + fpletz + globin + lovesegfault + ]; + }; +} diff --git a/pkgs/by-name/li/libvmi/package.nix b/pkgs/by-name/li/libvmi/package.nix index 8a0ed3339a74..56f5baf3c663 100644 --- a/pkgs/by-name/li/libvmi/package.nix +++ b/pkgs/by-name/li/libvmi/package.nix @@ -24,14 +24,14 @@ let pname = "libvmi"; - version = "0.14.0-unstable-2025-02-27"; + version = "0.14.0-unstable-2025-04-09"; libVersion = "0.0.15"; src = fetchFromGitHub { owner = "libvmi"; repo = "libvmi"; - rev = "f02aeb751fd27bd4ae753dcd5904a4ef3232821e"; - hash = "sha256-h5kevP8B1iKJBZMaEaxkrAIgnUy7yOCnN3G3oYf/eNo="; + rev = "872ccc6efac607b83b603fef691c3641656fed34"; + hash = "sha256-8rqcDU4y86Uq6I7LOOMhMYWLEt7TxvzHilddUoutMOw="; }; in diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix new file mode 100644 index 000000000000..b016e19af766 --- /dev/null +++ b/pkgs/by-name/li/libvncserver/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libjpeg, + openssl, + zlib, + libgcrypt, + libpng, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + systemd, +}: + +stdenv.mkDerivation rec { + pname = "libvncserver"; + version = "0.9.14"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "LibVNC"; + repo = "libvncserver"; + rev = "LibVNCServer-${version}"; + sha256 = "sha256-kqVZeCTp+Z6BtB6nzkwmtkJ4wtmjlSQBg05lD02cVvQ="; + }; + + patches = [ + # fix generated pkg-config files + ./pkgconfig.patch + ]; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DWITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}" + ]; + + buildInputs = + [ + libjpeg + openssl + libgcrypt + libpng + ] + ++ lib.optionals withSystemd [ + systemd + ]; + + propagatedBuildInputs = [ + zlib + ]; + + meta = with lib; { + description = "VNC server library"; + homepage = "https://libvnc.github.io/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libvncserver/pkgconfig.patch b/pkgs/by-name/li/libvncserver/pkgconfig.patch similarity index 100% rename from pkgs/development/libraries/libvncserver/pkgconfig.patch rename to pkgs/by-name/li/libvncserver/pkgconfig.patch diff --git a/pkgs/by-name/li/libvpl/package.nix b/pkgs/by-name/li/libvpl/package.nix index 25304bc909e1..319373b62dfc 100644 --- a/pkgs/by-name/li/libvpl/package.nix +++ b/pkgs/by-name/li/libvpl/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libvpl"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "intel"; repo = "libvpl"; rev = "v${finalAttrs.version}"; - hash = "sha256-51kl9w1xqldQXGWbk6bveS2jMZWQOz/gYP/hPXDk/7M="; + hash = "sha256-aCoyIHgX3ftlk0CKg/cXNAVjuGI8GMT358GoiyaNjnI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libvpx/package.nix b/pkgs/by-name/li/libvpx/package.nix index 41cc90a17954..dc33fa0bef67 100644 --- a/pkgs/by-name/li/libvpx/package.nix +++ b/pkgs/by-name/li/libvpx/package.nix @@ -99,10 +99,18 @@ let isGeneric = (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian) || stdenv.hostPlatform.parsed.cpu.name == "armv6l" + || stdenv.hostPlatform.isLoongArch64 || stdenv.hostPlatform.isRiscV; target = - if (stdenv.hostPlatform.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then + if + ( + stdenv.hostPlatform.isBSD + || stdenv.hostPlatform != stdenv.buildPlatform + # https://issues.chromium.org/issues/359039635 + || stdenv.hostPlatform.isLoongArch64 + ) + then (if isGeneric then "generic-gnu" else "${cpu}-${kernel}-gcc") else null; diff --git a/pkgs/by-name/li/libwacom-surface/package.nix b/pkgs/by-name/li/libwacom-surface/package.nix index 04fa64d1e822..3ad32e9edaf3 100644 --- a/pkgs/by-name/li/libwacom-surface/package.nix +++ b/pkgs/by-name/li/libwacom-surface/package.nix @@ -41,5 +41,6 @@ libwacom.overrideAttrs (prevAttrs: { meta = prevAttrs.meta // { homepage = "https://github.com/linux-surface/libwacom-surface"; maintainers = with lib.maintainers; [ dotlambda ]; + teams = [ ]; }; }) diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix index 79505191bcac..5132dd488156 100644 --- a/pkgs/by-name/li/libwacom/package.nix +++ b/pkgs/by-name/li/libwacom/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://linuxwacom.github.io/"; changelog = "https://github.com/linuxwacom/libwacom/blob/${finalAttrs.src.rev}/NEWS"; description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; - maintainers = lib.teams.freedesktop.members; + teams = [ lib.teams.freedesktop ]; license = lib.licenses.hpnd; }; }) diff --git a/pkgs/by-name/li/libxcvt/package.nix b/pkgs/by-name/li/libxcvt/package.nix new file mode 100644 index 000000000000..0688e25aa636 --- /dev/null +++ b/pkgs/by-name/li/libxcvt/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + meson, + ninja, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxcvt"; + version = "0.1.3"; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libxcvt-${finalAttrs.version}.tar.xz"; + hash = "sha256-qSmZiodn3n36NtbaR1HNvu807WMHFPL0p2ezUfJELgE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "VESA CVT standard timing modeline generation library & utility"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcvt"; + license = with lib.licenses; [ + mit + hpndSellVariant + ]; + mainProgram = "cvt"; + maintainers = [ ]; + platforms = lib.platforms.unix; + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; + }; +}) diff --git a/pkgs/by-name/li/libxeddsa/package.nix b/pkgs/by-name/li/libxeddsa/package.nix new file mode 100644 index 000000000000..7b33a5a3f02a --- /dev/null +++ b/pkgs/by-name/li/libxeddsa/package.nix @@ -0,0 +1,39 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gitUpdater, + cmake, + libsodium, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxeddsa"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "Syndace"; + repo = "libxeddsa"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kdy+S51nQstRFGw5mIW3TW+WBNynHLpmFC1t6Mc02K4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libsodium ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Toolkit around Curve25519 and Ed25519 key pairs"; + homepage = "https://github.com/Syndace/libxeddsa"; + changelog = "https://github.com/Syndace/libxeddsa/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch b/pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch index fb5c8458b5dd..b962ade00a4e 100644 --- a/pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch +++ b/pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch @@ -8,7 +8,7 @@ test fails. ) - test( - 'x11comp', -- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep), +- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_xvfb_test_dep), - env: test_env, - is_parallel : false, - ) diff --git a/pkgs/by-name/li/libxkbcommon_8/package.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix index 88e3830d150c..53cb92844de2 100644 --- a/pkgs/by-name/li/libxkbcommon_8/package.nix +++ b/pkgs/by-name/li/libxkbcommon_8/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, meson, ninja, pkg-config, @@ -24,11 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxkbcommon"; - version = "1.7.0"; + version = "1.8.1"; - src = fetchurl { - url = with finalAttrs; "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - hash = "sha256-ZXgvChCktFWvnGuqtwQOL1N1IMqi7CCSgFzf02hjskc="; + src = fetchFromGitHub { + owner = "xkbcommon"; + repo = "libxkbcommon"; + tag = "xkbcommon-${finalAttrs.version}"; + hash = "sha256-MnegPisAtev69pNV6cR4a/oLIQhijG2e6ed6mpKr5js="; }; patches = [ diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix index d814ee010450..91137b535c89 100644 --- a/pkgs/by-name/li/libxmlb/package.nix +++ b/pkgs/by-name/li/libxmlb/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.21"; + version = "0.3.22"; outputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - hash = "sha256-+gs1GqDVnt0uf/0vjUj+c9CRnUtaYfngBsjSs4ZwVXs="; + hash = "sha256-6S/4X6dYsVj9v98LoDJjir6Kmb5L8PloD23yvvkiD6o="; }; patches = [ diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix index d8b8ba0f3b40..e23be1dd83a3 100644 --- a/pkgs/by-name/li/libxmp/package.nix +++ b/pkgs/by-name/li/libxmp/package.nix @@ -1,27 +1,62 @@ { lib, stdenv, - fetchurl, + docutils, + fetchFromGitHub, + cmake, + ninja, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libxmp"; - version = "4.6.2"; + version = "4.6.3"; - meta = with lib; { + src = fetchFromGitHub { + owner = "libxmp"; + repo = "libxmp"; + tag = "libxmp-${finalAttrs.version}"; + hash = "sha256-VTjS5bVu+jiswP4GCTxcAdhtVdtopy4A3hxlzIQlZVU="; + }; + + outputs = [ + "out" + "dev" + "man" + ]; + + nativeBuildInputs = [ + cmake + ninja + docutils + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic) + (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "libxmp-(.*)" + ]; + }; + + meta = { description = "Extended module player library"; homepage = "https://xmp.sourceforge.net/"; + changelog = "https://github.com/libxmp/libxmp/releases/tag/${finalAttrs.src.tag}"; longDescription = '' Libxmp is a library that renders module files to PCM data. It supports over 90 mainstream and obscure module formats including Protracker (MOD), Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT). ''; - license = licenses.lgpl21Plus; - platforms = platforms.all; + maintainers = with lib.maintainers; [ marcin-serwin ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; - - src = fetchurl { - url = "mirror://sourceforge/xmp/libxmp/${pname}-${version}.tar.gz"; - sha256 = "sha256-rKwXBb4sT7TS1w3AV1mFO6aqt0eoPeV2sIJ4TUb1pLk="; - }; -} +}) diff --git a/pkgs/by-name/li/libyafaray/package.nix b/pkgs/by-name/li/libyafaray/package.nix index 3f6ba6312623..69d2aaad0466 100644 --- a/pkgs/by-name/li/libyafaray/package.nix +++ b/pkgs/by-name/li/libyafaray/package.nix @@ -2,7 +2,6 @@ cmake, fetchFromGitHub, freetype, - ilmbase, lib, libjpeg, libtiff, @@ -33,10 +32,6 @@ stdenv.mkDerivation { include/geometry/poly_double.h include/noise/noise_generator.h # gcc12 ''; - preConfigure = '' - NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR" - ''; - nativeBuildInputs = [ cmake pkg-config @@ -44,7 +39,6 @@ stdenv.mkDerivation { buildInputs = [ freetype - ilmbase libjpeg libtiff libxml2 diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix index ca097a219486..93215e51fb84 100644 --- a/pkgs/by-name/li/libyang/package.nix +++ b/pkgs/by-name/li/libyang/package.nix @@ -25,12 +25,17 @@ stdenv.mkDerivation rec { hash = "sha256-5oJV8gr2rwvSdpX5w3gmIw/LTrWtXVnl6oLr/soNTDk="; }; + outputs = [ + "out" + "dev" + ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ + propagatedBuildInputs = [ pcre2 ]; diff --git a/pkgs/by-name/li/libyuv/link-library-against-libjpeg.patch b/pkgs/by-name/li/libyuv/link-library-against-libjpeg.patch deleted file mode 100644 index d0f3d2968462..000000000000 --- a/pkgs/by-name/li/libyuv/link-library-against-libjpeg.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 636531ee..af1b0e4e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,6 +39,7 @@ INCLUDE ( FindJPEG ) - if (JPEG_FOUND) - include_directories( ${JPEG_INCLUDE_DIR} ) - target_link_libraries( yuvconvert ${JPEG_LIBRARY} ) -+ target_link_libraries( ${ly_lib_shared} ${JPEG_LIBRARY} ) - add_definitions( -DHAVE_JPEG ) - endif() diff --git a/pkgs/by-name/li/libyuv/package.nix b/pkgs/by-name/li/libyuv/package.nix index 549d4853f1f9..20587c52e87e 100644 --- a/pkgs/by-name/li/libyuv/package.nix +++ b/pkgs/by-name/li/libyuv/package.nix @@ -4,31 +4,30 @@ fetchgit, cmake, libjpeg, + gtest, }: stdenv.mkDerivation { pname = "libyuv"; - version = "1787"; # Defined in: include/libyuv/version.h + version = "1908"; # Defined in: include/libyuv/version.h src = fetchgit { url = "https://chromium.googlesource.com/libyuv/libyuv.git"; - rev = "eb6e7bb63738e29efd82ea3cf2a115238a89fa51"; # refs/heads/stable - hash = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU="; + rev = "b7a857659f8485ee3c6769c27a3e74b0af910746"; # upstream does not do tagged releases + hash = "sha256-4Irs+hlAvr6v5UKXmKHhg4IK3cTWdsFWxt1QTS0rizU="; }; nativeBuildInputs = [ cmake ]; - # NEON does not work on aarch64, we disable it - cmakeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ - "-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON" + cmakeFlags = [ + "-DUNIT_TEST=ON" ]; - buildInputs = [ libjpeg ]; - - patches = [ - ./link-library-against-libjpeg.patch + buildInputs = [ + libjpeg + gtest ]; postPatch = '' @@ -40,6 +39,16 @@ stdenv.mkDerivation { --replace "@VERSION@" "$version" ''; + doCheck = true; + + checkPhase = '' + runHook preCheck + + ./libyuv_unittest + + runHook postCheck + ''; + meta = with lib; { homepage = "https://chromium.googlesource.com/libyuv/libyuv"; description = "Open source project that includes YUV scaling and conversion functionality"; diff --git a/pkgs/by-name/li/libzapojit/package.nix b/pkgs/by-name/li/libzapojit/package.nix deleted file mode 100644 index ace4b1bbf65f..000000000000 --- a/pkgs/by-name/li/libzapojit/package.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - glib, - intltool, - json-glib, - librest, - libsoup_2_4, - gnome, - gnome-online-accounts, - gobject-introspection, -}: - -stdenv.mkDerivation rec { - pname = "libzapojit"; - version = "0.0.3"; - - outputs = [ - "out" - "dev" - ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; - }; - - nativeBuildInputs = [ - pkg-config - intltool - gobject-introspection - ]; - propagatedBuildInputs = [ - glib - json-glib - librest - libsoup_2_4 - gnome-online-accounts - ]; # zapojit-0.0.pc - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; - homepage = "https://gitlab.gnome.org/Archive/libzapojit"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/li/libzim/package.nix b/pkgs/by-name/li/libzim/package.nix index 4e2981096b21..c6a208815cfd 100644 --- a/pkgs/by-name/li/libzim/package.nix +++ b/pkgs/by-name/li/libzim/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "9.2.3"; + version = "9.3.0"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; tag = version; - hash = "sha256-z22+cDlFQtLMLFh5+7Nt9LsGFyBPi3HeZhYb0LK86Oc="; + hash = "sha256-DZiFeZ2ry3JpXDs3mvf0q7diwhkjQ2730KQkDQPbgcY="; }; patches = [ diff --git a/pkgs/by-name/li/licensedigger/package.nix b/pkgs/by-name/li/licensedigger/package.nix index 6536648e1963..9035c07c27d4 100644 --- a/pkgs/by-name/li/licensedigger/package.nix +++ b/pkgs/by-name/li/licensedigger/package.nix @@ -3,7 +3,7 @@ fetchFromGitLab, stdenv, cmake, - kdePackages, + extra-cmake-modules, libsForQt5, }: stdenv.mkDerivation { @@ -18,10 +18,12 @@ stdenv.mkDerivation { hash = "sha256-/ZEja+iDx0lVkJaLshPd1tZD4ZUspVeFHY1TNXjr4qg="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ - kdePackages.extra-cmake-modules libsForQt5.qtbase ]; diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index a5a4ac228048..01d404151dbb 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -1,13 +1,11 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, git, gitls, - darwin, }: rustPlatform.buildRustPackage rec { pname = "licensure"; @@ -23,15 +21,11 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-b3Vb8beULbLQuBORcE5nWuHkqDmalexJick9Ct5+iUM="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - git - gitls - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + git + gitls + ]; checkFlags = [ # Checking for files in the git repo (git ls-files), diff --git a/pkgs/by-name/li/lifelines/package.nix b/pkgs/by-name/li/lifelines/package.nix index a1014564ef0f..4f45e30442c3 100644 --- a/pkgs/by-name/li/lifelines/package.nix +++ b/pkgs/by-name/li/lifelines/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, gettext, libiconv, bison, @@ -13,25 +12,15 @@ stdenv.mkDerivation { pname = "lifelines"; - version = "unstable-2019-05-07"; + version = "0-unstable-2025-01-05"; src = fetchFromGitHub { owner = "lifelines"; repo = "lifelines"; - rev = "43f29285ed46fba322b6a14322771626e6b02c59"; - sha256 = "1agszzlmkxmznpc1xj0vzxkskrcfagfjvqsdyw1yp5yg6bsq272y"; + rev = "fbc92b6585e5f642c59a5317a0f4d4573f51b2d6"; + sha256 = "sha256-G/Sj3E8K4QDR4fJcipCKTXpQU19LOfOeLBp5k7uPwk4="; }; - patches = [ - # Fix pending upstream inclusion for ncurses-6.3 support: - # https://github.com/lifelines/lifelines/pull/437 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/lifelines/lifelines/commit/e04ce2794d458c440787c191877fbbc0784447bd.patch"; - sha256 = "1smnz4z5hfjas79bfvlnpw9x8199a5g0p9cvhf17zpcnz1432kg7"; - }) - ]; - buildInputs = [ gettext libiconv @@ -43,11 +32,11 @@ stdenv.mkDerivation { bison ]; - meta = with lib; { + meta = { description = "Genealogy tool with ncurses interface"; homepage = "https://lifelines.github.io/lifelines/"; - license = licenses.mit; - maintainers = with maintainers; [ disassembler ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.disassembler ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/li/lifeograph/package.nix b/pkgs/by-name/li/lifeograph/package.nix index c44d85c96452..7e26c1ddfbca 100644 --- a/pkgs/by-name/li/lifeograph/package.nix +++ b/pkgs/by-name/li/lifeograph/package.nix @@ -1,26 +1,27 @@ { - stdenv, lib, + stdenv, fetchgit, pkg-config, meson, ninja, - wrapGAppsHook3, + wrapGAppsHook4, enchant, - gtkmm3, + gtkmm4, libchamplain, libgcrypt, shared-mime-info, + libshumate, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lifeograph"; - version = "2.0.3"; + version = "3.0.1"; src = fetchgit { url = "https://git.launchpad.net/lifeograph"; - rev = "v${version}"; - hash = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM="; + rev = "v${finalAttrs.version}"; + hash = "sha256-tcq1A1P8sJ57Tr2MLxsFIru+VJdORuvPBq6fMgBmuY0="; }; nativeBuildInputs = [ @@ -28,27 +29,28 @@ stdenv.mkDerivation rec { ninja pkg-config shared-mime-info # for update-mime-database - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ libgcrypt enchant - gtkmm3 + gtkmm4 libchamplain + libshumate ]; postInstall = '' substituteInPlace $out/share/applications/net.sourceforge.Lifeograph.desktop \ - --replace "Exec=" "Exec=$out/bin/" + --replace-fail "Exec=" "Exec=$out/bin/" ''; - meta = with lib; { - homepage = "https://lifeograph.sourceforge.net/wiki/Main_Page"; - description = "Lifeograph is an off-line and private journal and note taking application"; - license = licenses.gpl3Only; - maintainers = [ ]; + meta = { + homepage = "https://lifeograph.sourceforge.net/doku.php?id=start"; + description = "Off-line and private journal and note taking application"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ emaryn ]; mainProgram = "lifeograph"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/lightburn/package.nix b/pkgs/by-name/li/lightburn/package.nix index 95ce9327b1fb..df15a74ba638 100644 --- a/pkgs/by-name/li/lightburn/package.nix +++ b/pkgs/by-name/li/lightburn/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.7.07"; + version = "1.7.08"; src = fetchurl { url = "https://release.lightburnsoftware.com/LightBurn/Release/LightBurn-v${version}/LightBurn-Linux64-v${version}.7z"; - hash = "sha256-MFv+y1GVoio4ok7negpX4ABaya7Z+s8zqM85YhOFxVo="; + hash = "sha256-dG/A39/SapyS6GGSKCsHUvYN+CONul/s55HTi9Cc59g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lighthouse-steamvr/package.nix b/pkgs/by-name/li/lighthouse-steamvr/package.nix new file mode 100644 index 000000000000..775a22a16c3f --- /dev/null +++ b/pkgs/by-name/li/lighthouse-steamvr/package.nix @@ -0,0 +1,34 @@ +{ + fetchFromGitHub, + lib, + rustPlatform, + pkg-config, + dbus, +}: + +rustPlatform.buildRustPackage rec { + pname = "Lighthouse"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "ShayBox"; + repo = pname; + rev = version; + hash = "sha256-FiS+jB5l5xtFIVISA6+K/jbyJZFPwLvy7G+dA+78kZU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-5IrY1ohG5oJF+LvrcHrHYT2nslICQPZptJYrrwMEmwQ="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ dbus ]; + + meta = with lib; { + description = "VR Lighthouse power state management"; + homepage = "https://github.com/ShayBox/Lighthouse"; + license = licenses.mit; + maintainers = with maintainers; [ bddvlpr ]; + mainProgram = "lighthouse"; + }; +} diff --git a/pkgs/by-name/li/lighthouse/package.nix b/pkgs/by-name/li/lighthouse/package.nix new file mode 100644 index 000000000000..c024b07db1ab --- /dev/null +++ b/pkgs/by-name/li/lighthouse/package.nix @@ -0,0 +1,146 @@ +{ + cmake, + fetchFromGitHub, + fetchurl, + lib, + lighthouse, + nix-update-script, + openssl, + pkg-config, + protobuf, + rustPlatform, + rust-jemalloc-sys, + sqlite, + stdenv, + testers, +}: + +rustPlatform.buildRustPackage rec { + pname = "lighthouse"; + version = "6.0.1"; + + # lighthouse/common/deposit_contract/build.rs + depositContractSpecVersion = "0.12.1"; + testnetDepositContractSpecVersion = "0.9.2.1"; + + src = fetchFromGitHub { + owner = "sigp"; + repo = "lighthouse"; + rev = "v${version}"; + hash = "sha256-8jHNm/MGpHGOt52rLMXLMWIVn8AXqnpAr+Wvk7DH6gc="; + }; + + patches = [ + ./use-system-sqlite.patch + ]; + + cargoHash = "sha256-Opkz3EVKw0M4LeWMsn1NlSw/Fg7cWVqnDJRRTPYYlLo="; + useFetchCargoVendor = true; + + buildFeatures = [ + "modern" + "gnosis" + ]; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + cmake + pkg-config + protobuf + ]; + + buildInputs = + [ + rust-jemalloc-sys + sqlite + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + openssl + ]; + + depositContractSpec = fetchurl { + url = "https://raw.githubusercontent.com/ethereum/eth2.0-specs/v${depositContractSpecVersion}/deposit_contract/contracts/validator_registration.json"; + hash = "sha256-ZslAe1wkmkg8Tua/AmmEfBmjqMVcGIiYHwi+WssEwa8="; + }; + + testnetDepositContractSpec = fetchurl { + url = "https://raw.githubusercontent.com/sigp/unsafe-eth2-deposit-contract/v${testnetDepositContractSpecVersion}/unsafe_validator_registration.json"; + hash = "sha256-aeTeHRT3QtxBRSNMCITIWmx89vGtox2OzSff8vZ+RYY="; + }; + + LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}"; + LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}"; + + OPENSSL_NO_VENDOR = true; + + cargoBuildFlags = [ + "--package lighthouse" + ]; + + __darwinAllowLocalNetworking = true; + + checkFeatures = [ ]; + + # All of these tests require network access and/or docker + cargoTestFlags = [ + "--workspace" + "--exclude beacon_chain" + "--exclude beacon_node" + "--exclude http_api" + "--exclude lighthouse" + "--exclude lighthouse_network" + "--exclude network" + "--exclude slashing_protection" + "--exclude watch" + "--exclude web3signer_tests" + ]; + + # All of these tests require network access + checkFlags = + [ + "--skip basic" + "--skip deposit_tree::cache_consistency" + "--skip deposit_tree::double_update" + "--skip deposit_tree::updating" + "--skip eth1_cache::big_skip" + "--skip eth1_cache::double_update" + "--skip eth1_cache::pruning" + "--skip eth1_cache::simple_scenario" + "--skip fast::deposit_cache_query" + "--skip http::incrementing_deposits" + "--skip persist::test_persist_caches" + "--skip service::tests::tests::test_dht_persistence" + "--skip time::test::test_reinsertion_updates_timeout" + ] + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ + "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart" + "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch" + "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" + ]; + + passthru = { + tests.version = testers.testVersion { + package = lighthouse; + command = "lighthouse --version"; + version = "v${lighthouse.version}"; + }; + updateScript = nix-update-script { }; + }; + + enableParallelBuilding = true; + + # This is needed by the unit tests. + FORK_NAME = "capella"; + + meta = with lib; { + description = "Ethereum consensus client in Rust"; + homepage = "https://lighthouse.sigmaprime.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ + centromere + pmw + ]; + mainProgram = "lighthouse"; + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch b/pkgs/by-name/li/lighthouse/use-system-sqlite.patch similarity index 100% rename from pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch rename to pkgs/by-name/li/lighthouse/use-system-sqlite.patch diff --git a/pkgs/by-name/li/lightlocker/package.nix b/pkgs/by-name/li/lightlocker/package.nix index efcee4bdeea1..559a267aa0fd 100644 --- a/pkgs/by-name/li/lightlocker/package.nix +++ b/pkgs/by-name/li/lightlocker/package.nix @@ -87,7 +87,8 @@ stdenv.mkDerivation rec { ConsoleKit/UPower or logind/systemd. ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ obadz ] ++ teams.pantheon.members; + maintainers = with maintainers; [ obadz ]; + teams = [ teams.pantheon ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix index 22b0361b3b9f..7bd0a90d12e7 100644 --- a/pkgs/by-name/li/lightningcss/package.nix +++ b/pkgs/by-name/li/lightningcss/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lightningcss"; - version = "1.29.3"; + version = "1.30.1"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; tag = "v${finalAttrs.version}"; - hash = "sha256-+rSqRJaB6UMdCsAcr0X2BZuHk2o6NWDn1yIX4Yjn+Y4="; + hash = "sha256-imLbsQ2F5CQiepwWSMcXj0Fgyv4liCMmCwA/0SE07Mo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6P559K7hKZcd/hjyEQGf4V+cTHoS9H0wprfpMqG3ugk="; + cargoHash = "sha256-aNho9NavEgY4dwGcNXsLDnlVCB2rODIPae3LnfOwJIA="; patches = [ # Backport fix for build error for lightningcss-napi diff --git a/pkgs/by-name/li/lightsoff/package.nix b/pkgs/by-name/li/lightsoff/package.nix index b1c6a82baa01..da5a5a3f4304 100644 --- a/pkgs/by-name/li/lightsoff/package.nix +++ b/pkgs/by-name/li/lightsoff/package.nix @@ -4,18 +4,15 @@ fetchurl, vala, pkg-config, - gtk3, + glib, + gtk4, + libadwaita, gnome, - adwaita-icon-theme, gdk-pixbuf, - librsvg, - wrapGAppsHook3, + wrapGAppsHook4, gettext, itstool, - clutter, - clutter-gtk, libxml2, - appstream-glib, meson, ninja, python3, @@ -23,20 +20,19 @@ stdenv.mkDerivation rec { pname = "lightsoff"; - version = "46.0"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/lightsoff-${version}.tar.xz"; - hash = "sha256-ZysVMuBkX64C8oN6ltU57c/Uw7pPcuWR3HP+R567i5I="; + hash = "sha256-LsmVAXE9vNE8WlZaLhGMxMwrUCg2s4enc2z7pAqLOYk="; }; nativeBuildInputs = [ vala pkg-config - wrapGAppsHook3 + wrapGAppsHook4 itstool gettext - appstream-glib libxml2 meson ninja @@ -44,17 +40,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 - adwaita-icon-theme - gdk-pixbuf - librsvg - clutter - clutter-gtk + glib + gtk4 + libadwaita ]; postPatch = '' chmod +x build-aux/meson_post_install.py patchShebangs build-aux/meson_post_install.py + substituteInPlace build-aux/meson_post_install.py \ + --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; passthru = { @@ -66,7 +61,7 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/GNOME/lightsoff/-/blob/${version}/NEWS?ref_type=tags"; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; mainProgram = "lightsoff"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix index 5abe45061795..edfd21231602 100644 --- a/pkgs/by-name/li/lighttpd/package.nix +++ b/pkgs/by-name/li/lighttpd/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.78"; + version = "1.4.79"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-PAc56Lx1yen8HPqJ4cME3UsOSruHrcZGodILxqLbKj4="; + sha256 = "sha256-OymmJbOtiHAtH+pPX0K7fYdIjy5O/Jd9fxhTKcpghL0="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix index bac3bc61b1d2..a1b35fa48cec 100644 --- a/pkgs/by-name/li/ligolo-ng/package.nix +++ b/pkgs/by-name/li/ligolo-ng/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.7.5"; + version = "0.8.1"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; tag = "v${version}"; - hash = "sha256-BU3gBUNOTjpAANkvzPcgsZrly+TkbG86LHtZf93uxeY="; + hash = "sha256-+d5dBhB0ABYrGQHZ5ta5hxsAqQop7H/5P4pxNF4MIc0="; }; - vendorHash = "sha256-v6lHY3s1TJh8u4JaTa9kcCj+1pl01zckvTVeLk8TZ+w="; + vendorHash = "sha256-oc85xNPMFeaPC7TMcSh3i3Msd8sCJ5QGFmi2fKjcyvk="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/li/limbo/package.nix index 38f31582183f..a1d99b72d58e 100644 --- a/pkgs/by-name/li/limbo/package.nix +++ b/pkgs/by-name/li/limbo/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 08e697c17fbc..06fc33255a1b 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -42,14 +42,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "9.2.1"; + version = "9.3.2"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-yHr8FMOKlWlSkkmkGADC6R4PHO7tHk38gwrJS/nPvvs="; + hash = "sha256-aYzNgErrlRIIv4hmekdoPMCZ4g5xDYIeTUJhEkfuuJQ="; }; enableParallelBuilding = true; @@ -113,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lzcunt phip1611 + prince213 surfaceflinger ]; }; diff --git a/pkgs/by-name/li/limo/package.nix b/pkgs/by-name/li/limo/package.nix index b3fdb4e4ab1e..2efce77c2cd4 100644 --- a/pkgs/by-name/li/limo/package.nix +++ b/pkgs/by-name/li/limo/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "limo"; - version = "1.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "limo-app"; repo = "limo"; tag = "v${finalAttrs.version}"; - hash = "sha256-fzqIZ/BqOpPjo18qi4VidGg1ruhQLqfwoA/hidGPEao="; + hash = "sha256-ZnGDEoZLKlbtAzPKg5dIisvV1pR+Usu6m71zRQBa9ig="; }; patches = lib.optionals (!withUnrar) [ diff --git a/pkgs/by-name/li/linalg/package.nix b/pkgs/by-name/li/linalg/package.nix new file mode 100644 index 000000000000..7daf050b5fe0 --- /dev/null +++ b/pkgs/by-name/li/linalg/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "lialg"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "sgorsten"; + repo = "linalg"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2I+sJca0tf/CcuoqaldfwPVRrzNriTXO60oHxsFQSnE="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 linalg.h -t $out/include + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Single-header, public domain, short vector math library for C++"; + homepage = "https://github.com/sgorsten/linalg"; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.eymeric ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/li/linbox/package.nix b/pkgs/by-name/li/linbox/package.nix index b1fa335a04a7..c6821aa2f872 100644 --- a/pkgs/by-name/li/linbox/package.nix +++ b/pkgs/by-name/li/linbox/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { description = "C++ library for exact, high-performance linear algebra"; mainProgram = "linbox-config"; license = licenses.lgpl21Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; homepage = "https://linalg.org/"; }; diff --git a/pkgs/by-name/li/linenoise-ng/package.nix b/pkgs/by-name/li/linenoise-ng/package.nix deleted file mode 100644 index 1b9ad3f243c4..000000000000 --- a/pkgs/by-name/li/linenoise-ng/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, -}: - -stdenv.mkDerivation rec { - pname = "linenoise-ng"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "arangodb"; - repo = "linenoise-ng"; - rev = "v${version}"; - sha256 = "176iz0kj0p8d8i3jqps4z8xkxwl3f1986q88i9xg5fvqgpzsxp20"; - }; - - nativeBuildInputs = [ cmake ]; - - meta = { - homepage = "https://github.com/arangodb/linenoise-ng"; - description = "Small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters"; - maintainers = [ ]; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/by-name/li/linien-gui/package.nix b/pkgs/by-name/li/linien-gui/package.nix index a62f5b269f10..213c4174db1c 100644 --- a/pkgs/by-name/li/linien-gui/package.nix +++ b/pkgs/by-name/li/linien-gui/package.nix @@ -4,22 +4,28 @@ qt5, }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + self = python; + packageOverrides = self: super: { + numpy = super.numpy_1; + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "linien-gui"; pyproject = true; - inherit (python3.pkgs.linien-common) src version; + inherit (python.pkgs.linien-common) src version; sourceRoot = "${src.name}/linien-gui"; - nativeBuildInputs = - with python3.pkgs; - [ - setuptools - ] - ++ [ - qt5.wrapQtAppsHook - ]; + build-system = with python.pkgs; [ + setuptools + ]; + nativeBuildInputs = [ + qt5.wrapQtAppsHook + ]; # Makes qt-wayland appear in the qt paths injected by the wrapper - helps users # with `QT_QPA_PLATFORM=wayland` in their environment. @@ -27,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { qt5.qtwayland ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python.pkgs; [ appdirs click pyqtgraph @@ -43,13 +49,19 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - meta = with lib; { + passthru = { + # Useful for creating .withPackages environments, see NOTE near + # `python3Packages.linien-common.meta.broken`. + inherit python; + }; + + meta = { description = "Graphical user interface of the Linien spectroscopy lock application"; mainProgram = "linien"; homepage = "https://github.com/linien-org/linien/tree/develop/linien-gui"; changelog = "https://github.com/linien-org/linien/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fsagbuya doronbehar ]; diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 493ce3831e51..68e16790e4bc 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.5.0"; + version = "16.0.0"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-xZ4fKwryGHVD1AhSKJVvBGIDJin10YejKxDp1yMi8Pg="; + hash = "sha256-vMk8KrWkrMETEGUev0C5ZaMFZH95/VaASr9v5nI2JGo="; }; - npmDepsHash = "sha256-KIZgJaVGwPAsMtKMINqSnqSuD3iJIqRmoUDkU4iPh/s="; + npmDepsHash = "sha256-lj1+a/+X/0Qj41S+C50Z5cQfu/5KUgXgls+tYbN16OU="; dontNpmBuild = true; diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix index 778c4bb874b9..d403c207cbf7 100644 --- a/pkgs/by-name/li/lintspec/package.nix +++ b/pkgs/by-name/li/lintspec/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "lintspec"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "beeb"; repo = "lintspec"; tag = "v${version}"; - hash = "sha256-3+E0y3WxyjvIeIaAVhjXoBnS4+THv6L4Dj4LvpRYkog="; + hash = "sha256-I9u4fS3K3tPgr15lAEkBQO1KXSNPAu3aiM9Qo9IRuHE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-TIGNToVqzRUV3/5RpbYpuMrefntft9qasCjOxmpE3lc="; + cargoHash = "sha256-wTR4E+Pbx0ReeVav/ECklS8on0v5aYvFqE+FZhieRHk="; meta = { description = "Blazingly fast linter for NatSpec comments in Solidity code"; diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix index dcdad53cb207..e5f97ebebdb2 100644 --- a/pkgs/by-name/li/linux-firmware/package.nix +++ b/pkgs/by-name/li/linux-firmware/package.nix @@ -22,11 +22,11 @@ let in stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20250311"; + version = "20250509"; src = fetchzip { url = "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-${version}.tar.xz "; - hash = "sha256-ZM7j+kUpmWJUQdAGbsfwOqsNV8oE0U2t6qnw0b7pT4g="; + hash = "sha256-0FrhgJQyCeRCa3s0vu8UOoN0ZgVCahTQsSH0o6G6hhY="; }; postUnpack = '' diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix index a1a515097307..03bbf3299520 100644 --- a/pkgs/by-name/li/linux-pam/package.nix +++ b/pkgs/by-name/li/linux-pam/package.nix @@ -4,7 +4,6 @@ buildPackages, fetchurl, flex, - cracklib, db4, gettext, audit, @@ -51,7 +50,6 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.buildPlatform.isDarwin gettext; buildInputs = [ - cracklib db4 libxcrypt ] ++ lib.optional stdenv.buildPlatform.isLinux audit; diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix index d0261ad7fd14..5dfee0f92ad5 100644 --- a/pkgs/by-name/li/linux-wallpaperengine/package.nix +++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix @@ -8,12 +8,9 @@ glew, glfw, glm, - libGL, libpulseaudio, - libX11, libXau, libXdmcp, - libXext, libXpm, libXrandr, libXxf86vm, @@ -23,115 +20,30 @@ SDL2, SDL2_mixer, zlib, - fetchzip, wayland, wayland-protocols, egl-wayland, libffi, wayland-scanner, - glib, - nss, - nspr, - atk, - at-spi2-atk, - libdrm, - expat, - libxcb, - libxkbcommon, - libXcomposite, - libXdamage, - libXfixes, - libgbm, - gtk3, - pango, - cairo, - alsa-lib, - dbus, - at-spi2-core, - cups, - libxshmfence, - udev, - systemd, + cef-binary, libdecor, autoPatchelfHook, }: + let - rpath = lib.makeLibraryPath [ - glib - nss - nspr - atk - at-spi2-atk - libdrm - libGL - expat - libxcb - libxkbcommon - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXrandr - libgbm - gtk3 - pango - cairo - alsa-lib - dbus - at-spi2-core - cups - libxshmfence - udev - systemd - ]; - buildType = "Release"; - selectSystem = - attrs: - attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - arch = selectSystem { - aarch64-linux = "arm64"; - x86_64-linux = "x64"; - }; - cef-bin-name = "cef_binary_120.1.10+g3ce3184+chromium-120.0.6099.129_linux${arch}"; - cef-bin = stdenv.mkDerivation { - pname = "cef-bin"; - version = "120.0.6099.129"; + cef = cef-binary.overrideAttrs (oldAttrs: { + version = "120.1.10"; + __intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD + gitRevision = "3ce3184"; + chromiumVersion = "120.0.6099.129"; - src = fetchzip { - url = "https://cef-builds.spotifycdn.com/${ - builtins.replaceStrings [ "+" ] [ "%2B" ] cef-bin-name - }.tar.bz2"; - hash = selectSystem { - aarch64-linux = "sha256-2mOh3GWdx0qxsLRKVYXOJnVY0eqz6B3z9/B9A9Xfs/A="; - x86_64-linux = "sha256-FFkFMMkTSseLZIDzESFl8+h7wRhv5QGi1Uy5MViYpX8="; - }; - }; - - installPhase = '' - runHook preInstall - - cp --recursive --no-preserve=mode . $out - patchelf $out/${buildType}/libcef.so --set-rpath "${rpath}" --add-needed libudev.so - patchelf $out/${buildType}/libGLESv2.so --set-rpath "${rpath}" --add-needed libGL.so.1 - patchelf $out/${buildType}/chrome-sandbox --set-interpreter $(cat $NIX_BINTOOLS/nix-support/dynamic-linker) - sed 's/-O0/-O2/' -i $out/cmake/cef_variables.cmake - - runHook postInstall - ''; - - meta = { - description = "Simple framework for embedding Chromium-based browsers in other applications"; - homepage = "https://cef-builds.spotifycdn.com/index.html"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.bsd3; - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; - hydraPlatforms = [ "x86_64-linux" ]; # Hydra "aarch64-linux" fails with "Output limit exceeded" - }; - }; + srcHash = + { + aarch64-linux = "sha256-l0PSW4ZeLhfEauf1bez1GoLfu9cwXZzEocDlGI9yFsQ="; + x86_64-linux = "sha256-OdIVEy77tiYRfDWXgyceSstFqCNeZHswzkpw06LSnP0="; + } + .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); + }); in stdenv.mkDerivation rec { pname = "linux-wallpaperengine"; @@ -176,13 +88,13 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${buildType}" - "-DCEF_ROOT=${cef-bin}" + "-DCMAKE_BUILD_TYPE=${cef.buildType}" + "-DCEF_ROOT=${cef}" "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/app/linux-wallpaperengine" ]; preFixup = '' - patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:${cef-bin}" $out/app/linux-wallpaperengine/linux-wallpaperengine + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:${cef}" $out/app/linux-wallpaperengine/linux-wallpaperengine chmod 755 $out/app/linux-wallpaperengine/linux-wallpaperengine mkdir $out/bin ln -s $out/app/linux-wallpaperengine/linux-wallpaperengine $out/bin/linux-wallpaperengine diff --git a/pkgs/by-name/li/linux_logo/package.nix b/pkgs/by-name/li/linux_logo/package.nix index c252aab25982..85da3509bd6c 100644 --- a/pkgs/by-name/li/linux_logo/package.nix +++ b/pkgs/by-name/li/linux_logo/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "http://www.deater.net/weave/vmwprod/linux_logo"; changelog = "https://github.com/deater/linux_logo/blob/${src.rev}/CHANGES"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/li/linuxdoc-tools/package.nix b/pkgs/by-name/li/linuxdoc-tools/package.nix index 34bb2d847575..ce39d91de2a0 100644 --- a/pkgs/by-name/li/linuxdoc-tools/package.nix +++ b/pkgs/by-name/li/linuxdoc-tools/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "linuxdoc-tools"; - version = "0.9.85"; + version = "0.9.86"; src = fetchFromGitLab { owner = "agmartin"; repo = "linuxdoc-tools"; rev = version; - hash = "sha256-8nsCfcxqVt16br6Vhk8tW3cxJMJFSZYX2g3MjO7JoT4="; + hash = "sha256-AsTlrjTYuuLB2jF0zKPVrxOZ2ygUIyMJFV6qDd7ODwA="; }; outputs = [ diff --git a/pkgs/by-name/li/linuxquota/package.nix b/pkgs/by-name/li/linuxquota/package.nix index 8543256ec87e..04e5d71dbe9c 100644 --- a/pkgs/by-name/li/linuxquota/package.nix +++ b/pkgs/by-name/li/linuxquota/package.nix @@ -10,12 +10,12 @@ }: stdenv.mkDerivation rec { - version = "4.09"; + version = "4.10"; pname = "quota"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "sha256-nNrKFUvJKvwxF/Dl9bMgjdX4RYOvHPBhw5uqCiuxQvk="; + sha256 = "sha256-oEoMr8opwVvotqxmDgYYi8y4AsGe/i58Ge1/PWZ+z14="; }; outputs = [ diff --git a/pkgs/by-name/li/linuxsampler/package.nix b/pkgs/by-name/li/linuxsampler/package.nix index 6a7fbf180120..d0c093b9178a 100644 --- a/pkgs/by-name/li/linuxsampler/package.nix +++ b/pkgs/by-name/li/linuxsampler/package.nix @@ -16,15 +16,17 @@ lv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "linuxsampler"; version = "2.3.1"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "sha256-T7quk5N5JBiPqIziQd0vaCr8tLDbwS6otz6egY01OTE="; + url = "https://download.linuxsampler.org/packages/linuxsampler-${finalAttrs.version}.tar.bz2"; + hash = "sha256-T7quk5N5JBiPqIziQd0vaCr8tLDbwS6otz6egY01OTE="; }; + env.HAVE_UNIX98 = "1"; + preConfigure = '' make -f Makefile.svn ''; @@ -49,7 +51,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "http://www.linuxsampler.org"; description = "Sampler backend"; longDescription = '' @@ -63,8 +65,8 @@ stdenv.mkDerivation rec { have questions on the subject, that are not yet covered by the FAQ, please contact us. ''; - license = licenses.unfree; + license = lib.licenses.unfree; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/lipo-go/package.nix b/pkgs/by-name/li/lipo-go/package.nix index b2cdfef1aadf..3375419968d6 100644 --- a/pkgs/by-name/li/lipo-go/package.nix +++ b/pkgs/by-name/li/lipo-go/package.nix @@ -2,37 +2,26 @@ lib, buildGoModule, fetchFromGitHub, - ast-grep, versionCheckHook, nix-update-script, lipo-go, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "lipo-go"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "konoui"; repo = "lipo"; - tag = "v${version}"; - hash = "sha256-FW2mOsshpXCTTjijo0RFdsYX883P2cudyclRtvkCxa0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-V1KlgCNKvxnY/B8cmiWFdXzHH6k6VmhNMIta3nckXtA="; }; vendorHash = "sha256-7M6CRxJd4fgYQLJDkNa3ds3f7jOp3dyloOZtwMtCBQk="; - nativeBuildInputs = [ ast-grep ]; - - postPatch = - # Remove the test case that is not compatible with nix-build - '' - ast-grep run \ - --pattern 'func TestLipo_ArchsToLocalFiles($$$) { $$$ }' \ - --rewrite "" \ - pkg/lipo/archs_test.go - ''; buildPhase = '' runHook preBuild - make build VERSION=${version} REVISION="" BINARY=$out/bin/lipo + make build VERSION=${finalAttrs.version} REVISION="" BINARY=$out/bin/lipo runHook postBuild ''; @@ -41,19 +30,17 @@ buildGoModule rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/lipo"; - versionCheckProgramArg = [ "-version" ]; + versionCheckProgramArg = "-version"; doInstallCheck = true; - passthru = { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Designed to be compatible with macOS lipo, written in golang"; homepage = "https://github.com/konoui/lipo"; - changelog = "https://github.com/konoui/lipo/releases/tag/v${version}"; + changelog = "https://github.com/konoui/lipo/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; mainProgram = "lipo"; }; -} +}) diff --git a/pkgs/by-name/li/listenbrainz-mpd/package.nix b/pkgs/by-name/li/listenbrainz-mpd/package.nix new file mode 100644 index 000000000000..63ac2e3b1040 --- /dev/null +++ b/pkgs/by-name/li/listenbrainz-mpd/package.nix @@ -0,0 +1,74 @@ +{ + lib, + rustPlatform, + fetchFromGitea, + pkg-config, + stdenv, + openssl, + libiconv, + sqlite, + installShellFiles, + asciidoctor, +}: + +rustPlatform.buildRustPackage rec { + pname = "listenbrainz-mpd"; + version = "2.3.8"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "elomatreb"; + repo = "listenbrainz-mpd"; + rev = "v${version}"; + hash = "sha256-QBc0avci232UIxzTKlS0pjL7cCuvwAFgw6dSwdtYAtU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-NQXXR6b1XZDihVoRNFJLXtMNjlzOIzkc4rthwx0A7AE="; + + nativeBuildInputs = [ + pkg-config + installShellFiles + asciidoctor + ]; + + buildInputs = + [ sqlite ] + ++ ( + if stdenv.hostPlatform.isDarwin then + [ + libiconv + ] + else + [ + openssl + ] + ); + + buildFeatures = + [ + "shell_completion" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "systemd" + ]; + + postInstall = '' + installShellCompletion \ + --bash generated_completions/listenbrainz-mpd.bash \ + --fish generated_completions/listenbrainz-mpd.fish \ + --zsh generated_completions/_listenbrainz-mpd + + asciidoctor --backend=manpage listenbrainz-mpd.adoc -o listenbrainz-mpd.1 + installManPage listenbrainz-mpd.1 + ''; + + meta = with lib; { + homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd"; + changelog = "https://codeberg.org/elomatreb/listenbrainz-mpd/src/tag/v${version}/CHANGELOG.md"; + description = "ListenBrainz submission client for MPD"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ DeeUnderscore ]; + mainProgram = "listenbrainz-mpd"; + }; +} diff --git a/pkgs/by-name/li/lite-xl/package.nix b/pkgs/by-name/li/lite-xl/package.nix new file mode 100644 index 000000000000..44c478e7209e --- /dev/null +++ b/pkgs/by-name/li/lite-xl/package.nix @@ -0,0 +1,50 @@ +{ + fetchFromGitHub, + freetype, + lib, + lua5_4, + meson, + ninja, + pcre2, + pkg-config, + SDL2, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "lite-xl"; + version = "2.1.7"; + + src = fetchFromGitHub { + owner = "lite-xl"; + repo = "lite-xl"; + rev = "v${version}"; + hash = "sha256-Ig0XDxnll/zruAwWHwuXiqumBXgAPxuK0E1ELupvcXo="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + freetype + lua5_4 + pcre2 + SDL2 + ]; + + mesonFlags = [ + "-Duse_system_lua=true" + ]; + + meta = with lib; { + description = "Lightweight text editor written in Lua"; + homepage = "https://github.com/lite-xl/lite-xl"; + license = licenses.mit; + maintainers = with maintainers; [ sefidel ]; + platforms = platforms.unix; + mainProgram = "lite-xl"; + }; +} diff --git a/pkgs/by-name/li/litebrowser/package.nix b/pkgs/by-name/li/litebrowser/package.nix index 1dcaf8b4c436..94c822321427 100644 --- a/pkgs/by-name/li/litebrowser/package.nix +++ b/pkgs/by-name/li/litebrowser/package.nix @@ -7,7 +7,6 @@ gtk3, gtkmm3, curl, - poco, gumbo, # litehtml dependency }: @@ -32,7 +31,6 @@ stdenv.mkDerivation { gtk3 gtkmm3 curl - poco gumbo ]; diff --git a/pkgs/by-name/li/litefs/package.nix b/pkgs/by-name/li/litefs/package.nix index 5277cda5c178..83226ec9b449 100644 --- a/pkgs/by-name/li/litefs/package.nix +++ b/pkgs/by-name/li/litefs/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "litefs"; - version = "0.5.11"; + version = "0.5.14"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I12bKImZkvAMyfwb6r/NxE+BcUk+SalN+cIDXP0q4xA="; + sha256 = "sha256-URwHnOvvz/UnrxoFIuUYpw10uPHgxQf9LPO1xECixDE="; }; - vendorHash = "sha256-FcYPe4arb+jbxj4Tl6bRRAnkEvw0rkECIo8/zC79lOA="; + vendorHash = "sha256-i0gYhPwcs3dfWy6GANlUl1Nc+dXD8KuAT71FATwxpDo="; subPackages = [ "cmd/litefs" ]; diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index 4cbb41fec40d..e60b13570f91 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "litmusctl"; - version = "1.14.0"; + version = "1.15.0"; nativeBuildInputs = [ installShellFiles @@ -22,7 +22,7 @@ buildGoModule rec { owner = "litmuschaos"; repo = "litmusctl"; rev = "${version}"; - hash = "sha256-Saj5sx5YkcKsnMrnIzPcLok+mgEZSh9p8rnfQbJhAeU="; + hash = "sha256-SNqxfoYABKV4MheyP5G9nkRca/1+ozOPEvZAUtGdxh0="; }; vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix index 93f03ec7a786..6ea244670ba6 100644 --- a/pkgs/by-name/li/littlefs-fuse/package.nix +++ b/pkgs/by-name/li/littlefs-fuse/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "littlefs-fuse"; - version = "2.7.11"; + version = "2.7.12"; src = fetchFromGitHub { owner = "littlefs-project"; repo = "littlefs-fuse"; rev = "v${version}"; - hash = "sha256-RZpGLFVNo3WEXVU7V2tFjRs8iYN1Ge6AN4Bcq3d6mtc="; + hash = "sha256-BgvdwEEzJ5QtdXTXHLmLPSoyTs6Svd7ESJULxPbjgJk="; }; buildInputs = [ fuse ]; installPhase = '' diff --git a/pkgs/by-name/li/littlegptracker/package.nix b/pkgs/by-name/li/littlegptracker/package.nix new file mode 100644 index 000000000000..12e6940ccc87 --- /dev/null +++ b/pkgs/by-name/li/littlegptracker/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + fetchFromGitHub, + SDL2, + python3, + jack2, + alsa-lib, + pkg-config, +}: +let + python = python3.withPackages (ps: with ps; [ pillow ]); + platform = if stdenv.hostPlatform.isDarwin then "OSX" else "X64"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "littlegptracker"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "djdiskmachine"; + repo = "littlegptracker"; + tag = finalAttrs.version; + hash = "sha256-1uXC5nJ63YguQuNIkuK0yx9lmrMBqw0WdlmCV8o11cE="; + }; + + nativeBuildInputs = [ + pkg-config + python + ]; + buildInputs = + [ SDL2 ] + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib + ++ lib.optional stdenv.hostPlatform.isLinux jack2; + + preBuild = '' + cd projects + ''; + + makeFlags = [ + "CXX=${stdenv.cc.targetPrefix}c++" + "PLATFORM=${platform}" + ]; + + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework Foundation"; + + installPhase = + let + extension = if stdenv.hostPlatform.isDarwin then "app" else "x64"; + in + '' + runHook preInstall + install -Dm555 lgpt.${extension} $out/lib/lgpt/lgpt + install -Dm444 resources/${platform}/{config,mapping}.xml $out/lib/lgpt/ + mkdir -p $out/bin + ln -s $out/lib/lgpt/lgpt $out/bin/ + runHook postInstall + ''; + + meta = { + description = "Music tracker optimised to run on portable game consoles"; + longDescription = '' + Little Piggy Tracker (f.k.a 'LittleGPTracker') is a music tracker optimised to run on portable game consoles. + It is currently running on Windows, MacOS (intel/arm) & Linux, PSP, Miyoo Mini, and a collection of other retro gaming handhelds. + It implements the user interface of littlesounddj and precedes M8 tracker, two popular trackers greatly loved in the tracker community. + ''; + homepage = "https://github.com/djdiskmachine/LittleGPTracker"; + downloadPage = "https://github.com/djdiskmachine/LittleGPTracker/releases"; + mainProgram = "lgpt"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; + + # https://github.com/NixOS/nixpkgs/pull/352617#issuecomment-2495663097 + broken = stdenv.hostPlatform.isDarwin; + }; +}) diff --git a/pkgs/by-name/li/littlenavmap/atools.nix b/pkgs/by-name/li/littlenavmap/atools.nix new file mode 100644 index 000000000000..3072f02f4e55 --- /dev/null +++ b/pkgs/by-name/li/littlenavmap/atools.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libsForQt5, +}: + +stdenv.mkDerivation rec { + pname = "atools"; + version = "4.0.17"; + + src = fetchFromGitHub { + owner = "albar965"; + repo = "atools"; + tag = "v${version}"; + hash = "sha256-R5CbMdT8UsPiiIXFhmdAmNa1fKLPfUrWunlbwsHOVow="; + }; + + nativeBuildInputs = [ + libsForQt5.qmake + ]; + + buildInputs = [ + libsForQt5.qtsvg + ]; + + env.ATOOLS_NO_CRASHHANDLER = "true"; + + installTargets = "deploy"; + + postInstall = '' + rmdir $out + mv D/atools $out + ''; + + dontWrapQtApps = true; + + meta = { + description = "A static library extending Qt for exception handling, a log4j like logging framework, Flight Simulator related utilities like BGL reader and more"; + homepage = "https://github.com/albar965/atools"; + changelog = "https://github.com/albar965/atools/blob/${src.rev}/CHANGELOG.txt"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ck3d ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/li/littlenavmap/deploy.patch b/pkgs/by-name/li/littlenavmap/deploy.patch new file mode 100644 index 000000000000..d35674f7c2e1 --- /dev/null +++ b/pkgs/by-name/li/littlenavmap/deploy.patch @@ -0,0 +1,108 @@ +diff --git a/littlenavmap.pro b/littlenavmap.pro +index 7c8ed0c6..31590e2c 100644 +--- a/littlenavmap.pro ++++ b/littlenavmap.pro +@@ -777,18 +777,6 @@ OTHER_FILES += \ + # Linux - Copy help and Marble plugins and data + unix:!macx { + copydata.commands = mkdir -p $$OUT_PWD/plugins && +- copydata.commands += cp -avfu \ +- $$MARBLE_LIB_PATH/marble/plugins/libCachePlugin.so \ +- $$MARBLE_LIB_PATH/marble/plugins/libAtmospherePlugin.so \ +- $$MARBLE_LIB_PATH/marble/plugins/libCompassFloatItem.so \ +- $$MARBLE_LIB_PATH/marble/plugins/libGraticulePlugin.so \ +- $$MARBLE_LIB_PATH/marble/plugins/libKmlPlugin.so \ +- $$MARBLE_LIB_PATH/marble/plugins/libLatLonPlugin.so \ +- $$MARBLE_LIB_PATH/marble/plugins/libPn2Plugin.so \ +- $$MARBLE_LIB_PATH/marble/plugins/libMapScaleFloatItem.so \ +- $$MARBLE_LIB_PATH/marble/plugins/libNavigationFloatItem.so \ +- $$MARBLE_LIB_PATH/marble/plugins/libOverviewMap.so \ +- $$OUT_PWD/plugins && + copydata.commands += mkdir -p $$OUT_PWD/translations && + copydata.commands += cp -avfu $$PWD/*.qm $$OUT_PWD/translations && + copydata.commands += cp -avfu $$ATOOLS_INC_PATH/../*.qm $$OUT_PWD/translations && +@@ -796,8 +784,7 @@ unix:!macx { + copydata.commands += cp -avfu $$PWD/web $$OUT_PWD && + copydata.commands += cp -avfu $$PWD/customize $$OUT_PWD && + copydata.commands += cp -avfu $$PWD/marble/data $$OUT_PWD && +- copydata.commands += cp -vf $$PWD/desktop/littlenavmap*.sh $$OUT_PWD && +- copydata.commands += chmod -v a+x $$OUT_PWD/littlenavmap*.sh ++ copydata.commands += true + } + + # Mac OS X - Copy help and Marble plugins and data +@@ -820,73 +807,20 @@ unix:!macx { + + deploy.commands += rm -Rfv $$DEPLOY_DIR && + deploy.commands += mkdir -pv $$DEPLOY_DIR/translations && +- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB && +- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/iconengines && +- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/imageformats && +- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/platforms && +- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/platformthemes && +- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/printsupport && +- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/sqldrivers && + deploy.commands += echo $$VERSION_NUMBER > $$DEPLOY_DIR/version.txt && +- deploy.commands += echo $$GIT_REVISION_FULL > $$DEPLOY_DIR/revision.txt && +- deploy.commands += cp -Rvf $$MARBLE_LIB_PATH/*.so* $$DEPLOY_DIR_LIB && +- deploy.commands += patchelf --set-rpath \'\$\$ORIGIN/.\' $$DEPLOY_DIR_LIB/libmarblewidget-qt5.so* && +- deploy.commands += patchelf --set-rpath \'\$\$ORIGIN/.\' $$DEPLOY_DIR_LIB/libastro.so* && +- deploy.commands += cp -Rvf $$OUT_PWD/plugins $$DEPLOY_DIR && + deploy.commands += cp -Rvf $$OUT_PWD/data $$DEPLOY_DIR && + deploy.commands += cp -Rvf $$OUT_PWD/help $$DEPLOY_DIR && + deploy.commands += cp -Rvf $$OUT_PWD/web $$DEPLOY_DIR && + deploy.commands += cp -Rvf $$OUT_PWD/customize $$DEPLOY_DIR && + deploy.commands += cp -Rvf $$OUT_PWD/littlenavmap $$DEPLOY_DIR && +- deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qt_??.qm $$DEPLOY_DIR/translations && +- deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qt_??_??.qm $$DEPLOY_DIR/translations && +- deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qtbase*.qm $$DEPLOY_DIR/translations && + deploy.commands += cp -Rvf $$OUT_PWD/translations $$DEPLOY_DIR && + exists($$DATABASE_BASE) : deploy.commands += cp -Rvf $$DATABASE_BASE $$DEPLOY_DIR && + exists($$HELP_BASE) : deploy.commands += cp -Rvf $$HELP_BASE/* $$DEPLOY_DIR/help && +- deploy.commands += cp -vf $$PWD/desktop/\"Little Navmap Portable Linux.sh\" $$DEPLOY_DIR/\"Little Navmap Portable.sh\" && +- deploy.commands += cp -vf $$PWD/desktop/linux-qt.conf $$DEPLOY_DIR/qt.conf && + deploy.commands += cp -vf $$PWD/CHANGELOG.txt $$DEPLOY_DIR && + deploy.commands += cp -vf $$PWD/README.txt $$DEPLOY_DIR && + deploy.commands += cp -vf $$PWD/LICENSE.txt $$DEPLOY_DIR && + deploy.commands += cp -vf $$PWD/resources/icons/littlenavmap.svg $$DEPLOY_DIR && +- deploy.commands += cp -vf \"$$PWD/desktop/Little Navmap.desktop\" $$DEPLOY_DIR && +- exists(/usr/lib/x86_64-linux-gnu/libssl.so.1.1) : deploy.commands += cp -vfaL /usr/lib/x86_64-linux-gnu/libssl.so.1.1 $$DEPLOY_DIR_LIB && +- exists(/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1) : deploy.commands += cp -vfaL /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/iconengines/libqsvgicon.so* $$DEPLOY_DIR_LIB/iconengines && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqgif.so* $$DEPLOY_DIR_LIB/imageformats && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqjpeg.so* $$DEPLOY_DIR_LIB/imageformats && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqsvg.so* $$DEPLOY_DIR_LIB/imageformats && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqwbmp.so* $$DEPLOY_DIR_LIB/imageformats && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqwebp.so* $$DEPLOY_DIR_LIB/imageformats && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqeglfs.so* $$DEPLOY_DIR_LIB/platforms && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqlinuxfb.so* $$DEPLOY_DIR_LIB/platforms && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqminimal.so* $$DEPLOY_DIR_LIB/platforms && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqminimalegl.so* $$DEPLOY_DIR_LIB/platforms && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqoffscreen.so* $$DEPLOY_DIR_LIB/platforms && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqxcb.so* $$DEPLOY_DIR_LIB/platforms && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platformthemes/libqgtk*.so* $$DEPLOY_DIR_LIB/platformthemes && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/printsupport/libcupsprintersupport.so* $$DEPLOY_DIR_LIB/printsupport && +- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/sqldrivers/libqsqlite.so* $$DEPLOY_DIR_LIB/sqldrivers && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicudata.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicui18n.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicuuc.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Concurrent.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Core.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5DBus.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Gui.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Network.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5PrintSupport.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Qml.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Quick.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Sql.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Svg.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Widgets.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5X11Extras.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5XcbQpa.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5QmlModels.so* $$DEPLOY_DIR_LIB && +- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Xml.so* $$DEPLOY_DIR_LIB && +- deploy.commands += rm -fv $$DEPLOY_DIR_LIB/lib*.so.*.debug $$DEPLOY_DIR_LIB/*/lib*.so.*.debug ++ deploy.commands += true + } + + # Mac specific deploy target diff --git a/pkgs/by-name/li/littlenavmap/package.nix b/pkgs/by-name/li/littlenavmap/package.nix new file mode 100644 index 000000000000..8ebe6e9dce63 --- /dev/null +++ b/pkgs/by-name/li/littlenavmap/package.nix @@ -0,0 +1,131 @@ +{ + lib, + stdenv, + callPackage, + fetchFromGitHub, + libsForQt5, + makeDesktopItem, +}: +let + atools = callPackage ./atools.nix { }; + marble = libsForQt5.marble.overrideAttrs (self: { + version = "0.25.5"; + + src = fetchFromGitHub { + owner = "albar965"; + repo = "marble"; + rev = "722acf7f8d79023f6c6a761063645a1470bb3935"; # branch lnm/1.1 + hash = "sha256-5GSa+xIQS9EgJXxMFUOA5jTtHJ6Dl4C9yAkFPIOrgo8="; + }; + + # https://github.com/albar965/littlenavmap/wiki/Compiling#compile-marble + cmakeFlags = + let + disable = n: lib.cmakeBool n false; + enable = n: lib.cmakeBool n true; + in + map enable [ + "STATIC_BUILD" + "MARBLE_EMPTY_MAPTHEME" + "QTONLY" + ] + ++ map disable [ + "BUILD_MARBLE_EXAMPLES" + "BUILD_INHIBIT_SCREENSAVER_PLUGIN" + "BUILD_MARBLE_APPS" + "BUILD_MARBLE_EXAMPLES" + "BUILD_MARBLE_TESTS" + "BUILD_MARBLE_TOOLS" + "BUILD_TESTING" + "BUILD_WITH_DBUS" + "MOBILE" + "WITH_DESIGNER_PLUGIN" + "WITH_Phonon" + "WITH_Qt5Location" + "WITH_Qt5Positioning" + "WITH_Qt5SerialPort" + "WITH_ZLIB" + "WITH_libgps" + "WITH_libshp" + "WITH_libwlocate" + ]; + }); + + pname = "littlenavmap"; + + desktopItem = makeDesktopItem { + name = "Little Navmap"; + desktopName = "Little Navmap"; + icon = pname; + terminal = false; + exec = pname; + categories = [ + "Qt" + "Utility" + "Geography" + "Maps" + ]; + }; +in +stdenv.mkDerivation (finalAttrs: rec { + inherit pname; + version = "3.0.17"; + + src = fetchFromGitHub { + owner = "albar965"; + repo = "littlenavmap"; + tag = "v${version}"; + hash = "sha256-/1YB2uEQzT0K6IylpWDqOaMSENDR9GuyJNty+2C8kXM="; + }; + + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; + + # https://github.com/albar965/littlenavmap/wiki/Compiling#default-paths-and-environment-variables-2 + env = { + ATOOLS_INC_PATH = "${atools}/include"; + ATOOLS_LIB_PATH = "${atools}/lib"; + MARBLE_INC_PATH = "${marble.dev}/include"; + MARBLE_LIB_PATH = "${marble}/lib"; + inherit (atools) ATOOLS_NO_CRASHHANDLER; + }; + + patches = [ ./deploy.patch ]; + + configurePhase = '' + runHook preConfigure + + # we have to build out of source tree + cd build + qmake "''${flagsArray[@]}" .. + + runHook postConfigure + ''; + + postInstall = '' + mkdir -p $out/bin $out/lib $out/share/icons/scaleable/apps + mv "../../deploy/Little Navmap" $out/lib/littlenavmap + ln -s $out/lib/littlenavmap/littlenavmap $out/bin + cp -ra ${desktopItem}/* $out + mv $out/lib/littlenavmap/littlenavmap.svg $out/share/icons/scaleable/apps + ''; + + enableParallelBuilding = true; + enableParallelInstalling = true; + + installTargets = "deploy"; + + passthru.local-packages = { inherit atools marble; }; + + meta = { + description = "A free flight planner, navigation tool, moving map, airport search and airport information system for Flight Simulator X, Microsoft Flight Simulator 2020, Prepar3D and X-Plane"; + homepage = "https://github.com/albar965/littlenavmap"; + changelog = "https://github.com/albar965/littlenavmap/blob/${src.rev}/CHANGELOG.txt"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ck3d ]; + mainProgram = "littlenavmap"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix index 66ede7d221c3..0257a426b04f 100644 --- a/pkgs/by-name/li/live-server/package.nix +++ b/pkgs/by-name/li/live-server/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, openssl, pkg-config, }: @@ -24,15 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; meta = with lib; { description = "Local network server with live reload feature for static pages"; diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 617b3e3b711a..84ccfaa25b97 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -1,12 +1,17 @@ { - lib, + buildPackages, cctools, fetchpatch, fetchurl, + lib, + live555, openssl, + runCommand, stdenv, - vlc, }: +let + isStatic = stdenv.hostPlatform.isStatic; +in stdenv.mkDerivation (finalAttrs: { pname = "live555"; @@ -42,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=${placeholder "out"}" "C_COMPILER=$(CC)" "CPLUSPLUS_COMPILER=$(CXX)" - "LIBRARY_LINK=$(AR) cr " "LINK=$(CXX) -o " + "LIBRARY_LINK=${if isStatic then "$(AR) cr " else "$(CC) -o "}" ]; # Since NIX_CFLAGS_COMPILE affects both C and C++ toolchains, we set CXXFLAGS @@ -83,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { let platform = if stdenv.hostPlatform.isLinux then - "linux" + if isStatic then "linux" else "linux-with-shared-libraries" else if stdenv.hostPlatform.isDarwin then "macosx-catalina" else @@ -97,10 +102,33 @@ stdenv.mkDerivation (finalAttrs: { runHook postConfigure ''; - passthru.tests = { - # Downstream dependency - inherit vlc; - }; + doInstallCheck = true; + installCheckPhase = '' + if ! ($out/bin/openRTSP || :) 2>&1 | grep -q "Usage: "; then + echo "Executing example program failed" >&2 + exit 1 + else + echo "Example program executed successfully" + fi + ''; + + passthru.tests = + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + { + # The installCheck phase above cannot be ran in cross-compilation scenarios, + # therefore the passthru test + run-test-prog = runCommand "live555-run-test-prog" { } '' + if ! (${emulator} ${live555}/bin/openRTSP || :) 2>&1 | grep -q "Usage: "; then + echo "Executing example program failed" >&2 + exit 1 + else + echo "Example program executed successfully" + touch $out + fi + ''; + }; meta = { homepage = "http://www.live555.com/liveMedia/"; diff --git a/pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix b/pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix index 5008a586ce76..0b81afcdbd28 100644 --- a/pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix +++ b/pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix @@ -24,14 +24,14 @@ let in buildPythonPackage { pname = "gclient2nix"; - version = "0.2.0-unstable-2024-12-19"; + version = "0.2.0-unstable-2025-04-04"; pyproject = true; src = fetchFromGitHub { owner = "WeetHet"; repo = "gclient2nix"; - rev = "bdf5ab79818595be9dcfc655bd6784cf4bcdb863"; - hash = "sha256-KOXG8E2g30XyZGmM4ZnYPBSybBhHIjOZL8ZXRKYrkZQ="; + rev = "ec5fff1082cd4fff352e4c57baf9b1a7dbbcc94b"; + hash = "sha256-BK8GUpuqFOeK5d5wKVFYCfR5f6jCrke/2xxoVlmKpRI="; }; build-system = [ diff --git a/pkgs/by-name/li/livekit-libwebrtc/package.nix b/pkgs/by-name/li/livekit-libwebrtc/package.nix index 6e26db659732..3c392e3b6036 100644 --- a/pkgs/by-name/li/livekit-libwebrtc/package.nix +++ b/pkgs/by-name/li/livekit-libwebrtc/package.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation { pname = "livekit-libwebrtc"; - version = "m114"; + version = "125-unstable-2025-03-24"; src = "${sources}/src"; @@ -95,20 +95,37 @@ stdenv.mkDerivation { url = "https://raw.githubusercontent.com/livekit/rust-sdks/b41861c7b71762d5d85b3de07ae67ffcae7c3fa2/webrtc-sys/libwebrtc/patches/add_deps.patch"; hash = "sha256-EMNYcTcBYh51Tt96+HP43ND11qGKClfx3xIPQmIBSo0="; }) - # Fixes concurrency and localization issues + # Fixes "error: no matching member function for call to 'emplace'" (fetchpatch { - url = "https://github.com/zed-industries/webrtc/commit/08f7a701a2eda6407670508fc2154257a3c90308.patch"; - hash = "sha256-oWYZLwqjRSHDt92MqsxsoBSMyZKj1ubNbOXZRbPpbEw="; + url = "https://raw.githubusercontent.com/zed-industries/livekit-rust-sdks/refs/heads/main/webrtc-sys/libwebrtc/patches/abseil_use_optional.patch"; + hash = "sha256-FOwlwOqgv5IEBCMogPACbXXxdNhGzpYcVfsolcwA7qU="; + + extraPrefix = "third_party/"; + stripLen = 1; }) # Required for dynamically linking to ffmpeg libraries and exposing symbols ./0001-shared-libraries.patch ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./0002-disable-narrowing-const-reference.patch + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # GCC does not support C11 _Generic in C++ mode. Fixes boringssl build with GCC + (fetchpatch { + name = "fix-gcc-c11-generic-boringssl"; + + url = "https://github.com/google/boringssl/commit/c70190368c7040c37c1d655f0690bcde2b109a0d.patch"; + hash = "sha256-xkmYulDOw5Ny5LOCl7rsheZSFbSF6md2NkZ3+azjFQk="; + stripLen = 1; + extraPrefix = "third_party/boringssl/src/"; + }) ]; postPatch = '' + substituteInPlace .gn \ + --replace-fail "vpython3" "python3" + substituteInPlace tools/generate_shim_headers/generate_shim_headers.py \ --replace-fail "OFFICIAL_BUILD" "GOOGLE_CHROME_BUILD" @@ -235,7 +252,7 @@ stdenv.mkDerivation { "api/task_queue:default_task_queue_factory" "sdk:native_api" "sdk:default_codec_factory_objc" - "pc:peerconnection" + "pc:peer_connection" "sdk:videocapture_objc" "sdk:mac_framework_objc" ]; diff --git a/pkgs/by-name/li/livekit-libwebrtc/sources.nix b/pkgs/by-name/li/livekit-libwebrtc/sources.nix index 1a099d235ebf..014bba2f449c 100644 --- a/pkgs/by-name/li/livekit-libwebrtc/sources.nix +++ b/pkgs/by-name/li/livekit-libwebrtc/sources.nix @@ -1,6 +1,8 @@ { fetchFromGitHub, fetchFromGitiles, + fetchgit, + fetchurl, runCommand, lib, }: @@ -9,68 +11,69 @@ let "src" = fetchFromGitHub { owner = "webrtc-sdk"; repo = "webrtc"; - rev = "dac8015ce039c8658706b222746808f01968256b"; - hash = "sha256-T5syfRzX/LfvEllVurzZPKffkciTd2inUEC2py78ZPA="; + rev = "7ec4c03bff7f7ce117dc9100f081d031d946d995"; # m125_release + hash = "sha256-LUncFGXaYVUrBdWD1Xx3MZe5GzmjJuJtDebAMb8jass="; }; "src/base" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/src/base"; - rev = "fe22033c21d399a340b3f4604722463d9da25c6e"; - hash = "sha256-iqtcXEtmCNioKRxfTCwiU/NG0xlQ1R/6GE1M6qC0XTU="; + rev = "738cf0c976fd3d07c5f1853f050594c5295300d8"; + hash = "sha256-Hw0cXws+0M2UcvcnJZGkUtH28ZEDfxNl0e8ngWlAZnA="; }; - "src/build" = fetchFromGitiles { - url = "https://chromium.googlesource.com/chromium/src/build"; - rev = "a9d28a095c8b349f8319ee0d241a78e2c849928f"; - hash = "sha256-5NguoLWm6v68fpyHK6SYbM6vHdaOT0quks5/SPW0XOI="; + "src/build" = fetchFromGitHub { + owner = "webrtc-sdk"; + repo = "build"; + rev = "6978bac6466311e4bee4c7a9fd395faa939e0fcd"; + hash = "sha256-mPjb7/TTJ7/oatBdIRGhSsacjbyu5ZilUgyplAtji1s="; }; "src/buildtools" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/src/buildtools"; - rev = "539a6f68735c631f57ae33096e9e7fc059e049cf"; - hash = "sha256-1u4BQqXcW4Z9LPx7lMjBLK8ouKkyb576FRvB2LGwf7Q="; + rev = "5eb927f0a922dfacf10cfa84ee76f39dcf2a7311"; + hash = "sha256-OS9k7sDzAVH+NU9P4ilKJavkiov/1qq1fG5AWq9kH/Y="; }; "src/testing" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/src/testing"; - rev = "ee4801b4e9c2d945fff5236d8518511e6c00a29e"; - hash = "sha256-xUfPwWVPoLxlCWHFKLWtRC1kVJgLgcvSoXPYmrseCXE="; + rev = "d6e731571c33f30e5dc46f54c69e6d432566e55c"; + hash = "sha256-VisK7NDR/xDC3OM7LD9Gyo58rs1GE37i7QRYC/Kk12k="; }; "src/third_party" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/src/third_party"; - rev = "4f8bf4c6885ab577c7577c4cdd11d04eaf78e9ca"; - hash = "sha256-4ehEerUw9IvghdPPrrh+WCm/XEpVe5PjjIRbQZpIsbY="; + rev = "f36c4b6e56aaa94606c87fa0c3f7cbdbb5c70546"; + hash = "sha256-TdB8qMcmXO3xgYyJkHHwn/8tVg1pFMlrNABpQQ80bOY="; }; - "src/buildtools/clang_format/script" = fetchFromGitiles { + "src/third_party/clang-format/script" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format"; - rev = "f97059df7f8b205064625cdb5f97b56668a125ef"; - hash = "sha256-IL6ReGM6+urkXfGYe1BBOv+0XgCZv5i3Lib1q9COhig="; + rev = "3c0acd2d4e73dd911309d9e970ba09d58bf23a62"; + hash = "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo="; }; - "src/buildtools/third_party/libc++/trunk" = fetchFromGitiles { + "src/third_party/libc++/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx"; - rev = "bff81b702ff4b7f74b1c0ed02a4bcf6c2744a90b"; - hash = "sha256-i/FGU9F7HlGJJuwoFMV4V05pf4pvsqNxrPBN223YjZQ="; + rev = "e3b94d0e5b86883fd77696bf10dc33ba250ba99b"; + hash = "sha256-ocJqlENHw19VpkFxKwHneGw3aNh56nt+/JeopxLj2M8="; }; - "src/buildtools/third_party/libc++abi/trunk" = fetchFromGitiles { + "src/third_party/libc++abi/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi"; - rev = "307bd163607c315d46103ebe1d68aab44bf93986"; - hash = "sha256-Zka8AHFtHA4AC/Pbzc3pVqz/k2GYZYc8CeP1IXxGBUM="; + rev = "932d253fedb390a08b17ec3a92469a4553934a6a"; + hash = "sha256-qBupfCAnSNpvqcwFycQEi5v6TBAH5LdQI5YcLeQD2y8="; }; - "src/buildtools/third_party/libunwind/trunk" = fetchFromGitiles { + "src/third_party/libunwind/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind"; - rev = "2795322d57001de8125cfdf18cef804acff69e35"; - hash = "sha256-u6FMD83JBBusQuWU7Hx5HREvLIFWUA4iN4If8poaHbE="; + rev = "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad"; + hash = "sha256-/4/Trextb4F9UMDVrg4uG9QZl6S0H9FiwnL+2S5+ZpE="; }; "src/third_party/boringssl/src" = fetchFromGitiles { url = "https://boringssl.googlesource.com/boringssl"; - rev = "6776d5cd8fcdf6c5e05bae2d655076dbeaa56103"; - hash = "sha256-KvQhpkn1pGQ/xPbkHcGgTTvL3GGRL1TfdSPYgfNn5bU="; + rev = "f94f3ed3965ea033001fb9ae006084eee408b861"; + hash = "sha256-baa6L6h1zVBHen/YFVtF+9fhYWC4ZGbMUSO8L1VNFjw="; }; "src/third_party/breakpad/breakpad" = fetchFromGitiles { url = "https://chromium.googlesource.com/breakpad/breakpad"; - rev = "9bf8d1ec526cec139b2d3fba148ce81ccf2cceab"; - hash = "sha256-c3/ksp01+cmSyzaD5SF0Lnnw+t78RwZAKCJnwg1NGXU="; + rev = "76788faa4ef163081f82273bfca7fae8a734b971"; + hash = "sha256-qAIXZ1jZous0Un0jVkOQ66nA2525NziV3Lbso2/+Z1Y="; }; "src/third_party/catapult" = fetchFromGitiles { url = "https://chromium.googlesource.com/catapult"; - rev = "cae7ec667dee9f5c012b54ee9ffee94eb7beda14"; - hash = "sha256-vK7rlGshfzPzaEdAxlP5vQ4USR/fC3BzPCh/rn0aAf4="; + rev = "88367fd8c736a2601fc183920c9ffe9ac2ec32ac"; + hash = "sha256-uqtyxO7Ge3egBsYmwcRGiV1lqm4iYVHrqYfDz7r6Byo="; }; "src/third_party/ced/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/google/compact_enc_det"; @@ -89,18 +92,18 @@ let }; "src/third_party/depot_tools" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/tools/depot_tools"; - rev = "6e714e6dfe62110c95fafed4bdeb365a69c6a77e"; - hash = "sha256-7jPow77ejToE55KvQ7/eO0alMdMHcypfSyPceFAbZkw="; + rev = "495b23b39aaba2ca3b55dd27cadc523f1cb17ee6"; + hash = "sha256-RguGUaIpxtxrY+LksFmeNbZuitZpB6O9HJc1c4TMXeQ="; }; "src/third_party/ffmpeg" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/third_party/ffmpeg"; - rev = "8d21d41d8bec5c0b266ee305d1a708dc5c23b594"; - hash = "sha256-UjrZJBtOQiiqxtLb8x24axord3OFvyCcRcgDwiYE/jw="; + rev = "901248a373cbbe7af68fb92faf3be7d4f679150d"; + hash = "sha256-6+Sc5DsPaKW68PSUS4jlpzRXjPhEN7LFQATVVL9Xhfo="; }; "src/third_party/flatbuffers/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/google/flatbuffers"; - rev = "a56f9ec50e908362e20254fcef28e62a2f148d91"; - hash = "sha256-OQ8E+i30WRz/lPJmVDiF7+TPo4gZVu2Of9loxz3tswI="; + rev = "bcb9ef187628fe07514e57756d05e6a6296f7dc5"; + hash = "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM="; }; "src/third_party/grpc/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/grpc/grpc"; @@ -109,38 +112,38 @@ let }; "src/third_party/fontconfig/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/fontconfig"; - rev = "06929a556fdc39c8fe12965b69070c8df520a33e"; - hash = "sha256-0R+FEhtGXFiQWHEPRrJqaBW1JVfCojYI4NPDvYMBhoU="; + rev = "14d466b30a8ab4a9d789977ed94f2c30e7209267"; + hash = "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00="; }; "src/third_party/freetype/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/src/third_party/freetype2"; - rev = "9806414c15230d253d5219ea0dafeddb717307b1"; - hash = "sha256-UbWtRb24U7Cv+PecVtoNG33Q1ItmkvssmW8Bh8qlFvA="; + rev = "b3a6a20a805366e0bc7044d1402d04c53f9c1660"; + hash = "sha256-XBHWUw28bsCpwUXb+faE36DRdujuKiWoJ+dEmUk07s4="; }; "src/third_party/harfbuzz-ng/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz"; - rev = "2822b589bc837fae6f66233e2cf2eef0f6ce8470"; - hash = "sha256-qwtRORl/Pu4M9EvW8MdK8onFMCw/4+57FEBjoNt4qoY="; + rev = "155015f4bec434ecc2f94621665844218f05ce51"; + hash = "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls="; }; "src/third_party/google_benchmark/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/google/benchmark"; - rev = "b177433f3ee2513b1075140c723d73ab8901790f"; - hash = "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc="; + rev = "344117638c8ff7e239044fd0fa7085839fc03021"; + hash = "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME="; }; "src/third_party/gtest-parallel" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/google/gtest-parallel"; - rev = "f4d65b555894b301699c7c3c52906f72ea052e83"; - hash = "sha256-dzWXJHPb8RHqxoi/gA9npwnjAsT8gg7A90g/dx8LVwQ="; + rev = "96f4f904922f9bf66689e749c40f314845baaac8"; + hash = "sha256-VUuk5tBTh+aU2dxVWUF1FePWlKUJaWSiGSXk/J5zgHw="; }; "src/third_party/googletest/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/google/googletest"; - rev = "af29db7ec28d6df1c7f0f745186884091e602e07"; - hash = "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg="; + rev = "5197b1a8e6a1ef9f214f4aa537b0be17cbf91946"; + hash = "sha256-JCIJrjN/hH6oAgvJRuv3aJA+z6Qe7yefyRbAhP5bZDc="; }; "src/third_party/icu" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/deps/icu"; - rev = "d8daa943f64cd5dd2a55e9baf2e655ab4bfa5ae9"; - hash = "sha256-47Xxb5IFbRmdO3oADjn13fm7aIYFXh2R4YVZIJAy22U="; + rev = "364118a1d9da24bb5b770ac3d762ac144d6da5a4"; + hash = "sha256-frsmwYMiFixEULsE91x5+p98DvkyC0s0fNupqjoRnvg="; }; "src/third_party/jsoncpp/source" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp"; @@ -148,64 +151,84 @@ let hash = "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q="; }; "src/third_party/libFuzzer/src" = fetchFromGitiles { - url = "https://chromium.googlesource.com/chromium/llvm-project/compiler-rt/lib/fuzzer"; - rev = "debe7d2d1982e540fbd6bd78604bf001753f9e74"; - hash = "sha256-HG3KHhKQnr4hdnUK/2QhcxRdNxh38fhU54JKKzqZaio="; + url = "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer"; + rev = "758bd21f103a501b362b1ca46fa8fcb692eaa303"; + hash = "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E="; + }; + "src/third_party/fuzztest/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/google/fuzztest"; + rev = "65354bf09a2479945b4683c42948695d4f2f7c07"; + hash = "sha256-8w4yIW15VamdjevMO27NYuf+GFu5AvHSooDZH0PbS6s="; }; "src/third_party/libjpeg_turbo" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo"; - rev = "aa4075f116e4312537d0d3e9dbd5e31096539f94"; - hash = "sha256-QnXMR9qqRiYfV1sUJvKVvLQ9A022lYKbsrI9HOU9LCs="; + rev = "9b894306ec3b28cea46e84c32b56773a98c483da"; + hash = "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg="; }; "src/third_party/libsrtp" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/deps/libsrtp"; - rev = "5b7c744eb8310250ccc534f3f86a2015b3887a0a"; - hash = "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc="; + rev = "7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a"; + hash = "sha256-XOPiDAOHpWyCiXI+fi1CAie0Zaj4v14m9Kc8+jbzpUY="; }; "src/third_party/dav1d/libdav1d" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/videolan/dav1d"; - rev = "d426d1c91075b9c552b12dd052af1cd0368f05a2"; - hash = "sha256-FivzwqCvlY89q2znGvfNks+hje/iUFHcKPb19FyAZhM="; + rev = "006ca01d387ac6652825d6cce1a57b2de67dbf8d"; + hash = "sha256-AA2bcrsW1xFspyl5TqYUJeAwKM06rWTNtXr/uMVIJmw="; }; "src/third_party/libaom/source/libaom" = fetchFromGitiles { url = "https://aomedia.googlesource.com/aom"; - rev = "5a0903824082f41123e8365b5b99ddb6ced8971c"; - hash = "sha256-j8b0xM7hHNqYIeUQjf+c7LyzcfZVJx64Xqo9gIRtsYU="; + rev = "eefd5585a0c4c204fcf7d30065f8c2ca35c38a82"; + hash = "sha256-0tLfbfYyCnG89DHNIoYoiitN9pFFcuX/Nymp3Q5xhBg="; }; "src/third_party/perfetto" = fetchFromGitiles { url = "https://android.googlesource.com/platform/external/perfetto"; - rev = "20b114cd063623e63ef1b0a31167d60081567e51"; - hash = "sha256-6BpUd+BplRR/0eUIYz5SehzrpNHPfUm2Qv6U1+Mxy8g="; + rev = "0e424063dbfd4e7400aa3b77b5c00b84893aee7b"; + hash = "sha256-fS0P/0Bqn9EreCPRC65Lw7/zcpMquo7RDf6dmbMDa74="; + }; + "src/third_party/protobuf-javascript/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"; + rev = "e34549db516f8712f678fcd4bc411613b5cc5295"; + hash = "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U="; }; "src/third_party/libvpx/source/libvpx" = fetchFromGitiles { url = "https://chromium.googlesource.com/webm/libvpx"; - rev = "7aaffe2df4c9426ab204a272ca5ca52286ca86d4"; - hash = "sha256-Uis24FzUtM38ktPG/wDJLiHZYmpmYFGbuQ/SWnmZJSA="; + rev = "8762f5efb2917765316a198e6713f0bc93b07c9b"; + hash = "sha256-JbeUgX8Dx8GkQ79ElZHK8gYI3/4o6NrTV+HpblwLvIE="; }; "src/third_party/libyuv" = fetchFromGitiles { url = "https://chromium.googlesource.com/libyuv/libyuv"; - rev = "77c2121f7e6b8e694d6e908bbbe9be24214097da"; - hash = "sha256-LLmTW05GxoXgNkLRHp3e6gb7glMgJo1moc6lPLVHk6w="; + rev = "a6a2ec654b1be1166b376476a7555c89eca0c275"; + hash = "sha256-hD5B9fPNwf8M98iS/PYeUJgJxtBvvf2BrrlnBNYXSg0="; }; "src/third_party/lss" = fetchFromGitiles { url = "https://chromium.googlesource.com/linux-syscall-support"; rev = "ce877209e11aa69dcfffbd53ef90ea1d07136521"; hash = "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw="; }; + "src/third_party/instrumented_libs" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries"; + rev = "0172d67d98df2d30bd2241959d0e9569ada25abe"; + hash = "sha256-SGEB74fK9e0WWT77ZNISE9fVlXGGPvZMBUsQ3XD+DsA="; + }; "src/third_party/nasm" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/deps/nasm"; - rev = "7fc833e889d1afda72c06220e5bed8fb43b2e5ce"; - hash = "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs="; + rev = "f477acb1049f5e043904b87b825c5915084a9a29"; + hash = "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY="; }; "src/third_party/openh264/src" = fetchFromGitiles { url = "https://chromium.googlesource.com/external/github.com/cisco/openh264"; rev = "09a4f3ec842a8932341b195c5b01e141c8a16eb7"; hash = "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c="; }; + "src/third_party/re2/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/google/re2"; + rev = "b84e3ff189980a33d4a0c6fa1201aa0b3b8bab4a"; + hash = "sha256-FA9wAZwqLx7oCPf+qeqZ7hhpJ9J2DSMXZAWllHIX/qY="; + }; "src/tools" = fetchFromGitiles { url = "https://chromium.googlesource.com/chromium/src/tools"; - rev = "bafae7909cbbcd277d29c0da0809001a8d6f4a14"; - hash = "sha256-MK5M9RrX+cX4S7vsMgNVQ2YkNbEuvizKueuc1mA5jyU="; + rev = "0d6482e40fe26f738a0acf6ebb0f797358538b48"; + hash = "sha256-19oGSveaPv8X+/hsevUe4fFtLASC3HfPtbnw3TWpYQk="; }; }; namedSourceDerivations = builtins.mapAttrs ( diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index 4f023ced0b09..35abab93682f 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + nixosTests, }: buildGoModule rec { @@ -23,6 +24,8 @@ buildGoModule rec { mv $out/bin/server $out/bin/livekit-server ''; + passthru.tests = nixosTests.livekit; + meta = with lib; { description = "End-to-end stack for WebRTC. SFU media server and SDKs"; homepage = "https://livekit.io/"; diff --git a/pkgs/by-name/li/livepeer/package.nix b/pkgs/by-name/li/livepeer/package.nix index f905830802a8..304d77d35d61 100644 --- a/pkgs/by-name/li/livepeer/package.nix +++ b/pkgs/by-name/li/livepeer/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "livepeer"; - version = "0.8.4"; + version = "0.8.5"; proxyVendor = true; vendorHash = "sha256-9BxLyl8lZTKx/2Qw0NR4+1GdmD9FQPfnVU+x/RWEIvA="; @@ -19,7 +19,7 @@ buildGoModule rec { owner = "livepeer"; repo = "go-livepeer"; tag = "v${version}"; - hash = "sha256-slM3StvePwCyKXFmbxyZAZ4tTtLea4SMBXCojK8zrdM="; + hash = "sha256-GT/YMY3U17pfhAL5uiEBjSlM79dhwgkwan0xlzGbR5g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lix-diff/package.nix b/pkgs/by-name/li/lix-diff/package.nix new file mode 100644 index 000000000000..ac9809d0048a --- /dev/null +++ b/pkgs/by-name/li/lix-diff/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "lix-diff"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tgirlcloud"; + repo = "lix-diff"; + tag = "v${finalAttrs.version}"; + hash = "sha256-apjYXFdvxLZjhcN1wV7Y/LKNuWtWtCZM0h1VFg/znVo="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-u3aFmPcceLP7yPdWWoPmOnQEbM0jhULs/kPweymQcZ8="; + + meta = { + homepage = "https://github.com/isabelroses/lix-diff"; + description = "lix plugin for diffing two generations"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ isabelroses ]; + mainProgram = "lix-diff"; + }; +}) diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix index 9f43932bec96..979a882ece94 100644 --- a/pkgs/by-name/lk/lk-jwt-service/package.nix +++ b/pkgs/by-name/lk/lk-jwt-service/package.nix @@ -2,21 +2,24 @@ lib, buildGoModule, fetchFromGitHub, + nixosTests, }: buildGoModule (finalAttrs: { pname = "lk-jwt-service"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "element-hq"; repo = "lk-jwt-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-ONL2qKBXL2FtTv5Eao61qPKWP2h9t3KyoHlS5nAHMGA="; + hash = "sha256-DT9W+LFUDrSc/Twjanhrm2zXpQ63zpxLpRY1wf/o0q4="; }; vendorHash = "sha256-47eJO1Ai78RuhlEPn/J1cd+YSqvmfUD8cuPZIqsdxvI="; + passthru.tests = nixosTests.lk-jwt-service; + meta = with lib; { changelog = "https://github.com/element-hq/lk-jwt-service/releases/tag/${finalAttrs.src.tag}"; description = "Minimal service to issue LiveKit JWTs for MatrixRTC"; diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 5896c4336bcc..0323e2b709d0 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, makeBinaryWrapper, + installShellFiles, versionCheckHook, nix-update-script, }: @@ -20,13 +21,22 @@ rustPlatform.buildRustPackage { hash = "sha256-/6p23JW3ZaSuDf34IWcTggR92/zUTMRerQ32bTsRujo="; }; - nativeBuildInputs = [ makeBinaryWrapper ]; + nativeBuildInputs = [ + makeBinaryWrapper + installShellFiles + ]; useFetchCargoVendor = true; cargoHash = "sha256-aX8nm/V0ug2g40QeFU9AWxjuFAnW+gYTR8RC5CV7wRQ="; cargoBuildFlags = [ "--workspace" ]; + # TODO: Upstream also provides Elvish and PowerShell completions, + # but `installShellCompletion` only has support for Bash, Zsh and Fish at the moment. + postInstall = '' + installShellCompletion completions/{_lla,lla{.bash,.fish}} + ''; + postFixup = '' wrapProgram $out/bin/lla \ --add-flags "--plugins-dir $out/lib" diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index d69193e2f0fc..589f6c2c3dc2 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -2,7 +2,6 @@ lib, autoAddDriverRunpath, cmake, - darwin, fetchFromGitHub, nix-update-script, stdenv, @@ -50,15 +49,6 @@ let optionalString ; - darwinBuildInputs = - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreVideo - CoreGraphics - ] - ++ optionals metalSupport [ MetalKit ]; - cudaBuildInputs = with cudaPackages; [ cuda_cccl # @@ -82,13 +72,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "4958"; + version = "5416"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-Llw2lDLNjkG6nDMQG4hQCPokKgUg/tnPVJQId75XR9g="; + hash = "sha256-/UFfHPGJRPnLEA9JninLazrwO3koE5AaK4oHK7yoN+0="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -126,8 +116,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ]; buildInputs = - optionals effectiveStdenv.hostPlatform.isDarwin darwinBuildInputs - ++ optionals cudaSupport cudaBuildInputs + optionals cudaSupport cudaBuildInputs ++ optionals openclSupport [ clblast ] ++ optionals rocmSupport rocmBuildInputs ++ optionals blasSupport [ blas ] @@ -152,16 +141,11 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ optionals cudaSupport [ (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) ] - ++ optionals rocmSupport [ - (cmakeFeature "CMAKE_C_COMPILER" "hipcc") - (cmakeFeature "CMAKE_CXX_COMPILER" "hipcc") - - # Build all targets supported by rocBLAS. When updating search for TARGET_LIST_ROCM - # in https://github.com/ROCmSoftwarePlatform/rocBLAS/blob/develop/CMakeLists.txt - # and select the line that matches the current nixpkgs version of rocBLAS. - # Should likely use `rocmPackages.clr.gpuTargets`. - "-DAMDGPU_TARGETS=gfx803;gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx940;gfx941;gfx942;gfx1010;gfx1012;gfx1030;gfx1100;gfx1101;gfx1102" - ] + ++ optionals rocmSupport ([ + (cmakeFeature "CMAKE_HIP_COMPILER" "${rocmPackages.clr.hipClangPath}/clang++") + # TODO: this should become `clr.gpuTargets` in the future. + (cmakeFeature "CMAKE_HIP_ARCHITECTURES" rocmPackages.rocblas.amdgpu_targets) + ]) ++ optionals metalSupport [ (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") (cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true) diff --git a/pkgs/by-name/ll/lldpd/package.nix b/pkgs/by-name/ll/lldpd/package.nix new file mode 100644 index 000000000000..ff6ea5e3d2a7 --- /dev/null +++ b/pkgs/by-name/ll/lldpd/package.nix @@ -0,0 +1,67 @@ +{ + stdenv, + fetchurl, + lib, + libevent, + net-snmp, + openssl, + pkg-config, + readline, + removeReferencesTo, +}: + +stdenv.mkDerivation rec { + pname = "lldpd"; + version = "1.0.19"; + + src = fetchurl { + url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; + hash = "sha256-+H3zFj1eUTjakB0FWzhACXhdHrUP2xeiNDkQ/PMKmX8="; + }; + + configureFlags = + [ + "--localstatedir=/var" + "--enable-pie" + "--with-snmp" + "--with-systemdsystemunitdir=\${out}/lib/systemd/system" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--with-launchddaemonsdir=no" + "--with-privsep-chroot=/var/empty" + "--with-privsep-group=nogroup" + "--with-privsep-user=nobody" + ]; + + nativeBuildInputs = [ + pkg-config + removeReferencesTo + ]; + buildInputs = [ + libevent + readline + net-snmp + openssl + ]; + + enableParallelBuilding = true; + + outputs = [ + "out" + "dev" + "man" + "doc" + ]; + + preFixup = '' + find $out -type f -exec remove-references-to -t ${stdenv.cc} '{}' + + ''; + + meta = with lib; { + description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments"; + homepage = "https://lldpd.github.io/"; + license = licenses.isc; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/ll/llm-ls/package.nix b/pkgs/by-name/ll/llm-ls/package.nix index ce2c39be80b1..c4b45fd9bc51 100644 --- a/pkgs/by-name/ll/llm-ls/package.nix +++ b/pkgs/by-name/ll/llm-ls/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ll/llpp/package.nix b/pkgs/by-name/ll/llpp/package.nix index 686831fd92dc..12d0e5d54c90 100644 --- a/pkgs/by-name/ll/llpp/package.nix +++ b/pkgs/by-name/ll/llpp/package.nix @@ -20,7 +20,6 @@ xclip, inotify-tools, procps, - darwin, }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; @@ -63,10 +62,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.frameworks.Cocoa ]; dontStrip = true; diff --git a/pkgs/by-name/ll/lls/package.nix b/pkgs/by-name/ll/lls/package.nix index fad8352a9d78..7d7edcc5a8ee 100644 --- a/pkgs/by-name/ll/lls/package.nix +++ b/pkgs/by-name/ll/lls/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage rec { pname = "lls"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "jcaesar"; repo = "lls"; tag = "v${version}"; - hash = "sha256-7biyctXeTTZi8PQqKKYn7Qkuw1CxJ9lT6Wo1+rpnjVs="; + hash = "sha256-eFGyrGtH57a5iRWHWqt1h58QMdmPf2rPqHnuVj5u6PQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-v4AW6kL546LNdBh9GEJfC5lKJBvVhfF52MS4bOkUbdU="; + cargoHash = "sha256-TY7s0sIeW+FgxqbbYvK3uZ2RwPLVKKhLq3DOurer+Gc="; meta = with lib; { description = "Tool to list listening sockets"; diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index 8cec68695abd..4f89526d536a 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lms"; - version = "3.65.0"; + version = "3.66.1"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-H+ibj7eroIWti2Mxa+V5pzE1NE7b3H3/ThVIDqweWf8="; + hash = "sha256-MKVO/jxLCjfWi17/XeTwBksOAw4Zd1i/6yMiAlSsYfY="; }; strictDeps = true; diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index 9b2acdf5929a..f18a880feabe 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -7,6 +7,7 @@ version, url, hash, + passthru, }: stdenv.mkDerivation { inherit meta pname version; @@ -47,4 +48,6 @@ stdenv.mkDerivation { echo 'Copying extracted content into "sourceRoot"' cp -a $mnt/LM\ Studio.app $PWD/ ''; + + inherit passthru; } diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index df9421c581c4..5b6e09171819 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -8,7 +8,7 @@ meta, stdenv, lib, - patchelf, + passthru, }: let src = fetchurl { inherit url hash; }; @@ -21,6 +21,7 @@ appimageTools.wrapType2 { pname version src + passthru ; extraPkgs = pkgs: [ pkgs.ocl-icd ]; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index c41d543c446a..5da2f785865f 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -2,13 +2,16 @@ lib, stdenv, callPackage, - version ? "0.3.14", - rev ? "3", ... }@args: let pname = "lmstudio"; - packageVersion = "${version}-${rev}"; # Combine version and rev + + version_aarch64-darwin = "0.3.15-11"; + hash_aarch64-darwin = "sha256-Bi5UbZR0fDYF+x9mtFaqZsOZZ1gMQAJN+IS/ST/5Wkc="; + version_x86_64-linux = "0.3.15-11"; + hash_x86_64-linux = "sha256-EfynIN6DGSvzOgI+E7CxycJ2KUlFZx2YRwRihjhE3SM="; + meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; @@ -26,18 +29,20 @@ in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname meta; - version = packageVersion; + passthru.updateScript = ./update.sh; + version = version_aarch64-darwin; url = args.url - or "https://installers.lmstudio.ai/darwin/arm64/${version}-${rev}/LM-Studio-${version}-${rev}-arm64.dmg"; - hash = args.hash or "sha256-doAhCbWFwDWlBQ+4YfJz6p7I4NZJxIOtdLYTr3mOGds="; + or "https://installers.lmstudio.ai/darwin/arm64/${version_aarch64-darwin}/LM-Studio-${version_aarch64-darwin}-arm64.dmg"; + hash = args.hash or hash_aarch64-darwin; } else callPackage ./linux.nix { inherit pname meta; - version = packageVersion; + passthru.updateScript = ./update.sh; + version = version_x86_64-linux; url = args.url - or "https://installers.lmstudio.ai/linux/x64/${version}-${rev}/LM-Studio-${version}-${rev}-x64.AppImage"; - hash = args.hash or "sha256-IIJMk0cfLQdrx0nTSbpsbqOvD+f/qrH+rGdYN4mygaw="; + or "https://installers.lmstudio.ai/linux/x64/${version_x86_64-linux}/LM-Studio-${version_x86_64-linux}-x64.AppImage"; + hash = args.hash or hash_x86_64-linux; } diff --git a/pkgs/by-name/lm/lmstudio/update.sh b/pkgs/by-name/lm/lmstudio/update.sh new file mode 100755 index 000000000000..4b9f5ef47560 --- /dev/null +++ b/pkgs/by-name/lm/lmstudio/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts + +set -euo pipefail + +packages="$(curl -s -L "https://lmstudio.ai/" | grep -oE 'https://installers.lmstudio.ai[^"\]*' | sort -u | grep -v \\.exe)" +for system in "aarch64-darwin darwin/arm64" "x86_64-linux linux/x64"; do + # shellcheck disable=SC2086 + set -- ${system} # split string into variables $1 and $2 + + arch="${1}" + url=$(echo "${packages}" | grep "${2}") + version="$(echo "${url}" | cut -d/ -f6)" + hash=$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url "${url}")") + + update-source-version lmstudio "${version}" "${hash}" --system="${arch}" --version-key="version_${arch}" \ + 2> >(tee /dev/stderr) | grep -q "nothing to do" && exit +done diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix index 9af958ac6723..8b152bd7df8f 100644 --- a/pkgs/by-name/ln/lnav/package.nix +++ b/pkgs/by-name/ln/lnav/package.nix @@ -19,34 +19,43 @@ cargo, rustPlatform, rustc, + libunistring, + prqlSupport ? stdenv.hostPlatform == stdenv.buildPlatform, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lnav"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "tstack"; repo = "lnav"; - rev = "v${version}"; - sha256 = "sha256-m0r7LAo9pYFpS+oimVCNCipojxPzMMsLLjhjkitEwow="; + tag = "v${finalAttrs.version}"; + hash = "sha256-XS3/km2sJwRnWloLKu9X9z07+qBFRfUsaRpZVYjoclI="; }; enableParallelBuilding = true; + separateDebugInfo = true; strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ - autoconf - automake - zlib - curl.dev - re2c - cargo - rustPlatform.cargoSetupHook - rustc - ]; + + nativeBuildInputs = + [ + autoconf + automake + zlib + curl.dev + re2c + ] + ++ lib.optionals prqlSupport [ + cargo + rustPlatform.cargoSetupHook + rustc + ]; + buildInputs = [ bzip2 @@ -56,14 +65,15 @@ stdenv.mkDerivation rec { sqlite curl libarchive + libunistring ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gpm ]; cargoDeps = rustPlatform.fetchCargoVendor { - src = "${src}/src/third-party/prqlc-c"; - hash = "sha256-jfmr6EuNW2mEHTEVHn6YnBDMzKxKI097vEFHXC4NT2Y="; + src = "${finalAttrs.src}/src/third-party/prqlc-c"; + hash = "sha256-svi+C3ELw6Ly0mtji8xOv+DDqR0z5shFNazHa3kDQVg="; }; cargoRoot = "src/third-party/prqlc-c"; @@ -74,7 +84,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://github.com/tstack/lnav"; description = "Logfile Navigator"; longDescription = '' @@ -87,14 +97,13 @@ stdenv.mkDerivation rec { will allow the user to quickly and efficiently zero in on problems. ''; downloadPage = "https://github.com/tstack/lnav/releases"; - license = licenses.bsd2; - maintainers = with maintainers; [ + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ dochang symphorien pcasaretto ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "lnav"; }; - -} +}) diff --git a/pkgs/by-name/ln/lngen/package.nix b/pkgs/by-name/ln/lngen/package.nix index 7eb065c780b2..a66fe9326cb2 100644 --- a/pkgs/by-name/ln/lngen/package.nix +++ b/pkgs/by-name/ln/lngen/package.nix @@ -6,15 +6,17 @@ haskellPackages.mkDerivation { pname = "lngen"; - version = "unstable-2024-10-22"; + version = "0-unstable-2024-10-22"; src = fetchFromGitHub { owner = "plclub"; repo = "lngen"; rev = "c034c8d95264e6a5d490bc4096534ccd54f0d393"; hash = "sha256-XzcB/mNXure6aZRmwgUWGHSEaknrbP8Onk2CisVuhiw="; }; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = with haskellPackages; [ base syb @@ -23,6 +25,12 @@ haskellPackages.mkDerivation { mtl ]; executableHaskellDepends = with haskellPackages; [ base ]; + + # Fix build on GHC >=9.8.1, where using partial functions was made an error with `-Werror` + preBuild = '' + substituteInPlace lngen.cabal --replace-fail "-Werror" "-Werror -Wwarn=x-partial" + ''; + 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 ]; diff --git a/pkgs/by-name/ln/lnx/package.nix b/pkgs/by-name/ln/lnx/package.nix new file mode 100644 index 000000000000..08a75bcd4f6a --- /dev/null +++ b/pkgs/by-name/ln/lnx/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +# unstable was chosen because of an added Cargo.lock +# revert to stable for the version after 0.9.0 +let + version = "unstable-2022-06-25"; +in +rustPlatform.buildRustPackage { + pname = "lnx"; + inherit version; + src = fetchFromGitHub { + owner = "lnx-search"; + repo = "lnx"; + rev = "2cb80f344c558bfe37f21ccfb83265bf351419d9"; + sha256 = "sha256-iwoZ6xRzEDArmhWYxIrbIXRTQjOizyTsXCvMdnUrs2g="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-9fro1Dx7P+P9NTsg0gtMfr0s4TEpkZA31EFAnObiNFo="; + meta = with lib; { + description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants."; + mainProgram = "lnx"; + homepage = "https://lnx.rs/"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/lo/loadwatch/package.nix b/pkgs/by-name/lo/loadwatch/package.nix index 95990bc5190d..d3db7c30cd5b 100644 --- a/pkgs/by-name/lo/loadwatch/package.nix +++ b/pkgs/by-name/lo/loadwatch/package.nix @@ -1,28 +1,26 @@ { lib, stdenv, - fetchgit, + fetchFromSourcehut, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "loadwatch"; - version = "1.1-1-g6d2544c"; + version = "1.1-4-g868bd29"; - src = fetchgit { - url = "git://woffs.de/git/fd/loadwatch.git"; - sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b"; - rev = "6d2544c0caaa8a64bbafc3f851e06b8056c30e6e"; + src = fetchFromSourcehut { + owner = "~woffs"; + repo = "loadwatch"; + hash = "sha256-/4kfGdpYJWQyb7mRaVUpyQQC5VP96bDsBDfM3XhcJXw="; + rev = finalAttrs.version; }; - installPhase = '' - mkdir -p $out/bin - install loadwatch lw-ctl $out/bin - ''; + makeFlags = [ "bindir=$(out)/bin" ]; - meta = with lib; { + meta = { description = "Run a program using only idle cycles"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ woffs ]; - platforms = platforms.all; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/lo/lobster/package.nix b/pkgs/by-name/lo/lobster/package.nix new file mode 100644 index 000000000000..31c69279915a --- /dev/null +++ b/pkgs/by-name/lo/lobster/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + callPackage, + + # Linux deps + libGL, + xorg, + +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lobster"; + version = "2025.1"; + + src = fetchFromGitHub { + owner = "aardappel"; + repo = "lobster"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-ia/xPyPX5lwSkiFCsJ48baCfxv6z6jL5/CIMVRWo/og="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libGL + xorg.libX11 + xorg.libXext + ]; + + preConfigure = '' + cd dev + ''; + + passthru.tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix { }; + + meta = with lib; { + broken = stdenv.hostPlatform.isDarwin; + homepage = "https://strlen.com/lobster/"; + description = "Lobster programming language"; + mainProgram = "lobster"; + longDescription = '' + Lobster is a programming language that tries to combine the advantages of + very static typing and memory management with a very lightweight, + friendly and terse syntax, by doing most of the heavy lifting for you. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/compilers/lobster/test-can-run-hello-world.nix b/pkgs/by-name/lo/lobster/test-can-run-hello-world.nix similarity index 100% rename from pkgs/development/compilers/lobster/test-can-run-hello-world.nix rename to pkgs/by-name/lo/lobster/test-can-run-hello-world.nix diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index 14832660a7a9..eb9e91b952d6 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -20,6 +20,7 @@ ncurses, which, opencv, + curl, enable_upx ? true, upx, @@ -28,11 +29,11 @@ # https://github.com/NixOS/rfcs/pull/169 # CPU extensions - enable_avx ? true, - enable_avx2 ? true, + enable_avx ? stdenv.hostPlatform.isx86_64, + enable_avx2 ? stdenv.hostPlatform.isx86_64, enable_avx512 ? stdenv.hostPlatform.avx512Support, - enable_f16c ? true, - enable_fma ? true, + enable_f16c ? stdenv.hostPlatform.isx86_64, + enable_fma ? stdenv.hostPlatform.isx86_64, with_openblas ? false, openblas, @@ -105,10 +106,10 @@ let final: prev: { name = "llama-cpp-grpc"; src = fetchFromGitHub { - owner = "ggml-org"; + owner = "ggerganov"; repo = "llama.cpp"; - rev = "300907b2110cc17b4337334dc397e05de2d8f5e0"; - hash = "sha256-7jPgToZ8Xs+8DfXP5WFWZKhqFdYcZ9yFzWVKjvOttIA="; + rev = "d6d2c2ab8c8865784ba9fef37f2b2de3f2134d33"; + hash = "sha256-b9B5I3EbBFrkWc6RLXMWcCRKayyWjlGuQrogUcrISrc="; fetchSubmodules = true; }; postPatch = @@ -116,7 +117,7 @@ let + '' cd examples cp -r --no-preserve=mode ${src}/backend/cpp/llama grpc-server - cp llava/clip.* llava/llava.* grpc-server + cp llava/clip* llava/llava.* grpc-server printf "\nadd_subdirectory(grpc-server)" >> CMakeLists.txt cp ${src}/backend/backend.proto grpc-server @@ -137,6 +138,7 @@ let protobuf # provides also abseil_cpp as propagated build input grpc openssl + curl ]; } )).override @@ -286,7 +288,7 @@ let src = fetchFromGitHub { owner = "PABannier"; repo = "bark.cpp"; - rev = "v1.0.0"; + tag = "v1.0.0"; hash = "sha256-wOcggRWe8lsUzEj/wqOAUlJVypgNFmit5ISs9fbwoCE="; fetchSubmodules = true; }; @@ -303,10 +305,10 @@ let stable-diffusion = stdenv.mkDerivation { name = "stable-diffusion"; src = fetchFromGitHub { - owner = "leejet"; + owner = "richiejp"; repo = "stable-diffusion.cpp"; - rev = "d46ed5e184b97c2018dc2e8105925bdb8775e02c"; - hash = "sha256-5i2HjkdaQEmlUWeHucQyrS8zNS+xyB7Zj+1oA/xsv2k="; + rev = "53e3b17eb3d0b5760ced06a1f98320b68b34aaae"; # branch cuda-fix + hash = "sha256-z56jafOdibpX+XhRsrc7ieGbeug4bf737/UobqkpBV0="; fetchSubmodules = true; }; installPhase = '' @@ -316,6 +318,9 @@ let | tar cf - --null --files-from - \ | tar xf - -C $out/build ''; + cmakeFlags = [ + (lib.cmakeFeature "GGML_BUILD_NUMBER" "1") + ]; nativeBuildInputs = [ cmake ]; buildInputs = [ opencv ]; }; @@ -331,12 +336,12 @@ let stdenv; pname = "local-ai"; - version = "2.26.0"; + version = "2.28.0"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; - rev = "v${version}"; - hash = "sha256-eHylgEbPNQ8CVLlstkeQH6jqYOKfvel1uU5ro8DkLJs="; + tag = "v${version}"; + hash = "sha256-Hpz0dGkgasSY/FGO7mDzqsLjXut0LdQ9PUXGaURUOlY="; }; prepare-sources = @@ -355,7 +360,7 @@ let self = buildGo123Module.override { stdenv = effectiveStdenv; } { inherit pname version src; - vendorHash = "sha256-6loR8bvt5BlijufUBVDpxNS/cVCMmbaCwEhYpJKwGys="; + vendorHash = "sha256-1OY/y1AeL0K+vOU4Jk/cj7rToVLC9EkkNhgifB+icDM="; env.NIX_CFLAGS_COMPILE = " -isystem ${opencv}/include/opencv4"; @@ -364,7 +369,6 @@ let # TODO: add silero-vad sed -i Makefile \ -e '/mod download/ d' \ - -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-fallback/ d' \ -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-avx/ d' \ -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-cuda/ d' \ -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/silero-vad/ d' \ @@ -383,7 +387,7 @@ let + '' shopt -s extglob mkdir -p backend-assets/grpc - cp ${llama-cpp-grpc}/bin/grpc-server backend-assets/grpc/llama-cpp-avx2 + cp ${llama-cpp-grpc}/bin/grpc-server backend-assets/grpc/llama-cpp-fallback cp ${llama-cpp-rpc}/bin/grpc-server backend-assets/grpc/llama-cpp-grpc mkdir -p backend/cpp/llama/llama.cpp diff --git a/pkgs/by-name/lo/local-ai/tests.nix b/pkgs/by-name/lo/local-ai/tests.nix index 17f3fb94dd03..ba8479582ca4 100644 --- a/pkgs/by-name/lo/local-ai/tests.nix +++ b/pkgs/by-name/lo/local-ai/tests.nix @@ -84,7 +84,7 @@ in nodes.machine = { imports = [ common-config ]; virtualisation.cores = 2; - virtualisation.memorySize = 4096; + virtualisation.memorySize = 3 * 4096; services.local-ai.models = models; }; passthru = { diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix index 9533e51e006e..a2e0f6e95475 100644 --- a/pkgs/by-name/lo/localsearch/package.nix +++ b/pkgs/by-name/lo/localsearch/package.nix @@ -19,11 +19,11 @@ bzip2, dbus, exempi, + ffmpeg, giflib, glib, gobject-introspection, gnome, - gst_all_1, icu, json-glib, libcue, @@ -39,7 +39,6 @@ libtiff, libuuid, libxml2, - networkmanager, poppler, systemd, taglib, @@ -50,11 +49,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "localsearch"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz"; - hash = "sha256-zaaRlfaEU1eo2RwCNnDv6SI49NE4oe96FAH0WiqEA84="; + hash = "sha256-1C9AjcP7KP5U9amrv18d7PWBjbnC6exRwJRkvf0MFLk="; }; patches = [ @@ -87,16 +86,11 @@ stdenv.mkDerivation (finalAttrs: { bzip2 dbus exempi + ffmpeg giflib gexiv2 totem-pl-parser tinysparql - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gstreamer - gst_all_1.gst-libav icu json-glib libcue @@ -116,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp - networkmanager systemd upower ] @@ -146,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://gitlab.gnome.org/GNOME/localsearch"; description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; mainProgram = "localsearch"; diff --git a/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch b/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch index 4715241ee628..a38e37fa222a 100644 --- a/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch +++ b/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch @@ -1,8 +1,8 @@ -diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c -index 6d4510be1..1de5d5a90 100644 ---- a/src/libtracker-miners-common/tracker-landlock.c -+++ b/src/libtracker-miners-common/tracker-landlock.c -@@ -184,6 +184,10 @@ gboolean +diff --git a/src/common/tracker-landlock.c b/src/common/tracker-landlock.c +index f26791d73..f03e8ddb9 100644 +--- a/src/common/tracker-landlock.c ++++ b/src/common/tracker-landlock.c +@@ -185,6 +185,10 @@ gboolean tracker_landlock_init (const gchar * const *indexed_folders) { TrackerLandlockRule stock_rules[] = { @@ -11,5 +11,5 @@ index 6d4510be1..1de5d5a90 100644 + LANDLOCK_ACCESS_FS_READ_FILE | + LANDLOCK_ACCESS_FS_READ_DIR) }, /* Allow access to the executable itself */ - { LIBEXECDIR "/tracker-extract-3", - LANDLOCK_ACCESS_FS_READ_FILE | + { LIBEXECDIR "/localsearch-extractor-3", + LANDLOCK_ACCESS_FS_READ_FILE | diff --git a/pkgs/by-name/lo/localstack/package.nix b/pkgs/by-name/lo/localstack/package.nix index e8f95f38e034..bdc074f7345a 100644 --- a/pkgs/by-name/lo/localstack/package.nix +++ b/pkgs/by-name/lo/localstack/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "localstack"; - version = "4.2.0"; + version = "4.3.0"; pyproject = true; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; tag = "v${version}"; - hash = "sha256-cmBorHlYL7xmq4SIdyGu11/byCJK+OzrJsqVZHJDDTE="; + hash = "sha256-owkRyMT/ntKPUHp4Are91/4LThVzzaoeZZ0gpKLD6mM="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index 5c9ea9e206be..6d331e18cc2a 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; tag = "v${finalAttrs.version}"; - hash = "sha256-HXyU+b4CtTeQJrX0vVKV94twCXJRWZn/dGsjyC8fpc8="; + hash = "sha256-2AHnzJ5lwm/CXOTBumTxllIzFo88EAENwQFny7TjrUk="; }; strictDeps = true; diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index e50876658ad2..050093fb3f82 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,17 +18,17 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook-desktop"; - version = "0.9.21"; + version = "0.9.23"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-SRmfLxF78jR1a/37pU1TLM6nFpmYLRbHJzQIVQtM8/M="; + hash = "sha256-1SHAlhcQFuhwiYQReVOILX2T0gufNBojuy/E/EcECNw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-faqbsxXF2AjDE+FMkD1PihacPAvQlD6nkczN4QdsCeM="; + cargoHash = "sha256-TAa/HuRDwRr5GBObcQwxebTiBjRrWeq52HFYT9h6Rq4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index bf9c911ae031..d4d5da794911 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "lockbook"; - version = "0.9.21"; + version = "0.9.22"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-SRmfLxF78jR1a/37pU1TLM6nFpmYLRbHJzQIVQtM8/M="; + hash = "sha256-akCtnPLJupoo7n3Vfyl37fjCmK4dHB0bt92rie6k0dQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-faqbsxXF2AjDE+FMkD1PihacPAvQlD6nkczN4QdsCeM="; + cargoHash = "sha256-xH3GIwh3zaLbpZqvzM+KM+K14fWj241RTwUM7dWRCKA="; doCheck = false; # there are no cli tests cargoBuildFlags = [ diff --git a/pkgs/by-name/lo/loco/package.nix b/pkgs/by-name/lo/loco/package.nix index 26d3a3a6ff9e..158145b80a3b 100644 --- a/pkgs/by-name/lo/loco/package.nix +++ b/pkgs/by-name/lo/loco/package.nix @@ -2,22 +2,27 @@ lib, rustPlatform, fetchCrate, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "loco"; - version = "0.14.0"; + version = "0.15.0"; src = fetchCrate { inherit pname version; - hash = "sha256-d13BuDPXZJ2cOgaNhX95Us+T4SoJZJAyCugSySHh7U8="; + hash = "sha256-sTPFDdiYmw+ODAcuBh4XXpSXVZbbYxfjr+WiTGit18E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-g7zfPO0/8a9PPdd8CPDWRUTWdQ29tFZ3uOSux8hcExo="; + cargoHash = "sha256-EsNFdk7bLRzyfncDRxqS0CQGdtPFdRRSlpTTxbQ8csI="; #Skip trycmd integration tests checkFlags = [ "--skip=cli_tests" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Loco CLI is a powerful command-line tool designed to streamline the process of generating Loco websites"; homepage = "https://loco.rs"; diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index 75b61ff080e8..dccb3963563e 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -24,14 +24,6 @@ git, }: -let - # unpack tarball containing electron's headers - electron-headers = runCommand "electron-headers" { } '' - mkdir -p $out - tar -C $out --strip-components=1 -xvf ${electron.headers} - ''; -in - stdenv.mkDerivation (finalAttrs: { pname = "logseq"; version = "0.10.9-unstable-2025-03-11"; @@ -202,7 +194,7 @@ stdenv.mkDerivation (finalAttrs: { npm rebuild --verbose popd - export npm_config_nodedir=${electron-headers} + export npm_config_nodedir=${electron.headers} pushd static @@ -210,15 +202,16 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace node_modules/dugite/package.json \ --replace-fail '"postinstall"' '"_postinstall"' - # this doesn't seem to build with electron-headers + # this doesn't seem to build with electron.headers rm node_modules/macos-alias/binding.gyp # the electron-rebuild command deadlocks for some reason, let's just use normal npm rebuild (since we overrode the nodedir anyways) npm rebuild --verbose - # remove most references to electron-headers - # TODO: track down the remaining references - find node_modules -type f \( -name "*.target.mk" -o -name "config.gypi" -o -name "Makefile" \) -delete + # remove most references to electron.headers + shopt -s globstar + rm -r node_modules/**/{*.target.mk,config.gypi,Makefile,Release/.deps} + shopt -u globstar popd diff --git a/pkgs/by-name/lo/logstalgia/package.nix b/pkgs/by-name/lo/logstalgia/package.nix index 3b4ea626225e..d23dff56d9fa 100644 --- a/pkgs/by-name/lo/logstalgia/package.nix +++ b/pkgs/by-name/lo/logstalgia/package.nix @@ -7,11 +7,12 @@ pkg-config, libpng, libjpeg, - pcre, + pcre2, SDL2_image, glew, libGLU, libGL, + libX11, boost, glm, freetype, @@ -19,11 +20,11 @@ stdenv.mkDerivation rec { pname = "logstalgia"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { url = "https://github.com/acaudwell/Logstalgia/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd"; + hash = "sha256-wEnv9AXpJANSIu2ya8xse18AoIkmq9t7Rn4kSSQnkKk="; }; nativeBuildInputs = [ pkg-config ]; @@ -33,7 +34,8 @@ stdenv.mkDerivation rec { ftgl libpng libjpeg - pcre + libX11 + pcre2 SDL2_image libGLU libGL @@ -42,6 +44,11 @@ stdenv.mkDerivation rec { freetype ]; + configureFlags = [ + "--with-boost-system=boost_system" + "--with-boost-filesystem=boost_filesystem" + ]; + meta = with lib; { homepage = "https://logstalgia.io/"; description = "Website traffic visualization tool"; diff --git a/pkgs/by-name/lo/lokalise2-cli/package.nix b/pkgs/by-name/lo/lokalise2-cli/package.nix index 6614c9a3382d..f6c53649100f 100644 --- a/pkgs/by-name/lo/lokalise2-cli/package.nix +++ b/pkgs/by-name/lo/lokalise2-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "3.1.1"; + version = "3.1.4"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-CFZB1nELQOBNOuISTjes4vhXMr8Pjq4Rj83nq/FfpMY="; + sha256 = "sha256-weqYHKxu6HvdrFduzKtHtCVnJ0GVRGIPABLrsW4f0VA="; }; - vendorHash = "sha256-sM4v1EWxXPUFKFWcl9EBc8ZTmm2STOVoeGH9Zv+KEng="; + vendorHash = "sha256-thD8NtG9uVI4KwNQiNsVCUdyUcgAmnr+szsUQ2Ika1c="; doCheck = false; diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix index 45ea60a7ea13..57af96cb8afc 100644 --- a/pkgs/by-name/lo/loksh/package.nix +++ b/pkgs/by-name/lo/loksh/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "loksh"; - version = "7.6"; + version = "7.7"; src = fetchFromGitHub { owner = "dimkr"; repo = "loksh"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-R9yLrXzXeu7gUoV+CDOAu89p2YmPP0ImAWq2fod722c="; + hash = "sha256-BxQ7SZwRP9PlD2MV7DqG7tQ2lqzlkTwmaKwbgC7NYrc="; }; outputs = [ diff --git a/pkgs/by-name/lo/lombok/package.nix b/pkgs/by-name/lo/lombok/package.nix index dea367c79860..3f92609bd9eb 100644 --- a/pkgs/by-name/lo/lombok/package.nix +++ b/pkgs/by-name/lo/lombok/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.36"; + version = "1.18.38"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-c7awW2otNltwC6sI0w+U3p0zZJC8Cszlthgf70jL8Y4="; + sha256 = "sha256-Hh5CfDb/Y8RP0w7yktnnc+oxVEYKtiZdP+1+b1vFD7k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/lo/lon/package.nix b/pkgs/by-name/lo/lon/package.nix index 9fa33e864e1f..0296246aa5b4 100644 --- a/pkgs/by-name/lo/lon/package.nix +++ b/pkgs/by-name/lo/lon/package.nix @@ -2,28 +2,51 @@ rustPlatform, lib, fetchFromGitHub, + makeBinaryWrapper, + nix-prefetch-git, + gitMinimal, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "lon"; - version = "0.2.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "nikstur"; repo = "lon"; tag = version; - hash = "sha256-VGvK0ahBl440NMs03WqmP7T4a1DP13yfX47YI84rlGU="; + hash = "sha256-/7RelKn3pzC8n+b2OV1pcUEaWeEoH4qC2TvAWwni5AA="; }; sourceRoot = "source/rust/lon"; useFetchCargoVendor = true; - cargoHash = "sha256-YzQ6A1dH2D56/3inAmsE6G5rCnpWhDawxk6+FMWfhkc="; + cargoHash = "sha256-2/lHRv3bD0hX/JVSucsA3G5gM9NMgRrBf21JtEvzu64="; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postInstall = '' + wrapProgram $out/bin/lon --prefix PATH : ${ + lib.makeBinPath [ + nix-prefetch-git + gitMinimal + ] + } + ''; + + passthru = { + updateScript = nix-update-script { }; + }; meta = { description = "Lock & update Nix dependencies"; homepage = "https://github.com/nikstur/lon"; - maintainers = with lib.maintainers; [ ma27 ]; + changelog = "https://github.com/nikstur/lon/blob/${version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ + ma27 + nikstur + ]; license = lib.licenses.mit; mainProgram = "lon"; }; diff --git a/pkgs/by-name/lo/lorem/package.nix b/pkgs/by-name/lo/lorem/package.nix index ed6bb0111784..8c8eafcdb15b 100644 --- a/pkgs/by-name/lo/lorem/package.nix +++ b/pkgs/by-name/lo/lorem/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://apps.gnome.org/Lorem/"; license = lib.licenses.gpl3Plus; mainProgram = "lorem"; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/lo/lorri/package.nix b/pkgs/by-name/lo/lorri/package.nix new file mode 100644 index 000000000000..340cb69988bc --- /dev/null +++ b/pkgs/by-name/lo/lorri/package.nix @@ -0,0 +1,79 @@ +{ + lib, + pkgs, + rustPackages, + fetchFromGitHub, + rustPlatform, + writers, + nixosTests, +}: + +let + # Run `eval $(nix-build -A lorri.updater)` after updating the revision! + # It will copy some required files if necessary. + # Also don’t forget to run `nix-build -A lorri.tests` + version = "1.7.1"; + sha256 = "sha256-dEdKMgE4Jd8CCvtGQDZNDCYOomZAV8aR7Cmtyn8RfTo="; + cargoHash = "sha256-pRtc0cDVIBqbCbC1weFOhZP29rKAE1XdmM6HE5nJKRU="; + +in +(rustPlatform.buildRustPackage rec { + pname = "lorri"; + inherit version; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = pname; + rev = version; + inherit sha256; + }; + + outputs = [ + "out" + "man" + "doc" + ]; + + useFetchCargoVendor = true; + inherit cargoHash; + doCheck = false; + + BUILD_REV_COUNT = src.revCount or 1; + RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix { }; + + nativeBuildInputs = [ rustPackages.rustfmt ]; + + # copy the docs to the $man and $doc outputs + postInstall = '' + install -Dm644 lorri.1 $man/share/man/man1/lorri.1 + install -Dm644 -t $doc/share/doc/lorri/ \ + README.md \ + CONTRIBUTING.md \ + LICENSE \ + MAINTAINERS.md + cp -r contrib/ $doc/share/doc/lorri/contrib + ''; + + passthru = { + updater = writers.writeBash "copy-runtime-nix.sh" '' + set -euo pipefail + cp ${src}/nix/runtime.nix ${toString ./runtime.nix} + cp ${src}/nix/runtime-closure.nix.template ${toString ./runtime-closure.nix.template} + ''; + tests = { + nixos = nixosTests.lorri; + }; + }; + + meta = with lib; { + description = "Your project's nix-env"; + homepage = "https://github.com/nix-community/lorri"; + license = licenses.asl20; + maintainers = with maintainers; [ + grahamc + Profpatsch + nyarly + ]; + mainProgram = "lorri"; + }; +}) diff --git a/pkgs/tools/misc/lorri/runtime-closure.nix.template b/pkgs/by-name/lo/lorri/runtime-closure.nix.template similarity index 100% rename from pkgs/tools/misc/lorri/runtime-closure.nix.template rename to pkgs/by-name/lo/lorri/runtime-closure.nix.template diff --git a/pkgs/tools/misc/lorri/runtime.nix b/pkgs/by-name/lo/lorri/runtime.nix similarity index 100% rename from pkgs/tools/misc/lorri/runtime.nix rename to pkgs/by-name/lo/lorri/runtime.nix diff --git a/pkgs/by-name/lo/loudmouth/package.nix b/pkgs/by-name/lo/loudmouth/package.nix index 600082edef21..6ce497ea5a59 100644 --- a/pkgs/by-name/lo/loudmouth/package.nix +++ b/pkgs/by-name/lo/loudmouth/package.nix @@ -7,7 +7,6 @@ glib, pkg-config, zlib, - darwin, }: stdenv.mkDerivation rec { @@ -30,14 +29,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optionals - (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") - [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Foundation - ]; - meta = with lib; { description = "Lightweight C library for the Jabber protocol"; platforms = platforms.all; diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index 131214d8e5c0..4f887f68316a 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -8,8 +8,6 @@ meson, ninja, pkg-config, - jq, - moreutils, rustc, wrapGAppsHook4, gtk4, @@ -19,21 +17,25 @@ libseccomp, glycin-loaders, gnome, + common-updater-scripts, + _experimental-update-script-combinators, + rustPlatform, }: stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "47.4"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; - hash = "sha256-jckmgpqcM4gAyPQytaNHJG5ty9mtLdGiTEmOr90+ias="; + hash = "sha256-EHE9PpZ4nQd659M4lFKl9sOX3fQ6UMBxy/4tEnJZcN4="; }; - patches = [ - # Fix paths in glycin library - glycin-loaders.passthru.glycinPathsPatch - ]; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + name = "loupe-deps-${finalAttrs.version}"; + hash = "sha256-PKkyZDd4FLWGZ/kDKWkaSV8p8NDniSQGcR9Htce6uCg="; + }; nativeBuildInputs = [ cargo @@ -42,9 +44,8 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - jq - moreutils rustc + rustPlatform.cargoSetupHook wrapGAppsHook4 ]; @@ -56,13 +57,12 @@ stdenv.mkDerivation (finalAttrs: { libseccomp ]; - postPatch = '' - # Replace hash of file we patch in vendored glycin. - jq \ - --arg hash "$(sha256sum vendor/glycin/src/sandbox.rs | cut -d' ' -f 1)" \ - '.files."src/sandbox.rs" = $hash' \ - vendor/glycin/.cargo-checksum.json \ - | sponge vendor/glycin/.cargo-checksum.json + preConfigure = '' + # Dirty approach to add patches after cargoSetupPostUnpackHook + # We should eventually use a cargo vendor patch hook instead + pushd ../$(stripHash $cargoDeps)/glycin-2.* + patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + popd ''; preFixup = '' @@ -73,8 +73,34 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - passthru.updateScript = gnome.updateScript { - packageName = "loupe"; + passthru = { + updateScript = + let + updateSource = gnome.updateScript { + packageName = "loupe"; + }; + + updateLockfile = { + command = [ + "sh" + "-c" + '' + PATH=${ + lib.makeBinPath [ + common-updater-scripts + ] + } + update-source-version loupe --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null + '' + ]; + # Experimental feature: do not copy! + supportedFeatures = [ "silent" ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateLockfile + ]; }; meta = with lib; { @@ -82,7 +108,8 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/loupe/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Simple image viewer application written with GTK4 and Rust"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jk ] ++ teams.gnome.members; + maintainers = with maintainers; [ jk ]; + teams = [ teams.gnome ]; platforms = platforms.unix; mainProgram = "loupe"; }; diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 561fb1af2ed6..53393017ddd2 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "louvre"; - version = "2.16.0-1"; + version = "2.16.3-1"; src = fetchFromGitHub { owner = "CuarzoSoftware"; repo = "Louvre"; rev = "v${finalAttrs.version}"; - hash = "sha256-zw/n/Q1wwTiwhk6Q3xrMl2pEFBAk/BqSa/p0LTDbGBA="; + hash = "sha256-ZdV/KvYnPN4IKU6kbjDhCgcC3TdWqZbNJzDt39ZQ2x8="; }; sourceRoot = "${finalAttrs.src.name}/src"; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ library for building Wayland compositors"; homepage = "https://github.com/CuarzoSoftware/Louvre"; mainProgram = "louvre-views"; - maintainers = [ lib.maintainers.dblsaiko ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix index 8ff50bc7d6b3..365f87477ab6 100644 --- a/pkgs/by-name/lo/lowfi/package.nix +++ b/pkgs/by-name/lo/lowfi/package.nix @@ -5,7 +5,6 @@ pkg-config, openssl, stdenv, - darwin, alsa-lib, }: @@ -23,7 +22,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-waQcxdVXZZ09wuLWUNL4nRUHF1rIDI8lAfYc/1bxMl0="; - buildFeatures = [ "mpris" ]; + buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [ "mpris" ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lp/LPCNet/package.nix b/pkgs/by-name/lp/LPCNet/package.nix deleted file mode 100644 index 351e51118cb5..000000000000 --- a/pkgs/by-name/lp/LPCNet/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchurl, - cmake, - codec2, - # for tests - octave, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "LPCNet"; - version = "0.5"; - - src = fetchFromGitHub { - owner = "drowe67"; - repo = "LPCNet"; - rev = "v${finalAttrs.version}"; - hash = "sha256-tHZLKXmuM86A6OpfS3CRRjhFbqj1Q/w1w56msdgLHb0="; - }; - passthru = { - # Prebuilt neural network model that is needed during the build - can be overwritten - nnmodel = fetchurl { - url = "http://rowetel.com/downloads/deep/lpcnet_191005_v1.0.tgz"; - hash = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg="; - }; - }; - preConfigure = '' - mkdir build - cp \ - ${finalAttrs.finalPackage.passthru.nnmodel} \ - build/${finalAttrs.finalPackage.passthru.nnmodel.name} - ''; - - prePatch = '' - patchShebangs *.sh unittest/*.sh - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ codec2 ]; - nativeCheckInputs = [ octave ]; - - doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}/build/source/build/src" - ''; - - meta = with lib; { - description = "Experimental Neural Net speech coding for FreeDV"; - homepage = "https://github.com/drowe67/LPCNet"; - license = licenses.bsd3; - maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/by-name/lp/lpairs2/package.nix b/pkgs/by-name/lp/lpairs2/package.nix index 999f346afee1..1676bf86719e 100644 --- a/pkgs/by-name/lp/lpairs2/package.nix +++ b/pkgs/by-name/lp/lpairs2/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lpairs2"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "mirror://sourceforge/lgames/lpairs2-${finalAttrs.version}.tar.gz"; - hash = "sha256-ES5RGr817vc8t2DFNeETTqrm0uwk3JuTypSZjXK86Bg="; + hash = "sha256-y4eRLWhfI4XMBtGCqdM/l69pftGGIbVjVEkz/v5ytZI="; }; buildInputs = [ @@ -25,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: { SDL2_ttf ]; + enableParallelBuilding = true; + passthru.updateScript = directoryListingUpdater { inherit (finalAttrs) pname version; url = "https://lgames.sourceforge.io/LPairs/"; diff --git a/pkgs/by-name/lp/lparchive2epub/package.nix b/pkgs/by-name/lp/lparchive2epub/package.nix index e7024017bacc..f2727f445cd6 100644 --- a/pkgs/by-name/lp/lparchive2epub/package.nix +++ b/pkgs/by-name/lp/lparchive2epub/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "lparchive2epub"; - version = "1.2.4"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "Arwalk"; repo = pname; - rev = "v${version}"; - hash = "sha256-z8/cIevqPKo7Eukk4WVxgSjzO1EYUYWD8orAdUKR8z8="; + tag = "v${version}"; + hash = "sha256-h1i/p14Zzzr0SK+OjcCnXpsVjJl7mrbeLJ5JlnA0wPU="; }; build-system = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/lp/lpcnetfreedv/darwin.patch b/pkgs/by-name/lp/lpcnet/darwin.patch similarity index 100% rename from pkgs/by-name/lp/lpcnetfreedv/darwin.patch rename to pkgs/by-name/lp/lpcnet/darwin.patch diff --git a/pkgs/by-name/lp/lpcnet/package.nix b/pkgs/by-name/lp/lpcnet/package.nix new file mode 100644 index 000000000000..75865e7abb69 --- /dev/null +++ b/pkgs/by-name/lp/lpcnet/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + cmake, + codec2, + sox, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "LPCNet"; + version = "0.5-unstable-2025-01-19"; + + src = fetchFromGitHub { + owner = "drowe67"; + repo = "LPCNet"; + rev = "c8e51ac5e2fe674849cb53e7da44689b572cc246"; + sha256 = "sha256-0Knoym+deTuFAyJrrD55MijVh6DlhJp3lss66BJUHiA="; + }; + + patches = [ + # extracted from https://github.com/drowe67/LPCNet/pull/59 + ./darwin.patch + ]; + + passthru = { + # Prebuilt neural network model that is needed during the build - can be overwritten + nnmodel = fetchurl { + url = "http://rowetel.com/downloads/deep/lpcnet_191005_v1.0.tgz"; + hash = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg="; + }; + }; + + preConfigure = '' + mkdir build + cp \ + ${finalAttrs.finalPackage.passthru.nnmodel} \ + build/${finalAttrs.finalPackage.passthru.nnmodel.name} + ''; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + codec2 + ]; + + doCheck = true; + nativeCheckInputs = [ + # NOTE: From some reason, the tests pass without this on x86_64-linux, but + # not on aarch64-linux, although the relevant test is not enabled + # conditionally, see: + # https://github.com/drowe67/LPCNet/blob/c8e51ac5e2fe674849cb53e7da44689b572cc246/CMakeLists.txt#L220-L225 + sox + ]; + + meta = { + description = "Experimental Neural Net speech coding for FreeDV"; + homepage = "https://github.com/drowe67/LPCNet"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + doronbehar + mvs + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix deleted file mode 100644 index bfc773ad47cd..000000000000 --- a/pkgs/by-name/lp/lpcnetfreedv/package.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchurl, - cmake, - nix-update-script, -}: - -let - dataVersion = "191005_v1.0"; - data = fetchurl { - url = "http://rowetel.com/downloads/deep/lpcnet_${dataVersion}.tgz"; - sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg="; - }; -in -stdenv.mkDerivation { - pname = "lpcnetfreedv"; - version = "0.5-unstable-2025-01-19"; - - src = fetchFromGitHub { - owner = "drowe67"; - repo = "LPCNet"; - rev = "c8e51ac5e2fe674849cb53e7da44689b572cc246"; - sha256 = "sha256-0Knoym+deTuFAyJrrD55MijVh6DlhJp3lss66BJUHiA="; - }; - - nativeBuildInputs = [ cmake ]; - - patches = [ - # extracted from https://github.com/drowe67/LPCNet/pull/59 - ./darwin.patch - ]; - - postPatch = '' - mkdir build - ln -s ${data} build/lpcnet_${dataVersion}.tgz - ''; - - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; - - meta = { - homepage = "https://freedv.org/"; - description = "Experimental Neural Net speech coding for FreeDV"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ mvs ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/by-name/lp/lprobe/package.nix b/pkgs/by-name/lp/lprobe/package.nix index 0e5ba650733d..2aacf60ec18b 100644 --- a/pkgs/by-name/lp/lprobe/package.nix +++ b/pkgs/by-name/lp/lprobe/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lprobe"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "fivexl"; repo = "lprobe"; tag = "v${version}"; - hash = "sha256-1VoZIZQDEYVQg8cMacpHPRUffu+1+bAt7O3MZSi6+2A="; + hash = "sha256-Cb6jzL/BAhfwvGENLFfphATDz0EjFFT7qeHFiZCrvBk="; }; - vendorHash = "sha256-wrxIHb296YOszgK9GnCTpSHz2kSd89zT/90/CrPely8="; + vendorHash = "sha256-wQrbRch+5srZfQgEz7aacfbUXJfHeDCz52pPrgDFaNg="; buildInputs = [ libpcap diff --git a/pkgs/by-name/lr/lrcalc/package.nix b/pkgs/by-name/lr/lrcalc/package.nix index 9231b3e15684..c682d69ded20 100644 --- a/pkgs/by-name/lr/lrcalc/package.nix +++ b/pkgs/by-name/lr/lrcalc/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Littlewood-Richardson calculator"; homepage = "http://math.rutgers.edu/~asbuch/lrcalc/"; license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix index 1bf3282df317..0fdc42ec23dd 100644 --- a/pkgs/by-name/lr/lrcget/package.nix +++ b/pkgs/by-name/lr/lrcget/package.nix @@ -1,21 +1,25 @@ { - dbus, - openssl, - gtk3, - webkitgtk_4_1, - pkg-config, - wrapGAppsHook3, - fetchFromGitHub, - buildNpmPackage, - rustPlatform, lib, stdenv, - copyDesktopItems, - makeDesktopItem, + rustPlatform, + + fetchFromGitHub, + fetchNpmDeps, + + cargo-tauri, + makeBinaryWrapper, + nodejs, + npmHooks, + pkg-config, + wrapGAppsHook3, + alsa-lib, - darwin, + openssl, + webkitgtk_4_1, + nix-update-script, }: + rustPlatform.buildRustPackage rec { pname = "lrcget"; version = "0.9.3"; @@ -23,89 +27,70 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "tranxuanthang"; repo = "lrcget"; - rev = "${version}"; + tag = version; hash = "sha256-3dBjQ1fO1q8JCQFvvV8LWBCD8cKFkFmm8ufC/Xihmj4="; }; - sourceRoot = "${src.name}/src-tauri"; + patches = [ + # needed to not attempt codesigning on darwin + ./remove-signing-identity.patch + ]; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; useFetchCargoVendor = true; cargoHash = "sha256-Nu1N96OrLG/D2/1vbU229jLVNZuKIiCSwDJA25hlqFM="; - frontend = buildNpmPackage { - inherit version src; - pname = "lrcget-ui"; - # FIXME: This is a workaround, because we have a git dependency node_modules/lrc-kit contains install scripts - # but has no lockfile, which is something that will probably break. - forceGitDeps = true; - distPhase = "true"; - dontInstall = true; - # To fix `npm ERR! Your cache folder contains root-owned files` - makeCacheWritable = true; + # FIXME: This is a workaround, because we have a git dependency node_modules/lrc-kit contains install scripts + # but has no lockfile, which is something that will probably break. + forceGitDeps = true; - npmDepsHash = "sha256-N48+C3NNPYg/rOpnRNmkZfZU/ZHp8imrG/tiDaMGsCE="; - - postBuild = '' - cp -r dist/ $out - ''; + npmDeps = fetchNpmDeps { + name = "lrcget-${version}-npm-deps"; + inherit src forceGitDeps; + hash = "sha256-N48+C3NNPYg/rOpnRNmkZfZU/ZHp8imrG/tiDaMGsCE="; }; - # copy the frontend static resources to final build directory - # Also modify tauri.conf.json so that it expects the resources at the new location - postPatch = '' - cp -r $frontend ./frontend - - substituteInPlace tauri.conf.json \ - --replace-fail '"frontendDist": "../dist"' '"frontendDist": "./frontend"' - ''; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - copyDesktopItems - rustPlatform.bindgenHook - ]; - - buildInputs = + nativeBuildInputs = [ - dbus - openssl - gtk3 + cargo-tauri.hook + nodejs + npmHooks.npmConfigHook + rustPlatform.bindgenHook ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - webkitgtk_4_1 - alsa-lib + pkg-config + wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreAudio - darwin.apple_sdk.frameworks.WebKit + makeBinaryWrapper ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + alsa-lib + openssl + webkitgtk_4_1 + ]; + + # To fix `npm ERR! Your cache folder contains root-owned files` + makeCacheWritable = true; + # Disable checkPhase, since the project doesn't contain tests doCheck = false; - postInstall = '' - install -DT icons/128x128@2x.png $out/share/icons/hicolor/128x128@2/apps/lrcget.png - install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/lrcget.png - install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/lrcget.png + # make the binary also runnable from the shell + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper "$out/Applications/LRCGET.app/Contents/MacOS/LRCGET" "$out/bin/LRCGET" ''; - # WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079 - postFixup = '' - wrapProgram "$out/bin/lrcget" \ + preFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + gappsWrapperArgs+=( + # WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079 --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ) ''; - desktopItems = [ - (makeDesktopItem { - name = "LRCGET"; - exec = "lrcget"; - icon = "lrcget"; - desktopName = "LRCGET"; - comment = meta.description; - }) - ]; - passthru.updateScript = nix-update-script { }; meta = { @@ -117,7 +102,7 @@ rustPlatform.buildRustPackage rec { anas Scrumplex ]; - mainProgram = "lrcget"; + mainProgram = "LRCGET"; platforms = with lib.platforms; unix ++ windows; }; } diff --git a/pkgs/by-name/lr/lrcget/remove-signing-identity.patch b/pkgs/by-name/lr/lrcget/remove-signing-identity.patch new file mode 100644 index 000000000000..eeb7944546d9 --- /dev/null +++ b/pkgs/by-name/lr/lrcget/remove-signing-identity.patch @@ -0,0 +1,13 @@ +diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json +index 92d43e7..6519fd0 100644 +--- a/src-tauri/tauri.conf.json ++++ b/src-tauri/tauri.conf.json +@@ -36,7 +36,7 @@ + "exceptionDomain": "", + "frameworks": [], + "providerShortName": null, +- "signingIdentity": "-" ++ "signingIdentity": null + }, + "resources": [], + "shortDescription": "Utility for mass-downloading LRC synced lyrics for your offline music library.", diff --git a/pkgs/by-name/ls/lsp-ai/package.nix b/pkgs/by-name/ls/lsp-ai/package.nix index 5324d1e13240..9c19652d5323 100644 --- a/pkgs/by-name/ls/lsp-ai/package.nix +++ b/pkgs/by-name/ls/lsp-ai/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, pkg-config, cmake, openssl, @@ -58,15 +56,10 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + openssl + zlib + ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/by-name/ls/lsr/deps.nix b/pkgs/by-name/ls/lsr/deps.nix new file mode 100644 index 000000000000..95585b248791 --- /dev/null +++ b/pkgs/by-name/ls/lsr/deps.nix @@ -0,0 +1,42 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ + linkFarm, + fetchzip, + fetchgit, +}: + +linkFarm "zig-packages" [ + { + name = "ourio-0.0.0-_s-z0asOAgAhpi7gSpLLvWGj_4XURez4W9TWN6SGs5BP"; + path = fetchgit { + url = "https://github.com/rockorager/ourio"; + rev = "54c1a1ed8d0994636770e5185ecdb59fe6d8535e"; + hash = "sha256-WnNfO51t3Qc5LmeDOB6MVrsaUWR41mGuwbO5t5sCtwE="; + }; + } + { + name = "tls-0.1.0-ER2e0pU3BQB-UD2_s90uvppceH_h4KZxtHCrCct8L054"; + path = fetchgit { + url = "https://github.com/ianic/tls.zig"; + rev = "8250aa9184fbad99983b32411bbe1a5d2fd6f4b7"; + hash = "sha256-EDK4L/K58V7sepDphjdxkJSGw9yQktuk8wd76c473wY="; + }; + } + { + name = "zeit-0.6.0-5I6bk1J1AgA13rteb6E0steXiOUKBYTzJZMMIuK9oEmb"; + path = fetchgit { + url = "https://github.com/rockorager/zeit"; + rev = "4496d1c40b2223c22a1341e175fc2ecd94cc0de9"; + hash = "sha256-To+8CLfKhRBgYnnlBKM+TD041wJ+jBpRZGFrghHaxTk="; + }; + } + { + name = "zzdoc-0.0.0-tzT1PuPZAACr1jIJxjTrdOsLbfXS6idWFGfTq0gwxJiv"; + path = fetchgit { + url = "https://github.com/rockorager/zzdoc"; + rev = "57e86eb4e621bc4a96fbe0dd89ad0986db6d0483"; + hash = "sha256-PAGgJCA/B3eSarTNbXB6ENwHNPiHq+wX/n6Rh2s8Pvk="; + }; + } +] diff --git a/pkgs/by-name/ls/lsr/package.nix b/pkgs/by-name/ls/lsr/package.nix new file mode 100644 index 000000000000..798602921cc0 --- /dev/null +++ b/pkgs/by-name/ls/lsr/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + installShellFiles, + fetchgit, + zig_0_14, + callPackage, + versionCheckHook, +}: + +let + zig = zig_0_14; +in +stdenv.mkDerivation (finalAttrs: { + pname = "lsr"; + version = "0.2.0"; + + src = fetchgit { + url = "https://tangled.sh/@rockorager.dev/lsr"; + rev = "v${finalAttrs.version}"; + sparseCheckout = [ + "src" + "docs" + ]; + hash = "sha256-+5VHY02AHFtV405OGk5PR/2tl/3qDQHDrOUghZbx5ks="; + }; + + postPatch = '' + ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ''; + + nativeBuildInputs = [ + installShellFiles + zig.hook + ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + meta = { + homepage = "https://tangled.sh/@rockorager.dev/lsr"; + description = "ls but with io_uring"; + changelog = "https://tangled.sh/@rockorager.dev/lsr/tags"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ddogfoodd ]; + platforms = lib.platforms.linux; + mainProgram = "lsr"; + }; +}) diff --git a/pkgs/by-name/ls/lswt/package.nix b/pkgs/by-name/ls/lswt/package.nix index 1bd9c04df8f3..d69a7b509f43 100644 --- a/pkgs/by-name/ls/lswt/package.nix +++ b/pkgs/by-name/ls/lswt/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromSourcehut, + fetchpatch, wayland-scanner, wayland, }: @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { hash = "sha256-8jP6I2zsDt57STtuq4F9mcsckrjvaCE5lavqKTjhNT0="; }; + patches = [ + # Subject: [PATCH] fix JSON formatting of identifier string + (fetchpatch { + url = "https://git.sr.ht/~leon_plickat/lswt/commit/d35786da4383388c19f5437128fd393a6f16f74f.patch"; + hash = "sha256-3RTq8BXRR7MgKV0BueoOjPORMrYVAKNbKR74hZ75W/Y="; + }) + ]; + nativeBuildInputs = [ wayland-scanner ]; buildInputs = [ wayland ]; diff --git a/pkgs/by-name/lt/ltex-ls-plus/package.nix b/pkgs/by-name/lt/ltex-ls-plus/package.nix index 6bb2bccebb20..b187cd1a16c5 100644 --- a/pkgs/by-name/lt/ltex-ls-plus/package.nix +++ b/pkgs/by-name/lt/ltex-ls-plus/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "ltex-ls-plus"; - version = "18.4.0"; + version = "18.5.1"; src = fetchurl { url = "https://github.com/ltex-plus/ltex-ls-plus/releases/download/${version}/ltex-ls-plus-${version}.tar.gz"; - sha256 = "sha256-BkVPLtyF62keDDEnET8zF7g0FqDz6UkDWI6BM8W2qMQ="; + sha256 = "sha256-kSs/0Hi9G5l632+dqxGhlvMJCizzKFY/dq7UyAr3uss="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/lt/ltris/package.nix b/pkgs/by-name/lt/ltris/package.nix index 8e0f4ba3cd5f..3c31f4ecc819 100644 --- a/pkgs/by-name/lt/ltris/package.nix +++ b/pkgs/by-name/lt/ltris/package.nix @@ -1,24 +1,28 @@ { lib, - SDL, - SDL_mixer, + sdl2-compat, + SDL2_mixer, + SDL2_image, + SDL2_ttf, directoryListingUpdater, fetchurl, stdenv, }: stdenv.mkDerivation (finalAttrs: { - pname = "lgames-ltris"; - version = "1.2.8"; + pname = "ltris"; + version = "2.0.3"; src = fetchurl { - url = "mirror://sourceforge/lgames/ltris-${finalAttrs.version}.tar.gz"; - hash = "sha256-2e5haaU2pqkBk82qiF/3HQgSBVPHP09UwW+TQqpGUqA="; + url = "mirror://sourceforge/lgames/ltris2-${finalAttrs.version}.tar.gz"; + hash = "sha256-+w8WTASYj/AWcBg9W3dmZ0cyCmlZNhDZ0l/WwhRfJRk="; }; buildInputs = [ - SDL - SDL_mixer + sdl2-compat + SDL2_mixer + SDL2_image + SDL2_ttf ]; hardeningDisable = [ "format" ]; @@ -32,10 +36,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://lgames.sourceforge.io/LTris/"; description = "Tetris clone from the LGames series"; - license = with lib.licenses; [ gpl2Plus ]; - mainProgram = "ltris"; - maintainers = with lib.maintainers; [ ]; - inherit (SDL.meta) platforms; + license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "ltris2"; + maintainers = with lib.maintainers; [ marcin-serwin ]; + platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/lt/lttng-tools/package.nix b/pkgs/by-name/lt/lttng-tools/package.nix index 03e6a16134e2..445f47be4e96 100644 --- a/pkgs/by-name/lt/lttng-tools/package.nix +++ b/pkgs/by-name/lt/lttng-tools/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.14"; + version = "2.13.15"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-U733xK0H2/5mDuTZr/xj/kSuWemnPG96luD8oUDlrcs="; + sha256 = "sha256-lupCNR7hEsGdrZ/ceq6TtYPZ8XIrIXVmSjgdLTN3A8Q="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/lt/lttng-ust/package.nix b/pkgs/by-name/lt/lttng-ust/package.nix new file mode 100644 index 000000000000..4b5cb17a9c7f --- /dev/null +++ b/pkgs/by-name/lt/lttng-ust/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + liburcu, + numactl, + python3, +}: + +# NOTE: +# ./configure ... +# [...] +# LTTng-UST will be built with the following options: +# +# Java support (JNI): Disabled +# sdt.h integration: Disabled +# [...] +# +# Debian builds with std.h (systemtap). + +stdenv.mkDerivation rec { + pname = "lttng-ust"; + version = "2.13.8"; + + src = fetchurl { + url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; + sha256 = "sha256-1O+Y2rmjetT1JMyv39UK9PJmA5tSjdWvq8545JAk2Tc="; + }; + + outputs = [ + "bin" + "out" + "dev" + "devdoc" + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + numactl + python3 + ]; + + preConfigure = '' + patchShebangs . + ''; + + hardeningDisable = [ "trivialautovarinit" ]; + + configureFlags = [ "--disable-examples" ]; + + propagatedBuildInputs = [ liburcu ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "LTTng Userspace Tracer libraries"; + mainProgram = "lttng-gen-tp"; + homepage = "https://lttng.org/"; + license = with licenses; [ + lgpl21Only + gpl2Only + mit + ]; + platforms = lib.intersectLists platforms.linux liburcu.meta.platforms; + maintainers = [ maintainers.bjornfor ]; + }; + +} diff --git a/pkgs/by-name/lt/lttng-ust_2_12/package.nix b/pkgs/by-name/lt/lttng-ust_2_12/package.nix new file mode 100644 index 000000000000..9a2b2579911b --- /dev/null +++ b/pkgs/by-name/lt/lttng-ust_2_12/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + liburcu, + numactl, + python3, +}: + +# NOTE: +# ./configure ... +# [...] +# LTTng-UST will be built with the following options: +# +# Java support (JNI): Disabled +# sdt.h integration: Disabled +# [...] +# +# Debian builds with std.h (systemtap). + +stdenv.mkDerivation rec { + pname = "lttng-ust"; + version = "2.12.2"; + + src = fetchurl { + url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; + sha256 = "sha256-vNDwZLbKiMcthOdg6sNHKuXIKEEcY0Q1kivun841n8c="; + }; + + outputs = [ + "bin" + "out" + "dev" + "devdoc" + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + numactl + python3 + ]; + + preConfigure = '' + patchShebangs . + ''; + + hardeningDisable = [ "trivialautovarinit" ]; + + configureFlags = [ "--disable-examples" ]; + + propagatedBuildInputs = [ liburcu ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "LTTng Userspace Tracer libraries"; + mainProgram = "lttng-gen-tp"; + homepage = "https://lttng.org/"; + license = with licenses; [ + lgpl21Only + gpl2Only + mit + ]; + platforms = lib.intersectLists platforms.linux liburcu.meta.platforms; + maintainers = [ maintainers.bjornfor ]; + }; + +} diff --git a/pkgs/by-name/lt/ltwheelconf/package.nix b/pkgs/by-name/lt/ltwheelconf/package.nix deleted file mode 100644 index fef9f7445b81..000000000000 --- a/pkgs/by-name/lt/ltwheelconf/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenv, - libusb1, - pkg-config, - fetchFromGitHub, -}: - -stdenv.mkDerivation { - pname = "ltwheelconf"; - version = "0.2.7"; - - src = fetchFromGitHub { - owner = "thk"; - repo = "ltwheelconf"; - rev = "df55451f059d593b0259431662612ab5c2bef859"; - sha256 = "1fsz7k73yln987gcx1jvb5irxfbp1x2c457a60a8yap27nkp5y2w"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; - - installPhase = '' - mkdir -p $out/bin - cp ltwheelconf $out/bin - ''; - - meta = with lib; { - homepage = "https://github.com/thk/LTWheelConf"; - description = "Logitech wheels configuration tool"; - license = licenses.gpl3; - maintainers = [ maintainers.ebzzry ]; - platforms = platforms.linux; - mainProgram = "ltwheelconf"; - }; -} diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index 923b0a1fc417..b9b97d323603 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.13.9"; + version = "3.14.0"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; tag = finalAttrs.version; - hash = "sha256-zttTtMAeBsHBqgDm3CAvp54Tp2bfQUhk5/lKgKWUeJY="; + hash = "sha256-+pxDCjBcNYpSGZJpwJhL/PsARNhqdIXRHKj9DQvOyLE="; fetchSubmodules = true; }; @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/lu/luakit/package.nix b/pkgs/by-name/lu/luakit/package.nix index 7222f712b1dd..49b42cfd826a 100644 --- a/pkgs/by-name/lu/luakit/package.nix +++ b/pkgs/by-name/lu/luakit/package.nix @@ -10,22 +10,21 @@ pkg-config, sqlite, stdenv, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, }: - let inherit (luajitPackages) luafilesystem; in stdenv.mkDerivation (finalAttrs: { pname = "luakit"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "luakit"; repo = "luakit"; rev = finalAttrs.version; - hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo="; + hash = "sha256-6OPcGwWQyP+xWVKGjwEfE8Xnf1gcwwbO+FbvA1x0c8M="; }; nativeBuildInputs = [ @@ -41,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 luafilesystem sqlite - webkitgtk_4_0 + webkitgtk_4_1 ] ++ (with gst_all_1; [ gst-libav @@ -65,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "DEVELOPMENT_PATHS=0" "USE_LUAJIT=1" + "LUA_BIN_NAME=luajit" "INSTALLDIR=${placeholder "out"}" "PREFIX=${placeholder "out"}" "USE_GTK3=1" @@ -95,7 +95,9 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Only; mainProgram = "luakit"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ + griffi-gh + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index ee275ba8ad1b..ba6f24bbf5bf 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -31,7 +31,6 @@ libiconv, ninja, prometheus-cpp, - darwin, buildClient ? true, buildServer ? true, SDL2, @@ -109,11 +108,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.frameworks.OpenAL - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Kernel ] ++ lib.optionals buildClient [ libpng diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py index 402f2b0d553e..4aa7ea6b9db0 100755 --- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py +++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py @@ -50,15 +50,16 @@ PKG_LIST = "maintainers/scripts/luarocks-packages.csv" TMP_FILE = "$(mktemp)" GENERATED_NIXFILE = "pkgs/development/lua-modules/generated-packages.nix" -HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! -Regenerate it with: nix run nixpkgs#luarocks-packages-updater -You can customize the generated packages in pkgs/development/lua-modules/overrides.nix +HEADER = """/* + {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! + Regenerate it with: nix run nixpkgs#luarocks-packages-updater + You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ """.format(GENERATED_NIXFILE=GENERATED_NIXFILE) FOOTER = """ } -/* GENERATED - do not edit this file */ +# GENERATED - do not edit this file """ @@ -118,10 +119,16 @@ class LuaEditor(pluginupdate.Editor): with tempfile.NamedTemporaryFile("w+") as f: f.write(HEADER) header2 = textwrap.dedent( - """ - { stdenv, lib, fetchurl, fetchgit, callPackage, ... }: - final: prev: - { + """ + { + stdenv, + lib, + fetchurl, + fetchgit, + callPackage, + ... + }: + final: prev: { """ ) f.write(header2) @@ -136,6 +143,9 @@ class LuaEditor(pluginupdate.Editor): print(f"updated {outfilename}") + # Format the generated file with nix fmt + subprocess.run(["nix", "fmt", outfilename], check=True) + @property def attr_path(self): return "luaPackages" @@ -231,7 +241,8 @@ def generate_pkg_nix(plug: LuaPlugin): log.debug("running %s", " ".join(cmd)) output = subprocess.check_output(cmd, text=True) - output = "callPackage(" + output.strip() + ") {};\n\n" + ## FIXME: luarocks nix command output isn't formatted properly + output = "callPackage(\n" + output.strip() + ") {};\n\n" return (plug, output, None) except subprocess.CalledProcessError as e: log.error("Failed to generate nix expression for %s: %s", plug.name, e) diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix new file mode 100644 index 000000000000..aa43da2dff41 --- /dev/null +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + versionCheckHook, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "luau-lsp"; + version = "1.47.0"; + + src = fetchFromGitHub { + owner = "JohnnyMorganz"; + repo = "luau-lsp"; + tag = finalAttrs.version; + hash = "sha256-/LJCLH94Egk7FvsarsMimIyehE3T9tgMz7SK6vf+BDg="; + fetchSubmodules = true; + }; + + NIX_CFLAGS_COMPILE = "-Wno-error"; + + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeFeature "CMAKE_OSX_ARCHITECTURES" stdenv.hostPlatform.darwinArch) + ]; + + nativeBuildInputs = [ cmake ]; + + buildPhase = '' + runHook preBuild + + cmake --build . --target Luau.LanguageServer.CLI --config Release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -D luau-lsp $out/bin/luau-lsp + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Language Server Implementation for Luau"; + homepage = "https://github.com/JohnnyMorganz/luau-lsp"; + downloadPage = "https://github.com/JohnnyMorganz/luau-lsp/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/JohnnyMorganz/luau-lsp/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + anninzy + HeitorAugustoLN + ]; + mainProgram = "luau-lsp"; + platforms = lib.platforms.all; + badPlatforms = [ + # Could not find a package configuration file provided by "Protobuf" + # It is unclear why this is only happening on x86_64-darwin + "x86_64-darwin" + ]; + }; +}) diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index 5fba70890b06..1f0e4c3e9415 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -3,19 +3,19 @@ stdenv, fetchFromGitHub, cmake, - gitUpdater, llvmPackages, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.666"; + version = "0.674"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; - rev = version; - hash = "sha256-++4PwlCxNq31T0UQUHcvrUnY/ADdnQCtekGiGTPRmv0="; + tag = finalAttrs.version; + hash = "sha256-9HdrwFbjeRwYXVIm6JtqT+HI0ZFJDm9//kvuU25u5Qo="; }; nativeBuildInputs = [ cmake ]; @@ -43,15 +43,18 @@ stdenv.mkDerivation rec { runHook postCheck ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Fast, small, safe, gradually typed embeddable scripting language derived from Lua"; homepage = "https://luau-lang.org/"; - changelog = "https://github.com/luau-lang/luau/releases/tag/${version}"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ ]; + changelog = "https://github.com/luau-lang/luau/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + prince213 + HeitorAugustoLN + ]; mainProgram = "luau"; }; -} +}) diff --git a/pkgs/by-name/lu/lucene/package.nix b/pkgs/by-name/lu/lucene/package.nix deleted file mode 100644 index f49428ba76f9..000000000000 --- a/pkgs/by-name/lu/lucene/package.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - stdenv, - fetchurl, -}: - -stdenv.mkDerivation rec { - pname = "lucene"; - version = "1.4.3"; - - src = fetchurl { - url = "mirror://apache/jakarta/lucene/lucene-${version}.tar.gz"; - sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; - }; - - buildCommand = '' - cp -r . $out/ - ''; - - meta = with lib; { - description = "Java full-text search engine"; - platforms = platforms.unix; - license = licenses.asl20; - }; -} diff --git a/pkgs/by-name/lu/lucky-commit/package.nix b/pkgs/by-name/lu/lucky-commit/package.nix new file mode 100644 index 000000000000..0eddf327835f --- /dev/null +++ b/pkgs/by-name/lu/lucky-commit/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + withOpenCL ? true, + stdenv, + ocl-icd, +}: + +rustPlatform.buildRustPackage rec { + pname = "lucky-commit"; + version = "2.2.5"; + + src = fetchFromGitHub { + owner = "not-an-aardvark"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-pghc2lTI81/z1bPJ6P2bFPyZkM8pko0V7lqv9rUUxWM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-zuWPkaYltxOOLaR6NTVkf1WbKzUQByml45jNL+e5UJ0="; + + buildInputs = lib.optional (withOpenCL && (!stdenv.hostPlatform.isDarwin)) ocl-icd; + + buildNoDefaultFeatures = !withOpenCL; + + # disable tests that require gpu + checkNoDefaultFeatures = true; + + meta = with lib; { + description = "Change the start of your git commit hashes to whatever you want"; + homepage = "https://github.com/not-an-aardvark/lucky-commit"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "lucky_commit"; + }; +} diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix index c616f6c4dce7..fa5a42cbe05f 100644 --- a/pkgs/by-name/lu/ludusavi/package.nix +++ b/pkgs/by-name/lu/ludusavi/package.nix @@ -32,17 +32,17 @@ rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.28.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "mtkennerly"; repo = "ludusavi"; rev = "v${version}"; - hash = "sha256-N2dDi47Z2PifMNlYE6Lk1nHxfpvwoL6h2QkUPthlh4A="; + hash = "sha256-IApPudo8oD6YkYJkGpowqpaqrsl2/Q2VFyYfYQI3mN0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-kKyH+JAydoaPvuhHxkC18Io4CWbyjhVcuu9+CBOvEwg="; + cargoHash = "sha256-ixxUz+XJPzPu51sxHpXs92Tis2gj9SElqYtNiN+n2EY="; dontWrapGApps = true; diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix index 5e0e8dc152b4..92ca76d081d6 100644 --- a/pkgs/by-name/lu/lug-helper/package.nix +++ b/pkgs/by-name/lu/lug-helper/package.nix @@ -15,12 +15,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { name = "lug-helper"; - version = "3.7"; + version = "3.9"; src = fetchFromGitHub { owner = "starcitizen-lug"; repo = "lug-helper"; tag = "v${finalAttrs.version}"; - hash = "sha256-2z8Le65DQk121jTM3UP25V3Xzq+KUve5XJQmNaQ2IGg="; + hash = "sha256-Fne0esV/1o+f4Fnn8oeUL+gc29d0ndGpYG21YQvZDvM="; }; buildInputs = [ diff --git a/pkgs/by-name/lu/luminance/package.nix b/pkgs/by-name/lu/luminance/package.nix index f885fbe7f653..e9b85e10182d 100644 --- a/pkgs/by-name/lu/luminance/package.nix +++ b/pkgs/by-name/lu/luminance/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, gtk4, installShellFiles, + wrapGAppsHook4, libadwaita, nix-update-script, pkg-config, @@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles pkg-config + wrapGAppsHook4 ]; buildInputs = [ @@ -56,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 install_files/com.sidevesh.Luminance.desktop -t $out/share/applications install -Dm644 install_files/com.sidevesh.Luminance.gschema.xml -t $out/share/glib-2.0/schemas + glib-compile-schemas $out/share/glib-2.0/schemas + mv icons $out/share/icons rm $out/share/icons/com.sidevesh.luminance.Source.svg ''; diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix index 45ec1adafefe..10934f444862 100644 --- a/pkgs/by-name/lu/lunacy/package.nix +++ b/pkgs/by-name/lu/lunacy/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lunacy"; - version = "11.2.1"; + version = "11.4"; src = fetchurl { url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb"; - hash = "sha256-h2Fs14dcVG7nM0ubMc75+AI/iW/P4bzdd+lfFRrO4TI="; + hash = "sha256-YDKSaKYS98Y4FR+fU3++8A/PB3X9TtZhuSYqM250Ibo="; }; buildInputs = [ diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 121738051f9e..ef997de10d60 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.3.6"; + version = "3.3.7"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-OqgyEIjg72MDHu3mjWmmK2j7Mapk9Hd8TI7G6xXw8yMzT5w710Ny99ALy/k55p/3cknLI84i0GkQJpDy2HAJxQ=="; + hash = "sha512-YnNqFuRRaRnVqNlD1VaWbx1TaTpD851altu9YamXX0q2ZohtGzB7lzE2xhllbS61E71jSUDasLUlbyyVqGTrJw=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/lu/lunasvg/package.nix b/pkgs/by-name/lu/lunasvg/package.nix new file mode 100644 index 000000000000..605d6dafc0d1 --- /dev/null +++ b/pkgs/by-name/lu/lunasvg/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + plutovg, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "lunasvg"; + version = "3.2.1"; + + src = fetchFromGitHub { + owner = "sammycage"; + repo = "lunasvg"; + tag = "v${finalAttrs.version}"; + hash = "sha256-CBhz117Y8e7AdD1JJtNkR/EthsfyiQ05HW41beaY95I="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + plutovg + ]; + + patches = [ + # https://github.com/sammycage/lunasvg/pull/219 + # can be removed when the PR 219 and a new release is created + ./use_system_plutovg.patch + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_PLUTOVG" true) + ]; + + meta = { + homepage = "https://github.com/sammycage/lunasvg"; + changelog = "https://github.com/sammycage/lunasvg/releases/tag/v${finalAttrs.version}"; + description = "SVG rendering and manipulation library in C++"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.eymeric ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/lu/lunasvg/use_system_plutovg.patch b/pkgs/by-name/lu/lunasvg/use_system_plutovg.patch new file mode 100644 index 000000000000..b2e56f7866dd --- /dev/null +++ b/pkgs/by-name/lu/lunasvg/use_system_plutovg.patch @@ -0,0 +1,47 @@ +From 18d25de94046ed8223fe8987ca55b44f8b5f902c Mon Sep 17 00:00:00 2001 +From: eymeric +Date: Tue, 15 Apr 2025 22:16:50 +0200 +Subject: [PATCH] Refactor CMakeLists.txt to conditionally use system plutovg + library + +--- + CMakeLists.txt | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 08cee28..9724827 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,8 +6,17 @@ set(LUNASVG_VERSION_MICRO 1) + + project(lunasvg LANGUAGES CXX VERSION ${LUNASVG_VERSION_MAJOR}.${LUNASVG_VERSION_MINOR}.${LUNASVG_VERSION_MICRO}) + +-find_package(plutovg 0.0.4 QUIET) ++option(USE_SYSTEM_PLUTOVG "Use system plutovg library" OFF) ++ ++if(USE_SYSTEM_PLUTOVG) ++ find_package(plutovg 1.0.0 QUIET) ++ if(NOT plutovg_FOUND) ++ message(WARNING "Could not find: plutovg>=1.0.0. Falling back to plutovg submodule.") ++ endif() ++endif() ++ + if(NOT plutovg_FOUND) ++ message(STATUS "Using plutovg submodule.") + add_subdirectory(plutovg) + endif() + +@@ -57,7 +66,12 @@ target_include_directories(lunasvg PUBLIC + $ + ) + +-target_link_libraries(lunasvg PRIVATE plutovg::plutovg) ++if(USE_SYSTEM_PLUTOVG AND plutovg_FOUND) ++ target_link_libraries(lunasvg PRIVATE plutovg::plutovg) ++else() ++ target_link_libraries(lunasvg PRIVATE plutovg) ++endif() ++ + target_compile_definitions(lunasvg PRIVATE LUNASVG_BUILD) + if(NOT BUILD_SHARED_LIBS) + target_compile_definitions(lunasvg PUBLIC LUNASVG_BUILD_STATIC) diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index 412385bf625e..acc3b4c5eb78 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -6,12 +6,12 @@ }: let - version = "2.0.19"; + version = "2.0.22"; pname = "lunatask"; src = fetchurl { url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage"; - hash = "sha256-JJyGpVak0bBouvFduD5mWna0QlUwQ898HGdnL7fGvPA="; + hash = "sha256-5V4h7x9NMZPAEinWmvhcBj8WrtKXp7naacSaMOEzwl0="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/lu/lunatic/package.nix b/pkgs/by-name/lu/lunatic/package.nix index ac508ee88afc..eace661ef36c 100644 --- a/pkgs/by-name/lu/lunatic/package.nix +++ b/pkgs/by-name/lu/lunatic/package.nix @@ -4,45 +4,45 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, + unstableGitUpdater, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "lunatic"; - version = "0.13.2"; + version = "0.13.2-unstable-2025-03-29"; src = fetchFromGitHub { owner = "lunatic-solutions"; repo = "lunatic"; - rev = "v${version}"; - hash = "sha256-uMMssZaPDZn3bOtQIho+GvUCPmzRllv7eJ+SJuKaYtg="; + rev = "28a2f387ebf6a64ce4b87e2638812e2c032d5049"; + hash = "sha256-FnUYnSWarQf68jBfSlIKVZbQHJt5U93MvA6rbNJE23U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SzfM4hQW9vTTRqCAEn/EPv9mK9WlXYRFUW8pA/Gfw04="; + cargoHash = "sha256-+2koGrhM9VMLh8uO1YcaugcfmZaCP4S2twKem+y2oks="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; checkFlags = [ # requires simd support which is not always available on hydra "--skip=state::tests::import_filter_signature_matches" ]; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + branch = "main"; + }; + meta = with lib; { description = "Erlang inspired runtime for WebAssembly"; homepage = "https://lunatic.solutions"; - changelog = "https://github.com/lunatic-solutions/lunatic/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/lunatic-solutions/lunatic/blob/main/CHANGELOG.md"; license = with licenses; [ mit # or asl20 diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix index 4d096143fbfc..011a65ce898f 100644 --- a/pkgs/by-name/lu/lutgen/package.nix +++ b/pkgs/by-name/lu/lutgen/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "lutgen"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "ozwaldorf"; repo = "lutgen-rs"; rev = "v${version}"; - hash = "sha256-jmMVeDDVb/TuxulDYj+8y4Kl42EJTAWb3tAsanfWduE="; + hash = "sha256-VE4R0rdQbZ7cyCPRtWWARUAnlR/KWGFUoJSJ4lySwzY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-BEh8Wl0X1wv53w/Zu0PHwh8oGtCvIJe60aVqLbiH1Hs="; + cargoHash = "sha256-H913/EjCh14AcCIj/Em6neP5F6i88rSVbPMmnS3po/I="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix new file mode 100644 index 000000000000..7f5a78e1cfb0 --- /dev/null +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -0,0 +1,84 @@ +{ + gnupg, + gpgme, + installShellFiles, + lib, + libgit2, + libgpg-error, + luaPackages, + luajit, + makeWrapper, + nix, + openssl, + pkg-config, + rustPlatform, + versionCheckHook, +}: +rustPlatform.buildRustPackage rec { + pname = "lux-cli"; + + version = "0.5.0"; + + src = luaPackages.lux-lua.src; + + buildAndTestSubdir = "lux-cli"; + useFetchCargoVendor = true; + cargoHash = luaPackages.lux-lua.cargoHash; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + ]; + + buildInputs = [ + gnupg + gpgme + libgit2 + libgpg-error + luajit + openssl + ]; + + env = { + LIBGIT2_NO_VENDOR = 1; + LIBSSH2_SYS_USE_PKG_CONFIG = 1; + LUX_SKIP_IMPURE_TESTS = 1; # Disable impure unit tests + }; + + cargoTestFlags = "--lib"; # Disable impure integration tests + + nativeCheckInputs = [ + luajit + nix + ]; + + postBuild = '' + cargo xtask dist-man + cargo xtask dist-completions + ''; + + meta = { + description = "Luxurious package manager for Lua"; + longDescription = '' + A modern package manager for Lua. + compatible with luarocks.org and the Rockspec specification, + with first-class support for Nix and Neovim. + ''; + homepage = "https://nvim-neorocks.github.io/"; + changelog = "https://github.com/nvim-neorocks/lux/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + mrcjkb + ]; + platforms = lib.platforms.all; + mainProgram = "lx"; + }; +} diff --git a/pkgs/by-name/lx/lx-music-desktop/electron-builder.patch b/pkgs/by-name/lx/lx-music-desktop/electron-builder.patch new file mode 100644 index 000000000000..fcb90f89cd2b --- /dev/null +++ b/pkgs/by-name/lx/lx-music-desktop/electron-builder.patch @@ -0,0 +1,23 @@ +diff --git a/build-config/build-pack.js b/build-config/build-pack.js +index 569252c..ccaef34 100644 +--- a/build-config/build-pack.js ++++ b/build-config/build-pack.js +@@ -1,7 +1,5 @@ + /* eslint-disable no-template-curly-in-string */ +- + const builder = require('electron-builder') +-const beforePack = require('./build-before-pack') + const afterPack = require('./build-after-pack') + + /** +@@ -11,8 +9,9 @@ const afterPack = require('./build-after-pack') + const options = { + appId: 'cn.toside.music.desktop', + productName: 'lx-music-desktop', +- beforePack, + afterPack, ++ electronVersion: "@electron_version@", ++ electronDist: "./electron-dist", + protocols: { + name: 'lx-music-protocol', + schemes: [ diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index 138564e76548..6be8e51cc2d2 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -1,93 +1,98 @@ { lib, stdenv, - fetchurl, + buildNpmPackage, + + fetchFromGitHub, + replaceVars, + makeWrapper, - dpkg, - libGL, - systemd, - electron_32, - + electron_34, commandLineArgs ? "", }: let + # if we want to use later electron, we'll need to bump the `node-abi` npm package version + electron = electron_34; +in +buildNpmPackage rec { pname = "lx-music-desktop"; - version = "2.10.0"; + version = "2.11.0"; - buildUrl = - version: arch: - "https://github.com/lyswhut/lx-music-desktop/releases/download/v${version}/lx-music-desktop_${version}_${arch}.deb"; - - srcs = { - x86_64-linux = fetchurl { - url = buildUrl version "amd64"; - hash = "sha256-btNB8XFCJij1wUVZoWaa55vZn5n1gsKSMnEbQPTd9lg="; - }; - - aarch64-linux = fetchurl { - url = buildUrl version "arm64"; - hash = "sha256-GVTzxTV7bM4AWZ+Xfb70fyedDMIa9eX/YwnGkm3WOsk="; - }; - - armv7l-linux = fetchurl { - url = buildUrl version "armv7l"; - hash = "sha256-3zttIk+A4BpG0W196LzgTJ5WeqWvLjqPFz6e9RCGlJo="; - }; + src = fetchFromGitHub { + owner = "lyswhut"; + repo = "lx-music-desktop"; + tag = "v${version}"; + hash = "sha256-NMj8rb5PAejT1HCE5nxi2+SS9lFUVdLEqN0id23QjVc="; }; - host = stdenv.hostPlatform.system; - src = srcs.${host} or (throw "Unsupported system: ${host}"); - - runtimeLibs = lib.makeLibraryPath [ - libGL - stdenv.cc.cc + patches = [ + # set electron version and dist dir + # disable before-pack: it would copy prebuilt libraries + (replaceVars ./electron-builder.patch { + electron_version = electron.version; + }) ]; -in -stdenv.mkDerivation { - inherit pname version src; nativeBuildInputs = [ - dpkg makeWrapper ]; - runtimeDependencies = map lib.getLib [ - systemd - ]; + npmDepsHash = "sha256-cA9NdHe3lEg8twMLWoeomWgobidZ34TKwdC5rDezZ5g="; + + makeCacheWritable = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + # we haven't set up npm_config_nodedir at this point + # and electron-rebuild will rebuild the native libs later anyway + npmFlags = [ "--ignore-scripts" ]; + + preBuild = '' + # delete prebuilt libs + rm -r build-config/lib + + # don't spam the build logs + substituteInPlace build-config/pack.js \ + --replace-fail 'new Spinnies({' 'new Spinnies({disableSpins:true,' + + # this directory is configured to be used in the patch + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + export npm_config_nodedir=${electron.headers} + export npm_config_build_from_source="true" + + npm rebuild --no-progress --verbose + ''; + + npmBuildScript = "pack:dir"; installPhase = '' runHook preInstall - mkdir -p $out/bin $out/opt/lx-music-desktop - cp -r opt/lx-music-desktop/{resources,locales} $out/opt/lx-music-desktop - cp -r usr/share $out/share - - substituteInPlace $out/share/applications/lx-music-desktop.desktop \ - --replace-fail "/opt/lx-music-desktop/lx-music-desktop" "$out/bin/lx-music-desktop" \ + mkdir -p "$out/opt/lx-music-desktop" + cp -r build/*-unpacked/{locales,resources{,.pak}} "$out/opt/lx-music-desktop" + rm "$out/opt/lx-music-desktop/resources/app-update.yml" runHook postInstall ''; postFixup = '' - makeWrapper ${electron_32}/bin/electron $out/bin/lx-music-desktop \ + makeWrapper ${lib.getExe electron} $out/bin/lx-music-desktop \ --add-flags $out/opt/lx-music-desktop/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} \ + --add-flags ${lib.escapeShellArg commandLineArgs} ''; meta = with lib; { + broken = stdenv.hostPlatform.isDarwin; description = "Music software based on Electron and Vue"; homepage = "https://github.com/lyswhut/lx-music-desktop"; changelog = "https://github.com/lyswhut/lx-music-desktop/releases/tag/v${version}"; license = licenses.asl20; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "armv7l-linux" - ]; + platforms = electron.meta.platforms; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "lx-music-desktop"; maintainers = with maintainers; [ oosquare ]; diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix index 6398ec6093a2..5c14f5f64172 100644 --- a/pkgs/by-name/lx/lxc/package.nix +++ b/pkgs/by-name/lx/lxc/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxc"; - version = "6.0.3"; + version = "6.0.4"; src = fetchFromGitHub { owner = "lxc"; repo = "lxc"; tag = "v${finalAttrs.version}"; - hash = "sha256-h41lcHGjJmIH28XRpM0gdFsOQOCLSWevSLfvQ7gIf7Q="; + hash = "sha256-zmL568PprrpIWTVCkScXHEzTZ+NduSH4r8ETnz4NY64="; }; nativeBuildInputs = [ @@ -115,6 +115,6 @@ stdenv.mkDerivation (finalAttrs: { ''; platforms = lib.platforms.linux; - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; }; }) diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix index 966d93df2ac8..e62bf4aa2f3e 100644 --- a/pkgs/by-name/lx/lxcfs/package.nix +++ b/pkgs/by-name/lx/lxcfs/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxcfs"; - version = "6.0.3"; + version = "6.0.4"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; - rev = "v${version}"; - hash = "sha256-+Xlx1E6ggB/Vx3yOJGgh4UfEvaVyT7uOttaxelDA7Iw="; + tag = "v${version}"; + hash = "sha256-jmadClC/3nHfNL+F/gC5NM6u03OE9flEVtPU28nylw4="; }; patches = [ @@ -59,6 +59,13 @@ stdenv.mkDerivation rec { util-linux ] } + + # requires access to sleep + wrapProgram "$out/share/lxcfs/lxc.reboot.hook" --prefix PATH : ${ + lib.makeBinPath [ + coreutils + ] + } ''; postFixup = '' @@ -81,6 +88,6 @@ stdenv.mkDerivation rec { changelog = "https://linuxcontainers.org/lxcfs/news/"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; }; } diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index 99678ed26fc5..efd0e0187b7b 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.216.1"; + version = "1.216.2"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-wwsCGSZy/WB7QBbRams06DGA6oypsPKTN0TGYlX3jQM="; + hash = "sha256-fRg0JhN3VxO2si5yuN//SddgiA/A5D7AHkCXhQuI0SA="; }; dontUnpack = true; diff --git a/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch b/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch deleted file mode 100644 index 57c58ac9255f..000000000000 --- a/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/lxterminal.c b/src/lxterminal.c -index 015f5e4..32e3b68 100644 ---- a/src/lxterminal.c -+++ b/src/lxterminal.c -@@ -1210,6 +1210,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); - ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0); - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); -+ vte_regex_unref(dingus1); -+ vte_regex_unref(dingus2); - #else - GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL); - GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL); -@@ -1217,9 +1219,9 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); - ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0); - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); --#endif - g_regex_unref(dingus1); - g_regex_unref(dingus2); -+#endif - - /* Create a horizontal box inside an event box as the toplevel for the tab label. */ - term->tab = gtk_event_box_new(); diff --git a/pkgs/by-name/lx/lxterminal/package.nix b/pkgs/by-name/lx/lxterminal/package.nix index 956d3e3b121a..9fb97945ae4e 100644 --- a/pkgs/by-name/lx/lxterminal/package.nix +++ b/pkgs/by-name/lx/lxterminal/package.nix @@ -18,15 +18,15 @@ pcre2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxterminal"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "lxde"; repo = "lxterminal"; - rev = version; - sha256 = "sha256-bCF/V6yFe4vKqVMOtNlwYyw/ickj1LFuFn4IyypwIg0="; + tag = finalAttrs.version; + sha256 = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U="; }; configureFlags = [ @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { ]; patches = [ - ./fix-gcc14-pr122.patch # manual port of https://github.com/lxde/lxterminal/pull/122 ./respect-xml-catalog-files-var.patch ]; @@ -73,10 +72,10 @@ stdenv.mkDerivation rec { desktop-independent VTE-based terminal emulator for LXDE without any unnecessary dependencies. ''; - homepage = "https://wiki.lxde.org/en/LXTerminal"; - license = lib.licenses.gpl2; + homepage = "https://www.lxde.org/"; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.pbsds ]; platforms = lib.platforms.linux; mainProgram = "lxterminal"; }; -} +}) diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix index 044d22cff5df..91012f6450a2 100644 --- a/pkgs/by-name/ly/LycheeSlicer/package.nix +++ b/pkgs/by-name/ly/LycheeSlicer/package.nix @@ -7,11 +7,11 @@ }: let pname = "LycheeSlicer"; - version = "7.3.1"; + version = "7.3.2"; src = fetchurl { url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage"; - hash = "sha256-21ySVT2Un/WAWxvEAH5GfrumGbsSaeNVjaMsL9mYwsg="; + hash = "sha256-CmN4Q4gTGYeICIoLz0UuVlSyOstXW/yYVb4s1dT5EOc="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/display-managers/ly/deps.nix b/pkgs/by-name/ly/ly/deps.nix similarity index 100% rename from pkgs/applications/display-managers/ly/deps.nix rename to pkgs/by-name/ly/ly/deps.nix diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/by-name/ly/ly/package.nix similarity index 100% rename from pkgs/applications/display-managers/ly/default.nix rename to pkgs/by-name/ly/ly/package.nix diff --git a/pkgs/by-name/ly/lyto/package.nix b/pkgs/by-name/ly/lyto/package.nix new file mode 100644 index 000000000000..387032f53e4c --- /dev/null +++ b/pkgs/by-name/ly/lyto/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "lyto"; + version = "0.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "eeriemyxi"; + repo = "lyto"; + tag = "v${version}"; + hash = "sha256-XCAM7vo4EcbIxFddggeqABru4epE2jW2YpF++I0mpdU="; + }; + + build-system = [ + python3.pkgs.hatchling + ]; + + dependencies = with python3.pkgs; [ + qrcode + rich + sixel + zeroconf + ]; + + pythonImportsCheck = [ + "lyto" + ]; + + meta = { + description = "Automatic wireless ADB connection using QR codes"; + homepage = "https://github.com/eeriemyxi/lyto"; + changelog = "https://github.com/eeriemyxi/lyto/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ atemu ]; + mainProgram = "lyto"; + }; +} diff --git a/pkgs/by-name/m1/m17-cxx-demod/package.nix b/pkgs/by-name/m1/m17-cxx-demod/package.nix index d5d391ecc17e..12d2536526e9 100644 --- a/pkgs/by-name/m1/m17-cxx-demod/package.nix +++ b/pkgs/by-name/m1/m17-cxx-demod/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mobilinkd/m17-cxx-demod"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = teams.c3d2.members; + teams = [ teams.c3d2 ]; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/m1/m17n_db/package.nix b/pkgs/by-name/m1/m17n_db/package.nix index 4109b37a3613..a24093cb4b48 100644 --- a/pkgs/by-name/m1/m17n_db/package.nix +++ b/pkgs/by-name/m1/m17n_db/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "m17n-db"; - version = "1.8.9"; + version = "1.8.10"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/m17n/m17n-db-${version}.tar.gz"; - sha256 = "sha256-SBJUo4CqnGbX9Ow6o3Kn4dL+R/w53252BEvUQBfEJKQ="; + url = "mirror://savannah/m17n/${pname}-${version}.tar.gz"; + hash = "sha256-MQJOBRNTNEi5sx6jKU01pkJuZpDrRGKGgHMaqVXAwWw="; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/by-name/m1/m1ddc/package.nix b/pkgs/by-name/m1/m1ddc/package.nix index cd69a7072e3b..51a2113fa17a 100644 --- a/pkgs/by-name/m1/m1ddc/package.nix +++ b/pkgs/by-name/m1/m1ddc/package.nix @@ -1,6 +1,5 @@ { stdenv, - darwin, fetchFromGitHub, lib, }: @@ -21,11 +20,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail kIOMainPortDefault kIOMasterPortDefault ''; - buildInputs = with darwin.apple_sdk_11_0.frameworks; [ - CoreDisplay - Foundation - ]; - installPhase = '' runHook preInstall mkdir -p $out/bin diff --git a/pkgs/by-name/m2/m2-mesoplanet/package.nix b/pkgs/by-name/m2/m2-mesoplanet/package.nix index b52e0174e153..3e7c625ad31a 100644 --- a/pkgs/by-name/m2/m2-mesoplanet/package.nix +++ b/pkgs/by-name/m2/m2-mesoplanet/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Macro Expander Saving Our m2-PLANET"; homepage = "https://github.com/oriansj/M2-Mesoplanet"; license = licenses.gpl3Only; - maintainers = teams.minimal-bootstrap.members; + teams = [ teams.minimal-bootstrap ]; inherit (m2libc.meta) platforms; mainProgram = "M2-Mesoplanet"; }; diff --git a/pkgs/by-name/m2/m2-planet/package.nix b/pkgs/by-name/m2/m2-planet/package.nix index 73f455091fff..b99706aa786c 100644 --- a/pkgs/by-name/m2/m2-planet/package.nix +++ b/pkgs/by-name/m2/m2-planet/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { description = "PLAtform NEutral Transpiler"; homepage = "https://github.com/oriansj/M2-Planet"; license = licenses.gpl3Only; - maintainers = teams.minimal-bootstrap.members; + teams = [ teams.minimal-bootstrap ]; inherit (m2libc.meta) platforms; mainProgram = "M2-Planet"; }; diff --git a/pkgs/by-name/m2/m2libc/package.nix b/pkgs/by-name/m2/m2libc/package.nix index 084f02db253c..4c3546c7abcc 100644 --- a/pkgs/by-name/m2/m2libc/package.nix +++ b/pkgs/by-name/m2/m2libc/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { description = "More standards compliant C library written in M2-Planet's C subset"; homepage = "https://github.com/oriansj/m2libc"; license = licenses.gpl3Only; - maintainers = teams.minimal-bootstrap.members; + teams = [ teams.minimal-bootstrap ]; platforms = [ "i686-linux" "x86_64-linux" diff --git a/pkgs/by-name/m4/m4ri/package.nix b/pkgs/by-name/m4/m4ri/package.nix index a7d750da16e6..d6e397a18e90 100644 --- a/pkgs/by-name/m4/m4ri/package.nix +++ b/pkgs/by-name/m4/m4ri/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://malb.bitbucket.io/m4ri/"; description = "Library to do fast arithmetic with dense matrices over F_2"; license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/m4/m4rie/package.nix b/pkgs/by-name/m4/m4rie/package.nix index 270638f4d730..9bc3f77d6b74 100644 --- a/pkgs/by-name/m4/m4rie/package.nix +++ b/pkgs/by-name/m4/m4rie/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { It uses the M4RI library, implementing the same operations over the finite field F2. ''; license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/ma/ma/package.nix b/pkgs/by-name/ma/ma/package.nix new file mode 100644 index 000000000000..3a6e00774344 --- /dev/null +++ b/pkgs/by-name/ma/ma/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + tclPackages, + fetchurl, +}: + +stdenv.mkDerivation { + pname = "ma"; + version = "11"; + + src = fetchurl { + url = "https://web.archive.org/web/20250511210225/http://call-with-current-continuation.org/ma/ma.tar.gz"; + hash = "sha256-1UVxXbN2jSNm13BjyoN3jbKtkO3DUEEHaDOC2Ibbxf4="; + }; + + postPatch = '' + substituteInPlace ./build --replace-fail gcc ${lib.getExe stdenv.cc} + ''; + + buildInputs = [ + tclPackages.tk + ]; + + buildPhase = '' + runHook preBuild + ./build + for f in B ma ma-eval; do + substituteInPlace $f --replace-fail \ + 'set exec_prefix ""' "set exec_prefix \"$out/bin/\"" + done + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/bin \ + B awd ma ma-eval plumb pty win + runHook postInstall + ''; + + meta = { + description = "minimalistic variant of the Acme editor"; + homepage = "http://call-with-current-continuation.org/ma/ma.html"; + mainProgram = "ma"; + maintainers = with lib.maintainers; [ ehmry ]; + # Per the README: + # > All of MA's source code is hereby placed in the public domain + license = lib.licenses.publicDomain; + inherit (tclPackages.tk.meta) platforms; + }; +} diff --git a/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/pkgs/by-name/ma/maa-assistant-arknights/package.nix index 32d43f3d05b1..947626dd46a9 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/package.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/package.nix @@ -3,7 +3,6 @@ config, callPackage, stdenv, - overrideSDK, fetchFromGitHub, asio, cmake, @@ -19,72 +18,70 @@ let fastdeploy = callPackage ./fastdeploy-ppocr.nix { }; sources = lib.importJSON ./pin.json; in -# https://github.com/NixOS/nixpkgs/issues/314160 -(if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv).mkDerivation - (finalAttr: { - pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta"; - version = if isBeta then sources.beta.version else sources.stable.version; +stdenv.mkDerivation (finalAttr: { + pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta"; + version = if isBeta then sources.beta.version else sources.stable.version; - src = fetchFromGitHub { - owner = "MaaAssistantArknights"; - repo = "MaaAssistantArknights"; - rev = "v${finalAttr.version}"; - hash = if isBeta then sources.beta.hash else sources.stable.hash; - }; + src = fetchFromGitHub { + owner = "MaaAssistantArknights"; + repo = "MaaAssistantArknights"; + rev = "v${finalAttr.version}"; + hash = if isBeta then sources.beta.hash else sources.stable.hash; + }; - nativeBuildInputs = [ - asio - cmake - fastdeploy.cmake - ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + nativeBuildInputs = [ + asio + cmake + fastdeploy.cmake + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; - buildInputs = + buildInputs = + [ + fastdeploy + libcpr + onnxruntime + opencv + ] + ++ lib.optionals cudaSupport ( + with cudaPackages; [ - fastdeploy - libcpr - onnxruntime - opencv + cuda_cccl # cub/cub.cuh + libcublas # cublas_v2.h + libcurand # curand.h + libcusparse # cusparse.h + libcufft # cufft.h + cudnn # cudnn.h + cuda_cudart ] - ++ lib.optionals cudaSupport ( - with cudaPackages; - [ - cuda_cccl # cub/cub.cuh - libcublas # cublas_v2.h - libcurand # curand.h - libcusparse # cusparse.h - libcufft # cufft.h - cudnn # cudnn.h - cuda_cudart - ] - ); + ); - cmakeBuildType = "None"; + cmakeBuildType = "None"; - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" true) - (lib.cmakeBool "INSTALL_FLATTEN" false) - (lib.cmakeBool "INSTALL_PYTHON" true) - (lib.cmakeBool "INSTALL_RESOURCE" true) - (lib.cmakeBool "USE_MAADEPS" false) - (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") - ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "INSTALL_FLATTEN" false) + (lib.cmakeBool "INSTALL_PYTHON" true) + (lib.cmakeBool "INSTALL_RESOURCE" true) + (lib.cmakeBool "USE_MAADEPS" false) + (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") + ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = ./update.sh; - postPatch = '' - cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/ - ''; + postPatch = '' + cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/ + ''; - postInstall = '' - mkdir -p $out/share/${finalAttr.pname} - mv $out/{Python,resource} $out/share/${finalAttr.pname} - ''; + postInstall = '' + mkdir -p $out/share/${finalAttr.pname} + mv $out/{Python,resource} $out/share/${finalAttr.pname} + ''; - meta = with lib; { - description = "Arknights assistant"; - homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ Cryolitia ]; - platforms = platforms.linux ++ platforms.darwin; - }; - }) + meta = with lib; { + description = "Arknights assistant"; + homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ Cryolitia ]; + platforms = platforms.linux ++ platforms.darwin; + }; +}) diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index 37f6fddacbd8..1e2ba69c807e 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.14.1", - "hash": "sha256-kKupLW0T6XUpmmjlQ4rTBn/bchzkOzvM5qg6PmLSAPk=" + "version": "5.16.4", + "hash": "sha256-1ERKook2z8fKHOkAi43fU0amBgQaxYewFYCQGjFcF3o=" }, "beta": { - "version": "5.14.1", - "hash": "sha256-kKupLW0T6XUpmmjlQ4rTBn/bchzkOzvM5qg6PmLSAPk=" + "version": "5.16.4", + "hash": "sha256-1ERKook2z8fKHOkAi43fU0amBgQaxYewFYCQGjFcF3o=" } } diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index bf74f70ffd5a..101f406c9bb0 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -7,7 +7,6 @@ makeWrapper, pkg-config, openssl, - darwin, maa-assistant-arknights, android-tools, git, @@ -15,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "maa-cli"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "maa-cli"; rev = "v${version}"; - hash = "sha256-KoKMfZrI3V73hbZGm0Xx8VxL7ENicSApropLm02B098="; + hash = "sha256-WOl/d4q7l6t5BZYOf2lih/eIBTiswRBYWALmXx5ffio="; }; nativeBuildInputs = [ @@ -30,22 +29,14 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; # https://github.com/MaaAssistantArknights/maa-cli/pull/126 buildNoDefaultFeatures = true; buildFeatures = [ "git2" ]; useFetchCargoVendor = true; - cargoHash = "sha256-EIN624QnrPvta8ZNb27vT6ZDO2YY0CKSrSIZqelSlJU="; + cargoHash = "sha256-1KTPvL5JdxN1TPfS0H6Rxi4o8dzMAolHSti9xUKChL8="; # maa-cli would only search libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix index bf3e0b657d72..03d34ca4257f 100644 --- a/pkgs/by-name/ma/macchina/package.nix +++ b/pkgs/by-name/ma/macchina/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,11 +23,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.DisplayServices - ]; - postInstall = '' installManPage doc/macchina.{1,7} ''; diff --git a/pkgs/by-name/ma/macfuse-stubs/package.nix b/pkgs/by-name/ma/macfuse-stubs/package.nix new file mode 100644 index 000000000000..1461e3ef27f6 --- /dev/null +++ b/pkgs/by-name/ma/macfuse-stubs/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchurl, + cpio, + xar, + undmg, + libtapi, +}: + +stdenv.mkDerivation rec { + pname = "macfuse-stubs"; + version = "4.8.0"; + + src = fetchurl { + url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg"; + hash = "sha256-ucTzO2qdN4QkowMVvC3+4pjEVjbwMsB0xFk+bvQxwtQ="; + }; + + nativeBuildInputs = [ + cpio + xar + undmg + libtapi + ]; + + postUnpack = '' + xar -xf 'Install macFUSE.pkg' + cd Core.pkg + gunzip -dc Payload | cpio -i + ''; + + sourceRoot = "."; + + buildPhase = '' + pushd usr/local/lib + for f in *.dylib; do + tapi stubify --filetype=tbd-v2 "$f" -o "''${f%%.dylib}.tbd" + done + sed -i "s|^prefix=.*|prefix=$out|" pkgconfig/fuse.pc + popd + ''; + + # NOTE: Keep in mind that different parts of macFUSE are distributed under a + # different license + installPhase = '' + mkdir -p $out/include $out/lib/pkgconfig + cp usr/local/lib/*.tbd $out/lib + cp usr/local/lib/pkgconfig/*.pc $out/lib/pkgconfig + cp -R usr/local/include/* $out/include + ''; + + meta = with lib; { + homepage = "https://osxfuse.github.io"; + description = "Build time stubs for FUSE on macOS"; + longDescription = '' + macFUSE is required for this package to work on macOS. To install macFUSE, + use the installer from the + project website. + ''; + platforms = platforms.darwin; + maintainers = with maintainers; [ midchildan ]; + + # macFUSE as a whole includes code with restrictions on commercial + # redistribution. However, the build artifacts that we actually touch for + # this derivation are distributed under a free license. + license = with licenses; [ + lgpl2Plus # libfuse + ]; + }; + + passthru.warning = '' + macFUSE is required for this package to work on macOS. To install macFUSE, + use the installer from the + project website. + ''; +} diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix index f8579fb30f36..7c2c798072b7 100644 --- a/pkgs/by-name/ma/mackerel-agent/package.nix +++ b/pkgs/by-name/ma/mackerel-agent/package.nix @@ -10,20 +10,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.84.2"; + version = "0.85.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sh5hbhWlyu70Wm2zTQeKiQr/nYi6bG4g6a/yvEnd/DU="; + sha256 = "sha256-wTL+zxa0uaRT8cP2P+iYW6qC8RS5g8wSpvsa01iSUXA="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ]; - vendorHash = "sha256-2JpI67HkhNJcFTuveHSgsqmmHhWOjHC0f0dK0tOjwIc="; + vendorHash = "sha256-Q3HsfLA6xqzwXVfRc0bOb15kW2tdwj14DvJEZoRy0/4="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ma/macos-defaults/package.nix b/pkgs/by-name/ma/macos-defaults/package.nix new file mode 100644 index 000000000000..00f13bfcbb21 --- /dev/null +++ b/pkgs/by-name/ma/macos-defaults/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "macos-defaults"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "dsully"; + repo = "macos-defaults"; + tag = finalAttrs.version; + hash = "sha256-dSZjMuw7ott0dgiYo0rqekEvScmrX6iG7xHaPAgo1/E="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-xSg6WAkFPS8B1G4WqMW77egCMmOEo3rK2EKcrDYaBjA="; + + checkFlags = [ + # accesses home dir + "--skip=defaults::tests::plist_path_tests" + # accesses system_profiler + "--skip=defaults::tests::test_get_hardware_uuid" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool for managing macOS defaults declaratively via YAML files"; + homepage = "https://github.com/dsully/macos-defaults"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ josh ]; + mainProgram = "macos-defaults"; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/ma/macos-instantview/package.nix b/pkgs/by-name/ma/macos-instantview/package.nix new file mode 100644 index 000000000000..94a8178cb23c --- /dev/null +++ b/pkgs/by-name/ma/macos-instantview/package.nix @@ -0,0 +1,44 @@ +{ + stdenvNoCC, + fetchurl, + lib, + _7zz, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "instantview"; + version = "3.22R0002"; + + src = fetchurl { + url = "https://www.siliconmotion.com/downloads/macOS_InstantView_V${finalAttrs.version}.dmg"; + hash = "sha256-PdgX9zCrVYtNbuOCYKVo9cegCG/VY7QXetivVsUltbg="; + }; + + nativeBuildInputs = [ _7zz ]; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p "$out/Applications" + + # Extract the DMG using 7zip + 7zz x "$src" -oextracted -y + + # Move the extracted contents to $out + cp -r extracted/* "$out/Applications/" + + runHook postInstall + ''; + + meta = { + platforms = lib.platforms.darwin; + description = "USB Docking Station plugin-and-display support with SM76x driver"; + homepage = "https://www.siliconmotion.com/events/instantview/"; + license = lib.licenses.unfree; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ aspauldingcode ]; + }; +}) diff --git a/pkgs/by-name/ma/macpm/package.nix b/pkgs/by-name/ma/macpm/package.nix new file mode 100644 index 000000000000..ea9dca568992 --- /dev/null +++ b/pkgs/by-name/ma/macpm/package.nix @@ -0,0 +1,45 @@ +{ + lib, + + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication { + pname = "macpm"; + version = "0.24-unstable-2024-11-19"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "visualcjy"; + repo = "macpm"; + rev = "7882d4c86c84bb23a8966ca57990de9b11397bd4"; + hash = "sha256-jqaPPvYbuL8q6grmBLyZLf8aDmjugYxMOWAh1Ix82jc="; + }; + + # has no tests + doCheck = false; + + # backwards compatibility for users still expecting 'asitop' + postInstall = '' + ln -rs $out/bin/macpm $out/bin/asitop + ''; + + dependencies = with python3Packages; [ + dashing + humanize + psutil + ]; + + meta = { + description = "Perf monitoring CLI tool for Apple Silicon; previously named 'asitop'"; + homepage = "https://github.com/visualcjy/macpm"; + mainProgram = "macpm"; + platforms = [ "aarch64-darwin" ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + juliusrickert + siriobalmelli + ]; + }; +} diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix index 8cdc9432040e..6d984640b4d5 100644 --- a/pkgs/by-name/ma/mactop/package.nix +++ b/pkgs/by-name/ma/mactop/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Terminal-based monitoring tool 'top' designed to display real-time metrics for Apple Silicon chips"; diff --git a/pkgs/by-name/ma/maeparser/package.nix b/pkgs/by-name/ma/maeparser/package.nix index 96d696917834..715baa4b184f 100644 --- a/pkgs/by-name/ma/maeparser/package.nix +++ b/pkgs/by-name/ma/maeparser/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "maeparser"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "schrodinger"; repo = "maeparser"; rev = "v${version}"; - sha256 = "sha256-+eCTOU0rqFQC87wcxgINGLsULfbIr/wKxQTkRR59JVc="; + sha256 = "sha256-LTE1YGw6DiWnpUGB9x3vFVArcYd8zO49b4tqpqK30eA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix index 519d00a71ffe..3afc444d0ebe 100644 --- a/pkgs/by-name/ma/maestro/package.nix +++ b/pkgs/by-name/ma/maestro/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maestro"; - version = "1.39.13"; + version = "1.40.3"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip"; - hash = "sha256-J1Gy12VF5C7OTDCOs4s7sWuwixZR1tz4hQyRxKcwahM="; + hash = "sha256-gLdT1Mcllnsysb4N2JYck9OxQi9m63leH9zb5newotU="; }; dontUnpack = true; diff --git a/pkgs/by-name/ma/magic-enum/package.nix b/pkgs/by-name/ma/magic-enum/package.nix index 0b9ffcd9dae5..c4bae5ef975f 100644 --- a/pkgs/by-name/ma/magic-enum/package.nix +++ b/pkgs/by-name/ma/magic-enum/package.nix @@ -4,17 +4,16 @@ stdenv, cmake, nix-update-script, - testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "magic-enum"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "Neargye"; repo = "magic_enum"; - tag = "v${version}"; - hash = "sha256-1pO9FWd0InXqg8+lwRF3YNFTAeVLjqoI9v15LjWxnZY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-P6fl/dcGOSE1lTJwZlimbvsTPelHwdQdZr18H4Zji20="; }; nativeBuildInputs = [ cmake ]; @@ -23,8 +22,8 @@ stdenv.mkDerivation rec { # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly # (setting it to an absolute path causes include files to go to $out/$out/include, # because the absolute path is interpreted with root at $out). - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") ]; passthru = { @@ -34,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "Static reflection for enums (to string, from string, iteration) for modern C++"; homepage = "https://github.com/Neargye/magic_enum"; - changelog = "https://github.com/Neargye/magic_enum/releases/tag/v${version}"; + changelog = "https://github.com/Neargye/magic_enum/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Alper-Celik ]; }; -} +}) diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix index 7cb7a5bbcbba..41d3debe3e95 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.522"; + version = "8.3.526"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-haXmCVnPPAry4n9EpVWS5UclK6PCA8J9OFlw4jPMGw4="; + sha256 = "sha256-u6Z/Nfrlzn6JFDbPLPrpaZoR/nUGtE1H1roM6khme1Q="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/by-name/ma/magic-wormhole-rs/package.nix b/pkgs/by-name/ma/magic-wormhole-rs/package.nix index 9e6207a4c5b4..9125fe5b0378 100644 --- a/pkgs/by-name/ma/magic-wormhole-rs/package.nix +++ b/pkgs/by-name/ma/magic-wormhole-rs/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage rec { pname = "magic-wormhole-rs"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole.rs"; rev = version; - sha256 = "sha256-wah3Mkw3oFUx4rD6OkLvYyHsz6Z8pFFPhKlc0D7gIQA="; + sha256 = "sha256-01u1DJNd/06q9dH/Y4E5kj5gb2CA7EKdoPtMhzCLtso="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qQAedjOHXYTu1K5fvoXWonXsJBSlBD4M8r3DGLSw7pI="; + cargoHash = "sha256-sZuvhJWgBlptfgsKglWvL6oxK5W3y2x0Gwf+r2pNRi8="; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libxcb ]; diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index af8bc1189280..ef663c369c3d 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "mago"; - version = "0.22.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = version; - hash = "sha256-Zc6DTqIVU4shmZ9csg4nzwjn7ut/D6FrBXATQqwHI8o="; + hash = "sha256-Kdktcq3czn6YdGKoTB7AjCtfDkNTHhee/kVhMzxsuD8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-wppfZNsAFzXMJzcIOHL8Lj2FCgPp/i/TZcHP4VYsGCk="; + cargoHash = "sha256-V7x0n+JcXiSGg8sJBKnsB5/KnfJSadYH0i/dNouhoHc="; env = { # Get openssl-sys to use pkg-config diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix index 35036b14319c..185fc183ce1c 100644 --- a/pkgs/by-name/ma/magpie/package.nix +++ b/pkgs/by-name/ma/magpie/package.nix @@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/BuddiesOfBudgie/magpie"; changelog = "https://github.com/BuddiesOfBudgie/magpie/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; - maintainers = lib.teams.budgie.members; + teams = [ lib.teams.budgie ]; platforms = lib.platforms.linux; pkgConfigModules = [ "libmagpie-0" diff --git a/pkgs/by-name/ma/maigret/package.nix b/pkgs/by-name/ma/maigret/package.nix index ec4f2103295b..cdea13a209a5 100644 --- a/pkgs/by-name/ma/maigret/package.nix +++ b/pkgs/by-name/ma/maigret/package.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "maigret"; version = "0.4.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "soxoj"; - repo = pname; + repo = "maigret"; tag = "v${version}"; hash = "sha256-Z8SnA7Z5+oKW0AOaNf+c/zR30lrPFmXaxxKkbnDXNNs="; }; @@ -27,7 +27,9 @@ python3.pkgs.buildPythonApplication rec { }) ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ aiodns aiohttp aiohttp-socks @@ -68,8 +70,6 @@ python3.pkgs.buildPythonApplication rec { yarl ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = with python3.pkgs; [ pytest-httpserver pytest-asyncio @@ -77,6 +77,7 @@ python3.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = true; + pythonRemoveDeps = [ "future-annotations" ]; pytestFlagsArray = [ @@ -100,14 +101,13 @@ python3.pkgs.buildPythonApplication rec { "test_asyncio_progressbar_executor" ]; - pythonImportsCheck = [ - "maigret" - ]; + pythonImportsCheck = [ "maigret" ]; meta = with lib; { description = "Tool to collect details about an username"; homepage = "https://maigret.readthedocs.io"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch b/pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch index 9e38d103fbfd..c92fd5067b55 100644 --- a/pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch +++ b/pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch @@ -1,24 +1,24 @@ -From ba00547a25bfea641d0c8a5dba42a6ace990767b Mon Sep 17 00:00:00 2001 +From 0ffd4dcbc7df1510213ec8f2c20b94fb016d390e Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> -Date: Mon, 4 Nov 2024 11:04:05 +0800 -Subject: [PATCH] Add go.mod & go.sum +Date: Thu, 17 Apr 2025 20:52:12 +0800 +Subject: [PATCH] Update go.mod & go.sum --- - go.mod | 36 ++++++++++++++++++++++++++++ - go.sum | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 112 insertions(+) + go.mod | 37 +++++++++++++++++++++++++++ + go.sum | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 117 insertions(+) create mode 100644 go.mod create mode 100644 go.sum diff --git a/go.mod b/go.mod new file mode 100644 -index 0000000..b09f764 +index 0000000..594f99f --- /dev/null +++ b/go.mod -@@ -0,0 +1,36 @@ +@@ -0,0 +1,37 @@ +module github.com/mailhog/MailHog + -+go 1.23.2 ++go 1.24.1 + +require ( + github.com/gorilla/pat v1.0.2 @@ -27,8 +27,8 @@ index 0000000..b09f764 + github.com/mailhog/MailHog-Server v1.0.1 + github.com/mailhog/MailHog-UI v1.0.1 + github.com/mailhog/http v1.0.1 -+ github.com/mailhog/mhsendmail v0.2.0 -+ golang.org/x/crypto v0.28.0 ++ github.com/mailhog/mhsendmail v0.2.1-0.20170416184902-9e70164f299c ++ golang.org/x/crypto v0.37.0 +) + +require ( @@ -45,19 +45,20 @@ index 0000000..b09f764 + github.com/ogier/pflag v0.0.1 // indirect + github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect + github.com/smartystreets/goconvey v1.8.1 // indirect -+ github.com/stretchr/testify v1.9.0 // indirect ++ github.com/spf13/pflag v1.0.6 // indirect ++ github.com/stretchr/testify v1.10.0 // indirect + github.com/t-k/fluent-logger-golang v1.0.0 // indirect -+ github.com/tinylib/msgp v1.2.4 // indirect ++ github.com/tinylib/msgp v1.2.5 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect + gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 -index 0000000..9089971 +index 0000000..87a8922 --- /dev/null +++ b/go.sum -@@ -0,0 +1,76 @@ +@@ -0,0 +1,80 @@ +github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= +github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -100,6 +101,8 @@ index 0000000..9089971 +github.com/mailhog/http v1.0.1/go.mod h1:91oqUCI9ZoSDY2cTj4pWDJVBHCK1U762V2a4if4KlOw= +github.com/mailhog/mhsendmail v0.2.0 h1:C5HUC4obHfXIkttLfGBUopYbsJmh+bnExGWHBpWQ8IA= +github.com/mailhog/mhsendmail v0.2.0/go.mod h1:B0778+OoPEc5aEFqatEnSO4ZWl9FCTxvaY+c7OOQadM= ++github.com/mailhog/mhsendmail v0.2.1-0.20170416184902-9e70164f299c h1:Tci7WxOyjr3Vs+oCoMT4F4LMNsaxh4eJzq9CKivNRuo= ++github.com/mailhog/mhsendmail v0.2.1-0.20170416184902-9e70164f299c/go.mod h1:B0778+OoPEc5aEFqatEnSO4ZWl9FCTxvaY+c7OOQadM= +github.com/mailhog/smtp v1.0.1 h1:igL3N/L+pWuGCqUaje21HX3VIVnqHoVlqWO0t+wJEYE= +github.com/mailhog/smtp v1.0.1/go.mod h1:GMrAdv1hXro38xj5dsWPAk5ZiXJHFx9t7W9Yqsk0XUM= +github.com/mailhog/storage v1.0.1 h1:uut2nlG5hIxbsl6f8DGznPAHwQLf3/7Na2t4gmrIais= @@ -117,14 +120,16 @@ index 0000000..9089971 +github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec= +github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY= +github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60= -+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= ++github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= ++github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= ++github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= ++github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/t-k/fluent-logger-golang v1.0.0 h1:4IQzY+/l66Zkkhk9eB3LwF9vPkgKHJ1rpYdrRiap0EI= +github.com/t-k/fluent-logger-golang v1.0.0/go.mod h1:6vC3Vzp9Kva0l5J9+YDY5/ROePwkAqwLK+KneCjSm4w= -+github.com/tinylib/msgp v1.2.4 h1:yLFeUGostXXSGW5vxfT5dXG/qzkn4schv2I7at5+hVU= -+github.com/tinylib/msgp v1.2.4/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= -+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= ++github.com/tinylib/msgp v1.2.5 h1:WeQg1whrXRFiZusidTQqzETkRpGjFjcIhW6uqWH09po= ++github.com/tinylib/msgp v1.2.5/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= ++golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= ++golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -135,5 +140,5 @@ index 0000000..9089971 +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -- -2.46.1 +2.48.1 diff --git a/pkgs/by-name/ma/mailhog/package.nix b/pkgs/by-name/ma/mailhog/package.nix index 8d73256cf5ae..26bfa337c934 100644 --- a/pkgs/by-name/ma/mailhog/package.nix +++ b/pkgs/by-name/ma/mailhog/package.nix @@ -17,11 +17,11 @@ buildGoModule rec { }; patches = [ - # Generate by go mod init github.com/mailhog/MailHog && go mod tidy + # Generate by go mod init github.com/mailhog/MailHog && go mod tidy && go get github.com/mailhog/mhsendmail@9e70164f299c9e06af61402e636f5bbdf03e7dbb ./0001-Add-go.mod-go.sum.patch ]; - vendorHash = "sha256-yYMgNpthBwmDeD4pgnVj88OJWiPNWuwzxDzC6eejabU="; + vendorHash = "sha256-YfqC8MEdiLcucOaXOsLI9H4NDQ/4T0newb6q7v0uDbw="; deleteVendor = true; diff --git a/pkgs/by-name/ma/mainsail/package.nix b/pkgs/by-name/ma/mainsail/package.nix index 3f0c7578f18d..8083e0147e4a 100644 --- a/pkgs/by-name/ma/mainsail/package.nix +++ b/pkgs/by-name/ma/mainsail/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "mainsail"; - version = "2.13.2"; + version = "2.14.0"; src = fetchFromGitHub { owner = "mainsail-crew"; repo = "mainsail"; rev = "v${version}"; - hash = "sha256-rXavUkoFRw5fWCisdz/eD+wL1Sc+vExyjskVEIN4QNQ="; + hash = "sha256-hZgENY1Vb0wr6fqQfodjXQ+a/JAca0AQFKHlTc4EG68="; }; - npmDepsHash = "sha256-MzPXDy9sX7Y5dUm3qp3OORdEz8QyL5j4M4eXl0gtopo="; + npmDepsHash = "sha256-9pkcQS281OC9q9WadctQ/GAgbaeejrj7HLwKK/SDkAU="; # Prevent Cypress binary download. CYPRESS_INSTALL_BINARY = 0; diff --git a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh index 3948342a36fc..c860048d10a2 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh +++ b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh @@ -25,10 +25,12 @@ assertExecutable() { # the environment # --unset VAR : remove VAR from the environment # --chdir DIR : change working directory (use instead of --run "cd DIR") -# --add-flags ARGS : prepend ARGS to the invocation of the executable +# --add-flag ARG : prepend the single argument ARG to the invocation of the executable # (that is, *before* any arguments passed on the command line) -# --append-flags ARGS : append ARGS to the invocation of the executable +# --append-flag ARG : append the single argument ARG to the invocation of the executable # (that is, *after* any arguments passed on the command line) +# --add-flags ARGS : prepend the whitespace-separated list of arguments ARGS to the invocation of the executable +# --append-flags ARGS : append the whitespace-separated list of arguments ARGS to the invocation of the executable # --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP # --suffix @@ -86,9 +88,9 @@ makeDocumentedCWrapper() { # makeCWrapper EXECUTABLE ARGS # ARGS: same as makeWrapper makeCWrapper() { - local argv0 inherit_argv0 n params cmd main flagsBefore flagsAfter flags executable length + local argv0 inherit_argv0 n params cmd main flags executable length local uses_prefix uses_suffix uses_assert uses_assert_success uses_stdio uses_asprintf - local resolve_path + local flagsBefore=() flagsAfter=() executable=$(escapeStringLiteral "$1") params=("$@") length=${#params[*]} @@ -147,16 +149,28 @@ makeCWrapper() { n=$((n + 1)) [ $n -ge "$length" ] && main="$main#error makeCWrapper: $p takes 1 argument"$'\n' ;; + --add-flag) + flagsBefore+=("${params[n + 1]}") + uses_assert=1 + n=$((n + 1)) + [ $n -ge "$length" ] && main="$main#error makeCWrapper: $p takes 1 argument"$'\n' + ;; + --append-flag) + flagsAfter+=("${params[n + 1]}") + uses_assert=1 + n=$((n + 1)) + [ $n -ge "$length" ] && main="$main#error makeCWrapper: $p takes 1 argument"$'\n' + ;; --add-flags) - flags="${params[n + 1]}" - flagsBefore="$flagsBefore $flags" + read -ra flags <<< "${params[n + 1]}" + flagsBefore+=("${flags[@]}") uses_assert=1 n=$((n + 1)) [ $n -ge "$length" ] && main="$main#error makeCWrapper: $p takes 1 argument"$'\n' ;; --append-flags) - flags="${params[n + 1]}" - flagsAfter="$flagsAfter $flags" + read -ra flags <<< "${params[n + 1]}" + flagsAfter+=("${flags[@]}") uses_assert=1 n=$((n + 1)) [ $n -ge "$length" ] && main="$main#error makeCWrapper: $p takes 1 argument"$'\n' @@ -182,7 +196,7 @@ makeCWrapper() { ;; esac done - [[ -z "$flagsBefore" && -z "$flagsAfter" ]] || main="$main"${main:+$'\n'}$(addFlags "$flagsBefore" "$flagsAfter")$'\n'$'\n' + (( ${#flagsBefore[@]} + ${#flagsAfter[@]} > 0 )) && main="$main"${main:+$'\n'}$(addFlags flagsBefore flagsAfter)$'\n'$'\n' [ -z "$inherit_argv0" ] && main="${main}argv[0] = \"${argv0:-${executable}}\";"$'\n' [ -z "$resolve_argv0" ] || main="${main}argv[0] = resolve_argv0(argv[0]);"$'\n' main="${main}return execv(\"${executable}\", argv);"$'\n' @@ -203,23 +217,10 @@ makeCWrapper() { } addFlags() { - local n flag before after var + local n flag var - # Disable file globbing, since bash will otherwise try to find - # filenames matching the the value to be prefixed/suffixed if - # it contains characters considered wildcards, such as `?` and - # `*`. We want the value as is, except we also want to split - # it on on the separator; hence we can't quote it. - local reenableGlob=0 - if [[ ! -o noglob ]]; then - reenableGlob=1 - fi - set -o noglob - # shellcheck disable=SC2086 - before=($1) after=($2) - if (( reenableGlob )); then - set +o noglob - fi + local -n before=$1 + local -n after=$2 var="argv_tmp" printf '%s\n' "char **$var = calloc(${#before[@]} + argc + ${#after[@]} + 1, sizeof(*$var));" @@ -435,6 +436,14 @@ formatArgs() { formatArgsLine 1 "$@" shift 1 ;; + --add-flag) + formatArgsLine 1 "$@" + shift 1 + ;; + --append-flag) + formatArgsLine 1 "$@" + shift 1 + ;; --add-flags) formatArgsLine 1 "$@" shift 1 diff --git a/pkgs/by-name/ma/makedepend/package.nix b/pkgs/by-name/ma/makedepend/package.nix new file mode 100644 index 000000000000..f84a707a96c8 --- /dev/null +++ b/pkgs/by-name/ma/makedepend/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "makedepend"; + version = "1.0.9"; + + src = fetchurl { + url = "mirror://xorg/individual/util/makedepend-${finalAttrs.version}.tar.xz"; + hash = "sha256-ktDetln/9tjdvB0n/EyozrK22+Fdc/CgTtwJ8cV4LdQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/util/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "parse C sources to make dependency lists for Makefiles"; + homepage = "https://gitlab.freedesktop.org/xorg/util/makedepend"; + license = with lib.licenses; [ + mitOpenGroup + hpnd + ]; + mainProgram = "makedepend"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ma/makemkv/package.nix b/pkgs/by-name/ma/makemkv/package.nix index 5832860a7303..a664daaeb4d5 100644 --- a/pkgs/by-name/ma/makemkv/package.nix +++ b/pkgs/by-name/ma/makemkv/package.nix @@ -17,21 +17,21 @@ }: let - version = "1.17.9"; + version = "1.18.1"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - hash = "sha256-q87cvHBzUQRF4wO/ZA07kbGrok0Bkj1BGTi/4i0s1Hs="; + hash = "sha256-sWV2ZR6t7DWF6BeEOioaDryqcTuJ3R4CDYsdBW3bL9Y="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - hash = "sha256-JrEV5rpJNRgbXqiKLNUZZtWbZyR44EMTd1kSKVGLZ6o="; + hash = "sha256-3Efu+x5o99U55LB5u5POZBRBBK0jPeVoGJOYEOzQO3s="; }; in libsForQt5.mkDerivation { diff --git a/pkgs/by-name/ma/makima/package.nix b/pkgs/by-name/ma/makima/package.nix index 9540668604be..69a4ad2548b1 100644 --- a/pkgs/by-name/ma/makima/package.nix +++ b/pkgs/by-name/ma/makima/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "makima"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "cyber-sushi"; repo = "makima"; rev = "v${version}"; - hash = "sha256-kC0GJ1K7DMfkYxaYog5y1y0DMfFjZ7iD7pGQQE67N9o="; + hash = "sha256-Pb9XBMs0AeklobxEDRQ1GDeI6hQFZ43EJt/+XQEGrWU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-d9MUH8cORFaxgAKV/Mgq3tiNuoAJ2YTcbgvwPTOIlkw="; + cargoHash = "sha256-7XpecFwkUW3VVMYUAmHEL9gk5mpwC0mWN2N8Dptm3iI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/ma/malt/package.nix b/pkgs/by-name/ma/malt/package.nix index b5342172d4a2..f7919e15673a 100644 --- a/pkgs/by-name/ma/malt/package.nix +++ b/pkgs/by-name/ma/malt/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "malt"; - version = "1.2.3"; + version = "1.2.6"; src = fetchFromGitHub { owner = "memtt"; repo = "malt"; rev = "v${version}"; - sha256 = "sha256-eeiThHorLxL2qHIXd9vzc2jRYd7BN3/OHCqM9BmXi0U="; + sha256 = "sha256-Hq6XDxcjH5ronprnV1CwumGqBg9RXYpJ+WANqoBA2/c="; }; postPatch = '' diff --git a/pkgs/by-name/ma/maltego/package.nix b/pkgs/by-name/ma/maltego/package.nix index d3a3570aaba8..8b832872eafb 100644 --- a/pkgs/by-name/ma/maltego/package.nix +++ b/pkgs/by-name/ma/maltego/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maltego"; - version = "4.9.2"; + version = "4.9.3"; src = fetchzip { url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip"; - hash = "sha256-+jPfIqvaVLo+s/yNHc5fHtnEMClcHtLVsVzFi4LZnK0="; + hash = "sha256-h0cTA6/i7cpYvGQli3UA6WZnaMOProN4f0TTdeIczcY="; }; postPatch = '' diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix new file mode 100644 index 000000000000..75dbacee94dc --- /dev/null +++ b/pkgs/by-name/ma/mamba-cpp/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + bzip2, + cmake, + cli11, + yaml-cpp, + nlohmann_json, + zstd, + reproc, + spdlog, + tl-expected, + libmamba, + python3, + versionCheckHook, +}: +stdenv.mkDerivation rec { + pname = "mamba-cpp"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "mamba-org"; + repo = "mamba"; + tag = version; + hash = "sha256-JBwdfYM7J5R7HZyw5kVXwu4FlZUd2QPrsTaGuXnyAJI="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + python3 + reproc + spdlog + nlohmann_json + tl-expected + zstd + bzip2 + cli11 + yaml-cpp + libmamba + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_MAMBA" true) + (lib.cmakeBool "BUILD_SHARED" true) + (lib.cmakeBool "BUILD_LIBMAMBA" false) + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = with lib; { + description = "Reimplementation of the conda package manager"; + homepage = "https://github.com/mamba-org/mamba"; + license = licenses.bsd3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ klchen0112 ]; + mainProgram = "mamba"; + }; +} diff --git a/pkgs/by-name/ma/man-db/package.nix b/pkgs/by-name/ma/man-db/package.nix index d8d645113287..7481da85d1e9 100644 --- a/pkgs/by-name/ma/man-db/package.nix +++ b/pkgs/by-name/ma/man-db/package.nix @@ -1,6 +1,6 @@ { buildPackages, - db, + gdbm, fetchurl, groff, gzip, @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libpipeline - db + gdbm groff libiconv' ]; # (Yes, 'groff' is both native and build input) diff --git a/pkgs/by-name/ma/manaplus/package.nix b/pkgs/by-name/ma/manaplus/package.nix index f6390f2f0f92..cb30d88c53cd 100644 --- a/pkgs/by-name/ma/manaplus/package.nix +++ b/pkgs/by-name/ma/manaplus/package.nix @@ -13,6 +13,7 @@ curl, libxml2, libpng, + libX11, pkg-config, libGL, autoreconfHook, @@ -53,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { curl libGL libpng + libX11 libxml2 physfs zlib diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix index 18fe73e6260c..af215b99a4dd 100644 --- a/pkgs/by-name/ma/manga-tui/package.nix +++ b/pkgs/by-name/ma/manga-tui/package.nix @@ -10,7 +10,7 @@ nix-update-script, }: let - version = "0.6.0"; + version = "0.7.0"; in rustPlatform.buildRustPackage { pname = "manga-tui"; @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage { owner = "josueBarretogit"; repo = "manga-tui"; rev = "v${version}"; - hash = "sha256-L5KZaBJDG0z6NUGPJfbOkKCp1xQEzqfJ9GREx189VqU="; + hash = "sha256-1WFg2hG3UnOO9+HpUcdPkZNhsNYa2QG1PhzLZ4bQiQM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-gmG/gDozYizwjcm3SGs2m8oLiuWp6oxJPOB3FlHfW+4="; + cargoHash = "sha256-1nERwIZCR/afgfGdronpy145GnDkbsB7YjF6XyDcfEY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index 6208970a8abd..9e7fe1639c21 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - flutter327, + flutter329, webkitgtk_4_1, mpv, rustPlatform, @@ -13,13 +13,13 @@ let pname = "mangayomi"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "kodjodevf"; repo = "mangayomi"; tag = "v${version}"; - hash = "sha256-xF3qvmEGctYXE7HWka89G4W6ytMTVGw75o26h/Ql0Aw="; + hash = "sha256-kvwssyVjce9VipANRED5k3a2pdJRAhio6GtM7+5nd38="; }; metaCommon = { @@ -38,14 +38,14 @@ let useFetchCargoVendor = true; - cargoHash = "sha256-WkWNgjTA50cOztuF9ZN6v8l38kldarqUOMXNFJDI0Ds="; + cargoHash = "sha256-vGu5e5M6CFpaLodEpt8v8DGhu2S5h/E4vvqSNOKkWns="; passthru.libraryPath = "lib/librust_lib_mangayomi.so"; meta = metaCommon; }; in -flutter327.buildFlutterApplication { +flutter329.buildFlutterApplication { inherit pname version src; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -74,18 +74,11 @@ flutter327.buildFlutterApplication { }; }; - gitHashes = - let - media_kit-hash = "sha256-bRwDrK6YdQGuXnxyIaNtvRoubl3i42ksaDsggAwgB80="; - in - { - desktop_webview_window = "sha256-wRxQPlJZZe4t2C6+G5dMx3+w8scxWENLwII08dlZ4IA="; - flutter_qjs = "sha256-m+Z0bCswylfd1E2Y6X6bdPivkSlXUxO4J0Icbco+/0A="; - media_kit_libs_windows_video = media_kit-hash; - media_kit_video = media_kit-hash; - media_kit = media_kit-hash; - flutter_web_auth_2 = "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw="; - }; + gitHashes = { + desktop_webview_window = "sha256-wRxQPlJZZe4t2C6+G5dMx3+w8scxWENLwII08dlZ4IA="; + flutter_qjs = "sha256-m+Z0bCswylfd1E2Y6X6bdPivkSlXUxO4J0Icbco+/0A="; + flutter_web_auth_2 = "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw="; + }; nativeBuildInputs = [ copyDesktopItems ]; diff --git a/pkgs/by-name/ma/mangayomi/pubspec.lock.json b/pkgs/by-name/ma/mangayomi/pubspec.lock.json index ae97fa265276..d508932aec8b 100644 --- a/pkgs/by-name/ma/mangayomi/pubspec.lock.json +++ b/pkgs/by-name/ma/mangayomi/pubspec.lock.json @@ -27,7 +27,7 @@ "version": "6.11.0" }, "analyzer_plugin": { - "dependency": "transitive", + "dependency": "direct overridden", "description": { "name": "analyzer_plugin", "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161", @@ -90,31 +90,31 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a", + "sha256": "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.5" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "asn1lib": { "dependency": "transitive", "description": { "name": "asn1lib", - "sha256": "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5", + "sha256": "e02d018628c870ef2d7f03e33f9ad179d89ff6ec52ca6c56bcb80bcef979867f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.8" + "version": "1.6.2" }, "async": { "dependency": "transitive", @@ -130,11 +130,11 @@ "dependency": "transitive", "description": { "name": "audio_session", - "sha256": "b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7", + "sha256": "2b7fff16a552486d078bfc09a8cde19f426dc6d6329262b684182597bec5b1ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.23" + "version": "0.1.25" }, "boolean_selector": { "dependency": "transitive", @@ -190,31 +190,31 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.3" + "version": "4.0.4" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.3" + "version": "2.4.4" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.14" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", @@ -240,11 +240,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.3" + "version": "8.9.5" }, "cached_network_image": { "dependency": "transitive", @@ -280,11 +280,11 @@ "dependency": "transitive", "description": { "name": "change_case", - "sha256": "99cfdf2018c627c8a3af5a23ea4c414eb69c75c31322d23b9660ebc3cf30b514", + "sha256": "e41ef3df58521194ef8d7649928954805aeb08061917cf658322305e61568003", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.0" }, "characters": { "dependency": "transitive", @@ -310,11 +310,11 @@ "dependency": "transitive", "description": { "name": "chewie", - "sha256": "28d77bb89787b41430202fee9509289d75f3aa7fac408be1c0a74cb487e3bdba", + "sha256": "df6711bc3ba165ad19cb496e350250be5673327f79c61c9cc8a15088ed8007ed", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.11.1" }, "cli_util": { "dependency": "transitive", @@ -347,7 +347,7 @@ "version": "4.10.1" }, "collection": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { "name": "collection", "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", @@ -430,21 +430,21 @@ "dependency": "transitive", "description": { "name": "custom_lint_core", - "sha256": "02450c3e45e2a6e8b26c4d16687596ab3c4644dd5792e3313aa9ceba5a49b7f5", + "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.5" }, "custom_lint_visitor": { "dependency": "transitive", "description": { "name": "custom_lint_visitor", - "sha256": "bfe9b7a09c4775a587b58d10ebb871d4fe618237639b1e84d5ec62d7dfef25f9", + "sha256": "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0+6.11.0" + "version": "1.0.0+7.3.0" }, "dart_eval": { "dependency": "direct main", @@ -460,11 +460,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.7" + "version": "2.3.8" }, "dartx": { "dependency": "transitive", @@ -480,11 +480,11 @@ "dependency": "transitive", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "desktop_webview_window": { "dependency": "direct main", @@ -497,6 +497,26 @@ "source": "git", "version": "0.2.4" }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.3.3" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.2" + }, "directed_graph": { "dependency": "transitive", "description": { @@ -571,11 +591,11 @@ "dependency": "transitive", "description": { "name": "extended_image_library", - "sha256": "9a94ec9314aa206cfa35f16145c3cd6e2c924badcc670eaaca8a3a8063a68cd7", + "sha256": "e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.5" + "version": "4.0.6" }, "fake_async": { "dependency": "transitive", @@ -591,21 +611,21 @@ "dependency": "direct main", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "ffigen": { "dependency": "direct main", "description": { "name": "ffigen", - "sha256": "e0bdaa4ff30106aab68e7fa19311df4ced2035dc07be30f2e112855e8dcd3259", + "sha256": "2119b4fe3aad0db94dc9531b90283c4640a6231070e613c400b426a4da08c704", "url": "https://pub.dev" }, "source": "hosted", - "version": "16.0.0" + "version": "16.1.0" }, "file": { "dependency": "transitive", @@ -641,21 +661,21 @@ "dependency": "direct main", "description": { "name": "flex_color_scheme", - "sha256": "09bea5d776f694c5a67f2229f2aa500cc7cce369322dc6500ab01cf9ad1b4e1a", + "sha256": "3344f8f6536c6ce0473b98e9f084ef80ca89024ad3b454f9c32cf840206f4387", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.0" + "version": "8.2.0" }, "flex_seed_scheme": { "dependency": "transitive", "description": { "name": "flex_seed_scheme", - "sha256": "d3ba3c5c92d2d79d45e94b4c6c71d01fac3c15017da1545880c53864da5dfeb0", + "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.5.0" + "version": "3.5.1" }, "flutter": { "dependency": "direct main", @@ -663,6 +683,16 @@ "source": "sdk", "version": "0.0.0" }, + "flutter_app_installer": { + "dependency": "direct main", + "description": { + "name": "flutter_app_installer", + "sha256": "b71f7c3f6c5712b6f9bdcde798bbb8a0c4047cab47c4364f7252de8c95d67358", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, "flutter_cache_manager": { "dependency": "transitive", "description": { @@ -783,11 +813,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", + "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.24" + "version": "2.0.27" }, "flutter_qjs": { "dependency": "direct main", @@ -814,21 +844,21 @@ "dependency": "direct main", "description": { "name": "flutter_rust_bridge", - "sha256": "35c257fc7f98e34c1314d6c145e5ed54e7c94e8a9f469947e31c9298177d546f", + "sha256": "5a5c7a5deeef2cc2ffe6076a33b0429f4a20ceac22a397297aed2b1eb067e611", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.0" + "version": "2.9.0" }, "flutter_svg": { "dependency": "transitive", "description": { "name": "flutter_svg", - "sha256": "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123", + "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.16" + "version": "2.0.17" }, "flutter_test": { "dependency": "direct dev", @@ -987,21 +1017,21 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "go_router": { "dependency": "direct main", "description": { "name": "go_router", - "sha256": "7c2d40b59890a929824f30d442e810116caf5088482629c894b9e4478c67472d", + "sha256": "f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.6.3" + "version": "14.8.1" }, "google_fonts": { "dependency": "direct main", @@ -1057,11 +1087,11 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_client_helper": { "dependency": "transitive", @@ -1107,11 +1137,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.4" }, "infinite_listview": { "dependency": "transitive", @@ -1214,14 +1244,14 @@ "version": "4.1.5+1" }, "js": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.6.7" }, "js_packer": { "dependency": "direct main", @@ -1247,11 +1277,11 @@ "dependency": "direct main", "description": { "name": "json_path", - "sha256": "7a06bbb1cfad390b20fb7a2ca5e67d9ba59633879c6d71142b80fbf61c3b66f6", + "sha256": "a3a06eb005f2e93d0df7f263cdf76bbd02c7602f5c4bed9be94fcca4c36be03e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.4" + "version": "0.7.5" }, "json_view": { "dependency": "direct main", @@ -1267,31 +1297,31 @@ "dependency": "transitive", "description": { "name": "just_audio", - "sha256": "a49e7120b95600bd357f37a2bb04cd1e88252f7cdea8f3368803779b925b1049", + "sha256": "f978d5b4ccea08f267dae0232ec5405c1b05d3f3cd63f82097ea46c015d5c09e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.42" + "version": "0.9.46" }, "just_audio_platform_interface": { "dependency": "transitive", "description": { "name": "just_audio_platform_interface", - "sha256": "0243828cce503c8366cc2090cefb2b3c871aa8ed2f520670d76fd47aa1ab2790", + "sha256": "271b93b484c6f494ecd72a107fffbdb26b425f170c665b9777a0a24a726f2f24", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.4.0" }, "just_audio_web": { "dependency": "transitive", "description": { "name": "just_audio_web", - "sha256": "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448", + "sha256": "58915be64509a7683c44bf11cd1a23c15a48de104927bee116e3c63c8eeea0d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.13" + "version": "0.4.14" }, "lazy_memo": { "dependency": "transitive", @@ -1396,23 +1426,22 @@ "media_kit": { "dependency": "direct main", "description": { - "path": "media_kit", - "ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "resolved-ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "url": "https://github.com/media-kit/media-kit.git" + "name": "media_kit", + "sha256": "48c10c3785df5d88f0eef970743f8c99b2e5da2b34b9d8f9876e598f62d9e776", + "url": "https://pub.dev" }, - "source": "git", - "version": "1.1.11" + "source": "hosted", + "version": "1.2.0" }, "media_kit_libs_android_video": { "dependency": "transitive", "description": { "name": "media_kit_libs_android_video", - "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c", + "sha256": "adff9b571b8ead0867f9f91070f8df39562078c0eb3371d88b9029a2d547d7b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.6" + "version": "1.3.7" }, "media_kit_libs_ios_video": { "dependency": "transitive", @@ -1428,11 +1457,11 @@ "dependency": "transitive", "description": { "name": "media_kit_libs_linux", - "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "sha256": "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.2.1" }, "media_kit_libs_macos_video": { "dependency": "transitive", @@ -1448,46 +1477,34 @@ "dependency": "direct main", "description": { "name": "media_kit_libs_video", - "sha256": "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288", + "sha256": "958cc55e7065d9d01f52a2842dab2a0812a92add18489f1006d864fb5e42a3ef", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.0.6" }, "media_kit_libs_windows_video": { - "dependency": "direct overridden", - "description": { - "path": "libs/windows/media_kit_libs_windows_video", - "ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "resolved-ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "url": "https://github.com/media-kit/media-kit.git" - }, - "source": "git", - "version": "1.0.10" - }, - "media_kit_native_event_loop": { "dependency": "transitive", "description": { - "name": "media_kit_native_event_loop", - "sha256": "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40", + "name": "media_kit_libs_windows_video", + "sha256": "dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.9" + "version": "1.0.11" }, "media_kit_video": { "dependency": "direct main", "description": { - "path": "media_kit_video", - "ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "resolved-ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "url": "https://github.com/media-kit/media-kit.git" + "name": "media_kit_video", + "sha256": "a656a9463298c1adc64c57f2d012874f7f2900f0c614d9545a3e7b8bb9e2137b", + "url": "https://pub.dev" }, - "source": "git", - "version": "1.2.5" + "source": "hosted", + "version": "1.3.0" }, "meta": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { "name": "meta", "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", @@ -1550,31 +1567,31 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.2" + "version": "8.3.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.2.0" }, "path": { "dependency": "direct main", @@ -1610,11 +1627,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.16" }, "path_provider_foundation": { "dependency": "transitive", @@ -1660,31 +1677,31 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.1" + "version": "11.4.0" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.13" + "version": "12.1.0" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "sha256": "f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.5" + "version": "9.4.6" }, "permission_handler_html": { "dependency": "transitive", @@ -1700,11 +1717,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.3.0" }, "permission_handler_windows": { "dependency": "transitive", @@ -1720,11 +1737,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "photo_view": { "dependency": "direct main", @@ -1786,15 +1803,35 @@ "source": "hosted", "version": "6.0.1" }, + "protobuf": { + "dependency": "direct main", + "description": { + "name": "protobuf", + "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "protoc_plugin": { + "dependency": "direct dev", + "description": { + "name": "protoc_plugin", + "sha256": "fb0554851c9eca30bd18405fbbfe81e39166d4a2f0e5b770606fd69da3da0b2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "21.1.2" + }, "provider": { "dependency": "transitive", "description": { "name": "provider", - "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.1.4" }, "pseudom": { "dependency": "direct main", @@ -1810,11 +1847,11 @@ "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", @@ -1949,21 +1986,21 @@ "dependency": "direct main", "description": { "name": "screen_brightness", - "sha256": "99b898dae860ebe55fc872d8e300c6eafff3ee4ccb09301b90adb3f241f29874", + "sha256": "eca7bd9d2c3c688bcad14855361cab7097839400b6b4a56f62b7ae511c709958", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "screen_brightness_android": { "dependency": "transitive", "description": { "name": "screen_brightness_android", - "sha256": "ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a", + "sha256": "6ba1b5812f66c64e9e4892be2d36ecd34210f4e0da8bdec6a2ea34f1aa42683e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "screen_brightness_ios": { "dependency": "transitive", @@ -2069,11 +2106,11 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400", + "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.3" + "version": "10.1.4" }, "share_plus_platform_interface": { "dependency": "transitive", @@ -2099,11 +2136,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.0" }, "sky_engine": { "dependency": "transitive", @@ -2145,41 +2182,41 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", + "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "sqflite_android": { "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", + "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4+6" + "version": "2.5.5" }, "sqflite_darwin": { "dependency": "transitive", "description": { "name": "sqflite_darwin", - "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c", + "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1+1" + "version": "2.4.2" }, "sqflite_platform_interface": { "dependency": "transitive", @@ -2255,11 +2292,11 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.3.1" }, "term_glyph": { "dependency": "transitive", @@ -2345,11 +2382,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.15" }, "url_launcher_ios": { "dependency": "transitive", @@ -2395,21 +2432,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.4.0" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.4" }, "uuid": { "dependency": "transitive", @@ -2425,11 +2462,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7", + "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.15" + "version": "1.1.18" }, "vector_graphics_codec": { "dependency": "transitive", @@ -2465,51 +2502,51 @@ "dependency": "transitive", "description": { "name": "video_player", - "sha256": "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17", + "sha256": "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.2" + "version": "2.9.5" }, "video_player_android": { "dependency": "transitive", "description": { "name": "video_player_android", - "sha256": "7018dbcb395e2bca0b9a898e73989e67c0c4a5db269528e1b036ca38bcca0d0b", + "sha256": "ae7d4f1b41e3ac6d24dd9b9d5d6831b52d74a61bdd90a7a6262a33d8bb97c29a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.17" + "version": "2.8.2" }, "video_player_avfoundation": { "dependency": "transitive", "description": { "name": "video_player_avfoundation", - "sha256": "33224c19775fd244be2d6e3dbd8e1826ab162877bd61123bf71890772119a2b7", + "sha256": "84b4752745eeccb6e75865c9aab39b3d28eb27ba5726d352d45db8297fbd75bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.5" + "version": "2.7.0" }, "video_player_platform_interface": { "dependency": "transitive", "description": { "name": "video_player_platform_interface", - "sha256": "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb", + "sha256": "df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.3" + "version": "6.3.0" }, "video_player_web": { "dependency": "transitive", "description": { "name": "video_player_web", - "sha256": "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10", + "sha256": "3ef40ea6d72434edbfdba4624b90fd3a80a0740d260667d91e7ecd2d79e13476", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.3.4" }, "vm_service": { "dependency": "transitive", @@ -2525,21 +2562,21 @@ "dependency": "transitive", "description": { "name": "volume_controller", - "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e", + "sha256": "e82fd689bb8e1fe8e64be3fa5946ff8699058f8cf9f4c1679acdba20cda7f5bd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.8" + "version": "3.3.3" }, "wakelock_plus": { "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.10" + "version": "1.2.11" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -2565,11 +2602,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", @@ -2585,11 +2622,11 @@ "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "webview_flutter": { "dependency": "transitive", @@ -2605,11 +2642,11 @@ "dependency": "transitive", "description": { "name": "webview_flutter_android", - "sha256": "3d535126f7244871542b2f0b0fcf94629c9a14883250461f9abe1a6644c1c379", + "sha256": "e09150b28a07933839adef0e4a088bb43e8c8d9e6b93025b01882d4067a58ab0", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "4.3.4" }, "webview_flutter_platform_interface": { "dependency": "transitive", @@ -2625,21 +2662,31 @@ "dependency": "transitive", "description": { "name": "webview_flutter_wkwebview", - "sha256": "b7e92f129482460951d96ef9a46b49db34bd2e1621685de26e9eaafd9674e7eb", + "sha256": "c14455137ce60a68e1ccaf4e8f2dae8cebcb3465ddaa2fcfb57584fb7c5afe4d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.3" + "version": "3.18.5" }, "win32": { "dependency": "direct main", "description": { "name": "win32", - "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.10.1" + "version": "5.12.0" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" }, "window_manager": { "dependency": "direct main", @@ -2733,7 +2780,7 @@ } }, "sdks": { - "dart": ">=3.7.0 <4.0.0", - "flutter": ">=3.27.0" + "dart": ">=3.7.2 <4.0.0", + "flutter": ">=3.29.0" } } diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix index aab7000014e8..24e11a5329f2 100644 --- a/pkgs/by-name/ma/mangojuice/package.nix +++ b/pkgs/by-name/ma/mangojuice/package.nix @@ -25,13 +25,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mangojuice"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "radiolamp"; repo = "mangojuice"; tag = finalAttrs.version; - hash = "sha256-NpNsYwktcce9R1LpoIL2vh5UzsgDqdPyS0D3mhM3F0w="; + hash = "sha256-LsXTzPSDELw1SKTDtgOMQe1FOPwdVft7VFacE4WezNQ="; }; patches = [ @@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Convenient alternative to GOverlay for setting up MangoHud"; homepage = "https://github.com/radiolamp/mangojuice"; + changelog = "https://github.com/radiolamp/mangojuice/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ gpl3Only ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ma/manifest-tool/package.nix b/pkgs/by-name/ma/manifest-tool/package.nix index 4880edc5d18b..9d3de5a520f9 100644 --- a/pkgs/by-name/ma/manifest-tool/package.nix +++ b/pkgs/by-name/ma/manifest-tool/package.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "manifest-tool"; - version = "2.1.9"; + version = "2.2.0"; modRoot = "v2"; src = fetchFromGitHub { owner = "estesp"; repo = "manifest-tool"; rev = "v${version}"; - hash = "sha256-tehdgYH73tmzjhJmTQuMWvciGYIyc6VeIMS2fFO7YP4="; + hash = "sha256-tEUsqrJGRhyirI8TEgG6r9crHX58webHO5v7JLLRQ30="; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git-revision diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 0b185bc3b041..4a0edc05a35e 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "manifold"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; rev = "v${finalAttrs.version}"; - hash = "sha256-wbeWxAeKyqjEPemc2e5n357gwq83pQlASOvMd0ZCE7g="; + hash = "sha256-GymlaLs6LIG/252suYnFrgeT1jwrYeIXMo++LCjFHD4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ma/manticore/package.nix b/pkgs/by-name/ma/manticore/package.nix deleted file mode 100644 index 883acec4526a..000000000000 --- a/pkgs/by-name/ma/manticore/package.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - stdenv, - fetchFromGitHub, - coreutils, - autoreconfHook, - smlnj, -}: - -let - rev = "7376cb20ba5285a6b076a73c821e4743809c1d9d"; -in -stdenv.mkDerivation { - pname = "manticore"; - version = "2019.12.03"; - - src = fetchFromGitHub { - owner = "ManticoreProject"; - repo = "manticore"; - sha256 = "17h3ar7d6145dyrm006r3gd5frk3v4apjk383n78dh4vlniv1ay2"; - inherit rev; - }; - - enableParallelBuilding = false; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ - coreutils - smlnj - ]; - - autoreconfFlags = [ - "-Iconfig" - "-vfi" - ]; - - unpackPhase = '' - mkdir -p $out - cd $out - unpackFile $src - mv source repo_checkout - cd repo_checkout - chmod u+w . -R - ''; - - postPatch = '' - patchShebangs . - substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout' - ''; - - preInstall = "mkdir -p $out/bin"; - - meta = { - description = "Parallel, pure variant of Standard ML"; - mainProgram = "pmlc"; - - longDescription = '' - Manticore is a high-level parallel programming language aimed at - general-purpose applications running on multi-core - processors. Manticore supports parallelism at multiple levels: - explicit concurrency and coarse-grain parallelism via CML-style - constructs and fine-grain parallelism via various light-weight - notations, such as parallel tuple expressions and NESL/Nepal-style - parallel array comprehensions. - ''; - - homepage = "http://manticore.cs.uchicago.edu/"; - }; -} diff --git a/pkgs/by-name/ma/mapcache/package.nix b/pkgs/by-name/ma/mapcache/package.nix index 5d38ce3f0362..23fd47c9e291 100644 --- a/pkgs/by-name/ma/mapcache/package.nix +++ b/pkgs/by-name/ma/mapcache/package.nix @@ -12,6 +12,7 @@ fcgi, gdal, geos, + gfortran, libgeotiff, libjpeg, libpng, @@ -23,21 +24,26 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mapcache"; version = "1.14.1"; src = fetchFromGitHub { owner = "MapServer"; repo = "mapcache"; - rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; + tag = "rel-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; hash = "sha256-AwdZdOEq9SZ5VzuBllg4U1gdVxZ9IVdqiDrn3QuRdCk="; }; - nativeBuildInputs = [ - cmake - pkg-config - ]; + nativeBuildInputs = + [ + cmake + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # work around for `ld: file not found: @rpath/libquadmath.0.dylib` + gfortran.cc + ]; buildInputs = [ apacheHttpd @@ -70,12 +76,18 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-std=c99"; + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace-fail "include_directories(\''${TIFF_INCLUDE_DIR})" "" \ + --replace-fail "target_link_libraries(mapcache \''${TIFF_LIBRARY})" "target_link_libraries(mapcache TIFF::TIFF)" + ''; + meta = { description = "Server that implements tile caching to speed up access to WMS layers"; homepage = "https://mapserver.org/mapcache/"; changelog = "https://www.mapserver.org/development/changelog/mapcache/"; license = lib.licenses.mit; - maintainers = lib.teams.geospatial.members; + teams = [ lib.teams.geospatial ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index 75a6ecac099c..1afe2d500365 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -1,26 +1,27 @@ { lib, - python3, fetchFromGitHub, + + python3Packages, }: -with python3.pkgs; -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mapproxy"; - version = "3.1.3"; + version = "4.1.1"; + disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mapproxy"; repo = "mapproxy"; tag = version; - hash = "sha256-Dltr4JlgE1aJfSybTbAxlUyjqkfaobupNNSj90j9taE="; + hash = "sha256-rsravNSmvx1/291VvfRm0Yx1eg32UJd+egeG4S2SNnk="; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" ''; - dependencies = [ + dependencies = with python3Packages; [ boto3 # needed for caches service future jsonschema @@ -33,19 +34,17 @@ buildPythonApplication rec { setuptools werkzeug ]; + # Tests are disabled: # 1) Dependency list is huge. # https://github.com/mapproxy/mapproxy/blob/master/requirements-tests.txt - # - # 2) There are security issues with package Riak - # https://github.com/NixOS/nixpkgs/issues/33876 - # https://github.com/NixOS/nixpkgs/pull/56480 doCheck = false; meta = { description = "Open source proxy for geospatial data"; homepage = "https://mapproxy.org/"; license = lib.licenses.asl20; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ rakesh4g ]); + maintainers = with lib.maintainers; [ rakesh4g ]; + teams = [ lib.teams.geospatial ]; }; } diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index d3e6da773688..a3bbd8239692 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { homepage = "https://mapserver.org/"; changelog = "https://mapserver.org/development/changelog/"; license = lib.licenses.mit; - maintainers = lib.teams.geospatial.members; + teams = [ lib.teams.geospatial ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ma/mar1d/fix-aarch64.patch b/pkgs/by-name/ma/mar1d/fix-aarch64.patch new file mode 100644 index 000000000000..b45d54eb6d50 --- /dev/null +++ b/pkgs/by-name/ma/mar1d/fix-aarch64.patch @@ -0,0 +1,45 @@ +diff --git a/src/parsing.c b/src/parsing.c +index 8d97a7e..786a536 100644 +--- a/src/parsing.c ++++ b/src/parsing.c +@@ -348,8 +348,8 @@ void io_getLevels(level** ls, char* fn){ + memset(io_cs, 0, sizeof(color) * CHAR_MAX); + *ls = salloc(sizeof(level) * CHAR_MAX); + memset(*ls, 0, sizeof(level *) * CHAR_MAX); +- char c; +- char name = '\0'; ++ int c; ++ int name = '\0'; + while((c = fgetc(f)) != EOF){ + if (c == 'C' || c == 'O' || c == 'L') { + name = fgetc(f); +diff --git a/src/parsing.h b/src/parsing.h +index d4be0a0..ae485ae 100644 +--- a/src/parsing.h ++++ b/src/parsing.h +@@ -16,9 +16,9 @@ int io_getFont(bool**, char*); + + void io_getColor(FILE*, color*); + +-void io_getLevel(FILE*, level*, obj[127]); ++void io_getLevel(FILE*, level*, obj[CHAR_MAX]); + +-void io_getObj(FILE*, obj*, char, color[127]); ++void io_getObj(FILE*, obj*, char, color[CHAR_MAX]); + + // TODO: this is named terribly. There should be another function io_readLevels that's exposed. this should be private and take in FILE* + void io_getLevels(level**, char*); +diff --git a/src/visual_sounds.c b/src/visual_sounds.c +index 067e2e3..5e5cdc4 100644 +--- a/src/visual_sounds.c ++++ b/src/visual_sounds.c +@@ -921,6 +921,9 @@ void vs_mainPlay(int snd) { + } + + void vs_mainStop() { ++ if (vs_mainVisual == SND_none) { ++ return; ++ } + vs_sounds[vs_mainVisual].cur = NULL; + vs_mainVisual = SND_none; + } diff --git a/pkgs/by-name/ma/mar1d/package.nix b/pkgs/by-name/ma/mar1d/package.nix index 5494432ac91a..2b57511e4dd9 100644 --- a/pkgs/by-name/ma/mar1d/package.nix +++ b/pkgs/by-name/ma/mar1d/package.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/Radvendii/MAR1D/commit/baf3269e90eca69f154a43c4c1ef14677a6300fd.patch"; hash = "sha256-ybdLA2sO8e0J7w4roSdMWn72OkttD3y+cJ3ScuGiHCI="; }) + # https://github.com/Radvendii/MAR1D/pull/5 + ./fix-aarch64.patch ]; meta = { diff --git a/pkgs/by-name/ma/mariadb-connector-java/package.nix b/pkgs/by-name/ma/mariadb-connector-java/package.nix index 9b30c1a218b1..ea84e1cf8f0f 100644 --- a/pkgs/by-name/ma/mariadb-connector-java/package.nix +++ b/pkgs/by-name/ma/mariadb-connector-java/package.nix @@ -7,13 +7,13 @@ maven.buildMavenPackage rec { pname = "mariadb-connector-java"; - version = "3.5.2"; + version = "3.5.3"; src = fetchFromGitHub { owner = "mariadb-corporation"; repo = "mariadb-connector-j"; tag = version; - hash = "sha256-/61AE+ywJo4ANBE+JYsS/tXJuwSuNnvB2JQIR43Gig4="; + hash = "sha256-EDfAjcgmQ6qZrQMm4Oo04TSGY2I12HpqpLNLp7iQ8Fc="; }; mvnHash = "sha256-Tj+W0Dqr0FQijqYSzeAmYnbKtPZQGqry62PAZuaiGbI="; diff --git a/pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/by-name/ma/mariadb-galera/package.nix index c7efd83a99b1..e1d3937c6d82 100644 --- a/pkgs/by-name/ma/mariadb-galera/package.nix +++ b/pkgs/by-name/ma/mariadb-galera/package.nix @@ -51,7 +51,8 @@ stdenv.mkDerivation rec { mainProgram = "garbd"; homepage = "https://galeracluster.com/"; license = licenses.lgpl2Only; - maintainers = with maintainers; [ izorkin ] ++ teams.helsinki-systems.members; + maintainers = with maintainers; [ izorkin ]; + teams = [ teams.helsinki-systems ]; platforms = platforms.all; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/ma/marisa/package.nix b/pkgs/by-name/ma/marisa/package.nix index 2ff016940d30..4f754de872b5 100644 --- a/pkgs/by-name/ma/marisa/package.nix +++ b/pkgs/by-name/ma/marisa/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "marisa"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "s-yata"; repo = "marisa-trie"; rev = "v${version}"; - sha256 = "1hy8hfksizk1af6kg8z3b9waiz6d5ggd73fiqcvmhfgra36dscyq"; + sha256 = "sha256-+OGtDbwl7ar3i65POkTGyC4AYkOT4YuASfdt5FGJ8yM="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix index ebf3adf13240..71ec2cc03056 100644 --- a/pkgs/by-name/ma/mark/package.nix +++ b/pkgs/by-name/ma/mark/package.nix @@ -1,21 +1,23 @@ { lib, - buildGoModule, + buildGo123Module, fetchFromGitHub, }: -buildGoModule rec { +# Tests with go 1.24 do not work. For now +# https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996 +buildGo123Module rec { pname = "mark"; - version = "12.1.2"; + version = "12.2.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; - rev = version; - sha256 = "sha256-t70Od27w/ZT/EHKAgjPBx39Oo4dS1aWL3up7TVlNAuI="; + rev = "${version}"; + sha256 = "sha256-0w6rIOSnOS7EfTBA/mRNWm8KOtdviTxWdukl4reb4zE="; }; - vendorHash = "sha256-XPTnsV0JVSatfHzI4ajq8nnN2HTKc8FeKwmOIuXo2GU="; + vendorHash = "sha256-CqFCjSXw7/jLe1OYosUl6mKSPEsdHl8p3zb/LVNqnxM="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/markdown-code-runner/package.nix b/pkgs/by-name/ma/markdown-code-runner/package.nix new file mode 100644 index 000000000000..94615392a96c --- /dev/null +++ b/pkgs/by-name/ma/markdown-code-runner/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage { + pname = "markdown-code-runner"; + version = "0-unstable-2025-04-18"; + + src = fetchFromGitHub { + owner = "drupol"; + repo = "markdown-code-runner"; + rev = "9907df63574d714abcd78f9dfdf4bdda73ff30d6"; + hash = "sha256-Bn+IsZzV07bm5TNRX3+OOuxi3kj7d73gYPzcdIxWMi8="; + }; + + cargoHash = "sha256-HOJCnuzd6i4v1SpR4jstlpNkvSgH/4kvvE6Lsr4cgbI="; + + dontUseCargoParallelTests = true; + + meta = { + description = "A configurable Markdown code runner that executes and optionally replaces code blocks using external commands"; + longDescription = '' + markdown-code-runner is a command-line tool that scans Markdown files for fenced code blocks, + executes them using per-language configuration, and optionally replaces the block content + with the command output. + + It is useful for documentation that stays in sync with linters, formatters, or scripts. + The tool supports placeholder substitution, configurable replace/check modes, and CI-friendly validation. + ''; + homepage = "https://github.com/drupol/markdown-code-runner"; + license = lib.licenses.eupl12; + mainProgram = "mdcr"; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ma/markdownlint-cli/package.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix index a0e65f253922..8077203db5c7 100644 --- a/pkgs/by-name/ma/markdownlint-cli/package.nix +++ b/pkgs/by-name/ma/markdownlint-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "markdownlint-cli"; - version = "0.44.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "igorshubovych"; repo = "markdownlint-cli"; rev = "v${version}"; - hash = "sha256-1CQVj2iFywimK9sBJ60u9xH5qm/stEOA0yAHcUSAdY8="; + hash = "sha256-H6vK0ZJarNK9h3T/304SO8HNiZUGdrAA72wA6XPZbPQ="; }; - npmDepsHash = "sha256-iRK+8wyqHmP6vluDVBs3L4IpnZVvVfEfKDit+9YFU4g="; + npmDepsHash = "sha256-puRm56VO711HC/CXCfUfODfy7ZVwEhucjwIikiHCf5E="; dontNpmBuild = true; diff --git a/pkgs/by-name/ma/marker/fix_incompatible_pointer_in_marker_window_init.patch b/pkgs/by-name/ma/marker/fix_incompatible_pointer_in_marker_window_init.patch new file mode 100644 index 000000000000..0421e8ff4ef6 --- /dev/null +++ b/pkgs/by-name/ma/marker/fix_incompatible_pointer_in_marker_window_init.patch @@ -0,0 +1,25 @@ +From 92a679e02f08eef8e2f8c91371b7a3a1f95b4bbc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tomi=20L=C3=A4hteenm=C3=A4ki?= +Date: Fri, 25 Apr 2025 22:04:10 +0300 +Subject: [PATCH] Fix incompatible pointer in marker_window_init() + +The `g_action_group_activate_action()` takes `GActionGroup` as first parameter. + +This fixes compilation with `-Wincompatible-pointer-types`. +--- + src/marker-window.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/marker-window.c b/src/marker-window.c +index 0ffd0ce3..98b2fdc5 100644 +--- a/src/marker-window.c ++++ b/src/marker-window.c +@@ -866,7 +866,7 @@ marker_window_init (MarkerWindow *window) + if (marker_prefs_get_show_sidebar()) + { + // show sidebar and set the "Sidebar" button as activated +- g_action_group_activate_action(G_ACTION_MAP (window), "sidebar", NULL); ++ g_action_group_activate_action(G_ACTION_GROUP (window), "sidebar", NULL); + } + g_signal_connect(window, "delete-event", G_CALLBACK(window_deleted_event_cb), window); + diff --git a/pkgs/by-name/ma/marker/package.nix b/pkgs/by-name/ma/marker/package.nix index 2a5165da2b3b..990f016b9311 100644 --- a/pkgs/by-name/ma/marker/package.nix +++ b/pkgs/by-name/ma/marker/package.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0="; }; + patches = [ + # https://github.com/fabiocolacio/Marker/pull/427 + ./fix_incompatible_pointer_in_marker_window_init.patch + ]; + nativeBuildInputs = [ itstool meson diff --git a/pkgs/by-name/ma/markets/package.nix b/pkgs/by-name/ma/markets/package.nix deleted file mode 100644 index b06f5fa4fd32..000000000000 --- a/pkgs/by-name/ma/markets/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - desktop-file-utils, - glib, - gtk3, - meson, - ninja, - pkg-config, - python3, - vala, - wrapGAppsHook3, - glib-networking, - gobject-introspection, - json-glib, - libgee, - libhandy, - libsoup_2_4, -}: - -stdenv.mkDerivation rec { - pname = "markets"; - version = "0.5.4"; - - src = fetchFromGitHub { - owner = "bitstower"; - repo = "markets"; - rev = version; - sha256 = "sha256-/g/r/1i69PmPND40zIID3Nun0I4ZFT1EFoNf1qprBjI="; - }; - - nativeBuildInputs = [ - desktop-file-utils - glib - gtk3 - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook3 - gobject-introspection - ]; - buildInputs = [ - glib - glib-networking - gtk3 - json-glib - libgee - libhandy - libsoup_2_4 - ]; - - postPatch = '' - patchShebangs build-aux/meson/postinstall.py - ''; - - postInstall = '' - ln -s bitstower-markets $out/bin/markets - ''; - - meta = with lib; { - homepage = "https://github.com/bitstower/markets"; - description = "Stock, currency and cryptocurrency tracker"; - maintainers = with maintainers; [ qyliss ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix index 1a095a3520eb..6f4dcac1317c 100644 --- a/pkgs/by-name/ma/marktext/package.nix +++ b/pkgs/by-name/ma/marktext/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "marktext"; - version = "0.17.0-unstable-2024-06-10"; + version = "0.17.1-unstable-2024-06-10"; src = fetchFromGitHub { owner = "marktext"; diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix index baabb4624d87..5155985b1f98 100644 --- a/pkgs/by-name/ma/markuplinkchecker/package.nix +++ b/pkgs/by-name/ma/markuplinkchecker/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: let version = "0.21.0"; @@ -26,15 +24,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/ma/martin/package.nix b/pkgs/by-name/ma/martin/package.nix new file mode 100644 index 000000000000..b111df18b60a --- /dev/null +++ b/pkgs/by-name/ma/martin/package.nix @@ -0,0 +1,66 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "martin"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "maplibre"; + repo = "martin"; + rev = "v${version}"; + hash = "sha256-Jq72aEwM5bIaVywmS3HetR6nnBZnr3oa9a/4ZbgeL9E="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-595VKHLajoNinyv12J9qUi55hOcOFRgUeLlzvSdjESs="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + checkFlags = [ + "--skip function_source_schemas" + "--skip function_source_tile" + "--skip function_source_tilejson" + "--skip pg_get_function_tiles" + "--skip pg_get_function_source_ok_rewrite" + "--skip pg_get_function_source_ok" + "--skip pg_get_composite_source_tile_minmax_zoom_ok" + "--skip pg_get_function_source_query_params_ok" + "--skip pg_get_composite_source_tile_ok" + "--skip pg_get_catalog" + "--skip pg_get_composite_source_ok" + "--skip pg_get_health_returns_ok" + "--skip pg_get_table_source_ok" + "--skip pg_get_table_source_rewrite" + "--skip pg_null_functions" + "--skip utils::test_utils::tests::test_bad_os_str" + "--skip utils::test_utils::tests::test_get_env_str" + "--skip pg_get_table_source_multiple_geom_tile_ok" + "--skip pg_get_table_source_tile_minmax_zoom_ok" + "--skip pg_tables_feature_id" + "--skip pg_get_table_source_tile_ok" + "--skip table_source_schemas" + "--skip tables_srid_ok" + "--skip tables_tile_ok" + "--skip table_source" + "--skip tables_tilejson" + "--skip tables_multiple_geom_ok" + ]; + + meta = with lib; { + description = "Blazing fast and lightweight PostGIS vector tiles server"; + homepage = "https://martin.maplibre.org/"; + license = with licenses; [ + mit # or + asl20 + ]; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index db4fa214b380..062995bcb39e 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "mas"; - version = "1.9.0"; + version = "2.2.2"; src = fetchurl { url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas-${version}.pkg"; - hash = "sha256-MiSrCHLby3diTAzDPCYX1ZwdmzcHwOx/UJuWrlRJe54="; + hash = "sha256-v+tiD5ZMVFzeShyuOt8Ss3yw6p8VjopHaMimOQznL6o="; }; nativeBuildInputs = [ @@ -53,6 +53,7 @@ stdenvNoCC.mkDerivation rec { description = "Mac App Store command line interface"; homepage = "https://github.com/mas-cli/mas"; license = licenses.mit; + mainProgram = "mas"; maintainers = with maintainers; [ steinybot zachcoyle diff --git a/pkgs/by-name/ma/maskprocessor/package.nix b/pkgs/by-name/ma/maskprocessor/package.nix index f6eb9ab8194e..a146421a5982 100644 --- a/pkgs/by-name/ma/maskprocessor/package.nix +++ b/pkgs/by-name/ma/maskprocessor/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ma/master_me/package.nix b/pkgs/by-name/ma/master_me/package.nix new file mode 100644 index 000000000000..3f62b0f62d03 --- /dev/null +++ b/pkgs/by-name/ma/master_me/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libGL, + libX11, + libXext, + libXrandr, + pkg-config, + python3, +}: +stdenv.mkDerivation rec { + pname = "master_me"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "trummerschlunk"; + repo = "master_me"; + rev = version; + fetchSubmodules = true; + hash = "sha256-FG3X1dOF9KRHHSnd5/zP+GrYCB2O0y+tnI5/l9tNhyE="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = + [ + libGL + python3 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXext + libXrandr + ]; + + enableParallelBuilding = true; + + postPatch = '' + patchShebangs ./dpf/utils/ + ''; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + homepage = "https://github.com/trummerschlunk/master_me"; + description = "automatic mastering plugin for live streaming, podcasts and internet radio"; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.all; + broken = stdenv.hostPlatform.isDarwin; # error: no type or protocol named 'NSPasteboardType' + license = licenses.gpl3Plus; + mainProgram = "master_me"; + }; +} diff --git a/pkgs/by-name/ma/matcha-gtk-theme/package.nix b/pkgs/by-name/ma/matcha-gtk-theme/package.nix index 74d5dde06f25..61b923022bb7 100644 --- a/pkgs/by-name/ma/matcha-gtk-theme/package.nix +++ b/pkgs/by-name/ma/matcha-gtk-theme/package.nix @@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-05-01"; + version = "2025-04-11"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "trQwRZ/JKIS8TcRIg0eL5GmB/yymDwqqNued0ddRuqU="; + sha256 = "sha256-vPAGEa3anWAynEg2AYme4qpHJdLDKk2CmL5iQ1mBYgM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index 5e575efb2afd..d46ddefb2d80 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -170,7 +170,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/environmentd"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ma/mathemagix/package.nix b/pkgs/by-name/ma/mathemagix/package.nix index 8e0add17dcd8..26165f55eb13 100644 --- a/pkgs/by-name/ma/mathemagix/package.nix +++ b/pkgs/by-name/ma/mathemagix/package.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "mathemagix"; - version = "11126"; + version = "11229"; src = fetchsvn { url = "https://subversion.renater.fr/anonscm/svn/mmx/"; rev = finalAttrs.version; - hash = "sha256-AFnYd5oFg/wgaHPjfZmqXNljEpoFW4h6f3UG+KZauEs="; + hash = "sha256-JSjgvbOjV/66wjFpLGI1vCTvNGdYX48JTGGvWdBzQm8="; }; strictDeps = true; diff --git a/pkgs/by-name/ma/mathgl/package.nix b/pkgs/by-name/ma/mathgl/package.nix index 45095e7f2bf7..4081f7d8cd59 100644 --- a/pkgs/by-name/ma/mathgl/package.nix +++ b/pkgs/by-name/ma/mathgl/package.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation rec { pname = "mathgl"; - version = "8.0.2"; + version = "8.0.3"; src = fetchurl { url = "mirror://sourceforge/mathgl/mathgl-${version}.tar.gz"; - sha256 = "sha256-cWYJlWhKawooI/Z49sQ4q6ukdKEVJGzfX5sLRgq/ysE="; + sha256 = "sha256-m7qe5qD4bRuPPzugN008t3b3ctu28aAWhMpsC9ViBNY="; }; nativeBuildInputs = [ @@ -35,5 +35,7 @@ stdenv.mkDerivation rec { ]; platforms = platforms.linux; maintainers = [ maintainers.GabrielDougherty ]; + # build tool make_bin is built for host + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; } diff --git a/pkgs/by-name/ma/mathmod/package.nix b/pkgs/by-name/ma/mathmod/package.nix index 09f295b0c0dd..2eec8e24f29d 100644 --- a/pkgs/by-name/ma/mathmod/package.nix +++ b/pkgs/by-name/ma/mathmod/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mathmod"; - version = "12.0"; + version = "12.1"; src = fetchFromGitHub { owner = "parisolab"; repo = "mathmod"; tag = finalAttrs.version; - hash = "sha256-h1iI7bheJVfE2+0m6Yk7QNCkl9Vye97tqb/WkQExVcQ="; + hash = "sha256-gDIYDXI9X24JAM1HP10EhJXkHZV2X8QngD5KPCUqdyI="; }; patches = [ ./fix-paths.patch ]; diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index ac0cc2633fc8..b935b23d1930 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "matomo"; - version = "5.2.2"; + version = "5.3.2"; src = fetchurl { url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz"; - hash = "sha256-ZEwz/KKZZwTFsKfwR0iKZM1ta4CUXJsWgBXika+pjb0="; + hash = "sha256-rn5Lr2BSrGitI16MLlP91znSPm2Asd6j0qI8N+1c+Lo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -95,6 +95,8 @@ stdenv.mkDerivation (finalAttrs: { extraArgs = [ "--url" "https://github.com/matomo-org/matomo" + "--version-regex" + "^(\\d+\\.\\d+\\.\\d+)$" ]; }; tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { @@ -109,15 +111,13 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://matomo.org/"; changelog = "https://github.com/matomo-org/matomo/releases/tag/${finalAttrs.version}"; platforms = lib.platforms.all; - maintainers = - with lib.maintainers; - [ - florianjacob - sebbel - twey - boozedog - niklaskorz - ] - ++ lib.teams.flyingcircus.members; + maintainers = with lib.maintainers; [ + florianjacob + sebbel + twey + boozedog + niklaskorz + ]; + teams = [ lib.teams.flyingcircus ]; }; }) diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index 6283e5b2ad86..60c4157e8faa 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -7,16 +7,16 @@ buildGo124Module rec { pname = "matrix-alertmanager-receiver"; - version = "2025.3.26"; + version = "2025.4.23"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = version; - hash = "sha256-IIuYsuNEQheMZmhU06kkz9wP75s53Nl/nGDqdlebnL8="; + hash = "sha256-ubSrj8mUc0b6fwRuvaw8oapTyIbDRvlzEqpjIFEY1FQ="; }; - vendorHash = "sha256-aMk82HLfuIP+HEFinVUf4WXZC3y6RAUhf/e+ZwXD46k="; + vendorHash = "sha256-8LQ4SJ1zapBRuFDX8VxYUvA6jzukVml8Jr+B3zQKFOs="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/matrix-appservice-slack/package.nix b/pkgs/by-name/ma/matrix-appservice-slack/package.nix index b37ebccbf2f2..0a24e694698a 100644 --- a/pkgs/by-name/ma/matrix-appservice-slack/package.nix +++ b/pkgs/by-name/ma/matrix-appservice-slack/package.nix @@ -4,13 +4,13 @@ fetchYarnDeps, makeWrapper, mkYarnPackage, - nodejs_18, + nodejs_20, callPackage, }: let data = lib.importJSON ./pin.json; - nodejs = nodejs_18; + nodejs = nodejs_20; matrix-sdk-crypto-nodejs = callPackage ./matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix { }; in mkYarnPackage rec { @@ -59,5 +59,7 @@ mkYarnPackage rec { chvp ]; license = licenses.asl20; + # Depends on nodejs_18 that has been removed. + broken = true; }; } diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index b88b92d78f90..2612dcc1f616 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -10,29 +10,28 @@ sqlite, zstd, stdenv, - darwin, open-policy-agent, cctools, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "0.14.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; - tag = "v${version}"; - hash = "sha256-s6LVCISmbG3ubY/67DcUUE/pnTJSE0v9n8INmLMQNcw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/UrMmC5DTxoN6uzvTB+V3//hGQmKlkYvi5Lv4p31fq4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VJiIt0/zTJgCCskevb4/p62im/lAMkyJSiFUdaIdKO8="; + cargoHash = "sha256-UvRv69rHqPNqTg5nhUojTDHEFUIXF8LEB4ndzA7CHc0="; npmDeps = fetchNpmDeps { - name = "${pname}-${version}-npm-deps"; - src = "${src}/${npmRoot}"; - hash = "sha256-5Hq7wbvm3bLUSLAkLd3SNdwYCVhniV4XMCI84mO0iTc="; + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + src = "${finalAttrs.src}/${finalAttrs.npmRoot}"; + hash = "sha256-7EN8GIO8VutAZujVvgM67fGIXWD2aJhHhEJrTeHRiGE="; }; npmRoot = "frontend"; @@ -46,19 +45,14 @@ rustPlatform.buildRustPackage rec { (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; # libtool used by gyp; - buildInputs = - [ - sqlite - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.SystemConfiguration - ]; + buildInputs = [ + sqlite + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; + VERGEN_GIT_DESCRIBE = finalAttrs.version; }; buildNoDefaultFeatures = true; @@ -92,9 +86,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "OAuth2.0 + OpenID Provider for Matrix Homeservers"; homepage = "https://github.com/element-hq/matrix-authentication-service"; - changelog = "https://github.com/element-hq/matrix-authentication-service/releases/tag/v${version}"; + changelog = "https://github.com/element-hq/matrix-authentication-service/releases/tag/v${finalAttrs.version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ teutat3s ]; mainProgram = "mas-cli"; }; -} +}) diff --git a/pkgs/by-name/ma/matrix-commander-rs/package.nix b/pkgs/by-name/ma/matrix-commander-rs/package.nix index 1248862513b4..b5782bd57d1b 100644 --- a/pkgs/by-name/ma/matrix-commander-rs/package.nix +++ b/pkgs/by-name/ma/matrix-commander-rs/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, openssl, pkg-config, @@ -28,12 +26,7 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; meta = { description = "CLI-based Matrix client app for sending and receiving"; diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix index 6dcea572c57f..16d1ad758aa3 100644 --- a/pkgs/by-name/ma/matrix-conduit/package.nix +++ b/pkgs/by-name/ma/matrix-conduit/package.nix @@ -5,7 +5,6 @@ pkg-config, sqlite, stdenv, - darwin, nixosTests, rocksdb, rust-jemalloc-sys, @@ -36,15 +35,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - sqlite - rust-jemalloc-sys - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + sqlite + rust-jemalloc-sys + ]; env = { ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix new file mode 100644 index 000000000000..fe082b6e8517 --- /dev/null +++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix @@ -0,0 +1,115 @@ +{ + lib, + rustPlatform, + fetchFromGitea, + pkg-config, + bzip2, + zstd, + stdenv, + rocksdb, + nix-update-script, + testers, + matrix-continuwuity, + enableBlurhashing ? true, + # upstream continuwuity enables jemalloc by default, so we follow suit + enableJemalloc ? true, + rust-jemalloc-sys, + enableLiburing ? stdenv.hostPlatform.isLinux, + liburing, + nixosTests, +}: +let + rust-jemalloc-sys' = rust-jemalloc-sys.override { + unprefixed = !stdenv.hostPlatform.isDarwin; + }; + rocksdb' = rocksdb.override { + inherit enableLiburing; + # rocksdb does not support prefixed jemalloc, which is required on darwin + enableJemalloc = enableJemalloc && !stdenv.hostPlatform.isDarwin; + jemalloc = rust-jemalloc-sys'; + }; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "matrix-continuwuity"; + version = "0.5.0-rc.5"; + + src = fetchFromGitea { + domain = "forgejo.ellis.link"; + owner = "continuwuation"; + repo = "continuwuity"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Oq2scBu3Ewao828BT1QGffqIqF5WoH9HMXEXKg1YU0o="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-bjjGR3++CaDEtlsQj9GgdViCEB5l72sI868uTFBtIwg="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = + [ + bzip2 + zstd + ] + ++ lib.optional enableJemalloc rust-jemalloc-sys' + ++ lib.optional enableLiburing liburing; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include"; + ROCKSDB_LIB_DIR = "${rocksdb'}/lib"; + }; + + buildNoDefaultFeatures = true; + # See https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/Cargo.toml + # for available features. + # We enable all default features except jemalloc, blurhashing, and io_uring, which + # we guard behind our own (default-enabled) flags. + buildFeatures = + [ + "brotli_compression" + "element_hacks" + "gzip_compression" + "media_thumbnail" + "release_max_log_level" + "systemd" + "url_preview" + "zstd_compression" + ] + ++ lib.optional enableBlurhashing "blurhashing" + ++ lib.optional enableJemalloc [ + "jemalloc" + "jemalloc_conf" + ] + ++ lib.optional enableLiburing "io_uring"; + + passthru = { + updateScript = nix-update-script { }; + tests = + { + version = testers.testVersion { + inherit (finalAttrs) version; + package = matrix-continuwuity; + }; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + inherit (nixosTests) matrix-continuwuity; + }; + }; + + meta = { + description = "Matrix homeserver written in Rust, forked from conduwuit"; + homepage = "https://continuwuity.org/"; + changelog = "https://forgejo.ellis.link/continuwuation/continuwuity/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + nyabinary + snaki + ]; + # Not a typo, continuwuity is a drop-in replacement for conduwuit. + mainProgram = "conduwuit"; + }; +}) diff --git a/pkgs/by-name/ma/matrix-gtk-theme/package.nix b/pkgs/by-name/ma/matrix-gtk-theme/package.nix index 00a3f052847e..1525f050d620 100644 --- a/pkgs/by-name/ma/matrix-gtk-theme/package.nix +++ b/pkgs/by-name/ma/matrix-gtk-theme/package.nix @@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-11-06"; + version = "0-unstable-2025-05-06"; src = fetchFromGitHub { owner = "D3vil0p3r"; repo = "Matrix-GTK-Theme"; - rev = "a91254e5827f5fb331308ecf893881bc9643f01a"; - hash = "sha256-XiXKzXzzWcJIfEV8ngczovyjCqH7uX8tToihq66q+jo="; + rev = "ef8a4e2e5e2b42c5ac1d649e88e40cba420321ca"; + hash = "sha256-H/MKwZ5IdRekoCKtw3hHOUke8fKU4hdBLT11Lzn7c7I="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/by-name/ma/matrix-media-repo/package.nix b/pkgs/by-name/ma/matrix-media-repo/package.nix index f15eb89e33e8..5a4b057357cc 100644 --- a/pkgs/by-name/ma/matrix-media-repo/package.nix +++ b/pkgs/by-name/ma/matrix-media-repo/package.nix @@ -8,16 +8,16 @@ }: let pname = "matrix-media-repo"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "t2bot"; repo = "matrix-media-repo"; rev = "v${version}"; - hash = "sha256-trVn+Mn98aJLQCpQX1+qps/uuA5+8zeDoM94eauxHO8="; + hash = "sha256-KP1ZyHqeATxk1PCLuM6lPk+GB4Rd0f7ppKVETIURx28="; }; - vendorHash = "sha256-fKDdL7C3L33caoXxlutzoND2izB5GH+5qTeojTskIUg="; + vendorHash = "sha256-+sHy4Lgufs5jdN/V9W06U4dOZrsPiX87zmR1UwGHhQg="; asset-compiler = buildGoModule { pname = "${pname}-compile_assets"; diff --git a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix index a9d7ab36dd76..e40aa7e6d11d 100644 --- a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix +++ b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation rec { pname = "matrix-sdk-crypto-nodejs"; - version = "0.2.0-beta.1"; + version = "0.3.0-beta.1-unstable-2025-02-11"; src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-rust-sdk-crypto-nodejs"; - rev = "v${version}"; - hash = "sha256-g86RPfhF9XHpbXhHRbyhl920VazCrQyRQrYV6tVCHy4="; + rev = "f74a37e9c8f5af005119464a3501346b8c22695f"; + hash = "sha256-QHKFD9PPUXMb78GjSabk3vWnd5DIhTjtBZL8e/Tuw0g="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-5+nW5g9oxe4L39wJUkSuP3ul5yH8V+E7IdhQVfvzhNk="; + hash = "sha256-hKuFu8T7zCXlmiG7k3WJsLSDYhIu6vT5la+AZOmz8EM="; }; nativeBuildInputs = [ @@ -64,5 +64,7 @@ stdenv.mkDerivation rec { dandellion ]; inherit (nodejs.meta) platforms; + # napi_build doesn't handle most cross-compilation configurations + broken = (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) || stdenv.hostPlatform.isStatic; }; } diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 2090477f2050..a2c01eb52dc1 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, python3, openssl, libiconv, @@ -17,22 +18,31 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.127.1"; + version = "1.129.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-DNUKbb+d3BBp8guas6apQ4yFeXCc0Ilijtbt1hZkap4="; + hash = "sha256-JDaTFbRb2eNtzxZBLn8wOBEN5uJcInNrhFnGFZjI8is="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wI3vOfR5UpVFls2wPfgeIEj2+bmWdL3pDSsKfT+ysw8="; + hash = "sha256-PdAyEGLYmMLgcPQjzjuwvQo55olKgr079gsgQnUoKTM="; }; + patches = [ + # fix compatibility with authlib 1.5.2 + # https://github.com/element-hq/synapse/pull/18390 + (fetchpatch { + url = "https://github.com/element-hq/synapse/commit/c9adbc6a1ce6039b1c04ae3298e463a3e3b25c38.patch"; + hash = "sha256-0EZL0esZ6IEjmBV1whSpfZoFsMJ2yZQPi1GjW7NQ484="; + }) + ]; + postPatch = '' # Remove setuptools_rust from runtime dependencies # https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185 @@ -186,6 +196,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/element-hq/synapse/releases/tag/v${version}"; description = "Matrix reference homeserver"; license = licenses.agpl3Plus; - maintainers = with lib.maintainers; teams.matrix.members ++ [ sumnerevans ]; + maintainers = with maintainers; [ sumnerevans ]; + teams = [ teams.matrix ]; }; } diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/default.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/default.nix index 1f35ae050241..6736dbd6f313 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/default.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/default.nix @@ -7,4 +7,5 @@ matrix-synapse-pam = callPackage ./pam.nix { }; matrix-synapse-s3-storage-provider = callPackage ./s3-storage-provider.nix { }; matrix-synapse-shared-secret-auth = callPackage ./shared-secret-auth.nix { }; + synapse-http-antispam = callPackage ./synapse-http-antispam.nix { }; } diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix index fa38d1f7b772..061fb8ab8a5e 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "LDAP3 auth provider for Synapse"; homepage = "https://github.com/matrix-org/matrix-synapse-ldap3"; license = licenses.asl20; - maintainers = with maintainers; [ ] ++ teams.c3d2.members; + teams = [ teams.c3d2 ]; }; } diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix new file mode 100644 index 000000000000..35cc6fcf54a3 --- /dev/null +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + matrix-synapse-unwrapped, + nix-update-script, + twisted, +}: + +buildPythonPackage rec { + pname = "synapse-http-antispam"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "maunium"; + repo = "synapse-http-antispam"; + tag = "v${version}"; + hash = "sha256-YvgHIZ5Kr9WsX30QN8W5OJ4sxLB7EsLqUmCye3x+JQA="; + }; + + build-system = [ hatchling ]; + + pythonImportsCheck = [ "synapse_http_antispam" ]; + + buildInputs = [ matrix-synapse-unwrapped ]; + dependencies = [ twisted ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Synapse module that forwards spam checking to an HTTP server"; + homepage = "https://github.com/maunium/synapse-http-antispam"; + changelog = "https://github.com/maunium/synapse-http-antispam/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sumnerevans ]; + }; +} diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index ad141c593e89..2ce3996a482d 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, buildNpmPackage, - electron_33, + electron_34, makeWrapper, testers, mattermost-desktop, @@ -10,21 +10,21 @@ }: let - electron = electron_33; + electron = electron_34; in buildNpmPackage rec { pname = "mattermost-desktop"; - version = "5.10.2"; + version = "5.11.2"; src = fetchFromGitHub { owner = "mattermost"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-LHjVmrsOdk8vfsqvNEWkzpusm6jbz3SOb3bEaIb7rb4="; + hash = "sha256-03874pV7/GqydMdaSlh3N17LsbHppfPdYJ8nGdbvvbk="; }; - npmDepsHash = "sha256-LAbqsMdMmmHGgvg2ilz6neQxMOK3jtCKt8K0M8BWifs="; + npmDepsHash = "sha256-v6XEJJ9kozkY7HSLNJtM+86+36G7wt8xIFwCyO7x11Y="; npmBuildScript = "build-prod"; makeCacheWritable = true; @@ -59,7 +59,7 @@ buildNpmPackage rec { $out/share/applications \ $out/share/icons/hicolor/512x512/apps - readonly dist=release/linux-unpacked + readonly dist=release/*-unpacked cp -a $dist/resources $out/share/${pname} diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index d6624fde408d..aea81d315293 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -18,11 +18,14 @@ # the version regex here as well. # # Ensure you also check ../mattermostLatest/package.nix. - regex = "^v(9\\.11\\.[0-9]+)$"; - version = "9.11.11"; - srcHash = "sha256-ugFGb85Oolg9pXeNi2JFKWQ4eebmdr/O3xIGbKGFSvQ="; - vendorHash = "sha256-h/hcdVImU3wFp7BGHS/TxYBEWGv9v06y8etaz9OrHTA="; - npmDepsHash = "sha256-Kk0Bbx/Rs5xpwSpgpm9BSMMEMKmO6kgKgyv/oDIAZ7w="; + regex = "^v(10\\.5\\.[0-9]+)$"; + version = "10.5.5"; + srcHash = "sha256-ptyBYZvxCnqD3SX1Cy1uNFjM8wvBHDrroGsu1SnnuJs="; + vendorHash = "sha256-9Jl+lxvSoxUReziTqkDRyeNrijGWcBDbqoywJRIeD2k="; + npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0="; + lockfileOverlay = '' + unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react") + ''; }, }: @@ -80,7 +83,7 @@ let tests.mattermostWithTests = withTests; }; in - finalPassthru.withTests; + finalPassthru.withoutTests; in buildMattermost rec { pname = "mattermost"; diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix index 0eaf1c8966a9..84452edb54ba 100644 --- a/pkgs/by-name/ma/mattermost/tests.nix +++ b/pkgs/by-name/ma/mattermost/tests.nix @@ -39,9 +39,10 @@ mattermost.overrideAttrs ( + '' # Just echo install/get/mod commands in the Makefile, since the dependencies are locked. substituteInPlace server/Makefile \ - --replace-warn '$(GO) install' '@echo $(GO) install' \ - --replace-warn '$(GO) get' '@echo $(GO) get' \ - --replace-warn '$(GO) get' '@echo $(GO) mod' + --replace-warn '$(GO) install' 'echo $(GO) install' \ + --replace-warn '$(GOBIN)/go$$version download' 'echo $(GOBIN)/go$$version download' \ + --replace-warn '$(GO) get' 'echo $(GO) get' \ + --replace-warn '$(GO) get' 'echo $(GO) mod' # mmctl tests shell out by writing a bash script to a tempfile substituteInPlace server/cmd/mmctl/commands/config_e2e_test.go \ --replace-fail '#!/bin/bash' '#!${runtimeShell}' @@ -142,10 +143,17 @@ mattermost.overrideAttrs ( # Appear to be broken. "TestSessionStore/MySQL/SessionGetWithDeviceId" "TestSessionStore/MySQL/GetMobileSessionMetadata" + "TestSessionStore/MySQL/GetSessionsWithActiveDeviceIds" + "TestUpdateTeam" + "TestSyncSyncableRoles" ] ++ optionals (!stdenv.hostPlatform.isx86_64) [ # aarch64: invalid operating system or processor architecture "TestCanIUpgradeToE0" + + # aarch64: thumbnail previews are nondeterministic + "TestUploadFiles/multipart_Happy_image_thumbnail" + "TestUploadFiles/simple_Happy_image_thumbnail" ]; preCheck = '' diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index 3dee4870ce1c..c8b423013b10 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -11,10 +11,10 @@ mattermost.override { # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(10\\.[0-9]+\\.[0-9]+)$"; - version = "10.6.0"; - srcHash = "sha256-GnXxhhbOKJezUAyKRBbn5IE22gzsn80mwnPANOT9Qu4="; - vendorHash = "sha256-wj+bAQNJSs9m2SSfl+Ipm965iAhKQ2v1iMjH7I79qf4="; - npmDepsHash = "sha256-MdLfjLmizFbLfSqOdAZ+euXomB2ZPjZOqspQYnyHcuk="; + version = "10.8.0"; + srcHash = "sha256-JfMQXwRXb3KdZssi5z4KU+X6oBu4+SZRN7KeCBd2Q1E="; + vendorHash = "sha256-K51Ps1hvi4O0sCYAiAhYHJa2Igpt1dF16VUJPA3S3XA="; + npmDepsHash = "sha256-iddiDUXW9o6bCvswxCQTk9GbaZ1Kk0RN7RY9dPrClXQ="; lockfileOverlay = '' unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react") ''; diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 5f8ae3cdb2d3..c9f694e68cf9 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, + fetchpatch, libiconv, testers, nix-update-script, @@ -13,20 +13,29 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-k4s0kh68kycc8MSVkD64X547mWmFW4UuToDIcZ87OSc="; + hash = "sha256-qMiFHoEm6Q3Pwz8Gv6U75rTKO2Pj81g9rhqdyYJKOys="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6aLWkphWLScUz6l0RJj9LmNad6aPxLz2iVxXVOXq7pg="; + cargoHash = "sha256-7YPUTTRo9+aBmVXLq5NfU+t5VPxfEQc4+rdQnPN+AZ0="; + + patches = [ + # Sorts RECORD file in wheel archives to make them deterministic. See: https://github.com/NixOS/nixpkgs/issues/384708 + # Remove on next bump https://github.com/PyO3/maturin/pull/2550 + (fetchpatch { + name = "wheel-deterministic-record.patch"; + url = "https://github.com/PyO3/maturin/commit/bade37e108514f4288c1dd6457119a257bf95db4.patch"; + hash = "sha256-jcZ/NMHKFYQuOfR+fu5UPykEljUq3l/+ZAx0Tlyu3Zw="; + }) + ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/pkgs/by-name/ma/mautrix-discord/package.nix b/pkgs/by-name/ma/mautrix-discord/package.nix index b3943084ca55..79d75916b882 100644 --- a/pkgs/by-name/ma/mautrix-discord/package.nix +++ b/pkgs/by-name/ma/mautrix-discord/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mautrix-discord"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "discord"; rev = "v${version}"; - hash = "sha256-KRfbxPblOL4JznnGx9Jj5XXEWEKzan5xWvAwYmP7yGc="; + hash = "sha256-q6FpeGWoeIVVeomKMHpXUntMWsMJMV73FDiBfbMQ6Oc="; }; - vendorHash = "sha256-8SW2q4Svfe8X9qwzYBa5HhHyQZDsPJqig/V1/Wp+avo="; + vendorHash = "sha256-6R5ryzjAAAI3YtTMlHjrLOXkid2kCe8+ZICnNUjtxaQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 928d67fbe8b7..dc6153bab418 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "0.4.5"; + version = "0.4.6"; subPackages = [ "cmd/mautrix-meta" ]; @@ -23,13 +23,13 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-UWW5h4e6usxVkMH1TDGt62/ThlAhbeqivnYFIKPOqXE="; + hash = "sha256-FRK32NBtAro/+StacBa/jMg31xkxOKx791RBmuG61z8="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-fJuCNhbm6930zPyfXA8mbjyJmRdv0Zn0ZZ+ULImXjKU="; + vendorHash = "sha256-nFxWPMNV0La21W03WNDZNktcHYLFVzPY/SkAyp0AVxs="; passthru = { tests = { diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix index 86d66e59c493..fa6903d9ee8e 100644 --- a/pkgs/by-name/ma/mautrix-signal/package.nix +++ b/pkgs/by-name/ma/mautrix-signal/package.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "mautrix-signal"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; tag = "v${version}"; - hash = "sha256-w27e+gOnKsjYVSDAk8Wp7fx32igSg3sKqYyM6yUX088="; + hash = "sha256-BummgGQ+LNe4JYJHF4a2JfKEzgo7wVEMnAIbi1D0hS0="; }; buildInputs = @@ -41,7 +41,7 @@ buildGoModule rec { CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ]; - vendorHash = "sha256-UXloMc9XaJe096zwdHup2DiIoXqimNjSgQRuVXbV080="; + vendorHash = "sha256-aJrcX2aK4Ge7yELEssoVdsrR+/2qoqTr3usRFGooLGU="; doCheck = true; preCheck = @@ -60,14 +60,14 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = with lib; { homepage = "https://github.com/mautrix/signal"; description = "Matrix-Signal puppeting bridge"; license = licenses.agpl3Plus; maintainers = with maintainers; [ - niklaskorz + alyaeanyx ma27 ]; mainProgram = "mautrix-signal"; diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix index c81c36bf00c0..d29544550e04 100644 --- a/pkgs/by-name/ma/mautrix-slack/package.nix +++ b/pkgs/by-name/ma/mautrix-slack/package.nix @@ -13,7 +13,7 @@ withGoolm ? false, }: let - version = "0.2.0"; + version = "0.2.1"; in buildGoModule { pname = "mautrix-slack"; @@ -23,16 +23,16 @@ buildGoModule { owner = "mautrix"; repo = "slack"; tag = "v${version}"; - hash = "sha256-y6DsojQQAQkAB4puhk3DLheVvjn0puoYvzoX1H7gBEM="; + hash = "sha256-1/OuwyQU68tsg9WOl0Eg4ZM28sD6JDMQN9i1LZLYOuE="; }; - vendorHash = "sha256-1aYg6wDG2hzUshtHs9KiJDAFb4OM1oupUJAh3LR4KxY="; + vendorHash = "sha256-YjM2ZpXm3DGNRtCGvj7+0+bXAnb7HXYzQvxCSL4+hHo="; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix index 12438c912bc9..b38f13c39c4e 100644 --- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix +++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix @@ -14,19 +14,19 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.11.4"; + version = "0.12.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-6Fnkw/lf64T0EXpWvSSnIRBuHJVt01Ft8Ks43/jvtZ0="; + hash = "sha256-WZPmSIkRSCrI1krIWJ2abVw1t81vjcqewTdx0W2aD+Q="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-zMS6zZvJQAcnoklCi5qoM+aMMCSaeTQmQBxawgC67P8="; + vendorHash = "sha256-jgwi0ENJ064gWJWyvlSlaEicC+NAtn0Tdbnu6mzmLoE="; doCheck = false; diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index 4febe1647aab..e78c355b8dc0 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -84,7 +84,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; license = lib.licenses.asl20; mainProgram = "mvn"; - maintainers = with lib.maintainers; [ tricktron ] ++ lib.teams.java.members; + maintainers = with lib.maintainers; [ tricktron ]; + teams = [ lib.teams.java ]; inherit (jdk_headless.meta) platforms; }; }) diff --git a/pkgs/by-name/mb/mbtileserver/package.nix b/pkgs/by-name/mb/mbtileserver/package.nix index 12c64e6c9c43..a8e19da119f4 100644 --- a/pkgs/by-name/mb/mbtileserver/package.nix +++ b/pkgs/by-name/mb/mbtileserver/package.nix @@ -23,6 +23,6 @@ buildGoModule rec { homepage = "https://github.com/consbio/mbtileserver"; changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md"; license = licenses.isc; - maintainers = teams.geospatial.members; + teams = [ teams.geospatial ]; }; } diff --git a/pkgs/by-name/mb/mbuffer/package.nix b/pkgs/by-name/mb/mbuffer/package.nix index d20292c5269c..c5af0a7ac44c 100644 --- a/pkgs/by-name/mb/mbuffer/package.nix +++ b/pkgs/by-name/mb/mbuffer/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mbuffer"; - version = "20241007"; + version = "20250429"; outputs = [ "out" "man" @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${finalAttrs.version}.tgz"; - sha256 = "sha256-nXNjAQtO9FsWRva19QJ7SbtqIJxQL7hOKBx713HVa+0="; + sha256 = "sha256-qFPvcg1fw+9HwXiPlldHe3bXCrDJuKfZbpleMeNTa78="; }; buildInputs = [ diff --git a/pkgs/by-name/mc/mc/package.nix b/pkgs/by-name/mc/mc/package.nix new file mode 100644 index 000000000000..76e563bbbb21 --- /dev/null +++ b/pkgs/by-name/mc/mc/package.nix @@ -0,0 +1,110 @@ +{ + lib, + stdenv, + fetchurl, + buildPackages, + pkg-config, + glib, + gpm, + file, + e2fsprogs, + libICE, + perl, + zip, + unzip, + gettext, + slang, + libssh2, + openssl, + coreutils, + darwin, + x11Support ? true, + libX11, + + # updater only + writeScript, +}: + +stdenv.mkDerivation rec { + pname = "mc"; + version = "4.8.33"; + + src = fetchurl { + url = "https://ftp.osuosl.org/pub/midnightcommander/${pname}-${version}.tar.xz"; + hash = "sha256-yuFJ1C+ETlGF2MgdfbOROo+iFMZfhSIAqdiWtGivFkw="; + }; + + nativeBuildInputs = + [ + pkg-config + unzip + ] + # The preFixup hook rewrites the binary, which invaliates the code + # signature. Add the fixup hook to sign the output. + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + darwin.autoSignDarwinBinariesHook + ]; + + buildInputs = + [ + file + gettext + glib + libICE + libssh2 + openssl + slang + zip + ] + ++ lib.optionals x11Support [ libX11 ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + e2fsprogs + gpm + ]; + + enableParallelBuilding = true; + + configureFlags = [ + # used for vfs helpers at run time: + "PERL=${perl}/bin/perl" + # used for .hlp generation at build time: + "PERL_FOR_BUILD=${buildPackages.perl}/bin/perl" + + # configure arguments have a bunch of build-only dependencies. + # Avoid their retention in final closure. + "--disable-configure-args" + ]; + + postPatch = '' + substituteInPlace src/filemanager/ext.c \ + --replace /bin/rm ${coreutils}/bin/rm + ''; + + postFixup = lib.optionalString ((!stdenv.hostPlatform.isDarwin) && x11Support) '' + # libX11.so is loaded dynamically so autopatch doesn't detect it + patchelf \ + --add-needed ${libX11}/lib/libX11.so \ + $out/bin/mc + ''; + + passthru.updateScript = writeScript "update-mc" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of "Current version is: 4.8.27; ...". + new_version="$(curl -s https://midnight-commander.org/ | pcregrep -o1 'Current version is: (([0-9]+\.?)+);')" + update-source-version mc "$new_version" + ''; + + meta = with lib; { + description = "File Manager and User Shell for the GNU Project, known as Midnight Commander"; + downloadPage = "https://ftp.osuosl.org/pub/midnightcommander/"; + homepage = "https://midnight-commander.org"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sander ]; + platforms = platforms.linux ++ platforms.darwin; + mainProgram = "mc"; + }; +} diff --git a/pkgs/by-name/mc/mchprs/package.nix b/pkgs/by-name/mc/mchprs/package.nix index c3a38d74b0cd..d562355d6c00 100644 --- a/pkgs/by-name/mc/mchprs/package.nix +++ b/pkgs/by-name/mc/mchprs/package.nix @@ -6,8 +6,6 @@ openssl, sqlite, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,17 +27,11 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - openssl - sqlite - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + sqlite + zlib + ]; meta = with lib; { mainProgram = "mchprs"; diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix index 8f747a186c1c..c43a563a7e2f 100644 --- a/pkgs/by-name/mc/mcpelauncher-client/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix @@ -25,7 +25,7 @@ # Bionic libc part doesn't compile with GCC clangStdenv.mkDerivation (finalAttrs: { pname = "mcpelauncher-client"; - version = "1.2.0-qt6"; + version = "1.3.0-qt6"; # NOTE: check mcpelauncher-ui-qt when updating src = fetchFromGitHub { @@ -33,7 +33,7 @@ clangStdenv.mkDerivation (finalAttrs: { repo = "mcpelauncher-manifest"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-SyIiBUZCGcV4NFD7IcQv8YdRkDGhkBeqE0qVsKp+44Y="; + hash = "sha256-/I6hCnRSFHX30Gd0jErx5Uy/o8JCdYexsMRDKMUOWWI="; }; patches = [ ./dont_download_glfw_client.patch ]; diff --git a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix index 81352635f66d..39ccb25196d6 100644 --- a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "mcpelauncher-ui-manifest"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-333PwfBWhdfJSi1XrJNHidMYZrzSReb8s4VxBASFQ6Q="; + hash = "sha256-OvzdXr2Q7PHonaQ+y3VeAODCCVWBwuSCgUW3GghA1Ys="; }; patches = [ diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix new file mode 100644 index 000000000000..485d91a0da40 --- /dev/null +++ b/pkgs/by-name/mc/mcphost/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "mcphost"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "mark3labs"; + repo = "mcphost"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4vKzrT/1pEupiW3IaQV6d4Y2QHKNBH8sCA4TP8qn+50="; + }; + + vendorHash = "sha256-yD+83cuOIBFF91Zu4Xi2g+dsP4iUOTrjBOuetowLRQw="; + + meta = { + description = "A CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP"; + homepage = "https://github.com/mark3labs/mcphost"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "mcphost"; + }; +}) diff --git a/pkgs/by-name/mc/mcrypt/malloc_to_stdlib.patch b/pkgs/by-name/mc/mcrypt/malloc_to_stdlib.patch old mode 100755 new mode 100644 diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix index 9f65bd075fe7..2f85e6912070 100644 --- a/pkgs/by-name/mc/mctc-lib/package.nix +++ b/pkgs/by-name/mc/mctc-lib/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mctc-lib"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "grimme-lab"; repo = "mctc-lib"; rev = "v${version}"; - hash = "sha256-zR4J9gOKwUIfDZsHMdX/t+mKdTpHKYTZQBYxQMWC8Vk="; + hash = "sha256-AMRHvzL6CUPItCs07LLOB6Al3yfs8WgrPKRhuNbXiGw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mc/mcumgr-client/package.nix b/pkgs/by-name/mc/mcumgr-client/package.nix index 21b12fc2501b..a69f81120099 100644 --- a/pkgs/by-name/mc/mcumgr-client/package.nix +++ b/pkgs/by-name/mc/mcumgr-client/package.nix @@ -6,7 +6,6 @@ pkg-config, udev, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,9 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ udev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev ]; meta = with lib; { description = "Client for mcumgr commands"; diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index 5956ad70637a..abbb890aa74a 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - stdenv, - darwin, nix-update-script, }: @@ -24,12 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - ]; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index 2a0d2922dfa0..8337e202b47e 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -2,30 +2,23 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "mdbook-d2"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "danieleades"; repo = "mdbook-d2"; rev = "v${version}"; - hash = "sha256-PsPCbuSK8JlNZOqFbxCK0f8h+7EC4tNFtjBfJqiPi7Q="; + hash = "sha256-iVPB4SAzspw8gZHzEQVFRbFjyPCkxrvXvhMszopzslE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-emfO7D7JU/fQYdnaK7eWR8tCPx3ffvU/pTutSURZMBQ="; + cargoHash = "sha256-9D/osDyFwIhgv3scnnpsdN6S4qCPWuAU9tajENyWaXo="; doCheck = false; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - ]; - meta = with lib; { description = "D2 diagram generator plugin for MdBook"; mainProgram = "mdbook-d2"; diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix index 430e3f32f30a..5de989c1176a 100644 --- a/pkgs/by-name/md/mdbook-emojicodes/package.nix +++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-+VVkrXvsqtizeVhfuO0U8ADfSkmovpT7DVwrz7QljU0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; - meta = with lib; { description = "MDBook preprocessor for converting emojicodes (e.g. `: cat :`) into emojis 🐱"; mainProgram = "mdbook-emojicodes"; diff --git a/pkgs/by-name/md/mdbook-katex/package.nix b/pkgs/by-name/md/mdbook-katex/package.nix index 42378e78607a..122002573213 100644 --- a/pkgs/by-name/md/mdbook-katex/package.nix +++ b/pkgs/by-name/md/mdbook-katex/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.9.3"; + version = "0.9.4"; src = fetchCrate { inherit pname version; - hash = "sha256-5EYskcYEDZENK7ehws36+5MrTY2rNTXoFnWYOC+LuiQ="; + hash = "sha256-xwIW8igfxO9vsck8ktDBc7XFLuYzwqI3I4nLDTYC8JI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-j0BdEnPP7/0i1hg7GNgc+F4EeElVm6AZIWZNelYZLIU="; + cargoHash = "sha256-ULcjcY+CaVSohSzlm4KbSgG27IZyxX8zp8ifZNj5c54="; meta = { description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time"; diff --git a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix index fd18fe07fc96..a97b80644f49 100644 --- a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix +++ b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Render Kroki diagrams from files or code blocks in mdbook"; diff --git a/pkgs/by-name/md/mdbook-linkcheck/package.nix b/pkgs/by-name/md/mdbook-linkcheck/package.nix new file mode 100644 index 000000000000..498cb0f85582 --- /dev/null +++ b/pkgs/by-name/md/mdbook-linkcheck/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + testers, + mdbook-linkcheck, +}: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-linkcheck"; + version = "0.7.7"; + + src = fetchFromGitHub { + owner = "Michael-F-Bryan"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ZbraChBHuKAcUA62EVHZ1RygIotNEEGv24nhSPAEj00="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Tt7ljjWv2CMtP/ELZNgSH/ifmBk/42+E0r9ZXQEJNP8="; + + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; + + nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; + + OPENSSL_NO_VENDOR = 1; + + doCheck = false; # tries to access network to test broken web link functionality + + passthru.tests.version = testers.testVersion { package = mdbook-linkcheck; }; + + meta = with lib; { + description = "Backend for `mdbook` which will check your links for you"; + mainProgram = "mdbook-linkcheck"; + homepage = "https://github.com/Michael-F-Bryan/mdbook-linkcheck"; + license = licenses.mit; + maintainers = with maintainers; [ + zhaofengli + matthiasbeyer + ]; + }; +} diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 21d3dd72fba7..c08a936952c3 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -4,12 +4,10 @@ fetchFromGitHub, nix, rustPlatform, - darwin, - CoreServices ? darwin.apple_sdk.frameworks.CoreServices, installShellFiles, }: let - version = "0.4.47"; + version = "0.4.49"; in rustPlatform.buildRustPackage rec { inherit version; @@ -19,16 +17,14 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = "mdBook"; tag = "v${version}"; - hash = "sha256-XTvC2pGRVat0kOybNb9TziG32wDVexnFx2ahmpUFmaA="; + hash = "sha256-X+ptqzAOjCX2Tt5jDfH/jdUy99WrITGfzDj+F2DoI5w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ASPRBAB+elJuyXpPQBm3WI97wD3mjoO1hw0fNHc+KAw="; + cargoHash = "sha256-ZPJkSMcxyTOivfwThPfaO6oRkfewH048rrCDCwCtE8c="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd mdbook \ --bash <($out/bin/mdbook completions bash) \ diff --git a/pkgs/by-name/md/mdq/package.nix b/pkgs/by-name/md/mdq/package.nix index fdd5bb8a309e..3ebe6185ab24 100644 --- a/pkgs/by-name/md/mdq/package.nix +++ b/pkgs/by-name/md/mdq/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdq"; - version = "0.3.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "yshavit"; repo = "mdq"; tag = "v${finalAttrs.version}"; - hash = "sha256-IMDyPIuG5Zyp323XYsFcFo0yNimCm2DV9rY+Ac0DiZo="; + hash = "sha256-QGva+yuiNwez8z9j4SL8vpcHdUm8nxRFn+6WiZgdWjQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-GxQ9YyofalnIP3EtGVpIpg7s8QW2d1Z/gFF2CUBg1P0="; + cargoHash = "sha256-k+St07jA+F+c4md9OzFiDp9idie6zoNI65HEQ2JqynM="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/md/mdsf/package.nix b/pkgs/by-name/md/mdsf/package.nix new file mode 100644 index 000000000000..546c55c75ed6 --- /dev/null +++ b/pkgs/by-name/md/mdsf/package.nix @@ -0,0 +1,45 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: +let + pname = "mdsf"; + version = "0.5.1"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "hougesen"; + repo = "mdsf"; + tag = "v${version}"; + hash = "sha256-KHTWE3ENRc/VHrgwAag6DsnEU3c8Nqw15jR5jWlNrk4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-kgqRwYjDc/eV9wv1G6aAhfrGpoYDPCFfqaTm+T2p7uw="; + + checkFlags = [ + "--skip=tests::it_should_add_go_package_if_missing" + "--skip=tests::it_should_format_the_code" + "--skip=tests::it_should_format_the_codeblocks_that_start_with_whitespace" + "--skip=tests::it_should_not_care_if_go_package_is_set" + "--skip=tests::it_should_not_modify_outside_blocks" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool for formatting a linting markdown code snippets using language specific tools"; + homepage = "https://github.com/hougesen/mdsf"; + changelog = "https://github.com/hougesen/mdsf/releases"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + mainProgram = "mdsf"; + }; +} diff --git a/pkgs/by-name/md/mdzk/package.nix b/pkgs/by-name/md/mdzk/package.nix new file mode 100644 index 000000000000..12994582e9d4 --- /dev/null +++ b/pkgs/by-name/md/mdzk/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "mdzk"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "mdzk-rs"; + repo = "mdzk"; + rev = version; + hash = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs="; + }; + + cargoPatches = [ + # Remove when new version of mdzk is released. + ./update-mdbook-for-rust-1.64.patch + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-+x4pOtszvdzI/zR55ezcxlS52GrWQTuBn7vbnqDTVac="; + + meta = with lib; { + description = "Plain text Zettelkasten based on mdBook"; + homepage = "https://github.com/mdzk-rs/mdzk/"; + changelog = "https://github.com/mdzk-rs/mdzk/blob/main/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ + bryanasdev000 + ratsclub + ]; + mainProgram = "mdzk"; + }; +} diff --git a/pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch b/pkgs/by-name/md/mdzk/update-mdbook-for-rust-1.64.patch similarity index 100% rename from pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch rename to pkgs/by-name/md/mdzk/update-mdbook-for-rust-1.64.patch diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix index bbf356cad3e3..5132f564e99a 100644 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ b/pkgs/by-name/me/mealie/mealie-frontend.nix @@ -2,7 +2,7 @@ src: version: { lib, fetchYarnDeps, - nodejs_18, + nodejs_20, fixup-yarn-lock, stdenv, yarn, @@ -19,8 +19,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ fixup-yarn-lock - nodejs_18 - (yarn.override { nodejs = nodejs_18; }) + nodejs_20 + (yarn.override { nodejs = nodejs_20; }) ]; configurePhase = '' @@ -29,7 +29,10 @@ stdenv.mkDerivation { export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" fixup-yarn-lock yarn.lock - yarn install --frozen-lockfile --offline --no-progress --non-interactive + # TODO: Remove --ignore-engines once upstream supports nodejs_20+ + # https://github.com/mealie-recipes/mealie/issues/5400 + # https://github.com/mealie-recipes/mealie/pull/5184 + yarn install --frozen-lockfile --offline --no-progress --non-interactive --ignore-engines patchShebangs node_modules/ runHook postConfigure diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 29cdd1213523..6a7897f9a79f 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -1,46 +1,28 @@ { lib, - stdenv, callPackage, fetchFromGitHub, makeWrapper, nixosTests, python3Packages, + nltk-data, writeShellScript, nix-update-script, }: let - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "mealie-recipes"; repo = "mealie"; tag = "v${version}"; - hash = "sha256-nN8AuSzxHjIDKc8rGN+O2/vlzkH/A5LAr4aoAlOTLlk="; + hash = "sha256-0LUT7OdYoOZTdR/UXJO2eL2Afo2Y7GjBPIrjWUt205E="; }; frontend = callPackage (import ./mealie-frontend.nix src version) { }; pythonpkgs = python3Packages; python = pythonpkgs.python; - - crfpp = stdenv.mkDerivation { - pname = "mealie-crfpp"; - version = "unstable-2024-02-12"; - src = fetchFromGitHub { - owner = "mealie-recipes"; - repo = "crfpp"; - rev = "c56dd9f29469c8a9f34456b8c0d6ae0476110516"; - hash = "sha256-XNps3ZApU8m07bfPEnvip1w+3hLajdn9+L5+IpEaP0c="; - }; - - # Can remove once the `register` keyword is removed from source files - # Configure overwrites CXXFLAGS so patch it in the Makefile - postConfigure = lib.optionalString stdenv.cc.isClang '' - substituteInPlace Makefile \ - --replace-fail "CXXFLAGS = " "CXXFLAGS = -std=c++14 " - ''; - }; in pythonpkgs.buildPythonApplication rec { @@ -69,6 +51,7 @@ pythonpkgs.buildPythonApplication rec { gunicorn html2text httpx + ingredient-parser-nlp itsdangerous jinja2 lxml @@ -106,7 +89,6 @@ pythonpkgs.buildPythonApplication rec { ${lib.getExe pythonpkgs.gunicorn} "$@" -k uvicorn.workers.UvicornWorker mealie.app:app; ''; init_db = writeShellScript "init-mealie-db" '' - ${python.interpreter} $OUT/${python.sitePackages}/mealie/scripts/install_model.py ${python.interpreter} $OUT/${python.sitePackages}/mealie/db/init_db.py ''; in @@ -116,9 +98,7 @@ pythonpkgs.buildPythonApplication rec { makeWrapper ${start_script} $out/bin/mealie \ --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \ - --set LD_LIBRARY_PATH "${crfpp}/lib" \ - --set STATIC_FILES "${frontend}" \ - --set PATH "${lib.makeBinPath [ crfpp ]}" + --set STATIC_FILES "${frontend}" makeWrapper ${init_db} $out/libexec/init_db \ --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \ @@ -127,6 +107,11 @@ pythonpkgs.buildPythonApplication rec { nativeCheckInputs = with pythonpkgs; [ pytestCheckHook ]; + # Needed for tests + preCheck = '' + export NLTK_DATA=${nltk-data.averaged-perceptron-tagger-eng} + ''; + disabledTestPaths = [ # KeyError: 'alembic_version' "tests/unit_tests/services_tests/backup_v2_tests/test_backup_v2.py" diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 2d6190ef3ada..b855d9c21bba 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -1,7 +1,6 @@ { aria2, cmake, - # https://github.com/mhogomchungu/media-downloader?tab=readme-ov-file#extensions extraPackages ? [ aria2 ffmpeg @@ -10,28 +9,31 @@ fetchFromGitHub, ffmpeg, lib, - libsForQt5, python3, + qt6, stdenv, }: stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "5.3.0"; + version = "5.3.3"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-SkjcqItBXIjcgublkUnfLlelxc7nW2rCyOBHlbYI6fA="; + hash = "sha256-vVTTICGtuSUWz10iEEsMUSLwlZmOjW+ffpZ3T7Hy+WU="; }; nativeBuildInputs = [ cmake - libsForQt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; - buildInputs = [ libsForQt5.qtbase ]; + buildInputs = [ + qt6.qtbase + qt6.qtwayland + ]; qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath extraPackages}" ]; diff --git a/pkgs/by-name/me/mediagoblin/package.nix b/pkgs/by-name/me/mediagoblin/package.nix index af2ed13dce4b..e02b2c217c2e 100644 --- a/pkgs/by-name/me/mediagoblin/package.nix +++ b/pkgs/by-name/me/mediagoblin/package.nix @@ -157,6 +157,6 @@ python.pkgs.buildPythonApplication rec { description = "Free software media publishing platform that anyone can run"; homepage = "https://mediagoblin.org/"; license = lib.licenses.agpl3Plus; - maintainers = lib.teams.c3d2.members; + teams = [ lib.teams.c3d2 ]; }; } diff --git a/pkgs/by-name/me/mediainfo/package.nix b/pkgs/by-name/me/mediainfo/package.nix index 078ef1131300..c9219e047cf9 100644 --- a/pkgs/by-name/me/mediainfo/package.nix +++ b/pkgs/by-name/me/mediainfo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "25.03"; + version = "25.04"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-wpO7MPIx3FMQuYDv2E/n0za4MQto6DJlzxZtf3/Dhsk="; + hash = "sha256-SyVT/pEEMy07rKX+Yba4evTUkxCMW4Y4Ac2wpIJqM64="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index 6d6ebbe587a0..5bd4506f7f75 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -1,8 +1,8 @@ { lib, + buildGoModule, fetchFromGitHub, fetchurl, - buildGoModule, nixosTests, }: @@ -12,32 +12,32 @@ let hash = "sha256-0BbBIwSW7lnz9bAcFszkzAG1odPTV63sIAyQixMevkk="; }; in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.11.3"; + version = "1.12.2"; src = fetchFromGitHub { owner = "bluenviron"; - repo = pname; - rev = "v${version}"; - hash = "sha256-LPyyPHTdV9cUDRKSlP+XaMyb+yhSj4Jq0tnT7AnTRqw="; + repo = "mediamtx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-O3Iu9gvCiAVuoJw77MWPyCfuJVcw0E8YWcJBiJq+/Ms="; }; - vendorHash = "sha256-lR2GH/oEdzdnel7wUAVDUQIpKuI4WUsa75Nn44SWloY="; + vendorHash = "sha256-0927IeFIC2rhApPVs5ZIvS3yoDN8Km3tHgrRXnP/wBc="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js - echo "v${version}" > internal/core/VERSION + echo "v${finalAttrs.version}" > internal/core/VERSION # disable binary-only rpi camera support substituteInPlace internal/staticsources/rpicamera/camera_disabled.go \ --replace-fail '!linux || (!arm && !arm64)' 'linux || !linux' - substituteInPlace internal/staticsources/rpicamera/{component,camera,params_serialize,pipe}.go \ + substituteInPlace internal/staticsources/rpicamera/{camera,params_serialize,pipe}.go \ --replace-fail '(linux && arm) || (linux && arm64)' 'linux && !linux' - substituteInPlace internal/staticsources/rpicamera/component_32.go \ + substituteInPlace internal/staticsources/rpicamera/camera_32.go \ --replace-fail 'linux && arm' 'linux && !linux' - substituteInPlace internal/staticsources/rpicamera/component_64.go \ + substituteInPlace internal/staticsources/rpicamera/camera_64.go \ --replace-fail 'linux && arm64' 'linux && !linux' ''; @@ -50,11 +50,11 @@ buildGoModule rec { inherit (nixosTests) mediamtx; }; - meta = with lib; { + meta = { description = "SRT, WebRTC, RTSP, RTMP, LL-HLS media server and media proxy"; - inherit (src.meta) homepage; - license = licenses.mit; + inherit (finalAttrs.src.meta) homepage; + license = lib.licenses.mit; mainProgram = "mediamtx"; - maintainers = with maintainers; [ fpletz ]; + maintainers = with lib.maintainers; [ fpletz ]; }; -} +}) diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix index fd27885e0b4e..3fd63ab4f664 100644 --- a/pkgs/by-name/me/mediawiki/package.nix +++ b/pkgs/by-name/me/mediawiki/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "mediawiki"; - version = "1.43.0"; + version = "1.43.1"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-VuCn/i/3jlC5yHs9WJ8tjfW8qwAY5FSypKI5yFhr2O4="; + hash = "sha256-PIWqnEzWw1PGeASjpY57eWFdQUHD1msQHl8660BlPWw="; }; postPatch = '' @@ -44,6 +44,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl2Plus; homepage = "https://www.mediawiki.org/"; platforms = platforms.all; - maintainers = with maintainers; [ ] ++ teams.c3d2.members; + teams = [ teams.c3d2 ]; }; } diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix index 5c41866441bf..a127b4263d4f 100644 --- a/pkgs/by-name/me/mediawriter/package.nix +++ b/pkgs/by-name/me/mediawriter/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mediawriter"; - version = "5.2.3"; + version = "5.2.5"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "MediaWriter"; tag = version; - hash = "sha256-f8AHmRO0PbF4WZPUxrBy5cVb3Pj/PSAgBqpm5Kt/2o0="; + hash = "sha256-acKLKnAXTp1w8+pPVXO2gCi3GELEi3skYCYN13QjWyY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/megabasterd/package.nix b/pkgs/by-name/me/megabasterd/package.nix new file mode 100644 index 000000000000..573aafed22a6 --- /dev/null +++ b/pkgs/by-name/me/megabasterd/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + jre, + makeWrapper, + maven, +}: +let + version = "8.22"; +in +maven.buildMavenPackage { + pname = "megabasterd"; + inherit version; + + src = fetchFromGitHub { + owner = "tonikelope"; + repo = "megabasterd"; + tag = "v${version}"; + hash = "sha256-dkxIbQCnOnZ3tbqijqlRhEtEJ4q1ksot5n0gJ7HvsgI="; + }; + + mvnHash = "sha256-b7+17CXmBB65fMG472FPjOvr+9nAsUurdBC/7esalCE="; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + jar_filename=MegaBasterd-${version}-jar-with-dependencies.jar + + mkdir -p $out/bin $out/share/megabasterd + install -Dm644 target/$jar_filename $out/share/megabasterd + + makeWrapper ${jre}/bin/java $out/bin/megabasterd \ + --add-flags "-jar $out/share/megabasterd/$jar_filename" + + runHook postInstall + ''; + + meta = { + description = "Yet another unofficial (and ugly) cross-platform MEGA downloader/uploader/streaming suite"; + homepage = "https://github.com/tonikelope/megabasterd"; + changelog = "https://github.com/tonikelope/megabasterd/releases"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "megabasterd"; + }; +} diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix index 642af48e9099..81b2a6b0843e 100644 --- a/pkgs/by-name/me/megaglest/package.nix +++ b/pkgs/by-name/me/megaglest/package.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation { buildInputs = [ curl SDL2 + xorg.libX11 xercesc openal lua diff --git a/pkgs/by-name/me/megasync/package.nix b/pkgs/by-name/me/megasync/package.nix index 54f7c64d1b6a..1f28e9484b20 100644 --- a/pkgs/by-name/me/megasync/package.nix +++ b/pkgs/by-name/me/megasync/package.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://mega.nz/"; downloadPage = "https://github.com/meganz/MEGAsync"; changelog = "https://github.com/meganz/MEGAsync/releases/tag/v${finalAttrs.version}_Linux"; - license = lib.licenses.unfree; + license = lib.licenses.unfreeRedistributable; platforms = [ "i686-linux" "x86_64-linux" diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 1dbb5c1c0420..7336f922581b 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -7,7 +7,7 @@ }: let - version = "1.11.3"; + version = "1.14.0"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "meiliSearch"; tag = "v${version}"; - hash = "sha256-CVofke9tOGeDEhRHEt6EYwT52eeAYNqlEd9zPpmXQ2U="; + hash = "sha256-nPOhiJJbZCr9PBlR6bsZ9trSn/2XCI2O+nXeYbZEQpU="; }; cargoBuildFlags = [ "--package=meilisearch" ]; useFetchCargoVendor = true; - cargoHash = "sha256-cEJTokDJQuc9Le5+3ObMDNJmEhWEb+Qh0TV9xZkD9D8="; + cargoHash = "sha256-8fcOXAzheG9xm1v7uD3T+6oc/dD4cjtu3zzBBh2EkcE="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index 104b8b260233..7af30fb483be 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "melange"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-i6H8fjSc8ui4RTUxDARPF3b6Fkxxj9C6ZJHDEvbKg94="; + hash = "sha256-LlcPkxTeT1jD6PTj22Jn4T6kD8HBuw58LXhEdX5MDtk="; # 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; @@ -26,7 +26,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-oWZXzT0SbKoZPdOg+jWCSJovBH3s5PKoitDq6HyEPU8="; + vendorHash = "sha256-C8P750AtJX4c/7MtuETP7q5T7WJZPbV4X/0y7HgRPDI="; subPackages = [ "." ]; diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix index 321fa21b8b04..d713ff827a6e 100644 --- a/pkgs/by-name/me/meli/package.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "0.8.10"; + version = "0.8.12"; src = fetchzip { urls = [ @@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec { "https://codeberg.org/meli/meli/archive/v${version}.tar.gz" "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz" ]; - hash = "sha256-MGnCX/6pnKNxDEqCcVWTl/fteMypk+N2PrJYRMP0sL0="; + hash = "sha256-Dp0WI1Cl+m7oxZ/4zEi0TtOwqRX681jZht9bNMFnmsU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OyOLAw3HzXY85Jwolh4Wqjmm6au6wRwGq5WkicOt5eg="; + cargoHash = "sha256-DJtk8xLppXdl9sSt6GcaXwZ5MEIY/s/z/bdcdr8YdLw="; # Needed to get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; @@ -75,7 +75,6 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Terminal e-mail client and e-mail client library"; mainProgram = "meli"; homepage = "https://meli.delivery"; diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 8c8159dec617..d7d1d0e7ee07 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,17 +27,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "1.0rc-unstable-2025-03-09"; + version = "1.0rc-unstable-2025-05-15"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "0fcf1f6e3a443cb249f85d948ff6e58dc58501d6"; - hash = "sha256-llRmW596UHs/q/DjqG8qQ1RqjvmGMsOO1IUkpjPW4h4="; + rev = "0e64a06c84f9b9428f8647c2aafde110c9d917f3"; + hash = "sha256-T+AcpAITNALtZbuwY+oh4RnMgjCAi7n2HPyDjFqpQPI="; }; nativeBuildInputs = [ cmake + extra-cmake-modules pkg-config wrapQtAppsHook ]; @@ -46,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { [ SDL2 enet - extra-cmake-modules libarchive libslirp libGL diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix index ac30a624de81..af9ed54a0c36 100644 --- a/pkgs/by-name/me/memcached/package.nix +++ b/pkgs/by-name/me/memcached/package.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "1.6.35"; + version = "1.6.37"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-60UpMX7sgY78RDUt3R+Vn9IIgr7RrikqV4i9eklm98E="; + sha256 = "sha256-dKBik3D2v2CHOTfkOc1ZZZ+9eoTyTBCVvAgtoMhAaWk="; }; configureFlags = [ diff --git a/pkgs/by-name/me/memcachedTestHook/memcached-test-hook.sh b/pkgs/by-name/me/memcachedTestHook/memcached-test-hook.sh new file mode 100644 index 000000000000..aa49e5066721 --- /dev/null +++ b/pkgs/by-name/me/memcachedTestHook/memcached-test-hook.sh @@ -0,0 +1,27 @@ +preCheckHooks+=('memcachedStart') +postCheckHooks+=('memcachedStop') + + +memcachedStart() { + if [[ "${memcachedTestPort:-}" == "" ]]; then + memcachedTestPort=11211 + fi + + echo 'starting memcached' + + # Note about Darwin: unless the output is redirected, the parent process becomes launchd instead of bash. + # This would leave the memcached process running in case of a test failure (the postCheckHook would not be executed), + # hanging the Nix build forever. + @memcached@ -p "$memcachedTestPort" >/dev/null 2>&1 & + MEMCACHED_PID=$! + + echo 'waiting for memcached to be ready' + while ! (echo 'quit' | @nc@ localhost "$memcachedTestPort") ; do + sleep 1 + done +} + +memcachedStop() { + echo 'stopping memcached' + kill "$MEMCACHED_PID" +} diff --git a/pkgs/by-name/me/memcachedTestHook/package.nix b/pkgs/by-name/me/memcachedTestHook/package.nix new file mode 100644 index 000000000000..6635b36a35e6 --- /dev/null +++ b/pkgs/by-name/me/memcachedTestHook/package.nix @@ -0,0 +1,18 @@ +{ + callPackage, + makeSetupHook, + lib, + memcached, + netcat, +}: + +makeSetupHook { + name = "memcached-test-hook"; + substitutions = { + memcached = lib.getExe memcached; + nc = lib.getExe netcat; + }; + passthru.tests = { + simple = callPackage ./test.nix { }; + }; +} ./memcached-test-hook.sh diff --git a/pkgs/by-name/me/memcachedTestHook/test.nix b/pkgs/by-name/me/memcachedTestHook/test.nix new file mode 100644 index 000000000000..8be860b2aaa7 --- /dev/null +++ b/pkgs/by-name/me/memcachedTestHook/test.nix @@ -0,0 +1,41 @@ +{ + memcachedTestHook, + netcat, + stdenv, +}: + +stdenv.mkDerivation { + name = "memcached-test-hook-test"; + + nativeCheckInputs = [ + memcachedTestHook + netcat + ]; + + dontUnpack = true; + doCheck = true; + + preCheck = '' + memcachedTestPort=11212 + ''; + + checkPhase = '' + runHook preCheck + + echo "running test" + if echo -e "stats\nquit" | nc localhost $memcachedTestPort; then + echo "connected to memcached" + TEST_RAN=1 + fi + + runHook postCheck + ''; + + __darwinAllowLocalNetworking = true; + + installPhase = '' + [[ $TEST_RAN == 1 ]] + echo "test passed" + touch $out + ''; +} diff --git a/pkgs/by-name/me/meme-suite/package.nix b/pkgs/by-name/me/meme-suite/package.nix index 5f185c3f923c..b9e5c047ac84 100644 --- a/pkgs/by-name/me/meme-suite/package.nix +++ b/pkgs/by-name/me/meme-suite/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "meme-suite"; - version = "5.5.4"; + version = "5.5.7"; src = fetchurl { url = "https://meme-suite.org/meme-software/${version}/meme-${version}.tar.gz"; - sha256 = "sha256-zaYBHCuFW/JWPE56LCVeEembW25ec3Nv8AiUJQdYAVM="; + sha256 = "sha256-HcqNDm0dNlcMGoirjb5+Sxd3M/u+rKoujEZ0/r9XqvQ="; }; buildInputs = [ zlib ]; diff --git a/pkgs/by-name/me/memos/nixbuild-check.patch b/pkgs/by-name/me/memos/nixbuild-check.patch new file mode 100644 index 000000000000..9a19c116c97f --- /dev/null +++ b/pkgs/by-name/me/memos/nixbuild-check.patch @@ -0,0 +1,23 @@ +diff --git a/plugin/httpgetter/html_meta_test.go b/plugin/httpgetter/html_meta_test.go +index d0b0d903..d1668db1 100644 +--- a/plugin/httpgetter/html_meta_test.go ++++ b/plugin/httpgetter/html_meta_test.go +@@ -2,7 +2,6 @@ package httpgetter + + import ( + "errors" +- "strings" + "testing" + + "github.com/stretchr/testify/require" +@@ -30,10 +29,4 @@ func TestGetHTMLMetaForInternal(t *testing.T) { + if _, err := GetHTMLMeta("http://localhost"); !errors.Is(err, ErrInternalIP) { + t.Errorf("Expected error for resolved internal IP, got %v", err) + } +- +- // test for redirected internal IP +- // 49.232.126.226:1110 will redirects to 127.0.0.1 +- if _, err := GetHTMLMeta("http://49.232.126.226:1110"); !(errors.Is(err, ErrInternalIP) && strings.Contains(err.Error(), "redirect")) { +- t.Errorf("Expected error for redirected internal IP, got %v", err) +- } + } diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix new file mode 100644 index 000000000000..bdeffac3f194 --- /dev/null +++ b/pkgs/by-name/me/memos/package.nix @@ -0,0 +1,122 @@ +{ + fetchFromGitHub, + buildGoModule, + stdenvNoCC, + nix-update-script, + nodejs, + lib, + pnpm, + buf, + cacert, + grpc-gateway, + protoc-gen-go, + protoc-gen-go-grpc, + protoc-gen-validate, +}: +let + version = "0.24.2"; + src = fetchFromGitHub { + owner = "usememos"; + repo = "memos"; + rev = "v${version}"; + hash = "sha256-DWOJ6+lUTbOzMLsfTDNZfhgNomajNCnNi7U1A+tqXm4="; + }; + + protobufsGenerated = stdenvNoCC.mkDerivation { + name = "memos-protobuf-gen"; + inherit src; + + nativeBuildInputs = [ + buf + cacert + grpc-gateway + protoc-gen-go + protoc-gen-go-grpc + protoc-gen-validate + ]; + + buildPhase = '' + runHook preBuild + pushd proto + HOME=$TMPDIR buf generate + popd + runHook postBuild + ''; + installPhase = '' + runHook preInstall + mkdir -p $out/{proto,web/src/types} + cp -r {.,$out}/proto/gen + cp -r {.,$out}/web/src/types/proto + runHook postInstall + ''; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "sha256-u+Wq/fXvWTjXdhC2h6RCsn7pjdFJ+gUdTPRvrn9cZ+k="; + }; + + frontend = stdenvNoCC.mkDerivation (finalAttrs: { + pname = "memos-web"; + inherit version src; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + sourceRoot = "${finalAttrs.src.name}/web"; + hash = "sha256-lopCa7F/foZ42cAwCxE+TWAnglTZg8jY8eRWmeck/W8="; + }; + pnpmRoot = "web"; + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + preBuild = '' + cp -r {${protobufsGenerated},.}/web/src/types/proto + ''; + buildPhase = '' + runHook preBuild + pnpm -C web build + runHook postBuild + ''; + installPhase = '' + runHook preInstall + cp -r web/dist $out + runHook postInstall + ''; + }); +in +buildGoModule { + pname = "memos"; + inherit version src; + + vendorHash = "sha256-hdL4N0tg/lYGTeiKl9P2QsV8HTxlvHfsSqsqq/C0cg8="; + + preBuild = '' + rm -rf server/router/frontend/dist + cp -r ${frontend} server/router/frontend/dist + cp -r {${protobufsGenerated},.}/proto/gen + ''; + + patches = [ + # to be removed in next release (test was removed upstream as part of a bigger commit) + ./nixbuild-check.patch + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "memos-web" + "--subpackage" + "memos-protobuf-gen" + ]; + }; + + meta = { + homepage = "https://usememos.com"; + description = "Lightweight, self-hosted memo hub"; + maintainers = with lib.maintainers; [ + indexyz + kuflierl + ]; + license = lib.licenses.mit; + mainProgram = "memos"; + }; +} diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix index 6b09d922f42d..c97d0a233013 100644 --- a/pkgs/by-name/me/memray/package.nix +++ b/pkgs/by-name/me/memray/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "memray"; - version = "1.16.0"; + version = "1.17.2"; pyproject = true; src = fetchFromGitHub { owner = "bloomberg"; repo = "memray"; tag = "v${version}"; - hash = "sha256-1Vwf4lCe/srIvR47mCIN2pXrRE3mZJpTGdbOwrW2BpU="; + hash = "sha256-n000m2jIJJFZFTjfECS3gFrO6xHauZW46xe1tDqI6Lg="; }; build-system = with python3Packages; [ @@ -63,6 +63,11 @@ python3Packages.buildPythonApplication rec { disabledTestPaths = [ # Very time-consuming and some tests fails (performance-related?) "tests/integration/test_main.py" + + # AssertionError since textual was updated to 3.1.0 + # https://github.com/bloomberg/memray/issues/750 + "tests/unit/test_tree_reporter.py" + "tests/unit/test_tui_reporter.py" ]; meta = with lib; { diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index 7a6ed7a323af..cecc37df961c 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -17,6 +17,8 @@ python3Packages.buildPythonApplication { hash = "sha256-Ifp8hwkuyBw57fGer3GbDiJaRjL4TD3hzj+ecGXWqI0="; }; + pythonRelaxDeps = [ "rich" ]; + nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/me/menyoki/package.nix b/pkgs/by-name/me/menyoki/package.nix new file mode 100644 index 000000000000..34f657bf71e9 --- /dev/null +++ b/pkgs/by-name/me/menyoki/package.nix @@ -0,0 +1,61 @@ +{ + fetchFromGitHub, + installShellFiles, + lib, + pkg-config, + rustPlatform, + stdenv, + withSixel ? false, + libsixel, + xorg, + withSki ? true, +}: + +rustPlatform.buildRustPackage rec { + pname = "menyoki"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-6FRc/kEhGJXIZ+6GXeYj5j7QVmvZgIQgtDPvt94hlho="; + + nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config; + + buildInputs = + lib.optional withSixel libsixel + ++ lib.optionals stdenv.hostPlatform.isLinux ( + with xorg; + [ + libX11 + libXrandr + ] + ); + + buildNoDefaultFeatures = !withSki; + buildFeatures = lib.optional withSixel "sixel"; + + checkFlags = [ + # sometimes fails on lower end machines + "--skip=record::fps::tests::test_fps" + ]; + + postInstall = '' + installManPage man/* + installShellCompletion completions/menyoki.{bash,fish,zsh} + ''; + + meta = with lib; { + description = "Screen{shot,cast} and perform ImageOps on the command line"; + homepage = "https://menyoki.cli.rs/"; + changelog = "https://github.com/orhun/menyoki/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "menyoki"; + }; +} diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index 13e23aa57f11..13c8d3d0c8ca 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { doCheck = true; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/me/meowpdf/package.nix b/pkgs/by-name/me/meowpdf/package.nix new file mode 100644 index 000000000000..12178de39838 --- /dev/null +++ b/pkgs/by-name/me/meowpdf/package.nix @@ -0,0 +1,34 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "meowpdf"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "monoamine11231"; + repo = "meowpdf"; + tag = "v${finalAttrs.version}"; + hash = "sha256-C5GqyZW0pDmBuaKM890hx2JZtkZqZx+x/RZFCPhpjho="; + }; + + cargoHash = "sha256-hCGMm0ORKuyyWU5D9k+nthSwmq8ALz0qASLDaMiW30U="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + meta = { + description = "PDF viewer for the Kitty terminal with GUI-like usage and Vim-like keybindings written in Rust"; + homepage = "https://github.com/monoamine11231/meowpdf"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ arthsmn ]; + mainProgram = "meowpdf"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix index 52fdad672cbe..7612dfd164bf 100644 --- a/pkgs/by-name/me/mercure/package.nix +++ b/pkgs/by-name/me/mercure/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "mercure"; - version = "0.18.4"; + version = "0.19.0"; src = fetchFromGitHub { owner = "dunglas"; repo = "mercure"; rev = "v${version}"; - hash = "sha256-igPb2b3q3gGewg9DhSBVCSnFvwbGxIOQTCN1sEzdSJE="; + hash = "sha256-TpcxSNvSzn5g7WxEEEbxpHKEwa1W4T6LmYbBCMA8P88="; }; sourceRoot = "${src.name}/caddy"; - vendorHash = "sha256-AzlLZ4+4bpsDfYGMDBH9V79BKa1N4iVzRsH3+XHAFSQ="; + vendorHash = "sha256-g6MQOJJXLFibMelRblXsQEqcsBNpmdViOPVgYoWzOPw="; subPackages = [ "mercure" ]; excludedPackages = [ "../cmd/mercure" ]; diff --git a/pkgs/by-name/me/mercurial/package.nix b/pkgs/by-name/me/mercurial/package.nix new file mode 100644 index 000000000000..bc60bd3fcb54 --- /dev/null +++ b/pkgs/by-name/me/mercurial/package.nix @@ -0,0 +1,301 @@ +{ + lib, + stdenv, + fetchurl, + python3Packages, + makeWrapper, + gettext, + installShellFiles, + re2Support ? true, + rustSupport ? stdenv.hostPlatform.isLinux, + cargo, + rustPlatform, + rustc, + fullBuild ? false, + gitSupport ? fullBuild, + guiSupport ? fullBuild, + tk, + highlightSupport ? fullBuild, + # test dependencies + runCommand, + unzip, + which, + sqlite, + git, + cacert, + gnupg, +}: + +let + inherit (python3Packages) + docutils + python + fb-re2 + pygit2 + pygments + setuptools + ; + + self = python3Packages.buildPythonApplication rec { + pname = "mercurial${lib.optionalString fullBuild "-full"}"; + version = "6.9.4"; + + src = fetchurl { + url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; + hash = "sha256-fqDoOeyDRSd90Z0HJQtEJhNNxdZoL/iAqGorCbTjjs0="; + }; + + format = "other"; + + passthru = { inherit python; }; # pass it so that the same version can be used in hg2git + + cargoDeps = + if rustSupport then + rustPlatform.fetchCargoVendor { + inherit src; + name = "mercurial-${version}"; + hash = "sha256-k/K1BupCqnlB++2T7hJxu82yID0jG8HwLNmb2eyx29o="; + sourceRoot = "mercurial-${version}/rust"; + } + else + null; + cargoRoot = if rustSupport then "rust" else null; + + propagatedBuildInputs = + lib.optional re2Support fb-re2 + ++ lib.optional gitSupport pygit2 + ++ lib.optional highlightSupport pygments; + nativeBuildInputs = + [ + makeWrapper + gettext + installShellFiles + setuptools + ] + ++ lib.optionals rustSupport [ + rustPlatform.cargoSetupHook + cargo + rustc + ]; + buildInputs = [ docutils ]; + + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional rustSupport "PURE=--rust"; + + postInstall = + (lib.optionalString guiSupport '' + mkdir -p $out/etc/mercurial + cp contrib/hgk $out/bin + cat >> $out/etc/mercurial/hgrc << EOF + [extensions] + hgk=$out/${python.sitePackages}/hgext/hgk.py + EOF + # setting HG so that hgk can be run itself as well (not only hg view) + WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} + --set HG $out/bin/hg + --prefix PATH : ${tk}/bin " + '') + + '' + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + $WRAP_TK + done + + # copy hgweb.cgi to allow use in apache + mkdir -p $out/share/cgi-bin + cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin + chmod u+x $out/share/cgi-bin/hgweb.cgi + + installShellCompletion --cmd hg \ + --bash contrib/bash_completion \ + --zsh contrib/zsh_completion + ''; + + passthru.tests = { + mercurial-tests = makeTests { flags = "--with-hg=$MERCURIAL_BASE/bin/hg"; }; + }; + + meta = with lib; { + description = "Fast, lightweight SCM system for very large distributed projects"; + homepage = "https://www.mercurial-scm.org"; + downloadPage = "https://www.mercurial-scm.org/release/"; + changelog = "https://wiki.mercurial-scm.org/Release${versions.majorMinor version}"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ + lukegb + euxane + techknowlogick + ]; + platforms = platforms.unix; + mainProgram = "hg"; + }; + }; + + makeTests = + { + mercurial ? self, + nameSuffix ? "", + flags ? "", + }: + runCommand "${mercurial.pname}${nameSuffix}-tests" + { + inherit (mercurial) src; + + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; # needed for git + MERCURIAL_BASE = mercurial; + nativeBuildInputs = [ + python + unzip + which + sqlite + git + gnupg + ]; + + # https://bz.mercurial-scm.org/show_bug.cgi?id=6887 + propagatedBuildInputs = [ setuptools ]; + + postPatch = '' + patchShebangs . + + for f in **/*.{py,c,t}; do + # not only used in shebangs + substituteAllInPlace "$f" '/bin/sh' '${stdenv.shell}' + done + + for f in **/*.t; do + substituteInPlace 2>/dev/null "$f" \ + --replace '*/hg:' '*/*hg*:' \${ + # paths emitted by our wrapped hg look like ..hg-wrapped-wrapped + "" + } + --replace '"$PYTHON" "$BINDIR"/hg' '"$BINDIR"/hg' ${ + # 'hg' is a wrapper; don't run using python directly + "" + } + done + + # https://bz.mercurial-scm.org/show_bug.cgi?id=6887 + # Adding setuptools to the python path is not enough for the distutils + # module to be found, so we patch usage directly: + substituteInPlace tests/hghave.py \ + --replace-fail "distutils" "setuptools._distutils" + ''; + + # This runs Mercurial _a lot_ of times. + requiredSystemFeatures = [ "big-parallel" ]; + + # Don't run tests if not-Linux or if cross-compiling. + meta.broken = !stdenv.hostPlatform.isLinux || stdenv.buildPlatform != stdenv.hostPlatform; + } + '' + addToSearchPathWithCustomDelimiter : PYTHONPATH "${mercurial}/${python.sitePackages}" + + unpackPhase + cd "$sourceRoot" + patchPhase + + cat << EOF > tests/blacklists/nix + # tests enforcing "/usr/bin/env" shebangs, which are patched for nix + test-run-tests.t + test-check-shbang.t + + # unstable experimental/unsupported features + # https://bz.mercurial-scm.org/show_bug.cgi?id=6633#c1 + test-git-interop.t + + # doesn't like the extra setlocale warnings emitted by our bash wrappers + test-locale.t + + # Python 3.10-3.12 deprecation warning: asyncore + # https://bz.mercurial-scm.org/show_bug.cgi?id=6727 + test-patchbomb-tls.t + + # Python 3.12 _lsprof module change, breaking profile test + # https://bz.mercurial-scm.org/show_bug.cgi?id=6846 + test-profile.t + + # Python 3.12 deprecation warning: multi-threaded fork in worker.py + # https://bz.mercurial-scm.org/show_bug.cgi?id=6892 + test-clone-stream.t + test-clonebundles.t + test-fix-topology.t + test-fix.t + test-persistent-nodemap.t + test-profile.t + test-simple-update.t + + EOF + + export HGTEST_REAL_HG="${mercurial}/bin/hg" + # include tests for native components + export HGMODULEPOLICY="rust+c" + # extended timeout necessary for tests to pass on the busy CI workers + export HGTESTFLAGS="--blacklist blacklists/nix --timeout 1800 -j$NIX_BUILD_CORES ${flags}" + make check + touch $out + ''; +in +self.overridePythonAttrs (origAttrs: { + passthru = origAttrs.passthru // rec { + # withExtensions takes a function which takes the python packages set and + # returns a list of extensions to install. + # + # for instance: mercurial.withExtension (pm: [ pm.hg-evolve ]) + withExtensions = + f: + let + python = self.python; + mercurialHighPrio = + ps: + (ps.toPythonModule self).overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { + priority = 50; + }; + }); + plugins = (f python.pkgs) ++ [ (mercurialHighPrio python.pkgs) ]; + env = python.withPackages (ps: plugins); + in + stdenv.mkDerivation { + pname = "${self.pname}-with-extensions"; + + inherit (self) src version meta; + + buildInputs = self.buildInputs ++ self.propagatedBuildInputs; + nativeBuildInputs = self.nativeBuildInputs; + + dontUnpack = true; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + for bindir in ${lib.concatStringsSep " " (map (d: "${lib.getBin d}/bin") plugins)}; do + for bin in $bindir/*; do + ln -s ${env}/bin/$(basename $bin) $out/bin/ + done + done + + ln -s ${self}/share $out/share + + runHook postInstall + ''; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/hg help >/dev/null || exit 1 + + runHook postInstallCheck + ''; + }; + + tests = origAttrs.passthru.tests // { + withExtensions = withExtensions (pm: [ pm.hg-evolve ]); + }; + }; +}) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 82034a27d571..4d60d995b184 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "mergiraf"; - version = "0.6.0"; + version = "0.8.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "mergiraf"; repo = "mergiraf"; rev = "refs/tags/v${version}"; - hash = "sha256-1GiXGwNgJvA3uftLu2nWa2/Tp/koCybr2r/MXkJR6hk="; + hash = "sha256-CQriH0vZ+ZBSIZcj0MKQEojpugS2g4sCuDICmwLCUBE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+qnaxWkh0ZOi4gKSLHxSeFDMmJsUM9PHL7jaH3+6OhY="; + cargoHash = "sha256-nsWRysIupGC3w0L7OMChcgPPTHSwnmcKv58BTn51cY4="; nativeCheckInputs = [ git @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats"; diff --git a/pkgs/by-name/me/mescc-tools-extra/package.nix b/pkgs/by-name/me/mescc-tools-extra/package.nix index b611df378103..5b62096e9609 100644 --- a/pkgs/by-name/me/mescc-tools-extra/package.nix +++ b/pkgs/by-name/me/mescc-tools-extra/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Collection of tools written for use in bootstrapping"; homepage = "https://github.com/oriansj/mescc-tools-extra"; license = licenses.gpl3Only; - maintainers = teams.minimal-bootstrap.members; + teams = [ teams.minimal-bootstrap ]; inherit (m2libc.meta) platforms; }; }) diff --git a/pkgs/by-name/me/mescc-tools/package.nix b/pkgs/by-name/me/mescc-tools/package.nix index 18562c71076b..875e8e8bd5c0 100644 --- a/pkgs/by-name/me/mescc-tools/package.nix +++ b/pkgs/by-name/me/mescc-tools/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Collection of tools written for use in bootstrapping"; homepage = "https://savannah.nongnu.org/projects/mescc-tools"; license = licenses.gpl3Only; - maintainers = teams.minimal-bootstrap.members; + teams = [ teams.minimal-bootstrap ]; inherit (m2libc.meta) platforms; }; }) diff --git a/pkgs/by-name/me/mesen/deps.json b/pkgs/by-name/me/mesen/deps.json index 8b2284636873..ed1b21d2485e 100644 --- a/pkgs/by-name/me/mesen/deps.json +++ b/pkgs/by-name/me/mesen/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Avalonia", - "version": "11.2.0", - "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q=" + "version": "11.2.4", + "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -16,18 +16,18 @@ }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.0", - "hash": "sha256-x6IdcSo3e2Pq/En9/N80HpPblEXSAv51VRlBrF8wlVM=" + "version": "11.2.3", + "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.0", - "hash": "sha256-pd/cD82onMZ0iMLl9TOCl35PEvAPbyX2lUj49lrBpOA=" + "version": "11.2.3", + "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM=" }, { "pname": "Avalonia.Controls.ProportionalStackPanel", @@ -46,18 +46,18 @@ }, { "pname": "Avalonia.Desktop", - "version": "11.2.0", - "hash": "sha256-+5ISi6WXe8AIjClVo3UqZHgzZpFbMgFk13YvHHhx9MM=" + "version": "11.2.4", + "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.0", - "hash": "sha256-k60HGDKnsXiDOnxSH+Hx2ihyqmxSSeWIBJx2XD1ELW0=" + "version": "11.2.3", + "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.0", - "hash": "sha256-u4CQvG6EdsyaHSWa+Y704sDiWZlqbArB0g4gcoCFwQo=" + "version": "11.2.4", + "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk=" }, { "pname": "Avalonia.MarkupExtension", @@ -66,43 +66,48 @@ }, { "pname": "Avalonia.Native", - "version": "11.2.0", - "hash": "sha256-fMikurP2RAnOahZkORxuGOKGn5iQ0saZCEYsvoFiFQI=" + "version": "11.2.4", + "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.2.0", - "hash": "sha256-6GXX1ZA6gS9CpkQnGepx1PFNoKiwcHQyLSK5qOGmjYo=" + "version": "11.2.3", + "hash": "sha256-NqRetBiFg5gNCS8C0J1JJJsZ4sz+w+GoEegGFddBGDg=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.0", - "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM=" + "version": "11.2.3", + "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.2.4", + "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc=" }, { "pname": "Avalonia.Skia", - "version": "11.2.0", - "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o=" + "version": "11.2.4", + "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.0", - "hash": "sha256-Ate6KC61pwXmTAk5h1uh7rjwAViuiO/qgAVMl3F1BA8=" + "version": "11.2.4", + "hash": "sha256-CPun/JWFCVoGxgMA510/gMP2ZB9aZJ9Bk8yuNjwo738=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.0", - "hash": "sha256-l88ZX50Nao8wjtRnyZxNFFgRpJ/yxxNki6NY48dyTUg=" + "version": "11.2.3", + "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k=" }, { "pname": "Avalonia.Win32", - "version": "11.2.0", - "hash": "sha256-A9PB6Bt61jLdQlMOkchWy/3BwROgxS9BP8FObs/KFiU=" + "version": "11.2.4", + "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY=" }, { "pname": "Avalonia.X11", - "version": "11.2.0", - "hash": "sha256-EP9cCqriEh8d+Wwyv27QGK/CY6w2LcCjtcIv79PZqkM=" + "version": "11.2.4", + "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk=" }, { "pname": "CommunityToolkit.Mvvm", @@ -156,28 +161,28 @@ }, { "pname": "HarfBuzzSharp", - "version": "7.3.0.2", - "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "7.3.0.2", - "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=" + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "7.3.0.2", - "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=" + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "7.3.0.3-preview.2.2", - "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM=" + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "7.3.0.2", - "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=" + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" }, { "pname": "MicroCom.Runtime", @@ -201,28 +206,28 @@ }, { "pname": "SkiaSharp", - "version": "2.88.8", - "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.8", - "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=" + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.8", - "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=" + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.8", - "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=" + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.8", - "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=" + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, { "pname": "Splat", diff --git a/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch b/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch deleted file mode 100644 index 1c194a4a3084..000000000000 --- a/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/UI/UI.csproj b/UI/UI.csproj -index 2a0eb78..74751bc 100644 ---- a/UI/UI.csproj -+++ b/UI/UI.csproj -@@ -90,11 +90,6 @@ - - - -- -- -- https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json -- -- - - - diff --git a/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch b/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch new file mode 100644 index 000000000000..b21e6b7d0306 --- /dev/null +++ b/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch @@ -0,0 +1,33 @@ +diff --git a/UI/UI.csproj b/UI/UI.csproj +index 7721884..3011ae8 100644 +--- a/UI/UI.csproj ++++ b/UI/UI.csproj +@@ -90,11 +90,6 @@ + + + +- +- +- https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json +- +- + + + +@@ -105,13 +100,13 @@ + + + +- ++ + +- ++ + + + +- ++ + + + diff --git a/pkgs/by-name/me/mesen/dont-zip-libraries.patch b/pkgs/by-name/me/mesen/dont-zip-libraries.patch index 6aeed6c3e757..9e78203b5af6 100644 --- a/pkgs/by-name/me/mesen/dont-zip-libraries.patch +++ b/pkgs/by-name/me/mesen/dont-zip-libraries.patch @@ -1,17 +1,17 @@ diff --git a/UI/Config/ConfigManager.cs b/UI/Config/ConfigManager.cs -index 56c1ff1..ed5fe8a 100644 +index c3249cf..96c6ae0 100644 --- a/UI/Config/ConfigManager.cs +++ b/UI/Config/ConfigManager.cs @@ -51,7 +51,6 @@ namespace Mesen.Config } else { homeFolder = DefaultDocumentsFolder; } -- Program.ExtractNativeDependencies(homeFolder); +- DependencyHelper.ExtractNativeDependencies(homeFolder); _homeFolder = homeFolder; Config.Save(); } diff --git a/UI/Program.cs b/UI/Program.cs -index dfc4ba3..632cef2 100644 +index dc923ab..ae7a1cc 100644 --- a/UI/Program.cs +++ b/UI/Program.cs @@ -54,8 +54,6 @@ namespace Mesen @@ -19,7 +19,7 @@ index dfc4ba3..632cef2 100644 if(!File.Exists(ConfigManager.GetConfigFile())) { - //Could not find configuration file, show wizard -- ExtractNativeDependencies(ConfigManager.HomeFolder); +- DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder); App.ShowConfigWindow = true; BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnMainWindowClose); if(File.Exists(ConfigManager.GetConfigFile())) { @@ -28,12 +28,12 @@ index dfc4ba3..632cef2 100644 Task.Run(() => ConfigManager.LoadConfig()); - //Extract core dll & other native dependencies -- ExtractNativeDependencies(ConfigManager.HomeFolder); +- DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder); - if(CommandLineHelper.IsTestRunner(args)) { return TestRunner.Run(args); } -@@ -147,7 +142,7 @@ namespace Mesen +@@ -105,7 +100,7 @@ namespace Mesen libraryName = libraryName + ".dylib"; } } @@ -43,10 +43,10 @@ index dfc4ba3..632cef2 100644 return IntPtr.Zero; } diff --git a/UI/UI.csproj b/UI/UI.csproj -index 053d495..2a0eb78 100644 +index 67fe57d..65762d3 100644 --- a/UI/UI.csproj +++ b/UI/UI.csproj -@@ -634,7 +634,6 @@ +@@ -637,7 +637,6 @@ @@ -54,7 +54,7 @@ index 053d495..2a0eb78 100644 -@@ -644,16 +643,5 @@ +@@ -647,16 +646,4 @@ @@ -62,13 +62,12 @@ index 053d495..2a0eb78 100644 - - - -- +- - - - - - - - +- - diff --git a/pkgs/by-name/me/mesen/package.nix b/pkgs/by-name/me/mesen/package.nix index 43957a1c7004..34b5b1108727 100644 --- a/pkgs/by-name/me/mesen/package.nix +++ b/pkgs/by-name/me/mesen/package.nix @@ -6,24 +6,24 @@ fetchFromGitHub, wrapGAppsHook3, gtk3, + libX11, SDL2, }: buildDotnetModule rec { pname = "mesen"; - version = "2.0.0-unstable-2024-12-25"; + version = "2.0.0-unstable-2025-04-01"; src = fetchFromGitHub { owner = "SourMesen"; repo = "Mesen2"; - rev = "6820db37933002089a04d356d8469481e915a359"; - hash = "sha256-TzGMZr351XvVj/wARWJxRisRb5JlkyzdjCVYbwydBVE="; + rev = "0dfdbbdd9b5bc4c5d501ea691116019266651aff"; + hash = "sha256-+Jzw1tfdiX2EmQIoPuMtLmJrv9nx/XqfyLEBW+AXj1I="; }; patches = [ - # the nightly avalonia repository url is still queried, which errors out - # even if we don't actually need any nightly versions - ./dont-use-alternative-restore-sources.patch + # patch out the usage of nightly avalonia builds, since we can't use alternative restore sources + ./dont-use-nightly-avalonia.patch # upstream has a weird library loading mechanism, which we override with a more sane alternative ./dont-zip-libraries.patch ]; @@ -60,7 +60,7 @@ buildDotnetModule rec { nativeBuildInputs = [ SDL2 ]; - buildInputs = [ SDL2 ]; + buildInputs = [ SDL2 ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ libX11 ]; makeFlags = [ "core" ]; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index bdefa68e0390..9ac84af31d3d 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -10,18 +10,19 @@ pkg-config, python3, replaceVars, + writeShellScriptBin, zlib, }: python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.7.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; tag = version; - hash = "sha256-nvaq+9evQSj/ahK68nj8FckG4nA1gs2DqcZxFEFH1iU="; + hash = "sha256-On67RM3u1/XhdwgtAHve1GAJwKGCnk8IOCjNZcyDfyg="; }; patches = [ @@ -66,12 +67,34 @@ python3.pkgs.buildPythonApplication rec { ./007-freebsd-pkgconfig-path.patch ]; + postPatch = + if python3.isPyPy then + '' + substituteInPlace mesonbuild/modules/python.py \ + --replace-fail "PythonExternalProgram('python3', mesonlib.python_command)" \ + "PythonExternalProgram('${python3.meta.mainProgram}', mesonlib.python_command)" + substituteInPlace mesonbuild/modules/python3.py \ + --replace-fail "state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, 'python3')" \ + "state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, '${python3.meta.mainProgram}')" + substituteInPlace "test cases"/*/*/*.py "test cases"/*/*/*/*.py \ + --replace-quiet '#!/usr/bin/env python3' '#!/usr/bin/env pypy3' \ + --replace-quiet '#! /usr/bin/env python3' '#!/usr/bin/env pypy3' + chmod +x "test cases"/*/*/*.py "test cases"/*/*/*/*.py + '' + else + null; + nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ - ninja - pkg-config - ]; + nativeCheckInputs = + [ + ninja + pkg-config + ] + ++ lib.optionals python3.isPyPy [ + # Several tests hardcode python3. + (writeShellScriptBin "python3" ''exec pypy3 "$@"'') + ]; checkInputs = [ @@ -116,9 +139,15 @@ python3.pkgs.buildPythonApplication rec { # pch doesn't work quite right on FreeBSD, I think ''test cases/common/13 pch'' ] + ++ lib.optionals python3.isPyPy [ + # fails for unknown reason + ''test cases/python/4 custom target depends extmodule'' + ] )) ++ [ - ''HOME="$TMPDIR" python ./run_project_tests.py'' + ''HOME="$TMPDIR" ${ + if python3.isPyPy then python3.interpreter else "python" + } ./run_project_tests.py'' "runHook postCheck" ] ); diff --git a/pkgs/by-name/me/messer-slim/package.nix b/pkgs/by-name/me/messer-slim/package.nix index 6c90806992ed..cc2558340e78 100644 --- a/pkgs/by-name/me/messer-slim/package.nix +++ b/pkgs/by-name/me/messer-slim/package.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "4.3"; + version = "5.0"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - hash = "sha256-Hgh1ianEdITRUIDKLiLW32kQlPlXKIfN4PSv3cOXTGI="; + hash = "sha256-fouZI5Uc8pY7eXD9Tm1C66j3reu7kijTEGA402bOJwc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix new file mode 100644 index 000000000000..1a7af0ffce8f --- /dev/null +++ b/pkgs/by-name/me/metabase/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jre_headless, + nixosTests, +}: + +let + jre = jre_headless; +in +stdenv.mkDerivation (finalAttrs: { + pname = "metabase"; + version = "0.54.1"; + + src = fetchurl { + url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar"; + hash = "sha256-gHLugoL3wCvlCzN2fNJtCt+1iSW+kKPzWPpqqHAn/D0="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + makeWrapper ${lib.getExe jre} $out/bin/metabase --add-flags "-jar $src" + runHook postInstall + ''; + + meta = with lib; { + description = "Business Intelligence and Embedded Analytics tool"; + homepage = "https://metabase.com"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.agpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ + schneefux + thoughtpolice + mmahut + ]; + mainProgram = "metabase"; + }; + passthru.tests = { + inherit (nixosTests) metabase; + }; +}) diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix index 8a7248287a8d..4cb4054d2fa5 100644 --- a/pkgs/by-name/me/metacity/package.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.54.0"; + version = "3.56.0"; src = fetchurl { url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor version}/metacity-${version}.tar.xz"; - hash = "sha256-WHifKLbzhSL9iMIkKRChB9ppNCF7LH3VKn1RLTlB1kM="; + hash = "sha256-dVSZcQSyb/DnmgKzeiuhib3058zVQibw+vSxpZAGyQE="; }; patches = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/metacity"; changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/me/metadata-cleaner/package.nix b/pkgs/by-name/me/metadata-cleaner/package.nix index 1f42f6b474f3..686ec13faded 100644 --- a/pkgs/by-name/me/metadata-cleaner/package.nix +++ b/pkgs/by-name/me/metadata-cleaner/package.nix @@ -21,13 +21,12 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; version = "2.5.6"; - - format = "other"; + pyproject = false; src = fetchFromGitLab { owner = "rmnvgr"; repo = "metadata-cleaner"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-J+nwgLbAFoh1gq3J4cqQEShZJCSZesyCjT9DfkCWIHs="; }; @@ -61,15 +60,15 @@ python3.pkgs.buildPythonApplication rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Python GTK application to view and clean metadata in files, using mat2"; mainProgram = "metadata-cleaner"; homepage = "https://gitlab.com/rmnvgr/metadata-cleaner"; - changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ + changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ gpl3Plus cc-by-sa-40 ]; - maintainers = with maintainers; [ dotlambda ] ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/by-name/me/metal-cli/package.nix b/pkgs/by-name/me/metal-cli/package.nix index b13d6bb0d162..3f1e570e567d 100644 --- a/pkgs/by-name/me/metal-cli/package.nix +++ b/pkgs/by-name/me/metal-cli/package.nix @@ -3,16 +3,17 @@ buildGoModule, fetchFromGitHub, installShellFiles, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "metal-cli"; version = "0.25.0"; src = fetchFromGitHub { owner = "equinix"; - repo = pname; - rev = "v${version}"; + repo = "metal-cli"; + tag = "v${finalAttrs.version}"; hash = "sha256-+hpsGFZHuVhh+fKVcap0vhoUmRs3xPgUwW8SD56m6uI="; }; @@ -21,7 +22,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/equinix/metal-cli/cmd.Version=${version}" + "-X github.com/equinix/metal-cli/cmd.Version=${finalAttrs.version}" ]; nativeBuildInputs = [ @@ -38,21 +39,20 @@ buildGoModule rec { doCheck = false; doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/metal"; + versionCheckProgramArg = "--version"; - installCheckPhase = '' - $out/bin/metal --version | grep ${version} - ''; - - meta = with lib; { + meta = { description = "Official Equinix Metal CLI"; homepage = "https://github.com/equinix/metal-cli/"; - changelog = "https://github.com/equinix/metal-cli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + changelog = "https://github.com/equinix/metal-cli/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne nshalman teutat3s ]; mainProgram = "metal"; }; -} +}) diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix index 09eec632fa46..6a97121ff564 100644 --- a/pkgs/by-name/me/metals/package.nix +++ b/pkgs/by-name/me/metals/package.nix @@ -7,15 +7,15 @@ setJavaClassPath, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "metals"; - version = "1.5.2"; + version = "1.5.3"; deps = stdenv.mkDerivation { - name = "${pname}-deps-${version}"; + name = "metals-deps-${finalAttrs.version}"; buildCommand = '' export COURSIER_CACHE=$(pwd) - ${coursier}/bin/cs fetch org.scalameta:metals_2.13:${version} \ + ${coursier}/bin/cs fetch org.scalameta:metals_2.13:${finalAttrs.version} \ -r bintray:scalacenter/releases \ -r sonatype:snapshots > deps mkdir -p $out/share/java @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-Qh8T0/nLVpfdJiWqdi1mpvUom5B9Xr8jsNGqzEx8OLs="; + outputHash = "sha256-jxrAtlD+s3yjcDWYLoN7mr8RozutItCv8dt28/UoVjk="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; - buildInputs = [ deps ]; + buildInputs = [ finalAttrs.deps ]; dontUnpack = true; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/metals \ - --add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main" + --add-flags "${finalAttrs.extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main" ''; meta = with lib; { @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { tomahna ]; }; -} +}) diff --git a/pkgs/by-name/me/meteo-qt/package.nix b/pkgs/by-name/me/meteo-qt/package.nix index 26709f421b61..a967175c6a30 100644 --- a/pkgs/by-name/me/meteo-qt/package.nix +++ b/pkgs/by-name/me/meteo-qt/package.nix @@ -2,31 +2,40 @@ lib, python3Packages, fetchFromGitHub, - qt5, + qt6, }: python3Packages.buildPythonApplication rec { pname = "meteo-qt"; - version = "3.4"; - format = "setuptools"; + version = "4.2"; + pyproject = true; src = fetchFromGitHub { owner = "dglent"; repo = "meteo-qt"; tag = "v${version}"; - hash = "sha256-J9R6UGfj3vaPfn0vmjeRMsHryc/1pxoKyIE9wteVYbY="; + hash = "sha256-s02A5WwJffjbB497sXyugkIolqyK3OpEY7aBgnOBdbM="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "lrelease-pro-qt6" "${qt6.qttools}/libexec/lrelease-pro" + ''; + nativeBuildInputs = [ - qt5.qttools - qt5.wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook + python3Packages.pyqt6 ]; - build-system = with python3Packages; [ sip ]; + build-system = with python3Packages; [ + setuptools + sip + ]; dependencies = with python3Packages; [ lxml - pyqt5 + pyqt6 ]; postFixup = '' diff --git a/pkgs/by-name/me/metronome/package.nix b/pkgs/by-name/me/metronome/package.nix index c2010ce3a10b..b9f4dee6a2ee 100644 --- a/pkgs/by-name/me/metronome/package.nix +++ b/pkgs/by-name/me/metronome/package.nix @@ -12,7 +12,6 @@ desktop-file-utils, libadwaita, gst_all_1, - darwin, }: stdenv.mkDerivation rec { @@ -44,16 +43,12 @@ stdenv.mkDerivation rec { desktop-file-utils ]; - buildInputs = - [ - libadwaita - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-bad - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libadwaita + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + ]; # Workaround for the gettext-sys issue # https://github.com/Koka/gettext-rs/issues/114 diff --git a/pkgs/by-name/me/mev-boost/package.nix b/pkgs/by-name/me/mev-boost/package.nix index f99e1b0ce3fb..f36c87d7f615 100644 --- a/pkgs/by-name/me/mev-boost/package.nix +++ b/pkgs/by-name/me/mev-boost/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "mev-boost"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "flashbots"; repo = "mev-boost"; rev = "v${version}"; - hash = "sha256-EFPVBSSIef3cTrYp3X1xCEOtYcGpuW/GZXHXX+0wGd8="; + hash = "sha256-VBvbiB7M6X+bQ5xEwmJo5dptiR7PIBiFDqkg1fyU8ro="; }; - vendorHash = "sha256-xkncfaqNfgPt5LEQ3JyYXHHq6slOUchomzqwkZCgCOM="; + vendorHash = "sha256-OyRyMsINy4I04E2QvToOEY7UKh2s6NUeJJO0gJI5uS0="; meta = with lib; { description = "Ethereum block-building middleware"; diff --git a/pkgs/by-name/mh/mhost/package.nix b/pkgs/by-name/mh/mhost/package.nix new file mode 100644 index 000000000000..436ac744cb4b --- /dev/null +++ b/pkgs/by-name/mh/mhost/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "mhost"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "lukaspustina"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-6jn9jOCh96d9y2l1OZ5hgxg7sYXPUFzJiiT95OR7lD0="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-n+ZVsdR+X7tMqZFYsjsWSUr6OkD90s44EFORqRldCNE="; + + CARGO_CRATE_NAME = "mhost"; + + doCheck = false; + + meta = with lib; { + description = "Modern take on the classic host DNS lookup utility including an easy to use and very fast Rust lookup library"; + homepage = "https://github.com/lukaspustina/mhost"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = [ maintainers.mgttlinger ]; + mainProgram = "mhost"; + }; +} diff --git a/pkgs/by-name/mi/mi2ly/package.nix b/pkgs/by-name/mi/mi2ly/package.nix index 56fb4f5b3a87..f78d1df79a5e 100644 --- a/pkgs/by-name/mi/mi2ly/package.nix +++ b/pkgs/by-name/mi/mi2ly/package.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { version = "0.12"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/mi2ly/mi2ly.${version}.tar.bz2"; - sha256 = "sha256-lFbqH+syFaQDMbXfb+OUcWnyKnjfVz9yl7DbTTn7JKw="; + url = "mirror://savannah/${pname}/${pname}.${version}.tar.bz2"; + hash = "sha256-lFbqH+syFaQDMbXfb+OUcWnyKnjfVz9yl7DbTTn7JKw="; }; sourceRoot = "."; diff --git a/pkgs/by-name/mi/micro-httpd/package.nix b/pkgs/by-name/mi/micro-httpd/package.nix index 8a47f8eff38e..918d29d45514 100644 --- a/pkgs/by-name/mi/micro-httpd/package.nix +++ b/pkgs/by-name/mi/micro-httpd/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Really small HTTP server"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; mainProgram = "micro_httpd"; }; } diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix index 2f5d08158f94..dc44e039ccd7 100644 --- a/pkgs/by-name/mi/microbin/package.nix +++ b/pkgs/by-name/mi/microbin/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitHub, fetchpatch, lib, @@ -7,7 +6,6 @@ openssl, pkg-config, rustPlatform, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -66,14 +64,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - oniguruma - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + oniguruma + openssl + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/mi/microcode-intel/package.nix b/pkgs/by-name/mi/microcode-intel/package.nix index 0093c9235321..b304ed399e1b 100644 --- a/pkgs/by-name/mi/microcode-intel/package.nix +++ b/pkgs/by-name/mi/microcode-intel/package.nix @@ -4,29 +4,27 @@ fetchFromGitHub, libarchive, iucode-tool, + buildPackages, }: stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20250211"; + version = "20250512"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-XfBVygHmUAV287MyBreoAyGcffGBEY7YKyj6AOytXZ4="; + hash = "sha256-xasV1w6+8qnD+RLWsReMo+xm7a9nguV2st3IC4FURDU="; }; - nativeBuildInputs = [ - iucode-tool - libarchive - ]; + nativeBuildInputs = [ libarchive ]; installPhase = '' runHook preInstall mkdir -p $out kernel/x86/microcode - iucode_tool -w kernel/x86/microcode/GenuineIntel.bin intel-ucode/ + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe iucode-tool} -w kernel/x86/microcode/GenuineIntel.bin intel-ucode/ touch -d @$SOURCE_DATE_EPOCH kernel/x86/microcode/GenuineIntel.bin echo kernel/x86/microcode/GenuineIntel.bin | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- > $out/intel-ucode.img diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index fbf1289361b7..e25ffe66ab86 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "microfetch"; - version = "0.4.6"; + version = "0.4.8"; src = fetchFromGitHub { owner = "NotAShelf"; repo = "microfetch"; tag = "v${version}"; - hash = "sha256-qpwzuzEqXsGO4y3ClaY25Q4rFm2RyPl/X3yNcQz3R4E="; + hash = "sha256-WGr2qqxcbh7hotqPj8ZQbSB3E4qG5U2LEmqXx/aEc18="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UguHTRHdcogxg/8DmRWSE7XwmaF36MTGHzF5CpMBc3Y="; + cargoHash = "sha256-/siuEdZeIk23aIagbjrd5cYvb5/xEdAq84PoSVLWz60="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix index 4e25aa18430d..3b3bbdb39b27 100644 --- a/pkgs/by-name/mi/micronaut/package.nix +++ b/pkgs/by-name/mi/micronaut/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.7.6"; + version = "4.8.2"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-PGdxwq20nSc7TPBlfo6HWxx6DmbZ1OFyeh4cZvsQ3Hg="; + sha256 = "sha256-QCXf3999EFLVSUuks8vQWAG/yJnZ74leJ0HWwzH70qU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix index fb75f70d01c8..15b39dc7e192 100644 --- a/pkgs/by-name/mi/micropython/package.nix +++ b/pkgs/by-name/mi/micropython/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.24.1"; + version = "1.25.0"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - hash = "sha256-Hn5TtLBKK9kn9x3U2ZcU9O2CS272rcDD0HA+Xva3G4w="; + hash = "sha256-yH5omiYs07ZKECI+DAnpYq4T+r2O/RuGdtN+dhYxePc="; fetchSubmodules = true; # remove unused libraries from rp2 port's SDK. we leave this and the other @@ -85,5 +85,6 @@ stdenv.mkDerivation rec { prusnak sgo ]; + mainProgram = "micropython"; }; } diff --git a/pkgs/by-name/mi/microserver/package.nix b/pkgs/by-name/mi/microserver/package.nix index 84f46fd49e25..af9f172fa69c 100644 --- a/pkgs/by-name/mi/microserver/package.nix +++ b/pkgs/by-name/mi/microserver/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-IPJJ9kv7gf5l7Y2JLCLjkNFao42h/VmkTd3LF5BCMLU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ Security ] - ); - meta = with lib; { homepage = "https://github.com/robertohuertasm/microserver"; description = "Simple ad-hoc server with SPA support"; diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix deleted file mode 100644 index d8194599d9d5..000000000000 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ /dev/null @@ -1,294 +0,0 @@ -{ - fetchurl, - lib, - makeWrapper, - patchelf, - stdenv, - - # Linked dynamic libraries. - alsa-lib, - at-spi2-atk, - at-spi2-core, - atk, - cairo, - cups, - dbus, - expat, - fontconfig, - freetype, - gcc-unwrapped, - gdk-pixbuf, - glib, - gtk3, - gtk4, - libdrm, - libglvnd, - libkrb5, - libX11, - libxcb, - libXcomposite, - libXcursor, - libXdamage, - libXext, - libXfixes, - libXi, - libxkbcommon, - libXrandr, - libXrender, - libXScrnSaver, - libxshmfence, - libXtst, - libgbm, - nspr, - nss, - pango, - pipewire, - vulkan-loader, - wayland, # ozone/wayland - - # Command line programs - coreutils, - - # command line arguments which are always set e.g "--disable-gpu" - commandLineArgs ? "", - - # Will crash without. - systemd, - - # Loaded at runtime. - libexif, - pciutils, - - # Additional dependencies according to other distros. - ## Ubuntu - curl, - liberation_ttf, - util-linux, - wget, - xdg-utils, - ## Arch Linux. - flac, - harfbuzz, - icu, - libopus, - libpng, - snappy, - speechd-minimal, - ## Gentoo - bzip2, - libcap, - - # Necessary for USB audio devices. - libpulseaudio, - pulseSupport ? true, - - adwaita-icon-theme, - gsettings-desktop-schemas, - - # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) - libva, - libvaSupport ? true, - - # For Vulkan support (--enable-features=Vulkan) - addDriverRunpath, - - # Edge AAD sync - cacert, - libsecret, - - # Edge Specific - libuuid, -}: - -let - - opusWithCustomModes = libopus.override { withCustomModes = true; }; - - deps = - [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - bzip2 - cacert - cairo - coreutils - cups - curl - dbus - expat - flac - fontconfig - freetype - gcc-unwrapped.lib - gdk-pixbuf - glib - harfbuzz - icu - libcap - libdrm - liberation_ttf - libexif - libglvnd - libkrb5 - libpng - libX11 - libxcb - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libxkbcommon - libXrandr - libXrender - libXScrnSaver - libxshmfence - libXtst - libgbm - nspr - nss - opusWithCustomModes - pango - pciutils - pipewire - snappy - speechd-minimal - systemd - util-linux - vulkan-loader - wayland - wget - libsecret - libuuid - ] - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional libvaSupport libva - ++ [ - gtk3 - gtk4 - ]; -in - -stdenv.mkDerivation (finalAttrs: { - pname = "microsoft-edge"; - version = "134.0.3124.68"; - - src = fetchurl { - url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-zjN8ssVeR3yyw+e6tVzcrrYkLToo8Rmm4GjcG9iQMpk="; - }; - - # With strictDeps on, some shebangs were not being patched correctly - # ie, $out/share/microsoft/msedge/microsoft-edge - strictDeps = false; - - nativeBuildInputs = [ - makeWrapper - patchelf - ]; - - buildInputs = [ - # needed for XDG_ICON_DIRS - adwaita-icon-theme - glib - gtk3 - gtk4 - # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas - ]; - - unpackPhase = '' - runHook preUnpack - ar x $src - tar xf data.tar.xz - runHook postUnpack - ''; - - rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; - binpath = lib.makeBinPath deps; - - installPhase = '' - runHook preInstall - - appname=msedge - dist=stable - - exe=$out/bin/microsoft-edge - - mkdir -p $out/bin $out/share - cp -v -a opt/* $out/share - cp -v -a usr/share/* $out/share - - # replace bundled vulkan-loader - rm -v $out/share/microsoft/$appname/libvulkan.so.1 - ln -v -s -t "$out/share/microsoft/$appname" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" - - substituteInPlace $out/share/microsoft/$appname/microsoft-edge \ - --replace-fail 'CHROME_WRAPPER' 'WRAPPER' - substituteInPlace $out/share/applications/microsoft-edge.desktop \ - --replace-fail /usr/bin/microsoft-edge-$dist $exe - substituteInPlace $out/share/gnome-control-center/default-apps/microsoft-edge.xml \ - --replace-fail /opt/microsoft/msedge $exe - substituteInPlace $out/share/menu/microsoft-edge.menu \ - --replace-fail /opt $out/share \ - --replace-fail $out/share/microsoft/$appname/microsoft-edge $exe - - for icon_file in $out/share/microsoft/msedge/product_logo_[0-9]*.png; do - num_and_suffix="''${icon_file##*logo_}" - if [ $dist = "stable" ]; then - icon_size="''${num_and_suffix%.*}" - else - icon_size="''${num_and_suffix%_*}" - fi - logo_output_prefix="$out/share/icons/hicolor" - logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" - mkdir -p "$logo_output_path" - mv "$icon_file" "$logo_output_path/microsoft-edge.png" - done - - # "--simulate-outdated-no-au" disables auto updates and browser outdated popup - makeWrapper "$out/share/microsoft/$appname/microsoft-edge" "$exe" \ - --prefix LD_LIBRARY_PATH : "$rpath" \ - --prefix PATH : "$binpath" \ - --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ - --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \ - --set CHROME_WRAPPER "microsoft-edge-$dist" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ - --add-flags ${lib.escapeShellArg commandLineArgs} - - # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so - patchelf --set-rpath $rpath $out/share/microsoft/$appname/lib*GL* - - # Edge specific set liboneauth - patchelf --set-rpath $rpath $out/share/microsoft/$appname/liboneauth.so - - for elf in $out/share/microsoft/$appname/{msedge,msedge-sandbox,msedge_crashpad_handler}; do - patchelf --set-rpath $rpath $elf - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf - done - - runHook postInstall - ''; - - passthru.updateScript = ./update.py; - - meta = { - changelog = "https://learn.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel"; - description = "Web browser from Microsoft"; - homepage = "https://www.microsoft.com/en-us/edge"; - license = lib.licenses.unfree; - mainProgram = "microsoft-edge"; - maintainers = with lib.maintainers; [ - zanculmarktum - kuwii - rhysmdnz - ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py deleted file mode 100755 index e0d007c12f17..000000000000 --- a/pkgs/by-name/mi/microsoft-edge/update.py +++ /dev/null @@ -1,44 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts - -import base64 -import textwrap -import os -from urllib import request - -from collections import OrderedDict -from debian.deb822 import Packages -from debian.debian_support import Version -from os.path import abspath, dirname - -PIN_PATH = dirname(abspath(__file__)) + '/default.nix' - -def packages(): - packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages' - handle = request.urlopen(packages_url) - return handle - - -def latest_packages(packages: bytes): - latest_packages: OrderedDict[str, Packages] = {} - for package in Packages.iter_paragraphs(packages, use_apt_pkg=False): - name: str = package['Package'] - if not name.startswith('microsoft-edge-stable'): - continue - channel = name.replace('microsoft-edge-', '') - if channel not in latest_packages: - latest_packages[channel] = package - else: - old_package = latest_packages[channel] - if old_package.get_version() < package.get_version(): # type: ignore - latest_packages[channel] = package - return OrderedDict(sorted(latest_packages.items(), key=lambda x:x[0])) - - -def write_expression(): - latest = latest_packages(packages()) - version = Version.re_valid_version.match(latest['stable']['Version']).group('upstream_version') - os.system(f'update-source-version microsoft-edge "{version}"') - - -write_expression() diff --git a/pkgs/by-name/mi/midivisualizer/package.nix b/pkgs/by-name/mi/midivisualizer/package.nix new file mode 100644 index 000000000000..911d9688d286 --- /dev/null +++ b/pkgs/by-name/mi/midivisualizer/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libX11, + glfw, + makeWrapper, + libXrandr, + libXinerama, + libXcursor, + gtk3, + ffmpeg-full, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "midivisualizer"; + version = "7.0"; + + src = fetchFromGitHub { + owner = "kosua20"; + repo = "MIDIVisualizer"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = + [ + glfw + ffmpeg-full + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXrandr + libXinerama + libXcursor + gtk3 + ]; + + installPhase = + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/Applications $out/bin + cp -r MIDIVisualizer.app $out/Applications/ + ln -s ../Applications/MIDIVisualizer.app/Contents/MacOS/MIDIVisualizer $out/bin/ + '' + else + '' + mkdir -p $out/bin + cp MIDIVisualizer $out/bin + + wrapProgram $out/bin/MIDIVisualizer \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" + ''; + + meta = with lib; { + description = "Small MIDI visualizer tool, using OpenGL"; + mainProgram = "MIDIVisualizer"; + homepage = "https://github.com/kosua20/MIDIVisualizer"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.ericdallo ]; + }; +}) diff --git a/pkgs/by-name/mi/midori-unwrapped/package.nix b/pkgs/by-name/mi/midori-unwrapped/package.nix deleted file mode 100644 index 906354905354..000000000000 --- a/pkgs/by-name/mi/midori-unwrapped/package.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - ninja, - pkg-config, - intltool, - vala, - wrapGAppsHook3, - gcr, - libpeas, - gtk3, - webkitgtk_4_0, - sqlite, - gsettings-desktop-schemas, - libsoup_2_4, - glib-networking, - json-glib, - libarchive, -}: - -stdenv.mkDerivation rec { - pname = "midori"; - version = "9.0"; - - src = fetchurl { - url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.tar.gz"; - sha256 = "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy"; - }; - - nativeBuildInputs = [ - cmake - intltool - ninja - pkg-config - vala - wrapGAppsHook3 - ]; - - buildInputs = [ - (libsoup_2_4.override { gnomeSupport = true; }) - gcr - glib-networking - gsettings-desktop-schemas - gtk3 - libpeas - sqlite - webkitgtk_4_0 - json-glib - libarchive - ]; - - passthru = { - inherit gtk3; - applicationName = "Midori"; - }; - - meta = with lib; { - description = "Lightweight WebKitGTK web browser"; - mainProgram = "midori"; - homepage = "https://github.com/midori-browser/core"; - license = with licenses; [ lgpl21Plus ]; - platforms = with platforms; linux; - maintainers = with maintainers; [ - raskin - ramkromberg - ]; - # https://github.com/NixOS/nixpkgs/issues/374354 - broken = true; - }; -} diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index eff21c563892..6018c51edf78 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mieru"; - version = "3.13.0"; + version = "3.14.1"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-Hy5Uy6lC3d8N2lsnGLrcN/D5/eiycp7X7h6V8vo3tPA="; + hash = "sha256-+I3Vqu6laJPzv8tZ+3f6J88K+IM5SiGr7GVem4dKyao="; }; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index ecdc61aebd4b..1ea7711b30a7 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -8,7 +8,7 @@ nspr, alsa-lib, openssl, - webkitgtk_4_0, + webkitgtk_4_1, udev, libayatana-appindicator, libGL, @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "mihomo-party"; - version = "1.7.2"; + version = "1.7.3"; src = let @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { fetchurl { url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${arch}.deb"; hash = selectSystem { - x86_64-linux = "sha256-hJnb0K3ytw0ITwL6dY1klSG260WrZQiHhz4FRZ0idI4="; - aarch64-linux = "sha256-6hAB1QezewgKI2We0zDTK+vNgxcMP2AEmGZqdSbMcWQ="; + x86_64-linux = "sha256-IzOW36nJS8SBc3o6/E6eGdBi9I7JApmWydk1x0gEWUw="; + aarch64-linux = "sha256-AKOATvsAqX1CkoQrMQzVlbf2x+BzIP4bcj49vPRIkEg="; }; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nspr alsa-lib openssl - webkitgtk_4_0 + webkitgtk_4_1 (lib.getLib stdenv.cc.cc) ]; diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index e7abb69102c0..d91d5a580d2c 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.19.3"; + version = "1.19.8"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-NzxH6rgr85oHmkMxh3rLbYXJoQKOsngeTazAV3SvRCg="; + hash = "sha256-C8g2KhhXY11bqGKthNgiqdZwxoPVPhflhkh+X6JU33I="; }; - vendorHash = "sha256-dQNdOTFcfk53Snu01XLGB3PTiU1Ex/QQvykfopIdk2M="; + vendorHash = "sha256-j97UFlcN8SfY6nireI6NDw8UcQuxyH34gue1Ywf25Yg="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/mi/miktex/package.nix b/pkgs/by-name/mi/miktex/package.nix index 2085ee7676e6..3abba4f2e345 100644 --- a/pkgs/by-name/mi/miktex/package.nix +++ b/pkgs/by-name/mi/miktex/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, fetchurl, runCommand, - writeText, biber, # nativeBuildInputs @@ -95,13 +94,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "miktex"; - version = "25.2"; + version = "25.4"; src = fetchFromGitHub { owner = "miktex"; repo = "miktex"; tag = finalAttrs.version; - hash = "sha256-egN9+BRO/EAcbrn/jZac4Lb79H5N/LEjReMPGHVM/yM="; + hash = "sha256-3QGW8rsettA+Jtrsi9C5ONIG4vP+iuUEUi9dGHfWMSY="; }; patches = [ @@ -231,7 +230,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A modern TeX distribution"; + description = "Modern TeX distribution"; homepage = "https://miktex.org"; platforms = lib.platforms.linux; license = with lib.licenses; [ @@ -240,8 +239,6 @@ stdenv.mkDerivation (finalAttrs: { gpl3Plus publicDomain ]; - maintainers = with lib.maintainers; [ - qbisi - ]; + maintainers = with lib.maintainers; [ qbisi ]; }; }) diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix index 10dfb82e2190..17a9165ec1aa 100644 --- a/pkgs/by-name/mi/mill/package.nix +++ b/pkgs/by-name/mi/mill/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mill"; - version = "0.12.9"; + version = "0.12.11"; src = fetchurl { url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/${finalAttrs.version}/mill-dist-${finalAttrs.version}-assembly.jar"; - hash = "sha256-Ntqzivy8dfsRlBclPNsWOZ4h1Xk7D3UJV7GLVGIEcAU="; + hash = "sha256-VnpEvukAaslD+MvsGMOGN8VEFEcmzcaZqk81hO1SrpM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix index 2eeb9e166389..31ec43338ec0 100644 --- a/pkgs/by-name/mi/mim-solvers/package.nix +++ b/pkgs/by-name/mi/mim-solvers/package.nix @@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) (lib.cmakeBool "BUILD_WITH_PROXSUITE" true) ] + ++ lib.optional (stdenv.hostPlatform.isDarwin) ( + lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'py-test-clqr-osqp'" + ) ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ( lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test_solvers'" ); diff --git a/pkgs/by-name/mi/mimalloc/package.nix b/pkgs/by-name/mi/mimalloc/package.nix index 97c07e5ca613..b0de189bcc97 100644 --- a/pkgs/by-name/mi/mimalloc/package.nix +++ b/pkgs/by-name/mi/mimalloc/package.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.1.8"; + version = "3.0.3"; src = fetchFromGitHub { owner = "microsoft"; repo = "mimalloc"; rev = "v${version}"; - sha256 = "sha256-C0cqYiXxx8tW3plUZrfAJYKeY36opGKymkZ/CWrVuEI="; + sha256 = "sha256-RjFMLInulyynrmyAg6Km/u9HGfcYeerkou0gQwCdhsA="; }; doCheck = !stdenv.hostPlatform.isStatic; diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index 5892858a7230..c4b335ba16c0 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -30,7 +30,7 @@ buildGoModule rec { "delete-objects" "list-deduplicated-blocks" "listblocks" - "markblocks" + "mark-blocks" "undelete-blocks" ]); @@ -51,7 +51,6 @@ buildGoModule rec { t = "github.com/grafana/mimir/pkg/util/version"; in [ - ''-extldflags "-static"'' "-s" "-w" "-X ${t}.Version=${version}" diff --git a/pkgs/by-name/mi/min-ed-launcher/deps.json b/pkgs/by-name/mi/min-ed-launcher/deps.json new file mode 100644 index 000000000000..a12052661d25 --- /dev/null +++ b/pkgs/by-name/mi/min-ed-launcher/deps.json @@ -0,0 +1,257 @@ +[ + { + "pname": "Expecto", + "version": "10.2.1", + "hash": "sha256-DgwHFsPMySlnMag4kPTviTwrNOD7uPnnJLi9DCZif5s=" + }, + { + "pname": "Expecto.FsCheck", + "version": "10.2.1", + "hash": "sha256-+IDkxZKfEir5/TJrwxMFC4H6voWbSmCsvZUrjxcbc50=" + }, + { + "pname": "FsCheck", + "version": "2.16.5", + "hash": "sha256-+UXoE+QGCDN1LM+XgseKJ7c5Lj/Cblo3izmo7GtIE0A=" + }, + { + "pname": "FsConfig", + "version": "4.1.0", + "hash": "sha256-daaTrzhZjnJLDL49vOCkeXX6W5PWaLj5aqHuaYgiS1s=" + }, + { + "pname": "FSharp.Core", + "version": "8.0.200", + "hash": "sha256-wjYiedFiqOTKaM4mF6uT9kc/yKDJ78mqfw9qLoBFHOw=" + }, + { + "pname": "FSharp.Data", + "version": "6.4.0", + "hash": "sha256-8/iQA6anTybzseyvsvFV33jVVwrnYiKG1iqgwkqNeRc=" + }, + { + "pname": "FSharp.Data.Csv.Core", + "version": "6.4.0", + "hash": "sha256-jcw/6uDN0he/PhhopEvTydy2X13Xt3g3kKuVdt+8+oY=" + }, + { + "pname": "FSharp.Data.Html.Core", + "version": "6.4.0", + "hash": "sha256-HeljybTU019Z7HxFoErPM/HIAm32pJiKQM+kSyt63xw=" + }, + { + "pname": "FSharp.Data.Http", + "version": "6.4.0", + "hash": "sha256-Zn4dZCb46vr8LYR5donzeistFPSO8YYiXUU3Iqo+vKg=" + }, + { + "pname": "FSharp.Data.Json.Core", + "version": "6.4.0", + "hash": "sha256-dVhcVzUi//PFFFIML/5SWKrileeQ6IOd1VlGyEptaw0=" + }, + { + "pname": "FSharp.Data.Runtime.Utilities", + "version": "6.4.0", + "hash": "sha256-nD4U7mwZtFEUcD9XvPxhpot8FNl2YyhiLpjpjmFNAO0=" + }, + { + "pname": "FSharp.Data.WorldBank.Core", + "version": "6.4.0", + "hash": "sha256-ea2CZyHisqa1MnF70TBKfcMl6+W90MnLJ5Ctgjfk9SM=" + }, + { + "pname": "FSharp.Data.Xml.Core", + "version": "6.4.0", + "hash": "sha256-6eZWKdNjKMqufyOYolTximIS41gipBUNMKNn3HEiYw0=" + }, + { + "pname": "FSharpx.Collections", + "version": "3.1.0", + "hash": "sha256-CmDCfx19VNthqZHphYywOK0attxyJjOhu2srNKSky10=" + }, + { + "pname": "FsToolkit.ErrorHandling", + "version": "4.15.2", + "hash": "sha256-fzsnH7178Gr0pnFoXkJvqRc2s5c+MXuRKQHBifIhmQk=" + }, + { + "pname": "FsToolkit.ErrorHandling.TaskResult", + "version": "4.15.2", + "hash": "sha256-I/3BXTQQzVSlldcfaVZ849/PirOcozM5GLCmfL2qHWg=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.9.0", + "hash": "sha256-OaGa4+jRPHs+T+p/oekm2Miluqfd2IX8Rt+BmUx8kr4=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "8.0.0", + "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "8.0.0", + "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "8.0.1", + "hash": "sha256-KYPQYYspiBGiez7JshmEjy4kFt7ASzVxQeVsygIEvHA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.FileExtensions", + "version": "8.0.0", + "hash": "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Json", + "version": "8.0.0", + "hash": "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "8.0.0", + "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Physical", + "version": "8.0.0", + "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc=" + }, + { + "pname": "Microsoft.Extensions.FileSystemGlobbing", + "version": "8.0.0", + "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "8.0.0", + "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" + }, + { + "pname": "Microsoft.Extensions.TimeProvider.Testing", + "version": "8.5.0", + "hash": "sha256-ZGXrOV/qJVfjwrJsv3jtC80IVQyH3OLOw70gCIn6uIM=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.9.0", + "hash": "sha256-q/1AJ7eNlk02wvN76qvjl2xBx5iJ+h5ssiE/4akLmtI=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "5.0.0", + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.9.0", + "hash": "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.9.0", + "hash": "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, + { + "pname": "Mono.Cecil", + "version": "0.11.4", + "hash": "sha256-HrnRgFsOzfqAWw0fUxi/vkzZd8dMn5zueUeLQWA9qvs=" + }, + { + "pname": "Mono.Posix.NETStandard", + "version": "5.20.1-preview", + "hash": "sha256-gLtcH308/VVYgZcrJtvXDkBIMIQjK8w35AcmuxYYTvM=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, + { + "pname": "Serilog", + "version": "3.1.1", + "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI=" + }, + { + "pname": "Serilog.Sinks.Console", + "version": "5.0.1", + "hash": "sha256-aveoZM25ykc2haBHCXWD09jxZ2t2tYIGmaNTaO2V0jI=" + }, + { + "pname": "Serilog.Sinks.File", + "version": "5.0.0", + "hash": "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ=" + }, + { + "pname": "Serilog.Sinks.File.Header", + "version": "1.0.2", + "hash": "sha256-2igOXIHtojhhNlg/C5OhPwmVUoE5MpmgApi8dFmutx4=" + }, + { + "pname": "System.Collections.Immutable", + "version": "6.0.0", + "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.6.0", + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "8.0.0", + "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=" + }, + { + "pname": "System.Security.Permissions", + "version": "8.0.0", + "hash": "sha256-+YUPY+3HnTmfPLZzr+5qEk0RqalCbFZBgLXee1yCH1M=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "5.0.0", + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "8.0.0", + "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" + }, + { + "pname": "System.Text.Json", + "version": "8.0.0", + "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow=" + }, + { + "pname": "System.Windows.Extensions", + "version": "8.0.0", + "hash": "sha256-aHkz7LtmUDDRS7swQM0i6dDVUytRCMYeA2CfaeVA2Y0=" + }, + { + "pname": "TypeShape", + "version": "10.0.0", + "hash": "sha256-esJFuRvxuLXwBgi/7FjEVm1ATCGXU/yB2RtgN4ilZtg=" + }, + { + "pname": "YoloDev.Expecto.TestSdk", + "version": "0.14.3", + "hash": "sha256-3FIZM+GYsBsFGhLsasF7Ia9nXHSpqooQNe5H7ANy334=" + } +] diff --git a/pkgs/by-name/mi/min-ed-launcher/package.nix b/pkgs/by-name/mi/min-ed-launcher/package.nix new file mode 100644 index 000000000000..54e4f1d44278 --- /dev/null +++ b/pkgs/by-name/mi/min-ed-launcher/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, + git, +}: +buildDotnetModule rec { + pname = "min-ed-launcher"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "rfvgyhn"; + repo = "min-ed-launcher"; + tag = "v${version}"; + hash = "sha256-x3T88bhjxlf6K+COGfZGLsgwlEBSs9WR9zV+ZiTzh7g="; + + leaveDotGit = true; # During build the current commit is appended to the version + }; + + projectFile = "MinEdLauncher.sln"; + nugetDeps = ./deps.json; + buildInputs = [ + git # During build the current commit is appended to the version + ]; + + executables = [ "MinEdLauncher" ]; + + meta = { + homepage = "https://github.com/rfvgyhn/min-ed-launcher"; + description = "Minimal Elite Dangerous Launcher"; + license = lib.licenses.mit; + platforms = lib.platforms.x86_64; + mainProgram = "MinEdLauncher"; + maintainers = with lib.maintainers; [ jiriks74 ]; + }; +} diff --git a/pkgs/by-name/mi/minder/package.nix b/pkgs/by-name/mi/minder/package.nix index 33966794be80..e393a7dd27c8 100644 --- a/pkgs/by-name/mi/minder/package.nix +++ b/pkgs/by-name/mi/minder/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/phase1geo/Minder"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + teams = [ teams.pantheon ]; mainProgram = "com.github.phase1geo.minder"; }; } diff --git a/pkgs/by-name/mi/minetest-mapserver/package.nix b/pkgs/by-name/mi/minetest-mapserver/package.nix index 9641223a8460..5e9fb2aade10 100644 --- a/pkgs/by-name/mi/minetest-mapserver/package.nix +++ b/pkgs/by-name/mi/minetest-mapserver/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "minetest-mapserver"; - version = "4.9.2"; + version = "4.9.3"; src = fetchFromGitHub { owner = "minetest-mapserver"; repo = "mapserver"; rev = "v${version}"; - hash = "sha256-wo3/7axVkEcnqkOG29KE136EeMt/FW63q68UlpIA3z8="; + hash = "sha256-6tDhfYG/zcFjGNCR6yir71FM/qFHK5p/3+q+P6V1a4c="; }; vendorHash = "sha256-P3+M1ciRmFbOFnjy1+oWPhngPYFe/5o6Cs8pRlYNx2Q="; diff --git a/pkgs/by-name/mi/mini-redis/package.nix b/pkgs/by-name/mi/mini-redis/package.nix new file mode 100644 index 000000000000..3b87457ed68c --- /dev/null +++ b/pkgs/by-name/mi/mini-redis/package.nix @@ -0,0 +1,43 @@ +{ + lib, + rustPlatform, + fetchCrate, + pkg-config, + openssl, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mini-redis"; + version = "0.4.1"; + + src = fetchCrate { + inherit (finalAttrs) pname version; + sha256 = "sha256-vYphaQNMAHajod5oT/T3VJ12e6Qk5QOa5LQz6KsXvm8="; + }; + + cargoHash = "sha256-oGyJxNzJX7PwMkDoT9Tb3xF0vWgQwuyIjKPgEkbPKyI="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + doCheck = false; + + meta = { + description = "Incomplete, idiomatic implementation of a Redis client and server built with Tokio, for learning purposes"; + homepage = "https://github.com/tokio-rs/mini-redis"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nomaterials ]; + mainProgram = "mini-redis-cli"; + }; +}) diff --git a/pkgs/by-name/mi/minicom/package.nix b/pkgs/by-name/mi/minicom/package.nix new file mode 100644 index 000000000000..a4252e97065e --- /dev/null +++ b/pkgs/by-name/mi/minicom/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + makeWrapper, + pkg-config, + lrzsz, + ncurses, + libiconv, +}: + +stdenv.mkDerivation rec { + pname = "minicom"; + version = "2.10"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "minicom-team"; + repo = pname; + rev = version; + sha256 = "sha256-wC6VlMRwuhV1zQ26wNx7gijuze8E2CvnzpqOSIPzq2s="; + }; + + buildInputs = + [ ncurses ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + nativeBuildInputs = [ + autoreconfHook + makeWrapper + pkg-config + ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--sysconfdir=/etc" + "--enable-lock-dir=/var/lock" + ]; + + patches = [ ./xminicom_terminal_paths.patch ]; + + preConfigure = '' + # Have `configure' assume that the lock directory exists. + substituteInPlace configure \ + --replace 'test -d $UUCPLOCK' true + ''; + + postInstall = '' + for f in $out/bin/*minicom ; do + wrapProgram $f \ + --prefix PATH : ${lib.makeBinPath [ lrzsz ]}:$out/bin + done + ''; + + meta = with lib; { + description = "Modem control and terminal emulation program"; + homepage = "https://salsa.debian.org/minicom-team/minicom"; + license = licenses.gpl2Plus; + longDescription = '' + Minicom is a menu driven communications program. It emulates ANSI + and VT102 terminals. It has a dialing directory and auto zmodem + download. + ''; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch b/pkgs/by-name/mi/minicom/xminicom_terminal_paths.patch similarity index 100% rename from pkgs/tools/misc/minicom/xminicom_terminal_paths.patch rename to pkgs/by-name/mi/minicom/xminicom_terminal_paths.patch diff --git a/pkgs/by-name/mi/minidsp/package.nix b/pkgs/by-name/mi/minidsp/package.nix new file mode 100644 index 000000000000..0be81f52a4d5 --- /dev/null +++ b/pkgs/by-name/mi/minidsp/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + libusb1, + pkg-config, +}: +rustPlatform.buildRustPackage rec { + pname = "minidsp"; + version = "0.1.12"; + + src = fetchFromGitHub { + owner = "mrene"; + repo = "minidsp-rs"; + rev = "v${version}"; + hash = "sha256-8bKP9/byVRKj1P1MP3ZVg8yw0WaNB0BcqarCti7B8CA="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-JIm0XcgqXGPXlkQ1rhG5D38bQkQT9K44F71ZaCT2g8o="; + + cargoBuildFlags = [ "-p minidsp -p minidsp-daemon" ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ]; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + + meta = with lib; { + description = "Control interface for some MiniDSP products"; + homepage = "https://github.com/mrene/minidsp-rs"; + license = licenses.asl20; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ + maintainers.adamcstephens + maintainers.mrene + ]; + }; +} diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix index 59762d4ed2bc..75397b7ecc80 100644 --- a/pkgs/by-name/mi/miniflux/package.nix +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "miniflux"; - version = "2.2.7"; + version = "2.2.8"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; tag = version; - hash = "sha256-1W+sFXvM5qOYxpbRBkZIvombchv2oYkcFuq7/ETGjfs="; + hash = "sha256-AQ6HVRVlWt1D8fA4Z2FH7VIEKydDva7txwa/9Rfq0Ho="; }; - vendorHash = "sha256-bulQrLtA61RMZVhTtupTJUUTWJGWXcmpGaNUAoXEfYE="; + vendorHash = "sha256-9I0/dyjanuV8oZystox9RY/gGx1SZuFRTghArv5aJ64="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix index 1742f171ecba..2ade8acd9428 100644 --- a/pkgs/by-name/mi/minify/package.nix +++ b/pkgs/by-name/mi/minify/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "minify"; - version = "2.22.4"; + version = "2.23.1"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-sN3gGxUOWNFBB+iz6i+a0SP8my+IdbMXAVd/bWzzKms="; + hash = "sha256-v0KLQlf2WhI18uanVtvWfX6/7s9ZtfPM5AGyEIHZf54="; }; - vendorHash = "sha256-PxmtYVMkZcJvaM9CYSy5OSUkpyhL1VLwkXoY7uIe7Q8="; + vendorHash = "sha256-Btc5d/wwDmjhyDZwAIHDSbXuh8xqq/nIjTAkPsdeHU4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mi/minigalaxy/package.nix b/pkgs/by-name/mi/minigalaxy/package.nix index 131bd375418b..020788f0cc30 100644 --- a/pkgs/by-name/mi/minigalaxy/package.nix +++ b/pkgs/by-name/mi/minigalaxy/package.nix @@ -10,7 +10,7 @@ steam-run, replaceVars, unzip, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, }: @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { pythonPath = [ python3Packages.pygobject3 python3Packages.requests - webkitgtk_4_0 + webkitgtk_4_1 ]; dontWrapGApps = true; diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 3184c339168e..e35a49ab22e5 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.9.0"; + version = "2.10.2"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-WbWMssIQ8ETaVaJ9fEkUxHmnylH4hdO14XMwyB0BtFY="; + hash = "sha256-JPR9FRMVQH7DdYyFfh75g1BYDg8R9xCnigirGe8Xx1o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-B9La6DSrsJXsausew/FMcl/iQvZxrNkavddtU5yIQuA="; + cargoHash = "sha256-EInDnhUD29nZUOr2nBT4SuweMVad+RsS5eS767CvjRk="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix new file mode 100644 index 000000000000..74788f7c5224 --- /dev/null +++ b/pkgs/by-name/mi/minikube/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + pkg-config, + which, + libvirt, + withQemu ? false, + qemu, + makeWrapper, + OVMF, +}: + +buildGoModule rec { + pname = "minikube"; + version = "1.34.0"; + + vendorHash = "sha256-gw5Ol7Gp26KyIaiMvwik8FJpABpMT86vpFnZnAJ6hhs="; + + doCheck = false; + + src = fetchFromGitHub { + owner = "kubernetes"; + repo = "minikube"; + rev = "v${version}"; + sha256 = "sha256-Z7x3MOQUF3a19X4SSiIUfSJ3xl3482eKH700m/9pqcU="; + }; + postPatch = + (lib.optionalString (withQemu && stdenv.hostPlatform.isDarwin) '' + substituteInPlace \ + pkg/minikube/registry/drvs/qemu2/qemu2.go \ + --replace "/usr/local/opt/qemu/share/qemu" "${qemu}/share/qemu" \ + --replace "/opt/homebrew/opt/qemu/share/qemu" "${qemu}/share/qemu" + '') + + (lib.optionalString (withQemu && stdenv.hostPlatform.isLinux) '' + substituteInPlace \ + pkg/minikube/registry/drvs/qemu2/qemu2.go \ + --replace "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ + --replace "/usr/share/AAVMF/AAVMF_CODE.fd" "${OVMF.firmware}" + ''); + + nativeBuildInputs = [ + installShellFiles + pkg-config + which + makeWrapper + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libvirt ]; + + buildPhase = '' + make COMMIT=${src.rev} + ''; + + installPhase = '' + install out/minikube -Dt $out/bin + + wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false + export HOME=$PWD + + for shell in bash zsh fish; do + $out/bin/minikube completion $shell > minikube.$shell + installShellCompletion minikube.$shell + done + ''; + + meta = with lib; { + homepage = "https://minikube.sigs.k8s.io"; + description = "Tool that makes it easy to run Kubernetes locally"; + mainProgram = "minikube"; + license = licenses.asl20; + maintainers = with maintainers; [ + ebzzry + vdemeester + atkinschang + Chili-Man + ]; + }; +} diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix index 8808db4374f7..1d5c8aa0513a 100644 --- a/pkgs/by-name/mi/minimap2/package.nix +++ b/pkgs/by-name/mi/minimap2/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "minimap2"; - version = "2.28"; + version = "2.29"; src = fetchFromGitHub { repo = "minimap2"; owner = "lh3"; rev = "v${version}"; - sha256 = "sha256-cBl2BKgPCP/xHZW6fTH51cY9/lV/1HVLsN7a1R1Blv4="; + sha256 = "sha256-AIcxlEDHZOZgUOUZLRwmm5yuuzKHNz21rrSXAWGJEHk="; }; buildInputs = [ zlib ]; diff --git a/pkgs/by-name/mi/minio-client/package.nix b/pkgs/by-name/mi/minio-client/package.nix index 68d6a1c6ba18..a5d1f8d023b8 100644 --- a/pkgs/by-name/mi/minio-client/package.nix +++ b/pkgs/by-name/mi/minio-client/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2025-03-12T17-29-24Z"; + version = "2025-04-16T18-13-26Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-8n/qjM+FBrjbSLcd9iVioh3iEAkMNrIo5fG/ZQkAmBo="; + sha256 = "sha256-23shNQWVIuTLL0FLM00919JaT2QR4R0ou5ZA2/mQ4PA="; }; - vendorHash = "sha256-P7W8xgHc+2ksZnY0iuuPKjwsxSqjhPdiUfNMe18ldL0="; + vendorHash = "sha256-MpLQZFrf2sBAweXtYeFi5j6p6GaXuN99x+r4UK8D9xM="; subPackages = [ "." ]; diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix index b54ebc1353ef..869c12017efa 100644 --- a/pkgs/by-name/mi/minio-warp/package.nix +++ b/pkgs/by-name/mi/minio-warp/package.nix @@ -4,20 +4,29 @@ buildGoModule, versionCheckHook, nix-update-script, + fetchpatch, }: buildGoModule rec { pname = "minio-warp"; - version = "1.1.1"; + version = "1.1.4"; src = fetchFromGitHub { owner = "minio"; repo = "warp"; rev = "v${version}"; - hash = "sha256-zRRvY/PpLSY8cx3vqcAGfVK7FJKzFnxtghhIwrlUh+Y="; + hash = "sha256-KOhBSxR9P3Q6DpC8QCRaiw6Y51OyHLRlhr0WmXE74PI="; }; - vendorHash = "sha256-Qyb8ivuZplbOIxoS2cC+2FSZbW7CnChv1jaIKkCzgN4="; + patches = [ + # upstream ships a broken go.sum file in the release and fixes it one commit later .. + (fetchpatch { + url = "https://github.com/minio/warp/commit/c830e94367efce6e6d70c337d490a3b6eba5e558.patch"; + hash = "sha256-LXkgwpTPe4WvU+nAsYfjs38uXiBoeoavnxliw8nweRQ="; + }) + ]; + + vendorHash = "sha256-duEd5uss6mS2aTOTsI3dzZV2TEDHyKN5QKWb4Tt5+7s="; # See .goreleaser.yml ldflags = [ @@ -36,13 +45,14 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; meta = { description = "S3 benchmarking tool"; homepage = "https://github.com/minio/warp"; + changelog = "https://github.com/minio/warp/releases/tag/v${version}"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ christoph-heiss ]; mainProgram = "minio-warp"; diff --git a/pkgs/by-name/mi/miniplayer/package.nix b/pkgs/by-name/mi/miniplayer/package.nix index abb54413638a..bf8a6228ca94 100644 --- a/pkgs/by-name/mi/miniplayer/package.nix +++ b/pkgs/by-name/mi/miniplayer/package.nix @@ -38,6 +38,6 @@ buildPythonApplication rec { description = "Curses-based MPD client with basic functionality that can also display an album art"; homepage = "https://github.com/GuardKenzie/miniplayer"; license = licenses.mit; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index d85fd90783b0..36b2f3f5e609 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, curl, }: @@ -26,11 +25,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - nativeCheckInputs = [ curl ]; diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index e585035af33f..21643bc581b2 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "minizip-ng"; rev = finalAttrs.version; - hash = "sha256-NFl2R+o1SBXNAt2TOMMsbIh+IHJu78p56caT4h2TDeU="; + hash = "sha256-iAiw+ihVfcSNl6UdBad7FjT5Zwa+brndg60v7ceCzC8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mint-artwork/package.nix b/pkgs/by-name/mi/mint-artwork/package.nix index 8f5c843cf17c..7c02e0d10ce2 100644 --- a/pkgs/by-name/mi/mint-artwork/package.nix +++ b/pkgs/by-name/mi/mint-artwork/package.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { cc-by-40 ]; # from debian/copyright platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/mi/mint-cursor-themes/package.nix b/pkgs/by-name/mi/mint-cursor-themes/package.nix index 78a15f53ce74..66fd61fef4ae 100644 --- a/pkgs/by-name/mi/mint-cursor-themes/package.nix +++ b/pkgs/by-name/mi/mint-cursor-themes/package.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/linuxmint/mint-cursor-themes/"; description = "Linux Mint cursor themes"; license = licenses.gpl3Plus; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/mi/mint-l-icons/package.nix b/pkgs/by-name/mi/mint-l-icons/package.nix index f5e6deb2aa57..1641646ffdfc 100644 --- a/pkgs/by-name/mi/mint-l-icons/package.nix +++ b/pkgs/by-name/mi/mint-l-icons/package.nix @@ -52,6 +52,6 @@ stdenvNoCC.mkDerivation { description = "Mint-L icon theme"; license = licenses.gpl3Plus; # from debian/copyright platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/mi/mint-l-theme/package.nix b/pkgs/by-name/mi/mint-l-theme/package.nix index 7ce18e06f8f5..4ef7e9447f42 100644 --- a/pkgs/by-name/mi/mint-l-theme/package.nix +++ b/pkgs/by-name/mi/mint-l-theme/package.nix @@ -42,6 +42,6 @@ stdenvNoCC.mkDerivation rec { description = "Mint-L theme for the Cinnamon desktop"; license = licenses.gpl3Plus; # from debian/copyright platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/mi/mint-themes/package.nix b/pkgs/by-name/mi/mint-themes/package.nix index c25ba30e6afc..29d3e4ba3948 100644 --- a/pkgs/by-name/mi/mint-themes/package.nix +++ b/pkgs/by-name/mi/mint-themes/package.nix @@ -38,6 +38,6 @@ stdenvNoCC.mkDerivation rec { description = "Mint-X and Mint-Y themes for the cinnamon desktop"; license = licenses.gpl3; # from debian/copyright platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/mi/mint-x-icons/package.nix b/pkgs/by-name/mi/mint-x-icons/package.nix index 14e9500030d8..03fa2ceb04e4 100644 --- a/pkgs/by-name/mi/mint-x-icons/package.nix +++ b/pkgs/by-name/mi/mint-x-icons/package.nix @@ -53,6 +53,6 @@ stdenvNoCC.mkDerivation rec { description = "Mint/metal theme based on mintified versions of Clearlooks Revamp, Elementary and Faenza"; license = licenses.gpl3Plus; # from debian/copyright platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/mi/mint-y-icons/package.nix b/pkgs/by-name/mi/mint-y-icons/package.nix index 74734a4da865..a11b03fa8c28 100644 --- a/pkgs/by-name/mi/mint-y-icons/package.nix +++ b/pkgs/by-name/mi/mint-y-icons/package.nix @@ -49,6 +49,6 @@ stdenvNoCC.mkDerivation rec { description = "Mint-Y icon theme"; license = licenses.gpl3; # from debian/copyright platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 2ffbc30cc5f0..7763154211fa 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; tag = "v${finalAttrs.version}"; - hash = "sha256-PCY6vAnDjyoIL66oREUGRypQFX90EKB1RlXTkQDyXMw="; + hash = "sha256-nmDFmj3DawgjRB0+vlcvPX+kj6lzAu14HySFc2NsJss="; }; postPatch = diff --git a/pkgs/by-name/mi/miraclecast/package.nix b/pkgs/by-name/mi/miraclecast/package.nix index 74a3aff23ecb..681a38624963 100644 --- a/pkgs/by-name/mi/miraclecast/package.nix +++ b/pkgs/by-name/mi/miraclecast/package.nix @@ -1,30 +1,46 @@ { lib, - stdenv, fetchFromGitHub, + glib, + gst_all_1, + iproute2, + libtool, + makeBinaryWrapper, meson, + miraclecast, ninja, pkg-config, - glib, readline, - pcre, - systemd, + stdenv, + systemdLibs, + testers, udev, - iproute2, + wpa_supplicant, + relyUdev ? true, }: +let + gstreamerPluginPaths = lib.concatMapStrings (pth: pth + "/lib/gstreamer-1.0:") [ + (lib.getLib gst_all_1.gstreamer) + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ]; +in stdenv.mkDerivation { pname = "miraclecast"; - version = "1.0-20231112"; + version = "1.0-unstable-2024-07-13"; src = fetchFromGitHub { owner = "albfan"; repo = "miraclecast"; - rev = "af6ab257eae83bb0270a776a8fe00c0148bc53c4"; - hash = "sha256-3ZIAvA3w/ZhoJtVmUD444nch0PGD58PdBRke7zd9IuQ="; + rev = "937747fd4de64a33bccf5adb73924c435ceb821b"; + hash = "sha256-y37+AOz8xYjtDk9ITxMB7UeWeMpDH+b6HQBczv+x5zo="; }; nativeBuildInputs = [ + makeBinaryWrapper meson ninja pkg-config @@ -32,24 +48,44 @@ stdenv.mkDerivation { buildInputs = [ glib - pcre - readline - systemd - udev + gst_all_1.gstreamer iproute2 + libtool + readline + systemdLibs + udev + wpa_supplicant ]; - mesonFlags = [ - "-Drely-udev=true" - "-Dbuild-tests=true" - "-Dip-binary=${iproute2}/bin/ip" - ]; + mesonFlags = + [ + "-Dbuild-tests=true" + "-Dip-binary=${iproute2}/bin/ip" + ] + ++ lib.optionals relyUdev [ + "-Drely-udev=true" + ]; + + postPatch = '' + substituteInPlace res/miracle-gst \ + --replace-fail "/usr/bin/gst-launch-1.0" "${gst_all_1.gstreamer}/bin/gst-launch-1.0" + ''; + + postInstall = '' + wrapProgram $out/bin/miracle-gst --set GST_PLUGIN_SYSTEM_PATH_1_0 ${gstreamerPluginPaths} + ''; + + passthru.tests.version = testers.testVersion { + package = miraclecast; + command = "miracled --version"; + version = "Miraclecast 1"; + }; meta = with lib; { - description = "Connect external monitors via Wi-Fi"; + description = "Connect external monitors to your system via Wifi-Display specification also known as Miracast"; homepage = "https://github.com/albfan/miraclecast"; license = licenses.lgpl21Plus; - maintainers = [ ]; + maintainers = [ maintainers.wizardlink ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/mi/mirrorbits/package.nix b/pkgs/by-name/mi/mirrorbits/package.nix index a5d8bc041b7f..384ee2c1ca51 100644 --- a/pkgs/by-name/mi/mirrorbits/package.nix +++ b/pkgs/by-name/mi/mirrorbits/package.nix @@ -1,35 +1,32 @@ { lib, + versionCheckHook, buildGoModule, fetchFromGitHub, - fetchpatch, pkg-config, zlib, geoip, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mirrorbits"; - version = "0.5.1"; + version = "0.6"; src = fetchFromGitHub { owner = "etix"; repo = "mirrorbits"; - rev = "v${version}"; - hash = "sha256-Ta3+Y3P74cvx09Z4rB5ObgBZtfF4grVgyeZ57yFPlGM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-99eOfVSlGIEzNm+0gI/y0+UPd+dnZiGzaHlkqUNtO1U="; }; - vendorHash = null; + postPatch = '' + rm -rf vendor + ''; - patches = [ - # Add Go Modules support - (fetchpatch { - url = "https://github.com/etix/mirrorbits/commit/955a8b2e1aacea1cae06396a64afbb531ceb36d4.patch"; - hash = "sha256-KJgj3ynnjjiXG5qsUmzBiMjGEwfvM/9Ap+ZgUdhclik="; - }) - ]; + vendorHash = "sha256-cdD9RvOtgN/SHtgrtrucnUI+nnO/FabUyPRdvgoL44o="; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ zlib geoip @@ -40,10 +37,15 @@ buildGoModule rec { ldflags = [ "-s" "-w" + "-X github.com/etix/mirrorbits/core.VERSION=${finalAttrs.version}" ]; - meta = with lib; { - description = "geographical download redirector for distributing files efficiently across a set of mirrors"; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + meta = { + description = "Geographical download redirector for distributing files efficiently across a set of mirrors"; homepage = "https://github.com/etix/mirrorbits"; longDescription = '' Mirrorbits is a geographical download redirector written in Go for @@ -53,8 +55,8 @@ buildGoModule rec { the distribution of large-scale Open-Source projects with a lot of traffic. ''; - license = licenses.mit; - maintainers = with maintainers; [ fpletz ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fpletz ]; mainProgram = "mirrorbits"; }; -} +}) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 8ce5d1aa22f8..514d05453314 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.136.0", + "version": "3.142.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_linux_x86_64", - "hash": "sha256-MV6S23Ly0g2FPAhp2+RIMSC8D+s6NakVbMqLSwEr/2o=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.0/mirrord_linux_x86_64", + "hash": "sha256-XR9zqZLoM2ZNCCMiiIcAfthSg1a9l90Df9IHsod4Oc0=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_linux_aarch64", - "hash": "sha256-zwistetfQCucaQ3yE1XHNChDhVCnSUq2ttl4XMnAQJU=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.0/mirrord_linux_aarch64", + "hash": "sha256-P4Gt7xBGeDQFP5x7fRX9UzHkKq2ILuMoHfritzI+EiM=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_mac_universal", - "hash": "sha256-eSHJvtbCBxegYUjfplyBND2kinEqr5LlXJs9mm2U9wI=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.0/mirrord_mac_universal", + "hash": "sha256-Buw+QJ86e9vR1qDKiHUr6u/nlFrLYfUJ3Uu/GCsrm3Q=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_mac_universal", - "hash": "sha256-eSHJvtbCBxegYUjfplyBND2kinEqr5LlXJs9mm2U9wI=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.0/mirrord_mac_universal", + "hash": "sha256-Buw+QJ86e9vR1qDKiHUr6u/nlFrLYfUJ3Uu/GCsrm3Q=" } } } diff --git a/pkgs/by-name/mi/miru/darwin.nix b/pkgs/by-name/mi/miru/darwin.nix index 792282b44663..42aabead4c49 100644 --- a/pkgs/by-name/mi/miru/darwin.nix +++ b/pkgs/by-name/mi/miru/darwin.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/mac-Miru-${version}-mac.zip"; - hash = "sha256-o/7CTkIVufD5ai99XZFyDUgCIV7r4PbUcqkYcMVZwKE="; + hash = "sha256-V4Vo9fuQ0X7Q6CBM7Akh3+MrgQOBgCuC41khFatYWi4="; }; sourceRoot = "."; diff --git a/pkgs/by-name/mi/miru/linux.nix b/pkgs/by-name/mi/miru/linux.nix index e31b02d79554..80d5850e1ebc 100644 --- a/pkgs/by-name/mi/miru/linux.nix +++ b/pkgs/by-name/mi/miru/linux.nix @@ -19,7 +19,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha256-AhaGiZ/Vx9nJmIXrzZ1JMLqjWfQDyoKpzl55NT712Ro="; + hash = "sha256-nLPqEI6u5NNQ/kPbXRWPG0pIwutKNK2J8JeTPN6wHlg="; }; extraInstallCommands = diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix index f250c3a524f7..3141c48afca0 100644 --- a/pkgs/by-name/mi/miru/package.nix +++ b/pkgs/by-name/mi/miru/package.nix @@ -5,7 +5,7 @@ }: let pname = "miru"; - version = "5.5.9"; + version = "5.5.10"; meta = { description = "Stream anime torrents, real-time with no waiting for downloads"; homepage = "https://miru.watch"; diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index 1bc25833f15a..11e667800d73 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.13.7"; + version = "1.14.3"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; tag = "v${version}"; - hash = "sha256-6WFtXIqnn2ayfXkGMIxGDlYpE3UbHRuAU8qHGk9SCU4="; + hash = "sha256-ZYTPXzqQ0jKRjjpw0HFExNWjXBG3xopBhD2SoUEvdIE="; }; - vendorHash = "sha256-fEmf+d9oBXz7KymNVmC+CM7OyPD9QV1uN4ReTNhei7A="; + vendorHash = "sha256-A+71QaSmF7fzGeqmNOBvlZz5irJGxfO8+pR+1uxsiiU="; ldflags = [ "-s" diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 29355753f408..9eaed863a826 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -1,10 +1,10 @@ { + stdenv, lib, nix-update-script, rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, coreutils, bash, direnv, @@ -12,8 +12,6 @@ pkg-config, openssl, cacert, - Security, - SystemConfiguration, usage, mise, testers, @@ -23,29 +21,24 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2025.3.11"; + version = "2025.5.3"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-n7A6LGjcVz6LWz8fkkG5XS2WZf3FFkbidnt/S5jxy5g="; + hash = "sha256-BNGjkWBw2RKHmZH5HYy7AGALaVLStXK91ilw9K8iO0U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-On2+ROA71RyZdFPvH4Zem/494Q4uCYS4EZSvQL1DDWQ="; + cargoHash = "sha256-1bbj66+h9gnXqpf55cprqzZ5Ld44dsfET3FldututR4="; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ openssl ]; postPatch = '' patchShebangs --build \ @@ -70,12 +63,16 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ cacert ]; - checkFlags = [ - # last_modified will always be different in nix - "--skip=tera::tests::test_last_modified" - # requires https://github.com/rbenv/ruby-build - "--skip=plugins::core::ruby::tests::test_list_versions_matching" - ]; + checkFlags = + [ + # last_modified will always be different in nix + "--skip=tera::tests::test_last_modified" + ] + ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ + # started failing mid-April 2025 + "--skip=task::task_file_providers::remote_task_http::tests::test_http_remote_task_get_local_path_with_cache" + "--skip=task::task_file_providers::remote_task_http::tests::test_http_remote_task_get_local_path_without_cache" + ]; cargoTestFlags = [ "--all-features" ]; # some tests access the same folders, don't test in parallel to avoid race conditions @@ -92,6 +89,9 @@ rustPlatform.buildRustPackage rec { --bash ./completions/mise.bash \ --fish ./completions/mise.fish \ --zsh ./completions/_mise + + mkdir -p $out/lib/mise + touch $out/lib/mise/.disable-self-update ''; passthru = { diff --git a/pkgs/by-name/mi/mission-planner/package.nix b/pkgs/by-name/mi/mission-planner/package.nix index 626f499f9e15..ccf1af203c1a 100644 --- a/pkgs/by-name/mi/mission-planner/package.nix +++ b/pkgs/by-name/mi/mission-planner/package.nix @@ -34,7 +34,17 @@ stdenv.mkDerivation rec { mono unzip ]; - sourceRoot = "."; + + # zip has no outer directory, so make one and unpack there + unpackPhase = '' + runHook preUnpack + + mkdir -p source + cd source + unzip -q $src + + runHook postUnpack + ''; AOT_FILES = [ "MissionPlanner.exe" diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index cb65ef0c7110..18d3eccf6e3f 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -7,6 +7,8 @@ # nativeBuildInputs pkg-config, python3, + autoPatchelfHook, + autoAddDriverRunpath, # buildInputs oniguruma, @@ -32,6 +34,8 @@ }: let + inherit (stdenv) hostPlatform; + accelIsValid = builtins.elem acceleration [ null false @@ -45,7 +49,7 @@ let (acceleration == "cuda") || (config.cudaSupport && acceleration == null); minRequiredCudaCapability = "6.1"; # build fails with 6.0 - inherit (cudaPackages.cudaFlags) cudaCapabilities; + inherit (cudaPackages.flags) cudaCapabilities; cudaCapabilityString = if cudaCapability == null then (builtins.head ( @@ -56,7 +60,7 @@ let )) else cudaCapability; - cudaCapability' = lib.toInt (cudaPackages.cudaFlags.dropDot cudaCapabilityString); + cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString); mklSupport = assert accelIsValid; @@ -65,7 +69,7 @@ let metalSupport = assert accelIsValid; (acceleration == "metal") - || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && (acceleration == null)); + || (hostPlatform.isDarwin && hostPlatform.isAarch64 && (acceleration == null)); in rustPlatform.buildRustPackage (finalAttrs: { @@ -86,10 +90,19 @@ rustPlatform.buildRustPackage (finalAttrs: { useFetchCargoVendor = true; cargoHash = "sha256-YGGtS8gJJQKIgXxMWjO05ikSVdfVNs+cORbJ+Wf88y4="; - nativeBuildInputs = [ - pkg-config - python3 - ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + nativeBuildInputs = + [ + pkg-config + python3 + ] + ++ lib.optionals cudaSupport [ + # WARNING: autoAddDriverRunpath must run AFTER autoPatchelfHook + # Otherwise, autoPatchelfHook removes driverLink from RUNPATH + autoPatchelfHook + autoAddDriverRunpath + + cudaPackages.cuda_nvcc + ]; buildInputs = [ @@ -97,6 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: { openssl ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cccl cudaPackages.cuda_cudart cudaPackages.cuda_nvrtc cudaPackages.libcublas @@ -107,7 +121,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = lib.optionals cudaSupport [ "cuda" ] ++ lib.optionals mklSupport [ "mkl" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && metalSupport) [ "metal" ]; + ++ lib.optionals (hostPlatform.isDarwin && metalSupport) [ "metal" ]; env = { @@ -132,19 +146,23 @@ rustPlatform.buildRustPackage (finalAttrs: { // (lib.optionalAttrs cudaSupport { CUDA_COMPUTE_CAP = cudaCapability'; - # Apparently, cudart is enough: No need to provide the entire cudaPackages.cudatoolkit derivation. + # We already list CUDA dependencies in buildInputs + # We only set CUDA_TOOLKIT_ROOT_DIR to satisfy some redundant checks from upstream CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart; }); - NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [ - "-I${lib.getDev cudaPackages.cuda_cudart}/include" - "-I${lib.getDev cudaPackages.cuda_cccl}/include" + appendRunpaths = lib.optionals cudaSupport [ + (lib.makeLibraryPath [ + cudaPackages.libcublas + cudaPackages.libcurand + ]) ]; # swagger-ui will once more be copied in the target directory during the check phase + # See https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-7.1.0/utoipa-swagger-ui/build.rs#L168 # Not deleting the existing unpacked archive leads to a `PermissionDenied` error preCheck = '' - rm -rf target/${stdenv.hostPlatform.config}/release/build/ + rm -rf target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/build/ ''; # Prevent checkFeatures from inheriting buildFeatures because @@ -170,13 +188,11 @@ rustPlatform.buildRustPackage (finalAttrs: { tests = { version = testers.testVersion { package = mistral-rs; }; - withMkl = lib.optionalAttrs (stdenv.hostPlatform == "x86_64-linux") ( + withMkl = lib.optionalAttrs (hostPlatform.isLinux && hostPlatform.isx86_64) ( mistral-rs.override { acceleration = "mkl"; } ); - withCuda = lib.optionalAttrs stdenv.hostPlatform.isLinux ( - mistral-rs.override { acceleration = "cuda"; } - ); - withMetal = lib.optionalAttrs (stdenv.hostPlatform == "aarch64-darwin") ( + withCuda = lib.optionalAttrs hostPlatform.isLinux (mistral-rs.override { acceleration = "cuda"; }); + withMetal = lib.optionalAttrs (hostPlatform.isDarwin && hostPlatform.isAarch64) ( mistral-rs.override { acceleration = "metal"; } ); }; diff --git a/pkgs/build-support/mitm-cache/fetch.nix b/pkgs/by-name/mi/mitm-cache/fetch.nix similarity index 100% rename from pkgs/build-support/mitm-cache/fetch.nix rename to pkgs/by-name/mi/mitm-cache/fetch.nix diff --git a/pkgs/by-name/mi/mitm-cache/package.nix b/pkgs/by-name/mi/mitm-cache/package.nix new file mode 100644 index 000000000000..9c4e89bf3d55 --- /dev/null +++ b/pkgs/by-name/mi/mitm-cache/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + callPackage, + rustPlatform, + replaceVars, + openssl, + python3Packages, +}: + +rustPlatform.buildRustPackage rec { + pname = "mitm-cache"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "chayleaf"; + repo = "mitm-cache"; + rev = "v${version}"; + hash = "sha256-eY8mgmQB8wXQ7YJbLvdjXEEgGD+/RDywjvehJYf7ckE="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-DTPlPCumkVI2naYoNdO8T3pQNSawBA0FZ9LxVpqKqN0="; + + setupHook = replaceVars ./setup-hook.sh { + inherit openssl; + ephemeral_port_reserve = python3Packages.ephemeral-port-reserve; + }; + + passthru.fetch = callPackage ./fetch.nix { }; + + meta = with lib; { + description = "A MITM caching proxy for use in nixpkgs"; + homepage = "https://github.com/chayleaf/mitm-cache#readme"; + license = licenses.mit; + maintainers = with maintainers; [ chayleaf ]; + mainProgram = "mitm-cache"; + }; +} diff --git a/pkgs/build-support/mitm-cache/setup-hook.sh b/pkgs/by-name/mi/mitm-cache/setup-hook.sh similarity index 100% rename from pkgs/build-support/mitm-cache/setup-hook.sh rename to pkgs/by-name/mi/mitm-cache/setup-hook.sh diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index 13bce0bcd6b7..7b0975679b31 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "mitra"; - version = "3.21.0"; + version = "4.2.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "silverpill"; repo = "mitra"; rev = "v${version}"; - hash = "sha256-xBcz9XNpEDtIZW7yfbfWYPklw3whYoNF+gx3vkHQXGI="; + hash = "sha256-rT29QByrg/rn13Hj4UTzwA22xLsQhNESQPM0lb/dsf8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LO7xJBWxEGKLxocVs6EDWzGYLX/YtH4d9gSaVy+XxbM="; + cargoHash = "sha256-whAUofVJgqhwasOaYNmrWcZVyg0YpvNemt7/LJHxgCs="; # require running database doCheck = false; diff --git a/pkgs/by-name/mi/mix2nix/package.nix b/pkgs/by-name/mi/mix2nix/package.nix index a1e25f4e0a20..145e0685c798 100644 --- a/pkgs/by-name/mi/mix2nix/package.nix +++ b/pkgs/by-name/mi/mix2nix/package.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { description = "Generate nix expressions from mix.lock file"; mainProgram = "mix2nix"; license = licenses.mit; - maintainers = with maintainers; [ ydlr ] ++ teams.beam.members; + maintainers = with maintainers; [ ydlr ]; + teams = [ teams.beam ]; }; } diff --git a/pkgs/by-name/mj/mjolnir/package.json b/pkgs/by-name/mj/mjolnir/package.json deleted file mode 100644 index d0ffe772a827..000000000000 --- a/pkgs/by-name/mj/mjolnir/package.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "name": "mjolnir", - "version": "1.9.1", - "description": "A moderation tool for Matrix", - "main": "lib/index.js", - "repository": "git@github.com:matrix-org/mjolnir.git", - "author": "The Matrix.org Foundation C.I.C.", - "license": "Apache-2.0", - "private": true, - "scripts": { - "build": "tsc", - "postbuild": "rm -rf lib/test/ && cp -r lib/src/* lib/ && rm -rf lib/src/", - "lint": "tslint --project ./tsconfig.json -t stylish && npx prettier . --check", - "start:dev": "yarn build && node --async-stack-traces lib/index.js", - "test": "ts-mocha --project ./tsconfig.json test/commands/**/*.ts", - "test:integration": "NODE_ENV=harness ts-mocha --async-stack-traces --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json \"test/integration/**/*Test.ts\"", - "test:integration:single": "NODE_ENV=harness npx ts-mocha --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json", - "test:appservice:integration": "NODE_ENV=harness ts-mocha --async-stack-traces --timeout 300000 --project ./tsconfig.json \"test/appservice/integration/**/*Test.ts\"", - "test:appservice:integration:single": "NODE_ENV=harness npx ts-mocha --timeout 300000 --project ./tsconfig.json", - "test:manual": "NODE_ENV=harness ts-node test/integration/manualLaunchScript.ts", - "version": "sed -i '/# version automated/s/[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][0-9]*/'$npm_package_version'/' synapse_antispam/setup.py && git add synapse_antispam/setup.py && cat synapse_antispam/setup.py" - }, - "devDependencies": { - "@types/config": "^3.3.0", - "@types/crypto-js": "^4.0.2", - "@types/express": "^4.17.13", - "@types/html-to-text": "^8.0.1", - "@types/humanize-duration": "^3.27.1", - "@types/js-yaml": "^4.0.5", - "@types/jsdom": "^16.2.11", - "@types/mocha": "^9.0.0", - "@types/nedb": "^1.8.12", - "@types/node": "^18.0.0", - "@types/pg": "^8.6.5", - "@types/request": "^2.48.8", - "@types/shell-quote": "1.7.1", - "crypto-js": "^4.2.0", - "eslint": "^7.32", - "expect": "^27.0.6", - "mocha": "^9.0.1", - "ts-mocha": "^9.0.2", - "tslint": "^6.1.3", - "typescript": "^4.8.4", - "typescript-formatter": "^7.2" - }, - "dependencies": { - "@sentry/node": "^7.17.2", - "@sentry/tracing": "^7.17.2", - "@tensorflow/tfjs-node": "^4.21.0", - "@vector-im/matrix-bot-sdk": "^0.7.1-element.6", - "await-lock": "^2.2.2", - "axios": "^1.7.6", - "body-parser": "^1.20.1", - "config": "^3.3.8", - "express": "^4.20", - "html-to-text": "^8.0.0", - "humanize-duration": "^3.27.1", - "humanize-duration-ts": "^2.1.1", - "js-yaml": "^4.1.0", - "jsdom": "^16.6.0", - "lru-cache": "^11.0.1", - "matrix-appservice-bridge": "10.3.1", - "nsfwjs": "^4.1.0", - "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.2.2" - }, - "engines": { - "node": ">=20.0.0" - }, - "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" -} diff --git a/pkgs/by-name/mj/mjolnir/package.nix b/pkgs/by-name/mj/mjolnir/package.nix index dae472d6c015..7f97fc48f1b0 100644 --- a/pkgs/by-name/mj/mjolnir/package.nix +++ b/pkgs/by-name/mj/mjolnir/package.nix @@ -1,23 +1,26 @@ { lib, - mkYarnPackage, + stdenv, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, fetchFromGitHub, fetchYarnDeps, matrix-sdk-crypto-nodejs, makeWrapper, - nodejs, nixosTests, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "mjolnir"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; - tag = "v${version}"; - hash = "sha256-LK2CgMLDJHfr1+ejHYeJNw2ekCnUA8GHufZ6vbifzGQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-OxHnCMP6IP0EaAs4YQgmV04tq6IdAYmKQX8O9Q48CPk="; }; patches = [ @@ -25,33 +28,27 @@ mkYarnPackage rec { ./001-disable-nsfwprotection.patch ]; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-1V7ooONt9j+4hk/3w6Dsv/SdWwa1xsLk97EwhuPegNo="; }; - packageResolutions = { - "@matrix-org/matrix-sdk-crypto-nodejs" = - "${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildPhase = '' - runHook preBuild - - pushd deps/${pname} - yarn run build - popd - - runHook postBuild - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + makeWrapper + ]; postInstall = '' + cp -r lib/* $out/lib/node_modules/mjolnir/lib/ + + rm -rf $out/lib/node_modules/mjolnir/node_modules/@matrix-org/matrix-sdk-crypto-nodejs + ln -s ${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs $out/lib/node_modules/mjolnir/node_modules/@matrix-org/matrix-sdk-crypto-nodejs + makeWrapper ${nodejs}/bin/node "$out/bin/mjolnir" \ - --add-flags "$out/libexec/mjolnir/deps/mjolnir/lib/index.js" + --add-flags "$out/lib/node_modules/mjolnir/lib/index.js" ''; passthru = { @@ -60,7 +57,7 @@ mkYarnPackage rec { }; }; - meta = with lib; { + meta = { description = "Moderation tool for Matrix"; homepage = "https://github.com/matrix-org/mjolnir"; longDescription = '' @@ -77,8 +74,8 @@ mkYarnPackage rec { A Synapse module is also available to apply the same rulesets the bot uses across an entire homeserver. ''; - license = licenses.asl20; - maintainers = with maintainers; [ jojosch ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jojosch ]; mainProgram = "mjolnir"; }; -} +}) diff --git a/pkgs/by-name/mk/mkalias/package.nix b/pkgs/by-name/mk/mkalias/package.nix index 38f326992f67..a9c57605e1de 100644 --- a/pkgs/by-name/mk/mkalias/package.nix +++ b/pkgs/by-name/mk/mkalias/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, cmake, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -21,10 +20,6 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = [ - darwin.apple_sdk.frameworks.Foundation - ]; - cmakeFlags = [ "-DMKALIAS_VERSION=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/mk/mkbrr/package.nix b/pkgs/by-name/mk/mkbrr/package.nix new file mode 100644 index 000000000000..05d1ab72b352 --- /dev/null +++ b/pkgs/by-name/mk/mkbrr/package.nix @@ -0,0 +1,45 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "mkbrr"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "autobrr"; + repo = "mkbrr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NTkZKGoJqy7+f8dIIgLVRUQziD8QkcmoV2jEukXCqmM="; + }; + + vendorHash = "sha256-iczdGnJS70Ze5eZ2gnL511Ecy6Qjp+i4I749eIroRCM="; + + ldflags = [ + "-s" + "-w" + "-X main.version=v${finalAttrs.version}" + "-X main.buildTime=unknown" + ]; + + doCheck = true; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgramArg = "version"; + + meta = { + description = "Tool to create, modify and inspect torrent files"; + homepage = "https://github.com/autobrr/mkbrr"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ambroisie ]; + mainProgram = "mkbrr"; + }; +}) diff --git a/pkgs/by-name/mk/mkcal/package.nix b/pkgs/by-name/mk/mkcal/package.nix index bb2bae2d0d00..f401fb0135e7 100644 --- a/pkgs/by-name/mk/mkcal/package.nix +++ b/pkgs/by-name/mk/mkcal/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mkcal"; - version = "0.7.26"; + version = "0.7.27"; src = fetchFromGitHub { owner = "sailfishos"; repo = "mkcal"; tag = finalAttrs.version; - hash = "sha256-myOSzxzZmuOU7MShPfUOsHJilw9B6jh3W1S3P5dhcvs="; + hash = "sha256-7QgkGULCqlsao91WmqHjVYJDN0b1JFEmPMRs2SvFv3k="; }; outputs = [ @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + extra-cmake-modules doxygen graphviz perl @@ -53,16 +54,12 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]); - buildInputs = - [ - extra-cmake-modules - ] - ++ (with libsForQt5; [ - kcalendarcore - qtbase - qtpim - timed - ]); + buildInputs = with libsForQt5; [ + kcalendarcore + qtbase + qtpim + timed + ]; nativeCheckInputs = [ tzdata @@ -116,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/sailfishos/mkcal/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl2Plus; mainProgram = "mkcaltool"; - maintainers = lib.teams.lomiri.members; + teams = [ lib.teams.lomiri ]; platforms = lib.platforms.linux; pkgConfigModules = [ "libmkcal-qt5" diff --git a/pkgs/by-name/mk/mkclean/package.nix b/pkgs/by-name/mk/mkclean/package.nix index 14eee4aa21e6..13e6da9a0945 100644 --- a/pkgs/by-name/mk/mkclean/package.nix +++ b/pkgs/by-name/mk/mkclean/package.nix @@ -1,45 +1,32 @@ { - dos2unix, - fetchurl, lib, stdenv, + fetchurl, + cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mkclean"; - version = "0.8.10"; - - hardeningDisable = [ "format" ]; - nativeBuildInputs = [ dos2unix ]; + version = "0.9.0"; src = fetchurl { - url = "mirror://sourceforge/matroska/${pname}-${version}.tar.bz2"; - sha256 = "0zbpi4sm68zb20d53kbss93fv4aafhcmz7dsd0zdf01vj1r3wxwn"; + url = "mirror://sourceforge/matroska/mkclean-${finalAttrs.version}.tar.bz2"; + hash = "sha256-L1zcqw4Jtl+f74lJpV7wDuPdcA5LQFDiRdRCNH18w9s="; }; - configurePhase = '' - dos2unix ./mkclean/configure.compiled - ./mkclean/configure.compiled + nativeBuildInputs = [ cmake ]; + + hardeningDisable = [ "format" ]; + + postInstall = '' + install -Dm0755 mkclean/mkclean $out/bin/mkclean ''; - buildPhase = '' - make -C mkclean - ''; - - installPhase = '' - mkdir -p $out/{bin,lib} - mv release/gcc_linux_*/*.* $out/lib - mv release/gcc_linux_*/* $out/bin - ''; - - meta = with lib; { + meta = { description = "Command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed"; homepage = "https://www.matroska.org"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ cawilliamson ]; - platforms = [ - "i686-linux" - "x86_64-linux" - ]; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ cawilliamson ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/mk/mkvtoolnix/package.nix b/pkgs/by-name/mk/mkvtoolnix/package.nix index 4d1af75b0af6..c0ff5eb5cc3b 100644 --- a/pkgs/by-name/mk/mkvtoolnix/package.nix +++ b/pkgs/by-name/mk/mkvtoolnix/package.nix @@ -52,14 +52,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mkvtoolnix"; - version = "91.0"; + version = "92.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "mbunkus"; repo = "mkvtoolnix"; tag = "release-${finalAttrs.version}"; - hash = "sha256-cBzW8zj2JxzhdMkvs8nWiBID/8FSMT7FkrZ78c0f0ts="; + hash = "sha256-3yiQRGkjvOz80G6s39JHzqytxvGDmV9Lqs5bMxTAejo="; }; passthru = { diff --git a/pkgs/by-name/ml/mlib/package.nix b/pkgs/by-name/ml/mlib/package.nix index a2664abdffda..3b84372a3a08 100644 --- a/pkgs/by-name/ml/mlib/package.nix +++ b/pkgs/by-name/ml/mlib/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mlib"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "P-p-H-d"; repo = "mlib"; rev = "V${version}"; - hash = "sha256-r8ol923tNkZ13QXWjWpMrN6rBjjjg5XoBCho4OKdyvY="; + hash = "sha256-yP0oTlUJPllhmSLz0i3t3tIZhSnzwPJD6kzoFnEtrLM="; }; makeFlags = [ diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix new file mode 100644 index 000000000000..9997857befc4 --- /dev/null +++ b/pkgs/by-name/ml/mlt/package.nix @@ -0,0 +1,166 @@ +{ + config, + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + which, + ffmpeg, + fftw, + frei0r, + libdv, + libjack2, + libsamplerate, + libvorbis, + libxml2, + libX11, + makeWrapper, + movit, + opencv4, + rtaudio, + rubberband, + sox, + vid-stab, + cudaSupport ? config.cudaSupport, + cudaPackages ? { }, + enableJackrack ? stdenv.hostPlatform.isLinux, + glib, + ladspa-sdk, + ladspaPlugins, + enablePython ? false, + python3, + swig, + qt ? null, + enableSDL1 ? stdenv.hostPlatform.isLinux, + SDL, + enableSDL2 ? true, + SDL2, + gitUpdater, + libarchive, +}: + +stdenv.mkDerivation rec { + pname = "mlt"; + version = "7.30.0"; + + src = fetchFromGitHub { + owner = "mltframework"; + repo = "mlt"; + rev = "v${version}"; + hash = "sha256-z1bW+hcVeMeibC1PUS5XNpbkNB+75YLoOWZC2zuDol4="; + # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate. + # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on + # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545 + fetchSubmodules = true; + }; + + nativeBuildInputs = + [ + cmake + pkg-config + which + makeWrapper + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + ] + ++ lib.optionals enablePython [ + python3 + swig + ] + ++ lib.optionals (qt != null) [ + qt.wrapQtAppsHook + ]; + + buildInputs = + [ + (opencv4.override { inherit ffmpeg; }) + ffmpeg + fftw + frei0r + libdv + libjack2 + libsamplerate + libvorbis + libxml2 + movit + rtaudio + rubberband + sox + vid-stab + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + ] + ++ lib.optionals enableJackrack [ + glib + ladspa-sdk + ladspaPlugins + ] + ++ lib.optionals (qt != null) [ + qt.qtbase + qt.qtsvg + (qt.qt5compat or null) + libarchive + ] + ++ lib.optionals enableSDL1 [ + SDL + libX11 + ] + ++ lib.optionals enableSDL2 [ + SDL2 + libX11 + ]; + + outputs = [ + "out" + "dev" + ]; + + cmakeFlags = + [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + "-DMOD_OPENCV=ON" + ] + ++ lib.optionals enablePython [ + "-DSWIG_PYTHON=ON" + ] + ++ lib.optionals (qt != null) [ + "-DMOD_QT${lib.versions.major qt.qtbase.version}=ON" + "-DMOD_GLAXNIMATE${if lib.versions.major qt.qtbase.version == "5" then "" else "_QT6"}=ON" + ]; + + preFixup = '' + wrapProgram $out/bin/melt \ + --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 \ + ${lib.optionalString enableJackrack "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"} \ + ${lib.optionalString (qt != null) "\${qtWrapperArgs[@]}"} + + ''; + + postFixup = '' + substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \ + --replace '=''${prefix}//' '=/' + ''; + + passthru = { + inherit ffmpeg; + }; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = with lib; { + description = "Open source multimedia framework, designed for television broadcasting"; + homepage = "https://www.mltframework.org/"; + license = with licenses; [ + lgpl21Plus + gpl2Plus + ]; + maintainers = [ ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/by-name/ml/mlterm/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/mlterm/default.nix rename to pkgs/by-name/ml/mlterm/package.nix diff --git a/pkgs/by-name/ml/mlv-app/package.nix b/pkgs/by-name/ml/mlv-app/package.nix new file mode 100644 index 000000000000..9be0365f2bd9 --- /dev/null +++ b/pkgs/by-name/ml/mlv-app/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + libsForQt5, + writableTmpDirAsHomeHook, + ffmpeg-headless, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mlv-app"; + version = "1.15"; + + src = fetchFromGitHub { + owner = "ilia3101"; + repo = "MLV-App"; + rev = "QTv${finalAttrs.version}"; + hash = "sha256-boYnIGDowV4yRxdE98U5ngeAwqi5HTRDFh5gVwW/kN8="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/ilia3101/MLV-App/commit/b7643b1031955f085ade30e27974ddd889a4641f.patch"; + hash = "sha256-DQkoB+fjshWDLzKouhEQXzpqn78WL+eqo5oTfE9ltEk="; + }) + ]; + + postPatch = '' + substituteInPlace platform/qt/MainWindow.cpp \ + --replace-fail '"ffmpeg"' '"${lib.getExe ffmpeg-headless}"' + ''; + + qmakeFlags = [ "MLVApp.pro" ]; + + preConfigure = '' + cd platform/qt/ + ''; + + nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook + libsForQt5.qmake + writableTmpDirAsHomeHook + ]; + buildInputs = [ + libsForQt5.qtmultimedia + libsForQt5.qtbase + ]; + + dontWrapQtApps = true; + + preFixup = '' + wrapQtApp "$out/bin/mlvapp" + ''; + + installPhase = '' + runHook preInstall + install -Dm555 -t $out/bin mlvapp + install -Dm444 -t $out/share/applications mlvapp.desktop + install -Dm444 -t $out/share/icons/hicolor/512x512/apps RetinaIMG/MLVAPP.png + runHook postInstall + ''; + + updateScript = nix-update-script { }; + + meta = { + description = "All in one MLV processing app that is pretty great"; + homepage = "https://mlv.app"; + downloadPage = "https://github.com/ilia3101/MLV-App"; + changelog = "https://github.com/ilia3101/MLV-App/releases/tag/QTv${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = [ ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "mlvapp"; + }; +}) diff --git a/pkgs/by-name/ml/mlxbf-bootimages/package.nix b/pkgs/by-name/ml/mlxbf-bootimages/package.nix index 46e87a88d32b..63a8317bc572 100644 --- a/pkgs/by-name/ml/mlxbf-bootimages/package.nix +++ b/pkgs/by-name/ml/mlxbf-bootimages/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mlxbf-bootimages"; - version = "4.8.0-13249"; + version = "4.10.0-13520"; src = fetchurl { url = "https://linux.mellanox.com/public/repo/bluefield/${version}/bootimages/prod/${pname}-signed_${version}_arm64.deb"; - hash = "sha256-VwbngA2UpHtvhCmL21qrebVSNG6/4PbkhnVAmERpek0="; + hash = "sha256-lPclxhKmn1hvGXWI1A+Q1yXK7FZzKUcOtBoXG6KRsCA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mm/mm-common/package.nix b/pkgs/by-name/mm/mm-common/package.nix index e4d2b8b25439..439a9e597ed8 100644 --- a/pkgs/by-name/mm/mm-common/package.nix +++ b/pkgs/by-name/mm/mm-common/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtkmm.org"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/mm/mmh/package.nix b/pkgs/by-name/mm/mmh/package.nix index 7f9e04b2de40..2dbcea7045ce 100644 --- a/pkgs/by-name/mm/mmh/package.nix +++ b/pkgs/by-name/mm/mmh/package.nix @@ -7,21 +7,21 @@ flex, }: let - rev = "b17ea39dc17e5514f33b3f5c34ede92bd16e208c"; + rev = "7e93dee44df1a7e8f551a2e408a600b2e90a0974"; in stdenv.mkDerivation { pname = "mmh"; - version = "unstable-2020-08-21"; + version = "unstable-2023-09-24"; src = fetchurl { url = "http://git.marmaro.de/?p=mmh;a=snapshot;h=${rev};sf=tgz"; name = "mmh-${rev}.tgz"; - sha256 = "1bqfxafw4l2y46pnsxgy4ji1xlyifzw01k1ykbsjj9p61q3nv6l6"; + hash = "sha256-t2Qnwtkli+/MDk6uaikS2SIP9LucK64os8kGcn2ytRU="; }; postPatch = '' substituteInPlace sbr/Makefile.in \ - --replace "ar " "${stdenv.cc.targetPrefix}ar " + --replace-fail "ar " "${stdenv.cc.targetPrefix}ar " ''; buildInputs = [ ncurses ]; @@ -30,12 +30,18 @@ stdenv.mkDerivation { flex ]; - meta = with lib; { + # mhl.c:1031:58: error: pointer type mismatch in conditional expression [] + # 1031 | putstr((c1->c_flags & RTRIM) ? rtrim(cp) : cp); + NIX_CFLAGS_COMPILE = [ " -Wno-error=incompatible-pointer-types" ]; + + enableParallelBuilding = true; + + meta = { description = "Set of electronic mail handling programs"; homepage = "http://marmaro.de/prog/mmh"; - license = licenses.bsd3; - platforms = platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; - maintainers = with maintainers; [ kaction ]; + maintainers = with lib.maintainers; [ kaction ]; }; } diff --git a/pkgs/by-name/mo/moar/package.nix b/pkgs/by-name/mo/moar/package.nix index 2a79dcb2678b..cbac530d7a6d 100644 --- a/pkgs/by-name/mo/moar/package.nix +++ b/pkgs/by-name/mo/moar/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "moar"; - version = "1.31.4"; + version = "1.31.5"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-28rD8NYuvfNoBtegGXBuoa5qb3f1eYilkmE4ykIeHTU="; + hash = "sha256-o3vPC8P3yu3i0B/+BsIOFWfS2cWNFNYz4Ae0Z8L2TvE="; }; vendorHash = "sha256-J9u7LxzXk4npRyymmMKyN2ZTmhT4WwKjy0X5ITcHtoE="; diff --git a/pkgs/by-name/mo/mobilecoin-wallet/package.nix b/pkgs/by-name/mo/mobilecoin-wallet/package.nix index 1fba3f5a3f17..c6c972a0e78d 100644 --- a/pkgs/by-name/mo/mobilecoin-wallet/package.nix +++ b/pkgs/by-name/mo/mobilecoin-wallet/package.nix @@ -6,10 +6,10 @@ let pname = "mobilecoin-wallet"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage"; - hash = "sha256-UCBQRcGFHMQlLGvChrrMmM0MYv7AZtlkngFK4ptIPU0="; + hash = "sha256-JfG+eHsPFXZKi9Vjbw7CPvhmeMvfPWSDS65Ey4Lb8iQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/mo/moc/package.nix b/pkgs/by-name/mo/moc/package.nix new file mode 100644 index 000000000000..08d71f5b1684 --- /dev/null +++ b/pkgs/by-name/mo/moc/package.nix @@ -0,0 +1,167 @@ +{ + lib, + stdenv, + fetchsvn, + fetchpatch2, + pkg-config, + autoreconfHook, + autoconf-archive, + ncurses, + db, + popt, + libtool, + libiconv, + # Sound sub-systems + alsaSupport ? (!stdenv.hostPlatform.isDarwin), + alsa-lib, + pulseSupport ? true, + libpulseaudio, + jackSupport ? true, + libjack2, + ossSupport ? true, + # Audio formats + aacSupport ? true, + faad2, + libid3tag, + flacSupport ? true, + flac, + midiSupport ? true, + timidity, + modplugSupport ? true, + libmodplug, + mp3Support ? true, + libmad, + musepackSupport ? true, + libmpc, + libmpcdec, + taglib, + vorbisSupport ? true, + libvorbis, + speexSupport ? true, + speex, + ffmpegSupport ? true, + ffmpeg, + sndfileSupport ? true, + libsndfile, + wavpackSupport ? true, + wavpack, + # Misc + curlSupport ? true, + curl, + samplerateSupport ? true, + libsamplerate, + withDebug ? false, +}: + +stdenv.mkDerivation { + pname = "moc"; + version = "2.6-alpha3-unstable-2019-09-14"; + + src = fetchsvn { + url = "svn://svn.daper.net/moc/trunk"; + rev = "3005"; + hash = "sha256-JksJxHQgQ8hPTFtLvEvZuFh2lflDNrEmDTMWWwVnjZQ="; + }; + + patches = [ + # FFmpeg 6 support + (fetchpatch2 { + url = "https://cygwin.com/cgit/cygwin-packages/moc/plain/Support-for-recent-ffmpeg-change.patch?id=ab70f1306b8416852915be4347003aac3bdc216"; + hash = "sha256-5hLEFBJ+7Nvxn6pNj4bngcg2qJsCzxiuP6yEj+7tvs0="; + stripLen = 1; + }) + + # FFmpeg 7 support + (fetchpatch2 { + url = "https://cygwin.com/cgit/cygwin-packages/moc/plain/ffmpeg-7.0.patch?id=ab70f1306b8416852915be4347003aac3bdc216e"; + hash = "sha256-dYw6DNyw61MGfv+GdBz5Dtrr9fVph1tf7vxexWONwF8="; + stripLen = 1; + }) + + ./use-ax-check-compile-flag.patch + ] ++ lib.optional pulseSupport ./pulseaudio.patch; + + postPatch = '' + rm m4/* + ''; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + autoconf-archive + ]; + + buildInputs = + [ + ncurses + db + popt + libtool + ] + # Sound sub-systems + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional jackSupport libjack2 + # Audio formats + ++ lib.optional (aacSupport || mp3Support) libid3tag + ++ lib.optional aacSupport faad2 + ++ lib.optional flacSupport flac + ++ lib.optional midiSupport timidity + ++ lib.optional modplugSupport libmodplug + ++ lib.optional mp3Support libmad + ++ lib.optionals musepackSupport [ + libmpc + libmpcdec + taglib + ] + ++ lib.optional vorbisSupport libvorbis + ++ lib.optional speexSupport speex + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional sndfileSupport libsndfile + ++ lib.optional wavpackSupport wavpack + # Misc + ++ lib.optional curlSupport curl + ++ lib.optional samplerateSupport libsamplerate + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + configureFlags = [ + # Sound sub-systems + (lib.withFeature alsaSupport "alsa") + (lib.withFeature pulseSupport "pulse") + (lib.withFeature jackSupport "jack") + (lib.withFeature ossSupport "oss") + # Audio formats + (lib.withFeature aacSupport "aac") + (lib.withFeature flacSupport "flac") + (lib.withFeature midiSupport "timidity") + (lib.withFeature modplugSupport "modplug") + (lib.withFeature mp3Support "mp3") + (lib.withFeature musepackSupport "musepack") + (lib.withFeature vorbisSupport "vorbis") + (lib.withFeature speexSupport "speex") + (lib.withFeature ffmpegSupport "ffmpeg") + (lib.withFeature sndfileSupport "sndfile") + (lib.withFeature wavpackSupport "wavpack") + # Misc + (lib.withFeature curlSupport "curl") + (lib.withFeature samplerateSupport "samplerate") + ("--enable-debug=" + (if withDebug then "yes" else "no")) + "--disable-cache" + "--without-rcc" + ]; + + meta = with lib; { + description = "Terminal audio player designed to be powerful and easy to use"; + homepage = "http://moc.daper.net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ + aethelz + pSub + jagajaga + ]; + platforms = platforms.unix; + mainProgram = "mocp"; + }; +} diff --git a/pkgs/applications/audio/moc/pulseaudio.patch b/pkgs/by-name/mo/moc/pulseaudio.patch similarity index 100% rename from pkgs/applications/audio/moc/pulseaudio.patch rename to pkgs/by-name/mo/moc/pulseaudio.patch diff --git a/pkgs/applications/audio/moc/use-ax-check-compile-flag.patch b/pkgs/by-name/mo/moc/use-ax-check-compile-flag.patch similarity index 100% rename from pkgs/applications/audio/moc/use-ax-check-compile-flag.patch rename to pkgs/by-name/mo/moc/use-ax-check-compile-flag.patch diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix index d3c73f9fa685..22b87f1a4e5d 100644 --- a/pkgs/by-name/mo/mochi/package.nix +++ b/pkgs/by-name/mo/mochi/package.nix @@ -10,14 +10,14 @@ let pname = "mochi"; - version = "1.18.7"; + version = "1.18.11"; linux = appimageTools.wrapType2 rec { inherit pname version meta; src = fetchurl { url = "https://mochi.cards/releases/Mochi-${version}.AppImage"; - hash = "sha256-FCh8KLnvs26GKTVJY4Tqp+iA8sNlK7e0rv+oywBIF+U="; + hash = "sha256-NQ591KtWQz8hlXPhV83JEwGm+Au26PIop5KVzsyZKp4="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -37,7 +37,7 @@ let src = fetchzip { url = "https://mochi.cards/releases/Mochi-${version}.dmg"; - hash = "sha256-W3JqEPF8iCiXlKqjPoFcm7lP+n3lN4XBeAQdBEWvy8s="; + hash = "sha256-5RM4eqHQoYfO5JiUH9ol+3XxOk4VX4ocE3Yia82sovI="; stripRoot = false; nativeBuildInputs = [ _7zz ]; }; diff --git a/pkgs/by-name/mo/mockgen/package.nix b/pkgs/by-name/mo/mockgen/package.nix index 403f29e54f9c..866109dd7826 100644 --- a/pkgs/by-name/mo/mockgen/package.nix +++ b/pkgs/by-name/mo/mockgen/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "mockgen"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "uber-go"; repo = "mock"; rev = "v${version}"; - sha256 = "sha256-1UlaM3IvKlplBW1pg5l+IXwirlierjDKqKsVwFt7EAw="; + sha256 = "sha256-650GRaSlGg+ZszACtvn8pJPEnD9NUXM/liLNK7kte6c="; }; vendorHash = "sha256-0OnK5/e0juEYrNJuVkr+tK66btRW/oaHpJSDakB32Bc="; diff --git a/pkgs/by-name/mo/modelscan/package.nix b/pkgs/by-name/mo/modelscan/package.nix index eb746ead7b83..1a7b96927377 100644 --- a/pkgs/by-name/mo/modelscan/package.nix +++ b/pkgs/by-name/mo/modelscan/package.nix @@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-8VupkPiHebVtOqMdtkBflAI1zPRdDSvHCEq3ghjASaE="; }; + pythonRelaxDeps = [ "rich" ]; + build-system = with python3.pkgs; [ poetry-core poetry-dynamic-versioning diff --git a/pkgs/by-name/mo/modemmanager/package.nix b/pkgs/by-name/mo/modemmanager/package.nix index 0840191e498f..5ccfa92549fb 100644 --- a/pkgs/by-name/mo/modemmanager/package.nix +++ b/pkgs/by-name/mo/modemmanager/package.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { description = "WWAN modem manager, part of NetworkManager"; homepage = "https://www.freedesktop.org/wiki/Software/ModemManager/"; license = licenses.gpl2Plus; - maintainers = teams.freedesktop.members; + teams = [ teams.freedesktop ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 6731686e16c8..856faa41b314 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -6,6 +6,7 @@ desktop-file-utils, fetchFromGitHub, makeBinaryWrapper, + nix-update-script, nodejs, openssl, pkg-config, @@ -18,23 +19,24 @@ let pnpm = pnpm_9; in -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "modrinth-app-unwrapped"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; - tag = "v${version}"; - hash = "sha256-h+zj4Hm7v8SU6Zy0rIWbOknXVdSDf8b1d4q6M12J5Lc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-1+Fmc8qyU3hCZmRNgp90nuvFgaB/GOH6SNc9AyWZYn0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RrXSBgVh4UZFHcgUWhUjE7rEm/RZFDSDCpXS22gVjZ0="; + cargoHash = "sha256-6hEnXzaL6PnME9s+T+MtmoTQmaux/0m/6xaQ99lwM2I="; pnpmDeps = pnpm.fetchDeps { - inherit pname version src; - hash = "sha256-nFuPFgwJw38XVxhW0QXmU31o+hqJKGJysnPg2YSg2D0="; + inherit (finalAttrs) pname version src; + hash = "sha256-Q6e942R+3+511qFe4oehxdquw1TgaWMyOGOmP3me54o="; }; nativeBuildInputs = [ @@ -72,6 +74,10 @@ rustPlatform.buildRustPackage rec { $out/share/applications/Modrinth\ App.desktop ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Modrinth's game launcher"; longDescription = '' @@ -91,4 +97,4 @@ rustPlatform.buildRustPackage rec { # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678 broken = !stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/mo/modsecurity_standalone/package.nix b/pkgs/by-name/mo/modsecurity_standalone/package.nix index ffcefb8beb7b..5a1ee330d2b7 100644 --- a/pkgs/by-name/mo/modsecurity_standalone/package.nix +++ b/pkgs/by-name/mo/modsecurity_standalone/package.nix @@ -13,6 +13,8 @@ luaSupport ? false, lua5, perl, + fetchpatch, + versionCheckHook, }: let @@ -20,15 +22,15 @@ let optional = lib.optional; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "modsecurity"; - version = "2.9.7"; + version = "2.9.8"; src = fetchFromGitHub { owner = "owasp-modsecurity"; repo = "modsecurity"; - rev = "v${version}"; - sha256 = "sha256-hJ8wYeC83dl85bkUXGZKHpHzw9QRgtusj1/+Coxsx0k="; + tag = "v${finalAttrs.version}"; + hash = "sha256-fJ5XeO5m5LlImAuzIvXVVWkc9awbaRI3NWWOOwGrshI="; }; nativeBuildInputs = [ @@ -56,13 +58,40 @@ stdenv.mkDerivation rec { "--with-lua=${luaValue}" ]; + enableParallelBuilding = true; + + env.NIX_CFLAGS_COMPILE = toString [ + # msc_test.c:86:5: error: initialization of 'int' from 'void *' makes integer from pointer without a cast [] + "-Wno-error=int-conversion" + ]; + outputs = [ "out" "nginx" ]; - # by default modsecurity's install script copies compiled output to httpd's modules folder - # this patch removes those lines - patches = [ ./Makefile.am.patch ]; + patches = [ + # by default modsecurity's install script copies compiled output to httpd's modules folder + # this patch removes those lines + ./Makefile.am.patch + # remove when 2.9.9 is released + (fetchpatch { + name = "move-id_log"; + url = "https://github.com/owasp-modsecurity/ModSecurity/commit/149376377ecef9ecc36ee81d5b666fc0ac7e249b.patch"; + hash = "sha256-KjQGqSBt/u9zPZY1aSIupnYHleJbsOAOk3Y2bNOyRxk="; + }) + # remove when 2.9.9 is released + (fetchpatch { + name = "gcc-format-security"; + url = "https://github.com/owasp-modsecurity/ModSecurity/commit/cddd9a7eb5585a9b3be1f9bdcadcace8f60f5808.patch"; + hash = "sha256-H1wkZQ5bTQIRhlEvvvj7YCBi9qndRgHgKTnE9Cusq3I="; + }) + # remove when 2.9.9 is released + (fetchpatch { + name = "gcc-incompatible-pointer-type"; + url = "https://github.com/owasp-modsecurity/ModSecurity/commit/4919814a5cf0e7911f71856ed872b0e73b659a0a.patch"; + hash = "sha256-9JzCtiLf43xw6i4NqQpok37es+kuWXZWKdJum28Hx4M="; + }) + ]; doCheck = true; nativeCheckInputs = [ perl ]; @@ -72,11 +101,18 @@ stdenv.mkDerivation rec { cp -R * $nginx ''; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "-v"; + versionCheckProgram = "${placeholder "out"}/bin/mlogc"; + + meta = { description = "Open source, cross-platform web application firewall (WAF)"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://github.com/owasp-modsecurity/ModSecurity"; - maintainers = with maintainers; [ offline ]; + maintainers = with lib.maintainers; [ offline ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index 125753726091..07161835189e 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -7,7 +7,7 @@ cmake, mimalloc, ninja, - tbb, + tbb_2022_0, zlib, zstd, @@ -20,17 +20,19 @@ runCommandCC, testers, useMoldLinker, + + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mold"; - version = "2.37.1"; + version = "2.39.1"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; - rev = "v${version}"; - hash = "sha256-ZGO3oT8NOOkAYTyoMUKxH3TFP4mw2z0BGdGSF2TbKaE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uC6oakFfF0tpSiBeps5IO41Khk7VyCMSZhVh2Gmwlyc="; }; nativeBuildInputs = [ @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ - tbb + tbb_2022_0 zlib zstd ] @@ -53,6 +55,10 @@ stdenv.mkDerivation rec { "-DMOLD_USE_SYSTEM_TBB:BOOL=ON" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + passthru = { updateScript = nix-update-script { }; tests = @@ -110,7 +116,7 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { description = "Faster drop-in replacement for existing Unix linkers (unwrapped)"; longDescription = '' mold is a faster drop-in replacement for existing Unix linkers. It is @@ -119,13 +125,14 @@ stdenv.mkDerivation rec { rapid debug-edit-rebuild cycles. ''; homepage = "https://github.com/rui314/mold"; - changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; - license = licenses.mit; - platforms = platforms.unix; + changelog = "https://github.com/rui314/mold/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "mold"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ azahi paveloom ]; }; -} +}) diff --git a/pkgs/by-name/mo/mollysocket/package.nix b/pkgs/by-name/mo/mollysocket/package.nix index aede71ab8bc2..1f3b5add9fed 100644 --- a/pkgs/by-name/mo/mollysocket/package.nix +++ b/pkgs/by-name/mo/mollysocket/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, sqlite, - stdenv, - darwin, nixosTests, }: @@ -28,14 +26,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + sqlite + ]; checkFlags = [ # tests interact with Signal servers diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix index d758e2915773..4fd4aa6e6b3b 100644 --- a/pkgs/by-name/mo/moltenvk/package.nix +++ b/pkgs/by-name/mo/moltenvk/package.nix @@ -6,7 +6,6 @@ gitUpdater, apple-sdk_15, cereal, - libcxx, glslang, spirv-cross, spirv-headers, @@ -102,8 +101,8 @@ stdenv.mkDerivation (finalAttrs: { ''; env.NIX_CFLAGS_COMPILE = toString ( - [ - "-isystem ${lib.getDev libcxx}/include/c++/v1" + lib.optional (stdenv.cc.libcxx != null) "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1" + ++ [ "-I${lib.getDev spirv-cross}/include/spirv_cross" "-I${lib.getDev spirv-headers}/include/spirv/unified1" diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 9930e8fca566..108f0cbbf246 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch2, writeText, bluez, cjson, @@ -11,7 +12,6 @@ doxygen, eigen, elfutils, - fetchpatch2, glslang, gst-plugins-base, gstreamer, @@ -66,16 +66,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "monado"; - version = "24.0.0"; + version = "25.0.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-lFy0VvaLD4Oyu2TZJnaIWjuaJUZjGGDJS0VsRfIUpcc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-VxTxvw+ftqlh3qF5qWxpK1OJsRowkRXu0xEH2bDckUA="; }; + patches = [ + # Remove with v26 + (fetchpatch2 { + url = "https://gitlab.freedesktop.org/monado/monado/-/commit/2a6932d46dad9aa957205e8a47ec2baa33041076.patch"; + hash = "sha256-CZMbGgx7mEDcjcoRJHDZ5P6BecFW8CB4fpzxQ9bpAvE="; + }) + ]; + nativeBuildInputs = [ cmake doxygen @@ -138,16 +146,6 @@ stdenv.mkDerivation (finalAttrs: { tracy ]; - patches = [ - # Remove this patch on the next update - # https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2338 - (fetchpatch2 { - name = "improve-reproducibility.patch"; - url = "https://gitlab.freedesktop.org/monado/monado/-/commit/9819fb6dd61d2af5b2d993ed37b976760002b055.patch"; - hash = "sha256-qpTF1Q64jl8ZnJzMtflrpHLahCqfde2DXA9/Avlc18I="; - }) - ]; - cmakeFlags = [ (lib.cmakeBool "XRT_FEATURE_SERVICE" serviceSupport) (lib.cmakeBool "XRT_HAVE_TRACY" tracingSupport) diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix new file mode 100644 index 000000000000..2fddc205709d --- /dev/null +++ b/pkgs/by-name/mo/monero-cli/package.nix @@ -0,0 +1,132 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch2, + cmake, + pkg-config, + boost186, + libsodium, + miniupnpc, + openssl, + python3, + randomx, + rapidjson, + readline, + unbound, + zeromq, + + trezorSupport ? true, + hidapi, + libusb1, + protobuf_21, + udev, +}: + +let + # submodules; revs are taken from monero repo's `/external` at the given monero version tag. + supercop = fetchFromGitHub { + owner = "monero-project"; + repo = "supercop"; + rev = "633500ad8c8759995049ccd022107d1fa8a1bbc9"; + hash = "sha256-26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE="; + }; + trezor-common = fetchFromGitHub { + owner = "trezor"; + repo = "trezor-common"; + rev = "bff7fdfe436c727982cc553bdfb29a9021b423b0"; + hash = "sha256-VNypeEz9AV0ts8X3vINwYMOgO8VpNmyUPC4iY3OOuZI="; + }; +in +stdenv.mkDerivation rec { + pname = "monero-cli"; + version = "0.18.4.0"; + + src = fetchFromGitHub { + owner = "monero-project"; + repo = "monero"; + rev = "v${version}"; + hash = "sha256-0byMtX2f+8FqNhLPN1oLxIUTWg5RSbHfwiL8pUIAcgQ="; + }; + + patches = [ + ./use-system-libraries.patch + ]; + + postPatch = '' + # manually install submodules + rmdir external/{supercop,trezor-common} + ln -sf ${supercop} external/supercop + ln -sf ${trezor-common} external/trezor-common + # export patched source for monero-gui + cp -r . $source + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = + [ + boost186 # uses boost/asio/io_service.hpp + libsodium + miniupnpc + openssl + randomx + rapidjson + readline + unbound + zeromq + ] + ++ lib.optionals trezorSupport [ + python3 + hidapi + libusb1 + protobuf_21 + ] + ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ]; + + cmakeFlags = + [ + # skip submodules init + "-DMANUAL_SUBMODULES=ON" + # required by monero-gui + "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" + "-Wno-dev" + ] + ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF" + ++ lib.optional trezorSupport [ + "-DUSE_DEVICE_TREZOR=ON" + # fix build on recent gcc versions + "-DCMAKE_CXX_FLAGS=-fpermissive" + ]; + + outputs = [ + "out" + "source" + ]; + + meta = { + description = "Private, secure, untraceable currency"; + homepage = "https://getmonero.org/"; + license = lib.licenses.bsd3; + + platforms = with lib.platforms; linux; + + # macOS/ARM has a working `monerod` (at least), but `monero-wallet-cli` + # segfaults on start after entering the wallet password, when built in release mode. + # Building the same revision in debug mode to root-cause the above problem doesn't work + # because of https://github.com/monero-project/monero/issues/9486 + badPlatforms = [ "aarch64-darwin" ]; + + maintainers = with lib.maintainers; [ + pmw + rnhmjoj + ]; + mainProgram = "monero-wallet-cli"; + # internal build tool generate_translations_header is tricky to compile for the build platform + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; + }; +} diff --git a/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch b/pkgs/by-name/mo/monero-cli/use-system-libraries.patch similarity index 93% rename from pkgs/applications/blockchains/monero-cli/use-system-libraries.patch rename to pkgs/by-name/mo/monero-cli/use-system-libraries.patch index adb41fb4ac25..33dc84018bcb 100644 --- a/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch +++ b/pkgs/by-name/mo/monero-cli/use-system-libraries.patch @@ -1,8 +1,8 @@ diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 5b7f69a56..cc4b0a346 100644 +index 538e4d215..cc4b0a346 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt -@@ -35,25 +35,14 @@ +@@ -35,26 +35,14 @@ # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with # others. @@ -10,6 +10,7 @@ index 5b7f69a56..cc4b0a346 100644 - -message(STATUS "Using in-tree miniupnpc") -set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) +-set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Disable building shared library" FORCE) -add_subdirectory(miniupnp/miniupnpc) -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") -set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -34,13 +35,13 @@ index 5b7f69a56..cc4b0a346 100644 if(NOT UNBOUND_INCLUDE_DIR) die("Could not find libunbound") -@@ -69,4 +58,3 @@ endif() +@@ -70,4 +58,3 @@ endif() add_subdirectory(db_drivers) add_subdirectory(easylogging++) add_subdirectory(qrcodegen) -add_subdirectory(randomx EXCLUDE_FROM_ALL) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl -index 71f5393e8..bb48083d0 100644 +index 884a7b5fc..24c10334e 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -60,9 +60,9 @@ diff --git a/pkgs/applications/blockchains/monero-gui/move-log-file.patch b/pkgs/by-name/mo/monero-gui/move-log-file.patch similarity index 100% rename from pkgs/applications/blockchains/monero-gui/move-log-file.patch rename to pkgs/by-name/mo/monero-gui/move-log-file.patch diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix new file mode 100644 index 000000000000..d1683b09a684 --- /dev/null +++ b/pkgs/by-name/mo/monero-gui/package.nix @@ -0,0 +1,148 @@ +{ + lib, + fetchFromGitHub, + makeDesktopItem, + boost186, + cmake, + libgcrypt, + libgpg-error, + libsodium, + miniupnpc, + monero-cli, + pkg-config, + qt5, + quirc, + randomx, + rapidjson, + stdenv, + unbound, + zeromq, + + trezorSupport ? true, + hidapi, + libusb1, + protobuf_21, + python3, + udev, +}: + +stdenv.mkDerivation rec { + pname = "monero-gui"; + version = "0.18.4.0"; + + src = fetchFromGitHub { + owner = "monero-project"; + repo = "monero-gui"; + rev = "v${version}"; + hash = "sha256-JwYx5TjGp3VPPSgjN0+w1A4RoZGm7A73Gpg44fre1/c="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt5.wrapQtAppsHook + (lib.getDev qt5.qttools) + ]; + + buildInputs = + [ + boost186 # uses boost/asio/io_service.hpp + libgcrypt + libgpg-error + libsodium + miniupnpc + qt5.qtbase + qt5.qtdeclarative + qt5.qtgraphicaleffects + qt5.qtmultimedia + qt5.qtquickcontrols + qt5.qtquickcontrols2 + qt5.qtxmlpatterns + quirc + randomx + rapidjson + unbound + zeromq + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ qt5.qtmacextras ] + ++ lib.optionals trezorSupport [ + hidapi + libusb1 + protobuf_21 + python3 + ] + ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ + udev + ]; + + postUnpack = '' + # copy monero sources here + # (needs to be writable) + cp -r ${monero-cli.source}/* source/monero + chmod -R +w source/monero + ''; + + patches = [ + ./move-log-file.patch + ./use-system-libquirc.patch + ]; + + postPatch = '' + # set monero-gui version + substituteInPlace src/version.js.in \ + --replace '@VERSION_TAG_GUI@' '${version}' + + # use monerod from the monero package + substituteInPlace src/daemon/DaemonManager.cpp \ + --replace 'QApplication::applicationDirPath() + "' '"${monero-cli}/bin' + + # 1: only build external deps, *not* the full monero + # 2: use nixpkgs libraries + substituteInPlace CMakeLists.txt \ + --replace 'add_subdirectory(monero)' \ + 'add_subdirectory(monero EXCLUDE_FROM_ALL)' \ + --replace 'add_subdirectory(external)' "" + ''; + + cmakeFlags = + [ "-DARCH=default" ] + ++ lib.optional trezorSupport [ + # fix build on recent gcc versions + "-DCMAKE_CXX_FLAGS=-fpermissive" + ]; + + desktopItem = makeDesktopItem { + name = "monero-wallet-gui"; + exec = "monero-wallet-gui"; + icon = "monero"; + desktopName = "Monero"; + genericName = "Wallet"; + categories = [ + "Network" + "Utility" + ]; + }; + + postInstall = '' + # install desktop entry + install -Dm644 -t $out/share/applications \ + ${desktopItem}/share/applications/* + + # install icons + for n in 16 24 32 48 64 96 128 256; do + size=$n"x"$n + install -Dm644 \ + $src/images/appicons/$size.png \ + $out/share/icons/hicolor/$size/apps/monero.png + done; + ''; + + meta = { + description = "Private, secure, untraceable currency"; + homepage = "https://getmonero.org/"; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rnhmjoj ]; + mainProgram = "monero-wallet-gui"; + }; +} diff --git a/pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch b/pkgs/by-name/mo/monero-gui/use-system-libquirc.patch similarity index 100% rename from pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch rename to pkgs/by-name/mo/monero-gui/use-system-libquirc.patch diff --git a/pkgs/by-name/mo/monetdb/package.nix b/pkgs/by-name/mo/monetdb/package.nix index e05dc1777367..02ac4a2f166f 100644 --- a/pkgs/by-name/mo/monetdb/package.nix +++ b/pkgs/by-name/mo/monetdb/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.51.7"; + version = "11.53.3"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-lWURVG+5NSWBTxXC5slYSedMZC1Z/HGfzZ43tR7z4dE="; + hash = "sha256-8q8Q3b7D6BR+UMmcu4T5y+Xtwmr1URHc0Cq97tfDD6I="; }; nativeBuildInputs = [ @@ -45,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: { $out/bin/Mz.py \ $out/bin/Mtest.py \ $out/bin/sqlsample.pl \ - $out/bin/malsample.pl \ - $out/bin/Mconvert.py + $out/bin/malsample.pl ''; passthru.tests = { inherit (nixosTests) monetdb; }; diff --git a/pkgs/by-name/mo/moneydance/package.nix b/pkgs/by-name/mo/moneydance/package.nix index f487e1306f07..f08eda658829 100644 --- a/pkgs/by-name/mo/moneydance/package.nix +++ b/pkgs/by-name/mo/moneydance/package.nix @@ -15,11 +15,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "moneydance"; - version = "2024.1_5118"; + version = "2024.4_5253"; src = fetchzip { - url = "https://infinitekind.com/stabledl/2024_5118/moneydance-linux.tar.gz"; - hash = "sha256-wwSb3CuhuXB4I9jq+TpLPbd1k9UzqQbAaZkGKgi+nns="; + url = "https://infinitekind.com/stabledl/${ + lib.replaceStrings [ "_" ] [ "." ] finalAttrs.version + }/moneydance-linux.tar.gz"; + hash = "sha256-xOdkuaN17ss9tTSXgU//s6cBm2jGEgP9eTtvW0k3VWQ="; }; # We must use wrapGAppsHook (since Java GUIs on Linux use GTK), but by @@ -76,7 +78,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://infinitekind.com/moneydance"; - changelog = "https://infinitekind.com/stabledl/2024_5118/changelog.txt"; + changelog = "https://infinitekind.com/stabledl/${ + lib.replaceStrings [ "_" ] [ "." ] finalAttrs.version + }/changelog-stable.txt"; description = "Easy to use and full-featured personal finance app that doesn't compromise your privacy"; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.unfree; diff --git a/pkgs/by-name/mo/mongoc/package.nix b/pkgs/by-name/mo/mongoc/package.nix index 5812ffda8bef..74c92b65168f 100644 --- a/pkgs/by-name/mo/mongoc/package.nix +++ b/pkgs/by-name/mo/mongoc/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.30.2"; + version = "1.30.3"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; tag = version; - hash = "sha256-RDUrD8MPZd1VBePyR+L5GiT/j5EZIY1KHLQKG5MsuSM="; + hash = "sha256-3mzqsrbXfrtAAC5igIna5dAgU8FH23lkMS2IacVlCmI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix new file mode 100644 index 000000000000..2c00474a9587 --- /dev/null +++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix @@ -0,0 +1,57 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + nix-update-script, + testers, + mongodb-atlas-cli, +}: + +buildGoModule rec { + pname = "mongodb-atlas-cli"; + version = "1.42.2"; + + vendorHash = "sha256-oWn8vEwhcrGsytou+xIKOrM1kO0gIvU3X/aIWavhh2w="; + + src = fetchFromGitHub { + owner = "mongodb"; + repo = "mongodb-atlas-cli"; + rev = "refs/tags/atlascli/v${version}"; + sha256 = "sha256-RJMcVOP94eFxbvYF20/X+wkf5+/DWSEQ4+dt/LxcDro="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/mongodb/mongodb-atlas-cli/atlascli/internal/version.GitCommit=${src.rev}" + "-X github.com/mongodb/mongodb-atlas-cli/atlascli/internal/version.Version=v${version}" + ]; + + postInstall = '' + installShellCompletion --cmd atlas \ + --bash <($out/bin/atlas completion bash) \ + --fish <($out/bin/atlas completion fish) \ + --zsh <($out/bin/atlas completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version-regex=atlascli/v(.+)" ]; + }; + tests.version = testers.testVersion { + package = mongodb-atlas-cli; + version = "v${version}"; + }; + }; + + meta = { + homepage = "https://www.mongodb.com/try/download/shell"; + description = "CLI utility to manage MongoDB Atlas from the terminal"; + maintainers = with lib.maintainers; [ aduh95 ]; + license = lib.licenses.asl20; + mainProgram = "atlas"; + }; +} diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 1e9e4d04739d..c74954f6ec3d 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/mongod"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; # Only enable the version install check on darwin. # On Linux, this would fail as mongod relies on tcmalloc, which # requires access to `/sys/devices/system/cpu/possible`. diff --git a/pkgs/by-name/mo/mongodb-cli/package.nix b/pkgs/by-name/mo/mongodb-cli/package.nix new file mode 100644 index 000000000000..7de8eca4cdde --- /dev/null +++ b/pkgs/by-name/mo/mongodb-cli/package.nix @@ -0,0 +1,44 @@ +{ + stdenv, + fetchFromGitHub, + lib, + buildGoModule, + installShellFiles, + nix-update-script, +}: + +buildGoModule rec { + pname = "mongodb-cli"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "mongodb"; + repo = "mongodb-cli"; + tag = "mongocli/v${version}"; + sha256 = "sha256-vhx8dxTNngDBy+34e+Er7uqIAGJImJiPmwxZX+EwIG0="; + }; + + vendorHash = "sha256-825S3jMwgZC3aInuahg6/jg4A9u/bKeie30MB9HexJY="; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "cmd/mongocli" ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd mongocli \ + --bash <($out/bin/mongocli completion bash) \ + --fish <($out/bin/mongocli completion fish) \ + --zsh <($out/bin/mongocli completion zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "MongoDB CLI enable you to manage your MongoDB via ops manager and cloud manager"; + homepage = "https://github.com/mongodb/mongodb-cli"; + changelog = "https://www.mongodb.com/docs/mongocli/current/release-notes/#mongodb-cli-${version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.iamanaws ]; + mainProgram = "mongocli"; + }; +} diff --git a/pkgs/by-name/mo/mongodb-compass/darwin.nix b/pkgs/by-name/mo/mongodb-compass/darwin.nix new file mode 100644 index 000000000000..b2036833d536 --- /dev/null +++ b/pkgs/by-name/mo/mongodb-compass/darwin.nix @@ -0,0 +1,63 @@ +{ + stdenvNoCC, + fetchurl, + unzip, + runtimeShell, + pname, + version, + meta, +}: + +let + appName = "MongoDB Compass.app"; + + dist = + { + aarch64-darwin = { + arch = "arm64"; + sha256 = "sha256-naSOCYxdDLt/zDtR4MhTE96gJypfbk98CWKx2i8kiTk="; + }; + + x86_64-darwin = { + arch = "x64"; + sha256 = "sha256-TnoXaiSNYiblgJS5nygTHOe9HBgVCTfffX37wrwtxZ8="; + }; + } + .${stdenvNoCC.hostPlatform.system} + or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); + +in +stdenvNoCC.mkDerivation { + inherit pname version meta; + + src = fetchurl { + url = "https://downloads.mongodb.com/compass/mongodb-compass-${version}-darwin-${dist.arch}.zip"; + inherit (dist) sha256; + name = "${pname}-${version}.zip"; + }; + + nativeBuildInputs = [ unzip ]; + + # The archive will be automatically unzipped; tell Nix where the source root is. + dontFixup = true; + sourceRoot = appName; + + installPhase = '' + runHook preInstall + + # Create directories for the application bundle and the launcher script. + mkdir -p "$out/Applications/${appName}" "$out/bin" + + # Copy the unzipped app bundle into the Applications folder. + cp -R . "$out/Applications/${appName}" + + # Create a launcher script that opens the app. + cat > "$out/bin/${pname}" << EOF + #!${runtimeShell} + open -na "$out/Applications/${appName}" --args "\$@" + EOF + chmod +x "$out/bin/${pname}" + + runHook postInstall + ''; +} diff --git a/pkgs/by-name/mo/mongodb-compass/linux.nix b/pkgs/by-name/mo/mongodb-compass/linux.nix new file mode 100644 index 000000000000..c3c4797bc501 --- /dev/null +++ b/pkgs/by-name/mo/mongodb-compass/linux.nix @@ -0,0 +1,132 @@ +{ + alsa-lib, + at-spi2-atk, + at-spi2-core, + atk, + cairo, + cups, + curl, + dbus, + dpkg, + expat, + fetchurl, + fontconfig, + freetype, + gdk-pixbuf, + glib, + gtk3, + lib, + libdrm, + libGL, + libnotify, + libsecret, + libuuid, + libxcb, + libxkbcommon, + libgbm, + nspr, + nss, + pango, + stdenv, + systemd, + wrapGAppsHook3, + xorg, + pname, + version, + meta, +}: + +let + rpath = lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libdrm + libGL + libnotify + libsecret + libuuid + libxcb + libxkbcommon + libgbm + nspr + nss + pango + stdenv.cc.cc + systemd + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxkbfile + xorg.libxshmfence + (lib.getLib stdenv.cc.cc) + ]; + +in +stdenv.mkDerivation { + inherit pname version meta; + + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; + hash = "sha256-cwhYiV5G8GRBT7MST20MPUxEMQM1mzxlLUfzGO6jv10="; + } + else + throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; + + buildInputs = [ + dpkg + wrapGAppsHook3 + gtk3 + ]; + dontUnpack = true; + + buildCommand = '' + IFS=$'\n' + + # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here + dpkg --fsys-tarfile $src | tar --extract + + mkdir -p $out + mv usr/* $out + + # cp -av $out/usr/* $out + rm -rf $out/share/lintian + + # The node_modules are bringing in non-linux files/dependencies + find $out -name "*.app" -exec rm -rf {} \; || true + find $out -name "*.dll" -delete + find $out -name "*.exe" -delete + + # Otherwise it looks "suspicious" + chmod -R g-w $out + + for file in `find $out -type f -perm /0111 -o -name \*.so\*`; do + echo "Manipulating file: $file" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-rpath ${rpath}:$out/lib/mongodb-compass "$file" || true + done + + wrapGAppsHook $out/bin/mongodb-compass + ''; +} diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index ac3cdc8fe8ff..b18ca42c7b66 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -1,149 +1,32 @@ { - alsa-lib, - at-spi2-atk, - at-spi2-core, - atk, - cairo, - cups, - curl, - dbus, - dpkg, - expat, - fetchurl, - fontconfig, - freetype, - gdk-pixbuf, - glib, - gtk3, - lib, - libdrm, - libGL, - libnotify, - libsecret, - libuuid, - libxcb, - libxkbcommon, - libgbm, - nspr, - nss, - pango, stdenv, - systemd, - wrapGAppsHook3, - xorg, + callPackage, + lib, + ... }: let - version = "1.45.4"; - - rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - curl - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libdrm - libGL - libnotify - libsecret - libuuid - libxcb - libxkbcommon - libgbm - nspr - nss - pango - stdenv.cc.cc - systemd - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - xorg.libxshmfence - (lib.getLib stdenv.cc.cc) - ]; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - hash = "sha256-q+nEMJ6GtWNPKqYdab6DXWGTgRmmLWvG3qcR9tRi9YY="; - } - else - throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; - # NOTE While MongoDB Compass is available to darwin, I do not have resources to test it - # Feel free to make a PR adding support if desired - -in -stdenv.mkDerivation { pname = "mongodb-compass"; - inherit version; - - inherit src; - - buildInputs = [ - dpkg - wrapGAppsHook3 - gtk3 - ]; - dontUnpack = true; - - buildCommand = '' - IFS=$'\n' - - # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here - dpkg --fsys-tarfile $src | tar --extract - - mkdir -p $out - mv usr/* $out - - # cp -av $out/usr/* $out - rm -rf $out/share/lintian - - # The node_modules are bringing in non-linux files/dependencies - find $out -name "*.app" -exec rm -rf {} \; || true - find $out -name "*.dll" -delete - find $out -name "*.exe" -delete - - # Otherwise it looks "suspicious" - chmod -R g-w $out - - for file in `find $out -type f -perm /0111 -o -name \*.so\*`; do - echo "Manipulating file: $file" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/lib/mongodb-compass "$file" || true - done - - wrapGAppsHook $out/bin/mongodb-compass - ''; - + version = "1.46.0"; meta = { description = "GUI for MongoDB"; maintainers = with lib.maintainers; [ bryanasdev000 friedow + iamanaws ]; homepage = "https://github.com/mongodb-js/compass"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.sspl; - platforms = [ "x86_64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; mainProgram = "mongodb-compass"; }; -} +in +if stdenv.hostPlatform.isDarwin then + callPackage ./darwin.nix { inherit pname version meta; } +else + callPackage ./linux.nix { inherit pname version meta; } diff --git a/pkgs/by-name/mo/mongosh/disable-telemetry.patch b/pkgs/by-name/mo/mongosh/disable-telemetry.patch new file mode 100644 index 000000000000..ceaa29e6ccd3 --- /dev/null +++ b/pkgs/by-name/mo/mongosh/disable-telemetry.patch @@ -0,0 +1,13 @@ +diff --git a/packages/cli-repl/src/cli-repl.ts b/packages/cli-repl/src/cli-repl.ts +index b00c52e1..7a096d6d 100644 +--- a/packages/cli-repl/src/cli-repl.ts ++++ b/packages/cli-repl/src/cli-repl.ts +@@ -159,7 +159,7 @@ export class CliRepl implements MongoshIOProvider { + this.config = { + userId: id, + telemetryAnonymousId: id, +- enableTelemetry: true, ++ enableTelemetry: false, + }; + + this.getCryptLibraryPaths = options.getCryptLibraryPaths; diff --git a/pkgs/by-name/mo/mongosh/package-lock.json b/pkgs/by-name/mo/mongosh/package-lock.json deleted file mode 100644 index 3b43438b2f3d..000000000000 --- a/pkgs/by-name/mo/mongosh/package-lock.json +++ /dev/null @@ -1,6028 +0,0 @@ -{ - "name": "mongosh", - "version": "2.4.2", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "mongosh", - "version": "2.4.2", - "license": "Apache-2.0", - "dependencies": { - "@mongosh/cli-repl": "2.4.2" - }, - "bin": { - "mongosh": "bin/mongosh.js" - }, - "engines": { - "node": ">=16.15.0" - } - }, - "node_modules/@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "license": "Apache-2.0", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@aws-crypto/sha256-browser": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz", - "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-js": "^5.2.0", - "@aws-crypto/supports-web-crypto": "^5.2.0", - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", - "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", - "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", - "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha256-js": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz", - "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-crypto/supports-web-crypto": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz", - "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-crypto/util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz", - "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "^3.222.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", - "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", - "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", - "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.758.0.tgz", - "integrity": "sha512-8bOXVYtf/0OUN0jXTIHLv3V0TAS6kvvCRAy7nmiL/fDde0O+ChW1WZU7CVPAOtFEpFCdKskDcxFspM7m1k6qyg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.758.0", - "@aws-sdk/credential-provider-node": "3.758.0", - "@aws-sdk/middleware-host-header": "3.734.0", - "@aws-sdk/middleware-logger": "3.734.0", - "@aws-sdk/middleware-recursion-detection": "3.734.0", - "@aws-sdk/middleware-user-agent": "3.758.0", - "@aws-sdk/region-config-resolver": "3.734.0", - "@aws-sdk/types": "3.734.0", - "@aws-sdk/util-endpoints": "3.743.0", - "@aws-sdk/util-user-agent-browser": "3.734.0", - "@aws-sdk/util-user-agent-node": "3.758.0", - "@smithy/config-resolver": "^4.0.1", - "@smithy/core": "^3.1.5", - "@smithy/fetch-http-handler": "^5.0.1", - "@smithy/hash-node": "^4.0.1", - "@smithy/invalid-dependency": "^4.0.1", - "@smithy/middleware-content-length": "^4.0.1", - "@smithy/middleware-endpoint": "^4.0.6", - "@smithy/middleware-retry": "^4.0.7", - "@smithy/middleware-serde": "^4.0.2", - "@smithy/middleware-stack": "^4.0.1", - "@smithy/node-config-provider": "^4.0.1", - "@smithy/node-http-handler": "^4.0.3", - "@smithy/protocol-http": "^5.0.1", - "@smithy/smithy-client": "^4.1.6", - "@smithy/types": "^4.1.0", - "@smithy/url-parser": "^4.0.1", - "@smithy/util-base64": "^4.0.0", - "@smithy/util-body-length-browser": "^4.0.0", - "@smithy/util-body-length-node": "^4.0.0", - "@smithy/util-defaults-mode-browser": "^4.0.7", - "@smithy/util-defaults-mode-node": "^4.0.7", - "@smithy/util-endpoints": "^3.0.1", - "@smithy/util-middleware": "^4.0.1", - "@smithy/util-retry": "^4.0.1", - "@smithy/util-utf8": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/client-sso": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.758.0.tgz", - "integrity": "sha512-BoGO6IIWrLyLxQG6txJw6RT2urmbtlwfggapNCrNPyYjlXpzTSJhBYjndg7TpDATFd0SXL0zm8y/tXsUXNkdYQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.758.0", - "@aws-sdk/middleware-host-header": "3.734.0", - "@aws-sdk/middleware-logger": "3.734.0", - "@aws-sdk/middleware-recursion-detection": "3.734.0", - "@aws-sdk/middleware-user-agent": "3.758.0", - "@aws-sdk/region-config-resolver": "3.734.0", - "@aws-sdk/types": "3.734.0", - "@aws-sdk/util-endpoints": "3.743.0", - "@aws-sdk/util-user-agent-browser": "3.734.0", - "@aws-sdk/util-user-agent-node": "3.758.0", - "@smithy/config-resolver": "^4.0.1", - "@smithy/core": "^3.1.5", - "@smithy/fetch-http-handler": "^5.0.1", - "@smithy/hash-node": "^4.0.1", - "@smithy/invalid-dependency": "^4.0.1", - "@smithy/middleware-content-length": "^4.0.1", - "@smithy/middleware-endpoint": "^4.0.6", - "@smithy/middleware-retry": "^4.0.7", - "@smithy/middleware-serde": "^4.0.2", - "@smithy/middleware-stack": "^4.0.1", - "@smithy/node-config-provider": "^4.0.1", - "@smithy/node-http-handler": "^4.0.3", - "@smithy/protocol-http": "^5.0.1", - "@smithy/smithy-client": "^4.1.6", - "@smithy/types": "^4.1.0", - "@smithy/url-parser": "^4.0.1", - "@smithy/util-base64": "^4.0.0", - "@smithy/util-body-length-browser": "^4.0.0", - "@smithy/util-body-length-node": "^4.0.0", - "@smithy/util-defaults-mode-browser": "^4.0.7", - "@smithy/util-defaults-mode-node": "^4.0.7", - "@smithy/util-endpoints": "^3.0.1", - "@smithy/util-middleware": "^4.0.1", - "@smithy/util-retry": "^4.0.1", - "@smithy/util-utf8": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/core": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.758.0.tgz", - "integrity": "sha512-0RswbdR9jt/XKemaLNuxi2gGr4xGlHyGxkTdhSQzCyUe9A9OPCoLl3rIESRguQEech+oJnbHk/wuiwHqTuP9sg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.734.0", - "@smithy/core": "^3.1.5", - "@smithy/node-config-provider": "^4.0.1", - "@smithy/property-provider": "^4.0.1", - "@smithy/protocol-http": "^5.0.1", - "@smithy/signature-v4": "^5.0.1", - "@smithy/smithy-client": "^4.1.6", - "@smithy/types": "^4.1.0", - "@smithy/util-middleware": "^4.0.1", - "fast-xml-parser": "4.4.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.758.0.tgz", - "integrity": "sha512-y/rHZqyChlEkNRr59gn4hv0gjhJwGmdCdW0JI1K9p3P9p7EurWGjr2M6+goTn3ilOlcAwrl5oFKR5jLt27TkOA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@smithy/property-provider": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.758.0.tgz", - "integrity": "sha512-N27eFoRrO6MeUNumtNHDW9WOiwfd59LPXPqDrIa3kWL/s+fOKFHb9xIcF++bAwtcZnAxKkgpDCUP+INNZskE+w==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@smithy/property-provider": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.758.0.tgz", - "integrity": "sha512-Xt9/U8qUCiw1hihztWkNeIR+arg6P+yda10OuCHX6kFVx3auTlU7+hCqs3UxqniGU4dguHuftf3mRpi5/GJ33Q==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@smithy/fetch-http-handler": "^5.0.1", - "@smithy/node-http-handler": "^4.0.3", - "@smithy/property-provider": "^4.0.1", - "@smithy/protocol-http": "^5.0.1", - "@smithy/smithy-client": "^4.1.6", - "@smithy/types": "^4.1.0", - "@smithy/util-stream": "^4.1.2", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.758.0.tgz", - "integrity": "sha512-cymSKMcP5d+OsgetoIZ5QCe1wnp2Q/tq+uIxVdh9MbfdBBEnl9Ecq6dH6VlYS89sp4QKuxHxkWXVnbXU3Q19Aw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.758.0", - "@aws-sdk/credential-provider-env": "3.758.0", - "@aws-sdk/credential-provider-http": "3.758.0", - "@aws-sdk/credential-provider-process": "3.758.0", - "@aws-sdk/credential-provider-sso": "3.758.0", - "@aws-sdk/credential-provider-web-identity": "3.758.0", - "@aws-sdk/nested-clients": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@smithy/credential-provider-imds": "^4.0.1", - "@smithy/property-provider": "^4.0.1", - "@smithy/shared-ini-file-loader": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.758.0.tgz", - "integrity": "sha512-+DaMv63wiq7pJrhIQzZYMn4hSarKiizDoJRvyR7WGhnn0oQ/getX9Z0VNCV3i7lIFoLNTb7WMmQ9k7+z/uD5EQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.758.0", - "@aws-sdk/credential-provider-http": "3.758.0", - "@aws-sdk/credential-provider-ini": "3.758.0", - "@aws-sdk/credential-provider-process": "3.758.0", - "@aws-sdk/credential-provider-sso": "3.758.0", - "@aws-sdk/credential-provider-web-identity": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@smithy/credential-provider-imds": "^4.0.1", - "@smithy/property-provider": "^4.0.1", - "@smithy/shared-ini-file-loader": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.758.0.tgz", - "integrity": "sha512-AzcY74QTPqcbXWVgjpPZ3HOmxQZYPROIBz2YINF0OQk0MhezDWV/O7Xec+K1+MPGQO3qS6EDrUUlnPLjsqieHA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@smithy/property-provider": "^4.0.1", - "@smithy/shared-ini-file-loader": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.758.0.tgz", - "integrity": "sha512-x0FYJqcOLUCv8GLLFDYMXRAQKGjoM+L0BG4BiHYZRDf24yQWFCAZsCQAYKo6XZYh2qznbsW6f//qpyJ5b0QVKQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/client-sso": "3.758.0", - "@aws-sdk/core": "3.758.0", - "@aws-sdk/token-providers": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@smithy/property-provider": "^4.0.1", - "@smithy/shared-ini-file-loader": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.758.0.tgz", - "integrity": "sha512-XGguXhBqiCXMXRxcfCAVPlMbm3VyJTou79r/3mxWddHWF0XbhaQiBIbUz6vobVTD25YQRbWSmSch7VA8kI5Lrw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.758.0", - "@aws-sdk/nested-clients": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@smithy/property-provider": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-providers": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.758.0.tgz", - "integrity": "sha512-BaGVBdm9ynsErIc/mLuUwJ1OQcL/pkhCuAm24jpsif3evZ5wgyZnEAZB2yRin+mQnQaQT3L+KvTbdKGfjL8+fQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.758.0", - "@aws-sdk/core": "3.758.0", - "@aws-sdk/credential-provider-cognito-identity": "3.758.0", - "@aws-sdk/credential-provider-env": "3.758.0", - "@aws-sdk/credential-provider-http": "3.758.0", - "@aws-sdk/credential-provider-ini": "3.758.0", - "@aws-sdk/credential-provider-node": "3.758.0", - "@aws-sdk/credential-provider-process": "3.758.0", - "@aws-sdk/credential-provider-sso": "3.758.0", - "@aws-sdk/credential-provider-web-identity": "3.758.0", - "@aws-sdk/nested-clients": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@smithy/core": "^3.1.5", - "@smithy/credential-provider-imds": "^4.0.1", - "@smithy/property-provider": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.734.0.tgz", - "integrity": "sha512-LW7RRgSOHHBzWZnigNsDIzu3AiwtjeI2X66v+Wn1P1u+eXssy1+up4ZY/h+t2sU4LU36UvEf+jrZti9c6vRnFw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.734.0", - "@smithy/protocol-http": "^5.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-logger": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.734.0.tgz", - "integrity": "sha512-mUMFITpJUW3LcKvFok176eI5zXAUomVtahb9IQBwLzkqFYOrMJvWAvoV4yuxrJ8TlQBG8gyEnkb9SnhZvjg67w==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.734.0", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.734.0.tgz", - "integrity": "sha512-CUat2d9ITsFc2XsmeiRQO96iWpxSKYFjxvj27Hc7vo87YUHRnfMfnc8jw1EpxEwMcvBD7LsRa6vDNky6AjcrFA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.734.0", - "@smithy/protocol-http": "^5.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.758.0.tgz", - "integrity": "sha512-iNyehQXtQlj69JCgfaOssgZD4HeYGOwxcaKeG6F+40cwBjTAi0+Ph1yfDwqk2qiBPIRWJ/9l2LodZbxiBqgrwg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@aws-sdk/util-endpoints": "3.743.0", - "@smithy/core": "^3.1.5", - "@smithy/protocol-http": "^5.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/nested-clients": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.758.0.tgz", - "integrity": "sha512-YZ5s7PSvyF3Mt2h1EQulCG93uybprNGbBkPmVuy/HMMfbFTt4iL3SbKjxqvOZelm86epFfj7pvK7FliI2WOEcg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.758.0", - "@aws-sdk/middleware-host-header": "3.734.0", - "@aws-sdk/middleware-logger": "3.734.0", - "@aws-sdk/middleware-recursion-detection": "3.734.0", - "@aws-sdk/middleware-user-agent": "3.758.0", - "@aws-sdk/region-config-resolver": "3.734.0", - "@aws-sdk/types": "3.734.0", - "@aws-sdk/util-endpoints": "3.743.0", - "@aws-sdk/util-user-agent-browser": "3.734.0", - "@aws-sdk/util-user-agent-node": "3.758.0", - "@smithy/config-resolver": "^4.0.1", - "@smithy/core": "^3.1.5", - "@smithy/fetch-http-handler": "^5.0.1", - "@smithy/hash-node": "^4.0.1", - "@smithy/invalid-dependency": "^4.0.1", - "@smithy/middleware-content-length": "^4.0.1", - "@smithy/middleware-endpoint": "^4.0.6", - "@smithy/middleware-retry": "^4.0.7", - "@smithy/middleware-serde": "^4.0.2", - "@smithy/middleware-stack": "^4.0.1", - "@smithy/node-config-provider": "^4.0.1", - "@smithy/node-http-handler": "^4.0.3", - "@smithy/protocol-http": "^5.0.1", - "@smithy/smithy-client": "^4.1.6", - "@smithy/types": "^4.1.0", - "@smithy/url-parser": "^4.0.1", - "@smithy/util-base64": "^4.0.0", - "@smithy/util-body-length-browser": "^4.0.0", - "@smithy/util-body-length-node": "^4.0.0", - "@smithy/util-defaults-mode-browser": "^4.0.7", - "@smithy/util-defaults-mode-node": "^4.0.7", - "@smithy/util-endpoints": "^3.0.1", - "@smithy/util-middleware": "^4.0.1", - "@smithy/util-retry": "^4.0.1", - "@smithy/util-utf8": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.734.0.tgz", - "integrity": "sha512-Lvj1kPRC5IuJBr9DyJ9T9/plkh+EfKLy+12s/mykOy1JaKHDpvj+XGy2YO6YgYVOb8JFtaqloid+5COtje4JTQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.734.0", - "@smithy/node-config-provider": "^4.0.1", - "@smithy/types": "^4.1.0", - "@smithy/util-config-provider": "^4.0.0", - "@smithy/util-middleware": "^4.0.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/token-providers": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.758.0.tgz", - "integrity": "sha512-ckptN1tNrIfQUaGWm/ayW1ddG+imbKN7HHhjFdS4VfItsP0QQOB0+Ov+tpgb4MoNR4JaUghMIVStjIeHN2ks1w==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/nested-clients": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@smithy/property-provider": "^4.0.1", - "@smithy/shared-ini-file-loader": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/types": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.734.0.tgz", - "integrity": "sha512-o11tSPTT70nAkGV1fN9wm/hAIiLPyWX6SuGf+9JyTp7S/rC2cFWhR26MvA69nplcjNaXVzB0f+QFrLXXjOqCrg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/util-endpoints": { - "version": "3.743.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.743.0.tgz", - "integrity": "sha512-sN1l559zrixeh5x+pttrnd0A3+r34r0tmPkJ/eaaMaAzXqsmKU/xYre9K3FNnsSS1J1k4PEfk/nHDTVUgFYjnw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.734.0", - "@smithy/types": "^4.1.0", - "@smithy/util-endpoints": "^3.0.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/util-locate-window": { - "version": "3.723.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.723.0.tgz", - "integrity": "sha512-Yf2CS10BqK688DRsrKI/EO6B8ff5J86NXe4C+VCysK7UOgN0l1zOTeTukZ3H8Q9tYYX3oaF1961o8vRkFm7Nmw==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.734.0.tgz", - "integrity": "sha512-xQTCus6Q9LwUuALW+S76OL0jcWtMOVu14q+GoLnWPUM7QeUw963oQcLhF7oq0CtaLLKyl4GOUfcwc773Zmwwng==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.734.0", - "@smithy/types": "^4.1.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.758.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.758.0.tgz", - "integrity": "sha512-A5EZw85V6WhoKMV2hbuFRvb9NPlxEErb4HPO6/SPXYY4QrjprIzScHxikqcWv1w4J3apB1wto9LPU3IMsYtfrw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/middleware-user-agent": "3.758.0", - "@aws-sdk/types": "3.734.0", - "@smithy/node-config-provider": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - }, - "peerDependencies": { - "aws-crt": ">=1.0.0" - }, - "peerDependenciesMeta": { - "aws-crt": { - "optional": true - } - } - }, - "node_modules/@babel/code-frame": { - "version": "7.26.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", - "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.25.9", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/compat-data": { - "version": "7.26.8", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", - "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz", - "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==", - "license": "MIT", - "dependencies": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.9", - "@babel/helper-compilation-targets": "^7.26.5", - "@babel/helper-module-transforms": "^7.26.0", - "@babel/helpers": "^7.26.9", - "@babel/parser": "^7.26.9", - "@babel/template": "^7.26.9", - "@babel/traverse": "^7.26.9", - "@babel/types": "^7.26.9", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@babel/generator": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz", - "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==", - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.26.9", - "@babel/types": "^7.26.9", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^3.0.2" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz", - "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==", - "license": "MIT", - "dependencies": { - "@babel/compat-data": "^7.26.5", - "@babel/helper-validator-option": "^7.25.9", - "browserslist": "^4.24.0", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "license": "ISC", - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "license": "ISC" - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", - "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", - "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", - "license": "MIT", - "dependencies": { - "@babel/helper-module-imports": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9", - "@babel/traverse": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-plugin-utils": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", - "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", - "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", - "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", - "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz", - "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==", - "license": "MIT", - "dependencies": { - "@babel/template": "^7.26.9", - "@babel/types": "^7.26.9" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/parser": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz", - "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==", - "license": "MIT", - "dependencies": { - "@babel/types": "^7.26.9" - }, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz", - "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==", - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-parameters": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz", - "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==", - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz", - "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==", - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/template": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", - "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.26.2", - "@babel/parser": "^7.26.9", - "@babel/types": "^7.26.9" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz", - "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==", - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.9", - "@babel/parser": "^7.26.9", - "@babel/template": "^7.26.9", - "@babel/types": "^7.26.9", - "debug": "^4.3.1", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/types": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz", - "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==", - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "license": "ISC", - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", - "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", - "license": "MIT", - "dependencies": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "license": "MIT" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@lukeed/csprng": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@lukeed/csprng/-/csprng-1.1.0.tgz", - "integrity": "sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@lukeed/uuid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@lukeed/uuid/-/uuid-2.0.1.tgz", - "integrity": "sha512-qC72D4+CDdjGqJvkFMMEAtancHUQ7/d/tAiHf64z8MopFDmcrtbcJuerDtFceuAfQJ2pDSfCKCtbqoGBNnwg0w==", - "license": "MIT", - "dependencies": { - "@lukeed/csprng": "^1.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@mongodb-js/devtools-connect": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.7.0.tgz", - "integrity": "sha512-j/8Wgfp7La/5Rz52Vyic8aK1GnMEGMVN3TCB+P6/QNFVYpWp81SEy8kW12oIFvNUKgpzV75o9Ixb2K44r15J0w==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongodb-js/oidc-http-server-pages": "1.1.3", - "lodash.merge": "^4.6.2", - "mongodb-connection-string-url": "^3.0.0", - "socks": "^2.7.3" - }, - "optionalDependencies": { - "kerberos": "^2.1.0", - "mongodb-client-encryption": "^6.1.0", - "os-dns-native": "^1.2.0", - "resolve-mongodb-srv": "^1.1.1" - }, - "peerDependencies": { - "@mongodb-js/oidc-plugin": "^1.1.0", - "mongodb": "^6.9.0", - "mongodb-log-writer": "^2.4.0" - } - }, - "node_modules/@mongodb-js/devtools-proxy-support": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-proxy-support/-/devtools-proxy-support-0.4.2.tgz", - "integrity": "sha512-CSsAsiAkVDkSV7/soKWlPskWYRQLlOJo7a1x+M/HdYgBulEacWpBHnKepwDsaJn/9GCIIcFCVO9nLS0tn1aGLQ==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/socksv5": "^0.0.10", - "agent-base": "^7.1.1", - "debug": "^4.3.6", - "http-proxy-agent": "^7.0.2", - "https-proxy-agent": "^7.0.5", - "lru-cache": "^11.0.0", - "node-fetch": "^3.3.2", - "pac-proxy-agent": "^7.0.2", - "socks-proxy-agent": "^8.0.4", - "ssh2": "^1.15.0", - "system-ca": "^2.0.1" - } - }, - "node_modules/@mongodb-js/mongodb-constants": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/@mongodb-js/mongodb-constants/-/mongodb-constants-0.10.4.tgz", - "integrity": "sha512-fz7AjwBfN6iwb3Luo9N7qOKifUHJd38nS6tWRtkLDeMesbK7GyrD8ngI85RlJMTeZQCzDEx+XGfth02tD4pNXg==", - "license": "Apache-2.0", - "dependencies": { - "semver": "^7.5.4" - } - }, - "node_modules/@mongodb-js/oidc-http-server-pages": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-http-server-pages/-/oidc-http-server-pages-1.1.3.tgz", - "integrity": "sha512-I704bSQRu/SusTcCV8qqtdFVvAJf1aKZtgGM2VnYjPn2njZd5j7864k/CF9TeeR8+r0At5qqNa3N4MX9YxPnEg==", - "license": "Apache-2.0" - }, - "node_modules/@mongodb-js/oidc-plugin": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.6.tgz", - "integrity": "sha512-fuL4B9x1njcqdJqV+V3pt8s/9PX4uy9ojhcsP12BavDcg61ju6WEqCkDmUZCykDIvsDbb8tIhO97aCKDxcXROw==", - "license": "Apache-2.0", - "dependencies": { - "express": "^4.18.2", - "open": "^9.1.0", - "openid-client": "^5.6.4" - }, - "engines": { - "node": ">= 16.20.1" - } - }, - "node_modules/@mongodb-js/saslprep": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.0.tgz", - "integrity": "sha512-+ywrb0AqkfaYuhHs6LxKWgqbh3I72EpEgESCw37o+9qPx9WTCkgDm2B+eMrwehGtHBWHFU4GXvnSCNiFhhausg==", - "license": "MIT", - "dependencies": { - "sparse-bitfield": "^3.0.3" - } - }, - "node_modules/@mongodb-js/socksv5": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/@mongodb-js/socksv5/-/socksv5-0.0.10.tgz", - "integrity": "sha512-JDz2fLKsjMiSNUxKrCpGptsgu7DzsXfu4gnUQ3RhUaBS1d4YbLrt6HejpckAiHIAa+niBpZAeiUsoop0IihWsw==", - "license": "MIT", - "dependencies": { - "ip-address": "^9.0.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@mongosh/arg-parser": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-3.8.0.tgz", - "integrity": "sha512-TJrJmcBsOmztSj7X0pe/lVsAz9gRaLN4YXTM3ynHCNxLVHKTyuk/cxIf3tEYweZPNfDXM4sSyMOO+Ervqn7dRg==", - "license": "Apache-2.0", - "dependencies": { - "@mongosh/errors": "2.4.0", - "@mongosh/i18n": "^2.11.0", - "mongodb-connection-string-url": "^3.0.1" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/async-rewriter2": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.4.6.tgz", - "integrity": "sha512-v5Oq7eZ4dla13hKMbtFLVr0CHSOSeKHWoFxAtU8aD30N2ES2tT6i8/iNUMVsdF3zzLyzFfH/B81epDFNjNiOUA==", - "license": "Apache-2.0", - "dependencies": { - "@babel/core": "^7.22.8", - "@babel/plugin-transform-destructuring": "^7.22.5", - "@babel/plugin-transform-parameters": "^7.22.5", - "@babel/plugin-transform-shorthand-properties": "^7.22.5", - "@babel/types": "^7.22.5" - }, - "bin": { - "async-rewrite": "bin/async-rewrite.js" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/autocomplete": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-3.8.0.tgz", - "integrity": "sha512-tw3g0J4JdY27HtM6l8+HEAYqUrVhCb1YxsotjF59mFnufBLlcskTvq3iP220YK3U4IOxQJZ3UkXv/XqLD+GExw==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "3.8.0", - "semver": "^7.5.4" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/cli-repl": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-2.4.2.tgz", - "integrity": "sha512-rpLL/SXCmwh8bTqwfAJ8x9JldQeUDPq2t70cu0GXNSMCg6/1Ixkd0V9dJ4A3IrZnk8mox3P9ftQrwlhs5jkw4g==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "3.8.0", - "@mongosh/autocomplete": "3.8.0", - "@mongosh/editor": "3.8.0", - "@mongosh/errors": "2.4.0", - "@mongosh/history": "2.4.6", - "@mongosh/i18n": "^2.11.0", - "@mongosh/js-multiline-to-singleline": "2.4.6", - "@mongosh/logging": "3.6.0", - "@mongosh/service-provider-core": "3.1.0", - "@mongosh/service-provider-node-driver": "3.6.0", - "@mongosh/shell-api": "3.8.0", - "@mongosh/shell-evaluator": "3.8.0", - "@mongosh/snippet-manager": "3.8.0", - "@mongosh/types": "3.6.0", - "@segment/analytics-node": "^1.3.0", - "ansi-escape-sequences": "^5.1.2", - "askcharacter": "^2.0.4", - "askpassword": "^2.0.2", - "escape-string-regexp": "^4.0.0", - "is-recoverable-error": "^1.0.3", - "js-yaml": "^4.1.0", - "mongodb-connection-string-url": "^3.0.1", - "mongodb-log-writer": "^2.3.1", - "numeral": "^2.0.6", - "pretty-repl": "^4.0.1", - "semver": "^7.5.4", - "strip-ansi": "^6.0.0", - "text-table": "^0.2.0", - "yargs-parser": "^20.2.4" - }, - "bin": { - "mongosh": "bin/mongosh.js" - }, - "engines": { - "node": ">=18.19.0" - }, - "optionalDependencies": { - "get-console-process-list": "^1.0.5", - "glibc-version": "^1.0.0", - "macos-export-certificate-and-key": "^1.2.4", - "mongodb-crypt-library-version": "^1.0.5", - "win-export-certificate-and-key": "^2.1.0" - } - }, - "node_modules/@mongosh/editor": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-3.8.0.tgz", - "integrity": "sha512-aEhGgzC8jpr0hN4aHpP/WR8uej8ZPPWX1yZduYLJia1oy6PvaPiVksfQRgtEAFjdOQXcwKfMal7+PYvhZoYD5w==", - "license": "Apache-2.0", - "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.4.6", - "@mongosh/service-provider-core": "3.1.0", - "@mongosh/shell-api": "3.8.0", - "@mongosh/shell-evaluator": "3.8.0", - "@mongosh/types": "3.6.0", - "js-beautify": "^1.15.1" - }, - "engines": { - "node": ">=16.15.0" - } - }, - "node_modules/@mongosh/errors": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.4.0.tgz", - "integrity": "sha512-2YwY4TYlrAy3VC9Y5Xa1OWlbdb57O0ZTDfntROFcfotrMXkZc9CU+jafrKRNcPJz8UAhoUcSTDJuaLpC3AutHg==", - "license": "Apache-2.0", - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/history": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.4.6.tgz", - "integrity": "sha512-vEPJ0Y1FUM9aSxw/OQiV6QfAy0AjwZn9tMvFY27m4786jEM3hpJIPwDIRe33i7/hankLz8umsFrSTAnrT3icQw==", - "license": "Apache-2.0", - "dependencies": { - "mongodb-connection-string-url": "^3.0.1", - "mongodb-redact": "^1.1.5" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/i18n": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.11.0.tgz", - "integrity": "sha512-juPSFP2+VMoC4Z6m9pVH/AChGSUtFA+LU3oIU6OlMNaCrVN2Hdz8hpL2mJn8prWdZdxTw+P0hBbqmqVusMKr8A==", - "license": "Apache-2.0", - "dependencies": { - "@mongosh/errors": "2.4.0" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.4.6.tgz", - "integrity": "sha512-ALaGE6CaXnGdbDK5Vgb9YOIQiVrnqwB6eDpmXBhYE6EEHUKMjy5s6ybvtAASzN3aHHzvt4nvqiAg8U58fYNjHQ==", - "license": "Apache-2.0", - "dependencies": { - "@babel/core": "^7.16.12", - "@babel/types": "^7.21.2" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/logging": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-3.6.0.tgz", - "integrity": "sha512-f0fkAVNzV9Ja90DPpeQv2KL9zoYauUQh+ejoong4X88sEw5n1bYVOvng9Ic3tJFioGlcuWVe1waDDMio5SWElA==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.4.1", - "@mongosh/errors": "2.4.0", - "@mongosh/history": "2.4.6", - "@mongosh/types": "3.6.0", - "mongodb-log-writer": "^2.3.1", - "mongodb-redact": "^1.1.5" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/service-provider-core": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-3.1.0.tgz", - "integrity": "sha512-QSmTzmiD1Tlj9liWSqZJni12B8Afrqii3BoB96LMLHxPRkzTu+H9nWwYOF0d+IQaab7wW2HWDlpSJYhzgQdCKA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.4.0", - "bson": "^6.10.3", - "mongodb": "^6.14.2", - "mongodb-build-info": "^1.7.2", - "mongodb-connection-string-url": "^3.0.1" - }, - "engines": { - "node": ">=14.15.1" - }, - "optionalDependencies": { - "mongodb-client-encryption": "^6.3.0" - } - }, - "node_modules/@mongosh/service-provider-node-driver": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-node-driver/-/service-provider-node-driver-3.6.0.tgz", - "integrity": "sha512-VOmOQ11qcz+nYjOyB/6nXuoZcLRSDLc+tVjt/ePtdC/5XQKSZB/Pwn9riBmnqOXleST8ATmmf6z9m44viSNpQg==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.4.1", - "@mongodb-js/oidc-plugin": "^1.1.6", - "@mongosh/errors": "2.4.0", - "@mongosh/service-provider-core": "3.1.0", - "@mongosh/types": "3.6.0", - "aws4": "^1.12.0", - "mongodb": "^6.14.2", - "mongodb-connection-string-url": "^3.0.1", - "socks": "^2.8.3" - }, - "engines": { - "node": ">=14.15.1" - }, - "optionalDependencies": { - "kerberos": "2.1.0", - "mongodb-client-encryption": "^6.1.1" - } - }, - "node_modules/@mongosh/service-provider-node-driver/node_modules/kerberos": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.1.0.tgz", - "integrity": "sha512-HvOl6O6cyEN/8Z4CAocHe/sekJtvt5UrxUdCuu7bXDZ2Hnsy6OpsQbISW+lpm03vrbO2ir+1QQ5Sx/vMEhHnog==", - "hasInstallScript": true, - "license": "Apache-2.0", - "optional": true, - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^6.1.0", - "prebuild-install": "7.1.1" - }, - "engines": { - "node": ">=12.9.0" - } - }, - "node_modules/@mongosh/service-provider-node-driver/node_modules/napi-build-utils": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", - "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", - "license": "MIT", - "optional": true - }, - "node_modules/@mongosh/service-provider-node-driver/node_modules/node-addon-api": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", - "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", - "license": "MIT", - "optional": true - }, - "node_modules/@mongosh/service-provider-node-driver/node_modules/prebuild-install": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", - "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", - "license": "MIT", - "optional": true, - "dependencies": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^3.3.0", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@mongosh/shell-api": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-3.8.0.tgz", - "integrity": "sha512-lZLa2ivb4EakGO5SQCvztQflLHoaF898crI8OuuFrWzGsrAcCyVFFXAFrphapufzx8mBCgmn2xip+xvsoLIrxA==", - "license": "Apache-2.0", - "dependencies": { - "@mongosh/arg-parser": "3.8.0", - "@mongosh/errors": "2.4.0", - "@mongosh/history": "2.4.6", - "@mongosh/i18n": "^2.11.0", - "@mongosh/service-provider-core": "3.1.0", - "mongodb-redact": "^1.1.5" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/shell-evaluator": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-3.8.0.tgz", - "integrity": "sha512-0ASfL5phYr12QGRzeiN+WUsTXwRbsnF8b6S5jrJ7k8YILLuTAPAEoT8lkRaC1ThjZraPVhuD84STf5eYk5JnPA==", - "license": "Apache-2.0", - "dependencies": { - "@mongosh/async-rewriter2": "2.4.6", - "@mongosh/history": "2.4.6", - "@mongosh/shell-api": "3.8.0" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/snippet-manager": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-3.8.0.tgz", - "integrity": "sha512-ziQAqD8zib/ISWMRvqMxsi/rs7sq1abu1zVueTQfF2DqUCm0rIj3tAyB4mjEn3gPw/oNN8P782M4dYtn/HB1tA==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/errors": "2.4.0", - "@mongosh/shell-api": "3.8.0", - "@mongosh/types": "3.6.0", - "bson": "^6.10.3", - "cross-spawn": "^7.0.5", - "escape-string-regexp": "^4.0.0", - "tar": "^6.1.15", - "zod": "^3.24.1" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/types": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-3.6.0.tgz", - "integrity": "sha512-p6NXCTa4FjjTQAQJk9OehfXKFIE/vdQJOqcMbVR3Cxg2zVCnfV16NDnuxpFHYnLkgqL9Cz10BtUGSZPDMFJXew==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.4.1" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@one-ini/wasm": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz", - "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==", - "license": "MIT" - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "license": "MIT", - "optional": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/@segment/analytics-core": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@segment/analytics-core/-/analytics-core-1.4.1.tgz", - "integrity": "sha512-kV0Pf33HnthuBOVdYNani21kYyj118Fn+9757bxqoksiXoZlYvBsFq6giNdCsKcTIE1eAMqNDq3xE1VQ0cfsHA==", - "license": "MIT", - "dependencies": { - "@lukeed/uuid": "^2.0.0", - "@segment/analytics-generic-utils": "1.1.1", - "dset": "^3.1.2", - "tslib": "^2.4.1" - } - }, - "node_modules/@segment/analytics-generic-utils": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@segment/analytics-generic-utils/-/analytics-generic-utils-1.1.1.tgz", - "integrity": "sha512-THTIzBPHnvu1HYJU3fARdJ3qIkukO3zDXsmDm+kAeUks5R9CBXOQ6rPChiASVzSmwAIIo5uFIXXnCraojlq/Gw==", - "license": "MIT", - "dependencies": { - "tslib": "^2.4.1" - } - }, - "node_modules/@segment/analytics-node": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@segment/analytics-node/-/analytics-node-1.3.0.tgz", - "integrity": "sha512-lRLz1WZaDokMoUe299yP5JkInc3OgJuqNNlxb6j0q22umCiq6b5iDo2gRmFn93reirIvJxWIicQsGrHd93q8GQ==", - "license": "MIT", - "dependencies": { - "@lukeed/uuid": "^2.0.0", - "@segment/analytics-core": "1.4.1", - "@segment/analytics-generic-utils": "1.1.1", - "buffer": "^6.0.3", - "node-fetch": "^2.6.7", - "tslib": "^2.4.1" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/@segment/analytics-node/node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "license": "MIT", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/@segment/analytics-node/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "license": "MIT" - }, - "node_modules/@segment/analytics-node/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "license": "BSD-2-Clause" - }, - "node_modules/@segment/analytics-node/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "license": "MIT", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/@smithy/abort-controller": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.1.tgz", - "integrity": "sha512-fiUIYgIgRjMWznk6iLJz35K2YxSLHzLBA/RC6lBrKfQ8fHbPfvk7Pk9UvpKoHgJjI18MnbPuEju53zcVy6KF1g==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/config-resolver": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.0.1.tgz", - "integrity": "sha512-Igfg8lKu3dRVkTSEm98QpZUvKEOa71jDX4vKRcvJVyRc3UgN3j7vFMf0s7xLQhYmKa8kyJGQgUJDOV5V3neVlQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^4.0.1", - "@smithy/types": "^4.1.0", - "@smithy/util-config-provider": "^4.0.0", - "@smithy/util-middleware": "^4.0.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/core": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.1.5.tgz", - "integrity": "sha512-HLclGWPkCsekQgsyzxLhCQLa8THWXtB5PxyYN+2O6nkyLt550KQKTlbV2D1/j5dNIQapAZM1+qFnpBFxZQkgCA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/middleware-serde": "^4.0.2", - "@smithy/protocol-http": "^5.0.1", - "@smithy/types": "^4.1.0", - "@smithy/util-body-length-browser": "^4.0.0", - "@smithy/util-middleware": "^4.0.1", - "@smithy/util-stream": "^4.1.2", - "@smithy/util-utf8": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/credential-provider-imds": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.1.tgz", - "integrity": "sha512-l/qdInaDq1Zpznpmev/+52QomsJNZ3JkTl5yrTl02V6NBgJOQ4LY0SFw/8zsMwj3tLe8vqiIuwF6nxaEwgf6mg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^4.0.1", - "@smithy/property-provider": "^4.0.1", - "@smithy/types": "^4.1.0", - "@smithy/url-parser": "^4.0.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/fetch-http-handler": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.1.tgz", - "integrity": "sha512-3aS+fP28urrMW2KTjb6z9iFow6jO8n3MFfineGbndvzGZit3taZhKWtTorf+Gp5RpFDDafeHlhfsGlDCXvUnJA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/protocol-http": "^5.0.1", - "@smithy/querystring-builder": "^4.0.1", - "@smithy/types": "^4.1.0", - "@smithy/util-base64": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/hash-node": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.1.tgz", - "integrity": "sha512-TJ6oZS+3r2Xu4emVse1YPB3Dq3d8RkZDKcPr71Nj/lJsdAP1c7oFzYqEn1IBc915TsgLl2xIJNuxCz+gLbLE0w==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "@smithy/util-buffer-from": "^4.0.0", - "@smithy/util-utf8": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/invalid-dependency": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.1.tgz", - "integrity": "sha512-gdudFPf4QRQ5pzj7HEnu6FhKRi61BfH/Gk5Yf6O0KiSbr1LlVhgjThcvjdu658VE6Nve8vaIWB8/fodmS1rBPQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/is-array-buffer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz", - "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/middleware-content-length": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.1.tgz", - "integrity": "sha512-OGXo7w5EkB5pPiac7KNzVtfCW2vKBTZNuCctn++TTSOMpe6RZO/n6WEC1AxJINn3+vWLKW49uad3lo/u0WJ9oQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/protocol-http": "^5.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/middleware-endpoint": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.0.6.tgz", - "integrity": "sha512-ftpmkTHIFqgaFugcjzLZv3kzPEFsBFSnq1JsIkr2mwFzCraZVhQk2gqN51OOeRxqhbPTkRFj39Qd2V91E/mQxg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/core": "^3.1.5", - "@smithy/middleware-serde": "^4.0.2", - "@smithy/node-config-provider": "^4.0.1", - "@smithy/shared-ini-file-loader": "^4.0.1", - "@smithy/types": "^4.1.0", - "@smithy/url-parser": "^4.0.1", - "@smithy/util-middleware": "^4.0.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/middleware-retry": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.0.7.tgz", - "integrity": "sha512-58j9XbUPLkqAcV1kHzVX/kAR16GT+j7DUZJqwzsxh1jtz7G82caZiGyyFgUvogVfNTg3TeAOIJepGc8TXF4AVQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^4.0.1", - "@smithy/protocol-http": "^5.0.1", - "@smithy/service-error-classification": "^4.0.1", - "@smithy/smithy-client": "^4.1.6", - "@smithy/types": "^4.1.0", - "@smithy/util-middleware": "^4.0.1", - "@smithy/util-retry": "^4.0.1", - "tslib": "^2.6.2", - "uuid": "^9.0.1" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/middleware-serde": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.0.2.tgz", - "integrity": "sha512-Sdr5lOagCn5tt+zKsaW+U2/iwr6bI9p08wOkCp6/eL6iMbgdtc2R5Ety66rf87PeohR0ExI84Txz9GYv5ou3iQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/middleware-stack": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.0.1.tgz", - "integrity": "sha512-dHwDmrtR/ln8UTHpaIavRSzeIk5+YZTBtLnKwDW3G2t6nAupCiQUvNzNoHBpik63fwUaJPtlnMzXbQrNFWssIA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/node-config-provider": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.0.1.tgz", - "integrity": "sha512-8mRTjvCtVET8+rxvmzRNRR0hH2JjV0DFOmwXPrISmTIJEfnCBugpYYGAsCj8t41qd+RB5gbheSQ/6aKZCQvFLQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/property-provider": "^4.0.1", - "@smithy/shared-ini-file-loader": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/node-http-handler": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.0.3.tgz", - "integrity": "sha512-dYCLeINNbYdvmMLtW0VdhW1biXt+PPCGazzT5ZjKw46mOtdgToQEwjqZSS9/EN8+tNs/RO0cEWG044+YZs97aA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/abort-controller": "^4.0.1", - "@smithy/protocol-http": "^5.0.1", - "@smithy/querystring-builder": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/property-provider": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.1.tgz", - "integrity": "sha512-o+VRiwC2cgmk/WFV0jaETGOtX16VNPp2bSQEzu0whbReqE1BMqsP2ami2Vi3cbGVdKu1kq9gQkDAGKbt0WOHAQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/protocol-http": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.0.1.tgz", - "integrity": "sha512-TE4cpj49jJNB/oHyh/cRVEgNZaoPaxd4vteJNB0yGidOCVR0jCw/hjPVsT8Q8FRmj8Bd3bFZt8Dh7xGCT+xMBQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/querystring-builder": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.1.tgz", - "integrity": "sha512-wU87iWZoCbcqrwszsOewEIuq+SU2mSoBE2CcsLwE0I19m0B2gOJr1MVjxWcDQYOzHbR1xCk7AcOBbGFUYOKvdg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "@smithy/util-uri-escape": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/querystring-parser": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.1.tgz", - "integrity": "sha512-Ma2XC7VS9aV77+clSFylVUnPZRindhB7BbmYiNOdr+CHt/kZNJoPP0cd3QxCnCFyPXC4eybmyE98phEHkqZ5Jw==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/service-error-classification": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.1.tgz", - "integrity": "sha512-3JNjBfOWpj/mYfjXJHB4Txc/7E4LVq32bwzE7m28GN79+M1f76XHflUaSUkhOriprPDzev9cX/M+dEB80DNDKA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/shared-ini-file-loader": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.1.tgz", - "integrity": "sha512-hC8F6qTBbuHRI/uqDgqqi6J0R4GtEZcgrZPhFQnMhfJs3MnUTGSnR1NSJCJs5VWlMydu0kJz15M640fJlRsIOw==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/signature-v4": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.0.1.tgz", - "integrity": "sha512-nCe6fQ+ppm1bQuw5iKoeJ0MJfz2os7Ic3GBjOkLOPtavbD1ONoyE3ygjBfz2ythFWm4YnRm6OxW+8p/m9uCoIA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^4.0.0", - "@smithy/protocol-http": "^5.0.1", - "@smithy/types": "^4.1.0", - "@smithy/util-hex-encoding": "^4.0.0", - "@smithy/util-middleware": "^4.0.1", - "@smithy/util-uri-escape": "^4.0.0", - "@smithy/util-utf8": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/smithy-client": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.1.6.tgz", - "integrity": "sha512-UYDolNg6h2O0L+cJjtgSyKKvEKCOa/8FHYJnBobyeoeWDmNpXjwOAtw16ezyeu1ETuuLEOZbrynK0ZY1Lx9Jbw==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/core": "^3.1.5", - "@smithy/middleware-endpoint": "^4.0.6", - "@smithy/middleware-stack": "^4.0.1", - "@smithy/protocol-http": "^5.0.1", - "@smithy/types": "^4.1.0", - "@smithy/util-stream": "^4.1.2", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/types": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.1.0.tgz", - "integrity": "sha512-enhjdwp4D7CXmwLtD6zbcDMbo6/T6WtuuKCY49Xxc6OMOmUWlBEBDREsxxgV2LIdeQPW756+f97GzcgAwp3iLw==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/url-parser": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.1.tgz", - "integrity": "sha512-gPXcIEUtw7VlK8f/QcruNXm7q+T5hhvGu9tl63LsJPZ27exB6dtNwvh2HIi0v7JcXJ5emBxB+CJxwaLEdJfA+g==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/querystring-parser": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-base64": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.0.0.tgz", - "integrity": "sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^4.0.0", - "@smithy/util-utf8": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-body-length-browser": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.0.0.tgz", - "integrity": "sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-body-length-node": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz", - "integrity": "sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-buffer-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.0.0.tgz", - "integrity": "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-config-provider": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz", - "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-defaults-mode-browser": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.7.tgz", - "integrity": "sha512-CZgDDrYHLv0RUElOsmZtAnp1pIjwDVCSuZWOPhIOBvG36RDfX1Q9+6lS61xBf+qqvHoqRjHxgINeQz47cYFC2Q==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/property-provider": "^4.0.1", - "@smithy/smithy-client": "^4.1.6", - "@smithy/types": "^4.1.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-defaults-mode-node": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.7.tgz", - "integrity": "sha512-79fQW3hnfCdrfIi1soPbK3zmooRFnLpSx3Vxi6nUlqaaQeC5dm8plt4OTNDNqEEEDkvKghZSaoti684dQFVrGQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/config-resolver": "^4.0.1", - "@smithy/credential-provider-imds": "^4.0.1", - "@smithy/node-config-provider": "^4.0.1", - "@smithy/property-provider": "^4.0.1", - "@smithy/smithy-client": "^4.1.6", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-endpoints": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.1.tgz", - "integrity": "sha512-zVdUENQpdtn9jbpD9SCFK4+aSiavRb9BxEtw9ZGUR1TYo6bBHbIoi7VkrFQ0/RwZlzx0wRBaRmPclj8iAoJCLA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-hex-encoding": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.0.0.tgz", - "integrity": "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-middleware": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.0.1.tgz", - "integrity": "sha512-HiLAvlcqhbzhuiOa0Lyct5IIlyIz0PQO5dnMlmQ/ubYM46dPInB+3yQGkfxsk6Q24Y0n3/JmcA1v5iEhmOF5mA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-retry": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.1.tgz", - "integrity": "sha512-WmRHqNVwn3kI3rKk1LsKcVgPBG6iLTBGC1iYOV3GQegwJ3E8yjzHytPt26VNzOWr1qu0xE03nK0Ug8S7T7oufw==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/service-error-classification": "^4.0.1", - "@smithy/types": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-stream": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.1.2.tgz", - "integrity": "sha512-44PKEqQ303d3rlQuiDpcCcu//hV8sn+u2JBo84dWCE0rvgeiVl0IlLMagbU++o0jCWhYCsHaAt9wZuZqNe05Hw==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/fetch-http-handler": "^5.0.1", - "@smithy/node-http-handler": "^4.0.3", - "@smithy/types": "^4.1.0", - "@smithy/util-base64": "^4.0.0", - "@smithy/util-buffer-from": "^4.0.0", - "@smithy/util-hex-encoding": "^4.0.0", - "@smithy/util-utf8": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-uri-escape": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz", - "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-utf8": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.0.0.tgz", - "integrity": "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^4.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@tootallnate/quickjs-emscripten": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", - "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==", - "license": "MIT" - }, - "node_modules/@types/webidl-conversions": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", - "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==", - "license": "MIT" - }, - "node_modules/@types/whatwg-url": { - "version": "11.0.5", - "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", - "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", - "license": "MIT", - "dependencies": { - "@types/webidl-conversions": "*" - } - }, - "node_modules/abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "license": "MIT", - "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/acorn": { - "version": "8.14.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", - "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-class-fields": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/acorn-class-fields/-/acorn-class-fields-1.0.0.tgz", - "integrity": "sha512-l+1FokF34AeCXGBHkrXFmml9nOIRI+2yBnBpO5MaVAaTIJ96irWLtcCxX+7hAp6USHFCe+iyyBB4ZhxV807wmA==", - "license": "MIT", - "dependencies": { - "acorn-private-class-elements": "^1.0.0" - }, - "engines": { - "node": ">=4.8.2" - }, - "peerDependencies": { - "acorn": "^6 || ^7 || ^8" - } - }, - "node_modules/acorn-numeric-separator": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/acorn-numeric-separator/-/acorn-numeric-separator-0.3.6.tgz", - "integrity": "sha512-jUr5esgChu4k7VzesH/Nww3EysuyGJJcTEEiXqILUFKpO96PNyEXmK21M6nE0TSqGA1PeEg1MzgqJaoFsn9JMw==", - "deprecated": "acorn>=7.4 supports numeric separators", - "license": "MIT", - "engines": { - "node": ">=4.8.2" - }, - "peerDependencies": { - "acorn": "^6 || ^7 || ^8" - } - }, - "node_modules/acorn-private-class-elements": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-1.0.0.tgz", - "integrity": "sha512-zYNcZtxKgVCg1brS39BEou86mIao1EV7eeREG+6WMwKbuYTeivRRs6S2XdWnboRde6G9wKh2w+WBydEyJsJ6mg==", - "license": "MIT", - "engines": { - "node": ">=4.8.2" - }, - "peerDependencies": { - "acorn": "^6.1.0 || ^7 || ^8" - } - }, - "node_modules/acorn-private-methods": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/acorn-private-methods/-/acorn-private-methods-1.0.0.tgz", - "integrity": "sha512-Jou2L3nfwfPpFdmmHObI3yUpVPM1bPohTUAZCyVDw5Efyn9LSS6E36neRLCRfIr8QjskAfdxRdABOrvP4c/gwQ==", - "license": "MIT", - "dependencies": { - "acorn-private-class-elements": "^1.0.0" - }, - "engines": { - "node": ">=4.8.2" - }, - "peerDependencies": { - "acorn": "^6 || ^7 || ^8" - } - }, - "node_modules/acorn-static-class-features": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/acorn-static-class-features/-/acorn-static-class-features-1.0.0.tgz", - "integrity": "sha512-XZJECjbmMOKvMHiNzbiPXuXpLAJfN3dAKtfIYbk1eHiWdsutlek+gS7ND4B8yJ3oqvHo1NxfafnezVmq7NXK0A==", - "license": "MIT", - "dependencies": { - "acorn-private-class-elements": "^1.0.0" - }, - "engines": { - "node": ">=4.8.2" - }, - "peerDependencies": { - "acorn": "^6.1.0 || ^7 || ^8" - } - }, - "node_modules/agent-base": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", - "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", - "license": "MIT", - "engines": { - "node": ">= 14" - } - }, - "node_modules/ansi-escape-sequences": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-5.1.2.tgz", - "integrity": "sha512-JcpoVp1W1bl1Qn4cVuiXEhD6+dyXKSOgCn2zlzE8inYgCJCBy1aPnUhlz6I4DFum8D4ovb9Qi/iAjUcGvG2lqw==", - "license": "MIT", - "dependencies": { - "array-back": "^4.0.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "license": "Python-2.0" - }, - "node_modules/array-back": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", - "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "license": "MIT" - }, - "node_modules/askcharacter": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/askcharacter/-/askcharacter-2.0.4.tgz", - "integrity": "sha512-SlLS4gA0/6BTcmUfuwySw5n3m8aOI3QlT3GTcQkmJwAVM/olola+S+g/FXggApIidQEKklLfGBZEmZ7Ru69CQw==", - "license": "Apache-2.0", - "dependencies": { - "hijack-stream": "^2.0.0" - } - }, - "node_modules/askpassword": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/askpassword/-/askpassword-2.0.2.tgz", - "integrity": "sha512-9j9uyceJQ8rezozTs8pM0cc+b+kn0UbfohhoMii4o/4YRj1IntvCCtRBDYG7bcbL+8f2xJ53Y34WXTUnzgcUyg==", - "license": "Apache-2.0", - "dependencies": { - "handle-backspaces": "^2.0.0", - "hijack-stream": "^2.0.0" - } - }, - "node_modules/asn1": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", - "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", - "license": "MIT", - "dependencies": { - "safer-buffer": "~2.1.0" - } - }, - "node_modules/ast-types": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz", - "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==", - "license": "MIT", - "dependencies": { - "tslib": "^2.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/aws4": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz", - "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==", - "license": "MIT" - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "license": "MIT" - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/basic-ftp": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz", - "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==", - "license": "MIT", - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", - "license": "BSD-3-Clause", - "dependencies": { - "tweetnacl": "^0.14.3" - } - }, - "node_modules/big-integer": { - "version": "1.6.52", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz", - "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==", - "license": "Unlicense", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "license": "MIT", - "optional": true, - "dependencies": { - "file-uri-to-path": "1.0.0" - } - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "license": "MIT", - "optional": true, - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/bl/node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "optional": true, - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", - "license": "MIT", - "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/body-parser/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/body-parser/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" - }, - "node_modules/bowser": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz", - "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==", - "license": "MIT" - }, - "node_modules/bplist-parser": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", - "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", - "license": "MIT", - "dependencies": { - "big-integer": "^1.6.44" - }, - "engines": { - "node": ">= 5.10.0" - } - }, - "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/browserslist": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", - "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "caniuse-lite": "^1.0.30001688", - "electron-to-chromium": "^1.5.73", - "node-releases": "^2.0.19", - "update-browserslist-db": "^1.1.1" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/bson": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", - "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==", - "license": "Apache-2.0", - "engines": { - "node": ">=16.20.1" - } - }, - "node_modules/buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, - "node_modules/buildcheck": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz", - "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==", - "optional": true, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/bundle-name": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz", - "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", - "license": "MIT", - "dependencies": { - "run-applescript": "^5.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001702", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001702.tgz", - "integrity": "sha512-LoPe/D7zioC0REI5W73PeR1e1MLCipRGq/VkovJnd6Df+QVqT+vT33OXCp8QUd7kA7RZrHWxb1B36OQKI/0gOA==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "CC-BY-4.0" - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "license": "MIT" - }, - "node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", - "license": "MIT", - "engines": { - "node": ">=14" - } - }, - "node_modules/config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", - "license": "MIT", - "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, - "node_modules/content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "license": "MIT", - "dependencies": { - "safe-buffer": "5.2.1" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "license": "MIT" - }, - "node_modules/cookie": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", - "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "license": "MIT" - }, - "node_modules/cpu-features": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz", - "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==", - "hasInstallScript": true, - "optional": true, - "dependencies": { - "buildcheck": "~0.0.6", - "nan": "^2.19.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "license": "MIT", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/data-uri-to-buffer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", - "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", - "license": "MIT", - "engines": { - "node": ">= 12" - } - }, - "node_modules/debug": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", - "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "license": "MIT", - "optional": true, - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "license": "MIT", - "optional": true, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/default-browser": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", - "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", - "license": "MIT", - "dependencies": { - "bundle-name": "^3.0.0", - "default-browser-id": "^3.0.0", - "execa": "^7.1.1", - "titleize": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/default-browser-id": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz", - "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", - "license": "MIT", - "dependencies": { - "bplist-parser": "^0.2.0", - "untildify": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/define-lazy-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", - "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/degenerator": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", - "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", - "license": "MIT", - "dependencies": { - "ast-types": "^0.13.4", - "escodegen": "^2.1.0", - "esprima": "^4.0.1" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "license": "MIT", - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/detect-libc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", - "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", - "license": "Apache-2.0", - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/dset": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.4.tgz", - "integrity": "sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==", - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "license": "MIT" - }, - "node_modules/editorconfig": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz", - "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==", - "license": "MIT", - "dependencies": { - "@one-ini/wasm": "0.1.1", - "commander": "^10.0.0", - "minimatch": "9.0.1", - "semver": "^7.5.3" - }, - "bin": { - "editorconfig": "bin/editorconfig" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "license": "MIT" - }, - "node_modules/electron-to-chromium": { - "version": "1.5.113", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.113.tgz", - "integrity": "sha512-wjT2O4hX+wdWPJ76gWSkMhcHAV2PTMX+QetUCPYEdCIe+cxmgzzSSiGRCKW8nuh4mwKZlpv0xvoW7OF2X+wmHg==", - "license": "ISC" - }, - "node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "license": "MIT" - }, - "node_modules/emphasize": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/emphasize/-/emphasize-4.2.0.tgz", - "integrity": "sha512-yGKvcFUHlBsUPwlxTlzKLR8+zhpbitkFOMCUxN8fTJng9bdH3WNzUGkhdaGdjndSUgqmMPBN7umfwnUdLz5Axg==", - "license": "MIT", - "dependencies": { - "chalk": "^4.0.0", - "highlight.js": "~10.4.0", - "lowlight": "~1.17.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "license": "MIT", - "optional": true, - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "license": "MIT" - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/escodegen": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", - "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", - "license": "BSD-2-Clause", - "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=6.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "license": "BSD-2-Clause", - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/execa": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", - "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^4.3.0", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^3.0.7", - "strip-final-newline": "^3.0.0" - }, - "engines": { - "node": "^14.18.0 || ^16.14.0 || >=18.0.0" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/execa/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "license": "ISC" - }, - "node_modules/expand-template": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", - "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", - "license": "(MIT OR WTFPL)", - "optional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/express": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", - "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", - "license": "MIT", - "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.3", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.7.1", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.3.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.3", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.12", - "proxy-addr": "~2.0.7", - "qs": "6.13.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.19.0", - "serve-static": "1.16.2", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/express/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/express/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" - }, - "node_modules/fast-xml-parser": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz", - "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/NaturalIntelligence" - }, - { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" - } - ], - "license": "MIT", - "dependencies": { - "strnum": "^1.0.5" - }, - "bin": { - "fxparser": "src/cli/cli.js" - } - }, - "node_modules/fault": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", - "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", - "license": "MIT", - "dependencies": { - "format": "^0.2.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/fetch-blob": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", - "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "paypal", - "url": "https://paypal.me/jimmywarting" - } - ], - "license": "MIT", - "dependencies": { - "node-domexception": "^1.0.0", - "web-streams-polyfill": "^3.0.3" - }, - "engines": { - "node": "^12.20 || >= 14.13" - } - }, - "node_modules/file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "license": "MIT", - "optional": true - }, - "node_modules/finalhandler": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", - "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/finalhandler/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/finalhandler/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" - }, - "node_modules/foreground-child": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", - "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", - "license": "ISC", - "dependencies": { - "cross-spawn": "^7.0.6", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/format": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", - "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", - "engines": { - "node": ">=0.4.x" - } - }, - "node_modules/formdata-polyfill": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", - "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", - "license": "MIT", - "dependencies": { - "fetch-blob": "^3.1.2" - }, - "engines": { - "node": ">=12.20.0" - } - }, - "node_modules/forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "license": "MIT", - "optional": true - }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-console-process-list": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/get-console-process-list/-/get-console-process-list-1.0.5.tgz", - "integrity": "sha512-K73UHh6ht+MXnnuqQAE/5IjlevHV1ePiTy8yBLsZZPxmoY1KHtouW9E2K1bVLeQzHELztb38vFNak6J+2CNCuw==", - "hasInstallScript": true, - "license": "Apache-2.0", - "optional": true, - "os": [ - "win32" - ], - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0" - } - }, - "node_modules/get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "license": "MIT", - "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-uri": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz", - "integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==", - "license": "MIT", - "dependencies": { - "basic-ftp": "^5.0.2", - "data-uri-to-buffer": "^6.0.2", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/get-uri/node_modules/data-uri-to-buffer": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", - "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==", - "license": "MIT", - "engines": { - "node": ">= 14" - } - }, - "node_modules/github-from-package": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", - "license": "MIT", - "optional": true - }, - "node_modules/glibc-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/glibc-version/-/glibc-version-1.0.1.tgz", - "integrity": "sha512-DHPD6Z5wY3ga11O3Izx3JSLDZve0SdRN4nAHC1XtagIjcwHk1OuseZpDr+VWPuTfoDn9H3mHtlKn2+7369raRQ==", - "hasInstallScript": true, - "license": "Apache-2.0", - "optional": true, - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^8.0.0" - }, - "bin": { - "glibc-version": "bin/glibc-version.js" - } - }, - "node_modules/glibc-version/node_modules/node-addon-api": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.1.tgz", - "integrity": "sha512-lytcDEdxKjGJPTLEfW4mYMigRezMlyJY8W4wxJK8zE533Jlb8L8dRuObJFWg2P+AuOIxoCgKF+2Oq4d4Zd0OUA==", - "license": "MIT", - "optional": true, - "engines": { - "node": "^18 || ^20 || >= 21" - } - }, - "node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/handle-backspaces": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/handle-backspaces/-/handle-backspaces-2.0.1.tgz", - "integrity": "sha512-l6yTgp6ihz8SjmzFOnYzuGqcqFMHGlTCiPMGmFRv0Yl4SnVq71l4miKYOAQ4cxUCjMfclzQYc0PvrmIHZETZYw==", - "license": "Apache-2.0" - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/heap-js": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/heap-js/-/heap-js-2.6.0.tgz", - "integrity": "sha512-trFMIq3PATiFRiQmNNeHtsrkwYRByIXUbYNbotiY9RLVfMkdwZdd2eQ38mGt7BRiCKBaj1DyBAIHmm7mmXPuuw==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/highlight.js": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz", - "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==", - "license": "BSD-3-Clause", - "engines": { - "node": "*" - } - }, - "node_modules/hijack-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/hijack-stream/-/hijack-stream-2.0.1.tgz", - "integrity": "sha512-RDOUBy7x+iz6ljj7qQOjXZv3RKFLGjXTYV0Kdl7K3R3YlxqoyFt7PLxfbw3yYriHzZSzXp7Y/oaw1f58YvL1ig==", - "license": "Apache-2.0" - }, - "node_modules/http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "license": "MIT", - "dependencies": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/https-proxy-agent": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", - "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.2", - "debug": "4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/human-signals": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", - "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", - "license": "Apache-2.0", - "engines": { - "node": ">=14.18.0" - } - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "BSD-3-Clause" - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "license": "ISC" - }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "license": "ISC" - }, - "node_modules/ip-address": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", - "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", - "license": "MIT", - "dependencies": { - "jsbn": "1.1.0", - "sprintf-js": "^1.1.3" - }, - "engines": { - "node": ">= 12" - } - }, - "node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/ipv6-normalize": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ipv6-normalize/-/ipv6-normalize-1.0.1.tgz", - "integrity": "sha512-Bm6H79i01DjgGTCWjUuCjJ6QDo1HB96PT/xCYuyJUP9WFbVDrLSbG4EZCvOCun2rNswZb0c3e4Jt/ws795esHA==", - "license": "MIT", - "optional": true - }, - "node_modules/is-docker": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", - "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", - "license": "MIT", - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-inside-container": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", - "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", - "license": "MIT", - "dependencies": { - "is-docker": "^3.0.0" - }, - "bin": { - "is-inside-container": "cli.js" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-recoverable-error": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-recoverable-error/-/is-recoverable-error-1.0.3.tgz", - "integrity": "sha512-T06goBQXH5WCzWtzuU+kYhT3Ui0d3wgk8n4GR/3n9UjgO6cuphhel+W02ps/Z2PYZB8C+l//XAJk9tR5Txo6/w==", - "license": "MIT", - "dependencies": { - "acorn": "^8.8.1", - "acorn-class-fields": "^1.0.0", - "acorn-numeric-separator": "^0.3.6", - "acorn-private-methods": "^1.0.0", - "acorn-static-class-features": "^1.0.0" - } - }, - "node_modules/is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "license": "MIT", - "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-wsl/node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "license": "MIT", - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "license": "ISC" - }, - "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/jose": { - "version": "4.15.9", - "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz", - "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/panva" - } - }, - "node_modules/js-beautify": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.4.tgz", - "integrity": "sha512-9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA==", - "license": "MIT", - "dependencies": { - "config-chain": "^1.1.13", - "editorconfig": "^1.0.4", - "glob": "^10.4.2", - "js-cookie": "^3.0.5", - "nopt": "^7.2.1" - }, - "bin": { - "css-beautify": "js/bin/css-beautify.js", - "html-beautify": "js/bin/html-beautify.js", - "js-beautify": "js/bin/js-beautify.js" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/js-cookie": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", - "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", - "license": "MIT", - "engines": { - "node": ">=14" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "license": "MIT" - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsbn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", - "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", - "license": "MIT" - }, - "node_modules/jsesc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", - "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", - "license": "MIT", - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "license": "MIT", - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/kerberos": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.2.1.tgz", - "integrity": "sha512-Vlyv1tjAPb0y2VIJ03dKkUjsneGIBuTkH24uGRx6/DrKpFlVuGPmct3m5aEotljVUlw7PAGWABwR5aNeW7y8Zw==", - "hasInstallScript": true, - "license": "Apache-2.0", - "optional": true, - "dependencies": { - "node-addon-api": "^6.1.0", - "prebuild-install": "^7.1.2" - }, - "engines": { - "node": ">=12.9.0" - } - }, - "node_modules/kerberos/node_modules/node-addon-api": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", - "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", - "license": "MIT", - "optional": true - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "license": "MIT" - }, - "node_modules/lowlight": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.17.0.tgz", - "integrity": "sha512-vmtBgYKD+QVNy7tIa7ulz5d//Il9R4MooOVh4nkOf9R9Cb/Dk5TXMSTieg/vDulkBkIWj59/BIlyFQxT9X1oAQ==", - "license": "MIT", - "dependencies": { - "fault": "^1.0.0", - "highlight.js": "~10.4.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/lru-cache": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz", - "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==", - "license": "ISC", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/macos-export-certificate-and-key": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.2.4.tgz", - "integrity": "sha512-y5QZEywlBNKd+EhPZ1Hz1FmDbbeQKtuVHJaTlawdl7vXw9bi/4tJB2xSMwX4sMVcddy3gbQ8K0IqXAi2TpDo2g==", - "hasInstallScript": true, - "license": "Apache-2.0", - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0" - } - }, - "node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/memory-pager": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", - "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", - "license": "MIT" - }, - "node_modules/merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "license": "MIT" - }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "license": "MIT", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "license": "MIT", - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/minimatch": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", - "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "license": "MIT", - "optional": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "license": "MIT", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "license": "MIT", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "license": "MIT", - "optional": true - }, - "node_modules/mongodb": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.14.2.tgz", - "integrity": "sha512-kMEHNo0F3P6QKDq17zcDuPeaywK/YaJVCEQRzPF3TOM/Bl9MFg64YE5Tu7ifj37qZJMhwU1tl2Ioivws5gRG5Q==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/saslprep": "^1.1.9", - "bson": "^6.10.3", - "mongodb-connection-string-url": "^3.0.0" - }, - "engines": { - "node": ">=16.20.1" - }, - "peerDependencies": { - "@aws-sdk/credential-providers": "^3.188.0", - "@mongodb-js/zstd": "^1.1.0 || ^2.0.0", - "gcp-metadata": "^5.2.0", - "kerberos": "^2.0.1", - "mongodb-client-encryption": ">=6.0.0 <7", - "snappy": "^7.2.2", - "socks": "^2.7.1" - }, - "peerDependenciesMeta": { - "@aws-sdk/credential-providers": { - "optional": true - }, - "@mongodb-js/zstd": { - "optional": true - }, - "gcp-metadata": { - "optional": true - }, - "kerberos": { - "optional": true - }, - "mongodb-client-encryption": { - "optional": true - }, - "snappy": { - "optional": true - }, - "socks": { - "optional": true - } - } - }, - "node_modules/mongodb-build-info": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/mongodb-build-info/-/mongodb-build-info-1.7.2.tgz", - "integrity": "sha512-eoLFZvCIjcwijYJdxvYupj1c+55VAVm0o4gBJjrcDxxmmpm+bC4Ix9ayZbyhQdVXDZAGDi03NA0GghXjBVXnxg==", - "license": "Apache-2.0", - "dependencies": { - "mongodb-connection-string-url": "^3.0.0" - } - }, - "node_modules/mongodb-client-encryption": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.3.0.tgz", - "integrity": "sha512-OaOg02vglPxxrfY01alC0ER0W4WMuNO2ZJR3ehAUcuGYreJaJ+aX+rUQiQkdQHiXvnVPDUx/4QDr2CR1/FvpcQ==", - "hasInstallScript": true, - "license": "Apache-2.0", - "optional": true, - "dependencies": { - "node-addon-api": "^4.3.0", - "prebuild-install": "^7.1.3" - }, - "engines": { - "node": ">=16.20.1" - } - }, - "node_modules/mongodb-connection-string-url": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", - "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", - "license": "Apache-2.0", - "dependencies": { - "@types/whatwg-url": "^11.0.2", - "whatwg-url": "^14.1.0 || ^13.0.0" - } - }, - "node_modules/mongodb-crypt-library-version": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/mongodb-crypt-library-version/-/mongodb-crypt-library-version-1.0.5.tgz", - "integrity": "sha512-RLTxgBOpK1Ht1FvGpitI6EkFuYGk/CB6ImDJHzB9Iv/iKwVANu4OynaiJOoZQQTaZZCetmyAgMXwNHhMLCRyJw==", - "hasInstallScript": true, - "license": "Apache-2.0", - "optional": true, - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0" - }, - "bin": { - "mongodb-crypt-library-version": "bin/mongodb-crypt-library-version.js" - } - }, - "node_modules/mongodb-log-writer": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.4.0.tgz", - "integrity": "sha512-t/OcqDLl+JaVKnP7g3Zz3mCCowIAW5rp8AxD1IqVxy5rVApV332JHk5NkedtuHlRVIsN/qCujH4ezZZmoP16IQ==", - "license": "Apache-2.0", - "dependencies": { - "heap-js": "^2.3.0" - }, - "peerDependencies": { - "bson": "6.x" - } - }, - "node_modules/mongodb-redact": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/mongodb-redact/-/mongodb-redact-1.1.5.tgz", - "integrity": "sha512-bLTHIHviJvTGJDvCECDBEDMk7beJQ4Fvoec50hgIax98ojzyTk9xIyrewFPM7yzlDVKTkkh864uxlkkTTLVsbg==", - "license": "Apache-2.0" - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/nan": { - "version": "2.22.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz", - "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==", - "license": "MIT", - "optional": true - }, - "node_modules/napi-build-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", - "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", - "license": "MIT", - "optional": true - }, - "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/netmask": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", - "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==", - "license": "MIT", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/node-abi": { - "version": "3.74.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz", - "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==", - "license": "MIT", - "optional": true, - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-addon-api": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz", - "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==", - "license": "MIT", - "optional": true - }, - "node_modules/node-domexception": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", - "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "github", - "url": "https://paypal.me/jimmywarting" - } - ], - "license": "MIT", - "engines": { - "node": ">=10.5.0" - } - }, - "node_modules/node-fetch": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", - "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", - "license": "MIT", - "dependencies": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/node-fetch" - } - }, - "node_modules/node-releases": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", - "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", - "license": "MIT" - }, - "node_modules/nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", - "license": "ISC", - "dependencies": { - "abbrev": "^2.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-run-path": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", - "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", - "license": "MIT", - "dependencies": { - "path-key": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-run-path/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/numeral": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz", - "integrity": "sha512-qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==", - "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/object-hash": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz", - "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==", - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, - "node_modules/object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/oidc-token-hash": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-5.1.0.tgz", - "integrity": "sha512-y0W+X7Ppo7oZX6eovsRkuzcSM40Bicg2JEJkDJ4irIt1wsYAP5MLSNv+QAogO8xivMffw/9OvV3um1pxXgt1uA==", - "license": "MIT", - "engines": { - "node": "^10.13.0 || >=12.0.0" - } - }, - "node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "license": "MIT", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "license": "ISC", - "optional": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "license": "MIT", - "dependencies": { - "mimic-fn": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/open": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", - "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", - "license": "MIT", - "dependencies": { - "default-browser": "^4.0.0", - "define-lazy-prop": "^3.0.0", - "is-inside-container": "^1.0.0", - "is-wsl": "^2.2.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/openid-client": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.7.1.tgz", - "integrity": "sha512-jDBPgSVfTnkIh71Hg9pRvtJc6wTwqjRkN88+gCFtYWrlP4Yx2Dsrow8uPi3qLr/aeymPF3o2+dS+wOpglK04ew==", - "license": "MIT", - "dependencies": { - "jose": "^4.15.9", - "lru-cache": "^6.0.0", - "object-hash": "^2.2.0", - "oidc-token-hash": "^5.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/panva" - } - }, - "node_modules/openid-client/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/os-dns-native": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/os-dns-native/-/os-dns-native-1.2.1.tgz", - "integrity": "sha512-LbU43lWBxnZhy72Ngr+Vga0og5Q2+Ob8lvSHJkP2uYBkvdmAnK4CvaVaBhC1hk9AQV3YxAZ9fZWaJTuIyPEi+Q==", - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "dependencies": { - "bindings": "^1.5.0", - "debug": "^4.3.3", - "ipv6-normalize": "^1.0.1", - "node-addon-api": "^4.3.0" - } - }, - "node_modules/pac-proxy-agent": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz", - "integrity": "sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==", - "license": "MIT", - "dependencies": { - "@tootallnate/quickjs-emscripten": "^0.23.0", - "agent-base": "^7.1.2", - "debug": "^4.3.4", - "get-uri": "^6.0.1", - "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.6", - "pac-resolver": "^7.0.1", - "socks-proxy-agent": "^8.0.5" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/pac-resolver": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", - "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", - "license": "MIT", - "dependencies": { - "degenerator": "^5.0.0", - "netmask": "^2.0.2" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/package-json-from-dist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", - "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", - "license": "BlueOak-1.0.0" - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "license": "BlueOak-1.0.0", - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "license": "ISC" - }, - "node_modules/path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", - "license": "MIT" - }, - "node_modules/picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "license": "ISC" - }, - "node_modules/prebuild-install": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", - "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", - "license": "MIT", - "optional": true, - "dependencies": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^2.0.0", - "node-abi": "^3.3.0", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/pretty-repl": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pretty-repl/-/pretty-repl-4.0.1.tgz", - "integrity": "sha512-Ve+ZNS5fwxylks3TTR4su7SaNAHVOh++7J5R8VKFAHIjmAMS8X79rnETc/JJoqay52cfgeHum7vm2+9hFSys9Q==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1", - "chalk": "^4.1.1", - "emphasize": "^4.2.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", - "license": "ISC" - }, - "node_modules/proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "license": "MIT", - "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/pump": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", - "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", - "license": "MIT", - "optional": true, - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", - "license": "MIT", - "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", - "optional": true, - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "license": "MIT", - "optional": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/resolve-mongodb-srv": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/resolve-mongodb-srv/-/resolve-mongodb-srv-1.1.5.tgz", - "integrity": "sha512-flu1XTSLDJHvTnWu2aJh2w9jgGPcNYJn2obMkuzXiyWSz0MLXu9IRCjvirJ4zRoCPHJJPt3uLQVNJTrzFRWd1w==", - "license": "Apache-2.0", - "optional": true, - "dependencies": { - "whatwg-url": "^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0" - }, - "bin": { - "resolve-mongodb-srv": "bin/resolve-mongodb-srv.js" - } - }, - "node_modules/run-applescript": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", - "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", - "license": "MIT", - "dependencies": { - "execa": "^5.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/run-applescript/node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/run-applescript/node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "license": "Apache-2.0", - "engines": { - "node": ">=10.17.0" - } - }, - "node_modules/run-applescript/node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/run-applescript/node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/run-applescript/node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "license": "MIT", - "dependencies": { - "path-key": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/run-applescript/node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "license": "MIT", - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/run-applescript/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "license": "ISC" - }, - "node_modules/run-applescript/node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "license": "MIT" - }, - "node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/send/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/send/node_modules/debug/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" - }, - "node_modules/send/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/serve-static": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", - "license": "MIT", - "dependencies": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.19.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "license": "ISC" - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "license": "MIT", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/simple-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", - "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "optional": true - }, - "node_modules/simple-get": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", - "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "optional": true, - "dependencies": { - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, - "node_modules/smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "license": "MIT", - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks": { - "version": "2.8.4", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz", - "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==", - "license": "MIT", - "dependencies": { - "ip-address": "^9.0.5", - "smart-buffer": "^4.2.0" - }, - "engines": { - "node": ">= 10.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks-proxy-agent": { - "version": "8.0.5", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", - "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.2", - "debug": "^4.3.4", - "socks": "^2.8.3" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "license": "BSD-3-Clause", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sparse-bitfield": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", - "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", - "license": "MIT", - "dependencies": { - "memory-pager": "^1.0.2" - } - }, - "node_modules/sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "license": "BSD-3-Clause" - }, - "node_modules/ssh2": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz", - "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==", - "hasInstallScript": true, - "dependencies": { - "asn1": "^0.2.6", - "bcrypt-pbkdf": "^1.0.2" - }, - "engines": { - "node": ">=10.16.0" - }, - "optionalDependencies": { - "cpu-features": "~0.0.10", - "nan": "^2.20.0" - } - }, - "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "license": "MIT", - "optional": true, - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "license": "MIT" - }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/strnum": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz", - "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/NaturalIntelligence" - } - ], - "license": "MIT" - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/system-ca": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/system-ca/-/system-ca-2.0.1.tgz", - "integrity": "sha512-9ZDV9yl8ph6Op67wDGPr4LykX86usE9x3le+XZSHfVMiiVJ5IRgmCWjLgxyz35ju9H3GDIJJZm4ogAeIfN5cQQ==", - "license": "Apache-2.0", - "optionalDependencies": { - "macos-export-certificate-and-key": "^1.2.0", - "win-export-certificate-and-key": "^2.1.0" - } - }, - "node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "license": "ISC", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tar-fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", - "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", - "license": "MIT", - "optional": true, - "dependencies": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - } - }, - "node_modules/tar-fs/node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "license": "ISC", - "optional": true - }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "license": "MIT", - "optional": true, - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tar/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "license": "MIT" - }, - "node_modules/titleize": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz", - "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "license": "MIT", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/tr46": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz", - "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==", - "license": "MIT", - "dependencies": { - "punycode": "^2.3.1" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD" - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "license": "Apache-2.0", - "optional": true, - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", - "license": "Unlicense" - }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "license": "MIT", - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/update-browserslist-db": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", - "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "escalade": "^3.2.0", - "picocolors": "^1.1.1" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "license": "MIT", - "optional": true - }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "license": "MIT", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/web-streams-polyfill": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", - "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=12" - } - }, - "node_modules/whatwg-url": { - "version": "14.1.1", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.1.tgz", - "integrity": "sha512-mDGf9diDad/giZ/Sm9Xi2YcyzaFpbdLpJPr+E9fSkyQ7KpQD4SdFcugkRQYzhmfI4KeV4Qpnn2sKPdo+kmsgRQ==", - "license": "MIT", - "dependencies": { - "tr46": "^5.0.0", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/win-export-certificate-and-key": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/win-export-certificate-and-key/-/win-export-certificate-and-key-2.1.0.tgz", - "integrity": "sha512-WeMLa/2uNZcS/HWGKU2G1Gzeh3vHpV/UFvwLhJLKxPHYFAbubxxVcJbqmPXaqySWK1Ymymh16zKK5WYIJ3zgzA==", - "hasInstallScript": true, - "license": "Apache-2.0", - "optional": true, - "os": [ - "win32" - ], - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^3.1.0" - } - }, - "node_modules/win-export-certificate-and-key/node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "license": "MIT", - "optional": true - }, - "node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "license": "MIT" - }, - "node_modules/wrap-ansi-cjs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "license": "ISC", - "optional": true - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, - "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/zod": { - "version": "3.24.2", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz", - "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/colinhacks" - } - } - } -} diff --git a/pkgs/by-name/mo/mongosh/package.nix b/pkgs/by-name/mo/mongosh/package.nix index 52248dc8e86e..e091666233c0 100644 --- a/pkgs/by-name/mo/mongosh/package.nix +++ b/pkgs/by-name/mo/mongosh/package.nix @@ -1,38 +1,59 @@ { lib, buildNpmPackage, - fetchurl, + fetchFromGitHub, + fetchpatch, + libmongocrypt, + krb5, testers, - mongosh, + nix-update-script, }: -let - source = lib.importJSON ./source.json; -in -buildNpmPackage { +buildNpmPackage (finalAttrs: { pname = "mongosh"; - inherit (source) version; + version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mongosh/-/${source.filename}"; - hash = source.integrity; + src = fetchFromGitHub { + owner = "mongodb-js"; + repo = "mongosh"; + + # Tracking a few commits ahead of 2.5.1 to ensure the package-lock.json patch below applies + #tag = "v${finalAttrs.version}"; + rev = "2163e8b10a77af18e0cedfa164526506c051593e"; + + hash = "sha256-DYX8NqAISwzBpdilcv3YVrL72byXMeC4z/nLqd2nf2c="; }; - postPatch = '' - ln -s ${./package-lock.json} package-lock.json + patches = [ + # https://github.com/mongodb-js/mongosh/pull/2452 + (fetchpatch { + url = "https://github.com/mongodb-js/mongosh/commit/30f66260fce3e1744298d086bd2b54b2d2bfffbb.patch"; + hash = "sha256-c2QM/toeoagfhvuh4r+/5j7ZyV6DEr9brA9mXpEy1kM="; + }) + + ./disable-telemetry.patch + ]; + + npmDepsHash = "sha256-6uXEKAAGXxaODjXIszYml5Af4zSuEzy/QKdMgSzLD84="; + npmFlags = [ + "--omit=optional" + "--ignore-scripts" + ]; + npmBuildScript = "compile"; + dontNpmInstall = true; + installPhase = '' + runHook preInstall + npmWorkspace=packages/mongosh npmInstallHook + cp -r packages configs $out/lib/node_modules/mongosh/ + rm $out/lib/node_modules/mongosh/node_modules/@mongosh/docker-build-scripts # dangling symlink + runHook postInstall ''; - npmDepsHash = source.deps; - - makeCacheWritable = true; - dontNpmBuild = true; - npmFlags = [ "--omit=optional" ]; - passthru = { tests.version = testers.testVersion { - package = mongosh; + package = finalAttrs.finalPackage; }; - updateScript = ./update.sh; + updateScript = nix-update-script { }; }; meta = { @@ -42,4 +63,4 @@ buildNpmPackage { license = lib.licenses.asl20; mainProgram = "mongosh"; }; -} +}) diff --git a/pkgs/by-name/mo/mongosh/source.json b/pkgs/by-name/mo/mongosh/source.json deleted file mode 100644 index 694a8e4b428f..000000000000 --- a/pkgs/by-name/mo/mongosh/source.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "2.4.2", - "integrity": "sha512-sNgCITVstYsOkHDH05//wGQ/FJnFfq5gHGoHpIMehX/r2vSm3LEcCW366JlLvRmFj/f4NRGjvFI9c1Ks30W+Zw==", - "filename": "mongosh-2.4.2.tgz", - "deps": "sha256-aXjK0cW48nih2nI/m2i25zRpmLQ/KHo0KMiNJSvb13g=" -} diff --git a/pkgs/by-name/mo/mongosh/update.sh b/pkgs/by-name/mo/mongosh/update.sh deleted file mode 100755 index 08ceb076093b..000000000000 --- a/pkgs/by-name/mo/mongosh/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodejs libarchive prefetch-npm-deps moreutils jq -# shellcheck shell=bash - -set -exuo pipefail - -cd -- "$(dirname -- "${BASH_SOURCE[0]}")" - -TMPDIR="$(mktemp -d)" -trap 'rm -r -- "$TMPDIR"' EXIT - -pushd -- "$TMPDIR" -npm pack mongosh --json | jq '.[0] | { version, integrity, filename }' > source.json -bsdtar -x -f "$(jq -r .filename source.json)" - -pushd package -npm install --omit=optional --package-lock-only -popd - -DEPS="$(prefetch-npm-deps package/package-lock.json)" -jq ".deps = \"$DEPS\"" source.json | sponge source.json - -popd - -cp -t . -- "$TMPDIR/source.json" "$TMPDIR/package/package-lock.json" diff --git a/pkgs/by-name/mo/monit/package.nix b/pkgs/by-name/mo/monit/package.nix index d8425acd501a..43f89ea56326 100644 --- a/pkgs/by-name/mo/monit/package.nix +++ b/pkgs/by-name/mo/monit/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, bison, flex, zlib, @@ -15,22 +14,17 @@ stdenv.mkDerivation rec { pname = "monit"; - version = "5.34.4"; + version = "5.35.1"; src = fetchurl { url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz"; - sha256 = "sha256-72B8+qv9N2fUC5ueMgMvdIvuvE1oaDH2ER4OaPvRtGk="; + hash = "sha256-d6TAI+4Gru1IU23+tJ2WqGip64EGw+LojKtTe7xylRs="; }; - nativeBuildInputs = - [ - bison - flex - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.DiskArbitration - darwin.apple_sdk.frameworks.System - ]; + nativeBuildInputs = [ + bison + flex + ]; buildInputs = [ diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index 773e9003b897..05df78a0ec2a 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.01"; + version = "11.10"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-d7rTwEsKdCZ9iKxwzaM+eduGQqclNvpLV0hW6NGNWqI="; + hash = "sha256-OYOeBB3ykpiBnwLctnn/Pv3F30TrSKJJOeYrBaann7s="; stripRoot = false; }; diff --git a/pkgs/by-name/mo/monolith/package.nix b/pkgs/by-name/mo/monolith/package.nix new file mode 100644 index 000000000000..0b3fce941328 --- /dev/null +++ b/pkgs/by-name/mo/monolith/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + libiconv, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "monolith"; + version = "2.10.1"; + + src = fetchFromGitHub { + owner = "Y2Z"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7D/r9/uY1JcShKgfNUGVTn8P5kUAwUIa/xBbhpReeNw="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-rIwlNXe7me3Ehj1EIYiOYo12FQqovmZT0ui58gFRWWw="; + + OPENSSL_NO_VENDOR = true; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + checkFlags = [ "--skip=tests::cli" ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Bundle any web page into a single HTML file"; + mainProgram = "monolith"; + homepage = "https://github.com/Y2Z/monolith"; + license = licenses.cc0; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; + maintainers = with maintainers; [ Br1ght0ne ]; + }; +} diff --git a/pkgs/by-name/mo/monsoon/package.nix b/pkgs/by-name/mo/monsoon/package.nix index d3d6d3bfa04f..fc0cb5fe1cc2 100644 --- a/pkgs/by-name/mo/monsoon/package.nix +++ b/pkgs/by-name/mo/monsoon/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "monsoon"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "RedTeamPentesting"; repo = "monsoon"; tag = "v${version}"; - hash = "sha256-efVwOon499DUJ17g6aQveMd2g544Ck+/P7VttYnR+No="; + hash = "sha256-vgwoW7jrcLVHDm1cYrIpFcfrgKImCAVOtHg8lMQ6aic="; }; - vendorHash = "sha256-i96VDKNRNrkrkg2yBd+muXIQK0vZCGIoQrZsq+kBMsk="; + vendorHash = "sha256-hGEUO1sl8IKXo4rkS81Wlf7187lu2PrSujNlGNTLwmE="; # Tests fails on darwin doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/mo/moon/package.nix b/pkgs/by-name/mo/moon/package.nix new file mode 100644 index 000000000000..b6f246cb6c80 --- /dev/null +++ b/pkgs/by-name/mo/moon/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + openssl, + pkg-config, + versionCheckHook, + nix-update-script, + installShellFiles, + buildPackages, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "moon"; + version = "1.35.5"; + + src = fetchFromGitHub { + owner = "moonrepo"; + repo = "moon"; + tag = "v${finalAttrs.version}"; + hash = "sha256-cqa8s38c6wREqFzWD61t1vc0eLbrYRb8FuElKr+MdD0="; + }; + + cargoHash = "sha256-9UOGDsq93mayuoxyhO7hjss3OYRf97EUwNY23VYnP1E="; + + env = { + RUSTFLAGS = "-C strip=symbols"; + OPENSSL_NO_VENDOR = 1; + }; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd moon \ + --bash <(${emulator} $out/bin/moon completions --shell bash) \ + --fish <(${emulator} $out/bin/moon completions --shell fish) \ + --zsh <(${emulator} $out/bin/moon completions --shell zsh) + '' + ); + + # Some tests fail, because test using internet connection and install NodeJS by example + doCheck = false; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Task runner and repo management tool for the web ecosystem, written in Rust"; + mainProgram = "moon"; + homepage = "https://github.com/moonrepo/moon"; + changelog = "https://github.com/moonrepo/moon/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ flemzord ]; + }; +}) diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix index 0d9e3bc642dd..2923cf1db51c 100644 --- a/pkgs/by-name/mo/moonfire-nvr/package.nix +++ b/pkgs/by-name/mo/moonfire-nvr/package.nix @@ -8,7 +8,6 @@ sqlite, testers, moonfire-nvr, - darwin, nodejs, pnpm_9, }: @@ -59,17 +58,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - ncurses - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - ] - ); + buildInputs = [ + ncurses + sqlite + ]; postInstall = '' mkdir -p $out/lib/ui diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix index dc57ce4678f5..f04b26f5d82e 100644 --- a/pkgs/by-name/mo/moonlight-qt/package.nix +++ b/pkgs/by-name/mo/moonlight-qt/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - (SDL2.override { drmSupport = stdenv.hostPlatform.isLinux; }) + SDL2 SDL2_ttf ffmpeg libopus diff --git a/pkgs/by-name/mo/moonlight/disable_updates.patch b/pkgs/by-name/mo/moonlight/disable_updates.patch new file mode 100644 index 000000000000..10a76daad274 --- /dev/null +++ b/pkgs/by-name/mo/moonlight/disable_updates.patch @@ -0,0 +1,78 @@ +diff --git a/packages/core-extensions/src/moonbase/host.ts b/packages/core-extensions/src/moonbase/host.ts +index 8903f41..e5c8709 100644 +--- a/packages/core-extensions/src/moonbase/host.ts ++++ b/packages/core-extensions/src/moonbase/host.ts +@@ -79,22 +79,9 @@ electron.app.whenReady().then(() => { + + if (!entries.find((e) => e.label === "moonlight")) { + const options: Electron.MenuItemConstructorOptions[] = [ +- { label: "Update and restart", click: updateAndRestart }, + { label: "Reset config", click: resetConfig } + ]; + +- if (moonlightHost.branch !== MoonlightBranch.DEV) { +- options.push({ +- label: "Switch branch", +- submenu: [MoonlightBranch.STABLE, MoonlightBranch.NIGHTLY].map((branch) => ({ +- label: branch, +- type: "radio", +- checked: moonlightHost.branch === branch, +- click: () => changeBranch(branch) +- })) +- }); +- } +- + options.push({ label: "About", click: showAbout }); + + entries.splice(i + 1, 0, { +diff --git a/packages/core-extensions/src/moonbase/native.ts b/packages/core-extensions/src/moonbase/native.ts +index c6e068f..0adc765 100644 +--- a/packages/core-extensions/src/moonbase/native.ts ++++ b/packages/core-extensions/src/moonbase/native.ts +@@ -39,24 +39,7 @@ export default function getNatives(): MoonbaseNatives { + + return { + async checkForMoonlightUpdate() { +- try { +- if (moonlightGlobal.branch === MoonlightBranch.STABLE) { +- const json = await getStableRelease(); +- return json.name !== moonlightGlobal.version ? json.name : null; +- } else if (moonlightGlobal.branch === MoonlightBranch.NIGHTLY) { +- const req = await fetch(nightlyRefUrl, { +- cache: "no-store", +- headers: sharedHeaders +- }); +- const ref = (await req.text()).split("\n")[0]; +- return ref !== moonlightGlobal.version ? ref : null; +- } +- +- return null; +- } catch (e) { +- logger.error("Error checking for moonlight update", e); +- return null; +- } ++ return null; + }, + + async updateMoonlight(overrideBranch?: MoonlightBranch) { +diff --git a/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx b/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx +index 302c610..2db7ecd 100644 +--- a/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx ++++ b/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx +@@ -108,16 +108,6 @@ function ArrayFormItem({ config }: { config: "repositories" | "devSearchPaths" } + export default function ConfigPage() { + return ( + <> +- ("moonbase", "updateChecking", true) ?? true} +- onChange={(value: boolean) => { +- MoonbaseSettingsStore.setExtensionConfig("moonbase", "updateChecking", value); +- }} +- note="Checks for updates to moonlight" +- > +- Automatic update checking +- + + A list of remote repositories to display extensions from + diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix index 1a08a488d80d..9c693388b79b 100644 --- a/pkgs/by-name/mo/moonlight/package.nix +++ b/pkgs/by-name/mo/moonlight/package.nix @@ -1,34 +1,45 @@ { lib, stdenv, - nodejs, - pnpm_9, + pnpm_10, + nodejs_22, fetchFromGitHub, nix-update-script, }: - stdenv.mkDerivation (finalAttrs: { pname = "moonlight"; - version = "1.3.9"; + version = "1.3.19"; src = fetchFromGitHub { owner = "moonlight-mod"; repo = "moonlight"; tag = "v${finalAttrs.version}"; - hash = "sha256-WhPQ7JYfE8RBhDknBunKdW1VBxrklb3UGnMgk5LFVFA="; + hash = "sha256-cFsVYlIkSNEpGw4qT9Eea6sa1+dZyaCRZNrgQTc8wu4="; }; nativeBuildInputs = [ - nodejs - pnpm_9.configHook + nodejs_22 + pnpm_10.configHook ]; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-KZFHcW/OVjTDXZltxPYGuO+NWjuD5o6HE/E9JQZmrG8="; + buildInputs = [ nodejs_22 ]; + + hash = "sha256-Z/OypVPARLrSfvp9U2sPdgv194nj/f2VBxcxwtvaU5Q="; }; + env = { + NODE_ENV = "production"; + MOONLIGHT_BRANCH = "stable"; + MOONLIGHT_VERSION = "v${finalAttrs.version} (nixpkgs)"; + }; + + patches = [ + ./disable_updates.patch + ]; + buildPhase = '' runHook preBuild @@ -55,7 +66,8 @@ stdenv.mkDerivation (finalAttrs: { All core code is original or used with permission from their respective authors where not copyleft. ''; homepage = "https://moonlight-mod.github.io"; - changelog = "https://github.com/moonlight-mod/moonlight/blob/main/CHANGELOG.md"; + downloadPage = "https://moonlight-mod.github.io/using/install/#nix"; + changelog = "https://raw.githubusercontent.com/moonlight-mod/moonlight/refs/tags/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.lgpl3; maintainers = with maintainers; [ diff --git a/pkgs/by-name/mo/moonraker/package.nix b/pkgs/by-name/mo/moonraker/package.nix index 750640084665..930a5e0d490a 100644 --- a/pkgs/by-name/mo/moonraker/package.nix +++ b/pkgs/by-name/mo/moonraker/package.nix @@ -35,13 +35,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "0.9.3-unstable-2025-03-26"; + version = "0.9.3-unstable-2025-04-22"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "b90c96524cd4aa5579ebc9899fd7812c1e756d86"; - sha256 = "sha256-oXdZdSoxfDNGR2n1L41zAG1aRzxeLTHtTmIUe2nWu/I="; + rev = "1c124149720e24f52b80ce82ce906e69476b7724"; + sha256 = "sha256-+Yk0TBU8dIa9mf0s+F+mTop8jLxdVDDCP8ST8pRgCiY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix index 56944ad6be76..37dc19b74b25 100644 --- a/pkgs/by-name/mo/moosefs/package.nix +++ b/pkgs/by-name/mo/moosefs/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "4.57.5"; + version = "4.57.6"; src = fetchFromGitHub { owner = "moosefs"; repo = "moosefs"; rev = "v${version}"; - sha256 = "sha256-5sVnr+bUbmIc4qYC/h+d/s1ow3cxeL2Yo/JitCs6cbE="; + sha256 = "sha256-vCwRM6UIcT71e6u5QZzcTW6LK/VNlVG/19XxsHnn2a8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mopidy-argos/package.nix b/pkgs/by-name/mo/mopidy-argos/package.nix new file mode 100644 index 000000000000..3bf527af6138 --- /dev/null +++ b/pkgs/by-name/mo/mopidy-argos/package.nix @@ -0,0 +1,59 @@ +{ + stdenv, + lib, + python3Packages, + fetchFromGitHub, + pkg-config, + meson, + ninja, + appstream-glib, + desktop-file-utils, + wrapGAppsHook3, + gobject-introspection, +}: +python3Packages.buildPythonApplication rec { + pname = "mopidy-argos"; + version = "1.16.0"; + pyproject = false; # Built with meson + + src = fetchFromGitHub { + owner = "orontee"; + repo = "argos"; + tag = "v${version}"; + hash = "sha256-wmAGzURFPseBxBD6mW4rAHPrxmQHx03DQxvTBF3T/pg="; + }; + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + nativeBuildInputs = [ + pkg-config + meson + ninja + appstream-glib + gobject-introspection + desktop-file-utils + wrapGAppsHook3 + ]; + + dependencies = with python3Packages; [ + aiohttp + pycairo + pygobject3 + pyxdg + zeroconf + ]; + + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + homepage = "https://github.com/orontee/argos"; + description = "Gtk front-end to control a Mopidy server"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.hufman ]; + mainProgram = "argos"; + }; +} diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 380685a0dba3..205bfd4a2f31 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "morewaita-icon-theme"; - version = "47.4"; + version = "48.1"; src = fetchFromGitHub { owner = "somepaulo"; repo = "MoreWaita"; tag = "v${version}"; - hash = "sha256-AcEQVIlv+ar0dvqoTDFq06P3dCZx/sS/HUXxuBUvRoo="; + hash = "sha256-18jI4hADVHC/WCmMTlA+VBuZ1jNGSxL+lO3GwWDiNoU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix index af0a0de53770..fff6c79404f1 100644 --- a/pkgs/by-name/mo/morgen/package.nix +++ b/pkgs/by-name/mo/morgen/package.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.6.10"; + version = "3.6.13"; src = fetchurl { name = "morgen-${version}.deb"; url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-//HXWx0vi2lbCeZr+QMfif6B8MiCAdRDullQ1QlIZu8="; + hash = "sha256-a7IkEHRAwa7SnsPcK6psho6E+o1aOlQPPFHaDPrrXxw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/morphosis/package.nix b/pkgs/by-name/mo/morphosis/package.nix index 7a9271d4dcd5..5cf46c7631ce 100644 --- a/pkgs/by-name/mo/morphosis/package.nix +++ b/pkgs/by-name/mo/morphosis/package.nix @@ -20,15 +20,15 @@ python3Packages.buildPythonApplication rec { pname = "morphosis"; - version = "1.4.1"; + version = "48.2"; pyproject = false; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "morphosis"; - rev = "refs/tags/v${version}"; - hash = "sha256-ZpxenBqC5qr7yNwjld0u7gSBQfL7Kpa4FWE9gkzG0hg="; + tag = version; + hash = "sha256-wDEhXIt1iup7QxKsmWUjQZGTEZhOuNjpLqzpqs+TPHo="; }; strictDeps = true; diff --git a/pkgs/by-name/mo/mos/package.nix b/pkgs/by-name/mo/mos/package.nix index 5d0f6cc1f75b..dc527f625686 100644 --- a/pkgs/by-name/mo/mos/package.nix +++ b/pkgs/by-name/mo/mos/package.nix @@ -3,14 +3,15 @@ stdenvNoCC, fetchurl, undmg, + nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mos"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { url = "https://github.com/Caldis/Mos/releases/download/${finalAttrs.version}/Mos.Versions.${finalAttrs.version}.dmg"; - hash = "sha256-OOoz6GeBVQZBQyNIQUe4grbZffSvl1m8oKZNmMlQKbM="; + hash = "sha256-o2H4cfMudjoQHfKeV4ORiO9/szoomFP0IP6D6ecMAI4="; }; sourceRoot = "."; @@ -25,12 +26,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { - description = "Smooths scrolling and set mouse scroll directions independently"; + description = "Smooths scrolling and set mouse scroll directions independently on macOS"; homepage = "https://mos.caldis.me/"; changelog = "https://github.com/Caldis/Mos/releases/tag/${finalAttrs.version}"; license = licenses.cc-by-nc-40; - maintainers = [ ]; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = platforms.darwin; }; diff --git a/pkgs/by-name/mo/mosdepth/package.nix b/pkgs/by-name/mo/mosdepth/package.nix index 9e270b3b4e74..cd110fdec8cd 100644 --- a/pkgs/by-name/mo/mosdepth/package.nix +++ b/pkgs/by-name/mo/mosdepth/package.nix @@ -2,13 +2,12 @@ lib, buildNimPackage, fetchFromGitHub, - pcre, versionCheckHook, }: buildNimPackage (finalAttrs: { pname = "mosdepth"; - version = "0.3.10"; + version = "0.3.11"; requiredNimVersion = 1; @@ -16,12 +15,11 @@ buildNimPackage (finalAttrs: { owner = "brentp"; repo = "mosdepth"; rev = "v${finalAttrs.version}"; - hash = "sha256-RAE3k2yA2zsIr5JFYb5bPaMzdoEKms7TKaqVhPS5LzY="; + hash = "sha256-EzzDuzPAyNkL2tFWre86U+kx3SvLPbWto2/vfLdwHGI="; }; lockFile = ./lock.json; - buildInputs = [ pcre ]; nativeBuildInputs = [ versionCheckHook ]; nimFlags = [ ''--passC:"-Wno-incompatible-pointer-types"'' ]; diff --git a/pkgs/by-name/mo/moshi/Cargo.lock b/pkgs/by-name/mo/moshi/Cargo.lock new file mode 100644 index 000000000000..618b77bdeeaf --- /dev/null +++ b/pkgs/by-name/mo/moshi/Cargo.lock @@ -0,0 +1,5946 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[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 = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + +[[package]] +name = "alsa" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" +dependencies = [ + "alsa-sys", + "bitflags 2.9.0", + "cfg-if", + "libc", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +dependencies = [ + "anstyle", + "once_cell", + "windows-sys 0.59.0", +] + +[[package]] +name = "anyhow" +version = "1.0.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" +dependencies = [ + "backtrace", +] + +[[package]] +name = "arbitrary" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "async-compression" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a194f9d963d8099596278594b3107448656ba73831c9d8c783e613ce86da64" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "zstd", + "zstd-safe", +] + +[[package]] +name = "async-trait" +version = "0.1.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "audiopus_sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62314a1546a2064e033665d658e88c620a62904be945f8147e6b16c3db9f8651" +dependencies = [ + "cmake", + "log", + "pkg-config", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "aws-lc-rs" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f7720b74ed28ca77f90769a71fd8c637a0137f6fae4ae947e1050229cff57f" +dependencies = [ + "bindgen 0.69.5", + "cc", + "cmake", + "dunce", + "fs_extra", +] + +[[package]] +name = "axum" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +dependencies = [ + "async-trait", + "axum-core", + "base64 0.22.1", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.6.0", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper 1.0.2", + "tokio", + "tokio-tungstenite 0.24.0", + "tower 0.5.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-server" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ad46c3ec4e12f4a4b6835e173ba21c25e484c9d02b49770bf006ce5367c036" +dependencies = [ + "arc-swap", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.6.0", + "hyper-util", + "pin-project-lite", + "rustls 0.21.12", + "rustls-pemfile 2.2.0", + "tokio", + "tokio-rustls", + "tower 0.4.13", + "tower-service", +] + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.7.4", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.69.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +dependencies = [ + "bitflags 2.9.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.100", + "which", +] + +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.9.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.100", +] + +[[package]] +name = "bindgen_cuda" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8489af5b7d17a81bffe37e0f4d6e1e4de87c87329d05447f22c35d95a1227d" +dependencies = [ + "glob", + "num_cpus", + "rayon", +] + +[[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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" + +[[package]] +name = "bytemuck" +version = "1.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] + +[[package]] +name = "candle-core" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ccf5ee3532e66868516d9b315f73aec9f34ea1a37ae98514534d458915dbf1" +dependencies = [ + "byteorder", + "candle-kernels", + "candle-metal-kernels", + "cudarc", + "gemm 0.17.1", + "half", + "memmap2", + "metal 0.27.0", + "num-traits", + "num_cpus", + "rand 0.9.0", + "rand_distr", + "rayon", + "safetensors", + "thiserror", + "ug", + "ug-cuda", + "ug-metal", + "yoke", + "zip", +] + +[[package]] +name = "candle-flash-attn" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc08e6b4740a54e30d70cca5759de9c805b85279de662b091ea135077f24ce3" +dependencies = [ + "anyhow", + "bindgen_cuda", + "candle-core", + "half", +] + +[[package]] +name = "candle-kernels" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a10885bd902fad1b8518ba2b22369aaed88a3d94e123533ad3ca73db33b1c8ca" +dependencies = [ + "bindgen_cuda", +] + +[[package]] +name = "candle-metal-kernels" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52c85c21827c28db94e7112e364abe7e0cf8d2b022c014edf08642be6b94f21e" +dependencies = [ + "metal 0.27.0", + "once_cell", + "thiserror", + "tracing", +] + +[[package]] +name = "candle-nn" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1160c3b63f47d40d91110a3e1e1e566ae38edddbbf492a60b40ffc3bc1ff38" +dependencies = [ + "candle-core", + "candle-metal-kernels", + "half", + "metal 0.27.0", + "num-traits", + "rayon", + "safetensors", + "serde", + "thiserror", +] + +[[package]] +name = "candle-transformers" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94a0900d49f8605e0e7e6693a1f560e6271279de98e5fa369e7abf3aac245020" +dependencies = [ + "byteorder", + "candle-core", + "candle-nn", + "fancy-regex", + "num-traits", + "rand 0.9.0", + "rayon", + "serde", + "serde_json", + "serde_plain", + "tracing", +] + +[[package]] +name = "cargo-platform" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +dependencies = [ + "serde", +] + +[[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", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "castaway" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +dependencies = [ + "rustversion", +] + +[[package]] +name = "cc" +version = "1.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "windows-link", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_derive" +version = "4.5.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[package]] +name = "cmake" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +dependencies = [ + "cc", +] + +[[package]] +name = "color-eyre" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "compact_str" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "ryu", + "static_assertions", +] + +[[package]] +name = "console" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" +dependencies = [ + "encode_unicode", + "libc", + "once_cell", + "unicode-width 0.2.0", + "windows-sys 0.59.0", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b" +dependencies = [ + "bindgen 0.70.1", +] + +[[package]] +name = "cpal" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "dasp_sample", + "jni", + "js-sys", + "libc", + "mach2", + "ndk", + "ndk-context", + "oboe", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.54.0", +] + +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.9.0", + "crossterm_winapi", + "futures-core", + "libc", + "mio 0.8.11", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crunchy" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" + +[[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 = "cudarc" +version = "0.13.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "486c221362668c63a1636cfa51463b09574433b39029326cff40864b3ba12b6e" +dependencies = [ + "half", + "libloading", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + +[[package]] +name = "data-encoding" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" + +[[package]] +name = "deranged" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_arbitrary" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "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 0.48.0", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "dyn-stack" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" +dependencies = [ + "bytemuck", + "reborrow", +] + +[[package]] +name = "dyn-stack" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490bd48eb68fffcfed519b4edbfd82c69cbe741d175b84f0e0cbe8c57cbe0bdd" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-as-inner" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] + +[[package]] +name = "extended" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365" + +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "flate2" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" +dependencies = [ + "crc32fast", + "miniz_oxide 0.8.8", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +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.100", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +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 = "gemm" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32" +dependencies = [ + "dyn-stack 0.10.0", + "gemm-c32 0.17.1", + "gemm-c64 0.17.1", + "gemm-common 0.17.1", + "gemm-f16 0.17.1", + "gemm-f32 0.17.1", + "gemm-f64 0.17.1", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "seq-macro", +] + +[[package]] +name = "gemm" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab96b703d31950f1aeddded248bc95543c9efc7ac9c4a21fda8703a83ee35451" +dependencies = [ + "dyn-stack 0.13.0", + "gemm-c32 0.18.2", + "gemm-c64 0.18.2", + "gemm-common 0.18.2", + "gemm-f16 0.18.2", + "gemm-f32 0.18.2", + "gemm-f64 0.18.2", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 11.5.0", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0" +dependencies = [ + "dyn-stack 0.10.0", + "gemm-common 0.17.1", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6db9fd9f40421d00eea9dd0770045a5603b8d684654816637732463f4073847" +dependencies = [ + "dyn-stack 0.13.0", + "gemm-common 0.18.2", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 11.5.0", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a" +dependencies = [ + "dyn-stack 0.10.0", + "gemm-common 0.17.1", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfcad8a3d35a43758330b635d02edad980c1e143dc2f21e6fd25f9e4eada8edf" +dependencies = [ + "dyn-stack 0.13.0", + "gemm-common 0.18.2", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 11.5.0", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8" +dependencies = [ + "bytemuck", + "dyn-stack 0.10.0", + "half", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp 0.18.22", + "raw-cpuid 10.7.0", + "rayon", + "seq-macro", + "sysctl 0.5.5", +] + +[[package]] +name = "gemm-common" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a352d4a69cbe938b9e2a9cb7a3a63b7e72f9349174a2752a558a8a563510d0f3" +dependencies = [ + "bytemuck", + "dyn-stack 0.13.0", + "half", + "libm", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp 0.21.4", + "raw-cpuid 11.5.0", + "rayon", + "seq-macro", + "sysctl 0.6.0", +] + +[[package]] +name = "gemm-f16" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4" +dependencies = [ + "dyn-stack 0.10.0", + "gemm-common 0.17.1", + "gemm-f32 0.17.1", + "half", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f16" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff95ae3259432f3c3410eaa919033cd03791d81cebd18018393dc147952e109" +dependencies = [ + "dyn-stack 0.13.0", + "gemm-common 0.18.2", + "gemm-f32 0.18.2", + "half", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 11.5.0", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113" +dependencies = [ + "dyn-stack 0.10.0", + "gemm-common 0.17.1", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc8d3d4385393304f407392f754cd2dc4b315d05063f62cf09f47b58de276864" +dependencies = [ + "dyn-stack 0.13.0", + "gemm-common 0.18.2", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 11.5.0", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0" +dependencies = [ + "dyn-stack 0.10.0", + "gemm-common 0.17.1", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b2a4f76ce4b8b16eadc11ccf2e083252d8237c1b589558a49b0183545015bd" +dependencies = [ + "dyn-stack 0.13.0", + "gemm-common 0.18.2", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 11.5.0", + "seq-macro", +] + +[[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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap", + "slab", + "tokio", + "tokio-util 0.7.14", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.3.1", + "indexmap", + "slab", + "tokio", + "tokio-util 0.7.14", + "tracing", +] + +[[package]] +name = "half" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +dependencies = [ + "bytemuck", + "cfg-if", + "crunchy", + "num-traits", + "rand 0.9.0", + "rand_distr", +] + +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e" + +[[package]] +name = "hf-hub" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" +dependencies = [ + "dirs", + "futures", + "indicatif", + "log", + "native-tls", + "num_cpus", + "rand 0.8.5", + "reqwest", + "serde", + "serde_json", + "thiserror", + "tokio", + "ureq", +] + +[[package]] +name = "home" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.3.1", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" + +[[package]] +name = "hyper" +version = "0.14.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.8", + "http 1.3.1", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.32", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2" +dependencies = [ + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "hyper 1.6.0", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core 0.61.0", +] + +[[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.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indexmap" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indicatif" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" +dependencies = [ + "console", + "number_prefix", + "portable-atomic", + "unicode-width 0.2.0", + "web-time", +] + +[[package]] +name = "indoc" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" + +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "iri-string" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "is-terminal" +version = "0.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +dependencies = [ + "hermit-abi 0.5.0", + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +dependencies = [ + "getrandom 0.3.2", + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "keccak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +dependencies = [ + "cpufeatures", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[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.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" + +[[package]] +name = "libloading" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libm" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.9.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + +[[package]] +name = "litemap" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "lru" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "matrixmultiply" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" +dependencies = [ + "autocfg", + "rawpointer", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +dependencies = [ + "libc", + "stable_deref_trait", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.9.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "metal" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +dependencies = [ + "bitflags 2.9.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "mimi-pyo3" +version = "0.5.2" +dependencies = [ + "anyhow", + "moshi", + "numpy", + "pyo3", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "mio" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + +[[package]] +name = "monostate" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aafe1be9d0c75642e3e50fedc7ecadf1ef1cbce6eb66462153fc44245343fbee" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c402a4092d5e204f32c9e155431046831fa712637043c58cb73bc6bc6c9663b5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "moshi" +version = "0.5.2" +dependencies = [ + "candle-core", + "candle-flash-attn", + "candle-nn", + "candle-transformers", + "rayon", + "serde", + "tracing", +] + +[[package]] +name = "moshi-backend" +version = "0.5.2" +dependencies = [ + "anyhow", + "axum", + "axum-server", + "base64ct", + "bincode", + "byteorder", + "candle-core", + "candle-nn", + "candle-transformers", + "clap", + "env_logger", + "futures-util", + "hf-hub", + "http 1.3.1", + "lazy_static", + "log", + "moshi", + "ogg", + "opus", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rcgen", + "regex", + "rubato", + "sentencepiece", + "serde", + "serde_json", + "sha3", + "symphonia", + "tokenizers", + "tokio", + "tokio-rustls", + "tower 0.4.13", + "tower-http", + "tracing", + "tracing-appender", + "tracing-chrome", + "tracing-subscriber", + "vergen", +] + +[[package]] +name = "moshi-cli" +version = "0.5.2" +dependencies = [ + "anyhow", + "byteorder", + "candle-core", + "candle-nn", + "candle-transformers", + "clap", + "color-eyre", + "cpal", + "crossterm", + "env_logger", + "futures", + "futures-util", + "log", + "moshi", + "native-tls", + "ogg", + "opus", + "rand 0.8.5", + "ratatui", + "rubato", + "rustls 0.23.26", + "sentencepiece", + "serde_json", + "symphonia", + "tokio", + "tokio-tungstenite 0.21.0", + "toml", + "tracing", + "tracing-chrome", + "tracing-subscriber", + "tui-logger", +] + +[[package]] +name = "native-tls" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndarray" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882ed72dce9365842bf196bdeedf5055305f11fc8c03dee7bb0194a6cad34841" +dependencies = [ + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "portable-atomic", + "portable-atomic-util", + "rawpointer", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.9.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "bytemuck", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "numpy" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b94caae805f998a07d33af06e6a3891e38556051b8045c615470a71590e13e78" +dependencies = [ + "libc", + "ndarray", + "num-complex", + "num-integer", + "num-traits", + "pyo3", + "rustc-hash 2.1.1", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "oboe" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" +dependencies = [ + "jni", + "ndk", + "ndk-context", + "num-derive 0.4.2", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" +dependencies = [ + "cc", +] + +[[package]] +name = "ogg" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdab8dcd8d4052eaacaf8fb07a3ccd9a6e26efadb42878a413c68fc4af1dee2b" +dependencies = [ + "byteorder", + "bytes", + "futures-core", + "futures-io", + "pin-project", + "tokio", + "tokio-util 0.6.10", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[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 = "openssl" +version = "0.10.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" +dependencies = [ + "bitflags 2.9.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "openssl-probe" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + +[[package]] +name = "openssl-sys" +version = "0.9.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" +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 = "opus" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6526409b274a7e98e55ff59d96aafd38e6cd34d46b7dbbc32ce126dffcd75e8e" +dependencies = [ + "audiopus_sys", + "libc", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pem" +version = "3.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3" +dependencies = [ + "base64 0.22.1", + "serde", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[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.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "portable-atomic" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + +[[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.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" +dependencies = [ + "proc-macro2", + "syn 2.0.100", +] + +[[package]] +name = "primal-check" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08" +dependencies = [ + "num-integer", +] + +[[package]] +name = "proc-macro-crate" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-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 = "pulp" +version = "0.18.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0a01a0dc67cf4558d279f0c25b0962bd08fc6dec0137699eae304103e882fe6" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + +[[package]] +name = "pulp" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fb7a99b37aaef4c7dd2fd15a819eb8010bfc7a2c2155230d51f497316cad6d" +dependencies = [ + "bytemuck", + "cfg-if", + "libm", + "num-complex", + "reborrow", + "version_check", +] + +[[package]] +name = "pyo3" +version = "0.23.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.23.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.23.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.23.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.23.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[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" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", + "zerocopy", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.15", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.2", +] + +[[package]] +name = "rand_distr" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463" +dependencies = [ + "num-traits", + "rand 0.9.0", +] + +[[package]] +name = "ratatui" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3" +dependencies = [ + "bitflags 2.9.0", + "cassowary", + "compact_str", + "crossterm", + "itertools 0.13.0", + "lru", + "paste", + "stability", + "strum", + "strum_macros", + "unicode-segmentation", + "unicode-truncate", + "unicode-width 0.1.14", +] + +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "raw-cpuid" +version = "11.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146" +dependencies = [ + "bitflags 2.9.0", +] + +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rcgen" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2" +dependencies = [ + "pem", + "ring", + "rustls-pki-types", + "time", + "yasna", +] + +[[package]] +name = "realfft" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "390252372b7f2aac8360fc5e72eba10136b166d6faeed97e6d0c8324eb99b2b1" +dependencies = [ + "rustfft", +] + +[[package]] +name = "reborrow" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" + +[[package]] +name = "redox_syscall" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" +dependencies = [ + "bitflags 2.9.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom 0.2.15", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.15", + "libc", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rubato" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5d18b486e7d29a408ef3f825bc1327d8f87af091c987ca2f5b734625940e234" +dependencies = [ + "num-complex", + "num-integer", + "num-traits", + "realfft", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfft" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" +dependencies = [ + "num-complex", + "num-integer", + "num-traits", + "primal-check", + "strength_reduce", + "transpose", + "version_check", +] + +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.9.0", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +dependencies = [ + "bitflags 2.9.0", + "errno", + "libc", + "linux-raw-sys 0.9.4", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" +dependencies = [ + "aws-lc-rs", + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.103.1", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "safetensors" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44560c11236a6130a46ce36c836a62936dc81ebf8c36a37947423571be0e55b6" +dependencies = [ + "serde", + "serde_json", +] + +[[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.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.9.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" +dependencies = [ + "serde", +] + +[[package]] +name = "sentencepiece" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ae716e54c860d65df824a5b606b464e8f2acfc4a7fe93b2a1f6b9a173d1fff5" +dependencies = [ + "libc", + "num-derive 0.3.3", + "num-traits", + "prost", + "prost-derive", + "sentencepiece-sys", + "thiserror", +] + +[[package]] +name = "sentencepiece-sys" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c66315e346665798e116d1c21201434715e13dd691f3f33f6276746d0b71f" +dependencies = [ + "cc", + "cmake", + "pkg-config", +] + +[[package]] +name = "seq-macro" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "serde_json" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_plain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest", + "keccak", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio 0.8.11", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" + +[[package]] +name = "socket2" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "stability" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" +dependencies = [ + "quote", + "syn 2.0.100", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strength_reduce" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.100", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "symphonia" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9" +dependencies = [ + "lazy_static", + "symphonia-bundle-flac", + "symphonia-bundle-mp3", + "symphonia-codec-aac", + "symphonia-codec-adpcm", + "symphonia-codec-alac", + "symphonia-codec-pcm", + "symphonia-codec-vorbis", + "symphonia-core", + "symphonia-format-caf", + "symphonia-format-isomp4", + "symphonia-format-mkv", + "symphonia-format-ogg", + "symphonia-format-riff", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-bundle-flac" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e34f34298a7308d4397a6c7fbf5b84c5d491231ce3dd379707ba673ab3bd97" +dependencies = [ + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-bundle-mp3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-codec-aac" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdbf25b545ad0d3ee3e891ea643ad115aff4ca92f6aec472086b957a58522f70" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-adpcm" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94e1feac3327cd616e973d5be69ad36b3945f16b06f19c6773fc3ac0b426a0f" +dependencies = [ + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-alac" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d8a6666649a08412906476a8b0efd9b9733e241180189e9f92b09c08d0e38f3" +dependencies = [ + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-pcm" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f395a67057c2ebc5e84d7bb1be71cce1a7ba99f64e0f0f0e303a03f79116f89b" +dependencies = [ + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-vorbis" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30" +dependencies = [ + "log", + "symphonia-core", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-core" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" +dependencies = [ + "arrayvec", + "bitflags 1.3.2", + "bytemuck", + "lazy_static", + "log", +] + +[[package]] +name = "symphonia-format-caf" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e43c99c696a388295a29fe71b133079f5d8b18041cf734c5459c35ad9097af50" +dependencies = [ + "log", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-format-isomp4" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfdf178d697e50ce1e5d9b982ba1b94c47218e03ec35022d9f0e071a16dc844" +dependencies = [ + "encoding_rs", + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-format-mkv" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb43471a100f7882dc9937395bd5ebee8329298e766250b15b3875652fe3d6f" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-format-ogg" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931" +dependencies = [ + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-format-riff" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f7be232f962f937f4b7115cbe62c330929345434c834359425e043bfd15f50" +dependencies = [ + "extended", + "log", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-metadata" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c" +dependencies = [ + "encoding_rs", + "lazy_static", + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-utils-xiph" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe" +dependencies = [ + "symphonia-core", + "symphonia-metadata", +] + +[[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.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "sysctl" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" +dependencies = [ + "bitflags 2.9.0", + "byteorder", + "enum-as-inner", + "libc", + "thiserror", + "walkdir", +] + +[[package]] +name = "sysctl" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01198a2debb237c62b6826ec7081082d951f46dbb64b0e8c7649a452230d1dfc" +dependencies = [ + "bitflags 2.9.0", + "byteorder", + "enum-as-inner", + "libc", + "thiserror", + "walkdir", +] + +[[package]] +name = "sysinfo" +version = "0.30.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "windows 0.52.0", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" +dependencies = [ + "fastrand", + "getrandom 0.3.2", + "once_cell", + "rustix 1.0.5", + "windows-sys 0.59.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" + +[[package]] +name = "time-macros" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tokenizers" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dd47962b0ba36e7fd33518fbf1754d136fd1474000162bbf2a8b5fcb2d3654d" +dependencies = [ + "aho-corasick", + "clap", + "derive_builder", + "esaxx-rs", + "getrandom 0.2.15", + "indicatif", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand 0.8.5", + "rayon", + "rayon-cond", + "regex", + "regex-syntax", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] +name = "tokio" +version = "1.44.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio 1.0.3", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[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 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "native-tls", + "rustls 0.22.4", + "tokio", + "tokio-native-tls", + "tungstenite 0.21.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.24.0", +] + +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 1.0.2", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "async-compression", + "base64 0.21.7", + "bitflags 2.9.0", + "bytes", + "futures-core", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "http-range-header", + "httpdate", + "iri-string", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "tokio", + "tokio-util 0.7.14", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", + "uuid", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "tracing-chrome" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf0a738ed5d6450a9fb96e86a23ad808de2b727fd1394585da5cdd6788ffe724" +dependencies = [ + "serde_json", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-core" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "transpose" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" +dependencies = [ + "num-integer", + "strength_reduce", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tui-logger" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd1a0f217c2180e736bc9f3282fea4af182483532c6e719081b6b1c6d6be90" +dependencies = [ + "chrono", + "fxhash", + "lazy_static", + "log", + "parking_lot", + "ratatui", +] + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.3.1", + "httparse", + "log", + "native-tls", + "rand 0.8.5", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.3.1", + "httparse", + "log", + "rand 0.8.5", + "sha1", + "thiserror", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" + +[[package]] +name = "ug" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03719c61a91b51541f076dfdba45caacf750b230cefaa4b32d6f5411c3f7f437" +dependencies = [ + "gemm 0.18.2", + "half", + "libloading", + "memmap2", + "num", + "num-traits", + "num_cpus", + "rayon", + "safetensors", + "serde", + "thiserror", + "tracing", + "yoke", +] + +[[package]] +name = "ug-cuda" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50758486d7941f8b0a636ba7e29455c07071f41590beac1fd307ec893e8db69a" +dependencies = [ + "cudarc", + "half", + "serde", + "thiserror", + "ug", +] + +[[package]] +name = "ug-metal" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a02ddc17bf32f7dcaaf016b6735f7198082b82f122df7b3ca15d8ead5911ccef" +dependencies = [ + "half", + "metal 0.29.0", + "objc", + "serde", + "thiserror", + "ug", +] + +[[package]] +name = "unicase" +version = "2.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "unicode-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-truncate" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" +dependencies = [ + "itertools 0.13.0", + "unicode-segmentation", + "unicode-width 0.1.14", +] + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "unindent" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls 0.23.26", + "rustls-pki-types", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +dependencies = [ + "getrandom 0.3.2", +] + +[[package]] +name = "valuable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vergen" +version = "8.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" +dependencies = [ + "anyhow", + "cargo_metadata", + "cfg-if", + "regex", + "rustc_version", + "rustversion", + "sysinfo", + "time", +] + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn 2.0.100", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +dependencies = [ + "cfg-if", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "web-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.44", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result 0.3.2", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "windows-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags 2.9.0", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time", +] + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.8.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "zip" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "indexmap", + "num_enum", + "thiserror", +] + +[[package]] +name = "zstd" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.15+zstd.1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/by-name/mo/moshi/package.nix b/pkgs/by-name/mo/moshi/package.nix new file mode 100644 index 000000000000..94fd6af59326 --- /dev/null +++ b/pkgs/by-name/mo/moshi/package.nix @@ -0,0 +1,141 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + + # nativeBuildInputs + pkg-config, + python3, + autoPatchelfHook, + autoAddDriverRunpath, + + # buildInputs + libopus, + openssl, + sentencepiece, + alsa-lib, + + # passthru + moshi, + nix-update-script, + + config, + cudaPackages, + cudaCapability ? null, +}: + +let + minRequiredCudaCapability = "6.1"; # build fails with 6.0 + inherit (cudaPackages.flags) cudaCapabilities; + cudaCapabilityString = + if cudaCapability == null then + (builtins.head ( + (builtins.filter (cap: lib.versionAtLeast cap minRequiredCudaCapability) cudaCapabilities) + ++ [ + (lib.warn "moshi doesn't support ${lib.concatStringsSep " " cudaCapabilities}" minRequiredCudaCapability) + ] + )) + else + cudaCapability; + cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString); +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "moshi"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "kyutai-labs"; + repo = "moshi"; + tag = "v${finalAttrs.version}"; + hash = "sha256-tQQTMwvJauzF24S1N2m2slZAHZvklCkPOTrhLvlsNVg="; + }; + + sourceRoot = "${finalAttrs.src.name}/rust"; + + # Upstream does not track their Cargo.lock + # https://github.com/kyutai-labs/moshi/issues/256 + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = + [ + pkg-config + python3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Unable to find libclang: "couldn't find any valid shared libraries matching: ['libclang.dylib'] + rustPlatform.bindgenHook + ] + ++ lib.optionals config.cudaSupport [ + # WARNING: autoAddDriverRunpath must run AFTER autoPatchelfHook + # Otherwise, autoPatchelfHook removes driverLink from RUNPATH + autoPatchelfHook + autoAddDriverRunpath + + cudaPackages.cuda_nvcc + ]; + + buildInputs = + [ + libopus + openssl + sentencepiece + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ] + ++ lib.optionals config.cudaSupport [ + cudaPackages.cuda_cccl + cudaPackages.cuda_cudart + cudaPackages.cuda_nvrtc + cudaPackages.libcublas + cudaPackages.libcurand + ]; + + buildFeatures = + lib.optionals stdenv.hostPlatform.isDarwin [ "metal" ] + ++ lib.optionals config.cudaSupport [ "cuda" ]; + + env = lib.optionalAttrs config.cudaSupport { + CUDA_COMPUTE_CAP = cudaCapability'; + + # We already list CUDA dependencies in buildInputs + # We only set CUDA_TOOLKIT_ROOT_DIR to satisfy some redundant checks from upstream + CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart; + }; + + appendRunpaths = lib.optionals config.cudaSupport [ + (lib.makeLibraryPath [ + cudaPackages.libcublas + cudaPackages.libcurand + ]) + ]; + + passthru = { + tests = { + withCuda = lib.optionalAttrs stdenv.hostPlatform.isLinux ( + moshi.override { config.cudaSupport = true; } + ); + }; + updateScript = nix-update-script { + extraArgs = [ "--generate-lockfile" ]; + }; + }; + + meta = { + description = "Rust implementation of moshi, a real-time voice AI"; + homepage = "https://github.com/kyutai-labs/moshi"; + # The rust implementation is licensed under Apache + # https://github.com/kyutai-labs/moshi/tree/main/rust#license + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.all; + mainProgram = "moshi-cli"; + }; +}) diff --git a/pkgs/by-name/mo/mount-zip/package.nix b/pkgs/by-name/mo/mount-zip/package.nix index 214e7c729178..26cbce771521 100644 --- a/pkgs/by-name/mo/mount-zip/package.nix +++ b/pkgs/by-name/mo/mount-zip/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index c826757c6c7a..113178672eb1 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -9,18 +9,18 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.14.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-QpJYpHow9/vEPrq82XtbDosGz8lqVB0cOPQmY7Dx78Q="; + hash = "sha256-uV0umUoJkYgmjWjv8GMnk5TRRbCCJS1ut3VV1HvkaAw="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-QeRCCu7d4fdRfiw3qdbyFk+N0nT+IYKVJ/NvieejVQg="; + cargoHash = "sha256-zDgAGOuK0Jkmm554qZsaA/ABFhuupJ+WToO8HSPp7Xc="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 diff --git a/pkgs/by-name/mo/mousai/package.nix b/pkgs/by-name/mo/mousai/package.nix index 3a45a524d8e9..1458205511a4 100644 --- a/pkgs/by-name/mo/mousai/package.nix +++ b/pkgs/by-name/mo/mousai/package.nix @@ -73,7 +73,8 @@ stdenv.mkDerivation rec { mainProgram = "mousai"; homepage = "https://github.com/SeaDve/Mousai"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ dotlambda ]; + teams = [ teams.gnome-circle ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 463cc274b641..51843cfc6ac1 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -6,7 +6,7 @@ php, phpCfg ? null, withPostgreSQL ? true, # “strongly recommended” according to docs - withMySQL ? false, + withMariaDB ? false, minifyStaticFiles ? false, # default files are often not minified esbuild, lightningcss, @@ -44,13 +44,13 @@ let in php.buildComposerProject2 (finalAttrs: { pname = "movim"; - version = "0.29.2"; + version = "0.30.1"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; tag = "v${finalAttrs.version}"; - hash = "sha256-/u8/9tn0X+IwXKyK3S5uA9X8IRsg5xDdUPpnvxOIaYc="; + hash = "sha256-MjP1rLyWJWrUAHrOKAwGN3A0wIq4iPaXlaUbtPs3F6U="; }; php = php.buildEnv ( @@ -58,30 +58,24 @@ php.buildComposerProject2 (finalAttrs: { extensions = ( { all, enabled }: enabled - ++ (with all; [ - curl - dom - gd - imagick - mbstring - pdo - simplexml - ]) - ++ lib.optionals withPostgreSQL ( - with all; - [ - pdo_pgsql - pgsql - ] - ) - ++ lib.optionals withMySQL ( - with all; - [ - mysqli - mysqlnd - pdo_mysql - ] - ) + ++ [ + all.curl + all.dom + all.gd + all.imagick + all.mbstring + all.pdo + all.simplexml + ] + ++ lib.optionals withPostgreSQL [ + all.pdo_pgsql + all.pgsql + ] + ++ lib.optionals withMariaDB [ + all.mysqli + all.mysqlnd + all.pdo_mysql + ] ); } // lib.optionalAttrs (phpCfg != null) { @@ -94,11 +88,7 @@ php.buildComposerProject2 (finalAttrs: { ++ lib.optional minify.style.enable lightningcss ++ lib.optional minify.svg.enable scour; - # no listed license - # pinned commonmark - composerStrictValidation = false; - - vendorHash = "sha256-ikIAIPq8Yj27vGmJxeViYJ5SWiZtE68CIE526glZPlo="; + vendorHash = "sha256-7jb4/UgnMcXtLCihwk4rr0HLw99FgiYeYJVATGxM/D4="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; diff --git a/pkgs/by-name/mo/movine/package.nix b/pkgs/by-name/mo/movine/package.nix index 34f8a00ce89c..0539ec1e8bf5 100644 --- a/pkgs/by-name/mo/movine/package.nix +++ b/pkgs/by-name/mo/movine/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Migration manager written in Rust, that attempts to be smart yet minimal"; diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix index e285137e459f..b4575cb3f5ca 100644 --- a/pkgs/by-name/mo/movit/package.nix +++ b/pkgs/by-name/mo/movit/package.nix @@ -6,9 +6,10 @@ SDL2, fftw, gtest, - darwin, eigen, libepoxy, + libGL, + libX11, }: stdenv.mkDerivation rec { @@ -31,16 +32,13 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - SDL2 - fftw - gtest - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL - darwin.libobjc - ]; + buildInputs = [ + SDL2 + fftw + gtest + libGL + libX11 + ]; propagatedBuildInputs = [ eigen diff --git a/pkgs/by-name/mo/mox/package.nix b/pkgs/by-name/mo/mox/package.nix index 6c4c5addeb13..8997a9604b75 100644 --- a/pkgs/by-name/mo/mox/package.nix +++ b/pkgs/by-name/mo/mox/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mox"; - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "mjl-"; repo = "mox"; tag = "v${version}"; - hash = "sha256-cBTY4SjQxdM5jXantLws1ckGVn3/b0/iVPFunBy09YQ="; + hash = "sha256-apIV+nClXTUbmCssnvgG9UwpTNTHTe6FgLCxp14/s0A="; }; # set the version during buildtime diff --git a/pkgs/by-name/mo/mozc/package.nix b/pkgs/by-name/mo/mozc/package.nix index c3a13ad557a1..02cfa443c83f 100644 --- a/pkgs/by-name/mo/mozc/package.nix +++ b/pkgs/by-name/mo/mozc/package.nix @@ -106,7 +106,6 @@ buildBazelPackage rec { license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ - ericsagnes pineapplehunter ]; }; diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index e9890e4fcbdd..22487b17c307 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -4,6 +4,7 @@ cargo, cmake, fetchFromGitHub, + fetchpatch, go, lib, libcap, @@ -22,15 +23,36 @@ stdenv.mkDerivation (finalAttrs: { pname = "mozillavpn"; - version = "2.26.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-BKD8X4nPLyTtY0x06nCSRRK36XKucpnhvjJN8aZssUs="; + hash = "sha256-TfiEc5Lptr0ntp4buEEWbQTvNkVjZbdMWDv8CEZa6IM="; }; - patches = [ ]; + patches = [ + # Provide default args for LottieStatus::changed so moc can call it (#10420) + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/e5abe5714a5b506e398c088d21672f00d6f93240.patch"; + hash = "sha256-DU5wQ1DDF8DbmMIlohoEIDJ7/9+9GVwrvsr51T9bGx8="; + }) + # Remove Qt.labls.qmlmodels usage (#10422) + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/4497972b1bf7b7f215dc6c1227d76d6825f5b958.patch"; + hash = "sha256-RPRdARM/jXSHmTGGjiOrfJ7KVejp3JmUfsN5pmKYPuY="; + }) + # Qt compat: Make sure to include what we use + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/0909d43447a7ddbc6ec20d108637524552848bd6.patch"; + hash = "sha256-Hpn69hQxa269XH+Ku/MYD2GwdFhfCX4yoVRCEDfIOKc="; + }) + # Use QDesktopUnixServices after qt 6.9.0 + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/10424/commits/81e66044388459ffe2b08804ab5a326586ac7113.patch"; + hash = "sha256-+v3NoTAdkjKEyBPbbJZQ2d11hJMyE3E4B9uYUerVa7c="; + }) + ]; netfilter = buildGoModule { pname = "${finalAttrs.pname}-netfilter"; @@ -45,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-tVTXlGO969qPR9/TbOJbDdOiwOI1PT11MvNYdLqgDlo="; + hash = "sha256-SGC+YT5ATV/ZaP/wrm3c31OQBw6Pk8ZSXjxEPFdP2f8="; }; buildInputs = [ diff --git a/pkgs/by-name/mo/mozphab/package.nix b/pkgs/by-name/mo/mozphab/package.nix index d9869dc02a6f..ce8fc76cb7dd 100644 --- a/pkgs/by-name/mo/mozphab/package.nix +++ b/pkgs/by-name/mo/mozphab/package.nix @@ -11,27 +11,24 @@ python3.pkgs.buildPythonApplication rec { pname = "mozphab"; - version = "1.5.1"; - format = "pyproject"; + version = "1.9.0"; + pyproject = true; src = fetchFromGitHub { owner = "mozilla-conduit"; repo = "review"; tag = version; - hash = "sha256-HxwQ+mGtjnruppPAD01QUg3aca+k5vpj814BWM+3VfQ="; + hash = "sha256-CVpsq9YoEww47uruHYEsJk9YQ39ZFQsMdL0nBc8AHUM="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "glean-sdk>=50.0.1,==50.*" "glean-sdk" - ''; - - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools setuptools-scm ]; - propagatedBuildInputs = with python3.pkgs; [ + pythonRelaxDeps = [ "glean-sdk" ]; + + dependencies = with python3.pkgs; [ colorama distro glean-sdk diff --git a/pkgs/by-name/mo/mozwire/package.nix b/pkgs/by-name/mo/mozwire/package.nix new file mode 100644 index 000000000000..081f399a73db --- /dev/null +++ b/pkgs/by-name/mo/mozwire/package.nix @@ -0,0 +1,31 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "MozWire"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "NilsIrl"; + repo = pname; + rev = "v${version}"; + hash = "sha256-2i8C1XgfI3MXnwXZzY6n8tIcw45G9h3vZqRlFaVoLH0="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-UEo/CSRg1hS/BIEQTEgqfwwz1LAMDdjKwV8bDyspX7o="; + + meta = with lib; { + description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; + homepage = "https://github.com/NilsIrl/MozWire"; + license = licenses.gpl3; + maintainers = with maintainers; [ + siraben + nilsirl + ]; + mainProgram = "mozwire"; + }; +} diff --git a/pkgs/by-name/mp/mp3splt/package.nix b/pkgs/by-name/mp/mp3splt/package.nix deleted file mode 100644 index 5721630bef23..000000000000 --- a/pkgs/by-name/mp/mp3splt/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - libmp3splt, -}: - -stdenv.mkDerivation rec { - pname = "mp3splt"; - version = "2.6.2"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1aiv20gypb6r84qabz8gblk8vi42cg3x333vk2pi3fyqvl82phry"; - }; - - configureFlags = [ - "--enable-oggsplt-symlink" - "--enable-flacsplt-symlink" - ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libmp3splt ]; - - outputs = [ - "out" - "man" - ]; - - meta = with lib; { - description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; - homepage = "https://sourceforge.net/projects/mp3splt/"; - license = licenses.gpl2; - maintainers = [ maintainers.bosu ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/by-name/mp/mpack/package.nix b/pkgs/by-name/mp/mpack/package.nix index 5fc18538ed0c..567fb303f7ce 100644 --- a/pkgs/by-name/mp/mpack/package.nix +++ b/pkgs/by-name/mp/mpack/package.nix @@ -94,7 +94,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utilities for encoding and decoding binary files in MIME"; license = licenses.free; - platforms = platforms.linux; maintainers = with maintainers; [ tomodachi94 ]; }; } diff --git a/pkgs/by-name/mp/mpb/package.nix b/pkgs/by-name/mp/mpb/package.nix index 0a2a79e61f27..8f9bd6ee639e 100644 --- a/pkgs/by-name/mp/mpb/package.nix +++ b/pkgs/by-name/mp/mpb/package.nix @@ -19,13 +19,13 @@ assert !lapack.isILP64; stdenv.mkDerivation rec { pname = "mpb"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "NanoComp"; repo = "mpb"; tag = "v${version}"; - hash = "sha256-+2cMjZSGdfngtGoAeZRPRPBDvflTEIOWO8Se0W6jv9k="; + hash = "sha256-naxVKD7pxefb/ht5Pa4e/T9eDzlZ0raNYPSvKNaZUn8="; }; nativeBuildInputs = [ @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { doCheck = true; + preCheck = "export OMP_NUM_THREADS=2"; + meta = { description = "MIT Photonic-Bands: computation of photonic band structures in periodic media"; homepage = "https://mpb.readthedocs.io/en/latest/"; diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix index 589e27d4f32b..51578dd19063 100644 --- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix +++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence"; diff --git a/pkgs/by-name/mp/mpfr/package.nix b/pkgs/by-name/mp/mpfr/package.nix index 79de1ab9de90..9874292c6f8a 100644 --- a/pkgs/by-name/mp/mpfr/package.nix +++ b/pkgs/by-name/mp/mpfr/package.nix @@ -13,7 +13,7 @@ # files. stdenv.mkDerivation rec { - version = "4.2.1"; + version = "4.2.2"; pname = "mpfr"; src = fetchurl { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "https://www.mpfr.org/${pname}-${version}/${pname}-${version}.tar.xz" "mirror://gnu/mpfr/${pname}-${version}.tar.xz" ]; - hash = "sha256-J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; + hash = "sha256-tnugOD736KhWNzTi6InvXsPDuJigHQD6CmhprYHGzgE="; }; outputs = [ diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh index 6adad2b44076..be2203951c0f 100644 --- a/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh +++ b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh @@ -55,19 +55,21 @@ setupMpiCheck() { # The solution is to use a preset cpu topology file and disable ucx model. # Disable sysfs cpu topology directory discovery. - export PRTE_MCA_hwloc_use_topo_file="@topology@" + export HWLOC_XMLFILE="@topology@" # Use the network model ob1 instead of ucx. export OMPI_MCA_pml=ob1 ;; MPICH) # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo + export HYDRA_IFACE="@iface@" # Disable sysfs cpu topology directory discovery. export HWLOC_XMLFILE="@topology@" ;; MVAPICH) # Disable CPU pinning export MV2_ENABLE_AFFINITY=0 + # Disable sysfs cpu topology directory discovery. + export HWLOC_XMLFILE="@topology@" ;; esac diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix index a49e8e338bea..c771e87376fa 100644 --- a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix +++ b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix @@ -1,9 +1,14 @@ -{ callPackage, makeSetupHook }: +{ + callPackage, + makeSetupHook, + stdenv, +}: makeSetupHook { name = "mpi-checkPhase-hook"; substitutions = { + iface = if stdenv.hostPlatform.isDarwin then "lo0" else "lo"; topology = ./topology.xml; }; } ./mpi-check-hook.sh diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index 1dbc8f69ab0b..9498995027d8 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "mpls"; - version = "0.13.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "mhersson"; repo = "mpls"; tag = "v${version}"; - hash = "sha256-jcSi/ZdHP9kJRUaMkQdS6BuScp2GM4+iNGIoclYMljI="; + hash = "sha256-7uBhc4FRe9KxRloHJQoDb8JvKPcev2DuTftnMBnmiGs="; }; - vendorHash = "sha256-xILlYrwcnMWAPACeELwVKGUBIK9QbrUSR03xVmNXsnE="; + vendorHash = "sha256-zEJBB5xJBJuLZQ/+yDyoFbkYXpqEkRXuIIhReBPKi+g="; ldflags = [ "-s" diff --git a/pkgs/by-name/mp/mpop/package.nix b/pkgs/by-name/mp/mpop/package.nix new file mode 100644 index 000000000000..1fea4be45eba --- /dev/null +++ b/pkgs/by-name/mp/mpop/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchurl, + gnutls, + openssl, + gsasl, + libidn, + pkg-config, + nlsSupport ? true, + idnSupport ? true, + gsaslSupport ? true, + sslLibrary ? "gnutls", +}: +assert lib.assertOneOf "sslLibrary" sslLibrary [ + "gnutls" + "openssl" + "no" +]; + +stdenv.mkDerivation rec { + pname = "mpop"; + version = "1.4.21"; + + src = fetchurl { + url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; + sha256 = "sha256-TKDR4NATZv4+DPSQ2I0VTfURJ4+1lWOHE748pnVmWFU="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + lib.optional gsaslSupport gsasl + ++ lib.optional idnSupport libidn + ++ lib.optional (sslLibrary == "gnutls") gnutls + ++ lib.optional (sslLibrary == "openssl") openssl; + + configureFlags = [ + (lib.enableFeature nlsSupport "nls") + (lib.withFeature idnSupport "idn") + (lib.withFeature gsaslSupport "gsasl") + "--with-tls=${sslLibrary}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-macosx-keyring"; + + meta = with lib; { + description = "POP3 mail retrieval agent"; + homepage = "https://marlam.de/mpop"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/mp/mpris-notifier/package.nix b/pkgs/by-name/mp/mpris-notifier/package.nix index 6e52b2ecaa37..0bb272ac6609 100644 --- a/pkgs/by-name/mp/mpris-notifier/package.nix +++ b/pkgs/by-name/mp/mpris-notifier/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-5LDhxciLpDYd4isUQNx8LF3y7m6cfcuIF2atHj/kayg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Dependency-light, highly-customizable, XDG desktop notification generator for MPRIS status changes"; homepage = "https://github.com/l1na-forever/mpris-notifier"; diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix index 87e773853f24..9e8a43c35145 100644 --- a/pkgs/by-name/mp/mprocs/package.nix +++ b/pkgs/by-name/mp/mprocs/package.nix @@ -8,22 +8,22 @@ rustPlatform.buildRustPackage rec { pname = "mprocs"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "pvolok"; repo = "mprocs"; tag = "v${version}"; - hash = "sha256-bNA+P6Mnhxi6YH5gAUwvAPN7STUvwDnU/r/ZBYwzgrw="; + hash = "sha256-/FuvejcZoaHzlYh4zYDVS1WimzNMNbRZyM39OBi02VA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UnrwAff7Eer5Bpn2CTL2XOyM8J2Z2xofcH6d9eTr2yQ="; + cargoHash = "sha256-i9oQT2vpA5nAgQgVpxxfRPvCIb4w1emt1YsjMS6UPIk="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/mp/mpvpaper/package.nix b/pkgs/by-name/mp/mpvpaper/package.nix index 91d6d33634bd..69e25ab380e9 100644 --- a/pkgs/by-name/mp/mpvpaper/package.nix +++ b/pkgs/by-name/mp/mpvpaper/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "mpvpaper"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "GhostNaN"; repo = pname; rev = version; - sha256 = "sha256-uBitJM2Z5RFH4nfgdJ6ZbqkcMumu+K+3f6S49G7nEx8="; + sha256 = "sha256-JTlZSl8CZmWx7YTd0T58pwq10L1GKXNfAw0XlIsz7F8="; }; strictDeps = true; diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix index 0d8e05f9b4b0..75ff2b1b798a 100644 --- a/pkgs/by-name/mq/mqtt-explorer/package.nix +++ b/pkgs/by-name/mq/mqtt-explorer/package.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} - mv "build/mac/MQTT Explorer.app" $out/Applications + mv build/mac*/MQTT\ Explorer.app $out/Applications makeWrapper "$out/Applications/MQTT Explorer.app/Contents/MacOS/MQTT Explorer" \ $out/bin/mqtt-explorer diff --git a/pkgs/by-name/mq/mqttui/package.nix b/pkgs/by-name/mq/mqttui/package.nix index da132595b4cb..8a0f001b1788 100644 --- a/pkgs/by-name/mq/mqttui/package.nix +++ b/pkgs/by-name/mq/mqttui/package.nix @@ -1,26 +1,22 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "EdJoPaTo"; repo = "mqttui"; tag = "v${version}"; - hash = "sha256-q4C4YAs8Q1jHA5P2OApkFZnYM4/aZGxnE8Pd6Hmwd1I="; + hash = "sha256-wKqIDKng4pfqDuYtqFRh3UIeZQ4QzzFlLkQn5MXcVlU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pn4wmlMW8p6IAHrYjmvmZxNMjIJwJ2MYRsANz4D6xCU="; - - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + cargoHash = "sha256-gk5nA6np7dK4+j26aySNWfMZ9t/+7nZRaPsnhlDEnes="; meta = { description = "Terminal client for MQTT"; diff --git a/pkgs/by-name/mq/mqttx-cli/package.nix b/pkgs/by-name/mq/mqttx-cli/package.nix index 025e63baaec6..dd10d69c9d7a 100644 --- a/pkgs/by-name/mq/mqttx-cli/package.nix +++ b/pkgs/by-name/mq/mqttx-cli/package.nix @@ -1,7 +1,6 @@ { fetchFromGitHub, fetchYarnDeps, - fetchpatch, lib, mqttx-cli, nodejs, @@ -13,25 +12,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "mqttx-cli"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "emqx"; repo = "MQTTX"; tag = "v${finalAttrs.version}"; - hash = "sha256-IPIiSav6MPJmzetBgVw9fLGPjJ+JKS3oWMEfCJmEY84="; + hash = "sha256-kxK/c1tOwK9hCxX19um0z1MWBZQOwADYEh4xEqJNgWI="; }; - patches = [ - # moves @faker-js/faker from devDependencies to dependencies - # because the final package depends on it - # https://github.com/emqx/MQTTX/pull/1801 - (fetchpatch { - url = "https://github.com/emqx/MQTTX/commit/3d89c3a08477e9e2b5d83f2a222ceaa8c08e50ce.patch"; - hash = "sha256-Rd6YpGHsvAYD7/XCJq6dgvGeKfOiLh7IUQFr/AQz0mY="; - }) - ]; - yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/cli/yarn.lock"; hash = "sha256-vwPwSE6adxM1gkdsJBq3LH2eXze9yXADvnM90LsKjjo="; diff --git a/pkgs/by-name/mr/mrpack-install/package.nix b/pkgs/by-name/mr/mrpack-install/package.nix new file mode 100644 index 000000000000..aa232e169d9b --- /dev/null +++ b/pkgs/by-name/mr/mrpack-install/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + buildPackages, + installShellFiles, + nix-update-script, +}: + +let + version = "0.16.10"; +in +buildGoModule { + pname = "mrpack-install"; + inherit version; + + src = fetchFromGitHub { + owner = "nothub"; + repo = "mrpack-install"; + tag = "v${version}"; + hash = "sha256-mTAXFK97t10imdICpg0UI4YLF744oscJqoOIBG5GEkc="; + }; + + vendorHash = "sha256-az+NpP/hCIq2IfO8Bmn/qG3JVypeDljJ0jWg6yT6hks="; + + ldflags = [ + "-s" + "-w" + "-X github.com/nothub/mrpack-install/buildinfo.version=${version}" + "-X github.com/nothub/mrpack-install/buildinfo.date=1970-01-01T00:00:00Z" + ]; + + checkFlags = + let + skippedTests = [ + # Skip tests that require network access + "TestFetchMetadata" + "TestClient_VersionFromHash" + "TestClient_GetDependencies" + "TestClient_GetProjectVersions_Count" + "TestClient_GetVersion" + "TestClient_CheckProjectValidity_Slug" + "Test_GetProject_404" + "TestClient_GetProjects_Count" + "TestClient_GetProjectVersions_Filter_NoResults" + "Test_GetProject_Success" + "TestClient_CheckProjectValidity_Id" + "TestClient_GetLatestGameVersion" + "TestClient_GetProjectVersions_Filter_Results" + "TestClient_GetProjects_Slug" + "TestClient_GetVersions" + "TestGetPlayerUuid" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = + let + mrpack-install = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/mrpack-install"; + in + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + installShellCompletion --cmd mrpack-install \ + --bash <(${mrpack-install} completion bash) \ + --fish <(${mrpack-install} completion fish) \ + --zsh <(${mrpack-install} completion zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI application for installing Minecraft servers and Modrinth modpacks"; + homepage = "https://github.com/nothub/mrpack-install"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ encode42 ]; + mainProgram = "mrpack-install"; + }; +} diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.json b/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.json new file mode 100644 index 000000000000..b15409a33258 --- /dev/null +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.json @@ -0,0 +1,327 @@ +[ + { + "pname": "AutomaticGraphLayout", + "version": "1.1.12", + "hash": "sha256-Fe4pGr+Ln1FfgHD3Odq2WOTrhi2nD/jjnh2cKLC2pwo=" + }, + { + "pname": "AutomaticGraphLayout.Drawing", + "version": "1.1.12", + "hash": "sha256-KPyc4JxcQkGTeb5tceB3zRN8FqTj7jzimb97NOhZPl0=" + }, + { + "pname": "Avalonia", + "version": "11.0.0", + "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E=" + }, + { + "pname": "Avalonia", + "version": "11.1.3", + "hash": "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + }, + { + "pname": "Avalonia.AvaloniaEdit", + "version": "11.1.0", + "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.28", + "hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.29", + "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "11.1.3", + "hash": "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU=" + }, + { + "pname": "Avalonia.Controls.DataGrid", + "version": "11.1.3", + "hash": "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc=" + }, + { + "pname": "Avalonia.Desktop", + "version": "11.1.3", + "hash": "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w=" + }, + { + "pname": "Avalonia.Diagnostics", + "version": "11.1.3", + "hash": "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "11.1.3", + "hash": "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI=" + }, + { + "pname": "Avalonia.Native", + "version": "11.1.3", + "hash": "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.0.0", + "hash": "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.1.3", + "hash": "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.1.3", + "hash": "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM=" + }, + { + "pname": "Avalonia.Themes.Fluent", + "version": "11.1.3", + "hash": "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "11.1.3", + "hash": "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM=" + }, + { + "pname": "Avalonia.Win32", + "version": "11.1.3", + "hash": "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc=" + }, + { + "pname": "Avalonia.X11", + "version": "11.1.3", + "hash": "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw=" + }, + { + "pname": "DotUtils.StreamUtils.Sources", + "version": "0.0.8", + "hash": "sha256-KL5PkSsuZ9uPgtzK7rB0W6XGTcJQGqHoZqMLhpFR7tw=" + }, + { + "pname": "GuiLabs.Language.Xml", + "version": "1.2.93", + "hash": "sha256-4fvD+8QBxEpVqcQtZ+gE8GhY7Iaay4aFr5HWQ9LGeqk=" + }, + { + "pname": "HarfBuzzSharp", + "version": "7.3.0.2", + "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "7.3.0.2", + "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "7.3.0.2", + "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "7.3.0.2", + "hash": "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "7.3.0.2", + "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.0", + "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + }, + { + "pname": "Microsoft.Build.Framework", + "version": "17.5.0", + "hash": "sha256-FVomTQ8rZ5Ga09piFxSDFQ+b3gpC2ddZd+pQBSn5Csw=" + }, + { + "pname": "Microsoft.Build.Tasks.Git", + "version": "8.0.0", + "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" + }, + { + "pname": "Microsoft.Build.Utilities.Core", + "version": "17.5.0", + "hash": "sha256-W4bN0E9/DgEw0fxopXUhMK9tuGGwm0NYK3APytAzNRI=" + }, + { + "pname": "Microsoft.NET.StringTools", + "version": "17.5.0", + "hash": "sha256-9eoXaPQvt6YAeb+cK5/ekh3YFfjymZCzJAxsDsIPlMQ=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.SourceLink.Common", + "version": "8.0.0", + "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=" + }, + { + "pname": "Microsoft.SourceLink.GitHub", + "version": "8.0.0", + "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "6.0.0", + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" + }, + { + "pname": "Nerdbank.GitVersioning", + "version": "3.6.141", + "hash": "sha256-i1pBJ12vlPmde6qSQK4PG2QLSpjaUCoY+odTi24R5XI=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, + { + "pname": "Nullable", + "version": "1.3.1", + "hash": "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.8", + "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.8", + "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.8", + "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.8", + "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.8", + "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Buffers", + "version": "4.6.0", + "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=" + }, + { + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + }, + { + "pname": "System.ComponentModel.Annotations", + "version": "4.5.0", + "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" + }, + { + "pname": "System.Configuration.ConfigurationManager", + "version": "6.0.0", + "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=" + }, + { + "pname": "System.Drawing.Common", + "version": "6.0.0", + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" + }, + { + "pname": "System.IO.Pipelines", + "version": "6.0.0", + "hash": "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA=" + }, + { + "pname": "System.Memory", + "version": "4.6.0", + "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.6.0", + "hash": "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.1.0", + "hash": "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU=" + }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.AccessControl", + "version": "6.0.0", + "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "6.0.0", + "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=" + }, + { + "pname": "System.Security.Permissions", + "version": "6.0.0", + "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "5.0.0", + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "6.0.0", + "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" + }, + { + "pname": "System.Windows.Extensions", + "version": "6.0.0", + "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=" + }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.16.0", + "hash": "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98=" + } +] diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix deleted file mode 100644 index 34286768531c..000000000000 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix +++ /dev/null @@ -1,332 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! -# TODO: This format file is obsolete, consider migrating to JSON. - -{ fetchNuGet }: -[ - (fetchNuGet { - pname = "AutomaticGraphLayout"; - version = "1.1.12"; - hash = "sha256-Fe4pGr+Ln1FfgHD3Odq2WOTrhi2nD/jjnh2cKLC2pwo="; - }) - (fetchNuGet { - pname = "AutomaticGraphLayout.Drawing"; - version = "1.1.12"; - hash = "sha256-KPyc4JxcQkGTeb5tceB3zRN8FqTj7jzimb97NOhZPl0="; - }) - (fetchNuGet { - pname = "Avalonia"; - version = "11.0.0"; - hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="; - }) - (fetchNuGet { - pname = "Avalonia"; - version = "11.1.3"; - hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; - }) - (fetchNuGet { - pname = "Avalonia.Angle.Windows.Natives"; - version = "2.1.22045.20230930"; - hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; - }) - (fetchNuGet { - pname = "Avalonia.AvaloniaEdit"; - version = "11.1.0"; - hash = "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="; - }) - (fetchNuGet { - pname = "Avalonia.BuildServices"; - version = "0.0.28"; - hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="; - }) - (fetchNuGet { - pname = "Avalonia.BuildServices"; - version = "0.0.29"; - hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; - }) - (fetchNuGet { - pname = "Avalonia.Controls.ColorPicker"; - version = "11.1.3"; - hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="; - }) - (fetchNuGet { - pname = "Avalonia.Controls.DataGrid"; - version = "11.1.3"; - hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="; - }) - (fetchNuGet { - pname = "Avalonia.Desktop"; - version = "11.1.3"; - hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="; - }) - (fetchNuGet { - pname = "Avalonia.Diagnostics"; - version = "11.1.3"; - hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="; - }) - (fetchNuGet { - pname = "Avalonia.FreeDesktop"; - version = "11.1.3"; - hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="; - }) - (fetchNuGet { - pname = "Avalonia.Native"; - version = "11.1.3"; - hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="; - }) - (fetchNuGet { - pname = "Avalonia.Remote.Protocol"; - version = "11.0.0"; - hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="; - }) - (fetchNuGet { - pname = "Avalonia.Remote.Protocol"; - version = "11.1.3"; - hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="; - }) - (fetchNuGet { - pname = "Avalonia.Skia"; - version = "11.1.3"; - hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="; - }) - (fetchNuGet { - pname = "Avalonia.Themes.Fluent"; - version = "11.1.3"; - hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="; - }) - (fetchNuGet { - pname = "Avalonia.Themes.Simple"; - version = "11.1.3"; - hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="; - }) - (fetchNuGet { - pname = "Avalonia.Win32"; - version = "11.1.3"; - hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="; - }) - (fetchNuGet { - pname = "Avalonia.X11"; - version = "11.1.3"; - hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="; - }) - (fetchNuGet { - pname = "DotUtils.StreamUtils.Sources"; - version = "0.0.8"; - hash = "sha256-KL5PkSsuZ9uPgtzK7rB0W6XGTcJQGqHoZqMLhpFR7tw="; - }) - (fetchNuGet { - pname = "GuiLabs.Language.Xml"; - version = "1.2.93"; - hash = "sha256-4fvD+8QBxEpVqcQtZ+gE8GhY7Iaay4aFr5HWQ9LGeqk="; - }) - (fetchNuGet { - pname = "HarfBuzzSharp"; - version = "7.3.0.2"; - hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; - }) - (fetchNuGet { - pname = "HarfBuzzSharp.NativeAssets.Linux"; - version = "7.3.0.2"; - hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; - }) - (fetchNuGet { - pname = "HarfBuzzSharp.NativeAssets.macOS"; - version = "7.3.0.2"; - hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; - }) - (fetchNuGet { - pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; - version = "7.3.0.2"; - hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; - }) - (fetchNuGet { - pname = "HarfBuzzSharp.NativeAssets.Win32"; - version = "7.3.0.2"; - hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; - }) - (fetchNuGet { - pname = "MicroCom.Runtime"; - version = "0.11.0"; - hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; - }) - (fetchNuGet { - pname = "Microsoft.Build.Framework"; - version = "17.5.0"; - hash = "sha256-FVomTQ8rZ5Ga09piFxSDFQ+b3gpC2ddZd+pQBSn5Csw="; - }) - (fetchNuGet { - pname = "Microsoft.Build.Tasks.Git"; - version = "8.0.0"; - hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="; - }) - (fetchNuGet { - pname = "Microsoft.Build.Utilities.Core"; - version = "17.5.0"; - hash = "sha256-W4bN0E9/DgEw0fxopXUhMK9tuGGwm0NYK3APytAzNRI="; - }) - (fetchNuGet { - pname = "Microsoft.NET.StringTools"; - version = "17.5.0"; - hash = "sha256-9eoXaPQvt6YAeb+cK5/ekh3YFfjymZCzJAxsDsIPlMQ="; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; - }) - (fetchNuGet { - pname = "Microsoft.SourceLink.Common"; - version = "8.0.0"; - hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="; - }) - (fetchNuGet { - pname = "Microsoft.SourceLink.GitHub"; - version = "8.0.0"; - hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="; - }) - (fetchNuGet { - pname = "Microsoft.Win32.Registry"; - version = "5.0.0"; - hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; - }) - (fetchNuGet { - pname = "Microsoft.Win32.SystemEvents"; - version = "6.0.0"; - hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; - }) - (fetchNuGet { - pname = "Nerdbank.GitVersioning"; - version = "3.6.141"; - hash = "sha256-i1pBJ12vlPmde6qSQK4PG2QLSpjaUCoY+odTi24R5XI="; - }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "2.0.3"; - hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; - }) - (fetchNuGet { - pname = "Nullable"; - version = "1.3.1"; - hash = "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM="; - }) - (fetchNuGet { - pname = "SkiaSharp"; - version = "2.88.8"; - hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; - }) - (fetchNuGet { - pname = "SkiaSharp.NativeAssets.Linux"; - version = "2.88.8"; - hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; - }) - (fetchNuGet { - pname = "SkiaSharp.NativeAssets.macOS"; - version = "2.88.8"; - hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; - }) - (fetchNuGet { - pname = "SkiaSharp.NativeAssets.WebAssembly"; - version = "2.88.8"; - hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; - }) - (fetchNuGet { - pname = "SkiaSharp.NativeAssets.Win32"; - version = "2.88.8"; - hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.5.1"; - hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.6.0"; - hash = "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="; - }) - (fetchNuGet { - pname = "System.Collections.Immutable"; - version = "8.0.0"; - hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; - }) - (fetchNuGet { - pname = "System.ComponentModel.Annotations"; - version = "4.5.0"; - hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; - }) - (fetchNuGet { - pname = "System.Configuration.ConfigurationManager"; - version = "6.0.0"; - hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; - }) - (fetchNuGet { - pname = "System.Drawing.Common"; - version = "6.0.0"; - hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; - }) - (fetchNuGet { - pname = "System.IO.Pipelines"; - version = "6.0.0"; - hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; - }) - (fetchNuGet { - pname = "System.Memory"; - version = "4.6.0"; - hash = "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="; - }) - (fetchNuGet { - pname = "System.Numerics.Vectors"; - version = "4.5.0"; - hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; - }) - (fetchNuGet { - pname = "System.Numerics.Vectors"; - version = "4.6.0"; - hash = "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU="; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "6.1.0"; - hash = "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU="; - }) - (fetchNuGet { - pname = "System.Security.AccessControl"; - version = "5.0.0"; - hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; - }) - (fetchNuGet { - pname = "System.Security.AccessControl"; - version = "6.0.0"; - hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.ProtectedData"; - version = "6.0.0"; - hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; - }) - (fetchNuGet { - pname = "System.Security.Permissions"; - version = "6.0.0"; - hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; - }) - (fetchNuGet { - pname = "System.Security.Principal.Windows"; - version = "5.0.0"; - hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; - }) - (fetchNuGet { - pname = "System.Text.Encoding.CodePages"; - version = "6.0.0"; - hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; - }) - (fetchNuGet { - pname = "System.Windows.Extensions"; - version = "6.0.0"; - hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; - }) - (fetchNuGet { - pname = "Tmds.DBus.Protocol"; - version = "0.16.0"; - hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; - }) -] diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix index a73e70468cd7..6f2613b10ca3 100644 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix @@ -14,20 +14,20 @@ }: buildDotnetModule (finalAttrs: rec { pname = "msbuild-structured-log-viewer"; - version = "2.2.465"; + version = "2.2.490"; src = fetchFromGitHub { owner = "KirillOsenkov"; repo = "MSBuildStructuredLog"; rev = "v${version}"; - hash = "sha256-09+Jo5nSNOFX7jTzMhetHHjTJdxlEZH4JWzv84stUDE="; + hash = "sha256-VJun6bs47NKj90e/6ZGp66x+MG1R/qxqrn2L1bVkdHY="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; projectFile = [ "src/StructuredLogViewer.Avalonia/StructuredLogViewer.Avalonia.csproj" ]; - nugetDeps = ./deps.nix; + nugetDeps = ./deps.json; # HACK: Clear out RuntimeIdentifiers that's set in StructuredLogViewer.Avalonia.csproj, otherwise our --runtime has no effect dotnetFlags = [ "-p:RuntimeIdentifiers=" ]; diff --git a/pkgs/by-name/ms/mscp/package.nix b/pkgs/by-name/ms/mscp/package.nix index f95b0a249d5f..5ee4d6e22f0c 100644 --- a/pkgs/by-name/ms/mscp/package.nix +++ b/pkgs/by-name/ms/mscp/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mscp"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "upa"; repo = "mscp"; rev = "v${finalAttrs.version}"; - hash = "sha256-TWwvPLqGLhh/IE+hIz/jwaGLBoASs78Iqai1TxN7Wps="; + hash = "sha256-5lX0b3JfjmQh/HlESRMNxqCe2qFRAEZoazysoy252dY="; fetchSubmodules = true; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/upa/mscp"; mainProgram = "mscp"; license = lib.licenses.gpl3Only; - maintainers = lib.teams.deshaw.members; + teams = [ lib.teams.deshaw ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ms/mslicer/package.nix b/pkgs/by-name/ms/mslicer/package.nix new file mode 100644 index 000000000000..9f288a65925f --- /dev/null +++ b/pkgs/by-name/ms/mslicer/package.nix @@ -0,0 +1,55 @@ +{ + fetchFromGitHub, + lib, + libglvnd, + libxkbcommon, + nix-update-script, + rustPlatform, + vulkan-loader, + wayland, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mslicer"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "connorslade"; + repo = "mslicer"; + rev = finalAttrs.version; + hash = "sha256-VgbHFUQpxlQcYh3TNyw1IX7vyaWrHRxl4Oe5jake9Qg="; + }; + + cargoHash = "sha256-Bs/mQTMEQxRvKK9ibIAf4KLv9jzGv3hnduXFYEdjljc="; + + buildInputs = [ + libglvnd + libxkbcommon + vulkan-loader + wayland + ]; + + # Force linking to libEGL, which is always dlopen()ed, and to + # libwayland-client & libxkbcommon, which is dlopen()ed based on the + # winit backend. + NIX_LDFLAGS = [ + "--no-as-needed" + "-lEGL" + "-lvulkan" + "-lwayland-client" + "-lxkbcommon" + ]; + + strictDeps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Experimental open source slicer for masked stereolithography (resin) printers"; + homepage = "https://connorcode.com/projects/mslicer"; + changelog = "https://github.com/connorslade/mslicer/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ colinsane ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index 96d78e97af6d..037ce3270023 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msolve"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; tag = "v${finalAttrs.version}"; - hash = "sha256-3AP3qrFZX2JZveONtmG0CLpdwSCwlrW86D8QLRTW5kI="; + hash = "sha256-0kqRnBJA5CwsLY/YWZXu2+y4aiZAQQYl30Qb3JX3zEo="; }; postPatch = '' diff --git a/pkgs/by-name/mt/mt-st/package.nix b/pkgs/by-name/mt/mt-st/package.nix index 532598a2e284..909bcd1afd51 100644 --- a/pkgs/by-name/mt/mt-st/package.nix +++ b/pkgs/by-name/mt/mt-st/package.nix @@ -1,21 +1,24 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, }: stdenv.mkDerivation rec { pname = "mt-st"; - version = "1.3"; + version = "1.8"; - src = fetchurl { - url = "https://github.com/iustin/mt-st/releases/download/mt-st-${version}/mt-st-${version}.tar.gz"; - sha256 = "b552775326a327cdcc076c431c5cbc4f4e235ac7c41aa931ad83f94cccb9f6de"; + src = fetchFromGitHub { + owner = "iustin"; + repo = "mt-st"; + tag = "v${version}"; + hash = "sha256-Sl+/v+ko3K4npY/M49H1YDxqOMy923qcAkTohi5Xg70="; }; installFlags = [ - "PREFIX=$(out)" - "EXEC_PREFIX=$(out)" + "PREFIX=" + "DESTDIR=$(out)" + "COMPLETIONINSTALLDIR=$(out)/share/bash-completion/completions" ]; meta = { diff --git a/pkgs/by-name/mu/mu/package.nix b/pkgs/by-name/mu/mu/package.nix index 7a3f2266d5ac..26193a8a1246 100644 --- a/pkgs/by-name/mu/mu/package.nix +++ b/pkgs/by-name/mu/mu/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.12.9"; + version = "1.12.11"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-o6K1xHv6dvzv1oRRiAiSXAqTaC0GcPDQ+ymh5kmH98k="; + hash = "sha256-t4Jv1RX1mMGwiYg9mFrRuO2j54EfaGM3ouOdg8upds8="; }; postPatch = '' diff --git a/pkgs/by-name/mu/mud/package.nix b/pkgs/by-name/mu/mud/package.nix index b67867c11517..69cc3077fee0 100644 --- a/pkgs/by-name/mu/mud/package.nix +++ b/pkgs/by-name/mu/mud/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "mud"; - version = "1.0.12"; + version = "1.0.14"; pyproject = true; src = fetchFromGitHub { owner = "jasursadikov"; repo = "mud"; tag = "v${version}"; - hash = "sha256-fFSnkodYhV1dokCJq43PwXxjIeAkObYZA3VxhjGZlhM="; + hash = "sha256-nYmMz91ElYZDelyHGAF6FlEhXqORODRgdLbxha4sUb8="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index ad69ddb22310..3723c584bff7 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "muffet"; - version = "2.10.8"; + version = "2.10.9"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-vpckg0zx8RNR7dAKjdlSHyevn7kDslrysah8jCLSaBw="; + hash = "sha256-I4xLa4R9vxP+bHa1wP4ci5r4ZIlH2KUif+udSVLUsNk="; }; - vendorHash = "sha256-IbpTQdJ6OssyzwS2H4iNgJybC9rvvlW6UYkihNkBYOE="; + vendorHash = "sha256-scma8hrm8e/KU2x+TIGOvaUk6nYxKIZ1eaGqs/W2I0I="; meta = with lib; { description = "Website link checker which scrapes and inspects all pages in a website recursively"; diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix index e781647b9ad7..1550ae874f93 100644 --- a/pkgs/by-name/mu/muffin/package.nix +++ b/pkgs/by-name/mu/muffin/package.nix @@ -126,6 +126,6 @@ stdenv.mkDerivation rec { mainProgram = "muffin"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/mu/muffon/package.nix b/pkgs/by-name/mu/muffon/package.nix index 5546b291ec43..70030c4925e8 100644 --- a/pkgs/by-name/mu/muffon/package.nix +++ b/pkgs/by-name/mu/muffon/package.nix @@ -7,10 +7,10 @@ let pname = "muffon"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/staniel359/muffon/releases/download/v${version}/muffon-${version}-linux-x86_64.AppImage"; - hash = "sha256-GT91MLjBWsbk9P5fsIxlYUNziAPsdvMSPq9bLL3rKDw="; + hash = "sha256-VzT/jlNmUYFmUUqi8EzE4ilawezqhSgXHz32+S3FMTo="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; in diff --git a/pkgs/by-name/mu/mujmap/package.nix b/pkgs/by-name/mu/mujmap/package.nix new file mode 100644 index 000000000000..bda3f618763f --- /dev/null +++ b/pkgs/by-name/mu/mujmap/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + notmuch, +}: + +rustPlatform.buildRustPackage rec { + pname = "mujmap"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "elizagamedev"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-LyiJYKhoSXVf1P+nu56Wgp+z8biPpt0tWgPZQrB2NNQ="; + + buildInputs = [ + notmuch + ]; + + meta = with lib; { + description = "JMAP integration for notmuch mail"; + homepage = "https://github.com/elizagamedev/mujmap/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ elizagamedev ]; + mainProgram = "mujmap"; + }; +} diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index c0bea6fdd240..eb466cb5ccfb 100644 --- a/pkgs/by-name/mu/mujoco/package.nix +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -18,8 +18,8 @@ let abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "9ac7062b1860d895fb5a8cbf58c3e9ef8f674b5f"; - hash = "sha256-uOgUtF8gaEgcxFK9WAoAhv4GoS8P23IoUxHZZVZdpPk="; + rev = "d9e4955c65cd4367dd6bf46f4ccb8cd3d100540b"; + hash = "sha256-QTywqQCkyGFpdbtDBvUwz9bGXxbJs/qoFKF6zYAZUmQ="; }; benchmark = fetchFromGitHub { owner = "google"; @@ -36,8 +36,8 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "66f7f51b7e069d0a03a21157fa60b24aece69aeb"; - hash = "sha256-/xd0GnXoW8vclIk8aKAziQwDx6AdlBmZD48p8aCX6TQ="; + rev = "464c1d097891a1462ab28bf8bb763c1683883892"; + hash = "sha256-OJyfUyiR8PFSaWltx6Ig0RCB+LxPxrPtc0GUfu2dKrk="; }; googletest = fetchFromGitHub { owner = "google"; @@ -132,7 +132,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mujoco"; - version = "3.3.0"; + version = "3.3.2"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "google-deepmind"; repo = "mujoco"; tag = finalAttrs.version; - hash = "sha256-6Mb50WD5ZQksKoG4FH3+iyy9qBqa1fKUPyt6McNDkGg="; + hash = "sha256-ftohDFsQv6/N82QjPONiQV/Hr7Eb1h2pFDwHaOOhJE0="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; @@ -184,6 +184,7 @@ stdenv.mkDerivation (finalAttrs: { }; tests = { pythonMujoco = python3Packages.mujoco; + pythonMujocoMjx = python3Packages.mujoco-mjx; }; }; diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 7e7298dbaefe..5fd46fbf8d97 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -97,7 +97,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.0.9"; + version = "14.5.2"; sources = { x86_64-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-5mVplSTqXVTL+QSJg0hthKUL/JiwX3A3DC869HRzQ7M="; + hash = "sha256-LyvrlsL/dLgoa94+JEuzbxeEl0n61ry2BcD5BlGV0sE="; }; }; @@ -249,7 +249,7 @@ stdenv.mkDerivation rec { # FONTCONFIG_FILE is required to make fontconfig read the MB # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 # indicates the system fonts.conf being used instead. - FONTCONFIG_FILE=$MB_IN_STORE/fontconfig/fonts.conf + FONTCONFIG_FILE=$MB_IN_STORE/fonts/fonts.conf substituteInPlace "$FONTCONFIG_FILE" \ --replace-fail 'fonts' "$MB_IN_STORE/fonts" diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index 1b911fa0afbd..8eb740980e86 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/mu/multipass/multipassd.nix b/pkgs/by-name/mu/multipass/multipassd.nix index e328ca783914..2cc6f9b6fb06 100644 --- a/pkgs/by-name/mu/multipass/multipassd.nix +++ b/pkgs/by-name/mu/multipass/multipassd.nix @@ -24,7 +24,6 @@ qt6, slang, stdenv, - utf8proc, xterm, }: @@ -121,7 +120,6 @@ stdenv.mkDerivation { protobuf qt6.qtbase qt6.qtwayland - utf8proc ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/mu/multiqc/package.nix b/pkgs/by-name/mu/multiqc/package.nix index 6d49ccda1d43..ca3c29e213ac 100644 --- a/pkgs/by-name/mu/multiqc/package.nix +++ b/pkgs/by-name/mu/multiqc/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { pname = "multiqc"; - version = "1.26"; + version = "1.28"; # Two data sources. One for the code, another for the test data srcs = [ @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { owner = "MultiQC"; repo = "MultiQC"; tag = "v${version}"; - hash = "sha256-MPAw6gG/3LzdskkDXOTDEM1NpG0sH9GvklYFQ1ZXWIs="; + hash = "sha256-rYZaecoVAO1RE44XCw60aVwvWhKcZ/RrG3WpVRcLbuA="; }) (fetchFromGitHub { owner = "MultiQC"; repo = "test-data"; - rev = "67435083a8bfa228dca3dda7d835facef15fc2c7"; - hash = "sha256-oYmPIJSy6dOKPcMr3B4foGoWcerA29x0XeGoU4dSYsA="; + rev = "d775b73c106d48726653f2fd02e473b7acbd93d8"; + hash = "sha256-uxBpMx22gWJmnbF9tVuVIdYdiqUh7n51swzu5hnfZQ0="; name = "test-data"; }) ]; @@ -53,6 +53,8 @@ python3Packages.buildPythonApplication rec { pydantic typeguard tqdm + python-dotenv + jsonschema ]; optional-dependencies = { @@ -96,7 +98,7 @@ python3Packages.buildPythonApplication rec { addBinToPathHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; disabledTests = # On darwin, kaleido fails to starts diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix index 9a9d1019e5cb..acd55a8d8e4e 100644 --- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix +++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix @@ -25,15 +25,15 @@ writeScript, }: let - id = "232635194"; + id = "243289393"; in stdenvNoCC.mkDerivation rec { pname = "multiviewer-for-f1"; - version = "1.38.1"; + version = "1.43.2"; src = fetchurl { url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; - sha256 = "sha256-3UgpjQdZYr48MPoqgHci6Yvo+jxK7oa3THl/JuL8tRo="; + sha256 = "sha256-wdA5f/80GkKP6LrrP2E6M9GY5bl6rg7Spz7NWB7cQjg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mu/mum/package.nix b/pkgs/by-name/mu/mum/package.nix new file mode 100644 index 000000000000..0cc9ce86e3ab --- /dev/null +++ b/pkgs/by-name/mu/mum/package.nix @@ -0,0 +1,68 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + cmake, + pkg-config, + alsa-lib, + gdk-pixbuf, + glib, + libnotify, + libopus, + openssl, + versionCheckHook, + nix-update-script, + installShellFiles, + + withNotifications ? true, + withOgg ? true, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mum"; + version = "0.5.1"; + src = fetchFromGitHub { + owner = "mum-rs"; + repo = "mum"; + tag = "v${finalAttrs.version}"; + hash = "sha256-r2isuwXq79dOQQWB+CsofYCLQYu9VKm7kzoxw103YV4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-ey3nT6vZ5YOZGk08HykK9RxI7li+Sz+sER3HioGSXP0="; + + nativeBuildInputs = [ + cmake + pkg-config + installShellFiles + ]; + + buildInputs = [ + alsa-lib + gdk-pixbuf + glib + libopus + openssl + ] ++ lib.optional withNotifications libnotify; + + buildNoDefaultFeatures = true; + buildFeatures = lib.optional withNotifications "notifications" ++ lib.optional withOgg "ogg"; + + postInstall = '' + installManPage documentation/*.{1,5} + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/mumctl"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Daemon/cli mumble client"; + homepage = "https://github.com/mum-rs/mum"; + changelog = "https://github.com/mum-rs/mum/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ lykos153 ]; + license = lib.licenses.mit; + }; +}) diff --git a/pkgs/by-name/mu/munin/package.nix b/pkgs/by-name/mu/munin/package.nix index 637d95af89f7..fdf82910c6dc 100644 --- a/pkgs/by-name/mu/munin/package.nix +++ b/pkgs/by-name/mu/munin/package.nix @@ -175,6 +175,6 @@ stdenv.mkDerivation rec { homepage = "https://munin-monitoring.org/"; license = licenses.gpl2Only; maintainers = [ maintainers.bjornfor ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index 1e5957775ee7..afbdceac9b46 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromSourcehut { name = "muon-src"; owner = "~lattis"; repo = "muon"; rev = finalAttrs.version; - hash = "sha256-ZHWyUV/BqM3ihauXDqDVkZURDDbBiRcEzptyGQmw94I="; + hash = "sha256-xTdyqK8t741raMhjjJBMbWnAorLMMdZ02TeMXK7O+Yw="; }; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; @@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkgconf - samurai ] + ++ lib.optionals (!embedSamurai) [ samurai ] ++ lib.optionals buildDocs [ (python3.withPackages (ps: [ ps.pyyaml ])) scdoc @@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { curl libarchive libpkgconf - samurai zlib ]; @@ -54,20 +53,25 @@ stdenv.mkDerivation (finalAttrs: { # URLs manually extracted from subprojects directory meson-docs-wrap = fetchurl { name = "meson-docs-wrap"; - url = "https://mochiro.moe/wrap/meson-docs-1.0.1-19-gdd8d4ee22.tar.gz"; - hash = "sha256-jHSPdLFR5jUeds4e+hLZ6JOblor5iuCV5cIwoc4K9gI="; + url = "https://github.com/muon-build/meson-docs/archive/5bc0b250984722389419dccb529124aed7615583.tar.gz"; + hash = "sha256-5MmmiZfadCuUJ2jy5Rxubwf4twX0jcpr+TPj5ssdSbM="; }; - samurai-wrap = fetchurl { - name = "samurai-wrap"; - url = "https://mochiro.moe/wrap/samurai-1.2-32-g81cef5d.tar.gz"; - hash = "sha256-aPMAtScqweGljvOLaTuR6B0A0GQQQrVbRviXY4dpCoc="; + meson-tests-wrap = fetchurl { + name = "meson-tests-wrap"; + url = "https://github.com/muon-build/meson-tests/archive/591b5a053f9aa15245ccbd1d334cf3f8031b1035.tar.gz"; + hash = "sha256-6GXfcheZyB/S/xl/j7pj5EAWtsmx4N0fVhLPMJ2wC/w="; }; in '' - pushd $sourceRoot/subprojects - ${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap}"} - ${lib.optionalString embedSamurai "tar xvf ${samurai-wrap}"} + mkdir -p $sourceRoot/subprojects/meson-docs + pushd $sourceRoot/subprojects/meson-docs + ${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap} --strip-components=1"} + popd + + mkdir -p $sourceRoot/subprojects/meson-tests + pushd $sourceRoot/subprojects/meson-tests + tar xvf ${meson-tests-wrap} --strip-components=1 popd ''; @@ -99,13 +103,15 @@ stdenv.mkDerivation (finalAttrs: { '' runHook preBuild - ./bootstrap.sh stage-1 + ${ + lib.optionalString (!embedSamurai) "CFLAGS=\"$CFLAGS -DBOOTSTRAP_NO_SAMU\"" + } ./bootstrap.sh stage-1 - ./stage-1/muon setup ${cmdlineForMuon} stage-2 - samu ${cmdlineForSamu} -C stage-2 + ./stage-1/muon-bootstrap setup ${cmdlineForMuon} stage-2 + ${lib.optionalString embedSamurai "./stage-1/muon-bootstrap"} samu ${cmdlineForSamu} -C stage-2 - stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3 - samu ${cmdlineForSamu} -C stage-3 + ./stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3 + ${lib.optionalString embedSamurai "./stage-2/muon"} samu ${cmdlineForSamu} -C stage-3 runHook postBuild ''; diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 79fc67987ca6..50344eb22589 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -14,7 +14,6 @@ openjpeg, jbig2dec, libjpeg, - darwin, gumbo, enableX11 ? (!stdenv.hostPlatform.isDarwin), libX11, @@ -142,19 +141,10 @@ stdenv.mkDerivation rec { curl openssl ] - ++ lib.optionals enableGL ( - if stdenv.hostPlatform.isDarwin then - with darwin.apple_sdk.frameworks; - [ - GLUT - OpenGL - ] - else - [ - freeglut-mupdf - libGLU - ] - ) + ++ lib.optionals (enableGL && !stdenv.hostPlatform.isDarwin) [ + freeglut-mupdf + libGLU + ] ++ lib.optionals enableOcr [ leptonica tesseract diff --git a/pkgs/by-name/mu/mupen64plus/package.nix b/pkgs/by-name/mu/mupen64plus/package.nix index 89d055326e77..9b9230e0ec06 100644 --- a/pkgs/by-name/mu/mupen64plus/package.nix +++ b/pkgs/by-name/mu/mupen64plus/package.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-KX4XGAzXanuOqAnRob4smO1cc1LccWllqA3rWYsh4TE="; }; + patches = [ + # Remove unused SDL2 header that erroneously adds libX11 dependency + ./remove-unused-header.patch + ]; + nativeBuildInputs = [ pkg-config nasm diff --git a/pkgs/by-name/mu/mupen64plus/remove-unused-header.patch b/pkgs/by-name/mu/mupen64plus/remove-unused-header.patch new file mode 100644 index 000000000000..4e56c2a8b09b --- /dev/null +++ b/pkgs/by-name/mu/mupen64plus/remove-unused-header.patch @@ -0,0 +1,21 @@ +From d737386a5422f798dcb196bc58a99808a0843317 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sun, 20 Apr 2025 21:33:00 +0200 +Subject: [PATCH] Remove unused SDL_syswm header + +--- + src/main/eventloop.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/source/mupen64plus-core/src/main/eventloop.c b/source/mupen64plus-core/src/main/eventloop.c +index 6625638b4..eb0fd1919 100644 +--- a/source/mupen64plus-core/src/main/eventloop.c ++++ b/source/mupen64plus-core/src/main/eventloop.c +@@ -21,7 +21,6 @@ + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + #include +-#include + #include + #include + #include diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 94da1e2cf330..2b8a5862ea15 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -9,14 +9,14 @@ buildGoModule rec { pname = "museum"; - version = "1.0.0"; + version = "1.0.10"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; rev = "photos-v${version}"; - hash = "sha256-niEySdGebd9SRRha2dYLsAary3to/9tgV5KePg2LdyE="; + hash = "sha256-CX12JrKlI7FMizk29LXO5e5i7pmgjzni/RY97020UZg="; }; vendorHash = "sha256-px4pMqeH73Fe06va4+n6hklIUDMbPmAQNKKRIhwv6ec="; @@ -53,7 +53,6 @@ buildGoModule rec { homepage = "https://github.com/ente-io/ente/tree/main/server"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ - surfaceflinger pinpox ]; mainProgram = "museum"; diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index 17ebc9b78497..f2976a021145 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "music-assistant-frontend"; - version = "2.14.8"; + version = "2.14.9"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-YUir/YBBbggsQUh5b6qSG5fpAa25jJmgcSsf0EZ8rhw="; + hash = "sha256-UEGRZBegoAnls5xAyVgjisD0B8nu8kXp1XHI4A114lw="; }; postPatch = '' diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index d518bb0a0a24..f62bcbcd930c 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -42,16 +42,20 @@ let pythonPath = python.pkgs.makePythonPath providerDependencies; in +assert + (lib.elem "airplay" providers) + -> throw "music-assistant: airplay support is missing libraop, a library we will not package because it depends on OpenSSL 1.1."; + python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.5.0"; + version = "2.5.2"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-yugtL3dCuGb2OSTy49V4mil9EnfACcGrYCA1rW/lo+4="; + hash = "sha256-RkbU2MqQ7XSv7f6gvgS0AZ8jy63fUAomC41dEk8qyOI="; }; patches = [ @@ -154,6 +158,11 @@ python.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "music_assistant" ]; + postFixup = '' + # binary native code, segfaults when autopatchelf'd, requires openssl 1.1 to build + rm $out/${python3.sitePackages}/music_assistant/providers/airplay/bin/cliraop-* + ''; + passthru = { inherit python diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index b78e089de4d7..29c10738db94 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.5.0"; + version = "2.5.2"; providers = { airplay = ps: [ ]; diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix deleted file mode 100644 index 74b80a8b36cb..000000000000 --- a/pkgs/by-name/mu/music-player/package.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - alsa-lib, - darwin, - fetchFromGitHub, - pkg-config, - protobuf, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "music-player"; - version = "0.2.0-alpha.14-unstable-2024-10-02"; - - src = fetchFromGitHub { - owner = "tsirysndr"; - repo = "music-player"; - rev = "cbf03c3f2f0f9baca831b08ec27d9b31438faa3d"; - hash = "sha256-BG0MU6IdFQX+C4BxTZlq5I7a4BQmUTvwAQALw5/UPBE="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-gWLlsXFrovApYCSlo/jBxPZ7nlBCuGVeh28/Ir12MDo="; - - nativeBuildInputs = - [ - protobuf - rustPlatform.bindgenHook - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - ]; - - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AudioUnit - ]; - - meta = { - description = "Extensible music player daemon written in Rust"; - homepage = "https://github.com/tsirysndr/music-player"; - changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.sigmasquadron ]; - mainProgram = "music-player"; - }; -} diff --git a/pkgs/by-name/mu/musicpod/package.nix b/pkgs/by-name/mu/musicpod/package.nix index 7fc13890008b..4be5daba1788 100644 --- a/pkgs/by-name/mu/musicpod/package.nix +++ b/pkgs/by-name/mu/musicpod/package.nix @@ -1,6 +1,6 @@ { lib, - flutter327, + flutter329, fetchFromGitHub, mpv-unwrapped, libass, @@ -12,15 +12,15 @@ gitUpdater, }: -flutter327.buildFlutterApplication rec { +flutter329.buildFlutterApplication rec { pname = "musicpod"; - version = "2.9.0"; + version = "2.11.4"; src = fetchFromGitHub { owner = "ubuntu-flutter-community"; repo = "musicpod"; tag = "v${version}"; - hash = "sha256-jq133GdeuEENPb2igNWkjeFTpI5qqxF2RuCu78y6L8o="; + hash = "sha256-bZAVkYSQ8NFW4wAXjfEZYt/Z/gSYn51MPLY+hENWQac="; }; postPatch = '' @@ -30,14 +30,18 @@ flutter327.buildFlutterApplication rec { pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes = { - audio_service_mpris = "sha256-QRZ4a3w4MZP8/A4yXzP4P9FPwEVNXlntmBwE8I+s2Kk="; - media_kit = "sha256-uRQmrV1jAxsWXFm5SimAY/VYMHBB9fPSnRXvUCvEI8g="; - media_kit_libs_video = "sha256-uRQmrV1jAxsWXFm5SimAY/VYMHBB9fPSnRXvUCvEI8g="; - media_kit_video = "sha256-uRQmrV1jAxsWXFm5SimAY/VYMHBB9fPSnRXvUCvEI8g="; - phoenix_theme = "sha256-HGMRQ5wdhoqYNkrjLTfz6mE/dh45IRyuQ79/E4oo+9w="; - yaru = "sha256-lwyl5aRf5HzWHk7aXYXFj6a9QiFpDN9piHYXzVccYWY="; - }; + gitHashes = + let + media_kit-hash = "sha256-uSVSLh4E/iUJaxA1JxKRYmDFyMpuoTWTyEwsbJuPldU="; + in + { + audio_service_mpris = "sha256-QRZ4a3w4MZP8/A4yXzP4P9FPwEVNXlntmBwE8I+s2Kk="; + media_kit = media_kit-hash; + media_kit_libs_video = media_kit-hash; + media_kit_video = media_kit-hash; + phoenix_theme = "sha256-HGMRQ5wdhoqYNkrjLTfz6mE/dh45IRyuQ79/E4oo+9w="; + yaru = "sha256-8TgDrI1vWIi8V1e/DrKVb4PS+KLCguG0bB15/XFFnX4="; + }; buildInputs = [ mpv-unwrapped diff --git a/pkgs/by-name/mu/musicpod/pubspec.lock.json b/pkgs/by-name/mu/musicpod/pubspec.lock.json index 4f3da3d51278..1aa9bb7278f2 100644 --- a/pkgs/by-name/mu/musicpod/pubspec.lock.json +++ b/pkgs/by-name/mu/musicpod/pubspec.lock.json @@ -4,27 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "88399e291da5f7e889359681a8f64b18c5123e03576b01f32a6a276611e511c3", + "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57", "url": "https://pub.dev" }, "source": "hosted", - "version": "78.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.3" + "version": "80.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "62899ef43d0b962b056ed2ebac6b47ec76ffd003d5f7c4e4dc870afe63188e33", + "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.1.0" + "version": "7.3.0" }, "animated_emoji": { "dependency": "direct main", @@ -60,61 +54,61 @@ "dependency": "transitive", "description": { "name": "archive", - "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a", + "sha256": "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.5" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "assorted_layout_widgets": { "dependency": "transitive", "description": { "name": "assorted_layout_widgets", - "sha256": "0fa75b70e3d0a8c6a8d4d89ff138eead007c1e42c6b27f7863bc2f18ea1481fa", + "sha256": "86eacbd25f7dd14a8182003935b07d94205ae4b0e6bedee03bde1404746bb7a9", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.4.4" + "version": "10.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "audio_metadata_reader": { "dependency": "direct main", "description": { "name": "audio_metadata_reader", - "sha256": "9f05d016a3277357308eb6d2f283cd1229c7fae62d6943ee6ab95b374e265222", + "sha256": "3a8f69540f2c8ffab3d22fad65d3dd91a29170850766843390d2b5beebc902ee", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.4.1" }, "audio_service": { "dependency": "direct main", "description": { "name": "audio_service", - "sha256": "f6c8191bef6b843da34675dd0731ad11d06094c36b691ffcf3148a4feb2e585f", + "sha256": "887ddf15fce31fd12aa8044c3bffd14c58929fb20e31d96284fe3aaf48315ac6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.18.16" + "version": "0.18.17" }, "audio_service_mpris": { "dependency": "direct main", @@ -141,51 +135,51 @@ "dependency": "transitive", "description": { "name": "audio_service_web", - "sha256": "4cdc2127cd4562b957fb49227dc58e3303fafb09bde2573bc8241b938cf759d9", + "sha256": "b8ea9243201ee53383157fbccf13d5d2a866b5dda922ec19d866d1d5d70424df", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.3" + "version": "0.1.4" }, "audio_session": { "dependency": "transitive", "description": { "name": "audio_session", - "sha256": "b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7", + "sha256": "2b7fff16a552486d078bfc09a8cde19f426dc6d6329262b684182597bec5b1ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.23" + "version": "0.1.25" }, "basic_utils": { "dependency": "direct main", "description": { "name": "basic_utils", - "sha256": "2064b21d3c41ed7654bc82cc476fd65542e04d60059b74d5eed490a4da08fc6c", + "sha256": "548047bef0b3b697be19fa62f46de54d99c9019a69fb7db92c69e19d87f633c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.2" }, "blur": { "dependency": "direct main", "description": { "name": "blur", - "sha256": "c17450404bceea429100e0838d19bbfaa6ad1f3053e7bac78a0264bbd60cfe01", + "sha256": "4009ea0c63d55b335794ac5cbbe9544fd10527a21b6272bfb6a44b5eda1a814c", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.0.1" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "build": { "dependency": "transitive", @@ -221,31 +215,31 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.3" + "version": "4.0.4" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.3" + "version": "2.4.4" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.14" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", @@ -271,11 +265,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.3" + "version": "8.9.5" }, "cached_network_image": { "dependency": "direct main", @@ -311,11 +305,11 @@ "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "charset": { "dependency": "transitive", @@ -351,11 +345,11 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", @@ -371,21 +365,21 @@ "dependency": "direct main", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "connectivity_plus": { "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "8a68739d3ee113e51ad35583fdf9ab82c55d09d693d3c39da1aebab87c938412", + "sha256": "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.1.3" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -431,11 +425,11 @@ "dependency": "transitive", "description": { "name": "csslib", - "sha256": "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.17.3" + "version": "1.0.2" }, "cupertino_icons": { "dependency": "direct main", @@ -461,11 +455,11 @@ "dependency": "transitive", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "desktop_notifications": { "dependency": "direct main", @@ -501,21 +495,21 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.0+1" }, "dio_web_adapter": { "dependency": "transitive", "description": { "name": "dio_web_adapter", - "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.1" }, "equatable": { "dependency": "transitive", @@ -531,21 +525,21 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "direct main", @@ -561,11 +555,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "c904b4ab56d53385563c7c39d8e9fa9af086f91495dfc48717ad84a42c3cf204", + "sha256": "36a1652d99cb6bf8ccc8b9f43aded1fd60b234d23ce78af422c07f950a436ef7", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.7" + "version": "10.0.0" }, "file_selector": { "dependency": "direct main", @@ -581,11 +575,11 @@ "dependency": "transitive", "description": { "name": "file_selector_android", - "sha256": "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc", + "sha256": "f3a3d48a36d1640b4dca22a086f26b426c246925a80eddc2953120775fbcf86a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1+12" + "version": "0.5.1+13" }, "file_selector_ios": { "dependency": "transitive", @@ -641,11 +635,11 @@ "dependency": "transitive", "description": { "name": "file_selector_windows", - "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4", + "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+3" + "version": "0.9.3+4" }, "fixnum": { "dependency": "transitive", @@ -687,21 +681,21 @@ "dependency": "direct main", "description": { "name": "flutter_html", - "sha256": "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee", + "sha256": "38a2fd702ffdf3243fb7441ab58aa1bc7e6922d95a50db76534de8260638558d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0-beta.2" + "version": "3.0.0" }, "flutter_launcher_icons": { "dependency": "direct dev", "description": { "name": "flutter_launcher_icons", - "sha256": "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5", + "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.14.2" + "version": "0.14.3" }, "flutter_lints": { "dependency": "direct dev", @@ -723,21 +717,21 @@ "dependency": "direct main", "description": { "name": "flutter_markdown", - "sha256": "e37f4c69a07b07bb92622ef6b131a53c9aae48f64b176340af9e8e5238718487", + "sha256": "634622a3a826d67cb05c0e3e576d1812c430fa98404e95b60b131775c73d76ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.5" + "version": "0.7.7" }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", + "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.24" + "version": "2.0.27" }, "flutter_rust_bridge": { "dependency": "transitive", @@ -825,11 +819,11 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "graphs": { "dependency": "transitive", @@ -875,21 +869,21 @@ "dependency": "direct main", "description": { "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.15.4" + "version": "0.15.5" }, "http": { "dependency": "transitive", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_multi_server": { "dependency": "transitive", @@ -915,11 +909,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.4" }, "intl": { "dependency": "direct main", @@ -965,11 +959,11 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" }, "json_annotation": { "dependency": "transitive", @@ -995,21 +989,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -1081,16 +1075,6 @@ "source": "hosted", "version": "1.0.3" }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.3-main.0" - }, "markdown": { "dependency": "transitive", "description": { @@ -1105,11 +1089,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -1136,21 +1120,21 @@ "description": { "path": "media_kit", "ref": "HEAD", - "resolved-ref": "4d8c634c28d439384aab40b9d2edff83077f37c9", + "resolved-ref": "d544e1c52db47a45097a8332a862687c832359d9", "url": "https://github.com/media-kit/media-kit" }, "source": "git", - "version": "1.1.11" + "version": "1.2.0" }, "media_kit_libs_android_video": { "dependency": "transitive", "description": { "name": "media_kit_libs_android_video", - "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c", + "sha256": "adff9b571b8ead0867f9f91070f8df39562078c0eb3371d88b9029a2d547d7b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.6" + "version": "1.3.7" }, "media_kit_libs_ios_video": { "dependency": "transitive", @@ -1166,11 +1150,11 @@ "dependency": "transitive", "description": { "name": "media_kit_libs_linux", - "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "sha256": "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.2.1" }, "media_kit_libs_macos_video": { "dependency": "transitive", @@ -1187,45 +1171,45 @@ "description": { "path": "libs/universal/media_kit_libs_video", "ref": "HEAD", - "resolved-ref": "4d8c634c28d439384aab40b9d2edff83077f37c9", + "resolved-ref": "d544e1c52db47a45097a8332a862687c832359d9", "url": "https://github.com/media-kit/media-kit" }, "source": "git", - "version": "1.0.5" + "version": "1.0.6" }, "media_kit_libs_windows_video": { "dependency": "transitive", "description": { "name": "media_kit_libs_windows_video", - "sha256": "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887", + "sha256": "dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.10" + "version": "1.0.11" }, "media_kit_video": { "dependency": "direct main", "description": { "path": "media_kit_video", "ref": "HEAD", - "resolved-ref": "4d8c634c28d439384aab40b9d2edff83077f37c9", + "resolved-ref": "d544e1c52db47a45097a8332a862687c832359d9", "url": "https://github.com/media-kit/media-kit" }, "source": "git", - "version": "1.2.5" + "version": "1.3.0" }, "meta": { "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "mime", "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", @@ -1264,55 +1248,65 @@ "source": "hosted", "version": "2.1.0" }, + "opml": { + "dependency": "direct main", + "description": { + "name": "opml", + "sha256": "812ac9abc81c486c24c26dc96de0ffab71696f88c26edc39e21f3435f97dbd56", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, "package_config": { "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.3" + "version": "8.3.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.2.0" }, "palette_generator": { "dependency": "direct main", "description": { "name": "palette_generator", - "sha256": "0b20245c451f14a5ca0818ab7a377765162389f8e8f0db361cceabf0fed9d1ea", + "sha256": "5a96b78983752faeb94866b30cb8f52e94ef176722bf51d1c5541d6a3044368f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.3+5" + "version": "0.3.3+6" }, "path": { "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_parsing": { "dependency": "transitive", @@ -1338,11 +1332,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.16" }, "path_provider_foundation": { "dependency": "transitive", @@ -1388,31 +1382,31 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.1" + "version": "11.4.0" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.13" + "version": "12.1.0" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "sha256": "f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.5" + "version": "9.4.6" }, "permission_handler_html": { "dependency": "transitive", @@ -1428,11 +1422,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.3.0" }, "permission_handler_windows": { "dependency": "transitive", @@ -1448,11 +1442,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "phoenix_theme": { "dependency": "direct main", @@ -1529,11 +1523,11 @@ "dependency": "transitive", "description": { "name": "pointycastle", - "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "sha256": "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.9.1" + "version": "4.0.0" }, "pool": { "dependency": "transitive", @@ -1559,11 +1553,11 @@ "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", @@ -1639,11 +1633,11 @@ "dependency": "transitive", "description": { "name": "screen_brightness_android", - "sha256": "ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a", + "sha256": "6ba1b5812f66c64e9e4892be2d36ecd34210f4e0da8bdec6a2ea34f1aa42683e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "screen_brightness_platform_interface": { "dependency": "transitive", @@ -1719,21 +1713,21 @@ "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.5" + "version": "2.5.3" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "bf808be89fe9dc467475e982c1db6c2faf3d2acf54d526cd5ec37d86c99dbd84", + "sha256": "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.8" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1769,11 +1763,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.3" }, "shared_preferences_windows": { "dependency": "transitive", @@ -1799,11 +1793,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.0" }, "shimmer": { "dependency": "direct main", @@ -1845,11 +1839,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -1865,41 +1859,41 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", + "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "sqflite_android": { "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", + "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4+6" + "version": "2.5.5" }, "sqflite_darwin": { "dependency": "transitive", "description": { "name": "sqflite_darwin", - "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c", + "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1+1" + "version": "2.4.2" }, "sqflite_platform_interface": { "dependency": "transitive", @@ -1915,11 +1909,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "state_notifier": { "dependency": "transitive", @@ -1935,11 +1929,11 @@ "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", @@ -1955,11 +1949,11 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "super_clipboard": { "dependency": "transitive", @@ -1992,14 +1986,14 @@ "version": "0.8.24" }, "synchronized": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.3.1" }, "system_theme": { "dependency": "direct main", @@ -2025,21 +2019,21 @@ "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "timing": { "dependency": "transitive", @@ -2095,21 +2089,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.15" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.2" + "version": "6.3.3" }, "url_launcher_linux": { "dependency": "transitive", @@ -2185,31 +2179,31 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "volume_controller": { "dependency": "transitive", "description": { "name": "volume_controller", - "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e", + "sha256": "e82fd689bb8e1fe8e64be3fa5946ff8699058f8cf9f4c1679acdba20cda7f5bd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.8" + "version": "3.3.3" }, "wakelock_plus": { "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.10" + "version": "1.2.11" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -2225,14 +2219,14 @@ "dependency": "direct main", "description": { "name": "watch_it", - "sha256": "8ce7e442a65ef81db155dc505594f1856660fa5dd068471a1fe9c5eeaced9b93", + "sha256": "44ad14c66c9a4240ac39243c8e09849a85ab6511b7b9217cacde024ed45796e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.6.2" + "version": "1.6.5" }, "watcher": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "watcher", "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", @@ -2245,11 +2239,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", @@ -2265,21 +2259,21 @@ "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "win32": { "dependency": "direct main", "description": { "name": "win32", - "sha256": "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.10.0" + "version": "5.12.0" }, "win32_registry": { "dependency": "transitive", @@ -2335,12 +2329,12 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "4a943961ad6c1d382b1bfc3bc0e67bb9f6440089", - "resolved-ref": "4a943961ad6c1d382b1bfc3bc0e67bb9f6440089", + "ref": "b75bb6e2b3c30126b17d73a67577ad43f5c65d7c", + "resolved-ref": "b75bb6e2b3c30126b17d73a67577ad43f5c65d7c", "url": "https://github.com/ubuntu/yaru.dart" }, "source": "git", - "version": "6.0.0" + "version": "7.0.0" }, "yaru_window": { "dependency": "direct main", @@ -2394,7 +2388,7 @@ } }, "sdks": { - "dart": ">=3.6.0 <4.0.0", - "flutter": ">=3.27.2" + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.29.2" } } diff --git a/pkgs/by-name/mu/musikcube/package.nix b/pkgs/by-name/mu/musikcube/package.nix index 8c59e9833985..fa94ea6ff806 100644 --- a/pkgs/by-name/mu/musikcube/package.nix +++ b/pkgs/by-name/mu/musikcube/package.nix @@ -26,8 +26,6 @@ sndio, systemd, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, - # Darwin Dependencies - darwin, coreaudioSupport ? stdenv.hostPlatform.isDarwin, }: @@ -76,14 +74,6 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib pulseaudio ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - SystemConfiguration - ] - ) - ++ lib.optionals coreaudioSupport (with darwin.apple_sdk.frameworks; [ CoreAudio ]) ++ lib.optionals sndioSupport [ sndio ] ++ lib.optionals pipewireSupport [ pipewire ]; diff --git a/pkgs/by-name/mu/musl-obstack/0001-ignore-obstack_free-alias-on-darwin.patch b/pkgs/by-name/mu/musl-obstack/0001-ignore-obstack_free-alias-on-darwin.patch new file mode 100644 index 000000000000..a102bbf28f7b --- /dev/null +++ b/pkgs/by-name/mu/musl-obstack/0001-ignore-obstack_free-alias-on-darwin.patch @@ -0,0 +1,27 @@ +From 44679bc1a03302aa6b1eb19220d9723e9e0e4d3f Mon Sep 17 00:00:00 2001 +From: usertam +Date: Fri, 16 May 2025 23:29:41 +0800 +Subject: [PATCH] ignore obstack_free alias on darwin + +clang will complain "error: aliases are not supported on darwin". +--- + obstack.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/obstack.c b/obstack.c +index 1f2f4c7..b9be9dd 100644 +--- a/obstack.c ++++ b/obstack.c +@@ -294,7 +294,9 @@ _obstack_free (struct obstack *h, void *obj) + abort (); + } + ++#ifndef __APPLE__ + extern __typeof(_obstack_free) obstack_free __attribute__((alias("_obstack_free"))); ++#endif + + _OBSTACK_SIZE_T + _obstack_memory_used (struct obstack *h) +-- +2.48.1 + diff --git a/pkgs/by-name/mu/musl-obstack/package.nix b/pkgs/by-name/mu/musl-obstack/package.nix index edac988c36db..dfe19c50b41f 100644 --- a/pkgs/by-name/mu/musl-obstack/package.nix +++ b/pkgs/by-name/mu/musl-obstack/package.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-oydS7FubUniMHAUWfg84OH9+CZ0JCrTXy7jzwOyJzC8="; }; + patches = lib.optionals stdenv.isDarwin [ + ./0001-ignore-obstack_free-alias-on-darwin.patch + ]; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -27,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/void-linux/musl-obstack"; description = "An extraction of the obstack functions and macros from GNU libiberty for use with musl-libc"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = [ maintainers.pjjw ]; }; diff --git a/pkgs/by-name/mu/muso/package.nix b/pkgs/by-name/mu/muso/package.nix new file mode 100644 index 000000000000..029d728a7305 --- /dev/null +++ b/pkgs/by-name/mu/muso/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + wrapGAppsHook3, +}: + +rustPlatform.buildRustPackage rec { + pname = "muso"; + version = "unstable-2021-09-02"; + + src = fetchFromGitHub { + owner = "quebin31"; + repo = pname; + rev = "6dd1c6d3a82b21d4fb2606accf2f26179eb6eaf9"; + hash = "sha256-09DWUER0ZWQuwfE3sjov2GjJNI7coE3D3E5iUy9mlSE="; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + + preConfigure = '' + substituteInPlace lib/utils.rs \ + --replace "/usr/share/muso" "$out/share/muso" + ''; + + postInstall = '' + mkdir -p $out/share/muso + cp share/* $out/share/muso/ + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-L0ZQoz9J5Hxg98puk1RbKuybLboIoOsy5qqGnvEPi1U="; + + meta = with lib; { + broken = stdenv.hostPlatform.isDarwin; + description = "Automatic music sorter (based on ID3 tags)"; + mainProgram = "muso"; + homepage = "https://github.com/quebin31/muso"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ crertel ]; + }; +} diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 4e08097370b5..03ad81a4612e 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -9,6 +9,7 @@ gobject-introspection, cairo, colord, + docutils, lcms2, pango, libstartup_notification, @@ -70,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "47.5"; + version = "48.2"; outputs = [ "out" @@ -81,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZVGjPOiH5oQVsTlSr21rQw6VMG+Sl63IwRGVPplcUVs="; + hash = "sha256-PBi6Tgk+qaN4ET3K+nvbXB+db1r5dlAmt+Zst42vYU4="; }; mesonFlags = [ @@ -107,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ desktop-file-utils + docutils # for rst2man gettext glib libxcvt @@ -115,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { xvfb-run pkg-config python3 + python3.pkgs.argcomplete # for register-python-argcomplete wayland-scanner wrapGAppsHook4 gi-docgen @@ -170,6 +173,12 @@ stdenv.mkDerivation (finalAttrs: { libXrandr libXinerama libXau + + # for gdctl shebang + (python3.withPackages (pp: [ + pp.pygobject3 + pp.argcomplete + ])) ]; postPatch = '' @@ -183,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. # TODO: Move this into a directory devhelp can find. - moveToOutput "share/mutter-15/doc" "$devdoc" + moveToOutput "share/mutter-${finalAttrs.passthru.libmutter_api_version}/doc" "$devdoc" ''; # Install udev files into our own tree. @@ -193,7 +202,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; passthru = { - libdir = "${finalAttrs.finalPackage}/lib/mutter-15"; + libmutter_api_version = "16"; # bumped each dev cycle + libdir = "${finalAttrs.finalPackage}/lib/mutter-${finalAttrs.passthru.libmutter_api_version}"; tests = { libdirExists = runCommand "mutter-libdir-exists" { } '' @@ -216,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/mutter"; changelog = "https://gitlab.gnome.org/GNOME/mutter/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/mu/mutter46/package.nix b/pkgs/by-name/mu/mutter46/package.nix index b594ee5c8cf2..cd3ee4ea8f2a 100644 --- a/pkgs/by-name/mu/mutter46/package.nix +++ b/pkgs/by-name/mu/mutter46/package.nix @@ -205,7 +205,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "mutter"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; license = licenses.gpl2Plus; - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/mu/muvm/package.nix b/pkgs/by-name/mu/muvm/package.nix new file mode 100644 index 000000000000..64ad1e8c4ca4 --- /dev/null +++ b/pkgs/by-name/mu/muvm/package.nix @@ -0,0 +1,110 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + libkrun, + passt, + dhcpcd, + systemd, + udev, + pkg-config, + procps, + fex, + writeShellApplication, + coreutils, + makeBinaryWrapper, +# TODO: Enable again when sommelier is not broken. +# For now, don't give false impression of sommelier being supported. +# sommelier, +# withSommelier ? false, +}: +let + # TODO: Setup setuid wrappers. + # E.g. FEX needs fusermount for rootfs functionality + initScript = writeShellApplication { + name = "muvm-init"; + runtimeInputs = [ + coreutils + ]; + text = '' + if [[ ! -f /etc/NIXOS ]]; then exit; fi + + ln -s /run/muvm-host/run/current-system /run/current-system + # Only create the symlink if that path exists on the host and is a directory. + if [[ -d /run/muvm-host/run/opengl-driver ]]; then ln -s /run/muvm-host/run/opengl-driver /run/opengl-driver; fi + ''; + }; + binPath = [ + dhcpcd + passt + (placeholder "out") + ] ++ lib.optionals stdenv.isAarch64 [ fex ]; + wrapArgs = lib.escapeShellArgs [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath binPath) + "--add-flags" + "--execute-pre=${lib.getExe initScript}" + ]; +in +rustPlatform.buildRustPackage rec { + pname = "muvm"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "AsahiLinux"; + repo = pname; + rev = "muvm-${version}"; + hash = "sha256-1XPhVEj7iqTxdWyYwNk6cbb9VRGuhpvvowYDPJb1cWU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-fkvdS0c1Ib8Kto44ou06leXy731cpMHXevyFR5RROt4="; + + postPatch = + '' + substituteInPlace crates/muvm/src/guest/bin/muvm-guest.rs \ + --replace-fail "/usr/lib/systemd/systemd-udevd" "${systemd}/lib/systemd/systemd-udevd" + + substituteInPlace crates/muvm/src/monitor.rs \ + --replace-fail "/sbin/sysctl" "${lib.getExe' procps "sysctl"}" + '' + # Only patch FEX path if we're aarch64, otherwise we don't want the derivation to pull in FEX in any way + + lib.optionalString stdenv.isAarch64 '' + substituteInPlace crates/muvm/src/guest/mount.rs \ + --replace-fail "/usr/share/fex-emu" "${fex}/share/fex-emu" + ''; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + makeBinaryWrapper + pkg-config + ]; + + buildInputs = [ + (libkrun.override { + withBlk = true; + withGpu = true; + withNet = true; + }) + udev + ]; + + postFixup = '' + wrapProgram $out/bin/muvm ${wrapArgs} + ''; + + meta = { + description = "Run programs from your system in a microVM"; + homepage = "https://github.com/AsahiLinux/muvm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + RossComputerGuy + nrabulinski + ]; + inherit (libkrun.meta) platforms; + mainProgram = "muvm"; + }; +} diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index edc2a6808b6f..3b4472c0e11b 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2025.02.10.00"; + version = "2025.04.21.00"; outputs = [ "bin" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "mvfst"; tag = "v${finalAttrs.version}"; - hash = "sha256-IsBydt1T33yedlaoyKl43fB7Dsuu4RPPiJuUtwZIUGg="; + hash = "sha256-/84smnZ2L1zDmkO1w9VQzVhXKt/S5azQr7Xpr8/dOA4="; }; patches = [ @@ -60,6 +60,13 @@ stdenv.mkDerivation (finalAttrs: { gtest ]; + hardeningDisable = [ + # causes test failures on aarch64 + "pacret" + # causes empty cmake files to be generated + "trivialautovarinit" + ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix index 7e347bafcab7..473580df7738 100644 --- a/pkgs/by-name/mv/mvnd/package.nix +++ b/pkgs/by-name/mv/mvnd/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitHub, graalvmPackages, installShellFiles, @@ -40,7 +39,7 @@ maven.buildMavenPackage rec { graalvmPackages.graalvm-ce installShellFiles makeWrapper - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; + ]; mvnDepsParameters = mvnParameters; mvnParameters = lib.concatStringsSep " " [ diff --git a/pkgs/by-name/mx/mx-takeover/package.nix b/pkgs/by-name/mx/mx-takeover/package.nix index a0df42942b33..d3e54e541cc6 100644 --- a/pkgs/by-name/mx/mx-takeover/package.nix +++ b/pkgs/by-name/mx/mx-takeover/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, }: @@ -24,10 +25,11 @@ buildGoModule rec { meta = with lib; { description = "Tool to work with DNS MX records"; - mainProgram = "mx-takeover"; homepage = "https://github.com/musana/mx-takeover"; - changelog = "https://github.com/musana/mx-takeover/releases/tag/v${version}"; + changelog = "https://github.com/musana/mx-takeover/releases/tag/v${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "mx-takeover"; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index f947e2c1f7ad..4d882527c115 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -2,9 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, openssl, - darwin, nixosTests, nix-update-script, versionCheckHook, @@ -12,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "mycelium"; - version = "0.5.7"; + version = "0.6.0"; sourceRoot = "${src.name}/myceliumd"; @@ -20,17 +18,13 @@ rustPlatform.buildRustPackage rec { owner = "threefoldtech"; repo = "mycelium"; rev = "v${version}"; - hash = "sha256-PbEoM+AnZTuo9xtwcDcTH9FZAzPzfBhX41+zVVTdgRo="; + hash = "sha256-H/LDDoWX8fDQMGknY4/SasRGC30fCmtWI3+p8XzEzCg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-63AB63vmxXi6ugLCAOKI1eJcOB8XHWEiCc5yoIEqd+w="; + cargoHash = "sha256-9eiBFTb1dMKnM9VDPcV8dF7ChswVha0zCXjxlD2NCNc="; nativeBuildInputs = [ versionCheckHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; doInstallCheck = true; diff --git a/pkgs/by-name/my/mycli/package.nix b/pkgs/by-name/my/mycli/package.nix index 3454dfec7dd3..c902ed3eaa64 100644 --- a/pkgs/by-name/my/mycli/package.nix +++ b/pkgs/by-name/my/mycli/package.nix @@ -7,17 +7,20 @@ python3Packages.buildPythonApplication rec { pname = "mycli"; - version = "1.29.2"; + version = "1.31.2"; pyproject = true; src = fetchFromGitHub { owner = "dbcli"; repo = "mycli"; tag = "v${version}"; - hash = "sha256-d90HJszhnYDxFkvLmTkt/LZ6XctcBjgKBoMUD3m+Sdw="; + hash = "sha256-s5PzWrxG2z0sOyQIyACLkG7dau+MHYLtLNLig6UfuCs="; }; - pythonRelaxDeps = [ "sqlparse" ]; + pythonRelaxDeps = [ + "sqlparse" + "click" + ]; build-system = with python3Packages; [ setuptools diff --git a/pkgs/by-name/my/mycorrhiza/package.nix b/pkgs/by-name/my/mycorrhiza/package.nix index 9ffd22c450e6..a688562270d4 100644 --- a/pkgs/by-name/my/mycorrhiza/package.nix +++ b/pkgs/by-name/my/mycorrhiza/package.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, buildGoModule, @@ -7,14 +6,14 @@ git, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mycorrhiza"; version = "1.15.1"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Cgf2YtAatfKWxhe4xAqNRB4ktsGs3ONi5XqbjcZwzTw="; }; @@ -29,12 +28,12 @@ buildGoModule rec { --prefix PATH : ${lib.makeBinPath [ git ]} ''; - meta = with lib; { + meta = { description = "Filesystem and git-based wiki engine written in Go using mycomarkup as its primary markup language"; homepage = "https://github.com/bouncepaw/mycorrhiza"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ chekoopa ]; - platforms = platforms.linux; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ chekoopa ]; + platforms = lib.platforms.unix; mainProgram = "mycorrhiza"; }; -} +}) diff --git a/pkgs/development/libraries/mygui/disable-framework.patch b/pkgs/by-name/my/mygui/disable-framework.patch similarity index 100% rename from pkgs/development/libraries/mygui/disable-framework.patch rename to pkgs/by-name/my/mygui/disable-framework.patch diff --git a/pkgs/by-name/my/mygui/package.nix b/pkgs/by-name/my/mygui/package.nix new file mode 100644 index 000000000000..d574bbc73e1f --- /dev/null +++ b/pkgs/by-name/my/mygui/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + boost, + freetype, + libuuid, + ois, + withOgre ? false, + ogre, + libGL, + libGLU, + libX11, +}: + +let + renderSystem = if withOgre then "3" else "4"; +in +stdenv.mkDerivation rec { + pname = "mygui"; + version = "3.4.2"; + + src = fetchFromGitHub { + owner = "MyGUI"; + repo = "mygui"; + rev = "MyGUI${version}"; + hash = "sha256-yBV0ImOFJlqBPqqOjXYe4SFO2liSGZCEwvehED5Ubj4="; + }; + + patches = [ + ./disable-framework.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = + [ + boost + freetype + libuuid + ois + ] + ++ lib.optionals withOgre [ + ogre + ] + ++ lib.optionals (!withOgre && stdenv.hostPlatform.isLinux) [ + libGL + libGLU + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + ]; + + # Tools are disabled due to compilation failures. + cmakeFlags = [ + "-DMYGUI_BUILD_TOOLS=OFF" + "-DMYGUI_BUILD_DEMOS=OFF" + "-DMYGUI_RENDERSYSTEM=${renderSystem}" + ]; + + meta = with lib; { + homepage = "http://mygui.info/"; + description = "Library for creating GUIs for games and 3D applications"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 5eb57965676d..c230464133e9 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "4.6.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-xHWiE0SCv5LbObAa4Ha/U1uTFe9z11nhpB/eMj5qYoA="; + hash = "sha256-HG3TuK4mh44D+qVtcfM09dbuf+M2ZuREASXxG0me3B4="; }; - vendorHash = "sha256-tgshaSrh5o28uiSMF7sv4AP57xYkaHq6B8sQTrnteqQ="; + vendorHash = "sha256-lxqAd7N5yrW453s6cEGAtCcxLyJMsWK8LtT31kTODoc="; subPackages = "."; diff --git a/pkgs/tools/games/mymcplus/default.nix b/pkgs/by-name/my/mymcplus/package.nix similarity index 100% rename from pkgs/tools/games/mymcplus/default.nix rename to pkgs/by-name/my/mymcplus/package.nix diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix index 4581de2f5879..d04843e56c44 100644 --- a/pkgs/by-name/my/mympd/package.nix +++ b/pkgs/by-name/my/mympd/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "20.1.1"; + version = "21.0.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-A78dT/BervM4rlVlbEYojNsG7wvESvKsm9nYjI9svb4="; + sha256 = "sha256-K86kOCJ9Fnf/ZvS11Tyf81mdKA9R5pgBz1XzDY4N/8E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/my/mysql-workbench/package.nix b/pkgs/by-name/my/mysql-workbench/package.nix index e06cb8f4ac51..ed575a1de305 100644 --- a/pkgs/by-name/my/mysql-workbench/package.nix +++ b/pkgs/by-name/my/mysql-workbench/package.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mysql-workbench"; - version = "8.0.41"; + version = "8.0.42"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-H/u1nwizZ9pCEu9JPXRcKshxjvc/efcZ//6ankHcGGk="; + hash = "sha256-d4SnNALK76AXWEu0WHX0dZv4co6Q+oCMTYAVV3pd9gU="; }; patches = [ diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix index bdddda7e3124..d0e39e5dccea 100644 --- a/pkgs/by-name/my/mysql84/package.nix +++ b/pkgs/by-name/my/mysql84/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.4.4"; + version = "8.4.5"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-+ykO90iJRDQIUknDG8pSrHGFMSREarIYuzvFAr8AgqU="; + hash = "sha256-U2OVkqcgpxn9+t8skhuUfqyGwG4zMgLkdmeFKleBvRo="; }; nativeBuildInputs = [ @@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools - darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools ]; diff --git a/pkgs/by-name/my/mysql_jdbc/package.nix b/pkgs/by-name/my/mysql_jdbc/package.nix index 60132e1cc384..02adf65c9cca 100644 --- a/pkgs/by-name/my/mysql_jdbc/package.nix +++ b/pkgs/by-name/my/mysql_jdbc/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "mysql-connector-java"; - version = "9.2.0"; + version = "9.3.0"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip"; - hash = "sha256-4+5QyBvRVSCYbc6a0vYuk9S/dgLkGwb22yttJHx/pkk="; + hash = "sha256-GPbmdZGW/T8fd6/zF+6owqSvU2IhZYA13hBgOIzBKAs="; }; installPhase = '' diff --git a/pkgs/by-name/n2/n2/package.nix b/pkgs/by-name/n2/n2/package.nix index a5ee26abfe02..3e581b5cfcbd 100644 --- a/pkgs/by-name/n2/n2/package.nix +++ b/pkgs/by-name/n2/n2/package.nix @@ -6,24 +6,24 @@ rustPlatform.buildRustPackage { pname = "n2"; - version = "unstable-2023-10-10"; + version = "unstable-2025-03-14"; src = fetchFromGitHub { owner = "evmar"; repo = "n2"; - rev = "90041c1f010d27464e3b18e38440ed9855ea62ef"; - hash = "sha256-svJPcriSrqloJlr7pIp/k84O712l4ZEPlSr58GPANXY="; + rev = "d67d508c389ac2e6961c6f84cd668f05ec7dc7b7"; + hash = "sha256-eWcN/iK/ToufABi4+hIyWetp2I94Vy4INHb4r6fw+TY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bVvtTsaLnsmfzv2wMFx81a2ef91pj8XGtXhj8X9WFlc="; + cargoHash = "sha256-LTgAaTQXW0XEbe+WS47pqSb+eU7FqjdTSO2++C3J5aM="; - meta = with lib; { + meta = { homepage = "https://github.com/evmar/n2"; description = "Ninja compatible build system"; mainProgram = "n2"; - license = licenses.asl20; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 2b2ffc2aeec3..611ee8b51793 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -4,7 +4,7 @@ nixosTests, fetchFromGitHub, nodejs, - pnpm_9, + pnpm_10, python3, node-gyp, cctools, @@ -17,23 +17,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.75.2"; + version = "1.91.3"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-fIdwciI4QUNr2wNWiq7qT4c6aZeUnkaVhSkIgFO4Svw="; + hash = "sha256-FkjYe+OSSzEHGx2NW1I3ZAsg4FbEP1VS2hA4Li3JvXc="; }; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-rtXTAHZUeitQFTa1Tw6l4el+xWD2hLT+2wu2LXW80cE="; + hash = "sha256-tYUbCAb2FI9NXyViDEYcpOST2LwZGx66Zwqy9sl2V1A="; }; nativeBuildInputs = [ - pnpm_9.configHook + pnpm_10.configHook python3 # required to build sqlite3 bindings node-gyp # required to build sqlite3 bindings makeWrapper diff --git a/pkgs/by-name/n9/n98-magerun/package.nix b/pkgs/by-name/n9/n98-magerun/package.nix index 995423c69797..bd1c9aaf8b91 100644 --- a/pkgs/by-name/n9/n98-magerun/package.nix +++ b/pkgs/by-name/n9/n98-magerun/package.nix @@ -32,6 +32,6 @@ php81.buildComposerProject2 (finalAttrs: { homepage = "https://magerun.net/"; license = lib.licenses.mit; mainProgram = "n98-magerun"; - maintainers = lib.teams.php.members; + teams = [ lib.teams.php ]; }; }) diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix index 46b2a63d0283..41892a382a82 100644 --- a/pkgs/by-name/n9/n98-magerun2/package.nix +++ b/pkgs/by-name/n9/n98-magerun2/package.nix @@ -1,22 +1,22 @@ { lib, fetchFromGitHub, - php, + php83, versionCheckHook, }: -php.buildComposerProject2 (finalAttrs: { +php83.buildComposerProject2 (finalAttrs: { pname = "n98-magerun2"; - version = "8.0.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "netz98"; repo = "n98-magerun2"; tag = finalAttrs.version; - hash = "sha256-MzJJkbT3AgSX+lLEfKlfg0zTY/79CcFelOK83NnSWI0="; + hash = "sha256-GnyIYgVNPumX+GLgPotSzD6BcUiUTlsfYFwFMX94hEk="; }; - vendorHash = "sha256-4w4HqYSSeVZnsgMGt+m8XN98RuAv7XmVo1vHtEXA0Uk="; + vendorHash = "sha256-kF8VXE0K/Gzho5K40H94hXtgSS2rogCtMow2ET8PinU="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; @@ -28,6 +28,6 @@ php.buildComposerProject2 (finalAttrs: { homepage = "https://magerun.net/"; license = lib.licenses.mit; mainProgram = "n98-magerun2"; - maintainers = lib.teams.php.members; + teams = [ lib.teams.php ]; }; }) diff --git a/pkgs/by-name/na/naabu/package.nix b/pkgs/by-name/na/naabu/package.nix index c632a5dfc5c1..234079b3fb6d 100644 --- a/pkgs/by-name/na/naabu/package.nix +++ b/pkgs/by-name/na/naabu/package.nix @@ -32,7 +32,7 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = [ "-version" ]; + versionCheckProgramArg = "-version"; meta = with lib; { description = "Fast SYN/CONNECT port scanner"; diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index 937fe3d2c26a..24cf7ee71259 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation { description = "Structural Netlist API (and more) for EDA post synthesis flow development"; homepage = "https://github.com/najaeda/naja"; license = lib.licenses.asl20; - maintainers = lib.teams.ngi.members; + teams = [ lib.teams.ngi ]; mainProgram = "naja_edit"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix index dec7c1ab825c..0ed580b2fae8 100644 --- a/pkgs/by-name/na/nak/package.nix +++ b/pkgs/by-name/na/nak/package.nix @@ -1,27 +1,28 @@ { lib, - buildGo123Module, + buildGoModule, fetchFromGitHub, versionCheckHook, nix-update-script, }: -buildGo123Module rec { + +buildGoModule (finalAttrs: { pname = "nak"; - version = "0.11.4"; + version = "0.13.2"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "nak"; - tag = "v${version}"; - hash = "sha256-xFATXMK7wyEgnJXmTq9BdW27xqgXUP1Mo0m5QhFIv0I="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Ecn3hIdGzwcUrfSvESCGAYlPo7Kf0425RJ4GBzVYGNs="; }; - vendorHash = "sha256-VkeQLWtyDfZiR0nrhmd5KCi/BIuqrFem9WhcTd3VRcc="; + vendorHash = "sha256-ZDOlQiSVe0hssTsMEtpwIKu5v5zH4RJ+Haq+zS0GTnc="; ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; # Integration tests fail (requires connection to relays) @@ -29,16 +30,16 @@ buildGo123Module rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; meta = { description = "Command-line tool for Nostr things"; homepage = "https://github.com/fiatjaf/nak"; - changelog = "https://github.com/fiatjaf/nak/releases/tag/${src.tag}"; + changelog = "https://github.com/fiatjaf/nak/releases/tag/v${finalAttrs.version}"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ nartsiss ]; mainProgram = "nak"; }; -} +}) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 8b03013e862e..16a70c1b0534 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.407"; + version = "0.0.413"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-ToAZacID91HxzsPRBKk+b8d9RHYmeDHjT0fQxOjXgRo="; + hash = "sha256-aOa2vSm2yT29I/jeFBWAc/td43O6j8yv9Y4ALjtfYE8="; }; - vendorHash = "sha256-c5USwojzahlReI0GK6IvByICJJ7OGydnLCfIpeqHPKM="; + vendorHash = "sha256-OBFzi8n29gnyMvwLYsmJz8oLLvR2i6YRNrfWxkRwC/s="; subPackages = [ "cmd/nsc" diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix index 895c538bc67a..d0b543fa0a37 100644 --- a/pkgs/by-name/na/nano/package.nix +++ b/pkgs/by-name/na/nano/package.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "8.3"; + version = "8.4"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - hash = "sha256-VRtxey4o9+kPdJMjaGobW7vYTPoTkGBNhUo8o3ePER4="; + hash = "sha256-WtKSIrvVViTYfqZ3kosxBqdDEU1sb5tB82yXviqOYo0="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; @@ -46,11 +46,15 @@ stdenv.mkDerivation rec { "info" ]; - configureFlags = [ - "--sysconfdir=/etc" - (lib.enableFeature enableNls "nls") - (lib.enableFeature enableTiny "tiny") - ]; + configureFlags = + [ + "--sysconfdir=/etc" + (lib.enableFeature enableNls "nls") + (lib.enableFeature enableTiny "tiny") + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "gl_cv_func_strcasecmp_works=yes" + ]; postInstall = if enableTiny then @@ -61,6 +65,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + strictDeps = true; passthru = { tests = { diff --git a/pkgs/by-name/na/nanoboyadvance/package.nix b/pkgs/by-name/na/nanoboyadvance/package.nix index 7edf601090d8..6b0efdc8b717 100644 --- a/pkgs/by-name/na/nanoboyadvance/package.nix +++ b/pkgs/by-name/na/nanoboyadvance/package.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/nba-emu/NanoBoyAdvance/commit/f5551cc1aa6a12b3d65dd56d186c73a67f3d9dd6.patch"; hash = "sha256-TCyN0qz7o7BDhVZtaTsWCZAcKThi5oVqUM0NGmj44FI="; }) + (fetchpatch { + name = "fix-darwin-bundle-install-path.patch"; + url = "https://github.com/nba-emu/NanoBoyAdvance/commit/bd07a261141cd1f67b828d20f6d01a97adf91c16.patch"; + hash = "sha256-Nqz35PGfPBZ3Lg6szez4k3R/NkgObNndvbxY8JCY40Y"; + }) ]; nativeBuildInputs = [ @@ -53,13 +58,24 @@ stdenv.mkDerivation (finalAttrs: { libunarr ]; - cmakeFlags = [ - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GLAD" "${gladSrc}") - (lib.cmakeBool "USE_SYSTEM_FMT" true) - (lib.cmakeBool "USE_SYSTEM_TOML11" true) - (lib.cmakeBool "USE_SYSTEM_UNARR" true) - (lib.cmakeBool "PORTABLE_MODE" false) - ]; + cmakeFlags = + [ + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GLAD" "${gladSrc}") + (lib.cmakeBool "USE_SYSTEM_FMT" true) + (lib.cmakeBool "USE_SYSTEM_TOML11" true) + (lib.cmakeBool "USE_SYSTEM_UNARR" true) + (lib.cmakeBool "PORTABLE_MODE" false) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeBool "MACOS_BUILD_APP_BUNDLE" true) + (lib.cmakeBool "MACOS_BUNDLE_QT" false) + ]; + + # Make it runnable from the terminal on Darwin + postInstall = lib.optionals stdenv.hostPlatform.isDarwin '' + mkdir "$out/bin" + ln -s "$out/Applications/NanoBoyAdvance.app/Contents/MacOS/NanoBoyAdvance" "$out/bin/NanoBoyAdvance" + ''; meta = { description = "Cycle-accurate Nintendo Game Boy Advance emulator"; diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix index a67679dffd47..772d30ce40a2 100644 --- a/pkgs/by-name/na/nanomq/package.nix +++ b/pkgs/by-name/na/nanomq/package.nix @@ -49,21 +49,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.22.1"; + version = "0.23.6"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; - rev = finalAttrs.version; - hash = "sha256-aB1gEzo2dX8NY+e0Dq4ELgkUpL/NtvvuY/l539BPIng="; + tag = finalAttrs.version; + hash = "sha256-Fy/9ASpQ/PHGItYhad69DdHWqCr/Wa+Xdm53Q573Pfc="; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "DESTINATION /etc" "DESTINATION $out/etc" - ''; - nativeBuildInputs = [ cmake ninja @@ -90,8 +85,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "NNG_ENABLE_TLS" true) ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=int-conversion"; - # disabled by default - not 100% reliable and making nanomq depend on # mosquitto would annoy people doInstallCheck = false; @@ -133,11 +126,11 @@ stdenv.mkDerivation (finalAttrs: { }); }; - meta = with lib; { + meta = { description = "Ultra-lightweight and blazing-fast MQTT broker for IoT edge"; homepage = "https://nanomq.io/"; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/na/nanosaur/package.nix b/pkgs/by-name/na/nanosaur/package.nix index 9bac2d99105f..7230d3322a27 100644 --- a/pkgs/by-name/na/nanosaur/package.nix +++ b/pkgs/by-name/na/nanosaur/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, SDL2, + libGL, cmake, makeWrapper, unstableGitUpdater, @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ SDL2 + libGL ]; installPhase = '' diff --git a/pkgs/by-name/na/nanosaur2/package.nix b/pkgs/by-name/na/nanosaur2/package.nix index 6d53df9b414b..476524125e28 100644 --- a/pkgs/by-name/na/nanosaur2/package.nix +++ b/pkgs/by-name/na/nanosaur2/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, SDL2, + libGL, cmake, makeWrapper, unstableGitUpdater, @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ SDL2 + libGL ]; installPhase = '' diff --git a/pkgs/by-name/na/naps2/deps.json b/pkgs/by-name/na/naps2/deps.json index a3cda59b5a45..27042ebac4a3 100644 --- a/pkgs/by-name/na/naps2/deps.json +++ b/pkgs/by-name/na/naps2/deps.json @@ -2,876 +2,711 @@ { "pname": "AtkSharp", "version": "3.24.24.95", - "sha256": "0x4nr8rx50h87n6ijv5a4vkavs2x61bsrkxvam27h178finmc1rn" + "hash": "sha256-NgdWbXToBHhEVbvPrFcwXeit5iaqbBmNPQiC0jPKlnQ=" }, { "pname": "Autofac", "version": "8.0.0", - "sha256": "0w3y76vik6rfr9am649v4w6dyyp5s25244q3il2x8si11xgl6y7d" + "hash": "sha256-7XhDXw8hatQFjQMTIorQ5XrfDCc7EVNVyi6bGbc5fnA=" }, { "pname": "Ben.Demystifier", "version": "0.4.1", - "sha256": "1szlrhvwpwkjhpgvjlrpjg714bz1yhyljs72pxni3li4mgnklk1f" + "hash": "sha256-Lkw67ask0hFtv+JoST304S8SzpM3U7nfhXLyyzfM9Os=" }, { "pname": "CairoSharp", "version": "3.24.24.95", - "sha256": "05fq8jdlxzrrw7gh0i3w272q34wzmb3bizcghjnf9mlh1jcn1iy9" + "hash": "sha256-ycdgmQyQ1uSshI/9uMaqn5OBxRF8RADf4Tn/TptE2BU=" }, { "pname": "CommandLineParser", "version": "2.9.1", - "sha256": "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582" + "hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo=" }, { "pname": "EmbedIO", "version": "3.5.2", - "sha256": "13saxicm07nkppzfxb60cpm1501n4ixaqhkvvqqfaqgifma9z8bv" + "hash": "sha256-e6GfVHXxYeUw3ntCrHokNoAS6mXArO7+vdMeUFnsSo8=" }, { "pname": "Eto.Forms", "version": "2.8.3", - "sha256": "00v2ffi9sl8cjllrz8rw3a5s5cgm9bfh45852znwz18zp06rh5bg" + "hash": "sha256-bxWYDbgfhc/tFwUVAt1K9bGiixo8o58plQxRnaJzYgM=" }, { "pname": "Eto.Platform.Gtk", "version": "2.8.3", - "sha256": "0av22hyx6xf6cnm89a4jvpnm80h1p6a6301r4n2906ihai9k3gsk" + "hash": "sha256-U78xU1QwGpCEJTmAYZS5AQJU7d2SqISqZcZ10z0UYis=" }, { "pname": "GdkSharp", "version": "3.24.24.95", - "sha256": "1wp2kgng0pwg8q5bl1zz4lzzj603qcjljql61h83bxa60q7c121m" + "hash": "sha256-NYjADgZG9TUQDIZiSSXDAxj5PyX/B7oKRo9f8Oyb4vI=" }, { "pname": "GioSharp", "version": "3.24.24.95", - "sha256": "121xb98hg955vwxfv1r5idr5a2zv09xpcmqckm7hhgprlzhz2cg5" + "hash": "sha256-5THx4af5PghPnQxXdnsC+wtVcoslh+0636WkB1FaPYg=" }, { "pname": "GLibSharp", "version": "3.24.24.95", - "sha256": "1l5nbg0qwjp55wfj06vnk5q5r5cnq5h064qp4k5xf8qlma8d346n" + "hash": "sha256-1pDRkKoUI9fLJBcTA2DBlpVccJl2GyAdL+VKjsFbttA=" }, { "pname": "Google.Protobuf", "version": "3.25.1", - "sha256": "0zcw9vmv2bdai3zaip86s37lj3r5z4zvcs9mf5a9nih0hy4gzwsi" + "hash": "sha256-UfP/iIcARptUcTVptj/5JQ9Jz9AG3aj+iKotsetOnH0=" }, { "pname": "Grpc.Core.Api", "version": "2.59.0", - "sha256": "0pajrxg0dsfnyxwrd2li5nrabz0r3b3bql776l44hn5rg1s1287k" + "hash": "sha256-8yARdHi5WEgINedQvMYaGfylsi2RipZ599bpBl7PUl0=" }, { "pname": "Grpc.Tools", - "version": "2.62.0", - "sha256": "1x6ydsvjckxdpnrl07h307wql5gghlb4fasf591ppr16kv5igdfp" + "version": "2.65.0", + "hash": "sha256-Nzpq4DIBnhZ7kX+/bwqUSMDa5NJB52iKuXARYnM5yZw=" }, { "pname": "GrpcDotNetNamedPipes", "version": "3.0.0", - "sha256": "1sndscz12dldjfvifp04ml56fkbl1vwb9llzq0h58hwri35nnbv7" + "hash": "sha256-Zy9ry4iZQ1QgwJ/StPgOdE1nCq0EXBe3k402ET7Tzeo=" }, { "pname": "GtkSharp", "version": "3.24.24.95", - "sha256": "0y20zn8wv72dg2bc7f95l8iz8z51ap08q5gnv6f2xnhz8zjf86xh" + "hash": "sha256-sBvk5Ecf2i6c2fYVjMBVoXz0I6IlucOWeE2czZH9QHg=" }, { "pname": "IsExternalInit", "version": "1.0.3", - "sha256": "01flcxs8m7m916s5rx5iyvzh6fjdl1dvcyzl9cpzn0d17yp8dz2i" + "hash": "sha256-UfyGrj+hAfsvS/R7tlugTToD//ax9Fy0CameinRn1AU=" }, { "pname": "Makaretu.Dns", "version": "2.0.1", - "sha256": "1l6ajfdcvqpz078wl6nm44bnhd8h47nssb5qgp5al9zqic50mqnd" - }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "7.0.0", - "sha256": "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm" + "hash": "sha256-zeIKCov4J6rKfbgsre0hEDVoFyHVGsrRAf/izZqTytA=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "8.0.0", - "sha256": "0z4jq5prnxyb4p3163yxx35znpd2msjd8hw8ysmv4ah90f5sd9gm" - }, - { - "pname": "Microsoft.Extensions.Configuration", - "version": "2.1.0", - "sha256": "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2" - }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "2.1.0", - "sha256": "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd" + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "8.0.0", - "sha256": "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71" - }, - { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "2.1.0", - "sha256": "0x1888w5ypavvszfmpja9krgc64527prs75vm8xbf9fv3rgsplql" + "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" }, { "pname": "Microsoft.Extensions.DependencyInjection", "version": "8.0.0", - "sha256": "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "2.1.0", - "sha256": "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s" + "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "8.0.0", - "sha256": "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg" + "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "8.0.1", - "sha256": "1wyhpamm1nqjfi3r463dhxljdlr6rm2ax4fvbgq2s0j3jhpdhd4p" - }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "2.1.0", - "sha256": "0dii8i7s6libfnspz2xb96ayagb4rwqj2kmr162vndivr9rmbm06" + "hash": "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM=" }, { "pname": "Microsoft.Extensions.Logging", "version": "8.0.0", - "sha256": "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i" - }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "2.1.0", - "sha256": "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj" + "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.0", - "sha256": "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6" + "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.1", - "sha256": "0i9pgmk60b8xlws3q9z890gim1xjq42dhyh6dj4xvbycmgg1x1sd" - }, - { - "pname": "Microsoft.Extensions.Options", - "version": "2.1.0", - "sha256": "0w9644sryd1c6r3n4lq2cgd5pn6jl3k5m38a05m7vjffa4m2spd2" + "hash": "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U=" }, { "pname": "Microsoft.Extensions.Options", "version": "8.0.0", - "sha256": "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "2.1.0", - "sha256": "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb" + "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" }, { "pname": "Microsoft.Extensions.Primitives", "version": "8.0.0", - "sha256": "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm" + "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" }, { "pname": "Microsoft.NETCore.App", "version": "2.1.30", - "sha256": "10brwj7csacwa4ra37pjb2bqwg961lxi576330xlhhwqixkjkrqf" + "hash": "sha256-DucpZ4+YQ0g7GMOcEjsNJj2Ol1jynqEyUZwpzY7keYE=" }, { "pname": "Microsoft.NETCore.DotNetAppHost", "version": "2.1.30", - "sha256": "0rabvmid1n604pk9rndlq62zqhq77p7cznmq9bzr7hshvr2rszab" + "hash": "sha256-S32dRd5Qw5P/Srjaz849B0P8hcG02ZzmJcDY0GLdS2U=" }, { "pname": "Microsoft.NETCore.DotNetHostPolicy", "version": "2.1.30", - "sha256": "1zk6ajalssvpm2yv4ri3g6hbxjaj1ns0y4w3g98wss54k7v44vpw" + "hash": "sha256-/G5C9pmkaM1ReoMTD7QNUsm+oHkjZrK9qHdrTZVUZv4=" }, { "pname": "Microsoft.NETCore.DotNetHostResolver", "version": "2.1.30", - "sha256": "0k3k6ldi5lj9ab9bdnhzfiykr6ipwz17d9g952bcanhvmk57l376" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" + "hash": "sha256-5gx6yqwbWsWWKOmldsLnN5o8fXQf2rbSUknSEhs1c0w=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.1", - "sha256": "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj" + "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "2.1.14", - "sha256": "0mbmcgsky65y0xai4xjfnhm07kn856y9kpn6hnm1b5m3mdsf8dkq" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc" + "hash": "sha256-eDbkdKujlhWqhcbembwpyM4DKrROdhJVB74YP/VjdVU=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Microsoft.NETCore.Targets", "version": "2.0.0", - "sha256": "0nsrrhafvxqdx8gmlgsz612bmlll2w3l2qn2ygdzr92rp1nqyka2" - }, - { - "pname": "Microsoft.NETFramework.ReferenceAssemblies", - "version": "1.0.3", - "sha256": "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl" - }, - { - "pname": "Microsoft.NETFramework.ReferenceAssemblies.net462", - "version": "1.0.3", - "sha256": "08bfss2p262d8zj41xqndv0qgvz9lq636k2xhl80jl23ay22lsgf" + "hash": "sha256-Qk2PbbhZpPzb88JiQQcXlNK6RDBfP1of6g337RTMWVs=" }, { "pname": "Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "5.0.0", - "sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n" + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, { "pname": "MimeKitLite", - "version": "4.4.0", - "sha256": "1am381zbh89qa520pllsa92by92lg6wn0zxhqa26z7mlh6jwc8nz" + "version": "4.7.1", + "hash": "sha256-vxCSs9w+xQDsUM8OiyCg6VmBi2twmqsD2BTJ1ESHLo8=" }, { "pname": "NAPS2.Mdns", "version": "1.0.1", - "sha256": "0xi46brppcjm8mrabnffahkmkcakhw94cnq1w2yk8y2hyq9qb4ms" + "hash": "sha256-upKFE/ZQeDS94AFbRhKHU7FZJ1TO2aVyRVWye/MyJHY=" }, { "pname": "NAPS2.NTwain", "version": "1.0.0", - "sha256": "088dw31h7rlgr0s05snm382wz65wi46yaizjnjpd0wzw2mb58yld" + "hash": "sha256-jXpUVhX8c9CutPJH5Q2JvJjPBRrV6gI0yI/mA8PgDSE=" }, { "pname": "NAPS2.Pdfium.Binaries", "version": "1.1.0", - "sha256": "0rnqkk6y047p6a6li2dr2cygkhjn3d2a13yn3rck5gf854k3q3ws" + "hash": "sha256-mg88JinIvTJZHtaPoEQbVsL5PBO5iUiNMvcQ4M2c2GY=" }, { "pname": "NAPS2.PdfSharp", "version": "1.0.1", - "sha256": "0x51whjhlqd5r0f1s5hjx41zzwwcwcdl19q6iz6k7fwx81746w0w" + "hash": "sha256-HHBDTkCduzPNjwanQBvjjPP/A+kSFh0cyKVhCiXkoXQ=" }, { "pname": "NAPS2.Tesseract.Binaries", "version": "1.2.0", - "sha256": "0m1aksfjg4vfl2llvhd2in0a5i4wa72nmfw2h78y4wwxmjplbfz2" + "hash": "sha256-4rtFr6ydc+LRgYK7asVRnMSigI2iwU2poG6TJ52eKlQ=" }, { "pname": "NAPS2.Wia", "version": "2.0.3", - "sha256": "0xszkccb8fy2x60nkblpda78wx2d86fn8y49j94qmvz4rp2nw98i" + "hash": "sha256-ESVuxc3k74pJkol4ZJ1BTXSOjmqXrmmB6cI7tBibX3c=" }, { "pname": "NETStandard.Library", "version": "2.0.3", - "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y" + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" }, { "pname": "Newtonsoft.Json", "version": "13.0.3", - "sha256": "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7" + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, { "pname": "NLog", - "version": "5.2.8", - "sha256": "1z3h20m5rjnizm1jbf5j0vpdc1f373rzzkg6478p1lxv5j385c12" + "version": "5.3.2", + "hash": "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc=" }, { "pname": "NLog.Extensions.Logging", - "version": "5.3.8", - "sha256": "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8" + "version": "5.3.11", + "hash": "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g=" }, { "pname": "PangoSharp", "version": "3.24.24.95", - "sha256": "0548jrkgzia899va9smhh7if49nk6avbswb68xmc52k37lins6b2" + "hash": "sha256-YhltIz1jisJqR2ZxvbYy0ybi4oGw6qR2SkjF/2aWiBQ=" }, { "pname": "Polyfill", - "version": "4.2.0", - "sha256": "0h25jszwrkmxlklcr6mjjmz71rn6q36pqb5jx36l94lrccy2k0a8" + "version": "4.9.0", + "hash": "sha256-oTnmSAwMbxPFhzqBBrcSej0Nd3BKSX1kh0iwih2Iquo=" }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", - "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0" + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" }, { "pname": "runtime.any.System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn" + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" }, { "pname": "runtime.any.System.Globalization", "version": "4.3.0", - "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x" + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" }, { "pname": "runtime.any.System.Globalization.Calendars", "version": "4.3.0", - "sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201" + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" }, { "pname": "runtime.any.System.IO", "version": "4.3.0", - "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x" + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" }, { "pname": "runtime.any.System.Reflection", "version": "4.3.0", - "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly" + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.3.0", - "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf" + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" }, { "pname": "runtime.any.System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl" + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" }, { "pname": "runtime.any.System.Runtime", "version": "4.3.0", - "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b" + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" }, { "pname": "runtime.any.System.Runtime.Handles", "version": "4.3.0", - "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x" + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" }, { "pname": "runtime.any.System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19" + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" }, { "pname": "runtime.any.System.Text.Encoding", "version": "4.3.0", - "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3" + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" }, { "pname": "runtime.any.System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8" + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" }, { "pname": "runtime.any.System.Threading.Tasks", "version": "4.3.0", - "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va" + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i" + "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c=" }, { "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r" + "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg=" }, { "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3" + "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.App", "version": "2.1.30", - "sha256": "039r4c42mz8fg8nqn8p3v0dxnjv681xlllhrc4l91rbbwv04li6j" + "hash": "sha256-0kRKwOZr5ZAoYRlSSntAZkvbG9jjIosteg79KggjOQ0=" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost", "version": "2.1.30", - "sha256": "00pm387jvv574jsdd1261mbvxd7lbjbsfx3wq0z0iqjhr31pgmw1" + "hash": "sha256-gdd3w8hQ4gg+wHx0p5dc9LS+Vw1GhNa0JKfsLQ8a9QI=" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy", "version": "2.1.30", - "sha256": "1gjjs4xvg9x48lg00ys6r5vc00s973aknpqp0ffa946s8m8xhlfw" + "hash": "sha256-3FHYUUXakKScAxdfO9U4SQPAdslGewAeRaSntzvRUr4=" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver", "version": "2.1.30", - "sha256": "0jyzw9wr9sgllgj08vdf716p27s13ad46nah2q1qmfa05cgdbikb" + "hash": "sha256-a8bVHitAuYoDFlBZQ5oaQR9xTTiubQTko/TplHni30s=" }, { "pname": "runtime.linux-x64.Microsoft.NETCore.App", "version": "2.1.30", - "sha256": "1wy9kagwj6avvhpp4lrlxw5sqgh4zlmii9wvf474fx999szi5bqb" + "hash": "sha256-C68Sv04pdUcOcZunGCv9BD6sC+80U3Iv3FsZyZ+ayfM=" }, { "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost", "version": "2.1.30", - "sha256": "0mrlvhm6yb3x40pfm4smi67p6wm3hi71jdnawqkqy73g203rjmgx" + "hash": "sha256-/VWZBxBvHI8n5so2GU6Eo3Jzj4lVk+ouIH0sbyrcNFc=" }, { "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy", "version": "2.1.30", - "sha256": "1zv9i8wqpsdr2vx35i3qzad1yvz00l6i9f00fclw02v2p92jz9c1" + "hash": "sha256-gaUvRbpiC8ApcwC4FA0F4G8fmvp4xDL6FrnpizmKaf8=" }, { "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver", "version": "2.1.30", - "sha256": "1s6zx2hpg60pscvz8yfdkxpdg1lhs534x5mz3yryxa91nfzhxv95" + "hash": "sha256-Je0Ov7Mhqe6zH7+WTkbRkIbXbp/NefQ30xeYd6Ho3+g=" }, { "pname": "runtime.native.System", "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, { "pname": "runtime.native.System.Net.Http", "version": "4.3.0", - "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk" + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" }, { "pname": "runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q" + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6" + "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8=" }, { "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438" + "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ=" }, { "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj" + "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi" + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6" + "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U=" }, { "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1" + "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI=" }, { "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi" + "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU=" }, { "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w" + "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA=" }, { "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c" + "hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q=" }, { "pname": "runtime.unix.Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id" + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5" + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" }, { "pname": "runtime.unix.System.IO.FileSystem", "version": "4.3.0", - "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix" + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" }, { "pname": "runtime.unix.System.Net.Primitives", "version": "4.3.0", - "sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4" + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", - "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk" + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" }, { "pname": "runtime.unix.System.Runtime.Extensions", "version": "4.3.0", - "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p" + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, { "pname": "SharpZipLib", "version": "1.4.2", - "sha256": "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y" + "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" }, { "pname": "SimpleBase", "version": "1.3.1", - "sha256": "0mjvqbn3b6ai7nhzs5mssy2imn9lw10z4sj8nhgiapyqy9qlim0n" + "hash": "sha256-FtRIcfLYXxUftEhq8kHgNNkahde6Fv2hPVGZNezCW1Y=" }, { "pname": "SixLabors.Fonts", "version": "1.0.1", - "sha256": "08ljgagwm8aha9p4plqdnf507gcisajd9frcbvaykikrsrzpm33y" + "hash": "sha256-fox6f9Z5xunVXiy71KTSkb0DirMN00tuUlChyp96kiI=" }, { "pname": "StandardSocketsHttpHandler", "version": "2.2.0.8", - "sha256": "18h3rzh9pp3b6mjx1m4jvwwhv5abjqsd1nnbibc0gbkvbcrb16ni" + "hash": "sha256-0ZqwMlt7rgfYisva0DSWS5UNOd+S1NBlNWvcm+DPA6I=" }, { "pname": "System.Buffers", "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" - }, - { - "pname": "System.Buffers", - "version": "4.4.0", - "sha256": "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, { "pname": "System.Collections", "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" }, { "pname": "System.Collections.Concurrent", "version": "4.3.0", - "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8" - }, - { - "pname": "System.Collections.Immutable", - "version": "5.0.0", - "sha256": "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r" + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, { "pname": "System.Collections.Immutable", "version": "8.0.0", - "sha256": "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp" - }, - { - "pname": "System.ComponentModel.Annotations", - "version": "5.0.0", - "sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j" + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" }, { "pname": "System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "4.3.0", - "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq" + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "7.0.2", - "sha256": "1h97ikph775gya93qsjjaka87qcygbyh1064rh1hnfcnp5xv0ipi" + "hash": "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, { "pname": "System.Globalization", "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" }, { "pname": "System.Globalization.Calendars", "version": "4.3.0", - "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq" + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" }, { "pname": "System.Globalization.Extensions", "version": "4.3.0", - "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls" + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" }, { "pname": "System.IO", "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, { "pname": "System.IO.FileSystem", "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" }, { "pname": "System.Linq", "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" - }, - { - "pname": "System.Memory", - "version": "4.5.0", - "sha256": "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30" - }, - { - "pname": "System.Memory", - "version": "4.5.1", - "sha256": "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c" - }, - { - "pname": "System.Memory", - "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, { "pname": "System.Memory", "version": "4.5.5", - "sha256": "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h" + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" }, { "pname": "System.Net.Http", "version": "4.3.4", - "sha256": "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl" + "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00=" }, { "pname": "System.Net.Primitives", "version": "4.3.0", - "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59" + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" }, { "pname": "System.Private.Uri", "version": "4.3.0", - "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx" + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { "pname": "System.Reflection", "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Metadata", "version": "5.0.0", - "sha256": "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss" + "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8=" }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, { "pname": "System.Resources.Extensions", "version": "8.0.0", - "sha256": "0chqkw486pb5dg9nlj5352lsz1206xyf953nd98dglia3isxklg5" + "hash": "sha256-5dHZdRwq0tdQanaU5Hw3QISvqSijSGrTa2VdgwifGDI=" }, { "pname": "System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" }, { "pname": "System.Runtime", "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.0", - "sha256": "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.2", - "sha256": "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "sha256": "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.7.0", - "sha256": "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc" + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, { "pname": "System.Runtime.Handles", "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, { "pname": "System.Runtime.Numerics", "version": "4.3.0", - "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z" - }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r" + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.3.0", - "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml" + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" }, { "pname": "System.Security.Cryptography.Cng", "version": "4.3.0", - "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv" + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" }, { "pname": "System.Security.Cryptography.Csp", "version": "4.3.0", - "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1" + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" }, { "pname": "System.Security.Cryptography.Encoding", "version": "4.3.0", - "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32" + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" }, { "pname": "System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc" + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" }, { "pname": "System.Security.Cryptography.Primitives", "version": "4.3.0", - "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby" + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "8.0.0", - "sha256": "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx" + "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=" }, { "pname": "System.Security.Cryptography.X509Certificates", "version": "4.3.0", - "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" }, { "pname": "System.Text.Encoding", "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "8.0.0", - "sha256": "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y" + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" }, { "pname": "System.Threading", "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "System.Threading.Tasks.Dataflow", - "version": "8.0.0", - "sha256": "02mmqnbd7ybin1yiffrq3ph71rsbrnf6r6m01j98ynydqfscz9s3" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.2", - "sha256": "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153" + "version": "8.0.1", + "hash": "sha256-hgCfF91BDd/eOtLEd5jhjzgJdvwmVv4/b42fXRr3nvo=" }, { "pname": "System.ValueTuple", "version": "4.5.0", - "sha256": "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy" + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" }, { "pname": "Unosquare.Swan.Lite", "version": "3.1.0", - "sha256": "0yjbchc2rhgssfvb1qxg3kq3lzyx089r3rngpcjgrkw85bf0vgrw" + "hash": "sha256-PL8N3CqIz/wku8/mkRMC3X868Byv47C20/rBLBhkS3o=" }, { "pname": "ZXing.Net", "version": "0.16.9", - "sha256": "0bpki21p2wjjjviayhza0gam7s9lm7qj6g8hdcp2csd0mv54l980" + "hash": "sha256-ACVKyq6gaSYuaxA9I/GpNOlT1QPqQ6/illJycYOI8y4=" } ] diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix index 591aafe787e6..d77a05a479ac 100644 --- a/pkgs/by-name/na/naps2/package.nix +++ b/pkgs/by-name/na/naps2/package.nix @@ -4,6 +4,7 @@ buildDotnetModule, dotnetCorePackages, fetchFromGitHub, + wrapGAppsHook3, gtk3, gdk-pixbuf, glib, @@ -13,34 +14,35 @@ buildDotnetModule rec { pname = "naps2"; - version = "7.4.3"; + version = "7.5.3"; src = fetchFromGitHub { owner = "cyanfish"; repo = "naps2"; - rev = "v${version}"; - hash = "sha256-/qSfxGHcCSoNp516LFYWgEL4csf8EKgtSffBt1C02uE="; + tag = "v${version}"; + hash = "sha256-vX+ZyCQsYqJjgYaufWJRnzX8retiFK5QHSP40bbBaCc="; }; projectFile = "NAPS2.App.Gtk/NAPS2.App.Gtk.csproj"; nugetDeps = ./deps.json; + postPatch = '' + substituteInPlace NAPS2.Images.Gtk/NAPS2.Images.Gtk.csproj \ + --replace-fail TargetFramework TargetFrameworks \ + ''; + + dotnetFlags = [ + "-p:TargetFrameworks=net8" + "-p:EnablePreviewFeatures=true" + ]; + executables = [ "naps2" ]; - dotnet-sdk = - with dotnetCorePackages; - sdk_8_0 - // { - inherit - (combinePackages [ - sdk_8_0 - sdk_6_0-bin - ]) - packages - targetPackages - ; - }; + dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; + + nativeBuildInputs = [ wrapGAppsHook3 ]; + selfContainedBuild = true; runtimeDeps = [ gtk3 @@ -68,7 +70,6 @@ buildDotnetModule rec { maintainers = with lib.maintainers; [ eliandoran ]; platforms = lib.platforms.linux; mainProgram = "naps2"; - broken = stdenv.hostPlatform.isAarch64; # Google.Protobuf.Tools dependency fails to build. }; } diff --git a/pkgs/by-name/na/narrowlink/package.nix b/pkgs/by-name/na/narrowlink/package.nix index 66168b2e7cd8..c67aaa36d62d 100644 --- a/pkgs/by-name/na/narrowlink/package.nix +++ b/pkgs/by-name/na/narrowlink/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,11 +22,6 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.Security - ]; - meta = { description = "Self-hosted solution to enable secure connectivity between devices across restricted networks like NAT or firewalls"; homepage = "https://github.com/narrowlink/narrowlink"; diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix index 76d3ac329ad9..2b65576cd5c7 100644 --- a/pkgs/by-name/na/narsil/package.nix +++ b/pkgs/by-name/na/narsil/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { pname = "narsil"; - version = "1.4.0-48-gaf7c8c1b3"; + version = "1.4.0-49-g64a513fe4"; src = fetchFromGitHub { owner = "NickMcConnell"; repo = "NarSil"; tag = version; - hash = "sha256-w/rXKD66Kx+XE1ItOwurf5XWE02OHirofVMUQqpf6WQ="; + hash = "sha256-YSPaquQfWTRGswttA+z7zIDJu+i8bDegzAetQMKlgZA="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/na/nasc/package.nix b/pkgs/by-name/na/nasc/package.nix index 57afe669e12d..5a255668d75c 100644 --- a/pkgs/by-name/na/nasc/package.nix +++ b/pkgs/by-name/na/nasc/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { the equations it’s used in. ''; homepage = "https://github.com/parnold-x/nasc"; - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; platforms = platforms.linux; license = licenses.gpl3Plus; mainProgram = "com.github.parnold_x.nasc"; diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix index 0531e6a0a795..41f5d202f377 100644 --- a/pkgs/by-name/na/nats-server/package.nix +++ b/pkgs/by-name/na/nats-server/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.11.0"; + version = "2.11.3"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-9t5DOLZU2VcEBggirf+aLzwzsDBB+uGGXlBkIKP3HkE="; + hash = "sha256-Z4EBXWUtBzW65ONvt94sKzVDHw8qVz2cR5qewUm5nXI="; }; - vendorHash = "sha256-CvxAP35/hinewnNhrW9urI0J3DI5QfZybbyRbz9Ol4s="; + vendorHash = "sha256-uCNTUfYfMDjgM3RXsgAIzIFSuoHOCVks8aBR58RlU6Q="; doCheck = false; diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix index 48bb782524c9..9de7c83dd3f8 100644 --- a/pkgs/by-name/na/natscli/package.nix +++ b/pkgs/by-name/na/natscli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "nats-io"; repo = "natscli"; tag = "v${version}"; - hash = "sha256-Ya3nNgPa9MEiDDwoBv8oXi7+Hji9fhUNIm55jJ6w++8="; + hash = "sha256-5iGU23HsaMuRDcy3qeCJZE3p2ikaIlLnuWyGfCAlMYQ="; }; - vendorHash = "sha256-NLsIX0B2YKGNWeAuKIQUs/2sXokUr6PYO5qvvfbbN1Y="; + vendorHash = "sha256-8JtMcEI3UMMuTa9jmkTspjKtseIb2XUcbNuWlrkAVfg="; ldflags = [ "-s" diff --git a/pkgs/by-name/na/nautilus-open-any-terminal/package.nix b/pkgs/by-name/na/nautilus-open-any-terminal/package.nix index 3af2ef1cc5ad..94f6cb402b1d 100644 --- a/pkgs/by-name/na/nautilus-open-any-terminal/package.nix +++ b/pkgs/by-name/na/nautilus-open-any-terminal/package.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonPackage rec { pname = "nautilus-open-any-terminal"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "Stunkymonkey"; repo = pname; tag = version; - hash = "sha256-jKPqgd0sSt/qKPqbYbvdeGuo78R5gp1R5tSTPAzz+IU="; + hash = "sha256-oiyXDeunAgs3uCrqHKdTcOvXD4vmx8Z3uFutNYpGxtc="; }; patches = [ ./hardcode-gsettings.patch ]; diff --git a/pkgs/by-name/na/nautilus-python/package.nix b/pkgs/by-name/na/nautilus-python/package.nix index 565a188dd582..decd2c848b6e 100644 --- a/pkgs/by-name/na/nautilus-python/package.nix +++ b/pkgs/by-name/na/nautilus-python/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Python bindings for the Nautilus Extension API"; homepage = "https://gitlab.gnome.org/GNOME/nautilus-python"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index f2323af1f26a..b226b106f290 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "47.2"; + version = "48.1"; outputs = [ "out" @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - hash = "sha256-fzIDR08uY3ShHGdU7zPzNg6vf1tehfXkd+igrg+nZNk="; + hash = "sha256-eZWioXwp1LCav53ZrKFLje597DvXR3bdN5US8ubXNH8="; }; patches = [ @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://apps.gnome.org/Nautilus/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; mainProgram = "nautilus"; }; }) diff --git a/pkgs/by-name/na/nauty/package.nix b/pkgs/by-name/na/nauty/package.nix index 0963586a049d..f20c1ff37b67 100644 --- a/pkgs/by-name/na/nauty/package.nix +++ b/pkgs/by-name/na/nauty/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "nauty"; - version = "2.8.8"; + version = "2.8.9"; src = fetchurl { url = "https://pallini.di.uniroma1.it/nauty${ builtins.replaceStrings [ "." ] [ "_" ] version }.tar.gz"; - sha256 = "sha256-FZ0hVoEKa7JAQQzWHrZBrdhQiNnxXIiM2qN7hoH5Kc4="; + sha256 = "sha256-yXq0K/SHlqhqWYvOPpJpBHyisywU/CPgcgiiRP5SxO4="; }; outputs = [ @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { "dev" ]; + # HACK: starting from 2.8.9, the makefile tries to copy .libs/*.a files unconditionally + dontDisableStatic = true; + configureFlags = [ # Prevent nauty from sniffing some cpu features. While those are very # widely available, it can lead to nasty bugs when they are not available: @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Programs for computing automorphism groups of graphs and digraphs"; license = licenses.asl20; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; # I'm not sure if the filename will remain the same for future changelog or # if it will track changes to minor releases. Lets see. Better than nothing diff --git a/pkgs/by-name/na/nav/package.nix b/pkgs/by-name/na/nav/package.nix index f5aeaa069db4..5c89611cd808 100644 --- a/pkgs/by-name/na/nav/package.nix +++ b/pkgs/by-name/na/nav/package.nix @@ -1,30 +1,27 @@ { stdenv, lib, - fetchzip, - nix-update-script, + fetchurl, autoPatchelfHook, libxcrypt-legacy, }: -let - system = stdenv.hostPlatform.parsed.cpu.name; - platform = "${system}-unknown-linux-gnu"; -in stdenv.mkDerivation rec { pname = "nav"; - version = "1.2.1"; + version = "1.3.1"; - src = fetchzip { - url = "https://github.com/Jojo4GH/nav/releases/download/v${version}/nav-${platform}.tar.gz"; + src = fetchurl { + url = "https://github.com/Jojo4GH/nav/releases/download/v${version}/nav-${stdenv.hostPlatform.parsed.cpu.name}-unknown-linux-gnu.tar.gz"; sha256 = { - x86_64-linux = "sha256-ihn5wlagmujHlSfJpgojQNqa4NjLF1wk2pt8wHi60DY="; - aarch64-linux = "sha256-l3rKu3OU/TUUjmx3p06k9V5eN3ZDNcxbxObLqVQ2B7U="; + x86_64-linux = "sha256-T/gmQVetPoW+veVmQBHnv56UetiMUXUoJU7f2t9yMVE="; + aarch64-linux = "sha256-ueEeaiUGx+ZbTywNrCMEIZl1zNxhfmZQuN/GkYpiC1Q="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; + sourceRoot = "."; + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib @@ -40,7 +37,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = ./update.sh; meta = { description = "Interactive and stylish replacement for ls & cd"; diff --git a/pkgs/by-name/na/nav/update.sh b/pkgs/by-name/na/nav/update.sh new file mode 100755 index 000000000000..6645453f9a6d --- /dev/null +++ b/pkgs/by-name/na/nav/update.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts +set -eou pipefail + +version=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sfL "https://api.github.com/repos/Jojo4GH/nav/releases/latest" | jq -r .tag_name | sed 's/v//') + +for cpu in "x86_64" "aarch64"; do + + hash=$(nix-hash --type sha256 --to-sri $(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sfL "https://github.com/Jojo4GH/nav/releases/download/v$version/nav-$cpu-unknown-linux-gnu.tar.gz.sha256")) + update-source-version nav $version $hash --system=$cpu-linux --ignore-same-version +done diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix index 81b4773d008e..f4e715411b76 100644 --- a/pkgs/by-name/na/navicat-premium/package.nix +++ b/pkgs/by-name/na/navicat-premium/package.nix @@ -6,17 +6,17 @@ }: let pname = "navicat-premium"; - version = "17.2.1"; + version = "17.2.2"; src = { x86_64-linux = fetchurl { - url = "https://web.archive.org/web/20250315165150/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; - hash = "sha256-noDeF3OLxWpOYSd7e1KKHpk1m8RxmVxCOijiW8Wv+YE="; + url = "https://web.archive.org/web/20250409204831/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; + hash = "sha256-btSHD4hDqaqtdiwgd6jJraUqTcS4lGabPD/Q+UJS6KM="; }; aarch64-linux = fetchurl { - url = "https://web.archive.org/web/20250315170215/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage"; - hash = "sha256-1rdZ4eLeFkZ5Hso4EqUpYjUBFCBYIw0GSL4RPeEgycw="; + url = "https://web.archive.org/web/20250409211232/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage"; + hash = "sha256-D7dVxcHdrlc2Exa+gR8MkY8Tk9+afZXTRTvNzGWGOco="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix index bcba1d8a6ad0..39d1396f83bd 100644 --- a/pkgs/by-name/na/navidrome/package.nix +++ b/pkgs/by-name/na/navidrome/package.nix @@ -1,5 +1,5 @@ { - buildGo123Module, + buildGo124Module, buildPackages, fetchFromGitHub, fetchNpmDeps, @@ -16,18 +16,18 @@ ffmpegSupport ? true, }: -buildGo123Module rec { +buildGo124Module rec { pname = "navidrome"; - version = "0.55.1"; + version = "0.55.2"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-BkgHUX2kQ7OMnb9vOIwsQ9eNcqCzekz2IVMtG0IMUaA="; + hash = "sha256-RJDWpaB0rdrwLSEjwLIZ7ymvYvFSX4/fIT3xFki3278="; }; - vendorHash = "sha256-IF2RaEsuHADnwONrvwbL6KZVrE3bZx1sX03zpmtQZq8="; + vendorHash = "sha256-stdYTvYwsu00l5sAW86nBlwnACOfyLbKi7Xn5gdM/7Y="; npmRoot = "ui"; @@ -92,6 +92,7 @@ buildGo123Module rec { maintainers = with lib.maintainers; [ aciceri squalus + tebriel ]; # Broken on Darwin: sandbox-exec: pattern serialization length exceeds maximum (NixOS/nix#4119) broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/nb/nb-cli/package.nix b/pkgs/by-name/nb/nb-cli/package.nix index 12d6456359c3..74d724b86842 100644 --- a/pkgs/by-name/nb/nb-cli/package.nix +++ b/pkgs/by-name/nb/nb-cli/package.nix @@ -17,6 +17,10 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-HZey1RVpx/fHNxdEue1LczYbwYUxEb3i3fHpkKHhn+8="; }; + pythonRelaxDeps = [ + "watchfiles" + ]; + build-system = [ python3.pkgs.babel python3.pkgs.pdm-backend @@ -43,7 +47,15 @@ python3.pkgs.buildPythonApplication rec { # no test doCheck = false; - pythonImportsCheck = [ "nb_cli" ]; + pythonImportsCheck = [ + "nb_cli" + "nb_cli.cli" + "nb_cli.compat" + "nb_cli.config" + "nb_cli.handlers" + "nb_cli.i18n" + "nb_cli.log" + ]; passthru.tests = { version = testers.testVersion { package = nb-cli; }; diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix index 6b5455b2e2ba..0645cdeb9298 100644 --- a/pkgs/by-name/nb/nb/package.nix +++ b/pkgs/by-name/nb/nb/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.16.1"; + version = "7.18.1"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - hash = "sha256-RX3DEjk+/tivTyv0+j3lZAKYgca4Zq9zQ+P1a/RXj2I="; + hash = "sha256-SKn4/Nqmvv8kRQkooGrvTuVrj70rastVg4j7U3cXdYg="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/nb/nbfc-linux/package.nix b/pkgs/by-name/nb/nbfc-linux/package.nix index 2ae265b615db..551bee71c708 100644 --- a/pkgs/by-name/nb/nbfc-linux/package.nix +++ b/pkgs/by-name/nb/nbfc-linux/package.nix @@ -3,21 +3,24 @@ stdenv, fetchFromGitHub, autoreconfHook, + curl, }: + stdenv.mkDerivation (finalAttrs: { pname = "nbfc-linux"; - version = "0.2.7"; + version = "0.3.16"; src = fetchFromGitHub { owner = "nbfc-linux"; repo = "nbfc-linux"; - rev = "${finalAttrs.version}"; - hash = "sha256-1tLW/xEh01y8BjVbgIa95DkYWf7CDVSo/lI/1U28Xs8="; + tag = "${finalAttrs.version}"; + hash = "sha256-vbpdBYrH8sf62UjVfSiJEwEDpKagGw8FIHkIBKwjy1Q="; }; - nativeBuildInputs = [ - autoreconfHook - ]; + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ curl ]; + configureFlags = [ "--prefix=${placeholder "out"}" "--sysconfdir=${placeholder "out"}/etc" diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix index 900e4f2d2e46..7f2f12863ee9 100644 --- a/pkgs/by-name/nb/nbqa/package.nix +++ b/pkgs/by-name/nb/nbqa/package.nix @@ -73,7 +73,7 @@ let ]) ++ lib.flatten (lib.attrValues optional-dependencies) ++ [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; disabledTests = [ # Test data not found diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix index 08efb59bdf36..7700a16fe628 100644 --- a/pkgs/by-name/nb/nbtscanner/package.nix +++ b/pkgs/by-name/nb/nbtscanner/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, versionCheckHook, @@ -31,13 +29,11 @@ rustPlatform.buildRustPackage rec { --replace-fail '.version("0.1")' '.version("${version}")' ''; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "NetBIOS scanner written in Rust"; diff --git a/pkgs/by-name/nb/nbxplorer/deps.json b/pkgs/by-name/nb/nbxplorer/deps.json index 84e367c1f1af..408869628806 100644 --- a/pkgs/by-name/nb/nbxplorer/deps.json +++ b/pkgs/by-name/nb/nbxplorer/deps.json @@ -166,13 +166,13 @@ }, { "pname": "NBitcoin", - "version": "7.0.50", - "hash": "sha256-l3H70u5OAbd2hevX/yeVBdQyee/dUn5mp4iGvTnTcjk=" + "version": "8.0.12", + "hash": "sha256-OBJu6fQd0MBKSVHERI7EBtSQQvAL9T8Gr0e7Kx2q9/I=" }, { "pname": "NBitcoin.Altcoins", - "version": "3.0.34", - "hash": "sha256-eh5Yft+UQqlLREJJ3kKAKLYYjAHOuMxhBI+tr3Ciya8=" + "version": "4.0.7", + "hash": "sha256-WN9uLRlIW+WGUSS4NE7ZE8kftQEaVDh7AnT1+P8g2gg=" }, { "pname": "NETStandard.Library", diff --git a/pkgs/by-name/nb/nbxplorer/package.nix b/pkgs/by-name/nb/nbxplorer/package.nix index fc6ed897fdd1..df6948d838bc 100644 --- a/pkgs/by-name/nb/nbxplorer/package.nix +++ b/pkgs/by-name/nb/nbxplorer/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.5.23"; + version = "2.5.26"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; - rev = "v${version}"; - sha256 = "sha256-T7pKIj7e4ZOX0JRawLc53eqjMrAV2CV8m6BRjukJ+t4="; + tag = "v${version}"; + hash = "sha256-gXLzUgFZxrDNbDjpPmVDIj2xi6I+IfkNwXBYvelRYPU="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/by-name/nb/nbxplorer/util/update-common.sh b/pkgs/by-name/nb/nbxplorer/util/update-common.sh index 1354588a7549..e9b05253c403 100755 --- a/pkgs/by-name/nb/nbxplorer/util/update-common.sh +++ b/pkgs/by-name/nb/nbxplorer/util/update-common.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_6 git gnupg nixFlakes +#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_8 git gnupg set -euo pipefail # This script uses the following env vars: diff --git a/pkgs/by-name/nc/ncbi-vdb/package.nix b/pkgs/by-name/nc/ncbi-vdb/package.nix index 1424b3fb81a2..5e8348db74f1 100644 --- a/pkgs/by-name/nc/ncbi-vdb/package.nix +++ b/pkgs/by-name/nc/ncbi-vdb/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncbi-vdb"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "ncbi"; repo = "ncbi-vdb"; tag = finalAttrs.version; - hash = "sha256-HBiheN8XfYYwmY5gw7j8qTczn6WZZNTzY2/fGtpgs/8="; + hash = "sha256-ccKJF6Ank/hyADnDwN0qoQbb0BniXlz/Fgnc1IXq0P0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nc/ncftp/package.nix b/pkgs/by-name/nc/ncftp/package.nix index 9ed5733d8925..85146b1b2527 100644 --- a/pkgs/by-name/nc/ncftp/package.nix +++ b/pkgs/by-name/nc/ncftp/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncftp"; - version = "3.2.7"; + version = "3.3.0"; src = fetchurl { - url = "https://www.ncftp.com/public_ftp/ncftp/ncftp-${finalAttrs.version}-src.tar.xz"; - hash = "sha256-1BxcTWYUqOri7U5NetprbTr8yftlpO2bhxE0S+8k9+g="; + url = "https://www.ncftp.com/public_ftp/ncftp/ncftp-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-eSD4hMKtr8gsjkHEbW89ImmHhcez9W9Wd6jVyGY5Y4Y="; }; buildInputs = [ ncurses ]; @@ -53,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: { "--mandir=$(out)/share/man/" ]; - meta = with lib; { + meta = { description = "Command line FTP (File Transfer Protocol) client"; homepage = "https://www.ncftp.com/ncftp/"; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.unix; - license = licenses.clArtistic; + maintainers = with lib.maintainers; [ bjornfor ]; + platforms = lib.platforms.unix; + license = lib.licenses.clArtistic; mainProgram = "ncftp"; }; }) diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix index 4ab6257c3f7a..2d8439b5cbad 100644 --- a/pkgs/by-name/nc/nchat/package.nix +++ b/pkgs/by-name/nc/nchat/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, file, # for libmagic @@ -10,18 +11,17 @@ zlib, cmake, gperf, - stdenv, - darwin, + nix-update-script, }: let - version = "5.4.2"; + version = "5.7.24"; src = fetchFromGitHub { owner = "d99kris"; repo = "nchat"; tag = "v${version}"; - hash = "sha256-NrAU47GA7ZASJ7vCo1S8nyGBpfsZn4EBBqx2c4HKx7k="; + hash = "sha256-qyx4LOhCFcwg2ou4QgiiolGgLs2fxfQu6gwDIeMUcb4="; }; libcgowm = buildGoModule { @@ -29,14 +29,18 @@ let inherit version src; sourceRoot = "${src.name}/lib/wmchat/go"; - vendorHash = "sha256-EdbOO5cCDT1CcPlCBgMoPDg65FcoOYvBwZa4bz0hfGE="; + vendorHash = "sha256-LPcIfXOlkejyLlYtew26FTOl7eBGhuNxjAVrmUItkxY="; buildPhase = '' + runHook preBuild + mkdir -p $out/ go build -o $out/ -buildmode=c-archive mv $out/go.a $out/libcgowm.a ln -s $out/libcgowm.a $out/libref-cgowm.a mv $out/go.h $out/libcgowm.h + + runHook postBuild ''; }; in @@ -75,28 +79,29 @@ stdenv.mkDerivation rec { libcgowm ]; - buildInputs = - [ - file # for libmagic - ncurses - openssl - readline - sqlite - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Cocoa - Foundation - ] - ); + buildInputs = [ + file # for libmagic + ncurses + openssl + readline + sqlite + zlib + ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + passthru = { + inherit libcgowm; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "libcgowm" + ]; + }; + }; + meta = { description = "Terminal-based chat client with support for Telegram and WhatsApp"; changelog = "https://github.com/d99kris/nchat/releases/tag/v${version}"; diff --git a/pkgs/by-name/nc/ncpamixer/package.nix b/pkgs/by-name/nc/ncpamixer/package.nix index e8977c63757a..88b0ad65c22c 100644 --- a/pkgs/by-name/nc/ncpamixer/package.nix +++ b/pkgs/by-name/nc/ncpamixer/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fulhax/ncpamixer"; license = licenses.mit; platforms = platforms.linux; - maintainers = teams.c3d2.members; + teams = [ teams.c3d2 ]; mainProgram = "ncpamixer"; }; } diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index be29560ce1a9..104e7f233942 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -8,13 +8,13 @@ let finalAttrs = { pname = "ncps"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "kalbasit"; repo = "ncps"; tag = "v${finalAttrs.version}"; - hash = "sha256-Vr/thppCABdZDl1LEc7l7c7Ih55U/EFwJInWSUWoLJA"; + hash = "sha256-CjiPn5godd8lT3eE9e7MnZ0/2hOEq+CG0bpgRtLtwHo="; }; ldflags = [ @@ -23,7 +23,7 @@ let subPackages = [ "." ]; - vendorHash = "sha256-xPrWofNyDFrUPQ42AYDs2x2gGoQ2w3tRrMIsu3SVyHA="; + vendorHash = "sha256-El3yvYYnase4ztG3u7xxcKE5ARy5Lvp/FVosBwOXzbU="; doCheck = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/neargye-semver/package.nix b/pkgs/by-name/ne/neargye-semver/package.nix new file mode 100644 index 000000000000..948b5bd82a8b --- /dev/null +++ b/pkgs/by-name/ne/neargye-semver/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "neargye-semver"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "Neargye"; + repo = "semver"; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-0HOp+xzo8xcCUUgtSh87N9DXP5P0odBaYXhcDzOiiXE="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + doCheck = true; + + # Install headers + postInstall = '' + mkdir -p $out/include + cp -r $src/include/* $out/include/ + ''; + + meta = { + description = "C++17 header-only dependency-free versioning library complying with Semantic Versioning 2.0.0"; + homepage = "https://github.com/Neargye/semver"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ phodina ]; + }; +}) diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix new file mode 100644 index 000000000000..b01280747f8b --- /dev/null +++ b/pkgs/by-name/ne/necesse-server/package.nix @@ -0,0 +1,53 @@ +{ + fetchzip, + jre, + lib, + stdenvNoCC, +}: + +let + version = "0.32.1-18336931"; + urlVersion = lib.replaceStrings [ "." ] [ "-" ] version; + +in +stdenvNoCC.mkDerivation { + pname = "necesse-server"; + inherit version; + + src = fetchzip { + url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip"; + hash = "sha256-vvTbwEcfpzLIWSjbkUqKBOyAsT2fFk27v9UB9V+fTfw="; + }; + + # removing packaged jre since we use our own + postUnpack = '' + rm -rf "$sourceRoot/jre" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r . $out + params='-nogui "$@"' + cat >$out/bin/necesse-server </libs/get_source_env.sh - Xray-core = fetchSource { - name = "Xray-core"; - rev = "01208225ee7e508044cca8eb6776a117bcecd997"; - hash = "sha256-R66i9MITdE9JlhD4wV0EitKPxyahQqDNpunUxVTmupA="; - }; - sing-box-extra = fetchSource { - name = "sing-box-extra"; - rev = "d31d6da26a51a929349e0d75fd89dccbe20d1268"; - hash = "sha256-YlzMAff8VOZGyCP7ksjcmoBDHT5llTYwwXIrs+qO5P4="; - }; - - # revs found in https://github.com/MatsuriDayo/sing-box-extra/blob//libs/get_source_env.sh - sing-box = fetchSource { - name = "sing-box"; - rev = "64f4eed2c667d9ff1e52a84233dee0e2ca32c17e"; - hash = "sha256-jIg/+fvTn46h6tE6YXtov+ZaBD/ywApTZbzHlT5v4lM="; - }; - sing-quic = fetchSource { - name = "sing-quic"; - rev = "e396733db4de15266f0cfdb43c392aca0759324a"; - hash = "sha256-un5NtZPRx1QAjwNhXkR9OVGldtfM1jQoNRUzt9oilUE="; - }; - libneko = fetchSource { - name = "libneko"; - rev = "5277a5bfc889ee7a89462695b0e678c1bd4909b1"; - hash = "sha256-6dlWDzI9ox4PQzEtJNgwA0pXmPC7fGrGId88Zl+1gpw="; - }; - }; - - geodata = { - "geoip.dat" = "${v2ray-geoip}/share/v2ray/geoip.dat"; - "geosite.dat" = "${v2ray-domain-list-community}/share/v2ray/geosite.dat"; - "geoip.db" = "${sing-geoip}/share/sing-box/geoip.db"; - "geosite.db" = "${sing-geosite}/share/sing-box/geosite.db"; - }; - - installGeodata = lib.concatStringsSep "\n" ( - lib.mapAttrsToList (filename: file: '' - install -Dm644 ${file} "$out/share/nekoray/${filename}" - '') geodata - ); -in stdenv.mkDerivation (finalAttrs: { pname = "nekoray"; - version = "3.26"; + version = "4.3.4"; - src = fetchSource { - name = "nekoray"; - rev = finalAttrs.version; - hash = "sha256-fDm6fCI6XA4DHKCN3zm9B7Qbdh3LTHYGK8fPmeEnhjI="; - fetchSubmodules = true; + src = fetchFromGitHub { + owner = "Mahdi-zarei"; + repo = "nekoray"; + tag = finalAttrs.version; + hash = "sha256-h0LkH58+QQFeSwqhqOZDcFF0n98YJEHH/1tq72LdZpI="; }; strictDeps = true; nativeBuildInputs = [ - libsForQt5.wrapQtAppsHook cmake - ninja copyDesktopItems + ninja + qt6Packages.wrapQtAppsHook ]; buildInputs = [ - libsForQt5.qtbase - libsForQt5.qttools - libsForQt5.qtwayland - libsForQt5.qtx11extras + libcpr protobuf + qt6Packages.qtbase + qt6Packages.qttools yaml-cpp zxing-cpp ]; - # NKR_PACKAGE makes sure the app uses the user's config directory to store it's non-static content - # it's essentially the same as always setting the -appdata flag when running the program - cmakeFlags = [ (lib.cmakeBool "NKR_PACKAGE" true) ]; + cmakeFlags = [ + # makes sure the app uses the user's config directory to store it's non-static content + # it's essentially the same as always setting the -appdata flag when running the program + (lib.cmakeBool "NKR_PACKAGE" true) + ]; + + patches = [ + # if compiled with NKR_PACKAGE, nekoray assumes geoip.db and geosite.db will be found in ~/.config/nekoray + # we already package those two files in nixpkgs + # we can't place file at that location using our builder so we must change the search directory to be relative to the built executable + ./search-for-geodata-in-install-location.patch + ]; installPhase = '' runHook preInstall @@ -115,12 +70,11 @@ stdenv.mkDerivation (finalAttrs: { ln -s "$out/share/nekoray/nekoray" "$out/bin" # nekoray looks for other files and cores in the same directory it's located at - ln -s ${finalAttrs.passthru.nekoray-core}/bin/nekoray_core "$out/share/nekoray/nekoray_core" ln -s ${finalAttrs.passthru.nekobox-core}/bin/nekobox_core "$out/share/nekoray/nekobox_core" - ${installGeodata} - - install -Dm644 "$src/res/public/nekoray.png" "$out/share/icons/hicolor/256x256/apps/nekoray.png" + # our patch also makes nekoray look for geodata files next to the executable + ln -s ${sing-geoip}/share/sing-box/geoip.db "$out/share/nekoray/geoip.db" + ln -s ${sing-geosite}/share/sing-box/geosite.db "$out/share/nekoray/geosite.db" runHook postInstall ''; @@ -133,27 +87,41 @@ stdenv.mkDerivation (finalAttrs: { icon = "nekoray"; comment = finalAttrs.meta.description; terminal = false; - categories = [ - "Network" - "Application" - ]; + categories = [ "Network" ]; }) ]; - passthru = { - nekobox-core = callPackage ./nekobox-core.nix { - inherit (finalAttrs) src version; - inherit extraSources; - }; - nekoray-core = callPackage ./nekoray-core.nix { - inherit (finalAttrs) src version; - inherit extraSources; - }; + passthru.nekobox-core = buildGoModule { + pname = "nekobox-core"; + inherit (finalAttrs) version src; + sourceRoot = "${finalAttrs.src.name}/core/server"; + + vendorHash = "sha256-CTI9wDPJ9dYpUwvszY2nRfi+NW0nO8imt9lsQ7Nd1Q8="; + + # ldflags and tags are taken from script/build_go.sh + ldflags = [ + "-w" + "-s" + "-X github.com/sagernet/sing-box/constant.Version=${finalAttrs.version}" + ]; + + tags = [ + "with_clash_api" + "with_gvisor" + "with_quic" + "with_wireguard" + "with_utls" + "with_ech" + "with_dhcp" + ]; }; + # this tricks nix-update into also updating the vendorHash of nekobox-core + passthru.goModules = finalAttrs.passthru.nekobox-core.goModules; + meta = { description = "Qt based cross-platform GUI proxy configuration manager"; - homepage = "https://github.com/MatsuriDayo/nekoray"; + homepage = "https://github.com/Mahdi-zarei/nekoray"; license = lib.licenses.gpl3Plus; mainProgram = "nekoray"; maintainers = with lib.maintainers; [ tomasajt ]; diff --git a/pkgs/by-name/ne/nekoray/search-for-geodata-in-install-location.patch b/pkgs/by-name/ne/nekoray/search-for-geodata-in-install-location.patch new file mode 100644 index 000000000000..1af2e727bc41 --- /dev/null +++ b/pkgs/by-name/ne/nekoray/search-for-geodata-in-install-location.patch @@ -0,0 +1,13 @@ +diff --git a/src/global/NekoGui.cpp b/src/global/NekoGui.cpp +index d9be515..15de64b 100644 +--- a/src/global/NekoGui.cpp ++++ b/src/global/NekoGui.cpp +@@ -426,8 +426,6 @@ namespace NekoGui { + }; + + QString GetBasePath() { +- if (dataStore->flag_use_appdata) return QStandardPaths::writableLocation( +- QStandardPaths::AppConfigLocation); + return qApp->applicationDirPath(); + } + diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix new file mode 100644 index 000000000000..90f333cc01a3 --- /dev/null +++ b/pkgs/by-name/ne/nelm/package.nix @@ -0,0 +1,68 @@ +{ + buildGoModule, + buildPackages, + fetchFromGitHub, + installShellFiles, + lib, + stdenv, + versionCheckHook, +}: +buildGoModule (finalAttrs: { + pname = "nelm"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "werf"; + repo = "nelm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yIBgNgWqWxEHlrngNe47iSqVcPIoqet3V/nCnqftk1Q="; + }; + + vendorHash = "sha256-osFfjZcvNVNkX2YAcgWS0AYD2b0DzN3RUvZU1P7epbU="; + + subPackages = [ "cmd/nelm" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/werf/nelm/internal/common.Brand=Nelm" + "-X github.com/werf/nelm/internal/common.Version=${finalAttrs.version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + preCheck = '' + # Test all packages. + unset subPackages + ''; + + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + for shell in bash fish zsh; do + installShellCompletion \ + --cmd nelm \ + --$shell <(${emulator} $out/bin/nelm completion $shell) + done + '' + ); + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "version"; + + meta = { + description = "Kubernetes deployment tool, alternative to Helm 3"; + longDescription = '' + Nelm is a Helm 3 alternative. It is a Kubernetes deployment tool that + manages Helm Charts and deploys them to Kubernetes. + ''; + homepage = "https://github.com/werf/nelm"; + changelog = "https://github.com/werf/nelm/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.azahi ]; + mainProgram = "nelm"; + }; +}) diff --git a/pkgs/by-name/ne/nemo-emblems/package.nix b/pkgs/by-name/ne/nemo-emblems/package.nix index faa0215419b1..08d8886022d2 100644 --- a/pkgs/by-name/ne/nemo-emblems/package.nix +++ b/pkgs/by-name/ne/nemo-emblems/package.nix @@ -38,6 +38,6 @@ python3.pkgs.buildPythonApplication rec { ''; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ne/nemo-fileroller/package.nix b/pkgs/by-name/ne/nemo-fileroller/package.nix index ae668730829e..9f5115f7922c 100644 --- a/pkgs/by-name/ne/nemo-fileroller/package.nix +++ b/pkgs/by-name/ne/nemo-fileroller/package.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "Nemo file roller extension"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ne/nemo-preview/package.nix b/pkgs/by-name/ne/nemo-preview/package.nix index 93ded54859fd..83d5742af99c 100644 --- a/pkgs/by-name/ne/nemo-preview/package.nix +++ b/pkgs/by-name/ne/nemo-preview/package.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Quick previewer for Nemo, the Cinnamon desktop file manager"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = lib.teams.cinnamon.members; + teams = [ lib.teams.cinnamon ]; }; }) diff --git a/pkgs/by-name/ne/nemo-python/package.nix b/pkgs/by-name/ne/nemo-python/package.nix index a80cf5e60294..2caf1456f9b1 100644 --- a/pkgs/by-name/ne/nemo-python/package.nix +++ b/pkgs/by-name/ne/nemo-python/package.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { description = "Python bindings for the Nemo extension library"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ne/nemo-seahorse/package.nix b/pkgs/by-name/ne/nemo-seahorse/package.nix index 593a5e97e679..8c8bd4396d72 100644 --- a/pkgs/by-name/ne/nemo-seahorse/package.nix +++ b/pkgs/by-name/ne/nemo-seahorse/package.nix @@ -85,6 +85,6 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = lib.teams.cinnamon.members; + teams = [ lib.teams.cinnamon ]; }; } diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix index 5faaf68ef2b9..9d93c359a3d1 100644 --- a/pkgs/by-name/ne/nemo/package.nix +++ b/pkgs/by-name/ne/nemo/package.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { licenses.lgpl2 ]; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; mainProgram = "nemo"; }; } diff --git a/pkgs/by-name/ne/neo4j/package.nix b/pkgs/by-name/ne/neo4j/package.nix index a6f80296a53f..6d70883fe9d6 100644 --- a/pkgs/by-name/ne/neo4j/package.nix +++ b/pkgs/by-name/ne/neo4j/package.nix @@ -7,6 +7,7 @@ openjdk17, which, gawk, + bashNonInteractive, }: stdenv.mkDerivation rec { @@ -19,6 +20,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bashNonInteractive ]; + strictDeps = true; installPhase = '' mkdir -p "$out/share/neo4j" diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix index b521d70158c0..d9b9aeb78848 100644 --- a/pkgs/by-name/ne/neocmakelsp/package.nix +++ b/pkgs/by-name/ne/neocmakelsp/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.8.21"; + version = "0.8.23"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-iVetPUg/eX8o2BB1y9dlijbhZUyDNMHaLrqcqTbvpQk="; + hash = "sha256-4zu5y1LnZFkysYm3w0HY3+/0Jn8WuZh17fJ1fo3Q/hQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Mswh/wuowrWORj16Mvg4kIueW72bEFw3Ax2RBMtATqY="; + cargoHash = "sha256-oExHwID8mkDx+DFQNXt0D9PUkaLndDeTSna1V6Wd00c="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ne/neocomp/package.nix b/pkgs/by-name/ne/neocomp/package.nix deleted file mode 100644 index 31e7d7de8ec9..000000000000 --- a/pkgs/by-name/ne/neocomp/package.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - asciidoc, - docbook_xml_dtd_45, - docbook_xsl, - freetype, - judy, - libGL, - libconfig, - libdrm, - libxml2, - libxslt, - libXcomposite, - libXdamage, - libXext, - libXinerama, - libXrandr, - libXrender, - libXres, - pcre, - pkg-config, -}: - -stdenv.mkDerivation rec { - pname = "neocomp"; - version = "unstable-2021-04-06"; - - src = fetchFromGitHub { - owner = "DelusionalLogic"; - repo = "NeoComp"; - rev = "ccd340d7b2dcd3f828aff958a638cc23686aee6f"; - sha256 = "sha256-tLLEwpAGNVTC+N41bM7pfskIli4Yvc95wH2/NT0OZ+8="; - }; - - nativeBuildInputs = [ - asciidoc - docbook_xml_dtd_45 - docbook_xsl - pkg-config - ]; - - buildInputs = [ - freetype - judy - libGL - libconfig - libdrm - libxml2 - libxslt - libXcomposite - libXdamage - libXext - libXinerama - libXrandr - libXrender - libXres - pcre - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "CFGDIR=${placeholder "out"}/etc/xdg/neocomp" - "ASTDIR=${placeholder "out"}/share/neocomp/assets" - "COMPTON_VERSION=${version}" - ]; - - postPatch = '' - substituteInPlace src/compton.c --replace \ - "assets_add_path(\"./assets/\");" \ - "assets_add_path(\"$out/share/neocomp/assets/\");" - substituteInPlace src/assets/assets.c --replace \ - "#define MAX_PATH_LENGTH 64" \ - "#define MAX_PATH_LENGTH 128" - ''; - - meta = with lib; { - homepage = "https://github.com/DelusionalLogic/NeoComp"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ - twey - moni - ]; - platforms = platforms.linux; - description = "Fork of Compton, a compositor for X11"; - longDescription = '' - NeoComp is a (hopefully) fast and (hopefully) simple compositor - for X11, focused on delivering frames from the window to the - framebuffer as quickly as possible. - ''; - mainProgram = "neocomp"; - }; -} diff --git a/pkgs/by-name/ne/neohtop/package.nix b/pkgs/by-name/ne/neohtop/package.nix index 14a83ec87048..4ed54a841699 100644 --- a/pkgs/by-name/ne/neohtop/package.nix +++ b/pkgs/by-name/ne/neohtop/package.nix @@ -11,7 +11,6 @@ fetchFromGitHub, glib, gtk3, - libsoup_2_4, openssl, nix-update-script, }: @@ -51,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { glib gtk3 openssl - libsoup_2_4 webkitgtk_4_1 ]; diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index 05b6cf155a6e..79d69da40353 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -26,17 +26,17 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; tag = version; - hash = "sha256-tXKTKE2JrDDJDpnipCv1hk7vS/0i7nrjzqMoMAy53qM="; + hash = "sha256-MLiLddF53OXDPYuJbTAscezxN09mxZkuSOZtQz07JSE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RKgpgM6quN0plYYE8fien5tUtHlN0YG0VTp5BGuzzuo="; + cargoHash = "sha256-1ni8AZIwAz5R2Ejt9Fj5qmybvL4KZV/M3BMqQx4HFLU="; SKIA_SOURCE_DIR = let @@ -44,8 +44,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - tag = "m132-0.81.0"; - hash = "sha256-9DQgCaCiK0zgsl0wARPEiGjyXxmNLRSYaHf3690KuCM="; + tag = "m135-0.83.1"; + hash = "sha256-TSGPJl9DfWQtrkNIhv40s8VcuudCjbiSh+QjLc0hKN4="; }; # The externals for skia are taken from skia/DEPS externals = linkFarm "skia-externals" ( @@ -89,6 +89,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { [ libglvnd libxkbcommon + xorg.libX11 xorg.libXcursor xorg.libXext xorg.libXrandr diff --git a/pkgs/by-name/ne/neovim-node-client/package.nix b/pkgs/by-name/ne/neovim-node-client/package.nix index 4c000ed895ab..e59b444e7bab 100644 --- a/pkgs/by-name/ne/neovim-node-client/package.nix +++ b/pkgs/by-name/ne/neovim-node-client/package.nix @@ -38,7 +38,7 @@ buildNpmPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/neovim-node-host"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 6c26e4d1a646..520233ca23e9 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation ( in { pname = "neovim-unwrapped"; - version = "0.11.0"; + version = "0.11.1"; __structuredAttrs = true; @@ -103,7 +103,7 @@ stdenv.mkDerivation ( owner = "neovim"; repo = "neovim"; tag = "v${finalAttrs.version}"; - hash = "sha256-UVMRHqyq3AP9sV79EkPUZnVkj0FpbS+XDPPOppp2yFE="; + hash = "sha256-kJvKyNjpqIKa5aBi62jHTCb1KxQ4YgYtBh/aNYZSeO8="; }; patches = [ @@ -270,7 +270,7 @@ stdenv.mkDerivation ( asl20 vim ]; - maintainers = lib.teams.neovim.members; + teams = [ lib.teams.neovim ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ne/nerd-font-patcher/package.nix b/pkgs/by-name/ne/nerd-font-patcher/package.nix index 0cc66507523e..bb66a717bda7 100644 --- a/pkgs/by-name/ne/nerd-font-patcher/package.nix +++ b/pkgs/by-name/ne/nerd-font-patcher/package.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "nerd-font-patcher"; - version = "3.3.0"; + version = "3.4.0"; src = fetchzip { url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/FontPatcher.zip"; - sha256 = "sha256-/LbO8+ZPLFIUjtZHeyh6bQuplqRfR6SZRu9qPfVZ0Mw="; + sha256 = "sha256-koZj0Tn1HtvvSbQGTc3RbXQdUU4qJwgClOVq1RXW6aM="; stripRoot = false; }; diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix index 76c5f37fb143..811ae2d69a3c 100644 --- a/pkgs/by-name/ne/nest-cli/package.nix +++ b/pkgs/by-name/ne/nest-cli/package.nix @@ -1,24 +1,23 @@ { buildNpmPackage, - darwin, fetchFromGitHub, lib, python3, - stdenv, }: buildNpmPackage rec { pname = "nest-cli"; - version = "10.4.9"; + version = "11.0.7"; src = fetchFromGitHub { owner = "nestjs"; repo = "nest-cli"; - rev = version; - hash = "sha256-dko+hOC3oZToNS+EOqmm+z7DLHfqqKDeQsH2sYxburU="; + tag = version; + hash = "sha256-CCNbkSu/ymSKdFVDKZezekVFXl6Ipg9Dp9+Tyd4D+cY="; }; - npmDepsHash = "sha256-K4M6Jehy1854SuxDiaHQLlvhOecwInZZbOcgMqchiIM="; + npmDepsHash = "sha256-R9uSOeoQJw061ZEJMe8aDYUaUC1QvHQ9nOyoQa+z+fY="; + npmFlags = [ "--legacy-peer-deps" ]; env = { npm_config_build_from_source = true; @@ -28,15 +27,15 @@ buildNpmPackage rec { python3 ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - - meta = with lib; { - description = "CLI tool for Nest applications"; + meta = { homepage = "https://nestjs.com"; - license = licenses.mit; + description = "CLI tool for Nest applications"; + license = lib.licenses.mit; + changelog = "https://github.com/nestjs/nest-cli/releases/tag/${version}"; mainProgram = "nest"; - maintainers = [ maintainers.ehllie ]; + maintainers = with lib.maintainers; [ + ehllie + phanirithvij + ]; }; } diff --git a/pkgs/by-name/ne/nesting/package.nix b/pkgs/by-name/ne/nesting/package.nix index 1fbc3af9007b..928fec3c059d 100644 --- a/pkgs/by-name/ne/nesting/package.nix +++ b/pkgs/by-name/ne/nesting/package.nix @@ -9,33 +9,34 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "nesting"; version = "0.3.0"; src = fetchFromGitLab { - group = "gitlab-org"; - owner = "fleeting"; + owner = "gitlab-org/fleeting"; repo = "nesting"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ejoLld1TmwaqTlSyuzyEVEqLyEehu6g7yc0H0Cvkqp4="; }; vendorHash = "sha256-CyXlK/0VWMFlwSfisoaNCRdknasp8faN/K/zdyRhAQQ="; - subPackages = [ "cmd/nesting" ]; - - # See https://gitlab.com/gitlab-org/fleeting/nesting/-/blob/v0.3.0/Makefile?ref_type=tags#L22-24. - # - # Needed for "nesting version" to not show "dev". - ldflags = [ - "-X gitlab.com/gitlab-org/fleeting/nesting.NAME=nesting" - "-X gitlab.com/gitlab-org/fleeting/nesting.VERSION=v${version}" - "-X gitlab.com/gitlab-org/fleeting/nesting.REVISION=${src.rev}" - ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; + # Needed for "nesting version" to not show "dev". + # + # https://gitlab.com/gitlab-org/fleeting/nesting/-/blob/v0.3.0/Makefile?ref_type=tags#L22-24 + ldflags = + let + ldflagsPackageVariablePrefix = "gitlab.com/gitlab-org/fleeting/nesting"; + in + [ + "-X ${ldflagsPackageVariablePrefix}.NAME=nesting" + "-X ${ldflagsPackageVariablePrefix}.VERSION=${finalAttrs.version}" + "-X ${ldflagsPackageVariablePrefix}.REFERENCE=v${finalAttrs.version}" + ]; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -57,4 +58,4 @@ buildGoModule rec { "x86_64-darwin" ]; }; -} +}) diff --git a/pkgs/by-name/ne/net-cpp/package.nix b/pkgs/by-name/ne/net-cpp/package.nix index fedb695fc245..1fd254363026 100644 --- a/pkgs/by-name/ne/net-cpp/package.nix +++ b/pkgs/by-name/ne/net-cpp/package.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/ubports/development/core/lib-cpp/net-cpp"; changelog = "https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/blob/${finalAttrs.version}/ChangeLog"; license = licenses.lgpl3Only; - maintainers = teams.lomiri.members; + teams = [ teams.lomiri ]; platforms = platforms.linux; pkgConfigModules = [ "net-cpp" diff --git a/pkgs/by-name/ne/net-snmp/package.nix b/pkgs/by-name/ne/net-snmp/package.nix index a8c268e2abb9..c1ad4ea5d064 100644 --- a/pkgs/by-name/ne/net-snmp/package.nix +++ b/pkgs/by-name/ne/net-snmp/package.nix @@ -9,7 +9,6 @@ nettools, autoreconfHook, withPerlTools ? false, - darwin, }: let @@ -84,15 +83,7 @@ stdenv.mkDerivation rec { file autoreconfHook ]; - buildInputs = - [ openssl ] - ++ lib.optional withPerlTools perlWithPkgs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.ApplicationServices - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.DiskArbitration - ]; + buildInputs = [ openssl ] ++ lib.optional withPerlTools perlWithPkgs; enableParallelBuilding = true; # Missing dependencies during relinking: diff --git a/pkgs/by-name/ne/netatalk/package.nix b/pkgs/by-name/ne/netatalk/package.nix index 9832c80527c5..83de57d738fb 100644 --- a/pkgs/by-name/ne/netatalk/package.nix +++ b/pkgs/by-name/ne/netatalk/package.nix @@ -22,17 +22,17 @@ openldap, glib, dbus, - docbook-xsl-nons, - libxslt, + iniparser, + pandoc, }: stdenv.mkDerivation (finalAttrs: { pname = "netatalk"; - version = "4.1.2"; + version = "4.2.3"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz"; - hash = "sha256-qCX2/37+2wm7nKdXJ6tDEmeXAA+Jd123LI2VIL9IHpw="; + hash = "sha256-EKPDpMEazsZX35wzxppiaeMZ26dZxeHfpB7lo/G4DEM="; }; nativeBuildInputs = [ @@ -58,12 +58,13 @@ stdenv.mkDerivation (finalAttrs: { glib perl dbus - docbook-xsl-nons - libxslt + iniparser + pandoc ]; mesonFlags = [ "-Dwith-appletalk=true" + "-Dwith-statedir-path=/var/lib" "-Dwith-bdb-path=${db.out}" "-Dwith-bdb-include-path=${db.dev}/include" "-Dwith-install-hooks=false" @@ -71,16 +72,16 @@ stdenv.mkDerivation (finalAttrs: { "-Dwith-lockfile-path=/run/lock/" "-Dwith-cracklib=true" "-Dwith-cracklib-path=${cracklib.out}" - "-Dwith-docbook-path=${docbook-xsl-nons.out}/share/xml/docbook-xsl-nons/" + "-Dwith-statedir-creation=false" ]; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Apple Filing Protocol Server"; homepage = "https://netatalk.io/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ jcumming ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jcumming ]; }; }) diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix index 7734682aed95..394f8d73afab 100644 --- a/pkgs/by-name/ne/netavark/package.nix +++ b/pkgs/by-name/ne/netavark/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { description = "Rust based network stack for containers"; homepage = "https://github.com/containers/netavark"; license = licenses.asl20; - maintainers = with maintainers; [ ] ++ teams.podman.members; + teams = [ teams.podman ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index e43016e3ddb7..1dd55b19c9cb 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -31,16 +31,16 @@ let in buildGoModule (finalAttrs: { pname = "netbird"; - version = "0.39.2"; + version = "0.44.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-K1qnQfkptMFviWWqzDA+yju/L/aMNTyO3qDHzMJnXzU="; + hash = "sha256-+tiQx692GSAI5AoDaKY5x3Z3WrX6QU+WFV96paM9ayw="; }; - vendorHash = "sha256-yNFyW1D2gFkt2VDTyiaDXPw0zrT4KBQTe72x0Jh0jOs="; + vendorHash = "sha256-EVhtxYDinmid5C/3N8UGmCzWw1qIE3m0rXes4uFpcOM="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; @@ -119,6 +119,7 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ vrifox saturn745 + loc ]; mainProgram = if ui then "netbird-ui" else "netbird"; }; diff --git a/pkgs/by-name/ne/netbox2netshot/package.nix b/pkgs/by-name/ne/netbox2netshot/package.nix index 96d1bbb78e00..c6191cd6bdfa 100644 --- a/pkgs/by-name/ne/netbox2netshot/package.nix +++ b/pkgs/by-name/ne/netbox2netshot/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Inventory synchronization tool between Netbox and Netshot"; diff --git a/pkgs/by-name/ne/netbox_4_1/package.nix b/pkgs/by-name/ne/netbox_4_1/package.nix index 384e6ddb99f5..f2b36a10cf3d 100644 --- a/pkgs/by-name/ne/netbox_4_1/package.nix +++ b/pkgs/by-name/ne/netbox_4_1/package.nix @@ -15,7 +15,7 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "4.1.7"; + version = "4.1.11"; format = "other"; @@ -23,7 +23,7 @@ py.pkgs.buildPythonApplication rec { owner = "netbox-community"; repo = "netbox"; tag = "v${version}"; - hash = "sha256-0AyIXSiNsAHELM8Ry/bcm7sd7K+ApeoEguiEm8ecAU0="; + hash = "sha256-Nd8HWXn7v0llmg934KGtS5+Tj2RvBhJDuXEvB2Pg3nQ="; }; patches = [ @@ -127,6 +127,9 @@ py.pkgs.buildPythonApplication rec { description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool"; mainProgram = "netbox"; license = lib.licenses.asl20; + knownVulnerabilities = [ + "Netbox version ${version} is EOL; please upgrade by following the current release notes instructions." + ]; maintainers = with lib.maintainers; [ minijackson raitobezarius diff --git a/pkgs/by-name/ne/netbox_4_2/package.nix b/pkgs/by-name/ne/netbox_4_2/package.nix index 34f75c1f6bbc..371a07b361ff 100644 --- a/pkgs/by-name/ne/netbox_4_2/package.nix +++ b/pkgs/by-name/ne/netbox_4_2/package.nix @@ -4,6 +4,7 @@ python3, plugins ? _ps: [ ], nixosTests, + nix-update-script, }: let py = python3.override { @@ -14,7 +15,7 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "4.2.6"; + version = "4.2.9"; format = "other"; @@ -22,7 +23,7 @@ py.pkgs.buildPythonApplication rec { owner = "netbox-community"; repo = "netbox"; tag = "v${version}"; - hash = "sha256-SOGVMaqAYc+DeyeF5ZQ4TQr9RIhWH23Lwth3h0Y3Dtg="; + hash = "sha256-uVe4YTZoxRMBfvItFa9SMHu4AaVvygfAg9GDB115TFc="; }; patches = [ @@ -112,6 +113,7 @@ py.pkgs.buildPythonApplication rec { netbox = nixosTests.netbox_4_2; inherit (nixosTests) netbox-upgrade; }; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/by-name/ne/netcat-gnu/package.nix b/pkgs/by-name/ne/netcat-gnu/package.nix index f072cf5d2133..00fdcbe54461 100644 --- a/pkgs/by-name/ne/netcat-gnu/package.nix +++ b/pkgs/by-name/ne/netcat-gnu/package.nix @@ -4,21 +4,21 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netcat-gnu"; version = "0.7.1"; src = fetchurl { - url = "mirror://sourceforge/netcat/netcat-${version}.tar.bz2"; - sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; + url = "mirror://sourceforge/netcat/netcat-${finalAttrs.version}.tar.bz2"; + hash = "sha256:1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; }; - meta = with lib; { + meta = { description = "Utility which reads and writes data across network connections"; homepage = "https://netcat.sourceforge.net/"; mainProgram = "netcat"; - license = licenses.gpl2Plus; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ RossComputerGuy ]; }; -} +}) diff --git a/pkgs/by-name/ne/netcdf/package.nix b/pkgs/by-name/ne/netcdf/package.nix index 42aa89ab7d94..b9bfa0de107e 100644 --- a/pkgs/by-name/ne/netcdf/package.nix +++ b/pkgs/by-name/ne/netcdf/package.nix @@ -46,15 +46,17 @@ stdenv.mkDerivation rec { libxml2 # xml2-config ]; - buildInputs = [ - curl - hdf5 - libxml2 - mpi - bzip2 - libzip - zstd - ] ++ lib.optional szipSupport szip; + buildInputs = + [ + curl + hdf5 + libxml2 + bzip2 + libzip + zstd + ] + ++ lib.optional szipSupport szip + ++ lib.optional mpiSupport mpi; strictDeps = true; diff --git a/pkgs/by-name/ne/netcdffortran/package.nix b/pkgs/by-name/ne/netcdffortran/package.nix new file mode 100644 index 000000000000..363a85402eae --- /dev/null +++ b/pkgs/by-name/ne/netcdffortran/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + netcdf, + hdf5, + curl, + gfortran, +}: +stdenv.mkDerivation rec { + pname = "netcdf-fortran"; + version = "4.4.5"; + + src = fetchFromGitHub { + owner = "Unidata"; + repo = "netcdf-fortran"; + rev = "v${version}"; + sha256 = "sha256-nC93NcA4VJbrqaLwyhjP10j/t6rQSYcAzKBxclpZVe0="; + }; + + nativeBuildInputs = [ gfortran ]; + buildInputs = [ + netcdf + hdf5 + curl + ]; + + doCheck = true; + + FFLAGS = [ "-std=legacy" ]; + FCFLAGS = [ "-std=legacy" ]; + + meta = with lib; { + description = "Fortran API to manipulate netcdf files"; + mainProgram = "nf-config"; + homepage = "https://www.unidata.ucar.edu/software/netcdf/"; + license = licenses.free; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index 5138403f15a1..5d2d1f5d17b2 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "netclient"; - version = "0.30.0"; + version = "0.90.0"; src = fetchFromGitHub { owner = "gravitl"; repo = "netclient"; rev = "v${version}"; - hash = "sha256-F9hyTjRk2gqS9Jf+2/ZVYsvltr+lohK1loCAlJGyPEk="; + hash = "sha256-/drujpz0oeAZmV24Fxy3N6aqa5z72WiVxkjccbc6xmE="; }; - vendorHash = "sha256-ccTN1/LmbriQBia/zi+66+Sd7TUs7Qdr4Cwvsp3Wv30="; + vendorHash = "sha256-l2Vx1lD+LF/4N0QLVTDD1/TmWpR3JPAgMyrgw7aT2EQ="; buildInputs = lib.optional stdenv.hostPlatform.isLinux libX11; diff --git a/pkgs/by-name/ne/netcoredbg/deps.json b/pkgs/by-name/ne/netcoredbg/deps.json index 002cb71be2ad..66a3323b62c1 100644 --- a/pkgs/by-name/ne/netcoredbg/deps.json +++ b/pkgs/by-name/ne/netcoredbg/deps.json @@ -31,68 +31,63 @@ }, { "pname": "Microsoft.Diagnostics.DbgShim", - "version": "8.0.532401", - "hash": "sha256-rvTxIxaW6WYlbNqV0mVjX3JkjxOB2eoDtm7HD3qgKvg=" + "version": "9.0.621003", + "hash": "sha256-xdRwwLonXgqp4G+HWmFe5pEdv/x0L51/8jOqV5allZ4=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-arm", - "version": "8.0.532401", - "hash": "sha256-LYDAN85Qsnj3TIdH1VzzIbeQRQfo4A9kYp/da0nZMX4=" + "version": "9.0.621003", + "hash": "sha256-wcr6S8ktct8XNtXnEOCUHqA13N+7rQytgGkUsp1j4aU=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-arm64", - "version": "8.0.532401", - "hash": "sha256-/1eElmNjO8ug2i0hzsnX+ksaeTlSrJNxuHBZZ5Mxw7A=" + "version": "9.0.621003", + "hash": "sha256-OGsfVeZ4LcgOb2aM/e38Kyw9YGBn0t0uH8qgFdj8SIA=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-arm", - "version": "8.0.532401", - "hash": "sha256-3FsyQbXHgUErMg4islyZ68ZOi22Dtc7bHuzV4cHTetQ=" + "version": "9.0.621003", + "hash": "sha256-ZUno/Sd0UWYVVD20sJj/HleDfLcb7kf32j5NvIAYSMc=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-arm64", - "version": "8.0.532401", - "hash": "sha256-UCGQZZ9ZQKgdvVpgJfKAUL1hDxopEOpkb71x11mZ5go=" + "version": "9.0.621003", + "hash": "sha256-SKrqZiGnDdisdCIIETozCuSgj3JCAZeWfo2Ru/sMmOw=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-x64", - "version": "8.0.532401", - "hash": "sha256-zpKJdEGHfrk/ty0s2TuPiNi/yanEk6iAVZDOgBlv20s=" + "version": "9.0.621003", + "hash": "sha256-/kEBxB4puJJHwC71W2QQlOMykKCeNGvNy2j6s91g6jc=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-x64", - "version": "8.0.532401", - "hash": "sha256-maN37KzN1GxFW37E2t8suG1XHNfTIdDLTHxiaiwGfdc=" + "version": "9.0.621003", + "hash": "sha256-rW9QGI1awjHBHWaMwFtfhgXuR3X/PBxuks0DgnT2684=" }, { "pname": "Microsoft.Diagnostics.DbgShim.osx-arm64", - "version": "8.0.532401", - "hash": "sha256-4+hYe0f09F/seep1K1O9uF1S+g0ygyNJIcqA3b4Fhh4=" + "version": "9.0.621003", + "hash": "sha256-BXi0IePavjClLQcSrXZXGOqkkoymdecw9ZFf5w0mpRs=" }, { "pname": "Microsoft.Diagnostics.DbgShim.osx-x64", - "version": "8.0.532401", - "hash": "sha256-K/0i5SGl3rG8ciXbhSu2dWURlzfB2uVorv2yc7KKP4I=" - }, - { - "pname": "Microsoft.Diagnostics.DbgShim.win-arm", - "version": "8.0.532401", - "hash": "sha256-m/XEdwtXKGGIB1ORetiEaJ5qnQa+wz1Ou+aspxHAhe0=" + "version": "9.0.621003", + "hash": "sha256-FXkjxK3Bq4twUJ69aqsCgv2hNpO2Lkuz7EPAtqxJWd0=" }, { "pname": "Microsoft.Diagnostics.DbgShim.win-arm64", - "version": "8.0.532401", - "hash": "sha256-QPo/eFVr7HCAeOcLlsOrukL78BWfs+nZHVr5ClZzCiQ=" + "version": "9.0.621003", + "hash": "sha256-NScEkmv6oh+wXn5D7Nb0AoNSb1PU+HgUpd8fpup+a6o=" }, { "pname": "Microsoft.Diagnostics.DbgShim.win-x64", - "version": "8.0.532401", - "hash": "sha256-gxTB3KBr/ROgbBpLGQogtg2dz7a8F26UWyzsMJYMzv4=" + "version": "9.0.621003", + "hash": "sha256-sfe0tF2D3BpktS9J0o1xsR2cWIkDGhzXaUvKsgHDqC0=" }, { "pname": "Microsoft.Diagnostics.DbgShim.win-x86", - "version": "8.0.532401", - "hash": "sha256-CP1WHi8a3Xr0ml2Dnhmhc14xSGqHPnrfnrfeuhZmm6o=" + "version": "9.0.621003", + "hash": "sha256-CRUYEGm3lqOO3FDn8kr3OUjxmIHNe1ntihN6UaFeDs8=" }, { "pname": "Microsoft.NETCore.Platforms", diff --git a/pkgs/by-name/ne/netcoredbg/package.nix b/pkgs/by-name/ne/netcoredbg/package.nix index f2dc49a18410..f0e6f88abe98 100644 --- a/pkgs/by-name/ne/netcoredbg/package.nix +++ b/pkgs/by-name/ne/netcoredbg/package.nix @@ -12,17 +12,17 @@ }: let pname = "netcoredbg"; - build = "1031"; - release = "3.1.0"; + build = "1054"; + release = "3.1.2"; version = "${release}-${build}"; - hash = "sha256-/ScV6NPGOun47D88e7BLisSOipeQWdUbYaEryrlPbHg="; + hash = "sha256-WORGZXbq6d3sxGqyG8oZSwcBoVaD3D56t9K6PJoKFsM="; - coreclr-version = "v8.0.7"; + coreclr-version = "v8.0.16"; coreclr-src = fetchFromGitHub { owner = "dotnet"; repo = "runtime"; rev = coreclr-version; - hash = "sha256-vxyhZ1Z5TB/2jpF4qiXTpUj1hKeqV7xPgG1BJYOLIko="; + hash = "sha256-/fSKCIugR3UhqxBxtQRw+Bw+UpaSjB4xj0iBiXJaiR4="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; diff --git a/pkgs/by-name/ne/netdiscover/package.nix b/pkgs/by-name/ne/netdiscover/package.nix index 9886a73fe65c..cd508518ee1d 100644 --- a/pkgs/by-name/ne/netdiscover/package.nix +++ b/pkgs/by-name/ne/netdiscover/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "netdiscover"; - version = "0.11"; + version = "0.20"; src = fetchFromGitHub { owner = "netdiscover-scanner"; repo = pname; tag = version; - hash = "sha256-LUM6vl6pohrTW3X9c1FaDE7j9mvMuAiDkFBKWc4KZso="; + hash = "sha256-I3t9GsgKFo/eJrqYzj8T2Epfi3SURicwRYPBK25uHEw="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock b/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock index 6153492bc2c8..938809e5ff62 100644 --- a/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock +++ b/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "adler2" @@ -34,9 +34,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.17" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -83,17 +83,17 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.92" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "async-broadcast" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -124,42 +124,32 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" +checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa" dependencies = [ "async-task", "concurrent-queue", "fastrand 2.1.1", - "futures-lite 2.4.0", + "futures-lite 2.6.0", + "pin-project-lite", "slab", ] -[[package]] -name = "async-fs" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" -dependencies = [ - "async-lock", - "blocking", - "futures-lite 2.4.0", -] - [[package]] name = "async-io" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.4.0", + "futures-lite 2.6.0", "parking", - "polling 3.7.3", - "rustix", + "polling 3.7.4", + "rustix 0.38.44", "slab", "tracing", "windows-sys 0.59.0", @@ -171,7 +161,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "event-listener-strategy", "pin-project-lite", ] @@ -189,9 +179,9 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.3.1", - "futures-lite 2.4.0", - "rustix", + "event-listener 5.4.0", + "futures-lite 2.6.0", + "rustix 0.38.44", "tracing", ] @@ -218,7 +208,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix", + "rustix 0.38.44", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -232,9 +222,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" dependencies = [ "proc-macro2", "quote", @@ -273,9 +263,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" [[package]] name = "block" @@ -283,15 +273,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "blocking" version = "1.6.1" @@ -301,41 +282,41 @@ dependencies = [ "async-channel 2.3.1", "async-task", "futures-io", - "futures-lite 2.4.0", + "futures-lite 2.6.0", "piper", ] [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c" [[package]] -name = "byteorder" -version = "1.5.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cairo-rs" -version = "0.20.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fa699e1d7ae691001a811dda5ef0e3e42e1d4119b26426352989df9e94e3e6" +checksum = "ae50b5510d86cf96ac2370e66d8dc960882f3df179d6a5a1e52bd94a1416c0f7" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "cairo-sys-rs", "glib", "libc", @@ -343,9 +324,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.20.0" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" +checksum = "f18b6bb8e43c7eb0f2aac7976afe0c61b6f5fc2ab7bc4c139537ea56c92290df" dependencies = [ "glib-sys", "libc", @@ -360,18 +341,18 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.1.34" +version = "1.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9" +checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1" dependencies = [ "shlex", ] [[package]] name = "cfg-expr" -version = "0.17.0" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c" +checksum = "8d4ba6e40bd1184518716a6e1a781bf9160e286d219ccdb8ab2612e74cfe4789" dependencies = [ "smallvec", "target-lexicon", @@ -391,24 +372,18 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-link", ] -[[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.3" @@ -437,12 +412,13 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" +checksum = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9" dependencies = [ "cookie", - "idna 0.5.0", + "document-features", + "idna", "log", "publicsuffix", "serde", @@ -458,15 +434,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "cpufeatures" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" -dependencies = [ - "libc", -] - [[package]] name = "crc32fast" version = "1.4.2" @@ -478,19 +445,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "curl" @@ -509,9 +466,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.77+curl-8.10.1" +version = "0.4.80+curl-8.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f469e8a5991f277a208224f6c7ad72ecb5f986e36d09ae1f2c1bb9259478a480" +checksum = "55f7df2eac63200c3ab25bde3b2268ef2ee56af3d238e76d61f01c3c49bff734" dependencies = [ "cc", "libc", @@ -525,28 +482,38 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", ] [[package]] -name = "digest" -version = "0.10.7" +name = "displaydoc" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ - "block-buffer", - "crypto-common", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "document-features" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" +dependencies = [ + "litrs", ] [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "encoding_rs" @@ -565,9 +532,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] name = "enumflags2" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147" dependencies = [ "enumflags2_derive", "serde", @@ -575,9 +542,9 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79" dependencies = [ "proc-macro2", "quote", @@ -586,9 +553,9 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ "log", "regex", @@ -596,31 +563,31 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.5" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" dependencies = [ "anstream", "anstyle", "env_filter", - "humantime", + "jiff", "log", ] [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -631,9 +598,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -642,11 +609,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "pin-project-lite", ] @@ -667,9 +634,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" dependencies = [ "simd-adler32", ] @@ -686,9 +653,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.34" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" dependencies = [ "crc32fast", "miniz_oxide", @@ -773,9 +740,9 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210" +checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" dependencies = [ "fastrand 2.1.1", "futures-core", @@ -795,12 +762,6 @@ dependencies = [ "syn", ] -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - [[package]] name = "futures-task" version = "0.3.31" @@ -814,11 +775,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-core", - "futures-io", "futures-macro", - "futures-sink", "futures-task", - "memchr", "pin-project-lite", "pin-utils", "slab", @@ -826,9 +784,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.20.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4c29071a9e92337d8270a85cb0510cda4ac478be26d09ad027cc1d081911b19" +checksum = "7563afd6ff0a221edfbb70a78add5075b8d9cb48e637a40a24c3ece3fea414d0" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -838,9 +796,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.20.4" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687343b059b91df5f3fbd87b4307038fa9e647fcc0461d0d3f93e94fee20bf3d" +checksum = "67f2587c9202bf997476bbba6aaed4f78a11538a2567df002a5f57f5331d0b5c" dependencies = [ "gio-sys", "glib-sys", @@ -851,9 +809,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fb4af2d606b0ac4e81f982f0d064bcb71ca73859ce5f30475f7eb2e2be4bc3" +checksum = "4850c9d9c1aecd1a3eb14fadc1cdb0ac0a2298037e116264c7473e1740a32d60" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -866,9 +824,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3642625b384ad43c006871462e6c498488b503dbf219542591f4ddf0f5f2032b" +checksum = "6f6eb95798e2b46f279cf59005daf297d5b69555428f185650d71974a910473a" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -881,32 +839,23 @@ dependencies = [ "system-deps", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" -version = "0.2.15" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "libc", + "r-efi", "wasi", ] [[package]] name = "gettext-rs" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a" dependencies = [ "gettext-sys", "locale_config", @@ -914,9 +863,9 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.21.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" +checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661" dependencies = [ "cc", "temp-dir", @@ -924,9 +873,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.20.5" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8569975884fdfdbed536b682448fbd8c70bafbd69cac2d45eb1a7a372702241" +checksum = "a4f00c70f8029d84ea7572dd0e1aaa79e5329667b4c17f329d79ffb1e6277487" dependencies = [ "futures-channel", "futures-core", @@ -941,24 +890,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.20.5" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "217f464cad5946ae4369c355155e2d16b488c08920601083cb4891e352ae777b" +checksum = "160eb5250a26998c3e1b54e6a3d4ea15c6c7762a6062a19a7b63eff6e2b33f9e" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "glib" -version = "0.20.5" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358431b0e0eb15b9d02db52e1f19c805b953c5c168099deb3de88beab761768c" +checksum = "707b819af8059ee5395a2de9f2317d87a53dbad8846a2f089f0bb44703f37686" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "futures-channel", "futures-core", "futures-executor", @@ -975,9 +924,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.20.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d21ca27acfc3e91da70456edde144b4ac7c36f78ee77b10189b3eb4901c156" +checksum = "715601f8f02e71baef9c1f94a657a9a77c192aea6097cf9ae7e5e177cd8cde68" dependencies = [ "heck", "proc-macro-crate", @@ -988,9 +937,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.20.5" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5911863ab7ecd4a6f8d5976f12eeba076b23669c49b066d877e742544aa389" +checksum = "a8928869a44cfdd1fccb17d6746e4ff82c8f82e41ce705aa026a52ca8dc3aefb" dependencies = [ "libc", "system-deps", @@ -998,9 +947,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.20.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462" +checksum = "c773a3cb38a419ad9c26c81d177d96b4b08980e8bdbbf32dace883e96e96e7e3" dependencies = [ "glib-sys", "libc", @@ -1009,9 +958,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.20.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f53144c7fe78292705ff23935f1477d511366fb2f73c43d63b37be89076d2fe" +checksum = "3cbc5911bfb32d68dcfa92c9510c462696c2f715548fcd7f3f1be424c739de19" dependencies = [ "glib", "graphene-sys", @@ -1020,9 +969,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.20.4" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e741797dc5081e59877a4d72c442c72d61efdd99161a0b1c1b29b6b988934b99" +checksum = "11a68d39515bf340e879b72cecd4a25c1332557757ada6e8aba8654b4b81d23a" dependencies = [ "glib-sys", "libc", @@ -1032,9 +981,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deb9ae5a7fb759b2405e248d52850d9ef733079b90af2d6b01638f5b9eeafe1" +checksum = "61f5e72f931c8c9f65fbfc89fe0ddc7746f147f822f127a53a9854666ac1f855" dependencies = [ "cairo-rs", "gdk4", @@ -1047,9 +996,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2226662e97948f3f241c9a6c432cd95eeca662daf4a327e201458bb540ad9590" +checksum = "755059de55fa6f85a46bde8caf03e2184c96bfda1f6206163c72fb0ea12436dc" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1063,9 +1012,9 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.23.3" +version = "0.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680006694e79692f831ca4f3ba6e147b8c23db289b2df1d33a4a97fd038145d7" +checksum = "2188fe829b0ebe12e4cf2bbcf6658470a936269daba7afae92847a2af32c9105" dependencies = [ "cfg-if", "futures-channel", @@ -1088,9 +1037,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.23.3" +version = "0.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11df90e3abf1d9747111c41902338fc1bd13b1c23b27fb828d43e57bd190134" +checksum = "ad33dd444db0d215ac363164f900f800ffb93361ad8a60840e95e14b7de985e8" dependencies = [ "atomic_refcell", "cfg-if", @@ -1102,9 +1051,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.23.3" +version = "0.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d691b2bb51a9e5727fb33c3b53fb64ee5b80c40cbbd250941a6d44b142f7a6a0" +checksum = "114b2a704f19a70f20c54b00e54f5d5376bbf78bd2791e6beb0776c997d8bf24" dependencies = [ "glib-sys", "gobject-sys", @@ -1115,9 +1064,9 @@ dependencies = [ [[package]] name = "gstreamer-play" -version = "0.23.2" +version = "0.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397e46fee36e6bbdc56a54c84bec03a47b9955b4f8b03ffa37b3975090b7a37f" +checksum = "6ef455584b832e9fdc76f7952b9432eaee2fd287157b03cf2bc0e83f1b41619c" dependencies = [ "glib", "gstreamer", @@ -1128,9 +1077,9 @@ dependencies = [ [[package]] name = "gstreamer-play-sys" -version = "0.23.2" +version = "0.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f485669dfdb4bca2bb1b0d7f6a1e290a4d481c5f67270f1eae9cdf37ca40e426" +checksum = "b01c1c4f09cb6709c7da2532b3fcbc14da9006d508baee606328080e46f491f5" dependencies = [ "glib-sys", "gobject-sys", @@ -1142,9 +1091,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.23.3" +version = "0.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db89964774a97d5b092e2d124debc6bbcaf34b5c7cdef1759f4a9e1e3f8326ef" +checksum = "fe159238834058725808cf6604a7c5d9e4a50e1eacd7b0c63bce2fe3a067dbd1" dependencies = [ "glib-sys", "gobject-sys", @@ -1154,9 +1103,9 @@ dependencies = [ [[package]] name = "gstreamer-video" -version = "0.23.3" +version = "0.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94193e7e4c07ba97f1627bd9907bd187e90cdac8849bb78479d744e9121893b" +checksum = "ad242d388b63c91652c8157de3b0c1f709e49c941a0aae1952455f6ee326ca2d" dependencies = [ "cfg-if", "futures-channel", @@ -1171,9 +1120,9 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.23.3" +version = "0.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81660cfa5a7b9973a51229785581d029da1681bf5aceffd5a4f32021db85ac0" +checksum = "465ff496889fb38be47f5e821163c2e83414d87c4aa55f5aae62dc7200971d4d" dependencies = [ "glib-sys", "gobject-sys", @@ -1185,9 +1134,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34465497f5a4c182c9c94a582a187db7d6af0863f28e87ccf4379f21f0e2a22" +checksum = "af1c491051f030994fd0cde6f3c44f3f5640210308cff1298c7673c47408091d" dependencies = [ "cairo-rs", "field-offset", @@ -1206,9 +1155,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c518d5dd41c57385c7cd30af52e261820c897fc1144e558bb88c303d048ae2" +checksum = "0ed1786c4703dd196baf7e103525ce0cf579b3a63a0570fe653b7ee6bac33999" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1218,9 +1167,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c7812e28542edb4d0495a2fde1f4588899e2accfcebaa80115f27dc7358a3" +checksum = "41e03b01e54d77c310e1d98647d73f996d04b2f29b9121fe493ea525a7ec03d6" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1237,9 +1186,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" [[package]] name = "heck" @@ -1285,22 +1234,17 @@ 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 = "iana-time-zone" -version = "0.1.61" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", "windows-core", ] @@ -1315,43 +1259,129 @@ dependencies = [ ] [[package]] -name = "idna" -version = "0.3.0" +name = "icu_collections" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" + +[[package]] +name = "icu_properties" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "potential_utf", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04" + +[[package]] +name = "icu_provider" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +dependencies = [ + "displaydoc", + "icu_locale_core", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", ] [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "image" -version = "0.24.9" +version = "0.25.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a" dependencies = [ "bytemuck", - "byteorder", - "color_quant", + "byteorder-lite", "num-traits", "png", ] [[package]] name = "indexmap" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", "hashbrown", @@ -1411,16 +1441,41 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jiff" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -1432,9 +1487,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libadwaita" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8611ee9fb85e7606c362b513afcaf5b59853f79e4d98caaaf581d99465014247" +checksum = "500135d29c16aabf67baafd3e7741d48e8b8978ca98bac39e589165c8dc78191" dependencies = [ "gdk4", "gio", @@ -1447,9 +1502,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b099a223560118d4d4fa04b6d23f3ea5b7171fe1d83dfb7e6b45b54cdfc83af9" +checksum = "6680988058c2558baf3f548a370e4e78da3bf7f08469daa822ac414842c912db" dependencies = [ "gdk4-sys", "gio-sys", @@ -1463,15 +1518,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.161" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libnghttp2-sys" -version = "0.1.10+1.61.0" +version = "0.1.11+1.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135" +checksum = "1b6c24e48a7167cffa7119da39d577fa482e66c688a4aac016bee862e1a713c4" dependencies = [ "cc", "libc", @@ -1479,9 +1534,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.20" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" dependencies = [ "cc", "libc", @@ -1491,9 +1546,27 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + +[[package]] +name = "litemap" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "locale_config" @@ -1510,9 +1583,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "malloc_buf" @@ -1546,9 +1619,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", "simd-adler32", @@ -1556,9 +1629,9 @@ dependencies = [ [[package]] name = "mpris-server" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058bc2227727af394f34aa51da3e36aeecf2c808f39315d35f754872660750ae" +checksum = "392ce2be7224867869df37e473f28871ab0ff725c0014f1b196ba56a38aea9a8" dependencies = [ "async-channel 2.3.1", "futures-channel", @@ -1575,8 +1648,8 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "netease-cloud-music-api" -version = "1.5.0" -source = "git+https://gitee.com/gmg137/netease-cloud-music-api.git?tag=1.5.0#2af4140314eec93cb6fc0a5697a1e12bd34aeda2" +version = "1.5.1" +source = "git+https://gitee.com/gmg137/netease-cloud-music-api.git?tag=1.5.1#63e439734d9d08f28f2752ce858f040822eb97d9" dependencies = [ "anyhow", "base64", @@ -1593,7 +1666,7 @@ dependencies = [ [[package]] name = "netease-cloud-music-gtk4" -version = "2.5.0" +version = "2.5.2" dependencies = [ "anyhow", "async-channel 2.3.1", @@ -1620,7 +1693,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "cfg-if", "cfg_aliases", "libc", @@ -1698,11 +1771,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "cfg-if", "foreign-types", "libc", @@ -1724,15 +1797,15 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.104" +version = "0.9.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" dependencies = [ "cc", "libc", @@ -1761,9 +1834,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.20.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa26aa54b11094d72141a754901cd71d9356432bb8147f9cace8d9c7ba95f356" +checksum = "6b1f5dc1b8cf9bc08bfc0843a04ee0fa2e78f1e1fa4b126844a383af4f25f0ec" dependencies = [ "gio", "glib", @@ -1773,9 +1846,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.20.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fd65917bf12f06544ae2bbc200abf9fc0a513a5a88a0fa81013893aef2b838" +checksum = "0dbb9b751673bd8fe49eb78620547973a1e719ed431372122b20abd12445bab5" dependencies = [ "glib-sys", "gobject-sys", @@ -1803,18 +1876,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.7" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.7" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", @@ -1823,9 +1896,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1846,15 +1919,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "png" -version = "0.17.14" +version = "0.17.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" +checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -1881,19 +1954,43 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.3" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix", + "rustix 0.38.44", "tracing", "windows-sys 0.59.0", ] +[[package]] +name = "portable-atomic" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -1902,27 +1999,27 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ "zerocopy", ] [[package]] name = "proc-macro-crate" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" dependencies = [ "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -1935,19 +2032,19 @@ checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" [[package]] name = "publicsuffix" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +checksum = "6f42ea446cab60335f76979ec15e12619a2165b5ae2c12166bef27d283a9fadf" dependencies = [ - "idna 0.3.0", + "idna", "psl-types", ] [[package]] name = "qrcode-generator" -version = "4.1.9" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d06cb9646c7a14096231a2474d7f21e5e8c13de090c68d13bde6157cfe7f159" +checksum = "faf0051849b5465059b75f59d388c7318aad6554701b74ecf02afc2573b0306c" dependencies = [ "html-escape", "image", @@ -1962,29 +2059,34 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] name = "quote" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] [[package]] -name = "rand" -version = "0.8.5" +name = "r-efi" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[package]] +name = "rand" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ - "libc", "rand_chacha", "rand_core", ] [[package]] name = "rand_chacha" -version = "0.3.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", "rand_core", @@ -1992,9 +2094,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ "getrandom", ] @@ -2013,9 +2115,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -2039,52 +2141,71 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.38" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "errno", "libc", - "linux-raw-sys", - "windows-sys 0.52.0", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", ] [[package]] -name = "ryu" -version = "1.0.18" +name = "rustix" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +dependencies = [ + "bitflags 2.9.0", + "errno", + "libc", + "linux-raw-sys 0.9.4", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustversion" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] [[package]] name = "semver" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" -version = "1.0.214" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -2093,9 +2214,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -2105,9 +2226,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", @@ -2123,17 +2244,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "shlex" version = "1.3.0" @@ -2142,9 +2252,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] @@ -2177,20 +2287,26 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -2199,15 +2315,26 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.87" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "system-deps" version = "7.0.3" @@ -2229,37 +2356,37 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-dir" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" +checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" dependencies = [ - "cfg-if", "fastrand 2.1.1", + "getrandom", "once_cell", - "rustix", + "rustix 1.0.7", "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.66" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.66" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", @@ -2268,9 +2395,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "itoa", @@ -2283,40 +2410,35 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" dependencies = [ "num-conv", "time-core", ] [[package]] -name = "tinyvec" -version = "1.8.0" +name = "tinystr" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "toml" -version = "0.8.19" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" dependencies = [ "serde", "serde_spanned", @@ -2326,18 +2448,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" dependencies = [ "indexmap", "serde", @@ -2348,9 +2470,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -2360,9 +2482,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", @@ -2371,9 +2493,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -2399,12 +2521,6 @@ dependencies = [ "syn", ] -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - [[package]] name = "uds_windows" version = "1.1.0" @@ -2416,35 +2532,20 @@ dependencies = [ "winapi", ] -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" - [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "unicode-normalization" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", ] @@ -2460,6 +2561,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -2492,30 +2599,33 @@ checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -2524,9 +2634,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2534,9 +2644,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -2547,9 +2657,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "winapi" @@ -2575,11 +2688,61 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.52.0" +version = "0.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" dependencies = [ - "windows-targets 0.52.6", + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + +[[package]] +name = "windows-result" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +dependencies = [ + "windows-link", ] [[package]] @@ -2732,32 +2895,60 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.20" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" dependencies = [ "memchr", ] [[package]] -name = "xdg-home" -version = "1.3.0" +name = "wit-bindgen-rt" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ - "libc", - "windows-sys 0.59.0", + "bitflags 2.9.0", +] + +[[package]] +name = "writeable" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" + +[[package]] +name = "yoke" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", ] [[package]] name = "zbus" -version = "4.4.0" +version = "5.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" +checksum = "2522b82023923eecb0b366da727ec883ace092e7887b61d3da5139f26b44da58" dependencies = [ "async-broadcast", "async-executor", - "async-fs", "async-io", "async-lock", "async-process", @@ -2766,22 +2957,18 @@ dependencies = [ "async-trait", "blocking", "enumflags2", - "event-listener 5.3.1", + "event-listener 5.4.0", "futures-core", - "futures-sink", - "futures-util", + "futures-lite 2.6.0", "hex", "nix", "ordered-stream", - "rand", "serde", "serde_repr", - "sha1", - "static_assertions", "tracing", "uds_windows", - "windows-sys 0.52.0", - "xdg-home", + "windows-sys 0.59.0", + "winnow", "zbus_macros", "zbus_names", "zvariant", @@ -2789,43 +2976,99 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.4.0" +version = "5.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +checksum = "05d2e12843c75108c00c618c2e8ef9675b50b6ec095b36dc965f2e5aed463c15" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", "syn", + "zbus_names", + "zvariant", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "3.0.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97" dependencies = [ "serde", "static_assertions", + "winnow", "zvariant", ] [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" dependencies = [ - "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", @@ -2834,22 +3077,23 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.2.0" +version = "5.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" +checksum = "557e89d54880377a507c94cd5452f20e35d14325faf9d2958ebeadce0966c1b2" dependencies = [ "endi", "enumflags2", "serde", - "static_assertions", + "winnow", "zvariant_derive", + "zvariant_utils", ] [[package]] name = "zvariant_derive" -version = "4.2.0" +version = "5.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" +checksum = "757779842a0d242061d24c28be589ce392e45350dfb9186dfd7a042a2e19870c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2860,11 +3104,14 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "2.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" +checksum = "e16edfee43e5d7b553b77872d99bc36afdda75c223ca7ad5e3fbecd82ca5fc34" dependencies = [ "proc-macro2", "quote", + "serde", + "static_assertions", "syn", + "winnow", ] diff --git a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix index 44325c79b8ac..a1b01ba9a057 100644 --- a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix +++ b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix @@ -15,23 +15,24 @@ libadwaita, glib-networking, gst_all_1, + libxml2, }: stdenv.mkDerivation (finalAttrs: { pname = "netease-cloud-music-gtk"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "gmg137"; repo = "netease-cloud-music-gtk"; tag = finalAttrs.version; - hash = "sha256-QRgGQDYrqOpZErz+OHZF1GPshxnZRPTIJSNkFWqQeHM="; + hash = "sha256-3vAEk4HwS7EiMv0DAYOvZ9dOlO0yMEUcaO2qCCWlpLs="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "netease-cloud-music-api-1.5.0" = "sha256-3CBWYUJ+5/KRQ6/EPt84rBxXQRjhvazrasRzbpkRwPU="; + "netease-cloud-music-api-1.5.1" = "sha256-PFzXm7jgNsEJiluBaNuhSF0kg/licDdbItMDWmfIBDk="; }; }; @@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook cargo rustc + libxml2 ]; buildInputs = diff --git a/pkgs/by-name/ne/netexec/package.nix b/pkgs/by-name/ne/netexec/package.nix new file mode 100644 index 000000000000..0b7913cd8657 --- /dev/null +++ b/pkgs/by-name/ne/netexec/package.nix @@ -0,0 +1,113 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3, +}: +let + python = python3.override { + self = python; + packageOverrides = self: super: { + impacket = super.impacket.overridePythonAttrs { + version = "0.12.0.dev1-unstable-2023-11-30"; + src = fetchFromGitHub { + owner = "Pennyw0rth"; + repo = "impacket"; + rev = "d370e6359a410063b2c9c68f6572c3b5fb178a38"; + hash = "sha256-Jozn4lKAnLQ2I53+bx0mFY++OH5P4KyqVmrS5XJUY3E="; + }; + # Fix version to be compliant with Python packaging rules + postPatch = '' + substituteInPlace setup.py \ + --replace 'version="{}.{}.{}.{}{}"' 'version="{}.{}.{}"' + ''; + }; + }; + }; +in +python.pkgs.buildPythonApplication rec { + pname = "netexec"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Pennyw0rth"; + repo = "NetExec"; + tag = "v${version}"; + hash = "sha256-Pub7PAw6CTN4c/PHTPE9KcnDR2a6hSza1ODp3EWMOH0="; + }; + + pythonRelaxDeps = true; + + pythonRemoveDeps = [ + # Fail to detect dev version requirement + "neo4j" + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '{ git = "https://github.com/fortra/impacket.git" }' '"*"' \ + --replace-fail '{ git = "https://github.com/Pennyw0rth/NfsClient" }' '"*"' + ''; + + build-system = with python.pkgs; [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = with python.pkgs; [ + aardwolf + aioconsole + aiosqlite + argcomplete + asyauth + beautifulsoup4 + bloodhound-py + dploot + dsinternals + impacket + lsassy + masky + minikerberos + msgpack + msldap + neo4j + paramiko + pyasn1-modules + pylnk3 + pynfsclient + pypsrp + pypykatz + python-dateutil + python-libnmap + pywerview + requests + rich + sqlalchemy + termcolor + terminaltables + xmltodict + ]; + + nativeCheckInputs = with python.pkgs; [ pytestCheckHook ]; + + # Tests no longer works out-of-box with 1.3.0 + doCheck = false; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = { + description = "Network service exploitation tool (maintained fork of CrackMapExec)"; + homepage = "https://github.com/Pennyw0rth/NetExec"; + changelog = "https://github.com/Pennyw0rth/NetExec/releases/tag/v${version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ vncsb ]; + mainProgram = "nxc"; + # FIXME: failing fixupPhase: + # $ Rewriting #!/nix/store/-python3-3.11.7/bin/python3.11 to #!/nix/store/-python3-3.11.7 + # $ /nix/store/-wrap-python-hook/nix-support/setup-hook: line 65: 47758 Killed: 9 sed -i "$f" -e "1 s^#!/nix/store/-python3-3.11.7^#!/nix/store/-python3-3.11.7^" + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix index d034a54c7fdb..a58e521737db 100644 --- a/pkgs/by-name/ne/netgen/package.nix +++ b/pkgs/by-name/ne/netgen/package.nix @@ -3,7 +3,10 @@ stdenv, fetchFromGitHub, fetchpatch2, - makeWrapper, + libicns, + imagemagick, + makeDesktopItem, + copyDesktopItems, cmake, python3Packages, mpi, @@ -66,28 +69,38 @@ stdenv.mkDerivation (finalAttrs: { url = "${patchSource}/include_stdlib.patch"; hash = "sha256-W+NgGBuy/UmzVbPTSqR8FRUlyN/9dl9l9e9rxKklmIc="; }) - (fetchpatch2 { - url = "${patchSource}/fix-version.patch"; - hash = "sha256-CT98Wq3UufB81z/jYLiH9nXvt+QzoZ7210OeuFXCfmc="; - }) ]; # when generating python stub file utilizing system python pybind11_stubgen module # cmake need to inherit pythonpath - postPatch = '' - substituteInPlace python/CMakeLists.txt \ - --replace-fail ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}' \ - ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH}' + postPatch = + '' + sed -i '/-DBDIR=''\'''${CMAKE_CURRENT_BINARY_DIR}/a\ + -DNETGEN_VERSION_GIT=''\'''${NETGEN_VERSION_GIT} + ' CMakeLists.txt - substituteInPlace ng/ng.tcl ng/onetcl.cpp \ - --replace-fail "libnggui" "$out/lib/libnggui" - ''; + substituteInPlace python/CMakeLists.txt \ + --replace-fail ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}' \ + ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH}' + + substituteInPlace ng/ng.tcl ng/onetcl.cpp \ + --replace-fail "libnggui" "$out/lib/libnggui" + + substituteInPlace ng/Togl2.1/CMakeLists.txt \ + --replace-fail "/usr/bin/gcc" "$CC" + '' + + lib.optionalString (!stdenv.hostPlatform.isx86_64) '' + # mesh generation differs on x86_64 and aarch64 platform + # test_tutorials will fail on aarch64 platform + rm tests/pytest/test_tutorials.py + ''; nativeBuildInputs = [ + libicns + imagemagick cmake - makeWrapper python3Packages.pybind11-stubgen - ]; + ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ metis @@ -111,6 +124,12 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "NETGEN_VERSION_GIT" "v${finalAttrs.version}-0") + (lib.cmakeFeature "NG_INSTALL_DIR_BIN" "bin") + (lib.cmakeFeature "NG_INSTALL_DIR_LIB" "lib") + (lib.cmakeFeature "NG_INSTALL_DIR_CMAKE" "lib/cmake/${finalAttrs.pname}") + (lib.cmakeFeature "NG_INSTALL_DIR_PYTHON" python3Packages.python.sitePackages) + (lib.cmakeFeature "NG_INSTALL_DIR_RES" "share") + (lib.cmakeFeature "NG_INSTALL_DIR_INCLUDE" "include") (lib.cmakeFeature "CMAKE_CXX_FLAGS" archFlags) (lib.cmakeBool "USE_MPI" true) (lib.cmakeBool "USE_MPI4PY" true) @@ -124,9 +143,45 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doInstallCheck) ]; - # mesh generation differs on x86_64 and aarch64 platform - # tests will fail on aarch64 platform - doInstallCheck = stdenv.hostPlatform.isx86_64; + __darwinAllowLocalNetworking = true; + + desktopItems = [ + (makeDesktopItem { + name = "netgen"; + exec = "netgen"; + comment = finalAttrs.meta.description; + desktopName = "Netgen Mesh Generator"; + genericName = "3D Mesh Generator"; + categories = [ "Science" ]; + icon = "netgen"; + }) + ]; + + postInstall = + lib.optionalString stdenv.hostPlatform.isDarwin '' + rm $out/bin/{Netgen1,startup.sh} + mkdir -p $out/Applications/${finalAttrs.pname}.app/Contents/{MacOS,Resouces} + substituteInPlace $out/Info.plist --replace-fail "Netgen1" "netgen" + mv $out/Info.plist $out/Applications/${finalAttrs.pname}.app/Contents + mv $out/Netgen.icns $out/Applications/${finalAttrs.pname}.app/Contents/Resouces + ln -s $out/bin/netgen $out/Applications/${finalAttrs.pname}.app/Contents/MacOS/netgen + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + # Extract pngs from the Apple icon image and create + # the missing ones from the 512x512 image. + icns2png --extract ../netgen.icns + for size in 16 24 32 48 64 128 256 512; do + mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps + if [ -e netgen_"$size"x"$size"x32.png ] + then + mv netgen_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/netgen.png + else + convert -resize "$size"x"$size" netgen_512x512x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/netgen.png + fi + done; + ''; + + doInstallCheck = true; preInstallCheck = '' export PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH @@ -139,15 +194,19 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.pytest python3Packages.pytest-check python3Packages.pytest-mpi + python3Packages.pythonImportsCheckHook mpiCheckPhaseHook ]; + pythonImportsCheck = [ "netgen" ]; + passthru = { inherit avxSupport avx2Support avx512Support; }; meta = { homepage = "https://ngsolve.org"; + downloadPage = "https://github.com/NGSolve/netgen"; description = "Atomatic 3d tetrahedral mesh generator"; license = with lib.licenses; [ lgpl2Plus @@ -157,10 +216,7 @@ stdenv.mkDerivation (finalAttrs: { boost publicDomain ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; + platforms = lib.platforms.unix; mainProgram = "netgen"; maintainers = with lib.maintainers; [ qbisi ]; }; diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix index 57a8ebe52bf6..17ead201a98a 100644 --- a/pkgs/by-name/ne/netpbm/package.nix +++ b/pkgs/by-name/ne/netpbm/package.nix @@ -17,11 +17,11 @@ buildPackages, }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.9.3"; + version = "11.10.2"; outputs = [ "bin" @@ -31,8 +31,8 @@ stdenv.mkDerivation { src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "5027"; - sha256 = "sha256-fz4SvJwQAYV6agXC7oMwo8rUIHMRav25MuWiwoEONkE="; + rev = "5066"; + sha256 = "sha256-Qa9hKGcdAwCUcHQ4Vfz5Qeu4+Q6YV+lY8zhXAOXnkc4="; }; nativeBuildInputs = [ @@ -129,6 +129,7 @@ stdenv.mkDerivation { passthru.updateScript = ./update.sh; meta = { + changelog = "https://sourceforge.net/p/netpbm/code/${src.rev}/tree/advanced/doc/HISTORY"; homepage = "https://netpbm.sourceforge.net/"; description = "Toolkit for manipulation of graphic images"; license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary diff --git a/pkgs/by-name/ne/netron/package-lock.json b/pkgs/by-name/ne/netron/package-lock.json deleted file mode 100644 index c7782a0f5a19..000000000000 --- a/pkgs/by-name/ne/netron/package-lock.json +++ /dev/null @@ -1,5743 +0,0 @@ -{ - "name": "netron", - "version": "8.1.8", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "netron", - "version": "8.1.8", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "electron-updater": "6.3.9" - }, - "devDependencies": { - "@electron/notarize": "2.5.0", - "electron": "34.2.0", - "electron-builder": "25.1.8", - "eslint": "9.20.1" - } - }, - "node_modules/@develar/schema-utils": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz", - "integrity": "sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.0", - "ajv-keywords": "^3.4.1" - }, - "engines": { - "node": ">= 8.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/@electron/asar": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.3.1.tgz", - "integrity": "sha512-WtpC/+34p0skWZiarRjLAyqaAX78DofhDxnREy/V5XHfu1XEXbFCSSMcDQ6hNCPJFaPy8/NnUgYuf9uiCkvKPg==", - "dev": true, - "license": "MIT", - "dependencies": { - "commander": "^5.0.0", - "glob": "^7.1.6", - "minimatch": "^3.0.4" - }, - "bin": { - "asar": "bin/asar.js" - }, - "engines": { - "node": ">=10.12.0" - } - }, - "node_modules/@electron/asar/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@electron/asar/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@electron/get": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", - "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.1.1", - "env-paths": "^2.2.0", - "fs-extra": "^8.1.0", - "got": "^11.8.5", - "progress": "^2.0.3", - "semver": "^6.2.0", - "sumchecker": "^3.0.1" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "global-agent": "^3.0.0" - } - }, - "node_modules/@electron/get/node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/@electron/get/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@electron/get/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/@electron/notarize": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz", - "integrity": "sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.1.1", - "fs-extra": "^9.0.1", - "promise-retry": "^2.0.1" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron/osx-sign": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.1.tgz", - "integrity": "sha512-BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "compare-version": "^0.1.2", - "debug": "^4.3.4", - "fs-extra": "^10.0.0", - "isbinaryfile": "^4.0.8", - "minimist": "^1.2.6", - "plist": "^3.0.5" - }, - "bin": { - "electron-osx-flat": "bin/electron-osx-flat.js", - "electron-osx-sign": "bin/electron-osx-sign.js" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@electron/osx-sign/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@electron/osx-sign/node_modules/isbinaryfile": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz", - "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/gjtorikian/" - } - }, - "node_modules/@electron/rebuild": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.6.1.tgz", - "integrity": "sha512-f6596ZHpEq/YskUd8emYvOUne89ij8mQgjYFA5ru25QwbrRO+t1SImofdDv7kKOuWCmVOuU5tvfkbgGxIl3E/w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@malept/cross-spawn-promise": "^2.0.0", - "chalk": "^4.0.0", - "debug": "^4.1.1", - "detect-libc": "^2.0.1", - "fs-extra": "^10.0.0", - "got": "^11.7.0", - "node-abi": "^3.45.0", - "node-api-version": "^0.2.0", - "node-gyp": "^9.0.0", - "ora": "^5.1.0", - "read-binary-file-arch": "^1.0.6", - "semver": "^7.3.5", - "tar": "^6.0.5", - "yargs": "^17.0.1" - }, - "bin": { - "electron-rebuild": "lib/cli.js" - }, - "engines": { - "node": ">=12.13.0" - } - }, - "node_modules/@electron/rebuild/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@electron/rebuild/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@electron/universal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.1.tgz", - "integrity": "sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@electron/asar": "^3.2.7", - "@malept/cross-spawn-promise": "^2.0.0", - "debug": "^4.3.1", - "dir-compare": "^4.2.0", - "fs-extra": "^11.1.1", - "minimatch": "^9.0.3", - "plist": "^3.1.0" - }, - "engines": { - "node": ">=16.4" - } - }, - "node_modules/@electron/universal/node_modules/fs-extra": { - "version": "11.3.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", - "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/@electron/universal/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", - "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eslint-visitor-keys": "^3.4.3" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", - "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, - "node_modules/@eslint/config-array": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz", - "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@eslint/object-schema": "^2.1.6", - "debug": "^4.3.1", - "minimatch": "^3.1.2" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/config-array/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@eslint/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@eslint/core": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz", - "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@types/json-schema": "^7.0.15" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", - "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^10.0.1", - "globals": "^14.0.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@eslint/eslintrc/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@eslint/js": { - "version": "9.20.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz", - "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/object-schema": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", - "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/plugin-kit": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.6.tgz", - "integrity": "sha512-+0TjwR1eAUdZtvv/ir1mGX+v0tUoR3VEPB8Up0LLJC+whRW0GgBBtpbOkg/a/U4Dxa6l5a3l9AJ1aWIQVyoWJA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@eslint/core": "^0.11.0", - "levn": "^0.4.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@humanfs/core": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", - "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18.0" - } - }, - "node_modules/@humanfs/node": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", - "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.3.0" - }, - "engines": { - "node": ">=18.18.0" - } - }, - "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/retry": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz", - "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/@malept/cross-spawn-promise": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz", - "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/malept" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" - } - ], - "license": "Apache-2.0", - "dependencies": { - "cross-spawn": "^7.0.1" - }, - "engines": { - "node": ">= 12.13.0" - } - }, - "node_modules/@malept/flatpak-bundler": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz", - "integrity": "sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.1.1", - "fs-extra": "^9.0.0", - "lodash": "^4.17.15", - "tmp-promise": "^3.0.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@npmcli/fs/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dev": true, - "license": "MIT", - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/@sindresorhus/is": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", - "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/is?sponsor=1" - } - }, - "node_modules/@szmarczak/http-timer": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", - "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", - "dev": true, - "license": "MIT", - "dependencies": { - "defer-to-connect": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, - "node_modules/@types/cacheable-request": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", - "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/http-cache-semantics": "*", - "@types/keyv": "^3.1.4", - "@types/node": "*", - "@types/responselike": "^1.0.0" - } - }, - "node_modules/@types/debug": { - "version": "4.1.12", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", - "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/ms": "*" - } - }, - "node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/fs-extra": { - "version": "9.0.13", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", - "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/http-cache-semantics": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", - "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/keyv": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", - "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/ms": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", - "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/node": { - "version": "20.17.19", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.19.tgz", - "integrity": "sha512-LEwC7o1ifqg/6r2gn9Dns0f1rhK+fPFDoMiceTJ6kWmVk6bgXBI/9IOWfVan4WiAavK9pIVWdX0/e3J+eEUh5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.19.2" - } - }, - "node_modules/@types/plist": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz", - "integrity": "sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@types/node": "*", - "xmlbuilder": ">=11.0.1" - } - }, - "node_modules/@types/responselike": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz", - "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/verror": { - "version": "1.10.10", - "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.10.tgz", - "integrity": "sha512-l4MM0Jppn18hb9xmM6wwD1uTdShpf9Pn80aXTStnK1C94gtPvJcV2FrDmbOQUAQfJ1cKZHktkQUDwEqaAKXMMg==", - "dev": true, - "license": "MIT", - "optional": true - }, - "node_modules/@types/yauzl": { - "version": "2.10.3", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", - "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@xmldom/xmldom": { - "version": "0.8.10", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", - "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/7zip-bin": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz", - "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==", - "dev": true, - "license": "MIT" - }, - "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true, - "license": "ISC" - }, - "node_modules/acorn": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", - "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/agent-base": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", - "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14" - } - }, - "node_modules/agentkeepalive": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz", - "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "humanize-ms": "^1.2.1" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/app-builder-bin": { - "version": "5.0.0-alpha.10", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz", - "integrity": "sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw==", - "dev": true, - "license": "MIT" - }, - "node_modules/app-builder-lib": { - "version": "25.1.8", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-25.1.8.tgz", - "integrity": "sha512-pCqe7dfsQFBABC1jeKZXQWhGcCPF3rPCXDdfqVKjIeWBcXzyC1iOWZdfFhGl+S9MyE/k//DFmC6FzuGAUudNDg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@develar/schema-utils": "~2.6.5", - "@electron/notarize": "2.5.0", - "@electron/osx-sign": "1.3.1", - "@electron/rebuild": "3.6.1", - "@electron/universal": "2.0.1", - "@malept/flatpak-bundler": "^0.4.0", - "@types/fs-extra": "9.0.13", - "async-exit-hook": "^2.0.1", - "bluebird-lst": "^1.0.9", - "builder-util": "25.1.7", - "builder-util-runtime": "9.2.10", - "chromium-pickle-js": "^0.2.0", - "config-file-ts": "0.2.8-rc1", - "debug": "^4.3.4", - "dotenv": "^16.4.5", - "dotenv-expand": "^11.0.6", - "ejs": "^3.1.8", - "electron-publish": "25.1.7", - "form-data": "^4.0.0", - "fs-extra": "^10.1.0", - "hosted-git-info": "^4.1.0", - "is-ci": "^3.0.0", - "isbinaryfile": "^5.0.0", - "js-yaml": "^4.1.0", - "json5": "^2.2.3", - "lazy-val": "^1.0.5", - "minimatch": "^10.0.0", - "resedit": "^1.7.0", - "sanitize-filename": "^1.6.3", - "semver": "^7.3.8", - "tar": "^6.1.12", - "temp-file": "^3.4.0" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "dmg-builder": "25.1.8", - "electron-builder-squirrel-windows": "25.1.8" - } - }, - "node_modules/app-builder-lib/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/app-builder-lib/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/archiver": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz", - "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "archiver-utils": "^2.1.0", - "async": "^3.2.4", - "buffer-crc32": "^0.2.1", - "readable-stream": "^3.6.0", - "readdir-glob": "^1.1.2", - "tar-stream": "^2.2.0", - "zip-stream": "^4.1.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/archiver-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", - "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "glob": "^7.1.4", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^2.0.0" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/archiver-utils/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/archiver-utils/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/archiver-utils/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/are-we-there-yet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", - "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "license": "Python-2.0" - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/async": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "dev": true, - "license": "MIT" - }, - "node_modules/async-exit-hook": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", - "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true, - "license": "MIT" - }, - "node_modules/bluebird-lst": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz", - "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==", - "dev": true, - "license": "MIT", - "dependencies": { - "bluebird": "^3.5.5" - } - }, - "node_modules/boolean": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", - "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dev": true, - "license": "MIT", - "optional": true - }, - "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/builder-util": { - "version": "25.1.7", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-25.1.7.tgz", - "integrity": "sha512-7jPjzBwEGRbwNcep0gGNpLXG9P94VA3CPAZQCzxkFXiV2GMQKlziMbY//rXPI7WKfhsvGgFXjTcXdBEwgXw9ww==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/debug": "^4.1.6", - "7zip-bin": "~5.2.0", - "app-builder-bin": "5.0.0-alpha.10", - "bluebird-lst": "^1.0.9", - "builder-util-runtime": "9.2.10", - "chalk": "^4.1.2", - "cross-spawn": "^7.0.3", - "debug": "^4.3.4", - "fs-extra": "^10.1.0", - "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.0", - "is-ci": "^3.0.0", - "js-yaml": "^4.1.0", - "source-map-support": "^0.5.19", - "stat-mode": "^1.0.0", - "temp-file": "^3.4.0" - } - }, - "node_modules/builder-util-runtime": { - "version": "9.2.10", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz", - "integrity": "sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw==", - "license": "MIT", - "dependencies": { - "debug": "^4.3.4", - "sax": "^1.2.4" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/builder-util/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/cacache/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/cacache/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/cacache/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/cacheable-lookup": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", - "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.6.0" - } - }, - "node_modules/cacheable-request": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", - "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", - "dev": true, - "license": "MIT", - "dependencies": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^4.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^6.0.1", - "responselike": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/chromium-pickle-js": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", - "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==", - "dev": true, - "license": "MIT" - }, - "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "license": "MIT", - "dependencies": { - "restore-cursor": "^3.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cli-spinners": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", - "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/clone-response": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", - "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-response": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true, - "license": "ISC", - "bin": { - "color-support": "bin.js" - } - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, - "node_modules/compare-version": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", - "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/compress-commons": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", - "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "buffer-crc32": "^0.2.13", - "crc32-stream": "^4.0.2", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" - }, - "node_modules/config-file-ts": { - "version": "0.2.8-rc1", - "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz", - "integrity": "sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg==", - "dev": true, - "license": "MIT", - "dependencies": { - "glob": "^10.3.12", - "typescript": "^5.4.3" - } - }, - "node_modules/config-file-ts/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/config-file-ts/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/config-file-ts/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/crc": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", - "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "buffer": "^5.1.0" - } - }, - "node_modules/crc-32": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", - "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", - "dev": true, - "license": "Apache-2.0", - "peer": true, - "bin": { - "crc32": "bin/crc32.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/crc32-stream": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz", - "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "crc-32": "^1.2.0", - "readable-stream": "^3.4.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/debug": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", - "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/decompress-response/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/defaults": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", - "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", - "dev": true, - "license": "MIT", - "dependencies": { - "clone": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/defer-to-connect": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/define-properties": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", - "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "define-data-property": "^1.0.1", - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/detect-libc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", - "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=8" - } - }, - "node_modules/detect-node": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", - "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", - "dev": true, - "license": "MIT", - "optional": true - }, - "node_modules/dir-compare": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz", - "integrity": "sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimatch": "^3.0.5", - "p-limit": "^3.1.0 " - } - }, - "node_modules/dir-compare/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/dir-compare/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/dmg-builder": { - "version": "25.1.8", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-25.1.8.tgz", - "integrity": "sha512-NoXo6Liy2heSklTI5OIZbCgXC1RzrDQsZkeEwXhdOro3FT1VBOvbubvscdPnjVuQ4AMwwv61oaH96AbiYg9EnQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "app-builder-lib": "25.1.8", - "builder-util": "25.1.7", - "builder-util-runtime": "9.2.10", - "fs-extra": "^10.1.0", - "iconv-lite": "^0.6.2", - "js-yaml": "^4.1.0" - }, - "optionalDependencies": { - "dmg-license": "^1.0.11" - } - }, - "node_modules/dmg-builder/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/dmg-license": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz", - "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "@types/plist": "^3.0.1", - "@types/verror": "^1.10.3", - "ajv": "^6.10.0", - "crc": "^3.8.0", - "iconv-corefoundation": "^1.1.7", - "plist": "^3.0.4", - "smart-buffer": "^4.0.2", - "verror": "^1.10.0" - }, - "bin": { - "dmg-license": "bin/dmg-license.js" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dotenv": { - "version": "16.4.7", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", - "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" - } - }, - "node_modules/dotenv-expand": { - "version": "11.0.7", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz", - "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "dotenv": "^16.4.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" - } - }, - "node_modules/dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true, - "license": "MIT" - }, - "node_modules/ejs": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", - "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "jake": "^10.8.5" - }, - "bin": { - "ejs": "bin/cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/electron": { - "version": "34.2.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-34.2.0.tgz", - "integrity": "sha512-SYwBJNeXBTm1q/ErybQMUBZAYqEreBUqBwTrNkw1rV4YatDZk5Aittpcus3PPeC4UoI/tqmJ946uG8AKHTd6CA==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "@electron/get": "^2.0.0", - "@types/node": "^20.9.0", - "extract-zip": "^2.0.1" - }, - "bin": { - "electron": "cli.js" - }, - "engines": { - "node": ">= 12.20.55" - } - }, - "node_modules/electron-builder": { - "version": "25.1.8", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-25.1.8.tgz", - "integrity": "sha512-poRgAtUHHOnlzZnc9PK4nzG53xh74wj2Jy7jkTrqZ0MWPoHGh1M2+C//hGeYdA+4K8w4yiVCNYoLXF7ySj2Wig==", - "dev": true, - "license": "MIT", - "dependencies": { - "app-builder-lib": "25.1.8", - "builder-util": "25.1.7", - "builder-util-runtime": "9.2.10", - "chalk": "^4.1.2", - "dmg-builder": "25.1.8", - "fs-extra": "^10.1.0", - "is-ci": "^3.0.0", - "lazy-val": "^1.0.5", - "simple-update-notifier": "2.0.0", - "yargs": "^17.6.2" - }, - "bin": { - "electron-builder": "cli.js", - "install-app-deps": "install-app-deps.js" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/electron-builder-squirrel-windows": { - "version": "25.1.8", - "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-25.1.8.tgz", - "integrity": "sha512-2ntkJ+9+0GFP6nAISiMabKt6eqBB0kX1QqHNWFWAXgi0VULKGisM46luRFpIBiU3u/TDmhZMM8tzvo2Abn3ayg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "app-builder-lib": "25.1.8", - "archiver": "^5.3.1", - "builder-util": "25.1.7", - "fs-extra": "^10.1.0" - } - }, - "node_modules/electron-builder-squirrel-windows/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-builder/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-publish": { - "version": "25.1.7", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-25.1.7.tgz", - "integrity": "sha512-+jbTkR9m39eDBMP4gfbqglDd6UvBC7RLh5Y0MhFSsc6UkGHj9Vj9TWobxevHYMMqmoujL11ZLjfPpMX+Pt6YEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/fs-extra": "^9.0.11", - "builder-util": "25.1.7", - "builder-util-runtime": "9.2.10", - "chalk": "^4.1.2", - "fs-extra": "^10.1.0", - "lazy-val": "^1.0.5", - "mime": "^2.5.2" - } - }, - "node_modules/electron-publish/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-updater": { - "version": "6.3.9", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.3.9.tgz", - "integrity": "sha512-2PJNONi+iBidkoC5D1nzT9XqsE8Q1X28Fn6xRQhO3YX8qRRyJ3mkV4F1aQsuRnYPqq6Hw+E51y27W75WgDoofw==", - "license": "MIT", - "dependencies": { - "builder-util-runtime": "9.2.10", - "fs-extra": "^10.1.0", - "js-yaml": "^4.1.0", - "lazy-val": "^1.0.5", - "lodash.escaperegexp": "^4.1.2", - "lodash.isequal": "^4.5.0", - "semver": "^7.6.3", - "tiny-typed-emitter": "^2.1.0" - } - }, - "node_modules/electron-updater/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-updater/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "iconv-lite": "^0.6.2" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true, - "license": "MIT" - }, - "node_modules/es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-set-tostringtag": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", - "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.6", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true, - "license": "MIT", - "optional": true - }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint": { - "version": "9.20.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.1.tgz", - "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.0", - "@eslint/core": "^0.11.0", - "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.20.0", - "@eslint/plugin-kit": "^0.2.5", - "@humanfs/node": "^0.16.6", - "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.1", - "@types/estree": "^1.0.6", - "@types/json-schema": "^7.0.15", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.6", - "debug": "^4.3.2", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.2.0", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", - "esquery": "^1.5.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^8.0.0", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://eslint.org/donate" - }, - "peerDependencies": { - "jiti": "*" - }, - "peerDependenciesMeta": { - "jiti": { - "optional": true - } - } - }, - "node_modules/eslint-scope": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", - "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/eslint/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "acorn": "^8.14.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/exponential-backoff": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz", - "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - }, - "bin": { - "extract-zip": "cli.js" - }, - "engines": { - "node": ">= 10.17.0" - }, - "optionalDependencies": { - "@types/yauzl": "^2.9.1" - } - }, - "node_modules/extsprintf": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", - "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "license": "MIT", - "optional": true - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "pend": "~1.2.0" - } - }, - "node_modules/file-entry-cache": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", - "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "flat-cache": "^4.0.0" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/filelist": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", - "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "minimatch": "^5.0.1" - } - }, - "node_modules/filelist/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", - "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", - "dev": true, - "license": "MIT", - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.4" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/flatted": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", - "dev": true, - "license": "ISC" - }, - "node_modules/foreground-child": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", - "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", - "dev": true, - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, - "license": "ISC" - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gauge": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", - "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", - "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", - "function-bind": "^1.1.2", - "get-proto": "^1.0.0", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, - "license": "MIT", - "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "license": "MIT", - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/glob/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/global-agent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", - "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", - "dev": true, - "license": "BSD-3-Clause", - "optional": true, - "dependencies": { - "boolean": "^3.0.1", - "es6-error": "^4.1.1", - "matcher": "^3.0.0", - "roarr": "^2.15.3", - "semver": "^7.3.2", - "serialize-error": "^7.0.1" - }, - "engines": { - "node": ">=10.0" - } - }, - "node_modules/global-agent/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, - "license": "ISC", - "optional": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/globals": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", - "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globalthis": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", - "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "define-properties": "^1.2.1", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/got": { - "version": "11.8.6", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", - "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sindresorhus/is": "^4.0.0", - "@szmarczak/http-timer": "^4.0.5", - "@types/cacheable-request": "^6.0.1", - "@types/responselike": "^1.0.0", - "cacheable-lookup": "^5.0.3", - "cacheable-request": "^7.0.2", - "decompress-response": "^6.0.0", - "http2-wrapper": "^1.0.0-beta.5.2", - "lowercase-keys": "^2.0.0", - "p-cancelable": "^2.0.0", - "responselike": "^2.0.0" - }, - "engines": { - "node": ">=10.19.0" - }, - "funding": { - "url": "https://github.com/sindresorhus/got?sponsor=1" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "license": "ISC" - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "es-define-property": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-symbols": "^1.0.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/http-cache-semantics": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/http2-wrapper": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", - "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", - "dev": true, - "license": "MIT", - "dependencies": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.0.0" - }, - "engines": { - "node": ">=10.19.0" - } - }, - "node_modules/https-proxy-agent": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", - "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.2", - "debug": "4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.0.0" - } - }, - "node_modules/iconv-corefoundation": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz", - "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "cli-truncate": "^2.1.0", - "node-addon-api": "^1.6.3" - }, - "engines": { - "node": "^8.11.2 || >=10" - } - }, - "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "BSD-3-Clause" - }, - "node_modules/ignore": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/import-fresh": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", - "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true, - "license": "ISC" - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, - "license": "ISC", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/ip-address": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", - "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "jsbn": "1.1.0", - "sprintf-js": "^1.1.3" - }, - "engines": { - "node": ">= 12" - } - }, - "node_modules/is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ci-info": "^3.2.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/isbinaryfile": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.4.tgz", - "integrity": "sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 18.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/gjtorikian/" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" - }, - "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/jake": { - "version": "10.9.2", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", - "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "async": "^3.2.3", - "chalk": "^4.0.2", - "filelist": "^1.0.4", - "minimatch": "^3.1.2" - }, - "bin": { - "jake": "bin/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/jake/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/jake/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsbn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", - "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "dev": true, - "license": "ISC", - "optional": true - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "license": "MIT", - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "license": "MIT", - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/lazy-val": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", - "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==", - "license": "MIT" - }, - "node_modules/lazystream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", - "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "readable-stream": "^2.0.5" - }, - "engines": { - "node": ">= 0.6.3" - } - }, - "node_modules/lazystream/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/lazystream/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/lazystream/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.defaults": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/lodash.difference": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/lodash.escaperegexp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", - "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==", - "license": "MIT" - }, - "node_modules/lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", - "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.", - "license": "MIT" - }, - "node_modules/lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.union": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", - "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/make-fetch-happen/node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/make-fetch-happen/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/matcher": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", - "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "escape-string-regexp": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "dev": true, - "license": "MIT", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/minimatch": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "license": "MIT", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true, - "license": "MIT" - }, - "node_modules/negotiator": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", - "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/node-abi": { - "version": "3.74.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz", - "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-abi/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-addon-api": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", - "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==", - "dev": true, - "license": "MIT", - "optional": true - }, - "node_modules/node-api-version": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.0.tgz", - "integrity": "sha512-fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.3.5" - } - }, - "node_modules/node-api-version/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-gyp": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", - "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^12.13 || ^14.13 || >=16" - } - }, - "node_modules/node-gyp/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "license": "ISC", - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/normalize-url": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npmlog": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", - "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/optionator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "dev": true, - "license": "MIT", - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.5" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-cancelable": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", - "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/package-json-from-dist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", - "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", - "dev": true, - "license": "BlueOak-1.0.0" - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "license": "MIT", - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/path-scurry/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/pe-library": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/pe-library/-/pe-library-0.4.1.tgz", - "integrity": "sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12", - "npm": ">=6" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/jet2jet" - } - }, - "node_modules/pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", - "dev": true, - "license": "MIT" - }, - "node_modules/plist": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz", - "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@xmldom/xmldom": "^0.8.8", - "base64-js": "^1.5.1", - "xmlbuilder": "^15.1.1" - }, - "engines": { - "node": ">=10.4.0" - } - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true, - "license": "ISC" - }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/pump": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", - "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", - "dev": true, - "license": "MIT", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-binary-file-arch": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz", - "integrity": "sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.3.4" - }, - "bin": { - "read-binary-file-arch": "cli.js" - } - }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/readdir-glob": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", - "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", - "dev": true, - "license": "Apache-2.0", - "peer": true, - "dependencies": { - "minimatch": "^5.1.0" - } - }, - "node_modules/readdir-glob/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "peer": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resedit": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.2.tgz", - "integrity": "sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==", - "dev": true, - "license": "MIT", - "dependencies": { - "pe-library": "^0.4.1" - }, - "engines": { - "node": ">=12", - "npm": ">=6" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/jet2jet" - } - }, - "node_modules/resolve-alpn": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", - "dev": true, - "license": "MIT" - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/responselike": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", - "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", - "dev": true, - "license": "MIT", - "dependencies": { - "lowercase-keys": "^2.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/roarr": { - "version": "2.15.4", - "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", - "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", - "dev": true, - "license": "BSD-3-Clause", - "optional": true, - "dependencies": { - "boolean": "^3.0.1", - "detect-node": "^2.0.4", - "globalthis": "^1.0.1", - "json-stringify-safe": "^5.0.1", - "semver-compare": "^1.0.0", - "sprintf-js": "^1.1.2" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, - "license": "MIT" - }, - "node_modules/sanitize-filename": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz", - "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==", - "dev": true, - "license": "WTFPL OR ISC", - "dependencies": { - "truncate-utf8-bytes": "^1.0.0" - } - }, - "node_modules/sax": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", - "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==", - "license": "ISC" - }, - "node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/semver-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", - "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", - "dev": true, - "license": "MIT", - "optional": true - }, - "node_modules/serialize-error": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", - "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "type-fest": "^0.13.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true, - "license": "ISC" - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/simple-update-notifier": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", - "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.5.3" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks": { - "version": "2.8.4", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz", - "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ip-address": "^9.0.5", - "smart-buffer": "^4.2.0" - }, - "engines": { - "node": ">= 10.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/socks-proxy-agent/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/stat-mode": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz", - "integrity": "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/sumchecker": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", - "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "debug": "^4.1.0" - }, - "engines": { - "node": ">= 8.0" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "dev": true, - "license": "ISC", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tar/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/temp-file": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz", - "integrity": "sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==", - "dev": true, - "license": "MIT", - "dependencies": { - "async-exit-hook": "^2.0.1", - "fs-extra": "^10.0.0" - } - }, - "node_modules/temp-file/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/tiny-typed-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", - "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==", - "license": "MIT" - }, - "node_modules/tmp": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", - "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.14" - } - }, - "node_modules/tmp-promise": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", - "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "tmp": "^0.2.0" - } - }, - "node_modules/truncate-utf8-bytes": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", - "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==", - "dev": true, - "license": "WTFPL", - "dependencies": { - "utf8-byte-length": "^1.0.1" - } - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-fest": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", - "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/typescript": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", - "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/undici-types": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", - "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", - "dev": true, - "license": "MIT" - }, - "node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/utf8-byte-length": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz", - "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==", - "dev": true, - "license": "(WTFPL OR MIT)" - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true, - "license": "MIT" - }, - "node_modules/verror": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", - "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", - "dev": true, - "license": "MIT", - "dependencies": { - "defaults": "^1.0.3" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "node_modules/word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/xmlbuilder": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", - "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.0" - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, - "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/zip-stream": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz", - "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "archiver-utils": "^3.0.4", - "compress-commons": "^4.1.2", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/zip-stream/node_modules/archiver-utils": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz", - "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "glob": "^7.2.3", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">= 10" - } - } - } -} diff --git a/pkgs/by-name/ne/netron/package.nix b/pkgs/by-name/ne/netron/package.nix index ad432a9a1682..8c15bc2c612e 100644 --- a/pkgs/by-name/ne/netron/package.nix +++ b/pkgs/by-name/ne/netron/package.nix @@ -1,44 +1,38 @@ { - stdenv, lib, + stdenv, buildNpmPackage, - electron_34, + electron_36, fetchFromGitHub, jq, makeDesktopItem, }: let - electron = electron_34; + electron = electron_36; description = "Visualizer for neural network, deep learning and machine learning models"; icon = "netron"; in -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "netron"; - version = "8.1.8"; + version = "8.3.3"; src = fetchFromGitHub { owner = "lutzroeder"; repo = "netron"; - tag = "v${version}"; - hash = "sha256-h03nqBE82mw/XpUOnnQwUxhjXpBF9Ysc1fVTBQpMIS4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7OdHg0nLVz7xno1FTE+fr6FZkzkI+6KjX3EsDzyZbOM="; }; - # Upstream doesn't ship package-lock.json in their sources - # https://github.com/lutzroeder/netron/issues/1430 - postPatch = '' - cp ${./package-lock.json} package-lock.json - ''; + npmDepsHash = "sha256-oOGHo/KCc/qlJRdIyUmoRayV1i+e0mEqMr7TTCo5YKA="; - npmDepsHash = "sha256-oS/s2ZcqynPTJDjoY4hIHEaBKyci/AfaCqpSHhBZB+s="; - - nativeBuildInputs = [ - jq - ]; + nativeBuildInputs = [ jq ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + makeCacheWritable = true; + preBuild = '' if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then echo 'ERROR: electron version mismatch' @@ -96,7 +90,7 @@ buildNpmPackage rec { ]; meta = { - changelog = "https://github.com/lutzroeder/netron/releases/tag/v${version}"; + changelog = "https://github.com/lutzroeder/netron/releases/tag/v${finalAttrs.version}"; inherit description; homepage = "https://netron.app"; license = lib.licenses.mit; @@ -108,4 +102,4 @@ buildNpmPackage rec { lib.systems.inspect.patterns.isDarwin ]; }; -} +}) diff --git a/pkgs/by-name/ne/networkd-dispatcher/package.nix b/pkgs/by-name/ne/networkd-dispatcher/package.nix index e0892968d7ca..486551ce0f6a 100644 --- a/pkgs/by-name/ne/networkd-dispatcher/package.nix +++ b/pkgs/by-name/ne/networkd-dispatcher/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitLab, fetchpatch, + installShellFiles, python3Packages, asciidoc, wrapGAppsNoGuiHook, @@ -36,13 +37,14 @@ stdenv.mkDerivation rec { postPatch = '' # Fix paths in systemd unit file substituteInPlace networkd-dispatcher.service \ - --replace "/usr/bin/networkd-dispatcher" "$out/bin/networkd-dispatcher" + --replace-fail "/usr/bin/networkd-dispatcher" "$out/bin/networkd-dispatcher" # Remove conditions on existing rules path sed -i '/ConditionPathExistsGlob/g' networkd-dispatcher.service ''; nativeBuildInputs = [ - asciidoc + asciidoc # for a2x + installShellFiles wrapGAppsNoGuiHook python3Packages.wrapPython ]; @@ -58,7 +60,6 @@ stdenv.mkDerivation rec { ]; pythonPath = with python3Packages; [ - configparser dbus-python pygobject3 ]; @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { install -D -m755 -t $out/bin networkd-dispatcher install -Dm644 networkd-dispatcher.service $out/lib/systemd/system/networkd-dispatcher.service install -Dm644 networkd-dispatcher.conf $out/etc/conf.d/networkd-dispatcher.conf - install -D networkd-dispatcher.8 -t $out/share/man/man8/ + installManPage networkd-dispatcher.8 runHook postInstall ''; diff --git a/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix index f2ce6da670f6..ec651b3b0a56 100644 --- a/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix +++ b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NetworkManager’s FortiSSL plugin"; - inherit (networkmanager.meta) maintainers platforms; + inherit (networkmanager.meta) maintainers teams platforms; license = licenses.gpl2Plus; }; } diff --git a/pkgs/by-name/ne/networkmanager-iodine/package.nix b/pkgs/by-name/ne/networkmanager-iodine/package.nix index 2e6b2970b924..ad6ff0bad876 100644 --- a/pkgs/by-name/ne/networkmanager-iodine/package.nix +++ b/pkgs/by-name/ne/networkmanager-iodine/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { meta = with lib; { description = "NetworkManager's iodine plugin"; - inherit (networkmanager.meta) maintainers platforms; + inherit (networkmanager.meta) maintainers teams platforms; license = licenses.gpl2Plus; }; } diff --git a/pkgs/by-name/ne/networkmanager-openconnect/package.nix b/pkgs/by-name/ne/networkmanager-openconnect/package.nix index e4ec7fa5739b..098be3d6fe68 100644 --- a/pkgs/by-name/ne/networkmanager-openconnect/package.nix +++ b/pkgs/by-name/ne/networkmanager-openconnect/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NetworkManager’s OpenConnect plugin"; - inherit (networkmanager.meta) maintainers platforms; + inherit (networkmanager.meta) maintainers teams platforms; license = licenses.gpl2Plus; }; } diff --git a/pkgs/by-name/ne/networkmanager-openvpn/package.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix index 82e9c7b0149f..f2c5684b5356 100644 --- a/pkgs/by-name/ne/networkmanager-openvpn/package.nix +++ b/pkgs/by-name/ne/networkmanager-openvpn/package.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { description = "NetworkManager's OpenVPN plugin"; homepage = "https://gitlab.gnome.org/GNOME/NetworkManager-openvpn"; changelog = "https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/blob/main/NEWS"; - inherit (networkmanager.meta) maintainers platforms; + inherit (networkmanager.meta) maintainers teams platforms; license = lib.licenses.gpl2Plus; }; }) diff --git a/pkgs/by-name/ne/networkmanager-sstp/package.nix b/pkgs/by-name/ne/networkmanager-sstp/package.nix index 494f27b80571..e2a6547859ca 100644 --- a/pkgs/by-name/ne/networkmanager-sstp/package.nix +++ b/pkgs/by-name/ne/networkmanager-sstp/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NetworkManager's sstp plugin"; - inherit (networkmanager.meta) maintainers platforms; + inherit (networkmanager.meta) maintainers teams platforms; license = licenses.gpl2Plus; }; } diff --git a/pkgs/by-name/ne/networkmanager-vpnc/package.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix index c476089b890f..23fd0bc5b595 100644 --- a/pkgs/by-name/ne/networkmanager-vpnc/package.nix +++ b/pkgs/by-name/ne/networkmanager-vpnc/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NetworkManager's VPNC plugin"; - inherit (networkmanager.meta) maintainers platforms; + inherit (networkmanager.meta) maintainers teams platforms; license = licenses.gpl2Plus; }; } diff --git a/pkgs/by-name/ne/neverball/package.nix b/pkgs/by-name/ne/neverball/package.nix index 167023a22f6a..d56ee11a81e7 100644 --- a/pkgs/by-name/ne/neverball/package.nix +++ b/pkgs/by-name/ne/neverball/package.nix @@ -7,6 +7,7 @@ libGL, libpng, libjpeg, + libX11, SDL2_ttf, libvorbis, gettext, @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { libjpeg SDL2_ttf libvorbis + libX11 gettext physfs ]; diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix index 8a54783f91f6..fd45a8ee81cd 100644 --- a/pkgs/by-name/ne/neverest/package.nix +++ b/pkgs/by-name/ne/neverest/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, pkg-config, - darwin, installShellFiles, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, @@ -36,17 +35,7 @@ rustPlatform.buildRustPackage rec { pkg-config ] ++ lib.optional (installManPages || installShellCompletions) installShellFiles; - buildInputs = - [ ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Cocoa - Security - ] - ) - ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch; + buildInputs = lib.optional (builtins.elem "notmuch" buildFeatures) notmuch; # TODO: unit tests temporarily broken, remove this line for the next # beta.2 release diff --git a/pkgs/by-name/ne/newlisp/package.nix b/pkgs/by-name/ne/newlisp/package.nix index c38df75a3e25..a1d4f0682593 100644 --- a/pkgs/by-name/ne/newlisp/package.nix +++ b/pkgs/by-name/ne/newlisp/package.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ rc-zb ]; mainProgram = "newlisp"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index 96c63f9951a9..8e9d82719ffd 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -11,7 +11,6 @@ libxml2, json_c, ncurses, - darwin, asciidoctor, libiconv, makeWrapper, @@ -59,15 +58,10 @@ rustPlatform.buildRustPackage (finalAttrs: { json_c ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - Foundation - libiconv - gettext - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + gettext + ]; postBuild = '' make -j $NIX_BUILD_CORES prefix="$out" diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index 2c89c3e550e3..e534e2e76df9 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -12,7 +12,7 @@ rustc, wrapGAppsHook4, gdk-pixbuf, - clapper, + clapper-unwrapped, gtk4, libadwaita, libxml2, @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - clapper + clapper-unwrapped gtk4 libadwaita libxml2 @@ -94,13 +94,11 @@ stdenv.mkDerivation (finalAttrs: { description = "Modern feed reader designed for the GNOME desktop"; homepage = "https://gitlab.com/news-flash/news_flash_gtk"; license = lib.licenses.gpl3Plus; - maintainers = - with lib.maintainers; - [ - kira-bruneau - stunkymonkey - ] - ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ + kira-bruneau + stunkymonkey + ]; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.unix; mainProgram = "io.gitlab.news_flash.NewsFlash"; }; diff --git a/pkgs/by-name/ne/newsraft/package.nix b/pkgs/by-name/ne/newsraft/package.nix index 419bb9dc16ca..11228ceca7c6 100644 --- a/pkgs/by-name/ne/newsraft/package.nix +++ b/pkgs/by-name/ne/newsraft/package.nix @@ -8,20 +8,19 @@ gumbo, ncurses, sqlite, - yajl, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "newsraft"; - version = "0.29"; + version = "0.30"; src = fetchFromGitea { domain = "codeberg.org"; owner = "newsraft"; repo = "newsraft"; rev = "newsraft-${finalAttrs.version}"; - hash = "sha256-6rDnGVOApSURuXom+XxPPOG7lxMbHGTL+4Oqrx+Jq2w="; + hash = "sha256-h9gjw2EjWWNdyQT2p4wgWlz4TNitDBX5fPbNNH9/th4="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,11 +30,14 @@ stdenv.mkDerivation (finalAttrs: { gumbo ncurses sqlite - yajl ]; makeFlags = [ "PREFIX=$(out)" ]; + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + install -Dm444 doc/newsraft.desktop -t $out/share/applications + ''; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ne/newt-go/package.nix b/pkgs/by-name/ne/newt-go/package.nix new file mode 100644 index 000000000000..6f86105d62f5 --- /dev/null +++ b/pkgs/by-name/ne/newt-go/package.nix @@ -0,0 +1,45 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule rec { + pname = "newt"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "fosrl"; + repo = "newt"; + tag = version; + hash = "sha256-wfm2UI4QUiYiAJIYBiSCOD/w72WRJIv2cyLIkfqGsek="; + }; + + vendorHash = "sha256-8VlT9cy2uNhQPiUpr1jJuQSgUR6TtlbQ+etran2Htxs="; + + postPatch = '' + substituteInPlace main.go \ + --replace-fail "replaceme" "${version}" + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + ldflags = [ + "-s" + "-w" + ]; + + doInstallCheck = true; + + versionCheckProgramArg = [ "-version" ]; + + meta = { + description = "Tunneling client for Pangolin"; + homepage = "https://github.com/fosrl/newt"; + changelog = "https://github.com/fosrl/newt/releases/tag/${src.tag}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "newt"; + }; +} diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index 7865f43c6921..dcf4d86a9f70 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.16.2"; + version = "3.16.4"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud-releases"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-CBGvASIPN5xB2kgSDXg2vWpnsFBD3c3wudUAL6u64U8="; + hash = "sha256-8P73YitjuU9SGDBNimqJsvSfGOE9lNCVUNN3f4KXWSY="; }; patches = [ diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix index d08b3773c9af..391a454af7dc 100644 --- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix +++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextcloud-talk-desktop"; - version = "1.1.5"; + version = "1.1.8"; # Building from source would require building also building Server and Talk components # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites src = fetchzip { url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip"; - hash = "sha256-KI6EJxsiIPjk+SBdqAwQNpaMZgVQSra/tqCGufQYSPs="; + hash = "sha256-rKUf6BQk/snwI6Sf67+PbNEnoZZY1u+EOEWE11p3dYw="; stripRoot = false; }; diff --git a/pkgs/applications/science/misc/nextinspace/default.nix b/pkgs/by-name/ne/nextinspace/package.nix similarity index 100% rename from pkgs/applications/science/misc/nextinspace/default.nix rename to pkgs/by-name/ne/nextinspace/package.nix diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index a9399bb9bfbc..30d0fb69093c 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, boost, python3, @@ -15,7 +14,6 @@ enableGui ? false, wrapQtAppsHook ? null, qtbase ? null, - OpenGL ? null, }: let @@ -25,42 +23,33 @@ let }; pname = "nextpnr"; - version = "0.7"; + version = "0.8"; - main_src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "nextpnr"; - rev = "${pname}-${version}"; - hash = "sha256-YIAQcCg9RjvCys1bQ3x+sTgTmnmEeXVbt9Lr6wtg1pA="; - name = "nextpnr"; + prjxray_src = fetchFromGitHub { + owner = "f4pga"; + repo = "prjxray"; + rev = "faf9c774a340e39cf6802d009996ed6016e63521"; + hash = "sha256-BEv7vJoOHWHZoc9EXbesfwFFClkuiSpVwHUrj4ahUcA="; }; - test_src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "nextpnr-tests"; - rev = "00c55a9eb9ea2e062b51fe0d64741412b185d95d"; - hash = "sha256-83suMftMtnaRFq3T2/I7Uahb11WZlXhwYt6Q/rqi2Yo="; - name = "nextpnr-tests"; + prjbeyond_src = fetchFromGitHub { + owner = "YosysHQ-GmbH"; + repo = "prjbeyond-db"; + rev = "06d3b424dd0e52d678087c891c022544238fb9e3"; + hash = "sha256-nmyFFUO+/J2lb+lPATEjdYq0d21P1fN3N94JXR8brZ0="; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit pname version; - srcs = [ - main_src - test_src - ]; - - sourceRoot = main_src.name; - - patches = [ - (fetchpatch { - name = "boost-1_85-fixes.patch"; - url = "https://github.com/YosysHQ/nextpnr/commit/f085950383155a745cf2e3c0f28c468d01ff5fd7.patch"; - hash = "sha256-ihN3S4eeBQSrKbHrGinE/SlIY3QDytYCaO9Mtu36n6c="; - }) - ]; + src = fetchFromGitHub { + owner = "YosysHQ"; + repo = "nextpnr"; + tag = "${pname}-${version}"; + hash = "sha256-lconcmLACxWxC41fTIkUaGbfp79G98YdHA4mRJ9Qo1w="; + fetchSubmodules = true; + }; nativeBuildInputs = [ cmake @@ -79,35 +68,30 @@ stdenv.mkDerivation { let # the specified version must always start with "nextpnr-", so add it if # missing (e.g. if the user overrides with a git hash) - rev = main_src.rev; + rev = src.rev; version = if (lib.hasPrefix "nextpnr-" rev) then rev else "nextpnr-${rev}"; in [ "-DCURRENT_GIT_VERSION=${version}" - "-DARCH=generic;ice40;ecp5;gowin;himbaechel" + "-DARCH=generic;ice40;ecp5;himbaechel" "-DBUILD_TESTS=ON" "-DICESTORM_INSTALL_PREFIX=${icestorm}" "-DTRELLIS_INSTALL_PREFIX=${trellis}" "-DTRELLIS_LIBDIR=${trellis}/lib/trellis" "-DGOWIN_BBA_EXECUTABLE=${python3Packages.apycula}/bin/gowin_bba" "-DUSE_OPENMP=ON" - # warning: high RAM usage - "-DSERIALIZE_CHIPDBS=OFF" + "-DHIMBAECHEL_UARCH=all" "-DHIMBAECHEL_GOWIN_DEVICES=all" + "-DHIMBAECHEL_PRJXRAY_DB=${prjxray_src}" + "-DHIMBAECHEL_PRJBEYOND_DB=${prjbeyond_src}" ] - ++ (lib.optional enableGui "-DBUILD_GUI=ON") - ++ (lib.optional ( - enableGui && stdenv.hostPlatform.isDarwin - ) "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"); + ++ (lib.optional enableGui "-DBUILD_GUI=ON"); postPatch = '' - # use PyPy for icestorm if enabled - substituteInPlace ./ice40/CMakeLists.txt \ - --replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}' - ''; - - preBuild = '' - ln -s ../${test_src.name} tests + # Don't use #embed macro for chipdb binary embeddings - otherwise getting spurious type narrowing errors. + # Maybe related to: https://github.com/llvm/llvm-project/issues/119256 + substituteInPlace CMakeLists.txt \ + --replace-fail "check_cxx_compiler_hash_embed(HAS_HASH_EMBED CXX_FLAGS_HASH_EMBED)" "" ''; doCheck = true; @@ -116,17 +100,16 @@ stdenv.mkDerivation { wrapQtApp $out/bin/nextpnr-generic wrapQtApp $out/bin/nextpnr-ice40 wrapQtApp $out/bin/nextpnr-ecp5 - wrapQtApp $out/bin/nextpnr-gowin wrapQtApp $out/bin/nextpnr-himbaechel ''; strictDeps = true; - meta = with lib; { + meta = { description = "Place and route tool for FPGAs"; homepage = "https://github.com/yosyshq/nextpnr"; - license = licenses.isc; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice ]; + license = lib.licenses.isc; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix index ca14a95e5dce..0e1ec9ed8b32 100644 --- a/pkgs/by-name/ne/nexttrace/package.nix +++ b/pkgs/by-name/ne/nexttrace/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.3.5"; + version = "1.4.0"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-32QFgmvXQ+8ix1N9I6pJaIJGWOT67/FG0VVEhftwQQw="; + sha256 = "sha256-S3rxA5V3x4xdfUiq+XnP2ObE2gQ/3IcooIx6ShNkLrc="; }; - vendorHash = "sha256-WRH9doQavcdH1sd2fS8QoFSmlirBMZgSzB/sj1q6cUQ="; + vendorHash = "sha256-9CNreBLmx1t95M8BijfytDxDrr/GL1GPI/ed9SdYae4="; doCheck = false; # Tests require a network connection. diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json index a9b2f5a7fbf1..e3e8bc58dc00 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.json +++ b/pkgs/by-name/ne/nexusmods-app/deps.json @@ -19,11 +19,6 @@ "version": "11.0.0", "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E=" }, - { - "pname": "Avalonia", - "version": "11.1.3", - "hash": "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0=" - }, { "pname": "Avalonia", "version": "11.2.0", @@ -31,8 +26,13 @@ }, { "pname": "Avalonia", - "version": "11.2.4", - "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4=" + "version": "11.2.3", + "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY=" + }, + { + "pname": "Avalonia", + "version": "11.2.6", + "hash": "sha256-f+fuElhlc2dCUt/GD/Noh07JqPIA8ZtpFxdmetdPVVI=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -41,8 +41,8 @@ }, { "pname": "Avalonia.AvaloniaEdit", - "version": "11.1.0", - "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8=" + "version": "11.2.0", + "hash": "sha256-AFe1jt9xR8XGq4tKkxOdUd7aQOGRSE+M2EQ8fOiV6xo=" }, { "pname": "Avalonia.BuildServices", @@ -56,13 +56,13 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.4", - "hash": "sha256-21Wfb4p0dCevw8Iu/Fchngt1teAnBaxEWgiUpFkerTo=" + "version": "11.2.6", + "hash": "sha256-TeUwMcNIvXw/gMuApUODZ7nuymM6OF9cNUGSajlyfoQ=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.4", - "hash": "sha256-fqQBKzHcL0CwuOQ90Gp+UUZZP9OQ9U6H41bvikxQJpo=" + "version": "11.2.6", + "hash": "sha256-69ZtybLdpGG28M6p1Cenz6PZEfdf1VKxA4wIrw5FJnI=" }, { "pname": "Avalonia.Controls.TreeDataGrid", @@ -71,23 +71,23 @@ }, { "pname": "Avalonia.Desktop", - "version": "11.2.4", - "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo=" + "version": "11.2.6", + "hash": "sha256-PANuvQlAhDWjnv7VUzxOjz6XRmt4l/YKhVLSIP7YL24=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.4", - "hash": "sha256-MUSfRXeJ1bstO2rTqWWCQyVq2EpjM5b5bxe0KxVAEU4=" + "version": "11.2.6", + "hash": "sha256-Lc9qLIywzD06I9sPXQRjLLLijDoFOVmuO5qNh301gYQ=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.4", - "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk=" + "version": "11.2.6", + "hash": "sha256-816li4Nj8+oNkfeMjOAtFSFS+DSo9e2S3K45xqyHJAQ=" }, { "pname": "Avalonia.Headless", - "version": "11.2.4", - "hash": "sha256-3XvLm+pu+s3gXJVyn8dl8teQX4ikNn+dvKXb18Owsn8=" + "version": "11.2.6", + "hash": "sha256-sV68KaIcXu/IK7dQ8S6GdPtRNm6PaOTv5v+z4IUYp1E=" }, { "pname": "Avalonia.Labs.Panels", @@ -96,13 +96,13 @@ }, { "pname": "Avalonia.Native", - "version": "11.2.4", - "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM=" + "version": "11.2.6", + "hash": "sha256-by589X1UIjeQNK0lJMLfNzF2dK+qTNT6CBJNLgG86Aw=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.2.4", - "hash": "sha256-LqwLUDCIbJowol6BNTTsK7a7KjcLLbCM3y3KKvuHRGw=" + "version": "11.2.6", + "hash": "sha256-DsUxdEQMgpmzgRS5zkf3rqk32YL3xFN7KoQkn1Xl6WU=" }, { "pname": "Avalonia.Remote.Protocol", @@ -111,8 +111,8 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.4", - "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc=" + "version": "11.2.6", + "hash": "sha256-Q2uPnR6tPFWExohhMJKnJGTet8IVpQn/HIcRurUPAHQ=" }, { "pname": "Avalonia.Skia", @@ -126,8 +126,8 @@ }, { "pname": "Avalonia.Skia", - "version": "11.2.4", - "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI=" + "version": "11.2.6", + "hash": "sha256-6CfDcJT707iSB9XUQRvSvr5YWMavhiYPnHwVudUl74c=" }, { "pname": "Avalonia.Svg.Skia", @@ -136,28 +136,28 @@ }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.4", - "hash": "sha256-CPun/JWFCVoGxgMA510/gMP2ZB9aZJ9Bk8yuNjwo738=" + "version": "11.2.6", + "hash": "sha256-L664hbpCtbu8aDX7YLnqKybF/eQFfes8eQp4A+as8PY=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.4", - "hash": "sha256-rnF2/bzN8AuOFlsuekOxlu+uLI7n1kIAmC36FFXMKak=" + "version": "11.2.6", + "hash": "sha256-kE31/1tchMJ6XmEbjLr5Idc7uKBAbuhsroUMg0LQauA=" }, { "pname": "Avalonia.Win32", - "version": "11.2.4", - "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY=" + "version": "11.2.6", + "hash": "sha256-e+DNtKz4UDNqOP1vvVRqbD67n5IG9PxmGkMz7B6b7AY=" }, { "pname": "Avalonia.X11", - "version": "11.2.4", - "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk=" + "version": "11.2.6", + "hash": "sha256-atnfxY6vspMzvMFc9PzwWb/uPNkPx5tF3zDGKeqlGIw=" }, { "pname": "AvaloniaEdit.TextMate", - "version": "11.1.0", - "hash": "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM=" + "version": "11.2.0", + "hash": "sha256-O9uQHHMwXCf6xaK+oUNRPJUQC6+p97UmZU1OsLOeroI=" }, { "pname": "Bannerlord.LauncherManager", @@ -361,58 +361,58 @@ }, { "pname": "GameFinder", - "version": "4.5.0", - "hash": "sha256-n9LaGrFy4kHTeXfk5HQbnZli1rzIaw0kWx4bXjUuFm8=" + "version": "4.6.1", + "hash": "sha256-wx5MEcWHg+O7qmXZeoJiLCfEawh5rwtYdxYkSJh+/sk=" }, { "pname": "GameFinder.Common", - "version": "4.5.0", - "hash": "sha256-2HHwusG2DqMSfgH3eD07afvLTmRsUSOcPc6yIuHcMks=" + "version": "4.6.1", + "hash": "sha256-bkgdsruhxbpu9zdyAebPSEPk08WzfzxUbxLGbIHjFT0=" }, { "pname": "GameFinder.Launcher.Heroic", - "version": "4.5.0", - "hash": "sha256-N9wQl4kTPcQC0ulqPm5OugCVeBUEstVLyG87/dwu1Fg=" + "version": "4.6.1", + "hash": "sha256-Zx4fxMvdwoNKQFXe6vz2bp3IFqoK0QHzsB8BveqnNqY=" }, { "pname": "GameFinder.RegistryUtils", - "version": "4.5.0", - "hash": "sha256-n6ZmjyUlAp75mVIYi0R4ncQX7hqLAvsgapMf58Mr3Jo=" + "version": "4.6.1", + "hash": "sha256-AKC6Lrwyb+oFLdUpAAERkdIblRlvNOb94C4hvJflaac=" }, { "pname": "GameFinder.StoreHandlers.EADesktop", - "version": "4.5.0", - "hash": "sha256-JUt5STjbESpaFmvDeGM0yQqgQziD4Or5FxBPwW4XMJE=" + "version": "4.6.1", + "hash": "sha256-6NG35ERzXLt8nGC2mt5/qF3LUSSceHRqlnWtjRfRGTY=" }, { "pname": "GameFinder.StoreHandlers.EGS", - "version": "4.5.0", - "hash": "sha256-O8rFUroxJHQoX0UFK4xmV637Qz+bm5Xk/SCIbhRDZQA=" + "version": "4.6.1", + "hash": "sha256-h+zv/YY8tLSz4XaLLZZVD7n04poAbqrJ422IHfT2rK0=" }, { "pname": "GameFinder.StoreHandlers.GOG", - "version": "4.5.0", - "hash": "sha256-EyX15gumoPf4hyZ4Q8YFfyQfD1dj6J2RmilcGnkf7NE=" + "version": "4.6.1", + "hash": "sha256-SZNRdt77Bgg3I7w6/R0OSeDI6qt90pP1GIrEg2x/a4I=" }, { "pname": "GameFinder.StoreHandlers.Origin", - "version": "4.5.0", - "hash": "sha256-N2TS31L6hzJKn4LsW7g31v2LRsCjKyjVdOH6Kum7vWE=" + "version": "4.6.1", + "hash": "sha256-xp7KDYEsdxjTzRRpkqPkeuf5Umi/5+o9+k0Xn9m6Yus=" }, { "pname": "GameFinder.StoreHandlers.Steam", - "version": "4.5.0", - "hash": "sha256-IjdnksYT1EApOxYix6eInBAE2khwOyTbK11hjNqXZT8=" + "version": "4.6.1", + "hash": "sha256-xPW1IGePWF+clMOSjDky4AgEqCMMa42+ZmrH+WkZUcg=" }, { "pname": "GameFinder.StoreHandlers.Xbox", - "version": "4.5.0", - "hash": "sha256-CmiTBT2T3pC3GzqxUr6T2hQNDp9gmxrRPDkFOzNC3Yo=" + "version": "4.6.1", + "hash": "sha256-jcWgZKQt4NYvEOAgA6tDlnm7oHCV6hwTNKztMpXnC1E=" }, { "pname": "GameFinder.Wine", - "version": "4.5.0", - "hash": "sha256-QARwwZNoHOEnSnHZXeqoGj9R0uK+hMXte9Hc38vZlAI=" + "version": "4.6.1", + "hash": "sha256-DZTxn55GNcWsowre57csnhIS6SW4loC+6XroJ9ZGEC8=" }, { "pname": "Gee.External.Capstone", @@ -816,8 +816,8 @@ }, { "pname": "LinuxDesktopUtils.XDGDesktopPortal", - "version": "1.0.0", - "hash": "sha256-DTxWI/DI01Flb4yfSxukaEw6roSzD9iy4Twy1I8/5Mg=" + "version": "1.0.2", + "hash": "sha256-qE9u3mL/HTN1ABU4zegEpOSq6IblpmIVB9hlYrUzULE=" }, { "pname": "LiveChartsCore", @@ -1606,8 +1606,8 @@ }, { "pname": "NexusMods.Archives.Nx", - "version": "0.6.3", - "hash": "sha256-E4bOexmmPqMJoXs2gDAhgierGAFyc2JVrP3HBn3KAXs=" + "version": "0.6.4", + "hash": "sha256-jDOCZ6VWPqcKE6gqqAdkyLL3G2g6pbG78mpMRhgYx2o=" }, { "pname": "NexusMods.Hashing.xxHash3", @@ -1621,38 +1621,38 @@ }, { "pname": "NexusMods.MnemonicDB", - "version": "0.9.114", - "hash": "sha256-VE1SEKwsS+XAi12l+0jYOQDG1zYSI1t9wKDjXMMyyng=" + "version": "0.9.122", + "hash": "sha256-uaADmIInfTD6jxbfG2XpBzZplVBjuuki7glK5iIS6BM=" }, { "pname": "NexusMods.MnemonicDB.Abstractions", - "version": "0.9.114", - "hash": "sha256-6nNJkQp5FhO29oKnwSvP3Qw6/Zab3RwB3F7WkS6mDBY=" + "version": "0.9.122", + "hash": "sha256-UVGEPXfDx9vaOBPofVmlqJLg0LZS14AETFZWWc8KB14=" }, { "pname": "NexusMods.MnemonicDB.SourceGenerator", - "version": "0.9.114", - "hash": "sha256-vMGecXrBoDgWFk1VyMqsENEVpWuGVaPULjJ4azZThRE=" - }, - { - "pname": "NexusMods.Paths", - "version": "0.10.0", - "hash": "sha256-tzUKPBrGNyZvVgScDAP0qvVF5nV6635v3NlBvzpnz1M=" + "version": "0.9.122", + "hash": "sha256-6YlvYr3mSd/D96iDm6zqP6O9x3mo/DezS3RRRBIn2wk=" }, { "pname": "NexusMods.Paths", "version": "0.15.0", "hash": "sha256-No2kbrDVmJ5ySLm7jH+gNAfNLVnsv4AtLT1phcuOFLc=" }, + { + "pname": "NexusMods.Paths", + "version": "0.18.0", + "hash": "sha256-HNFDFStIXxkoHU8bt9enmb6YxU2NZnqbiapztQpzCcE=" + }, { "pname": "NexusMods.Paths.Extensions.Nx", - "version": "0.15.0", - "hash": "sha256-8QT+Iu32u4m5wqMG2bAqramnUQPLDmUB8/c+ew4fRqM=" + "version": "0.18.0", + "hash": "sha256-UcDLHyepHB1c3RnObNk7Y+2+GDAg+ZmJkGwJ+fLfo1w=" }, { "pname": "NexusMods.Paths.TestingHelpers", - "version": "0.15.0", - "hash": "sha256-xUZIAND1Ob0SRuoTTuJqw7N2j/4ncIlck3lgfeWxd5M=" + "version": "0.18.0", + "hash": "sha256-J8vNJ5njlKz9Nl6JzrTo232p8PAgm9t3RPh+y7nnD68=" }, { "pname": "NLog", @@ -1726,13 +1726,13 @@ }, { "pname": "ObservableCollections", - "version": "3.3.2", - "hash": "sha256-pM/2bPf2QvgOhkqA/cSpd/0jAqhOXrtLn01WWZiuoGc=" + "version": "3.3.3", + "hash": "sha256-HH/xNIVQpvlWONL8RChuaeW2l6zC47Xx/JNSE5/JRR4=" }, { "pname": "ObservableCollections.R3", - "version": "3.3.2", - "hash": "sha256-q/Ch2JW4H/CvE0oFxmqQDKbgQVo1HfHmtuhMrnFQSEU=" + "version": "3.3.3", + "hash": "sha256-9Zh9wjEHPi0qvix7elMGbrQkbe47cmtFLw2e/Wz5rK8=" }, { "pname": "OneOf", @@ -1816,13 +1816,13 @@ }, { "pname": "Projektanker.Icons.Avalonia", - "version": "9.4.1", - "hash": "sha256-RK62Wls48/j7QZTLlzHOLCXV0jK/0WBra5367zyit7s=" + "version": "9.6.1", + "hash": "sha256-vO6CqlO3EjzGYElIjy6r2d5b8g33P1m4EoqYuew9anM=" }, { "pname": "Projektanker.Icons.Avalonia.MaterialDesign", - "version": "9.4.1", - "hash": "sha256-YfGVVfl/Yon9WgJCZscXZMbZoCNg+OvGFvdPSxe+Q1I=" + "version": "9.6.1", + "hash": "sha256-5e/MUcfACOKbX6Wgc+L/3nuDDbS8ccTXwZ0G5obo7Kw=" }, { "pname": "protobuf-net", @@ -1854,10 +1854,15 @@ "version": "1.2.9", "hash": "sha256-Wb3ELPbVhxEMqkrQq5vIjGC36VAzIuMdiYqSAEnVXpY=" }, + { + "pname": "R3", + "version": "1.3.0", + "hash": "sha256-IHKC8TzTPV9FSlUahbZ1EAtEOaATHUB3Ta7snJW1PKw=" + }, { "pname": "R3Extensions.Avalonia", - "version": "1.2.9", - "hash": "sha256-ZNah6u4+a13E93rYGtZIyYPIb3mkopIjjCzYUgmjCxQ=" + "version": "1.3.0", + "hash": "sha256-zqLbdbKQrDz0YweAs50h5kc5O/4cYR/t/IQHYDwBDLg=" }, { "pname": "ReactiveUI", @@ -1879,11 +1884,6 @@ "version": "19.5.41", "hash": "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM=" }, - { - "pname": "Reloaded.Memory", - "version": "9.4.1", - "hash": "sha256-bXaTAUx+/SiiMLmxuPumV9z5w1HcHpzEoNuR+xNhafs=" - }, { "pname": "Reloaded.Memory", "version": "9.4.2", @@ -3014,11 +3014,6 @@ "version": "8.0.0", "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow=" }, - { - "pname": "System.Text.Json", - "version": "8.0.4", - "hash": "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI=" - }, { "pname": "System.Text.Json", "version": "8.0.5", @@ -3111,34 +3106,24 @@ }, { "pname": "TextMateSharp", - "version": "1.0.59", - "hash": "sha256-qfAGSgVpTrWMZSk0TFDVP1IgWWi6O1jEEvWc0Pvw9i0=" - }, - { - "pname": "TextMateSharp", - "version": "1.0.64", - "hash": "sha256-49Fdf6ndcb4BKMlWYjkjpJ3pLp17Z10FcGJpfdXvvzc=" + "version": "1.0.65", + "hash": "sha256-kZx3CBDzu7qUSnihs9Q4Ck78ih1aJ+0g8cN8Hke+E5w=" }, { "pname": "TextMateSharp.Grammars", - "version": "1.0.59", - "hash": "sha256-ru5VxQK4PFRJhHu+MvCzDt3EwbC/94n1whtDovUAUDA=" - }, - { - "pname": "TextMateSharp.Grammars", - "version": "1.0.64", - "hash": "sha256-ykBZOyvaX1/iFmZjue754qJG4jfPx38ZdHevEZvh7w8=" - }, - { - "pname": "Tmds.DBus.Protocol", - "version": "0.18.0", - "hash": "sha256-u5bRK7XbxU/NdMu8PZqxb3fmRdPTbimQ/YIe5/scPOo=" + "version": "1.0.65", + "hash": "sha256-tZx/GKYX3bomQFVFaEgneNYHpB74v+8D90IfkYImlhE=" }, { "pname": "Tmds.DBus.Protocol", "version": "0.20.0", "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.21.2", + "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" + }, { "pname": "TransparentValueObjects", "version": "1.0.2", @@ -3156,8 +3141,8 @@ }, { "pname": "ValveKeyValue", - "version": "0.10.0.360", - "hash": "sha256-LPQ6isUsA3cQKiO6ADijrCQ2ucx4TD01+kGzei3jIGY=" + "version": "0.13.1.398", + "hash": "sha256-dBoEU9Eb0VhzDWHLJY74xamz2Yt283tve+81I8mIxJc=" }, { "pname": "Verify", @@ -3304,6 +3289,11 @@ "version": "16.3.0", "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q=" }, + { + "pname": "ZLinq", + "version": "0.9.6", + "hash": "sha256-MxKNBih6j/t+S+Adw7OgkVN5llUylP+gstF9LSsDShY=" + }, { "pname": "ZstdSharp.Port", "version": "0.8.2", diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 7b39ae86eca2..0aff0df04e7c 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -24,14 +24,13 @@ let in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.8.3"; + version = "0.10.2"; src = fetchgit { url = "https://github.com/Nexus-Mods/NexusMods.App.git"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-b6Tpwy0DepbT80+Jil8celeiNN3W+5prt57NjgLD+u0="; + hash = "sha256-L75nmxjymPfuu6CM5QRE1jInElNrD2OuAXMR8+c2tGQ="; fetchSubmodules = true; - fetchLFS = true; }; enableParallelBuilding = false; @@ -65,12 +64,6 @@ buildDotnetModule (finalAttrs: { postPatch = '' # for some reason these tests fail (intermittently?) with a zero timestamp touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png - - # Bump StrawberryShake so we can drop .NET 8 - # See https://github.com/Nexus-Mods/NexusMods.App/pull/2830 - substituteInPlace Directory.Packages.props \ - --replace-fail 'Include="StrawberryShake.Server" Version="14.1.0"' \ - 'Include="StrawberryShake.Server" Version="15.0.3"' ''; makeWrapperArgs = [ diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index c37cd9bff9f1..20b16274de26 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -6,29 +6,25 @@ versionCheckHook, nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "nezha-agent"; - version = "1.9.7"; + version = "1.12.2"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; - tag = "v${version}"; - hash = "sha256-Kggdd6mSMI04YiBkF93X+LYf2pmLccB6n9LC1tBKMgk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-j0GIfte5z7uyhsnWqsRexWZHJxnqf1cFl1Hq4jnONAo="; }; - vendorHash = "sha256-klwWNTKR7Vdqg3BDDMTyfnVfC+XZ+sFV/17pq7YdJTs="; + vendorHash = "sha256-+0goz1TpHcNd0T45mRc0QornXdHFPy5Y+uH0aOiql+A="; ldflags = [ "-s" - "-X github.com/nezhahq/agent/pkg/monitor.Version=${version}" + "-X github.com/nezhahq/agent/pkg/monitor.Version=${finalAttrs.version}" "-X main.arch=${stdenv.hostPlatform.system}" ]; - preBuild = '' - go generate ./... - ''; - checkFlags = let # Skip tests that require network access @@ -69,4 +65,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ moraxyc ]; mainProgram = "nezha-agent"; }; -} +}) diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json index 31048724c393..1fe63e47f65c 100644 --- a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json +++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json @@ -384,6 +384,36 @@ "node": ">=6.9.0" } }, + "node_modules/@biomejs/js-api": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-0.7.1.tgz", + "integrity": "sha512-VFdgFFZWcyCQxZcAasyv8Enpexn4CblMdWmr6izLYHTLcbd+z9x/LuKU71qnmClABfnYqZjiY7c8DKTVri3Ajw==", + "dev": true, + "license": "MIT OR Apache-2.0", + "peerDependencies": { + "@biomejs/wasm-bundler": "^1.9.2", + "@biomejs/wasm-nodejs": "^1.9.2", + "@biomejs/wasm-web": "^1.9.2" + }, + "peerDependenciesMeta": { + "@biomejs/wasm-bundler": { + "optional": true + }, + "@biomejs/wasm-nodejs": { + "optional": true + }, + "@biomejs/wasm-web": { + "optional": true + } + } + }, + "node_modules/@biomejs/wasm-nodejs": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-1.9.4.tgz", + "integrity": "sha512-ZqNlhKcZW6MW1LxWIOfh9YVrBykvzyFad3bOh6JJFraDnNa3NXboRDiaI8dmrbb0ZHXCU1Tsq6WQsKV2Vpp5dw==", + "dev": true, + "license": "MIT OR Apache-2.0" + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.25.2", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz", @@ -810,9 +840,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", - "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.6.1.tgz", + "integrity": "sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==", "dev": true, "license": "MIT", "dependencies": { @@ -852,9 +882,9 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz", - "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz", + "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -877,9 +907,9 @@ } }, "node_modules/@eslint/core": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz", - "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", + "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -927,9 +957,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.23.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz", - "integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==", + "version": "9.25.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.25.1.tgz", + "integrity": "sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg==", "dev": true, "license": "MIT", "engines": { @@ -960,19 +990,6 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", - "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@types/json-schema": "^7.0.15" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, "node_modules/@exodus/schemasafe": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.3.0.tgz", @@ -1204,29 +1221,29 @@ } }, "node_modules/@radix-ui/number": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.0.tgz", - "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz", + "integrity": "sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==", "license": "MIT" }, "node_modules/@radix-ui/primitive": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz", - "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.2.tgz", + "integrity": "sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==", "license": "MIT" }, "node_modules/@radix-ui/react-alert-dialog": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.6.tgz", - "integrity": "sha512-p4XnPqgej8sZAAReCAKgz1REYZEBLR8hU9Pg27wFnCWIMc8g1ccCs0FjBcy05V15VTu8pAePw/VDYeOm/uZ6yQ==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.10.tgz", + "integrity": "sha512-EJ+FGNgLiOw33YOipPZ4/fZC2x1zKELDBjdJJleYsM6kJCBp3lvAPuXeUoYEHXNvv9iWl5VRU3IT7d/f4A5C7g==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dialog": "1.1.6", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-dialog": "1.1.10", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-slot": "1.2.0" }, "peerDependencies": { "@types/react": "*", @@ -1244,12 +1261,12 @@ } }, "node_modules/@radix-ui/react-arrow": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.2.tgz", - "integrity": "sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.4.tgz", + "integrity": "sha512-qz+fxrqgNxG0dYew5l7qR3c7wdgRu1XVUHGnGYX7rg5HM4p9SWaRmJwfgR3J0SgyUKayLmzQIun+N6rWRgiRKw==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.2" + "@radix-ui/react-primitive": "2.1.0" }, "peerDependencies": { "@types/react": "*", @@ -1267,15 +1284,16 @@ } }, "node_modules/@radix-ui/react-avatar": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.3.tgz", - "integrity": "sha512-Paen00T4P8L8gd9bNsRMw7Cbaz85oxiv+hzomsRZgFm2byltPFDtfcoqlWJ8GyZlIBWgLssJlzLCnKU0G0302g==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.6.tgz", + "integrity": "sha512-YDduxvqNMHzTQWNqja7Z/XTyFc8UOP98/ePjJTFa1vqILPlTPcQaVa1YyQMiQl4SFQPA9Y/zj1dHBgMlE5G/ow==", "license": "MIT", "dependencies": { - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-is-hydrated": "0.0.0", + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1293,19 +1311,19 @@ } }, "node_modules/@radix-ui/react-checkbox": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.4.tgz", - "integrity": "sha512-wP0CPAHq+P5I4INKe3hJrIa1WoNqqrejzW+zoU0rOvo1b9gDEJJFl2rYfO1PYJUQCc2H1WZxIJmyv9BS8i5fLw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.2.2.tgz", + "integrity": "sha512-pMxzQLK+m/tkDRXJg7VUjRx6ozsBdzNLOV4vexfVBU57qT2Gvf4cw2gKKhOohJxjadQ+WcUXCKosTIxcZzi03A==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-controllable-state": "1.1.0", - "@radix-ui/react-use-previous": "1.1.0", - "@radix-ui/react-use-size": "1.1.0" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-controllable-state": "1.2.2", + "@radix-ui/react-use-previous": "1.1.1", + "@radix-ui/react-use-size": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1323,15 +1341,15 @@ } }, "node_modules/@radix-ui/react-collection": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.2.tgz", - "integrity": "sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.4.tgz", + "integrity": "sha512-cv4vSf7HttqXilDnAnvINd53OTl1/bjUYVZrkFnA7nwmY9Ob2POUy0WY0sfqBAe1s5FyKsyceQlqiEGPYNTadg==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2" + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-slot": "1.2.0" }, "peerDependencies": { "@types/react": "*", @@ -1349,9 +1367,9 @@ } }, "node_modules/@radix-ui/react-compose-refs": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz", - "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz", + "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1364,9 +1382,9 @@ } }, "node_modules/@radix-ui/react-context": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz", - "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz", + "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1379,23 +1397,23 @@ } }, "node_modules/@radix-ui/react-dialog": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz", - "integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.10.tgz", + "integrity": "sha512-m6pZb0gEM5uHPSb+i2nKKGQi/HMSVjARMsLMWQfKDP+eJ6B+uqryHnXhpnohTWElw+vEcMk/o4wJODtdRKHwqg==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-controllable-state": "1.1.0", + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-dismissable-layer": "1.1.7", + "@radix-ui/react-focus-guards": "1.1.2", + "@radix-ui/react-focus-scope": "1.1.4", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-portal": "1.1.6", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-slot": "1.2.0", + "@radix-ui/react-use-controllable-state": "1.2.2", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, @@ -1415,9 +1433,9 @@ } }, "node_modules/@radix-ui/react-direction": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz", - "integrity": "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.1.tgz", + "integrity": "sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1430,16 +1448,16 @@ } }, "node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz", - "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.7.tgz", + "integrity": "sha512-j5+WBUdhccJsmH5/H0K6RncjDtoALSEr6jbkaZu+bjw6hOPOhHycr6vEUujl+HBK8kjUfWcoCJXxP6e4lUlMZw==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-escape-keydown": "1.1.0" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-escape-keydown": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1457,18 +1475,18 @@ } }, "node_modules/@radix-ui/react-dropdown-menu": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.6.tgz", - "integrity": "sha512-no3X7V5fD487wab/ZYSHXq3H37u4NVeLDKI/Ks724X/eEFSSEFYZxWgsIlr1UBeEyDaM29HM5x9p1Nv8DuTYPA==", + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.11.tgz", + "integrity": "sha512-wbPE3cFBfLl+S+LCxChWQGX0k14zUxgvep1HEnLhJ9mNhjyO3ETzRviAeKZ3XomT/iVRRZAWFsnFZ3N0wI8OmA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-menu": "2.1.6", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-controllable-state": "1.1.0" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-menu": "2.1.11", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-controllable-state": "1.2.2" }, "peerDependencies": { "@types/react": "*", @@ -1486,9 +1504,9 @@ } }, "node_modules/@radix-ui/react-focus-guards": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz", - "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.2.tgz", + "integrity": "sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1501,14 +1519,14 @@ } }, "node_modules/@radix-ui/react-focus-scope": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz", - "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.4.tgz", + "integrity": "sha512-r2annK27lIW5w9Ho5NyQgqs0MmgZSTIKXWpVCJaLC1q2kZrZkcqnmHkCHMEmv8XLvsLlurKMPT+kbKkRkm/xVA==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0" + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1526,12 +1544,12 @@ } }, "node_modules/@radix-ui/react-id": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz", - "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz", + "integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1544,12 +1562,12 @@ } }, "node_modules/@radix-ui/react-label": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.2.tgz", - "integrity": "sha512-zo1uGMTaNlHehDyFQcDZXRJhUPDuukcnHz0/jnrup0JA6qL+AFpAnty+7VKa9esuU5xTblAZzTGYJKSKaBxBhw==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.4.tgz", + "integrity": "sha512-wy3dqizZnZVV4ja0FNnUhIWNwWdoldXrneEyUcVtLYDAt8ovGS4ridtMAOGgXBBIfggL4BOveVWsjXDORdGEQg==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.2" + "@radix-ui/react-primitive": "2.1.0" }, "peerDependencies": { "@types/react": "*", @@ -1567,27 +1585,27 @@ } }, "node_modules/@radix-ui/react-menu": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.6.tgz", - "integrity": "sha512-tBBb5CXDJW3t2mo9WlO7r6GTmWV0F0uzHZVFmlRmYpiSK1CDU5IKojP1pm7oknpBOrFZx/YgBRW9oorPO2S/Lg==", + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.11.tgz", + "integrity": "sha512-sbFI4Qaw02J0ogmR9tOMsSqsdrGNpUanlPYAqTE2JJafow8ecHtykg4fSTjNHBdDl4deiKMK+RhTEwyVhP7UDA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.2", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-roving-focus": "1.1.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-callback-ref": "1.1.0", + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-collection": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-dismissable-layer": "1.1.7", + "@radix-ui/react-focus-guards": "1.1.2", + "@radix-ui/react-focus-scope": "1.1.4", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-popper": "1.2.4", + "@radix-ui/react-portal": "1.1.6", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-roving-focus": "1.1.7", + "@radix-ui/react-slot": "1.2.0", + "@radix-ui/react-use-callback-ref": "1.1.1", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, @@ -1607,25 +1625,25 @@ } }, "node_modules/@radix-ui/react-navigation-menu": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.5.tgz", - "integrity": "sha512-myMHHQUZ3ZLTi8W381/Vu43Ia0NqakkQZ2vzynMmTUtQQ9kNkjzhOwkZC9TAM5R07OZUVIQyHC06f/9JZJpvvA==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.9.tgz", + "integrity": "sha512-Z7lefjA5VAmEB5ZClxeHGWGQAqhGWgEc6u0MYviUmIVrgGCVLv5mv/jsfUY3tJWI71cVhpQ7dnf/Q6RtM3ylVA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-controllable-state": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0", - "@radix-ui/react-use-previous": "1.1.0", - "@radix-ui/react-visually-hidden": "1.1.2" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-collection": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-dismissable-layer": "1.1.7", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-controllable-state": "1.2.2", + "@radix-ui/react-use-layout-effect": "1.1.1", + "@radix-ui/react-use-previous": "1.1.1", + "@radix-ui/react-visually-hidden": "1.2.0" }, "peerDependencies": { "@types/react": "*", @@ -1643,24 +1661,24 @@ } }, "node_modules/@radix-ui/react-popover": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.6.tgz", - "integrity": "sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.10.tgz", + "integrity": "sha512-IZN7b3sXqajiPsOzKuNJBSP9obF4MX5/5UhTgWNofw4r1H+eATWb0SyMlaxPD/kzA4vadFgy1s7Z1AEJ6WMyHQ==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.2", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-controllable-state": "1.1.0", + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-dismissable-layer": "1.1.7", + "@radix-ui/react-focus-guards": "1.1.2", + "@radix-ui/react-focus-scope": "1.1.4", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-popper": "1.2.4", + "@radix-ui/react-portal": "1.1.6", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-slot": "1.2.0", + "@radix-ui/react-use-controllable-state": "1.2.2", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, @@ -1680,21 +1698,21 @@ } }, "node_modules/@radix-ui/react-popper": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.2.tgz", - "integrity": "sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.4.tgz", + "integrity": "sha512-3p2Rgm/a1cK0r/UVkx5F/K9v/EplfjAeIFCGOPYPO4lZ0jtg4iSQXt/YGTSLWaf4x7NG6Z4+uKFcylcTZjeqDA==", "license": "MIT", "dependencies": { "@floating-ui/react-dom": "^2.0.0", - "@radix-ui/react-arrow": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0", - "@radix-ui/react-use-rect": "1.1.0", - "@radix-ui/react-use-size": "1.1.0", - "@radix-ui/rect": "1.1.0" + "@radix-ui/react-arrow": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-layout-effect": "1.1.1", + "@radix-ui/react-use-rect": "1.1.1", + "@radix-ui/react-use-size": "1.1.1", + "@radix-ui/rect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1712,13 +1730,13 @@ } }, "node_modules/@radix-ui/react-portal": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz", - "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.6.tgz", + "integrity": "sha512-XmsIl2z1n/TsYFLIdYam2rmFwf9OC/Sh2avkbmVMDuBZIe7hSpM0cYnWPAo7nHOVx8zTuwDZGByfcqLdnzp3Vw==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1736,13 +1754,13 @@ } }, "node_modules/@radix-ui/react-presence": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.2.tgz", - "integrity": "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.3.tgz", + "integrity": "sha512-IrVLIhskYhH3nLvtcBLQFZr61tBG7wx7O3kEmdzcYwRGAEBmBicGGL7ATzNgruYJ3xBTbuzEEq9OXJM3PAX3tA==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1760,12 +1778,12 @@ } }, "node_modules/@radix-ui/react-primitive": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz", - "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.0.tgz", + "integrity": "sha512-/J/FhLdK0zVcILOwt5g+dH4KnkonCtkVJsa2G6JmvbbtZfBEI1gMsO3QMjseL4F/SwfAMt1Vc/0XKYKq+xJ1sw==", "license": "MIT", "dependencies": { - "@radix-ui/react-slot": "1.1.2" + "@radix-ui/react-slot": "1.2.0" }, "peerDependencies": { "@types/react": "*", @@ -1783,20 +1801,20 @@ } }, "node_modules/@radix-ui/react-roving-focus": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.2.tgz", - "integrity": "sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.7.tgz", + "integrity": "sha512-C6oAg451/fQT3EGbWHbCQjYTtbyjNO1uzQgMzwyivcHT3GKNEmu1q3UuREhN+HzHAVtv3ivMVK08QlC+PkYw9Q==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-controllable-state": "1.1.0" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-collection": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-controllable-state": "1.2.2" }, "peerDependencies": { "@types/react": "*", @@ -1814,20 +1832,20 @@ } }, "node_modules/@radix-ui/react-scroll-area": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.3.tgz", - "integrity": "sha512-l7+NNBfBYYJa9tNqVcP2AGvxdE3lmE6kFTBXdvHgUaZuy+4wGCL1Cl2AfaR7RKyimj7lZURGLwFO59k4eBnDJQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.5.tgz", + "integrity": "sha512-VyLjxI8/gXYn+Wij1FLpXjZp6Z/uNklUFQQ75tOpJNESeNaZ2kCRfjiEDmHgWmLeUPeJGwrqbgRmcdFjtYEkMA==", "license": "MIT", "dependencies": { - "@radix-ui/number": "1.1.0", - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/number": "1.1.1", + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1845,30 +1863,30 @@ } }, "node_modules/@radix-ui/react-select": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.6.tgz", - "integrity": "sha512-T6ajELxRvTuAMWH0YmRJ1qez+x4/7Nq7QIx7zJ0VK3qaEWdnWpNbEDnmWldG1zBDwqrLy5aLMUWcoGirVj5kMg==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.2.tgz", + "integrity": "sha512-HjkVHtBkuq+r3zUAZ/CvNWUGKPfuicGDbgtZgiQuFmNcV5F+Tgy24ep2nsAW2nFgvhGPJVqeBZa6KyVN0EyrBA==", "license": "MIT", "dependencies": { - "@radix-ui/number": "1.1.0", - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.2", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-controllable-state": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0", - "@radix-ui/react-use-previous": "1.1.0", - "@radix-ui/react-visually-hidden": "1.1.2", + "@radix-ui/number": "1.1.1", + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-collection": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-dismissable-layer": "1.1.7", + "@radix-ui/react-focus-guards": "1.1.2", + "@radix-ui/react-focus-scope": "1.1.4", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-popper": "1.2.4", + "@radix-ui/react-portal": "1.1.6", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-slot": "1.2.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-controllable-state": "1.2.2", + "@radix-ui/react-use-layout-effect": "1.1.1", + "@radix-ui/react-use-previous": "1.1.1", + "@radix-ui/react-visually-hidden": "1.2.0", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, @@ -1888,12 +1906,12 @@ } }, "node_modules/@radix-ui/react-separator": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.2.tgz", - "integrity": "sha512-oZfHcaAp2Y6KFBX6I5P1u7CQoy4lheCGiYj+pGFrHy8E/VNRb5E39TkTr3JrV520csPBTZjkuKFdEsjS5EUNKQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.4.tgz", + "integrity": "sha512-2fTm6PSiUm8YPq9W0E4reYuv01EE3aFSzt8edBiXqPHshF8N9+Kymt/k0/R+F3dkY5lQyB/zPtrP82phskLi7w==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.2" + "@radix-ui/react-primitive": "2.1.0" }, "peerDependencies": { "@types/react": "*", @@ -1911,12 +1929,12 @@ } }, "node_modules/@radix-ui/react-slot": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz", - "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.0.tgz", + "integrity": "sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1" + "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1929,19 +1947,19 @@ } }, "node_modules/@radix-ui/react-tabs": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.3.tgz", - "integrity": "sha512-9mFyI30cuRDImbmFF6O2KUJdgEOsGh9Vmx9x/Dh9tOhL7BngmQPQfwW4aejKm5OHpfWIdmeV6ySyuxoOGjtNng==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.8.tgz", + "integrity": "sha512-4iUaN9SYtG+/E+hJ7jRks/Nv90f+uAsRHbLYA6BcA9EsR6GNWgsvtS4iwU2SP0tOZfDGAyqIT0yz7ckgohEIFA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-roving-focus": "1.1.2", - "@radix-ui/react-use-controllable-state": "1.1.0" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-roving-focus": "1.1.7", + "@radix-ui/react-use-controllable-state": "1.2.2" }, "peerDependencies": { "@types/react": "*", @@ -1959,9 +1977,9 @@ } }, "node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", - "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz", + "integrity": "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1974,12 +1992,31 @@ } }, "node_modules/@radix-ui/react-use-controllable-state": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz", - "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz", + "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.0" + "@radix-ui/react-use-effect-event": "0.0.2", + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-effect-event": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz", + "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1992,12 +2029,30 @@ } }, "node_modules/@radix-ui/react-use-escape-keydown": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz", - "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz", + "integrity": "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.0" + "@radix-ui/react-use-callback-ref": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-is-hydrated": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.0.0.tgz", + "integrity": "sha512-23RkSm7jSZ8+rtfdSJTi/2D+p9soPbtnoG/tPf08egYCDr6p8X83hrcmW77p7MJ8kJYWNXwruuPTPp1TwIIH4g==", + "license": "MIT", + "dependencies": { + "use-sync-external-store": "^1.4.0" }, "peerDependencies": { "@types/react": "*", @@ -2010,9 +2065,9 @@ } }, "node_modules/@radix-ui/react-use-layout-effect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz", - "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz", + "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -2025,9 +2080,9 @@ } }, "node_modules/@radix-ui/react-use-previous": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz", - "integrity": "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.1.tgz", + "integrity": "sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -2040,12 +2095,12 @@ } }, "node_modules/@radix-ui/react-use-rect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz", - "integrity": "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.1.tgz", + "integrity": "sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==", "license": "MIT", "dependencies": { - "@radix-ui/rect": "1.1.0" + "@radix-ui/rect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -2058,12 +2113,12 @@ } }, "node_modules/@radix-ui/react-use-size": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz", - "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.1.tgz", + "integrity": "sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -2076,12 +2131,12 @@ } }, "node_modules/@radix-ui/react-visually-hidden": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz", - "integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.0.tgz", + "integrity": "sha512-rQj0aAWOpCdCMRbI6pLQm8r7S2BM3YhTa0SzOYD55k+hJA8oo9J+H+9wLM9oMlZWOX/wJWPTzfDfmZkf7LvCfg==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.2" + "@radix-ui/react-primitive": "2.1.0" }, "peerDependencies": { "@types/react": "*", @@ -2099,15 +2154,15 @@ } }, "node_modules/@radix-ui/rect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz", - "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.1.tgz", + "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==", "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.39.0.tgz", - "integrity": "sha512-lGVys55Qb00Wvh8DMAocp5kIcaNzEFTmGhfFd88LfaogYTRKrdxgtlO5H6S49v2Nd8R2C6wLOal0qv6/kCkOwA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.0.tgz", + "integrity": "sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==", "cpu": [ "arm" ], @@ -2119,9 +2174,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.39.0.tgz", - "integrity": "sha512-It9+M1zE31KWfqh/0cJLrrsCPiF72PoJjIChLX+rEcujVRCb4NLQ5QzFkzIZW8Kn8FTbvGQBY5TkKBau3S8cCQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.0.tgz", + "integrity": "sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==", "cpu": [ "arm64" ], @@ -2133,9 +2188,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.39.0.tgz", - "integrity": "sha512-lXQnhpFDOKDXiGxsU9/l8UEGGM65comrQuZ+lDcGUx+9YQ9dKpF3rSEGepyeR5AHZ0b5RgiligsBhWZfSSQh8Q==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.0.tgz", + "integrity": "sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==", "cpu": [ "arm64" ], @@ -2147,9 +2202,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.39.0.tgz", - "integrity": "sha512-mKXpNZLvtEbgu6WCkNij7CGycdw9cJi2k9v0noMb++Vab12GZjFgUXD69ilAbBh034Zwn95c2PNSz9xM7KYEAQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.0.tgz", + "integrity": "sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==", "cpu": [ "x64" ], @@ -2161,9 +2216,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.39.0.tgz", - "integrity": "sha512-jivRRlh2Lod/KvDZx2zUR+I4iBfHcu2V/BA2vasUtdtTN2Uk3jfcZczLa81ESHZHPHy4ih3T/W5rPFZ/hX7RtQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.0.tgz", + "integrity": "sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==", "cpu": [ "arm64" ], @@ -2175,9 +2230,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.39.0.tgz", - "integrity": "sha512-8RXIWvYIRK9nO+bhVz8DwLBepcptw633gv/QT4015CpJ0Ht8punmoHU/DuEd3iw9Hr8UwUV+t+VNNuZIWYeY7Q==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.0.tgz", + "integrity": "sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==", "cpu": [ "x64" ], @@ -2189,9 +2244,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.39.0.tgz", - "integrity": "sha512-mz5POx5Zu58f2xAG5RaRRhp3IZDK7zXGk5sdEDj4o96HeaXhlUwmLFzNlc4hCQi5sGdR12VDgEUqVSHer0lI9g==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.0.tgz", + "integrity": "sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==", "cpu": [ "arm" ], @@ -2203,9 +2258,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.39.0.tgz", - "integrity": "sha512-+YDwhM6gUAyakl0CD+bMFpdmwIoRDzZYaTWV3SDRBGkMU/VpIBYXXEvkEcTagw/7VVkL2vA29zU4UVy1mP0/Yw==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.0.tgz", + "integrity": "sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==", "cpu": [ "arm" ], @@ -2217,9 +2272,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.39.0.tgz", - "integrity": "sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.0.tgz", + "integrity": "sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==", "cpu": [ "arm64" ], @@ -2231,9 +2286,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.39.0.tgz", - "integrity": "sha512-vYanR6MtqC7Z2SNr8gzVnzUul09Wi1kZqJaek3KcIlI/wq5Xtq4ZPIZ0Mr/st/sv/NnaPwy/D4yXg5x0B3aUUA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.0.tgz", + "integrity": "sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==", "cpu": [ "arm64" ], @@ -2245,9 +2300,9 @@ ] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.39.0.tgz", - "integrity": "sha512-NMRUT40+h0FBa5fb+cpxtZoGAggRem16ocVKIv5gDB5uLDgBIwrIsXlGqYbLwW8YyO3WVTk1FkFDjMETYlDqiw==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.0.tgz", + "integrity": "sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==", "cpu": [ "loong64" ], @@ -2259,9 +2314,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.39.0.tgz", - "integrity": "sha512-0pCNnmxgduJ3YRt+D+kJ6Ai/r+TaePu9ZLENl+ZDV/CdVczXl95CbIiwwswu4L+K7uOIGf6tMo2vm8uadRaICQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.0.tgz", + "integrity": "sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==", "cpu": [ "ppc64" ], @@ -2273,9 +2328,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.39.0.tgz", - "integrity": "sha512-t7j5Zhr7S4bBtksT73bO6c3Qa2AV/HqiGlj9+KB3gNF5upcVkx+HLgxTm8DK4OkzsOYqbdqbLKwvGMhylJCPhQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.0.tgz", + "integrity": "sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==", "cpu": [ "riscv64" ], @@ -2287,9 +2342,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.39.0.tgz", - "integrity": "sha512-m6cwI86IvQ7M93MQ2RF5SP8tUjD39Y7rjb1qjHgYh28uAPVU8+k/xYWvxRO3/tBN2pZkSMa5RjnPuUIbrwVxeA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.0.tgz", + "integrity": "sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==", "cpu": [ "riscv64" ], @@ -2301,9 +2356,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.39.0.tgz", - "integrity": "sha512-iRDJd2ebMunnk2rsSBYlsptCyuINvxUfGwOUldjv5M4tpa93K8tFMeYGpNk2+Nxl+OBJnBzy2/JCscGeO507kA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.0.tgz", + "integrity": "sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==", "cpu": [ "s390x" ], @@ -2315,9 +2370,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz", - "integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.0.tgz", + "integrity": "sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==", "cpu": [ "x64" ], @@ -2329,9 +2384,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.39.0.tgz", - "integrity": "sha512-ThFdkrFDP55AIsIZDKSBWEt/JcWlCzydbZHinZ0F/r1h83qbGeenCt/G/wG2O0reuENDD2tawfAj2s8VK7Bugg==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.0.tgz", + "integrity": "sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==", "cpu": [ "x64" ], @@ -2343,9 +2398,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.39.0.tgz", - "integrity": "sha512-jDrLm6yUtbOg2TYB3sBF3acUnAwsIksEYjLeHL+TJv9jg+TmTwdyjnDex27jqEMakNKf3RwwPahDIt7QXCSqRQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.0.tgz", + "integrity": "sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==", "cpu": [ "arm64" ], @@ -2357,9 +2412,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.39.0.tgz", - "integrity": "sha512-6w9uMuza+LbLCVoNKL5FSLE7yvYkq9laSd09bwS0tMjkwXrmib/4KmoJcrKhLWHvw19mwU+33ndC69T7weNNjQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.0.tgz", + "integrity": "sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==", "cpu": [ "ia32" ], @@ -2371,9 +2426,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.39.0.tgz", - "integrity": "sha512-yAkUOkIKZlK5dl7u6dg897doBgLXmUHhIINM2c+sND3DZwnrdQkkSiDh7N75Ll4mM4dxSkYfXqU9fW3lLkMFug==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.0.tgz", + "integrity": "sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==", "cpu": [ "x64" ], @@ -2385,12 +2440,12 @@ ] }, "node_modules/@tanstack/react-table": { - "version": "8.21.2", - "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.2.tgz", - "integrity": "sha512-11tNlEDTdIhMJba2RBH+ecJ9l1zgS2kjmexDPAraulc8jeNA4xocSNeyzextT0XJyASil4XsCYlJmf5jEWAtYg==", + "version": "8.21.3", + "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.3.tgz", + "integrity": "sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww==", "license": "MIT", "dependencies": { - "@tanstack/table-core": "8.21.2" + "@tanstack/table-core": "8.21.3" }, "engines": { "node": ">=12" @@ -2405,9 +2460,9 @@ } }, "node_modules/@tanstack/table-core": { - "version": "8.21.2", - "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.2.tgz", - "integrity": "sha512-uvXk/U4cBiFMxt+p9/G7yUWI/UbHYbyghLCjlpWZ3mLeIZiUBSKcUnw9UnKkdRz7Z/N4UBuFLWQdJCjUe7HjvA==", + "version": "8.21.3", + "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.3.tgz", + "integrity": "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==", "license": "MIT", "engines": { "node": ">=12" @@ -2466,9 +2521,9 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.8", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", - "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", + "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", "dev": true, "license": "MIT", "dependencies": { @@ -2496,12 +2551,6 @@ "@babel/types": "^7.20.7" } }, - "node_modules/@types/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", - "license": "MIT" - }, "node_modules/@types/estree": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", @@ -2517,15 +2566,15 @@ "license": "MIT" }, "node_modules/@types/luxon": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.0.tgz", - "integrity": "sha512-RtEj20xRyG7cRp142MkQpV3GRF8Wo2MtDkKLz65MQs7rM1Lh8bz+HtfPXCCJEYpnDFu6VwAq/Iv2Ikyp9Jw/hw==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.2.tgz", + "integrity": "sha512-R/BdP7OxEMc44l2Ex5lSXHoIXTB2JLNa3y2QISIbr58U/YcsffyQrYW//hZSdrfxrjRZj3GcUoxMPGdO8gSYuw==", "license": "MIT" }, "node_modules/@types/node": { - "version": "22.14.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.0.tgz", - "integrity": "sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==", + "version": "22.14.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz", + "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==", "dev": true, "license": "MIT", "dependencies": { @@ -2568,17 +2617,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.0.tgz", - "integrity": "sha512-PAIpk/U7NIS6H7TEtN45SPGLQaHNgB7wSjsQV/8+KYokAb2T/gloOA/Bee2yd4/yKVhPKe5LlaUGhAZk5zmSaQ==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.31.0.tgz", + "integrity": "sha512-evaQJZ/J/S4wisevDvC1KFZkPzRetH8kYZbkgcTRyql3mcKsf+ZFDV1BVWUGTCAW5pQHoqn5gK5b8kn7ou9aFQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.29.0", - "@typescript-eslint/type-utils": "8.29.0", - "@typescript-eslint/utils": "8.29.0", - "@typescript-eslint/visitor-keys": "8.29.0", + "@typescript-eslint/scope-manager": "8.31.0", + "@typescript-eslint/type-utils": "8.31.0", + "@typescript-eslint/utils": "8.31.0", + "@typescript-eslint/visitor-keys": "8.31.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -2598,16 +2647,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz", - "integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.0.tgz", + "integrity": "sha512-67kYYShjBR0jNI5vsf/c3WG4u+zDnCTHTPqVMQguffaWWFs7artgwKmfwdifl+r6XyM5LYLas/dInj2T0SgJyw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.29.0", - "@typescript-eslint/types": "8.29.0", - "@typescript-eslint/typescript-estree": "8.29.0", - "@typescript-eslint/visitor-keys": "8.29.0", + "@typescript-eslint/scope-manager": "8.31.0", + "@typescript-eslint/types": "8.31.0", + "@typescript-eslint/typescript-estree": "8.31.0", + "@typescript-eslint/visitor-keys": "8.31.0", "debug": "^4.3.4" }, "engines": { @@ -2623,14 +2672,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz", - "integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.0.tgz", + "integrity": "sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.29.0", - "@typescript-eslint/visitor-keys": "8.29.0" + "@typescript-eslint/types": "8.31.0", + "@typescript-eslint/visitor-keys": "8.31.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2641,14 +2690,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.0.tgz", - "integrity": "sha512-ahaWQ42JAOx+NKEf5++WC/ua17q5l+j1GFrbbpVKzFL/tKVc0aYY8rVSYUpUvt2hUP1YBr7mwXzx+E/DfUWI9Q==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.31.0.tgz", + "integrity": "sha512-DJ1N1GdjI7IS7uRlzJuEDCgDQix3ZVYVtgeWEyhyn4iaoitpMBX6Ndd488mXSx0xah/cONAkEaYyylDyAeHMHg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.29.0", - "@typescript-eslint/utils": "8.29.0", + "@typescript-eslint/typescript-estree": "8.31.0", + "@typescript-eslint/utils": "8.31.0", "debug": "^4.3.4", "ts-api-utils": "^2.0.1" }, @@ -2665,9 +2714,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz", - "integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.0.tgz", + "integrity": "sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==", "dev": true, "license": "MIT", "engines": { @@ -2679,14 +2728,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz", - "integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.0.tgz", + "integrity": "sha512-xLmgn4Yl46xi6aDSZ9KkyfhhtnYI15/CvHbpOy/eR5NWhK/BK8wc709KKwhAR0m4ZKRP7h07bm4BWUYOCuRpQQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.29.0", - "@typescript-eslint/visitor-keys": "8.29.0", + "@typescript-eslint/types": "8.31.0", + "@typescript-eslint/visitor-keys": "8.31.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -2745,16 +2794,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.0.tgz", - "integrity": "sha512-gX/A0Mz9Bskm8avSWFcK0gP7cZpbY4AIo6B0hWYFCaIsz750oaiWR4Jr2CI+PQhfW1CpcQr9OlfPS+kMFegjXA==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.31.0.tgz", + "integrity": "sha512-qi6uPLt9cjTFxAb1zGNgTob4x9ur7xC6mHQJ8GwEzGMGE9tYniublmJaowOJ9V2jUzxrltTPfdG2nKlWsq0+Ww==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.29.0", - "@typescript-eslint/types": "8.29.0", - "@typescript-eslint/typescript-estree": "8.29.0" + "@typescript-eslint/scope-manager": "8.31.0", + "@typescript-eslint/types": "8.31.0", + "@typescript-eslint/typescript-estree": "8.31.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2769,13 +2818,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz", - "integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.0.tgz", + "integrity": "sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/types": "8.31.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -2787,17 +2836,17 @@ } }, "node_modules/@vitejs/plugin-react": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.4.tgz", - "integrity": "sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.4.1.tgz", + "integrity": "sha512-IpEm5ZmeXAP/osiBXVVP5KjFMzbWOonMs0NaQQl+xYnUAcq4oHUBsF2+p4MgKWG4YMmFYJU8A6sxRPuowllm6w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/core": "^7.26.0", + "@babel/core": "^7.26.10", "@babel/plugin-transform-react-jsx-self": "^7.25.9", "@babel/plugin-transform-react-jsx-source": "^7.25.9", "@types/babel__core": "^7.20.5", - "react-refresh": "^0.14.2" + "react-refresh": "^0.17.0" }, "engines": { "node": "^14.18.0 || >=16.0.0" @@ -3053,6 +3102,35 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/c12": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/c12/-/c12-3.0.3.tgz", + "integrity": "sha512-uC3MacKBb0Z15o5QWCHvHWj5Zv34pGQj9P+iXKSpTuSGFS0KKhUWf4t9AJ+gWjYOdmWCPEGpEzm8sS0iqbpo1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "chokidar": "^4.0.3", + "confbox": "^0.2.2", + "defu": "^6.1.4", + "dotenv": "^16.4.7", + "exsolve": "^1.0.4", + "giget": "^2.0.0", + "jiti": "^2.4.2", + "ohash": "^2.0.11", + "pathe": "^2.0.3", + "perfect-debounce": "^1.0.0", + "pkg-types": "^2.1.0", + "rc9": "^2.1.2" + }, + "peerDependencies": { + "magicast": "^0.3.5" + }, + "peerDependenciesMeta": { + "magicast": { + "optional": true + } + } + }, "node_modules/call-me-maybe": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz", @@ -3080,9 +3158,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001707", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", - "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", + "version": "1.0.30001715", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz", + "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==", "dev": true, "funding": [ { @@ -3118,39 +3196,19 @@ } }, "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, "license": "MIT", "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" + "readdirp": "^4.0.1" }, "engines": { - "node": ">= 8.10.0" + "node": ">= 14.16.0" }, "funding": { "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/chokidar/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" } }, "node_modules/citty": { @@ -3312,6 +3370,13 @@ "dev": true, "license": "MIT" }, + "node_modules/confbox": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.2.tgz", + "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==", + "dev": true, + "license": "MIT" + }, "node_modules/consola": { "version": "3.4.2", "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz", @@ -3347,33 +3412,6 @@ "toggle-selection": "^1.0.6" } }, - "node_modules/cosmiconfig": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", - "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", - "dev": true, - "license": "MIT", - "dependencies": { - "env-paths": "^2.2.1", - "import-fresh": "^3.3.0", - "js-yaml": "^4.1.0", - "parse-json": "^5.2.0" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/d-fischer" - }, - "peerDependencies": { - "typescript": ">=4.9.5" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -3431,6 +3469,13 @@ "dev": true, "license": "MIT" }, + "node_modules/defu": { + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz", + "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==", + "dev": true, + "license": "MIT" + }, "node_modules/dequal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", @@ -3440,6 +3485,13 @@ "node": ">=6" } }, + "node_modules/destr": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/destr/-/destr-2.0.5.tgz", + "integrity": "sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==", + "dev": true, + "license": "MIT" + }, "node_modules/detect-node-es": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", @@ -3458,6 +3510,19 @@ "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", "license": "MIT" }, + "node_modules/dotenv": { + "version": "16.5.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", + "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -3465,9 +3530,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.129", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz", - "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==", + "version": "1.5.140", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.140.tgz", + "integrity": "sha512-o82Rj+ONp4Ip7Cl1r7lrqx/pXhbp/lh9DpKcMNscFJdh8ebyRofnc7Sh01B4jx403RI0oqTBvlZ7OBIZLMr2+Q==", "dev": true, "license": "ISC" }, @@ -3477,26 +3542,6 @@ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "license": "MIT" }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, "node_modules/es6-promise": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", @@ -3569,20 +3614,20 @@ } }, "node_modules/eslint": { - "version": "9.23.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz", - "integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==", + "version": "9.25.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.25.1.tgz", + "integrity": "sha512-E6Mtz9oGQWDCpV12319d59n4tx9zOTXSTmc8BLVxBx+G/0RdM5MvEEJLU9c0+aleoePYYgVTOsRblx433qmhWQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.2", - "@eslint/config-helpers": "^0.2.0", - "@eslint/core": "^0.12.0", + "@eslint/config-array": "^0.20.0", + "@eslint/config-helpers": "^0.2.1", + "@eslint/core": "^0.13.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.23.0", - "@eslint/plugin-kit": "^0.2.7", + "@eslint/js": "9.25.1", + "@eslint/plugin-kit": "^0.2.8", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", @@ -3643,9 +3688,9 @@ } }, "node_modules/eslint-plugin-react-refresh": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.19.tgz", - "integrity": "sha512-eyy8pcr/YxSYjBoqIFSrlbn9i/xvxUFa8CjzAYo9cFjgGXqq1hyjihcpZvxRLalpaWmueWR81xn7vuKmAFijDQ==", + "version": "0.4.20", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.20.tgz", + "integrity": "sha512-XpbHQ2q5gUF8BGOX4dHe+71qoirYMhApEPZ7sfhF/dNnOF1UXnCMGZf79SFTBO7Bz5YEIT4TMieSlJBWhP9WBA==", "dev": true, "license": "MIT", "peerDependencies": { @@ -3759,6 +3804,13 @@ "url": "https://github.com/eta-dev/eta?sponsor=1" } }, + "node_modules/exsolve": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.5.tgz", + "integrity": "sha512-pz5dvkYYKQ1AHVrgOzBKWeP4u4FRb3a6DNK2ucr0OoNwYIU4QWsJ+NM36LLzORT+z845MzKHHhpXiUF5nvQoJg==", + "dev": true, + "license": "MIT" + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -3996,6 +4048,24 @@ "node": ">=6" } }, + "node_modules/giget": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/giget/-/giget-2.0.0.tgz", + "integrity": "sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "citty": "^0.1.6", + "consola": "^3.4.0", + "defu": "^6.1.4", + "node-fetch-native": "^1.6.6", + "nypm": "^0.6.0", + "pathe": "^2.0.3" + }, + "bin": { + "giget": "dist/cli.mjs" + } + }, "node_modules/glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -4142,9 +4212,9 @@ } }, "node_modules/i18next-browser-languagedetector": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.4.tgz", - "integrity": "sha512-f3frU3pIxD50/Tz20zx9TD9HobKYg47fmAETb117GKGPrhwcSSPJDoCposXlVycVebQ9GQohC3Efbpq7/nnJ5w==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.5.tgz", + "integrity": "sha512-OstebRKqKiQw8xEvQF5aRyUujsCatanj7Q9eo5iiH2gJpoXGZ7483ol3sVBwfqbobTQPNH1J+NAyJ1aCQoEC+w==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.2" @@ -4187,13 +4257,6 @@ "node": ">=0.8.19" } }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true, - "license": "MIT" - }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -4288,18 +4351,19 @@ "license": "MIT" }, "node_modules/jiti": { - "version": "1.21.7", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz", - "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz", + "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==", + "dev": true, "license": "MIT", "bin": { - "jiti": "bin/jiti.js" + "jiti": "lib/jiti-cli.mjs" } }, "node_modules/jotai": { - "version": "2.12.2", - "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.12.2.tgz", - "integrity": "sha512-oN8715y7MkjXlSrpyjlR887TOuc/NLZMs9gvgtfWH/JP47ChwO0lR2ijSwBvPMYyXRAPT+liIAhuBavluKGgtA==", + "version": "2.12.3", + "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.12.3.tgz", + "integrity": "sha512-DpoddSkmPGXMFtdfnoIHfueFeGP643nqYUWC6REjUcME+PG2UkAtYnLbffRDw3OURI9ZUTcRWkRGLsOvxuWMCg==", "license": "MIT", "peer": true, "engines": { @@ -4365,13 +4429,6 @@ "dev": true, "license": "MIT" }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "license": "MIT" - }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -4643,6 +4700,13 @@ "node": "4.x || >=6.0.0" } }, + "node_modules/node-fetch-native": { + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.6.tgz", + "integrity": "sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==", + "dev": true, + "license": "MIT" + }, "node_modules/node-readfiles": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/node-readfiles/-/node-readfiles-0.2.0.tgz", @@ -4679,6 +4743,26 @@ "node": ">=0.10.0" } }, + "node_modules/nypm": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.0.tgz", + "integrity": "sha512-mn8wBFV9G9+UFHIrq+pZ2r2zL4aPau/by3kJb3cM7+5tQHMt6HGQB8FDIeKFYp8o0D2pnH6nVsO88N4AmUxIWg==", + "dev": true, + "license": "MIT", + "dependencies": { + "citty": "^0.1.6", + "consola": "^3.4.0", + "pathe": "^2.0.3", + "pkg-types": "^2.0.0", + "tinyexec": "^0.3.2" + }, + "bin": { + "nypm": "dist/cli.mjs" + }, + "engines": { + "node": "^14.16.0 || >=16.10.0" + } + }, "node_modules/oas-kit-common": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/oas-kit-common/-/oas-kit-common-1.0.8.tgz", @@ -4802,6 +4886,13 @@ "node": ">= 6" } }, + "node_modules/ohash": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz", + "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==", + "dev": true, + "license": "MIT" + }, "node_modules/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", @@ -4871,25 +4962,6 @@ "node": ">=6" } }, - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -4937,6 +5009,20 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "license": "ISC" }, + "node_modules/pathe": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", + "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", + "dev": true, + "license": "MIT" + }, + "node_modules/perfect-debounce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", + "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==", + "dev": true, + "license": "MIT" + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -4973,6 +5059,18 @@ "node": ">= 6" } }, + "node_modules/pkg-types": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.1.0.tgz", + "integrity": "sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "confbox": "^0.2.1", + "exsolve": "^1.0.1", + "pathe": "^2.0.3" + } + }, "node_modules/postcss": { "version": "8.5.3", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", @@ -5131,6 +5229,7 @@ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==", "license": "MIT", + "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -5249,6 +5348,17 @@ ], "license": "MIT" }, + "node_modules/rc9": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/rc9/-/rc9-2.1.2.tgz", + "integrity": "sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==", + "dev": true, + "license": "MIT", + "dependencies": { + "defu": "^6.1.4", + "destr": "^2.0.3" + } + }, "node_modules/react": { "version": "19.1.0", "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz", @@ -5271,9 +5381,9 @@ } }, "node_modules/react-hook-form": { - "version": "7.55.0", - "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.55.0.tgz", - "integrity": "sha512-XRnjsH3GVMQz1moZTW53MxfoWN7aDpUg/GpVNc4A3eXRVNdGXfbzJ4vM4aLQ8g6XCUh1nIbx70aaNCl7kxnjog==", + "version": "7.56.0", + "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.56.0.tgz", + "integrity": "sha512-U2QQgx5z2Y8Z0qlXv3W19hWHJgfKdWMz0O/osuY+o+CYq568V2R/JhzC6OAXfR8k24rIN0Muan2Qliaq9eKs/g==", "license": "MIT", "engines": { "node": ">=18.0.0" @@ -5309,9 +5419,9 @@ } }, "node_modules/react-refresh": { - "version": "0.14.2", - "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz", - "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz", + "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==", "dev": true, "license": "MIT", "engines": { @@ -5366,12 +5476,11 @@ } }, "node_modules/react-router": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.4.1.tgz", - "integrity": "sha512-Vmizn9ZNzxfh3cumddqv3kLOKvc7AskUT0dC1prTabhiEi0U4A33LmkDOJ79tXaeSqCqMBXBU/ySX88W85+EUg==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.5.1.tgz", + "integrity": "sha512-/jjU3fcYNd2bwz9Q0xt5TwyiyoO8XjSEFXJY4O/lMAlkGTHWuHRAbR9Etik+lSDqMC7A7mz3UlXzgYT6Vl58sA==", "license": "MIT", "dependencies": { - "@types/cookie": "^0.6.0", "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0", "turbo-stream": "2.4.0" @@ -5390,12 +5499,12 @@ } }, "node_modules/react-router-dom": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.4.1.tgz", - "integrity": "sha512-L3/4tig0Lvs6m6THK0HRV4eHUdpx0dlJasgCxXKnavwhh4tKYgpuZk75HRYNoRKDyDWi9QgzGXsQ1oQSBlWpAA==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.5.1.tgz", + "integrity": "sha512-5DPSPc7ENrt2tlKPq0FtpG80ZbqA9aIKEyqX6hSNJDlol/tr6iqCK4crqdsusmOSSotq6zDsn0y3urX9TuTNmA==", "license": "MIT", "dependencies": { - "react-router": "7.4.1" + "react-router": "7.5.1" }, "engines": { "node": ">=20.0.0" @@ -5447,15 +5556,17 @@ } }, "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "dev": true, "license": "MIT", - "dependencies": { - "picomatch": "^2.2.1" - }, "engines": { - "node": ">=8.10.0" + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/reftools": { @@ -5525,9 +5636,9 @@ } }, "node_modules/rollup": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.39.0.tgz", - "integrity": "sha512-thI8kNc02yNvnmJp8dr3fNWJ9tCONDhp6TV35X6HkKGGs9E6q7YWCHbe5vKiTa7TAiNcFEmXKj3X/pG2b3ci0g==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.0.tgz", + "integrity": "sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==", "dev": true, "license": "MIT", "dependencies": { @@ -5541,26 +5652,26 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.39.0", - "@rollup/rollup-android-arm64": "4.39.0", - "@rollup/rollup-darwin-arm64": "4.39.0", - "@rollup/rollup-darwin-x64": "4.39.0", - "@rollup/rollup-freebsd-arm64": "4.39.0", - "@rollup/rollup-freebsd-x64": "4.39.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.39.0", - "@rollup/rollup-linux-arm-musleabihf": "4.39.0", - "@rollup/rollup-linux-arm64-gnu": "4.39.0", - "@rollup/rollup-linux-arm64-musl": "4.39.0", - "@rollup/rollup-linux-loongarch64-gnu": "4.39.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.39.0", - "@rollup/rollup-linux-riscv64-gnu": "4.39.0", - "@rollup/rollup-linux-riscv64-musl": "4.39.0", - "@rollup/rollup-linux-s390x-gnu": "4.39.0", - "@rollup/rollup-linux-x64-gnu": "4.39.0", - "@rollup/rollup-linux-x64-musl": "4.39.0", - "@rollup/rollup-win32-arm64-msvc": "4.39.0", - "@rollup/rollup-win32-ia32-msvc": "4.39.0", - "@rollup/rollup-win32-x64-msvc": "4.39.0", + "@rollup/rollup-android-arm-eabi": "4.40.0", + "@rollup/rollup-android-arm64": "4.40.0", + "@rollup/rollup-darwin-arm64": "4.40.0", + "@rollup/rollup-darwin-x64": "4.40.0", + "@rollup/rollup-freebsd-arm64": "4.40.0", + "@rollup/rollup-freebsd-x64": "4.40.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.40.0", + "@rollup/rollup-linux-arm-musleabihf": "4.40.0", + "@rollup/rollup-linux-arm64-gnu": "4.40.0", + "@rollup/rollup-linux-arm64-musl": "4.40.0", + "@rollup/rollup-linux-loongarch64-gnu": "4.40.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.40.0", + "@rollup/rollup-linux-riscv64-gnu": "4.40.0", + "@rollup/rollup-linux-riscv64-musl": "4.40.0", + "@rollup/rollup-linux-s390x-gnu": "4.40.0", + "@rollup/rollup-linux-x64-gnu": "4.40.0", + "@rollup/rollup-linux-x64-musl": "4.40.0", + "@rollup/rollup-win32-arm64-msvc": "4.40.0", + "@rollup/rollup-win32-ia32-msvc": "4.40.0", + "@rollup/rollup-win32-x64-msvc": "4.40.0", "fsevents": "~2.3.2" } }, @@ -5885,24 +5996,25 @@ "license": "ISC" }, "node_modules/swagger-typescript-api": { - "version": "13.0.28", - "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.0.28.tgz", - "integrity": "sha512-8IwPD6nCFDTtzSl8rS7xlAx0NGMpBUlFfccJwgMV7t8d/nKw1yQWPVdC7h94XDsDPrLFvICd5xAJJm2TK2Pcpw==", + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.1.1.tgz", + "integrity": "sha512-Slwbvz1cAno7TjujKfKIvGK5R72BlpQhnVUUtK/TcQjx/pMIiGVCaLaJWOux0mye7LEABABAhUwArFEAusuAcQ==", "dev": true, "license": "MIT", "dependencies": { + "@biomejs/js-api": "^0.7.1", + "@biomejs/wasm-nodejs": "^1.9.4", "@types/swagger-schema-official": "^2.0.25", + "c12": "^3.0.3", "citty": "^0.1.6", "consola": "^3.4.2", - "cosmiconfig": "^9.0.0", "eta": "^2.2.0", "js-yaml": "^4.1.0", "lodash": "^4.17.21", "nanoid": "^5.1.5", - "prettier": "~3.5.3", "swagger-schema-official": "2.0.0-bab6bed", "swagger2openapi": "^7.0.8", - "typescript": "~5.8.2" + "typescript": "~5.8.3" }, "bin": { "sta": "dist/cli.js", @@ -5932,9 +6044,9 @@ } }, "node_modules/swagger-typescript-api/node_modules/typescript": { - "version": "5.8.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", - "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", + "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -6052,6 +6164,63 @@ "tailwindcss": ">=3.0.0 || insiders" } }, + "node_modules/tailwindcss/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/tailwindcss/node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/tailwindcss/node_modules/jiti": { + "version": "1.21.7", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz", + "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", + "license": "MIT", + "bin": { + "jiti": "bin/jiti.js" + } + }, + "node_modules/tailwindcss/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, "node_modules/thenify": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", @@ -6073,6 +6242,58 @@ "node": ">=0.8" } }, + "node_modules/tinyexec": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", + "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/tinyglobby": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", + "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.4.4", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tinyglobby/node_modules/fdir": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/tinyglobby/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -6157,15 +6378,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.0.tgz", - "integrity": "sha512-ep9rVd9B4kQsZ7ZnWCVxUE/xDLUUUsRzE0poAeNu+4CkFErLfuvPt/qtm2EpnSyfvsR0S6QzDFSrPCFBwf64fg==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.31.0.tgz", + "integrity": "sha512-u+93F0sB0An8WEAPtwxVhFby573E8ckdjwUUQUj9QA4v8JAvgtoDdIyYR3XFwFHq2W1KJ1AurwJCO+w+Y1ixyQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.29.0", - "@typescript-eslint/parser": "8.29.0", - "@typescript-eslint/utils": "8.29.0" + "@typescript-eslint/eslint-plugin": "8.31.0", + "@typescript-eslint/parser": "8.31.0", + "@typescript-eslint/utils": "8.31.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6299,15 +6520,18 @@ } }, "node_modules/vite": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.4.tgz", - "integrity": "sha512-veHMSew8CcRzhL5o8ONjy8gkfmFJAd5Ac16oxBUjlwgX3Gq2Wqr+qNC3TjPIpy7TPV/KporLga5GT9HqdrCizw==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.2.tgz", + "integrity": "sha512-ZSvGOXKGceizRQIZSz7TGJ0pS3QLlVY/9hwxVh17W3re67je1RKYzFHivZ/t0tubU78Vkyb9WnHPENSBCzbckg==", "dev": true, "license": "MIT", "dependencies": { "esbuild": "^0.25.0", + "fdir": "^6.4.3", + "picomatch": "^4.0.2", "postcss": "^8.5.3", - "rollup": "^4.30.1" + "rollup": "^4.34.9", + "tinyglobby": "^0.2.12" }, "bin": { "vite": "bin/vite.js" @@ -6370,6 +6594,34 @@ } } }, + "node_modules/vite/node_modules/fdir": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/vite/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/void-elements": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", @@ -6627,9 +6879,9 @@ } }, "node_modules/zod": { - "version": "3.24.2", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz", - "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==", + "version": "3.24.3", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.3.tgz", + "integrity": "sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix index 759235b00d46..c2abd6506922 100644 --- a/pkgs/by-name/ne/nezha-theme-admin/package.nix +++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "nezha-theme-admin"; - version = "1.10.4"; + version = "1.12.0"; src = fetchFromGitHub { owner = "nezhahq"; repo = "admin-frontend"; tag = "v${version}"; - hash = "sha256-TT/WCeHYi/Q5zpB8DCdJdAv8sJsm4J7q596qOqbCH4E="; + hash = "sha256-M1iJmSskXk0Qhr+p9yradZE4Xnf88F28NBUfJw4Wr34="; }; # TODO: Switch to the bun build function once available in nixpkgs @@ -21,7 +21,7 @@ buildNpmPackage rec { cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-vkToSpCqsXrbjMxmnlyBGeiWTQaQC04XBnCRtn9lEQU="; + npmDepsHash = "sha256-y0MnD6ymU4YDpNkTrEKMROHwllSVRm1LQeG0v3IPa0Y="; npmPackFlags = [ "--ignore-scripts" ]; diff --git a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix index de3d0de67321..bdbeba1066d4 100644 --- a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix +++ b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nezha-theme-nazhua"; - version = "0.6.3"; + version = "0.6.6"; src = fetchFromGitHub { owner = "hi2shark"; repo = "nazhua"; tag = "v${finalAttrs.version}"; - hash = "sha256-0tbCNj6kglI3/y4e1pp0J3Tw7rrNhaqIRHoM7mFPCow="; + hash = "sha256-Flx0yHhYGDM9qPIsE1ZfjdmuWXbDTodnaiVK7Hee3Z4="; }; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 4dd38bfc91ca..48509c03fdef 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -14,7 +14,7 @@ let pname = "nezha"; - version = "1.10.4"; + version = "1.12.4"; frontendName = lib.removePrefix "nezha-theme-"; @@ -58,7 +58,7 @@ buildGo124Module { owner = "nezhahq"; repo = "nezha"; tag = "v${version}"; - hash = "sha256-9dw1MT3v7ZCpC/MrlZDJmZ9EdTNVIbE0b45ao3eXO7o="; + hash = "sha256-f9zP9koWjP8PPtQhbYx56J1mW8+xKuZCfxgOLw6XGc0="; }; proxyVendor = true; @@ -97,7 +97,7 @@ buildGo124Module { GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false ''; - vendorHash = "sha256-ftVcbO1QYIEYUwPqxAHE/7TNBwzgN5BNyu5+rTnOgIs="; + vendorHash = "sha256-Pj5HfrwIuWt3Uwt2Y9Tz96B2kL7Svq5rzU1hKf/RZ4s="; ldflags = [ "-s" @@ -111,7 +111,7 @@ buildGo124Module { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "-v" ]; + versionCheckProgramArg = "-v"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/nf/nfdump/package.nix b/pkgs/by-name/nf/nfdump/package.nix index c72bdb62a2e3..67dd1ffd8bbe 100644 --- a/pkgs/by-name/nf/nfdump/package.nix +++ b/pkgs/by-name/nf/nfdump/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nfdump"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "phaag"; repo = "nfdump"; tag = "v${version}"; - hash = "sha256-1S55WVVHczYBDGwTxGZr+ND+e4a892jkTINlvIR2xgI="; + hash = "sha256-4iyoQAjOQW4KNJbRmdisdecuOz+DFvQGEKgq8cq7GDI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index 2da3eb5e7b6a..89cc40e3e21c 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.42.0"; + version = "2.42.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-63vhxsoGK8YNs0wobFyViOHO9K3hSHgWJU/wbvUxJFw="; + hash = "sha256-uHtrxBlSlVBmpVqE645nRNQ3mL07Uj9YrmG/jAfuyyg="; }; - vendorHash = "sha256-VA6/n89OIX+Au1JmCwWezh80xEtydUgBWYSlwpyXZtA="; + vendorHash = "sha256-pxOxiYYvzIAmXo4rRLpngG4ILUhc1f1DJqwNxXlCXtM="; ldflags = [ "-s" diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix index 86a223f5cbef..057aa9e93aff 100644 --- a/pkgs/by-name/ng/nghttp2/package.nix +++ b/pkgs/by-name/ng/nghttp2/package.nix @@ -46,11 +46,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.64.0"; + version = "1.65.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-OmcN83joUrhaIpXyXk9RzCj1bg/MSWQIuMN2QpBTevU="; + sha256 = "sha256-C9u3jcIYcEhP1URJBnZXtg47G3Im4RdM9WQBbG0zB/U="; }; outputs = [ diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix new file mode 100644 index 000000000000..0b7e8b830d5f --- /dev/null +++ b/pkgs/by-name/ng/nghttp3/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curlHTTP3, +}: + +stdenv.mkDerivation rec { + pname = "nghttp3"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "ngtcp2"; + repo = pname; + rev = "v${version}"; + hash = "sha256-CTra8vmpIig8LX7RWqRzhWhX9yn0RnFrnV/kYPgZgJk="; + fetchSubmodules = true; + }; + + outputs = [ + "out" + "dev" + "doc" + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_STATIC_LIB" false) + ]; + + doCheck = true; + + passthru.tests = { + inherit curlHTTP3; + }; + + meta = with lib; { + homepage = "https://github.com/ngtcp2/nghttp3"; + description = "nghttp3 is an implementation of HTTP/3 mapping over QUIC and QPACK in C"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/by-name/ng/nginx-language-server/package.nix b/pkgs/by-name/ng/nginx-language-server/package.nix index d9e19b79f7b6..cb7aee0da561 100644 --- a/pkgs/by-name/ng/nginx-language-server/package.nix +++ b/pkgs/by-name/ng/nginx-language-server/package.nix @@ -1,22 +1,24 @@ { lib, - python3, + python3Packages, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "nginx-language-server"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "pappasam"; repo = "nginx-language-server"; tag = "v${version}"; - hash = "sha256-AXWrNt4f3jkAbidE1goDgFicu4sSBv08f/Igyh2bRII="; + hash = "sha256-v9+Y8NBvN8HvTdNrK9D9YQuqDB3olIu5LfYapjlVlAM="; }; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ poetry-core ]; @@ -24,21 +26,31 @@ python3.pkgs.buildPythonApplication rec { "pydantic" ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ crossplane lsprotocol pydantic pygls + typing-extensions ]; pythonImportsCheck = [ "nginx_language_server" ]; - meta = with lib; { + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Language server for nginx.conf"; homepage = "https://github.com/pappasam/nginx-language-server"; changelog = "https://github.com/pappasam/nginx-language-server/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "nginx-language-server"; }; } diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index aeef324f1a0b..83a6d04ed5f9 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -4,28 +4,27 @@ rustPlatform, installShellFiles, makeBinaryWrapper, - darwin, fetchFromGitHub, nix-update-script, nvd, nix-output-monitor, + buildPackages, }: let - version = "3.6.0"; runtimeDeps = [ nvd nix-output-monitor ]; in -rustPlatform.buildRustPackage { - inherit version; +rustPlatform.buildRustPackage (finalAttrs: { pname = "nh"; + version = "4.0.3"; src = fetchFromGitHub { - owner = "viperML"; + owner = "nix-community"; repo = "nh"; - tag = "v${version}"; - hash = "sha256-k8rz5RF1qi7RXzQYWGbw5pJRNRFIdX85SIYN+IHiVL4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-BCD0tfDNlQHFM75THRtXM3GegMg/KbREsYllg7Az9ao="; }; strictDeps = true; @@ -35,18 +34,19 @@ rustPlatform.buildRustPackage { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + preFixup = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + mkdir completions + ${emulator} $out/bin/nh completions bash > completions/nh.bash + ${emulator} $out/bin/nh completions zsh > completions/nh.zsh + ${emulator} $out/bin/nh completions fish > completions/nh.fish - preFixup = '' - mkdir completions - $out/bin/nh completions --shell bash > completions/nh.bash - $out/bin/nh completions --shell zsh > completions/nh.zsh - $out/bin/nh completions --shell fish > completions/nh.fish - - installShellCompletion completions/* - ''; + installShellCompletion completions/* + '' + ); postFixup = '' wrapProgram $out/bin/nh \ @@ -54,18 +54,20 @@ rustPlatform.buildRustPackage { ''; useFetchCargoVendor = true; - cargoHash = "sha256-Csh8M5BquAD2vUYIu0nNWSvznTZxno1WxvkEhBVN+9c="; + cargoHash = "sha256-cNYPxM2DOLdyq0YcZ0S/WIa3gAx7aTzPp7Zhbtu4PKg="; passthru.updateScript = nix-update-script { }; meta = { + changelog = "https://github.com/nix-community/nh/blob/${finalAttrs.version}/CHANGELOG.md"; description = "Yet another nix cli helper"; - homepage = "https://github.com/viperML/nh"; + homepage = "https://github.com/nix-community/nh"; license = lib.licenses.eupl12; mainProgram = "nh"; maintainers = with lib.maintainers; [ drupol + NotAShelf viperML ]; }; -} +}) diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix index 005c5937388b..bd1fe4e56900 100644 --- a/pkgs/by-name/nh/nheko/package.nix +++ b/pkgs/by-name/nh/nheko/package.nix @@ -80,7 +80,12 @@ stdenv.mkDerivation rec { preFixup = '' # add gstreamer plugins path to the wrapper - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + # unset QT_STYLE_OVERRIDE to avoid showing a blank window when started + # https://github.com/NixOS/nixpkgs/issues/333009 + qtWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --unset QT_STYLE_OVERRIDE + ) ''; meta = with lib; { diff --git a/pkgs/by-name/nh/nhost-cli/package.nix b/pkgs/by-name/nh/nhost-cli/package.nix index d6f2a91f72f1..40711fdb9b68 100644 --- a/pkgs/by-name/nh/nhost-cli/package.nix +++ b/pkgs/by-name/nh/nhost-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nhost-cli"; - version = "1.29.5"; + version = "1.29.7"; src = fetchFromGitHub { owner = "nhost"; repo = "cli"; tag = "v${version}"; - hash = "sha256-x6/hPW8sD/wwgjlA6+Cz3t3c7KICD/bhzz5yfks/In8="; + hash = "sha256-CQWPDhHPKo2MYWQnVG07JBMzQLwWwDOWAcOc/3Ovr1M="; }; vendorHash = null; diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index 7c1e15edaf61..fdbf18dfffad 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 53ea84f976d5..5435356e206e 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -4,26 +4,27 @@ rustPlatform, fetchFromGitHub, python3, + gitMinimal, versionCheckHook, pkg-config, - nix, + nixVersions, nix-update-script, enableNixImport ? true, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "nickel"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; tag = finalAttrs.version; - hash = "sha256-CnEGC4SnLRfAPl3WTv83xertH2ulG5onseZpq3vxfwc="; + hash = "sha256-I7cLVrkJhB3aJeE/A3tpFEUj0AkvcONSXD8NtnE5eQ0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-CyO+W4332fJmeF2CL+9CCdPuion8MrxzkPotLA7my3U="; + cargoHash = "sha256-DzSfwBVeRT/GAXWyZKZjlDvj95bQzrkqIgZZ2EZw7eQ="; cargoBuildFlags = [ "-p nickel-lang-cli" @@ -33,13 +34,14 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ python3 + gitMinimal ] ++ lib.optionals enableNixImport [ pkg-config ]; buildInputs = lib.optionals enableNixImport [ - nix + nixVersions.nix_2_24 boost ]; @@ -61,11 +63,11 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "dep:comrak" "comrak" ''; - checkFlags = [ - # https://github.com/tweag/nickel/blob/1.10.0/git/tests/main.rs#L60 - # fails because src is not a git repo - # `cmd.current_dir(repo.path()).output()` errors with `NotFound` - "--skip=fetch_targets" + cargoTestFlags = [ + # Skip the py-nickel tests because linking them fails on aarch64, and we + # aren't packaging py-nickel anyway + "--workspace" + "--exclude=py-nickel" ]; postInstall = '' @@ -76,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; @@ -99,10 +101,5 @@ rustPlatform.buildRustPackage (finalAttrs: { matthiasbeyer ]; mainProgram = "nickel"; - badPlatforms = [ - # collect2: error: ld returned 1 exit status - # undefined reference to `PyExc_TypeError' - "aarch64-linux" - ]; }; }) diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix index fd2a32f20c5e..a5b76c8b1ec9 100644 --- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix +++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix @@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-11-06"; + version = "0-unstable-2025-04-24"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Nightfox-GTK-Theme"; - rev = "d9534b5275eb4bc588890c7bd8b30cf2b535c8e0"; - hash = "sha256-VVro8kkQisLkTyQVIBDSf55Qfnwb85glWOYWVfJbueI="; + rev = "a301759d3650847d14a4c8f4d639f97015eb5b0d"; + hash = "sha256-dPplS1NKtby/+9L0FtNEKIjLuhlR9KqS+TxwW12sPwc="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/by-name/ni/nightlight/package.nix b/pkgs/by-name/ni/nightlight/package.nix new file mode 100644 index 000000000000..187d99965d2e --- /dev/null +++ b/pkgs/by-name/ni/nightlight/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + makeWrapper, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "nightlight"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "smudge"; + repo = "nightlight"; + tag = "v${version}"; + hash = "sha256-NOphjrqsnO5693Zw3NkX3c74I3PdJ8W6sxYwOEJ1yCU="; + }; + + useFetchCargoVendor = true; + + cargoHash = "sha256-v5Oo1AxwvJs66l9CtVjO+WfwgsM16zSLT1SSnDi1kSo="; + + checkFlags = [ + "--skip=repl" + "--skip=printer::tests" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/smudge/nightlight"; + description = "CLI tool for configuring Night Shift macOS"; + maintainers = with lib.maintainers; [ aspauldingcode ]; + platforms = lib.platforms.darwin; + license = lib.licenses.mit; + mainProgram = "nightlight"; + }; +} diff --git a/pkgs/by-name/ni/nile/package.nix b/pkgs/by-name/ni/nile/package.nix new file mode 100644 index 000000000000..9362ace93a0d --- /dev/null +++ b/pkgs/by-name/ni/nile/package.nix @@ -0,0 +1,57 @@ +{ + lib, + gitUpdater, + python3Packages, + fetchFromGitHub, +}: + +let + version = "1.1.2"; +in +python3Packages.buildPythonApplication { + pname = "nile"; + inherit version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "imLinguin"; + repo = "nile"; + rev = "v${version}"; + hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI="; + }; + + disabled = python3Packages.pythonOlder "3.8"; + + propagatedBuildInputs = with python3Packages; [ + setuptools + requests + protobuf + pycryptodome + zstandard + json5 + platformdirs + ]; + + pyprojectAppendix = '' + [tool.setuptools.packages.find] + include = ["nile*"] + ''; + + postPatch = '' + echo "$pyprojectAppendix" >> pyproject.toml + ''; + + pythonImportsCheck = [ "nile" ]; + + meta = with lib; { + description = "Unofficial Amazon Games client"; + mainProgram = "nile"; + homepage = "https://github.com/imLinguin/nile"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ aidalgol ]; + }; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; +} diff --git a/pkgs/by-name/ni/nim-2_2/package.nix b/pkgs/by-name/ni/nim-2_2/package.nix index f97506eb624a..61f58db18dae 100644 --- a/pkgs/by-name/ni/nim-2_2/package.nix +++ b/pkgs/by-name/ni/nim-2_2/package.nix @@ -9,7 +9,6 @@ openssl, pcre, nim-unwrapped-2_2 ? buildPackages.nim-unwrapped-2_2, - Security ? darwin.Security, }: let @@ -28,7 +27,6 @@ let # Needed for any nim package that uses the standard library's # 'std/sysrand' module. - depsTargetTargetPropagated = lib.optional stdenv.hostPlatform.isDarwin Security; inherit patches; diff --git a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix index ab8d1dc8120a..168dacbff336 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix @@ -7,10 +7,10 @@ nim-unwrapped-2_2.overrideAttrs ( finalAttrs: previousAttrs: { - version = "2.0.12"; + version = "2.0.16"; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-xIh5ScXrjX+an1bwrrK/IUD6vwruDwWAoxnioJgVczo="; + hash = "sha256-sucMbAEbVQcJMJCoiH+iUncyCP0EfuOPhWLiVp5cN4o="; }; patches = lib.lists.unique ( builtins.filter ( diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix index 0ecdbe92b511..f2a00ece01c0 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix @@ -10,7 +10,6 @@ readline, sqlite, darwin, - Security ? darwin.Security, }: let @@ -85,12 +84,12 @@ in stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; - version = "2.2.2"; + version = "2.2.4"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-f8ybh6ycC6Wkif3Cbi2EgM6Wo8piIQDWJn75ITX9ih8="; + hash = "sha256-+CtBl1D8zlYfP4l6BIaxgBhoRddvtdmfJIzhZhCBicc="; }; buildInputs = [ @@ -99,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { pcre readline sqlite - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; patches = [ ./NIM_CONFIG_DIR.patch diff --git a/pkgs/by-name/ni/nimble/package.nix b/pkgs/by-name/ni/nimble/package.nix index c5ea0e9dc59b..42c0ccf50833 100644 --- a/pkgs/by-name/ni/nimble/package.nix +++ b/pkgs/by-name/ni/nimble/package.nix @@ -5,18 +5,20 @@ nim, openssl, makeWrapper, + + nix-update-script, }: buildNimPackage ( final: prev: { pname = "nimble"; - version = "0.16.4"; + version = "0.18.2"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nimble"; rev = "v${final.version}"; - hash = "sha256-ASodRov4rO/IhjQRRdqVnLWMG1voXWM9F6R6VJd9qkM="; + hash = "sha256-wgzFhModFkwB8st8F5vSkua7dITGGC2cjoDvgkRVZMs="; fetchSubmodules = true; }; @@ -32,11 +34,15 @@ buildNimPackage ( --suffix PATH : ${lib.makeBinPath [ nim ]} ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Package manager for the Nim programming language"; homepage = "https://github.com/nim-lang/nimble"; + changelog = "https://github.com/nim-lang/nimble/releases/tag/v${final.version}"; license = lib.licenses.bsd3; mainProgram = "nimble"; + maintainers = [ lib.maintainers.daylinmorgan ]; }; } ) diff --git a/pkgs/applications/misc/nimbo/default.nix b/pkgs/by-name/ni/nimbo/package.nix similarity index 100% rename from pkgs/applications/misc/nimbo/default.nix rename to pkgs/by-name/ni/nimbo/package.nix diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix index 0f49bc7494ba..c7fc8872c5c7 100644 --- a/pkgs/by-name/ni/nimlangserver/package.nix +++ b/pkgs/by-name/ni/nimlangserver/package.nix @@ -6,7 +6,7 @@ buildNimPackage ( final: prev: rec { pname = "nimlangserver"; - version = "1.10.2"; + version = "1.12.0"; # nix build ".#nimlangserver.src" # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --git,=,bearssl,zlib @@ -16,7 +16,7 @@ buildNimPackage ( owner = "nim-lang"; repo = "langserver"; rev = "v${version}"; - hash = "sha256-CbdlDcEkX/pPXEbIsSM6S9INeBCwgjx7NxonjUJAHrk="; + hash = "sha256-yf3oiKwsJoQxRPhbEBMJN+TR7j58t6ggjq51DJ3ypGQ="; }; doCheck = false; diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix index d776c546f1e4..fe89a9c1e670 100644 --- a/pkgs/by-name/ni/ninja/package.nix +++ b/pkgs/by-name/ni/ninja/package.nix @@ -17,26 +17,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "ninja"; - version = lib.removePrefix "v" finalAttrs.src.rev; - - src = + version = { - # TODO: Remove Ninja 1.11 as soon as possible. - "1.11" = fetchFromGitHub { - owner = "ninja-build"; - repo = "ninja"; - rev = "v1.11.1"; - hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; - }; - - latest = fetchFromGitHub { - owner = "ninja-build"; - repo = "ninja"; - rev = "v1.12.1"; - hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA="; - }; + "1.11" = "1.11.1"; + latest = "1.12.1"; } - .${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}"); + .${ninjaRelease}; + + src = fetchFromGitHub { + owner = "ninja-build"; + repo = "ninja"; + rev = "v${finalAttrs.version}"; + hash = + { + # TODO: Remove Ninja 1.11 as soon as possible. + "1.11" = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; + latest = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA="; + } + .${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}"); + }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 1d8215cf324e..f866e1fa2af6 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -25,13 +25,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "niri"; - version = "25.02"; + version = "25.05"; src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; tag = "v${finalAttrs.version}"; - hash = "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8="; + hash = "sha256-ngQ+iTHmBJkEbsjYfCWTJdV8gHhOCTkV8K0at6Y+YHI="; }; postPatch = '' @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-xUjBQ65INi5qD7s5SpPw9TISgY6I3bjjUBmpubvM43I="; + cargoHash = "sha256-tZp7AhhddEhKWzEUTgosxXMEzALbv6FxqnJEb9MBhzc="; strictDeps = true; diff --git a/pkgs/by-name/ni/nitrokey-start-firmware/package.nix b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix index 8bad7ed5fbc2..4169ccf702c0 100644 --- a/pkgs/by-name/ni/nitrokey-start-firmware/package.nix +++ b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - gcc-arm-embedded, + gcc-arm-embedded-13, }: stdenv.mkDerivation (finalAttrs: { @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-certdo" ]; - nativeBuildInputs = [ gcc-arm-embedded ]; + nativeBuildInputs = [ gcc-arm-embedded-13 ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix index 91a559503682..c804aaa3bd6f 100644 --- a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix +++ b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix @@ -1,20 +1,31 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, + python3, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "nitrokey-udev-rules"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nitrokey-udev-rules"; rev = "v${finalAttrs.version}"; - hash = "sha256-uq1+YQg+oe5UFphpy1AdxEYaPFyRle6ffYOPoU6Li28="; + hash = "sha256-LKpd6O9suAc2+FFgpuyTClEgL/JiZiokH3DV8P3C7Aw="; }; + nativeBuildInputs = [ python3 ]; + + buildPhase = '' + runHook preBuild + + make generate + + runHook postBuild + ''; + installPhase = '' install -D 41-nitrokey.rules -t $out/etc/udev/rules.d ''; diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix index 6865383baa78..b5ca7d99096e 100644 --- a/pkgs/by-name/ni/nitter/package.nix +++ b/pkgs/by-name/ni/nitter/package.nix @@ -10,13 +10,13 @@ buildNimPackage ( finalAttrs: prevAttrs: { pname = "nitter"; - version = "0-unstable-2025-02-25"; + version = "0-unstable-2025-05-01"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "41fa47bfbf3917e9b3ac4f7b49c89a75a7a2bd44"; - hash = "sha256-cmYlmzCJl1405TuYExGw3AOmjdY0r7ObmmLCAom+Fyw="; + rev = "e40c61a6ae76431c570951cc4925f38523b00a82"; + hash = "sha256-YOwoN3sC5g9oV1gbIu2TQE4SCAoNDONvEQy9xvzKD/c="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in b/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in index 13b62a8829da..e5848dcb28ad 100644 --- a/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in +++ b/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in @@ -1,7 +1,7 @@ #! @shell@ parse_opts () { - while @coreutils@/test -n "$1" && @coreutils@/test "x$1" != x-- ; do + while @coreutils@/test -n "$1" && @coreutils@/test "x$1" != x-- ; do case "$1" in --store-dir) shift; @@ -76,7 +76,7 @@ workingdir="$(@coreutils@/mktemp -d)" cd "$workingdir" PORT=8080 -(echo "STORE_DIR=${NIX_STORE_DIR:-/nix/store}"; parse_opts "$@" +(echo "STORE_DIR=${NIX_STORE_DIR:-/nix/store}"; parse_opts "$@" ) > nix-binary-cache.conf || exit . "$workingdir/nix-binary-cache.conf" @@ -94,8 +94,8 @@ server.use-ipv6 = \"enable\" } " >> lighttpd.conf -cp @out@/nix-binary-cache.cgi . -cp @out@/nix-binary-cache.cgi ./nix-bc.cgi +cp @out@/nix-binary-cache.cgi . +cp @out@/nix-binary-cache.cgi ./nix-bc.cgi ip="$(@iproute@/ip a | @gnugrep@/grep 'inet .* scope global' | @coreutils@/head -n 1)" ip="${ip%%/*}" diff --git a/pkgs/by-name/ni/nix-btm/package.nix b/pkgs/by-name/ni/nix-btm/package.nix index 742da2fb0a68..c14740055ad0 100644 --- a/pkgs/by-name/ni/nix-btm/package.nix +++ b/pkgs/by-name/ni/nix-btm/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchCrate, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,14 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-zMQw3Q9t6JSMDt7xHMGTgAu9LW6MhG+Rrjpp5IEs/qQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); - meta = with lib; { description = "Rust tool to monitor Nix processes"; homepage = "https://github.com/DieracDelta/nix-btm"; diff --git a/pkgs/by-name/ni/nix-converter/package.nix b/pkgs/by-name/ni/nix-converter/package.nix new file mode 100644 index 000000000000..73345f86b63c --- /dev/null +++ b/pkgs/by-name/ni/nix-converter/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule { + pname = "nix-converter"; + version = "0-unstable-2025-04-14"; + + src = fetchFromGitHub { + owner = "theobori"; + repo = "nix-converter"; + rev = "d06af43bf578f2650417600250e68782478ce98d"; + hash = "sha256-/HEKbE1tLCGGu4xopky/02OWRt23UUTPKQCdi7ThCX8="; + }; + + vendorHash = "sha256-Ay1f9sk8RuJyOS7hl/lrscpxdlIgm9dMow/xTFoR+H4="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "All-in-one converter configuration language to Nix and vice versa"; + homepage = "https://github.com/theobori/nix-converter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + theobori + jaredmontoya + ]; + mainProgram = "nix-converter"; + }; +} diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix index ff56c097c29a..0298c0fd3ec3 100644 --- a/pkgs/by-name/ni/nix-direnv/package.nix +++ b/pkgs/by-name/ni/nix-direnv/package.nix @@ -11,13 +11,13 @@ # https://github.com/abathur/resholve/issues/107 resholve.mkDerivation rec { pname = "nix-direnv"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - hash = "sha256-oNqhPqgQT92yxbKmcgX4F3e2yTUPyXYG7b2xQm3TvQw="; + hash = "sha256-H59MMmyQ9Tl9CLKKkXIv2NZddrrJNLv8XOOI2e4pG64="; }; installPhase = '' diff --git a/pkgs/by-name/ni/nix-du/package.nix b/pkgs/by-name/ni/nix-du/package.nix new file mode 100644 index 000000000000..cb9ea6f585bf --- /dev/null +++ b/pkgs/by-name/ni/nix-du/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nixVersions, + nlohmann_json, + boost, + graphviz, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "nix-du"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "symphorien"; + repo = "nix-du"; + tag = "v${version}"; + hash = "sha256-/Afp0InA/0xXdombAzylYJF9wcv5WwYizVsP+fHTDrM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Q/woxGh1I6FpgJ5D0x7KovSwuRXfZzqjzwljaoKj0/Y="; + + doCheck = true; + nativeCheckInputs = [ + nixVersions.nix_2_24 + graphviz + ]; + + buildInputs = [ + boost + nixVersions.nix_2_24 + nlohmann_json + ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + meta = with lib; { + description = "Tool to determine which gc-roots take space in your nix store"; + homepage = "https://github.com/symphorien/nix-du"; + license = licenses.lgpl3Only; + maintainers = [ maintainers.symphorien ]; + platforms = platforms.unix; + mainProgram = "nix-du"; + changelog = "https://github.com/symphorien/nix-du/blob/v${version}/CHANGELOG.md"; + }; +} diff --git a/pkgs/by-name/ni/nix-forecast/package.nix b/pkgs/by-name/ni/nix-forecast/package.nix index 14801c299675..2535821ebb0d 100644 --- a/pkgs/by-name/ni/nix-forecast/package.nix +++ b/pkgs/by-name/ni/nix-forecast/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "nix-forecast"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "getchoo"; repo = "nix-forecast"; tag = "v${version}"; - hash = "sha256-di9RV4xSCqIa+UCdALAEdR0cDq3u799L3YyFyAF+bRg="; + hash = "sha256-GTINiV+oHmu1/DmQsE7UjfAFFtH26LK35TveW437lPA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-n5LKfHBmua8iridnHY0C6ayjREwnqQpDI75+Ips4aNc="; + cargoHash = "sha256-FQph9QOc0JrVjdilUxjRc77/obICK7fgzcDuqAoE2cs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ni/nix-health/package.nix b/pkgs/by-name/ni/nix-health/package.nix index ab6cf7acfec3..5ca8e3ca2b9d 100644 --- a/pkgs/by-name/ni/nix-health/package.nix +++ b/pkgs/by-name/ni/nix-health/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, rustPlatform, fetchCrate, libiconv, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,20 +21,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-3DE/NwPdi//7xaoV2SVgF5l3ndrEYraoyg5NLJzvzBI="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libiconv - openssl - ] - # Use a newer SDK for CoreFoundation, because the sysinfo crate requires - # it, https://github.com/GuillaumeGomez/sysinfo/issues/915 - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - IOKit - CoreFoundation - ] - ); + buildInputs = [ + libiconv + openssl + ]; meta = with lib; { description = "Check the health of your Nix setup"; diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix index 0c0c8e76222a..88cad6addb7a 100644 --- a/pkgs/by-name/ni/nix-heuristic-gc/package.nix +++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix @@ -3,7 +3,7 @@ { lib, fetchFromGitHub, - nix, + nixVersions, boost, python3Packages, }: @@ -19,12 +19,12 @@ python3Packages.buildPythonPackage rec { # NIX_SYSTEM suggested at # https://github.com/NixOS/nixpkgs/issues/386184#issuecomment-2692433531 - NIX_SYSTEM = nix.stdenv.hostPlatform.system; - NIX_CFLAGS_COMPILE = [ "-I${lib.getDev nix}/include/nix" ]; + NIX_SYSTEM = nixVersions.nix_2_24.stdenv.hostPlatform.system; + NIX_CFLAGS_COMPILE = [ "-I${lib.getDev nixVersions.nix_2_24}/include/nix" ]; buildInputs = [ boost - nix + nixVersions.nix_2_24 python3Packages.pybind11 python3Packages.setuptools ]; diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix index b7b517f1976b..c53db6681ff0 100644 --- a/pkgs/by-name/ni/nix-ld/package.nix +++ b/pkgs/by-name/ni/nix-ld/package.nix @@ -8,19 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "nix-ld"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { - owner = "mic92"; + owner = "nix-community"; repo = "nix-ld"; rev = version; - hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw="; + hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk="; }; - patches = [ ./rust-1.83.patch ]; - useFetchCargoVendor = true; - cargoHash = "sha256-2CFdUZbKFl7cf6dik6XextuGG2vLM9oNS8rIyzLnfM4="; + cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc="; hardeningDisable = [ "stackprotector" ]; @@ -47,11 +45,11 @@ rustPlatform.buildRustPackage rec { passthru.tests = nixosTests.nix-ld; - meta = with lib; { + meta = { description = "Run unpatched dynamic binaries on NixOS"; - homepage = "https://github.com/Mic92/nix-ld"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; - platforms = platforms.linux; + homepage = "https://github.com/nix-community/nix-ld"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mic92 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ni/nix-ld/rust-1.83.patch b/pkgs/by-name/ni/nix-ld/rust-1.83.patch deleted file mode 100644 index 8ff1fb7d9ce7..000000000000 --- a/pkgs/by-name/ni/nix-ld/rust-1.83.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/src/arch.rs -+++ b/src/arch.rs -@@ -142,7 +142,7 @@ cfg_match! { - - #[naked] - unsafe extern "C" fn entry_trampoline() -> ! { -- core::arch::asm!( -+ core::arch::naked_asm!( - "lea r10, [rip + {context}]", - "mov r11, [r10 + {size} * 1]", // .env_entry - "test r11, r11", -@@ -153,7 +153,6 @@ cfg_match! { - "jmp [rip + {context}]", - context = sym TRAMPOLINE_CONTEXT, - size = const core::mem::size_of::<*const u8>(), -- options(noreturn), - ) - } - } -@@ -162,7 +161,7 @@ cfg_match! { - - #[naked] - unsafe extern "C" fn entry_trampoline() -> ! { -- core::arch::asm!( -+ core::arch::naked_asm!( - "adrp x8, {context}", - "ldr x9, [x8, {env_entry_off}]", // .env_entry - "cbz x9, 2f", -@@ -174,7 +173,6 @@ cfg_match! { - context = sym TRAMPOLINE_CONTEXT, - env_entry_off = const TrampolineContext::ENV_ENTRY_OFFSET, - env_string_off = const TrampolineContext::ENV_STRING_OFFSET, -- options(noreturn), - ) - } - } diff --git a/pkgs/by-name/ni/nix-output-monitor/generated-package.nix b/pkgs/by-name/ni/nix-output-monitor/generated-package.nix index aae28fd797ad..e97ec3c342b0 100644 --- a/pkgs/by-name/ni/nix-output-monitor/generated-package.nix +++ b/pkgs/by-name/ni/nix-output-monitor/generated-package.nix @@ -9,21 +9,21 @@ bytestring, cassava, containers, - data-default, directory, extra, fetchzip, + filelock, filepath, hermes-json, HUnit, lib, - lock-file, MemoTrie, nix-derivation, optics, random, relude, safe, + safe-exceptions, stm, streamly-core, strict, @@ -38,10 +38,10 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "2.1.5"; + version = "2.1.6"; src = fetchzip { - url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.5.tar.gz"; - sha256 = "01rsd2x74ainpadmyldxmjypkcc80f3caiysz9dz6vm8q2arcfbd"; + url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.6.tar.gz"; + sha256 = "0v291s6lx9rxlw38a3329gc37nyl2x24blyrf9rv8lzxc1q4bz31"; }; isLibrary = true; isExecutable = true; @@ -53,17 +53,17 @@ mkDerivation { bytestring cassava containers - data-default directory extra + filelock filepath hermes-json - lock-file MemoTrie nix-derivation optics relude safe + safe-exceptions stm streamly-core strict @@ -82,17 +82,17 @@ mkDerivation { bytestring cassava containers - data-default directory extra + filelock filepath hermes-json - lock-file MemoTrie nix-derivation optics relude safe + safe-exceptions stm streamly-core strict @@ -113,19 +113,19 @@ mkDerivation { bytestring cassava containers - data-default directory extra + filelock filepath hermes-json HUnit - lock-file MemoTrie nix-derivation optics random relude safe + safe-exceptions stm streamly-core strict diff --git a/pkgs/by-name/ni/nix-output-monitor/package.nix b/pkgs/by-name/ni/nix-output-monitor/package.nix index 03b0e0b78a0c..c50be7ede2a1 100644 --- a/pkgs/by-name/ni/nix-output-monitor/package.nix +++ b/pkgs/by-name/ni/nix-output-monitor/package.nix @@ -12,7 +12,7 @@ let # nom has unit-tests and golden-tests # golden-tests call nix and thus can’t be run in a nix build. - testTarget = "unit-tests"; + testTargets = [ "unit-tests" ]; buildTools = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/by-name/ni/nix-output-monitor/update.sh b/pkgs/by-name/ni/nix-output-monitor/update.sh index a83043df66ee..71f4e2634fd7 100755 --- a/pkgs/by-name/ni/nix-output-monitor/update.sh +++ b/pkgs/by-name/ni/nix-output-monitor/update.sh @@ -27,4 +27,6 @@ cabal2nix \ "https://code.maralorn.de/maralorn/nix-output-monitor/archive/${new_version}.tar.gz" \ >> "$derivation_file" +nixfmt "$derivation_file" + echo "Finished." diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix deleted file mode 100644 index bd83cecddbd1..000000000000 --- a/pkgs/by-name/ni/nix-plugin-pijul/package.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - meson, - ninja, - pkg-config, - boost, - howard-hinnant-date, - - # for tests - runCommand, - pijul, - nixVersions, - nixOverride ? null, - nix-plugin-pijul, -}: -let - nix = if nixOverride != null then nixOverride else nixVersions.nix_2_24; -in -stdenv.mkDerivation (finalAttrs: { - pname = "nix-plugin-pijul"; - version = "0.1.6"; - - src = fetchzip { - url = "https://dblsaiko.net/pub/nix-plugin-pijul/nix-plugin-pijul-${finalAttrs.version}.tar.gz"; - hash = "sha256-BOuBaFvejv1gffhBlAJADLtd5Df71oQbuCnniU07nF4="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - boost - howard-hinnant-date - nix - ]; - - passthru.tests = - let - localRepoCheck = - nixOverride: - runCommand "localRepoCheck-${nixOverride.name}" - { - nativeBuildInputs = [ - pijul - nix - ]; - } - '' - export HOME=$(mktemp -d) - export EDITOR=true - pijul identity new --no-link --no-prompt --display-name 'Test User' --email 'test@example.com' - - pijul init repo - cd repo - - echo "it works" > foo - pijul add foo - pijul record --message 'Add foo' - - output=$( - nix \ - --option plugin-files ${ - nix-plugin-pijul.override { inherit nixOverride; } - }/lib/nix/plugins/pijul.so \ - --extra-experimental-features 'nix-command flakes' \ - eval --impure --raw --expr "builtins.readFile ((builtins.fetchTree \"pijul+file://$PWD\") + \"/foo\")" - ) - - echo $output - - [[ "$output" = "it works" ]] - - mkdir $out - ''; - in - { - stable = localRepoCheck nixVersions.stable; - latest = localRepoCheck nixVersions.latest; - nix_2_24 = localRepoCheck nixVersions.nix_2_24; - }; - - meta = { - description = "Plugin to add Pijul support to the Nix package manager"; - homepage = "https://nest.pijul.com/dblsaiko/nix-plugin-pijul"; - license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.dblsaiko ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix index bb0c86e7cba6..918734291ffd 100644 --- a/pkgs/by-name/ni/nix-plugins/package.nix +++ b/pkgs/by-name/ni/nix-plugins/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - nix, + nixVersions, cmake, pkg-config, boost, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - nix + nixVersions.nix_2_24 boost ]; diff --git a/pkgs/by-name/ni/nix-prefetch/package.nix b/pkgs/by-name/ni/nix-prefetch/package.nix index 423b2df932ca..4a58d1905095 100644 --- a/pkgs/by-name/ni/nix-prefetch/package.nix +++ b/pkgs/by-name/ni/nix-prefetch/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ni/nix-search-tv/package.nix b/pkgs/by-name/ni/nix-search-tv/package.nix index 12e2fafd6431..8b4863e34fae 100644 --- a/pkgs/by-name/ni/nix-search-tv/package.nix +++ b/pkgs/by-name/ni/nix-search-tv/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "nix-search-tv"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "3timeslazy"; repo = "nix-search-tv"; tag = "v${finalAttrs.version}"; - hash = "sha256-9tOrEcSZ6chVKq82zCoFCy3as71p5k7poXXFO/mXhw0="; + hash = "sha256-AgFedZzkNuTXJFzIs+U2m0nELjFUwESYUbUCSmh0G3Q="; }; - vendorHash = "sha256-hgZWppiy+P3BfoKOMClzCot1shKcGTZnsMCJ/ItxckE="; + vendorHash = "sha256-hBkro++bjYGrhnq8rmSuKTgnkicagOHTkfRYluSBUX8="; subPackages = [ "cmd/nix-search-tv" ]; @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { }; meta = { - description = "Nixpkgs channel for television"; + description = "Fuzzy search for Nix packages"; homepage = "https://github.com/3timeslazy/nix-search-tv"; changelog = "https://github.com/3timeslazy/nix-search-tv/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/ni/nix-template/package.nix b/pkgs/by-name/ni/nix-template/package.nix new file mode 100644 index 000000000000..e81ac8de681d --- /dev/null +++ b/pkgs/by-name/ni/nix-template/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, + makeWrapper, + nix, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "nix-template"; + version = "0.4.1"; + + src = fetchFromGitHub { + name = "${pname}-${version}-src"; + owner = "jonringer"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-42u5FmTIKHpfQ2zZQXIrFkAN2/XvU0wWnCRrQkQzcNI="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-cLSGWOyBQLv235TeYqSVg/f0Zmcnpj+RshINN69JYEU="; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + ]; + + buildInputs = [ openssl ]; + + # needed for nix-prefetch-url + postInstall = + '' + wrapProgram $out/bin/nix-template \ + --prefix PATH : ${lib.makeBinPath [ nix ]} + + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd nix-template \ + --bash <($out/bin/nix-template completions bash) \ + --fish <($out/bin/nix-template completions fish) \ + --zsh <($out/bin/nix-template completions zsh) + ''; + + meta = with lib; { + description = "Make creating nix expressions easy"; + homepage = "https://github.com/jonringer/nix-template/"; + changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}"; + license = licenses.cc0; + maintainers = [ ]; + mainProgram = "nix-template"; + }; +} diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 6e32a46cbe6c..ce343a85db56 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -6,57 +6,55 @@ nix-prefetch-git, nixpkgs-review, python3Packages, + nix-update, }: -let - self = python3Packages.buildPythonApplication { - pname = "nix-update"; - version = "1.10.0"; - pyproject = true; +python3Packages.buildPythonApplication rec { + pname = "nix-update"; + version = "1.11.0"; + pyproject = true; - src = fetchFromGitHub { - owner = "Mic92"; - repo = "nix-update"; - tag = self.version; - hash = "sha256-fGs/EdCEoDA9N5gPtHU6CaDZo9e/aqW6pm6atsjK7PI="; - }; - - build-system = [ python3Packages.setuptools ]; - - makeWrapperArgs = [ - "--prefix" - "PATH" - ":" - (lib.makeBinPath [ - nix - nix-prefetch-git - nixpkgs-review - ]) - ]; - - checkPhase = '' - runHook preCheck - - $out/bin/nix-update --help >/dev/null - - runHook postCheck - ''; - - passthru = { - nix-update-script = callPackage ./nix-update-script.nix { nix-update = self; }; - }; - - meta = { - description = "Swiss-knife for updating nix packages"; - homepage = "https://github.com/Mic92/nix-update/"; - changelog = "https://github.com/Mic92/nix-update/releases/tag/${self.version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - figsoda - mic92 - ]; - mainProgram = "nix-update"; - }; + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nix-update"; + tag = version; + hash = "sha256-G5YehePEMhTgxCnLp8Dg+bDHvOe+QltlCkQHVwMtYx0="; }; -in -self + + build-system = [ python3Packages.setuptools ]; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ + nix + nix-prefetch-git + nixpkgs-review + ]) + ]; + + checkPhase = '' + runHook preCheck + + $out/bin/nix-update --help >/dev/null + + runHook postCheck + ''; + + passthru = { + nix-update-script = callPackage ./nix-update-script.nix { inherit nix-update; }; + }; + + meta = { + description = "Swiss-knife for updating nix packages"; + homepage = "https://github.com/Mic92/nix-update/"; + changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + figsoda + mic92 + ]; + mainProgram = "nix-update"; + }; +} diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix index 961ea4afe735..fa4ad7a7a722 100644 --- a/pkgs/by-name/ni/nix-weather/package.nix +++ b/pkgs/by-name/ni/nix-weather/package.nix @@ -5,7 +5,6 @@ rustPlatform, pkg-config, openssl, - darwin, libiconv, installShellFiles, nix-update-script, @@ -36,8 +35,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; outputs = [ diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix index 2511a260b279..9149274b37d3 100644 --- a/pkgs/by-name/ni/nix-web/package.nix +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -7,7 +7,6 @@ openssl, nixVersions, nixPackage ? nixVersions.stable, - darwin, }: let @@ -31,15 +30,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-PfbDod1vQDnWqbhRgXbOvidxGWIXIe7XIgqiLVbovh0="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optional (!stdenv.hostPlatform.isDarwin) openssl - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) openssl; postPatch = '' substituteInPlace nix-web/nix-web.service \ diff --git a/pkgs/by-name/ni/nixci/package.nix b/pkgs/by-name/ni/nixci/package.nix index 458a03ade240..267107cbdb46 100644 --- a/pkgs/by-name/ni/nixci/package.nix +++ b/pkgs/by-name/ni/nixci/package.nix @@ -5,9 +5,6 @@ fetchFromGitHub, openssl, pkg-config, - Security, - SystemConfiguration, - IOKit, installShellFiles, nix, }: @@ -32,15 +29,9 @@ rustPlatform.buildRustPackage rec { nix ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Security - SystemConfiguration - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; postInstall = '' installShellCompletion --cmd nixci \ diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix index 8e895030339f..617a1acddd2d 100644 --- a/pkgs/by-name/ni/nixdoc/package.nix +++ b/pkgs/by-name/ni/nixdoc/package.nix @@ -1,36 +1,32 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "nixdoc"; version = "3.1.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; - rev = "v${version}"; - sha256 = "sha256-7UOjmW8Ef4mEvj7SINaKWh2ZuyNMVEXB82mtuZTQiPA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7UOjmW8Ef4mEvj7SINaKWh2ZuyNMVEXB82mtuZTQiPA="; }; useFetchCargoVendor = true; cargoHash = "sha256-Aw794yhIET8/pnlQiK2xKVbYC/Kd5MExvFTwkv4LLTc="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; - - meta = with lib; { + meta = { description = "Generate documentation for Nix functions"; mainProgram = "nixdoc"; homepage = "https://github.com/nix-community/nixdoc"; - license = [ licenses.gpl3 ]; - maintainers = with maintainers; [ + license = [ lib.licenses.gpl3 ]; + maintainers = with lib.maintainers; [ infinisil hsjobeki ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ni/nixf-diagnose/package.nix b/pkgs/by-name/ni/nixf-diagnose/package.nix new file mode 100644 index 000000000000..bbcac13337bf --- /dev/null +++ b/pkgs/by-name/ni/nixf-diagnose/package.nix @@ -0,0 +1,31 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nixf, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "nixf-diagnose"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "inclyc"; + repo = "nixf-diagnose"; + tag = finalAttrs.version; + hash = "sha256-gkeU3EwAl9810eRRp5/ddf1h0qpV6FrBBdntNBpBtsM="; + }; + + env.NIXF_TIDY_PATH = lib.getExe nixf; + + useFetchCargoVendor = true; + cargoHash = "sha256-nrr2/lTWPyH7MsG2hSMJjbFCpHsKWINEP8jwSYPhocg="; + + meta = { + description = "CLI wrapper for nixf-tidy with fancy diagnostic output"; + mainProgram = "nixf-diagnose"; + homepage = "https://github.com/inclyc/nixf-diagnose"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ inclyc ]; + }; +}) diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt index 323e1df227fb..24a34eca600b 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt +++ b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt @@ -1 +1 @@ -2025-03-03 +2025-04-04 diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix index 95e0871add42..1da633e8999d 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix +++ b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix @@ -25,8 +25,8 @@ mkDerivation { pname = "nixfmt"; version = "0.6.0"; src = fetchzip { - url = "https://github.com/nixos/nixfmt/archive/3261d1016ecc753c59ff92767a257f91b587e705.tar.gz"; - sha256 = "0jk6mgp710iwxyc7wa5kzz0p0rpcwbbs21smnv14cyii0jniz42s"; + url = "https://github.com/nixos/nixfmt/archive/65af4b69133d19f534d97746c97c2d5b464f43b4.tar.gz"; + sha256 = "0l0w3janvss1n1j7qkcml97zndm2jm2gbrzzs9d8l0ixnrw0cd5r"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/package.nix index 980a840d6408..90e659765b68 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/package.nix +++ b/pkgs/by-name/ni/nixfmt-rfc-style/package.nix @@ -13,7 +13,7 @@ let passthru.updateScript = ./update.sh; - maintainers = lib.teams.formatter.members; + teams = [ lib.teams.formatter ]; preBuild = '' echo -n 'nixpkgs-${version}' > .version diff --git a/pkgs/by-name/ni/nixfmt-tree/package.nix b/pkgs/by-name/ni/nixfmt-tree/package.nix index a9478757585a..f9a7991544ef 100644 --- a/pkgs/by-name/ni/nixfmt-tree/package.nix +++ b/pkgs/by-name/ni/nixfmt-tree/package.nix @@ -21,7 +21,7 @@ let treefmtWithConfig = treefmt.withConfig { name = "nixfmt-tree"; - settings = [ + settings = lib.mkMerge [ # Default settings { _file = ./package.nix; @@ -118,7 +118,7 @@ treefmtWithConfig.overrideAttrs { ''; # All the code is in this file, so same license as Nixpkgs license = lib.licenses.mit; - maintainers = lib.teams.formatter.members; + teams = [ lib.teams.formatter ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index 4a80fd1b9c9c..424813cec2a5 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -31,12 +31,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-7kHxBQuzb7gcHzVmLGljJ4kF6BDDSYVCIxYFDmYPnAo="; + hash = "sha256-xzalz30m0iTVfxPMf0nROg5j/xvg6NhHsX04+ym1E9w="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix index 9f0304aa4a3c..f762d2f78a22 100644 --- a/pkgs/by-name/ni/nixos-facter/package.nix +++ b/pkgs/by-name/ni/nixos-facter/package.nix @@ -6,8 +6,7 @@ libusb1, gcc, pkg-config, - util-linux, - pciutils, + makeWrapper, stdenv, systemdMinimal, }: @@ -24,16 +23,16 @@ let in buildGoModule rec { pname = "nixos-facter"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-facter"; rev = "v${version}"; - hash = "sha256-HJt6FEQbzwlVMow47p1DtqXdmCxLYA6g3D1EgGnKcUo="; + hash = "sha256-SuD6FTyCGT+H5uEPkPmBSI00R87weAoO5xZHPJElSu8="; }; - vendorHash = "sha256-WCItbRbGgclXGtJyHCkDgaPe3Mobe4mT/4c16AEdF5o="; + vendorHash = "sha256-A7ZuY8Gc/a0Y8O6UG2WHWxptHstJOxi4n9F8TY6zqiw="; env.CGO_ENABLED = 1; @@ -45,14 +44,14 @@ buildGoModule rec { nativeBuildInputs = [ gcc pkg-config + makeWrapper ]; - runtimeInputs = [ - libusb1 - util-linux - pciutils - systemdMinimal - ]; + # nixos-facter calls systemd-detect-virt + postInstall = '' + wrapProgram "$out/bin/nixos-facter" \ + --prefix PATH : "${lib.makeBinPath [ systemdMinimal ]}" + ''; ldflags = [ "-s" diff --git a/pkgs/by-name/ni/nixos-firewall-tool/package.nix b/pkgs/by-name/ni/nixos-firewall-tool/package.nix index b928487c5277..13f27d3b7b25 100644 --- a/pkgs/by-name/ni/nixos-firewall-tool/package.nix +++ b/pkgs/by-name/ni/nixos-firewall-tool/package.nix @@ -3,7 +3,7 @@ lib, bash, installShellFiles, - shellcheck-minimal, + buildPackages, }: stdenvNoCC.mkDerivation { @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation { strictDeps = true; buildInputs = [ bash ]; nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ shellcheck-minimal ]; + nativeCheckInputs = [ buildPackages.shellcheck-minimal ]; postPatch = '' patchShebangs --host nixos-firewall-tool @@ -26,10 +26,7 @@ stdenvNoCC.mkDerivation { installShellCompletion nixos-firewall-tool.{bash,fish} ''; - # Skip shellcheck if GHC is not available, see writeShellApplication. - doCheck = - lib.meta.availableOn stdenvNoCC.buildPlatform shellcheck-minimal.compiler - && (builtins.tryEval shellcheck-minimal.compiler.outPath).success; + doCheck = buildPackages.shellcheck-minimal.compiler.bootstrapAvailable; checkPhase = '' shellcheck nixos-firewall-tool ''; diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/README.md b/pkgs/by-name/ni/nixos-rebuild-ng/README.md index 206cfdbb4912..10bd1a90e9d4 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/README.md +++ b/pkgs/by-name/ni/nixos-rebuild-ng/README.md @@ -148,8 +148,6 @@ not possible to fix, please open an issue and we can discuss a solution. ## TODON'T -- Reimplement `systemd-run` logic: will be moved to the new - [`apply`](https://github.com/NixOS/nixpkgs/pull/344407) script - Nix bootstrap: it is only used for non-Flake paths and it is basically useless nowadays. It was created at a time when Nix was changing frequently and there was a need to bootstrap a new version of Nix before evaluating the diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 7709f1af8742..fd03e5b69ef4 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -5,7 +5,7 @@ import os import sys from pathlib import Path from subprocess import CalledProcessError, run -from typing import assert_never +from typing import Final, assert_never from . import nix, tmpdir from .constants import EXECUTABLE, WITH_NIX_2_18, WITH_REEXEC, WITH_SHELL_FILES @@ -13,7 +13,7 @@ from .models import Action, BuildAttr, Flake, ImageVariants, NRError, Profile from .process import Remote, cleanup_ssh from .utils import Args, LogFormatter, tabulate -logger = logging.getLogger() +logger: Final = logging.getLogger() logger.setLevel(logging.INFO) @@ -396,7 +396,7 @@ def execute(argv: list[str]) -> None: raise NRError( "please specify one of the following " + "supported image variants via --image-variant:\n" - + "\n".join(f"- {v}" for v in variants.keys()) + + "\n".join(f"- {v}" for v in variants) ) match action: @@ -518,7 +518,19 @@ def execute(argv: list[str]) -> None: "Done. The virtual machine can be started by running", vm_path ) case Action.BUILD_IMAGE: - disk_path = path_to_config / variants[args.image_variant] + if flake: + image_name = nix.get_build_image_name_flake( + flake, + args.image_variant, + eval_flags=flake_common_flags, + ) + else: + image_name = nix.get_build_image_name( + build_attr, + args.image_variant, + instantiate_flags=flake_common_flags, + ) + disk_path = path_to_config / image_name print_result("Done. The disk image can be found in", disk_path) case Action.EDIT: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py index f879130f0336..ef706af7b342 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py @@ -1,9 +1,11 @@ +from typing import Final + # Build-time flags # Use strings to avoid breaking standalone (e.g.: `python -m nixos_rebuild`) # usage -EXECUTABLE = "@executable@" +EXECUTABLE: Final[str] = "@executable@" # Use either `== "true"` if the default (e.g.: `python -m nixos_rebuild`) is # `False` or `!= "false"` if the default is `True` -WITH_NIX_2_18 = "@withNix218@" != "false" # type: ignore -WITH_REEXEC = "@withReexec@" == "true" # type: ignore -WITH_SHELL_FILES = "@withShellFiles@" == "true" # type: ignore +WITH_NIX_2_18: Final[bool] = "@withNix218@" != "false" +WITH_REEXEC: Final[bool] = "@withReexec@" == "true" +WITH_SHELL_FILES: Final[bool] = "@withShellFiles@" == "true" diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py index a18578a481d6..3fe47acc1bb6 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py @@ -8,7 +8,7 @@ from typing import Any, Callable, ClassVar, Self, TypedDict, override from .process import Remote, run_wrapper -type ImageVariants = dict[str, str] +type ImageVariants = list[str] class NRError(Exception): diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index c7b2010229ab..f4f3db5f13b5 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -2,6 +2,7 @@ import json import logging import os import textwrap +import uuid from concurrent.futures import ThreadPoolExecutor from datetime import datetime from importlib.resources import files @@ -9,7 +10,6 @@ from pathlib import Path from string import Template from subprocess import PIPE, CalledProcessError from typing import Final, Literal -from uuid import uuid4 from . import tmpdir from .constants import WITH_NIX_2_18 @@ -29,7 +29,23 @@ from .utils import Args, dict_to_flags FLAKE_FLAGS: Final = ["--extra-experimental-features", "nix-command flakes"] FLAKE_REPL_TEMPLATE: Final = "repl.nix.template" -logger = logging.getLogger(__name__) +SWITCH_TO_CONFIGURATION_CMD_PREFIX: Final = [ + "systemd-run", + "-E", + # Will be set to new value early in switch-to-configuration script, + # but interpreter starts out with old value + "LOCALE_ARCHIVE", + "-E", + "NIXOS_INSTALL_BOOTLOADER", + "--collect", + "--no-ask-password", + "--pipe", + "--quiet", + "--same-dir", + "--service-type=exec", + "--unit=nixos-rebuild-switch-to-configuration", +] +logger: Final = logging.getLogger(__name__) def build( @@ -91,7 +107,7 @@ def build_remote( "--attr", build_attr.to_attr(attr), "--add-root", - tmpdir.TMPDIR_PATH / uuid4().hex, + tmpdir.TMPDIR_PATH / uuid.uuid4().hex, *dict_to_flags(instantiate_flags), ], stdout=PIPE, @@ -111,7 +127,7 @@ def build_remote( "--realise", drv, "--add-root", - remote_tmpdir / uuid4().hex, + remote_tmpdir / uuid.uuid4().hex, *dict_to_flags(realise_flags), ], remote=build_host, @@ -266,6 +282,59 @@ def find_file(file: str, nix_flags: Args | None = None) -> Path | None: return Path(r.stdout.strip()) +def get_build_image_name( + build_attr: BuildAttr, + image_variant: str, + instantiate_flags: Args | None = None, +) -> str: + path = ( + f'"{build_attr.path.resolve()}"' + if isinstance(build_attr.path, Path) + else build_attr.path + ) + r = run_wrapper( + [ + "nix-instantiate", + "--eval", + "--strict", + "--json", + "--expr", + textwrap.dedent(f""" + let + value = import {path}; + set = if builtins.isFunction value then value {{}} else value; + in + set.{build_attr.to_attr("config.system.build.images", image_variant, "passthru", "filePath")} + """), + *dict_to_flags(instantiate_flags), + ], + stdout=PIPE, + ) + j: str = json.loads(r.stdout.strip()) + return j + + +def get_build_image_name_flake( + flake: Flake, + image_variant: str, + eval_flags: Args | None = None, +) -> str: + r = run_wrapper( + [ + "nix", + "eval", + "--json", + flake.to_attr( + "config.system.build.images", image_variant, "passthru", "filePath" + ), + *dict_to_flags(eval_flags), + ], + stdout=PIPE, + ) + j: str = json.loads(r.stdout.strip()) + return j + + def get_build_image_variants( build_attr: BuildAttr, instantiate_flags: Args | None = None, @@ -287,7 +356,7 @@ def get_build_image_variants( value = import {path}; set = if builtins.isFunction value then value {{}} else value; in - builtins.mapAttrs (n: v: v.passthru.filePath) set.{build_attr.to_attr("config.system.build.images")} + builtins.attrNames set.{build_attr.to_attr("config.system.build.images")} """), *dict_to_flags(instantiate_flags), ], @@ -308,7 +377,7 @@ def get_build_image_variants_flake( "--json", flake.to_attr("config.system.build.images"), "--apply", - "builtins.mapAttrs (n: v: v.passthru.filePath)", + "builtins.attrNames", *dict_to_flags(eval_flags), ], stdout=PIPE, @@ -575,8 +644,21 @@ def switch_to_configuration( if not path_to_config.exists(): raise NRError(f"specialisation not found: {specialisation}") + r = run_wrapper( + ["test", "-d", "/run/systemd/system"], + remote=target_host, + check=False, + ) + cmd = SWITCH_TO_CONFIGURATION_CMD_PREFIX + if r.returncode: + logger.debug( + "skipping systemd-run to switch configuration since systemd is " + + "not working in target host" + ) + cmd = [] + run_wrapper( - [path_to_config / "bin/switch-to-configuration", str(action)], + [*cmd, path_to_config / "bin/switch-to-configuration", str(action)], extra_env={"NIXOS_INSTALL_BOOTLOADER": "1" if install_bootloader else "0"}, remote=target_host, sudo=sudo, diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index de37bd615512..462c4178e8f7 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -1,16 +1,17 @@ import atexit +import getpass import logging import os +import re import shlex import subprocess from collections.abc import Sequence from dataclasses import dataclass -from getpass import getpass from typing import Final, Self, TypedDict, Unpack from . import tmpdir -logger = logging.getLogger(__name__) +logger: Final = logging.getLogger(__name__) SSH_DEFAULT_OPTS: Final = [ "-o", @@ -21,6 +22,8 @@ SSH_DEFAULT_OPTS: Final = [ "ControlPersist=60", ] +type Args = Sequence[str | bytes | os.PathLike[str] | os.PathLike[bytes]] + @dataclass(frozen=True) class Remote: @@ -43,7 +46,7 @@ class Remote: cls._validate_opts(opts, ask_sudo_password) sudo_password = None if ask_sudo_password: - sudo_password = getpass(f"[sudo] password for {host}: ") + sudo_password = getpass.getpass(f"[sudo] password for {host}: ") return cls(host, opts, sudo_password) @staticmethod @@ -82,7 +85,7 @@ atexit.register(cleanup_ssh) def run_wrapper( - args: Sequence[str | bytes | os.PathLike[str] | os.PathLike[bytes]], + args: Args, *, check: bool = True, extra_env: dict[str, str] | None = None, @@ -93,6 +96,8 @@ def run_wrapper( "Wrapper around `subprocess.run` that supports extra functionality." env = None process_input = None + run_args = args + if remote: if extra_env: extra_env_args = [f"{env}={value}" for env, value in extra_env.items()] @@ -103,7 +108,7 @@ def run_wrapper( process_input = remote.sudo_password + "\n" else: args = ["sudo", *args] - args = [ + run_args = [ "ssh", *remote.opts, *SSH_DEFAULT_OPTS, @@ -119,32 +124,39 @@ def run_wrapper( if extra_env: env = os.environ | extra_env if sudo: - args = ["sudo", *args] + run_args = ["sudo", *run_args] logger.debug( "calling run with args=%r, kwargs=%r, extra_env=%r", - args, + run_args, kwargs, extra_env, ) try: r = subprocess.run( - args, + run_args, check=check, env=env, input=process_input, - # Hope nobody is using NixOS with non-UTF8 encodings, but "surrogateescape" - # should still work in those systems. + # Hope nobody is using NixOS with non-UTF8 encodings, but + # "surrogateescape" should still work in those systems. text=True, errors="surrogateescape", **kwargs, ) if kwargs.get("capture_output") or kwargs.get("stderr") or kwargs.get("stdout"): - logger.debug("captured output stdout=%r, stderr=%r", r.stdout, r.stderr) + logger.debug( + "captured output with stdout=%r, stderr=%r", r.stdout, r.stderr + ) return r + except KeyboardInterrupt: + # sudo commands are activation only and unlikely to be long running + if remote and not sudo: + _kill_long_running_ssh_process(args, remote) + raise except subprocess.CalledProcessError: if sudo and remote and remote.sudo_password is None: logger.error( @@ -152,3 +164,55 @@ def run_wrapper( + "--ask-sudo-password?" ) raise + + +# SSH does not send the signals to the process when running without usage of +# pseudo-TTY (that causes a whole other can of worms), so if the process is +# long running (e.g.: a build) this will result in the underlying process +# staying alive. +# See: https://stackoverflow.com/a/44354466 +# Issue: https://github.com/NixOS/nixpkgs/issues/403269 +def _kill_long_running_ssh_process(args: Args, remote: Remote) -> None: + logger.info("cleaning-up remote process, please wait...") + + # We need to escape both the shell and regex here (since pkill interprets + # its arguments as regex) + quoted_args = re.escape(shlex.join(str(a) for a in args)) + logger.debug("killing remote process using pkill with args=%r", quoted_args) + cleanup_interrupted = False + + try: + r = subprocess.run( + [ + "ssh", + *remote.opts, + *SSH_DEFAULT_OPTS, + remote.host, + "--", + "pkill", + "--signal", + "SIGINT", + "--full", + "--", + quoted_args, + ], + check=False, + capture_output=True, + text=True, + ) + logger.debug( + "remote pkill captured output with stdout=%r, stderr=%r, returncode=%s", + r.stdout, + r.stderr, + r.returncode, + ) + except KeyboardInterrupt: + cleanup_interrupted = True + raise + finally: + if cleanup_interrupted or r.returncode: + logger.warning( + "could not clean-up remote process, the command %s may still be running in host '%s'", + args, + remote.host, + ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py index 77ddad740865..c7a2a29ee3dc 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py @@ -8,4 +8,8 @@ def get_qualified_name( ) -> str: module_name = getattr(module, "__name__", method.__module__) method_name = getattr(method, "__qualname__", method.__name__) - return f"{module_name}.{method_name}" + name = f"{module_name}.{method_name}" + assert name.startswith("nixos_rebuild"), ( + f"Non-internal module '{name}' called with 'get_qualified_name'" + ) + return name diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 2e9363e2869a..e41bd1c6ad0f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -1,4 +1,5 @@ import logging +import os import textwrap import uuid from pathlib import Path @@ -126,8 +127,8 @@ def test_parse_args() -> None: ] -@patch.dict(nr.os.environ, {}, clear=True) -@patch(get_qualified_name(nr.os.execve, nr.os), autospec=True) +@patch.dict(os.environ, {}, clear=True) +@patch("os.execve", autospec=True) @patch(get_qualified_name(nr.nix.build), autospec=True) def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -> None: monkeypatch.setattr(nr, "EXECUTABLE", "nixos-rebuild-ng") @@ -170,8 +171,8 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) - ) -@patch.dict(nr.os.environ, {}, clear=True) -@patch(get_qualified_name(nr.os.execve, nr.os), autospec=True) +@patch.dict(os.environ, {}, clear=True) +@patch("os.execve", autospec=True) @patch(get_qualified_name(nr.nix.build_flake), autospec=True) def test_reexec_flake( mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch @@ -212,8 +213,8 @@ def test_reexec_flake( ) -@patch.dict(nr.process.os.environ, {}, clear=True) -@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) +@patch.dict(os.environ, {}, clear=True) +@patch("subprocess.run", autospec=True) def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.mkdir() @@ -234,7 +235,7 @@ def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: nr.execute(["nixos-rebuild", "boot", "--no-flake", "-vvv", "--no-reexec"]) - assert mock_run.call_count == 6 + assert mock_run.call_count == 7 mock_run.assert_has_calls( [ call( @@ -279,7 +280,16 @@ def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: **DEFAULT_RUN_KWARGS, ), call( - [config_path / "bin/switch-to-configuration", "boot"], + ["test", "-d", "/run/systemd/system"], + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + *nr.nix.SWITCH_TO_CONFIGURATION_CMD_PREFIX, + config_path / "bin/switch-to-configuration", + "boot", + ], check=True, **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "0"}}), ), @@ -287,8 +297,8 @@ def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None: ) -@patch.dict(nr.process.os.environ, {}, clear=True) -@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) +@patch.dict(os.environ, {}, clear=True) +@patch("subprocess.run", autospec=True) def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -336,8 +346,8 @@ def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None: ) -@patch.dict(nr.process.os.environ, {}, clear=True) -@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) +@patch.dict(os.environ, {}, clear=True) +@patch("subprocess.run", autospec=True) def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -347,12 +357,7 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: return CompletedProcess( [], 0, - """ - { - "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", - "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk" - } - """, + '"nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd"', ) elif args[0] == "nix": return CompletedProcess([], 0, str(config_path)) @@ -372,7 +377,7 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: ] ) - assert mock_run.call_count == 2 + assert mock_run.call_count == 3 mock_run.assert_has_calls( [ call( @@ -382,7 +387,7 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: "--json", "/path/to/config#nixosConfigurations.hostname.config.system.build.images", "--apply", - "builtins.mapAttrs (n: v: v.passthru.filePath)", + "builtins.attrNames", ], check=True, stdout=PIPE, @@ -401,12 +406,23 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None: stdout=PIPE, **DEFAULT_RUN_KWARGS, ), + call( + [ + "nix", + "eval", + "--json", + "/path/to/config#nixosConfigurations.hostname.config.system.build.images.azure.passthru.filePath", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), ] ) -@patch.dict(nr.process.os.environ, {}, clear=True) -@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) +@patch.dict(os.environ, {}, clear=True) +@patch("subprocess.run", autospec=True) def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -436,7 +452,7 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: ] ) - assert mock_run.call_count == 3 + assert mock_run.call_count == 4 mock_run.assert_has_calls( [ call( @@ -470,7 +486,17 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: **DEFAULT_RUN_KWARGS, ), call( - ["sudo", config_path / "bin/switch-to-configuration", "switch"], + ["test", "-d", "/run/systemd/system"], + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "sudo", + *nr.nix.SWITCH_TO_CONFIGURATION_CMD_PREFIX, + config_path / "bin/switch-to-configuration", + "switch", + ], check=True, **(DEFAULT_RUN_KWARGS | {"env": {"NIXOS_INSTALL_BOOTLOADER": "1"}}), ), @@ -478,13 +504,13 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: ) -@patch.dict(nr.process.os.environ, {}, clear=True) -@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -@patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) -@patch(get_qualified_name(nr.nix.uuid4, nr.nix), autospec=True) +@patch.dict(os.environ, {}, clear=True) +@patch("subprocess.run", autospec=True) +@patch("uuid.uuid4", autospec=True) +@patch(get_qualified_name(nr.cleanup_ssh), autospec=True) def test_execute_nix_switch_build_target_host( - mock_uuid4: Mock, mock_cleanup_ssh: Mock, + mock_uuid4: Mock, mock_run: Mock, tmp_path: Path, ) -> None: @@ -529,7 +555,7 @@ def test_execute_nix_switch_build_target_host( ] ) - assert mock_run.call_count == 10 + assert mock_run.call_count == 11 mock_run.assert_has_calls( [ call( @@ -655,6 +681,19 @@ def test_execute_nix_switch_build_target_host( check=True, **DEFAULT_RUN_KWARGS, ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@target-host", + "--", + "test", + "-d", + "/run/systemd/system", + ], + check=False, + **DEFAULT_RUN_KWARGS, + ), call( [ "ssh", @@ -664,6 +703,7 @@ def test_execute_nix_switch_build_target_host( "sudo", "env", "NIXOS_INSTALL_BOOTLOADER=0", + *nr.nix.SWITCH_TO_CONFIGURATION_CMD_PREFIX, str(config_path / "bin/switch-to-configuration"), "switch", ], @@ -674,9 +714,9 @@ def test_execute_nix_switch_build_target_host( ) -@patch.dict(nr.process.os.environ, {}, clear=True) -@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -@patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) +@patch.dict(os.environ, {}, clear=True) +@patch("subprocess.run", autospec=True) +@patch(get_qualified_name(nr.cleanup_ssh), autospec=True) def test_execute_nix_switch_flake_target_host( mock_cleanup_ssh: Mock, mock_run: Mock, @@ -706,7 +746,7 @@ def test_execute_nix_switch_flake_target_host( ] ) - assert mock_run.call_count == 4 + assert mock_run.call_count == 5 mock_run.assert_has_calls( [ call( @@ -744,6 +784,19 @@ def test_execute_nix_switch_flake_target_host( check=True, **DEFAULT_RUN_KWARGS, ), + call( + [ + "ssh", + *nr.process.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "test", + "-d", + "/run/systemd/system", + ], + check=False, + **DEFAULT_RUN_KWARGS, + ), call( [ "ssh", @@ -753,6 +806,7 @@ def test_execute_nix_switch_flake_target_host( "sudo", "env", "NIXOS_INSTALL_BOOTLOADER=0", + *nr.nix.SWITCH_TO_CONFIGURATION_CMD_PREFIX, str(config_path / "bin/switch-to-configuration"), "switch", ], @@ -763,9 +817,9 @@ def test_execute_nix_switch_flake_target_host( ) -@patch.dict(nr.process.os.environ, {}, clear=True) -@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -@patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) +@patch.dict(os.environ, {}, clear=True) +@patch("subprocess.run", autospec=True) +@patch(get_qualified_name(nr.cleanup_ssh), autospec=True) def test_execute_nix_switch_flake_build_host( mock_cleanup_ssh: Mock, mock_run: Mock, @@ -796,7 +850,7 @@ def test_execute_nix_switch_flake_build_host( ] ) - assert mock_run.call_count == 6 + assert mock_run.call_count == 7 mock_run.assert_has_calls( [ call( @@ -857,7 +911,16 @@ def test_execute_nix_switch_flake_build_host( **DEFAULT_RUN_KWARGS, ), call( - [config_path / "bin/switch-to-configuration", "switch"], + ["test", "-d", "/run/systemd/system"], + check=False, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + *nr.nix.SWITCH_TO_CONFIGURATION_CMD_PREFIX, + config_path / "bin/switch-to-configuration", + "switch", + ], check=True, **DEFAULT_RUN_KWARGS, ), @@ -865,7 +928,7 @@ def test_execute_nix_switch_flake_build_host( ) -@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) +@patch("subprocess.run", autospec=True) def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.touch() @@ -875,6 +938,8 @@ def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: return CompletedProcess([], 0, str(nixpkgs_path)) elif args[0] == "git": return CompletedProcess([], 0, "") + elif args[0] == "test": + return CompletedProcess([], 1) else: return CompletedProcess([], 0) @@ -891,7 +956,7 @@ def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: ] ) - assert mock_run.call_count == 4 + assert mock_run.call_count == 5 mock_run.assert_has_calls( [ call( @@ -923,6 +988,11 @@ def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: check=True, **DEFAULT_RUN_KWARGS, ), + call( + ["test", "-d", "/run/systemd/system"], + check=False, + **DEFAULT_RUN_KWARGS, + ), call( [ Path("/nix/var/nix/profiles/system/bin/switch-to-configuration"), @@ -935,7 +1005,7 @@ def test_execute_switch_rollback(mock_run: Mock, tmp_path: Path) -> None: ) -@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) +@patch("subprocess.run", autospec=True) def test_execute_build(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -964,7 +1034,7 @@ def test_execute_build(mock_run: Mock, tmp_path: Path) -> None: ) -@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) +@patch("subprocess.run", autospec=True) def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: config_path = tmp_path / "test" config_path.touch() @@ -972,6 +1042,8 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]: if args[0] == "nix": return CompletedProcess([], 0, str(config_path)) + elif args[0] == "test": + return CompletedProcess([], 1) else: return CompletedProcess([], 0) @@ -981,7 +1053,7 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: ["nixos-rebuild", "test", "--flake", "github:user/repo#hostname", "--no-reexec"] ) - assert mock_run.call_count == 2 + assert mock_run.call_count == 3 mock_run.assert_has_calls( [ call( @@ -997,6 +1069,11 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: stdout=PIPE, **DEFAULT_RUN_KWARGS, ), + call( + ["test", "-d", "/run/systemd/system"], + check=False, + **DEFAULT_RUN_KWARGS, + ), call( [config_path / "bin/switch-to-configuration", "test"], check=True, @@ -1006,9 +1083,9 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None: ) -@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -@patch(get_qualified_name(nr.nix.Path.exists, nr.nix), autospec=True, return_value=True) -@patch(get_qualified_name(nr.nix.Path.mkdir, nr.nix), autospec=True) +@patch("subprocess.run", autospec=True) +@patch("pathlib.Path.exists", autospec=True, return_value=True) +@patch("pathlib.Path.mkdir", autospec=True) def test_execute_test_rollback( mock_path_mkdir: Mock, mock_path_exists: Mock, @@ -1025,6 +1102,8 @@ def test_execute_test_rollback( 2084 2024-11-07 23:54:17 (current) """), ) + elif args[0] == "test": + return CompletedProcess([], 1) else: return CompletedProcess([], 0) @@ -1034,7 +1113,7 @@ def test_execute_test_rollback( ["nixos-rebuild", "test", "--rollback", "--profile-name", "foo", "--no-reexec"] ) - assert mock_run.call_count == 2 + assert mock_run.call_count == 3 mock_run.assert_has_calls( [ call( @@ -1048,6 +1127,11 @@ def test_execute_test_rollback( stdout=PIPE, **DEFAULT_RUN_KWARGS, ), + call( + ["test", "-d", "/run/systemd/system"], + check=False, + **DEFAULT_RUN_KWARGS, + ), call( [ Path( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index 6d2017392fbf..cf9c052c709b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -1,4 +1,3 @@ -import platform import subprocess from pathlib import Path from unittest.mock import Mock, patch @@ -77,7 +76,7 @@ def test_flake_to_attr() -> None: ) -@patch(get_qualified_name(platform.node), autospec=True) +@patch("platform.node", autospec=True) def test_flake_from_arg( mock_node: Mock, monkeypatch: MonkeyPatch, tmpdir: Path ) -> None: @@ -100,7 +99,7 @@ def test_flake_from_arg( # None when we do not have /etc/nixos/flake.nix with patch( - get_qualified_name(m.Path.exists, m), + "pathlib.Path.exists", autospec=True, return_value=False, ): @@ -109,17 +108,17 @@ def test_flake_from_arg( # None when we have a file in /etc/nixos/flake.nix with ( patch( - get_qualified_name(m.Path.exists, m), + "pathlib.Path.exists", autospec=True, return_value=True, ), patch( - get_qualified_name(m.Path.is_symlink, m), + "pathlib.Path.is_symlink", autospec=True, return_value=False, ), patch( - get_qualified_name(m.discover_git, m), + get_qualified_name(m.discover_git), autospec=True, return_value="/etc/nixos", ), @@ -130,17 +129,17 @@ def test_flake_from_arg( with ( patch( - get_qualified_name(m.Path.exists, m), + "pathlib.Path.exists", autospec=True, return_value=True, ), patch( - get_qualified_name(m.Path.is_symlink, m), + "pathlib.Path.is_symlink", autospec=True, return_value=True, ), patch( - get_qualified_name(m.Path.resolve, m), + "pathlib.Path.resolve", autospec=True, return_value=Path("/path/to/flake.nix"), ), @@ -151,7 +150,7 @@ def test_flake_from_arg( with ( patch( - get_qualified_name(m.subprocess.run), + "subprocess.run", autospec=True, return_value=subprocess.CompletedProcess([], 0, "remote-hostname\n"), ), @@ -161,7 +160,7 @@ def test_flake_from_arg( ) -@patch(get_qualified_name(m.Path.mkdir, m), autospec=True) +@patch("pathlib.Path.mkdir", autospec=True) def test_profile_from_arg(mock_mkdir: Mock) -> None: assert m.Profile.from_arg("system") == m.Profile( "system", diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index af8c0bdfd6a7..2180abd55d71 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -78,7 +78,7 @@ def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) -> @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -@patch(get_qualified_name(n.uuid4, n), autospec=True) +@patch("uuid.uuid4", autospec=True) def test_build_remote( mock_uuid4: Mock, mock_run: Mock, monkeypatch: MonkeyPatch ) -> None: @@ -353,7 +353,7 @@ def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: value = import ; set = if builtins.isFunction value then value {} else value; in - builtins.mapAttrs (n: v: v.passthru.filePath) set.config.system.build.images + builtins.attrNames set.config.system.build.images """), ], stdout=PIPE, @@ -376,7 +376,7 @@ def test_get_build_image_variants(mock_run: Mock, tmp_path: Path) -> None: value = import "{tmp_path}"; set = if builtins.isFunction value then value {{}} else value; in - builtins.mapAttrs (n: v: v.passthru.filePath) set.preAttr.config.system.build.images + builtins.attrNames set.preAttr.config.system.build.images """), "--inst-flag", ], @@ -411,7 +411,7 @@ def test_get_build_image_variants_flake(mock_run: Mock) -> None: "--json", "flake.nix#myAttr.config.system.build.images", "--apply", - "builtins.mapAttrs (n: v: v.passthru.filePath)", + "builtins.attrNames", "--eval-flag", ], stdout=PIPE, @@ -689,9 +689,12 @@ def test_set_profile(mock_run: Mock) -> None: @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> None: +def test_switch_to_configuration_without_systemd_run( + mock_run: Any, monkeypatch: MonkeyPatch +) -> None: profile_path = Path("/path/to/profile") config_path = Path("/path/to/config") + mock_run.return_value = CompletedProcess([], 1) with monkeypatch.context() as mp: mp.setenv("LOCALE_ARCHIVE", "") @@ -749,8 +752,64 @@ def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> No ) +@patch(get_qualified_name(n.run_wrapper, n), autospec=True) +def test_switch_to_configuration_with_systemd_run( + mock_run: Mock, monkeypatch: MonkeyPatch +) -> None: + profile_path = Path("/path/to/profile") + config_path = Path("/path/to/config") + mock_run.return_value = CompletedProcess([], 0) + + with monkeypatch.context() as mp: + mp.setenv("LOCALE_ARCHIVE", "") + + n.switch_to_configuration( + profile_path, + m.Action.SWITCH, + sudo=False, + target_host=None, + specialisation=None, + install_bootloader=False, + ) + mock_run.assert_called_with( + [ + *n.SWITCH_TO_CONFIGURATION_CMD_PREFIX, + profile_path / "bin/switch-to-configuration", + "switch", + ], + extra_env={"NIXOS_INSTALL_BOOTLOADER": "0"}, + sudo=False, + remote=None, + ) + + target_host = m.Remote("user@localhost", [], None) + with monkeypatch.context() as mp: + mp.setenv("LOCALE_ARCHIVE", "/path/to/locale") + mp.setenv("PATH", "/path/to/bin") + mp.setattr(Path, Path.exists.__name__, lambda self: True) + + n.switch_to_configuration( + Path("/path/to/config"), + m.Action.TEST, + sudo=True, + target_host=target_host, + install_bootloader=True, + specialisation="special", + ) + mock_run.assert_called_with( + [ + *n.SWITCH_TO_CONFIGURATION_CMD_PREFIX, + config_path / "specialisation/special/bin/switch-to-configuration", + "test", + ], + extra_env={"NIXOS_INSTALL_BOOTLOADER": "1"}, + sudo=True, + remote=target_host, + ) + + @patch( - get_qualified_name(n.Path.glob, n), + "pathlib.Path.glob", autospec=True, return_value=[ Path("/nix/var/nix/profiles/per-user/root/channels/nixos"), @@ -758,7 +817,7 @@ def test_switch_to_configuration(mock_run: Mock, monkeypatch: MonkeyPatch) -> No Path("/nix/var/nix/profiles/per-user/root/channels/home-manager"), ], ) -@patch(get_qualified_name(n.Path.is_dir, n), autospec=True, return_value=True) +@patch("pathlib.Path.is_dir", autospec=True, return_value=True) def test_upgrade_channels(mock_is_dir: Mock, mock_glob: Mock) -> None: with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(False) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index 6458f54c06ef..84eba633b21b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -6,10 +6,8 @@ from pytest import MonkeyPatch import nixos_rebuild.models as m import nixos_rebuild.process as p -from .helpers import get_qualified_name - -@patch(get_qualified_name(p.subprocess.run), autospec=True) +@patch("subprocess.run", autospec=True) def test_run(mock_run: Any) -> None: p.run_wrapper(["test", "--with", "flags"], check=True) mock_run.assert_called_with( @@ -96,6 +94,37 @@ def test_run(mock_run: Any) -> None: ) +@patch("subprocess.run", autospec=True) +def test__kill_long_running_ssh_process(mock_run: Any) -> None: + p._kill_long_running_ssh_process( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "/nix/store/la0c8nmpr9xfclla0n4f3qq9iwgdrq4g-nixos-system-sankyuu-nixos-25.05.20250424.f771eb4.drv^*", + ], + m.Remote("user@localhost", opts=[], sudo_password=None), + ) + mock_run.assert_called_with( + [ + "ssh", + *p.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "pkill", + "--signal", + "SIGINT", + "--full", + "--", + r"nix\ \-\-extra\-experimental\-features\ 'nix\-command\ flakes'\ build\ '/nix/store/la0c8nmpr9xfclla0n4f3qq9iwgdrq4g\-nixos\-system\-sankyuu\-nixos\-25\.05\.20250424\.f771eb4\.drv\^\*'", + ], + check=False, + capture_output=True, + text=True, + ) + + def test_remote_from_name(monkeypatch: MonkeyPatch) -> None: monkeypatch.setenv("NIX_SSHOPTS", "") assert m.Remote.from_arg("user@localhost", None, False) == m.Remote( @@ -104,9 +133,7 @@ def test_remote_from_name(monkeypatch: MonkeyPatch) -> None: sudo_password=None, ) - # get_qualified_name doesn't work because getpass is aliased to another - # function - with patch(f"{p.__name__}.getpass", autospec=True, return_value="password"): + with patch("getpass.getpass", autospec=True, return_value="password"): monkeypatch.setenv("NIX_SSHOPTS", "-f foo -b bar -t") assert m.Remote.from_arg("user@localhost", True, True) == m.Remote( "user@localhost", diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix index a003f5eb65e5..2212d9ca0606 100644 --- a/pkgs/by-name/ni/nixpacks/package.nix +++ b/pkgs/by-name/ni/nixpacks/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.34.1"; + version = "1.37.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "nixpacks"; rev = "v${version}"; - hash = "sha256-G3PIQfwddATVNhe/cEZBSFESX3grFqjUQjq40DB5mH4="; + hash = "sha256-1Kw5vOE8UhGWlSjBX/wMiUyRvCYwha343RiGAXEcFXw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-h6DoUCj7wjN/qiy0rsC2fCHhQ8hcmSwFu7zaRw9tCUs="; + cargoHash = "sha256-rmndlNqUtGpSBLclyoTL01CP3qgCNoTmOnpR+9ux/VE="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix index 4627def80b68..fe7f6de6c107 100644 --- a/pkgs/by-name/ni/nixpkgs-review/package.nix +++ b/pkgs/by-name/ni/nixpkgs-review/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "3.2.0"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; tag = version; - hash = "sha256-XJRZpAiIbwN5itqxHTcAqd6VnuUOO8TwShZiupJc8dc="; + hash = "sha256-Ey07yahJQv5ppf8TiwIt1Cn4xo4QMZ5v+CsJRDelWNY="; }; build-system = [ diff --git a/pkgs/by-name/ni/nixpkgs-vet/package.nix b/pkgs/by-name/ni/nixpkgs-vet/package.nix new file mode 100644 index 000000000000..4a57d4f48c9e --- /dev/null +++ b/pkgs/by-name/ni/nixpkgs-vet/package.nix @@ -0,0 +1,36 @@ +{ + fetchFromGitHub, + lib, + nix, + nix-update-script, + rustPlatform, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "nixpkgs-vet"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nixpkgs-vet"; + tag = finalAttrs.version; + hash = "sha256-J61eOTeDMHt9f1XmKVrEMAFUgwHGmMxDoSyY3v72QVY="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-H2JAIMJeVqp8xq75eLEBKiK2pBrgC7vgXXlqbrSUifE="; + + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool to vet (check) Nixpkgs, including its pkgs/by-name directory"; + homepage = "https://github.com/NixOS/nixpkgs-vet"; + license = lib.licenses.mit; + mainProgram = "nixpkgs-vet"; + maintainers = with lib.maintainers; [ + philiptaron + willbush + ]; + }; +}) diff --git a/pkgs/by-name/ni/nixtract/package.nix b/pkgs/by-name/ni/nixtract/package.nix index 13139e54b6db..71bc900fed88 100644 --- a/pkgs/by-name/ni/nixtract/package.nix +++ b/pkgs/by-name/ni/nixtract/package.nix @@ -6,7 +6,6 @@ openssl, stdenv, libiconv, - darwin, nix, testers, nixtract, @@ -32,7 +31,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ nix ]; diff --git a/pkgs/by-name/nk/nkeys/package.nix b/pkgs/by-name/nk/nkeys/package.nix index 1272455703ea..9fa508349456 100644 --- a/pkgs/by-name/nk/nkeys/package.nix +++ b/pkgs/by-name/nk/nkeys/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nkeys"; - version = "0.4.10"; + version = "0.4.11"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; tag = "v${version}"; - hash = "sha256-vSjIqeGWS9sDGyrPD11u4ngiZrW6gZfYd08kKXUDXdU="; + hash = "sha256-dSkIT+KW+hT/Rk3NSkrb5ABLLiGGz2dppr9rwhjLOnM="; }; - vendorHash = "sha256-TtplWIDLUsFXhT5OQVhW3KTfxh1MVY8Hssejy8GBYVQ="; + vendorHash = "sha256-89DGLTkt9c8jJhAX3Uo8BBtLcBbnYE0q4mCqq/RGXM4="; meta = with lib; { description = "Public-key signature system for NATS"; diff --git a/pkgs/by-name/nl/nlopt/package.nix b/pkgs/by-name/nl/nlopt/package.nix new file mode 100644 index 000000000000..51386f659748 --- /dev/null +++ b/pkgs/by-name/nl/nlopt/package.nix @@ -0,0 +1,150 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + nix-update-script, + # Optionally build Python bindings + withPython ? false, + python3, + python3Packages, + # Optionally build Octave bindings + withOctave ? false, + octave, + # Optionally build Java bindings + withJava ? false, + jdk, + # Required for building the Python and Java bindings + swig, + # Optionally exclude Luksan solvers to allow licensing under MIT + withoutLuksanSolvers ? false, + # Build static on-demand + withStatic ? stdenv.hostPlatform.isStatic, + + # v2.8.0 introduced a regression where testing on Linux platforms fails with a buffer overflow + # when compiled with -D_FORTIFY_SOURCE=3. + # This was deemed to be a compiler false positive by the library's author in https://github.com/stevengj/nlopt/issues/563. + # Building with `clangStdenv` prevents this from occurring. + clangStdenv, +}: +let + buildPythonBindingsEnv = python3.withPackages (p: [ p.numpy ]); + buildDocsEnv = python3.withPackages (p: [ + p.mkdocs + p.python-markdown-math + ]); +in +clangStdenv.mkDerivation (finalAttrs: { + pname = "nlopt"; + version = "2.10.0"; + + src = fetchFromGitHub { + owner = "stevengj"; + repo = "nlopt"; + tag = "v${finalAttrs.version}"; + hash = "sha256-mZRmhXrApxfiJedk+L/poIP2DR/BkV04c5fiwPGAyjI="; + }; + + outputs = [ + "out" + "doc" + ]; + + patches = [ + # 26-03-2025: `mkdocs.yml` is missing a link for the subpage related to the Java bindings. + # 26-03-2025: This commit was merged after v2.10.0 was released, and has not been made + # 26-03-2025: part of a release. + (fetchpatch { + name = "missing-java-reference-mkdocs"; + url = "https://github.com/stevengj/nlopt/commit/7e34f1a6fe82ed27daa6111d83c4d5629555454b.patch"; + hash = "sha256-XivfZtgIGLyTtU+Zo2jSQAx2mVdGLJ8PD7VSSvGR/5Q="; + }) + + # 26-03-2025: The docs pages still list v2.7.1 as the newest version. + # 26-03-2025: This commit was merged after v2.10.0 was released, and has not been made + # 26-03-2025: part of a release. + (fetchpatch { + name = "update-index-md"; + url = "https://github.com/stevengj/nlopt/commit/2c4147832eff7ea15d0536c82351a9e169f85e43.patch"; + hash = "sha256-BXcbNUyu20f3N146v6v9cpjSj5CwuDtesp6lAqOK2KY="; + }) + + # 26-03-2025: There is an off-by-one error in the test/CMakeLists.txt + # 26-03-2025: that causes the tests to attempt to run disabled Luksan solver code, + # 26-03-2025: which in turn causes the test suite to fail. + # 26-03-2025: See https://github.com/stevengj/nlopt/pull/605 + (fetchpatch { + name = "fix-nondisabled-luksan-algorithm"; + url = "https://github.com/stevengj/nlopt/commit/7817ec19f21be6877a4b79777fc5315a52c6850b.patch"; + hash = "sha256-KgdAMSYKOQuraun4HNr9GOx48yjyeQk6W3IgWRA44oo="; + }) + ]; + + postPatch = '' + substituteInPlace nlopt.pc.in \ + --replace-fail 'libdir=''${exec_prefix}/@NLOPT_INSTALL_LIBDIR@' 'libdir=@NLOPT_INSTALL_LIBDIR@' + ''; + + nativeBuildInputs = + [ cmake ] + ## Building the python bindings requires SWIG, and numpy in addition to the CXX routines. + ## The tests also make use of the same interpreter to test the bindings. + ++ lib.optionals withPython [ + swig + buildPythonBindingsEnv + ] + ## Building the java bindings requires SWIG, C++, JNI and Java + ++ lib.optionals withJava [ + swig + jdk + ] + ## Building octave bindings requires `mkoctfile` to be installed. + ++ lib.optional withOctave octave; + + # Python bindings depend on numpy at import time. + propagatedBuildInputs = lib.optional withPython python3Packages.numpy; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!withStatic)) + (lib.cmakeBool "NLOPT_CXX" true) + (lib.cmakeBool "NLOPT_PYTHON" withPython) + (lib.cmakeBool "NLOPT_OCTAVE" withOctave) + (lib.cmakeBool "NLOPT_JAVA" withJava) + (lib.cmakeBool "NLOPT_SWIG" (withPython || withJava)) + (lib.cmakeBool "NLOPT_FORTRAN" false) + (lib.cmakeBool "NLOPT_MATLAB" false) + (lib.cmakeBool "NLOPT_GUILE" false) + (lib.cmakeBool "NLOPT_LUKSAN" (!withoutLuksanSolvers)) + (lib.cmakeBool "NLOPT_TESTS" finalAttrs.doCheck) + ] + ++ lib.optional withPython ( + lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}" + ); + + postBuild = '' + ${buildDocsEnv.interpreter} -m mkdocs build \ + --config-file ../mkdocs.yml \ + --site-dir $doc \ + --no-directory-urls + ''; + + doCheck = true; + + postFixup = '' + substituteInPlace $out/lib/cmake/nlopt/NLoptLibraryDepends.cmake --replace-fail \ + 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/' 'INTERFACE_INCLUDE_DIRECTORIES "' + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://nlopt.readthedocs.io/en/latest/"; + changelog = "https://github.com/stevengj/nlopt/releases/tag/v${finalAttrs.version}"; + description = "Free open-source library for nonlinear optimization"; + license = if withoutLuksanSolvers then lib.licenses.mit else lib.licenses.lgpl21Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.bengsparks ]; + }; +}) diff --git a/pkgs/by-name/nm/nm-file-secret-agent/package.nix b/pkgs/by-name/nm/nm-file-secret-agent/package.nix index ac4993ad9af1..5cce4afde6cd 100644 --- a/pkgs/by-name/nm/nm-file-secret-agent/package.nix +++ b/pkgs/by-name/nm/nm-file-secret-agent/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitHub, + fetchFromGitea, rustPlatform, dbus, networkmanager, @@ -9,16 +9,17 @@ }: rustPlatform.buildRustPackage rec { name = "nm-file-secret-agent"; - version = "1.0.1"; + version = "1.1.0"; - src = fetchFromGitHub { - owner = "lilioid"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "lilly"; repo = "nm-file-secret-agent"; rev = "v${version}"; - hash = "sha256-xQWgNxrbpHOfnKXa57cV1F3JmtJcvQsqUfgwfWg5Ni4="; + hash = "sha256-FZef9qMJeQkoLvCHcsGMqr0riC98WVXntQtbt76Iev4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Q2RQ6pWYKOr/6nD7PLpTonVldOfyUu2lvwNRAc8zkLg="; + cargoHash = "sha256-HYyL0r9YrDL22uQdypJQ7Xep9Uqt4b16bhl0D9kRByU="; buildInputs = [ dbus ]; nativeBuildInputs = [ pkg-config ]; @@ -27,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "NetworkManager secret agent that responds with the content of preconfigured files"; mainProgram = "nm-file-secret-agent"; - homepage = "https://github.com/lilioid/nm-file-secret-agent/"; + homepage = "https://codeberg.org/lilly/nm-file-secret-agent"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lilioid ]; platforms = lib.lists.intersectLists dbus.meta.platforms networkmanager.meta.platforms; diff --git a/pkgs/by-name/nm/nmap-formatter/package.nix b/pkgs/by-name/nm/nmap-formatter/package.nix index c341552d8eae..60299fdb366a 100644 --- a/pkgs/by-name/nm/nmap-formatter/package.nix +++ b/pkgs/by-name/nm/nmap-formatter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nmap-formatter"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "vdjagilev"; repo = pname; rev = "v${version}"; - hash = "sha256-eWrFeADjPUioKuGcC3f/y2ocBwOHa5KN81YjF2dbgoc="; + hash = "sha256-jpgAcnDDVVboZEMkLIE9ei0oT91Y9yp8KUJkH6LQSY4="; }; - vendorHash = "sha256-zYXT5+TLx+Z9WtgDabaUqBdRiaa+tyeQYwENfnv8ARo="; + vendorHash = "sha256-xOS59co6FE2lJae2VtsBKcGjvmMRiGlmZKbqH++mEYk="; meta = with lib; { description = "Tool that allows you to convert nmap output"; diff --git a/pkgs/by-name/nm/nmap/package.nix b/pkgs/by-name/nm/nmap/package.nix index 32a6f1a322ec..fc929197ebe9 100644 --- a/pkgs/by-name/nm/nmap/package.nix +++ b/pkgs/by-name/nm/nmap/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + versionCheckHook, libpcap, pkg-config, openssl, @@ -15,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nmap"; - version = "7.95"; + version = "7.96"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - hash = "sha256-4Uq1MOR7Wv2I8ciiusf4nNj+a0eOItJVxbm923ocV3g="; + hash = "sha256-mK56Ty+2bBo9SCr48AE3KDuRciNEa0bnogsG6r7fjIo="; }; prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -63,6 +64,12 @@ stdenv.mkDerivation rec { doCheck = false; # fails 3 tests, probably needs the net + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "-V"; + doInstallCheck = true; + meta = { description = "Free and open source utility for network discovery and security auditing"; homepage = "http://www.nmap.org"; diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix index 0eebc1cb85e0..e4848e915cee 100644 --- a/pkgs/by-name/nm/nmh/package.nix +++ b/pkgs/by-name/nm/nmh/package.nix @@ -14,25 +14,27 @@ openssl, readline, runtimeShell, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "nmh"; - version = "1.7.1"; + version = "1.8"; src = fetchFromSavannah { repo = "nmh"; rev = finalAttrs.version; - hash = "sha256-sBftXl4hWs4bKw5weHkif1KIJBpheU/RCePx0WXuv9o="; + hash = "sha256-ShAdinvBA7guVBhjqTelBRiUzyo5KqHcawlQS9kXtqs="; }; + patches = [ ./reproducible-build-date.patch ]; + postPatch = '' - substituteInPlace config/config.c --replace /bin/cat ${coreutils}/bin/cat substituteInPlace \ sbr/arglist.c \ uip/mhbuildsbr.c \ uip/whatnowsbr.c \ uip/slocal.c \ - --replace '"/bin/sh"' '"${runtimeShell}"' + --replace-fail '"/bin/sh"' '"${runtimeShell}"' # the "cleanup" pseudo-test makes diagnosing test failures a pain ln -s -f ${stdenv}/bin/true test/cleanup ''; @@ -57,11 +59,18 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; enableParallelBuilding = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/install-mh"; + versionCheckProgramArg = "-version"; + meta = { description = "New MH Mail Handling System"; homepage = "https://nmh.nongnu.org/"; - downloadPage = "http://download.savannah.nongnu.org/releases/nmh/"; - changelog = "http://savannah.nongnu.org/news/?group=nmh"; + downloadPage = "https://download.savannah.nongnu.org/releases/nmh/"; + changelog = "https://savannah.nongnu.org/news/?group=nmh"; license = [ lib.licenses.bsd3 ]; longDescription = '' This is the nmh mail user agent (reader/sender), a command-line based diff --git a/pkgs/by-name/nm/nmh/reproducible-build-date.patch b/pkgs/by-name/nm/nmh/reproducible-build-date.patch new file mode 100644 index 000000000000..cb28c0a948cf --- /dev/null +++ b/pkgs/by-name/nm/nmh/reproducible-build-date.patch @@ -0,0 +1,15 @@ +Index: config/version.sh +=================================================================== +--- a/config/version.sh ++++ b/config/version.sh +@@ -11,9 +11,9 @@ + git=" `git -C $srcdir describe --long --dirty`" + else + git= + fi +-date="`TZ=GMT0 date +'%Y-%m-%d %T'` +0000" ++date="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" + + cat <=21.1.0" } }, + "node_modules/@eslint/config-helpers": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz", + "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/core": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz", - "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz", + "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -107,9 +117,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", - "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "dev": true, "license": "MIT", "dependencies": { @@ -131,9 +141,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.20.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz", - "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==", + "version": "9.23.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz", + "integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==", "dev": true, "license": "MIT", "engines": { @@ -151,13 +161,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz", - "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==", + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz", + "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.10.0", + "@eslint/core": "^0.13.0", "levn": "^0.4.1" }, "engines": { @@ -165,9 +175,9 @@ } }, "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz", - "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", + "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -241,9 +251,9 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", - "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz", + "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -393,9 +403,9 @@ } }, "node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "dev": true, "license": "MIT" }, @@ -407,17 +417,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.0.tgz", - "integrity": "sha512-aFcXEJJCI4gUdXgoo/j9udUYIHgF23MFkg09LFz2dzEmU0+1Plk4rQWv/IYKvPHAtlkkGoB3m5e6oUp+JPsNaQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.0.tgz", + "integrity": "sha512-PAIpk/U7NIS6H7TEtN45SPGLQaHNgB7wSjsQV/8+KYokAb2T/gloOA/Bee2yd4/yKVhPKe5LlaUGhAZk5zmSaQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.24.0", - "@typescript-eslint/type-utils": "8.24.0", - "@typescript-eslint/utils": "8.24.0", - "@typescript-eslint/visitor-keys": "8.24.0", + "@typescript-eslint/scope-manager": "8.29.0", + "@typescript-eslint/type-utils": "8.29.0", + "@typescript-eslint/utils": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -433,20 +443,20 @@ "peerDependencies": { "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.0.tgz", - "integrity": "sha512-MFDaO9CYiard9j9VepMNa9MTcqVvSny2N4hkY6roquzj8pdCBRENhErrteaQuu7Yjn1ppk0v1/ZF9CG3KIlrTA==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz", + "integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.24.0", - "@typescript-eslint/types": "8.24.0", - "@typescript-eslint/typescript-estree": "8.24.0", - "@typescript-eslint/visitor-keys": "8.24.0", + "@typescript-eslint/scope-manager": "8.29.0", + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/typescript-estree": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0", "debug": "^4.3.4" }, "engines": { @@ -458,18 +468,18 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.0.tgz", - "integrity": "sha512-HZIX0UByphEtdVBKaQBgTDdn9z16l4aTUz8e8zPQnyxwHBtf5vtl1L+OhH+m1FGV9DrRmoDuYKqzVrvWDcDozw==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz", + "integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.24.0", - "@typescript-eslint/visitor-keys": "8.24.0" + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -480,14 +490,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.0.tgz", - "integrity": "sha512-8fitJudrnY8aq0F1wMiPM1UUgiXQRJ5i8tFjq9kGfRajU+dbPyOuHbl0qRopLEidy0MwqgTHDt6CnSeXanNIwA==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.0.tgz", + "integrity": "sha512-ahaWQ42JAOx+NKEf5++WC/ua17q5l+j1GFrbbpVKzFL/tKVc0aYY8rVSYUpUvt2hUP1YBr7mwXzx+E/DfUWI9Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.24.0", - "@typescript-eslint/utils": "8.24.0", + "@typescript-eslint/typescript-estree": "8.29.0", + "@typescript-eslint/utils": "8.29.0", "debug": "^4.3.4", "ts-api-utils": "^2.0.1" }, @@ -500,13 +510,13 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.0.tgz", - "integrity": "sha512-VacJCBTyje7HGAw7xp11q439A+zeGG0p0/p2zsZwpnMzjPB5WteaWqt4g2iysgGFafrqvyLWqq6ZPZAOCoefCw==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz", + "integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==", "dev": true, "license": "MIT", "engines": { @@ -518,14 +528,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.0.tgz", - "integrity": "sha512-ITjYcP0+8kbsvT9bysygfIfb+hBj6koDsu37JZG7xrCiy3fPJyNmfVtaGsgTUSEuTzcvME5YI5uyL5LD1EV5ZQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz", + "integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.24.0", - "@typescript-eslint/visitor-keys": "8.24.0", + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -541,7 +551,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { @@ -571,16 +581,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.0.tgz", - "integrity": "sha512-07rLuUBElvvEb1ICnafYWr4hk8/U7X9RDCOqd9JcAMtjh/9oRmcfN4yGzbPVirgMR0+HLVHehmu19CWeh7fsmQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.0.tgz", + "integrity": "sha512-gX/A0Mz9Bskm8avSWFcK0gP7cZpbY4AIo6B0hWYFCaIsz750oaiWR4Jr2CI+PQhfW1CpcQr9OlfPS+kMFegjXA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.24.0", - "@typescript-eslint/types": "8.24.0", - "@typescript-eslint/typescript-estree": "8.24.0" + "@typescript-eslint/scope-manager": "8.29.0", + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/typescript-estree": "8.29.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -591,17 +601,17 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.0.tgz", - "integrity": "sha512-kArLq83QxGLbuHrTMoOEWO+l2MwsNS2TGISEdx8xgqpkbytB07XmlQyQdNDrCc1ecSqx0cnmhGvpX+VBwqqSkg==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz", + "integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.24.0", + "@typescript-eslint/types": "8.29.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -622,9 +632,9 @@ } }, "node_modules/acorn": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", - "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", "dev": true, "license": "MIT", "bin": { @@ -993,9 +1003,9 @@ } }, "node_modules/call-bind-apply-helpers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", - "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1007,14 +1017,14 @@ } }, "node_modules/call-bound": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", - "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", "dev": true, "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "get-intrinsic": "^1.2.6" + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" }, "engines": { "node": ">= 0.4" @@ -1634,13 +1644,16 @@ } }, "node_modules/es-shim-unscopables": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", - "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", "dev": true, "license": "MIT", "dependencies": { - "hasown": "^2.0.0" + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/es-to-primitive": { @@ -1685,22 +1698,23 @@ } }, "node_modules/eslint": { - "version": "9.20.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.0.tgz", - "integrity": "sha512-aL4F8167Hg4IvsW89ejnpTwx+B/UQRzJPGgbIOl+4XqffWsahVVsLEWoZvnrVuwpWmnRd7XeXmQI1zlKcFDteA==", + "version": "9.23.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz", + "integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.0", - "@eslint/core": "^0.11.0", - "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.20.0", - "@eslint/plugin-kit": "^0.2.5", + "@eslint/config-array": "^0.19.2", + "@eslint/config-helpers": "^0.2.0", + "@eslint/core": "^0.12.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.23.0", + "@eslint/plugin-kit": "^0.2.7", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.1", + "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", @@ -1708,7 +1722,7 @@ "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.2.0", + "eslint-scope": "^8.3.0", "eslint-visitor-keys": "^4.2.0", "espree": "^10.3.0", "esquery": "^1.5.0", @@ -1783,13 +1797,13 @@ } }, "node_modules/eslint-plugin-n": { - "version": "17.15.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.15.1.tgz", - "integrity": "sha512-KFw7x02hZZkBdbZEFQduRGH4VkIH4MW97ClsbAM4Y4E6KguBJWGfWG1P4HEIpZk2bkoWf0bojpnjNAhYQP8beA==", + "version": "17.17.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.17.0.tgz", + "integrity": "sha512-2VvPK7Mo73z1rDFb6pTvkH6kFibAmnTubFq5l83vePxu0WiY1s0LOtj2WHb6Sa40R3w4mnh8GFYbHBQyMlotKw==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.4.1", + "@eslint-community/eslint-utils": "^4.5.0", "enhanced-resolve": "^5.17.1", "eslint-plugin-es-x": "^7.8.0", "get-tsconfig": "^4.8.1", @@ -1819,9 +1833,9 @@ } }, "node_modules/eslint-plugin-n/node_modules/globals": { - "version": "15.14.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz", - "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==", + "version": "15.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", + "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", "dev": true, "license": "MIT", "engines": { @@ -1910,9 +1924,9 @@ } }, "node_modules/eslint-scope": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", - "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", + "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -2061,9 +2075,9 @@ "license": "MIT" }, "node_modules/fastq": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz", - "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", "dev": true, "license": "ISC", "dependencies": { @@ -2145,9 +2159,9 @@ } }, "node_modules/flatted": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", - "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", "dev": true, "license": "ISC" }, @@ -2168,12 +2182,12 @@ } }, "node_modules/foreground-child": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", - "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", "license": "ISC", "dependencies": { - "cross-spawn": "^7.0.0", + "cross-spawn": "^7.0.6", "signal-exit": "^4.0.1" }, "engines": { @@ -2262,18 +2276,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", - "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "dev": true, "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", + "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", + "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", - "get-proto": "^1.0.0", + "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", @@ -3366,9 +3380,9 @@ } }, "node_modules/minipass-fetch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.0.tgz", - "integrity": "sha512-2v6aXUXwLP1Epd/gc32HAMIWoczx+fZwEPRHm/VwtrJzRGwR1qGZXEYV3Zp8ZjjbwaZhMrM6uHV4KVkk+XCc2w==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz", + "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==", "license": "MIT", "dependencies": { "minipass": "^7.0.3", @@ -3473,13 +3487,12 @@ "license": "ISC" }, "node_modules/minizlib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz", - "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", + "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==", "license": "MIT", "dependencies": { - "minipass": "^7.0.4", - "rimraf": "^5.0.5" + "minipass": "^7.1.2" }, "engines": { "node": ">= 18" @@ -3582,9 +3595,9 @@ "license": "MIT" }, "node_modules/nan": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", - "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "version": "2.22.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz", + "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==", "dev": true, "license": "MIT" }, @@ -3632,9 +3645,9 @@ } }, "node_modules/neostandard/node_modules/globals": { - "version": "15.14.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz", - "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==", + "version": "15.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", + "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", "dev": true, "license": "MIT", "engines": { @@ -3724,15 +3737,16 @@ } }, "node_modules/object.entries": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", - "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz", + "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==", "dev": true, "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" + "es-object-atoms": "^1.1.1" }, "engines": { "node": ">= 0.4" @@ -4167,9 +4181,9 @@ } }, "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", "dev": true, "license": "MIT", "engines": { @@ -4177,21 +4191,6 @@ "node": ">=0.10.0" } }, - "node_modules/rimraf": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", - "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", - "license": "ISC", - "dependencies": { - "glob": "^10.3.7" - }, - "bin": { - "rimraf": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -4795,6 +4794,48 @@ "node": ">=18" } }, + "node_modules/tinyglobby": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz", + "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==", + "license": "MIT", + "dependencies": { + "fdir": "^6.4.3", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tinyglobby/node_modules/fdir": { + "version": "6.4.3", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz", + "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==", + "license": "MIT", + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/tinyglobby/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -4809,9 +4850,9 @@ } }, "node_modules/ts-api-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz", - "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", "dev": true, "license": "MIT", "engines": { @@ -4913,9 +4954,9 @@ } }, "node_modules/typescript": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", - "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", + "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", "dev": true, "license": "Apache-2.0", "peer": true, @@ -4928,15 +4969,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.24.0.tgz", - "integrity": "sha512-/lmv4366en/qbB32Vz5+kCNZEMf6xYHwh1z48suBwZvAtnXKbP+YhGe8OLE2BqC67LMqKkCNLtjejdwsdW6uOQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.0.tgz", + "integrity": "sha512-ep9rVd9B4kQsZ7ZnWCVxUE/xDLUUUsRzE0poAeNu+4CkFErLfuvPt/qtm2EpnSyfvsR0S6QzDFSrPCFBwf64fg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.24.0", - "@typescript-eslint/parser": "8.24.0", - "@typescript-eslint/utils": "8.24.0" + "@typescript-eslint/eslint-plugin": "8.29.0", + "@typescript-eslint/parser": "8.29.0", + "@typescript-eslint/utils": "8.29.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4947,7 +4988,7 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/unbox-primitive": { @@ -5086,16 +5127,17 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.18", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz", - "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==", + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", "dev": true, "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.8", - "call-bound": "^1.0.3", - "for-each": "^0.3.3", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" }, diff --git a/pkgs/by-name/no/node-gyp/package.nix b/pkgs/by-name/no/node-gyp/package.nix index bfcfb8876757..65de35eac04c 100644 --- a/pkgs/by-name/no/node-gyp/package.nix +++ b/pkgs/by-name/no/node-gyp/package.nix @@ -1,4 +1,5 @@ { + stdenv, buildNpmPackage, fetchFromGitHub, lib, @@ -7,19 +8,21 @@ (buildNpmPackage.override { inherit nodejs; }) rec { pname = "node-gyp"; - version = "11.1.0"; + version = "11.2.0"; src = fetchFromGitHub { owner = "nodejs"; repo = "node-gyp"; tag = "v${version}"; - hash = "sha256-KbV0lhBICx9oRWA8Gq/ex2cfeHbZSQq8JCjwCCIcrYk="; + hash = "sha256-NOVswjTByrQ+2z4H9wYd4YIWKhWIdgxpz2pE0dOK6qc="; }; - npmDepsHash = "sha256-TQKSR0h/RH4/P+HENT+mwb0AFWkBo7SUh51yfCq/jVk="; + npmDepsHash = "sha256-emCYKqe6Bn1hmUq9jPDo5Nu9n43s4kb0E8lQndVtmlQ="; postPatch = '' ln -s ${./package-lock.json} package-lock.json + substituteInPlace gyp/pylib/gyp/**.py \ + --replace-quiet sys.platform '"${stdenv.targetPlatform.parsed.kernel.name}"' ''; dontNpmBuild = true; diff --git a/pkgs/by-name/no/node-pre-gyp/package.nix b/pkgs/by-name/no/node-pre-gyp/package.nix index 3e570fa323de..b0f6a990dea4 100644 --- a/pkgs/by-name/no/node-pre-gyp/package.nix +++ b/pkgs/by-name/no/node-pre-gyp/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "node-pre-gyp"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "mapbox"; repo = "node-pre-gyp"; tag = "v${version}"; - hash = "sha256-i7iBy+X9zBKrrbIwVa61y9cbmHJmqeacXrZk+XGRok8="; + hash = "sha256-9MADe6oY28MBAdQsu/ddVveZYwD4xeVNKUffhcvK+Q0="; }; - npmDepsHash = "sha256-0Xa5bByTskrQ8v2O1FUxtQzRb1ZEV0TvUhe8hh05QHI="; + npmDepsHash = "sha256-yNu66HlkOVsYv60saTf7M4QuN9B2euYFu5WB7UAwhUw="; dontNpmBuild = true; diff --git a/pkgs/by-name/no/nodehun/package.nix b/pkgs/by-name/no/nodehun/package.nix index 36426f03ea83..d903cf04e92d 100644 --- a/pkgs/by-name/no/nodehun/package.nix +++ b/pkgs/by-name/no/nodehun/package.nix @@ -1,7 +1,6 @@ { buildNpmPackage, cctools, - darwin, fetchFromGitHub, lib, node-gyp, @@ -30,10 +29,6 @@ buildNpmPackage { ]; npmDepsHash = "sha256-mV6rWNf2p2w4H0ESUT0/Ybtx9YEdvO5l2gCvlWFXK+U="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; nativeBuildInputs = [ node-gyp python3 diff --git a/pkgs/by-name/no/nodeinfo/package.nix b/pkgs/by-name/no/nodeinfo/package.nix index a21a324d92e8..cd76391847a5 100644 --- a/pkgs/by-name/no/nodeinfo/package.nix +++ b/pkgs/by-name/no/nodeinfo/package.nix @@ -5,15 +5,15 @@ }: buildGoModule rec { pname = "nodeinfo"; - version = "0.3.2"; - vendorHash = "sha256-4nHdz/Js8xBUMiH+hH+hSYP25cB4yHbe+QVk0RMqLgc="; + version = "1.0.0"; + vendorHash = "sha256-P0klk3YWa2qprCUNUjiuF+Akxh246WCu4vwUAZmSDCw="; src = fetchFromGitea { domain = "codeberg.org"; owner = "thefederationinfo"; repo = "nodeinfo-go"; rev = "refs/tags/v${version}"; - hash = "sha256-NNrMv4AS7ybuJfTgs+p61btSIxo+iMvzH7Y5ct46Dag="; + hash = "sha256-XwK3QeVDQMZD5G79XPJTAJyilVgYFVgZORHYTBI0gIQ="; }; modRoot = "./cli"; diff --git a/pkgs/by-name/no/nodemon/package.nix b/pkgs/by-name/no/nodemon/package.nix index fa1317e6f841..664d40582fff 100644 --- a/pkgs/by-name/no/nodemon/package.nix +++ b/pkgs/by-name/no/nodemon/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "nodemon"; - version = "3.1.9"; + version = "3.1.10"; src = fetchFromGitHub { owner = "remy"; repo = "nodemon"; rev = "v${version}"; - hash = "sha256-D0trs/Il7ekXXuLIsp8b9VPxQW1qqTc7DduGymv6jyU="; + hash = "sha256-wr/HNa+iqHhlE/Qp62d1EgcwA6hsv8CsJg9NLgEa15g="; }; npmDepsHash = "sha256-cZHfaUWhKZYKRe4Foc2UymZ8hTPrGLzlcXe1gMsW1pU="; diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix index 91ce841ac804..9de9d0d728ae 100644 --- a/pkgs/by-name/no/nomacs/package.nix +++ b/pkgs/by-name/no/nomacs/package.nix @@ -18,8 +18,8 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nomacs"; - version = "3.19.1"; - hash = "sha256-NRwZ/ShJaLCMFv7QdfRoJY5zQFo18cAVWGRpS3ap3Rw="; + version = "3.21.1"; + hash = "sha256-RRa19vj7iTtGzdssdtHVOsDzS4X+p1HeiZKy8EIWxq8="; src = fetchFromGitHub { owner = "nomacs"; @@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { plugins = fetchFromGitHub { owner = "novomesk"; repo = "nomacs-plugins"; - rev = "40d0f7089b7f108077dac5dede52e8a303b243b3"; - hash = "sha256-7+JMmHaTvWjVTkLwXGtQHnoaC/3vK7haCzNvVIZ9F/g="; + rev = "20101da282f13d3184ece873388e1c234a79b5e7"; + hash = "sha256-gcRc4KoWJQ5BirhLuk+c+5HwBeyQtlJ3iyX492DXeVk="; }; outputs = diff --git a/pkgs/by-name/no/nomad-pack/package.nix b/pkgs/by-name/no/nomad-pack/package.nix index 0e5e0c6154dc..b2747e93fc6c 100644 --- a/pkgs/by-name/no/nomad-pack/package.nix +++ b/pkgs/by-name/no/nomad-pack/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nomad-pack"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "nomad-pack"; rev = "v${version}"; - sha256 = "sha256-dw6sueC1qibJYc6sbZX8HJlEf9R6O8dlE1aobw70UHw="; + sha256 = "sha256-QtpTnChLB9OfzLSJXr19geHzxmOeL5DQ0G4fgcqCdbc="; }; - vendorHash = "sha256-BKYJ9FZXKpFwK3+mrZAXRkfitSY9jeOLLeC0BOsKc/A="; + vendorHash = "sha256-lygNUHerj9bMJk2+PTUeAJIdTPK9nUYXaByZpzh7uLY="; # skip running go tests as they require network access doCheck = false; diff --git a/pkgs/by-name/no/nomnatong/package.nix b/pkgs/by-name/no/nomnatong/package.nix index 894ecc0c999d..9c157b1c3e85 100644 --- a/pkgs/by-name/no/nomnatong/package.nix +++ b/pkgs/by-name/no/nomnatong/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nomnatong"; - version = "5.14"; + version = "5.15"; src = fetchFromGitHub { owner = "nomfoundation"; repo = "font"; rev = "v${finalAttrs.version}"; - hash = "sha256-H9Cdl27qg94SgyDS1KvoyHTQC4s2geLBPKKupEXGJQE="; + hash = "sha256-QVg54EX2ctfADe5976PHHId3r35oQEPDejvGU89+QeU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix index 29d8664ea2ce..c4c17deb190e 100644 --- a/pkgs/by-name/no/normcap/package.nix +++ b/pkgs/by-name/no/normcap/package.nix @@ -47,6 +47,7 @@ ps.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "jeepney" "shiboken6" ]; diff --git a/pkgs/by-name/no/norminette/package.nix b/pkgs/by-name/no/norminette/package.nix index 602297773727..bec1adc9d304 100644 --- a/pkgs/by-name/no/norminette/package.nix +++ b/pkgs/by-name/no/norminette/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "norminette"; - version = "3.3.55"; + version = "3.3.58"; src = fetchFromGitHub { owner = "42School"; repo = pname; tag = version; - hash = "sha256-SaXOUpYEbc2QhZ8aKS+JeJ22MSXZ8HZuRmVQ9fWk7tM="; + hash = "sha256-6hBBbfW2PQFb8rcDihvtWK0df7WcvOk0il1E82GOxaU="; }; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index 95ea63774953..fe9cebb960c6 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -5,24 +5,24 @@ boost, cmake, git, - hyperscan, + vectorscan, openssl, pkg-config, }: rustPlatform.buildRustPackage rec { pname = "noseyparker"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "noseyparker"; rev = "v${version}"; - hash = "sha256-n+lX49BwipIPQ2ZeQT+DFO2ILHHAU2VsOnhASOGX5RE="; + hash = "sha256-6GxkIxLEgbIgg4nSHvmRedm8PAPBwVxLQUnQzh3NonA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-eAJlbJyGILc3veVxJNKqrTeZGQsAymAGYNCTU+Kakos="; + cargoHash = "sha256-hVBHIm/12WU6g45QMxxuGk41B0kwThk7A84fOxArvno="; nativeCheckInputs = [ git @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ boost - hyperscan + vectorscan openssl ]; @@ -59,7 +59,5 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/praetorian-inc/noseyparker/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ _0x4A6F ]; - # limited by hyperscan - platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix index 485cced95575..f73007bf9a08 100644 --- a/pkgs/by-name/no/nostr-rs-relay/package.nix +++ b/pkgs/by-name/no/nostr-rs-relay/package.nix @@ -6,7 +6,6 @@ openssl, pkg-config, libiconv, - darwin, protobuf, }: @@ -27,8 +26,6 @@ rustPlatform.buildRustPackage rec { [ openssl.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix index 6c32f8c19c94..97413ca90f7c 100644 --- a/pkgs/by-name/no/nostui/package.nix +++ b/pkgs/by-name/no/nostui/package.nix @@ -2,8 +2,6 @@ lib, fetchFromGitHub, rustPlatform, - darwin, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -17,10 +15,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RCD11KdzM66Mkydc51r6fG+q8bmKl5eZma58YoARwPo="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk; [ frameworks.SystemConfiguration ] - ); - GIT_HASH = "000000000000000000000000000000000000000000000000000"; checkFlags = [ diff --git a/pkgs/by-name/no/notation/package.nix b/pkgs/by-name/no/notation/package.nix index cbc5eaa21dc0..865b6da8a14a 100644 --- a/pkgs/by-name/no/notation/package.nix +++ b/pkgs/by-name/no/notation/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "notation"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "notaryproject"; repo = pname; rev = "v${version}"; - hash = "sha256-KxxksliL2ZxbvwbLKB81Lhpvjab9nm4o3QBT2CVFwDw="; + hash = "sha256-l9A5AwKJ/atN92Oral6PRH2nCbMJ+/ST9weXYRZXWms="; }; - vendorHash = "sha256-Mjuw0J5ITLcTWbCUYKLBDrK84wrN7KC05dn0+eBqb9s="; + vendorHash = "sha256-WFcy7to3bV3V3bBto5F175PEIxrG9Tj7MuLeBXdSvaM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix index b13ed4f005cb..d6508d2a1142 100644 --- a/pkgs/by-name/no/notcurses/package.nix +++ b/pkgs/by-name/no/notcurses/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "notcurses"; - version = "3.0.13"; + version = "3.0.16"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-i3UNd1y88aOGBp2r9itBFd9w+UJQhleJQHZOiK0d26w="; + sha256 = "sha256-qAc9jKFpYgI0SdzKHhzmrPkWg4uSXDetD/oNEmHob2o="; }; outputs = [ diff --git a/pkgs/by-name/no/notepad-next/package.nix b/pkgs/by-name/no/notepad-next/package.nix index 09a761e24f14..ab44de46b983 100644 --- a/pkgs/by-name/no/notepad-next/package.nix +++ b/pkgs/by-name/no/notepad-next/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "notepad-next"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; tag = "v${finalAttrs.version}"; - hash = "sha256-DpqFu7Nt7l1rmQoJ7aQnFEGPxo8NDrowHxmyLdKIX4A="; + hash = "sha256-qpJXby355iSyAGzj19jJJFmFkKeBRgOGod2rrZJqU9Y="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/pkgs/by-name/no/notes-up/package.nix b/pkgs/by-name/no/notes-up/package.nix index 7e9fe5f5bf88..291ad6f6681d 100644 --- a/pkgs/by-name/no/notes-up/package.nix +++ b/pkgs/by-name/no/notes-up/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { description = "Markdown notes editor and manager designed for elementary OS"; homepage = "https://github.com/Philip-Scott/Notes-up"; license = licenses.gpl2Only; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + teams = [ teams.pantheon ]; platforms = platforms.linux; mainProgram = "com.github.philip_scott.notes-up"; }; diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix index af926182fa91..2a5317c2f459 100644 --- a/pkgs/by-name/no/notes/package.nix +++ b/pkgs/by-name/no/notes/package.nix @@ -4,13 +4,8 @@ fetchFromGitHub, cmake, qt6, - darwin, - overrideSDK, }: -let - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "notes"; version = "2.3.1"; @@ -29,14 +24,10 @@ stdenv'.mkDerivation (finalAttrs: { qt6.wrapQtAppsHook ]; - buildInputs = - [ - qt6.qtbase - qt6.qtdeclarative - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - ]; + buildInputs = [ + qt6.qtbase + qt6.qtdeclarative + ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix new file mode 100644 index 000000000000..27b8675652c0 --- /dev/null +++ b/pkgs/by-name/no/noti/package.nix @@ -0,0 +1,52 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: + +buildGoModule (finalAttrs: rec { + pname = "noti"; + version = "3.8.0"; + + src = fetchFromGitHub { + owner = "variadico"; + repo = "noti"; + tag = finalAttrs.version; + hash = "sha256-FwOS4ifMiODIzKVQufLhkDYOcmXz9dAfWw+hM3rXT/Y="; + }; + + vendorHash = null; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "cmd/noti" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/variadico/noti/internal/command.Version=${finalAttrs.version}" + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + postInstall = '' + installManPage docs/man/dist/* + ''; + + meta = { + description = "Monitor a process and trigger a notification"; + longDescription = '' + Monitor a process and trigger a notification. + + Never sit and wait for some long-running process to finish. Noti can alert + you when it's done. You can receive messages on your computer or phone. + ''; + homepage = "https://github.com/variadico/noti"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.stites ]; + mainProgram = "noti"; + }; +}) diff --git a/pkgs/by-name/no/notion-app/info.json b/pkgs/by-name/no/notion-app/info.json index a88884f7b803..8bbde63624f3 100644 --- a/pkgs/by-name/no/notion-app/info.json +++ b/pkgs/by-name/no/notion-app/info.json @@ -1,12 +1,12 @@ { "x86_64-darwin": { - "version": "4.6.3", - "url": "https://desktop-release.notion-static.com/Notion-4.6.3.zip", - "hash": "sha512-8MVCebWFInBLh8PEnm2hcCW95tncOvaIPx+MxC0xCr377fEpCAU9IlCjhUokKxw/u3sljU7Vfkxhwk/kXjh+PQ==" + "version": "4.9.1", + "url": "https://desktop-release.notion-static.com/Notion-4.9.1.zip", + "hash": "sha512-q32pytnWo9YIXqWFvEa7Pw2FI1S0EAR5O0O33At2l7OVCJLytdV0BavsZtMP+xhDw51TUUYnDsMzkXoTVAzaCQ==" }, "aarch64-darwin": { - "version": "4.6.3", - "url": "https://desktop-release.notion-static.com/Notion-arm64-4.6.3.zip", - "hash": "sha512-aNMx/tZ26KXz0Wb3kajRER6Ni9raItflCCt+aQTKMz3v4SN+wkoad/aKbIugrNB30+4cxeVRJISOZMNWmQryOA==" + "version": "4.9.1", + "url": "https://desktop-release.notion-static.com/Notion-arm64-4.9.1.zip", + "hash": "sha512-DFgQOevvIDIq3zG0O3x3kwmDmtEtpifw0MIB7CPmuAhAix7LJwM2+FxeOXr1YlJF0MaAja5kllMWSyK993Qijw==" } } diff --git a/pkgs/by-name/no/notion-app/package.nix b/pkgs/by-name/no/notion-app/package.nix index 544d6454528e..bd33b998b55c 100644 --- a/pkgs/by-name/no/notion-app/package.nix +++ b/pkgs/by-name/no/notion-app/package.nix @@ -5,9 +5,7 @@ unzip, }: let - info = - (builtins.fromJSON (builtins.readFile ./info.json))."${stdenvNoCC.targetPlatform.system}" - or (throw "notion-app: unsupported system ${stdenvNoCC.targetPlatform.system}"); + info = (lib.importJSON ./info.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin"; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "notion-app"; diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix index ed09967977b0..da7a28082e51 100644 --- a/pkgs/by-name/no/notion/package.nix +++ b/pkgs/by-name/no/notion/package.nix @@ -19,20 +19,24 @@ xmessage, xterm, }: - stdenv.mkDerivation (finalAttrs: { pname = "notion"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "raboof"; repo = "notion"; - rev = finalAttrs.version; - hash = "sha256-u5KoTI+OcnQu9m8/Lmsmzr8lEk9tulSE7RRFhj1oXJM="; + tag = finalAttrs.version; + hash = "sha256-Ll4thDS8fHxkm2IuGjePPVPyPPrz7yDzpKVloFuk/yE="; }; - # error: 'PATH_MAX' undeclared postPatch = '' + # Fix build failure due missing headers + sed -i '1i#define _POSIX_C_SOURCE 200809L' mod_notionflux/notionflux/notionflux.c + sed -i '2i#include ' mod_notionflux/notionflux/notionflux.c + sed -i '3i#include ' mod_notionflux/notionflux/notionflux.c + + # error: 'PATH_MAX' undeclared sed 1i'#include ' -i mod_notionflux/notionflux/notionflux.c ''; @@ -90,8 +94,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl21; mainProgram = "notion"; maintainers = with lib.maintainers; [ - jfb raboof + NotAShelf ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/no/notmuch-bower/package.nix b/pkgs/by-name/no/notmuch-bower/package.nix index 1bb1c050171d..09262d8bfce0 100644 --- a/pkgs/by-name/no/notmuch-bower/package.nix +++ b/pkgs/by-name/no/notmuch-bower/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "notmuch-bower"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "sha256-CqA9JU/ujqIn/NvtbPtSWxKDYCv4oDdLCgbf2jj9Av4="; + sha256 = "sha256-THIMCIk6ugPpogfQ5DTHIgFD7no5IIVYfz2mqBvKBlY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/notmuch-mailmover/package.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix index ba4aadcc34d9..b74a4dcab435 100644 --- a/pkgs/by-name/no/notmuch-mailmover/package.nix +++ b/pkgs/by-name/no/notmuch-mailmover/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage rec { pname = "notmuch-mailmover"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "michaeladler"; repo = "notmuch-mailmover"; rev = "v${version}"; - hash = "sha256-v70R6CgN4RzG6L8LUg3ZvW895+G4eU8HZ0TI+jRxZ10="; + hash = "sha256-xX1sH+8DaLgCzkl5WwwNEE9+iTdZX0d64SxfmvuVVgs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-aMSYXquyDwPBa4xL7wOSu/Ou1saPG5ZDXhLB4dAnomo="; + cargoHash = "sha256-5jEM5FURnfuoOiu2rqsh4shMp1ajv0zMpIx7r0gv6Bc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index 276362d5c2cd..0c9d6ddef625 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -20,18 +20,18 @@ stdenvNoCC.mkDerivation rec { pname = "noto-fonts${suffix}"; - version = "2025.03.01"; + version = "2025.05.01"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-49p4LFGywuA6zNZEw0VmtykmDUBtRkzOKYAb4sG4fK4="; + hash = "sha256-voOizeGK7fU2bGLoNBhdNIfleDCu84nFiEHo5lCIye4="; }; outputs = [ "out" - "megamerge" # Experimental fonts created by mergeing regular notofonts + "megamerge" # Experimental fonts created by merging regular notofonts ]; _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; diff --git a/pkgs/by-name/no/nova-password/package.nix b/pkgs/by-name/no/nova-password/package.nix index 83fde0d4362a..ab7e136c73ed 100644 --- a/pkgs/by-name/no/nova-password/package.nix +++ b/pkgs/by-name/no/nova-password/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nova-password"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "sapcc"; repo = "nova-password"; tag = "v${version}"; - hash = "sha256-+qFbBjjbp1Nazpo21oOytvEPzn6Nmc4Cr8du045Ab/E="; + hash = "sha256-+RW+uJ9mLEiNMGYio+FcAJHvga8uzDLmgcylwoUJIho="; }; - vendorHash = "sha256-tRBWniPM/IPR/JKi7R46tnx9rgyCb5hOkOR1oy7iVcc="; + vendorHash = "sha256-7Hg5s3yZezLVwoUoeF4125QtjeLSCcsjnCD6+zbMz8I="; meta = { description = "Decrypt the admin password generated for the VM in OpenStack"; diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix index 3c9db899f070..8898152794e1 100644 --- a/pkgs/by-name/no/novops/package.nix +++ b/pkgs/by-name/no/novops/package.nix @@ -7,7 +7,6 @@ stdenv, installShellFiles, libiconv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,7 +29,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/nowplaying-cli/package.nix b/pkgs/by-name/no/nowplaying-cli/package.nix index f959cfd02c6f..61f46f60930c 100644 --- a/pkgs/by-name/no/nowplaying-cli/package.nix +++ b/pkgs/by-name/no/nowplaying-cli/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -16,12 +15,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FkyrtgsGzpK2rLNr+oxfPUbX43TVXYeiBg7CN1JUg8Y="; }; - buildInputs = [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Cocoa - ]; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/np/np2kai/package.nix b/pkgs/by-name/np/np2kai/package.nix index add57748df67..8ed66b71bdfe 100644 --- a/pkgs/by-name/np/np2kai/package.nix +++ b/pkgs/by-name/np/np2kai/package.nix @@ -2,32 +2,23 @@ stdenv, lib, fetchFromGitHub, - enable16Bit ? true, - enable32Bit ? true, - - enableSDL ? true, - withSDLVersion ? "2", - SDL, - SDL_ttf, - SDL_mixer, + unstableGitUpdater, + writeShellApplication, + cmake, + fontconfig, + freetype, + glib, + gtk2, + libusb1, + libX11, + openssl, + pkg-config, SDL2, SDL2_ttf, SDL2_mixer, + enable16Bit ? true, enableX11 ? stdenv.hostPlatform.isLinux, - automake, - autoconf, - autoconf-archive, - libtool, - pkg-config, - unzip, - gtk2, - libusb1, - libXxf86vm, - nasm, - libICE, - libSM, - # HAXM build succeeds but the binary segfaults, seemingly due to the missing HAXM kernel module # Enable once there is a HAXM kernel module option in NixOS? Or somehow bind it to the system kernel having HAXM? # Or leave it disabled by default? @@ -35,198 +26,104 @@ enableHAXM ? false, }: -assert lib.assertMsg ( - enable16Bit || enable32Bit -) "Must enable 16-Bit and/or 32-Bit system variant."; -assert lib.assertMsg (enableSDL || enableX11) "Must enable SDL and/or X11 graphics interfaces."; -assert lib.assertOneOf "withSDLVersion" withSDLVersion [ - "1" - "2" -]; -assert enableHAXM -> (lib.assertMsg enableX11 "Must enable X11 graphics interface for HAXM build."); -let - inherit (lib) optional optionals optionalString; - inherit (lib.strings) concatStringsSep concatMapStringsSep; - isSDL2 = (withSDLVersion == "2"); - sdlInfix = optionalString isSDL2 "2"; - sdlDeps1 = [ - SDL - SDL_ttf - SDL_mixer - ]; - sdlDeps2 = [ - SDL2 - SDL2_ttf - SDL2_mixer - ]; - sdlDepsBuildonly = if isSDL2 then sdlDeps1 else sdlDeps2; - sdlDepsTarget = if isSDL2 then sdlDeps2 else sdlDeps1; - sdlMakefileSuffix = - if stdenv.hostPlatform.isWindows then - "win" - else if stdenv.hostPlatform.isDarwin then - "mac" - else - "unix"; - sdlMakefiles = concatMapStringsSep " " (x: x + "." + sdlMakefileSuffix) ( - optionals enable16Bit [ - "Makefile" - ] - ++ optionals enable32Bit [ - "Makefile21" - ] - ); - sdlBuildFlags = concatStringsSep " " ( - optionals enableSDL [ - "SDL_VERSION=${withSDLVersion}" - ] - ); - sdlBins = concatStringsSep " " ( - optionals enable16Bit [ - "np2kai" - ] - ++ optionals enable32Bit [ - "np21kai" - ] - ); - x11ConfigureFlags = concatStringsSep " " ( - ( - if ((enableHAXM && (enable16Bit || enable32Bit)) || (enable16Bit && enable32Bit)) then - [ - "--enable-build-all" - ] - else if enableHAXM then - [ - "--enable-haxm" - ] - else if enable32Bit then - [ - "--enable-ia32" - ] - else - [ ] - ) - ++ optionals (!isSDL2) [ - "--enable-sdl" - "--enable-sdlmixer" - "--enable-sdlttf" - - "--enable-sdl2=no" - "--enable-sdl2mixer=no" - "--enable-sdl2ttf=no" - ] - ); - x11BuildFlags = concatStringsSep " " [ - "SDL2_CONFIG=sdl2-config" - "SDL_CONFIG=sdl-config" - "SDL_CFLAGS=\"$(sdl${sdlInfix}-config --cflags)\"" - "SDL_LIBS=\"$(sdl${sdlInfix}-config --libs) -lSDL${sdlInfix}_mixer -lSDL${sdlInfix}_ttf\"" - ]; - x11Bins = concatStringsSep " " ( - optionals enable16Bit [ - "xnp2kai" - ] - ++ optionals enable32Bit [ - "xnp21kai" - ] - ++ optionals enableHAXM [ - "xnp21kai_haxm" - ] - ); -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "np2kai"; - version = "0.86rev22"; # update src.rev to commit rev accordingly + version = "0.86rev22-unstable-2024-12-22"; src = fetchFromGitHub { owner = "AZO234"; repo = "NP2kai"; - rev = "4a317747724669343e4c33ebdd34783fb7043221"; - sha256 = "0kxysxhx6jyk82mx30ni0ydzmwdcbnlxlnarrlq018rsnwb4md72"; + rev = "da219658c24c610ba82d5a07ea9897e8e0eef670"; + hash = "sha256-b0KOfqUgVtFuZxw8js6JCnzMh6Wh+f7o/IHcD6TiG1s="; }; - configurePhase = - '' - export GIT_VERSION=${builtins.substring 0 7 src.rev} - '' - + optionalString enableParallelBuilding '' - appendToVar buildFlags "-j$NIX_BUILD_CORES" - '' - + optionalString enableX11 '' - cd x11 - substituteInPlace Makefile.am \ - --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' - ./autogen.sh ${x11ConfigureFlags} - ./configure ${x11ConfigureFlags} - cd .. - ''; + # Don't require Git + # Use SDL2(_*) targets for correct includedirs + # Add return type in ancient code + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'if(NOT git_result EQUAL 0)' 'if(FALSE)' \ + --replace-fail "\''${SDL2_DEFINE}" "" \ + --replace-fail "\''${SDL2_INCLUDE_DIR}" "" \ + --replace-fail "\''${SDL2_LIBRARY}" "SDL2::SDL2" \ + --replace-fail "\''${SDL2_MIXER_DEFINE}" "" \ + --replace-fail "\''${SDL2_MIXER_INCLUDE_DIR}" "" \ + --replace-fail "\''${SDL2_MIXER_LIBRARY}" "SDL2_mixer::SDL2_mixer" \ + --replace-fail "\''${SDL2_TTF_DEFINE}" "" \ + --replace-fail "\''${SDL2_TTF_INCLUDE_DIR}" "" \ + --replace-fail "\''${SDL2_TTF_LIBRARY}" "SDL2_ttf::SDL2_ttf" \ + + substituteInPlace x/cmserial.c \ + --replace-fail 'convert_np2tocm(UINT port, UINT8* param, UINT32* speed) {' 'int convert_np2tocm(UINT port, UINT8* param, UINT32* speed) {' + substituteInPlace x/gtk2/gtk_menu.c \ + --replace-fail 'xmenu_visible_item(MENU_HDL hdl, const char *name, BOOL onoff)' 'int xmenu_visible_item(MENU_HDL hdl, const char *name, BOOL onoff)' + ''; + + strictDeps = true; nativeBuildInputs = - sdlDepsBuildonly - ++ optionals enableX11 [ - automake - autoconf - autoconf-archive - libtool + [ + cmake + ] + ++ lib.optionals enableX11 [ pkg-config - unzip - nasm ]; buildInputs = - sdlDepsTarget - ++ optionals enableX11 [ - gtk2 - libICE - libSM + [ libusb1 - libXxf86vm + openssl + SDL2 + SDL2_ttf + SDL2_mixer + ] + ++ lib.optionals enableX11 [ + fontconfig + freetype + glib + gtk2 + libX11 ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SDL" true) + (lib.cmakeBool "BUILD_X" enableX11) + (lib.cmakeBool "BUILD_HAXM" enableHAXM) + (lib.cmakeBool "BUILD_I286" enable16Bit) + + (lib.cmakeBool "USE_SDL" true) + (lib.cmakeBool "USE_SDL2" true) + (lib.cmakeBool "USE_SDL_MIXER" true) + (lib.cmakeBool "USE_SDL_TTF" true) + (lib.cmakeBool "USE_X" enableX11) + (lib.cmakeBool "USE_HAXM" enableHAXM) + ]; + enableParallelBuilding = true; - # TODO Remove when bumping past rev22 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; + env = { + NP2KAI_VERSION = finalAttrs.version; + NP2KAI_HASH = builtins.substring 0 7 finalAttrs.src.rev; + # GCC 14 incompatibility + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; - buildPhase = - optionalString enableSDL '' - cd sdl2 - for mkfile in ${sdlMakefiles}; do - substituteInPlace $mkfile \ - --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' - echo make -f $mkfile $buildFlags ${sdlBuildFlags} clean - make -f $mkfile $buildFlags ${sdlBuildFlags} clean - make -f $mkfile $buildFlags ${sdlBuildFlags} - done - cd .. - '' - + optionalString enableX11 '' - cd x11 - make $buildFlags ${x11BuildFlags} - cd .. - ''; + passthru.updateScript = unstableGitUpdater { + # 0.86 version prefix is implied, add it back for our versioning + tagConverter = lib.getExe (writeShellApplication { + name = "update-np2kai"; + text = '' + sed -e 's/^rev\./0.86rev/g' + ''; + }); + }; - installPhase = - optionalString enableSDL '' - cd sdl2 - for emu in ${sdlBins}; do - install -D -m 755 $emu $out/bin/$emu - done - cd .. - '' - + optionalString enableX11 '' - cd x11 - for emu in ${x11Bins}; do - install -D -m 755 $emu $out/bin/$emu - done - cd .. - ''; - - meta = with lib; { + meta = { description = "PC-9801 series emulator"; homepage = "https://github.com/AZO234/NP2kai"; - license = licenses.mit; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.x86; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ OPNA2608 ]; + mainProgram = "${if enableX11 then "x" else "sdl"}np21kai"; + platforms = lib.platforms.x86; }; -} +}) diff --git a/pkgs/by-name/np/npins/package.nix b/pkgs/by-name/np/npins/package.nix index 4b9269f11d14..dcd8873cc384 100644 --- a/pkgs/by-name/np/npins/package.nix +++ b/pkgs/by-name/np/npins/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, makeWrapper, - stdenv, - darwin, # runtime dependencies nix, # for nix-prefetch-url @@ -21,25 +19,24 @@ let in rustPlatform.buildRustPackage rec { pname = "npins"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "andir"; repo = "npins"; tag = version; - sha256 = "sha256-nTm6IqCHNFQLU7WR7dJRP7ktBctpE/O2LHbUV25roJA="; + sha256 = "sha256-PPk9Ve1pM3X7NfGeGb8Jiq4YDEwAjErP4xzGwLaakTU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-HnX7dkWLxa3DARXG8y9OVBRwvwgxwRIs4mWK3VNblG0="; + cargoHash = "sha256-YRW2TqbctuGC2M6euR4bb0m9a19m8WQVvWucRMpzkQE="; + buildNoDefaultFeatures = true; + buildFeatures = [ + "clap" + "crossterm" + "env_logger" + ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); nativeBuildInputs = [ makeWrapper ]; # (Almost) all tests require internet diff --git a/pkgs/by-name/np/npm-check-updates/package.nix b/pkgs/by-name/np/npm-check-updates/package.nix index 76deb6572676..bf48f44e0acc 100644 --- a/pkgs/by-name/np/npm-check-updates/package.nix +++ b/pkgs/by-name/np/npm-check-updates/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "npm-check-updates"; - version = "17.1.16"; + version = "18.0.1"; src = fetchFromGitHub { owner = "raineorshine"; repo = "npm-check-updates"; rev = "refs/tags/v${version}"; - hash = "sha256-yNo1W+Twzs3jG9bZzgjDLTxvZYCXY/FhoGtjlh6ZMZo="; + hash = "sha256-JVwjjGs1BCQnL9q4zwnQ56JRWL5CZ9cf4FyK2jpfKKE="; }; - npmDepsHash = "sha256-8jxuKxL7PEGYqK6kwSPnfmoQH4RLmL8sGi989RDBBSI="; + npmDepsHash = "sha256-75YPV96eKIhNVIT10ZYTJOVzJEFk98a2e4XUIoiYRd4="; postPatch = '' sed -i '/"prepare"/d' package.json diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix index c699118ca75e..3c8fe2fc3d2a 100644 --- a/pkgs/by-name/ns/nsc/package.nix +++ b/pkgs/by-name/ns/nsc/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.10.2"; + version = "2.11.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-F/9yAF1vXG4eWMmS6l/qWqlEV8YkS7nihHN2vK3JFbE="; + hash = "sha256-/xfNl91cb82kV2IC/m56p94nb3WLDPU5O+1H+sTZnW4="; }; ldflags = [ @@ -24,7 +24,7 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-MxkpK3CgQ+eoxGfLRqE3kudyZounDD0+cmzOoiPf1wc="; + vendorHash = "sha256-Ms+chBbQCo3TGWPgIy4OSXNpxO5jpm1zxEe9upiPmnY="; nativeBuildInputs = [ installShellFiles ]; @@ -47,7 +47,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.10.2.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.11.0.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/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch b/pkgs/by-name/ns/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch similarity index 100% rename from pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch rename to pkgs/by-name/ns/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch diff --git a/pkgs/by-name/ns/nspr/package.nix b/pkgs/by-name/ns/nspr/package.nix new file mode 100644 index 000000000000..236cdff3d954 --- /dev/null +++ b/pkgs/by-name/ns/nspr/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchurl, + buildPackages, + nixosTests, +}: + +stdenv.mkDerivation rec { + pname = "nspr"; + version = "4.36"; + + src = fetchurl { + url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; + hash = "sha256-Vd7DF/FAHNLl26hE00C5MKt1R/gYF5pAArzmLm8caJU="; + }; + + patches = [ + ./0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch + ]; + + outputs = [ + "out" + "dev" + ]; + outputBin = "dev"; + + preConfigure = + '' + cd nspr + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace configure --replace '@executable_path/' "$out/lib/" + substituteInPlace configure.in --replace '@executable_path/' "$out/lib/" + ''; + + HOST_CC = "cc"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + configureFlags = [ + "--enable-optimize" + "--disable-debug" + ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; + + postInstall = '' + find $out -name "*.a" -delete + moveToOutput share "$dev" # just aclocal + ''; + + enableParallelBuilding = true; + + passthru.tests = { + inherit (nixosTests) firefox firefox-esr; + }; + + meta = with lib; { + homepage = "https://firefox-source-docs.mozilla.org/nspr/index.html"; + description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; + maintainers = with maintainers; [ + ajs124 + hexa + ]; + platforms = platforms.all; + license = licenses.mpl20; + }; +} diff --git a/pkgs/by-name/ns/nsq/package.nix b/pkgs/by-name/ns/nsq/package.nix index fd7bc11e0649..f8290cf52916 100644 --- a/pkgs/by-name/ns/nsq/package.nix +++ b/pkgs/by-name/ns/nsq/package.nix @@ -29,5 +29,6 @@ buildGoModule rec { description = "Realtime distributed messaging platform"; changelog = "https://github.com/nsqio/nsq/raw/v${version}/ChangeLog.md"; license = licenses.mit; + maintainers = with maintainers; [ blakesmith ]; }; } diff --git a/pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch b/pkgs/by-name/nt/ntfs3g/autoconf-sbin-helpers.patch similarity index 100% rename from pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch rename to pkgs/by-name/nt/ntfs3g/autoconf-sbin-helpers.patch diff --git a/pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch b/pkgs/by-name/nt/ntfs3g/consistent-sbindir-usage.patch similarity index 100% rename from pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch rename to pkgs/by-name/nt/ntfs3g/consistent-sbindir-usage.patch diff --git a/pkgs/by-name/nt/ntfs3g/package.nix b/pkgs/by-name/nt/ntfs3g/package.nix new file mode 100644 index 000000000000..0c02ede8667f --- /dev/null +++ b/pkgs/by-name/nt/ntfs3g/package.nix @@ -0,0 +1,95 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + gettext, + mount, + libuuid, + kmod, + macfuse-stubs, + crypto ? false, + libgcrypt, + gnutls, +}: + +stdenv.mkDerivation rec { + pname = "ntfs3g"; + version = "2022.10.3"; + + outputs = [ + "out" + "dev" + "man" + "doc" + ]; + + src = fetchFromGitHub { + owner = "tuxera"; + repo = "ntfs-3g"; + rev = version; + sha256 = "sha256-nuFTsGkm3zmSzpwmhyY7Ke0VZfZU0jHOzEWaLBbglQk="; + }; + + buildInputs = + [ + gettext + libuuid + ] + ++ lib.optionals crypto [ + gnutls + libgcrypt + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + macfuse-stubs + ]; + + # Note: libgcrypt is listed here non-optionally because its m4 macros are + # being used in ntfs-3g's configure.ac. + nativeBuildInputs = [ + autoreconfHook + libgcrypt + pkg-config + ]; + + patches = [ + # https://github.com/tuxera/ntfs-3g/pull/39 + ./autoconf-sbin-helpers.patch + ./consistent-sbindir-usage.patch + ]; + + configureFlags = + [ + "--disable-ldconfig" + "--exec-prefix=\${prefix}" + "--enable-mount-helper" + "--enable-posix-acls" + "--enable-xattr-mappings" + "--${if crypto then "enable" else "disable"}-crypto" + "--enable-extras" + "--with-mount-helper=${mount}/bin/mount" + "--with-umount-helper=${mount}/bin/umount" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "--with-modprobe-helper=${kmod}/bin/modprobe" + ]; + + postInstall = '' + # Prefer ntfs-3g over the ntfs driver in the kernel. + ln -sv mount.ntfs-3g $out/sbin/mount.ntfs + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/tuxera/ntfs-3g"; + description = "FUSE-based NTFS driver with full write support"; + maintainers = with maintainers; [ dezgeg ]; + platforms = with platforms; darwin ++ linux; + license = with licenses; [ + gpl2Plus # ntfs-3g itself + lgpl2Plus # fuse-lite + ]; + }; +} diff --git a/pkgs/by-name/nt/ntl/package.nix b/pkgs/by-name/nt/ntl/package.nix index 028f0eae3423..82dc3bb533c5 100644 --- a/pkgs/by-name/nt/ntl/package.nix +++ b/pkgs/by-name/nt/ntl/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { homepage = "http://www.shoup.net/ntl/"; # also locally at "${src}/doc/tour-changes.html"; changelog = "https://www.shoup.net/ntl/doc/tour-changes.html"; - maintainers = teams.sage.members; + teams = [ teams.sage ]; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 59c65eab35af..8130882db143 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -5,15 +5,15 @@ unstableGitUpdater, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2025-03-23"; + version = "0-unstable-2025-05-15"; src = fetchFromGitHub { owner = "nushell"; - repo = pname; - rev = "e956708244820d2b98620ef0ed10e63cb7d42b3a"; - hash = "sha256-fzQ8f6mB7cVRbwVOCxPD/4nFmI3s5mXzJagn8us6ngA="; + repo = "nu_scripts"; + rev = "b2d512f6c67f68895a26136c6ce552281efbec6e"; + hash = "sha256-iC5Qmyn9vDr4b1BWtJkC3pl2dOam2Se51+ENvRdXlvA="; }; installPhase = '' @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Place to share Nushell scripts with each other"; homepage = "https://github.com/nushell/nu_scripts"; - license = lib.licenses.free; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.CardboardTurkey ]; diff --git a/pkgs/by-name/nu/nuclear/package.nix b/pkgs/by-name/nu/nuclear/package.nix index ad1b1ba9b0c5..f43355122561 100644 --- a/pkgs/by-name/nu/nuclear/package.nix +++ b/pkgs/by-name/nu/nuclear/package.nix @@ -5,7 +5,7 @@ }: let pname = "nuclear"; - version = "0.6.43"; + version = "0.6.47"; src = fetchurl { # Nuclear currently only publishes AppImage releases for x86_64, which is hardcoded in @@ -13,7 +13,7 @@ let # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose # source URL accordingly. url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - hash = "sha256-kruQ9h/0dYWIsjX8P2Em7v5weGd4B5hZbu/VldeAGRU="; + hash = "sha256-mwCQ6jddNF3knf1w0nztlyB/ijPsyjjV6aMcoYkadRI="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 63cd50a39d0c..0e910eff0737 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "10.1.6"; + version = "10.2.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; tag = "v${version}"; - hash = "sha256-4li7585M7Pp1/mzD91+tgZgsnoo/Hfy55O+7bEyxUtA="; + hash = "sha256-r2c6mmW/bLUGb8n1zvNJWrxyvSWBfPuTsU7tneeGaVE="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix index 74677277285c..ff0086db8572 100644 --- a/pkgs/by-name/nu/nuclei/package.nix +++ b/pkgs/by-name/nu/nuclei/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.4.1"; + version = "3.4.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; tag = "v${version}"; - hash = "sha256-ZSmyhNbZotNiqoXl4E+Pjap5zewPlwcTlPihcm4v6Qs="; + hash = "sha256-pZA7Alrn3E9w283nQ5G0sVaTd8/QqnMqa3WGaMsNllQ="; }; - vendorHash = "sha256-tTFEDTUM3ldH3/NtqYx4LyEazp7o5qZ6ionu01Vxwrw="; + vendorHash = "sha256-mrLXVfZR+OtinIsvRaEMss//oKl6IWDFcfS8ku05zx4="; proxyVendor = true; # hash mismatch between Linux and Darwin @@ -34,7 +34,7 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = [ "-version" ]; + versionCheckProgramArg = "-version"; meta = with lib; { description = "Tool for configurable targeted scanning"; diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index 5c5ccfecb46d..04f4046be16d 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage { pname = "nufmt"; - version = "0-unstable-2024-11-21"; + version = "0-unstable-2025-04-28"; src = fetchFromGitHub { owner = "nushell"; repo = "nufmt"; - rev = "628a3b73ea637c96f2c191ae066cf1cecadeafa3"; - hash = "sha256-ideILLOawU6BNawmr4lqt2LGkf29wvlwQe9gqgdYRiI="; + rev = "feafe695659c4d5153018a78fad949d088d8a480"; + hash = "sha256-4FnZIlZWuvSAXMQbdyONNrgIuMxH5Vq3MFbb8J2CnHM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index 2fe66b664409..eee8acabf6e9 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nu/numcpp/package.nix b/pkgs/by-name/nu/numcpp/package.nix index d0a495e4d6e3..c5972f050cc0 100644 --- a/pkgs/by-name/nu/numcpp/package.nix +++ b/pkgs/by-name/nu/numcpp/package.nix @@ -9,15 +9,17 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "numcpp"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "dpilger26"; repo = "NumCpp"; - rev = "Version_${finalAttrs.version}"; - hash = "sha256-+2xd8GNMSKPz801lfMAcHIkmidKd+xM8YblkdFj3HZk="; + tag = "Version_${finalAttrs.version}"; + hash = "sha256-8ghHTRneLeiFgzF9zHFjFu46qopc3l2Svku1H06XQTw="; }; + patches = [ ./pytest-CMakeLists.patch ]; + nativeCheckInputs = [ gtest python3 @@ -36,16 +38,16 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' substituteInPlace $out/share/NumCpp/cmake/NumCppConfig.cmake \ - --replace "\''${PACKAGE_PREFIX_DIR}/" "" + --replace-fail "\''${PACKAGE_PREFIX_DIR}/" "" ''; NIX_CFLAGS_COMPILE = "-Wno-error"; - meta = with lib; { + meta = { description = "Templatized Header Only C++ Implementation of the Python NumPy Library"; homepage = "https://github.com/dpilger26/NumCpp"; - license = licenses.mit; - maintainers = with maintainers; [ spalf ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ spalf ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/nu/numcpp/pytest-CMakeLists.patch b/pkgs/by-name/nu/numcpp/pytest-CMakeLists.patch new file mode 100644 index 000000000000..33bdb11e106a --- /dev/null +++ b/pkgs/by-name/nu/numcpp/pytest-CMakeLists.patch @@ -0,0 +1,18 @@ +add --embed to $PYTHON_LD_FLAGS and strip a preceding whitespace to conform to CMP0004 + +--- a/test/pytest/src/CMakeLists.txt ++++ b/test/pytest/src/CMakeLists.txt +@@ -56,11 +56,12 @@ find_package(Python 3.11 REQUIRED + if(UNIX) + execute_process( + COMMAND +- python3-config --ldflags ++ python3-config --embed --ldflags + OUTPUT_VARIABLE + PYTHON_LD_FLAGS + OUTPUT_STRIP_TRAILING_WHITESPACE + ) ++ string(STRIP ${PYTHON_LD_FLAGS} PYTHON_LD_FLAGS) + endif() + + target_link_libraries(${TARGET_NAME} PRIVATE diff --git a/pkgs/by-name/nu/numworks-epsilon/package.nix b/pkgs/by-name/nu/numworks-epsilon/package.nix index 337322bfb039..4280eb9ab4f8 100644 --- a/pkgs/by-name/nu/numworks-epsilon/package.nix +++ b/pkgs/by-name/nu/numworks-epsilon/package.nix @@ -11,6 +11,8 @@ gcc-arm-embedded, pkg-config, python3Packages, + makeDesktopItem, + copyDesktopItems, }: stdenv.mkDerivation rec { @@ -24,7 +26,11 @@ stdenv.mkDerivation rec { hash = "sha256-w9ddcULE1MrGnYcXA0qOg1elQv/eBhcXqhMSjWT3Bkk="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; + buildInputs = [ libpng libjpeg @@ -47,9 +53,38 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r ./output/release/simulator/linux/* $out/bin/ + # Build the logo + assets="$src/ion/src/simulator/assets" + logo_dir="$out/share/icons/hicolor/scalable/apps" + logo="$logo_dir/numworks.svg" + mkdir -p "$logo_dir" + + # Take opening svg tag + grep ' "$logo" + + # Insert path from logo mask and change color + grep path "$assets/icon_mask.svg" | sed 's/fill="[^"]*"/fill="#edb14b"/' >> "$logo" + + # Add remainder of logo + grep -v '> "$logo" + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "epsilon"; + exec = "epsilon"; + icon = "numworks"; + desktopName = "NumWorks Epsilon Calculator"; + categories = [ + "Utility" + "Math" + ]; + type = "Application"; + }) + ]; + meta = with lib; { description = "Simulator for Epsilon, a High-performance graphing calculator operating system"; homepage = "https://numworks.com/"; diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix index 0946695d21ad..4da4d7f0e896 100644 --- a/pkgs/by-name/nu/nurl/package.nix +++ b/pkgs/by-name/nu/nurl/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, installShellFiles, makeBinaryWrapper, - stdenv, - darwin, gitMinimal, mercurial, nixForLinking, @@ -30,10 +28,6 @@ rustPlatform.buildRustPackage rec { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # tests require internet access doCheck = false; diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index 0998757de52a..4b42bcf6d857 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.15.2"; + version = "1.16.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-GMgGnsEKItVgQLwk6gY8pU6lIGoGGWPGhkBJwmVRy+Q="; + hash = "sha256-7hTlY/WKJaw+ZMSn8A5F0p1vhg67NUY/CCjw7xdOg2M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix index aa4f28e72e83..7543a52d4634 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix @@ -1,7 +1,7 @@ { lib, glibc, - fetchFromGitLab, + fetchFromGitHub, makeWrapper, buildGoModule, formats, @@ -26,14 +26,14 @@ let cliVersionPackage = "github.com/NVIDIA/nvidia-container-toolkit/internal/info"; in buildGoModule rec { - pname = "container-toolkit/container-toolkit"; - version = "1.15.0-rc.3"; + pname = "nvidia-container-toolkit"; + version = "1.17.6"; - src = fetchFromGitLab { - owner = "nvidia"; + src = fetchFromGitHub { + owner = "NVIDIA"; repo = pname; rev = "v${version}"; - hash = "sha256-IH2OjaLbcKSGG44aggolAOuJkjk+GaXnnTbrXfZ0lVo="; + hash = "sha256-MQQTQ6AaoA4VIAT7YPo3z6UbZuKHjOvu9sW2975TveM="; }; @@ -51,23 +51,26 @@ buildGoModule rec { ]; postPatch = '' - # Replace the default hookDefaultFilePath to the $out path and override - # default ldconfig locations to the one in nixpkgs. - substituteInPlace internal/config/config.go \ - --replace '/usr/bin/nvidia-container-runtime-hook' "$out/bin/nvidia-container-runtime-hook" \ - --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' - - substituteInPlace internal/config/config_test.go \ - --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' + --replace-fail '/usr/bin/nvidia-container-runtime-hook' "$tools/bin/nvidia-container-runtime-hook" \ + --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' substituteInPlace tools/container/toolkit/toolkit.go \ - --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' + --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' - substituteInPlace cmd/nvidia-ctk/hook/update-ldcache/update-ldcache.go \ - --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' + substituteInPlace cmd/nvidia-cdi-hook/update-ldcache/update-ldcache.go \ + --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' ''; + subPackages = [ + "cmd/nvidia-cdi-hook" + "cmd/nvidia-container-runtime" + "cmd/nvidia-container-runtime.cdi" + "cmd/nvidia-container-runtime-hook" + "cmd/nvidia-container-runtime.legacy" + "cmd/nvidia-ctk" + ]; + # Based on upstream's Makefile: # https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L64 ldflags = [ @@ -78,6 +81,8 @@ buildGoModule rec { # "-X name=value" "-X" "${cliVersionPackage}.version=${version}" + "-X" + "github.com/NVIDIA/nvidia-container-toolkit/internal/info.gitCommit=${src.rev}" ]; nativeBuildInputs = [ @@ -100,11 +105,13 @@ buildGoModule rec { postInstall = '' - wrapProgram $out/bin/nvidia-container-runtime-hook \ - --prefix PATH : ${libnvidia-container}/bin - mkdir -p $tools/bin - mv $out/bin/{containerd,crio,docker,nvidia-toolkit,toolkit} $tools/bin + mv $out/bin/{nvidia-cdi-hook,nvidia-container-runtime,nvidia-container-runtime.cdi,nvidia-container-runtime-hook,nvidia-container-runtime.legacy} $tools/bin + + for bin in nvidia-container-runtime-hook nvidia-container-runtime; do + wrapProgram $tools/bin/$bin \ + --prefix PATH : ${libnvidia-container}/bin:$out/bin + done '' + lib.optionalString (configTemplate != null || configTemplatePath != null) '' mkdir -p $out/etc/nvidia-container-runtime @@ -120,6 +127,9 @@ buildGoModule rec { description = "NVIDIA Container Toolkit"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cpcloud ]; + maintainers = with maintainers; [ + cpcloud + christoph-heiss + ]; }; } diff --git a/pkgs/by-name/nv/nvidia-modprobe/package.nix b/pkgs/by-name/nv/nvidia-modprobe/package.nix index 594e92923936..49fe0a66051a 100644 --- a/pkgs/by-name/nv/nvidia-modprobe/package.nix +++ b/pkgs/by-name/nv/nvidia-modprobe/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "nvidia-modprobe"; - version = "570.133.07"; + version = "575.51.02"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; rev = version; - hash = "sha256-6/1g66Mr0Ru4V3JMTRXet1aiNa0wrTIGw84QPrCO85c="; + hash = "sha256-3iQySxYLG+GwtACeY7n5IwUSc0dVVgu6S0y+XMmv7AU="; }; nativeBuildInputs = [ gnum4 ]; diff --git a/pkgs/by-name/nv/nvidia_oc/package.nix b/pkgs/by-name/nv/nvidia_oc/package.nix index 81ac7156d3c4..b3e6bcf783a4 100644 --- a/pkgs/by-name/nv/nvidia_oc/package.nix +++ b/pkgs/by-name/nv/nvidia_oc/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "nvidia_oc"; - version = "0.1.19"; + version = "0.1.20"; src = fetchFromGitHub { owner = "Dreaming-Codes"; repo = "nvidia_oc"; tag = version; - hash = "sha256-OYQuCNHByt9y6XGIayCw8uvZHeITqRk8PV06+pT0dhA="; + hash = "sha256-2BijC+LDZJKEheZVlqG+EP6+/GSRLNQfxPEUKCY8lfU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-94uoOzbC1ocK1LWHArUYqfaBFzOUQNSLPKnMRXXjBQ0="; + cargoHash = "sha256-Xt+0clazawNvc9iIX6PR76NlyuJnjCTMkI/k2JzJ6nw="; nativeBuildInputs = [ autoAddDriverRunpath @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Simple command line tool to overclock Nvidia GPUs using the NVML library on Linux"; diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index f75292ff8575..9436ba6386b7 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "XuehaiPan"; repo = "nvitop"; tag = "v${version}"; - hash = "sha256-2l/VfqgV2UmMVad3UYASjYFu/Mzp2K2XNQFUDq1XM9k="; + hash = "sha256-1WL1S6jUbCLtuAe223AAmCcOcLZ0rStE04uCd0L9gVw="; }; pythonRelaxDeps = [ "nvidia-ml-py" ]; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Interactive NVIDIA-GPU process viewer, the one-stop solution for GPU process management"; diff --git a/pkgs/by-name/nv/nvrh/package.nix b/pkgs/by-name/nv/nvrh/package.nix index 3fc4a45aaeca..fd964d0f4af7 100644 --- a/pkgs/by-name/nv/nvrh/package.nix +++ b/pkgs/by-name/nv/nvrh/package.nix @@ -40,7 +40,7 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix index 2cc7265359e6..90eaa3c6b0fc 100644 --- a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix +++ b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-dock-hyprland"; tag = "v${version}"; - hash = "sha256-l2JB+CmdQg/bDXneJ+rjv4z6xjB+BERh0rLZFETCMtE="; + hash = "sha256-zpQou/ABWIYg5QRynfrzPI3YOuNzpU5wHYZwutXwFc0="; }; - vendorHash = "sha256-3ubDvtl/FvVyoRMRNBhwCoIJkJNFvlrWue+cNNGe5eI="; + vendorHash = "sha256-ZR/vF7ogOEhyKQr35ew3OmYLVeudt51W8b734SZXvC0="; ldflags = [ "-s" diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index f8be91ed1719..f38232fbec1a 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -13,16 +13,16 @@ let pname = "nwg-drawer"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-uctM2fi3lfSrvKSinkjAXD3bLyJOVC0DTyDoAKXgB54="; + hash = "sha256-M0+4/lr79CYBy2+ysB1Wb1obD7B/Qi8MBwNhIsiIDak="; }; - vendorHash = "sha256-VW9K56pdzA6CAqyJ859WOCEtHTASW8lnQGuW1zBUJYw="; + vendorHash = "sha256-1uZTZ7/p1l4Rue3mxlaMRSDfyARo94wR4KIKkQXBUMQ="; in buildGoModule { inherit @@ -63,7 +63,7 @@ buildGoModule { description = "Application drawer for sway Wayland compositor"; homepage = "https://github.com/nwg-piotr/nwg-drawer"; changelog = "https://github.com/nwg-piotr/nwg-drawer/releases/tag/${src.rev}"; - license = with lib.licenses; [ mit ]; + license = with lib.licenses; [ agpl3Plus ]; mainProgram = "nwg-drawer"; maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; diff --git a/pkgs/by-name/nw/nwg-hello/package.nix b/pkgs/by-name/nw/nwg-hello/package.nix index 8ba4a1eb289c..a99cc11c4be5 100644 --- a/pkgs/by-name/nw/nwg-hello/package.nix +++ b/pkgs/by-name/nw/nwg-hello/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "nwg-hello"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-hello"; tag = "v${version}"; - hash = "sha256-cIRHvDTEaKHwOg9F/roE+8axl2f0hZIqVNe3xs/T9Ag="; + hash = "sha256-yevcHctVnUWuPsdB+KN+Uuxg+iGdzP7WOOTMUvVmuEY="; }; nativeBuildInputs = [ @@ -39,15 +39,15 @@ python3Packages.buildPythonApplication rec { postPatch = '' # hard coded paths substituteInPlace nwg_hello/main.py \ - --replace '/etc/nwg-hello' "$out/etc/nwg-hello" \ - --replace "/usr/share/xsessions" "/run/current-system/sw/share/xsessions" \ - --replace "/usr/share/wayland-sessions" "/run/current-system/sw/share/wayland-sessions" + --replace-fail '/etc/nwg-hello' "$out/etc/nwg-hello" \ + --replace-fail "/usr/share/xsessions" "/run/current-system/sw/share/xsessions" \ + --replace-fail "/usr/share/wayland-sessions" "/run/current-system/sw/share/wayland-sessions" substituteInPlace nwg-hello-default.json \ - --replace "/usr/share/xsessions" "/run/current-system/sw/share/xsessions" \ - --replace "/usr/share/wayland-sessions" "/run/current-system/sw/share/wayland-sessions" + --replace-fail "/usr/share/xsessions" "/run/current-system/sw/share/xsessions" \ + --replace-fail "/usr/share/wayland-sessions" "/run/current-system/sw/share/wayland-sessions" - substituteInPlace nwg_hello/ui.py --replace '/usr/share/nwg-hello' "$out/share/nwg-hello" + substituteInPlace nwg_hello/ui.py --replace-fail '/usr/share/nwg-hello' "$out/share/nwg-hello" ''; postInstall = '' @@ -68,7 +68,7 @@ python3Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/nwg-piotr/nwg-hello"; - changelog = "https://github.com/nwg-piotr/nwg-hello/releases/tag/v${version}"; + changelog = "https://github.com/nwg-piotr/nwg-hello/releases/tag/${src.tag}"; description = "GTK3-based greeter for the greetd daemon, written in python"; license = lib.licenses.mit; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/nw/nwg-icon-picker/package.nix b/pkgs/by-name/nw/nwg-icon-picker/package.nix new file mode 100644 index 000000000000..9d5235a6b073 --- /dev/null +++ b/pkgs/by-name/nw/nwg-icon-picker/package.nix @@ -0,0 +1,54 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + wrapGAppsHook3, + gobject-introspection, + gtk3, +}: +python3Packages.buildPythonApplication rec { + pname = "nwg-icon-picker"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = "nwg-icon-picker"; + tag = "v${version}"; + hash = "sha256-Gm3JhS6eq2mSex4VFe71tRf13qWDCSqXoiMvNIhu9Sw="; + }; + + build-system = with python3Packages; [ + setuptools + wrapGAppsHook3 + gobject-introspection + ]; + + dependencies = with python3Packages; [ + pygobject3 + gtk3 + ]; + + postInstall = '' + install -Dm444 -t $out/share/pixmaps/ nwg-icon-picker.svg + install -Dm444 -t $out/share/applications/ nwg-icon-picker.desktop + ''; + + # prevent double wrapped binary + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + pythonImportsCheck = [ + "gi" + ]; + + meta = { + description = "GTK icon chooser with a text search option"; + homepage = "https://github.com/nwg-piotr/nwg-icon-picker"; + license = lib.licenses.mit; + mainProgram = "nwg-icon-picker"; + maintainers = with lib.maintainers; [ quantenzitrone ]; + }; +} diff --git a/pkgs/by-name/nw/nwg-look/package.nix b/pkgs/by-name/nw/nwg-look/package.nix index ad5a42a26d99..96a9e5b19964 100644 --- a/pkgs/by-name/nw/nwg-look/package.nix +++ b/pkgs/by-name/nw/nwg-look/package.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "nwg-look"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-look"; rev = "v${version}"; - hash = "sha256-oP+qcOu03ZKQRdvPKCRVL187QP3gAg2dyvRO94N7+GE="; + hash = "sha256-SyGyW4Hq0zT+jBrCmsuG+9Smcu4ruP6+aR3VUK205MM="; }; - vendorHash = "sha256-KzAozP9pfqoFOgK+/xmwsI0m2QWAVW/b+hoWHlQoVX0="; + vendorHash = "sha256-8ooWJTOC4fmuu+/Dy7JOaGSO5YlsMfKcf2lyv2ojJIw="; ldflags = [ "-s" diff --git a/pkgs/by-name/nw/nwg-menu/package.nix b/pkgs/by-name/nw/nwg-menu/package.nix index 1499989b0451..7942430a26db 100644 --- a/pkgs/by-name/nw/nwg-menu/package.nix +++ b/pkgs/by-name/nw/nwg-menu/package.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "nwg-menu"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-menu"; rev = "v${version}"; - sha256 = "sha256-pWdLSoTeRgr5FPdBWMTVdsnijuwu8fLuNkyIRZ+JEe8="; + sha256 = "sha256-Ce8hxFVCj/No2Sb6avQ9ogMPTJXDcWxa3GFfsczq1+E="; }; - vendorHash = "sha256-iR+ytThRwmCvFEMcpSELPRwiramN5jPXAjaJtda4pOw="; + vendorHash = "sha256-53lRO4Ct20jYJY7JRElx9MWzb+TEm8KIIJZF3OfL1kQ="; doCheck = false; diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix index dcf88c90c63b..cb77ab815cd7 100644 --- a/pkgs/by-name/nw/nwg-panel/package.nix +++ b/pkgs/by-name/nw/nwg-panel/package.nix @@ -23,13 +23,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.62"; + version = "0.10.2"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; tag = "v${version}"; - hash = "sha256-h+lhk3gqJj3/GZ8S4vnUE8UaunmT1KcaGquSb/I+kpI="; + hash = "sha256-Wml9FXktLjTtYWTE/yoYDwFcPXeL1zhY3VgzrMW8DzE="; }; # No tests @@ -91,7 +91,7 @@ python3Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/nwg-piotr/nwg-panel"; - changelog = "https://github.com/nwg-piotr/nwg-panel/releases/tag/v${version}"; + changelog = "https://github.com/nwg-piotr/nwg-panel/releases/tag/${src.tag}"; description = "GTK3-based panel for Sway window manager"; license = lib.licenses.mit; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix index ec73eaff2289..1edc91a41dc4 100644 --- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix +++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix @@ -7,7 +7,7 @@ let bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32"; - version = "0.97.0"; + version = "0.98.2"; in stdenv.mkDerivation { pname = "nwjs-ffmpeg-prebuilt"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { src = let hashes = { - "x64" = "sha256-Z4AS8qjDgbXhpzLVspc4Y/78kdmwuqB2wtsjQ3MjMzE="; - "ia32" = "sha256-Z4AS8qjDgbXhpzLVspc4Y/78kdmwuqB2wtsjQ3MjMzE="; + "x64" = "sha256-Bx2Mz9RniryLdOFP11p+wp7o1b83LwbkOIXPYAXQdOk="; + "ia32" = "sha256-Bx2Mz9RniryLdOFP11p+wp7o1b83LwbkOIXPYAXQdOk="; }; in fetchurl { diff --git a/pkgs/by-name/nz/nzbget/package.nix b/pkgs/by-name/nz/nzbget/package.nix index 6e4b8f629fe6..cdc87663cd6b 100644 --- a/pkgs/by-name/nz/nzbget/package.nix +++ b/pkgs/by-name/nz/nzbget/package.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nzbget"; - version = "24.8"; + version = "25.0"; src = fetchFromGitHub { owner = "nzbgetcom"; repo = "nzbget"; rev = "v${finalAttrs.version}"; - hash = "sha256-jsCjiZQ5Li+PKAfeMliAe341f8kn7QgUjUKciP5CdKE="; + hash = "sha256-PtmXirnaQH9viFWUdNEDwJ/pgQjm2N1Or13V4ozUUGI="; }; patches = [ diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index 23c7cbf19ea9..1fa9cd840c55 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "7.12.3"; + version = "7.13.0"; src = fetchzip { url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip"; - hash = "sha256-uTtkMusIhDbD+CojOSJ59Kqo6iSuIqWLqd6T5tYuX4k="; + hash = "sha256-jMiSVzAulM7xs6Z3KYIFHjJHx8dWFVbr/PqNeItV81g="; stripRoot = false; }; diff --git a/pkgs/by-name/oa/oakctl/package.nix b/pkgs/by-name/oa/oakctl/package.nix new file mode 100644 index 000000000000..1b0de871f1d0 --- /dev/null +++ b/pkgs/by-name/oa/oakctl/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchurl, + libgcc, + autoPatchelfHook, + testers, + oakctl, +}: + +let + version = "0.2.12"; + + # Note: Extracted from install script + # https://oakctl-releases.luxonis.com/oakctl-installer.sh + sources = { + x86_64-linux = fetchurl { + url = "https://oakctl-releases.luxonis.com/data/${version}/linux_x86_64/oakctl"; + hash = "sha256-HCnFD0LD6sQp9k3SP2g4svjA5/kLvfrnN+IwiuMWGCY="; + }; + aarch64-linux = fetchurl { + url = "https://oakctl-releases.luxonis.com/data/${version}/linux_aarch64/oakctl"; + hash = "sha256-1oJQs57/tW3rsMM+LAuKiBUf1aKOKFoPQAMcVUfXqlE="; + }; + aarch64-darwin = fetchurl { + url = "https://oakctl-releases.luxonis.com/data/${version}/darwin_arm64/oakctl"; + hash = "sha256-arS2qfd/Z/ZCNWAKD9bc2PMwkhVtO5WViTibMST7zd8="; + }; + x86_64-darwin = fetchurl { + url = "https://oakctl-releases.luxonis.com/data/${version}/darwin_x86_64/oakctl"; + hash = "sha256-yyvDQbFEtlB8xmdbxquy22wAIUcCSVchP/AuSpi4TAU="; + }; + }; + + src = + sources.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +stdenv.mkDerivation (finalAttrs: { + pname = "oakctl"; + inherit version src; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + passthru.tests.version = testers.testVersion { + command = "HOME=$TMPDIR oakctl version"; + package = oakctl; + }; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libgcc ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -D -m 0755 $src $out/bin/${finalAttrs.pname} + + runHook postInstall + ''; + + # Note: The command 'oakctl self-update' won't work as the binary is located in the nix/store + meta = { + description = "Tool to interact with Luxonis OAK4 cameras"; + homepage = "https://rvc4.docs.luxonis.com/software/tools/oakctl"; + license = lib.licenses.unfree; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + mainProgram = "oakctl"; + maintainers = with lib.maintainers; [ phodina ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/oa/oama/generated-package.nix b/pkgs/by-name/oa/oama/generated-package.nix index f024cc98466d..e78d118a8e0b 100644 --- a/pkgs/by-name/oa/oama/generated-package.nix +++ b/pkgs/by-name/oa/oama/generated-package.nix @@ -10,6 +10,7 @@ fetchgit, hsyslog, http-conduit, + http-types, lib, mtl, network, @@ -30,11 +31,11 @@ }: mkDerivation { pname = "oama"; - version = "0.14"; + version = "0.20.1"; src = fetchgit { url = "https://github.com/pdobsan/oama.git"; - sha256 = "1hdhkc6hh4nvx31vkaii7hd2rxlwqrsvr6i1i0a9r1xlda05ffq0"; - rev = "4e1ffd3001034771d284678f0160060c1871707c"; + sha256 = "sha256-59tKAHL7rCZJyfraD7NnwFR5iP6784IcgH82hfsFHiA="; + rev = "99659a8567808b28885ed241abe4df03f37e92fc"; fetchSubmodules = true; }; isLibrary = true; @@ -47,6 +48,7 @@ mkDerivation { directory hsyslog http-conduit + http-types mtl network network-uri @@ -72,6 +74,7 @@ mkDerivation { directory hsyslog http-conduit + http-types mtl network network-uri diff --git a/pkgs/by-name/oa/oama/package.nix b/pkgs/by-name/oa/oama/package.nix index 73a275f431e0..d68fc20ae775 100644 --- a/pkgs/by-name/oa/oama/package.nix +++ b/pkgs/by-name/oa/oama/package.nix @@ -1,6 +1,5 @@ { haskell, - haskellPackages, lib, stdenv, }: @@ -15,7 +14,7 @@ let passthru.updateScript = ./update.sh; }; - raw-pkg = haskellPackages.callPackage ./generated-package.nix { }; + raw-pkg = haskell.packages.ghc912.callPackage ./generated-package.nix { }; in lib.pipe raw-pkg [ (overrideCabal overrides) diff --git a/pkgs/by-name/oa/oama/update.sh b/pkgs/by-name/oa/oama/update.sh index 60d1c74cbca1..45af4b99fe59 100755 --- a/pkgs/by-name/oa/oama/update.sh +++ b/pkgs/by-name/oa/oama/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix curl jq nixfmt-rfc-style +#!nix-shell -i bash -p haskell.packages.ghc910.cabal2nix nix-prefetch-git curl jq nixfmt-rfc-style set -euo pipefail diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index b463c5d0695b..f6bd1318e80a 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -6,12 +6,12 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.8.1"; + version = "7.9.0"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "sha256-NU9/BLyTEWGqt9SJNbvF4kSG/op8TEpYV2A24/V29PM="; + sha256 = "sha256-ykC29q7/rTv7POGETMiypj9CQYdYVo7rjT5B+3nfj/U="; rev = "v${version}"; }; @@ -19,7 +19,7 @@ buildGoModule rec { ./fix-tests-go-1.24.diff ]; - vendorHash = "sha256-t/SJjh9bcsIevr3S0ysDlvtaIGzkks+qvfXF5/SEidE="; + vendorHash = "sha256-KIu/NSKaXLutlY8757haAlsyuHUZjkDZ6D10lJ08uCM="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X main.VERSION=${version}" ]; @@ -28,7 +28,7 @@ buildGoModule rec { description = "Reverse proxy that provides authentication with Google, Github, or other providers"; homepage = "https://github.com/oauth2-proxy/oauth2-proxy/"; license = licenses.mit; - maintainers = teams.serokell.members; + teams = [ teams.serokell ]; mainProgram = "oauth2-proxy"; }; } diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index 5c8f86b09648..e0dfc358d0e1 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "oboete"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "mariinkys"; repo = "oboete"; tag = version; - hash = "sha256-tQn3ihGHkR91zNtBIiyyIEEo21Q0ZSKLEaV/3UI9pwU="; + hash = "sha256-Xs9o6V/rUtRkUp7F2hJXLz8PP7XWtqx4uaONo3Q23uo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-91JMgdpMXL0a7oZXAG5xgiulOIyVXQ5x09wN3XDeSy0="; + cargoHash = "sha256-bhSkQcDqYhkRwqLbiOLXprQnMqjDKRetZ97K1ES5hrw="; nativeBuildInputs = [ libcosmicAppHook ]; diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index 2777931a8361..8b300de3879c 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -4,26 +4,26 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "obs-cmd"; - version = "0.18.2"; + version = "0.18.4"; src = fetchFromGitHub { owner = "grigio"; repo = "obs-cmd"; - rev = "v${version}"; - hash = "sha256-plNLVBSTen11q945qtDBJaNTWKGICbuWokyvRzhu0Wg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/LgQqxZqxbE8hgip+yl8VVjiRYD+6AblKag2MQo1gDs="; }; useFetchCargoVendor = true; cargoHash = "sha256-ZKHm6N7y5FbDFiK2QfQ+9siexgzrdLpBs5Xikh1SRLo="; - meta = with lib; { + meta = { description = "Minimal CLI to control OBS Studio via obs-websocket"; homepage = "https://github.com/grigio/obs-cmd"; - changelog = "https://github.com/grigio/obs-cmd/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + changelog = "https://github.com/grigio/obs-cmd/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; mainProgram = "obs-cmd"; }; -} +}) diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index beae1bf30a37..d845b9ec919c 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -12,7 +12,7 @@ }: let pname = "obsidian"; - version = "1.8.9"; + version = "1.8.10"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -36,9 +36,9 @@ let url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; hash = if stdenv.hostPlatform.isDarwin then - "sha256-OPK5GI0P52zk7EF8Gk5i15N/WddbNjS47YNy55o2A8k=" + "sha256-3BiPbT1ME75WpR/mTDl8/TI+yq6+WMU+RaZXykUG8yE=" else - "sha256-XVq0nQiyT2HvKQpzJIvhghsGgg4ye7uqZcyA1nH4O/o="; + "sha256-xZoi4Z9JMM/FEPfvjBXEag3pT/uJH9dvFp8qHnTFNKE="; }; icon = fetchurl { diff --git a/pkgs/by-name/oc/ocenaudio/package.nix b/pkgs/by-name/oc/ocenaudio/package.nix index a6f62dd127ed..d75dde3ab0ba 100644 --- a/pkgs/by-name/oc/ocenaudio/package.nix +++ b/pkgs/by-name/oc/ocenaudio/package.nix @@ -1,10 +1,10 @@ { - stdenv, lib, + stdenv, fetchurl, autoPatchelfHook, dpkg, - qt5, + qt6, libjack2, alsa-lib, bzip2, @@ -12,54 +12,55 @@ xz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ocenaudio"; - version = "3.13.8"; + version = "3.14.11"; src = fetchurl { - url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=v${version}"; - hash = "sha256-GKNho2xV6Lc4U5Ys4j+ZiGxE8irolcrTttN3PG1S2Ug="; + name = "ocenaudio.deb"; + url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian12.deb?version=v${finalAttrs.version}"; + hash = "sha256-+UQ4veSoqwNC6ENQVWmOFebiI6RQlV7rBL7n238xxyc="; }; nativeBuildInputs = [ - alsa-lib autoPatchelfHook - bzip2 - libjack2 - libpulseaudio - qt5.qtbase - qt5.wrapQtAppsHook - xz + qt6.wrapQtAppsHook + dpkg ]; - buildInputs = [ dpkg ]; + buildInputs = [ + xz + qt6.qtbase + bzip2 + libjack2 + alsa-lib + libpulseaudio + ]; - dontUnpack = true; dontBuild = true; dontStrip = true; installPhase = '' - mkdir -p $out - dpkg -x $src $out - cp -av $out/opt/ocenaudio/* $out - rm -rf $out/opt - mv $out/usr/share $out/share - rm -rf $out/usr + runHook preInstall + + cp -r opt/ocenaudio $out + cp -r usr/share $out/share substituteInPlace $out/share/applications/ocenaudio.desktop \ --replace-fail "/opt/ocenaudio/bin/ocenaudio" "ocenaudio" mkdir -p $out/share/licenses/ocenaudio mv $out/bin/ocenaudio_license.txt $out/share/licenses/ocenaudio/LICENSE - # Create symlink bzip2 library ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/libbz2.so.1.0 + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Cross-platform, easy to use, fast and functional audio editor"; homepage = "https://www.ocenaudio.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ onny ]; + maintainers = with lib.maintainers; [ onny ]; }; -} +}) diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index 4622f8a6b976..5061eb018613 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -25,14 +25,14 @@ in py.pkgs.buildPythonApplication rec { pname = "oci-cli"; - version = "3.54.0"; + version = "3.55.0"; format = "setuptools"; src = fetchFromGitHub { owner = "oracle"; repo = pname; tag = "v${version}"; - hash = "sha256-UzjXnjYTXdTJAl9MRPJEjQ10EM4U5gDtK0na5fnxp6A="; + hash = "sha256-+XKoB8lychQJXjrYA536TSYYYSeRsSAfgi6ER2tLaqA="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix b/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix index 3e572473abde..7814da4e5965 100644 --- a/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix +++ b/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix @@ -11,12 +11,12 @@ buildGoModule rec { pname = "oci-seccomp-bpf-hook"; - version = "1.2.10"; + version = "1.2.11"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "sha256-bWlm+JYNf7+faKSQfW5fhxoH/D2I8ujjakswH+1r49o="; + sha256 = "sha256-1LRwbKOLNBkY/TMTLlWq2lkFzCabXqwdaMRT9HNr6HE="; }; vendorHash = null; diff --git a/pkgs/by-name/oc/ockam/package.nix b/pkgs/by-name/oc/ockam/package.nix new file mode 100644 index 000000000000..70d4ffc4f253 --- /dev/null +++ b/pkgs/by-name/oc/ockam/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + git, + nix-update-script, + pkg-config, + openssl, + dbus, +}: + +let + pname = "ockam"; + version = "0.138.0"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "build-trust"; + repo = pname; + rev = "ockam_v${version}"; + hash = "sha256-AY0i7qXA7JXfIEY0htmL+/yn71xAuh7WowXOs2fD6n8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Mt/UFVFLZRrY8Mka4VFi6J2XjBjFsnJPi9tnBVZ6a5E="; + nativeBuildInputs = [ + git + pkg-config + ]; + buildInputs = [ + openssl + dbus + ]; + + passthru.updateScript = nix-update-script { }; + + # too many tests fail for now + doCheck = false; + + meta = with lib; { + description = "Orchestrate end-to-end encryption, cryptographic identities, mutual authentication, and authorization policies between distributed applications – at massive scale"; + homepage = "https://github.com/build-trust/ockam"; + license = licenses.mpl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/by-name/oc/ocl-icd/package.nix b/pkgs/by-name/oc/ocl-icd/package.nix index ba360ae32f75..3c44fa98db25 100644 --- a/pkgs/by-name/oc/ocl-icd/package.nix +++ b/pkgs/by-name/oc/ocl-icd/package.nix @@ -26,9 +26,14 @@ stdenv.mkDerivation rec { buildInputs = [ opencl-headers ] ++ lib.optionals stdenv.hostPlatform.isWindows [ windows.dlfcn ]; - configureFlags = [ - "--enable-custom-vendordir=/run/opengl-driver/etc/OpenCL/vendors" - ]; + configureFlags = + [ + "--enable-custom-vendordir=/run/opengl-driver/etc/OpenCL/vendors" + ] + ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; # fixes: can't build x86_64-w64-mingw32 shared library unless -no-undefined is specified makeFlags = lib.optionals stdenv.hostPlatform.isWindows [ "LDFLAGS=-no-undefined" ]; diff --git a/pkgs/by-name/oc/ocm/package.nix b/pkgs/by-name/oc/ocm/package.nix index 0b023d981518..f9b2fa28dbad 100644 --- a/pkgs/by-name/oc/ocm/package.nix +++ b/pkgs/by-name/oc/ocm/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "ocm"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-K/hAxzstRY0Mh7qYMqwWfIbop+AhgzvPZsrZo8eTzsQ="; + sha256 = "sha256-0JCmKuSVuSOinJiLDT4dOKNON6PnICum6Smnf3syJfM="; }; - vendorHash = "sha256-RQioZq/fdqr6baTTDeLUhFh/dlByNM5Ys0L4pAYXkHI="; + vendorHash = "sha256-kTgTRRSJe3zvgoy923FRtomJpXqnK1t7MF53QAidyuo="; # Strip the final binary. ldflags = [ diff --git a/pkgs/by-name/oc/ocserv/package.nix b/pkgs/by-name/oc/ocserv/package.nix index 60ce8def4355..c8b6935b8629 100644 --- a/pkgs/by-name/oc/ocserv/package.nix +++ b/pkgs/by-name/oc/ocserv/package.nix @@ -18,6 +18,7 @@ ronn, pam, libxcrypt, + oath-toolkit, }: stdenv.mkDerivation (finalAttrs: { @@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { lz4 pam libxcrypt + oath-toolkit ]; meta = { diff --git a/pkgs/by-name/oc/ocsp-server/package.nix b/pkgs/by-name/oc/ocsp-server/package.nix index b5b9bbbde056..736beb3efb4f 100644 --- a/pkgs/by-name/oc/ocsp-server/package.nix +++ b/pkgs/by-name/oc/ocsp-server/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/oc/octodns/package.nix b/pkgs/by-name/oc/octodns/package.nix new file mode 100644 index 000000000000..5b6aa4ecdea1 --- /dev/null +++ b/pkgs/by-name/oc/octodns/package.nix @@ -0,0 +1,79 @@ +{ + lib, + fetchFromGitHub, + python3, + runCommand, + + # passthru + octodns, +}: +let + # Export `python` with `octodns` as a module for `octodns-providers`. + python = python3.override { + self = python; + packageOverrides = final: prev: { + octodns = final.toPythonModule octodns; + }; + }; + python3Packages = python.pkgs; +in +python3Packages.buildPythonApplication rec { + pname = "octodns"; + version = "1.11.0"; + pyproject = true; + + disabled = python.pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns"; + tag = "v${version}"; + hash = "sha256-zCEfg6AAyclDBzSVQiGrE8Ol/9C7STq0VChepBt73GQ="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + dnspython + fqdn + idna + natsort + python-dateutil + pyyaml + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "octodns" ]; + + passthru = { + providers = lib.recurseIntoAttrs ( + lib.packagesFromDirectoryRecursive { + inherit (python3Packages) callPackage; + directory = ./providers; + } + ); + + withProviders = + ps: + let + pyEnv = python.withPackages ps; + in + runCommand "octodns-with-providers" { } '' + mkdir -p $out/bin + ln -st $out/bin ${pyEnv}/bin/octodns-* + ''; + }; + + meta = { + description = "Tools for managing DNS across multiple providers"; + homepage = "https://github.com/octodns/octodns"; + changelog = "https://github.com/octodns/octodns/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + teams = [ lib.teams.octodns ]; + }; +} diff --git a/pkgs/by-name/oc/octodns/providers/bind/package.nix b/pkgs/by-name/oc/octodns/providers/bind/package.nix new file mode 100644 index 000000000000..8354be694115 --- /dev/null +++ b/pkgs/by-name/oc/octodns/providers/bind/package.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + octodns, + pytestCheckHook, + pythonOlder, + dnspython, + setuptools, +}: + +buildPythonPackage rec { + pname = "octodns-bind"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-bind"; + tag = "v${version}"; + hash = "sha256-ezLaNeqJoi3fcfwQFkiEyYUSlw7cTCikmv0qmPTzrvI="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + octodns + dnspython + ]; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ "octodns_bind" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "RFC compliant (Bind9) provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-bind"; + changelog = "https://github.com/octodns/octodns-bind/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + teams = [ lib.teams.octodns ]; + }; +} diff --git a/pkgs/by-name/oc/octodns/providers/cloudflare/package.nix b/pkgs/by-name/oc/octodns/providers/cloudflare/package.nix new file mode 100644 index 000000000000..21b69d8166ad --- /dev/null +++ b/pkgs/by-name/oc/octodns/providers/cloudflare/package.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + octodns, + pytestCheckHook, + pythonOlder, + requests, + requests-mock, + setuptools, +}: + +buildPythonPackage rec { + pname = "octodns-cloudflare"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-cloudflare"; + tag = "v${version}"; + hash = "sha256-8ORqUGmbmKQ1QbGLi3TFF9DCgF/raSpSEFZ62NfNAOQ="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + octodns + requests + ]; + + pythonImportsCheck = [ "octodns_cloudflare" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = { + description = "Cloudflare API provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-cloudflare/"; + changelog = "https://github.com/octodns/octodns-cloudflare/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ret2pop ]; + teams = [ lib.teams.octodns ]; + }; +} diff --git a/pkgs/by-name/oc/octodns/providers/ddns/package.nix b/pkgs/by-name/oc/octodns/providers/ddns/package.nix new file mode 100644 index 000000000000..7e85749868dc --- /dev/null +++ b/pkgs/by-name/oc/octodns/providers/ddns/package.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + octodns, + pytestCheckHook, + setuptools, + requests, +}: +buildPythonPackage rec { + pname = "octodns-ddns"; + version = "0.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-ddns"; + tag = "v${version}"; + hash = "sha256-n4dTkJT5UmmEqtN5x2zkJe7NQtjXz3gPwwFnOmMIfIs="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + octodns + requests + ]; + + postPatch = '' + substituteInPlace tests/test_octodns_source_ddns.py \ + --replace-fail "assertEquals" "assertEqual" + ''; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ + "octodns_ddns" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Simple Dynamic DNS source for octoDNS"; + homepage = "https://github.com/octodns/octodns-ddns"; + changelog = "https://github.com/octodns/octodns-ddns/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.provokateurin ]; + teams = [ lib.teams.octodns ]; + }; +} diff --git a/pkgs/by-name/oc/octodns/providers/gandi/package.nix b/pkgs/by-name/oc/octodns/providers/gandi/package.nix new file mode 100644 index 000000000000..a9e434bda87a --- /dev/null +++ b/pkgs/by-name/oc/octodns/providers/gandi/package.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + octodns, + pytestCheckHook, + pythonOlder, + requests, + requests-mock, + setuptools, +}: + +buildPythonPackage rec { + pname = "octodns-gandi"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-gandi"; + tag = "v${version}"; + hash = "sha256-+0djfrlKAb9Rv6eaybGAg5YpS5PK3EHFbG/3bxa6WhQ="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + octodns + requests + ]; + + pythonImportsCheck = [ "octodns_gandi" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = { + description = "Gandi v5 API provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-gandi"; + changelog = "https://github.com/octodns/octodns-gandi/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.onny ]; + teams = [ lib.teams.octodns ]; + }; +} diff --git a/pkgs/by-name/oc/octodns/providers/hetzner/package.nix b/pkgs/by-name/oc/octodns/providers/hetzner/package.nix new file mode 100644 index 000000000000..78378c21552e --- /dev/null +++ b/pkgs/by-name/oc/octodns/providers/hetzner/package.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + octodns, + pytestCheckHook, + pythonOlder, + requests, + requests-mock, + setuptools, +}: + +buildPythonPackage rec { + pname = "octodns-hetzner"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-hetzner"; + tag = "v${version}"; + hash = "sha256-JYVztSO38y4F+p0glgtT9/QRdt9uDnOziMFXxBikzLg="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + octodns + requests + ]; + + pythonImportsCheck = [ "octodns_hetzner" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = { + description = "Hetzner DNS provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-hetzner/"; + changelog = "https://github.com/octodns/octodns-hetzner/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + teams = [ lib.teams.octodns ]; + }; +} diff --git a/pkgs/by-name/oc/octodns/providers/powerdns/package.nix b/pkgs/by-name/oc/octodns/providers/powerdns/package.nix new file mode 100644 index 000000000000..2505794e6bba --- /dev/null +++ b/pkgs/by-name/oc/octodns/providers/powerdns/package.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + octodns, + pytestCheckHook, + pythonOlder, + requests, + requests-mock, + setuptools, +}: + +buildPythonPackage rec { + pname = "octodns-powerdns"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-powerdns"; + tag = "v${version}"; + hash = "sha256-bdCX1oHFZRYr9PvLVbag/La087DMSXZfZ2W0mXffcUY="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + octodns + requests + ]; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ "octodns_powerdns" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = { + description = "PowerDNS API provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-powerdns/"; + changelog = "https://github.com/octodns/octodns-powerdns/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + teams = [ lib.teams.octodns ]; + }; +} diff --git a/pkgs/by-name/oc/octodns/providers/transip/package.nix b/pkgs/by-name/oc/octodns/providers/transip/package.nix new file mode 100644 index 000000000000..1dd1add7c08f --- /dev/null +++ b/pkgs/by-name/oc/octodns/providers/transip/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + octodns, + pytestCheckHook, + setuptools, + python-transip, +}: +buildPythonPackage rec { + pname = "octodns-transip"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-transip"; + tag = "v${version}"; + hash = "sha256-mqrMzPnUSavSTiyjbLKQuwuwuE2Ghk94EXccpOpWLlM="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + octodns + python-transip + ]; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ + "octodns_transip" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "octoDNS provider that targets Transip DNS"; + homepage = "https://github.com/octodns/octodns-transip"; + changelog = "https://github.com/octodns/octodns-transip/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.provokateurin ]; + teams = [ lib.teams.octodns ]; + }; +} diff --git a/pkgs/by-name/oc/octofetch/package.nix b/pkgs/by-name/oc/octofetch/package.nix new file mode 100644 index 000000000000..516ea40f1317 --- /dev/null +++ b/pkgs/by-name/oc/octofetch/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + openssl, + pkg-config, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "octofetch"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "azur1s"; + repo = pname; + rev = version; + sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-1lnHCiRktBGYb7Bgq4p60+kikb/LApPhzNp1O0Go46Q="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; + + meta = with lib; { + homepage = "https://github.com/azur1s/octofetch"; + description = "Github user information on terminal"; + license = licenses.mit; + maintainers = [ ]; + mainProgram = "octofetch"; + }; +} diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix index 3a75f033f772..cec7024bccc3 100644 --- a/pkgs/by-name/oc/octoprint/package.nix +++ b/pkgs/by-name/oc/octoprint/package.nix @@ -4,7 +4,6 @@ callPackage, lib, fetchFromGitHub, - fetchPypi, python3, replaceVars, nix-update-script, @@ -17,59 +16,6 @@ let py = python3.override { self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ - ( - # Due to flask > 2.3 the login will not work - self: super: { - werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { - version = "2.2.3"; - format = "setuptools"; - pyproject = null; - src = fetchPypi { - pname = "Werkzeug"; - inherit version; - hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; - }; - doCheck = false; - }); - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "2.2.5"; - format = "setuptools"; - pyproject = null; - src = fetchPypi { - pname = "Flask"; - inherit version; - hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; - }; - doCheck = false; - }); - flask-login = super.flask-login.overridePythonAttrs (oldAttrs: rec { - version = "0.6.3"; - src = fetchPypi { - pname = "Flask-Login"; - inherit version; - hash = "sha256-XiPRSmB+8SgGxplZC4nQ8ODWe67sWZ11lHv5wUczAzM="; - }; - build-system = [ self.setuptools ]; - doCheck = false; # DeprecationWarnings - }); - pytest-httpbin = super.pytest-httpbin.overridePythonAttrs (oldAttrs: { - doCheck = false; # fails in current overlay - }); - httpcore = super.httpcore.overridePythonAttrs (oldAttrs: { - doCheck = false; # fails in current overlay - }); - - netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec { - version = "0.9.0"; - - src = fetchPypi { - pname = "netaddr"; - inherit version; - hash = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg="; - }; - }); - }) - # Built-in dependency (self: super: { octoprint-filecheck = self.buildPythonPackage rec { @@ -105,14 +51,14 @@ let (self: super: { octoprint-pisupport = self.buildPythonPackage rec { pname = "OctoPrint-PiSupport"; - version = "2023.5.24"; + version = "2023.10.10"; format = "setuptools"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-PiSupport"; rev = version; - hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew="; + hash = "sha256-VSzDoFq4Yn6KOn+RNi1uVJHzH44973kd/VoMjqzyBRA="; }; # requires octoprint itself during tests @@ -127,13 +73,13 @@ let (self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.10.3"; + version = "1.11.1"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - hash = "sha256-BToW1/AcQ01OK7RWZrkstX2M4+uKuL/wFB6HGkVUflk="; + hash = "sha256-eH5AWeER2spiWgtRM5zMp40OakpM5TMXO07WjdY7gNU="; }; propagatedBuildInputs = @@ -153,7 +99,6 @@ let flask-login flask-limiter frozendict - future itsdangerous immutabledict jinja2 diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix index c5b076bd2428..6599a4a88f7c 100644 --- a/pkgs/by-name/oc/octoprint/plugins.nix +++ b/pkgs/by-name/oc/octoprint/plugins.nix @@ -16,7 +16,7 @@ let // { pname = "octoprint-plugin-${args.pname}"; inherit (args) version; - propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ self.octoprint ]; + propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ super.octoprint ]; # none of the following have tests doCheck = false; } @@ -345,13 +345,13 @@ in octopod = buildPlugin rec { pname = "octopod"; - version = "0.3.16"; + version = "0.3.18"; src = fetchFromGitHub { owner = "gdombiak"; repo = "OctoPrint-OctoPod"; rev = version; - sha256 = "sha256-9QKC1MsYO3XihOTAijJUv5i20iMSQHOHPfLiYPV5y8s="; + sha256 = "sha256-HLR5402hFlUX0MLg3HXE7bIHKNnOI0buGAViqDt8mLc="; }; propagatedBuildInputs = with super; [ pillow ]; @@ -366,13 +366,13 @@ in printtimegenius = buildPlugin rec { pname = "printtimegenius"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "eyal0"; repo = "OctoPrint-PrintTimeGenius"; rev = version; - sha256 = "sha256-hqm8RShCNpsVbrVXquat5VXqcVc7q5tn5+7Ipqmaw4U="; + sha256 = "sha256-+EmM61s8HHcTIf0xoHkxEP7eqaNYB6ls61YwSXiVzyA="; }; propagatedBuildInputs = with super; [ diff --git a/pkgs/by-name/oc/octoscan/package.nix b/pkgs/by-name/oc/octoscan/package.nix index 93f7f5ad0b09..3b2636a2bec1 100644 --- a/pkgs/by-name/oc/octoscan/package.nix +++ b/pkgs/by-name/oc/octoscan/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "octoscan"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "synacktiv"; repo = "octoscan"; tag = "v${version}"; - hash = "sha256-7Y33HUqI3EKyWcVdJt+gj6VaMcXRp20fxuz9gNutOIo="; + hash = "sha256-SG6QHpDG9kPfb9jvHwz58U7+HZpFwYzwsDERNRW5R10="; }; vendorHash = "sha256-Jx4OEVqCTiW/BSygeLtwwqijiACEuPk0BT26JQoL3Ds="; diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index 332329aac083..3c59d77be355 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -16,7 +16,6 @@ wayland, stdenv, gtk3, - darwin, perl, wrapGAppsHook3, }: @@ -57,9 +56,6 @@ rustPlatform.buildRustPackage rec { gtk3 libxkbcommon wayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc ]; checkFlags = [ diff --git a/pkgs/by-name/od/ode/package.nix b/pkgs/by-name/od/ode/package.nix index cdef316b45a2..b41cb0e48b31 100644 --- a/pkgs/by-name/od/ode/package.nix +++ b/pkgs/by-name/od/ode/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -14,11 +13,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yRooxv8mUChHhKeccmo4DWr+yH7PejXDKmvgxbdFE+g="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.GLUT - ]; - env.CXXFLAGS = lib.optionalString stdenv.cc.isClang (toString [ "-std=c++14" "-Wno-error=c++11-narrowing" diff --git a/pkgs/by-name/od/odin/darwin-remove-impure-links.patch b/pkgs/by-name/od/odin/darwin-remove-impure-links.patch new file mode 100644 index 000000000000..eb7fa04c415a --- /dev/null +++ b/pkgs/by-name/od/odin/darwin-remove-impure-links.patch @@ -0,0 +1,23 @@ +diff --git a/src/linker.cpp b/src/linker.cpp +index ec165ef7d..91a28b8fc 100644 +--- a/src/linker.cpp ++++ b/src/linker.cpp +@@ -769,18 +769,6 @@ try_cross_linking:; + gbString platform_lib_str = gb_string_make(heap_allocator(), ""); + defer (gb_string_free(platform_lib_str)); + if (build_context.metrics.os == TargetOs_darwin) { +- platform_lib_str = gb_string_appendc(platform_lib_str, "-Wl,-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib "); +- +- // Homebrew's default library path, checking if it exists to avoid linking warnings. +- if (gb_file_exists("/opt/homebrew/lib")) { +- platform_lib_str = gb_string_appendc(platform_lib_str, "-L/opt/homebrew/lib "); +- } +- +- // MacPort's default library path, checking if it exists to avoid linking warnings. +- if (gb_file_exists("/opt/local/lib")) { +- platform_lib_str = gb_string_appendc(platform_lib_str, "-L/opt/local/lib "); +- } +- + // Only specify this flag if the user has given a minimum version to target. + // This will cause warnings to show up for mismatched libraries. + if (build_context.minimum_os_version_string_given) { diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix index 8b8ce9205098..6fea6313b0f2 100644 --- a/pkgs/by-name/od/odin/package.nix +++ b/pkgs/by-name/od/odin/package.nix @@ -1,41 +1,34 @@ { - fetchFromGitHub, lib, - libiconv, llvmPackages, - MacOSX-SDK, + fetchFromGitHub, makeBinaryWrapper, - nix-update-script, - Security, which, + nix-update-script, }: let inherit (llvmPackages) stdenv; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "odin"; - version = "dev-2025-01"; + version = "dev-2025-04"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; - rev = "dev-2025-01"; - hash = "sha256-GXea4+OIFyAhTqmDh2q+ewTUqI92ikOsa2s83UH2r58="; + tag = finalAttrs.version; + hash = "sha256-dVC7MgaNdgKy3X9OE5ZcNCPnuDwqXszX9iAoUglfz2k="; }; - postPatch = - lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace src/linker.cpp \ - --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} - '' - + '' - substituteInPlace build_odin.sh \ - --replace-fail '-framework System' '-lSystem' - patchShebangs build_odin.sh - ''; + patches = [ + ./darwin-remove-impure-links.patch + ]; + postPatch = '' + patchShebangs --build build_odin.sh + ''; - LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; + LLVM_CONFIG = lib.getExe' llvmPackages.llvm.dev "llvm-config"; dontConfigure = true; @@ -46,11 +39,6 @@ stdenv.mkDerivation { which ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - Security - ]; - installPhase = '' runHook preInstall @@ -87,6 +75,7 @@ stdenv.mkDerivation { description = "Fast, concise, readable, pragmatic and open sourced programming language"; downloadPage = "https://github.com/odin-lang/Odin"; homepage = "https://odin-lang.org/"; + changelog = "https://github.com/odin-lang/Odin/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; mainProgram = "odin"; maintainers = with lib.maintainers; [ @@ -95,4 +84,4 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isMusl; }; -} +}) diff --git a/pkgs/by-name/od/odoo/package.nix b/pkgs/by-name/od/odoo/package.nix index 254459e62081..ceef961f1fd8 100644 --- a/pkgs/by-name/od/odoo/package.nix +++ b/pkgs/by-name/od/odoo/package.nix @@ -9,7 +9,7 @@ let odoo_version = "18.0"; - odoo_release = "20250213"; + odoo_release = "20250506"; python = python312.override { self = python; }; @@ -24,7 +24,7 @@ python.pkgs.buildPythonApplication rec { # find latest version on https://nightly.odoo.com/${odoo_version}/nightly/src url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "odoo-${version}"; - hash = "sha256-iohlJ5OQ10iUaWjC4AFYmBwXuf9OOXAdCgdhdJAchYQ="; # odoo + hash = "sha256-rNG0He+51DnRT5g1SovGZ9uiE1HWXtcmAybcadBMjY4="; # odoo }; makeWrapperArgs = [ @@ -97,11 +97,11 @@ python.pkgs.buildPythonApplication rec { }; }; - meta = with lib; { + meta = { description = "Open Source ERP and CRM"; homepage = "https://www.odoo.com/"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ mkg20001 siriobalmelli ]; diff --git a/pkgs/by-name/od/odoo15/package.nix b/pkgs/by-name/od/odoo15/package.nix deleted file mode 100644 index c149bf1ee2bb..000000000000 --- a/pkgs/by-name/od/odoo15/package.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchzip, - python310, - rtlcss, - wkhtmltopdf, - nixosTests, -}: - -let - odoo_version = "15.0"; - odoo_release = "20241010"; - python = python310.override { - self = python; - packageOverrides = self: super: { - pypdf2 = super.pypdf2.overridePythonAttrs (old: rec { - version = "1.28.6"; - - src = fetchFromGitHub { - owner = "py-pdf"; - repo = "pypdf"; - rev = version; - fetchSubmodules = true; - hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; - }; - - dependencies = [ self.setuptools ]; - - nativeCheckInputs = with self; [ - pytestCheckHook - pillow - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { - pname = "odoo"; - version = "${odoo_version}.${odoo_release}"; - - format = "setuptools"; - - # latest release is at https://github.com/odoo/docker/blob/5fb6a842747c296099d9384587cd89640eb7a615/15.0/Dockerfile#L58 - src = fetchzip { - url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; - name = "odoo-${version}"; - hash = "sha256-Hkre6mghEiLrDwfB1BxGbqEm/zruHLwaS+eIFQKjl1o="; # odoo - }; - - makeWrapperArgs = [ - "--prefix" - "PATH" - ":" - "${lib.makeBinPath [ - wkhtmltopdf - rtlcss - ]}" - ]; - - propagatedBuildInputs = with python.pkgs; [ - babel - chardet - decorator - docutils - ebaysdk - freezegun - gevent - greenlet - idna - jinja2 - libsass - lxml - lxml-html-clean - markupsafe - mock - num2words - ofxparse - passlib - pillow - polib - psutil - psycopg2 - pydot - pyopenssl - pypdf2 - pyserial - python-dateutil - python-ldap - python-stdnum - pytz - pyusb - qrcode - reportlab - requests - setuptools - vobject - werkzeug - xlrd - xlsxwriter - xlwt - zeep - ]; - - # takes 5+ minutes and there are not files to strip - dontStrip = true; - - passthru = { - updateScript = ./update.sh; - tests = { inherit (nixosTests) odoo15; }; - }; - - meta = with lib; { - description = "Open Source ERP and CRM"; - homepage = "https://www.odoo.com/"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ mkg20001 ]; - }; -} diff --git a/pkgs/by-name/od/odoo15/update.sh b/pkgs/by-name/od/odoo15/update.sh deleted file mode 100755 index 2265f9048c0e..000000000000 --- a/pkgs/by-name/od/odoo15/update.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch -# shellcheck shell=bash - -set -euo pipefail - -SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" -PKG=$(basename "$SCRIPT_DIR") - -LATEST="18" # increment manually -VERSION="${PKG/#odoo}" -VERSION="${VERSION:-$LATEST}.0" - -RELEASE="$( - curl "https://nightly.odoo.com/$VERSION/nightly/src/" | - sed -nE 's/.*odoo_'"$VERSION"'.(20[0-9]{6}).tar.gz.*/\1/p' | - tail -n 1 -)" - -latestVersion="$VERSION.$RELEASE" -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; $PKG.version or (lib.getVersion $PKG)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "$PKG is up-to-date: $currentVersion" - exit 0 -fi - -cd "$SCRIPT_DIR" - -sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix -sed -ri "s|odoo_version = .+|odoo_version = \"$VERSION\";|" package.nix -sed -ri "s|odoo_release = .+|odoo_release = \"$RELEASE\";|" package.nix diff --git a/pkgs/by-name/od/odoo16/fix-test.patch b/pkgs/by-name/od/odoo16/fix-test.patch new file mode 100644 index 000000000000..232590c87c30 --- /dev/null +++ b/pkgs/by-name/od/odoo16/fix-test.patch @@ -0,0 +1,22 @@ +diff --git a/odoo/http.py b/odoo/http.py +index f26dd52db235c..9689fc894b2b1 100644 +--- a/odoo/http.py ++++ b/odoo/http.py +@@ -117,6 +117,7 @@ + import glob + import hashlib + import hmac ++import importlib.metadata + import inspect + import json + import logging +@@ -256,7 +257,7 @@ def get_default_session(): + 'alias', 'host', 'methods', + } + +-if parse_version(werkzeug.__version__) >= parse_version('2.0.2'): ++if parse_version(importlib.metadata.version('werkzeug')) >= parse_version('2.0.2'): + # Werkzeug 2.0.2 adds the websocket option. If a websocket request + # (ws/wss) is trying to access an HTTP route, a WebsocketMismatch + # exception is raised. On the other hand, Werkzeug 0.16 does not + diff --git a/pkgs/by-name/od/odoo16/package.nix b/pkgs/by-name/od/odoo16/package.nix index 73791dbcfcf1..6e95a6909def 100644 --- a/pkgs/by-name/od/odoo16/package.nix +++ b/pkgs/by-name/od/odoo16/package.nix @@ -1,7 +1,7 @@ { lib, fetchzip, - python310, + python311, rtlcss, wkhtmltopdf, nixosTests, @@ -9,8 +9,8 @@ let odoo_version = "16.0"; - odoo_release = "20241010"; - python = python310.override { + odoo_release = "20250506"; + python = python311.override { self = python; }; in @@ -24,9 +24,11 @@ python.pkgs.buildPythonApplication rec { src = fetchzip { url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "odoo-${version}"; - hash = "sha256-ICe5UOy+Ga81fE66SnIhRz3+JEEbGfoz7ag53mkG4UM="; # odoo + hash = "sha256-dBqRZ3cf4/udP9hm+u9zhuUCkH176uG2NPAy5sujyNc="; # odoo }; + patches = [ ./fix-test.patch ]; + makeWrapperArgs = [ "--prefix" "PATH" @@ -90,14 +92,14 @@ python.pkgs.buildPythonApplication rec { passthru = { updateScript = ./update.sh; tests = { - inherit (nixosTests) odoo; + inherit (nixosTests) odoo16; }; }; - meta = with lib; { + meta = { description = "Open Source ERP and CRM"; homepage = "https://www.odoo.com/"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ mkg20001 ]; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ mkg20001 ]; }; } diff --git a/pkgs/by-name/od/odoo17/package.nix b/pkgs/by-name/od/odoo17/package.nix index 698afb37d103..ac5db5d4ff76 100644 --- a/pkgs/by-name/od/odoo17/package.nix +++ b/pkgs/by-name/od/odoo17/package.nix @@ -2,7 +2,8 @@ lib, fetchgit, fetchzip, - python310, + fetchpatch2, + python311, rtlcss, wkhtmltopdf, nixosTests, @@ -10,8 +11,8 @@ let odoo_version = "17.0"; - odoo_release = "20241010"; - python = python310.override { + odoo_release = "20250506"; + python = python311.override { self = python; packageOverrides = final: prev: { # requirements.txt fixes docutils at 0.17; the default 0.21.1 tested throws exceptions @@ -37,8 +38,14 @@ python.pkgs.buildPythonApplication rec { src = fetchzip { url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "odoo-${version}"; - hash = "sha256-s4Fvzjwl2oM0V9G1WQdSoqo7kE7b8tJdluk9f7A06e8="; # odoo + hash = "sha256-V15Oe3AOBJ1agt5WmpFZnC7EkyoKyxTH8Iqdf2/9aec="; # odoo }; + patches = [ + (fetchpatch2 { + url = "https://github.com/odoo/odoo/commit/ade3200e8138a9c28eb9b294a4efd2753a8e5591.patch?full_index=1"; + hash = "sha256-EFKjrR38eg9bxlNmRNoLSXem+MjQKqPcR3/mSgs0cDs="; + }) + ]; makeWrapperArgs = [ "--prefix" @@ -105,15 +112,15 @@ python.pkgs.buildPythonApplication rec { passthru = { updateScript = ./update.sh; tests = { - inherit (nixosTests) odoo; + inherit (nixosTests) odoo17; }; }; - meta = with lib; { + meta = { description = "Open Source ERP and CRM"; homepage = "https://www.odoo.com/"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ mkg20001 siriobalmelli ]; diff --git a/pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch b/pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch new file mode 100644 index 000000000000..daafdfad8584 --- /dev/null +++ b/pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch @@ -0,0 +1,46 @@ +diff --git a/lib/eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h +index deb1fd43f2..0f63ebe1d5 100644 +--- a/lib/eal/include/rte_bitops.h ++++ b/lib/eal/include/rte_bitops.h +@@ -525,10 +525,12 @@ __rte_bit_ ## variant ## flip ## size(qualifier uint ## size ## _t *addr, unsign + __RTE_GEN_BIT_OPS(,, size) \ + __RTE_GEN_BIT_OPS(v_, volatile, size) + ++#ifndef __cplusplus + #ifdef ALLOW_EXPERIMENTAL_API + __RTE_GEN_BIT_OPS_SIZE(32) + __RTE_GEN_BIT_OPS_SIZE(64) + #endif ++#endif + + #define __RTE_GEN_BIT_ATOMIC_TEST(variant, qualifier, size) \ + __rte_experimental \ +@@ -653,10 +655,12 @@ __rte_bit_atomic_ ## variant ## test_and_assign ## size( \ + __RTE_GEN_BIT_ATOMIC_OPS(,, size) \ + __RTE_GEN_BIT_ATOMIC_OPS(v_, volatile, size) + ++#ifndef __cplusplus + #ifdef ALLOW_EXPERIMENTAL_API + __RTE_GEN_BIT_ATOMIC_OPS_SIZE(32) + __RTE_GEN_BIT_ATOMIC_OPS_SIZE(64) + #endif ++#endif + + /*------------------------ 32-bit relaxed operations ------------------------*/ + +@@ -1485,6 +1489,7 @@ rte_bit_ ## family ## fun(qualifier uint ## size ## _t *addr, arg1_type arg1_nam + __RTE_BIT_OVERLOAD_SZ_4R(family, fun, qualifier, 64, ret_type, arg1_type, arg1_name, \ + arg2_type, arg2_name, arg3_type, arg3_name) + ++#ifndef __cplusplus + #ifdef ALLOW_EXPERIMENTAL_API + __RTE_BIT_OVERLOAD_2R(, test, const, bool, unsigned int, nr) + __RTE_BIT_OVERLOAD_2(, set,, unsigned int, nr) +@@ -1502,6 +1507,7 @@ __RTE_BIT_OVERLOAD_3R(atomic_, test_and_clear,, bool, unsigned int, nr, int, mem + __RTE_BIT_OVERLOAD_4R(atomic_, test_and_assign,, bool, unsigned int, nr, bool, value, + int, memory_order) + #endif ++#endif + + #endif + diff --git a/pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch b/pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch new file mode 100644 index 000000000000..a62c9a0796a3 --- /dev/null +++ b/pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch @@ -0,0 +1,50 @@ +diff --git a/platform/linux-dpdk/odp_packet_dpdk.c b/platform/linux-dpdk/odp_packet_dpdk.c +index cd95ba0f9..7e8b7e3f1 100644 +--- a/platform/linux-dpdk/odp_packet_dpdk.c ++++ b/platform/linux-dpdk/odp_packet_dpdk.c +@@ -372,13 +372,18 @@ static void prepare_rss_conf(pktio_entry_t *pktio_entry, + uint64_t rss_hf_capa; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); + uint16_t port_id = pkt_dpdk->port_id; ++ int ret; + + memset(&pkt_dpdk->rss_conf, 0, sizeof(struct rte_eth_rss_conf)); + + if (!p->hash_enable) + return; + +- rte_eth_dev_info_get(port_id, &dev_info); ++ ret = rte_eth_dev_info_get(port_id, &dev_info); ++ if (ret) { ++ _ODP_ERR("Failed to read device info: %d\n", ret); ++ return; ++ } + rss_hf_capa = dev_info.flow_type_rss_offloads; + + /* Print debug info about unsupported hash protocols */ +@@ -842,7 +847,11 @@ static int dpdk_start(pktio_entry_t *pktio_entry) + pktio_entry->state == PKTIO_STATE_STOP_PENDING) + rte_eth_dev_stop(pkt_dpdk->port_id); + +- rte_eth_dev_info_get(port_id, &dev_info); ++ ret = rte_eth_dev_info_get(port_id, &dev_info); ++ if (ret) { ++ _ODP_ERR("Failed to read device info: %d\n", ret); ++ return -1; ++ } + + /* Pcap driver reconfiguration may fail if number of rx/tx queues is set to zero */ + if (!strncmp(dev_info.driver_name, PCAP_DRV_NAME, strlen(PCAP_DRV_NAME))) { +@@ -1258,7 +1267,11 @@ static uint32_t _dpdk_vdev_mtu(uint16_t port_id) + int ret; + int sockfd; + +- rte_eth_dev_info_get(port_id, &dev_info); ++ ret = rte_eth_dev_info_get(port_id, &dev_info); ++ if (ret) { ++ _ODP_ERR("Failed to read device info: %d\n", ret); ++ return 0; ++ } + if_indextoname(dev_info.if_index, ifr.ifr_name); + sockfd = socket(AF_INET, SOCK_DGRAM, 0); + ret = ioctl(sockfd, SIOCGIFMTU, &ifr); diff --git a/pkgs/by-name/od/odp-dpdk/package.nix b/pkgs/by-name/od/odp-dpdk/package.nix index 0c8ef1005e6f..5134a82a6987 100644 --- a/pkgs/by-name/od/odp-dpdk/package.nix +++ b/pkgs/by-name/od/odp-dpdk/package.nix @@ -29,13 +29,21 @@ stdenv.mkDerivation rec { hash = "sha256-9stWGupRSQwUXOdPEQ9Rhkim22p5BBA5Z+2JCYS7Za0="; }; + patches = [ + ./odp-dpdk_25.03.patch + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - dpdk + (dpdk.overrideAttrs { + patches = [ + ./dpdk_25.03.patch + ]; + }) libconfig libpcap numactl diff --git a/pkgs/by-name/od/odyssey/fix-missing-c-header.patch b/pkgs/by-name/od/odyssey/fix-missing-c-header.patch new file mode 100644 index 000000000000..f3312e5e2495 --- /dev/null +++ b/pkgs/by-name/od/odyssey/fix-missing-c-header.patch @@ -0,0 +1,12 @@ +diff --git a/third_party/kiwi/kiwi.h b/third_party/kiwi/kiwi.h +index d3bf4113..a8a2ad6e 100644 +--- a/third_party/kiwi/kiwi.h ++++ b/third_party/kiwi/kiwi.h +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + + #include "kiwi/macro.h" diff --git a/pkgs/by-name/od/odyssey/package.nix b/pkgs/by-name/od/odyssey/package.nix index 39766cf81224..b6d4217b450a 100644 --- a/pkgs/by-name/od/odyssey/package.nix +++ b/pkgs/by-name/od/odyssey/package.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { url = "https://github.com/yandex/odyssey/commit/01ca5b345c4483add7425785c9c33dfa2c135d63.patch"; sha256 = "sha256-8UPkZkiI08ZZL6GShhug/5/kOVrmdqYlsD1bcqfxg/w="; }) + # Fixes kiwi build. + ./fix-missing-c-header.patch ]; nativeBuildInputs = [ cmake ]; @@ -34,6 +36,9 @@ stdenv.mkDerivation rec { libpq zstd ]; + + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int -Wno-error=incompatible-pointer-types"; + cmakeFlags = [ "-DBUILD_COMPRESSION=ON" "-DPOSTGRESQL_INCLUDE_DIR=${lib.getDev libpq}/include/postgresql/server" diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index ec6b6f5c2670..70746ccc5a3b 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -7,16 +7,24 @@ python3Packages.buildPythonApplication rec { pname = "oelint-adv"; - version = "6.7.1"; + version = "7.2.6"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-adv"; tag = version; - hash = "sha256-rJ1M5YRXcKbDEGhy0G+N2dGD3sx8KFUfLJSLthYQNtU="; + hash = "sha256-QNTC8jO6RjHNaHVNSqAoM1xAhYc35G5A7D0yfwmd6+U="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--random-order-bucket=global" "" \ + --replace-fail "--random-order" "" \ + --replace-fail "--force-sugar" "" \ + --replace-fail "--old-summary" "" + ''; + build-system = with python3Packages; [ setuptools ]; @@ -25,6 +33,7 @@ python3Packages.buildPythonApplication rec { anytree argcomplete colorama + oelint-data oelint-parser urllib3 ]; @@ -50,20 +59,12 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = nix-update-script { }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--random-order-bucket=global" "" \ - --replace-fail "--random-order" "" \ - --replace-fail "--force-sugar" "" \ - --replace-fail "--old-summary" "" - ''; - - meta = with lib; { + meta = { description = "Advanced bitbake-recipe linter"; mainProgram = "oelint-adv"; homepage = "https://github.com/priv-kweihmann/oelint-adv"; changelog = "https://github.com/priv-kweihmann/oelint-adv/releases/tag/${version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ otavio ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ otavio ]; }; } diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index af338a75adb4..2f784f559e62 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -19,6 +19,7 @@ python3.pkgs.buildPythonApplication rec { sourceRoot = "${src.name}/src"; pythonRelaxDeps = [ + "rich" "setuptools" "tenacity" ]; diff --git a/pkgs/by-name/of/offensive-azure/package.nix b/pkgs/by-name/of/offensive-azure/package.nix index 0243bab6a458..5c715bf6ea67 100644 --- a/pkgs/by-name/of/offensive-azure/package.nix +++ b/pkgs/by-name/of/offensive-azure/package.nix @@ -6,6 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "offensive-azure"; + # nixpkgs-update: no auto update version = "0.4.10"; format = "pyproject"; diff --git a/pkgs/by-name/of/offpunk/package.nix b/pkgs/by-name/of/offpunk/package.nix index 332f234839dd..2359e9a0ff91 100644 --- a/pkgs/by-name/of/offpunk/package.nix +++ b/pkgs/by-name/of/offpunk/package.nix @@ -1,38 +1,20 @@ { + lib, + python3Packages, fetchFromSourcehut, file, installShellFiles, less, - lib, offpunk, - python3Packages, testers, timg, xdg-utils, xsel, }: -let - pythonDependencies = with python3Packages; [ - beautifulsoup4 - chardet - cryptography - feedparser - readability-lxml - requests - setproctitle - ]; - otherDependencies = [ - file - less - timg - xdg-utils - xsel - ]; -in python3Packages.buildPythonApplication rec { pname = "offpunk"; - version = "2.6"; + version = "2.7.1"; pyproject = true; disabled = python3Packages.pythonOlder "3.7"; @@ -41,14 +23,30 @@ python3Packages.buildPythonApplication rec { owner = "~lioploum"; repo = "offpunk"; rev = "v${version}"; - hash = "sha256-bVWPmCs8vspW0leaNajEYy+c3WRRMzIB8b9nXDDB8tw="; + hash = "sha256-+Mbe1VLeF8Adf7bgVnbzvcWdPB4PXakCD9gO35jAYBY="; }; - nativeBuildInputs = [ - python3Packages.hatchling - installShellFiles - ]; - propagatedBuildInputs = otherDependencies ++ pythonDependencies; + build-system = with python3Packages; [ hatchling ]; + + nativeBuildInputs = [ installShellFiles ]; + + dependencies = + [ + file + less + timg + xdg-utils + xsel + ] + ++ (with python3Packages; [ + beautifulsoup4 + chardet + cryptography + feedparser + readability-lxml + requests + setproctitle + ]); postInstall = '' installManPage man/*.1 diff --git a/pkgs/by-name/og/ogdf/package.nix b/pkgs/by-name/og/ogdf/package.nix index 8fcb1db5a393..4d666933ad42 100644 --- a/pkgs/by-name/og/ogdf/package.nix +++ b/pkgs/by-name/og/ogdf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "ogdf"; - version = "2022.02"; + version = "2023.09"; src = fetchFromGitHub { owner = "ogdf"; repo = "ogdf"; - rev = "dogwood-202202"; - sha256 = "sha256-zkQ6sS0EUmiigv3T7To+tG3XbFbR3XEbFo15oQ0bWf0="; + tag = "elderberry-202309"; + hash = "sha256-vnhPuMhz+pE4ExhRhjwHy4OilIkJ/kXc2LWU+9auY9k="; }; nativeBuildInputs = [ @@ -28,12 +28,12 @@ stdenv.mkDerivation { "-DOGDF_WARNING_ERRORS=OFF" ]; - meta = with lib; { + meta = { description = "Open Graph Drawing Framework/Open Graph algorithms and Data structure Framework"; homepage = "http://www.ogdf.net"; - license = licenses.gpl2; - maintainers = [ maintainers.ianwookim ]; - platforms = platforms.all; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.ianwookim ]; + platforms = lib.platforms.all; longDescription = '' OGDF stands both for Open Graph Drawing Framework (the original name) and Open Graph algorithms and Data structures Framework. diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix index 4841ecb7cb05..b2c9e881f638 100644 --- a/pkgs/by-name/og/ogen/package.nix +++ b/pkgs/by-name/og/ogen/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ogen"; - version = "1.10.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "ogen-go"; repo = "ogen"; tag = "v${version}"; - hash = "sha256-A4ZtwsDBLGEGxQhGhRSAd+dSt6PRu6sPE4ZF83IWHXM="; + hash = "sha256-M2xKxaf+iWXTq+vMXsucMmVqs9BarCoyG6prmwcL8KI="; }; - vendorHash = "sha256-VpJR/VC7Gtqg2jEMqDArtRV+3Cf6/J6numUuTrmmnwQ="; + vendorHash = "sha256-TVnTg+SbTmpdfxWSr3KIPioQ/0OlUxCuCfyn5oMWPu8="; patches = [ ./modify-version-handling.patch ]; diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix index 139982212a54..58aebbbd0b08 100644 --- a/pkgs/by-name/oh/oh-my-zsh/package.nix +++ b/pkgs/by-name/oh/oh-my-zsh/package.nix @@ -19,14 +19,14 @@ }: stdenv.mkDerivation rec { - version = "2025-03-11"; + version = "2025-05-14"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "f97e871c33da57d20e1b0411da6b1674126192a9"; - sha256 = "sha256-L2g9kw5mFfIz+IwTSfdHN4O48tew6D807gJvrgtkjJM="; + rev = "c95509ebfdbcc3c497f12697cfd2717bcb0a528b"; + sha256 = "sha256-abhfCm/7L866nLbucPNHfM5xLU7CYfb8fbK6auUOw3Q="; }; strictDeps = true; diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 7ba4aa030a47..20cadb0eff29 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -5,7 +5,6 @@ stdenv, pkg-config, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; # tests don't work inside the sandbox doCheck = false; diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix index f24534264f92..21409f1658e8 100644 --- a/pkgs/by-name/oi/oils-for-unix/package.nix +++ b/pkgs/by-name/oi/oils-for-unix/package.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "oils-for-unix"; - version = "0.28.0"; + version = "0.29.0"; src = fetchurl { url = "https://oils.pub/download/oils-for-unix-${version}.tar.gz"; - hash = "sha256-Jm0UsW2Q1KB/53SIHq+g7Nu8hBHPHHX4tuJWNwtmjjU="; + hash = "sha256-NP21Px29K4dC73TNOkbYer/NoY0NZF8pdixP3bmis6w="; }; postPatch = '' diff --git a/pkgs/by-name/oi/oink/package.nix b/pkgs/by-name/oi/oink/package.nix index aac1061ba60e..9ececc3a3c95 100644 --- a/pkgs/by-name/oi/oink/package.nix +++ b/pkgs/by-name/oi/oink/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oink"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "rlado"; repo = "oink"; rev = "v${version}"; - hash = "sha256-MBNEMIrpJdXzMjmNwmKXTIzPNNGalElhIxmMU4y6zXo="; + hash = "sha256-e8FtjORTTIDnDANk8sWH8kmS35wyndDd6F7Vhepskb8="; }; vendorHash = null; diff --git a/pkgs/by-name/oi/ois/package.nix b/pkgs/by-name/oi/ois/package.nix new file mode 100644 index 000000000000..6b5d4c32b663 --- /dev/null +++ b/pkgs/by-name/oi/ois/package.nix @@ -0,0 +1,34 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + libX11, +}: + +stdenv.mkDerivation rec { + pname = "ois"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "wgois"; + repo = "OIS"; + rev = "v${version}"; + sha256 = "sha256-ir6p+Tzf8L5VOW/rsG4yelsth7INbhABO2T7pfMHcFo="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + + meta = with lib; { + description = "Object-oriented C++ input system"; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; + license = licenses.zlib; + }; +} diff --git a/pkgs/by-name/ok/okapi/package.nix b/pkgs/by-name/ok/okapi/package.nix new file mode 100644 index 000000000000..427a95123084 --- /dev/null +++ b/pkgs/by-name/ok/okapi/package.nix @@ -0,0 +1,33 @@ +{ + lib, + rustPlatform, + fetchurl, +}: + +rustPlatform.buildRustPackage rec { + pname = "okapi"; + version = "1.6.0"; + + src = fetchurl { + url = "https://github.com/trinsic-id/okapi/releases/download/v${version}/okapi-vendor-${version}.tar.gz"; + sha256 = "sha256-wszpCzh1VhqBlox7ywWi6WKUmxQUTsf5N5IiJumlEbM="; + }; + + cargoVendorDir = "vendor"; + doCheck = false; + + postInstall = '' + cp -r include $out + ''; + + meta = with lib; { + description = "Okapi Library"; + longDescription = '' + Collection of tools that support workflows for working + with authentic data and identity management + ''; + homepage = "https://github.com/trinsic-id/okapi"; + license = licenses.asl20; + maintainers = with maintainers; [ tmarkovski ]; + }; +} diff --git a/pkgs/by-name/ok/oksh/package.nix b/pkgs/by-name/ok/oksh/package.nix index 68c1ba57f3b3..780b83c1f43a 100644 --- a/pkgs/by-name/ok/oksh/package.nix +++ b/pkgs/by-name/ok/oksh/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "oksh"; - version = "7.6"; + version = "7.7"; src = fetchFromGitHub { owner = "ibara"; repo = "oksh"; rev = "oksh-${version}"; - hash = "sha256-iEV0ibEXwJioBaKN2Tuy0+SaVs8q0Ac4bImP8zhI7oI="; + hash = "sha256-Go73MvL9Mi/Rz1KzrKM7KP9UkI9GQFTduMPSUxEbl70="; }; strictDeps = true; diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 487b28c0d990..db9349c040ae 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -7,18 +7,18 @@ okteto, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.4.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; - rev = version; - hash = "sha256-vi2ow95a3btiR4yINunEa56SUGWlbgNdMdS/T747a+U="; + rev = finalAttrs.version; + hash = "sha256-xJdG5BHlVkK+wGn4ZNFfRoPimnlZrQOLbtKvCnBewqw="; }; - vendorHash = "sha256-tlZr1IOGOSbahd0Wh3yozbBrVL3RAWQLKNv/3XlMKqM="; + vendorHash = "sha256-zfY/AfSo8f9LALf0FRAdd26Q9xGcKvVAnK3rnACCW4s="; postPatch = '' # Disable some tests that need file system & network access. @@ -36,7 +36,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/okteto/okteto/pkg/config.VersionString=${version}" + "-X github.com/okteto/okteto/pkg/config.VersionString=${finalAttrs.version}" ]; tags = [ @@ -61,6 +61,7 @@ buildGoModule rec { "Test_translateJobWithoutVolumes" "Test_translateJobWithVolumes" "Test_translateService" + "TestProtobufTranslator_Translate_Success" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; @@ -84,4 +85,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "okteto"; }; -} +}) diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix new file mode 100644 index 000000000000..24cb51325a2a --- /dev/null +++ b/pkgs/by-name/ol/olivetin/package.nix @@ -0,0 +1,140 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + stdenvNoCC, + writableTmpDirAsHomeHook, + buf, + protoc-gen-go, + protoc-gen-go-grpc, + grpc-gateway, + buildNpmPackage, + installShellFiles, + versionCheckHook, + nixosTests, +}: + +buildGoModule ( + finalAttrs: + + let + gen = stdenvNoCC.mkDerivation { + pname = "olivetin-gen"; + inherit (finalAttrs) version src; + + nativeBuildInputs = [ + writableTmpDirAsHomeHook + buf + protoc-gen-go + protoc-gen-go-grpc + grpc-gateway + ]; + + buildPhase = '' + runHook preBuild + + pushd proto + buf generate + popd + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r service/gen $out + + runHook postInstall + ''; + + outputHashMode = "recursive"; + outputHash = "sha256-KygZ7NqkfhczYy1YMR824Om4NTq06+KHa/jvmsCty3s="; + }; + + webui = buildNpmPackage { + pname = "olivetin-webui"; + inherit (finalAttrs) version src; + + npmDepsHash = "sha256-VxIPjpsbxEPP15cu5Wvz0qeDGXTMb2tojdry8YaHMVI="; + + sourceRoot = "${finalAttrs.src.name}/webui.dev"; + + buildPhase = '' + runHook preBuild + + npx parcel build --public-url "." + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist $out + cp -r *.png $out + + runHook postInstall + ''; + }; + in + + { + pname = "olivetin"; + version = "2025.4.22"; + + src = fetchFromGitHub { + owner = "OliveTin"; + repo = "OliveTin"; + tag = finalAttrs.version; + hash = "sha256-dgoYGtBsyaCTgxCT/y7rU5B9pEvIU/yiLU2/pPm/vJU="; + }; + + modRoot = "service"; + + vendorHash = "sha256-yUW4BrC7Oqs+mvvZGp6oxdGQ9fxP5gQNacq6Pz5ZHAQ="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + ]; + + __darwinAllowLocalNetworking = true; + + nativeBuildInputs = [ installShellFiles ]; + + preBuild = '' + ln -s ${gen} gen + substituteInPlace internal/config/config.go \ + --replace-fail 'config.WebUIDir = "./webui"' 'config.WebUIDir = "${webui}"' + substituteInPlace internal/httpservers/webuiServer_test.go \ + --replace-fail '"../webui/"' '"${webui}"' + ''; + + postInstall = '' + installManPage ../var/manpage/OliveTin.1.gz + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/OliveTin"; + versionCheckProgramArg = "-version"; + doInstallCheck = true; + + passthru = { + inherit gen webui; + tests = { inherit (nixosTests) olivetin; }; + updateScript = ./update.sh; + }; + + meta = { + description = "Gives safe and simple access to predefined shell commands from a web interface"; + homepage = "https://www.olivetin.app/"; + downloadPage = "https://github.com/OliveTin/OliveTin"; + changelog = "https://github.com/OliveTin/OliveTin/releases/tag/${finalAttrs.version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "OliveTin"; + }; + } +) diff --git a/pkgs/by-name/ol/olivetin/update.sh b/pkgs/by-name/ol/olivetin/update.sh new file mode 100755 index 000000000000..88436b64bb58 --- /dev/null +++ b/pkgs/by-name/ol/olivetin/update.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update common-updater-scripts + +set -euo pipefail + +nix-update olivetin --src-only +update-source-version olivetin --source-key=gen --ignore-same-version +update-source-version olivetin --source-key=webui.npmDeps --ignore-same-version +update-source-version olivetin --source-key=goModules --ignore-same-version diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 8e45f3811933..2a3b650472b3 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -14,12 +14,10 @@ clblast, libdrm, rocmPackages, - rocmGpuTargets ? rocmPackages.clr.gpuTargets or [ ], + rocmGpuTargets ? rocmPackages.clr.localGpuTargets or (rocmPackages.clr.gpuTargets or [ ]), cudaPackages, - cudaArches ? cudaPackages.cudaFlags.realArches or [ ], - darwin, + cudaArches ? cudaPackages.flags.realArches or [ ], autoAddDriverRunpath, - versionCheckHook, # passthru nixosTests, @@ -41,20 +39,6 @@ assert builtins.elem acceleration [ ]; let - pname = "ollama"; - # don't forget to invalidate all hashes each update - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "ollama"; - repo = "ollama"; - tag = "v${version}"; - hash = "sha256-ZQiBbVQbMYxC73DAPyWi6Yn/cPySpsPcTiCOHK3F35w="; - fetchSubmodules = true; - }; - - vendorHash = "sha256-Zpzn2YWpiDAl4cwgrrSpN8CFy4GqqhE1mWsRxtYwdDA="; - validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [ "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, " "but they are mutually exclusive; falling back to cpu" @@ -70,6 +54,7 @@ let rocmLibs = [ rocmPackages.clr + rocmPackages.hipblas-common rocmPackages.hipblas rocmPackages.rocblas rocmPackages.rocsolver @@ -77,10 +62,9 @@ let rocmPackages.rocm-device-libs rocmPackages.rocm-smi ]; - rocmClang = linkFarm "rocm-clang" { llvm = rocmPackages.llvm.clang; }; rocmPath = buildEnv { name = "rocm-path"; - paths = rocmLibs ++ [ rocmClang ]; + paths = rocmLibs; }; cudaLibs = [ @@ -104,13 +88,6 @@ let cudaPath = lib.removeSuffix "-${cudaMajorVersion}" cudaToolkit; - metalFrameworks = with darwin.apple_sdk_11_0.frameworks; [ - Accelerate - Metal - MetalKit - MetalPerformanceShaders - ]; - wrapperOptions = [ # ollama embeds llama-cpp binaries which actually run the ai models @@ -131,23 +108,34 @@ let goBuild = if enableCuda then buildGoModule.override { stdenv = cudaPackages.backendStdenv; } + else if enableRocm then + buildGoModule.override { stdenv = rocmPackages.stdenv; } else buildGoModule; inherit (lib) licenses platforms maintainers; in -goBuild { - inherit - pname - version - src - vendorHash - ; +goBuild (finalAttrs: { + pname = "ollama"; + # don't forget to invalidate all hashes each update + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "ollama"; + repo = "ollama"; + tag = "v${finalAttrs.version}"; + hash = "sha256-rkSWMGMKzs7V6jmxS3fG611Zahsyzz5kDI8L4HxQSfQ="; + fetchSubmodules = true; + }; + + vendorHash = "sha256-t7+GLNC6mRcXq9ErxN6gGki5WWWoEcMfzRVjta4fddA="; env = lib.optionalAttrs enableRocm { ROCM_PATH = rocmPath; CLBlast_DIR = "${clblast}/lib/cmake/CLBlast"; HIP_PATH = rocmPath; + CFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include"; + CXXFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include"; } // lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; }; @@ -164,18 +152,16 @@ goBuild { ++ lib.optionals (enableRocm || enableCuda) [ makeWrapper autoAddDriverRunpath - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks; + ]; buildInputs = lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) - ++ lib.optionals enableCuda cudaLibs - ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks; + ++ lib.optionals enableCuda cudaLibs; # replace inaccurate version number with actual release version postPatch = '' substituteInPlace version/version.go \ - --replace-fail 0.0.0 '${version}' + --replace-fail 0.0.0 '${finalAttrs.version}' ''; overrideModAttrs = ( @@ -231,22 +217,24 @@ goBuild { ldflags = [ "-s" "-w" - "-X=github.com/ollama/ollama/version.Version=${version}" + "-X=github.com/ollama/ollama/version.Version=${finalAttrs.version}" "-X=github.com/ollama/ollama/server.mode=release" ]; __darwinAllowLocalNetworking = true; - nativeInstallCheck = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; - doInstallCheck = true; + # required for github.com/ollama/ollama/detect's tests + sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' + (allow file-read* (subpath "/System/Library/Extensions")) + (allow iokit-open (iokit-user-client-class "AGXDeviceUserClient")) + ''; passthru = { tests = { inherit ollama; version = testers.testVersion { - inherit version; + inherit (finalAttrs) version; package = ollama; }; } @@ -264,7 +252,7 @@ goBuild { + lib.optionalString rocmRequested ", using ROCm for AMD GPU acceleration" + lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration"; homepage = "https://github.com/ollama/ollama"; - changelog = "https://github.com/ollama/ollama/releases/tag/v${version}"; + changelog = "https://github.com/ollama/ollama/releases/tag/v${finalAttrs.version}"; license = licenses.mit; platforms = if (rocmRequested || cudaRequested) then platforms.linux else platforms.unix; mainProgram = "ollama"; @@ -273,7 +261,6 @@ goBuild { dit7ya elohmeier prusnak - roydubnium ]; }; -} +}) diff --git a/pkgs/by-name/ol/olm/package.nix b/pkgs/by-name/ol/olm/package.nix index 0eded23b94fe..ec0aeb705e6c 100644 --- a/pkgs/by-name/ol/olm/package.nix +++ b/pkgs/by-name/ol/olm/package.nix @@ -21,11 +21,18 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' - substituteInPlace olm.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; + postPatch = + '' + substituteInPlace olm.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + '' + # Clang 19 has become more strict about assigning to const variables + # Patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281497 + + lib.optionalString (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "19") '' + substituteInPlace include/olm/list.hh \ + --replace-fail "T * const other_pos = other._data;" "T const * other_pos = other._data;" + ''; meta = with lib; { description = "Implements double cryptographic ratchet and Megolm ratchet"; diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index 50c28b88728b..e2630adc444c 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2025-03-12"; + version = "0-unstable-2025-05-11"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "1e44e3d78ad8a74ef09c7f54a6f6d3f7df517f8e"; - hash = "sha256-rmKEsRrGvwlPeOKq/NX/775fAw50rdeWqEUqJiNax5k="; + rev = "89f83305019a70d714af015aec734700dfee967c"; + hash = "sha256-z+0+eEc+DOmHRv4jt3kOq4WvvJ4o+h9j/JDYgmxNCms="; }; postPatch = '' diff --git a/pkgs/by-name/ol/olvid/package.nix b/pkgs/by-name/ol/olvid/package.nix index 6b6af9b94cb7..535ce4c5b40f 100644 --- a/pkgs/by-name/ol/olvid/package.nix +++ b/pkgs/by-name/ol/olvid/package.nix @@ -62,14 +62,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "olvid"; - version = "2.3.0"; + version = "2.4.2"; dontUnpack = true; dontWrapGApps = true; src = fetchurl { url = "https://static.olvid.io/linux/${repo}-${finalAttrs.version}.tar.gz"; - hash = "sha256-MzWDqF8mfrtIRmz4Eoxeek3nwV0S3TobZNxIGz1SQM8="; + hash = "sha256-eL6XLdEwb3txgN7/YZv1vQGI4pznZb/CrjYY+QZlr5I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/om/ombi/package.nix b/pkgs/by-name/om/ombi/package.nix new file mode 100644 index 000000000000..35097500bf0a --- /dev/null +++ b/pkgs/by-name/om/ombi/package.nix @@ -0,0 +1,95 @@ +{ + lib, + stdenv, + fetchurl, + makeWrapper, + autoPatchelfHook, + fixDarwinDylibNames, + zlib, + krb5, + openssl, + icu, + nixosTests, +}: + +let + os = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; + arch = + { + x86_64-linux = "x64"; + aarch64-linux = "arm64"; + x86_64-darwin = "x64"; + } + ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + hash = + { + x64-linux_hash = "sha256-5pnHuYjT+O/mlGC+arIofwlAwOWOzyYa4/jK+fstkHs="; + arm64-linux_hash = "sha256-yBZQuTNPIPCa2LqaRd9rFinJpPvJraAe4xo09mt8RD8="; + x64-osx_hash = "sha256-VZTFsjB08/plpwv0ErwHbyIiSBGxsXAz92X2AdACN1E="; + } + ."${arch}-${os}_hash"; + +in +stdenv.mkDerivation rec { + pname = "ombi"; + version = "4.47.1"; + + src = fetchurl { + url = "https://github.com/Ombi-app/Ombi/releases/download/v${version}/${os}-${arch}.tar.gz"; + sha256 = hash; + }; + + sourceRoot = "source"; + + unpackPhase = '' + runHook preUnpack + mkdir -p "$sourceRoot" + tar xf $src --directory="$sourceRoot" + runHook postUnpack + ''; + + nativeBuildInputs = + [ makeWrapper ] + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + propagatedBuildInputs = [ + stdenv.cc.cc + zlib + krb5 + ]; + + installPhase = '' + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version} + + makeWrapper $out/share/${pname}-${version}/Ombi $out/bin/Ombi \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + openssl + icu + ] + } \ + --chdir "$out/share/${pname}-${version}" + ''; + + passthru = { + updateScript = ./update.sh; + tests.smoke-test = nixosTests.ombi; + }; + + meta = with lib; { + description = "Self-hosted web application that automatically gives your shared Plex or Emby users the ability to request content by themselves"; + homepage = "https://ombi.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ woky ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + ]; + mainProgram = "Ombi"; + }; +} diff --git a/pkgs/servers/ombi/update.sh b/pkgs/by-name/om/ombi/update.sh similarity index 100% rename from pkgs/servers/ombi/update.sh rename to pkgs/by-name/om/ombi/update.sh diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index de52df25d619..ee28971dd468 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.47.1"; + version = "0.49.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-/hv6YNaBfECFlf1xJCiSeWg+/PqmIa+Rtip6kFuHPCM="; + hash = "sha256-0SLeR91KVwpAKLLVVZ3pEKI2Vy0QaysezX2M3X5aZdQ="; }; - vendorHash = "sha256-BQn+3TEaHnJrzDZt3j/sB9Gbh4mQXhqfX0ssu+G+mg0="; + vendorHash = "sha256-dT0sniTYli+zRYN/uLETS3SrM5cfDY5ZYYAthaiQ93U="; ldflags = [ "-s" diff --git a/pkgs/by-name/om/omniorb/package.nix b/pkgs/by-name/om/omniorb/package.nix index 47a546781e34..574d758fcc58 100644 --- a/pkgs/by-name/om/omniorb/package.nix +++ b/pkgs/by-name/om/omniorb/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "omniorb"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - hash = "sha256-HHRTMNAZBK/Xoe0KWJa5puU6waS4ZKSFA7k8fuy/H6g="; + hash = "sha256-rM0l4stwxOM+0iew2T6WaeOMRgGWN4h8dxOYhw7UXno="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix index 4de4ee677f66..d885a6601df9 100644 --- a/pkgs/by-name/om/omnom/package.nix +++ b/pkgs/by-name/om/omnom/package.nix @@ -81,7 +81,7 @@ buildGoModule (finalAttrs: { description = "A webpage bookmarking and snapshotting service"; homepage = "https://github.com/asciimoo/omnom"; license = lib.licenses.agpl3Only; - maintainers = lib.teams.ngi.members; + teams = [ lib.teams.ngi ]; mainProgram = "omnom"; }; }) diff --git a/pkgs/by-name/om/omping/package.nix b/pkgs/by-name/om/omping/package.nix deleted file mode 100644 index 4e39e8294d83..000000000000 --- a/pkgs/by-name/om/omping/package.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, -}: - -stdenv.mkDerivation rec { - pname = "omping"; - version = "0.0.5"; - - src = fetchFromGitHub { - owner = "troglobit"; - repo = "omping"; - rev = version; - sha256 = "1f0vsbnhxp7bbgdnfqshryx3nhz2sqdnxdj068s0nmzsh53ckbf7"; - }; - - patches = [ - # This can go in 0.0.6+ - (fetchpatch { - url = "https://github.com/troglobit/omping/commit/08a31ec1a6eb4e8f88c301ef679c3b6f9893f333.patch"; - sha256 = "1xafyvd46bq53w2zvjw8bdw7vjqbrcrr21cyh6d0zfcn4gif1k0f"; - name = "fix_manpage_install.patch"; - }) - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; - description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN"; - license = licenses.mit; - platforms = platforms.unix; - inherit (src.meta) homepage; - mainProgram = "omping"; - }; -} diff --git a/pkgs/by-name/on/oncall/package.nix b/pkgs/by-name/on/oncall/package.nix new file mode 100644 index 000000000000..ede210ae2bb2 --- /dev/null +++ b/pkgs/by-name/on/oncall/package.nix @@ -0,0 +1,110 @@ +{ + lib, + python3, + fetchFromGitHub, + fetchPypi, + oncall, + nixosTests, + fetchpatch, +}: +python3.pkgs.buildPythonApplication rec { + pname = "oncall"; + # Using newer revision for Falcon 4 patch to work + version = "0-unstable-2025-04-15"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "linkedin"; + repo = pname; + #tag = "v${version}"; + rev = "030f5d0286b253e4300d36de1954c7b2a7490a76"; + hash = "sha256-Lox9aqYKsl/vg6mNwr0MoLmJQkC+kEf7AqvCCKhgo94="; + }; + + patches = [ + # Add support for loading extra settings file + ./support_extra_config.patch + + # Support storing assets in custom state dir + ./support_custom_state_dir.patch + + # Log Python errors to uwsgi + ./verbose_logging.patch + + # Add support for Falcon 4 + # https://github.com/linkedin/oncall/pull/433 + (fetchpatch { + url = "https://github.com/linkedin/oncall/commit/4ccf2239fb8c8aeda376f57735461174f48614f2.patch"; + hash = "sha256-XT7Z6NUg2zxoRtgxaM0ZbBhXtO9xvhKv30Jo1ZaEGMU="; + name = "falcon_4_support.patch"; + }) + ]; + + dependencies = with python3.pkgs; [ + beaker + falcon + falcon-cors + gevent + gunicorn + icalendar + irisclient + jinja2 + phonenumbers + pymysql + python-ldap + pytz + pyyaml + ujson + webassets + ]; + + postInstall = '' + mkdir "$out/share" + cp -r configs db "$out/share/" + ''; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + pytest-mock + ]; + + disabledTestPaths = [ + # Tests require running web server + "e2e/test_audit.py" + "e2e/test_events.py" + "e2e/test_ical.py" + "e2e/test_login.py" + "e2e/test_notification.py" + "e2e/test_override.py" + "e2e/test_pin.py" + "e2e/test_populate.py" + "e2e/test_roles.py" + "e2e/test_roster_suggest.py" + "e2e/test_rosters.py" + "e2e/test_schedules.py" + "e2e/test_services.py" + "e2e/test_subscription.py" + "e2e/test_teams.py" + "e2e/test_users.py" + ]; + + pythonImportsCheck = [ + "oncall" + ]; + + passthru = { + tests = { + inherit (nixosTests) oncall; + }; + pythonPath = "${python3.pkgs.makePythonPath dependencies}:${oncall}/${python3.sitePackages}"; + }; + + meta = { + description = "A calendar web-app designed for scheduling and managing on-call shifts"; + homepage = "http://oncall.tools"; + changelog = "https://github.com/linkedin/oncall/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ onny ]; + mainProgram = "oncall"; + }; +} diff --git a/pkgs/by-name/on/oncall/support_custom_state_dir.patch b/pkgs/by-name/on/oncall/support_custom_state_dir.patch new file mode 100644 index 000000000000..f0e181c255d9 --- /dev/null +++ b/pkgs/by-name/on/oncall/support_custom_state_dir.patch @@ -0,0 +1,56 @@ +diff --git a/src/oncall/ui/__init__.py b/src/oncall/ui/__init__.py +index a94fb17..364404a 100644 +--- a/src/oncall/ui/__init__.py ++++ b/src/oncall/ui/__init__.py +@@ -18,8 +18,12 @@ from webassets.ext.jinja2 import AssetsExtension + from webassets.script import CommandLineEnvironment + + STATIC_ROOT = environ.get('STATIC_ROOT', path.abspath(path.dirname(__file__))) ++SOURCE_ROOT = path.abspath(path.dirname(__file__)) + assets_env = AssetsEnvironment(path.join(STATIC_ROOT, 'static'), + url='/static') ++assets_env.cache = False ++assets_env.manifest = False ++assets_env.load_path = [ path.join(SOURCE_ROOT, 'static') ] + + assets_env.register('libs', Bundle( + 'js/jquery-3.3.1.min.js', 'js/handlebars-4.0.12.min.js', 'js/bootstrap.min.js', +@@ -45,7 +49,7 @@ logger = logging.getLogger('webassets') + logger.addHandler(logging.StreamHandler()) + + jinja2_env = Jinja2Environment(extensions=[AssetsExtension], autoescape=True) +-jinja2_env.loader = FileSystemLoader(path.join(STATIC_ROOT, 'templates')) ++jinja2_env.loader = FileSystemLoader(path.join(SOURCE_ROOT, 'templates')) + jinja2_env.assets_environment = assets_env + + _filename_ascii_strip_re = re.compile(r'[^A-Za-z0-9_.-]') +@@ -113,14 +117,15 @@ def secure_filename(filename): + class StaticResource(object): + allow_no_auth = True + +- def __init__(self, path): ++ def __init__(self, path, root): + self.path = path.lstrip('/') ++ self.root = root + + def on_get(self, req, resp, filename): + suffix = path.splitext(req.path)[1] + resp.content_type = mimes.get(suffix, 'application/octet-stream') + +- filepath = path.join(STATIC_ROOT, self.path, secure_filename(filename)) ++ filepath = path.join(self.root, self.path, secure_filename(filename)) + try: + resp.stream = open(filepath, 'rb') + resp.content_length = path.getsize(filepath) +@@ -153,8 +158,8 @@ def init(application, config): + + application.add_sink(index, '/') + application.add_route('/static/bundles/{filename}', +- StaticResource('/static/bundles')) ++ StaticResource('/static/bundles', STATIC_ROOT)) + application.add_route('/static/images/{filename}', +- StaticResource('/static/images')) ++ StaticResource('/static/images', SOURCE_ROOT)) + application.add_route('/static/fonts/{filename}', +- StaticResource('/static/fonts')) ++ StaticResource('/static/fonts', SOURCE_ROOT)) diff --git a/pkgs/by-name/on/oncall/support_extra_config.patch b/pkgs/by-name/on/oncall/support_extra_config.patch new file mode 100644 index 000000000000..25468c8d8858 --- /dev/null +++ b/pkgs/by-name/on/oncall/support_extra_config.patch @@ -0,0 +1,120 @@ +diff --git a/src/oncall/bin/notifier.py b/src/oncall/bin/notifier.py +index 25142b8..cbc92aa 100644 +--- a/src/oncall/bin/notifier.py ++++ b/src/oncall/bin/notifier.py +@@ -32,11 +32,29 @@ send_queue = queue.Queue() + + default_timezone = None + ++def merge_dict(extend_me, extend_by): ++ if isinstance(extend_by, dict): ++ for k, v in extend_by.items(): ++ if isinstance(v, dict) and isinstance(extend_me.get(k), dict): ++ merge_dict(extend_me[k], v) ++ else: ++ extend_me[k] = v ++ return extend_me + + def load_config_file(config_path): + with open(config_path, 'r', encoding='utf-8') as h: + config = yaml.safe_load(h) + ++ # Check for extra config files from environment variable ++ extra_config_paths = os.getenv('ONCALL_EXTRA_CONFIG') ++ if extra_config_paths: ++ for extra_path in extra_config_paths.split(','): ++ extra_path = extra_path.strip() ++ if os.path.isfile(extra_path): ++ with open(extra_path, 'r') as f: ++ extra_config = yaml.safe_load(f) or {} ++ config = merge_dict(config, extra_config) ++ + if 'init_config_hook' in config: + try: + module = config['init_config_hook'] +diff --git a/src/oncall/user_sync/ldap_sync.py b/src/oncall/user_sync/ldap_sync.py +index ef9a8ec..c5f027d 100644 +--- a/src/oncall/user_sync/ldap_sync.py ++++ b/src/oncall/user_sync/ldap_sync.py +@@ -6,6 +6,7 @@ import time + import yaml + import logging + import ldap ++import os + + from oncall import metrics + from ldap.controls import SimplePagedResultsControl +@@ -447,9 +448,28 @@ def main(config): + logger.info('Sleeping for %s seconds' % sleep_time) + sleep(sleep_time) + ++def merge_dict(extend_me, extend_by): ++ if isinstance(extend_by, dict): ++ for k, v in extend_by.items(): ++ if isinstance(v, dict) and isinstance(extend_me.get(k), dict): ++ merge_dict(extend_me[k], v) ++ else: ++ extend_me[k] = v ++ return extend_me + + if __name__ == '__main__': + config_path = sys.argv[1] + with open(config_path, 'r', encoding='utf-8') as config_file: + config = yaml.safe_load(config_file) ++ ++ # Check for extra config files from environment variable ++ extra_config_paths = os.getenv('ONCALL_EXTRA_CONFIG') ++ if extra_config_paths: ++ for extra_path in extra_config_paths.split(','): ++ extra_path = extra_path.strip() ++ if os.path.isfile(extra_path): ++ with open(extra_path, 'r') as f: ++ extra_config = yaml.safe_load(f) or {} ++ config = merge_dict(config, extra_config) ++ + main(config) +diff --git a/src/oncall/utils.py b/src/oncall/utils.py +index a0b695c..278ca1d 100644 +--- a/src/oncall/utils.py ++++ b/src/oncall/utils.py +@@ -13,6 +13,7 @@ from pytz import timezone + from .constants import ONCALL_REMINDER + from . import constants + import re ++import os + + invalid_char_reg = re.compile(r'[!"#%-,\.\/;->@\[-\^`\{-~]+') + DAY = 86400 +@@ -27,10 +28,31 @@ def insert_notification(x, y): + def update_notification(x, y): + pass + ++def merge_dict(extend_me, extend_by): ++ if isinstance(extend_by, dict): ++ for k, v in extend_by.items(): ++ if isinstance(v, dict) and isinstance(extend_me.get(k), dict): ++ merge_dict(extend_me[k], v) ++ else: ++ extend_me[k] = v ++ return extend_me + + def read_config(config_path): ++ + with open(config_path, 'r', encoding='utf8') as config_file: +- return yaml.safe_load(config_file) ++ config = yaml.safe_load(config_file) ++ ++ # Check for extra config files from environment variable ++ extra_config_paths = os.getenv('ONCALL_EXTRA_CONFIG') ++ if extra_config_paths: ++ for extra_path in extra_config_paths.split(','): ++ extra_path = extra_path.strip() ++ if os.path.isfile(extra_path): ++ with open(extra_path, 'r') as f: ++ extra_config = yaml.safe_load(f) or {} ++ config = merge_dict(config, extra_config) ++ ++ return config + + + def create_notification(context, team_id, role_ids, type_name, users_involved, cursor, **kwargs): diff --git a/pkgs/by-name/on/oncall/verbose_logging.patch b/pkgs/by-name/on/oncall/verbose_logging.patch new file mode 100644 index 000000000000..b2b4dfda5af6 --- /dev/null +++ b/pkgs/by-name/on/oncall/verbose_logging.patch @@ -0,0 +1,33 @@ +diff --git a/src/oncall/app.py b/src/oncall/app.py +index 370fcf4..59f014e 100644 +--- a/src/oncall/app.py ++++ b/src/oncall/app.py +@@ -62,9 +62,19 @@ class AuthMiddleware(object): + + application = None + ++def handle_uncaught_exception(req, resp, ex, params): ++ logging.exception('Unhandled error') ++ raise falcon.HTTPInternalServerError(title='App error') ++ ++ ++def handle_http_error(req, resp, ex, params): ++ logging.exception('HTTP error') ++ raise ex ++ + + def init_falcon_api(config): + global application ++ + cors = CORS(allow_origins_list=config.get('allow_origins_list', [])) + middlewares = [ + SecurityHeaderMiddleware(), +@@ -74,6 +84,8 @@ def init_falcon_api(config): + if config.get('require_auth'): + middlewares.append(AuthMiddleware()) + application = falcon.App(middleware=middlewares) ++ application.add_error_handler(falcon.HTTPError, handle_http_error) ++ application.add_error_handler(Exception, handle_uncaught_exception) + application.req_options.auto_parse_form_urlencoded = False + application.set_error_serializer(json_error_serializer) + application.req_options.strip_url_path_trailing_slash = True diff --git a/pkgs/by-name/on/one-click-backup/package.nix b/pkgs/by-name/on/one-click-backup/package.nix index 26ae411f0fed..ea3994bbec30 100644 --- a/pkgs/by-name/on/one-click-backup/package.nix +++ b/pkgs/by-name/on/one-click-backup/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + extra-cmake-modules ninja qt6.wrapQtAppsHook ]; buildInputs = [ qt6.qtdeclarative - extra-cmake-modules ]; meta = with lib; { diff --git a/pkgs/by-name/on/oneDNN/package.nix b/pkgs/by-name/on/oneDNN/package.nix index e5d1de169101..e3855a3a57b5 100644 --- a/pkgs/by-name/on/oneDNN/package.nix +++ b/pkgs/by-name/on/oneDNN/package.nix @@ -11,13 +11,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-buOrJOPI2Fe5fqyaFjC+Wai4BX2RhQ+41+VR2Kyi8+A="; + hash = "sha256-wOS/VBcP8VyuBAdXVNkTDtYizTQe00ZocW5p0PMqbr4="; }; outputs = [ diff --git a/pkgs/by-name/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix index bb60b17aa484..9a01cf6c8344 100644 --- a/pkgs/by-name/on/oneanime/package.nix +++ b/pkgs/by-name/on/oneanime/package.nix @@ -60,13 +60,13 @@ let in flutter329.buildFlutterApplication rec { pname = "oneanime"; - version = "1.3.9"; + version = "1.4.0"; src = fetchFromGitHub { owner = "Predidit"; repo = "oneAnime"; tag = version; - hash = "sha256-7W+/Au3NJLO6lv8AZ0T+vs9bb+qgUV0Sz4qZSl7gR6c="; + hash = "sha256-1rNnJF16YEj6akq4jtIzI2skl/qxYgi/VQSeo1J87JM="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/on/oneanime/pubspec.lock.json b/pkgs/by-name/on/oneanime/pubspec.lock.json index f866afae398f..47aa1d0581f0 100644 --- a/pkgs/by-name/on/oneanime/pubspec.lock.json +++ b/pkgs/by-name/on/oneanime/pubspec.lock.json @@ -180,11 +180,11 @@ "dependency": "direct main", "description": { "name": "canvas_danmaku", - "sha256": "a6761973c72328c3872fa288d0a943bf3675238a30913cf9cd0155d9b7cea9ca", + "sha256": "98fd90f257ffe93bd6a0bd857d92f40172767fc77ffb48b2379ac692e62150eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.6" + "version": "0.2.7" }, "characters": { "dependency": "transitive", @@ -806,7 +806,7 @@ "description": { "path": "media_kit", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -817,7 +817,7 @@ "description": { "path": "libs/android/media_kit_libs_android_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -828,7 +828,7 @@ "description": { "path": "libs/ios/media_kit_libs_ios_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -839,7 +839,7 @@ "description": { "path": "libs/linux/media_kit_libs_linux", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -850,7 +850,7 @@ "description": { "path": "libs/macos/media_kit_libs_macos_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -861,7 +861,7 @@ "description": { "path": "libs/universal/media_kit_libs_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -872,7 +872,7 @@ "description": { "path": "libs/windows/media_kit_libs_windows_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -883,7 +883,7 @@ "description": { "path": "media_kit_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1699,11 +1699,11 @@ "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.10" + "version": "1.2.11" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -1828,6 +1828,6 @@ }, "sdks": { "dart": ">=3.7.0 <4.0.0", - "flutter": ">=3.29.1" + "flutter": ">=3.29.2" } } diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix index 6da20b868e16..d4ca51341cae 100644 --- a/pkgs/by-name/on/onefetch/package.nix +++ b/pkgs/by-name/on/onefetch/package.nix @@ -16,17 +16,17 @@ let in rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.23.1"; + version = "2.24.0"; src = fetchFromGitHub { owner = "o2sh"; repo = "onefetch"; rev = version; - hash = "sha256-lQxv2gwZOGtxJrXjxvjBnbl225ppSs3cVNCfePFeqEE="; + hash = "sha256-Q74iqCSH8sdGFWC5DmMZhvUoL/Hzz4XNj548Gls6Hzk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-s1xA7UHArHeGaXrGQmqn9pKvtSW175ci4ipQEmKQQ5s="; + cargoHash = "sha256-BpWc1GEj94vGEXDJEyocItggP1vQC441wp8r3DwalFw="; cargoPatches = [ # enable pkg-config feature of zstd diff --git a/pkgs/by-name/on/onionshare/package.nix b/pkgs/by-name/on/onionshare/package.nix index d025d96e35a6..640caf9ed2a1 100644 --- a/pkgs/by-name/on/onionshare/package.nix +++ b/pkgs/by-name/on/onionshare/package.nix @@ -15,6 +15,7 @@ versionCheckHook, gitUpdater, onionshare-gui, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { pname = "onionshare-cli"; @@ -95,16 +96,12 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook + writableTmpDirAsHomeHook ] ++ (with python3Packages; [ pytestCheckHook ]); - preCheck = '' - # Tests use the home directory - export HOME="$(mktemp -d)" - ''; - disabledTests = lib.optionals stdenv.hostPlatform.isLinux [ "test_get_tor_paths_linux" # expects /usr instead of /nix/store diff --git a/pkgs/by-name/on/oniux/package.nix b/pkgs/by-name/on/oniux/package.nix new file mode 100644 index 000000000000..e63fe4a308b3 --- /dev/null +++ b/pkgs/by-name/on/oniux/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "oniux"; + version = "0.4.0"; + + src = fetchFromGitLab { + domain = "gitlab.torproject.org"; + owner = "tpo/core"; + repo = "oniux"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wWB/ch8DB2tO4+NuNDaGv8K4AbV5/MbyY01oRGai86A="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-tUOxs9bTcXS3Gq6cHYe+eAGAEYSRvf3JVGugBImbvJM="; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://gitlab.torproject.org/tpo/core/oniux"; + description = "Isolate Applications over Tor using Linux Namespaces"; + maintainers = with lib.maintainers; [ tnias ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ + asl20 + mit + ]; + mainProgram = "oniux"; + }; +}) diff --git a/pkgs/by-name/on/onlyoffice-documentserver/package.nix b/pkgs/by-name/on/onlyoffice-documentserver/package.nix index a86bf31a641f..0d828b87580c 100644 --- a/pkgs/by-name/on/onlyoffice-documentserver/package.nix +++ b/pkgs/by-name/on/onlyoffice-documentserver/package.nix @@ -61,9 +61,9 @@ let mkdir -p var/lib/onlyoffice/ var/www/onlyoffice/documentserver/fonts/ # see usr/bin/documentserver-flush-cache.sh - cp var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js.tpl var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js - HASH=$(basename $out | cut -d '-' -f 1) - sed -i "s/{{HASH_POSTFIX}}/$HASH/g" var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js + cp var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js{.tpl,} + substituteInPlace var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js \ + --replace-fail '{{HASH_POSTFIX}}' "$(basename $out | cut -d '-' -f 1)" mv * $out/ ''; diff --git a/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch b/pkgs/by-name/on/onnxruntime/nvcc-gsl.patch similarity index 100% rename from pkgs/development/libraries/onnxruntime/nvcc-gsl.patch rename to pkgs/by-name/on/onnxruntime/nvcc-gsl.patch diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix new file mode 100644 index 000000000000..71891ad7f149 --- /dev/null +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -0,0 +1,312 @@ +{ + config, + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + abseil-cpp_202407, + cmake, + cpuinfo, + eigen, + flatbuffers_23, + gbenchmark, + glibcLocales, + gtest, + howard-hinnant-date, + libpng, + nlohmann_json, + pkg-config, + python3Packages, + re2, + zlib, + microsoft-gsl, + libiconv, + protobuf_21, + pythonSupport ? true, + cudaSupport ? config.cudaSupport, + ncclSupport ? config.cudaSupport, + cudaPackages ? { }, +}@inputs: + +let + version = "1.21.0"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "onnxruntime"; + tag = "v${version}"; + hash = "sha256-BaHXpK6Ek+gsld7v+OBM+C3FjrPiyMQYP1liv7mEjho="; + fetchSubmodules = true; + }; + + stdenv = throw "Use effectiveStdenv instead"; + effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; + + cudaArchitecturesString = cudaPackages.flags.cmakeCudaArchitecturesString; + + mp11 = fetchFromGitHub { + owner = "boostorg"; + repo = "mp11"; + tag = "boost-1.82.0"; + hash = "sha256-cLPvjkf2Au+B19PJNrUkTW/VPxybi1MpPxnIl4oo4/o="; + }; + + safeint = fetchFromGitHub { + owner = "dcleblanc"; + repo = "safeint"; + tag = "3.0.28"; + hash = "sha256-pjwjrqq6dfiVsXIhbBtbolhiysiFlFTnx5XcX77f+C0="; + }; + + pytorch_clog = effectiveStdenv.mkDerivation { + pname = "clog"; + version = "3c8b153"; + src = "${cpuinfo.src}/deps/clog"; + + nativeBuildInputs = [ + cmake + gbenchmark + gtest + ]; + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_GOOGLEBENCHMARK" true) + (lib.cmakeBool "USE_SYSTEM_GOOGLETEST" true) + (lib.cmakeBool "USE_SYSTEM_LIBS" true) + # 'clog' tests set 'CXX_STANDARD 11'; this conflicts with our 'gtest'. + (lib.cmakeBool "CLOG_BUILD_TESTS" false) + ]; + }; + + onnx = fetchFromGitHub { + owner = "onnx"; + repo = "onnx"; + tag = "v1.17.0"; + hash = "sha256-9oORW0YlQ6SphqfbjcYb0dTlHc+1gzy9quH/Lj6By8Q="; + }; + + cutlass = fetchFromGitHub { + owner = "NVIDIA"; + repo = "cutlass"; + tag = "v3.5.1"; + hash = "sha256-sTGYN+bjtEqQ7Ootr/wvx3P9f8MCDSSj3qyCWjfdLEA="; + }; + + dlpack = fetchFromGitHub { + owner = "dmlc"; + repo = "dlpack"; + tag = "v0.6"; + hash = "sha256-YJdZ0cMtUncH5Z6TtAWBH0xtAIu2UcbjnVcCM4tfg20="; + }; + + isCudaJetson = cudaSupport && cudaPackages.flags.isJetsonBuild; +in +effectiveStdenv.mkDerivation rec { + pname = "onnxruntime"; + inherit src version; + + patches = + [ + # drop with the next update + # https://github.com/microsoft/onnxruntime/pull/23939 + (fetchpatch { + url = "https://github.com/microsoft/onnxruntime/commit/55553703eaa8cd01d2b01cc21171a0ea515c888a.patch"; + hash = "sha256-gL1rMNUcteKcjLmdJ+0r67rvNrC31bAyKYx4aeseWkM="; + }) + ] + ++ lib.optionals cudaSupport [ + # We apply the referenced 1064.patch ourselves to our nix dependency. + # FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0 + ./nvcc-gsl.patch + ]; + + nativeBuildInputs = + [ + cmake + pkg-config + python3Packages.python + protobuf_21 + ] + ++ lib.optionals pythonSupport ( + with python3Packages; + [ + pip + python + pythonOutputDistHook + setuptools + wheel + ] + ) + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + cudaPackages.cudnn-frontend + ] + ++ lib.optionals isCudaJetson [ + cudaPackages.autoAddCudaCompatRunpath + ]; + + buildInputs = + [ + cpuinfo + eigen + glibcLocales + howard-hinnant-date + libpng + nlohmann_json + microsoft-gsl + pytorch_clog + zlib + ] + ++ lib.optionals pythonSupport ( + with python3Packages; + [ + numpy + pybind11 + packaging + ] + ) + ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ + libiconv + ] + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cccl # cub/cub.cuh + libcublas # cublas_v2.h + libcurand # curand.h + libcusparse # cusparse.h + libcufft # cufft.h + cudnn # cudnn.h + cuda_cudart + ] + ++ lib.optionals (cudaSupport && ncclSupport) ( + with cudaPackages; + [ + nccl + ] + ) + ); + + nativeCheckInputs = + [ + gtest + ] + ++ lib.optionals pythonSupport ( + with python3Packages; + [ + pytest + sympy + onnx + ] + ); + + # TODO: build server, and move .so's to lib output + # Python's wheel is stored in a separate dist output + outputs = [ + "out" + "dev" + ] ++ lib.optionals pythonSupport [ "dist" ]; + + enableParallelBuilding = true; + + cmakeDir = "../cmake"; + + cmakeFlags = + [ + (lib.cmakeBool "ABSL_ENABLE_INSTALL" true) + (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeBool "FETCHCONTENT_QUIET" false) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202407.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DLPACK" "${dlpack}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FLATBUFFERS" "${flatbuffers_23.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MP11" "${mp11}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ONNX" "${onnx}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_RE2" "${re2.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SAFEINT" "${safeint}") + (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") + # fails to find protoc on darwin, so specify it + (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" "${protobuf_21}/bin/protoc") + (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true) + (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck) + (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" false) + (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) + (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport)) + (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8")) + ] + ++ lib.optionals pythonSupport [ + (lib.cmakeBool "onnxruntime_ENABLE_PYTHON" true) + ] + ++ lib.optionals cudaSupport [ + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass}") + (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}") + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) + (lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1") + ]; + + env = lib.optionalAttrs effectiveStdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error"; + }; + + # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox + doCheck = !(cudaSupport || effectiveStdenv.buildPlatform.system == "aarch64-linux"); + + requiredSystemFeatures = lib.optionals cudaSupport [ "big-parallel" ]; + + postPatch = + '' + substituteInPlace cmake/libonnxruntime.pc.cmake.in \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ + echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake + + # https://github.com/microsoft/onnxruntime/blob/c4f3742bb456a33ee9c826ce4e6939f8b84ce5b0/onnxruntime/core/platform/env.h#L249 + substituteInPlace onnxruntime/core/platform/env.h --replace-fail \ + "GetRuntimePath() const { return PathString(); }" \ + "GetRuntimePath() const { return PathString(\"$out/lib/\"); }" + '' + + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") '' + # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691 + rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc + ''; + + postBuild = lib.optionalString pythonSupport '' + ${python3Packages.python.interpreter} ../setup.py bdist_wheel + ''; + + postInstall = '' + # perform parts of `tools/ci_build/github/linux/copy_strip_binary.sh` + install -m644 -Dt $out/include \ + ../include/onnxruntime/core/framework/provider_options.h \ + ../include/onnxruntime/core/providers/cpu/cpu_provider_factory.h \ + ../include/onnxruntime/core/session/onnxruntime_*.h + ''; + + passthru = { + inherit cudaSupport cudaPackages; # for the python module + protobuf = protobuf_21; + tests = lib.optionalAttrs pythonSupport { + python = python3Packages.onnxruntime; + }; + }; + + meta = with lib; { + description = "Cross-platform, high performance scoring engine for ML models"; + longDescription = '' + ONNX Runtime is a performance-focused complete scoring engine + for Open Neural Network Exchange (ONNX) models, with an open + extensible architecture to continually address the latest developments + in AI and Deep Learning. ONNX Runtime stays up to date with the ONNX + standard with complete implementation of all ONNX operators, and + supports all ONNX releases (1.2+) with both future and backwards + compatibility. + ''; + homepage = "https://github.com/microsoft/onnxruntime"; + changelog = "https://github.com/microsoft/onnxruntime/releases/tag/v${version}"; + # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ + puffnfresh + ck3d + cbourjau + ]; + }; +} diff --git a/pkgs/by-name/oo/oobicpl/package.nix b/pkgs/by-name/oo/oobicpl/package.nix deleted file mode 100644 index c8d5a85b860e..000000000000 --- a/pkgs/by-name/oo/oobicpl/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - libminc, - bicpl, - arguments, - pcre-cpp, -}: - -stdenv.mkDerivation rec { - pname = "oobicpl"; - version = "unstable-2020-08-12"; - - src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "a9409da8a5bb4925438f32aff577b6333faec28b"; - sha256 = "0b4chjhr32wbb1sash8cq1jfnr7rzdq84hif8anlrjqd3l0gw357"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - libminc - bicpl - arguments - pcre-cpp - ]; - - cmakeFlags = [ - "-DLIBMINC_DIR=${libminc}/lib/cmake" - "-DBICPL_DIR=${bicpl}/lib" - "-DARGUMENTS_DIR=${arguments}/lib" - "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" - ]; - - meta = with lib; { - homepage = "https://github.com/BIC-MNI/oobicpl"; - description = "Brain Imaging Centre object-oriented programming library (and tools)"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.free; - }; -} diff --git a/pkgs/by-name/oo/ooniprobe-cli/package.nix b/pkgs/by-name/oo/ooniprobe-cli/package.nix index 9c14e54425d8..9cb0b79de641 100644 --- a/pkgs/by-name/oo/ooniprobe-cli/package.nix +++ b/pkgs/by-name/oo/ooniprobe-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.24.0"; + version = "3.25.0"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; - rev = "v${version}"; - hash = "sha256-jg09yIX3jHMp0PwSwy2RMwYhZm0haJFTmpwcyTc5I0A="; + tag = "v${version}"; + hash = "sha256-6BZ1ZhlskvP1eYS/yMaPgR0gbAUDJS0rS3KId+Lq450="; }; - vendorHash = "sha256-QH5PyCvfJWWDhjH6Jo8O3wBq3MwfpHWKSuYMmpaqjWk="; + vendorHash = "sha256-WPfeelgKGY0zTfP19+x8PLBrCFpla2uJFstXxJM966o="; subPackages = [ "cmd/ooniprobe" ]; @@ -25,7 +25,7 @@ buildGoModule rec { ]; meta = with lib; { - changelog = "https://github.com/ooni/probe-cli/releases/tag/${src.rev}"; + changelog = "https://github.com/ooni/probe-cli/releases/tag/${src.tag}"; description = "Open Observatory of Network Interference command line network probe"; homepage = "https://ooni.org/install/cli"; license = licenses.gpl3Plus; diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix index cce97e930864..99cb30ccf703 100644 --- a/pkgs/by-name/op/opa-envoy-plugin/package.nix +++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix @@ -14,13 +14,13 @@ assert buildGoModule rec { pname = "opa-envoy-plugin"; - version = "1.2.0-envoy-2"; + version = "1.4.2-envoy"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa-envoy-plugin"; tag = "v${version}"; - hash = "sha256-b3JaPd435VgLEMpkK79CkLGTvQmZpi8Eavj0ybPrBcs="; + hash = "sha256-DRW9VaxKd+MRcC3Ay7f9sblWTY9/RUNfH76LgPEhTas="; }; vendorHash = null; diff --git a/pkgs/by-name/op/opam-publish/package.nix b/pkgs/by-name/op/opam-publish/package.nix index 994b7ecad4a1..b6ccbd11210b 100644 --- a/pkgs/by-name/op/opam-publish/package.nix +++ b/pkgs/by-name/op/opam-publish/package.nix @@ -19,13 +19,13 @@ in buildDunePackage rec { pname = "opam-publish"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "ocaml-opam"; repo = "opam-publish"; rev = version; - hash = "sha256-HjMba80c4vOEm9p7r0cfFBf3y0XoFf986XjTDCPzn38="; + hash = "sha256-clTEm2DGxcNsv+Y1wwWwnM/lrRJDQBHsncwrdqVWA5U="; }; buildInputs = [ diff --git a/pkgs/by-name/op/opcua-commander/package.nix b/pkgs/by-name/op/opcua-commander/package.nix index ac137b7fe184..79af40699445 100644 --- a/pkgs/by-name/op/opcua-commander/package.nix +++ b/pkgs/by-name/op/opcua-commander/package.nix @@ -10,16 +10,16 @@ }: buildNpmPackage rec { pname = "opcua-commander"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "node-opcua"; repo = "opcua-commander"; rev = version; - hash = "sha256-7KYwIdrhlvGR9RHZBfMFOcBa+opwx7Q/crCdvwZD6Y8="; + hash = "sha256-qoBpYN0EiXiuhH+hXjVPK2ET8Psjz52rocohU8ccVIg="; }; - npmDepsHash = "sha256-g4WFLh+UnziQR2NZ4eL84Vrk+Mz99kFQiBkdGmBEMHE="; + npmDepsHash = "sha256-HB4boWgZWoG+ib+cCoQbUmrrV5rECR3dMwj2lCyJjT0="; nativeBuildInputs = [ esbuild typescript diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index 517bb13383e7..01ff13010866 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -12,15 +12,15 @@ assert enableWasmEval && stdenv.hostPlatform.isDarwin -> builtins.throw "building with wasm on darwin is failing in nixpkgs"; -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "open-policy-agent"; - version = "1.2.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; - rev = "v${version}"; - hash = "sha256-9pLySzYfLyRcbhKz+zusBFHNVnhtGyqlsrNr1AzDQx0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-4FRNTB24JWyF3Zuhx3T6LjNs83+wDh4gmE9rh3cu/Vk="; }; vendorHash = null; @@ -32,7 +32,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/open-policy-agent/opa/version.Version=${version}" + "-X github.com/open-policy-agent/opa/version.Version=${finalAttrs.version}" ]; tags = lib.optional enableWasmEval ( @@ -43,22 +43,37 @@ buildGoModule rec { ) "opa_wasm" ); - checkFlags = lib.optionals (!enableWasmEval) [ - "-skip=TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages" - ]; + checkFlags = + let + skippedTests = + [ + # Skip tests that require network, not available in the nix sandbox + "TestInterQueryCache_ClientError" + "TestIntraQueryCache_ClientError" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Skip tests that require network, not available in the darwin sandbox + "TestHTTPSClient" + "TestHTTPSNoClientCerts" + ] + ++ lib.optionals (!enableWasmEval) [ + "TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; preCheck = + # Feed in all but the e2e tests for testing + # This is because subPackages above limits what is built to just what we + # want but also limits the tests + # Also avoid wasm tests on darwin due to wasmtime-go build issues '' - # Feed in all but the e2e tests for testing - # This is because subPackages above limits what is built to just what we - # want but also limits the tests - # Also avoid wasm tests on darwin due to wasmtime-go build issues getGoDirs() { go list ./... | grep -v -e e2e ${lib.optionalString stdenv.hostPlatform.isDarwin "-e wasm"} } '' + # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra + lib.optionalString stdenv.hostPlatform.isDarwin '' - # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra rm v1/server/server_test.go ''; @@ -74,7 +89,7 @@ buildGoModule rec { runHook preInstallCheck $out/bin/opa --help - $out/bin/opa version | grep "Version: ${version}" + $out/bin/opa version | grep "Version: ${finalAttrs.version}" ${lib.optionalString enableWasmEval '' # If wasm is enabled verify it works @@ -84,10 +99,13 @@ buildGoModule rec { runHook postInstallCheck ''; - meta = with lib; { + # Required for tests that need networking + __darwinAllowLocalNetworking = true; + + meta = { mainProgram = "opa"; homepage = "https://www.openpolicyagent.org"; - changelog = "https://github.com/open-policy-agent/opa/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/open-policy-agent/opa/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "General-purpose policy engine"; longDescription = '' The Open Policy Agent (OPA, pronounced "oh-pa") is an open source, general-purpose policy engine that unifies @@ -95,10 +113,10 @@ buildGoModule rec { as code and simple APIs to offload policy decision-making from your software. You can use OPA to enforce policies in microservices, Kubernetes, CI/CD pipelines, API gateways, and more. ''; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lewo jk ]; }; -} +}) diff --git a/pkgs/by-name/op/open-sans/package.nix b/pkgs/by-name/op/open-sans/package.nix index 9cec3689e55f..91144234c13b 100644 --- a/pkgs/by-name/op/open-sans/package.nix +++ b/pkgs/by-name/op/open-sans/package.nix @@ -34,6 +34,6 @@ stdenvNoCC.mkDerivation { homepage = "https://www.opensans.com"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + teams = [ teams.pantheon ]; }; } diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index 7ae098af1898..eb59f6b8e6d3 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -12,8 +12,6 @@ gtk4, libadwaita, pango, - stdenv, - darwin, cargo-make, }: @@ -35,22 +33,15 @@ rustPlatform.buildRustPackage rec { cargo-make ]; - buildInputs = - [ - cairo - dbus - gdk-pixbuf - glib - gtk4 - libadwaita - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreBluetooth - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + cairo + dbus + gdk-pixbuf + glib + gtk4 + libadwaita + pango + ]; useFetchCargoVendor = true; cargoHash = "sha256-3K+/CpTGWSjCRa2vOEcDvLIiZMdntugIqnzkXF4wkng="; diff --git a/pkgs/by-name/op/open-stage-control/package.nix b/pkgs/by-name/op/open-stage-control/package.nix index 7df60380a38f..6ffa6b95ec41 100644 --- a/pkgs/by-name/op/open-stage-control/package.nix +++ b/pkgs/by-name/op/open-stage-control/package.nix @@ -5,7 +5,7 @@ makeBinaryWrapper, makeDesktopItem, copyDesktopItems, - nodejs_18, + nodejs_20, electron, python3, nix-update-script, @@ -29,7 +29,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-UqjYNXdNoQmirIgU9DRgkp14SIrawfrfi9mD2h6ACyU="; - nodejs = nodejs_18; + nodejs = nodejs_20; nativeBuildInputs = [ copyDesktopItems @@ -97,5 +97,7 @@ buildNpmPackage rec { maintainers = [ ]; platforms = platforms.linux; mainProgram = "open-stage-control"; + # Depends on nodejs_18 that has been removed. + broken = true; }; } diff --git a/pkgs/by-name/op/open-timeline-io/package.nix b/pkgs/by-name/op/open-timeline-io/package.nix new file mode 100644 index 000000000000..a944810fd890 --- /dev/null +++ b/pkgs/by-name/op/open-timeline-io/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + imath, + rapidjson, +}: + +stdenv.mkDerivation rec { + pname = "open-timeline-io"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "OpenTimelineIO"; + rev = "v${version}"; + hash = "sha256-53KXjbhHxuEtu6iRGWrirvFamuZ/WbOTcKCfs1iqKmM="; + }; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + imath + ]; + + buildInputs = [ + rapidjson + ]; + + cmakeFlags = [ + "-DOTIO_DEPENDENCIES_INSTALL=0" + "-DOTIO_FIND_IMATH=1" + ]; + + meta = { + description = "Open Source API and interchange format for editorial timeline information"; + homepage = "https://github.com/AcademySoftwareFoundation/OpenTimelineIO"; + license = lib.licenses.asl20; + maintainers = [ ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/op/open-web-calendar/package.nix b/pkgs/by-name/op/open-web-calendar/package.nix index 0d8c0cc7cac9..c56fbbb4285c 100644 --- a/pkgs/by-name/op/open-web-calendar/package.nix +++ b/pkgs/by-name/op/open-web-calendar/package.nix @@ -12,7 +12,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "open-web-calendar"; - version = "1.48"; + version = "1.49"; pyproject = true; disabled = python.pythonOlder "3.9"; @@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "open_web_calendar"; - hash = "sha256-SSe5vkrfTpUFdSLglBxo5//VZfuXYnWs5sUKJL2zWOw="; + hash = "sha256-vtmIqiF85zn8CiMUWsCKJUzfiiK/j+xlZIyuIMGxR4I="; }; # The Pypi tarball doesn't contain open_web_calendars/features diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 33e72e505215..036a1767ed82 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -2,35 +2,47 @@ lib, buildNpmPackage, fetchFromGitHub, - python312, + fetchpatch2, + python3Packages, nixosTests, fetchurl, + ffmpeg-headless, }: let pname = "open-webui"; - version = "0.6.0"; + version = "0.6.10"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-YCob6Tgnpdbt9QqnwakorXGlyaxy4wo2QCp4EMGHTrU="; + hash = "sha256-OZPZlF6tXzfuFU8/ZavE67E8+XdRu+7oCA1eD0EA9fg="; }; frontend = buildNpmPackage rec { - inherit pname version src; + pname = "open-webui-frontend"; + inherit version src; + + patches = [ + # Git is not available in the sandbox + # Remove this patch at the next release + (fetchpatch2 { + url = "https://github.com/open-webui/open-webui/commit/ed0659aca60eedadadba4362b309015b4a8368c6.patch"; + hash = "sha256-lTzCdAk9gagIfN5Ld1tCS3gp/oVm4+CRy/lD42702WM="; + }) + ]; # the backend for run-on-client-browser python execution # must match lock file in open-webui # TODO: should we automate this? # TODO: with JQ? "jq -r '.packages["node_modules/pyodide"].version' package-lock.json" - pyodideVersion = "0.27.2"; + pyodideVersion = "0.27.3"; pyodide = fetchurl { - hash = "sha256-sZ47IxPiL1e12rmpH3Zv2v6L2+1tz/kIrT4uYbng+Ec="; + hash = "sha256-SeK3RKqqxxLLf9DN5xXuPw6ZPblE6OX9VRXMzdrmTV4="; url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-lWVkZDlPDCmiNMj+7K47wSFwTKRJkS762uGtcBfx59s="; + npmDepsHash = "sha256-F/xum76SHFwX/77kPHTFayJ00wv6ZWE09hw8taUbMMQ="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -39,6 +51,10 @@ let --replace-fail "npm run pyodide:fetch && vite build" "vite build" ''; + propagatedBuildInputs = [ + ffmpeg-headless + ]; + env.CYPRESS_INSTALL_BINARY = "0"; # disallow cypress from downloading binaries in sandbox env.ONNXRUNTIME_NODE_INSTALL_CUDA = "skip"; env.NODE_OPTIONS = "--max-old-space-size=8192"; @@ -57,11 +73,11 @@ let ''; }; in -python312.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { inherit pname version src; pyproject = true; - build-system = with python312.pkgs; [ hatchling ]; + build-system = with python3Packages; [ hatchling ]; # Not force-including the frontend build directory as frontend is managed by the `frontend` derivation above. postPatch = '' @@ -80,8 +96,9 @@ python312.pkgs.buildPythonApplication rec { ]; dependencies = - with python312.pkgs; + with python3Packages; [ + accelerate aiocache aiofiles aiohttp @@ -117,6 +134,7 @@ python312.pkgs.buildPythonApplication rec { google-auth-httplib2 google-auth-oauthlib google-cloud-storage + google-genai google-generativeai googleapis-common-protos iso-639 @@ -129,6 +147,7 @@ python312.pkgs.buildPythonApplication rec { markdown moto nltk + onnxruntime openai opencv-python-headless openpyxl @@ -150,6 +169,7 @@ python312.pkgs.buildPythonApplication rec { peewee-migrate pgvector pillow + pinecone-client playwright psutil psycopg2-binary @@ -177,6 +197,7 @@ python312.pkgs.buildPythonApplication rec { sentence-transformers sentencepiece soundfile + tencentcloud-sdk-python tiktoken transformers unstructured @@ -203,7 +224,23 @@ python312.pkgs.buildPythonApplication rec { changelog = "https://github.com/open-webui/open-webui/blob/${src.tag}/CHANGELOG.md"; description = "Comprehensive suite for LLMs with a user-friendly WebUI"; homepage = "https://github.com/open-webui/open-webui"; - license = lib.licenses.mit; + # License history is complex: originally MIT, then a potentially problematic + # relicensing to a modified BSD-3 clause occurred around v0.5.5/v0.6.6. + # Due to these concerns and non-standard terms, it's treated as custom non-free. + license = { + fullName = "Open WebUI License"; + url = "https://github.com/open-webui/open-webui/blob/0cef844168e97b70de2abee4c076cc30ffec6193/LICENSE"; + # Marked non-free due to concerns over the MIT -> modified BSD-3 relicensing process, + # potentially unclear/contradictory statements, and non-standard branding requirements. + free = false; + }; + longDescription = '' + User-friendly WebUI for LLMs. Note on licensing: Code in Open WebUI prior + to version 0.5.5 was MIT licensed. Since version 0.6.6, the project has + adopted a modified BSD-3-Clause license that includes branding requirements + and whose relicensing process from MIT has raised concerns within the community. + Nixpkgs treats this custom license as non-free due to these factors. + ''; mainProgram = "open-webui"; maintainers = with lib.maintainers; [ drupol diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix index bc5922d80554..c64f9bbd10f6 100644 --- a/pkgs/by-name/op/open62541/package.nix +++ b/pkgs/by-name/op/open62541/package.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open62541"; - version = "1.4.10"; + version = "1.4.12"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-UUN8zLkXyXRbUOGFD6TYKUlbkZCIEJGw/S7xpUWVPxQ="; + hash = "sha256-FhlYowmu3McXuhOplnN/tnfkHAvRJqIuk60ceFYOmR0="; fetchSubmodules = true; }; @@ -150,6 +150,8 @@ stdenv.mkDerivation (finalAttrs: { rm -r bin/libopen62541* ''; + __darwinAllowLocalNetworking = true; + passthru.updateScript = nix-update-script { }; passthru.tests = diff --git a/pkgs/by-name/op/open62541pp/package.nix b/pkgs/by-name/op/open62541pp/package.nix index 35b55a0786df..b5b992408db1 100644 --- a/pkgs/by-name/op/open62541pp/package.nix +++ b/pkgs/by-name/op/open62541pp/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "open62541pp"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "open62541pp"; repo = "open62541pp"; rev = "v${finalAttrs.version}"; - hash = "sha256-593UaEEqWaheqEBUl13ijuC25sNnuPe9a6gbBo7Zo+E="; + hash = "sha256-xFiL+biDETGNwWzbTcfAi3GF1Dj9vvXEj2wJ+GoFz1Q="; }; cmakeFlags = [ diff --git a/pkgs/by-name/op/openalSoft/package.nix b/pkgs/by-name/op/openalSoft/package.nix new file mode 100644 index 000000000000..c51300ebfb79 --- /dev/null +++ b/pkgs/by-name/op/openalSoft/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + removeReferencesTo, + alsaSupport ? stdenv.hostPlatform.isLinux, + alsa-lib, + dbusSupport ? !stdenv.hostPlatform.isDarwin, + dbus, + pipewireSupport ? !stdenv.hostPlatform.isDarwin, + pipewire, + pulseSupport ? !stdenv.hostPlatform.isDarwin, + libpulseaudio, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "openal-soft"; + version = "1.24.2"; + + src = fetchFromGitHub { + owner = "kcat"; + repo = "openal-soft"; + rev = version; + sha256 = "sha256-ECrIkxMACPsWehtJWwTmoYj6hGcsdxwVuTiQywG36Y8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + removeReferencesTo + ]; + + buildInputs = + lib.optional alsaSupport alsa-lib + ++ lib.optional dbusSupport dbus + ++ lib.optional pipewireSupport pipewire + ++ lib.optional pulseSupport libpulseaudio; + + cmakeFlags = + [ + # Automatically links dependencies without having to rely on dlopen, thus + # removes the need for NIX_LDFLAGS. + "-DALSOFT_DLOPEN=OFF" + + # allow oal-soft to find its own data files (e.g. HRTF profiles) + "-DALSOFT_SEARCH_INSTALL_DATADIR=1" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # https://github.com/NixOS/nixpkgs/issues/183774 + "-DALSOFT_BACKEND_OSS=OFF" + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^(\\d+\\.\\d+\\.\\d+)$" + ]; + }; + + meta = with lib; { + description = "OpenAL alternative"; + homepage = "https://openal-soft.org/"; + license = licenses.lgpl2; + maintainers = with maintainers; [ ftrvxmtrx ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/op/openapi-changes/package.nix b/pkgs/by-name/op/openapi-changes/package.nix index ad81688f85dd..4b2225416adb 100644 --- a/pkgs/by-name/op/openapi-changes/package.nix +++ b/pkgs/by-name/op/openapi-changes/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "openapi-changes"; - version = "0.0.76"; + version = "0.0.78"; src = fetchFromGitHub { owner = "pb33f"; repo = pname; rev = "v${version}"; - hash = "sha256-Z+jFfsreJYLdvxfFjmTr8SKHOV22iNDFKYUdi9/8QRI="; + hash = "sha256-Ct4VyYFqdMmROg9SE/pFNOJozSkQtKpgktJVgvtW/HA="; }; # this test requires the `.git` of the project to be present diff --git a/pkgs/by-name/op/openapi-down-convert/package.nix b/pkgs/by-name/op/openapi-down-convert/package.nix new file mode 100644 index 000000000000..77d0cb66e054 --- /dev/null +++ b/pkgs/by-name/op/openapi-down-convert/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + buildNpmPackage, + nodejs, + versionCheckHook, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "openapi-down-convert"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "apiture"; + repo = "openapi-down-convert"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8csxj2HfOb9agDmwNmksNaiQhRd+3D1tf0vWU2w+XWw="; + }; + + npmDepsHash = "sha256-5VgFAiphahDKz3ZhzNEdQOFxvhvDy+S/qOClqBgMzSg="; + + postInstall = '' + find $out/lib -type f \( -name '*.ts' \) -delete + rm -r $out/lib/node_modules/@apiture/openapi-down-convert/node_modules/typescript + rm $out/lib/node_modules/@apiture/openapi-down-convert/node_modules/.bin/* + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Convert an OpenAPI 3.1.x document to OpenAPI 3.0.x format"; + homepage = "https://github.com/apiture/openapi-down-convert"; + changelog = "https://github.com/apiture/openapi-down-convert/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ fliegendewurst ]; + mainProgram = "openapi-down-convert"; + }; +}) diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix index 5440c203766f..834f6ff85784 100644 --- a/pkgs/by-name/op/openapi-python-client/package.nix +++ b/pkgs/by-name/op/openapi-python-client/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { pname = "openapi-python-client"; - version = "0.24.2"; + version = "0.24.3"; pyproject = true; src = fetchFromGitHub { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "openapi-generators"; repo = "openapi-python-client"; tag = "v${version}"; - hash = "sha256-uGS5MearvggL7hPov3vgwyskKDXJFbHNzKdIu2WlA7A="; + hash = "sha256-EAHwICY8bjqYt0yGSG+SMcyTqeftfGCGTE4pJE120Mo="; }; nativeBuildInputs = diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix index 6b02d98c49b9..6d0f3262cf10 100644 --- a/pkgs/by-name/op/openbao/package.nix +++ b/pkgs/by-name/op/openbao/package.nix @@ -2,74 +2,82 @@ lib, fetchFromGitHub, buildGoModule, - go_1_24, - testers, - openbao, + installShellFiles, versionCheckHook, nix-update-script, + nixosTests, + callPackage, + stdenvNoCC, + withUi ? true, + withHsm ? stdenvNoCC.hostPlatform.isLinux, }: -buildGoModule.override { go = go_1_24; } rec { +buildGoModule (finalAttrs: { pname = "openbao"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "openbao"; repo = "openbao"; - tag = "v${version}"; - hash = "sha256-dDMOeAceMaSrF7P4JZ2MKy6zDa10LxCQKkKwu/Q3kOU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-qbLaa7EUQywPRTIgUclTomDDBxzdQnyVAqCGD+iOlpg="; }; - vendorHash = "sha256-zcMc63B/jTUykPfRKvea27xRxjOV+zytaxKOEQAUz1Q="; + vendorHash = "sha256-Upvv3dxS6HIFxR6T+2/dqnFsUtemjOGUaiICgPlepJ8="; proxyVendor = true; subPackages = [ "." ]; - tags = [ - "openbao" - "bao" - ]; + tags = lib.optional withHsm "hsm" ++ lib.optional withUi "ui"; ldflags = [ "-s" "-w" - "-X github.com/openbao/openbao/version.GitCommit=${src.rev}" - "-X github.com/openbao/openbao/version.fullVersion=${version}" + "-X github.com/openbao/openbao/version.GitCommit=${finalAttrs.src.rev}" + "-X github.com/openbao/openbao/version.fullVersion=${finalAttrs.version}" + "-X github.com/openbao/openbao/version.buildDate=1970-01-01T00:00:00Z" + ]; + + postConfigure = lib.optionalString withUi '' + cp -r --no-preserve=mode ${finalAttrs.passthru.ui} http/web_ui + ''; + + nativeBuildInputs = [ + installShellFiles ]; postInstall = '' mv $out/bin/openbao $out/bin/bao + + # https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/bash.go#L8 + installShellCompletion --bash --name bao <(echo complete -C "$out/bin/bao" bao) ''; - # TODO: Enable the NixOS tests after adding OpenBao as a NixOS service in an upcoming PR and - # adding NixOS tests - # - # passthru.tests = { inherit (nixosTests) vault vault-postgresql vault-dev vault-agent; }; - - passthru.tests.version = testers.testVersion { - package = openbao; - command = "HOME=$(mktemp -d) bao --version"; - version = "v${version}"; - }; - nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bao"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { - updateScript = nix-update-script { }; + ui = callPackage ./ui.nix { }; + tests = { inherit (nixosTests) openbao; }; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "ui" + ]; + }; }; meta = { homepage = "https://www.openbao.org/"; description = "Open source, community-driven fork of Vault managed by the Linux Foundation"; - changelog = "https://github.com/openbao/openbao/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/openbao/openbao/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mpl20; mainProgram = "bao"; maintainers = with lib.maintainers; [ brianmay ]; }; -} +}) diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix new file mode 100644 index 000000000000..b81451b5b8db --- /dev/null +++ b/pkgs/by-name/op/openbao/ui.nix @@ -0,0 +1,34 @@ +{ + stdenvNoCC, + openbao, + yarn-berry_3, + nodejs, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = openbao.pname + "-ui"; + inherit (openbao) version src; + sourceRoot = "${finalAttrs.src.name}/ui"; + + offlineCache = yarn-berry_3.fetchYarnBerryDeps { + inherit (finalAttrs) src sourceRoot; + hash = "sha256-bQ+ph7CvPtygvCoCMjTMadYLn/ds2ZOGQL29x3hFuLg="; + }; + + nativeBuildInputs = [ + yarn-berry_3.yarnBerryConfigHook + nodejs + yarn-berry_3 + ]; + + env.YARN_ENABLE_SCRIPTS = 0; + + postConfigure = '' + substituteInPlace .ember-cli \ + --replace-fail "../http/web_ui" "$out" + ''; + + buildPhase = "yarn run ember build --environment=production"; + + dontInstall = true; +}) diff --git a/pkgs/by-name/op/openboardview/package.nix b/pkgs/by-name/op/openboardview/package.nix index c68764ee1f6a..71f71e966e61 100644 --- a/pkgs/by-name/op/openboardview/package.nix +++ b/pkgs/by-name/op/openboardview/package.nix @@ -11,12 +11,8 @@ fontconfig, gtk3, wrapGAppsHook3, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation rec { pname = "openboardview"; version = "9.95.0"; @@ -44,15 +40,11 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook3 ]; - buildInputs = - [ - SDL2 - fontconfig - gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + buildInputs = [ + SDL2 + fontconfig + gtk3 + ]; postPatch = '' substituteInPlace src/openboardview/CMakeLists.txt \ diff --git a/pkgs/by-name/op/opencascade-occt/package.nix b/pkgs/by-name/op/opencascade-occt/package.nix index 85ee2f4d1683..6295a0c98e38 100644 --- a/pkgs/by-name/op/opencascade-occt/package.nix +++ b/pkgs/by-name/op/opencascade-occt/package.nix @@ -5,6 +5,7 @@ fetchpatch, cmake, ninja, + rapidjson, tcl, tk, libGL, @@ -12,7 +13,6 @@ libXext, libXmu, libXi, - darwin, }: stdenv.mkDerivation rec { @@ -48,9 +48,11 @@ stdenv.mkDerivation rec { libXext libXmu libXi - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; + rapidjson + ]; NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + cmakeFlags = [ "-DUSE_RAPIDJSON=ON" ]; meta = with lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; diff --git a/pkgs/by-name/op/opencl-clang/package.nix b/pkgs/by-name/op/opencl-clang/package.nix index 3a195fc68aa6..0d31c8f5b920 100644 --- a/pkgs/by-name/op/opencl-clang/package.nix +++ b/pkgs/by-name/op/opencl-clang/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, cmake, git, - llvmPackages_14, + llvmPackages_15, spirv-llvm-translator, buildWithPatches ? true, }: @@ -23,7 +23,7 @@ let ''; }); - llvmPkgs = llvmPackages_14; + llvmPkgs = llvmPackages_15; inherit (llvmPkgs) llvm; spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; libclang = if buildWithPatches then passthru.libclang else llvmPkgs.libclang; @@ -46,8 +46,8 @@ let postPatch = '' for filename in patches/clang/*.patch; do substituteInPlace "$filename" \ - --replace "a/clang/" "a/" \ - --replace "b/clang/" "b/" + --replace-fail "a/clang/" "a/" \ + --replace-fail "b/clang/" "b/" done ''; @@ -58,14 +58,13 @@ let }; }; - version = "14.0.0-unstable-2024-07-09"; + version = "15.0.1"; src = applyPatches { src = fetchFromGitHub { owner = "intel"; repo = "opencl-clang"; - # https://github.com/intel/opencl-clang/compare/ocl-open-140 - rev = "470cf0018e1ef6fc92eda1356f5f31f7da452abc"; - hash = "sha256-Ja+vJ317HI3Nh45kcAMhyLVTIqyy6pE5KAsKs4ou9J8="; + tag = "v${version}"; + hash = "sha256-mUqxe3lZQdhz/CRE1+NU2q5g2Taxlh7nzPwUHOB6I0c="; }; patches = [ @@ -78,13 +77,13 @@ let '' # fix not be able to find clang from PATH substituteInPlace cl_headers/CMakeLists.txt \ - --replace " NO_DEFAULT_PATH" "" + --replace-fail " NO_DEFAULT_PATH" "" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Uses linker flags that are not supported on Darwin. sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt substituteInPlace CMakeLists.txt \ - --replace '-Wl,--no-undefined' "" + --replace-fail '-Wl,--no-undefined' "" ''; }; in diff --git a/pkgs/by-name/op/opencl-clhpp/package.nix b/pkgs/by-name/op/opencl-clhpp/package.nix index 241c80190e18..5a545fccc4da 100644 --- a/pkgs/by-name/op/opencl-clhpp/package.nix +++ b/pkgs/by-name/op/opencl-clhpp/package.nix @@ -4,18 +4,22 @@ fetchFromGitHub, cmake, python3, + ruby, opencl-headers, + khronos-ocl-icd-loader, + testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencl-clhpp"; - version = "2024.05.08"; + version = "2024.10.24"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-CLHPP"; - rev = "v${version}"; - sha256 = "sha256-bIm4tGqwWX0IPKH3BwLgkf0T7YFrkN6vemYvdPrqUpw="; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + sha256 = "sha256-3RVZJIt03pRmjrPa9q6h6uqFCuTnxvEqjUGUmdwybbY="; }; nativeBuildInputs = [ @@ -27,15 +31,28 @@ stdenv.mkDerivation rec { strictDeps = true; + doCheck = true; + checkInputs = [ khronos-ocl-icd-loader ]; + nativeCheckInputs = [ ruby ]; + cmakeFlags = [ - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_TESTS=OFF" + (lib.cmakeBool "OPENCL_CLHPP_BUILD_TESTING" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "BUILD_EXAMPLES" finalAttrs.finalPackage.doCheck) ]; - meta = with lib; { + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "OpenCL-CLHPP" ]; + # Package version does not match the pkg-config module version. + }; + }; + + meta = { description = "OpenCL Host API C++ bindings"; homepage = "http://github.khronos.org/OpenCL-CLHPP/"; - license = licenses.mit; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.xokdvium ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/op/opencl-headers/package.nix b/pkgs/by-name/op/opencl-headers/package.nix index 94e8e4b0ffbe..b0bfde105a11 100644 --- a/pkgs/by-name/op/opencl-headers/package.nix +++ b/pkgs/by-name/op/opencl-headers/package.nix @@ -7,6 +7,7 @@ ocl-icd, tesseract, testers, + opencl-clhpp, }: stdenv.mkDerivation (finalAttrs: { @@ -23,18 +24,23 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; passthru.tests = { - inherit ocl-icd tesseract hashcat; + inherit + ocl-icd + tesseract + hashcat + opencl-clhpp + ; pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; moduleNames = [ "OpenCL-Headers" ]; }; }; - meta = with lib; { + meta = { description = "Khronos OpenCL headers version ${finalAttrs.version}"; homepage = "https://www.khronos.org/registry/cl/"; - license = licenses.asl20; - platforms = platforms.unix ++ platforms.windows; - maintainers = [ ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix ++ lib.platforms.windows; + maintainers = [ lib.maintainers.xokdvium ]; }; }) diff --git a/pkgs/by-name/op/openclonk/package.nix b/pkgs/by-name/op/openclonk/package.nix index aec87ac14830..0626cf498086 100644 --- a/pkgs/by-name/op/openclonk/package.nix +++ b/pkgs/by-name/op/openclonk/package.nix @@ -1,44 +1,53 @@ { lib, stdenv, + + # sources fetchurl, fetchFromGitHub, fetchDebianPatch, + + # nativeBuildInputs cmake, + ninja, pkg-config, - SDL2, - libvorbis, - libogg, - libjpeg, - libpng, - freetype, - glew, - tinyxml, - openal, - libepoxy, + + # buildInputs curl, freealut, - readline, + freetype, + glew, libb2, - gcc-unwrapped, - enableSoundtrack ? false, # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther + libepoxy, + libjpeg, + libogg, + libpng, + libvorbis, + libXrandr, + openal, + readline, + SDL2, + tinyxml, + + # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther + enableSoundtrack ? false, }: let soundtrack_src = fetchurl { url = "http://www.openclonk.org/download/Music.ocg"; - sha256 = "1ckj0dlpp5zsnkbb5qxxfxpkiq76jj2fgj91fyf3ll7n0gbwcgw5"; + hash = "sha256-Mye6pl1eSgEQ/vOLfDsdHDjp2ljb3euGKBr7s36+2W4="; }; in stdenv.mkDerivation { - version = "unstable-2023-10-30"; + version = "9.0-unstable-2025-01-11"; pname = "openclonk"; src = fetchFromGitHub { owner = "openclonk"; repo = "openclonk"; - rev = "5275334a11ef7c23ce809f35d6b443abd91b415f"; - sha256 = "14x5b2rh739156l4072rbsnv9n862jz1zafi6ng158ja5fwl16l2"; + rev = "db975b4a887883f4413d1ce3181f303d83ee0ab5"; + hash = "sha256-Vt7umsfe2TVZAeKJOXCi2ZCbSv6wAotuMflS7ii7Y/E="; }; patches = [ @@ -51,52 +60,47 @@ stdenv.mkDerivation { }) ]; - enableParallelInstalling = false; - postInstall = - '''' + '' + mv $out/games/openclonk $out/bin + rm -r $out/games + '' + lib.optionalString enableSoundtrack '' ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg ''; nativeBuildInputs = [ cmake + ninja pkg-config ]; buildInputs = [ - SDL2 - libvorbis - libogg - libjpeg - libpng + curl + freealut freetype glew - tinyxml - openal - freealut - libepoxy - curl - readline libb2 - ]; - - cmakeFlags = [ - "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" - "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + libepoxy + libjpeg + libogg + libpng + libvorbis + libXrandr + openal + readline + SDL2 + tinyxml ]; cmakeBuildType = "RelWithDebInfo"; - meta = with lib; { + meta = { description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings"; homepage = "https://www.openclonk.org"; - license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc; + license = with lib.licenses; [ isc ] ++ lib.optional enableSoundtrack unfreeRedistributable; mainProgram = "openclonk"; - maintainers = [ ]; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + maintainers = with lib.maintainers; [ wolfgangwalther ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/op/opencloud-desktop-shell-integration-dolphin/package.nix b/pkgs/by-name/op/opencloud-desktop-shell-integration-dolphin/package.nix new file mode 100644 index 000000000000..d8c3f666c639 --- /dev/null +++ b/pkgs/by-name/op/opencloud-desktop-shell-integration-dolphin/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + qt6, + kdePackages, + opencloud-desktop-shell-integration-resources, +}: + +stdenv.mkDerivation rec { + pname = "opencloud-desktop-shell-integration-dolphin"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "opencloud-eu"; + repo = "desktop-shell-integration-dolphin"; + tag = "v${version}"; + hash = "sha256-+Bu/kN4RvR/inWQHYcfWOF6BWHTFm5jlea/QeT4NhFQ="; + }; + + buildInputs = [ + qt6.qtbase + kdePackages.extra-cmake-modules + kdePackages.kbookmarks + kdePackages.kcoreaddons + kdePackages.kio + opencloud-desktop-shell-integration-resources + ]; + + nativeBuildInputs = [ + cmake + ]; + + dontWrapQtApps = true; + + meta = { + description = "This is the OpenCloud Desktop shell integration for the great KDE Dolphin in KDE Frameworks 6"; + homepage = "https://github.com/opencloud-eu/desktop-shell-integration-dolphin"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ k900 ]; + mainProgram = "opencloud-desktop-shell-integration-dolphin"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/op/opencloud-desktop-shell-integration-resources/package.nix b/pkgs/by-name/op/opencloud-desktop-shell-integration-resources/package.nix new file mode 100644 index 000000000000..13a9c593090d --- /dev/null +++ b/pkgs/by-name/op/opencloud-desktop-shell-integration-resources/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kdePackages, +}: + +stdenv.mkDerivation rec { + pname = "opencloud-desktop-shell-integration-resources"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "opencloud-eu"; + repo = "desktop-shell-integration-resources"; + tag = "v${version}"; + hash = "sha256-TqJanrAKD3aNQu5jL1Dt0bn84dYBNGImAKBGsAY2xeU="; + }; + + buildInputs = [ + kdePackages.extra-cmake-modules + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Shared assets for OpenCloud desktop shell integrations"; + homepage = "https://github.com/opencloud-eu/desktop-shell-integration-resources"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ k900 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/op/opencloud-desktop/package.nix b/pkgs/by-name/op/opencloud-desktop/package.nix new file mode 100644 index 000000000000..75603c122918 --- /dev/null +++ b/pkgs/by-name/op/opencloud-desktop/package.nix @@ -0,0 +1,54 @@ +{ + lib, + cmake, + kdePackages, + fetchFromGitHub, + libre-graph-api-cpp-qt-client, + kdsingleapplication, + nix-update-script, + qt6, + versionCheckHook, + stdenv, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "opencloud-desktop"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "opencloud-eu"; + repo = "desktop"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sGbjFPidPncCu9LqaeClrXoKQUzhbR1XbX8RoLuz+N8="; + }; + + buildInputs = [ + kdePackages.extra-cmake-modules + qt6.qtbase + qt6.qtdeclarative + qt6.qttools + kdePackages.qtkeychain + libre-graph-api-cpp-qt-client + kdsingleapplication + ]; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ]; + + strictDeps = true; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/opencloudcmd"; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/opencloud-eu/desktop/releases/tag/v${finalAttrs.version}"; + description = "Desktop Application for OpenCloud"; + downloadPage = "https://github.com/opencloud-eu/desktop"; + homepage = "https://opencloud.eu/en"; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.FKouhai ]; + }; +}) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix new file mode 100644 index 000000000000..ea8e181ed03e --- /dev/null +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -0,0 +1,55 @@ +{ + stdenvNoCC, + lib, + opencloud, + pnpm_10, + nodejs, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "opencloud-idp-web"; + + inherit (opencloud) version src; + + pnpmRoot = "services/idp"; + + pnpmDeps = pnpm_10.fetchDeps { + inherit (finalAttrs) pname version src; + sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}"; + hash = "sha256-gFhWDYk3DcwUowZ9AQjCqHZL1oniK3YCNiG1cDGabYg="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_10.configHook + ]; + + buildPhase = '' + runHook preBuild + cd $pnpmRoot + pnpm build + mkdir -p assets/identifier/static + cp -v src/images/favicon.svg assets/identifier/static/favicon.svg + cp -v src/images/icon-lilac.svg assets/identifier/static/icon-lilac.svg + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir $out + cp -r assets $out + runHook postInstall + ''; + + meta = { + description = "OpenCloud - IDP Web UI"; + homepage = "https://github.com/opencloud-eu/opencloud"; + changelog = "https://github.com/opencloud-eu/opencloud/blob/v${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + christoph-heiss + k900 + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix new file mode 100644 index 000000000000..0f3dd11ef6f1 --- /dev/null +++ b/pkgs/by-name/op/opencloud/package.nix @@ -0,0 +1,119 @@ +{ + lib, + callPackage, + buildGoModule, + fetchFromGitHub, + ncurses, + gettext, + pigeon, + go-mockery, + protoc-go-inject-tag, + libxcrypt, + vips, + pkg-config, + nixosTests, + nix-update-script, + versionCheckHook, +}: + +let + bingoBinsMakefile = builtins.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: "${n} := ${v}\n\\$(${n}):") { + GO_XGETTEXT = "xgettext"; + MOCKERY = "mockery"; + PIGEON = "pigeon"; + PROTOC_GO_INJECT_TAG = "protoc-go-inject-tag"; + } + ); +in +buildGoModule rec { + pname = "opencloud"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "opencloud-eu"; + repo = "opencloud"; + tag = "v${version}"; + hash = "sha256-IIasFyKF28ynYi8bAmx8LddF0OWB1/Hji6Ovp5pm9QE="; + }; + + postPatch = '' + echo "${bingoBinsMakefile}" >.bingo/Variables.mk + + # tries to build web assets, done separately + substituteInPlace services/idp/Makefile \ + --replace-fail 'node-generate-prod: assets' 'node-generate-prod:' + # tries to download something web assets .. + substituteInPlace services/web/Makefile \ + --replace-fail 'node-generate-prod: download-assets' 'node-generate-prod:' + + # tries to build some random binaries off the internet and + # no need to build protobuf bindings anyway, as they are in-repo already + sed -i -e '/\$(BINGO) get/d' -e '/\$(BUF) generate/d' .make/protobuf.mk + ''; + + vendorHash = null; + + preConfigure = '' + export HOME=$(mktemp -d) + make generate + ''; + + ldflags = [ + "-s" + "-w" + "-X" + "github.com/opencloud-eu/opencloud/pkg/version.String=nixos" + "-X" + "github.com/opencloud-eu/opencloud/pkg/version.Tag=${version}" + "-X" + "github.com/opencloud-eu/opencloud/pkg/version.Date=19700101" + ]; + + tags = [ "enable_vips" ]; + + nativeBuildInputs = [ + ncurses + gettext + pigeon + go-mockery + protoc-go-inject-tag + pkg-config + ]; + + buildInputs = [ + libxcrypt + vips + ]; + + env = { + # avoids 'make generate' calling `git`, otherwise no-op + STRING = version; + VERSION = version; + }; + + excludedPackages = [ "tests/*" ]; + + passthru = { + web = callPackage ./web.nix { }; + idp-web = callPackage ./idp-web.nix { }; + tests = { inherit (nixosTests) opencloud; }; + updateScript = nix-update-script { }; + }; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "version" ]; + + meta = { + description = "OpenCloud gives you a secure and private way to store, access, and share your files."; + homepage = "https://github.com/opencloud-eu/opencloud"; + changelog = "https://github.com/opencloud-eu/opencloud/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + christoph-heiss + k900 + ]; + mainProgram = "opencloud"; + }; +} diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix new file mode 100644 index 000000000000..7513839ab0e6 --- /dev/null +++ b/pkgs/by-name/op/opencloud/web.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nodejs, + pnpm_10, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "opencloud-web"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "opencloud-eu"; + repo = "web"; + tag = "v${finalAttrs.version}"; + hash = "sha256-64Dwkx5IEwlaIX1z6Roi6cSWB2ETBldQcNWxgWiUX18="; + }; + + pnpmDeps = pnpm_10.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-UKgtthdRnI+iR4Qn07nabQOzWZFATjIfrQfwxhKJkx8="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_10.configHook + ]; + + buildPhase = '' + runHook preBuild + pnpm build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir $out + cp -r dist/* $out + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Web UI for OpenCloud built with Vue.js and TypeScript"; + homepage = "https://github.com/opencloud-eu/web"; + changelog = "https://github.com/opencloud-eu/web/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + christoph-heiss + k900 + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix new file mode 100644 index 000000000000..1b0f99707070 --- /dev/null +++ b/pkgs/by-name/op/opencode/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: + +buildGoModule (finalAttrs: { + pname = "opencode"; + version = "0.0.46"; + + src = fetchFromGitHub { + owner = "opencode-ai"; + repo = "opencode"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q7ArUsFMpe0zayUMBJd+fC1K4jTGElIFep31Qa/L1jY="; + }; + + vendorHash = "sha256-MVpluFTF/2S6tRQQAXE3ujskQZ3njBkfve0RQgk3IkQ="; + + checkFlags = + let + skippedTests = [ + # permission denied + "TestBashTool_Run" + "TestSourcegraphTool_Run" + "TestLsTool_Run" + ]; + in + [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; + + meta = { + description = "Powerful terminal-based AI assistant providing intelligent coding assistance"; + homepage = "https://github.com/opencode-ai/opencode"; + mainProgram = "opencode"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + zestsystem + ]; + }; +}) diff --git a/pkgs/by-name/op/opencore-amr/package.nix b/pkgs/by-name/op/opencore-amr/package.nix index 6eef6bade0e4..159e9162ebe8 100644 --- a/pkgs/by-name/op/opencore-amr/package.nix +++ b/pkgs/by-name/op/opencore-amr/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "https://opencore-amr.sourceforge.io/"; + homepage = "https://sourceforge.net/projects/opencore-amr/"; description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/op/openct/package.nix b/pkgs/by-name/op/openct/package.nix index 2b25bf2614c5..62c2f5ed9e40 100644 --- a/pkgs/by-name/op/openct/package.nix +++ b/pkgs/by-name/op/openct/package.nix @@ -3,28 +3,34 @@ stdenv, fetchFromGitHub, autoreconfHook, - pkg-config, - pcsclite, - libusb-compat-0_1, doxygen, libxslt, + pkg-config, + pcsclite, + libtool, + libusb-compat-0_1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openct"; version = "0.6.20"; src = fetchFromGitHub { owner = "OpenSC"; repo = "openct"; - rev = "${pname}-${version}"; - sha256 = "09wxq0jxdxhci3zr7jd3zcxjkl3j0r1v00k3q8gqrg9gighh8nk2"; + rev = "openct-${finalAttrs.version}"; + hash = "sha256-YloE4YsvvYwfwmMCsEMGctApO/ujyZP/iAz21iXAnSc="; }; postPatch = '' - sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am + substituteInPlace etc/Makefile.am \ + --replace-fail "DESTDIR" "out" ''; + # unbreak build on GCC 14, remove when https://github.com/OpenSC/openct/pull/12 + # (or equivalent) is merged and released + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + configureFlags = [ "--enable-api-doc" "--enable-usb" @@ -35,24 +41,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook + doxygen + libxslt # xsltproc pkg-config ]; + buildInputs = [ pcsclite + libtool # libltdl libusb-compat-0_1 - doxygen - libxslt ]; + strictDeps = true; + preInstall = '' mkdir -p $out/etc ''; - meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; + meta = { homepage = "https://github.com/OpenSC/openct/"; - license = licenses.lgpl21; description = "Drivers for several smart card readers"; - platforms = platforms.all; + license = lib.licenses.lgpl21; + maintainers = [ ]; + platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/op/openctm/package.nix b/pkgs/by-name/op/openctm/package.nix index bb6bd763ea1d..84c4f11dfdea 100644 --- a/pkgs/by-name/op/openctm/package.nix +++ b/pkgs/by-name/op/openctm/package.nix @@ -6,7 +6,6 @@ libglut, gtk2, libGLU, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -27,13 +26,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libglut - libGLU - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = [ + libglut + libGLU + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 ]; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/op/opendbx/package.nix b/pkgs/by-name/op/opendbx/package.nix index 0e6db1ef2ec4..4b46e91ae277 100644 --- a/pkgs/by-name/op/opendbx/package.nix +++ b/pkgs/by-name/op/opendbx/package.nix @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; + configureFlags = [ + # detection fails when cross-compiling + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + "ac_cv_func_strtod=yes" + ]; + buildInputs = [ readline libmysqlclient diff --git a/pkgs/by-name/op/opendht/package.nix b/pkgs/by-name/op/opendht/package.nix new file mode 100644 index 000000000000..cecc8ee47b0b --- /dev/null +++ b/pkgs/by-name/op/opendht/package.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + asio, + nettle, + gnutls, + msgpack-cxx, + readline, + libargon2, + jsoncpp, + restinio, + llhttp, + openssl, + fmt, + enableProxyServerAndClient ? false, + enablePushNotifications ? false, +}: + +stdenv.mkDerivation { + pname = "opendht"; + version = "3.2.0-unstable-2025-01-05"; + + src = fetchFromGitHub { + owner = "savoirfairelinux"; + repo = "opendht"; + rev = "5237f0a3b3eb8965f294de706ad73596569ae1dd"; + hash = "sha256-qErVKyZQR/asJ8qr0sRDaXZ8jUV7RaSLnJka5baWa7Q="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = + [ + asio + fmt + nettle + gnutls + msgpack-cxx + readline + libargon2 + ] + ++ lib.optionals enableProxyServerAndClient [ + jsoncpp + restinio + llhttp + openssl + ]; + + cmakeFlags = + lib.optionals enableProxyServerAndClient [ + "-DOPENDHT_PROXY_SERVER=ON" + "-DOPENDHT_PROXY_CLIENT=ON" + ] + ++ lib.optionals enablePushNotifications [ + "-DOPENDHT_PUSH_NOTIFICATIONS=ON" + ]; + + # https://github.com/savoirfairelinux/opendht/issues/612 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + + outputs = [ + "out" + "lib" + "dev" + "man" + ]; + + meta = with lib; { + description = "C++11 Kademlia distributed hash table implementation"; + homepage = "https://github.com/savoirfairelinux/opendht"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + taeer + olynch + thoughtpolice + ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/op/opendmarc/package.nix b/pkgs/by-name/op/opendmarc/package.nix index 9dba438fa06e..cf48bbeda178 100644 --- a/pkgs/by-name/op/opendmarc/package.nix +++ b/pkgs/by-name/op/opendmarc/package.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { bsd3 sendmail ]; - maintainers = teams.helsinki-systems.members; + teams = [ teams.helsinki-systems ]; }; } diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix index e5f6354cb0d2..0c59cfb1d84d 100644 --- a/pkgs/by-name/op/openfga-cli/package.nix +++ b/pkgs/by-name/op/openfga-cli/package.nix @@ -7,7 +7,7 @@ let pname = "openfga-cli"; - version = "0.6.4"; + version = "0.6.6"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "cli"; rev = "v${version}"; - hash = "sha256-EIfVu6RnfIlHDKa5Kfy9cZ9ntg4Mdaz0SaDcCVHi01Q="; + hash = "sha256-cmeWRtdt3mm5FqOq28pWNPgwQeJs/5amZ5RHT8VzwYQ="; }; - vendorHash = "sha256-l6gZ8E7WYeJq8crxzKAP8q4L9aoXkjad64XUZfToE14="; + vendorHash = "sha256-vIkG78ep/JcjhlQznn93ImLrZCpKX6GU6FEzbJBPu2Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index 69c7e761b0f3..92fc6c889a47 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,7 +7,7 @@ let pname = "openfga"; - version = "1.8.8"; + version = "1.8.11"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "openfga"; rev = "v${version}"; - hash = "sha256-Hg6mtePtaZ2Yg3ohDVEDFsZKcBDY24K2lb+avZHfqD8="; + hash = "sha256-Qv82KeRcK6Io+JB/5NvJ4pdUNFmf8H1OUzRyoH7P4BQ="; }; - vendorHash = "sha256-M14y4WZZTvXm6dOkJV16TFv2xHkInZCI9rEu9h7lQ1I="; + vendorHash = "sha256-Bzgtb4kYUB/+JhFqYoiLKFe09EpNrBk2gwOndLXDm/8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/openfortivpn/package.nix b/pkgs/by-name/op/openfortivpn/package.nix index 55d15037f805..45ca1758d881 100644 --- a/pkgs/by-name/op/openfortivpn/package.nix +++ b/pkgs/by-name/op/openfortivpn/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index 807b5ad92204..497f1e03eda1 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -1,6 +1,5 @@ { alsa-lib, - autoPatchelfHook, cargo, dbus, fetchFromGitHub, @@ -24,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "opengamepadui"; - version = "0.39.0"; + version = "0.39.2"; buildType = if withDebug then "debug" else "release"; @@ -32,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ShadowBlip"; repo = "OpenGamepadUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-eBHDJVbPL4Lw1TDOOJT4rzvSb+F7J6EdsLbL4co69nk="; + hash = "sha256-r7AR3PAYgTS/KvL44xkAr/iJM19grbmjwjZyzOSFXMc="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -43,34 +42,12 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "extensions"; nativeBuildInputs = [ - autoPatchelfHook cargo godot_4_4 - godot_4_4.export-templates-bin pkg-config rustPlatform.cargoSetupHook ]; - runtimeDependencies = [ - alsa-lib - dbus - gamescope - hwdata - libGL - libpulseaudio - mesa-demos - udev - upower - vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXrandr - xorg.libXres - xorg.libXtst - ]; - dontStrip = withDebug; env = @@ -81,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { GODOT = lib.getExe godot_4_4; GODOT_VERSION = lib.elemAt versionAndRelease 0; GODOT_RELEASE = lib.elemAt versionAndRelease 1; - EXPORT_TEMPLATE = "${godot_4_4.export-templates-bin}"; + EXPORT_TEMPLATE = "${godot_4_4.export-template}/share/godot/export_templates"; BUILD_TYPE = "${finalAttrs.buildType}"; }; @@ -92,15 +69,26 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' # Godot looks for export templates in HOME export HOME=$(mktemp -d) - mkdir -p $HOME/.local/share/godot/export_templates - ln -s "${godot_4_4.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE" + mkdir -p $HOME/.local/share/godot/ + ln -s "$EXPORT_TEMPLATE" "$HOME"/.local/share/godot/ ''; - postInstall = '' - # The Godot binary looks in "../lib" for gdextensions - mkdir -p $out/share/lib - mv $out/share/opengamepadui/*.so $out/share/lib - ''; + postInstall = + let + runtimeDependencies = [ + gamescope + hwdata + mesa-demos + udev + upower + ]; + in + '' + # The Godot binary looks in "../lib" for gdextensions + mkdir -p $out/share/lib + mv $out/share/opengamepadui/*.so $out/share/lib + patchelf --add-rpath ${lib.makeLibraryPath runtimeDependencies} $out/share/lib/*.so + ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index 9ab36bc952d7..d1f4254b7d08 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -7,24 +7,28 @@ moreutils, jq, git, + writableTmpDirAsHomeHook, }: -let - # finalAttrs when 🥺 (buildGoModule does not support them) - # https://github.com/NixOS/nixpkgs/issues/273815 - version = "1.9.1"; + +buildGoModule (finalAttrs: { + pname = "opengist"; + + version = "1.10.0"; + src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; - tag = "v${version}"; - hash = "sha256-Zjn38OGnDtgD2OfIhgUxWo0Cx+ZmNv6UjJanASbjiYU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-cSPKtcD1V+WTSCkgi8eKhGbtW+WdCoetbiSrNvEVRW4="; }; frontend = buildNpmPackage { pname = "opengist-frontend"; - inherit version src; + inherit (finalAttrs) version src; + # npm complains of "invalid package". shrug. we can give it a version. postPatch = '' - ${lib.getExe jq} '.version = "${version}"' package.json | ${lib.getExe' moreutils "sponge"} package.json + ${lib.getExe jq} '.version = "${finalAttrs.version}"' package.json | ${lib.getExe' moreutils "sponge"} package.json ''; # copy pasta from the Makefile upstream, seems to be a workaround of sass @@ -41,41 +45,37 @@ let npmDepsHash = "sha256-Uh+oXd//G/lPAMXRxijjEOpQNmeXK/XCIU7DJN3ujaY="; }; -in -buildGoModule { - pname = "opengist"; - inherit version src; - vendorHash = "sha256-aqfr3yGyTXDtZDU8d1lbWWvFfY4fo6/PsSDwpiDtM90="; + + vendorHash = "sha256-m2f9+PEMjVhlXs7b1neEWO0VY1fQSfe+T1aNEdtML28="; + tags = [ "fs_embed" ]; + ldflags = [ "-s" - "-X github.com/thomiceli/opengist/internal/config.OpengistVersion=v${version}" + "-X github.com/thomiceli/opengist/internal/config.OpengistVersion=v${finalAttrs.version}" ]; - # required for tests nativeCheckInputs = [ git + writableTmpDirAsHomeHook ]; - # required for tests to not try to write into $HOME and fail - preCheck = '' - export OG_OPENGIST_HOME=$(mktemp -d) - ''; - doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck + make test + runHook postCheck ''; postPatch = '' - cp -R ${frontend}/public/{manifest.json,assets} public/ + cp -R ${finalAttrs.frontend}/public/{manifest.json,assets} public/ ''; passthru = { - inherit frontend; + inherit (finalAttrs) frontend; updateScript = ./update.sh; }; @@ -83,9 +83,9 @@ buildGoModule { description = "Self-hosted pastebin powered by Git"; homepage = "https://github.com/thomiceli/opengist"; license = lib.licenses.agpl3Only; - changelog = "https://github.com/thomiceli/opengist/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/thomiceli/opengist/blob/v${finalAttrs.version}/CHANGELOG.md"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ phanirithvij ]; mainProgram = "opengist"; }; -} +}) diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix index 69efb208b6bf..045976f632e2 100644 --- a/pkgs/by-name/op/opengrok/package.nix +++ b/pkgs/by-name/op/opengrok/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.27"; + version = "1.13.30"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-Qr30+paSn3I3+tWpzALTIXP8kxireL96rKopDDj/qnM="; + hash = "sha256-upmmgyZXl4DUn4BjU0b7+T7LYw/JC9cRyiy169Ned/U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index b15816eefc19..d70de0343f30 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -3,7 +3,6 @@ config, cudaPackages, cudaSupport ? config.cudaSupport, - darwin, fetchzip, ispc, lib, @@ -15,12 +14,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "openimagedenoise"; - version = "2.3.2"; + version = "2.3.3"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/RenderKit/oidn/releases/download/v${finalAttrs.version}/oidn-${finalAttrs.version}.src.tar.gz"; - sha256 = "sha256-yTa6U/1idfidbfNTQ7mXcroe7M4eM7Frxi45A/7e2A8="; + sha256 = "sha256-JzAd47fYGLT6DeOep8Wag29VY9HOTpqf0OSv1v0kGQU="; }; patches = lib.optional cudaSupport ./cuda.patch; @@ -42,14 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ tbb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Accelerate - MetalKit - MetalPerformanceShadersGraph - ] - ) + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart cudaPackages.cuda_cccl diff --git a/pkgs/by-name/op/openimageio/2.nix b/pkgs/by-name/op/openimageio/2.nix new file mode 100644 index 000000000000..d31dd2190a51 --- /dev/null +++ b/pkgs/by-name/op/openimageio/2.nix @@ -0,0 +1,15 @@ +{ fetchFromGitHub, openimageio }: + +let + version = "2.5.17.0"; +in +openimageio.overrideAttrs { + inherit version; + + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "OpenImageIO"; + tag = "v${version}"; + hash = "sha256-d5LqRcqWj6E9jJYY/Pa5e7/MeuQGMjUo/hMCYRKsKeU="; + }; +} diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix new file mode 100644 index 000000000000..884b9d61b331 --- /dev/null +++ b/pkgs/by-name/op/openimageio/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchFromGitHub, + boost, + cmake, + giflib, + libjpeg, + libpng, + libtiff, + opencolorio, + openexr, + robin-map, + unzip, + fmt, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "openimageio"; + version = "3.0.6.1"; + + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "OpenImageIO"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ymg7uSnPBKotnV6/FaVBIndsz6oEP5gfZ1+poMIdR4I="; + }; + + outputs = [ + "bin" + "out" + "dev" + "doc" + ]; + + nativeBuildInputs = [ + cmake + unzip + ]; + + buildInputs = [ + boost + giflib + libjpeg + libpng + libtiff + opencolorio + openexr + robin-map + ]; + + propagatedBuildInputs = [ + fmt + ]; + + cmakeFlags = [ + "-DUSE_PYTHON=OFF" + "-DUSE_QT=OFF" + # GNUInstallDirs + "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config + # Do not install a copy of fmt header files + "-DINTERNALIZE_FMT=OFF" + ]; + + postFixup = '' + substituteInPlace $dev/lib/cmake/OpenImageIO/OpenImageIOTargets-*.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$out/lib/lib" + ''; + + meta = { + homepage = "https://openimageio.org"; + description = "Library and tools for reading and writing images"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ yzx9 ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/op/openipmi/package.nix b/pkgs/by-name/op/openipmi/package.nix index 652ec050a24d..c8ace62f7daf 100644 --- a/pkgs/by-name/op/openipmi/package.nix +++ b/pkgs/by-name/op/openipmi/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "OpenIPMI"; - version = "2.0.36"; + version = "2.0.37"; src = fetchurl { url = "mirror://sourceforge/openipmi/OpenIPMI-${version}.tar.gz"; - sha256 = "sha256-oEAxSPpfe+2TDJWKTRxVgEfic3Y6QIs6A2jtwTfMVdk="; + sha256 = "sha256-xi049dp99Cmaw6ZSUI6VlTd1JEAYHjTHayrs69fzAbk="; }; buildInputs = [ @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { lgpl2Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ arezvov ] ++ teams.c3d2.members; + maintainers = with maintainers; [ arezvov ]; + teams = [ teams.c3d2 ]; }; } diff --git a/pkgs/by-name/op/openjfx/24/deps.json b/pkgs/by-name/op/openjfx/24/deps.json new file mode 100644 index 000000000000..55263fae58fe --- /dev/null +++ b/pkgs/by-name/op/openjfx/24/deps.json @@ -0,0 +1,161 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": { + "jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs=" + }, + "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355": { + "jar": "sha256-j98ySq5bTxFHbDJKzWMZP+kfUqekWU1jYUJNDyNg9js=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-74-2/icu4c-74_2-data-bin-l": { + "zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.11.3": { + "module": "sha256-S/D1PO6nx5D9+9JNujyeBM3FGGQnnuv8V6qkc+vKA4A=", + "pom": "sha256-8T3y5Mrx/rzlZ2Z+fDeBAaAzHVPRMk1uLf467Psfd3Q=" + }, + "org/junit/jupiter#junit-jupiter-api/5.11.3": { + "jar": "sha256-XYFHpg9JRTlz4lDtaHAbf/BVlk/iRi/Cyx7B1tRIibo=", + "module": "sha256-zC4yvwDuZDSpoZ3P2fJ6z2ZaPdYy03fkdhgNies+8n0=", + "pom": "sha256-8Zr+CSOwGTXEDy5+ltZgN+IAi3AXkXzHBRM4N3hJYY4=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.11.3": { + "jar": "sha256-5iQgyZ98DVmiFZou9j5hh36cgL1yLAPKi/O9zqBQpYk=", + "module": "sha256-s3w9vEFSbrpeVMz/ROxUf0hVYstDyj0J2p+n2hmjBl4=", + "pom": "sha256-eJ43jTfEndhlTWbjrTreQY5YhK5vSHI5Ad0758nsngM=" + }, + "org/junit/jupiter#junit-jupiter-params/5.11.3": { + "jar": "sha256-D3mOvsdExOZgX9TyBy9BqOmJ4tRp4h21qmfPeZwLUew=", + "module": "sha256-sLUYC9HX9NFhsKCF+7JP2hbNcKfQX2Ni4asuSS0cq+w=", + "pom": "sha256-zOw0JKBxSUTGd7lP1QP9DByiQ84VxAFg1gzmKKr6Nf8=" + }, + "org/junit/jupiter#junit-jupiter/5.11.3": { + "jar": "sha256-rHV47+0WI2fD3cAGM44H1FcVEP2YZmQuqT1bnk7S9mU=", + "module": "sha256-a5pr3dlKOPEmUmh67HyBJisZkf6+vEjKmP6rxWOhKwE=", + "pom": "sha256-y+nzhaChO2/tjGxu0fFtxgWpJlfzslsZaDjHPZdoSAY=" + }, + "org/junit/platform#junit-platform-commons/1.11.3": { + "jar": "sha256-viYpZLC2tI3pd8YdT5Md+M9h6A51DMPzoKOc3SHBAIw=", + "module": "sha256-l531zqTESC/fxZCK3ItGq2q/ADbpmk0CzBjAdDyLggc=", + "pom": "sha256-gW69MkSncNkV2cHUDTtGUf40j0L4m3y369De4gnFIEA=" + }, + "org/junit/platform#junit-platform-engine/1.11.3": { + "jar": "sha256-AEP3L2EWZHNdqNyaMIvxLs0iNrBTOTUcR0HttNj6sNo=", + "module": "sha256-K5UnTIxw3eS9vEmQnxxY61qSLlQcXdO+qpx68rv6Qaw=", + "pom": "sha256-/ibcXakRuUtowSsiQSV6IIE1u7m4yRzBoTQzqAp6eR4=" + }, + "org/junit/platform#junit-platform-launcher/1.11.3": { + "jar": "sha256-tHJ0WSAbABG+sHQr2AdCGh/IQmsRYZMDHth4JbwtTwQ=", + "module": "sha256-cqqtIKPLIsFMA9WYDgJZZ1KmWe3EaylHH35c/yJWbow=", + "pom": "sha256-ElFDZ7k84oUOXa4jt8PWSjZuVMuLgjf5FNiD/Z26G/o=" + }, + "org/junit/vintage#junit-vintage-engine/5.11.3": { + "jar": "sha256-1YAiQZvHaz309Hmis1mdleJEZM1o+3wiZ/GhqHEhXEc=", + "module": "sha256-/ruKwpJtQhhJUQhtKDFqn0AfjEoUMhW4QleXCHEGBoQ=", + "pom": "sha256-Js5pMwDkTPg5mu0wujw7kBA6inM8/wH5DfCMDyvs2CA=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/by-name/op/openjfx/24/source.json b/pkgs/by-name/op/openjfx/24/source.json new file mode 100644 index 000000000000..d9f8d4ef2aaf --- /dev/null +++ b/pkgs/by-name/op/openjfx/24/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-pXQCzNcucQAYv0Da1uE5xG6pGqxQXrTDzvFqrn7H92M=", + "owner": "openjdk", + "repo": "jfx24u", + "rev": "refs/tags/24+29" +} diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix index 08cd2edbec5c..aef6b92888fc 100644 --- a/pkgs/by-name/op/openjfx/package.nix +++ b/pkgs/by-name/op/openjfx/package.nix @@ -36,11 +36,13 @@ jdk17_headless, jdk21_headless, jdk23_headless, + jdk24_headless, jdk-bootstrap ? { "17" = jdk17_headless; "21" = jdk21_headless; "23" = jdk23_headless; + "24" = jdk24_headless; } .${featureVersion}, }: diff --git a/pkgs/by-name/op/openjk/package.nix b/pkgs/by-name/op/openjk/package.nix index beff76cf9dd5..9a7c87f889a2 100644 --- a/pkgs/by-name/op/openjk/package.nix +++ b/pkgs/by-name/op/openjk/package.nix @@ -9,6 +9,7 @@ zlib, libpng, libGL, + libX11, SDL2, unstableGitUpdater, }: @@ -64,6 +65,7 @@ stdenv.mkDerivation { zlib libpng libGL + libX11 SDL2 ]; diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix index 56172ace9892..68e3aaaa3995 100644 --- a/pkgs/by-name/op/openjump/package.nix +++ b/pkgs/by-name/op/openjump/package.nix @@ -59,7 +59,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.openjump.org/"; license = lib.licenses.gpl2; mainProgram = "OpenJump"; - maintainers = lib.teams.geospatial.members ++ [ lib.maintainers.marcweber ]; + maintainers = [ lib.maintainers.marcweber ]; + teams = [ lib.teams.geospatial ]; platforms = jre.meta.platforms; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; }; diff --git a/pkgs/by-name/op/openldap/package.nix b/pkgs/by-name/op/openldap/package.nix index ccf8dcbc1635..7a9300bb0fba 100644 --- a/pkgs/by-name/op/openldap/package.nix +++ b/pkgs/by-name/op/openldap/package.nix @@ -120,6 +120,9 @@ stdenv.mkDerivation rec { --replace "/bin/rm" "rm" # skip flaky tests + # https://bugs.openldap.org/show_bug.cgi?id=8623 + rm -f tests/scripts/test022-ppolicy + rm -f tests/scripts/test063-delta-multiprovider # https://bugs.openldap.org/show_bug.cgi?id=10009 @@ -158,7 +161,8 @@ stdenv.mkDerivation rec { homepage = "https://www.openldap.org/"; description = "Open source implementation of the Lightweight Directory Access Protocol"; license = licenses.openldap; - maintainers = with maintainers; [ hexa ] ++ teams.helsinki-systems.members; + maintainers = with maintainers; [ hexa ]; + teams = [ teams.helsinki-systems ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix index d79407eda28f..e71c16be9c8c 100644 --- a/pkgs/by-name/op/openlinkhub/package.nix +++ b/pkgs/by-name/op/openlinkhub/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "openlinkhub"; - version = "0.5.1"; + version = "0.5.4"; src = fetchFromGitHub { owner = "jurkovic-nikola"; repo = "OpenLinkHub"; tag = version; - hash = "sha256-toCujsX+hR6JYxOc4UFnaN3A6p3IzyghcTtjbYe3GiY="; + hash = "sha256-cfnijxmn4Oe/t+K/N1JDTSQ3JSYyzB85gXj7OJ5hqr4="; }; proxyVendor = true; diff --git a/pkgs/by-name/op/openmolcas/nevpt2.patch b/pkgs/by-name/op/openmolcas/nevpt2.patch new file mode 100644 index 000000000000..0033a17af196 --- /dev/null +++ b/pkgs/by-name/op/openmolcas/nevpt2.patch @@ -0,0 +1,22 @@ +diff --git a/src/gctime.c b/src/gctime.c +index 34fcb6f..832459c 100644 +--- a/src/gctime.c ++++ b/src/gctime.c +@@ -1,14 +1,15 @@ ++#include + typedef long f77_int; /* Fortran integer type */ + typedef char * f77_char; /* Fortran character argument */ + #define CH_F2C(X) ((char *) (X)) /* How to get char ptr from F77 argument */ +-gctime (fstr, lstr) f77_char *fstr; int lstr; { ++int gctime (fstr, lstr) f77_char *fstr; int lstr; { + long time(), t; + char *ctime(); + t = time ( (long *) 0); + strcpy(CH_F2C(fstr),ctime(&t)); + return (0); + } +-gctime_(fstr, lstr) f77_char *fstr; int lstr; { ++int gctime_(fstr, lstr) f77_char *fstr; int lstr; { + long time(), t; + char *ctime(); + t = time ( (long *) 0); diff --git a/pkgs/by-name/op/openmolcas/openblasPath.patch b/pkgs/by-name/op/openmolcas/openblasPath.patch deleted file mode 100644 index e47adcc3e9a3..000000000000 --- a/pkgs/by-name/op/openmolcas/openblasPath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 276ae4e2..db13e6e3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1507,7 +1507,6 @@ if (LINALG STREQUAL "OpenBLAS") - NAMES openblas - PATHS ${OPENBLASROOT} - PATH_SUFFIXES lib -- NO_DEFAULT_PATH - ) - - if (NOT LIBOPENBLAS) diff --git a/pkgs/by-name/op/openmolcas/package.nix b/pkgs/by-name/op/openmolcas/package.nix index 35d244cec9a0..544bd7f6a8cb 100644 --- a/pkgs/by-name/op/openmolcas/package.nix +++ b/pkgs/by-name/op/openmolcas/package.nix @@ -7,6 +7,7 @@ gfortran, perl, blas-ilp64, + lapack-ilp64, hdf5-cpp, python3, texliveMinimal, @@ -16,7 +17,7 @@ gsl, boost, autoPatchelfHook, - enableQcmaquis ? false, + enableQcmaquis ? true, # Note that the CASPT2 module is broken with MPI # See https://gitlab.com/Molcas/OpenMolcas/-/issues/169 enableMpi ? false, @@ -25,11 +26,7 @@ }: assert blas-ilp64.isILP64; -assert lib.elem blas-ilp64.passthru.implementation [ - "openblas" - "mkl" -]; -assert enableQcmaquis -> lib.elem blas-ilp64.passthru.implementation "mkl"; +assert lapack-ilp64.isILP64; let python = python3.withPackages ( @@ -46,30 +43,43 @@ let rev = "release-3.1.4"; # Must match tag in cmake/custom/qcmaquis.cmake hash = "sha256-vhC5k+91IPFxdCi5oYt1NtF9W08RxonJjPpA0ls4I+o="; }; - nevtp2Src = fetchFromGitHub { - owner = "qcscine"; - repo = "nevpt2"; - rev = "e1484fd"; # Must match tag in cmake/custom/nevpt2.cmake - hash = "sha256-Vl+FhwhJBbD/7U2CwsYE9BClSQYLJ8DKXV9EXxQUmz0="; + + # NEVPT2 sources must be patched to be valid C code in gctime.c + nevpt2Src = stdenv.mkDerivation { + pname = "nevpt2-src"; + version = "unstable"; + phases = [ + "unpackPhase" + "patchPhase" + "installPhase" + ]; + src = fetchFromGitHub { + owner = "qcscine"; + repo = "nevpt2"; + rev = "e1484fd"; # Must match tag in cmake/custom/nevpt2.cmake + hash = "sha256-Vl+FhwhJBbD/7U2CwsYE9BClSQYLJ8DKXV9EXxQUmz0="; + }; + patches = [ ./nevpt2.patch ]; + installPhase = '' + mkdir $out + cp -r * $out/. + ''; }; in stdenv.mkDerivation rec { pname = "openmolcas"; - version = "24.10"; + version = "25.02"; src = fetchFromGitLab { owner = "Molcas"; repo = "OpenMolcas"; rev = "v${version}"; - hash = "sha256-LXxr/xqBHG7a0rOBrb8IMZ4IjZak3NsBw40Qf+z1fic="; + hash = "sha256-Ty7C7zj1lQixuUzeKLcwQCmcPexZXtIGDzp1wUMKDi0="; }; patches = [ - # Required to handle openblas multiple outputs - ./openblasPath.patch - - # Required for a local QCMaquis build + # Required for a local QCMaquis build. Also sanitises QCMaquis BLAS/LAPACK handling ./qcmaquis.patch ]; @@ -83,7 +93,7 @@ stdenv.mkDerivation rec { --subst-var-by "qcmaquis_src_url" "file://${qcmaquisSrc}" substituteInPlace cmake/custom/nevpt2.cmake \ - --subst-var-by "nevpt2_src_url" "file://${nevtp2Src}" + --subst-var-by "nevpt2_src_url" "file://${nevpt2Src}" ''; nativeBuildInputs = [ @@ -97,13 +107,14 @@ stdenv.mkDerivation rec { buildInputs = [ - blas-ilp64.passthru.provider hdf5-cpp python armadillo libxc gsl.dev boost + blas-ilp64 + lapack-ilp64 ] ++ lib.optionals enableMpi [ mpi @@ -112,38 +123,32 @@ stdenv.mkDerivation rec { passthru = lib.optionalAttrs enableMpi { inherit mpi; }; - cmakeFlags = - [ - "-DOPENMP=ON" - "-DTOOLS=ON" - "-DHDF5=ON" - "-DFDE=ON" - "-DEXTERNAL_LIBXC=${lib.getDev libxc}" - (lib.strings.cmakeBool "DMRG" enableQcmaquis) - (lib.strings.cmakeBool "NEVPT2" enableQcmaquis) - "-DCMAKE_SKIP_BUILD_RPATH=ON" - (lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) - (lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) - ] - ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [ - "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}" - "-DLINALG=OpenBLAS" - ] - ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [ - "-DMKLROOT=${blas-ilp64.passthru.provider}" - "-DLINALG=MKL" - ] - ++ lib.optionals enableMpi [ - "-DGA=ON" - "-DMPI=ON" - ]; + cmakeFlags = [ + "-DOPENMP=ON" + "-DTOOLS=ON" + "-DHDF5=ON" + "-DFDE=ON" + "-DEXTERNAL_LIBXC=${lib.getDev libxc}" + (lib.strings.cmakeBool "DMRG" enableQcmaquis) + (lib.strings.cmakeBool "NEVPT2" enableQcmaquis) + "-DCMAKE_SKIP_BUILD_RPATH=ON" + (lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) + (lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + "-DLINALG=Manual" + (lib.strings.cmakeBool "DGA" enableMpi) + (lib.strings.cmakeBool "MPI" enableMpi) + ]; - preConfigure = lib.optionalString enableMpi '' - export GAROOT=${globalarrays}; - ''; + preConfigure = + '' + cmakeFlagsArray+=("-DLINALG_LIBRARIES=-lblas -llapack") + '' + + lib.optionalString enableMpi '' + export GAROOT=${globalarrays}; + ''; + # The Makefile will install pymolcas during the build grrr. postConfigure = '' - # The Makefile will install pymolcas during the build grrr. mkdir -p $out/bin export PATH=$PATH:$out/bin ''; @@ -158,8 +163,8 @@ stdenv.mkDerivation rec { # removed by autopatchelf noAuditTmpdir = true; + # Wrong store path in shebang (bare Python, no Python pkgs), force manual re-patching postFixup = '' - # Wrong store path in shebang (bare Python, no Python pkgs), force manual re-patching for exe in $(find $out/bin/ -type f -name "*.py"); do sed -i "1s:.*:#!${python}/bin/python:" "$exe" done diff --git a/pkgs/by-name/op/openmolcas/qcmaquis.patch b/pkgs/by-name/op/openmolcas/qcmaquis.patch index c388f699a1cc..c4b5261a6cf6 100644 --- a/pkgs/by-name/op/openmolcas/qcmaquis.patch +++ b/pkgs/by-name/op/openmolcas/qcmaquis.patch @@ -45,3 +45,58 @@ index 5fd1ef207..8d2957c6e 100644 SOURCE_SUBDIR dmrg CMAKE_ARGS ${EP_CMAKE_ARGS} CMAKE_CACHE_ARGS ${EP_CMAKE_CACHE_ARGS} +diff --git a/cmake/custom/qcmaquis.cmake b/cmake/custom/qcmaquis.cmake +index 5fd1ef207..4291ec3d7 100644 +--- a/cmake/custom/qcmaquis.cmake ++++ b/cmake/custom/qcmaquis.cmake +@@ -94,47 +94,9 @@ if (NOT MAQUIS_DMRG_FOUND) # Does the opposite work? + ) + endif (BOOST_ROOT) + +- if (LINALG STREQUAL "Manual") +- target_files (LINALG_LIBRARIES_FILES ${LINALG_LIBRARIES}) +- list (APPEND LINALG_LIBRARIES_FILES ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}) +- string (REPLACE ";" '\' LINALG_LIBRARIES_FILES "${LINALG_LIBRARIES_FILES}") +- list (APPEND QCMaquisCMakeArgs +- "-DBLAS_LAPACK_SELECTOR=manual" +- "-DMAQUISLapack_LIBRARIES=${LINALG_LIBRARIES_FILES}" +- ) +- elseif (LINALG STREQUAL "MKL") +- list (APPEND QCMaquisCMakeArgs +- "-DBLAS_LAPACK_SELECTOR=mkl_sequential" +- ) +- elseif (LINALG STREQUAL "OpenBLAS") +- list (APPEND QCMaquisCMakeArgs +- "-DBLAS_LAPACK_SELECTOR=openblas" +- "-DOPENBLASROOT=${OPENBLASROOT}" +- ) +- elseif (LINALG STREQUAL "Accelerate") +- list (APPEND QCMaquisCMakeArgs +- "-DBLAS_LAPACK_SELECTOR:STRING=veclib" +- ) +- elseif (LINALG STREQUAL "Internal") +- +- # To link QCMaquis with Fortran static libraries, we +- # need to add -lgfortran for gfortran +- # It seems that ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES} +- # is not suited for this because it contains also other unnecessary libraries +- +- # for some reason, the list does not work if the generator expression -lgfortran is not first +- # but for correct linking it needs to be last AND with a prepended "-l" +- if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") +- set (Fortran_RUNTIME_LIBRARY "gfortran") +- endif () +- +- list (APPEND QCMaquisCMakeArgs +- "-DBLAS_LAPACK_SELECTOR=manual" +- "-DMAQUISLapack_LIBRARIES=$<$:${Fortran_RUNTIME_LIBRARY}\ >$\ $\ $\ -l$<$:${Fortran_RUNTIME_LIBRARY}>" +- ) +- else () +- message (FATAL_ERROR "LINALG=${LINALG} is not supported by QCMaquis") +- endif () ++ list (APPEND QCMaquisCMakeArgs ++ "-DBLAS_LAPACK_SELECTOR=auto" ++ ) + + # Enabling source changes to keep ExternalProject happy + set (CMAKE_DISABLE_SOURCE_CHANGES OFF diff --git a/pkgs/by-name/op/openmsx/package.nix b/pkgs/by-name/op/openmsx/package.nix index 7167d5b86642..bf2722098390 100644 --- a/pkgs/by-name/op/openmsx/package.nix +++ b/pkgs/by-name/op/openmsx/package.nix @@ -14,6 +14,7 @@ libpng, libtheora, libvorbis, + libX11, python3, tcl, zlib, @@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_image SDL2_ttf + libX11 alsa-lib freetype glew diff --git a/pkgs/by-name/op/openomf/package.nix b/pkgs/by-name/op/openomf/package.nix new file mode 100644 index 000000000000..fb8268c096d4 --- /dev/null +++ b/pkgs/by-name/op/openomf/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + cmake, + argtable, + enet, + git, + libconfuse, + libnatpmp, + libepoxy, + libpng, + libxmp, + miniupnpc, + opusfile, + SDL2, + SDL2_mixer, + unzip, + zlib, + withRemix ? true, +}: + +let + assets = fetchurl { + url = "https://www.omf2097.com/pub/files/omf/openomf-assets.zip"; + hash = "sha256-3kcseGrfnmGL9LcaXyy4W7CwkPJ9orMAjzBUU6jepn0="; + }; + icons = fetchurl { + url = "https://www.omf2097.com/pub/files/omf/openomf-icons.zip"; + hash = "sha256-8LWmrkY3ZiXcuVe0Zj90RQFUTwM27dJ4ev9TiBGoVk0="; + }; + remix = fetchurl { + url = "https://github.com/omf2097/openomf/releases/download/0.8.0/ARENA2.ogg"; + hash = "sha256-jOIzDaIwQDlwCaPrRZdG5Y0g7bWKwc38mPKP030PGb4="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "openomf"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "omf2097"; + repo = "openomf"; + tag = finalAttrs.version; + hash = "sha256-vp/aiKFAWiBb8pxjivB54fr84CLW9vaBa1U8Ye/cF4M="; + }; + + nativeBuildInputs = [ + cmake + git + unzip + ]; + + buildInputs = [ + argtable + enet + libconfuse + libepoxy + libnatpmp + libpng + libxmp + miniupnpc + opusfile + SDL2 + SDL2_mixer + zlib + ]; + + postInstall = + '' + mkdir -p $out/share/icons/hicolor/256x256/apps + unzip -j ${assets} -d $out/share/games/openomf + unzip -p ${icons} omf-logo/omf-256x256.png > $out/share/icons/hicolor/256x256/apps/org.openomf.OpenOMF.png + install -Dm644 $src/resources/flatpak/org.openomf.OpenOMF.desktop $out/share/applications/org.openomf.OpenOMF.desktop + '' + + lib.optionalString withRemix '' + ln -s ${remix} $out/share/games/openomf/ARENA2.ogg + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/resources + ln -s $out/share/games/openomf/* $out/resources + ''; + + meta = { + description = "One Must Fall 2097 Remake"; + homepage = "https://www.openomf.org"; + changelog = "https://github.com/omf2097/openomf/releases/tag/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ keenanweaver ]; + mainProgram = "openomf"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/op/openpace/package.nix b/pkgs/by-name/op/openpace/package.nix new file mode 100644 index 000000000000..535a73c84d64 --- /dev/null +++ b/pkgs/by-name/op/openpace/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + help2man, + gengetopt, + openssl, + nix-update-script, +}: +stdenv.mkDerivation rec { + pname = "openpace"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "frankmorgner"; + repo = "openpace"; + tag = version; + hash = "sha256-KsgCTHvbqxNOcf9HWgXGxagpIjHEcQ5Kryjq71F8XRk="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + help2man + gengetopt + ]; + + buildInputs = [ openssl ]; + + preConfigure = '' + autoreconf --verbose --install + ''; + + preFixup = '' + rm $out/bin/example + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cryptographic library for EAC version 2"; + homepage = "https://github.com/frankmorgner/openpace"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ vaavaav ]; + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; # help2man + }; +} diff --git a/pkgs/by-name/op/openpgp-ca/package.nix b/pkgs/by-name/op/openpgp-ca/package.nix index 7b5e0bffc3d2..55195c940688 100644 --- a/pkgs/by-name/op/openpgp-ca/package.nix +++ b/pkgs/by-name/op/openpgp-ca/package.nix @@ -1,8 +1,6 @@ { - stdenv, fetchFromGitLab, lib, - darwin, nettle, nix-update-script, rustPlatform, @@ -36,21 +34,12 @@ rustPlatform.buildRustPackage rec { gnupg ]; - buildInputs = - [ - openssl - sqlite - pcsclite - nettle - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - PCSC - Security - SystemConfiguration - ] - ); + buildInputs = [ + openssl + sqlite + pcsclite + nettle + ]; # Most tests rely on gnupg being able to write to /run/user # gnupg refuses to respect the XDG_RUNTIME_DIR variable, so we skip the tests diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix index 52bab92c1a8f..a7bb79b2a209 100644 --- a/pkgs/by-name/op/openrct2/package.nix +++ b/pkgs/by-name/op/openrct2/package.nix @@ -33,18 +33,18 @@ }: let - openrct2-version = "0.4.20"; + openrct2-version = "0.4.22"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.5.1"; + objects-version = "1.6.1"; openmsx-version = "1.6"; opensfx-version = "1.0.5"; title-sequences-version = "0.4.14"; objects = fetchurl { url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip"; - hash = "sha256-xrgAy817G5xwfzZX+8Xy2508/Zwq32aKzMndus14Qd8="; + hash = "sha256-aCkYZjDlLDMrakhH67k2xUmlIvytr49eXkV5xMkaRFA="; }; openmsx = fetchurl { url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${openmsx-version}/openmusic.zip"; @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - hash = "sha256-G/uD3t8m7C74pjSA6dbz4gzu9CwEpmyFwtYpoFIiRjM="; + hash = "sha256-dFELAfJIgizM0nRc4SMrFGIqFQo/ImTtR89GVkb4/TQ="; }; nativeBuildInputs = [ @@ -147,6 +147,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ oxzi keenanweaver + kylerisse ]; }; }) diff --git a/pkgs/by-name/op/openroad/package.nix b/pkgs/by-name/op/openroad/package.nix new file mode 100644 index 000000000000..2023f2606825 --- /dev/null +++ b/pkgs/by-name/op/openroad/package.nix @@ -0,0 +1,149 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + bison, + cmake, + doxygen, + flex, + gitMinimal, + gtest, + libsForQt5, + pkg-config, + swig, + + # buildInputs + boost186, # 1.87.0 broken https://github.com/boostorg/asio/issues/442 + cbc, # for clp + cimg, + clp, # for or-tools + cudd, + eigen, + glpk, + lcov, + lemon-graph, + libjpeg, + or-tools, + pcre, + python3, + re2, # for or-tools + readline, + spdlog, + tcl, + tclPackages, + yosys, + zlib, + xorg, + llvmPackages, +}: + +stdenv.mkDerivation rec { + pname = "openroad"; + version = "2.0-unstable-2025-03-01"; + + src = fetchFromGitHub { + owner = "The-OpenROAD-Project"; + repo = "OpenROAD"; + rev = "e794373d44ac5421f0633d8dda7e5c59e8fe79bf"; + fetchSubmodules = true; + hash = "sha256-a/X4FHkbiqHeblse2ZkLT56gYP+LCrAIZVCdsWF59jM="; + }; + + nativeBuildInputs = [ + bison + cmake + doxygen + flex + gitMinimal + gtest + libsForQt5.wrapQtAppsHook + pkg-config + swig + ]; + + buildInputs = + [ + boost186 + cbc + cimg + clp + cudd + eigen + glpk + lcov + lemon-graph + libjpeg + libsForQt5.qtbase + libsForQt5.qtcharts + libsForQt5.qtdeclarative + libsForQt5.qtsvg + or-tools + pcre + python3 + re2 + readline + spdlog + tcl + tclPackages.tclreadline + yosys + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; + + postPatch = '' + patchShebangs --build etc/find_messages.py + # Disable two tests that are failing curently. + sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CMakeLists.txt + ''; + + cmakeFlags = + [ + (lib.cmakeBool "ENABLE_TESTS" true) + (lib.cmakeBool "USE_SYSTEM_BOOST" true) + (lib.cmakeBool "USE_SYSTEM_ABC" false) + (lib.cmakeBool "ABC_SKIP_TESTS" true) # it attempts to download gtest + (lib.cmakeBool "USE_SYSTEM_OPENSTA" false) + (lib.cmakeFeature "OPENROAD_VERSION" "${version}_${src.rev}") + (lib.cmakeBool "CMAKE_RULE_MESSAGES" false) + (lib.cmakeFeature "TCL_HEADER" "${tcl}/include/tcl.h") + (lib.cmakeFeature "TCL_LIBRARY" "${tcl}/lib/libtcl${stdenv.hostPlatform.extensions.sharedLibrary}") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED") + ]; + + # Resynthesis needs access to the Yosys binaries. + qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ yosys ]}" ]; + + # Upstream uses vendored package versions for some dependencies, so regression testing is prudent + # to see if there are any breaking changes in unstable that should be vendored as well. + doCheck = !stdenv.hostPlatform.isDarwin; # it seems to hang on darwin + checkPhase = '' + make test + ../test/regression + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/openroad -version + $out/bin/sta -version + + runHook postInstallCheck + ''; + + meta = { + description = "OpenROAD's unified application implementing an RTL-to-GDS flow"; + homepage = "https://theopenroadproject.org"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + trepetti + hzeller + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/op/openrsync/package.nix b/pkgs/by-name/op/openrsync/package.nix new file mode 100644 index 000000000000..bd7df3bcd42b --- /dev/null +++ b/pkgs/by-name/op/openrsync/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "openrsync"; + version = "unstable-2025-01-27"; + + src = fetchFromGitHub { + owner = "kristapsdz"; + repo = "openrsync"; + rev = "a257c0f495af2b5ee6b41efc6724850a445f87ed"; + hash = "sha256-pc1lo8d5FY8/1K2qUWzSlrSnA7jnRg4FQRyHqC8I38k="; + }; + + # Uses oconfigure + prefixKey = "PREFIX="; + + meta = with lib; { + homepage = "https://www.openrsync.org/"; + description = "BSD-licensed implementation of rsync"; + mainProgram = "openrsync"; + license = licenses.isc; + maintainers = with maintainers; [ fgaz ]; + # https://github.com/kristapsdz/openrsync#portability + # https://github.com/kristapsdz/oconfigure#readme + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/op/openrw/package.nix b/pkgs/by-name/op/openrw/package.nix index c169f5c76e03..8a17cc5f6e20 100644 --- a/pkgs/by-name/op/openrw/package.nix +++ b/pkgs/by-name/op/openrw/package.nix @@ -16,6 +16,7 @@ libGL, libGLU, libmad, + libX11, openal, unstableGitUpdater, @@ -52,6 +53,7 @@ stdenv.mkDerivation { libGL libGLU libmad + libX11 openal ]; diff --git a/pkgs/by-name/op/opensaml-cpp/package.nix b/pkgs/by-name/op/opensaml-cpp/package.nix index 9eac6e3074da..6bbe4f57d718 100644 --- a/pkgs/by-name/op/opensaml-cpp/package.nix +++ b/pkgs/by-name/op/opensaml-cpp/package.nix @@ -4,7 +4,6 @@ fetchgit, autoreconfHook, pkg-config, - darwin, boost, openssl, log4shib, @@ -24,23 +23,15 @@ stdenv.mkDerivation rec { sha256 = "0ms3sqmwqkrqb92d7jy2hqwnz5yd7cbrz73n321jik0jilrwl5w8"; }; - buildInputs = - [ - boost - openssl - log4shib - xercesc - xml-security-c - xml-tooling-c - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + boost + openssl + log4shib + xercesc + xml-security-c + xml-tooling-c + zlib + ]; nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/by-name/op/opensc/package.nix b/pkgs/by-name/op/opensc/package.nix index 4714e994308a..8c642beb23da 100644 --- a/pkgs/by-name/op/opensc/package.nix +++ b/pkgs/by-name/op/opensc/package.nix @@ -14,9 +14,7 @@ docbook_xsl, libxslt, docbook_xml_dtd_412, - darwin, nix-update-script, - withApplePCSC ? stdenv.hostPlatform.isDarwin, }: stdenv.mkDerivation rec { @@ -35,46 +33,33 @@ stdenv.mkDerivation rec { autoreconfHook libxslt # xsltproc ]; - buildInputs = - [ - zlib - readline - openssl - libassuan - libXt - libiconv - docbook_xml_dtd_412 - ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Carbon - ++ (if withApplePCSC then [ darwin.apple_sdk.frameworks.PCSC ] else [ pcsclite ]); + buildInputs = [ + zlib + readline + openssl + libassuan + libXt + libiconv + docbook_xml_dtd_412 + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) pcsclite; env.NIX_CFLAGS_COMPILE = "-Wno-error"; - configureFlags = [ - "--enable-zlib" - "--enable-readline" - "--enable-openssl" - "--enable-pcsc" - "--enable-sm" - "--enable-man" - "--enable-doc" - "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" - "--with-pcsc-provider=${ - if withApplePCSC then - "${darwin.apple_sdk.frameworks.PCSC}/Library/Frameworks/PCSC.framework/PCSC" - else - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" - }" - ]; - - PCSC_CFLAGS = lib.concatStringsSep " " ( - lib.optionals withApplePCSC [ - "-I${darwin.apple_sdk.frameworks.PCSC}/Library/Frameworks/PCSC.framework/Headers" - "-I${lib.getDev pcsclite}/include/PCSC" + configureFlags = + [ + "--enable-zlib" + "--enable-readline" + "--enable-openssl" + "--enable-pcsc" + "--enable-sm" + "--enable-man" + "--enable-doc" + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" ] - ); + ++ lib.optional (!stdenv.hostPlatform.isDarwin) + "--with-pcsc-provider=${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"; installFlags = [ "sysconfdir=$(out)/etc" diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 7ee708b69605..280f4035a5ce 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -41,6 +41,7 @@ xorg, mimalloc, opencsg, + ctestCheckHook, }: # clang consume much less RAM than GCC clangStdenv.mkDerivation rec { @@ -142,12 +143,16 @@ clangStdenv.mkDerivation rec { nativeCheckInputs = [ mesa.llvmpipeHook + ctestCheckHook ]; - checkPhase = '' + dontUseNinjaCheck = true; + checkFlags = [ + "-E" # some fontconfig issues cause pdf output to have wrong font - ctest -j$NIX_BUILD_CORES -E pdfexporttest.\* - ''; + "pdfexporttest" + ]; + meta = with lib; { description = "3D parametric model compiler (unstable)"; longDescription = '' diff --git a/pkgs/by-name/op/openscap/package.nix b/pkgs/by-name/op/openscap/package.nix index 92df65d4a402..34776269a5ca 100644 --- a/pkgs/by-name/op/openscap/package.nix +++ b/pkgs/by-name/op/openscap/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "openscap"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "OpenSCAP"; repo = "openscap"; rev = version; - hash = "sha256-omPGm3VSLmwEIzInIORLfJf7wreRyxbDOXTRl05mAz0="; + hash = "sha256-AOldgYS8qMOLB/Nm2/O0obdDOrefSrubTETb50f3Gv8="; }; strictDeps = true; diff --git a/pkgs/by-name/op/openscenegraph/package.nix b/pkgs/by-name/op/openscenegraph/package.nix new file mode 100644 index 000000000000..ef95cbcdb125 --- /dev/null +++ b/pkgs/by-name/op/openscenegraph/package.nix @@ -0,0 +1,148 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + fetchurl, + cmake, + pkg-config, + doxygen, + libX11, + libXinerama, + libXrandr, + libGLU, + libGL, + glib, + libxml2, + pcre, + zlib, + boost, + jpegSupport ? true, + libjpeg, + exrSupport ? false, + openexr, + gifSupport ? true, + giflib, + pngSupport ? true, + libpng, + tiffSupport ? true, + libtiff, + gdalSupport ? false, + gdal, + curlSupport ? true, + curl, + colladaSupport ? false, + opencollada, + opencascadeSupport ? false, + opencascade-occt, + ffmpegSupport ? false, + ffmpeg, + nvttSupport ? false, + nvidia-texture-tools, + freetypeSupport ? true, + freetype, + svgSupport ? false, + librsvg, + pdfSupport ? false, + poppler, + vncSupport ? false, + libvncserver, + lasSupport ? false, + libLAS, + luaSupport ? false, + lua, + sdlSupport ? false, + SDL2, + restSupport ? false, + asio, + withApps ? false, + withExamples ? false, + fltk, +}: + +stdenv.mkDerivation rec { + pname = "openscenegraph"; + version = "3.6.5"; + + src = fetchFromGitHub { + owner = "openscenegraph"; + repo = "OpenSceneGraph"; + rev = "OpenSceneGraph-${version}"; + sha256 = "00i14h82qg3xzcyd8p02wrarnmby3aiwmz0z43l50byc9f8i05n1"; + }; + + nativeBuildInputs = [ + pkg-config + cmake + doxygen + ]; + + buildInputs = + lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libX11 + libXinerama + libXrandr + libGLU + libGL + ] + ++ [ + glib + libxml2 + pcre + zlib + ] + ++ lib.optional jpegSupport libjpeg + ++ lib.optional exrSupport openexr + ++ lib.optional gifSupport giflib + ++ lib.optional pngSupport libpng + ++ lib.optional tiffSupport libtiff + ++ lib.optional gdalSupport gdal + ++ lib.optional curlSupport curl + ++ lib.optional colladaSupport opencollada + ++ lib.optional opencascadeSupport opencascade-occt + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional nvttSupport nvidia-texture-tools + ++ lib.optional freetypeSupport freetype + ++ lib.optional svgSupport librsvg + ++ lib.optional pdfSupport poppler + ++ lib.optional vncSupport libvncserver + ++ lib.optional lasSupport libLAS + ++ lib.optional luaSupport lua + ++ lib.optional sdlSupport SDL2 + ++ lib.optional restSupport asio + ++ lib.optionals withExamples [ fltk ] + ++ lib.optional (restSupport || colladaSupport) boost; + + patches = [ + (fetchpatch { + name = "opencascade-api-patch"; + url = "https://github.com/openscenegraph/OpenSceneGraph/commit/bc2daf9b3239c42d7e51ecd7947d31a92a7dc82b.patch"; + hash = "sha256-VR8YKOV/YihB5eEGZOGaIfJNrig1EPS/PJmpKsK284c="; + }) + # OpenEXR 3 support: https://github.com/openscenegraph/OpenSceneGraph/issues/1075 + (fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch?id=0f642d8f09b589166f0e0c0fc84df7673990bf3f"; + hash = "sha256-fdNbkg6Vp7DeDBTe5Zso8qJ5v9uPSXHpQ5XlGkvputk="; + }) + # Fix compiling with libtiff when libtiff is compiled using CMake + (fetchurl { + url = "https://github.com/openscenegraph/OpenSceneGraph/commit/9da8d428f6666427c167b951b03edd21708e1f43.patch"; + hash = "sha256-YGG/DIHU1f6StbeerZoZrNDm348wYB3ydmVIIGTM7fU="; + }) + ]; + + cmakeFlags = + lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" + ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; + + meta = with lib; { + description = "3D graphics toolkit"; + homepage = "http://www.openscenegraph.org/"; + maintainers = with maintainers; [ + aanderse + raskin + ]; + platforms = with platforms; linux ++ darwin; + license = "OpenSceneGraph Public License - free LGPL-based license"; + }; +} diff --git a/pkgs/by-name/op/opensearch/package.nix b/pkgs/by-name/op/opensearch/package.nix index 040421bec198..68e6c81d5720 100644 --- a/pkgs/by-name/op/opensearch/package.nix +++ b/pkgs/by-name/op/opensearch/package.nix @@ -12,11 +12,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.19.1"; + version = "2.19.2"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-skOqp9jc67h4gfcPcWE5A8Nt2gd/2Q7hHqN3QS1tVp8="; + hash = "sha256-EaOx8vs3y00ln7rUiaCGoD+HhiQY4bhQAzu18VfaTYw="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix b/pkgs/by-name/op/opensmtpd-filter-rspamd/package.nix similarity index 100% rename from pkgs/servers/mail/opensmtpd/filter-rspamd.nix rename to pkgs/by-name/op/opensmtpd-filter-rspamd/package.nix diff --git a/pkgs/by-name/op/opensmtpd-table-ldap/package.nix b/pkgs/by-name/op/opensmtpd-table-ldap/package.nix new file mode 100644 index 000000000000..ac81d8d4a7d2 --- /dev/null +++ b/pkgs/by-name/op/opensmtpd-table-ldap/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, + libevent, + libressl, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "opensmtpd-table-ldap"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "OpenSMTPD"; + repo = "table-ldap"; + tag = finalAttrs.version; + hash = "sha256-dfwvgFYBED3GyZ347JSNIyiik133GYLT6p+XkIIm//w="; + }; + + strictDeps = true; + + buildInputs = [ + libevent + libressl + ]; + + nativeBuildInputs = [ + autoconf + automake + ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-path-socket=/run" + "--with-path-pidfile=/run" + ]; + + preConfigure = '' + sh bootstrap + ''; + + meta = { + homepage = "https://www.opensmtpd.org/"; + description = "ldap table for the OpenSMTPD mail server"; + changelog = "https://github.com/OpenSMTPD/table-ldap/releases/tag/${finalAttrs.version}"; + license = lib.licenses.isc; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + pks + ]; + }; +}) diff --git a/pkgs/by-name/op/opensmtpd-table-mysql/package.nix b/pkgs/by-name/op/opensmtpd-table-mysql/package.nix new file mode 100644 index 000000000000..c1bd227783b0 --- /dev/null +++ b/pkgs/by-name/op/opensmtpd-table-mysql/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, + libmysqlclient, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "opensmtpd-table-mysql"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "OpenSMTPD"; + repo = "table-mysql"; + tag = finalAttrs.version; + hash = "sha256-0N1fuYJvJKAoOJMH2bX0pdvAqb26w/6JSuv6ycnRZHU="; + }; + + strictDeps = true; + + buildInputs = [ + libmysqlclient + ]; + + nativeBuildInputs = [ + autoconf + automake + libmysqlclient + ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-path-socket=/run" + "--with-path-pidfile=/run" + ]; + + preConfigure = '' + sh bootstrap + ''; + + meta = { + homepage = "https://www.opensmtpd.org/"; + description = "ldap table for the OpenSMTPD mail server"; + changelog = "https://github.com/OpenSMTPD/table-mysql/releases/tag/${finalAttrs.version}"; + license = lib.licenses.isc; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + pks + ]; + }; +}) diff --git a/pkgs/by-name/op/opensmtpd-table-passwd/package.nix b/pkgs/by-name/op/opensmtpd-table-passwd/package.nix new file mode 100644 index 000000000000..3a068ad41867 --- /dev/null +++ b/pkgs/by-name/op/opensmtpd-table-passwd/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "opensmtpd-table-passwd"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "OpenSMTPD"; + repo = "table-passwd"; + tag = finalAttrs.version; + hash = "sha256-veE7PADO8KAMEnMrDc9V/xbVMqwF3rUoYPmpQSIJw9o="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoconf + automake + ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-path-socket=/run" + "--with-path-pidfile=/run" + ]; + + preConfigure = '' + sh bootstrap + ''; + + meta = { + homepage = "https://www.opensmtpd.org/"; + description = "passwd table for the OpenSMTPD mail server"; + changelog = "https://github.com/OpenSMTPD/table-passwd/releases/tag/${finalAttrs.version}"; + license = lib.licenses.isc; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + pks + ]; + }; +}) diff --git a/pkgs/by-name/op/opensmtpd-table-postgres/package.nix b/pkgs/by-name/op/opensmtpd-table-postgres/package.nix new file mode 100644 index 000000000000..3e62a3cb7eb7 --- /dev/null +++ b/pkgs/by-name/op/opensmtpd-table-postgres/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, + libpq, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "opensmtpd-table-postgres"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "OpenSMTPD"; + repo = "table-postgres"; + tag = finalAttrs.version; + hash = "sha256-CGtqCQnsUvgsBIJOVXphkisp3Iij+oW88w7Y1njusx8="; + }; + + strictDeps = true; + + buildInputs = [ + libpq + ]; + + nativeBuildInputs = [ + autoconf + automake + ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-path-socket=/run" + "--with-path-pidfile=/run" + ]; + + preConfigure = '' + sh bootstrap + ''; + + meta = { + homepage = "https://www.opensmtpd.org/"; + description = "ldap table for the OpenSMTPD mail server"; + changelog = "https://github.com/OpenSMTPD/table-postgres/releases/tag/${finalAttrs.version}"; + license = lib.licenses.isc; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + pks + ]; + }; +}) diff --git a/pkgs/by-name/op/opensmtpd-table-redis/package.nix b/pkgs/by-name/op/opensmtpd-table-redis/package.nix new file mode 100644 index 000000000000..e4f1cb775a9d --- /dev/null +++ b/pkgs/by-name/op/opensmtpd-table-redis/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, + hiredis, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "opensmtpd-table-redis"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "OpenSMTPD"; + repo = "table-redis"; + tag = finalAttrs.version; + hash = "sha256-eS/jzran7/j3xrFuEqTLam0pokD/LBl4v2s/1ferCqk="; + }; + + strictDeps = true; + + buildInputs = [ + hiredis + ]; + + nativeBuildInputs = [ + autoconf + automake + ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-path-socket=/run" + "--with-path-pidfile=/run" + ]; + + env.NIX_CFLAGS_COMPILE = "-I${hiredis}/include/hiredis"; + + preConfigure = '' + sh bootstrap + ''; + + meta = { + homepage = "https://www.opensmtpd.org/"; + description = "ldap table for the OpenSMTPD mail server"; + changelog = "https://github.com/OpenSMTPD/table-redis/releases/tag/${finalAttrs.version}"; + license = lib.licenses.isc; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + pks + ]; + }; +}) diff --git a/pkgs/by-name/op/opensmtpd-table-socketmap/package.nix b/pkgs/by-name/op/opensmtpd-table-socketmap/package.nix new file mode 100644 index 000000000000..e3346765857c --- /dev/null +++ b/pkgs/by-name/op/opensmtpd-table-socketmap/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "opensmtpd-table-socketmap"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "OpenSMTPD"; + repo = "table-socketmap"; + tag = finalAttrs.version; + hash = "sha256-YTV0ijD264C7JAiB5ZfuCZhAmkLN0GSNl1vkZ3i3aRo="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoconf + automake + ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-path-socket=/run" + "--with-path-pidfile=/run" + ]; + + preConfigure = '' + sh bootstrap + ''; + + meta = { + homepage = "https://www.opensmtpd.org/"; + description = "ldap table for the OpenSMTPD mail server"; + changelog = "https://github.com/OpenSMTPD/table-socketmap/releases/tag/${finalAttrs.version}"; + license = lib.licenses.isc; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + pks + ]; + }; +}) diff --git a/pkgs/by-name/op/opensmtpd-table-sqlite/package.nix b/pkgs/by-name/op/opensmtpd-table-sqlite/package.nix new file mode 100644 index 000000000000..a85f91f48f17 --- /dev/null +++ b/pkgs/by-name/op/opensmtpd-table-sqlite/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, + sqlite, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "opensmtpd-table-sqlite"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "OpenSMTPD"; + repo = "table-sqlite"; + tag = finalAttrs.version; + hash = "sha256-Y5AveTo+Ol6cMcxOW3/GMZZD+17HiQdQ4Vg5WHPjKgA="; + }; + + strictDeps = true; + + buildInputs = [ + sqlite + ]; + + nativeBuildInputs = [ + autoconf + automake + ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-path-socket=/run" + "--with-path-pidfile=/run" + ]; + + preConfigure = '' + sh bootstrap + ''; + + meta = { + homepage = "https://www.opensmtpd.org/"; + description = "ldap table for the OpenSMTPD mail server"; + changelog = "https://github.com/OpenSMTPD/table-sqlite/releases/tag/${finalAttrs.version}"; + license = lib.licenses.isc; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + pks + ]; + }; +}) diff --git a/pkgs/by-name/op/opensmtpd/package.nix b/pkgs/by-name/op/opensmtpd/package.nix new file mode 100644 index 000000000000..8f7930623b37 --- /dev/null +++ b/pkgs/by-name/op/opensmtpd/package.nix @@ -0,0 +1,92 @@ +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + autoconf-archive, + pkgconf, + libtool, + bison, + libevent, + zlib, + libressl, + db, + pam, + libxcrypt, + nixosTests, +}: + +stdenv.mkDerivation rec { + pname = "opensmtpd"; + version = "7.7.0p0"; + + 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"; + hash = "sha256-sJU9oc4sv+S+E5zbGaqTX7+rQs8KmT1CWzejl9xIOWg="; + }; + + patches = [ + ./proc_path.diff # TODO: upstream to OpenSMTPD, see https://github.com/NixOS/nixpkgs/issues/54045 + ]; + + postPatch = '' + substituteInPlace mk/smtpctl/Makefile.am --replace "chgrp" "true" + substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555" + ''; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-mantype=doc" + "--with-auth-pam" + "--without-auth-bsdauth" + "--with-path-socket=/run" + "--with-path-pidfile=/run" + "--with-user-smtpd=smtpd" + "--with-user-queue=smtpq" + "--with-group-queue=smtpq" + "--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt" + "--with-libevent=${libevent.dev}" + "--with-table-db" + ]; + + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; + + meta = with lib; { + homepage = "https://www.opensmtpd.org/"; + description = '' + A free implementation of the server-side SMTP protocol as defined by + RFC 5321, with some additional standard extensions + ''; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ + obadz + ekleog + vifino + ]; + }; + passthru.tests = { + basic-functionality-and-dovecot-interaction = nixosTests.opensmtpd; + rspamd-integration = nixosTests.opensmtpd-rspamd; + }; +} diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/pkgs/by-name/op/opensmtpd/proc_path.diff similarity index 100% rename from pkgs/servers/mail/opensmtpd/proc_path.diff rename to pkgs/by-name/op/opensmtpd/proc_path.diff diff --git a/pkgs/by-name/op/opensnitch-ui/package.nix b/pkgs/by-name/op/opensnitch-ui/package.nix index 11ed3b064196..1d50cffd70f2 100644 --- a/pkgs/by-name/op/opensnitch-ui/package.nix +++ b/pkgs/by-name/op/opensnitch-ui/package.nix @@ -1,29 +1,23 @@ { - python311Packages, - fetchFromGitHub, - nix-update-script, + python3Packages, qt5, lib, + opensnitch, }: -python311Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "opensnitch-ui"; - version = "1.6.8"; - src = fetchFromGitHub { - owner = "evilsocket"; - repo = "opensnitch"; - rev = "refs/tags/v${version}"; - hash = "sha256-zn5kBnINLt/qqAbka9wShFLWJoMJ6SXu2OL6V6uQ2IM="; - }; + inherit (opensnitch) src version; + sourceRoot = "${opensnitch.src.name}/ui"; postPatch = '' - substituteInPlace ui/opensnitch/utils/__init__.py \ - --replace /usr/lib/python3/dist-packages/data ${python311Packages.pyasn}/${python311Packages.python.sitePackages}/pyasn/data + substituteInPlace opensnitch/utils/__init__.py \ + --replace-fail /usr/lib/python3/dist-packages/data ${python3Packages.pyasn}/${python3Packages.python.sitePackages}/pyasn/data ''; nativeBuildInputs = [ - python311Packages.pyqt5 + python3Packages.pyqt5 qt5.wrapQtAppsHook ]; @@ -31,7 +25,7 @@ python311Packages.buildPythonApplication rec { qt5.qtwayland ]; - propagatedBuildInputs = with python311Packages; [ + dependencies = with python3Packages; [ grpcio-tools notify2 packaging @@ -50,16 +44,12 @@ python311Packages.buildPythonApplication rec { sed -i 's/^import ui_pb2/from . import ui_pb2/' opensnitch/ui_pb2* ''; - preConfigure = '' - cd ui - ''; - preCheck = '' export PYTHONPATH=opensnitch:$PYTHONPATH ''; postInstall = '' - mv $out/${python311Packages.python.sitePackages}/usr/* $out/ + mv $out/${python3Packages.python.sitePackages}/usr/* $out/ ''; dontWrapQtApps = true; @@ -68,14 +58,15 @@ python311Packages.buildPythonApplication rec { # All tests are sandbox-incompatible and disabled for now doCheck = false; - passthru.updateScript = nix-update-script { }; - - meta = with lib; { + meta = { description = "Application firewall"; mainProgram = "opensnitch-ui"; homepage = "https://github.com/evilsocket/opensnitch/wiki"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ onny ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + onny + grimmauld + ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index 39b4e6dfad79..e4542308b687 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -13,9 +13,12 @@ testers, opensnitch, nixosTests, + opensnitch-ui, + nix-update-script, }: let # Override protoc-gen-go-grpc to use the compatible version + # Should be droppable on opensnitch 1.7.0 protoc-gen-go-grpc' = protoc-gen-go-grpc.overrideAttrs (oldAttrs: rec { version = "1.3.0"; @@ -29,20 +32,20 @@ let vendorHash = "sha256-y+/hjYUTFZuq55YAZ5M4T1cwIR+XFQBmWVE+Cg1Y7PI="; }); in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "opensnitch"; - version = "1.6.7"; + version = "1.6.9"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; - tag = "v${version}"; - hash = "sha256-2BwFCRbVvs7pAM5SnhynWws2+QthB/F9V6DYPViDICU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-c+VAlm32/NXvUr5i0AY/zuTrFIQLtPxNNeSiQTMoJAY="; }; postPatch = '' # Allow configuring Version at build time - substituteInPlace daemon/core/version.go --replace "const " "var " + substituteInPlace daemon/core/version.go --replace-fail "const " "var " ''; modRoot = "daemon"; @@ -71,18 +74,18 @@ buildGoModule rec { mkdir -p $out/etc/opensnitchd $out/lib/systemd/system cp system-fw.json $out/etc/opensnitchd/ substitute default-config.json $out/etc/opensnitchd/default-config.json \ - --replace "/var/log/opensnitchd.log" "/dev/stdout" + --replace-fail "/var/log/opensnitchd.log" "/dev/stdout" # Do not mkdir rules path sed -i '8d' opensnitchd.service # Fixup hardcoded paths substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \ - --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" + --replace-fail "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" ''; ldflags = [ "-s" "-w" - "-X github.com/evilsocket/opensnitch/daemon/core.Version=${version}" + "-X github.com/evilsocket/opensnitch/daemon/core.Version=${finalAttrs.version}" ]; postInstall = '' @@ -90,20 +93,33 @@ buildGoModule rec { --prefix PATH : ${lib.makeBinPath [ iptables ]} ''; - passthru.tests = { - inherit (nixosTests) opensnitch; - version = testers.testVersion { - package = opensnitch; - command = "opensnitchd -version"; + passthru = { + tests = { + inherit (nixosTests) opensnitch; + inherit opensnitch-ui; + version = testers.testVersion { + package = opensnitch; + command = "opensnitchd -version"; + }; + }; + + updater = nix-update-script { + extraArgs = [ + "--version-regex" + "^v([0-9.]+)$" + ]; }; }; - meta = with lib; { + meta = { description = "Application firewall"; mainProgram = "opensnitchd"; homepage = "https://github.com/evilsocket/opensnitch/wiki"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ onny ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + onny + grimmauld + ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/op/opensoldat/package.nix b/pkgs/by-name/op/opensoldat/package.nix index 89359b898887..3081619b8e10 100644 --- a/pkgs/by-name/op/opensoldat/package.nix +++ b/pkgs/by-name/op/opensoldat/package.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { physfs openal gamenetworkingsockets + xorg.libX11 ]; # TODO(@sternenseemann): set proper rpath via cmake, so we don't need autoPatchelfHook runtimeDependencies = [ xorg.libX11 ]; diff --git a/pkgs/by-name/op/openspades/package.nix b/pkgs/by-name/op/openspades/package.nix new file mode 100644 index 000000000000..5988ca9d4300 --- /dev/null +++ b/pkgs/by-name/op/openspades/package.nix @@ -0,0 +1,106 @@ +{ + lib, + stdenv, + fetchurl, + fetchFromGitHub, + fetchpatch, + cmake, + unzip, + zip, + file, + curl, + glew, + libGL, + SDL2, + SDL2_image, + zlib, + freetype, + imagemagick, + openal, + opusfile, + libogg, + libXext, +}: + +stdenv.mkDerivation rec { + pname = "openspades"; + version = "0.1.3"; + devPakVersion = "33"; + + src = fetchFromGitHub { + owner = "yvt"; + repo = "openspades"; + rev = "v${version}"; + sha256 = "1fvmqbif9fbipd0vphp57pk6blb4yp8xvqlc2ppipk5pjv6a3d2h"; + }; + + nativeBuildInputs = [ + cmake + imagemagick + unzip + zip + file + ]; + + buildInputs = [ + freetype + SDL2 + SDL2_image + libGL + zlib + curl + glew + opusfile + openal + libogg + libXext + ]; + + patches = [ + # https://github.com/yvt/openspades/pull/793 fix Darwin build + (fetchpatch { + url = "https://github.com/yvt/openspades/commit/2d13704fefc475b279337e89057b117f711a35d4.diff"; + sha256 = "1i7rcpjzkjhbv5pp6byzrxv7sb1iamqq5k1vyqlvkbr38k2dz0rv"; + }) + ]; + + cmakeFlags = [ + "-DOPENSPADES_INSTALL_BINARY=bin" + ]; + + devPak = fetchurl { + url = "https://github.com/yvt/openspades-paks/releases/download/r${devPakVersion}/OpenSpadesDevPackage-r${devPakVersion}.zip"; + sha256 = "1bd2fyn7mlxa3xnsvzj08xjzw02baimqvmnix07blfhb78rdq9q9"; + }; + + notoFont = fetchurl { + url = "https://github.com/yvt/openspades/releases/download/v0.1.1b/NotoFonts.pak"; + sha256 = "0kaz8j85wjjnf18z0lz69xr1z8makg30jn2dzdyicd1asrj0q1jm"; + }; + + postPatch = '' + sed -i 's,^wget .*,cp $devPak "$PAK_NAME",' Resources/downloadpak.sh + patchShebangs Resources + ''; + + postInstall = '' + cp $notoFont $out/share/games/openspades/Resources/ + ''; + + NIX_CFLAGS_LINK = "-lopenal"; + + meta = with lib; { + description = "Compatible client of Ace of Spades 0.75"; + mainProgram = "openspades"; + homepage = "https://github.com/yvt/openspades/"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ + abbradar + azahi + ]; + # never built on aarch64-linux since first introduction in nixpkgs + broken = + stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); + }; +} diff --git a/pkgs/by-name/op/openstack-rs/package.nix b/pkgs/by-name/op/openstack-rs/package.nix new file mode 100644 index 000000000000..836eac472b81 --- /dev/null +++ b/pkgs/by-name/op/openstack-rs/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + lib, + fetchFromGitHub, + rustPlatform, + installShellFiles, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "openstack-rs"; + version = "0.12.0"; + src = fetchFromGitHub { + owner = "gtema"; + repo = "openstack"; + tag = "v${finalAttrs.version}"; + hash = "sha256-n3tVkEDn5giAYxcFWI/sc0yCjK1A80L7+dp44QXoCc4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-lu3OeBP2fHGX1SV1LnDv/RCAVhoEVZIRiMoXWJ3H4IQ="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd osc \ + --bash <($out/bin/osc completion bash) \ + --fish <($out/bin/osc completion fish) \ + --zsh <($out/bin/osc completion zsh) + ''; + + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "OpenStack CLI and TUI implemented in Rust"; + homepage = "https://github.com/gtema/openstack"; + changelog = "https://github.com/gtema/openstack/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lykos153 ]; + mainProgram = "osc"; + }; +}) diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix index 588993c98e37..9eedd8f19430 100644 --- a/pkgs/by-name/op/opensubdiv/package.nix +++ b/pkgs/by-name/op/opensubdiv/package.nix @@ -14,7 +14,6 @@ cudaSupport ? config.cudaSupport, cudaPackages, openclSupport ? !cudaSupport, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -57,18 +56,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXi ] ++ lib.optionals (openclSupport && stdenv.hostPlatform.isLinux) [ ocl-icd ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - OpenCL - Cocoa - CoreVideo - IOKit - AppKit - AGL - MetalKit - ] - ) + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; @@ -78,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/PixarAnimationStudios/OpenSubdiv/blob/7d0ab5530feef693ac0a920585b5c663b80773b3/CMakeLists.txt#L602 preConfigure = lib.optionalString cudaSupport '' cmakeFlagsArray+=( - -DOSD_CUDA_NVCC_FLAGS="${lib.concatStringsSep " " cudaPackages.cudaFlags.gencode}" + -DOSD_CUDA_NVCC_FLAGS="${lib.concatStringsSep " " cudaPackages.flags.gencode}" ) ''; diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix new file mode 100644 index 000000000000..566a189e706c --- /dev/null +++ b/pkgs/by-name/op/opensurge/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + allegro5, + libglvnd, + surgescript, + physfs, + xorg, + versionCheckHook, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "opensurge"; + version = "0.6.1.2"; + + src = fetchFromGitHub { + owner = "alemart"; + repo = "opensurge"; + tag = "v${finalAttrs.version}"; + hash = "sha256-HvpKZ62mYy7XkZOnIn7QRA2rFVREFnKO1NO83aCR76k="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + allegro5 + libglvnd + physfs + surgescript + xorg.libX11 + ]; + + cmakeFlags = [ + "-DGAME_BINDIR=${placeholder "out"}/bin" + "-DDESKTOP_ICON_PATH=${placeholder "out"}/share/pixmaps" + "-DDESKTOP_METAINFO_PATH=${placeholder "out"}/share/metainfo" + "-DDESKTOP_ENTRY_PATH=${placeholder "out"}/share/applications" + "-DWANT_BUILD_DATE=OFF" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + # Darwin fails with "Critical error: required built-in appearance SystemAppearance not found" + doInstallCheck = !stdenv.hostPlatform.isDarwin; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "opensurge"; + description = "Fun 2D retro platformer inspired by Sonic games and a game creation system"; + homepage = "https://opensurge2d.org/"; + downloadPage = "https://github.com/alemart/opensurge"; + changelog = "https://github.com/alemart/opensurge/blob/v${finalAttrs.version}/CHANGES.md"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ federicoschonborn ]; + }; +}) diff --git a/pkgs/by-name/op/openterface-qt/package.nix b/pkgs/by-name/op/openterface-qt/package.nix index 9000ceaa8600..543c192aa972 100644 --- a/pkgs/by-name/op/openterface-qt/package.nix +++ b/pkgs/by-name/op/openterface-qt/package.nix @@ -22,17 +22,18 @@ let in stdenv.mkDerivation (final: { pname = "openterface-qt"; - version = "0.2.0"; + version = "0.3.12"; src = fetchFromGitHub { owner = "TechxArtisanStudio"; repo = "Openterface_QT"; - rev = "v${final.version}"; - hash = "sha256-2Z4sMoNfbGuZKyS4YVrId8AIKr5XhNBNcdYfywc2MXM="; + rev = "${final.version}"; + hash = "sha256-VB2DTfm6X5xY+bGQBq9VXe6boJJTDxBkPEdLvPbd71g="; }; nativeBuildInputs = [ copyDesktopItems qt6.wrapQtAppsHook qt6.qmake + qt6.qttools ]; buildInputs = [ libusb1 @@ -41,6 +42,9 @@ stdenv.mkDerivation (final: { qt6.qtserialport qt6.qtsvg ]; + preBuild = '' + lrelease openterfaceQT.pro + ''; installPhase = '' runHook preInstall mkdir -p $out/bin diff --git a/pkgs/by-name/op/opentimestamps-client/package.nix b/pkgs/by-name/op/opentimestamps-client/package.nix new file mode 100644 index 000000000000..bb563188ca97 --- /dev/null +++ b/pkgs/by-name/op/opentimestamps-client/package.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "opentimestamps-client"; + version = "0.7.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "opentimestamps"; + repo = "opentimestamps-client"; + tag = "opentimestamps-client-v${version}"; + hash = "sha256-ny2svB8WcoUky8UfeilANo1DlS+f3o9RtV4YNmUwjJk="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + gitpython + opentimestamps + pysocks + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "otsclient" + ]; + + meta = with lib; { + description = "Command-line tool to create and verify OpenTimestamps proofs"; + mainProgram = "ots"; + homepage = "https://github.com/opentimestamps/opentimestamps-client"; + changelog = "https://github.com/opentimestamps/opentimestamps-client/releases/tag/opentimestamps-client-v${version}"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ erikarvstedt ]; + }; +} diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index e73a6e6b27f0..6c7c2792d443 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -15,16 +15,16 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; tag = "v${version}"; - hash = "sha256-e0ZzbQdex0DD7Bj9WpcVI5roh0cMbJuNr5nsSVaOSu4="; + hash = "sha256-YZMv17fnvzgzm35MXFkvMc5JAuPnyapa41H8Ob4t88c="; }; - vendorHash = "sha256-fMTbLSeW+pw6GK8/JLZzG2ER90ss2g1FSDX5+f292do="; + vendorHash = "sha256-avfyMwYv8nKLCUHSExsPvYQrt9sMKZNPHFB/YFGQs2s="; ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index f6c984e4b9df..c93d0ba40100 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -4,7 +4,6 @@ ceres-solver, cmake, cminpack, - darwin, dlib, fetchFromGitHub, hdf5, @@ -24,9 +23,6 @@ enablePython ? false, }: -let - inherit (darwin.apple_sdk.frameworks) Accelerate; -in stdenv.mkDerivation (finalAttrs: { pname = "openturns"; version = "1.24"; @@ -64,9 +60,6 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.matplotlib python3Packages.psutil python3Packages.python - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate ]; cmakeFlags = [ diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 9f4fe9af2277..4b5bd08d1e90 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.16.1"; + version = "23.19.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; tag = "v${version}"; - hash = "sha256-/5vcK6ndqdur2CceAgEkMPQpWpghS3O8GuBe1s6ZPKg="; + hash = "sha256-f5rK5029+Gz2klb6UAEfExWpDVxdkb2SVFgou4H5jKk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openvi/package.nix b/pkgs/by-name/op/openvi/package.nix index 9ac54feb90b7..db796fed81cc 100644 --- a/pkgs/by-name/op/openvi/package.nix +++ b/pkgs/by-name/op/openvi/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "openvi"; - version = "7.6.30"; + version = "7.6.31"; src = fetchFromGitHub { owner = "johnsonjh"; repo = "OpenVi"; rev = version; - hash = "sha256-P4w/PM9UmHmTzS9+WDK3x3MyZ7OoY2yO/Rx0vRMJuLI="; + hash = "sha256-RqmulYHQFZmTHQAYgZmB8tAG6mSquNODmssfKB8YqDU="; }; buildInputs = [ diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index dc5b3036b560..56c51de76b72 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -61,14 +61,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2025.0.0"; + version = "2025.1.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; tag = version; fetchSubmodules = true; - hash = "sha256-+LXOX5ChfVbD2dbQYuIp9unz6v3OIpH5YUpdhn2okbM="; + hash = "sha256-KufQjBSzhj1N+T95PjlNU3Tc9V5/X2OLwCbXoI2fdZk="; }; outputs = [ diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix index c690a37a1da8..cf25ba7abce8 100644 --- a/pkgs/by-name/op/openvpn3/package.nix +++ b/pkgs/by-name/op/openvpn3/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "openvpn3"; # also update openvpn3-core - version = "24"; + version = "24.1"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "openvpn3-linux"; tag = "v${version}"; - hash = "sha256-e3NRLrznTEolTzMO+kGEh48MCrcEr8p7JG3hG889aK4="; + hash = "sha256-E6SBVPHmejXB18RuNCNq62yWOJslZfIjVbNUdRIk5Sw="; # `openvpn3-core` is a submodule. # TODO: make it into a separate package fetchSubmodules = true; diff --git a/pkgs/by-name/op/openvr/package.nix b/pkgs/by-name/op/openvr/package.nix index 501a74ec098f..fa65d10af9e3 100644 --- a/pkgs/by-name/op/openvr/package.nix +++ b/pkgs/by-name/op/openvr/package.nix @@ -1,9 +1,7 @@ { - AppKit, cmake, fetchFromGitHub, fetchpatch2, - Foundation, jsoncpp, lib, libGL, @@ -48,15 +46,10 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = - [ - jsoncpp - libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Foundation - ]; + buildInputs = [ + jsoncpp + libGL + ]; cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" diff --git a/pkgs/by-name/op/openxr-loader/package.nix b/pkgs/by-name/op/openxr-loader/package.nix index 6fbea11233c9..b6f31e85b909 100644 --- a/pkgs/by-name/op/openxr-loader/package.nix +++ b/pkgs/by-name/op/openxr-loader/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.1.46"; + version = "1.1.47"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; tag = "release-${version}"; - hash = "sha256-C2PGPIDA4C/d37jjXLO+2lqD5VSV3skSqraRiT8RT+c="; + hash = "sha256-7VW99dtE7gz0Y9pKyAdyeKHL6zgk5KvA8jPfgG1O5sc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opera/package.nix b/pkgs/by-name/op/opera/package.nix index 30f6059fc633..a18655c63acb 100644 --- a/pkgs/by-name/op/opera/package.nix +++ b/pkgs/by-name/op/opera/package.nix @@ -52,11 +52,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "117.0.5408.93"; + version = "118.0.5461.60"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-1Qi1Suh5gDJXFOnI3sjmLCNrNFDqV9n1sTh3rFrRBro="; + hash = "sha256-SApVqrMeOrpw9GDMwBgpxMfSgMXJS1YV2bPx+KXBY/4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/ophcrack/package.nix b/pkgs/by-name/op/ophcrack/package.nix index bee8b7dd76f6..3379e9818f60 100644 --- a/pkgs/by-name/op/ophcrack/package.nix +++ b/pkgs/by-name/op/ophcrack/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "3.8.0"; src = fetchurl { - url = "mirror://ophcrack/ophcrack/${version}/ophcrack-${version}.tar.bz2"; + url = "mirror://sourceforge/ophcrack/${version}/ophcrack-${version}.tar.bz2"; hash = "sha256-BIpt9XmDo6WjGsfE7BLfFqpJ5lKilnbZPU75WdUK7uA="; }; diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix index 5b675880a748..7586bca5f127 100644 --- a/pkgs/by-name/op/opkssh/package.nix +++ b/pkgs/by-name/op/opkssh/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "opkssh"; - version = "0.3.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "openpubkey"; repo = "opkssh"; tag = "v${finalAttrs.version}"; - hash = "sha256-RtTo/wj4v+jtJ4xZJD0YunKtxT7zZ1esgJOSEtxnLOg="; + hash = "sha256-BK34zw/VYv6mAn68U8tRoOU6Obz3P+6Hw12fsKBuUf8="; }; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-MK7lEBKMVZv4jbYY2Vf0zYjw7YV+13tB0HkO3tCqzEI="; + vendorHash = "sha256-6nTRiybsNtP/BiDaNrFEGEGM41BAjGpOyQ0AlQimSE4="; nativeInstallCheckInputs = [ versionCheckHook @@ -31,9 +31,12 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/openpubkey/opkssh"; - description = "Integrating SSO with SSH - short-lived SSH keys with an OpenID provider"; + description = "Enables SSH to be used with OpenID Connect"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.johnrichardrinehart ]; + maintainers = with lib.maintainers; [ + johnrichardrinehart + sarcasticadmin + ]; mainProgram = "opkssh"; }; }) diff --git a/pkgs/by-name/op/optinix/package.nix b/pkgs/by-name/op/optinix/package.nix index 044b190e4e20..21a69da48689 100644 --- a/pkgs/by-name/op/optinix/package.nix +++ b/pkgs/by-name/op/optinix/package.nix @@ -20,11 +20,6 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - preBuild = '' - substituteInPlace vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go \ - --replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)' - ''; - postInstall = '' installShellCompletion --cmd optinix \ --bash <($out/bin/optinix completion bash) \ diff --git a/pkgs/development/libraries/science/math/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch b/pkgs/by-name/or/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch similarity index 100% rename from pkgs/development/libraries/science/math/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch rename to pkgs/by-name/or/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix new file mode 100644 index 000000000000..f391bafc6492 --- /dev/null +++ b/pkgs/by-name/or/or-tools/package.nix @@ -0,0 +1,172 @@ +{ + abseil-cpp_202407, + bzip2, + cbc, + cmake, + eigen, + ensureNewerSourcesForZipFilesHook, + fetchFromGitHub, + fetchpatch, + glpk, + highs, + lib, + pkg-config, + protobuf_29, + python3, + re2, + stdenv, + swig, + unzip, + zlib, +}: + +let + # OR-Tools strictly requires specific versions of abseil-cpp and + # protobuf. Do not un-pin these, even if you're upgrading them to + # what might happen to be the latest version at the current moment; + # future upgrades *will* break the build. + abseil-cpp = abseil-cpp_202407; + protobuf = protobuf_29.override { inherit abseil-cpp; }; + python-protobuf = python3.pkgs.protobuf5.override { inherit protobuf; }; + pybind11-protobuf = python3.pkgs.pybind11-protobuf.override { protobuf_29 = protobuf; }; + +in +stdenv.mkDerivation (finalAttrs: { + pname = "or-tools"; + version = "9.12"; + + src = fetchFromGitHub { + owner = "google"; + repo = "or-tools"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5rFeAK51+BfjIyu/5f5ptaKMD7Hd20yHa2Vj3O3PkLU="; + }; + + patches = [ + # Rebased from https://build.opensuse.org/public/source/science/google-or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch?rev=19 + ./0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch + (fetchpatch { + name = "0001-Revert-python-Fix-python-install-on-windows-breaks-L.patch"; + url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Revert-python-Fix-python-install-on-windows-breaks-L.patch?rev=19"; + hash = "sha256-BNB3KlgjpWcZtb9e68Jkc/4xC4K0c+Iisw0eS6ltYXE="; + }) + (fetchpatch { + name = "0001-Fix-up-broken-CMake-rules-for-bundled-pybind-stuff.patch"; + url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Fix-up-broken-CMake-rules-for-bundled-pybind-stuff.patch?rev=19"; + hash = "sha256-r38ZbRkEW1ZvJb0Uf56c0+HcnfouZZJeEYlIK7quSjQ="; + }) + ]; + + # or-tools normally attempts to build Protobuf for the build platform when + # cross-compiling. Instead, just tell it where to find protoc. + postPatch = + '' + echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake + '' + # Patches from OpenSUSE: + # https://build.opensuse.org/projects/science/packages/google-or-tools/files/google-or-tools.spec?expand=1 + + '' + sed -i -e '/CMAKE_DEPENDENT_OPTION(INSTALL_DOC/ s/BUILD_CXX AND BUILD_DOC/BUILD_CXX/' CMakeLists.txt + find . -iname \*CMakeLists.txt -exec sed -i -e 's/pybind11_native_proto_caster/pybind11_protobuf::pybind11_native_proto_caster/' '{}' \; + sed -i -e 's/TARGET pybind11_native_proto_caster/TARGET pybind11_protobuf::pybind11_native_proto_caster/' cmake/check_deps.cmake + sed -i -e "/protobuf/ { s/.*,/'protobuf >= 5.26',/ }" ortools/python/setup.py.in + ''; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_DEPS" false) + (lib.cmakeBool "BUILD_PYTHON" true) + (lib.cmakeBool "BUILD_pybind11" false) + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeBool "FETCH_PYTHON_DEPS" false) + (lib.cmakeBool "USE_GLPK" true) + (lib.cmakeBool "USE_SCIP" false) + (lib.cmakeFeature "Python3_EXECUTABLE" "${python3.pythonOnBuildForHost.interpreter}") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeBool "CMAKE_MACOSX_RPATH" false) + ]; + + strictDeps = true; + + nativeBuildInputs = + [ + cmake + ensureNewerSourcesForZipFilesHook + pkg-config + python3.pythonOnBuildForHost + swig + unzip + ] + ++ (with python3.pythonOnBuildForHost.pkgs; [ + pip + mypy-protobuf + mypy + ]); + buildInputs = [ + abseil-cpp + bzip2 + cbc + eigen + glpk + highs + python3.pkgs.absl-py + python3.pkgs.pybind11 + python3.pkgs.pybind11-abseil + pybind11-protobuf + python3.pkgs.pytest + python3.pkgs.scipy + python3.pkgs.setuptools + python3.pkgs.wheel + re2 + zlib + ]; + propagatedBuildInputs = [ + abseil-cpp + highs + protobuf + python-protobuf + python3.pkgs.immutabledict + python3.pkgs.numpy + python3.pkgs.pandas + ]; + nativeCheckInputs = [ + python3.pkgs.matplotlib + python3.pkgs.virtualenv + ]; + + # some tests fail on linux and hang on darwin + doCheck = false; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib + ''; + + # This extra configure step prevents the installer from littering + # $out/bin with sample programs that only really function as tests, + # and disables the upstream installation of a zipped Python egg that + # can’t be imported with our Python setup. + installPhase = '' + cmake . -DBUILD_EXAMPLES=OFF -DBUILD_PYTHON=OFF -DBUILD_SAMPLES=OFF + cmake --install . + pip install --prefix="$python" python/ + ''; + + outputs = [ + "out" + "python" + ]; + + meta = { + homepage = "https://github.com/google/or-tools"; + license = lib.licenses.asl20; + description = '' + Google's software suite for combinatorial optimization. + ''; + mainProgram = "fzn-cp-sat"; + maintainers = with lib.maintainers; [ andersk ]; + platforms = with lib.platforms; linux ++ darwin; + }; +}) diff --git a/pkgs/by-name/or/oranchelo-icon-theme/package.nix b/pkgs/by-name/or/oranchelo-icon-theme/package.nix index fd23ec698945..b3972069b06d 100644 --- a/pkgs/by-name/or/oranchelo-icon-theme/package.nix +++ b/pkgs/by-name/or/oranchelo-icon-theme/package.nix @@ -42,6 +42,7 @@ stdenvNoCC.mkDerivation rec { gtk-update-icon-cache "$theme" done ''; + dontCheckForBrokenSymlinks = true; meta = with lib; { description = "Oranchelo icon theme"; diff --git a/pkgs/by-name/or/oranda/package.nix b/pkgs/by-name/or/oranda/package.nix index 5cf56cc1bf9c..482bd1c767f3 100644 --- a/pkgs/by-name/or/oranda/package.nix +++ b/pkgs/by-name/or/oranda/package.nix @@ -6,7 +6,6 @@ tailwindcss, oniguruma, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,14 +27,9 @@ rustPlatform.buildRustPackage rec { tailwindcss ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + oniguruma + ]; # requires internet access checkFlags = [ diff --git a/pkgs/by-name/or/oras/package.nix b/pkgs/by-name/or/oras/package.nix index 52f862548d8a..b8ae0063f634 100644 --- a/pkgs/by-name/or/oras/package.nix +++ b/pkgs/by-name/or/oras/package.nix @@ -5,20 +5,21 @@ installShellFiles, testers, oras, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "oras"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "oras-project"; repo = "oras"; - rev = "v${version}"; - hash = "sha256-iSmoD2HhzVrWQBaZ7HaIjcPmybl4JTVeVVfbn29i91Q="; + tag = "v${finalAttrs.version}"; + hash = "sha256-IXIw2prApg5iL3BPbOY4x09KjyhFvKofgfz2L6UXKR8="; }; - vendorHash = "sha256-zxcRMrr0mfSiuZpXYe7N0nJrEmiBTgw03+Yp4PYieBY="; + vendorHash = "sha256-PLGWPoMCsmdnsKD/FdaRHGO0X9/0Y/8DWV21GsCBR04="; nativeBuildInputs = [ installShellFiles ]; @@ -27,7 +28,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X oras.land/oras/internal/version.Version=${version}" + "-X oras.land/oras/internal/version.Version=${finalAttrs.version}" "-X oras.land/oras/internal/version.BuildMetadata=" "-X oras.land/oras/internal/version.GitTreeState=clean" ]; @@ -40,29 +41,18 @@ buildGoModule rec { ''; doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; - $out/bin/oras --help - $out/bin/oras version | grep "${version}" - - runHook postInstallCheck - ''; - - passthru.tests.version = testers.testVersion { - package = oras; - command = "oras version"; - }; - - meta = with lib; { + meta = { homepage = "https://oras.land/"; - changelog = "https://github.com/oras-project/oras/releases/tag/v${version}"; + changelog = "https://github.com/oras-project/oras/releases/tag/v${finalAttrs.version}"; description = "ORAS project provides a way to push and pull OCI Artifacts to and from OCI Registries"; mainProgram = "oras"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jk developer-guy ]; }; -} +}) diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix index ead3cdfe1d00..d210a38c46d8 100644 --- a/pkgs/by-name/or/orbiton/package.nix +++ b/pkgs/by-name/or/orbiton/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.68.9"; + version = "2.69.0"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; tag = "v${version}"; - hash = "sha256-MKXixsiEJOcJV+46RGLOfuG4Dm4LyaVPSqs5hfexC3M="; + hash = "sha256-0ba+IkiBQUsesq54S4Ngd9vTO5E7kqOQS61HidxE0jM="; }; vendorHash = null; diff --git a/pkgs/by-name/or/orc/package.nix b/pkgs/by-name/or/orc/package.nix index 7cc98b93f7ee..d88ff17b0312 100644 --- a/pkgs/by-name/or/orc/package.nix +++ b/pkgs/by-name/or/orc/package.nix @@ -5,7 +5,7 @@ meson, ninja, file, - docbook_xsl, + docbook-xsl-nons, gtk-doc ? null, buildDevDoc ? gtk-doc != null, @@ -14,18 +14,21 @@ gst_all_1, qt6, vips, - }: -let - inherit (lib) optional optionals; -in -stdenv.mkDerivation rec { + +stdenv.mkDerivation (finalAttrs: { pname = "orc"; - version = "0.4.40"; + version = "0.4.41"; + + outputs = [ + "out" + "dev" + ] ++ lib.optional buildDevDoc "devdoc"; + outputBin = "dev"; # compilation tools src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz"; - hash = "sha256-P8K+5437fEH9lgUGH8aRONt98Afq4vZpofVui6zvdKs="; + url = "https://gstreamer.freedesktop.org/src/orc/orc-${finalAttrs.version}.tar.xz"; + hash = "sha256-yxv9T2VSic05vARkLVl76d5UJ2I/CGHB/BnAjZhGf6I="; }; postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' @@ -33,23 +36,19 @@ stdenv.mkDerivation rec { sed -i '/memcpy_speed/d' testsuite/meson.build ''; - outputs = [ - "out" - "dev" - ] ++ optional buildDevDoc "devdoc"; - outputBin = "dev"; # compilation tools - - mesonFlags = optionals (!buildDevDoc) [ "-Dgtk_doc=disabled" ]; + mesonFlags = [ + (lib.mesonEnable "gtk_doc" buildDevDoc) + ]; nativeBuildInputs = [ meson ninja ] - ++ optionals buildDevDoc [ + ++ lib.optionals buildDevDoc [ gtk-doc file - docbook_xsl + docbook-xsl-nons ]; # https://gitlab.freedesktop.org/gstreamer/orc/-/issues/41 @@ -70,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Oil Runtime Compiler"; homepage = "https://gstreamer.freedesktop.org/projects/orc.html"; - changelog = "https://cgit.freedesktop.org/gstreamer/orc/plain/RELEASE?h=${version}"; + changelog = "https://gitlab.freedesktop.org/gstreamer/orc/-/blob/${finalAttrs.version}/RELEASE"; # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. license = with licenses; [ @@ -80,4 +79,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index ac79481e65e6..14887e24ae25 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -199,6 +199,9 @@ stdenv.mkDerivation (finalAttrs: { "-Wno-dev" ]; + # Generate translation files + postBuild = "( cd .. && ./run_gettext.sh )"; + preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "$out/lib:${ diff --git a/pkgs/by-name/or/orca/fix-paths.patch b/pkgs/by-name/or/orca/fix-paths.patch index 8f713de296d6..49b5cc34ac89 100644 --- a/pkgs/by-name/or/orca/fix-paths.patch +++ b/pkgs/by-name/or/orca/fix-paths.patch @@ -1,39 +1,34 @@ -diff --git a/src/orca/debug.py b/src/orca/debug.py -index e17e2333e..595c8489d 100644 ---- a/src/orca/debug.py -+++ b/src/orca/debug.py -@@ -529,7 +529,7 @@ def traceit(frame, event, arg): - return traceit +diff --git a/src/orca/ax_utilities_application.py b/src/orca/ax_utilities_application.py +index 60c172f78..e8dadf76d 100644 +--- a/src/orca/ax_utilities_application.py ++++ b/src/orca/ax_utilities_application.py +@@ -189,7 +189,7 @@ class AXUtilitiesApplication: - def getOpenFDCount(pid): -- procs = subprocess.check_output([ 'lsof', '-w', '-Ff', '-p', str(pid)]) -+ procs = subprocess.check_output([ '@lsof@', '-w', '-Ff', '-p', str(pid)]) - procs = procs.decode('UTF-8').split('\n') - files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs)) - -@@ -547,7 +547,7 @@ def getCmdline(pid): - return cmdline - - def pidOf(procName): -- openFile = subprocess.Popen(f'pgrep {procName}', -+ openFile = subprocess.Popen(f'@pgrep@ {procName}', - shell=True, - stdout=subprocess.PIPE).stdout - pids = openFile.read() + pid = AXUtilitiesApplication.get_process_id(app) + try: +- state = subprocess.getoutput(f"cat /proc/{pid}/status | grep State") ++ state = subprocess.getoutput(f"@cat@ /proc/{pid}/status | @grep@ State") + state = state.split()[1] + except Exception as error: + tokens = [f"AXUtilitiesApplication: Exception checking state of pid {pid}: {error}"] +diff --git a/src/orca/debugging_tools_manager.py b/src/orca/debugging_tools_manager.py +index 740f1a690..85f74d2dc 100644 +--- a/src/orca/debugging_tools_manager.py ++++ b/src/orca/debugging_tools_manager.py +@@ -243,7 +243,7 @@ class DebuggingToolsManager: + else: + name = AXObject.get_name(app) or "[DEAD]" + try: +- cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline") ++ cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline") + except Exception as error: + cmdline = f"EXCEPTION: {error}" + else: diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in -index c3b23dec2..320597ae6 100755 +index 6cb4c7772..903b344f0 100755 --- a/src/orca/orca_bin.py.in +++ b/src/orca/orca_bin.py.in -@@ -63,7 +63,7 @@ class ListApps(argparse.Action): - name = "[DEAD]" - - try: -- cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid) -+ cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid) - except Exception: - cmdline = '(exception encountered)' - else: -@@ -199,7 +199,7 @@ def inGraphicalDesktop(): +@@ -186,7 +186,7 @@ def inGraphicalDesktop(): def otherOrcas(): """Returns the pid of any other instances of Orca owned by this user.""" @@ -43,33 +38,33 @@ index c3b23dec2..320597ae6 100755 stdout=subprocess.PIPE).stdout pids = openFile.read() diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py -index 48c0dead5..8a4a04e74 100644 +index 3407be009..452297a3f 100644 --- a/src/orca/orca_modifier_manager.py +++ b/src/orca/orca_modifier_manager.py -@@ -200,7 +200,7 @@ class OrcaModifierManager: - debug.printMessage(debug.LEVEL_INFO, msg, True) +@@ -230,7 +230,7 @@ class OrcaModifierManager: + debug.print_message(debug.LEVEL_INFO, msg, True) self.unset_orca_modifiers(reason) -- p = subprocess.Popen(['xkbcomp', os.environ['DISPLAY'], '-'], -+ p = subprocess.Popen(['@xkbcomp@', os.environ['DISPLAY'], '-'], - stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) - self._original_xmodmap, _ = p.communicate() +- with subprocess.Popen(["xkbcomp", os.environ["DISPLAY"], "-"], ++ with subprocess.Popen(["@xkbcomp@", os.environ["DISPLAY"], "-"], + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) as p: + self._original_xmodmap, _ = p.communicate() self._create_orca_xmodmap() -@@ -232,7 +232,7 @@ class OrcaModifierManager: +@@ -262,7 +262,7 @@ class OrcaModifierManager: return self._caps_lock_cleared = False -- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], -+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], - stdin=subprocess.PIPE, stdout=None, stderr=None) - p.communicate(self._original_xmodmap) +- with subprocess.Popen(["xkbcomp", "-w0", "-", os.environ["DISPLAY"]], ++ with subprocess.Popen(["@xkbcomp@", "-w0", "-", os.environ["DISPLAY"]], + stdin=subprocess.PIPE, stdout=None, stderr=None) as p: + p.communicate(self._original_xmodmap) -@@ -293,7 +293,7 @@ class OrcaModifierManager: - if modified: - msg = "ORCA MODIFIER MANAGER: Updating xmodmap" - debug.printMessage(debug.LEVEL_INFO, msg, True) -- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], -+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], - stdin=subprocess.PIPE, stdout=None, stderr=None) - p.communicate(bytes('\n'.join(lines), 'UTF-8')) +@@ -325,7 +325,7 @@ class OrcaModifierManager: + debug.print_message(debug.LEVEL_INFO, msg, True) + + +- with subprocess.Popen(["xkbcomp", "-w0", "-", os.environ["DISPLAY"]], ++ with subprocess.Popen(["@xkbcomp@", "-w0", "-", os.environ["DISPLAY"]], + stdin=subprocess.PIPE, stdout=None, stderr=None) as p: + p.communicate(bytes('\n'.join(lines), 'UTF-8')) else: diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 4d20ca75d163..ae9ddec8febe 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -18,7 +18,7 @@ dbus, xkbcomp, procps, - lsof, + gnugrep, coreutils, gsettings-desktop-schemas, speechd-minimal, @@ -29,19 +29,19 @@ python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "47.3"; + version = "48.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz"; - hash = "sha256-GwsUW7aFzXTso+KMt7cJf5jRPuHMWLce3u06j5BFIxs="; + hash = "sha256-ZsbwmCIUnaJDpGM6fYSnsduq8UU0qf653yv+AaUFF4o="; }; patches = [ (replaceVars ./fix-paths.patch { cat = "${coreutils}/bin/cat"; - lsof = "${lsof}/bin/lsof"; + grep = "${gnugrep}/bin/grep"; pgrep = "${procps}/bin/pgrep"; xkbcomp = "${xkbcomp}/bin/xkbcomp"; }) @@ -111,7 +111,8 @@ python3.pkgs.buildPythonApplication rec { Needs `services.gnome.at-spi2-core.enable = true;` in `configuration.nix`. ''; - maintainers = with maintainers; [ berce ] ++ teams.gnome.members; + maintainers = with maintainers; [ berce ]; + teams = [ teams.gnome ]; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 3fc331e66434..fb1199274458 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.31.0"; + version = "0.33.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-XUZq9+hO1L+VjipR5cNeA7IJXP4mg/fxnV64pcyJWU8="; + hash = "sha256-yiCMnP73C5MJLYjnZfqcKtdSzPyL/9WlAtylMXDl4E8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-DfDnTJ5PeBE9QVV7FvGCO7VLbb8CMslOBR1lrvDoNkM="; + vendorHash = "sha256-fU2TXUtcXmjswlEbSsbCTOaC5rvtctHbTKbR7zIwP/g="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/or/orchis-theme/package.nix b/pkgs/by-name/or/orchis-theme/package.nix index fcb63679336b..af74db27205d 100644 --- a/pkgs/by-name/or/orchis-theme/package.nix +++ b/pkgs/by-name/or/orchis-theme/package.nix @@ -38,13 +38,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-11-03"; + version = "2025-04-25"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-K8FiS1AiFMhVaz2Jbr0pudQJGqpwBkQ/4NZdZACtM9Q="; + hash = "sha256-+2/CsgJ+rdDpCp+r5B/zys3PtFgtnu+ohTEUOtJNd1Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index e6cb2d85ddfb..34050f3e23bc 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -4,36 +4,29 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "ord"; - version = "0.22.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "ordinals"; repo = "ord"; rev = version; - hash = "sha256-95da/aoBhrQ/GaM4fojFufs6+OI2KLF6SGsSw6qtYUc="; + hash = "sha256-p9WjZ8QsY5fvL91zPUKnK8p0ZJvAxzmPbN/UVWSNjqk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-PGC3R+iy3evp7BtEpyXDPvi6mlB7CGtd8uzfpkmHzMU="; + cargoHash = "sha256-c3+yM7jJyIl2XpSOeqdeQP2OdRc7/t/epDTMoOa/66A="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; dontUseCargoParallelTests = true; diff --git a/pkgs/by-name/or/orogene/package.nix b/pkgs/by-name/or/orogene/package.nix index 510b0c67dcae..f1fbb658b10c 100644 --- a/pkgs/by-name/or/orogene/package.nix +++ b/pkgs/by-name/or/orogene/package.nix @@ -4,8 +4,7 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, + versionCheckHook, }: rustPlatform.buildRustPackage rec { @@ -20,26 +19,35 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + cargoPatches = [ + # Workaround to avoid "error[E0282]" + # ref: https://github.com/orogene/orogene/pull/315 + ./update-outdated-lockfile.patch + ]; + useFetchCargoVendor = true; - cargoHash = "sha256-Ju3nRevwJZfnoSqEIERkfMyg6Dy8ky53qf1ZXuAOjsw="; + cargoHash = "sha256-I08mqyogEuadp+V10svMmCm0i0zOZWiocOpM9E3lgag="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; preCheck = '' export CI=true export HOME=$(mktemp -d) ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/oro"; + versionCheckProgramArg = "--version"; + meta = with lib; { description = "Package manager for tools that use node_modules"; homepage = "https://github.com/orogene/orogene"; diff --git a/pkgs/by-name/or/orogene/update-outdated-lockfile.patch b/pkgs/by-name/or/orogene/update-outdated-lockfile.patch new file mode 100644 index 000000000000..d56073fdb227 --- /dev/null +++ b/pkgs/by-name/or/orogene/update-outdated-lockfile.patch @@ -0,0 +1,3785 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 2655ed26..a26cbb5d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4,9 +4,9 @@ version = 3 + + [[package]] + name = "addr2line" +-version = "0.21.0" ++version = "0.22.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" ++checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" + dependencies = [ + "gimli", + ] +@@ -19,20 +19,20 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + + [[package]] + name = "ahash" +-version = "0.7.6" ++version = "0.7.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" ++checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" + dependencies = [ +- "getrandom 0.2.10", ++ "getrandom 0.2.15", + "once_cell", + "version_check", + ] + + [[package]] + name = "aho-corasick" +-version = "1.1.1" ++version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" ++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" + dependencies = [ + "memchr", + ] +@@ -54,63 +54,64 @@ dependencies = [ + + [[package]] + name = "anstream" +-version = "0.6.4" ++version = "0.6.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" ++checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" + dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", ++ "is_terminal_polyfill", + "utf8parse", + ] + + [[package]] + name = "anstyle" +-version = "1.0.4" ++version = "1.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" ++checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + + [[package]] + name = "anstyle-parse" +-version = "0.2.2" ++version = "0.2.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" ++checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" + dependencies = [ + "utf8parse", + ] + + [[package]] + name = "anstyle-query" +-version = "1.0.0" ++version = "1.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" ++checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" + dependencies = [ +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "anstyle-wincon" +-version = "3.0.1" ++version = "3.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" ++checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" + dependencies = [ + "anstyle", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "anyhow" +-version = "1.0.75" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" ++checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + + [[package]] + name = "arrayref" +-version = "0.3.7" ++version = "0.3.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" ++checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" + + [[package]] + name = "arrayvec" +@@ -145,8 +146,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-channel" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" ++dependencies = [ ++ "concurrent-queue", ++ "event-listener-strategy", + "futures-core", ++ "pin-project-lite", + ] + + [[package]] +@@ -164,9 +177,9 @@ dependencies = [ + + [[package]] + name = "async-compression" +-version = "0.4.3" ++version = "0.4.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" ++checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" + dependencies = [ + "flate2", + "futures-core", +@@ -177,30 +190,29 @@ dependencies = [ + + [[package]] + name = "async-executor" +-version = "1.5.4" ++version = "1.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" ++checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" + dependencies = [ +- "async-lock", + "async-task", + "concurrent-queue", +- "fastrand 2.0.1", +- "futures-lite", ++ "fastrand 2.1.0", ++ "futures-lite 2.3.0", + "slab", + ] + + [[package]] + name = "async-global-executor" +-version = "2.3.1" ++version = "2.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" ++checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" + dependencies = [ +- "async-channel", ++ "async-channel 2.3.1", + "async-executor", +- "async-io", +- "async-lock", ++ "async-io 2.3.3", ++ "async-lock 3.4.0", + "blocking", +- "futures-lite", ++ "futures-lite 2.3.0", + "once_cell", + "tokio", + ] +@@ -211,47 +223,94 @@ 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.24", ++ "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.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" ++dependencies = [ ++ "async-lock 3.4.0", ++ "cfg-if", ++ "concurrent-queue", ++ "futures-io", ++ "futures-lite 2.3.0", ++ "parking", ++ "polling 3.7.2", ++ "rustix 0.38.34", ++ "slab", ++ "tracing", ++ "windows-sys 0.52.0", ++] ++ + [[package]] + name = "async-lock" + version = "2.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" + dependencies = [ +- "event-listener", ++ "event-listener 2.5.3", ++] ++ ++[[package]] ++name = "async-lock" ++version = "3.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" ++dependencies = [ ++ "event-listener 5.3.1", ++ "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.24", +- "signal-hook", ++ "event-listener 3.1.0", ++ "futures-lite 1.13.0", ++ "rustix 0.38.34", + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "async-signal" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" ++dependencies = [ ++ "async-io 2.3.3", ++ "async-lock 3.4.0", ++ "atomic-waker", ++ "cfg-if", ++ "futures-core", ++ "futures-io", ++ "rustix 0.38.34", ++ "signal-hook-registry", ++ "slab", ++ "windows-sys 0.52.0", ++] ++ + [[package]] + name = "async-std" + version = "1.12.0" +@@ -259,16 +318,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" + dependencies = [ + "async-attributes", +- "async-channel", ++ "async-channel 1.9.0", + "async-global-executor", +- "async-io", +- "async-lock", ++ "async-io 1.13.0", ++ "async-lock 2.8.0", + "async-process", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", +- "futures-lite", ++ "futures-lite 1.13.0", + "gloo-timers", + "kv-log-macro", + "log", +@@ -296,19 +355,19 @@ dependencies = [ + + [[package]] + name = "async-task" +-version = "4.4.1" ++version = "4.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" ++checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + + [[package]] + name = "async-trait" +-version = "0.1.73" ++version = "0.1.81" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" ++checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[package]] +@@ -319,17 +378,17 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + + [[package]] + name = "autocfg" +-version = "1.1.0" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" ++checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + + [[package]] + name = "backon" +-version = "0.4.1" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0c1a6197b2120bb2185a267f6515038558b019e92b832bb0320e96d66268dcf9" ++checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0" + dependencies = [ +- "fastrand 1.9.0", ++ "fastrand 2.1.0", + "futures-core", + "pin-project", + "tokio", +@@ -337,9 +396,9 @@ dependencies = [ + + [[package]] + name = "backtrace" +-version = "0.3.69" ++version = "0.3.73" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" ++checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" + dependencies = [ + "addr2line", + "cc", +@@ -367,9 +426,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + + [[package]] + name = "base64" +-version = "0.21.4" ++version = "0.21.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" ++checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" ++ ++[[package]] ++name = "base64" ++version = "0.22.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + + [[package]] + name = "bincode" +@@ -388,9 +453,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "bitflags" +-version = "2.4.0" ++version = "2.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" ++checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + + [[package]] + name = "bitvec" +@@ -415,31 +480,28 @@ dependencies = [ + + [[package]] + name = "blocking" +-version = "1.4.0" ++version = "1.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "94c4ef1f913d78636d78d538eec1f18de81e481f44b1be0a81060090530846e1" ++checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" + dependencies = [ +- "async-channel", +- "async-lock", ++ "async-channel 2.3.1", + "async-task", +- "fastrand 2.0.1", + "futures-io", +- "futures-lite", ++ "futures-lite 2.3.0", + "piper", +- "tracing", + ] + + [[package]] + name = "bumpalo" +-version = "3.14.0" ++version = "3.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" ++checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + + [[package]] + name = "bytecheck" +-version = "0.6.11" ++version = "0.6.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" ++checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" + dependencies = [ + "bytecheck_derive", + "ptr_meta", +@@ -448,9 +510,9 @@ dependencies = [ + + [[package]] + name = "bytecheck_derive" +-version = "0.6.11" ++version = "0.6.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" ++checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" + dependencies = [ + "proc-macro2", + "quote", +@@ -459,15 +521,15 @@ dependencies = [ + + [[package]] + name = "bytecount" +-version = "0.6.4" ++version = "0.6.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7" ++checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" + + [[package]] + name = "bytemuck" +-version = "1.14.0" ++version = "1.16.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" ++checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" + + [[package]] + name = "byteorder" +@@ -487,9 +549,9 @@ dependencies = [ + + [[package]] + name = "bytes" +-version = "1.5.0" ++version = "1.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" ++checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + + [[package]] + name = "cacache" +@@ -500,7 +562,7 @@ dependencies = [ + "async-std", + "digest", + "either", +- "futures 0.3.28", ++ "futures 0.3.30", + "hex", + "libc", + "memmap2", +@@ -526,7 +588,7 @@ dependencies = [ + "async-std", + "digest", + "either", +- "futures 0.3.28", ++ "futures 0.3.30", + "hex", + "libc", + "memmap2", +@@ -545,12 +607,9 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.0.83" ++version = "1.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +-dependencies = [ +- "libc", +-] ++checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" + + [[package]] + name = "cfg-if" +@@ -560,16 +619,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "chrono" +-version = "0.4.31" ++version = "0.4.38" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" ++checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" + dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", +- "windows-targets 0.48.5", ++ "windows-targets 0.52.6", + ] + + [[package]] +@@ -583,9 +642,9 @@ dependencies = [ + + [[package]] + name = "clap" +-version = "4.4.6" ++version = "4.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" ++checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" + dependencies = [ + "clap_builder", + "clap_derive", +@@ -593,33 +652,33 @@ dependencies = [ + + [[package]] + name = "clap_builder" +-version = "4.4.6" ++version = "4.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" ++checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" + dependencies = [ + "anstream", + "anstyle", + "clap_lex", +- "strsim", ++ "strsim 0.11.1", + ] + + [[package]] + name = "clap_derive" +-version = "4.4.2" ++version = "4.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" ++checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" + dependencies = [ + "heck", + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[package]] + name = "clap_lex" +-version = "0.5.1" ++version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" ++checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + + [[package]] + name = "color_quant" +@@ -629,35 +688,34 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + + [[package]] + name = "colorchoice" +-version = "1.0.0" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" ++checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + + [[package]] + name = "colored" +-version = "2.0.4" ++version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" ++checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" + dependencies = [ +- "is-terminal", + "lazy_static", + "windows-sys 0.48.0", + ] + + [[package]] + name = "concurrent-queue" +-version = "2.3.0" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" ++checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" + dependencies = [ + "crossbeam-utils", + ] + + [[package]] + name = "config" +-version = "0.13.3" ++version = "0.13.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7" ++checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca" + dependencies = [ + "async-trait", + "lazy_static", +@@ -668,15 +726,15 @@ dependencies = [ + + [[package]] + name = "console" +-version = "0.15.7" ++version = "0.15.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" ++checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" + dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", +- "windows-sys 0.45.0", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -691,9 +749,9 @@ dependencies = [ + + [[package]] + name = "core-foundation" +-version = "0.9.3" ++version = "0.9.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" ++checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" + dependencies = [ + "core-foundation-sys", + "libc", +@@ -701,46 +759,42 @@ dependencies = [ + + [[package]] + name = "core-foundation-sys" +-version = "0.8.4" ++version = "0.8.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" ++checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + + [[package]] + name = "cpufeatures" +-version = "0.2.9" ++version = "0.2.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" ++checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" + dependencies = [ + "libc", + ] + + [[package]] + name = "crc32fast" +-version = "1.3.2" ++version = "1.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" ++checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" + dependencies = [ + "cfg-if", + ] + + [[package]] + name = "crossbeam-channel" +-version = "0.5.8" ++version = "0.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" ++checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" + dependencies = [ +- "cfg-if", + "crossbeam-utils", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.8.16" ++version = "0.8.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +-dependencies = [ +- "cfg-if", +-] ++checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + + [[package]] + name = "crypto-common" +@@ -772,7 +826,7 @@ dependencies = [ + "ident_case", + "proc-macro2", + "quote", +- "strsim", ++ "strsim 0.10.0", + "syn 1.0.109", + ] + +@@ -818,9 +872,9 @@ dependencies = [ + + [[package]] + name = "deadpool-runtime" +-version = "0.1.3" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" ++checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" + + [[package]] + name = "debugid" +@@ -834,9 +888,12 @@ dependencies = [ + + [[package]] + name = "deranged" +-version = "0.3.8" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] + + [[package]] + name = "derive_builder" +@@ -924,9 +981,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + + [[package]] + name = "either" +-version = "1.9.0" ++version = "1.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" ++checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + + [[package]] + name = "embed-resource" +@@ -949,9 +1006,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + + [[package]] + name = "encoding_rs" +-version = "0.8.33" ++version = "0.8.34" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" ++checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" + dependencies = [ + "cfg-if", + ] +@@ -964,30 +1021,51 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + + [[package]] + name = "errno" +-version = "0.3.4" ++version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" ++checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" + dependencies = [ +- "errno-dragonfly", + "libc", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] +-name = "errno-dragonfly" +-version = "0.1.2" ++name = "event-listener" ++version = "2.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" ++ ++[[package]] ++name = "event-listener" ++version = "3.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" ++checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" + dependencies = [ +- "cc", +- "libc", ++ "concurrent-queue", ++ "parking", ++ "pin-project-lite", + ] + + [[package]] + name = "event-listener" +-version = "2.5.3" ++version = "5.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" ++checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" ++dependencies = [ ++ "concurrent-queue", ++ "parking", ++ "pin-project-lite", ++] ++ ++[[package]] ++name = "event-listener-strategy" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" ++dependencies = [ ++ "event-listener 5.3.1", ++ "pin-project-lite", ++] + + [[package]] + name = "fastrand" +@@ -1000,29 +1078,29 @@ dependencies = [ + + [[package]] + name = "fastrand" +-version = "2.0.1" ++version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" ++checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + + [[package]] + name = "fdeflate" +-version = "0.3.0" ++version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" ++checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" + dependencies = [ + "simd-adler32", + ] + + [[package]] + name = "filetime" +-version = "0.2.22" ++version = "0.2.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" ++checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" + dependencies = [ + "cfg-if", + "libc", +- "redox_syscall 0.3.5", +- "windows-sys 0.48.0", ++ "redox_syscall 0.4.1", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -1045,9 +1123,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + + [[package]] + name = "flate2" +-version = "1.0.27" ++version = "1.0.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" ++checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" + dependencies = [ + "crc32fast", + "miniz_oxide", +@@ -1067,11 +1145,11 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + + [[package]] + name = "fontconfig-parser" +-version = "0.5.3" ++version = "0.5.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" ++checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" + dependencies = [ +- "roxmltree", ++ "roxmltree 0.20.0", + ] + + [[package]] +@@ -1103,9 +1181,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + + [[package]] + name = "form_urlencoded" +-version = "1.2.0" ++version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" ++checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" + dependencies = [ + "percent-encoding", + ] +@@ -1124,9 +1202,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + + [[package]] + name = "futures" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" ++checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" + dependencies = [ + "futures-channel", + "futures-core", +@@ -1139,9 +1217,9 @@ dependencies = [ + + [[package]] + name = "futures-channel" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" ++checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" + dependencies = [ + "futures-core", + "futures-sink", +@@ -1149,15 +1227,15 @@ dependencies = [ + + [[package]] + name = "futures-core" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" ++checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + + [[package]] + name = "futures-executor" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" ++checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" + dependencies = [ + "futures-core", + "futures-task", +@@ -1166,9 +1244,9 @@ dependencies = [ + + [[package]] + name = "futures-io" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" ++checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + + [[package]] + name = "futures-lite" +@@ -1185,40 +1263,53 @@ dependencies = [ + "waker-fn", + ] + ++[[package]] ++name = "futures-lite" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" ++dependencies = [ ++ "fastrand 2.1.0", ++ "futures-core", ++ "futures-io", ++ "parking", ++ "pin-project-lite", ++] ++ + [[package]] + name = "futures-macro" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" ++checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[package]] + name = "futures-sink" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" ++checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + + [[package]] + name = "futures-task" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" ++checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + + [[package]] + name = "futures-timer" +-version = "3.0.2" ++version = "3.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" ++checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + + [[package]] + name = "futures-util" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" ++checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" + dependencies = [ + "futures 0.1.31", + "futures-channel", +@@ -1257,9 +1348,9 @@ dependencies = [ + + [[package]] + name = "getrandom" +-version = "0.2.10" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" ++checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" + dependencies = [ + "cfg-if", + "js-sys", +@@ -1280,9 +1371,9 @@ dependencies = [ + + [[package]] + name = "gimli" +-version = "0.28.0" ++version = "0.29.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" ++checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + + [[package]] + name = "gloo-timers" +@@ -1298,17 +1389,36 @@ dependencies = [ + + [[package]] + name = "h2" +-version = "0.3.21" ++version = "0.3.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" ++checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" + dependencies = [ +- "bytes 1.5.0", ++ "bytes 1.7.1", + "fnv", + "futures-core", + "futures-sink", + "futures-util", +- "http", +- "indexmap 1.9.3", ++ "http 0.2.12", ++ "indexmap 2.3.0", ++ "slab", ++ "tokio", ++ "tokio-util", ++ "tracing", ++] ++ ++[[package]] ++name = "h2" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" ++dependencies = [ ++ "atomic-waker", ++ "bytes 1.7.1", ++ "fnv", ++ "futures-core", ++ "futures-sink", ++ "http 1.1.0", ++ "indexmap 2.3.0", + "slab", + "tokio", + "tokio-util", +@@ -1326,21 +1436,27 @@ dependencies = [ + + [[package]] + name = "hashbrown" +-version = "0.14.1" ++version = "0.14.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" ++checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + + [[package]] + name = "heck" +-version = "0.4.1" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" ++checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + + [[package]] + name = "hermit-abi" +-version = "0.3.3" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" ++checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + + [[package]] + name = "hex" +@@ -1350,11 +1466,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + + [[package]] + name = "home" +-version = "0.5.5" ++version = "0.5.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" ++checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" + dependencies = [ +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -1370,23 +1486,57 @@ dependencies = [ + + [[package]] + name = "http" +-version = "0.2.9" ++version = "0.2.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" ++dependencies = [ ++ "bytes 1.7.1", ++ "fnv", ++ "itoa", ++] ++ ++[[package]] ++name = "http" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" ++checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" + dependencies = [ +- "bytes 1.5.0", ++ "bytes 1.7.1", + "fnv", + "itoa", + ] + + [[package]] + name = "http-body" +-version = "0.4.5" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" ++dependencies = [ ++ "bytes 1.7.1", ++ "http 0.2.12", ++ "pin-project-lite", ++] ++ ++[[package]] ++name = "http-body" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" ++dependencies = [ ++ "bytes 1.7.1", ++ "http 1.1.0", ++] ++ ++[[package]] ++name = "http-body-util" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" ++checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" + dependencies = [ +- "bytes 1.5.0", +- "http", ++ "bytes 1.7.1", ++ "futures-util", ++ "http 1.1.0", ++ "http-body 1.0.1", + "pin-project-lite", + ] + +@@ -1400,7 +1550,7 @@ dependencies = [ + "async-trait", + "bincode", + "cacache 11.7.1", +- "http", ++ "http 0.2.12", + "http-cache-semantics", + "httpdate", + "miette", +@@ -1417,7 +1567,7 @@ checksum = "166fed9ab4881ce1383fb854c41fbd947a067d87986955badb500a2c1c8fd1af" + dependencies = [ + "anyhow", + "async-trait", +- "http", ++ "http 0.2.12", + "http-cache", + "http-cache-semantics", + "reqwest", +@@ -1429,11 +1579,11 @@ dependencies = [ + + [[package]] + name = "http-cache-semantics" +-version = "1.0.1" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14246388577086faaaa56fb59f0b94e288800fecfff75918a237813297cdda17" ++checksum = "7aec9f678bca3f4a15194b980f20ed9bfe0dd38e8d298c65c559a93dfbd6380a" + dependencies = [ +- "http", ++ "http 0.2.12", + "http-serde", + "serde", + "time", +@@ -1445,7 +1595,7 @@ version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" + dependencies = [ +- "http", ++ "http 0.2.12", + "serde", + ] + +@@ -1456,10 +1606,10 @@ 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", +- "http", ++ "futures-lite 1.13.0", ++ "http 0.2.12", + "infer", + "pin-project-lite", + "rand 0.7.3", +@@ -1472,9 +1622,9 @@ dependencies = [ + + [[package]] + name = "httparse" +-version = "1.8.0" ++version = "1.9.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" ++checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + + [[package]] + name = "httpdate" +@@ -1490,41 +1640,76 @@ checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" + + [[package]] + name = "hyper" +-version = "0.14.27" ++version = "0.14.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" ++checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" + dependencies = [ +- "bytes 1.5.0", ++ "bytes 1.7.1", + "futures-channel", + "futures-core", + "futures-util", +- "h2", +- "http", +- "http-body", ++ "h2 0.3.26", ++ "http 0.2.12", ++ "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", +- "socket2 0.4.9", ++ "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", + "want", + ] + ++[[package]] ++name = "hyper" ++version = "1.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" ++dependencies = [ ++ "bytes 1.7.1", ++ "futures-channel", ++ "futures-util", ++ "h2 0.4.5", ++ "http 1.1.0", ++ "http-body 1.0.1", ++ "httparse", ++ "httpdate", ++ "itoa", ++ "pin-project-lite", ++ "smallvec", ++ "tokio", ++] ++ + [[package]] + name = "hyper-tls" + version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" + dependencies = [ +- "bytes 1.5.0", +- "hyper", ++ "bytes 1.7.1", ++ "hyper 0.14.30", + "native-tls", + "tokio", + "tokio-native-tls", + ] + ++[[package]] ++name = "hyper-util" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" ++dependencies = [ ++ "bytes 1.7.1", ++ "futures-util", ++ "http 1.1.0", ++ "http-body 1.0.1", ++ "hyper 1.4.1", ++ "pin-project-lite", ++ "tokio", ++] ++ + [[package]] + name = "hypermelon" + version = "0.5.5" +@@ -1533,16 +1718,16 @@ checksum = "a21d32b951725c7efe88bac17f191cf2bb0028cce32d1acb3cd087755a0719b2" + + [[package]] + name = "iana-time-zone" +-version = "0.1.57" ++version = "0.1.60" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" ++checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" + dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", +- "windows 0.48.0", ++ "windows-core 0.52.0", + ] + + [[package]] +@@ -1562,9 +1747,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + + [[package]] + name = "idna" +-version = "0.4.0" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" ++checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" + dependencies = [ + "unicode-bidi", + "unicode-normalization", +@@ -1589,19 +1774,19 @@ dependencies = [ + + [[package]] + name = "indexmap" +-version = "2.0.2" ++version = "2.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" ++checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" + dependencies = [ + "equivalent", +- "hashbrown 0.14.1", ++ "hashbrown 0.14.5", + ] + + [[package]] + name = "indicatif" +-version = "0.17.7" ++version = "0.17.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" ++checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" + dependencies = [ + "console", + "instant", +@@ -1619,23 +1804,22 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" + + [[package]] + name = "insta" +-version = "1.33.0" ++version = "1.39.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" ++checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" + dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "serde", + "similar", +- "yaml-rust", + ] + + [[package]] + name = "instant" +-version = "0.1.12" ++version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" ++checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" + dependencies = [ + "cfg-if", + "js-sys", +@@ -1649,7 +1833,7 @@ version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" + dependencies = [ +- "hermit-abi", ++ "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", + ] +@@ -1660,12 +1844,6 @@ version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4b3f7cef34251886990511df1c61443aa928499d598a9473929ab5a90a527304" + +-[[package]] +-name = "ioctl-sys" +-version = "0.8.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c" +- + [[package]] + name = "iovec" + version = "0.1.4" +@@ -1677,9 +1855,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-docker" +@@ -1692,13 +1870,13 @@ dependencies = [ + + [[package]] + name = "is-terminal" +-version = "0.4.9" ++version = "0.4.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" ++checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" + dependencies = [ +- "hermit-abi", +- "rustix 0.38.17", +- "windows-sys 0.48.0", ++ "hermit-abi 0.3.9", ++ "libc", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -1713,39 +1891,45 @@ dependencies = [ + + [[package]] + name = "is_ci" +-version = "1.1.1" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" ++ ++[[package]] ++name = "is_terminal_polyfill" ++version = "1.70.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" ++checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + + [[package]] + name = "itoa" +-version = "1.0.9" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "jpeg-decoder" +-version = "0.3.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" ++checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + + [[package]] + name = "js-sys" +-version = "0.3.64" ++version = "0.3.69" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" ++checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" + dependencies = [ + "wasm-bindgen", + ] + + [[package]] + name = "junction" +-version = "1.0.0" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca39ef0d69b18e6a2fd14c2f0a1d593200f4a4ed949b240b5917ab51fac754cb" ++checksum = "1c9c415a9b7b1e86cd5738f39d34c9e78c765da7fb1756dbd7d31b3b0d2e7afa" + dependencies = [ + "scopeguard", +- "winapi", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -1788,15 +1972,25 @@ dependencies = [ + + [[package]] + name = "lazy_static" +-version = "1.4.0" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + + [[package]] + name = "libc" +-version = "0.2.149" ++version = "0.2.155" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" ++ ++[[package]] ++name = "libredox" ++version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" ++checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" ++dependencies = [ ++ "bitflags 2.6.0", ++ "libc", ++] + + [[package]] + name = "linked-hash-map" +@@ -1812,15 +2006,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + + [[package]] + name = "linux-raw-sys" +-version = "0.4.8" ++version = "0.4.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" ++checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + + [[package]] + name = "lock_api" +-version = "0.4.10" ++version = "0.4.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" ++checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" + dependencies = [ + "autocfg", + "scopeguard", +@@ -1828,9 +2022,9 @@ dependencies = [ + + [[package]] + name = "log" +-version = "0.4.20" ++version = "0.4.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" ++checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + dependencies = [ + "value-bag", + ] +@@ -1858,9 +2052,9 @@ dependencies = [ + + [[package]] + name = "memchr" +-version = "2.6.4" ++version = "2.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" ++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + + [[package]] + name = "memmap2" +@@ -1900,7 +2094,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[package]] +@@ -1911,9 +2105,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + + [[package]] + name = "mime_guess" +-version = "2.0.4" ++version = "2.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" ++checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" + dependencies = [ + "mime", + "unicase", +@@ -1927,9 +2121,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + + [[package]] + name = "miniz_oxide" +-version = "0.7.1" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" ++checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" + dependencies = [ + "adler", + "simd-adler32", +@@ -1937,25 +2131,31 @@ dependencies = [ + + [[package]] + name = "mio" +-version = "0.8.8" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" ++checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" + dependencies = [ ++ "hermit-abi 0.3.9", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "mockito" +-version = "1.2.0" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f8d3038e23466858569c2d30a537f691fa0d53b51626630ae08262943e3bbb8b" ++checksum = "09b34bd91b9e5c5b06338d392463e1318d683cf82ec3d3af4014609be6e2108d" + dependencies = [ + "assert-json-diff", ++ "bytes 1.7.1", + "colored", +- "futures 0.3.28", +- "hyper", ++ "futures-util", ++ "http 1.1.0", ++ "http-body 1.0.1", ++ "http-body-util", ++ "hyper 1.4.1", ++ "hyper-util", + "log", + "rand 0.8.5", + "regex", +@@ -1980,7 +2180,7 @@ dependencies = [ + "console_error_panic_hook", + "dashmap", + "flate2", +- "futures 0.3.28", ++ "futures 0.3.30", + "io_tee", + "js-sys", + "miette", +@@ -2004,17 +2204,16 @@ dependencies = [ + "url", + "wasm-bindgen", + "wasm-bindgen-futures", +- "wasm-streams", ++ "wasm-streams 0.3.0", + "which", + ] + + [[package]] + name = "native-tls" +-version = "0.2.11" ++version = "0.2.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" ++checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" + dependencies = [ +- "lazy_static", + "libc", + "log", + "openssl", +@@ -2034,7 +2233,7 @@ dependencies = [ + "colored", + "console_error_panic_hook", + "dashmap", +- "futures 0.3.28", ++ "futures 0.3.30", + "indexmap 1.9.3", + "indicatif", + "insta", +@@ -2102,11 +2301,17 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-traits" +-version = "0.2.16" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" ++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" + dependencies = [ + "autocfg", + ] +@@ -2117,7 +2322,7 @@ version = "1.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" + dependencies = [ +- "hermit-abi", ++ "hermit-abi 0.3.9", + "libc", + ] + +@@ -2129,24 +2334,24 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + + [[package]] + name = "object" +-version = "0.32.1" ++version = "0.36.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" ++checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" + dependencies = [ + "memchr", + ] + + [[package]] + name = "once_cell" +-version = "1.18.0" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" ++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + + [[package]] + name = "open" +-version = "5.0.0" ++version = "5.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" ++checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" + dependencies = [ + "is-wsl", + "libc", +@@ -2155,11 +2360,11 @@ dependencies = [ + + [[package]] + name = "openssl" +-version = "0.10.57" ++version = "0.10.66" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" ++checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", +@@ -2176,7 +2381,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[package]] +@@ -2187,9 +2392,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + + [[package]] + name = "openssl-sys" +-version = "0.9.93" ++version = "0.9.103" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" ++checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" + dependencies = [ + "cc", + "libc", +@@ -2204,9 +2409,9 @@ dependencies = [ + "anyhow", + "async-std", + "async-trait", +- "base64 0.21.4", ++ "base64 0.21.7", + "chrono", +- "futures 0.3.28", ++ "futures 0.3.30", + "http-cache-reqwest", + "indexmap 1.9.3", + "maplit", +@@ -2263,7 +2468,7 @@ name = "oro-npm-account" + version = "0.3.34" + dependencies = [ + "async-std", +- "base64 0.21.4", ++ "base64 0.21.7", + "dialoguer", + "kdl", + "miette", +@@ -2370,13 +2575,13 @@ dependencies = [ + + [[package]] + name = "os_info" +-version = "3.7.0" ++version = "3.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" ++checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" + dependencies = [ + "log", + "serde", +- "winapi", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -2393,9 +2598,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + + [[package]] + name = "parking" +-version = "2.1.1" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" ++checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + + [[package]] + name = "parking_lot" +@@ -2410,12 +2615,12 @@ dependencies = [ + + [[package]] + name = "parking_lot" +-version = "0.12.1" ++version = "0.12.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" ++checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" + dependencies = [ + "lock_api", +- "parking_lot_core 0.9.8", ++ "parking_lot_core 0.9.10", + ] + + [[package]] +@@ -2434,15 +2639,15 @@ dependencies = [ + + [[package]] + name = "parking_lot_core" +-version = "0.9.8" ++version = "0.9.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" ++checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" + dependencies = [ + "cfg-if", + "libc", +- "redox_syscall 0.3.5", ++ "redox_syscall 0.5.3", + "smallvec", +- "windows-targets 0.48.5", ++ "windows-targets 0.52.6", + ] + + [[package]] +@@ -2453,18 +2658,18 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + + [[package]] + name = "percent-encoding" +-version = "2.3.0" ++version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" ++checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + + [[package]] + name = "petgraph" +-version = "0.6.4" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" ++checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" + dependencies = [ + "fixedbitset", +- "indexmap 2.0.2", ++ "indexmap 2.3.0", + ] + + [[package]] +@@ -2475,29 +2680,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + + [[package]] + name = "pin-project" +-version = "1.1.3" ++version = "1.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" ++checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" + dependencies = [ + "pin-project-internal", + ] + + [[package]] + name = "pin-project-internal" +-version = "1.1.3" ++version = "1.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" ++checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[package]] + name = "pin-project-lite" +-version = "0.2.13" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" ++checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + + [[package]] + name = "pin-utils" +@@ -2507,26 +2712,26 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + + [[package]] + name = "piper" +-version = "0.2.1" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" ++checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" + dependencies = [ + "atomic-waker", +- "fastrand 2.0.1", ++ "fastrand 2.1.0", + "futures-io", + ] + + [[package]] + name = "pkg-config" +-version = "0.3.27" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" ++checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + + [[package]] + name = "png" +-version = "0.17.10" ++version = "0.17.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" ++checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" + dependencies = [ + "bitflags 1.3.2", + "crc32fast", +@@ -2551,6 +2756,21 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "polling" ++version = "3.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" ++dependencies = [ ++ "cfg-if", ++ "concurrent-queue", ++ "hermit-abi 0.4.0", ++ "pin-project-lite", ++ "rustix 0.38.34", ++ "tracing", ++ "windows-sys 0.52.0", ++] ++ + [[package]] + name = "poloto" + version = "17.2.1" +@@ -2563,15 +2783,24 @@ dependencies = [ + + [[package]] + name = "portable-atomic" +-version = "1.4.3" ++version = "1.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" ++ ++[[package]] ++name = "powerfmt" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + + [[package]] + name = "ppv-lite86" +-version = "0.2.17" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" ++checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f" ++dependencies = [ ++ "zerocopy", ++] + + [[package]] + name = "pretty_assertions" +@@ -2583,35 +2812,11 @@ dependencies = [ + "yansi", + ] + +-[[package]] +-name = "proc-macro-error" +-version = "1.0.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +-dependencies = [ +- "proc-macro-error-attr", +- "proc-macro2", +- "quote", +- "syn 1.0.109", +- "version_check", +-] +- +-[[package]] +-name = "proc-macro-error-attr" +-version = "1.0.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +-dependencies = [ +- "proc-macro2", +- "quote", +- "version_check", +-] +- + [[package]] + name = "proc-macro2" +-version = "1.0.68" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -2638,9 +2843,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.33" ++version = "1.0.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" ++checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" + dependencies = [ + "proc-macro2", + ] +@@ -2710,7 +2915,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.15", + ] + + [[package]] +@@ -2739,45 +2944,54 @@ dependencies = [ + + [[package]] + name = "redox_syscall" +-version = "0.3.5" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" ++checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" + dependencies = [ + "bitflags 1.3.2", + ] + ++[[package]] ++name = "redox_syscall" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" ++dependencies = [ ++ "bitflags 2.6.0", ++] ++ + [[package]] + name = "redox_users" +-version = "0.4.3" ++version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" ++checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" + dependencies = [ +- "getrandom 0.2.10", +- "redox_syscall 0.2.16", ++ "getrandom 0.2.15", ++ "libredox", + "thiserror", + ] + + [[package]] + name = "reflink-copy" +-version = "0.1.9" ++version = "0.1.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d7e3e017e993f86feeddf8a7fb609ca49f89082309e328e27aefd4a25bb317a4" ++checksum = "dc31414597d1cd7fdd2422798b7652a6329dda0fe0219e6335a13d5bcaa9aeb6" + dependencies = [ + "cfg-if", +- "ioctl-sys", +- "windows 0.51.1", ++ "rustix 0.38.34", ++ "windows", + ] + + [[package]] + name = "regex" +-version = "1.9.6" ++version = "1.10.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" ++checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" + dependencies = [ + "aho-corasick", + "memchr", +- "regex-automata 0.3.9", +- "regex-syntax 0.7.5", ++ "regex-automata 0.4.7", ++ "regex-syntax 0.8.4", + ] + + [[package]] +@@ -2791,13 +3005,13 @@ dependencies = [ + + [[package]] + name = "regex-automata" +-version = "0.3.9" ++version = "0.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" ++checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" + dependencies = [ + "aho-corasick", + "memchr", +- "regex-syntax 0.7.5", ++ "regex-syntax 0.8.4", + ] + + [[package]] +@@ -2808,35 +3022,35 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + + [[package]] + name = "regex-syntax" +-version = "0.7.5" ++version = "0.8.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" ++checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + + [[package]] + name = "rend" +-version = "0.4.1" ++version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" ++checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" + dependencies = [ + "bytecheck", + ] + + [[package]] + name = "reqwest" +-version = "0.11.22" ++version = "0.11.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" ++checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" + dependencies = [ +- "async-compression 0.4.3", +- "base64 0.21.4", +- "bytes 1.5.0", ++ "async-compression 0.4.12", ++ "base64 0.21.7", ++ "bytes 1.7.1", + "encoding_rs", + "futures-core", + "futures-util", +- "h2", +- "http", +- "http-body", +- "hyper", ++ "h2 0.3.26", ++ "http 0.2.12", ++ "http-body 0.4.6", ++ "hyper 0.14.30", + "hyper-tls", + "ipnet", + "js-sys", +@@ -2847,9 +3061,11 @@ dependencies = [ + "once_cell", + "percent-encoding", + "pin-project-lite", ++ "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", ++ "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", +@@ -2858,7 +3074,7 @@ dependencies = [ + "url", + "wasm-bindgen", + "wasm-bindgen-futures", +- "wasm-streams", ++ "wasm-streams 0.4.0", + "web-sys", + "winreg 0.50.0", + ] +@@ -2871,7 +3087,7 @@ checksum = "4531c89d50effe1fac90d095c8b133c20c5c714204feee0bfc3fd158e784209d" + dependencies = [ + "anyhow", + "async-trait", +- "http", ++ "http 0.2.12", + "reqwest", + "serde", + "task-local-extensions", +@@ -2887,10 +3103,10 @@ dependencies = [ + "anyhow", + "async-trait", + "chrono", +- "futures 0.3.28", +- "getrandom 0.2.10", +- "http", +- "hyper", ++ "futures 0.3.30", ++ "getrandom 0.2.15", ++ "http 0.2.12", ++ "hyper 0.14.30", + "parking_lot 0.11.2", + "reqwest", + "reqwest-middleware", +@@ -2939,21 +3155,22 @@ dependencies = [ + + [[package]] + name = "rgb" +-version = "0.8.36" ++version = "0.8.45" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" ++checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" + dependencies = [ + "bytemuck", + ] + + [[package]] + name = "rkyv" +-version = "0.7.42" ++version = "0.7.44" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" ++checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" + dependencies = [ + "bitvec", + "bytecheck", ++ "bytes 1.7.1", + "hashbrown 0.12.3", + "ptr_meta", + "rend", +@@ -2965,9 +3182,9 @@ dependencies = [ + + [[package]] + name = "rkyv_derive" +-version = "0.7.42" ++version = "0.7.44" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" ++checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" + dependencies = [ + "proc-macro2", + "quote", +@@ -2981,7 +3198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bdc23d1ace03d6b8153c7d16f0708cd80b61ee8e80304954803354e67e40d150" + dependencies = [ + "log", +- "roxmltree", ++ "roxmltree 0.18.1", + "simplecss", + "siphasher", + "svgtypes 0.9.0", +@@ -2996,11 +3213,17 @@ dependencies = [ + "xmlparser", + ] + ++[[package]] ++name = "roxmltree" ++version = "0.20.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" ++ + [[package]] + name = "rustc-demangle" +-version = "0.1.23" ++version = "0.1.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" ++checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + + [[package]] + name = "rustc_version" +@@ -3013,9 +3236,9 @@ dependencies = [ + + [[package]] + name = "rustix" +-version = "0.37.24" ++version = "0.37.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d" ++checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" + dependencies = [ + "bitflags 1.3.2", + "errno", +@@ -3027,15 +3250,24 @@ dependencies = [ + + [[package]] + name = "rustix" +-version = "0.38.17" ++version = "0.38.34" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" ++checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.6.0", + "errno", + "libc", +- "linux-raw-sys 0.4.8", +- "windows-sys 0.48.0", ++ "linux-raw-sys 0.4.14", ++ "windows-sys 0.52.0", ++] ++ ++[[package]] ++name = "rustls-pemfile" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" ++dependencies = [ ++ "base64 0.21.7", + ] + + [[package]] +@@ -3056,9 +3288,9 @@ dependencies = [ + + [[package]] + name = "ryu" +-version = "1.0.15" ++version = "1.0.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" ++checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + + [[package]] + name = "same-file" +@@ -3071,11 +3303,11 @@ dependencies = [ + + [[package]] + name = "schannel" +-version = "0.1.22" ++version = "0.1.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" ++checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" + dependencies = [ +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -3092,11 +3324,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + + [[package]] + name = "security-framework" +-version = "2.9.2" ++version = "2.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" ++checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", +@@ -3105,9 +3337,9 @@ dependencies = [ + + [[package]] + name = "security-framework-sys" +-version = "2.9.1" ++version = "2.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" ++checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" + dependencies = [ + "core-foundation-sys", + "libc", +@@ -3115,15 +3347,15 @@ dependencies = [ + + [[package]] + name = "semver" +-version = "1.0.19" ++version = "1.0.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" ++checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + + [[package]] + name = "sentry" +-version = "0.31.7" ++version = "0.31.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc" ++checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5" + dependencies = [ + "httpdate", + "native-tls", +@@ -3140,9 +3372,9 @@ dependencies = [ + + [[package]] + name = "sentry-backtrace" +-version = "0.31.7" ++version = "0.31.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670" ++checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e" + dependencies = [ + "backtrace", + "once_cell", +@@ -3152,9 +3384,9 @@ dependencies = [ + + [[package]] + name = "sentry-contexts" +-version = "0.31.7" ++version = "0.31.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147" ++checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1" + dependencies = [ + "hostname", + "libc", +@@ -3166,9 +3398,9 @@ dependencies = [ + + [[package]] + name = "sentry-core" +-version = "0.31.7" ++version = "0.31.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053" ++checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1" + dependencies = [ + "once_cell", + "rand 0.8.5", +@@ -3179,9 +3411,9 @@ dependencies = [ + + [[package]] + name = "sentry-debug-images" +-version = "0.31.7" ++version = "0.31.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd" ++checksum = "afdb263e73d22f39946f6022ed455b7561b22ff5553aca9be3c6a047fa39c328" + dependencies = [ + "findshlibs", + "once_cell", +@@ -3190,9 +3422,9 @@ dependencies = [ + + [[package]] + name = "sentry-panic" +-version = "0.31.7" ++version = "0.31.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa" ++checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99" + dependencies = [ + "sentry-backtrace", + "sentry-core", +@@ -3200,9 +3432,9 @@ dependencies = [ + + [[package]] + name = "sentry-tracing" +-version = "0.31.7" ++version = "0.31.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac" ++checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704" + dependencies = [ + "sentry-backtrace", + "sentry-core", +@@ -3212,9 +3444,9 @@ dependencies = [ + + [[package]] + name = "sentry-types" +-version = "0.31.7" ++version = "0.31.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740" ++checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82" + dependencies = [ + "debugid", + "hex", +@@ -3229,9 +3461,9 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.188" ++version = "1.0.204" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" ++checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" + dependencies = [ + "serde_derive", + ] +@@ -3260,13 +3492,13 @@ dependencies = [ + + [[package]] + name = "serde_derive" +-version = "1.0.188" ++version = "1.0.204" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" ++checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[package]] +@@ -3277,17 +3509,18 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[package]] + name = "serde_json" +-version = "1.0.107" ++version = "1.0.122" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" ++checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" + dependencies = [ +- "indexmap 2.0.2", ++ "indexmap 2.3.0", + "itoa", ++ "memchr", + "ryu", + "serde", + ] +@@ -3363,21 +3596,11 @@ version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +-[[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" ++version = "1.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" ++checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" + dependencies = [ + "libc", + ] +@@ -3396,9 +3619,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + + [[package]] + name = "similar" +-version = "2.2.1" ++version = "2.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" ++checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" + + [[package]] + name = "simplecss" +@@ -3426,9 +3649,9 @@ dependencies = [ + + [[package]] + name = "smallvec" +-version = "1.11.1" ++version = "1.13.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" ++checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + + [[package]] + name = "smawk" +@@ -3438,9 +3661,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" + + [[package]] + name = "socket2" +-version = "0.4.9" ++version = "0.4.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" ++checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" + dependencies = [ + "libc", + "winapi", +@@ -3448,12 +3671,12 @@ dependencies = [ + + [[package]] + name = "socket2" +-version = "0.5.4" ++version = "0.5.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" ++checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" + dependencies = [ + "libc", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -3462,7 +3685,7 @@ version = "9.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "da7a2b3c2bc9693bcb40870c4e9b5bf0d79f9cb46273321bf855ec513e919082" + dependencies = [ +- "base64 0.21.4", ++ "base64 0.21.7", + "digest", + "hex", + "miette", +@@ -3488,6 +3711,12 @@ version = "0.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + ++[[package]] ++name = "strsim" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" ++ + [[package]] + name = "supports-color" + version = "2.1.0" +@@ -3509,9 +3738,9 @@ dependencies = [ + + [[package]] + name = "supports-unicode" +-version = "2.0.0" ++version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7" ++checksum = "f850c19edd184a205e883199a261ed44471c81e39bd95b1357f5febbef00e77a" + dependencies = [ + "is-terminal", + ] +@@ -3559,15 +3788,21 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.38" ++version = "2.0.72" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" ++checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" + dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", + ] + ++[[package]] ++name = "sync_wrapper" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" ++ + [[package]] + name = "system-configuration" + version = "0.5.1" +@@ -3597,13 +3832,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + + [[package]] + name = "tar" +-version = "0.4.40" ++version = "0.4.41" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" ++checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" + dependencies = [ + "filetime", + "libc", +- "xattr 1.0.1", ++ "xattr 1.3.1", + ] + + [[package]] +@@ -3617,15 +3852,14 @@ dependencies = [ + + [[package]] + name = "tempfile" +-version = "3.8.0" ++version = "3.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" ++checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" + dependencies = [ + "cfg-if", +- "fastrand 2.0.1", +- "redox_syscall 0.3.5", +- "rustix 0.38.17", +- "windows-sys 0.48.0", ++ "fastrand 2.1.0", ++ "rustix 0.38.34", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -3659,36 +3893,34 @@ dependencies = [ + + [[package]] + name = "test-case" +-version = "3.2.1" ++version = "3.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" ++checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" + dependencies = [ + "test-case-macros", + ] + + [[package]] + name = "test-case-core" +-version = "3.2.1" ++version = "3.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" ++checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" + dependencies = [ + "cfg-if", +- "proc-macro-error", + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[package]] + name = "test-case-macros" +-version = "3.2.1" ++version = "3.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" ++checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" + dependencies = [ +- "proc-macro-error", + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + "test-case-core", + ] + +@@ -3705,29 +3937,29 @@ dependencies = [ + + [[package]] + name = "thiserror" +-version = "1.0.49" ++version = "1.0.63" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.49" ++version = "1.0.63" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[package]] + name = "thread_local" +-version = "1.1.7" ++version = "1.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" ++checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" + dependencies = [ + "cfg-if", + "once_cell", +@@ -3735,12 +3967,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.29" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -3754,10 +3988,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.15" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -3788,9 +4023,9 @@ dependencies = [ + + [[package]] + name = "tinyvec" +-version = "1.6.0" ++version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" ++checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" + dependencies = [ + "tinyvec_macros", + ] +@@ -3803,21 +4038,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + + [[package]] + name = "tokio" +-version = "1.32.0" ++version = "1.39.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" ++checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" + dependencies = [ + "backtrace", +- "bytes 1.5.0", ++ "bytes 1.7.1", + "libc", + "mio", +- "num_cpus", +- "parking_lot 0.12.1", ++ "parking_lot 0.12.3", + "pin-project-lite", +- "signal-hook-registry", +- "socket2 0.5.4", +- "tokio-macros", +- "windows-sys 0.48.0", ++ "socket2 0.5.7", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -3831,17 +4063,6 @@ dependencies = [ + "log", + ] + +-[[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" +@@ -3854,16 +4075,15 @@ dependencies = [ + + [[package]] + name = "tokio-util" +-version = "0.7.9" ++version = "0.7.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" ++checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" + dependencies = [ +- "bytes 1.5.0", ++ "bytes 1.7.1", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +- "tracing", + ] + + [[package]] +@@ -3883,11 +4103,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + + [[package]] + name = "tracing" +-version = "0.1.37" ++version = "0.1.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" ++checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" + dependencies = [ +- "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +@@ -3895,31 +4114,32 @@ dependencies = [ + + [[package]] + name = "tracing-appender" +-version = "0.2.2" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" ++checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" + dependencies = [ + "crossbeam-channel", ++ "thiserror", + "time", + "tracing-subscriber", + ] + + [[package]] + name = "tracing-attributes" +-version = "0.1.26" ++version = "0.1.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" ++checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[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", +@@ -3927,9 +4147,9 @@ dependencies = [ + + [[package]] + name = "tracing-indicatif" +-version = "0.3.5" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57e05fe4a1c906d94b275d8aeb8ff8b9deaca502aeb59ae8ab500a92b8032ac8" ++checksum = "069580424efe11d97c3fef4197fa98c004fa26672cc71ad8770d224e23b1951d" + dependencies = [ + "indicatif", + "tracing", +@@ -3939,20 +4159,20 @@ dependencies = [ + + [[package]] + name = "tracing-log" +-version = "0.1.3" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" ++checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" + dependencies = [ +- "lazy_static", + "log", ++ "once_cell", + "tracing-core", + ] + + [[package]] + name = "tracing-subscriber" +-version = "0.3.17" ++version = "0.3.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" ++checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" + dependencies = [ + "matchers", + "nu-ansi-term", +@@ -3968,9 +4188,9 @@ dependencies = [ + + [[package]] + name = "try-lock" +-version = "0.2.4" ++version = "0.2.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" ++checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + + [[package]] + name = "tsify" +@@ -3993,7 +4213,7 @@ dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", +- "syn 2.0.38", ++ "syn 2.0.72", + ] + + [[package]] +@@ -4028,9 +4248,9 @@ dependencies = [ + + [[package]] + name = "unicode-bidi" +-version = "0.3.13" ++version = "0.3.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" ++checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + + [[package]] + name = "unicode-bidi-mirroring" +@@ -4064,18 +4284,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + + [[package]] + name = "unicode-normalization" +-version = "0.1.22" ++version = "0.1.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" ++checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" + dependencies = [ + "tinyvec", + ] + + [[package]] + name = "unicode-script" +-version = "0.5.5" ++version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" ++checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + + [[package]] + name = "unicode-vo" +@@ -4085,17 +4305,17 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + + [[package]] + name = "unicode-width" +-version = "0.1.11" ++version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" ++checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + + [[package]] + name = "ureq" +-version = "2.8.0" ++version = "2.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" ++checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" + dependencies = [ +- "base64 0.21.4", ++ "base64 0.22.1", + "log", + "native-tls", + "once_cell", +@@ -4104,9 +4324,9 @@ dependencies = [ + + [[package]] + name = "url" +-version = "2.4.1" ++version = "2.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" ++checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" + dependencies = [ + "form_urlencoded", + "idna", +@@ -4120,7 +4340,7 @@ version = "0.29.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "63b6bb4e62619d9f68aa2d8a823fea2bff302340a1f2d45c264d5b0be170832e" + dependencies = [ +- "base64 0.21.4", ++ "base64 0.21.7", + "data-url", + "flate2", + "imagesize", +@@ -4149,15 +4369,15 @@ dependencies = [ + + [[package]] + name = "utf8parse" +-version = "0.2.1" ++version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" ++checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + + [[package]] + name = "uuid" +-version = "1.4.1" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" ++checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" + dependencies = [ + "serde", + ] +@@ -4170,9 +4390,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + + [[package]] + name = "value-bag" +-version = "1.4.1" ++version = "1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" ++checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + + [[package]] + name = "vcpkg" +@@ -4182,9 +4402,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + + [[package]] + name = "version_check" +-version = "0.9.4" ++version = "0.9.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" ++checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + + [[package]] + name = "vswhom" +@@ -4231,9 +4451,9 @@ dependencies = [ + + [[package]] + name = "vte_generate_state_changes" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" ++checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" + dependencies = [ + "proc-macro2", + "quote", +@@ -4241,15 +4461,15 @@ dependencies = [ + + [[package]] + name = "waker-fn" +-version = "1.1.1" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" ++checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + + [[package]] + name = "walkdir" +-version = "2.4.0" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" ++checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" + dependencies = [ + "same-file", + "winapi-util", +@@ -4278,9 +4498,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.87" ++version = "0.2.92" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" ++checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" + dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +@@ -4288,24 +4508,24 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.87" ++version = "0.2.92" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" ++checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" + dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-futures" +-version = "0.4.37" ++version = "0.4.42" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" ++checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" + dependencies = [ + "cfg-if", + "js-sys", +@@ -4315,9 +4535,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.87" ++version = "0.2.92" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" ++checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -4325,22 +4545,22 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.87" ++version = "0.2.92" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" ++checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.38", ++ "syn 2.0.72", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.87" ++version = "0.2.92" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" ++checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + + [[package]] + name = "wasm-streams" +@@ -4355,13 +4575,26 @@ dependencies = [ + "web-sys", + ] + ++[[package]] ++name = "wasm-streams" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" ++dependencies = [ ++ "futures-util", ++ "js-sys", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", ++] ++ + [[package]] + name = "wasm-timer" + version = "0.2.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" + dependencies = [ +- "futures 0.3.28", ++ "futures 0.3.30", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", +@@ -4372,9 +4605,9 @@ dependencies = [ + + [[package]] + name = "web-sys" +-version = "0.3.64" ++version = "0.3.69" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" ++checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" + dependencies = [ + "js-sys", + "wasm-bindgen", +@@ -4382,9 +4615,9 @@ dependencies = [ + + [[package]] + name = "weezl" +-version = "0.1.7" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" ++checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + + [[package]] + name = "which" +@@ -4395,7 +4628,7 @@ dependencies = [ + "either", + "home", + "once_cell", +- "rustix 0.38.17", ++ "rustix 0.38.34", + ] + + [[package]] +@@ -4416,11 +4649,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-util" +-version = "0.1.6" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" ++checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" + dependencies = [ +- "winapi", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -4431,39 +4664,75 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "windows" +-version = "0.48.0" ++version = "0.58.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" ++checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" + dependencies = [ +- "windows-targets 0.48.5", ++ "windows-core 0.58.0", ++ "windows-targets 0.52.6", + ] + + [[package]] +-name = "windows" +-version = "0.51.1" ++name = "windows-core" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" ++checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" + dependencies = [ +- "windows-core", +- "windows-targets 0.48.5", ++ "windows-targets 0.52.6", + ] + + [[package]] + name = "windows-core" +-version = "0.51.1" ++version = "0.58.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" ++checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" + dependencies = [ +- "windows-targets 0.48.5", ++ "windows-implement", ++ "windows-interface", ++ "windows-result", ++ "windows-strings", ++ "windows-targets 0.52.6", + ] + + [[package]] +-name = "windows-sys" +-version = "0.45.0" ++name = "windows-implement" ++version = "0.58.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.72", ++] ++ ++[[package]] ++name = "windows-interface" ++version = "0.58.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.72", ++] ++ ++[[package]] ++name = "windows-result" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" ++checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" + dependencies = [ +- "windows-targets 0.42.2", ++ "windows-targets 0.52.6", ++] ++ ++[[package]] ++name = "windows-strings" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" ++dependencies = [ ++ "windows-result", ++ "windows-targets 0.52.6", + ] + + [[package]] +@@ -4476,18 +4745,12 @@ dependencies = [ + ] + + [[package]] +-name = "windows-targets" +-version = "0.42.2" ++name = "windows-sys" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" + dependencies = [ +- "windows_aarch64_gnullvm 0.42.2", +- "windows_aarch64_msvc 0.42.2", +- "windows_i686_gnu 0.42.2", +- "windows_i686_msvc 0.42.2", +- "windows_x86_64_gnu 0.42.2", +- "windows_x86_64_gnullvm 0.42.2", +- "windows_x86_64_msvc 0.42.2", ++ "windows-targets 0.52.6", + ] + + [[package]] +@@ -4506,10 +4769,20 @@ dependencies = [ + ] + + [[package]] +-name = "windows_aarch64_gnullvm" +-version = "0.42.2" ++name = "windows-targets" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" ++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.52.6", ++ "windows_aarch64_msvc 0.52.6", ++ "windows_i686_gnu 0.52.6", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc 0.52.6", ++ "windows_x86_64_gnu 0.52.6", ++ "windows_x86_64_gnullvm 0.52.6", ++ "windows_x86_64_msvc 0.52.6", ++] + + [[package]] + name = "windows_aarch64_gnullvm" +@@ -4518,10 +4791,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + + [[package]] +-name = "windows_aarch64_msvc" +-version = "0.42.2" ++name = "windows_aarch64_gnullvm" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" ++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + + [[package]] + name = "windows_aarch64_msvc" +@@ -4530,10 +4803,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + + [[package]] +-name = "windows_i686_gnu" +-version = "0.42.2" ++name = "windows_aarch64_msvc" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" ++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + + [[package]] + name = "windows_i686_gnu" +@@ -4542,10 +4815,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + + [[package]] +-name = "windows_i686_msvc" +-version = "0.42.2" ++name = "windows_i686_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" ++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + + [[package]] + name = "windows_i686_msvc" +@@ -4554,10 +4833,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + + [[package]] +-name = "windows_x86_64_gnu" +-version = "0.42.2" ++name = "windows_i686_msvc" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" ++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + + [[package]] + name = "windows_x86_64_gnu" +@@ -4566,10 +4845,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + + [[package]] +-name = "windows_x86_64_gnullvm" +-version = "0.42.2" ++name = "windows_x86_64_gnu" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" ++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + + [[package]] + name = "windows_x86_64_gnullvm" +@@ -4578,10 +4857,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + + [[package]] +-name = "windows_x86_64_msvc" +-version = "0.42.2" ++name = "windows_x86_64_gnullvm" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" ++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + + [[package]] + name = "windows_x86_64_msvc" +@@ -4589,6 +4868,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" ++ + [[package]] + name = "winreg" + version = "0.10.1" +@@ -4610,18 +4895,18 @@ dependencies = [ + + [[package]] + name = "wiremock" +-version = "0.5.19" ++version = "0.5.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c6f71803d3a1c80377a06221e0530be02035d5b3e854af56c6ece7ac20ac441d" ++checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9" + dependencies = [ + "assert-json-diff", + "async-trait", +- "base64 0.21.4", ++ "base64 0.21.7", + "deadpool", +- "futures 0.3.28", ++ "futures 0.3.30", + "futures-timer", + "http-types", +- "hyper", ++ "hyper 0.14.30", + "log", + "once_cell", + "regex", +@@ -4650,11 +4935,13 @@ dependencies = [ + + [[package]] + name = "xattr" +-version = "1.0.1" ++version = "1.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" ++checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" + dependencies = [ + "libc", ++ "linux-raw-sys 0.4.14", ++ "rustix 0.38.34", + ] + + [[package]] +@@ -4665,27 +4952,39 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + + [[package]] + name = "xxhash-rust" +-version = "0.8.7" ++version = "0.8.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" ++checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" + + [[package]] +-name = "yaml-rust" +-version = "0.4.5" ++name = "yansi" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" ++ ++[[package]] ++name = "zerocopy" ++version = "0.6.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" ++checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" + dependencies = [ +- "linked-hash-map", ++ "byteorder", ++ "zerocopy-derive", + ] + + [[package]] +-name = "yansi" +-version = "0.5.1" ++name = "zerocopy-derive" ++version = "0.6.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" ++checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.72", ++] + + [[package]] + name = "zeroize" +-version = "1.6.0" ++version = "1.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" ++checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/or/orthanc-framework/package.nix b/pkgs/by-name/or/orthanc-framework/package.nix index 037044b68a6f..e19bd8331e79 100644 --- a/pkgs/by-name/or/orthanc-framework/package.nix +++ b/pkgs/by-name/or/orthanc-framework/package.nix @@ -18,10 +18,6 @@ stdenv.mkDerivation (finalAttrs: { ; sourceRoot = "${finalAttrs.src.name}/OrthancFramework/SharedLibrary"; - outputs = [ - "out" - "dev" - ]; buildInputs = orthanc.buildInputs ++ [ icu diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch b/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch deleted file mode 100644 index 87c92ed94d1b..000000000000 --- a/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r ad41d16f36b1 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake ---- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Fri Jan 17 12:24:54 2025 +0100 -+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Thu Mar 20 17:45:59 2025 +0100 -@@ -552,9 +552,10 @@ - set(ORTHANC_FRAMEWORK_INCLUDE_DIR ${ORTHANC_FRAMEWORK_ROOT}) - else() - find_path(ORTHANC_FRAMEWORK_INCLUDE_DIR OrthancFramework.h -- /usr/include/orthanc-framework -- /usr/local/include/orthanc-framework -+ /usr/ -+ /usr/local/ - ${ORTHANC_FRAMEWORK_ROOT} -+ PATH_SUFFIXES include include/orthanc-framework - ) - endif() - diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix index 160d7bb47949..e05ca1302a72 100644 --- a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix +++ b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix @@ -13,7 +13,6 @@ pugixml, libuuid, zlib, - pkg-config, }: let @@ -40,19 +39,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "orthanc-plugin-dicomweb"; - version = "1.18"; + version = "1.20"; src = fetchhg { url = "https://orthanc.uclouvain.be/hg/orthanc-dicomweb/"; rev = "OrthancDicomWeb-${finalAttrs.version}"; - hash = "sha256-ee271Fcu8yi1gZpTWrCuqhsBdFcPR/JK/fsnJg8PwIc="; + hash = "sha256-p1n4YAFC3W2B2YYsFm/1cJ/zqLsrycJgkMrcXFf/3Xk="; }; - patches = [ - # Fix Orthanc Framework headers files detection - ./fix-orthanc-framework-headers-detection.patch - ]; - postPatch = '' mkdir -p ThirdPartyDownloads ln -s ${bootstrap} ThirdPartyDownloads/bootstrap-5.3.3.zip @@ -92,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_BUILD_TYPE=Release" "-DSTATIC_BUILD=OFF" "-DORTHANC_FRAMEWORK_SOURCE=system" + "-DORTHANC_FRAMEWORK_ROOT=${orthanc.framework}/include/orthanc-framework" ]; meta = { diff --git a/pkgs/by-name/or/orthanc/add-missing-include.patch b/pkgs/by-name/or/orthanc/add-missing-include.patch deleted file mode 100644 index 48ada55a9ece..000000000000 --- a/pkgs/by-name/or/orthanc/add-missing-include.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -r cba3e8ca3a87 OrthancServer/Sources/OrthancInitialization.cpp ---- a/Sources/OrthancInitialization.cpp Tue Mar 11 10:46:15 2025 +0100 -+++ b/Sources/OrthancInitialization.cpp Thu Mar 13 18:20:00 2025 +0100 -@@ -59,6 +59,7 @@ - # undef __FILE__ - # define __FILE__ __ORTHANC_FILE__ - # endif -+# include - # include - #endif diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix index 31ec189162b5..8b2099a10274 100644 --- a/pkgs/by-name/or/orthanc/package.nix +++ b/pkgs/by-name/or/orthanc/package.nix @@ -28,20 +28,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "orthanc"; - version = "1.12.6"; + version = "1.12.7"; src = fetchhg { url = "https://orthanc.uclouvain.be/hg/orthanc/"; rev = "Orthanc-${finalAttrs.version}"; - hash = "sha256-1ztA95PiCGL1oD6zVfsEhwrwGNID13/NcyZDD3eHYv0="; + hash = "sha256-aWUA8cCnWff5Tl8PWGJJtERlGh4GX4a8hTG9E2ADG9k="; }; - patches = [ - # Without this patch, the build fails to find `GOOGLE_PROTOBUF_VERIFY_VERSION` - # The patch has been included upstream, it need to be removed in the next release. - ./add-missing-include.patch - ]; - outputs = [ "out" "dev" diff --git a/pkgs/by-name/os/osc/package.nix b/pkgs/by-name/os/osc/package.nix index 24078c23e5a8..e6f6e23cd7cb 100644 --- a/pkgs/by-name/os/osc/package.nix +++ b/pkgs/by-name/os/osc/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "osc"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "theimpostor"; repo = "osc"; tag = "v${version}"; - hash = "sha256-MfEBbYT99tEtlOMmdl3iq2d07KYsN1tu5tDRFW3676g="; + hash = "sha256-XVFNcQH4MFZKmuOD9b3t320/hE+s+3igjlyHBWGKr0Q="; }; - vendorHash = "sha256-POtQWIjPObsfa3YZ1dLZgedZFUcc4HeTWjU20AucoKc="; + vendorHash = "sha256-k+4m9y7oAZqTr8S0zldJk5FeI3+/nN9RggKIfiyxzDI="; meta = { description = "Command line tool to access the system clipboard from anywhere using the ANSI OSC52 sequence"; diff --git a/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch b/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch new file mode 100644 index 000000000000..425fa95e508b --- /dev/null +++ b/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch @@ -0,0 +1,13 @@ +diff --git a/osmgpsmap-1.0.pc.in b/osmgpsmap-1.0.pc.in +index 86efb3c..da6d1a9 100644 +--- a/osmgpsmap-1.0.pc.in ++++ b/osmgpsmap-1.0.pc.in +@@ -6,6 +6,7 @@ includedir=@includedir@ + Name: @PACKAGE_NAME@ + Description: Moving map widget using openstreet map data + Version: @PACKAGE_VERSION@ +-Requires: gtk+-3.0 libsoup-2.4 ++Requires: gtk+-3.0 ++Requires.private: libsoup-2.4 + Libs: -L${libdir} -losmgpsmap-1.0 + Cflags: -I${includedir}/osmgpsmap-1.0 diff --git a/pkgs/by-name/os/osm-gps-map/package.nix b/pkgs/by-name/os/osm-gps-map/package.nix index 4bae4c46fd45..5f480db6582e 100644 --- a/pkgs/by-name/os/osm-gps-map/package.nix +++ b/pkgs/by-name/os/osm-gps-map/package.nix @@ -11,15 +11,22 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osm-gps-map"; version = "1.2.0"; src = fetchzip { - url = "https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz"; + url = "https://github.com/nzjrs/osm-gps-map/releases/download/${finalAttrs.version}/osm-gps-map-${finalAttrs.version}.tar.gz"; sha256 = "sha256-ciw28YXhR+GC6B2VPC+ZxjyhadOk3zYGuOssSgqjwH0="; }; + patches = [ + # libsoup is only used internally + # it should only be listed as private requirement + # https://github.com/nzjrs/osm-gps-map/pull/108 + ./dont-require-libsoup.patch + ]; + outputs = [ "out" "dev" @@ -35,15 +42,18 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib - gtk3 libsoup_2_4 ]; - meta = with lib; { + propagatedBuildInputs = [ + gtk3 + ]; + + meta = { description = "GTK widget for displaying OpenStreetMap tiles"; homepage = "https://nzjrs.github.io/osm-gps-map"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ hrdinka ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ hrdinka ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix index d4fbb130bea9..71108ffee7d0 100644 --- a/pkgs/by-name/os/osm2pgsql/package.nix +++ b/pkgs/by-name/os/osm2pgsql/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "osm2pgsql-dev"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-+EFvYloLm/cDOflqj6ZIgjFoljKhYBVIKxD8L9j2Hj4="; + hash = "sha256-5rENMcYCfHUdb4QsyOnnGe/qCbdYLoXI15e7OqJXit4="; }; postPatch = '' @@ -82,11 +82,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://osm2pgsql.org"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - maintainers = - lib.teams.geospatial.members - ++ (with lib.maintainers; [ - jglukasik - das-g - ]); + maintainers = with lib.maintainers; [ + jglukasik + das-g + ]; + teams = [ lib.teams.geospatial ]; }; }) diff --git a/pkgs/by-name/os/osmium-tool/package.nix b/pkgs/by-name/os/osmium-tool/package.nix index 7d8bee0466c5..bca502b5ebd6 100644 --- a/pkgs/by-name/os/osmium-tool/package.nix +++ b/pkgs/by-name/os/osmium-tool/package.nix @@ -58,7 +58,8 @@ stdenv.mkDerivation (finalAttrs: { mit bsd3 ]; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ das-g ]); + maintainers = with lib.maintainers; [ das-g ]; + teams = [ lib.teams.geospatial ]; mainProgram = "osmium"; }; }) diff --git a/pkgs/by-name/os/osmo/package.nix b/pkgs/by-name/os/osmo/package.nix index c5bcfc5e08ba..51ede958a4c4 100644 --- a/pkgs/by-name/os/osmo/package.nix +++ b/pkgs/by-name/os/osmo/package.nix @@ -10,7 +10,7 @@ libnotify, libarchive, gspell, - webkitgtk_4_0, + webkitgtk_4_1, libgringotts, wrapGAppsHook3, }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libnotify libarchive gspell - webkitgtk_4_0 + webkitgtk_4_1 libgringotts ]; diff --git a/pkgs/by-name/os/ospd-openvas/package.nix b/pkgs/by-name/os/ospd-openvas/package.nix index 336554863447..be4f4712b5aa 100644 --- a/pkgs/by-name/os/ospd-openvas/package.nix +++ b/pkgs/by-name/os/ospd-openvas/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ospd-openvas"; - version = "22.8.1"; + version = "22.8.2"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "ospd-openvas"; tag = "v${version}"; - hash = "sha256-x/QDo5knECHDQJGj3JEMXfAiT2dDVWKJjJx/ryk8s8k="; + hash = "sha256-UrEcT65SlhJ33QHbAarAuVVSsZlzo/5JxlKSTL7/lsM="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix new file mode 100644 index 000000000000..de9207b66365 --- /dev/null +++ b/pkgs/by-name/os/osrm-backend/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + bzip2, + libxml2, + libzip, + boost, + lua, + luabind, + tbb_2022_0, + expat, + nixosTests, +}: + +let + tbb = tbb_2022_0; +in +stdenv.mkDerivation rec { + pname = "osrm-backend"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "Project-OSRM"; + repo = "osrm-backend"; + tag = "V${version}"; + hash = "sha256-R2Sx+DbT6gROI8X1fkxqOGbMqgmsnNiw2rUX6gSZuTs="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + bzip2 + libxml2 + libzip + boost + lua + luabind + tbb + expat + ]; + + # Needed with GCC 12 + env.NIX_CFLAGS_COMPILE = "-Wno-error=uninitialized"; + + postInstall = '' + mkdir -p $out/share/osrm-backend + cp -r ../profiles $out/share/osrm-backend/profiles + ''; + + passthru.tests = { + inherit (nixosTests) osrm-backend; + }; + + meta = { + homepage = "https://project-osrm.org/"; + description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; + changelog = "https://github.com/Project-OSRM/osrm-backend/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ erictapen ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix index 59591c867175..e733aef67387 100644 --- a/pkgs/by-name/os/ossia-score/package.nix +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -44,13 +44,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "ossia-score"; - version = "3.4.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "ossia"; repo = "score"; rev = "v${finalAttrs.version}"; - hash = "sha256-PpIGlw3MmJYiLaKX+oHM7QUjlk6Bw/W2GwdkLgPK1Hg="; + hash = "sha256-pm+CB1DMO5iyXzt4XR1OQUyTr37R007a64AHDbecJk0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/os/ostree/fix-1592.patch b/pkgs/by-name/os/ostree/fix-1592.patch new file mode 100644 index 000000000000..ddc0b2b7e096 --- /dev/null +++ b/pkgs/by-name/os/ostree/fix-1592.patch @@ -0,0 +1,151 @@ +diff --git a/tests/basic-test.sh b/tests/basic-test.sh +index c8f853f8..a58ad3de 100644 +--- a/tests/basic-test.sh ++++ b/tests/basic-test.sh +@@ -242,7 +242,7 @@ cd ${test_tmpdir} + if $OSTREE commit ${COMMIT_ARGS} -b test-bootable --bootable $test_tmpdir/checkout-test2-4 2>err.txt; then + fatal "committed non-bootable tree" + fi +-assert_file_has_content err.txt "error: .*No such file or directory" ++assert_file_has_content err.txt "error:.*No such file or directory" + echo "ok commit fails bootable if no kernel" + + cd ${test_tmpdir} +diff --git a/tests/pull-test.sh b/tests/pull-test.sh +index d61735a0..9e751d82 100644 +--- a/tests/pull-test.sh ++++ b/tests/pull-test.sh +@@ -297,7 +297,7 @@ ostree_repo_init mirrorrepo-local --mode=archive + if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then + fatal "pull with mixed refs succeeded?" + fi +-assert_file_has_content err.txt "error: Invalid ref name origin:main" ++assert_file_has_content err.txt "Invalid ref name origin:main" + ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch + ${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch + ${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck +@@ -308,7 +308,7 @@ if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo nosuchbranc + fatal "pulled nonexistent branch" + fi + # So true +-assert_file_has_content_literal err.txt "error: Refspec 'nosuchbranch' not found" ++assert_file_has_content_literal err.txt "Refspec 'nosuchbranch' not found" + echo "ok pull-local nonexistent branch" + + cd ${test_tmpdir} +@@ -687,5 +687,5 @@ rm ostree-srv/gnomerepo/summary + if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then + fatal "pull of invalid ref succeeded" + fi +-assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' ++assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' + echo "ok pull got HTML for a ref" +diff --git a/tests/test-config.sh b/tests/test-config.sh +index 2d9aaf53..f1e28614 100755 +--- a/tests/test-config.sh ++++ b/tests/test-config.sh +@@ -44,7 +44,7 @@ assert_file_has_content list.txt "http://example\.com/ostree/repo/" + if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then + assert_not_reached "ostree config get should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config get" + + ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only +@@ -61,7 +61,7 @@ assert_file_has_content repo/config "http://example\.com/ostree/" + if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then + assert_not_reached "ostree config set should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config set" + + # Check that using `--` works and that "ostree config unset" works +@@ -78,7 +78,7 @@ if ${CMD_PREFIX} ostree config --repo=repo get core.lock-timeout-secs 2>err.txt; + fi + # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian + # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839 +-assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core." ++assert_file_has_content err.txt "Key file does not have key .lock-timeout-secs. in group .core." + + # Check that it's idempotent + ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs +@@ -95,5 +95,5 @@ ${CMD_PREFIX} ostree config --repo=repo unset --group='remote "aoeuhtns"' 'xa.ti + if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then + assert_not_reached "ostree config unset should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config unset" +diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh +index 3dbcdd23..d6359979 100755 +--- a/tests/test-fsck-collections.sh ++++ b/tests/test-fsck-collections.sh +@@ -98,7 +98,7 @@ ${CMD_PREFIX} ostree fsck --repo=repo + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" ++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" + assert_file_has_content fsck "^Validating refs\.\.\.$" + + echo "ok 3 fsck detects missing ref bindings" +@@ -111,7 +111,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" ++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" + +@@ -125,7 +125,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has collection ID ‘org\.example\.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org\.example\.Collection2’" ++assert_file_has_content fsck-error "Commit has collection ID .org\.example\.Collection. in collection binding metadata, while the remote it came from has collection ID .org\.example\.Collection2." + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" + +@@ -145,7 +145,7 @@ echo "ok 6 fsck ignores unreferenced ref bindings" + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Collection–ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist" ++assert_file_has_content fsck-error 'Collection.ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist' + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" + +@@ -184,7 +184,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --create=new-ref $(cat ref3-checksum) + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)" ++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)" + assert_file_has_content fsck "^Validating refs\.\.\.$" + + echo "ok 9 fsck detects missing ref bindings" +@@ -203,7 +203,7 @@ echo "ok 10 fsck ignores unreferenced ref bindings" + if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then + assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" + fi +-assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist" ++assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist' + assert_file_has_content fsck "^Validating refs\.\.\.$" + + echo "ok 11 fsck ignores unreferenced ref bindings" +diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh +index 2f5ea634..0f63853c 100755 +--- a/tests/test-remote-add.sh ++++ b/tests/test-remote-add.sh +@@ -81,7 +81,7 @@ echo "ok remote delete" + if $OSTREE remote delete nosuchremote 2>err.txt; then + assert_not_reached "Deleting remote unexpectedly succeeded" + fi +-assert_file_has_content err.txt "error: " ++assert_file_has_content err.txt "not found" + + $OSTREE remote delete --if-exists nosuchremote + echo "ok" diff --git a/pkgs/by-name/os/ostree/fix-test-paths.patch b/pkgs/by-name/os/ostree/fix-test-paths.patch new file mode 100644 index 000000000000..2cc06e9f5bc3 --- /dev/null +++ b/pkgs/by-name/os/ostree/fix-test-paths.patch @@ -0,0 +1,55 @@ +diff --git a/tests/libtest.sh b/tests/libtest.sh +index 2c2a33f0..4e9d3fa2 100755 +--- a/tests/libtest.sh ++++ b/tests/libtest.sh +@@ -761,12 +761,12 @@ gen_ed25519_keys () + { + # Generate private key in PEM format + pemfile="$(mktemp -p ${test_tmpdir} ed25519_XXXXXX.pem)" +- openssl genpkey -algorithm ed25519 -outform PEM -out "${pemfile}" ++ @openssl@ genpkey -algorithm ed25519 -outform PEM -out "${pemfile}" + + # Based on: http://openssl.6102.n7.nabble.com/ed25519-key-generation-td73907.html + # Extract the private and public parts from generated key. +- ED25519PUBLIC="$(openssl pkey -outform DER -pubout -in ${pemfile} | tail -c 32 | base64)" +- ED25519SEED="$(openssl pkey -outform DER -in ${pemfile} | tail -c 32 | base64)" ++ ED25519PUBLIC="$(@openssl@ pkey -outform DER -pubout -in ${pemfile} | tail -c 32 | base64)" ++ ED25519SEED="$(@openssl@ pkey -outform DER -in ${pemfile} | tail -c 32 | base64)" + # Secret key is concantination of SEED and PUBLIC + ED25519SECRET="$(echo ${ED25519SEED}${ED25519PUBLIC} | base64 -d | base64 -w 0)" + +@@ -777,7 +777,7 @@ gen_ed25519_keys () + + gen_ed25519_random_public() + { +- openssl genpkey -algorithm ED25519 | openssl pkey -outform DER | tail -c 32 | base64 ++ @openssl@ genpkey -algorithm ED25519 | @openssl@ pkey -outform DER | tail -c 32 | base64 + } + + is_bare_user_only_repo () { +diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh +index f6e8606d..1fed2465 100755 +--- a/tests/test-basic-user-only.sh ++++ b/tests/test-basic-user-only.sh +@@ -27,7 +27,7 @@ extra_basic_tests=7 + . $(dirname $0)/basic-test.sh + + $CMD_PREFIX ostree --version > version.yaml +-python3 -c 'import yaml; yaml.safe_load(open("version.yaml"))' ++@python3@ -c 'import yaml; yaml.safe_load(open("version.yaml"))' + echo "ok yaml version" + + # Reset things so we don't inherit a lot of state from earlier tests +diff --git a/tests/test-remote-headers.sh b/tests/test-remote-headers.sh +index d3bf4f97..0d2331ba 100755 +--- a/tests/test-remote-headers.sh ++++ b/tests/test-remote-headers.sh +@@ -24,7 +24,7 @@ echo '1..2' + . $(dirname $0)/libtest.sh + + V=$($CMD_PREFIX ostree --version | \ +- python3 -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])') ++ @python3@ -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])') + + setup_fake_remote_repo1 "archive" "" \ + --expected-header foo=bar \ diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index 7164d3656670..b9cfa532807c 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchurl, - fetchpatch, pkg-config, gtk-doc, nixosTests, @@ -11,8 +10,7 @@ glib, xz, e2fsprogs, - libsoup_2_4, - wrapGAppsNoGuiHook, + libsoup_3, gpgme, which, makeWrapper, @@ -36,14 +34,15 @@ composefs, withGjs ? lib.meta.availableOn stdenv.hostPlatform gjs, gjs, - withGlibNetworking ? lib.meta.availableOn stdenv.hostPlatform glib-networking, - glib-networking, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages, gobject-introspection, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, + replaceVars, + openssl, + ostree-full, }: let @@ -53,9 +52,9 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ostree"; - version = "2024.10"; + version = "2025.2"; outputs = [ "out" @@ -65,15 +64,19 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-VOM4fe4f8WAxoGeayitg2pCrf0omwhGCIzPH8jAAq+4="; + url = "https://github.com/ostreedev/ostree/releases/download/v${finalAttrs.version}/libostree-${finalAttrs.version}.tar.xz"; + hash = "sha256-8kSkCMkJmYp3jhJ/zCLBtQK00BPxXyaUj0fMcv/i7vQ="; }; patches = [ - (fetchpatch { - name = "static-pkg-config.patch"; - url = "https://github.com/ostreedev/ostree/pull/3382.patch"; - hash = "sha256-VCQLq4OqmojtB7WFHNNV82asgXPGq5tKoJun66eUntY="; + # Workarounds for installed tests failing in pseudoterminal + # https://github.com/ostreedev/ostree/issues/1592 + ./fix-1592.patch + + # Hard-code paths in installed tests + (replaceVars ./fix-test-paths.patch { + python3 = testPython.interpreter; + openssl = "${openssl}/bin/openssl"; }) ]; @@ -91,7 +94,6 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 - wrapGAppsNoGuiHook ] ++ lib.optionals withIntrospection [ gobject-introspection @@ -102,7 +104,7 @@ stdenv.mkDerivation rec { curl glib e2fsprogs - libsoup_2_4 + libsoup_3 # for trivial-httpd for tests gpgme fuse3 libselinux @@ -122,9 +124,6 @@ stdenv.mkDerivation rec { ++ lib.optionals withGjs [ gjs ] - ++ lib.optionals withGlibNetworking [ - glib-networking - ] ++ lib.optionals withSystemd [ systemd ]; @@ -160,7 +159,7 @@ stdenv.mkDerivation rec { let typelibPath = lib.makeSearchPath "/lib/girepository-1.0" [ (placeholder "out") - gobject-introspection + glib.out ]; in lib.optionalString withIntrospection '' @@ -173,6 +172,7 @@ stdenv.mkDerivation rec { tests = { musl = pkgsCross.musl64.ostree; installedTests = nixosTests.installed-tests.ostree; + inherit ostree-full; }; }; @@ -181,6 +181,6 @@ stdenv.mkDerivation rec { homepage = "https://ostreedev.github.io/ostree/"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index a33bd35bcee2..ff542b27c083 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -10,23 +10,23 @@ let pname = "osu-lazer-bin"; - version = "2025.321.0"; + version = "2025.424.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-oc5IbLhOGn7nug47YHpEqTkQoGWQXrVS77xQMW9khqw="; + hash = "sha256-fgG3SnltGxOYHwos8BTngaW4YrRdpOdURxd73sz0t7o="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-c1EHrkLbxYUwwgMdgGTHHkop6STFLVH8vRQ41MzGeeI="; + hash = "sha256-0K+uAH4f8JOfzG4J37aGaStpEkH5tdUfHEqsogMtN2I="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-mNxoEx/wgJ1OUm7y9JLd5vHSwfcB49QjKDVQWZaMDJQ="; + hash = "sha256-8nOoSkNbzEFpDj0FivCYI20tZzT02YHcKZblfEfh+Zo="; }; } .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json index 2cc851c8fbb5..18dd9bca29e3 100644 --- a/pkgs/by-name/os/osu-lazer/deps.json +++ b/pkgs/by-name/os/osu-lazer/deps.json @@ -651,8 +651,8 @@ }, { "pname": "ppy.osu.Framework", - "version": "2025.321.0", - "hash": "sha256-+TD1TcZfAzFMlVsT19hCfhoMfU4MQcL8K18N/wHZhns=" + "version": "2025.419.0", + "hash": "sha256-fsuEdzD4pzBID7I7DNAYs4JGrCkm/ALtZkEu5/QgKVQ=" }, { "pname": "ppy.osu.Framework.NativeLibs", diff --git a/pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json b/pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json deleted file mode 100644 index 170449ccbc02..000000000000 --- a/pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "net8.0", - "framework": { - "name": "Microsoft.NETCore.App", - "version": "8.0.0" - } - } -} diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index 69841a20bdd6..f24e49e6ca3e 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -16,18 +16,19 @@ xorg, udev, vulkan-loader, + nix-update-script, nativeWayland ? false, }: buildDotnetModule rec { pname = "osu-lazer"; - version = "2025.321.0"; + version = "2025.424.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; tag = version; - hash = "sha256-37foEm4MO8kuir72qARQ7LKiICRiRq1vorABh3OaL3g="; + hash = "sha256-+r7YeaNrUkoYoMzGqhqT+bqdO1UohvJRlAcAskF7vn4="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -78,7 +79,6 @@ buildDotnetModule rec { done ln -sft $out/lib/${pname} ${SDL2}/lib/libSDL2${stdenvNoCC.hostPlatform.extensions.sharedLibrary} - cp -f ${./osu.runtimeconfig.json} "$out/lib/${pname}/osu!.runtimeconfig.json" runHook postFixup ''; @@ -95,7 +95,7 @@ buildDotnetModule rec { }) ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = { description = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)"; diff --git a/pkgs/by-name/os/osu-lazer/update.sh b/pkgs/by-name/os/osu-lazer/update.sh deleted file mode 100755 index 194b644e7777..000000000000 --- a/pkgs/by-name/os/osu-lazer/update.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env nix-shell -#!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/ppy/osu/releases?per_page=1" | jq -r '.[0].name')" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)" -if [[ "$new_version" == "$old_version" ]]; then - echo "Up to date" - exit 0 -fi - -cd ../../../.. - -if [[ "$1" != "--deps-only" ]]; then - update-source-version osu-lazer "$new_version" -fi - -$(nix-build . -A osu-lazer.fetch-deps --no-out-link) diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix index 717b0871ea86..761c89ca810b 100644 --- a/pkgs/by-name/os/osv-scanner/package.nix +++ b/pkgs/by-name/os/osv-scanner/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; tag = "v${version}"; - hash = "sha256-iYbCCGZDTUbyW1XvQIpLZEtuzwUhTBAf3EfAwRX9qYU="; + hash = "sha256-x2lQqBjNbX+EhtnK6r3YpZX5yAadLMUKfypxsGTB5s4="; }; - vendorHash = "sha256-saD4RehZrKSC5V3A5r5prlq+080BFbhEp1Jo1rCbSHI="; + vendorHash = "sha256-eN5KJWubE+NptdncfVPyglb5SS76Eh7jlrajcjBU8YI="; subPackages = [ "cmd/osv-scanner" diff --git a/pkgs/by-name/os/osx-cpu-temp/package.nix b/pkgs/by-name/os/osx-cpu-temp/package.nix new file mode 100644 index 000000000000..016cd81d6831 --- /dev/null +++ b/pkgs/by-name/os/osx-cpu-temp/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "osx-cpu-temp"; + version = "unstable-2020-12-04"; + + src = fetchFromGitHub { + name = "osx-cpu-temp-source"; + owner = "lavoiesl"; + repo = pname; + rev = "6ec951be449badcb7fb84676bbc2c521e600e844"; + sha256 = "1nlibgr55bpln6jbdf8vqcp0fj9zv9343vflb7s9w0yh33fsbg9d"; + }; + + installPhase = '' + mkdir -p $out/bin + cp osx-cpu-temp $out/bin + ''; + + meta = with lib; { + description = "Outputs current CPU temperature for OSX"; + homepage = "https://github.com/lavoiesl/osx-cpu-temp"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ virusdave ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/by-name/os/osxsnarf/package.nix b/pkgs/by-name/os/osxsnarf/package.nix index aa4f22baa43e..d57c7523b53d 100644 --- a/pkgs/by-name/os/osxsnarf/package.nix +++ b/pkgs/by-name/os/osxsnarf/package.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, plan9port, - darwin, ... }: @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ plan9port - darwin.apple_sdk.frameworks.Carbon ]; makeFlags = [ "prefix=${placeholder "out"}" ]; diff --git a/pkgs/by-name/ot/otb/package.nix b/pkgs/by-name/ot/otb/package.nix index 8b66d8e8614e..b30b092ae6c6 100644 --- a/pkgs/by-name/ot/otb/package.nix +++ b/pkgs/by-name/ot/otb/package.nix @@ -27,6 +27,7 @@ tinyxml, # otb modules + enableFFTW ? false, enableFeatureExtraction ? true, enableHyperspectral ? true, enableLearning ? true, @@ -50,10 +51,16 @@ let # filter out gdcm, libminc from list of ITK deps as it's not needed for OTB itkVersion = "5.3.0"; itkMajorMinorVersion = lib.versions.majorMinor itkVersion; - itkDepsToRemove = [ - "gdcm" - "libminc" - ]; + itkDepsToRemove = + [ + "gdcm" + "libminc" + ] + ++ optionals (!enableFFTW) [ + # remove fftw to avoid GPL contamination + # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2454#note_112821 + "fftw" + ]; itkIsInDepsToRemove = dep: builtins.any (d: d == dep.name) itkDepsToRemove; # remove after https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2451 @@ -196,8 +203,8 @@ let propagatedBuildInputs = lib.lists.filter (pkg: !(itkIsInDepsToRemove pkg)) oldArgs.propagatedBuildInputs or [ ] - ++ [ - # the only missing dependency for OTB from itk propagated list + ++ lib.optionals enableFFTW [ + # the only missing dependency for OTB from itk propagated list if FFTW option is enabled fftwFloat ]; @@ -208,13 +215,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "otb"; - version = "10.0-unstable-2025-02-13"; + version = "10.0-unstable-2025-04-03"; src = fetchFromGitHub { owner = "orfeotoolbox"; repo = "otb"; - rev = "34c96ef53bb94985a1358d5c3de1a5ac6dfecf18"; - hash = "sha256-QCLuUryVi+r8sQGxvrh9G91uLxuRju6l3LxVJO3VzXM="; + rev = "93649b68f54975a1a48a0acd49f2602a55fc8032"; + hash = "sha256-S6yhV//qlKdWWcT9J1p64WuVS0QNepIYTr/t4JvyEwE="; }; patches = [ @@ -254,6 +261,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "OTBGroup_ThirdParty" enableThirdParty) (lib.cmakeBool "OTB_WRAP_PYTHON" enablePython) (lib.cmakeBool "BUILD_TESTING" finalAttrs.doInstallCheck) + (lib.cmakeBool "OTB_USE_FFTW" enableFFTW) ]; propagatedBuildInputs = @@ -267,7 +275,6 @@ stdenv.mkDerivation (finalAttrs: { muparserx opencv otb-itk - otb-shark perl tinyxml ] diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index f9e678ccc439..b6dd44bef0fd 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -1,19 +1,22 @@ { lib, + stdenv, python3Packages, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.9.3"; + version = "0.11.1"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-2zzDVUZc+H2tBO5scRUjwz859uaQIbpvCaC0bm4B7NM="; + hash = "sha256-b/+siNzmM6RUJ3jv/2dNJJFueejChKde0D5r8J0lTqM="; }; pythonRelaxDeps = [ @@ -23,6 +26,7 @@ python3Packages.buildPythonApplication rec { "ollama" "packaging" "pillow" + "pydantic" "textual" "typer" ]; @@ -43,14 +47,24 @@ python3Packages.buildPythonApplication rec { python-dotenv rich-pixels textual + textual-image textualeffects typer ]; pythonImportsCheck = [ "oterm" ]; - # Tests require a HTTP connection to ollama - doCheck = false; + # Python tests require a HTTP connection to ollama + + # Fails on darwin with: PermissionError: [Errno 1] Operation not permitted: '/var/empty/Library' + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = nix-update-script { }; + }; meta = { description = "Text-based terminal client for Ollama"; diff --git a/pkgs/by-name/ot/otf2/package.nix b/pkgs/by-name/ot/otf2/package.nix index 385501c529f5..12593de5b110 100644 --- a/pkgs/by-name/ot/otf2/package.nix +++ b/pkgs/by-name/ot/otf2/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchurl, + buildPackages, + which, versionCheckHook, }: @@ -9,18 +11,48 @@ stdenv.mkDerivation (finalAttrs: { pname = "otf2"; version = "3.1.1"; + outputs = [ + "out" + "lib" + "doc" + ]; + src = fetchurl { url = "http://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-${finalAttrs.version}/otf2-${finalAttrs.version}.tar.gz"; hash = "sha256-Wk4BOlGsTteU/jXFW3AM1yA0b9p/M+yEx2uGpfuICm4="; }; - configureFlags = [ - "--enable-backend-test-runs" + postPatch = '' + substituteInPlace build-config/common/platforms/platform-backend-user-provided \ + --replace-fail 'CC=' 'CC=${stdenv.cc.targetPrefix}cc' \ + --replace-fail 'CXX=' 'CXX=${stdenv.cc.targetPrefix}c++' + substituteInPlace build-config/common/platforms/platform-frontend-user-provided \ + --replace-fail 'CC_FOR_BUILD=' 'CC_FOR_BUILD=${buildPackages.stdenv.cc.targetPrefix}cc' \ + --replace-fail 'CXX_FOR_BUILD=' 'CXX_FOR_BUILD=${buildPackages.stdenv.cc.targetPrefix}c++' + ''; + + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + configureFlags = + [ + (lib.enableFeature finalAttrs.finalPackage.doCheck "backend-test-runs") + (lib.withFeature true "custom-compilers") + ] + ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [ + "ac_scorep_cross_compiling=yes" + ]; + + nativeBuildInputs = [ + which # used in configure script ]; + enableParallelBuilding = true; + nativeInstallCheckInputs = [ versionCheckHook ]; doCheck = true; + enableParallelChecking = true; doInstallCheck = true; versionCheckProgram = [ "${placeholder "out"}/bin/otf2-config" ]; diff --git a/pkgs/by-name/ot/otfcc/package.nix b/pkgs/by-name/ot/otfcc/package.nix index 820df7dac464..a5a8478867b8 100644 --- a/pkgs/by-name/ot/otfcc/package.nix +++ b/pkgs/by-name/ot/otfcc/package.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { pname = "otfcc"; version = "0.10.4"; + # archived by the owner on Jun 3, 2022. No viable forks. src = fetchFromGitHub { owner = "caryll"; repo = "otfcc"; @@ -38,6 +39,11 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ ttuegel ]; + # Build fails on all platforms with + # > configure flags: gmake + # > ** Warning: action 'xcode4' sets 'os' field, which is deprecated, use 'targetos' instead. + # > Error: invalid value 'StaticRuntime' for flags + broken = true; }; } diff --git a/pkgs/by-name/ot/otpauth/package.nix b/pkgs/by-name/ot/otpauth/package.nix index c129eb31ee5a..f0a797d8b703 100644 --- a/pkgs/by-name/ot/otpauth/package.nix +++ b/pkgs/by-name/ot/otpauth/package.nix @@ -6,16 +6,16 @@ buildGo124Module rec { pname = "otpauth"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dim13"; repo = "otpauth"; rev = "v${version}"; - sha256 = "sha256-gxFhuFOSiyE7FLWqTZzKPZzXerwK2PWy7Z0zshAJ4Yg="; + sha256 = "sha256-QpQuMeldkZRXFi7I2yc7HS45gvsneZdPsSzkGWmnMX8="; }; - vendorHash = "sha256-UXn+v8SAkEJ2tU3MudH2pDnLHBF4mzshHaovlzqm/fM="; + vendorHash = "sha256-Vx+nSSXidSJdEDoI2Bzx+5CQstNmW9dIOg8jEpAaguQ="; meta = with lib; { description = "Google Authenticator migration decoder"; diff --git a/pkgs/by-name/ot/otpw/package.nix b/pkgs/by-name/ot/otpw/package.nix index 3bac1ca3eb4e..c83b44e472d2 100644 --- a/pkgs/by-name/ot/otpw/package.nix +++ b/pkgs/by-name/ot/otpw/package.nix @@ -8,14 +8,15 @@ procps, unixtools, util-linux, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "otpw"; version = "1.5"; src = fetchurl { - url = "https://www.cl.cam.ac.uk/~mgk25/download/otpw-${version}.tar.gz"; + url = "https://www.cl.cam.ac.uk/~mgk25/download/otpw-${finalAttrs.version}.tar.gz"; hash = "sha256-mKyjimHHcTZ3uW8kQmynBTSAwP0HfZGx6ZvJ+SzLgyo="; }; @@ -34,6 +35,17 @@ stdenv.mkDerivation rec { pam ]; + env.NIX_CFLAGS_COMPILE = toString [ + # demologin.c:132:25: error: implicit declaration of function 'crypt' [] + # 132 | if (!user || strcmp(crypt(password, user->pwd.pw_passwd), + "-Wno-error=implicit-function-declaration" + # demologin.c:132:25: error: passing argument 1 of 'strcmp' makes pointer from integer without a cast [] + # 132 | if (!user || strcmp(crypt(password, user->pwd.pw_passwd), + "-Wno-error=int-conversion" + ]; + + enableParallelBuilding = true; + installPhase = '' mkdir -p $out/bin $out/lib/security $out/share/man/man{1,8} cp pam_*.so $out/lib/security @@ -46,12 +58,16 @@ stdenv.mkDerivation rec { "stackprotector" ]; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + doInstallCheck = true; + + meta = { description = "One-time password login package"; mainProgram = "otpw-gen"; homepage = "http://www.cl.cam.ac.uk/~mgk25/otpw.html"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ot/otto-matic/package.nix b/pkgs/by-name/ot/otto-matic/package.nix index 717154698f77..f58ce12e8bd4 100644 --- a/pkgs/by-name/ot/otto-matic/package.nix +++ b/pkgs/by-name/ot/otto-matic/package.nix @@ -2,20 +2,22 @@ lib, stdenv, fetchFromGitHub, - SDL2, + sdl3, + libGL, cmake, makeWrapper, + unstableGitUpdater, }: stdenv.mkDerivation rec { pname = "OttoMatic"; - version = "unstable-2023-11-13"; + version = "4.0.1-unstable-2025-04-27"; src = fetchFromGitHub { owner = "jorio"; - repo = pname; - rev = "8a5411779762684066d3748fbf4d33747ca871a4"; - hash = "sha256-cZ2gHNXmjMocfTgbA+0T2nwKs55ZMDoB+JTf0Qdqe8U="; + repo = "OttoMatic"; + rev = "69f0111d1768abe56498bf8121f0f9cbc85aedd3"; + hash = "sha256-7RpEVL3tNhEhkZYVjgsI6S+CQfyiz/ukroldrtohA4k="; fetchSubmodules = true; }; @@ -25,7 +27,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL2 + sdl3 + libGL ]; installPhase = '' @@ -38,15 +41,18 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/OttoMatic --chdir "$out/share/OttoMatic" install -Dm644 $src/packaging/io.jor.ottomatic.desktop $out/share/applications/io.jor.ottomatic.desktop install -Dm644 $src/packaging/io.jor.ottomatic.png $out/share/pixmaps/io.jor.ottomatic.png + runHook postInstall ''; - meta = with lib; { + passthru.updateScript = unstableGitUpdater { }; + + meta = { description = "Port of Otto Matic, a 2001 Macintosh game by Pangea Software, for modern operating systems"; homepage = "https://github.com/jorio/OttoMatic"; - license = licenses.cc-by-sa-40; - maintainers = with maintainers; [ lux ]; - platforms = platforms.linux; + license = lib.licenses.cc-by-sa-40; + maintainers = with lib.maintainers; [ lux ]; + platforms = lib.platforms.linux; mainProgram = "OttoMatic"; }; } diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix index 86267edd9f50..9044782ea4d4 100644 --- a/pkgs/by-name/ou/ouch/package.nix +++ b/pkgs/by-name/ou/ouch/package.nix @@ -5,32 +5,40 @@ installShellFiles, pkg-config, bzip2, + bzip3, xz, + git, zlib, zstd, }: rustPlatform.buildRustPackage rec { pname = "ouch"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "ouch-org"; repo = "ouch"; rev = version; - hash = "sha256-WO1fetu39fcLGcrbzFh+toHpnyxWuDVHtmjuH203hzQ="; + hash = "sha256-vNeOJOyQsjDUzScA1a/W+SI1Z67HTLiHjwWZZpr1Paw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LBigtb8kYAgPb4X+L0a/mzPLPEUk5aEHigZuI4Y8N+k="; + cargoHash = "sha256-mMoYJ3dLpb1Y3Ocdyxg1brE7xYeZBbtUg0J/2HTK0hE="; nativeBuildInputs = [ installShellFiles pkg-config + rustPlatform.bindgenHook + ]; + + nativeCheckInputs = [ + git ]; buildInputs = [ bzip2 + bzip3 xz zlib zstd @@ -38,11 +46,6 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "zstd/pkg-config" ]; - preCheck = '' - substituteInPlace tests/ui.rs \ - --replace 'format!(r"/private{path}")' 'path.to_string()' - ''; - postInstall = '' installManPage artifacts/*.1 installShellCompletion artifacts/ouch.{bash,fish} --zsh artifacts/_ouch @@ -58,6 +61,7 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ figsoda psibi + krovuxdev ]; mainProgram = "ouch"; }; diff --git a/pkgs/by-name/ou/oui/package.nix b/pkgs/by-name/ou/oui/package.nix index 584de64b926e..f22095f4e54b 100644 --- a/pkgs/by-name/ou/oui/package.nix +++ b/pkgs/by-name/ou/oui/package.nix @@ -21,7 +21,7 @@ buildGoModule rec { description = "MAC Address CLI Toolkit"; homepage = "https://github.com/thatmattlove/oui"; license = with licenses; [ bsd3 ]; - maintainers = teams.wdz.members; + teams = [ teams.wdz ]; mainProgram = "oui"; }; } diff --git a/pkgs/by-name/ou/outfieldr/package.nix b/pkgs/by-name/ou/outfieldr/package.nix new file mode 100644 index 000000000000..e59a53dde728 --- /dev/null +++ b/pkgs/by-name/ou/outfieldr/package.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitLab, + stdenv, + zig_0_14, +}: + +let + zig = zig_0_14; +in +stdenv.mkDerivation (finalAttrs: { + pname = "outfieldr"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "ve-nt"; + repo = "outfieldr"; + rev = finalAttrs.version; + hash = "sha256-Xz5BxwPWrZfDsWnvVR9KvHidbUdPsxy7b2ONiSZY+uk="; + }; + + nativeBuildInputs = [ + zig.hook + ]; + + meta = { + description = "TLDR client written in Zig"; + homepage = "https://gitlab.com/ve-nt/outfieldr"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hasnep ]; + mainProgram = "tldr"; + inherit (zig.meta) platforms; + }; +}) diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix index cbdfb0f79d5e..c181967c0f70 100644 --- a/pkgs/by-name/ov/ov/package.nix +++ b/pkgs/by-name/ov/ov/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "ov"; - version = "0.39.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; tag = "v${version}"; - hash = "sha256-fjFQM1+K+ZOPqwDgqQAK43NqXTpH8CoLv95IhDDkJmA="; + hash = "sha256-9J04E72pFcHs0JrdHPkkL8O0At/TXEYObnkwHlDnH4s="; }; - vendorHash = "sha256-OJ3ZsDI0g6mOtt7vpyze52/kH9RS8dSJ3432fB6w7/k="; + vendorHash = "sha256-H7mS5Zjtr86s+nOljyzjNx3GlwupDiq7OrPQcHofJvU="; ldflags = [ "-s" diff --git a/pkgs/by-name/ov/overlayed/Cargo.lock b/pkgs/by-name/ov/overlayed/Cargo.lock deleted file mode 100644 index 44e60ad4e328..000000000000 --- a/pkgs/by-name/ov/overlayed/Cargo.lock +++ /dev/null @@ -1,5952 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.15", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_log-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" - -[[package]] -name = "android_logger" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826" -dependencies = [ - "android_log-sys", - "env_filter", - "log", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" -dependencies = [ - "derive_arbitrary", -] - -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" - -[[package]] -name = "async-broadcast" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" -dependencies = [ - "event-listener", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-fs" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" -dependencies = [ - "async-lock", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-io" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" -dependencies = [ - "async-lock", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix", - "slab", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "async-lock" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" -dependencies = [ - "event-listener", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-process" -version = "2.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" -dependencies = [ - "async-channel", - "async-io", - "async-lock", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener", - "futures-lite", - "rustix", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "async-signal" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix", - "signal-hook-registry", - "slab", - "windows-sys 0.59.0", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "atk" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4" -dependencies = [ - "atk-sys", - "glib", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -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" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite", - "piper", -] - -[[package]] -name = "borsh" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028" -dependencies = [ - "borsh-derive", - "cfg_aliases 0.1.1", -] - -[[package]] -name = "borsh-derive" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0" -dependencies = [ - "once_cell", - "proc-macro-crate 2.0.2", - "proc-macro2", - "quote", - "syn 2.0.75", - "syn_derive", -] - -[[package]] -name = "brotli" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byte-unit" -version = "5.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" -dependencies = [ - "rust_decimal", - "serde", - "utf8-width", -] - -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "bytemuck" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - -[[package]] -name = "bytes" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" -dependencies = [ - "serde", -] - -[[package]] -name = "cairo-rs" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" -dependencies = [ - "bitflags 2.6.0", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "camino" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[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", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cargo_toml" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719" -dependencies = [ - "serde", - "toml 0.8.2", -] - -[[package]] -name = "cc" -version = "1.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" -dependencies = [ - "shlex", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfb" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" -dependencies = [ - "byteorder", - "fnv", - "uuid", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "serde", - "windows-targets 0.52.6", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation 0.1.2", - "core-foundation 0.9.4", - "core-graphics 0.23.2", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" -dependencies = [ - "bitflags 2.6.0", - "block", - "cocoa-foundation 0.2.0", - "core-foundation 0.10.0", - "core-graphics 0.24.0", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" -dependencies = [ - "bitflags 2.6.0", - "block", - "core-foundation 0.10.0", - "core-graphics-types 0.2.0", - "libc", - "objc", -] - -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" -dependencies = [ - "percent-encoding", - "time", - "version_check", -] - -[[package]] -name = "cookie_store" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" -dependencies = [ - "cookie", - "idna 0.5.0", - "log", - "publicsuffix", - "serde", - "serde_derive", - "serde_json", - "time", - "url", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.10.0", - "core-graphics-types 0.2.0", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.10.0", - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.75", -] - -[[package]] -name = "ctor" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" -dependencies = [ - "quote", - "syn 2.0.75", -] - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.75", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 2.0.75", -] - -[[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 0.48.0", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "dlopen2" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi", -] - -[[package]] -name = "dlopen2_derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "dpi" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" -dependencies = [ - "serde", -] - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" -dependencies = [ - "dtoa", -] - -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - -[[package]] -name = "dyn-clone" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" - -[[package]] -name = "embed-resource" -version = "2.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602" -dependencies = [ - "cc", - "memchr", - "rustc_version", - "toml 0.8.2", - "vswhom", - "winreg", -] - -[[package]] -name = "embed_plist" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" - -[[package]] -name = "enumflags2" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "env_filter" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "erased-serde" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" -dependencies = [ - "serde", - "typeid", -] - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener", - "pin-project-lite", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "fern" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" -dependencies = [ - "log", -] - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "filetime" -version = "0.2.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" -dependencies = [ - "cfg-if", - "libc", - "libredox", - "windows-sys 0.59.0", -] - -[[package]] -name = "flate2" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fluent-uri" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", - "once_cell", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90fbf5c033c65d93792192a49a8efb5bb1e640c419682a58bb96f5ae77f3d4a" -dependencies = [ - "gdk-sys", - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gdkx11" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2ea8a4909d530f79921290389cbd7c34cb9d623bfe970eaae65ca5f9cd9cce" -dependencies = [ - "gdk", - "gdkx11-sys", - "gio", - "glib", - "libc", - "x11", -] - -[[package]] -name = "gdkx11-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee8f00f4ee46cad2939b8990f5c70c94ff882c3028f3cc5abf950fa4ab53043" -dependencies = [ - "gdk-sys", - "glib-sys", - "libc", - "system-deps", - "x11", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getrandom" -version = "0.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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "gio" -version = "0.18.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - -[[package]] -name = "glib" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" -dependencies = [ - "bitflags 2.6.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" -dependencies = [ - "heck 0.4.1", - "proc-macro-crate 2.0.2", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gobject-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gtk" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c" -dependencies = [ - "atk", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk3-macros" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap 2.4.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.11", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "itoa 1.0.11", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" -dependencies = [ - "futures-util", - "http", - "hyper", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", - "webpki-roots", -] - -[[package]] -name = "hyper-util" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ico" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" -dependencies = [ - "byteorder", - "png", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" -dependencies = [ - "bytemuck", - "byteorder-lite", - "num-traits", - "png", -] - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "infer" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" -dependencies = [ - "cfb", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[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-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 = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "javascriptcore-rs" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc" -dependencies = [ - "bitflags 1.3.2", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "js-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json-patch" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" -dependencies = [ - "jsonptr", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "jsonptr" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" -dependencies = [ - "fluent-uri", - "serde", - "serde_json", -] - -[[package]] -name = "keyboard-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" -dependencies = [ - "bitflags 2.6.0", - "serde", - "unicode-segmentation", -] - -[[package]] -name = "kuchikiki" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" -dependencies = [ - "cssparser", - "html5ever", - "indexmap 1.9.3", - "matches", - "selectors", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libappindicator" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" -dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" -dependencies = [ - "gtk-sys", - "libloading", - "once_cell", -] - -[[package]] -name = "libc" -version = "0.2.157" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374af5f94e54fa97cf75e945cce8a6b201e88a1a07e688b47dfd2a59c66dbd86" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -dependencies = [ - "value-bag", -] - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen 0.10.0", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minisign-verify" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - -[[package]] -name = "muda" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c410a9d21523a819e84881603fbc00331c8001eb899964952046671deddb9c" -dependencies = [ - "cocoa 0.26.0", - "crossbeam-channel", - "dpi", - "gtk", - "keyboard-types", - "objc", - "once_cell", - "png", - "serde", - "thiserror", - "windows-sys 0.59.0", -] - -[[package]] -name = "ndk" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" -dependencies = [ - "bitflags 2.6.0", - "jni-sys", - "log", - "ndk-sys", - "num_enum", - "raw-window-handle", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.6.0+11769913" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "libc", - "memoffset", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_enum" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" -dependencies = [ - "proc-macro-crate 2.0.2", - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2-app-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" -dependencies = [ - "bitflags 2.6.0", - "block2", - "libc", - "objc2", - "objc2-core-data", - "objc2-core-image", - "objc2-foundation", - "objc2-quartz-core", -] - -[[package]] -name = "objc2-core-data" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-image" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc2-encode" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" - -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags 2.6.0", - "block2", - "dispatch", - "libc", - "objc2", -] - -[[package]] -name = "objc2-metal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.36.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "open" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" -dependencies = [ - "is-wsl", - "libc", - "pathdiff", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "os_info" -version = "3.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" -dependencies = [ - "log", - "serde", - "windows-sys 0.52.0", -] - -[[package]] -name = "os_pipe" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "overlayed" -version = "0.0.0" -dependencies = [ - "anyhow", - "cocoa 0.26.0", - "log", - "objc", - "serde", - "serde_json", - "system-notification", - "tauri", - "tauri-build", - "tauri-nspanel", - "tauri-plugin-fs", - "tauri-plugin-http", - "tauri-plugin-log", - "tauri-plugin-os", - "tauri-plugin-process", - "tauri-plugin-shell", - "tauri-plugin-single-instance", - "tauri-plugin-updater", - "tauri-plugin-websocket", - "tauri-plugin-window-state", - "tokio", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pango" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" -dependencies = [ - "gio", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_macros 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros 0.11.2", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "plist" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" -dependencies = [ - "base64 0.22.1", - "indexmap 2.4.0", - "quick-xml", - "serde", - "time", -] - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "3.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix", - "tracing", - "windows-sys 0.59.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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" -dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-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.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "psl-types" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "publicsuffix" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" -dependencies = [ - "idna 0.3.0", - "psl-types", -] - -[[package]] -name = "quick-xml" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" -dependencies = [ - "memchr", -] - -[[package]] -name = "quinn" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "socket2", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" -dependencies = [ - "libc", - "once_cell", - "socket2", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -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.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "raw-window-handle" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" - -[[package]] -name = "redox_syscall" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom 0.2.15", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - -[[package]] -name = "reqwest" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" -dependencies = [ - "base64 0.22.1", - "bytes", - "cookie", - "cookie_store", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-rustls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.15", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rkyv" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" -dependencies = [ - "bitvec", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rust_decimal" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" -dependencies = [ - "arrayvec", - "borsh", - "bytes", - "num-traits", - "rand 0.8.5", - "rkyv", - "serde", - "serde_json", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - -[[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.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.23.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" -dependencies = [ - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" -dependencies = [ - "base64 0.22.1", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" - -[[package]] -name = "rustls-webpki" -version = "0.102.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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 = "schemars" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" -dependencies = [ - "dyn-clone", - "indexmap 1.9.3", - "schemars_derive", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "schemars_derive" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 2.0.75", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags 1.3.2", - "cssparser", - "derive_more", - "fxhash", - "log", - "matches", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.208" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-untagged" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6" -dependencies = [ - "erased-serde", - "serde", - "typeid", -] - -[[package]] -name = "serde_derive" -version = "1.0.208" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "serde_derive_internals" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "serde_json" -version = "1.0.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" -dependencies = [ - "itoa 1.0.11", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "serde_spanned" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" -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 1.0.11", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.4.0", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "serialize-to-javascript" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" -dependencies = [ - "serde", - "serde_json", - "serialize-to-javascript-impl", -] - -[[package]] -name = "serialize-to-javascript-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shared_child" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -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 = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "softbuffer" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d623bff5d06f60d738990980d782c8c866997d9194cfe79ecad00aa2f76826dd" -dependencies = [ - "bytemuck", - "cfg_aliases 0.2.1", - "core-graphics 0.23.2", - "foreign-types", - "js-sys", - "log", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "objc2-quartz-core", - "raw-window-handle", - "redox_syscall", - "wasm-bindgen", - "web-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "soup3" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" -dependencies = [ - "futures-channel", - "gio", - "glib", - "libc", - "soup3-sys", -] - -[[package]] -name = "soup3-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[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 = "state" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" -dependencies = [ - "loom", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "swift-rs" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" -dependencies = [ - "base64 0.21.7", - "serde", - "serde_json", -] - -[[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.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - -[[package]] -name = "sys-locale" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" -dependencies = [ - "libc", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck 0.5.0", - "pkg-config", - "toml 0.8.2", - "version-compare", -] - -[[package]] -name = "system-notification" -version = "0.1.0" -source = "git+https://github.com/ahkohd/tauri-toolkit?branch=v2#9ba387cadcaf91dc0ec36673890849099c564622" -dependencies = [ - "block", - "cocoa 0.25.0", - "objc", - "tauri", -] - -[[package]] -name = "tao" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a93f2c6b8fdaeb7f417bda89b5bc767999745c3052969664ae1fa65892deb7e" -dependencies = [ - "bitflags 2.6.0", - "cocoa 0.26.0", - "core-foundation 0.10.0", - "core-graphics 0.24.0", - "crossbeam-channel", - "dispatch", - "dlopen2", - "dpi", - "gdkwayland-sys", - "gdkx11-sys", - "gtk", - "instant", - "jni", - "lazy_static", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "raw-window-handle", - "scopeguard", - "tao-macros", - "unicode-segmentation", - "url", - "windows 0.58.0", - "windows-core 0.58.0", - "windows-version", - "x11-dl", -] - -[[package]] -name = "tao-macros" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tar" -version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "tauri" -version = "2.0.0-rc.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f60dc86a0513f775a6515d79cf2a54ce38f2fa7225e0c5b9d5ae8241e599afa" -dependencies = [ - "anyhow", - "bytes", - "cocoa 0.26.0", - "dirs", - "dunce", - "embed_plist", - "futures-util", - "getrandom 0.2.15", - "glob", - "gtk", - "heck 0.5.0", - "http", - "image", - "jni", - "libc", - "log", - "mime", - "muda", - "objc", - "percent-encoding", - "raw-window-handle", - "reqwest", - "serde", - "serde_json", - "serde_repr", - "serialize-to-javascript", - "state", - "swift-rs", - "tauri-build", - "tauri-macros", - "tauri-runtime", - "tauri-runtime-wry", - "tauri-utils", - "thiserror", - "tokio", - "tray-icon", - "url", - "urlpattern", - "webkit2gtk", - "webview2-com", - "window-vibrancy", - "windows 0.58.0", -] - -[[package]] -name = "tauri-build" -version = "2.0.0-rc.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d6fc774b19bedadd547b0310fbdbfadbc7546978eccd6d3e389be7cabc437a" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs", - "glob", - "heck 0.5.0", - "json-patch", - "schemars", - "semver", - "serde", - "serde_json", - "tauri-utils", - "tauri-winres", - "toml 0.8.2", - "walkdir", -] - -[[package]] -name = "tauri-codegen" -version = "2.0.0-rc.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14af7a85713898cb8a6be3ece89eb1c39392d8756dd1cc0309ebd6fdc966eb3" -dependencies = [ - "base64 0.22.1", - "brotli", - "ico", - "json-patch", - "plist", - "png", - "proc-macro2", - "quote", - "semver", - "serde", - "serde_json", - "sha2", - "syn 2.0.75", - "tauri-utils", - "thiserror", - "time", - "url", - "uuid", - "walkdir", -] - -[[package]] -name = "tauri-macros" -version = "2.0.0-rc.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f698301cd7297a7876bb81181a830d40d401461eb14fdaf7ae189b1b56ef76" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.75", - "tauri-codegen", - "tauri-utils", -] - -[[package]] -name = "tauri-nspanel" -version = "2.0.0-beta" -source = "git+https://github.com/ahkohd/tauri-nspanel?branch=v2#07b1a04efee07c10b5eb4bfe3af71e32957d2d7a" -dependencies = [ - "bitflags 2.6.0", - "block", - "cocoa 0.26.0", - "core-foundation 0.10.0", - "core-graphics 0.24.0", - "objc", - "objc-foundation", - "objc_id", - "tauri", -] - -[[package]] -name = "tauri-plugin" -version = "2.0.0-rc.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2b0b4fe684059a1b700c1a0d7d51698c05b2257ca64eca2a730d7be2e47c6a" -dependencies = [ - "anyhow", - "glob", - "plist", - "schemars", - "serde", - "serde_json", - "tauri-utils", - "toml 0.8.2", - "walkdir", -] - -[[package]] -name = "tauri-plugin-fs" -version = "2.0.0-rc.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5da009a6d75a07593085ea5e37adb2c55dbe9feb428b0f7610bd1018ebb3660" -dependencies = [ - "anyhow", - "dunce", - "glob", - "percent-encoding", - "schemars", - "serde", - "serde_json", - "serde_repr", - "tauri", - "tauri-plugin", - "thiserror", - "url", - "uuid", -] - -[[package]] -name = "tauri-plugin-http" -version = "2.0.0-rc.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c714b1abe7b355203c54575ad09a9601106e6f0d6f91d63593810affb899cda9" -dependencies = [ - "data-url", - "http", - "regex", - "reqwest", - "schemars", - "serde", - "serde_json", - "tauri", - "tauri-plugin", - "tauri-plugin-fs", - "thiserror", - "tokio", - "url", - "urlpattern", -] - -[[package]] -name = "tauri-plugin-log" -version = "2.0.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57e4666c4a5d81f81b7bb8eacf51ae32c4e69c35071aabb480ad20a80836e4e" -dependencies = [ - "android_logger", - "byte-unit", - "cocoa 0.25.0", - "fern", - "log", - "objc", - "serde", - "serde_json", - "serde_repr", - "swift-rs", - "tauri", - "tauri-plugin", - "thiserror", - "time", -] - -[[package]] -name = "tauri-plugin-os" -version = "2.0.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc4ee761edd532fce2232453e9c8e0f7d9c0b6fe125c4b90b3eb4362ee84224" -dependencies = [ - "gethostname", - "log", - "os_info", - "serde", - "serde_json", - "serialize-to-javascript", - "sys-locale", - "tauri", - "tauri-plugin", - "thiserror", -] - -[[package]] -name = "tauri-plugin-process" -version = "2.0.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9eb80b601682dcbd45dc5ed5f7cc214f1d994aeea730d500899cc616784559" -dependencies = [ - "tauri", - "tauri-plugin", -] - -[[package]] -name = "tauri-plugin-shell" -version = "2.0.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83800ddf78b820172efb5ed7310344e8e4f97fd30cd8237a3f20c12a79eb136" -dependencies = [ - "encoding_rs", - "log", - "open", - "os_pipe", - "regex", - "schemars", - "serde", - "serde_json", - "shared_child", - "tauri", - "tauri-plugin", - "thiserror", - "tokio", -] - -[[package]] -name = "tauri-plugin-single-instance" -version = "2.0.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24e22c4d830f5d8c13d078560aeb497c9f31fc1013e39842a08c486ed4be89c" -dependencies = [ - "log", - "serde", - "serde_json", - "tauri", - "thiserror", - "windows-sys 0.59.0", - "zbus", -] - -[[package]] -name = "tauri-plugin-updater" -version = "2.0.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391ebb8ae8cd6aec44b5d96d3005659d88cde69c57326f639bbc660116a30d63" -dependencies = [ - "base64 0.22.1", - "dirs", - "flate2", - "futures-util", - "http", - "infer", - "minisign-verify", - "reqwest", - "semver", - "serde", - "serde_json", - "tar", - "tauri", - "tauri-plugin", - "tempfile", - "thiserror", - "time", - "tokio", - "url", - "windows-sys 0.59.0", - "zip", -] - -[[package]] -name = "tauri-plugin-websocket" -version = "2.0.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0559ff75acabdd8a2d1bc1dee480d65d6760fd3b758916ff19db0bc1c1f19d7e" -dependencies = [ - "futures-util", - "http", - "log", - "rand 0.8.5", - "serde", - "serde_json", - "tauri", - "tauri-plugin", - "thiserror", - "tokio", - "tokio-tungstenite", -] - -[[package]] -name = "tauri-plugin-window-state" -version = "2.0.0-rc.1" -source = "git+https://github.com/Hacksore/plugins-workspace?branch=v2#01acc8c406b8fdf5f1c53999aa76a7ebba79768c" -dependencies = [ - "bitflags 2.6.0", - "log", - "serde", - "serde_json", - "tauri", - "tauri-plugin", - "thiserror", -] - -[[package]] -name = "tauri-runtime" -version = "2.0.0-rc.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0758dce4f9e08ebeee877d84de0062859495507e1d16f647f97b29f881b43d" -dependencies = [ - "dpi", - "gtk", - "http", - "jni", - "raw-window-handle", - "serde", - "serde_json", - "tauri-utils", - "thiserror", - "url", - "windows 0.58.0", -] - -[[package]] -name = "tauri-runtime-wry" -version = "2.0.0-rc.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78dd7f77e769630da5d91a55e4f102a84ff9c5a99c71e1b5c916a18b5ccafc16" -dependencies = [ - "cocoa 0.26.0", - "gtk", - "http", - "jni", - "log", - "percent-encoding", - "raw-window-handle", - "softbuffer", - "tao", - "tauri-runtime", - "tauri-utils", - "url", - "webkit2gtk", - "webview2-com", - "windows 0.58.0", - "wry", -] - -[[package]] -name = "tauri-utils" -version = "2.0.0-rc.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92ad9cdf7658fefa29a7218dda0acead9400c021bbf9c3f88e98f5e3b9bbab" -dependencies = [ - "brotli", - "cargo_metadata", - "ctor", - "dunce", - "glob", - "html5ever", - "infer", - "json-patch", - "kuchikiki", - "log", - "memchr", - "phf 0.11.2", - "proc-macro2", - "quote", - "regex", - "schemars", - "semver", - "serde", - "serde-untagged", - "serde_json", - "serde_with", - "swift-rs", - "thiserror", - "toml 0.8.2", - "url", - "urlpattern", - "walkdir", -] - -[[package]] -name = "tauri-winres" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" -dependencies = [ - "embed-resource", - "toml 0.7.8", -] - -[[package]] -name = "tempfile" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" -dependencies = [ - "cfg-if", - "fastrand", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa 1.0.11", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -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.39.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" -dependencies = [ - "futures-util", - "log", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.20.2", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.4.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" -dependencies = [ - "indexmap 2.4.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[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.75", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tray-icon" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044d7738b3d50f288ddef035b793228740ad4d927f5466b0af55dc15e7e03cfe" -dependencies = [ - "core-graphics 0.24.0", - "crossbeam-channel", - "dirs", - "libappindicator", - "muda", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "once_cell", - "png", - "serde", - "thiserror", - "windows-sys 0.59.0", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tungstenite" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.8.5", - "rustls", - "rustls-pki-types", - "sha1", - "thiserror", - "utf-8", -] - -[[package]] -name = "typeid" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset", - "tempfile", - "winapi", -] - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-ident" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna 0.5.0", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlpattern" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" -dependencies = [ - "regex", - "serde", - "unic-ucd-ident", - "url", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8-width" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" - -[[package]] -name = "uuid" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" -dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "value-bag" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.75", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "wasm-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webkit2gtk" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup3", - "webkit2gtk-sys", -] - -[[package]] -name = "webkit2gtk-sys" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c" -dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pkg-config", - "soup3-sys", - "system-deps", -] - -[[package]] -name = "webpki-roots" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "webview2-com" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys", - "windows 0.58.0", - "windows-core 0.58.0", - "windows-implement", - "windows-interface", -] - -[[package]] -name = "webview2-com-macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "webview2-com-sys" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886" -dependencies = [ - "thiserror", - "windows 0.58.0", - "windows-core 0.58.0", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "window-vibrancy" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8cdd6999298d969289d8078dae02ce798ad23452075985cccba8b6326711ecf" -dependencies = [ - "cocoa 0.26.0", - "objc", - "raw-window-handle", - "windows-sys 0.59.0", - "windows-version", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-version" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wry" -version = "0.43.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d715cf5fe88e9647f3d17b207b6d060d4a88e7171d4ccb2d2c657dd1d44728" -dependencies = [ - "base64 0.22.1", - "block", - "cocoa 0.26.0", - "core-graphics 0.24.0", - "crossbeam-channel", - "dpi", - "dunce", - "gdkx11", - "gtk", - "html5ever", - "http", - "javascriptcore-rs", - "jni", - "kuchikiki", - "libc", - "ndk", - "objc", - "objc_id", - "once_cell", - "percent-encoding", - "raw-window-handle", - "sha2", - "soup3", - "tao-macros", - "thiserror", - "webkit2gtk", - "webkit2gtk-sys", - "webview2-com", - "windows 0.58.0", - "windows-core 0.58.0", - "windows-version", - "x11-dl", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xdg-home" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "zbus" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "derivative", - "enumflags2", - "event-listener", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a3e850ff1e7217a3b7a07eba90d37fe9bb9e89a310f718afcde5885ca9b6d7" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zip" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" -dependencies = [ - "arbitrary", - "crc32fast", - "crossbeam-utils", - "displaydoc", - "indexmap 2.4.0", - "memchr", - "thiserror", -] - -[[package]] -name = "zvariant" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e09e8be97d44eeab994d752f341e67b3b0d80512a8b315a0671d47232ef1b65" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a5857e2856435331636a9fbb415b09243df4521a267c5bedcd5289b4d5799e" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix index cdfc7a67f693..0180aaa78cc8 100644 --- a/pkgs/by-name/ov/overlayed/package.nix +++ b/pkgs/by-name/ov/overlayed/package.nix @@ -24,6 +24,9 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/apps/desktop/src-tauri"; + useFetchCargoVendor = true; + cargoHash = "sha256-6wN4nZQWrY0J5E+auj17B3iJ/84hzBXYA/bJsX/N5pk="; + webui = callPackage ./webui.nix { inherit meta src version; }; @@ -42,15 +45,6 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "system-notification-0.1.0" = "sha256-T9SnKBy4x0Y5Ul6oECHJ/lvsYS2TPY8Nrg1R9JtJUXs="; - "tauri-nspanel-2.0.0-beta" = "sha256-PhMkSrmmc6fJ0GmT9lPwYMsyBap7/g8vIp210l2nFU4="; - "tauri-plugin-window-state-2.0.0-rc.1" = "sha256-8GR9q1+eiULDOtWlLy+sLylOzfAOUO5Q61EP/XvP6c0="; - }; - }; - postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" diff --git a/pkgs/by-name/ov/overturemaps/package.nix b/pkgs/by-name/ov/overturemaps/package.nix index 788d75e593c8..f0dbe48c7f3d 100644 --- a/pkgs/by-name/ov/overturemaps/package.nix +++ b/pkgs/by-name/ov/overturemaps/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonPackage rec { pname = "overturemaps"; - version = "0.12.0"; + version = "0.14.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Nr8ZB5A8ePJI69IL4Mzjmz22FLzsTGdfP+eTSAqCcoc="; + hash = "sha256-UtYS5FcNBT9IIiybKUXK+jwGnXQ+oR/HQI3ntfV8NYg="; }; build-system = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/ov/ovftool/.editorconfig b/pkgs/by-name/ov/ovftool/.editorconfig new file mode 100644 index 000000000000..1eadccb7c232 --- /dev/null +++ b/pkgs/by-name/ov/ovftool/.editorconfig @@ -0,0 +1,5 @@ +[*.ova] +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +charset = unset diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix index 10156450bec7..3176c2f5c4c8 100644 --- a/pkgs/by-name/ov/ovftool/package.nix +++ b/pkgs/by-name/ov/ovftool/package.nix @@ -1,62 +1,117 @@ { autoPatchelfHook, c-ares, + curl, darwin, expat, fetchurl, glibc, icu60, + jq, lib, libiconv, libredirect, libxcrypt-legacy, libxml2, makeWrapper, + openssl, stdenv, unzip, xercesc, zlib, + acceptBroadcomEula ? false, }: let + # Returns the base URL for the given tool ID. + mkBaseUrl = toolId: "https://developer.broadcom.com/tools/${toolId}/latest"; + ovftoolId = "open-virtualization-format-ovf-tool"; - ovftoolSystems = - let - baseUrl = "https://vdc-download.vmware.com/vmwb-repository/dcr-public"; - in + # Use browser devtools to figure out how this works. + fetchFromBroadcom = { - "i686-linux" = rec { - name = "VMware-ovftool-${version}-lin.i386.zip"; - # As of 2024-02-20 the "Zip of OVF Tool for 32-bit Linux" download link - # on the v4.6.2 page links to v4.6.0. - version = "4.6.0-21452615"; - url = "${baseUrl}/7254abb2-434d-4f5d-83e2-9311ced9752e/57e666a2-874c-48fe-b1d2-4b6381f7fe97/${name}"; - hash = "sha256-qEOr/3SW643G5ZQQNJTelZbUxB8HmxPd5uD+Gqsoxz0="; - }; - "x86_64-linux" = rec { - name = "VMware-ovftool-${version}-lin.x86_64.zip"; - version = "4.6.2-22220919"; - url = "${baseUrl}/8a93ce23-4f88-4ae8-b067-ae174291e98f/c609234d-59f2-4758-a113-0ec5bbe4b120/${name}"; - hash = "sha256-3B1cUDldoTqLsbSARj2abM65nv+Ot0z/Fa35/klJXEY="; - }; - "x86_64-darwin" = rec { - name = "VMware-ovftool-${version}-mac.x64.zip"; - version = "4.6.2-22220919"; - url = "${baseUrl}/91091b23-280a-487a-a048-0c2594303c92/dc666e23-104f-4b9b-be11-6d88dcf3ab98/${name}"; - hash = "sha256-AZufZ0wxt5DYjnpahDfy36W8i7kjIfEkW6MoELSx11k="; + fileName, + version, + toolId ? ovftoolId, + artifactId ? 21342, + fileType ? "Download", + source ? "", + hash ? "", + }: + let + requestJson = builtins.toJSON { + inherit + fileName + artifactId + fileType + source + ; }; + in + fetchurl { + name = fileName; + url = + (mkBaseUrl toolId) + + "?p_p_id=SDK_AND_TOOL_DETAILS_INSTANCE_iwlk&p_p_lifecycle=2&p_p_resource_id=documentDownloadArtifact"; + curlOptsList = [ + "--json" + requestJson + ]; + downloadToTemp = true; + nativeBuildInputs = [ jq ]; + postFetch = '' + # Try again with the new URL + urls="$(jq -r 'if (.success == true) then .data.downloadUrl else error(. | tostring) end' < "$downloadedFile" || exit $?)" \ + downloadToTemp="" \ + curlOptsList="" \ + curlOpts="" \ + postFetch="" \ + exec "$SHELL" "''${BASH_ARGV[@]}" + ''; + inherit hash; }; + ovftoolSystems = { + "x86_64-linux" = rec { + version = "4.6.3-24031167"; + fileName = "VMware-ovftool-${version}-lin.x86_64.zip"; + hash = "sha256-NEwwgmEh/mrZkMMhI+Kq+SYdd3MJ0+IBLdUhd1+kPow="; + }; + "x86_64-darwin" = rec { + version = "4.6.3-24031167"; + fileName = "VMware-ovftool-${version}-mac.x64.zip"; + hash = "sha256-vhACcc4tjaQhvKwZyWkgpaKaoC+coWGl1zfSIC6WebM="; + }; + }; + ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); + # Regrettably, we need to compile this version or else ovftool complains about unknown symbols. + ovftool-xercesc = xercesc.overrideAttrs (prev: rec { + version = "3.2.5"; + src = fetchurl { + url = lib.replaceStrings [ prev.version ] [ version ] prev.src.url; + hash = "sha256-VFz8zmxOdVIHvR8n4xkkHlDjfAwnJQ8RzaEWAY8e8PU="; + }; + }); in -stdenv.mkDerivation { +stdenv.mkDerivation (final: { pname = "ovftool"; inherit (ovftoolSystem) version; - src = fetchurl { - inherit (ovftoolSystem) name url hash; - }; + src = + if acceptBroadcomEula then + fetchFromBroadcom { + inherit (ovftoolSystem) fileName version hash; + } + else + throw '' + See the following URL for terms of using this software: + ${mkBaseUrl ovftoolId} + + Use `${final.pname}.override { acceptBroadcomEula = true; }` if you accept Broadcom's terms + and would like to use this package. + ''; buildInputs = [ @@ -65,21 +120,26 @@ stdenv.mkDerivation { icu60 libiconv libxcrypt-legacy - xercesc + ovftool-xercesc zlib + curl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glibc + openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.Libsystem libxml2 ]; - nativeBuildInputs = [ - unzip - makeWrapper - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = + [ + unzip + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ]; postUnpack = '' # The linux package wraps ovftool.bin with ovftool. Wrapping @@ -98,12 +158,11 @@ stdenv.mkDerivation { # with the addition of a libexec directory and a Nix-style binary wrapper. # Almost all libs in the package appear to be VMware proprietary except for - # libgoogleurl and libcurl. The rest of the libraries that the installer - # extracts are omitted here, and provided in buildInputs. Since libcurl - # depends on VMware's OpenSSL, both libs are still used. + # libgoogleurl and libcurl. + # # FIXME: Replace libgoogleurl? Possibly from Chromium? - # FIXME: Tell VMware to use a modern version of OpenSSL. As of ovftool - # v4.6.2 ovftool uses openssl-1.0.2zh which in seems to be the extended + # FIXME: Tell VMware to use a modern version of OpenSSL on macOS. As of ovftool + # v4.6.3 ovftool uses openssl-1.0.2zj which in seems to be the extended # support LTS release: https://www.openssl.org/support/contracts.html # Install all libs that are not patched in preFixup. @@ -112,18 +171,15 @@ stdenv.mkDerivation { install -m 644 -t "$out/lib" \ '' + lib.optionalString stdenv.hostPlatform.isLinux '' - libcrypto.so.1.0.2 \ - libcurl.so.4 \ libgoogleurl.so.59 \ - libssl.so.1.0.2 \ libssoclient.so \ libvim-types.so \ libvmacore.so \ libvmomi.so '' + # macOS still relies on OpenSSL 1.0.2 as of v4.6.3, but Linux is in the clear + lib.optionalString stdenv.hostPlatform.isDarwin '' lib/libcrypto.1.0.2.dylib \ - lib/libcurl.4.dylib \ lib/libgoogleurl.59.0.30.45.2.dylib \ lib/libssl.1.0.2.dylib \ lib/libssoclient.dylib \ @@ -152,6 +208,7 @@ stdenv.mkDerivation { install -m 644 -t "$out/share/licenses" \ "vmware.eula" \ "vmware-eula.rtf" \ + "README.txt" \ "open_source_licenses.txt" # Install Docs @@ -186,7 +243,6 @@ stdenv.mkDerivation { done # Patches for ovftool binary - change_args+=(-change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib) change_args+=(-change /usr/lib/libc++.1.dylib ${stdenv.cc.libcxx}/lib/libc++.1.dylib) change_args+=(-change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib) change_args+=(-change /usr/lib/libxml2.2.dylib ${libxml2}/lib/libxml2.2.dylib) @@ -195,20 +251,24 @@ stdenv.mkDerivation { change_args+=(-change @loader_path/lib/libexpat.dylib ${expat}/lib/libexpat.dylib) change_args+=(-change @loader_path/lib/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib) change_args+=(-change @loader_path/lib/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib) - change_args+=(-change @loader_path/lib/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib) + change_args+=(-change @loader_path/lib/libxerces-c-3.2.dylib ${ovftool-xercesc}/lib/libxerces-c.dylib) + + # lolwut + change_args+=(-change @GOBUILD_CAYMAN_CURL_ROOT@/apple_mac64/lib/libcurl.4.dylib ${curl.out}/lib/libcurl.4.dylib) # Patch binary install_name_tool "''${change_args[@]}" "$out/libexec/ovftool" + otool -L "$out/libexec/ovftool" # Additional patches for ovftool dylibs - change_args+=(-change /usr/lib/libresolv.9.dylib ${darwin.Libsystem}/lib/libresolv.9.dylib) + change_args+=(-change /usr/lib/libresolv.9.dylib ${lib.getLib darwin.libresolv}/lib/libresolv.9.dylib) change_args+=(-change @loader_path/libcares.2.dylib ${c-ares}/lib/libcares.2.dylib) change_args+=(-change @loader_path/libexpat.dylib ${expat}/lib/libexpat.dylib) change_args+=(-change @loader_path/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib) change_args+=(-change @loader_path/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib) - change_args+=(-change @loader_path/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib) + change_args+=(-change @loader_path/libxerces-c-3.2.dylib ${ovftool-xercesc}/lib/libxerces-c.dylib) - # Add new abolute paths for other libs to all libs + # Add new absolute paths for other libs to all libs for lib in $out/lib/*.dylib; do libname=$(basename $lib) change_args+=(-change "@loader_path/$libname" "$out/lib/$libname") @@ -219,6 +279,7 @@ stdenv.mkDerivation { libname=$(basename $lib) install_name_tool -id "$libname" "$lib" install_name_tool "''${change_args[@]}" "$lib" + otool -L "$lib" done ''; @@ -229,29 +290,34 @@ stdenv.mkDerivation { (allow file-read* (subpath "/System/Library/TextEncodings")) ''; - doInstallCheck = true; + # Seems to get stuck and return 255, but works outside the sandbox + doInstallCheck = !stdenv.hostPlatform.isDarwin; postInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$TMPDIR # Construct a dummy /etc/passwd file - ovftool attempts to determine the # user's "real" home using this - DUMMY_PASSWD="$(realpath $HOME/dummy-passwd)" + DUMMY_PASSWD="$HOME/dummy-passwd" cat > $DUMMY_PASSWD < 3.3.2' - +gem 'oxidized', '0.33.0' +gem 'oxidized-web', '0.16.0' +gem 'oxidized-script', '0.7.0' +gem 'psych', '~> 5.0' diff --git a/pkgs/by-name/ox/oxidized/Gemfile.lock b/pkgs/by-name/ox/oxidized/Gemfile.lock index 660cf7cdb813..667fe8266d0d 100644 --- a/pkgs/by-name/ox/oxidized/Gemfile.lock +++ b/pkgs/by-name/ox/oxidized/Gemfile.lock @@ -1,18 +1,11 @@ -GIT - remote: https://github.com/ytti/oxidized-script.git - revision: 988cded5d89f52e274afb545bd3e011e19d5d22d - ref: 988cded5d89f52e274afb545bd3e011e19d5d22d - specs: - oxidized-script (0.6.0) - oxidized (~> 0.28) - slop (~> 4.6) - GEM remote: https://rubygems.org/ specs: asetus (0.4.0) base64 (0.2.0) bcrypt_pbkdf (1.1.1) + bcrypt_pbkdf (1.1.1-arm64-darwin) + bcrypt_pbkdf (1.1.1-x86_64-darwin) charlock_holmes (0.7.9) date (3.4.1) ed25519 (1.3.0) @@ -23,7 +16,7 @@ GEM thor tilt htmlentities (4.3.4) - json (2.10.2) + json (2.11.3) logger (1.7.0) multi_json (1.15.0) mustermann (3.0.3) @@ -31,6 +24,7 @@ GEM net-ftp (0.3.8) net-protocol time + net-http-digest_auth (1.4.1) net-protocol (0.2.2) timeout net-scp (4.1.0) @@ -38,31 +32,40 @@ GEM net-ssh (7.3.0) net-telnet (0.2.0) nio4r (2.7.4) - oxidized (0.30.1) - asetus (~> 0.1) + ostruct (0.6.1) + oxidized (0.33.0) + asetus (~> 0.4) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) net-ftp (~> 0.2) - net-scp (~> 4.0) - net-ssh (~> 7.1) + net-http-digest_auth (~> 1.4) + net-scp (~> 4.1) + net-ssh (~> 7.3) net-telnet (~> 0.2) - psych (~> 3.3.2) + ostruct (~> 0.6) + psych (~> 5.0) rugged (~> 1.6) slop (~> 4.6) - oxidized-web (0.14.0) + oxidized-script (0.7.0) + oxidized (~> 0.29) + slop (~> 4.6) + oxidized-web (0.16.0) charlock_holmes (~> 0.7.5) emk-sinatra-url-for (~> 0.2) haml (~> 6.0) htmlentities (~> 4.3) json (~> 2.3) - oxidized (~> 0.26) - puma (>= 3.11.4, < 6.5.0) - sinatra (>= 1.4.6, < 5.0) - sinatra-contrib (>= 1.4.6, < 5.0) - psych (3.3.4) - puma (6.4.3) + ostruct (~> 0.6) + oxidized (~> 0.31) + puma (>= 3.11.4) + sinatra (>= 1.4.6) + sinatra-contrib (>= 1.4.6) + psych (5.2.3) + date + stringio + puma (6.6.0) nio4r (~> 2.0) - rack (3.1.12) + rack (3.1.13) rack-protection (4.1.1) base64 (>= 0.1.0) logger (>= 1.6.0) @@ -86,6 +89,7 @@ GEM sinatra (= 4.1.1) tilt (~> 2.0) slop (4.10.1) + stringio (3.1.7) temple (0.10.3) thor (1.3.2) tilt (2.6.0) @@ -94,13 +98,16 @@ GEM timeout (0.4.3) PLATFORMS + arm64-darwin ruby + x86_64-darwin + x86_64-linux DEPENDENCIES - oxidized (= 0.30.1) - oxidized-script! - oxidized-web (= 0.14.0) - psych (~> 3.3.2) + oxidized (= 0.33.0) + oxidized-script (= 0.7.0) + oxidized-web (= 0.16.0) + psych (~> 5.0) BUNDLED WITH - 2.6.2 + 2.5.22 diff --git a/pkgs/by-name/ox/oxidized/gemset.nix b/pkgs/by-name/ox/oxidized/gemset.nix index 3bbb47bc3d0c..c946d8773f98 100644 --- a/pkgs/by-name/ox/oxidized/gemset.nix +++ b/pkgs/by-name/ox/oxidized/gemset.nix @@ -100,10 +100,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; + sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s"; type = "gem"; }; - version = "2.10.2"; + version = "2.11.3"; }; logger = { groups = [ "default" ]; @@ -150,6 +150,16 @@ }; version = "0.3.8"; }; + net-http-digest_auth = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nq859b0gh2vjhvl1qh1zrk09pc7p54r9i6nnn6sb06iv07db2jb"; + type = "gem"; + }; + version = "1.4.1"; + }; net-protocol = { dependencies = [ "timeout" ]; groups = [ "default" ]; @@ -202,15 +212,27 @@ }; version = "2.7.4"; }; + ostruct = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; + }; oxidized = { dependencies = [ "asetus" "bcrypt_pbkdf" "ed25519" "net-ftp" + "net-http-digest_auth" "net-scp" "net-ssh" "net-telnet" + "ostruct" "psych" "rugged" "slop" @@ -219,10 +241,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ry9rwksjb80wxd42zv5m5444n5hwhkbr4spa895jk2c1k5q1y0c"; + sha256 = "02vprgsqaafrnkz9fhj27mv8ngir4h1g07zc6s6f7gja5awfwqzm"; type = "gem"; }; - version = "0.30.1"; + version = "0.33.0"; }; oxidized-script = { dependencies = [ @@ -232,13 +254,11 @@ groups = [ "default" ]; platforms = [ ]; source = { - fetchSubmodules = false; - rev = "988cded5d89f52e274afb545bd3e011e19d5d22d"; - sha256 = "13vglj6w37xd6dqfn98xdan3kqbs460akj1rdr4bm7lsrpa281gf"; - type = "git"; - url = "https://github.com/ytti/oxidized-script.git"; + remotes = [ "https://rubygems.org" ]; + sha256 = "0734py1wb97zgjlsdd9rfw60pm0pnp02a53z0va5w5ng7sjn2zli"; + type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; oxidized-web = { dependencies = [ @@ -247,6 +267,7 @@ "haml" "htmlentities" "json" + "ostruct" "oxidized" "puma" "sinatra" @@ -256,20 +277,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mf1kxjg49fxf988sqd9cni8j5r8xsp3218370ppinsy39l50782"; + sha256 = "1w16ha8rdnqb9j7v9mjdgfh4p0fdmwfxfprs167267ag1mah4268"; type = "gem"; }; - version = "0.14.0"; + version = "0.16.0"; }; psych = { + dependencies = [ + "date" + "stringio" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "186i2hc6sfvg4skhqf82kxaf4mb60g65fsif8w8vg1hc9mbyiaph"; + sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4"; type = "gem"; }; - version = "3.3.4"; + version = "5.2.3"; }; puma = { dependencies = [ "nio4r" ]; @@ -277,20 +302,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; + sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j"; type = "gem"; }; - version = "6.4.3"; + version = "6.6.0"; }; rack = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h65a1f9gsqx2ryisdy4lrd9a9l8gdv65dcscw9ynwwjr1ak1n00"; + sha256 = "14jpch41i6iclbgc8rykvkyn7ii8s9dwvn98k96qi0hqcbdpj30p"; type = "gem"; }; - version = "3.1.12"; + version = "3.1.13"; }; rack-protection = { dependencies = [ @@ -386,6 +411,16 @@ }; version = "4.10.1"; }; + stringio = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v"; + type = "gem"; + }; + version = "3.1.7"; + }; temple = { groups = [ "default" ]; platforms = [ ]; diff --git a/pkgs/by-name/ox/oxidized/package.nix b/pkgs/by-name/ox/oxidized/package.nix index 28a25b3f1d74..bfe2e7fa8cf3 100644 --- a/pkgs/by-name/ox/oxidized/package.nix +++ b/pkgs/by-name/ox/oxidized/package.nix @@ -22,7 +22,8 @@ bundlerApp { description = "Network device configuration backup tool. It's a RANCID replacement"; homepage = "https://github.com/ytti/oxidized"; license = licenses.asl20; - maintainers = with maintainers; [ nicknovitski ] ++ teams.wdz.members; + maintainers = with maintainers; [ nicknovitski ]; + teams = [ teams.wdz ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ox/oxigraph/package.nix b/pkgs/by-name/ox/oxigraph/package.nix new file mode 100644 index 000000000000..7aaa0f023f6d --- /dev/null +++ b/pkgs/by-name/ox/oxigraph/package.nix @@ -0,0 +1,63 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, +}: + +rustPlatform.buildRustPackage rec { + pname = "oxigraph"; + version = "0.4.9"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-sv9LpAoPQ4oFrGI6j6NgVZwEwpM1wt93lHkUwnvmhIY="; + fetchSubmodules = true; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-nVlvmYOxZDMLvxP8JaKTyKMgW6+48B8B+UzlwgthJS0="; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + installShellFiles + ]; + + buildAndTestSubdir = "cli"; + buildNoDefaultFeatures = true; + buildFeatures = [ + "rustls-webpki" + "geosparql" + ]; + + # Man pages and autocompletion + postInstall = '' + MAN_DIR="$(find target/*/release -name man)" + installManPage "$MAN_DIR"/*.1 + COMPLETE_DIR="$(find target/*/release -name complete)" + installShellCompletion --bash --name oxigraph.bash "$COMPLETE_DIR/oxigraph.bash" + installShellCompletion --fish --name oxigraph.fish "$COMPLETE_DIR/oxigraph.fish" + installShellCompletion --zsh --name _oxigraph "$COMPLETE_DIR/_oxigraph" + ''; + + cargoCheckNoDefaultFeatures = true; + cargoCheckFeatures = buildFeatures; + + meta = with lib; { + homepage = "https://github.com/oxigraph/oxigraph"; + description = "SPARQL graph database"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; + maintainers = with maintainers; [ astro ]; + license = with licenses; [ + asl20 + mit + ]; + mainProgram = "oxigraph"; + }; +} diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index 461522b2f3f2..6cb987c2ee65 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -5,7 +5,7 @@ }: rustPlatform.buildRustPackage rec { - version = "9.1.4"; + version = "9.1.5"; pname = "oxipng"; # do not use fetchCrate (only repository includes tests) @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { owner = "shssoichiro"; repo = "oxipng"; tag = "v${version}"; - hash = "sha256-cwujBgvGdNvD8vKp3+jNxcxkw/+M2FooNgsw+RejyrM="; + hash = "sha256-UjiGQSLiUMuYm62wF7Xwhp2MRzCaQ9pbBBkvHnuspVw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Z0otTCFwtGuSC1XBM3jcgGDFPZuMzQikZaYCnR+S6Us="; + cargoHash = "sha256-sdhyxJDUlb6+SJ/kvfqsplHOeCEbA3ls66eur3eeVVA="; # don't require qemu for aarch64-linux tests # error: linker `aarch64-linux-gnu-gcc` not found diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix index 10ddd96d4f2d..1dc3cb54219e 100644 --- a/pkgs/by-name/ox/oxker/package.nix +++ b/pkgs/by-name/ox/oxker/package.nix @@ -2,26 +2,29 @@ lib, fetchCrate, rustPlatform, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "oxker"; - version = "0.9.0"; + version = "0.10.3"; src = fetchCrate { - inherit pname version; - hash = "sha256-XY3LwDagxSi1yeAfqhnbtNRBqJxp0BkhaYZM/T59tGw="; + inherit (finalAttrs) pname version; + hash = "sha256-2xLTR5+0xtyYhc5+gYG78EMP/B5Vk6ZqEGsZwM2bAok="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Z14XLNvu7lcTD5DjaN7+raswnw7A+jyA/ZjFq6b3Vqk="; + cargoHash = "sha256-d6jaOtB6S8R6cdqLUnuPhDP6q9Hl6FTieFEiBibiDDE="; - meta = with lib; { - description = "Simple tui to view & control docker containers"; + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple TUI to view & control docker containers"; homepage = "https://github.com/mrjackwills/oxker"; - changelog = "https://github.com/mrjackwills/oxker/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ siph ]; + changelog = "https://github.com/mrjackwills/oxker/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ siph ]; mainProgram = "oxker"; }; -} +}) diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 03798b666fc7..e4bdaa4da6de 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -3,31 +3,25 @@ rustPlatform, fetchFromGitHub, rust-jemalloc-sys, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.15.14"; + version = "0.16.9"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-PCaS60UjD502YI9lZsvbSa3utwrYl8YazZj/CF91euQ="; + hash = "sha256-6CTDUtui1YwfmR2f0MdqpNGmZ+fLyxtsf7NdhQTgsoI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/OLcyHTTevqpkrHY3Ueo38xtIjhjE4quqPTEZfPEcaY="; + cargoHash = "sha256-Pt67KLcUiHRiQ7E6Rm3MuJ3kPYwmXzfUo0u6IVZn8D8="; - buildInputs = - [ - rust-jemalloc-sys - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + rust-jemalloc-sys + ]; env.OXC_VERSION = version; diff --git a/pkgs/by-name/p0/p0f/build-stdio.patch b/pkgs/by-name/p0/p0f/build-stdio.patch new file mode 100644 index 000000000000..3274960c7fba --- /dev/null +++ b/pkgs/by-name/p0/p0f/build-stdio.patch @@ -0,0 +1,13 @@ +diff --git a/build.sh b/build.sh +index f674433..f181344 100755 +--- a/build.sh ++++ b/build.sh +@@ -197,7 +197,7 @@ echo -n "[*] Checking if memory alignment is required... " + + rm -f "$TMP" "$TMP.c" "$TMP.log" || exit 1 + +-echo -e "#include \"types.h\"\nvolatile u8 tmp[6]; int main() { printf(\"%d\x5cn\", *(u32*)(tmp+1)); return 0; }" >"$TMP.c" || exit 1 ++echo -e "#include \"types.h\"\n#include \"stdio.h\"\nvolatile u8 tmp[6]; int main() { printf(\"%d\x5cn\", *(u32*)(tmp+1)); return 0; }" >"$TMP.c" || exit 1 + $CC $USE_CFLAGS $USE_LDFLAGS "$TMP.c" -o "$TMP" &>"$TMP.log" + + if [ ! -x "$TMP" ]; then diff --git a/pkgs/by-name/p0/p0f/package.nix b/pkgs/by-name/p0/p0f/package.nix index 93c025b1c43e..5db7d66cf16d 100644 --- a/pkgs/by-name/p0/p0f/package.nix +++ b/pkgs/by-name/p0/p0f/package.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ]; + patches = [ ./build-stdio.patch ]; + buildPhase = '' substituteInPlace config.h --replace "p0f.fp" "$out/etc/p0f.fp" substituteInPlace build.sh --replace "/bin/bash" "${bash}/bin/bash" diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix index 16fb274d0130..d004151ec79c 100644 --- a/pkgs/by-name/p2/p2pool/package.nix +++ b/pkgs/by-name/p2/p2pool/package.nix @@ -12,12 +12,8 @@ openssl, pkg-config, zeromq, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Foundation; -in stdenv.mkDerivation rec { pname = "p2pool"; version = "4.4"; @@ -42,7 +38,7 @@ stdenv.mkDerivation rec { hwloc openssl curl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + ]; cmakeFlags = [ "-DWITH_LTO=OFF" ]; diff --git a/pkgs/by-name/p4/p4/package.nix b/pkgs/by-name/p4/p4/package.nix new file mode 100644 index 000000000000..68af1ce3c04c --- /dev/null +++ b/pkgs/by-name/p4/p4/package.nix @@ -0,0 +1,140 @@ +{ + stdenv, + fetchurl, + fetchzip, + lib, + emptyDirectory, + linkFarm, + jam, + openssl, + testers, +}: + +let + opensslStatic = openssl.override { + static = true; + }; + androidZlibContrib = + let + src = fetchzip { + url = "https://android.googlesource.com/platform/external/zlib/+archive/61174f4fd262c6075f88768465f308aae95a2f04.tar.gz"; + sha256 = "sha256-EMzKAHcEWOUugcHKH2Fj3ZaIHC9UlgO4ULKe3RvgxvI="; + stripRoot = false; + }; + in + linkFarm "android-zlib-contrib" [ + # We only want to keep the contrib directory as the other files conflict + # with p4's own zlib files. (For the same reason, we can't use the + # cone-based Git sparse checkout, either.) + { + name = "contrib"; + path = "${src}/contrib"; + } + ]; +in +stdenv.mkDerivation (finalAttrs: { + pname = "p4"; + version = "2024.1/2596294"; + + src = fetchurl { + # Upstream replaces minor versions, so use archived URL. + url = "https://web.archive.org/web/20240526153453id_/https://ftp.perforce.com/perforce/r24.1/bin.tools/p4source.tgz"; + sha256 = "sha256-6+DOJPeVzP4x0UsN9MlZRAyusapBTICX0BuyvVBQBC8="; + }; + + postPatch = lib.optionals stdenv.hostPlatform.isDarwin '' + # same error as https://github.com/pocoproject/poco/issues/4586 + substituteInPlace zlib/zutil.h \ + --replace-fail '#if defined(MACOS) || defined(TARGET_OS_MAC)' '#if defined(MACOS)' + ''; + + nativeBuildInputs = [ jam ]; + + outputs = [ + "out" + "bin" + "dev" + ]; + + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ]; + + jamFlags = + [ + "-sEXEC=bin.unix" + "-sCROSS_COMPILE=${stdenv.cc.targetPrefix}" + "-sMALLOC_OVERRIDE=no" + "-sSSLINCDIR=${lib.getDev opensslStatic}/include" + "-sSSLLIBDIR=${lib.getLib opensslStatic}/lib" + ] + ++ lib.optionals stdenv.cc.isClang [ + "-sOSCOMP=clang" + "-sCLANGVER=${stdenv.cc.cc.version}" + ] + ++ lib.optionals stdenv.cc.isGNU [ + "-sOSCOMP=gcc" + "-sGCCVER=${stdenv.cc.cc.version}" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ "-sOSVER=26" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-sOSVER=1013" + "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib" + ]; + + CCFLAGS = + # The file contrib/optimizations/slide_hash_neon.h is missing from the + # upstream distribution. It comes from the Android/Chromium sources. + lib.optionals stdenv.hostPlatform.isAarch64 [ "-I${androidZlibContrib}" ]; + + "C++FLAGS" = + # Avoid a compilation error that only occurs for 4-byte longs. + lib.optionals stdenv.hostPlatform.isi686 [ "-Wno-narrowing" ] + # See the "Header dependency changes" section of + # https://www.gnu.org/software/gcc/gcc-11/porting_to.html for more + # information on why we need to include these. + ++ + lib.optionals + (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0.0")) + [ + "-include" + "limits" + "-include" + "thread" + ]; + + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + export MACOSX_SDK=$SDKROOT + ''; + + buildPhase = '' + runHook preBuild + jam $jamFlags -j$NIX_BUILD_CORES p4 + jam $jamFlags -j$NIX_BUILD_CORES -sPRODUCTION=yes p4api.tar + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $bin/bin $dev $out + cp bin.unix/p4 $bin/bin + cp -r bin.unix/p4api-*/include $dev + cp -r bin.unix/p4api-*/lib $out + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "p4 -V"; + }; + + meta = with lib; { + description = "Perforce Helix Core command-line client and APIs"; + homepage = "https://www.perforce.com"; + license = licenses.bsd2; + mainProgram = "p4"; + platforms = platforms.unix; + maintainers = with maintainers; [ + corngood + impl + ]; + }; +}) diff --git a/pkgs/by-name/pa/pacemaker/package.nix b/pkgs/by-name/pa/pacemaker/package.nix index c8c7d26648a0..7f8133a537e5 100644 --- a/pkgs/by-name/pa/pacemaker/package.nix +++ b/pkgs/by-name/pa/pacemaker/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "pacemaker"; - version = "2.1.9"; + version = "3.0.0"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = "pacemaker"; rev = "Pacemaker-${version}"; - sha256 = "sha256-L/LQS5XLps0pqTfMAh1ZiR00SVltrNxMl6DXQhXBw1Q="; + sha256 = "sha256-2Uj81hWNig30baS9a9Uc0+T1lZuADtcSDmn/TX5koL8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/paco/package.nix b/pkgs/by-name/pa/paco/package.nix deleted file mode 100644 index 1aee35c2e486..000000000000 --- a/pkgs/by-name/pa/paco/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - fetchpatch, -}: - -buildGoModule rec { - pname = "paco"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "pacolang"; - repo = "paco"; - rev = "v${version}"; - hash = "sha256-sCU7cjmsUTrhf/7Lm3wBPKwk80SAhCfc4lrCBggspw8="; - }; - - vendorHash = "sha256-J0TKp1df5IWq3Irlzf1lvhWlXnP//MsVqs9M8TtEraw="; - - patches = [ - # Set correct package path in go.mod - (fetchpatch { - url = "https://github.com/pacolang/paco/pull/1/commits/886f0407e94418d34c7e062c6857834aea3c99ac.patch"; - hash = "sha256-HRNJSyWz1OY+kCV+eaRJbaDXkH4n1NaMpFxCuEhocK4="; - }) - ]; - - subPackages = [ "." ]; - - ldflags = [ - "-s" - "-w" - ]; - - meta = with lib; { - description = "Simple compiled programming language"; - mainProgram = "paco"; - homepage = "https://github.com/pacolang/paco"; - license = licenses.mit; - maintainers = with maintainers; [ hugolgst ]; - }; -} diff --git a/pkgs/by-name/pa/pacparser/fix-invalid-pointer-type.patch b/pkgs/by-name/pa/pacparser/fix-invalid-pointer-type.patch new file mode 100644 index 000000000000..936de11a2aba --- /dev/null +++ b/pkgs/by-name/pa/pacparser/fix-invalid-pointer-type.patch @@ -0,0 +1,11 @@ +--- a/src/spidermonkey/js/src/jsapi.c ++++ b/src/spidermonkey/js/src/jsapi.c +@@ -93,7 +93,7 @@ + #ifdef HAVE_VA_LIST_AS_ARRAY + #define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(ap)) + #else +-#define JS_ADDRESSOF_VA_LIST(ap) (&(ap)) ++#define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(&(ap))) + #endif + + #if defined(JS_PARANOID_REQUEST) && defined(JS_THREADSAFE) \ No newline at end of file diff --git a/pkgs/by-name/pa/pacparser/package.nix b/pkgs/by-name/pa/pacparser/package.nix index b3230107a1ac..378a81b02dcf 100644 --- a/pkgs/by-name/pa/pacparser/package.nix +++ b/pkgs/by-name/pa/pacparser/package.nix @@ -4,22 +4,31 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pacparser"; version = "1.4.5"; src = fetchFromGitHub { owner = "manugarg"; repo = "pacparser"; - rev = "v${version}"; - sha256 = "sha256-X842+xPjM404aQJTc2JwqU4vq8kgyKhpnqVu70pNLks="; + rev = "v${finalAttrs.version}"; + hash = "sha256-X842+xPjM404aQJTc2JwqU4vq8kgyKhpnqVu70pNLks="; }; + patches = [ + # jsapi.c:96:35: error: passing argument 5 of 'TryArgumentFormatter' from incompatible pointer type [] + # 96 | #define JS_ADDRESSOF_VA_LIST(ap) (&(ap)) + # suggested by https://github.com/manugarg/pacparser/issues/194#issuecomment-2262030966 + ./fix-invalid-pointer-type.patch + ]; + makeFlags = [ "NO_INTERNET=1" "PREFIX=${placeholder "out"}" ]; + enableParallelBuilding = true; + preConfigure = '' patchShebangs tests/runtests.sh cd src @@ -35,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ abbradar ]; mainProgram = "pactester"; }; -} +}) diff --git a/pkgs/by-name/pa/pactorio/package.nix b/pkgs/by-name/pa/pactorio/package.nix new file mode 100644 index 000000000000..bbced1b8b592 --- /dev/null +++ b/pkgs/by-name/pa/pactorio/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + pkg-config, + bzip2, +}: + +rustPlatform.buildRustPackage rec { + pname = "pactorio"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "figsoda"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-3+irejeDltf7x+gyJxWBgvPgpQx5uU3DewU23Z4Nr/A="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-1rqYp9OZ7hkZhrU813uBQAOZNdQ3j+OQdM6ia+t5cOc="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = [ bzip2 ]; + + postInstall = '' + installManPage artifacts/pactorio.1 + installShellCompletion artifacts/pactorio.{bash,fish} --zsh artifacts/_pactorio + ''; + + GEN_ARTIFACTS = "artifacts"; + + meta = with lib; { + description = "Mod packager for factorio"; + mainProgram = "pactorio"; + homepage = "https://github.com/figsoda/pactorio"; + changelog = "https://github.com/figsoda/pactorio/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/by-name/pa/paho-mqtt-cpp/package.nix b/pkgs/by-name/pa/paho-mqtt-cpp/package.nix index 6373f3e54164..2d0981a47593 100644 --- a/pkgs/by-name/pa/paho-mqtt-cpp/package.nix +++ b/pkgs/by-name/pa/paho-mqtt-cpp/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "paho.mqtt.cpp"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.cpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-3fUqtYFerjEmwn68rNvDeqGU+gly6fkWOyBPikhoFNg="; + hash = "sha256-vwfWcJqAWY4Em4MxZVcvOi6pzXAYYlOrKh6peMtjcXo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/pa/palp/package.nix b/pkgs/by-name/pa/palp/package.nix index d365d11c0158..7e1e3db79760 100644 --- a/pkgs/by-name/pa/palp/package.nix +++ b/pkgs/by-name/pa/palp/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { # version was released that pointed to gplv2 however, so thats probably # the right license. license = licenses.gpl2; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/pa/pam_gnupg/package.nix b/pkgs/by-name/pa/pam_gnupg/package.nix index ff5546320ec2..96b0491d3ef3 100644 --- a/pkgs/by-name/pa/pam_gnupg/package.nix +++ b/pkgs/by-name/pa/pam_gnupg/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/cruegge/pam-gnupg"; license = licenses.gpl3; - maintainers = with maintainers; [ mtreca ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/pa/pam_rssh/package.nix b/pkgs/by-name/pa/pam_rssh/package.nix index a3168a587419..cc95d3acc04a 100644 --- a/pkgs/by-name/pa/pam_rssh/package.nix +++ b/pkgs/by-name/pa/pam_rssh/package.nix @@ -40,9 +40,11 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # Fails because it tries finding authorized_keys in /home/$USER. "--skip=tests::parse_user_authorized_keys" + # Skip unsupported DSA keys since OpenSSH v10. + "--skip=sign_verify::test_dsa_sign_verify" ]; - nativeCheckInputs = [ (openssh.override { dsaKeysSupport = true; }) ]; + nativeCheckInputs = [ openssh ]; env.USER = "nixbld"; @@ -55,7 +57,6 @@ rustPlatform.buildRustPackage rec { ssh-keygen -q -N "" -t ecdsa -b 256 -f $HOME/.ssh/id_ecdsa256 ssh-keygen -q -N "" -t ed25519 -f $HOME/.ssh/id_ed25519 ssh-keygen -q -N "" -t rsa -f $HOME/.ssh/id_rsa - ssh-keygen -q -N "" -t dsa -f $HOME/.ssh/id_dsa export SSH_AUTH_SOCK=$HOME/ssh-agent.sock eval $(ssh-agent -a $SSH_AUTH_SOCK) ssh-add $HOME/.ssh/id_ecdsa521 @@ -63,7 +64,6 @@ rustPlatform.buildRustPackage rec { ssh-add $HOME/.ssh/id_ecdsa256 ssh-add $HOME/.ssh/id_ed25519 ssh-add $HOME/.ssh/id_rsa - ssh-add $HOME/.ssh/id_dsa ''; meta = with lib; { diff --git a/pkgs/by-name/pa/pam_u2f/package.nix b/pkgs/by-name/pa/pam_u2f/package.nix index f3cf5168e67a..772fff0f4183 100644 --- a/pkgs/by-name/pa/pam_u2f/package.nix +++ b/pkgs/by-name/pa/pam_u2f/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "pam_u2f"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz"; - hash = "sha256-OL59GJcnHLP+45HSODs1r8EmrUMakanebpkQjBLMlJA="; + hash = "sha256-pZknzqOOqNkaaDagTiD8Yp7d5CBLFggvcD9ts3jpxjQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pa/pamix/package.nix b/pkgs/by-name/pa/pamix/package.nix index 251a21337621..cdcb4a9390e1 100644 --- a/pkgs/by-name/pa/pamix/package.nix +++ b/pkgs/by-name/pa/pamix/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/patroclos/PAmix/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ericsagnes ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "pamix"; }; }) diff --git a/pkgs/by-name/pa/pan/package.nix b/pkgs/by-name/pa/pan/package.nix index f6f84067dcc3..401426f34205 100644 --- a/pkgs/by-name/pa/pan/package.nix +++ b/pkgs/by-name/pa/pan/package.nix @@ -1,12 +1,11 @@ { - spellChecking ? true, lib, stdenv, fetchFromGitLab, - autoreconfHook, + cmake, pkg-config, gtk3, - gtkspell3, + gspell, gmime3, gettext, intltool, @@ -14,33 +13,34 @@ libxml2, libnotify, gnutls, - makeWrapper, + wrapGAppsHook3, gnupg, + spellChecking ? true, gnomeSupport ? true, libsecret, gcr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pan"; - version = "0.158"; + version = "0.162"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "pan"; - rev = "v${version}"; - hash = "sha256-gcs3TsUzZAW8PhNPMzyOfwu+2SNynjRgfxdGIfAHrpA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-YXZA0WguDAV/CCqjdkNWB2bnkBwDN7AfWtaSaJ1ztmM="; }; nativeBuildInputs = [ - autoreconfHook + cmake pkg-config gettext intltool itstool libxml2 - makeWrapper + wrapGAppsHook3 ]; buildInputs = @@ -50,37 +50,37 @@ stdenv.mkDerivation rec { libnotify gnutls ] - ++ lib.optional spellChecking gtkspell3 + ++ lib.optionals spellChecking [ gspell ] ++ lib.optionals gnomeSupport [ libsecret gcr ]; - configureFlags = - [ - "--with-dbus" - "--with-gtk3" - "--with-gnutls" - "--enable-libnotify" - ] - ++ lib.optional spellChecking "--with-gtkspell" - ++ lib.optional gnomeSupport "--enable-gkr"; + cmakeFlags = [ + (lib.cmakeBool "WANT_GSPELL" spellChecking) + (lib.cmakeBool "WANT_GKR" gnomeSupport) + (lib.cmakeBool "ENABLE_MANUAL" true) + (lib.cmakeBool "WANT_GMIME_CRYPTO" true) + (lib.cmakeBool "WANT_WEBKIT" false) # We don't have webkitgtk_3_0 + (lib.cmakeBool "WANT_NOTIFY" true) + ]; - postInstall = '' - wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnupg ]}) ''; - enableParallelBuilding = true; - - meta = with lib; { + meta = { description = "GTK-based Usenet newsreader good at both text and binaries"; mainProgram = "pan"; - homepage = "http://pan.rebelbase.com/"; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; - license = with licenses; [ + homepage = "http://pan.rebelbase.com"; + maintainers = with lib.maintainers; [ + aleksana + emaryn + ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ gpl2Only fdl11Only ]; }; -} +}) diff --git a/pkgs/by-name/pa/panamax/package.nix b/pkgs/by-name/pa/panamax/package.nix index 7834c46fc2e7..c8c579a074d7 100644 --- a/pkgs/by-name/pa/panamax/package.nix +++ b/pkgs/by-name/pa/panamax/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,16 +22,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; meta = with lib; { description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage"; diff --git a/pkgs/by-name/pa/pandoc/package.nix b/pkgs/by-name/pa/pandoc/package.nix index 422ebdbbf695..3fd7ed8e9150 100644 --- a/pkgs/by-name/pa/pandoc/package.nix +++ b/pkgs/by-name/pa/pandoc/package.nix @@ -41,9 +41,6 @@ in remove-references-to \ -t ${pandoc-cli.scope.pandoc} \ $out/bin/pandoc - '' - # https://github.com/jgm/typst-hs/commit/9707b74ce60d71c2ba0f35249ffbd01dea197a6e - + lib.optionalString (lib.versionAtLeast pandoc-cli.scope.typst.version "0.6.1") '' remove-references-to \ -t ${pandoc-cli.scope.typst} \ $out/bin/pandoc diff --git a/pkgs/by-name/pa/pangolin/package.nix b/pkgs/by-name/pa/pangolin/package.nix new file mode 100644 index 000000000000..30cbbedeb70c --- /dev/null +++ b/pkgs/by-name/pa/pangolin/package.nix @@ -0,0 +1,68 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + libGL, + glew, + xorg, + ffmpeg, + libjpeg, + libpng, + libtiff, + eigen, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pangolin"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "stevenlovegrove"; + repo = "Pangolin"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-B5YuNcJZHjR3dlVs66rySi68j29O3iMtlQvCjTUZBeY="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + doxygen + ]; + + buildInputs = [ + libGL + glew + xorg.libX11 + ffmpeg + libjpeg + libpng + libtiff.out + eigen + ]; + + # The tests use cmake's findPackage to find the installed version of + # pangolin, which isn't what we want (or available). + doCheck = false; + cmakeFlags = [ (lib.cmakeBool "BUILD_TESTS" false) ]; + + meta = { + description = "Lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input"; + longDescription = '' + Pangolin is a lightweight portable rapid development library for managing + OpenGL display / interaction and abstracting video input. At its heart is + a simple OpenGl viewport manager which can help to modularise 3D + visualisation without adding to its complexity, and offers an advanced + but intuitive 3D navigation handler. Pangolin also provides a mechanism + for manipulating program variables through config files and ui + integration, and has a flexible real-time plotter for visualising + graphical data. + ''; + homepage = "https://github.com/stevenlovegrove/Pangolin"; + license = lib.licenses.mit; + maintainers = [ ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/pa/panoply/package.nix b/pkgs/by-name/pa/panoply/package.nix index 3211cd95e2e8..03078eb621c0 100644 --- a/pkgs/by-name/pa/panoply/package.nix +++ b/pkgs/by-name/pa/panoply/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.6.0"; + version = "5.6.1"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - hash = "sha256-DEcD8ol1DaGMej5/TGHz7Otj/V2bXkP8uqK992FeqqY="; + hash = "sha256-r3hKlBRpZe9HJws24cqoiiQmFlH6Abn++w5yEudgKfI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pa/panotools/package.nix b/pkgs/by-name/pa/panotools/package.nix index 1616159e31c1..f9af218e70ed 100644 --- a/pkgs/by-name/pa/panotools/package.nix +++ b/pkgs/by-name/pa/panotools/package.nix @@ -7,7 +7,6 @@ libpng, libtiff, perl, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -26,15 +25,11 @@ stdenv.mkDerivation (finalAttrs: { perl ]; - buildInputs = - [ - libjpeg - libpng - libtiff - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Carbon - ]; + buildInputs = [ + libjpeg + libpng + libtiff + ]; meta = { description = "Free software suite for authoring and displaying virtual reality panoramas"; diff --git a/pkgs/by-name/pa/pantheon-tweaks/package.nix b/pkgs/by-name/pa/pantheon-tweaks/package.nix index a25da6a1f4af..e90b3365cadc 100644 --- a/pkgs/by-name/pa/pantheon-tweaks/package.nix +++ b/pkgs/by-name/pa/pantheon-tweaks/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "pantheon-tweaks"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "pantheon-tweaks"; repo = pname; rev = version; - hash = "sha256-5RsNVUQ8FJmtdI7Z2le+qt9b13zHlQxiyTaUY15wSkw="; + hash = "sha256-+dkjmeY4WJfXwgNR8HlRaVfvS/2icbi8eSAkiB9x7uI="; }; nativeBuildInputs = [ @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { elementary-terminal # io.elementary.terminal.settings granite7 switchboard + wingpanel-indicator-sound # io.elementary.desktop.wingpanel.sound ]); mesonFlags = [ @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pantheon-tweaks/pantheon-tweaks"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; mainProgram = "pantheon-tweaks"; }; } diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix index c1a59f48b72d..f68b73b20237 100644 --- a/pkgs/by-name/pa/paper-age/package.nix +++ b/pkgs/by-name/pa/paper-age/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/matiaskorhonen/paper-age"; changelog = "https://github.com/matiaskorhonen/paper-age/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = [ ]; mainProgram = "paper-age"; }; } diff --git a/pkgs/by-name/pa/paper-clip/package.nix b/pkgs/by-name/pa/paper-clip/package.nix index e73043672ab0..683580dd0817 100644 --- a/pkgs/by-name/pa/paper-clip/package.nix +++ b/pkgs/by-name/pa/paper-clip/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Diego-Ivan/Paper-Clip"; license = lib.licenses.gpl3Plus; mainProgram = "pdf-metadata-editor"; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/pa/paper-plane/package.nix b/pkgs/by-name/pa/paper-plane/package.nix index b2f852a4709a..065a5354c571 100644 --- a/pkgs/by-name/pa/paper-plane/package.nix +++ b/pkgs/by-name/pa/paper-plane/package.nix @@ -17,7 +17,6 @@ libxml2, libshumate, gst_all_1, - darwin, buildPackages, }: @@ -90,20 +89,16 @@ stdenv.mkDerivation { libxml2.bin ]; - buildInputs = - [ - libshumate - libadwaita-paperplane - tdlib-paperplane - rlottie-paperplane - gst_all_1.gstreamer - gst_all_1.gst-libav - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libshumate + libadwaita-paperplane + tdlib-paperplane + rlottie-paperplane + gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ]; mesonFlags = [ # The API ID and hash provided here are for use with Paper Plane only. diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 969e9c651d71..4ca8929f10be 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -2,14 +2,12 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, - buildNpmPackage, + node-gyp, nodejs_20, nixosTests, gettext, python3, giflib, - darwin, ghostscript_headless, imagemagickBig, jbig2enc, @@ -18,6 +16,7 @@ qpdf, tesseract5, unpaper, + pnpm, poppler-utils, liberation_ttf, xcbuild, @@ -27,49 +26,22 @@ xorg, }: let - version = "2.14.7"; + version = "2.16.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-p3eUEb/ZPK11NbqE4LU+3TE1Xny9sjfYvVVmABkoAEQ="; + hash = "sha256-wdcwSWaixNceVqrCXStf+0jnWbigd3k5FXRF0o2UbW0="; }; - patches = [ - # Fix frontend tests in March (yes, it's date dependent) - (fetchpatch { - url = "https://github.com/paperless-ngx/paperless-ngx/commit/bc90ccc5551f184a683128def772652ad74c65e3.patch"; - hash = "sha256-KArPyKZLi5LfaTDTY3DxA3cdQYYadpQo052Xk9eH14c="; - }) - ]; - - # subpath installation is broken with uvicorn >= 0.26 - # https://github.com/NixOS/nixpkgs/issues/298719 - # https://github.com/paperless-ngx/paperless-ngx/issues/5494 python = python3.override { self = python; packageOverrides = final: prev: { django = prev.django_5; - django-extensions = prev.django-extensions.overridePythonAttrs (_: { - # fails with: TypeError: 'class Meta' got invalid attribute(s): index_together - # probably because of django_5 but it is the latest version available and used like that in paperless-ngx - doCheck = false; - }); - # tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; }; - - uvicorn = prev.uvicorn.overridePythonAttrs (_: { - version = "0.25.0"; - src = fetchFromGitHub { - owner = "encode"; - repo = "uvicorn"; - rev = "0.25.0"; - hash = "sha256-ng98DTw49zyFjrPnEwfnPfONyjKKZYuLl0qduxSppYk="; - }; - }); }; }; @@ -85,73 +57,90 @@ let poppler-utils ]; - frontend = buildNpmPackage { - pname = "paperless-ngx-frontend"; - inherit version src patches; + frontend = + let + frontendSrc = src + "/src-ui"; + in + stdenv.mkDerivation rec { + pname = "paperless-ngx-frontend"; + inherit version; - nodejs = nodejs_20; # does not build with 22 + src = frontendSrc; - postPatch = '' - cd src-ui - ''; + pnpmDeps = pnpm.fetchDeps { + inherit pname version src; + hash = "sha256-tSBpZ+1aPLUI0SKpOyKo+OLsJZiyDCxRb+5hKMPrxL8="; + }; - npmDepsHash = "sha256-hK7Soop9gBZP4m2UzbEIAsLkPKpbQkLmVruY2So4CSs="; + nativeBuildInputs = + [ + node-gyp + nodejs_20 + pkg-config + pnpm.configHook + python3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + xcbuild + ]; - nativeBuildInputs = - [ - pkg-config - python3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - xcbuild - ]; + buildInputs = + [ + pango + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + giflib + ]; - buildInputs = - [ - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - giflib - darwin.apple_sdk.frameworks.CoreText - ]; + CYPRESS_INSTALL_BINARY = "0"; + NG_CLI_ANALYTICS = "false"; - CYPRESS_INSTALL_BINARY = "0"; - NG_CLI_ANALYTICS = "false"; + buildPhase = '' + runHook preBuild - npmBuildFlags = [ - "--" - "--configuration" - "production" - ]; + pushd node_modules/canvas + node-gyp rebuild + popd - doCheck = true; - checkPhase = '' - runHook preCheck - npm run test - runHook postCheck - ''; + pnpm run build --configuration production - installPhase = '' - runHook preInstall - mkdir -p $out/lib/paperless-ui - mv ../src/documents/static/frontend $out/lib/paperless-ui/ - runHook postInstall - ''; - }; + runHook postBuild + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + + pnpm run test + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/paperless-ui + mv ../src/documents/static/frontend $out/lib/paperless-ui/ + + runHook postInstall + ''; + }; in python.pkgs.buildPythonApplication rec { pname = "paperless-ngx"; - pyproject = false; + pyproject = true; - inherit version src patches; + inherit version src; postPatch = '' # pytest-xdist with to many threads makes the tests flaky if (( $NIX_BUILD_CORES > 4)); then NIX_BUILD_CORES=4 fi - substituteInPlace src/setup.cfg \ - --replace-fail "--numprocesses auto --maxprocesses=16" "--numprocesses $NIX_BUILD_CORES" + substituteInPlace pyproject.toml \ + --replace-fail '"--numprocesses=auto",' "" \ + --replace-fail '--maxprocesses=16' "--numprocesses=$NIX_BUILD_CORES" \ + --replace-fail "djangorestframework-guardian~=0.3.0" "djangorestframework-guardian2" ''; nativeBuildInputs = [ @@ -159,6 +148,10 @@ python.pkgs.buildPythonApplication rec { xorg.lndir ]; + pythonRelaxDeps = [ + "django-allauth" + ]; + dependencies = with python.pkgs; [ @@ -180,11 +173,13 @@ python.pkgs.buildPythonApplication rec { django-soft-delete djangorestframework djangorestframework-guardian2 + drf-spectacular + drf-spectacular-sidecar drf-writable-nested filelock flower gotenberg-client - gunicorn + granian httpx-oauth imap-tools inotifyrecursive @@ -208,16 +203,14 @@ python.pkgs.buildPythonApplication rec { setproctitle tika-client tqdm - uvicorn watchdog whitenoise - whoosh + whoosh-reloaded zxing-cpp ] ++ django-allauth.optional-dependencies.mfa ++ django-allauth.optional-dependencies.socialaccount - ++ redis.optional-dependencies.hiredis - ++ uvicorn.optional-dependencies.standard; + ++ redis.optional-dependencies.hiredis; postBuild = '' # Compile manually because `pythonRecompileBytecodeHook` only works @@ -239,7 +232,7 @@ python.pkgs.buildPythonApplication rec { runHook preInstall mkdir -p $out/lib/paperless-ngx/static/frontend - cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx + cp -r {src,static,LICENSE} $out/lib/paperless-ngx lndir -silent ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/frontend chmod +x $out/lib/paperless-ngx/src/manage.py makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ @@ -312,21 +305,21 @@ python.pkgs.buildPythonApplication rec { tesseract5 ; nltkData = with nltk-data; [ - punkt_tab - snowball_data + punkt-tab + snowball-data stopwords ]; tests = { inherit (nixosTests) paperless; }; }; - meta = with lib; { + meta = { description = "Tool to scan, index, and archive all of your physical documents"; homepage = "https://docs.paperless-ngx.com/"; - changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}"; - license = licenses.gpl3Only; - platforms = platforms.unix; + changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/${src.tag}"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; mainProgram = "paperless-ngx"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ leona SuperSandro2000 erikarvstedt diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index dfd126181208..afa12ce2a4d5 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -15,9 +15,7 @@ itstool, poppler, nautilus, - darwin, djvulibre, - libspectre, libarchive, libsecret, wrapGAppsHook4, @@ -27,7 +25,8 @@ gsettings-desktop-schemas, dbus, gi-docgen, - libgxps, + libsysprof-capture, + libspelling, withLibsecret ? true, supportNautilus ? (!stdenv.hostPlatform.isDarwin), libadwaita, @@ -38,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "papers"; - version = "47.3"; + version = "48.2"; outputs = [ "out" @@ -48,19 +47,16 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz"; - hash = "sha256-PlhTk+gef6D5r55U38hvYSa1w9hS6pDf3DumsHlSxKo="; + hash = "sha256-HpvFlhNCS/ZVIjxr3Khzri8d2ifPAtc0K/9bVZBRYG0="; }; - cargoRoot = "shell-rs"; - cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src pname version - cargoRoot ; - hash = "sha256-66pOdZxgzbvXkvF07rNvWtcF/dJ2+RuS24IeI/VWykE="; + hash = "sha256-1HFecOTn84m9lT166HlmYjqP+KN/ZOTWW4ztigrpqNQ="; }; nativeBuildInputs = [ @@ -89,9 +85,9 @@ stdenv.mkDerivation (finalAttrs: { gsettings-desktop-schemas libadwaita libarchive - libgxps librsvg - libspectre + libsysprof-capture + libspelling pango poppler ] @@ -100,16 +96,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals supportNautilus [ nautilus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation ]; mesonFlags = - [ - "-Dps=enabled" - ] - ++ lib.optionals (!withLibsecret) [ + lib.optionals (!withLibsecret) [ "-Dkeyring=disabled" ] ++ lib.optionals (!supportNautilus) [ @@ -151,6 +141,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; platforms = platforms.unix; mainProgram = "papers"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; }) diff --git a/pkgs/by-name/pa/papi/package.nix b/pkgs/by-name/pa/papi/package.nix index 1c4cf77e8427..4ced6c351e74 100644 --- a/pkgs/by-name/pa/papi/package.nix +++ b/pkgs/by-name/pa/papi/package.nix @@ -4,15 +4,13 @@ fetchurl, }: -stdenv.mkDerivation rec { - version = "7.0.1"; +stdenv.mkDerivation (finalAttrs: { + version = "7.1.0"; pname = "papi"; src = fetchurl { - url = "https://bitbucket.org/icl/papi/get/papi-${ - lib.replaceStrings [ "." ] [ "-" ] version - }-t.tar.gz"; - sha256 = "sha256-VajhmPW8sEJksfhLjBVlpBH7+AZr4fwKZPAtZxRF1Bk="; + url = "http://icl.utk.edu/projects/papi/downloads/papi-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-WBivttuj7OV/UeZYl9tQYvjjRk5u0pS2VOvzTDmRvE8="; }; setSourceRoot = '' @@ -32,4 +30,4 @@ stdenv.mkDerivation rec { zhaofengli ]; }; -} +}) diff --git a/pkgs/by-name/pa/pappl/package.nix b/pkgs/by-name/pa/pappl/package.nix index 5cd3ebad48cc..bd10878aca6f 100644 --- a/pkgs/by-name/pa/pappl/package.nix +++ b/pkgs/by-name/pa/pappl/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pappl"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "pappl"; tag = "v${version}"; - hash = "sha256-vp0DQvsQzuiXb5QAXVEcXNvyDJeRM99aO9/baZw9QwA="; + hash = "sha256-XHFYwl129iD5rKC1P/roFlX+03uFE8ofwQRIEkUuOCc="; }; outputs = [ diff --git a/pkgs/by-name/pa/paps/package.nix b/pkgs/by-name/pa/paps/package.nix index f99da48d4fb2..20d66b612011 100644 --- a/pkgs/by-name/pa/paps/package.nix +++ b/pkgs/by-name/pa/paps/package.nix @@ -2,42 +2,57 @@ lib, stdenv, fetchFromGitHub, - autoconf, - automake, + fetchpatch, + meson, + ninja, pkg-config, - intltool, + fmt, + glib, pango, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "paps"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "dov"; repo = "paps"; - rev = "v${version}"; - sha256 = "129wpm2ayxs6qfh2761d4x9c034ivb2bcmmcnl56qs4448qb9495"; + rev = "v${finalAttrs.version}"; + hash = "sha256-bNF/kZl/fGAT+He9kMHYj5ERhJwCJJABjhV3H+bs3D0="; }; + patches = [ + # remove when 0.8.1 is released + (fetchpatch { + url = "https://github.com/dov/paps/commit/e9270aaac5e0b8018a6fad9a562ee48e7b2c3113.patch"; + name = "fix-g_utf8_next_char-cast"; + hash = "sha256-fedkyjd8cGFUuUQCbGii7wfMCmK6vye/1/vHWuJiJI4="; + }) + ]; + nativeBuildInputs = [ - autoconf - automake + meson + ninja pkg-config - intltool ]; - buildInputs = [ pango ]; + buildInputs = [ + fmt + glib + pango + ]; - preConfigure = '' - ./autogen.sh - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; - meta = with lib; { + meta = { description = "Pango to PostScript converter"; homepage = "https://github.com/dov/paps"; - license = licenses.lgpl2; + license = lib.licenses.lgpl2; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "paps"; }; -} +}) diff --git a/pkgs/by-name/pa/par2cmdline-turbo/package.nix b/pkgs/by-name/pa/par2cmdline-turbo/package.nix index 202e87e2c7de..4ce994c9af35 100644 --- a/pkgs/by-name/pa/par2cmdline-turbo/package.nix +++ b/pkgs/by-name/pa/par2cmdline-turbo/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "par2cmdline-turbo"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "animetosho"; repo = "par2cmdline-turbo"; rev = "v${version}"; - hash = "sha256-GFMFqHiKoQByD8ZYgGm36ehfMP4CvC2F+u2Va20RSNI="; + hash = "sha256-ld0oTaf1IZ0U0KMF4sW7RdTmF0CNobxjwomTLQEhpIc="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix index 532e923e4e9d..36f49d6db14a 100644 --- a/pkgs/by-name/pa/paratest/package.nix +++ b/pkgs/by-name/pa/paratest/package.nix @@ -23,7 +23,7 @@ nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { @@ -32,6 +32,6 @@ homepage = "https://github.com/paratestphp/paratest"; license = lib.licenses.mit; mainProgram = "paratest"; - maintainers = lib.teams.php.members; + teams = [ lib.teams.php ]; }; }) diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix index 001611316e0f..ba47b0ea01e3 100644 --- a/pkgs/by-name/pa/parca-agent/package.nix +++ b/pkgs/by-name/pa/parca-agent/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "parca-agent"; - version = "0.36.0"; + version = "0.38.2"; src = fetchFromGitHub { owner = "parca-dev"; repo = "parca-agent"; tag = "v${version}"; - hash = "sha256-06TrG4cDf5RjwScIhX4zEjcx4zlFCjnWySpZHmaXT7E="; + hash = "sha256-6TjO5Fb6+zCrVz/Edq41H3tTbJLtYD1k/OKt01ms2dY="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-6PD2qd0Qeqb1yQiQcOw0nRX6lWjLsWcLDTlmbz0T5+k="; + vendorHash = "sha256-Qm5ezWjMTYrhulHS5ALs4yrCInhqsxRc9RvCh9vv3GE="; buildInputs = [ stdenv.cc.libc.static diff --git a/pkgs/by-name/pa/parca/package.nix b/pkgs/by-name/pa/parca/package.nix index 3c9758e81100..9f115f8dd184 100644 --- a/pkgs/by-name/pa/parca/package.nix +++ b/pkgs/by-name/pa/parca/package.nix @@ -8,13 +8,13 @@ stdenv, }: let - version = "0.22.0"; + version = "0.23.1"; parca-src = fetchFromGitHub { owner = "parca-dev"; repo = "parca"; tag = "v${version}"; - hash = "sha256-iuTlKUmugRum0qZRhuw0FR13iE2qrQegTgwpAvgJSXk="; + hash = "sha256-UCYBT+KegoXpMRMoA3iuX8WiXhkX43JVOmhHksH5Pwk="; }; ui = stdenv.mkDerivation (finalAttrs: { @@ -24,7 +24,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname src version; - hash = "sha256-MVNO24Oksy/qRUmEUoWoviQEo6Eimb18ZnDj5Z1vJkY="; + hash = "sha256-MByoIJtynv38TFNVDdZWjkJJpABCjJU2wBrChxM2rdE="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ buildGoModule rec { pname = "parca"; src = parca-src; - vendorHash = "sha256-fErrbi3iSJlkguqzL6nH+fzmjxhoYVl1qH7tqRR1F1A="; + vendorHash = "sha256-O7dzdMGZ1l+cmVA3svbh/Ig1SbXXiMwJ7TXmrT2IM+g="; ldflags = [ "-X=main.version=${version}" @@ -68,6 +68,11 @@ buildGoModule rec { cp -r ${ui}/share/parca/ui/* ui/packages/app/web/build ''; + passthru = { + inherit ui; + updateScript = ./update.sh; + }; + meta = { mainProgram = "parca"; description = "Continuous profiling for analysis of CPU and memory usage"; diff --git a/pkgs/by-name/pa/parca/update.sh b/pkgs/by-name/pa/parca/update.sh new file mode 100755 index 000000000000..a20292a935e0 --- /dev/null +++ b/pkgs/by-name/pa/parca/update.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq git pnpm_9 +# shellcheck shell=bash +set -euo pipefail +nixpkgs="$(pwd)" +cd $(readlink -e $(dirname "${BASH_SOURCE[0]}")) + +# Update the hash of the parca source code in the Nix expression. +update_parca_source() { + local version; version="$1" + echo "Updating parca source" + + old_version="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).parca.version" | jq -r)" + sed -i "s|${old_version}|${version}|g" package.nix + + old_hash="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).parca.src.outputHash" | jq -r)" + new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs/default.nix {}).parca.src; in (src.overrideAttrs or (f: src // f src)) (_: { outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true + + sed -i "s|${old_hash}|${new_hash}|g" package.nix +} + +# Update the hash of the parca ui pnpm dependencies in the Nix expression. +update_pnpm_deps_hash() { + echo "Updating parca ui pnpm deps hash" + + old_hash="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).parca.ui.pnpmDeps.outputHash" | jq -r)" + new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs/default.nix {}).parca.ui.pnpmDeps; in (src.overrideAttrs or (f: src // f src)) (_: { outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true + + sed -i "s|${old_hash}|${new_hash}|g" package.nix +} + +# Update the hash of the parca go dependencies in the Nix expression. +update_go_deps_hash() { + echo "Updating parca go deps hash" + + old_hash="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).parca.vendorHash" | jq -r)" + new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs/default.nix {}).parca; in (src.overrideAttrs { vendorHash = \"\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true + + sed -i "s|${old_hash}|${new_hash}|g" package.nix +} + +LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/parca-dev/parca/releases/latest | jq -r '.tag_name')" +LATEST_VERSION="$(expr "$LATEST_TAG" : 'v\(.*\)')" +CURRENT_VERSION="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).parca.version" | jq -r)" + +if [[ "$CURRENT_VERSION" == "$LATEST_VERSION" ]]; then + echo "parca is up to date: ${CURRENT_VERSION}" + exit 0 +fi + +update_parca_source "$LATEST_VERSION" +update_pnpm_deps_hash +update_go_deps_hash diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix index e6b5232d75cb..13a848fc5880 100644 --- a/pkgs/by-name/pa/paretosecurity/package.nix +++ b/pkgs/by-name/pa/paretosecurity/package.nix @@ -5,49 +5,73 @@ testers, paretosecurity, nixosTests, + pkg-config, + gtk3, + webkitgtk_4_1, }: -buildGoModule rec { +buildGoModule (finalAttrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + gtk3 + webkitgtk_4_1 + ]; pname = "paretosecurity"; - version = "0.0.96"; + version = "0.2.17"; src = fetchFromGitHub { owner = "ParetoSecurity"; repo = "agent"; - rev = version; - hash = "sha256-SyeIGSDvrnOvyOJ0zC8CulpaMa+iZeRaMTJUSydz2tw="; + rev = finalAttrs.version; + hash = "sha256-2Ev6LJWa+iPV7/Y/o9HrNf4vR4dbnIOim+qb4HdRXqU="; }; - vendorHash = "sha256-O/OF3Y6HiiikMxf657k9eIM7UfkicIImAUxVVf/TgR8="; + vendorHash = "sha256-YnyACP/hJYxi4AWMwr0We4YUTbWwahKAIYN6RnHmzls="; proxyVendor = true; + # Skip building the Windows installer + preBuild = '' + rm -rf cmd/paretosecurity-installer + ''; + ldflags = [ "-s" - "-X=github.com/ParetoSecurity/agent/shared.Version=${version}" - "-X=github.com/ParetoSecurity/agent/shared.Commit=${src.rev}" + "-X=github.com/ParetoSecurity/agent/shared.Version=${finalAttrs.version}" + "-X=github.com/ParetoSecurity/agent/shared.Commit=${finalAttrs.src.rev}" "-X=github.com/ParetoSecurity/agent/shared.Date=1970-01-01T00:00:00Z" ]; postInstall = '' # Install global systemd files - install -Dm400 ${src}/apt/paretosecurity.socket $out/lib/systemd/system/paretosecurity.socket - install -Dm400 ${src}/apt/paretosecurity.service $out/lib/systemd/system/paretosecurity.service + install -Dm400 ${finalAttrs.src}/apt/paretosecurity.socket $out/lib/systemd/system/paretosecurity.socket + install -Dm400 ${finalAttrs.src}/apt/paretosecurity.service $out/lib/systemd/system/paretosecurity.service substituteInPlace $out/lib/systemd/system/paretosecurity.service \ --replace-fail "/usr/bin/paretosecurity" "$out/bin/paretosecurity" # Install user systemd files - install -Dm444 ${src}/apt/paretosecurity-user.timer $out/lib/systemd/user/paretosecurity-user.timer - install -Dm444 ${src}/apt/paretosecurity-user.service $out/lib/systemd/user/paretosecurity-user.service + install -Dm444 ${finalAttrs.src}/apt/paretosecurity-user.timer $out/lib/systemd/user/paretosecurity-user.timer + install -Dm444 ${finalAttrs.src}/apt/paretosecurity-user.service $out/lib/systemd/user/paretosecurity-user.service substituteInPlace $out/lib/systemd/user/paretosecurity-user.service \ --replace-fail "/usr/bin/paretosecurity" "$out/bin/paretosecurity" - install -Dm444 ${src}/apt/paretosecurity-trayicon.service $out/lib/systemd/user/paretosecurity-trayicon.service + install -Dm444 ${finalAttrs.src}/apt/paretosecurity-trayicon.service $out/lib/systemd/user/paretosecurity-trayicon.service substituteInPlace $out/lib/systemd/user/paretosecurity-trayicon.service \ --replace-fail "/usr/bin/paretosecurity" "$out/bin/paretosecurity" + + # Install .desktop files + install -Dm444 ${finalAttrs.src}/apt/ParetoSecurity.desktop $out/share/applications/ParetoSecurity.desktop + substituteInPlace $out/share/applications/ParetoSecurity.desktop \ + --replace-fail "/usr/bin/paretosecurity" "$out/bin/paretosecurity" + install -Dm444 ${finalAttrs.src}/apt/ParetoSecurityLink.desktop $out/share/applications/ParetoSecurityLink.desktop + substituteInPlace $out/share/applications/ParetoSecurityLink.desktop \ + --replace-fail "/usr/bin/paretosecurity" "$out/bin/paretosecurity" + + # Install icon + install -Dm444 ${finalAttrs.src}/assets/icon.png $out/share/icons/hicolor/512x512/apps/ParetoSecurity.png ''; passthru.tests = { version = testers.testVersion { - version = "${version}"; + inherit (finalAttrs) version; package = paretosecurity; }; integration_test = nixosTests.paretosecurity; @@ -66,10 +90,11 @@ buildGoModule rec { root helper that allows you to run the checker in userspace. Some checks require root permissions, and the checker asks the helper to run those. - Additionally, if you enable `services.paretosecurity.trayIcon`, you get a - little Vilfredo Pareto living in your systray showing your the current - status of checks. This will also enable a systemd timer to update the - status of checks once per hour. + Additionally, using the NixOS module gets you a little Vilfredo Pareto + living in your systray showing your the current status of checks. The + NixOS Module also installs a systemd timer to update the status of checks + once per hour. If you want to use just the CLI mode, set + `services.paretosecurity.trayIcon` to `false`. Finally, you can run `paretosecurity link` to configure the agent to send the status of checks to https://dash.paretosecurity.com to make @@ -80,4 +105,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ zupo ]; mainProgram = "paretosecurity"; }; -} +}) diff --git a/pkgs/by-name/pa/pari-galdata/package.nix b/pkgs/by-name/pa/pari-galdata/package.nix index 9a2e0acb332a..d3ec40d1ce58 100644 --- a/pkgs/by-name/pa/pari-galdata/package.nix +++ b/pkgs/by-name/pa/pari-galdata/package.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = teams.sage.members; + teams = [ teams.sage ]; }; } diff --git a/pkgs/by-name/pa/pari-seadata-small/package.nix b/pkgs/by-name/pa/pari-seadata-small/package.nix index 5056d6992124..80890dcb81f6 100644 --- a/pkgs/by-name/pa/pari-seadata-small/package.nix +++ b/pkgs/by-name/pa/pari-seadata-small/package.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = teams.sage.members; + teams = [ teams.sage ]; }; } diff --git a/pkgs/by-name/pa/parrot/package.nix b/pkgs/by-name/pa/parrot/package.nix new file mode 100644 index 000000000000..1d8c4e5ae0e6 --- /dev/null +++ b/pkgs/by-name/pa/parrot/package.nix @@ -0,0 +1,60 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + cmake, + ffmpeg, + libopus, + makeBinaryWrapper, + unstableGitUpdater, + openssl, + pkg-config, + yt-dlp, +}: +rustPlatform.buildRustPackage { + pname = "parrot"; + version = "1.6.0-unstable-2024-07-12"; + + src = fetchFromGitHub { + owner = "aquelemiguel"; + repo = "parrot"; + rev = "a6c1e88a1e360d46a91bc536985db87af72245b3"; + hash = "sha256-to1SVLzw2l06cqsVOopk9KH2UyGgJ4CwWagHxaDrf4Y="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-be/gGKCd8/VgcjzhyMKDl5TzAuavm1rPNYBm8RLTP90="; + + nativeBuildInputs = [ + cmake + makeBinaryWrapper + pkg-config + ]; + + buildInputs = [ + libopus + openssl + ]; + + postInstall = '' + wrapProgram $out/bin/parrot \ + --prefix PATH : ${ + lib.makeBinPath [ + ffmpeg + yt-dlp + ] + } + ''; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; + + meta = { + description = "Hassle-free Discord music bot"; + homepage = "https://github.com/aquelemiguel/parrot"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gerg-l ]; + mainProgram = "parrot"; + }; +} diff --git a/pkgs/by-name/pa/parseable/package.nix b/pkgs/by-name/pa/parseable/package.nix index 0cb6e5fccf5c..ab2f9187c8d0 100644 --- a/pkgs/by-name/pa/parseable/package.nix +++ b/pkgs/by-name/pa/parseable/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "parseable"; - version = "1.7.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "parseablehq"; repo = "parseable"; tag = "v${version}"; - hash = "sha256-arRaib5jzU2mtSJI70UphVqPN+hOGoag++jopgx/zCw="; + hash = "sha256-oMDFi5cBcghxzwmmR/Gg50PcYCb6HaxDqWA8vVyw30Y="; }; LOCAL_ASSETS_PATH = fetchzip { @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; - cargoHash = "sha256-j+v3lf3x3eW1PAjYdPHfma6PnUsb4m6ZBRj+5jdPxCs="; + cargoHash = "sha256-kVLUSu+9jW3M0YosmpZWDIKCj7GilZZibMMtufHPdfM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pa/particle-cli/package.nix b/pkgs/by-name/pa/particle-cli/package.nix new file mode 100644 index 000000000000..451c9ee5f419 --- /dev/null +++ b/pkgs/by-name/pa/particle-cli/package.nix @@ -0,0 +1,47 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + udev, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "particle-cli"; + version = "3.35.10"; + + src = fetchFromGitHub { + owner = "particle-iot"; + repo = "particle-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-u1QiV8KNG5tRrSqKkoSljCvaGw5rExSVC71IQaC5hPI="; + }; + + npmDepsHash = "sha256-QIyq/hmZFjt2mpH61ZaCTPve8QvDTSm2Ijwa5thrKkM="; + + buildInputs = [ + udev + ]; + + dontNpmBuild = true; + dontNpmPrune = true; + + postPatch = '' + ln -s npm-shrinkwrap.json package-lock.json + ''; + + postInstall = '' + install -D -t $out/etc/udev/rules.d \ + $out/lib/node_modules/particle-cli/assets/50-particle.rules + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command Line Interface for Particle Cloud and devices"; + homepage = "https://github.com/particle-iot/particle-cli"; + maintainers = with lib.maintainers; [ jess ]; + mainProgram = "particle"; + license = lib.licenses.asl20; + }; +}) diff --git a/pkgs/by-name/pa/partio/package.nix b/pkgs/by-name/pa/partio/package.nix index 771169e90c28..9c2cc4c91f7e 100644 --- a/pkgs/by-name/pa/partio/package.nix +++ b/pkgs/by-name/pa/partio/package.nix @@ -12,7 +12,6 @@ doxygen, xorg, python3, - darwin, }: stdenv.mkDerivation rec { @@ -46,10 +45,6 @@ stdenv.mkDerivation rec { xorg.libXi xorg.libXmu ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.GLUT - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libglut libGLU diff --git a/pkgs/by-name/pa/pass-secret-service/package.nix b/pkgs/by-name/pa/pass-secret-service/package.nix index 9525232213a0..a722b48c516d 100644 --- a/pkgs/by-name/pa/pass-secret-service/package.nix +++ b/pkgs/by-name/pa/pass-secret-service/package.nix @@ -6,6 +6,7 @@ gnupg, coreutils, nixosTests, + nix-update-script, }: python3.pkgs.buildPythonApplication { @@ -13,13 +14,13 @@ python3.pkgs.buildPythonApplication { # PyPI has old alpha version. Since then the project has switched from using a # seemingly abandoned D-Bus package pydbus and started using maintained # dbus-next. So let's use latest from GitHub. - version = "unstable-2022-07-18"; + version = "0-unstable-2023-12-16"; src = fetchFromGitHub { owner = "mdellweg"; repo = "pass_secret_service"; - rev = "fadc09be718ae1e507eeb8719f3a2ea23edb6d7a"; - hash = "sha256-lrNU5bkG4/fMu5rDywfiI8vNHyBsMf/fiWIeEHug03c="; + rev = "6335c85d9a790a6472e3de6eff87a15208caa5dc"; + hash = "sha256-SSmI3HJCUWuwFXCu3Zg66X18POlzp3ADRj7HeE8GRio="; }; # Need to specify session.conf file for tests because it won't be found under @@ -65,7 +66,12 @@ python3.pkgs.buildPythonApplication { checkTarget = "test"; - passthru.tests.pass-secret-service = nixosTests.pass-secret-service; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + tests.pass-secret-service = nixosTests.pass-secret-service; + }; meta = { description = "Libsecret D-Bus API with pass as the backend"; diff --git a/pkgs/by-name/pa/passes/package.nix b/pkgs/by-name/pa/passes/package.nix index c856dd3d6e71..5d0e37b8d651 100644 --- a/pkgs/by-name/pa/passes/package.nix +++ b/pkgs/by-name/pa/passes/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/model/meson.build \ - --replace-fail /app/lib ${zint}/lib + --replace-fail /app/lib ${lib.getLib zint}/lib ''; strictDeps = true; diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index 38a47233b5c1..a8af2a7fe952 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -11,13 +11,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "passt"; - version = "2025_03_20.32f6212"; + version = "2025_05_03.587980c"; src = fetchurl { url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz"; - hash = "sha256-TRtFwBUUOnRwcLtB3vwU5nG/ufi9D36waXW5Yuboowk="; + hash = "sha256-ussvShWxhR6ScBYiCJG0edrqS+W+74DSlsDRS1GCByA="; }; + separateDebugInfo = true; + postPatch = '' substituteInPlace Makefile --replace-fail \ 'PAGE_SIZE=$(shell getconf PAGE_SIZE)' \ diff --git a/pkgs/by-name/pa/pastel/package.nix b/pkgs/by-name/pa/pastel/package.nix new file mode 100644 index 000000000000..01f2f3623b3a --- /dev/null +++ b/pkgs/by-name/pa/pastel/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "pastel"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug="; + + meta = with lib; { + description = "Command-line tool to generate, analyze, convert and manipulate colors"; + homepage = "https://github.com/sharkdp/pastel"; + changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = [ ]; + mainProgram = "pastel"; + }; +} diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 714c3140070a..ec1bbb709264 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-RQg7Fo8Z0P+z6Fv6YTv/IpEErP6ncxylvBaeargTrIQ="; + hash = "sha256-5Xb/M7M8PAVXMyr7dwpoT0H4BV7o6okPQQw2e273ogQ="; }; - vendorHash = "sha256-VzskPOd1nlrkiwGsS5OoXP0v8LQbqS+NumV2WoahFvY="; + vendorHash = "sha256-B/Xw8rR+cldLKHr5N6ifBRHWAzJLayiejLi/winPjKg="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/pa/patchcil/deps.json b/pkgs/by-name/pa/patchcil/deps.json new file mode 100644 index 000000000000..175fd1c3cb4d --- /dev/null +++ b/pkgs/by-name/pa/patchcil/deps.json @@ -0,0 +1,32 @@ +[ + { + "pname": "AsmResolver", + "version": "6.0.0-beta.1", + "hash": "sha256-ZW61z6Qmztdy2NaiqxvNcP5RWBIiIO6CWNnqYq0MwoA=" + }, + { + "pname": "AsmResolver.DotNet", + "version": "6.0.0-beta.1", + "hash": "sha256-VoTiIr2/r2my6sg2AOEeiqz9vZhWtq5mGaW2Hx90Uo4=" + }, + { + "pname": "AsmResolver.PE", + "version": "6.0.0-beta.1", + "hash": "sha256-tTU/flTxRJaC4gkmI/gctqIriGIMntkgTs51TqzcQlg=" + }, + { + "pname": "AsmResolver.PE.File", + "version": "6.0.0-beta.1", + "hash": "sha256-hPuFrpcm2VMiYEirsL4kYmAhOzjwjNXUklIfYJEonLo=" + }, + { + "pname": "DotNet.Glob", + "version": "3.1.3", + "hash": "sha256-5uGSaGY1IqDjq4RCDLPJm0Lg9oyWmyR96OiNeGqSj84=" + }, + { + "pname": "System.CommandLine", + "version": "2.0.0-beta4.22272.1", + "hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc=" + } +] diff --git a/pkgs/by-name/pa/patchcil/package.nix b/pkgs/by-name/pa/patchcil/package.nix new file mode 100644 index 000000000000..d0bdfb97c7b2 --- /dev/null +++ b/pkgs/by-name/pa/patchcil/package.nix @@ -0,0 +1,76 @@ +{ + lib, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + stdenv, + nix-update-script, + aot ? dotnetCorePackages.sdk_9_0.hasILCompiler && !stdenv.hostPlatform.isDarwin, +}: + +buildDotnetModule rec { + pname = "patchcil"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "GGG-KILLER"; + repo = "patchcil"; + tag = "v${version}"; + hash = "sha256-jqVXKp5ShWkIMAgmcwu9/QHy+Ey9d1Piv62wsO0Xm44="; + }; + + nativeBuildInputs = lib.optional aot stdenv.cc; + + projectFile = "src/PatchCil.csproj"; + nugetDeps = ./deps.json; + + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = if aot then null else dotnetCorePackages.runtime_9_0; + + selfContainedBuild = aot; + dotnetFlags = lib.optionals (!aot) [ + # Disable AOT + "-p:PublishAot=false" + "-p:InvariantGlobalization=false" + "-p:EventSourceSupport=true" + "-p:HttpActivityPropagationSupport=true" + "-p:MetadataUpdaterSupport=true" + "-p:MetricsSupport=true" + "-p:UseNativeHttpHandler=false" + "-p:XmlResolverIsNetworkingEnabledByDefault=true" + "-p:EnableGeneratedComInterfaceComImportInterop=true" + "-p:_ComObjectDescriptorSupport=true" + "-p:_DataSetXmlSerializationSupport=true" + "-p:_DefaultValueAttributeSupport=true" + "-p:_DesignerHostSupport=true" + "-p:_EnableConsumingManagedCodeFromNativeHosting=true" + "-p:_UseManagedNtlm=true" + ]; + + preFixup = lib.optionalString aot '' + # Remove debug symbols as they shouldn't have anything in them. + rm $out/lib/patchcil/patchcil.dbg + ''; + + executables = [ "patchcil" ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "A small utility to modify the library paths from PInvoke in .NET assemblies."; + homepage = "https://github.com/GGG-KILLER/patchcil"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ggg ]; + mainProgram = "patchcil"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + "x86_64-windows" + "i686-windows" + ]; + }; +} diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix index 5c919286a46d..84ebe32e4cc0 100644 --- a/pkgs/by-name/pa/patroni/package.nix +++ b/pkgs/by-name/pa/patroni/package.nix @@ -5,6 +5,7 @@ versionCheckHook, nixosTests, nix-update-script, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { @@ -46,11 +47,9 @@ python3Packages.buildPythonApplication rec { pytest-cov requests versionCheckHook + writableTmpDirAsHomeHook ]; - versionCheckProgramArg = [ "--version" ]; - - # Fix tests by preventing them from writing to /homeless-shelter. - preCheck = "export HOME=$(mktemp -d)"; + versionCheckProgramArg = "--version"; __darwinAllowLocalNetworking = true; @@ -66,6 +65,6 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/patroni/patroni/blob/v${version}/docs/releases.rst"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = lib.teams.deshaw.members; + teams = [ lib.teams.deshaw ]; }; } diff --git a/pkgs/by-name/pa/pavolctld/package.nix b/pkgs/by-name/pa/pavolctld/package.nix index f024e71aabd9..471bd1704141 100644 --- a/pkgs/by-name/pa/pavolctld/package.nix +++ b/pkgs/by-name/pa/pavolctld/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "pavolctld"; - version = "1.0.1"; + version = "1.0.2"; src = fetchgit { url = "https://git.tjkeller.xyz/pavolctld"; tag = "v${finalAttrs.version}"; - hash = "sha256-nmN8bQKQNGpCGvHQnZK9YQgB80SxRSds0V9Y7h/Guh8="; + hash = "sha256-gNEXED+9BkCCLi8oW2GZi9Azd/zOWUvu/bY0a1WbE/A="; }; buildInputs = [ libpulseaudio ]; diff --git a/pkgs/by-name/pa/pax/package.nix b/pkgs/by-name/pa/pax/package.nix new file mode 100644 index 000000000000..9dbf30620d73 --- /dev/null +++ b/pkgs/by-name/pa/pax/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchurl, + musl-fts, +}: + +stdenv.mkDerivation rec { + pname = "pax"; + version = "20240817"; + + src = fetchurl { + url = "http://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${version}.tgz"; + sha256 = "sha256-6VXV06+Xrt4KP0Y6mlm4Po0Qg6rxQutvOIxUmn0YLms="; + }; + + buildInputs = lib.optional stdenv.hostPlatform.isMusl musl-fts; + + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts"; + + buildPhase = '' + sh Build.sh -r -tpax + ''; + + installPhase = '' + install -Dm555 pax $out/bin/pax + ln -s $out/bin/pax $out/bin/paxcpio + ln -s $out/bin/pax $out/bin/paxtar + install -Dm444 mans/pax{,cpio,tar}.1 -t $out/share/man/man1/ + ''; + + meta = with lib; { + description = "POSIX standard archive tool from MirBSD"; + homepage = "https://www.mirbsd.org/pax.htm"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/pa/paxtest/package.nix b/pkgs/by-name/pa/paxtest/package.nix index 149c334e891b..85aefd59fa36 100644 --- a/pkgs/by-name/pa/paxtest/package.nix +++ b/pkgs/by-name/pa/paxtest/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ - copumpkin joachifm ]; }; diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index a9bffe2ea8d3..a98ae0d5c4e7 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -2,37 +2,30 @@ lib, fetchFromGitea, rustPlatform, - pkg-config, - openssl, - curl, + versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "pay-respects"; - version = "0.6.14"; + version = "0.7.6"; src = fetchFromGitea { domain = "codeberg.org"; owner = "iff"; repo = "pay-respects"; - rev = "v${version}"; - hash = "sha256-D6wkLrIzFpCTzOtVD8GcfBAZS48pNAIkTUTw3DRf7ds="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+50MKpZgJqjuUvJeFFv8fMILkJ3cOAN7R7kmlR+98II="; }; useFetchCargoVendor = true; - cargoHash = "sha256-QdeU+0o68j5Y0IKouyJ8ypZghuS8NKxCUpmZxi+sxuk="; + cargoHash = "sha256-TJP+GPkXwPvnBwiF0SCkn8NGz/xyrYjbUZKCbUUSqHQ="; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - curl - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; meta = { - description = "Terminal command correction, alternative to `thefuck`, written in Rust"; + description = "Terminal command correction, alternative to thefuck, written in Rust"; homepage = "https://codeberg.org/iff/pay-respects"; + changelog = "https://codeberg.org/iff/pay-respects/src/tag/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ sigmasquadron @@ -41,4 +34,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "pay-respects"; }; -} +}) diff --git a/pkgs/by-name/pa/pazi/package.nix b/pkgs/by-name/pa/pazi/package.nix index 560f1e7c7a10..59aad8623053 100644 --- a/pkgs/by-name/pa/pazi/package.nix +++ b/pkgs/by-name/pa/pazi/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, installShellFiles, }: @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - useFetchCargoVendor = true; cargoHash = "sha256-/r/nRQ/7KyUmJK19F557AcxXEXa85E/CE6+YFU6DdR4="; diff --git a/pkgs/by-name/pb/pbpctrl/package.nix b/pkgs/by-name/pb/pbpctrl/package.nix index 715ba55bde98..8243e5b02331 100644 --- a/pkgs/by-name/pb/pbpctrl/package.nix +++ b/pkgs/by-name/pb/pbpctrl/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "pbpctrl"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "qzed"; repo = "pbpctrl"; rev = "v${version}"; - hash = "sha256-u5I3Hs00JDPRBwThYTEmNiZj/zPVfHyyrt4E68d13do="; + hash = "sha256-XSRJytPrRKKWhFTBQd3Kd1R3amdecGNTmJS4PmFL6kg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0kh9bwiTVWuDviDw6IY5EGj+2k2WsyCCeo+r7CdBftE="; + cargoHash = "sha256-eDR/Z4v8G7/XPzWjJdZ5Fg2qULdn/SuNmvE/GVqSVJ8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pc/pc-ble-driver/package.nix b/pkgs/by-name/pc/pc-ble-driver/package.nix new file mode 100644 index 000000000000..e7bce66d8175 --- /dev/null +++ b/pkgs/by-name/pc/pc-ble-driver/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchpatch, + fetchFromGitHub, + cmake, + git, + asio, + catch2, + spdlog, + udev, +}: + +stdenv.mkDerivation rec { + pname = "pc-ble-driver"; + version = "4.1.4"; + + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = pname; + rev = "v${version}"; + hash = "sha256-srH7Gdiy9Lsv68fst/9jhifx03R2e+4kMia6pU/oCZg="; + }; + + patches = [ + (fetchpatch { + name = "support-arm.patch"; + url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/76a6b31dba7a13ceae40587494cbfa01a29192f4.patch"; + hash = "sha256-bvK1BXjdlhIXV8R4PiCGaq8oSLzgjMmTgAwssm8N2sk="; + }) + # Fix build with GCC 11 + (fetchpatch { + url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch"; + hash = "sha256-gOdzIW8YJQC+PE4FJd644I1+I7CMcBY8wpF6g02eI5g="; + }) + ]; + + cmakeFlags = + [ + "-DNRF_BLE_DRIVER_VERSION=${version}" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + "-DARCH=arm64" + ]; + + nativeBuildInputs = [ + cmake + git + ]; + buildInputs = [ + asio + catch2 + spdlog + ]; + + propagatedBuildInputs = + [ + + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + udev + ]; + + meta = with lib; { + description = "Desktop library for Bluetooth low energy development"; + homepage = "https://github.com/NordicSemiconductor/pc-ble-driver"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/pc/pc/package.nix b/pkgs/by-name/pc/pc/package.nix index 9abcda1d567b..d8bf35a59b51 100644 --- a/pkgs/by-name/pc/pc/package.nix +++ b/pkgs/by-name/pc/pc/package.nix @@ -8,18 +8,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "pc"; - version = "0.4"; + version = "0.6"; src = fetchFromSourcehut { owner = "~ft"; repo = "pc"; rev = finalAttrs.version; - hash = "sha256-fzEDI20o5ROY9n/QRzCW66iCKYaBbI++Taur6EoA0wA="; + hash = "sha256-hmFzFaBMb/hqKqc+2hYda1+iowWhs/pC+6LPPhhqzJo="; }; nativeBuildInputs = [ byacc ]; makeFlags = [ "PREFIX=$(out)" ]; + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.hostPlatform.isDarwin [ + "-Wno-error=implicit-function-declaration" + ] + ); + strictDeps = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/pc/pciutils/package.nix b/pkgs/by-name/pc/pciutils/package.nix new file mode 100644 index 000000000000..8224369d0992 --- /dev/null +++ b/pkgs/by-name/pc/pciutils/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + zlib, + kmod, + which, + hwdata, + static ? stdenv.hostPlatform.isStatic, + gitUpdater, +}: + +stdenv.mkDerivation rec { + pname = "pciutils"; + version = "3.13.0"; # with release-date database + + src = fetchFromGitHub { + owner = "pciutils"; + repo = "pciutils"; + rev = "v${version}"; + hash = "sha256-buhq7SN6eH+sckvT5mJ8eP4C1EP/4CUFt3gooJohJW0="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + which + zlib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ kmod ]; + + preConfigure = lib.optionalString (!stdenv.cc.isGNU) '' + substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" + ''; + + enableParallelBuilding = true; + + makeFlags = [ + "SHARED=${if static then "no" else "yes"}" + "PREFIX=\${out}" + "STRIP=" + "HOST=${stdenv.hostPlatform.system}" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + "DNS=yes" + ]; + + installTargets = [ + "install" + "install-lib" + ]; + + postInstall = '' + # Remove update-pciids as it won't work on nixos + rm $out/sbin/update-pciids $out/man/man8/update-pciids.8 + + # use database from hwdata instead + # (we don't create a symbolic link because we do not want to pull in the + # full closure of hwdata) + cp --reflink=auto ${hwdata}/share/hwdata/pci.ids $out/share/pci.ids + ''; + + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://github.com/pciutils/pciutils.git"; + rev-prefix = "v"; + }; + + meta = with lib; { + homepage = "https://mj.ucw.cz/sw/pciutils/"; + description = "Collection of programs for inspecting and manipulating configuration of PCI devices"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.vcunat ]; # not really, but someone should watch it + mainProgram = "lspci"; + }; +} diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix index 7d5caeeecf81..f57975508c8e 100644 --- a/pkgs/by-name/pc/pcl/package.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-UCuQMWGwe+YxeGj0Y6m5IT58NW2lAWN5RqyZnvyFSr4="; }; + strictDeps = true; + # remove attempt to prevent (x86/x87-specific) extended precision use # when SSE not detected postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' @@ -59,8 +61,7 @@ stdenv.mkDerivation (finalAttrs: { libpcap libsForQt5.qtbase libusb1 - llvmPackages.openmp - ]; + ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; propagatedBuildInputs = [ boost @@ -71,8 +72,11 @@ stdenv.mkDerivation (finalAttrs: { vtk ]; - cmakeFlags = lib.optionals cudaSupport [ - (lib.cmakeBool "WITH_CUDA" true) + cmakeFlags = [ + (lib.cmakeBool "BUILD_CUDA" cudaSupport) + (lib.cmakeBool "BUILD_GPU" cudaSupport) + (lib.cmakeBool "PCL_ENABLE_MARCHNATIVE" false) + (lib.cmakeBool "WITH_CUDA" cudaSupport) ]; passthru.updateScript = gitUpdater { diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index 9add368f7738..fde6306795db 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -39,13 +39,13 @@ let pname = "pcloud"; - version = "1.14.11"; - code = "XZQRe85ZLPTV99jSGRkmdR9ET2xzqHYeABBX"; + version = "1.14.12"; + code = "XZcIVb5ZhHzMumagTOBxWWhbjhyv0bN7oPKk"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-fqC6cQYfmtwBfnXsKNXbHQ1jB6xPXleCcfi2DV5AtLw="; + hash = "sha256-SwwaMGORtgW7tzkaZY4hyR001Rw7qRDlMyzdBbC1nUQ="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/pc/pcm/package.nix b/pkgs/by-name/pc/pcm/package.nix index 1e2f7cd370ce..ebad295b48c6 100644 --- a/pkgs/by-name/pc/pcm/package.nix +++ b/pkgs/by-name/pc/pcm/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "202502"; src = fetchFromGitHub { - owner = "opcm"; + owner = "intel"; repo = "pcm"; rev = version; hash = "sha256-U6V3LX+JlVL9MRFBP3xpYwPQ6Y7pnJ4F/7dpKG3Eyuw="; diff --git a/pkgs/by-name/pc/pcsc-tools/package.nix b/pkgs/by-name/pc/pcsc-tools/package.nix new file mode 100644 index 000000000000..6b724185b9c4 --- /dev/null +++ b/pkgs/by-name/pc/pcsc-tools/package.nix @@ -0,0 +1,140 @@ +{ + stdenv, + lib, + fetchFromGitHub, + autoconf-archive, + autoreconfHook, + gobject-introspection, + makeWrapper, + pkg-config, + wrapGAppsHook3, + systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, + systemd, + dbusSupport ? stdenv.hostPlatform.isLinux, + dbus, + pcsclite, + wget, + coreutils, + perlPackages, + testers, + nix-update-script, + + # gui does not cross compile properly + withGui ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, +}: + +assert systemdSupport -> dbusSupport; + +stdenv.mkDerivation (finalAttrs: { + pname = "pcsc-tools"; + version = "1.7.3"; + + src = fetchFromGitHub { + owner = "LudovicRousseau"; + repo = "pcsc-tools"; + tag = finalAttrs.version; + hash = "sha256-pNTEiXAcT0NivDMIHGI+0VC9rKqLMc07yQB15mDWZhM="; + }; + + configureFlags = [ + "--datarootdir=${placeholder "out"}/share" + ]; + + buildInputs = + lib.optionals dbusSupport [ + dbus + ] + ++ [ + perlPackages.perl + pcsclite + ] + ++ lib.optional systemdSupport systemd; + + nativeBuildInputs = + [ + autoconf-archive + autoreconfHook + makeWrapper + pkg-config + ] + ++ lib.optionals withGui [ + gobject-introspection + wrapGAppsHook3 + ]; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postInstall = + '' + wrapProgram $out/bin/scriptor \ + --set PERL5LIB "${ + with perlPackages; + makePerlPath [ + ChipcardPCSC + libintl-perl + ] + }" + + '' + + lib.optionalString withGui '' + wrapProgram $out/bin/gscriptor \ + ''${makeWrapperArgs[@]} \ + --set PERL5LIB "${ + with perlPackages; + makePerlPath [ + ChipcardPCSC + libintl-perl + GlibObjectIntrospection + Glib + Gtk3 + Pango + Cairo + CairoGObject + ] + }" + '' + + '' + + wrapProgram $out/bin/ATR_analysis \ + --set PERL5LIB "${ + with perlPackages; + makePerlPath [ + ChipcardPCSC + libintl-perl + ] + }" + + wrapProgram $out/bin/pcsc_scan \ + --prefix PATH : "$out/bin:${ + lib.makeBinPath [ + coreutils + wget + ] + }" + + install -Dm444 -t $out/share/pcsc smartcard_list.txt + ''; + + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "pcsc_scan -V"; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Tools used to test a PC/SC driver, card or reader"; + homepage = "https://pcsc-tools.apdu.fr/"; + changelog = "https://github.com/LudovicRousseau/pcsc-tools/releases/tag/${finalAttrs.version}"; + license = licenses.gpl2Plus; + mainProgram = "pcsc_scan"; + maintainers = with maintainers; [ + peterhoeg + anthonyroussel + ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/pc/pcsclite/package.nix b/pkgs/by-name/pc/pcsclite/package.nix new file mode 100644 index 000000000000..4fd0d974e94d --- /dev/null +++ b/pkgs/by-name/pc/pcsclite/package.nix @@ -0,0 +1,136 @@ +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + meson, + ninja, + flex, + pkg-config, + perl, + python3, + dbus, + polkit, + systemdLibs, + udev, + dbusSupport ? stdenv.hostPlatform.isLinux, + systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs, + udevSupport ? dbusSupport, + libusb1, + testers, + nix-update-script, + pname ? "pcsclite", + polkitSupport ? false, +}: + +assert polkitSupport -> dbusSupport; +assert systemdSupport -> dbusSupport; + +stdenv.mkDerivation (finalAttrs: { + inherit pname; + version = "2.3.0"; + + outputs = [ + "out" + "lib" + "dev" + "doc" + "man" + ]; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "rousseau"; + repo = "PCSC"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-37qeWGEuutF0cOOidoLchKJLQCvJFdVRZXepWzD4pZs="; + }; + + # fix build with macOS 11 SDK + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/rousseau/PCSC/-/commit/f41fdaaf7c82bc270af6d7439c6da037bf149be8.patch"; + revert = true; + hash = "sha256-8A76JfYqcILi52X9l/uIpJXeRJDf2dkrNEToOsxGZXk="; + }) + ]; + + mesonFlags = + [ + (lib.mesonOption "sysconfdir" "/etc") + # The OS should care on preparing the drivers into this location + (lib.mesonOption "usbdropdir" "/var/lib/pcsc/drivers") + (lib.mesonBool "libsystemd" systemdSupport) + (lib.mesonBool "polkit" polkitSupport) + (lib.mesonOption "ipcdir" "/run/pcscd") + ] + ++ lib.optionals systemdSupport [ + (lib.mesonOption "systemdunit" "system") + ] + ++ lib.optionals (!udevSupport) [ + (lib.mesonBool "libudev" false) + ]; + + # disable building pcsc-wirecheck{,-gen} when cross compiling + # see also: https://github.com/LudovicRousseau/PCSC/issues/25 + postPatch = + '' + substituteInPlace src/libredirect.c src/spy/libpcscspy.c \ + --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1" + '' + + lib.optionalString systemdSupport '' + substituteInPlace meson.build \ + --replace-fail \ + "systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemd' + unit + 'unitdir')" \ + "systemdsystemunitdir = '${placeholder "out"}/lib/systemd/system'" + '' + + lib.optionalString polkitSupport '' + substituteInPlace meson.build \ + --replace-fail \ + "install_dir : polkit_dep.get_variable('policydir')" \ + "install_dir : '${placeholder "out"}/share/polkit-1/actions'" + ''; + + postInstall = '' + # pcsc-spy is a debugging utility and it drags python into the closure + moveToOutput bin/pcsc-spy "$dev" + ''; + + nativeBuildInputs = [ + meson + ninja + flex + pkg-config + perl + ]; + + buildInputs = + [ python3 ] + ++ lib.optionals systemdSupport [ systemdLibs ] + ++ lib.optionals (!systemdSupport && udevSupport) [ udev ] + ++ lib.optionals dbusSupport [ dbus ] + ++ lib.optionals polkitSupport [ polkit ] + ++ lib.optionals (!udevSupport) [ libusb1 ]; + + passthru = { + tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "pcscd --version"; + }; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Middleware to access a smart card using SCard API (PC/SC)"; + homepage = "https://pcsclite.apdu.fr/"; + changelog = "https://salsa.debian.org/rousseau/PCSC/-/blob/${finalAttrs.version}/ChangeLog"; + license = lib.licenses.bsd3; + mainProgram = "pcscd"; + maintainers = [ lib.maintainers.anthonyroussel ]; + pkgConfigModules = [ "libpcsclite" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index dcbcff5a3408..9aaf2bbedb34 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -54,6 +54,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + extra-cmake-modules pkg-config strip-nondeterminism wrapQtAppsHook @@ -62,7 +63,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl - extra-cmake-modules ffmpeg libaio libbacktrace diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix index 0b2674f43518..c48bf2584bdd 100644 --- a/pkgs/by-name/pd/pdal/package.nix +++ b/pkgs/by-name/pd/pdal/package.nix @@ -2,6 +2,7 @@ lib, stdenv, callPackage, + ctestCheckHook, fetchFromGitHub, testers, @@ -65,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: { libe57format ]; + strictDeps = true; + cmakeFlags = [ "-DBUILD_PLUGIN_E57=${if enableE57 then "ON" else "OFF"}" "-DBUILD_PLUGIN_HDF=ON" @@ -90,6 +93,9 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; + # tests are flaky and they seem to fail less often when they don't run in + # parallel + enableParallelChecking = false; disabledTests = [ # Tests failing due to TileDB library implementation, disabled also @@ -110,14 +116,18 @@ stdenv.mkDerivation (finalAttrs: { # Failure "pdal_app_plugin_test" + + # Removed in GDAL 3.11 + "pdal_io_gdal_writer_test" ]; - checkPhase = '' - runHook preCheck - # tests are flaky and they seem to fail less often when they don't run in - # parallel - ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$' - runHook postCheck + nativeCheckInputs = [ + gdal # gdalinfo + ctestCheckHook + ]; + + postInstall = '' + patchShebangs --update --build $out/bin/pdal-config ''; passthru.tests = { @@ -136,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; homepage = "https://pdal.io"; license = licenses.bsd3; - maintainers = teams.geospatial.members; + teams = [ teams.geospatial ]; platforms = platforms.all; pkgConfigModules = [ "pdal" ]; }; diff --git a/pkgs/by-name/pd/pdepend/package.nix b/pkgs/by-name/pd/pdepend/package.nix index 7d75b1bbf083..aa72fe80e91f 100644 --- a/pkgs/by-name/pd/pdepend/package.nix +++ b/pkgs/by-name/pd/pdepend/package.nix @@ -35,6 +35,6 @@ php.buildComposerProject2 (finalAttrs: { maintainability. "; mainProgram = "pdepend"; - maintainers = lib.teams.php.members; + teams = [ lib.teams.php ]; }; }) diff --git a/pkgs/by-name/pd/pdf2djvu/package.nix b/pkgs/by-name/pd/pdf2djvu/package.nix index e92663ad2239..2d617b6664f6 100644 --- a/pkgs/by-name/pd/pdf2djvu/package.nix +++ b/pkgs/by-name/pd/pdf2djvu/package.nix @@ -56,9 +56,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Required by Poppler on darwin - # https://github.com/jwilk/pdf2djvu/commit/373e065faf2f0d868a3700788d20a96e9528bb12 - CXXFLAGS = "-std=c++17"; + # Required by Poppler + CXXFLAGS = "-std=c++20"; meta = with lib; { description = "Creates djvu files from PDF files"; diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix index e12839032fbc..94e92d587920 100644 --- a/pkgs/by-name/pd/pdf4qt/package.nix +++ b/pkgs/by-name/pd/pdf4qt/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdf4qt"; - version = "1.5.0.0"; + version = "1.5.1.0"; src = fetchFromGitHub { owner = "JakubMelka"; repo = "PDF4QT"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ELdmnOEKFGCtuf240R/0M6r8aPwRQiXurAxrqcCZvOI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Ysrz/uCSTFK5wGNdTXhpq6QVf7Ju1xWisNVUtBtdEjc="; }; patches = [ @@ -70,8 +70,9 @@ stdenv.mkDerivation (finalAttrs: { functionality based on PDF Reference 2.0. ''; homepage = "https://jakubmelka.github.io"; - license = lib.licenses.lgpl3Only; - mainProgram = "Pdf4QtViewerLite"; + changelog = "https://github.com/JakubMelka/PDF4QT/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "Pdf4QtViewer"; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix index 438d0a12e976..f05af5f56ea7 100644 --- a/pkgs/by-name/pd/pdfcpu/package.nix +++ b/pkgs/by-name/pd/pdfcpu/package.nix @@ -1,18 +1,20 @@ { lib, buildGoModule, + stdenv, fetchFromGitHub, + writableTmpDirAsHomeHook, }: buildGoModule rec { pname = "pdfcpu"; - version = "0.9.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-PJTEaWU/erqVJakvxfB0aYRsi/tcGxYYZjCdEvThmzM="; + hash = "sha256-vfU0mFfOW9K3rgVNdfN2RBiKJLbijoVMtuywsoclEgE="; # Apparently upstream requires that the compiled executable will know the # commit hash and the date of the commit. This information is also presented # in the output of `pdfcpu version` which we use as a sanity check in the @@ -35,7 +37,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-x5EXv2LkJg2LAdml+1I4MzgTvNo6Gl+6e6UHVQ+Z9rU="; + vendorHash = "sha256-27YTR/vYuNggjUIbpKs3/yEJheUXMaLZk8quGPwgNNk="; ldflags = [ "-s" @@ -52,12 +54,24 @@ buildGoModule rec { # No tests doCheck = false; doInstallCheck = true; + installCheckInputs = [ + writableTmpDirAsHomeHook + ]; + # NOTE: Can't use `versionCheckHook` since a writeable $HOME is required and + # `versionCheckHook` uses --ignore-environment installCheckPhase = '' - export HOME=$(mktemp -d) echo checking the version print of pdfcpu - $out/bin/pdfcpu version | grep ${version} - $out/bin/pdfcpu version | grep $(cat COMMIT | cut -c1-8) - $out/bin/pdfcpu version | grep $(cat SOURCE_DATE) + mkdir -p $HOME/"${ + if stdenv.hostPlatform.isDarwin then "Library/Application Support" else ".config" + }"/pdfcpu + versionOutput="$($out/bin/pdfcpu version)" + for part in ${version} $(cat COMMIT | cut -c1-8) $(cat SOURCE_DATE); do + if [[ ! "$versionOutput" =~ "$part" ]]; then + echo version output did not contain expected part $part . Output was: + echo "$versionOutput" + exit 3 + fi + done ''; subPackages = [ "cmd/pdfcpu" ]; diff --git a/pkgs/by-name/pd/pdftk/package.nix b/pkgs/by-name/pd/pdftk/package.nix index 025652d69b87..54f55796473b 100644 --- a/pkgs/by-name/pd/pdftk/package.nix +++ b/pkgs/by-name/pd/pdftk/package.nix @@ -3,12 +3,21 @@ stdenv, fetchFromGitLab, gradle_8, - jre, + jre_headless, + jre_minimal, runtimeShell, }: let # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." gradle = gradle_8; + + jre = jre_minimal.override { + modules = [ + "java.base" + "java.desktop" + ]; + jdk = jre_headless; + }; in stdenv.mkDerivation rec { pname = "pdftk"; diff --git a/pkgs/by-name/pd/pdftoipe/package.nix b/pkgs/by-name/pd/pdftoipe/package.nix index 70e3fc58f3d9..3f4219e83d20 100644 --- a/pkgs/by-name/pd/pdftoipe/package.nix +++ b/pkgs/by-name/pd/pdftoipe/package.nix @@ -9,33 +9,15 @@ stdenv.mkDerivation rec { pname = "pdftoipe"; - version = "7.2.24.1"; + version = "7.2.29.1"; src = fetchFromGitHub { owner = "otfried"; repo = "ipe-tools"; rev = "v${version}"; - hash = "sha256-jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k="; + hash = "sha256-6FI0ZLRrDmNFAKyht7hB94MsCy+TasD6Mb/rx6sdCdg="; }; - patches = [ - # Fix build with poppler > 22.03.0 - # https://github.com/otfried/ipe-tools/pull/48 - (fetchpatch { - url = "https://github.com/otfried/ipe-tools/commit/14335180432152ad094300d0afd00d8e390469b2.patch"; - hash = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc="; - stripLen = 1; - name = "poppler_fix_build_48.patch"; - }) - # https://github.com/otfried/ipe-tools/pull/55 - (fetchpatch { - url = "https://github.com/otfried/ipe-tools/commit/65586fcd9cc39e482ae5a9abdb6f4932d9bb88c4.patch"; - hash = "sha256-qr1AQyWHz1e2a65m05xSHFnP6oSP6qSmMVekNk2flRc="; - stripLen = 1; - name = "poppler_fix_build_55.patch"; - }) - ]; - sourceRoot = "${src.name}/pdftoipe"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pd/pdftricks/package.nix b/pkgs/by-name/pd/pdftricks/package.nix new file mode 100644 index 000000000000..4ad66a2ff843 --- /dev/null +++ b/pkgs/by-name/pd/pdftricks/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + pkg-config, + vala, + gtk3, + wrapGAppsHook3, + pantheon, + ninja, + ghostscript, + makeWrapper, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "pdftricks"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "muriloventuroso"; + repo = "pdftricks"; + tag = finalAttrs.version; + hash = "sha256-l4Xg4Uk520qoaEo8UxdLE8MfpVkRj/bpGBzL5HwdDUo="; + }; + + nativeBuildInputs = [ + meson + pkg-config + vala + wrapGAppsHook3 + ninja + makeWrapper + ]; + + buildInputs = [ + gtk3 + pantheon.granite + ghostscript + ]; + + preFixup = '' + wrapProgram $out/bin/com.github.muriloventuroso.pdftricks \ + --prefix PATH : ${lib.makeBinPath [ ghostscript ]} \ + ''${gappsWrapperArgs[@]} + ''; + + dontWrapGApps = true; + + postPatch = '' + # Remove positional arguments that cause errors + substituteInPlace data/meson.build \ + --replace-fail "'desktop'," "" \ + --replace-fail "'appdata'," "" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple, efficient application for small manipulations in PDF files using Ghostscript"; + homepage = "https://github.com/muriloventuroso/pdftricks"; + changelog = "https://github.com/muriloventuroso/pdftricks/releases"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ theobori ]; + platforms = lib.platforms.linux; + mainProgram = "com.github.muriloventuroso.pdftricks"; + }; +}) diff --git a/pkgs/by-name/pd/pdi/package.nix b/pkgs/by-name/pd/pdi/package.nix index a759cf478556..356d469f6478 100644 --- a/pkgs/by-name/pd/pdi/package.nix +++ b/pkgs/by-name/pd/pdi/package.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pdi"; - version = "1.8.3"; + version = "1.9.1"; src = fetchFromGitHub { owner = "pdidev"; repo = "pdi"; tag = finalAttrs.version; - hash = "sha256-oiHkCXQZGeijoJf8XpbBPdxmxClWyCsnv6laDdMXk6U="; + hash = "sha256-Tmn4M+tcnNH6Bm4t5D/VgciOu4dDKKqYkbERKgpHX/Y="; }; # Current hdf5 version in nixpkgs is 1.14.4.3 which is 4 numbers long and doesn't match the 3 number regex. :') diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index fdcaae9e1c2d..0eeb269bb258 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.22.3"; + version = "2.24.1"; pyproject = true; disabled = python.pkgs.pythonOlder "3.8"; @@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec { owner = "pdm-project"; repo = "pdm"; tag = version; - hash = "sha256-+qUvVQJO/xfBZJuMBezu/LdKhKag1BCQ3To2qFXiOzY="; + hash = "sha256-YChgPJmHWJ4tftosa24SKB0J7uV/zR6VWX18poEEsLY="; }; pythonRelaxDeps = [ "hishel" ]; @@ -67,6 +67,7 @@ python.pkgs.buildPythonApplication rec { tomlkit truststore unearth + id virtualenv ] ++ httpx.optional-dependencies.socks; @@ -118,6 +119,9 @@ python.pkgs.buildPythonApplication rec { "test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV" "test_build_distributions" "test_init_project_respect" + "test_use_python_write_file_multiple_versions" + "test_repository_get_token_from_oidc" + "test_repository_get_token_misconfigured_github" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix index bba6c4f4d185..ceae53962ea0 100644 --- a/pkgs/by-name/pd/pdns-recursor/package.nix +++ b/pkgs/by-name/pd/pdns-recursor/package.nix @@ -20,17 +20,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "5.1.2"; + version = "5.2.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2"; - hash = "sha256-s6N+uyAoWrmsu7DhNw5iO7OY7TCH8OZ48j/6OwBjmD0="; + hash = "sha256-+clSdCMe48XJQZf20FAR1Vq/BrKTdTW6jnjiTqT7vW4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "pdns-recursor-${finalAttrs.version}/settings/rust"; - hash = "sha256-/fxFqs5lDzOhatc6KBc7Zwsq3A7N5AOanGOebttr1l8="; + hash = "sha256-A3NX1zj9+9qCLTkfca3v8Rr8oc/zL/Ruknjl3g1aMG4="; }; cargoRoot = "settings/rust"; @@ -38,10 +38,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cargo rustc - rustPlatform.cargoSetupHook pkg-config ]; + buildInputs = [ boost openssl @@ -67,14 +67,14 @@ stdenv.mkDerivation (finalAttrs: { inherit (nixosTests) pdns-recursor ncdns; }; - meta = with lib; { + meta = { description = "Recursive DNS server"; homepage = "https://www.powerdns.com/"; - platforms = platforms.linux; + platforms = lib.platforms.linux; badPlatforms = [ "i686-linux" # a 64-bit time_t is needed ]; - license = licenses.gpl2Only; - maintainers = with maintainers; [ rnhmjoj ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ rnhmjoj ]; }; }) diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix index b889ad441072..4fd873d03374 100644 --- a/pkgs/by-name/pd/pdns/package.nix +++ b/pkgs/by-name/pd/pdns/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-ysRm18sFZDTGBjLlVL5QVDywzs2dOzO7V4XBSbWXn8E="; + hash = "sha256-Zpu3uZgjsyw5ATN9abOMn4Bz8vwC6HZJM7jFwJdOJyQ="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix index d22a18e43e0d..78cc0b2ae3bd 100644 --- a/pkgs/by-name/pe/peazip/package.nix +++ b/pkgs/by-name/pe/peazip/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "peazip"; - version = "10.3.0"; + version = "10.4.0"; src = fetchFromGitHub { owner = "peazip"; repo = "peazip"; rev = version; - hash = "sha256-rEddDg2sS/4+HK3UqPEWudWnwjMPNjA2+v4CKtFtZYM="; + hash = "sha256-tA2JLO4KIqFOVZyt7CPMRJTojQFQVQqGGOeh3sU/FuQ="; }; sourceRoot = "${src.name}/peazip-sources"; diff --git a/pkgs/by-name/pe/pebble/package.nix b/pkgs/by-name/pe/pebble/package.nix index 3c507c4daee7..f3e70c2d1295 100644 --- a/pkgs/by-name/pe/pebble/package.nix +++ b/pkgs/by-name/pe/pebble/package.nix @@ -35,6 +35,6 @@ buildGoModule rec { longDescription = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; license = [ lib.licenses.mpl20 ]; mainProgram = "pebble"; - maintainers = lib.teams.acme.members; + teams = [ lib.teams.acme ]; }; } diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix index 904dad57b84f..f1314e631b77 100644 --- a/pkgs/by-name/pe/peergos/package.nix +++ b/pkgs/by-name/pe/peergos/package.nix @@ -41,12 +41,12 @@ let in stdenv.mkDerivation rec { pname = "peergos"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Peergos"; repo = "web-ui"; rev = "v${version}"; - hash = "sha256-TSvhp/9nneXGADiDPgGvA78emVcQG0UzHsFfVS9k7mo="; + hash = "sha256-X5yXTCHKGrdvuoKc5nFbn4CWunNsyoJI+EZLpknLAyA="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pe/peering-manager/package.nix b/pkgs/by-name/pe/peering-manager/package.nix index d90554868467..7dd8f0238d2d 100644 --- a/pkgs/by-name/pe/peering-manager/package.nix +++ b/pkgs/by-name/pe/peering-manager/package.nix @@ -87,7 +87,7 @@ python3.pkgs.buildPythonApplication rec { license = licenses.asl20; description = "BGP sessions management tool"; mainProgram = "peering-manager"; - maintainers = teams.wdz.members; + teams = [ teams.wdz ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix new file mode 100644 index 000000000000..c80bc03c2ef6 --- /dev/null +++ b/pkgs/by-name/pe/peertube/package.nix @@ -0,0 +1,226 @@ +{ + lib, + stdenv, + callPackage, + fetchurl, + fetchFromGitHub, + fetchYarnDeps, + nixosTests, + brotli, + fixup-yarn-lock, + jq, + fd, + nodejs_20, + which, + yarn, +}: +let + bcryptHostPlatformAttrs = { + x86_64-linux = { + arch = "linux-x64"; + libc = "glibc"; + hash = "sha256-C5N6VgFtXPLLjZt0ZdRTX095njRIT+12ONuUaBBj7fQ="; + }; + aarch64-linux = { + arch = "linux-arm64"; + libc = "glibc"; + hash = "sha256-TerDujO+IkSRnHYlSbAKSP9IS7AT7XnQJsZ8D8pCoGc="; + }; + x86_64-darwin = { + arch = "darwin-x64"; + libc = "unknown"; + hash = "sha256-gphOONWujbeCCr6dkmMRJP94Dhp1Jvp2yt+g7n1HTv0="; + }; + aarch64-darwin = { + arch = "darwin-arm64"; + libc = "unknown"; + hash = "sha256-JMnELVUxoU1C57Tzue3Sg6OfDFAjfCnzgDit0BWzmlo="; + }; + }; + bcryptAttrs = + bcryptHostPlatformAttrs."${stdenv.hostPlatform.system}" + or (throw "Unsupported architecture: ${stdenv.hostPlatform.system}"); + bcryptVersion = "5.1.1"; + bcryptLib = fetchurl { + url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v${bcryptVersion}/bcrypt_lib-v${bcryptVersion}-napi-v3-${bcryptAttrs.arch}-${bcryptAttrs.libc}.tar.gz"; + inherit (bcryptAttrs) hash; + }; +in +stdenv.mkDerivation rec { + pname = "peertube"; + version = "7.0.1"; + + src = fetchFromGitHub { + owner = "Chocobozzz"; + repo = "PeerTube"; + tag = "v${version}"; + hash = "sha256-DoUSzqb8lrU+s5R95rxCN/5A8sgb11edAhv0T6YACRo="; + }; + + yarnOfflineCacheServer = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-WLaIIyz6SEekLFeVO39Swpny5/x5Jc1zoxy/6bmOXTk="; + }; + + yarnOfflineCacheClient = fetchYarnDeps { + yarnLock = "${src}/client/yarn.lock"; + hash = "sha256-/ZdORSnwk29ubsgKKB7RfHCetODNOH9DzkflQdDsMz0="; + }; + + yarnOfflineCacheAppsCli = fetchYarnDeps { + yarnLock = "${src}/apps/peertube-cli/yarn.lock"; + hash = "sha256-lcWtZGE/6XGm8KXmzSowCHAb/vGwBoqkwk32Ru3mMYU="; + }; + + yarnOfflineCacheAppsRunner = fetchYarnDeps { + yarnLock = "${src}/apps/peertube-runner/yarn.lock"; + hash = "sha256-R7oXJUT698l2D1WkQGTWfkmbC7bC1XJ04xT0O8bwuI8="; + }; + + outputs = [ + "out" + "cli" + "runner" + ]; + + nativeBuildInputs = [ + brotli + fixup-yarn-lock + jq + which + yarn + fd + ]; + + buildInputs = [ nodejs_20 ]; + + buildPhase = '' + # Build node modules + export HOME=$PWD + fixup-yarn-lock ~/yarn.lock + fixup-yarn-lock ~/client/yarn.lock + fixup-yarn-lock ~/apps/peertube-cli/yarn.lock + fixup-yarn-lock ~/apps/peertube-runner/yarn.lock + yarn config --offline set yarn-offline-mirror $yarnOfflineCacheServer + yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress + cd ~/client + yarn config --offline set yarn-offline-mirror $yarnOfflineCacheClient + yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress + cd ~/apps/peertube-cli + yarn config --offline set yarn-offline-mirror $yarnOfflineCacheAppsCli + yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress + cd ~/apps/peertube-runner + yarn config --offline set yarn-offline-mirror $yarnOfflineCacheAppsRunner + yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress + + patchShebangs ~/{node_modules,client/node_modules,/apps/peertube-cli/node_modules,apps/peertube-runner/node_modules,scripts} + + # Fix bcrypt node module + cd ~/node_modules/bcrypt + if [ "${bcryptVersion}" != "$(cat package.json | jq -r .version)" ]; then + echo "Mismatching version please update bcrypt in derivation" + exit + fi + mkdir -p ./lib/binding && tar -C ./lib/binding -xf ${bcryptLib} + + # Return to home directory + cd ~ + + # Build PeerTube server + npm run build:server + + # Build PeerTube client + npm run build:client + + # Build PeerTube cli + npm run build:peertube-cli + patchShebangs ~/apps/peertube-cli/dist/peertube.js + + # Build PeerTube runner + npm run build:peertube-runner + patchShebangs ~/apps/peertube-runner/dist/peertube-runner.js + + # Clean up declaration files + find ~/dist/ \ + ~/packages/core-utils/dist/ \ + ~/packages/ffmpeg/dist/ \ + ~/packages/models/dist/ \ + ~/packages/node-utils/dist/ \ + ~/packages/server-commands/dist/ \ + ~/packages/transcription/dist/ \ + ~/packages/typescript-utils/dist/ \ + \( -name '*.d.ts' -o -name '*.d.ts.map' \) -type f -delete + ''; + + installPhase = '' + mkdir -p $out/dist + mv ~/dist $out + mv ~/node_modules $out/node_modules + mkdir $out/client + mv ~/client/{dist,node_modules,package.json,yarn.lock} $out/client + mkdir -p $out/packages/{core-utils,ffmpeg,models,node-utils,server-commands,transcription,typescript-utils} + mv ~/packages/core-utils/{dist,package.json} $out/packages/core-utils + mv ~/packages/ffmpeg/{dist,package.json} $out/packages/ffmpeg + mv ~/packages/models/{dist,package.json} $out/packages/models + mv ~/packages/node-utils/{dist,package.json} $out/packages/node-utils + mv ~/packages/server-commands/{dist,package.json} $out/packages/server-commands + mv ~/packages/transcription/{dist,package.json} $out/packages/transcription + mv ~/packages/typescript-utils/{dist,package.json} $out/packages/typescript-utils + mv ~/{config,support,CREDITS.md,FAQ.md,LICENSE,README.md,package.json,yarn.lock} $out + + # Remove broken symlinks in node_modules from workspace packages that aren't needed + # by the built artifact. If any new packages break the check for broken symlinks, + # they should be checked before adding them here to make sure they aren't likely to + # be needed, either now or in the future. If they might be, then we probably want + # to move the package to $out above instead of removing the broken symlink. + rm $out/node_modules/@peertube/{peertube-server,peertube-transcription-devtools,peertube-types-generator,tests} + rm $out/client/node_modules/@peertube/{peertube-transcription-devtools,peertube-types-generator,tests} + + mkdir -p $cli/bin + mv ~/apps/peertube-cli/{dist,node_modules,package.json,yarn.lock} $cli + ln -s $cli/dist/peertube.js $cli/bin/peertube-cli + + mkdir -p $runner/bin + mv ~/apps/peertube-runner/{dist,node_modules,package.json,yarn.lock} $runner + ln -s $runner/dist/peertube-runner.js $runner/bin/peertube-runner + + # Create static gzip and brotli files + fd -e css -e eot -e html -e js -e json -e svg -e webmanifest -e xlf \ + --type file --search-path $out/client/dist --threads $NIX_BUILD_CORES \ + --exec gzip -9 -n -c {} > {}.gz \;\ + --exec brotli --best -f {} -o {}.br + ''; + + passthru.tests.peertube = nixosTests.peertube; + + meta = with lib; { + description = "Free software to take back control of your videos"; + longDescription = '' + PeerTube aspires to be a decentralized and free/libre alternative to video + broadcasting services. + PeerTube is not meant to become a huge platform that would centralize + videos from all around the world. Rather, it is a network of + inter-connected small videos hosters. + Anyone with a modicum of technical skills can host a PeerTube server, aka + an instance. Each instance hosts its users and their videos. In this way, + every instance is created, moderated and maintained independently by + various administrators. + You can still watch from your account videos hosted by other instances + though if the administrator of your instance had previously connected it + with other instances. + ''; + license = licenses.agpl3Plus; + homepage = "https://joinpeertube.org/"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + # feasible, looking for maintainer to help out + # "x86_64-darwin" "aarch64-darwin" + ]; + maintainers = with maintainers; [ + immae + izorkin + stevenroose + ]; + }; +} diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/by-name/pe/pencil/package.nix similarity index 100% rename from pkgs/applications/graphics/pencil/default.nix rename to pkgs/by-name/pe/pencil/package.nix diff --git a/pkgs/by-name/pe/penpot-desktop/package.nix b/pkgs/by-name/pe/penpot-desktop/package.nix index 91efa18e6afb..ea24c174e939 100644 --- a/pkgs/by-name/pe/penpot-desktop/package.nix +++ b/pkgs/by-name/pe/penpot-desktop/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, copyDesktopItems, - electron, + electron_35, fetchFromGitHub, jq, makeDesktopItem, @@ -15,16 +15,17 @@ let description = "Unofficial desktop application for the open-source design tool, Penpot"; icon = "penpot"; nodejs = nodejs_22; + electron = electron_35; in buildNpmPackage rec { pname = "penpot-desktop"; - version = "0.11.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "author-more"; repo = "penpot-desktop"; tag = "v${version}"; - hash = "sha256-33LAhR0L7pAnS27dz5DuqgfUllyAFA9JVZRmrHoajE4="; + hash = "sha256-ztvwabsy7PiT8m0+DDehvwV8oclJCb1BymEpkjTPtZ8="; }; makeCacheWritable = true; @@ -32,7 +33,7 @@ buildNpmPackage rec { "--engine-strict" "--legacy-peer-deps" ]; - npmDepsHash = "sha256-BR51Oi9Ffxy7d0fBkSQ6Iz/PVi+ghIaLqzm3Loq6aDo="; + npmDepsHash = "sha256-aRdqq0tMuNXkSy/NYdwir+LfwAr466dLi2b4vO/yjdg="; # Do not run the default build script as it leads to errors caused by the electron-builder configuration dontNpmBuild = true; diff --git a/pkgs/by-name/pe/persepolis/package.nix b/pkgs/by-name/pe/persepolis/package.nix index 34b14304223b..2be96d8ecc32 100644 --- a/pkgs/by-name/pe/persepolis/package.nix +++ b/pkgs/by-name/pe/persepolis/package.nix @@ -14,14 +14,14 @@ python3.pkgs.buildPythonApplication rec { pname = "persepolis"; - version = "5.0.1"; + version = "5.1.0"; format = "other"; src = fetchFromGitHub { owner = "persepolisdm"; repo = "persepolis"; tag = version; - hash = "sha256-ffEXPkpHGwvVzUxO6sjAEKYbxRod7o8f7DWR5AN+SkA="; + hash = "sha256-viRRPccw0C1GmZFXWAtg008HfDmnTwEjg2TqVlIiICY="; }; postPatch = '' diff --git a/pkgs/by-name/pe/persistent-cache-cpp/package.nix b/pkgs/by-name/pe/persistent-cache-cpp/package.nix index e1d7bb70efa4..ac8c0c7c6a4e 100644 --- a/pkgs/by-name/pe/persistent-cache-cpp/package.nix +++ b/pkgs/by-name/pe/persistent-cache-cpp/package.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp"; changelog = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/blob/${finalAttrs.version}/ChangeLog"; license = licenses.lgpl3Only; - maintainers = teams.lomiri.members; + teams = [ teams.lomiri ]; platforms = platforms.unix; pkgConfigModules = [ "libpersistent-cache-cpp" diff --git a/pkgs/by-name/pe/pesign/package.nix b/pkgs/by-name/pe/pesign/package.nix index a29bee3ba2b6..5c25ee80dca8 100644 --- a/pkgs/by-name/pe/pesign/package.nix +++ b/pkgs/by-name/pe/pesign/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, pkg-config, nss, efivar, @@ -11,17 +12,26 @@ mandoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pesign"; version = "116"; src = fetchFromGitHub { owner = "rhboot"; repo = "pesign"; - rev = version; + tag = finalAttrs.version; hash = "sha256-cuOSD/ZHkilgguDFJviIZCG8kceRWw2JgssQuWN02Do="; }; + patches = [ + # fix build with gcc14 + # https://github.com/rhboot/pesign/pull/119 + (fetchpatch2 { + url = "https://github.com/rhboot/pesign/commit/1f9e2fa0b4d872fdd01ca3ba81b04dfb1211a187.patch?full_index=1"; + hash = "sha256-viVM4Z0jAEAWC3EdJVHcWe21aQskH5XE85lOd6Xd/qU="; + }) + ]; + # nss-util is missing because it is already contained in nss # Red Hat seems to be shipping a separate nss-util: # https://centos.pkgs.org/7/centos-x86_64/nss-util-devel-3.44.0-4.el7_7.x86_64.rpm.html @@ -49,12 +59,12 @@ stdenv.mkDerivation rec { rm -rf $out/run ''; - meta = with lib; { + meta = { description = "Signing tools for PE-COFF binaries. Compliant with the PE and Authenticode specifications"; homepage = "https://github.com/rhboot/pesign"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ raitobezarius ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ raitobezarius ]; # efivar is currently Linux-only. - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix index a06b35650757..933156c3e5d6 100644 --- a/pkgs/by-name/pe/pest-ide-tools/package.nix +++ b/pkgs/by-name/pe/pest-ide-tools/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, nix-update-script, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,9 +17,6 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pe/pest/package.nix b/pkgs/by-name/pe/pest/package.nix index 22358f7e67fa..f400de45dd91 100644 --- a/pkgs/by-name/pe/pest/package.nix +++ b/pkgs/by-name/pe/pest/package.nix @@ -24,6 +24,6 @@ php.buildComposerProject2 (finalAttrs: { homepage = "https://pestphp.com"; license = lib.licenses.mit; mainProgram = "pest"; - maintainers = lib.teams.php.members; + teams = [ lib.teams.php ]; }; }) diff --git a/pkgs/by-name/pe/pet/package.nix b/pkgs/by-name/pe/pet/package.nix index f702dda7b191..8686474eea0c 100644 --- a/pkgs/by-name/pe/pet/package.nix +++ b/pkgs/by-name/pe/pet/package.nix @@ -1,8 +1,10 @@ { + lib, + stdenv, buildGoModule, fetchFromGitHub, installShellFiles, - lib, + writableTmpDirAsHomeHook, }: buildGoModule rec { @@ -30,11 +32,14 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles + writableTmpDirAsHomeHook ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd pet \ - --zsh ./misc/completions/zsh/_pet + --bash <($out/bin/pet completion bash) \ + --fish <($out/bin/pet completion fish) \ + --zsh $src/misc/completions/zsh/_pet ''; meta = with lib; { diff --git a/pkgs/by-name/pe/petidomo/package.nix b/pkgs/by-name/pe/petidomo/package.nix index 20b70daea826..f277e5e3dfbd 100644 --- a/pkgs/by-name/pe/petidomo/package.nix +++ b/pkgs/by-name/pe/petidomo/package.nix @@ -5,15 +5,16 @@ flex, bison, sendmailPath ? "/run/wrappers/bin/sendmail", + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "petidomo"; version = "4.3"; src = fetchurl { - url = "mirror://sourceforge/petidomo/${pname}-${version}.tar.gz"; - sha256 = "0x4dbxc4fcfg1rw5ywpcypvylnzn3y4rh0m6fz4h4cdnzb8p1lvm"; + url = "mirror://sourceforge/petidomo/petidomo-${finalAttrs.version}.tar.gz"; + hash = "sha256-ddNw0fq2MQLJd6YCmIkf9lvq9/Xscl94Ds8xR1hfjXQ="; }; buildInputs = [ @@ -23,10 +24,16 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-mta=${sendmailPath}" ]; + # test.c:43:11: error: implicit declaration of function 'gets'; did you mean 'fgets'? + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + enableParallelBuilding = true; doCheck = true; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + meta = { homepage = "https://petidomo.sourceforge.net/"; description = "Simple and easy to administer mailing list server"; @@ -35,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.peti ]; }; -} +}) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index d31359143af8..7d067f7566fa 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -1,23 +1,24 @@ { lib, + newScope, stdenv, fetchzip, - gfortran, replaceVars, - python3, - python3Packages, - blas, - lapack, - zlib, # propagated by p4est but required by petsc + bash, + pkg-config, + gfortran, + bison, mpi, # generic mpi dependency mpiCheckPhaseHook, - bash, + python3, + python3Packages, # Build options - petsc-optimized ? true, - petsc-scalar-type ? "real", - petsc-precision ? "double", + debug ? false, + scalarType ? "real", + precision ? "double", mpiSupport ? true, + fortranSupport ? true, pythonSupport ? false, # petsc python binding withExamples ? false, withFullDeps ? false, # full External libraries support @@ -26,41 +27,95 @@ # External libraries options withHdf5 ? withCommonDeps, withMetis ? withCommonDeps, - withScalapack ? withFullDeps, + withZlib ? (withP4est || withPtscotch), + withScalapack ? withCommonDeps && mpiSupport, withParmetis ? withFullDeps, # parmetis is unfree - withPtscotch ? withFullDeps, - withMumps ? withFullDeps, + withPtscotch ? withCommonDeps && mpiSupport, + withMumps ? withCommonDeps, withP4est ? withFullDeps, + withHypre ? withCommonDeps && mpiSupport, + withFftw ? withCommonDeps, + withSuperLu ? withCommonDeps, + withSuperLuDist ? withCommonDeps && mpiSupport, + withSuitesparse ? withCommonDeps, # External libraries - hdf5-fortran-mpi, + blas, + lapack, + hdf5, metis, parmetis, scotch, scalapack, - mumps_par, - pkg-config, + mumps, p4est, + zlib, # propagated by p4est but required by petsc + hypre, + fftw, + superlu, + superlu_dist, + suitesparse, + + # Used in passthru.tests + petsc, + mpich, }: assert withFullDeps -> withCommonDeps; # This version of PETSc does not support a non-MPI p4est build -assert withP4est -> (p4est.mpiSupport && mpiSupport); +assert withP4est -> (mpiSupport && withZlib); # Package parmetis depend on metis and mpi support assert withParmetis -> (withMetis && mpiSupport); -assert withPtscotch -> mpiSupport; +assert withPtscotch -> (mpiSupport && withZlib); assert withScalapack -> mpiSupport; -assert withMumps -> withScalapack; +assert (withMumps && mpiSupport) -> withScalapack; +assert withHypre -> mpiSupport; +assert withSuperLuDist -> mpiSupport; -stdenv.mkDerivation rec { +let + petscPackages = lib.makeScope newScope (self: { + inherit + mpi + python3 + python3Packages + # global override options + mpiSupport + fortranSupport + pythonSupport + precision + ; + enableMpi = self.mpiSupport; + + petscPackages = self; + # external libraries + blas = self.callPackage blas.override { }; + lapack = self.callPackage lapack.override { }; + hdf5 = self.callPackage hdf5.override { + fortran = gfortran; + cppSupport = !mpiSupport; + }; + metis = self.callPackage metis.override { }; + parmetis = self.callPackage parmetis.override { }; + scotch = self.callPackage scotch.override { }; + scalapack = self.callPackage scalapack.override { }; + mumps = self.callPackage mumps.override { }; + p4est = self.callPackage p4est.override { }; + hypre = self.callPackage hypre.override { }; + fftw = self.callPackage fftw.override { }; + superlu = self.callPackage superlu.override { }; + superlu_dist = self.callPackage superlu_dist.override { }; + suitesparse = self.callPackage suitesparse.override { }; + }); +in +stdenv.mkDerivation (finalAttrs: { pname = "petsc"; - version = "3.22.4"; + version = "3.23.2"; src = fetchzip { - url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${version}.tar.gz"; - hash = "sha256-8WV1ylXytkhiNa7YpWSOIpSvzLCCjdVVe5SiGfhicas="; + url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz"; + hash = "sha256-I/vxSo0CVvkcEPmbSahPog1MiyyG4IyNorrZUAPSTYw="; }; strictDeps = true; @@ -70,6 +125,7 @@ stdenv.mkDerivation rec { python3 gfortran pkg-config + bison ] ++ lib.optional mpiSupport mpi ++ lib.optionals pythonSupport [ @@ -79,16 +135,22 @@ stdenv.mkDerivation rec { buildInputs = [ - blas - lapack + petscPackages.blas + petscPackages.lapack ] - ++ lib.optional withHdf5 hdf5-fortran-mpi - ++ lib.optional withP4est p4est - ++ lib.optional withMetis metis - ++ lib.optional withParmetis parmetis - ++ lib.optional withPtscotch scotch - ++ lib.optional withScalapack scalapack - ++ lib.optional withMumps mumps_par; + ++ lib.optional withZlib zlib + ++ lib.optional withHdf5 petscPackages.hdf5 + ++ lib.optional withP4est petscPackages.p4est + ++ lib.optional withMetis petscPackages.metis + ++ lib.optional withParmetis petscPackages.parmetis + ++ lib.optional withPtscotch petscPackages.scotch + ++ lib.optional withScalapack petscPackages.scalapack + ++ lib.optional withMumps petscPackages.mumps + ++ lib.optional withHypre petscPackages.hypre + ++ lib.optional withSuperLu petscPackages.superlu + ++ lib.optional withSuperLuDist petscPackages.superlu_dist + ++ lib.optional withFftw petscPackages.fftw + ++ lib.optional withSuitesparse petscPackages.suitesparse; propagatedBuildInputs = lib.optional pythonSupport python3Packages.numpy; @@ -107,59 +169,46 @@ stdenv.mkDerivation rec { configureFlags = [ - "--with-blas=1" - "--with-lapack=1" - "--with-scalar-type=${petsc-scalar-type}" - "--with-precision=${petsc-precision}" + "--with-blaslapack=1" + "--with-scalar-type=${scalarType}" + "--with-precision=${precision}" "--with-mpi=${if mpiSupport then "1" else "0"}" ] - ++ lib.optional pythonSupport "--with-petsc4py=1" + ++ lib.optionals (!mpiSupport) [ + "--with-cc=${stdenv.cc}/bin/${if stdenv.cc.isGNU then "gcc" else "clang"}" + "--with-cxx=${stdenv.cc}/bin/${if stdenv.cc.isGNU then "g++" else "clang++"}" + "--with-fc=${gfortran}/bin/gfortran" + ] ++ lib.optionals mpiSupport [ - "--CC=mpicc" - "--with-cxx=mpicxx" - "--with-fc=mpif90" + "--with-cc=${lib.getDev mpi}/bin/mpicc" + "--with-cxx=${lib.getDev mpi}/bin/mpicxx" + "--with-fc=${lib.getDev mpi}/bin/mpif90" ] - ++ lib.optionals withMetis [ - "--with-metis=1" - "--with-metis-dir=${metis}" - ] - ++ lib.optionals withParmetis [ - "--with-parmetis=1" - "--with-parmetis-dir=${parmetis}" - ] - ++ lib.optionals withPtscotch [ - "--with-ptscotch=1" - "--with-ptscotch-include=${lib.getDev scotch}/include" - "--with-ptscotch-lib=[-L${lib.getLib scotch}/lib,-lptscotch,-lptesmumps,-lptscotchparmetisv3,-lptscotcherr,-lesmumps,-lscotch,-lscotcherr]" - ] - ++ lib.optionals withScalapack [ - "--with-scalapack=1" - "--with-scalapack-dir=${scalapack}" - ] - ++ lib.optionals withMumps [ - "--with-mumps=1" - "--with-mumps-dir=${mumps_par}" - ] - ++ lib.optionals withP4est [ - "--with-p4est=1" - "--with-zlib-include=${lib.getDev zlib}/include" - "--with-zlib-lib=[-L${lib.getLib zlib}/lib,-lz]" - ] - ++ lib.optionals withHdf5 [ - "--with-hdf5=1" - "--with-hdf5-fortran-bindings=1" - "--with-hdf5-include=${lib.getDev hdf5-fortran-mpi}/include" - "--with-hdf5-lib=[-L${lib.getLib hdf5-fortran-mpi}/lib,-lhdf5]" - ] - ++ lib.optionals petsc-optimized [ + ++ lib.optionals (!debug) [ "--with-debugging=0" "COPTFLAGS=-O3" "FOPTFLAGS=-O3" "CXXOPTFLAGS=-O3" "CXXFLAGS=-O3" - ]; + ] + ++ lib.optional (!fortranSupport) "--with-fortran-bindings=0" + ++ lib.optional pythonSupport "--with-petsc4py=1" + ++ lib.optional withMetis "--with-metis=1" + ++ lib.optional withParmetis "--with-parmetis=1" + ++ lib.optional withPtscotch "--with-ptscotch=1" + ++ lib.optional withScalapack "--with-scalapack=1" + ++ lib.optional withMumps "--with-mumps=1" + ++ lib.optional (withMumps && !mpiSupport) "--with-mumps-serial=1" + ++ lib.optional withP4est "--with-p4est=1" + ++ lib.optional withZlib "--with-zlib=1" + ++ lib.optional withHdf5 "--with-hdf5=1" + ++ lib.optional withHypre "--with-hypre=1" + ++ lib.optional withSuperLu "--with-superlu=1" + ++ lib.optional withSuperLuDist "--with-superlu_dist=1" + ++ lib.optional withFftw "--with-fftw=1" + ++ lib.optional withSuitesparse "--with-suitesparse=1"; - hardeningDisable = lib.optionals (!petsc-optimized) [ + hardeningDisable = lib.optionals debug [ "fortify" "fortify3" ]; @@ -168,6 +217,30 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Ensure petscvariables contains absolute paths for compilers and flags so that downstream + # packages relying on PETSc's runtime configuration (e.g. form compilers, code generators) + # can correctly compile and link generated code + postInstall = lib.concatStringsSep "\n" ( + map ( + package: + let + pname = package.pname or package.name; + prefix = + if (pname == "blas" || pname == "lapack") then + "BLASLAPACK" + else + lib.toUpper (builtins.elemAt (lib.splitString "-" pname) 0); + in + '' + substituteInPlace $out/lib/petsc/conf/petscvariables \ + --replace-fail "${prefix}_INCLUDE =" "${prefix}_INCLUDE = -I${lib.getDev package}/include" \ + --replace-fail "${prefix}_LIB =" "${prefix}_LIB = -L${lib.getLib package}/lib" + '' + ) finalAttrs.buildInputs + ); + + __darwinAllowLocalNetworking = true; + # This is needed as the checks need to compile and link the test cases with # -lpetsc, which is not available in the checkPhase, which is executed before # the installPhase. The installCheckPhase comes after the installPhase, so @@ -198,19 +271,43 @@ stdenv.mkDerivation rec { pythonImportsCheck = [ "petsc4py" ]; passthru = { - inherit mpiSupport pythonSupport; + inherit + mpiSupport + pythonSupport + fortranSupport + ; + petscPackages = petscPackages.overrideScope ( + final: prev: { + petsc = finalAttrs.finalPackage; + } + ); + tests = + { + serial = petsc.override { + mpiSupport = false; + }; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + fullDeps = petsc.override { + withFullDeps = true; + withParmetis = false; + }; + mpich = petsc.override { + mpi = mpich; + }; + }; }; setupHook = ./setup-hook.sh; - meta = with lib; { + meta = { description = "Portable Extensible Toolkit for Scientific computation"; homepage = "https://petsc.org/release/"; - license = licenses.bsd2; + license = lib.licenses.bsd2; platforms = lib.platforms.unix; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ cburstedde qbisi ]; }; -} +}) diff --git a/pkgs/by-name/pf/pferd/package.nix b/pkgs/by-name/pf/pferd/package.nix index 1f563eaaced4..9bf1ebd48b6f 100644 --- a/pkgs/by-name/pf/pferd/package.nix +++ b/pkgs/by-name/pf/pferd/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.7.0"; + version = "3.8.2"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; tag = "v${version}"; - sha256 = "sha256-4+LlnGv/i9zDf+HeW86PJ6XsPMEkJ0JzhLr14MJ4WKM="; + sha256 = "sha256-HDzlztk9ezLSckT1RM0pd2PJjheC9UedM4fL5GJ1Wdk="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/pf/pfetch-rs/package.nix b/pkgs/by-name/pf/pfetch-rs/package.nix index 33ffa99ff901..b01632e6a4fb 100644 --- a/pkgs/by-name/pf/pfetch-rs/package.nix +++ b/pkgs/by-name/pf/pfetch-rs/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,11 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-36MjBzSzEOVaSnd6dTqYnV+Pi+5EDoUskkYsvYMGrgg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.DisplayServices - ]; - meta = with lib; { description = "Rewrite of the pfetch system information tool in Rust"; homepage = "https://github.com/Gobidev/pfetch-rs"; diff --git a/pkgs/by-name/pf/pfetch/package.nix b/pkgs/by-name/pf/pfetch/package.nix index 6e6e53ae38a6..1a559db35571 100644 --- a/pkgs/by-name/pf/pfetch/package.nix +++ b/pkgs/by-name/pf/pfetch/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/pg/pg-dump-anon/package.nix b/pkgs/by-name/pg/pg-dump-anon/package.nix index 3836d43f95ae..506a2e84ef17 100644 --- a/pkgs/by-name/pg/pg-dump-anon/package.nix +++ b/pkgs/by-name/pg/pg-dump-anon/package.nix @@ -32,7 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Export databases with data being anonymized with the anonymizer extension"; homepage = "https://postgresql-anonymizer.readthedocs.io/en/stable/"; - maintainers = teams.flyingcircus.members; + teams = [ teams.flyingcircus ]; license = licenses.postgresql; mainProgram = "pg_dump_anon"; }; diff --git a/pkgs/by-name/pg/pg_checksums/package.nix b/pkgs/by-name/pg/pg_checksums/package.nix index a52513a5f805..35cfe1463b83 100644 --- a/pkgs/by-name/pg/pg_checksums/package.nix +++ b/pkgs/by-name/pg/pg_checksums/package.nix @@ -1,13 +1,13 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql, }: -stdenv.mkDerivation rec { +clangStdenv.mkDerivation rec { pname = "pg_checksums"; version = "1.2"; @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-joGaCoRMGpEqq7pnT4Qd7XySjZ5wlZPW27WfOv1UFF4="; }; - nativeBuildInputs = [ libxslt.bin ]; + nativeBuildInputs = [ + libxslt.bin + postgresql.pg_config + ]; buildInputs = [ postgresql ]; diff --git a/pkgs/by-name/pg/pg_featureserv/package.nix b/pkgs/by-name/pg/pg_featureserv/package.nix index 6774bfda4e21..c12bf67c2f22 100644 --- a/pkgs/by-name/pg/pg_featureserv/package.nix +++ b/pkgs/by-name/pg/pg_featureserv/package.nix @@ -48,6 +48,6 @@ buildGoModule rec { mainProgram = "pg_featureserv"; homepage = "https://github.com/CrunchyData/pg_featureserv"; license = licenses.asl20; - maintainers = teams.geospatial.members; + teams = [ teams.geospatial ]; }; } diff --git a/pkgs/by-name/pg/pg_tileserv/package.nix b/pkgs/by-name/pg/pg_tileserv/package.nix index 96d5f6eb5caa..de715fc57fe7 100644 --- a/pkgs/by-name/pg/pg_tileserv/package.nix +++ b/pkgs/by-name/pg/pg_tileserv/package.nix @@ -50,6 +50,6 @@ buildGoModule rec { mainProgram = "pg_tileserv"; homepage = "https://github.com/CrunchyData/pg_tileserv"; license = licenses.asl20; - maintainers = teams.geospatial.members; + teams = [ teams.geospatial ]; }; } diff --git a/pkgs/by-name/pg/pgbackrest/package.nix b/pkgs/by-name/pg/pgbackrest/package.nix index 49a072154414..7f0d3be5d5e0 100644 --- a/pkgs/by-name/pg/pgbackrest/package.nix +++ b/pkgs/by-name/pg/pgbackrest/package.nix @@ -1,31 +1,32 @@ { - lib, - stdenv, - fetchFromGitHub, - meson, - ninja, - python3, - pkg-config, - libbacktrace, bzip2, - lz4, + fetchFromGitHub, + lib, + libbacktrace, libpq, + libssh2, libxml2, libyaml, + lz4, + meson, + ninja, + pkg-config, + python3, + stdenv, zlib, - libssh2, zstd, + nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pgbackrest"; - version = "2.54.2"; + version = "2.55.1"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; - rev = "release/${version}"; - sha256 = "sha256-Q0WZLbtn+qJLs2jop5S92NFC6QBtCQnU3AEEcm6MSVI="; + tag = "release/${finalAttrs.version}"; + hash = "sha256-A1dTywcCHBu7Ml0Q9k//VVPFN1C3kmmMkq4ok9T4g94="; }; strictDeps = true; @@ -33,28 +34,30 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - python3 pkg-config + python3 ]; buildInputs = [ - libbacktrace bzip2 - lz4 + libbacktrace libpq + libssh2 libxml2 libyaml + lz4 zlib - libssh2 zstd ]; - meta = with lib; { + passthru.tests = nixosTests.pgbackrest; + + meta = { description = "Reliable PostgreSQL backup & restore"; - homepage = "https://pgbackrest.org/"; - changelog = "https://github.com/pgbackrest/pgbackrest/releases"; - license = licenses.mit; + homepage = "https://pgbackrest.org"; + changelog = "https://github.com/pgbackrest/pgbackrest/releases/tag/release%2F${finalAttrs.version}"; + license = lib.licenses.mit; mainProgram = "pgbackrest"; - maintainers = with maintainers; [ zaninime ]; + maintainers = with lib.maintainers; [ zaninime ]; }; -} +}) diff --git a/pkgs/by-name/pg/pgbouncer/package.nix b/pkgs/by-name/pg/pgbouncer/package.nix index 90ae5b91d429..af6b31cd406d 100644 --- a/pkgs/by-name/pg/pgbouncer/package.nix +++ b/pkgs/by-name/pg/pgbouncer/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://www.pgbouncer.org/downloads/files/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-52rflBoxkaQW4iPAss2/cxWe74CioyMUr2+9guQaHUE="; + hash = "sha256-2nKjq6EwcodtBVo+WN1Kukpd5O1hSOcwMxhSRVmP0+A="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pg/pgcat/package.nix b/pkgs/by-name/pg/pgcat/package.nix index 159acd4ca1e7..e0e8945250a8 100644 --- a/pkgs/by-name/pg/pgcat/package.nix +++ b/pkgs/by-name/pg/pgcat/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, nix-update-script, testers, pgcat, @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-6x/IPFncfOPxautW7gVUh5LG0hK4h6T4QL7B82Moi6o="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - checkFlags = [ # requires network access "--skip=dns_cache" diff --git a/pkgs/by-name/pg/pgcopydb/package.nix b/pkgs/by-name/pg/pgcopydb/package.nix index 9cf2992b28ba..86a346c55fdd 100644 --- a/pkgs/by-name/pg/pgcopydb/package.nix +++ b/pkgs/by-name/pg/pgcopydb/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, libkrb5, openssl, @@ -13,7 +13,7 @@ zlib, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "pgcopydb"; version = "0.15"; @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config + postgresql.pg_config ]; buildInputs = @@ -37,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { sqlite zlib ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ + ++ lib.optionals clangStdenv.hostPlatform.isLinux [ pam ]; diff --git a/pkgs/by-name/pg/pgf1/package.nix b/pkgs/by-name/pg/pgf1/package.nix deleted file mode 100644 index fb5e7a9a420f..000000000000 --- a/pkgs/by-name/pg/pgf1/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "pgf"; - version = "1.18"; - - src = fetchFromGitHub { - owner = "pgf-tikz"; - repo = "pgf"; - tag = "version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; - hash = "sha256-WZ/191iEDd5VK1bnV9JZx2BZfACUeAUhAqrlyx+ZvA4="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/texmf-nix - cp -prd context doc generic latex plain $out/share/texmf-nix/ - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/pgf-tikz/pgf"; - description = "Portable Graphic Format for TeX - version ${finalAttrs.version}"; - branch = lib.versions.major version; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index 0f3547ed42c7..8ee301ef4dfa 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -3,19 +3,18 @@ stdenv, perlPackages, fetchFromGitHub, - fetchpatch, shortenPerlShebang, }: perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.5"; + version = "5.6"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - hash = "sha256-4KtrsckO9Q9H0yIM0877YvWaDW02CQVAQiOKD919e9w="; + hash = "sha256-EJLAP1uBmWxWEsdLJYTuViMv4o0iEi2fqy79ixyRijU="; }; outputs = [ "out" ]; @@ -25,14 +24,6 @@ perlPackages.buildPerlPackage rec { # Avoid creating perllocal.pod, which contains a timestamp installTargets = [ "pure_install" ]; - patches = [ - # Fix an uninitialized variable error. Remove with the next release. - (fetchpatch { - url = "https://github.com/darold/pgFormatter/commit/c2622c47d48cee47effecbf58a588c3cd3a7bf1a.patch"; - sha256 = "sha256-WnQIOvfuzL2HrwtL0HaaYObrBxhXDu82jxGcqggQVhc="; - }) - ]; - # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS. patchPhase = '' substituteInPlace pg_format \ diff --git a/pkgs/by-name/pg/pgmanage/package.nix b/pkgs/by-name/pg/pgmanage/package.nix index 801c4bd00f64..5fc3468dae44 100644 --- a/pkgs/by-name/pg/pgmanage/package.nix +++ b/pkgs/by-name/pg/pgmanage/package.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation { openssl ]; + nativeBuildInputs = [ + libpq.pg_config + ]; + passthru.tests.sign-in = nixosTests.pgmanage; meta = with lib; { diff --git a/pkgs/by-name/pg/pgmodeler/package.nix b/pkgs/by-name/pg/pgmodeler/package.nix new file mode 100644 index 000000000000..177b06fee164 --- /dev/null +++ b/pkgs/by-name/pg/pgmodeler/package.nix @@ -0,0 +1,91 @@ +{ + lib, + stdenv, + copyDesktopItems, + fetchFromGitHub, + makeDesktopItem, + pkg-config, + libpq, + cups, + libxml2, + qt6, +}: + +stdenv.mkDerivation rec { + pname = "pgmodeler"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "pgmodeler"; + repo = "pgmodeler"; + rev = "v${version}"; + sha256 = "sha256-q0XoShp+XERvyERLxi9uh//dNxVEtfL+UY9uVKqX4fI="; + }; + + nativeBuildInputs = [ + pkg-config + qt6.qmake + qt6.wrapQtAppsHook + copyDesktopItems + ]; + + qmakeFlags = + [ + "pgmodeler.pro" + "CONFIG+=release" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "PGSQL_INC=${lib.getDev libpq}/include" + "PGSQL_LIB=${lib.getLib libpq}/lib/libpq.dylib" + "XML_INC=${libxml2.dev}/include/libxml2" + "XML_LIB=${libxml2.out}/lib/libxml2.dylib" + "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents" + ]; + + buildInputs = + [ + qt6.qtbase + qt6.qtsvg + libpq + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cups + libxml2 + ]; + + desktopItems = [ + (makeDesktopItem { + name = "pgModeler"; + exec = "pgmodeler"; + icon = "pgmodeler"; + desktopName = "PgModeler"; + genericName = "PgModeler"; + comment = meta.description; + categories = [ "Development" ]; + startupWMClass = "pgmodeler"; + }) + ]; + + postInstall = + '' + install -Dm444 apps/pgmodeler/res/windows_ico.ico $out/share/icons/hicolor/256x256/apps/pgmodeler.ico + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/bin + for item in pgmodeler pgmodeler-{cli,se,ch} + do + ln -s $out/Applications/pgModeler.app/Contents/MacOS/$item $out/bin + done + ''; + + dontWrapQtApps = stdenv.hostPlatform.isDarwin; + + meta = with lib; { + description = "Database modeling tool for PostgreSQL"; + homepage = "https://pgmodeler.io/"; + license = licenses.gpl3; + maintainers = [ maintainers.esclear ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index e8c129cbcd52..8ed64df7b280 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.15.2"; + version = "0.16.1"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-kPQ0GCRYrxoAz4Y2uGHsvn8KxiAE2Fc6FMOJyZaWTjI="; + hash = "sha256-NsbCgXruRIyzEdJjzImJJeTjDhMQwmo7bCTg9LTND+Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pg/pgrok/package.nix b/pkgs/by-name/pg/pgrok/package.nix index dd3c674b7416..107c0c2fb3df 100644 --- a/pkgs/by-name/pg/pgrok/package.nix +++ b/pkgs/by-name/pg/pgrok/package.nix @@ -9,12 +9,12 @@ let pname = "pgrok"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "pgrok"; repo = "pgrok"; tag = "v${version}"; - hash = "sha256-1T3PUMgtEfjbCFmUKwKVofHPCCE0Hw1F18iC0mfh4KQ="; + hash = "sha256-eDtYnsHZpdIGcgRGHTptlfVf//bxup6ZDWvVkBJdBbE="; }; in @@ -33,10 +33,10 @@ buildGoModule { env.pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-xObDEkNGMXcUqX9thAJoE45yzd7f15k2odDWv9X3RRE="; + hash = "sha256-o6wxO8EGRmhcYggJnfxDkH+nbt+isc8bfHji8Hu9YKg="; }; - vendorHash = "sha256-1s8PPP/Q5bSJleCPZ6P4BwLEan/lelohRKX/0RStdvY="; + vendorHash = "sha256-nIxsG1O5RG+PDSWBcUWpk+4aFq2cYaxpkgOoDqLjY90="; ldflags = [ "-s" diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix index b3592a8a7392..18f4647e8484 100644 --- a/pkgs/by-name/pg/pgroll/package.nix +++ b/pkgs/by-name/pg/pgroll/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "pgroll"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "xataio"; repo = "pgroll"; tag = "v${version}"; - hash = "sha256-AJ0dTvywbwwSHOwSPrAgTE9M1AMvo/GRj6L1dZM9Hz8="; + hash = "sha256-hmFCXVlcqvOXbDkHcsWcdVoxZoMe+Gaji011kCqU0lI="; }; proxyVendor = true; - vendorHash = "sha256-olblf/mi/M9Zo4C/fR/Z11C+bAEFOy7bz7EXfMn8Akw="; + vendorHash = "sha256-o1ei6KSZUclKqAxkzQgtLnvttzMOK1IWrpbwq7AufO8="; excludedPackages = [ "dev" ]; diff --git a/pkgs/by-name/ph/pharo/package.nix b/pkgs/by-name/ph/pharo/package.nix index aeca44373b14..b5ed2cb7b5c3 100644 --- a/pkgs/by-name/ph/pharo/package.nix +++ b/pkgs/by-name/ph/pharo/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pharo"; - version = "10.3.1-6cdb1e5"; + version = "10.3.4+3.884643b"; src = fetchzip { # 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-${finalAttrs.version}-Linux-x86_64-c-src.zip"; - hash = "sha256-Oskbo0ZMh2Wr8uY9BjA54AhFVDEuzs4AN8cpO02gdfY="; + url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-v${finalAttrs.version}-Linux-x86_64-c-src.zip"; + hash = "sha256-JBN0gPVMIUFzrdLqrCnCvf4cbZMfpluO2/jCxk3U+M8="; }; strictDeps = true; @@ -59,6 +59,12 @@ stdenv.mkDerivation (finalAttrs: { "-Wno-incompatible-pointer-types" ]; + # Fix missing version.info + preBuild = '' + mkdir -p /build/source/build/ + echo "${finalAttrs.version}" > /build/source/build/version.info + ''; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ph/phase-cli/package.nix b/pkgs/by-name/ph/phase-cli/package.nix index 26c9cf88c540..3bcbcbff9ddc 100644 --- a/pkgs/by-name/ph/phase-cli/package.nix +++ b/pkgs/by-name/ph/phase-cli/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "phase-cli"; - version = "1.19.0"; + version = "1.19.1"; pyproject = true; src = fetchFromGitHub { owner = "phasehq"; repo = "cli"; tag = "v${version}"; - hash = "sha256-E5vSF8/DLUH2zfGwbQ3XqELTSP4XR3cqfcMM8hMaOf4="; + hash = "sha256-2FVnOQ6A7PopqE9KRlZP1QhGP6Ia5kGPDvguOI45aPI="; }; build-system = with python3Packages; [ @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Securely manage and sync environment variables with Phase"; diff --git a/pkgs/by-name/ph/phetch/package.nix b/pkgs/by-name/ph/phetch/package.nix new file mode 100644 index 000000000000..a198f7c0443b --- /dev/null +++ b/pkgs/by-name/ph/phetch/package.nix @@ -0,0 +1,65 @@ +{ + lib, + fetchFromGitHub, + installShellFiles, + rustPlatform, + pkg-config, + openssl, + scdoc, + which, +}: + +rustPlatform.buildRustPackage rec { + pname = "phetch"; + version = "1.2.0"; + + outputs = [ + "out" + "man" + ]; + + src = fetchFromGitHub { + owner = "xvxx"; + repo = pname; + tag = "v${version}"; + hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-2lbQAM3gdytXsoMFzKwLWA1hvQIJf1vBdMRpYx/VLVg="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + scdoc + which + ]; + buildInputs = [ openssl ]; + + postInstall = '' + make manual + installManPage doc/phetch.1 + ''; + + doCheck = true; + + meta = with lib; { + description = "Quick lil gopher client for your terminal, written in rust"; + mainProgram = "phetch"; + longDescription = '' + phetch is a terminal client designed to help you quickly navigate the gophersphere. + - <1MB executable for Linux, Mac, and NetBSD + - Technicolor design (based on GILD) + - No-nonsense keyboard navigation + - Supports Gopher searches, text and menu pages, and downloads + - Save your favorite Gopher sites with bookmarks + - Opt-in history tracking + - Secure Gopher support (TLS) + - Tor support + ''; + changelog = "https://github.com/xvxx/phetch/releases/tag/v${version}"; + homepage = "https://github.com/xvxx/phetch"; + license = licenses.mit; + maintainers = with maintainers; [ felixalbrigtsen ]; + }; +} diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix index 0fadbdf22b63..e48baa57c262 100644 --- a/pkgs/by-name/ph/phoenixd/package.nix +++ b/pkgs/by-name/ph/phoenixd/package.nix @@ -1,6 +1,6 @@ { - stdenv, lib, + stdenv, fetchurl, unzip, autoPatchelfHook, @@ -9,32 +9,35 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "phoenixd"; - version = "0.5.0"; + version = "0.6.0"; - suffix = - { - aarch64-darwin = "macos-arm64"; - x86_64-darwin = "macos-x64"; - x86_64-linux = "linux-x64"; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + src = + let + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + suffix = selectSystem { + aarch64-darwin = "macos-arm64"; + x86_64-darwin = "macos-x64"; + x86_64-linux = "linux-x64"; + aarch64-linux = "linux-arm64"; + }; + in + fetchurl { + url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip"; + hash = selectSystem { + aarch64-darwin = "sha256-CJCGVL6az02Yxdj7RpXMScSdx+yKvMfBMKE0SaBYTow="; + x86_64-darwin = "sha256-ClSyQ8Ir13wVBBpYivv2W+s5ZlYrx+6drUbUp5EhlBo="; + x86_64-linux = "sha256-z+gfiFor8nDHl2vjGCA0RYKrUXmdiRX6ztucXOOxLoI="; + aarch64-linux = "sha256-YkGJJS3dSHtxB891urGdL3f5F5TYIKBHKRrREAk5NkM="; + }; + }; - src = fetchurl { - url = "https://github.com/ACINQ/phoenixd/releases/download/v${version}/phoenix-${version}-${suffix}.zip"; - hash = - { - aarch64-darwin = "sha256-hfg/gca27t8psG1+7u5DvHCuQDQJou6Fp3+ySaz+MXc="; - x86_64-darwin = "sha256-qpwkt2rbilpQVmAkl6Q4XyecSzayzYb1k5H5ur7SItk="; - x86_64-linux = "sha256-lshsJQ9km8C+KDtp1nQiK8h7LJN3A8GlGN6Yhb3VPtk="; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; + nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libgcc # provides libgcc_s.so.1 libxcrypt-legacy # provides libcrypt.so.1 zlib # provides libz.so.1 @@ -43,17 +46,24 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin - cp phoenix{-cli,d} $out/bin/ + install -Dm0755 phoenix-cli $out/bin/phoenix-cli + install -Dm0755 phoenixd $out/bin/phoenixd runHook postInstall ''; - meta = with lib; { + passthru.updateScript = ./update.sh; + + meta = { description = "Server equivalent of the popular Phoenix wallet for mobile"; homepage = "https://phoenix.acinq.co/server"; - license = licenses.asl20; - maintainers = with maintainers; [ prusnak ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ prusnak ]; + platforms = [ + "aarch64-linux" + "aarch64-darwin" + "x86_64-linux" + "x86_64-darwin" + ]; }; -} +}) diff --git a/pkgs/by-name/ph/phoenixd/update.sh b/pkgs/by-name/ph/phoenixd/update.sh new file mode 100755 index 000000000000..3b43d0443740 --- /dev/null +++ b/pkgs/by-name/ph/phoenixd/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix curl coreutils common-updater-scripts nix-update + +set -eou pipefail + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; phoenixd.version or (lib.getVersion phoenixd)" | tr -d '"') +nix-update phoenixd --system x86_64-linux +latestVersion=$(nix-instantiate --eval -E "with import ./. {}; phoenixd.version or (lib.getVersion phoenixd)" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +for system in \ + aarch64-linux \ + x86_64-darwin \ + aarch64-darwin; do + hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; phoenixd.src.url" --system "$system" | tr -d '"'))) + update-source-version phoenixd $latestVersion $hash --system=$system --ignore-same-version +done diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index 776914930af4..972c9a19424b 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "photoqt"; - version = "4.8.1"; + version = "4.9.1"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-Iq5Fc0v+EYFe1YG3ZhZKl8leXD+TpGGhaQjr800vz7Y="; + hash = "sha256-dAqAM9zsFWPiGF7njhy7SM6f/5S19jMyTv57JadgHu8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index f1bfef2201b5..1e6842e12424 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpactor"; - version = "2025.03.28.0"; + version = "2025.04.17.0"; src = fetchFromGitHub { owner = "phpactor"; repo = "phpactor"; rev = finalAttrs.version; - hash = "sha256-K3phBiu2D3DbOm7mApqqSNnVCsfYRQtN/o3bCVubN9I="; + hash = "sha256-HJH+31qAE4shamRl1/+TRtje0ZzOtPV7l++NIaacmxE="; }; - vendorHash = "sha256-7wFlS+a97tdhfxfc/IElzOVH25MAgf42UZBC1giBAls="; + vendorHash = "sha256-qdR8/ME9H7gusALjXXbKl8hj20N704Nw1tC3V9xTcEY="; nativeBuildInputs = [ installShellFiles ]; @@ -36,6 +36,6 @@ php.buildComposerProject2 (finalAttrs: { homepage = "https://github.com/phpactor/phpactor"; license = lib.licenses.mit; mainProgram = "phpactor"; - maintainers = lib.teams.php.members; + teams = [ lib.teams.php ]; }; }) diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix index a719be228576..552e409b86f5 100644 --- a/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/pkgs/by-name/ph/phpdocumentor/package.nix @@ -31,7 +31,7 @@ php.buildComposerProject2 (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index de9210c102a6..7eea0a35f37d 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -10,16 +10,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "12.0.10"; + version = "12.1.5"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-JFJauSTUOZzUbpvKx6IrD3QDum/rNa+5JZZsoThA4TM="; + hash = "sha256-+KYRsYFUs85fOO2mTcB73Cmhc5HOHe5/y7lryGdBYwE="; }; - vendorHash = "sha256-fjed7Zm/Iq1VS7eakvrvZs1Yy1t3it3p5U61FKUB2zI="; + vendorHash = "sha256-V7v2XdVawZ/DWjyKugc700EaOCPMWr+wXaXToBWXPQY="; passthru = { updateScript = nix-update-script { }; @@ -36,6 +36,7 @@ php.buildComposerProject2 (finalAttrs: { homepage = "https://phpunit.de"; license = lib.licenses.bsd3; mainProgram = "phpunit"; - maintainers = with lib.maintainers; [ onny ] ++ lib.teams.php.members; + maintainers = with lib.maintainers; [ onny ]; + teams = [ lib.teams.php ]; }; }) diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index 01c005fb9ced..64a81fb07e3c 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.39.0"; + version = "2.40.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-85XgRml1D6J4HkxiUk0zLlC+q0ylmN68hL0z73HG/Lk="; + sha256 = "sha256-d/B5XzEAM1GlpQxshy0kEJexF01FlF99hnoctKDXhp0="; }; - vendorHash = "sha256-k7y0sJTulCf234oMCccw+bk0pzsebqD82kkVX7xZluE="; + vendorHash = "sha256-VV4ctHj9fPosAgqBOfkqOKETSeGJXFPPP+kBMgqV2nk="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/by-name/pi/picard-tools/package.nix b/pkgs/by-name/pi/picard-tools/package.nix index a73167fe8a94..f5ddc9f38205 100644 --- a/pkgs/by-name/pi/picard-tools/package.nix +++ b/pkgs/by-name/pi/picard-tools/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-WIGadmBka3SzTigvXU0hyNuuoi3e/5bjJYdV2voPhtw="; + sha256 = "sha256-52EowoOIn8WDyd6jOjt0SJdMBn0QLJ41vhUmQtTV+QE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pi/pico-sdk/package.nix b/pkgs/by-name/pi/pico-sdk/package.nix index 109f11ea04bf..0835ad2111ca 100644 --- a/pkgs/by-name/pi/pico-sdk/package.nix +++ b/pkgs/by-name/pi/pico-sdk/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pico-sdk"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "raspberrypi"; @@ -26,9 +26,9 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = withSubmodules; hash = if withSubmodules then - "sha256-nLn6H/P79Jbk3/TIowH2WqmHFCXKEy7lgs7ZqhqJwDM=" + "sha256-8ru1uGjs11S2yQ+aRAvzU53K8mreZ+CC3H+ijfctuqg=" else - "sha256-QKc16Wnx2AvpM0/bklY8CnbsShVR1r5ejtRlvE8f8mM="; + "sha256-epO7yw6/21/ess3vMCkXvXEqAn6/4613zmH/hbaBbUw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/pi/picocom/package.nix b/pkgs/by-name/pi/picocom/package.nix index 4a549e27921c..bca2dbd1f25d 100644 --- a/pkgs/by-name/pi/picocom/package.nix +++ b/pkgs/by-name/pi/picocom/package.nix @@ -7,7 +7,6 @@ go-md2man, installShellFiles, linenoise, - darwin, lrzsz, }: @@ -35,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ linenoise - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + ]; makeFlags = [ "HISTFILE=.cache/picocom_history" diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix index 82400038c397..3700983f5760 100644 --- a/pkgs/by-name/pi/picocrypt/package.nix +++ b/pkgs/by-name/pi/picocrypt/package.nix @@ -1,6 +1,6 @@ { lib, - buildGo124Module, + buildGoModule, fetchFromGitHub, stdenv, copyDesktopItems, @@ -13,20 +13,20 @@ wrapGAppsHook3, }: -buildGo124Module rec { +buildGoModule (finalAttrs: { pname = "picocrypt"; - version = "1.47"; + version = "1.48"; src = fetchFromGitHub { owner = "Picocrypt"; repo = "Picocrypt"; - tag = version; - hash = "sha256-O/n9dJz8cdJwldOXnsG8W8OZU5WeSmNys746HxRHvdc="; + tag = finalAttrs.version; + hash = "sha256-Gvh6t/jFRBCX+I9CYkXV265PiRSSvH6qAgkU0fA/v4A="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; - vendorHash = "sha256-9xB0D5Og/eiWUZGMog6lBoze4GrdvBOtNAKcMc3AdIE="; + vendorHash = "sha256-HvtQFoAK4+DX2Mwzf5f39tTnxJcH7Dox/otlvPVczeA="; ldflags = [ "-s" @@ -60,7 +60,7 @@ buildGo124Module rec { name = "Picocrypt"; exec = "picocrypt-gui"; icon = "picocrypt"; - comment = meta.description; + comment = finalAttrs.meta.description; desktopName = "Picocrypt"; categories = [ "Utility" ]; }) @@ -69,9 +69,9 @@ buildGo124Module rec { meta = { description = "Very small, very simple, yet very secure encryption tool, written in Go"; homepage = "https://github.com/Picocrypt/Picocrypt"; - changelog = "https://github.com/Picocrypt/Picocrypt/blob/${version}/Changelog.md"; + changelog = "https://github.com/Picocrypt/Picocrypt/blob/${finalAttrs.version}/Changelog.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ ryand56 ]; mainProgram = "picocrypt-gui"; }; -} +}) diff --git a/pkgs/by-name/pi/picolibc/package.nix b/pkgs/by-name/pi/picolibc/package.nix new file mode 100644 index 000000000000..e870fbe3d3f3 --- /dev/null +++ b/pkgs/by-name/pi/picolibc/package.nix @@ -0,0 +1,226 @@ +{ + stdenv, + fetchFromGitHub, + lib, + meson, + ninja, + nix-update-script, + pkgsCross, + + # General Build Options + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L40-L57 + multilib ? true, + sanitize-bounds ? false, + sanitize-trap-on-error ? false, + profile ? false, + analyzer ? false, + assert-verbose ? true, + fast-strcmp ? true, + + # Testing options + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L75 + picolib ? stdenv.hostPlatform.isNone, + semihost ? stdenv.hostPlatform.isNone, + + # Stdio Options + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L114 + tinystdio ? true, + io-c99-formats ? true, + io-long-long ? false, + io-pos-args ? false, + io-long-double ? false, + + # Tinystdio options + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L129 + io-float-exact ? true, + atomic-ungetc ? true, + posix-console ? !stdenv.hostPlatform.isNone, + format-default ? "double", + printf-aliases ? true, + io-percent-b ? false, + printf-small-ultoa ? true, + printf-percent-n ? false, + minimal-io-long-long ? false, + fast-bufio ? false, + io-wchar ? false, + + # Internaltionalization options + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L181 + mb-capable ? false, + mb-extended-charsets ? false, + mb-ucs-charsets ? "auto", + mb-iso-charsets ? "auto", + mb-jis-charsets ? "auto", + mb-windows-charsets ? "auto", + + # Startup/shutdown options + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L198 + picocrt ? stdenv.hostPlatform.isNone, + picocrt-enable-mmu ? true, + picocrt-lib ? true, + picoexit ? true, + initfini-array ? true, + crt-runtime-size ? false, + + # Legacy (non-picoexit) startup/shutdown options + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L217 + newlib-atexit-dynamic-alloc ? false, + newlib-global-atexit ? !stdenv.hostPlatform.isNone, + newlib-register-fini ? false, + + # Malloc options + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L228 + newlib-nano-malloc ? true, + nano-malloc-clear-freed ? false, + + # Locking options + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L237 + single-thread ? false, + + # TLS storage options + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L244 + thread-local-storage ? "picolibc", + tls-model ? if stdenv.hostPlatform.isNone then "local-exec" else "global-dynamic", + newlib-global-errno ? false, + errno-function ? if stdenv.hostPlatform.isNone then "false" else "auto", + tls-rp2040 ? false, + + # Math options + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L261 + want-math-errno ? false, +}: +let + inherit (lib.strings) mesonBool mesonOption; + + canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; +in +stdenv.mkDerivation (finalAttrs: { + pname = "picolibc"; + version = "1.8.9-2"; + strictDeps = true; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "picolibc"; + repo = finalAttrs.pname; + tag = finalAttrs.version; + hash = "sha256-djOZKkinsaaYD4tUEA6mKdo+5em0GP1/+rI0mIm7Vs8="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + # Default values taken from + # Build fails without using them. + # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/doc/os.md?plain=1#L183 + mesonFlags = + [ + (mesonBool "multilib" multilib) + (mesonBool "sanitize-bounds" sanitize-bounds) + (mesonBool "sanitize-trap-on-error" sanitize-trap-on-error) + (mesonBool "profile" profile) + (mesonBool "analyzer" analyzer) + (mesonBool "assert-verbose" assert-verbose) + (mesonBool "fast-strcmp" fast-strcmp) + + # Testing options + (mesonBool "picolib" picolib) + (mesonBool "semihost" semihost) + (mesonBool "use-stdlib" true) + + # Install options + (mesonOption "specsdir" "${placeholder "dev"}/lib") + + (mesonBool "tinystdio" tinystdio) + (mesonBool "io-c99-formats" io-c99-formats) + (mesonBool "io-long-long" io-long-long) + (mesonBool "io-pos-args" io-pos-args) + (mesonBool "io-long-double" io-long-double) + + (mesonBool "io-float-exact" io-float-exact) + (mesonBool "atomic-ungetc" atomic-ungetc) + (mesonBool "posix-console" posix-console) + (mesonOption "format-default" format-default) + (mesonBool "printf-aliases" printf-aliases) + (mesonBool "io-percent-b" io-percent-b) + (mesonBool "printf-small-ultoa" printf-small-ultoa) + (mesonBool "printf-percent-n" printf-percent-n) + (mesonBool "minimal-io-long-long" minimal-io-long-long) + (mesonBool "fast-bufio" fast-bufio) + (mesonBool "io-wchar" io-wchar) + + (mesonBool "mb-capable" mb-capable) + (mesonBool "mb-extended-charsets" mb-extended-charsets) + (mesonOption "mb-ucs-charsets" mb-ucs-charsets) + (mesonOption "mb-iso-charsets" mb-iso-charsets) + (mesonOption "mb-jis-charsets" mb-jis-charsets) + (mesonOption "mb-windows-charsets" mb-windows-charsets) + + (mesonBool "picocrt" picocrt) + (mesonBool "picocrt-enable-mmu" picocrt-enable-mmu) + (mesonBool "picocrt-lib" picocrt-lib) + (mesonBool "picoexit" picoexit) + (mesonBool "newlib-initfini-array" initfini-array) + (mesonBool "crt-runtime-size" crt-runtime-size) + + (mesonBool "newlib-atexit-dynamic-alloc" newlib-atexit-dynamic-alloc) + (mesonBool "newlib-global-atexit" newlib-global-atexit) + (mesonBool "newlib-register-fini" newlib-register-fini) + + (mesonBool "newlib-nano-malloc" newlib-nano-malloc) + (mesonBool "nano-malloc-clear-freed" nano-malloc-clear-freed) + + (mesonBool "newlib-multithread" (!single-thread)) + + (mesonOption "thread-local-storage" thread-local-storage) + (mesonOption "tls-model" tls-model) + (mesonBool "newlib-global-errno" newlib-global-errno) + (mesonOption "errno-function" errno-function) + (mesonBool "tls-rp2040" tls-rp2040) + + (mesonBool "want-math-errno" want-math-errno) + ] + ++ lib.optionals finalAttrs.doCheck [ + (mesonBool "tests" true) + # Something is broken with this and I'm not sure what. + (mesonOption "tests-cdefs" "false") + ]; + + doCheck = canExecute; + + passthru = { + updateScript = nix-update-script { }; + tests = { + arm = pkgsCross.arm-embedded.picolibc; + }; + }; + + meta = + let + inherit (lib) licenses maintainers; + in + { + description = "C library designed for embedded 32- and 64- bit systems"; + longDescription = '' + Picolibc is library offering standard C library APIs that targets + small embedded systems with limited RAM. Picolibc was formed by blending + code from [Newlib](http://sourceware.org/newlib/) and + [AVR Libc](https://www.nongnu.org/avr-libc/). + ''; + homepage = "https://keithp.com/picolibc/"; + changelog = "https://github.com/picolibc/picolibc/releases/tag/${finalAttrs.version}"; + license = [ + licenses.bsd2 + licenses.bsd3 + ]; + maintainers = [ maintainers.RossSmyth ]; + # https://github.com/picolibc/picolibc/tree/db4d0fe5952d5ecd714781e3212d4086d970735a?tab=readme-ov-file#supported-architectures + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/pi/picoscope/package.nix b/pkgs/by-name/pi/picoscope/package.nix index edd02f15fd71..4e86f7eb13cf 100644 --- a/pkgs/by-name/pi/picoscope/package.nix +++ b/pkgs/by-name/pi/picoscope/package.nix @@ -30,7 +30,8 @@ let shared_meta = lib: { homepage = "https://www.picotech.com/downloads/linux"; - maintainers = with lib.maintainers; [ wirew0rm ] ++ lib.teams.lumiguide.members; + maintainers = with lib.maintainers; [ wirew0rm ]; + teams = [ lib.teams.lumiguide ]; platforms = [ "x86_64-linux" ]; license = lib.licenses.unfree; }; diff --git a/pkgs/by-name/pi/picotool/package.nix b/pkgs/by-name/pi/picotool/package.nix index 953121813b7f..2e60a2b57e80 100644 --- a/pkgs/by-name/pi/picotool/package.nix +++ b/pkgs/by-name/pi/picotool/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix index b36051cd5e42..b75a4b8a74db 100644 --- a/pkgs/by-name/pi/pict-rs/package.nix +++ b/pkgs/by-name/pi/pict-rs/package.nix @@ -5,7 +5,6 @@ rustPlatform, makeWrapper, protobuf, - darwin, imagemagick, ffmpeg, exiftool, @@ -14,25 +13,24 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.5.16"; + version = "0.5.19"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q0h+H3260CSpZemVuyaiwSHDi8yKXUX8Df9ih3IzAWo="; + sha256 = "sha256-ifuN3Kb7Hhq8H/eoZcumO5yyrxOCA+nWQQvAdFk7w2Q="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JJB5d9N2/tu2SYudNNguQGocQdyFAMvBea/Q3V7pYOw="; + cargoHash = "sha256-wZRWusETLl32BJy5lza4Bvix500VkpXLUpQb5aO8yJ0="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; postInstall = '' wrapProgram "$out/bin/pict-rs" \ diff --git a/pkgs/by-name/pi/pid-fan-controller/package.nix b/pkgs/by-name/pi/pid-fan-controller/package.nix new file mode 100644 index 000000000000..12cfdc626b57 --- /dev/null +++ b/pkgs/by-name/pi/pid-fan-controller/package.nix @@ -0,0 +1,29 @@ +{ + rustPlatform, + fetchFromGitHub, + lib, +}: +let + version = "0.1.1"; +in +rustPlatform.buildRustPackage { + pname = "pid-fan-controller"; + inherit version; + + src = fetchFromGitHub { + owner = "zimward"; + repo = "pid-fan-controller"; + rev = version; + hash = "sha256-ALR9Qa0AhcGyc3+7x5CEG/72+bJzhaEoIvQNL+QjldY="; + }; + cargoHash = "sha256-Y57VSheI94b43SwNCDdFvcNxzkA16KObBvzZ6ywYAyU="; + + meta = { + description = "Service to provide closed-loop PID fan control"; + homepage = "https://github.com/zimward/pid-fan-controller"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ zimward ]; + platforms = lib.platforms.linux; + mainProgram = "pid-fan-controller"; + }; +} diff --git a/pkgs/by-name/pi/pies/package.nix b/pkgs/by-name/pi/pies/package.nix index 4d9e858669be..e5499a017637 100644 --- a/pkgs/by-name/pi/pies/package.nix +++ b/pkgs/by-name/pi/pies/package.nix @@ -1,30 +1,40 @@ { - fetchurl, lib, stdenv, + fetchurl, libxcrypt, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pies"; - version = "1.3"; + version = "1.8"; src = fetchurl { - url = "mirror://gnu/pies/${pname}-${version}.tar.bz2"; - sha256 = "12r7rjjyibjdj08dvwbp0iflfpzl4s0zhn6cr6zj3hwf9gbzgl1g"; + url = "mirror://gnu/pies/pies-${finalAttrs.version}.tar.bz2"; + hash = "sha256-ZSi00WmC6il4+aSohqFKrKjtp6xFXYE7IIRGVwFmHWw="; }; buildInputs = [ libxcrypt ]; + patches = [ ./stdlib.patch ]; + + postPatch = '' + substituteInPlace configure \ + --replace-fail "gl_cv_func_memchr_works=\"guessing no\"" "gl_cv_func_memchr_works=yes" + ''; + configureFlags = [ "--sysconfdir=/etc" ]; hardeningDisable = [ "format" ]; doCheck = true; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + meta = { description = "Program invocation and execution supervisor"; - longDescription = '' The name Pies (pronounced "p-yes") stands for Program Invocation and Execution Supervisor. This utility starts and controls execution of @@ -45,12 +55,10 @@ stdenv.mkDerivation rec { Jabberd or MeTA1 (and it offers much more control over them than the native utilities). Finally, it can replace the inetd utility! ''; - - license = lib.licenses.gpl3Plus; - homepage = "https://www.gnu.org/software/pies/"; - + license = lib.licenses.gpl3Plus; platforms = lib.platforms.gnu ++ lib.platforms.linux; + broken = stdenv.hostPlatform.system == "aarch64-linux"; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/pi/pies/stdlib.patch b/pkgs/by-name/pi/pies/stdlib.patch new file mode 100644 index 000000000000..13af5cdc8522 --- /dev/null +++ b/pkgs/by-name/pi/pies/stdlib.patch @@ -0,0 +1,24 @@ +diff --git a/src/pies.c b/src/pies.c +index 9355d50..9fe6109 100644 +--- a/src/pies.c ++++ b/src/pies.c +@@ -19,6 +19,7 @@ + #include + #include "meta1parse.h" + #include "grecsasrt.h" ++#include + + int preprocess_only; /* Preprocess config, do nothing more */ + int lint_mode; /* Test configuration syntax and exit */ +diff --git a/src/piesctl.c b/src/piesctl.c +index a0ac967..fd6c3e2 100644 +--- a/src/piesctl.c ++++ b/src/piesctl.c +@@ -14,6 +14,7 @@ + You should have received a copy of the GNU General Public License + along with GNU Pies. If not, see . */ + ++#include + #include + #include + #include diff --git a/pkgs/by-name/pi/piglit/package.nix b/pkgs/by-name/pi/piglit/package.nix index 68d8920d3fe1..d1b0d5247156 100644 --- a/pkgs/by-name/pi/piglit/package.nix +++ b/pkgs/by-name/pi/piglit/package.nix @@ -3,6 +3,9 @@ fetchFromGitLab, lib, cmake, + glslang, + libffi, + libgbm, libglut, libGL, libGLU, @@ -11,8 +14,12 @@ ninja, pkg-config, python3, + vulkan-loader, waffle, wayland, + wayland-protocols, + wayland-scanner, + libXau, libX11, libXrender, libxcb, @@ -22,21 +29,25 @@ stdenv.mkDerivation { pname = "piglit"; - version = "unstable-2020-10-23"; + version = "unstable-2025-04-15"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "piglit"; - rev = "59e695c16fdcdd4ea4f16365f0e397a93cef7b80"; - sha256 = "kx0+2Sdvdc3SbpAIl2OuGCWCpaLJC/7cXG+ZLvf92g8="; + rev = "d06f7bac988e67db53cbc05dc0b096b00856ab93"; + hash = "sha256-bH9NjLEldlZwylq7S0q2vC5IQhUej0xZ6wD+mrWBK5A="; }; buildInputs = [ + glslang + libffi + libgbm libglut libGL libGLU libglvnd + libXau libX11 libXrender libxcb @@ -47,8 +58,11 @@ stdenv.mkDerivation { numpy ] )) + vulkan-loader waffle wayland + wayland-protocols + wayland-scanner ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix index 6e2e45eac3b0..8f7cbd50042d 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -8,7 +8,6 @@ libsodium, openssl, xxHash, - darwin, gitImportSupport ? true, libgit2 ? null, }: @@ -30,21 +29,11 @@ rustPlatform.buildRustPackage rec { installShellFiles pkg-config ]; - buildInputs = - [ - openssl - libsodium - xxHash - ] - ++ (lib.optionals gitImportSupport [ libgit2 ]) - ++ (lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - Security - SystemConfiguration - ] - )); + buildInputs = [ + openssl + libsodium + xxHash + ] ++ (lib.optionals gitImportSupport [ libgit2 ]); buildFeatures = lib.optional gitImportSupport "git"; diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index 7a478fee9259..d715f333c223 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "pik"; - version = "0.18.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "jacek-kurlit"; repo = "pik"; rev = version; - hash = "sha256-8+Q5j9PWiITVgZkJnX+oWbC6QnNDhFxX4jLiMDWnw/g="; + hash = "sha256-uehrEHTjzgJxzkBPJRZ75rOLcjjBnC80kcMsZdnksoo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6U0QkLgGEONGRDfrDVkxeHSJy9QnfQqn2YiZEswunTk="; + cargoHash = "sha256-K+3VjGwD12ANZHvU/KCVCFJwODXyp27/e6E6AB0mxTo="; passthru.tests.version = testers.testVersion { package = pik; }; diff --git a/pkgs/by-name/pi/pika-backup/package.nix b/pkgs/by-name/pi/pika-backup/package.nix index ef4b3357f4e8..c70586e44e54 100644 --- a/pkgs/by-name/pi/pika-backup/package.nix +++ b/pkgs/by-name/pi/pika-backup/package.nix @@ -77,7 +77,8 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/app/org.gnome.World.PikaBackup"; changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ dotlambda ]; + teams = [ teams.gnome-circle ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/pi/pilot-link/incompatible-pointer-type.patch b/pkgs/by-name/pi/pilot-link/incompatible-pointer-type.patch new file mode 100644 index 000000000000..114f88cfa537 --- /dev/null +++ b/pkgs/by-name/pi/pilot-link/incompatible-pointer-type.patch @@ -0,0 +1,15 @@ +Index: pilot-link/src/pilot-read-todos.c +=================================================================== +--- pilot-link/src/pilot-read-todos.c ++++ pilot-link/src/pilot-read-todos.c +@@ -216,9 +216,9 @@ + break; + } + else { + if (pi_file_read_record +- (pif, i, (void *) &ptr, &len, &attr, &category, ++ (pif, i, (void *) &ptr, (size_t *) &len, &attr, &category, + 0)) + break; + + pi_buffer_clear(recbuf); diff --git a/pkgs/by-name/pi/pilot-link/package.nix b/pkgs/by-name/pi/pilot-link/package.nix index e8eef25e3652..a7b6f3813b50 100644 --- a/pkgs/by-name/pi/pilot-link/package.nix +++ b/pkgs/by-name/pi/pilot-link/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, autoreconfHook, pkg-config, - darwin, popt, bluezSupport ? stdenv.hostPlatform.isLinux, bluez, @@ -20,7 +19,7 @@ stdenv.mkDerivation { pname = "pilot-link"; - version = "0.12.3-unstable-2022-09-26"; + version = "0.13.0-unstable-2022-09-26"; src = fetchFromGitHub { owner = "desrod"; @@ -33,7 +32,10 @@ stdenv.mkDerivation { # https://github.com/desrod/pilot-link/issues/16 # https://aur.archlinux.org/packages/pilot-link-git patches = - [ ./configure-checks.patch ] + [ + ./configure-checks.patch + ./incompatible-pointer-type.patch + ] ++ lib.optionals enableConduits [ ./format-string-literals.patch ] ++ lib.optionals enableLibpng [ ./pilot-link-png14.patch ]; @@ -47,8 +49,7 @@ stdenv.mkDerivation { ++ lib.optionals bluezSupport [ bluez ] ++ lib.optionals enableLibpng [ libpng ] ++ lib.optionals enableLibusb [ libusb-compat-0_1 ] - ++ lib.optionals readlineSupport [ readline ] - ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); + ++ lib.optionals readlineSupport [ readline ]; configureFlags = [ "--with-libiconv" ] @@ -56,6 +57,8 @@ stdenv.mkDerivation { ++ lib.optionals enableLibpng [ "--enable-libpng" ] ++ lib.optionals enableLibusb [ "--enable-libusb" ]; + enableParallelBuilding = true; + meta = { description = "Suite of tools for connecting to PalmOS handheld devices"; homepage = "https://github.com/desrod/pilot-link"; diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index 3ca18cd97e43..81849bb79419 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -1,37 +1,50 @@ { lib, + stdenv, fetchFromGitHub, buildGoModule, + installShellFiles, versionCheckHook, nix-update-script, }: let + mainProgram = "pinact"; +in +buildGoModule (finalAttrs: { pname = "pinact"; - version = "2.2.0"; + version = "3.1.2"; + src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; - tag = "v${version}"; - hash = "sha256-h/Y+zFqWmd+TVkM+2CLC4Txz8/Vwvck+goslPEQlXOA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5jJzlMMpfk9fFDoqR0NJNacquZ4Zma0YF/pi80Miv0Y="; }; - mainProgram = "pinact"; -in -buildGoModule { - inherit pname version src; - vendorHash = "sha256-36U5R9eXwfwXrJFsdNri7HPEq8t2AT4f/Gn//ane/48="; + vendorHash = "sha256-kK4r0mCktlbhJr6iHD0Q/k1DralieN2AUg+zREZ06DA="; env.CGO_ENABLED = 0; doCheck = true; + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd '${mainProgram}' \ + --bash <("$out/bin/${mainProgram}" completion bash) \ + --zsh <("$out/bin/${mainProgram}" completion zsh) \ + --fish <("$out/bin/${mainProgram}" completion fish) + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${mainProgram}"; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; passthru = { updateScript = nix-update-script { }; @@ -40,7 +53,7 @@ buildGoModule { ldflags = [ "-s" "-w" - "-X main.version=${version} -X main.commit=v${version}" + "-X main.version=${finalAttrs.version} -X main.commit=v${finalAttrs.version}" ]; subPackages = [ @@ -51,8 +64,8 @@ buildGoModule { inherit mainProgram; description = "Pin GitHub Actions versions"; homepage = "https://github.com/suzuki-shunsuke/pinact"; - changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/v${version}"; + changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kachick ]; }; -} +}) diff --git a/pkgs/tools/networking/pingu/default.nix b/pkgs/by-name/pi/pingu/package.nix similarity index 100% rename from pkgs/tools/networking/pingu/default.nix rename to pkgs/by-name/pi/pingu/package.nix diff --git a/pkgs/by-name/pi/pinocchio/package.nix b/pkgs/by-name/pi/pinocchio/package.nix index 0b97a1148897..39d1f62a1d78 100644 --- a/pkgs/by-name/pi/pinocchio/package.nix +++ b/pkgs/by-name/pi/pinocchio/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pinocchio"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "pinocchio"; rev = "v${finalAttrs.version}"; - hash = "sha256-oSxeFt84IB3KR12knm2vBAHYyevVNjCjnp9mS3e0Zls="; + hash = "sha256-2DLK0mDZ7nQZO8L4dDV4+xvlN+eRdmN82ncfdMJm0Pc="; }; outputs = [ diff --git a/pkgs/by-name/pi/pinta/deps.json b/pkgs/by-name/pi/pinta/deps.json index 7299114be0cb..c3f40bcc9293 100644 --- a/pkgs/by-name/pi/pinta/deps.json +++ b/pkgs/by-name/pi/pinta/deps.json @@ -1,58 +1,553 @@ [ { - "pname": "AtkSharp", - "version": "3.24.24.38", - "hash": "sha256-J9/+MU+zky18Lk3gfTCox6Jtm1SyjQQAK0vCb5Ecu4k=" + "pname": "GirCore.Adw-1", + "version": "0.6.3", + "hash": "sha256-wV4zTybD7yJldzQORBK2iI/77Fv3C9kjZvtj/S6v48k=" }, { - "pname": "CairoSharp", - "version": "3.24.24.38", - "hash": "sha256-DeXSAuSiGc7SzHb3HsUkLDLe5HZVpRn7VQFNhAAvflg=" + "pname": "GirCore.Cairo-1.0", + "version": "0.6.3", + "hash": "sha256-IJLzVmWkuCzdyiIqlzXyl8/ZDC6hmnh/bf4+i2HOpLw=" }, { - "pname": "GdkSharp", - "version": "3.24.24.38", - "hash": "sha256-JpggYCsUlrGZ1CKjCZMawiCjJDWQQc45YdYuA8L7rzA=" + "pname": "GirCore.FreeType2-2.0", + "version": "0.6.3", + "hash": "sha256-CsH4zQkZukyVw653sphDf5eveuvzY3HVphoO6fvjZiA=" }, { - "pname": "GioSharp", - "version": "3.24.24.38", - "hash": "sha256-RLd7hlelMgp9Eqga+0YxZVHN6GtbCe6IcHct2bPKcaw=" + "pname": "GirCore.Gdk-4.0", + "version": "0.6.3", + "hash": "sha256-3R7ikDBuQJ1iaVb8yuewdLggZ1IVecLuhmjaw1Hzm0s=" }, { - "pname": "GLibSharp", - "version": "3.24.24.38", - "hash": "sha256-df/8vV4OeQ2v8k7HPNrKcoEQdfPUWrHmM2S1F3DrEag=" + "pname": "GirCore.GdkPixbuf-2.0", + "version": "0.6.3", + "hash": "sha256-HZr3YmNLumXTGIN2CvxYZS9mHzvOvpMhUVJ1/DJlWN4=" }, { - "pname": "GtkSharp", - "version": "3.24.24.38", - "hash": "sha256-Uvx7/ylLL4HROPWifMZnOYD9fe0qxlc8QsCayN5TyDI=" + "pname": "GirCore.Gio-2.0", + "version": "0.6.3", + "hash": "sha256-pYc13vCSAH9Or7plQYffBzB/9b83oPNRBf5+HDeT/7w=" }, { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + "pname": "GirCore.GLib-2.0", + "version": "0.6.3", + "hash": "sha256-Lsl44qroh+ENO7yBFoySrNgxs8FBeT0nH6PKJ5u+LAI=" + }, + { + "pname": "GirCore.GObject-2.0", + "version": "0.6.3", + "hash": "sha256-+gerXQbv8HNcFjA76AvtzAG3d+CRb7pPYDaAL+iUPz4=" + }, + { + "pname": "GirCore.GObject-2.0.Integration", + "version": "0.6.3", + "hash": "sha256-ujkhIzrqeKOcwdwjgzMh3eTcZ2N5PfgvItfyNj7Kc3s=" + }, + { + "pname": "GirCore.Graphene-1.0", + "version": "0.6.3", + "hash": "sha256-+pDFEj94WNbXD7Fso1xuxkkETjej/O/d1JNW8eV6UPA=" + }, + { + "pname": "GirCore.Gsk-4.0", + "version": "0.6.3", + "hash": "sha256-vV66rP1vVloB+DA1xPL2iSrJwEmdUDdl209RcRpNP9Q=" + }, + { + "pname": "GirCore.Gtk-4.0", + "version": "0.6.3", + "hash": "sha256-unQkwxnaoIihD+FWKnJgJNAR4i99qcTcN78SG8WhrZk=" + }, + { + "pname": "GirCore.HarfBuzz-0.0", + "version": "0.6.3", + "hash": "sha256-8I7+SMTeXBNe6Q/rE7R6WiAYRPuLjfSeDjwllP/n9tM=" + }, + { + "pname": "GirCore.Pango-1.0", + "version": "0.6.3", + "hash": "sha256-4qPtnqcd1gjt/bz6vyq7L4iA8TyDYTlqkkDD6H150Hs=" + }, + { + "pname": "GirCore.PangoCairo-1.0", + "version": "0.6.3", + "hash": "sha256-O8SVg5F8OBazisAwxDB66zlup2hB6hvmO7ubdpSJXpI=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "4.8.0", + "hash": "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "4.8.0", + "hash": "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.0.1", + "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.1", + "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.0.1", + "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "Mono.Addins", + "version": "1.4.2-alpha.4", + "hash": "sha256-RZk63v41ByKGmv0wT57MfX77+ao8KcWEWtkWogucHYM=" + }, + { + "pname": "Mono.Addins.CecilReflector", + "version": "1.4.2-alpha.4", + "hash": "sha256-VPVhTWLKJDhOThuu3Z0Yv1DlOFXp+H7olqwY/YpZE2Q=" + }, + { + "pname": "Mono.Addins.Setup", + "version": "1.4.2-alpha.4", + "hash": "sha256-oPpISiP20NQLlBjkG9fyH0qdgDwl6vxaaykTxVgG9rY=" + }, + { + "pname": "Mono.Cecil", + "version": "0.10.1", + "hash": "sha256-JlELZujFtdTky8wt4k5lmLbY+hxLSzbAWJN0AHq41/4=" }, { "pname": "NGettext", "version": "0.6.7", "hash": "sha256-fmIODwPZkNJsnoNJG+EL1J5mpbuxYI4BsrgD1B4N2NI=" }, - { - "pname": "PangoSharp", - "version": "3.24.24.38", - "hash": "sha256-dq1c/G05iCmWmWZxwLV0e8qvQMS0620Bd0MSz4hEqjI=" - }, { "pname": "ParagonClipper", "version": "6.4.2", "hash": "sha256-jCT6rkghEqMuGwiVeiIAspHW+kuiB2jRl9ireBwhVV0=" }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography", + "version": "4.0.0", + "hash": "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + }, { "pname": "SharpZipLib", - "version": "1.4.1", - "hash": "sha256-ZsmWYdcr73k6Vd9HK1sKBrit6LLiSr+haH8l9h+UAbY=" + "version": "1.3.3", + "hash": "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4=" + }, + { + "pname": "System.Buffers", + "version": "4.3.0", + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" + }, + { + "pname": "System.Collections", + "version": "4.0.11", + "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.0.12", + "hash": "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" + }, + { + "pname": "System.Collections.Immutable", + "version": "6.0.0", + "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" + }, + { + "pname": "System.Collections.Immutable", + "version": "7.0.0", + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + }, + { + "pname": "System.Collections.NonGeneric", + "version": "4.3.0", + "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8=" + }, + { + "pname": "System.Collections.Specialized", + "version": "4.3.0", + "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk=" + }, + { + "pname": "System.CommandLine", + "version": "2.0.0-beta4.22272.1", + "hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.0.11", + "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.1.0", + "hash": "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Globalization", + "version": "4.0.11", + "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + }, + { + "pname": "System.IO", + "version": "4.1.0", + "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.0.1", + "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.0.1", + "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.Linq", + "version": "4.1.0", + "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Net.Http", + "version": "4.3.4", + "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Reflection", + "version": "4.1.0", + "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Emit", @@ -60,13 +555,178 @@ "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" }, { - "pname": "System.Security.Principal.Windows", - "version": "4.7.0", - "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" + "pname": "System.Reflection.Metadata", + "version": "7.0.0", + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.0.1", + "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.0.1", + "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.1.0", + "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.1.0", + "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.0.1", + "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.1.0", + "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.0.1", + "hash": "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.2.0", + "hash": "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.0.0", + "hash": "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.0.0", + "hash": "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.0.0", + "hash": "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.0.11", + "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Threading", + "version": "4.0.11", + "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.0.11", + "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "Tmds.DBus", - "version": "0.11.0", - "hash": "sha256-xNArjhSaEZcRiRB+mb9ZwUPQUqbLjRYt4JV2WUtM+hg=" + "version": "0.21.2", + "hash": "sha256-1rxUexOuj0raH8FvvUKeGdcWr3u8KmuAySe/4isy6S0=" } ] diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index e3704ef9ea77..e04cfa245bb5 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -4,26 +4,38 @@ dotnetCorePackages, fetchFromGitHub, glibcLocales, - gtk3, + gtk4, intltool, - wrapGAppsHook3, + libadwaita, + wrapGAppsHook4, }: buildDotnetModule rec { pname = "Pinta"; - version = "2.1.2"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "PintaProject"; + repo = "Pinta"; + rev = version; + hash = "sha256-87uzUIgivBI2W+vJV/LflxJoUPJCW5SlodwcC1pSOUk="; + }; nativeBuildInputs = [ intltool - wrapGAppsHook3 + wrapGAppsHook4 ]; + runtimeDeps = [ + gtk4 + libadwaita + ]; + + buildInputs = runtimeDeps; + dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; - runtimeDeps = [ gtk3 ]; - buildInputs = runtimeDeps; - # How-to update deps: # $ nix-build -A pinta.fetch-deps # $ ./result @@ -32,13 +44,6 @@ buildDotnetModule rec { projectFile = "Pinta"; - src = fetchFromGitHub { - owner = "PintaProject"; - repo = "Pinta"; - rev = version; - hash = "sha256-/GMYF7G469oX5W1zjv5A9a6tcLX+4g6Sf9cDqxSjgWg="; - }; - # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) env.LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; diff --git a/pkgs/by-name/pi/pinyin-tool/package.nix b/pkgs/by-name/pi/pinyin-tool/package.nix new file mode 100644 index 000000000000..bbd3e0b42097 --- /dev/null +++ b/pkgs/by-name/pi/pinyin-tool/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "pinyin-tool"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "briankung"; + repo = pname; + rev = version; + sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b"; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-SOeyk2uWCdO99ooQc2L1eXlV77lR4DLBK6PnV6Ur49A="; + + meta = with lib; { + description = "Simple command line tool for converting Chinese characters to space-separate pinyin words"; + mainProgram = "pinyin-tool"; + homepage = "https://github.com/briankung/pinyin-tool"; + license = licenses.mit; + maintainers = with maintainers; [ neonfuz ]; + }; +} diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix index 8d7889e772e4..6da58aeeb35d 100644 --- a/pkgs/by-name/pi/pioneer/package.nix +++ b/pkgs/by-name/pi/pioneer/package.nix @@ -13,6 +13,7 @@ libpng, libsigcxx, libvorbis, + libX11, lua5_2, libgbm, SDL2, @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { libpng libsigcxx libvorbis + libX11 lua5_2 libgbm SDL2 diff --git a/pkgs/by-name/pi/pip-audit/package.nix b/pkgs/by-name/pi/pip-audit/package.nix index 10a402a621a9..721a9a8fd921 100644 --- a/pkgs/by-name/pi/pip-audit/package.nix +++ b/pkgs/by-name/pi/pip-audit/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.8.0"; + version = "2.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = "pip-audit"; tag = "v${version}"; - hash = "sha256-UW7pJYMcc8Myc4DmrZqAPUhAVs9J6o8/6QQb5vxskcg="; + hash = "sha256-j8ZKqE7PEwaCTUNnJunqM0A2eyuWfx8zG5i3nmZERow="; }; build-system = with python3.pkgs; [ flit-core ]; @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool for scanning Python environments for known vulnerabilities"; homepage = "https://github.com/trailofbits/pip-audit"; - changelog = "https://github.com/pypa/pip-audit/releases/tag/v${version}"; + changelog = "https://github.com/pypa/pip-audit/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "pip-audit"; diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix index d86d5ee726f5..350a2157def2 100644 --- a/pkgs/by-name/pi/pipeline/package.nix +++ b/pkgs/by-name/pi/pipeline/package.nix @@ -17,7 +17,7 @@ desktop-file-utils, blueprint-compiler, sqlite, - clapper, + clapper-unwrapped, gettext, gst_all_1, gtuber, @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { libadwaita openssl sqlite - clapper + clapper-unwrapped gst_all_1.gstreamer gst_all_1.gst-libav diff --git a/pkgs/by-name/pi/pipenv/package.nix b/pkgs/by-name/pi/pipenv/package.nix index 02a20ee81cde..f16c5ad76190 100644 --- a/pkgs/by-name/pi/pipenv/package.nix +++ b/pkgs/by-name/pi/pipenv/package.nix @@ -74,7 +74,7 @@ buildPythonApplication rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; disabledTests = [ # this test wants access to the internet diff --git a/pkgs/by-name/pi/piping-server-rust/package.nix b/pkgs/by-name/pi/piping-server-rust/package.nix new file mode 100644 index 000000000000..cbdc1e60553a --- /dev/null +++ b/pkgs/by-name/pi/piping-server-rust/package.nix @@ -0,0 +1,29 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "piping-server-rust"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "nwtgck"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-8kYaANVWmBOncTdhtjjbaYnEFQeuWjemdz/kTjwj2fw="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-m6bYkewBE0ZloDVUhUslS+dgPyoK+eay7rrP3+c00mo="; + + meta = with lib; { + description = "Infinitely transfer between every device over pure HTTP with pipes or browsers"; + homepage = "https://github.com/nwtgck/piping-server-rust"; + changelog = "https://github.com/nwtgck/piping-server-rust/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "piping-server"; + }; +} diff --git a/pkgs/by-name/pi/piston-cli/package.nix b/pkgs/by-name/pi/piston-cli/package.nix index 3039279a3e64..8484f6523357 100644 --- a/pkgs/by-name/pi/piston-cli/package.nix +++ b/pkgs/by-name/pi/piston-cli/package.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/piston"; pythonImportsCheck = [ "piston" ]; diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix index 227ff18f4b64..2db2d3e0cb2c 100644 --- a/pkgs/by-name/pi/piv-agent/package.nix +++ b/pkgs/by-name/pi/piv-agent/package.nix @@ -2,7 +2,6 @@ lib, stdenv, buildGoModule, - darwin, fetchFromGitHub, pcsclite, pkg-config, @@ -10,16 +9,16 @@ buildGoModule rec { pname = "piv-agent"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "smlx"; repo = "piv-agent"; rev = "v${version}"; - hash = "sha256-bfJIrWDFQIg0n1RDadARPHhQwE6i7mAMxE5GPYo4WU8="; + hash = "sha256-4oyIUE7Yy0KUw5pC64MRKeUziy+tqvl/zFVySffxfBs="; }; - vendorHash = "sha256-HIB+p0yh7EWudLp1YGoClYbK3hkYEJZ+o+9BbOHE4+0="; + vendorHash = "sha256-4yfQQxMf00263OKEXTWD34YifK7oDclvPk8JDz5N1I0="; subPackages = [ "cmd/piv-agent" ]; @@ -32,8 +31,7 @@ buildGoModule rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.PCSC ] else [ pcsclite ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ pcsclite ]; meta = with lib; { description = "SSH and GPG agent which you can use with your PIV hardware security device (e.g. a Yubikey)"; diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix index 761b3a6b56e8..323d9189c80d 100644 --- a/pkgs/by-name/pi/pix/package.nix +++ b/pkgs/by-name/pi/pix/package.nix @@ -104,6 +104,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linuxmint/pix"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/pi/pixelflasher/package.nix b/pkgs/by-name/pi/pixelflasher/package.nix index 352ff0f65d1f..5b20e7213998 100644 --- a/pkgs/by-name/pi/pixelflasher/package.nix +++ b/pkgs/by-name/pi/pixelflasher/package.nix @@ -10,14 +10,14 @@ }: python3Packages.buildPythonApplication rec { pname = "pixelflasher"; - version = "7.11.2.1"; + version = "7.11.4.0"; format = "other"; src = fetchFromGitHub { owner = "badabing2005"; repo = "PixelFlasher"; tag = "v${version}"; - hash = "sha256-FW5Ve95Po0GoQCLhSVgBR20mVA1Hh9GUDeq2VbziVBQ="; + hash = "sha256-TFvMxYGiRNpuwQyDmSqnksQ31azucZzXq9mZHvl/C4U="; }; desktopItems = [ diff --git a/pkgs/by-name/pi/pixelorama/package.nix b/pkgs/by-name/pi/pixelorama/package.nix index 5d2af594eb39..2d4553403e37 100644 --- a/pkgs/by-name/pi/pixelorama/package.nix +++ b/pkgs/by-name/pi/pixelorama/package.nix @@ -1,20 +1,9 @@ { lib, stdenv, - alsa-lib, - autoPatchelfHook, fetchFromGitHub, godot_4_3, - libGL, - libpulseaudio, - libX11, - libXcursor, - libXext, - libXi, - libXrandr, nix-update-script, - udev, - vulkan-loader, }: let @@ -28,45 +17,30 @@ let or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); godot = godot_4_3; - godot_version_folder = lib.replaceStrings [ "-" ] [ "." ] godot.version; in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "1.0.5"; + version = "1.1"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - hash = "sha256-pT2+LSYQuq2M8C9TjtdfWD5njMCurPGyQ3i9iaT5Yds="; + hash = "sha256-UJ9sQ9igB2YAtkeHRUPvA60lbR2OXd4tqBDFxf9YTnI="; }; strictDeps = true; nativeBuildInputs = [ - autoPatchelfHook godot ]; - runtimeDependencies = map lib.getLib [ - alsa-lib - libGL - libpulseaudio - libX11 - libXcursor - libXext - libXi - libXrandr - udev - vulkan-loader - ]; - buildPhase = '' runHook preBuild export HOME=$(mktemp -d) - mkdir -p $HOME/.local/share/godot/export_templates - ln -s "${godot.export-templates-bin}" "$HOME/.local/share/godot/export_templates/${godot_version_folder}" + mkdir -p $HOME/.local/share/godot/ + ln -s "${godot.export-template}"/share/godot/export_templates "$HOME"/.local/share/godot/ mkdir -p build godot4 --headless --export-release "${preset}" ./build/pixelorama diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix index e9cc910bc274..17d72dfda4b9 100644 --- a/pkgs/by-name/pi/pixi-pack/package.nix +++ b/pkgs/by-name/pi/pixi-pack/package.nix @@ -8,19 +8,19 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi-pack"; - version = "0.3.3"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Quantco"; repo = "pixi-pack"; - tag = "v${version}"; - hash = "sha256-Yf0ewDGDYpdl/tk4qvhKTbFmnGceqTJFv0bExL7N9AE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ccKJtGKhfYiJm8/2yOlCZtRECvax1dTgtNOtabzfhI4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-W8C3d+2KYgPwb5zyC59cdUC79W9Ho4gX4McKm/xtWjU="; + cargoHash = "sha256-+rwG9lPK0Ec7CCtVccwGrFOqfZqeXNA3WsN1QivABQA="; buildInputs = [ openssl ]; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; @@ -43,11 +43,11 @@ rustPlatform.buildRustPackage rec { meta = { description = "Pack and unpack conda environments created with pixi"; homepage = "https://github.com/Quantco/pixi-pack"; - changelog = "https://github.com/Quantco/pixi-pack/releases/tag/v${version}"; + changelog = "https://github.com/Quantco/pixi-pack/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; mainProgram = "pixi-pack"; }; -} +}) diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 5e7920d508eb..8080506d9aec 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.43.3"; + version = "0.47.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-FWUnab6mj4Xq3k3GLQFKrlZkWxX3fqHZujwuK3sbgbg="; + hash = "sha256-ndNwtCKAU/59bq6uDlaxb+24DG2yKD7NyfwgBAlHMtg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Ioqw8ddpJWiPB8wniLsteaWzDXIORoOsHitGVQ2uPBw="; + cargoHash = "sha256-Q82CD/byqXAqJpO0izIwBD6lYpoZNJoWqDCciRecZnY="; nativeBuildInputs = [ pkg-config @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; @@ -70,7 +70,6 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://pixi.sh/latest/CHANGELOG"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ - aaronjheng edmundmiller xiaoxiangmoe ]; diff --git a/pkgs/by-name/pi/pixiecore/package.nix b/pkgs/by-name/pi/pixiecore/package.nix index f449bdb8d276..80d1a95bc6cd 100644 --- a/pkgs/by-name/pi/pixiecore/package.nix +++ b/pkgs/by-name/pi/pixiecore/package.nix @@ -2,31 +2,70 @@ lib, buildGoModule, fetchFromGitHub, + xz, + ipxe, + stdenv, + perl, + go-bindata, + fetchpatch, }: +let + rebuildIpxe = stdenv.system == "x86_64-linux"; +in buildGoModule rec { pname = "pixiecore"; - version = "2020-03-25"; - rev = "68743c67a60c18c06cd21fd75143e3e069ca3cfc"; + version = "0-unstable-2024-05-31"; + rev = "2ed7bd30206a51bae786b02d9a5b8156fdcc8870"; src = fetchFromGitHub { owner = "danderson"; repo = "netboot"; inherit rev; - hash = "sha256-SoD871PaL5/oabKeHFE2TLTTj/CFS4dfggjMN3qlupE="; + hash = "sha256-pG4nzzJRWI1rAHS5kBcefNi0ee0/a3jwE+RmR4Dj8jo="; }; - vendorHash = "sha256-hytMhf7fz4XiRJH7MnGLmNH+iIzPDz9/rRJBPp2pwyI="; + vendorHash = "sha256-3cVGDAZWhmZ1byvjoRodSWMNHCpNujDOAVQKHNntHR8="; + + patches = [ + # part of https://github.com/danderson/netboot/pull/144 + # Also backed up in https://github.com/danderson/netboot/compare/main...Mic92:netboot:upgrade-go-mod-117?expand=1 + (fetchpatch { + url = "https://github.com/danderson/netboot/commit/c999a6ca573c973e760c8df531b4c970c21f3d05.patch"; + sha256 = "sha256-pRWcBz24cqqajLvJffugB/T6lKGVtvOG4ch3vyzDDQQ="; + }) + ]; doCheck = false; + # De-vendor ipxe, only on x86_64-linux for now. + # In future we can do this also for more systems, if we do cross-compilation. + buildInputs = lib.optionals rebuildIpxe [ xz ]; + nativeBuildInputs = lib.optionals rebuildIpxe [ + perl + go-bindata + ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ]; + preBuild = lib.optionalString rebuildIpxe '' + # don't run in our go-modules phase but only in the normal build phase + if echo $NIX_CFLAGS_COMPILE | grep -q xz; then + rm -rf ./third_party/ipxe + cp -r ${ipxe.src} ./third_party/ipxe + chmod -R u+w ./third_party/ipxe + make update-ipxe -j$NIX_BUILD_CORES + fi + ''; + subPackages = [ "cmd/pixiecore" ]; meta = { description = "Tool to manage network booting of machines"; homepage = "https://github.com/danderson/netboot/tree/master/pixiecore"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ bbigras ]; + maintainers = with lib.maintainers; [ + bbigras + mic92 + ]; mainProgram = "pixiecore"; }; } diff --git a/pkgs/applications/networking/pjsip/fix-aarch64.patch b/pkgs/by-name/pj/pjsip/fix-aarch64.patch similarity index 100% rename from pkgs/applications/networking/pjsip/fix-aarch64.patch rename to pkgs/by-name/pj/pjsip/fix-aarch64.patch diff --git a/pkgs/by-name/pj/pjsip/package.nix b/pkgs/by-name/pj/pjsip/package.nix new file mode 100644 index 000000000000..5d0e9484c838 --- /dev/null +++ b/pkgs/by-name/pj/pjsip/package.nix @@ -0,0 +1,139 @@ +{ + lib, + testers, + stdenv, + fetchFromGitHub, + openssl, + libsamplerate, + swig, + alsa-lib, + python3, + pythonSupport ? true, + runCommand, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "pjsip"; + version = "2.14.1"; + + src = fetchFromGitHub { + owner = "pjsip"; + repo = "pjproject"; + tag = finalAttrs.version; + hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY="; + }; + + patches = [ ./fix-aarch64.patch ]; + + postPatch = '' + substituteInPlace \ + pjsip-apps/src/py_pjsua/setup.py \ + pjsip-apps/src/swig/python/setup.py \ + pjsip-apps/src/python/setup.py \ + pjsip-apps/src/python/setup-vc.py \ + --replace-fail "distutils.core" "setuptools" + ''; + + nativeBuildInputs = lib.optionals pythonSupport [ + swig + python3 + python3.pkgs.build + python3.pkgs.installer + python3.pkgs.setuptools + python3.pkgs.wheel + ]; + + buildInputs = [ + openssl + libsamplerate + ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; + + env = + lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_LINK = "-headerpad_max_install_names"; + }; + + preConfigure = '' + export LD=$CC + ''; + + postBuild = lib.optionalString pythonSupport '' + make -C pjsip-apps/src/swig/python + ''; + + configureFlags = [ "--enable-shared" ]; + + outputs = [ "out" ] ++ lib.optional pythonSupport "py"; + + postInstall = + '' + mkdir -p $out/bin + cp pjsip-apps/bin/pjsua-* $out/bin/pjsua + mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples + cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples + '' + + lib.optionalString pythonSupport '' + (cd pjsip-apps/src/swig/python && \ + python -m build --no-isolation --outdir dist/ --wheel + python -m installer --prefix $py dist/*.whl + ) + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # On MacOS relative paths are used to refer to libraries. All libraries use + # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to + # rewrite these to use absolute ones. + + # First, find all libraries (and their symlinks) in our outputs to define + # the install_name_tool -change arguments we should pass. + readarray -t libraries < <( + for outputName in $(getAllOutputNames); do + find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \) + done + ) + + # Determine the install_name_tool -change arguments that are going to be + # applied to all libraries. + change_args=() + for lib in "''${libraries[@]}"; do + lib_name="$(basename $lib)" + change_args+=(-change ../lib/$lib_name $lib) + change_args+=(-change ../../lib/$lib_name $lib) + done + + # Rewrite id and library refences for all non-symlinked libraries. + for lib in "''${libraries[@]}"; do + if [ -f "$lib" ]; then + install_name_tool -id $lib "''${change_args[@]}" $lib + fi + done + + # Rewrite library references for all executables. + find "$out" -executable -type f | while read executable; do + install_name_tool "''${change_args[@]}" "$executable" + done + ''; + + # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) + dontPatchELF = true; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "pjsua --version"; + }; + + passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + + passthru.tests.python-pjsua2 = runCommand "python-pjsua2" { } '' + ${(python3.withPackages (pkgs: [ pkgs.pjsua2 ])).interpreter} -c "import pjsua2" > $out + ''; + + meta = with lib; { + description = "Multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; + homepage = "https://pjsip.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ olynch ]; + mainProgram = "pjsua"; + platforms = platforms.linux ++ platforms.darwin; + pkgConfigModules = [ "libpjproject" ]; + }; +}) diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix index 3ddc577400bb..60d6d1174605 100644 --- a/pkgs/by-name/pk/pkarr/package.nix +++ b/pkgs/by-name/pk/pkarr/package.nix @@ -1,9 +1,7 @@ { lib, fetchFromGitHub, - darwin, rustPlatform, - stdenv, }: rustPlatform.buildRustPackage rec { pname = "pkarr"; @@ -19,14 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-y20vVO714WPcB2aYzo0LBuJhy224bsHA7O9Dj00ViWE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); - meta = { description = "Public Key Addressable Resource Records (sovereign TLDs) "; homepage = "https://github.com/pubky/pkarr"; diff --git a/pkgs/by-name/pk/pkg/package.nix b/pkgs/by-name/pk/pkg/package.nix index 8a3739410c4c..45c1319334e5 100644 --- a/pkgs/by-name/pk/pkg/package.nix +++ b/pkgs/by-name/pk/pkg/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "2.0.6"; + version = "2.1.2"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - hash = "sha256-NTjAhqCUN2bN4ilijoeHHIkl58XXP5nSj/yLUL0N2fw="; + hash = "sha256-mIuUewuW+aw0ZDGstUadfHkjamDxPRp1O/YVZ9JuCtg="; }; setOutputFlags = false; diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index c6dcc236ac06..67add1f5ad3a 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2025-03-21"; + version = "0-unstable-2025-05-06"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "d037ac96d503b32fcdcb5f5efeefef10447c394e"; - hash = "sha256-/zcnS3qYmiI5kuOZ4jJB7/3C2U9KELYgte7d9OgaLmo="; + rev = "1bc9132f566501f5f66bfcb147479cf741704cf4"; + hash = "sha256-FfgwHiqbDhVp31YQzalveG+JVe93gXUq/XvTwPV7zsI="; }; - vendorHash = "sha256-M4cbpMZ/ujnMUoGp//KpBM2oEl/RCOfI1IcmoGMw+fw="; + vendorHash = "sha256-s8uYvMQENqeUN8DbZ/jNhcTe2dJeiE9UYPCPGeScO10="; subPackages = [ "cmd/pkgsite" ]; diff --git a/pkgs/by-name/pk/pkl/deps.json b/pkgs/by-name/pk/pkl/deps.json new file mode 100644 index 000000000000..af9adaa00978 --- /dev/null +++ b/pkgs/by-name/pk/pkl/deps.json @@ -0,0 +1,1495 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/github/johnrengelman#shadow/8.1.1": { + "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", + "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=", + "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU=" + }, + "gradle/plugin/org/gradle/crypto#checksum/1.4.0": { + "jar": "sha256-GZuCZMulLIpIqibHExIveIFOPB6AGmrwsgoaUdXFsJQ=", + "pom": "sha256-9JIlgzqyRZYjC9qx+OQyOJFVNx9h7MBLiRUbL/AydBk=" + }, + "gradle/plugin/org/jetbrains/gradle/plugin/idea-ext#gradle-idea-ext/1.1.9": { + "jar": "sha256-581IH2xEr1PReSD/VQU256P5SjGC6b0euN+Udy3E6Ow=", + "pom": "sha256-FOT6q6pDC/wzpuk92vzIj1Ct88uGb/RXzqqClJEVNcc=" + }, + "io/github/gradle-nexus#publish-plugin/2.0.0": { + "jar": "sha256-lCwaFtFh9kYxkBtOLa1UHS/L/lHPAyOVXavgLiqe8qo=", + "module": "sha256-4T/01uEPKDtihxA8mC8Ha9YZ4qRh+znBbUTR0V1x6Pc=", + "pom": "sha256-V4e4+lvBAqYRbTWnztW7vPEZ/XJgQxs3kXPuNQU5rQk=" + }, + "io/github/gradle-nexus/publish-plugin#io.github.gradle-nexus.publish-plugin.gradle.plugin/2.0.0": { + "pom": "sha256-oymrlfS/3VyJEIPK06uzB0H9xroLspsRUqgP4KadYu8=" + }, + "me/champeau/jmh#jmh-gradle-plugin/0.7.2": { + "jar": "sha256-2Wcgmf+Pw/m/PU0BWGThWG8H7L0qihd6ZhhO8LaKumU=", + "module": "sha256-bYSa50VKs5Fxjl/HDicWQY7z7SZEcjRb2Axt5k4AtsQ=", + "pom": "sha256-FdkdAH98O7wCJseQSM3cRf/BJPoegAgu//jhAwxoSg8=" + }, + "me/champeau/jmh#me.champeau.jmh.gradle.plugin/0.7.2": { + "pom": "sha256-V+DCOsYJRa77WgxKkzm+poopU2TKR8epB5oDL3kBOrs=" + }, + "org/gradle/crypto/checksum#org.gradle.crypto.checksum.gradle.plugin/1.4.0": { + "pom": "sha256-HzWQYt4QGbCRu7QhGghr4U0xCMX2mXisy9AbZRUFN0w=" + }, + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": { + "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=", + "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=", + "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" + }, + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": { + "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" + }, + "org/gradle/toolchains#foojay-resolver/0.8.0": { + "jar": "sha256-+Q5pNRY46QueyYSOdZ0hhjWQfAklQRkRUAN7CyLlFAw=", + "module": "sha256-jDzPVNoHLGSkDgaIKqplIzbLKe7C6iMPBtaEOrs4TVE=", + "pom": "sha256-pxZyrK0MCu4576V1P1yU+aSjWh2sBl4ii8rDQt6nxUg=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.8.0": { + "pom": "sha256-O2ciN72cwejoyobvWnkgpnj2nQTS9L+9DFouedRcXLU=" + }, + "org/jetbrains/gradle/plugin/idea-ext#org.jetbrains.gradle.plugin.idea-ext.gradle.plugin/1.1.9": { + "pom": "sha256-6wJgv+4Rm/1Rks144nHJcBaqRUx54PxVPd2Gbym+vTw=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/durian#durian-swt.os/4.2.2": { + "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", + "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", + "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.45.0": { + "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", + "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", + "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" + }, + "com/diffplug/spotless#spotless-lib/2.45.0": { + "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", + "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", + "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { + "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", + "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", + "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" + }, + "com/ethlo/time#itu/1.10.3": { + "jar": "sha256-I9O6hAldSJpZUkD4kEUIXqUGb7b8HcCRJY1XffnXSrw=", + "pom": "sha256-shihqWmXfQEerG6Ttzo6uwuIQGMK0aHxbr//JOWIbXQ=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" + }, + "com/fasterxml/jackson#jackson-base/2.18.2": { + "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.2": { + "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/jackson#jackson-parent/2.18.1": { + "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.2": { + "jar": "sha256-WBvWEADvdkiUP3gcoFaJ5W0D9gUnSDZajis6m10/oy8=", + "module": "sha256-4Ruvm1NubflNqmNaEBPsPgabhmuOES3cKqBEahVQUNw=", + "pom": "sha256-CyvWlOqJJn7qSBJqilskplI0xkM4dULSRGnRlb+6HPg=" + }, + "com/fasterxml/jackson/core#jackson-core/2.18.2": { + "jar": "sha256-2AVK58DRwtL1XSjkYCbr5YkogfP6tfQ5IzGEOBw7Sh8=", + "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=", + "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.2": { + "jar": "sha256-SzZOaFDciRcvzx1N0muP9UiO2kT/RlfiLdJlID3Vqzw=", + "module": "sha256-jH2sL3J4GNiEeoKqTqxrAXTXnPBN+Q3iJGBy5t005wA=", + "pom": "sha256-STo9tkR7eo7Ls3JCNMbOZ31y20sE9roAjw6+rqe+Wp0=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.18.2": { + "jar": "sha256-OBocBxHku4hWGmwACLWpRUZWKMoHdkzNZqDZfuB61hI=", + "module": "sha256-evxmQXLDpubGw1hHZaAyncb+q7/mu6ibrq2L0un77Hs=", + "pom": "sha256-9W9UNh5DSV7TuiShoG8OO3QZA+Q+0TLxpq086QErhBU=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.18.2": { + "pom": "sha256-4h1diLBHShG3H+lBAMT1KVv6F08u5q5LCtArdhZHhkg=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.2": { + "jar": "sha256-4tIC1GBuI66vilqWMtsG9f79W2PSUcP1A/n6qnhTDlw=", + "module": "sha256-Jd8o9WC1kI6hAYUATV/Bkyk0hHBj5mcpJID2dbOx7eQ=", + "pom": "sha256-FivnrZea9eDHOc1+0BiJ+Br0ggDJ+RJ5lqElrFGzSkc=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.2": { + "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY=" + }, + "com/github/ajalt/clikt#clikt-core-jvm/5.0.3": { + "jar": "sha256-acupSiKR90t4yII5zYtn6vPwjg2tKXdJq+ZHez6bgbE=", + "module": "sha256-dFtZmw9KoAz3AVYz429KVvJdGLy292htyrOxoRQZ3PE=", + "pom": "sha256-CPpCgzMVYwi9KLYyNih6MXIVLcu/ccgx4LOshiPl4XE=" + }, + "com/github/ajalt/clikt#clikt-core/5.0.3": { + "jar": "sha256-KeBaQXAKBp8NEHSOp9Xwyb8OFjbUsQNXPj98X3q7fDo=", + "module": "sha256-CmMddfhkwX5dYQBfYDwSaUtGcy3s1cOckU0pLQXo6zM=", + "pom": "sha256-wrBLaB6IqaGSgLZW2mBKIfLj4lUih2i4maaLoejuYBU=" + }, + "com/github/ajalt/clikt#clikt-jvm/5.0.3": { + "jar": "sha256-nNGeBHgvRh3/6xg9F+V2mE/rt5NJMstAZkasQeQohjs=", + "module": "sha256-nSm2J+l1mRLhJ+r7136GAYceul6qUthMgXUKiYIC8Xc=", + "pom": "sha256-CcAbsS0foX/hKcoSgvHpmpCAEbGDA5ptT8z2tclaTos=" + }, + "com/github/ajalt/clikt#clikt-markdown-jvm/5.0.3": { + "jar": "sha256-vLsmkGeKQ0w3YdkF/6Kgt0v6zmGmvu5rj7OrzNBASWg=", + "module": "sha256-7m5GD1rHh80CdvxU0fR/FkGPqThJfkiiiNWWh5HmE9M=", + "pom": "sha256-j65i2Z1IbZcvnPE8AYPoodAa1qZwJ+Kb7yxnJxV81VE=" + }, + "com/github/ajalt/clikt#clikt-markdown/5.0.3": { + "jar": "sha256-OVCM/Xz1fhXCfgKU8T5Q5ATSuUnsyxJkr3/T2Iwc0p0=", + "module": "sha256-Gugy8ma3VZkKEovS0iFDb8U087ENcqYtznZs1UDjm9o=", + "pom": "sha256-vlz5vmknfu7Yz1qiPziHX50MSm+DgGrpMbBasA8BCUM=" + }, + "com/github/ajalt/clikt#clikt/5.0.3": { + "jar": "sha256-qLzj6fI3DFVs1FG2AY5Yfu1LCfO3jr72SP2D874LgPw=", + "module": "sha256-vNNPHTxGfvq1FuoiqeeazD8SRJxIl/DF6sGCEnMizsY=", + "pom": "sha256-GwUigSeaOs6FY7svHtP1Khs9Rq15w9T2wzMjI+VzX9g=" + }, + "com/github/ajalt/colormath#colormath-jvm/3.6.0": { + "jar": "sha256-WfdBrf5iBTBmeC2LGkWv0GaFpLxkszJ35Uh2uZPtiFw=", + "module": "sha256-P6dnMPmJ4ChN8YL87IViDZtIrjIhOYhBrGyviEYvYvg=", + "pom": "sha256-8Dw11QURDQZzNF9HQOVbzZdqmp+lobE8qirTmPO8Hl0=" + }, + "com/github/ajalt/colormath#colormath/3.6.0": { + "jar": "sha256-49ox0EqJXlNfXQh2TM9fODQcQr99aNqW6h8ACfclmdY=", + "module": "sha256-aQeqSXrbmvY4EsdTZjic7T5ruL7oDnsjmttMU2c/iIQ=", + "pom": "sha256-zh3tjA259LxNNjS64Vn9jVu2qWDyzTuWoAyPDnnOZAs=" + }, + "com/github/ajalt/mordant#mordant-core-jvm/3.0.1": { + "jar": "sha256-nPm0bR9J8tbPJjVGKyncWeDCmx+y8IWzMSiIu+nHzTE=", + "module": "sha256-5HRMRxB05ezUFh9wcLRZTfAO8XivBEJlkF5e0c61rJI=", + "pom": "sha256-1Ylt5eNKnVarJ4Y5iyYHJLGB85zAUIy7Kh9+iGzSXYc=" + }, + "com/github/ajalt/mordant#mordant-core/3.0.1": { + "jar": "sha256-c/UXnY6U+FEUR18Zlo0WWURZTmszjbcciwv9sJUe6z4=", + "module": "sha256-BWl6xcBV8Uh2cJ/U6f1ejD0VphrHesVy+RZEmTKgjC8=", + "pom": "sha256-Ah3YAdKdWJlqDJv/ux8VHWkHytU20syNGnoHuck4UNo=" + }, + "com/github/ajalt/mordant#mordant-jvm-ffm-jvm/3.0.1": { + "jar": "sha256-IEHC9fe4cJWxFcsZFV7pJXRRhU0I5bhnEWW0O8fhFM8=", + "module": "sha256-iE1x/LfBAQrm11qoka5UqYmGEVSwfxIVzVRfDkg34V0=", + "pom": "sha256-azbnZhrYKN4DoomS2K6WJWzq3z/aEo+OxImo1lu7rFM=" + }, + "com/github/ajalt/mordant#mordant-jvm-ffm/3.0.1": { + "module": "sha256-2Frg+0n7bXFHibQ/MbVnUoybit+G0Ou5hpSkGpHgmmc=", + "pom": "sha256-/MzpL8GhnxYzgGhDyuVTLIx/2YSnkxRbb7y3iUpk/s0=" + }, + "com/github/ajalt/mordant#mordant-jvm-graal-ffi-jvm/3.0.1": { + "jar": "sha256-bdS+vBZK6s3azI+Y6Phx4A/SHOe8LrDRgjDqg73fyGo=", + "module": "sha256-DYGba/u8pO6XszB4ZoEpaQdmr/lI/ByDF4j04DSFOsM=", + "pom": "sha256-Cm95LxyTYJX4dGmR1k2os/+ECazeOUir5d4v1WiIeDo=" + }, + "com/github/ajalt/mordant#mordant-jvm-graal-ffi/3.0.1": { + "module": "sha256-qu/aIGckg7OwsmDdHvE0LOazTs6IutbfOa4bJgUMjAo=", + "pom": "sha256-VAicrH9XCzo84x3cCD+ORgs7ED62oXM8kUE1GgaLR/M=" + }, + "com/github/ajalt/mordant#mordant-jvm-jna-jvm/3.0.1": { + "jar": "sha256-QQY0QsiJGyd0U2qbh6UGKn/SDm8ZSZdMbacvSUctb00=", + "module": "sha256-eBcNkl07qnWGYvl2M2FjkN6Q1CoslON2PqpZBXY3jh4=", + "pom": "sha256-/hWoxktH4H8vmdiDKG5O+xR0YkVlh0ayVQ9vlohkX4A=" + }, + "com/github/ajalt/mordant#mordant-jvm-jna/3.0.1": { + "module": "sha256-cn+1FiNOi6/JJ5Xi7L0No4VNcjoWxphCrGGSC/WIebk=", + "pom": "sha256-xbxkikqeKmz3+dGAJMi/ZrIYCVDpPxYIODTHv/OqeGE=" + }, + "com/github/ajalt/mordant#mordant-jvm/3.0.1": { + "jar": "sha256-ntO5dvzMx42nRtSYZvqOu48QUwqTxUTqBCAlmmB92V4=", + "module": "sha256-peTyMSt69CDG2DLDA4kcGg2GN8z6WpTYnxFGxIZpgLo=", + "pom": "sha256-sAnaTDfbjhc2uEgrRPIJ2Cdx/xyNO9+UbraE07nOmWU=" + }, + "com/github/ajalt/mordant#mordant-markdown-jvm/3.0.1": { + "jar": "sha256-tiRG42KjhK3bnB3bpdc2C/7QAU9/8lZ+gVYGI+ouLg0=", + "module": "sha256-vVFEMapoiPpX3TZ64fXBfGd7ZLtTDYdiaoHmqbD2DII=", + "pom": "sha256-CTcnsaakYK6yzbTSXHsVIIbOxs9JCtQY8OAaZKqQuq0=" + }, + "com/github/ajalt/mordant#mordant-markdown/3.0.1": { + "jar": "sha256-Si/srE3DCUCL+3jNcQnBmmVFbIATk/mvv9PMwJW3rQk=", + "module": "sha256-EtkyhMfHBhsJKCKHmsPNfqdRHyYgCP0Vy2AepLdXowU=", + "pom": "sha256-6wdnhNOAGG4CtaSQhIkOH01xqs6YzA/D+Ma4tz3ecS4=" + }, + "com/github/ajalt/mordant#mordant/3.0.1": { + "jar": "sha256-CQmE0gJpL/70R+iN/ixjaTpd4pZw2ggxuGO8KE2hR+I=", + "module": "sha256-lJLcf2NgJt8ulCkim52Ae1d00uZBUQ2Qv4Kb0qyzthU=", + "pom": "sha256-BlK5t9Y0kro8J8ZIkANIZRxbKFdEAph7j+KqBUlqkaQ=" + }, + "com/github/jknack#handlebars-helpers/4.3.1": { + "jar": "sha256-VvCtTe+0RLA4pwio4NADaS3xuRK5EhlzanZN6I/3hnw=", + "pom": "sha256-AYv9plPb9sQZG3sF/k7+2KPY1w495wp77RsYim3ibNI=" + }, + "com/github/jknack#handlebars.java/4.3.1": { + "pom": "sha256-UECkDYFTRzveednE1O+4cSChaQ+uWFtYKAcH1DdCCZk=" + }, + "com/github/jknack#handlebars/4.3.1": { + "jar": "sha256-VCT9EukRzxW+/RY0G0bg4bxoGqYePLHAcMV+aNzNW70=", + "pom": "sha256-/DAp8kYk6YvWC1pGmSEPP1YKOUiTQpzQbMrYROj41BU=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/code/gson#gson/2.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, + "com/google/errorprone#error_prone_annotations/2.18.0": { + "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=", + "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" + }, + "com/google/errorprone#error_prone_annotations/2.3.4": { + "jar": "sha256-uvfW6pfOYGxT4RtoVLpfLOfvXCTd3wr6GNEmC9JbACw=", + "pom": "sha256-EyZziktPfMrPYHuGahH7hRk+9g9qWUYRh85yZfm+W+0=" + }, + "com/google/errorprone#error_prone_annotations/2.36.0": { + "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=", + "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw=" + }, + "com/google/errorprone#error_prone_annotations/2.7.1": { + "jar": "sha256-zVJXwIokbPhiiBeuccuCK+GS75H2iByko/z/Tx3hz/M=", + "pom": "sha256-Mahy4RScXzqLwF+03kVeXqYI7PrRryIst2N8psdi7iU=" + }, + "com/google/errorprone#error_prone_parent/2.18.0": { + "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" + }, + "com/google/errorprone#error_prone_parent/2.3.4": { + "pom": "sha256-QElbQ3pg0jmPD9/AVLidnDlKgjR6J0oHIcLpUKQwIYY=" + }, + "com/google/errorprone#error_prone_parent/2.36.0": { + "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw=" + }, + "com/google/errorprone#error_prone_parent/2.7.1": { + "pom": "sha256-Cm4kLigQToCTQFrjeWlmCkOLccTBtz/E/3FtuJ2ojeY=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/28.2-jre": { + "pom": "sha256-UEptGOuBum1aJVomK9gj8BaMf0eBTUtST1+jA+pWF8I=" + }, + "com/google/guava#guava-parent/31.0.1-jre": { + "pom": "sha256-s7a2qnCZwRgXrO6FsyL9kffuMq6mn+CD7jbIc17AZ4g=" + }, + "com/google/guava#guava-parent/32.1.1-jre": { + "pom": "sha256-BqpdGsBo8vgJUw8/9T+1yMlAFSolNiPQtTxPU/WhOj0=" + }, + "com/google/guava#guava-parent/33.4.0-jre": { + "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc=" + }, + "com/google/guava#guava/28.2-jre": { + "jar": "sha256-/DqjY62HIj0fvqWE7uAVqGIVD200xx8k3HQIimNfCO8=", + "pom": "sha256-wIBSYVSNxhykyYK1m/qtZQPkMZD15eRE6Qss9qty25Q=" + }, + "com/google/guava#guava/31.0.1-jre": { + "jar": "sha256-1b6U1l6HvSGfsxk60VF7qlWjuI/JHSHPc1gmq1rwh7k=", + "pom": "sha256-K+VmkgwhxgxcyvKCeGfK/3ZmRuIRO3/MPunCSkCy85Y=" + }, + "com/google/guava#guava/32.1.1-jre": { + "jar": "sha256-kfu6N/HIslHPnqnn06Np63nrHmpd8dS79IPdA4B0AoE=", + "module": "sha256-pY+TjSOeaYtZs8OcrVgO/Ro/1MoTq5KzBCbUJFLE7z4=", + "pom": "sha256-LJBx19FSKwx2IFfDToub+uOZJ6DrdVw2qnZRlyGHDXs=" + }, + "com/google/guava#guava/33.4.0-jre": { + "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=", + "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=", + "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/google/jimfs#jimfs-parent/1.3.0": { + "pom": "sha256-HujPYBb+/5eGQrqvajZ2sUCBNGC08LLKupmaMq5eqR4=" + }, + "com/google/jimfs#jimfs/1.3.0": { + "jar": "sha256-gklECLtRP1USZS57f2PW8x8B7/V841yHhkT/wtJa7k8=", + "pom": "sha256-xH8iAIEN7swu96xiY6NUqF6vIf1U9vGLvHOPUUv+cOs=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/ibm/icu#icu4j/58.2": { + "jar": "sha256-lT4eg7K+fD6i+I2obBNhT0fp5x01eMhSHX8Yd1a2OWI=", + "pom": "sha256-R7Zq1yxypJmlRL57ixEzX2xz/bcyFxfRGBHfs+k0FGo=" + }, + "com/jayway/jsonpath#json-path/2.9.0": { + "jar": "sha256-Eanub4i7MfFFAQjRz2RBN33shKygdetrsjQ74VdXW+o=", + "module": "sha256-5ikAQ9rpOnDZqz+hvrh56M9e1ajgqQGD+5bCUVqXCD4=", + "pom": "sha256-DCU33em/ncKix5ZzAPwTvFIp0ZJnf8uItv2Jlmk2ZD8=" + }, + "com/networknt#json-schema-validator/1.5.5": { + "jar": "sha256-+fAA7RyDJ5JyPkotvC4x4Zd8WU0i1ERLRs+N6anT94k=", + "pom": "sha256-TU4EN7xfLcgtujWjfNLLKtSft8F3V+jZEtnua+cH4rg=" + }, + "com/palantir/javapoet#javapoet/0.6.0": { + "jar": "sha256-HI3RzEQEue61xU/vihzyvnoTikJ4O5Rg+66cr4XtWy8=", + "pom": "sha256-9uNKJqwJo6aKkcySNcsfjHc2sH/onbWaMkrNjVfZ55c=" + }, + "com/shapesecurity#salvation/2.7.2": { + "jar": "sha256-UrhnP2KpmupssmLnlGBkH/iJrVDO51e+MeIn2ZWn8rw=", + "pom": "sha256-oOTbnCwgUSBjf5XD7eCR3zpte3HGvD7CyzUcIo3k8IM=" + }, + "com/squareup#kotlinpoet/1.6.0": { + "jar": "sha256-gIXrTIsezk8yJZsi8mv4gLxHt09UjikBCwFGqms48ks=", + "pom": "sha256-ehlsmQuPMqA98tIsiMpe2ZLAOdReWzh2JjYIJD9DM0c=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", + "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", + "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" + }, + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + }, + "com/tunnelvisionlabs#antlr4-annotations/4.9.0": { + "jar": "sha256-B9BT1MMXi7QGt3Iov/5a8jFHNmboS/gBhrHOpDmLy3g=", + "pom": "sha256-/RFLtzGoRYoVaFF2Efdw61AbP1gxR+z+lwZwv26rsU0=" + }, + "com/tunnelvisionlabs#antlr4-master/4.9.0": { + "pom": "sha256-PGDW41sFnx1xFiZQuyKCPZE8xbH2dxQiYptTGBckDIE=" + }, + "com/tunnelvisionlabs#antlr4-runtime/4.9.0": { + "jar": "sha256-5Bk7qANM7fkgkFvbMYuKUJfXZ/mZ+HupekKY3mnz/6s=", + "pom": "sha256-rrWtT7mfiGvPWaqtrMB2l/6VRswGCKs/KA/T6/Jibx8=" + }, + "com/tunnelvisionlabs#antlr4/4.9.0": { + "jar": "sha256-xGNEWLxKnVdRl56TMU30mRq/X6BhBXySYyVulQPhzDs=", + "pom": "sha256-cjuYfLaa8AQaHOq2PkSU1kJBv9gViQp6wQz+IUrZqdo=" + }, + "commons-codec#commons-codec/1.10": { + "jar": "sha256-QkHfqU5xHUNfKaRgSj4t5cSqPBZeI70Ga+b8H8QwlWk=", + "pom": "sha256-vbjbcBLREqbj6o/bfFELMA2Z7/CBnSfd26nEM5fqTPs=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "commons-fileupload#commons-fileupload/1.5": { + "jar": "sha256-Ufez3LTlDHZimU2i9HIxUZ/5lwelx/t7BfTE06FyjBQ=", + "pom": "sha256-zHIPHgWDV52f5Tk8iE7kbQ10+Z0fm6AXsXKzHqGJ4rE=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-io#commons-io/2.4": { + "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=", + "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "de/undercouch#gradle-download-task/5.6.0": { + "jar": "sha256-zkN6arnKcZzIVrVbp0kuQsTODumC5tIvtDLNVYh2gb4=", + "module": "sha256-P+YJN66Dzs2qpOD2EykVaQKD7d+IQ54m8efjgEV4NSI=", + "pom": "sha256-RqMBkMaLY9AegKQEQJfCULu8MgmkXw3FpNDioe1bgKc=" + }, + "dev/equo/ide#solstice/1.7.5": { + "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", + "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", + "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" + }, + "io/fabric8#kubernetes-client-bom/5.12.2": { + "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" + }, + "io/leangen/geantyref#geantyref/1.3.16": { + "jar": "sha256-fx1ZEJLVFCtqqnz1n5TEx01X2+7wOy+CYpSfjza6xuM=", + "pom": "sha256-JCgbY4MutO8QZOfd/b57eWquGr+IeYrb9NC5ZpurpKQ=" + }, + "io/netty#netty-bom/4.1.86.Final": { + "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" + }, + "isorelax#isorelax/20030108": { + "jar": "sha256-NCcVJDHPf5Z/kuaeXKwWFHxdj7S05ainL1KReI78/4w=", + "pom": "sha256-ug/b8qvT+5HXid/DGfVCwbiy1db042K6D5PcR79i9eY=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { + "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" + }, + "jakarta/platform#jakartaee-api-parent/9.0.0": { + "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" + }, + "javax/inject#javax.inject/1": { + "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", + "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" + }, + "net/bytebuddy#byte-buddy-parent/1.15.11": { + "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY=" + }, + "net/bytebuddy#byte-buddy/1.15.11": { + "jar": "sha256-+giZiq4ee9roO94HEsUOhETXHA4MGWuyJHrejUrQ65A=", + "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4=" + }, + "net/java/dev/jna#jna/5.14.0": { + "jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=", + "pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0=" + }, + "net/javacrumbs/json-unit#json-unit-core/2.40.1": { + "jar": "sha256-rbfoK/91XIqQw7dBIibzpy7UqLvbDNs3JrRpBQNgUdw=", + "pom": "sha256-fQRVja+97tYnCxaDBh2k+nj76qhlAgQ9IeRldagofhE=" + }, + "net/javacrumbs/json-unit#json-unit-parent/2.40.1": { + "pom": "sha256-GgCNCnykEDwm/lGk3ott86W5KGQZHNGLGfEBumF3yZQ=" + }, + "net/minidev#accessors-smart/2.5.1": { + "jar": "sha256-J5auhX0Me+S8NYDapNOCjVVSEjVfTIPTjdCvB0KzyBI=", + "pom": "sha256-SH53qNvZrDhEGRbIMFAYXDoeSGnOl1N3r+o5Mr9ire4=" + }, + "net/minidev#json-smart/2.5.1": { + "jar": "sha256-hsDBiVgbebV7Bxn0Q6ck6fYo/7ue72Rc95GU9Zc6EAE=", + "pom": "sha256-9GfdUfaGnmaD0QWmcop0I9oReTsIFevTK1DDq/QyH20=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "net/sf/saxon#Saxon-HE/9.6.0-4": { + "jar": "sha256-wW6MiyS/b6Fl4B7KaSiMtkNf2TW4s19WeFjFl8yLyrQ=", + "pom": "sha256-t/yqK4yQwOrPBGivdO71cu/ehElg1JeTwyXFXgYE3Mk=" + }, + "nu/validator#cssvalidator/1.0.8": { + "jar": "sha256-sBzzjmk2G81Aux/Yuo2kaVcrkvIsjEqgCltYrXcuBAY=", + "pom": "sha256-yQ8wpMPMPMXLtvTWGfz3j5H0JgafiuziZd1NQYhLD/M=" + }, + "nu/validator#galimatias/0.1.3": { + "jar": "sha256-s3y8RRNYTtaqHY91KevnervijB9U7GOw/yigCi2dKpo=", + "pom": "sha256-0pTwlIXl8ZksreBRvbe+5wkiW5sKPOPQkAn36KjwG10=" + }, + "nu/validator#htmlparser/1.4.16": { + "jar": "sha256-Gh2hDgEJBdA+ZLQ/kLFxkDQOlkSCPLKvKlgiYIJVIRM=", + "pom": "sha256-X/JPq97/y7gin1SRPIomRALbzuZEL9DFNSBSgGQgxHI=" + }, + "nu/validator#jing/20200702VNU": { + "jar": "sha256-jjev/dEa645RrxsKg3CioWS7Bvjs0OR+oC/IGb/VX1o=", + "pom": "sha256-FKoIrg/V4KZsswsCx9bnOpOHC98K98jN8ub1flu4zWs=" + }, + "nu/validator#langdetect/1.2": { + "jar": "sha256-+wJvcyKYtK5eVurhHOXafBpc5AVzCEIInMku15vpanY=", + "pom": "sha256-KyE28/fhlC+B4R9FV0x+cnfWeURT27yzmYs8MluPu+g=" + }, + "nu/validator#validator/20.7.2": { + "jar": "sha256-L9dKzt4kTJ7GcyvLVyR6AfZ+JYCLVztT6EoK4pyfl4U=", + "pom": "sha256-GHLq+MRZqWPz+Oo+G6220xgYc8YH4v9aj1CylRNjvkM=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.1": { + "jar": "sha256-grnjYxrMcIwRUhb6ePl3gNioHbt/FfjYIpGh3DqDsdA=", + "pom": "sha256-fIy/ymTpcEQNTyh/NRapbABpKgOU/KHVexKpepbw6hE=" + }, + "org/antlr#ST4/4.3": { + "jar": "sha256-KFR9ukjPzrd7bvv+Bprr6e0zJK5g29Ugk9E6HWNu0Gk=", + "pom": "sha256-Lz9Cw+TSDspiobTm2EFO8MuXODgISZnl4nA8ZOWECs8=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/15": { + "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/ant#ant-launcher/1.10.13": { + "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=", + "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o=" + }, + "org/apache/ant#ant-parent/1.10.13": { + "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk=" + }, + "org/apache/ant#ant/1.10.13": { + "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", + "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" + }, + "org/apache/commons#commons-math3/3.6.1": { + "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", + "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" + }, + "org/apache/commons#commons-parent/25": { + "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/35": { + "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/56": { + "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/httpcomponents#httpclient/4.4": { + "jar": "sha256-xQ6vpUd68vqCF9P3KbgV/zxmnbxGdVLA/u7cYb6WVSM=", + "pom": "sha256-ZKLnQYeKsG0yEWJ1cC6TLPjc/UYJNJ+yAL3sNG1elfE=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.4": { + "pom": "sha256-M/J/3AzbDS+IohFr5amyo1ZTn2u3o5MZdxrbZZ200kM=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4": { + "pom": "sha256-UFItaYaRpZowcLDqR6/yag2GqjJAyIRd8rOQlkpci74=" + }, + "org/apache/httpcomponents#httpcomponents-parent/13": { + "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M=" + }, + "org/apache/httpcomponents#httpcore/4.4": { + "jar": "sha256-HvjbXTC3dBq1/fbfh2oJCn3VFiPoPzc20LuPsbXq0y8=", + "pom": "sha256-rwGjbrhaJe6i0r5BG+ogbQMP3CzwogJLtpUSqK7ME40=" + }, + "org/apache/httpcomponents#project/7": { + "pom": "sha256-PW66QoVVpVjeBGtddurMH1pUtPXyC4TWNu16/xiqSMM=" + }, + "org/apache/httpcomponents/client5#httpclient5-parent/5.4.1": { + "pom": "sha256-L6XaD1iLiH/eOrrsd93p7nFumNsuFFJwIjtbVH5woFQ=" + }, + "org/apache/httpcomponents/client5#httpclient5/5.4.1": { + "jar": "sha256-xsb8YMuz7dnoI9kibWCP8xNetIvSBJu4O9vD70qRETg=", + "pom": "sha256-ArD3i0r7w2xCK4Z51CWsPCH5iu7O3OohoC+pTgTXwT0=" + }, + "org/apache/httpcomponents/core5#httpcore5-h2/5.3.1": { + "jar": "sha256-lj4ZSpcqo9rwkofJIe1aLdTDmFxEGFsBOAApQwJb7Wo=", + "pom": "sha256-5tvnRFdwRLoVvwi6ViP5FBcFR8Te1jc42eQDzLiuXII=" + }, + "org/apache/httpcomponents/core5#httpcore5-parent/5.3.1": { + "pom": "sha256-9fhAvvD1PBeSx1INGq1DOSFfKO5EzjC3rW0NKSlACPk=" + }, + "org/apache/httpcomponents/core5#httpcore5/5.3.1": { + "jar": "sha256-g/VZrR7nI8GrPoCwQFUc+ssuWlK98E3N01QZpnYNgbM=", + "pom": "sha256-ALBBLdLr0s6dltKDnxTT/XMjALC1o0CrCNk30BcnG3E=" + }, + "org/apache/logging#logging-parent/3": { + "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + }, + "org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "org/apache/logging/log4j#log4j-1.2-api/2.17.1": { + "jar": "sha256-yj6RUPlcMdFbloCmCbiBf4VJvTlVkcXKVZV9HvD0ZNY=", + "pom": "sha256-LQAYi3EPC3r8SE5Jb2/Xs+s+ODMeCF886cPiLQLPp5I=" + }, + "org/apache/logging/log4j#log4j-api/2.17.1": { + "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", + "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" + }, + "org/apache/logging/log4j#log4j-api/2.20.0": { + "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", + "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" + }, + "org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "org/apache/logging/log4j#log4j-core/2.20.0": { + "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", + "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" + }, + "org/apache/logging/log4j#log4j/2.17.1": { + "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" + }, + "org/apache/logging/log4j#log4j/2.20.0": { + "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/assertj#assertj-core/3.27.3": { + "jar": "sha256-W4omIF9tXqYK2c5lzkpAoq/kxIq+7GG9B0CgiMJOifU=", + "pom": "sha256-jrN+QWt4B+e/833QN8QMBrlWk6dgWcX7m+uFSaTO19w=" + }, + "org/checkerframework#checker-qual/2.10.0": { + "jar": "sha256-0mH94l1ZD2tp23ch1GmsGwoZoXzKqqdRwx8Ni4JguJQ=", + "pom": "sha256-JG5H45X416jBK3IisWa8Oh04Cbw6PTDel0cKo42VKks=" + }, + "org/checkerframework#checker-qual/3.12.0": { + "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", + "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", + "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" + }, + "org/checkerframework#checker-qual/3.33.0": { + "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", + "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", + "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" + }, + "org/checkerframework#checker-qual/3.43.0": { + "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=", + "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=", + "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM=" + }, + "org/codehaus/groovy#groovy-bom/3.0.14": { + "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" + }, + "org/codehaus/plexus#plexus-utils/3.5.1": { + "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", + "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI=" + }, + "org/codehaus/plexus#plexus/10": { + "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" + }, + "org/commonmark#commonmark-ext-gfm-tables/0.24.0": { + "jar": "sha256-tU3DMvkx5tB8J2YUTAh7CPNpNnfjaBUaZwILTpW7S5k=", + "pom": "sha256-vyvnG//gIyTv1T8EXhiKaXlUQJCJQ2taplFIhB99DbI=" + }, + "org/commonmark#commonmark-parent/0.24.0": { + "pom": "sha256-PeaJsU9vvYC3DerOWehyTzXzXhQpxxb98PNooDaz00g=" + }, + "org/commonmark#commonmark/0.24.0": { + "jar": "sha256-Z5M44Lf8FcAtJ11ZhlSwGhSYk7woqHmS6QEjyNBq8ls=", + "pom": "sha256-DffPmAUxQkwc6POISc3YtqHG0QI5Pm0fXcErVqDSLyY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/jetty#jetty-alpn-client/11.0.24": { + "jar": "sha256-0+q/fwpQ7pnkwu7T+VWZetfIToMe9tmcpl/N2Gkbg7s=", + "pom": "sha256-4ChUPNXWBpMyzMepXiaeCUfgUWY62QK8CRmkbgxrfSk=" + }, + "org/eclipse/jetty#jetty-alpn-java-client/11.0.24": { + "jar": "sha256-GjsnDNXypSIpCZ1ZDV6pqgTuXkD2//6rffkmvmUzggg=", + "pom": "sha256-EXzXCLo3u6kMVwaD9v3LsY9IPiDkpOj0QhRT/JP47a0=" + }, + "org/eclipse/jetty#jetty-alpn-java-server/11.0.24": { + "jar": "sha256-zIMflTl1QO7wVV8LHht7L8pfYt/e0MT7UPo1jYulTc0=", + "pom": "sha256-jq2POCgEbXoevHVoT2OTaLdhQ51Ru19sgiCscdMJ33o=" + }, + "org/eclipse/jetty#jetty-alpn-parent/11.0.24": { + "pom": "sha256-OEfidTdZ+GkaIo2c8dddJPcwJG4J3FL/8b0r0PTbnVc=" + }, + "org/eclipse/jetty#jetty-alpn-server/11.0.24": { + "jar": "sha256-oRp4O8Aj5vsgET85ugmM/6H4/F2pkwOXHploc2PlZWI=", + "pom": "sha256-Kl+OKVd+qPdvkUmX9VOPjofcGYeJef4SC+UFRtsUoUg=" + }, + "org/eclipse/jetty#jetty-bom/11.0.24": { + "pom": "sha256-OzjVNA/7MaYiymePR8K2Bawg6lhVJZ84Xm0ujyfs1dk=" + }, + "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { + "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" + }, + "org/eclipse/jetty#jetty-client/11.0.24": { + "jar": "sha256-yYOqFTdFGdhxcoDh2EM028XuQiePsQllX29alJQ/TS8=", + "pom": "sha256-u68OEXqGWPInb/qKEbdVywctM1NQWvsKPk7BpkzkbP4=" + }, + "org/eclipse/jetty#jetty-http/11.0.24": { + "jar": "sha256-ZONoY0f2D7GqAlATghVHmVpwjmGomWfAOGrTrcn60R8=", + "pom": "sha256-/lve2cVDbsrkT438v4Rw0O96qj/U1nAe+oEuV4EOeP8=" + }, + "org/eclipse/jetty#jetty-io/11.0.24": { + "jar": "sha256-N5oEGTtOZm15AEePYC0SvU49kavTtfZENNkpJ7BHIPk=", + "pom": "sha256-vTPGW6IaAznasQRHEZ9yPb23L7mSM0AHjtTT1ZVTkwc=" + }, + "org/eclipse/jetty#jetty-project/11.0.24": { + "pom": "sha256-9miJ0dIX26PbBfSwXOwksKIg1PHRbFLSA9m2+3HaYIY=" + }, + "org/eclipse/jetty#jetty-project/9.4.18.v20190429": { + "pom": "sha256-1GvUDvRMD9fEvW/Hp/MUbHxgL3TrtfN42ipcMDXnmDg=" + }, + "org/eclipse/jetty#jetty-proxy/11.0.24": { + "jar": "sha256-Sm2GP0PMQH0GsriAgUOHog0hodIptNdV7xx8Ln4QOGc=", + "pom": "sha256-NaAFoAOnCQTDSyp+GfgdI71U25KBjCEfYsTiInDyGys=" + }, + "org/eclipse/jetty#jetty-security/11.0.24": { + "jar": "sha256-B/VW40sEjIGUQLnpn6apwUSeDRDjwNhiikRr5e0IK4g=", + "pom": "sha256-NeCJ1jkTMrp34adpkgnU7j7zlq0pkmWDWt4tm/0Esp0=" + }, + "org/eclipse/jetty#jetty-server/11.0.24": { + "jar": "sha256-ECHKaaTLVr2kZsqbuw/K/z3zFimi7PckBZX2Wuuro0s=", + "pom": "sha256-5yEko9Ho+3DaG1JY4VQrgB/+sDOqExYB2hH3lLQpj1Q=" + }, + "org/eclipse/jetty#jetty-servlet/11.0.24": { + "jar": "sha256-F4yNx+mFFboodMh7NgwZFf53TsbgARxlHmOeoycZvmM=", + "pom": "sha256-3uiUnisDmOn03P7p/2yS86l4qZd3aF1i6MheSx+7itg=" + }, + "org/eclipse/jetty#jetty-servlets/11.0.24": { + "jar": "sha256-x66EoSNNwkBEbqnmbyLhKRBfYvJfETYnME+LPBacz7Y=", + "pom": "sha256-gbRgsSDWSrntgs0oDfrdtb4om9P6V2M6D4/1e6R1HoQ=" + }, + "org/eclipse/jetty#jetty-util-ajax/9.4.18.v20190429": { + "jar": "sha256-sfOmKclI6RzM8O5BwkcYLwjCeKzjCdbzhvJJdFvhrLE=", + "pom": "sha256-59pcvWbuHZsx0DFJ1Jj183k6+aU6ghN/+PUsqdBGlW4=" + }, + "org/eclipse/jetty#jetty-util/11.0.24": { + "jar": "sha256-HscB9QUFZEPeE00OVGTimKoVQAmBIQwQtmigcP/Ze/0=", + "pom": "sha256-7ro8qZy7kyAEbuNm6V3wzr8vEQciaPRcouvj4iO2m8o=" + }, + "org/eclipse/jetty#jetty-util/9.4.18.v20190429": { + "jar": "sha256-2yrpdnnk2d0LluDi4EQj1BQHl3qH7foO0XFMROtceqE=", + "pom": "sha256-g/9B2rfamDvQ3Y+IUSZRCz+sQEtSzOlF/YbM4PAeIh4=" + }, + "org/eclipse/jetty#jetty-webapp/11.0.24": { + "jar": "sha256-McsSrHHqnIzljqDSmfOP3w7abuIzp3CuHqPOj3S5VP4=", + "pom": "sha256-Y9pNCE6Eb9AtbJpCi8zGYK+hxb17wkfsIfFsN6cWaBs=" + }, + "org/eclipse/jetty#jetty-xml/11.0.24": { + "jar": "sha256-gOF06W0GINnCf9Ck0ZqDEnjxRkycVr7Z5DfMikUlX9Q=", + "pom": "sha256-JXNlZfHw0Et42x+ZH449AZRmgAWbwqhXauRd7pJu8h8=" + }, + "org/eclipse/jetty/http2#http2-common/11.0.24": { + "jar": "sha256-XXdG9EmGKB3Ks+fLpeTSSGgnQ3XErF45F4XET5uZJ9E=", + "pom": "sha256-aEwrliRzkYCfzaIEvCz/NqLyc7LgCLlDxs6QTrmkCsE=" + }, + "org/eclipse/jetty/http2#http2-hpack/11.0.24": { + "jar": "sha256-8yapKXQgEU+ZuzCFkHcrQQDNjmL1XWdm5ctJb7JHQ8U=", + "pom": "sha256-4N056ZrPI6FKjnFfmLf5Lxe6AgVMJuI4XOXEm85i4jU=" + }, + "org/eclipse/jetty/http2#http2-parent/11.0.24": { + "pom": "sha256-H/63MlEaizavZ8nPMV5XckiQjy/U8WLyxVezUjFsBis=" + }, + "org/eclipse/jetty/http2#http2-server/11.0.24": { + "jar": "sha256-p4bvTZ6UpIZcl3XKG6wwdgMA9WNx17QISGixfM4Cw48=", + "pom": "sha256-e4PC3DueupOTnXmCIU9A++tU/iean6/NAb9Me0dVdE0=" + }, + "org/eclipse/jetty/toolchain#jetty-jakarta-servlet-api/5.0.2": { + "jar": "sha256-77IJl3KfMr+myKgxkDfDU/etRg1dSfM2vyMpmOojWNs=", + "pom": "sha256-g+y5PmHWvZyMgfwlzcrUp3ONx7LAiCnRcihj7kaaSIo=" + }, + "org/eclipse/jetty/toolchain#jetty-toolchain/1.6": { + "pom": "sha256-RVY/EXXZhZwcBmoJgPvbn2u0xtPBLgXYlXm7F4P0e2w=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { + "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { + "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", + "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" + }, + "org/eclipse/platform#org.eclipse.osgi/3.18.300": { + "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", + "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" + }, + "org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "org/fusesource/jansi#jansi/2.4.1": { + "jar": "sha256-Ll53Wp3Fj/prvWqm8JnWL4ti3N60w8O7vlzyMBvC3ME=", + "pom": "sha256-P5jZeaTTVZ+HefuwBLNK51Fq+t9RDhHffMPNBz6xuzs=" + }, + "org/graalvm/compiler#compiler/24.1.2": { + "jar": "sha256-gq3hmWcps0qlg7m/JB2VVPTZ2cxj14IQ6FT/hNozVww=", + "pom": "sha256-zQTN2Et4pKF1FHqAe3NHa9DPmhq/Qv6zy2IKCHkJSQ0=" + }, + "org/graalvm/js#js-community/24.1.2": { + "pom": "sha256-/JHs5Fr26PIPfriMs0i6nbz5u0b+t2tXguGQx+I/mio=" + }, + "org/graalvm/js#js-language/24.1.2": { + "jar": "sha256-xci8J4EZ+BhYerB0FnF/EPhVxDpohezx6cfKtw63azw=", + "pom": "sha256-fM8RFfkdp/3tFxuZa+GJt/evoo9rssTMoClYBK9nDvw=" + }, + "org/graalvm/js#js/24.1.2": { + "pom": "sha256-8N0K3PJg42G3my5F+belkz4PlbiYTu2wc14U+vGXzgE=" + }, + "org/graalvm/nativeimage#native-image-base/24.1.2": { + "jar": "sha256-qONvRTeFBOi5XdI3NbET05CW6AoQ3jKPyQw6BGpk7Fc=", + "pom": "sha256-eNQbHL1x6K0QHYmsZOze5Mujf7rtRrmrqHcxjyBfUxw=" + }, + "org/graalvm/nativeimage#objectfile/24.1.2": { + "jar": "sha256-b1vpPS25JLVAYJzfO25bn9FAxSmvyLeK196wcK4ZaR8=", + "pom": "sha256-rL21b7fdbTN/XKRVuN2lByZNU8Hv9xb5W2RGSdBSfMg=" + }, + "org/graalvm/nativeimage#pointsto/24.1.2": { + "jar": "sha256-cfH1cZKpPs0EhI8iLqqfbxW0Q+vphJEL86ZYX5xBXpU=", + "pom": "sha256-Sy7YHy3/sYiD52THB6Jo0j5tX1TMMl1tdb6d4PAKDtw=" + }, + "org/graalvm/nativeimage#svm/24.1.2": { + "jar": "sha256-/0YCkZMbK1Nmm6RwhH4aM+bQtGA4v3JjU98Ot4CwEQc=", + "pom": "sha256-+Xiugobmr5ie+3pInagYJIHEpQ4i0gxpEeQ8kP9CJY0=" + }, + "org/graalvm/nativeimage#truffle-runtime-svm/24.1.2": { + "jar": "sha256-2LxJ81SH2ILH20s8l2wXPiaOjDllnlzcLxWIToHjhr8=", + "pom": "sha256-5hd5+iy00SVEqhk722OIXKqu5kL93zzEQmKyXc87aD4=" + }, + "org/graalvm/polyglot#polyglot/24.1.2": { + "jar": "sha256-baP+QqFqbWcMNFhGLfmosfIZh4PiKBn/y29XW6GdX24=", + "pom": "sha256-JA4/TNOBxDpQzio1aP8B5uZkxyS1jzUg64w/63b/clw=" + }, + "org/graalvm/regex#regex/24.1.2": { + "jar": "sha256-9U0ujATkV+FOp+yrrO81WvFPnf0lJZMmtkqly8U6/Ls=", + "pom": "sha256-XldkKpbEd7Vj3h7rSpH0FQuxrMFzUL55mgPW31IVgFI=" + }, + "org/graalvm/sdk#collections/24.1.2": { + "jar": "sha256-y0BGwMpGmWG5PWFZ+Hrhf/RJhHo2d//d5ZugkJG/HYQ=", + "pom": "sha256-GpD0olIcFyFLm8B5J8NI5IGDvmMySQdMIFkTm0qaJfQ=" + }, + "org/graalvm/sdk#graal-sdk/24.1.2": { + "jar": "sha256-8pTBWK6CN7jcm2Gulr7JOYP+wkNa72+2ENvd2lfC0NU=", + "pom": "sha256-UT1IZgK0JiB5IUbfkeMOEsS0Zu8MJbFZgS48YudLU3Q=" + }, + "org/graalvm/sdk#jniutils/24.1.2": { + "jar": "sha256-JbrCp3mGJJaMfGkFbhoqYa3R64o9umCKKx9jYWXwc/c=", + "pom": "sha256-YMcw3nPAcZJ0cor/jpzCXLTM+tjgwWSM2m2u4Px2yMQ=" + }, + "org/graalvm/sdk#nativebridge/24.1.2": { + "jar": "sha256-U2e5IG24xy8v5ZkklbP0/Kf3t0XuaPDlnSs2pf/Txnk=", + "pom": "sha256-YPdz2cf5a9aD1LZp+pvhR7Ho+QaizX5fXHuo6GcT3VQ=" + }, + "org/graalvm/sdk#nativeimage/24.1.2": { + "jar": "sha256-POtoig91AJ0UwvSy9iRCA0es09+CRVAUS6jwLdJH/N0=", + "pom": "sha256-7Fs7DGjZTpnYYyE4GUQZLBtihXtUQcGV5dDzjYDLf8c=" + }, + "org/graalvm/sdk#word/24.1.2": { + "jar": "sha256-BTHpPWpg3aUxP0gKlp0bR5P8qs94Z5iyQPfe1U7r880=", + "pom": "sha256-5wZNcSPCVYFG0RAZP3u0rvm1A0WRg0Z7dxr+8C1nzZE=" + }, + "org/graalvm/shadowed#icu4j/24.1.2": { + "jar": "sha256-lO3/9ZUrQRg3aZgQr6Hvs7UlT/7LdS344SZG0k5VeXA=", + "pom": "sha256-P57XxBd+qwIXqv8KQbIfhdpu/7en6GuTv3gzU/KYASo=" + }, + "org/graalvm/truffle#truffle-api/24.1.2": { + "jar": "sha256-/YhKfGsvigm8G6zkXYr0LasC3KOOEckvQ+QItJC9YKM=", + "pom": "sha256-/FGo+tFWW/EKS1NAnGH93pjdkZyiOpbgKnLDZ1E5LzY=" + }, + "org/graalvm/truffle#truffle-compiler/24.1.2": { + "jar": "sha256-H7rMDaupxoli5eMplVZS9wVRyaERQySff2XicuiRuVw=", + "pom": "sha256-lYRyGH1LeiOPlkBmCuQDVfBnSTdVr1vmU54uHFXiX6I=" + }, + "org/graalvm/truffle#truffle-dsl-processor/24.1.2": { + "jar": "sha256-8cfeDrNNHdo89VlsXCjHe41Q3j4VfRWc6tWIvzCTw4U=", + "pom": "sha256-/SaVF3mJNesYpbqWivrKB1LM46Nl+QxxywqP6fjXts4=" + }, + "org/graalvm/truffle#truffle-enterprise/24.1.2": { + "jar": "sha256-lzki77b3hsYJMmG4QsLHU8wCpXgiDIqwf1IqPMPXbB0=", + "pom": "sha256-kOuiMkmvxuZlKxay0RVsSPAmH1TJnc2cqQdvwSQraZc=" + }, + "org/graalvm/truffle#truffle-runtime/24.1.2": { + "jar": "sha256-C1/otOVMvHywtoEZFxX54Rqr182f6zWroWK/GoV5WgU=", + "pom": "sha256-suG7sr5LL/v1+xazdHDtY1p6OJAaICDyvSFdwRMt8gw=" + }, + "org/hamcrest#hamcrest-core/2.2": { + "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=", + "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590=" + }, + "org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "org/infinispan#infinispan-bom/11.0.19.Final": { + "pom": "sha256-OmBv0rX3f991rPM15brdRnxCQFsR8mjnPBfrkkM+WhE=" + }, + "org/infinispan#infinispan-build-configuration-parent/11.0.19.Final": { + "pom": "sha256-EghgxWpNd7zBIjy650Dusm8vk1XUmhfV8WWADuCvqno=" + }, + "org/jboss#jboss-parent/36": { + "pom": "sha256-AA3WFimK69IanVcxh03wg9cphCS5HgN7c8vdB+vIPg4=" + }, + "org/jdom#jdom2/2.0.6.1": { + "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", + "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains#markdown-jvm/0.7.3": { + "jar": "sha256-iTq7MfFbYhb3TccEwMa/HlZ9zytizKKc9C5PUxU2N6w=", + "module": "sha256-cCm2PHSWTltDNDCO5ynpW1ONpe1qwSsuR31HhXLQIlI=", + "pom": "sha256-rLnRV//Hpk7mK+jt2WANJrXbAycKdOi+U815/gsm880=" + }, + "org/jetbrains#markdown/0.7.3": { + "jar": "sha256-+Hp+5ADarnOaX9bzGdMb+6MG8E1qV1dAawGd8b8r9qk=", + "module": "sha256-2/rnqoU+teoe66MYllOKhANkb1XFmpkZHWh/wDe9rDk=", + "pom": "sha256-EeUuCmQOVKSzsjDRSFyVukuneyx7H8KENzkPngEicUc=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=", + "pom": "sha256-rIU9chaJ+vEV8RiBCjU2/CcvE1to0CdFOqpW6eY79wc=" + }, + "org/jetbrains/kotlin#kotlin-assignment/2.0.21": { + "module": "sha256-8638yrZURNtqqzwNfSVoZG7AyS8kWCh/KLKu5POXNtw=", + "pom": "sha256-QBfCQqfb3Oca6ApXB7S/OyOoIr8jpodahFp7UTYhzQ8=" + }, + "org/jetbrains/kotlin#kotlin-assignment/2.0.21/gradle85": { + "jar": "sha256-USUeNCELiNTJCAXKZS6Xe93IR4OkVAY5ydIQkJhbrOY=" + }, + "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { + "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", + "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" + }, + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": { + "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=", + "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { + "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", + "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": { + "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", + "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", + "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=", + "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { + "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", + "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": { + "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", + "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=", + "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": { + "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=", + "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=", + "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { + "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", + "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": { + "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", + "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { + "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", + "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.0.21": { + "jar": "sha256-2Gv0M4pthBzM37v/LaBb0DpJw9uMP5erhed+AhrQhFs=", + "pom": "sha256-esgfO7B8TWqo+pj/WjmaR6vRzhx4bU8/rZbvKBIL34o=" + }, + "org/jetbrains/kotlin#kotlin-native-prebuilt/2.0.21": { + "pom": "sha256-Gv4wJE4ZR67Wy+01BBrTbFnw6nZK/bxv/56agY7loEE=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": { + "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", + "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { + "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", + "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" + }, + "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-x88d6VXfIqFihyImvQZ3yaDItmMKLi1z0R0UfNDFO3M=", + "pom": "sha256-cWKsEOFFTpJ2c7FcrQMp2jgvt1jmVPWfy0AHRZ2eyEE=" + }, + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21": { + "module": "sha256-kJCVCx7oa4b+KWmV2AKG6opPN5+yshjoVvzt0ErS1Hk=", + "pom": "sha256-7lYZBmzLB5zDMy4kcnQ1n9dQXeLVQPuRtyd5ICW2Siw=" + }, + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": { + "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": { + "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", + "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { + "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", + "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { + "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", + "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { + "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", + "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jsr223/2.0.21": { + "jar": "sha256-oA3EJBkEd4i4324+tLSJFK3eNVIPg+adigW1f90Kgls=", + "pom": "sha256-dIMa0FAwQx86SWvajE2zVH+IOZD+c4IDewYzDZLVYUU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm-host/2.0.21": { + "jar": "sha256-+AqFLOSTTUbjnQa7VBUDtvtTpRJ+Fi5LGzTU7s8JGiE=", + "pom": "sha256-WalUA6QOq3dIr5wlAat93AV45rnaVdgoddCCVtxfBGY=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { + "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", + "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" + }, + "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-3v0m28WB8x1QKe5EmZ4QRpLrAw6rrX2TZMI9jwuP2Fk=", + "pom": "sha256-0opI/fcJ0wz4lqL3XMbx7aA3L2r+MYdCDPigSrJCb/w=" + }, + "org/jetbrains/kotlin#kotlin-serialization/2.0.21": { + "module": "sha256-HXUsci8E/La3an9mSgXqFQAuEO1c/30pBJtd5ZfxID8=", + "pom": "sha256-Ju6iFEnSY66HScTjq7enkNl1ubpRP2jVSMzFCOFfUkI=" + }, + "org/jetbrains/kotlin#kotlin-serialization/2.0.21/gradle85": { + "jar": "sha256-wd9+ggYbMC3WH0hoOT54Uy/qeKprY7eBmybK9sJHRME=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": { + "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=", + "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": { + "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=", + "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": { + "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", + "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21/all": { + "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": { + "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", + "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { + "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", + "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { + "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", + "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" + }, + "org/jetbrains/kotlin/kotlin-native-prebuilt/2.0.21/kotlin-native-prebuilt-2.0.21-macos-aarch64": { + "tar.gz": "sha256-yCN1mUlyXnBw9dwg063YIqMivAeo2Y1USfvb/I2Is1Q=" + }, + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.21": { + "pom": "sha256-qWzO0nL6L6tLdB40cgtedO9RS0QRFSMD7fnBJ5V6R6o=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/jetbrains/kotlinx#kotlinx-html-jvm/0.11.0": { + "jar": "sha256-4nb9kD4yUy/2N0RxOj0QJeelDw94rEb75ZEOFZb9HD0=", + "module": "sha256-X7HkFdiYoGjNPuH5fEA8qMg7PtA7/WecP2Bs5wOKdw8=", + "pom": "sha256-JwybmESOeNZABjIDsKsWdqKS3YDjOj3hiMcvxcIuSVA=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.0": { + "pom": "sha256-xD5IdSnM/RIJ66hlOrjolZggNGSq+/5fBEje2ZKHFQk=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.0": { + "jar": "sha256-08lOnYKbum4MTNOuR4pAhG3UnVR11nB4d76FOXav5BY=", + "module": "sha256-NzH80jhWGpCpdSs0hfHWNeAbRF5Kd4F9ewd/S50vQi0=", + "pom": "sha256-QVKRtvWbeTemcau136BLJyl811jLUQLNzHWUFJj5wDw=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.0": { + "jar": "sha256-hThiUkHBX0SBQAQyDq6l32fpRK3FKwDduDGY1mTpIlE=", + "module": "sha256-mE2aqabpvMONfoNuqNAAsThyCH/GZY0NjWIldjPzlfE=", + "pom": "sha256-nVbnQWLOQn4MSetsuXUSR0Mq3PwukTw4KWY+27qr7hM=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.0": { + "jar": "sha256-e3xEWIDO+U3EZPRzPaGzO5S+54gFBB6giuBuhQfkYg4=", + "module": "sha256-l+NZl/6prZY63lv0wDko/lOXS4JlIdSwP7+zyrAgiqo=", + "pom": "sha256-4CSBj4YiByqIM8DTmVd3Uet3ZJymO9DA/AYATWaRd6Q=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.0": { + "jar": "sha256-+qvHPoVryerJe6GdPfT8Suh+FOKt0HZccEG8cupHobs=", + "module": "sha256-lK/eU8GRw+Hge5+AiqF3f4YryKlbxQtGYozQkhnVaFg=", + "pom": "sha256-WAgq+Zc0Ah1bjbKcQ1sR1FyhGxwP14bHhFIsnSxxeVg=" + }, + "org/jline#jline-native/3.23.0": { + "jar": "sha256-67QTkCH3PxmswV70H+XfOYk979pEqMt5EEfYT+hlUo8=", + "pom": "sha256-4R+TbRRFnwzlLXrIugQX+Jo0F7ZteARXYnIVZPynFJQ=" + }, + "org/jline#jline-parent/3.23.0": { + "pom": "sha256-FsBy+h0RKs7uO+J1KOm/FX+S++nSrLwiKhIpmRP8Y/4=" + }, + "org/jline#jline-reader/3.23.0": { + "jar": "sha256-8jn4QWZ3XwUZ+4ioqggjbWzLbfuCHy29DPPYeAp3yXw=", + "pom": "sha256-2v464XJ0coWwlqlcxBtcUJAvkRpgiEpJjt/eZ8QjzAE=" + }, + "org/jline#jline-terminal-jansi/3.23.0": { + "jar": "sha256-5J8/1WLzw+Yug9WNQnA8o9KMNdwIJ2z/J/qiicA/lRQ=", + "pom": "sha256-MEQFUqD44DBRCgJEGsJMGpLiWk3ztTSntHMgGmNLyks=" + }, + "org/jline#jline-terminal/3.23.0": { + "jar": "sha256-hwrs9UUhkKdKOJe0Esle6aeukqP+RPWpqLGi4uZqfhM=", + "pom": "sha256-8x3FciyLEYhUc6IZ0wJXKdjvUbL03xLjFJabA5/eaUU=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.8.2": { + "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=", + "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/junit/jupiter#junit-jupiter-api/5.11.4": { + "jar": "sha256-q4PvnlGsRZfVnSa0tYgSEpVQ4vV5pATIr30J9c5bQpM=", + "module": "sha256-puov77OqWGj9engK4doRYudt2jdgtIAVwqQZ0jcv88s=", + "pom": "sha256-US0j/znHZmWho2RVJiMLz4ib1JiEME9/6+BHsBjuszk=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.2": { + "jar": "sha256-GAjuh+D3GM1uJfO3WvwXlWrIo+3EjH6bq58Z+aeeOAE=", + "module": "sha256-fpr03/9iZ6zd0VfZ4Rug1dyRszL6dLxMZZOeRReht3A=", + "pom": "sha256-yb3jYieVswp3NTHoXFgy+NyKp37N0xPu4jXJg8v9Anc=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.11.4": { + "jar": "sha256-zfisWfP613TKc4rQOJCVDuuRgz7w6JCHUxd+3SbxWBw=", + "module": "sha256-25EWOorwBaMnmFZd1nU3clGJWQ3qttoDsx292kVoahg=", + "pom": "sha256-sKMjsNA0REQdE9RjC0DbXvhBYNLC9YXU1kbcOIL5kgc=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.2": { + "jar": "sha256-dTt3Js3RWLs0ztuUwWHiKRiW9HgyoentpT2XACCoGE4=", + "module": "sha256-pWIExxbCN5lwyo4/4qcuOgMM2QJzKNPOFFfdEMAVDn4=", + "pom": "sha256-Ckt92UuvnF+7ZaLpFz0IUii9ACQhNkgCWtBnAk8cZrs=" + }, + "org/junit/jupiter#junit-jupiter-params/5.11.4": { + "jar": "sha256-AqbgFd586UrH8lbn+gW4CR3qhh/nmlVaeZMxPQ9sfZY=", + "module": "sha256-WIZbi0uZi5qxnBP45BO34dSBk3TdXfaXYMTAsLxOmJU=", + "pom": "sha256-jDWbvqB8ZKas3YweE7T3cFiyQys16G6ald3GMkmgrVQ=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.2": { + "jar": "sha256-0cItb+VINWjAjIkT80q9IwNJDDSAzmwYouoxxl5EECo=", + "module": "sha256-UCPk4+wVbsa9PPZV8wcM/Fo+iq1dUbS74CWnkulJjXM=", + "pom": "sha256-tGngEBcBfYW8AlIlMCBS+kXPK1n5QVhCRzlGtPpJx8Y=" + }, + "org/junit/jupiter#junit-jupiter/5.8.2": { + "jar": "sha256-T1wcxkMiRM0W42qg4Ct0vONKgf+VoT1j1QlR7Ezj9L0=", + "module": "sha256-2d9Hs8dDGIOrHx8dggwpgOvL11PtxMgrmb9ewsUzrS4=", + "pom": "sha256-Q/Vic+es8z4PW10Qecf/pCRTHwHieUqdZHOt/RCkXS4=" + }, + "org/junit/platform#junit-platform-commons/1.11.4": { + "jar": "sha256-nt2Wmw0GcMVBBbyRrnm9HG9QPhIRX6uoIHO4TIa7wzQ=", + "module": "sha256-C54mJcj0aLPNQTLMCoBfif5B+FLRrf/3Xz6xRlyhy2s=", + "pom": "sha256-zRLSt8JC8WVUjtnJQGFg3O22CAkltHz3MeD9rl+0vOI=" + }, + "org/junit/platform#junit-platform-commons/1.8.2": { + "jar": "sha256-0uAV/KcTDnmvL0YI3FRBXksQtZLXczPey0saJ0wYUFA=", + "module": "sha256-NChH0wRv6kNVlWkttPBdXwOeDh0eIE9NV1WQJVcIJiY=", + "pom": "sha256-zoUuNMahhKpsgO6N8EcXE6dAgTQTTwjjwcPdh8a1mrc=" + }, + "org/junit/platform#junit-platform-engine/1.11.4": { + "jar": "sha256-sd2Zj2T5rK3BWWbZzT0IB0ZiZ3s+OQ8KOPy/C7THIzA=", + "module": "sha256-v2zh+1lR3Gx942re72rq9474LWODHFzOvOOI2p/F/iU=", + "pom": "sha256-lDRxV5mEIS++adA+3sfC/0+6sYiL4LgMJl6nCGn9ir0=" + }, + "org/junit/platform#junit-platform-engine/1.8.2": { + "jar": "sha256-C30AD4w+jl99a4GWSZNue5k4MU6HyPmDgFIY6ldWflk=", + "module": "sha256-66d7Nu/fdaZ/RkODM4JfnkSPVQ1SHnJJ2VA1hYDuY2s=", + "pom": "sha256-AWhkMmYGDtko71qBgjAD7PrnmpqMC7/Xb0IBxsnXccU=" + }, + "org/junit/platform#junit-platform-launcher/1.8.2": { + "jar": "sha256-giFWQJ/YPmguTFGZs0YAVCmbU4oFjCxtD1ybalvbdZQ=", + "module": "sha256-4XQA7HvnYIwfiI1yG0MAHpc2wVDUD5jIoLzalWPYyus=", + "pom": "sha256-tfancaautzyJpud/Vtcp9LqOta/dDxD0TbRNaq25UJU=" + }, + "org/msgpack#msgpack-core/0.9.8": { + "jar": "sha256-HTpha505JEfSb2siPsv75idr8of4H1SQsMSf9Vtob3w=", + "pom": "sha256-u4D60T5fabCRH95YrhGZHTB6n1j2+6UWY59lrL+3Kqg=" + }, + "org/openjdk/jmh#jmh-core/1.37": { + "jar": "sha256-3A6vK78ANqcLYHmMeF1uA6na8GtouO2w8bqes0IbrrM=", + "pom": "sha256-BEU74Abwb4bXxD88SS97TrM2JoDK5PHugLpl2yM3P1o=" + }, + "org/openjdk/jmh#jmh-generator-asm/1.37": { + "jar": "sha256-3im6zFw6QTIVgA9X3pAX/dobPLblNZ6gyE6+E8lhAiI=", + "pom": "sha256-TnnCVbmY4N8L97XZ+c+K5N0cS9CkYoYKqjWYvAmn9ps=" + }, + "org/openjdk/jmh#jmh-generator-bytecode/1.37": { + "jar": "sha256-YZs9FaXov8TsSdO3pk2+0FOgyoYlggpJpPhp0bjHHQk=", + "pom": "sha256-pYKmsrLkBBQXs66E2EQsjxOXEuSmMvdQEhmnfzxyLhg=" + }, + "org/openjdk/jmh#jmh-generator-reflection/1.37": { + "jar": "sha256-oEIdu+XndpDfLf3vmGGLYoUtgWu7gUxcvQtNRkv/MrA=", + "pom": "sha256-LTvap+ugIOZC4DP7pio/DHCy81HFA3KRiaBobOztk/Q=" + }, + "org/openjdk/jmh#jmh-parent/1.37": { + "pom": "sha256-DCTyFvNjfd52ORFPcCc6aX+FRvekxtWs1Mxtrum+9Mk=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/organicdesign#Paguro/3.10.3": { + "jar": "sha256-/Uy9fOJDUeyhDTWUdqZfxQBz29CTlEk28i/LA27PtCE=", + "pom": "sha256-JLzMpVgDe1TwX9BC0cPkA6qx3FcHX9CvNDFY4ykVnvM=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-bom/9.7": { + "pom": "sha256-jIZR874EOzV43SihXAFhhhsV6wObf1JHZ5wMwNvwd4c=" + }, + "org/ow2/asm#asm-commons/9.4": { + "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=", + "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk=" + }, + "org/ow2/asm#asm-tree/9.4": { + "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", + "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" + }, + "org/ow2/asm#asm/9.0": { + "jar": "sha256-Dfl1dJFK7pL9NJ0MtOAPM0XUWywjngu1DwqQ6tR4iOA=", + "module": "sha256-ivgQlu06/6OaRyn8kApVtmOJSRHWfE1L7w6kJDk90/k=", + "pom": "sha256-3gNVWQ3Rv8zNyNeQJK6ZKXLoVSaKztua1oLQheA6lK0=" + }, + "org/ow2/asm#asm/9.4": { + "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", + "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" + }, + "org/pkl-lang#pkl-config-java-all/0.25.0": { + "jar": "sha256-LY60xLafflMRbzLYGxbmvsaLNO0OHCZTpW02Rk8VKhs=", + "pom": "sha256-xPMxhJFlYwvKLrOJSTrg82IjMoXHxqQudDvvam5P9zo=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" + }, + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" + }, + "org/slf4j#slf4j-simple/1.7.36": { + "jar": "sha256-Lzm+2UPWJN+o9BAtBXEoOhCHC2qjbxl6ilBvFHAQwQ8=", + "pom": "sha256-xWuAoKa+oqBGPnDQiSrjOKnlB+SGdnpSBFNAmBIFjRs=" + }, + "org/snakeyaml#snakeyaml-engine/2.9": { + "jar": "sha256-L3qVdGG21wwABeLDW3ihyXvvbERnBMDuk5POmOSVi6g=", + "pom": "sha256-9toG5chpkBVwSG0VOlKn/y1iHc93AIG5MkUxCEUl9to=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.24": { + "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", + "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" + }, + "org/testcontainers#testcontainers-bom/1.20.1": { + "pom": "sha256-CKrS6R3QXKeycG0t/Ap66AxLXFBHAweZyLzbcyfLL0A=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "org/vafer#jdependency/2.8.0": { + "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", + "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0=" + }, + "org/wiremock#wiremock/3.11.0": { + "jar": "sha256-8EApsHzgUi6AIOT8x/qCDn+3G7lsHpt2I3BCetaRrmo=", + "module": "sha256-zD3mqIz4B/lBxfwFgCBh4ndW6wf7b5JHNdRg6/K8/WM=", + "pom": "sha256-xpeUPhqOWaXna1Ot+t9mrs19tK600pl5XN9ZSsTSzGQ=" + }, + "org/xmlunit#xmlunit-core/2.10.0": { + "jar": "sha256-P4mwpinT2cymbhX43eXglHhS+kQXK8d+om7fluPk/Pg=", + "pom": "sha256-dm2pvAtCrYEk6vJw6zEgRBdaZWCSkc8coSxXg3iemA0=" + }, + "org/xmlunit#xmlunit-legacy/2.10.0": { + "jar": "sha256-ICdKuflsM6ZFqlWZ4x9CwS6sXbdb39tO0YfdVGllOZg=", + "pom": "sha256-B0sBekWQP79QoP3faxekM90lzFQDmMGvuG+tkOxxwmg=" + }, + "org/xmlunit#xmlunit-parent/2.10.0": { + "pom": "sha256-XOnCkW1QdlQJ78IKgQf5jvF3BAzr4LG4VwSI4h0JYcc=" + }, + "org/xmlunit#xmlunit-placeholders/2.10.0": { + "jar": "sha256-AED12T/KxmKkYFSJO5Pog8T5yyZvoRWtQ1kDPp265pI=", + "pom": "sha256-41+qK1zuBc03FaViqCOoA4/PQyp97WWZny0lBaGMSes=" + }, + "org/yaml#snakeyaml/2.3": { + "jar": "sha256-Y6dv5mtlI2C9TCwQfm8CWNqn1LtJIAi6jCb80jD/kUY=", + "pom": "sha256-D1omWgYzGwBJ41K+MsoyLeGLF/PU27cGNdQNppLjWC8=" + } + } +} diff --git a/pkgs/by-name/pk/pkl/disable_bad_tests.patch b/pkgs/by-name/pk/pkl/disable_bad_tests.patch new file mode 100644 index 000000000000..6c8028cedda9 --- /dev/null +++ b/pkgs/by-name/pk/pkl/disable_bad_tests.patch @@ -0,0 +1,12 @@ +diff --git i/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt w/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt +index df88c423..ae1db500 100644 +--- i/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt ++++ w/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt +@@ -1497,6 +1497,7 @@ result = someLib.x + assertThat(output).isEqualTo("result = 1\n") + } + ++ @Disabled + @Test + fun `eval file with non-ASCII name`() { + val tempDirUri = tempDir.toUri() diff --git a/pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch b/pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch new file mode 100644 index 000000000000..9d12ec70e9cd --- /dev/null +++ b/pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch @@ -0,0 +1,65 @@ +diff --git a/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt b/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt +index 68a5b533..84fe66df 100644 +--- a/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt ++++ b/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt +@@ -18,9 +18,11 @@ package org.pkl.gradle + import kotlin.io.path.listDirectoryEntries + import kotlin.io.path.readText + import org.assertj.core.api.Assertions.assertThat ++import org.junit.jupiter.api.Disabled; + import org.junit.jupiter.api.Test + + class JavaCodeGeneratorsTest : AbstractTest() { ++ @Disabled("runTask doesn't use the MITM cache") + @Test + fun `generate code`() { + writeBuildFile() +@@ -68,6 +70,7 @@ class JavaCodeGeneratorsTest : AbstractTest() { + ) + } + ++ @Disabled("runTask doesn't use the MITM cache") + @Test + fun `compile generated code`() { + writeBuildFile() +@@ -84,6 +87,7 @@ class JavaCodeGeneratorsTest : AbstractTest() { + assertThat(addressClassFile).exists() + } + ++ @Disabled("runTask doesn't use the MITM cache") + @Test + fun `no source modules`() { + writeFile( +diff --git a/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt b/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt +index 2b9ffc88..99b91893 100644 +--- a/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt ++++ b/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt +@@ -18,9 +18,11 @@ package org.pkl.gradle + import kotlin.io.path.listDirectoryEntries + import kotlin.io.path.readText + import org.assertj.core.api.Assertions.assertThat ++import org.junit.jupiter.api.Disabled; + import org.junit.jupiter.api.Test + + class KotlinCodeGeneratorsTest : AbstractTest() { ++ @Disabled("runTask doesn't use the MITM cache") + @Test + fun `generate code`() { + writeBuildFile() +@@ -69,6 +71,7 @@ class KotlinCodeGeneratorsTest : AbstractTest() { + ) + } + ++ @Disabled("runTask doesn't use the MITM cache") + @Test + fun `compile generated code`() { + writeBuildFile() +@@ -84,6 +87,7 @@ class KotlinCodeGeneratorsTest : AbstractTest() { + assertThat(addressClassFile).exists() + } + ++ @Disabled("runTask doesn't use the MITM cache") + @Test + fun `no source modules`() { + writeFile( + diff --git a/pkgs/by-name/pk/pkl/fix_kotlin_classpath.patch b/pkgs/by-name/pk/pkl/fix_kotlin_classpath.patch new file mode 100644 index 000000000000..98b583b7b5ac --- /dev/null +++ b/pkgs/by-name/pk/pkl/fix_kotlin_classpath.patch @@ -0,0 +1,14 @@ +diff --git a/pkl-gradle/pkl-gradle.gradle.kts b/pkl-gradle/pkl-gradle.gradle.kts +index 08f0e8ca..a16c7073 100644 +--- a/pkl-gradle/pkl-gradle.gradle.kts ++++ b/pkl-gradle/pkl-gradle.gradle.kts +@@ -58,7 +58,7 @@ sourceSets { + // if `compileClasspath` is filtered, causing "unresolved reference" errors in IntelliJ. + // As a workaround, don't perform filtering for IntelliJ (import). + if (System.getProperty("idea.sync.active") == null) { +- compileClasspath = compileClasspath.filter { !(it.path.contains("dists")) } ++ compileClasspath = compileClasspath.filter { !(it.path.contains("@gradle@") || it.path.contains("generated-gradle-jars/gradle-api-")) } + } + } + } + diff --git a/pkgs/by-name/pk/pkl/package.nix b/pkgs/by-name/pk/pkl/package.nix new file mode 100644 index 000000000000..9d023e18779b --- /dev/null +++ b/pkgs/by-name/pk/pkl/package.nix @@ -0,0 +1,101 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gradle, + temurin-bin-21, + kotlin, + nix-update-script, + replaceVars, + makeWrapper, +}: +let + jdk = temurin-bin-21; + gradleOverlay = gradle.override { java = jdk; }; + kotlinOverlay = kotlin.override { jre = jdk; }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "pkl"; + version = "0.28.2"; + + src = fetchFromGitHub { + owner = "apple"; + repo = "pkl"; + tag = finalAttrs.version; + hash = "sha256-ay3V3EWqZHncLH6UR4JOCChkweNcilDeskXzaeAFTR8="; + leaveDotGit = true; + postFetch = '' + pushd $out + git rev-parse HEAD | tr -d '\n' > .commit-hash + rm -rf .git + popd + ''; + }; + + patches = [ + (replaceVars ./fix_kotlin_classpath.patch { gradle = gradle.unwrapped; }) + ./disable_gradle_codegen_tests.patch + ./disable_bad_tests.patch + ]; + + nativeBuildInputs = [ + gradleOverlay + jdk + kotlinOverlay + makeWrapper + ]; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + doCheck = !(stdenv.hostPlatform.isDarwin); + + gradleFlags = [ + "-x" + "spotlessCheck" + "-DreleaseBuild=true" + "-Dorg.gradle.java.home=${jdk}" + "-Porg.gradle.java.installations.auto-download=false" + "-Porg.gradle.java.installations.auto-detect=false" + ]; + + preBuild = '' + gradleFlagsArray+=(-DcommitId=$(cat .commit-hash)) + ''; + + JAVA_TOOL_OPTIONS = "-Dfile.encoding=utf-8"; + __darwinAllowLocalNetworking = true; + + preCheck = '' + export LANG=C.UTF-8 + export LC_ALL=C.UTF-8 + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" "$out/opt/pkl" + cp ./pkl-cli/build/executable/jpkl "$out/opt/pkl/jpkl.jar" + + makeWrapper ${lib.getExe jdk} $out/bin/pkl --add-flags "-jar $out/opt/pkl/jpkl.jar" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Configuration-as-code language with rich validation and tooling"; + homepage = "https://pkl-lang.org"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ hugolgst ]; + mainProgram = "pkl"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; + }; +}) diff --git a/pkgs/by-name/pk/pktgen/package.nix b/pkgs/by-name/pk/pktgen/package.nix index 6f7e723450c5..095196a6eaa9 100644 --- a/pkgs/by-name/pk/pktgen/package.nix +++ b/pkgs/by-name/pk/pktgen/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "pktgen"; - version = "23.10.0"; + version = "24.10.3"; src = fetchFromGitHub { owner = "pktgen"; repo = "Pktgen-DPDK"; rev = "pktgen-${version}"; - sha256 = "sha256-eujVEU+XkxF1kIGQJoBW3oXXNSqBEzx6mwR2XYoHinM="; + sha256 = "sha256-6KC1k+LWNSU/mdwcUKjCaq8pGOcO+dFzeXX4PJm0QgE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plakativ/package.nix b/pkgs/by-name/pl/plakativ/package.nix new file mode 100644 index 000000000000..fc82f1708345 --- /dev/null +++ b/pkgs/by-name/pl/plakativ/package.nix @@ -0,0 +1,33 @@ +{ + lib, + python3Packages, + fetchPypi, + guiSupport ? true, +}: +let + pname = "plakativ"; + version = "0.5.3"; +in +python3Packages.buildPythonApplication { + inherit pname version; + + src = fetchPypi { + inherit pname version; + hash = "sha256-6TvMznd5obkn/gsQTyZ6Pc/dF55I53987EbuSNAlY58="; + }; + + dependencies = + with python3Packages; + [ + pymupdf + ] + ++ lib.optional guiSupport tkinter; + + meta = { + description = "Convert a PDF into a large poster that can be printed on multiple smaller pages"; + mainProgram = "plakativ"; + homepage = "https://gitlab.mister-muffin.de/josch/plakativ"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ marcin-serwin ]; + }; +} diff --git a/pkgs/by-name/pl/plan-exporter/package.nix b/pkgs/by-name/pl/plan-exporter/package.nix index 936ef9107dd8..21cc7e91d467 100644 --- a/pkgs/by-name/pl/plan-exporter/package.nix +++ b/pkgs/by-name/pl/plan-exporter/package.nix @@ -2,18 +2,25 @@ lib, fetchFromGitHub, buildGoModule, + nix-update-script, }: buildGoModule rec { pname = "plan-exporter"; version = "0.0.6"; + src = fetchFromGitHub { owner = "agneum"; repo = "plan-exporter"; tag = "v${version}"; hash = "sha256-Csp57wmkDA8b05hmKbk1+bGtORFgNls7I01A0irTKao="; }; + vendorHash = null; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Query plan exporter for psql"; homepage = "https://github.com/agneum/plan-exporter"; diff --git a/pkgs/by-name/pl/planarity/package.nix b/pkgs/by-name/pl/planarity/package.nix index c7e11394511b..9ecc15b994e5 100644 --- a/pkgs/by-name/pl/planarity/package.nix +++ b/pkgs/by-name/pl/planarity/package.nix @@ -3,21 +3,23 @@ stdenv, fetchFromGitHub, autoreconfHook, + pkg-config, }: stdenv.mkDerivation rec { pname = "planarity"; - version = "3.0.2.0"; + version = "4.0.0.0"; src = fetchFromGitHub { owner = "graph-algorithms"; repo = "edge-addition-planarity-suite"; rev = "Version_${version}"; - sha256 = "sha256-cUAh2MXCSmtxFtV6iTHgSRgsq/26DjWwxhWJH1+367A="; + sha256 = "sha256-A7huHvMgUyvw2zM9qA7Ax/1Ai5VZ6A1PZIo3eiCpu44="; }; nativeBuildInputs = [ autoreconfHook + pkg-config ]; doCheck = true; @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { description = "Library for implementing graph algorithms"; mainProgram = "planarity"; license = licenses.bsd3; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix index e877da17cc2d..f58c3c9d2f4b 100644 --- a/pkgs/by-name/pl/planify/package.nix +++ b/pkgs/by-name/pl/planify/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { description = "Task manager with Todoist support designed for GNU/Linux"; homepage = "https://github.com/alainm23/planify"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + teams = [ teams.pantheon ]; platforms = platforms.linux; mainProgram = "io.github.alainm23.planify"; }; diff --git a/pkgs/by-name/pl/plank/package.nix b/pkgs/by-name/pl/plank/package.nix index bcfc33c653fb..553559f2f6a8 100644 --- a/pkgs/by-name/pl/plank/package.nix +++ b/pkgs/by-name/pl/plank/package.nix @@ -86,6 +86,7 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/plank"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; + maintainers = with maintainers; [ davidak ]; + teams = [ teams.pantheon ]; }; } diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix index 0f0078255607..faddd49464e8 100644 --- a/pkgs/by-name/pl/plantuml/package.nix +++ b/pkgs/by-name/pl/plantuml/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchurl, graphviz, + gitUpdater, jre, makeBinaryWrapper, testers, @@ -10,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "plantuml"; - version = "1.2025.0"; + version = "1.2025.2"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar"; - hash = "sha256-tHlhO7+q/iG5jbivTzQtvaOiDXoIEC/thA2nJnS6Kak="; + hash = "sha256-mDP72BLe7+WqjCsxIrhF//jVQVpmU0jwgFeH2sW1mH0="; }; nativeBuildInputs = [ @@ -38,9 +39,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { $out/bin/plantuml -testdot ''; - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "plantuml --version"; + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "plantuml --version"; + }; + updateScript = gitUpdater { + url = "https://github.com/plantuml/plantuml.git"; + allowedVersions = "^1\\.[0-9\\.]+$"; + rev-prefix = "v"; + }; }; meta = { diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 8e5de5a58e6d..11f6132ab4ff 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "2.4.1"; + version = "3.0.1"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-YDYVjAbizmo1+E1DVeyISKM4Jb/HkKY/On9RanJBuvI="; + hash = "sha256-d1NqC8m2ujNsAuHTKRiNz179DzlTc08SKtY/QKHB1xw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix index c3be82584f18..4de57017c6e1 100644 --- a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix +++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-spacer-extended"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-spacer-extended"; tag = "v${finalAttrs.version}"; - hash = "sha256-Rr80bI+9xnrlj8JNTL+vGqOw9/98R0ub0pQfHQmEWNM="; + hash = "sha256-PEwyydaO2n/tuZ63403mnT2ZRVq4wy5rLUFwX9r8P20="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 1de7bdefae6b..a82e78737789 100644 --- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasmusic-toolbar"; - version = "2.3.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "ccatterina"; repo = "plasmusic-toolbar"; tag = "v${finalAttrs.version}"; - hash = "sha256-YxhZ4XhHCbEPVrc+qqO+phGnEf0nnKiDVRB5K4wjR/Q="; + hash = "sha256-y+vE/GzZnBWBdeVMqbmAle+eYiRsehplV6rQfMtTd3A="; }; installPhase = '' diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index ddb3c8eb6ad4..64a9fe3f2bcf 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -34,11 +34,11 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "24.2.6"; + version = "25.1.9"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-MEw7pmaDPOxhjeIHWumCxwESZri3gdXULIc7kRh9/BM="; + hash = "sha256-iNgMsQ6JDPRNKssvgVyZ9z8aUFzemboYgm1wIjuERog="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/pl/platformsh/versions.json b/pkgs/by-name/pl/platformsh/versions.json index 4432911aeb41..cd44984844ea 100644 --- a/pkgs/by-name/pl/platformsh/versions.json +++ b/pkgs/by-name/pl/platformsh/versions.json @@ -1,19 +1,19 @@ { - "version": "5.0.23", + "version": "5.1.1", "darwin-amd64": { - "hash": "sha256-u82W5pwJQi0RqhRkQgY9SDahi4HvintFwXG6q+FlBR0=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.23/platform_5.0.23_darwin_all.tar.gz" + "hash": "sha256-wj8zEyYxalEauCOv6VLPgvkfXlf/uA/xwEiHOqxRFic=", + "url": "https://github.com/platformsh/cli/releases/download/5.1.1/platform_5.1.1_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-u82W5pwJQi0RqhRkQgY9SDahi4HvintFwXG6q+FlBR0=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.23/platform_5.0.23_darwin_all.tar.gz" + "hash": "sha256-wj8zEyYxalEauCOv6VLPgvkfXlf/uA/xwEiHOqxRFic=", + "url": "https://github.com/platformsh/cli/releases/download/5.1.1/platform_5.1.1_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-Yve4EeMe9j90MqeelqT6S6NwTc1PL5JlzX4aTjR5XUU=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.23/platform_5.0.23_linux_amd64.tar.gz" + "hash": "sha256-2teph6Ozgl5GTckeNExRqCpoUSCCNF7mRRy3wWxOc2U=", + "url": "https://github.com/platformsh/cli/releases/download/5.1.1/platform_5.1.1_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-ejeWn98wCSum6SqdW6RlQ7YvF7dzDRw/vftm82uZAio=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.23/platform_5.0.23_linux_arm64.tar.gz" + "hash": "sha256-iqeErUjouQEsdwEo+6fNQqfULZ9V1lCwsJXDC0lZNdM=", + "url": "https://github.com/platformsh/cli/releases/download/5.1.1/platform_5.1.1_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/pl/plattenalbum/package.nix b/pkgs/by-name/pl/plattenalbum/package.nix index e6464cc5b20a..aa189bf57cac 100644 --- a/pkgs/by-name/pl/plattenalbum/package.nix +++ b/pkgs/by-name/pl/plattenalbum/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "plattenalbum"; - version = "2.2.2"; + version = "2.3.0"; pyproject = false; src = fetchFromGitHub { owner = "SoongNoonien"; repo = "plattenalbum"; tag = "v${version}"; - hash = "sha256-IuyEy6w1JxuuA+domZ+XNIq5vmcOVs0sHO4dp1dyE6k="; + hash = "sha256-5/4t7tnMGuy5TIIdGN5hm0I0O0oC3FC503PNpnUHkV8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/play/package.nix b/pkgs/by-name/pl/play/package.nix index 75a34f67a533..bfa8be51d4c3 100644 --- a/pkgs/by-name/pl/play/package.nix +++ b/pkgs/by-name/pl/play/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/pl/please-cli/package.nix b/pkgs/by-name/pl/please-cli/package.nix index 24a1ecc940cb..80f895828b2d 100644 --- a/pkgs/by-name/pl/please-cli/package.nix +++ b/pkgs/by-name/pl/please-cli/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "please-cli"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "TNG"; repo = "please-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-wgH/43CQ8LCOwoidv9ciOiquHKoWAB6qlpeKN/JdcEc="; + hash = "sha256-Kpb36Fm49Cxr3PMlSoUfTNEMNmWFktgEoej1904DmEE="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/pl/please/package.nix b/pkgs/by-name/pl/please/package.nix index 7c998388080c..d991fee33649 100644 --- a/pkgs/by-name/pl/please/package.nix +++ b/pkgs/by-name/pl/please/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.usenix.org.uk/content/please.html"; changelog = "https://github.com/edneville/please/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/pl/plemoljp-hs/package.nix b/pkgs/by-name/pl/plemoljp-hs/package.nix index bc736de3bf7c..20ec33ee1253 100644 --- a/pkgs/by-name/pl/plemoljp-hs/package.nix +++ b/pkgs/by-name/pl/plemoljp-hs/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "plemoljp-hs"; - version = "2.0.3"; + version = "2.0.4"; src = fetchzip { url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_HS_v${version}.zip"; - hash = "sha256-rKWZMIK6TP6IV6KjFGuZE2S6IiMtjtHZeWM44tULduk="; + hash = "sha256-+pRbMgRaIbsXo8e7rQre377F8LhbK9rBjG/vYrdeFQM="; }; installPhase = '' diff --git a/pkgs/by-name/pl/plemoljp/package.nix b/pkgs/by-name/pl/plemoljp/package.nix index ec13bfaaf936..59d92b848bab 100644 --- a/pkgs/by-name/pl/plemoljp/package.nix +++ b/pkgs/by-name/pl/plemoljp/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "plemoljp"; - version = "2.0.3"; + version = "2.0.4"; src = fetchzip { url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_v${version}.zip"; - hash = "sha256-cT2BpD2PoAd38uYCQlq5fv9NYgwInblrYdK/XDEmOWI="; + hash = "sha256-pajE86IK05mm3Z507bvoMGy8JJwuGWZnUiSrXndiBTk="; }; installPhase = '' diff --git a/pkgs/by-name/pl/plink-ng/package.nix b/pkgs/by-name/pl/plink-ng/package.nix index 74b04c56ecce..ea697c070e4e 100644 --- a/pkgs/by-name/pl/plink-ng/package.nix +++ b/pkgs/by-name/pl/plink-ng/package.nix @@ -5,7 +5,6 @@ zlib, blas, lapack, - darwin, }: stdenv.mkDerivation rec { @@ -20,16 +19,13 @@ stdenv.mkDerivation rec { }; buildInputs = - [ zlib ] - ++ ( - if stdenv.hostPlatform.isDarwin then - [ darwin.apple_sdk.frameworks.Accelerate ] - else - [ - blas - lapack - ] - ); + [ + zlib + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + blas + lapack + ]; preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h diff --git a/pkgs/by-name/pl/ploticus/fix-zlib-file-type.patch b/pkgs/by-name/pl/ploticus/fix-zlib-file-type.patch new file mode 100644 index 000000000000..15a4d3e83c29 --- /dev/null +++ b/pkgs/by-name/pl/ploticus/fix-zlib-file-type.patch @@ -0,0 +1,28 @@ +Index: src/svg.c +=================================================================== +--- a/src/svg.c ++++ b/src/svg.c +@@ -676,9 +676,9 @@ + double x1, y1, x2, y2; + { + char *buf; + #ifdef WZ +- FILE *outfp; ++ gzFile outfp; + #endif + + if (svg_style_in_prog) fprintf( svg_fp, ""); + fprintf( svg_fp, "\n" ); /* close default style */ +@@ -731,10 +731,10 @@ + svg_fp = fopen( svg_tmpfilename, "r" ); + if( svg_fp == NULL ) return( Eerr( 2487, "cannot reopen temp file", svg_tmpfilename ) ); + #ifdef WZ + if( svg_compress ) { +- if( svg_stdout ) outfp = (FILE *) gzdopen( 1, svg_compressmode ); /* stdout = 1 */ +- else outfp = (FILE *) gzopen( svg_filename, svg_compressmode ); ++ if( svg_stdout ) outfp = gzdopen( 1, svg_compressmode ); /* stdout = 1 */ ++ else outfp = gzopen( svg_filename, svg_compressmode ); + if( outfp == NULL ) return( Eerr( 2488, "cannot open output file", svg_filename ) ); + } + #endif + buf = svg_style; /* reuse */ diff --git a/pkgs/by-name/pl/ploticus/package.nix b/pkgs/by-name/pl/ploticus/package.nix index 63f2409da4b8..ecb3e6861fa2 100644 --- a/pkgs/by-name/pl/ploticus/package.nix +++ b/pkgs/by-name/pl/ploticus/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { url = "mirror://sourceforge/ploticus/ploticus/${finalAttrs.version}/ploticus${ lib.replaceStrings [ "." ] [ "" ] finalAttrs.version }_src.tar.gz"; - sha256 = "PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA="; + hash = "sha256-PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA="; }; patches = [ @@ -33,6 +33,11 @@ stdenv.mkDerivation (finalAttrs: { # This is required for non-ASCII fonts to work: # https://ploticus.sourceforge.net/doc/fonts.html ./use-gd-package.patch + + # svg.c:752:26: error: passing argument 1 of 'gzclose' from incompatible pointer type [] + # 752 | gzclose( outfp ); + # note: expected 'gzFile' {aka 'struct gzFile_s *'} but argument is of type 'FILE *' + ./fix-zlib-file-type.patch ]; buildInputs = [ @@ -56,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "CC:=$(CC)" ]; + enableParallelBuilding = true; + preInstall = '' mkdir -p "$out/bin" ''; @@ -84,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "Non-interactive software package for producing plots and charts"; longDescription = '' Ploticus is a free, GPL'd, non-interactive @@ -94,9 +101,9 @@ stdenv.mkDerivation (finalAttrs: { statistical capabilities. It allows significant user control over colors, styles, options and details. ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ pSub ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ pSub ]; homepage = "https://ploticus.sourceforge.net/"; - platforms = with platforms; linux ++ darwin; + platforms = with lib.platforms; linux ++ darwin; }; }) diff --git a/pkgs/by-name/pl/plplot/package.nix b/pkgs/by-name/pl/plplot/package.nix new file mode 100644 index 000000000000..dcc8ca518051 --- /dev/null +++ b/pkgs/by-name/pl/plplot/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchurl, + cmake, + pkg-config, + enableWX ? false, + wxGTK32, + enableXWin ? false, + xorg, + enablePNG ? false, + cairo, + pango, +}: + +stdenv.mkDerivation rec { + pname = "plplot"; + version = "5.15.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/${pname}/${version}%20Source/${pname}-${version}.tar.gz"; + sha256 = "0ywccb6bs1389zjfmc9zwdvdsvlpm7vg957whh6b5a96yvcf8bdr"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = + lib.optional enableWX wxGTK32 + ++ lib.optional enableXWin xorg.libX11 + ++ lib.optionals enablePNG [ + cairo + pango + ]; + + passthru = { + inherit (xorg) libX11; + inherit + enableWX + enableXWin + ; + }; + + cmakeFlags = [ + "-DBUILD_TEST=ON" + ]; + + doCheck = true; + + meta = with lib; { + description = "Cross-platform scientific graphics plotting library"; + mainProgram = "pltek"; + homepage = "https://plplot.org"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/by-name/pl/pls/package.nix b/pkgs/by-name/pl/pls/package.nix index 85ff1558f446..9347cbe5186a 100644 --- a/pkgs/by-name/pl/pls/package.nix +++ b/pkgs/by-name/pl/pls/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "pls"; - version = "0.0.1-beta.8"; + version = "0.0.1-beta.9"; src = fetchFromGitHub { owner = "pls-rs"; repo = "pls"; - rev = "v${version}"; - hash = "sha256-gJufm2krZSTdBbbfZ+355M9e3MJQbDEpSPf0EbZEayQ="; + tag = "v${version}"; + hash = "sha256-ofwdhGpqYlADDY2BLe0SkoHWqSeRNtQaXK61zWVFXzw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-q6tLSq9MkWOT+XUmtv123C9VwncJ7ljTnaGEZOZqLjk="; + cargoHash = "sha256-P+4jRuakDUPaICJPsNJ6nXfhm09K/GC/VA9bsTXIMvc="; meta = { - changelog = "https://github.com/pls-rs/pls/releases/tag/${src.rev}"; + changelog = "https://github.com/pls-rs/pls/releases/tag/${src.tag}"; description = "Prettier and powerful ls"; homepage = "http://pls.cli.rs"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/by-name/pl/plugdata/package.nix b/pkgs/by-name/pl/plugdata/package.nix index 5cac0666f863..3d35d5e0dba7 100644 --- a/pkgs/by-name/pl/plugdata/package.nix +++ b/pkgs/by-name/pl/plugdata/package.nix @@ -9,7 +9,7 @@ pkg-config, alsa-lib, freetype, - webkitgtk_4_0, + webkitgtk_4_1, zenity, curl, xorg, @@ -23,7 +23,6 @@ libxkbcommon, libdatrie, libepoxy, - libsoup_2_4, libGL, libjack2, lerc, @@ -60,7 +59,7 @@ stdenv.mkDerivation { alsa-lib curl freetype - webkitgtk_4_0 + webkitgtk_4_1 xorg.libX11 xorg.libXcursor xorg.libXext @@ -80,7 +79,6 @@ stdenv.mkDerivation { libxkbcommon libdatrie libepoxy - libsoup_2_4 lerc libjack2 expat diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix index 31782dafb32e..d4743026071a 100644 --- a/pkgs/by-name/pl/pluto/package.nix +++ b/pkgs/by-name/pl/pluto/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.21.3"; + version = "5.21.6"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-/gq6BdlNG9vUazVt7Ucvv2679BytUEZrx6u8znnsxG4="; + hash = "sha256-q0ScT1H93IyoWha4arkvTWUCOM6GI0MMps02Sq478zg="; }; - vendorHash = "sha256-PABCma+pfguDHxRhvQYCHcjr7Epy2AteC+QiXbAx04k="; + vendorHash = "sha256-4kiLgwr8wr/L4anxgZVAE6IFdbBvTgcUlf5KIcT+lRk="; ldflags = [ "-w" diff --git a/pkgs/by-name/pl/plutovg/package.nix b/pkgs/by-name/pl/plutovg/package.nix new file mode 100644 index 000000000000..88b1d186081a --- /dev/null +++ b/pkgs/by-name/pl/plutovg/package.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "plutovg"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "sammycage"; + repo = "plutovg"; + tag = "v${finalAttrs.version}"; + hash = "sha256-xNWwACKGU5UIJviVZ3wU4GMuRxKn/rR8jBsZQpZiFZ8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + homepage = "https://github.com/sammycage/plutovg/"; + changelog = "https://github.com/sammycage/plutovg/releases/tag/v${finalAttrs.version}"; + description = "Tiny 2D vector graphics library in C"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.eymeric ]; + }; +}) diff --git a/pkgs/by-name/pl/plymouth/package.nix b/pkgs/by-name/pl/plymouth/package.nix index 27251284df3f..ee52b762baaa 100644 --- a/pkgs/by-name/pl/plymouth/package.nix +++ b/pkgs/by-name/pl/plymouth/package.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.freedesktop.org/wiki/Software/Plymouth/"; description = "Boot splash and boot logger"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index d4890c950e75..42230293293d 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "pmbootstrap"; - version = "3.3.2"; + version = "3.4.0"; pyproject = true; src = fetchFromGitLab { owner = "postmarketOS"; - repo = pname; + repo = "pmbootstrap"; tag = version; - hash = "sha256-A/hWJwyx/k9+NNOJBuor2qQi5gRB3Rpp5qnRloFM0FM="; + hash = "sha256-vNa0MMU5NHO8RjgfKxNjhQDKQ2Rd/ZGU0HndOD2Sypo="; domain = "gitlab.postmarketos.org"; }; @@ -52,10 +52,16 @@ python3Packages.buildPythonApplication rec { ''; # skip impure tests - disabledTests = [ - "test_pkgrepo_pmaports" - "test_random_valid_deviceinfos" - ]; + disabledTests = + [ + "test_pkgrepo_pmaports" + "test_random_valid_deviceinfos" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # assert chroot.type == ChrootType.BUILDROOT + # AssertionError: assert == + "test_valid_chroots" + ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/pm/pmenu/package.nix b/pkgs/by-name/pm/pmenu/package.nix index f61fdc5859e2..5905b02197bc 100644 --- a/pkgs/by-name/pm/pmenu/package.nix +++ b/pkgs/by-name/pm/pmenu/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { stdin, shows a menu for the user to select one of the options, and outputs the option selected to stdout. ''; - maintainers = [ lib.maintainers.azahi ]; + maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "pmenu"; }; diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 9d8a2524d740..f47ca31492ad 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "pmtiles"; - version = "1.27.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; tag = "v${version}"; - hash = "sha256-AeHdmspvx8/vThhbKDROGS7vKBxx9fpe1PFSrVUV1uI="; + hash = "sha256-g+QVsvf28LWkT2iEJUvG1f5eOjR444Xca5W5ImCQXvM="; }; vendorHash = "sha256-kfEzpaFMf0W8Ygtl40LBy3AZQSL+9Uo+n2x9OTOavqk="; @@ -31,7 +31,8 @@ buildGoModule rec { description = "Single-file utility for creating and working with PMTiles archives"; homepage = "https://github.com/protomaps/go-pmtiles"; license = lib.licenses.bsd3; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ theaninova ]); + maintainers = with lib.maintainers; [ theaninova ]; + teams = [ lib.teams.geospatial ]; mainProgram = "pmtiles"; }; } diff --git a/pkgs/by-name/pn/pnfft/package.nix b/pkgs/by-name/pn/pnfft/package.nix index 8d6b9bfcb6d7..484ba9eeba21 100644 --- a/pkgs/by-name/pn/pnfft/package.nix +++ b/pkgs/by-name/pn/pnfft/package.nix @@ -1,6 +1,6 @@ { autoreconfHook, - fetchurl, + fetchFromGitHub, fftwMpi, gsl, lib, @@ -22,11 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pnfft-${precision}"; - version = "1.0.7-alpha"; + version = "1.0.7-alpha-unstable-2018-06-04"; - src = fetchurl { - url = "https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software/pnfft-${finalAttrs.version}.tar.gz"; - hash = "sha256-/aVY/1fuMRl1Q2O7bmc5M4aA0taGD+fcQgCdhVYr1no="; + src = fetchFromGitHub { + owner = "mpip"; + repo = "pnfft"; + rev = "a0bb24b8fa8af59c9e599b1cc3914586636d9125"; + hash = "sha256-Cgusm/zWCLy//3qh/YAXjCZGl+QOnycUjUCQsd1HxvQ="; }; outputs = [ @@ -49,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ pfft' ]; + enableParallelBuilding = true; + doCheck = true; meta = { diff --git a/pkgs/by-name/pn/pngnq/missing-includes.patch b/pkgs/by-name/pn/pngnq/missing-includes.patch new file mode 100644 index 000000000000..2b605a50fca7 --- /dev/null +++ b/pkgs/by-name/pn/pngnq/missing-includes.patch @@ -0,0 +1,17 @@ +diff --git a/src/rwpng.c b/src/rwpng.c +index aaa21fc..11d698f 100644 +--- a/src/rwpng.c ++++ b/src/rwpng.c +@@ -30,10 +30,12 @@ + ---------------------------------------------------------------------------*/ + + #include ++#include + #include + + #include "png.h" /* libpng header; includes zlib.h */ + #include "rwpng.h" /* typedefs, common macros, public prototypes */ ++#include + + /* future versions of libpng will provide this macro: */ + /* GRR NOTUSED */ diff --git a/pkgs/by-name/pn/pngnq/package.nix b/pkgs/by-name/pn/pngnq/package.nix index c418ecbb9ecd..23f4a6e0a248 100644 --- a/pkgs/by-name/pn/pngnq/package.nix +++ b/pkgs/by-name/pn/pngnq/package.nix @@ -16,16 +16,20 @@ stdenv.mkDerivation rec { sha256 = "1qmnnl846agg55i7h4vmrn11lgb8kg6gvs8byqz34bdkjh5gwiy1"; }; + patches = [ + ./missing-includes.patch + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=incompatible-pointer-types" + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng zlib ]; - patchPhase = '' - sed -i '/png.h/a \#include ' src/rwpng.c - ''; - meta = with lib; { homepage = "https://pngnq.sourceforge.net/"; description = "PNG quantizer"; diff --git a/pkgs/by-name/pn/pngpaste/package.nix b/pkgs/by-name/pn/pngpaste/package.nix new file mode 100644 index 000000000000..2360b9de8d26 --- /dev/null +++ b/pkgs/by-name/pn/pngpaste/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +let + pname = "pngpaste"; + version = "0.2.3"; +in +stdenv.mkDerivation { + inherit pname version; + src = fetchFromGitHub { + owner = "jcsalterego"; + repo = pname; + rev = version; + sha256 = "uvajxSelk1Wfd5is5kmT2fzDShlufBgC0PDCeabEOSE="; + }; + + installPhase = '' + mkdir -p $out/bin + cp pngpaste $out/bin + ''; + + meta = with lib; { + description = "Paste image files from clipboard to file on MacOS"; + longDescription = '' + Paste PNG into files on MacOS, much like pbpaste does for text. + Supported input formats are PNG, PDF, GIF, TIF, JPEG. + Supported output formats are PNG, GIF, JPEG, TIFF. Output + formats are determined by the provided filename extension, + falling back to PNG. + ''; + homepage = "https://github.com/jcsalterego/pngpaste"; + changelog = "https://github.com/jcsalterego/pngpaste/raw/${version}/CHANGELOG.md"; + platforms = platforms.darwin; + license = licenses.bsd2; + maintainers = with maintainers; [ samw ]; + }; +} diff --git a/pkgs/by-name/po/pocket-casts/package.nix b/pkgs/by-name/po/pocket-casts/package.nix index 7ff8546875e5..1f9b0af02a86 100644 --- a/pkgs/by-name/po/pocket-casts/package.nix +++ b/pkgs/by-name/po/pocket-casts/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "pocket-casts"; - version = "0.9.0"; + version = "0.10.3"; src = fetchFromGitHub { owner = "felicianotech"; repo = "pocket-casts-desktop-app"; rev = "v${version}"; - hash = "sha256-5xn2uAjqIyWKQAruHLyho72HCYpbxyWlcTQ3LXXZy6M="; + hash = "sha256-IhH5nZ2kXVW2D8cMmVyMX4xZLnzfMAp2gwQgZgHOItY="; }; - npmDepsHash = "sha256-nfTn2rs0XGraebI0rKlTECccc7KpRXf/+qOjj/5GPAw="; + npmDepsHash = "sha256-oLZ81SA+eO20sUc2cwba3cc6vu1Qf/lNkIfzK2CQdrw="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -44,8 +44,8 @@ buildNpmPackage rec { ]; 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 + install -Dm444 $out/lib/node_modules/pocket-casts/img/icon-x512.png $out/share/icons/hicolor/512x512/apps/pocket-casts.png + install -Dm444 $out/lib/node_modules/pocket-casts/img/icon-x360.png $out/share/icons/hicolor/360x360/apps/pocket-casts.png makeWrapper ${electron}/bin/electron $out/bin/pocket-casts \ --add-flags $out/lib/node_modules/pocket-casts/main.js diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix new file mode 100644 index 000000000000..5f7d9c9b9922 --- /dev/null +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -0,0 +1,111 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + buildNpmPackage, + makeWrapper, + nodejs, + stdenvNoCC, + nixosTests, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "pocket-id"; + version = "0.53.0"; + + src = fetchFromGitHub { + owner = "pocket-id"; + repo = "pocket-id"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3lW4jPh9YElgpBcIooGQ2zZbNwC/rz7CABsp7ScTxyQ="; + }; + + backend = buildGoModule { + pname = "pocket-id-backend"; + inherit (finalAttrs) version src; + + sourceRoot = "${finalAttrs.src.name}/backend"; + + vendorHash = "sha256-wOrYIhOrUxz22Ay2A26FTrPJA8YRgdRihP78Ls8VgNM="; + + preFixup = '' + mv $out/bin/cmd $out/bin/pocket-id-backend + ''; + }; + + frontend = buildNpmPackage { + pname = "pocket-id-frontend"; + inherit (finalAttrs) version src; + + sourceRoot = "${finalAttrs.src.name}/frontend"; + + npmDepsHash = "sha256-UjYAndueuJU07unbNFoTQHqRFkdyaBKHyT4k3Ex4pg0="; + npmFlags = [ "--legacy-peer-deps" ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + # even though vite build creates most of the minified js files, + # it still needs a few packages from node_modules, try to strip that + npm prune --omit=dev --omit=optional $npmFlags + # larger seemingly unused packages + rm -r node_modules/{lucide-svelte,jiti,@swc,.bin} + # unused file types + for pattern in '*.map' '*.map.js' '*.ts'; do + find . -type f -name "$pattern" -exec rm {} + + done + + mkdir -p $out/{bin,lib/pocket-id-frontend} + cp -r build $out/lib/pocket-id-frontend/dist + cp -r node_modules $out/lib/pocket-id-frontend/node_modules + makeWrapper ${lib.getExe nodejs} $out/bin/pocket-id-frontend \ + --add-flags $out/lib/pocket-id-frontend/dist/index.js + + runHook postInstall + ''; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ln -s ${finalAttrs.backend}/bin/pocket-id-backend $out/bin/pocket-id-backend + ln -s ${finalAttrs.frontend}/bin/pocket-id-frontend $out/bin/pocket-id-frontend + + runHook postInstall + ''; + + passthru = { + tests = { + inherit (nixosTests) pocket-id; + }; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "backend" + "--subpackage" + "frontend" + ]; + }; + }; + + meta = { + description = "OIDC provider with passkeys support"; + homepage = "https://pocket-id.org"; + changelog = "https://github.com/pocket-id/pocket-id/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ + gepbird + marcusramberg + ymstnt + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index 76dfacdebf2b..e0f27d1620a0 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.26.3"; + version = "0.28.1"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-hzFA9EBYIU/BkpmWs/jKeYgSWyAjT9UUQiKhQYFTicM="; + hash = "sha256-tx9dx4ZFmdllG/pMoI8mmPSvMg7fBk6+lXSxkW5jlDM="; }; - vendorHash = "sha256-oi7jSZ1oys5Vrcl7fKgb4lCp8AR1DhTKwNnGuOA/YFQ="; + vendorHash = "sha256-DN3rCuRBFVeRfiXrwxeHemqOZgXb7OswwzcEqHbi4lo="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/by-name/po/pocl/package.nix b/pkgs/by-name/po/pocl/package.nix index 4f1d93a72eb8..4075762f19e5 100644 --- a/pkgs/by-name/po/pocl/package.nix +++ b/pkgs/by-name/po/pocl/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - nix-update-script, cmake, pkg-config, hwloc, @@ -11,28 +10,34 @@ spirv-llvm-translator, spirv-tools, lttng-ust, + opencl-headers, ocl-icd, python3, runCommand, makeWrapper, + writableTmpDirAsHomeHook, }: let clang = llvmPackages.clangUseLLVM; # Workaround to make sure libclang finds libgcc.a and libgcc_s.so when # invoked from within libpocl - clangWrapped = runCommand "clang-pocl" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin - cp -r ${clang}/bin/* $out/bin/ - LIBGCC_DIR=$(dirname $(find ${stdenv.cc.cc}/lib/ -name libgcc.a)) - for F in ${clang}/bin/ld*; do - BASENAME=$(basename "$F") - rm -f $out/bin/$BASENAME - makeWrapper ${clang}/bin/$BASENAME $out/bin/$BASENAME \ - --add-flags "-L$LIBGCC_DIR" \ - --add-flags "-L${lib.getLib stdenv.cc.cc}/lib" - done - ''; + clangWrapped = + if stdenv.hostPlatform.isDarwin then + clang + else + runCommand "clang-pocl" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin + cp -r ${clang}/bin/* $out/bin/ + LIBGCC_DIR=$(dirname $(find ${stdenv.cc.cc}/lib/ -name libgcc.a)) + for F in ${clang}/bin/ld*; do + BASENAME=$(basename "$F") + rm -f $out/bin/$BASENAME + makeWrapper ${clang}/bin/$BASENAME $out/bin/$BASENAME \ + --add-flags "-L$LIBGCC_DIR" \ + --add-flags "-L${lib.getLib stdenv.cc.cc}/lib" + done + ''; in stdenv.mkDerivation (finalAttrs: { pname = "pocl"; @@ -45,18 +50,31 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-d/BD8YkdMYtu6yFlGNXrsz7PVIrzBvvYLU1JRv7ZJmc="; }; - cmakeFlags = [ - "-DKERNELLIB_HOST_CPU_VARIANTS=distro" - # avoid the runtime linker pulling in a different llvm e.g. from graphics drivers - "-DSTATIC_LLVM=ON" - "-DENABLE_POCL_BUILDING=OFF" - "-DPOCL_ICD_ABSOLUTE_PATH=ON" - "-DENABLE_ICD=ON" - "-DCLANG=${clangWrapped}/bin/clang" - "-DCLANGXX=${clangWrapped}/bin/clang++" - "-DENABLE_REMOTE_CLIENT=ON" - "-DENABLE_REMOTE_SERVER=ON" - ]; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace pocld/shared_cl_context.cc --replace-fail \ + "Dev.getInfo()" \ + "static_cast(Dev.getInfo())" + ''; + + cmakeFlags = + [ + # avoid the runtime linker pulling in a different llvm e.g. from graphics drivers + (lib.cmakeBool "STATIC_LLVM" true) + (lib.cmakeBool "ENABLE_POCL_BUILDING" false) + (lib.cmakeBool "POCL_ICD_ABSOLUTE_PATH" true) + (lib.cmakeBool "ENABLE_ICD" true) + (lib.cmakeBool "ENABLE_REMOTE_CLIENT" true) + (lib.cmakeBool "ENABLE_REMOTE_SERVER" true) + (lib.cmakeFeature "CLANG" "${clangWrapped}/bin/clang") + (lib.cmakeFeature "CLANGXX" "${clangWrapped}/bin/clang++") + ] + # Only x86_64 supports "distro" which allows runtime detection of SSE/AVX + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + (lib.cmakeFeature "KERNELLIB_HOST_CPU_VARIANTS" "distro") + ] + ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ + (lib.cmakeFeature "LLC_HOST_CPU" "generic") + ]; nativeBuildInputs = [ cmake @@ -65,21 +83,40 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - buildInputs = [ - hwloc - libxml2 - llvmPackages.llvm - llvmPackages.libclang - lttng-ust - ocl-icd - spirv-tools - spirv-llvm-translator + buildInputs = + [ + hwloc + libxml2 + llvmPackages.llvm + llvmPackages.libclang + opencl-headers + ocl-icd + spirv-tools + spirv-llvm-translator + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + lttng-ust + ]; + + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook ]; - passthru.updateScript = nix-update-script { }; + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + export OCL_ICD_VENDORS=$out/etc/OpenCL/vendors + $out/bin/poclcc -o poclcc.cl.pocl $src/examples/poclcc/poclcc.cl + + runHook postInstallCheck + ''; + + setupHook = ./setup-hook.sh; meta = { - description = "A portable open source (MIT-licensed) implementation of the OpenCL standard"; + description = "portable open source (MIT-licensed) implementation of the OpenCL standard"; homepage = "http://portablecl.org"; changelog = "https://github.com/pocl/pocl/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/po/pocl/setup-hook.sh b/pkgs/by-name/po/pocl/setup-hook.sh new file mode 100644 index 000000000000..986297516b75 --- /dev/null +++ b/pkgs/by-name/po/pocl/setup-hook.sh @@ -0,0 +1,6 @@ +preCheckHooks+=('setupPoclCheck') +preInstallCheckHooks+=('setupPoclCheck') + +setupPoclCheck () { + export OCL_ICD_VENDORS="@out@/etc/OpenCL/vendors" +} diff --git a/pkgs/by-name/po/poco/package.nix b/pkgs/by-name/po/poco/package.nix index e473a6ceae42..2117341d5232 100644 --- a/pkgs/by-name/po/poco/package.nix +++ b/pkgs/by-name/po/poco/package.nix @@ -7,11 +7,11 @@ pkg-config, zlib, pcre2, + utf8proc, expat, sqlite, openssl, unixODBC, - utf8proc, libmysqlclient, }: @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { buildInputs = [ unixODBC - utf8proc libmysqlclient ]; propagatedBuildInputs = [ zlib pcre2 + utf8proc expat sqlite openssl diff --git a/pkgs/by-name/po/pod2mdoc/package.nix b/pkgs/by-name/po/pod2mdoc/package.nix index 97dcc5590854..ffb849484a0e 100644 --- a/pkgs/by-name/po/pod2mdoc/package.nix +++ b/pkgs/by-name/po/pod2mdoc/package.nix @@ -4,15 +4,20 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pod2mdoc"; - version = "0.0.10"; + version = "0.2"; src = fetchurl { - url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/pod2mdoc-${version}.tgz"; - sha256 = "0nwa9zv9gmfi5ysz1wfm60kahc7nv0133n3dfc2vh2y3gj8mxr4f"; + url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/pod2mdoc-${finalAttrs.version}.tgz"; + hash = "sha256-dPH+MfYdyHauClcD7N1zwjw4EPdtt9uQGCUh9OomsPw="; }; + # use compat_ohash instead of system ohash, which is BSD-specific + postPatch = '' + substituteInPlace Makefile --replace-fail "-DHAVE_OHASH=1" "-DHAVE_OHASH=0" + ''; + installPhase = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 @@ -20,12 +25,14 @@ stdenv.mkDerivation rec { install -m 0444 pod2mdoc.1 $out/share/man/man1 ''; - meta = with lib; { - homepage = "http://mdocml.bsd.lv/"; + enableParallelBuild = true; + + meta = { + homepage = "https://mandoc.bsd.lv/pod2mdoc/"; description = "converter from POD into mdoc"; - license = licenses.isc; - platforms = platforms.all; - maintainers = with maintainers; [ ramkromberg ]; + license = lib.licenses.isc; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ramkromberg ]; mainProgram = "pod2mdoc"; }; -} +}) diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 27fe6db1c4e4..581a0573ce17 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -4,33 +4,63 @@ fetchFromGitHub, makeWrapper, copyDesktopItems, - electron_34, + electron_35, nodejs, - pnpm_9, + pnpm_10, makeDesktopItem, darwin, nix-update-script, + _experimental-update-script-combinators, + writeShellApplication, + nix, + jq, + gnugrep, }: let - electron = electron_34; + electron = electron_35; in stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; - version = "1.17.1"; + version = "1.18.1"; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + (lib.getExe (writeShellApplication { + name = "${finalAttrs.pname}-dependencies-updater"; + runtimeInputs = [ + nix + jq + gnugrep + ]; + runtimeEnv = { + PNAME = finalAttrs.pname; + PKG_FILE = builtins.toString ./package.nix; + }; + text = '' + new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)" + new_electron_major="$(jq '.devDependencies.electron' "$new_src/package.json" | grep --perl-regexp --only-matching '\d+' | head -n 1)" + new_pnpm_major="$(jq '.packageManager' "$new_src/package.json" | grep --perl-regexp --only-matching '\d+' | head -n 1)" + sed -i -E "s/electron_[0-9]+/electron_$new_electron_major/g" "$PKG_FILE" + sed -i -E "s/pnpm_[0-9]+/pnpm_$new_pnpm_major/g" "$PKG_FILE" + ''; + })) + (nix-update-script { + # Changing the pnpm version requires updating `pnpmDeps.hash`. + extraArgs = [ "--version=skip" ]; + }) + ]; src = fetchFromGitHub { owner = "containers"; repo = "podman-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-7lqBS5iasLGsF3+2fZ19ksCOK3VvNFuBMdZs94vP3PI="; + hash = "sha256-GYdetO/WiEQAvVSvu81tKqkOH7YUgkB7RVW0Crd/2ww="; }; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-BLzNETlvLqXAzPhTXOIQmwHhXudMxoNQ8WOlpsaKo6I="; + hash = "sha256-IjCO2mLDHhb1fB92plBAFcH1RpmOtiUGlFHEEAAHOJ8="; }; patches = [ @@ -47,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs - pnpm_9.configHook + pnpm_10.configHook ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index 2b67c481e47e..15a4d6bb0c62 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-HPn467lqHyT+I42J8Bs4lmUlNf/Pr2Grrmp6KCGvlwo="; + hash = "sha256-dtXJRoOb/FhGuCaRB43/8y2DM3ZgpYVts1ATzsVsUFE="; }; vendorHash = null; diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 48565b2d64cd..7224359cb18b 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -191,7 +191,7 @@ buildGoModule rec { ''; changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md"; license = licenses.asl20; - maintainers = with maintainers; [ ] ++ teams.podman.members; + teams = [ teams.podman ]; mainProgram = "podman"; }; } diff --git a/pkgs/by-name/po/poetry/package.nix b/pkgs/by-name/po/poetry/package.nix index 5b1058a4be21..b17bd307b3dd 100644 --- a/pkgs/by-name/po/poetry/package.nix +++ b/pkgs/by-name/po/poetry/package.nix @@ -17,12 +17,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 = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; tag = version; - hash = "sha256-fNj/LI4A4RjjPzYT+0ekwqmm3qzzZL3aACOe8BHviuk="; + hash = "sha256-CgaWlqjvBTN7GuerzmO5IiEdXxYH6pmTDj9IsNJlCBE="; }; }); } diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index 95e683c07dfb..6c70694ff3f6 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "2.1.2"; + version = "2.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = "poetry"; tag = version; - hash = "sha256-51pO/PP5OwTmi+1uy26CK/1oQ/P21wPBoRVE9Jv0TjA="; + hash = "sha256-aMmYgFdQhgMd99atAtr5MD0yniaIi+QTPJ0rMI2jMxk="; }; build-system = [ @@ -132,6 +132,7 @@ buildPythonPackage rec { "test_builder_should_execute_build_scripts" "test_env_system_packages_are_relative_to_lib" "test_install_warning_corrupt_root" + "test_no_additional_output_in_verbose_mode" "test_project_plugins_are_installed_in_project_folder" "test_application_command_not_found_messages" # PermissionError: [Errno 13] Permission denied: '/build/pytest-of-nixbld/pytest-0/popen-gw3/test_find_poetry_managed_pytho1/.local/share/pypoetry/python/pypy@3.10.8/bin/python' @@ -139,6 +140,11 @@ buildPythonPackage rec { "test_list_poetry_managed" "test_find_all_with_poetry_managed" "test_find_poetry_managed_pythons" + # Flaky + "test_threading_property_types" + "test_threading_single_thread_safe" + "test_threading_property_caching" + "test_threading_atomic_cached_property_different_instances" ]; pytestFlagsArray = [ @@ -155,12 +161,12 @@ buildPythonPackage rec { # in the Python script, which runs after the wrapper. makeWrapperArgs = [ "--unset PYTHONPATH" ]; - meta = with lib; { - changelog = "https://github.com/python-poetry/poetry/blob/${src.rev}/CHANGELOG.md"; + meta = { + changelog = "https://github.com/python-poetry/poetry/blob/${src.tag}/CHANGELOG.md"; homepage = "https://python-poetry.org/"; description = "Python dependency management and packaging made easy"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jakewaksbaum dotlambda ]; diff --git a/pkgs/by-name/po/polari/package.nix b/pkgs/by-name/po/polari/package.nix index a74004c5630c..7703671c9319 100644 --- a/pkgs/by-name/po/polari/package.nix +++ b/pkgs/by-name/po/polari/package.nix @@ -86,7 +86,10 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/Polari/"; description = "IRC chat client designed to integrate with the GNOME desktop"; mainProgram = "polari"; - maintainers = teams.gnome.members ++ teams.gnome-circle.members; + teams = [ + teams.gnome + teams.gnome-circle + ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index 9b32eb7d8ffc..0e3d35aae305 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "polarity"; - version = "latest-unstable-2025-03-26"; + version = "latest-unstable-2025-05-14"; src = fetchFromGitHub { owner = "polarity-lang"; repo = "polarity"; - rev = "73c91061930cf10002aae4f2dd7ac301af20dfdc"; - hash = "sha256-EN4xOBIrIrNBd/YQPc1xRagAvCdvEH83shb2axj9xX0="; + rev = "6c0370011b827886e87b7afec644788a1a54f6f7"; + hash = "sha256-RKuL0gn734eqNQHIsSA0kLF1qUNtyEUpYf8Zv359GAs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-wpO7JYLjuEbKc/a4WO4KeUxdDCI1BswvgvSH+sFh1V0="; + cargoHash = "sha256-23qr4bEAsN75ONnNmym9eWH38fRoMmP1EkmOaka73Ko="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/po/poliedros/package.nix b/pkgs/by-name/po/poliedros/package.nix new file mode 100644 index 000000000000..c1d36e41db39 --- /dev/null +++ b/pkgs/by-name/po/poliedros/package.nix @@ -0,0 +1,60 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + ninja, + meson, + pkg-config, + wrapGAppsHook4, + glib, + desktop-file-utils, + appstream-glib, + gobject-introspection, + libadwaita, + nix-update-script, +}: +let + version = "1.0.1"; +in +python3Packages.buildPythonApplication { + pname = "poliedros"; + inherit version; + pyproject = false; + + src = fetchFromGitHub { + owner = "kriptolix"; + repo = "Poliedros"; + tag = "v${version}"; + hash = "sha256-1lYEsfyl6ckH1TmMLRP+flnm77INiA8ntnGVWnwpLvs="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + glib + desktop-file-utils + appstream-glib + gobject-introspection + ]; + + pythonPath = [ python3Packages.pygobject3 ]; + + buildInputs = [ libadwaita ]; + + dontWrapGApps = true; + + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Multi-type dice roller"; + homepage = "https://github.com/kriptolix/Poliedros"; + changelog = "https://github.com/kriptolix/Poliedros/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + mainProgram = "poliedros"; + maintainers = [ lib.maintainers.awwpotato ]; + }; +} diff --git a/pkgs/by-name/po/polipo/package.nix b/pkgs/by-name/po/polipo/package.nix deleted file mode 100644 index f050199942c0..000000000000 --- a/pkgs/by-name/po/polipo/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - texinfo, -}: - -stdenv.mkDerivation rec { - pname = "polipo"; - version = "1.1.1"; - - src = fetchurl { - url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${pname}-${version}.tar.gz"; - sha256 = "05g09sg9qkkhnc2mxldm1w1xkxzs2ylybkjzs28w8ydbjc3pand2"; - }; - - buildInputs = [ texinfo ]; - makeFlags = [ - "PREFIX=$(out)" - "LOCAL_ROOT=$(out)/share/polipo/www" - ]; - - meta = with lib; { - homepage = "http://www.pps.jussieu.fr/~jch/software/polipo/"; - description = "Small and fast caching web proxy"; - license = licenses.mit; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.all; - knownVulnerabilities = [ - "Unmaintained upstream: https://github.com/jech/polipo/commit/4d42ca1b5849" - ]; - }; -} diff --git a/pkgs/by-name/po/polkadot/package.nix b/pkgs/by-name/po/polkadot/package.nix new file mode 100644 index 000000000000..d81e136d5174 --- /dev/null +++ b/pkgs/by-name/po/polkadot/package.nix @@ -0,0 +1,88 @@ +{ + cacert, + fetchFromGitHub, + lib, + openssl, + pkg-config, + protobuf, + rocksdb_8_3, + rust-jemalloc-sys-unprefixed, + rustPlatform, + rustc, + stdenv, +}: + +let + rocksdb = rocksdb_8_3; +in +rustPlatform.buildRustPackage rec { + pname = "polkadot"; + version = "2503-2"; + + src = fetchFromGitHub { + owner = "paritytech"; + repo = "polkadot-sdk"; + rev = "polkadot-stable${version}"; + hash = "sha256-sUBUWFAJ8PwWUVSqPef0SMJcvSt+bGruTW+GmJGTLdE="; + + # the build process of polkadot requires a .git folder in order to determine + # the git commit hash that is being built and add it to the version string. + # since having a .git folder introduces reproducibility issues to the nix + # build, we check the git commit hash after fetching the source and save it + # into a .git_commit file, and then delete the .git folder. we can then use + # this file to populate an environment variable with the commit hash, which + # is picked up by polkadot's build process. + leaveDotGit = true; + postFetch = '' + ( cd $out; git rev-parse --short HEAD > .git_commit ) + rm -rf $out/.git + ''; + }; + + preBuild = '' + export SUBSTRATE_CLI_GIT_COMMIT_HASH=$(< .git_commit) + rm .git_commit + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-U3roe7rQL1BaHr3rKV1Dl7Lhjic3pZlxo2DpD9C2ong="; + + buildType = "production"; + buildAndTestSubdir = "polkadot"; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + rustc + rustc.llvmPackages.lld + ]; + + # NOTE: jemalloc is used by default on Linux with unprefixed enabled + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ]; + + checkInputs = [ + cacert + ]; + + OPENSSL_NO_VENDOR = 1; + PROTOC = "${protobuf}/bin/protoc"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + + meta = with lib; { + description = "Implementation of a https://polkadot.network node in Rust based on the Substrate framework"; + homepage = "https://github.com/paritytech/polkadot-sdk"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ + akru + andresilva + FlorianFranzen + RaghavSood + ]; + # See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta. + platforms = intersectLists platforms.unix ( + platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86 + ); + }; +} diff --git a/pkgs/by-name/po/polkit/package.nix b/pkgs/by-name/po/polkit/package.nix index 1ecf173e5608..e3e79ff92b41 100644 --- a/pkgs/by-name/po/polkit/package.nix +++ b/pkgs/by-name/po/polkit/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, glib, expat, @@ -61,6 +62,12 @@ stdenv.mkDerivation rec { # Allow changing base for paths in pkg-config file as before. # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/100 ./0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch + + (fetchpatch { + name = "elogind.patch"; + url = "https://github.com/polkit-org/polkit/commit/55ee1b70456eca8281dda9612c485c619122f202.patch"; + hash = "sha256-XOsDyYFBDWxs0PGAgqm3OSUycKR8fYa2ySZqBl8EX7E="; + }) ]; depsBuildBuild = [ @@ -120,10 +127,6 @@ stdenv.mkDerivation rec { ]; env = { - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - PKG_CONFIG_SYSTEMD_SYSUSERS_DIR = "${placeholder "out"}/lib/sysusers.d"; - PKG_CONFIG_SYSTEMD_TMPFILES_DIR = "${placeholder "out"}/lib/tmpfiles.d"; - # HACK: We want to install policy files files to $out/share but polkit # should read them from /run/current-system/sw/share on a NixOS system. # Similarly for config files in /etc. @@ -132,6 +135,11 @@ stdenv.mkDerivation rec { # so we need to convince it to install all files to a temporary # location using DESTDIR and then move it to proper one in postInstall. DESTDIR = "dest"; + + # Set these to the default locations, so the builds with and + # without systemd can have the same installation path below. + PKG_CONFIG_SYSTEMD_SYSUSERS_DIR = "/usr/lib/sysusers.d"; + PKG_CONFIG_SYSTEMD_TMPFILES_DIR = "/usr/lib/tmpfiles.d"; }; mesonFlags = @@ -144,6 +152,7 @@ stdenv.mkDerivation rec { "-Dtests=${lib.boolToString doCheck}" "-Dgtk_doc=${lib.boolToString withIntrospection}" "-Dman=true" + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-Dsession_tracking=${if useSystemd then "logind" else "elogind"}" @@ -172,9 +181,13 @@ stdenv.mkDerivation rec { mv "$DESTDIR/''${!o}" "''${!o}" done mv "$DESTDIR/etc" "$out" + mv "$DESTDIR/usr/lib"/{sysusers,tmpfiles}.d "$out/lib" mv "$DESTDIR${system}/share"/* "$out/share" # Ensure we did not forget to install anything. - rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}" "$DESTDIR${system}/share" + rmdir --parents --ignore-fail-on-non-empty \ + "$DESTDIR${builtins.storeDir}" \ + "$DESTDIR/usr/lib" \ + "$DESTDIR${system}/share" ! test -e "$DESTDIR" ''; @@ -187,6 +200,6 @@ stdenv.mkDerivation rec { # mandatory libpolkit-gobject shared library lib.systems.inspect.platformPatterns.isStatic ]; - maintainers = teams.freedesktop.members; + teams = [ teams.freedesktop ]; }; } diff --git a/pkgs/by-name/po/polymake/package.nix b/pkgs/by-name/po/polymake/package.nix index a0b90178df27..9812c8a19fe7 100644 --- a/pkgs/by-name/po/polymake/package.nix +++ b/pkgs/by-name/po/polymake/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://www.polymake.org/doku.php"; changelog = "https://github.com/polymake/polymake/blob/V${version}/ChangeLog"; license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/po/polypane/package.nix b/pkgs/by-name/po/polypane/package.nix index cd7b185f2739..f8446111cc8d 100644 --- a/pkgs/by-name/po/polypane/package.nix +++ b/pkgs/by-name/po/polypane/package.nix @@ -6,12 +6,12 @@ let pname = "polypane"; - version = "23.1.1"; + version = "24.0.2"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-TG2U++/DiDQMBYGbo6KOz12iwNHjOiUUUpkaG8BpamE="; + sha256 = "sha256-iO2589e2L1q5xEoIvSUV8QBpn/uHp/FBLMFeXDgIdVY="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/po/polytopes_db/package.nix b/pkgs/by-name/po/polytopes_db/package.nix index a46acf47d242..da13198b5a8c 100644 --- a/pkgs/by-name/po/polytopes_db/package.nix +++ b/pkgs/by-name/po/polytopes_db/package.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Reflexive polytopes database"; license = licenses.gpl2; platforms = platforms.all; - maintainers = teams.sage.members; + teams = [ teams.sage ]; }; } diff --git a/pkgs/by-name/po/pomerium-cli/package.nix b/pkgs/by-name/po/pomerium-cli/package.nix index 7a51ae3e8ad8..6fbf07776211 100644 --- a/pkgs/by-name/po/pomerium-cli/package.nix +++ b/pkgs/by-name/po/pomerium-cli/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "pomerium-cli"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "pomerium"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-H5wZaZsMgHPcO1qDoaqp/UP+stU7IG070DNFhxC7Ehw="; + sha256 = "sha256-CcXreKZ83+WDucV3sr62bwKzSs+S9R3e+z0JD0rR8jw="; }; - vendorHash = "sha256-a5eESlDBxYVvfiafdZFIjUqIxB51LZc67fUJek69qwc="; + vendorHash = "sha256-k6HOIpz0cPCkP3TXg62u+tuYd41TF+YAoCWINAcFoB8="; subPackages = [ "cmd/pomerium-cli" diff --git a/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch b/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch index cd1f3fb7421c..fd7fa5672975 100644 --- a/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch +++ b/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch @@ -1,14 +1,14 @@ -From 54e426127a35ea6c88bf0ba882f97f0712533ef5 Mon Sep 17 00:00:00 2001 +From dfb6e2797e7c9166c8dd3dc0d87a4d91474244c7 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 26 May 2024 12:17:01 -0500 Subject: [PATCH] envoy: allow specification of external binary --- - pkg/envoy/envoy.go | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) + pkg/envoy/envoy.go | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go -index 66cf71ae..8d81090e 100644 +index 8224f364..bb8b6506 100644 --- a/pkg/envoy/envoy.go +++ b/pkg/envoy/envoy.go @@ -8,9 +8,9 @@ import ( @@ -22,7 +22,7 @@ index 66cf71ae..8d81090e 100644 "path/filepath" "regexp" "strconv" -@@ -34,8 +34,12 @@ import ( +@@ -35,8 +35,17 @@ import ( const ( configFileName = "envoy-config.yaml" @@ -32,20 +32,22 @@ index 66cf71ae..8d81090e 100644 +var OverrideEnvoyPath = "" + - type serverOptions struct { - services string - logLevel config.LogLevel -@@ -59,17 +63,16 @@ type Server struct { - - // NewServer creates a new server with traffic routed by envoy. - func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Builder) (*Server, error) { -- if err := preserveRlimitNofile(); err != nil { -- log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy") -- } -+ envoyPath := OverrideEnvoyPath -+ wd := filepath.Join(os.TempDir(), workingDirectoryName) ++type serverOptions struct { ++ services string ++ logLevel config.LogLevel ++} ++ + // A Server is a pomerium proxy implemented via envoy. + type Server struct { + ServerOptions +@@ -94,14 +103,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil + log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy") + } - envoyPath, err := Extract() ++ envoyPath := OverrideEnvoyPath ++ wd := filepath.Join(os.TempDir(), workingDirectoryName) ++ + err := os.MkdirAll(wd, embeddedEnvoyPermissions) if err != nil { - return nil, fmt.Errorf("extracting envoy: %w", err) @@ -53,11 +55,12 @@ index 66cf71ae..8d81090e 100644 } srv := &Server{ -- wd: path.Dir(envoyPath), -+ wd: wd, - builder: builder, - grpcPort: src.GetConfig().GRPCPort, - httpPort: src.GetConfig().HTTPPort, + ServerOptions: options, +- wd: path.Dir(envoyPath), ++ wd: wd, + builder: builder, + grpcPort: src.GetConfig().GRPCPort, + httpPort: src.GetConfig().HTTPPort, -- -2.47.0 +2.48.1 diff --git a/pkgs/by-name/po/pomerium/package.json b/pkgs/by-name/po/pomerium/package.json index 59e65c4fcbaa..eb48ee5cab7b 100644 --- a/pkgs/by-name/po/pomerium/package.json +++ b/pkgs/by-name/po/pomerium/package.json @@ -43,7 +43,7 @@ "@types/react-dom": "^17.0.11", "@typescript-eslint/eslint-plugin": "^5.10.2", "@typescript-eslint/parser": "^5.59.11", - "esbuild": "^0.21.1", + "esbuild": "^0.25.0", "eslint": "7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.28.0", diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix index b19b8c130e3d..0c76b846b00a 100644 --- a/pkgs/by-name/po/pomerium/package.nix +++ b/pkgs/by-name/po/pomerium/package.nix @@ -19,15 +19,15 @@ let in buildGo123Module rec { pname = "pomerium"; - version = "0.28.0"; + version = "0.29.3"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-Uj/mVklFRaoDNQjCFS5NW/AhSU+7V1XxPiZBAUuly7s="; + hash = "sha256-jlNU6pygq6X0DL3f25aVGHB8VoKw+VEdNFB5QY8MR9E="; }; - vendorHash = "sha256-s6EZUZoGNBpy5RaLAPiCCCVFli+YzZ0PHJ/aH3s4APA="; + vendorHash = "sha256-K9LcGvANajoVKEDIswahD0mT5845qGZzafmWMKkVn8Q="; ui = mkYarnPackage { inherit version; diff --git a/pkgs/by-name/po/pomerium/yarn-hash b/pkgs/by-name/po/pomerium/yarn-hash index 6f871e034fe3..164160128670 100644 --- a/pkgs/by-name/po/pomerium/yarn-hash +++ b/pkgs/by-name/po/pomerium/yarn-hash @@ -1 +1 @@ -0bdrczn8mj5iidmba7xzkcyvsnwmbvcvrc1vgks2x4pxqbfyxaiv +1fqb1bcsg0k6xazr6v19jav11fl99mm3p9w53hl5xflb974m2lg0 diff --git a/pkgs/by-name/po/pomodoro/package.nix b/pkgs/by-name/po/pomodoro/package.nix new file mode 100644 index 000000000000..c34dd208893c --- /dev/null +++ b/pkgs/by-name/po/pomodoro/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage { + pname = "pomodoro"; + version = "unstable-2021-06-18"; + + src = fetchFromGitHub { + owner = "SanderJSA"; + repo = "Pomodoro"; + rev = "c833b9551ed0b09e311cdb369cc8226c5b9cac6a"; + sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-oXOf9G0BMSbFFAsmRaAZzaquFva1i1gJ4ISqJkqSx4k="; + + meta = with lib; { + description = "Simple CLI pomodoro timer using desktop notifications written in Rust"; + homepage = "https://github.com/SanderJSA/Pomodoro"; + license = licenses.mit; + maintainers = with maintainers; [ annaaurora ]; + # error: redefinition of module 'ObjectiveC' + broken = stdenv.hostPlatform.isDarwin; + mainProgram = "pomodoro"; + }; +} diff --git a/pkgs/by-name/po/pong3d/package.nix b/pkgs/by-name/po/pong3d/package.nix index 32614d8db292..d94b42d23303 100644 --- a/pkgs/by-name/po/pong3d/package.nix +++ b/pkgs/by-name/po/pong3d/package.nix @@ -2,23 +2,39 @@ lib, stdenv, fetchurl, + libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "3dpong"; version = "0.5"; + src = fetchurl { - url = "ftp://ftp.tuxpaint.org/unix/x/3dpong/src/3dpong-${version}.tar.gz"; - sha256 = "1ibb79sbzlbn4ra3n0qk22gqr6fg7q0jy6cm0wg2qj4z64c7hmdi"; + url = "https://tuxpaint.org/ftp/unix/x/3dpong/src/3dpong-${finalAttrs.version}.tar.gz"; + hash = "sha256-sVV4GDGfSCweB5UZLwE+z5mMnxATAztUJnbRv3Q6a8U="; }; + postPatch = '' + substituteInPlace src/3dpong.c --replace-fail \ + "#include " \ + "#include + #include " + + substituteInPlace src/randnum.c --replace-fail \ + "#include " \ + "#include + #include " + + substituteInPlace src/text.c --replace-fail \ + "#include " \ + "#include + #include " + ''; + buildInputs = [ libX11 ]; - preConfigure = '' - sed -i s,/usr/local,$out, Makefile - mkdir -p $out/bin - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = { homepage = "http://www.newbreedsoftware.com/3dpong/"; @@ -26,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/by-name/po/pony-corral/package.nix similarity index 100% rename from pkgs/development/compilers/ponyc/pony-corral.nix rename to pkgs/by-name/po/pony-corral/package.nix diff --git a/pkgs/by-name/po/ponyc/disable-networking-tests.patch b/pkgs/by-name/po/ponyc/disable-networking-tests.patch new file mode 100644 index 000000000000..a5f35792ec5a --- /dev/null +++ b/pkgs/by-name/po/ponyc/disable-networking-tests.patch @@ -0,0 +1,42 @@ +From e49f97eb4b0fd27b26437638db7984fbcfd3a14f Mon Sep 17 00:00:00 2001 +From: Morgan Jones +Date: Sun, 4 May 2025 15:46:07 -0700 +Subject: [PATCH] net: disable tests in the Nix sandbox + +--- + packages/net/_test.pony | 19 +------------------ + 1 file changed, 1 insertion(+), 18 deletions(-) + +diff --git a/packages/net/_test.pony b/packages/net/_test.pony +index 05462eb2..c0c6cdfa 100644 +--- a/packages/net/_test.pony ++++ b/packages/net/_test.pony +@@ -15,25 +15,8 @@ actor \nodoc\ Main is TestList + new make() => None + + fun tag tests(test: PonyTest) => +- // Tests below function across all systems and are listed alphabetically ++ // (@numinit): only this test works in the Nix sandbox: + test(_TestTCPConnectionFailed) +- test(_TestTCPExpect) +- test(_TestTCPExpectOverBufferSize) +- test(_TestTCPMute) +- test(_TestTCPProxy) +- test(_TestTCPUnmute) +- test(_TestTCPWritev) +- +- // Tests below exclude windows and are listed alphabetically +- ifdef not windows then +- test(_TestTCPConnectionToClosedServerFailed) +- test(_TestTCPThrottle) +- end +- +- // Tests below exclude osx and are listed alphabetically +- ifdef not osx then +- test(_TestBroadcast) +- end + + class \nodoc\ _TestPing is UDPNotify + let _h: TestHelper +-- +2.47.0 diff --git a/pkgs/by-name/po/ponyc/disable-process-tests.patch b/pkgs/by-name/po/ponyc/disable-process-tests.patch new file mode 100644 index 000000000000..e4ee0656655b --- /dev/null +++ b/pkgs/by-name/po/ponyc/disable-process-tests.patch @@ -0,0 +1,26 @@ +From 77d703b11d298f6be88b04f7e8ca85de139e82be Mon Sep 17 00:00:00 2001 +From: Morgan Jones +Date: Mon, 5 May 2025 20:34:02 -0700 +Subject: [PATCH] process: disable KillLongRunningChild test + +--- + packages/process/_test.pony | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/packages/process/_test.pony b/packages/process/_test.pony +index fe9fdb04..756588f9 100644 +--- a/packages/process/_test.pony ++++ b/packages/process/_test.pony +@@ -18,7 +18,8 @@ actor \nodoc\ Main is TestList + test(_TestChdir) + test(_TestExpect) + test(_TestFileExecCapabilityIsRequired) +- test(_TestKillLongRunningChild) ++ // (@booxter/@numinit) Appears to be flaky. ++ // test(_TestKillLongRunningChild) + test(_TestLongRunningChild) + test(_TestNonExecutablePathResultsInExecveError) + test(_TestPrintvOrdering) +-- +2.47.0 + diff --git a/pkgs/by-name/po/ponyc/fix-darwin-build.patch b/pkgs/by-name/po/ponyc/fix-darwin-build.patch new file mode 100644 index 000000000000..60446f73452e --- /dev/null +++ b/pkgs/by-name/po/ponyc/fix-darwin-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/libponyc/codegen/genexe.c b/src/libponyc/codegen/genexe.c +index 3f0348eaa1..76b03030bf 100644 +--- a/src/libponyc/codegen/genexe.c ++++ b/src/libponyc/codegen/genexe.c +@@ -308,7 +308,7 @@ + snprintf(ld_cmd, ld_len, + "%s -execute -arch %.*s " + "-o %s %s %s %s " +- "-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib -lSystem %s -platform_version macos '" STR(PONY_OSX_PLATFORM) "' '0.0.0'", ++ "-L\"${SDKROOT:-${DEVELOPER_DIR:-@apple-sdk@}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk}/usr/lib\" -lSystem %s -platform_version macos '" STR(PONY_OSX_PLATFORM) "' '0.0.0'", + linker, (int)arch_len, c->opt->triple, file_exe, file_o, + lib_args, ponyrt, sanitizer_arg + ); diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix new file mode 100644 index 000000000000..2fcb07cb780b --- /dev/null +++ b/pkgs/by-name/po/ponyc/package.nix @@ -0,0 +1,181 @@ +{ + lib, + stdenv, + fetchFromGitHub, + apple-sdk_13, + cmake, + coreutils, + darwinMinVersionHook, + libxml2, + lto ? true, + makeWrapper, + openssl, + pcre2, + pony-corral, + python3, + # Not really used for anything real, just at build time. + git, + replaceVars, + which, + z3, + cctools, + procps, +}: + +stdenv.mkDerivation (rec { + pname = "ponyc"; + version = "0.59.0"; + + src = fetchFromGitHub { + owner = "ponylang"; + repo = pname; + rev = version; + hash = "sha256-4gDv8UWTk0RWVNC4PU70YKSK9fIMbWBsQbHboVls2BA="; + fetchSubmodules = true; + }; + + benchmarkRev = "1.9.1"; + benchmark = fetchFromGitHub { + owner = "google"; + repo = "benchmark"; + rev = "v${benchmarkRev}"; + hash = "sha256-5xDg1duixLoWIuy59WT0r5ZBAvTR6RPP7YrhBYkMxc8="; + }; + + googletestRev = "1.15.2"; + googletest = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "v${googletestRev}"; + hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM="; + }; + + nativeBuildInputs = + [ + cmake + makeWrapper + which + python3 + git + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Keep in sync with `PONY_OSX_PLATFORM`. + apple-sdk_13 + (darwinMinVersionHook "13.0") + cctools.libtool + ]; + + buildInputs = [ + libxml2 + z3 + ]; + + patches = + [ + # Sandbox disallows network access, so disabling problematic networking tests + ./disable-networking-tests.patch + ./disable-process-tests.patch + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (replaceVars ./fix-darwin-build.patch { + apple-sdk = apple-sdk_13; + }) + ]; + + postUnpack = '' + mkdir -p $NIX_BUILD_TOP/deps + tar -C "$benchmark" -cf $NIX_BUILD_TOP/deps/benchmark-$benchmarkRev.tar . + tar -C "$googletest" -cf $NIX_BUILD_TOP/deps/googletest-$googletestRev.tar . + ''; + + dontConfigure = true; + + postPatch = '' + substituteInPlace packages/process/_test.pony \ + --replace-fail '"/bin/' '"${coreutils}/bin/' \ + --replace-fail '=/bin' "${coreutils}/bin" + substituteInPlace src/libponyc/pkg/package.c \ + --replace-fail "/usr/local/lib" "" \ + --replace-fail "/opt/local/lib" "" + + # Replace downloads with local copies. + substituteInPlace lib/CMakeLists.txt \ + --replace-fail "https://github.com/google/benchmark/archive/v$benchmarkRev.tar.gz" "$NIX_BUILD_TOP/deps/benchmark-$benchmarkRev.tar" \ + --replace-fail "https://github.com/google/googletest/archive/refs/tags/v$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar" + ''; + + preBuild = + '' + extraFlags=(build_flags=-j$NIX_BUILD_CORES) + '' + + lib.optionalString stdenv.hostPlatform.isAarch64 '' + # See this relnote about building on Raspbian: + # https://github.com/ponylang/ponyc/blob/0.46.0/.release-notes/0.45.2.md + extraFlags+=(pic_flag=-fPIC) + '' + + '' + make libs "''${extraFlags[@]}" + make configure "''${extraFlags[@]}" + ''; + + makeFlags = [ + "PONYC_VERSION=${version}" + "prefix=${placeholder "out"}" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no"); + + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=redundant-move" + "-Wno-error=implicit-fallthrough" + ]; + + doCheck = true; + + nativeCheckInputs = [ procps ]; + + installPhase = + '' + makeArgs=(config=release prefix=$out) + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + makeArgs+=(bits=64) + '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && !lto) '' + makeArgs+=(lto=no) + '' + + '' + make "''${makeArgs[@]}" install + wrapProgram $out/bin/ponyc \ + --prefix PATH ":" "${stdenv.cc}/bin" \ + --set-default CC "$CC" \ + --prefix PONYPATH : "${ + lib.makeLibraryPath [ + pcre2 + openssl + (placeholder "out") + ] + }" + ''; + + # Stripping breaks linking for ponyc + dontStrip = true; + + passthru.tests.pony-corral = pony-corral; + + meta = with lib; { + description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; + homepage = "https://www.ponylang.org"; + license = licenses.bsd2; + maintainers = with maintainers; [ + kamilchm + patternspandemic + redvers + numinit + ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" + ]; + }; +}) diff --git a/pkgs/by-name/po/ponymix/package.nix b/pkgs/by-name/po/ponymix/package.nix index c3072757a57e..8f4cd665acd2 100644 --- a/pkgs/by-name/po/ponymix/package.nix +++ b/pkgs/by-name/po/ponymix/package.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { mainProgram = "ponymix"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ericsagnes ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/po/popa3d/package.nix b/pkgs/by-name/po/popa3d/package.nix index b4ced4eb19e2..637a34ef94e1 100644 --- a/pkgs/by-name/po/popa3d/package.nix +++ b/pkgs/by-name/po/popa3d/package.nix @@ -4,22 +4,18 @@ fetchurl, openssl, libxcrypt, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "popa3d"; version = "1.0.3"; src = fetchurl { - url = "http://www.openwall.com/popa3d/${pname}-${version}.tar.gz"; - sha256 = "1g48cd74sqhl496wmljhq44iyfpghaz363a1ip8nyhpjz7d57f03"; + url = "http://www.openwall.com/popa3d/popa3d-${finalAttrs.version}.tar.gz"; + hash = "sha256-A7hT2vnyQm/RjUENM76C7zofCcFQ0spNIhRiTU5jiLw="; }; - buildInputs = [ - openssl - libxcrypt - ]; - patches = [ ./fix-mail-spool-path.patch ./use-openssl.patch @@ -27,7 +23,23 @@ stdenv.mkDerivation rec { ./enable-standalone-mode.patch ]; - configurePhase = ''makeFlags="PREFIX=$out MANDIR=$out/share/man"''; + enableParallelBuilding = true; + + makeFlags = [ + "PREFIX=$(out)" + "MANDIR=$(out)/share/man" + ]; + + buildInputs = [ + openssl + libxcrypt + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgramArg = "-V"; meta = { homepage = "http://www.openwall.com/popa3d/"; @@ -35,4 +47,4 @@ stdenv.mkDerivation rec { mainProgram = "popa3d"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/po/popa3d/use-glibc-crypt.patch b/pkgs/by-name/po/popa3d/use-glibc-crypt.patch index 35843a38bb31..66e973283eca 100644 --- a/pkgs/by-name/po/popa3d/use-glibc-crypt.patch +++ b/pkgs/by-name/po/popa3d/use-glibc-crypt.patch @@ -10,3 +10,16 @@ diff -ubr popa3d-1.0.2-orig/Makefile popa3d-1.0.2/Makefile # HP-UX trusted system #LIBS += -lsec # Solaris (POP_STANDALONE, POP_VIRTUAL) +diff -ubr popa3d-1.0.2-orig/auth_shadow.c popa3d-1.0.2/auth_shadow.c +--- a/auth_shadow.c ++++ b/auth_shadow.c +@@ -14,8 +14,9 @@ + #define _XOPEN_SOURCE 4 + #define _XOPEN_SOURCE_EXTENDED + #define _XOPEN_VERSION 4 + #define _XPG4_2 ++#define _DEFAULT_SOURCE + #include + #include + #include + #include diff --git a/pkgs/by-name/po/popl/package.nix b/pkgs/by-name/po/popl/package.nix index 35be9c51566f..023b283b670d 100644 --- a/pkgs/by-name/po/popl/package.nix +++ b/pkgs/by-name/po/popl/package.nix @@ -32,6 +32,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/badaix/popl"; changelog = "https://github.com/badaix/popl/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/po/poppler_data/package.nix b/pkgs/by-name/po/poppler_data/package.nix index 6c11f81ea0af..edd4824bd2f4 100644 --- a/pkgs/by-name/po/poppler_data/package.nix +++ b/pkgs/by-name/po/poppler_data/package.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; license = licenses.free; # more free licenses combined - maintainers = poppler.meta.maintainers; + inherit (poppler.meta) teams maintainers; }; } diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix index f29f75853f93..285f106a6648 100644 --- a/pkgs/by-name/po/poptracker/package.nix +++ b/pkgs/by-name/po/poptracker/package.nix @@ -6,7 +6,9 @@ SDL2, SDL2_ttf, SDL2_image, + libX11, openssl, + zlib, which, libsForQt5, makeWrapper, @@ -17,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "poptracker"; - version = "0.30.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "black-sliver"; repo = "PopTracker"; rev = "v${finalAttrs.version}"; - hash = "sha256-U1C0vwHcUfjBPGLcmmWFqaKmIMPlV/FumIbFJ6JDBFc="; + hash = "sha256-uGzgkXOXmpByXewDuo0NieXHYT6fzaHqyfP60V5fMOY="; fetchSubmodules = true; }; @@ -47,7 +49,9 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_ttf SDL2_image + libX11 openssl + zlib ]; buildFlags = [ diff --git a/pkgs/by-name/po/porsmo/package.nix b/pkgs/by-name/po/porsmo/package.nix index 21dba217b326..4ae2993d59d1 100644 --- a/pkgs/by-name/po/porsmo/package.nix +++ b/pkgs/by-name/po/porsmo/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, alsa-lib, - stdenv, - darwin, testers, porsmo, }: @@ -29,14 +27,9 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreAudio - darwin.apple_sdk.frameworks.CoreFoundation - ]; + buildInputs = [ + alsa-lib + ]; passthru.tests.version = testers.testVersion { package = porsmo; diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 816d6b483503..12123603ca29 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -9,7 +9,7 @@ makeDesktopItem, openjdk21, stdenvNoCC, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, gitUpdater, }: @@ -21,6 +21,7 @@ let comment = "Calculate Investment Portfolio Performance"; desktopName = "Portfolio Performance"; categories = [ "Office" ]; + startupWMClass = "Portfolio Performance"; }; runtimeLibs = lib.makeLibraryPath [ @@ -28,16 +29,16 @@ let glib-networking gtk3 libsecret - webkitgtk_4_0 + webkitgtk_4_1 ]; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.74.2"; + version = "0.76.3"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-RPoEby12DiJwdM2ejVfOQyrJjy/qgQ9BbqYyaV9KMD0="; + hash = "sha256-HbmNIRKNV1vmDX6PdjBvBNfyLP/pqtRCZRBHNADyiqM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/portmidi/missing-header.diff b/pkgs/by-name/po/portmidi/missing-header.diff similarity index 100% rename from pkgs/development/libraries/portmidi/missing-header.diff rename to pkgs/by-name/po/portmidi/missing-header.diff diff --git a/pkgs/by-name/po/portmidi/package.nix b/pkgs/by-name/po/portmidi/package.nix new file mode 100644 index 000000000000..3806a1be2d52 --- /dev/null +++ b/pkgs/by-name/po/portmidi/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchFromGitHub, + unzip, + cmake, + alsa-lib, +}: + +stdenv.mkDerivation rec { + pname = "portmidi"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-uqBeh9vBP6+V+FN4lfeGxePQcpZMDYUuAo/d9a5rQxU="; + }; + + cmakeFlags = [ + "-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release" + "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release" + "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release" + ]; + + patches = [ + # Add missing header include + ./missing-header.diff + ]; + + postInstall = + let + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + ln -s libportmidi${ext} "$out/lib/libporttime${ext}" + ''; + + nativeBuildInputs = [ + unzip + cmake + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + homepage = "https://github.com/PortMidi/portmidi"; + description = "Platform independent library for MIDI I/O"; + license = licenses.mit; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/po/portunus/package.nix b/pkgs/by-name/po/portunus/package.nix index 96408db6f66d..933b286da5b7 100644 --- a/pkgs/by-name/po/portunus/package.nix +++ b/pkgs/by-name/po/portunus/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "portunus"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "majewsky"; repo = "portunus"; rev = "v${version}"; - sha256 = "sha256-+pMMIutj+OWKZmOYH5NuA4a7aS5CD+33vAEC9bJmyfM="; + sha256 = "sha256-nLFwfH1K6vsgNATwAxyq/q6HTtfLK8gsQhei7eJ86Kc="; }; buildInputs = [ libxcrypt ]; @@ -28,6 +28,7 @@ buildGoModule rec { homepage = "https://github.com/majewsky/portunus"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ majewsky ] ++ teams.c3d2.members; + maintainers = with maintainers; [ majewsky ]; + teams = [ teams.c3d2 ]; }; } diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index e06e1c8e3f96..dded8d345ea4 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -22,7 +22,7 @@ }: let pname = "positron-bin"; - version = "2025.02.0-171"; + version = "2025.05.0-75"; in stdenv.mkDerivation { inherit version pname; @@ -30,13 +30,13 @@ stdenv.mkDerivation { src = if stdenv.hostPlatform.isDarwin then fetchurl { - url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}.dmg"; - hash = "sha256-b5o1+UXt5JAuHkm1K1jrMLV+7PHfKJTOff4aTk8xm2I="; + url = "https://cdn.posit.co/positron/dailies/mac/universal/Positron-${version}.dmg"; + hash = "sha256-dmRYKysQJYrNWyGvH9DsNIC0tIHYNix7QWagVtuGx1g="; } else fetchurl { - url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}-x64.deb"; - hash = "sha256-TjQc/Y4Sa2MlLslbygYVFbIk3raArMvYstSiSEYzfo0="; + url = "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${version}-x64.deb"; + hash = "sha256-dmJrDE3g44aoCsVBvSDDFLt38uIqxzaXPBhcmu/U5Oo="; }; buildInputs = @@ -85,7 +85,8 @@ stdenv.mkDerivation { # Positron will use the system version of BLAS if we don't provide the nix version. wrapProgram "$out/Applications/Positron.app/Contents/Resources/app/bin/code" \ - --prefix DYLD_INSERT_LIBRARIES : "${lib.makeLibraryPath [ blas ]}/libblas.dylib" + --prefix DYLD_INSERT_LIBRARIES : "${lib.makeLibraryPath [ blas ]}/libblas.dylib" \ + --add-flags "--disable-updates" ln -s "$out/Applications/Positron.app/Contents/Resources/app/bin/code" "$out/bin/positron" runHook postInstall @@ -112,7 +113,9 @@ stdenv.mkDerivation { # Fix libGL.so not found errors. wrapProgram "$out/share/positron/positron" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libglvnd ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libglvnd ]}" \ + --add-flags "--disable-updates" + mkdir -p "$out/bin" ln -s "$out/share/positron/positron" "$out/bin/positron" diff --git a/pkgs/by-name/po/positron-bin/update.sh b/pkgs/by-name/po/positron-bin/update.sh index a024b382ec96..3e3966a356e9 100755 --- a/pkgs/by-name/po/positron-bin/update.sh +++ b/pkgs/by-name/po/positron-bin/update.sh @@ -18,22 +18,22 @@ fi # Update Darwin hash. current_hash=$(nix store prefetch-file --json --hash-type sha256 \ - "https://github.com/posit-dev/positron/releases/download/${current_version}/Positron-${current_version}.dmg" \ + "https://cdn.posit.co/positron/dailies/mac/universal/Positron-${current_version}.dmg" \ | jq -r .hash) new_hash=$(nix store prefetch-file --json --hash-type sha256 \ - "https://github.com/posit-dev/positron/releases/download/${new_version}/Positron-${new_version}.dmg" \ + "https://cdn.posit.co/positron/dailies/mac/universal/Positron-${new_version}.dmg" \ | jq -r .hash) sed -i "s|$current_hash|$new_hash|g" $positron_nix # Update Linux hash. current_hash=$(nix store prefetch-file --json --hash-type sha256 \ - "https://github.com/posit-dev/positron/releases/download/${current_version}/Positron-${current_version}-x64.deb" \ + "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${current_version}-x64.deb" \ | jq -r .hash) new_hash=$(nix store prefetch-file --json --hash-type sha256 \ - "https://github.com/posit-dev/positron/releases/download/${new_version}/Positron-${new_version}-x64.deb" \ + "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${new_version}-x64.deb" \ | jq -r .hash) sed -i "s|$current_hash|$new_hash|g" $positron_nix diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix new file mode 100644 index 000000000000..051aea4e141b --- /dev/null +++ b/pkgs/by-name/po/postfix-tlspol/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "postfix-tlspol"; + version = "1.8.10"; + + src = fetchFromGitHub { + owner = "Zuplu"; + repo = "postfix-tlspol"; + tag = "v${version}"; + hash = "sha256-UAAjvu/nWF9Q60n+Fojw/a6CsgY6iI5qjKv2nsBuzvo="; + }; + + vendorHash = null; + + # don't run tests, they perform checks via the network + doCheck = false; + + ldflags = [ "-X main.Version=${version}" ]; + + meta = { + description = "Lightweight MTA-STS + DANE/TLSA resolver and TLS policy server for Postfix, prioritizing DANE."; + homepage = "https://github.com/Zuplu/postfix-tlspol"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ valodim ]; + }; +} diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix index bdac9ee5e202..03f555ec84a3 100644 --- a/pkgs/by-name/po/postfix/package.nix +++ b/pkgs/by-name/po/postfix/package.nix @@ -67,11 +67,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.10.1"; + version = "3.10.2"; src = fetchurl { url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; - hash = "sha256-dYaNt6jtJSzToUwTo844Pd1CVjFgwCAn0GEgLuNnmb8="; + hash = "sha256-vMpWQTLUz1+cnONU2rndNe6OniGQCGRiPIFdrBa/vCc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-lsp/package.nix index 538ba40addef..20d486ca3cd7 100644 --- a/pkgs/by-name/po/postgres-lsp/package.nix +++ b/pkgs/by-name/po/postgres-lsp/package.nix @@ -2,39 +2,46 @@ lib, rustPlatform, fetchFromGitHub, - protobuf, }: - -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "postgres-lsp"; - version = "0-unstable-2024-03-24"; + version = "0.6.0"; src = fetchFromGitHub { - owner = "supabase"; - repo = "postgres_lsp"; - rev = "43ca9b675cb152ca7f38cfa6aff6dd2131dfa9a2"; - hash = "sha256-n7Qbt9fGzC0CcleAtTWDInPz4oaPjI+pvIPrR5EYJ9U="; + owner = "supabase-community"; + repo = "postgres-language-server"; + tag = finalAttrs.version; + hash = "sha256-PL8irQ3R8m//BbtTjODBrBcG/bAdK+t6GZGAj0PkJwE="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-9T3bm/TSjnFeF8iE4338I44espnFq6l36yOq8YFPaPQ="; + cargoHash = "sha256-lUZpjX3HljOXi0Wt2xZCUru8uinWlngLEs5wlqfFiJA="; nativeBuildInputs = [ - protobuf rustPlatform.bindgenHook ]; - cargoBuildFlags = [ "-p=postgres_lsp" ]; - cargoTestFlags = cargoBuildFlags; + env = { + SQLX_OFFLINE = 1; - RUSTC_BOOTSTRAP = 1; # We need rust unstable features - - meta = with lib; { - description = "Language Server for Postgres"; - homepage = "https://github.com/supabase/postgres_lsp"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "postgres_lsp"; + # As specified in the upstream: https://github.com/supabase-community/postgres-language-server/blob/main/.github/workflows/release.yml + RUSTFLAGS = "-C strip=symbols -C codegen-units=1"; + PGT_VERSION = finalAttrs.version; }; -} + + cargoBuildFlags = [ "-p=pgt_cli" ]; + cargoTestFlags = finalAttrs.cargoBuildFlags; + checkFlags = [ + # Tries to write to the file system relatively to the current path + "--skip=syntax_error" + ]; + + meta = { + description = "Tools and language server for Postgres"; + homepage = "https://pgtools.dev"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; + mainProgram = "postgrestools"; + }; +}) diff --git a/pkgs/by-name/po/postgresqlTestHook/postgresql-test-hook.sh b/pkgs/by-name/po/postgresqlTestHook/postgresql-test-hook.sh index d09153b2d644..41762121882b 100644 --- a/pkgs/by-name/po/postgresqlTestHook/postgresql-test-hook.sh +++ b/pkgs/by-name/po/postgresqlTestHook/postgresql-test-hook.sh @@ -1,5 +1,5 @@ -preCheckHooks+=('postgresqlStart') -postCheckHooks+=('postgresqlStop') +preCheckHooks+=(postgresqlStart) +postCheckHooks+=(postgresqlStop) postgresqlStart() { @@ -69,6 +69,7 @@ EOF echo 'starting postgresql' eval "${postgresqlStartCommands:-pg_ctl start}" + failureHooks+=(postgresqlStop) echo 'setting up postgresql' eval "$postgresqlTestSetupCommands" @@ -80,4 +81,5 @@ EOF postgresqlStop() { echo 'stopping postgresql' pg_ctl stop + failureHooks=("${failureHooks[@]/postgresqlStop}") } diff --git a/pkgs/by-name/po/posting/package.nix b/pkgs/by-name/po/posting/package.nix index a46a63d7044e..1d4bc876145d 100644 --- a/pkgs/by-name/po/posting/package.nix +++ b/pkgs/by-name/po/posting/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication rec { pname = "posting"; - version = "2.5.4"; + version = "2.7.0"; pyproject = true; src = fetchFromGitHub { owner = "darrenburns"; repo = "posting"; tag = version; - hash = "sha256-6nFQSGCdmR4qZuleiY0xh76WgBIjs9OZtfpc16b4iws="; + hash = "sha256-FkeQSU/gktCsCFoKAk0igfHj16WpxQG01WyAmBYLwX4="; }; pythonRelaxDeps = true; @@ -23,7 +23,9 @@ python3Packages.buildPythonApplication rec { ]; # Required for x resources themes - buildInputs = [ xorg.xrdb ]; + buildInputs = [ + xorg.xrdb + ]; dependencies = with python3Packages; @@ -41,6 +43,8 @@ python3Packages.buildPythonApplication rec { textual-autocomplete textual openapi-pydantic + tree-sitter-json + tree-sitter-html ] ++ httpx.optional-dependencies.brotli ++ textual.optional-dependencies.syntax; @@ -49,9 +53,12 @@ python3Packages.buildPythonApplication rec { description = "Modern API client that lives in your terminal"; mainProgram = "posting"; homepage = "https://posting.sh/"; - changelog = "https://github.com/darrenburns/posting/releases/tag/${version}"; + changelog = "https://github.com/darrenburns/posting/releases/tag/${src.tag}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ jorikvanveen ]; + maintainers = with lib.maintainers; [ + jorikvanveen + fullmetalsheep + ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/po/postman/darwin.nix b/pkgs/by-name/po/postman/darwin.nix index e14ad072e574..bc7ce9fe2775 100644 --- a/pkgs/by-name/po/postman/darwin.nix +++ b/pkgs/by-name/po/postman/darwin.nix @@ -13,12 +13,12 @@ let { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-tp8qKk06HvSVY1GggOv9VYH+1Ntlirf8Pf2FY0Qhksk="; + sha256 = "sha256-uhhrJk/WtM4tKsrBAn1IjHx0OeR/SpdOzy2XhoUP4sY="; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-8hSxtLGoAcTLmUpr3Il/1wii2MgLqOJ3oAYSSPq7a1o="; + sha256 = "sha256-NYxcZoQYDyn85RkUz57b5yhzpeAK5xyyJF/7L2+3tt4="; }; } .${stdenvNoCC.hostPlatform.system} @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation { cp -R . $out/Applications/${appName} cat > $out/bin/${pname} << EOF #!${stdenvNoCC.shell} - open -na $out/Applications/${appName} --args "$@" + open -na $out/Applications/${appName} --args "\$@" EOF chmod +x $out/bin/${pname} runHook postInstall diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index 4549c027948a..763330f35e03 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -56,12 +56,12 @@ let { aarch64-linux = { arch = "arm64"; - sha256 = "sha256-JKE6riUJXAiCwT0yp5ncoExiRAnFmuefmPkwWmvRjV4="; + sha256 = "sha256-/Qfd/xn+FwYLPSWssP5JFfjMdICz6HDg30edl/Fme5A="; }; x86_64-linux = { arch = "64"; - sha256 = "sha256-w7R4IsWMtW37BwGHBY9UweMR6PaZpkya401ARGeR1wY="; + sha256 = "sha256-BbTYT0GHU+BmWFXG2TU8PL90eTpLcyLgnwSw9YyWT0g="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index d883696aa9da..3415c93e28e8 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -6,7 +6,7 @@ let pname = "postman"; - version = "11.32.2"; + version = "11.44.0"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; diff --git a/pkgs/by-name/po/postsrsd/package.nix b/pkgs/by-name/po/postsrsd/package.nix index f100d56d94cf..b9a653fe35b3 100644 --- a/pkgs/by-name/po/postsrsd/package.nix +++ b/pkgs/by-name/po/postsrsd/package.nix @@ -1,5 +1,6 @@ { lib, + libconfuse, stdenv, fetchFromGitHub, cmake, @@ -8,18 +9,20 @@ stdenv.mkDerivation rec { pname = "postsrsd"; - version = "1.12"; + version = "2.0.10"; src = fetchFromGitHub { owner = "roehling"; repo = "postsrsd"; rev = version; - sha256 = "sha256-aSI9TR1wSyMA0SKkbavk+IugRfW4ZEgpzrNiXn0F5ak="; + sha256 = "sha256-8uy7a3wUGuLE4+6ZPqbFMdPzm6IZqQSvpZzLYAkBxNg="; }; cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" + "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" + "-DINSTALL_SYSTEMD_SERVICE=OFF" ]; preConfigure = '' @@ -31,6 +34,10 @@ stdenv.mkDerivation rec { help2man ]; + buildInputs = [ + libconfuse + ]; + meta = with lib; { homepage = "https://github.com/roehling/postsrsd"; description = "Postfix Sender Rewriting Scheme daemon"; diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index f7eeb8c9f9c6..10098cccb472 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -25,17 +25,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pot"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "pot-app"; repo = "pot-desktop"; tag = finalAttrs.version; - hash = "sha256-PUXZT1kiInM/CXUoRko/5qlrRurGpQ4ym5YMTgFwuxE="; + hash = "sha256-0Q1hf1AGAZv6jt05tV3F6++lzLpddvjhiykIhV40cPs="; }; - sourceRoot = "${finalAttrs.src.name}/src-tauri"; - postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -46,11 +44,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-iYQNGRWqXYBU+WIH/Xm8qndgOQ6RKYCtAyi93kb7xrQ="; }; - pnpmRoot = ".."; + cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - sourceRoot = "${finalAttrs.src.name}/src-tauri"; + inherit (finalAttrs) + pname + version + src + cargoRoot + ; hash = "sha256-dyXINRttgsqCfmgtZNXxr/Rl8Yn0F2AVm8v2Ao+OBsw="; }; @@ -93,12 +96,6 @@ stdenv.mkDerivation (finalAttrs: { } )}"; - preConfigure = '' - # pnpm.configHook has to write to .., as our sourceRoot is set to src-tauri - # TODO: move frontend into its own drv - chmod +w .. - ''; - meta = { description = "Cross-platform translation software"; mainProgram = "pot"; diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix index 1f26e7836301..7dec487e37a2 100644 --- a/pkgs/by-name/po/poutine/package.nix +++ b/pkgs/by-name/po/poutine/package.nix @@ -40,5 +40,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "poutine"; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/po/powerjoular/package.nix b/pkgs/by-name/po/powerjoular/package.nix index 64ecfbfd738d..9cb31c00c8f8 100644 --- a/pkgs/by-name/po/powerjoular/package.nix +++ b/pkgs/by-name/po/powerjoular/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "powerjoular"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "joular"; repo = pname; rev = version; - hash = "sha256-rM6fV2Jw9C1LjMQ1RhV8DJQcUcyQmXtANXWAkO03O18="; + hash = "sha256-fJYcJKbZ6PoTJSfEDEKPOy+CDwDRsaeAn/2BW5r4p7k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/powerpipe/package.nix b/pkgs/by-name/po/powerpipe/package.nix index c7a06dacbfed..8bb44837f8e8 100644 --- a/pkgs/by-name/po/powerpipe/package.nix +++ b/pkgs/by-name/po/powerpipe/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "powerpipe"; - version = "1.2.2"; + version = "1.2.5"; src = fetchFromGitHub { owner = "turbot"; repo = "powerpipe"; tag = "v${version}"; - hash = "sha256-kOC2eS13OzyKGgaQj7BtLxzzjGqncTEFB7HaHPuedUE="; + hash = "sha256-S4NxKxro0K7uplB47CFO0Pm2qz7VvgqHbKxh/6Nd9P4="; }; - vendorHash = "sha256-fSMIsMefRWTX02/S9wCxbqQXN76qYQibU1Xq012HiXs="; + vendorHash = "sha256-5+IapEYAL4p5jhGhqNw00s42e3dE0cXRDVawq8Fqb08="; proxyVendor = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix index 8d1366db9651..e03d277dd3af 100644 --- a/pkgs/by-name/po/powershell/package.nix +++ b/pkgs/by-name/po/powershell/package.nix @@ -10,7 +10,6 @@ libuuid, libunwind, openssl, - darwin, lttng-ust, pam, testers, @@ -32,13 +31,20 @@ let in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.5.0"; + version = "7.5.1"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - sourceRoot = "."; + sourceRoot = "source"; + + unpackPhase = '' + runHook preUnpack + mkdir -p "$sourceRoot" + tar xf $src --directory="$sourceRoot" + runHook postUnpack + ''; strictDeps = true; @@ -59,9 +65,6 @@ stdenv.mkDerivation rec { libunwind openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.Libsystem - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lttng-ust pam @@ -96,19 +99,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-EHv+NRyyMdIv+qwUpgJc/s7ONzW9ff8RZwWJ/V1+49U="; + hash = "sha256-0fAWzM5acQbjYJC/E65xtGEV8lZGWu4Hdgsm5gf00DM="; }; aarch64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; - hash = "sha256-o7ah0UiXl0rqcy2ClwyG3Rf/xXpfxPS/q/4t0nL/bEA="; + hash = "sha256-h5Y93+/2rHJmv/vgIbCK2u0mStSjq5Nqgg5tf0Wp7oo="; }; x86_64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-9LxQACnZggsVxn+IXGWrvuCqlE8wV+XZng+GWMYA/Zs="; + hash = "sha256-SwXo6jVSZhFKmm8/A0yosaKamLGhbKYL2OVLNf+horM="; }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; - hash = "sha256-frsASKOACd5aWdYgoQ8z17pJIKziN5sQSmf6+3nihBs="; + hash = "sha256-u5tff4BgAHNU112pL8ZDDHe6B0z4G/ohVvG6Nz/0d+U="; }; }; tests.version = testers.testVersion { diff --git a/pkgs/by-name/po/powerstat/package.nix b/pkgs/by-name/po/powerstat/package.nix index 8211ec02bb45..33c67eec967c 100644 --- a/pkgs/by-name/po/powerstat/package.nix +++ b/pkgs/by-name/po/powerstat/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.04.04"; + version = "0.04.05"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "powerstat"; rev = "V${version}"; - hash = "sha256-M0DgY70EDGPOyLHVTEgLFJ1k9qoi2hgVV0WryIJeGOI="; + hash = "sha256-KR+Nzm9uRISNuqqnlTwfQP1jvSK4lAy//zdn7M8HPLk="; }; installFlags = [ diff --git a/pkgs/by-name/po/powerstation/package.nix b/pkgs/by-name/po/powerstation/package.nix index d7f3dd5f8952..19e559a16662 100644 --- a/pkgs/by-name/po/powerstation/package.nix +++ b/pkgs/by-name/po/powerstation/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "powerstation"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "PowerStation"; tag = "v${version}"; - hash = "sha256-R6p3zuYWggnOy60iGZ6G23ig1gzezweswAxVrCB+zvU="; + hash = "sha256-2NCUDR85LAWGYrxruHLSipgX41N/jgy/P34qfm+bOb4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3mOmDDDGW7AClG4tNuXti07lCNbK5bMnpWUnsxcxGPI="; + cargoHash = "sha256-4ACSwxGSPEdbGeVL44SN4qCd7ActL1T0xKuebPvTHPk="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix index c909425f7814..70c95e38e69e 100644 --- a/pkgs/by-name/pp/ppsspp/package.nix +++ b/pkgs/by-name/pp/ppsspp/package.nix @@ -9,6 +9,7 @@ libffi, libsForQt5, libzip, + libX11, makeDesktopItem, makeWrapper, pkg-config, @@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 + libX11 glew libzip zlib diff --git a/pkgs/by-name/pq/pq-cli/package.nix b/pkgs/by-name/pq/pq-cli/package.nix index d9e3ee1bc276..225ee762b0d7 100644 --- a/pkgs/by-name/pq/pq-cli/package.nix +++ b/pkgs/by-name/pq/pq-cli/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "pq-cli"; - version = "1.0.2-unstable-2024-07-15"; + version = "1.0.2-unstable-2025-04-10"; pyproject = true; src = fetchFromGitHub { owner = "rr-"; repo = "pq-cli"; - rev = "4122e936c87436552f35ff7972d6e543ba6c837b"; - hash = "sha256-PvHkTjPjOubhl9gfPTF7yNaFgg2GLk8y+PtF09fpaII="; + rev = "7790e52a6d3c0f6fbaf45f581f0fb98f78247af6"; + hash = "sha256-lRvjSOhEAur8dhrtpGb89BMD3o6/E1aJjyp+G4xZDnQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/pr/pr-tracker/package.nix b/pkgs/by-name/pr/pr-tracker/package.nix index 0f96f9dfcdbb..dfee8b6db957 100644 --- a/pkgs/by-name/pr/pr-tracker/package.nix +++ b/pkgs/by-name/pr/pr-tracker/package.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "pr-tracker"; - version = "1.6.0"; + version = "1.7.0"; src = fetchzip { url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz"; - hash = "sha256-O+dtGxVhn3hW+vFQzEt7kQRTnZgc1R938BJ6pAkIW4E="; + hash = "sha256-l+bji9uJp8n4//wbbbu8vd3rDICr/XEpDs1ukHxQMcA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4RCgu6t8qbOfTpl3rX35f/fqyMWGBbsnw1TYhhLnxZ4="; + cargoHash = "sha256-D8O1lFoTJOQmFsjql4qIZqA5+iCnESydDDBJiDpBnzs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index 8c3b9aca06e6..5bee2ddd0c3e 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -197,6 +197,11 @@ buildPythonApplication rec { "pre_commit" ]; + # add gitMinimal as fallback, if git is not installed + preFixup = '' + makeWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gitMinimal ]}) + ''; + passthru.tests = callPackage ./tests.nix { inherit gitMinimal pre-commit; }; diff --git a/pkgs/by-name/pr/prefect/package.nix b/pkgs/by-name/pr/prefect/package.nix index 5b6e43f81cd6..7d566da9aea9 100644 --- a/pkgs/by-name/pr/prefect/package.nix +++ b/pkgs/by-name/pr/prefect/package.nix @@ -3,11 +3,12 @@ python3Packages, fetchPypi, nixosTests, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "prefect"; - version = "3.2.14"; + version = "3.4.2"; pyproject = true; # Trying to install from source is challenging @@ -16,7 +17,7 @@ python3Packages.buildPythonApplication rec { # Source will be missing sdist, uv.lock, ui artefacts ... src = fetchPypi { inherit pname version; - hash = "sha256-DmPpiilxKp8uakcRJGaP1AD4AuOre1okk5h7bb5T2tE="; + hash = "sha256-BORFXIikiX5Cu1rT8jUijkjAnncTACr8lEs/k2fC5Mk="; }; pythonRelaxDeps = [ @@ -163,6 +164,14 @@ python3Packages.buildPythonApplication rec { passthru.tests = { inherit (nixosTests) prefect; + + updateScript = nix-update-script { + extraArgs = [ + # avoid pre‐releases + "--version-regex" + "^(\\d+\\.\\d+\\.\\d+)$" + ]; + }; }; # Tests are not included in the pypi source diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index 84765cad4394..04aaa97736bf 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "presenterm"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; tag = "v${finalAttrs.version}"; - hash = "sha256-2k1YCzRoXt5Nmn+HH2qkdpP3S3+PJ5OVSVx29nYSdF8="; + hash = "sha256-vBEHk0gQe4kUTtH4qtc0jVfDvYGabnkJrwPxmxt10hs="; }; buildInputs = [ @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; useFetchCargoVendor = true; - cargoHash = "sha256-M9VcwfG6NwUIvOkZKdoh97GVJEivkEmXhlApGQ1Hqds="; + cargoHash = "sha256-u0wOWKAfzi1Fxmx6x2ckrIv/PKgtqKrDiDauD4/BY24="; checkFlags = [ # failed to load .tmpEeeeaQ: No such file or directory (os error 2) diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 33a182458c93..66afbf46c56f 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -37,7 +37,8 @@ let homepage = "https://github.com/pretalx/pretalx"; changelog = "https://docs.pretalx.org/changelog/#${version}"; license = licenses.asl20; - maintainers = with maintainers; [ hexa ] ++ teams.c3d2.members; + maintainers = with maintainers; [ hexa ]; + teams = [ teams.c3d2 ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index f4582f124a83..9c735d4dd548 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -25,16 +25,6 @@ let }; }); - geoip2 = super.geoip2.overridePythonAttrs rec { - version = "5.0.1"; - - src = fetchPypi { - pname = "geoip2"; - inherit version; - hash = "sha256-kK+LbTaH877yUfJwitAXsw1ifRFEwAQOq8TJAXqAfYY="; - }; - }; - stripe = super.stripe.overridePythonAttrs rec { version = "7.9.0"; @@ -46,19 +36,17 @@ let }; pretix-plugin-build = self.callPackage ./plugin-build.nix { }; - - sentry-sdk = super.sentry-sdk_2; }; }; pname = "pretix"; - version = "2025.3.0"; + version = "2025.4.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-D/j1RzKhRvdqMxcHg/NPZSoroN3etzh6/V38XV9W1cs="; + hash = "sha256-K/llv85CWp+V70BiYAR7lT+urGdLbXBhWpCptxUqDrc="; }; npmDeps = buildNpmPackage { @@ -66,7 +54,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-6qjG0p7pLtTd9CBVVzoeUPv6Vdr5se1wuI5qcKJH2Os="; + npmDepsHash = "sha256-FqwgHmIUfcipVbeXmN4uYPHdmnuaSgOQ9LHgKRf16ys="; dontBuild = true; @@ -92,6 +80,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "beautifulsoup4" + "celery" "django-bootstrap3" "django-phonenumber-field" "dnspython" @@ -209,7 +198,6 @@ python.pkgs.buildPythonApplication rec { requests sentry-sdk sepaxml - slimit stripe text-unidecode tlds diff --git a/pkgs/by-name/pr/pretty-php/package.nix b/pkgs/by-name/pr/pretty-php/package.nix index 985a03cc727c..97efb357c8bb 100644 --- a/pkgs/by-name/pr/pretty-php/package.nix +++ b/pkgs/by-name/pr/pretty-php/package.nix @@ -6,16 +6,16 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "pretty-php"; - version = "0.4.92"; + version = "0.4.93"; src = fetchFromGitHub { owner = "lkrms"; repo = "pretty-php"; tag = "v${finalAttrs.version}"; - hash = "sha256-rKL6ViBEJf+GGxWood0DXVF8U7wuz22Z26SEdgDAJww="; + hash = "sha256-5gFTL4hcnEMKrffMpLRfneq5zeMHH50fjpvZcnefJZ8="; }; - vendorHash = "sha256-V1oqMnDJgWujQXJJqyc2cvEvBbFv+KdXjXfb+sxs8/8="; + vendorHash = "sha256-cp6WPlEc3WCW19UqLgrqMv8zE9UrCiTuN+WqTpAsuWE="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix index 3dede06815d3..7e9daf5eb2a3 100644 --- a/pkgs/by-name/pr/previewqt/package.nix +++ b/pkgs/by-name/pr/previewqt/package.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + extra-cmake-modules pkg-config qt6Packages.wrapQtAppsHook ]; @@ -36,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ exiv2 - extra-cmake-modules imagemagick libarchive libdevil diff --git a/pkgs/by-name/pr/primecount/package.nix b/pkgs/by-name/pr/primecount/package.nix index f8a402931699..385f1139883f 100644 --- a/pkgs/by-name/pr/primecount/package.nix +++ b/pkgs/by-name/pr/primecount/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "primecount"; - version = "7.15"; + version = "7.16"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primecount"; rev = "v${finalAttrs.version}"; - hash = "sha256-UE+BEYynZGMBi3hjNX51I9cD/I1bbmfj9bO9r8UwwD0="; + hash = "sha256-wmq2AmpmDNJE7AEbn+sFbmLYR/ewdVQeEyWkmq16U9o="; }; outputs = [ @@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/kimwalisch/primecount/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.bsd2; mainProgram = "primecount"; - inherit (primesieve.meta) maintainers platforms; + inherit (primesieve.meta) teams platforms; }; }) diff --git a/pkgs/by-name/pr/primesieve/package.nix b/pkgs/by-name/pr/primesieve/package.nix index 0b5e643bfbbe..0aeee779743c 100644 --- a/pkgs/by-name/pr/primesieve/package.nix +++ b/pkgs/by-name/pr/primesieve/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "primesieve"; - version = "12.7"; + version = "12.8"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${finalAttrs.version}"; - hash = "sha256-wWxbEu8nBY7LI5Ut1w0b6qMuQ4O/hCV6/dpxcojWepU="; + hash = "sha256-1jy4cfH/z4fwuuonoRHtrKUVNX9mD9A2sBaUTtAUA8M="; }; outputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/kimwalisch/primesieve/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.bsd2; mainProgram = "primesieve"; - maintainers = lib.teams.sage.members; + teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/pr/primus/package.nix b/pkgs/by-name/pr/primus/package.nix new file mode 100644 index 000000000000..cb1a886ea962 --- /dev/null +++ b/pkgs/by-name/pr/primus/package.nix @@ -0,0 +1,46 @@ +# For a 64bit + 32bit system the LD_LIBRARY_PATH must contain both the 32bit and 64bit primus +# libraries. Providing a different primusrun for each architecture will not work as expected. EG: +# Using steam under wine can involve both 32bit and 64bit process. All of which inherit the +# same LD_LIBRARY_PATH. +# Other distributions do the same. +{ + stdenv, + pkgsi686Linux, + lib, + primusLib, + writeScriptBin, + runtimeShell, + primusLib_i686 ? + if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null, + useNvidia ? true, +}: + +let + # We override stdenv in case we need different ABI for libGL + primusLib_ = primusLib.override { inherit stdenv; }; + primusLib_i686_ = primusLib_i686.override { stdenv = pkgsi686Linux.stdenv; }; + + primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; }; + primus_i686 = + if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; }; + ldPath = lib.makeLibraryPath ( + lib.filter (x: x != null) ( + [ + primus + primus.glvnd + ] + ++ lib.optionals (primusLib_i686 != null) [ + primus_i686 + primus_i686.glvnd + ] + ) + ); + +in +writeScriptBin "primusrun" '' + #!${runtimeShell} + export LD_LIBRARY_PATH=${ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH + # https://bugs.launchpad.net/ubuntu/+source/bumblebee/+bug/1758243 + export __GLVND_DISALLOW_PATCHING=1 + exec "$@" +'' diff --git a/pkgs/by-name/pr/primusLib/package.nix b/pkgs/by-name/pr/primusLib/package.nix new file mode 100644 index 000000000000..dfe3c58ce1fa --- /dev/null +++ b/pkgs/by-name/pr/primusLib/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + libX11, + libGL, + linuxPackages, + nvidia_x11 ? linuxPackages.nvidia_x11.override { libsOnly = true; }, + libglvnd, +}: + +let + aPackage = + if nvidia_x11 == null then + libGL + else if nvidia_x11.useGLVND then + libglvnd + else + nvidia_x11; + +in +stdenv.mkDerivation { + pname = "primus-lib"; + version = "unstable-2015-04-28"; + + src = fetchFromGitHub { + owner = "amonakov"; + repo = "primus"; + rev = "d1afbf6fce2778c0751eddf19db9882e04f18bfd"; + sha256 = "118jm57ccawskb8vjq3a9dpa2gh72nxzvx2zk7zknpy0arrdznj1"; + }; + + patches = [ + # Bump buffer size for long library paths. + (fetchpatch { + url = "https://github.com/abbradar/primus/commit/2f429e232581c556df4f4bf210aee8a0c99c60b7.patch"; + sha256 = "1da6ynz7r7x98495i329sf821308j1rpy8prcdraqahz7p4c89nc"; + }) + ]; + + buildInputs = [ + libX11 + libGL + ]; + + makeFlags = [ + "LIBDIR=$(out)/lib" + "PRIMUS_libGLa=${aPackage}/lib/libGL.so" + "PRIMUS_libGLd=${libGL}/lib/libGL.so" + ]; + + installPhase = '' + ln -s $out/lib/libGL.so.1 $out/lib/libGL.so + ''; + + passthru.glvnd = if nvidia_x11 != null && nvidia_x11.useGLVND then nvidia_x11 else null; + + meta = { + description = "Low-overhead client-side GPU offloading"; + homepage = "https://github.com/amonakov/primus"; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/by-name/pr/principia/package.nix b/pkgs/by-name/pr/principia/package.nix index 85edd081024d..6ed8e890eca9 100644 --- a/pkgs/by-name/pr/principia/package.nix +++ b/pkgs/by-name/pr/principia/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "principia"; - version = "2024.07.12"; + version = "2025.04.05"; src = fetchFromGitHub { owner = "Bithack"; repo = "principia"; rev = finalAttrs.version; - hash = "sha256-JZXarRXScn7/0uve3Ul9dxMz0TE3N8E1VR1nasl051Q="; + hash = "sha256-cXtc1E4iJf3//UyzZzhky/NV7zk4959xSwGLHdCeyk0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/prisma-engines/package.nix b/pkgs/by-name/pr/prisma-engines/package.nix index d7156eaa6ba9..86518ccecf5c 100644 --- a/pkgs/by-name/pr/prisma-engines/package.nix +++ b/pkgs/by-name/pr/prisma-engines/package.nix @@ -13,17 +13,17 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "6.3.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-gQLDskabTaNk19BJi9Kv4TiEfVck2QZ7xdhopt5KH6M="; + hash = "sha256-Ty8BqWjZluU6a5xhSAVb2VoTVY91UUj6zoVXMKeLO4o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-GLOGivOH8psE5/M5kYakh9Cab4Xe5Q8isY1c6YDyAB8="; + cargoHash = "sha256-HjDoWa/JE6izUd+hmWVI1Yy3cTBlMcvD9ANsvqAoHBI="; # Use system openssl. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix index 5240f890a1a7..d82d9a8fa5ff 100644 --- a/pkgs/by-name/pr/prisma/package.nix +++ b/pkgs/by-name/pr/prisma/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prisma"; - version = "6.3.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma"; rev = finalAttrs.version; - hash = "sha256-Buu+E0xxjcrPOyEHkQTp7IVS9kymmR1PTegeOXxb2PA="; + hash = "sha256-ts7HvQbbBFzLRr7uamo95rDnJuDHsAu2CE/pKkJwcX4="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-rAEUkk3uWVuUDrSRz6d2Ewr3vi4rzYmO0yLTCl21qZ4="; + hash = "sha256-dhEpn0oaqZqeiRMfcSiaqhud/RsKd6Wm5RR5iyQp1I8="; }; patchPhase = '' diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index ba5602ee52f2..d05ab5abcb56 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -5,7 +5,7 @@ cmake, cmark, extra-cmake-modules, - fetchpatch, + fetchpatch2, gamemode, ghc_filesystem, jdk17, @@ -31,13 +31,13 @@ assert lib.assertMsg ( ) "gamemodeSupport is only available on Linux."; stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "9.2"; + version = "9.4"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; tag = finalAttrs.version; - hash = "sha256-0KDhX8mfh11pyYQS/lB6qlUvRSOcYEbQKgsdQVA+Q3U="; + hash = "sha256-q8ln54nepwbJhC212vGODaafsbOCtdXar7F2NacKWO4="; }; postUnpack = '' @@ -45,6 +45,16 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${libnbtplusplus} source/libraries/libnbtplusplus ''; + patches = [ + # https://github.com/PrismLauncher/PrismLauncher/pull/3622 + # https://github.com/NixOS/nixpkgs/issues/400119 + (fetchpatch2 { + name = "fix-qt6.9-compatibility.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/8bb9b168fb996df9209e1e34be854235eda3d42a.diff"; + hash = "sha256-hOqWBrUrVUhMir2cfc10gu1i8prdNxefTyr7lH6KA2c="; + }) + ]; + nativeBuildInputs = [ cmake ninja @@ -84,15 +94,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/") ]; - patches = [ - # This patch allows Mangohud 0.8 to run correctly with Prism Launcher. - # This should be removed on the next Prism Launcher release. - (fetchpatch { - url = "https://github.com/PrismLauncher/PrismLauncher/commit/3295b0717a8c4805022eccb74fee2304361d8dab.patch"; - hash = "sha256-A7DrmI00dFUNZLoMFDfym7e5rSFg6V4/MjVxAnQwT6E="; - }) - ]; - doCheck = true; dontWrapQtApps = true; diff --git a/pkgs/by-name/pr/pritunl-client/package.nix b/pkgs/by-name/pr/pritunl-client/package.nix index 37ea802f59e2..d4177d008d9b 100644 --- a/pkgs/by-name/pr/pritunl-client/package.nix +++ b/pkgs/by-name/pr/pritunl-client/package.nix @@ -19,12 +19,12 @@ electron, }: let - version = "1.3.4099.99"; + version = "1.3.4220.57"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-bxCGZ2Jm2rPKRH6Uj0JmQ3MQ3zRd6kXjOVeAOHBl1lA="; + sha256 = "sha256-AqolwsGHDxVQMjgQdWz24BmM+uMT/XII1vtDjA3fFcQ="; }; cli = buildGoModule { @@ -45,7 +45,7 @@ let inherit version src; modRoot = "service"; - vendorHash = "sha256-uy8+R4l3e4YAWMxWWbVHhkwxvbOsY5PF7fs1dVyMIAg="; + vendorHash = "sha256-WWvROYvw8JuidZHKOO0xiNcxlyRCZkw9j/eI6C5HJhU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index 99ef721a9216..3b72a79ef788 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs-tools"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "probe-rs"; repo = "probe-rs"; tag = "v${version}"; - hash = "sha256-xtUaGJyzr0uQUb/A+7RmOVVgrXIctr2I9gLPU2/rXso="; + hash = "sha256-CCB7NdLSg3Ve/iBSG7TuTbXKnGsevzhnELA2gN3n2t4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-acGLTbWI0SHspFISWw5Lj+sqn5HE4du5jTC3NS5zzh8="; + cargoHash = "sha256-jBkMUaC8aFCP0N8cbYDEJtJtVbagB+YAHge0IT8xm+c="; buildAndTestSubdir = pname; diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix index e88658dcb0bb..0836348aa050 100644 --- a/pkgs/by-name/pr/process-compose/package.nix +++ b/pkgs/by-name/pr/process-compose/package.nix @@ -10,13 +10,13 @@ let in buildGoModule rec { pname = "process-compose"; - version = "1.46.0"; + version = "1.64.1"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-E7ovd/dNSMxVld7CS4ZjxZxUVDXLuoQR7W4ZZ1cPMP0="; + hash = "sha256-qv/fVfuQD7Nan5Nn1RkwXoGZuPYSRWQaojEn6MCF9BQ="; # 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; @@ -45,7 +45,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-pztub6PsHhF56ks4UFG9u/mGrvKFUZi+7EudpP9DVYE="; + vendorHash = "sha256-NEKHTSLEF8jBSmAnHq/q+kyV8vPz3DTNj4Jquf5rnso="; doCheck = false; diff --git a/pkgs/by-name/pr/process-viewer/package.nix b/pkgs/by-name/pr/process-viewer/package.nix index 4dce0784aca0..06fdc363d711 100644 --- a/pkgs/by-name/pr/process-viewer/package.nix +++ b/pkgs/by-name/pr/process-viewer/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, gtk4, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -22,11 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ gtk4 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Foundation - ]; + buildInputs = [ gtk4 ]; postInstall = '' install -Dm644 assets/fr.guillaume_gomez.ProcessViewer.desktop -t $out/share/applications diff --git a/pkgs/by-name/pr/procmail/package.nix b/pkgs/by-name/pr/procmail/package.nix index f5e2f75bbacd..47f77406421d 100644 --- a/pkgs/by-name/pr/procmail/package.nix +++ b/pkgs/by-name/pr/procmail/package.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { }; patches = [ + # Avoid benchmarking the build machine to determine compilation results + # https://build.opensuse.org/projects/server:mail/packages/procmail/files/reproducible.patch?expand=1 + ./reproducible.patch # Fix clang-16 and gcc-14 build failures: # https://github.com/BuGlessRB/procmail/pull/7 (fetchpatch { diff --git a/pkgs/by-name/pr/procmail/reproducible.patch b/pkgs/by-name/pr/procmail/reproducible.patch new file mode 100644 index 000000000000..7098b1789fb1 --- /dev/null +++ b/pkgs/by-name/pr/procmail/reproducible.patch @@ -0,0 +1,40 @@ +https://bugzilla.opensuse.org/show_bug.cgi?id=1041534 + +Avoid benchmarking the build machine +to determine compilation results + +Index: procmail-3.24/src/autoconf +=================================================================== +--- procmail-3.24.orig/src/autoconf ++++ procmail-3.24/src/autoconf +@@ -951,6 +951,7 @@ void*realloc(),*malloc(); + #endif + int main() + { char*p=malloc(1),*q=0; ++#if 0 + size_t len,last,max=BLKSIZ*64; /* 1M on non-SMALLHEAP systems */ + int count=0; + for(last=len=INITIAL;len<=max+INITIAL;len+=BLKSIZ) +@@ -968,6 +969,7 @@ int main() + { puts("#define INEFFICIENTrealloc"); + exit(1); + } ++#endif + exit(0); + } + HERE +@@ -1248,10 +1250,9 @@ int main(argc,argv)int argc;const char*a + if(!iter) + iter=1; + printf("\ +-/* Your system's strstr() is %.2f times %sER than my C-routine */\n", +- syscnt>=iter?(double)syscnt/iter:(double)iter/syscnt, +- syscnt>=iter?"SLOW":"FAST"); +- if(syscnt>iter+iter/16) /* if at least 1.0625 times slower */ ++/* Your system's strstr() is %sER than my C-routine */\n", ++ "FAST"); ++ if(0) /* always use system strstr to have reproducible binaries */ + printf("\ + #define SLOWstrstr\t\t\t /* using my substitute instead */\n"); + } + diff --git a/pkgs/by-name/pr/procs/package.nix b/pkgs/by-name/pr/procs/package.nix new file mode 100644 index 000000000000..71136f1d5cff --- /dev/null +++ b/pkgs/by-name/pr/procs/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + buildPackages, + fetchFromGitHub, + rustPlatform, + installShellFiles, + libiconv, +}: + +rustPlatform.buildRustPackage rec { + pname = "procs"; + version = "0.14.10"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = "procs"; + rev = "v${version}"; + hash = "sha256-+qY0BG3XNCm5vm5W6VX4a0JWCb4JSat/oK9GLXRis/M="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-/y+9EA3PhyI5iqg2wM0ny41nBDJiKnsjvbmPfCe5RJk="; + + nativeBuildInputs = [ + installShellFiles + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; + + postInstall = '' + for shell in bash fish zsh; do + ${stdenv.hostPlatform.emulator buildPackages} $out/bin/procs --gen-completion $shell + done + installShellCompletion procs.{bash,fish} --zsh _procs + ''; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + meta = with lib; { + description = "Modern replacement for ps written in Rust"; + homepage = "https://github.com/dalance/procs"; + changelog = "https://github.com/dalance/procs/raw/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ + Br1ght0ne + sciencentistguy + ]; + mainProgram = "procs"; + }; +} diff --git a/pkgs/by-name/pr/proftpd/package.nix b/pkgs/by-name/pr/proftpd/package.nix index 741f21f33d47..c9b901b41c41 100644 --- a/pkgs/by-name/pr/proftpd/package.nix +++ b/pkgs/by-name/pr/proftpd/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://www.proftpd.org/"; - maintainers = lib.teams.flyingcircus.members; + teams = [ lib.teams.flyingcircus ]; license = lib.licenses.gpl2Plus; mainProgram = "proftpd"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pr/projectable/package.nix b/pkgs/by-name/pr/projectable/package.nix index 5b27b6ffe9ce..657d2616f4b7 100644 --- a/pkgs/by-name/pr/projectable/package.nix +++ b/pkgs/by-name/pr/projectable/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,15 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/pr/projectlibre/package.nix b/pkgs/by-name/pr/projectlibre/package.nix new file mode 100644 index 000000000000..b1fb70ed9e27 --- /dev/null +++ b/pkgs/by-name/pr/projectlibre/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + fetchgit, + + ant, + jdk, + makeWrapper, + stripJavaArchivesHook, + + coreutils, + jre, + which, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "projectlibre"; + version = "1.9.8"; + + src = fetchgit { + url = "https://git.code.sf.net/p/projectlibre/code"; + rev = "0530be227f4a10c5545cce8d3db20ac5a4d76a66"; # version 1.9.8 was not tagged + hash = "sha256-eGoPtHy1XfPLnJXNDOMcek4spNKkNyZdby0IsZFZfME="; + }; + + nativeBuildInputs = [ + ant + jdk + makeWrapper + stripJavaArchivesHook + ]; + + runtimeDeps = [ + jre + coreutils + which + ]; + + buildPhase = '' + runHook preBuild + ant -f projectlibre_build/build.xml + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{projectlibre/samples,doc/projectlibre} + + pushd projectlibre_build + cp -R dist/* $out/share/projectlibre + cp -R license $out/share/doc/projectlibre + cp -R resources/samples/* $out/share/projectlibre/samples + install -Dm644 resources/projectlibre.desktop -t $out/share/applications + install -Dm644 resources/projectlibre.png -t $out/share/pixmaps + install -Dm755 resources/projectlibre -t $out/bin + popd + + substituteInPlace $out/bin/projectlibre \ + --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre" + + wrapProgram $out/bin/projectlibre \ + --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} + + runHook postInstall + ''; + + meta = { + description = "Project-Management Software similar to MS-Project"; + homepage = "https://www.projectlibre.com/"; + license = lib.licenses.cpal10; + mainProgram = "projectlibre"; + maintainers = with lib.maintainers; [ + Mogria + tomasajt + ]; + platforms = jre.meta.platforms; + }; +}) diff --git a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix index 26d3ce9e1c88..e7d9679e20cc 100644 --- a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix +++ b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, cmake, libprojectm, + libGL, + libX11, poco, utf8proc, SDL2, @@ -43,6 +45,8 @@ stdenv.mkDerivation { libprojectm poco utf8proc + libGL + libX11 SDL2 ]; diff --git a/pkgs/by-name/pr/proksi/package.nix b/pkgs/by-name/pr/proksi/package.nix index f60a31829f2e..5b4b9ad89364 100644 --- a/pkgs/by-name/pr/proksi/package.nix +++ b/pkgs/by-name/pr/proksi/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "proksi"; - version = "0.5.3"; + version = "0.5.3-unstable-2025-05-12"; src = fetchFromGitHub { owner = "luizfonseca"; repo = "proksi"; - tag = "proksi-v${finalAttrs.version}"; - hash = "sha256-zwLF6yL/EqyBtZ+hHXLJRe2UaZyhSzotEFYlpoLXKZ4="; + rev = "da697ae58c515759b710b93ea1d2065a6ae07443"; + hash = "sha256-maoiQc8s+gGC/xqyii/KsYZmF9li8VjyizBqlGq7H0c="; }; postPatch = '' @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-vFZUcHh/gI4fdlM6LcN+6kjweLUnPNYNq6Y+XxWoSl8="; + cargoHash = "sha256-Mmq68jk4EK3J8wnnqznAgcggoFv0iSStlnUwmumRFmQ="; nativeBuildInputs = [ pkg-config @@ -61,11 +61,15 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; doInstallCheck = true; + # remove after updating to the next stable version + preVersionCheck = '' + export version=0.5.3 + ''; passthru.updateScript = nix-update-script { extraArgs = [ - "--version-regex" - "proksi-v(.*)" + "--version=branch" + "--version-regex=proksi-v(.*)" ]; }; diff --git a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix index 02f115756d51..2d8ba68ac1c5 100644 --- a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix @@ -46,7 +46,7 @@ buildGoModule rec { description = "NVIDIA GPU metrics exporter for Prometheus leveraging DCGM"; homepage = "https://github.com/NVIDIA/dcgm-exporter"; license = licenses.asl20; - maintainers = teams.deshaw.members; + teams = [ teams.deshaw ]; mainProgram = "dcgm-exporter"; platforms = platforms.linux; }; diff --git a/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix new file mode 100644 index 000000000000..02d934714c8b --- /dev/null +++ b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix @@ -0,0 +1,82 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, + pkgs, + libbpf, + libelf, + libsystemtap, + libz, +}: + +let + version = "2.4.2"; + tag = "v${version}"; +in +buildGoModule.override + { + stdenv = pkgs.clangStdenv; + } + { + name = "ebpf_exporter"; + + src = fetchFromGitHub { + inherit tag; + owner = "cloudflare"; + repo = "ebpf_exporter"; + hash = "sha256-gXzaMx9Z6LzrlDaQnagQIi183uKhJvdYiolYb8P+MIs="; + }; + + vendorHash = "sha256-GhQvPp8baw2l91OUOg+/lrG27P/D4Uzng8XevJf8Pj4="; + + postPatch = '' + substituteInPlace examples/Makefile \ + --replace-fail "-Wall -Werror" "" + ''; + + buildInputs = [ + libbpf + libelf + libsystemtap + libz + ]; + + CGO_LDFLAGS = "-l bpf"; + + hardeningDisable = [ "zerocallusedregs" ]; + + # Tests fail on trying to access cgroups. + doCheck = false; + + ldflags = [ + "-s" + "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=${tag}" + "-X github.com/prometheus/common/version.Branch=unknown" + "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" + "-X github.com/prometheus/common/version.BuildDate=unknown" + ]; + + postBuild = '' + BUILD_LIBBPF=0 make examples + ''; + + postInstall = '' + mkdir -p $out/examples + mv examples/*.o examples/*.yaml $out/examples + ''; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) ebpf; }; + + meta = { + description = "Prometheus exporter for custom eBPF metrics"; + mainProgram = "ebpf_exporter"; + homepage = "https://github.com/cloudflare/ebpf_exporter"; + changelog = "https://github.com/cloudflare/ebpf_exporter/releases/tag/v${tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jpds ]; + platforms = lib.platforms.linux; + }; + } diff --git a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix index 2390d74441c3..a600ea8b9b29 100644 --- a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix @@ -21,6 +21,6 @@ buildGoModule rec { mainProgram = "elasticsearch_exporter"; homepage = "https://github.com/prometheus-community/elasticsearch_exporter"; license = licenses.asl20; - maintainers = teams.deshaw.members; + teams = [ teams.deshaw ]; }; } diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix index 46069bd5468e..b5b6a17f96d7 100644 --- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix @@ -5,17 +5,17 @@ }: let - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "tynany"; repo = "frr_exporter"; rev = "v${version}"; - hash = "sha256-J847Y2ZxD0JLEv7hYS5EsNBA6052PXO6VVoavFrWVUU="; + hash = "sha256-Dk8YcaUzpM65WlSTJojVZb3IDGIZ7DGWOstRgyA/sYw="; }; in buildGoModule { pname = "prometheus-frr-exporter"; - vendorHash = "sha256-A2lLW19+wtHcNC8Du8HRORVp/JHGjWbEgoadlNmgm80="; + vendorHash = "sha256-T7zurp9Eh1OFuCwyYm3F+cfLi4xdXZyhme9++jxsrzQ="; inherit src version; ldflags = [ diff --git a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix index db41ced6fd45..4015eab336fe 100644 --- a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "prometheus-klipper-exporter"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "scross01"; repo = "prometheus-klipper-exporter"; rev = "v${version}"; - sha256 = "sha256-OlNUBdCizMOSb7WEtu00LaHYSXLSPlISVJD/0rHujnY="; + sha256 = "sha256-zNRjD2YO7OfcNXF5pukXChxhC5LB88C1EKfiMreMzTs="; }; vendorHash = "sha256-0nbLHZ2WMLMK0zKZuUYz355K01Xspn9svmlFCtQjed0="; diff --git a/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix b/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix new file mode 100644 index 000000000000..d9ae5c17902d --- /dev/null +++ b/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: +buildGoModule (finalAttrs: { + pname = "prometheus-modbus-exporter"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "richih"; + repo = "modbus_exporter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZkES+CDthYZrNZ7wVO0oRx6pBMX23AyUOhU+OBTD42g="; + }; + + ldflags = [ + "-s" + "-w" + "-X=github.com/prometheus/common/version.BuildDate=1970-01-01T00:00:00Z" + "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" + "-X github.com/prometheus/common/version.Branch=master" + "-X github.com/prometheus/common/version.Revision=${finalAttrs.src.rev}" + "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" + ]; + + vendorHash = "sha256-RfpJLoYPR5Ura3GvLIAePg+fuiaiXig6XaSNCPhZ/Vg="; + + passthru.updateScript = nix-update-script { }; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + versionCheckProgramArg = "--version"; + + meta = { + changelog = "https://github.com/richih/modbus_exporter/releases/tag/v${finalAttrs.version}"; + homepage = "https://paepcke.de/modbus_exporter"; + description = "Prometheus exporter for the modbus interface. Basepackage for a large group of iot device exporters."; + license = lib.licenses.mit; + mainProgram = "modbus_exporter"; + maintainers = with lib.maintainers; [ paepcke ]; + }; +}) diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index 3d805a9bd28a..d36c608385af 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, nixosTests, - darwin, }: buildGoModule rec { @@ -24,14 +22,6 @@ buildGoModule rec { # FIXME: tests fail due to read-only nix store doCheck = false; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - IOKit - ] - ); - excludedPackages = [ "docs/node-mixin" ]; ldflags = [ diff --git a/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix b/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix index 94ee81b1b357..0a0bf6c21fdc 100644 --- a/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "prometheus-nvidia-gpu-exporter"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "utkuozdemir"; repo = "nvidia_gpu_exporter"; rev = "v${version}"; - hash = "sha256-nBNQqnXomQpEgspC9kmI574Onhkcg7UCXIf7O7XiiH0="; + hash = "sha256-d5/sWgfb4rGfHHeHOunHkm61F6o9L/z0MLh7iRABEYg="; }; - vendorHash = "sha256-ZzZ7MJUxXL+rX7SAHHT+KMHDkCDi5qTeAIkg4bAtMio="; + vendorHash = "sha256-kzjaMLPZrjgdeNSLapp3t+b8Y++Q8Cqj1hkU+GVGm88="; ldflags = [ "-s" diff --git a/pkgs/by-name/pr/prometheus-pushgateway/package.nix b/pkgs/by-name/pr/prometheus-pushgateway/package.nix index 5d71ec9da6f5..4c6b453c5271 100644 --- a/pkgs/by-name/pr/prometheus-pushgateway/package.nix +++ b/pkgs/by-name/pr/prometheus-pushgateway/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "pushgateway"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "pushgateway"; rev = "v${version}"; - sha256 = "sha256-VIqk5GxI5qFnsjeq6FL1UUd7lX3VLLhTcPlo4j8oL/c="; + sha256 = "sha256-qcG7yTJN+HvzX1MB6ImF2umT/HLqohFeUwIc/86G/ec="; }; - vendorHash = "sha256-PXJkjRg699tu/WPrFkekmAbGwPPHoUXaiYfxuju9Dwk="; + vendorHash = "sha256-CUL9jj4Xu3G5+MIVCCY9IW4SxBe3xqaZatxA+0Our2M="; ldflags = [ "-s" diff --git a/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix index 7955ff2ca6f9..6a3547a37f91 100644 --- a/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "smartctl_exporter"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; tag = "v${version}"; - hash = "sha256-0WppsqDl4nKa6s/dyX9zsUzoqAgStDSBWMM0eolTPdk="; + hash = "sha256-9woQgqkPYKMu8p35aeSv3ua1l35BuMzFT4oCVpmyG2E="; }; - vendorHash = "sha256-Sy/lm55NAhYDdVLli5yQpoRVieJU8RJDRFzd4Len6eg="; + vendorHash = "sha256-bDO7EgCjmObNaYHllczDKuFyKTKH0iCFDSLke6VMsHI="; postPatch = '' substituteInPlace main.go README.md \ diff --git a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix new file mode 100644 index 000000000000..8e7913871c85 --- /dev/null +++ b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: +buildGoModule (finalAttrs: { + pname = "prometheus-solaredge-exporter"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "paepckehh"; + repo = "solaredge_exporter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-vo0WaiigwjSEA+wEUs8Wdko+UHq5OXXcVcfgna/QVHE="; + }; + + ldflags = [ + "-s" + "-w" + "-X=github.com/prometheus/common/version.BuildDate=1970-01-01T00:00:00Z" + "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" + "-X github.com/prometheus/common/version.Branch=master" + "-X github.com/prometheus/common/version.Revision=${finalAttrs.src.rev}" + "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" + ]; + + vendorHash = "sha256-ltCjuihbm0/bj2SPkiITTHzYmcQsX12xvt+OpYROivU="; + + passthru.updateScript = nix-update-script { }; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + versionCheckProgramArg = "--version"; + + meta = { + changelog = "https://github.com/paepckehh/solaredge_exporter/releases/tag/v${finalAttrs.version}"; + homepage = "https://paepcke.de/solaredge_exporter"; + description = "Prometheus exporter for solaredge solar inverter local tcp modbus interface"; + license = lib.licenses.mit; + mainProgram = "solaredge_exporter"; + maintainers = with lib.maintainers; [ paepcke ]; + }; +}) diff --git a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix index 9073641c66e1..5e98de190317 100644 --- a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "squid-exporter"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "boynux"; repo = "squid-exporter"; rev = "v${version}"; - hash = "sha256-low1nIL7FbIYfIP7KWPskAQ50Hh+d7JI+ryYoR+mP10="; + hash = "sha256-UH/+YbUiAqgAJ8Xm/6cZg5imFSgA6LHU6+SHseq5IPw="; }; - vendorHash = "sha256-0BNhjNveUDd0+X0do4Md58zJjXe3+KN27MPEviNuF3g="; + vendorHash = "sha256-aY0tW4OH8OHEMF3cLYTAeOd0VItSP0cTCwF4s7wdqTk="; meta = { description = "Squid Prometheus exporter"; diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 0908777635bb..f7985edd5f61 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -31,16 +31,9 @@ enableZookeeper ? true, }: -let - version = "3.1.0"; - webUiStatic = fetchurl { - url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-05DaaDIFtADnkLFqdHe5eUvo6LRz6BduMvGVmzOeurM="; - }; -in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "prometheus"; - inherit version; + version = "3.1.0"; outputs = [ "out" @@ -51,19 +44,24 @@ buildGoModule rec { src = fetchFromGitHub { owner = "prometheus"; repo = "prometheus"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Q3f0L6cRVQRL1AHgUI3VNbMG9eTfcApbXfSjOTHr7Go="; }; vendorHash = "sha256-vQwBnSxoyIYTeWLk3GD9pKDuUjjsMfwPptgyVnzcTok="; + webUiStatic = fetchurl { + url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz"; + hash = "sha256-05DaaDIFtADnkLFqdHe5eUvo6LRz6BduMvGVmzOeurM="; + }; + excludedPackages = [ "documentation/prometheus-mixin" "web/ui/mantine-ui/src/promql/tools" ]; postPatch = '' - tar -C web/ui -xzf ${webUiStatic} + tar -C web/ui -xzf ${finalAttrs.webUiStatic} patchShebangs scripts @@ -109,7 +107,7 @@ buildGoModule rec { [ "-s" "-w" - "-X ${t}.Version=${version}" + "-X ${t}.Version=${finalAttrs.version}" "-X ${t}.Revision=unknown" "-X ${t}.Branch=unknown" "-X ${t}.BuildUser=nix@nixpkgs" @@ -142,4 +140,4 @@ buildGoModule rec { Frostman ]; }; -} +}) diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 6b55f079512e..7c63991f9c62 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, libiconv, makeBinaryWrapper, pkg-config, @@ -11,20 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.47.8"; + version = "0.49.1"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${version}"; - hash = "sha256-RWUm96jn+2SFRteO0tO8Teis6hN9SBHgDID1zIYqOzM="; + hash = "sha256-VtU59YvNqpHvZ1WRj87Heo8RDyCOzleB+odE4DOQYag="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OQLom6k8987QK64YBTDP/YmyGwuaTQmnHcnX0rvntKM="; + cargoHash = "sha256-wPB4YBNzDg9eoVCY4bbbvKu171Qdh7JJZIT9rD5hVdI="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/protobufc/package.nix b/pkgs/by-name/pr/protobufc/package.nix index 7273982206f5..8531f723018e 100644 --- a/pkgs/by-name/pr/protobufc/package.nix +++ b/pkgs/by-name/pr/protobufc/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "protobuf-c"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; tag = "v${version}"; - hash = "sha256-usfONVSq0/V9GRrBx9RwO/hCrVJ8d17mvAgTKpKUssQ="; + hash = "sha256-bpxk2o5rYLFkx532A3PYyhh2MwVH2Dqf3p/bnNpQV7s="; }; outputs = [ diff --git a/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/pkgs/by-name/pr/protoc-gen-elixir/package.nix index 79aef256c7d0..96af826fd59f 100644 --- a/pkgs/by-name/pr/protoc-gen-elixir/package.nix +++ b/pkgs/by-name/pr/protoc-gen-elixir/package.nix @@ -2,37 +2,32 @@ beamPackages, fetchFromGitHub, lib, + nix-update-script, }: -beamPackages.mixRelease rec { +let + inherit (beamPackages) mixRelease fetchMixDeps erlang; +in +mixRelease rec { pname = "protoc-gen-elixir"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "elixir-protobuf"; repo = "protobuf"; tag = "v${version}"; - hash = "sha256-TnuIlXYr36hx1sVktPHj4J4cJLCFK5F1xaX0V9/+ICQ="; + hash = "sha256-SbwjOFTyN3euMNXkuIP49zNqoXmD8611IXgqPwqfuFU="; }; - mixFodDeps = beamPackages.fetchMixDeps { + mixFodDeps = fetchMixDeps { inherit version src; pname = "protoc-gen-elixir-deps"; - hash = "sha256-lFfAfKAM4O+yIBXgdCA+EPe1XAOaTIjTfpOFjITpvQ4="; + hash = "sha256-T1uL3xXXmCkobJJhS3p6xMrJUyiim3AMwaG87/Ix7A8="; }; - postBuild = '' - mix do escript.build - ''; + escriptBinName = "protoc-gen-elixir"; - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp protoc-gen-elixir $out/bin - - runHook postInstall - ''; + passthru.updateScript = nix-update-script { }; meta = { description = "A protoc plugin to generate Elixir code"; diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix index 240c5b833b43..bffd37a9b187 100644 --- a/pkgs/by-name/pr/protoc-gen-es/package.nix +++ b/pkgs/by-name/pr/protoc-gen-es/package.nix @@ -7,20 +7,20 @@ buildNpmPackage rec { pname = "protoc-gen-es"; - version = "2.2.3"; + version = "2.2.5"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protobuf-es"; tag = "v${version}"; - hash = "sha256-ECTra+uT5yEdTbi9kyrdseZQmcctPzCkDIkjX54Zc5Y="; + hash = "sha256-7g7DZSSFyidgpWJQNuKQRpyDuCDQT6gGgIKNk1JsbEk="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-a6kc0FkmDH71XH7GbEo7lWBC0HrXu8+WdS0b922RV0M="; + npmDepsHash = "sha256-NclrKsBBHlcYIgWf0bEq7xI3pUq2RvZ+0Ebj77ICars="; npmWorkspace = "packages/protoc-gen-es"; diff --git a/pkgs/by-name/pr/protolint/package.nix b/pkgs/by-name/pr/protolint/package.nix index 8dac80a2bb93..a9d3dbd0eeca 100644 --- a/pkgs/by-name/pr/protolint/package.nix +++ b/pkgs/by-name/pr/protolint/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "protolint"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "yoheimuta"; repo = pname; rev = "v${version}"; - hash = "sha256-3/eoVrt/Ic2LLLbexXG3ng/uR60JbmKheSxa2PiMnvg="; + hash = "sha256-TVDF9q/lZAVs/a/czQZoxTRFtqae6ySpv80m9XlNpBE="; }; - vendorHash = "sha256-TSbISfXBSxc9VQOGV7Chn1CPxhudRG5y2KxCgi01tKw="; + vendorHash = "sha256-FRCLa8kpJlmnyp+kczgSUx0USMWtR9Hj09HIE2nGY8k="; # Something about the way we run tests causes issues. It doesn't happen # when using "go test" directly: diff --git a/pkgs/by-name/pr/protols/package.nix b/pkgs/by-name/pr/protols/package.nix index 3b8665624043..dd75421810dc 100644 --- a/pkgs/by-name/pr/protols/package.nix +++ b/pkgs/by-name/pr/protols/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "protols"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "coder3101"; repo = "protols"; tag = version; - hash = "sha256-A2fa1rZvxVpJ6X0s0wTDROarGX5Fxp6zKK9cWiag7TQ="; + hash = "sha256-v4ROQVoJmrukHFrxykr6EuBFXRuaBnPZ7f36ly7rPhg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Pvz15q9yGqcJecOvDWXQQCEDXuSEJbJyZ8Arj8Xbyh4="; + cargoHash = "sha256-fmsPkXwu8qy+SRyP5w940gqNmXg0V/p/vDSI7EIFrh0="; meta = { description = "Protocol Buffers language server written in Rust"; diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 6487a7fd972a..3a24fa2ae7dd 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-27"; + version = "GE-Proton10-3"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-70au1dx9co3X+X7xkBCDGf1BxEouuw3zN+7eDyT7i5c="; + hash = "sha256-V4znOni53KMZ0rs7O7TuBst5kDSaEOyWUGgL7EESVAU="; }; dontUnpack = true; @@ -70,6 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/GloriousEggroll/proton-ge-custom"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ + Gliczy NotAShelf Scrumplex shawn8901 diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 6cee601d5b52..3bfe5d14d269 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.29.8"; + version = "1.31.2"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-xwXIcoBPhANKiTv7DP+gmVeCtuzjymtQmHu+HuRKqjU="; + hash = "sha256-o6BNweQQzis2OnaLQj9A1gHs8zPo2rF75msnTGrBfc0="; }; dontConfigure = true; diff --git a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix deleted file mode 100644 index c9a25a988dcd..000000000000 --- a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - python3, -}: - -rustPlatform.buildRustPackage rec { - pname = "proton-vpn-local-agent"; - version = "1.4.4"; - useFetchCargoVendor = true; - cargoHash = "sha256-i/qJwN8693MRaWTcvGGcWMCqclyOOIb/wlqiUilOhzQ="; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-local-agent"; - rev = version; - hash = "sha256-9dyyLZZEOB2080KxN0ffdkRhyvEY8xKE/7b2mA7JL+o="; - }; - - sourceRoot = "${src.name}/python-proton-vpn-local-agent"; - - installPhase = '' - # manually install the python binding - mkdir -p $out/${python3.sitePackages}/proton/vpn/ - cp ./target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/libpython_proton_vpn_local_agent.so $out/${python3.sitePackages}/proton/vpn/local_agent.so - ''; - - meta = { - description = "Proton VPN local agent written in Rust with Python bindings"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-local-agent"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix index 3d159ffb6459..d8d87b4909b2 100644 --- a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { find . -type f -name "CMakeLists.txt" -exec sed -i "/BridgeSetup\\.cmake/d" {} \; # Use the available ICU version - sed -i "s/libicu\(i18n\|uc\|data\)\.so\.56/libicu\1.so/g" bridge-gui/DeployLinux.cmake + sed -i "s/libicu\(i18n\|uc\|data\)\.so\.[0-9][0-9]/libicu\1.so/g" bridge-gui/DeployLinux.cmake # Create a Desktop Entry that uses a `protonmail-bridge-gui` binary without upstream's launcher sed "s/^\(Icon\|Exec\)=.*$/\1=protonmail-bridge-gui/" ../../../dist/proton-bridge.desktop > proton-bridge-gui.desktop diff --git a/pkgs/by-name/pr/protonmail-bridge/package.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix index 80842c582a8d..a3048d79f695 100644 --- a/pkgs/by-name/pr/protonmail-bridge/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.18.0"; + version = "3.20.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-qLxIXAGa1nqLOroz5VYWktznId+vfOPvHpUT/oVPD8M="; + hash = "sha256-Vd7r3devsWGyqFLAoNzUT0hu9oWcDA9XPTTgSUfr17c="; }; - vendorHash = "sha256-S08Vw/dLLVd6zFWmpG8wDVf7LOdSC29qo7pUscYHDyY="; + vendorHash = "sha256-KXq2KIVHCaY/b1nT+GMBY8pT4GLl9l6sT2RiNIH/6Wo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pr/protonup-qt/package.nix b/pkgs/by-name/pr/protonup-qt/package.nix new file mode 100644 index 000000000000..2034a0f939af --- /dev/null +++ b/pkgs/by-name/pr/protonup-qt/package.nix @@ -0,0 +1,45 @@ +{ + lib, + appimageTools, + fetchurl, + makeWrapper, +}: + +appimageTools.wrapAppImage rec { + pname = "protonup-qt"; + version = "2.12.0"; + + src = appimageTools.extractType2 { + inherit pname version; + src = fetchurl { + url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; + hash = "sha256-8MeHSy3XW1oXAD2xrDSIB0ZLJxtk5UBIMpDRTPF9ksU="; + }; + }; + + nativeBuildInputs = [ makeWrapper ]; + + extraInstallCommands = '' + install -Dm644 ${src}/net.davidotek.pupgui2.desktop $out/share/applications/protonup-qt.desktop + install -Dm644 ${src}/net.davidotek.pupgui2.png $out/share/pixmaps/protonup-qt.png + substituteInPlace $out/share/applications/protonup-qt.desktop \ + --replace-fail "Exec=net.davidotek.pupgui2" "Exec=protonup-qt" \ + --replace-fail "Icon=net.davidotek.pupgui2" "Icon=protonup-qt" + wrapProgram $out/bin/protonup-qt \ + --unset QT_PLUGIN_PATH \ + --unset QML2_IMPORT_PATH + ''; + + extraPkgs = pkgs: with pkgs; [ zstd ]; + + meta = { + homepage = "https://davidotek.github.io/protonup-qt/"; + description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface"; + license = lib.licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "protonup-qt"; + changelog = "https://github.com/DavidoTek/ProtonUp-Qt/releases/tag/v${version}"; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ michaelBelsanti ]; + }; +} diff --git a/pkgs/by-name/pr/protozero/package.nix b/pkgs/by-name/pr/protozero/package.nix index 780c12af4352..9960890cfe29 100644 --- a/pkgs/by-name/pr/protozero/package.nix +++ b/pkgs/by-name/pr/protozero/package.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { "https://github.com/mapbox/protozero/releases/tag/v${finalAttrs.version}" "https://github.com/mapbox/protozero/blob/v${finalAttrs.version}/CHANGELOG.md" ]; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ das-g ]); + maintainers = with lib.maintainers; [ das-g ]; + teams = [ lib.teams.geospatial ]; }; }) diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix index 6fc633cee1f5..85180da593bf 100644 --- a/pkgs/by-name/pr/prowlarr/package.nix +++ b/pkgs/by-name/pr/prowlarr/package.nix @@ -37,16 +37,16 @@ let hash = { - aarch64-darwin = "sha256-5wuBChkTOljCPPRsQw6KRKbpqjW5GwJWWw8EBDVsIw0="; - aarch64-linux = "sha256-4bqK+fEkYk9LK3suWgqoSzf9vKtPpbYGuEL62M/KHR4="; - x86_64-darwin = "sha256-azG6bG7zwzZ/VU5TfjS7w3OecRb4ovgAbjlAcIyGBCM="; - x86_64-linux = "sha256-bHdI+eVBQAPQAceP2zDnxj9uh/z5aA84W1leFO5Fw0w="; + aarch64-darwin = "sha256-zHaYgR9UXKnyikt5z3UUmh6oTNoNv5mqtnAId9kCzgE="; + aarch64-linux = "sha256-xChYbzs4zTWe71xwn3TfUZHGTOHHjzDwbkzPgQEfQZk="; + x86_64-darwin = "sha256-mual72UuFh9h7Hc/hHqSUeFInwm09f+UptX8jqknXlg="; + x86_64-linux = "sha256-UCiHeg46ncRQA6rDW4uxoFRqC7cuwMdr33OrN7yj51o="; } .${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.32.2.4987"; + version = "1.35.1.5034"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 4f33d93ee670..fd3e9f85a90b 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -4,23 +4,38 @@ fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +let + py = python3.override { + packageOverrides = self: super: { + + # Doesn't work with latest pydantic + py-ocsf-models = super.py-ocsf-models.overridePythonAttrs (oldAttrs: rec { + dependencies = [ + python3.pkgs.pydantic_1 + python3.pkgs.cryptography + python3.pkgs.email-validator + ]; + }); + }; + }; +in +py.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "5.4.2"; + version = "5.6.0"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; tag = version; - hash = "sha256-VT28O67s69pzmy3e6F3teRKzsPFnRT1Z2b3ngjQg5Og="; + hash = "sha256-+AZEeWvkG8abC44WmVjDzZ9BT+MrLp5+iLDOMmN0aN4="; }; pythonRelaxDeps = true; - build-system = with python3.pkgs; [ poetry-core ]; + build-system = with py.pkgs; [ poetry-core ]; - dependencies = with python3.pkgs; [ + dependencies = with py.pkgs; [ alive-progress awsipranges azure-identity @@ -59,7 +74,7 @@ python3.pkgs.buildPythonApplication rec { numpy pandas py-ocsf-models - pydantic + pydantic_1 python-dateutil pytz schema diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock index df8651a1334d..79825deab4ba 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "adler2" @@ -15,7 +15,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -71,19 +71,20 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" [[package]] name = "autocfg" @@ -99,15 +100,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" [[package]] name = "block-buffer" @@ -129,9 +124,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.1" +version = "1.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c" dependencies = [ "shlex", ] @@ -144,9 +139,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.21" +version = "4.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" dependencies = [ "clap_builder", "clap_derive", @@ -154,9 +149,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.21" +version = "4.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" dependencies = [ "anstream", "anstyle", @@ -166,9 +161,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ "heck", "proc-macro2", @@ -178,9 +173,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" @@ -190,9 +185,9 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "compact_str" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" +checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32" dependencies = [ "castaway", "cfg-if", @@ -220,9 +215,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -238,18 +233,18 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crossterm" @@ -257,11 +252,11 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ - "bitflags 2.6.0", + "bitflags", "crossterm_winapi", "mio", "parking_lot", - "rustix", + "rustix 0.38.44", "signal-hook", "signal-hook-mio", "winapi", @@ -339,9 +334,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ "darling_core", "darling_macro", @@ -349,9 +344,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ "fnv", "ident_case", @@ -362,9 +357,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", @@ -373,13 +368,19 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" version = "0.10.7" @@ -444,31 +445,31 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" dependencies = [ "crc32fast", "miniz_oxide", @@ -522,14 +523,26 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", ] [[package]] name = "glob" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "hashbrown" @@ -543,12 +556,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] name = "hex" version = "0.4.3" @@ -596,9 +603,9 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" +checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" [[package]] name = "icu_normalizer" @@ -620,9 +627,9 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" +checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" [[package]] name = "icu_properties" @@ -641,9 +648,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" [[package]] name = "icu_provider" @@ -702,9 +709,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", "hashbrown", @@ -718,9 +725,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itoa" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "lazy_static" @@ -730,21 +737,27 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" +checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" [[package]] name = "lock_api" @@ -758,9 +771,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "memchr" @@ -768,42 +781,32 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi", "libc", "log", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" dependencies = [ "libc", "log", @@ -816,19 +819,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", - "pin-utils", -] - [[package]] name = "num" version = "0.4.3" @@ -907,17 +897,17 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" dependencies = [ - "bitflags 2.6.0", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -939,15 +929,15 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.104" +version = "0.9.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" dependencies = [ "cc", "libc", @@ -984,17 +974,11 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[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.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "powerfmt" @@ -1003,17 +987,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] -name = "proc-macro2" -version = "1.0.92" +name = "pretty_assertions" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" +dependencies = [ + "diff", + "yansi", +] + +[[package]] +name = "proc-macro2" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ "unicode-ident", ] [[package]] name = "proxmox-auto-install-assistant" -version = "8.3.3" +version = "8.4.6" dependencies = [ "anyhow", "clap", @@ -1029,12 +1023,13 @@ dependencies = [ [[package]] name = "proxmox-auto-installer" -version = "0.1.0" +version = "8.4.6" dependencies = [ "anyhow", "clap", "glob", "log", + "pretty_assertions", "proxmox-installer-common", "serde", "serde_json", @@ -1044,11 +1039,10 @@ dependencies = [ [[package]] name = "proxmox-chroot" -version = "0.1.0" +version = "8.4.6" dependencies = [ "anyhow", "clap", - "nix", "proxmox-installer-common", "regex", "serde_json", @@ -1056,7 +1050,7 @@ dependencies = [ [[package]] name = "proxmox-fetch-answer" -version = "0.1.0" +version = "8.4.6" dependencies = [ "anyhow", "log", @@ -1069,11 +1063,12 @@ dependencies = [ [[package]] name = "proxmox-installer-common" -version = "0.1.0" +version = "8.4.6" dependencies = [ "anyhow", "hex", "native-tls", + "pretty_assertions", "regex", "rustls", "rustls-native-certs", @@ -1086,7 +1081,7 @@ dependencies = [ [[package]] name = "proxmox-post-hook" -version = "0.1.0" +version = "8.4.6" dependencies = [ "anyhow", "proxmox-auto-installer", @@ -1097,7 +1092,7 @@ dependencies = [ [[package]] name = "proxmox-tui-installer" -version = "0.1.0" +version = "8.4.6" dependencies = [ "cursive", "proxmox-installer-common", @@ -1108,20 +1103,26 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] [[package]] -name = "redox_syscall" -version = "0.5.7" +name = "r-efi" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[package]] +name = "redox_syscall" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" dependencies = [ - "bitflags 2.6.0", + "bitflags", ] [[package]] @@ -1155,30 +1156,42 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "ring" -version = "0.17.8" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", - "spin", "untrusted", "windows-sys 0.52.0", ] [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.6.0", + "bitflags", "errno", "libc", - "linux-raw-sys", - "windows-sys 0.52.0", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys 0.9.4", + "windows-sys 0.59.0", ] [[package]] @@ -1226,15 +1239,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "schannel" @@ -1267,7 +1280,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -1276,9 +1289,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -1286,18 +1299,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.215" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -1306,9 +1319,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -1383,15 +1396,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "stable_deref_trait" @@ -1413,9 +1420,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.89" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -1435,22 +1442,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.14.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" dependencies = [ - "cfg-if", "fastrand", + "getrandom 0.3.2", "once_cell", - "rustix", + "rustix 1.0.5", "windows-sys 0.59.0", ] [[package]] name = "time" -version = "0.3.36" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "itoa", @@ -1465,15 +1472,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" dependencies = [ "num-conv", "time-core", @@ -1491,9 +1498,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" dependencies = [ "serde", "serde_spanned", @@ -1512,9 +1519,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ "indexmap", "serde", @@ -1525,15 +1532,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-segmentation" @@ -1618,6 +1625,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "webpki-roots" version = "0.25.4" @@ -1730,13 +1746,22 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.20" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + [[package]] name = "write16" version = "1.0.0" @@ -1755,6 +1780,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + [[package]] name = "yoke" version = "0.7.5" @@ -1801,18 +1832,18 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/locale-info.json b/pkgs/by-name/pr/proxmox-auto-install-assistant/locale-info.json new file mode 100644 index 000000000000..dc371827ddba --- /dev/null +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/locale-info.json @@ -0,0 +1,2 @@ +{"cczones":{"ad":{"Europe/Andorra":1},"ae":{"Asia/Dubai":1},"af":{"Asia/Kabul":1},"ag":{"America/Antigua":1},"ai":{"America/Anguilla":1},"al":{"Europe/Tirane":1},"am":{"Asia/Yerevan":1},"ao":{"Africa/Luanda":1},"aq":{"Antarctica/Casey":1,"Antarctica/Davis":1,"Antarctica/DumontDUrville":1,"Antarctica/Mawson":1,"Antarctica/McMurdo":1,"Antarctica/Palmer":1,"Antarctica/Rothera":1,"Antarctica/Syowa":1,"Antarctica/Troll":1,"Antarctica/Vostok":1},"ar":{"America/Argentina/Buenos_Aires":1,"America/Argentina/Catamarca":1,"America/Argentina/Cordoba":1,"America/Argentina/Jujuy":1,"America/Argentina/La_Rioja":1,"America/Argentina/Mendoza":1,"America/Argentina/Rio_Gallegos":1,"America/Argentina/Salta":1,"America/Argentina/San_Juan":1,"America/Argentina/San_Luis":1,"America/Argentina/Tucuman":1,"America/Argentina/Ushuaia":1},"as":{"Pacific/Pago_Pago":1},"at":{"Europe/Vienna":1},"au":{"Antarctica/Macquarie":1,"Australia/Adelaide":1,"Australia/Brisbane":1,"Australia/Broken_Hill":1,"Australia/Darwin":1,"Australia/Eucla":1,"Australia/Hobart":1,"Australia/Lindeman":1,"Australia/Lord_Howe":1,"Australia/Melbourne":1,"Australia/Perth":1,"Australia/Sydney":1},"aw":{"America/Aruba":1},"ax":{"Europe/Mariehamn":1},"az":{"Asia/Baku":1},"ba":{"Europe/Sarajevo":1},"bb":{"America/Barbados":1},"bd":{"Asia/Dhaka":1},"be":{"Europe/Brussels":1},"bf":{"Africa/Ouagadougou":1},"bg":{"Europe/Sofia":1},"bh":{"Asia/Bahrain":1},"bi":{"Africa/Bujumbura":1},"bj":{"Africa/Porto-Novo":1},"bl":{"America/St_Barthelemy":1},"bm":{"Atlantic/Bermuda":1},"bn":{"Asia/Brunei":1},"bo":{"America/La_Paz":1},"bq":{"America/Kralendijk":1},"br":{"America/Araguaina":1,"America/Bahia":1,"America/Belem":1,"America/Boa_Vista":1,"America/Campo_Grande":1,"America/Cuiaba":1,"America/Eirunepe":1,"America/Fortaleza":1,"America/Maceio":1,"America/Manaus":1,"America/Noronha":1,"America/Porto_Velho":1,"America/Recife":1,"America/Rio_Branco":1,"America/Santarem":1,"America/Sao_Paulo":1},"bs":{"America/Nassau":1},"bt":{"Asia/Thimphu":1},"bw":{"Africa/Gaborone":1},"by":{"Europe/Minsk":1},"bz":{"America/Belize":1},"ca":{"America/Atikokan":1,"America/Blanc-Sablon":1,"America/Cambridge_Bay":1,"America/Creston":1,"America/Dawson":1,"America/Dawson_Creek":1,"America/Edmonton":1,"America/Fort_Nelson":1,"America/Glace_Bay":1,"America/Goose_Bay":1,"America/Halifax":1,"America/Inuvik":1,"America/Iqaluit":1,"America/Moncton":1,"America/Rankin_Inlet":1,"America/Regina":1,"America/Resolute":1,"America/St_Johns":1,"America/Swift_Current":1,"America/Toronto":1,"America/Vancouver":1,"America/Whitehorse":1,"America/Winnipeg":1},"cc":{"Indian/Cocos":1},"cd":{"Africa/Kinshasa":1,"Africa/Lubumbashi":1},"cf":{"Africa/Bangui":1},"cg":{"Africa/Brazzaville":1},"ch":{"Europe/Zurich":1},"ci":{"Africa/Abidjan":1},"ck":{"Pacific/Rarotonga":1},"cl":{"America/Punta_Arenas":1,"America/Santiago":1,"Pacific/Easter":1},"cm":{"Africa/Douala":1},"cn":{"Asia/Shanghai":1,"Asia/Urumqi":1},"co":{"America/Bogota":1},"cr":{"America/Costa_Rica":1},"cu":{"America/Havana":1},"cv":{"Atlantic/Cape_Verde":1},"cw":{"America/Curacao":1},"cx":{"Indian/Christmas":1},"cy":{"Asia/Famagusta":1,"Asia/Nicosia":1},"cz":{"Europe/Prague":1},"de":{"Europe/Berlin":1,"Europe/Busingen":1},"dj":{"Africa/Djibouti":1},"dk":{"Europe/Copenhagen":1},"dm":{"America/Dominica":1},"do":{"America/Santo_Domingo":1},"dz":{"Africa/Algiers":1},"ec":{"America/Guayaquil":1,"Pacific/Galapagos":1},"ee":{"Europe/Tallinn":1},"eg":{"Africa/Cairo":1},"eh":{"Africa/El_Aaiun":1},"er":{"Africa/Asmara":1},"es":{"Africa/Ceuta":1,"Atlantic/Canary":1,"Europe/Madrid":1},"et":{"Africa/Addis_Ababa":1},"fi":{"Europe/Helsinki":1},"fj":{"Pacific/Fiji":1},"fk":{"Atlantic/Stanley":1},"fm":{"Pacific/Chuuk":1,"Pacific/Kosrae":1,"Pacific/Pohnpei":1},"fo":{"Atlantic/Faroe":1},"fr":{"Europe/Paris":1},"ga":{"Africa/Libreville":1},"gb":{"Europe/London":1},"gd":{"America/Grenada":1},"ge":{"Asia/Tbilisi":1},"gf":{"America/Cayenne":1},"gg":{"Europe/Guernsey":1},"gh":{"Africa/Accra":1},"gi":{"Europe/Gibraltar":1},"gl":{"America/Danmarkshavn":1,"America/Nuuk":1,"America/Scoresbysund":1,"America/Thule":1},"gm":{"Africa/Banjul":1},"gn":{"Africa/Conakry":1},"gp":{"America/Guadeloupe":1},"gq":{"Africa/Malabo":1},"gr":{"Europe/Athens":1},"gs":{"Atlantic/South_Georgia":1},"gt":{"America/Guatemala":1},"gu":{"Pacific/Guam":1},"gw":{"Africa/Bissau":1},"gy":{"America/Guyana":1},"hk":{"Asia/Hong_Kong":1},"hn":{"America/Tegucigalpa":1},"hr":{"Europe/Zagreb":1},"ht":{"America/Port-au-Prince":1},"hu":{"Europe/Budapest":1},"id":{"Asia/Jakarta":1,"Asia/Jayapura":1,"Asia/Makassar":1,"Asia/Pontianak":1},"ie":{"Europe/Dublin":1},"il":{"Asia/Jerusalem":1},"im":{"Europe/Isle_of_Man":1},"in":{"Asia/Kolkata":1},"io":{"Indian/Chagos":1},"iq":{"Asia/Baghdad":1},"ir":{"Asia/Tehran":1},"is":{"Atlantic/Reykjavik":1},"it":{"Europe/Rome":1},"je":{"Europe/Jersey":1},"jm":{"America/Jamaica":1},"jo":{"Asia/Amman":1},"jp":{"Asia/Tokyo":1},"ke":{"Africa/Nairobi":1},"kg":{"Asia/Bishkek":1},"kh":{"Asia/Phnom_Penh":1},"ki":{"Pacific/Kanton":1,"Pacific/Kiritimati":1,"Pacific/Tarawa":1},"km":{"Indian/Comoro":1},"kn":{"America/St_Kitts":1},"kp":{"Asia/Pyongyang":1},"kr":{"Asia/Seoul":1},"kw":{"Asia/Kuwait":1},"ky":{"America/Cayman":1},"kz":{"Asia/Almaty":1,"Asia/Aqtau":1,"Asia/Aqtobe":1,"Asia/Atyrau":1,"Asia/Oral":1,"Asia/Qostanay":1,"Asia/Qyzylorda":1},"la":{"Asia/Vientiane":1},"lb":{"Asia/Beirut":1},"lc":{"America/St_Lucia":1},"li":{"Europe/Vaduz":1},"lk":{"Asia/Colombo":1},"lr":{"Africa/Monrovia":1},"ls":{"Africa/Maseru":1},"lt":{"Europe/Vilnius":1},"lu":{"Europe/Luxembourg":1},"lv":{"Europe/Riga":1},"ly":{"Africa/Tripoli":1},"ma":{"Africa/Casablanca":1},"mc":{"Europe/Monaco":1},"md":{"Europe/Chisinau":1},"me":{"Europe/Podgorica":1},"mf":{"America/Marigot":1},"mg":{"Indian/Antananarivo":1},"mh":{"Pacific/Kwajalein":1,"Pacific/Majuro":1},"mk":{"Europe/Skopje":1},"ml":{"Africa/Bamako":1},"mm":{"Asia/Yangon":1},"mn":{"Asia/Choibalsan":1,"Asia/Hovd":1,"Asia/Ulaanbaatar":1},"mo":{"Asia/Macau":1},"mp":{"Pacific/Saipan":1},"mq":{"America/Martinique":1},"mr":{"Africa/Nouakchott":1},"ms":{"America/Montserrat":1},"mt":{"Europe/Malta":1},"mu":{"Indian/Mauritius":1},"mv":{"Indian/Maldives":1},"mw":{"Africa/Blantyre":1},"mx":{"America/Bahia_Banderas":1,"America/Cancun":1,"America/Chihuahua":1,"America/Ciudad_Juarez":1,"America/Hermosillo":1,"America/Matamoros":1,"America/Mazatlan":1,"America/Merida":1,"America/Mexico_City":1,"America/Monterrey":1,"America/Ojinaga":1,"America/Tijuana":1},"my":{"Asia/Kuala_Lumpur":1,"Asia/Kuching":1},"mz":{"Africa/Maputo":1},"na":{"Africa/Windhoek":1},"nc":{"Pacific/Noumea":1},"ne":{"Africa/Niamey":1},"nf":{"Pacific/Norfolk":1},"ng":{"Africa/Lagos":1},"ni":{"America/Managua":1},"nl":{"Europe/Amsterdam":1},"no":{"Europe/Oslo":1},"np":{"Asia/Kathmandu":1},"nr":{"Pacific/Nauru":1},"nu":{"Pacific/Niue":1},"nz":{"Pacific/Auckland":1,"Pacific/Chatham":1},"om":{"Asia/Muscat":1},"pa":{"America/Panama":1},"pe":{"America/Lima":1},"pf":{"Pacific/Gambier":1,"Pacific/Marquesas":1,"Pacific/Tahiti":1},"pg":{"Pacific/Bougainville":1,"Pacific/Port_Moresby":1},"ph":{"Asia/Manila":1},"pk":{"Asia/Karachi":1},"pl":{"Europe/Warsaw":1},"pm":{"America/Miquelon":1},"pn":{"Pacific/Pitcairn":1},"pr":{"America/Puerto_Rico":1},"ps":{"Asia/Gaza":1,"Asia/Hebron":1},"pt":{"Atlantic/Azores":1,"Atlantic/Madeira":1,"Europe/Lisbon":1},"pw":{"Pacific/Palau":1},"py":{"America/Asuncion":1},"qa":{"Asia/Qatar":1},"re":{"Indian/Reunion":1},"ro":{"Europe/Bucharest":1},"rs":{"Europe/Belgrade":1},"ru":{"Asia/Anadyr":1,"Asia/Barnaul":1,"Asia/Chita":1,"Asia/Irkutsk":1,"Asia/Kamchatka":1,"Asia/Khandyga":1,"Asia/Krasnoyarsk":1,"Asia/Magadan":1,"Asia/Novokuznetsk":1,"Asia/Novosibirsk":1,"Asia/Omsk":1,"Asia/Sakhalin":1,"Asia/Srednekolymsk":1,"Asia/Tomsk":1,"Asia/Ust-Nera":1,"Asia/Vladivostok":1,"Asia/Yakutsk":1,"Asia/Yekaterinburg":1,"Europe/Astrakhan":1,"Europe/Kaliningrad":1,"Europe/Kirov":1,"Europe/Moscow":1,"Europe/Samara":1,"Europe/Saratov":1,"Europe/Ulyanovsk":1,"Europe/Volgograd":1},"rw":{"Africa/Kigali":1},"sa":{"Asia/Riyadh":1},"sb":{"Pacific/Guadalcanal":1},"sc":{"Indian/Mahe":1},"sd":{"Africa/Khartoum":1},"se":{"Europe/Stockholm":1},"sg":{"Asia/Singapore":1},"sh":{"Atlantic/St_Helena":1},"si":{"Europe/Ljubljana":1},"sj":{"Arctic/Longyearbyen":1},"sk":{"Europe/Bratislava":1},"sl":{"Africa/Freetown":1},"sm":{"Europe/San_Marino":1},"sn":{"Africa/Dakar":1},"so":{"Africa/Mogadishu":1},"sr":{"America/Paramaribo":1},"ss":{"Africa/Juba":1},"st":{"Africa/Sao_Tome":1},"sv":{"America/El_Salvador":1},"sx":{"America/Lower_Princes":1},"sy":{"Asia/Damascus":1},"sz":{"Africa/Mbabane":1},"tc":{"America/Grand_Turk":1},"td":{"Africa/Ndjamena":1},"tf":{"Indian/Kerguelen":1},"tg":{"Africa/Lome":1},"th":{"Asia/Bangkok":1},"tj":{"Asia/Dushanbe":1},"tk":{"Pacific/Fakaofo":1},"tl":{"Asia/Dili":1},"tm":{"Asia/Ashgabat":1},"tn":{"Africa/Tunis":1},"to":{"Pacific/Tongatapu":1},"tr":{"Europe/Istanbul":1},"tt":{"America/Port_of_Spain":1},"tv":{"Pacific/Funafuti":1},"tw":{"Asia/Taipei":1},"tz":{"Africa/Dar_es_Salaam":1},"ua":{"Europe/Kyiv":1,"Europe/Simferopol":1},"ug":{"Africa/Kampala":1},"um":{"Pacific/Midway":1,"Pacific/Wake":1},"us":{"America/Adak":1,"America/Anchorage":1,"America/Boise":1,"America/Chicago":1,"America/Denver":1,"America/Detroit":1,"America/Indiana/Indianapolis":1,"America/Indiana/Knox":1,"America/Indiana/Marengo":1,"America/Indiana/Petersburg":1,"America/Indiana/Tell_City":1,"America/Indiana/Vevay":1,"America/Indiana/Vincennes":1,"America/Indiana/Winamac":1,"America/Juneau":1,"America/Kentucky/Louisville":1,"America/Kentucky/Monticello":1,"America/Los_Angeles":1,"America/Menominee":1,"America/Metlakatla":1,"America/New_York":1,"America/Nome":1,"America/North_Dakota/Beulah":1,"America/North_Dakota/Center":1,"America/North_Dakota/New_Salem":1,"America/Phoenix":1,"America/Sitka":1,"America/Yakutat":1,"Pacific/Honolulu":1},"uy":{"America/Montevideo":1},"uz":{"Asia/Samarkand":1,"Asia/Tashkent":1},"va":{"Europe/Vatican":1},"vc":{"America/St_Vincent":1},"ve":{"America/Caracas":1},"vg":{"America/Tortola":1},"vi":{"America/St_Thomas":1},"vn":{"Asia/Ho_Chi_Minh":1},"vu":{"Pacific/Efate":1},"wf":{"Pacific/Wallis":1},"ws":{"Pacific/Apia":1},"ye":{"Asia/Aden":1},"yt":{"Indian/Mayotte":1},"za":{"Africa/Johannesburg":1},"zm":{"Africa/Lusaka":1},"zw":{"Africa/Harare":1}},"country":{"ad":{"kmap":"","mirror":"","name":"Andorra","zone":"Europe/Andorra"},"ae":{"kmap":"","mirror":"","name":"United Arab Emirates","zone":"Asia/Dubai"},"af":{"kmap":"","mirror":"","name":"Afghanistan","zone":"Asia/Kabul"},"ag":{"kmap":"","mirror":"","name":"Antigua and Barbuda","zone":"America/Antigua"},"ai":{"kmap":"","mirror":"","name":"Anguilla","zone":"America/Anguilla"},"al":{"kmap":"","mirror":"","name":"Albania","zone":"Europe/Tirane"},"am":{"kmap":"","mirror":"","name":"Armenia","zone":"Asia/Yerevan"},"ao":{"kmap":"","mirror":"","name":"Angola","zone":"Africa/Luanda"},"aq":{"kmap":"","mirror":"","name":"Antarctica","zone":"Antarctica/McMurdo"},"ar":{"kmap":"","mirror":"","name":"Argentina","zone":"America/Argentina/Buenos_Aires"},"as":{"kmap":"","mirror":"","name":"American Samoa","zone":"Pacific/Pago_Pago"},"at":{"kmap":"de","mirror":"ftp.at.debian.org","name":"Austria","zone":"Europe/Vienna"},"au":{"kmap":"","mirror":"ftp.au.debian.org","name":"Australia","zone":"Australia/Lord_Howe"},"aw":{"kmap":"","mirror":"","name":"Aruba","zone":"America/Aruba"},"ax":{"kmap":"","mirror":"","name":"Åland Islands","zone":"Europe/Mariehamn"},"az":{"kmap":"","mirror":"","name":"Azerbaijan","zone":"Asia/Baku"},"ba":{"kmap":"","mirror":"","name":"Bosnia and Herzegovina","zone":"Europe/Sarajevo"},"bb":{"kmap":"","mirror":"","name":"Barbados","zone":"America/Barbados"},"bd":{"kmap":"","mirror":"","name":"Bangladesh","zone":"Asia/Dhaka"},"be":{"kmap":"fr-be","mirror":"ftp.be.debian.org","name":"Belgium","zone":"Europe/Brussels"},"bf":{"kmap":"","mirror":"","name":"Burkina Faso","zone":"Africa/Ouagadougou"},"bg":{"kmap":"","mirror":"ftp.bg.debian.org","name":"Bulgaria","zone":"Europe/Sofia"},"bh":{"kmap":"","mirror":"","name":"Bahrain","zone":"Asia/Bahrain"},"bi":{"kmap":"","mirror":"","name":"Burundi","zone":"Africa/Bujumbura"},"bj":{"kmap":"","mirror":"","name":"Benin","zone":"Africa/Porto-Novo"},"bl":{"kmap":"","mirror":"","name":"Saint Barthélemy","zone":"America/St_Barthelemy"},"bm":{"kmap":"","mirror":"","name":"Bermuda","zone":"Atlantic/Bermuda"},"bn":{"kmap":"","mirror":"","name":"Brunei Darussalam","zone":"Asia/Brunei"},"bo":{"kmap":"","mirror":"","name":"Bolivia","zone":"America/La_Paz"},"bq":{"kmap":"","mirror":"","name":"Bonaire, Sint Eustatius and Saba","zone":"America/Kralendijk"},"br":{"kmap":"pt-br","mirror":"ftp.br.debian.org","name":"Brazil","zone":"America/Noronha"},"bs":{"kmap":"","mirror":"","name":"Bahamas","zone":"America/Nassau"},"bt":{"kmap":"","mirror":"","name":"Bhutan","zone":"Asia/Thimphu"},"bv":{"kmap":"","mirror":"","name":"Bouvet Island"},"bw":{"kmap":"","mirror":"","name":"Botswana","zone":"Africa/Gaborone"},"by":{"kmap":"","mirror":"","name":"Belarus","zone":"Europe/Minsk"},"bz":{"kmap":"","mirror":"","name":"Belize","zone":"America/Belize"},"ca":{"kmap":"en-us","mirror":"ftp.ca.debian.org","name":"Canada","zone":"America/St_Johns"},"cc":{"kmap":"","mirror":"","name":"Cocos (Keeling) Islands","zone":"Indian/Cocos"},"cd":{"kmap":"","mirror":"","name":"Congo, The Democratic Republic of the","zone":"Africa/Kinshasa"},"cf":{"kmap":"","mirror":"","name":"Central African Republic","zone":"Africa/Bangui"},"cg":{"kmap":"","mirror":"","name":"Congo","zone":"Africa/Brazzaville"},"ch":{"kmap":"de-ch","mirror":"ftp.ch.debian.org","name":"Switzerland","zone":"Europe/Zurich"},"ci":{"kmap":"","mirror":"","name":"Côte d'Ivoire","zone":"Africa/Abidjan"},"ck":{"kmap":"","mirror":"","name":"Cook Islands","zone":"Pacific/Rarotonga"},"cl":{"kmap":"","mirror":"ftp.cl.debian.org","name":"Chile","zone":"America/Santiago"},"cm":{"kmap":"","mirror":"","name":"Cameroon","zone":"Africa/Douala"},"cn":{"kmap":"","mirror":"","name":"China","zone":"Asia/Shanghai"},"co":{"kmap":"","mirror":"","name":"Colombia","zone":"America/Bogota"},"cr":{"kmap":"","mirror":"","name":"Costa Rica","zone":"America/Costa_Rica"},"cu":{"kmap":"","mirror":"","name":"Cuba","zone":"America/Havana"},"cv":{"kmap":"","mirror":"","name":"Cabo Verde","zone":"Atlantic/Cape_Verde"},"cw":{"kmap":"","mirror":"","name":"Curaçao","zone":"America/Curacao"},"cx":{"kmap":"","mirror":"","name":"Christmas Island","zone":"Indian/Christmas"},"cy":{"kmap":"","mirror":"","name":"Cyprus","zone":"Asia/Nicosia"},"cz":{"kmap":"","mirror":"ftp.cz.debian.org","name":"Czechia","zone":"Europe/Prague"},"de":{"kmap":"de","mirror":"ftp.de.debian.org","name":"Germany","zone":"Europe/Berlin"},"dj":{"kmap":"","mirror":"","name":"Djibouti","zone":"Africa/Djibouti"},"dk":{"kmap":"dk","mirror":"ftp.dk.debian.org","name":"Denmark","zone":"Europe/Copenhagen"},"dm":{"kmap":"","mirror":"","name":"Dominica","zone":"America/Dominica"},"do":{"kmap":"","mirror":"","name":"Dominican Republic","zone":"America/Santo_Domingo"},"dz":{"kmap":"","mirror":"","name":"Algeria","zone":"Africa/Algiers"},"ec":{"kmap":"","mirror":"","name":"Ecuador","zone":"America/Guayaquil"},"ee":{"kmap":"","mirror":"ftp.ee.debian.org","name":"Estonia","zone":"Europe/Tallinn"},"eg":{"kmap":"","mirror":"","name":"Egypt","zone":"Africa/Cairo"},"eh":{"kmap":"","mirror":"","name":"Western Sahara","zone":"Africa/El_Aaiun"},"er":{"kmap":"","mirror":"","name":"Eritrea","zone":"Africa/Asmara"},"es":{"kmap":"es","mirror":"ftp.es.debian.org","name":"Spain","zone":"Europe/Madrid"},"et":{"kmap":"","mirror":"","name":"Ethiopia","zone":"Africa/Addis_Ababa"},"fi":{"kmap":"fi","mirror":"ftp.fi.debian.org","name":"Finland","zone":"Europe/Helsinki"},"fj":{"kmap":"","mirror":"","name":"Fiji","zone":"Pacific/Fiji"},"fk":{"kmap":"","mirror":"","name":"Falkland Islands (Malvinas)","zone":"Atlantic/Stanley"},"fm":{"kmap":"","mirror":"","name":"Micronesia, Federated States of","zone":"Pacific/Chuuk"},"fo":{"kmap":"","mirror":"","name":"Faroe Islands","zone":"Atlantic/Faroe"},"fr":{"kmap":"fr","mirror":"ftp.fr.debian.org","name":"France","zone":"Europe/Paris"},"ga":{"kmap":"","mirror":"","name":"Gabon","zone":"Africa/Libreville"},"gb":{"kmap":"en-gb","mirror":"ftp.uk.debian.org","name":"United Kingdom","zone":"Europe/London"},"gd":{"kmap":"","mirror":"","name":"Grenada","zone":"America/Grenada"},"ge":{"kmap":"","mirror":"","name":"Georgia","zone":"Asia/Tbilisi"},"gf":{"kmap":"","mirror":"","name":"French Guiana","zone":"America/Cayenne"},"gg":{"kmap":"","mirror":"","name":"Guernsey","zone":"Europe/Guernsey"},"gh":{"kmap":"","mirror":"","name":"Ghana","zone":"Africa/Accra"},"gi":{"kmap":"es","mirror":"","name":"Gibraltar","zone":"Europe/Gibraltar"},"gl":{"kmap":"","mirror":"","name":"Greenland","zone":"America/Nuuk"},"gm":{"kmap":"","mirror":"","name":"Gambia","zone":"Africa/Banjul"},"gn":{"kmap":"","mirror":"","name":"Guinea","zone":"Africa/Conakry"},"gp":{"kmap":"","mirror":"","name":"Guadeloupe","zone":"America/Guadeloupe"},"gq":{"kmap":"","mirror":"","name":"Equatorial Guinea","zone":"Africa/Malabo"},"gr":{"kmap":"","mirror":"ftp.gr.debian.org","name":"Greece","zone":"Europe/Athens"},"gs":{"kmap":"","mirror":"","name":"South Georgia and the South Sandwich Islands","zone":"Atlantic/South_Georgia"},"gt":{"kmap":"","mirror":"","name":"Guatemala","zone":"America/Guatemala"},"gu":{"kmap":"","mirror":"","name":"Guam","zone":"Pacific/Guam"},"gw":{"kmap":"","mirror":"","name":"Guinea-Bissau","zone":"Africa/Bissau"},"gy":{"kmap":"","mirror":"","name":"Guyana","zone":"America/Guyana"},"hk":{"kmap":"","mirror":"ftp.hk.debian.org","name":"Hong Kong","zone":"Asia/Hong_Kong"},"hm":{"kmap":"","mirror":"","name":"Heard Island and McDonald Islands"},"hn":{"kmap":"","mirror":"","name":"Honduras","zone":"America/Tegucigalpa"},"hr":{"kmap":"","mirror":"ftp.hr.debian.org","name":"Croatia","zone":"Europe/Zagreb"},"ht":{"kmap":"","mirror":"","name":"Haiti","zone":"America/Port-au-Prince"},"hu":{"kmap":"hu","mirror":"ftp.hu.debian.org","name":"Hungary","zone":"Europe/Budapest"},"id":{"kmap":"","mirror":"","name":"Indonesia","zone":"Asia/Jakarta"},"ie":{"kmap":"","mirror":"ftp.ie.debian.org","name":"Ireland","zone":"Europe/Dublin"},"il":{"kmap":"","mirror":"","name":"Israel","zone":"Asia/Jerusalem"},"im":{"kmap":"","mirror":"","name":"Isle of Man","zone":"Europe/Isle_of_Man"},"in":{"kmap":"","mirror":"","name":"India","zone":"Asia/Kolkata"},"io":{"kmap":"","mirror":"","name":"British Indian Ocean Territory","zone":"Indian/Chagos"},"iq":{"kmap":"","mirror":"","name":"Iraq","zone":"Asia/Baghdad"},"ir":{"kmap":"","mirror":"","name":"Iran","zone":"Asia/Tehran"},"is":{"kmap":"is","mirror":"ftp.is.debian.org","name":"Iceland","zone":"Atlantic/Reykjavik"},"it":{"kmap":"it","mirror":"ftp.it.debian.org","name":"Italy","zone":"Europe/Rome"},"je":{"kmap":"","mirror":"","name":"Jersey","zone":"Europe/Jersey"},"jm":{"kmap":"","mirror":"","name":"Jamaica","zone":"America/Jamaica"},"jo":{"kmap":"","mirror":"","name":"Jordan","zone":"Asia/Amman"},"jp":{"kmap":"jp","mirror":"ftp.jp.debian.org","name":"Japan","zone":"Asia/Tokyo"},"ke":{"kmap":"","mirror":"","name":"Kenya","zone":"Africa/Nairobi"},"kg":{"kmap":"","mirror":"","name":"Kyrgyzstan","zone":"Asia/Bishkek"},"kh":{"kmap":"","mirror":"","name":"Cambodia","zone":"Asia/Phnom_Penh"},"ki":{"kmap":"","mirror":"","name":"Kiribati","zone":"Pacific/Tarawa"},"km":{"kmap":"","mirror":"","name":"Comoros","zone":"Indian/Comoro"},"kn":{"kmap":"","mirror":"","name":"Saint Kitts and Nevis","zone":"America/St_Kitts"},"kp":{"kmap":"","mirror":"","name":"North Korea","zone":"Asia/Pyongyang"},"kr":{"kmap":"","mirror":"ftp.kr.debian.org","name":"South Korea","zone":"Asia/Seoul"},"kw":{"kmap":"","mirror":"","name":"Kuwait","zone":"Asia/Kuwait"},"ky":{"kmap":"","mirror":"","name":"Cayman Islands","zone":"America/Cayman"},"kz":{"kmap":"","mirror":"","name":"Kazakhstan","zone":"Asia/Almaty"},"la":{"kmap":"","mirror":"","name":"Laos","zone":"Asia/Vientiane"},"lb":{"kmap":"","mirror":"","name":"Lebanon","zone":"Asia/Beirut"},"lc":{"kmap":"","mirror":"","name":"Saint Lucia","zone":"America/St_Lucia"},"li":{"kmap":"de-ch","mirror":"","name":"Liechtenstein","zone":"Europe/Vaduz"},"lk":{"kmap":"","mirror":"","name":"Sri Lanka","zone":"Asia/Colombo"},"lr":{"kmap":"","mirror":"","name":"Liberia","zone":"Africa/Monrovia"},"ls":{"kmap":"","mirror":"","name":"Lesotho","zone":"Africa/Maseru"},"lt":{"kmap":"lt","mirror":"","name":"Lithuania","zone":"Europe/Vilnius"},"lu":{"kmap":"fr-ch","mirror":"","name":"Luxembourg","zone":"Europe/Luxembourg"},"lv":{"kmap":"","mirror":"","name":"Latvia","zone":"Europe/Riga"},"ly":{"kmap":"","mirror":"","name":"Libya","zone":"Africa/Tripoli"},"ma":{"kmap":"","mirror":"","name":"Morocco","zone":"Africa/Casablanca"},"mc":{"kmap":"","mirror":"","name":"Monaco","zone":"Europe/Monaco"},"md":{"kmap":"","mirror":"","name":"Moldova","zone":"Europe/Chisinau"},"me":{"kmap":"","mirror":"","name":"Montenegro","zone":"Europe/Podgorica"},"mf":{"kmap":"","mirror":"","name":"Saint Martin (French part)","zone":"America/Marigot"},"mg":{"kmap":"","mirror":"","name":"Madagascar","zone":"Indian/Antananarivo"},"mh":{"kmap":"","mirror":"","name":"Marshall Islands","zone":"Pacific/Majuro"},"mk":{"kmap":"mk","mirror":"","name":"North Macedonia","zone":"Europe/Skopje"},"ml":{"kmap":"","mirror":"","name":"Mali","zone":"Africa/Bamako"},"mm":{"kmap":"","mirror":"","name":"Myanmar","zone":"Asia/Yangon"},"mn":{"kmap":"","mirror":"","name":"Mongolia","zone":"Asia/Ulaanbaatar"},"mo":{"kmap":"","mirror":"","name":"Macao","zone":"Asia/Macau"},"mp":{"kmap":"","mirror":"","name":"Northern Mariana Islands","zone":"Pacific/Saipan"},"mq":{"kmap":"","mirror":"","name":"Martinique","zone":"America/Martinique"},"mr":{"kmap":"","mirror":"","name":"Mauritania","zone":"Africa/Nouakchott"},"ms":{"kmap":"","mirror":"","name":"Montserrat","zone":"America/Montserrat"},"mt":{"kmap":"","mirror":"","name":"Malta","zone":"Europe/Malta"},"mu":{"kmap":"","mirror":"","name":"Mauritius","zone":"Indian/Mauritius"},"mv":{"kmap":"","mirror":"","name":"Maldives","zone":"Indian/Maldives"},"mw":{"kmap":"","mirror":"","name":"Malawi","zone":"Africa/Blantyre"},"mx":{"kmap":"","mirror":"ftp.mx.debian.org","name":"Mexico","zone":"America/Mexico_City"},"my":{"kmap":"","mirror":"","name":"Malaysia","zone":"Asia/Kuala_Lumpur"},"mz":{"kmap":"","mirror":"","name":"Mozambique","zone":"Africa/Maputo"},"na":{"kmap":"","mirror":"","name":"Namibia","zone":"Africa/Windhoek"},"nc":{"kmap":"","mirror":"","name":"New Caledonia","zone":"Pacific/Noumea"},"ne":{"kmap":"","mirror":"","name":"Niger","zone":"Africa/Niamey"},"nf":{"kmap":"","mirror":"","name":"Norfolk Island","zone":"Pacific/Norfolk"},"ng":{"kmap":"","mirror":"","name":"Nigeria","zone":"Africa/Lagos"},"ni":{"kmap":"","mirror":"","name":"Nicaragua","zone":"America/Managua"},"nl":{"kmap":"en-us","mirror":"ftp.nl.debian.org","name":"Netherlands","zone":"Europe/Amsterdam"},"no":{"kmap":"no","mirror":"ftp.no.debian.org","name":"Norway","zone":"Europe/Oslo"},"np":{"kmap":"","mirror":"","name":"Nepal","zone":"Asia/Kathmandu"},"nr":{"kmap":"","mirror":"","name":"Nauru","zone":"Pacific/Nauru"},"nu":{"kmap":"","mirror":"","name":"Niue","zone":"Pacific/Niue"},"nz":{"kmap":"","mirror":"ftp.nz.debian.org","name":"New Zealand","zone":"Pacific/Auckland"},"om":{"kmap":"","mirror":"","name":"Oman","zone":"Asia/Muscat"},"pa":{"kmap":"","mirror":"","name":"Panama","zone":"America/Panama"},"pe":{"kmap":"","mirror":"","name":"Peru","zone":"America/Lima"},"pf":{"kmap":"","mirror":"","name":"French Polynesia","zone":"Pacific/Tahiti"},"pg":{"kmap":"","mirror":"","name":"Papua New Guinea","zone":"Pacific/Port_Moresby"},"ph":{"kmap":"","mirror":"","name":"Philippines","zone":"Asia/Manila"},"pk":{"kmap":"","mirror":"","name":"Pakistan","zone":"Asia/Karachi"},"pl":{"kmap":"pl","mirror":"ftp.pl.debian.org","name":"Poland","zone":"Europe/Warsaw"},"pm":{"kmap":"","mirror":"","name":"Saint Pierre and Miquelon","zone":"America/Miquelon"},"pn":{"kmap":"","mirror":"","name":"Pitcairn","zone":"Pacific/Pitcairn"},"pr":{"kmap":"","mirror":"","name":"Puerto Rico","zone":"America/Puerto_Rico"},"ps":{"kmap":"","mirror":"","name":"Palestine, State of","zone":"Asia/Gaza"},"pt":{"kmap":"pt","mirror":"ftp.pt.debian.org","name":"Portugal","zone":"Europe/Lisbon"},"pw":{"kmap":"","mirror":"","name":"Palau","zone":"Pacific/Palau"},"py":{"kmap":"","mirror":"","name":"Paraguay","zone":"America/Asuncion"},"qa":{"kmap":"","mirror":"","name":"Qatar","zone":"Asia/Qatar"},"re":{"kmap":"","mirror":"","name":"Réunion","zone":"Indian/Reunion"},"ro":{"kmap":"","mirror":"ftp.ro.debian.org","name":"Romania","zone":"Europe/Bucharest"},"rs":{"kmap":"","mirror":"","name":"Serbia","zone":"Europe/Belgrade"},"ru":{"kmap":"","mirror":"ftp.ru.debian.org","name":"Russian Federation","zone":"Europe/Kaliningrad"},"rw":{"kmap":"","mirror":"","name":"Rwanda","zone":"Africa/Kigali"},"sa":{"kmap":"","mirror":"","name":"Saudi Arabia","zone":"Asia/Riyadh"},"sb":{"kmap":"","mirror":"","name":"Solomon Islands","zone":"Pacific/Guadalcanal"},"sc":{"kmap":"","mirror":"","name":"Seychelles","zone":"Indian/Mahe"},"sd":{"kmap":"","mirror":"","name":"Sudan","zone":"Africa/Khartoum"},"se":{"kmap":"","mirror":"ftp.se.debian.org","name":"Sweden","zone":"Europe/Stockholm"},"sg":{"kmap":"","mirror":"","name":"Singapore","zone":"Asia/Singapore"},"sh":{"kmap":"","mirror":"","name":"Saint Helena, Ascension and Tristan da Cunha","zone":"Atlantic/St_Helena"},"si":{"kmap":"si","mirror":"ftp.si.debian.org","name":"Slovenia","zone":"Europe/Ljubljana"},"sj":{"kmap":"","mirror":"","name":"Svalbard and Jan Mayen","zone":"Arctic/Longyearbyen"},"sk":{"kmap":"","mirror":"ftp.sk.debian.org","name":"Slovakia","zone":"Europe/Bratislava"},"sl":{"kmap":"","mirror":"","name":"Sierra Leone","zone":"Africa/Freetown"},"sm":{"kmap":"","mirror":"","name":"San Marino","zone":"Europe/San_Marino"},"sn":{"kmap":"","mirror":"","name":"Senegal","zone":"Africa/Dakar"},"so":{"kmap":"","mirror":"","name":"Somalia","zone":"Africa/Mogadishu"},"sr":{"kmap":"","mirror":"","name":"Suriname","zone":"America/Paramaribo"},"ss":{"kmap":"","mirror":"","name":"South Sudan","zone":"Africa/Juba"},"st":{"kmap":"","mirror":"","name":"Sao Tome and Principe","zone":"Africa/Sao_Tome"},"sv":{"kmap":"","mirror":"","name":"El Salvador","zone":"America/El_Salvador"},"sx":{"kmap":"","mirror":"","name":"Sint Maarten (Dutch part)","zone":"America/Lower_Princes"},"sy":{"kmap":"","mirror":"","name":"Syria","zone":"Asia/Damascus"},"sz":{"kmap":"","mirror":"","name":"Eswatini","zone":"Africa/Mbabane"},"tc":{"kmap":"","mirror":"","name":"Turks and Caicos Islands","zone":"America/Grand_Turk"},"td":{"kmap":"","mirror":"","name":"Chad","zone":"Africa/Ndjamena"},"tf":{"kmap":"","mirror":"","name":"French Southern Territories","zone":"Indian/Kerguelen"},"tg":{"kmap":"","mirror":"","name":"Togo","zone":"Africa/Lome"},"th":{"kmap":"","mirror":"","name":"Thailand","zone":"Asia/Bangkok"},"tj":{"kmap":"","mirror":"","name":"Tajikistan","zone":"Asia/Dushanbe"},"tk":{"kmap":"","mirror":"","name":"Tokelau","zone":"Pacific/Fakaofo"},"tl":{"kmap":"","mirror":"","name":"Timor-Leste","zone":"Asia/Dili"},"tm":{"kmap":"","mirror":"","name":"Turkmenistan","zone":"Asia/Ashgabat"},"tn":{"kmap":"","mirror":"","name":"Tunisia","zone":"Africa/Tunis"},"to":{"kmap":"","mirror":"","name":"Tonga","zone":"Pacific/Tongatapu"},"tr":{"kmap":"","mirror":"ftp.tr.debian.org","name":"Türkiye","zone":"Europe/Istanbul"},"tt":{"kmap":"","mirror":"","name":"Trinidad and Tobago","zone":"America/Port_of_Spain"},"tv":{"kmap":"","mirror":"","name":"Tuvalu","zone":"Pacific/Funafuti"},"tw":{"kmap":"","mirror":"ftp.tw.debian.org","name":"Taiwan","zone":"Asia/Taipei"},"tz":{"kmap":"","mirror":"","name":"Tanzania","zone":"Africa/Dar_es_Salaam"},"ua":{"kmap":"","mirror":"","name":"Ukraine","zone":"Europe/Simferopol"},"ug":{"kmap":"","mirror":"","name":"Uganda","zone":"Africa/Kampala"},"um":{"kmap":"","mirror":"","name":"United States Minor Outlying Islands","zone":"Pacific/Midway"},"us":{"kmap":"en-us","mirror":"ftp.us.debian.org","name":"United States","zone":"America/New_York"},"uy":{"kmap":"","mirror":"","name":"Uruguay","zone":"America/Montevideo"},"uz":{"kmap":"","mirror":"","name":"Uzbekistan","zone":"Asia/Samarkand"},"va":{"kmap":"it","mirror":"","name":"Holy See (Vatican City State)","zone":"Europe/Vatican"},"vc":{"kmap":"","mirror":"","name":"Saint Vincent and the Grenadines","zone":"America/St_Vincent"},"ve":{"kmap":"","mirror":"","name":"Venezuela","zone":"America/Caracas"},"vg":{"kmap":"","mirror":"","name":"Virgin Islands, British","zone":"America/Tortola"},"vi":{"kmap":"","mirror":"","name":"Virgin Islands, U.S.","zone":"America/St_Thomas"},"vn":{"kmap":"","mirror":"","name":"Vietnam","zone":"Asia/Ho_Chi_Minh"},"vu":{"kmap":"","mirror":"","name":"Vanuatu","zone":"Pacific/Efate"},"wf":{"kmap":"","mirror":"","name":"Wallis and Futuna","zone":"Pacific/Wallis"},"ws":{"kmap":"","mirror":"","name":"Samoa","zone":"Pacific/Apia"},"ye":{"kmap":"","mirror":"","name":"Yemen","zone":"Asia/Aden"},"yt":{"kmap":"","mirror":"","name":"Mayotte","zone":"Indian/Mayotte"},"za":{"kmap":"","mirror":"","name":"South Africa","zone":"Africa/Johannesburg"},"zm":{"kmap":"","mirror":"","name":"Zambia","zone":"Africa/Lusaka"},"zw":{"kmap":"","mirror":"","name":"Zimbabwe","zone":"Africa/Harare"}},"countryhash":{"afghanistan":"af","albania":"al","algeria":"dz","american samoa":"as","andorra":"ad","angola":"ao","anguilla":"ai","antarctica":"aq","antigua and barbuda":"ag","argentina":"ar","armenia":"am","aruba":"aw","australia":"au","austria":"at","azerbaijan":"az","bahamas":"bs","bahrain":"bh","bangladesh":"bd","barbados":"bb","belarus":"by","belgium":"be","belize":"bz","benin":"bj","bermuda":"bm","bhutan":"bt","bolivia":"bo","bonaire, sint eustatius and saba":"bq","bosnia and herzegovina":"ba","botswana":"bw","bouvet island":"bv","brazil":"br","british indian ocean territory":"io","brunei darussalam":"bn","bulgaria":"bg","burkina faso":"bf","burundi":"bi","cabo verde":"cv","cambodia":"kh","cameroon":"cm","canada":"ca","cayman islands":"ky","central african republic":"cf","chad":"td","chile":"cl","china":"cn","christmas island":"cx","cocos (keeling) islands":"cc","colombia":"co","comoros":"km","congo":"cg","congo, the democratic republic of the":"cd","cook islands":"ck","costa rica":"cr","croatia":"hr","cuba":"cu","curaçao":"cw","cyprus":"cy","czechia":"cz","côte d'ivoire":"ci","denmark":"dk","djibouti":"dj","dominica":"dm","dominican republic":"do","ecuador":"ec","egypt":"eg","el salvador":"sv","equatorial guinea":"gq","eritrea":"er","estonia":"ee","eswatini":"sz","ethiopia":"et","falkland islands (malvinas)":"fk","faroe islands":"fo","fiji":"fj","finland":"fi","france":"fr","french guiana":"gf","french polynesia":"pf","french southern territories":"tf","gabon":"ga","gambia":"gm","georgia":"ge","germany":"de","ghana":"gh","gibraltar":"gi","greece":"gr","greenland":"gl","grenada":"gd","guadeloupe":"gp","guam":"gu","guatemala":"gt","guernsey":"gg","guinea":"gn","guinea-bissau":"gw","guyana":"gy","haiti":"ht","heard island and mcdonald islands":"hm","holy see (vatican city state)":"va","honduras":"hn","hong kong":"hk","hungary":"hu","iceland":"is","india":"in","indonesia":"id","iran":"ir","iraq":"iq","ireland":"ie","isle of man":"im","israel":"il","italy":"it","jamaica":"jm","japan":"jp","jersey":"je","jordan":"jo","kazakhstan":"kz","kenya":"ke","kiribati":"ki","kuwait":"kw","kyrgyzstan":"kg","laos":"la","latvia":"lv","lebanon":"lb","lesotho":"ls","liberia":"lr","libya":"ly","liechtenstein":"li","lithuania":"lt","luxembourg":"lu","macao":"mo","madagascar":"mg","malawi":"mw","malaysia":"my","maldives":"mv","mali":"ml","malta":"mt","marshall islands":"mh","martinique":"mq","mauritania":"mr","mauritius":"mu","mayotte":"yt","mexico":"mx","micronesia, federated states of":"fm","moldova":"md","monaco":"mc","mongolia":"mn","montenegro":"me","montserrat":"ms","morocco":"ma","mozambique":"mz","myanmar":"mm","namibia":"na","nauru":"nr","nepal":"np","netherlands":"nl","new caledonia":"nc","new zealand":"nz","nicaragua":"ni","niger":"ne","nigeria":"ng","niue":"nu","norfolk island":"nf","north korea":"kp","north macedonia":"mk","northern mariana islands":"mp","norway":"no","oman":"om","pakistan":"pk","palau":"pw","palestine, state of":"ps","panama":"pa","papua new guinea":"pg","paraguay":"py","peru":"pe","philippines":"ph","pitcairn":"pn","poland":"pl","portugal":"pt","puerto rico":"pr","qatar":"qa","romania":"ro","russian federation":"ru","rwanda":"rw","réunion":"re","saint barthélemy":"bl","saint helena, ascension and tristan da cunha":"sh","saint kitts and nevis":"kn","saint lucia":"lc","saint martin (french part)":"mf","saint pierre and miquelon":"pm","saint vincent and the grenadines":"vc","samoa":"ws","san marino":"sm","sao tome and principe":"st","saudi arabia":"sa","senegal":"sn","serbia":"rs","seychelles":"sc","sierra leone":"sl","singapore":"sg","sint maarten (dutch part)":"sx","slovakia":"sk","slovenia":"si","solomon islands":"sb","somalia":"so","south africa":"za","south georgia and the south sandwich islands":"gs","south korea":"kr","south sudan":"ss","spain":"es","sri lanka":"lk","sudan":"sd","suriname":"sr","svalbard and jan mayen":"sj","sweden":"se","switzerland":"ch","syria":"sy","taiwan":"tw","tajikistan":"tj","tanzania":"tz","thailand":"th","timor-leste":"tl","togo":"tg","tokelau":"tk","tonga":"to","trinidad and tobago":"tt","tunisia":"tn","turkmenistan":"tm","turks and caicos islands":"tc","tuvalu":"tv","türkiye":"tr","uganda":"ug","ukraine":"ua","united arab emirates":"ae","united kingdom":"gb","united states":"us","united states minor outlying islands":"um","uruguay":"uy","uzbekistan":"uz","vanuatu":"vu","venezuela":"ve","vietnam":"vn","virgin islands, british":"vg","virgin islands, u.s.":"vi","wallis and futuna":"wf","western sahara":"eh","yemen":"ye","zambia":"zm","zimbabwe":"zw","åland islands":"ax"},"kmap":{"de":{"console":"qwertz/de-latin1-nodeadkeys.kmap.gz","kvm":"de","name":"German","x11":"de","x11var":"nodeadkeys"},"de-ch":{"console":"qwertz/sg-latin1.kmap.gz","kvm":"de-ch","name":"Swiss-German","x11":"ch","x11var":"de_nodeadkeys"},"dk":{"console":"qwerty/dk-latin1.kmap.gz","kvm":"da","name":"Danish","x11":"dk","x11var":"nodeadkeys"},"en-gb":{"console":"qwerty/uk.kmap.gz","kvm":"en-gb","name":"United Kingdom","x11":"gb","x11var":""},"en-us":{"console":"qwerty/us-latin1.kmap.gz","kvm":"en-us","name":"U.S. English","x11":"us","x11var":""},"es":{"console":"qwerty/es.kmap.gz","kvm":"es","name":"Spanish","x11":"es","x11var":"nodeadkeys"},"fi":{"console":"qwerty/fi-latin1.kmap.gz","kvm":"fi","name":"Finnish","x11":"fi","x11var":"nodeadkeys"},"fr":{"console":"azerty/fr-latin1.kmap.gz","kvm":"fr","name":"French","x11":"fr","x11var":"nodeadkeys"},"fr-be":{"console":"azerty/be2-latin1.kmap.gz","kvm":"fr-be","name":"Belgium-French","x11":"be","x11var":"nodeadkeys"},"fr-ca":{"console":"qwerty/cf.kmap.gz","kvm":"fr-ca","name":"Canada-French","x11":"ca","x11var":"fr-legacy"},"fr-ch":{"console":"qwertz/fr_CH-latin1.kmap.gz","kvm":"fr-ch","name":"Swiss-French","x11":"ch","x11var":"fr_nodeadkeys"},"hu":{"console":"qwertz/hu.kmap.gz","kvm":"hu","name":"Hungarian","x11":"hu","x11var":""},"is":{"console":"qwerty/is-latin1.kmap.gz","kvm":"is","name":"Icelandic","x11":"is","x11var":"nodeadkeys"},"it":{"console":"qwerty/it2.kmap.gz","kvm":"it","name":"Italian","x11":"it","x11var":"nodeadkeys"},"jp":{"console":"qwerty/jp106.kmap.gz","kvm":"ja","name":"Japanese","x11":"jp","x11var":""},"lt":{"console":"qwerty/lt.kmap.gz","kvm":"lt","name":"Lithuanian","x11":"lt","x11var":"std"},"mk":{"console":"qwerty/mk.kmap.gz","kvm":"mk","name":"Macedonian","x11":"mk","x11var":"nodeadkeys"},"nl":{"console":"qwerty/nl.kmap.gz","kvm":"nl","name":"Dutch","x11":"nl","x11var":""},"no":{"console":"qwerty/no-latin1.kmap.gz","kvm":"no","name":"Norwegian","x11":"no","x11var":"nodeadkeys"},"pl":{"console":"qwerty/pl.kmap.gz","kvm":"pl","name":"Polish","x11":"pl","x11var":""},"pt":{"console":"qwerty/pt-latin1.kmap.gz","kvm":"pt","name":"Portuguese","x11":"pt","x11var":"nodeadkeys"},"pt-br":{"console":"qwerty/br-latin1.kmap.gz","kvm":"pt-br","name":"Brazil-Portuguese","x11":"br","x11var":"nodeadkeys"},"se":{"console":"qwerty/se-latin1.kmap.gz","kvm":"sv","name":"Swedish","x11":"se","x11var":"nodeadkeys"},"si":{"console":"qwertz/slovene.kmap.gz","kvm":"sl","name":"Slovenian","x11":"si","x11var":""},"tr":{"console":"qwerty/trq.kmap.gz","kvm":"tr","name":"Turkish","x11":"tr","x11var":""}},"kmaphash":{"Belgium-French":"fr-be","Brazil-Portuguese":"pt-br","Canada-French":"fr-ca","Danish":"dk","Dutch":"nl","Finnish":"fi","French":"fr","German":"de","Hungarian":"hu","Icelandic":"is","Italian":"it","Japanese":"jp","Lithuanian":"lt","Macedonian":"mk","Norwegian":"no","Polish":"pl","Portuguese":"pt","Slovenian":"si","Spanish":"es","Swedish":"se","Swiss-French":"fr-ch","Swiss-German":"de-ch","Turkish":"tr","U.S. English":"en-us","United Kingdom":"en-gb"},"zones":{"Africa/Abidjan":1,"Africa/Accra":1,"Africa/Addis_Ababa":1,"Africa/Algiers":1,"Africa/Asmara":1,"Africa/Bamako":1,"Africa/Bangui":1,"Africa/Banjul":1,"Africa/Bissau":1,"Africa/Blantyre":1,"Africa/Brazzaville":1,"Africa/Bujumbura":1,"Africa/Cairo":1,"Africa/Casablanca":1,"Africa/Ceuta":1,"Africa/Conakry":1,"Africa/Dakar":1,"Africa/Dar_es_Salaam":1,"Africa/Djibouti":1,"Africa/Douala":1,"Africa/El_Aaiun":1,"Africa/Freetown":1,"Africa/Gaborone":1,"Africa/Harare":1,"Africa/Johannesburg":1,"Africa/Juba":1,"Africa/Kampala":1,"Africa/Khartoum":1,"Africa/Kigali":1,"Africa/Kinshasa":1,"Africa/Lagos":1,"Africa/Libreville":1,"Africa/Lome":1,"Africa/Luanda":1,"Africa/Lubumbashi":1,"Africa/Lusaka":1,"Africa/Malabo":1,"Africa/Maputo":1,"Africa/Maseru":1,"Africa/Mbabane":1,"Africa/Mogadishu":1,"Africa/Monrovia":1,"Africa/Nairobi":1,"Africa/Ndjamena":1,"Africa/Niamey":1,"Africa/Nouakchott":1,"Africa/Ouagadougou":1,"Africa/Porto-Novo":1,"Africa/Sao_Tome":1,"Africa/Tripoli":1,"Africa/Tunis":1,"Africa/Windhoek":1,"America/Adak":1,"America/Anchorage":1,"America/Anguilla":1,"America/Antigua":1,"America/Araguaina":1,"America/Argentina/Buenos_Aires":1,"America/Argentina/Catamarca":1,"America/Argentina/Cordoba":1,"America/Argentina/Jujuy":1,"America/Argentina/La_Rioja":1,"America/Argentina/Mendoza":1,"America/Argentina/Rio_Gallegos":1,"America/Argentina/Salta":1,"America/Argentina/San_Juan":1,"America/Argentina/San_Luis":1,"America/Argentina/Tucuman":1,"America/Argentina/Ushuaia":1,"America/Aruba":1,"America/Asuncion":1,"America/Atikokan":1,"America/Bahia":1,"America/Bahia_Banderas":1,"America/Barbados":1,"America/Belem":1,"America/Belize":1,"America/Blanc-Sablon":1,"America/Boa_Vista":1,"America/Bogota":1,"America/Boise":1,"America/Cambridge_Bay":1,"America/Campo_Grande":1,"America/Cancun":1,"America/Caracas":1,"America/Cayenne":1,"America/Cayman":1,"America/Chicago":1,"America/Chihuahua":1,"America/Ciudad_Juarez":1,"America/Costa_Rica":1,"America/Creston":1,"America/Cuiaba":1,"America/Curacao":1,"America/Danmarkshavn":1,"America/Dawson":1,"America/Dawson_Creek":1,"America/Denver":1,"America/Detroit":1,"America/Dominica":1,"America/Edmonton":1,"America/Eirunepe":1,"America/El_Salvador":1,"America/Fort_Nelson":1,"America/Fortaleza":1,"America/Glace_Bay":1,"America/Goose_Bay":1,"America/Grand_Turk":1,"America/Grenada":1,"America/Guadeloupe":1,"America/Guatemala":1,"America/Guayaquil":1,"America/Guyana":1,"America/Halifax":1,"America/Havana":1,"America/Hermosillo":1,"America/Indiana/Indianapolis":1,"America/Indiana/Knox":1,"America/Indiana/Marengo":1,"America/Indiana/Petersburg":1,"America/Indiana/Tell_City":1,"America/Indiana/Vevay":1,"America/Indiana/Vincennes":1,"America/Indiana/Winamac":1,"America/Inuvik":1,"America/Iqaluit":1,"America/Jamaica":1,"America/Juneau":1,"America/Kentucky/Louisville":1,"America/Kentucky/Monticello":1,"America/Kralendijk":1,"America/La_Paz":1,"America/Lima":1,"America/Los_Angeles":1,"America/Lower_Princes":1,"America/Maceio":1,"America/Managua":1,"America/Manaus":1,"America/Marigot":1,"America/Martinique":1,"America/Matamoros":1,"America/Mazatlan":1,"America/Menominee":1,"America/Merida":1,"America/Metlakatla":1,"America/Mexico_City":1,"America/Miquelon":1,"America/Moncton":1,"America/Monterrey":1,"America/Montevideo":1,"America/Montserrat":1,"America/Nassau":1,"America/New_York":1,"America/Nome":1,"America/Noronha":1,"America/North_Dakota/Beulah":1,"America/North_Dakota/Center":1,"America/North_Dakota/New_Salem":1,"America/Nuuk":1,"America/Ojinaga":1,"America/Panama":1,"America/Paramaribo":1,"America/Phoenix":1,"America/Port-au-Prince":1,"America/Port_of_Spain":1,"America/Porto_Velho":1,"America/Puerto_Rico":1,"America/Punta_Arenas":1,"America/Rankin_Inlet":1,"America/Recife":1,"America/Regina":1,"America/Resolute":1,"America/Rio_Branco":1,"America/Santarem":1,"America/Santiago":1,"America/Santo_Domingo":1,"America/Sao_Paulo":1,"America/Scoresbysund":1,"America/Sitka":1,"America/St_Barthelemy":1,"America/St_Johns":1,"America/St_Kitts":1,"America/St_Lucia":1,"America/St_Thomas":1,"America/St_Vincent":1,"America/Swift_Current":1,"America/Tegucigalpa":1,"America/Thule":1,"America/Tijuana":1,"America/Toronto":1,"America/Tortola":1,"America/Vancouver":1,"America/Whitehorse":1,"America/Winnipeg":1,"America/Yakutat":1,"Antarctica/Casey":1,"Antarctica/Davis":1,"Antarctica/DumontDUrville":1,"Antarctica/Macquarie":1,"Antarctica/Mawson":1,"Antarctica/McMurdo":1,"Antarctica/Palmer":1,"Antarctica/Rothera":1,"Antarctica/Syowa":1,"Antarctica/Troll":1,"Antarctica/Vostok":1,"Arctic/Longyearbyen":1,"Asia/Aden":1,"Asia/Almaty":1,"Asia/Amman":1,"Asia/Anadyr":1,"Asia/Aqtau":1,"Asia/Aqtobe":1,"Asia/Ashgabat":1,"Asia/Atyrau":1,"Asia/Baghdad":1,"Asia/Bahrain":1,"Asia/Baku":1,"Asia/Bangkok":1,"Asia/Barnaul":1,"Asia/Beirut":1,"Asia/Bishkek":1,"Asia/Brunei":1,"Asia/Chita":1,"Asia/Choibalsan":1,"Asia/Colombo":1,"Asia/Damascus":1,"Asia/Dhaka":1,"Asia/Dili":1,"Asia/Dubai":1,"Asia/Dushanbe":1,"Asia/Famagusta":1,"Asia/Gaza":1,"Asia/Hebron":1,"Asia/Ho_Chi_Minh":1,"Asia/Hong_Kong":1,"Asia/Hovd":1,"Asia/Irkutsk":1,"Asia/Jakarta":1,"Asia/Jayapura":1,"Asia/Jerusalem":1,"Asia/Kabul":1,"Asia/Kamchatka":1,"Asia/Karachi":1,"Asia/Kathmandu":1,"Asia/Khandyga":1,"Asia/Kolkata":1,"Asia/Krasnoyarsk":1,"Asia/Kuala_Lumpur":1,"Asia/Kuching":1,"Asia/Kuwait":1,"Asia/Macau":1,"Asia/Magadan":1,"Asia/Makassar":1,"Asia/Manila":1,"Asia/Muscat":1,"Asia/Nicosia":1,"Asia/Novokuznetsk":1,"Asia/Novosibirsk":1,"Asia/Omsk":1,"Asia/Oral":1,"Asia/Phnom_Penh":1,"Asia/Pontianak":1,"Asia/Pyongyang":1,"Asia/Qatar":1,"Asia/Qostanay":1,"Asia/Qyzylorda":1,"Asia/Riyadh":1,"Asia/Sakhalin":1,"Asia/Samarkand":1,"Asia/Seoul":1,"Asia/Shanghai":1,"Asia/Singapore":1,"Asia/Srednekolymsk":1,"Asia/Taipei":1,"Asia/Tashkent":1,"Asia/Tbilisi":1,"Asia/Tehran":1,"Asia/Thimphu":1,"Asia/Tokyo":1,"Asia/Tomsk":1,"Asia/Ulaanbaatar":1,"Asia/Urumqi":1,"Asia/Ust-Nera":1,"Asia/Vientiane":1,"Asia/Vladivostok":1,"Asia/Yakutsk":1,"Asia/Yangon":1,"Asia/Yekaterinburg":1,"Asia/Yerevan":1,"Atlantic/Azores":1,"Atlantic/Bermuda":1,"Atlantic/Canary":1,"Atlantic/Cape_Verde":1,"Atlantic/Faroe":1,"Atlantic/Madeira":1,"Atlantic/Reykjavik":1,"Atlantic/South_Georgia":1,"Atlantic/St_Helena":1,"Atlantic/Stanley":1,"Australia/Adelaide":1,"Australia/Brisbane":1,"Australia/Broken_Hill":1,"Australia/Darwin":1,"Australia/Eucla":1,"Australia/Hobart":1,"Australia/Lindeman":1,"Australia/Lord_Howe":1,"Australia/Melbourne":1,"Australia/Perth":1,"Australia/Sydney":1,"Europe/Amsterdam":1,"Europe/Andorra":1,"Europe/Astrakhan":1,"Europe/Athens":1,"Europe/Belgrade":1,"Europe/Berlin":1,"Europe/Bratislava":1,"Europe/Brussels":1,"Europe/Bucharest":1,"Europe/Budapest":1,"Europe/Busingen":1,"Europe/Chisinau":1,"Europe/Copenhagen":1,"Europe/Dublin":1,"Europe/Gibraltar":1,"Europe/Guernsey":1,"Europe/Helsinki":1,"Europe/Isle_of_Man":1,"Europe/Istanbul":1,"Europe/Jersey":1,"Europe/Kaliningrad":1,"Europe/Kirov":1,"Europe/Kyiv":1,"Europe/Lisbon":1,"Europe/Ljubljana":1,"Europe/London":1,"Europe/Luxembourg":1,"Europe/Madrid":1,"Europe/Malta":1,"Europe/Mariehamn":1,"Europe/Minsk":1,"Europe/Monaco":1,"Europe/Moscow":1,"Europe/Oslo":1,"Europe/Paris":1,"Europe/Podgorica":1,"Europe/Prague":1,"Europe/Riga":1,"Europe/Rome":1,"Europe/Samara":1,"Europe/San_Marino":1,"Europe/Sarajevo":1,"Europe/Saratov":1,"Europe/Simferopol":1,"Europe/Skopje":1,"Europe/Sofia":1,"Europe/Stockholm":1,"Europe/Tallinn":1,"Europe/Tirane":1,"Europe/Ulyanovsk":1,"Europe/Vaduz":1,"Europe/Vatican":1,"Europe/Vienna":1,"Europe/Vilnius":1,"Europe/Volgograd":1,"Europe/Warsaw":1,"Europe/Zagreb":1,"Europe/Zurich":1,"Indian/Antananarivo":1,"Indian/Chagos":1,"Indian/Christmas":1,"Indian/Cocos":1,"Indian/Comoro":1,"Indian/Kerguelen":1,"Indian/Mahe":1,"Indian/Maldives":1,"Indian/Mauritius":1,"Indian/Mayotte":1,"Indian/Reunion":1,"Pacific/Apia":1,"Pacific/Auckland":1,"Pacific/Bougainville":1,"Pacific/Chatham":1,"Pacific/Chuuk":1,"Pacific/Easter":1,"Pacific/Efate":1,"Pacific/Fakaofo":1,"Pacific/Fiji":1,"Pacific/Funafuti":1,"Pacific/Galapagos":1,"Pacific/Gambier":1,"Pacific/Guadalcanal":1,"Pacific/Guam":1,"Pacific/Honolulu":1,"Pacific/Kanton":1,"Pacific/Kiritimati":1,"Pacific/Kosrae":1,"Pacific/Kwajalein":1,"Pacific/Majuro":1,"Pacific/Marquesas":1,"Pacific/Midway":1,"Pacific/Nauru":1,"Pacific/Niue":1,"Pacific/Norfolk":1,"Pacific/Noumea":1,"Pacific/Pago_Pago":1,"Pacific/Palau":1,"Pacific/Pitcairn":1,"Pacific/Pohnpei":1,"Pacific/Port_Moresby":1,"Pacific/Rarotonga":1,"Pacific/Saipan":1,"Pacific/Tahiti":1,"Pacific/Tarawa":1,"Pacific/Tongatapu":1,"Pacific/Wake":1,"Pacific/Wallis":1}} + diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix index acc15ff2c81f..fae2af442143 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix @@ -2,7 +2,6 @@ lib, fetchgit, rustPlatform, - testers, pkg-config, openssl, versionCheckHook, @@ -10,20 +9,20 @@ rustPlatform.buildRustPackage rec { pname = "proxmox-auto-install-assistant"; - version = "8.3.3"; + version = "8.4.6"; src = fetchgit { url = "git://git.proxmox.com/git/pve-installer.git"; - rev = "cf6df4a23491071d207dcc8b00af8ddf310ae0b0"; - hash = "sha256-n4mn8VF84QyJiUNubgoxkbMEbuyj8n5KeIdVB3Xz5iY="; + rev = "fcd13b1503bec573da9db4bfad42b2478e97d9ce"; + hash = "sha256-fPl6qxWTaqumtnAFUfEBTChTIe+94fWCZv8s7Sq9zSk="; }; postPatch = '' rm -v .cargo/config.toml cp -v ${./Cargo.lock} Cargo.lock - # fix up hard-coded version number to match that of the debian package - substituteInPlace proxmox-auto-install-assistant/Cargo.toml \ - --replace-fail 'version = "0.1.0"' 'version = "${version}"' + # pre-generated using `make locale-info.json` + # depends on non-packaged perl modules and debian-specific files + cp -v ${./locale-info.json} locale-info.json ''; buildAndTestSubdir = "proxmox-auto-install-assistant"; @@ -34,20 +33,27 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl.dev ]; postFixup = '' - # openssl is not actually necessary, only pulled in through a feature (unfortunately) - patchelf --remove-needed libssl.so.3 $out/bin/proxmox-auto-install-assistant + # these libraries are not actually necessary, only linked in by cargo + # through crate dependencies (unfortunately) + patchelf \ + --remove-needed libcrypto.so.3 \ + --remove-needed libssl.so.3 \ + $out/bin/proxmox-auto-install-assistant + patchelf --shrink-rpath $out/bin/proxmox-auto-install-assistant ''; + disallowedReferences = [ openssl.out ]; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Tool to prepare a Proxmox installation ISO for automated installations"; longDescription = '' This tool can be used to prepare a Proxmox installation ISO for automated installations. Additional uses are to validate the format of an answer file or to test match filters and - print information on the properties to match against for the current hardware + print information on the properties to match against for the current hardware. ''; homepage = "https://pve.proxmox.com/wiki/Automated_Installation"; changelog = "https://git.proxmox.com/?p=pve-installer.git;a=blob;f=debian/changelog"; diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix index bf5e4a29ecde..833f668aacf5 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/package.nix +++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix @@ -171,7 +171,7 @@ rustPlatform.buildRustPackage { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; meta = with lib; { description = "Command line client for Proxmox Backup Server"; diff --git a/pkgs/by-name/pr/proxypin/package.nix b/pkgs/by-name/pr/proxypin/package.nix index a55ee485f38c..9477c9d7c671 100644 --- a/pkgs/by-name/pr/proxypin/package.nix +++ b/pkgs/by-name/pr/proxypin/package.nix @@ -1,26 +1,26 @@ { lib, - flutter327, + flutter329, fetchFromGitHub, autoPatchelfHook, }: -flutter327.buildFlutterApplication rec { +flutter329.buildFlutterApplication rec { pname = "proxypin"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "wanghongenpin"; repo = "proxypin"; tag = "v${version}"; - hash = "sha256-A+FgWTzluyTENyr29I57107pYrClMn+L4Th1BluTQIU="; + hash = "sha256-SLAm/Ab6/LgDFV/bUdBOTdNBFFh4+F+OrYFxjv5X3wo="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { desktop_multi_window = "sha256-Tbl0DOxW1F8V2Kj34gcNRbBqr5t9Iq74qCT26deqFdQ="; - flutter_code_editor = "sha256-HwgjyIwS0HcXL5JN7T1pTKyALakCC31V3rMFum7dHvE="; + flutter_code_editor = "sha256-w8SbgvfpKbfCr0Y82r/k9pDsZjLOdVJ6D93dzKXct8c="; }; postPatch = '' @@ -38,6 +38,8 @@ flutter327.buildFlutterApplication rec { install -Dm0644 assets/icon.png $out/share/pixmaps/proxypin.png ''; + passthru.updateScript = ./update.sh; + meta = { description = "Capture HTTP(S) traffic software"; homepage = "https://github.com/wanghongenpin/proxypin"; diff --git a/pkgs/by-name/pr/proxypin/pubspec.lock.json b/pkgs/by-name/pr/proxypin/pubspec.lock.json index ebfdca4b4b78..61fe885f77e7 100644 --- a/pkgs/by-name/pr/proxypin/pubspec.lock.json +++ b/pkgs/by-name/pr/proxypin/pubspec.lock.json @@ -4,11 +4,11 @@ "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "autotrie": { "dependency": "transitive", @@ -24,11 +24,11 @@ "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "brotli": { "dependency": "direct main", @@ -44,11 +44,11 @@ "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "charcode": { "dependency": "transitive", @@ -64,21 +64,21 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "collection": { "dependency": "transitive", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "convert": { "dependency": "transitive", @@ -145,11 +145,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da", + "sha256": "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.0" + "version": "11.3.3" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -175,21 +175,21 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "transitive", @@ -205,11 +205,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810", + "sha256": "8986dec4581b4bcd4b6df5d75a2ea0bede3db802f500635d05fa8be298f9467f", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.7" + "version": "10.1.2" }, "fixnum": { "dependency": "transitive", @@ -232,7 +232,7 @@ "description": { "path": ".", "ref": "secure-keyboard", - "resolved-ref": "d727aff0747851e8cb26f5b1ee8e8b414d512aed", + "resolved-ref": "b07c518b7cea5df69e2f826de168b91f83508d06", "url": "https://github.com/wanghongenpin/flutter-code-editor.git" }, "source": "git", @@ -288,21 +288,21 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", + "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.27" + "version": "2.0.28" }, - "flutter_qr_reader": { + "flutter_qr_reader_plus": { "dependency": "direct main", "description": { - "name": "flutter_qr_reader", - "sha256": "201168208410ce74b2e5b05b28aace2af3baf6946e90c784b089eb6a33876246", + "name": "flutter_qr_reader_plus", + "sha256": "ae374b5caf0be28e00572475c899ec272afc777505c2174b1149cfa2506c8bde", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.0.6" }, "flutter_test": { "dependency": "direct dev", @@ -366,15 +366,25 @@ "source": "hosted", "version": "4.1.2" }, + "iconsax_flutter": { + "dependency": "transitive", + "description": { + "name": "iconsax_flutter", + "sha256": "95b65699da8ea98f87c5d232f06b0debaaf1ec1332b697e4d90969ec9a93037d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, "image_pickers": { "dependency": "direct main", "description": { "name": "image_pickers", - "sha256": "43b3098d1d0cee1bbddd919814cee83582d40842f9fc41c1af3c7174dce5a3c9", + "sha256": "e2f5d19a7b0a40af3af5d49c5855b22a755e6f79b22e0b58a65c44311b9d67c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5+2" + "version": "2.0.6" }, "intl": { "dependency": "direct main", @@ -386,16 +396,6 @@ "source": "hosted", "version": "0.19.0" }, - "js": { - "dependency": "transitive", - "description": { - "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.1" - }, "json_annotation": { "dependency": "transitive", "description": { @@ -410,21 +410,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -470,11 +470,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -490,11 +490,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", @@ -520,11 +520,11 @@ "dependency": "transitive", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_provider": { "dependency": "direct main", @@ -540,11 +540,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", + "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.16" + "version": "2.2.17" }, "path_provider_foundation": { "dependency": "transitive", @@ -586,6 +586,16 @@ "source": "hosted", "version": "2.3.0" }, + "pausable_timer": { + "dependency": "transitive", + "description": { + "name": "pausable_timer", + "sha256": "6ef1a95441ec3439de6fb63f39a011b67e693198e7dae14e20675c3c00e86074", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+3" + }, "permission_handler": { "dependency": "direct main", "description": { @@ -610,11 +620,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98", + "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.6" + "version": "9.4.7" }, "permission_handler_html": { "dependency": "transitive", @@ -670,11 +680,11 @@ "dependency": "direct main", "description": { "name": "pointycastle", - "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "sha256": "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.9.1" + "version": "4.0.0" }, "proxy_manager": { "dependency": "direct main", @@ -790,21 +800,21 @@ "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.2" + "version": "2.5.3" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad", + "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.8" + "version": "2.4.10" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -866,11 +876,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -886,31 +896,31 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "sync_http": { "dependency": "transitive", @@ -926,21 +936,31 @@ "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" + }, + "toastification": { + "dependency": "direct main", + "description": { + "name": "toastification", + "sha256": "9713989549d60754fd0522425d1251501919cfb7bab4ffbbb36ef40de5ea72b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" }, "tuple": { "dependency": "transitive", @@ -976,21 +996,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", + "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.15" + "version": "6.3.16" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.2" + "version": "6.3.3" }, "url_launcher_linux": { "dependency": "transitive", @@ -1052,6 +1072,16 @@ "source": "hosted", "version": "4.5.1" }, + "vclibs": { + "dependency": "direct main", + "description": { + "name": "vclibs", + "sha256": "5dc5de54fabe27ad276898b7c04a56a4a3dd9834e479b9db5e04a9f3eb36790e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, "vector_math": { "dependency": "transitive", "description": { @@ -1066,11 +1096,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "web": { "dependency": "transitive", @@ -1086,21 +1116,21 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.10.1" + "version": "5.12.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.5" + "version": "2.1.0" }, "win32audio": { "dependency": "direct main", @@ -1122,6 +1152,16 @@ "source": "hosted", "version": "0.4.3" }, + "windows_single_instance": { + "dependency": "direct main", + "description": { + "name": "windows_single_instance", + "sha256": "50d5dcd6bec90b4a5ed588b1822b1aad21b39fc96da843e61c734b3caccfd2fc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, "xdg_directories": { "dependency": "transitive", "description": { @@ -1134,7 +1174,7 @@ } }, "sdks": { - "dart": ">=3.6.0 <4.0.0", + "dart": ">=3.7.0 <4.0.0", "flutter": ">=3.27.0" } } diff --git a/pkgs/by-name/pr/proxypin/update.sh b/pkgs/by-name/pr/proxypin/update.sh new file mode 100755 index 000000000000..a9c584fe312d --- /dev/null +++ b/pkgs/by-name/pr/proxypin/update.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p yq nix bash coreutils nix-update common-updater-scripts ripgrep flutter + +set -eou pipefail + +PACKAGE_DIR="$(realpath "$(dirname "$0")")" +cd "$PACKAGE_DIR"/.. +while ! test -f flake.nix; do cd ..; done +NIXPKGS_DIR="$PWD" + +latestVersion=$( + list-git-tags --url=https://github.com/wanghongenpin/proxypin | + rg '^v(.*)' -r '$1' | + sort --version-sort | + tail -n1 +) + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; proxypin.version or (lib.getVersion proxypin)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +nix-update --version=$latestVersion proxypin + +export HOME="$(mktemp -d)" +src="$(nix-build --no-link "$NIXPKGS_DIR" -A proxypin.src)" +TMPDIR="$(mktemp -d)" +cp --recursive --no-preserve=mode "$src"/* $TMPDIR +cd $TMPDIR +flutter pub get +yq . pubspec.lock >"$PACKAGE_DIR"/pubspec.lock.json +rm -rf $TMPDIR diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix index ca7ce16a8adc..50f2ff5d0c83 100644 --- a/pkgs/by-name/pr/proxysql/package.nix +++ b/pkgs/by-name/pr/proxysql/package.nix @@ -221,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "proxysql"; homepage = "https://proxysql.com/"; license = with licenses; [ gpl3Only ]; - maintainers = teams.helsinki-systems.members; + teams = [ teams.helsinki-systems ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix index 4715f0cf80ca..d16e452b3a9c 100644 --- a/pkgs/by-name/pr/prr/package.nix +++ b/pkgs/by-name/pr/prr/package.nix @@ -2,10 +2,8 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -22,12 +20,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-VIJFr1HpXMC2DXt79Yb1DuLYSbo9g6zsXaNDTXjtlR4="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix index 6e6089f50321..075e86594fb3 100644 --- a/pkgs/by-name/pr/prrte/package.nix +++ b/pkgs/by-name/pr/prrte/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "prrte"; - version = "3.0.9"; + version = "3.0.10"; src = fetchFromGitHub { owner = "openpmix"; repo = "prrte"; rev = "v${version}"; - hash = "sha256-wLM+txjngY5gh/+yiaSKrenG6oIzF2dPgMumIGyCsXU="; + hash = "sha256-Pnm0t7dJhT0MEYEKBHh6l16V5b/zOSxsd5OWda5SIzI="; fetchSubmodules = true; }; @@ -75,6 +75,12 @@ stdenv.mkDerivation rec { pmix ]; + # Setting this manually, required for RiscV cross-compile + configureFlags = [ + "--with-pmix=${lib.getDev pmix}" + "--with-pmix-libdir=${lib.getLib pmix}/lib" + ]; + enableParallelBuilding = true; meta = { diff --git a/pkgs/by-name/ps/ps3-disc-dumper/deps.json b/pkgs/by-name/ps/ps3-disc-dumper/deps.json index 27ac4d95fd0a..84caefc4a739 100644 --- a/pkgs/by-name/ps/ps3-disc-dumper/deps.json +++ b/pkgs/by-name/ps/ps3-disc-dumper/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Avalonia", - "version": "11.2.3", - "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY=" + "version": "11.3.0", + "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -11,94 +11,59 @@ }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.3", - "hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I=" + "version": "11.3.0", + "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I=" }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.2.3", - "hash": "sha256-ySsCXVpjqjCX/uYkwluSfrAoBtuq9k7fC1bFjxKC9/Q=" + "version": "11.3.0", + "hash": "sha256-/ObA3b0iPpPFcXBUiD8TmdCXFVqZKToK7YRuU3QUWtg=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.3", - "hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY=" + "version": "11.3.0", + "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4=" }, { "pname": "Avalonia.Native", - "version": "11.2.3", - "hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8=" - }, - { - "pname": "Avalonia.ReactiveUI", - "version": "11.2.3", - "hash": "sha256-NqRetBiFg5gNCS8C0J1JJJsZ4sz+w+GoEegGFddBGDg=" + "version": "11.3.0", + "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.3", - "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" + "version": "11.3.0", + "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I=" }, { "pname": "Avalonia.Skia", - "version": "11.2.3", - "hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA=" + "version": "11.3.0", + "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.3", - "hash": "sha256-DRl+267mUtJDUJpreUj6BxDLGGYGkEEo5vDGtGguoC8=" + "version": "11.3.0", + "hash": "sha256-o5scZcwaflLKXQD6VLGZYe4vvQ322Xzgh7F3IvriMfk=" }, { "pname": "Avalonia.Win32", - "version": "11.2.3", - "hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE=" + "version": "11.3.0", + "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE=" }, { "pname": "Avalonia.X11", - "version": "11.2.3", - "hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60=" + "version": "11.3.0", + "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU=" }, { "pname": "CommunityToolkit.Mvvm", "version": "8.4.0", "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI=" }, - { - "pname": "DiscUtils.Core", - "version": "0.16.13", - "hash": "sha256-EMl8Vc1nBOiPG0ilHLwar/UH2JFumPEZ1nst049et+A=" - }, - { - "pname": "DiscUtils.Iso9660", - "version": "0.16.13", - "hash": "sha256-pMAQwrvqhzOOaAQChdxqPNw8Xx9YP60PNsetPRFNvm0=" - }, - { - "pname": "DiscUtils.OpticalDisk", - "version": "0.16.13", - "hash": "sha256-rgcFTQUuxrG9V4gL5e6xhPqBTxnzVpDn3JHhvnVNGsA=" - }, - { - "pname": "DiscUtils.Streams", - "version": "0.16.13", - "hash": "sha256-DSetHA56M/GLg0cXhMjLJk8GPRa5TAieaXSbOWrfnw8=" - }, - { - "pname": "DiscUtils.Udf", - "version": "0.16.13", - "hash": "sha256-zEtRSgTtH3xXbhUH7XaKUilhYOyur3xiIDKLTi7pk2A=" - }, - { - "pname": "DynamicData", - "version": "8.4.1", - "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4=" - }, { "pname": "HarfBuzzSharp", "version": "7.3.0.3", @@ -124,6 +89,36 @@ "version": "7.3.0.3", "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" }, + { + "pname": "LTRData.DiscUtils.Core", + "version": "1.0.54", + "hash": "sha256-6n68/HVei6xzPvjTxP8utmHWUYWQ8bA6j19LT7hxCHc=" + }, + { + "pname": "LTRData.DiscUtils.Iso9660", + "version": "1.0.54", + "hash": "sha256-pW2wKBlMeqNFHXI58p2yR9uEkf3B5MqhRNfIjDt2JYE=" + }, + { + "pname": "LTRData.DiscUtils.OpticalDisk", + "version": "1.0.54", + "hash": "sha256-k8DJcb6m2aEFd2SWICAjsZ+8IK4bPX7UP/od3ddI2eY=" + }, + { + "pname": "LTRData.DiscUtils.Streams", + "version": "1.0.54", + "hash": "sha256-e0QWGFOAYFMCp/FDi/0kQ8Rd1hF3oWZ3pwrQX9sCFZg=" + }, + { + "pname": "LTRData.DiscUtils.Udf", + "version": "1.0.54", + "hash": "sha256-K9Fs4SzQjW+ESuvvVqr9+fTs1hvGv571WCRc2Nl5jfo=" + }, + { + "pname": "LTRData.Extensions", + "version": "1.0.18", + "hash": "sha256-BUmv97cIUDNtjPj7IKW1iZHhqx9iyidb4xwAGXbRyvM=" + }, { "pname": "MicroCom.Runtime", "version": "0.11.0", @@ -134,10 +129,20 @@ "version": "6.0.0", "hash": "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo=" }, + { + "pname": "Microsoft.Bcl.HashCode", + "version": "6.0.0", + "hash": "sha256-87myurC/jMcX1f32167j7FTjbZ6FvUE0esrhYTGcvWs=" + }, { "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Newtonsoft.Json", @@ -155,9 +160,154 @@ "hash": "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA=" }, { - "pname": "ReactiveUI", - "version": "20.1.1", - "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE=" + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.1", + "hash": "sha256-Mt2QAjNH5nKnwpbyoUe2O+En97CP84EQFoS3CkmYXAM=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.1", + "hash": "sha256-J5RHzSIfUs001NsY82+ZXn0ZIqux+aLvY7uDuXjRd8U=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, { "pname": "SkiaSharp", @@ -185,24 +335,39 @@ "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, { - "pname": "Splat", - "version": "15.1.1", - "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" }, { - "pname": "System.CodeDom", - "version": "9.0.1", - "hash": "sha256-AhoLbz7WIP5tV7dExnYxRgFGl4NgSXA3R7h2SzaW0Wc=" + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, { - "pname": "System.ComponentModel.Annotations", - "version": "5.0.0", - "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, { "pname": "System.IO.Hashing", - "version": "9.0.1", - "hash": "sha256-IJru9BdFNsNs7FbG+F9djJdkkWdpoz2IxQ+GgvKvUOs=" + "version": "9.0.4", + "hash": "sha256-rbcQzEncB3VuUZIcsE1tq30suf5rvRE4HkE+0lR/skU=" }, { "pname": "System.IO.Pipelines", @@ -210,9 +375,9 @@ "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, { - "pname": "System.Management", - "version": "9.0.1", - "hash": "sha256-dHSBGiI5OWxNQF/7ZrcVDRybYwdDOMyIUNDSGh0Gpz0=" + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, { "pname": "System.Memory", @@ -220,33 +385,108 @@ "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" }, { - "pname": "System.Reactive", - "version": "6.0.0", - "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" + "pname": "System.Memory", + "version": "4.6.3", + "hash": "sha256-JgeK63WMmumF6L+FH5cwJgYdpqXrSDcgTQwtIgTHKVU=" }, { - "pname": "System.Reactive", - "version": "6.0.1", - "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.1", + "hash": "sha256-QlO/ppRk/OyDYHCimD867RAlKIOakidD0ICNOt63XNQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "9.0.4", + "hash": "sha256-gW3nGw3ElYCYTEuYxZOk1oyHsj3wBenr6uwJGK0u+IQ=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.5.4", "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.6.3", + "hash": "sha256-GrySx1F6Ah6tfnnQt/PHC+dbzg+sfP47OOFX0yJF/xo=" + }, { "pname": "Tmds.DBus.Protocol", - "version": "0.20.0", - "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" + "version": "0.21.2", + "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" + }, + { + "pname": "WmiLight", + "version": "6.13.0", + "hash": "sha256-dliebNR45yj1Gvyv4WE7dMnWcdHx94PLjBv3AWhdS5I=" } ] diff --git a/pkgs/by-name/ps/ps3-disc-dumper/package.nix b/pkgs/by-name/ps/ps3-disc-dumper/package.nix index 7d90e7ad1549..6599b30bfc92 100644 --- a/pkgs/by-name/ps/ps3-disc-dumper/package.nix +++ b/pkgs/by-name/ps/ps3-disc-dumper/package.nix @@ -10,13 +10,13 @@ buildDotnetModule rec { pname = "ps3-disc-dumper"; - version = "4.3.0"; + version = "4.3.6"; src = fetchFromGitHub { owner = "13xforever"; repo = "ps3-disc-dumper"; tag = "v${version}"; - hash = "sha256-FtKFX7w60lAt7aMg/KNumFGESluYZf1/vzjdkLctkqs="; + hash = "sha256-dHd5pAWvol4TQBXcbb1E71TTxEWvLogvj0K4VL9huNs="; }; dotnet-sdk = dotnetCorePackages.sdk_9_0; @@ -27,12 +27,6 @@ buildDotnetModule rec { projectFile = "UI.Avalonia/UI.Avalonia.csproj"; nugetDeps = ./deps.json; - preConfigureNuGet = '' - # This should really be in the upstream nuget.config - dotnet nuget add source https://api.nuget.org/v3/index.json \ - -n nuget.org --configfile nuget.config - ''; - runtimeDeps = [ zlib openssl diff --git a/pkgs/by-name/ps/psc-package/package.nix b/pkgs/by-name/ps/psc-package/package.nix index dcdceee7cd93..0b69b4db9bd0 100644 --- a/pkgs/by-name/ps/psc-package/package.nix +++ b/pkgs/by-name/ps/psc-package/package.nix @@ -6,7 +6,6 @@ gmp, zlib, libiconv, - darwin, installShellFiles, }: @@ -52,7 +51,6 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool \ - -change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib \ -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \ $PSC_PACKAGE '' diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index ffbd140a6627..174a3b39f63a 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -1,4 +1,5 @@ { + stdenv, buildGoModule, fetchFromGitHub, installShellFiles, @@ -9,16 +10,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.230.0"; + version = "0.241.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-aWml3iTcci1V8RkiCrvv+E7zmW5JJCDzDNv2RaDhjAg="; + sha256 = "sha256-he9LLC8ijbgfmTDVURKZhU5RyOJC8U4vjPQBNNtC9WI="; }; - vendorHash = "sha256-soDM7IfgTKWZnFNfGSlKH4aScGr1A26OZrgqiJ5UAlA="; + vendorHash = "sha256-Gt2dDgIAn7Hjlb2VI5VBKP7IfzkMZvCyLmOYYBtLx3o="; ldflags = [ "-s" @@ -30,7 +31,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd pscale \ --bash <($out/bin/pscale completion bash) \ --fish <($out/bin/pscale completion fish) \ diff --git a/pkgs/by-name/ps/pshash/package.nix b/pkgs/by-name/ps/pshash/package.nix index fcc3f5b74e99..d5fd1efe885e 100644 --- a/pkgs/by-name/ps/pshash/package.nix +++ b/pkgs/by-name/ps/pshash/package.nix @@ -5,12 +5,12 @@ }: haskellPackages.mkDerivation rec { pname = "pshash"; - version = "0.1.14.6"; + version = "0.1.15.0"; src = fetchFromGitHub { owner = "thornoar"; repo = "pshash"; tag = "v${version}"; - hash = "sha256-gqIdfIC8f9aF4ojHBhKOTvIr34kuTGQ5R/q1D+0c4bA="; + hash = "sha256-i3jDt9ghA21OkkKjBk5a7Xok+ESskMPNA8WP+MUZxVk="; }; postPatch = '' diff --git a/pkgs/by-name/ps/pspg/package.nix b/pkgs/by-name/ps/pspg/package.nix index fb2addc0c646..260655a7d6f0 100644 --- a/pkgs/by-name/ps/pspg/package.nix +++ b/pkgs/by-name/ps/pspg/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.8.8"; + version = "5.8.10"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = version; - sha256 = "sha256-8Wi8fMEBc1A0foEzwO5Dq6c3yC0pJ9hbzCjjMp+Lapg="; + sha256 = "sha256-kkynCpnwdoAwWEs+gXO0ZPkPk+U4Phl0iL/s3CnL0zA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ps/psql2csv/package.nix b/pkgs/by-name/ps/psql2csv/package.nix index 1e010d10077c..aaef5311a9ce 100644 --- a/pkgs/by-name/ps/psql2csv/package.nix +++ b/pkgs/by-name/ps/psql2csv/package.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation rec { description = "Tool to run a PostreSQL query and output the result as CSV"; homepage = "https://github.com/fphilipe/psql2csv"; license = licenses.mit; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; inherit (postgresql.meta) platforms; mainProgram = "psql2csv"; }; diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix index 0aacf5c815d6..9f86aabed1d4 100644 --- a/pkgs/by-name/ps/psqlodbc/package.nix +++ b/pkgs/by-name/ps/psqlodbc/package.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { autoreconfHook ]; + strictDeps = true; + passthru = { updateScript = nix-update-script { }; @@ -46,15 +48,19 @@ stdenv.mkDerivation rec { driver = "lib/psqlodbcw.so"; }; - configureFlags = [ - "--with-libpq=${lib.getDev libpq}" - ] ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}"; + configureFlags = + [ + "CPPFLAGS=-DSQLCOLATTRIBUTE_SQLLEN" # needed for cross + "--with-libpq=${lib.getDev libpq}" + ] + ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}" + ++ lib.optional withUnixODBC "--with-unixodbc=${unixODBC}"; meta = with lib; { homepage = "https://odbc.postgresql.org/"; description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; platforms = platforms.unix; - maintainers = libpq.meta.maintainers; + teams = libpq.meta.teams; }; } diff --git a/pkgs/by-name/ps/psst/package.nix b/pkgs/by-name/ps/psst/package.nix index ebc533b9bbe7..af702e84d0a5 100644 --- a/pkgs/by-name/ps/psst/package.nix +++ b/pkgs/by-name/ps/psst/package.nix @@ -33,17 +33,17 @@ let in rustPlatform.buildRustPackage { pname = "psst"; - version = "0-unstable-2025-02-22"; + version = "0-unstable-2025-04-20"; src = fetchFromGitHub { owner = "jpochyla"; repo = "psst"; - rev = "dd47c302147677433d70b398b1bcd7f1ade87638"; - hash = "sha256-EMjY8Tu+ssO30dD2qsvi3FAkt/UlXwM/ss2/FcyNNgI="; + rev = "86169f8b05c1b3502261cfe1fae9af2487b8f1bb"; + hash = "sha256-BkGoaYflCTiElTj47r2j/ngUrZ9wIe0q4pl+zhoattA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0UllCmIe6oEl2Ecl4nqSk9ODdgso5ucX8T5nG3dVwbE="; + cargoHash = "sha256-gt2EDrZ+XXig5JUsmQksSLaFd7UArnttOT4UiTVASXw="; # specify the subdirectory of the binary crate to build from the workspace buildAndTestSubdir = "psst-gui"; diff --git a/pkgs/by-name/ps/psstop/package.nix b/pkgs/by-name/ps/psstop/package.nix deleted file mode 100644 index 67968128d828..000000000000 --- a/pkgs/by-name/ps/psstop/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - pkg-config, - glib, -}: - -stdenv.mkDerivation rec { - pname = "psstop"; - version = "1.3"; - - src = fetchFromGitHub { - owner = "clearlinux"; - repo = "psstop"; - rev = "v${version}"; - sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ glib ]; - - meta = with lib; { - homepage = "https://github.com/clearlinux/psstop"; - description = "Show processes' memory usage by looking into pss"; # upstream summary - license = licenses.gpl3; - maintainers = with maintainers; [ dtzWill ]; - mainProgram = "psstop"; - }; -} diff --git a/pkgs/by-name/ps/pstoedit/package.nix b/pkgs/by-name/ps/pstoedit/package.nix index af1916667b2d..6b93fb4ec998 100644 --- a/pkgs/by-name/ps/pstoedit/package.nix +++ b/pkgs/by-name/ps/pstoedit/package.nix @@ -2,7 +2,6 @@ stdenv, fetchurl, pkg-config, - darwin, lib, zlib, ghostscript, @@ -24,6 +23,11 @@ stdenv.mkDerivation rec { hash = "sha256-VYi0MtLGsq2YKLRJFepYE/+aOjMSpB+g3kw43ayd9y8="; }; + postPatch = '' + # don't use gnu-isms like link.h on macos + substituteInPlace src/pstoedit.cpp --replace-fail '#ifndef _MSC_VER' '#if !defined(_MSC_VER) && !defined(__APPLE__)' + ''; + outputs = [ "out" "dev" @@ -42,19 +46,9 @@ stdenv.mkDerivation rec { libjpeg libwebp ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - libiconv - ApplicationServices - ] - ); - - # '@LIBPNG_LDFLAGS@' is no longer substituted by autoconf (the code is commented out) - # so we need to remove it from the pkg-config file as well - preConfigure = '' - substituteInPlace config/pstoedit.pc.in --replace '@LIBPNG_LDFLAGS@' "" - ''; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; postInstall = '' wrapProgram $out/bin/pstoedit \ diff --git a/pkgs/by-name/pt/pt2-clone/package.nix b/pkgs/by-name/pt/pt2-clone/package.nix index 99042320dd60..2b2acb462878 100644 --- a/pkgs/by-name/pt/pt2-clone/package.nix +++ b/pkgs/by-name/pt/pt2-clone/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.72"; + version = "1.73"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Laq2C2bjLqeyT8eRH0DVjGmGg8R3TBfFL3XzwXTzKzo="; + sha256 = "sha256-x7pAMa5Bs7Wc/rnQgEoxV0h1TbvNp5Q+vtlNXmyEgSw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/pt/ptask/json_c_is_error.patch b/pkgs/by-name/pt/ptask/json_c_is_error.patch deleted file mode 100644 index 435c8b26e6f7..000000000000 --- a/pkgs/by-name/pt/ptask/json_c_is_error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tw.c b/src/tw.c -index 602f7b3..ca601cd 100644 ---- a/src/tw.c -+++ b/src/tw.c -@@ -163,7 +163,7 @@ static struct json_object *task_exec_json(const char *opts) - - free(cmd); - -- if (o && is_error(o)) -+ if (!o) - return NULL; - - return o; diff --git a/pkgs/by-name/pt/ptask/package.nix b/pkgs/by-name/pt/ptask/package.nix deleted file mode 100644 index 88fff269fc71..000000000000 --- a/pkgs/by-name/pt/ptask/package.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - makeWrapper, - gtk3, - json_c, - taskwarrior2, -}: - -stdenv.mkDerivation rec { - pname = "ptask"; - version = "1.0.0"; - - src = fetchurl { - url = "https://wpitchoune.net/ptask/files/ptask-${version}.tar.gz"; - sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq"; - }; - - buildInputs = [ - gtk3 - json_c - ]; - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - - patches = [ - ./tw-version.patch - ./json_c_is_error.patch - ]; - - preFixup = '' - wrapProgram "$out/bin/ptask" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix PATH : "${taskwarrior2}/bin" - ''; - - meta = with lib; { - homepage = "http://wpitchoune.net/ptask/"; - description = "GTK-based GUI for taskwarrior"; - mainProgram = "ptask"; - license = licenses.gpl2; - maintainers = [ maintainers.spacefrogg ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/pt/ptask/tw-version.patch b/pkgs/by-name/pt/ptask/tw-version.patch deleted file mode 100644 index 995fffeda2f8..000000000000 --- a/pkgs/by-name/pt/ptask/tw-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/tw.c 2017-02-21 22:56:19.289037608 +0100 -+++ b/src/tw.c 2017-02-21 22:57:04.726814256 +0100 -@@ -116,7 +116,7 @@ - || !strcmp(ver, "2.3.0") - || !strcmp(ver, "2.4.0") - || !strcmp(ver, "2.4.1") -- || !strcmp(ver, "2.5.0")) -+ || !strcmp(ver, "2.5.1")) - return 1; - else - return 0; diff --git a/pkgs/by-name/pt/ptcollab/package.nix b/pkgs/by-name/pt/ptcollab/package.nix index 67eeddb61681..372da09be9db 100644 --- a/pkgs/by-name/pt/ptcollab/package.nix +++ b/pkgs/by-name/pt/ptcollab/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ptcollab"; - version = "0.6.4.8"; + version = "0.6.4.9"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${finalAttrs.version}"; - hash = "sha256-9u2K79QJRfYKL66e1lsRrQMEqmKTWbK+ucal3/u4rP4="; + hash = "sha256-1fVhimwBAYtC+HnuxA7ywfEnVlqHnlzwfKT9+H/ZG0k="; }; nativeBuildInputs = diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix index 366a186d99ed..22eb0f46f25e 100644 --- a/pkgs/by-name/pt/ptyxis/package.nix +++ b/pkgs/by-name/pt/ptyxis/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ptyxis"; - version = "47.10"; + version = "48.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "ptyxis"; - rev = finalAttrs.version; - hash = "sha256-ZZwrqX7GkqMVtLhyzJvThzqmxg/PRwBxSshSv/Z7uKo="; + tag = finalAttrs.version; + hash = "sha256-Uj3RUMaPU/KHhhtsrw+kD5HBM+UY4MY/Ov4/8wjNpyI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index ca99e248714a..5ce8b7bfca68 100644 --- a/pkgs/by-name/pu/publicsuffix-list/package.nix +++ b/pkgs/by-name/pu/publicsuffix-list/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2025-02-12"; + version = "0-unstable-2025-03-12"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "560007a8aea8267f15cad9abcdbcff7848186bd8"; - hash = "sha256-/5O0ac0mJZzOgy8h1NE0dTt0jzAEkymBbh5hJmc1+qk="; + rev = "b85018227bf5620427fc719c80fd652d52fd945f"; + hash = "sha256-IV9k14VQlr92hzcApLCYA6rHdVRQL9kgRTJzyz37TRY="; }; dontBuild = true; diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix index 8f8355569f05..b90481040830 100644 --- a/pkgs/by-name/pu/publii/package.nix +++ b/pkgs/by-name/pu/publii/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "publii"; - version = "0.46.4"; + version = "0.46.5"; src = fetchurl { url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-06bPVsfWHASQFzsXr5QONZq27UaeXbMfqyuuKmTcjNE="; + hash = "sha256-VymAHQNv3N7Mqe8wiUfYawi1BooczLFClxuwaW8NetA="; }; dontConfigure = true; diff --git a/pkgs/by-name/pu/pueue/package.nix b/pkgs/by-name/pu/pueue/package.nix new file mode 100644 index 000000000000..6412b1e21a8f --- /dev/null +++ b/pkgs/by-name/pu/pueue/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + libiconv, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "pueue"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "Nukesor"; + repo = "pueue"; + rev = "v${version}"; + hash = "sha256-TDxTj7VGzJzd6RWyVbe2ubpVS57bqq7OVvi23ZHmYDM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-R94D9/J+Zl86Rb4+5O2Hp9GmcwnRt+0wJ56CHFoy/zg="; + + nativeBuildInputs = + [ + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + rustPlatform.bindgenHook + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + checkFlags = [ + "--test client_tests" + "--skip=test_single_huge_payload" + "--skip=test_create_unix_socket" + ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/pueue completions $shell . + done + installShellCompletion pueue.{bash,fish} _pueue + ''; + + meta = with lib; { + homepage = "https://github.com/Nukesor/pueue"; + description = "Daemon for managing long running shell commands"; + longDescription = '' + Pueue is a command-line task management tool for sequential and parallel + execution of long-running tasks. + + Simply put, it's a tool that processes a queue of shell commands. On top + of that, there are a lot of convenient features and abstractions. + + Since Pueue is not bound to any terminal, you can control your tasks from + any terminal on the same machine. The queue will be continuously + processed, even if you no longer have any active ssh sessions. + ''; + changelog = "https://github.com/Nukesor/pueue/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ sarcasticadmin ]; + }; +} diff --git a/pkgs/by-name/pu/puffin/package.nix b/pkgs/by-name/pu/puffin/package.nix index ac3959e111c4..93b60c891f06 100644 --- a/pkgs/by-name/pu/puffin/package.nix +++ b/pkgs/by-name/pu/puffin/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "puffin"; - version = "2.1.1"; + version = "2.1.5"; src = fetchFromGitHub { owner = "siddhantac"; repo = pname; rev = "v${version}"; - hash = "sha256-5lglIiVOsxnMbeR/E3O5TaMtoR5DJACWjStE4d7hDao="; + hash = "sha256-cXhnCCg5A/G/FKWfCpq130qSD1iTGpgidqzGGnIPqO8="; }; vendorHash = "sha256-ZxAqR3D5VUtbntktrpnywPG3m9rq1utO4fdum0Qe6TU="; diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index 9bb1a49a7c60..3b5f7645d154 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -36,14 +36,14 @@ let pname = "pulsar"; - version = "1.127.1"; + version = "1.128.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-qcsnYrfrKD9QKcV2eEYVcHNKxpGUtC9G2D3G/ceuWCw="; + x86_64-linux.hash = "sha256-LDr5H2VchlTzHtwcDo0za9GWfKZTpXx6LZVwtgKWxxY="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-V40O0M6H7sveuYpHB9vdatUR+r7q0YKTI4XcGOQXffo="; + aarch64-linux.hash = "sha256-tT55J2TDRiEcsh5vNVl2dapRdYj3yZsn0ZrfjO5qnqE="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/pu/pulsar/update.mjs b/pkgs/by-name/pu/pulsar/update.mjs index 4da49b268d9a..215092faab02 100755 --- a/pkgs/by-name/pu/pulsar/update.mjs +++ b/pkgs/by-name/pu/pulsar/update.mjs @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell /* -#!nix-shell -i node -p nodejs_18 +#!nix-shell -i node -p nodejs */ import { promises as fs } from 'node:fs'; diff --git a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix index ceec2b35af4c..c25bb4d5bbb3 100644 --- a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix +++ b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pulseaudio-module-xrdp"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = pname; rev = "v${version}"; - hash = "sha256-GT0kBfq6KvuiX30B9JzCiUxgSm9E6IhdJuQKKKprDCE="; + hash = "sha256-R1ZPifEjlueTJma6a0UiGdiNwTSa5+HnW4w9qGrauxE="; }; preConfigure = '' diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix index 08dd1f41862b..e40f234c099d 100644 --- a/pkgs/by-name/pu/pulumi-esc/package.nix +++ b/pkgs/by-name/pu/pulumi-esc/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "pulumi-esc"; - version = "0.13.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "pulumi"; repo = "esc"; rev = "v${version}"; - hash = "sha256-hQYA8j0fmVdlRuUfZy4NT5oYYot2lHrTqFCPe255F2k="; + hash = "sha256-vJDhuxbnbDevHeOqS8Mnl3hjNx4Fjw3Ab0ZXa4wJRGA="; }; subPackages = "cmd/esc"; - vendorHash = "sha256-J4ozpVm177DR+a35ckMtLY/4rFIPU6MsI5ewXz/wYGc="; + vendorHash = "sha256-v2+fisMMNUZVcDbUhXDGAUU6rC+Clrh/rb3cuuSCLF0="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix index 219a23859dec..d1557c9dcfa3 100644 --- a/pkgs/by-name/pu/pulumi/package.nix +++ b/pkgs/by-name/pu/pulumi/package.nix @@ -10,21 +10,25 @@ callPackage, testers, pulumi, + pulumiPackages, + python3Packages, + nix-update-script, + _experimental-update-script-combinators, }: buildGoModule rec { pname = "pulumi"; - version = "3.156.0"; + version = "3.162.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi"; tag = "v${version}"; - hash = "sha256-1iML+WCEkLMdAJ7e+F5XwBzM+pn3eZQsCaSi3Ui/JdM="; + hash = "sha256-avtqURmj3PL82j89kLmVsBWqJJHnOFqR1huoUESt4L4="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorHash = "sha256-2hpn1IKJvWtXgNKgf56dZABA4VO1aT0cDsHOmCEPrGo="; + vendorHash = "sha256-fJFpwhbRkxSI2iQfNJ9qdL9oYM1SVVMJ30VIymoZBmg="; sourceRoot = "${src.name}/pkg"; @@ -56,6 +60,11 @@ buildGoModule rec { # Skip tests that fail in Nix sandbox. "-skip=^${ lib.concatStringsSep "$|^" [ + # Concurrent map modification in test case. + # TODO: remove after the fix is merged and released. + # https://github.com/pulumi/pulumi/pull/19200 + "TestGetDocLinkForPulumiType" + # Seems to require TTY. "TestProgressEvents" @@ -68,6 +77,10 @@ buildGoModule rec { "TestGenerateOnlyProjectCheck" "TestPulumiNewSetsTemplateTag" "TestPulumiPromptRuntimeOptions" + "TestPulumiNewOrgTemplate" + "TestPulumiNewWithOrgTemplates" + "TestPulumiNewWithoutPulumiAccessToken" + "TestPulumiNewWithoutTemplateSupport" # Connects to https://pulumi-testing.vault.azure.net/… "TestAzureCloudManager" @@ -117,12 +130,39 @@ buildGoModule rec { passthru = { pkgs = callPackage ./plugins.nix { }; withPackages = callPackage ./with-packages.nix { }; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + (nix-update-script { + attrPath = "pulumiPackages.pulumi-go"; + extraArgs = [ "--version=skip" ]; + }) + (nix-update-script { + attrPath = "pulumiPackages.pulumi-nodejs"; + extraArgs = [ "--version=skip" ]; + }) + (nix-update-script { + attrPath = "pulumiPackages.pulumi-python"; + extraArgs = [ "--version=skip" ]; + }) + ]; tests = { version = testers.testVersion { package = pulumi; version = "v${version}"; command = "PULUMI_SKIP_UPDATE_CHECK=1 pulumi version"; }; + # Test building packages that reuse our version and src. + inherit (pulumiPackages) pulumi-go pulumi-nodejs pulumi-python; + # Pulumi currently requires protobuf4, but Nixpkgs defaults to a newer + # version. Test that we can actually build the package with protobuf4. + # https://github.com/pulumi/pulumi/issues/16828 + # https://github.com/NixOS/nixpkgs/issues/351751#issuecomment-2462163436 + pythonPackage = + (python3Packages.overrideScope ( + final: _: { + protobuf = final.protobuf4; + } + )).pulumi; pulumiTestHookShellcheck = testers.shellcheck { name = "pulumi-test-hook-shellcheck"; src = ./extra/pulumi-test-hook.sh; diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix index a7371c0e6b67..2d7c350626ad 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix @@ -9,7 +9,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/go/pulumi-language-go"; - vendorHash = "sha256-MqqkDuCAHsxyzcofufMSzf1TpntnMy+sNHhBY5vr+TE="; + vendorHash = "sha256-3I9Kh3Zqpu0gT0pQNzg2mMwxQUdhEpjITZOrO7Yt50A="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix index c3dd0f050239..0eae02fc2a21 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs"; - vendorHash = "sha256-Blhbjc9nNj2ZDKs6uO/IZ5RuFJJTkS2wJF/7Egc7VvA="; + vendorHash = "sha256-UvfSmHWRFRZkmcgzUrLkqktQAt8ZlVDEzP6y+pxUOGc="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix index 74ff53ad2b08..5930c1ffef81 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python"; - vendorHash = "sha256-x3dWYM8/2cWWhTmfGEDdrGHntqIDObYwQicSHIXr1rw="; + vendorHash = "sha256-5tr3mQ5x6jMOa9meHK6gaoRjNgLoHkWiTiaYXXqmUDo="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-scala/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-scala/package.nix new file mode 100644 index 000000000000..37c0cdf79c8a --- /dev/null +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-scala/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "pulumi-scala"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "VirtusLab"; + repo = "besom"; + tag = "v${version}"; + hash = "sha256-ZOWC8S4OP2URfrzeegMmrJ9yC5xwCuC1cdEtBEsaCdk="; + }; + + sourceRoot = "source/language-plugin/pulumi-language-scala"; + vendorHash = "sha256-GGkHKLKtcx/uW9CvrFIFKr2sZD3Mx0RYQM3lI9HvMXY="; + + postInstall = '' + mv $out/bin/language-host $out/bin/${meta.mainProgram} + ''; + + meta = { + description = "Besom - a Pulumi SDK for Scala. Also, incidentally, a broom made of twigs tied round a stick. Brooms and besoms are used for protection, to ward off evil spirits, and cleansing of ritual spaces"; + homepage = "https://github.com/VirtusLab/besom"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nikolaiser ]; + mainProgram = "pulumi-language-scala"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/pu/pulumictl/package.nix b/pkgs/by-name/pu/pulumictl/package.nix index 110b623787bf..3f1c059d75d8 100644 --- a/pkgs/by-name/pu/pulumictl/package.nix +++ b/pkgs/by-name/pu/pulumictl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.48"; + version = "0.0.49"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-rFVxfWeESWmqH0BhKY6BO5AxSPXVW8tOPGyUXB5Kc/E="; + sha256 = "sha256-VEfDKkavZWWxfE1J2Cy/lnPyHiOJWOtwwcYpeb1pkkM="; }; - vendorHash = "sha256-x5CBSzwOfX0BwwbAOuW1ibrLnnkVSNjqG0Sj2EcmRbM="; + vendorHash = "sha256-IqJdbeayUcTTEiPAar1goqubAjTavJNYOzCyKXGd0Q8="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/puncia/package.nix b/pkgs/by-name/pu/puncia/package.nix index de2599361b26..05af38dc4c36 100644 --- a/pkgs/by-name/pu/puncia/package.nix +++ b/pkgs/by-name/pu/puncia/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "puncia"; - version = "0.29"; + version = "0.30"; pyproject = true; src = fetchFromGitHub { owner = "ARPSyndicate"; repo = "puncia"; tag = "v${version}"; - hash = "sha256-46qJ5sUQs8A8wiNj1Oj/1s4roAR+gtwmcGqHhkkUvd0="; + hash = "sha256-woy8JL+yFOYUsAhYWxyskUj/hT3JmwrhKHg3JHyWzNY="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/pu/pur/package.nix b/pkgs/by-name/pu/pur/package.nix index bd14c61b7df8..3d1723fe119b 100644 --- a/pkgs/by-name/pu/pur/package.nix +++ b/pkgs/by-name/pu/pur/package.nix @@ -16,20 +16,18 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-zSEzYYpDmu3fennTZNvQjAoMekzxoMDUEqvSjN6hNUk="; }; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; - dependencies = with python3.pkgs; [ - click - ]; + dependencies = with python3.pkgs; [ click ]; - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; - pythonImportsCheck = [ - "pur" + pythonImportsCheck = [ "pur" ]; + + disabledTests = [ + # Tests are failing after the last mass update + "test_missing_requirements_file" + "test_no_arguments_and_no_requirements_file" ]; meta = with lib; { diff --git a/pkgs/by-name/pu/pureref/package.nix b/pkgs/by-name/pu/pureref/package.nix index d9ff3269f162..069ff4f7e3a3 100644 --- a/pkgs/by-name/pu/pureref/package.nix +++ b/pkgs/by-name/pu/pureref/package.nix @@ -5,26 +5,39 @@ curl, gnugrep, cacert, + dpkg, }: - -appimageTools.wrapType1 rec { - pname = "pureref"; +let version = "2.0.3"; - - src = - runCommand "PureRef-${version}_x64.Appimage" + deb = + runCommand "PureRef-${version}_x64" { nativeBuildInputs = [ curl gnugrep cacert + dpkg ]; - outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM="; + outputHash = "sha256-VdKu1YQa+//FbNWqgTPoUhY4pSekgVohI53D4i5hVkQ="; + outputHashMode = "recursive"; } '' key="$(curl -A 'nixpkgs/Please contact maintainer if there is an issue' "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)" - curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out + curl -L "https://www.pureref.com/files/build.php?build=LINUX64.deb&version=${version}&downloadKey=$key" --output $name.deb + dpkg-deb -x $name.deb $out + chmod 755 $out ''; +in +appimageTools.wrapType1 { + pname = "pureref"; + inherit version; + + src = "${deb}/usr/bin/PureRef"; + + extraInstallCommands = '' + mv $out/bin/pureref $out/bin/PureRef + cp -r ${deb}/usr/share $out + ''; meta = with lib; { description = "Reference Image Viewer"; @@ -35,6 +48,7 @@ appimageTools.wrapType1 rec { husjon ]; platforms = [ "x86_64-linux" ]; + mainProgram = "PureRef"; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix index d6157bab9918..626b4e16f7d1 100644 --- a/pkgs/by-name/pv/pvs-studio/package.nix +++ b/pkgs/by-name/pv/pvs-studio/package.nix @@ -3,6 +3,7 @@ stdenv, fetchzip, + installShellFiles, makeWrapper, perl, strace, @@ -14,7 +15,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "pvs-studio"; - version = "7.33.85330.89"; + version = "7.36.91321.455"; src = let @@ -23,27 +24,36 @@ stdenv.mkDerivation rec { in fetchzip { url = selectSystem { - x86_64-darwin = "https://web.archive.org/web/20241115155106/https://cdn.pvs-studio.com/pvs-studio-7.33.85330.89-macos.tgz"; - x86_64-linux = "https://web.archive.org/web/20241115155538/https://cdn.pvs-studio.com/pvs-studio-7.33.85330.89-x86_64.tgz"; + aarch64-darwin = "https://web.archive.org/web/20250411093324/https://files.pvs-studio.com/pvs-studio-${version}-macos-arm64.tgz"; + x86_64-darwin = "https://web.archive.org/web/20250411092440/https://files.pvs-studio.com/pvs-studio-${version}-macos-x86_64.tgz"; + x86_64-linux = "https://web.archive.org/web/20250411091929/https://files.pvs-studio.com/pvs-studio-${version}-x86_64.tgz"; }; hash = selectSystem { - x86_64-darwin = "sha256-jhfW+uBexzYzzf3JVqRYqtDjE5+OoT3RcuRPJEOEs18="; - x86_64-linux = "sha256-rJQc8B2B7J0bcEI00auwIO/4PH2YMkuzSK/OyAnhdBA="; + aarch64-darwin = "sha256-KEDKsWXg+CRwsEi7hNKlC3CWldBtvf9Jw79vuLMKSOE="; + x86_64-darwin = "sha256-Esf+pohienMAkWs1q5fYZ+0RzzK/WxOGljRXYJ0AtFI="; + x86_64-linux = "sha256-Be4IGFA+307zuMnhXBZko6T27TYeBZHX/zxaXBWVPHo="; }; }; - nativeBuildInputs = [ makeWrapper ]; - - nativeRuntimeInputs = lib.makeBinPath [ - perl - strace + nativeBuildInputs = [ + installShellFiles + makeWrapper ]; + nativeRuntimeInputs = lib.makeBinPath ( + [ + perl + ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform strace) [ + strace + ] + ); + installPhase = '' runHook preInstall install -D -m 0755 bin/* -t $out/bin - install -D -m 0644 etc/bash_completion.d/* -t $out/etc/bash_completion.d + installShellCompletion --bash etc/bash_completion.d/* runHook postInstall ''; @@ -62,6 +72,7 @@ stdenv.mkDerivation rec { homepage = "https://pvs-studio.com/en/pvs-studio"; license = lib.licenses.unfreeRedistributable; platforms = [ + "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; diff --git a/pkgs/by-name/pw/pwninit/package.nix b/pkgs/by-name/pw/pwninit/package.nix new file mode 100644 index 000000000000..3a889cef0f54 --- /dev/null +++ b/pkgs/by-name/pw/pwninit/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + openssl, + elfutils, + makeBinaryWrapper, + pkg-config, + xz, +}: + +rustPlatform.buildRustPackage rec { + pname = "pwninit"; + version = "3.3.1"; + + src = fetchFromGitHub { + owner = "io12"; + repo = "pwninit"; + rev = version; + sha256 = "sha256-tbZS7PdRFvO2ifoHA/w3cSPfqqHrLeLHAg6V8oG9gVE="; + }; + + buildInputs = [ + openssl + xz + ]; + nativeBuildInputs = [ + pkg-config + makeBinaryWrapper + ]; + postInstall = '' + wrapProgram $out/bin/pwninit \ + --prefix PATH : "${lib.getBin elfutils}/bin" + ''; + doCheck = false; # there are no tests to run + + useFetchCargoVendor = true; + cargoHash = "sha256-N0vje5ZU7B++f71BJKwkEfpbInpermH241f6oP1/fQE="; + + meta = { + description = "Automate starting binary exploit challenges"; + mainProgram = "pwninit"; + homepage = "https://github.com/io12/pwninit"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.scoder12 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix index 0ef4f94a3df1..55978beac35d 100644 --- a/pkgs/by-name/pw/pwsafe/package.nix +++ b/pkgs/by-name/pw/pwsafe/package.nix @@ -20,22 +20,18 @@ curl, openssl, file, - darwin, gitUpdater, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.20.0"; # do NOT update to 3.x Windows releases + version = "1.21.0fp"; # do NOT update to 3.x Windows releases src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-GmM7AXnTjw6kme2mZqmKrirsorosSygJ38H5fnIqTZ4="; + hash = "sha256-pPKUFX6NNGtGGjHL3g0Y6xzj+bHU2KDNMhYCnpP9wgM="; }; strictDeps = true; @@ -66,9 +62,6 @@ stdenv.mkDerivation rec { libuuid libyubikey yubikey-personalization - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa ]; cmakeFlags = diff --git a/pkgs/by-name/px/pxlib/package.nix b/pkgs/by-name/px/pxlib/package.nix deleted file mode 100644 index b0ac6d42e7fe..000000000000 --- a/pkgs/by-name/px/pxlib/package.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - intltool, -}: - -stdenv.mkDerivation rec { - pname = "pxlib"; - version = "0.6.8"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1yafwz4z5h30hqvk51wpgbjlmq9f2z2znvfim87ydrfrqfjmi6sz"; - }; - - nativeBuildInputs = [ intltool ]; - - meta = with lib; { - description = "Library to read and write Paradox files"; - homepage = "https://pxlib.sourceforge.net/"; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = [ maintainers.winpat ]; - }; -} diff --git a/pkgs/by-name/px/pxview/package.nix b/pkgs/by-name/px/pxview/package.nix deleted file mode 100644 index ea3542adc879..000000000000 --- a/pkgs/by-name/px/pxview/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - perl, - perlPackages, - pxlib, -}: - -stdenv.mkDerivation rec { - pname = "pxview"; - version = "0.2.5"; - src = fetchurl { - url = "mirror://sourceforge/pxlib/${pname}_${version}.orig.tar.gz"; - sha256 = "1kpdqs6lvnyj02v9fbz1s427yqhgrxp7zw63rzfgiwd4iqp75139"; - }; - - buildInputs = [ - pxlib - perl - ] ++ (with perlPackages; [ libxml_perl ]); - nativeBuildInputs = [ pkg-config ]; - - configureFlags = [ "--with-pxlib=${pxlib.out}" ]; - - # https://sourceforge.net/p/pxlib/bugs/12/ - LDFLAGS = "-lm"; - hardeningDisable = [ "format" ]; - - meta = with lib; { - description = "Program to convert Paradox databases"; - mainProgram = "pxview"; - homepage = "https://pxlib.sourceforge.net/pxview/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.winpat ]; - }; -} diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/by-name/py/py-spy/package.nix similarity index 100% rename from pkgs/development/tools/py-spy/default.nix rename to pkgs/by-name/py/py-spy/package.nix diff --git a/pkgs/by-name/py/pychess/package.nix b/pkgs/by-name/py/pychess/package.nix index fdf109bb150a..c1e86e79b441 100644 --- a/pkgs/by-name/py/pychess/package.nix +++ b/pkgs/by-name/py/pychess/package.nix @@ -8,6 +8,7 @@ gtk3, gst_all_1, gtksourceview, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { @@ -25,6 +26,7 @@ python3Packages.buildPythonApplication rec { pkg-config gobject-introspection wrapGAppsHook3 + writableTmpDirAsHomeHook ]; buildInputs = [ @@ -50,7 +52,6 @@ python3Packages.buildPythonApplication rec { ''; preBuild = '' - export HOME=$(mktemp -d) export PYTHONPATH=./lib:$PYTHONPATH python pgn2ecodb.py python create_theme_preview.py diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix index b74b3ced1f31..94c56ae89c57 100644 --- a/pkgs/by-name/py/pyenv/package.nix +++ b/pkgs/by-name/py/pyenv/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.5.4"; + version = "2.5.7"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; tag = "v${version}"; - hash = "sha256-8+e4kZoJ/dvx5X/JSlvtEzXiGZJmbtxSnWC1Z0YHtic="; + hash = "sha256-JTD++YQzO84zFVhp9BMBqA8Hln990tAFpfZ8YjmrhvU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index 5851bcd5475e..578ef30da73e 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -10,7 +10,7 @@ copyDesktopItems, }: let - version = "2.62.2"; + version = "2.62.3"; in python3Packages.buildPythonApplication rec { inherit version; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-7YFObKV4vXiTWgCfek7k4yVq7IG3JMtaB36Jhu7rGjk="; + hash = "sha256-PqiwZwok7Mv1M4txU3D5MZYu8WxDCetLmvTqZ30rypY="; }; desktopItems = [ diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index e6b473feb735..cc2380e97850 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/py/pympress/package.nix b/pkgs/by-name/py/pympress/package.nix index 8c8801fe8cd9..3532bf57d737 100644 --- a/pkgs/by-name/py/pympress/package.nix +++ b/pkgs/by-name/py/pympress/package.nix @@ -2,7 +2,7 @@ lib, stdenv, python3Packages, - fetchPypi, + fetchFromGitHub, wrapGAppsHook3, gtk3, gobject-introspection, @@ -15,14 +15,31 @@ python3Packages.buildPythonApplication rec { pname = "pympress"; - version = "1.8.5"; + version = "1.8.6"; - src = fetchPypi { - inherit version; - pname = "pympress"; - hash = "sha256-Kb05EV0F8lTamTq7pC1UoOkYf04s58NjMksVE2xTC/Y="; + src = fetchFromGitHub { + owner = "cimbali"; + repo = "pympress"; + tag = "v${version}"; + hash = "sha256-rIlYd5SMWYeqdMHyW3d1ggKnUMCJCDP5uw25d7zG2DU="; }; + build-system = with python3Packages; [ + setuptools + babel + ]; + + dependencies = + with python3Packages; + [ + watchdog + pycairo + pygobject3 + ] + ++ lib.optional withVLC [ + python-vlc + ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection @@ -44,23 +61,13 @@ python3Packages.buildPythonApplication rec { gst_all_1.gst-vaapi ]; - propagatedBuildInputs = - with python3Packages; - [ - pycairo - pygobject3 - setuptools - watchdog - ] - ++ lib.optional withVLC python-vlc; - doCheck = false; # there are no tests - meta = with lib; { + meta = { description = "Simple yet powerful PDF reader designed for dual-screen presentations"; mainProgram = "pympress"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://cimbali.github.io/pympress/"; - maintainers = [ maintainers.tbenst ]; + maintainers = with lib.maintainers; [ tbenst ]; }; } diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 3a1b8c5da185..08ddc3341f28 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.4.4"; + version = "2.4.5"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; tag = version; - hash = "sha256-Vj4Gn9zV0opvLaaMGv8zdS4tYqek0z6ppAhY+nnY6FM="; + hash = "sha256-s93zuBS2jpGLTKKGvna1Zc+ph6A6kemgfkl8j7uSdKY="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix index 7c17ff8fc57a..715a16584f8e 100644 --- a/pkgs/by-name/py/pyradio/package.nix +++ b/pkgs/by-name/py/pyradio/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.3.11.9"; + version = "0.9.3.11.11"; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; tag = version; - hash = "sha256-paDiD47ERcVNQ1iVEKY2xBItFhyedacAAElT0slBYWk="; + hash = "sha256-yVXq9wHuPO87SRxJdFtYeQWFzeX6IwhKdMchhuzo0ms="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 3bfa13310d3f..ed278678450d 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -7,13 +7,13 @@ }: let - version = "1.1.396"; + version = "1.1.399"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-6YvjpLV1Jj5N0CgN9hE7C2X9BMYZBJegB0xpSBW8n5c="; + hash = "sha256-AEdzc0ZC40k+ZUOL6JmFTR2iFYUiQMKnilPFLKoBbDY="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-HwwVshop15nHE5oFuPIFmL5AduJ2z208cv2TbEAEMnY="; + npmDepsHash = "sha256-idKRVd3xYreLQe5cc5jRYCB6BKsnrBbYs91FdnNE1KU="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -58,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-ywQimf2w5xXbNqcluv6Bi/wH7/QQG0U/r6Ferx9vbis="; + npmDepsHash = "sha256-lgnTbvlwOcGr2E/X6pMebxwaIXo/Fqd8cjcSUmihKe4="; postPatch = '' chmod +w ../../ diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/by-name/py/pysolfc/package.nix similarity index 100% rename from pkgs/games/pysolfc/default.nix rename to pkgs/by-name/py/pysolfc/package.nix diff --git a/pkgs/games/pysolfc/pysolfc-datadir.patch b/pkgs/by-name/py/pysolfc/pysolfc-datadir.patch similarity index 100% rename from pkgs/games/pysolfc/pysolfc-datadir.patch rename to pkgs/by-name/py/pysolfc/pysolfc-datadir.patch diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix index 44744abe8cf2..35981f5ad35c 100644 --- a/pkgs/by-name/py/pyspread/package.nix +++ b/pkgs/by-name/py/pyspread/package.nix @@ -10,10 +10,10 @@ let # get rid of rec pname = "pyspread"; - version = "2.3.1"; + version = "2.4"; src = fetchPypi { inherit pname version; - hash = "sha256-l6b02CIUqPnT16zqOWl6gDdAobkhiqBMFvT+R1Dvtek="; + hash = "sha256-MZlR2Rap5oMRfCmswg9W//FYFkSEki7eyMNhLoGZgJM="; }; inherit (libsForQt5) qtsvg diff --git a/pkgs/by-name/py/python-cosmopolitan/package.nix b/pkgs/by-name/py/python-cosmopolitan/package.nix index a47eb667166e..7869e44446f8 100644 --- a/pkgs/by-name/py/python-cosmopolitan/package.nix +++ b/pkgs/by-name/py/python-cosmopolitan/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { platforms = platforms.x86_64; badPlatforms = platforms.darwin; license = licenses.isc; - maintainers = teams.cosmopolitan.members; + teams = [ teams.cosmopolitan ]; mainProgram = "python.com"; }; } diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index 5538b60ed159..d75918a0a005 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "pytr"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "pytr-org"; repo = "pytr"; tag = "v${version}"; - hash = "sha256-uWG8q6H6q54v3Iq5LOkr7zi5rds+y13O0ai9R9QySdI="; + hash = "sha256-7554su1bR3m6wcIcmT64O+x/kvVlDMsG/hkTym25B/Q="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index 8f79261a6b37..e93f4c3ef4d1 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pywal16"; - version = "3.8.4"; + version = "3.8.6"; pyproject = true; src = fetchFromGitHub { owner = "eylles"; repo = "pywal16"; tag = version; - hash = "sha256-gdFHAvZD1jBc2ZA5NujRUN1nortlzAj3sLh9B+dMJlk="; + hash = "sha256-aq9I9KJnzwFjfLZ2fzW80abJQ/oSX7FcmCXYi1JMY7Q="; }; build-system = [ python3.pkgs.setuptools ]; diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix index ad1372e45f98..d56ffd92ae7a 100644 --- a/pkgs/by-name/q2/q2pro/package.nix +++ b/pkgs/by-name/q2/q2pro/package.nix @@ -11,8 +11,10 @@ curl, SDL2, openalSoft, + libGL, libogg, libvorbis, + libX11, libXi, wayland, wayland-protocols, @@ -30,18 +32,18 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "q2pro"; - version = "0-unstable-2025-03-26"; + version = "0-unstable-2025-05-03"; src = fetchFromGitHub { owner = "skullernet"; repo = "q2pro"; - rev = "7b63f040fdc37389ff4fde074aa24cecbc407f13"; - hash = "sha256-qJvxMRsB7pkKZrM+zWxg+ftDkmABx+7qFA49VZdRFqY="; + rev = "aba81ef8bc277e9a4e11733a449a29d07ea28c7a"; + hash = "sha256-5iUvHmqhB8X9ylTMS1va4qTnPCRPI4yOg2L0Qp2d9hE="; }; # build date and rev number is displayed in the game's console - revCount = "3732"; # git rev-list --count ${src.rev} - SOURCE_DATE_EPOCH = "1742939506"; # git show -s --format=%ct ${src.rev} + revCount = "3817"; # git rev-list --count ${src.rev} + SOURCE_DATE_EPOCH = "1746223027"; # git show -s --format=%ct ${src.rev} nativeBuildInputs = [ @@ -61,8 +63,10 @@ stdenv.mkDerivation (finalAttrs: rec { libjpeg curl SDL2 + libGL libogg libvorbis + libX11 ffmpeg openalSoft ] diff --git a/pkgs/by-name/qb/qbittorrent-cli/package.nix b/pkgs/by-name/qb/qbittorrent-cli/package.nix index 40d3dac0e71f..a58a8bbe7282 100644 --- a/pkgs/by-name/qb/qbittorrent-cli/package.nix +++ b/pkgs/by-name/qb/qbittorrent-cli/package.nix @@ -38,7 +38,7 @@ buildDotnetModule { ]; versionCheckProgram = "${placeholder "out"}/bin/qbt"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix index 2f92d753bb75..441a5b8b9795 100644 --- a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix +++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix @@ -7,13 +7,13 @@ (qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec { pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox"; - version = "5.0.4.10"; + version = "5.1.0.10"; src = fetchFromGitHub { owner = "c0re100"; repo = "qBittorrent-Enhanced-Edition"; rev = "release-${version}"; - hash = "sha256-qYGDPEg4BZZgHschgFjp23EnmaBtmM+UNoC2Lympt/g="; + hash = "sha256-VJqQFx9OvfuGyIfot9CgKiyGawOD3mYIdux20Atjea0="; }; meta = old.meta // { diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix index 102c0f747396..f32b270787e1 100644 --- a/pkgs/by-name/qb/qbittorrent/package.nix +++ b/pkgs/by-name/qb/qbittorrent/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; - version = "5.0.4"; + version = "5.1.0"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${finalAttrs.version}"; - hash = "sha256-8gSSUgYx0CSSb3ackFknZ9r0cWFLxkC7a3Tj8QJaylc="; + hash = "sha256-ZLmKEdvtOxCzEOnJ4JPQQhR427YA288vTRxpk6O0tUc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix index d54085b04b51..a102d6efe50e 100644 --- a/pkgs/by-name/qd/qdiskinfo/package.nix +++ b/pkgs/by-name/qd/qdiskinfo/package.nix @@ -8,6 +8,7 @@ qt6, qdiskinfo, themeBundle ? null, + unstableGitUpdater, }: let @@ -33,15 +34,15 @@ assert && themeBundle' ? rightCharacter ); -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "qdiskinfo"; - version = "0.3"; + version = "0.3-unstable-2025-05-08"; src = fetchFromGitHub { owner = "edisionnano"; repo = "QDiskInfo"; - tag = finalAttrs.version; - hash = "sha256-0zF3Nc5K8+K68HOSy30ieYvYP9/oSkTe0+cp0hVo9Gs="; + rev = "3416cc7ac19b25bb78eab135cf5e0b281e506de0"; + hash = "sha256-loL6fzOSoZyCmrs7joHQCsCStLGgKxmMuqFmtADWTW0="; }; nativeBuildInputs = [ @@ -103,14 +104,18 @@ stdenv.mkDerivation (finalAttrs: { themeName: themeBundle: (qdiskinfo.override { inherit themeBundle; }).overrideAttrs { pname = "qdiskinfo-${themeName}"; } ); + updateScript = unstableGitUpdater { }; }; meta = { description = "CrystalDiskInfo alternative for Linux"; homepage = "https://github.com/edisionnano/QDiskInfo"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ roydubnium ]; + maintainers = with lib.maintainers; [ + roydubnium + ryand56 + ]; platforms = lib.platforms.linux; mainProgram = "QDiskInfo"; }; -}) +} diff --git a/pkgs/by-name/qd/qdl/package.nix b/pkgs/by-name/qd/qdl/package.nix index 7edc70d122c7..068fee74de2d 100644 --- a/pkgs/by-name/qd/qdl/package.nix +++ b/pkgs/by-name/qd/qdl/package.nix @@ -9,41 +9,43 @@ unstableGitUpdater, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "qdl"; - version = "unstable-2024-06-10"; + version = "0-unstable-2025-03-19"; src = fetchFromGitHub { owner = "linux-msm"; repo = "qdl"; - rev = "cbd46184d33af597664e08aff2b9181ae2f87aa6"; - sha256 = "sha256-0PeOunYXY0nEEfGFGdguf5+GNN950GhPfMaD8h1ez/8="; + rev = "30ac3a8abcfb0825157185f11e595d0c7562c0df"; + hash = "sha256-5ZV39whIm8qJIBLNdAsR2e8+f0jYjwE9dGNgh6ARPUY="; }; + postPatch = '' + substituteInPlace Makefile --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config' + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - systemd libxml2 libusb1 ]; - installPhase = '' - runHook preInstall - install -Dm755 ./qdl -t $out/bin - runHook postInstall - ''; + makeFlags = [ + "VERSION=${finalAttrs.src.rev}" + "prefix=${placeholder "out"}" + ]; - meta = with lib; { + meta = { homepage = "https://github.com/linux-msm/qdl"; description = "Tool for flashing images to Qualcomm devices"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ muscaln anas ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "qdl"; }; passthru.updateScript = unstableGitUpdater { }; -} +}) diff --git a/pkgs/by-name/qd/qdocumentview/package.nix b/pkgs/by-name/qd/qdocumentview/package.nix new file mode 100644 index 000000000000..fc72f319be25 --- /dev/null +++ b/pkgs/by-name/qd/qdocumentview/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitLab, + kdePackages, + meson, + ninja, + pkg-config, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qdocumentview"; + version = "0.3.0.1"; + + src = fetchFromGitLab { + owner = "extraqt"; + repo = "qdocumentview"; + tag = "v${finalAttrs.version}"; + hash = "sha256-z5Z43fo6oemGBn5Gfmx5ndeOva+qSH6mwkUWClylChA="; + }; + + nativeBuildInputs = [ + meson + ninja + cmake + pkg-config + ]; + + buildInputs = [ + kdePackages.qtbase + kdePackages.poppler + ]; + + dontWrapQtApps = true; + + meta = { + description = "Widget to render multi-page documents"; + mainProgram = "qdocumentview"; + homepage = "https://gitlab.com/extraqt/qdocumentview"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ emaryn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/qd/qdrant-web-ui/package.nix b/pkgs/by-name/qd/qdrant-web-ui/package.nix index b6609ea78825..d16c33ea5354 100644 --- a/pkgs/by-name/qd/qdrant-web-ui/package.nix +++ b/pkgs/by-name/qd/qdrant-web-ui/package.nix @@ -5,16 +5,16 @@ }: buildNpmPackage rec { pname = "qdrant-web-ui"; - version = "0.1.38"; + version = "0.1.39"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant-web-ui"; tag = "v${version}"; - hash = "sha256-0oUTKX4dDJ8GYRp8oPgx2a7TEHKofn2ZpIEZRpvbfIs="; + hash = "sha256-xMVLZoboDiFYIPNkNgRuJQ0aUVi0Z8qHnD2ExTiIEwE="; }; - npmDepsHash = "sha256-uH8kjCHQk+4vNkgHSlvO0UrvGRh/LKEM1bvrcEHolp0="; + npmDepsHash = "sha256-HT7Lm4PUhVx/HJpeYpni3ZXZ/53Fyq2iTNtpK64XPtU="; npmBuildScript = "build-qdrant"; diff --git a/pkgs/by-name/qd/qdrant/package.nix b/pkgs/by-name/qd/qdrant/package.nix new file mode 100644 index 000000000000..fd0560619101 --- /dev/null +++ b/pkgs/by-name/qd/qdrant/package.nix @@ -0,0 +1,55 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + protobuf, + pkg-config, + openssl, + rust-jemalloc-sys, + nix-update-script, + rust-jemalloc-sys-unprefixed, +}: + +rustPlatform.buildRustPackage rec { + pname = "qdrant"; + version = "1.14.0"; + + src = fetchFromGitHub { + owner = "qdrant"; + repo = "qdrant"; + tag = "v${version}"; + hash = "sha256-o9Nv4UsFgVngKWpe5sUR8tovtpB81tJBSm6We6DN20c="; + }; + + useFetchCargoVendor = true; + + cargoHash = "sha256-xt7uu+YZGazbKwXEKXeIwcGg8G4djQx7nKpQYFv/L3Y="; + + nativeBuildInputs = [ + protobuf + rustPlatform.bindgenHook + pkg-config + ]; + + buildInputs = [ + openssl + rust-jemalloc-sys + rust-jemalloc-sys-unprefixed + ]; + + # Needed to get openssl-sys to use pkg-config. + env.OPENSSL_NO_VENDOR = 1; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Vector Search Engine for the next generation of AI applications"; + longDescription = '' + Expects a config file at config/config.yaml with content similar to + https://github.com/qdrant/qdrant/blob/master/config/config.yaml + ''; + homepage = "https://github.com/qdrant/qdrant"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/by-name/qe/qes/package.nix b/pkgs/by-name/qe/qes/package.nix new file mode 100644 index 000000000000..cf6702b92c53 --- /dev/null +++ b/pkgs/by-name/qe/qes/package.nix @@ -0,0 +1,27 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "qes"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "koekeishiya"; + repo = "qes"; + rev = "ddedf008f0c38b134501ad9f328447b671423d34"; # no tag + sha256 = "1w9ppid7jg6f4q7pq40lhm0whg7xmnxcmf3pb9xqfkq2zj2f7dxv"; + }; + + makeFlags = [ "BUILD_PATH=$(out)/bin" ]; + + meta = with lib; { + description = "Quartz Event Synthesizer"; + homepage = "https://github.com/koekeishiya/qes"; + platforms = platforms.darwin; + maintainers = with maintainers; [ lnl7 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/by-name/qg/qgrep/package.nix b/pkgs/by-name/qg/qgrep/package.nix index dbcd06c4ce67..a6961947e75c 100644 --- a/pkgs/by-name/qg/qgrep/package.nix +++ b/pkgs/by-name/qg/qgrep/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, fetchpatch, - darwin, }: stdenv.mkDerivation rec { @@ -26,11 +25,6 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.CoreFoundation - ]; - env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=unused-command-line-argument" diff --git a/pkgs/by-name/qi/qidi-slicer-bin/package.nix b/pkgs/by-name/qi/qidi-slicer-bin/package.nix index 416f4e4b22e5..a27fd1940f90 100644 --- a/pkgs/by-name/qi/qidi-slicer-bin/package.nix +++ b/pkgs/by-name/qi/qidi-slicer-bin/package.nix @@ -3,15 +3,16 @@ fetchurl, webkitgtk_4_1, libsoup_3, + libpng, lib, }: let pname = "qidi-slicer"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { - url = "https://github.com/QIDITECH/QIDISlicer/releases/download/V${version}/QIDISlicer_${version}_Linux_ubuntu_24.04.AppImage"; - hash = "sha256-sKdNAhnL2jk4UaSxFwKEFKGiC3kvpkyXRzbMXVAg7Kk="; + url = "https://github.com/QIDITECH/QIDISlicer/releases/download/V${version}/QIDISlicer_${version}_Linux_Ubuntu24.AppImage"; + hash = "sha256-76bdVQu+xCf6uCwkHcpLNNna5MgHm4vbuwMFoQ26N0Y="; }; appimageContents = appimageTools.extract { @@ -23,6 +24,7 @@ appimageTools.wrapType2 { extraPkgs = pkgs: [ webkitgtk_4_1 libsoup_3 + libpng ]; extraInstallCommands = '' diff --git a/pkgs/by-name/qi/qir-runner/package.nix b/pkgs/by-name/qi/qir-runner/package.nix index cfa1167666a4..2203f4092044 100644 --- a/pkgs/by-name/qi/qir-runner/package.nix +++ b/pkgs/by-name/qi/qir-runner/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "qir-runner"; - version = "0.7.6"; + version = "0.8.1"; src = fetchFromGitHub { owner = "qir-alliance"; repo = "qir-runner"; tag = "v${version}"; - hash = "sha256-dvzvLm8omt4Uh/yTisaUcwuom0ZJnV6SwwFfbDNjHvM="; + hash = "sha256-ExCIjn5XqDIIYhvEesHRtNZuc4mRr+b9EYE5LNKqNTc="; }; nativeBuildInputs = [ llvmPackages_19.llvm ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-11+TV+7JLLvoWQIwgc4owUV4jNZcjD6S1uUwD8xWAEI="; + cargoHash = "sha256-XzxkSzbjJdJaUmXK2nwd9naIDCsfXiLLlTyf8AFSvzA="; meta = { description = "QIR bytecode runner to assist with QIR development and validation"; diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix new file mode 100644 index 000000000000..dfedb53dfe7e --- /dev/null +++ b/pkgs/by-name/ql/qlog/package.nix @@ -0,0 +1,62 @@ +{ + fetchFromGitHub, + stdenv, + lib, + cups, + hamlib, + pkg-config, + qt6, + qt6Packages, +}: + +stdenv.mkDerivation rec { + pname = "qlog"; + version = "0.43.1"; + + src = fetchFromGitHub { + owner = "foldynl"; + repo = "QLog"; + tag = "v${version}"; + hash = "sha256-D3WtvSHDauo/9py9To2Kn+20vrSvgw+b1+H0inNnRJI="; + fetchSubmodules = true; + }; + + env.NIX_LDFLAGS = "-lhamlib"; + + buildInputs = + [ + hamlib + qt6.qtbase + qt6.qtcharts + qt6.qtserialport + qt6.qtwebchannel + qt6.qtwebengine + qt6Packages.qtkeychain + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cups + ]; + + nativeBuildInputs = [ + pkg-config + qt6.qmake + qt6.wrapQtAppsHook + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/{qlog.app,Applications} + ln -s $out/Applications/qlog.app/Contents/MacOS/qlog $out/bin/qlog + ''; + + meta = { + description = "Amateur radio logbook software"; + mainProgram = "qlog"; + license = with lib.licenses; [ gpl3Only ]; + homepage = "https://github.com/foldynl/QLog"; + maintainers = with lib.maintainers; [ + oliver-koss + ]; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/by-name/qm/qmk/package.nix b/pkgs/by-name/qm/qmk/package.nix index cc093b06d4dc..01015abaca56 100644 --- a/pkgs/by-name/qm/qmk/package.nix +++ b/pkgs/by-name/qm/qmk/package.nix @@ -14,12 +14,12 @@ python3.pkgs.buildPythonApplication rec { pname = "qmk"; - version = "1.1.6"; + version = "1.1.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-3ENs26vy+M7G261FPeODK+AbrI5+nBkHXCmGbuIqi1A="; + hash = "sha256-4Qhzsa5GAAeSgt7FZsRWIVO1ZB+010WtBv9SV38Xgto="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/qm/qmmp/package.nix b/pkgs/by-name/qm/qmmp/package.nix new file mode 100644 index 000000000000..e9c91a1a10d6 --- /dev/null +++ b/pkgs/by-name/qm/qmmp/package.nix @@ -0,0 +1,118 @@ +{ + lib, + stdenv, + fetchurl, + cmake, + pkg-config, + qt6, + # transports + curl, + libmms, + # input plugins + libmad, + taglib, + libvorbis, + libogg, + flac, + libmpcdec, + libmodplug, + libsndfile, + libcdio, + cdparanoia, + libcddb, + faad2, + ffmpeg, + wildmidi, + libbs2b, + game-music-emu, + libarchive, + opusfile, + soxr, + wavpack, + libxmp, + libsidplayfp, + # output plugins + alsa-lib, + libpulseaudio, + pipewire, + libjack2, + # effect plugins + libsamplerate, +}: + +# Additional plugins that can be added: +# ProjectM visualization plugin + +# To make MIDI work we must tell Qmmp what instrument configuration to use (and +# this can unfortunately not be set at configure time): +# Go to settings (ctrl-p), navigate to the WildMidi plugin and click on +# Preferences. In the instrument configuration field, type the path to +# /nix/store/*wildmidi*/etc/wildmidi.cfg (or your own custom cfg file). + +# Qmmp installs working .desktop file(s) all by itself, so we don't need to +# handle that. + +stdenv.mkDerivation rec { + pname = "qmmp"; + version = "2.2.6"; + + src = fetchurl { + url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2"; + hash = "sha256-Jw7Kb9co2aC8fxnpTg4OH2o8RNreZI3/pYoNu3OWy0s="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + # basic requirements + qt6.qtbase + qt6.qttools + qt6.qtmultimedia + # transports + curl + libmms + # input plugins + libmad + taglib + libvorbis + libogg + flac + libmpcdec + libmodplug + libsndfile + libcdio + cdparanoia + libcddb + faad2 + ffmpeg + wildmidi + libbs2b + game-music-emu + libarchive + opusfile + soxr + wavpack + libxmp + libsidplayfp + # output plugins + alsa-lib + libpulseaudio + pipewire + libjack2 + # effect plugins + libsamplerate + ]; + + meta = with lib; { + description = "Qt-based audio player that looks like Winamp"; + mainProgram = "qmmp"; + homepage = "https://qmmp.ylsoftware.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 701a0f4cbde4..02f63045154d 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.3.3"; + version = "25.5.8"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-waWFOPXxKgCb1h1dVSzXDVQwcKyFBKXuAwYXu63ofPo="; + hash = "sha256-5/L7DNHwVW/5RYt65rlHGQdCNNxnZaPKnhwfu4zMRtQ="; }; nativeBuildInputs = @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix index 618e9741370b..857ea50290a1 100644 --- a/pkgs/by-name/qp/qpdf/package.nix +++ b/pkgs/by-name/qp/qpdf/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpdf"; - version = "11.10.0"; + version = "11.10.1"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${finalAttrs.version}"; - hash = "sha256-X5VF7kwnpNNWuQ7iA12qh6JwGU/40EKnGxWst0U+T8k="; + hash = "sha256-MkJpbAIoPZmsYupOjQKOwZomh/rUF+r/kKTdHfT5Dc8="; }; outputs = [ diff --git a/pkgs/by-name/qp/qpid-cpp/package.nix b/pkgs/by-name/qp/qpid-cpp/package.nix index 5d69a4c87416..61f415e6480b 100644 --- a/pkgs/by-name/qp/qpid-cpp/package.nix +++ b/pkgs/by-name/qp/qpid-cpp/package.nix @@ -3,7 +3,7 @@ stdenv, fetchpatch, fetchurl, - boost, + boost183, cmake, libuuid, python3, @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { python3 ]; buildInputs = [ - boost + boost183 libuuid ruby ]; diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index 0d4745d860e1..4db1d34cccc8 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-03-24 +# Last updated: 2025-05-19 { - version = "3.2.16-2025.3.18"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250318_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250318_arm64_01.deb"; - arm64_hash = "sha256-j3aMjxfKyV/IpwxxchMrakJ9ZauA43WwZ9ysoZMEPyE="; - amd64_hash = "sha256-JaTsTL8j0KyACSm1mp9O+l526165+qheJUtTxMH4Tgg="; + version = "3.2.17-2025.5.19"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250519_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250519_arm64_01.deb"; + arm64_hash = "sha256-IGwcZfxePhhu46ARCML/TgVCC2QrIqsd6sh5As30JBY="; + amd64_hash = "sha256-kCA5MmLHumCJqQ959L3wXO9bX5mzhowyrRxy5LRocfY="; } diff --git a/pkgs/by-name/qr/qrcode/package.nix b/pkgs/by-name/qr/qrcode/package.nix index ccb66cc4c539..e15f7ca636cb 100644 --- a/pkgs/by-name/qr/qrcode/package.nix +++ b/pkgs/by-name/qr/qrcode/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "qrcode"; - version = "0-unstable-2024-07-18"; + version = "0-unstable-2025-04-29"; src = fetchFromGitHub { owner = "qsantos"; repo = "qrcode"; - rev = "6e882a26a30ab9478ba98591ecc547614fb62b69"; - hash = "sha256-wJL+XyYnI8crKVu+xwCioD5YcFjE5a92qkbOB7juw+s="; + rev = "29140c67b69b79e5c8a52911489648853fddf85f"; + hash = "sha256-WQeZB8G9Nm68mYmLr0ksZdFDcQxF54X0yJxigJZWvMo="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/by-name/qr/qrencode/package.nix b/pkgs/by-name/qr/qrencode/package.nix new file mode 100644 index 000000000000..246499eba9ce --- /dev/null +++ b/pkgs/by-name/qr/qrencode/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + SDL2, + libpng, + libiconv, +}: + +stdenv.mkDerivation (finalAttrs: rec { + pname = "qrencode"; + version = "4.1.1"; + + outputs = [ + "bin" + "out" + "man" + "dev" + ]; + + src = fetchurl { + url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; + sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libiconv + libpng + ]; + + nativeCheckInputs = [ SDL2 ]; + + doCheck = false; + + checkPhase = '' + runHook preCheck + + pushd tests + ./test_basic.sh + popd + + runHook postCheck + ''; + + passthru.tests = finalAttrs.finalPackage.overrideAttrs (_: { + configureFlags = [ "--with-tests" ]; + doCheck = true; + }); + + meta = with lib; { + homepage = "https://fukuchi.org/works/qrencode/"; + description = "C library for encoding data in a QR Code symbol"; + longDescription = '' + Libqrencode is a C library for encoding data in a QR Code symbol, + a kind of 2D symbology that can be scanned by handy terminals + such as a mobile phone with CCD. + ''; + license = licenses.lgpl21Plus; + maintainers = [ ]; + platforms = platforms.all; + mainProgram = "qrencode"; + }; +}) diff --git a/pkgs/by-name/qs/qspeakers/package.nix b/pkgs/by-name/qs/qspeakers/package.nix index 8fd025250b38..a3418f38c414 100644 --- a/pkgs/by-name/qs/qspeakers/package.nix +++ b/pkgs/by-name/qs/qspeakers/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qspeakers"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "be1"; repo = "qspeakers"; tag = finalAttrs.version; - hash = "sha256-CQzUeC2nbKMWG6/2715+bf4rFu9IytT+bdqkZYVrYGc="; + hash = "sha256-zN9Z2t7dKo7Ffe5J9ZOGCpNJUK2RkZfQzjzL5HCmJpg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix index c187b7a412af..ee71ee3cd512 100644 --- a/pkgs/by-name/qs/qsv/package.nix +++ b/pkgs/by-name/qs/qsv/package.nix @@ -5,13 +5,13 @@ pkg-config, rustPlatform, sqlite, - stdenv, zstd, + cmake, }: let pname = "qsv"; - version = "2.2.1"; + version = "4.0.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage { owner = "dathere"; repo = "qsv"; rev = version; - hash = "sha256-LE3iQCZb3FKSsrb8/E5awjh26wGv9FlXw63+rNyzIIk="; + hash = "sha256-rMqDn2Dw64xxAVE3ZslKzpyNfgRMrLIALHjVtcq0vqU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Nse3IrhXKdEJ3BMWq8LEdd6EvhSEtzx1RbHQT9AoEb8="; + cargoHash = "sha256-/hkFIM7grcyMYNdM5UP2Mx+hBuw7zk8R2KbUYp2UkTg="; buildInputs = [ file @@ -35,6 +35,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook + cmake ]; buildFeatures = [ @@ -71,7 +72,6 @@ rustPlatform.buildRustPackage { ]; maintainers = with lib.maintainers; [ detroyejr - uncenter ]; }; } diff --git a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix index 07085a003207..984e5e0f4a83 100644 --- a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix +++ b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtorganizer-mkcal"; - version = "0-unstable-2025-02-19"; + version = "0-unstable-2025-04-24"; src = fetchFromGitHub { owner = "dcaliste"; repo = "qtorganizer-mkcal"; - rev = "312412de3f810fbedc7c4f27bd33adb2c3fbe967"; - hash = "sha256-uv2cEs84bM614vg5K+t4vyXas+1b5Jm39tfGSwWj6n0="; + rev = "45906b1df8ad758a824369873f423d9e0c457fbf"; + hash = "sha256-sgYCO8LxBFhMkjGnKVvOx2d4hyw9Oa5lbu6LKhuwl8s="; }; postPatch = '' @@ -31,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + extra-cmake-modules pkg-config ]; buildInputs = [ - extra-cmake-modules mkcal ] ++ (with libsForQt5; [ @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { description = "QtOrganizer plugin using sqlite via mKCal"; homepage = "https://github.com/dcaliste/qtorganizer-mkcal"; license = lib.licenses.bsd3; - maintainers = lib.teams.lomiri.members; + teams = [ lib.teams.lomiri ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix index 261c61a02a3f..0fd57977cf48 100644 --- a/pkgs/by-name/qt/qtractor/package.nix +++ b/pkgs/by-name/qt/qtractor/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz"; - hash = "sha256-O0CB8LPbXPE52t97NkEwL47fMfOb9XF6f+EQUwY8JdU="; + hash = "sha256-gV6IgFA7GeneabRCk6HLZVMfnS94qbdgyJQGwwRO904="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index 7c04bf6f2e70..22f020325984 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/quadrapassel"; changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch b/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch index 38eebfba6e68..4ff0cb5b1085 100644 --- a/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch +++ b/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch @@ -1,11 +1,37 @@ diff --git a/src-tauri/src/qf_client/modules/analytics.rs b/src-tauri/src/qf_client/modules/analytics.rs -index f6f1209..e08490b 100644 +index 3b31cfa..562e0b4 100644 --- a/src-tauri/src/qf_client/modules/analytics.rs +++ b/src-tauri/src/qf_client/modules/analytics.rs -@@ -115,52 +115,6 @@ impl AnalyticsModule { - } - }; - } +@@ -37,7 +37,7 @@ impl AnalyticsModule { + current_page: "home".to_string(), + component: "Analytics".to_string(), + is_init: false, +- send_metrics: true, ++ send_metrics: false, + last_user_activity: Arc::new(Mutex::new(Instant::now())), + metricAndLabelPairsScheduledToSend: vec![], + } +@@ -96,69 +96,6 @@ impl AnalyticsModule { + // Create Timer for sending metrics + let mut last_metric_time = Instant::now(); + +- if is_first_install { +- logger::info( +- &&qf.analytics().get_component("init"), +- "Detected first install", +- LoggerOptions::default(), +- ); +- match qf +- .analytics() +- .try_send_analytics("install", 3, json!({})) +- .await +- { +- Ok(_) => {} +- Err(e) => { +- error::create_log_file("analytics.log", &e); +- } +- }; +- } - loop { - let send_metrics = qf.analytics().send_metrics; - if !send_metrics { @@ -22,10 +48,10 @@ index f6f1209..e08490b 100644 - } - - last_metric_time = Instant::now(); -- logger::info_con( -- &qf.analytics().get_component("TrySendAnalytics"), -- "Sending user activity", -- ); +- // logger::info_con( +- // &qf.analytics().get_component("TrySendAnalytics"), +- // "Sending user activity", +- // ); - match qf - .analytics() - .try_send_analytics( @@ -43,10 +69,10 @@ index f6f1209..e08490b 100644 - || e.cause().contains("Banned") - || e.cause().contains("WFMBanned") - { -- error::create_log_file("analytics.log".to_string(), &e); +- error::create_log_file("analytics.log", &e); - break; - } -- error::create_log_file("analytics.log".to_string(), &e); +- error::create_log_file("analytics.log", &e); - } - }; - } @@ -55,7 +81,7 @@ index f6f1209..e08490b 100644 qf.analytics().is_init = false; } }); -@@ -176,44 +130,6 @@ impl AnalyticsModule { +@@ -174,45 +111,6 @@ impl AnalyticsModule { mut retry_count: i64, data: Value, ) -> Result<(), AppError> { @@ -88,16 +114,30 @@ index f6f1209..e08490b 100644 - return Err(err); - } - retry_count -= 1; -- logger::warning_con( +- logger::warning( - &self.get_component("TrySendAnalytics"), - &format!( - "Failed to send analytics, retrying in 5 seconds, retries left: {}", - retry_count - ), +- LoggerOptions::default(), - ); - tokio::time::sleep(std::time::Duration::from_secs(5)).await; - } - Ok(()) -+ return Ok(()); ++ return Ok(()) } } +diff --git a/src/contexts/app.context.tsx b/src/contexts/app.context.tsx +index 8b3ced9..5da811f 100644 +--- a/src/contexts/app.context.tsx ++++ b/src/contexts/app.context.tsx +@@ -160,7 +160,7 @@ export function AppContextProvider({ children }: AppContextProviderProps) { + const id = context.substring(start, end); + + console.log("OpenTos", settings?.tos_uuid, id); +- if (id == settings?.tos_uuid) return; ++ if (true) return; + modals.open({ + title: useTranslateModals("tos.title"), + size: "100%", diff --git a/pkgs/by-name/qu/quantframe/package.nix b/pkgs/by-name/qu/quantframe/package.nix index 864f2883cb8b..c175469262c6 100644 --- a/pkgs/by-name/qu/quantframe/package.nix +++ b/pkgs/by-name/qu/quantframe/package.nix @@ -2,33 +2,37 @@ lib, rustPlatform, fetchFromGitHub, - cargo-tauri_1, + cargo-tauri, nodejs, pnpm_9, pkg-config, glib-networking, openssl, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, - libsoup_2_4, + libsoup_3, libayatana-appindicator, gtk3, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "quantframe"; - version = "1.3.4"; + version = "1.4.3"; src = fetchFromGitHub { owner = "Kenya-DK"; repo = "quantframe-react"; tag = "v${finalAttrs.version}"; - hash = "sha256-/cjlYQHb23DY4RSjc2HosTar6p1epsqlWQX6TlrzSe8="; + hash = "sha256-ls6c9xLmjjx0kSh1s+HkdClrcTOvsAemjzqNwMeOd9c="; }; postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + + substituteInPlace src-tauri/tauri.conf.json \ + --replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' ''; patches = [ @@ -37,34 +41,34 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-4uyjvwvrMDe+86wcB7MBBWWc4NGKzqBsgG3TScf7BMk="; + hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mtHbWTNrWh4hq4IAncE9TCWr7sozIy2zf3DK3WN7wqI="; + cargoHash = "sha256-UyfSmlr+5mWmlisNtjF6jZKx92kdQziG26mgeZtkySY="; nativeBuildInputs = [ - cargo-tauri_1.hook - + cargo-tauri.hook pkg-config wrapGAppsHook3 - nodejs pnpm_9.configHook ]; buildInputs = [ openssl - libsoup_2_4 + libsoup_3 glib-networking gtk3 libayatana-appindicator - webkitgtk_4_0 + webkitgtk_4_1 ]; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; + passthru.updateScript = nix-update-script { }; + meta = { description = "Warframe Market listings and transactions manager"; mainProgram = "quantframe"; diff --git a/pkgs/by-name/qu/quantlib/package.nix b/pkgs/by-name/qu/quantlib/package.nix index 6401c2e8f110..fc8555fc7cb8 100644 --- a/pkgs/by-name/qu/quantlib/package.nix +++ b/pkgs/by-name/qu/quantlib/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "quantlib"; - version = "1.37"; + version = "1.38"; outputs = [ "out" @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "lballabio"; repo = "QuantLib"; rev = "v${finalAttrs.version}"; - hash = "sha256-Q8Bz94yd4A0VCDldtiichFKgiZMN4dHHJJep/tcE/z0="; + hash = "sha256-4a86sGUOz/B5IQHE41r5+OTvR9es4FgXeufy3bKRWAc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/qu/quark-engine/package.nix b/pkgs/by-name/qu/quark-engine/package.nix index 397eb26584ff..30400d74c801 100644 --- a/pkgs/by-name/qu/quark-engine/package.nix +++ b/pkgs/by-name/qu/quark-engine/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "25.3.1"; + version = "25.5.1"; pyproject = true; src = fetchFromGitHub { owner = "quark-engine"; repo = "quark-engine"; tag = "v${version}"; - hash = "sha256-k4jWmLoTT92ikyiVXv7iXyNoVfyGGo12ekmfthO9M3U="; + hash = "sha256-gu9W8+LyJHEqvn7Mrvjn7XjDjObAh8zRchNbTNWkT1M="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index 9c3a110d5823..30426a750e08 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.19.4"; + version = "3.22.2"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-18sfx0z06JqdYFfSNT62X9Io6awPxUNzjKmG/PeaDB0="; + hash = "sha256-RCWkaPoE3Purq9VG1xhlakMxqXhnxi+q10YcgOyScqg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/qu/qucsator-rf/package.nix b/pkgs/by-name/qu/qucsator-rf/package.nix index 2549a5694f84..135b0c014f6d 100644 --- a/pkgs/by-name/qu/qucsator-rf/package.nix +++ b/pkgs/by-name/qu/qucsator-rf/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "qucsator-rf"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucsator_rf"; rev = version; - hash = "sha256-Q1hpCt3SeXRzUFX4jPUu8ZsPTx2W28LQ3YwlYtOZhqg="; + hash = "sha256-c9deaY9eV1q+bx/k1tNpdVrJ8Q/L2G0lSQBYaOSfoDs="; }; # Upstream forces NO_DEFAULT_PATH on APPLE diff --git a/pkgs/by-name/qu/quesoglc/package.nix b/pkgs/by-name/qu/quesoglc/package.nix index ff38dc30757a..caf85dd1e926 100644 --- a/pkgs/by-name/qu/quesoglc/package.nix +++ b/pkgs/by-name/qu/quesoglc/package.nix @@ -10,13 +10,15 @@ fribidi, libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quesoglc"; version = "0.7.2"; + src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl"; + url = "mirror://sourceforge/quesoglc/quesoglc-${finalAttrs.version}.tar.bz2"; + hash = "sha256-VP7y7mhRct80TQb/RpmkQRQ7h6vtDVFFJK3E+JukyTE="; }; + buildInputs = [ libGLU libGL @@ -26,8 +28,18 @@ stdenv.mkDerivation rec { fribidi libX11 ]; + + # required for cross builds + configureFlags = [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + "ac_cv_func_memcmp_working=yes" + ]; + + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + # FIXME: Configure fails to use system glew. - meta = with lib; { + meta = { description = "Free implementation of the OpenGL Character Renderer"; longDescription = '' QuesoGLC is a free (as in free speech) implementation of the OpenGL @@ -36,8 +48,8 @@ stdenv.mkDerivation rec { platform that supports both FreeType and the OpenGL API. ''; homepage = "https://quesoglc.sourceforge.net/"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.linux; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ astsmtl ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix index 8df29745c54f..4251f9a68bd4 100644 --- a/pkgs/by-name/qu/questdb/package.nix +++ b/pkgs/by-name/qu/questdb/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "8.2.3"; + version = "8.3.1"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-hjx+SDqwl4wZaLitIP22wULUIAzAoaKYel5UWTZWvvE="; + hash = "sha256-y6bOdANERM+21kqv5tn6iRVxEXn3d0KVz2P8YkO0/0M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qu/quick-sasl/package.nix b/pkgs/by-name/qu/quick-sasl/package.nix new file mode 100644 index 000000000000..8c778e617d56 --- /dev/null +++ b/pkgs/by-name/qu/quick-sasl/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + cmake, + arpa2cm, + arpa2common, + quickmem, + cyrus_sasl, + quickder, + libkrb5, + libev, + e2fsprogs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "quick-sasl"; + version = "0.13.2"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "quick-sasl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kMKZRromm/hb9PZwvWAzmJorSqTB8xMIbWASfSjajiQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + libkrb5 + ]; + + buildInputs = [ + arpa2cm + arpa2common + quickmem + cyrus_sasl + quickder + libev + e2fsprogs + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Gentle wrapper around any SASL implementation"; + homepage = "https://gitlab.com/arpa2/Quick-SASL"; + changelog = "https://gitlab.com/arpa2/Quick-SASL/-/blob/v${finalAttrs.version}/CHANGES"; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + mainProgram = "qsasl-server"; + }; +}) diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix index 6191b00cd4c4..df9a58790148 100644 --- a/pkgs/by-name/qu/quickjs-ng/package.nix +++ b/pkgs/by-name/qu/quickjs-ng/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quickjs-ng"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "quickjs-ng"; repo = "quickjs"; tag = "v${finalAttrs.version}"; - hash = "sha256-/E9JSINmuv+9M5qODsmTCkcpdTyG0qN6I+iUbq5XclE="; + hash = "sha256-rLwCmI2mfw503aqIQQAUPzMyQnSXTyBFrsEZv+Z/X38="; }; outputs = [ diff --git a/pkgs/by-name/qu/quickserve/package.nix b/pkgs/by-name/qu/quickserve/package.nix deleted file mode 100644 index 8c4535b16c84..000000000000 --- a/pkgs/by-name/qu/quickserve/package.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - stdenv, - makeWrapper, - fetchzip, - python3, - python3Packages, -}: -let - threaded_servers = python3Packages.buildPythonPackage { - name = "threaded_servers"; - src = fetchzip { - url = "https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz"; - sha256 = "1irliz90a1dk4lyl7mrfq8qnnrfad9czvbcw1spc13zyai66iyhf"; - }; - - # stuff we don't care about pacserve - doCheck = false; - }; - wrappedPython = python3.withPackages (_: [ threaded_servers ]); -in -stdenv.mkDerivation { - pname = "quickserve"; - version = "2018"; - - dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - makeWrapper ${wrappedPython}/bin/python $out/bin/quickserve \ - --add-flags -mThreadedServers.PeeredQuickserve - runHook postInstall - ''; - - meta = with lib; { - description = "Simple HTTP server for quickly sharing files"; - homepage = "https://xyne.archlinux.ca/projects/quickserve/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ lassulus ]; - mainProgram = "quickserve"; - }; -} diff --git a/pkgs/servers/search/quickwit/Cargo.lock b/pkgs/by-name/qu/quickwit/Cargo.lock similarity index 100% rename from pkgs/servers/search/quickwit/Cargo.lock rename to pkgs/by-name/qu/quickwit/Cargo.lock diff --git a/pkgs/by-name/qu/quickwit/package.nix b/pkgs/by-name/qu/quickwit/package.nix new file mode 100644 index 000000000000..9cc4559eed74 --- /dev/null +++ b/pkgs/by-name/qu/quickwit/package.nix @@ -0,0 +1,149 @@ +{ + stdenv, + lib, + fetchFromGitHub, + rustPlatform, + nixosTests, + nix-update-script, + protobuf, + rust-jemalloc-sys, + nodejs, + yarn, + fetchYarnDeps, + fixup-yarn-lock, +}: + +let + pname = "quickwit"; + version = "0.8.2"; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/quickwit/quickwit-ui/yarn.lock"; + hash = "sha256-HppK9ycUxCOIagvzCmE+VfcmfMQfPIC8WeWM6WbA6fQ="; + }; + + src = fetchFromGitHub { + owner = "quickwit-oss"; + repo = pname; + rev = "v${version}"; + hash = "sha256-OrCO0mCFmhYBdpr4Gps56KJJ37uuJpV6ZJHWspOScyw="; + }; + + quickwit-ui = stdenv.mkDerivation { + name = "quickwit-ui"; + src = "${src}/quickwit/quickwit-ui"; + + nativeBuildInputs = [ + nodejs + yarn + fixup-yarn-lock + ]; + + configurePhase = '' + export HOME=$(mktemp -d) + ''; + + buildPhase = '' + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + fixup-yarn-lock yarn.lock + + yarn install --offline \ + --frozen-lockfile --no-progress \ + --ignore-engines --ignore-scripts + patchShebangs . + + yarn build + ''; + + installPhase = '' + mkdir $out + mv build/* $out + ''; + }; +in +rustPlatform.buildRustPackage rec { + inherit pname version src; + + postPatch = '' + substituteInPlace ./quickwit-ingest/build.rs \ + --replace-fail '.with_protos' '.with_includes(&["."]).with_protos' + substituteInPlace ./quickwit-codegen/example/build.rs \ + --replace-fail '.with_protos' '.with_includes(&["."]).with_protos' + substituteInPlace ./quickwit-proto/build.rs \ + --replace-fail '.with_protos' '.with_includes(&["."]).with_protos' + cp /build/cargo-vendor-dir/Cargo.lock /build/source/quickwit/Cargo.lock + ''; + + sourceRoot = "${src.name}/quickwit"; + + preBuild = '' + mkdir -p quickwit-ui/build + cp -r ${quickwit-ui}/* quickwit-ui/build + ''; + + buildInputs = [ + rust-jemalloc-sys + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "chitchat-0.8.0" = "sha256-6K2noPoFaDnOxQIEV1WbmVPfRGwlI/WS1OWSBH2qb1Q="; + "mrecordlog-0.4.0" = "sha256-9LIVs+BqK9FLSfHL3vm9LL+/FXIXJ6v617QLv4luQik="; + "ownedbytes-0.6.0" = "sha256-in18/NYYIgUiZ9sm8NgJlebWidRp34DR7AhOD1Nh0aw="; + "pulsar-5.0.2" = "sha256-j7wpsAro6x4fk3pvSL4fxLkddJFq8duZ7jDj0Edf3YQ="; + "sasl2-sys-0.1.20+2.1.28" = "sha256-u4BsfmTDFxuY3i1amLCsr7MDv356YPThMHclura0Sxs="; + "whichlang-0.1.0" = "sha256-7AvLGjtWHjG0TnZdg9p5D+O0H19uo2sqPxJMn6mOU0k="; + }; + }; + + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + + # needed for internal protobuf c wrapper library + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + + passthru = { + tests = { + inherit (nixosTests) quickwit; + inherit (nixosTests.vector) syslog-quickwit; + }; + updateScript = nix-update-script { }; + }; + + checkFlags = [ + # tries to make a network access + "--skip=test_all_local_index" + "--skip=test_cmd_create" + "--skip=test_cmd_create_no_index_uri" + "--skip=test_cmd_search_aggregation" + "--skip=test_cmd_search_with_snippets" + "--skip=test_delete_index_cli" + "--skip=test_delete_index_cli_dry_run" + "--skip=test_ingest_docs_cli" + "--skip=test_ingest_docs_cli_keep_cache" + "--skip=test_search_index_cli" + "--skip=test_garbage_collect_cli_no_grace" + "--skip=actors::indexing_service::tests::test_indexing_service_spawn_observe_detach" + "--skip=object_storage::s3_compatible_storage::tests::test_s3_compatible_storage_relative_path" + # flaky test + "--skip=actors::indexer::tests::test_indexer_triggers_commit_on_drained_mailbox" + "--skip=actors::indexer::tests::test_indexer_triggers_commit_on_timeout" + "--skip=actors::indexer::tests::test_indexer_partitioning" + "--skip=actors::indexing_pipeline::tests::test_merge_pipeline_does_not_stop_on_indexing_pipeline_failure" + "--skip=actors::indexer::tests::test_indexer_triggers_commit_on_target_num_docs" + "--skip=actors::packager::tests::test_packager_simple" + # fail on darwin for some reason + "--skip=io::tests::test_controlled_writer_limited_async" + "--skip=io::tests::test_controlled_writer_limited_sync" + ]; + + meta = with lib; { + description = "Sub-second search & analytics engine on cloud storage"; + homepage = "https://quickwit.io/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/qu/quiet/package.nix b/pkgs/by-name/qu/quiet/package.nix index 7a94f9b14ee9..94d9398c2490 100644 --- a/pkgs/by-name/qu/quiet/package.nix +++ b/pkgs/by-name/qu/quiet/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "quiet"; - version = "4.0.3"; + version = "4.1.2"; src = fetchurl { url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.AppImage"; - hash = "sha256-BeN0O/Q95M42+2iRtYoko0mM4rLFVlzeRPXdls+5zOs="; + hash = "sha256-oYN+oXUvSeAR+gaRxEuBZHHV6lKTS7OrYVW4MMGoUO0="; }; meta = { diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index 1b7d1aeb4f52..eea168fec2a9 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "quill-log"; - version = "9.0.0"; + version = "9.0.2"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; rev = "v${version}"; - hash = "sha256-WkJOB06yH3B3L2aqglh1jc38e1fDbxaqFEEh1AvBUcw="; + hash = "sha256-8BXdSITZKdJSstS4LbOCT9BedFHbmd/6bAPiQsCC+8Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/qu/quill/package.nix b/pkgs/by-name/qu/quill/package.nix new file mode 100644 index 000000000000..d1464f0442c3 --- /dev/null +++ b/pkgs/by-name/qu/quill/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + openssl, + libiconv, + udev, + pkg-config, + protobuf, + buildPackages, +}: + +rustPlatform.buildRustPackage rec { + pname = "quill"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "dfinity"; + repo = "quill"; + rev = "v${version}"; + hash = "sha256-lCDKM9zzGcey4oWp6imiHvGSNRor0xhlmlhRkSXFLlU="; + }; + + ic = fetchFromGitHub { + owner = "dfinity"; + repo = "ic"; + rev = "2f9ae6bf5eafed03599fd29475100aca9f78ae81"; + hash = "sha256-QWJFsWZ9miWN4ql4xFXMQM1Y71nzgGCL57yAa0j7ch4="; + }; + + registry = "file://local-registry"; + + preBuild = '' + export REGISTRY_TRANSPORT_PROTO_INCLUDES=${ic}/rs/registry/transport/proto + export IC_BASE_TYPES_PROTO_INCLUDES=${ic}/rs/types/base_types/proto + export IC_PROTOBUF_PROTO_INCLUDES=${ic}/rs/protobuf/def + export IC_NNS_COMMON_PROTO_INCLUDES=${ic}/rs/nns/common/proto + export IC_ICRC1_ARCHIVE_WASM_PATH=${ic}/rs/rosetta-api/icrc1/wasm/ic-icrc1-archive.wasm.gz + export LEDGER_ARCHIVE_NODE_CANISTER_WASM_PATH=${ic}/rs/rosetta-api/icp_ledger/wasm/ledger-archive-node-canister.wasm + cp ${ic}/rs/rosetta-api/icp_ledger/ledger.did /build/quill-${version}-vendor/ledger.did + export PROTOC=${buildPackages.protobuf}/bin/protoc + export OPENSSL_DIR=${openssl.dev} + export OPENSSL_LIB_DIR=${lib.getLib openssl}/lib + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-rpsbQYA6RBYSo2g+YhYG02CYlboRQvIwMqPAybayCOs="; + + nativeBuildInputs = [ + pkg-config + protobuf + ]; + buildInputs = + [ + openssl + udev + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + meta = { + homepage = "https://github.com/dfinity/quill"; + changelog = "https://github.com/dfinity/quill/releases/tag/v${version}"; + description = "Minimalistic ledger and governance toolkit for cold wallets on the Internet Computer"; + mainProgram = "quill"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ imalison ]; + }; +} diff --git a/pkgs/by-name/qu/quilt/package.nix b/pkgs/by-name/qu/quilt/package.nix index 5f2e634e927f..ae47ede35406 100644 --- a/pkgs/by-name/qu/quilt/package.nix +++ b/pkgs/by-name/qu/quilt/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "quilt"; - version = "0.68"; + version = "0.69"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-/owJ3gPBBuhbNzfI8DreFHyVa3ntevSFocijhY2zhCY="; + sha256 = "sha256-VV3f/eIto8htHK9anB+4oVKsK4RzBDe9OcwIhJyfSFI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/qu/quisk/package.nix b/pkgs/by-name/qu/quisk/package.nix index e9d10a52cfd8..69312e3b20a4 100644 --- a/pkgs/by-name/qu/quisk/package.nix +++ b/pkgs/by-name/qu/quisk/package.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.41"; + version = "4.2.42"; src = fetchPypi { inherit pname version; - hash = "sha256-du6VcKn5WvLnlUrW9tKWT7MlMIZ2bpkrsO4yHC8cM6Q="; + hash = "sha256-Di5B0irH6G8XQtwXVDk4FXwLRo5Nh+cyt9zsG7+dMkc="; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch b/pkgs/by-name/qu/qutebrowser/fix-restart.patch similarity index 100% rename from pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch rename to pkgs/by-name/qu/qutebrowser/fix-restart.patch diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix new file mode 100644 index 000000000000..21b7878cb75b --- /dev/null +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -0,0 +1,166 @@ +{ + stdenv, + lib, + fetchurl, + fetchzip, + python3, + glib-networking, + asciidoc, + docbook_xml_dtd_45, + docbook_xsl, + libxml2, + libxslt, + withPdfReader ? true, + pipewireSupport ? stdenv.hostPlatform.isLinux, + pipewire, + qt6Packages, + enableWideVine ? false, + widevine-cdm, + # can cause issues on some graphics chips + enableVulkan ? false, + vulkan-loader, +}: + +let + isQt6 = lib.versions.major qt6Packages.qtbase.version == "6"; + pdfjs = + let + version = "5.1.91"; + in + fetchzip { + url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; + hash = "sha256-e1zBpH9F8TI4ET4FvkxJsoOYVKLWJBP2KaNNC2kpaVk="; + stripRoot = false; + }; + + version = "3.5.0"; +in + +python3.pkgs.buildPythonApplication { + pname = "qutebrowser" + lib.optionalString (!isQt6) "-qt5"; + inherit version; + pyproject = true; + + src = fetchurl { + url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; + hash = "sha256-+hQsjRwoJbBotxs2BKiy1oLi7YShTD5ott54RDMdgLs="; + }; + + # Needs tox + doCheck = false; + + buildInputs = + [ + qt6Packages.qtbase + glib-networking + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + qt6Packages.qtwayland + ]; + + build-system = with python3.pkgs; [ + setuptools + ]; + + nativeBuildInputs = [ + qt6Packages.wrapQtAppsHook + asciidoc + docbook_xml_dtd_45 + docbook_xsl + libxml2 + libxslt + ]; + + dependencies = with python3.pkgs; [ + colorama + pyyaml + (if isQt6 then pyqt6-webengine else pyqtwebengine) + jinja2 + pygments + # scripts and userscripts libs + tldextract + beautifulsoup4 + readability-lxml + pykeepass + stem + pynacl + # extensive ad blocking + adblock + # for the qute-bitwarden user script to be able to copy the TOTP token to clipboard + pyperclip + ]; + + patches = [ + ./fix-restart.patch + ]; + + dontWrapQtApps = true; + + postPatch = + '' + substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser" + + sed -i "s,/usr,$out,g" qutebrowser/utils/standarddir.py + '' + + lib.optionalString withPdfReader '' + sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py + ''; + + installPhase = '' + runHook preInstall + + make -f misc/Makefile \ + PYTHON=${(python3.pythonOnBuildForHost.withPackages (ps: with ps; [ setuptools ])).interpreter} \ + PREFIX=. \ + DESTDIR="$out" \ + DATAROOTDIR=/share \ + install + + runHook postInstall + ''; + + postInstall = '' + # Patch python scripts + buildPythonPath "$out $propagatedBuildInputs" + scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/) + for i in $scripts; do + patchPythonScript "$i" + done + ''; + + preFixup = + let + libPath = lib.makeLibraryPath [ pipewire ]; + in + '' + makeWrapperArgs+=( + # Force the app to use QT_PLUGIN_PATH values from wrapper + --unset QT_PLUGIN_PATH + "''${qtWrapperArgs[@]}" + # avoid persistant warning on starup + --set QT_STYLE_OVERRIDE Fusion + ${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''} + ${lib.optionalString (enableVulkan) '' + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} + --set-default QSG_RHI_BACKEND vulkan + ''} + ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''} + --set QTWEBENGINE_RESOURCES_PATH "${qt6Packages.qtwebengine}/resources" + ) + ''; + + meta = with lib; { + homepage = "https://github.com/qutebrowser/qutebrowser"; + changelog = "https://github.com/qutebrowser/qutebrowser/blob/v${version}/doc/changelog.asciidoc"; + description = "Keyboard-focused browser with a minimal GUI"; + license = licenses.gpl3Plus; + mainProgram = "qutebrowser"; + platforms = if enableWideVine then [ "x86_64-linux" ] else qt6Packages.qtwebengine.meta.platforms; + maintainers = with maintainers; [ + jagajaga + rnhmjoj + ebzzry + dotlambda + ]; + }; +} diff --git a/pkgs/by-name/qw/qwertone/package.nix b/pkgs/by-name/qw/qwertone/package.nix new file mode 100644 index 000000000000..9ecd2f0dc3d9 --- /dev/null +++ b/pkgs/by-name/qw/qwertone/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + wrapGAppsHook3, + pkg-config, + alsa-lib, + atk, + gtk3, +}: + +rustPlatform.buildRustPackage rec { + pname = "qwertone"; + version = "0.5.0"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "azymohliad"; + repo = "qwertone"; + tag = "v${version}"; + hash = "sha256-GD7iFDAaS6D7DGPvK+Cof4rVbUwPX9aCI1jfc0XTxn8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-5hrjmX+eUPrj48Ii1YHPZFPMvynowSwSArcNnUOw4hc="; + + nativeBuildInputs = [ + wrapGAppsHook3 + pkg-config + ]; + + buildInputs = [ + alsa-lib + atk + gtk3 + ]; + + meta = { + description = "Simple music synthesizer app based on usual qwerty-keyboard for input"; + mainProgram = "qwertone"; + homepage = "https://gitlab.com/azymohliad/qwertone"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ linsui ]; + }; +} diff --git a/pkgs/by-name/qz/qzdl/cmake.patch b/pkgs/by-name/qz/qzdl/cmake.patch new file mode 100644 index 000000000000..cdb4a451f37d --- /dev/null +++ b/pkgs/by-name/qz/qzdl/cmake.patch @@ -0,0 +1,37 @@ +diff --git i/CMakeLists.txt w/CMakeLists.txt +index 364f72b..2d5070d 100644 +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -7,16 +7,8 @@ project(qzdl LANGUAGES C CXX) + find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Widgets) + find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Widgets REQUIRED) + +-include(FetchContent) +-FetchContent_Declare( +- inih +- GIT_REPOSITORY https://github.com/benhoyt/inih.git +- GIT_TAG r44 +-) +-FetchContent_GetProperties(inih) +-if (NOT inih_POPULATED) +- FetchContent_MakeAvailable(inih) +-endif() ++find_package(PkgConfig) ++pkg_check_modules(INIH inih) + + add_executable( + zdl +@@ -46,9 +38,9 @@ add_executable( + libwad.cpp + qzdl.cpp + ${PROJECT_SOURCE_DIR}/zdlconf/zdlconf.cpp +- ${inih_SOURCE_DIR}/ini.c + ) + +-target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf) +-target_include_directories(zdl PRIVATE ${inih_SOURCE_DIR}) +-target_link_libraries(zdl Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets) ++target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf ${inih_INCLUDE_DIR}) ++target_link_libraries(zdl Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets ${INIH_LDFLAGS}) ++ ++install(TARGETS zdl RUNTIME DESTINATION "bin") diff --git a/pkgs/by-name/qz/qzdl/package.nix b/pkgs/by-name/qz/qzdl/package.nix new file mode 100644 index 000000000000..19f979187856 --- /dev/null +++ b/pkgs/by-name/qz/qzdl/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + copyDesktopItems, + inih, + libsForQt5, + makeDesktopItem, + ninja, + pkg-config, +}: +stdenv.mkDerivation { + pname = "qzdl"; + version = "3.3.0.0-unstable-2025-01-04"; + + src = fetchFromGitHub { + owner = "qbasicer"; + repo = "qzdl"; + rev = "a03191777152b932b9bf15f45d439bf38e8c7679"; + hash = "sha256-YRWJBuYY1QI/liiGw5zYFqsrK+DyvW1Lpava6CkmVnQ="; + }; + + patches = [ + ./cmake.patch + ]; + + nativeBuildInputs = [ + cmake + copyDesktopItems + ninja + pkg-config + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = [ + inih + libsForQt5.qtbase + ]; + + postInstall = '' + install -Dm644 $src/res/zdl3.svg $out/share/icons/hicolor/scalable/apps/zdl3.svg + ''; + + desktopItems = [ + (makeDesktopItem { + name = "zdl3"; + exec = "zdl %U"; + icon = "zdl3"; + desktopName = "ZDL"; + genericName = "A ZDoom WAD Launcher"; + categories = [ "Game" ]; + }) + ]; + + meta = { + description = "ZDoom WAD Launcher"; + homepage = "https://zdl.vectec.net"; + license = lib.licenses.gpl3Only; + inherit (libsForQt5.qtbase.meta) platforms; + maintainers = [ lib.maintainers.azahi ]; + mainProgram = "zdl"; + }; +} diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix index 2620a8d0057d..1c7f55d5f828 100644 --- a/pkgs/by-name/r0/r0vm/package.nix +++ b/pkgs/by-name/r0/r0vm/package.nix @@ -1,13 +1,11 @@ { rustPlatform, - stdenv, fetchFromGitHub, fetchurl, pkg-config, perl, openssl, lib, - darwin, }: rustPlatform.buildRustPackage rec { pname = "r0vm"; @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ - openssl.dev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl.dev + ]; doCheck = false; diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index ce5073e41d83..8ff252ef6fdf 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.1.57"; + version = "3.1.58"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${finalAttrs.version}"; - hash = "sha256-1b24tclqXGx85BGFYL9cbthLScVWau2OmRh9YElfCLs="; + hash = "sha256-ICLKkhgEi0ThWHLgm9fr0QXXtWMCAOJ6nkD66JR8XMo="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix index 236533dcc3a2..997478adf5e2 100644 --- a/pkgs/by-name/ra/rabbitmq-server/package.nix +++ b/pkgs/by-name/ra/rabbitmq-server/package.nix @@ -42,12 +42,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "4.0.7"; + version = "4.0.9"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-ScqNRa1itxawGyRruNihA60xbltw7Lek36SP9Nd+LfI="; + hash = "sha256-imBxBn8RQS0jBGfT5KLLLt+fKvyybzLzPZu9DpFOos8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix index c68c6ae22128..14343ffd73bb 100644 --- a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix +++ b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "rabbitmqadmin-ng"; - version = "0.29.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "rabbitmq"; repo = "rabbitmqadmin-ng"; tag = "v${version}"; - hash = "sha256-EWL1MFBBIsjfkx43SFSxsxjM0/XVYS8O3fYkXWkkctc="; + hash = "sha256-b6xa12jop0YbbUNYNrCvCEJH17lx/Ski3maKUWVVAjE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-PShBU5xC9+X1exoIFP64xHWn6oVsID4ZcYMuUq/1vKI="; + cargoHash = "sha256-qPbh8kRm57ferdv2+hGaOXFCK49hYzDrVb6ePbaPuAM="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Command line tool for RabbitMQ that uses the HTTP API"; - maintainers = lib.teams.flyingcircus.members; + teams = [ lib.teams.flyingcircus ]; homepage = "https://www.rabbitmq.com/docs/management-cli"; license = with lib.licenses; [ mit diff --git a/pkgs/by-name/ra/rabtap/package.nix b/pkgs/by-name/ra/rabtap/package.nix index 91b312e2bedc..1fdb26d34746 100644 --- a/pkgs/by-name/ra/rabtap/package.nix +++ b/pkgs/by-name/ra/rabtap/package.nix @@ -6,16 +6,20 @@ buildGoModule rec { pname = "rabtap"; - version = "1.43"; + version = "1.44.1"; src = fetchFromGitHub { owner = "jandelgado"; repo = "rabtap"; rev = "v${version}"; - sha256 = "sha256-OUpDk6nfVbz/KP7vZeZV2JfbCzh/KcuxG015/uxYuEI="; + sha256 = "sha256-mW2O8/22zbA3/wpYkQHCI0z8EEL0Wyud2TD5vNUJrNI="; }; - vendorHash = "sha256-V7AkqmEbwuW2Ni9b00Zd22ugk9ScGWf5wauHcQwG7b0="; + vendorHash = "sha256-Yi4vH3UMOE//p3H9iCR5RY3SjjR0mu2sBRx8WK57Dq8="; + + ldflags = [ + "-X main.BuildVersion=v${version}" + ]; meta = with lib; { description = "RabbitMQ wire tap and swiss army knife"; diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index c38563550262..836ba75cf4dc 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.5.0"; + version = "3.5.3"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; tag = "v${version}"; - hash = "sha256-OWOCwioW0TPVk6vIkfVuAaYJdIWJ6Do4NcYWR/b3sQs="; + hash = "sha256-+oAVgLXDyexvMCAf7hIhFOT+RELn4zeTpgE8YVGlCyw="; }; build-system = with python3.pkgs; [ @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { passlib vobject pika - python-dateutil + requests pytz # https://github.com/Kozea/Radicale/issues/816 ldap3 ] diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 5b4acfd1c8b8..262de4fba351 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -1,6 +1,5 @@ { asciidoctor, - darwin, fetchgit, git, installShellFiles, @@ -34,7 +33,6 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; nativeCheckInputs = [ git ]; - buildInputs = lib.optionals stdenv.buildPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; doCheck = stdenv.hostPlatform.isLinux; diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index b0a6bae693e1..a9bcb469f4f8 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -1,6 +1,5 @@ { asciidoctor, - darwin, fetchgit, git, installShellFiles, @@ -41,9 +40,6 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; nativeCheckInputs = [ git ]; - buildInputs = lib.optionals stdenv.buildPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; # tests regularly time out on aarch64 doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86; diff --git a/pkgs/by-name/ra/raft-cowsql/package.nix b/pkgs/by-name/ra/raft-cowsql/package.nix index 2ac47e242caf..6796d5288367 100644 --- a/pkgs/by-name/ra/raft-cowsql/package.nix +++ b/pkgs/by-name/ra/raft-cowsql/package.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cowsql/raft"; license = licenses.lgpl3Only; platforms = platforms.linux; - maintainers = teams.lxc.members; + teams = [ teams.lxc ]; }; } diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix index 1de79c3d1b7f..9c359fa71505 100644 --- a/pkgs/by-name/ra/rage/package.nix +++ b/pkgs/by-name/ra/rage/package.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +24,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - # cargo test has an x86-only dependency doCheck = stdenv.hostPlatform.isx86; diff --git a/pkgs/by-name/ra/raider/package.nix b/pkgs/by-name/ra/raider/package.nix index 9283c6b443ae..31f536bc8dd3 100644 --- a/pkgs/by-name/ra/raider/package.nix +++ b/pkgs/by-name/ra/raider/package.nix @@ -65,12 +65,10 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/Raider"; license = licenses.gpl3Plus; mainProgram = "raider"; - maintainers = - with maintainers; - [ - benediktbroich - ] - ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ + benediktbroich + ]; + teams = [ lib.teams.gnome-circle ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 1fd672670492..0f974486cd84 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -1,38 +1,27 @@ { lib, - darwin, rustPlatform, fetchFromGitHub, pkg-config, openssl, - stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; -in rustPlatform.buildRustPackage rec { pname = "railway"; - version = "4.0.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-o3AWcUKeOBiNsDSDV0XFzQ0rWpj7el4qX6iQKnqMPgg="; + hash = "sha256-tZwVkZDT4WtM7cxI0FKPtX7C7NdhRbIOsDIrS4hbz+I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-F+1ELwvtjnaQlvkfdKk7hnuEEde4NL/sUjPBExU+zds="; + cargoHash = "sha256-eK91RATbTqYJYKM5I67281oHY90aaTVvbqQnysz/8k4="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; + buildInputs = [ openssl ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ra/rain/package.nix b/pkgs/by-name/ra/rain/package.nix index 05b2b0189e8b..30a334aee635 100644 --- a/pkgs/by-name/ra/rain/package.nix +++ b/pkgs/by-name/ra/rain/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "rain"; - version = "1.21.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2yb965fDzNgrPXT2xMRdqD/inyvlwdKlkMj16YSFHBk="; + sha256 = "sha256-Dsg8vUMs6aep4FfrulHdtH3H7fitWdzENfTPm+9z5m0="; }; - vendorHash = "sha256-TlS9SfqMJa5w+JMUx+7ZMF0xk/VsnjOScSGXEw1dVkU="; + vendorHash = "sha256-5i6dAjgWclyEkRrDzrkiIRQKTeNz4GM1LU+2J3t/+Yc="; subPackages = [ "cmd/rain" ]; diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index 36338b43709f..3931848bdafa 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -1,15 +1,13 @@ { lib, - darwin, fetchFromGitHub, testers, nix-update-script, rustPlatform, - stdenv, rainfrog, }: let - version = "0.3.0"; + version = "0.3.1"; in rustPlatform.buildRustPackage { inherit version; @@ -19,20 +17,11 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; tag = "v${version}"; - hash = "sha256-dBsL91BK/OkLimBUnqOQu/bBqxNIjnZY5oI0lwMkfDo="; + hash = "sha256-sUZnHlTxOz0j2KsWi/qaI5MYT0mkANn6deH54TS/JYw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-C5Wn/Qe+VSCFEma7IAmxGK2t2xugWOt2BaF7izsCU+I="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreGraphics - SystemConfiguration - ] - ); + cargoHash = "sha256-wgJWPlURS2DxcRMzDEAXa50nQswcjbe0zj2QgF0HZys="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix index f76a46fc5933..ddc517bbf247 100644 --- a/pkgs/by-name/ra/rancher/package.nix +++ b/pkgs/by-name/ra/rancher/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rancher"; - version = "2.10.1"; + version = "2.11.1"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; - rev = "v${version}"; - hash = "sha256-7lsv974XjD8tBt19FrLkKieec0jQ/0wf8ETLSNdQsH0="; + tag = "v${version}"; + hash = "sha256-puwbZQ6JOdRODOChb2hOqW4KPIxxubOkMILFHUP/I78="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { "-static" ]; - vendorHash = "sha256-t7Gjm9EKpYwSe2ORcFyolsAcyN8Xndtw03zBqFNeePg="; + vendorHash = "sha256-NQ5R2rYmPc5Y6tpnWm9/QL5TNe70ZWwXF51KgShyovQ="; postInstall = '' mv $out/bin/cli $out/bin/rancher diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/by-name/ra/randomx/package.nix similarity index 100% rename from pkgs/development/libraries/randomx/default.nix rename to pkgs/by-name/ra/randomx/package.nix diff --git a/pkgs/by-name/ra/rankwidth/package.nix b/pkgs/by-name/ra/rankwidth/package.nix index 4b3a8c3d21e7..ed773ba35891 100644 --- a/pkgs/by-name/ra/rankwidth/package.nix +++ b/pkgs/by-name/ra/rankwidth/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Calculates rank-width and rank-decompositions"; license = with licenses; [ gpl2Plus ]; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/ra/rapidsvn/package.nix b/pkgs/by-name/ra/rapidsvn/package.nix index e6d2b1f5ca8a..abbaeca4ef56 100644 --- a/pkgs/by-name/ra/rapidsvn/package.nix +++ b/pkgs/by-name/ra/rapidsvn/package.nix @@ -8,7 +8,6 @@ apr, aprutil, python3, - darwin, }: stdenv.mkDerivation { @@ -31,17 +30,13 @@ stdenv.mkDerivation { autoreconfHook ]; - buildInputs = - [ - wxGTK32 - subversion - apr - aprutil - python3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = [ + wxGTK32 + subversion + apr + aprutil + python3 + ]; configureFlags = [ "--with-svn-include=${subversion.dev}/include" diff --git a/pkgs/by-name/ra/rapidyaml/package.nix b/pkgs/by-name/ra/rapidyaml/package.nix index c7ae5e3f024b..07bc3eee474e 100644 --- a/pkgs/by-name/ra/rapidyaml/package.nix +++ b/pkgs/by-name/ra/rapidyaml/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "rapidyaml"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "biojppm"; repo = "rapidyaml"; fetchSubmodules = true; rev = "v${version}"; - hash = "sha256-5Z1UV8JSgaO4X8+fTEgxD7bzD1igOgiLQMn10c3rCLs="; + hash = "sha256-+ENfflVjeesX14m0G71HdeSIECopZV4J2JL9+c+nbXE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix index 671550c39555..c9b10eeec338 100644 --- a/pkgs/by-name/ra/rare-regex/package.nix +++ b/pkgs/by-name/ra/rare-regex/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "rare"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "zix99"; repo = "rare"; rev = version; - hash = "sha256-Sc8Ek1JfagqEDZ1Ci2UdqDkKZbQ6klH+uICML/ifO0Q="; + hash = "sha256-hdOG7UGEi4MnFg0wbyDN4gDpQLb9sG3yUrQ/J0fwKkA="; }; vendorHash = "sha256-wUOtxNjL/4MosACCzPTWKWrnMZhxINfN1ppkRsqDh9M="; diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index dc54feb8c222..caf7289e1e73 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rasm"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; rev = "v${version}"; - hash = "sha256-gH1YGN8uM4K8JpkV2r7PilAcgv8leswaN+IOgMM0m74="; + hash = "sha256-U4bsOU76eNGBSDVEduxqbKqxcq7tIHQZldbe/ElZm+A="; }; # by default the EXEC variable contains `rasm.exe` diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix index a30a46e727c2..9621e30adc04 100644 --- a/pkgs/by-name/ra/rates/package.nix +++ b/pkgs/by-name/ra/rates/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, versionCheckHook, @@ -21,13 +19,11 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-qfuCA1kAEbYIYI274lNrEKZNhltQP71CwtsjBr0REJs="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "CLI tool that brings currency exchange rates right into your terminal"; diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix index 09e8b91d7568..e9f79baa9a6f 100644 --- a/pkgs/by-name/ra/ratman/package.nix +++ b/pkgs/by-name/ra/ratman/package.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { domain = "codeberg.org"; owner = "irdest"; repo = "irdest"; - rev = "${version}"; - sha256 = "sha256-OuKUZSvIUekhbe1LoEFBL8+sU2KLXBsp1JCEEuxkUlk="; + tag = "${version}"; + hash = "sha256-rdKfKbikyqs0Y/y9A8XRVSKenjHD5rS3blxwy98Tvmg="; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index d546f0cae5ea..60a2dddaddd9 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.39.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-8U48Jow/6mOBTxRgMUtW6CaTkhwaAu8Hkad3WjRdkEM="; + hash = "sha256-6N4YHrwzFTBShitAW7BMjEMzigB37Om5lICb94wEvlQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-U9ebUV9Hkfu5clAffncMXBo/ujnVf80Qt6dOkzphWx4="; + cargoHash = "sha256-fslC+e3d2tVFOWag7NZ1mTnjG3iMMezodpNQ+2LVRxU="; doCheck = false; # test requires network access @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ra/rauc/package.nix b/pkgs/by-name/ra/rauc/package.nix index 26448f01cef5..4ee055688382 100644 --- a/pkgs/by-name/ra/rauc/package.nix +++ b/pkgs/by-name/ra/rauc/package.nix @@ -1,4 +1,5 @@ { + composefs, curl, dbus, fetchFromGitHub, @@ -18,13 +19,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "rauc"; repo = "rauc"; rev = "v${version}"; - sha256 = "sha256-Vq1dudB8OQveclAIVgiB8jbtp4o2Ga5v61Y6JUjOpbs="; + sha256 = "sha256-tpynDSCQ8E5DE82BvIJ2lEmwFQQpyYkV9UqjKKlArpw="; }; passthru = { @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + composefs curl dbus glib @@ -53,6 +55,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "--buildtype=release" + (lib.mesonEnable "composefs" true) (lib.mesonOption "systemdunitdir" "${placeholder "out"}/lib/systemd/system") (lib.mesonOption "dbusinterfacesdir" "${placeholder "out"}/share/dbus-1/interfaces") (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d") diff --git a/pkgs/by-name/ra/rav1d/package.nix b/pkgs/by-name/ra/rav1d/package.nix new file mode 100644 index 000000000000..8c2b204f672d --- /dev/null +++ b/pkgs/by-name/ra/rav1d/package.nix @@ -0,0 +1,63 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nasm, + meson, + ninja, + pkg-config, + + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "rav1d"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "memorysafety"; + repo = "rav1d"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OAfuUeScdjL7xIpf6pclNyo4ugRLIIcTjjf0AwoF+7o="; + }; + + cargoHash = "sha256-13j0++XHcNjkVc3VZxv2ukQvhiu+heZPgaTsA1U4MGQ="; + + nativeBuildInputs = [ + nasm + ]; + + # Tests are using meson + # https://github.com/memorysafety/rav1d/tree/v1.0.0?tab=readme-ov-file#running-tests + nativeCheckInputs = [ + meson + ninja + pkg-config + ]; + + checkPhase = + let + cargoTarget = rustPlatform.cargoInstallHook.targetSubdirectory; + in + '' + runHook preCheck + + patchShebangs .github/workflows/test.sh + .github/workflows/test.sh -r target/${cargoTarget}/release/dav1d + + runHook postCheck + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "AV1 cross-platform decoder, Rust port of dav1d"; + homepage = "https://github.com/memorysafety/rav1d"; + changelog = "https://github.com/memorysafety/rav1d/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ liberodark ]; + mainProgram = "dav1d"; + }; +}) diff --git a/pkgs/by-name/ra/ravedude/package.nix b/pkgs/by-name/ra/ravedude/package.nix index ede59484a5fb..abb50dd30979 100644 --- a/pkgs/by-name/ra/ravedude/package.nix +++ b/pkgs/by-name/ra/ravedude/package.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "ravedude"; - version = "0.1.8"; + version = "0.2.0"; src = fetchCrate { inherit pname version; - hash = "sha256-AvnojcWQ4dQKk6B1Tjhkb4jfL6BJDsbeEo4tlgbOp84="; + hash = "sha256-rUYqqswjIPg4p7oWNjXnEKSav+uLjItGVxrRLz4NXd4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tvHKRIKrKK9tCIhz/1DQkNaeTi+uBRKc8LAq7JucuPE="; + cargoHash = "sha256-FrlG68X9fbEBZlt+qdL3O1S8HAgwXu/Bkplu8UxXy5Y="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index e4952620dae8..71a0e29a62b4 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -12,19 +12,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.94.0"; + version = "1.99.0"; src = { aarch64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; - hash = "sha256-jSGlMh+8K27lpz8oLxTGLaER5x1+CeLhGK7pITJ12rQ="; + hash = "sha256-5TMVwZ912+r0OP2NeBc53FOkanaRHJgw+P+JbtdBsKg="; }; x86_64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; - hash = "sha256-pmmKPSnr6/mixdNCfgpvBu7n8hWT/U1YyV0DwOhqfhk="; + hash = "sha256-fhW/qQksn69ri7dLwMerRsktZ3Ykn5qmlNkWZ2piN58="; }; } .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/ra/raylib-games/package.nix b/pkgs/by-name/ra/raylib-games/package.nix index 8bc325841060..3ca74877fbb4 100644 --- a/pkgs/by-name/ra/raylib-games/package.nix +++ b/pkgs/by-name/ra/raylib-games/package.nix @@ -3,12 +3,8 @@ stdenv, fetchFromGitHub, raylib, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation rec { pname = "raylib-games"; version = "2022-10-24"; @@ -20,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-N9ip8yFUqXmNMKcvQuOyxDI4yF/w1YaoIh0prvS4Xr4="; }; - buildInputs = [ raylib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + buildInputs = [ raylib ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/by-name/ra/razer-cli/package.nix b/pkgs/by-name/ra/razer-cli/package.nix index 37bf5eedb65c..47d888d8d4e2 100644 --- a/pkgs/by-name/ra/razer-cli/package.nix +++ b/pkgs/by-name/ra/razer-cli/package.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "razer-cli"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "lolei"; repo = "razer-cli"; - rev = "v${version}"; - hash = "sha256-p/RcBpkvtqYQ3Ekt0pLvKyi1Vv93oHDd7hqSTu/5CSw="; + tag = "v${version}"; + hash = "sha256-uwTqDCYmG/5dyse0tF/CPG+9SlThyRyeHJ0OSBpcQio="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/rb/rblake2sum/package.nix b/pkgs/by-name/rb/rblake2sum/package.nix new file mode 100644 index 000000000000..8dc252af0539 --- /dev/null +++ b/pkgs/by-name/rb/rblake2sum/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage { + pname = "rblake2sum"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "crev-dev"; + repo = "rblake2sum"; + rev = "cdbaba9f198bd28bfad2fbc17011ce5c8c7ad957"; + hash = "sha256-bzOjJ+/M0YWY4/r8cNARPVqbuLBeTllqFyVXhJz6ZMI="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-wIJWwU4D0OeVa2RMgmpN512TIvNdcBdorXU8KfFRTIg="; + + meta = with lib; { + description = "Recursive blake2 digest (hash) of a file-system path"; + homepage = "https://github.com/crev-dev/rblake2sum"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ dpc ]; + mainProgram = "rblake2sum"; + }; +} diff --git a/pkgs/by-name/rb/rblake3sum/package.nix b/pkgs/by-name/rb/rblake3sum/package.nix new file mode 100644 index 000000000000..1e0ad125994b --- /dev/null +++ b/pkgs/by-name/rb/rblake3sum/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage { + pname = "rblake3sum"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "rustshop"; + repo = "rblake3sum"; + rev = "6a8e2576ccc05214eacb75b75a9d4cfdf272161c"; + hash = "sha256-UFk6SJVA58WXhH1CIuT48MEF19yPUe1HD+ekn4LDj8g="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-cxPNqUVNMkNY9Ov7/ajTAwnBd2j/gKDHVLXPtd1aPVA="; + + meta = with lib; { + description = "Recursive blake3 digest (hash) of a file-system path"; + homepage = "https://github.com/rustshop/rblake3sum"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ dpc ]; + mainProgram = "rblake3sum"; + }; +} diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix new file mode 100644 index 000000000000..f9d9d1c694d3 --- /dev/null +++ b/pkgs/by-name/rb/rbspy/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + ruby, + which, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "rbspy"; + version = "0.33.0"; + + src = fetchFromGitHub { + owner = "rbspy"; + repo = "rbspy"; + tag = "v${version}"; + hash = "sha256-JvlFVoYGPPe3WJgS1MS3GHGpZcGpRh8Yg+8NwARJ3eI="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-DDWsp8EzqbRyal6/x1hQE1sOdtBt1qACzd2f5wmsiHg="; + + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config + ''; + + doCheck = true; + + # The current implementation of rbspy fails to detect the version of ruby + # from nixpkgs during tests. + preCheck = '' + substituteInPlace src/core/process.rs \ + --replace /usr/bin/which '${which}/bin/which' + substituteInPlace src/sampler/mod.rs \ + --replace /usr/bin/which '${which}/bin/which' + substituteInPlace src/core/ruby_spy.rs \ + --replace /usr/bin/ruby '${ruby}/bin/ruby' + ''; + + checkFlags = [ + "--skip=test_get_trace" + "--skip=test_get_trace_when_process_has_exited" + "--skip=test_sample_single_process" + "--skip=test_sample_single_process_with_time_limit" + "--skip=test_sample_subprocesses" + ]; + + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; + + nativeCheckInputs = [ + ruby + which + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://rbspy.github.io/"; + description = "Sampling CPU Profiler for Ruby"; + mainProgram = "rbspy"; + changelog = "https://github.com/rbspy/rbspy/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ viraptor ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/by-name/rc/rc-9front/package.nix b/pkgs/by-name/rc/rc-9front/package.nix index a88159cf72a6..df50742c1d5b 100644 --- a/pkgs/by-name/rc/rc-9front/package.nix +++ b/pkgs/by-name/rc/rc-9front/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation { pname = "rc-9front"; - version = "0-unstable-2025-01-19"; + version = "0-unstable-2025-04-12"; src = fetchFrom9Front { domain = "shithub.us"; owner = "cinap_lenrek"; repo = "rc"; - rev = "a827beee910cb143f916cf3657c45c29d904800c"; - hash = "sha256-FPHKGuJn1xs6yex64knplr6hteFy2xVsUOAgMxQbGXs="; + rev = "ab2af6895d0e66aa9e5a94f77c2ba132c08f28d8"; + hash = "sha256-hpBZsZ+I2dS79bS6lkXOgx+KPri7vQftTLwuPEnomhc="; }; strictDeps = true; diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index 79158113b421..f00054b24a7c 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication rec { pname = "rclip"; - version = "1.11.0"; + version = "2.0.5"; pyproject = true; src = fetchFromGitHub { owner = "yurijmikhalevich"; repo = "rclip"; tag = "v${version}"; - hash = "sha256-bu9kz0CCq78lp+d2uPoApzZnVybwyWD/fwgnXYG52dk="; + hash = "sha256-d/jEtcBvOiebdI4DgWNWtP8ZfOy2x7EaQt/6mo7o2Ok="; }; build-system = with python3Packages; [ @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook ] ++ (with python3Packages; [ pytestCheckHook ]); - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; disabledTestPaths = [ # requires network diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix new file mode 100644 index 000000000000..0db1c5d2cb26 --- /dev/null +++ b/pkgs/by-name/rc/rclone-ui/package.nix @@ -0,0 +1,86 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + + cargo-tauri, + nodejs, + npmHooks, + fetchNpmDeps, + + pkg-config, + wrapGAppsHook3, + + openssl, + webkitgtk_4_1, + glib-networking, + libappindicator, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "rclone-ui"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "rclone-ui"; + repo = "rclone-ui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KTi/vCHiZVRAmQAiVXSWHCTTv1NnsvM5UZg8cpuFbRQ="; + }; + + npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src; + forceGitDeps = true; + hash = "sha256-18QkqqYS1kGY701FbFBHLvr5WBkJzxFgR9VMnydeelY="; + }; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; + useFetchCargoVendor = true; + cargoHash = "sha256-o21of2eS2KZtg1U1E6RwdaA8jGhEVzg7HkgOv1k5wxI="; + + # Disable tauri bundle updater, can be removed when #389107 is merged + patches = [ ./remove_updater.patch ]; + + postPatch = '' + substituteInPlace src-tauri/Cargo.toml \ + --replace-fail 'name = "app"' 'name = "${finalAttrs.pname}"' + ''; + + nativeBuildInputs = [ + npmHooks.npmConfigHook + nodejs + + cargo-tauri.hook + + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + openssl + webkitgtk_4_1 + glib-networking + libappindicator + ]; + + dontWrapGApps = true; + + postInstall = '' + wrapProgram $out/bin/rclone-ui \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libappindicator ]} + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cross-platform desktop GUI for rclone & S3"; + homepage = "https://github.com/rclone-ui/rclone-ui"; + changelog = "https://github.com/rclone-ui/rclone-ui/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "rclone-ui"; + }; +}) diff --git a/pkgs/by-name/rc/rclone-ui/remove_updater.patch b/pkgs/by-name/rc/rclone-ui/remove_updater.patch new file mode 100644 index 000000000000..398ba86b2bc8 --- /dev/null +++ b/pkgs/by-name/rc/rclone-ui/remove_updater.patch @@ -0,0 +1,32 @@ +diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs +index 001faa3..2d7ae0c 100644 +--- a/src-tauri/src/lib.rs ++++ b/src-tauri/src/lib.rs +@@ -82,7 +82,6 @@ pub fn run() { + let _guard = minidump::init(&client); + + let mut app = tauri::Builder::default() +- .plugin(tauri_plugin_updater::Builder::new().build()) + .plugin(tauri_plugin_os::init()) + .plugin(tauri_plugin_notification::init()) + .plugin(tauri_plugin_process::init()) +diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json +index 4f9df22..58d6c06 100644 +--- a/src-tauri/tauri.conf.json ++++ b/src-tauri/tauri.conf.json +@@ -86,14 +86,9 @@ + "installMode": "both" + }, + "signCommand": "trusted-signing-cli %1 -e https://eus.codesigning.azure.net -a sign-1 -c Sign1" +- }, +- "createUpdaterArtifacts": true ++ } + }, + "plugins": { +- "updater": { +- "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDIyNDFENEZGNjFDNTBGOEYKUldTUEQ4VmgvOVJCSWhVZmw0enhmcW1kWFk3TS9mMzBDRjVEZWdxKzQ5ZmRhTlYvT2gvdFNMbE8K", +- "endpoints": ["https://github.com/FTCHD/rclone-ui/releases/latest/download/latest.json"] +- }, + "fs": { + "requireLiteralLeadingDot": false + } diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix index cfddacffc9dd..f9c3ce8e7010 100644 --- a/pkgs/by-name/rc/rcodesign/package.nix +++ b/pkgs/by-name/rc/rcodesign/package.nix @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index f6d630ae31af..436df90d68e9 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -3,29 +3,21 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { pname = "rcp"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "wykurz"; repo = "rcp"; rev = "v${version}"; - hash = "sha256-gFkrUqG3GXPAg9Zqv7Wr3axQ30axYGXw8bo+P1kmSJM="; + hash = "sha256-mFFMxGu/r8xtfMkpDW2Rk/oTWQcS9oK6ngoRKCc+STo="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - IOKit - ] - ); - useFetchCargoVendor = true; - cargoHash = "sha256-izJRaxJhLvk064JB3hlzN50V7ZWmv/X1pbL0lRCZV60="; + cargoHash = "sha256-2S3bygSu9ouT/RYCmafFGvFHHFJXVryb5E3PMmcZs0U="; RUSTFLAGS = "--cfg tokio_unstable"; @@ -41,7 +33,8 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit ]; mainProgram = "rcp"; maintainers = with maintainers; [ wykurz ]; - # = note: Undefined symbols for architecture x86_64: "_utimensat" - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; + # Building procfs on an for a unsupported platform. Currently only linux and android are supported + # (Your current target_os is macos) + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/rd/rdedup/package.nix b/pkgs/by-name/rd/rdedup/package.nix new file mode 100644 index 000000000000..cc874b51493a --- /dev/null +++ b/pkgs/by-name/rd/rdedup/package.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + libsodium, + xz, +}: + +rustPlatform.buildRustPackage rec { + pname = "rdedup"; + version = "3.2.1"; + + src = fetchFromGitHub { + owner = "dpc"; + repo = "rdedup"; + rev = "v${version}"; + sha256 = "sha256-GEYP18CaCQShvCg8T7YTvlybH1LNO34KBxgmsTv2Lzs="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-JpsUceR9Y3r6RiaLOtbgBUrb6eoan7fFt76U9ztQoM8="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + buildInputs = [ + openssl + libsodium + xz + ]; + + meta = with lib; { + description = "Data deduplication with compression and public key encryption"; + mainProgram = "rdedup"; + homepage = "https://github.com/dpc/rdedup"; + license = licenses.mpl20; + maintainers = with maintainers; [ dywedir ]; + }; +} diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix index c07800cebd6d..241d2f32297f 100644 --- a/pkgs/by-name/rd/rdkafka/package.nix +++ b/pkgs/by-name/rd/rdkafka/package.nix @@ -8,17 +8,18 @@ curl, cmake, ninja, + deterministic-host-uname, }: stdenv.mkDerivation (finalAttrs: { pname = "rdkafka"; - version = "2.8.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-OCCsxgEO8UvCcC0XwzqpqmaT8dV0Klrspp+2o1FbH2Y="; + sha256 = "sha256-u4+qskNw18TD59aiSTyv1XOYT2DI24uZnGEAzJ4YBJU="; }; outputs = [ @@ -29,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja + # cross: build system uses uname to determine host system + deterministic-host-uname ]; buildInputs = [ diff --git a/pkgs/by-name/rd/rdma-core/package.nix b/pkgs/by-name/rd/rdma-core/package.nix index 13f277e64ffa..36d43361053f 100644 --- a/pkgs/by-name/rd/rdma-core/package.nix +++ b/pkgs/by-name/rd/rdma-core/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdma-core"; - version = "56.0"; + version = "57.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${finalAttrs.version}"; - hash = "sha256-nzd7BDP72o0TsSTrCGT6HOF7td+3ex4/c68GdjIA6Bc="; + hash = "sha256-vE0HKsNQNB+Nfxh7BNGadweZQC+e8HFbI89iJhSg40o="; }; strictDeps = true; diff --git a/pkgs/by-name/rd/rdrview/package.nix b/pkgs/by-name/rd/rdrview/package.nix index ad50b473490a..f9e8796b588c 100644 --- a/pkgs/by-name/rd/rdrview/package.nix +++ b/pkgs/by-name/rd/rdrview/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdrview"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "eafer"; repo = "rdrview"; rev = "v${finalAttrs.version}"; - hash = "sha256-UFHRsaLGa/jv/S+VXtXIMgLuQUPgqbRgD35bBrJyuZA="; + hash = "sha256-wYeDtgfq6/W92WguPh9wiFaxR7CWSfLnfqTX1N7eT10="; }; buildInputs = [ diff --git a/pkgs/by-name/re/re-flex/package.nix b/pkgs/by-name/re/re-flex/package.nix index c976c63c2f0b..19f4ce49d5f6 100644 --- a/pkgs/by-name/re/re-flex/package.nix +++ b/pkgs/by-name/re/re-flex/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "5.2.2"; + version = "5.5.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - hash = "sha256-oLpgY8m0hwLrTVkUwxVW7O7vr4Hl7Bn+uIQwFEVSfvc="; + hash = "sha256-BTzKR9C4J9DOszKGtcd+7Tiw+OkohPJuKKjbXZ8wX7k="; }; outputs = [ diff --git a/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch b/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch new file mode 100644 index 000000000000..30b8696b70d8 --- /dev/null +++ b/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch @@ -0,0 +1,50 @@ +# fixes "undefined reference to `IDB::JsonHitTable(RESULT const&)" build failure + +--- + src/idb.cxx | 26 -------------------------- + 1 file changed, 26 deletions(-) + +diff --git a/src/idb.cxx b/src/idb.cxx +index 2469c06..753a9fb 100644 +--- a/src/idb.cxx ++++ b/src/idb.cxx +@@ -5486,37 +5486,11 @@ STRING IDB::XMLHitTable(const RESULT& Result) + } + #endif + +-#if 0 + STRING IDB::JsonHitTable(const RESULT& Result) + { +-#if 1 + message_log (LOG_FATAL, "JsonHitTable is not yet implemented"); + return NulString; +-#else +-/* +- +- Shopping +- +- +-is JSON +- +-{ +- "folders": { +- "folder":{ +- "@": { +- "id": "123", +- "private": "0", +- "archived": "0", +- "order": "1" +- }, +- "#": "Shopping" +- } +- } +-} +-*/ + } +-#endif +-#endif + + + PIRSET IDB::SearchSmart(QUERY *Query, const STRING& DefaultField) +-- +2.47.2 diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index b026835b89cb..ca799c160456 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -5,24 +5,36 @@ db, file, libnsl, + writableTmpDirAsHomeHook, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttr: { pname = "re-Isearch"; - version = "unstable-2022-03-24"; + version = "2.20220925.4.0a-unstable-2025-03-16"; src = fetchFromGitHub { owner = "re-Isearch"; repo = "re-Isearch"; - rev = "e5953ea6c84285283be3689df7065908369cdbaf"; - sha256 = "sha256-D0PDqlWzIOHqdS2MlNzR2T5cyhiLcFlf30v6eFokoRQ="; + rev = "56e0dfbe7468881b3958ca8e630f41a5354e9873"; + sha256 = "sha256-tI75D02/sFEkHDQX/BpDlu24WNP6Qh9G0MIfEvs8npM="; }; + # Upstream issue: https://github.com/re-Isearch/re-Isearch/issues/11 + patches = [ ./0001-fix-JsonHitTable-undefined-reference.patch ]; + postPatch = '' # Fix gcc-13 build due to missing include. sed -e '1i #include ' -i src/mmap.cxx + + # g++: error: unrecognized command-line option '-msse2' + # gcc: error: unrecognized command-line option '-m64' + substituteInPlace build/Makefile.ubuntu \ + --replace-fail "-msse2" "" \ + --replace-fail "-m64" "" ''; + nativeBuildInputs = [ writableTmpDirAsHomeHook ]; + buildinputs = [ db file # libmagic @@ -33,11 +45,11 @@ stdenv.mkDerivation { "CC=g++" "cc=gcc" "LD=g++" - "INSTALL=${placeholder "out"}/bin" ]; preBuild = '' cd build + make clean # clean up pre-built objects in the source makeFlagsArray+=( EXTRA_INC="-I${db.dev}/include -I${lib.getDev file}/include" LD_PATH="-L../lib -L${db.out}/lib -L${file}/lib -L${libnsl}/lib" @@ -47,14 +59,24 @@ stdenv.mkDerivation { preInstall = '' mkdir -p $out/{bin,lib} ''; - postInstall = '' + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + + cp ../bin/{Iindex,Isearch,Iutil,Idelete,zpresent,Iwatch,zipper} $out/bin cp ../lib/*.so $out/lib/ + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Novel multimodal search and retrieval engine"; - homepage = "https://github.com/re-Isearch/"; - license = licenses.asl20; - maintainers = [ maintainers.astro ]; + homepage = "https://nlnet.nl/project/Re-iSearch/"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.astro ]; + teams = [ lib.teams.ngi ]; }; -} +}) diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix index 278d63702ed2..8781413e48ba 100644 --- a/pkgs/by-name/re/re2/package.nix +++ b/pkgs/by-name/re/re2/package.nix @@ -44,7 +44,10 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ abseil-cpp ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ icu ]; cmakeFlags = - [ (lib.cmakeBool "RE2_BUILD_TESTING" true) ] + [ + (lib.cmakeBool "RE2_BUILD_TESTING" true) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--timeout;999999") + ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ (lib.cmakeBool "RE2_USE_ICU" true) (lib.cmakeBool "BUILD_SHARED_LIBS" true) diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix index 02859a9bc813..bc7ee4beba24 100644 --- a/pkgs/by-name/re/re2c/package.nix +++ b/pkgs/by-name/re/re2c/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "re2c"; - version = "4.0.2"; + version = "4.1"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "sha256-hp9kwsoSRdel1z1+VWREPQdigI1rQ5GrM5/Z6wpnmE0="; + sha256 = "sha256-xB4oH0QS0VKTK2we+wdylS8VBijpp6tv7YV7fIX1s4A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/readarr/package.nix b/pkgs/by-name/re/readarr/package.nix index c01cc63a1443..30b5a3de57bf 100644 --- a/pkgs/by-name/re/readarr/package.nix +++ b/pkgs/by-name/re/readarr/package.nix @@ -24,15 +24,15 @@ let ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-lpINlPOZL7dMxrxzmPr6O4yK2kK9irTQ7gL64xBR0G0="; - arm64-linux_hash = "sha256-rn0J93wpwGNz9wbfVRa2P/Sj+YrN0EeKhDGdAlpzZAE="; - x64-osx_hash = "sha256-eWo6E76x+cI34T8FcbGEgmYA+J3CZj3YgtiolP77+JU="; + x64-linux_hash = "sha256-sJcnCysBNRL0rY+leTW9oTmHPa1Ook8oC6ateAyP58A="; + arm64-linux_hash = "sha256-PQYWApDyl5HFv+lNFi/VQ0suG32QHm0icjsEjHopf/U="; + x64-osx_hash = "sha256-NBy3shWURHQdZauTqeZMi7OMfGkBmJjhF/l4oX2xTp4="; } ."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.4.12.2753"; + version = "0.4.16.2793"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/by-name/re/readeck/package.nix b/pkgs/by-name/re/readeck/package.nix index cf8f768e733d..d0082683eef4 100644 --- a/pkgs/by-name/re/readeck/package.nix +++ b/pkgs/by-name/re/readeck/package.nix @@ -1,14 +1,14 @@ { + lib, fetchFromGitea, fetchNpmDeps, buildGoModule, nodejs, npmHooks, - lib, + python3, }: let - file-compose = buildGoModule { pname = "file-compose"; version = "unstable-2023-10-21"; @@ -27,19 +27,20 @@ in buildGoModule rec { pname = "readeck"; - version = "0.17.1"; + version = "0.18.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "readeck"; repo = "readeck"; tag = version; - hash = "sha256-+GgjR1mxD93bFNaLeDuEefPlQEV9jNgFIo8jTAxphyo="; + hash = "sha256-geKhug1sQ51i+6qw2LVzW8lXyvre6AlVHWvGlEXWki8="; }; nativeBuildInputs = [ nodejs npmHooks.npmConfigHook + (python3.withPackages (ps: with ps; [ babel ])) ]; npmRoot = "web"; @@ -48,10 +49,13 @@ buildGoModule rec { preBuild = '' make web-build + python3 locales/messages.py compile ${file-compose}/bin/file-compose -format json docs/api/api.yaml docs/assets/api.json go run ./tools/docs docs/src docs/assets ''; + subPackages = [ "." ]; + tags = [ "netgo" "osusergo" @@ -66,6 +70,7 @@ buildGoModule rec { "-X" "codeberg.org/readeck/readeck/configs.version=${version}" ]; + overrideModAttrs = oldAttrs: { # Do not add `npmConfigHook` to `goModules` nativeBuildInputs = lib.remove npmHooks.npmConfigHook oldAttrs.nativeBuildInputs; @@ -75,18 +80,17 @@ buildGoModule rec { npmDeps = fetchNpmDeps { src = "${src}/web"; - hash = "sha256-7fRSkXKAMEC7rFmSF50DM66SVhV68g93PMBjrtkd9/E="; + hash = "sha256-3MVrzpilJKptT0iRBQx2Cl0iKVoOJu5cBT987U1/C1k="; }; - vendorHash = "sha256-O/ZrpT6wTtPwBDUCAmR0XHRgQmd46/MPvWNE0EvD3bg="; + vendorHash = "sha256-RjU3PW7GeMkQE0oHkI4EmFNr4HT3vRyFITUzYX9AHpw="; meta = { description = "Web application that lets you save the readable content of web pages you want to keep forever."; mainProgram = "readeck"; homepage = "https://readeck.org/"; - changelog = "https://github.com/readeck/readeck/releases/tag/${version}"; + changelog = "https://codeberg.org/readeck/readeck/releases/tag/${version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ julienmalka ]; }; - } diff --git a/pkgs/by-name/re/reader/package.nix b/pkgs/by-name/re/reader/package.nix index 30a4c7e0b1f3..decd816d28a4 100644 --- a/pkgs/by-name/re/reader/package.nix +++ b/pkgs/by-name/re/reader/package.nix @@ -6,16 +6,16 @@ let self = buildGoModule { pname = "reader"; - version = "0.4.7"; + version = "0.5.0"; src = fetchFromGitHub { owner = "mrusme"; repo = "reader"; tag = "v${self.version}"; - hash = "sha256-Xg6ndfxKOfiIz654HcnhdvBGydOSSODBp8LnYxmqb4o="; + hash = "sha256-qu48ikqm4EmoeL9j67tGkX3EFBd1JdrLWhhmoElCoJY="; }; - vendorHash = "sha256-dr/y4BBBe5K9U24ikLzYA+B2mzTGpFuFqoj5OLXtUG4="; + vendorHash = "sha256-8IjN7hm5Rg9ItkxE9pbnkVr5t+tG95W9vvXyGaWmEIA="; meta = { description = "Lightweight tool offering better readability of web pages on the CLI"; diff --git a/pkgs/by-name/re/readerwriterqueue/package.nix b/pkgs/by-name/re/readerwriterqueue/package.nix new file mode 100644 index 000000000000..968702eb3ff8 --- /dev/null +++ b/pkgs/by-name/re/readerwriterqueue/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "readerwriterqueue"; + # Not using a stable version since this one produces + # readerwriterqueueConfig.cmake needed by dependent packages. + version = "1.0.6-2024-07-09"; + + src = fetchFromGitHub { + owner = "cameron314"; + repo = "readerwriterqueue"; + rev = "16b48ae1148284e7b40abf72167206a4390a4592"; + hash = "sha256-m4cUIXiDFxTguDZ7d0svjlOSkUNYY0bbUp3t7adBwOo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Fast single-producer, single-consumer lock-free queue for C"; + homepage = "https://github.com/cameron314/readerwriterqueue"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ doronbehar ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 839bd03f2fcd..c9bb0474e366 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -15,17 +15,18 @@ nix-update-script, moreutils, jq, + gst_all_1, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.29"; + version = "0.9.41"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-2L5Wyl3xWjiJCjwUq9mcKe/hnDeHjNnhHgFPISNqfk0="; + hash = "sha256-sX/Er2G4V2jmIp5DAXR158nmAXqkVvEb9bMqP44z7P4="; fetchSubmodules = true; }; @@ -38,14 +39,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-VcPxhCpDrKaqKtGMsvPwXwniPy0rbJ/i03gbZ3i87aE="; + hash = "sha256-ozRDNXWqg0CZ1IgU33C6yJu4e05010jsHeTdIVhB72M="; }; pnpmRoot = "../.."; useFetchCargoVendor = true; - cargoHash = "sha256-bRIZcR8UNE78k5cbOt6GQM+PlFVHR2qV7eB82Y+abZw="; + cargoHash = "sha256-5DIagAKSq427kwZTH/QKY3vbb+TmFscKSANoSkEJMGg="; cargoRoot = "../.."; @@ -78,6 +79,11 @@ rustPlatform.buildRustPackage (finalAttrs: { gtk3 librsvg openssl + # TTS + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad ]; preBuild = '' diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix index b32356df4cb7..6edeccfdd07d 100644 --- a/pkgs/by-name/re/realm/package.nix +++ b/pkgs/by-name/re/realm/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nix-update-script, nixosTests, }: @@ -22,10 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Oe64l16uYdU6NvTl7XrEm6dAtRFngI9yHC4fe4hpTNA="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - env.RUSTC_BOOTSTRAP = 1; passthru = { diff --git a/pkgs/by-name/re/reason-shell/package.nix b/pkgs/by-name/re/reason-shell/package.nix index 9a3dc6692732..e3ce9f006665 100644 --- a/pkgs/by-name/re/reason-shell/package.nix +++ b/pkgs/by-name/re/reason-shell/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Shell for research papers"; diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix index 3b38e60f0d31..303677626ab2 100644 --- a/pkgs/by-name/re/rebuilderd/package.nix +++ b/pkgs/by-name/re/rebuilderd/package.nix @@ -12,7 +12,6 @@ xz, zstd, stdenv, - darwin, buildPackages, versionCheckHook, nixosTests, @@ -21,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rebuilderd"; - version = "0.22.1"; + version = "0.23.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = "rebuilderd"; tag = "v${finalAttrs.version}"; - hash = "sha256-YMBq+Z9yMQRXOM3U679g2lnBZlH/h0VLjoxySxi4SCo="; + hash = "sha256-ARm81++VByh/erog1aDQTOaxd60M9OuTbJGdgHx24pw="; }; postPatch = '' @@ -42,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-MjFQ5d9VWHodjj+hIsKgAIUdaiarXIi5GCS+47n5MGU="; + cargoHash = "sha256-O+1ARimSN26geZanLV5E94vnZk0HsE4pyjNS3dADg8Y="; nativeBuildInputs = [ pkg-config @@ -50,19 +49,14 @@ rustPlatform.buildRustPackage (finalAttrs: { scdoc ]; - buildInputs = - [ - bzip2 - openssl - shared-mime-info - sqlite - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + shared-mime-info + sqlite + xz + zstd + ]; postInstall = let @@ -107,7 +101,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.tests = { diff --git a/pkgs/by-name/re/recon-ng/package.nix b/pkgs/by-name/re/recon-ng/package.nix index 03aed8ec2638..1a08b38e3462 100644 --- a/pkgs/by-name/re/recon-ng/package.nix +++ b/pkgs/by-name/re/recon-ng/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, python3, - substituteAll, + replaceVars, fetchpatch, }: python3.pkgs.buildPythonApplication rec { @@ -49,8 +49,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = let - setup = substituteAll { - src = ./setup.py; + setup = replaceVars ./setup.py { inherit pname version; }; in diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix index 6d3d9e5493ad..205136b591bd 100644 --- a/pkgs/by-name/re/rectangle/package.nix +++ b/pkgs/by-name/re/rectangle/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rectangle"; - version = "0.86"; + version = "0.87"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg"; - hash = "sha256-UUL5xaZn+NDQ5VvlVH9ROek5AFQ5fyZLGubLc/qQqcI="; + hash = "sha256-onXzRRUvr3WiVn9JZxVLqXFcCmFG/u1n+oOsTEQMi+8="; }; sourceRoot = "."; diff --git a/pkgs/by-name/re/recyclarr/package.nix b/pkgs/by-name/re/recyclarr/package.nix index f729757aed3a..7ac3bb36fb62 100644 --- a/pkgs/by-name/re/recyclarr/package.nix +++ b/pkgs/by-name/re/recyclarr/package.nix @@ -1,22 +1,12 @@ { lib, openssl, - writeText, git, buildDotnetModule, dotnetCorePackages, fetchFromGitHub, testers, }: -let - nuget-config = writeText "nuget.config" '' - - - - - - ''; -in buildDotnetModule (finalAttrs: { pname = "recyclarr"; version = "7.4.1"; @@ -47,8 +37,6 @@ buildDotnetModule (finalAttrs: { enableParallelBuilding = false; - dotnetRestoreFlags = [ "--configfile=${nuget-config}" ]; - doCheck = false; dotnet-sdk = dotnetCorePackages.sdk_9_0; diff --git a/pkgs/by-name/re/reddit-tui/package.nix b/pkgs/by-name/re/reddit-tui/package.nix new file mode 100644 index 000000000000..57c5c8a7f09f --- /dev/null +++ b/pkgs/by-name/re/reddit-tui/package.nix @@ -0,0 +1,34 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + nix-update-script, + callPackage, +}: +buildGoModule (finalAttrs: { + pname = "reddit-tui"; + version = "0.3.8"; + src = fetchFromGitHub { + owner = "tonymajestro"; + repo = "reddit-tui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RorH4O4SKZOGb9UmEr1vsKu2w21Fx9IcZbSlGPX8Kms="; + }; + vendorHash = "sha256-Yqo80adzA9gtSD3qzM+fObzRt3WbcMATQef0g7/z2Dw="; + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/tonymajestro/reddit-tui/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://github.com/tonymajestro/reddit-tui"; + description = "Terminal UI for reddit"; + longDescription = '' + Due to suspected throttling by reddit, it might be necessary to use a [redlib backend](https://github.com/redlib-org/redlib) to enable this package to work. + See [the Docs](https://github.com/tonymajestro/reddit-tui#configuration-files) on how to do that. + ''; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.LazilyStableProton ]; + mainProgram = "reddittui"; + }; +}) diff --git a/pkgs/by-name/re/reddsaver/package.nix b/pkgs/by-name/re/reddsaver/package.nix new file mode 100644 index 000000000000..e9017cf243a4 --- /dev/null +++ b/pkgs/by-name/re/reddsaver/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "reddsaver"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "manojkarthick"; + repo = "reddsaver"; + rev = "v${version}"; + sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf"; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-xYtdGhuieFudfJz+LxUjP7mV8uItaIvLahCH7vBWTtg="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + # package does not contain tests as of v0.3.3 + docCheck = false; + + meta = with lib; { + description = "CLI tool to download saved media from Reddit"; + homepage = "https://github.com/manojkarthick/reddsaver"; + license = with licenses; [ + mit # or + asl20 + ]; + maintainers = [ maintainers.manojkarthick ]; + mainProgram = "reddsaver"; + }; + +} diff --git a/pkgs/by-name/re/redeclipse/package.nix b/pkgs/by-name/re/redeclipse/package.nix index 1bb741380b45..797c5a659ee7 100644 --- a/pkgs/by-name/re/redeclipse/package.nix +++ b/pkgs/by-name/re/redeclipse/package.nix @@ -7,6 +7,7 @@ pkg-config, freetype, zlib, + libGL, libX11, SDL2, SDL2_image, @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ + libGL libX11 freetype zlib diff --git a/pkgs/by-name/re/redfang/include-pthread.patch b/pkgs/by-name/re/redfang/include-pthread.patch new file mode 100644 index 000000000000..6e895df84ac4 --- /dev/null +++ b/pkgs/by-name/re/redfang/include-pthread.patch @@ -0,0 +1,12 @@ +diff --git a/fang.c b/fang.c +index cda61bf..52f9659 100755 +--- a/fang.c ++++ b/fang.c +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/pkgs/by-name/re/redfang/package.nix b/pkgs/by-name/re/redfang/package.nix index 014e62ac328f..5bb42b53b109 100644 --- a/pkgs/by-name/re/redfang/package.nix +++ b/pkgs/by-name/re/redfang/package.nix @@ -6,7 +6,7 @@ bluez, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redfang"; version = "2.5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "kalilinux"; owner = "packages"; repo = "redfang"; - rev = "upstream/${version}"; + rev = "upstream/${finalAttrs.version}"; hash = "sha256-dF9QmBckyHAZ+JbLr0jTmp0eMu947unJqjrTMsJAfIE="; }; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/kalilinux/packages/redfang/-/merge_requests/1.diff"; sha256 = "sha256-oxIrUAucxsBL4+u9zNNe2XXoAd088AEAHcRB/AN7B1M="; }) + # error: implicit declaration of function 'pthread_create' [] + ./include-pthread.patch ]; installFlags = [ "DESTDIR=$(out)" ]; @@ -32,11 +34,11 @@ stdenv.mkDerivation rec { buildInputs = [ bluez ]; - meta = with lib; { + meta = { description = "Small proof-of-concept application to find non discoverable bluetooth devices"; homepage = "https://gitlab.com/kalilinux/packages/redfang"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ moni ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ moni ]; mainProgram = "fang"; }; -} +}) diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index d14f90d09f81..e60ba5c6caff 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -1,7 +1,8 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + fetchpatch2, lua, jemalloc, pkg-config, @@ -10,12 +11,12 @@ which, ps, getconf, - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, - # dependency ordering is broken at the moment when building with openssl - tlsSupport ? !stdenv.hostPlatform.isStatic, openssl, + python3, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + tlsSupport ? true, # Using system jemalloc fixes cross-compilation and various setups. # However the experimental 'active defragmentation' feature of redis requires # their custom patched version of jemalloc. @@ -26,30 +27,29 @@ stdenv.mkDerivation (finalAttrs: { pname = "redis"; version = "7.2.7"; - src = fetchurl { - url = "https://download.redis.io/releases/redis-${finalAttrs.version}.tar.gz"; - hash = "sha256-csCB47jPrnFEJz0m12c28IMZAAr0bAFRXK1dKXZc6tU="; + src = fetchFromGitHub { + owner = "redis"; + repo = "redis"; + rev = finalAttrs.version; + hash = "sha256-WZ89BUm3zz6n0dZKyODHCyMGExbqaPJJ1qxLvJKUSDI="; }; - patches = lib.optionals useSystemJemalloc [ - # use system jemalloc - (fetchurl { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch"; - hash = "sha256-VPRfoSnctkkkzLrXEWQX3Lh5HmZaCXoJafyOG007KzM="; - }) - ]; + patches = lib.optional useSystemJemalloc (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch"; + hash = "sha256-A9qp+PWQRuNy/xmv9KLM7/XAyL7Tzkyn0scpVCGngcc="; + }); - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + which + python3 + ]; buildInputs = [ lua ] ++ lib.optional useSystemJemalloc jemalloc ++ lib.optional withSystemd systemd - ++ lib.optionals tlsSupport [ openssl ]; - - preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace src/Makefile --replace "-flto" "" - ''; + ++ lib.optional tlsSupport openssl; # More cross-compiling fixes. makeFlags = @@ -103,13 +103,13 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.redis = nixosTests.redis; passthru.serverBin = "redis-server"; - meta = with lib; { + meta = { homepage = "https://redis.io"; description = "Open source, advanced key-value store"; - license = licenses.bsd3; - platforms = platforms.all; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; changelog = "https://github.com/redis/redis/raw/${finalAttrs.version}/00-RELEASENOTES"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ berdario globin ]; diff --git a/pkgs/by-name/re/redisTestHook/package.nix b/pkgs/by-name/re/redisTestHook/package.nix new file mode 100644 index 000000000000..5ffc0be7c239 --- /dev/null +++ b/pkgs/by-name/re/redisTestHook/package.nix @@ -0,0 +1,17 @@ +{ + lib, + callPackage, + makeSetupHook, + valkey, +}: + +makeSetupHook { + name = "redis-test-hook"; + substitutions = { + cli = lib.getExe' valkey "redis-cli"; + server = lib.getExe' valkey "redis-server"; + }; + passthru.tests = { + simple = callPackage ./test.nix { }; + }; +} ./redis-test-hook.sh diff --git a/pkgs/by-name/re/redisTestHook/redis-test-hook.sh b/pkgs/by-name/re/redisTestHook/redis-test-hook.sh new file mode 100644 index 000000000000..58496021760c --- /dev/null +++ b/pkgs/by-name/re/redisTestHook/redis-test-hook.sh @@ -0,0 +1,33 @@ +preCheckHooks+=('redisStart') +postCheckHooks+=('redisStop') + + +redisStart() { + if [[ "${redisTestPort:-}" == "" ]]; then + redisTestPort=6379 + fi + + if [[ "${REDIS_SOCKET:-}" == "" ]]; then + mkdir -p "$NIX_BUILD_TOP/run/" + REDIS_SOCKET="$NIX_BUILD_TOP/run/redis.sock" + fi + export REDIS_SOCKET + + echo 'starting redis' + + # Note about Darwin: unless the output is redirected, the parent process becomes launchd instead of bash. + # This would leave the Redis process running in case of a test failure (the postCheckHook would not be executed), + # hanging the Nix build forever. + @server@ --unixsocket "$REDIS_SOCKET" --port "$redisTestPort" > /dev/null 2>&1 & + REDIS_PID=$! + + echo 'waiting for redis to be ready' + while ! @cli@ --scan -s "$REDIS_SOCKET" ; do + sleep 1 + done +} + +redisStop() { + echo 'stopping redis' + kill "$REDIS_PID" +} diff --git a/pkgs/by-name/re/redisTestHook/test.nix b/pkgs/by-name/re/redisTestHook/test.nix new file mode 100644 index 000000000000..82ab0a1cac3e --- /dev/null +++ b/pkgs/by-name/re/redisTestHook/test.nix @@ -0,0 +1,47 @@ +{ + valkey, + redisTestHook, + stdenv, +}: + +stdenv.mkDerivation { + name = "redis-test-hook-test"; + + nativeCheckInputs = [ + valkey + redisTestHook + ]; + + dontUnpack = true; + doCheck = true; + + preCheck = '' + redisTestPort=6380 + REDIS_SOCKET=/tmp/customredis.sock + ''; + + checkPhase = '' + runHook preCheck + + echo "running test" + if redis-cli --scan -p $redisTestPort; then + echo "connected to redis via localhost" + PORT_TEST_RAN=1 + fi + + if redis-cli --scan -s $REDIS_SOCKET; then + echo "connected to redis via domain socket" + SOCKET_TEST_RAN=1 + fi + + runHook postCheck + ''; + + installPhase = '' + [[ $PORT_TEST_RAN == 1 && $SOCKET_TEST_RAN == 1 ]] + echo "test passed" + touch $out + ''; + + __darwinAllowLocalNetworking = true; +} diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index 2c2f4bd345b6..9f8c88f2b136 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -1,108 +1,108 @@ { lib, stdenv, + fetchFromGitHub, - makeWrapper, - makeDesktopItem, - copyDesktopItems, - fixup-yarn-lock, - yarn, - nodejs_18, - python3, fetchYarnDeps, - electron, - nest-cli, - libsass, - buildPackages, + makeDesktopItem, + + copyDesktopItems, + dart-sass, + makeWrapper, + nodejs_20, pkg-config, + yarnConfigHook, + + electron, + libsecret, sqlite, - xdg-utils, }: let - nodejs = nodejs_18; + nodejs = nodejs_20; in stdenv.mkDerivation (finalAttrs: { pname = "redisinsight"; - version = "2.48.0"; + version = "2.68.0"; src = fetchFromGitHub { owner = "RedisInsight"; repo = "RedisInsight"; rev = finalAttrs.version; - hash = "sha256-ek0Fp8v6j+mZPK2cEuFNrBgInXdYIKBBUg0UD1I51Sg="; + hash = "sha256-rXp3C/Ui3vMBscsxlwU9fRF1bmvMrvXLtmJfGzfh1Rk="; }; - offlineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-ohtU1h6wrg7asXDxTt1Jlzx9GaS3zDrGQD9P9tgzCOE="; + patches = [ + # the `file:` specifier doesn't seem to be supported with fetchYarnDeps + # upstream uses it to point the cpu-features dependency to a stub package + # so it's safe to remove + ./remove-cpu-features.patch + ]; + + baseOfflineCache = fetchYarnDeps { + name = "redisinsight-${finalAttrs.version}-base-offline-cache"; + inherit (finalAttrs) src patches; + hash = "sha256-ORVftwl/8Yrug2MeqWfZTsHNTRJlpKGn2P7JCHUf3do="; }; - feOfflineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/redisinsight/yarn.lock"; - hash = "sha256-9xbIdDeLUEk4eNeK7RTwidqDGinA8SPfcumqml66kTw="; + innerOfflineCache = fetchYarnDeps { + name = "redisinsight-${finalAttrs.version}-inner-offline-cache"; + inherit (finalAttrs) src patches; + postPatch = "cd redisinsight"; + hash = "sha256-yFfkpWV/GD2CcAzb0D3lNZwmqzEN6Bi1MjPyRwClaQ0="; }; apiOfflineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/redisinsight/api/yarn.lock"; - hash = "sha256-4zbffuneTceMEyKb8atTXTFhTv0DhrsRMdepZWgoxMQ="; + name = "redisinsight-${finalAttrs.version}-api-offline-cache"; + inherit (finalAttrs) src patches; + postPatch = "cd redisinsight/api"; + hash = "sha256-go7IR1UsW8TrWjaFSlC6/biUvb9cHo3PgJa16tF0XHo="; }; nativeBuildInputs = [ - yarn - fixup-yarn-lock - nodejs - makeWrapper - (python3.withPackages (ps: [ ps.setuptools ])) - nest-cli - libsass - pkg-config copyDesktopItems + makeWrapper + nodejs + (nodejs.python.withPackages (ps: [ ps.setuptools ])) + pkg-config + yarnConfigHook ]; buildInputs = [ - sqlite - xdg-utils + sqlite # for `sqlite3` node module + libsecret # for `keytar` node module ]; + postPatch = '' + substituteInPlace redisinsight/api/config/default.ts \ + --replace-fail "process['resourcesPath']" "\"$out/share/redisinsight\"" + + # has irrelevant files + rm -r resources/app + ''; + + # will run yarnConfigHook manually later + dontYarnInstallDeps = true; + configurePhase = '' runHook preConfigure - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + yarnOfflineCache="$baseOfflineCache" yarnConfigHook + cd redisinsight + yarnOfflineCache="$innerOfflineCache" yarnConfigHook + cd api + yarnOfflineCache="$apiOfflineCache" yarnConfigHook + cd ../.. - yarn config --offline set yarn-offline-mirror ${finalAttrs.feOfflineCache} - fixup-yarn-lock redisinsight/yarn.lock - yarn --offline --cwd redisinsight/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - - yarn config --offline set yarn-offline-mirror ${finalAttrs.apiOfflineCache} - fixup-yarn-lock redisinsight/api/yarn.lock - yarn --offline --cwd redisinsight/api/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - - patchShebangs node_modules/ - patchShebangs redisinsight/node_modules/ - patchShebangs redisinsight/api/node_modules/ - - 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} - - # Build the sqlite3 package. - pushd redisinsight - npm_config_node_gyp="${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" npm rebuild --verbose --sqlite=${sqlite.dev} sqlite3 - popd - - # Build node-sass - LIBSASS_EXT=auto npm rebuild --verbose node-sass - - substituteInPlace redisinsight/api/config/default.ts \ - --replace-fail "process['resourcesPath']" "\"$out/share/redisinsight\"" \ - - # has irrelevant files - rm -r resources/app + export npm_config_nodedir=${electron.headers} + export npm_config_sqlite=${lib.getDev sqlite} + export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + npm rebuild --verbose --no-progress + cd redisinsight + npm rebuild --verbose --no-progress + cd api + npm rebuild --verbose --no-progress + cd ../.. runHook postConfigure ''; @@ -110,14 +110,20 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} + # force the sass npm dependency to use our own sass binary instead of the bundled one + substituteInPlace node_modules/sass/dist/lib/src/compiler-path.js \ + --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];' yarn --offline build:prod + # TODO: Generate defaults. Currently broken because it requires network access. + # yarn --offline --cwd=redisinsight/api build:defaults + yarn --offline electron-builder \ --dir \ -c.electronDist=${electron.dist} \ - -c.electronVersion=${electron.version} + -c.electronVersion=${electron.version} \ + -c.npmRebuild=false # we've already rebuilt the native libs using the electron headers runHook postBuild ''; @@ -159,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "RedisInsight Redis client powered by Electron"; + description = "Developer GUI for Redis"; homepage = "https://github.com/RedisInsight/RedisInsight"; license = lib.licenses.sspl; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/re/redisinsight/remove-cpu-features.patch b/pkgs/by-name/re/redisinsight/remove-cpu-features.patch new file mode 100644 index 000000000000..a24964a6e322 --- /dev/null +++ b/pkgs/by-name/re/redisinsight/remove-cpu-features.patch @@ -0,0 +1,70 @@ +diff --git a/redisinsight/api/package.json b/redisinsight/api/package.json +index 4a24ac8..fab339c 100644 +--- a/redisinsight/api/package.json ++++ b/redisinsight/api/package.json +@@ -49,7 +49,6 @@ + "@nestjs/platform-socket.io/socket.io": "^4.8.0", + "@nestjs/cli/**/braces": "^3.0.3", + "**/semver": "^7.5.2", +- "**/cpu-features": "file:./stubs/cpu-features", + "**/cross-spawn": "^7.0.5", + "**/redis-parser": "3.0.0", + "winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0" +diff --git a/redisinsight/api/yarn.lock b/redisinsight/api/yarn.lock +index e0e8495..dfed1ae 100644 +--- a/redisinsight/api/yarn.lock ++++ b/redisinsight/api/yarn.lock +@@ -3223,9 +3223,6 @@ cosmiconfig@^8.2.0: + parse-json "^5.2.0" + path-type "^4.0.0" + +-"cpu-features@file:./stubs/cpu-features", cpu-features@~0.0.9: +- version "1.0.0" +- + create-jest@^29.7.0: + version "29.7.0" + resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320" +@@ -7969,7 +7966,6 @@ ssh2@^1.15.0: + asn1 "^0.2.6" + bcrypt-pbkdf "^1.0.2" + optionalDependencies: +- cpu-features "~0.0.9" + nan "^2.18.0" + + ssri@^8.0.0, ssri@^8.0.1: +diff --git a/redisinsight/package.json b/redisinsight/package.json +index 8649be7..354ed42 100644 +--- a/redisinsight/package.json ++++ b/redisinsight/package.json +@@ -16,8 +16,7 @@ + }, + "resolutions": { + "**/semver": "^7.5.2", +- "sqlite3/**/tar": "^6.2.1", +- "**/cpu-features": "file:./api/stubs/cpu-features" ++ "sqlite3/**/tar": "^6.2.1" + }, + "dependencies": { + "keytar": "^7.9.0", +diff --git a/redisinsight/yarn.lock b/redisinsight/yarn.lock +index 7a063ce..22f37a7 100644 +--- a/redisinsight/yarn.lock ++++ b/redisinsight/yarn.lock +@@ -183,9 +183,6 @@ console-control-strings@^1.1.0: + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== + +-"cpu-features@file:./api/stubs/cpu-features", cpu-features@~0.0.10: +- version "1.0.0" +- + debug@4, debug@^4.3.3: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" +@@ -807,7 +804,6 @@ ssh2@^1.15.0: + asn1 "^0.2.6" + bcrypt-pbkdf "^1.0.2" + optionalDependencies: +- cpu-features "~0.0.10" + nan "^2.20.0" + + ssri@^8.0.0, ssri@^8.0.1: diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index 0bcfd5c58d5f..b5c569a9f01f 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, cacert, nixosTests, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { pname = "redlib"; @@ -21,10 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-1zPLnkNZvuZS5z9AEJvhyIv+8/y+YhqFcj5Mu7RSqnE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - postInstall = '' install -D contrib/redlib.service $out/lib/systemd/system/redlib.service substituteInPlace $out/lib/systemd/system/redlib.service \ diff --git a/pkgs/by-name/re/redmine/Gemfile.lock b/pkgs/by-name/re/redmine/Gemfile.lock index a41a7c2d7918..dab693656576 100644 --- a/pkgs/by-name/re/redmine/Gemfile.lock +++ b/pkgs/by-name/re/redmine/Gemfile.lock @@ -77,7 +77,7 @@ GEM tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - ast (2.4.2) + ast (2.4.3) base64 (0.2.0) benchmark (0.4.0) bigdecimal (3.1.9) @@ -99,7 +99,7 @@ GEM chunky_png (1.4.0) commonmarker (0.23.11) concurrent-ruby (1.3.5) - connection_pool (2.5.0) + connection_pool (2.5.3) crass (1.0.6) css_parser (1.21.1) addressable @@ -113,7 +113,7 @@ GEM docile (1.4.1) drb (2.2.1) erubi (1.13.1) - ffi (1.17.1) + ffi (1.17.2) globalid (1.2.1) activesupport (>= 6.1) html-pipeline (2.13.2) @@ -123,16 +123,16 @@ GEM i18n (1.14.7) concurrent-ruby (~> 1.0) io-console (0.8.0) - irb (1.15.1) + irb (1.15.2) pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - json (2.10.2) + json (2.11.3) language_server-protocol (3.17.0.4) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.6) + logger (1.7.0) loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -150,7 +150,7 @@ GEM mocha (2.7.1) ruby2_keywords (>= 0.0.5) mysql2 (0.5.6) - net-imap (0.4.19) + net-imap (0.4.21) date net-protocol net-ldap (0.17.1) @@ -161,17 +161,18 @@ GEM net-smtp (0.4.0.1) net-protocol nio4r (2.7.4) - nokogiri (1.18.4) + nokogiri (1.18.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) - parallel (1.26.3) - parser (3.3.7.1) + parallel (1.27.0) + parser (3.3.8.0) ast (~> 2.4.1) racc pg (1.5.9) pp (0.6.2) prettyprint prettyprint (0.2.0) + prism (1.4.0) propshaft (1.1.0) actionpack (>= 7.0.0) activesupport (>= 7.0.0) @@ -184,7 +185,7 @@ GEM puma (6.6.0) nio4r (~> 2.0) racc (1.8.1) - rack (3.1.12) + rack (3.1.13) rack-session (2.1.0) base64 (>= 0.1.0) rack (>= 3.0.0) @@ -230,10 +231,10 @@ GEM htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) - rdoc (6.12.0) + rdoc (6.13.1) psych (>= 4.0.0) regexp_parser (2.10.0) - reline (0.6.0) + reline (0.6.1) io-console (~> 0.5) rexml (3.4.1) roadie (5.2.1) @@ -243,11 +244,11 @@ GEM railties (>= 5.1, < 8.0) roadie (~> 5.0) rotp (6.3.0) - rouge (4.5.1) - rqrcode (2.2.0) + rouge (4.5.2) + rqrcode (3.1.0) chunky_png (~> 1.0) - rqrcode_core (~> 1.0) - rqrcode_core (1.2.0) + rqrcode_core (~> 2.0) + rqrcode_core (2.0.0) rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -258,8 +259,9 @@ GEM rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.39.0) - parser (>= 3.3.1.0) + rubocop-ast (1.44.1) + parser (>= 3.3.7.2) + prism (~> 1.4) rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) @@ -275,7 +277,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) securerandom (0.4.1) - selenium-webdriver (4.29.1) + selenium-webdriver (4.31.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) @@ -289,7 +291,7 @@ GEM simplecov_json_formatter (0.1.4) sqlite3 (1.7.3) mini_portile2 (~> 2.8.0) - stringio (3.1.5) + stringio (3.1.7) svg_optimizer (0.3.0) nokogiri svg_sprite (1.0.3) @@ -369,7 +371,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 3.3.6p108 + ruby 3.3.7p123 BUNDLED WITH 2.5.22 diff --git a/pkgs/by-name/re/redmine/gemset.nix b/pkgs/by-name/re/redmine/gemset.nix index a9bf539b3989..8ddeabf0eb83 100644 --- a/pkgs/by-name/re/redmine/gemset.nix +++ b/pkgs/by-name/re/redmine/gemset.nix @@ -229,10 +229,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + sha256 = "10yknjyn0728gjn6b5syynvrvrwm66bhssbxq8mkhshxghaiailm"; type = "gem"; }; - version = "2.4.2"; + version = "2.4.3"; }; base64 = { groups = [ @@ -374,10 +374,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; + sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.3"; }; crass = { groups = [ "default" ]; @@ -514,10 +514,10 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6"; + sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9"; type = "gem"; }; - version = "1.17.1"; + version = "1.17.2"; }; globalid = { dependencies = [ "activesupport" ]; @@ -600,10 +600,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1478m97wiy6nwg6lnl0szy39p46acsvrhax552vsh1s2mi2sgg6r"; + sha256 = "1fpxa2m83rb7xlzs57daqwnzqjmz6j35xr7zb15s73975sak4br2"; type = "gem"; }; - version = "1.15.1"; + version = "1.15.2"; }; json = { groups = [ @@ -613,10 +613,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; + sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s"; type = "gem"; }; - version = "2.10.2"; + version = "2.11.3"; }; language_server-protocol = { groups = [ @@ -654,10 +654,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; type = "gem"; }; - version = "1.6.6"; + version = "1.7.0"; }; loofah = { dependencies = [ @@ -794,10 +794,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19cq7hbddq23yhyqysds2ic89mg3h8ngvmvjf0sj6k25cgwrlnc9"; + sha256 = "1iik22kpvah1n9hsw271lmgsbh6mkxg9iv7c0banm50548bwlxkg"; type = "gem"; }; - version = "0.4.19"; + version = "0.4.21"; }; net-ldap = { groups = [ "ldap" ]; @@ -869,10 +869,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1b34gaa6fiby5fb0zn1p5f8h1rx84wxz0bq9w39y3fhv3i920y5v"; + sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c"; type = "gem"; }; - version = "1.18.4"; + version = "1.18.8"; }; parallel = { groups = [ @@ -882,10 +882,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; + sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa"; type = "gem"; }; - version = "1.26.3"; + version = "1.27.0"; }; parser = { dependencies = [ @@ -899,10 +899,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18dcwrcnddvi8gl3hmbsb2cj1l7afxk2lh3jmhj90l95h1hn3gkx"; + sha256 = "0i9w8msil4snx5w11ix9b0wf52vjc3r49khy3ddgl1xk890kcxi4"; type = "gem"; }; - version = "3.3.7.1"; + version = "3.3.8.0"; }; pg = { groups = [ "default" ]; @@ -943,6 +943,19 @@ }; version = "0.2.0"; }; + prism = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw"; + type = "gem"; + }; + version = "1.4.0"; + }; propshaft = { dependencies = [ "actionpack" @@ -1024,10 +1037,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h65a1f9gsqx2ryisdy4lrd9a9l8gdv65dcscw9ynwwjr1ak1n00"; + sha256 = "14jpch41i6iclbgc8rykvkyn7ii8s9dwvn98k96qi0hqcbdpj30p"; type = "gem"; }; - version = "3.1.12"; + version = "3.1.13"; }; rack-session = { dependencies = [ @@ -1224,10 +1237,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q2nkyk6r3m15a2an7lwm4ilkcxzdh3j93s4ib8sbzqb0xp70vvx"; + sha256 = "1xvjskc5xp5x4lgrkxqrn7n4rjzgbbjl9yx3ny74xjckjk4xm832"; type = "gem"; }; - version = "6.12.0"; + version = "6.13.1"; }; regexp_parser = { groups = [ @@ -1252,10 +1265,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp"; + sha256 = "1yvm0svcdk6377ng6l00g39ldkjijbqg4whdg2zcsa8hrgbwkz0s"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.1"; }; rexml = { groups = [ @@ -1313,10 +1326,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pchwrkr0994v7mh054lcp0na3bk3mj2sk0dc33bn6bhxrnirj1a"; + sha256 = "18v8if3jix029rr3j8iwisv73facw223353n0h7avl39ibxk6hh3"; type = "gem"; }; - version = "4.5.1"; + version = "4.5.2"; }; rqrcode = { dependencies = [ @@ -1327,20 +1340,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; + sha256 = "1bwqy1iwbyn1091mg203is5ngsnvfparwa1wh89s1sgnfmirkmg2"; type = "gem"; }; - version = "2.2.0"; + version = "3.1.0"; }; rqrcode_core = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg"; + sha256 = "1ayrj7pwbv1g6jg5vvx6rq05lr1kbkfzbzqplj169aapmcivhh0y"; type = "gem"; }; - version = "1.2.0"; + version = "2.0.0"; }; rubocop = { dependencies = [ @@ -1364,7 +1377,10 @@ version = "1.68.0"; }; rubocop-ast = { - dependencies = [ "parser" ]; + dependencies = [ + "parser" + "prism" + ]; groups = [ "default" "test" @@ -1372,10 +1388,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v13m0ckd80mbvdbhwn52qqrdx1ii6n0b566h4xh7vgcgikhzfmn"; + sha256 = "14lf3d9bdr8cv8x3xcn3ijql5x23svk5zy7mdinlzw1f7ch09k73"; type = "gem"; }; - version = "1.39.0"; + version = "1.44.1"; }; rubocop-performance = { dependencies = [ @@ -1486,10 +1502,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0im1hclf7iki2393jngqk2dlxil6wz31bqc9pfnibifjqhyfazqa"; + sha256 = "1s80s7mgpwpfj4df2f43f5im37ks884xkbcxd9fxpk93xs7dicnx"; type = "gem"; }; - version = "4.29.1"; + version = "4.31.0"; }; simplecov = { dependencies = [ @@ -1552,10 +1568,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1j1mgvrgkxhadi6nb6pz1kcff7gsb5aivj1vfhsia4ssa5hj9adw"; + sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v"; type = "gem"; }; - version = "3.1.5"; + version = "3.1.7"; }; svg_optimizer = { dependencies = [ "nokogiri" ]; diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix index 4c0b9549ab36..e724ce286c9b 100644 --- a/pkgs/by-name/re/redmine/package.nix +++ b/pkgs/by-name/re/redmine/package.nix @@ -9,7 +9,7 @@ }: let - version = "6.0.4"; + version = "6.0.5"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.redmine.org/releases/redmine-${version}.tar.gz"; - hash = "sha256-vr+Ky0/RhD+I5fQoX/C0l/q0MyDDPngKXDThEkxeF3o="; + hash = "sha256-lNzFMRXgWBrEbmDD7ZMY8ZJs5GS6u7OF5SNiF9Hmpk4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index 4f5638a43986..d03162ff835f 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -1,49 +1,55 @@ { lib, + nodejs, buildNpmPackage, fetchFromGitHub, - makeWrapper, redocly, testers, }: buildNpmPackage rec { pname = "redocly"; - version = "1.29.0"; + version = "1.34.2"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-Oa4R4R7Obg26DKWZkccqjIcrD35pBw1AYIPe2/KN8f4="; + hash = "sha256-on5FqAYy6Ap0e5R3u1Wx4j8ijepj3K8FSpts7nTsXRI="; }; - npmDepsHash = "sha256-V0NklVsPRqRJ479nIMWqs/sXciXOm6LAlIh3YcPPDEc="; + npmDepsHash = "sha256-Duxdp8/HhoFwVRe9vLRsp08uTANGAY3u/lhgfHI2eag="; npmBuildScript = "prepare"; - nativeBuildInputs = [ makeWrapper ]; - postBuild = '' npm --prefix packages/cli run copy-assets ''; postInstall = '' - rm $out/lib/node_modules/@redocly/cli/node_modules/@redocly/{cli,openapi-core} + rm $out/lib/node_modules/@redocly/cli/node_modules/@redocly/{cli,openapi-core,respect-core} cp -R packages/cli $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli cp -R packages/core $out/lib/node_modules/@redocly/cli/node_modules/@redocly/openapi-core + cp -R packages/respect-core $out/lib/node_modules/@redocly/cli/node_modules/@redocly/respect-core - mkdir $out/bin - makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js \ - $out/bin/redocly \ - --set-default REDOCLY_TELEMETRY off \ - --set-default REDOCLY_SUPPRESS_UPDATE_NOTICE true + # Create a wrapper script to force the correct command name (Nodejs uses argv[1] for command name) + mkdir -p $out/bin + cat < $out/bin/redocly + #!${lib.getBin nodejs}/bin/node + // Override argv[1] to show "redocly" instead of "cli.js" + process.argv[1] = 'redocly'; + + // Set environment variables directly + process.env.REDOCLY_TELEMETRY = process.env.REDOCLY_TELEMETRY || "off"; + process.env.REDOCLY_SUPPRESS_UPDATE_NOTICE = process.env.REDOCLY_SUPPRESS_UPDATE_NOTICE || "true"; + + require('$out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js'); + EOF + chmod +x $out/bin/redocly ''; passthru = { - tests.version = testers.testVersion { - package = redocly; - }; + tests.version = testers.testVersion { package = redocly; }; }; meta = { diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index 0bb772f90eaf..ab01aa553b88 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "24.3.8"; + version = "25.1.3"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-7ufF1OXFtT+OZY6UiDDiaohe4witVPEaO9zZaM6wldA="; + sha256 = "sha256-fdEbZISejvk+3VVLxQd3zpeaXEUg6eR+MUtI+jcgg5g="; }; in buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-MdfCc3XdoMv3nnyaCbqU7mwJSgtusw9wVWjYqqJJmHA="; + vendorHash = "sha256-svJQFtwD1/NdlIyV7aSvonK/A7p6E38gLlrGg4r2Mm4="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/by-name/re/redu/package.nix b/pkgs/by-name/re/redu/package.nix new file mode 100644 index 000000000000..e81994bb9604 --- /dev/null +++ b/pkgs/by-name/re/redu/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "redu"; + version = "0.2.13"; + + src = fetchFromGitHub { + owner = "drdo"; + repo = "redu"; + tag = "v${finalAttrs.version}"; + hash = "sha256-iea3tt1WB0/5XPNeCAk38/UoCHVSngXfNmfZQyspmsw="; + }; + + cargoHash = "sha256-fiMZIFIVeFnBnRBgmdUB8E5A2pM5nrTfUgD1LS6a4LQ="; + + env.RUSTC_BOOTSTRAP = 1; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "ncdu for your restic repo"; + homepage = "https://github.com/drdo/redu"; + changelog = "https://github.com/drdo/redu/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ alexfmpe ]; + mainProgram = "redu"; + }; +}) diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index 648818481f40..946e2d13517c 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -19,22 +19,9 @@ glib, }: -let - libadwaita' = libadwaita.overrideAttrs (oldAttrs: { - version = "1.6.2-unstable-2025-01-02"; - src = oldAttrs.src.override { - rev = "f5f0e7ce69405846a8f8bdad11cef2e2a7e99010"; - hash = "sha256-n5RbGHtt2g627T/Tg8m3PjYIl9wfYTIcrplq1pdKAXk="; - }; - - # `test-application-window` is flaky on aarch64-linux - doCheck = false; - }); -in - python3Packages.buildPythonApplication rec { pname = "refine"; - version = "0.5.5"; + version = "0.5.9"; pyproject = false; # uses meson src = fetchFromGitLab { @@ -42,7 +29,7 @@ python3Packages.buildPythonApplication rec { owner = "TheEvilSkeleton"; repo = "Refine"; tag = version; - hash = "sha256-b2dNhd5UJqH/l5BOEgcOUZrhCZa8ErdBzNw5g4VjtM8="; + hash = "sha256-jX2U6YZCvB8IxUHoByO4egqV40C/L/O8z7AIEYYHBRY="; }; nativeBuildInputs = [ @@ -60,7 +47,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ libxml2 - libadwaita' + libadwaita ]; dependencies = diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix index cedd6767ce95..56ceae80fe14 100644 --- a/pkgs/by-name/re/refinery-cli/package.nix +++ b/pkgs/by-name/re/refinery-cli/package.nix @@ -1,11 +1,9 @@ { fetchCrate, lib, - stdenv, openssl, pkg-config, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; meta = with lib; { description = "Run migrations for the Refinery ORM for Rust via the CLI"; diff --git a/pkgs/by-name/re/reflection-cpp/package.nix b/pkgs/by-name/re/reflection-cpp/package.nix new file mode 100644 index 000000000000..5030321129fb --- /dev/null +++ b/pkgs/by-name/re/reflection-cpp/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "reflection-cpp"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "contour-terminal"; + repo = "reflection-cpp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ylaAS0zlkiJlBwibFBIyNOQ2h6IGRXTiKV1g6So9M9s="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "C++ static reflection support library"; + homepage = "https://github.com/contour-terminal/reflection-cpp"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ emaryn ]; + }; +}) diff --git a/pkgs/by-name/re/refurb/package.nix b/pkgs/by-name/re/refurb/package.nix index a551cd8897b8..a601893a14d1 100644 --- a/pkgs/by-name/re/refurb/package.nix +++ b/pkgs/by-name/re/refurb/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "refurb"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dosisod"; repo = "refurb"; tag = "v${version}"; - hash = "sha256-6MchaqRKJPmvwiDyhCK4kFyIYl2B+2dGL8H8X2ES+VQ="; + hash = "sha256-iqpVc4ajqF7DIl4jUH8+epEit4a/8KSrk2GwLJSVAbs="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index e29b786008b2..2a5e7fb0b346 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { name = "regal"; - version = "0.32.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "StyraInc"; repo = "regal"; rev = "v${version}"; - hash = "sha256-fO/hZw5aoDshemK0vmlwUJiSqGQ2peF5egT40029aAg="; + hash = "sha256-4H2/qHJA+/a2yoFNHhVUAslsyetesGdDqA8jHWN8L7E="; }; - vendorHash = "sha256-ExM7v2n2j8IhcuhA9S05gJvQq5x+jDjZtTcG+nXIorM="; + vendorHash = "sha256-JlbNTQYRGlmzoPP+mIEVjtObGNI1/uuseLz5trxN5gM="; ldflags = [ "-s" diff --git a/pkgs/by-name/re/regclient/package.nix b/pkgs/by-name/re/regclient/package.nix index 1b7196f82179..919e154a60df 100644 --- a/pkgs/by-name/re/regclient/package.nix +++ b/pkgs/by-name/re/regclient/package.nix @@ -18,16 +18,16 @@ in buildGoModule rec { pname = "regclient"; - version = "0.8.2"; + version = "0.8.3"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-Y+mO/DgJ7CqzDFTNyOMUEOZTnZmOjPu8O4xRO/qGVYY="; + sha256 = "sha256-vuZPd51nzCasV3WWulbKCQnqVkupMu5jQhQypvTKGvk="; }; - vendorHash = "sha256-SWkrPpjAA32XkToh7ujSPaRNvHtf2ymvx5E7iGD5B8k="; + vendorHash = "sha256-ad7IPiOMG4G80BdAZz7IN0hBPJgUIVdO9oFlM7IDmp8="; outputs = [ "out" ] ++ bins; diff --git a/pkgs/by-name/re/regname/package.nix b/pkgs/by-name/re/regname/package.nix new file mode 100644 index 000000000000..77c74957a9a9 --- /dev/null +++ b/pkgs/by-name/re/regname/package.nix @@ -0,0 +1,30 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "regname"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "linkdd"; + repo = "regname"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zKsWEjFMTFibzfZ2dEc+RN74Ih1jr9vJhOUU0gY1rYE="; + }; + + cargoHash = "sha256-6iRDUOXPDzlD11JEL4at+z3aWkhn/dECtl7y2/vGMwo="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Mass renamer TUI written in Rust"; + homepage = "https://github.com/linkdd/regname"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ilarvne ]; + mainProgram = "regname"; + }; +}) diff --git a/pkgs/by-name/re/regolith/package.nix b/pkgs/by-name/re/regolith/package.nix index c1ee41899751..b40fda40d753 100644 --- a/pkgs/by-name/re/regolith/package.nix +++ b/pkgs/by-name/re/regolith/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "regolith"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "Bedrock-OSS"; repo = "regolith"; tag = version; - hash = "sha256-gTEQ2hu581tD1I/3iLHzE/2nekAG49/M6V6QeqPhYsA="; + hash = "sha256-ZAOQluoeE6c32ETtikBPoDppk1RpuSVjh9p42fT5W48="; }; # Requires network access. diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index 0470a12b2cc9..fd2367f2c260 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2025.03.24.00"; + version = "2025.05.05.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-Rv6EtrsDISR/lHo0Fimh2cNToSxUE5bxVdURmjs8/g4="; + hash = "sha256-kJrOHXaYBZpqXWdxRBBY7kj+mk9Q2k153KEprf8exzc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mzYpqI+PT5083exelS+kyGLZ+M8bTiTSxAoTwqV2ubc="; + cargoHash = "sha256-NGwcGcl5xFtOrs2M6FE7Q/kFt/ajPKmXMqIQufLOBzQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 7add9cbe43f8..9102b17a9097 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.128"; + version = "0.3.134"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-eWmQFF52lpdX5Vj6fcDqkP3+E64r+MJINitk3HwIy0w="; + hash = "sha256-G2xXNeyKEix/kCJ1zUn0YILMmikuvhu3f6t3pq3GjHI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-u8DxkktCGQrfSCuKX/2JqiD6Ug3M1xXMYJg8/0ak8f8="; + cargoHash = "sha256-1bFIeWYBGefT1K545sNp7/LWG4oU+q4FlOL189a/wI0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix index 112df133fcd0..c3813d5c80e6 100644 --- a/pkgs/by-name/re/remarshal_0_17/package.nix +++ b/pkgs/by-name/re/remarshal_0_17/package.nix @@ -3,6 +3,7 @@ python3Packages, fetchFromGitHub, fetchPypi, + fetchpatch, }: let @@ -16,6 +17,13 @@ let inherit version; hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw="; }; + patches = [ + (fetchpatch { + url = "https://github.com/python-poetry/tomlkit/commit/05d9be1c2b2a95a4eb3a53d999f1483dd7abae5a.patch"; + hash = "sha256-9pLGxcGHs+XoKrqlh7Q0dyc07XrK7J6u2T7Kvfd0ICc="; + excludes = [ ".github/workflows/tests.yml" ]; + }) + ]; }); }; }; diff --git a/pkgs/by-name/re/remctl/package.nix b/pkgs/by-name/re/remctl/package.nix index b354440de81a..0a37c90899b4 100644 --- a/pkgs/by-name/re/remctl/package.nix +++ b/pkgs/by-name/re/remctl/package.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.eyrie.org/~eagle/software/remctl"; mainProgram = "remctl"; license = licenses.mit; - maintainers = teams.deshaw.members; + teams = [ teams.deshaw ]; }; }) diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index c5b323466b81..3236c0a1d31b 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -16,14 +16,14 @@ tcl.mkTclDerivation rec { pname = "remind"; - version = "05.03.05"; + version = "05.03.07"; src = fetchFromGitea { domain = "git.skoll.ca"; owner = "Skollsoft-Public"; repo = "Remind"; rev = version; - hash = "sha256-dMnsMV4DRxXWgev9LCb4wwdnx7A++giCsW7c2cMde9Q="; + hash = "sha256-gp6YGDh7gkCk4KFaPBfD72RJLbwGNz8iVAV764bfNe8="; }; propagatedBuildInputs = lib.optionals withGui [ diff --git a/pkgs/by-name/re/remmina/package.nix b/pkgs/by-name/re/remmina/package.nix new file mode 100644 index 000000000000..14faf6c54cf9 --- /dev/null +++ b/pkgs/by-name/re/remmina/package.nix @@ -0,0 +1,156 @@ +{ + lib, + stdenv, + fetchFromGitLab, + cmake, + ninja, + pkg-config, + wrapGAppsHook3, + curl, + fuse3, + desktopToDarwinBundle, + glib, + gtk3, + gettext, + libxkbfile, + libX11, + python3, + freerdp, + libssh, + libgcrypt, + gnutls, + pcre2, + libdbusmenu-gtk3, + libappindicator-gtk3, + libvncserver, + libpthreadstubs, + libXdmcp, + libxkbcommon, + libsecret, + libsoup_3, + spice-protocol, + spice-gtk, + libepoxy, + at-spi2-core, + openssl, + gsettings-desktop-schemas, + json-glib, + libsodium, + harfbuzz, + wayland, + # The themes here are soft dependencies; only icons are missing without them. + adwaita-icon-theme, + withKf5Wallet ? stdenv.hostPlatform.isLinux, + libsForQt5, + withLibsecret ? stdenv.hostPlatform.isLinux, + withWebkitGtk ? false, + webkitgtk_4_1, + withVte ? true, + vte, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "remmina"; + version = "1.4.40"; + + src = fetchFromGitLab { + owner = "Remmina"; + repo = "Remmina"; + rev = "v${finalAttrs.version}"; + hash = "sha256-AfZ9tWoaZTRs7GZOdli74e7/X/OMgbvfez9BipoZ/ng="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + wrapGAppsHook3 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; + + buildInputs = + [ + curl + gsettings-desktop-schemas + glib + gtk3 + gettext + libxkbfile + libX11 + freerdp + libssh + libgcrypt + gnutls + pcre2 + libvncserver + libpthreadstubs + libXdmcp + libxkbcommon + libsoup_3 + spice-protocol + spice-gtk + libepoxy + at-spi2-core + openssl + adwaita-icon-theme + json-glib + libsodium + harfbuzz + python3 + wayland + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + fuse3 + libappindicator-gtk3 + libdbusmenu-gtk3 + ] + ++ lib.optionals withLibsecret [ libsecret ] + ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] + ++ lib.optionals withWebkitGtk [ webkitgtk_4_1 ] + ++ lib.optionals withVte [ vte ]; + + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + + cmakeFlags = + [ + "-DWITH_FREERDP3=ON" + "-DWITH_VTE=${if withVte then "ON" else "OFF"}" + "-DWITH_TELEPATHY=OFF" + "-DWITH_AVAHI=OFF" + "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" + "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" + "-DWITH_WEBKIT2GTK=${if withWebkitGtk then "ON" else "OFF"}" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DHAVE_LIBAPPINDICATOR=OFF" + "-DWITH_CUPS=OFF" + "-DWITH_ICON_CACHE=OFF" + ]; + + dontWrapQtApps = true; + + preFixup = '' + gappsWrapperArgs+=( + --set-default SSL_CERT_DIR "/etc/ssl/certs/" + --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" + ''} + ) + ''; + + meta = with lib; { + license = licenses.gpl2Plus; + homepage = "https://gitlab.com/Remmina/Remmina"; + changelog = "https://gitlab.com/Remmina/Remmina/-/blob/master/CHANGELOG.md#${ + lib.replaceStrings [ "." ] [ "" ] finalAttrs.src.rev + }"; + description = "Remote desktop client written in GTK"; + mainProgram = "remmina"; + maintainers = with maintainers; [ + bbigras + melsigl + ryantm + ]; + platforms = platforms.linux ++ platforms.darwin; + }; +}) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index b63543b59cad..e3576832234d 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.18.49"; + version = "1.19.35"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-LSjPQbRYl61c7I/TT0ePSoXkXqiVuCD8RdaFFJsK02M="; + hash = "sha256-UrldNDYof3lYDyP6z3ukFdpiOkJZUJpO8iygI3JaBY4="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/re/remodel/package.nix b/pkgs/by-name/re/remodel/package.nix new file mode 100644 index 000000000000..89ac00bd0169 --- /dev/null +++ b/pkgs/by-name/re/remodel/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "remodel"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "rojo-rbx"; + repo = "remodel"; + rev = "v${version}"; + sha256 = "sha256-tZ6ptGeNBULJaoFomMFN294wY8YUu1SrJh4UfOL/MnI="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-41EkXciQZ7lGlD+gVlZEahrGPeEMmaIaiF7tYff9xXw="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + meta = with lib; { + description = "Roblox file manipulation tool"; + mainProgram = "remodel"; + longDescription = '' + Remodel is a command line tool for manipulating Roblox files and the instances contained within them. + ''; + homepage = "https://github.com/rojo-rbx/remodel"; + downloadPage = "https://github.com/rojo-rbx/remodel/releases/tag/v${version}"; + changelog = "https://github.com/rojo-rbx/remodel/raw/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ wackbyte ]; + }; +} diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index f4b20fb253c9..dba59f5d201a 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "renderdoc"; - version = "1.37"; + version = "1.38"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${finalAttrs.version}"; - hash = "sha256-udi3v5DyJ9aDBsfTv+T9VTa7SyhNAyuNB3LF5G8vZVg="; + hash = "sha256-6DvBV2amPfQff3LleXaqfoKzWvoHUJ0dh/bg/WcGIeA="; }; outputs = [ diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 448c21e62e27..8c9f79f49900 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2025-03-17"; + version = "0-unstable-2025-05-08"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "1039408cd06b7630bef0ef2d04d64d14e9a00641"; - hash = "sha256-Ho7H4gb48PfkuF0q4My9E4MHIny1cfqWeLwZpVb0L1E="; + rev = "5593a9f079e0ee89040cdf31b603878e5d8c147e"; + hash = "sha256-vLmEsU3zQ/1OMeW0kKS5nkRKlnBtEchjHJnnLb0Hlcw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index f5216be48eeb..4f3dbc2f2dff 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -7,11 +7,11 @@ renode.overrideAttrs ( finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.3+20250314git5b219d820"; + version = "1.15.3+20250507git91a4bb342"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-v23MC22DVYV+czmpktKKP8lU0JKjgoOfNkTDhm0q/4o="; + hash = "sha256-x0g7wsaDCi3QUTEQcw/gGtzkWTmJB7ZZVqCE9fOyCFI="; }; passthru.updateScript = diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 0b2a13317059..841fb24a3123 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "renovate"; - version = "39.208.1"; + version = "40.14.4"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-Y4EJCbIK3XZAilbf/zMEfjEDYHNrUrAGRfsNmY0h/Bw="; + hash = "sha256-qL1pXlY9rBoZ5o4ZdiDAEv2zmLN42q9kma5/5yOlOno="; }; postPatch = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-5KGTt6lx44LNpHG/RelCQ1ZlQOMOL6bJi66M2nCiirg="; + hash = "sha256-Uj+w9jzbWKLoJgRS5GVGY5QZAwIKsH/MoIu6OailgAw="; }; env.COREPACK_ENABLE_STRICT = 0; @@ -93,7 +93,12 @@ stdenv.mkDerivation (finalAttrs: { version = testers.testVersion { package = finalAttrs.finalPackage; }; vm-test = nixosTests.renovate; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^(\\d+\\.\\d+\\.\\d+)$" + ]; + }; }; meta = { diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix index dc72a086f7e0..51ef113f9f03 100644 --- a/pkgs/by-name/re/renpy/package.nix +++ b/pkgs/by-name/re/renpy/package.nix @@ -65,19 +65,23 @@ stdenv.mkDerivation (finalAttrs: { tkinter ]); - RENPY_DEPS_INSTALL = lib.concatStringsSep "::" [ - ffmpeg.lib - freetype - fribidi - glew.dev - harfbuzz.dev - libGL - libGLU - libpng - SDL2 - (lib.getDev SDL2) - zlib - ]; + RENPY_DEPS_INSTALL = lib.concatStringsSep "::" ( + [ + ffmpeg.lib + freetype + fribidi + glew.dev + harfbuzz.dev + libpng + SDL2 + (lib.getDev SDL2) + zlib + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libGL + libGLU + ] + ); enableParallelBuilding = true; diff --git a/pkgs/by-name/re/repgrep/package.nix b/pkgs/by-name/re/repgrep/package.nix index 0850105f181c..3f0d0cd8f5f1 100644 --- a/pkgs/by-name/re/repgrep/package.nix +++ b/pkgs/by-name/re/repgrep/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "repgrep"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "acheronfail"; repo = "repgrep"; rev = version; - hash = "sha256-Hg6N5ruf6MTf2/jSmDgaNFWnnaSb8ZCQ6hivYAeadfc="; + hash = "sha256-hLRl8mKRaufneJNBQqPsH+48ZQGxFBNgulXcaK4/6s4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Of0JyAm/XxyfRLBznAHzy701w4fA1d0QMQqOjqIzG00="; + cargoHash = "sha256-ALp6BQNWpylHPBeLs/4hugN1ulCdctOmgu55Lmt8wjI="; nativeBuildInputs = [ asciidoctor @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { popd '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - # As it can be seen here: https://github.com/acheronfail/repgrep/blob/0.16.0/.github/workflows/release.yml#L206, the completions are just the same as ripgrep + # As it can be seen here: https://github.com/acheronfail/repgrep/blob/0.16.1/.github/workflows/release.yml#L206, the completions are just the same as ripgrep installShellCompletion --cmd rgr \ --bash <(${lib.getExe ripgrep} --generate complete-bash | sed 's/-c rg/-c rgr/') \ --zsh <(${lib.getExe ripgrep} --generate complete-zsh | sed 's/-c rg/-c rgr/') \ diff --git a/pkgs/development/tools/database/replibyte/Cargo.lock b/pkgs/by-name/re/replibyte/Cargo.lock similarity index 100% rename from pkgs/development/tools/database/replibyte/Cargo.lock rename to pkgs/by-name/re/replibyte/Cargo.lock diff --git a/pkgs/by-name/re/replibyte/package.nix b/pkgs/by-name/re/replibyte/package.nix new file mode 100644 index 000000000000..02c7ce30822d --- /dev/null +++ b/pkgs/by-name/re/replibyte/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "replibyte"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "Qovery"; + repo = pname; + rev = "v${version}"; + hash = "sha256-VExA92g+1y65skxLKU62ZPUPOwdm9N73Ne9xW7Q0Sic="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "mongodb-schema-parser-0.5.0" = "sha256-P3srDY4bEDDYyic7Am2Cg+75j/kETf0uC7ui61TUJQA="; + }; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + cargoBuildFlags = [ "--all-features" ]; + + doCheck = false; # requires multiple dbs to be installed + + meta = with lib; { + description = "Seed your development database with real data"; + mainProgram = "replibyte"; + homepage = "https://github.com/Qovery/replibyte"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index d9f3c163ecf6..38d946dd74c9 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "0.3.0"; + version = "0.3.5"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-a0FZaATQ4U9KtRY1m/Bi/1P9hDoNbcracZagm9EMSew="; + hash = "sha256-gB4Z3IEzPUoHXI1a/JFBOmn+twIq469X0uQOSIs13LU="; }; - npmDepsHash = "sha256-BD0JBwZ3FSMpJRRTKQinPuaSBjX/RrkwXUqDr1wXEhk="; + npmDepsHash = "sha256-bO37po20j7wZbjT1LEY+yz0DGfVL3E3y+MjaFyK+LEE="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix index 0cdb557714ca..c19c0f013ebd 100644 --- a/pkgs/by-name/re/reposilite/package.nix +++ b/pkgs/by-name/re/reposilite/package.nix @@ -5,6 +5,7 @@ jre_headless, linkFarm, makeWrapper, + nixosTests, plugins ? [ ], }: let @@ -41,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = ./update.sh; + passthru = { + tests = nixosTests.reposilite; + updateScript = ./update.sh; + }; meta = { description = "Lightweight and easy-to-use repository management software dedicated for the Maven based artifacts in the JVM ecosystem"; diff --git a/pkgs/by-name/re/repro-env/package.nix b/pkgs/by-name/re/repro-env/package.nix new file mode 100644 index 000000000000..56d319a77326 --- /dev/null +++ b/pkgs/by-name/re/repro-env/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "repro-env"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = "repro-env"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ViOUS7prwLl2C2BOlwqshFks+q+xeiAD4ONdKUcDgWU="; + }; + + cargoHash = "sha256-0ljIt84CqcdC01YXU6J7RlvkN/nlU6Thige8TricFus="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + meta = { + changelog = "https://github.com/kpcyrd/repro-env/releases/tag/v${finalAttrs.version}"; + description = "Dependency lockfiles for reproducible build environments"; + homepage = "https://github.com/kpcyrd/repro-env"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "repro-env"; + }; +}) diff --git a/pkgs/by-name/re/reqable/package.nix b/pkgs/by-name/re/reqable/package.nix new file mode 100644 index 000000000000..8efa788b66fc --- /dev/null +++ b/pkgs/by-name/re/reqable/package.nix @@ -0,0 +1,92 @@ +{ + lib, + stdenv, + fetchurl, + dpkg, + autoPatchelfHook, + makeBinaryWrapper, + fontconfig, + atk, + cairo, + gdk-pixbuf, + glib, + gtk3, + harfbuzz, + libdbusmenu, + libdbusmenu-gtk3, + libepoxy, + libgcrypt, + libgpg-error, + lz4, + nspr, + nss, + pango, + util-linux, + xz, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "reqable"; + version = "2.33.12"; + + src = fetchurl { + url = "https://github.com/reqable/reqable-app/releases/download/${finalAttrs.version}/reqable-app-linux-x86_64.deb"; + hash = "sha256-LCHeJUzTRjl/lh3PWygZV0Rd3AxJEGlTkVrI/5l+Go4="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeBinaryWrapper + ]; + + buildInputs = [ + atk + cairo + fontconfig + gdk-pixbuf + glib + gtk3 + harfbuzz + libdbusmenu + libdbusmenu-gtk3 + libepoxy + libgcrypt + libgpg-error + lz4 + nspr + nss + pango + util-linux + xz + ]; + + installPhase = '' + runHook preInstall + + cp -r usr $out + substituteInPlace $out/share/applications/reqable.desktop \ + --replace-fail "/usr/share/reqable/" "" + + runHook postInstall + ''; + + preFixup = '' + mkdir $out/bin + makeWrapper $out/share/reqable/reqable $out/bin/reqable \ + --prefix LD_LIBRARY_PATH : $out/share/reqable/lib + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Generation API debugging and testing one-stop solution"; + homepage = "https://reqable.com"; + mainProgram = "reqable"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ emaryn ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index ffb2f2fef443..ba851e529187 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -28,20 +28,19 @@ # More information can be found in there README: # https://raw.githubusercontent.com/rerun-io/rerun/5a9794990c4903c088ad77174e65eb2573162d97/crates/utils/re_analytics/README.md buildWebViewerFeatures ? [ - "grpc" "map_view" ], }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rerun"; - version = "0.22.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "rerun-io"; repo = "rerun"; - tag = version; - hash = "sha256-J9Iy/KiDajDavL95qLcQBfUWpZ6OiUtldk+ZAGpSNWA="; + tag = finalAttrs.version; + hash = "sha256-l3p9yicA7SNKURemxGq2j0iXeyE4jEsqQ9VdGZPuN/E="; }; # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work @@ -51,7 +50,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-cGg8yi/jYKyle8dudHSNLPMnOtcgqlBQmu83h4B26NI="; + cargoHash = "sha256-zF3mzv7FOrr1qGG6N6u4c0OKc39klkBfQIqF0fmX5GU="; cargoBuildFlags = [ "--package rerun-cli" ]; cargoTestFlags = [ "--package rerun-cli" ]; @@ -140,7 +139,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { @@ -153,7 +152,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Visualize streams of multimodal data. Fast, easy to use, and simple to integrate. Built in Rust using egui"; homepage = "https://github.com/rerun-io/rerun"; - changelog = "https://github.com/rerun-io/rerun/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/rerun-io/rerun/blob/${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 mit @@ -164,4 +163,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "rerun"; }; -} +}) diff --git a/pkgs/by-name/re/rescript-language-server/package.nix b/pkgs/by-name/re/rescript-language-server/package.nix index 5e700b3c18da..b2042cfdbb08 100644 --- a/pkgs/by-name/re/rescript-language-server/package.nix +++ b/pkgs/by-name/re/rescript-language-server/package.nix @@ -54,7 +54,7 @@ buildNpmPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/re/reshape/package.nix b/pkgs/by-name/re/reshape/package.nix index 6b44a65c5030..c9a5cef39e03 100644 --- a/pkgs/by-name/re/reshape/package.nix +++ b/pkgs/by-name/re/reshape/package.nix @@ -2,10 +2,8 @@ lib, rustPlatform, fetchCrate, - darwin, postgresqlTestHook, postgresql, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-lK54SEayI015f2AQ6h4zadgkECLp4jCeJO7enBG0LeM="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - nativeCheckInputs = [ postgresqlTestHook postgresql diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index 0986cbfe5fb1..eab66add2b3b 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -22,19 +22,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "resources"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nokyan"; repo = "resources"; tag = "v${finalAttrs.version}"; - hash = "sha256-SHawaH09+mDovFiznZ+ZkUgUbv5tQGcXBgUGrdetOcA="; + hash = "sha256-z4ZVj/nS4n3oqENSK87YJ8sQRnqK7c4tWzKHUD0Qw2s="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - name = "resources-${finalAttrs.version}"; - hash = "sha256-zqCqbQAUAIhjntX4gcV1aoJwjozZFlF7Sr49w7uIgaI="; + inherit (finalAttrs) pname version src; + hash = "sha256-jHdEiK3nu9mN2A6biHq9Iu4bSniD74hGnKFBTt5xVDM="; }; nativeBuildInputs = [ @@ -79,13 +78,11 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/nokyan/resources"; license = lib.licenses.gpl3Only; mainProgram = "resources"; - maintainers = - with lib.maintainers; - [ - lukas-heiligenbrunner - ewuuwe - ] - ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ + lukas-heiligenbrunner + ewuuwe + ]; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index efb80b0cf913..8821a7d5c4d5 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -1,68 +1,74 @@ { lib, stdenv, - testers, - versionCheckHook, - nix-update-script, rustPlatform, fetchFromGitHub, protobuf, - restate, - pkg-config, + + # nativeBuildInputs + cmake, openssl, perl, - cmake, - cacert, + pkg-config, + + # buildInputs rdkafka, + + # tests + cacert, + versionCheckHook, + + # passthru + testers, + restate, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "restate"; - version = "1.1.6"; + version = "1.3.2"; src = fetchFromGitHub { owner = "restatedev"; repo = "restate"; - tag = "v${version}"; - hash = "sha256-uDNPIL9Ox5rwWVzqWe74elHPGy6lSvWR1S7HsY6ATjc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-zAICgEwErB6lHC/AK/3WuhL5u+Y5l+DXd4H63OLBQl8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-z7VAKU4bi6pX2z4jCKWDfQt8FFLN7ugnW2LOy6IHz/w="; + cargoHash = "sha256-NlT+j3OD52HgDMeWAm9MewPQaQ+xf0FIpsRd5rTTVdQ="; env = { PROTOC = lib.getExe protobuf; PROTOC_INCLUDE = "${protobuf}/include"; - VERGEN_GIT_COMMIT_DATE = "2024-12-23"; - VERGEN_GIT_SHA = "v${version}"; + VERGEN_GIT_SHA = "v${finalAttrs.version}"; # rustflags as defined in the upstream's .cargo/config.toml RUSTFLAGS = let target = stdenv.hostPlatform.config; - targetFlags = rec { + targetFlags = lib.fix (self: { build = [ "-C force-unwind-tables" - "-C debug-assertions" "--cfg uuid_unstable" "--cfg tokio_unstable" ]; - "aarch64-unknown-linux-gnu" = build ++ [ + "aarch64-unknown-linux-gnu" = self.build ++ [ # Enable frame pointers to support Parca (https://github.com/parca-dev/parca-agent/pull/1805) "-C force-frame-pointers=yes" ]; - "x86_64-unknown-linux-musl" = build ++ [ + "x86_64-unknown-linux-musl" = self.build ++ [ "-C link-self-contained=yes" ]; - "aarch64-unknown-linux-musl" = build ++ [ + "aarch64-unknown-linux-musl" = self.build ++ [ # Enable frame pointers to support Parca (https://github.com/parca-dev/parca-agent/pull/1805) "-C force-frame-pointers=yes" "-C link-self-contained=yes" ]; - }; + }); in lib.concatStringsSep " " (lib.attrsets.attrByPath [ target ] targetFlags.build targetFlags); @@ -71,13 +77,17 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ - pkg-config + cmake openssl perl + pkg-config rustPlatform.bindgenHook - cmake ]; - buildInputs = [ rdkafka ]; + + buildInputs = [ + rdkafka + ]; + nativeCheckInputs = [ cacert ]; @@ -86,12 +96,23 @@ rustPlatform.buildRustPackage rec { # Feature resolution seems to be failing due to this https://github.com/rust-lang/cargo/issues/7754 auditable = false; + checkFlags = [ + # Error: deadline has elapsed + "--skip replicated_loglet" + + # TIMEOUT [ 180.006s] + "--skip fast_forward_over_trim_gap" + + # TIMEOUT (could be related to https://github.com/restatedev/restate/issues/3043) + "--skip restatectl_smoke_test" + ]; + __darwinAllowLocalNetworking = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { @@ -111,11 +132,11 @@ rustPlatform.buildRustPackage rec { }; meta = { - description = "Restate is a platform for developing distributed fault-tolerant applications."; + description = "Platform for developing distributed fault-tolerant applications."; homepage = "https://restate.dev"; - changelog = "https://github.com/restatedev/restate/releases/tag/v${version}"; + changelog = "https://github.com/restatedev/restate/releases/tag/v${finalAttrs.version}"; mainProgram = "restate"; license = lib.licenses.bsl11; maintainers = with lib.maintainers; [ myypo ]; }; -} +}) diff --git a/pkgs/by-name/re/restic-browser/package.nix b/pkgs/by-name/re/restic-browser/package.nix index 0333ab8f71b3..7cfba5fae808 100644 --- a/pkgs/by-name/re/restic-browser/package.nix +++ b/pkgs/by-name/re/restic-browser/package.nix @@ -11,7 +11,6 @@ wrapGAppsHook3, webkitgtk_4_0, dbus, - darwin, nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -46,17 +45,10 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - webkitgtk_4_0 - dbus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - WebKit - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + webkitgtk_4_0 + dbus + ]; cargoRoot = "src-tauri"; buildAndTestSubdir = cargoRoot; diff --git a/pkgs/by-name/re/resticprofile/package.nix b/pkgs/by-name/re/resticprofile/package.nix index 7ce002647106..7ea203613420 100644 --- a/pkgs/by-name/re/resticprofile/package.nix +++ b/pkgs/by-name/re/resticprofile/package.nix @@ -1,6 +1,6 @@ { lib, - buildGo123Module, + buildGoModule, fetchFromGitHub, installShellFiles, restic, @@ -9,15 +9,15 @@ resticprofile, }: -buildGo123Module rec { +buildGoModule rec { pname = "resticprofile"; - version = "0.29.1"; + version = "0.30.1"; src = fetchFromGitHub { owner = "creativeprojects"; repo = "resticprofile"; tag = "v${version}"; - hash = "sha256-6s58rI+YMu6sCV8UsG9GOdF46Br3cMWIUqciVd2d4dY="; + hash = "sha256-Pg7rqllNRc/pN5VSgy7KiHQ7V7xOxiGM5fk5Y6+OBjw="; }; postPatch = '' @@ -32,7 +32,7 @@ buildGo123Module rec { ''; - vendorHash = "sha256-N39zPGos5EYRXGylsHFSjJ4EcQ9jahBOGV8xn7fF7gc="; + vendorHash = "sha256-M9S6F/Csz7HnOq8PSWjpENKm1704kVx9zDts1ieraTE="; ldflags = [ "-X main.version=${version}" @@ -44,14 +44,16 @@ buildGo123Module rec { nativeBuildInputs = [ installShellFiles ]; preCheck = '' - rm battery_test.go # tries to get battery data - rm update_test.go # tries to use network + rm batt/battery_test.go # tries to get battery data + rm commands_test.go # tries to use systemctl + rm config/path_test.go # expects normal environment rm lock/lock_test.go # needs ping rm preventsleep/caffeinate_test.go # tries to communicate with dbus rm priority/ioprio_test.go # tries to set nice(2) IO priority rm restic/downloader_test.go # tries to use network - rm schedule/schedule_test.go # tries to use systemctl - rm config/path_test.go # expects normal environment + rm schedule/*_test.go # tries to use systemctl + rm update_test.go # tries to use network + rm user/user_test.go # expects normal environment rm util/tempdir_test.go # expects normal environment ''; diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix index 153e083f313c..4a849ef4ed27 100644 --- a/pkgs/by-name/re/restish/package.nix +++ b/pkgs/by-name/re/restish/package.nix @@ -2,7 +2,6 @@ lib, stdenv, buildGoModule, - darwin, fetchFromGitHub, restish, testers, @@ -22,18 +21,13 @@ buildGoModule rec { vendorHash = "sha256-qeArar0WnMACUnKBlC+PcFeJPzofwbK440A4M/rQ04U="; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Kernel - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXrandr + ]; ldflags = [ "-s" diff --git a/pkgs/by-name/re/resvg/package.nix b/pkgs/by-name/re/resvg/package.nix index b41cbefbecc8..f736828cb521 100644 --- a/pkgs/by-name/re/resvg/package.nix +++ b/pkgs/by-name/re/resvg/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.44.0"; + version = "0.45.1"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = "resvg"; rev = "v${version}"; - hash = "sha256-XjWkzTdsnQZfBjf61dgGt/a7973ZljJG1rnCk0iGk6Y="; + hash = "sha256-sz1fAvg5HiBJpAgH7Vy0j5eAkvW8egcHyUXCsZzOWT8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NHXcBKSuyL0bIriEOr1nuTnz4vra1bIYcNOGmnN5HnQ="; + cargoHash = "sha256-jUq1BvHgs3tEI+ye04FykdunHcMMatE3Gamr3grNWQw="; cargoBuildFlags = [ "--package=resvg" diff --git a/pkgs/by-name/re/reth/package.nix b/pkgs/by-name/re/reth/package.nix new file mode 100644 index 000000000000..d2c039e2b338 --- /dev/null +++ b/pkgs/by-name/re/reth/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "reth"; + version = "1.3.12"; + + src = fetchFromGitHub { + owner = "paradigmxyz"; + repo = pname; + rev = "v${version}"; + hash = "sha256-59XUrMaXMiqSELQX8i7eK4Eo8YfGjPVZHT6q+rxoSPs="; + }; + + cargoHash = "sha256-FHQ+iPcjxwcY7uoZMXlm/lRoVA5E5wRg7qFgJe+VSEc="; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; + + # Some tests fail due to I/O that is unfriendly with nix sandbox. + checkFlags = [ + "--skip=builder::tests::block_number_node_config_test" + "--skip=builder::tests::launch_multiple_nodes" + "--skip=builder::tests::rpc_handles_none_without_http" + "--skip=cli::tests::override_trusted_setup_file" + "--skip=cli::tests::parse_env_filter_directives" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Modular Ethereum execution client in Rust by Paradigm"; + homepage = "https://github.com/paradigmxyz/reth"; + license = with lib.licenses; [ + mit + asl20 + ]; + mainProgram = "reth"; + maintainers = with lib.maintainers; [ mitchmindtree ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/re/retroarch-assets/package.nix b/pkgs/by-name/re/retroarch-assets/package.nix index b83e69b63257..5f16bf6559d3 100644 --- a/pkgs/by-name/re/retroarch-assets/package.nix +++ b/pkgs/by-name/re/retroarch-assets/package.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation { description = "Assets needed for RetroArch"; homepage = "https://libretro.com"; license = licenses.mit; - maintainers = with maintainers; teams.libretro.members ++ [ ]; + teams = [ teams.libretro ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix index 92825492acc3..149abd2f592c 100644 --- a/pkgs/by-name/re/retroarch-bare/package.nix +++ b/pkgs/by-name/re/retroarch-bare/package.nix @@ -58,12 +58,12 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - hash = "sha256-ER90i0BlHC8SXfz6DzoIPCP1G8n4NNyJcRE88YY0gXk="; + hash = "sha256-OewUmnYpRByOgTi42G2reoaSuwxyPGHwP0+Uts/pg54="; rev = "v${version}"; }; @@ -178,13 +178,11 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; changelog = "https://github.com/libretro/RetroArch/blob/v${version}/CHANGES.md"; - maintainers = - with lib.maintainers; - [ - matthewbauer - kolbycrouch - ] - ++ lib.teams.libretro.members; + maintainers = with lib.maintainers; [ + matthewbauer + kolbycrouch + ]; + teams = [ lib.teams.libretro ]; mainProgram = "retroarch"; # If you want to (re)-add support for macOS, see: # https://docs.libretro.com/development/retroarch/compilation/osx/ diff --git a/pkgs/by-name/re/retroarch-bare/wrapper.nix b/pkgs/by-name/re/retroarch-bare/wrapper.nix index f6c60a2a7374..691abe528339 100644 --- a/pkgs/by-name/re/retroarch-bare/wrapper.nix +++ b/pkgs/by-name/re/retroarch-bare/wrapper.nix @@ -65,6 +65,7 @@ symlinkJoin { license mainProgram maintainers + teams platforms ; diff --git a/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix b/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix index e72bde6a8e91..7f4c0c8e163f 100644 --- a/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix +++ b/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "retroarch-joypad-autoconfig"; - version = "1.20.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-joypad-autoconfig"; rev = "v${version}"; - hash = "sha256-TdNyQOMLBgwpeYDE8qrRrIMUYcagiBJ02rSVU4Ycn1o="; + hash = "sha256-yLxJaHvscNHvuX1ak1bQ1yGMYv5yO4gTj53neT+JsRo="; }; makeFlags = [ @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec { description = "Joypad autoconfig files"; homepage = "https://www.libretro.com/"; license = licenses.mit; - maintainers = with maintainers; teams.libretro.members ++ [ ]; + teams = [ teams.libretro ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/re/revanced-cli/package.nix b/pkgs/by-name/re/revanced-cli/package.nix index 00e725434f6d..6867588a848d 100644 --- a/pkgs/by-name/re/revanced-cli/package.nix +++ b/pkgs/by-name/re/revanced-cli/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "revanced-cli"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar"; - hash = "sha256-KxxdMDybGBEgu2O0wozFDMszIDz4lHrdOQ2QD5/n8tg="; + hash = "sha256-tq+DSWAPVupR2W1Jqk0vKI4ox5zWSTSbpwyLcs4EXa8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/re/revive/package.nix b/pkgs/by-name/re/revive/package.nix index ae8df4a81188..8fe71fa96d2d 100644 --- a/pkgs/by-name/re/revive/package.nix +++ b/pkgs/by-name/re/revive/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "revive"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - hash = "sha256-lu5zbZXTaLJ5m2sVOG1Y7I/bbJ7kwqbfL1ebwPJ+C0o="; + hash = "sha256-mHyXymMJZeHXYOB6JB5VTqeP1flOACnNE/dLApAenH4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-sGvD8CdTFE+TqMjerPSjg7EY9VXPA/EKjY9Ncy+UKTo="; + vendorHash = "sha256-oRhex0WC0MUxX1luKJeMvA7NpN7aS/9ecXkrfRYEnvM="; ldflags = [ "-s" diff --git a/pkgs/by-name/re/revolt-desktop/package.nix b/pkgs/by-name/re/revolt-desktop/package.nix index 0f7d07d0893b..44bd4a551480 100644 --- a/pkgs/by-name/re/revolt-desktop/package.nix +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -19,7 +19,7 @@ license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ heyimnova - caralice + magistau ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/re/revolver/package.nix b/pkgs/by-name/re/revolver/package.nix index 37eac352fd82..fd6c63266b38 100644 --- a/pkgs/by-name/re/revolver/package.nix +++ b/pkgs/by-name/re/revolver/package.nix @@ -5,7 +5,7 @@ zsh, installShellFiles, ncurses, - nix-update-script, + unstableGitUpdater, testers, runCommand, }: @@ -79,7 +79,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { version = "0.2.0"; }; }; - updateScript = nix-update-script { }; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; meta = { diff --git a/pkgs/by-name/re/rewrk/package.nix b/pkgs/by-name/re/rewrk/package.nix index 5e87c9104bea..86d3063460d5 100644 --- a/pkgs/by-name/re/rewrk/package.nix +++ b/pkgs/by-name/re/rewrk/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "More modern http framework benchmarker supporting HTTP/1 and HTTP/2 benchmarks"; homepage = "https://github.com/lnx-search/rewrk"; diff --git a/pkgs/by-name/re/rexi/package.nix b/pkgs/by-name/re/rexi/package.nix new file mode 100644 index 000000000000..cee0aaf7a501 --- /dev/null +++ b/pkgs/by-name/re/rexi/package.nix @@ -0,0 +1,47 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "rexi"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "royreznik"; + repo = "rexi"; + tag = "v${version}"; + hash = "sha256-tag2/QTM6tDCU3qr4e1GqRYAZgpvEgtA+FtR4P7WdiU="; + }; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = with python3Packages; [ + colorama + typer + textual + ]; + + nativeCheckInputs = with python3Packages; [ + pytest + pytest-asyncio + pytest-cov + ]; + + pythonRelaxDeps = [ + "textual" + "typer" + ]; + + meta = { + description = "User-friendly terminal UI to interactively work with regular expressions"; + homepage = "https://github.com/royreznik/rexi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gauravghodinde ]; + mainProgram = "rexi"; + }; +} diff --git a/pkgs/by-name/rg/rgbds/package.nix b/pkgs/by-name/rg/rgbds/package.nix index b46ac38954f1..f49e437acacf 100644 --- a/pkgs/by-name/rg/rgbds/package.nix +++ b/pkgs/by-name/rg/rgbds/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - hash = "sha256-Rv2ylZavLy+G4XFLBdNGjk78hSb8cDoX9lW1l2TRmtk="; + hash = "sha256-Ho9aSpENukNutb5VscopY2p6RGXbRgvtIcRgxTtZews="; }; nativeBuildInputs = [ bison diff --git a/pkgs/by-name/rh/rhvoice/package.nix b/pkgs/by-name/rh/rhvoice/package.nix index cb0d6d020b6a..50aade08446c 100644 --- a/pkgs/by-name/rh/rhvoice/package.nix +++ b/pkgs/by-name/rh/rhvoice/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { pname = "rhvoice"; - version = "1.14.0"; + version = "1.16.4"; src = fetchFromGitHub { owner = "RHVoice"; repo = "RHVoice"; rev = version; fetchSubmodules = true; - hash = "sha256-eduKnxSTIDTxcW3ExueNxVKf8SjmXkVeTfHvJ0eyBPY="; + hash = "sha256-bkKEEtKF9ULEJ0sAGgWlxpIq4SbFLBSGbmThvvOLO5w="; }; patches = [ diff --git a/pkgs/by-name/ri/rich-cli/package.nix b/pkgs/by-name/ri/rich-cli/package.nix index 93b4f94c37c6..7b98a06d3f89 100644 --- a/pkgs/by-name/ri/rich-cli/package.nix +++ b/pkgs/by-name/ri/rich-cli/package.nix @@ -1,11 +1,13 @@ { lib, + python3Packages, fetchFromGitHub, fetchpatch, - python3, + versionCheckHook, + nix-update-script, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "rich-cli"; version = "1.8.0"; pyproject = true; @@ -32,17 +34,15 @@ python3.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "rich" "textual" ]; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ - ]; - - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ click requests rich @@ -50,15 +50,23 @@ python3.pkgs.buildPythonApplication rec { textual ]; - pythonImportsCheck = [ - "rich_cli" - ]; + pythonImportsCheck = [ "rich_cli" ]; - meta = with lib; { + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/rich"; + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Command Line Interface to Rich"; homepage = "https://github.com/Textualize/rich-cli"; changelog = "https://github.com/Textualize/rich-cli/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "rich"; }; diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix index a819d78c5cf1..91783fdfc16c 100644 --- a/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ricochet-refresh"; - version = "3.0.31"; + version = "3.0.33"; src = fetchFromGitHub { owner = "blueprint-freespeech"; repo = "ricochet-refresh"; rev = "v${finalAttrs.version}-release"; fetchSubmodules = true; - hash = "sha256-MEYq5WOt9t8WWqLOJcEVs0guPpob0EVUa+tAIbnDafY="; + hash = "sha256-KI2C0+S2CKTqaHKL94aS/znGTrnrHjkKCij14BwZMIo="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix index 944baa2255ca..63a7972968cb 100644 --- a/pkgs/by-name/ri/riff/package.nix +++ b/pkgs/by-name/ri/riff/package.nix @@ -5,8 +5,6 @@ makeWrapper, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,13 +26,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; postInstall = '' wrapProgram $out/bin/riff --set-default RIFF_DISABLE_TELEMETRY true diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix index 6e357a00133e..d6af268c0c79 100644 --- a/pkgs/by-name/ri/riffdiff/package.nix +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "3.3.9"; + version = "3.3.10"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; tag = version; - hash = "sha256-EhRruR5UzVP5OdPRX/k8Tasst9tlVteyfXD9BCXBhtI="; + hash = "sha256-5HxQF8PVDonWpmxHEFT4zWZTWzzn50UzBU1z0ahuaGM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-a9XLP0ydG/lIXT6fa4QK5MiBN6NWp/IrchXLBm34F6g="; + cargoHash = "sha256-8O4ZLKaQajrvNp7tH8iuVRPriuIIdesBmuv5MXyTafA="; passthru = { tests.version = testers.testVersion { package = riffdiff; }; diff --git a/pkgs/by-name/ri/rigel-engine/package.nix b/pkgs/by-name/ri/rigel-engine/package.nix index 74b0e08d35f5..7dd413cb058a 100644 --- a/pkgs/by-name/ri/rigel-engine/package.nix +++ b/pkgs/by-name/ri/rigel-engine/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, cmake, + libX11, SDL2, SDL2_mixer, buildOpenGLES ? false, @@ -25,6 +26,7 @@ stdenv.mkDerivation { ]; buildInputs = [ + libX11 SDL2 SDL2_mixer ]; diff --git a/pkgs/by-name/ri/riko4/package.nix b/pkgs/by-name/ri/riko4/package.nix deleted file mode 100644 index 047c28aef0ad..000000000000 --- a/pkgs/by-name/ri/riko4/package.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - SDL2, - libGLU, - luajit, - curl, - curlpp, -}: - -let - # Newer versions of sdl-gpu don't work with Riko4 (corrupted graphics), - # and this library does not have a proper release version, so let the - # derivation for this stay next to the Riko4 derivation for now. - sdl-gpu = stdenv.mkDerivation { - pname = "sdl-gpu"; - version = "2018-11-01"; - src = fetchFromGitHub { - owner = "grimfang4"; - repo = "sdl-gpu"; - rev = "a4ff1ab02410f154b004c29ec46e07b22890fa1f"; - sha256 = "1wdwg331s7r4dhq1l8w4dvlqf4iywskpdrscgbwrz9j0c6nqqi3v"; - }; - buildInputs = [ - SDL2 - libGLU - ]; - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - homepage = "https://github.com/grimfang4/sdl-gpu"; - description = "Library for high-performance, modern 2D graphics with SDL written in C"; - license = licenses.mit; - maintainers = with maintainers; [ CrazedProgrammer ]; - }; - }; -in - -stdenv.mkDerivation rec { - pname = "riko4"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "incinirate"; - repo = "Riko4"; - rev = "v${version}"; - sha256 = "008i9991sn616dji96jfwq6gszrspbx4x7cynxb1cjw66phyy5zp"; - }; - - buildInputs = [ - SDL2 - luajit - sdl-gpu - curl - curlpp - ]; - nativeBuildInputs = [ cmake ]; - - hardeningDisable = [ "fortify" ]; - cmakeFlags = [ "-DSDL2_gpu_INCLUDE_DIR=\"${sdl-gpu}/include\"" ]; - - # Riko4 needs the data/ and scripts/ directories to be in its PWD. - installPhase = '' - install -Dm0755 riko4 $out/bin/.riko4-unwrapped - mkdir -p $out/lib/riko4 - cp -r ../data $out/lib/riko4 - cp -r ../scripts $out/lib/riko4 - cat > $out/bin/riko4 < /dev/null - exec $out/bin/.riko4-unwrapped "\$@" - popd > /dev/null - EOF - chmod +x $out/bin/riko4 - ''; - - meta = with lib; { - homepage = "https://github.com/incinirate/Riko4"; - description = "Fantasy console for pixel art game development"; - mainProgram = "riko4"; - license = licenses.mit; - maintainers = with maintainers; [ CrazedProgrammer ]; - }; -} diff --git a/pkgs/by-name/ri/rime-ls/package.nix b/pkgs/by-name/ri/rime-ls/package.nix index ec6260e7b101..7d022eab8212 100644 --- a/pkgs/by-name/ri/rime-ls/package.nix +++ b/pkgs/by-name/ri/rime-ls/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "rime-ls"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "wlh320"; repo = "rime-ls"; rev = "v${version}"; - hash = "sha256-IhrfUPC+7Gsg2n6nsGiK/wRoFGKtLXsRLQBw6XIVu0U="; + hash = "sha256-jDn41hSDcQQO1d4G0XV6B/JZkryHtuoHUOYpmdE1Kxo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-beppHZXtNni8tLgZaC6CyL2HMBK7xy5/kP1jFr6JW+M="; + cargoHash = "sha256-lmvIH6ssEqbkcDETzHL+Spd04B576o8dijigUR88l9c="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix new file mode 100644 index 000000000000..b835ac901c1c --- /dev/null +++ b/pkgs/by-name/ri/rime-wanxiang/package.nix @@ -0,0 +1,91 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + librime, + rime-data, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "rime-wanxiang"; + version = "6.7.9"; + + src = fetchFromGitHub { + owner = "amzxyz"; + repo = "rime_wanxiang"; + tag = "v" + finalAttrs.version; + hash = "sha256-cOHwgy0rjqce7MedL0hK59royKlAPmZRGcVHRx0FrRU="; + }; + + nativeBuildInputs = [ + librime + ]; + + buildInputs = [ + rime-data + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + for s in *.schema.yaml; do + rime_deployer --compile "$s" . ${rime-data}/share/rime-data ./build + done + + rm build/*.txt + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dst=$out/share/rime-data + mkdir -p $dst + + rm -r .github custom LICENSE squirrel.yaml weasel.yaml *.md *.trime.yaml + mv default.yaml wanxiang_suggested_default.yaml + + cp -pr -t $dst * + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Feature-rich pinyin schema for Rime, basic edition"; + longDescription = '' + 万象拼音基础版 is a basic quanpin and shuangpin input schema for Rime based on + [万象 dictionaries and grammar models](https://github.com/amzxyz/RIME-LMDG), + supporting traditional shuangpin as well as tonal schemata such as 自然龙 and + 龙码. + + The schema requires to work the grammar model `wanxiang-lts-zh-hans.gram`. + However, this file is + [released](https://github.com/amzxyz/RIME-LMDG/releases/tag/LTS) by + carelessly overriding the old versions + (see the [discussion](https://github.com/amzxyz/RIME-LMDG/issues/22)). So + we can't pack it into Nixpkgs, which demands reproducibility. You have to + download it yourself and place it in the user directory of Rime. + + The upstream `default.yaml` is included as + `wanxiang_suggested_default.yaml`. To enable it, please modify your + `default.custom.yaml` as such: + + ```yaml + patch: + __include: wanxiang_suggested_default:/ + ``` + ''; + homepage = "https://github.com/amzxyz/rime_wanxiang"; + downloadPage = "https://github.com/amzxyz/rime_wanxiang/releases"; + changelog = "https://github.com/amzxyz/rime_wanxiang/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.cc-by-40; + maintainers = with lib.maintainers; [ rc-zb ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ri/rink/package.nix b/pkgs/by-name/ri/rink/package.nix new file mode 100644 index 000000000000..622030ebfd98 --- /dev/null +++ b/pkgs/by-name/ri/rink/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + openssl, + pkg-config, + ncurses, + curl, + installShellFiles, + asciidoctor, + libiconv, +}: + +rustPlatform.buildRustPackage rec { + version = "0.8.0"; + pname = "rink"; + + src = fetchFromGitHub { + owner = "tiffany352"; + repo = "rink-rs"; + rev = "v${version}"; + hash = "sha256-2+ZkyWhEnnO/QgCzWscbMr0u5kwdv2HqPLjtiXDfv/o="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-XvtEXBsdxUMJJntzzKVbUIjg78JpwyuUlTm6J3huDPE="; + + nativeBuildInputs = [ + pkg-config + installShellFiles + asciidoctor + ]; + buildInputs = + [ ncurses ] + ++ ( + if stdenv.hostPlatform.isDarwin then + [ + curl + libiconv + ] + else + [ openssl ] + ); + + # Some tests fail and/or attempt to use internet servers. + doCheck = false; + + postBuild = '' + make man + ''; + + postInstall = '' + installManPage build/* + ''; + + meta = with lib; { + description = "Unit-aware calculator"; + mainProgram = "rink"; + homepage = "https://rinkcalc.app"; + license = with licenses; [ + mpl20 + gpl3Plus + ]; + maintainers = with maintainers; [ + sb0 + Br1ght0ne + ]; + }; +} diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index 014dcb9f0922..5084730eefee 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -53,17 +53,17 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.2.10"; + version = "0.2.16"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-zDik7uHbg177Np9ukX3yZnQSYbuyif7fh+gxCoeeDvU="; + hash = "sha256-m2DAJ8kSD5Z13ycMQGz1RHrarnObhHl9wrXxG+kaaZk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-N2CyZBKfpLT9vkTtIhhJy/PeMT6Iic5WJYc8yYWZbEs="; + cargoHash = "sha256-heitZrB+LDQ8sWDCYjK31GiajUC6x4T/f4+G3YcyX1Q="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix index d7da56c59c7c..9895571a9385 100644 --- a/pkgs/by-name/ri/rip2/package.nix +++ b/pkgs/by-name/ri/rip2/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "rip2"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "MilesCranmer"; repo = "rip2"; rev = "v${version}"; - hash = "sha256-bwIvjpZgX95Vg14sU6JmYuWNHP38ZBM98ii/Rze+lqA="; + hash = "sha256-lNMFbc0TItvVuzwpVbe7qWlSCzIaFi0/cQwfq2itzbY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-G4AlFICHkBzpVoXbKp8TIyUZ78bhwPxNNeQRMOxfq6o="; + cargoHash = "sha256-KUVybOCtc66AubXjei0YCkXirfuIDgK3xSxjNODun98="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ri/ripe-atlas-tools/package.nix b/pkgs/by-name/ri/ripe-atlas-tools/package.nix index 7cdcd6020ad3..8ccac955b77e 100644 --- a/pkgs/by-name/ri/ripe-atlas-tools/package.nix +++ b/pkgs/by-name/ri/ripe-atlas-tools/package.nix @@ -59,6 +59,8 @@ python3.pkgs.buildPythonApplication rec { ]; disabledTests = [ + # Disable this test because on Python >= 3.12 it fails due to argparse changes https://github.com/python/cpython/pull/124578 + "test_add_arguments" # Network tests: https://github.com/RIPE-NCC/ripe-atlas-tools/issues/234 "test_arg_from_file" "test_arg_from_stdin" diff --git a/pkgs/by-name/ri/ripgrep-all/package.nix b/pkgs/by-name/ri/ripgrep-all/package.nix new file mode 100644 index 000000000000..49f1342c7641 --- /dev/null +++ b/pkgs/by-name/ri/ripgrep-all/package.nix @@ -0,0 +1,73 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + makeWrapper, + ffmpeg, + pandoc, + poppler-utils, + ripgrep, + zip, + fzf, +}: + +let + path = [ + ffmpeg + pandoc + poppler-utils + ripgrep + zip + fzf + ]; +in +rustPlatform.buildRustPackage rec { + pname = "ripgrep-all"; + version = "0.10.9"; + + src = fetchFromGitHub { + owner = "phiresky"; + repo = "ripgrep-all"; + rev = "v${version}"; + hash = "sha256-r/+u76Qxat6U0Hb3Xh31K/F0dNSPzteFzoE69NNCerI="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-nTCqqTFt87snzOXkjablaX9ZMGu/s88ZnUVr5uYrzPs="; + + # override debug=true set in Cargo.toml upstream + RUSTFLAGS = "-C debuginfo=none"; + + nativeBuildInputs = [ + makeWrapper + poppler-utils + ]; + + nativeCheckInputs = path; + + postInstall = '' + for bin in $out/bin/*; do + wrapProgram $bin \ + --prefix PATH ":" "${lib.makeBinPath path}" + done + ''; + + meta = with lib; { + changelog = "https://github.com/phiresky/ripgrep-all/blob/${src.rev}/CHANGELOG.md"; + description = "Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, and more"; + longDescription = '' + Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, etc. + + rga is a line-oriented search tool that allows you to look for a regex in + a multitude of file types. rga wraps the awesome ripgrep and enables it + to search in pdf, docx, sqlite, jpg, movie subtitles (mkv, mp4), etc. + ''; + homepage = "https://github.com/phiresky/ripgrep-all"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ + zaninime + ma27 + ]; + mainProgram = "rga"; + }; +} diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix index a92406128c93..9ffa2846b826 100644 --- a/pkgs/by-name/ri/ripunzip/package.nix +++ b/pkgs/by-name/ri/ripunzip/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, openssl, - darwin, pkg-config, testers, fetchzip, @@ -13,27 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "ripunzip"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "google"; repo = "ripunzip"; rev = "v${version}"; - hash = "sha256-Y4p3CFE8MyEQJ/af0g2/EL4kto/VZABvD5OS0rRuo8g="; + hash = "sha256-IPa7LvwB6RqebJXWKz4DZE5o/ob0sV7mVp6a/F0qsbU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lhStxg8H2T29eFYDFAZhFjOyH4hfRwEmcewm7Ec/oTw="; + cargoHash = "sha256-3bzIScXVxT8HFmFc0svincvTyuT2F2nfFs/3ApnCBUs="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; checkFlags = [ diff --git a/pkgs/by-name/rk/rkbin/package.nix b/pkgs/by-name/rk/rkbin/package.nix index f13113238467..b4481753bee0 100644 --- a/pkgs/by-name/rk/rkbin/package.nix +++ b/pkgs/by-name/rk/rkbin/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { passthru = { BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.44.elf"; BL31_RK3588 = "${rkbin}/bin/rk35/rk3588_bl31_v1.47.elf"; + TPL_RK3566 = "${rkbin}/bin/rk35/rk3566_ddr_1056MHz_v1.23.bin"; TPL_RK3568 = "${rkbin}/bin/rk35/rk3568_ddr_1056MHz_v1.23.bin"; TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin"; }; diff --git a/pkgs/by-name/rk/rkdeveloptool/package.nix b/pkgs/by-name/rk/rkdeveloptool/package.nix index 6c06584d7968..9b319231ad05 100644 --- a/pkgs/by-name/rk/rkdeveloptool/package.nix +++ b/pkgs/by-name/rk/rkdeveloptool/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "rkdeveloptool"; - version = "unstable-2021-04-08"; + version = "unstable-2025-03-07"; src = fetchFromGitHub { owner = "rockchip-linux"; repo = "rkdeveloptool"; - rev = "46bb4c073624226c3f05b37b9ecc50bbcf543f5a"; - sha256 = "eIFzyoY6l3pdfCN0uS16hbVp0qzdG3MtcS1jnDX1Yk0="; + rev = "304f073752fd25c854e1bcf05d8e7f925b1f4e14"; + sha256 = "sha256-GcSxkraJrDCz5ADO0XJk4xRrYTk0V5dAAim+D7ZiMJQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix index 0994d8527043..54c509328db3 100644 --- a/pkgs/by-name/rk/rke/package.nix +++ b/pkgs/by-name/rk/rke/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rke"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-mTSeUFmkXI9yZ1yeBXzudf2BmLtdmoiTlB/wtn++NAo="; + hash = "sha256-+AS8vxMTVKuxVUVyjbMED4pqznMj5lEpr+WhH9DnT84="; }; - vendorHash = "sha256-5+BjXPh52RNoaU/ABpvgbAO+mKcW4Hg2SRxRhV9etIo="; + vendorHash = "sha256-OWC8OZhORHwntAR2YHd4KfQgB2Wtma6ayBWfY94uOA4="; subPackages = [ "." ]; diff --git a/pkgs/by-name/rk/rkflashtool/package.nix b/pkgs/by-name/rk/rkflashtool/package.nix index edece60a45b3..dabb652d8a9d 100644 --- a/pkgs/by-name/rk/rkflashtool/package.nix +++ b/pkgs/by-name/rk/rkflashtool/package.nix @@ -3,38 +3,31 @@ stdenv, fetchurl, libusb1, + pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rkflashtool"; - version = "5.1"; + version = "6.1"; src = fetchurl { - url = "mirror://sourceforge/rkflashtool/rkflashtool-${version}-src.tar.bz2"; - sha256 = "0dbp1crw7pjav9gffrnskhkf0gxlj4xgp65clqhvfmv32460xb9c"; - }; - - versionh = fetchurl { - url = "mirror://sourceforge/rkflashtool/version.h"; - sha256 = "1mkcy3yyfaddhzg524hjnhvmwdmdfzbavib8d9p5y38pcqy8xgdp"; + url = "mirror://sourceforge/rkflashtool/rkflashtool-${finalAttrs.version}-src.tar.bz2"; + hash = "sha256-K8DsWAyqeQsK7mNDiKkRCkKbr0uT/yxPzj2atYP1Ezk="; }; buildInputs = [ libusb1 ]; - - preBuild = '' - cp $versionh version.h - ''; + nativeBuildInputs = [ pkg-config ]; installPhase = '' mkdir -p $out/bin cp rkunpack rkcrc rkflashtool rkparameters rkparametersblock rkunsign rkmisc $out/bin ''; - meta = with lib; { + meta = { homepage = "https://sourceforge.net/projects/rkflashtool/"; description = "Tools for flashing Rockchip devices"; - platforms = platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; - license = licenses.bsd2; + license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/rl/rl_json/package.nix b/pkgs/by-name/rl/rl_json/package.nix deleted file mode 100644 index c9c000718135..000000000000 --- a/pkgs/by-name/rl/rl_json/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - tcl, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rl_json"; - version = "0.15.1"; - - src = fetchFromGitHub { - owner = "RubyLane"; - repo = "rl_json"; - rev = finalAttrs.version; - hash = "sha256-FkOsdOHPE75bSkKw3cdaech6jAv0f/RJ9tgRVzPSAdA="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - autoreconfHook - tcl.tclPackageHook - ]; - - configureFlags = [ - "--with-tcl=${tcl}/lib" - "--libdir=${placeholder "out"}/lib" - "--includedir=${placeholder "out"}/include" - "--datarootdir=${placeholder "out"}/share" - ]; - - meta = { - homepage = "https://github.com/RubyLane/rl_json"; - description = "Tcl extension for fast json manipulation"; - license = lib.licenses.tcltk; - longDescription = '' - Extends Tcl with a json value type and a command to manipulate json values - directly. Similar in spirit to how the dict command manipulates dictionary - values, and comparable in speed. - ''; - maintainers = with lib.maintainers; [ fgaz ]; - platforms = tcl.meta.platforms; - # From version 0.15.1: 'endian.h' file not found - broken = stdenv.hostPlatform.isDarwin; - }; -}) diff --git a/pkgs/by-name/rl/rlama/package.nix b/pkgs/by-name/rl/rlama/package.nix index 928e1966bf30..b873f5e60f1e 100644 --- a/pkgs/by-name/rl/rlama/package.nix +++ b/pkgs/by-name/rl/rlama/package.nix @@ -54,7 +54,7 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/rm/rmate-sh/package.nix b/pkgs/by-name/rm/rmate-sh/package.nix index f3646a33f921..6b20d61484bf 100644 --- a/pkgs/by-name/rm/rmate-sh/package.nix +++ b/pkgs/by-name/rm/rmate-sh/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, patsh, hostname, + coreutils, }: stdenv.mkDerivation rec { @@ -19,6 +20,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ patsh ]; + # needed for cross + buildInputs = [ coreutils ]; + buildPhase = '' runHook preBuild @@ -26,7 +30,7 @@ stdenv.mkDerivation rec { --replace-fail \ 'echo "hostname"' \ 'echo "${hostname}/bin/hostname"' - patsh -f rmate -s ${builtins.storeDir} + patsh -f rmate -s ${builtins.storeDir} --path "$HOST_PATH" runHook postBuild ''; diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix index b76e3a3b9567..30a1709b67a5 100644 --- a/pkgs/by-name/rm/rmfakecloud/package.nix +++ b/pkgs/by-name/rm/rmfakecloud/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "rmfakecloud"; - version = "0.0.23"; + version = "0.0.24"; src = fetchFromGitHub { owner = "ddvk"; repo = "rmfakecloud"; rev = "v${version}"; - hash = "sha256-XlKqh6GKGreWLPjS8XfEUJCMMxiOw8pP2qX8otD+RCo="; + hash = "sha256-ZsYq1+Bb6SyMGdbiy5UzanDiUiFOt4uhttiPKC0ESis="; }; - vendorHash = "sha256-9tfxE03brUvCYusmewiqNpCkKyIS9qePqylrzDWrJLY="; + vendorHash = "sha256-S2P80uhX86IVUVEoR4tZ7e6qMe7CK+6bmmjBgjXGZmo="; # if using webUI build it # use env because of https://github.com/NixOS/nixpkgs/issues/358844 diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 62c326b36bfc..5558fd286168 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rmg"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "Rosalie241"; repo = "RMG"; tag = "v${finalAttrs.version}"; - hash = "sha256-Jwp3DXCh30TLBALXdnu6IubT4Y/8NGjJoSj7WwPp8Q8="; + hash = "sha256-ijoXKZbK4tm1KQ4I7R/g12tCUqrg4wRRRBCPPL03WEk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rm/rmw/package.nix b/pkgs/by-name/rm/rmw/package.nix index f405ef621d92..84f5f602f0d0 100644 --- a/pkgs/by-name/rm/rmw/package.nix +++ b/pkgs/by-name/rm/rmw/package.nix @@ -6,6 +6,7 @@ ninja, pkg-config, ncurses, + gettext, }: stdenv.mkDerivation rec { @@ -28,6 +29,11 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses + ] ++ lib.optional stdenv.hostPlatform.isDarwin gettext; + + # The subproject "canfigger" has asan and ubsan enabled by default, disable it here + mesonFlags = [ + "-Dcanfigger:b_sanitize=none" ]; meta = with lib; { diff --git a/pkgs/development/libraries/rnnoise-plugin/disable-ubsan.patch b/pkgs/by-name/rn/rnnoise-plugin/disable-ubsan.patch similarity index 100% rename from pkgs/development/libraries/rnnoise-plugin/disable-ubsan.patch rename to pkgs/by-name/rn/rnnoise-plugin/disable-ubsan.patch diff --git a/pkgs/by-name/rn/rnnoise-plugin/package.nix b/pkgs/by-name/rn/rnnoise-plugin/package.nix new file mode 100644 index 000000000000..78fb11fca707 --- /dev/null +++ b/pkgs/by-name/rn/rnnoise-plugin/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + freetype, + gtk3-x11, + pcre, + pkg-config, + webkitgtk_4_1, + xorg, +}: +stdenv.mkDerivation rec { + pname = "rnnoise-plugin"; + version = "1.10"; + outputs = [ + "out" + "ladspa" + "lv2" + "lxvst" + "vst3" + ]; + + src = fetchFromGitHub { + owner = "werman"; + repo = "noise-suppression-for-voice"; + rev = "v${version}"; + sha256 = "sha256-sfwHd5Fl2DIoGuPDjELrPp5KpApZJKzQikCJmCzhtY8="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + patches = lib.optionals stdenv.hostPlatform.isDarwin [ + # Ubsan seems to be broken on aarch64-darwin, it produces linker errors similar to https://github.com/NixOS/nixpkgs/issues/140751 + ./disable-ubsan.patch + ]; + + buildInputs = + [ + freetype + gtk3-x11 + pcre + xorg.libX11 + xorg.libXrandr + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + webkitgtk_4_1 + ]; + + # Move each plugin into a dedicated output, leaving a symlink in $out for backwards compatibility + postInstall = '' + for plugin in ladspa lv2 lxvst vst3; do + mkdir -p ''${!plugin}/lib + mv $out/lib/$plugin ''${!plugin}/lib/$plugin + ln -s ''${!plugin}/lib/$plugin $out/lib/$plugin + done + ''; + + meta = with lib; { + description = "Real-time noise suppression plugin for voice based on Xiph's RNNoise"; + homepage = "https://github.com/werman/noise-suppression-for-voice"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ + panaeon + henrikolsson + sciencentistguy + ]; + }; +} diff --git a/pkgs/by-name/rn/rnote/package.nix b/pkgs/by-name/rn/rnote/package.nix index 2dd40240ad47..3ffc58be726a 100644 --- a/pkgs/by-name/rn/rnote/package.nix +++ b/pkgs/by-name/rn/rnote/package.nix @@ -27,18 +27,18 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; tag = "v${version}"; - hash = "sha256-RbuEgmly6Mjmx58zOV+tg6Mv5ghCNy/dE5FXYrEXtdg="; + hash = "sha256-uEYamKIZIjR7c2LB+GydLmxy+EhcKrcxV+9vsveqGVk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-0c3Me9SobMvUiJqTyz/3zhEvntkiJFS92BNJ9rRBAv0="; + hash = "sha256-bzB4yjBcMsOqbq1UCgPFErzVOXs55qy+CYBUinGEbg4="; }; nativeBuildInputs = [ @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/flxzt/rnote"; - changelog = "https://github.com/flxzt/rnote/releases/tag/${src.rev}"; + changelog = "https://github.com/flxzt/rnote/releases/tag/${src.tag}"; description = "Simple drawing application to create handwritten notes"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix index 5fab4df3975e..bdb58ac03c3f 100644 --- a/pkgs/by-name/ro/roadrunner/package.nix +++ b/pkgs/by-name/ro/roadrunner/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "roadrunner"; - version = "2024.3.5"; + version = "2025.1.1"; src = fetchFromGitHub { repo = "roadrunner"; owner = "roadrunner-server"; tag = "v${version}"; - hash = "sha256-zENTLo3jVOUE1yerIGTb+jFAMnClOVpU/IbUor+bi+g="; + hash = "sha256-HNljEsrHTbNA5/+tnquh4yO5plAj1kKTAY3P927nAEU="; }; nativeBuildInputs = [ @@ -46,7 +46,9 @@ buildGoModule rec { --replace "127.0.0.1:0" "127.0.0.1:55554" ''; - vendorHash = "sha256-/2MuuvWEyo6zY3op359BUjG/HcjKxRSIv7Qb+6vtNqM="; + __darwinAllowLocalNetworking = true; + + vendorHash = "sha256-dnbctKxwQqfxZfKPa3ZlKjF5a/7eC5arK9RrPksSNVg="; meta = { changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix index 09ba07804a16..477309543f82 100644 --- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix +++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix @@ -21,7 +21,7 @@ php.buildComposerProject2 (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { @@ -30,6 +30,6 @@ php.buildComposerProject2 (finalAttrs: { homepage = "https://github.com/Roave/BackwardCompatibilityCheck"; license = lib.licenses.mit; mainProgram = "roave-backward-compatibility-check"; - maintainers = lib.teams.php.members; + teams = [ lib.teams.php ]; }; }) diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix index 5ceb4eae6bb0..686150de5a62 100644 --- a/pkgs/by-name/ro/robo/package.nix +++ b/pkgs/by-name/ro/robo/package.nix @@ -21,7 +21,7 @@ php82.buildComposerProject2 (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ro/robotframework-tidy/package.nix b/pkgs/by-name/ro/robotframework-tidy/package.nix index c129758de6af..19c1d4b75f20 100644 --- a/pkgs/by-name/ro/robotframework-tidy/package.nix +++ b/pkgs/by-name/ro/robotframework-tidy/package.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ setuptools ]; - pythonRelaxDeps = [ "rich-click" ]; + pythonRelaxDeps = [ "rich_click" ]; dependencies = with python3.pkgs; [ robotframework diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix index faec0ef7014e..9ec578ffe1e6 100644 --- a/pkgs/by-name/ro/rockcraft/package.nix +++ b/pkgs/by-name/ro/rockcraft/package.nix @@ -7,17 +7,18 @@ testers, rockcraft, cacert, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { pname = "rockcraft"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "canonical"; repo = "rockcraft"; rev = version; - hash = "sha256-cgNKMxQrD9/OfmY5YEnpbNDstDdXqc/wdfCb4HvsgNM="; + hash = "sha256-LrUs6/YRQYU0o1kmNdBhafvDIyw91FnW8+9i0Jj5f+Y="; }; pyproject = true; @@ -39,20 +40,24 @@ python3Packages.buildPythonApplication rec { pytest-mock pytest-subprocess pytestCheckHook + writableTmpDirAsHomeHook ] ++ [ dpkg ]; - preCheck = '' - mkdir -p check-phase - export HOME="$(pwd)/check-phase" - ''; - disabledTests = [ "test_project_all_platforms_invalid" "test_run_init_flask" "test_run_init_django" ]; + disabledTestPaths = [ + # Relies upon info in the .git directory which is stripped by fetchFromGitHub, + # and the version is overridden anyway. + "tests/integration/test_version.py" + # Tests non-Nix native packaging + "tests/integration/test_setuptools.py" + ]; + passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix index 081215e4dc39..f61d0c5c2cbd 100644 --- a/pkgs/by-name/ro/rocketchat-desktop/package.nix +++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "4.2.0"; + version = "4.3.3"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-6eoZbjmwzvXz7u+zkyrvzebens8GF9jGQA40cKxX26M="; + hash = "sha256-2/AOHsIeYXqjCeDMEeSzhTEfgkHo4fX0cFdx5gXvfNk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index d68c97cf1e95..70ae5a6af2ba 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2025-03-28"; + version = "0-unstable-2025-05-14"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "fbb71fb47b39095365ebba057342a4b0330ac477"; - hash = "sha256-h1AuaR1MTgRhk4K+dbq2GAtVch8kehFDRFHknQzK3fg="; + rev = "877452519d3138bd4a98dc7ef3cd3dec78a5b9dc"; + hash = "sha256-uqtCB636qAe6c/dokLsbbTGw3oeo+93YhnGfPUwg7WI="; }; dontConfigure = true; diff --git a/pkgs/by-name/ro/rofi-games/package.nix b/pkgs/by-name/ro/rofi-games/package.nix index a888de728d42..811a627ec6b0 100644 --- a/pkgs/by-name/ro/rofi-games/package.nix +++ b/pkgs/by-name/ro/rofi-games/package.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "rofi-games"; - version = "1.10.9"; + version = "1.12.2"; src = fetchFromGitHub { owner = "Rolv-Apneseth"; repo = "rofi-games"; tag = "v${finalAttrs.version}"; - hash = "sha256-VkhavN1nte0JYRn8PRER9B6baGiRr4Qr/L/yZ0cXZmc="; + hash = "sha256-6sopWMiXA6UmZP2wNbl7RlDDBRz4rNLPrNd6XnaFQko="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-Ld6lFljnfNUwhoDOb8XdFka87E0Y+KN1GFnubUza/LY="; + hash = "sha256-5ofRwE68SNFYcnBiGORsTjl6jSeDJ+6PJH+/SA1l07g="; }; patches = [ diff --git a/pkgs/by-name/ro/rogcat/package.nix b/pkgs/by-name/ro/rogcat/package.nix index 0380dc04a84d..99e0d333a10d 100644 --- a/pkgs/by-name/ro/rogcat/package.nix +++ b/pkgs/by-name/ro/rogcat/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Adb logcat wrapper"; diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 20181d00888f..70f806c21100 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -1,60 +1,57 @@ { lib, stdenv, - fetchFromGitHub, rustPlatform, + fetchFromGitHub, pkg-config, openssl, - darwin, + versionCheckHook, + nix-update-script, }: - -let - inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; -in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rojo"; - version = "7.4.4"; + version = "7.5.1"; src = fetchFromGitHub { owner = "rojo-rbx"; repo = "rojo"; - rev = "v${version}"; - hash = "sha256-5jiqR3gn3X+klcYr1zTEB9omxWwHKQNLKCVXhry1jjY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-awMio62guyP5qZH4i5hwXV5re6o45HDwqIJb3Dd71Is="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-AUtTk98izmFgMK7xpwaObzc+lFB9OjjgdCdXtwTS6JQ="; + cargoHash = "sha256-iWRjXC+JaBA/z2eOHiiqFFtS2gug5/hkIpYrPdHyux0="; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - SystemConfiguration - ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; # reqwest's native-tls-vendored feature flag uses vendored openssl. this disables that - OPENSSL_NO_VENDOR = "1"; + env.OPENSSL_NO_VENDOR = true; # tests flaky on darwin on hydra doCheck = !stdenv.hostPlatform.isDarwin; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/rojo"; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/rojo-rbx/rojo/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "Project management tool for Roblox"; - mainProgram = "rojo"; - longDescription = '' - Rojo is a tool designed to enable Roblox developers to use professional-grade software engineering tools. - ''; + downloadPage = "https://github.com/rojo-rbx/rojo/releases/tag/v${finalAttrs.version}"; homepage = "https://rojo.space"; - downloadPage = "https://github.com/rojo-rbx/rojo/releases/tag/v${version}"; - changelog = "https://github.com/rojo-rbx/rojo/raw/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ wackbyte ]; + license = lib.licenses.mpl20; + longDescription = '' + Tool designed to enable Roblox developers to use professional-grade software engineering tools. + ''; + mainProgram = "rojo"; + maintainers = with lib.maintainers; [ + wackbyte + HeitorAugustoLN + ]; }; -} +}) diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix index b6c3eee521c1..63b751a2a2e6 100644 --- a/pkgs/by-name/ro/roon-server/package.nix +++ b/pkgs/by-name/ro/roon-server/package.nix @@ -16,7 +16,7 @@ stdenv, }: let - version = "2.48.1517"; + version = "2.51.1534"; urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version; in stdenv.mkDerivation { @@ -25,7 +25,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-2H8lQykhzbHcEW/+Rj+4eQdUMUugUeXivz+/+MEAYxk="; + hash = "sha256-x9zbWJ4lrqfC1CPquGsdgzhO3WBzd46dlZy6APqJbcg="; }; dontConfigure = true; diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index dc3321ce0050..7a8147e1e833 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -29,7 +29,7 @@ xz, man, openssl, - pcre, + pcre2, nlohmann_json, pkg-config, procps, @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.34.06"; + version = "6.34.08"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-p5nWMtrlux7Ifq5uvARqEiaMaEnyqIN5IcEY/FG2z/M="; + hash = "sha256-gGBFsVbeA/6PVmGmcOq4d/Lk0tpsI03D4x6Y4tfZb+g="; }; clad_src = fetchgit { @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { patchRcPathCsh patchRcPathFish patchRcPathPosix - pcre + pcre2 python3.pkgs.numpy tbb xrootd @@ -137,9 +137,6 @@ stdenv.mkDerivation rec { # Eliminate impure reference to /System/Library/PrivateFrameworks substituteInPlace core/macosx/CMakeLists.txt \ --replace-fail "-F/System/Library/PrivateFrameworks " "" - # Just like in libpng/12.nix to build the builtin libpng on macOS - substituteInPlace graf2d/asimage/src/libAfterImage/libpng/pngpriv.h \ - --replace-fail '' '' '' + lib.optionalString diff --git a/pkgs/by-name/ro/rootlesskit/package.nix b/pkgs/by-name/ro/rootlesskit/package.nix index 6b2c3e63d8e4..bdf7759140c9 100644 --- a/pkgs/by-name/ro/rootlesskit/package.nix +++ b/pkgs/by-name/ro/rootlesskit/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "rootlesskit"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - hash = "sha256-9jQNFjxMLjGa9m2gxmoauzLHqhljltEO/ZNsBjWjgtw="; + hash = "sha256-hidQMZMPwnOKpMYV2UL0MkYBdvQUD6SsS7ZXt6bDzI8="; }; - vendorHash = "sha256-8X4lwCPREwSgaRFiXNL/odhsdmGYZs2SjjDKK+Bnln0="; + vendorHash = "sha256-sqmAOEapft5DLHWKwwuuzWY1RCzaKed8M1usyCjmKG8="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ro/rops/package.nix b/pkgs/by-name/ro/rops/package.nix index 1e3e599ababf..c9329526804f 100644 --- a/pkgs/by-name/ro/rops/package.nix +++ b/pkgs/by-name/ro/rops/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "rops"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "gibbz00"; repo = "rops"; tag = version; - hash = "sha256-532rV7ISNy8vbqq8yW9FdIqj5Ei/HJKZoEocM7Vwvg8="; + hash = "sha256-wwZ/4yOB4pE6lZgX8ytCC3plMYt6kxOakQoLy8SWN+k="; }; useFetchCargoVendor = true; - cargoHash = "sha256-HVYMC6NgkK5FPFetvxRUOHZ/Pn2uMYlF1VQJQXpNh9g="; + cargoHash = "sha256-sKPVdvMoQ2nV29rjau/6YpO1zpAQOuZhouPCvDf2goc="; # will true when tests is fixed from source. doCheck = false; diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix index 6ec021b53ee6..23a5777153e2 100644 --- a/pkgs/by-name/ro/rosa/package.nix +++ b/pkgs/by-name/ro/rosa/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "rosa"; - version = "1.2.52"; + version = "1.2.53"; src = fetchFromGitHub { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-bImuMrrXssKEh4VvSMy4iuK61GJ+Pltt6Ksir1Bx1as="; + hash = "sha256-t8hJscLk0tRi7CC6maE478CEbOkJtVkbXA0Ag1DxFB4="; }; vendorHash = null; diff --git a/pkgs/by-name/ro/rose-pine-kvantum/package.nix b/pkgs/by-name/ro/rose-pine-kvantum/package.nix new file mode 100644 index 000000000000..ea0b6a3ed42c --- /dev/null +++ b/pkgs/by-name/ro/rose-pine-kvantum/package.nix @@ -0,0 +1,36 @@ +{ + stdenvNoCC, + fetchFromGitHub, + lib, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "rose-pine-kvantum"; + version = "0-unstable-2025-03-26"; + + src = fetchFromGitHub { + owner = "rose-pine"; + repo = "kvantum"; + rev = "5a51f5892ba752088dee062a6188b9f0bb59324b"; + hash = "sha256-lUO3Bg9+KbPkllKu2sv9ueV1dcZu4qRn32N/+4+2B4A="; + }; + + dontBuild = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/Kvantum/themes + for i in $(find . -iname "*.tar.gz"); do + tar -xf $i -C $out/share/Kvantum/themes + done + + runHook postInstall + ''; + + meta = { + description = "Kvantum-themes based on Rose Pine"; + homepage = "https://github.com/rose-pine/kvantum"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ amadaluzia ]; + license = lib.licenses.unfree; # rose-pine/kvantum#1 + }; +}) diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index 8a4b957c48ec..c6dee3bbd21d 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -13,9 +13,9 @@ }, { "pname": "ICSharpCode.Decompiler", - "version": "8.2.0.7535", - "hash": "sha256-4BWs04Va9pc/SLeMA/vKoBydhw+Bu6s9MDtoo/Ucft8=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/8.2.0.7535/icsharpcode.decompiler.8.2.0.7535.nupkg" + "version": "9.1.0.7988", + "hash": "sha256-zPLgLNO4cCrtN9BR9x6X+W0MNkQ71nADIopOC1VBhAQ=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/9.1.0.7988/icsharpcode.decompiler.9.1.0.7988.nupkg" }, { "pname": "MessagePack", @@ -41,12 +41,6 @@ "hash": "sha256-SQCJa6u8coWMptbR9iQJLjoi/YkT9t0kJNbojh9vUPw=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.187/messagepack.annotations.2.5.187.nupkg" }, - { - "pname": "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace", - "version": "9.0.0-preview.25064.4", - "hash": "sha256-w6gQZ702lMi2lI/9hIKbeaxW4K42YlDkDnGiD5+cgFo=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.25064.4/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.25064.4.nupkg" - }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "9.0.0", @@ -59,6 +53,12 @@ "hash": "sha256-gP6ZhEsjjbmw6a477sm7UuOvGFFTxZYfRE2kKxK8jnc=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.hashcode/1.1.1/microsoft.bcl.hashcode.1.1.1.nupkg" }, + { + "pname": "Microsoft.Build", + "version": "17.11.4", + "hash": "sha256-y2qkHCwPbRYZKXwmABQUNhEHHQB/67xSH1zq8fz9olo=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.11.4/microsoft.build.17.11.4.nupkg" + }, { "pname": "Microsoft.Build", "version": "17.13.9", @@ -72,10 +72,10 @@ "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build/17.3.4/microsoft.build.17.3.4.nupkg" }, { - "pname": "Microsoft.Build", - "version": "17.7.2", - "hash": "sha256-k35nFdPxC8t0zAltVSmAJtsepp/ubNIjPOsJ6k8jSqM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.7.2/microsoft.build.17.7.2.nupkg" + "pname": "Microsoft.Build.Framework", + "version": "17.11.4", + "hash": "sha256-CpRliCQT2v/Xw+TgEvUvFKLVlqYHnhX8NIEY/WaHLSE=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.11.4/microsoft.build.framework.17.11.4.nupkg" }, { "pname": "Microsoft.Build.Framework", @@ -89,18 +89,18 @@ "hash": "sha256-p2JG7pMBGfDVP6sOzBOqOkImZmwotlGvfS+8BjjVYf8=", "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.framework/17.3.4/microsoft.build.framework.17.3.4.nupkg" }, - { - "pname": "Microsoft.Build.Framework", - "version": "17.7.2", - "hash": "sha256-fNWmVQYFTJDveAGmxEdNqJRAczV6+Ep8RA8clKBJFqw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.7.2/microsoft.build.framework.17.7.2.nupkg" - }, { "pname": "Microsoft.Build.Locator", "version": "1.6.10", "hash": "sha256-hOFFiQiCNkkDqt0Ad/4Y/sggj4t0zWXmfGjE+I/cqqM=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.6.10/microsoft.build.locator.1.6.10.nupkg" }, + { + "pname": "Microsoft.Build.Tasks.Core", + "version": "17.11.4", + "hash": "sha256-Y1A6j3uuYVrjM+waJ4/AKNgiGGqZU3Cai3swu8FUtqM=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.11.4/microsoft.build.tasks.core.17.11.4.nupkg" + }, { "pname": "Microsoft.Build.Tasks.Core", "version": "17.13.9", @@ -114,10 +114,10 @@ "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.tasks.core/17.3.4/microsoft.build.tasks.core.17.3.4.nupkg" }, { - "pname": "Microsoft.Build.Tasks.Core", - "version": "17.7.2", - "hash": "sha256-OrV/qWgZHzGlNUmaSfX5wDBcmg1aQeF3/OUHpSH+uZU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.7.2/microsoft.build.tasks.core.17.7.2.nupkg" + "pname": "Microsoft.Build.Utilities.Core", + "version": "17.11.4", + "hash": "sha256-1hfIxI2oIHDH1HUotX4l4SFzWerkjoCYSFYUcW0SF5g=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.11.4/microsoft.build.utilities.core.17.11.4.nupkg" }, { "pname": "Microsoft.Build.Utilities.Core", @@ -131,30 +131,24 @@ "hash": "sha256-SfZxr5xDANnDnC1HCUgho2H9MnF6n51cM47Rrf07fWw=", "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.utilities.core/17.3.4/microsoft.build.utilities.core.17.3.4.nupkg" }, - { - "pname": "Microsoft.Build.Utilities.Core", - "version": "17.7.2", - "hash": "sha256-oatF0KfuP1nb4+OLNKg2/R/ZLO4EiACaO5leaxMEY4A=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.7.2/microsoft.build.utilities.core.17.7.2.nupkg" - }, { "pname": "Microsoft.CodeAnalysis.Analyzers", "version": "3.11.0", "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.11.0/microsoft.codeanalysis.analyzers.3.11.0.nupkg" }, - { - "pname": "Microsoft.CodeAnalysis.AnalyzerUtilities", - "version": "3.3.0", - "hash": "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzerutilities/3.3.0/microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg" - }, { "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", "version": "3.11.0-beta1.24081.1", "hash": "sha256-5UN//A8oc2w+UoxAwWmXWRXykQD+2mpa1hbJrAfh2Lg=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.bannedapianalyzers.3.11.0-beta1.24081.1.nupkg" }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "3.11.0", + "hash": "sha256-lOW5q1kAAk+Wpweb9TaZ1LztWzAODt9yZKe6SN5rkV8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/3.11.0/microsoft.codeanalysis.common.3.11.0.nupkg" + }, { "pname": "Microsoft.CodeAnalysis.Common", "version": "4.1.0", @@ -199,15 +193,15 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "9.0.0-beta.25161.4", - "hash": "sha256-NrQSPWnG7RlhNMyrqcz4sR0+WWpJpoTrrRtVLkIGFms=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25161.4/microsoft.dotnet.arcade.sdk.9.0.0-beta.25161.4.nupkg" + "version": "9.0.0-beta.25255.5", + "hash": "sha256-AgHPYDKvoO3a2zoRSgnokC6XrF521V1lQ9KEPcKyS5E=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25255.5/microsoft.dotnet.arcade.sdk.9.0.0-beta.25255.5.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", - "version": "9.0.0-beta.25161.4", - "hash": "sha256-l4CTmNsxuFP3Bjs2mS1/zdmsb/ZvyHpddTX2HT+MVu4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25161.4/microsoft.dotnet.xlifftasks.9.0.0-beta.25161.4.nupkg" + "version": "9.0.0-beta.25255.5", + "hash": "sha256-yigTPcb88S+1FUal0K/fL5pu5I/dmPACAo2sPOTDfZk=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25255.5/microsoft.dotnet.xlifftasks.9.0.0-beta.25255.5.nupkg" }, { "pname": "Microsoft.Extensions.Configuration", @@ -233,12 +227,6 @@ "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection/9.0.0/microsoft.extensions.dependencyinjection.9.0.0.nupkg" }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.0", - "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection.abstractions/8.0.0/microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg" - }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "9.0.0", @@ -275,12 +263,6 @@ "hash": "sha256-N2t9EUdlS6ippD4Z04qUUyBuQ4tKSR/8TpmKScb5zRw=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.console/9.0.0/microsoft.extensions.logging.console.9.0.0.nupkg" }, - { - "pname": "Microsoft.Extensions.ObjectPool", - "version": "8.0.0", - "hash": "sha256-FxFr5GC0y6vnp5YD2A2vISXYizAz3k/QyrH7sBXP5kg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.objectpool/8.0.0/microsoft.extensions.objectpool.8.0.0.nupkg" - }, { "pname": "Microsoft.Extensions.Options", "version": "9.0.0", @@ -305,6 +287,12 @@ "hash": "sha256-IaATAy1M/MEBTid0mQiTrHj4aTwo2POCtckxSbLc3lU=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.1/microsoft.io.redist.6.0.1.nupkg" }, + { + "pname": "Microsoft.NET.StringTools", + "version": "17.11.4", + "hash": "sha256-lWfzY35WQ+iKS9TpuztDTljgF9CIORhFhFEm0p1dVBE=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.11.4/microsoft.net.stringtools.17.11.4.nupkg" + }, { "pname": "Microsoft.NET.StringTools", "version": "17.13.9", @@ -317,12 +305,6 @@ "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.6.3/microsoft.net.stringtools.17.6.3.nupkg" }, - { - "pname": "Microsoft.NET.StringTools", - "version": "17.7.2", - "hash": "sha256-hQE07TCgcQuyu9ZHVq2gPDb0+xe8ECJUdrgh17bJP4o=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.7.2/microsoft.net.stringtools.17.7.2.nupkg" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", @@ -401,12 +383,6 @@ "hash": "sha256-J/egIc9ovDi1MUrnyKnpadECQqAB1WUUyrbxINv4zRE=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.remotecontrol/16.3.52/microsoft.visualstudio.remotecontrol.16.3.52.nupkg" }, - { - "pname": "Microsoft.VisualStudio.Setup.Configuration.Interop", - "version": "3.2.2146", - "hash": "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg" - }, { "pname": "Microsoft.VisualStudio.SolutionPersistence", "version": "1.0.28", @@ -415,9 +391,9 @@ }, { "pname": "Microsoft.VisualStudio.Telemetry", - "version": "17.14.2", - "hash": "sha256-MqIrtr0I5uC64ww7v7xD2nTOqsdAqX7C1nPNzfhTkWA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.14.2/microsoft.visualstudio.telemetry.17.14.2.nupkg" + "version": "17.14.8", + "hash": "sha256-DBqhTILQhgFqeVVr1/ktcIAlM8KgdUuaKomONSwzQ1I=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.14.8/microsoft.visualstudio.telemetry.17.14.8.nupkg" }, { "pname": "Microsoft.VisualStudio.Threading", @@ -545,12 +521,6 @@ "hash": "sha256-ioasr71UIhDmeZ2Etw52lQ7QsioEd1pnbpVlEeCyUI4=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/powershell/7.0.0/powershell.7.0.0.nupkg" }, - { - "pname": "RichCodeNav.EnvVarDump", - "version": "0.1.1643-alpha", - "hash": "sha256-bwND+Na9iEnkEdeL1elY34+m4/F4BYATBHv/2BEw4d4=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg" - }, { "pname": "Roslyn.Diagnostics.Analyzers", "version": "3.11.0-beta1.24081.1", @@ -793,9 +763,9 @@ }, { "pname": "System.CodeDom", - "version": "7.0.0", - "hash": "sha256-7IPt39cY+0j0ZcRr/J45xPtEjnSXdUJ/5ai3ebaYQiE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/7.0.0/system.codedom.7.0.0.nupkg" + "version": "8.0.0", + "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/8.0.0/system.codedom.8.0.0.nupkg" }, { "pname": "System.Collections", @@ -817,9 +787,9 @@ }, { "pname": "System.CommandLine", - "version": "2.0.0-beta4.24528.1", - "hash": "sha256-C1CMTF8ejnnk9h6Yih8ajWeNiQK6czWZTgBSEhGZNGQ=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta4.24528.1/system.commandline.2.0.0-beta4.24528.1.nupkg" + "version": "2.0.0-beta5.25210.1", + "hash": "sha256-AIUy4OsHWpfbH200l+rdZ2VvYsvDDMkccFfXd1ApE8Y=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta5.25210.1/system.commandline.2.0.0-beta5.25210.1.nupkg" }, { "pname": "System.ComponentModel.Composition", @@ -925,9 +895,9 @@ }, { "pname": "System.Formats.Asn1", - "version": "7.0.0", - "hash": "sha256-eMF+SD/yeslf/wOIlOTlpfpj3LtP6HUilGeSj++bJKg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/7.0.0/system.formats.asn1.7.0.0.nupkg" + "version": "8.0.0", + "hash": "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/8.0.0/system.formats.asn1.8.0.0.nupkg" }, { "pname": "System.Formats.Nrbf", @@ -1055,12 +1025,6 @@ "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/9.0.0/system.reflection.metadata.9.0.0.nupkg" }, - { - "pname": "System.Reflection.MetadataLoadContext", - "version": "7.0.0", - "hash": "sha256-VYl6SFD130K9Aw4eJH16ApJ9Sau4Xu0dcxEip2veuTI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/7.0.0/system.reflection.metadataloadcontext.7.0.0.nupkg" - }, { "pname": "System.Reflection.MetadataLoadContext", "version": "8.0.0", @@ -1123,9 +1087,9 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "7.0.2", - "hash": "sha256-qS5Z/Yo8J+f3ExVX5Qkcpj1Z57oUZqz5rWa1h5bVpl8=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/7.0.2/system.security.cryptography.pkcs.7.0.2.nupkg" + "version": "8.0.0", + "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/8.0.0/system.security.cryptography.pkcs.8.0.0.nupkg" }, { "pname": "System.Security.Cryptography.ProtectedData", @@ -1135,15 +1099,9 @@ }, { "pname": "System.Security.Cryptography.Xml", - "version": "7.0.1", - "hash": "sha256-CH8+JVC8LyCSW75/6ZQ7ecMbSOAE1c16z4dG8JTp01w=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/7.0.1/system.security.cryptography.xml.7.0.1.nupkg" - }, - { - "pname": "System.Security.Permissions", - "version": "9.0.0", - "hash": "sha256-BFrA9ottmQtLIAiKiGRbfSUpzNJwuaOCeFRDN4Z0ku0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/9.0.0/system.security.permissions.9.0.0.nupkg" + "version": "8.0.0", + "hash": "sha256-XSg8r9TBoYi6KF10Tg3HyCN3pTm1pA2v0BonEgu+PXU=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/8.0.0/system.security.cryptography.xml.8.0.0.nupkg" }, { "pname": "System.Security.Principal", @@ -1246,11 +1204,5 @@ "version": "4.5.0", "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg" - }, - { - "pname": "System.Windows.Extensions", - "version": "9.0.0", - "hash": "sha256-RErD+Ju15qtnwdwB7E0SjjJGAnhXwJyC7UPcl24Z3Vs=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/9.0.0/system.windows.extensions.9.0.0.nupkg" } ] diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index ce314ce8ea8e..4c45c67694c9 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -32,18 +32,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.70.15"; + vsVersion = "2.78.15"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-vXRt/scWxekd8U04MGfD4W8aj05H0CqkbIYZy8+0OdU="; + hash = "sha256-Lim2f2//NFiMrZzvpREMlk6/5NWatVTiQrciAAxIiLY="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.14.0-3.25164.3"; + version = "5.0.0-1.25263.3"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/ro/rotonda/package.nix b/pkgs/by-name/ro/rotonda/package.nix index 16f26b6ec8c7..436eea306ac8 100644 --- a/pkgs/by-name/ro/rotonda/package.nix +++ b/pkgs/by-name/ro/rotonda/package.nix @@ -7,22 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "rotonda"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = "rotonda"; tag = "v${version}"; - hash = "sha256-iLHOt7eVCgtYwSiqpgrp8kjfi90Mz0+X2n+P6bJDWbw="; + hash = "sha256-rSIjlLr1mtgyFKRAkcnDKV/MwtYb/ifXewLXhZ4zp7E="; }; - doCheck = false; - # Test can't be compiled - passthru.updateScript = nix-update-script { }; useFetchCargoVendor = true; - cargoHash = "sha256-fp4HhJs/x4w/FML0odbF17y7dlGfc+Ug/fkeC2s0fyk="; + cargoHash = "sha256-MKFSvmU3lgQZ1c5L1GmMmzXiXK28uCgYtrjIjhAhcfY="; meta = { description = "Rotonda - composable, programmable BGP Engine"; diff --git a/pkgs/by-name/ro/routersploit/package.nix b/pkgs/by-name/ro/routersploit/package.nix index 0ff779a6de1d..1bb8da28873a 100644 --- a/pkgs/by-name/ro/routersploit/package.nix +++ b/pkgs/by-name/ro/routersploit/package.nix @@ -6,25 +6,31 @@ python3.pkgs.buildPythonApplication rec { pname = "routersploit"; - version = "unstable-2021-02-06"; - format = "setuptools"; + version = "3.4.1-unstable-2025-04-24"; + pyproject = true; src = fetchFromGitHub { owner = "threat9"; - repo = pname; - rev = "3fd394637f5566c4cf6369eecae08c4d27f93cda"; + repo = "routersploit"; + rev = "0bf837f67ed2131077c4192c21909104aab9f13d"; hash = "sha256-IET0vL0VVP9ZNn75hKdTCiEmOZRHHYICykhzW2g3LEg="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ future paramiko pycryptodome pysnmp requests setuptools + standard-telnetlib ]; + # Tests are out-dated and support for newer pysnmp is not implemented yet + doCheck = false; + nativeCheckInputs = with python3.pkgs; [ pytest-xdist pytestCheckHook @@ -35,9 +41,7 @@ python3.pkgs.buildPythonApplication rec { mv $out/bin/rsf.py $out/bin/rsf ''; - pythonImportsCheck = [ - "routersploit" - ]; + pythonImportsCheck = [ "routersploit" ]; pytestFlagsArray = [ # Run the same tests as upstream does in the first round @@ -49,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Exploitation Framework for Embedded Devices"; homepage = "https://github.com/threat9/routersploit"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ fab ]; mainProgram = "rsf"; }; diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix index c9e5437b32d2..b394ddc6d0e4 100644 --- a/pkgs/by-name/ro/routinator/package.nix +++ b/pkgs/by-name/ro/routinator/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nixosTests, }: @@ -21,14 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-58EnGouq8iKkgsvyHqARoQ0u4QXjw0m6pv4Am4J9wlU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); - meta = with lib; { description = "RPKI Validator written in Rust"; homepage = "https://github.com/NLnetLabs/routinator"; diff --git a/pkgs/by-name/ro/routino/package.nix b/pkgs/by-name/ro/routino/package.nix index 2844356923b5..a40a2397f8a7 100644 --- a/pkgs/by-name/ro/routino/package.nix +++ b/pkgs/by-name/ro/routino/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "routino"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { url = "https://routino.org/download/routino-${version}.tgz"; - hash = "sha256-Dms1u/KuS6qFYcslKfsvIFPx0ApdyWtKK/XlgW+kToI="; + hash = "sha256-TroGfTLJfKk4itbpfA9aPBDUiCk2ckDXjFE3XYzBHlQ="; }; patchFlags = [ "-p0" ]; diff --git a/pkgs/by-name/ro/rox-filer/package.nix b/pkgs/by-name/ro/rox-filer/package.nix new file mode 100644 index 000000000000..841e70157316 --- /dev/null +++ b/pkgs/by-name/ro/rox-filer/package.nix @@ -0,0 +1,108 @@ +{ + lib, + stdenv, + fetchurl, + fetchpatch, + pkg-config, + wrapGAppsHook3, + libxml2, + gtk2, + libSM, + shared-mime-info, +}: + +stdenv.mkDerivation rec { + pname = "rox-filer"; + version = "2.11"; + + src = fetchurl { + url = "mirror://sourceforge/rox/rox-filer-${version}.tar.bz2"; + sha256 = "a929bd32ee18ef7a2ed48b971574574592c42e34ae09f36604bf663d7c101ba8"; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + buildInputs = [ + libxml2 + gtk2 + shared-mime-info + libSM + ]; + NIX_LDFLAGS = "-lm"; + NIX_CFLAGS_COMPILE = " -fpermissive"; + + patches = [ + ./rox-filer-2.11-in-source-build.patch + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/rox-desktop/rox-filer/pull/15 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/rox-desktop/rox-filer/commit/86b0bb9144186d51ea9b898905111bd8b143b552.patch"; + sha256 = "1csyx229i09p00lbdlkdqdhn3x2lb5zby1h9rkjgzlr2qz74gc69"; + }) + ]; + + # go to the source directory after unpacking the sources + sourceRoot = "rox-filer-${version}/ROX-Filer"; + + # account for 'setSourceRoot' offset + patchFlags = [ "-p2" ]; + + # patch the main.c to disable the lookup of the APP_DIR environment variable, + # which is used to lookup the location for certain images when rox-filer + # starts; rather override the location with an absolute path to the directory + # where images are stored to prevent having to use a wrapper, which sets the + # APP_DIR environment variable prior to starting rox-filer + preConfigure = '' + sed -i -e "s:g_strdup(getenv(\"APP_DIR\")):\"$out\":" src/main.c + mkdir build + cd build + ''; + + configureScript = "../src/configure"; + + installPhase = '' + mkdir -p "$out" + cd .. + cp -av Help Messages Options.xml ROX images style.css .DirIcon "$out" + + # create the man/ directory, which will be moved from $out to share/ in the fixup phase + mkdir "$out/man/" + cp -av ../rox.1 "$out/man/" + + # the main executable + mkdir "$out/bin/" + cp -v ROX-Filer "$out/bin/rox" + + # mime types + mkdir -p "$out/ROX/MIME" + cd "$out/ROX/MIME" + ln -sv text-x-{diff,patch}.png + ln -sv application-x-font-{afm,type1}.png + ln -sv application-xml{,-dtd}.png + ln -sv application-xml{,-external-parsed-entity}.png + ln -sv application-{,rdf+}xml.png + ln -sv application-x{ml,-xbel}.png + ln -sv application-{x-shell,java}script.png + ln -sv application-x-{bzip,xz}-compressed-tar.png + ln -sv application-x-{bzip,lzma}-compressed-tar.png + ln -sv application-x-{bzip-compressed-tar,lzo}.png + ln -sv application-x-{bzip,xz}.png + ln -sv application-x-{gzip,lzma}.png + ln -sv application-{msword,rtf}.png + ''; + + meta = with lib; { + description = "Fast, lightweight, gtk2 file manager"; + mainProgram = "rox"; + homepage = "http://rox.sourceforge.net/desktop"; + license = with licenses; [ + gpl2 + lgpl2 + ]; + platforms = platforms.linux; + maintainers = [ maintainers.eleanor ]; + }; +} diff --git a/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch b/pkgs/by-name/ro/rox-filer/rox-filer-2.11-in-source-build.patch similarity index 100% rename from pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch rename to pkgs/by-name/ro/rox-filer/rox-filer-2.11-in-source-build.patch diff --git a/pkgs/by-name/ro/roxctl/package.nix b/pkgs/by-name/ro/roxctl/package.nix new file mode 100644 index 000000000000..44260bbb6576 --- /dev/null +++ b/pkgs/by-name/ro/roxctl/package.nix @@ -0,0 +1,52 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + testers, + roxctl, +}: + +buildGoModule rec { + pname = "roxctl"; + version = "4.7.3"; + + src = fetchFromGitHub { + owner = "stackrox"; + repo = "stackrox"; + rev = version; + sha256 = "sha256-ZN9BkIgVJ4p78zfNPqRCmUCHg0KpaphfQM6HPvnx0pY="; + }; + + vendorHash = "sha256-eTxcJnAZUKk6VDQhbjxnsiQWEpM2jA228SAhrCqjbF4="; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "roxctl" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/stackrox/rox/pkg/version/internal.MainVersion=${version}" + ]; + + postInstall = '' + installShellCompletion --cmd roxctl \ + --bash <($out/bin/roxctl completion bash) \ + --fish <($out/bin/roxctl completion fish) \ + --zsh <($out/bin/roxctl completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = roxctl; + command = "roxctl version"; + }; + + meta = with lib; { + description = "Command-line client of the StackRox Kubernetes Security Platform"; + mainProgram = "roxctl"; + license = licenses.asl20; + homepage = "https://www.stackrox.io"; + maintainers = with maintainers; [ stehessel ]; + }; +} diff --git a/pkgs/by-name/rp/rpclib/package.nix b/pkgs/by-name/rp/rpclib/package.nix new file mode 100644 index 000000000000..d055c060cce9 --- /dev/null +++ b/pkgs/by-name/rp/rpclib/package.nix @@ -0,0 +1,26 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "rpclib"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "rpclib"; + repo = "rpclib"; + rev = "v${finalAttrs.version}"; + sha256 = "0dlbkl47zd2fkxwbn93w51wmvfr8ssp4zribn5wi4cpiky44a4g9"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "RPC library for C++, providing both a client and server implementation"; + homepage = "https://github.com/rpclib/rpclib/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tmplt ]; + }; +}) diff --git a/pkgs/by-name/rp/rpcs3/fix-qt6.9-compilation.patch b/pkgs/by-name/rp/rpcs3/fix-qt6.9-compilation.patch new file mode 100644 index 000000000000..13ca314d3022 --- /dev/null +++ b/pkgs/by-name/rp/rpcs3/fix-qt6.9-compilation.patch @@ -0,0 +1,68 @@ +From 600e4604169464c64cbf548e7629e483ad2aad1e Mon Sep 17 00:00:00 2001 +From: Megamouse +Date: Mon, 7 Apr 2025 20:49:15 +0200 +Subject: [PATCH] Fix compilation with newer Qt + +--- + rpcs3/rpcs3qt/game_list_base.cpp | 2 +- + rpcs3/rpcs3qt/game_list_frame.cpp | 4 ++-- + rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3qt/game_list_base.cpp +index 72b45d33bfbb..21640906ee7e 100644 +--- a/rpcs3/rpcs3qt/game_list_base.cpp ++++ b/rpcs3/rpcs3qt/game_list_base.cpp +@@ -25,7 +25,7 @@ void game_list_base::repaint_icons(std::vector& game_data, const QCol + for (game_info& game : game_data) + { + game->pxmap = placeholder; +- ++ + if (movie_item_base* item = game->item) + { + item->set_icon_load_func([this, game, device_pixel_ratio, cancel = item->icon_loading_aborted()](int) +diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp +index a294d69cc68e..439913760053 100644 +--- a/rpcs3/rpcs3qt/game_list_frame.cpp ++++ b/rpcs3/rpcs3qt/game_list_frame.cpp +@@ -2363,7 +2363,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set + + connect(future_watcher, &QFutureWatcher::finished, this, [=, this]() + { +- pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size)); ++ pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size)); + pdlg->setCancelButtonText(tr("OK")); + QApplication::beep(); + +@@ -2396,7 +2396,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set + return; + } + +- pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size)); ++ pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size)); + pdlg->setCancelButtonText(tr("OK")); + connect(pdlg, &progress_dialog::canceled, this, [pdlg](){ pdlg->deleteLater(); }); + QApplication::beep(); +diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp +index 45fbe6f59e7d..4b9bc5dd6e4f 100644 +--- a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp ++++ b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp +@@ -362,7 +362,7 @@ void ps_move_tracker_dialog::update_saturation_threshold(bool update_slider) + } + void ps_move_tracker_dialog::update_min_radius(bool update_slider) + { +- ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius)); ++ ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius.get())); + + if (update_slider) + { +@@ -372,7 +372,7 @@ void ps_move_tracker_dialog::update_min_radius(bool update_slider) + + void ps_move_tracker_dialog::update_max_radius(bool update_slider) + { +- ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius)); ++ ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius.get())); + + if (update_slider) + { diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index 779d9048ca0e..2c00a3dc91d6 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -21,12 +21,14 @@ python3, pugixml, flatbuffers, - llvm_16, + llvm_18, cubeb, + opencv, enableDiscordRpc ? false, faudioSupport ? true, faudio, SDL2, + sdl3, waylandSupport ? true, wayland, wrapGAppsHook3, @@ -34,10 +36,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "17323-92d070729"; - rpcs3Version = "0.0.34-17323-92d070729"; - rpcs3Revision = "92d07072915b99917892dd7833c06eb44a09e234"; - rpcs3Hash = "sha256-GH2sXw1AYdqwzxucXFhVS0nM0eRhC+XDHS6RTZY8pYY="; + rpcs3GitVersion = "17736-c86a25079"; + rpcs3Version = "0.0.36-17736-c86a25079"; + rpcs3Revision = "c86a25079518032d73395a79979970acb2581a91"; + rpcs3Hash = "sha256-e+mT3qn1oz1fh2bqu5YM+m774Can34If57Kd1T1EGbk="; inherit (qt6Packages) qtbase @@ -58,6 +60,11 @@ stdenv.mkDerivation { hash = rpcs3Hash; }; + patches = [ + # Modified from https://github.com/RPCS3/rpcs3/pull/17009; doesn't apply cleanly due to intermediate commits + ./fix-qt6.9-compilation.patch + ]; + passthru.updateScript = ./update.sh; preConfigure = '' @@ -77,9 +84,11 @@ stdenv.mkDerivation { (lib.cmakeBool "USE_SYSTEM_CURL" true) (lib.cmakeBool "USE_SYSTEM_WOLFSSL" true) (lib.cmakeBool "USE_SYSTEM_FAUDIO" true) + (lib.cmakeBool "USE_SYSTEM_OPENAL" true) (lib.cmakeBool "USE_SYSTEM_PUGIXML" true) (lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true) (lib.cmakeBool "USE_SYSTEM_SDL" true) + (lib.cmakeBool "USE_SYSTEM_OPENCV" true) (lib.cmakeBool "USE_SDL" true) (lib.cmakeBool "WITH_LLVM" true) (lib.cmakeBool "BUILD_LLVM" false) @@ -115,10 +124,12 @@ stdenv.mkDerivation { wolfssl python3 pugixml - SDL2 + SDL2 # Still needed by FAudio's CMake + sdl3 flatbuffers - llvm_16 + llvm_18 libSM + opencv ] ++ cubeb.passthru.backendLibs ++ lib.optional faudioSupport faudio diff --git a/pkgs/by-name/rp/rpm-ostree/package.nix b/pkgs/by-name/rp/rpm-ostree/package.nix index 592c12c19dc8..6296b13f56db 100644 --- a/pkgs/by-name/rp/rpm-ostree/package.nix +++ b/pkgs/by-name/rp/rpm-ostree/package.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { description = "Hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; homepage = "https://coreos.github.io/rpm-ostree/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "rpm-ostree"; }; diff --git a/pkgs/by-name/rp/rpm-sequoia/package.nix b/pkgs/by-name/rp/rpm-sequoia/package.nix index 17b863a4678f..aa28141583e3 100644 --- a/pkgs/by-name/rp/rpm-sequoia/package.nix +++ b/pkgs/by-name/rp/rpm-sequoia/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "rpm-sequoia"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "rpm-sequoia"; - rev = "v${version}"; - hash = "sha256-AZCsboUv4muKOw5El2Hw5O1cvAgD3JhBppacrQCJT2k="; + tag = "v${version}"; + hash = "sha256-Z2falZxewgMrrAyh8sDlIr9NfCzNs8GA+RHmfNYfzio="; }; useFetchCargoVendor = true; - cargoHash = "sha256-X+5Ww+cnt08mleA6FzxVGprjIEQVInQPSvTWGjXuGI8="; + cargoHash = "sha256-LJyq2gWP/I6+4lArhsWmcAHlub0Ww76jkq2gagP86ao="; patches = [ ./objdump.patch diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix index c6245e9c1d42..af243166d8ef 100644 --- a/pkgs/by-name/rq/rq/package.nix +++ b/pkgs/by-name/rq/rq/package.nix @@ -2,17 +2,19 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rq"; version = "1.0.4"; src = fetchFromGitHub { owner = "dflemstr"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI="; + repo = "rq"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI="; }; useFetchCargoVendor = true; @@ -22,24 +24,34 @@ rustPlatform.buildRustPackage rec { # Remove #[deny(warnings)] which is equivalent to -Werror in C. # Prevents build failures when upgrading rustc, which may give more warnings. substituteInPlace src/lib.rs \ - --replace "#![deny(warnings)]" "" + --replace-fail "#![deny(warnings)]" "" # build script tries to get version information from git # this fixes the --version output rm build.rs ''; - VERGEN_SEMVER = version; + VERGEN_SEMVER = finalAttrs.version; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Tool for doing record analysis and transformation"; mainProgram = "rq"; homepage = "https://github.com/dflemstr/rq"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ aristid Br1ght0ne figsoda ]; }; -} +}) diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index be52bf837eda..38012ae4f93b 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.36.14"; + version = "8.37.0"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dEs9xMJyy2QdZ4N3E65fjN5EXmQW6KIqWhy+92ac5yg="; + sha256 = "sha256-a5A6tcoMKaA0oRZQpmurQxlIvTdtcih/6rnM3p4awW8="; }; - vendorHash = "sha256-AOebt6kA0WCgEbSySfIPzRp0QnNtwdnPlEFJJSDO978="; + vendorHash = "sha256-jvZ2ZRA/DkjDNnYauS9sJLE8KROS197kSeNVZ363Htk="; subPackages = [ "cmd/rqlite" diff --git a/pkgs/by-name/rq/rquickshare/fix-pnpm-outdated-lockfile.patch b/pkgs/by-name/rq/rquickshare/fix-pnpm-outdated-lockfile.patch new file mode 100644 index 000000000000..5c4ac4f418d6 --- /dev/null +++ b/pkgs/by-name/rq/rquickshare/fix-pnpm-outdated-lockfile.patch @@ -0,0 +1,35 @@ +diff --git a/app/legacy/pnpm-lock.yaml b/app/legacy/pnpm-lock.yaml +index ce6a292..76ba03e 100644 +--- a/app/legacy/pnpm-lock.yaml ++++ b/app/legacy/pnpm-lock.yaml +@@ -12,8 +12,8 @@ importers: + specifier: link:../../core_lib + version: link:../../core_lib + '@tauri-apps/api': +- specifier: 1.5.6 +- version: 1.5.6 ++ specifier: 1.6.0 ++ version: 1.6.0 + pinia: + specifier: ^2.2.1 + version: 2.2.1(typescript@5.6.0-dev.20240811)(vue@3.4.27(typescript@5.6.0-dev.20240811)) +@@ -500,10 +500,6 @@ packages: + peerDependencies: + tailwindcss: '>=3.0.0 || insiders' + +- '@tauri-apps/api@1.5.6': +- resolution: {integrity: sha512-LH5ToovAHnDVe5Qa9f/+jW28I6DeMhos8bNDtBOmmnaDpPmJmYLyHdeDblAWWWYc7KKRDg9/66vMuKyq0WIeFA==} +- engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} +- + '@tauri-apps/api@1.6.0': + resolution: {integrity: sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg==} + engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} +@@ -2707,8 +2703,6 @@ snapshots: + postcss-selector-parser: 6.0.10 + tailwindcss: 3.4.9 + +- '@tauri-apps/api@1.5.6': {} +- + '@tauri-apps/api@1.6.0': {} + + '@tauri-apps/cli-darwin-arm64@1.5.14': diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix index 9a2102a9affb..6f30e1309874 100644 --- a/pkgs/by-name/rq/rquickshare/package.nix +++ b/pkgs/by-name/rq/rquickshare/package.nix @@ -3,6 +3,7 @@ cargo-tauri, cargo-tauri_1, fetchFromGitHub, + applyPatches, glib-networking, libayatana-appindicator, libsoup_2_4, @@ -39,13 +40,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rquickshare" + (app-type-either "" "-legacy"); - version = "0.11.4"; + version = "0.11.5"; - src = fetchFromGitHub { - owner = "Martichou"; - repo = "rquickshare"; - tag = "v${version}"; - hash = "sha256-Gq78vxM9hJ+dAHM3RAKHtkFIsoV0XQN4vNbOO3amvTs="; + src = applyPatches { + src = fetchFromGitHub { + owner = "Martichou"; + repo = "rquickshare"; + tag = "v${version}"; + hash = "sha256-DZdzk0wqKhVa51PgQf8UsAY6EbGKvRIGru71Z8rvrwA="; + }; + patches = [ ./fix-pnpm-outdated-lockfile.patch ]; }; # from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26 @@ -59,43 +63,51 @@ rustPlatform.buildRustPackage rec { inherit pname version src; sourceRoot = "${src.name}/app/${app-type}"; - hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-sDHysaKMdNcbL1szww7/wg0bGHOnEKsKoySZJJCcPik="; + hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-8QRigYNtxirXidFFnTzA6rP0+L64M/iakPqe2lZKegs="; }; useFetchCargoVendor = true; cargoRoot = "app/${app-type}/src-tauri"; buildAndTestSubdir = cargoRoot; - cargoPatches = [ ./remove-duplicate-versions-of-sys-metrics.patch ]; - cargoHash = app-type-either "sha256-wraCzzC7YVCXEXBTd8c1cbtCdBunENpUMQ1vZGwfGMs=" "sha256-TBsHlFwbWWa2LEZdmDyz/9vWiFOXKX39PCsjW6OqEGY="; - - nativeBuildInputs = [ - proper-cargo-tauri.hook - - # Setup pnpm - nodejs - pnpm_9.configHook - - # Make sure we can find our libraries - perl - pkg-config - protobuf - wrapGAppsHook4 + cargoPatches = [ + ./remove-duplicate-versions-of-sys-metrics.patch + ./remove-code-signing-darwin.patch ]; + cargoHash = app-type-either "sha256-XfN+/oC3lttDquLfoyJWBaFfdjW/wyODCIiZZksypLM=" "sha256-4vBHxuKg4P9H0FZYYNUT+AVj4Qvz99q7Bhd7x47UC2w="; + + nativeBuildInputs = + [ + proper-cargo-tauri.hook + + # Setup pnpm + nodejs + pnpm_9.configHook + + # Make sure we can find our libraries + perl + pkg-config + protobuf + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wrapGAppsHook4 + ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - glib-networking - libayatana-appindicator - ] - ++ lib.optionals (app-type == "main") [ - webkitgtk_4_1 - libsoup_3 - ] - ++ lib.optionals (app-type == "legacy") [ - webkitgtk_4_0 - libsoup_2_4 - ]; + ++ lib.optionals stdenv.hostPlatform.isLinux ( + [ + glib-networking + libayatana-appindicator + ] + ++ lib.optionals (app-type == "main") [ + webkitgtk_4_1 + libsoup_3 + ] + ++ lib.optionals (app-type == "legacy") [ + webkitgtk_4_0 + libsoup_2_4 + ] + ); passthru = # Don't set an update script for the legacy version diff --git a/pkgs/by-name/rq/rquickshare/remove-code-signing-darwin.patch b/pkgs/by-name/rq/rquickshare/remove-code-signing-darwin.patch new file mode 100644 index 000000000000..d1f3fa910394 --- /dev/null +++ b/pkgs/by-name/rq/rquickshare/remove-code-signing-darwin.patch @@ -0,0 +1,12 @@ +diff --git a/app/main/src-tauri/tauri.conf.json b/app/main/src-tauri/tauri.conf.json +index 1114b19..c4cc8f4 100644 +--- a/app/main/src-tauri/tauri.conf.json ++++ b/app/main/src-tauri/tauri.conf.json +@@ -23,7 +23,6 @@ + "macOS": { + "frameworks": [], + "exceptionDomain": "", +- "signingIdentity": "-", + "providerShortName": null, + "entitlements": null + }, diff --git a/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch b/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch index af1f423857fd..2de75e9ca237 100644 --- a/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch +++ b/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch @@ -1,9 +1,9 @@ diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock -index 1bba0ae..af24986 100644 +index 14872dc..341fcc8 100644 --- a/app/legacy/src-tauri/Cargo.lock +++ b/app/legacy/src-tauri/Cargo.lock -@@ -4138,7 +4138,7 @@ dependencies = [ - "rand 0.8.5", +@@ -4296,7 +4296,7 @@ dependencies = [ + "rand 0.9.0", "serde", "sha2", - "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)", @@ -11,7 +11,7 @@ index 1bba0ae..af24986 100644 "tokio", "tokio-util", "tracing-subscriber", -@@ -4158,7 +4158,7 @@ dependencies = [ +@@ -4316,7 +4316,7 @@ dependencies = [ "rqs_lib", "serde", "serde_json", @@ -20,10 +20,13 @@ index 1bba0ae..af24986 100644 "tauri", "tauri-build", "tauri-plugin-autostart", -@@ -4759,22 +4759,7 @@ dependencies = [ - [[package]] - name = "sys_metrics" - version = "0.2.7" +@@ -4920,21 +4920,6 @@ dependencies = [ + "libc", + ] + +-[[package]] +-name = "sys_metrics" +-version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484" -dependencies = [ @@ -36,16 +39,11 @@ index 1bba0ae..af24986 100644 - "serde", -] - --[[package]] --name = "sys_metrics" --version = "0.2.7" --source = "git+https://github.com/Martichou/sys_metrics#c0f4ec7b9156d3ab83ee61276984c7fd4e632098" -+source = "git+https://github.com/Martichou/sys_metrics#e5b324a17d1724bd97923a173c3535cc06a44b0c" - dependencies = [ - "core-foundation-sys", - "glob", + [[package]] + name = "sys_metrics" + version = "0.2.7" diff --git a/app/legacy/src-tauri/Cargo.toml b/app/legacy/src-tauri/Cargo.toml -index b971c3d..44abf29 100644 +index fb735b2..cfd1349 100644 --- a/app/legacy/src-tauri/Cargo.toml +++ b/app/legacy/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ notify-rust = "4.10" @@ -54,15 +52,15 @@ index b971c3d..44abf29 100644 serde_json = "1.0" -sys_metrics = "0.2" +sys_metrics = { git = "https://github.com/Martichou/sys_metrics" } - tauri = { version = "1.5", features = ["api-all", "reqwest-native-tls-vendored", "system-tray", "devtools"] } + tauri = { version = "1.8", features = ["api-all", "reqwest-native-tls-vendored", "devtools", "system-tray"] } tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } diff --git a/app/main/src-tauri/Cargo.lock b/app/main/src-tauri/Cargo.lock -index bc4753a..ed4c7e8 100644 +index 5580ef5..4327d4c 100644 --- a/app/main/src-tauri/Cargo.lock +++ b/app/main/src-tauri/Cargo.lock -@@ -4182,7 +4182,7 @@ dependencies = [ - "rand 0.8.5", +@@ -4247,7 +4247,7 @@ dependencies = [ + "rand 0.9.0", "serde", "sha2", - "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)", @@ -70,7 +68,7 @@ index bc4753a..ed4c7e8 100644 "tokio", "tokio-util", "tracing-subscriber", -@@ -4202,7 +4202,7 @@ dependencies = [ +@@ -4267,7 +4267,7 @@ dependencies = [ "rqs_lib", "serde", "serde_json", @@ -79,7 +77,7 @@ index bc4753a..ed4c7e8 100644 "tauri", "tauri-build", "tauri-plugin-autostart", -@@ -4867,21 +4867,6 @@ dependencies = [ +@@ -4932,21 +4932,6 @@ dependencies = [ "syn 2.0.95", ] @@ -102,7 +100,7 @@ index bc4753a..ed4c7e8 100644 name = "sys_metrics" version = "0.2.7" diff --git a/app/main/src-tauri/Cargo.toml b/app/main/src-tauri/Cargo.toml -index 5653700..5120513 100644 +index 8864112..7707922 100644 --- a/app/main/src-tauri/Cargo.toml +++ b/app/main/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ notify-rust = "4.10" diff --git a/pkgs/by-name/rr/rrdtool/package.nix b/pkgs/by-name/rr/rrdtool/package.nix index 1a66700b17d9..1aad60b8ec24 100644 --- a/pkgs/by-name/rr/rrdtool/package.nix +++ b/pkgs/by-name/rr/rrdtool/package.nix @@ -12,7 +12,6 @@ cairo, groff, tcl, - darwin, }: perl.pkgs.toPerlModule ( @@ -49,7 +48,6 @@ perl.pkgs.toPerlModule ( ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tcl - darwin.apple_sdk.frameworks.ApplicationServices ]; postInstall = '' diff --git a/pkgs/by-name/rs/rsnapshot/package.nix b/pkgs/by-name/rs/rsnapshot/package.nix index 3b74c4f0473d..575e0278ce6b 100644 --- a/pkgs/by-name/rs/rsnapshot/package.nix +++ b/pkgs/by-name/rs/rsnapshot/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix index 84704aa15f79..33d0789eaf21 100644 --- a/pkgs/by-name/rs/rspamd/package.nix +++ b/pkgs/by-name/rs/rspamd/package.nix @@ -13,6 +13,7 @@ pkg-config, sqlite, ragel, + fasttext, icu, vectorscan, jemalloc, @@ -23,7 +24,9 @@ xxHash, zstd, libarchive, - withBlas ? true, + # Enabling blas support breaks bayes filter training from dovecot in nixos-mailserver tests + # https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/321 + withBlas ? false, withLuaJIT ? stdenv.hostPlatform.isx86_64, nixosTests, }: @@ -57,6 +60,7 @@ stdenv.mkDerivation rec { pcre sqlite ragel + fasttext icu jemalloc libsodium @@ -80,6 +84,8 @@ stdenv.mkDerivation rec { "-DDBDIR=/var/lib/rspamd" "-DLOGDIR=/var/log/rspamd" "-DLOCAL_CONFDIR=/etc/rspamd" + "-DENABLE_BLAS=${if withBlas then "ON" else "OFF"}" + "-DENABLE_FASTTEXT=ON" "-DENABLE_JEMALLOC=ON" "-DSYSTEM_DOCTEST=ON" "-DSYSTEM_FMT=ON" diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix new file mode 100644 index 000000000000..881e7a97605e --- /dev/null +++ b/pkgs/by-name/rs/rssguard/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kdePackages, + wrapGAppsHook4, +}: + +stdenv.mkDerivation rec { + pname = "rssguard"; + version = "4.8.3"; + + src = fetchFromGitHub { + owner = "martinrotter"; + repo = pname; + tag = version; + sha256 = "sha256-1y3hmAuIOhh1L+x4ZOPy7ixAizVNPtQjxL3mgNWgx9A="; + }; + + buildInputs = [ + kdePackages.qtwebengine + kdePackages.qttools + kdePackages.mpvqt + kdePackages.full + ]; + nativeBuildInputs = [ + cmake + wrapGAppsHook4 + kdePackages.wrapQtAppsHook + ]; + cmakeFlags = with lib; [ + (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"") + ]; + + meta = with lib; { + description = "Simple RSS/Atom feed reader with online synchronization"; + mainProgram = "rssguard"; + longDescription = '' + RSS Guard is a simple, light and easy-to-use RSS/ATOM feed aggregator + developed using Qt framework and with online feed synchronization support + for ownCloud/Nextcloud. + ''; + homepage = "https://github.com/martinrotter/rssguard"; + changelog = "https://github.com/martinrotter/rssguard/releases/tag/${version}"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ + jluttine + tebriel + ]; + }; +} diff --git a/pkgs/by-name/rt/rt-tests/package.nix b/pkgs/by-name/rt/rt-tests/package.nix index 692763c6d74a..c8f430119cc6 100644 --- a/pkgs/by-name/rt/rt-tests/package.nix +++ b/pkgs/by-name/rt/rt-tests/package.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { "prefix=$(out)" "DESTDIR=" "PYLIB=$(out)/${python3.sitePackages}" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; postInstall = '' diff --git a/pkgs/by-name/rt/rtabmap/package.nix b/pkgs/by-name/rt/rtabmap/package.nix index bfa968d43e2e..b30f319eeea8 100644 --- a/pkgs/by-name/rt/rtabmap/package.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, # nativeBuildInputs cmake, @@ -15,6 +16,9 @@ liblapack, xorg, libusb1, + yaml-cpp, + libnabo, + libpointmatcher, eigen, g2o, ceres-solver, @@ -23,6 +27,7 @@ libdc1394, libGL, libGLU, + librealsense, vtkWithQt5, zed-open-capture, hidapi, @@ -33,22 +38,29 @@ stdenv.mkDerivation (finalAttrs: { pname = "rtabmap"; - version = "0.21.4.1"; + version = "0.21.13"; src = fetchFromGitHub { owner = "introlab"; repo = "rtabmap"; - tag = finalAttrs.version; - hash = "sha256-y/p1uFSxVQNXO383DLGCg4eWW7iu1esqpWlyPMF3huk="; + tag = "${finalAttrs.version}-noetic"; + hash = "sha256-W4yjHKb2BprPYkL8rLwLQcZDGgmMZ8279ntR+Eqj7R0="; }; + patches = [ + (fetchpatch { + # Fix the ctor and dtor warning + url = "https://github.com/introlab/rtabmap/pull/1496/commits/84c59a452b40a26edf1ba7ec8798700a2f9c3959.patch"; + hash = "sha256-kto02qcL2dW8Frt81GA+OCldPgCF5bAs/28w9amcf0o="; + }) + ]; + nativeBuildInputs = [ cmake libsForQt5.wrapQtAppsHook pkg-config wrapGAppsHook3 ]; - buildInputs = [ ## Required opencv @@ -58,16 +70,19 @@ stdenv.mkDerivation (finalAttrs: { xorg.libSM xorg.libICE xorg.libXt + ## Optional libusb1 eigen g2o ceres-solver - # libpointmatcher - ABI mismatch + yaml-cpp + libnabo + libpointmatcher octomap freenect libdc1394 - # librealsense - missing includedir + librealsense libsForQt5.qtbase libGL libGLU @@ -76,8 +91,14 @@ stdenv.mkDerivation (finalAttrs: { hidapi ]; - # Disable warnings that are irrelevant to us as packagers - cmakeFlags = [ "-Wno-dev" ]; + # Configure environment variables + NIX_CFLAGS_COMPILE = "-Wno-c++20-extensions -I${vtkWithQt5}/include/vtk"; + + cmakeFlags = [ + (lib.cmakeFeature "VTK_QT_VERSION" "5") + (lib.cmakeFeature "VTK_DIR" "${vtkWithQt5}/lib/cmake/vtk-${lib.versions.majorMinor vtkWithQt5.version}") + (lib.cmakeFeature "CMAKE_INCLUDE_PATH" "${vtkWithQt5}/include/vtk:${pcl}/include/pcl-${lib.versions.majorMinor pcl.version}") + ]; passthru = { updateScript = gitUpdater { }; @@ -90,7 +111,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ marius851000 ]; platforms = with lib.platforms; linux; - # pcl/io/io.h: No such file or directory - broken = true; }; }) diff --git a/pkgs/by-name/rt/rtags/package.nix b/pkgs/by-name/rt/rtags/package.nix new file mode 100644 index 000000000000..026ef45b442b --- /dev/null +++ b/pkgs/by-name/rt/rtags/package.nix @@ -0,0 +1,62 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + cmake, + llvmPackages, + openssl, + emacs, + pkg-config, +}: + +stdenv.mkDerivation rec { + pname = "rtags"; + version = "2.38"; + nativeBuildInputs = [ + cmake + pkg-config + llvmPackages.llvm.dev + ]; + buildInputs = [ + llvmPackages.llvm + llvmPackages.libclang + openssl + emacs + ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]; + + src = fetchFromGitHub { + owner = "andersbakken"; + repo = "rtags"; + rev = "v${version}"; + hash = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c="; + fetchSubmodules = true; + # unicode file names lead to different checksums on HFS+ vs. other + # filesystems because of unicode normalisation + postFetch = '' + rm $out/src/rct/tests/testfile_*.txt + ''; + }; + + # This should be fixed with the next version bump + # https://github.com/Andersbakken/rtags/issues/1411 + patches = [ + (fetchpatch { + name = "define-obsolete-function-alias.patch"; + url = "https://github.com/Andersbakken/rtags/commit/63f18acb21e664fd92fbc19465f0b5df085b5e93.patch"; + sha256 = "sha256-dmEPtnk8Pylmf5479ovHKItRZ+tJuOWuYOQbWB/si/Y="; + }) + ]; + + preConfigure = '' + export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \ + LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" + ''; + + meta = { + description = "C/C++ client-server indexer based on clang"; + homepage = "https://github.com/andersbakken/rtags"; + license = lib.licenses.gpl3; + platforms = with lib.platforms; x86_64 ++ aarch64; + }; +} diff --git a/pkgs/by-name/rt/rtaudio_6/package.nix b/pkgs/by-name/rt/rtaudio_6/package.nix index b57810ba7e15..b1da7ea2825a 100644 --- a/pkgs/by-name/rt/rtaudio_6/package.nix +++ b/pkgs/by-name/rt/rtaudio_6/package.nix @@ -13,7 +13,6 @@ jackSupport ? true, libjack2, coreaudioSupport ? stdenv.hostPlatform.isDarwin, - darwin, validatePkgConfig, }: @@ -45,9 +44,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals jackSupport [ libjack2 - ] - ++ lib.optionals coreaudioSupport [ - darwin.apple_sdk.frameworks.CoreAudio ]; cmakeFlags = [ diff --git a/pkgs/by-name/rt/rtfm/package.nix b/pkgs/by-name/rt/rtfm/package.nix index aa232c8c3ddd..6fd04196ac17 100644 --- a/pkgs/by-name/rt/rtfm/package.nix +++ b/pkgs/by-name/rt/rtfm/package.nix @@ -20,13 +20,13 @@ writeShellScript, }: let - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "hugopl"; repo = "rtfm"; tag = "v${version}"; - hash = "sha256-qWQ2V7o7swbnXGgPOcnZ5Mg/SpjHOYpaD1HL6kgutCs="; + hash = "sha256-0yKldVTZdFV1Tj1MUI7TCqF3Ho/D7NOGR9UuLaLUFdo="; }; gtk-doc = @@ -60,16 +60,13 @@ crystal.buildCrystalPackage { --replace-fail 'doc_source = Path.new(ARGV[0]? || "/usr/share/doc/crystal/api")' 'doc_source = Path.new(ARGV[0]? || "${crystal}/share/doc/crystal/api")' substituteInPlace src/doc2dash/docset_builder.cr \ --replace-fail 'File.copy(original, real_dest)' 'File.copy(original, real_dest); File.chmod(real_dest, 0o600)' - substituteInPlace Makefile \ - --replace-fail 'shards install' 'true' ''; preBuild = '' cd lib/gi-crystal shards build -Dpreview_mt --release --no-debug cd ../.. - mkdir bin/ - cp lib/gi-crystal/bin/gi-crystal bin/ + install -Dm755 lib/gi-crystal/bin/gi-crystal bin/gi-crystal ''; buildTargets = [ "all" ]; @@ -91,6 +88,8 @@ crystal.buildCrystalPackage { glib-compile-schemas $out/share/glib-2.0/schemas ''; + doInstallCheck = false; + passthru = { updateScript = _experimental-update-script-combinators.sequence [ (gitUpdater { rev-prefix = "v"; }) diff --git a/pkgs/by-name/rt/rtfm/shards.nix b/pkgs/by-name/rt/rtfm/shards.nix index 9fbf14f6e297..e49241fe3387 100644 --- a/pkgs/by-name/rt/rtfm/shards.nix +++ b/pkgs/by-name/rt/rtfm/shards.nix @@ -11,8 +11,8 @@ }; gi-crystal = { url = "https://github.com/hugopl/gi-crystal.git"; - rev = "v0.24.0"; - sha256 = "0x356xn35008l573qhyl1sdddc9cc5i3bsa4c7865kgq9521ifyh"; + rev = "69388976418f5cc5ebc0cb7fb6aae5efd345ce8d"; + sha256 = "15ayic628ma1h7b56bx11y8yl361qrpxlqngy0jkv793v7vpwd9b"; }; gtk4 = { url = "https://github.com/hugopl/gtk4.cr.git"; diff --git a/pkgs/by-name/rt/rtg-tools/package.nix b/pkgs/by-name/rt/rtg-tools/package.nix index 3fe57e0e80ae..d61c7f288415 100644 --- a/pkgs/by-name/rt/rtg-tools/package.nix +++ b/pkgs/by-name/rt/rtg-tools/package.nix @@ -5,6 +5,9 @@ jdk, ant, git, + coreutils, + hostname, + gawk, unzip, }: @@ -44,11 +47,19 @@ stdenv.mkDerivation rec { # Use a location outside nix (must be writable) substituteInPlace installer/rtg \ --replace-fail '$THIS_DIR/rtg.cfg' '$HOME/.config/rtg-tools/rtg.cfg' \ - --replace-fail 'RTG_JAVA="java"' 'RTG_JAVA="${jdk}/lib/openjdk/bin/java"' + --replace-fail 'RTG_JAVA="java"' 'RTG_JAVA="${jdk}/lib/opendk/bin/java"' \ + --replace-fail uname ${lib.getExe' coreutils "uname"} \ + --replace-fail awk ${lib.getExe gawk} \ + --replace-fail "hostname -s" "${lib.getExe hostname} -s" + sed -i '/USER_JAVA_OPTS=$RTG_JAVA_OPTS/a mkdir -p $HOME/.config/rtg-tools' installer/rtg ''; + checkPhase = '' + ant runalltests + ''; + meta = with lib; { homepage = "https://github.com/RealTimeGenomics/rtg-tools"; description = "Useful utilities for dealing with VCF files and sequence data, especially vcfeval"; diff --git a/pkgs/by-name/rt/rtrtr/package.nix b/pkgs/by-name/rt/rtrtr/package.nix new file mode 100644 index 000000000000..aa0cf55f8739 --- /dev/null +++ b/pkgs/by-name/rt/rtrtr/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "rtrtr"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "NLnetLabs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-1TmzC/d/odfYdo1CiCsFW3U7OCpTF4Gkw2w4c2yaxxw="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-SeQ2zRBbETabAhOItu3C6PUjL7vUsVDzWGbYcUIslF4="; + nativeBuildInputs = [ pkg-config ]; + + buildNoDefaultFeatures = true; + + meta = with lib; { + description = "RPKI data proxy"; + longDescription = '' + TRTR is an RPKI data proxy, designed to collect Validated ROA Payloads + from one or more sources in multiple formats and dispatch it onwards. It + provides the means to implement multiple distribution architectures for RPKI + such as centralised RPKI validators that dispatch data to local caching RTR + servers. RTRTR can read RPKI data from multiple RPKI Relying Party packages via + RTR and JSON and, in turn, provide an RTR service for routers to connect to. + ''; + homepage = "https://github.com/NLnetLabs/rtrtr"; + changelog = "https://github.com/NLnetLabs/rtrtr/blob/v${version}/Changelog.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ steamwalker ]; + mainProgram = "rtrtr"; + }; +} diff --git a/pkgs/by-name/rt/rtz/package.nix b/pkgs/by-name/rt/rtz/package.nix index 51ed10eababb..3dd5f8d13335 100644 --- a/pkgs/by-name/rt/rtz/package.nix +++ b/pkgs/by-name/rt/rtz/package.nix @@ -6,8 +6,6 @@ bzip2, openssl, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,16 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + zstd + ]; buildFeatures = [ "web" ]; diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix index 684bb97a1709..f64817adec84 100644 --- a/pkgs/by-name/ru/rubberband/package.nix +++ b/pkgs/by-name/ru/rubberband/package.nix @@ -12,7 +12,6 @@ ladspaH, meson, ninja, - darwin, }: stdenv.mkDerivation rec { @@ -30,23 +29,14 @@ stdenv.mkDerivation rec { ninja jdk_headless ]; - buildInputs = - [ - libsamplerate - libsndfile - fftw - vamp-plugin-sdk - ladspaH - lv2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreGraphics - CoreVideo - ] - ); + buildInputs = [ + libsamplerate + libsndfile + fftw + vamp-plugin-sdk + ladspaH + lv2 + ]; makeFlags = [ "AR:=$(AR)" ]; # TODO: package boost-test, so we can run the test suite. (Currently it fails diff --git a/pkgs/by-name/ru/rubiks/package.nix b/pkgs/by-name/ru/rubiks/package.nix index 7d158c95aead..965265c56e02 100644 --- a/pkgs/by-name/ru/rubiks/package.nix +++ b/pkgs/by-name/ru/rubiks/package.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { gpl2 # Michael Reid's and Eric Dietz software mit # Dik T. Winter's software ]; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/rubyfmt/0002-remove-dependency-on-git.patch b/pkgs/by-name/ru/rubyfmt/0002-remove-dependency-on-git.patch similarity index 100% rename from pkgs/development/tools/rubyfmt/0002-remove-dependency-on-git.patch rename to pkgs/by-name/ru/rubyfmt/0002-remove-dependency-on-git.patch diff --git a/pkgs/development/tools/rubyfmt/0003-ignore-warnings.patch b/pkgs/by-name/ru/rubyfmt/0003-ignore-warnings.patch similarity index 100% rename from pkgs/development/tools/rubyfmt/0003-ignore-warnings.patch rename to pkgs/by-name/ru/rubyfmt/0003-ignore-warnings.patch diff --git a/pkgs/by-name/ru/rubyfmt/package.nix b/pkgs/by-name/ru/rubyfmt/package.nix new file mode 100644 index 000000000000..3c395a8608bb --- /dev/null +++ b/pkgs/by-name/ru/rubyfmt/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + autoconf, + automake, + bison, + ruby, + zlib, + readline, + libiconv, + libunwind, + libxcrypt, + libyaml, + rust-jemalloc-sys-unprefixed, +}: + +rustPlatform.buildRustPackage rec { + pname = "rubyfmt"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "fables-tales"; + repo = "rubyfmt"; + rev = "v${version}"; + hash = "sha256-IIHPU6iwFwQ5cOAtOULpMSjexFtTelSd/LGLuazdmUo="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoconf + automake + bison + ruby + ]; + + buildInputs = + [ + zlib + libxcrypt + libyaml + rust-jemalloc-sys-unprefixed + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + readline + libiconv + libunwind + ]; + + preConfigure = '' + pushd librubyfmt/ruby_checkout + autoreconf --install --force --verbose + ./configure + popd + ''; + + cargoPatches = [ + # Avoid checking whether ruby gitsubmodule is up-to-date. + ./0002-remove-dependency-on-git.patch + # Avoid failing on unused variable warnings. + ./0003-ignore-warnings.patch + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-8LgAHznxU30bbK8ivNamVD3Yi2pljgpqJg2WC0nxftk="; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec"; + + preFixup = '' + mv $out/bin/rubyfmt{-main,} + ''; + + meta = { + description = "Ruby autoformatter"; + homepage = "https://github.com/fables-tales/rubyfmt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bobvanderlinden ]; + broken = stdenv.hostPlatform.isDarwin; + mainProgram = "rubyfmt"; + }; +} diff --git a/pkgs/by-name/ru/rucredstash/package.nix b/pkgs/by-name/ru/rucredstash/package.nix new file mode 100644 index 000000000000..3a352a29fc08 --- /dev/null +++ b/pkgs/by-name/ru/rucredstash/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "rucredstash"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "psibi"; + repo = "rucredstash"; + rev = "v${version}"; + hash = "sha256-trupBiinULzD8TAy3eh1MYXhQilO08xu2a4yN7wwhwk="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-QylZkqE8my2ldCjtg3++6TTDm0om3SVp0jwYUZ9qVes="; + + # Disable tests since it requires network access and relies on the + # presence of certain AWS infrastructure + doCheck = false; + + meta = with lib; { + description = "Utility for managing credentials securely in AWS cloud"; + homepage = "https://github.com/psibi/rucredstash"; + license = licenses.mit; + maintainers = with maintainers; [ psibi ]; + mainProgram = "rucredstash"; + }; +} diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix deleted file mode 100644 index 7b6bdc411aa8..000000000000 --- a/pkgs/by-name/ru/ruff-lsp/package.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - python3Packages, - fetchFromGitHub, - - # tests - versionCheckHook, - - # passthru - nix-update-script, -}: - -python3Packages.buildPythonApplication rec { - pname = "ruff-lsp"; - version = "0.0.62"; - pyproject = true; - - src = fetchFromGitHub { - owner = "astral-sh"; - repo = "ruff-lsp"; - tag = "v${version}"; - hash = "sha256-aYhNvT4rcaEzuqwql7TpFkCoyH77uSG7r6uY5aIzhrk="; - }; - - build-system = with python3Packages; [ hatchling ]; - - dependencies = with python3Packages; [ - lsprotocol - packaging - pygls - ruff - typing-extensions - ]; - - nativeCheckInputs = with python3Packages; [ - pytest-asyncio - pytestCheckHook - python-lsp-jsonrpc - ruff - versionCheckHook - ]; - versionCheckProgramArg = [ "--version" ]; - - makeWrapperArgs = [ - # prefer ruff from user's PATH, that's usually desired behavior - "--suffix PATH : ${lib.makeBinPath (with python3Packages; [ ruff ])}" - # Unset ambient PYTHONPATH in the wrapper, so ruff-lsp only ever runs with - # its own, isolated set of dependencies. This works because the correct - # PYTHONPATH is set in the Python script, which runs after the wrapper. - "--unset PYTHONPATH" - ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - changelog = "https://github.com/astral-sh/ruff-lsp/releases/tag/v${version}"; - description = "Language Server Protocol implementation for Ruff"; - homepage = "https://github.com/astral-sh/ruff-lsp"; - license = lib.licenses.mit; - mainProgram = "ruff-lsp"; - maintainers = with lib.maintainers; [ - figsoda - kalekseev - ]; - }; -} diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index a4ebffa0b28d..617c53f2f3b1 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -10,24 +10,25 @@ versionCheckHook, # passthru - ruff-lsp, nixosTests, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.11.3"; + version = "0.11.10"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-5kUoriAT9PqcEYK3jMm58jBcWwsVA1rU9juivE1jnvI="; + hash = "sha256-8psRFBhOzcFYYOU1aLf2tQwSZeWyn3TjUtfMR8HJ4FE="; }; + cargoBuildFlags = [ "--package=ruff" ]; + useFetchCargoVendor = true; - cargoHash = "sha256-e68m1wep7oR2dNQSSPGXuSVLlO60YT5ccD4f5ryiGtU="; + cargoHash = "sha256-KwTqm345bRwn5PXn/bTakiBNNjJCIstkXGpqtyCiK4k="; nativeBuildInputs = [ installShellFiles ]; @@ -55,28 +56,32 @@ rustPlatform.buildRustPackage (finalAttrs: { # This causes errors like "error: linker `cc` not found" on static builds doCheck = !stdenv.hostPlatform.isStatic; - # Failing on darwin for an unclear reason, but probably due to sandbox. - # According to the maintainers, those tests are from an experimental crate that isn't actually - # used by ruff currently and can thus be safely skipped. - cargoTestFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # Exclude tests from `ty`-related crates, run everything else. + # Ordinarily we would run all the tests, but there is significant overlap with the `ty` package in nixpkgs, + # which ruff shares a monorepo with. + # As such, we leave running `ty` tests to the `ty` package, and concentrate on everything else. + cargoTestFlags = [ "--workspace" - "--exclude=red_knot" + "--exclude=ty" + "--exclude=ty_ide" + "--exclude=ty_project" + "--exclude=ty_python_semantic" + "--exclude=ty_server" + "--exclude=ty_test" + "--exclude=ty_vendored" + "--exclude=ty_wasm" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { - tests = - { - inherit ruff-lsp; - } - // lib.optionalAttrs stdenv.hostPlatform.isLinux { - nixos-test-driver-busybox = nixosTests.nixos-test-driver.busybox; - }; + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { + nixos-test-driver-busybox = nixosTests.nixos-test-driver.busybox; + }; updateScript = nix-update-script { }; }; @@ -87,6 +92,7 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mit; mainProgram = "ruff"; maintainers = with lib.maintainers; [ + bengsparks figsoda GaetanLepage ]; diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 7330bb888093..70276d790f80 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -7,7 +7,6 @@ jre_minimal, pkg-config, wrapGAppsHook3, - darwin, alsa-lib, gtk3, openssl, @@ -23,17 +22,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0-nightly-2025-04-03"; + version = "0-nightly-2025-05-11"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0-" finalAttrs.version; - hash = "sha256-qhHX+ZnVZOsyzapbvTl/86LM9/GUd+/IkRdVXkmiNT4="; + hash = "sha256-m/4e15znssmDASvuLu7BpkhKLZmw7TZ2nXB0bAPrN+4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VDVm6CRq1x2ZZCgz96pvtCwwhq1igWYF3/55ECrwPxg="; + cargoHash = "sha256-JtapILlrDbTFBa763h04lMMP2xQxW0vOpAfyIlHPjeI="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = @@ -56,16 +55,14 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals stdenvNoCC.hostPlatform.isLinux [ - alsa-lib - gtk3 - openssl - wayland - vulkan-loader - udev - ] - ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ + alsa-lib + gtk3 + openssl + wayland + vulkan-loader + udev + ]; postInstall = '' diff --git a/pkgs/by-name/ru/runc/package.nix b/pkgs/by-name/ru/runc/package.nix index fa8da1fb252c..e478f91e80c4 100644 --- a/pkgs/by-name/ru/runc/package.nix +++ b/pkgs/by-name/ru/runc/package.nix @@ -68,7 +68,8 @@ buildGoModule rec { homepage = "https://github.com/opencontainers/runc"; description = "CLI tool for spawning and running containers according to the OCI specification"; license = licenses.asl20; - maintainers = with maintainers; [ offline ] ++ teams.podman.members; + maintainers = with maintainers; [ offline ]; + teams = [ teams.podman ]; platforms = platforms.linux; mainProgram = "runc"; }; diff --git a/pkgs/by-name/ru/rundeck-cli/package.nix b/pkgs/by-name/ru/rundeck-cli/package.nix new file mode 100644 index 000000000000..2bfb535e08a9 --- /dev/null +++ b/pkgs/by-name/ru/rundeck-cli/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jdk11, + unzip, + versionCheckHook, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rundeck-cli"; + version = "2.0.8"; + + src = fetchurl { + url = "https://github.com/rundeck/rundeck-cli/releases/download/v${finalAttrs.version}/rundeck-cli-${finalAttrs.version}-all.jar"; + hash = "sha256-mpy4oS7zCUdt4Q+KQPrGGbw6Gzmh1Msygl+NXDmFhDw="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk11 ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/rundeck-cli + cp $src $out/share/rundeck-cli/rundeck-cli.jar + + mkdir -p $out/bin + makeWrapper ${lib.getExe jdk11} $out/bin/rd \ + --add-flags "-jar $out/share/rundeck-cli/rundeck-cli.jar" + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/rd"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "The official CLI tool for Rundeck"; + longDescription = '' + The rd command provides command line access to the Rundeck HTTP API, + allowing you to access and control your Rundeck server from the + command line or shell scripts. + ''; + homepage = "https://github.com/rundeck/rundeck-cli"; + changelog = "https://github.com/rundeck/rundeck-cli/blob/v${finalAttrs.version}/docs/changes.md"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ liberodark ]; + mainProgram = "rd"; + }; +}) diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix index 3dd0074c7a19..93a77617a353 100644 --- a/pkgs/by-name/ru/rundeck/package.nix +++ b/pkgs/by-name/ru/rundeck/package.nix @@ -7,15 +7,16 @@ which, coreutils, openssh, + writeScript, }: stdenv.mkDerivation (finalAttrs: { pname = "rundeck"; - version = "5.9.0-20250205"; + version = "5.12.0-20250512"; src = fetchurl { url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167"; - hash = "sha256-3FDZJMw/ix54mSrMZ56CxibTjnI+6NxmjmKn59TAWtI="; + hash = "sha256-LsKxMj+XCKTAMC3aIRnJcJkc2jytfTfu/gi0omGkMEk="; }; nativeBuildInputs = [ makeWrapper ]; @@ -43,6 +44,22 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = writeScript "update-rundeck" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl jq + set -eu -o pipefail + + latest_tag=$(curl -s "https://api.github.com/repos/rundeck/rundeck/tags" | jq -r '.[0].name') + version=$(echo "$latest_tag" | sed -E 's/^v//') + full_version="$version-$(date +"%Y%m%d")" + + if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$full_version" ]]; then + download_url="https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-$full_version.war/artifacts/rundeck-$full_version.war/download?distro_version_id=167" + hash=$(curl -L "$download_url" | nix-hash --flat --type sha256 --base32 - | nix hash to-sri --type sha256) + update-source-version "$UPDATE_NIX_ATTR_PATH" "$full_version" "$hash" + fi + ''; + meta = { description = "Job scheduler and runbook automation"; longDescription = '' @@ -55,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.liberodark ]; + maintainers = with lib.maintainers; [ liberodark ]; mainProgram = "rundeck"; }; }) diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix index 35316fdc68a6..750b5a897dd9 100644 --- a/pkgs/by-name/ru/rune-languageserver/package.nix +++ b/pkgs/by-name/ru/rune-languageserver/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-YviRACndc4r4ul72ZF3I/R/nEsIoML2Ek2xqUUE3FDQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - env = { RUNE_VERSION = version; }; diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix index 8f962d69c6f5..61915b6e9801 100644 --- a/pkgs/by-name/ru/rune/package.nix +++ b/pkgs/by-name/ru/rune/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,11 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-SgfgoMqr2Cc7+qhf9Ejl4Ect1JR9RqI9I0b+PrdvdOs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - env = { RUNE_VERSION = version; }; diff --git a/pkgs/by-name/ru/runiq/package.nix b/pkgs/by-name/ru/runiq/package.nix index 198d3041a849..85cd0995f1f5 100644 --- a/pkgs/by-name/ru/runiq/package.nix +++ b/pkgs/by-name/ru/runiq/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Efficient way to filter duplicate lines from input, à la uniq"; mainProgram = "runiq"; diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix index 9e8a971f81a1..d3ac271a2a62 100644 --- a/pkgs/by-name/ru/runit/package.nix +++ b/pkgs/by-name/ru/runit/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, # Build runit-init as a static binary static ? false, @@ -30,12 +29,10 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = - lib.optionals static [ - stdenv.cc.libc - stdenv.cc.libc.static - ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp; + buildInputs = lib.optionals static [ + stdenv.cc.libc + stdenv.cc.libc.static + ]; postPatch = '' diff --git a/pkgs/by-name/ru/runmd/package.nix b/pkgs/by-name/ru/runmd/package.nix new file mode 100644 index 000000000000..3e67dc4d0fb7 --- /dev/null +++ b/pkgs/by-name/ru/runmd/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage (finalAttrs: { + pname = "runmd"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "broofa"; + repo = "runmd"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NaHBoRp6VuQwobpew7b1us8t2vbVPR4OLe3p3suykOw="; + }; + + npmDepsHash = "sha256-0djcoEq1O6zubD8OTFNE0BrOebSiw4JAXxa6flbHLb0="; + + dontNpmBuild = true; + + meta = { + description = "Executable markdown files"; + homepage = "https://github.com/broofa/runmd"; + changelog = "https://github.com/broofa/runmd/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "runmd"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix index 464cf16ef22d..63f415afc738 100644 --- a/pkgs/by-name/ru/runme/package.nix +++ b/pkgs/by-name/ru/runme/package.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "runme"; - version = "3.12.6"; + version = "3.13.2"; src = fetchFromGitHub { - owner = "stateful"; + owner = "runmedev"; repo = "runme"; rev = "v${version}"; - hash = "sha256-iLN+NXJf0qXllOdKygSRSZ6rxLLJj35YaCAbICh2UJo="; + hash = "sha256-3+Pi6wN5F6RJ+pUSU8bSXlqKKPEXgv7eCu8PPNSXw2s="; }; - vendorHash = "sha256-UNeyzWrTZscF3DsItpnFBK8MZ2j2tmRBFqr6cv89YrU="; + vendorHash = "sha256-9D3vMJCDGw3ohaShIcpAk1kAzRIRFhJtANp//YnS3A8="; nativeBuildInputs = [ installShellFiles @@ -40,13 +40,13 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/stateful/runme/v3/internal/version.BuildDate=1970-01-01T00:00:00Z" - "-X=github.com/stateful/runme/v3/internal/version.BuildVersion=${version}" - "-X=github.com/stateful/runme/v3/internal/version.Commit=${src.rev}" + "-X=github.com/runmedev/runme/v3/internal/version.BuildDate=1970-01-01T00:00:00Z" + "-X=github.com/runmedev/runme/v3/internal/version.BuildVersion=${version}" + "-X=github.com/runmedev/runme/v3/internal/version.Commit=${src.rev}" ]; # checkFlags = [ - # "-ldflags=-X=github.com/stateful/runme/v3/internal/version.BuildVersion=${version}" + # "-ldflags=-X=github.com/runmedev/runme/v3/internal/version.BuildVersion=${version}" # ]; # tests fail to access /etc/bashrc on darwin @@ -74,7 +74,7 @@ buildGoModule rec { description = "Execute commands inside your runbooks, docs, and READMEs"; mainProgram = "runme"; homepage = "https://runme.dev"; - changelog = "https://github.com/stateful/runme/releases/tag/v${version}"; + changelog = "https://github.com/runmedev/runme/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/by-name/ru/rure/Cargo.lock b/pkgs/by-name/ru/rure/Cargo.lock index 9984478e480f..33b7e44c2fa7 100644 --- a/pkgs/by-name/ru/rure/Cargo.lock +++ b/pkgs/by-name/ru/rure/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "memchr" @@ -25,9 +25,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "regex" -version = "1.10.5" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -48,9 +48,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rure" diff --git a/pkgs/by-name/ru/rure/package.nix b/pkgs/by-name/ru/rure/package.nix index 58cce26b19ea..c812d587fc76 100644 --- a/pkgs/by-name/ru/rure/package.nix +++ b/pkgs/by-name/ru/rure/package.nix @@ -4,6 +4,7 @@ rustPlatform, fetchCrate, fixDarwinDylibNames, + haskellPackages, }: let @@ -36,7 +37,10 @@ rustPlatform.buildRustPackage { fixDarwinDylibNames ]; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests.haskell-bindings = haskellPackages.regex-rure; + }; meta = { description = "C API for Rust's regular expression library"; diff --git a/pkgs/by-name/ru/rure/pin.json b/pkgs/by-name/ru/rure/pin.json index 9825f6e29ab9..528371275bfc 100644 --- a/pkgs/by-name/ru/rure/pin.json +++ b/pkgs/by-name/ru/rure/pin.json @@ -1,5 +1,5 @@ { "pname": "rure", "version": "0.2.2", - "hash": "sha256-BuTFOTmWrtGXNl5X0Nx+b7XdKnMN5XdowOy5rNBKTFg=" + "hash": "sha256:0n2c9b8arfgcq1l7gr8dfcmdvdbggvfd0msy6sbx3bln74wwbr06" } diff --git a/pkgs/by-name/ru/rure/update.sh b/pkgs/by-name/ru/rure/update.sh index d9a31cf68a80..4ee38a3d57b5 100755 --- a/pkgs/by-name/ru/rure/update.sh +++ b/pkgs/by-name/ru/rure/update.sh @@ -27,7 +27,7 @@ cat > pin.json < pubspec.lock.json + # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.9/flutter/pubspec.lock | yq > pubspec.lock.json pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow="; desktop_multi_window = "sha256-NOe0jMcH02c0TDTtv62OMTR/qDPnRQrRe73vXDuEq8Q="; dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8="; - flutter_gpu_texture_renderer = "sha256-6m34FB9Zi4wWbpQQ7uwtMnjUBvdCQnqlkHtWcZddtqU="; + flutter_gpu_texture_renderer = "sha256-EZa1FOMbcwdVs/m0vsUvlHv+MifPby4I97ZFe1bqmwQ="; window_manager = "sha256-40mwj4D8W2xW8C7RshTjOhelOiLPM7uU9rsF4NvQn8c="; window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM="; texture_rgba_renderer = "sha256-V/bmT/5x+Bt7kdjLTkgkoXdBcFVXxPyp9kIUhf+Rnt4="; @@ -100,7 +101,7 @@ flutter.buildFlutterApplication rec { src patches ; - hash = "sha256-uuoyEGmGkpPFeHDUX3dLT/VWhBRWum5CcQ7bGq+z/8w="; + hash = "sha256-9DjfGfTs8/J9XPZmWXCibyRib1/abnWzznQn6A5Tw2I="; }; dontCargoBuild = true; @@ -152,8 +153,6 @@ flutter.buildFlutterApplication rec { patches = [ ./make-build-reproducible.patch - # Multiple version of core-foundation-sys will make fetchCargoVendor unhappy. Keep one of it. - ./update-cargo-lock.patch ]; prepareBuildRunner = '' @@ -205,6 +204,10 @@ flutter.buildFlutterApplication rec { cp ../res/scalable.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg ''; + extraWrapProgramArgs = '' + --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]} + ''; + desktopItems = [ (makeDesktopItem { name = "rustdesk"; @@ -246,7 +249,7 @@ flutter.buildFlutterApplication rec { homepage = "https://rustdesk.com"; changelog = "https://github.com/rustdesk/rustdesk/releases/${version}"; license = lib.licenses.agpl3Only; - maintainers = lib.teams.helsinki-systems.members; + teams = [ lib.teams.helsinki-systems ]; mainProgram = "rustdesk"; platforms = lib.platforms.linux; # should work on darwin as well but I have no machine to test with }; diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json index d3678c9dea0e..ac6c4d9d8573 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json +++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json @@ -653,8 +653,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "2ded7f146437a761ffe6981e2f742038f85ca68d", - "resolved-ref": "2ded7f146437a761ffe6981e2f742038f85ca68d", + "ref": "08a471bb8ceccdd50483c81cdfa8b81b07b14b87", + "resolved-ref": "08a471bb8ceccdd50483c81cdfa8b81b07b14b87", "url": "https://github.com/rustdesk-org/flutter_gpu_texture_renderer" }, "source": "git", diff --git a/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch b/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch deleted file mode 100644 index d78e8e76ac3e..000000000000 --- a/pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e8ed6c42e..3e90da8fc 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1178,7 +1178,7 @@ name = "core-foundation" - version = "0.9.3" - source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" - dependencies = [ -- "core-foundation-sys 0.8.6 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", -+ "core-foundation-sys", - "libc", - ] - -@@ -1188,7 +1188,7 @@ version = "0.9.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" - dependencies = [ -- "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys", - "libc", - ] - -@@ -1198,14 +1198,6 @@ version = "0.8.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - --[[package]] --name = "core-foundation-sys" --version = "0.8.6" --source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" --dependencies = [ -- "objc2-encode 2.0.0-pre.2", --] -- - [[package]] - name = "core-graphics" - version = "0.22.3" --- -2.47.2 - diff --git a/pkgs/by-name/ru/rustdesk-server/Cargo.lock b/pkgs/by-name/ru/rustdesk-server/Cargo.lock deleted file mode 100644 index a87da66a2922..000000000000 --- a/pkgs/by-name/ru/rustdesk-server/Cargo.lock +++ /dev/null @@ -1,3861 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[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 = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -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 = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "async-compression" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-speed-limit" -version = "0.3.1" -source = "git+https://github.com/open-trade/async-speed-limit#f89f702ae01d4016429543d2f0dda1086157e420" -dependencies = [ - "futures-core", - "futures-io", - "futures-timer", - "pin-project-lite", -] - -[[package]] -name = "async-trait" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 1.0.93", -] - -[[package]] -name = "atoi" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f1e8a972137fad81e2a1a60b86ff17ce0338f8017264e45a9723d0083c39a1" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "headers", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower", - "tower-http", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da31c0ed7b4690e2c78fe4b880d21cd7db04a346ebc658b4270251b695437f17" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", -] - -[[package]] -name = "backtrace" -version = "0.3.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bcrypt" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e7c93a3fb23b2fdde989b2c9ec4dd153063ec81f408507f84c090cd91c6641" -dependencies = [ - "base64 0.13.0", - "blowfish", - "getrandom", - "zeroize", -] - -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "clap", - "env_logger 0.9.0", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2 1.0.93", - "quote 1.0.38", - "regex", - "rustc-hash", - "shlex", - "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.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" - -[[package]] -name = "block-buffer" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blowfish" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" -dependencies = [ - "byteorder", - "cipher", -] - -[[package]] -name = "bumpalo" -version = "3.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" -dependencies = [ - "serde", -] - -[[package]] -name = "cc" -version = "1.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom 7.1.1", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "config" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" -dependencies = [ - "lazy_static", - "nom 5.1.2", - "serde", -] - -[[package]] -name = "confy" -version = "0.4.0-2" -source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479" -dependencies = [ - "directories-next", - "serde", - "thiserror", - "toml 0.5.9", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "cpufeatures" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" -dependencies = [ - "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -dependencies = [ - "cfg-if", - "lazy_static", -] - -[[package]] -name = "crypto-common" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "deadpool" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef82259c587bceda08349f28ff00f69ae4c897898f254140af6021eb218e8232" -dependencies = [ - "async-trait", - "config", - "num_cpus", - "serde", - "tokio", -] - -[[package]] -name = "default_net" -version = "0.1.0" -source = "git+https://github.com/rustdesk-org/default_net#78f8f70cd85151a3a2c4a3230d80d5272703c02e" -dependencies = [ - "anyhow", - "regex", - "winapi", -] - -[[package]] -name = "digest" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "directories-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dlopen" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937" -dependencies = [ - "dlopen_derive", - "lazy_static", - "libc", - "winapi", -] - -[[package]] -name = "dlopen_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581" -dependencies = [ - "libc", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "dlv-list" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" - -[[package]] -name = "dns-lookup" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ecafc952c4528d9b51a458d1a8904b81783feff9fde08ab6ed2545ff396872" -dependencies = [ - "cfg-if", - "libc", - "socket2 0.4.4", - "winapi", -] - -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - -[[package]] -name = "ed25519" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d916019f70ae3a1faa1195685e290287f39207d38e6dfee727197cffcc002214" -dependencies = [ - "signature", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_logger" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "event-listener" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" - -[[package]] -name = "fastrand" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -dependencies = [ - "instant", -] - -[[package]] -name = "filetime" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "winapi", -] - -[[package]] -name = "flate2" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "flexi_logger" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969940c39bc718475391e53a3a59b0157e64929c80cf83ad5dde5f770ecdc423" -dependencies = [ - "ansi_term", - "atty", - "chrono", - "crossbeam", - "glob", - "lazy_static", - "log", - "regex", - "rustversion", - "thiserror", - "time", -] - -[[package]] -name = "flexi_logger" -version = "0.27.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469e584c031833564840fb0cdbce99bdfe946fd45480a188545e73a76f45461c" -dependencies = [ - "chrono", - "crossbeam-channel", - "crossbeam-queue", - "glob", - "is-terminal", - "lazy_static", - "log", - "nu-ansi-term", - "regex", - "thiserror", -] - -[[package]] -name = "flume" -version = "0.10.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843c03199d0c0ca54bc1ea90ac0d507274c28abcc4f691ae8b4eaa375087c76a" -dependencies = [ - "futures-core", - "futures-sink", - "pin-project", - "spin 0.9.3", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" - -[[package]] -name = "futures-executor" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62007592ac46aa7c2b6416f7deb9a8a8f63a01e0f1d6e1787d5630170db2b63e" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot 0.11.2", -] - -[[package]] -name = "futures-io" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" - -[[package]] -name = "futures-macro" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 1.0.93", -] - -[[package]] -name = "futures-sink" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" - -[[package]] -name = "futures-task" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" - -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[package]] -name = "futures-util" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.7.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - -[[package]] -name = "hashbrown" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" - -[[package]] -name = "hashlink" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086" -dependencies = [ - "hashbrown 0.12.1", -] - -[[package]] -name = "hbb_common" -version = "0.1.0" -dependencies = [ - "anyhow", - "backtrace", - "base64 0.22.1", - "bytes", - "chrono", - "confy", - "default_net", - "directories-next", - "dirs-next", - "dlopen", - "env_logger 0.10.2", - "filetime", - "flexi_logger 0.27.4", - "futures", - "futures-util", - "httparse", - "lazy_static", - "libc", - "log", - "mac_address", - "machine-uid 0.3.0", - "osascript", - "protobuf", - "protobuf-codegen", - "rand", - "regex", - "rustls-pki-types", - "rustls-platform-verifier", - "serde", - "serde_derive", - "serde_json", - "sha2", - "socket2 0.3.19", - "sodiumoxide", - "sysinfo", - "thiserror", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.26.1", - "tokio-socks 0.5.2-1", - "tokio-util", - "toml 0.7.8", - "url", - "uuid", - "winapi", - "zstd", -] - -[[package]] -name = "hbbs" -version = "1.1.14" -dependencies = [ - "async-speed-limit", - "async-trait", - "axum", - "base64 0.13.0", - "bcrypt", - "chrono", - "clap", - "deadpool", - "dns-lookup", - "flexi_logger 0.22.3", - "hbb_common", - "headers", - "http", - "ipnetwork", - "jsonwebtoken", - "lazy_static", - "local-ip-address", - "mac_address", - "machine-uid 0.2.0", - "minreq", - "once_cell", - "ping", - "regex", - "reqwest", - "rust-ini", - "serde", - "serde_derive", - "serde_json", - "sodiumoxide", - "sqlx", - "tokio-tungstenite", - "tower-http", - "tungstenite", - "uuid", - "whoami", -] - -[[package]] -name = "headers" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" -dependencies = [ - "base64 0.13.0", - "bitflags 1.3.2", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha-1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - -[[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - -[[package]] -name = "httparse" -version = "1.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.5.8", - "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 0.21.12", - "tokio", - "tokio-rustls 0.24.1", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" -dependencies = [ - "autocfg", - "hashbrown 0.11.2", -] - -[[package]] -name = "indexmap" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" -dependencies = [ - "equivalent", - "hashbrown 0.15.2", -] - -[[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" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" - -[[package]] -name = "ipnetwork" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" -dependencies = [ - "serde", -] - -[[package]] -name = "is-terminal" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" -dependencies = [ - "hermit-abi 0.4.0", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "itertools" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "jsonwebtoken" -version = "8.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9051c17f81bae79440afa041b3a278e1de71bfb96d32454b477fd4703ccb6f" -dependencies = [ - "base64 0.13.0", - "pem", - "ring 0.16.20", - "serde", - "serde_json", - "simple_asn1", -] - -[[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 = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags 1.3.2", - "cfg-if", - "ryu", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.169" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" - -[[package]] -name = "libloading" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libsodium-sys" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b779387cd56adfbc02ea4a668e704f729be8d6a6abd2c27ca5ee537849a92fd" -dependencies = [ - "cc", - "libc", - "pkg-config", - "walkdir", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "local-ip-address" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2815836665de176ba66deaa449ada98fdf208d84730d1a84a22cbeed6151a6fa" -dependencies = [ - "libc", - "neli", - "thiserror", - "windows-sys 0.48.0", -] - -[[package]] -name = "lock_api" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "mac_address" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4863ee94f19ed315bf3bc00299338d857d4b5bc856af375cc97d237382ad3856" -dependencies = [ - "nix", - "winapi", -] - -[[package]] -name = "machine-uid" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f1595709b0a7386bcd56ba34d250d626e5503917d05d32cdccddcd68603e212" -dependencies = [ - "winreg 0.6.2", -] - -[[package]] -name = "machine-uid" -version = "0.3.0" -source = "git+https://github.com/rustdesk-org/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" -dependencies = [ - "bindgen", - "cc", - "winreg 0.11.0", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "matchit" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" -dependencies = [ - "adler2", -] - -[[package]] -name = "minreq" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c785bc6027fd359756e538541c8624012ba3776d3d3fe123885643092ed4132" -dependencies = [ - "log", - "punycode", -] - -[[package]] -name = "mio" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "neli" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1100229e06604150b3becd61a4965d5c70f3be1759544ea7274166f4be41ef43" -dependencies = [ - "byteorder", - "libc", - "log", - "neli-proc-macros", -] - -[[package]] -name = "neli-proc-macros" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" -dependencies = [ - "either", - "proc-macro2 1.0.93", - "quote 1.0.38", - "serde", - "syn 1.0.93", -] - -[[package]] -name = "nix" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset", -] - -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "lexical-core", - "memchr", - "version_check", -] - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.49.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi 0.1.19", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" - -[[package]] -name = "openssl" -version = "0.10.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" -dependencies = [ - "bitflags 2.7.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 2.0.96", -] - -[[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.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-multimap" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" -dependencies = [ - "dlv-list", - "hashbrown 0.12.1", -] - -[[package]] -name = "osascript" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" -dependencies = [ - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.36.1", -] - -[[package]] -name = "paste" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" -dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pin-project" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 2.0.96", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "ping" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69044d1c00894fc1f43d9485aadb6ab6e68df90608fa52cf1074cda6420c6b76" -dependencies = [ - "rand", - "socket2 0.4.4", - "thiserror", -] - -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "protobuf" -version = "3.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" -dependencies = [ - "bytes", - "once_cell", - "protobuf-support", - "thiserror", -] - -[[package]] -name = "protobuf-codegen" -version = "3.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e26b833f144769a30e04b1db0146b2aaa53fd2fd83acf10a6b5f996606c18144" -dependencies = [ - "anyhow", - "once_cell", - "protobuf", - "protobuf-parse", - "regex", - "tempfile", - "thiserror", -] - -[[package]] -name = "protobuf-parse" -version = "3.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322330e133eab455718444b4e033ebfac7c6528972c784fcde28d2cc783c6257" -dependencies = [ - "anyhow", - "indexmap 2.7.0", - "log", - "protobuf", - "protobuf-support", - "tempfile", - "thiserror", - "which", -] - -[[package]] -name = "protobuf-support" -version = "3.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" -dependencies = [ - "thiserror", -] - -[[package]] -name = "punycode" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e1dcb320d6839f6edb64f7a4a59d39b30480d4d1765b56873f7c858538a5fe" - -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "rand", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" -dependencies = [ - "proc-macro2 1.0.93", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" -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", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "reqwest" -version = "0.11.23" -source = "git+https://github.com/rustdesk-org/reqwest#9cb758c9fb2f4edc62eb790acfd45a6a3da21ed3" -dependencies = [ - "async-compression", - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-native-certs 0.6.2", - "rustls-pemfile 1.0.0", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.24.1", - "tokio-socks 0.5.2", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.4", - "winreg 0.50.0", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" -dependencies = [ - "cc", - "getrandom", - "libc", - "spin 0.9.3", - "untrusted 0.9.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "rust-ini" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" -dependencies = [ - "cfg-if", - "ordered-multimap", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustls" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring 0.17.3", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.23.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" -dependencies = [ - "log", - "once_cell", - "ring 0.17.3", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile 1.0.0", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" -dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" - -[[package]] -name = "rustls-platform-verifier" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" -dependencies = [ - "core-foundation", - "core-foundation-sys", - "jni", - "log", - "once_cell", - "rustls 0.23.21", - "rustls-native-certs 0.7.3", - "rustls-platform-verifier-android", - "rustls-webpki 0.102.8", - "security-framework", - "security-framework-sys", - "webpki-roots 0.26.7", - "winapi", -] - -[[package]] -name = "rustls-platform-verifier-android" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.3", - "untrusted 0.9.0", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring 0.17.3", - "rustls-pki-types", - "untrusted 0.9.0", -] - -[[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 = "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.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.7.0", - "core-foundation", - "core-foundation-sys", - "libc", - "num-bigint", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "serde" -version = "1.0.217" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.217" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 2.0.96", -] - -[[package]] -name = "serde_json" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" - -[[package]] -name = "simple_asn1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a762b1c38b9b990c694b9c2f8abe3372ce6a9ceaae6bca39cfc46e054f45745" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", -] - -[[package]] -name = "slab" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" - -[[package]] -name = "smallvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if", - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "sodiumoxide" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e26be3acb6c2d9a7aac28482586a7856436af4cfe7100031d219de2d2ecb0028" -dependencies = [ - "ed25519", - "libc", - "libsodium-sys", - "serde", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d" -dependencies = [ - "lock_api", -] - -[[package]] -name = "sqlformat" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" -dependencies = [ - "itertools", - "nom 7.1.1", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f82cbe94f41641d6c410ded25bbf5097c240cefdf8e3b06d04198d0a96af6a4" -dependencies = [ - "sqlx-core", - "sqlx-macros", -] - -[[package]] -name = "sqlx-core" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b69bf218860335ddda60d6ce85ee39f6cf6e5630e300e19757d1de15886a093" -dependencies = [ - "ahash", - "atoi", - "bitflags 1.3.2", - "byteorder", - "bytes", - "chrono", - "crc", - "crossbeam-queue", - "either", - "event-listener", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "hashlink", - "hex", - "indexmap 1.8.1", - "itoa", - "libc", - "libsqlite3-sys", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls 0.20.4", - "rustls-pemfile 1.0.0", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlformat", - "sqlx-rt", - "stringprep", - "thiserror", - "tokio-stream", - "url", - "webpki-roots 0.22.4", -] - -[[package]] -name = "sqlx-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40c63177cf23d356b159b60acd27c54af7423f1736988502e36bae9a712118f" -dependencies = [ - "dotenv", - "either", - "heck", - "once_cell", - "proc-macro2 1.0.93", - "quote 1.0.38", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-rt", - "syn 1.0.93", - "url", -] - -[[package]] -name = "sqlx-rt" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874e93a365a598dc3dadb197565952cb143ae4aa716f7bcc933a8d836f6bf89f" -dependencies = [ - "once_cell", - "tokio", - "tokio-rustls 0.23.4", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stringprep" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04066589568b72ec65f42d65a1a52436e954b168773148893c020269563decf2" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "unicode-xid 0.2.3", -] - -[[package]] -name = "syn" -version = "2.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sysinfo" -version = "0.29.10" -source = "git+https://github.com/rustdesk-org/sysinfo?branch=rlim_max#90b1705d909a4902dbbbdea37ee64db17841077d" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "windows", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 1.0.93", -] - -[[package]] -name = "time" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" -dependencies = [ - "itoa", - "libc", - "num_threads", - "quickcheck", - "time-macros", -] - -[[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "parking_lot 0.12.0", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.8", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 2.0.96", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.4", - "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.12", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" -dependencies = [ - "rustls 0.23.21", - "tokio", -] - -[[package]] -name = "tokio-socks" -version = "0.5.2-1" -source = "git+https://github.com/rustdesk-org/tokio-socks#94e97c6d7c93b0bcbfa54f2dc397c1da0a6e43d3" -dependencies = [ - "bytes", - "either", - "futures-core", - "futures-sink", - "futures-util", - "pin-project", - "thiserror", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-socks" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "pin-project-lite", - "slab", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.7.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d342c6d58709c0a6d48d48dabbb62d4ef955cf5f0f3bbfd845838e7ae88dbae" -dependencies = [ - "bitflags 1.3.2", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "httpdate", - "mime", - "mime_guess", - "percent-encoding", - "pin-project-lite", - "tokio", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" - -[[package]] -name = "tower-service" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" - -[[package]] -name = "tracing" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 2.0.96", -] - -[[package]] -name = "tracing-core" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "tungstenite" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" -dependencies = [ - "base64 0.13.0", - "byteorder", - "bytes", - "http", - "httparse", - "log", - "rand", - "sha-1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "uuid" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" -dependencies = [ - "getrandom", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" -dependencies = [ - "cfg-if", - "once_cell", - "rustversion", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 2.0.96", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" -dependencies = [ - "cfg-if", - "js-sys", - "once_cell", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" -dependencies = [ - "quote 1.0.38", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.38", - "syn 2.0.96", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "web-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki-roots" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "webpki-roots" -version = "0.26.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "which" -version = "4.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" -dependencies = [ - "either", - "lazy_static", - "libc", -] - -[[package]] -name = "whoami" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[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.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zstd" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix index 9f15d8a80ba0..33fb44e5e207 100644 --- a/pkgs/by-name/ru/rustdesk-server/package.nix +++ b/pkgs/by-name/ru/rustdesk-server/package.nix @@ -1,11 +1,9 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, libsodium, - Security, sqlite, nix-update-script, testers, @@ -24,31 +22,17 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "async-speed-limit-0.3.1" = "sha256-iOel6XA07RPrBjQAFLnxXX4VBpDrYZaqQc9clnsOorI="; - "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; - "default_net-0.1.0" = "sha256-wwVcnS99I1NJFeSihy5YrB5p0y+OHXTX81DQ+TtyFBU="; - "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; - "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; - "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; - "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-U1LTnqi2iEsm2U7t0Fr4VJWLo1MdQmeTKrPsNqRWap0="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libsodium - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + libsodium + sqlite + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix index fcb851e8748b..d7da3b26e7d3 100644 --- a/pkgs/by-name/ru/rustdesk/package.nix +++ b/pkgs/by-name/ru/rustdesk/package.nix @@ -29,7 +29,6 @@ zlib, zstd, stdenv, - darwin, alsa-lib, makeDesktopItem, copyDesktopItems, @@ -42,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-m1bFljZL8vNaugepVs8u1EWNpDLtxgSSZqKGQmgrmsA="; }; @@ -144,19 +143,7 @@ rustPlatform.buildRustPackage (finalAttrs: { zlib zstd ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreAudio - CoreFoundation - CoreGraphics - Foundation - IOKit - Security - SystemConfiguration - ] - ) + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib xdotool diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix index 96cbda420d44..a706c00408be 100644 --- a/pkgs/by-name/ru/rusti-cal/package.nix +++ b/pkgs/by-name/ru/rusti-cal/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-9nd8xm3jAFouRYKSFpx3vQQaI/2wQzTaaehXjqljIfw="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - meta = with lib; { description = "Minimal command line calendar, similar to cal"; mainProgram = "rusti-cal"; diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index 1b2b632438ab..ea400d9b6ce3 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -2,9 +2,6 @@ lib, fetchFromGitHub, rustPlatform, - stdenv, - Security, - SystemConfiguration, installShellFiles, nix-update-script, }: @@ -25,11 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; - postInstall = '' for shell in {ba,fi,z}sh; do $out/bin/rustic completions $shell > rustic.$shell diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix index 5c3f1549df0c..136cddb89013 100644 --- a/pkgs/by-name/ru/rustlings/package.nix +++ b/pkgs/by-name/ru/rustlings/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, pkg-config, @@ -38,10 +36,6 @@ rustPlatform.buildRustPackage { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ CoreServices ] - ); - postFixup = '' wrapProgram $out/bin/rustlings --suffix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index 61bbb514cc75..11dca679d168 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -8,7 +8,6 @@ validatePkgConfig, rust, libiconv, - darwin, curl, apacheHttpd, testers, @@ -16,24 +15,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "rustls-ffi"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "rustls"; repo = "rustls-ffi"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ZKAyKcKwhnPE6PrfBFjLJKkTlGbdLcmW1EP/xSv2cpM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-m92kWH+J8wuGmI0msrp2aginY1K51iqgi3+u4ncmfts="; }; cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-cZ92wSKoygt9x6O/ginOEiCiarlR5qGVFOHrIFdWOWE="; + hash = "sha256-gqc6en59QQpD14hOgRuGEPWLvrkyGn9tPR9vQmRAxIg="; }; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix index a87e24b16802..932876025231 100644 --- a/pkgs/by-name/ru/rustmission/package.nix +++ b/pkgs/by-name/ru/rustmission/package.nix @@ -4,8 +4,6 @@ rustPlatform, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; # There is no tests doCheck = false; diff --git a/pkgs/by-name/ru/rustpython/package.nix b/pkgs/by-name/ru/rustpython/package.nix index d7e0c1778159..d52a621b55fd 100644 --- a/pkgs/by-name/ru/rustpython/package.nix +++ b/pkgs/by-name/ru/rustpython/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ru/rustscan/package.nix b/pkgs/by-name/ru/rustscan/package.nix new file mode 100644 index 000000000000..c012668a34fe --- /dev/null +++ b/pkgs/by-name/ru/rustscan/package.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitHub, + nmap, + perl, + python3, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "rustscan"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "RustScan"; + repo = "RustScan"; + tag = version; + hash = "sha256-+qPSeDpOeCq+KwZb5ANXx6z+pYbgdT1hVgcrSzxyGp0="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-cUuInYCT2jzen9gswfFGtKum6w2X/SiKA2ccdmxk38A="; + + postPatch = '' + substituteInPlace src/scripts/mod.rs \ + --replace-fail 'call_format = "nmap' 'call_format = "${nmap}/bin/nmap' + patchShebangs fixtures/.rustscan_scripts/* + ''; + + nativeCheckInputs = [ + perl + python3 + ]; + + checkFlags = [ + # These tests require network access + "--skip=parse_correct_host_addresses" + "--skip=parse_hosts_file_and_incorrect_hosts" + "--skip=resolver_args_google_dns" + "--skip=resolver_default_cloudflare" + ]; + + meta = with lib; { + description = "Faster Nmap Scanning with Rust"; + homepage = "https://github.com/RustScan/RustScan"; + changelog = "https://github.com/RustScan/RustScan/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "rustscan"; + }; +} diff --git a/pkgs/by-name/ru/rustus/package.nix b/pkgs/by-name/ru/rustus/package.nix index 2d6e9126502c..647f86a3d7c7 100644 --- a/pkgs/by-name/ru/rustus/package.nix +++ b/pkgs/by-name/ru/rustus/package.nix @@ -1,12 +1,10 @@ { - stdenv, lib, fetchFromGitHub, rustPlatform, nix-update-script, pkg-config, openssl, - darwin, rdkafka, }: @@ -36,14 +34,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - openssl - rdkafka - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + rdkafka + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix index 8dffbc41719c..1c9c03a91c09 100644 --- a/pkgs/by-name/ru/rusty-psn/package.nix +++ b/pkgs/by-name/ru/rusty-psn/package.nix @@ -13,22 +13,24 @@ openssl, xorg, libGL, + libxkbcommon, + wayland, withGui ? false, # build GUI version }: rustPlatform.buildRustPackage rec { pname = "rusty-psn"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "RainbowCookie32"; repo = "rusty-psn"; tag = "v${version}"; - hash = "sha256-ldGbEsKK2l7d3V7pWtDij0tS2fPrNhvxdIw8N8GvqaY="; + hash = "sha256-n2h+sgqNZhFgUa4MFp501W4YPtlWN94GhP9Rlu5plBA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-fOG01cTwbBddSKCC7YObcbxYRIs548HtPnIYF7lvKwg="; + cargoHash = "sha256-ffqTzu8/ra6SwvqDne/g9EgISGlEBSleEGn6gQ/DWAY="; # Tests require network access doCheck = false; @@ -59,6 +61,8 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libxcb libGL + libxkbcommon + wayland ]; buildNoDefaultFeatures = true; @@ -96,6 +100,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ AngryAnt ]; - mainProgram = "rusty-psn"; + mainProgram = if withGui then "rusty-psn-gui" else "rusty-psn"; }; } diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix index 5e7c9d6a7e5f..337bd547c497 100644 --- a/pkgs/by-name/ru/rustycli/package.nix +++ b/pkgs/by-name/ru/rustycli/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-QjkUiPwjG25NsvAXM3jqQVtJzYiXhzVqFaDN1b7DXDE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # some examples fail to compile cargoTestFlags = [ "--tests" ]; diff --git a/pkgs/by-name/ru/rustypaste-cli/package.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix index a19879a1d41c..4246b3ded784 100644 --- a/pkgs/by-name/ru/rustypaste-cli/package.nix +++ b/pkgs/by-name/ru/rustypaste-cli/package.nix @@ -2,27 +2,21 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "rustypaste-cli"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "orhun"; repo = "rustypaste-cli"; rev = "v${version}"; - hash = "sha256-ziIY/dz/2nwv0S6gUbVsrTXTNkGLh9MRNXnhhVOnCvA="; + hash = "sha256-tv5nAs5g7NWVakKUyw5PVxHJYQniV9OYm7yDXhooWU4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-R6mdHoARtnIRpN18KF1TVIgBzEtCinb0xfCM3nz2sxk="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + cargoHash = "sha256-Z8rybofRp4hzTbn3iT0X50fcJCn2tT3HTYTLLWTJBek="; meta = with lib; { description = "CLI tool for rustypaste"; diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix index 9548360b2f22..c97756291304 100644 --- a/pkgs/by-name/ru/rustypaste/package.nix +++ b/pkgs/by-name/ru/rustypaste/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-10tBbn4XtdUNhfzb+KpwFGZAc7YVIEQRaqNLzJC1GGI="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - dontUseCargoParallelTests = true; checkFlags = [ diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix index b0b5bbf2b2e9..72e4d59d6ea7 100644 --- a/pkgs/by-name/ru/rustywind/package.nix +++ b/pkgs/by-name/ru/rustywind/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-jq8d+ndPOu07YO5PJ5YfWTeG70bZnr0i8vMwv7Dw5GY="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "CLI for organizing Tailwind CSS classes"; mainProgram = "rustywind"; diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix index 7de2e8bb476b..efaec27ec715 100644 --- a/pkgs/by-name/ru/rutabaga_gfx/package.nix +++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix @@ -93,5 +93,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ qyliss ]; platforms = platforms.darwin ++ platforms.linux; + # error[E0432]: unresolved import `self::consts` + badPlatforms = [ "loongarch64-linux" ]; }; }) diff --git a/pkgs/by-name/ru/rutorrent/package.nix b/pkgs/by-name/ru/rutorrent/package.nix index 3cef28ce3db0..4d0caaf316b2 100644 --- a/pkgs/by-name/ru/rutorrent/package.nix +++ b/pkgs/by-name/ru/rutorrent/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rutorrent"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "Novik"; repo = "ruTorrent"; tag = "v${finalAttrs.version}"; - hash = "sha256-XdPrl1yDcn/dFU4etacDmBAvs0kU/cJE4Ioy6q8+pig="; + hash = "sha256-GeSHLPAmnq5ZStpBSfPc3DzRSh7zjDu31oO04oKgpYk="; }; installPhase = '' diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix index 9a9238d55be3..144a6b8356fa 100644 --- a/pkgs/by-name/rw/rwalk/package.nix +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/rx/rxp/package.nix b/pkgs/by-name/rx/rxp/package.nix index e36b34ae67d3..98c94cd7b672 100644 --- a/pkgs/by-name/rx/rxp/package.nix +++ b/pkgs/by-name/rx/rxp/package.nix @@ -4,17 +4,15 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rxp"; - version = "1.5.0"; + version = "1.5.2"; src = fetchurl { - url = "mirror://debian/pool/main/r/rxp/rxp_${version}.orig.tar.gz"; - sha256 = "0y365r36wzj4xn1dzhb03spxljnrx8vwqbiwnnwz4630129gzpm6"; + url = "https://www.inf.ed.ac.uk/research/isddarch/admin/rxp-${finalAttrs.version}.tar.gz"; + hash = "sha256-+mQbSlGF0KHZYQyCRbnVr/WXLBoooNqU8+ONafbBRRM="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration -Wno-error=int-conversion"; - meta = { license = lib.licenses.gpl2Plus; description = "Validating XML parser written in C"; @@ -22,4 +20,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "rxp"; }; -} +}) diff --git a/pkgs/by-name/ry/rye/package.nix b/pkgs/by-name/ry/rye/package.nix index 89dc923d09d8..c946d326d7f8 100644 --- a/pkgs/by-name/ry/rye/package.nix +++ b/pkgs/by-name/ry/rye/package.nix @@ -94,7 +94,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index ecb63fe7a9ce..67a9b43c8305 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rygel"; - version = "0.44.1"; + version = "0.44.2"; # TODO: split out lib outputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/rygel/${lib.versions.majorMinor finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz"; - hash = "sha256-eyxjG4QkCNonpUJC+Agqukm9HKAgQeeeHu+6DHAJqHs="; + hash = "sha256-eW7uSUzfYNwr+CsAuPmaFLocfPQNKUSBf/DBqmBz1aA="; }; patches = [ @@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/rygel"; changelog = "https://gitlab.gnome.org/GNOME/rygel/-/blob/rygel-${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/ry/rymdport/package.nix b/pkgs/by-name/ry/rymdport/package.nix new file mode 100644 index 000000000000..c45c6a659d4a --- /dev/null +++ b/pkgs/by-name/ry/rymdport/package.nix @@ -0,0 +1,56 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + pkg-config, + libGL, + xorg, +}: + +buildGoModule rec { + pname = "rymdport"; + version = "3.8.0"; + + src = fetchFromGitHub { + owner = "Jacalz"; + repo = "rymdport"; + rev = "v${version}"; + hash = "sha256-WWLs0gzFo1+scG+2JfNMd28jIP1BMMJOK4fhQ726mHY="; + }; + + vendorHash = "sha256-+FVERz1PVZSG8jqffUlglL+3VHsRNxHH0g2GYpYNQ9g="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = with xorg; [ + libGL + libX11 + libXcursor + libXext + libXi + libXinerama + libXrandr + libXxf86vm + ]; + + postInstall = '' + for res in $(ls internal/assets/icons | sed -e 's/icon-//g' -e 's/.png//g'); do + install -Dm444 internal/assets/icons/icon-$res.png \ + $out/share/icons/hicolor/''${res}x''${res}/apps/io.github.jacalz.rymdport.png + done + install -Dm444 internal/assets/svg/icon.svg $out/share/icons/hicolor/scalable/apps/io.github.jacalz.rymdport.svg + install -Dm444 internal/assets/unix/io.github.jacalz.rymdport.desktop -t $out/share/applications + ''; + + meta = { + description = "Easy encrypted file, folder, and text sharing between devices"; + homepage = "https://github.com/Jacalz/rymdport"; + changelog = "https://github.com/Jacalz/rymdport/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.linux; + mainProgram = "rymdport"; + }; +} diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix index 110cc6df04c5..a3f1951ef483 100644 --- a/pkgs/by-name/ry/ryubing/package.nix +++ b/pkgs/by-name/ry/ryubing/package.nix @@ -128,8 +128,8 @@ buildDotnetModule rec { passthru.updateScript = ./updater.sh; meta = with lib; { - homepage = "https://github.com/Ryubing/Ryujinx"; - changelog = "https://github.com/Ryubing/Ryujinx/wiki/Changelog"; + homepage = "https://ryujinx.app"; + changelog = "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/changelog"; description = "Experimental Nintendo Switch Emulator written in C# (community fork of Ryujinx)"; longDescription = '' Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan, @@ -143,7 +143,7 @@ buildDotnetModule rec { maintainers = with maintainers; [ jk artemist - kekschen + willow ]; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix index 4c4a56d5558a..51e84aaf2c3b 100644 --- a/pkgs/by-name/s2/s2n-tls/package.nix +++ b/pkgs/by-name/s2/s2n-tls/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.5.11"; + version = "1.5.17"; src = fetchFromGitHub { owner = "aws"; repo = "s2n-tls"; rev = "v${version}"; - hash = "sha256-3eh4+y3XyO2sUfPhkOeF5fKgakFz9f4zLceYqklEYBw="; + hash = "sha256-ylaWeYLplAi94PQHauI1lG4PJI193TvrAPM7U446cnE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/by-name/s3/s3fs/package.nix similarity index 100% rename from pkgs/tools/filesystems/s3fs/default.nix rename to pkgs/by-name/s3/s3fs/package.nix diff --git a/pkgs/by-name/s3/s3rs/package.nix b/pkgs/by-name/s3/s3rs/package.nix new file mode 100644 index 000000000000..fa40ad221611 --- /dev/null +++ b/pkgs/by-name/s3/s3rs/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + python3, + perl, + openssl, + fetchFromGitHub, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "s3rs"; + version = "0.4.19"; + + src = fetchFromGitHub { + owner = "yanganto"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mJ1bMfv/HY74TknpRvu8RIs1d2VlNreEVtHCtQSHQw8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-z7de/TZXyNsb+dxWcNFdJsaGsM3Ld2A0jorNMAVOZOg="; + + nativeBuildInputs = [ + python3 + perl + pkg-config + ]; + buildInputs = [ openssl ]; + + meta = with lib; { + description = "S3 cli client with multi configs with diffent provider"; + homepage = "https://github.com/yanganto/s3rs"; + license = licenses.mit; + maintainers = with maintainers; [ yanganto ]; + mainProgram = "s3rs"; + }; +} diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix index 15f533a890b7..738f7f414964 100644 --- a/pkgs/by-name/sa/saber/package.nix +++ b/pkgs/by-name/sa/saber/package.nix @@ -1,35 +1,40 @@ { lib, + flutter329, fetchFromGitHub, - flutter327, gst_all_1, libunwind, orc, webkitgtk_4_1, autoPatchelfHook, xorg, + runCommand, + yq, + saber, + _experimental-update-script-combinators, + gitUpdater, }: -flutter327.buildFlutterApplication rec { + +flutter329.buildFlutterApplication rec { pname = "saber"; - version = "0.25.3"; + version = "0.25.6"; src = fetchFromGitHub { owner = "saber-notes"; repo = "saber"; tag = "v${version}"; - hash = "sha256-plBcZo67/x8KcND28jqfrwbvI9IZz8ptLZoGl2y2vW4="; + hash = "sha256-OknqEbWAYLlxSTDWcggM6GP2V8cdKIAksbm7TmKzjKY="; }; gitHashes = { - receive_sharing_intent = "sha256-ppKPBL2ZOx2MeuLY6Q8aiVGsektK+Mqtwyxps0aNtwk="; + receive_sharing_intent = "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY="; json2yaml = "sha256-Vb0Bt11OHGX5+lDf8KqYZEGoXleGi5iHXVS2k7CEmDw="; + workmanager = "sha256-fpB8CwNIn+HCQujyIXciq7Y9yd78Ie0IjkSewv3u5iw="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; - nativeBuildInputs = [ - autoPatchelfHook - ]; + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ gst_all_1.gstreamer @@ -41,8 +46,8 @@ flutter327.buildFlutterApplication rec { ]; postInstall = '' - install -Dm0644 ./flatpak/com.adilhanney.saber.desktop $out/share/applications/com.adilhanney.saber.desktop - install -Dm0644 ./assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg + install -Dm0644 flatpak/com.adilhanney.saber.desktop $out/share/applications/saber.desktop + install -Dm0644 assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg ''; preFixup = '' @@ -50,6 +55,22 @@ flutter327.buildFlutterApplication rec { patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/saber/lib/lib*.so ''; + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + nativeBuildInputs = [ yq ]; + inherit (saber) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "saber.pubspecSource" ./pubspec.lock.json) + ]; + }; + meta = { description = "Cross-platform open-source app built for handwriting"; homepage = "https://github.com/saber-notes/saber"; diff --git a/pkgs/by-name/sa/saber/pubspec.lock.json b/pkgs/by-name/sa/saber/pubspec.lock.json index 4fa55a1e38a3..75ef121f775c 100644 --- a/pkgs/by-name/sa/saber/pubspec.lock.json +++ b/pkgs/by-name/sa/saber/pubspec.lock.json @@ -4,11 +4,11 @@ "dependency": "direct main", "description": { "name": "abstract_sync", - "sha256": "40c83f10dc670e6c6c7f1999fd9ddd0a32dcc61454ed6c202bd59cb6befd81c4", + "sha256": "f88f85bfecf2171d8756556b8d7992cf8d31d076a6d0ebbfd9f8ee559d8a18bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.3.1" }, "animated_vector": { "dependency": "transitive", @@ -44,161 +44,161 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.7" }, "args": { "dependency": "direct main", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "asn1lib": { "dependency": "transitive", "description": { "name": "asn1lib", - "sha256": "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5", + "sha256": "0511d6be23b007e95105ae023db599aea731df604608978dada7f9faf2637623", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.8" + "version": "1.6.4" }, "assorted_layout_widgets": { "dependency": "transitive", "description": { "name": "assorted_layout_widgets", - "sha256": "5b7f7c76a1a4c7cf95edfb854c3ed09ce9cb7f25a372f2d9a8d4c1569d42ecfb", + "sha256": "86eacbd25f7dd14a8182003935b07d94205ae4b0e6bedee03bde1404746bb7a9", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.0.2" + "version": "10.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "audioplayers": { "dependency": "direct main", "description": { "name": "audioplayers", - "sha256": "c346ba5a39dc208f1bab55fc239855f573d69b0e832402114bf0b793622adc4d", + "sha256": "a5341380a4f1d3a10a4edde5bb75de5127fe31e0faa8c4d860e64d2f91ad84c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "6.4.0" }, "audioplayers_android": { "dependency": "transitive", "description": { "name": "audioplayers_android", - "sha256": "de576b890befe27175c2f511ba8b742bec83765fa97c3ce4282bba46212f58e4", + "sha256": "f8c90823a45b475d2c129f85bbda9c029c8d4450b172f62e066564c6e170f69a", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.0" + "version": "5.2.0" }, "audioplayers_darwin": { "dependency": "transitive", "description": { "name": "audioplayers_darwin", - "sha256": "e507887f3ff18d8e5a10a668d7bedc28206b12e10b98347797257c6ae1019c3b", + "sha256": "405cdbd53ebdb4623f1c5af69f275dad4f930ce895512d5261c07cd95d23e778", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.0" + "version": "6.2.0" }, "audioplayers_linux": { "dependency": "transitive", "description": { "name": "audioplayers_linux", - "sha256": "3d3d244c90436115417f170426ce768856d8fe4dfc5ed66a049d2890acfa82f9", + "sha256": "7e0d081a6a527c53aef9539691258a08ff69a7dc15ef6335fbea1b4b03ebbef0", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.2.0" }, "audioplayers_platform_interface": { "dependency": "transitive", "description": { "name": "audioplayers_platform_interface", - "sha256": "6834dd48dfb7bc6c2404998ebdd161f79cd3774a7e6779e1348d54a3bfdcfaa5", + "sha256": "77e5fa20fb4a64709158391c75c1cca69a481d35dc879b519e350a05ff520373", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.1.0" }, "audioplayers_web": { "dependency": "transitive", "description": { "name": "audioplayers_web", - "sha256": "3609bdf0e05e66a3d9750ee40b1e37f2a622c4edb796cc600b53a90a30a2ace4", + "sha256": "bd99d8821114747682a2be0adcdb70233d4697af989b549d3a20a0f49f6c9b13", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.1" + "version": "5.1.0" }, "audioplayers_windows": { "dependency": "transitive", "description": { "name": "audioplayers_windows", - "sha256": "8605762dddba992138d476f6a0c3afd9df30ac5b96039929063eceed416795c2", + "sha256": "871d3831c25cd2408ddc552600fd4b32fba675943e319a41284704ee038ad563", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.2.0" }, "barcode": { "dependency": "transitive", "description": { "name": "barcode", - "sha256": "ab180ce22c6555d77d45f0178a523669db67f95856e3378259ef2ffeb43e6003", + "sha256": "7b6729c37e3b7f34233e2318d866e8c48ddb46c1f7ad01ff7bb2a8de1da2b9f4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.8" + "version": "2.2.9" }, "bidi": { "dependency": "transitive", "description": { "name": "bidi", - "sha256": "9a712c7ddf708f7c41b1923aa83648a3ed44cfd75b04f72d598c45e5be287f9d", + "sha256": "77f475165e94b261745cf1032c751e2032b8ed92ccb2bf5716036db79320637d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.12" + "version": "2.0.13" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "bson": { "dependency": "direct main", "description": { "name": "bson", - "sha256": "9071b154b5cd96482c2e116b015e87acfdc8412630cc8f3aba60c539a8ef5442", + "sha256": "f8c80be7a62a88f4add7c48cc83567c36a77532de107224df8328ef71f125045", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.5" + "version": "5.0.7" }, "built_collection": { "dependency": "transitive", @@ -214,21 +214,31 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.2" + "version": "8.9.5" + }, + "chalkdart": { + "dependency": "transitive", + "description": { + "name": "chalkdart", + "sha256": "7ffc6bd39c81453fb9ba8dbce042a9c960219b75ea1c07196a7fa41c2fab9e86", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "charcode": { "dependency": "transitive", @@ -244,11 +254,11 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "collapsible": { "dependency": "direct main", @@ -264,11 +274,11 @@ "dependency": "direct main", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "convert": { "dependency": "transitive", @@ -354,11 +364,11 @@ "dependency": "transitive", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "decimal": { "dependency": "transitive", @@ -394,11 +404,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431", + "sha256": "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.2.0" + "version": "11.4.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -464,11 +474,11 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "fast_image_resizer": { "dependency": "direct main", @@ -484,31 +494,31 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "file_picker": { "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "16dc141db5a2ccc6520ebb6a2eb5945b1b09e95085c021d9f914f8ded7f1465c", + "sha256": "a222f231db4f822fc49e3b753674bda630e981873c84bf8604bceeb77fce0b24", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.4" + "version": "10.1.7" }, "file_selector_linux": { "dependency": "transitive", @@ -534,11 +544,11 @@ "dependency": "transitive", "description": { "name": "file_selector_windows", - "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4", + "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+3" + "version": "0.9.3+4" }, "fixnum": { "dependency": "direct main", @@ -554,21 +564,21 @@ "dependency": "direct main", "description": { "name": "flex_color_picker", - "sha256": "12dc855ae8ef5491f529b1fc52c655f06dcdf4114f1f7fdecafa41eec2ec8d79", + "sha256": "8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.0" + "version": "3.7.1" }, "flex_seed_scheme": { "dependency": "transitive", "description": { "name": "flex_seed_scheme", - "sha256": "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334", + "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.1" + "version": "3.5.1" }, "flutter": { "dependency": "direct main", @@ -626,11 +636,11 @@ "dependency": "transitive", "description": { "name": "flutter_keyboard_visibility_temp_fork", - "sha256": "cecc44a350a8a369efbc960bb2126386af53cb0597ca6789607cbfb88081b9f4", + "sha256": "e3d02900640fbc1129245540db16944a0898b8be81694f4bf04b6c985bed9048", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.4" + "version": "0.1.5" }, "flutter_keyboard_visibility_windows": { "dependency": "transitive", @@ -662,91 +672,91 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398", + "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.23" + "version": "2.0.28" }, "flutter_quill": { "dependency": "direct main", "description": { "name": "flutter_quill", - "sha256": "6274834823e61291c0cedee9dd7f73fc7836ea07a12596de8f5fa08598b5eb74", + "sha256": "de019f6160023d36ad3e89343da6d740ab66ae7839875c89871fbeabcb9e8f9b", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.8.5" + "version": "11.4.0" }, "flutter_quill_delta_from_html": { "dependency": "transitive", "description": { "name": "flutter_quill_delta_from_html", - "sha256": "63873b5391b56daa999ce8fa7dd23dfd7d0417a70e00a647ba450f4a8988afd0", + "sha256": "4597bd0853a704696837aa6b05cffd851f587b176204c234edddfed1c1862a09", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.3" + "version": "1.5.2" }, "flutter_secure_storage": { "dependency": "direct main", "description": { "name": "flutter_secure_storage", - "sha256": "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0", + "sha256": "f7eceb0bc6f4fd0441e29d43cab9ac2a1c5ffd7ea7b64075136b718c46954874", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.2" + "version": "10.0.0-beta.4" + }, + "flutter_secure_storage_darwin": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_darwin", + "sha256": "f226f2a572bed96bc6542198ebaec227150786e34311d455a7e2d3d06d951845", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" }, "flutter_secure_storage_linux": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_linux", - "sha256": "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b", + "sha256": "9b4b73127e857cd3117d43a70fa3dddadb6e0b253be62e6a6ab85caa0742182c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" - }, - "flutter_secure_storage_macos": { - "dependency": "transitive", - "description": { - "name": "flutter_secure_storage_macos", - "sha256": "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" + "version": "2.0.1" }, "flutter_secure_storage_platform_interface": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_platform_interface", - "sha256": "cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8", + "sha256": "8ceea1223bee3c6ac1a22dabd8feefc550e4729b3675de4b5900f55afcb435d6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "2.0.1" }, "flutter_secure_storage_web": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_web", - "sha256": "f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9", + "sha256": "4c3f233e739545c6cb09286eeec1cc4744138372b985113acc904f7263bef517", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "2.0.0" }, "flutter_secure_storage_windows": { "dependency": "transitive", "description": { "name": "flutter_secure_storage_windows", - "sha256": "b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709", + "sha256": "ff32af20f70a8d0e59b2938fc92de35b54a74671041c814275afd80e27df9f21", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "4.0.0" }, "flutter_speed_dial": { "dependency": "direct main", @@ -772,11 +782,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123", + "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.16" + "version": "2.1.0" }, "flutter_test": { "dependency": "direct dev", @@ -826,25 +836,35 @@ "source": "sdk", "version": "0.0.0" }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, "go_router": { "dependency": "direct main", "description": { "name": "go_router", - "sha256": "2fd11229f59e23e967b0775df8d5948a519cd7e1e8b6e849729e010587b46539", + "sha256": "0b1e06223bee260dee31a171fb1153e306907563a0b0225e8c1733211911429a", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.6.2" + "version": "15.1.2" }, "golden_screenshot": { "dependency": "direct dev", "description": { "name": "golden_screenshot", - "sha256": "6c800c8e1338434ccb68dec788b5121bf97d256aa6a98b43a4330190572f144a", + "sha256": "0ecff8fde3eaea98d2f19449fb2becf67583cb0e98326b1a6ad47226137099a1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "3.2.1" }, "golden_toolkit": { "dependency": "transitive", @@ -880,51 +900,51 @@ "dependency": "transitive", "description": { "name": "html", - "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", + "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.15.5" + "version": "0.15.6" }, "http": { "dependency": "direct main", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.4.0" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.1" + "version": "4.1.2" }, "icons_launcher": { "dependency": "direct dev", "description": { "name": "icons_launcher", - "sha256": "a7c83fbc837dc6f81944ef35c3756f533bb2aba32fcca5cbcdb2dbcd877d5ae9", + "sha256": "2949eef3d336028d89133f69ef221d877e09deed04ebd8e738ab4a427850a7a2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.0.1" }, "image": { "dependency": "transitive", "description": { "name": "image", - "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.5.4" }, "integration_test": { "dependency": "direct dev", @@ -966,11 +986,11 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.7" + "version": "0.7.2" }, "json2yaml": { "dependency": "direct overridden", @@ -1007,21 +1027,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -1037,11 +1057,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "4a16b3f03741e1252fda5de3ce712666d010ba2122f8e912c94f9f7b90e1a4c3", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.1.0" + "version": "5.1.1" }, "list_utilities": { "dependency": "transitive", @@ -1067,21 +1087,21 @@ "dependency": "transitive", "description": { "name": "markdown", - "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051", + "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.2" + "version": "7.3.0" }, "matcher": { "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -1097,31 +1117,31 @@ "dependency": "direct main", "description": { "name": "material_symbols_icons", - "sha256": "64404f47f8e0a9d20478468e5decef867a688660bad7173adcd20418d7f892c9", + "sha256": "d45b6c36c3effa8cb51b1afb8698107d5ff1f88fa4631428f34a8a01abc295d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2801.0" + "version": "4.2815.0" }, "matrix4_transform": { "dependency": "transitive", "description": { "name": "matrix4_transform", - "sha256": "42c42610deecc382be2653f4a21358537401bd5b027c168a174c7c6a64959908", + "sha256": "1346e53517e3081d3e8362377be97e285e2bd348855c177eae2a18aa965cafa0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "4.0.1" }, "meta": { "dependency": "direct main", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", @@ -1167,11 +1187,11 @@ "dependency": "direct main", "description": { "name": "one_dollar_unistroke_recognizer", - "sha256": "fa47695d7318542401cd29a35829011dafa0d0b3cb401803e6d78d55d382a96c", + "sha256": "459ba12aaada0e85e8f211f62fea649f246ccb74f726527593a0716bf1bcf6c4", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.3.3" }, "onyxsdk_pen": { "dependency": "direct main", @@ -1273,14 +1293,14 @@ "version": "0.1.1" }, "path": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_drawing": { "dependency": "direct main", @@ -1316,11 +1336,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.17" }, "path_provider_foundation": { "dependency": "transitive", @@ -1376,11 +1396,11 @@ "dependency": "direct main", "description": { "name": "pdf", - "sha256": "05df53f8791587402493ac97b9869d3824eccbc77d97855f4545cf72df3cae07", + "sha256": "28eacad99bffcce2e05bba24e50153890ad0255294f4dd78a17075a2ba5c8416", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.11.1" + "version": "3.11.3" }, "pdf_widget_wrapper": { "dependency": "transitive", @@ -1396,11 +1416,11 @@ "dependency": "direct main", "description": { "name": "pdfrx", - "sha256": "1a9cb7c6c6ac9b6e8b441d6a956697894dc4d10a9452ca9d640490c26c07cbfc", + "sha256": "1bde1885de38ac8ad9f8d5e4be37a57f36f23467a9bb5a586607d5e4aa153ab8", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.97" + "version": "1.1.28" }, "perfect_freehand": { "dependency": "direct main", @@ -1416,31 +1436,31 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "sha256": "2d070d8684b68efb580a5997eb62f675e8a885ef0be6e754fb9ef489c177470f", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.1" + "version": "12.0.0+1" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "sha256": "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.13" + "version": "13.0.1" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.5" + "version": "9.4.7" }, "permission_handler_html": { "dependency": "transitive", @@ -1456,11 +1476,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.3.0" }, "permission_handler_windows": { "dependency": "transitive", @@ -1476,11 +1496,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "pixel_snap": { "dependency": "transitive", @@ -1496,11 +1516,11 @@ "dependency": "transitive", "description": { "name": "platform", - "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "platform_linux": { "dependency": "transitive", @@ -1532,6 +1552,16 @@ "source": "hosted", "version": "3.9.1" }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, "power_extensions": { "dependency": "transitive", "description": { @@ -1546,31 +1576,31 @@ "dependency": "direct main", "description": { "name": "printing", - "sha256": "b535d177fc6e8f8908e19b0ff5c1d4a87e3c4d0bf675e05aa2562af1b7853906", + "sha256": "482cd5a5196008f984bb43ed0e47cbfdca7373490b62f3b27b3299275bf22a93", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.13.4" + "version": "5.14.2" }, "process": { "dependency": "transitive", "description": { "name": "process", - "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "5.0.3" }, "provider": { "dependency": "transitive", "description": { "name": "provider", - "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.1.5" }, "qr": { "dependency": "transitive", @@ -1586,11 +1616,11 @@ "dependency": "transitive", "description": { "name": "quill_native_bridge", - "sha256": "0b3200c57bb4f1f12d6c764648d42482891f20f12024c75fe3479cafc1e132c9", + "sha256": "00752aca7d67cbd3254709a47558be78427750cb81aa42cfbed354d4a079bcfa", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.7.11" + "version": "11.0.1" }, "quill_native_bridge_android": { "dependency": "transitive", @@ -1636,21 +1666,21 @@ "dependency": "transitive", "description": { "name": "quill_native_bridge_platform_interface", - "sha256": "2d71b6c5106db0a4b1d788640d1b949ccdd0e570b5a5e0384f7b28be9630a94a", + "sha256": "8264a2bdb8a294c31377a27b46c0f8717fa9f968cf113f7dc52d332ed9c84526", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.1" + "version": "0.0.2+1" }, "quill_native_bridge_web": { "dependency": "transitive", "description": { "name": "quill_native_bridge_web", - "sha256": "e7e55047d68f1a88574c26dbe3f12988f49d07740590d8fc6280028bbde5b908", + "sha256": "7c723f6824b0250d7f33e8b6c23f2f8eb0103fe48ee7ebf47ab6786b64d5c05d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.1" + "version": "0.0.2" }, "quill_native_bridge_windows": { "dependency": "transitive", @@ -1686,9 +1716,9 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "deec27f3dd36d6c9f51c22d0026baa7b6f0850a3", - "resolved-ref": "deec27f3dd36d6c9f51c22d0026baa7b6f0850a3", - "url": "https://github.com/ad-angelo/receive_sharing_intent" + "ref": "2cea396843cd3ab1b5ec4334be4233864637874e", + "resolved-ref": "2cea396843cd3ab1b5ec4334be4233864637874e", + "url": "https://github.com/KasemJaffer/receive_sharing_intent" }, "source": "git", "version": "1.8.1" @@ -1787,51 +1817,51 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400", + "sha256": "b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.3" + "version": "11.0.0" }, "share_plus_platform_interface": { "dependency": "transitive", "description": { "name": "share_plus_platform_interface", - "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b", + "sha256": "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "6.0.0" }, "shared_preferences": { "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.5.3" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549", + "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.4" + "version": "2.4.10" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.3" + "version": "2.5.4" }, "shared_preferences_linux": { "dependency": "transitive", @@ -1857,11 +1887,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.3" }, "shared_preferences_windows": { "dependency": "transitive", @@ -1877,11 +1907,11 @@ "dependency": "direct dev", "description": { "name": "simplytranslate", - "sha256": "632b78778c5016b51ee3e5af778ad27f90d350d3153993d107fcb51fde1493c8", + "sha256": "3137b221b088c589cd68d26192d753a3a6fe314b83d95fc9c96cd0a40b270772", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1+3" + "version": "2.2.2" }, "sky_engine": { "dependency": "transitive", @@ -1893,31 +1923,31 @@ "dependency": "direct main", "description": { "name": "slang", - "sha256": "e02feadc1291280e755ed01da39817213247295368671da67570e28ac0120aa8", + "sha256": "13132690084bef34fb74dbc698a1e5496f97afbcd3eb58e20c09393e77ac46e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.7.1" }, "slang_flutter": { "dependency": "direct main", "description": { "name": "slang_flutter", - "sha256": "493456b7c4f842ec2e7519c2358a4653b3198b84e9b2656b03a648f7f3405471", + "sha256": "fff13b6fc8b0378ee23856c4f9fd7f8e2777b430090681f4d19ab14c47de9bc6", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.7.0" }, "source_span": { "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -1933,51 +1963,51 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "super_clipboard": { "dependency": "direct main", "description": { "name": "super_clipboard", - "sha256": "687ef5d4ceb2cb1e0e36a4af37683936609f424f0767b46fee5fc312b0aeb595", + "sha256": "5203c881d24033c3e6154c2ae01afd94e7f0a3201280373f28e540f1defa3f40", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.0-dev.5" + "version": "0.9.0-dev.6" }, "super_native_extensions": { "dependency": "transitive", "description": { "name": "super_native_extensions", - "sha256": "1cb6baecf529300ae7f59974bdc33a53b947ecc4ce374c00126df064c10e4e51", + "sha256": "09ccc40c475e6f91770eaeb2553bf4803812d7beadc3759aa57d643370619c86", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.0-dev.5" + "version": "0.9.0-dev.6" }, "sync_http": { "dependency": "transitive", @@ -1993,31 +2023,31 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.3.1" }, "term_glyph": { "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "timezone": { "dependency": "transitive", @@ -2073,21 +2103,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.16" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.2" + "version": "6.3.3" }, "url_launcher_linux": { "dependency": "transitive", @@ -2123,21 +2153,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.4.1" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.4" }, "uuid": { "dependency": "transitive", @@ -2153,21 +2183,21 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7", + "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.15" + "version": "1.1.18" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.12" + "version": "1.1.13" }, "vector_graphics_compiler": { "dependency": "transitive", @@ -2203,31 +2233,31 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web": { "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "webdriver": { "dependency": "transitive", @@ -2243,21 +2273,21 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69", + "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.0" + "version": "5.13.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.5" + "version": "2.1.0" }, "window_manager": { "dependency": "direct main", @@ -2283,20 +2313,21 @@ "dependency": "direct main", "description": { "name": "worker_manager", - "sha256": "0c6c4e7d246bcbe7221273ef955732dafb097347d536ebe6acd6547d0398c49c", + "sha256": "eb8ad7013f823539e259f2452b40f8bf77c0aacc7a73f66195f1ad3166eafcf8", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.2" + "version": "7.2.4" }, "workmanager": { "dependency": "direct main", "description": { - "name": "workmanager", - "sha256": "ed13530cccd28c5c9959ad42d657cd0666274ca74c56dea0ca183ddd527d3a00", - "url": "https://pub.dev" + "path": "workmanager", + "ref": "main", + "resolved-ref": "4ce065135dc1b91fee918f81596b42a56850391d", + "url": "https://github.com/fluttercommunity/flutter_workmanager" }, - "source": "hosted", + "source": "git", "version": "0.5.2" }, "xdg_directories": { @@ -2333,21 +2364,21 @@ "dependency": "direct dev", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" }, "yaru": { "dependency": "direct main", "description": { "name": "yaru", - "sha256": "afc659f78a0bef5e06ebbbd516979afceca7526b7703daa444bf419a54b2dc85", + "sha256": "f149399d81ecd3d20bfcc79afd5ddd9bcd7e4c901d5e602a8577fe59c71c8617", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.3.2" + "version": "7.0.0" }, "yaru_window": { "dependency": "transitive", @@ -2401,7 +2432,7 @@ } }, "sdks": { - "dart": ">=3.6.0-0 <4.0.0", - "flutter": ">=3.24.3" + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.29.0" } } diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix index 5de0077b4a7b..16705b2a20c4 100644 --- a/pkgs/by-name/sa/sabnzbd/package.nix +++ b/pkgs/by-name/sa/sabnzbd/package.nix @@ -72,14 +72,14 @@ let ]; in stdenv.mkDerivation rec { - version = "4.4.1"; + version = "4.5.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = "sabnzbd"; repo = "sabnzbd"; rev = version; - hash = "sha256-7CR2hn+mXd6eKoFjrapZuB+Fpfi1UWzTQK5DnP2303k="; + hash = "sha256-vundARltVyTX0rEdwQJnY8p1n9zBhFskJkyttWgEaZI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/sa/safe-rm/package.nix b/pkgs/by-name/sa/safe-rm/package.nix index 8a6546e3b7e1..c810fe8c572a 100644 --- a/pkgs/by-name/sa/safe-rm/package.nix +++ b/pkgs/by-name/sa/safe-rm/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace src/main.rs \ - --replace "/bin/rm" "${coreutils}/bin/rm" + --replace-fail "/bin/rm" "${coreutils}/bin/rm" ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix index 31756bdf7d66..db379c5c85e1 100644 --- a/pkgs/by-name/sa/safecloset/package.nix +++ b/pkgs/by-name/sa/safecloset/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, xorg, }: @@ -21,13 +20,9 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-/AnzUaya+dgckcilxj9ZZbDNqmfj1uTWkzhVphpZIsM="; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libxcb - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libxcb + ]; checkFlags = [ # skip flaky test diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 011c1929df58..321eeb33b522 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -20,7 +20,6 @@ vigra, pdal, libpq, - darwin, unixODBC, poppler, hdf5, @@ -80,7 +79,6 @@ stdenv.mkDerivation rec { # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa unixODBC poppler netcdf @@ -96,13 +94,11 @@ stdenv.mkDerivation rec { homepage = "https://saga-gis.sourceforge.io"; changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog ${version}/"; license = licenses.gpl2Plus; - maintainers = - with maintainers; - teams.geospatial.members - ++ [ - michelk - mpickering - ]; + maintainers = with maintainers; [ + michelk + mpickering + ]; + teams = [ teams.geospatial ]; platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/sa/sage/python-modules/sage-docbuild.nix b/pkgs/by-name/sa/sage/python-modules/sage-docbuild.nix index f55a9288b020..c42277406086 100644 --- a/pkgs/by-name/sa/sage/python-modules/sage-docbuild.nix +++ b/pkgs/by-name/sa/sage/python-modules/sage-docbuild.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Build system of the Sage documentation"; homepage = "https://www.sagemath.org"; license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; }; } diff --git a/pkgs/by-name/sa/sage/python-modules/sage-setup.nix b/pkgs/by-name/sa/sage/python-modules/sage-setup.nix index 29dea0671ea2..c8a3dab56347 100644 --- a/pkgs/by-name/sa/sage/python-modules/sage-setup.nix +++ b/pkgs/by-name/sa/sage/python-modules/sage-setup.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Build system of the Sage library"; homepage = "https://www.sagemath.org"; license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; }; } diff --git a/pkgs/by-name/sa/sage/sage.nix b/pkgs/by-name/sa/sage/sage.nix index 834f9f974aa2..3a1b20b9e87d 100644 --- a/pkgs/by-name/sa/sage/sage.nix +++ b/pkgs/by-name/sa/sage/sage.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { mainProgram = "sage"; homepage = "https://www.sagemath.org"; license = licenses.gpl2Plus; - maintainers = teams.sage.members; + teams = [ teams.sage ]; platforms = platforms.linux ++ [ "aarch64-darwin" ]; }; } diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix index e7bfd4246292..8d2e0bb7b656 100644 --- a/pkgs/by-name/sa/sagoin/package.nix +++ b/pkgs/by-name/sa/sagoin/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - postInstall = '' installManPage artifacts/sagoin.1 installShellCompletion artifacts/sagoin.{bash,fish} --zsh artifacts/_sagoin diff --git a/pkgs/by-name/sa/sailfish-access-control/package.nix b/pkgs/by-name/sa/sailfish-access-control/package.nix index 305dc0bbd96b..05fd9ff476b2 100644 --- a/pkgs/by-name/sa/sailfish-access-control/package.nix +++ b/pkgs/by-name/sa/sailfish-access-control/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/sailfishos/sailfish-access-control"; changelog = "https://github.com/sailfishos/sailfish-access-control/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl2Plus; - maintainers = lib.teams.lomiri.members; + teams = [ lib.teams.lomiri ]; platforms = lib.platforms.linux; pkgConfigModules = [ "sailfishaccesscontrol" diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix index 037a299a2054..329acb4ac709 100644 --- a/pkgs/by-name/sa/saleae-logic-2/package.nix +++ b/pkgs/by-name/sa/saleae-logic-2/package.nix @@ -6,10 +6,10 @@ }: let pname = "saleae-logic-2"; - version = "2.4.22"; + version = "2.4.29"; src = fetchurl { url = "https://downloads2.saleae.com/logic2/Logic-${version}-linux-x64.AppImage"; - hash = "sha256-MMuuSYOVw4O/JDsXz9OneUyJMNLUUCBpAMRqCs64khk="; + hash = "sha256-eCG2Al6MmWTCiYtaO6qIoNji4QreMryoZRcfKjk5d1c="; }; desktopItem = makeDesktopItem { name = "saleae-logic-2"; diff --git a/pkgs/by-name/sa/salmon/package.nix b/pkgs/by-name/sa/salmon/package.nix index 4e46c4e2dc05..fbe980cbdb6f 100644 --- a/pkgs/by-name/sa/salmon/package.nix +++ b/pkgs/by-name/sa/salmon/package.nix @@ -7,6 +7,7 @@ cmake, curl, fetchFromGitHub, + icu, jemalloc, libgff, libiconv, @@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { bzip2 cereal_1_3_2 curl + icu jemalloc libgff libstaden-read diff --git a/pkgs/by-name/sa/salt-lint/package.nix b/pkgs/by-name/sa/salt-lint/package.nix index 712ae494afb4..859a84ee7d3f 100644 --- a/pkgs/by-name/sa/salt-lint/package.nix +++ b/pkgs/by-name/sa/salt-lint/package.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Command-line utility that checks for best practices in SaltStack"; diff --git a/pkgs/by-name/sa/saml2aws/package.nix b/pkgs/by-name/sa/saml2aws/package.nix new file mode 100644 index 000000000000..5a698ee06811 --- /dev/null +++ b/pkgs/by-name/sa/saml2aws/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: + +buildGoModule rec { + pname = "saml2aws"; + version = "2.36.19"; + + src = fetchFromGitHub { + owner = "Versent"; + repo = "saml2aws"; + rev = "v${version}"; + sha256 = "sha256-5g7mbjBkjNl1xvMMJXcITOZTNWXE7m2WhzzvLuULcuo="; + }; + + vendorHash = "sha256-oCYtEMx3+wK1TyS18iYgRwH3NopWY63xsguvanNDSEo="; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ + "." + "cmd/saml2aws" + ]; + + ldflags = [ + "-X main.Version=${version}" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd saml2aws \ + --bash <($out/bin/saml2aws --completion-script-bash) \ + --zsh <($out/bin/saml2aws --completion-script-zsh) + ''; + + meta = with lib; { + description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; + mainProgram = "saml2aws"; + homepage = "https://github.com/Versent/saml2aws"; + license = licenses.mit; + maintainers = [ lib.maintainers.pmyjavec ]; + }; +} diff --git a/pkgs/by-name/sa/sammler/package.nix b/pkgs/by-name/sa/sammler/package.nix index 7a1c9247a85a..1b65d1a61b60 100644 --- a/pkgs/by-name/sa/sammler/package.nix +++ b/pkgs/by-name/sa/sammler/package.nix @@ -25,6 +25,7 @@ buildGoModule rec { mainProgram = "sammler"; homepage = "https://github.com/redcode-labs/Sammler"; license = licenses.mit; - maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members; + maintainers = with maintainers; [ fab ]; + teams = [ teams.redcodelabs ]; }; } diff --git a/pkgs/by-name/sa/sampler/package.nix b/pkgs/by-name/sa/sampler/package.nix index ec2e35728b1c..1f1f993d4915 100644 --- a/pkgs/by-name/sa/sampler/package.nix +++ b/pkgs/by-name/sa/sampler/package.nix @@ -3,7 +3,6 @@ buildGoModule, fetchFromGitHub, fetchpatch, - darwin, alsa-lib, stdenv, }: @@ -33,11 +32,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = - lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenAL - ]; + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib; meta = with lib; { description = "Tool for shell commands execution, visualization and alerting"; diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index b0fba4887cd4..1c6d2f8a4db3 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, versionCheckHook, nix-update-script, }: @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-mQykzO9Ldokd3PZ1fY4pK/GtLmYMVas2iHj1Pqi9WqQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; doInstallCheck = true; diff --git a/pkgs/by-name/sa/sane-airscan/package.nix b/pkgs/by-name/sa/sane-airscan/package.nix index 69738bf67f6b..6723521379ac 100644 --- a/pkgs/by-name/sa/sane-airscan/package.nix +++ b/pkgs/by-name/sa/sane-airscan/package.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.33"; + version = "0.99.35"; nativeBuildInputs = [ meson @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "sha256-qZ7j76cwJQxGXbgIkV2bYt7puG0lSEw/d6d3fw19TCk="; + sha256 = "sha256-sWBqYoeCEAIM5Gug+w4b4WZ8SwFrywqJVzo0nt69diA="; }; meta = with lib; { diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/by-name/sa/sapling/Cargo.lock similarity index 100% rename from pkgs/applications/version-management/sapling/Cargo.lock rename to pkgs/by-name/sa/sapling/Cargo.lock diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/by-name/sa/sapling/deps.json similarity index 100% rename from pkgs/applications/version-management/sapling/deps.json rename to pkgs/by-name/sa/sapling/deps.json diff --git a/pkgs/applications/version-management/sapling/gen-deps.py b/pkgs/by-name/sa/sapling/gen-deps.py similarity index 100% rename from pkgs/applications/version-management/sapling/gen-deps.py rename to pkgs/by-name/sa/sapling/gen-deps.py diff --git a/pkgs/by-name/sa/sapling/package.nix b/pkgs/by-name/sa/sapling/package.nix new file mode 100644 index 000000000000..a44df071c8de --- /dev/null +++ b/pkgs/by-name/sa/sapling/package.nix @@ -0,0 +1,198 @@ +{ + lib, + stdenv, + python311Packages, + fetchFromGitHub, + fetchurl, + cargo, + curl, + pkg-config, + openssl, + rustPlatform, + rustc, + fetchYarnDeps, + yarn, + nodejs, + fixup-yarn-lock, + glibcLocales, + libiconv, + + enableMinimal ? false, +}: + +let + inherit (lib.importJSON ./deps.json) links version versionHash; + # Sapling sets a Cargo config containing lines like so: + # [target.aarch64-apple-darwin] + # rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"] + # + # The default cargo config that's set by the build hook will set + # unstable.host-config and unstable.target-applies-to-host which seems to + # result in the link arguments above being ignored and thus link failures. + # All it is there to do anyway is just to do stuff with musl and cross + # compilation, which doesn't work on macOS anyway so we can just stub it + # on macOS. + # + # See https://github.com/NixOS/nixpkgs/pull/198311#issuecomment-1326894295 + myCargoSetupHook = rustPlatform.cargoSetupHook.overrideAttrs (old: { + cargoConfig = lib.optionalString (!stdenv.hostPlatform.isDarwin) old.cargoConfig; + }); + + src = fetchFromGitHub { + owner = "facebook"; + repo = "sapling"; + rev = version; + hash = "sha256-4pOpJ91esTSH90MvvMu74CnlLULLUawqxcniUeqnLwA="; + }; + + addonsSrc = "${src}/addons"; + + # Fetches the Yarn modules in Nix to to be used as an offline cache + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${addonsSrc}/yarn.lock"; + sha256 = "sha256-jCtrflwDrwql6rY1ff1eXLKdwmnXhg5bCJPlCczBCIk="; + }; + + # Builds the NodeJS server that runs with `sl web` + isl = stdenv.mkDerivation { + pname = "sapling-isl"; + src = addonsSrc; + inherit version; + + nativeBuildInputs = [ + fixup-yarn-lock + nodejs + yarn + ]; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + fixup-yarn-lock yarn.lock + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress + patchShebangs node_modules + patchShebangs isl/node_modules + + substituteInPlace build-tar.py \ + --replace-fail 'run(yarn + ["--cwd", src_join(), "install", "--prefer-offline"])' 'pass' + + ${python311Packages.python}/bin/python3 build-tar.py \ + --output isl-dist.tar.xz \ + --yarn 'yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress' + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + install isl-dist.tar.xz $out/isl-dist.tar.xz + + runHook postInstall + ''; + }; +in +# Builds the main `sl` binary and its Python extensions +python311Packages.buildPythonApplication { + pname = "sapling"; + inherit src version; + + sourceRoot = "${src.name}/eden/scm"; + + # Upstream does not commit Cargo.lock + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; + "cloned-0.1.0" = "sha256-2BaNR/pQmR7pHtRf6VBQLcZgLHbj2JCxeX4auAB0efU="; + "fb303_core-0.0.0" = "sha256-PDGdKjR6KPv1uH1JSTeoG5Rs0ZkmNJLqqSXtvV3RWic="; + "fbthrift-0.0.1+unstable" = "sha256-J4REXGuLjHyN3SHilSWhMoqpRcn1QnEtsTsZF4Z3feU="; + "serde_bser-0.4.0" = "sha256-Su1IP3NzQu/87p/+uQaG8JcICL9hit3OV1O9oFiACsQ="; + }; + }; + 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, + # fetch the artifacts manually and link them. Then replace the hardcoded URLs + # with filesystem paths for the curl calls. + postUnpack = '' + mkdir $sourceRoot/hack_pydeps + ${lib.concatStrings ( + map (li: "ln -s ${fetchurl li} $sourceRoot/hack_pydeps/${baseNameOf li.url}\n") links + )} + sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py + ''; + + postInstall = '' + install ${isl}/isl-dist.tar.xz $out/lib/isl-dist.tar.xz + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + wrapProgram $out/bin/sl \ + --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" + ''; + + nativeBuildInputs = [ + curl + pkg-config + myCargoSetupHook + cargo + rustc + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + libiconv + ]; + + HGNAME = "sl"; + SAPLING_OSS_BUILD = "true"; + SAPLING_VERSION_HASH = versionHash; + + # Python setuptools version 66 and newer does not support upstream Sapling's + # version numbers (e.g. "0.2.20230124-180750-hf8cd450a"). Change the version + # number to something supported by setuptools (e.g. "0.2.20230124"). + # https://github.com/facebook/sapling/issues/571 + SAPLING_VERSION = builtins.elemAt (builtins.split "-" version) 0; + + # just a simple check phase, until we have a running test suite. this should + # help catch issues like lack of a LOCALE_ARCHIVE setting (see GH PR #202760) + doCheck = true; + installCheckPhase = '' + echo -n "testing sapling version; should be \"$SAPLING_VERSION\"... " + $out/bin/sl version | grep -qw "$SAPLING_VERSION" + echo "OK!" + ''; + + # Expose isl to nix repl as sapling.isl. + passthru.isl = isl; + + meta = with lib; { + description = "Scalable, User-Friendly Source Control System"; + homepage = "https://sapling-scm.com"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ + pbar + thoughtpolice + ]; + platforms = platforms.unix; + mainProgram = "sl"; + }; +} diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index 1fe6fd9bd791..12a14748d315 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.29"; + version = "1.0.30"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-KQ+ooPJZx/HnhR/EvemaEb5gqffRP2+BRhrHfI9FK/Q="; + hash = "sha256-or/XzPJhWe7F2sMsWxaIynXALnMhzKQeezTt16tzqoY="; }; sourceRoot = "."; diff --git a/pkgs/by-name/sa/sarif-converter/package.nix b/pkgs/by-name/sa/sarif-converter/package.nix new file mode 100644 index 000000000000..19e6a50802d8 --- /dev/null +++ b/pkgs/by-name/sa/sarif-converter/package.nix @@ -0,0 +1,47 @@ +{ + lib, + buildGoModule, + fetchFromGitLab, + nix-update-script, + sarif-converter, + testers, +}: + +buildGoModule (finalAttrs: { + pname = "sarif-converter"; + version = "0.9.4"; + + src = fetchFromGitLab { + owner = "ignis-build"; + repo = "sarif-converter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q8L4C4mTJEfxASqrUAZlMoLx71/+nmP6mwW/vNFStTs="; + }; + + vendorHash = "sha256-vK+HhHlFWoWIrDEZzfRoqtJ3vKp0f4b8l8+LBlZuBJU="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + ]; + + postInstall = '' + mv $out/bin/main $out/bin/sarif-converter + ''; + + passthru = { + tests.version = testers.testVersion { + package = sarif-converter; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Convert from [SARIF](https://sarifweb.azurewebsites.net/) to GitLab Code Quality and SAST report"; + homepage = "https://gitlab.com/ignis-build/sarif-converter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + mainProgram = "sarif-converter"; + }; +}) diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix index 121762365651..cba1bff8a1ef 100644 --- a/pkgs/by-name/sa/sarif-fmt/package.nix +++ b/pkgs/by-name/sa/sarif-fmt/package.nix @@ -8,15 +8,15 @@ }: rustPlatform.buildRustPackage rec { pname = "sarif-fmt"; - version = "0.7.0"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-uQQ/UbmyPJbilxP2R+6KyBkf2dzGohN22xCCtU31y0s="; + hash = "sha256-Xc9uc//5wTBWJ89mcaC/4c8/xtTvnu8g2Aa1viUhluo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-naABVC4z5tYfe/Y2Gw4wp2Ye9wIF0Wq7jqhelcRQY30="; + cargoHash = "sha256-h4g4+2yiqr3CTkSgv8fTHEVQwSunFfYFhIczSGA+M5U="; # `test_clippy` (the only test we enable) is broken on Darwin # because `--enable-profiler` is not enabled in rustc on Darwin diff --git a/pkgs/by-name/sa/satdump/package.nix b/pkgs/by-name/sa/satdump/package.nix new file mode 100644 index 000000000000..3da37757f09f --- /dev/null +++ b/pkgs/by-name/sa/satdump/package.nix @@ -0,0 +1,111 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + cmake, + pkg-config, + # required dependencies + fftwFloat, + libpng, + libtiff, + jemalloc, + volk, + nng, + curl, + # Optional dependencies + withZIQRecordingCompression ? true, + zstd, + withGUI ? true, + glfw, + zenity, + withAudio ? true, + portaudio, + withOfficialProductSupport ? true, + hdf5, + withOpenCL ? true, + opencl-headers, + ocl-icd, + withSourceRtlsdr ? true, + rtl-sdr-librtlsdr, + withSourceHackRF ? true, + hackrf, + withSourceAirspy ? true, + airspy, + withSourceAirspyHF ? true, + airspyhf, + withSourceAD9361 ? true, + libad9361, + libiio, + withSourceBladeRF ? true, + libbladeRF, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "satdump"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "SatDump"; + repo = "SatDump"; + tag = finalAttrs.version; + hash = "sha256-+Sne+NMwnIAs3ff64fBHAIE4/iDExIC64sXtO0LJwI0="; + }; + + postPatch = '' + substituteInPlace src-core/CMakeLists.txt \ + --replace-fail '$'{CMAKE_INSTALL_PREFIX}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = + [ + fftwFloat + libpng + libtiff + jemalloc + volk + nng + curl + ] + ++ lib.optionals withZIQRecordingCompression [ zstd ] + ++ lib.optionals withGUI [ + glfw + zenity + ] + ++ lib.optionals withAudio [ portaudio ] + ++ lib.optionals withOfficialProductSupport [ hdf5 ] + ++ lib.optionals withOpenCL [ + opencl-headers + ocl-icd + ] + ++ lib.optionals withSourceRtlsdr [ rtl-sdr-librtlsdr ] + ++ lib.optionals withSourceHackRF [ hackrf ] + ++ lib.optionals withSourceAirspy [ airspy ] + ++ lib.optionals withSourceAirspyHF [ airspyhf ] + ++ lib.optionals withSourceAD9361 [ + libad9361 + libiio + ] + ++ lib.optionals withSourceBladeRF [ libbladeRF ]; + + cmakeFlags = [ (lib.cmakeBool "BUILD_GUI" withGUI) ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A generic satellite data processing software"; + homepage = "https://www.satdump.org/"; + changelog = "https://github.com/SatDump/SatDump/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + theverygaming + ]; + mainProgram = "satdump"; + }; +}) diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix index 6411512c8a69..ace84e0a9681 100644 --- a/pkgs/by-name/sa/satellite/package.nix +++ b/pkgs/by-name/sa/satellite/package.nix @@ -6,11 +6,12 @@ libadwaita, modemmanager, wrapGAppsHook4, + nix-update-script, }: python3.pkgs.buildPythonApplication rec { pname = "satellite"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; @@ -19,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tpikonen"; repo = "satellite"; tag = version; - hash = "sha256-w0ZpH1joFoV7W7PH74//LGLUJQLCpAGcC6GlyTbdsTE="; + hash = "sha256-E/OKdVB+JDP/01ydEgA/B6+GMiVYB4jlPI70TW8HBDU="; }; nativeBuildInputs = [ @@ -42,6 +43,10 @@ python3.pkgs.buildPythonApplication rec { strictDeps = true; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Program for showing navigation satellite data"; longDescription = '' diff --git a/pkgs/by-name/sa/satisfactorymodmanager/add-generated-files.patch b/pkgs/by-name/sa/satisfactorymodmanager/add-generated-files.patch new file mode 100644 index 000000000000..0f707e92060e --- /dev/null +++ b/pkgs/by-name/sa/satisfactorymodmanager/add-generated-files.patch @@ -0,0 +1,9727 @@ +diff --git a/frontend/src/lib/generated/graphql/graphql.schema.urql.json b/frontend/src/lib/generated/graphql/graphql.schema.urql.json +new file mode 100644 +index 0000000..b8e497a +--- /dev/null ++++ b/frontend/src/lib/generated/graphql/graphql.schema.urql.json +@@ -0,0 +1,3576 @@ ++{ ++ "__schema": { ++ "queryType": { ++ "name": "Query", ++ "kind": "OBJECT" ++ }, ++ "mutationType": { ++ "name": "Mutation", ++ "kind": "OBJECT" ++ }, ++ "subscriptionType": null, ++ "types": [ ++ { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "fields": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "importance", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "message", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Compatibility", ++ "fields": [ ++ { ++ "name": "note", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "state", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "CompatibilityInfo", ++ "fields": [ ++ { ++ "name": "EA", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Compatibility", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "EXP", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Compatibility", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "CreateVersionResponse", ++ "fields": [ ++ { ++ "name": "auto_approved", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetGuides", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "guides", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetMods", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetMyMods", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetMyVersions", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "versions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetSMLVersions", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "sml_versions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "SMLVersion", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetVersions", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "versions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Group", ++ "fields": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "name", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "fields": [ ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "guide", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "name", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "short_description", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "tags", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "updated_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "user", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "user_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "views", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "LatestVersions", ++ "fields": [ ++ { ++ "name": "alpha", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "beta", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "release", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "fields": [ ++ { ++ "name": "approved", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "authors", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "UserMod", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "compatibility", ++ "type": { ++ "kind": "OBJECT", ++ "name": "CompatibilityInfo", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "creator_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "downloads", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "full_description", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "hidden", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "hotness", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "last_version_date", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "latestVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "LatestVersions", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "logo", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "logo_thumbhash", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_reference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "name", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "popularity", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "short_description", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "source_url", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "tags", ++ "type": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "toggle_explicit_content", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "toggle_network_use", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "updated_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "versions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "views", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "ModVersion", ++ "fields": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_reference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "versions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Mutation", ++ "fields": [ ++ { ++ "name": "approveMod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "approveVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createAnnouncement", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "announcement", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createGuide", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "guide", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createMod", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "mod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createMultipleTags", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "tagNames", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createSatisfactoryVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "SatisfactoryVersion", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "input", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createTag", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "description", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "tagName", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteAnnouncement", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "announcementId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteGuide", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "guideId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteMod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteSatisfactoryVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteTag", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "tagID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "denyMod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "denyVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "discourseSSO", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [ ++ { ++ "name": "sig", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "sso", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "finalizeCreateVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "logout", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "oAuthFacebook", ++ "type": { ++ "kind": "OBJECT", ++ "name": "UserSession", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "code", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "state", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "oAuthGithub", ++ "type": { ++ "kind": "OBJECT", ++ "name": "UserSession", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "code", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "state", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "oAuthGoogle", ++ "type": { ++ "kind": "OBJECT", ++ "name": "UserSession", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "code", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "state", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateAnnouncement", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "announcement", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "announcementId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateGuide", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "guide", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "guideId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateMod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "mod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateModCompatibility", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "compatibility", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateMultipleModCompatibilities", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "compatibility", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "modIDs", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateSatisfactoryVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "SatisfactoryVersion", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "input", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateTag", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "NewName", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "description", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "tagID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateUser", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "input", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "userId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "uploadVersionPart", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "file", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "part", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "OAuthOptions", ++ "fields": [ ++ { ++ "name": "facebook", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "github", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "google", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Query", ++ "fields": [ ++ { ++ "name": "checkVersionUploadState", ++ "type": { ++ "kind": "OBJECT", ++ "name": "CreateVersionResponse", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getAnnouncement", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "announcementId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getAnnouncements", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "getAnnouncementsByImportance", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "importance", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getGuide", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "guideId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getGuides", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetGuides", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMe", ++ "type": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "getMod", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getModAssetList", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "modReference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getModByIdOrReference", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "modIdOrReference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getModByReference", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "modReference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMods", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMyMods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMyMods", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMyUnapprovedMods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMyMods", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMyUnapprovedVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMyVersions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMyVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMyVersions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getOAuthOptions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "OAuthOptions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "callback_url", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getSMLVersion", ++ "type": { ++ "kind": "OBJECT", ++ "name": "SMLVersion", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "smlVersionID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getSMLVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetSMLVersions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getSatisfactoryVersion", ++ "type": { ++ "kind": "OBJECT", ++ "name": "SatisfactoryVersion", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getSatisfactoryVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "SatisfactoryVersion", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "getTag", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "tagID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getTags", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getUnapprovedMods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMods", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getUnapprovedVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetVersions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getUser", ++ "type": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "userId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getUsers", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "userIds", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getVersion", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetVersions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "resolveModVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "ModVersion", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ } ++ } ++ ] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "SMLVersion", ++ "fields": [ ++ { ++ "name": "bootstrap_version", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "changelog", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "date", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "engine_version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "link", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "satisfactory_version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "stability", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "targets", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "SMLVersionTarget", ++ "ofType": null ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "updated_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "SMLVersionTarget", ++ "fields": [ ++ { ++ "name": "VersionID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "link", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "targetName", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "SatisfactoryVersion", ++ "fields": [ ++ { ++ "name": "engine_version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "fields": [ ++ { ++ "name": "description", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "name", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "User", ++ "fields": [ ++ { ++ "name": "avatar", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "avatar_thumbhash", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "email", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "facebook_id", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "github_id", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "google_id", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "groups", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Group", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "guides", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "UserMod", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "roles", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "UserRoles", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "username", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "UserMod", ++ "fields": [ ++ { ++ "name": "mod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "role", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "user", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "user_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "UserRoles", ++ "fields": [ ++ { ++ "name": "approveMods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "approveVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "deleteContent", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "editAnyModCompatibility", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "editBootstrapVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "editContent", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "editSatisfactoryVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "editUsers", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "UserSession", ++ "fields": [ ++ { ++ "name": "token", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Version", ++ "fields": [ ++ { ++ "name": "approved", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "changelog", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "dependencies", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "VersionDependency", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "downloads", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "game_version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "hash", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "link", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "metadata", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "required_on_remote", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "size", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "sml_version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "stability", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "targets", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "VersionTarget", ++ "ofType": null ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "updated_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "virustotal_results", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "VirustotalResult", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "VersionDependency", ++ "fields": [ ++ { ++ "name": "condition", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_reference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "optional", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "VersionTarget", ++ "fields": [ ++ { ++ "name": "VersionID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "hash", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "link", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "size", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "targetName", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "VirustotalResult", ++ "fields": [ ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "file_name", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "hash", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "safe", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "updated_at", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ ], ++ "directives": [] ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/graphql/graphql.ts b/frontend/src/lib/generated/graphql/graphql.ts +new file mode 100644 +index 0000000..93bc403 +--- /dev/null ++++ b/frontend/src/lib/generated/graphql/graphql.ts +@@ -0,0 +1,1007 @@ ++/* eslint-disable */ ++import type { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core'; ++export type Maybe = T | null; ++export type InputMaybe = Maybe; ++export type Exact = { [K in keyof T]: T[K] }; ++export type MakeOptional = Omit & { [SubKey in K]?: Maybe }; ++export type MakeMaybe = Omit & { [SubKey in K]: Maybe }; ++export type MakeEmpty = { [_ in K]?: never }; ++export type Incremental = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never }; ++/** All built-in and custom scalars, mapped to their actual values */ ++export type Scalars = { ++ ID: { input: string; output: string; } ++ String: { input: string; output: string; } ++ Boolean: { input: boolean; output: boolean; } ++ Int: { input: number; output: number; } ++ Float: { input: number; output: number; } ++ AnnouncementID: { input: string; output: string; } ++ Date: { input: any; output: any; } ++ GuideID: { input: string; output: string; } ++ ModID: { input: string; output: string; } ++ ModReference: { input: string; output: string; } ++ SMLVersionID: { input: any; output: any; } ++ SatisfactoryVersionID: { input: any; output: any; } ++ TagID: { input: string; output: string; } ++ TagName: { input: any; output: any; } ++ Upload: { input: any; output: any; } ++ UserID: { input: string; output: string; } ++ VersionID: { input: string; output: string; } ++ VirustotalHash: { input: any; output: any; } ++ VirustotalID: { input: any; output: any; } ++}; ++ ++export type Announcement = { ++ __typename?: 'Announcement'; ++ id: Scalars['AnnouncementID']['output']; ++ importance: AnnouncementImportance; ++ message: Scalars['String']['output']; ++}; ++ ++export enum AnnouncementImportance { ++ Alert = 'Alert', ++ Fix = 'Fix', ++ Info = 'Info', ++ Warning = 'Warning' ++} ++ ++export type Compatibility = { ++ __typename?: 'Compatibility'; ++ note?: Maybe; ++ state: CompatibilityState; ++}; ++ ++export type CompatibilityInfo = { ++ __typename?: 'CompatibilityInfo'; ++ EA: Compatibility; ++ EXP: Compatibility; ++}; ++ ++export type CompatibilityInfoInput = { ++ EA: CompatibilityInput; ++ EXP: CompatibilityInput; ++}; ++ ++export type CompatibilityInput = { ++ note?: InputMaybe; ++ state: CompatibilityState; ++}; ++ ++export enum CompatibilityState { ++ Broken = 'Broken', ++ Damaged = 'Damaged', ++ Works = 'Works' ++} ++ ++export type CreateVersionResponse = { ++ __typename?: 'CreateVersionResponse'; ++ auto_approved: Scalars['Boolean']['output']; ++ version?: Maybe; ++}; ++ ++export type GetGuides = { ++ __typename?: 'GetGuides'; ++ count: Scalars['Int']['output']; ++ guides: Array; ++}; ++ ++export type GetMods = { ++ __typename?: 'GetMods'; ++ count: Scalars['Int']['output']; ++ mods: Array; ++}; ++ ++export type GetMyMods = { ++ __typename?: 'GetMyMods'; ++ count: Scalars['Int']['output']; ++ mods: Array; ++}; ++ ++export type GetMyVersions = { ++ __typename?: 'GetMyVersions'; ++ count: Scalars['Int']['output']; ++ versions: Array; ++}; ++ ++export type GetSmlVersions = { ++ __typename?: 'GetSMLVersions'; ++ count: Scalars['Int']['output']; ++ sml_versions: Array; ++}; ++ ++export type GetVersions = { ++ __typename?: 'GetVersions'; ++ count: Scalars['Int']['output']; ++ versions: Array; ++}; ++ ++export type Group = { ++ __typename?: 'Group'; ++ id: Scalars['String']['output']; ++ name: Scalars['String']['output']; ++}; ++ ++export type Guide = { ++ __typename?: 'Guide'; ++ created_at: Scalars['Date']['output']; ++ guide: Scalars['String']['output']; ++ id: Scalars['GuideID']['output']; ++ name: Scalars['String']['output']; ++ short_description: Scalars['String']['output']; ++ tags: Array; ++ updated_at: Scalars['Date']['output']; ++ user: User; ++ user_id: Scalars['UserID']['output']; ++ views: Scalars['Int']['output']; ++}; ++ ++export enum GuideFields { ++ CreatedAt = 'created_at', ++ Name = 'name', ++ UpdatedAt = 'updated_at', ++ Views = 'views' ++} ++ ++export type GuideFilter = { ++ ids?: InputMaybe>; ++ limit?: InputMaybe; ++ offset?: InputMaybe; ++ order?: InputMaybe; ++ order_by?: InputMaybe; ++ search?: InputMaybe; ++ tagIDs?: InputMaybe>; ++}; ++ ++export type LatestVersions = { ++ __typename?: 'LatestVersions'; ++ alpha?: Maybe; ++ beta?: Maybe; ++ release?: Maybe; ++}; ++ ++export type Mod = { ++ __typename?: 'Mod'; ++ approved: Scalars['Boolean']['output']; ++ authors: Array; ++ compatibility?: Maybe; ++ created_at: Scalars['Date']['output']; ++ creator_id: Scalars['UserID']['output']; ++ downloads: Scalars['Int']['output']; ++ full_description?: Maybe; ++ hidden: Scalars['Boolean']['output']; ++ hotness: Scalars['Int']['output']; ++ id: Scalars['ModID']['output']; ++ last_version_date?: Maybe; ++ latestVersions: LatestVersions; ++ logo?: Maybe; ++ logo_thumbhash?: Maybe; ++ mod_reference: Scalars['ModReference']['output']; ++ name: Scalars['String']['output']; ++ popularity: Scalars['Int']['output']; ++ short_description: Scalars['String']['output']; ++ source_url?: Maybe; ++ tags?: Maybe>; ++ toggle_explicit_content: Scalars['Boolean']['output']; ++ toggle_network_use: Scalars['Boolean']['output']; ++ updated_at: Scalars['Date']['output']; ++ version?: Maybe; ++ versions: Array; ++ views: Scalars['Int']['output']; ++}; ++ ++ ++export type ModVersionArgs = { ++ version: Scalars['String']['input']; ++}; ++ ++ ++export type ModVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++export enum ModFields { ++ CreatedAt = 'created_at', ++ Downloads = 'downloads', ++ Hotness = 'hotness', ++ LastVersionDate = 'last_version_date', ++ Name = 'name', ++ Popularity = 'popularity', ++ Search = 'search', ++ UpdatedAt = 'updated_at', ++ Views = 'views' ++} ++ ++export type ModFilter = { ++ hidden?: InputMaybe; ++ ids?: InputMaybe>; ++ limit?: InputMaybe; ++ offset?: InputMaybe; ++ order?: InputMaybe; ++ order_by?: InputMaybe; ++ references?: InputMaybe>; ++ search?: InputMaybe; ++ tagIDs?: InputMaybe>; ++}; ++ ++export type ModVersion = { ++ __typename?: 'ModVersion'; ++ id: Scalars['ModID']['output']; ++ mod_reference: Scalars['ModReference']['output']; ++ versions: Array; ++}; ++ ++export type ModVersionConstraint = { ++ modIdOrReference: Scalars['String']['input']; ++ version: Scalars['String']['input']; ++}; ++ ++export type Mutation = { ++ __typename?: 'Mutation'; ++ approveMod: Scalars['Boolean']['output']; ++ approveVersion: Scalars['Boolean']['output']; ++ createAnnouncement?: Maybe; ++ createGuide?: Maybe; ++ createMod?: Maybe; ++ createMultipleTags: Array; ++ createSatisfactoryVersion: SatisfactoryVersion; ++ createTag?: Maybe; ++ createVersion: Scalars['VersionID']['output']; ++ deleteAnnouncement: Scalars['Boolean']['output']; ++ deleteGuide: Scalars['Boolean']['output']; ++ deleteMod: Scalars['Boolean']['output']; ++ deleteSatisfactoryVersion: Scalars['Boolean']['output']; ++ deleteTag: Scalars['Boolean']['output']; ++ deleteVersion: Scalars['Boolean']['output']; ++ denyMod: Scalars['Boolean']['output']; ++ denyVersion: Scalars['Boolean']['output']; ++ discourseSSO?: Maybe; ++ finalizeCreateVersion: Scalars['Boolean']['output']; ++ logout: Scalars['Boolean']['output']; ++ oAuthFacebook?: Maybe; ++ oAuthGithub?: Maybe; ++ oAuthGoogle?: Maybe; ++ updateAnnouncement: Announcement; ++ updateGuide: Guide; ++ updateMod: Mod; ++ updateModCompatibility: Scalars['Boolean']['output']; ++ updateMultipleModCompatibilities: Scalars['Boolean']['output']; ++ updateSatisfactoryVersion: SatisfactoryVersion; ++ updateTag: Tag; ++ updateUser: User; ++ updateVersion: Version; ++ uploadVersionPart: Scalars['Boolean']['output']; ++}; ++ ++ ++export type MutationApproveModArgs = { ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationApproveVersionArgs = { ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type MutationCreateAnnouncementArgs = { ++ announcement: NewAnnouncement; ++}; ++ ++ ++export type MutationCreateGuideArgs = { ++ guide: NewGuide; ++}; ++ ++ ++export type MutationCreateModArgs = { ++ mod: NewMod; ++}; ++ ++ ++export type MutationCreateMultipleTagsArgs = { ++ tagNames: Array; ++}; ++ ++ ++export type MutationCreateSatisfactoryVersionArgs = { ++ input: NewSatisfactoryVersion; ++}; ++ ++ ++export type MutationCreateTagArgs = { ++ description: Scalars['String']['input']; ++ tagName: Scalars['TagName']['input']; ++}; ++ ++ ++export type MutationCreateVersionArgs = { ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationDeleteAnnouncementArgs = { ++ announcementId: Scalars['AnnouncementID']['input']; ++}; ++ ++ ++export type MutationDeleteGuideArgs = { ++ guideId: Scalars['GuideID']['input']; ++}; ++ ++ ++export type MutationDeleteModArgs = { ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationDeleteSatisfactoryVersionArgs = { ++ id: Scalars['SatisfactoryVersionID']['input']; ++}; ++ ++ ++export type MutationDeleteTagArgs = { ++ tagID: Scalars['TagID']['input']; ++}; ++ ++ ++export type MutationDeleteVersionArgs = { ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type MutationDenyModArgs = { ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationDenyVersionArgs = { ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type MutationDiscourseSsoArgs = { ++ sig: Scalars['String']['input']; ++ sso: Scalars['String']['input']; ++}; ++ ++ ++export type MutationFinalizeCreateVersionArgs = { ++ modId: Scalars['ModID']['input']; ++ version: NewVersion; ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type MutationOAuthFacebookArgs = { ++ code: Scalars['String']['input']; ++ state: Scalars['String']['input']; ++}; ++ ++ ++export type MutationOAuthGithubArgs = { ++ code: Scalars['String']['input']; ++ state: Scalars['String']['input']; ++}; ++ ++ ++export type MutationOAuthGoogleArgs = { ++ code: Scalars['String']['input']; ++ state: Scalars['String']['input']; ++}; ++ ++ ++export type MutationUpdateAnnouncementArgs = { ++ announcement: UpdateAnnouncement; ++ announcementId: Scalars['AnnouncementID']['input']; ++}; ++ ++ ++export type MutationUpdateGuideArgs = { ++ guide: UpdateGuide; ++ guideId: Scalars['GuideID']['input']; ++}; ++ ++ ++export type MutationUpdateModArgs = { ++ mod: UpdateMod; ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationUpdateModCompatibilityArgs = { ++ compatibility: CompatibilityInfoInput; ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationUpdateMultipleModCompatibilitiesArgs = { ++ compatibility: CompatibilityInfoInput; ++ modIDs: Array; ++}; ++ ++ ++export type MutationUpdateSatisfactoryVersionArgs = { ++ id: Scalars['SatisfactoryVersionID']['input']; ++ input: UpdateSatisfactoryVersion; ++}; ++ ++ ++export type MutationUpdateTagArgs = { ++ NewName: Scalars['TagName']['input']; ++ description: Scalars['String']['input']; ++ tagID: Scalars['TagID']['input']; ++}; ++ ++ ++export type MutationUpdateUserArgs = { ++ input: UpdateUser; ++ userId: Scalars['UserID']['input']; ++}; ++ ++ ++export type MutationUpdateVersionArgs = { ++ version: UpdateVersion; ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type MutationUploadVersionPartArgs = { ++ file: Scalars['Upload']['input']; ++ modId: Scalars['ModID']['input']; ++ part: Scalars['Int']['input']; ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++export type NewAnnouncement = { ++ importance: AnnouncementImportance; ++ message: Scalars['String']['input']; ++}; ++ ++export type NewGuide = { ++ guide: Scalars['String']['input']; ++ name: Scalars['String']['input']; ++ short_description: Scalars['String']['input']; ++ tagIDs?: InputMaybe>; ++}; ++ ++export type NewMod = { ++ full_description?: InputMaybe; ++ hidden?: InputMaybe; ++ logo?: InputMaybe; ++ mod_reference: Scalars['ModReference']['input']; ++ name: Scalars['String']['input']; ++ short_description: Scalars['String']['input']; ++ source_url?: InputMaybe; ++ tagIDs?: InputMaybe>; ++ toggle_explicit_content?: InputMaybe; ++ toggle_network_use?: InputMaybe; ++}; ++ ++export type NewSatisfactoryVersion = { ++ engine_version: Scalars['String']['input']; ++ version: Scalars['Int']['input']; ++}; ++ ++export type NewTag = { ++ description: Scalars['String']['input']; ++ name: Scalars['TagName']['input']; ++}; ++ ++export type NewVersion = { ++ changelog: Scalars['String']['input']; ++ stability: VersionStabilities; ++}; ++ ++export type OAuthOptions = { ++ __typename?: 'OAuthOptions'; ++ facebook: Scalars['String']['output']; ++ github: Scalars['String']['output']; ++ google: Scalars['String']['output']; ++}; ++ ++export enum Order { ++ Asc = 'asc', ++ Desc = 'desc' ++} ++ ++export type Query = { ++ __typename?: 'Query'; ++ checkVersionUploadState?: Maybe; ++ getAnnouncement?: Maybe; ++ getAnnouncements: Array; ++ getAnnouncementsByImportance: Array; ++ getGuide?: Maybe; ++ getGuides: GetGuides; ++ getMe?: Maybe; ++ getMod?: Maybe; ++ getModAssetList: Array; ++ getModByIdOrReference?: Maybe; ++ getModByReference?: Maybe; ++ getMods: GetMods; ++ getMyMods: GetMyMods; ++ getMyUnapprovedMods: GetMyMods; ++ getMyUnapprovedVersions: GetMyVersions; ++ getMyVersions: GetMyVersions; ++ getOAuthOptions: OAuthOptions; ++ /** @deprecated SML is now a mod */ ++ getSMLVersion?: Maybe; ++ /** @deprecated SML is now a mod */ ++ getSMLVersions: GetSmlVersions; ++ getSatisfactoryVersion?: Maybe; ++ getSatisfactoryVersions: Array; ++ getTag?: Maybe; ++ getTags: Array; ++ getUnapprovedMods: GetMods; ++ getUnapprovedVersions: GetVersions; ++ getUser?: Maybe; ++ getUsers: Array>; ++ getVersion?: Maybe; ++ getVersions: GetVersions; ++ resolveModVersions: Array; ++}; ++ ++ ++export type QueryCheckVersionUploadStateArgs = { ++ modId: Scalars['ModID']['input']; ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type QueryGetAnnouncementArgs = { ++ announcementId: Scalars['AnnouncementID']['input']; ++}; ++ ++ ++export type QueryGetAnnouncementsByImportanceArgs = { ++ importance: AnnouncementImportance; ++}; ++ ++ ++export type QueryGetGuideArgs = { ++ guideId: Scalars['GuideID']['input']; ++}; ++ ++ ++export type QueryGetGuidesArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetModArgs = { ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type QueryGetModAssetListArgs = { ++ modReference: Scalars['ModID']['input']; ++}; ++ ++ ++export type QueryGetModByIdOrReferenceArgs = { ++ modIdOrReference: Scalars['String']['input']; ++}; ++ ++ ++export type QueryGetModByReferenceArgs = { ++ modReference: Scalars['ModReference']['input']; ++}; ++ ++ ++export type QueryGetModsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetMyModsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetMyUnapprovedModsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetMyUnapprovedVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetMyVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetOAuthOptionsArgs = { ++ callback_url: Scalars['String']['input']; ++}; ++ ++ ++export type QueryGetSmlVersionArgs = { ++ smlVersionID: Scalars['SMLVersionID']['input']; ++}; ++ ++ ++export type QueryGetSmlVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetSatisfactoryVersionArgs = { ++ id: Scalars['SatisfactoryVersionID']['input']; ++}; ++ ++ ++export type QueryGetTagArgs = { ++ tagID: Scalars['TagID']['input']; ++}; ++ ++ ++export type QueryGetTagsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetUnapprovedModsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetUnapprovedVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetUserArgs = { ++ userId: Scalars['UserID']['input']; ++}; ++ ++ ++export type QueryGetUsersArgs = { ++ userIds: Array; ++}; ++ ++ ++export type QueryGetVersionArgs = { ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type QueryGetVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryResolveModVersionsArgs = { ++ filter: Array; ++}; ++ ++export type SmlVersion = { ++ __typename?: 'SMLVersion'; ++ bootstrap_version?: Maybe; ++ changelog: Scalars['String']['output']; ++ created_at: Scalars['Date']['output']; ++ date: Scalars['Date']['output']; ++ engine_version: Scalars['String']['output']; ++ id: Scalars['SMLVersionID']['output']; ++ link: Scalars['String']['output']; ++ satisfactory_version: Scalars['Int']['output']; ++ stability: VersionStabilities; ++ targets: Array>; ++ updated_at: Scalars['Date']['output']; ++ version: Scalars['String']['output']; ++}; ++ ++export enum SmlVersionFields { ++ CreatedAt = 'created_at', ++ Date = 'date', ++ Name = 'name', ++ SatisfactoryVersion = 'satisfactory_version', ++ UpdatedAt = 'updated_at' ++} ++ ++export type SmlVersionFilter = { ++ ids?: InputMaybe>; ++ limit?: InputMaybe; ++ offset?: InputMaybe; ++ order?: InputMaybe; ++ order_by?: InputMaybe; ++ search?: InputMaybe; ++}; ++ ++export type SmlVersionTarget = { ++ __typename?: 'SMLVersionTarget'; ++ VersionID: Scalars['SMLVersionID']['output']; ++ link: Scalars['String']['output']; ++ targetName: TargetName; ++}; ++ ++export type SatisfactoryVersion = { ++ __typename?: 'SatisfactoryVersion'; ++ engine_version: Scalars['String']['output']; ++ id: Scalars['SatisfactoryVersionID']['output']; ++ version: Scalars['Int']['output']; ++}; ++ ++export type Tag = { ++ __typename?: 'Tag'; ++ description: Scalars['String']['output']; ++ id: Scalars['TagID']['output']; ++ name: Scalars['TagName']['output']; ++}; ++ ++export type TagFilter = { ++ ids?: InputMaybe>; ++ limit?: InputMaybe; ++ offset?: InputMaybe; ++ order?: InputMaybe; ++ search?: InputMaybe; ++}; ++ ++export enum TargetName { ++ LinuxServer = 'LinuxServer', ++ Windows = 'Windows', ++ WindowsServer = 'WindowsServer' ++} ++ ++export type UpdateAnnouncement = { ++ importance?: InputMaybe; ++ message?: InputMaybe; ++}; ++ ++export type UpdateGuide = { ++ guide?: InputMaybe; ++ name?: InputMaybe; ++ short_description?: InputMaybe; ++ tagIDs?: InputMaybe>; ++}; ++ ++export type UpdateMod = { ++ authors?: InputMaybe>; ++ compatibility?: InputMaybe; ++ full_description?: InputMaybe; ++ hidden?: InputMaybe; ++ logo?: InputMaybe; ++ mod_reference?: InputMaybe; ++ name?: InputMaybe; ++ short_description?: InputMaybe; ++ source_url?: InputMaybe; ++ tagIDs?: InputMaybe>; ++ toggle_explicit_content?: InputMaybe; ++ toggle_network_use?: InputMaybe; ++}; ++ ++export type UpdateSatisfactoryVersion = { ++ engine_version?: InputMaybe; ++ version?: InputMaybe; ++}; ++ ++export type UpdateUser = { ++ avatar?: InputMaybe; ++ groups?: InputMaybe>; ++ username?: InputMaybe; ++}; ++ ++export type UpdateUserMod = { ++ role: Scalars['String']['input']; ++ user_id: Scalars['UserID']['input']; ++}; ++ ++export type UpdateVersion = { ++ changelog?: InputMaybe; ++ stability?: InputMaybe; ++}; ++ ++export type User = { ++ __typename?: 'User'; ++ avatar?: Maybe; ++ avatar_thumbhash?: Maybe; ++ created_at: Scalars['Date']['output']; ++ email?: Maybe; ++ facebook_id?: Maybe; ++ github_id?: Maybe; ++ google_id?: Maybe; ++ groups: Array; ++ guides: Array; ++ id: Scalars['UserID']['output']; ++ mods: Array; ++ roles: UserRoles; ++ username: Scalars['String']['output']; ++}; ++ ++export type UserMod = { ++ __typename?: 'UserMod'; ++ mod: Mod; ++ mod_id: Scalars['ModID']['output']; ++ role: Scalars['String']['output']; ++ user: User; ++ user_id: Scalars['UserID']['output']; ++}; ++ ++export type UserRoles = { ++ __typename?: 'UserRoles'; ++ approveMods: Scalars['Boolean']['output']; ++ approveVersions: Scalars['Boolean']['output']; ++ deleteContent: Scalars['Boolean']['output']; ++ editAnyModCompatibility: Scalars['Boolean']['output']; ++ editBootstrapVersions: Scalars['Boolean']['output']; ++ editContent: Scalars['Boolean']['output']; ++ editSatisfactoryVersions: Scalars['Boolean']['output']; ++ editUsers: Scalars['Boolean']['output']; ++}; ++ ++export type UserSession = { ++ __typename?: 'UserSession'; ++ token: Scalars['String']['output']; ++}; ++ ++export type Version = { ++ __typename?: 'Version'; ++ approved: Scalars['Boolean']['output']; ++ changelog: Scalars['String']['output']; ++ created_at: Scalars['Date']['output']; ++ dependencies: Array; ++ downloads: Scalars['Int']['output']; ++ game_version: Scalars['String']['output']; ++ hash?: Maybe; ++ id: Scalars['VersionID']['output']; ++ link: Scalars['String']['output']; ++ metadata?: Maybe; ++ mod: Mod; ++ mod_id: Scalars['ModID']['output']; ++ required_on_remote: Scalars['Boolean']['output']; ++ size?: Maybe; ++ sml_version: Scalars['String']['output']; ++ stability: VersionStabilities; ++ targets: Array>; ++ updated_at: Scalars['Date']['output']; ++ version: Scalars['String']['output']; ++ virustotal_results: Array; ++}; ++ ++export type VersionDependency = { ++ __typename?: 'VersionDependency'; ++ condition: Scalars['String']['output']; ++ mod?: Maybe; ++ /** @deprecated soon will return actual mod id instead of reference. use mod_reference field instead! */ ++ mod_id: Scalars['ModID']['output']; ++ mod_reference: Scalars['String']['output']; ++ optional: Scalars['Boolean']['output']; ++ version?: Maybe; ++ version_id: Scalars['VersionID']['output']; ++}; ++ ++export enum VersionFields { ++ CreatedAt = 'created_at', ++ Downloads = 'downloads', ++ UpdatedAt = 'updated_at' ++} ++ ++export type VersionFilter = { ++ ids?: InputMaybe>; ++ limit?: InputMaybe; ++ offset?: InputMaybe; ++ order?: InputMaybe; ++ order_by?: InputMaybe; ++ search?: InputMaybe; ++}; ++ ++export enum VersionStabilities { ++ Alpha = 'alpha', ++ Beta = 'beta', ++ Release = 'release' ++} ++ ++export type VersionTarget = { ++ __typename?: 'VersionTarget'; ++ VersionID: Scalars['VersionID']['output']; ++ hash?: Maybe; ++ link: Scalars['String']['output']; ++ size?: Maybe; ++ targetName: TargetName; ++}; ++ ++export type VirustotalResult = { ++ __typename?: 'VirustotalResult'; ++ created_at: Scalars['Date']['output']; ++ file_name: Scalars['String']['output']; ++ hash: Scalars['VirustotalHash']['output']; ++ id?: Maybe; ++ safe: Scalars['Boolean']['output']; ++ updated_at?: Maybe; ++ version_id: Scalars['String']['output']; ++}; ++ ++export type GetAnnouncementsQueryVariables = Exact<{ [key: string]: never; }>; ++ ++ ++export type GetAnnouncementsQuery = { __typename?: 'Query', getAnnouncements: Array<{ __typename?: 'Announcement', id: string, message: string, importance: AnnouncementImportance }> }; ++ ++export type SmrHealthcheckQueryVariables = Exact<{ [key: string]: never; }>; ++ ++ ++export type SmrHealthcheckQuery = { __typename?: 'Query', getMods: { __typename?: 'GetMods', count: number } }; ++ ++export type GetModCountQueryVariables = Exact<{ [key: string]: never; }>; ++ ++ ++export type GetModCountQuery = { __typename?: 'Query', getMods: { __typename?: 'GetMods', count: number } }; ++ ++export type GetModDetailsQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type GetModDetailsQuery = { __typename?: 'Query', mod?: { __typename?: 'Mod', name: string, logo?: string | null, logo_thumbhash?: string | null, mod_reference: string, full_description?: string | null, created_at: any, last_version_date?: any | null, downloads: number, views: number, hidden: boolean, id: string, compatibility?: { __typename?: 'CompatibilityInfo', EA: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null }, EXP: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null } } | null, authors: Array<{ __typename?: 'UserMod', role: string, user: { __typename?: 'User', id: string, username: string, avatar?: string | null } }>, versions: Array<{ __typename?: 'Version', id: string, version: string, size?: number | null, changelog: string }> } | null }; ++ ++export type ModKeyFragment = { __typename?: 'Mod', id: string, mod_reference: string }; ++ ++export type GetModNameQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type GetModNameQuery = { __typename?: 'Query', getModByReference?: { __typename?: 'Mod', name: string, id: string, mod_reference: string } | null }; ++ ++export type GetModNamesQueryVariables = Exact<{ ++ modReferences: Array | Scalars['String']['input']; ++}>; ++ ++ ++export type GetModNamesQuery = { __typename?: 'Query', getMods: { __typename?: 'GetMods', mods: Array<{ __typename?: 'Mod', name: string, id: string, mod_reference: string }> } }; ++ ++export type GetModReferenceQueryVariables = Exact<{ ++ modIdOrReference: Scalars['String']['input']; ++}>; ++ ++ ++export type GetModReferenceQuery = { __typename?: 'Query', getModByIdOrReference?: { __typename?: 'Mod', mod_reference: string, id: string } | null }; ++ ++export type GetModSummaryQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type GetModSummaryQuery = { __typename?: 'Query', mod?: { __typename?: 'Mod', name: string, logo?: string | null, mod_reference: string, created_at: any, downloads: number, views: number, short_description: string, id: string } | null }; ++ ++export type GetModsQueryVariables = Exact<{ ++ offset: Scalars['Int']['input']; ++ limit: Scalars['Int']['input']; ++}>; ++ ++ ++export type GetModsQuery = { __typename?: 'Query', getMods: { __typename?: 'GetMods', count: number, mods: Array<{ __typename?: 'Mod', mod_reference: string, name: string, logo?: string | null, logo_thumbhash?: string | null, short_description: string, hidden: boolean, popularity: number, hotness: number, views: number, downloads: number, last_version_date?: any | null, id: string, tags?: Array<{ __typename?: 'Tag', id: string, name: any }> | null, authors: Array<{ __typename?: 'UserMod', role: string, user: { __typename?: 'User', id: string, username: string } }>, compatibility?: { __typename?: 'CompatibilityInfo', EA: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null }, EXP: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null } } | null, versions: Array<{ __typename?: 'Version', id: string, version: string, game_version: string, required_on_remote: boolean, dependencies: Array<{ __typename?: 'VersionDependency', mod_reference: string, condition: string }>, targets: Array<{ __typename?: 'VersionTarget', targetName: TargetName } | null> }> }> } }; ++ ++export type GetChangelogQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type GetChangelogQuery = { __typename?: 'Query', getModByReference?: { __typename?: 'Mod', name: string, id: string, mod_reference: string, versions: Array<{ __typename?: 'Version', id: string, version: string, changelog: string }> } | null }; ++ ++export type ModReportedCompatibilityQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type ModReportedCompatibilityQuery = { __typename?: 'Query', getModByReference?: { __typename?: 'Mod', id: string, mod_reference: string, compatibility?: { __typename?: 'CompatibilityInfo', EA: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null }, EXP: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null } } | null } | null }; ++ ++export type ModVersionsCompatibilityQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type ModVersionsCompatibilityQuery = { __typename?: 'Query', getModByReference?: { __typename?: 'Mod', id: string, mod_reference: string, versions: Array<{ __typename?: 'Version', id: string, version: string, game_version: string, required_on_remote: boolean, targets: Array<{ __typename?: 'VersionTarget', targetName: TargetName } | null> }> } | null }; ++ ++export const ModKeyFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetAnnouncementsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAnnouncements"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getAnnouncements"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"message"}},{"kind":"Field","name":{"kind":"Name","value":"importance"}}]}}]}}]} as unknown as DocumentNode; ++export const SmrHealthcheckDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"SMRHealthcheck"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getMods"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"count"}}]}}]}}]} as unknown as DocumentNode; ++export const GetModCountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModCount"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getMods"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"count"}}]}}]}}]} as unknown as DocumentNode; ++export const GetModDetailsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModDetails"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"mod"},"name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"logo_thumbhash"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}},{"kind":"Field","name":{"kind":"Name","value":"full_description"}},{"kind":"Field","name":{"kind":"Name","value":"created_at"}},{"kind":"Field","name":{"kind":"Name","value":"last_version_date"}},{"kind":"Field","name":{"kind":"Name","value":"downloads"}},{"kind":"Field","name":{"kind":"Name","value":"views"}},{"kind":"Field","name":{"kind":"Name","value":"hidden"}},{"kind":"Field","name":{"kind":"Name","value":"compatibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"EA"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}},{"kind":"Field","name":{"kind":"Name","value":"EXP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"authors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}}]}},{"kind":"Field","name":{"kind":"Name","value":"role"}}]}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"100"}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"changelog"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetModNameDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModName"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetModNamesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModNames"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReferences"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getMods"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"references"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReferences"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mods"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetModReferenceDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModReference"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modIdOrReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModByIdOrReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modIdOrReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modIdOrReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetModSummaryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModSummary"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"mod"},"name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}},{"kind":"Field","name":{"kind":"Name","value":"created_at"}},{"kind":"Field","name":{"kind":"Name","value":"downloads"}},{"kind":"Field","name":{"kind":"Name","value":"views"}},{"kind":"Field","name":{"kind":"Name","value":"short_description"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetModsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetMods"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"offset"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"limit"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getMods"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"limit"},"value":{"kind":"Variable","name":{"kind":"Name","value":"limit"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"offset"},"value":{"kind":"Variable","name":{"kind":"Name","value":"offset"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"count"}},{"kind":"Field","name":{"kind":"Name","value":"mods"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"logo_thumbhash"}},{"kind":"Field","name":{"kind":"Name","value":"short_description"}},{"kind":"Field","name":{"kind":"Name","value":"hidden"}},{"kind":"Field","name":{"kind":"Name","value":"popularity"}},{"kind":"Field","name":{"kind":"Name","value":"hotness"}},{"kind":"Field","name":{"kind":"Name","value":"views"}},{"kind":"Field","name":{"kind":"Name","value":"downloads"}},{"kind":"Field","name":{"kind":"Name","value":"last_version_date"}},{"kind":"Field","name":{"kind":"Name","value":"tags"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"authors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"username"}}]}},{"kind":"Field","name":{"kind":"Name","value":"role"}}]}},{"kind":"Field","name":{"kind":"Name","value":"compatibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"EA"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}},{"kind":"Field","name":{"kind":"Name","value":"EXP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"game_version"}},{"kind":"Field","name":{"kind":"Name","value":"required_on_remote"}},{"kind":"Field","name":{"kind":"Name","value":"dependencies"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}},{"kind":"Field","name":{"kind":"Name","value":"condition"}}]}},{"kind":"Field","name":{"kind":"Name","value":"targets"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"targetName"}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetChangelogDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetChangelog"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"100"}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"changelog"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const ModReportedCompatibilityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ModReportedCompatibility"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"compatibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"EA"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}},{"kind":"Field","name":{"kind":"Name","value":"EXP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const ModVersionsCompatibilityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ModVersionsCompatibility"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"game_version"}},{"kind":"Field","name":{"kind":"Name","value":"required_on_remote"}},{"kind":"Field","name":{"kind":"Name","value":"targets"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"targetName"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/de.json b/frontend/src/lib/generated/i18n/de.json +new file mode 100644 +index 0000000..111cdaf +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/de.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Offline gehen ", ++ "go-online" : "Online gehen", ++ "healthcheck" : "ficsit.app konnte nicht erreicht werden. Überprüfen deine Internetverbindung oder verwende den Offline-Modus. (Mod Manager-Einstellungen > Offline gehen)", ++ "offline" : "Du bist derzeit offline. Einige Funktionen sind möglicherweise nicht verfügbar. (Um die Verbindung wiederherzustellen, verwenden Sie Mod Manager-Einstellungen > Online gehen)" ++ }, ++ "common" : { ++ "add" : "hinzufügen", ++ "cancel" : "Abbrechen", ++ "close" : "schließen", ++ "delete" : "löschen", ++ "import" : "importieren", ++ "loading" : "Lade...", ++ "rename" : "umbenennen " ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Beim Erzeugen der Debug-Datei ist ein Fehler aufgetreten. Bitte überprüfe die Logdateien Ihres Satisfactory Mod Managers manuell auf weitere Informationen und melde den Fehler im Discord. Verwende dafür die Schaltfläche unten, um die Dokumentation zu öffnen und zu erfahren, wie.", ++ "generate_debug_info" : "Debug-Informationen generieren", ++ "help" : "Scheint falsch zu sein? Klicke auf die Schaltfläche unten und sende die generierte Zip-Datei an den <1>modding discord in #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} ungültige Satisfactory Installation gefunden } other {{invalidInstalls} ungültige Satisfactory Installationen gefunden }}", ++ "no_installs" : "Keine Satisfactory Installationen gefunden ", ++ "open_log_docs" : "Öffnen der Log Dateien ", ++ "open_modding_discord" : "Öfnne den Modding Discord", ++ "open_modding_discord.must_generate_debug_first" : "Du musst zuerst die Debug-Informationen erzeugen", ++ "reporting_directions" : "Scheint falsch zu sein? Klicke unten auf die Schaltfläche, um Logs zu sammeln, und sende dann die generierte Zip-Datei an den Modding-Discord in #help-using-mods.", ++ "title" : "Etwas ist schief gelaufen " ++ }, ++ "external-install-mod" : { ++ "already-installed" : "bereits installiert", ++ "error-loading" : "Fehler beim Laden der Mod Details ", ++ "in-queue" : "In der Warteschlange", ++ "install" : "Installieren", ++ "latest-version" : "Neuste Version", ++ "title" : "Mod installieren", ++ "version" : "Version {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Los geht's! ", ++ "change_later_hint" : "Diese Einstellungen kannst du jederzeit im Menü \"Mod-Manager-Einstellungen\" ändern.", ++ "intro" : "Wähle deine Präferenz um zu beginnen. ", ++ "open_welcome_guide" : "Öffne den Willkommens Leitfade.", ++ "option" : { ++ "language" : { ++ "title" : "Verwende diese Sprache, sofern verfügbar:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Warte, bis ich auf \"Übernehmen\" drücke.", ++ "enabled" : "Änderungen sofort anwenden", ++ "title" : "Wenn ich einen Mod hinzufüge oder entferne, oder das Profil wechsle..." ++ } ++ }, ++ "title" : "Willkommen beim Satisfactory Mod Manager!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Anwenden {profile}", ++ "apply-queued" : "Anwenden von {queued, plural, one {einer Änderung} other {# Änderungen}}", ++ "are-you-sure-warning" : "Bist du sicher, dass du starten willst?", ++ "cant-launch" : "SMM kann diese Installation nicht starten", ++ "cant-launch-tooltip" : "Der Mod Manager ist nicht in der Lage, diesen Installationstyp zu starten, aber er wird die Mod-Dateien für dich verwalten. Starte Satisfactory mit deinem gewohnten Spiel-Launcher.", ++ "changes-queued" : "Es wurden noch keine Änderungen an deinen Mod-Dateien vorgenommen. Klicke auf die Schaltfläche oben, um die Änderungen, die du in die Warteschlange gestellt hast, anzuwenden.", ++ "game-running" : "Dein Spiel Launcher meldet, dass das Spiel bereits läuft (oder noch dabei ist, sich zu schließen).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} inkompatible Mod, die nicht geladen wird oder das Spiel zum Absturz bringt} other {{versionIncompatible} inkompatible Mods, die nicht geladen werden oder das Spiel zum Absturz bringen}}", ++ "launch-in-progress" : "startet...", ++ "operation-in-progress" : "Es ist bereits ein Vorgang im Gange.", ++ "play" : "spiel Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Eine Mod {versionPossiblyCompatible, plural, one {ist} other {sind}} wie es aussieht, nicht mit deinem Spiel kompatibel} other {# Mod {versionPossiblyCompatible, plural, one {ist} other {sind}} wie es aussieht, nicht mit deinem Spiel kompatibel}}", ++ "profile-change-queued" : "Es wurden noch keine Änderungen an deinen Mod-Dateien vorgenommen. Klicke auf die Schaltfläche oben, um das neue Profil anzuwenden.\n\n(Du befindest dich in der Warteschlange im Modus „Manuell starten“)", ++ "ready" : "Du bist \"ready to rumble\"!\n\nHinweis: Der Mod-Manager hat die Installation der Mod-Dateien für dich bereits abgeschlossen. Du könntest das Spiel mit deinem üblichen Spiel Launcher starten und die Mods würden trotzdem geladen werden.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Eine Mod} other {# Mods}} that {reportedIncompatible, plural, one {ist} other {sind}} bei dieser Spielversion als fehlerhaft gemeldet. Lies die {versionIncompatible, plural, one {Mod's} other {Mod's}} Beschreibung oder Kompatibilitätshinweise für weitere Informationen.", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Eine Mod} other {# Mods}} die {reportedPossiblyCompatible, plural, one {ist} other {sind}} bei dieser Spielversion als fehlerhaft gemeldet. Lesen Sie die {versionIncompatible, plural, one {Mod's} other {Mod's}} Beschreibung oder Kompatibilitätshinweise für weitere Informationen.", ++ "you-have-warning-mods" : "Du hast:" ++ }, ++ "left-bar" : { ++ "export" : "exportieren", ++ "ficsit-app" : "ficsit.app (Mod Verzeichnis)", ++ "game-version" : "Spielinstallation auswählen", ++ "help" : "Hilfe", ++ "install-invalid" : "ungültig", ++ "install-invalid-tooltip" : "Status: SMM kann diese Installation nicht verwalten", ++ "install-loading" : "Lade...", ++ "install-loading-tooltip" : "Status: Lade...", ++ "install-unknown" : "Unbekannt", ++ "install-unknown-tooltip" : "Status: Konnte keine Informationen über diese Installation erhalten", ++ "links" : "Links", ++ "manage-servers" : "Manage Server", ++ "mods-off" : "Mods aus", ++ "mods-on" : "Mods an", ++ "other" : "Andere", ++ "profile" : "Profil", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Du hast {number} Aktion in der Warteschlange. Wende {number, plural, one {sie} other {sie}} an oder breche {number, plural, one {sie} other {sie}} ab, bevor du die Installation oder das Profil wechselst.} other {Du hast {number} Aktionen in der Warteschlange. Wende {number, plural, one {sie} other {sie}} an oder breche {number, plural, one {sie} other {sie}} ab, bevor du die Installation oder das Profil wechselst.}}", ++ "satisfactory-modding-discord" : "Satisfactory Modding Discord", ++ "smm-github" : "SMM GitHub", ++ "updates" : "Updates" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} Changelog" ++ }, ++ "mod-details" : { ++ "change-version" : "Version ändern ", ++ "change-version-any" : "Jede", ++ "change-version-or-newer" : "oder neuer", ++ "changelogs" : "Changelogs", ++ "compatibility" : "Kompatibilität", ++ "compatibility-branch" : "Diese Mod wurde gemeldet als {state} auf {branch}.", ++ "compatibility-unknown" : "unbekannt", ++ "compatibility-unknown-tooltip" : "Es wurden noch keine Kompatibilitätsinformationen für diese Mod gemeldet. Probiere es aus und kontaktiere uns im Discord, damit diese aktualisiert werden können!", ++ "contributors" : "Mitwirkende <1>{authors}", ++ "created" : "Erstellet ", ++ "downloads" : "Downloads insgesamt", ++ "installed-version" : "Installierte Version", ++ "latest-version" : "Letzte Version ", ++ "mod-author" : "Eine Mod von: ", ++ "offline-mode" : "Der Offline-Modus ist aktiviert. Changelogs und Beschreibungen sind nicht verfügbar.", ++ "size" : "Größe", ++ "updated" : "Aktualisiert", ++ "view-on-ficsit-app" : "anschauen auf ficsit.app", ++ "views" : "Aufrufe" ++ }, ++ "mod-list-item" : { ++ "by-author" : "von", ++ "compatibility-note" : "Diese Mod wurde für diese Spielversion als {state} gemeldet.", ++ "compatibility-note-none" : "(Keine Angabe)", ++ "compatibility-warning" : "Es wurden Probleme mit dieser Mod gemeldet, aber du kannst versuchen, sie trotzdem zu installieren. Details:", ++ "dependency" : "Diese Mod wurde in Abhängigkeit zu einer anderen Mod installiert. Sie kann nicht eigenständig installiert oder entfernt werden.", ++ "disable" : "Diese Mod ist in diesem Profil aktiviert. Klicke hier, um sie zu deaktivieren. Dadurch wird sie nicht mehr geladen, wenn du das Spiel startest, aber sie bleibt trotzdem Teil dieses Profils.", ++ "disable-queued" : "Diese Mod steht in der Warteschlange für die Deaktivierung. Klicken Sie, um den Vorgang abzubrechen.", ++ "disabled-tooltip" : "Diese Mod ist deaktiviert. Klicke auf das Pausensymbol, um sie zu aktivieren.", ++ "enable" : "Klicke, um diese Mod zu aktivieren.", ++ "enable-queued" : "Diese Mod steht in der Warteschlange für die Aktivierung. Klicke, um den Vorgang abzubrechen.", ++ "favorite" : "Klicke, um diese Mod zu Ihren Favoriten hinzuzufügen. Eine Mod als Favorit zu haben, hat nichts damit zu tun, ob sie installiert ist oder nicht - es ist eine Möglichkeit, eine Mod für später aufzubewahren, unabhängig davon, welches Profil du ausgewählt hast.", ++ "hidden" : "Diese Mod wurde vom Autor versteckt.", ++ "install" : "Klicke, um diese Mod zu installieren.", ++ "no-tags" : "(keine verfügbar)", ++ "not-installable" : "Du kannst diese Mod nicht installieren. Grund:", ++ "queued" : "Diese Mod steht bereits für einen anderen Vorgang in der Warteschlange.", ++ "queued-install" : "Diese Mod steht in der Warteschlange für die Installation. Klicke, um den Vorgang abzubrechen.", ++ "queued-uninstall" : "Diese Mod steht in der Warteschlange für die Deinstallation. Klicke, um den Vorgang abzubrechen.", ++ "unavailable" : "Diese Mod ist nicht mehr auf ficsit.app verfügbar. Möchtest du sie vielleicht entfernen? ", ++ "unfavorite" : "Klicken, um diese Mod aus deinen Favoriten zu entfernen.", ++ "uninstall" : "Diese Mod ist auf diesem Profil installiert. Klicke, um diese Mod zu deinstallieren.", ++ "wait" : "Warte bis der aktuelle Vorgang abgeschlossen ist." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(keine weiteren Anmerkungen vorhanden)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Alle Mods", ++ "compatible" : "Kompatibel", ++ "dependency" : "Abhängigkeit", ++ "disabled" : "Deaktiviert", ++ "enabled" : "Aktiviert", ++ "favorite" : "Favorit", ++ "installed" : "Installiert", ++ "not-installed" : "Nicht Installiert", ++ "queued" : "Warteschlange" ++ }, ++ "order-by" : { ++ "downloads" : "Downloads ", ++ "hotness" : "Angesagt ", ++ "last-updated" : "zuletzt aktuallisiert", ++ "name" : "Name", ++ "popularity" : "Bekanntheit", ++ "views" : "Aufrufe" ++ }, ++ "search" : "Durchsuche Mods" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Keine Mods entsprechen deinen Filtern", ++ "no-mods-found" : "keine Mods gefunden ", ++ "show-all" : "Alle anzeigen " ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Profilname", ++ "profile-name-placeholder" : "neuer Profilname ", ++ "title" : "Profil hinzufügen " ++ }, ++ "delete" : { ++ "profile-name" : "Profilname", ++ "title" : "Profil löschen " ++ }, ++ "import" : { ++ "profile-file" : "Profil-Datei", ++ "profile-name" : "Profilname", ++ "profile-name-placeholder" : "neuer Profilname ", ++ "profile-version-warning" : "Dieses Profil wurde mit einer neueren Version des Spiels erstellt. Es ist möglicherweise nicht mit dieser Version kompatibel.", ++ "title" : "Profil importieren " ++ }, ++ "rename" : { ++ "new-profile" : "neuer Profilname ", ++ "new-profile-placeholder" : "neues Profil", ++ "old-profile" : "alter Profilname ", ++ "old-profile-placeholder" : "Altes Profil", ++ "title" : "Profil umbenennen " ++ } ++ }, ++ "server-manager" : { ++ "add" : "hinzufügen ", ++ "advanced-note" : "Beachte, dass du möglicherweise bestimmte Zeichen im Benutzernamen und im Passwort auslassen musst.", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : "Verbindung zum Server fehlgeschlagen, zum erneuten Versuch anklicken.", ++ "get-help" : "Hilfe bei der Verbindung zu Servern erhalten", ++ "host-placeholder" : "Host", ++ "invalid" : "SMM kann diese Installation nicht verwalten", ++ "loading" : "Lade...", ++ "local-path-placeholder" : "C:\\Pfad\\zum\\Server", ++ "name-placeholder" : "Name (Standard: {default})", ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : "Passwort", ++ "path-placeholder" : "Pfad", ++ "port-placeholder" : "Port (Standard: {default})", ++ "switch-to-advanced" : "In den erweiterten Modus wechseln", ++ "switch-to-simple" : "In den einfachen Modus wechseln", ++ "title" : "Dedizierte Server", ++ "username-placeholder" : "Benutzername ", ++ "validating" : "Prüfen..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Verzeichnis kann nicht aufgelistet werden", ++ "failed-valid-check" : "Es konnte nicht überprüft werden, ob der ausgewählte Pfad ein gültiger Server ist" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Cache-Speicherort", ++ "reset" : "Auf Standardwerte zurücksetzen", ++ "save" : "Speichern und verschieben", ++ "title" : "Download-Cache-Speicherort ändern" ++ }, ++ "change-cache-location" : "Cache-Speicherort ändern", ++ "copy-mod-list" : "Mod-Liste kopieren", ++ "debug" : "Debug", ++ "generate-debug-info" : "Debug-Informationen generieren", ++ "go-online-offline" : "Gehe {offline, select, true {online} other {offline}}", ++ "language" : "Sprache", ++ "launch-button" : "Start Button", ++ "launch-button.button" : "Button ", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normal", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Proxy entfernen ", ++ "save" : "Speichern und neu starten", ++ "title" : "Proxy festlegen" ++ }, ++ "queue" : "Warteschlange", ++ "queue.start-immediately" : "Sofort starten", ++ "queue.start-manually" : "Manuell starten ", ++ "save-window-position" : "Fensterposition speichern", ++ "secret-settings" : "Geheime Einstellungen", ++ "set-proxy" : "Proxy festlegen", ++ "settings" : "Einstellungen", ++ "smm-debug-logging" : "SMM-Debug-Protokollierung", ++ "start-view" : "Ansicht starten", ++ "start-view.compact" : "Kompakt", ++ "start-view.expanded" : "Erweitert", ++ "title" : "Mod Manager Einstellungen ", ++ "update-check" : "auf Updates prüfen ", ++ "update-check.ask" : "Nachfragen, wenn gefunden", ++ "update-check.on-exit" : "Am Ausgang", ++ "update-check.on-start" : "Beim Start" ++ }, ++ "smm-update" : { ++ "downloading" : "Herunterladen im Hintergrund", ++ "downloading-stats" : "Update wird heruntergeladen: {current} / {total}, {speed}/s, geschätzte Downloadzeit {eta}", ++ "title" : "SMM Update verfügbar - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "verbesserte Leistung", ++ "performance.description" : "Damit du effizient bleibst!", ++ "platform_support" : "Natives Linux Heroic, Steam Snap, Mac Unterstützung", ++ "platform_support.description" : "Hole dir eine Version aus den GitHub-Releases, wenn du es noch nicht getan hast!", ++ "profile_format" : "Neues Profilformat", ++ "profile_format.description" : "SMM2-Profile sind nicht mit SMM3 kompatibel! Deine bestehenden Profile wurden automatisch migriert, aber du kannst keine mit SMM2 erstellten Profile importieren.", ++ "queue" : "Aktions-Warteschlangen", ++ "queue.description" : "Mehrere Mod-Downloads/Deinstallationen auf einmal der Warteschlange hinzufügen.", ++ "servers" : "dediziertes Server Management ", ++ "servers.description" : "Einfaches Verwalten von Servern über filesystem, SFTP, FTP und SMB!", ++ "translation" : "Unterstützung bei der Übersetzung", ++ "translation.description" : "Tritt unserem Discord bei, um SMM in deine Sprache zu übersetzen!", ++ "ui" : "Aktualisierung der Benutzeroberfläche", ++ "ui.description" : "Ein frischer Farbanstrich zur Feier von Satisfactory 1.0!" ++ }, ++ "intro" : "Wir haben in dieser Version eine Menge Verbesserungen vorgenommen. Hier sind einige der Highlights:", ++ "open_guide" : "Öffne die SMM3-Dokumentation", ++ "title" : "Willkommen im Satisfactory Mod Manager Version 3!" ++ }, ++ "updates" : { ++ "changelog" : "Changelog", ++ "check-for-updates" : "Nach Updates suchen", ++ "checking-for-updates" : "Nach Updates suchen...", ++ "hide-ignored" : "ignoriert ausblenden ", ++ "ignore" : "ignorieren", ++ "mod-update-available" : "{updates, plural, one {{updates} Mod Update verfügbar} other {{updates} Mod Updates verfügbar }}", ++ "no-updates" : "Momentan keine Mod/SMM-Updates", ++ "show-ignored" : "ignoriert anzeigen ", ++ "smm-update-available" : "SMM Update verfügbar", ++ "title" : "Updates", ++ "unignore" : "nicht mehr ignorieren ", ++ "update-all" : "Alles aktualisieren ", ++ "update-selected" : "Auswahl aktualisieren " ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/en.json b/frontend/src/lib/generated/i18n/en.json +new file mode 100644 +index 0000000..b5ec7a7 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/en.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Go Offline", ++ "go-online" : "Go Online", ++ "healthcheck" : "Could not reach ficsit.app. Check your internet connection or consider using the offline mode. (Mod Manager Settings > Go Offline)", ++ "offline" : "You are currently offline. Some features may be unavailable. (To reconnect, use Mod Manager Settings > Go Online)" ++ }, ++ "common" : { ++ "add" : "Add", ++ "cancel" : "Cancel", ++ "close" : "Close", ++ "delete" : "Delete", ++ "import" : "Import", ++ "loading" : "Loading...", ++ "rename" : "Rename" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "An error occurred while generating the debug file. Please manually check your Satisfactory Mod Manager log files for more information and report this on the Discord. Use the button below to open the documentation and learn how.", ++ "generate_debug_info" : "Generate debug info", ++ "help" : "Seems wrong? Click the button below and send the generated zip file on the <1>modding discord in #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} invalid Satisfactory install found} other {{invalidInstalls} invalid Satisfactory installs found}}", ++ "no_installs" : "No Satisfactory installs found", ++ "open_log_docs" : "Open the Logging Documentation", ++ "open_modding_discord" : "Open the Modding Discord", ++ "open_modding_discord.must_generate_debug_first" : "You must generate debug info first", ++ "reporting_directions" : "Seems wrong? Click the button below to gather logs, then send the generated zip file on the modding Discord in #help-using-mods.", ++ "title" : "Something went wrong" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Already installed", ++ "error-loading" : "Error loading mod details", ++ "in-queue" : "In queue", ++ "install" : "Install", ++ "latest-version" : "Latest version", ++ "title" : "Install mod", ++ "version" : "Version {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Get Started!", ++ "change_later_hint" : "Change these settings at any time in the \"Mod Manager Settings\" menu.", ++ "intro" : "Select your preferences to get started.", ++ "open_welcome_guide" : "Open the Welcome Guide", ++ "option" : { ++ "language" : { ++ "title" : "Use this language where available:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Wait for me to press \"Apply\"", ++ "enabled" : "Apply changes immediately", ++ "title" : "When I add or remove a mod, or switch profiles..." ++ } ++ }, ++ "title" : "Welcome to the Satisfactory Mod Manager!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Apply {profile}", ++ "apply-queued" : "Apply {queued, plural, one {one change} other {# changes}}", ++ "are-you-sure-warning" : "Are you sure you want to launch?", ++ "cant-launch" : "SMM can't launch this install", ++ "cant-launch-tooltip" : "The Mod Manager is not capable of launching this install type, but it will still manage the mod files for you. Launch Satisfactory using your usual game launcher.", ++ "changes-queued" : "Changes have not yet been made to your mod files. Click the button below to apply the changes you have queued.\n\n(You're in Queue \"Start manually\" mode)", ++ "game-running" : "Your game launcher is reporting that the game is already running (or still in the process of closing).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} incompatible mod which will not load or crash our game} other {{versionIncompatible} incompatible mods which will not load or crash our game}}", ++ "launch-in-progress" : "Launch in progress...", ++ "operation-in-progress" : "An operation is already in progress.", ++ "play" : "Play Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {One mod that {versionPossiblyCompatible, plural, one {is} other {are}} likely incompatible with your game} other {# mods that {versionPossiblyCompatible, plural, one {is} other {are}} likely incompatible with your game}}", ++ "profile-change-queued" : "Changes have not yet been made to your mod files. Click the button below to apply the new profile.\n\n(You're in Queue \"Start manually\" mode)", ++ "ready" : "You're ready to rumble!\n\nNote: The Mod Manager has already finished installing the mod files for you. You could launch the game using your usual game launcher and mods would still be loaded.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {One mod} other {# mods}} that {reportedIncompatible, plural, one {is} other {are}} reported as Broken on this game version. Read the {versionIncompatible, plural, one {mod's} other {mods'}} description or compatibility notes for more information", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {One mod} other {# mods}} that {reportedPossiblyCompatible, plural, one {is} other {are}} reported as Damaged on this game version. Read the {versionIncompatible, plural, one {mod's} other {mods'}} description or compatibility notes for more information", ++ "you-have-warning-mods" : "You have:" ++ }, ++ "left-bar" : { ++ "export" : "Export", ++ "ficsit-app" : "ficsit.app (Mod Repository)", ++ "game-version" : "Select Game Installation", ++ "help" : "Help", ++ "install-invalid" : "Invalid", ++ "install-invalid-tooltip" : "Status: SMM cannot manage this install", ++ "install-loading" : "Loading...", ++ "install-loading-tooltip" : "Status: Loading...", ++ "install-unknown" : "Unknown", ++ "install-unknown-tooltip" : "Status: Could not get information about this install", ++ "links" : "Links", ++ "manage-servers" : "Manage Servers", ++ "mods-off" : "Mods off", ++ "mods-on" : "Mods on", ++ "other" : "Other", ++ "profile" : "Profile", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {You have {number} action queued. Apply or cancel {number, plural, one {it} other {them}} before switching installs or profiles.} other {You have {number} actions queued. Apply or cancel {number, plural, one {it} other {them}} before switching installs or profiles.}}", ++ "satisfactory-modding-discord" : "Satisfactory Modding Discord", ++ "smm-github" : "SMM GitHub", ++ "updates" : "Updates" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} Changelog" ++ }, ++ "mod-details" : { ++ "change-version" : "Change version", ++ "change-version-any" : "Any", ++ "change-version-or-newer" : "or newer", ++ "changelogs" : "Changelogs", ++ "compatibility" : "Compatibility", ++ "compatibility-branch" : "This mod has been reported as {state} on {branch}.", ++ "compatibility-unknown" : "Unknown", ++ "compatibility-unknown-tooltip" : "No compatibility information has been reported for this mod yet. Try it out and contact us on the Discord so it can be updated!", ++ "contributors" : "Contributors <1>({authors})", ++ "created" : "Created", ++ "downloads" : "Total downloads", ++ "installed-version" : "Installed version", ++ "latest-version" : "Latest version", ++ "mod-author" : "A mod by:", ++ "offline-mode" : "Offline mode is enabled. Changelogs and descriptions are not available.", ++ "size" : "Size", ++ "updated" : "Updated", ++ "view-on-ficsit-app" : "View on ficsit.app", ++ "views" : "Views" ++ }, ++ "mod-list-item" : { ++ "by-author" : "by", ++ "compatibility-note" : "This mod has been reported as {state} on this game version.", ++ "compatibility-note-none" : " (None specified)", ++ "compatibility-warning" : "There are problems reported with this mod, but you can try to install it anyways. Details:", ++ "dependency" : "This mod is already installed as a dependency of another mod. It cannot be uninstalled as long as other mods depend on it.", ++ "disable" : "This mod is Enabled on this profile. Click to Disable it, which prevents it from loading when you start the game, but still keeps it a part of this profile.", ++ "disable-queued" : "This mod is queued to be Disabled. Click to cancel the operation.", ++ "disabled-tooltip" : "This mod is Disabled. Click the pause icon to Enable it.", ++ "enable" : "Click to enable this mod.", ++ "enable-queued" : "This mod is queued to be Enabled. Click to cancel the operation.", ++ "favorite" : "Click to add this mod to your Favorites. Having a mod Favorited is unrelated to whether or not it's installed - it's a way to keep track of a mod for later regardless of what Profile you have selected.", ++ "hidden" : "This mod was hidden by the author.", ++ "install" : "Click to install this mod.", ++ "no-tags" : "(none available)", ++ "not-installable" : "You can't install this mod. Reason:", ++ "queued" : "This mod is already queued for another operation.", ++ "queued-install" : "This mod is queued to be installed. Click to cancel the operation.", ++ "queued-uninstall" : "This mod is queued to be uninstalled. Click to cancel the operation.", ++ "unavailable" : "This mod is no longer available on ficsit.app. You may want to remove it.", ++ "unfavorite" : "Click to remove this mod from your Favorites.", ++ "uninstall" : "This mod is installed on this profile. Click to uninstall this mod.", ++ "wait" : "Wait for the current operation to complete." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(No further notes provided)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "All mods", ++ "compatible" : "Compatible", ++ "dependency" : "Dependency", ++ "disabled" : "Disabled", ++ "enabled" : "Enabled", ++ "favorite" : "Favorite", ++ "installed" : "Installed", ++ "not-installed" : "Not installed", ++ "queued" : "Queued" ++ }, ++ "order-by" : { ++ "downloads" : "Downloads", ++ "hotness" : "Hotness", ++ "last-updated" : "Last updated", ++ "name" : "Name", ++ "popularity" : "Popularity", ++ "views" : "Views" ++ }, ++ "search" : "Search mods" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "No mods matching your filters", ++ "no-mods-found" : "No mods found", ++ "show-all" : "Show all" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Profile name", ++ "profile-name-placeholder" : "New Profile Name", ++ "title" : "Add profile" ++ }, ++ "delete" : { ++ "profile-name" : "Profile name", ++ "title" : "Delete profile" ++ }, ++ "import" : { ++ "profile-file" : "Profile file", ++ "profile-name" : "Profile name", ++ "profile-name-placeholder" : "New Profile Name", ++ "profile-version-warning" : "This profile was created with a newer version of the game. It may not be compatible with this version.", ++ "title" : "Import profile" ++ }, ++ "rename" : { ++ "new-profile" : "New profile name", ++ "new-profile-placeholder" : "New Profile", ++ "old-profile" : "Old profile name", ++ "old-profile-placeholder" : "Old Profile", ++ "title" : "Rename profile" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Add", ++ "advanced-note" : "Note that you might have to escape certain characters in the username and password", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : "No servers added yet. Add one below!", ++ "title" : "Manage Existing Servers" ++ }, ++ "failed-to-connect" : "Failed to connect to server, click to retry", ++ "get-help" : "Get help connecting to servers", ++ "host-placeholder" : "host", ++ "invalid" : "SMM cannot manage this install", ++ "loading" : "Loading...", ++ "local-path-placeholder" : "C:\\Path\\To\\Server", ++ "name-placeholder" : "Name (default: {default})", ++ "new-server" : { ++ "title" : "Add a New Server" ++ }, ++ "password-placeholder" : "password", ++ "path-placeholder" : "path", ++ "port-placeholder" : "port (default: {default})", ++ "switch-to-advanced" : "Switch to advanced mode", ++ "switch-to-simple" : "Switch to simple mode", ++ "title" : "Dedicated Servers", ++ "username-placeholder" : "username", ++ "validating" : "Validating..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Failed to list directory", ++ "failed-valid-check" : "Failed to check if selected path is a valid server" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Cache location", ++ "reset" : "Reset to default", ++ "save" : "Save and move", ++ "title" : "Change download cache location" ++ }, ++ "change-cache-location" : "Change cache location", ++ "copy-mod-list" : "Copy mod list", ++ "debug" : "Debug", ++ "generate-debug-info" : "Generate debug info", ++ "go-online-offline" : "Go {offline, select, true {online} other {offline}}", ++ "language" : "Language", ++ "launch-button" : "Launch button", ++ "launch-button.button" : "Button", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normal", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Remove proxy", ++ "save" : "Save and restart", ++ "title" : "Set Proxy" ++ }, ++ "queue" : "Queue", ++ "queue.start-immediately" : "Start immediately", ++ "queue.start-manually" : "Start manually", ++ "save-window-position" : "Save window position", ++ "secret-settings" : "Secret settings", ++ "set-proxy" : "Set proxy", ++ "settings" : "Settings", ++ "smm-debug-logging" : "SMM debug logging", ++ "start-view" : "Start view", ++ "start-view.compact" : "Compact", ++ "start-view.expanded" : "Expanded", ++ "title" : "Mod Manager Settings", ++ "update-check" : "Update check", ++ "update-check.ask" : "Ask when found", ++ "update-check.on-exit" : "On exit", ++ "update-check.on-start" : "On start" ++ }, ++ "smm-update" : { ++ "downloading" : "Downloading in background", ++ "downloading-stats" : "Downloading update: {current} / {total}, {speed}/s, ETA {eta}", ++ "title" : "SMM Update Available - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Improved performance", ++ "performance.description" : "Keeping you efficient!", ++ "platform_support" : "Native Linux Heroic, Steam Snap, Mac support", ++ "platform_support.description" : "Get a build from the GitHub releases if you haven't yet!", ++ "profile_format" : "New profile format", ++ "profile_format.description" : "SMM2 profiles are not compatible with SMM3! Your existing profiles have automatically been migrated, but you can't Import any profiles created with SMM2.", ++ "queue" : "Action queueing", ++ "queue.description" : "Queue up multiple mod downloads/uninstalls at once.", ++ "servers" : "Dedicated server management", ++ "servers.description" : "Easily manage servers via filesystem, SFTP, FTP and SMB!", ++ "translation" : "Translation support", ++ "translation.description" : "Join our Discord to translate SMM to your language!", ++ "ui" : "User interface refresh", ++ "ui.description" : "A fresh coat of paint to celebrate Satisfactory 1.0!" ++ }, ++ "intro" : "We've made a lot of improvements in this version. Here are some of the highlights:", ++ "open_guide" : "Open the SMM3 Documentation", ++ "title" : "Welcome to Satisfactory Mod Manager Version 3!" ++ }, ++ "updates" : { ++ "changelog" : "Changelog", ++ "check-for-updates" : "Check for updates", ++ "checking-for-updates" : "Checking for updates...", ++ "hide-ignored" : "Hide ignored", ++ "ignore" : "Ignore", ++ "mod-update-available" : "{updates, plural, one {{updates} mod update available} other {{updates} mod updates available}}", ++ "no-updates" : "No mod/SMM updates right now", ++ "show-ignored" : "Show ignored", ++ "smm-update-available" : "SMM update available", ++ "title" : "Updates", ++ "unignore" : "Unignore", ++ "update-all" : "Update All", ++ "update-selected" : "Update Selected" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/es.json b/frontend/src/lib/generated/i18n/es.json +new file mode 100644 +index 0000000..c204d60 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/es.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Desconectarse", ++ "go-online" : "Conectarse", ++ "healthcheck" : "No se ha podido acceder a ficsit.app. Comprueba tu conexión a internet o considera usar el modo offline. (Ajustes de Gestor de Mods > Desconectarse)", ++ "offline" : "Actualmente no estás conectado. Algunas funciones pueden no estar disponibles. (Para reconectar, vea a Ajustes del Gestor de Mods > Conectarse)" ++ }, ++ "common" : { ++ "add" : "Añadir", ++ "cancel" : "Cancelar", ++ "close" : "Cerrar", ++ "delete" : "Borrar", ++ "import" : "Importar", ++ "loading" : "Cargando...", ++ "rename" : "Renombrar" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Se ha producido un error al generar el archivo de depuración. Comprueba manualmente los archivos de registro del Gestor de Mods de Satisfactory para obtener más información e informa de ello en Discord. Usa el botón de abajo para abrir la documentación y aprender cómo hacerlo.", ++ "generate_debug_info" : "Generar información de depuración", ++ "help" : "Si crees que se trata de un error, haz click en el botón de abajo y envía el archivo .zip generado al <1>discord de modding en #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} Instalación de Satisfactory no válida encontrada} other {{invalidInstalls} Instalaciones de Satisfactory no válidas encontradas}}", ++ "no_installs" : "No se han encontrado instalaciones de Satisfactory", ++ "open_log_docs" : "Abrir la documentación de registro", ++ "open_modding_discord" : "Abrir el Discord de Mods", ++ "open_modding_discord.must_generate_debug_first" : "Primero debe generar información de depuración", ++ "reporting_directions" : "Si crees que se trata de un error, haz click en el botón de abajo para recopilar los registros, y después envía el archivo .zip generado al Discord de mods, en el canal de #help-using-mods.", ++ "title" : "Algo salió mal" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Ya instalado", ++ "error-loading" : "Error al cargar los detalles del mod", ++ "in-queue" : "En cola", ++ "install" : "Instalar", ++ "latest-version" : "Última versión", ++ "title" : "Instalar mod", ++ "version" : "Versión {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "¡Empieza ya!", ++ "change_later_hint" : "Cambia estos ajustes en cualquier momento en el menú \"Ajustes del Gestor de Mods\".", ++ "intro" : "Selecciona tus preferencias para empezar", ++ "open_welcome_guide" : "Abrir la Guía de Bienvenida", ++ "option" : { ++ "language" : { ++ "title" : "Utiliza este idioma cuando esté disponible:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Espera a la señal para pulsar \"Aplicar\"", ++ "enabled" : "Aplicar los cambios inmediatamente", ++ "title" : "Cuando añado o elimino un mod, o cambio de perfil..." ++ } ++ }, ++ "title" : "¡Bienvenido al Gestor de Mods de Satisfactory!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Aplicar {profile}", ++ "apply-queued" : "Aplicar {en cola, plural, un {un cambio} otro {# cambios}}", ++ "are-you-sure-warning" : "¿Estás seguro que quieres iniciar?", ++ "cant-launch" : "SMM no puede iniciar esta instalación", ++ "cant-launch-tooltip" : "El Gestor de Mods no es capaz de ejecutar este tipo de instalación, pero gestionará los archivos de los mods por ti. Inicia Satisfactory con tu launcher habitual.", ++ "changes-queued" : "Aún no se han realizado cambios en tus archivos de mod. Haz clic en el botón de abajo para aplicar los cambios que has puesto en cola.\n\n(Estás en el modo «Iniciar manualmente» de la cola)", ++ "game-running" : "Tu launcher está informando de que el juego ya se está ejecutando (o está en proceso de cerrarse).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} mod incompatible que no carga o bloquea el juego} other {{versionIncompatible} mods incompatibles que no cargan o bloquean el juego}}", ++ "launch-in-progress" : "Inicio en curso...", ++ "operation-in-progress" : "Una operación ya está en curso.", ++ "play" : "Jugar a Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Un mod que '{versionPosiblementeCompatible, plurales, uno {es} otro {son}}' probablemente incompatible con tu juego} other {#mods que '{versionPosiblementeCompatible, plurales, uno {es} otro {son}}' probablemente incompatibles con tu juego}}", ++ "profile-change-queued" : "No se han realizado cambios a los archivos de tus mods. Haz clic en el botón de abajo para aplicar el nuevo perfil.\n\n(Estás en el modo \"Iniciar manualmente\" de la cola)", ++ "ready" : "¡Estás listo para la acción!\n\nNota: El Gestor de Mods ya ha terminado de instalar los archivos de mods por ti. Puedes iniciar el juego con tu launcher habitual y los mods seguirán cargados.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Un mod} other {# mods}} que {reportedIncompatible, plural, one {is} other {are}} reportados como Rotos en esta versión del juego. Lee la descripción o las notas de compatibilidad de {versionIncompatible, plural, un {mod's} otro {mods'}} para obtener más información.", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Un mod} other {# mods}} que {reportedPossiblyCompatible, plural, one {is} other {are}} reportados como Dañados en esta versión del juego. Lee la descripción o las notas de compatibilidad de {versionIncompatible, plural, un {mod's} otro {mods'}} para obtener más información.", ++ "you-have-warning-mods" : "Tienes:" ++ }, ++ "left-bar" : { ++ "export" : "Exportar", ++ "ficsit-app" : "ficsit.app (Repositorio de Mods)", ++ "game-version" : "Selecciona la instalación del juego", ++ "help" : "Ayuda", ++ "install-invalid" : "No válido", ++ "install-invalid-tooltip" : "Estado: SMM no puede gestionar esta instalación", ++ "install-loading" : "Cargando...", ++ "install-loading-tooltip" : "Estado: Cargando...", ++ "install-unknown" : "Desconocido", ++ "install-unknown-tooltip" : "Estado: No se pudo obtener información sobre esta instalación", ++ "links" : "Enlaces", ++ "manage-servers" : "Gestionar servidores", ++ "mods-off" : "Mods desactivados", ++ "mods-on" : "Mods activados", ++ "other" : "Otro", ++ "profile" : "Perfil", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Tiene '{number} acción en cola. Aplica o cancela {número, plurales, uno {él} otro {ellos}}' antes de cambiar de instalación o perfil.} other {Tiene '{number} acción en cola. Aplica o cancela {número, plurales, uno {él} otro {ellos}}' antes de cambiar de instalaciones o perfiles.}}", ++ "satisfactory-modding-discord" : "Discord de Modding de Satisfactory", ++ "smm-github" : "GitHub de SMM", ++ "updates" : "Actualizaciones" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} Lista de cambios" ++ }, ++ "mod-details" : { ++ "change-version" : "Cambiar versión", ++ "change-version-any" : "Cualquiera", ++ "change-version-or-newer" : "o más nuevo", ++ "changelogs" : "Listas de cambios", ++ "compatibility" : "Compatibilidad", ++ "compatibility-branch" : "Este mod ha sido reportado como {state} en {branch}.", ++ "compatibility-unknown" : "Desconocido", ++ "compatibility-unknown-tooltip" : "Aún no se ha informado de la compatibilidad de este mod. ¡Pruébalo y ponte en contacto con nosotros en Discord para que podamos actualizarlo!", ++ "contributors" : "Colaboradores <1>({authors})", ++ "created" : "Creado", ++ "downloads" : "Descargas totales", ++ "installed-version" : "Versión instalada", ++ "latest-version" : "Última versión", ++ "mod-author" : "Mod hecho por:", ++ "offline-mode" : "El modo sin conexión está activado. Los registros de cambios y las descripciones no están disponibles.", ++ "size" : "Tamaño", ++ "updated" : "Actualizado", ++ "view-on-ficsit-app" : "Ver en ficsit.app", ++ "views" : "Visitas" ++ }, ++ "mod-list-item" : { ++ "by-author" : "por", ++ "compatibility-note" : "Este mod ha sido reportado como {state} en esta versión del juego.", ++ "compatibility-note-none" : "(Sin especificar)", ++ "compatibility-warning" : "Se han reportado problemas con este mod, pero puedes intentar instalarlo de todas formas. Detalles:", ++ "dependency" : "Este mod está instalado como una dependencia de otro mod. No puede ser instalado o borrado de manera independiente.", ++ "disable" : "Este mod está Activado en este perfil. Haz clic en Desactivar para que no se cargue al iniciar el juego, pero siga formando parte de este perfil.", ++ "disable-queued" : "Este mod está en cola para ser Desactivado. Haz clic para cancelar la operación.", ++ "disabled-tooltip" : "Este mod está Desactivado. Haz clic en el icono de pausa para Activarlo.", ++ "enable" : "Haz clic para activar este mod.", ++ "enable-queued" : "Este mod está en cola para ser Activado. Haz clic para cancelar la operación.", ++ "favorite" : "Haz clic para añadir este mod a Favoritos. Tener un mod en Favoritos no está relacionado con si está instalado o no - es una manera de tener un seguimiento de un mod independientemente de qué Perfil tengas seleccionado.", ++ "hidden" : "Este mod está oculto por el autor.", ++ "install" : "Haz clic para instalar este mod.", ++ "no-tags" : "(no disponible)", ++ "not-installable" : "No puedes instalar este mod. Razón:", ++ "queued" : "Este mod ya está en cola para otra operación.", ++ "queued-install" : "Este mod está en cola para ser instalado. Haz clic para cancelar la operación.", ++ "queued-uninstall" : "Este mod está en cola para ser desinstalado. Haz clic para cancelar la operación.", ++ "unavailable" : "Este mod ya no está disponible en ficsit.app. Es posible que desee eliminarlo.", ++ "unfavorite" : "Haz clic para borrar este mod de Favoritos.", ++ "uninstall" : "Este mod está instalado en este perfil. Haz clic para desinstalarlo.", ++ "wait" : "Espera a que finalice la operación en curso." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(No se han facilitado más notas)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Todos los mods", ++ "compatible" : "Compatible", ++ "dependency" : "Dependencia", ++ "disabled" : "Desactivado", ++ "enabled" : "Activado", ++ "favorite" : "Favorito", ++ "installed" : "Instalado", ++ "not-installed" : "No instalado", ++ "queued" : "En cola" ++ }, ++ "order-by" : { ++ "downloads" : "Descargas", ++ "hotness" : "En tendencia", ++ "last-updated" : "Últimos actualizados.", ++ "name" : "Nombre", ++ "popularity" : "Popularidad", ++ "views" : "Visitas" ++ }, ++ "search" : "Buscar mods" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "No hay mods que coincidan con tus filtros", ++ "no-mods-found" : "No se han encontrado mods", ++ "show-all" : "Mostrar todo" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Nombre de perfil", ++ "profile-name-placeholder" : "Nuevo nombre de perfil", ++ "title" : "Añadir perfil" ++ }, ++ "delete" : { ++ "profile-name" : "Nombre de perfil", ++ "title" : "Borrar perfil" ++ }, ++ "import" : { ++ "profile-file" : "Archivo del perfil", ++ "profile-name" : "Nombre de perfil", ++ "profile-name-placeholder" : "Nuevo nombre de perfil", ++ "profile-version-warning" : "Este perfil se creó con una versión más reciente del juego. Puede que no sea compatible con esta versión.", ++ "title" : "Importar perfil" ++ }, ++ "rename" : { ++ "new-profile" : "Nuevo nombre de perfil", ++ "new-profile-placeholder" : "Nuevo perfil", ++ "old-profile" : "Antiguo nombre de perfil", ++ "old-profile-placeholder" : "Antiguo perfil", ++ "title" : "Renombrar perfil" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Añadir", ++ "advanced-note" : "Tenga en cuenta que es posible que tenga que evitar ciertos caracteres en el nombre de usuario y la contraseña", ++ "advanced-path-placeholder" : "usuario:contraseña@host:puerto/ruta", ++ "existing-servers" : { ++ "none-yet" : "No hay servidores aún. ¡Añade uno abajo!", ++ "title" : "Gestionar servidores existentes" ++ }, ++ "failed-to-connect" : "No se ha podido conectar con el servidor, haga clic para volver a intentarlo.", ++ "get-help" : "Ayuda para conectarse a servidores", ++ "host-placeholder" : "host", ++ "invalid" : "SMM no puede gestionar esta instalación", ++ "loading" : "Cargando...", ++ "local-path-placeholder" : "C:\\Ruta\\Al\\Servidor", ++ "name-placeholder" : "Nombre (por defecto:{default})", ++ "new-server" : { ++ "title" : "Añadir un nuevo servidor" ++ }, ++ "password-placeholder" : "contraseña", ++ "path-placeholder" : "ruta", ++ "port-placeholder" : "puerto (por defecto:{default})", ++ "switch-to-advanced" : "Cambiar a modo avanzado", ++ "switch-to-simple" : "Cambiar a modo sencillo", ++ "title" : "Servidores dedicados", ++ "username-placeholder" : "nombre de usuario", ++ "validating" : "Validando..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Error al listar el directorio", ++ "failed-valid-check" : "Error al comprobar si la ruta seleccionada es un servidor válido" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Ubicación de la caché", ++ "reset" : "Restablecer valores por defecto", ++ "save" : "Guardar y mover", ++ "title" : "Cambiar la ubicación de la caché de descargas" ++ }, ++ "change-cache-location" : "Cambiar la ubicación de la caché", ++ "copy-mod-list" : "Copiar lista de mods", ++ "debug" : "Depurar", ++ "generate-debug-info" : "Generar información de depuración", ++ "go-online-offline" : "Go {offline, select, true {online} other {offline}}", ++ "language" : "Idioma", ++ "launch-button" : "Botón de inicio", ++ "launch-button.button" : "Botón", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normal", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Eliminar proxy", ++ "save" : "Guardar y reiniciar", ++ "title" : "Establecer proxy" ++ }, ++ "queue" : "Cola", ++ "queue.start-immediately" : "Empezar ya", ++ "queue.start-manually" : "Iniciar manualmente", ++ "save-window-position" : "Guardar posición de ventana", ++ "secret-settings" : "Ajustes secretos", ++ "set-proxy" : "Establecer proxy", ++ "settings" : "Ajustes", ++ "smm-debug-logging" : "Registros de depuración del SMM", ++ "start-view" : "Vista inicial", ++ "start-view.compact" : "Compacto", ++ "start-view.expanded" : "Expandida", ++ "title" : "Ajustes del Gestor de Mods", ++ "update-check" : "Comprobar actualización", ++ "update-check.ask" : "Consultar cuando se encuentre", ++ "update-check.on-exit" : "Al salir", ++ "update-check.on-start" : "Al inicio" ++ }, ++ "smm-update" : { ++ "downloading" : "Descarga en segundo plano", ++ "downloading-stats" : "Descargando actualización: {current} / {total},{speed}/s, Tiempo Estimado {eta} ", ++ "title" : "Actualización del SMM disponible - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Rendimiento mejorado", ++ "performance.description" : "¡Productividad a tope!", ++ "platform_support" : "Soporte nativo para Linux Heroic, Steam Snap y Mac", ++ "platform_support.description" : "¡Obtén una compilación de las versiones de GitHub si aún no lo has hecho!", ++ "profile_format" : "Nuevo formato de perfil", ++ "profile_format.description" : "¡Los perfiles de SMM2 no son compatibles con SMM3! Tus perfiles existentes han sido migrados automáticamente, pero no puedes Importar ningún perfil creado con SMM2.", ++ "queue" : "Acción en cola", ++ "queue.description" : "Pon en cola varias descargas/desinstalaciones de mods a la vez.", ++ "servers" : "Gestión de servidores dedicados", ++ "servers.description" : "¡Gestiona fácilmente servidores mediante: sistema de archivos, SFTP, FTP y SMB!", ++ "translation" : "Soporte de traducción", ++ "translation.description" : "¡Únete a nuestro Discord para traducir SMM a tu idioma!", ++ "ui" : "Actualización de la interfaz de usuario", ++ "ui.description" : "¡Una nueva capa de pintura para celebrar Satisfactory 1.0!" ++ }, ++ "intro" : "Hemos introducido muchas mejoras en esta versión. He aquí algunas de las más destacadas:", ++ "open_guide" : "Abrir la documentación de SMM3", ++ "title" : "¡Bienvenido a la versión 3 del Gestor de Mods de Satisfactory (SMM)!" ++ }, ++ "updates" : { ++ "changelog" : "Lista de cambios", ++ "check-for-updates" : "Comprobar actualizaciones", ++ "checking-for-updates" : "Comprobando actualizaciones...", ++ "hide-ignored" : "Ocultar ignorados", ++ "ignore" : "Ignorar", ++ "mod-update-available" : "{updates, plural, one {{updates} actualización de mod disponible} other {{updates} actualizaciones de mods disponibles}}", ++ "no-updates" : "No hay actualizaciones de mod/SMM en este momento", ++ "show-ignored" : "Mostrar ignorados", ++ "smm-update-available" : "Actualización disponible de SMM", ++ "title" : "Actualizaciones", ++ "unignore" : "No ignorar", ++ "update-all" : "Actualizar todo", ++ "update-selected" : "Actualización Seleccionada" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/fr.json b/frontend/src/lib/generated/i18n/fr.json +new file mode 100644 +index 0000000..ae9ee01 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/fr.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Passer hors-ligne", ++ "go-online" : "Passer en ligne", ++ "healthcheck" : "Impossible de joindre ficsit.app. Vérifiez votre connection internet ou essayer d'utiliser le mode hors-ligne. (Paramètres SMM > Passer en ligne)", ++ "offline" : "Vous êtes actuellement hors-ligne. Certaines fonctionnalités peuvent ne pas être disponibles. (Pour se reconnecter, aller dans Paramètres SMM > Passer en ligne) " ++ }, ++ "common" : { ++ "add" : "Ajouter", ++ "cancel" : "Annuler", ++ "close" : "Fermer", ++ "delete" : "Supprimer", ++ "import" : "Importer", ++ "loading" : "Chargement...", ++ "rename" : "Renommer" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Une erreur est survenue lors de la génération du fichier de débogage. Veuillez vérifier manuellement les logs de SMM pour plus d'informations et le reporter sur le DIscord. Utilisez le bouton ci-dessous pour ouvrir la documentation savoir comment faire.", ++ "generate_debug_info" : "Générer les infos de débogage", ++ "help" : "Cela vous paraît faux ? Cliquez sur le bouton ci-dessous et envoyez le fichier zip généré sur le <1>discord modding dans #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} installation invalide de Satisfactory trouvée} many {{invalidInstalls} installations invalide de Satisfactory trouvées} other {}}", ++ "no_installs" : "Aucune installations de Satisfactory trouvées", ++ "open_log_docs" : "Ouvrir la documentation des logs", ++ "open_modding_discord" : "Ouvrir le DIscord de Modding", ++ "open_modding_discord.must_generate_debug_first" : "Vous devez d'abord générer les infos de débogage", ++ "reporting_directions" : "Cela vous paraît faux ? Cliquez sur le bouton ci-dessous pour récupérer les logs et envoyez le fichier zip généré sur le Discord Modding dans #help-using-mods.", ++ "title" : "Un problème est survenu" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Déjà installé", ++ "error-loading" : "Erreur durant le chargement des détails du mod", ++ "in-queue" : "En attente", ++ "install" : "Installer", ++ "latest-version" : "Dernière version", ++ "title" : "Installer le mod", ++ "version" : "Version {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Commencer !", ++ "change_later_hint" : "Changez ces paramètres à tout moment dans le menu \"Paramètres SMM\"", ++ "intro" : "Choisissez vos préférences pour commencer.", ++ "open_welcome_guide" : "Ouvrir le Guide de Bienvenue", ++ "option" : { ++ "language" : { ++ "title" : "Utiliser cette langue quand disponible :" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Devoir cliquer sur \"Appliquer\"", ++ "enabled" : "Appliquer les changements immédiatement", ++ "title" : "Quand j'ajoute ou supprime un mode, ou change de profil..." ++ } ++ }, ++ "title" : "Bienvenue sur le Satisfactory Mod Manager (Gestionnaire de Mod de Satisfactory / SMM) !" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Appliquer {profile}", ++ "apply-queued" : "Appliquer {queued, plural, one {un changement} other {les # modifications}}", ++ "are-you-sure-warning" : "Êtes-vous sûr de vouloir lancer ?", ++ "cant-launch" : "SMM ne peut pas lancer cette installation", ++ "cant-launch-tooltip" : "Le Gestionnaire de Mods n'est pas capable de lancer ce type d'installation, mais va toujours gérer les fichiers de mods pour vous. Lancer Satisfactory avec votre lanceur habituel.", ++ "changes-queued" : "Les modifications n'ont pas encore été faites à vos fichiers. Cliquez sur le bouton ci-dessus pour appliquer les modification en attente. ", ++ "game-running" : "Votre lanceur du jeu nous rapporte que le jeu est déjà lancé (ou encore en train de se fermer)", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} mod incompatible qui ne se chargera pas ou fera planter le jeu} other {{versionIncompatible} mods incompatibles qui ne se chargeront pas ou feront planter le jeu}}", ++ "launch-in-progress" : "Lancement en cours...", ++ "operation-in-progress" : "Une opération est déjà en cours.", ++ "play" : "Jouer à Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Un mod {versionPossiblyCompatible, plural, one {n'est} other {ne sont}} probablement pas compatibles avec votre jeu} other {# Des mods {versionPossiblyCompatible, plural, one {n'est} other {ne sont}} probablement pas compatibles avec votre jeu}}", ++ "profile-change-queued" : "Les modifications n'ont pas encore été faites à vos fichiers. Cliquez sur le bouton ci-dessus pour appliquer les modification en attente. ", ++ "ready" : "Vous êtes prêt pour jouer !\n\nNote : Le Gestionnaire de Mod à déjà fini d'installer les fichiers de mod pour vous. Vous pouvez désormais lancer le jeu avec votre lanceur habituel et vos mods se chargeront toujours.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Un mod} other {# mods}} {reportedIncompatible, plural, one {est} other {sont}} signalé.s en tant qu'incompatible.s. Lisez la description ou les notes de comptabilité {versionIncompatible, plural, one {du mod} other {des mods}} pour plus d'informations.", ++ "reported-possibly-compatible-mods" : "{reportedIncompatible, plural, one {Un mod} other {# mods}} {reportedIncompatible, plural, one {est} other {sont}} signalé.s en tant qu'endommagé.s. Lisez la description ou les notes de comptabilité {versionIncompatible, plural, one {du mod} other {des mods}} pour plus d'informations.", ++ "you-have-warning-mods" : "Vous avez :" ++ }, ++ "left-bar" : { ++ "export" : "Exporter", ++ "ficsit-app" : "ficsit.app (Dépôt de Mods)", ++ "game-version" : "Sélectionnez l'installation du jeu", ++ "help" : "Aide", ++ "install-invalid" : "Invalide", ++ "install-invalid-tooltip" : "Statut : SMM ne peut pas gérer cette installation", ++ "install-loading" : "Chargement...", ++ "install-loading-tooltip" : "Statut : Chargement...", ++ "install-unknown" : "Inconnu", ++ "install-unknown-tooltip" : "Statut : Impossible de récupérer des informations sur cette installation", ++ "links" : "Liens", ++ "manage-servers" : "Gérer les serveurs", ++ "mods-off" : "Désactiver les mods", ++ "mods-on" : "Activer les mods", ++ "other" : "Autre", ++ "profile" : "Profile", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Vous avez {number} action en attentes. Appliquez ou annuler {number, plural, one {là} other {les}} avant de changer d'installation ou de profile.} other {Vous avez {number} actions en attentes. Appliquez ou annuler {number, plural, one {là} other {les}} avant de changer d'installation ou de profile.}}", ++ "satisfactory-modding-discord" : "Discord de Modding", ++ "smm-github" : "GitHub", ++ "updates" : "Mises à jour" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} Journal des modifications" ++ }, ++ "mod-details" : { ++ "change-version" : "Changer la version", ++ "change-version-any" : "Toutes", ++ "change-version-or-newer" : "Ou plus récent", ++ "changelogs" : "Journal des modifications", ++ "compatibility" : "Comptabilité", ++ "compatibility-branch" : "Ce mod à été signalé en tant que {state} sur {branch}.", ++ "compatibility-unknown" : "Inconnu", ++ "compatibility-unknown-tooltip" : "Aucune information de comptabilité n'a encore été reporté pour ce mod. Essayez le et contacte-nous sur le Discord pour qu'il puisse être mis à jour !", ++ "contributors" : "Contributeurs <1>({authors})", ++ "created" : "Créé", ++ "downloads" : "Téléchargements", ++ "installed-version" : "Version installé", ++ "latest-version" : "Dernière version", ++ "mod-author" : "Auteur(s) : ", ++ "offline-mode" : "Le mode hors-ligne est activé. Les journaux des modification et les descriptions ne seront pas disponibles.", ++ "size" : "Taille", ++ "updated" : "Mis à jour le ", ++ "view-on-ficsit-app" : "Voir sur ficsit.app", ++ "views" : "Vues" ++ }, ++ "mod-list-item" : { ++ "by-author" : "Par", ++ "compatibility-note" : "Ce mod a été signalé en tant que {state} sur cette version du jeu.", ++ "compatibility-note-none" : "(Aucun spécifié)", ++ "compatibility-warning" : "Il y a eu des problèmes liés à ce mod, mais vous pouvez quand même essayer de l'installer. Détails :", ++ "dependency" : "Ce mod est installé en tant que dépendance d'un autre mod. Il ne peut pas être installé ou supprimé seul.", ++ "disable" : "Ce mod est activé dans le profil actuel. Cliquez pour le désactiver, ce qui l'empêchera de se charger quand vous lancerez le jeu, mais il sera toujours présent dans ce profil.", ++ "disable-queued" : "Ce mod est en attente de désactivation. Cliquez pour annuler.", ++ "disabled-tooltip" : "Le mod est désactivé. Cliquez sur l'icone de pause pour l'activer.", ++ "enable" : "Cliquez pour activer ce mod.", ++ "enable-queued" : "Ce mod est en attente d'activation. Cliquez pour annuler.", ++ "favorite" : "Cliquez pour ajouter ce mod en tant que favori. Avoir un mod en favori n'est pas lié au fait qu'il soit installé ou non, c'est un moyen de garder une trace d'un mod, peu importe quel Profile est séléctionné.", ++ "hidden" : "Ce mod à été caché par l'auteur.", ++ "install" : "Cliquez pour installer ce mod.", ++ "no-tags" : "(Aucuns tags)", ++ "not-installable" : "Vous ne pouvez pas installer ce mod car :", ++ "queued" : "Ce mod est déjà en attente pour une autre action.", ++ "queued-install" : "Ce mod est en attente d'être installé. Cliquez pour annuler.", ++ "queued-uninstall" : "Ce mod est en attente d'être désinstaller. Cliquez pour annuler.", ++ "unavailable" : "Ce mod n'est plus disponible sur ficsit.app. Vous pouvez le supprimer.", ++ "unfavorite" : "Cliquez pour enlever ce mod des Favoris.", ++ "uninstall" : "Ce mod est installé sur ce profil. Cliquez pour désinstaller ce mod.", ++ "wait" : "Veuillez attendre que l'opération en cours se termine." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Aucunes autres informations données)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Tous les mods", ++ "compatible" : "Compatibles", ++ "dependency" : "Dépendances", ++ "disabled" : "Désactivés", ++ "enabled" : "Activés", ++ "favorite" : "Favoris", ++ "installed" : "Installés", ++ "not-installed" : "Non installés", ++ "queued" : "En attente" ++ }, ++ "order-by" : { ++ "downloads" : "Téléchargements", ++ "hotness" : "Tendance", ++ "last-updated" : "Dernier mis à jour", ++ "name" : "Nom", ++ "popularity" : "Popularité", ++ "views" : "Vues" ++ }, ++ "search" : "Rechercher un mod" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Aucun mod trouvés avec ces filtres", ++ "no-mods-found" : "Aucuns mods trouvé", ++ "show-all" : "Tout montrer" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Nom du profil", ++ "profile-name-placeholder" : "Nouveau nom du profil", ++ "title" : "Ajouter un profil" ++ }, ++ "delete" : { ++ "profile-name" : "Nom du profil", ++ "title" : "Supprimer le profil" ++ }, ++ "import" : { ++ "profile-file" : "Fichier du profil", ++ "profile-name" : "Nom du profil", ++ "profile-name-placeholder" : "Nouveau nom du profil", ++ "profile-version-warning" : "Ce profil à été avec une version plus récente du jeu. Il est possible qu'il ne soit pas compatible avec cette version.", ++ "title" : "Importer un profil" ++ }, ++ "rename" : { ++ "new-profile" : "Nouveau nom du profil", ++ "new-profile-placeholder" : "Nouveau profile", ++ "old-profile" : "Ancien nom du profil", ++ "old-profile-placeholder" : "Ancien profil", ++ "title" : "Renommer le profil" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Ajouter", ++ "advanced-note" : "Notez que vous devrez peut être éviter certain caractères dans l'identifiant et le mot de passe", ++ "advanced-path-placeholder" : "utilisateur:MotDePasse@hôte:port/chemin", ++ "existing-servers" : { ++ "none-yet" : "Aucun serveur ajouté. Ajoutez en un ci-dessous!", ++ "title" : "Gérer les serveurs existants" ++ }, ++ "failed-to-connect" : "Impossible de se connecter au serveur, cliquez pour réessayer", ++ "get-help" : "Avoir de l'aide pour se connecter aux serveurs", ++ "host-placeholder" : "hôte", ++ "invalid" : "SMM ne peut pas gérer cette installation", ++ "loading" : "Chargement...", ++ "local-path-placeholder" : "C:\\Chemin\\Vers\\Serveur", ++ "name-placeholder" : "Nom (par défaut : {default})", ++ "new-server" : { ++ "title" : "Ajouter un Nouveau Serveur" ++ }, ++ "password-placeholder" : "mot de passe", ++ "path-placeholder" : "chemin", ++ "port-placeholder" : "port (par défaut : {default})", ++ "switch-to-advanced" : "Passer en mode avancé", ++ "switch-to-simple" : "Passer en mode simple", ++ "title" : "Serveurs Dédiés", ++ "username-placeholder" : "identifiant", ++ "validating" : "Validation..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Impossible de lister le répertoire", ++ "failed-valid-check" : "Impossible de vérifier si le chemin sélectionné est un serveur valide" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Localisation du cache", ++ "reset" : "Réinitialiser par défaut", ++ "save" : "Sauvegarder et déplacer", ++ "title" : "Changer la localisation du cache de téléchargement" ++ }, ++ "change-cache-location" : "Changer la localisation du cache ", ++ "copy-mod-list" : "Copier la liste des mod", ++ "debug" : "Débogage", ++ "generate-debug-info" : "Générer les infos de débogage", ++ "go-online-offline" : "passer {offline, select, true {en ligne} other {hors-ligne}}", ++ "language" : "Langue", ++ "launch-button" : "Bouton de lancement", ++ "launch-button.button" : "Bouton", ++ "launch-button.cat" : "Miaou", ++ "launch-button.normal" : "Normal", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Enlever le proxy", ++ "save" : "Sauvegarder et redémarrer", ++ "title" : "Définir le proxy" ++ }, ++ "queue" : "File d'attente", ++ "queue.start-immediately" : "Démarrer immédiatement", ++ "queue.start-manually" : "Démarrer manuellement", ++ "save-window-position" : "Sauvegarder la position de la fenêtre", ++ "secret-settings" : "Paramètres secrets", ++ "set-proxy" : "Définir le proxy", ++ "settings" : "Paramètres", ++ "smm-debug-logging" : "log de débogage de SMM", ++ "start-view" : "Vue de départ", ++ "start-view.compact" : "Compact", ++ "start-view.expanded" : "Étendu", ++ "title" : "Paramètres", ++ "update-check" : "Vérification de la mise à jour", ++ "update-check.ask" : "Demander une fois trouvé", ++ "update-check.on-exit" : "En quittant", ++ "update-check.on-start" : "Au démarrage" ++ }, ++ "smm-update" : { ++ "downloading" : "Télécharger en arrière-plan", ++ "downloading-stats" : "Vitesse de téléchargement : {current} / {total}, {speed}/s, ETA {eta}", ++ "title" : "Mise à jour de SMM disponible - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Performances améliorées", ++ "performance.description" : "Vous garder productif !", ++ "platform_support" : "Support natif de Linux Heroic, Steam Snap et Mac", ++ "platform_support.description" : "Récupérer une version depuis la page GitHub si vous ne l'avez pas déjà fait !", ++ "profile_format" : "Nouveau format de profil", ++ "profile_format.description" : "Les profils de SMM2 ne sont pas compatibles avec SMM3 ! Vos profils existants ont automatiquement été migré, mais vous ne pouvez pas importer de profils créés avec SMM2.", ++ "queue" : "Action en attente", ++ "queue.description" : "Mettre en file d'attente plusieurs téléchargements/désinstallations de mod en même temps.", ++ "servers" : "Gestion de serveur dédié", ++ "servers.description" : "Gérer facilement des serveurs via filesystem, SFTP, FTP et SMB", ++ "translation" : "Problème de traduction ?", ++ "translation.description" : "Rejoignez notre Discord pour traduire SMM dans votre langue !", ++ "ui" : "Rafraichir l'interface utilisateur", ++ "ui.description" : "Une couche de peinture fraiche pour célébrer Satisfactory 1.0 !" ++ }, ++ "intro" : "On a amélioré beaucoup de points dans cette version. Voici quelques exemples :", ++ "open_guide" : "Ouvrir la documentation de SMM3", ++ "title" : "Bienvenue sur le Gestionnaire de Mod de Satisfactory Version 3 (SMM3)" ++ }, ++ "updates" : { ++ "changelog" : "Journal des modifications", ++ "check-for-updates" : "Vérifier les mises à jour", ++ "checking-for-updates" : "Vérification des mises à jour...", ++ "hide-ignored" : "Masquer ignorés", ++ "ignore" : "Ignorer", ++ "mod-update-available" : "{updates, plural, one {{updates} mise à jour de mod disponible} other {{updates} mises à jour de mod disponibles}}", ++ "no-updates" : "Aucunes mises à jour de mods/SMM actuellement", ++ "show-ignored" : "Montrer les MAJ ignorées", ++ "smm-update-available" : "Mise à jour de SMM disponible", ++ "title" : "Mises à jour", ++ "unignore" : "Annuler ignorer", ++ "update-all" : "Tout mettre à jour", ++ "update-selected" : "Mise à jour sélectionné" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/hu.json b/frontend/src/lib/generated/i18n/hu.json +new file mode 100644 +index 0000000..9b04401 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/hu.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Válts Offline módba", ++ "go-online" : "Válts Online módba", ++ "healthcheck" : "A ficsit.app nem elérhető. Ellenőrizd az internetkapcsolatodat, vagy próbáld meg az offline mód használatát. (Mod Manager Beállítások > Válts Offline módba)", ++ "offline" : "Jelenleg Offline módban vagy. Néhány funkció nem elérhető. (A visszacsatlakozáshoz használd a Mod Manager Beállítások > Válts Online módba)" ++ }, ++ "common" : { ++ "add" : "Hozzáadás", ++ "cancel" : "Visszavonás", ++ "close" : "Bezárás", ++ "delete" : "Kitörlés", ++ "import" : "Importálás", ++ "loading" : "Betöltés...", ++ "rename" : "Átnevezés" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "\nHiba történt a hibakereső fájl generálása során. Kérjük, manuálisan ellenőrizd a Satisfactory Mod Manager hibanapló fájljait további információkért, és jelentsd ezt a Discordon. Használd az alábbi gombot a dokumentáció megnyitásához és az útmutató megismeréséhez.", ++ "generate_debug_info" : "Hibakereső információ generálása\n\n\n\n\n\n\n", ++ "help" : "Úgy tűnik, hogy valami hiba történt? Kattints az alábbi gombra, és küldd el a létrehozott zip fájlt a <1>modding Discordon a #help-using-mods csatornába.\n", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls}Érvénytelen Satisfactory telepítés található.} other {{invalidInstalls}Érvénytelen Satisfactory telepítések találhatók.}}", ++ "no_installs" : "Nem található Satisfactory telepítés.\n\n\n\n\n\n\n", ++ "open_log_docs" : "Nyisd meg a Naplózás dokumentációt.\n\n\n\n\n\n\n", ++ "open_modding_discord" : "Nyisd meg a Modding Discordot.\n\n\n\n\n\n\n", ++ "open_modding_discord.must_generate_debug_first" : "Először hibakereső információt kell generálnod.\n\n\n\n\n\n\n\n\n", ++ "reporting_directions" : "Úgy tűnik, hogy valami hiba történt? Kattints az alábbi gombra a naplók összegyűjtéséhez, majd küldd el a létrehozott zip fájlt a modding Discordon a #help-using-mods csatornába.\n\n\n\n\n\n\n", ++ "title" : "Valami hiba történt.\n\n\n\n\n\n\n" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Már telepítve van.", ++ "error-loading" : "Hiba történt a mod részleteinek betöltésekor.", ++ "in-queue" : "Várakozó sorban.\n\n\n\n\n\n\n\n\n", ++ "install" : "Telepítés", ++ "latest-version" : "Legújabb verzió", ++ "title" : "Mod telepítése\n\n\n\n\n\n\n", ++ "version" : "{version} Verzió" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Get Started!", ++ "change_later_hint" : "Ezeket a beállításokat bármikor módosíthatod a \"Mod Manager Beállítások\" menüben.\n\n\n\n", ++ "intro" : "Válaszd ki a preferenciáidat a kezdéshez.", ++ "open_welcome_guide" : "Nyisd meg a Üdvözlő útmutatót.", ++ "option" : { ++ "language" : { ++ "title" : "Használj ezt a nyelvet, ahol elérhető:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Várj, amíg megnyomom az \"Alkalmaz\" gombot.", ++ "enabled" : "Változtatások azonnali alkalmazása.\n\n\n\n\n\n\n", ++ "title" : "Amikor modot adok hozzá vagy távolítok el, vagy váltok profilokat..." ++ } ++ }, ++ "title" : "Üdvözlünk a Satisfactory Mod Managerben!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Alkalmaz {profile}", ++ "apply-queued" : "Alkalmazd a {queued, plural, one {változást} other {# változást}}.\n\n\n\n\n\n", ++ "are-you-sure-warning" : "Biztosan el szeretnéd indítani?", ++ "cant-launch" : "Az SMM nem tudja elindítani ezt a telepítést.", ++ "cant-launch-tooltip" : "A Mod Manager nem képes elindítani ezt a telepítési típust, de továbbra is kezeli a mod fájlokat számodra. Indítsd el a Satisfactory-t a megszokott játékindítód segítségével.", ++ "changes-queued" : "A módosítások még nem kerültek alkalmazásra a mod fájljaidon. Kattints a fenti gombra a várakozó változtatások alkalmazásához.", ++ "game-running" : "A játékindítód azt jelzi, hogy a játék már fut (vagy még mindig a bezárás folyamatában van).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {Inkompatibilis mod, amely nem fog betöltődni vagy összeomlik a játékunk.\n} other {Inkompatibilis modok, amelyek nem fognak betöltődni vagy összeomlanak a játékunk.}}", ++ "launch-in-progress" : "Indítás folyamatban...", ++ "operation-in-progress" : "Egy művelet már folyamatban van.", ++ "play" : "Satisfactory Indítása", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Egy mod, amely '{versionPossiblyCompatible, plural, one {valószínűleg inkompatibilis} other {valószínűleg inkompatibilisek}' a játékoddal.} other {# Modok, amelyek '{versionPossiblyCompatible, plural, one {valószínűleg inkompatibilisek} other {valószínűleg inkompatibilisek}' a játékoddal.}}", ++ "profile-change-queued" : "A mod fájljain még nem történt módosítás. Kattintson a fenti gombra az új profil alkalmazásához.\n\n(A \"Kézi indítás\" sor módban van)", ++ "ready" : "A játék készen áll!\n\nMegjegyzés: A Mod Manager már befejezte a mod fájlok telepítését számodra. Indíthatod a játékot a megszokott játékindítód segítségével, és a modok továbbra is betöltődnek.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Egy mod} other {# mod}} amely {reportedIncompatible, plural, one {be van jelentve} other {be vannak jelentve} töröttnek ezen a játékverzión. Olvasd el a {versionIncompatible, plural, one {mod} other {modok}} leírását vagy kompatibilitási megjegyzéseit a további információkért.", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Egy mod} other {# mod}} amely {reportedPossiblyCompatible, plural, one {be van jelentve} other {be vannak jelentve} sérültnek ezen a játékverzión. Olvasd el a {versionIncompatible, plural, one {mod} other {modok}} leírását vagy kompatibilitási megjegyzéseit a további információkért.", ++ "you-have-warning-mods" : "Neked van:\n\n" ++ }, ++ "left-bar" : { ++ "export" : "Exportálás\n\n\n\n\n\n\n", ++ "ficsit-app" : "ficsit.app (Mod tároló)", ++ "game-version" : "Válaszd ki a Játék Telepítést\n\n\n\n\n\n\n", ++ "help" : "Segítség", ++ "install-invalid" : "Érvénytelen", ++ "install-invalid-tooltip" : "Állapot: Az SMM nem tudja kezelni ezt a telepítést.\n\n\n\n\n\n\n", ++ "install-loading" : "Betöltés...", ++ "install-loading-tooltip" : "Állapot: Betöltés...", ++ "install-unknown" : "Ismeretlen\n\n\n\n\n\n\n", ++ "install-unknown-tooltip" : "Állapot: Nem sikerült információt szerezni erről a telepítésről.", ++ "links" : "Linkek", ++ "manage-servers" : "Szerverek kezelése", ++ "mods-off" : "Modok kikapcsolása", ++ "mods-on" : "Modok bekapcsolása", ++ "other" : "Több", ++ "profile" : "Profil", ++ "queue-blocking-switching-tooltip" : "{number, plural, other {Neked van {number} akció a várakozó sorban. Alkalmazd vagy töröld {number, plural, one {azt} other {azokat}} mielőtt telepítéseket vagy profilokat váltanál.} }", ++ "satisfactory-modding-discord" : "Satisfactory Modding Discord\n", ++ "smm-github" : "SMM GitHub", ++ "updates" : "Frissítések" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} Változási naplója" ++ }, ++ "mod-details" : { ++ "change-version" : "Verzió változtatása", ++ "change-version-any" : "Bármennyi", ++ "change-version-or-newer" : "vagy újabb", ++ "changelogs" : "Változási naplók\n\n\n", ++ "compatibility" : "Kompatibilitás", ++ "compatibility-branch" : "Ez a mod be lett jelentve mint {state} {branch}-on.", ++ "compatibility-unknown" : "Ismeretlen", ++ "compatibility-unknown-tooltip" : "Még nincs bejelentett kompatibilitási információ erről a modról. Próbáld ki, és vedd fel velünk a kapcsolatot a Discordon, hogy frissíthessük!", ++ "contributors" : "Hozzájárulok <1>({authors})", ++ "created" : "Létrehozva", ++ "downloads" : "Összes letöltés", ++ "installed-version" : "Letöltött verziók", ++ "latest-version" : "Legújabb verzió", ++ "mod-author" : "A mod létrehozója: ", ++ "offline-mode" : "Az offline mód be van kapcsolva. Változási naplók és leírások nem elérhetők.\n", ++ "size" : "Méret", ++ "updated" : "Frissítve", ++ "view-on-ficsit-app" : "Nézd meg a ficsit.app-on", ++ "views" : "Megtekintések" ++ }, ++ "mod-list-item" : { ++ "by-author" : "általa", ++ "compatibility-note" : "Ez a mod be lett jelentve mint {state} ezen a játékverzión.\n\n", ++ "compatibility-note-none" : "(Nincs megadva)\n\n\n", ++ "compatibility-warning" : "Problémák lettek bejelentve ezzel a moddal kapcsolatban, de mindenképpen megpróbálhatod telepíteni. Részletek:", ++ "dependency" : "Ez a mod egy másik mod függőségeként van telepítve. Nem telepíthető vagy távolítható el önállóan.", ++ "disable" : "Ez a mod engedélyezve van ezen a profilon. Kattints a letiltásához, ami megakadályozza, hogy betöltődjön a játék indításakor, de továbbra is része marad ennek a profilnak.", ++ "disable-queued" : "Ez a mod letiltásra vár. Kattints a művelet törléséhez.", ++ "disabled-tooltip" : "Ez a mod le van tiltva. Kattints a szünet ikonra az engedélyezéséhez.", ++ "enable" : "Kattints a mod engedélyezéséhez.", ++ "enable-queued" : "Ez a mod engedélyezésre vár. Kattints a művelet törléséhez.", ++ "favorite" : "Kattints a mod kedvencekhez adásához. A mod kedvencként való megjelölése nem kapcsolódik ahhoz, hogy telepítve van-e vagy sem – ez egy módja annak, hogy nyomon követhesd a modot későbbi használatra, függetlenül attól, melyik profilt választottad.", ++ "hidden" : "Ez a mod el lett rejtve a szerző által.", ++ "install" : "Kattints a mod telepítéséhez.", ++ "no-tags" : "(nincs elérhető)", ++ "not-installable" : "Nem tudod telepíteni ezt a modot. Ok:", ++ "queued" : "Ez a mod már várakozik egy másik műveletre.", ++ "queued-install" : "Ez a mod telepítésre vár. Kattints a művelet törléséhez.", ++ "queued-uninstall" : "Ez a mod eltávolításra vár. Kattints a művelet törléséhez.", ++ "unavailable" : "Ez a mod már nem elérhető a ficsit.app-on. Lehet, hogy érdemes eltávolítanod.", ++ "unfavorite" : "Kattints a mod eltávolításához a kedvencek közül.", ++ "uninstall" : "Ez a mod telepítve van ezen a profilon. Kattints a mod eltávolításához.", ++ "wait" : "Várj meg a jelenlegi művelet befejezését." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Nincs további megjegyzés)\n\n" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Összes mod", ++ "compatible" : "Kompatibilis", ++ "dependency" : "Függőség", ++ "disabled" : "Letiltva", ++ "enabled" : "Engedélyezve", ++ "favorite" : "Kedvenc", ++ "installed" : "Letöltve", ++ "not-installed" : "Nincs letöltve", ++ "queued" : "Várakozó" ++ }, ++ "order-by" : { ++ "downloads" : "Letöltések", ++ "hotness" : "Népszerűség", ++ "last-updated" : "Utolsó frissítés", ++ "name" : "Név", ++ "popularity" : "Népszerűség", ++ "views" : "Megtekintések" ++ }, ++ "search" : "Modok keresése" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Nincsenek modok, amelyek megfelelnek a szűrőidnek.", ++ "no-mods-found" : "Nincs található mod.", ++ "show-all" : "Összes mutatása" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Profil név", ++ "profile-name-placeholder" : "Új profil név", ++ "title" : "Profil hozzáadása" ++ }, ++ "delete" : { ++ "profile-name" : "Profil név", ++ "title" : "Profil kitörlése" ++ }, ++ "import" : { ++ "profile-file" : "Profil fájl", ++ "profile-name" : "Profil név", ++ "profile-name-placeholder" : "Új profil név", ++ "profile-version-warning" : "Ez a profil egy újabb verzióval készült, mint a játék. Lehet, hogy nem kompatibilis ezzel a verzióval.", ++ "title" : "Profil betöltése" ++ }, ++ "rename" : { ++ "new-profile" : "Új profil név", ++ "new-profile-placeholder" : "Új profil", ++ "old-profile" : "Régi profil név", ++ "old-profile-placeholder" : "Régi profil", ++ "title" : "Profil név megváltoztatása" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Hozzáadás", ++ "advanced-note" : "Vedd figyelembe, hogy bizonyos karaktereket lehet, hogy escape-elni kell a felhasználónévben és a jelszóban.", ++ "advanced-path-placeholder" : "felhasználó:jelszó@host:port/út\n", ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : "Sikerült a kapcsolat a szerverhez, kattints a próbálkozáshoz.", ++ "get-help" : "Segítség a szerverekhez való kapcsolódáshoz.", ++ "host-placeholder" : "host", ++ "invalid" : "Az SMM nem tudja kezelni ezt a telepítést.\n\n\n", ++ "loading" : "Betöltés...", ++ "local-path-placeholder" : "C:\\Szerver\\Fájlai\n\n", ++ "name-placeholder" : "Név (alapértelmezett: {default})", ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : "jelszó", ++ "path-placeholder" : "út", ++ "port-placeholder" : "port (alapértelmezett: {default})", ++ "switch-to-advanced" : "Válts haladó módra", ++ "switch-to-simple" : "Válts egyszerű módra", ++ "title" : "Dedikált Szerverek", ++ "username-placeholder" : "felhasználónév", ++ "validating" : "Érvényesítés...\n" ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Nem sikerült listázni a könyvtárat\n", ++ "failed-valid-check" : "Nem sikerült a könyvtár listázása." ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Gyorsítótár helye\n\n\n\n\n\n\n", ++ "reset" : "Alapértelmezettre állítás", ++ "save" : "Mentés és tovább", ++ "title" : "Gyorsítótár letöltésének helye változtatása" ++ }, ++ "change-cache-location" : "Gyorsítótár helyének változtatása", ++ "copy-mod-list" : "Mod lista másolása", ++ "debug" : "Hibakeresés", ++ "generate-debug-info" : "Hibakeresés indítása", ++ "go-online-offline" : "Menj {offline, select, true {online} other {offline}}", ++ "language" : "Nyelv", ++ "launch-button" : "Indító gomb", ++ "launch-button.button" : "Gomb", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normális", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Proxy eltávolítása", ++ "save" : "Mentés és újraindítás", ++ "title" : "Proxy beállítása" ++ }, ++ "queue" : "Várakozó", ++ "queue.start-immediately" : "Indítás rögtön", ++ "queue.start-manually" : "Manuális indítás", ++ "save-window-position" : null, ++ "secret-settings" : "Rejtett beállítások", ++ "set-proxy" : "Proxy beállítása", ++ "settings" : "Beállítások", ++ "smm-debug-logging" : "SMM hibakereső bejelentkezés", ++ "start-view" : "Indító nézet", ++ "start-view.compact" : "Kompakt", ++ "start-view.expanded" : "Kiterjesztve", ++ "title" : "Mod Kezelő Beállításai", ++ "update-check" : "Frissítés ellenőrzés", ++ "update-check.ask" : "Kérdezés amikor megtalálva", ++ "update-check.on-exit" : "Amikor kilépés", ++ "update-check.on-start" : "Amikor bekapcsolva" ++ }, ++ "smm-update" : { ++ "downloading" : "Letöltés a háttérben", ++ "downloading-stats" : "Frissítés letöltése folyamatban: {current}/{total}, {speed}/s, Becsölt idő {eta}", ++ "title" : "{version} - SMM Frissítés elérhető" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Fejlesztett teljesítmény", ++ "performance.description" : "Hatékonyság megőrzése!\n", ++ "platform_support" : "Natív Linux Heroic, Steam Snap, Mac támogatás\n", ++ "platform_support.description" : "Szerezzen be egy buildet a GitHub-kiadásokból, ha még nem tette meg!\n", ++ "profile_format" : "Új profil formátum", ++ "profile_format.description" : "Az SMM2 profilok nem kompatibilisek az SMM3-mal! Meglévő profiljait automatikusan áttelepítettük, de az SMM2-vel létrehozott profilokat nem importálhatja.\n", ++ "queue" : "Művelet sorban állás\n", ++ "queue.description" : "Állítson fel egyszerre több mod-letöltést/eltávolítást a sorba.\n", ++ "servers" : "Dedikált szerver kezelése", ++ "servers.description" : "Könnyeben kezeld a szervert, használj SFTP, FTP és SMB fálj kezelő programot!", ++ "translation" : "Fordítási támogatás\n", ++ "translation.description" : "Csatlakozz a Discordunkhoz ha le szeretnéd fordítani a nyelved a SMM-re", ++ "ui" : "Kezelő felület frissítése", ++ "ui.description" : "Friss festékréteg a Satisfactory 1.0 ünneplésére!\n" ++ }, ++ "intro" : "Rengeteg fejlesztést hajtottunk végre ezen a verzión. Íme néhány kiemelés:\n", ++ "open_guide" : "Nyissa meg az SMM3 dokumentációját\n", ++ "title" : "Üdvözöljük a Satisfactory Mod Manager 3-as verziójában!\n" ++ }, ++ "updates" : { ++ "changelog" : "Változási napló\n", ++ "check-for-updates" : "Ellenőrizd a frissítéseket", ++ "checking-for-updates" : "Frissítések ellenörzése", ++ "hide-ignored" : "Elrejtés figyelmen kívül hagyva\n", ++ "ignore" : "Figyelmen kívül hagyva\n", ++ "mod-update-available" : "{updates, plural, one {{updates} mod frissítés elérhető} other {{updates} modok frissítése elérhető}}", ++ "no-updates" : "Nincs elérhető mod/SMM frissítés", ++ "show-ignored" : "Mutasd a figyelmen kívül hagyottat", ++ "smm-update-available" : "SMM Frissítés elérhető!", ++ "title" : "Frissítések", ++ "unignore" : "Hagyja figyelmen kívül", ++ "update-all" : "Összes frissítése", ++ "update-selected" : "Kiválasztott frissítése" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/index.ts b/frontend/src/lib/generated/i18n/index.ts +new file mode 100644 +index 0000000..0685334 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/index.ts +@@ -0,0 +1,36 @@ ++/* eslint-disable */ ++import de from './de.json'; ++import en from './en.json'; ++import es from './es.json'; ++import fr from './fr.json'; ++import hu from './hu.json'; ++import it from './it.json'; ++import ja from './ja.json'; ++import ko from './ko.json'; ++import lt from './lt.json'; ++import mt from './mt.json'; ++import pl from './pl.json'; ++import pt_BR from './pt-BR.json'; ++import ru from './ru.json'; ++import tr from './tr.json'; ++import zh_Hans from './zh-Hans.json'; ++import zh_Hant from './zh-Hant.json'; ++ ++export const i18n = { ++ "de": de, ++ "en": en, ++ "es": es, ++ "fr": fr, ++ "hu": hu, ++ "it": it, ++ "ja": ja, ++ "ko": ko, ++ "lt": lt, ++ "mt": mt, ++ "pl": pl, ++ "pt-BR": pt_BR, ++ "ru": ru, ++ "tr": tr, ++ "zh-Hans": zh_Hans, ++ "zh-Hant": zh_Hant, ++}; +diff --git a/frontend/src/lib/generated/i18n/it.json b/frontend/src/lib/generated/i18n/it.json +new file mode 100644 +index 0000000..5245bd1 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/it.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Vai Offline", ++ "go-online" : "Vai Online", ++ "healthcheck" : "Impossibile raggiungere ficsit.app. Controlla la tua connessione a internet o considera di usare la modalità offline. (Impostazioni Mod Manager > Vai Offline) ", ++ "offline" : "Attualmente sei offline. Alcune funzionalità potrebbero non essere disponibili. (Per riconnetterti, vai su Impostazioni Mod Manager > Vai Online)" ++ }, ++ "common" : { ++ "add" : "Aggiungi", ++ "cancel" : "Annulla", ++ "close" : "Chiudi", ++ "delete" : "Elimina", ++ "import" : "Importa", ++ "loading" : "Caricamento...", ++ "rename" : "Rinomina" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Si è verificato un errore durante la generazione del file di debug. Controlla manualmente i file di log del Satisfactory Mod Manager per ulteriori informazioni e segnala il problema su Discord. Usa il pulsante qui sotto per aprire la documentazione e scoprire come procedere.", ++ "generate_debug_info" : "Genera informazioni di debug", ++ "help" : "\nSembra sbagliato? Clicca il pulsante qui sotto e invia il file zip generato sul <1>Discord per il modding nel canale #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} installazione di Satisfactory non valida} other {{invalidInstalls} installazioni di Satisfactory non valide} }", ++ "no_installs" : "Nessuna installazione di Satisfactory trovata", ++ "open_log_docs" : "Apri la Documentazione per il Logging", ++ "open_modding_discord" : "Apri il server Discord per il Modding", ++ "open_modding_discord.must_generate_debug_first" : "Devi prima generare le informazioni di debug", ++ "reporting_directions" : "\nSembra sbagliato? Clicca il pulsante qui sotto e invia il file zip generato sul Discord per il Modding nel canale #help-using-mods.", ++ "title" : "Qualcosa è andato storto" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Già installato", ++ "error-loading" : "Errore durante il caricamento dei dettagli della mod", ++ "in-queue" : "In coda", ++ "install" : "Installa", ++ "latest-version" : "Ultima versione", ++ "title" : "Installa mod", ++ "version" : "Versione {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Iniziamo!", ++ "change_later_hint" : "Cambia queste impostazioni in qualsiasi momento nel menu \"Impostazioni Mod Manager\"", ++ "intro" : "Seleziona le tue preferenze per iniziare.", ++ "open_welcome_guide" : "Apri la Guida di Benvenuto", ++ "option" : { ++ "language" : { ++ "title" : "Usa questa lingua quando disponibile:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Aspetta per premere \"Applica\"", ++ "enabled" : "Applica le modifiche immediatamente", ++ "title" : "Quando aggiungo o rimuovo una mod, o cambio profilo..." ++ } ++ }, ++ "title" : "Benvenuto sul Satisfactory Mod Manager!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Applica", ++ "apply-queued" : "Applica {queued, plural, one {una modifica} other {# modifiche}}", ++ "are-you-sure-warning" : "Sei sicuro di voler avviare?", ++ "cant-launch" : "SMM non può avviare questa installazione", ++ "cant-launch-tooltip" : "Il Mod Manager non è in grado di avviare questo tipo di installazione, ma gestirà comunque i file dei mod per te. Avvia Satisfactory utilizzando il tuo launcher di gioco abituale.", ++ "changes-queued" : "Le modifiche non sono state ancora applicate ai file delle mod. Clicca il pulsante sopra per applicare le modifiche che hai messo in coda.\n\n(Hai impostato la modalità coda in \"Avvia manualmente\")", ++ "game-running" : "Il launcher sta rilevando che il gioco è già in esecuzione (o è ancora in fase di chiusura).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {mod incompatibile che non verrà caricata o causerà il crash del gioco} other {mod incompatibili che non verranno caricate o causeranno il crash del gioco}}", ++ "launch-in-progress" : "Avvio in corso...", ++ "operation-in-progress" : "Un'operazione è già in corso.", ++ "play" : "Avvia Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Una mod {versionPossiblyCompatible, plural, one {è probabilmente incompatibile} other {sono probabilmente incompatibili}} con il tuo gioco} other {# mod {versionPossiblyCompatible, plural, one {è probabilmente incompatibile} other {sono probabilmente incompatibili}} con il tuo gioco}}", ++ "profile-change-queued" : "Le modifiche devono essere ancora confermate. Premi il pulsante qui sotto per applicarle al profilo.", ++ "ready" : "Sei pronto a rombare!\n\nNota: il Mod Manager ha finito di installare i file delle mod per te. Puoi lanciare il gioco usando il tuo solito launcher, le mod verranno comunque caricate.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Una mod} other {# Alcune mods}} {reportedIncompatible, plural, one {è stata} other {sono state}}riportate NON FUNZIONANTI in questa versione di gioco. Leggi {versionIncompatible, plural, one {la descrizione della mod} other {le descrizioni delle mods'}} o le note di compatibilità per maggiori informazioni", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Una mod} other {# Alcune mods}} {reportedPossiblyCompatible, plural, one {è stata} other {sono state}} riportate DANNEGGIATE in questa versione di gioco. Leggi {versionIncompatible, plural, one {la descrizione della mod} other {le descrizioni delle mods'}} o le note di compatibilità per maggiori informazioni", ++ "you-have-warning-mods" : "Hai:" ++ }, ++ "left-bar" : { ++ "export" : "Esporta", ++ "ficsit-app" : "ficsit.app (Repository delle Mod)", ++ "game-version" : "Seleziona Installazione del Gioco", ++ "help" : "Aiuto", ++ "install-invalid" : "Invalido", ++ "install-invalid-tooltip" : "Stato: SMM non può gestire questa installazione", ++ "install-loading" : "Caricamento...", ++ "install-loading-tooltip" : "Status: Caricamento...", ++ "install-unknown" : "Sconosciuto", ++ "install-unknown-tooltip" : "Status: Non è possibile ottenere informazioni su questa installazione", ++ "links" : "Link", ++ "manage-servers" : "Gestisci Server", ++ "mods-off" : "Mod off", ++ "mods-on" : "Mod on", ++ "other" : "Altro", ++ "profile" : "Profilo", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Hai {number} azione in coda. Applica o annulla {number, plural, one {l'azione} other {le azioni}} prima di cambiare installazione o profilo.} other {Hai {number} azioni in coda. Applica o annulla {number, plural, one {l'azione} other {le azioni}} prima di cambiare installazione o profilo.}}", ++ "satisfactory-modding-discord" : "Satisfactory Modding Discord", ++ "smm-github" : "SMM GitHub", ++ "updates" : "Aggiornamenti" ++ }, ++ "mod-changelog" : { ++ "title" : "Changelog di <1>{mod}" ++ }, ++ "mod-details" : { ++ "change-version" : "Cambia versione", ++ "change-version-any" : "Qualsiasi", ++ "change-version-or-newer" : "o più recente", ++ "changelogs" : "Modifiche", ++ "compatibility" : "Compatibilità", ++ "compatibility-branch" : "Questa mod è stata segnalata come {state} su {branch}", ++ "compatibility-unknown" : "Sconosciuto", ++ "compatibility-unknown-tooltip" : "Non sono ancora state riportate informazioni sulla compatibilità per questa mod. Provala e contattaci su Discord affinché possa essere aggiornata!", ++ "contributors" : "Autori <1>({authors})", ++ "created" : "Creata", ++ "downloads" : "Download totali", ++ "installed-version" : "Versione installata", ++ "latest-version" : "Ultima versione", ++ "mod-author" : "Una mod di:", ++ "offline-mode" : "La modalità offline è attiva. Changelog e descrizioni non sono disponibili.", ++ "size" : "Dimensione", ++ "updated" : "Aggiornata", ++ "view-on-ficsit-app" : "Vedi su ficsit.app", ++ "views" : "Visualizzazioni" ++ }, ++ "mod-list-item" : { ++ "by-author" : "di", ++ "compatibility-note" : "Questa mod è stata segnalata come {state} su questa versione del gioco.", ++ "compatibility-note-none" : "(Nessuna specificata)", ++ "compatibility-warning" : "Sono stati segnalati problemi con questa mod, ma puoi provare a installarla comunque. Dettagli:", ++ "dependency" : "Questa mod è installata come dipendenza di un'altra mod. Non può essere installata o rimossa separatamente.", ++ "disable" : "Questa mod è Abilitata su questo profilo. Clicca per Disabilitarla, il che impedirà il suo caricamento all'avvio del gioco, ma rimarrà comunque parte di questo profilo.", ++ "disable-queued" : "Questa mod è in coda per essere disabilitata. Clicca per annullare l'operazione.", ++ "disabled-tooltip" : "Questa mod è disabilitata. Clicca sull'icona di pausa per abilitarla.", ++ "enable" : "Clicca per abilitare questa mod.", ++ "enable-queued" : "Questa mod è in coda per essere abilitata. Clicca per annullare l'operazione.", ++ "favorite" : "Clicca per aggiungere questa mod ai Preferiti. Avere una mod tra i Preferiti non è legato al fatto che sia installata o meno: è un modo per tenerne traccia per dopo, indipendentemente dal profilo selezionato.", ++ "hidden" : "Questa mod è stata nascosta dall'autore.", ++ "install" : "Clicca per installare questa mod.", ++ "no-tags" : "(nessuno disponibile)", ++ "not-installable" : "Non puoi installare questa mod. Motivo:", ++ "queued" : "Questa mod è già in coda per un'altra operazione.", ++ "queued-install" : "Questa mod è in coda per essere installata. Clicca per annullare l'operazione.", ++ "queued-uninstall" : "Questa mod è in coda per essere disinstallata. Clicca per annullare l'operazione.", ++ "unavailable" : "Questa mod non è più disponibile su ficsit.app. Potresti volerla rimuovere.", ++ "unfavorite" : "Clicca per rimuovere questa mod dai Preferiti.", ++ "uninstall" : "Questa mod è installata su questo profilo. Clicca per disinstallarla.", ++ "wait" : "Attendi il completamento dell' operazione in corso." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Nessuna ulteriore nota fornita)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Tutte le mod", ++ "compatible" : "Compatibile", ++ "dependency" : "Dipendenza", ++ "disabled" : "Disabilitata", ++ "enabled" : "Abilitata", ++ "favorite" : "Preferita", ++ "installed" : "Installata", ++ "not-installed" : "Non installata", ++ "queued" : "In Coda" ++ }, ++ "order-by" : { ++ "downloads" : "Download", ++ "hotness" : "Di tendenza", ++ "last-updated" : "Ultimo aggiornamento", ++ "name" : "Nome", ++ "popularity" : "Popolarità", ++ "views" : "Visualizzazioni" ++ }, ++ "search" : "Cerca mod" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Nessuna mod corrisponde ai tuoi filtri", ++ "no-mods-found" : "Nessuna mod trovata", ++ "show-all" : "Mostra tutte" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Nome profilo", ++ "profile-name-placeholder" : "Nome del Nuovo Profilo", ++ "title" : "Aggiungi profilo" ++ }, ++ "delete" : { ++ "profile-name" : "Nome profilo", ++ "title" : "Elimina profilo" ++ }, ++ "import" : { ++ "profile-file" : "File del profilo", ++ "profile-name" : "Nome profilo", ++ "profile-name-placeholder" : "Nome del Nuovo Profilo", ++ "profile-version-warning" : "Questo profilo è stato creato con una versione più recente del gioco. Potrebbe non essere compatibile con questa versione.", ++ "title" : "Importa profilo" ++ }, ++ "rename" : { ++ "new-profile" : "Nuovo nome del profilo", ++ "new-profile-placeholder" : "Nuovo Profilo", ++ "old-profile" : "Nome precedente del profilo", ++ "old-profile-placeholder" : "Vecchio Profilo", ++ "title" : "Rinomina profilo" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Aggiungi", ++ "advanced-note" : "Tieni presente che potresti dover eseguire l'escape di alcuni caratteri nel nome utente e nella password", ++ "advanced-path-placeholder" : "utente:password@dominio:porta/percorso", ++ "existing-servers" : { ++ "none-yet" : "Nessun server esistente, aggiungilo qui sotto!", ++ "title" : "Gestisci i Server" ++ }, ++ "failed-to-connect" : "Tentativo di connessione al server fallito, clicca per riprovare", ++ "get-help" : "Richiedi assistenza per connetterti al server", ++ "host-placeholder" : "host", ++ "invalid" : "SMM non può gestire questa installazione", ++ "loading" : "Caricamento...", ++ "local-path-placeholder" : "C:\\Percorso\\del\\Server", ++ "name-placeholder" : "Nome (predefinito: {default})", ++ "new-server" : { ++ "title" : "Aggiungi un nuovo Server" ++ }, ++ "password-placeholder" : "password", ++ "path-placeholder" : "path", ++ "port-placeholder" : "porta (default: {default})", ++ "switch-to-advanced" : "Passa alla modalità avanzata", ++ "switch-to-simple" : "Passa alla modalità semplice", ++ "title" : "Server Dedicati", ++ "username-placeholder" : "username", ++ "validating" : "Validazione..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Impossibile trovare la cartella", ++ "failed-valid-check" : "Impossibile verificare se il percorso selezionato è un server valido" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Posizione della cache", ++ "reset" : "Reimposta predefinito", ++ "save" : "Salva e sposta", ++ "title" : "Cambia posizione di download della cache" ++ }, ++ "change-cache-location" : "Cambia posizione della cache", ++ "copy-mod-list" : "Copia lista delle mod", ++ "debug" : "Debug", ++ "generate-debug-info" : "Genera informazioni di debug", ++ "go-online-offline" : "Vai {offline, select, true {online} other {offline}}\n", ++ "language" : "Lingua", ++ "launch-button" : "Pulsante di avvio", ++ "launch-button.button" : "Pulsante", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normale", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Rimuovi proxy", ++ "save" : "Salva e riavvia", ++ "title" : "Imposta proxy" ++ }, ++ "queue" : "Coda", ++ "queue.start-immediately" : "Esegui immediatamente", ++ "queue.start-manually" : "Esegui manualmente", ++ "save-window-position" : "Salva la posizione della finestra", ++ "secret-settings" : "Impostazioni segrete", ++ "set-proxy" : "Imposta proxy", ++ "settings" : "Impostazioni", ++ "smm-debug-logging" : "SMM debug logging", ++ "start-view" : "Vista all'avvio", ++ "start-view.compact" : "Compatto", ++ "start-view.expanded" : "Espanso", ++ "title" : "Impostazioni Mod Manager", ++ "update-check" : "Check degli aggiornamenti", ++ "update-check.ask" : "Chiedi quando trovati", ++ "update-check.on-exit" : "All'uscita", ++ "update-check.on-start" : "All'avvio" ++ }, ++ "smm-update" : { ++ "downloading" : "Scaricamento in background", ++ "downloading-stats" : "Scaricamento della nuova versione: {current} / {total}, {speed}/s, Rimanente {eta}", ++ "title" : "Aggiornamento di SMM disponibile" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Prestazioni migliorate", ++ "performance.description" : "Sempre efficente!", ++ "platform_support" : "Compatibile con Linux Heroic, Steam Snap e Mac", ++ "platform_support.description" : "Scarica il programma da GitHub se ancora non l'hai fatto!", ++ "profile_format" : "Nuovo formato del profilo", ++ "profile_format.description" : "I profili di SMM2 non sono compatibili con SMM3! I tuoi profili esistenti sono stati migrati automaticamente, ma non puoi importare alcun profilo creato con SMM2.", ++ "queue" : "Coda delle azioni", ++ "queue.description" : "Metti in coda più download/disinstallazioni di mod contemporaneamente.", ++ "servers" : "Gestione dei server dedicati", ++ "servers.description" : "Gestisci facilmente i server tramite filesystem, SFTP, FTP e SMB!", ++ "translation" : "Supporto traduzioni", ++ "translation.description" : "Unisciti al nostro Discord per tradurre SMM nella tua lingua!", ++ "ui" : "Nuova interfaccia utente", ++ "ui.description" : "Nuovo design per celebrare Satisfactory 1.0!" ++ }, ++ "intro" : "Abbiamo fatto un sacco di miglioramenti in questa versione. Ecco alcuni dei piu importanti:", ++ "open_guide" : "Apri la Documentazione di SMM3", ++ "title" : "Benvenuto su Satisfactory Mod Manager versione 3!" ++ }, ++ "updates" : { ++ "changelog" : "Changelog", ++ "check-for-updates" : "Controlla gli aggiornamenti", ++ "checking-for-updates" : "Controllo gli aggiornamenti...", ++ "hide-ignored" : "Nascondi ignorati", ++ "ignore" : "Ignora", ++ "mod-update-available" : "{updates, plural, one {{updates} aggiornamento disponibile} other {{updates} aggiornamenti disponibili}}", ++ "no-updates" : "Nessun aggiornamento di mod/SMM", ++ "show-ignored" : "Mostra ignorati", ++ "smm-update-available" : "Aggiornamento di SMM disponibile", ++ "title" : "Aggiornamenti", ++ "unignore" : "Mostra", ++ "update-all" : "Aggiorna Tutte", ++ "update-selected" : "Aggiorna Selezionate" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/ja.json b/frontend/src/lib/generated/i18n/ja.json +new file mode 100644 +index 0000000..36a0d02 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/ja.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "オフラインモードにする", ++ "go-online" : "オンラインモードにする", ++ "healthcheck" : "ficsit.appに接続できませんでした。インターネットへの接続状況を確認するか、オフラインモードの使用を検討してください。(Modマネージャー設定 > オフラインモードにする)", ++ "offline" : "現在オフラインモードです。幾つかの機能が使用できないかもしれません。（再接続するには Modマネージャー設定 > オンラインモードにする を選択してください）" ++ }, ++ "common" : { ++ "add" : "追加", ++ "cancel" : "キャンセル", ++ "close" : "閉じる", ++ "delete" : "削除", ++ "import" : "取り込み", ++ "loading" : "ロード中…", ++ "rename" : "名称変更" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "デバッグファイルを生成中にエラーが発生しました。追加の情報を見るには Satisfactory Mod マネージャーのログを確認し、Discordにて不具合をお知らせください（会話は英語を使用すること）。不具合報告のやり方を確認するには、下部にあるボタンを押してドキュメントを開いてください。", ++ "generate_debug_info" : "Debug info （デバッグ情報）を生成する", ++ "help" : "何か変ですか? 下部のボタンを押して生成されたZipファイルを <1>modding discord の #help-using-mods チャンネルに送信してください。（会話は英語を使用すること）", ++ "invalid_installs" : "{invalidInstalls, plural, other {{invalidInstalls}つの無効なSatisfactoryのインストールを発見しました。}}", ++ "no_installs" : "Satisfactory （ゲーム本体）を発見できませんでした", ++ "open_log_docs" : "ログについてのドキュメントを開く", ++ "open_modding_discord" : "Modding Discordを開く", ++ "open_modding_discord.must_generate_debug_first" : "最初にデバッグ情報を生成してください。", ++ "reporting_directions" : "何か変ですか? 下部のボタンを押してログを収集し、生成されたZipファイルを modding Discord の #help-using-mods チャンネルに送信してください。（会話は英語を使用すること）", ++ "title" : "不具合が発生しました。" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "インストール済み", ++ "error-loading" : "Mod 詳細情報の取得に失敗", ++ "in-queue" : "キュー待ち", ++ "install" : "インストール", ++ "latest-version" : "最新バージョン", ++ "title" : "Mod をインストールする", ++ "version" : "バージョン {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "始める！", ++ "change_later_hint" : "これらの設定はいつでも \"Mod マネージャー設定\" から変更できます。", ++ "intro" : "使い始める前にあなたの好みを選択してください。", ++ "open_welcome_guide" : "\"初めに\"のガイドを表示する", ++ "option" : { ++ "language" : { ++ "title" : "使用する言語:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "”適用”を押すまで待つ", ++ "enabled" : "すぐに変更を適用する", ++ "title" : "Mod を追加、削除又はプロファイルを変更したときに…" ++ } ++ }, ++ "title" : "Satisfactory Mod マネージャーへようこそ！" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "{profile}に適用する", ++ "apply-queued" : "{queued, plural, one {# つ} other {# つ}}の変更を適用する", ++ "are-you-sure-warning" : "本当に実行しますか？", ++ "cant-launch" : "SMMはこのインストールでは実行できません。", ++ "cant-launch-tooltip" : "Mod マネージャーはこのゲームのインストール方法に対応しておりません。Modは管理できますが、Satisfacotryを実行するにはあなたの使用しているランチャーをお使いください。", ++ "changes-queued" : "変更はまだ適用されていません。下部のボタンを押して変更を適用してください。（現在、キューが”手動”になっています）", ++ "game-running" : "ゲームランチャーはまだゲームが実行中と判断しているようです。（またはゲーム閉じている最中のようです）", ++ "incompatible-mods" : "{versionIncompatible, plural, other {読み込まれない又はクラッシュする可能性のある{versionIncompatible}つの互換性のないModが含まれています}}", ++ "launch-in-progress" : "ゲームを実行中…", ++ "operation-in-progress" : "処理中…", ++ "play" : "Satisfactory を実行する", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, other {#つのModがゲームと互換性の無い可能性があります。}}", ++ "profile-change-queued" : "変更はまだ適用されていません。下部のボタンを押してプロファイルに変更を適用してください。（現在、キューが”手動”になっています）", ++ "ready" : "準備ができました！\n\nメモ: ModマネージャーはModをインストールし終えました。ゲームをゲームランチャーを用いて起動してもModは読み込まれます。", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {# つ} other {# つ}} のModが現在のゲームのバージョンに対して”故障中”と報告されています。Modページの詳細情報か互換情報をご確認ください。", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {# つ} other {# つ}}のModが現在のゲームのバージョンに対して”一部故障中”と報告されています。Modページの詳細情報か互換情報をご確認ください。", ++ "you-have-warning-mods" : "　" ++ }, ++ "left-bar" : { ++ "export" : "書き出し", ++ "ficsit-app" : "ficsit.app (Mod 保管所)", ++ "game-version" : "ゲームのインストール方法の選択", ++ "help" : "ヘルプ", ++ "install-invalid" : "無効", ++ "install-invalid-tooltip" : "状況: このインストール方法ではSMMは管理できません", ++ "install-loading" : "ロード中…", ++ "install-loading-tooltip" : "状況: ロード中…", ++ "install-unknown" : "不明", ++ "install-unknown-tooltip" : "状況: このインストール方法についての情報が取得できませんでした", ++ "links" : "リンク", ++ "manage-servers" : "サーバー管理", ++ "mods-off" : "Mod オフ", ++ "mods-on" : "Mod オン", ++ "other" : "その他", ++ "profile" : "プロファイル", ++ "queue-blocking-switching-tooltip" : "{number, plural, other {現在{number}つの処理が待機中です。プロファイルを変更する又はインストール方法を変更する前に、適用するかキャンセルしてください。}}", ++ "satisfactory-modding-discord" : "Satisfactory Modding Discord", ++ "smm-github" : "SMM GitHub", ++ "updates" : "アップデート" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} 変更履歴" ++ }, ++ "mod-details" : { ++ "change-version" : "バージョンを変更", ++ "change-version-any" : "どれでも", ++ "change-version-or-newer" : "またはこれよりも最新", ++ "changelogs" : "変更履歴", ++ "compatibility" : "互換性", ++ "compatibility-branch" : "このModは{branch}ブランチで{state}と報告されています。", ++ "compatibility-unknown" : "不明", ++ "compatibility-unknown-tooltip" : "このModには互換情報が登録されていません。このModを試してから結果をDiscordにて報告して頂けると幸いです。", ++ "contributors" : "貢献者 <1>{authors}", ++ "created" : "作成日", ++ "downloads" : "全ダウンロード数", ++ "installed-version" : "インストール中のバージョン", ++ "latest-version" : "最新バージョン", ++ "mod-author" : "製作者:", ++ "offline-mode" : "現在オフラインモードです。変更履歴と詳細情報は利用できません。", ++ "size" : "容量", ++ "updated" : "最終更新日", ++ "view-on-ficsit-app" : "ficsit.app で閲覧する", ++ "views" : "閲覧数" ++ }, ++ "mod-list-item" : { ++ "by-author" : "製作者:", ++ "compatibility-note" : "このModは今のゲームバージョンに対して{state}と報告されています。", ++ "compatibility-note-none" : "(未指定)", ++ "compatibility-warning" : "このModは幾つかの問題を抱えているようですが、インストールすることはできます。詳細情報:", ++ "dependency" : "このModは他のModで必須とされています。単体でのインストールと削除はできません。", ++ "disable" : "このModはこのプロファイル内で有効化されています。ここを押して無効化します。無効化されたModはゲームに読み込まれませんがプロファイル内には残ります。", ++ "disable-queued" : "このModは無効化の適用待ちをしています。ここを押して無効化をキャンセルします。", ++ "disabled-tooltip" : "このModは無効化状態です。このポーズアイコンを押して有効化します。", ++ "enable" : "ここを押して有効化する", ++ "enable-queued" : "このModは有効化の適用待ちをしています。ここを押して有効化をキャンセルします。", ++ "favorite" : "ここを押してこのModをお気に入りに登録します。インストールに直接関係はありませんが、後にプロファイルを変更した際にこのModを探しやすくなります。", ++ "hidden" : "このModは製作者によって隠されています。", ++ "install" : "ここを押してこのModをインストールします。", ++ "no-tags" : "（タグなし）", ++ "not-installable" : "このModはインストールできません。理由:", ++ "queued" : "このModはまだ他の処理を待っています。", ++ "queued-install" : "このModはインストール待ちをしています。ここを押してキャンセルします。", ++ "queued-uninstall" : "このModはアンインストール待ちをしています。ここを押してキャンセルします。", ++ "unavailable" : "このModはもうficsit.app上で利用できません。削除することをお勧めします。", ++ "unfavorite" : "ここを押してお気に入りから外します。", ++ "uninstall" : "このModは現在のプロファイルにインストール済みです。ここを押してアンインストールします。", ++ "wait" : "処理が完了するまでお待ちください。" ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "（詳細情報無し）" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "全Mod", ++ "compatible" : "互換性有り", ++ "dependency" : "必須", ++ "disabled" : "無効化状態", ++ "enabled" : "有効化状態", ++ "favorite" : "お気に入り", ++ "installed" : "インストール済み", ++ "not-installed" : "未インストール", ++ "queued" : "キュー入り" ++ }, ++ "order-by" : { ++ "downloads" : "ダウンロード数", ++ "hotness" : "話題", ++ "last-updated" : "最終更新日", ++ "name" : "名前", ++ "popularity" : "人気", ++ "views" : "閲覧数" ++ }, ++ "search" : "Modを探す…" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "検索に該当するModがありませんでした", ++ "no-mods-found" : "該当Mod無し", ++ "show-all" : "全て表示する" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "プロファイル名", ++ "profile-name-placeholder" : "新しいプロファイル名", ++ "title" : "プロファイルの追加" ++ }, ++ "delete" : { ++ "profile-name" : "プロファイル名", ++ "title" : "プロファイルの削除" ++ }, ++ "import" : { ++ "profile-file" : "プロファイルのファイル", ++ "profile-name" : "プロファイル名", ++ "profile-name-placeholder" : "新しいプロファイル名", ++ "profile-version-warning" : "このプロファイルは新しいゲームバージョン用に作成されているようです。現在のゲームのバージョンと互換性が無い可能性があります。", ++ "title" : "プロファイルの取り込み" ++ }, ++ "rename" : { ++ "new-profile" : "新しいプロファイル名", ++ "new-profile-placeholder" : "新しいプロファイル", ++ "old-profile" : "前のプロファイル名", ++ "old-profile-placeholder" : "前のプロファイル", ++ "title" : "プロファイル名の変更" ++ } ++ }, ++ "server-manager" : { ++ "add" : "追加", ++ "advanced-note" : "ユーザー名とパスワードを入力する際に一部の文字前にエスケープ文字を入れる必要があります。", ++ "advanced-path-placeholder" : "ユーザー名:パスワード@ホストIP:ポート番号/パス", ++ "existing-servers" : { ++ "none-yet" : "サーバーが存在していません。下記を記入して追加してください。", ++ "title" : "サーバーの管理" ++ }, ++ "failed-to-connect" : "サーバーに接続できませんでした。ここを押して再試行します。", ++ "get-help" : "サーバーへの接続方法についてのヘルプを見る", ++ "host-placeholder" : "ホスト", ++ "invalid" : "このインストール方法はSMMでは管理できません", ++ "loading" : "ロード中…", ++ "local-path-placeholder" : "C:\\Path\\To\\Server", ++ "name-placeholder" : "サーバー名（デフォルト: {default}）", ++ "new-server" : { ++ "title" : "サーバーの新規追加" ++ }, ++ "password-placeholder" : "パスワード", ++ "path-placeholder" : "パス", ++ "port-placeholder" : "ポート番号（デフォルト: {default}）", ++ "switch-to-advanced" : "上級者モードに切り替える", ++ "switch-to-simple" : "シンプルモードに切り替える", ++ "title" : "専用サーバー", ++ "username-placeholder" : "ユーザー名", ++ "validating" : "検証中…" ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "ディレクトリのリスト化に失敗", ++ "failed-valid-check" : "指定されたパスが有効なサーバーかどうかの検証に失敗" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "キャッシュフォルダー", ++ "reset" : "デフォルトに戻す", ++ "save" : "保存して移動する", ++ "title" : "ダウンロード時の一時ファイルの保存場所を変更する" ++ }, ++ "change-cache-location" : "一時ファイル保存場所の変更", ++ "copy-mod-list" : "Modリストのコピー", ++ "debug" : "デバッグ", ++ "generate-debug-info" : "デバッグ情報を生成する", ++ "go-online-offline" : "{offline, select, true {オンライン} other {オフライン}}モードにする", ++ "language" : "言語", ++ "launch-button" : "起動ボタン", ++ "launch-button.button" : "ボタン", ++ "launch-button.cat" : "ニャン", ++ "launch-button.normal" : "通常", ++ "proxy" : { ++ "proxy" : "プロキシ", ++ "remove" : "プロキシを削除する", ++ "save" : "保存して再スタート", ++ "title" : "プロキシを設定する" ++ }, ++ "queue" : "キュー", ++ "queue.start-immediately" : "すぐに適用", ++ "queue.start-manually" : "手動で適用", ++ "save-window-position" : "ウィンドウ位置を記憶する", ++ "secret-settings" : "隠し設定", ++ "set-proxy" : "プロキシを設定する", ++ "settings" : "設定", ++ "smm-debug-logging" : "SMMのデバッグをログに書き込む", ++ "start-view" : "ウィンドウの大きさ", ++ "start-view.compact" : "コンパクト", ++ "start-view.expanded" : "拡大", ++ "title" : "Modマネージャー設定", ++ "update-check" : "アップデートの確認", ++ "update-check.ask" : "発見時に確認を取る", ++ "update-check.on-exit" : "終了時", ++ "update-check.on-start" : "起動時" ++ }, ++ "smm-update" : { ++ "downloading" : "バックグラウンドでダウンロード中", ++ "downloading-stats" : "アップデートをダウンロード中: {current} / {total}, {speed}/秒, 残り時間: {eta}", ++ "title" : "SMMのアップデートが利用可能 - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "パフォーマンスの向上", ++ "performance.description" : "もっと効率良く働けるようになりました！", ++ "platform_support" : "Linux Heroic, Steam Snap, Mac のサポート", ++ "platform_support.description" : "Githubにてダウンロード可能です。まだの際は是非！", ++ "profile_format" : "新しいプロファイルの書式", ++ "profile_format.description" : "SMM2のプロファイルはSMM3では使えません！現在残っている過去のプロファイルは自動的に更新されますが、SMM2からのプロファイルは取り込むことはできません。", ++ "queue" : "処理のキュー", ++ "queue.description" : "一斉にModのダウンロードとアンインストール等ができるようになりました。", ++ "servers" : "専用サーバーの管理", ++ "servers.description" : "ファイルシステム（SFTP, FTP, SMB）を通して簡単にサーバーの管理ができるように！", ++ "translation" : "翻訳のサポート", ++ "translation.description" : "我々のDiscordに入ってSMMをあなたの言語に翻訳しましょう！", ++ "ui" : "UIの抜本的改善", ++ "ui.description" : "新しいUIでSatisfactory1.0をお祝いします！" ++ }, ++ "intro" : "SMM3では我々は沢山の改善を致しました。その幾つかをご紹介します:", ++ "open_guide" : "SMM3のドキュメントを開く", ++ "title" : "Satisfactory Mod マネージャー バージョン 3へようこそ！" ++ }, ++ "updates" : { ++ "changelog" : "変更履歴", ++ "check-for-updates" : "アップデートの確認", ++ "checking-for-updates" : "アップデートの確認中…", ++ "hide-ignored" : "無視したModを隠す", ++ "ignore" : "無視する", ++ "mod-update-available" : "{updates, plural, other {{updates}つのModのアップデートが利用可能}}", ++ "no-updates" : "現在、アップデートはありません", ++ "show-ignored" : "無視したModを表示する", ++ "smm-update-available" : "SMMのアップデートが利用可能", ++ "title" : "アップデート", ++ "unignore" : "無視しない", ++ "update-all" : "全てをアップデート", ++ "update-selected" : "選択したModをアップデート" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/ko.json b/frontend/src/lib/generated/i18n/ko.json +new file mode 100644 +index 0000000..2b1b7bd +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/ko.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "오프라인으로 변경", ++ "go-online" : "온라인으로 변경", ++ "healthcheck" : "ficsit.app에 연결할 수 없습니다. 인터넷 연결을 확인하거나 오프라인 모드 사용을 고려해 주십시오. (모드 관리자 설정 > 오프라인으로 변경)", ++ "offline" : "현재 오프라인 상태입니다. 일부 기능이 제한될 수 있습니다. (모드 관리자 설정 > 온라인으로 변경을 통해 재연결)" ++ }, ++ "common" : { ++ "add" : "추가", ++ "cancel" : "취소", ++ "close" : "닫기", ++ "delete" : "삭제", ++ "import" : "불러오기", ++ "loading" : "불러오는 중...", ++ "rename" : "이름 변경" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "디버그 파일 생성 중 오류가 발생했습니다. 추가 정보 확인을 위해 Satisfactory 모드 관리자 로그 파일을 수동으로 확인 후 디스코드에 보고해 주십시오. 아래 버튼을 눌러 지침서를 엽니다.", ++ "generate_debug_info" : "디버그 정보 생성", ++ "help" : "잘못된 정보가 있습니까? 아래 버튼을 눌러 생성된 압축 파일을 <1>모딩 디스코드의 #help-using-mods 채널에 보내주십시오.", ++ "invalid_installs" : "{invalidInstalls, plural, other {설치된 Satisfactory {invalidInstalls}개가 유효하지 않음}}", ++ "no_installs" : "Satisfactory가 설치되지 않음", ++ "open_log_docs" : "기록 문서 열기", ++ "open_modding_discord" : "모딩 디스코드 열기", ++ "open_modding_discord.must_generate_debug_first" : "디버그 정보를 먼저 생성해야 합니다", ++ "reporting_directions" : "잘못된 정보가 있습니까? 아래 버튼을 눌러 로그를 수집 후 생성된 압축 파일을 모딩 디스코드의 #help-using-mods 채널에 보내주십시오.", ++ "title" : "문제 발생" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "이미 설치됨", ++ "error-loading" : "모드 세부정보를 불러오던 중 오류 발생", ++ "in-queue" : "대기 중", ++ "install" : "설치", ++ "latest-version" : "최신 버전", ++ "title" : "모드 설치", ++ "version" : "버전 {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "시작하기!", ++ "change_later_hint" : "이러한 설정들은 \"모드 관리자 설정\" 메뉴에서 언제든지 변경할 수 있습니다.", ++ "intro" : "기본 설정을 선택하여 시작합니다.", ++ "open_welcome_guide" : "환영 지침서 열기", ++ "option" : { ++ "language" : { ++ "title" : "가능한 경우 다음 언어 사용:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "\"적용\"을 누를 때까지 기다리기", ++ "enabled" : "변경 사항 즉시 적용", ++ "title" : "모드를 제거 또는 추가하거나 프로필을 변경할 때..." ++ } ++ }, ++ "title" : "Satisfactory 모드 관리자에 오신 것을 환영합니다!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "{profile} 적용", ++ "apply-queued" : "변경사항 {queued}개 적용", ++ "are-you-sure-warning" : "정말 실행하시겠습니까?", ++ "cant-launch" : "이 설치에서는 SMM를 구동할 수 없음", ++ "cant-launch-tooltip" : "모드 관리자가 이 설치 유형을 실행할 순 없지만 여전히 관리하고 있습니다. 평소 사용하는 게임 런처를 사용해 Satisfactory를 실행하십시오.", ++ "changes-queued" : "모드 파일이 아직 변경되지 않았습니다. 버튼을 클릭하여 대기 중인 변경 사항을 적용하십시오.\n\n(현재 대기열 \"수동 시작\" 모드에 있음)", ++ "game-running" : "게임 런처가 이미 게임을 실행 또는 종료 중입니다.", ++ "incompatible-mods" : "{versionIncompatible, plural, other {불러올 수 없거나 게임을 충돌시키는 호환되지 않는 모드 {versionIncompatible}개}}", ++ "launch-in-progress" : "실행 중...", ++ "operation-in-progress" : "작업이 이미 실행 중입니다.", ++ "play" : "Satisfactory 실행", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, other {게임과의 비호환이 의심되는 모드 #개}}", ++ "profile-change-queued" : "모드 파일이 아직 변경되지 않았습니다. 버튼을 클릭하여 대기 중인 변경 사항을 적용하십시오.\n\n(현재 대기열 \"수동 시작\" 모드에 있음)", ++ "ready" : "발사 준비 완료!\n\n참고: 모드 관리자가 이미 모드 파일 설치를 마쳤습니다. 일반적인 게임 실행기를 사용하여 실행해도 모드는 계속 불러와질 것입니다.", ++ "reported-incompatible-mods" : "현재 게임 버전에서 {reportedIncompatible}개의 모드가 작동하지 않는다고 확인됐습니다. 자세한 내용은 모드의 설명이나 호환성 정보를 확인해 주십시오", ++ "reported-possibly-compatible-mods" : "현재 게임 버전에서 {reportedIncompatible}개의 모드가 손상됐다고 확인됐습니다. 자세한 내용은 모드의 설명이나 호환성 정보를 확인해 주십시오", ++ "you-have-warning-mods" : "소유 중:" ++ }, ++ "left-bar" : { ++ "export" : "내보내기", ++ "ficsit-app" : "ficsit.app (모드 저장소)", ++ "game-version" : "게임 버전", ++ "help" : "도움말", ++ "install-invalid" : "잘못됨", ++ "install-invalid-tooltip" : "상태: SMM가 해당 설치를 관리할 수 없음", ++ "install-loading" : "불러오는 중...", ++ "install-loading-tooltip" : "상태: 불러오는 중...", ++ "install-unknown" : "알 수 없음", ++ "install-unknown-tooltip" : "상태: 해당 설치에 대한 정보를 얻을 수 없음", ++ "links" : "링크", ++ "manage-servers" : "서버 관리", ++ "mods-off" : "모드 비활성화", ++ "mods-on" : "모드 활성화", ++ "other" : "그 외", ++ "profile" : "프로필", ++ "queue-blocking-switching-tooltip" : "{number, plural, other {{number}개의 변경 사항이 있습니다. 설치 또는 프로필을 변경하기 전에 변경 사항을 처리해 주십시오.}}", ++ "satisfactory-modding-discord" : "Satisfactory 모딩 디스코드", ++ "smm-github" : "SMM 깃허브", ++ "updates" : "업데이트" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} 변경사항" ++ }, ++ "mod-details" : { ++ "change-version" : "버전 변경", ++ "change-version-any" : "모두", ++ "change-version-or-newer" : "이상", ++ "changelogs" : "변경사항", ++ "compatibility" : "호환성", ++ "compatibility-branch" : "이 모드는 {branch} 버전에서 {state} 상태로 확인되었습니다.", ++ "compatibility-unknown" : "알 수 없음", ++ "compatibility-unknown-tooltip" : "아직 이 모드에 대한 호환성 보고가 없습니다. 시도 후 디스코드를 통해 연락해 업데이트할 수 있게 기여해 주십시오!", ++ "contributors" : "기여자 <1>({authors})", ++ "created" : "생성일", ++ "downloads" : "총 다운로드", ++ "installed-version" : "설치된 버전", ++ "latest-version" : "최신 버전", ++ "mod-author" : "모드 제작:", ++ "offline-mode" : "오프라인 모드가 활성화 되었습니다. 변경사항과 설명에 접근할 수 없습니다.", ++ "size" : "크기", ++ "updated" : "업데이트됨", ++ "view-on-ficsit-app" : "ficsit.app에서 보기", ++ "views" : "조회수" ++ }, ++ "mod-list-item" : { ++ "by-author" : "by", ++ "compatibility-note" : "이 모드는 현재 게임 버전에서 {state} 상태로 확인되었습니다.", ++ "compatibility-note-none" : "(제공된 추가 참고 없음)", ++ "compatibility-warning" : "모드에 문제가 보고되었지만 설치할 순 있습니다. 세부정보:", ++ "dependency" : "이 모드는 다른 모드의 의존성으로 설치되어 있습니다. 독립적으로 설치되거나 제거될 수 없습니다.", ++ "disable" : "이 모드는 현재 프로필에서 활성화되어 있습니다. 클릭하여 비활성화하면 게임을 시작할 때 불러와지지 않지만 프로필에는 유지할 수 있습니다.", ++ "disable-queued" : "이 모드는 비활성화 대기열에 있습니다. 클릭하여 작업을 취소합니다.", ++ "disabled-tooltip" : "이 모드는 비활성화 되었습니다. 일시정지 아이콘을 눌러 활성화합니다.", ++ "enable" : "클릭하여 모드를 활성화합니다.", ++ "enable-queued" : "이 모드는 활성화 대기열에 있습니다. 클릭하여 작업을 취소합니다.", ++ "favorite" : "클릭하여 모드를 즐겨찾기에 추가합니다. 이 기능은 모드에 직접적으로 영향을 주지 않습니다", ++ "hidden" : "이 모드는 소유자에 의해 숨겨졌습니다.", ++ "install" : "클릭하여 모드를 설치합니다.", ++ "no-tags" : "(항목 없음)", ++ "not-installable" : "다음 이유로 모드를 설치할 수 없음:", ++ "queued" : "이 모드는 이미 대기열에 있습니다.", ++ "queued-install" : "이 모드는 설치 대기열에 있습니다. 클릭하여 작업을 취소합니다.", ++ "queued-uninstall" : "이 모드는 삭제 대기열에 있습니다. 클릭하여 작업을 취소합니다.", ++ "unavailable" : "이 모드는 더 이상 ficsit.app에서 사용할 수 없습니다. 원한다면 제거할 수 있습니다.", ++ "unfavorite" : "클릭하여 모드를 즐겨찾기에서 제거합니다.", ++ "uninstall" : "이 모드는 현재 프로필에 설치되어 있습니다. 클릭하여 모드를 제거합니다.", ++ "wait" : "현재 작업이 완료될 때까지 기다려 주십시오." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(추가 참고 사항 없음)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "모든 모드", ++ "compatible" : "호환됨", ++ "dependency" : "의존성", ++ "disabled" : "비활성화됨", ++ "enabled" : "활성화됨", ++ "favorite" : "즐겨찾기", ++ "installed" : "설치됨", ++ "not-installed" : "미설치됨", ++ "queued" : "예약됨" ++ }, ++ "order-by" : { ++ "downloads" : "다운로드 수", ++ "hotness" : "인기", ++ "last-updated" : "최근 업데이트", ++ "name" : "이름", ++ "popularity" : "인기도", ++ "views" : "조회수" ++ }, ++ "search" : "모드 검색" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "필터 결과에 맞는 모드 없음", ++ "no-mods-found" : "모드 없음", ++ "show-all" : "전부 보기" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "프로필 이름", ++ "profile-name-placeholder" : "새 프로필 이름", ++ "title" : "프로필 추가" ++ }, ++ "delete" : { ++ "profile-name" : "프로필 이름", ++ "title" : "프로필 삭제" ++ }, ++ "import" : { ++ "profile-file" : "프로필 파일", ++ "profile-name" : "프로필 이름", ++ "profile-name-placeholder" : "새 프로필 이름", ++ "profile-version-warning" : "이 프로필은 상위 버전의 게임에서 생성되었습니다. 현재 버전에서 호환되지 않을 수 있습니다.", ++ "title" : "프로필 불러오기" ++ }, ++ "rename" : { ++ "new-profile" : "새 프로필 이름", ++ "new-profile-placeholder" : "새 프로필", ++ "old-profile" : "이전 프로필 이름", ++ "old-profile-placeholder" : "이전 프로필", ++ "title" : "프로필 이름 바꾸기" ++ } ++ }, ++ "server-manager" : { ++ "add" : "추가", ++ "advanced-note" : "참고: 사용자 이름과 비밀번호에는 특정 문자를 사용할 수 없습니다", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : "아무 서버나 하나 추가해 보는 건 어떻습니까?", ++ "title" : "추가한 서버 관리" ++ }, ++ "failed-to-connect" : "서버와 연결할 수 없습니다. 클릭하여 재시도합니다", ++ "get-help" : "서버 연결 도움 받기", ++ "host-placeholder" : "호스트", ++ "invalid" : "SMM이 해당 설치를 관리할 수 없음", ++ "loading" : "불러오는 중...", ++ "local-path-placeholder" : "C:", ++ "name-placeholder" : "이름 (기본: {default})", ++ "new-server" : { ++ "title" : "새 서버 추가" ++ }, ++ "password-placeholder" : "비밀번호", ++ "path-placeholder" : "경로", ++ "port-placeholder" : "포트 (기본: {default})", ++ "switch-to-advanced" : "고급 모드로 변경", ++ "switch-to-simple" : "간단 모드로 변경", ++ "title" : "전용 서버", ++ "username-placeholder" : "사용자 이름", ++ "validating" : "유효성 확인 중..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "경로를 나열할 수 없음", ++ "failed-valid-check" : "선택된 경로가 유효한 서버인지 확인할 수 없음" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "캐시 위치", ++ "reset" : "기본으로 재설정", ++ "save" : "저장 후 이동", ++ "title" : "다운로드 캐시 위치 변경" ++ }, ++ "change-cache-location" : "캐시 위치 변경", ++ "copy-mod-list" : "모드 목록 복사", ++ "debug" : "디버그", ++ "generate-debug-info" : "디버그 정보 생성", ++ "go-online-offline" : "{offline, select, true {온} other {오프}}라인으로 전환", ++ "language" : "언어", ++ "launch-button" : "실행 버튼", ++ "launch-button.button" : "버튼", ++ "launch-button.cat" : "냥", ++ "launch-button.normal" : "일반", ++ "proxy" : { ++ "proxy" : "프록시", ++ "remove" : "프록시 제거", ++ "save" : "저장 후 재시작", ++ "title" : "프록시 설정" ++ }, ++ "queue" : "대기열", ++ "queue.start-immediately" : "즉시 시작", ++ "queue.start-manually" : "수동 시작", ++ "save-window-position" : "창 위치 기억", ++ "secret-settings" : "비밀 설정", ++ "set-proxy" : "프록시 설정", ++ "settings" : "설정", ++ "smm-debug-logging" : "SMM 디버그 기록", ++ "start-view" : "시작 보기", ++ "start-view.compact" : "요약", ++ "start-view.expanded" : "확장", ++ "title" : "모드 관리자 설정", ++ "update-check" : "업데이트 확인", ++ "update-check.ask" : "찾으면 알림", ++ "update-check.on-exit" : "종료할 때", ++ "update-check.on-start" : "시작할 때" ++ }, ++ "smm-update" : { ++ "downloading" : "백그라운드에서 다운로드 중", ++ "downloading-stats" : "업데이트 다운로드 중: {current} / {total}, {speed}/초, {eta} 남음", ++ "title" : "SMM 업데이트 사용 가능 - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "개선된 성능", ++ "performance.description" : "항상 효율적으로 지내십시오!", ++ "platform_support" : "기본 Linux Heroic, Steam Snap, Mac 지원됨", ++ "platform_support.description" : "아직 받지 않았다면 깃허브에서 빌드를 받으십시오!", ++ "profile_format" : "새 프로필 형식", ++ "profile_format.description" : "SMM2 프로필은 SMM3과 호환되지 않습니다! 이미 존재하는 프로필은 자동으로 마이그레이션 되지만 SMM2에서 생성된 프로필을 불러올 순 없습니다.", ++ "queue" : "지시 추가 중", ++ "queue.description" : "한 번에 여러 모드의 다운로드/제거를 예약하십시오.", ++ "servers" : "전용 서버 관리", ++ "servers.description" : "filesystem, SFTP, FTP, SMB를 사용하여 서버를 쉽게 관리하십시오!", ++ "translation" : "번역 지원", ++ "translation.description" : "디스코드에 참여하여 SMM를 자신의 언어로 번역하십시오!", ++ "ui" : "사용자 인터페이스 새로고침", ++ "ui.description" : "Satisfactory 1.0을 기념하기 위한 새로운 페인트 코팅!" ++ }, ++ "intro" : "이 버전에서 많은 것을 개선했습니다. 주목할 만한 요소는:", ++ "open_guide" : "SMM3 문서 열기", ++ "title" : "Satisfactory 모드 관리자 버전 3에 오신 것을 환영합니다!" ++ }, ++ "updates" : { ++ "changelog" : "변경사항", ++ "check-for-updates" : "업데이트 확인", ++ "checking-for-updates" : "업데이트 확인 중...", ++ "hide-ignored" : "무시 항목 숨기기", ++ "ignore" : "무시", ++ "mod-update-available" : "{updates, plural, other {모드 업데이트 {updates}개 사용 가능}}", ++ "no-updates" : "모드/SMM 업데이트 없음", ++ "show-ignored" : "무시 항목 보이기", ++ "smm-update-available" : "SMM 업데이트 사용 가능", ++ "title" : "업데이트", ++ "unignore" : "무시 해제", ++ "update-all" : "전부 업데이트", ++ "update-selected" : "선택 항목 업데이트" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/lt.json b/frontend/src/lib/generated/i18n/lt.json +new file mode 100644 +index 0000000..58f9854 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/lt.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Atsijunkite", ++ "go-online" : "Prisijunkite", ++ "healthcheck" : "Nepavyko pasiekti ficsit.app. Patikrinkite interneto ryšį arba apsvarstykite galimybę naudoti neprisijungus režimą. (Modų Tvarkyklės Nustatymai > Atsijungti)", ++ "offline" : "Šiuo metu esate neprisijungę. Kai kurios funkcijos gali būti nepasiekiamos. (Kad prisijungti, naudokite Modų Tvarkyklės Nustatymai > Prisijungti)" ++ }, ++ "common" : { ++ "add" : "Pridėti", ++ "cancel" : "Atšaukti", ++ "close" : "Uždaryti", ++ "delete" : "Ištrinti", ++ "import" : "Importuoti", ++ "loading" : "Kraunama...", ++ "rename" : "Pervadinti" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Įvyko klaida generuojant derinimo failą. Prašome rankiniu būdu patikrinti savo Satisfactory Modų Tvarkyklės žurnalo failus, kad gautumėte daugiau informacijos, ir pranešti apie tai Discordo platformoje. Naudokite žemiau esantį mygtuką, kad atidarytumėte dokumentaciją ir sužinotumėte, kaip tai padaryti.", ++ "generate_debug_info" : "Generuokite derinimo informaciją", ++ "help" : "Atrodo neteisinga? Spustelėkite žemiau esantį mygtuką ir nusiųskite sugeneruotą ZIP failą <1>modifikacijų Discorde, skyriuje #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} rastas netinkamas Satisfactory įdiegimas} few {{invalidInstalls} rasta keletas netinkamų „Satisfactory“ įdiegimų} many {{invalidInstalls} rasta daug netinkamų „Satisfactory“ įdiegimų} other {{invalidInstalls} rastas kitas netinkamas „Satisfactory“ įdiegimas}}", ++ "no_installs" : "Nerasta jokiu Satisfactory įdiegimų", ++ "open_log_docs" : "Atidaryti Žurnalo Dokumentaciją", ++ "open_modding_discord" : "Atidaryti Modifikacijų Discordą", ++ "open_modding_discord.must_generate_debug_first" : "Pirmiausia turite sugeneruoti derinimo informaciją", ++ "reporting_directions" : "Kažkas ne taip? Spustelėkite mygtuką žemiau, kad surinktumėte žurnalus, tuomet nusiųskite sugeneruotą zip failą į modifikacijų Discordo kanalą #help-using-mods.", ++ "title" : "Kažkas nepavyko" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Jau įdiegtas", ++ "error-loading" : "Klaida įkeliant modo informaciją", ++ "in-queue" : "Eilėje", ++ "install" : "Įdiegti", ++ "latest-version" : "Naujausia versija", ++ "title" : "Įdiegti modą", ++ "version" : "Versija {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Pradėti!", ++ "change_later_hint" : "Šiuos nustatymus bet kada galite pakeisti meniu „Modų tvarkyklės nustatymai“.", ++ "intro" : "Pasirinkite šias nuostatas kad pradėtumėte.", ++ "open_welcome_guide" : "Atidarykite Pasveikinimo vadovą", ++ "option" : { ++ "language" : { ++ "title" : "Jei įmanoma, naudoti šią kalbą:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Palaukti, kol paspausiu „Taikyti“", ++ "enabled" : "Priimti pakeitimus iškarto", ++ "title" : "Kai pridedu arba pašalinu modą ar pakeičiu profilius..." ++ } ++ }, ++ "title" : "Sveiki atvykę į Satisfactory modifikacijų tvarkyklę!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "taikyti {profile}", ++ "apply-queued" : "Taikyti {queued, plural, one {vieną pakeitimą} other {# pakeitimus}}", ++ "are-you-sure-warning" : "Ar tikrai norite paleisti?", ++ "cant-launch" : "SMM negali paleisti šios instaliacijos", ++ "cant-launch-tooltip" : "Modų tvarkyklė negali paleisti šio instaliacijos tipo, tačiau ji vis tiek tvarkys modų failus už jus. Paleiskite Satisfactory naudodami savo įprastą žaidimo paleidiklį.", ++ "changes-queued" : "Pakeitimai dar nebuvo atlikti jūsų modų failuose. Spustelėkite žemiau esantį mygtuką, kad pritaikytumėte laukiančius pakeitimus.\n\n(Jūs esate „Pradėti rankiniu būdu“ režime)", ++ "game-running" : "Jūsų žaidimo paleidiklis praneša, kad žaidimas jau veikia (vis dar yra uždarymo procese).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} vienas nesuderinamas modas, kuris nebus įkeltas arba sugadins mūsų žaidimą} other {{versionIncompatible} nesuderinami modai, kurie nebus įkelti arba sugadins mūsų žaidimą}}", ++ "launch-in-progress" : "Paleidimas vyksta...", ++ "operation-in-progress" : "Veikla jau vyksta.", ++ "play" : "Žaisti Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Vienas modas, kuris {versionPossiblyCompatible, plural, one {yra} other {yra}} greičiausiai nesuderinamas su jūsų žaidimu} other {# modai, kurie {versionPossiblyCompatible, plural, one {yra} other {yra}} greičiausiai nesuderinami su jūsų žaidimu.}}", ++ "profile-change-queued" : "Pakeitimai dar nebuvo atlikti jūsų modų failuose. Spustelėkite žemiau esantį mygtuką, kad pritaikytumėte naują profilį.\n\n(Jūs esate „Pradėti rankiniu būdu“ režime)", ++ "ready" : "Jūs esate pasiruošę veiksmui!\n\n\"Pastaba: Modų tvarkyklė jau baigė diegti modų failus už jus. Galite paleisti žaidimą naudodami savo įprastą žaidimo paleidiklį, o modai vis tiek bus įkelti.\"", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Vienas modas praneštas} other {# modai pranešti}} kaip neveikiantys šioje žaidimo versijoje. Perskaitykite {versionIncompatible, plural, one {modo} other {modų}} aprašymą arba suderinamumo pastabas, kad sužinotumėte daugiau informacijos.", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Vienas modas praneštas} other {# modai pranešti}} kaip pažeisti šioje žaidimo versijoje. Perskaitykite {versionIncompatible, plural, one {modo} other {modų}} aprašymą arba suderinamumo pastabas, kad sužinotumėte daugiau informacijos.", ++ "you-have-warning-mods" : "Jus turite:" ++ }, ++ "left-bar" : { ++ "export" : "Eksportuoti", ++ "ficsit-app" : "ficsit.app (Modų saugykla)", ++ "game-version" : "Pasirinkite Žaidimo Įdiegimą", ++ "help" : "Pagalba", ++ "install-invalid" : "Netinkamas", ++ "install-invalid-tooltip" : "Būsena: SMM negali valdyti šios diegimo versijos", ++ "install-loading" : "Kraunama...", ++ "install-loading-tooltip" : "Statusas: Kraunama...", ++ "install-unknown" : "Nežinoma", ++ "install-unknown-tooltip" : "Būsena: Nepavyko gauti informacijos apie šią diegimo versiją", ++ "links" : "Nuorados", ++ "manage-servers" : "Tvarkyti Serverius", ++ "mods-off" : "Modai išjungti", ++ "mods-on" : "Modai įjungti", ++ "other" : "Kitka", ++ "profile" : "Profilis", ++ "queue-blocking-switching-tooltip" : null, ++ "satisfactory-modding-discord" : "Satisfactory Modifikacijų Discordas", ++ "smm-github" : "SMM GitHubas", ++ "updates" : "Atnaujinimai" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod}Pakeitimų žurnalas" ++ }, ++ "mod-details" : { ++ "change-version" : "Pakeisti versija", ++ "change-version-any" : "Betkuris", ++ "change-version-or-newer" : "arba naujesnė", ++ "changelogs" : "Pakeitimų žurnalai", ++ "compatibility" : "Suderinamumas", ++ "compatibility-branch" : "Šis modas buvo praneštas kaip {state} ant {branch}.", ++ "compatibility-unknown" : "Nežinoma", ++ "compatibility-unknown-tooltip" : "Dar nėra pateikta suderinamumo informacijos apie šį modą. Išbandykite jį ir susisiekite su mumis Discord platformoje, kad galėtume ją atnaujinti!", ++ "contributors" : "Prisidėjėliai <1>{authors}", ++ "created" : "Sukurta", ++ "downloads" : "Bendrai atsisiūsta", ++ "installed-version" : "Įdiegta versija", ++ "latest-version" : "Naujausia versija", ++ "mod-author" : "Modas nuo:", ++ "offline-mode" : null, ++ "size" : "Dydis", ++ "updated" : "Atnaujinta", ++ "view-on-ficsit-app" : "Peržiūrėti ficsit.app", ++ "views" : "Peržiūros" ++ }, ++ "mod-list-item" : { ++ "by-author" : "nuo", ++ "compatibility-note" : "Šis modas buvo praneštas kaip {state} ant šios žaidimo versijos.", ++ "compatibility-note-none" : "(Nenurodyta)", ++ "compatibility-warning" : "Su šiuo modu pranešta problemų, tačiau galite pabandyti jį įdiegti vis tiek. Detalės:", ++ "dependency" : "Šis modas yra įdiegtas kaip kito modo priklausomybė. Jo negalima įdiegti ar pašalinti atskirai.", ++ "disable" : "Šis modas yra įjungtas šiame profilyje. Spustelėkite, kad jį išjungtumėte, kas neleis jam įsikrauti, kai paleidžiate žaidimą, tačiau jis vis tiek liks šio profilio dalimi.", ++ "disable-queued" : null, ++ "disabled-tooltip" : null, ++ "enable" : "Spustelėkite, kad įjungtumėte šį modą.", ++ "enable-queued" : null, ++ "favorite" : "Spustelėkite, kad pridėtumėte šį modą prie mėgstamiausių. Mėgstamo modo pasirinkimas nėra susijęs su tuo, ar jis įdiegtas, ar ne - tai būdas sekti modą vėliau, nepriklausomai nuo pasirinkto profilio.", ++ "hidden" : null, ++ "install" : "Spustelėkite, kad įdiegtumėte šį modą.", ++ "no-tags" : "(Nėra jokių žymų)", ++ "not-installable" : "Jūs negalite įdiegti šio modo dėl šios priežasties:", ++ "queued" : null, ++ "queued-install" : null, ++ "queued-uninstall" : null, ++ "unavailable" : "Šis modas nebegalimas ficsit.app svetainėje. Galbūt norėsite jį pašalinti.", ++ "unfavorite" : null, ++ "uninstall" : "Šis modas yra įdiegtas šiame profilyje. Spustelėkite, kad pašalintumėte šį modą.", ++ "wait" : null ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Daugiau pastabų nepateikta)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Visi modai", ++ "compatible" : "Suderinta", ++ "dependency" : "Priklausomi", ++ "disabled" : "Išjungta", ++ "enabled" : "Įjungta", ++ "favorite" : "Mėgstamiausia", ++ "installed" : "Įdiegta", ++ "not-installed" : "Neįdiegta", ++ "queued" : "Eilėje" ++ }, ++ "order-by" : { ++ "downloads" : "Parsisiųsti", ++ "hotness" : "Karščiausi", ++ "last-updated" : "Paskutinį kartą atnaujinta", ++ "name" : "Pavadinimas", ++ "popularity" : "Populiarumas", ++ "views" : "Peržiūros" ++ }, ++ "search" : "Ieškoti modų" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : null, ++ "no-mods-found" : "Nerasta jokių modų", ++ "show-all" : "Rodyti visus" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Profilio vardas", ++ "profile-name-placeholder" : "Naujo Profilio Vardas", ++ "title" : "Pridėti profilį" ++ }, ++ "delete" : { ++ "profile-name" : "Profilio vardas", ++ "title" : "Ištrinti profilį" ++ }, ++ "import" : { ++ "profile-file" : "Profilio failas", ++ "profile-name" : "Profilio vardas", ++ "profile-name-placeholder" : "Naujo Profilio Vardas", ++ "profile-version-warning" : "Šis profilis buvo sukurtas naudojant naujesnę žaidimo versiją. Jis gali būti nesuderinamas su šia versija", ++ "title" : "Importuoti profilį" ++ }, ++ "rename" : { ++ "new-profile" : "Naujo Profilio Vardas", ++ "new-profile-placeholder" : "Naujas profilis", ++ "old-profile" : "Seno profilio vardas", ++ "old-profile-placeholder" : "Senas profilis", ++ "title" : "Pervadinti profilį" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Pridėti", ++ "advanced-note" : "Atkreipkite dėmesį, kad naudotojo varde ir slaptažodyje gali reikėti vengti tam tikrų simbolių", ++ "advanced-path-placeholder" : "vartotojas:slaptazodis@savininkas:prievadas/vieta", ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : "Nepavyko prisijungti prie serverio, spustelėkite, kad bandytumėte dar kartą", ++ "get-help" : null, ++ "host-placeholder" : "Savininkas", ++ "invalid" : null, ++ "loading" : "Kraunama...", ++ "local-path-placeholder" : null, ++ "name-placeholder" : null, ++ "new-server" : { ++ "title" : "Pridėti Naują Serverį" ++ }, ++ "password-placeholder" : "slaptažodis", ++ "path-placeholder" : "vietovė", ++ "port-placeholder" : "prievadas (numatytasis: {default})", ++ "switch-to-advanced" : "Pereiti prie išplėstinio režimo", ++ "switch-to-simple" : "Pereiti prie paprasto režimo", ++ "title" : "Dedikuotas serveris", ++ "username-placeholder" : "Vartotojo vardas", ++ "validating" : "Validuojama..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Nepavyko išvardyti katalogo", ++ "failed-valid-check" : null ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Talpyklos vietą", ++ "reset" : "Atstatyti į numatytąsias reikšmes", ++ "save" : "Išsaugoti ir perkelti", ++ "title" : "Keisti atsisiuntimo talpyklos vietą" ++ }, ++ "change-cache-location" : "Keisti talpyklos vietą", ++ "copy-mod-list" : "Kopijuoti modų sarašą", ++ "debug" : "Derinimas", ++ "generate-debug-info" : "Generuokite derinimo informaciją", ++ "go-online-offline" : "Eiti {offline, select, true {prisijungus} other {neprisijungus}}", ++ "language" : "Kalba", ++ "launch-button" : "Paleidimo mygtukas", ++ "launch-button.button" : "Mygtukas", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normalus", ++ "proxy" : { ++ "proxy" : "Tarpinis serveris", ++ "remove" : "Pašalinti tarpinį serverį", ++ "save" : "Išsaugoti ir perkrauti", ++ "title" : "Nustatyti tarpinį serverį" ++ }, ++ "queue" : "Eilė", ++ "queue.start-immediately" : "Pradėti nedelsiant", ++ "queue.start-manually" : "Pradėti rankiniu būdu", ++ "save-window-position" : "Išsaugoti lango padėtį", ++ "secret-settings" : "Slapti nustatymai", ++ "set-proxy" : "Nustatyti tarpinį serverį", ++ "settings" : "Nustatymai", ++ "smm-debug-logging" : "SMM derinimo įrašinėjimas", ++ "start-view" : "Pradėti peržiūrą", ++ "start-view.compact" : "Kompaktiškas", ++ "start-view.expanded" : "Išplėstas", ++ "title" : "Modų Tvarkyklės Nustatymai", ++ "update-check" : "Atnaujinimo patikrinimas", ++ "update-check.ask" : "Paklausti, kai randama", ++ "update-check.on-exit" : "Išeinant", ++ "update-check.on-start" : "Pradžioje" ++ }, ++ "smm-update" : { ++ "downloading" : "Atsisiunčiama fone", ++ "downloading-stats" : "Atsisiunčiama naujinys: {current} / {total}, {speed}/s, liko {eta}", ++ "title" : "SMM atnaujinimas prieinamas - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Patobulintas našumas", ++ "performance.description" : "Užtikrina jūsų efektyvumą!", ++ "platform_support" : "Gimtoji Linux Heroic, Steam Snap, Mac palaikymas", ++ "platform_support.description" : "Gaukite versiją iš GitHubo išleidimų, jei dar to nepadarėte!", ++ "profile_format" : "Naujas profilio formatas", ++ "profile_format.description" : "SMM2 profiliai nėra suderinami su SMM3! Esami profiliai buvo automatiškai perkelti, tačiau negalite importuoti profilių, sukurtų su SMM2.", ++ "queue" : "Veiksmo eilės sudarymas", ++ "queue.description" : "Vienu metu sudėkite į eilę kelis modų atsisiuntimus/pašalinimus.", ++ "servers" : "Dedikuoto serverio valdymas", ++ "servers.description" : "Lengvai valdykite serverius per failų sistemą, SFTP, FTP ir SMB!", ++ "translation" : "Vertimo pagalba", ++ "translation.description" : "Prisijunkite prie mūsų Discordo, kad išverstumėte SMM į savo kalbą!", ++ "ui" : "Naudotojo sąsajos atnaujinimas", ++ "ui.description" : "Naujas apdailos sluoksnis, skirtas Satisfactory 1.0 šventei!" ++ }, ++ "intro" : "Šioje versijoje padarėme daug patobulinimų. Štai keletas svarbiausių akcentų:", ++ "open_guide" : "Atidaryti SMM3 Documentaciją", ++ "title" : "Sveiki atvykę į Satisfactory Modifikacijų Tvarkyklę, 3 Versiją!" ++ }, ++ "updates" : { ++ "changelog" : "Pakeitimų žurnalas", ++ "check-for-updates" : "Patikrinti, ar yra atnaujinimų", ++ "checking-for-updates" : "Tikrinama, ar yra atnaujinimų...", ++ "hide-ignored" : "Paslėpti ignoruojamus", ++ "ignore" : "Ignoruoti", ++ "mod-update-available" : "{updates, plural, one {{updates} pasiekiamas modo atnaujinimas} few {{updates} pasiekiami keli modų atnaujinimai} many {{updates} pasiekiama daug modų atnaujinimų} other {{updates} pasiekiami kiti modų atnaujinimai}}", ++ "no-updates" : "Šiuo metu nėra modų ar SMM atnaujinimų", ++ "show-ignored" : "Rodyti ignoruojamus", ++ "smm-update-available" : "Yra SMM atnaujinimas", ++ "title" : "Atnaujinimai", ++ "unignore" : "Nebeignoruoti", ++ "update-all" : "Atnaujinti visus", ++ "update-selected" : "Atnaujinti pasirinktus" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/mt.json b/frontend/src/lib/generated/i18n/mt.json +new file mode 100644 +index 0000000..8abbb23 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/mt.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : null, ++ "go-online" : null, ++ "healthcheck" : null, ++ "offline" : null ++ }, ++ "common" : { ++ "add" : null, ++ "cancel" : null, ++ "close" : null, ++ "delete" : null, ++ "import" : null, ++ "loading" : null, ++ "rename" : null ++ }, ++ "error" : { ++ "failed_to_generate_debug" : null, ++ "generate_debug_info" : null, ++ "help" : null, ++ "invalid_installs" : null, ++ "no_installs" : null, ++ "open_log_docs" : null, ++ "open_modding_discord" : null, ++ "open_modding_discord.must_generate_debug_first" : null, ++ "reporting_directions" : null, ++ "title" : null ++ }, ++ "external-install-mod" : { ++ "already-installed" : null, ++ "error-loading" : null, ++ "in-queue" : null, ++ "install" : null, ++ "latest-version" : null, ++ "title" : null, ++ "version" : null ++ }, ++ "first_time_setup" : { ++ "acknowledge" : null, ++ "change_later_hint" : null, ++ "intro" : null, ++ "open_welcome_guide" : null, ++ "option" : { ++ "language" : { ++ "title" : null ++ }, ++ "queue-auto-start" : { ++ "disabled" : null, ++ "enabled" : null, ++ "title" : null ++ } ++ }, ++ "title" : null ++ }, ++ "launch-button" : { ++ "apply-profile-change" : null, ++ "apply-queued" : null, ++ "are-you-sure-warning" : null, ++ "cant-launch" : null, ++ "cant-launch-tooltip" : null, ++ "changes-queued" : null, ++ "game-running" : null, ++ "incompatible-mods" : null, ++ "launch-in-progress" : null, ++ "operation-in-progress" : null, ++ "play" : null, ++ "possibly-incompatible-mods" : null, ++ "profile-change-queued" : null, ++ "ready" : null, ++ "reported-incompatible-mods" : null, ++ "reported-possibly-compatible-mods" : null, ++ "you-have-warning-mods" : null ++ }, ++ "left-bar" : { ++ "export" : null, ++ "ficsit-app" : null, ++ "game-version" : null, ++ "help" : null, ++ "install-invalid" : null, ++ "install-invalid-tooltip" : null, ++ "install-loading" : null, ++ "install-loading-tooltip" : null, ++ "install-unknown" : null, ++ "install-unknown-tooltip" : null, ++ "links" : null, ++ "manage-servers" : null, ++ "mods-off" : null, ++ "mods-on" : null, ++ "other" : null, ++ "profile" : null, ++ "queue-blocking-switching-tooltip" : null, ++ "satisfactory-modding-discord" : null, ++ "smm-github" : null, ++ "updates" : null ++ }, ++ "mod-changelog" : { ++ "title" : null ++ }, ++ "mod-details" : { ++ "change-version" : null, ++ "change-version-any" : null, ++ "change-version-or-newer" : null, ++ "changelogs" : null, ++ "compatibility" : null, ++ "compatibility-branch" : null, ++ "compatibility-unknown" : null, ++ "compatibility-unknown-tooltip" : null, ++ "contributors" : null, ++ "created" : null, ++ "downloads" : null, ++ "installed-version" : null, ++ "latest-version" : null, ++ "mod-author" : null, ++ "offline-mode" : null, ++ "size" : null, ++ "updated" : null, ++ "view-on-ficsit-app" : null, ++ "views" : null ++ }, ++ "mod-list-item" : { ++ "by-author" : null, ++ "compatibility-note" : null, ++ "compatibility-note-none" : null, ++ "compatibility-warning" : null, ++ "dependency" : null, ++ "disable" : null, ++ "disable-queued" : null, ++ "disabled-tooltip" : null, ++ "enable" : null, ++ "enable-queued" : null, ++ "favorite" : null, ++ "hidden" : null, ++ "install" : null, ++ "no-tags" : null, ++ "not-installable" : null, ++ "queued" : null, ++ "queued-install" : null, ++ "queued-uninstall" : null, ++ "unavailable" : null, ++ "unfavorite" : null, ++ "uninstall" : null, ++ "wait" : null ++ }, ++ "mod" : { ++ "compatibility-no-notes" : null ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : null, ++ "compatible" : null, ++ "dependency" : null, ++ "disabled" : null, ++ "enabled" : null, ++ "favorite" : null, ++ "installed" : null, ++ "not-installed" : null, ++ "queued" : null ++ }, ++ "order-by" : { ++ "downloads" : null, ++ "hotness" : null, ++ "last-updated" : null, ++ "name" : null, ++ "popularity" : null, ++ "views" : null ++ }, ++ "search" : null ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : null, ++ "no-mods-found" : null, ++ "show-all" : null ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : null, ++ "profile-name-placeholder" : null, ++ "title" : null ++ }, ++ "delete" : { ++ "profile-name" : null, ++ "title" : null ++ }, ++ "import" : { ++ "profile-file" : null, ++ "profile-name" : null, ++ "profile-name-placeholder" : null, ++ "profile-version-warning" : null, ++ "title" : null ++ }, ++ "rename" : { ++ "new-profile" : null, ++ "new-profile-placeholder" : null, ++ "old-profile" : null, ++ "old-profile-placeholder" : null, ++ "title" : null ++ } ++ }, ++ "server-manager" : { ++ "add" : null, ++ "advanced-note" : null, ++ "advanced-path-placeholder" : null, ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : null, ++ "get-help" : null, ++ "host-placeholder" : null, ++ "invalid" : null, ++ "loading" : null, ++ "local-path-placeholder" : null, ++ "name-placeholder" : null, ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : null, ++ "path-placeholder" : null, ++ "port-placeholder" : null, ++ "switch-to-advanced" : null, ++ "switch-to-simple" : null, ++ "title" : null, ++ "username-placeholder" : null, ++ "validating" : null ++ }, ++ "server-picker" : { ++ "failed-list-dir" : null, ++ "failed-valid-check" : null ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : null, ++ "reset" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "change-cache-location" : null, ++ "copy-mod-list" : null, ++ "debug" : null, ++ "generate-debug-info" : null, ++ "go-online-offline" : null, ++ "language" : null, ++ "launch-button" : null, ++ "launch-button.button" : null, ++ "launch-button.cat" : null, ++ "launch-button.normal" : null, ++ "proxy" : { ++ "proxy" : null, ++ "remove" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "queue" : null, ++ "queue.start-immediately" : null, ++ "queue.start-manually" : null, ++ "save-window-position" : null, ++ "secret-settings" : null, ++ "set-proxy" : null, ++ "settings" : null, ++ "smm-debug-logging" : null, ++ "start-view" : null, ++ "start-view.compact" : null, ++ "start-view.expanded" : null, ++ "title" : null, ++ "update-check" : null, ++ "update-check.ask" : null, ++ "update-check.on-exit" : null, ++ "update-check.on-start" : null ++ }, ++ "smm-update" : { ++ "downloading" : null, ++ "downloading-stats" : null, ++ "title" : null ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : null, ++ "performance.description" : null, ++ "platform_support" : null, ++ "platform_support.description" : null, ++ "profile_format" : null, ++ "profile_format.description" : null, ++ "queue" : null, ++ "queue.description" : null, ++ "servers" : null, ++ "servers.description" : null, ++ "translation" : null, ++ "translation.description" : null, ++ "ui" : null, ++ "ui.description" : null ++ }, ++ "intro" : null, ++ "open_guide" : null, ++ "title" : null ++ }, ++ "updates" : { ++ "changelog" : null, ++ "check-for-updates" : null, ++ "checking-for-updates" : null, ++ "hide-ignored" : null, ++ "ignore" : null, ++ "mod-update-available" : null, ++ "no-updates" : null, ++ "show-ignored" : null, ++ "smm-update-available" : null, ++ "title" : null, ++ "unignore" : null, ++ "update-all" : null, ++ "update-selected" : null ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/pl.json b/frontend/src/lib/generated/i18n/pl.json +new file mode 100644 +index 0000000..e4d1d46 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/pl.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Przejdź w Tryb Offline", ++ "go-online" : "Przejdź w Tryb Online", ++ "healthcheck" : "Nie można połączyć z ficsit.app. Sprawdź swoje połączenie internetowe, bądź użyj trybu offline. (Ustawienia Menadżera Modów > Przejdź w Tryb Offline)", ++ "offline" : "Jesteś aktualnie offline. Niektóre funkcje mogą być niedostępne. (Aby przywrócić połączenie, przejdź do Ustawienia Menadżera Modów > Przejdź w Tryb Online)" ++ }, ++ "common" : { ++ "add" : "Dodaj", ++ "cancel" : "Anuluj", ++ "close" : "Zamknij", ++ "delete" : "Usuń", ++ "import" : "Zaimportuj", ++ "loading" : "Ładowanie...", ++ "rename" : "Zmień Nazwę" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Wystąpił błąd przy próbie wygenerowania pliku debugowania. Prosimy o manualne sprawdzenie plików logów Menadżera Modów, aby uzyskać więcej informacji, oraz o zgłoszenie tego problemu na Discord. Użyj przycisku poniżej, aby otworzyć dokumentacje i dowiedzieć się, jak to zrobić.", ++ "generate_debug_info" : "Wygeneruj informacje debugowania", ++ "help" : "Nie powinno tak być? Naciśnij przycisk poniżej i wyślij wygenerowany plik .zip na <1>discordzie od modowania na #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {Wykryto {invalidInstalls} błędną instalację Satisfactory} many {Wykryto {invalidInstalls} błędnych instalacji Satisfactory} other {Wykryto {invalidInstalls} błędne instalacje Satisfactory} }", ++ "no_installs" : "Nie znaleziono instalacji Satisfactory", ++ "open_log_docs" : "Otwórz Dokumentacje Logów", ++ "open_modding_discord" : "Otwórz Discord od Modowania", ++ "open_modding_discord.must_generate_debug_first" : "Musisz najpierw wygenerować informacje debugowania", ++ "reporting_directions" : "Nie powinno tak być? Naciśnij przycisk poniżej, aby zebrać logi, a następnie wyślij wygenerowany plik .zip na discordzie od modowania na #help-using-mods.", ++ "title" : "Coś poszło nie tak" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Już zainstalowany", ++ "error-loading" : "Wystąpił błąd przy ładowaniu szczegółów moda", ++ "in-queue" : "W kolejce", ++ "install" : "Zainstaluj", ++ "latest-version" : "Najnowsza wersja", ++ "title" : "Zainstaluj moda", ++ "version" : "Wersja {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Rozpocznij!", ++ "change_later_hint" : "Zmień te ustawienia kiedykolwiek w menu \"Ustawienia Menadżera Modów\".", ++ "intro" : "Wybierz swoje preferencje, aby rozpocząć.", ++ "open_welcome_guide" : "Otwórz Przewodnik Wprowadzający", ++ "option" : { ++ "language" : { ++ "title" : "Użyj tego języka kiedy dostępny:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Poczekaj, aż nacisnę \"Zastosuj\"", ++ "enabled" : "Zastosuj zmiany natychmiast", ++ "title" : "Kiedy dodam lub usunę moda, bądź zmienię profil..." ++ } ++ }, ++ "title" : "Witaj w Satisfactory - Menadżer Modów!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Zastosuj {profile}", ++ "apply-queued" : "Zastosuj {queued, plural, one {jedną zmianę} few {# zmiany} many {# zmian} other {# zmiany}}", ++ "are-you-sure-warning" : "Czy jesteś pewien, że chcesz uruchomić?", ++ "cant-launch" : "SMM nie może uruchomić tej instalacji", ++ "cant-launch-tooltip" : "Menadżer Modów nie jest w stanie uruchomić tego typu instalacji, ale nadal będzie zarządzać plikami modów dla Ciebie. Uruchom Satisfactory za pomocą twojego standardowego programu do uruchamiania gier.", ++ "changes-queued" : "Zmiany nie zostały jeszcze zastosowane dla twoich modów. Naciśnij przycisk poniżej, aby zastosować zmiany, które są w kolejce\n\n(Jesteś w trybie Kolejki \"Zastosuj manualnie\")", ++ "game-running" : "Twój program do uruchamiania gier zgłasza, że gra jest już uruchomiona (albo jest podczas procesu zamykania).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} niekompatybilny mod, który się nie załaduje, bądź nieoczekiwanie zamknie naszą grę} many {{versionIncompatible} niekompatybilnych modów, które się nie załadują, bądź nieoczekiwanie zamkną naszą grę} other {{versionIncompatible} niekompatybilne mody, które się nie załadują, bądź nieoczekiwanie zamkną naszą grę} }", ++ "launch-in-progress" : "Uruchamianie w toku...", ++ "operation-in-progress" : "Operacja jest już w toku.", ++ "play" : "Zagraj w Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Jeden mod {versionPossiblyCompatible, plural, one {jest} few {są} many {jest} other {są}} prawdopodobnie niekompatybilny z twoją grą} many {# modów {versionPossiblyCompatible, plural, one {jest} few {są} many {jest} other {są}} prawdopodobnie niekompatybilnych z twoją grą} other {# mody {versionPossiblyCompatible, plural, one {jest} few {są} many {jest} other {są}} prawdopodobnie niekompatybilne z twoją grą} }", ++ "profile-change-queued" : "Zmiany nie zostały jeszcze zastosowane dla twoich modów. Naciśnij przycisk poniżej, aby zastosować nowy profil.\n\n(Jesteś w trybie Kolejki \"Zastosuj manualnie\")", ++ "ready" : "Jesteś gotów do akcji:\n\nInformacja: Menadżer modów już skończył instalować dla Ciebie mody. Możesz wystartować grę używając swojego standardowego programu do uruchamiania gier, a mody i tak się załadują.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Jeden mod} few {# mody} many {# modów} other {# mody}} {reportedIncompatible, plural, one {został zgłoszony jako Niedziałający} few {zostały zgłoszone jako Niedziałające} many {zostało zgłoszonych jako Niedziałających} other {zostały zgłoszone jako Niedziałające}} na tej wersji gry. Przeczytaj opis lub informacje o kompatybilności {versionIncompatible, plural, one {moda} few {modów} many {modów} other {modów}} po więcej informacji", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Jeden mod} few {# mody} many {# modów} other {# mody}} {reportedPossiblyCompatible, plural, one {został zgłoszony jako Uszkodzony} few {zostały zgłoszone jako Uszkodzone} many {zostało zgłoszonych jako Uszkodzone} other {zostały zgłoszone jako Uszkodzone}} na tej wersji gry. Przeczytaj opis lub informacje o kompatybilności {versionIncompatible, plural, one {moda} few {modów} many {modów} other {modów}} po więcej informacji", ++ "you-have-warning-mods" : "Masz:" ++ }, ++ "left-bar" : { ++ "export" : "Wyeksportuj", ++ "ficsit-app" : "ficsit.app (Repozytorium Modów)", ++ "game-version" : "Wybierz Instalacje Gry", ++ "help" : "Pomoc", ++ "install-invalid" : "Błędna", ++ "install-invalid-tooltip" : "Status: SMM nie może zarządzać tą instalacją", ++ "install-loading" : "Ładowanie...", ++ "install-loading-tooltip" : "Status: Ładowanie...", ++ "install-unknown" : "Nieznana", ++ "install-unknown-tooltip" : "Status: Nie mogliśmy zdobyć informacji na temat tej instalacji", ++ "links" : "Łącza", ++ "manage-servers" : "Zarządaj Serwerami", ++ "mods-off" : "Wyłącz Mody", ++ "mods-on" : "Włącz Mody", ++ "other" : "Inne", ++ "profile" : "Profil", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Masz {number} akcję w kolejce. Zastosuj albo anuluj {number, plural, one {ją} other {je}} zanim zmienisz instalacje lub profile.} many {Masz {number} akcji w kolejce. Zastosuj albo anuluj {number, plural, one {ją} other {je}} zanim zmienisz instalacje lub profile.} other {Masz {number} akcje w kolejce. Zastosuj albo anuluj {number, plural, one {ją} other {je}} zanim zmienisz instalacje lub profile.} }", ++ "satisfactory-modding-discord" : "Discord od Modowania Satisfactory", ++ "smm-github" : "GitHub SMM", ++ "updates" : "Aktualizacje" ++ }, ++ "mod-changelog" : { ++ "title" : "Lista Zmian <1>{mod}" ++ }, ++ "mod-details" : { ++ "change-version" : "Zmień wersje", ++ "change-version-any" : "Jakakolwiek", ++ "change-version-or-newer" : "lub nowsza", ++ "changelogs" : "Listy Zmian", ++ "compatibility" : "Kompatybilność", ++ "compatibility-branch" : "Mod został zgłoszony jako {state} na {branch}", ++ "compatibility-unknown" : "Nieznane", ++ "compatibility-unknown-tooltip" : "Informacja o kompatybilności nie została jeszcze zgłoszona. Przetestuj ją i skontaktuj się z nami na Discord, abyśmy mogli ją zaktualizować!", ++ "contributors" : "Autorzy <1>({authors})", ++ "created" : "Data Stworzenia", ++ "downloads" : "Ilość Pobrań", ++ "installed-version" : "Zainstalowana wersja", ++ "latest-version" : "Najnowsza wersja", ++ "mod-author" : "Mod autorstwa:", ++ "offline-mode" : "Tryb Offline jest włączony. Listy zmian i opisy są niedostępne.", ++ "size" : "Rozmiar", ++ "updated" : "Data Zaktualizowania:", ++ "view-on-ficsit-app" : "Zobacz na ficsit.app", ++ "views" : "Wyświetlenia" ++ }, ++ "mod-list-item" : { ++ "by-author" : "autorstwa", ++ "compatibility-note" : "Ten mod został zgłoszony jako {state} na tej wersji gry", ++ "compatibility-note-none" : "(Nie podano)", ++ "compatibility-warning" : "Zostały zgłoszone problemy z tym modem, ale nadal możesz spróbować go zainstalować. Detale:", ++ "dependency" : "Ten mod jest już zainstalowany jako dependencja innego moda. Nie może on zostać odinstalowany, dopóki inne mody na nim polegają.", ++ "disable" : "Ten mod jest Włączony na tym profilu. Naciśnij, aby go Wyłączyć, spowoduje to, że nie załaduje się on przy starcie gry, ale dalej będzie częścią tego profilu.", ++ "disable-queued" : "Ten mod jest w kolejce do Wyłączenia. Naciśnij, aby anulować tę operację.", ++ "disabled-tooltip" : "Ten mod jest Wyłączony. Naciśnij ikonkę pauzy, aby go Włączyć.", ++ "enable" : "Naciśnij, aby włączyć ten mod.", ++ "enable-queued" : "Ten mod jest w kolejce do Włączenia. Naciśnij, aby anulować tę operację.", ++ "favorite" : "Naciśnij, aby dodać ten mod do Ulubionych. Oznaczenie moda jako Ulubionego nie jest powiązane z tym czy jest zainstalowany - to sposób, aby śledzić moda, niezależnie od wybranego profilu.", ++ "hidden" : "Ten mod jest ukryty przez autora", ++ "install" : "Naciśnij, aby zainstalować ten mod.", ++ "no-tags" : "(nie podano)", ++ "not-installable" : "Nie możesz zainstalować tego moda. Powód:", ++ "queued" : "Ten mod jest już w kolejce do innej operacji.", ++ "queued-install" : "Ten mod jest w kolejce do zainstalowania. Naciśnij, aby anulować tę operację.", ++ "queued-uninstall" : "Ten mod jest w kolejce do odinstalowania. Naciśnij, aby anulować tę operację.", ++ "unavailable" : "Ten mod nie jest już dostępny na ficsit.app. Możesz chcieć go usunąć.", ++ "unfavorite" : "Naciśnij, aby usunąć tego moda z Ulubionych.", ++ "uninstall" : "Ten mod jest zainstalowany na tym profilu. Naciśnij, aby go odinstalować.", ++ "wait" : "Poczekaj, aż aktualna operacja zostanie ukończona." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Nie podano uwagi)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Wszystkie", ++ "compatible" : "Kompatybilne", ++ "dependency" : "Dependencja", ++ "disabled" : "Wyłączone", ++ "enabled" : "Włączone", ++ "favorite" : "Ulubione", ++ "installed" : "Zainstalowane", ++ "not-installed" : "Niezainstalowane", ++ "queued" : "W kolejce" ++ }, ++ "order-by" : { ++ "downloads" : "Ilość Pobrań", ++ "hotness" : "Trendy", ++ "last-updated" : "Zaktualizowane", ++ "name" : "Nazwa", ++ "popularity" : "Popularność", ++ "views" : "Wyświetlenia" ++ }, ++ "search" : "Szukaj mody" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Żadne mody nie pasują do wybranych filtrów.", ++ "no-mods-found" : "Nie znaleziono modów.", ++ "show-all" : "Pokaż wszystkie" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Nazwa Profilu", ++ "profile-name-placeholder" : "Nowa Nazwa Profilu", ++ "title" : "Dodaj Profil" ++ }, ++ "delete" : { ++ "profile-name" : "Nazwa Profilu", ++ "title" : "Usuń Profil" ++ }, ++ "import" : { ++ "profile-file" : "Plik Profilu", ++ "profile-name" : "Nazwa Profilu", ++ "profile-name-placeholder" : "Nowa Nazwa Profilu", ++ "profile-version-warning" : "Ten profil został stworzony dla nowszej wersji gry. Może on być niekompatybilny z tą wersją.", ++ "title" : "Zaimportuj profil" ++ }, ++ "rename" : { ++ "new-profile" : "Nowa nazwa profilu", ++ "new-profile-placeholder" : "Nowy Profil", ++ "old-profile" : "Stara nazwa profilu", ++ "old-profile-placeholder" : "Stary Profil", ++ "title" : "Zmień nazwę profilu" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Dodaj", ++ "advanced-note" : "Uwaga: niektóre znaki w nazwie użytkownika i haśle mogą wymagać poprzedzenia znakiem ucieczki (zazwyczaj znak odwrotnego ukośnika \"\\\").", ++ "advanced-path-placeholder" : "użytkownik:hasło@host:port/ścieżka", ++ "existing-servers" : { ++ "none-yet" : "Jeszcze nie zostały dodane żadne serwery. Dodaj jeden poniżej!", ++ "title" : "Zarządzaj Istniejącymi Serwerami" ++ }, ++ "failed-to-connect" : "Nie udało się połączyć z serwerem, naciśnij, aby spróbować ponownie", ++ "get-help" : "Uzyskaj pomoc z łączeniem do serwerów", ++ "host-placeholder" : "host", ++ "invalid" : "SMM nie może zarządzać tą instalacją", ++ "loading" : "Ładowanie...", ++ "local-path-placeholder" : "C:\\Ścieżka\\Do\\Serwera", ++ "name-placeholder" : "Nazwa (domyślna: {default})", ++ "new-server" : { ++ "title" : "Dodaj Nowy Serwer" ++ }, ++ "password-placeholder" : "hasło", ++ "path-placeholder" : "ścieżka", ++ "port-placeholder" : "port (domyślny: {default})", ++ "switch-to-advanced" : "Przełącz na tryb zaawansowany", ++ "switch-to-simple" : "Przełącz na tryb prosty", ++ "title" : "Dedykowane Serwery", ++ "username-placeholder" : "użytkownik", ++ "validating" : "Weryfikowanie..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Nie udało się wyświetlić katalogu.", ++ "failed-valid-check" : "Nie udało się sprawdzić czy wybrana ścieżka wskazuje na prawidłowy serwer" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Miejsce przechowywania pamięci podręcznej", ++ "reset" : "Zresetuj do domyślnych", ++ "save" : "Zapisz i przenieś", ++ "title" : "Zmień miejsce przechowywania pamięci podręcznej pobierania" ++ }, ++ "change-cache-location" : "Zmień miejsce przechowywania pamięci podręcznej", ++ "copy-mod-list" : "Skopiuj listę modów", ++ "debug" : "Debugowanie", ++ "generate-debug-info" : "Wygeneruj informacje debugowania", ++ "go-online-offline" : "Pójdź {offline, select, true {online} other {offline}}", ++ "language" : "Język", ++ "launch-button" : "Przycisk uruchamiania", ++ "launch-button.button" : "Przycisk", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normalny", ++ "proxy" : { ++ "proxy" : "Serwer pośredniczący (Proxy)", ++ "remove" : "Usuń serwer pośredniczący (Proxy)", ++ "save" : "Zapisz i zrestartuj", ++ "title" : "Ustaw serwer pośredniczący (Proxy)" ++ }, ++ "queue" : "Kolejka", ++ "queue.start-immediately" : "Zastosuj natychmiastowo", ++ "queue.start-manually" : "Zastosuj manualnie", ++ "save-window-position" : "Zapisz pozycję okna", ++ "secret-settings" : "Sekretne ustawienia", ++ "set-proxy" : "Ustaw serwer pośredniczący (Proxy)", ++ "settings" : "Ustawienia", ++ "smm-debug-logging" : "logowanie debugowania SMM", ++ "start-view" : "Widok startowy", ++ "start-view.compact" : "Kompaktowy", ++ "start-view.expanded" : "Rozszerzony", ++ "title" : "Ustawienia Menadżera Modów", ++ "update-check" : "Sprawdzanie dostępności aktualizacji", ++ "update-check.ask" : "Zapytaj, gdy znaleziono", ++ "update-check.on-exit" : "Przy zamknięciu", ++ "update-check.on-start" : "Przy starcie" ++ }, ++ "smm-update" : { ++ "downloading" : "Pobieranie w tle", ++ "downloading-stats" : "Pobieranie aktualizacji: {current} / {total}, {speed}/s, szacowany czas: {eta}", ++ "title" : "Dostępna aktualizacja SMM - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Lepsza wydajność", ++ "performance.description" : "Pomaga ci być efektywnym!", ++ "platform_support" : "Natywne wsparcie dla: Linux Heroic, Steam Snap, Mac", ++ "platform_support.description" : "Pobierz nową wersję z GitHub releases, jeśli jeszcze jej nie masz!", ++ "profile_format" : "Nowy format Profili", ++ "profile_format.description" : "Profile z SMM2 nie są kompatybilne z SMM3! Twoje istniejące profile zostały automatycznie przeniesione, ale nie możesz Zaimportować żadnych profilów stworzonych za pomocą SMM2.", ++ "queue" : "Kolejka akcji", ++ "queue.description" : "Kolejkuj wiele pobrań/odinstalowań modów na raz.", ++ "servers" : "Zarządzanie dedykowanymi serwerami", ++ "servers.description" : "Łatwo zarządzaj serwerami za pomocą systemu plików, SFTP, FTP i SMB!", ++ "translation" : "Wsparcie tłumaczeń", ++ "translation.description" : "Dołącz na nasz Discord, aby przetłumaczyć SMM na twój język!", ++ "ui" : "Odświeżony wygląd interfejsu użytkownika", ++ "ui.description" : "Świeża warstwa farby, by uczcić Satisfactory 1.0!" ++ }, ++ "intro" : "Wprowadziliśmy w tej wersji wiele usprawnień. Oto kilka najważniejszych:", ++ "open_guide" : "Otwórz dokumentacje SMM3", ++ "title" : "Witamy w trzeciej wersji Satisfactory - Menadżer Modów!" ++ }, ++ "updates" : { ++ "changelog" : "Lista Zmian", ++ "check-for-updates" : "Sprawdź dostępność aktualizacji", ++ "checking-for-updates" : "Sprawdzanie dostępności aktualizacji...", ++ "hide-ignored" : "Ukryj ignorowane", ++ "ignore" : "Zignoruj", ++ "mod-update-available" : "{updates, plural, one {{updates} dostępna aktualizacja moda} many {{updates} dostępnych aktualizacji modów} other {{updates} dostępne aktualizacje modów} }", ++ "no-updates" : "Brak dostępnych aktualizacji", ++ "show-ignored" : "Pokaż ignorowane", ++ "smm-update-available" : "Dostępna aktualizacja SMM", ++ "title" : "Aktualizacje", ++ "unignore" : "Odignoruj", ++ "update-all" : "Zaktualizuj wszystko", ++ "update-selected" : "Zaktualizuj wybrane" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/pt-BR.json b/frontend/src/lib/generated/i18n/pt-BR.json +new file mode 100644 +index 0000000..9800328 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/pt-BR.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Ficar Offline", ++ "go-online" : "Ficar Online", ++ "healthcheck" : "Não foi possível acessar o ficsit.app. Verifique sua conexão com a internet ou considere utilizar o modo offline. (Configurações do Gerenciador de Mods > Ficar Offline)", ++ "offline" : "Você está offline no momento. Algumas funções podem estar indisponíveis. (Para reconectar, use Configurações do Gerenciador de Mods > Ficar Offline)" ++ }, ++ "common" : { ++ "add" : "Adicionar", ++ "cancel" : "Cancelar", ++ "close" : "Fechar", ++ "delete" : "Deletar", ++ "import" : "Importar", ++ "loading" : "Carregando...", ++ "rename" : "Renomear" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Ocorreu um erro ao criar o arquivo de depuração. Por favor, cheque manualmente os arquivos de log do Satisfactory Mod Manager para mais informações e reporte isto em nosso Discord. Use o botão abaixo para abrir a documentação e saber como.", ++ "generate_debug_info" : "Gerar informações de depuração", ++ "help" : "Parece errado? Clique no botão abaixo e envie o arquivo zip gerado em #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} instalação inválida de Satisfactory encontrada} other {{invalidInstalls} instalações inválidas de Satisfactory encontradas}}", ++ "no_installs" : "Nenhuma instalação do Satisfactory encontrada", ++ "open_log_docs" : "Abrir documentação de registro", ++ "open_modding_discord" : "Abrir Discord de Modificações", ++ "open_modding_discord.must_generate_debug_first" : "Você deve gerar informações de depuração primeiro", ++ "reporting_directions" : "Parece errado? Clique no botão abaixo para coletar os logs, em seguida, envie o arquivo zip gerado no Discord de mods em #help-using-mods.", ++ "title" : "Algo deu errado" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Já instalado", ++ "error-loading" : "Erro ao carregar os detalhes do mod", ++ "in-queue" : "Na fila", ++ "install" : "Instalar", ++ "latest-version" : "Versão mais recente", ++ "title" : "Instalar mod", ++ "version" : "Versão{version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Começar!", ++ "change_later_hint" : "Altere essas configurações a qualquer momento no menu “Configurações do Mod Manager”.", ++ "intro" : "Selecione suas preferências para começar.", ++ "open_welcome_guide" : "Abra o Guia de Boas-vindas", ++ "option" : { ++ "language" : { ++ "title" : "Use este idioma quando disponível:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Espere por mim para pressionar “Aplicar”", ++ "enabled" : "Aplicar alterações imediatamente", ++ "title" : "Quando adiciono ou removo um mod, ou troco de perfil..." ++ } ++ }, ++ "title" : "Bem-vindo ao Satisfactory Mod Manager!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Aplicar {profile}", ++ "apply-queued" : "Aplicar {queued, plural, one {one change} other {# changes}}", ++ "are-you-sure-warning" : "Tem certeza de que deseja iniciar?", ++ "cant-launch" : "SMM não pode iniciar esta instalação", ++ "cant-launch-tooltip" : "O Gerenciador de Mods não é capaz de iniciar este tipo de instalação, mas ele ainda gerenciará os arquivos dos mods para você. Inicie o Satisfactory usando seu launcher habitual de jogos.", ++ "changes-queued" : "Ainda não foram feitas alterações nos seus arquivos mod. Clique no botão acima para aplicar as alterações que você colocou na fila.", ++ "game-running" : "O inicializador do jogo está informando que o jogo já está em execução (ou ainda em processo de fechamento).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible}mod incompatível que não será carregado ou travará o nosso jogo} other {{versionIncompatible}mods incompatíveis que não serão carregados ou travarão o nosso jogo}}", ++ "launch-in-progress" : "Inicialização em progesso...", ++ "operation-in-progress" : "Uma operação já está em andamento.", ++ "play" : "Jogar Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Um mod que {versionPossiblyCompatible, plural, one {is} other {are}} provavelmente incompatível com seu jogo} other {# mods que {versionPossiblyCompatible, plural, one {is} other {are}} provavelmente incompatível com seu jogo}}", ++ "profile-change-queued" : "Mudanças ainda não foram feitas em seus arquivos mod. Clique no botão acima para aplicar o novo perfil.\n\n(Você está no modo de fila \"Iniciar manualmente\")", ++ "ready" : "Você está pronto para fazer barulho!\n\nNota: O Mod Manager já concluiu a instalação dos arquivos mod para você. Você poderia iniciar o jogo usando seu inicializador do jogo e os mods ainda seriam carregados.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {One mod} other {# mods}} that {reportedIncompatible, plural, one {is} other {are}} reportado como Quebrado nesta versão do jogo. Leia o {versionIncompatible, plural, one {mod's} other {mods'}} descrição ou notas de compatibilidade para obter mais informações", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {One mod} other {# mods}} that {reportedPossiblyCompatible, plural, one {is} other {are}} reportado como Danificado nesta versão do jogo. Leia o {versionIncompatible, plural, one {mod's} other {mods'}} descrição ou notas de compatibilidade para obter mais informações", ++ "you-have-warning-mods" : "Você tem:" ++ }, ++ "left-bar" : { ++ "export" : "Exportar", ++ "ficsit-app" : "ficsit.app (Repositório de Mods)", ++ "game-version" : "Selecione a instalação do jogo", ++ "help" : "Ajuda", ++ "install-invalid" : "Inválido", ++ "install-invalid-tooltip" : "Status: o SMM não pode gerenciar esta instalação", ++ "install-loading" : "Carregando...", ++ "install-loading-tooltip" : "Status: Carregando...", ++ "install-unknown" : "Desconhecido", ++ "install-unknown-tooltip" : "Status: Não foi possível obter informações sobre esta instalação", ++ "links" : "Links", ++ "manage-servers" : "Gerenciar servidores", ++ "mods-off" : "Mods desligados", ++ "mods-on" : "Mods ligados", ++ "other" : "Outros", ++ "profile" : "Perfil", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Você tem {number} ação em fila. Aplique ou cancele-a antes de trocar instalações ou perfis.} other {Você tem {número} ações em fila. Aplique ou cancele-as antes de trocar instalações ou perfis.}}", ++ "satisfactory-modding-discord" : "Discord de Modding do Satisfactory", ++ "smm-github" : "SMM GitHub", ++ "updates" : "Atualizações" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod}Registro de alterações" ++ }, ++ "mod-details" : { ++ "change-version" : "Alterar versão", ++ "change-version-any" : "Qualquer", ++ "change-version-or-newer" : "Ou mais recente", ++ "changelogs" : "Registros de alterações", ++ "compatibility" : "Compatibilidade", ++ "compatibility-branch" : "Este mod foi reportado como {state} na {branch}.", ++ "compatibility-unknown" : "Desconhecido", ++ "compatibility-unknown-tooltip" : "Nenhuma informação de compatibilidade foi reportada para este mod ainda. Experimente e entre em contato conosco no Discord para que possa ser atualizado!", ++ "contributors" : "Contribuidores <1>({authors})", ++ "created" : "Criado", ++ "downloads" : "Total de downloads", ++ "installed-version" : "Versão instalada", ++ "latest-version" : "Versão mais recente", ++ "mod-author" : "Um mod por:", ++ "offline-mode" : "O modo offline está ativado. Registros de alterações e descrições não estão disponíveis.", ++ "size" : "Tamanho", ++ "updated" : "Atualizado", ++ "view-on-ficsit-app" : "Ver em ficsit.app", ++ "views" : "Visualizações" ++ }, ++ "mod-list-item" : { ++ "by-author" : "Por", ++ "compatibility-note" : "Este mod foi reportado como {state} nesta versão do jogo.", ++ "compatibility-note-none" : "(Nenhum especificado)", ++ "compatibility-warning" : "Existem problemas relatados com este mod, mas você pode tentar instalá-lo assim mesmo. Detalhes:", ++ "dependency" : "Este mod está instalado como uma dependência de outro mod. Não pode ser instalado ou removido por conta própria.", ++ "disable" : "Este mod está habilitado neste perfil. Clique para desativá-lo, o que impede que ele carregue quando você inicia o jogo, mas ainda o mantém como parte deste perfil.", ++ "disable-queued" : "Este mod está na fila para ser desativado. Clique para cancelar a operação.", ++ "disabled-tooltip" : "Este mod está desativado. Clique no ícone de pausa para ativá-lo.", ++ "enable" : "Clique para ativar este mod.", ++ "enable-queued" : "Este mod está na fila para ser Ativado. Clique para cancelar a operação.", ++ "favorite" : "Clique para adicionar este mod aos seus Favoritos. Ter um mod como Favorito não está relacionado ao fato dele estar ou não instalado - é uma forma de acompanhar um mod para mais tarde, independentemente do perfil que você selecionou.", ++ "hidden" : "Este mod foi escondido pelo autor.", ++ "install" : "Clique para instalar este mod.", ++ "no-tags" : "(nenhuma disponível)", ++ "not-installable" : "Você não pode instalar este mod. Motivo:", ++ "queued" : "Este mod já está na fila para outra operação.", ++ "queued-install" : "Este mod está na fila para ser instalado. Clique para cancelar a operação.", ++ "queued-uninstall" : "Este mod está na fila para ser desinstalado. Clique para cancelar a operação.", ++ "unavailable" : "Este mod não está mais disponível em ficsit.app. Você pode querer removê-lo.", ++ "unfavorite" : "Clique para remover este mod dos seus Favoritos.", ++ "uninstall" : "Este mod está instalado neste perfil. Clique para desinstalar este mod.", ++ "wait" : "Aguarde a conclusão da operação atual." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Nenhuma nota adicional fornecida)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Todos os mods", ++ "compatible" : "Compatível", ++ "dependency" : "Dependência", ++ "disabled" : "Desabilitado", ++ "enabled" : "Habilitado", ++ "favorite" : "Favorito", ++ "installed" : "Instalado", ++ "not-installed" : "Não instalado", ++ "queued" : "Na fila" ++ }, ++ "order-by" : { ++ "downloads" : "Downloads", ++ "hotness" : "Quentes", ++ "last-updated" : "Última atualização", ++ "name" : "Nome", ++ "popularity" : "Nome", ++ "views" : "Visualizações" ++ }, ++ "search" : "Pesquisar mods" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Nenhum mod que corresponda aos seus filtros", ++ "no-mods-found" : "Nenhum mod encontrado", ++ "show-all" : "Mostrar tudo" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Nome do perfil", ++ "profile-name-placeholder" : "Novo nome do perfil", ++ "title" : "Adicionar perfil" ++ }, ++ "delete" : { ++ "profile-name" : "Nome do perfil", ++ "title" : "Deletar perfil" ++ }, ++ "import" : { ++ "profile-file" : "Arquivo do perfil", ++ "profile-name" : "Nome do perfil", ++ "profile-name-placeholder" : "Novo nome do perfil", ++ "profile-version-warning" : "Este perfil foi criado com uma versão mais recente do jogo. Pode não ser compatível com esta versão.", ++ "title" : "Importar perfil" ++ }, ++ "rename" : { ++ "new-profile" : "Novo nome do perfil", ++ "new-profile-placeholder" : "Novo perfil", ++ "old-profile" : "Nome do perfil antigo", ++ "old-profile-placeholder" : "Perfil antigo", ++ "title" : "Renomear perfil" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Adicionar", ++ "advanced-note" : "Observe que você pode ter que escapar certos caracteres no nome de usuário e na senha.", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : "Nenhum servidor adicionado ainda. Adicione um abaixo!", ++ "title" : "Gerenciar Servidores Existentes" ++ }, ++ "failed-to-connect" : "Falha ao conectar ao servidor, clique para tentar novamente", ++ "get-help" : "Obtenha ajuda para se conectar a servidores", ++ "host-placeholder" : "Host", ++ "invalid" : "SMM não pode gerenciar esta instalação", ++ "loading" : "Carregando...", ++ "local-path-placeholder" : "C:\\Path\\To\\Server", ++ "name-placeholder" : "Nome (default: {default})", ++ "new-server" : { ++ "title" : "Adicionar um Novo Servidor" ++ }, ++ "password-placeholder" : "senha", ++ "path-placeholder" : "Caminho", ++ "port-placeholder" : "porta (default: {default})", ++ "switch-to-advanced" : "Mudar para o modo avançado", ++ "switch-to-simple" : "Mudar para o modo simples", ++ "title" : "Servidores Dedicados", ++ "username-placeholder" : "Nome de Usuário", ++ "validating" : "Validando..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Falha ao listar o diretório", ++ "failed-valid-check" : "Falha ao verificar se o caminho selecionado é um servidor válido" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Localização do cache", ++ "reset" : "Redefinir para o padrão", ++ "save" : "Salvar e mover", ++ "title" : "Alterar a localização do cache de download" ++ }, ++ "change-cache-location" : "Alterar a localização do cache", ++ "copy-mod-list" : "Copiar lista de mods", ++ "debug" : "Depuração", ++ "generate-debug-info" : "Gerar informações de depuração", ++ "go-online-offline" : "Ir {offline, select, true {online} other {offline}}", ++ "language" : "Idioma", ++ "launch-button" : "Botão de iniciar", ++ "launch-button.button" : "Botão", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normal", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Remover Proxy", ++ "save" : "Salvar e reiniciar", ++ "title" : "Definir Proxy" ++ }, ++ "queue" : "Fila", ++ "queue.start-immediately" : "Iniciar imediatamente", ++ "queue.start-manually" : "Iniciar manualmente", ++ "save-window-position" : "Salvar posição da janela", ++ "secret-settings" : "Configurações secretas", ++ "set-proxy" : "Definir Proxy", ++ "settings" : "Configurações", ++ "smm-debug-logging" : "Registro de depuração SMM.", ++ "start-view" : "Iniciar visualização", ++ "start-view.compact" : "Compactar", ++ "start-view.expanded" : "Expandido", ++ "title" : "Configurações do Mod Manager ", ++ "update-check" : "Verificação de atualização", ++ "update-check.ask" : "Pergunte quando for encontrado", ++ "update-check.on-exit" : "Na saída", ++ "update-check.on-start" : "No início" ++ }, ++ "smm-update" : { ++ "downloading" : "Baixando em segundo plano", ++ "downloading-stats" : "Baixando atualização: {current} / {total}, {speed}/s, ETA {eta}", ++ "title" : "Atualização do SMM disponível - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Desempenho aprimorado", ++ "performance.description" : "Mantendo você eficiente!", ++ "platform_support" : "Nativo Linux Heroic, Steam Snap, suporte para Mac", ++ "platform_support.description" : "Obtenha uma versão das versões do GitHub, caso ainda não o tenha feito!", ++ "profile_format" : "Novo formato de perfil", ++ "profile_format.description" : "Perfis SMM2 não são compatíveis com SMM3! Seus perfis existentes foram migrados automaticamente, mas você não pode importar nenhum perfil criado com SMM2.", ++ "queue" : "Fila de ações", ++ "queue.description" : "Coloque na fila vários downloads/desinstalações de mod de uma só vez.", ++ "servers" : "Gerenciamento de servidor dedicado", ++ "servers.description" : "Gerencie facilmente servidores via sistema de arquivos, SFTP, FTP e SMB!", ++ "translation" : "Suporte de tradução", ++ "translation.description" : "Junte-se ao nosso Discord para traduzir SMM para o seu idioma!", ++ "ui" : "Atualização da interface do usuário", ++ "ui.description" : "Uma nova camada de tinta para celebrar o Satisfactory 1.0!" ++ }, ++ "intro" : "Fizemos muitas melhorias nesta versão. Aqui estão alguns dos destaques:", ++ "open_guide" : "Abra a documentação do SMM3", ++ "title" : "Bem-vindo ao Satisfactory Mod Manager Versão 3!" ++ }, ++ "updates" : { ++ "changelog" : "Registro de alterações", ++ "check-for-updates" : "Verificar atualizações", ++ "checking-for-updates" : "Verificando atualizações...", ++ "hide-ignored" : "Ocultar ignorados", ++ "ignore" : "Ignorar", ++ "mod-update-available" : "{updates, plural, one {{updates} atualização de mod disponível} other {{updates} atualizações de mods disponíveis}}", ++ "no-updates" : "Sem atualizações de mod/SMM no momento", ++ "show-ignored" : "Mostrar ignorados", ++ "smm-update-available" : "Atualização SMM disponível", ++ "title" : "Atualizações", ++ "unignore" : "Designorar", ++ "update-all" : "Atualizar tudo", ++ "update-selected" : "Atualização selecionada" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/ru.json b/frontend/src/lib/generated/i18n/ru.json +new file mode 100644 +index 0000000..3928afb +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/ru.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Перейти в офлайн", ++ "go-online" : "Перейти в онлайн", ++ "healthcheck" : "Не удалось подключиться к ficsit.app. Проверьте ваше интернет-соединение или попробуйте использовать автономный режим. (Настройки Mod Manager > Играть Офлайн)", ++ "offline" : "Вы сейчас офлайн. Некоторые функции могут быть недоступны. (Чтобы снова подключиться, воспользуйтесь Настройки Mod Manager > Играть Онлайн)" ++ }, ++ "common" : { ++ "add" : "Добавить", ++ "cancel" : "Отмена", ++ "close" : "Закрыть", ++ "delete" : "Удалить", ++ "import" : "Импортировать", ++ "loading" : "Загрузка...", ++ "rename" : "Переименовать" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Произошла ошибка при создании отладочного файла. Пожалуйста, вручную проверьте журналы Satisfactory Mod Manager для получения дополнительной информации и сообщите об этом на Discord. Используйте кнопку ниже, чтобы открыть документацию и узнать, как это сделать.", ++ "generate_debug_info" : "Создать отладочную информацию", ++ "help" : "Что-то не так? Нажмите кнопку ниже и отправьте сгенерированный zip-файл в <1>Discord сервер моддеров в канал #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {Обнаружена неверная установка Satisfactory} other {Обнаружены неверные установки Satisfactory}}", ++ "no_installs" : "Установки Satisfactory не найдены", ++ "open_log_docs" : "Открыть документацию", ++ "open_modding_discord" : "Открыть Discord для моддеров", ++ "open_modding_discord.must_generate_debug_first" : "Сначала необходимо сгенерировать отладочную информацию", ++ "reporting_directions" : "Кажется, что что-то не так? Нажмите кнопку ниже, чтобы собрать журналы, а затем отправьте сгенерированный zip-файл в Discord для моддеров в канале #help-using-mods.", ++ "title" : "Что-то пошло не так" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Уже установлено", ++ "error-loading" : "Ошибка при загрузке данных мода", ++ "in-queue" : "В очереди", ++ "install" : "Установить", ++ "latest-version" : "Последняя версия", ++ "title" : "Установить мод", ++ "version" : "Версия {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Начать!", ++ "change_later_hint" : "Вы можете изменить эти настройки в любое время в меню \"Настройки Mod Manager\".", ++ "intro" : "Выберите свои предпочтения, чтобы начать.", ++ "open_welcome_guide" : "Открыть руководство", ++ "option" : { ++ "language" : { ++ "title" : "Использовать этот язык, если доступен:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Ждать, пока я нажму \"Применить\"", ++ "enabled" : "Применить изменения сразу", ++ "title" : "Когда я добавляю или удаляю мод или переключаю профили..." ++ } ++ }, ++ "title" : "Добро пожаловать в Satisfactory Mod Manager!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Применить {profile}", ++ "apply-queued" : "Применить {queued, plural, one {одно изменение} other {# изменений}}", ++ "are-you-sure-warning" : "Вы уверены, что хотите запустить?", ++ "cant-launch" : "SMM не может запустить эту установку", ++ "cant-launch-tooltip" : "Менеджер модов не может запустить этот тип установки, но он по-прежнему управляет файлами модов для вас. Запустите Satisfactory через свой обычный лаунчер.", ++ "changes-queued" : "Изменения в файлы модов ещё не внесены. Нажмите кнопку ниже, чтобы применить изменения, которые вы поставили в очередь.\n\nВы в режиме \"Запуск вручную\"", ++ "game-running" : "Ваш лаунчер сообщает, что игра уже запущена (или ещё закрывается).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {несовместимый мод, который не загрузится или приведёт к сбою игры} other {несовместимые моды, которые не загрузятся или приведут к сбою игры}}", ++ "launch-in-progress" : "Запуск игры...", ++ "operation-in-progress" : "Операция уже выполняется.", ++ "play" : "Играть в Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Один мод, который {versionPossiblyCompatible, plural, one {возможно} other {возможно}} несовместим с вашей игрой} other {# модов, которые {versionPossiblyCompatible, plural, one {возможно} other {возможно}} несовместимы с вашей игрой}}", ++ "profile-change-queued" : "Изменения в файлы модов ещё не внесены. Нажмите кнопку ниже, чтобы применить новый профиль.\n\nВы в режиме \"Запуск вручную\"", ++ "ready" : "Вы готовы к действию!\n\nПримечание: Менеджер модов уже завершил установку файлов модов. Вы можете запустить игру через обычный лаунчер, и моды всё равно будут загружены.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Один мод} other {# модов}} отмечен как неисправный для этой версии игры. Ознакомьтесь с описанием или примечаниями по совместимости {versionIncompatible, plural, one {этого мода} other {этих модов}} для получения дополнительной информации.", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Один мод} other {# модов}} отмечен как повреждённый для этой версии игры. Ознакомьтесь с описанием или примечаниями по совместимости {versionIncompatible, plural, one {этого мода} other {этих модов}} для получения дополнительной информации.", ++ "you-have-warning-mods" : "У вас:" ++ }, ++ "left-bar" : { ++ "export" : "Экспортировать", ++ "ficsit-app" : "ficsit.app (Репозиторий модов)", ++ "game-version" : "Выберите установку игры", ++ "help" : "Помощь", ++ "install-invalid" : "Недействительный", ++ "install-invalid-tooltip" : "Статус: SMM не может управлять этой установкой", ++ "install-loading" : "Загрузка...", ++ "install-loading-tooltip" : "Статус: Загрузка...", ++ "install-unknown" : "Неизвестно", ++ "install-unknown-tooltip" : "Статус: Не удалось получить информацию об этой установке", ++ "links" : "Ссылки", ++ "manage-servers" : "Управление серверами", ++ "mods-off" : "Моды отключены", ++ "mods-on" : "Моды включены", ++ "other" : "Другое", ++ "profile" : "Профиль", ++ "queue-blocking-switching-tooltip" : "{number, plural, one { У вас в очереди {number} действие. Примените или отмените {number, plural, one {его} other {их}} перед сменой установок или профилей.} other {У вас в очереди {number} действия. Примените или отмените {number, plural, one {его} other {их}} перед сменой установок или профилей.}}", ++ "satisfactory-modding-discord" : "Discord для модификаций Satisfactory", ++ "smm-github" : "SMM на GitHub", ++ "updates" : "Обновления" ++ }, ++ "mod-changelog" : { ++ "title" : "История изменений <1>{mod}" ++ }, ++ "mod-details" : { ++ "change-version" : "Изменить версию", ++ "change-version-any" : "Любая", ++ "change-version-or-newer" : "или новее", ++ "changelogs" : "История изменений", ++ "compatibility" : "Совместимость", ++ "compatibility-branch" : "Этот мод был отмечен как {state} на {branch}.", ++ "compatibility-unknown" : "Неизвестно", ++ "compatibility-unknown-tooltip" : "Информация о совместимости для этого мода ещё не предоставлена. Попробуйте его и свяжитесь с нами в Discord, чтобы обновить данные!", ++ "contributors" : "Авторы <1>({authors})", ++ "created" : "Создан", ++ "downloads" : "Всего скачиваний", ++ "installed-version" : "Установленная версия", ++ "latest-version" : "Последняя версия", ++ "mod-author" : "Мод от:", ++ "offline-mode" : "Офлайн-режим включён. История изменений и описания недоступны.", ++ "size" : "Размер", ++ "updated" : "Обновлено", ++ "view-on-ficsit-app" : "Посмотреть на ficsit.app", ++ "views" : "Просмотры" ++ }, ++ "mod-list-item" : { ++ "by-author" : "от", ++ "compatibility-note" : "Этот мод отмечен как {state} на этой версии игры.", ++ "compatibility-note-none" : "(Не указано)", ++ "compatibility-warning" : "Обнаружены проблемы с этим модом, но вы всё равно можете попробовать его установить. Подробности:", ++ "dependency" : " Этот мод установлен как зависимость другого мода. Его нельзя установить или удалить отдельно.", ++ "disable" : "Этот мод включён в данном профиле. Нажмите, чтобы отключить его — это предотвратит его загрузку при запуске игры, но он останется частью профиля.", ++ "disable-queued" : "Этот мод поставлен в очередь на отключение. Нажмите, чтобы отменить операцию.", ++ "disabled-tooltip" : "Этот мод отключён. Нажмите на значок паузы, чтобы включить его.", ++ "enable" : "Нажмите, чтобы включить этот мод.", ++ "enable-queued" : "Этот мод поставлен в очередь на включение. Нажмите, чтобы отменить операцию.", ++ "favorite" : "Нажмите, чтобы добавить этот мод в избранное. Избранные моды не обязательно должны быть установлены — это просто способ отслеживать их для будущего, независимо от выбранного профиля.", ++ "hidden" : "Этот мод был скрыт автором.", ++ "install" : "Нажмите, чтобы установить этот мод.", ++ "no-tags" : "(не доступно)", ++ "not-installable" : "Вы не можете установить этот мод. Причина:", ++ "queued" : "Этот мод уже поставлен в очередь на другую операцию.", ++ "queued-install" : "Этот мод поставлен в очередь на установку. Нажмите, чтобы отменить операцию.", ++ "queued-uninstall" : "Этот мод поставлен в очередь на удаление. Нажмите, чтобы отменить операцию.", ++ "unavailable" : "Этот мод больше недоступен на ficsit.app. Возможно, вам стоит его удалить.", ++ "unfavorite" : "Нажмите, чтобы удалить этот мод из избранного.", ++ "uninstall" : "Этот мод установлен в данном профиле. Нажмите, чтобы удалить этот мод.", ++ "wait" : "Подождите завершения текущей операции." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Дополнительные заметки отсутствуют)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Все моды", ++ "compatible" : "Совместимые", ++ "dependency" : "Зависимые", ++ "disabled" : "Отключённые", ++ "enabled" : "Включённые", ++ "favorite" : "Избранные", ++ "installed" : "Установленные", ++ "not-installed" : "Не установленные", ++ "queued" : "В очереди" ++ }, ++ "order-by" : { ++ "downloads" : "Загрузки", ++ "hotness" : "Популярность", ++ "last-updated" : "Последнее обновление", ++ "name" : "Название", ++ "popularity" : "Популярность", ++ "views" : "Просмотры" ++ }, ++ "search" : "Поиск модов" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : " Нет модов, соответствующих вашим фильтрам", ++ "no-mods-found" : "Моды не найдены", ++ "show-all" : "Показать все" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Название профиля", ++ "profile-name-placeholder" : "Новое имя профиля", ++ "title" : "Добавить профиль" ++ }, ++ "delete" : { ++ "profile-name" : "Название профиля", ++ "title" : "Удалить профиль" ++ }, ++ "import" : { ++ "profile-file" : "Файл профиля", ++ "profile-name" : "Название профиля", ++ "profile-name-placeholder" : "Новое имя профиля", ++ "profile-version-warning" : "Этот профиль создан в более новой версии игры. Он может быть несовместим с данной версией.", ++ "title" : "Импортировать профиль" ++ }, ++ "rename" : { ++ "new-profile" : "Новое имя профиля", ++ "new-profile-placeholder" : "Новый профиль", ++ "old-profile" : "Старое имя профиля", ++ "old-profile-placeholder" : "Старый профиль", ++ "title" : "Переименовать профиль" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Добавить", ++ "advanced-note" : "Учтите, что вам, возможно, придётся экранировать определённые символы в имени пользователя и пароле", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : "Не удалось подключиться к серверу, нажмите для повторной попытки", ++ "get-help" : "Получить помощь по подключению к серверам", ++ "host-placeholder" : "хост", ++ "invalid" : "SMM не может управлять этой установкой", ++ "loading" : "Загрзука...", ++ "local-path-placeholder" : "C:\\Путь\\До\\Сервера", ++ "name-placeholder" : "Имя (по умолчанию: {default})", ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : "пароль", ++ "path-placeholder" : "путь", ++ "port-placeholder" : "порт (по умолчанию: {default})", ++ "switch-to-advanced" : "Переключиться в расширенный режим", ++ "switch-to-simple" : "Переключиться в простой режим", ++ "title" : "Выделенные серверы", ++ "username-placeholder" : "имя пользователя", ++ "validating" : "Проверка..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Не удалось получить список директории", ++ "failed-valid-check" : "Не удалось проверить, является ли выбранный путь корректным сервером" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Расположение кеша", ++ "reset" : "Сбросить по умолчанию", ++ "save" : "Сохранить и переместить", ++ "title" : "Изменить расположение кеша загрузок" ++ }, ++ "change-cache-location" : "Изменить расположение кеша", ++ "copy-mod-list" : "Копировать список модов", ++ "debug" : "Отладка", ++ "generate-debug-info" : "Создать информацию для отладки", ++ "go-online-offline" : "Перейти {offline, select, true {в онлайн} other {в офлайн}}", ++ "language" : "Язык", ++ "launch-button" : "Кнопка запуска", ++ "launch-button.button" : "Кнопка", ++ "launch-button.cat" : "Ньян", ++ "launch-button.normal" : "Обычный", ++ "proxy" : { ++ "proxy" : "Прокси", ++ "remove" : "Удалить прокси", ++ "save" : "Сохранить и перезапустить", ++ "title" : "Установить прокси" ++ }, ++ "queue" : "Очередь", ++ "queue.start-immediately" : "Начать немедленно", ++ "queue.start-manually" : "Запуск вручную", ++ "save-window-position" : "Сохранить положение окна", ++ "secret-settings" : "Секретные настройки", ++ "set-proxy" : "Настроить прокси", ++ "settings" : "Настройки", ++ "smm-debug-logging" : "Логирование отладки SMM", ++ "start-view" : "Стартовый экран", ++ "start-view.compact" : "Компактный", ++ "start-view.expanded" : "Расширенный", ++ "title" : "Настройки менеджера модов", ++ "update-check" : "Проверка обновлений", ++ "update-check.ask" : "Спрашивать при обнаружении", ++ "update-check.on-exit" : "При выходе", ++ "update-check.on-start" : "При запуске" ++ }, ++ "smm-update" : { ++ "downloading" : "Загрузка в фоновом режиме", ++ "downloading-stats" : "Загрузка обновления: {current} / {total}, {speed}/с, ETA {eta}", ++ "title" : "Доступно обновление SMM - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Улучшенная производительность", ++ "performance.description" : "Поддерживаем вашу эффективность!", ++ "platform_support" : "Родная поддержка Linux Heroic, Steam Snap, Mac", ++ "platform_support.description" : "Получите сборку из релизов на GitHub, если ещё не сделали этого!", ++ "profile_format" : "Новый формат профиля", ++ "profile_format.description" : "Профили SMM2 несовместимы с SMM3! Ваши текущие профили были автоматически перенесены, но вы не сможете импортировать профили, созданные в SMM2.", ++ "queue" : "Очередь действий", ++ "queue.description" : "Ставьте в очередь несколько загрузок/удалений модов одновременно.", ++ "servers" : "Управление выделенными серверами", ++ "servers.description" : "Легко управляйте серверами через файловую систему, SFTP, FTP и SMB!", ++ "translation" : "Поддержка переводов", ++ "translation.description" : "Присоединяйтесь к нашему Discord, чтобы помочь с переводом SMM на ваш язык!", ++ "ui" : "Обновление интерфейса пользователя", ++ "ui.description" : "Новый облик в честь релиза Satisfactory 1.0!" ++ }, ++ "intro" : "Мы внесли множество улучшений в этой версии. Вот основные моменты:", ++ "open_guide" : "Открыть документацию SMM3", ++ "title" : "Добро пожаловать в Satisfactory Mod Manager версии 3!" ++ }, ++ "updates" : { ++ "changelog" : "История изменений", ++ "check-for-updates" : "Проверить обновления", ++ "checking-for-updates" : "Проверка обновлений...", ++ "hide-ignored" : "Скрыть проигнорированные", ++ "ignore" : "Игнорировать", ++ "mod-update-available" : "{updates, plural, one {доступно обновление мода {updates}} other {доступны обновления модов {updates}}}", ++ "no-updates" : "Сейчас нет доступных обновлений модов или SMM", ++ "show-ignored" : "Показать проигнорированные", ++ "smm-update-available" : "Доступно обновление SMM", ++ "title" : "Обновления", ++ "unignore" : "Прекратить игнорировать", ++ "update-all" : "Обновить всё", ++ "update-selected" : "Обновить выбранные" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/tr.json b/frontend/src/lib/generated/i18n/tr.json +new file mode 100644 +index 0000000..8abbb23 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/tr.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : null, ++ "go-online" : null, ++ "healthcheck" : null, ++ "offline" : null ++ }, ++ "common" : { ++ "add" : null, ++ "cancel" : null, ++ "close" : null, ++ "delete" : null, ++ "import" : null, ++ "loading" : null, ++ "rename" : null ++ }, ++ "error" : { ++ "failed_to_generate_debug" : null, ++ "generate_debug_info" : null, ++ "help" : null, ++ "invalid_installs" : null, ++ "no_installs" : null, ++ "open_log_docs" : null, ++ "open_modding_discord" : null, ++ "open_modding_discord.must_generate_debug_first" : null, ++ "reporting_directions" : null, ++ "title" : null ++ }, ++ "external-install-mod" : { ++ "already-installed" : null, ++ "error-loading" : null, ++ "in-queue" : null, ++ "install" : null, ++ "latest-version" : null, ++ "title" : null, ++ "version" : null ++ }, ++ "first_time_setup" : { ++ "acknowledge" : null, ++ "change_later_hint" : null, ++ "intro" : null, ++ "open_welcome_guide" : null, ++ "option" : { ++ "language" : { ++ "title" : null ++ }, ++ "queue-auto-start" : { ++ "disabled" : null, ++ "enabled" : null, ++ "title" : null ++ } ++ }, ++ "title" : null ++ }, ++ "launch-button" : { ++ "apply-profile-change" : null, ++ "apply-queued" : null, ++ "are-you-sure-warning" : null, ++ "cant-launch" : null, ++ "cant-launch-tooltip" : null, ++ "changes-queued" : null, ++ "game-running" : null, ++ "incompatible-mods" : null, ++ "launch-in-progress" : null, ++ "operation-in-progress" : null, ++ "play" : null, ++ "possibly-incompatible-mods" : null, ++ "profile-change-queued" : null, ++ "ready" : null, ++ "reported-incompatible-mods" : null, ++ "reported-possibly-compatible-mods" : null, ++ "you-have-warning-mods" : null ++ }, ++ "left-bar" : { ++ "export" : null, ++ "ficsit-app" : null, ++ "game-version" : null, ++ "help" : null, ++ "install-invalid" : null, ++ "install-invalid-tooltip" : null, ++ "install-loading" : null, ++ "install-loading-tooltip" : null, ++ "install-unknown" : null, ++ "install-unknown-tooltip" : null, ++ "links" : null, ++ "manage-servers" : null, ++ "mods-off" : null, ++ "mods-on" : null, ++ "other" : null, ++ "profile" : null, ++ "queue-blocking-switching-tooltip" : null, ++ "satisfactory-modding-discord" : null, ++ "smm-github" : null, ++ "updates" : null ++ }, ++ "mod-changelog" : { ++ "title" : null ++ }, ++ "mod-details" : { ++ "change-version" : null, ++ "change-version-any" : null, ++ "change-version-or-newer" : null, ++ "changelogs" : null, ++ "compatibility" : null, ++ "compatibility-branch" : null, ++ "compatibility-unknown" : null, ++ "compatibility-unknown-tooltip" : null, ++ "contributors" : null, ++ "created" : null, ++ "downloads" : null, ++ "installed-version" : null, ++ "latest-version" : null, ++ "mod-author" : null, ++ "offline-mode" : null, ++ "size" : null, ++ "updated" : null, ++ "view-on-ficsit-app" : null, ++ "views" : null ++ }, ++ "mod-list-item" : { ++ "by-author" : null, ++ "compatibility-note" : null, ++ "compatibility-note-none" : null, ++ "compatibility-warning" : null, ++ "dependency" : null, ++ "disable" : null, ++ "disable-queued" : null, ++ "disabled-tooltip" : null, ++ "enable" : null, ++ "enable-queued" : null, ++ "favorite" : null, ++ "hidden" : null, ++ "install" : null, ++ "no-tags" : null, ++ "not-installable" : null, ++ "queued" : null, ++ "queued-install" : null, ++ "queued-uninstall" : null, ++ "unavailable" : null, ++ "unfavorite" : null, ++ "uninstall" : null, ++ "wait" : null ++ }, ++ "mod" : { ++ "compatibility-no-notes" : null ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : null, ++ "compatible" : null, ++ "dependency" : null, ++ "disabled" : null, ++ "enabled" : null, ++ "favorite" : null, ++ "installed" : null, ++ "not-installed" : null, ++ "queued" : null ++ }, ++ "order-by" : { ++ "downloads" : null, ++ "hotness" : null, ++ "last-updated" : null, ++ "name" : null, ++ "popularity" : null, ++ "views" : null ++ }, ++ "search" : null ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : null, ++ "no-mods-found" : null, ++ "show-all" : null ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : null, ++ "profile-name-placeholder" : null, ++ "title" : null ++ }, ++ "delete" : { ++ "profile-name" : null, ++ "title" : null ++ }, ++ "import" : { ++ "profile-file" : null, ++ "profile-name" : null, ++ "profile-name-placeholder" : null, ++ "profile-version-warning" : null, ++ "title" : null ++ }, ++ "rename" : { ++ "new-profile" : null, ++ "new-profile-placeholder" : null, ++ "old-profile" : null, ++ "old-profile-placeholder" : null, ++ "title" : null ++ } ++ }, ++ "server-manager" : { ++ "add" : null, ++ "advanced-note" : null, ++ "advanced-path-placeholder" : null, ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : null, ++ "get-help" : null, ++ "host-placeholder" : null, ++ "invalid" : null, ++ "loading" : null, ++ "local-path-placeholder" : null, ++ "name-placeholder" : null, ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : null, ++ "path-placeholder" : null, ++ "port-placeholder" : null, ++ "switch-to-advanced" : null, ++ "switch-to-simple" : null, ++ "title" : null, ++ "username-placeholder" : null, ++ "validating" : null ++ }, ++ "server-picker" : { ++ "failed-list-dir" : null, ++ "failed-valid-check" : null ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : null, ++ "reset" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "change-cache-location" : null, ++ "copy-mod-list" : null, ++ "debug" : null, ++ "generate-debug-info" : null, ++ "go-online-offline" : null, ++ "language" : null, ++ "launch-button" : null, ++ "launch-button.button" : null, ++ "launch-button.cat" : null, ++ "launch-button.normal" : null, ++ "proxy" : { ++ "proxy" : null, ++ "remove" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "queue" : null, ++ "queue.start-immediately" : null, ++ "queue.start-manually" : null, ++ "save-window-position" : null, ++ "secret-settings" : null, ++ "set-proxy" : null, ++ "settings" : null, ++ "smm-debug-logging" : null, ++ "start-view" : null, ++ "start-view.compact" : null, ++ "start-view.expanded" : null, ++ "title" : null, ++ "update-check" : null, ++ "update-check.ask" : null, ++ "update-check.on-exit" : null, ++ "update-check.on-start" : null ++ }, ++ "smm-update" : { ++ "downloading" : null, ++ "downloading-stats" : null, ++ "title" : null ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : null, ++ "performance.description" : null, ++ "platform_support" : null, ++ "platform_support.description" : null, ++ "profile_format" : null, ++ "profile_format.description" : null, ++ "queue" : null, ++ "queue.description" : null, ++ "servers" : null, ++ "servers.description" : null, ++ "translation" : null, ++ "translation.description" : null, ++ "ui" : null, ++ "ui.description" : null ++ }, ++ "intro" : null, ++ "open_guide" : null, ++ "title" : null ++ }, ++ "updates" : { ++ "changelog" : null, ++ "check-for-updates" : null, ++ "checking-for-updates" : null, ++ "hide-ignored" : null, ++ "ignore" : null, ++ "mod-update-available" : null, ++ "no-updates" : null, ++ "show-ignored" : null, ++ "smm-update-available" : null, ++ "title" : null, ++ "unignore" : null, ++ "update-all" : null, ++ "update-selected" : null ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/zh-Hans.json b/frontend/src/lib/generated/i18n/zh-Hans.json +new file mode 100644 +index 0000000..ee8f53b +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/zh-Hans.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "进入离线模式", ++ "go-online" : "进入在线模式", ++ "healthcheck" : "无法访问模组仓库 ficsit.app。检查网络连接，或使用离线模式。（设置 > 进入离线模式）", ++ "offline" : "您目前处于离线状态。某些功能不可用。（设置 > 进入在线模式）" ++ }, ++ "common" : { ++ "add" : "添加", ++ "cancel" : "取消", ++ "close" : "关闭", ++ "delete" : "删除", ++ "import" : "导入", ++ "loading" : "加载中…", ++ "rename" : "重命名" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "生成调试文件时发生错误。请手动查看模组管理器日志文件以获取更多信息，并在Discord上报告此信息。点击下方按钮可打开文档查看详细步骤。", ++ "generate_debug_info" : "生成调试信息", ++ "help" : "出错了？点击下方按钮并将生成的 zip 文件发送到 <1>模组 Discord 的 #help-using-mods 频道。", ++ "invalid_installs" : "{invalidInstalls, plural, other {已找到 {invalidInstalls} 个无效的幸福工厂安装路径}}", ++ "no_installs" : "未找到到幸福工厂安装路径", ++ "open_log_docs" : "打开日志说明文档", ++ "open_modding_discord" : "打开模组社区 Discord", ++ "open_modding_discord.must_generate_debug_first" : "需要首先生成调试信息", ++ "reporting_directions" : "出错了？点击下方按钮收集日志，然后将生成的 zip 文件发送到模组 Discord 的 #help-using-mods 频道。", ++ "title" : "出错了！" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "已安装", ++ "error-loading" : "加载模组详细信息时出错", ++ "in-queue" : "在队列中", ++ "install" : "安装", ++ "latest-version" : "最新版本", ++ "title" : "安装模组", ++ "version" : "版本 {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "开始使用！", ++ "change_later_hint" : "随时可在“模组管理器设置”菜单中更改这些设置。", ++ "intro" : "开始前，请选择您的使用偏好。", ++ "open_welcome_guide" : "开启欢迎指南", ++ "option" : { ++ "language" : { ++ "title" : "使用下列可用的语言：" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "等待“应用”键按下", ++ "enabled" : "立即应用更改", ++ "title" : "当增删模组或切换配置文件时..." ++ } ++ }, ++ "title" : "欢迎使用幸福工程模组管理器！" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "应用 {profile}", ++ "apply-queued" : "应用 {queued} 个更新", ++ "are-you-sure-warning" : "您确定要启动吗？", ++ "cant-launch" : "SMM 无法启动游戏", ++ "cant-launch-tooltip" : "模组管理器无法启动该游戏版本，但仍会管理您的模组文件。您可从游戏启动器正常启动幸福工厂。", ++ "changes-queued" : "模组文件尚未进行更改。单击下方按钮以应用已排队的更改。\n\n（队列模式为手动开始）", ++ "game-running" : "游戏启动器显示游戏已在运行（或在关闭中）", ++ "incompatible-mods" : "{versionIncompatible, plural, other {{versionIncompatible} 个不兼容的模组，游戏可能无法加载或崩溃}}", ++ "launch-in-progress" : "启动中…", ++ "operation-in-progress" : "正在进行操作。", ++ "play" : "幸福工厂 启动", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, other {{versionPossiblyCompatible} 个模组可能与您的游戏不兼容}}", ++ "profile-change-queued" : "模组文件尚未进行更改。单击以应用新配置。\n\n（队列模式为手动开始）", ++ "ready" : "准备就绪！\n\n注意：模组管理器已经为您完成了模组的安装。也可以从游戏启动器正常启动游戏，模组仍会加载。", ++ "reported-incompatible-mods" : "{reportedPossiblyCompatible} 个模组已被报告损坏，请阅读模组描述或兼容性说明", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible} 个模组已被报告危险，请阅读模组描述或兼容性说明", ++ "you-have-warning-mods" : "您有：" ++ }, ++ "left-bar" : { ++ "export" : "导出", ++ "ficsit-app" : "ficsit.app（模组仓库）", ++ "game-version" : "选择已安装游戏", ++ "help" : "帮助", ++ "install-invalid" : "无效", ++ "install-invalid-tooltip" : "状态：SMM 无法管理此游戏版本", ++ "install-loading" : "加载中…", ++ "install-loading-tooltip" : "状态：加载中…", ++ "install-unknown" : "未知", ++ "install-unknown-tooltip" : "状态：无法获取有关此游戏版本的信息", ++ "links" : "链接", ++ "manage-servers" : "服务器管理", ++ "mods-off" : "关闭模组", ++ "mods-on" : "开启模组", ++ "other" : "其他选项", ++ "profile" : "配置文件", ++ "queue-blocking-switching-tooltip" : "{number, plural, other {您有 {number} 个已排队的操作。在切换游戏或配置前，请应用或取消这些操作。}}", ++ "satisfactory-modding-discord" : "幸福工厂模组 Discord", ++ "smm-github" : "SMM GitHub", ++ "updates" : "更新" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} 更新日志" ++ }, ++ "mod-details" : { ++ "change-version" : "更改版本", ++ "change-version-any" : "任意版本", ++ "change-version-or-newer" : "或更新", ++ "changelogs" : "更新日志", ++ "compatibility" : "兼容性", ++ "compatibility-branch" : "该模组在 {branch} 中被报告 {state}。", ++ "compatibility-unknown" : "未知", ++ "compatibility-unknown-tooltip" : "目前没有报告兼容性信息。请测试并在 Discord 上联系我们，以保持更新。", ++ "contributors" : "贡献者 <1>（{authors}）", ++ "created" : "创建于", ++ "downloads" : "下载量", ++ "installed-version" : "已安装版本", ++ "latest-version" : "最新版本", ++ "mod-author" : "作者：", ++ "offline-mode" : "离线模式已启用。无法浏览更新日志和模组详情。", ++ "size" : "大小", ++ "updated" : "更新于", ++ "view-on-ficsit-app" : "在 ficsit.app 上查看", ++ "views" : "浏览量" ++ }, ++ "mod-list-item" : { ++ "by-author" : "by", ++ "compatibility-note" : "该模组在当前游戏版本中被报告 {state}。", ++ "compatibility-note-none" : "（无详情）", ++ "compatibility-warning" : "该模组被报告存在问题，但您仍然可以尝试安装它。详情：", ++ "dependency" : "该模组为其他模组的依赖项。无法单独安装或卸载。", ++ "disable" : "该模组已启用于本配置文件。单击以禁用模组，启动游戏时不加载此模组，但其仍将保留在本配置文件中。", ++ "disable-queued" : "该模组正在等待禁用。单击以取消操作。", ++ "disabled-tooltip" : "该模组已禁用。单击暂停图标以启用模组。", ++ "enable" : "单击以启用模组。", ++ "enable-queued" : "该模组正在等待启用。单击以取消操作。", ++ "favorite" : "单击以添加到收藏夹。模组收藏仅为当前配置档的标记，与它是否安装无关。", ++ "hidden" : "该模组已被作者隐藏。", ++ "install" : "单击以安装此模组。", ++ "no-tags" : "（暂无标签）", ++ "not-installable" : "无法安装此模组。原因：", ++ "queued" : "该模组已排队等候另一项操作。", ++ "queued-install" : "该模组正在等待安装。单击以取消操作。", ++ "queued-uninstall" : "该模组正在等待卸载。单击以取消操作。", ++ "unavailable" : "该模组在 ficsit.app 上不再可用。您或许可以将其删除。", ++ "unfavorite" : "单击以取消收藏。", ++ "uninstall" : "该模组已安装于本配置文件。单击以卸载模组。", ++ "wait" : "等待当前操作完成。" ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "（未提供更多信息）" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "所有模组", ++ "compatible" : "版本兼容", ++ "dependency" : "依赖项", ++ "disabled" : "已禁用", ++ "enabled" : "已启用", ++ "favorite" : "已收藏", ++ "installed" : "已安装", ++ "not-installed" : "未安装", ++ "queued" : "准备安装" ++ }, ++ "order-by" : { ++ "downloads" : "下载量", ++ "hotness" : "近期热度", ++ "last-updated" : "最近更新", ++ "name" : "名称", ++ "popularity" : "近期人气", ++ "views" : "浏览量" ++ }, ++ "search" : "搜索模组" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "没有符合条件的模组", ++ "no-mods-found" : "未找到模组", ++ "show-all" : "展示所有" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "配置名", ++ "profile-name-placeholder" : "新配置名称", ++ "title" : "添加配置文件" ++ }, ++ "delete" : { ++ "profile-name" : "配置名", ++ "title" : "删除配置文件" ++ }, ++ "import" : { ++ "profile-file" : "配置文件", ++ "profile-name" : "配置名", ++ "profile-name-placeholder" : "新配置名称", ++ "profile-version-warning" : "此配置文件是使用较新版本的游戏创建的。可能与此版本不兼容。", ++ "title" : "导入配置文件" ++ }, ++ "rename" : { ++ "new-profile" : "新配置", ++ "new-profile-placeholder" : "新配置名称", ++ "old-profile" : "旧配置", ++ "old-profile-placeholder" : "旧配置名称", ++ "title" : "重命名配置文件" ++ } ++ }, ++ "server-manager" : { ++ "add" : "添加", ++ "advanced-note" : "请注意转义用户名和密码中的某些字符", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : "服务器连接失败，请点击重试", ++ "get-help" : "获取连接到服务器的帮助", ++ "host-placeholder" : "主机地址", ++ "invalid" : "SMM 无法管理此服务器", ++ "loading" : "加载中…", ++ "local-path-placeholder" : "服务器路径 C:\\...", ++ "name-placeholder" : "用户名（默认：{default}）", ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : "密码", ++ "path-placeholder" : "路径", ++ "port-placeholder" : "端口（默认：{default}）", ++ "switch-to-advanced" : "切换到高级模式", ++ "switch-to-simple" : "切换到简单模式", ++ "title" : "独立服务器", ++ "username-placeholder" : "用户名", ++ "validating" : "验证中…" ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "无法列出目录", ++ "failed-valid-check" : "无法检查所选路径是否为有效服务器" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "缓存路径", ++ "reset" : "重置为默认", ++ "save" : "保存并移动", ++ "title" : "更改下载缓存路径" ++ }, ++ "change-cache-location" : "更改缓存路径", ++ "copy-mod-list" : "复制模组列表", ++ "debug" : "调试", ++ "generate-debug-info" : "生成调试信息", ++ "go-online-offline" : "进入{offline, select, true {在线} other {离线}}模式", ++ "language" : "语言", ++ "launch-button" : "启动按钮", ++ "launch-button.button" : "按钮", ++ "launch-button.cat" : "彩虹猫", ++ "launch-button.normal" : "正常", ++ "proxy" : { ++ "proxy" : "代理", ++ "remove" : "删除代理", ++ "save" : "保存并重启", ++ "title" : "代理设置" ++ }, ++ "queue" : "更新队列", ++ "queue.start-immediately" : "立即开始", ++ "queue.start-manually" : "手动开始", ++ "save-window-position" : null, ++ "secret-settings" : "神秘设置", ++ "set-proxy" : "代理设置", ++ "settings" : "设置", ++ "smm-debug-logging" : "记录 SMM 调试日志", ++ "start-view" : "启动时样式", ++ "start-view.compact" : "紧凑", ++ "start-view.expanded" : "展开", ++ "title" : "模组管理器设置", ++ "update-check" : "检查更新", ++ "update-check.ask" : "查询到更新时", ++ "update-check.on-exit" : "退出时", ++ "update-check.on-start" : "启动时" ++ }, ++ "smm-update" : { ++ "downloading" : "后台下载", ++ "downloading-stats" : "更新下载中：{current}/{total}，{speed}/s，预计 {eta}", ++ "title" : "有可用的 SMM 更新 - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "性能提升", ++ "performance.description" : "让您保持高效！", ++ "platform_support" : "原生支持Linux Heroic、Steam Snap 和 Mac", ++ "platform_support.description" : "没有的话可以从 GitHub releases 下载构建版。", ++ "profile_format" : "新的配置文件格式", ++ "profile_format.description" : "SMM2 配置文件与 SMM3 不兼容！您现有的配置文件已自动迁移，但无法导入任何 SMM2 创建的配置文件。", ++ "queue" : "行动队列", ++ "queue.description" : "一次性排队下载/卸载多个模组。", ++ "servers" : "独立服务器管理", ++ "servers.description" : "可通过文件系统、SFTP、FTP 和 SMB 轻松管理服务器！", ++ "translation" : "支持多语言翻译", ++ "translation.description" : "加入 Discord，将 SMM 翻译成您的语言！", ++ "ui" : "全新的用户界面", ++ "ui.description" : "焕然一新的皮肤，庆祝幸福工厂1.0！" ++ }, ++ "intro" : "我们在这个版本中做了很多改进。以下是其中的一些亮点：", ++ "open_guide" : "打开 SMM3 文档", ++ "title" : "欢迎使用幸福工厂模组管理器 v3！" ++ }, ++ "updates" : { ++ "changelog" : "更新日志", ++ "check-for-updates" : "检查更新", ++ "checking-for-updates" : "正在检查更新…", ++ "hide-ignored" : "隐藏已忽略", ++ "ignore" : "忽略", ++ "mod-update-available" : "{updates, plural, other {{updates} 个模组可更新}}", ++ "no-updates" : "暂无 SMM 和模组更新", ++ "show-ignored" : "显示已忽略", ++ "smm-update-available" : "已准备好 SMM 更新", ++ "title" : "更新", ++ "unignore" : "取消忽略", ++ "update-all" : "更新全部", ++ "update-selected" : "更新所选" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/zh-Hant.json b/frontend/src/lib/generated/i18n/zh-Hant.json +new file mode 100644 +index 0000000..2977a11 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/zh-Hant.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "進入離線模式", ++ "go-online" : "進入在線模式", ++ "healthcheck" : null, ++ "offline" : null ++ }, ++ "common" : { ++ "add" : "添加", ++ "cancel" : "取消", ++ "close" : "關閉", ++ "delete" : "刪除", ++ "import" : "匯入", ++ "loading" : "載入中...", ++ "rename" : "重新命名" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : null, ++ "generate_debug_info" : null, ++ "help" : null, ++ "invalid_installs" : null, ++ "no_installs" : null, ++ "open_log_docs" : null, ++ "open_modding_discord" : null, ++ "open_modding_discord.must_generate_debug_first" : null, ++ "reporting_directions" : null, ++ "title" : "出錯了！" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "已安裝", ++ "error-loading" : null, ++ "in-queue" : null, ++ "install" : "安裝", ++ "latest-version" : null, ++ "title" : "安裝模組", ++ "version" : null ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "開始使用！", ++ "change_later_hint" : null, ++ "intro" : null, ++ "open_welcome_guide" : "開啟歡迎指南", ++ "option" : { ++ "language" : { ++ "title" : null ++ }, ++ "queue-auto-start" : { ++ "disabled" : null, ++ "enabled" : "立即套用變更", ++ "title" : null ++ } ++ }, ++ "title" : null ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "套用 {profile}", ++ "apply-queued" : "套用 {queued} 個更新", ++ "are-you-sure-warning" : null, ++ "cant-launch" : null, ++ "cant-launch-tooltip" : null, ++ "changes-queued" : null, ++ "game-running" : null, ++ "incompatible-mods" : null, ++ "launch-in-progress" : null, ++ "operation-in-progress" : null, ++ "play" : null, ++ "possibly-incompatible-mods" : null, ++ "profile-change-queued" : null, ++ "ready" : null, ++ "reported-incompatible-mods" : null, ++ "reported-possibly-compatible-mods" : null, ++ "you-have-warning-mods" : "您有：" ++ }, ++ "left-bar" : { ++ "export" : "匯出", ++ "ficsit-app" : "ficsit.app（模組儲存庫）", ++ "game-version" : "選擇已安裝遊戲", ++ "help" : "幫助", ++ "install-invalid" : null, ++ "install-invalid-tooltip" : null, ++ "install-loading" : null, ++ "install-loading-tooltip" : null, ++ "install-unknown" : null, ++ "install-unknown-tooltip" : null, ++ "links" : null, ++ "manage-servers" : null, ++ "mods-off" : null, ++ "mods-on" : null, ++ "other" : null, ++ "profile" : "設定檔", ++ "queue-blocking-switching-tooltip" : null, ++ "satisfactory-modding-discord" : null, ++ "smm-github" : "SMM GitHub", ++ "updates" : null ++ }, ++ "mod-changelog" : { ++ "title" : null ++ }, ++ "mod-details" : { ++ "change-version" : "變更版本", ++ "change-version-any" : null, ++ "change-version-or-newer" : null, ++ "changelogs" : "變更日誌", ++ "compatibility" : null, ++ "compatibility-branch" : null, ++ "compatibility-unknown" : null, ++ "compatibility-unknown-tooltip" : null, ++ "contributors" : null, ++ "created" : null, ++ "downloads" : null, ++ "installed-version" : null, ++ "latest-version" : null, ++ "mod-author" : null, ++ "offline-mode" : null, ++ "size" : null, ++ "updated" : null, ++ "view-on-ficsit-app" : null, ++ "views" : null ++ }, ++ "mod-list-item" : { ++ "by-author" : null, ++ "compatibility-note" : null, ++ "compatibility-note-none" : "（無詳情）", ++ "compatibility-warning" : null, ++ "dependency" : "此模組是其他模組的依賴。它不能單獨安裝或移除。", ++ "disable" : null, ++ "disable-queued" : null, ++ "disabled-tooltip" : null, ++ "enable" : null, ++ "enable-queued" : null, ++ "favorite" : null, ++ "hidden" : null, ++ "install" : null, ++ "no-tags" : null, ++ "not-installable" : "無法安裝該模組。原因：", ++ "queued" : null, ++ "queued-install" : null, ++ "queued-uninstall" : null, ++ "unavailable" : null, ++ "unfavorite" : null, ++ "uninstall" : null, ++ "wait" : null ++ }, ++ "mod" : { ++ "compatibility-no-notes" : null ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : null, ++ "compatible" : null, ++ "dependency" : null, ++ "disabled" : null, ++ "enabled" : null, ++ "favorite" : null, ++ "installed" : null, ++ "not-installed" : null, ++ "queued" : null ++ }, ++ "order-by" : { ++ "downloads" : null, ++ "hotness" : null, ++ "last-updated" : null, ++ "name" : null, ++ "popularity" : null, ++ "views" : null ++ }, ++ "search" : null ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : null, ++ "no-mods-found" : null, ++ "show-all" : null ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "設定檔名稱", ++ "profile-name-placeholder" : null, ++ "title" : null ++ }, ++ "delete" : { ++ "profile-name" : "設定檔名稱", ++ "title" : null ++ }, ++ "import" : { ++ "profile-file" : "設定檔檔案", ++ "profile-name" : "設定檔名稱", ++ "profile-name-placeholder" : null, ++ "profile-version-warning" : null, ++ "title" : null ++ }, ++ "rename" : { ++ "new-profile" : null, ++ "new-profile-placeholder" : null, ++ "old-profile" : null, ++ "old-profile-placeholder" : null, ++ "title" : null ++ } ++ }, ++ "server-manager" : { ++ "add" : null, ++ "advanced-note" : null, ++ "advanced-path-placeholder" : null, ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : null, ++ "get-help" : "取得連線至伺服器的協助", ++ "host-placeholder" : null, ++ "invalid" : null, ++ "loading" : null, ++ "local-path-placeholder" : "伺服器路徑 C:\\...", ++ "name-placeholder" : null, ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : null, ++ "path-placeholder" : null, ++ "port-placeholder" : null, ++ "switch-to-advanced" : null, ++ "switch-to-simple" : null, ++ "title" : null, ++ "username-placeholder" : null, ++ "validating" : null ++ }, ++ "server-picker" : { ++ "failed-list-dir" : null, ++ "failed-valid-check" : null ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : null, ++ "reset" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "change-cache-location" : null, ++ "copy-mod-list" : null, ++ "debug" : null, ++ "generate-debug-info" : null, ++ "go-online-offline" : null, ++ "language" : null, ++ "launch-button" : null, ++ "launch-button.button" : null, ++ "launch-button.cat" : null, ++ "launch-button.normal" : null, ++ "proxy" : { ++ "proxy" : null, ++ "remove" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "queue" : null, ++ "queue.start-immediately" : null, ++ "queue.start-manually" : null, ++ "save-window-position" : null, ++ "secret-settings" : null, ++ "set-proxy" : null, ++ "settings" : null, ++ "smm-debug-logging" : null, ++ "start-view" : null, ++ "start-view.compact" : null, ++ "start-view.expanded" : null, ++ "title" : null, ++ "update-check" : null, ++ "update-check.ask" : null, ++ "update-check.on-exit" : null, ++ "update-check.on-start" : null ++ }, ++ "smm-update" : { ++ "downloading" : null, ++ "downloading-stats" : null, ++ "title" : null ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : null, ++ "performance.description" : null, ++ "platform_support" : null, ++ "platform_support.description" : null, ++ "profile_format" : null, ++ "profile_format.description" : null, ++ "queue" : null, ++ "queue.description" : null, ++ "servers" : null, ++ "servers.description" : null, ++ "translation" : null, ++ "translation.description" : null, ++ "ui" : null, ++ "ui.description" : null ++ }, ++ "intro" : null, ++ "open_guide" : null, ++ "title" : null ++ }, ++ "updates" : { ++ "changelog" : "變更日誌", ++ "check-for-updates" : null, ++ "checking-for-updates" : null, ++ "hide-ignored" : null, ++ "ignore" : null, ++ "mod-update-available" : null, ++ "no-updates" : null, ++ "show-ignored" : null, ++ "smm-update-available" : null, ++ "title" : null, ++ "unignore" : null, ++ "update-all" : null, ++ "update-selected" : null ++ } ++} +\ No newline at end of file diff --git a/pkgs/by-name/sa/satisfactorymodmanager/dont-vendor-remote-fonts.patch b/pkgs/by-name/sa/satisfactorymodmanager/dont-vendor-remote-fonts.patch new file mode 100644 index 000000000000..bdd785c9de30 --- /dev/null +++ b/pkgs/by-name/sa/satisfactorymodmanager/dont-vendor-remote-fonts.patch @@ -0,0 +1,19 @@ +diff --git a/frontend/postcss.config.cjs b/frontend/postcss.config.cjs +index b315cbc..06e5627 100644 +--- a/frontend/postcss.config.cjs ++++ b/frontend/postcss.config.cjs +@@ -1,4 +1,3 @@ +-const importUrl = require('postcss-import-url'); + const postcssPresetEnv = require('postcss-preset-env'); + const tailwindCSS = require('tailwindcss'); + const tailwindCSSNesting = require('tailwindcss/nesting'); +@@ -12,9 +11,6 @@ module.exports = { + }, + }), + +- importUrl({ +- modernBrowser: true, +- }), + tailwindCSSNesting(), + tailwindCSS(), + ], diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix new file mode 100644 index 000000000000..db3b6e1414a5 --- /dev/null +++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix @@ -0,0 +1,112 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + nodejs, + pnpm_8, + wails, + wrapGAppsHook3, + glib-networking, + makeDesktopItem, + copyDesktopItems, +}: + +buildGoModule rec { + pname = "satisfactorymodmanager"; + version = "3.0.3"; + + src = fetchFromGitHub { + owner = "satisfactorymodding"; + repo = "SatisfactoryModManager"; + tag = "v${version}"; + hash = "sha256-ndvrgSRblm7pVwnGvxpwtGVMEGp+mqpC4kE87lmt36M="; + }; + + patches = [ + # disable postcss-import-url + ./dont-vendor-remote-fonts.patch + + # populates the lib/generated directory + ./add-generated-files.patch + ]; + + postPatch = '' + # don't generate i18n and graphql code + substituteInPlace frontend/package.json \ + --replace-fail '"postinstall":' '"_postinstall":' + ''; + + nativeBuildInputs = [ + nodejs + pnpm_8.configHook + wails + wrapGAppsHook3 + copyDesktopItems + ]; + + buildInputs = [ + glib-networking + ]; + + # we use env because buildGoModule doesn't forward all normal attrs + # this is pretty hacky + env = { + pnpmDeps = pnpm_8.fetchDeps { + inherit pname version src; + sourceRoot = "${src.name}/frontend"; + hash = "sha256-OP+3zsNlvqLFwvm2cnBd2bj2Kc3EghQZE3hpotoqqrQ="; + }; + + pnpmRoot = "frontend"; + }; + + # running this caches some additional dependencies for the FOD + overrideModAttrs = { + preBuild = '' + wails build + ''; + }; + + proxyVendor = true; + + vendorHash = "sha256-3nsJPuwL2Zw/yuHvd8rMSpj9DBBpYUaR19z9TSV/7jg="; + + buildPhase = '' + runHook preBuild + wails build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 build/bin/SatisfactoryModManager -t "$out/bin" + + for i in 16 32 64 128 256 512; do + install -D ./icons/"$i"x"$i".png "$out"/share/icons/hicolor/"$i"x"$i"/apps/SatisfactoryModManager.png + done + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "SatisfactoryModManager"; + desktopName = "Satisfactory Mod Manager"; + exec = "SatisfactoryModManager %u"; + mimeTypes = [ "x-scheme-handler/smmanager" ]; + icon = "SatisfactoryModManager"; + terminal = false; + categories = [ "Game" ]; + }) + ]; + + meta = { + broken = stdenv.hostPlatform.isDarwin; + description = "Mod manager and modloader for Satisfactory"; + homepage = "https://github.com/satisfactorymodding/SatisfactoryModManager"; + license = lib.licenses.gpl3Only; + mainProgram = "SatisfactoryModManager"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 3610ca575654..7fa70a01419d 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.16.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-81WX9GAZ0mPai1/4FrqDGDu6k4OVYrKSJSC/FkPkZmE="; + hash = "sha256-IqXzY4mccwVgRaq1TLr1dSyqSbIvClDyF6ahA6f5UP8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Yfy0IP2RzIv+PvCGb5cK54FN3rBH3CKdBhaPpASirQ0="; + cargoHash = "sha256-xfRuEq7YgyYD9IvEzVAor/Iz4LUBUawDREXtqerDn6A="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix index a9a6a573f46c..cba75e23c2d9 100644 --- a/pkgs/by-name/sa/saucectl/package.nix +++ b/pkgs/by-name/sa/saucectl/package.nix @@ -5,7 +5,7 @@ }: let pname = "saucectl"; - version = "0.194.1"; + version = "0.195.1"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "saucelabs"; repo = "saucectl"; tag = "v${version}"; - hash = "sha256-WsaM1FgbUVcd+6p+OdmIHNs2BVG8lEGgDqY2z9Du7Rg="; + hash = "sha256-OZ35DkZyR/xRFAq0BtF97INHj/9rX5QxfSLQyt87fKQ="; }; ldflags = [ @@ -22,7 +22,7 @@ buildGoModule { "-X github.com/saucelabs/saucectl/internal/version.GitCommit=${version}" ]; - vendorHash = "sha256-N8e8k8vAyVY57iqHU6P88hn9NS3Mdfbgx5P8/wDcmMY="; + vendorHash = "sha256-zRmTAb4Y86bQHW8oEf3oJqYQv81k1PkvjWnGAy2ZOLM="; checkFlags = [ "-skip=^TestNewRequestWithContext$" ]; diff --git a/pkgs/by-name/sa/sauerbraten/package.nix b/pkgs/by-name/sa/sauerbraten/package.nix index 2951641fbf5f..49925da52112 100644 --- a/pkgs/by-name/sa/sauerbraten/package.nix +++ b/pkgs/by-name/sa/sauerbraten/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { cp -r "../docs/"* $out/share/doc/sauerbraten/ cp sauer_client sauer_server $out/share/sauerbraten/ cp -r ../packages ../data $out/share/sauerbraten/ - ln -s $out/share/sauerbraten/cube.png $out/share/icon/sauerbraten.png + ln -s $out/share/sauerbraten/data/cube.png $out/share/icon/sauerbraten.png makeWrapper $out/share/sauerbraten/sauer_server $out/bin/sauerbraten_server \ --chdir "$out/share/sauerbraten" diff --git a/pkgs/by-name/sa/savvycan/package.nix b/pkgs/by-name/sa/savvycan/package.nix new file mode 100644 index 000000000000..210bf16bbbed --- /dev/null +++ b/pkgs/by-name/sa/savvycan/package.nix @@ -0,0 +1,72 @@ +{ + stdenv, + lib, + fetchFromGitHub, + qt5, +}: + +stdenv.mkDerivation rec { + pname = "savvycan"; + version = "220"; + + src = fetchFromGitHub { + owner = "collin80"; + repo = "SavvyCAN"; + rev = "V${version}"; + hash = "sha256-Du6Pc0JePdJNwBaWKKjTMWOmKCnk6Azojh8IJ7I+ngY="; + }; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtserialbus + qt5.qtserialport + qt5.qtdeclarative + ]; + + nativeBuildInputs = [ + qt5.qmake + qt5.wrapQtAppsHook + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/SavvyCAN.app $out/Applications + ln -s $out/Applications/SavvyCAN.app/Contents/MacOS/SavvyCAN $out/bin/SavvyCAN + ''; + + meta = with lib; { + description = "QT based cross platform canbus tool"; + homepage = "https://savvycan.com/"; + changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${version}"; + maintainers = with maintainers; [ simoneruffini ]; + platforms = platforms.all; + license = licenses.mit; + mainProgram = "SavvyCAN"; + longDescription = '' + SavvyCAN is a cross platform QT based C++ program. It is a CAN bus reverse + engineering and capture tool. It was originally written to utilize EVTV + hardware such as the EVTVDue and CANDue hardware. It has since expanded to be + able to use any socketCAN compatible device as well as the Macchina M2 and + Teensy 3.x boards. SavvyCAN can use any CAN interface supported by QT's + SerialBus system (PeakCAN, Vector, SocketCAN, J2534, etc) It can capture and + send to multiple buses and CAN capture devices at once. It has many functions + specifically meant for reverse engineering data found on the CAN bus: + - Ability to capture even very highly loaded buses + - Ability to connect to many dongles simultaneously + - Scan captured traffic for data that looks coherent + - Show ASCII of captured data to find things like VIN numbers and traffic to + and from the radio + - Graph data found on the bus + - Load and Save many different file formats common to CAN capture tools (Vector + captures, Microchip, CANDo, PCAN, and many more) + - Load and Save DBC files. DBC files are used to store definitions for how data + are formatted on the bus. You can turn the raw data into things like a RPM, + odometer readings, and more. + - UDS scanning and decoding + - Scripting interface to be able to expand the scope of the software + - Best of all, it's free and open source. Don't like something about it? Change + it! + ''; + }; +} diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix index 9474275edf51..6482e123d712 100644 --- a/pkgs/by-name/sa/sawfish/package.nix +++ b/pkgs/by-name/sa/sawfish/package.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; meta = { diff --git a/pkgs/by-name/sb/sbarlua/package.nix b/pkgs/by-name/sb/sbarlua/package.nix new file mode 100644 index 000000000000..1d7bdfc4a870 --- /dev/null +++ b/pkgs/by-name/sb/sbarlua/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchFromGitHub, + gcc, + lua54Packages, + readline, +}: +lua54Packages.buildLuaPackage { + pname = "sbarLua"; + version = "0-unstable-2024-08-12"; + + src = fetchFromGitHub { + owner = "FelixKratz"; + repo = "SbarLua"; + rev = "437bd2031da38ccda75827cb7548e7baa4aa9978"; + hash = "sha256-F0UfNxHM389GhiPQ6/GFbeKQq5EvpiqQdvyf7ygzkPg="; + }; + + nativeBuildInputs = [ gcc ]; + + buildInputs = [ readline ]; + + makeFlags = [ "INSTALL_DIR=$(out)/lib/lua/${lua54Packages.lua.luaversion}" ]; + + meta = { + description = "Lua API for SketchyBar"; + homepage = "https://github.com/FelixKratz/SbarLua/"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.khaneliman ]; + platforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/sb/sbom-utility/name.patch b/pkgs/by-name/sb/sbom-utility/name.patch new file mode 100644 index 000000000000..0edbb05706d4 --- /dev/null +++ b/pkgs/by-name/sb/sbom-utility/name.patch @@ -0,0 +1,13 @@ +diff --git a/cmd/root.go b/cmd/root.go +index 5ef5d46..e99b245 100644 +--- a/cmd/root.go ++++ b/cmd/root.go +@@ -139,7 +139,7 @@ const ( + ) + + var rootCmd = &cobra.Command{ +- Use: fmt.Sprintf("%s [command] [flags]", utils.GlobalFlags.Project), ++ Use: fmt.Sprintf("sbom-utility [command] [flags]"), + SilenceErrors: false, + SilenceUsage: false, + Short: MSG_APP_NAME, diff --git a/pkgs/by-name/sb/sbom-utility/package.nix b/pkgs/by-name/sb/sbom-utility/package.nix index e6f4ac7a5701..6ebfbcbfe73d 100644 --- a/pkgs/by-name/sb/sbom-utility/package.nix +++ b/pkgs/by-name/sb/sbom-utility/package.nix @@ -2,11 +2,18 @@ lib, buildGoModule, fetchFromGitHub, + fetchpatch, + versionCheckHook, + installShellFiles, + stdenv, }: -buildGoModule rec { - pname = "sbom-utility"; +let version = "0.17.0"; +in +buildGoModule { + pname = "sbom-utility"; + inherit version; src = fetchFromGitHub { owner = "CycloneDX"; @@ -17,10 +24,40 @@ buildGoModule rec { vendorHash = "sha256-vyYSir5u6d5nv+2ScrHpasQGER4VFSoLb1FDUDIrtDM="; + patches = [ + # work around https://github.com/CycloneDX/sbom-utility/issues/121, which otherwise + # breaks shell completions + ./name.patch + # Output logs to stderr rather than stdout. + # Patch of https://github.com/CycloneDX/sbom-utility/pull/122, adapted to apply + # against v0.17.0 + ./stderr.patch + ]; + + ldflags = [ + "-X main.Version=${version}" + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + preCheck = '' cd test ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + for shell in bash fish zsh; do + installShellCompletion --cmd sbom-utility \ + --$shell <($out/bin/sbom-utility -q completion $shell) + done + ''; + meta = with lib; { description = "Utility that provides an API platform for validating, querying and managing BOM data"; homepage = "https://github.com/CycloneDX/sbom-utility"; diff --git a/pkgs/by-name/sb/sbom-utility/stderr.patch b/pkgs/by-name/sb/sbom-utility/stderr.patch new file mode 100644 index 000000000000..779c53d624d9 --- /dev/null +++ b/pkgs/by-name/sb/sbom-utility/stderr.patch @@ -0,0 +1,67 @@ +diff --git a/log/log.go b/log/log.go +index 2615f0a..c82b6c5 100644 +--- a/log/log.go ++++ b/log/log.go +@@ -104,7 +104,7 @@ func NewDefaultLogger() *MiniLogger { + tagEnter: DEFAULT_ENTER_TAG, + tagExit: DEFAULT_EXIT_TAG, + tagColor: color.New(color.FgMagenta), +- outputFile: os.Stdout, ++ outputFile: os.Stderr, + maxStrLength: 64, + } + +@@ -361,7 +361,7 @@ func (log MiniLogger) dumpInterface(lvl Level, tag string, value interface{}, sk + } + + // TODO: use a general output writer (set to stdout, stderr, or file stream) +- fmt.Println(sb.String()) ++ fmt.Fprintln(log.outputFile, sb.String()) + } else { + os.Stderr.WriteString("Error: Unable to retrieve call stack. Exiting...") + os.Exit(-2) +@@ -370,7 +370,7 @@ func (log MiniLogger) dumpInterface(lvl Level, tag string, value interface{}, sk + } + + func (log MiniLogger) DumpString(value string) { +- fmt.Print(value) ++ fmt.Fprint(log.outputFile, value) + } + + func (log MiniLogger) DumpStruct(structName string, field interface{}) error { +@@ -389,7 +389,7 @@ func (log MiniLogger) DumpStruct(structName string, field interface{}) error { + } + + // TODO: print to output stream +- fmt.Println(sb.String()) ++ fmt.Fprintln(log.outputFile, sb.String()) + + return nil + } +@@ -398,8 +398,8 @@ func (log MiniLogger) DumpArgs() { + args := os.Args + for i, a := range args { + // TODO: print to output stream +- fmt.Print(log.indentRunes) +- fmt.Printf("os.Arg[%d]: `%v`\n", i, a) ++ fmt.Fprint(log.outputFile, log.indentRunes) ++ fmt.Fprintf(log.outputFile, "os.Arg[%d]: `%v`\n", i, a) + } + } + +@@ -409,7 +409,7 @@ func (log MiniLogger) DumpSeparator(sep byte, repeat int) (string, error) { + for i := 0; i < repeat; i++ { + sb.WriteByte(sep) + } +- fmt.Println(sb.String()) ++ fmt.Fprintln(log.outputFile, sb.String()) + return sb.String(), nil + } else { + return "", errors.New("invalid repeat length (>80)") +@@ -417,5 +417,5 @@ func (log MiniLogger) DumpSeparator(sep byte, repeat int) (string, error) { + } + + func (log *MiniLogger) DumpStackTrace() { +- fmt.Println(string(debug.Stack())) ++ fmt.Fprintln(log.outputFile, string(debug.Stack())) + } diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix index 74397ae1ad50..ae712563008d 100644 --- a/pkgs/by-name/sb/sbom4python/package.nix +++ b/pkgs/by-name/sb/sbom4python/package.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; pythonImportsCheck = [ "sbom4python" diff --git a/pkgs/by-name/sb/sbomnix/package.nix b/pkgs/by-name/sb/sbomnix/package.nix new file mode 100644 index 000000000000..67ae168f0814 --- /dev/null +++ b/pkgs/by-name/sb/sbomnix/package.nix @@ -0,0 +1,100 @@ +{ + lib, + fetchFromGitHub, + git, + grype, + nix, + nix-visualize, + python3, + vulnix, +}: + +let + python = python3.override { + self = python3; + packageOverrides = self: super: { + pyrate-limiter = super.pyrate-limiter.overridePythonAttrs (oldAttrs: rec { + version = "2.10.0"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + tag = "v${version}"; + hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0="; + }; + doCheck = false; + }); + }; + }; + +in + +python.pkgs.buildPythonApplication rec { + pname = "sbomnix"; + version = "1.7.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tiiuae"; + repo = "sbomnix"; + tag = "v${version}"; + hash = "sha256-Vtrxpb6nTTR5a9sFi1NrhEflhPOwv1gt6i7DnggJwMs="; + + # Remove documentation as it contains references to nix store + postFetch = '' + rm -fr "$out"/doc + find "$out" -name '*.md' ! -name "README.md" -exec rm -f '{}' \; + ''; + }; + + makeWrapperArgs = [ + "--prefix PATH : ${ + lib.makeBinPath [ + git + nix + python.pkgs.graphviz + nix-visualize + vulnix + grype + ] + }" + ]; + + build-system = [ python.pkgs.setuptools ]; + + dependencies = with python.pkgs; [ + beautifulsoup4 + colorlog + dfdiskcache + graphviz + filelock + numpy + packageurl-python + packaging + pandas + pyrate-limiter + requests + requests-cache + requests-ratelimiter + reuse + tabulate + ]; + + pythonImportsCheck = [ "sbomnix" ]; + + # Tests require network access + doCheck = false; + + meta = with lib; { + description = "Utilities to help with software supply chain challenges on nix targets"; + homepage = "https://github.com/tiiuae/sbomnix"; + license = with licenses; [ + asl20 + bsd3 + cc-by-30 + ]; + maintainers = with maintainers; [ + henrirosten + jk + ]; + mainProgram = "sbomnix"; + }; +} diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix index cc4af8a03439..a55540fa01cf 100644 --- a/pkgs/by-name/sb/sby/package.nix +++ b/pkgs/by-name/sb/sby/package.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "sby"; - version = "0.51"; + version = "0.52"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "sby"; tag = "v${version}"; - hash = "sha256-U9aIZ+D5BhAPWuyQgAvwO6Bu8na2KnYLVPoDHi18jj4="; + hash = "sha256-E/je1lHvYCpmRlwM17PWTQemSnz8azviKiz4t9z17UM="; }; nativeCheckInputs = [ diff --git a/pkgs/by-name/sc/sc-controller/package.nix b/pkgs/by-name/sc/sc-controller/package.nix index 33a4470d494c..f8d220639991 100644 --- a/pkgs/by-name/sc/sc-controller/package.nix +++ b/pkgs/by-name/sc/sc-controller/package.nix @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { pname = "sc-controller"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "C0rn3j"; repo = "sc-controller"; tag = "v${version}"; - hash = "sha256-2t4q0pKwt1wJIHgTr37voqY4tDoDMAoEuLpFetuENHI="; + hash = "sha256-w7jVh0d8u6csXOQ6pjUCSD3R/qFVqTa2gcGa47pqn/0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sc/sc-im/package.nix b/pkgs/by-name/sc/sc-im/package.nix index 43bd526db987..984d052b7ed1 100644 --- a/pkgs/by-name/sc/sc-im/package.nix +++ b/pkgs/by-name/sc/sc-im/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "sc-im"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "sha256-nNOifSYbmJjuw6c8TerIQRlhCwbs7GnzD2J7O3vs0gI="; + sha256 = "sha256-V2XwzZwn+plMxQuTCYxbeTaqdud69z77oMDDDi+7Jw0="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/by-name/sc/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json index 74be18f159b0..627553efc7f6 100644 --- a/pkgs/by-name/sc/scala-cli/sources.json +++ b/pkgs/by-name/sc/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.7.1", + "version": "1.8.0", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0nmqcd8a7qhj8msdwjng0x33024gxwnfby6nw3p2fnm8gjs8y99b" + "sha256": "0q4di7f3kfkh8lbzgad1ra6zjgnqfnvjz3a9b6frxr7hcvb7nndw" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1ilnahpwrlknh41b7swq3vf4f5wnnpm1snfpi7g6cw9m7sq575m4" + "sha256": "0gx5v3q9hcmg17cgsi14k1jw112fflkwh31pzh8s8zi9ch3za7x9" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "17krx8wqizgcac98scihgh34n7y9cd9prpfd6wr09n7xmhrw334b" + "sha256": "1s13nbdl242637a0hiwb1cmjqyxm02jgyhk97cj8z1aq8cmg8vnp" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0ck252q0wn6q4lv10ydz7w2fj0h33a8a1cf677qwy26d0ciy3ii2" + "sha256": "1k81g4kphqyd1xfsn1hih1smir191gp5r8smfxg4fk7lbwl509id" } } } diff --git a/pkgs/by-name/sc/scala-cli/update.nix b/pkgs/by-name/sc/scala-cli/update.nix index 80b34a4d9d1d..6fad7c96e307 100644 --- a/pkgs/by-name/sc/scala-cli/update.nix +++ b/pkgs/by-name/sc/scala-cli/update.nix @@ -35,7 +35,7 @@ writeShellScript "${pname}-update-script" '' fi nixpkgs=$(git rev-parse --show-toplevel) - sources_json="$nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json" + sources_json="$nixpkgs/pkgs/by-name/sc/scala-cli/sources.json" platform_assets=() diff --git a/pkgs/by-name/sc/scala-next/package.nix b/pkgs/by-name/sc/scala-next/package.nix index d43b3d0a184d..ce1a42e76f88 100644 --- a/pkgs/by-name/sc/scala-next/package.nix +++ b/pkgs/by-name/sc/scala-next/package.nix @@ -1,10 +1,10 @@ { scala, fetchurl }: scala.bare.overrideAttrs (oldAttrs: { - version = "3.6.4"; + version = "3.7.0"; pname = "scala-next"; src = fetchurl { inherit (oldAttrs.src) url; - hash = "sha256-I8Jpq/aelCJyAZzvNq5/QbfdD0Mk5mPuzTDxVdkIxKU="; + hash = "sha256-T2zGqv2XSjdA3t0FaJvldcthgpgRrMTyiRznlgQOmBE="; }; }) diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix index 5f495696480b..9ec30435e54b 100644 --- a/pkgs/by-name/sc/scalafmt/package.nix +++ b/pkgs/by-name/sc/scalafmt/package.nix @@ -9,7 +9,7 @@ let baseName = "scalafmt"; - version = "3.9.2"; + version = "3.9.6"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -19,7 +19,7 @@ let cp $(< deps) $out/share/java/ ''; outputHashMode = "recursive"; - outputHash = "sha256-IACG6fiunbLP5wLPMePpk0QQnDS18ale+Lppri4jBmU="; + outputHash = "sha256-qn3by++aYx/azaoDJFQfo8PHyjd3w4qI7g6NMIzLiPE="; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix index 1cf763df8793..e85690293277 100644 --- a/pkgs/by-name/sc/scaleway-cli/package.nix +++ b/pkgs/by-name/sc/scaleway-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.38.0"; + version = "2.39.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-3yte4gNl8uBSHfDp11HH+l3trN+d5YcEYajpruyOrKc="; + sha256 = "sha256-i4fEOcoizlCZbyUln8DYVbYcAXgnimCFHV0FdgeOjHE="; }; - vendorHash = "sha256-BYWuAzsfqNtswiNHWzNWusgh0SyxlEBEHdOrGjpd1/8="; + vendorHash = "sha256-dy8alr6DM0sNEWrqW+vATmVKbupbKOuMsAodwgPLHk4="; ldflags = [ "-w" diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix index 0198f6c72e70..3f1b52894ee0 100644 --- a/pkgs/by-name/sc/scalr-cli/package.nix +++ b/pkgs/by-name/sc/scalr-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "scalr-cli"; - version = "0.16.2"; + version = "0.17.1"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; - hash = "sha256-Pw3ZEmQHlRmhEINQRQ21aCt6t1f7aqH/n8zfIzOF0lo="; + hash = "sha256-+ZwENhZF19VpJPGOVHnT4vMiWi8fzuJa3AhyOQ/S6w0="; }; - vendorHash = "sha256-0p4f+KKD04IFAUQG8F3b+2sx9suYemt3wbgSNNOOIlk="; + vendorHash = "sha256-TUf+0Z0yBDOpzMuETn+FCAPXWvQltjRhwQ3Xz0X6YOI="; ldflags = [ "-s" diff --git a/pkgs/by-name/sc/scap-security-guide/package.nix b/pkgs/by-name/sc/scap-security-guide/package.nix old mode 100755 new mode 100644 diff --git a/pkgs/by-name/sc/scaphandre/package.nix b/pkgs/by-name/sc/scaphandre/package.nix index 083c1494d914..6e99301be1df 100644 --- a/pkgs/by-name/sc/scaphandre/package.nix +++ b/pkgs/by-name/sc/scaphandre/package.nix @@ -73,5 +73,8 @@ rustPlatform.buildRustPackage rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ gaelreyrol ]; mainProgram = "scaphandre"; + # Upstream needs to decide what to do about a broken dependency + # https://github.com/hubblo-org/scaphandre/issues/403 + broken = true; }; } diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix index f5e89c173587..04a95c7e1bdd 100644 --- a/pkgs/by-name/sc/sccache/package.nix +++ b/pkgs/by-name/sc/sccache/package.nix @@ -4,8 +4,6 @@ rustPlatform, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,14 +23,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; # Tests fail because of client server setup which is not possible inside the # pure environment, see https://github.com/mozilla/sccache/issues/460 diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix index 7705bd0d0746..d148bfe1123a 100644 --- a/pkgs/by-name/sc/schemamap/package.nix +++ b/pkgs/by-name/sc/schemamap/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, - darwin, }: let @@ -27,17 +25,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-8UmLAT7Etb9MARoGhvOHPhkdR/8jCEAjAK/mWRHL9hk="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk; - [ - frameworks.Security - frameworks.CoreFoundation - frameworks.CoreServices - frameworks.SystemConfiguration - ] - ); + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sc/schismtracker/package.nix b/pkgs/by-name/sc/schismtracker/package.nix new file mode 100644 index 000000000000..0994fea35340 --- /dev/null +++ b/pkgs/by-name/sc/schismtracker/package.nix @@ -0,0 +1,86 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + alsa-lib, + perl, + pkg-config, + SDL2, + libX11, + libXext, + utf8proc, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "schismtracker"; + version = "20250415"; + + src = fetchFromGitHub { + owner = "schismtracker"; + repo = "schismtracker"; + tag = version; + hash = "sha256-VK2XdixejaoG6P1X3XG8Ow4H6CF3sNwAveJ4cCxdLuQ="; + }; + + # If we let it try to get the version from git, it will fail and fall back + # on running `date`, which will output the epoch, which is considered invalid + # in this assert: https://github.com/schismtracker/schismtracker/blob/a106b57e0f809b95d9e8bcf5a3975d27e0681b5a/schism/version.c#L112 + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail 'git log' 'echo ${version} #' + ''; + + configureFlags = + [ + (lib.enableFeature true "dependency-tracking") + (lib.withFeature true "sdl2") + (lib.enableFeature true "sdl2-linking") + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + (lib.enableFeature true "alsa") + (lib.enableFeature true "alsa-linking") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.enableFeature false "sdltest") + ]; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + ]; + + buildInputs = + [ + SDL2 + libX11 + utf8proc + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libXext + ]; + + enableParallelBuilding = true; + + # Our Darwin SDL2 doesn't have a SDL2main to link against + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace configure.ac \ + --replace '-lSDL2main' '-lSDL2' + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Music tracker application, free reimplementation of Impulse Tracker"; + homepage = "https://schismtracker.org/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ftrvxmtrx ]; + mainProgram = "schismtracker"; + }; +} diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix index 9f0581f4f575..1e221c5df65e 100644 --- a/pkgs/by-name/sc/scipopt-papilo/package.nix +++ b/pkgs/by-name/sc/scipopt-papilo/package.nix @@ -12,16 +12,16 @@ stdenv.mkDerivation rec { pname = "scipopt-papilo"; - version = "2.4.1"; + version = "2.4.2"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.1"; + scipVersion = "9.2.2"; src = fetchFromGitHub { owner = "scipopt"; repo = "papilo"; tag = "v${version}"; - hash = "sha256-oQ9iq5UkFK0ghUx6uxdJIOo5niQjniHegSZptqi2fgE="; + hash = "sha256-/1AsAesUh/5YXeCU2OYopoG3SXAwAecPD88QvGkb2bY="; }; nativeBuildInputs = [ cmake ]; @@ -42,10 +42,6 @@ stdenv.mkDerivation rec { # > include/boost/multiprecision/mpfr.hpp:22: fatal error: mpfr.h: No such file or directory # > compilation terminated. (lib.cmakeBool "SOPLEX" false) - - # (lib.cmakeBool "GMP" true) - # (lib.cmakeBool "QUADMATH" true) - # (lib.cmakeBool "TBB" true) ]; doCheck = true; meta = { diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix index c4939120ae08..19699890df1a 100644 --- a/pkgs/by-name/sc/scipopt-scip/package.nix +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "scipopt-scip"; - version = "9.2.1"; + version = "9.2.2"; src = fetchFromGitHub { owner = "scipopt"; repo = "scip"; tag = "v${lib.replaceStrings [ "." ] [ "" ] version}"; - hash = "sha256-xYxbMZYYqFNInlct8Ju0SrksfJlwV9Q+AHjxq7xhfAs="; + hash = "sha256-gxR308XrlmuUym/ujwGcD9a7Z+Z7vQNHaK4zO/PWPBQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix index ab79ae825c21..e91831fbb139 100644 --- a/pkgs/by-name/sc/scipopt-soplex/package.nix +++ b/pkgs/by-name/sc/scipopt-soplex/package.nix @@ -11,16 +11,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "scipopt-soplex"; - version = "713"; + version = "714"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.1"; + scipVersion = "9.2.2"; src = fetchFromGitHub { owner = "scipopt"; repo = "soplex"; rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; - hash = "sha256-qI7VGPAm3ALzeiD/OgvlZ1w2GzHRYdBajTW5XdIN9pU="; + hash = "sha256-j5dsCAjEaReVpHHCM8FUyDIhxZ4P2yk2h89k5omTh8o="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sc/scipopt-ug/package.nix b/pkgs/by-name/sc/scipopt-ug/package.nix index 5905ce388596..2d52e294ceb5 100644 --- a/pkgs/by-name/sc/scipopt-ug/package.nix +++ b/pkgs/by-name/sc/scipopt-ug/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "1.0.0-beta6"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.1"; + scipVersion = "9.2.2"; # Take the SCIPOptSuite source since no other source exists publicly. src = fetchzip { diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix index d0e768b3e7ac..1e1d708a4ab2 100644 --- a/pkgs/by-name/sc/scipopt-zimpl/package.nix +++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { version = "362"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.1"; + scipVersion = "9.2.2"; src = fetchFromGitHub { owner = "scipopt"; diff --git a/pkgs/by-name/sc/scite/package.nix b/pkgs/by-name/sc/scite/package.nix index a587e493e5fd..9a1bd6a3be0d 100644 --- a/pkgs/by-name/sc/scite/package.nix +++ b/pkgs/by-name/sc/scite/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "scite"; - version = "5.5.5"; + version = "5.5.6"; src = fetchurl { url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz"; - hash = "sha256-PkXS0qdYYuU10jGO56RgKk/RrOo2GK+7PR7AfSZszOU="; + hash = "sha256-VmNP6NepkF7Ln9eh9pfStmch9nwIKKZTOYxkeduSxrI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix index 073b1ad207d5..12244728a826 100644 --- a/pkgs/by-name/sc/scooter/package.nix +++ b/pkgs/by-name/sc/scooter/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "scooter"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "thomasschafer"; repo = "scooter"; rev = "v${version}"; - hash = "sha256-wu9SNcd1+JqTkhUghOiRlGP/za/9Md/lgGrwNA2lCJE="; + hash = "sha256-+l2XkG6xUOkfSPe20oXjUKdmBYB7GX0xZuqddC8w/lc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-DQU3djlSjG1VG2bs+JuegwF3ii+asJXpEEPb95xeXqk="; + cargoHash = "sha256-+KvHeTa8x77cMbZNbSeMcr66lAqWSBmfkn1rY+PfqHs="; checkFlags = [ # failed only for buildRustPackage diff --git a/pkgs/by-name/sc/scorched3d/gcc14-fix.patch b/pkgs/by-name/sc/scorched3d/gcc14-fix.patch new file mode 100644 index 000000000000..8bae4dfe0b1e --- /dev/null +++ b/pkgs/by-name/sc/scorched3d/gcc14-fix.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 59414ee..c53064d 100755 +--- a/configure ++++ b/configure +@@ -4881,7 +4881,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + int main(int argc, char *argv[]) + { +- alutInit(argc, argv); ++ alutInit(&argc, argv); + return 0; + } + #undef main diff --git a/pkgs/by-name/sc/scorched3d/package.nix b/pkgs/by-name/sc/scorched3d/package.nix index da9b404812eb..cdfa6d7ca6b5 100644 --- a/pkgs/by-name/sc/scorched3d/package.nix +++ b/pkgs/by-name/sc/scorched3d/package.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { url = "https://sources.debian.org/data/main/s/scorched3d/44%2Bdfsg-7/debian/patches/wx3.0-compat.patch"; sha256 = "sha256-Y5U5yYNT5iMqhdRaDMFtZ4K7aD+pugFZP0jLh7rdDp8="; }) + ./gcc14-fix.patch ]; sourceRoot = "scorched"; diff --git a/pkgs/by-name/sc/scotty/package.nix b/pkgs/by-name/sc/scotty/package.nix new file mode 100644 index 000000000000..6d6990c7f09f --- /dev/null +++ b/pkgs/by-name/sc/scotty/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromSourcehut, + nix-update-script, + testers, +}: + +buildGoModule (finalAttrs: { + pname = "scotty"; + version = "0.5.2"; + + src = fetchFromSourcehut { + owner = "~phw"; + repo = "scotty"; + rev = "v${finalAttrs.version}"; + hash = "sha256-3SIgsAdcG44dhEZnoE1FE0prI8aVKtkeYYsmwK+UvUI="; + }; + + # Otherwise checks fail with `panic: open /etc/protocols: operation not permitted` when sandboxing is enabled on Darwin + # https://github.com/NixOS/nixpkgs/pull/381645#issuecomment-2656211797 + modPostBuild = '' + substituteInPlace vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go \ + --replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)' + ''; + + vendorHash = "sha256-9LkWoep4R8Mii34m5wkLCw6AAMP92I1lgQnHajgzae8="; + + env = { + # *Some* locale is required to be set + # https://git.sr.ht/~phw/scotty/tree/04eddfda33cc6f0b87dc0fcea43d5c4f50923ddc/item/internal/i18n/i18n.go#L30 + LC_ALL = "C.UTF-8"; + }; + + passthru = { + tests.version = testers.testVersion { + # See above + command = "LC_ALL='C.UTF-8' scotty --version"; + package = finalAttrs.finalPackage; + }; + + updateScript = nix-update-script { }; + }; + + meta = { + description = "Transfers your listens between various music listen tracking and streaming services"; + homepage = "https://git.sr.ht/~phw/scotty"; + changelog = "https://git.sr.ht/~phw/scotty/refs/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "scotty"; + }; +}) diff --git a/pkgs/by-name/sc/screego/package.nix b/pkgs/by-name/sc/screego/package.nix index 3eaff20baebe..1caf2e75ee97 100644 --- a/pkgs/by-name/sc/screego/package.nix +++ b/pkgs/by-name/sc/screego/package.nix @@ -10,13 +10,13 @@ }: let - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "screego"; repo = "server"; rev = "v${version}"; - hash = "sha256-wFLoReqzLx6PEW/u9oz7VIYKtJkmwGTneeB6Ysgse7Q="; + hash = "sha256-xWy7aqpUznIYeBPqdpYdRMJxxfiPNa4JmjS3o5i3xxY="; }; ui = stdenv.mkDerivation { @@ -27,7 +27,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/ui/yarn.lock"; - hash = "sha256-yjHxyKEqXMxYsm+KroPB9KulfqYSOU/7ghbKnlSFrd0="; + hash = "sha256-JPSbBUny5unUHVkaVGlHyA90IpT9ahcSmt9R1hxERRk="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ buildGo123Module rec { pname = "screego-server"; - vendorHash = "sha256-zMb8MLS0KhwYNpfVeNMD9huEcpyyrZD0QAPmBNxMcQU="; + vendorHash = "sha256-vx7CpHUPQlLEQGxdswQJI1SrfSUwPlpNcb7Cq81ZOBQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix index 141eca8d82c7..36118fc16fdd 100644 --- a/pkgs/by-name/sc/screen-pipe/package.nix +++ b/pkgs/by-name/sc/screen-pipe/package.nix @@ -9,9 +9,9 @@ openssl, sqlite, stdenv, - darwin, alsa-lib, xorg, + apple-sdk_12, }: rustPlatform.buildRustPackage rec { pname = "screen-pipe"; @@ -49,22 +49,9 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_12_3.frameworks; - [ - CoreAudio - AudioUnit - CoreFoundation - CoreGraphics - CoreMedia - IOKit - Metal - MetalPerformanceShaders - Security - ScreenCaptureKit - SystemConfiguration - ] - ) + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_12 + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib xorg.libxcb diff --git a/pkgs/by-name/sc/screen/package.nix b/pkgs/by-name/sc/screen/package.nix new file mode 100644 index 000000000000..930b70a81d96 --- /dev/null +++ b/pkgs/by-name/sc/screen/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + ncurses, + libxcrypt, + pam ? null, +}: + +stdenv.mkDerivation rec { + pname = "screen"; + version = "5.0.1"; + + src = fetchurl { + url = "mirror://gnu/screen/screen-${version}.tar.gz"; + hash = "sha256-La429Ns3n/zRS2kVlrpuwYrDqeIrxHrCOXiatYQJhp0="; + }; + + configureFlags = [ + "--enable-telnet" + "--enable-pam" + ]; + + # We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416 + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types"; + + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ + ncurses + libxcrypt + pam + ]; + + # The test suite seems to have some glibc malloc hooks that don't exist/link on macOS + # With pkgsLLVM: tests/test-winmsgcond.c:53: assertion 'wmc_end(&wmc, pos + 1, &chg) == pos' failed + doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.useLLVM; + + meta = with lib; { + homepage = "https://www.gnu.org/software/screen/"; + description = "Window manager that multiplexes a physical terminal"; + license = licenses.gpl3Plus; + + longDescription = '' + GNU Screen is a full-screen window manager that multiplexes a physical + terminal between several processes, typically interactive shells. + Each virtual terminal provides the functions of the DEC VT100 + terminal and, in addition, several control functions from the ANSI + X3.64 (ISO 6429) and ISO 2022 standards (e.g., insert/delete line + and support for multiple character sets). There is a scrollback + history buffer for each virtual terminal and a copy-and-paste + mechanism that allows the user to move text regions between windows. + When screen is called, it creates a single window with a shell in it + (or the specified command) and then gets out of your way so that you + can use the program as you normally would. Then, at any time, you + can create new (full-screen) windows with other programs in them + (including more shells), kill the current window, view a list of the + active windows, turn output logging on and off, copy text between + windows, view the scrollback history, switch between windows, etc. + All windows run their programs completely independent of each other. + Programs continue to run when their window is currently not visible + and even when the whole screen session is detached from the users + terminal. + ''; + + platforms = platforms.unix; + maintainers = [ ]; + }; +} diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix index 191cfa461cfd..226000e3902c 100644 --- a/pkgs/by-name/sc/screenly-cli/package.nix +++ b/pkgs/by-name/sc/screenly-cli/package.nix @@ -1,12 +1,10 @@ { - darwin, fetchFromGitHub, lib, perl, pkg-config, openssl, rustPlatform, - stdenv, nix-update-script, }: @@ -29,14 +27,7 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sc/script-directory/package.nix b/pkgs/by-name/sc/script-directory/package.nix index 5d9bbca76acc..a57e15a442cf 100644 --- a/pkgs/by-name/sc/script-directory/package.nix +++ b/pkgs/by-name/sc/script-directory/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, installShellFiles, patsh, + coreutils, }: stdenvNoCC.mkDerivation rec { @@ -22,10 +23,13 @@ stdenvNoCC.mkDerivation rec { patsh ]; + # needed for cross + buildInputs = [ coreutils ]; + installPhase = '' runHook preInstall - patsh -f sd + patsh -f sd -s ${builtins.storeDir} --path "$HOST_PATH" install -Dt "$out/bin" sd installShellCompletion --zsh _sd diff --git a/pkgs/by-name/sc/scriv/package.nix b/pkgs/by-name/sc/scriv/package.nix index f3c7c8da3fdc..c6d475c2a4a0 100644 --- a/pkgs/by-name/sc/scriv/package.nix +++ b/pkgs/by-name/sc/scriv/package.nix @@ -10,14 +10,17 @@ python3.pkgs.buildPythonApplication rec { pname = "scriv"; - version = "1.5.1"; + version = "1.7.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-MK6f+NFE+ODPOUxOHTeVQvGzgjdnZClVtU7EDcALMrY="; + hash = "sha256-fBqL5jUdA2kuXnV4Te6g2PEbLJD5G+GLD7OjdVVbUl4="; }; - propagatedBuildInputs = + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ attrs @@ -46,6 +49,8 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # assumes we have checked out the full repo (including remotes) "test_real_get_github_repos" + # test fails due to a pandoc bug (fixed in pandoc 3.6.4) + "test_convert_to_markdown" ]; passthru.tests = { diff --git a/pkgs/by-name/sc/scrot/package.nix b/pkgs/by-name/sc/scrot/package.nix index 7b7474f090aa..236899adab11 100644 --- a/pkgs/by-name/sc/scrot/package.nix +++ b/pkgs/by-name/sc/scrot/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "scrot"; - version = "1.11.1"; + version = "1.12.1"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = "scrot"; rev = version; - sha256 = "sha256-MUmvzZMzzKKw5GjOUhpdrMIgKO9/i9RDqDtTsSghd18="; + sha256 = "sha256-ExZH+bjpEvdbSYM8OhV+cyn4j+0YrHp5/b+HsHKAHCA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix index 3a7274f7af72..261e830134af 100644 --- a/pkgs/by-name/sc/scryer-prolog/package.nix +++ b/pkgs/by-name/sc/scryer-prolog/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,11 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; CARGO_FEATURE_USE_SYSTEM_LIBS = true; diff --git a/pkgs/by-name/sc/scsh/gcc-14-p1.patch b/pkgs/by-name/sc/scsh/gcc-14-p1.patch new file mode 100644 index 000000000000..30dfa6135267 --- /dev/null +++ b/pkgs/by-name/sc/scsh/gcc-14-p1.patch @@ -0,0 +1,33 @@ +https://github.com/scheme/scsh/pull/50.patch + +From edced224436fa70cd7d885fe65996b9c3cfd33d7 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 28 Apr 2025 22:40:31 +0100 +Subject: [PATCH] c/syscalls.c: add missing `` icnlude + +Without the change the build fails for me as: + + c/syscalls.c: In function 'sleep_until': + c/syscalls.c:711:18: error: implicit declaration of function 'time' [-Wimplicit-function-declaration] + 711 | time_t now = time(0); + | ^~~~ + c/syscalls.c:41:1: note: 'time' is defined in header ''; this is probably fixable by adding '#include ' + 40 | #include "syscalls.h" + +++ |+#include + 41 | +--- + c/syscalls.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/c/syscalls.c b/c/syscalls.c +index fe11e81..2be25a8 100644 +--- a/c/syscalls.c ++++ b/c/syscalls.c +@@ -5,6 +5,7 @@ + + #include + #include ++#include /* for time() */ + #include + #include + #include diff --git a/pkgs/by-name/sc/scsh/gcc-14-p2.patch b/pkgs/by-name/sc/scsh/gcc-14-p2.patch new file mode 100644 index 000000000000..c32793e6c60f --- /dev/null +++ b/pkgs/by-name/sc/scsh/gcc-14-p2.patch @@ -0,0 +1,31 @@ +https://github.com/scheme/scsh/pull/51.patch + +From b2934abb68d6adab448f24787192c047e46cf17c Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 28 Apr 2025 22:39:55 +0100 +Subject: [PATCH] configure.ac: add detection of `pty.h` + +Without the change the build on modern autoconf fails as: + + c/tty.c: In function 'allocate_master': + c/tty.c:398:14: error: implicit declaration of function 'openpty'; did you mean 'openat'? [-Wimplicit-function-declaration] + 398 | rc = openpty (&master_fd, &slave_fd, NULL, NULL, NULL); + | ^~~~~~~ + | openat +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99779dc..1cd8b22 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,7 @@ CPPFLAGS="$CPPFLAGS -I$S48DIR/include" + # Checks for libraries. + + # Checks for header files. +-AC_CHECK_HEADERS([fcntl.h limits.h netdb.h sgtty.h stdlib.h string.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utime.h]) ++AC_CHECK_HEADERS([fcntl.h limits.h netdb.h pty.h sgtty.h stdlib.h string.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utime.h]) + + dnl We need the scheme48.h headers, so bomb out if we can't find them. + AC_CHECK_HEADERS([scheme48.h], [], diff --git a/pkgs/by-name/sc/scsh/package.nix b/pkgs/by-name/sc/scsh/package.nix index d6d9d1a2ca22..7199980aa06a 100644 --- a/pkgs/by-name/sc/scsh/package.nix +++ b/pkgs/by-name/sc/scsh/package.nix @@ -19,6 +19,15 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + # Fix the build against gcc-14: + # https://github.com/scheme/scsh/pull/50 + ./gcc-14-p1.patch + # Fix the build against gcc-14: + # https://github.com/scheme/scsh/pull/51 + ./gcc-14-p2.patch + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ scheme48 ]; configureFlags = [ "--with-scheme48=${scheme48}" ]; diff --git a/pkgs/by-name/sc/scspell/package.nix b/pkgs/by-name/sc/scspell/package.nix new file mode 100644 index 000000000000..4910e200fd9a --- /dev/null +++ b/pkgs/by-name/sc/scspell/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication scspell diff --git a/pkgs/by-name/sd/SDL2_Pango/package.nix b/pkgs/by-name/sd/SDL2_Pango/package.nix index 2746a5fe5d82..f04bf88ecb9b 100644 --- a/pkgs/by-name/sd/SDL2_Pango/package.nix +++ b/pkgs/by-name/sd/SDL2_Pango/package.nix @@ -2,7 +2,6 @@ lib, SDL2, autoreconfHook, - darwin, fetchFromGitHub, freetype, pango, @@ -27,15 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - SDL2 - freetype - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - ]; + buildInputs = [ + SDL2 + freetype + pango + ]; outputs = [ "out" @@ -48,7 +43,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/markuskimius/SDL2_Pango"; description = "Library for graphically rendering internationalized and tagged text in SDL2 using TrueType fonts"; license = lib.licenses.lgpl21Plus; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ rardiol ]); + maintainers = with lib.maintainers; [ rardiol ]; + teams = [ lib.teams.sdl ]; inherit (SDL2.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/SDL2_gfx/package.nix b/pkgs/by-name/sd/SDL2_gfx/package.nix index 4d6f6d77bbd7..814e10a603eb 100644 --- a/pkgs/by-name/sd/SDL2_gfx/package.nix +++ b/pkgs/by-name/sd/SDL2_gfx/package.nix @@ -1,7 +1,6 @@ { lib, SDL2, - darwin, fetchurl, pkg-config, stdenv, @@ -25,19 +24,19 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - SDL2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - ]; + buildInputs = [ + SDL2 + ]; outputs = [ "out" "dev" ]; + # Missing 'sincos()' implementation fails linking projects + # like 'freeciv_sdl2'. + env.NIX_LDFLAGS = "-lm"; + configureFlags = [ (lib.enableFeature enableMmx "mmx") (lib.enableFeature enableSdltest "sdltest") @@ -45,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + enableParallelBuilding = true; + passthru = { tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; @@ -72,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { written in plain C and can be used in C++ code. ''; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; pkgConfigModules = [ "SDL2_gfx" ]; inherit (SDL2.meta) platforms; }; diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 2672f76d3f8b..06d6d99209dd 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -2,10 +2,7 @@ lib, SDL2, autoreconfHook, - darwin, fetchurl, - giflib, - libXpm, libjpeg, libpng, libtiff, @@ -14,20 +11,18 @@ stdenv, zlib, # Boolean flags + enableSTB ? true, ## Darwin headless will hang when trying to run the SDL test program enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: -let - inherit (darwin.apple_sdk.frameworks) Foundation; -in stdenv.mkDerivation (finalAttrs: { pname = "SDL2_image"; - version = "2.8.5"; + version = "2.8.8"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${finalAttrs.version}.tar.gz"; - hash = "sha256-i8TFf0HiwNt/m3SbJT72zs3G8LaJ7L427pe1ARX/9kU="; + hash = "sha256-IhO1b9r/IiDQ44yOQgy+GoPIc3QZDLqMcK8hVgl84wo="; }; nativeBuildInputs = [ @@ -36,16 +31,17 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ - SDL2 - giflib - libXpm - libjpeg - libpng - libtiff - libwebp - zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + buildInputs = + [ + SDL2 + libtiff + libwebp + zlib + ] + ++ lib.optionals (!enableSTB) [ + libjpeg + libpng + ]; configureFlags = [ @@ -54,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature false "png-shared") (lib.enableFeature false "tif-shared") (lib.enableFeature false "webp-shared") + (lib.enableFeature enableSTB "stb-image") (lib.enableFeature enableSdltest "sdltest") ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -71,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { description = "SDL image library"; homepage = "https://github.com/libsdl-org/SDL_image"; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/sd/SDL2_image_2_0/package.nix b/pkgs/by-name/sd/SDL2_image_2_0/package.nix deleted file mode 100644 index 4897ff5ad44a..000000000000 --- a/pkgs/by-name/sd/SDL2_image_2_0/package.nix +++ /dev/null @@ -1,17 +0,0 @@ -# Dependency of pygame, toppler -{ SDL2_image, fetchurl }: - -SDL2_image.overrideAttrs (oldAttrs: { - version = "2.0.5"; - src = fetchurl { - inherit (oldAttrs.src) url; - hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; - }; - - postPatch = - (oldAttrs.postPatch or "") - + '' - # allow newer autoreconf to run successfully - touch NEWS README AUTHORS ChangeLog - ''; -}) diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix index 440a7f35ca8b..228f35554a70 100644 --- a/pkgs/by-name/sd/SDL2_mixer/package.nix +++ b/pkgs/by-name/sd/SDL2_mixer/package.nix @@ -1,7 +1,6 @@ { lib, SDL2, - darwin, fetchFromGitHub, flac, fluidsynth, @@ -14,14 +13,13 @@ smpeg2, stdenv, timidity, + wavpack, + libxmp, + game-music-emu, # Boolean flags enableSdltest ? (!stdenv.hostPlatform.isDarwin), - enableSmpegtest ? (!stdenv.hostPlatform.isDarwin), }: -let - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; -in stdenv.mkDerivation (finalAttrs: { pname = "SDL2_mixer"; version = "2.8.1"; @@ -38,12 +36,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - AudioUnit - CoreServices - ]; - propagatedBuildInputs = [ SDL2 flac @@ -54,6 +46,9 @@ stdenv.mkDerivation (finalAttrs: { mpg123 opusfile smpeg2 + wavpack + libxmp + game-music-emu # MIDI patterns timidity ]; @@ -66,14 +61,11 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; configureFlags = [ - (lib.enableFeature false "music-ogg-shared") - (lib.enableFeature false "music-flac-shared") (lib.enableFeature false "music-mod-modplug-shared") (lib.enableFeature false "music-mp3-mpg123-shared") (lib.enableFeature false "music-opus-shared") (lib.enableFeature false "music-midi-fluidsynth-shared") (lib.enableFeature enableSdltest "sdltest") - (lib.enableFeature enableSmpegtest "smpegtest") # override default path to allow MIDI files to be played (lib.withFeatureAs true "timidity-cfg" "${timidity}/share/timidity/timidity.cfg") ]; @@ -82,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/libsdl-org/SDL_mixer"; description = "SDL multi-channel audio mixer library"; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/sd/SDL2_mixer_2_0/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch b/pkgs/by-name/sd/SDL2_mixer_2_0/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch deleted file mode 100644 index 76fff3fa63e2..000000000000 --- a/pkgs/by-name/sd/SDL2_mixer_2_0/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/music_mpg123.c 2018-10-31 10:59:00.000000000 -0400 -+++ b/music_mpg123.c 2023-09-05 21:31:51.529191521 -0400 -@@ -48,7 +48,11 @@ - int (*mpg123_open_handle)(mpg123_handle *mh, void *iohandle); - const char* (*mpg123_plain_strerror)(int errcode); - void (*mpg123_rates)(const long **list, size_t *number); -+#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */ -+ int (*mpg123_read)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done ); -+#else - int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ); -+#endif - int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); - off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence ); - const char* (*mpg123_strerror)(mpg123_handle *mh); -@@ -95,7 +99,11 @@ - FUNCTION_LOADER(mpg123_open_handle, int (*)(mpg123_handle *mh, void *iohandle)) - FUNCTION_LOADER(mpg123_plain_strerror, const char* (*)(int errcode)) - FUNCTION_LOADER(mpg123_rates, void (*)(const long **list, size_t *number)); -+#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */ -+ FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done )) -+#else - FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done )) -+#endif - FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) - FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence )) - FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh)) diff --git a/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix b/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix deleted file mode 100644 index 96b3d40f10fb..000000000000 --- a/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - SDL2_mixer, - fetchFromGitHub, - fetchpatch, - timidity, -}: - -let - attrset = { - version = "2.0.4"; - - src = fetchFromGitHub { - owner = "libsdl-org"; - repo = "SDL_mixer"; - rev = "release-${attrset.version}"; - hash = "sha256-vo9twUGeK2emDiGd9kSGuA/X8TxVmQrRFFm71zawWYM="; - }; - - patches = [ - # These patches fix incompatible function pointer conversion errors with clang 16. - (fetchpatch { - url = "https://github.com/libsdl-org/SDL_mixer/commit/4119ec3fe838d38d2433f4432cd18926bda5d093.patch"; - stripLen = 2; - hash = "sha256-Ug1EEZIRcV8+e1MeMsGHuTW7Zn6j4szqujP8IkIq2VM="; - }) - # Based on https://github.com/libsdl-org/SDL_mixer/commit/64ab759111ddb1b033bcce64e1a04e0cba6e498f - ./SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch - ]; - - # fix default path to timidity.cfg so MIDI files could be played - postPatch = '' - substituteInPlace timidity/options.h \ - --replace "/usr/share/timidity" "${timidity}/share/timidity" - ''; - }; -in -SDL2_mixer.overrideAttrs (_: attrset) diff --git a/pkgs/by-name/sd/SDL2_net/package.nix b/pkgs/by-name/sd/SDL2_net/package.nix index fb8d1eeedb3b..6a12a05f87ec 100644 --- a/pkgs/by-name/sd/SDL2_net/package.nix +++ b/pkgs/by-name/sd/SDL2_net/package.nix @@ -1,7 +1,6 @@ { lib, SDL2, - darwin, fetchFromGitHub, pkg-config, stdenv, @@ -30,10 +29,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - ]; - propagatedBuildInputs = [ SDL2 ]; configureFlags = [ @@ -47,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/libsdl-org/SDL_net"; description = "SDL multiplatform networking library"; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; inherit (SDL2.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/SDL2_sound/package.nix b/pkgs/by-name/sd/SDL2_sound/package.nix index 9ec2ec4e3cff..2da73abcc243 100644 --- a/pkgs/by-name/sd/SDL2_sound/package.nix +++ b/pkgs/by-name/sd/SDL2_sound/package.nix @@ -9,15 +9,8 @@ libmikmod, libvorbis, timidity, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) - AudioToolbox - CoreAudio - ; -in stdenv.mkDerivation rec { pname = "SDL2_sound"; version = "2.0.1"; @@ -42,24 +35,20 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSDLSOUND_DECODER_MIDI=1" ]; - buildInputs = - [ - SDL2 - flac - libmikmod - libvorbis - timidity - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - CoreAudio - ]; + buildInputs = [ + SDL2 + flac + libmikmod + libvorbis + timidity + ]; meta = with lib; { description = "SDL2 sound library"; mainProgram = "playsound"; platforms = platforms.unix; license = licenses.zlib; + teams = [ lib.teams.sdl ]; homepage = "https://www.icculus.org/SDL_sound/"; }; } diff --git a/pkgs/by-name/sd/SDL2_ttf/package.nix b/pkgs/by-name/sd/SDL2_ttf/package.nix index 88b5c8f8ba4a..f8968606c561 100644 --- a/pkgs/by-name/sd/SDL2_ttf/package.nix +++ b/pkgs/by-name/sd/SDL2_ttf/package.nix @@ -1,7 +1,6 @@ { lib, SDL2, - darwin, fetchurl, freetype, harfbuzz, @@ -35,9 +34,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc ]; configureFlags = [ @@ -58,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/libsdl-org/SDL_ttf"; description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer"; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; inherit (SDL2.meta) platforms; pkgConfigModules = [ "SDL2_ttf" ]; }; diff --git a/pkgs/by-name/sd/SDL_Pango/package.nix b/pkgs/by-name/sd/SDL_Pango/package.nix index cfe8c5dd852b..be84111ff5c6 100644 --- a/pkgs/by-name/sd/SDL_Pango/package.nix +++ b/pkgs/by-name/sd/SDL_Pango/package.nix @@ -50,7 +50,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sdlpango.sourceforge.net/"; description = "Connects the Pango rendering engine to SDL"; license = lib.licenses.lgpl21Plus; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ puckipedia ]); + maintainers = with lib.maintainers; [ puckipedia ]; + teams = [ lib.teams.sdl ]; inherit (SDL.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/SDL_audiolib/package.nix b/pkgs/by-name/sd/SDL_audiolib/package.nix index 5e919d9ce3af..6ee67a1faeec 100644 --- a/pkgs/by-name/sd/SDL_audiolib/package.nix +++ b/pkgs/by-name/sd/SDL_audiolib/package.nix @@ -5,17 +5,19 @@ fetchFromGitHub, pkg-config, stdenv, + flac, }: stdenv.mkDerivation (finalAttrs: { pname = "SDL_audiolib"; - version = "0-unstable-2022-04-17"; + # don't update to latest master as it will break some sounds in devilutionx + version = "0-unstable-2022-07-13"; src = fetchFromGitHub { owner = "realnc"; repo = "SDL_audiolib"; - rev = "908214606387ef8e49aeacf89ce848fb36f694fc"; - hash = "sha256-11KkwIhG1rX7yDFSj92NJRO9L2e7XZGq2gOJ54+sN/A="; + rev = "cc1bb6af8d4cf5e200259072bde1edd1c8c5137e"; + hash = "sha256-xP7qlwwOkqVeTlCEZLinnvmx8LbU2co5+t//cf4n190="; }; nativeBuildInputs = [ @@ -26,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 + flac ]; strictDeps = true; @@ -52,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Audio decoding, resampling and mixing library for SDL"; homepage = "https://github.com/realnc/SDL_audiolib"; license = lib.licenses.lgpl3Plus; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; inherit (SDL2.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index bdc63084a87e..683d6eb38c98 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -11,13 +11,18 @@ pkg-config, pkg-config-unwrapped, stdenv, + testers, + dosbox, + SDL_image, + SDL_ttf, + SDL_mixer, + SDL_sound, # Boolean flags libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms, openglSupport ? libGLSupported, }: let - inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin) autoSignDarwinBinariesHook; in stdenv.mkDerivation (finalAttrs: { @@ -50,12 +55,36 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Cocoa ] ++ lib.optionals openglSupport [ libGLU ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(CMAKE_SKIP_RPATH TRUE)' 'set(CMAKE_SKIP_RPATH FALSE)' + ''; + + dontPatchELF = true; # don't strip rpath + + cmakeFlags = + let + rpath = lib.makeLibraryPath [ sdl2-compat ]; + in + [ + (lib.cmakeFeature "CMAKE_INSTALL_RPATH" rpath) + (lib.cmakeFeature "CMAKE_BUILD_RPATH" rpath) + (lib.cmakeBool "SDL12TESTS" finalAttrs.finalPackage.doCheck) + ]; + enableParallelBuilding = true; + # Darwin fails with "Critical error: required built-in appearance SystemAppearance not found" + doCheck = !stdenv.hostPlatform.isDarwin; + checkPhase = '' + runHook preCheck + ./testver + runHook postCheck + ''; + postInstall = '' # allow as a drop in replacement for SDL # Can be removed after treewide switch from pkg-config to pkgconf @@ -68,31 +97,29 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./find-headers.patch ]; setupHook = ./setup-hook.sh; - postFixup = '' - for lib in $out/lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* ; do - if [[ -L "$lib" ]]; then - ${ - if stdenv.hostPlatform.isDarwin then - '' - install_name_tool ${ - lib.strings.concatMapStrings (x: " -add_rpath ${lib.makeLibraryPath [ x ]} ") finalAttrs.buildInputs - } "$lib" - '' - else - '' - patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath finalAttrs.buildInputs}" "$lib" - '' - } - fi - done - ''; + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + inherit + SDL_image + SDL_ttf + SDL_mixer + SDL_sound + dosbox + ; + }; meta = { homepage = "https://www.libsdl.org/"; description = "Cross-platform multimedia library - build SDL 1.2 applications against 2.0"; license = lib.licenses.zlib; mainProgram = "sdl-config"; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ peterhoeg ]); + maintainers = with lib.maintainers; [ peterhoeg ]; + teams = [ lib.teams.sdl ]; platforms = lib.platforms.all; + pkgConfigModules = [ + "sdl" + "sdl12_compat" + ]; }; }) diff --git a/pkgs/by-name/sd/SDL_gfx/package.nix b/pkgs/by-name/sd/SDL_gfx/package.nix index 9b0b74963626..85ff0a8d4fb3 100644 --- a/pkgs/by-name/sd/SDL_gfx/package.nix +++ b/pkgs/by-name/sd/SDL_gfx/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { written in plain C and can be used in C++ code. ''; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; inherit (SDL.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix index 361d33641b6f..658438678bed 100644 --- a/pkgs/by-name/sd/SDL_image/package.nix +++ b/pkgs/by-name/sd/SDL_image/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL_image"; - version = "1.2.12-unstable-2025-02-13"; + version = "1.2.12-unstable-2025-04-27"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL_image"; - rev = "74e8d577216e3c3a969e67b68b2e4769fcbf8fdd"; - hash = "sha256-WSNH7Pw/tL5rgPQtOjxRGp2UlYSJJmXS2YQS+fAkXSc="; + rev = "a5eac02dacd8a8940ffccd1b8d0783c0b5f8ec7d"; + hash = "sha256-vrV12fYGSh/vtCktsUVNvcRCn5lZ2tyBYwqhLPgNdhw="; }; configureFlags = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.libsdl.org/projects/SDL_image/"; description = "SDL image library"; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; inherit (SDL.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix index 34289d127a9b..e0fd4a8db33f 100644 --- a/pkgs/by-name/sd/SDL_mixer/package.nix +++ b/pkgs/by-name/sd/SDL_mixer/package.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "SDL multi-channel audio mixer library"; homepage = "http://www.libsdl.org/projects/SDL_mixer/"; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; license = lib.licenses.zlib; inherit (SDL.meta) platforms; }; diff --git a/pkgs/by-name/sd/SDL_net/package.nix b/pkgs/by-name/sd/SDL_net/package.nix index 49d16a72c5ad..01be8499391f 100644 --- a/pkgs/by-name/sd/SDL_net/package.nix +++ b/pkgs/by-name/sd/SDL_net/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL_net"; - version = "1.2.8-unstable-2024-04-23"; + version = "1.2.8-unstable-2025-04-21"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL_net"; - rev = "0043be2e559f8d562d04bf62d6e3f4162ed8edad"; - hash = "sha256-/W1Mq6hzJNNwpcx+VUT4DRGP3bE06GGMbYDGHBc4XlQ="; + rev = "e2e041b81747bc01b2c5fb3757a082e525e5d25b"; + hash = "sha256-Nk1OoCIrHMABHuPrJHMlLyyR73px/Xikgz40RpDfonw="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/libsdl-org/SDL_net"; description = "SDL networking library"; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; inherit (SDL.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/SDL_sixel/package.nix b/pkgs/by-name/sd/SDL_sixel/package.nix index 5232b0080cf5..727643eb6c06 100644 --- a/pkgs/by-name/sd/SDL_sixel/package.nix +++ b/pkgs/by-name/sd/SDL_sixel/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { description = "SDL 1.2 patched with libsixel support"; license = lib.licenses.lgpl21; mainProgram = "sdl-config"; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/sd/SDL_sound/package.nix b/pkgs/by-name/sd/SDL_sound/package.nix index 1ed4ecd400aa..5491af3672fd 100644 --- a/pkgs/by-name/sd/SDL_sound/package.nix +++ b/pkgs/by-name/sd/SDL_sound/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.icculus.org/SDL_sound/"; description = "SDL sound library"; license = lib.licenses.lgpl21Plus; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; mainProgram = "playsound"; inherit (SDL.meta) platforms; }; diff --git a/pkgs/by-name/sd/SDL_stretch/package.nix b/pkgs/by-name/sd/SDL_stretch/package.nix index 70a79f63515f..ea742a479c11 100644 --- a/pkgs/by-name/sd/SDL_stretch/package.nix +++ b/pkgs/by-name/sd/SDL_stretch/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sdl-stretch.sourceforge.net/"; description = "Stretch Functions For SDL"; license = lib.licenses.lgpl2; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + maintainers = [ ]; inherit (SDL.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix index dbbb1fff2b71..0bc0349ed809 100644 --- a/pkgs/by-name/sd/SDL_ttf/package.nix +++ b/pkgs/by-name/sd/SDL_ttf/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL_ttf"; - version = "2.0.11.1-unstable-2024-04-23"; + version = "2.0.11-unstable-2024-04-23"; src = fetchFromGitHub { owner = "libsdl-org"; @@ -33,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature enableSdltest "sdltest") ]; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; + strictDeps = true; passthru.updateScript = unstableGitUpdater { @@ -45,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/libsdl-org/SDL_ttf"; description = "SDL TrueType library"; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); + teams = [ lib.teams.sdl ]; inherit (SDL.meta) platforms; knownVulnerabilities = [ # CVE applies to SDL2 https://github.com/NixOS/nixpkgs/pull/274836#issuecomment-2708627901 diff --git a/pkgs/by-name/sd/sd-local/package.nix b/pkgs/by-name/sd/sd-local/package.nix index 374efe41885a..7c3adcdc7a4f 100644 --- a/pkgs/by-name/sd/sd-local/package.nix +++ b/pkgs/by-name/sd/sd-local/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.57"; + version = "1.0.58"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CBEdE15lAMMawTsfc45ptHsC2AbqFP6v4/nnktytwvc="; + sha256 = "sha256-7nL+9tJt4EnGGIhsGASXdBp0u7PXbbt50ADdK2Ciel0="; }; - vendorHash = "sha256-rAFfyMlnhDrb+f04S9+hNygXPaoG9mheQMxaJtXxBVw="; + vendorHash = "sha256-CcVb2ugvKzl/HTtub4iq81u7hps7Q5a1e1e+T5t13hY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/sd/sd-switch/package.nix b/pkgs/by-name/sd/sd-switch/package.nix index 6b22add6d81f..72b7d5bc1555 100644 --- a/pkgs/by-name/sd/sd-switch/package.nix +++ b/pkgs/by-name/sd/sd-switch/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.5.3"; + version = "0.5.4"; in rustPlatform.buildRustPackage { pname = "sd-switch"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "~rycee"; repo = "sd-switch"; rev = version; - hash = "sha256-9aIu37mmf4ZnmZZrU0GA6z+bHKwtfkA5KnLRLY0c2r8="; + hash = "sha256-lP65PrMFhbNoWyObFsJK06Hgv9w83hyI/YiKcL5rXhY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-2DpaO64EehlgG5zSzqERmenmEqUbhEwFmIQEmCKs4Wg="; + cargoHash = "sha256-sWYKJz/wfx0XG150cTOguvhdN3UEn8QE0P0+2lSeVkc="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix index 0f707b27bad8..d8361e04a744 100644 --- a/pkgs/by-name/sd/sdcc/package.nix +++ b/pkgs/by-name/sd/sdcc/package.nix @@ -63,6 +63,23 @@ stdenv.mkDerivation (finalAttrs: { gputils ]; + # sdcc 4.5.0 massively rewrote sim/ucsim/Makefile.in, and lost the `.PHONY` + # rule in the process. As a result, on macOS (which uses a case-insensitive + # filesystem), the INSTALL file keeps the `install` target in the ucsim + # directory from running. Nothing else creates the `man` output, causing the + # entire build to fail. + # + # TODO: remove this when updating to the next release - it's been fixed in + # upstream sdcc r15384 . + + postPatch = '' + if grep -q '\.PHONY:.*install' sim/ucsim/Makefile.in; then + echo 'Upstream has added `.PHONY: install` rule; must remove `postPatch` from the Nix file.' >&2 + exit 1 + fi + echo '.PHONY: install' >> sim/ucsim/Makefile.in + ''; + configureFlags = let excludedPorts = @@ -80,6 +97,10 @@ stdenv.mkDerivation (finalAttrs: { fi ''; + # ${src}/support/cpp/gcc/Makefile.in states: + # We don't want to compile the compilers with -fPIE, it make PCH fail. + hardeningDisable = [ "pie" ]; + meta = { homepage = "https://sdcc.sourceforge.net/"; description = "Small Device C Compiler"; diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index 0b28b9200e9e..ee975d422139 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -16,18 +16,17 @@ testers, libX11, libGL, - testSupport ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "sdl2-compat"; - version = "2.32.52"; + version = "2.32.56"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "sdl2-compat"; tag = "release-${finalAttrs.version}"; - hash = "sha256-adtFcBFclfub//KGpxqObuTIZbh9r4k/jdJEnP1Hzpw="; + hash = "sha256-Xg886KX54vwGANIhTAFslzPw/sZs2SvpXzXUXcOKgMs="; }; nativeBuildInputs = [ @@ -60,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { # skip timing-based tests as those are flaky env.SDL_TESTS_QUICK = 1; - doCheck = testSupport && stdenv.buildPlatform.canExecute stdenv.hostPlatform; + doCheck = true; patches = [ ./find-headers.patch ]; setupHook = ./setup-hook.sh; @@ -68,25 +67,25 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' # allow as a drop in replacement for SDL2 # Can be removed after treewide switch from pkg-config to pkgconf - ln -s $dev/lib/pkgconfig/sdl2_compat.pc $dev/lib/pkgconfig/sdl2.pc + ln -s $dev/lib/pkgconfig/sdl2-compat.pc $dev/lib/pkgconfig/sdl2.pc ''; passthru = { tests = - let - replaceSDL2 = drv: drv.override { SDL2 = finalAttrs.finalPackage; }; - in { - pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; - SDL2_ttf = replaceSDL2 SDL2_ttf; - SDL2_net = replaceSDL2 SDL2_net; - SDL2_gfx = replaceSDL2 SDL2_gfx; - SDL2_sound = replaceSDL2 SDL2_sound; - SDL2_mixer = replaceSDL2 SDL2_mixer; - SDL2_image = replaceSDL2 SDL2_image; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + inherit + SDL2_ttf + SDL2_net + SDL2_gfx + SDL2_sound + SDL2_mixer + SDL2_image + ; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { - monado = replaceSDL2 monado; + inherit monado; }; updateScript = nix-update-script { @@ -102,8 +101,14 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libsdl.org"; changelog = "https://github.com/libsdl-org/sdl2-compat/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.zlib; - maintainers = with lib.maintainers; [ nadiaholmquist ]; + maintainers = with lib.maintainers; [ + nadiaholmquist + ]; + teams = [ lib.teams.sdl ]; platforms = lib.platforms.all; - pkgConfigModules = [ "sdl2_compat" ]; + pkgConfigModules = [ + "sdl2-compat" + "sdl2" + ]; }; }) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index cf9a89d5a125..f9fd8ac47418 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -1,7 +1,6 @@ { lib, sdl3, - darwin, libavif, libtiff, libwebp, @@ -9,8 +8,12 @@ cmake, fetchFromGitHub, validatePkgConfig, + libpng, + libjpeg, + nix-update-script, # Boolean flags enableTests ? true, + enableSTB ? true, enableImageIO ? stdenv.hostPlatform.isDarwin, }: @@ -39,29 +42,44 @@ stdenv.mkDerivation (finalAttrs: { validatePkgConfig ]; - buildInputs = [ - sdl3 - libtiff - libwebp - libavif - ] ++ (lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation); + buildInputs = + [ + sdl3 + libtiff + libwebp + libavif + ] + ++ (lib.optionals (!enableSTB) [ + libpng + libjpeg + ]); cmakeFlags = [ # fail when a dependency could not be found (lib.cmakeBool "SDLIMAGE_STRICT" true) # disable shared dependencies as they're opened at runtime using SDL_LoadObject otherwise. (lib.cmakeBool "SDLIMAGE_DEPS_SHARED" false) + # disable stbi + (lib.cmakeBool "SDLIMAGE_BACKEND_STB" enableSTB) # enable imageio backend (lib.cmakeBool "SDLIMAGE_BACKEND_IMAGEIO" enableImageIO) # enable tests (lib.cmakeBool "SDLIMAGE_TESTS" enableTests) ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "release-(3\\..*)" + ]; + }; + meta = { description = "SDL image library"; homepage = "https://github.com/libsdl-org/SDL_image"; license = lib.licenses.zlib; - maintainers = with lib.maintainers; [ evythedemon ]; + maintainers = [ lib.maintainers.evythedemon ]; + teams = [ lib.teams.sdl ]; inherit (sdl3.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/sdl3-ttf/package.nix b/pkgs/by-name/sd/sdl3-ttf/package.nix index 917ac3c13753..c3ccf66b346a 100644 --- a/pkgs/by-name/sd/sdl3-ttf/package.nix +++ b/pkgs/by-name/sd/sdl3-ttf/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, nix-update-script, testers, validatePkgConfig, @@ -12,27 +11,20 @@ harfbuzz, glib, ninja, + fixDarwinDylibNames, }: stdenv.mkDerivation (finalAttrs: { pname = "sdl3-ttf"; - version = "3.2.0"; + version = "3.2.2"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL_ttf"; tag = "release-${finalAttrs.version}"; - hash = "sha256-eq7yWw7PWIeXWjuNHaQUiV+x0qng4FJNscsYRALK40I="; + hash = "sha256-g7LfLxs7yr7bezQWPWn8arNuPxCfYLCO4kzXmLRUUSY="; }; - # fix CMake path handling (remove on next update) - patches = [ - (fetchpatch { - url = "https://github.com/libsdl-org/SDL_ttf/commit/ad2ffa825d4535ddfb57861a7e33dff4a9bc6a94.patch?full_index=1"; - hash = "sha256-emf7UnfB6Rl1+R74lsoIvm9ezDZtjHUS/t4k/RxbaYg="; - }) - ]; - strictDeps = true; doCheck = true; @@ -40,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja validatePkgConfig - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ sdl3 @@ -57,7 +49,12 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "release-(3\\..*)" + ]; + }; tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; @@ -70,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { charain Emin017 ]; + teams = [ lib.teams.sdl ]; pkgConfigModules = [ "sdl3-ttf" ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 1093605f44c1..eb06643b1326 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -7,7 +7,6 @@ cmake, darwinMinVersionHook, dbus, - fcitx5, fetchFromGitHub, ibus, installShellFiles, @@ -57,7 +56,7 @@ assert lib.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "sdl3"; - version = "3.2.10"; + version = "3.2.12"; outputs = [ "lib" @@ -69,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL"; tag = "release-${finalAttrs.version}"; - hash = "sha256-SylXpHPT4Y/37UapfLScJJ/CGniNyK4UNVAWax+WiBo="; + hash = "sha256-CPCbbVbi0gwSUkaEBOQPJwCU2NN9Lex2Z4hqBfIjn+o="; }; postPatch = @@ -100,7 +99,6 @@ stdenv.mkDerivation (finalAttrs: { apple-sdk_11 ] ++ lib.optionals ibusSupport [ - fcitx5 ibus ] ++ lib.optional waylandSupport zenity; @@ -228,6 +226,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/libsdl-org/SDL/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.zlib; maintainers = with lib.maintainers; [ getchoo ]; + teams = [ lib.teams.sdl ]; platforms = lib.platforms.unix ++ lib.platforms.windows; pkgConfigModules = [ "sdl3" ]; }; diff --git a/pkgs/by-name/sd/sdrpp/package.nix b/pkgs/by-name/sd/sdrpp/package.nix new file mode 100644 index 000000000000..8e486eee2594 --- /dev/null +++ b/pkgs/by-name/sd/sdrpp/package.nix @@ -0,0 +1,183 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + libX11, + glfw, + glew, + fftwFloat, + volk, + zstd, + # Sources + airspy_source ? true, + airspy, + airspyhf_source ? true, + airspyhf, + bladerf_source ? true, + libbladeRF, + file_source ? true, + hackrf_source ? true, + hackrf, + limesdr_source ? true, + limesuite, + perseus_source ? false, # needs libperseus-sdr, not yet available in nixpks + plutosdr_source ? stdenv.hostPlatform.isLinux, + libiio, + libad9361, + rfspace_source ? true, + rtl_sdr_source ? true, + rtl-sdr-osmocom, + libusb1, # osmocom better w/ rtlsdr v4 + rtl_tcp_source ? true, + sdrplay_source ? false, + sdrplay, + soapy_source ? true, + soapysdr-with-plugins, + spyserver_source ? true, + usrp_source ? false, + uhd, + boost, + + # Sinks + audio_sink ? true, + rtaudio, + network_sink ? true, + portaudio_sink ? false, + portaudio, + + # Decoders + falcon9_decoder ? false, + m17_decoder ? false, + codec2, + meteor_demodulator ? true, + radio ? true, + weather_sat_decoder ? false, # is missing some dsp/pll.h + + # Misc + discord_presence ? true, + frequency_manager ? true, + recorder ? true, + rigctl_server ? true, + scanner ? true, +}: + +stdenv.mkDerivation rec { + pname = "sdrpp"; + + # SDR++ uses a rolling release model. + # Choose a git hash from head and use the date from that commit as + # version qualifier + git_hash = "27ab5bf3c194169ddf60ca312723fce96149cc8e"; + git_date = "2024-01-22"; + version = "1.1.0-unstable-" + git_date; + + src = fetchFromGitHub { + owner = "AlexandreRouma"; + repo = "SDRPlusPlus"; + rev = git_hash; + hash = "sha256-R4xWeqdHEAaje37VQaGlg+L2iYIOH4tXMHvZkZq4SDU="; + }; + + patches = [ ./runtime-prefix.patch ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/share" "share" \ + --replace "set(CMAKE_INSTALL_PREFIX" "#set(CMAKE_INSTALL_PREFIX" + substituteInPlace decoder_modules/m17_decoder/src/m17dsp.h \ + --replace "codec2.h" "codec2/codec2.h" + # Since the __TIME_ and __DATE__ is canonicalized in the build, + # use our qualified version shown in the programs window title. + substituteInPlace core/src/version.h --replace "1.1.0" "$version" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = + [ + glfw + glew + fftwFloat + volk + zstd + ] + ++ lib.optional stdenv.hostPlatform.isLinux libX11 + ++ lib.optional airspy_source airspy + ++ lib.optional airspyhf_source airspyhf + ++ lib.optional bladerf_source libbladeRF + ++ lib.optional hackrf_source hackrf + ++ lib.optional limesdr_source limesuite + ++ lib.optionals rtl_sdr_source [ + rtl-sdr-osmocom + libusb1 + ] + ++ lib.optional sdrplay_source sdrplay + ++ lib.optional soapy_source soapysdr-with-plugins + ++ lib.optionals plutosdr_source [ + libiio + libad9361 + ] + ++ lib.optionals usrp_source [ + uhd + boost + ] + ++ lib.optional audio_sink rtaudio + ++ lib.optional portaudio_sink portaudio + ++ lib.optional m17_decoder codec2; + + cmakeFlags = [ + # Sources + (lib.cmakeBool "OPT_BUILD_AIRSPYHF_SOURCE" airspyhf_source) + (lib.cmakeBool "OPT_BUILD_AIRSPY_SOURCE" airspy_source) + (lib.cmakeBool "OPT_BUILD_BLADERF_SOURCE" bladerf_source) + (lib.cmakeBool "OPT_BUILD_FILE_SOURCE" file_source) + (lib.cmakeBool "OPT_BUILD_HACKRF_SOURCE" hackrf_source) + (lib.cmakeBool "OPT_BUILD_LIMESDR_SOURCE" limesdr_source) + (lib.cmakeBool "OPT_BUILD_PERSEUS_SOURCE" perseus_source) + (lib.cmakeBool "OPT_BUILD_PLUTOSDR_SOURCE" plutosdr_source) + (lib.cmakeBool "OPT_BUILD_RFSPACE_SOURCE" rfspace_source) + (lib.cmakeBool "OPT_BUILD_RTL_SDR_SOURCE" rtl_sdr_source) + (lib.cmakeBool "OPT_BUILD_RTL_TCP_SOURCE" rtl_tcp_source) + (lib.cmakeBool "OPT_BUILD_SDRPLAY_SOURCE" sdrplay_source) + (lib.cmakeBool "OPT_BUILD_SOAPY_SOURCE" soapy_source) + (lib.cmakeBool "OPT_BUILD_SPYSERVER_SOURCE" spyserver_source) + (lib.cmakeBool "OPT_BUILD_USRP_SOURCE" usrp_source) + + # Sinks + (lib.cmakeBool "OPT_BUILD_AUDIO_SINK" audio_sink) + (lib.cmakeBool "OPT_BUILD_NETWORK_SINK" network_sink) + (lib.cmakeBool "OPT_BUILD_NEW_PORTAUDIO_SINK" portaudio_sink) + + # Decoders + (lib.cmakeBool "OPT_BUILD_FALCON9_DECODER" falcon9_decoder) + (lib.cmakeBool "OPT_BUILD_M17_DECODER" m17_decoder) + (lib.cmakeBool "OPT_BUILD_METEOR_DEMODULATOR" meteor_demodulator) + (lib.cmakeBool "OPT_BUILD_RADIO" radio) + (lib.cmakeBool "OPT_BUILD_WEATHER_SAT_DECODER" weather_sat_decoder) + + # Misc + (lib.cmakeBool "OPT_BUILD_DISCORD_PRESENCE" discord_presence) + (lib.cmakeBool "OPT_BUILD_FREQUENCY_MANAGER" frequency_manager) + (lib.cmakeBool "OPT_BUILD_RECORDER" recorder) + (lib.cmakeBool "OPT_BUILD_RIGCTL_SERVER" rigctl_server) + (lib.cmakeBool "OPT_BUILD_SCANNER" scanner) + ]; + + env.NIX_CFLAGS_COMPILE = "-fpermissive"; + + hardeningDisable = lib.optional stdenv.cc.isClang "format"; + + meta = with lib; { + description = "Cross-Platform SDR Software"; + homepage = "https://github.com/AlexandreRouma/SDRPlusPlus"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + mainProgram = "sdrpp"; + }; +} diff --git a/pkgs/applications/radio/sdrpp/runtime-prefix.patch b/pkgs/by-name/sd/sdrpp/runtime-prefix.patch similarity index 100% rename from pkgs/applications/radio/sdrpp/runtime-prefix.patch rename to pkgs/by-name/sd/sdrpp/runtime-prefix.patch diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix index 3816e739d140..98d140d5de49 100644 --- a/pkgs/by-name/se/sea-orm-cli/package.nix +++ b/pkgs/by-name/se/sea-orm-cli/package.nix @@ -9,11 +9,11 @@ }: rustPlatform.buildRustPackage rec { pname = "sea-orm-cli"; - version = "1.1.7"; + version = "1.1.11"; src = fetchCrate { inherit pname version; - hash = "sha256-/Wer+3uNWk9p/l1uVpMLEXrDQ/PB+rcpWPi6tuhucSo="; + hash = "sha256-JaUlRQfYTg/5GC3SHjDRYHc54naOW4NpdfB6lMcQqog="; }; nativeBuildInputs = [ pkg-config ]; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; useFetchCargoVendor = true; - cargoHash = "sha256-9o8HT5GNeqGQqzrDhSzzwoeo//MYV1YPec98j8UMHv4="; + cargoHash = "sha256-oytYVAbmGPotnnI7morg8ePH8Ox1hD1WhGwEct4F0vw="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix index 9c86c5f5304e..1efa4851ec4c 100644 --- a/pkgs/by-name/se/seagoat/package.nix +++ b/pkgs/by-name/se/seagoat/package.nix @@ -7,18 +7,21 @@ gitMinimal, ripgrep, writableTmpDirAsHomeHook, + + versionCheckHook, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "seagoat"; - version = "0.54.4"; + version = "0.54.17"; pyproject = true; src = fetchFromGitHub { owner = "kantord"; repo = "SeaGOAT"; tag = "v${version}"; - hash = "sha256-vix/tecZfKPF2pMuaYhBa3Y0qh3DelWYpta8Qy0saUE="; + hash = "sha256-8pLBZXj9p+nO+deozo57H/FlxDKd9KSQHZ8qkGsNzhA="; }; build-system = [ python3Packages.poetry-core ]; @@ -26,6 +29,7 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "chromadb" "psutil" + "setuptools" ]; dependencies = with python3Packages; [ @@ -59,8 +63,10 @@ python3Packages.buildPythonApplication rec { ++ [ gitMinimal ripgrep + versionCheckHook writableTmpDirAsHomeHook ]; + versionCheckProgramArg = "--version"; disabledTests = import ./failing_tests.nix; @@ -80,6 +86,10 @@ python3Packages.buildPythonApplication rec { --prefix PATH : "${ripgrep}/bin" ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Local-first semantic code search engine"; homepage = "https://kantord.github.io/SeaGOAT/"; diff --git a/pkgs/by-name/se/seahorse/package.nix b/pkgs/by-name/se/seahorse/package.nix index 1abdef69c734..a109960b7f12 100644 --- a/pkgs/by-name/se/seahorse/package.nix +++ b/pkgs/by-name/se/seahorse/package.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/seahorse"; description = "Application for managing encryption keys and passwords in the GnomeKeyring"; mainProgram = "seahorse"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 264dc4473f28..9e8307b0d48e 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -37,13 +37,13 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2025-02-09"; + version = "0-unstable-2025-04-09"; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "a1e2b254677a22f1f8968a06564661ac6203c162"; - hash = "sha256-DrSj1wQUWq9xVuQqt0BZ79JgyRS9qJqg1cdYTIBb1A8="; + rev = "15384e8fc596da9c4a7e27393f8100018c3a61ed"; + hash = "sha256-exkn/gQALJteUAsg3qeSnRGEbKANkhSBDziWUgJ1fF8="; }; postPatch = '' diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index e86774137597..02f152cd6767 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.85"; + version = "3.87"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-vW/+zvpx5UIAUwsPyad2Ib+wI3gtBbh23k03yCiGnH0="; + hash = "sha256-B6MgmgxvbGTcJ4GHK+TT30sb++29gvr0Ce004YCGF2E="; }; - vendorHash = "sha256-wlwL/9c0WuGzHfMotYKltjzeIVUhDJ0OTzXF9QE4zcw="; + vendorHash = "sha256-39MXGJvaKipqTRN5w9UKeRnkbsNgNx0eSdnRR/cnd4Y="; subPackages = [ "weed" ]; diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix index c27d9d98e41d..11f8dd65997c 100644 --- a/pkgs/by-name/se/seclists/package.nix +++ b/pkgs/by-name/se/seclists/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "seclists"; - version = "2025.1"; + version = "2025.2"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "SecLists"; - rev = "2025.1"; - hash = "sha256-XfiaOaLAG8B6Kpv+oybfEBgYpoO9XlFLqhTtyuj6qV0="; + rev = "2025.2"; + hash = "sha256-gQoOGdPWM6ChD1abJb7KH+UhrFfap2ThwDLB0878wUQ="; }; installPhase = '' diff --git a/pkgs/by-name/se/secretscanner/package.nix b/pkgs/by-name/se/secretscanner/package.nix index 356ecd9102f3..be6f24c530ff 100644 --- a/pkgs/by-name/se/secretscanner/package.nix +++ b/pkgs/by-name/se/secretscanner/package.nix @@ -2,11 +2,11 @@ lib, buildGoModule, fetchFromGitHub, - hyperscan, pkg-config, protobuf, protoc-gen-go, protoc-gen-go-grpc, + vectorscan, }: buildGoModule rec { @@ -35,7 +35,7 @@ buildGoModule rec { ]; buildInputs = [ - hyperscan + vectorscan ]; preBuild = '' @@ -52,7 +52,10 @@ buildGoModule rec { mainProgram = "secretscanner"; homepage = "https://github.com/deepfence/SecretScanner"; changelog = "https://github.com/deepfence/SecretScanner/releases/tag/v${version}"; - platforms = [ "x86_64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/by-name/se/securefs/package.nix similarity index 100% rename from pkgs/tools/filesystems/securefs/default.nix rename to pkgs/by-name/se/securefs/package.nix diff --git a/pkgs/by-name/se/sedutil/package.nix b/pkgs/by-name/se/sedutil/package.nix index fab012482eec..99e0f70c9022 100644 --- a/pkgs/by-name/se/sedutil/package.nix +++ b/pkgs/by-name/se/sedutil/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sedutil"; - version = "1.49.7"; + version = "1.49.13"; src = fetchFromGitHub { owner = "Drive-Trust-Alliance"; repo = "sedutil"; tag = version; - hash = "sha256-gas2OMy3p8cQHKsniRXYyxKo98dxmHg44AA2KujLN6w="; + hash = "sha256-bSeTbpeecufXNZKNb5A0gWYF3qkBc2fSmNTZxkDW+Vc="; }; postPatch = '' diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix index 31bf523f7900..c488e4b816ff 100644 --- a/pkgs/by-name/se/selene/package.nix +++ b/pkgs/by-name/se/selene/package.nix @@ -5,8 +5,6 @@ robloxSupport ? true, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,13 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals robloxSupport [ - openssl - ] - ++ lib.optionals (robloxSupport && stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals robloxSupport [ + openssl + ]; buildNoDefaultFeatures = !robloxSupport; diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 02ce397ea19a..15f5b3ff4960 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,10 +24,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-MgnmEJif4Z4CcmBFkC5BJR67DMGm1ttObtl4LhAFw4g="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - # TODO: enable tests # The test suite depends on a number of browsers and network requests, # check the Gentoo package for inspiration diff --git a/pkgs/by-name/se/selinux-python/package.nix b/pkgs/by-name/se/selinux-python/package.nix index 3d15b6dd502c..2d05e602d171 100644 --- a/pkgs/by-name/se/selinux-python/package.nix +++ b/pkgs/by-name/se/selinux-python/package.nix @@ -3,47 +3,67 @@ stdenv, fetchurl, python3, + gettext, libselinux, libsemanage, libsepol, setools, }: -# this is python3 only because setools only supports python3 -stdenv.mkDerivation rec { +let + selinuxPython3 = python3.withPackages ( + ps: with ps; [ + pip + setuptools + ] + ); +in +stdenv.mkDerivation (finalAttrs: { pname = "selinux-python"; - version = "3.3"; + version = "3.8.1"; inherit (libsepol) se_url; src = fetchurl { - url = "${se_url}/${version}/selinux-python-${version}.tar.gz"; - sha256 = "1v244hpb45my303793xa4kcn7qnxjgxn4ja7rdn9k1q361hi1nca"; + url = "${finalAttrs.se_url}/${finalAttrs.version}/selinux-python-${finalAttrs.version}.tar.gz"; + hash = "sha256-dJAlv6SqDgCb8//EVdVloY1Ntxz+eWvkQFghcXIGwlo="; }; strictDeps = true; nativeBuildInputs = [ - python3 - python3.pkgs.distutils + selinuxPython3 python3.pkgs.wrapPython + gettext ]; - buildInputs = [ libsepol ]; - propagatedBuildInputs = [ + + buildInputs = [ + python3 + libsepol libselinux - libsemanage + ]; + + pythonPath = [ + python3.pkgs.libselinux.py + libsemanage.py setools - python3.pkgs.ipy ]; postPatch = '' - substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix" - substituteInPlace sepolgen/src/share/Makefile --replace "/var/lib/sepolgen" \ - "\$PREFIX/var/lib/sepolgen" + # We would like to disable build isolation so we use the provided setuptools (this is part of a `pip install` command) + substituteInPlace sepolicy/Makefile --replace-fail 'echo --root' 'echo --no-build-isolation --root' + + # Replace hardcoded paths. + substituteInPlace sepolgen/src/share/Makefile --replace-fail "/var/lib/sepolgen" \ + '$(PREFIX)/var/lib/sepolgen' + substituteInPlace po/Makefile --replace-fail "/usr/bin/install" "install" ''; makeFlags = [ "PREFIX=$(out)" + # This makes pip successfully install it (note the test -n "$(DESTDIR)" nonsense) + # https://github.com/SELinuxProject/selinux/blob/d1e3170556e1023e07b3c071ce89543ead6ba6f8/python/sepolicy/Makefile#L30 + "DESTDIR=/" "LOCALEDIR=$(out)/share/locale" "BASHCOMPLETIONDIR=$(out)/share/bash-completion/completions" "PYTHON=python" @@ -51,15 +71,41 @@ stdenv.mkDerivation rec { "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; + preFixup = '' + patchShebangs --host $out/bin/* + ''; + postFixup = '' wrapPythonPrograms ''; + doInstallCheck = true; + + installCheckPhase = '' + # Version hasn't changed in 17 years, if it suddenly does these tests deserve to break + $out/bin/audit2allow --version | grep -Fm1 'audit2allow .1' + $out/bin/audit2why --version | grep -Fm1 'audit2allow .1' + $out/bin/sepolgen-ifgen --version | grep -Fm1 'sepolgen-ifgen .1' + + # "chcat: Requires a mls enabled system" or help, which includes chcat + { $out/bin/chcat --help || true; } | grep -Fm1 'chcat' + + $out/bin/semanage --help | grep -Fm1 'semanage' + $out/bin/sepolgen --help | grep -Fm1 'sepolicy' + $out/bin/sepolicy --help | grep -Fm1 'sepolicy' + + # Should at least run, even if we can't provide it a policy file and need to provide /dev/zero + { $out/bin/sepolgen-ifgen-attr-helper test /dev/null 2>&1 || true; } | grep -Fm1 'error(s) encountered' >/dev/null + ''; + meta = with lib; { description = "SELinux policy core utilities written in Python"; license = licenses.gpl2Plus; homepage = "https://selinuxproject.org"; - maintainers = with lib.maintainers; [ RossComputerGuy ]; + maintainers = with lib.maintainers; [ + RossComputerGuy + numinit + ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/se/selinux-refpolicy/package.nix b/pkgs/by-name/se/selinux-refpolicy/package.nix new file mode 100644 index 000000000000..08c73e68b116 --- /dev/null +++ b/pkgs/by-name/se/selinux-refpolicy/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gnum4, + python3, + getopt, + checkpolicy, + policycoreutils, + semodule-utils, + policyVersion ? null, + moduleVersion ? null, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "selinux-refpolicy"; + version = "2.20250213"; + + src = fetchFromGitHub { + owner = "SELinuxProject"; + repo = "refpolicy"; + tag = "RELEASE_${lib.versions.major finalAttrs.version}_${lib.versions.minor finalAttrs.version}"; + hash = "sha256-VsQRqigGwSVJ52uqFj1L2xzQqbWwQ/YaFI5Rsn/HbP8="; + }; + + nativeBuildInputs = [ + gnum4 + python3 + getopt + ]; + + configurePhase = '' + runHook preConfigure + make conf ''${makeFlags[@]} + runHook postConfigure + ''; + + makeFlags = + [ + "CHECKPOLICY=${lib.getExe checkpolicy}" + "CHECKMODULE=${lib.getExe' checkpolicy "checkmodule"}" + "SEMODULE=${lib.getExe' policycoreutils "semodule"}" + "SEMOD_PKG=${lib.getExe' semodule-utils "semodule_package"}" + "SEMOD_LNK=${lib.getExe' semodule-utils "semodule_link"}" + "SEMOD_EXP=${lib.getExe' semodule-utils "semodule_expand"}" + "DESTDIR=${placeholder "out"}" + "prefix=${placeholder "out"}" + "DISTRO=nixos" + "SYSTEMD=y" + "UBAC=y" + ] + ++ lib.optional (policyVersion != null) "OUTPUT_POLICY=${toString policyVersion}" + ++ lib.optional (moduleVersion != null) "OUTPUT_MODULE=${toString moduleVersion}"; + + installTargets = "all install install-headers install-docs"; + + meta = { + description = "SELinux Reference Policy v2"; + homepage = "http://userspace.selinuxproject.org"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ RossComputerGuy ]; + license = lib.licenses.gpl2Only; + }; +}) diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix index 17d014b2c562..0bd8db754e6d 100644 --- a/pkgs/by-name/se/semantic-release/package.nix +++ b/pkgs/by-name/se/semantic-release/package.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "semantic-release"; - version = "24.2.3"; + version = "24.2.4"; src = fetchFromGitHub { owner = "semantic-release"; repo = "semantic-release"; rev = "v${version}"; - hash = "sha256-DoOnrgS6g4Qie1v7AVyaJgseG/z7rZX8FwXyvokOy0Y="; + hash = "sha256-nQfHgVQ2Daa9CTiHCzd8XRuxAXL/jOG7KBfoZZWAaNo="; }; - npmDepsHash = "sha256-K/7Wk5yDwY7b/MDuBC/PwNzOgt9PPhUXrQZRmkZu+gE="; + npmDepsHash = "sha256-T+U9FKYa6VUIOLYOYwCBs0B53vgNlTYXZLJm+YwfWu4="; dontNpmBuild = true; diff --git a/pkgs/by-name/se/send/package.nix b/pkgs/by-name/se/send/package.nix index b9d9298af3d5..95e51b8de8f8 100644 --- a/pkgs/by-name/se/send/package.nix +++ b/pkgs/by-name/se/send/package.nix @@ -3,22 +3,21 @@ buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, - nodejs, + nodejs_20, nixosTests, }: - buildNpmPackage rec { pname = "send"; - version = "3.4.23"; + version = "3.4.25"; src = fetchFromGitHub { owner = "timvisee"; repo = "send"; tag = "v${version}"; - hash = "sha256-bqQEXLwUvTKX+m2yNHRnrl+eeaGmcovXpXugxd+j14A="; + hash = "sha256-2XeChKJi57auIf9aSe2JlP55tiE8dmrCBtUfCkziYi8="; }; - npmDepsHash = "sha256-r1iaurKuhpP0sevB5pFdtv9j1ikM1fKL7Jgakh4FzTI="; + npmDepsHash = "sha256-DY+4qOzoURx8xmemhutxcNxg0Tv2u6tyJHK5RhBjo8w="; nativeBuildInputs = [ makeBinaryWrapper @@ -38,7 +37,7 @@ buildNpmPackage rec { cp -r dist $out/lib/node_modules/send/ ln -s $out/lib/node_modules/send/dist/version.json $out/lib/node_modules/send/version.json - makeWrapper ${lib.getExe nodejs} $out/bin/send \ + makeWrapper ${lib.getExe nodejs_20} $out/bin/send \ --add-flags $out/lib/node_modules/send/server/bin/prod.js \ --set "NODE_ENV" "production" ''; @@ -52,7 +51,10 @@ buildNpmPackage rec { changelog = "https://github.com/timvisee/send/releases/tag/v${version}"; homepage = "https://github.com/timvisee/send"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ moraxyc ]; + maintainers = with lib.maintainers; [ + moraxyc + MrSom3body + ]; mainProgram = "send"; }; } diff --git a/pkgs/by-name/se/sendgmail/package.nix b/pkgs/by-name/se/sendgmail/package.nix new file mode 100644 index 000000000000..b735fd70c96c --- /dev/null +++ b/pkgs/by-name/se/sendgmail/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule { + pname = "sendgmail"; + version = "0-unstable-2025-03-06"; + + src = fetchFromGitHub { + owner = "google"; + repo = "gmail-oauth2-tools"; + rev = "85c6b4f07e637683cc5e0ec6a66ce8e4397a4b18"; + hash = "sha256-bzbTU9SA4dJKtQVkqESvV5o3l3MY4Uy7HDqo7jI3dhM="; + }; + + sourceRoot = "source/go/sendgmail"; + + vendorHash = "sha256-0pjcO2Ati+mUSw614uEL3CatHSgbgDUfOBE8bWpjmcw="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Mimic sendmail with Gmail for git send-email"; + homepage = "https://github.com/google/gmail-oauth2-tools/tree/master/go/sendgmail"; + maintainers = [ lib.maintainers.samw ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index bc68f58f9745..335b8c0219d1 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -1,31 +1,31 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = "sendme"; rev = "v${version}"; - hash = "sha256-OmP2FLvBupeJeGhMMBgcTpMSgQZ5JWzXBVeFZt7EU4Q="; + hash = "sha256-21JNyncChl8rv3IDdvYRF/nvMpAGCBps4xsBP9b/1lA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8Ry3rpGTNcvMIA3Q10Cb3uJHOBQin9AhlLNRekaKw/0="; + cargoHash = "sha256-1VVpjeGU6/+apTHv7klo7FkAQ3AVjiziQRNI7yFbvh0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); + __darwinAllowLocalNetworking = true; + + # On Darwin, sendme invokes CoreFoundation APIs that read ICU data from the + # system. Ensure these paths are accessible in the sandbox to avoid segfaults + # during checkPhase. + sandboxProfile = '' + (allow file-read* (subpath "/usr/share/icu")) + ''; meta = with lib; { description = "Tool to send files and directories, based on iroh"; diff --git a/pkgs/by-name/se/senpai/package.nix b/pkgs/by-name/se/senpai/package.nix index b0488b7ef307..9812e3d934f2 100644 --- a/pkgs/by-name/se/senpai/package.nix +++ b/pkgs/by-name/se/senpai/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "senpai"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromSourcehut { owner = "~delthas"; repo = "senpai"; rev = "v${version}"; - sha256 = "sha256-3DVy+7mMVFmPpGxwJqtt2+QwNEMrgZazynawE/Wf+UM="; + sha256 = "sha256-lwfhRnaHGOIp6NyugPEu6P+3WXkVgQEWaz7DUfHiJrQ="; }; vendorHash = "sha256-6glslBPjJr0TmrAkDGbOQ4sDzvODlavVeTugs6RXsCU="; diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix new file mode 100644 index 000000000000..1250f84acb5e --- /dev/null +++ b/pkgs/by-name/se/sentry-cli/package.nix @@ -0,0 +1,49 @@ +{ + rustPlatform, + fetchFromGitHub, + lib, + installShellFiles, + openssl, + pkg-config, + stdenv, +}: +rustPlatform.buildRustPackage rec { + pname = "sentry-cli"; + version = "2.43.1"; + + src = fetchFromGitHub { + owner = "getsentry"; + repo = "sentry-cli"; + rev = version; + hash = "sha256-uGYL+xEXcf7+qe9NUvzFVjGGx33UpwjS7EHD/xVV+9Q="; + }; + doCheck = false; + + # Needed to get openssl-sys to use pkgconfig. + OPENSSL_NO_VENDOR = 1; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-RnFsV9m9ChmUW1PcxSNR5i6lwKBfqp9XXUNpezjCfeY="; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd sentry-cli \ + --bash <($out/bin/sentry-cli completions bash) \ + --fish <($out/bin/sentry-cli completions fish) \ + --zsh <($out/bin/sentry-cli completions zsh) + ''; + + meta = with lib; { + homepage = "https://docs.sentry.io/cli/"; + license = licenses.bsd3; + description = "Command line utility to work with Sentry"; + mainProgram = "sentry-cli"; + changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md"; + maintainers = with maintainers; [ rizary ]; + }; +} diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index fdafea5a5403..d684def2563d 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.8.2"; + version = "0.8.5"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; - rev = version; - hash = "sha256-X5QA27y/7bJoGC1qDNhvbh5Cqm4StiZ9jkdsed+oVL4="; + tag = version; + hash = "sha256-mWyBejc5i5yt2AX062o+sACR3P4wtGfzbJJQTItAXYU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/sequeler/package.nix b/pkgs/by-name/se/sequeler/package.nix index 8c17dbe2cda3..456b4d5a3412 100644 --- a/pkgs/by-name/se/sequeler/package.nix +++ b/pkgs/by-name/se/sequeler/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/Alecaddd/sequeler"; license = licenses.gpl3; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + teams = [ teams.pantheon ]; platforms = platforms.linux; mainProgram = "com.github.alecaddd.sequeler"; }; diff --git a/pkgs/by-name/se/sequential/package.nix b/pkgs/by-name/se/sequential/package.nix new file mode 100644 index 000000000000..680d7f91d6a0 --- /dev/null +++ b/pkgs/by-name/se/sequential/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchurl, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "sequential"; + version = "2.6.0"; + + buildDate = "2024-09-07.14.59.00"; + + src = fetchurl { + url = "https://github.com/chuchusoft/Sequential/releases/download/v${finalAttrs.version}/Sequential.app.${finalAttrs.buildDate}.tar.xz"; + hash = "sha256-tgpzMAHw266UhKo43GIHFCx/SDq/zIJkWz1TPYTeTzI="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications/Sequential.app + cp -R Sequential.app $out/Applications + + runHook postInstall + ''; + + meta = { + description = "macOS native comic reader and image viewer"; + homepage = "https://github.com/chuchusoft/Sequential"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Enzime ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index 3dfbd7f562ec..5d8084732036 100644 --- a/pkgs/by-name/se/sequoia-sq/package.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -1,8 +1,6 @@ { - stdenv, fetchFromGitLab, lib, - darwin, nettle, nix-update-script, rustPlatform, @@ -16,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sequoia-sq"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sq"; tag = "v${finalAttrs.version}"; - hash = "sha256-1jssSlyjbrGgkxGC1gieZooVVI42Qvz0q+pIfcZRIj0="; + hash = "sha256-lM+j1KtH3U/lbPXnKALAP75YokDufbdz8s8bjb0VXUY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tATxGaoF/+cUDywvlnW1N2sKo/FbKhJM7yUb74mxB5s="; + cargoHash = "sha256-3z1Qm/eeVlH0/x3C8PSSPIlQaRKk1U6mRlEiKk0AaVQ="; nativeBuildInputs = [ pkg-config @@ -35,19 +33,11 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles ]; - buildInputs = - [ - openssl - sqlite - nettle - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ + openssl + sqlite + nettle + ]; # Needed for tests to be able to create a ~/.local/share/sequoia directory # Needed for avoiding "OpenSSL error" since 1.2.0 diff --git a/pkgs/by-name/se/sequoia-wot/package.nix b/pkgs/by-name/se/sequoia-wot/package.nix index b9aaf9dc9a92..d949f6743ca0 100644 --- a/pkgs/by-name/se/sequoia-wot/package.nix +++ b/pkgs/by-name/se/sequoia-wot/package.nix @@ -8,7 +8,6 @@ nettle, openssl, sqlite, - darwin, gnupg, }: rustPlatform.buildRustPackage rec { @@ -36,10 +35,6 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - # See comment near sequoia-openpgp/crypto- buildFeatures - ] ++ lib.optionals (!stdenv.targetPlatform.isWindows) [ nettle ]; diff --git a/pkgs/by-name/se/serialdv/package.nix b/pkgs/by-name/se/serialdv/package.nix index 655831830da1..56f954feedb4 100644 --- a/pkgs/by-name/se/serialdv/package.nix +++ b/pkgs/by-name/se/serialdv/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "serialdv"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "f4exb"; repo = "serialdv"; rev = "v${version}"; - sha256 = "0d88h2wjhf79nisiv96bq522hkbknzm88wsv0q9k33mzmrwnrx93"; + sha256 = "sha256-uswddoIpTXqsvjM2/ygdud9jZHTemLn9Dlv9FBXXKow="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index 2b14244649ad..28939ed70d01 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, testers, gitMinimal, serie, @@ -11,25 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "serie"; - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitHub { owner = "lusingander"; repo = "serie"; rev = "v${version}"; - hash = "sha256-Uf7HYcN/lJc2TSl2dZQcOKyEeLHMb2RTQwSzXWZnBkw="; + hash = "sha256-26B/bwXz60fcZrh6H1RPROiML44S1Pt1J3VrJh2gRrI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NbBF747sSxmjlTbcYknNZFFsaIVZ6+wHhjMJ6akg4BU="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreGraphics - AppKit - ] - ); + cargoHash = "sha256-Bdk553tECJiMxJlXj147Sv2LzH+nM+/Cm5BpBr78I4o="; nativeCheckInputs = [ gitMinimal ]; diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 62faa989d3dd..3ad024bea40e 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -28,7 +28,6 @@ freetype, gst_all_1, harfbuzz, - libcxx, libGL, libunwind, libxkbcommon, @@ -62,13 +61,13 @@ in rustPlatform.buildRustPackage { pname = "servo"; - version = "0-unstable-2025-03-29"; + version = "0-unstable-2025-05-15"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; - rev = "5d1c64dba9cf3e65f770370eb17f00ad4114edce"; - hash = "sha256-0DuS2WfgWgnxh5qDc/XNL28XxXKnYPQW7F2m4OlANck="; + rev = "103cbed928b0b9ecd7084b5e9dcab135eca19327"; + hash = "sha256-TMrtD7f0bay6NtodM3SZfi8tLCQp6dE5iBicyGXZAco="; # Breaks reproducibility depending on whether the picked commit # has other ref-names or not, which may change over time, i.e. with # "ref-names: HEAD -> main" as long this commit is the branch HEAD @@ -79,7 +78,7 @@ rustPlatform.buildRustPackage { }; useFetchCargoVendor = true; - cargoHash = "sha256-m6lsXHf7SIgbIt8RyhUkJpd1/nJQMSNRS9uTJ6th9ng="; + cargoHash = "sha256-7PTrE2FA2cvOKU35qTYBr7cop65gWY+zSOVlDZiJdow="; # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) @@ -131,10 +130,14 @@ rustPlatform.buildRustPackage { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_14 - libcxx ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + # Builds with additional features for aarch64, see https://github.com/servo/servo/issues/36819 + buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [ + "servo_allocator/use-system-allocator" + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"; # copy resources into `$out` to be used during runtime # link runtime libraries diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix index b9f31b07837c..61e408915c62 100644 --- a/pkgs/by-name/se/session-desktop/package.nix +++ b/pkgs/by-name/se/session-desktop/package.nix @@ -9,12 +9,12 @@ }: let - version = "1.13.2"; + version = "1.15.2"; 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-71v6CvlKa4m1LPG07eGhPqkpK60X4VrafCQyfjQR3rs="; + url = "https://github.com/session-foundation/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; + hash = "sha256-xQ/Fjg04XgXUioCCU0+sOLaTWZV1z05EmzZCqEU++Ok="; }; appimage = appimageTools.wrapType2 { inherit version pname src; }; appimage-contents = appimageTools.extractType2 { inherit version pname src; }; diff --git a/pkgs/by-name/se/setserial/package.nix b/pkgs/by-name/se/setserial/package.nix deleted file mode 100644 index 05564384699a..000000000000 --- a/pkgs/by-name/se/setserial/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - groff, -}: - -stdenv.mkDerivation rec { - pname = "setserial"; - version = "2.17"; - - src = fetchurl { - url = "mirror://sourceforge/setserial/${pname}-${version}.tar.gz"; - sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y"; - }; - - nativeBuildInputs = [ groff ]; - - installFlags = [ "DESTDIR=$(out)" ]; - - postConfigure = '' - sed -e s@/usr/man/@/share/man/@ -i Makefile - ''; - - preInstall = ''mkdir -p "$out/bin" "$out/share/man/man8"''; - - meta = { - description = "Serial port configuration utility"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl2Only; - mainProgram = "setserial"; - }; -} diff --git a/pkgs/by-name/se/seventeenlands/package.nix b/pkgs/by-name/se/seventeenlands/package.nix index 821b23bf025c..ab5d25baf31a 100644 --- a/pkgs/by-name/se/seventeenlands/package.nix +++ b/pkgs/by-name/se/seventeenlands/package.nix @@ -5,11 +5,11 @@ }: python3.pkgs.buildPythonApplication rec { pname = "seventeenlands"; - version = "0.1.42"; + version = "0.1.43"; src = fetchPypi { inherit pname version; - hash = "sha256-P/imV4vvyd6wgjqXzgfIAURFtFhLwX1eS8eiPl79oZk="; + hash = "sha256-oTF4dtMKhx2YR80goKTcyq2P0mxAKLE2Ze5HbMNvyGg="; }; # No tests diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix index 493a1c975d9d..dc2163ceb568 100644 --- a/pkgs/by-name/sf/sfcgal/package.nix +++ b/pkgs/by-name/sf/sfcgal/package.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.com/sfcgal/SFCGAL/-/releases/v${finalAttrs.version}"; license = lib.licenses.lgpl2; platforms = lib.platforms.linux; - maintainers = with lib; teams.geospatial.members ++ [ maintainers.fqidz ]; + maintainers = with lib.maintainers; [ fqidz ]; + teams = [ lib.teams.geospatial ]; }; }) diff --git a/pkgs/by-name/sg/sgrep/package.nix b/pkgs/by-name/sg/sgrep/package.nix deleted file mode 100644 index 4c93b1b6954e..000000000000 --- a/pkgs/by-name/sg/sgrep/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - stdenv, - sgrep, - fetchurl, - runCommand, - lib, - m4, - makeWrapper, -}: - -stdenv.mkDerivation rec { - pname = "sgrep"; - version = "1.94a"; - - src = fetchurl { - url = "https://www.cs.helsinki.fi/pub/Software/Local/Sgrep/sgrep-${version}.tar.gz"; - sha256 = "sha256-1bFkeOOrRHNeJCg9LYldLJyAE5yVIo3zvbKsRGOV+vk="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/sgrep \ - --prefix PATH : ${lib.makeBinPath [ m4 ]} - ''; - - passthru.tests.smokeTest = runCommand "test-sgrep" { } '' - expr='"" __ ""' - data="12" - ${sgrep}/bin/sgrep "$expr" <<<$data >$out - read result <$out - [[ $result = 1 ]] - ''; - - meta = with lib; { - homepage = "https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"; - description = "Grep for structured text formats such as XML"; - mainProgram = "sgrep"; - longDescription = '' - sgrep (structured grep) is a tool for searching and indexing text, - SGML, XML and HTML files and filtering text streams using - structural criteria. - ''; - platforms = platforms.unix; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ eigengrau ]; - }; -} diff --git a/pkgs/by-name/sh/sh4d0wup/package.nix b/pkgs/by-name/sh/sh4d0wup/package.nix new file mode 100644 index 000000000000..93ef3f73bd6e --- /dev/null +++ b/pkgs/by-name/sh/sh4d0wup/package.nix @@ -0,0 +1,77 @@ +{ + lib, + fetchFromGitHub, + gcc, + go, + makeWrapper, + nix-update-script, + openssl, + pcsclite, + pkg-config, + podman, + rustPlatform, + rustc, + sequoia-sq, + shared-mime-info, + versionCheckHook, + xz, # for liblzma + zstd, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "sh4d0wup"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = "sh4d0wup"; + tag = "v${finalAttrs.version}"; + hash = "sha256-gzkh+JYwuYvdNljB6agEVd7WxqJ5lI3sseY3BlkLmXs="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-FjRlKlOX78QClzhhFhkZuaOLA6XpFziSghJltlRPt20="; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + buildInputs = [ + openssl + pcsclite + xz + zstd + ]; + postInstall = '' + wrapProgram $out/bin/sh4d0wup \ + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ''; + + checkInputs = [ sequoia-sq ]; + preCheck = '' + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${shared-mime-info}/share + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; + + env = { + OPENSSL_NO_VENDOR = 1; + SH4D0WUP_GCC_BINARY = lib.getExe gcc; + SH4D0WUP_GO_BINARY = lib.getExe go; + SH4D0WUP_PODMAN_BINARY = lib.getExe podman; + SH4D0WUP_RUSTC_BINARY = lib.getExe' rustc "rustc"; + SH4D0WUP_SQ_BINARY = lib.getExe sequoia-sq; + }; + + meta = { + description = "Signing-key abuse and update exploitation framework"; + homepage = "https://github.com/kpcyrd/sh4d0wup"; + changelog = "https://github.com/kpcyrd/sh4d0wup/releases/tag/v${finalAttrs.version}"; + mainProgram = "sh4d0wup"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ kpcyrd ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index 9a272e4418e8..ef04aac610a0 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/slangc"; - versionCheckProgramArg = [ "-v" ]; + versionCheckProgramArg = "-v"; doInstallCheck = true; passthru.updateScript = gitUpdater { diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index b515addb0730..9c27f92eb921 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.17.2"; + version = "4.17.4"; src = fetchFromGitHub { owner = "shadow-maint"; repo = "shadow"; rev = version; - hash = "sha256-IoHAr35ziujHTukMbA5QN15YbnpwBT7pUYcqRr+rdog="; + hash = "sha256-HlSO1VCrMJtYlSL9/GvVw4mp/pEtuDju6V+6etrAAEk="; }; outputs = [ diff --git a/pkgs/by-name/sh/shadowenv/package.nix b/pkgs/by-name/sh/shadowenv/package.nix new file mode 100644 index 000000000000..b9cb01474888 --- /dev/null +++ b/pkgs/by-name/sh/shadowenv/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + installShellFiles, +}: + +rustPlatform.buildRustPackage rec { + pname = "shadowenv"; + version = "3.0.3"; + + src = fetchFromGitHub { + owner = "Shopify"; + repo = pname; + rev = version; + hash = "sha256-ZipFcwTpKKFnQWOPxXg07V71jitG0NSLpGLEzUSsUFA="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-KNCucBmYVmIQ/XY+UNV667iWLyiEJDnP/8gAmUHGY+0="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage man/man1/shadowenv.1 + installManPage man/man5/shadowlisp.5 + installShellCompletion --bash sh/completions/shadowenv.bash + installShellCompletion --fish sh/completions/shadowenv.fish + installShellCompletion --zsh sh/completions/_shadowenv + ''; + + preCheck = '' + HOME=$TMPDIR + ''; + + meta = with lib; { + homepage = "https://shopify.github.io/shadowenv/"; + description = "reversible directory-local environment variable manipulations"; + license = licenses.mit; + maintainers = [ ]; + mainProgram = "shadowenv"; + }; +} diff --git a/pkgs/by-name/sh/shadowsocks-rust/package.nix b/pkgs/by-name/sh/shadowsocks-rust/package.nix index 54d0a106a533..c0eefbe76bdb 100644 --- a/pkgs/by-name/sh/shadowsocks-rust/package.nix +++ b/pkgs/by-name/sh/shadowsocks-rust/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.23.0"; + version = "1.23.3"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "shadowsocks-rust"; tag = "v${version}"; - hash = "sha256-JcYf6Meq8iG7zcjQu240EKwlAPBriestKlz0RLpIAHg="; + hash = "sha256-gUCDHk6Z3w3ajtYV8s0TXXnJCiHhOdMZRcIK4uPnQ2M="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RadM8sN7ePGNkTanClqgpsDg8fHIrYMHcjbHxDmzKdc="; + cargoHash = "sha256-DsdVvYznh9i3d3UdcKOCYRoisP8BAJ6XLV2JbFhEr5M="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix index ff35f290a91d..7cd5fb54d86c 100644 --- a/pkgs/by-name/sh/shadps4/package.nix +++ b/pkgs/by-name/sh/shadps4/package.nix @@ -18,6 +18,7 @@ libusb1, magic-enum, libgbm, + pipewire, pkg-config, pugixml, qt6, @@ -33,18 +34,18 @@ xorg, xxHash, zlib-ng, - unstableGitUpdater, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "shadps4"; - version = "0.6.0-unstable-2025-03-18"; + version = "0.7.0"; src = fetchFromGitHub { owner = "shadps4-emu"; repo = "shadPS4"; - rev = "171f755c139764d83e6fc712fcbbcc9d4c5c5956"; - hash = "sha256-vYOI4ffKN8QPg6om3T0PUu2I/K84Y7Hn2iUfVHi7N7o="; + tag = "v.${finalAttrs.version}"; + hash = "sha256-g55Ob74Yhnnrsv9+fNA1+uTJ0H2nyH5UT4ITHnrGKDo="; fetchSubmodules = true; }; @@ -65,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXext magic-enum libgbm + pipewire pugixml qt6.qtbase qt6.qtdeclarative @@ -117,10 +119,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.openorbis-example = nixosTests.shadps4; - updateScript = unstableGitUpdater { - tagFormat = "v.*"; - tagPrefix = "v."; - }; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/by-name/sh/shaka-packager/package.nix b/pkgs/by-name/sh/shaka-packager/package.nix index f893540846c5..da252b4bf5f8 100644 --- a/pkgs/by-name/sh/shaka-packager/package.nix +++ b/pkgs/by-name/sh/shaka-packager/package.nix @@ -7,7 +7,7 @@ ninja, python3, nix-update-script, - abseil-cpp, + abseil-cpp_202401, curl, gtest, nlohmann_json, @@ -16,7 +16,7 @@ libwebm, mbedtls, mimalloc, - protobuf, + protobuf_29, zlib, }: @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { # pssh_box.py. ps.protobuf ])) - abseil-cpp + abseil-cpp_202401 curl gtest nlohmann_json @@ -69,9 +69,9 @@ stdenv.mkDerivation (finalAttrs: { libwebm mbedtls mimalloc - (protobuf.override { + (protobuf_29.override { # must be the same version as for shaka-packager - inherit abseil-cpp; + abseil-cpp = abseil-cpp_202401; }) zlib ]; diff --git a/pkgs/by-name/sh/shapelib/package.nix b/pkgs/by-name/sh/shapelib/package.nix index f906d3155703..daf948af95c1 100644 --- a/pkgs/by-name/sh/shapelib/package.nix +++ b/pkgs/by-name/sh/shapelib/package.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { description = "C Library for reading, writing and updating ESRI Shapefiles"; homepage = "http://shapelib.maptools.org/"; license = licenses.gpl2; - maintainers = with maintainers; teams.geospatial.members ++ [ ehmry ]; + maintainers = with maintainers; [ ehmry ]; + teams = [ teams.geospatial ]; changelog = "http://shapelib.maptools.org/release.html"; }; } diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix index 961c6ca606bc..29be893c1993 100644 --- a/pkgs/by-name/sh/share-preview/package.nix +++ b/pkgs/by-name/sh/share-preview/package.nix @@ -12,25 +12,24 @@ desktop-file-utils, libadwaita, openssl, - darwin, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "share-preview"; - version = "0.5.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rafaelmardojai"; repo = "share-preview"; rev = finalAttrs.version; - hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E="; + hash = "sha256-6Pk+3o4ZWF5pDYAtcBgty4b7edzIZnIuJh0KW1VW33I="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "share-preview-${finalAttrs.version}"; - hash = "sha256-XY48fQ5HLvZ1nxLk6rbuxSBAHAPUcnwu/5AwgTWhfbg="; + hash = "sha256-MC5MsoFdeCvF9nIFoYCKoBBpgGysBH36OdmTqbIJt8s="; }; nativeBuildInputs = [ @@ -44,15 +43,10 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils ]; - buildInputs = - [ - libadwaita - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libadwaita + openssl + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ] @@ -65,9 +59,11 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Preview and debug websites metadata tags for social media share"; homepage = "https://apps.gnome.org/SharePreview"; + downloadPage = "https://github.com/rafaelmardojai/share-preview"; + changelog = "https://github.com/rafaelmardojai/share-preview/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; mainProgram = "share-preview"; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/sh/shared-mime-info/package.nix b/pkgs/by-name/sh/shared-mime-info/package.nix index 3d51bade75aa..a1d89b02694e 100644 --- a/pkgs/by-name/sh/shared-mime-info/package.nix +++ b/pkgs/by-name/sh/shared-mime-info/package.nix @@ -52,7 +52,8 @@ stdenv.mkDerivation rec { homepage = "http://freedesktop.org/wiki/Software/shared-mime-info"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = teams.freedesktop.members ++ [ maintainers.mimame ]; + maintainers = [ maintainers.mimame ]; + teams = [ teams.freedesktop ]; mainProgram = "update-mime-database"; }; } diff --git a/pkgs/by-name/sh/sheldon/package.nix b/pkgs/by-name/sh/sheldon/package.nix new file mode 100644 index 000000000000..fa13c5fcb0e7 --- /dev/null +++ b/pkgs/by-name/sh/sheldon/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + installShellFiles, + curl, +}: + +rustPlatform.buildRustPackage rec { + pname = "sheldon"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "rossmacarthur"; + repo = pname; + rev = version; + hash = "sha256-C4rGE+tKlpEJabyGAexIoPmUiLvl87GkL6XH5aJHCrU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-5Ho41WU/DzAdBOGDPmJYipcJMAji6J+Jg8lNQYionng="; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + # Needs network connection + checkFlags = [ + "--skip lock::plugin::tests::external_plugin_lock_git_with_matches" + "--skip lock::plugin::tests::external_plugin_lock_git_with_matches_not_each" + "--skip lock::plugin::tests::external_plugin_lock_git_with_uses" + "--skip lock::plugin::tests::external_plugin_lock_remote" + "--skip lock::source::git::tests::git_checkout_resolve_branch" + "--skip lock::source::git::tests::git_checkout_resolve_rev" + "--skip lock::source::git::tests::git_checkout_resolve_tag" + "--skip lock::source::git::tests::lock_git_and_reinstall" + "--skip lock::source::git::tests::lock_git_https_with_checkout" + "--skip lock::source::local::tests::lock_local" + "--skip lock::source::remote::tests::lock_remote_and_reinstall" + "--skip lock::source::tests::lock_with_git" + "--skip lock::source::tests::lock_with_remote" + "--skip lock::tests::locked_config_clean" + "--skip directories_default" + "--skip directories_old" + "--skip directories_xdg_from_env" + "--skip lock_and_source_github" + "--skip lock_and_source_hooks" + "--skip lock_and_source_inline" + "--skip lock_and_source_profiles" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd sheldon \ + --bash <($out/bin/sheldon completions --shell bash) \ + --zsh <($out/bin/sheldon completions --shell zsh) + ''; + + meta = with lib; { + description = "Fast and configurable shell plugin manager"; + homepage = "https://github.com/rossmacarthur/sheldon"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ seqizz ]; + platforms = platforms.unix; + mainProgram = "sheldon"; + }; +} diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix index 87442def7299..3c52c2e43011 100644 --- a/pkgs/by-name/sh/shell-gpt/package.nix +++ b/pkgs/by-name/sh/shell-gpt/package.nix @@ -22,11 +22,14 @@ python3.pkgs.buildPythonApplication rec { "distro" "typer" "instructor" + "jinja2" ]; build-system = with python3.pkgs; [ hatchling ]; propagatedBuildInputs = with python3.pkgs; [ + jinja2 + requests click distro instructor @@ -43,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/TheR1D/shell_gpt"; changelog = "https://github.com/TheR1D/shell_gpt/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ mglolenstine ]; + maintainers = with maintainers; [ SohamG ]; mainProgram = "sgpt"; }; } diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix index dd0bed1f3e70..05c8017faf34 100644 --- a/pkgs/by-name/sh/shellcheck-sarif/package.nix +++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix @@ -7,15 +7,15 @@ }: rustPlatform.buildRustPackage rec { pname = "shellcheck-sarif"; - version = "0.7.0"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-cgcvl/nlnJtYzTfxbJHJ967zFH8KtWTMZPKGVpH66z0="; + hash = "sha256-G69DiDl78vkPuLodsRTL7dbbIFtNNF/XWuLZpCHKJws="; }; useFetchCargoVendor = true; - cargoHash = "sha256-eJzhaLQCniVUmsFgvzLE9Aw1nUq+P9m9wjSH3l8vQxo="; + cargoHash = "sha256-ZA7l7fmQG1wjT8oLVp6w2okPlwfNGQw/7qrH3rRS+0o="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/sh/sherlock-launcher/package.nix b/pkgs/by-name/sh/sherlock-launcher/package.nix new file mode 100644 index 000000000000..776a4b4022bd --- /dev/null +++ b/pkgs/by-name/sh/sherlock-launcher/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + gtk4, + gtk4-layer-shell, + dbus, + glib, + wayland, + openssl, + sqlite, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "sherlock-launcher"; + version = "0.1.11"; + + src = fetchFromGitHub { + owner = "Skxxtz"; + repo = "sherlock"; + tag = "v${finalAttrs.version}"; + hash = "sha256-YuAJbLQc7SIV9HkWGcQBPdZ6uxI5qeeSIaK0t8owe4A="; + }; + + nativeBuildInputs = [ + pkg-config + glib + ]; + + buildInputs = [ + gtk4 + gtk4-layer-shell + dbus + openssl + sqlite + glib + wayland + ]; + + cargoHash = "sha256-1swjAwDH1vyMcVv/Mx4P8lrdUJGdvoR1SVIjaUe4zZo="; + + meta = { + description = "Lightweight and efficient application launcher for Wayland built with Rust and GTK4"; + homepage = "https://github.com/Skxxtz/sherlock"; + license = lib.licenses.cc-by-nc-40; + mainProgram = "sherlock"; + maintainers = with lib.maintainers; [ agvantibo ]; + }; +}) diff --git a/pkgs/by-name/sh/sherlock/package.nix b/pkgs/by-name/sh/sherlock/package.nix index 436066f9e30a..196a15ad6963 100644 --- a/pkgs/by-name/sh/sherlock/package.nix +++ b/pkgs/by-name/sh/sherlock/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, makeWrapper, python3, - poetry, }: python3.pkgs.buildPythonApplication rec { @@ -59,7 +58,6 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ pytestCheckHook - poetry poetry-core jsonschema openpyxl diff --git a/pkgs/by-name/sh/shh/fix_run_checks.patch b/pkgs/by-name/sh/shh/fix_run_checks.patch new file mode 100644 index 000000000000..3b29a4f1b5eb --- /dev/null +++ b/pkgs/by-name/sh/shh/fix_run_checks.patch @@ -0,0 +1,150 @@ +commit 58bdfa7ef92ba07dc41a07aeef6d790ecd8f888c +Author: kuflierl <41301536+kuflierl@users.noreply.github.com> +Date: Sat May 3 21:02:26 2025 +0200 + + fix(tests): add support for nix-build-system for tests + +diff --git a/src/systemd/resolver.rs b/src/systemd/resolver.rs +index e2abbb7..1151592 100644 +--- a/src/systemd/resolver.rs ++++ b/src/systemd/resolver.rs +@@ -637,17 +637,14 @@ mod tests { + let OptionValue::List(opt_list) = &candidates[0].value else { + panic!(); + }; +- assert!(opt_list.values.contains(&"/boot".to_owned())); ++ // information gathering ++ // eprint!("{}\n", &candidates[0].to_string()); + assert!(opt_list.values.contains(&"/dev".to_owned())); + assert!(opt_list.values.contains(&"/etc".to_owned())); +- assert!(opt_list.values.contains(&"/home".to_owned())); +- assert!(opt_list.values.contains(&"/root".to_owned())); +- assert!(opt_list.values.contains(&"/sys".to_owned())); ++ assert!(opt_list.values.contains(&"/nix".to_owned())); ++ assert!(opt_list.values.contains(&"/bin".to_owned())); ++ assert!(opt_list.values.contains(&"/build".to_owned())); + assert!(opt_list.values.contains(&"/tmp".to_owned())); +- assert!(opt_list.values.contains(&"/usr".to_owned())); +- assert!(opt_list.values.contains(&"/var".to_owned())); +- assert!(!opt_list.values.contains(&"/proc".to_owned())); +- assert!(!opt_list.values.contains(&"/run".to_owned())); + + let actions = vec![ProgramAction::Read("/var/data".into())]; + let candidates = resolve(&opts, &actions, &hardening_opts); +diff --git a/tests/options.rs b/tests/options.rs +index 835ee14..a9c9973 100644 +--- a/tests/options.rs ++++ b/tests/options.rs +@@ -24,7 +24,7 @@ fn run_true() { + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -50,7 +50,7 @@ fn run_true() { + .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) + .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) + .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) +- .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) ++ .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + } + +@@ -97,7 +97,7 @@ fn run_ls_dev() { + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -130,12 +130,12 @@ fn run_ls_dev() { + fn run_ls_proc() { + Command::cargo_bin("shh") + .unwrap() +- .args(["run", "--", "busybox", "ls", "/proc/1/"]) ++ .args(["run", "--", "ls", "/proc/1/"]) + .unwrap() + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -166,7 +166,7 @@ fn run_ls_proc() { + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -188,7 +188,7 @@ fn run_ls_proc() { + .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) + .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) + .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) +- .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) ++ .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + } + +@@ -201,7 +201,7 @@ fn run_read_kallsyms() { + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -227,7 +227,7 @@ fn run_read_kallsyms() { + .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) + .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) + .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) +- .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) ++ .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + } + +@@ -344,6 +344,7 @@ fn run_systemctl() { + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + } + ++// patched due to nix build isolation + #[test] + fn run_ss() { + Command::cargo_bin("shh") +@@ -353,7 +354,7 @@ fn run_ss() { + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -369,7 +370,7 @@ fn run_ss() { + .stdout(predicate::str::contains("ProtectKernelModules=true\n").count(1)) + .stdout(predicate::str::contains("ProtectKernelLogs=true\n").count(1)) + .stdout(predicate::str::contains("ProtectControlGroups=true\n").count(1)) +- .stdout(predicate::str::contains("ProtectProc=").not()) ++ //.stdout(predicate::str::contains("ProtectProc=").not()) + .stdout(predicate::str::contains("MemoryDenyWriteExecute=true\n").count(1)) + .stdout(predicate::str::contains("RestrictAddressFamilies=AF_NETLINK AF_UNIX\n").count(1).or(predicate::str::contains("RestrictAddressFamilies=AF_NETLINK\n").count(1))) + .stdout(predicate::str::contains("SocketBindDeny=ipv4:tcp\n").count(1)) +@@ -379,7 +380,7 @@ fn run_ss() { + .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) + .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) + .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) +- .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) ++ .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + } + diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix new file mode 100644 index 000000000000..e2b894df6760 --- /dev/null +++ b/pkgs/by-name/sh/shh/package.nix @@ -0,0 +1,132 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + fetchpatch, + installShellFiles, + python3, + strace, + systemd, + iproute2, + stdenv, + enableDocumentationFeature ? true, + enableDocumentationGeneration ? true, +}: +let + isNativeDocgen = + (stdenv.buildPlatform.canExecute stdenv.hostPlatform) && enableDocumentationFeature; +in +rustPlatform.buildRustPackage rec { + pname = "shh"; + version = "2025.4.12"; + + src = fetchFromGitHub { + owner = "desbma"; + repo = "shh"; + tag = "v${version}"; + hash = "sha256-+JWz0ya6gi8pPERnpAcQIe7zZUzWGxha+9/gizMVtEw="; + }; + + cargoHash = "sha256-rrOH76LHYSEeuNiMIICpAO7U/sz5V0JRO22mbIICQWw="; + + # needs to be done this way to bypass patch conflicts + cargoPatches = [ + (fetchpatch { + # to be removed after next release + name = "refactor-man-page-generation-command.patch"; + url = "https://github.com/desbma/shh/commit/849b9a6646981c83a72a977b6398371e29d3b928.patch"; + hash = "sha256-LZlUFfPtt2ScTxQbQ9j3Kzvp7T4MCFs92cJiI3YbWns="; + }) + (fetchpatch { + # to be removed after next release + name = "support-shell-auto-complete.patch"; + url = "https://github.com/desbma/shh/commit/74914dc8cfd74dbd7e051a090cc4c1f561b8cdde.patch"; + hash = "sha256-WgKRQAEwSpXdQUnrZC1Bp4RfKg2J9kPkT1k6R2wwgT8="; + }) + ]; + + patches = [ + ./fix_run_checks.patch + (fetchpatch { + # to be removed after next release + name = "feat-static-strace-path-support-at-compile-time.patch"; + url = "https://github.com/desbma/shh/commit/da62ceeb227de853be06610721744667c6fe994b.patch"; + hash = "sha256-p/W7HRZZ4TpIwrWN8wQB/SH3C8x3ZLXzwGV50oK/znQ="; + }) + ]; + + env = { + SHH_STRACE_BIN_PATH = lib.getExe strace; + }; + + buildFeatures = lib.optional enableDocumentationFeature "generate-extra"; + + checkFlags = [ + # no access to system modules in build env + "--skip=run_ls_modules" + # missing systemd daemon in build env + "--skip=run_systemctl" + # no raw socket cap in nix build + "--skip=run_ping_4" + "--skip=run_ping_6" + ]; + + buildInputs = [ + strace + systemd + ]; + + nativeBuildInputs = [ + installShellFiles + systemd + strace + ]; + + nativeCheckInputs = [ + python3 + iproute2 + ]; + + # todo elvish + postInstall = lib.optionalString enableDocumentationGeneration '' + mkdir -p target/{mangen,shellcomplete} + + ${ + if isNativeDocgen then + '' + $out/bin/shh gen-man-pages target/mangen + $out/bin/shh gen-shell-complete target/shellcomplete + '' + else + '' + unset SHH_STRACE_BIN_PATH + cargo run --features generate-extra -- gen-man-pages target/mangen + cargo run --features generate-extra -- gen-shell-complete target/shellcomplete + '' + } + + installManPage target/mangen/* + + installShellCompletion --cmd ${pname} \ + target/shellcomplete/${pname}.{bash,fish} \ + --zsh target/shellcomplete/_${pname} + ''; + + # RUST_BACKTRACE = 1; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Automatic systemd service hardening guided by strace profiling"; + homepage = "https://github.com/desbma/shh"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + changelog = "https://github.com/desbma/shh/blob/v${version}/CHANGELOG.md"; + mainProgram = "shh"; + maintainers = with lib.maintainers; [ + erdnaxe + kuflierl + ]; + }; +} diff --git a/pkgs/by-name/sh/shibboleth-sp/package.nix b/pkgs/by-name/sh/shibboleth-sp/package.nix index 4a300718c737..f591d69d726d 100644 --- a/pkgs/by-name/sh/shibboleth-sp/package.nix +++ b/pkgs/by-name/sh/shibboleth-sp/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchgit, + fetchpatch, autoreconfHook, boost, fcgi, @@ -12,7 +13,6 @@ xercesc, xml-security-c, xml-tooling-c, - darwin, }: stdenv.mkDerivation rec { @@ -25,28 +25,40 @@ stdenv.mkDerivation rec { sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr"; }; + # Upgrade to Clang 19 (and thereby LLVM19) causes `std::char_traits` to now be present, + # making `char_traits` references ambiguous due to both `std` and `xmltooling` exporting this symbol, + # and the file in question uses both `using namespace std;` and `using namespace xmltooling;` + # The patches below result in `xmltooling` being removed. + # As `char_traits` is a compile time construct, no runtime repercussions can stem from this. + # See https://shibboleth.atlassian.net/browse/SSPCPP-998 for a related discussion. + patches = lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "19") [ + (fetchpatch { + name = "char-traits-ambig-1"; + url = "https://git.shibboleth.net/view/?p=cpp-sp.git;a=blobdiff_plain;f=shibsp/util/IPRange.cpp;h=532cf9e94c915667c091d127c696979f63939eb5;hp=d6f00bc36ea25997817a2308314bcdbea572936f;hb=49cd05fa6d9935a45069fa555db7a26ca77d23db;hpb=293ff2ab6454b0946b3b03719efa132bff461f1f"; + hash = "sha256-ZF0jsZJoHaxaPPjVbT6Wlq+wjyPQLTnEKcUxONji/hE="; + }) + + (fetchpatch { + name = "char-traits-ambig-2"; + url = "https://git.shibboleth.net/view/?p=cpp-sp.git;a=blobdiff_plain;f=shibsp/util/IPRange.cpp;h=da954870eb03c7cd054ecc5c52a6c1f011787760;hp=354010d5f5e533262cb385ea16756df53fe0c241;hb=793663a67aaa4e9a4aa9172728d924f8cec45cf6;hpb=a43814935030930c49b7a08f5515b861906525c7"; + hash = "sha256-4iGwCGpGwAkriOwQmh5AgvHLX1o39NuQ2l4sAJbD2bc="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = - [ - boost - fcgi - openssl - opensaml-cpp - log4shib - xercesc - xml-security-c - xml-tooling-c - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + boost + fcgi + openssl + opensaml-cpp + log4shib + xercesc + xml-security-c + xml-tooling-c + ]; configureFlags = [ "--without-apxs" diff --git a/pkgs/by-name/sh/shipwright/darwin-fixes.patch b/pkgs/by-name/sh/shipwright/darwin-fixes.patch index ae5e936603dd..de9135876a22 100644 --- a/pkgs/by-name/sh/shipwright/darwin-fixes.patch +++ b/pkgs/by-name/sh/shipwright/darwin-fixes.patch @@ -1,37 +1,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2c8644af..157758c9 100644 +index 2771ee8c..0702adad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -166,17 +166,13 @@ endif() +@@ -250,17 +250,13 @@ endif() if(CMAKE_SYSTEM_NAME MATCHES "Darwin") add_custom_target(CreateOSXIcons COMMAND mkdir -p ${CMAKE_BINARY_DIR}/macosx/soh.iconset -- COMMAND sips -z 16 16 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png -- COMMAND sips -z 32 32 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png -- COMMAND sips -z 32 32 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png -- COMMAND sips -z 64 64 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png -- COMMAND sips -z 128 128 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png -- COMMAND sips -z 256 256 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png -- COMMAND sips -z 256 256 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png -- COMMAND sips -z 512 512 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png -- COMMAND sips -z 512 512 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png -- COMMAND cp soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png +- COMMAND sips -z 16 16 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png +- COMMAND sips -z 32 32 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png +- COMMAND sips -z 32 32 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png +- COMMAND sips -z 64 64 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png +- COMMAND sips -z 128 128 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png +- COMMAND sips -z 256 256 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png +- COMMAND sips -z 256 256 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png +- COMMAND sips -z 512 512 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png +- COMMAND sips -z 512 512 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png +- COMMAND cp ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png - COMMAND iconutil -c icns -o ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset -+ COMMAND convert soh/macosx/sohIcon.png -resize 16x16 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16.png -+ COMMAND convert soh/macosx/sohIcon.png -resize 32x32 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32.png -+ COMMAND convert soh/macosx/sohIcon.png -resize 64x64 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_64.png -+ COMMAND convert soh/macosx/sohIcon.png -resize 128x128 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128.png -+ COMMAND convert soh/macosx/sohIcon.png -resize 256x256 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256.png -+ COMMAND convert soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 16x16 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 32x32 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 64x64 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_64.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 128x128 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 256x256 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512.png + COMMAND png2icns ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_{16,32,64,128,256,512}.png WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Creating OSX icons ..." ) -@@ -201,7 +197,6 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/assets +@@ -288,7 +284,6 @@ INSTALL(CODE "FILE(RENAME \${CMAKE_INSTALL_PREFIX}/../MacOS/soh-macos \${CMAKE_I install(CODE " include(BundleUtilities) -- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/soh-macos\" \"\" \"${dirs}\") +- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/../MacOS/soh\" \"\" \"${dirs}\") ") endif() diff --git a/pkgs/by-name/sh/shipwright/disable-downloading-stb_image.patch b/pkgs/by-name/sh/shipwright/disable-downloading-stb_image.patch new file mode 100644 index 000000000000..eade8db90a7b --- /dev/null +++ b/pkgs/by-name/sh/shipwright/disable-downloading-stb_image.patch @@ -0,0 +1,16 @@ +Submodule libultraship contains modified content +diff --git a/libultraship/cmake/dependencies/common.cmake b/libultraship/cmake/dependencies/common.cmake +index 596158c..c62d7b2 100644 +--- a/libultraship/cmake/dependencies/common.cmake ++++ b/libultraship/cmake/dependencies/common.cmake +@@ -47,10 +47,6 @@ set(stormlib_optimizations_patch git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/dep + endif() + + #=================== STB =================== +-set(STB_DIR ${CMAKE_BINARY_DIR}/_deps/stb) +-file(DOWNLOAD "https://github.com/nothings/stb/raw/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h" "${STB_DIR}/stb_image.h") +-file(WRITE "${STB_DIR}/stb_impl.c" "#define STB_IMAGE_IMPLEMENTATION\n#include \"stb_image.h\"") +- + add_library(stb STATIC) + + target_sources(stb PRIVATE diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix index 3c1511efdb52..baba8dab5f9c 100644 --- a/pkgs/by-name/sh/shipwright/package.nix +++ b/pkgs/by-name/sh/shipwright/package.nix @@ -1,4 +1,5 @@ { + apple-sdk_13, stdenv, cmake, lsb-release, @@ -6,16 +7,9 @@ lib, fetchFromGitHub, fetchurl, - fetchpatch, copyDesktopItems, makeDesktopItem, python3, - libX11, - libXrandr, - libXinerama, - libXcursor, - libXi, - libXext, glew, boost, SDL2, @@ -28,36 +22,118 @@ makeWrapper, darwin, libicns, + libzip, + nlohmann_json, + tinyxml-2, + spdlog, + writeTextFile, + fixDarwinDylibNames, + applyPatches, + shipwright, }: + +let + + # The following would normally get fetched at build time, or a specific version is required + + gamecontrollerdb = fetchFromGitHub { + owner = "mdqinc"; + repo = "SDL_GameControllerDB"; + rev = "a74711e1e87733ccdf02d7020d8fa9e4fa67176e"; + hash = "sha256-rXC4akz9BaKzr/C2CryZC6RGk6+fGVG7RsQryUFUUk0="; + }; + + imgui' = applyPatches { + src = fetchFromGitHub { + owner = "ocornut"; + repo = "imgui"; + tag = "v1.91.6-docking"; + hash = "sha256-28wyzzwXE02W5vbEdRCw2iOF8ONkb3M3Al8XlYBvz1A="; + }; + patches = [ + "${shipwright.src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch" + ]; + }; + + libgfxd = fetchFromGitHub { + owner = "glankk"; + repo = "libgfxd"; + rev = "008f73dca8ebc9151b205959b17773a19c5bd0da"; + hash = "sha256-AmHAa3/cQdh7KAMFOtz5TQpcM6FqO9SppmDpKPTjTt8="; + }; + + prism = fetchFromGitHub { + owner = "KiritoDv"; + repo = "prism-processor"; + rev = "fb3f8b4a2d14dfcbae654d0f0e59a73b6f6ca850"; + hash = "sha256-gGdQSpX/TgCNZ0uyIDdnazgVHpAQhl30e+V0aVvTFMM="; + }; + + stb_impl = writeTextFile { + name = "stb_impl.c"; + text = '' + #define STB_IMAGE_IMPLEMENTATION + #include "stb_image.h" + ''; + }; + + stb' = fetchurl { + name = "stb_image.h"; + url = "https://raw.githubusercontent.com/nothings/stb/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h"; + hash = "sha256-xUsVponmofMsdeLsI6+kQuPg436JS3PBl00IZ5sg3Vw="; + }; + + stormlib' = applyPatches { + src = fetchFromGitHub { + owner = "ladislav-zezula"; + repo = "StormLib"; + tag = "v9.25"; + hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc="; + }; + patches = [ + "${shipwright.src}/libultraship/cmake/dependencies/patches/stormlib-optimizations.patch" + ]; + }; + + thread_pool = fetchFromGitHub { + owner = "bshoshany"; + repo = "thread-pool"; + tag = "v4.1.0"; + hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88="; + }; + + metalcpp = fetchFromGitHub { + owner = "briaguya-ai"; + repo = "single-header-metal-cpp"; + tag = "macOS13_iOS16"; + hash = "sha256-CSYIpmq478bla2xoPL/cGYKIWAeiORxyFFZr0+ixd7I"; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "shipwright"; - version = "8.0.6"; + version = "9.0.2"; src = fetchFromGitHub { owner = "harbourmasters"; repo = "shipwright"; tag = finalAttrs.version; - hash = "sha256-bA+Bm7M6udeZLpFhGa8fCtagfYBeRxWWqFuAj62XwGQ="; + hash = "sha256-xmRUUMjQt3CFJ0GxlUsUqmp//XTRWik3jSD4auql7Nk="; fetchSubmodules = true; + deepClone = true; + postFetch = '' + cd $out + git branch --show-current > GIT_BRANCH + git rev-parse --short=7 HEAD > GIT_COMMIT_HASH + (git describe --tags --abbrev=0 --exact-match HEAD 2>/dev/null || echo "") > GIT_COMMIT_TAG + rm -rf .git + ''; }; patches = [ ./darwin-fixes.patch - (fetchpatch { - name = "gcc14.patch"; - url = "https://github.com/HarbourMasters/Shipwright/commit/1bc15d5bf3042d4fd64e1952eb68c47a7d5d8061.patch"; - hash = "sha256-OpjP+rGqx56DB4W8yzLkxuxSAQa6oXQqtbQ2cNcFjYQ="; - }) + ./disable-downloading-stb_image.patch ]; - # This would get fetched at build time otherwise, see: - # https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736 - gamecontrollerdb = fetchurl { - name = "gamecontrollerdb.txt"; - url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/075c1549075ef89a397fd7e0663d21e53a2485fd/gamecontrollerdb.txt"; - hash = "sha256-atjc0t921l6JSUAd/Yk7uup2R7mCp5ivAh6Dr7HBY7I="; - }; - nativeBuildInputs = [ cmake @@ -74,6 +150,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns darwin.sigtool + fixDarwinDylibNames ]; buildInputs = @@ -83,45 +160,71 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_net libpng + libzip + nlohmann_json + tinyxml-2 + spdlog ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXrandr - libXinerama - libXcursor - libXi - libXext libpulseaudio zenity + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Metal.hpp requires macOS 13.x min. + apple-sdk_13 ]; - cmakeFlags = [ - (lib.cmakeBool "NON_PORTABLE" true) - (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib") - ]; + cmakeFlags = + [ + (lib.cmakeBool "BUILD_REMOTE_CONTROL" true) + (lib.cmakeBool "NON_PORTABLE" true) + (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_METALCPP" "${metalcpp}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SPDLOG" "${spdlog}") + ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int -Wno-elaborated-enum-base"; dontAddPrefix = true; # Linking fails without this hardeningDisable = [ "format" ]; + preConfigure = '' + mkdir stb + cp ${stb'} ./stb/${stb'.name} + cp ${stb_impl} ./stb/${stb_impl.name} + substituteInPlace libultraship/cmake/dependencies/common.cmake \ + --replace-fail "\''${STB_DIR}" "$(readlink -f ./stb)" + ''; + + postPatch = '' + substituteInPlace soh/src/boot/build.c.in \ + --replace-fail "@CMAKE_PROJECT_GIT_BRANCH@" "$(cat GIT_BRANCH)" \ + --replace-fail "@CMAKE_PROJECT_GIT_COMMIT_HASH@" "$(cat GIT_COMMIT_HASH)" \ + --replace-fail "@CMAKE_PROJECT_GIT_COMMIT_TAG@" "$(cat GIT_COMMIT_TAG)" + ''; + postBuild = '' - cp ${finalAttrs.gamecontrollerdb} ${finalAttrs.gamecontrollerdb.name} + port_ver=$(grep CMAKE_PROJECT_VERSION: "$PWD/CMakeCache.txt" | cut -d= -f2) + cp ${gamecontrollerdb}/gamecontrollerdb.txt gamecontrollerdb.txt + mv ../libultraship/src/graphic/Fast3D/shaders ../soh/assets/custom pushd ../OTRExporter - python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver ${finalAttrs.version} + python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver $port_ver popd ''; - preInstall = - lib.optionalString stdenv.hostPlatform.isLinux '' - # Cmake likes it here for its install paths - cp ../OTRExporter/soh.otr .. - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - cp ../OTRExporter/soh.otr soh/soh.otr - ''; + preInstall = '' + # Cmake likes it here for its install paths + cp ../OTRExporter/soh.otr soh/soh.otr + ''; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' @@ -140,11 +243,6 @@ stdenv.mkDerivation (finalAttrs: { mv $out/MacOS $out/Applications/soh.app/Contents/MacOS - # Wrapper - cp $src/soh/macosx/soh-macos.sh.in $out/Applications/soh.app/Contents/MacOS/soh - chmod +x $out/Applications/soh.app/Contents/MacOS/soh - patchShebangs $out/Applications/soh.app/Contents/MacOS/soh - # "lib" contains all resources that are in "Resources" in the official bundle. # We move them to the right place and symlink them back to $out/lib, # as that's where the game expects them. @@ -156,19 +254,8 @@ stdenv.mkDerivation (finalAttrs: { # Copy icons cp -r ../build/macosx/soh.icns $out/Applications/soh.app/Contents/Resources/soh.icns - # Fix executable - install_name_tool -change @executable_path/../Frameworks/libSDL2-2.0.0.dylib \ - ${SDL2}/lib/libSDL2-2.0.0.dylib \ - $out/Applications/soh.app/Contents/Resources/soh-macos - install_name_tool -change @executable_path/../Frameworks/libGLEW.2.2.0.dylib \ - ${glew}/lib/libGLEW.2.2.0.dylib \ - $out/Applications/soh.app/Contents/Resources/soh-macos - install_name_tool -change @executable_path/../Frameworks/libpng16.16.dylib \ - ${libpng}/lib/libpng16.16.dylib \ - $out/Applications/soh.app/Contents/Resources/soh-macos - # Codesign (ad-hoc) - codesign -f -s - $out/Applications/soh.app/Contents/Resources/soh-macos + codesign -f -s - $out/Applications/soh.app/Contents/MacOS/soh ''; fixupPhase = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/sh/shod/package.nix b/pkgs/by-name/sh/shod/package.nix index 9bdd79ea1555..8686767a3a8c 100644 --- a/pkgs/by-name/sh/shod/package.nix +++ b/pkgs/by-name/sh/shod/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/phillbush/shod"; license = licenses.mit; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix new file mode 100644 index 000000000000..3e67d315d25f --- /dev/null +++ b/pkgs/by-name/sh/shogihome/package.nix @@ -0,0 +1,146 @@ +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + fetchpatch, + makeWrapper, + electron_35, + vulkan-loader, + makeDesktopItem, + copyDesktopItems, + commandLineArgs ? [ ], + nix-update-script, +}: + +let + electron = electron_35; +in +buildNpmPackage (finalAttrs: { + pname = "shogihome"; + version = "1.22.1"; + + src = fetchFromGitHub { + owner = "sunfish-shogi"; + repo = "shogihome"; + tag = "v${finalAttrs.version}"; + hash = "sha256-vVKdaFKOx4xm4BK+AjVr4cEDOHpOjOe58k2wUAhB9XA="; + }; + + npmDepsHash = "sha256-OS5DR+24F98ICgQ6zL4VD231Rd5JB/gJKl+qNfnP3PE="; + + patches = [ + # Make it possible to load the electron-builder config without sideeffects. + # PR at https://github.com/sunfish-shogi/shogihome/pull/1184 + # Should be removed next 1.22.X ShogiHome update or possibly 1.23.X. + (fetchpatch { + url = "https://github.com/sunfish-shogi/shogihome/commit/a075571a3bf4f536487e1212a2e7a13802dc7ec7.patch"; + sha256 = "sha256-dJyaoWOC+fEufzpYenmfnblgd2C9Ymv4Cl8Y/hljY6c="; + }) + ]; + + postPatch = '' + substituteInPlace package.json \ + --replace-fail 'npm run install:esbuild && ' "" \ + --replace-fail 'npm run install:electron && ' "" + + substituteInPlace .electron-builder.config.mjs \ + --replace-fail 'AppImage' 'dir' + ''; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + npm_config_build_from_source = "true"; + }; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + makeWrapper + copyDesktopItems + ]; + + makeCacheWritable = true; + + dontNpmBuild = true; + + buildPhase = + '' + runHook preBuild + + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + '' + # Electron builder complains about symlink in electron-dist + + lib.optionalString stdenv.hostPlatform.isLinux '' + rm electron-dist/libvulkan.so.1 + cp '${lib.getLib vulkan-loader}/lib/libvulkan.so.1' electron-dist + '' + + '' + npm run electron:pack + + ./node_modules/.bin/electron-builder \ + --dir \ + --config .electron-builder.config.mjs \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = + '' + runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + mkdir -p "$out/share/lib/shogihome" + cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/shogihome" + + install -Dm444 'docs/icon.svg' "$out/share/icons/hicolor/scalable/apps/shogihome.svg" + + makeWrapper '${lib.getExe electron}' "$out/bin/shogihome" \ + --add-flags "$out/share/lib/shogihome/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags ${lib.escapeShellArgs commandLineArgs} \ + --inherit-argv0 + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" + mv dist/mac*/ShogiHome.app "$out/Applications" + '' + + '' + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "shogihome"; + exec = "shogihome %U"; + icon = "shogihome"; + desktopName = "ShogiHome"; + genericName = "Shogi Frontend"; + comment = finalAttrs.meta.description; + categories = [ "Game" ]; + startupWMClass = "ShogiHome"; + }) + ]; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex=^v([\\d\\.]+)$" + ]; + }; + }; + + meta = { + description = "Shogi frontend supporting USI engines"; + homepage = "https://sunfish-shogi.github.io/shogihome/"; + license = with lib.licenses; [ + mit + asl20 # for icons + ]; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "shogihome"; + }; +}) diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index 2428478cf7f6..363d5368c74b 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -10,12 +10,12 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.5.12"; + version = "0.5.20"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; tag = version; - hash = "sha256-GLa6I9DHGgWoShNRpqSbvOU8z2RlNTfEzEidUytByPI="; + hash = "sha256-GXigjGjeOK74S2ZTjQj6FA+5074bbdNVfvWrjy8fLRY="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ buildGoModule rec { dart-sass ]; - vendorHash = "sha256-z8nktXEyERWHqCUfeSgqrmYX3mxqYFyjr/cdP+yV5qE="; + vendorHash = "sha256-pT47MLTGTV9/VZ3CeevSBwm9yB68aECXmcNuiGyovXY="; postInstall = '' installShellCompletion --cmd shopware-cli \ diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix index 83a925941a98..fcefe9289ce9 100644 --- a/pkgs/by-name/sh/shortwave/package.nix +++ b/pkgs/by-name/sh/shortwave/package.nix @@ -86,7 +86,8 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/World/Shortwave"; description = "Find and listen to internet radio stations"; mainProgram = "shortwave"; - maintainers = with lib.maintainers; [ lasandell ] ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ lasandell ]; + teams = [ lib.teams.gnome-circle ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix index d58b91f080ad..0e1d20f3e69e 100644 --- a/pkgs/by-name/sh/shotcut/package.nix +++ b/pkgs/by-name/sh/shotcut/package.nix @@ -13,7 +13,6 @@ fftw, qt6, cmake, - darwin, gitUpdater, ffmpeg, }: @@ -47,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtmultimedia qt6.qtcharts qt6.qtwayland - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ]; env.NIX_CFLAGS_COMPILE = "-DSHOTCUT_NOUPGRADE"; diff --git a/pkgs/by-name/sh/shotwell/package.nix b/pkgs/by-name/sh/shotwell/package.nix index 272e607725a7..e745c4c2f318 100644 --- a/pkgs/by-name/sh/shotwell/package.nix +++ b/pkgs/by-name/sh/shotwell/package.nix @@ -35,6 +35,7 @@ libsecret, libportal-gtk3, gsettings-desktop-schemas, + libheif, }: stdenv.mkDerivation (finalAttrs: { @@ -87,6 +88,18 @@ stdenv.mkDerivation (finalAttrs: { libportal-gtk3 ]; + postInstall = '' + # Pull in HEIF support. + # In postInstall to run before gappsWrapperArgsHook. + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + libheif.out + ]; + } + }" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "shotwell"; diff --git a/pkgs/servers/http/showoff/Gemfile b/pkgs/by-name/sh/showoff/Gemfile similarity index 100% rename from pkgs/servers/http/showoff/Gemfile rename to pkgs/by-name/sh/showoff/Gemfile diff --git a/pkgs/by-name/sh/showoff/Gemfile.lock b/pkgs/by-name/sh/showoff/Gemfile.lock new file mode 100644 index 000000000000..13f4cbf0e269 --- /dev/null +++ b/pkgs/by-name/sh/showoff/Gemfile.lock @@ -0,0 +1,83 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + commonmarker (0.23.11) + concurrent-ruby (1.3.5) + csv (3.3.4) + daemons (1.4.1) + em-websocket (0.3.8) + addressable (>= 2.1.1) + eventmachine (>= 0.12.9) + eventmachine (1.2.7) + fidget (0.0.6) + ruby-dbus (< 0.15.0) + gli (2.22.2) + ostruct + htmlentities (4.3.4) + i18n (1.14.7) + concurrent-ruby (~> 1.0) + iso-639 (0.3.8) + csv + json (2.11.3) + mini_portile2 (2.8.8) + mustermann (2.0.2) + ruby2_keywords (~> 0.0.1) + nokogiri (1.18.8) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + ostruct (0.6.1) + parslet (2.0.0) + pdfkit (0.8.7.3) + public_suffix (6.0.2) + racc (1.8.1) + rack (2.2.13) + rack-contrib (2.5.0) + rack (< 4) + rack-protection (2.2.4) + rack + redcarpet (3.6.1) + rexml (3.4.1) + ruby-dbus (0.14.1) + ruby2_keywords (0.0.5) + showoff (0.20.4) + commonmarker (~> 0.21) + fidget (~> 0.0) + gli (~> 2.20) + htmlentities (~> 4.3) + i18n (~> 1.8) + iso-639 (~> 0.3) + json (~> 2.5) + nokogiri (~> 1.11) + parslet (~> 2.0) + rack-contrib (~> 2.3) + redcarpet (~> 3.5) + sinatra (~> 2.1) + sinatra-websocket (~> 0.3) + tilt (~> 2.0) + sinatra (2.2.4) + mustermann (~> 2.0) + rack (~> 2.2) + rack-protection (= 2.2.4) + tilt (~> 2.0) + sinatra-websocket (0.3.1) + em-websocket (~> 0.3.6) + eventmachine + thin (>= 1.3.1, < 2.0.0) + thin (1.8.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + tilt (2.6.0) + +PLATFORMS + ruby + +DEPENDENCIES + pdfkit (~> 0.8.7) + rexml (~> 3.4) + showoff + +BUNDLED WITH + 2.6.6 diff --git a/pkgs/by-name/sh/showoff/gemset.nix b/pkgs/by-name/sh/showoff/gemset.nix new file mode 100644 index 000000000000..fbda14752da3 --- /dev/null +++ b/pkgs/by-name/sh/showoff/gemset.nix @@ -0,0 +1,380 @@ +{ + addressable = { + dependencies = [ "public_suffix" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; + type = "gem"; + }; + version = "2.8.7"; + }; + commonmarker = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1gyjwd7in1nlf8zai2fxazxi8cy6xjzswdcjway520blb39ka7cx"; + type = "gem"; + }; + version = "0.23.11"; + }; + concurrent-ruby = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; + type = "gem"; + }; + version = "1.3.5"; + }; + csv = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kfqg0m6vqs6c67296f10cr07im5mffj90k2b5dsm51liidcsvp9"; + type = "gem"; + }; + version = "3.3.4"; + }; + daemons = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07cszb0zl8mqmwhc8a2yfg36vi6lbgrp4pa5bvmryrpcz9v6viwg"; + type = "gem"; + }; + version = "1.4.1"; + }; + em-websocket = { + dependencies = [ + "addressable" + "eventmachine" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xkb1rc6dd3y5s7qsp4wqrri3n9gwsbvnwwv6xwgp241jxdpp4iq"; + type = "gem"; + }; + version = "0.3.8"; + }; + eventmachine = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + fidget = { + dependencies = [ "ruby-dbus" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04g2846wjlb8ms5041lv37aqs4jzsziwv58bxg7yzc61pdvi4ksb"; + type = "gem"; + }; + version = "0.0.6"; + }; + gli = { + dependencies = [ "ostruct" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1c2x5wh3d3mz8vg5bs7c5is0zvc56j6a2b4biv5z1w5hi1n8s3jq"; + type = "gem"; + }; + version = "2.22.2"; + }; + htmlentities = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + i18n = { + dependencies = [ "concurrent-ruby" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; + type = "gem"; + }; + version = "1.14.7"; + }; + iso-639 = { + dependencies = [ "csv" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dbmprc4j9qw6xjn7cs8s2sa1czfz1pf62bn6kd7ydjm9d511f28"; + type = "gem"; + }; + version = "0.3.8"; + }; + json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s"; + type = "gem"; + }; + version = "2.11.3"; + }; + mini_portile2 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; + type = "gem"; + }; + version = "2.8.8"; + }; + mustermann = { + dependencies = [ "ruby2_keywords" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0m70qz27mlv2rhk4j1li6pw797gmiwwqg02vcgxcxr1rq2v53rnb"; + type = "gem"; + }; + version = "2.0.2"; + }; + nokogiri = { + dependencies = [ + "mini_portile2" + "racc" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c"; + type = "gem"; + }; + version = "1.18.8"; + }; + ostruct = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; + }; + parslet = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01pnw6ymz6nynklqvqxs4bcai25kcvnd5x4id9z3vd1rbmlk0lfl"; + type = "gem"; + }; + version = "2.0.0"; + }; + pdfkit = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nmp0csvkh99x1ii6pq29j8424g40lfb7k9ajfkkpzgwygpfk6fd"; + type = "gem"; + }; + version = "0.8.7.3"; + }; + public_suffix = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz"; + type = "gem"; + }; + version = "6.0.2"; + }; + racc = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; + type = "gem"; + }; + version = "1.8.1"; + }; + rack = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc"; + type = "gem"; + }; + version = "2.2.13"; + }; + rack-contrib = { + dependencies = [ "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00idlf24sd64y5mcvs6w0f5snam7mv6w8c1i2zwp0cla5gl2rgai"; + type = "gem"; + }; + version = "2.5.0"; + }; + rack-protection = { + dependencies = [ "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1d6irsigm0i4ig1m47c94kixi3wb8jnxwvwkl8qxvyngmb73srl2"; + type = "gem"; + }; + version = "2.2.4"; + }; + redcarpet = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0iglapqs4av4za9yfaac0lna7s16fq2xn36wpk380m55d8792i6l"; + type = "gem"; + }; + version = "3.6.1"; + }; + rexml = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; + type = "gem"; + }; + version = "3.4.1"; + }; + ruby-dbus = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "16lsqdwas6ngyyvq51l7lynj5ayis17zm5hpsg5x3m3n6r5k2gv4"; + type = "gem"; + }; + version = "0.14.1"; + }; + ruby2_keywords = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + showoff = { + dependencies = [ + "commonmarker" + "fidget" + "gli" + "htmlentities" + "i18n" + "iso-639" + "json" + "nokogiri" + "parslet" + "rack-contrib" + "redcarpet" + "sinatra" + "sinatra-websocket" + "tilt" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "109v234fwjkawf8axm5mgn22jag3cql7p09hlkclpn77p35gwjqc"; + type = "gem"; + }; + version = "0.20.4"; + }; + sinatra = { + dependencies = [ + "mustermann" + "rack" + "rack-protection" + "tilt" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wkc079h6hzq737j4wycpnv7c38mhd0rl33pszyy7768zzvyjc9y"; + type = "gem"; + }; + version = "2.2.4"; + }; + sinatra-websocket = { + dependencies = [ + "em-websocket" + "eventmachine" + "thin" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0as52mfw34z3ba6qjab009h2rdn0za0iwrc42kw948hbb8qzcm5m"; + type = "gem"; + }; + version = "0.3.1"; + }; + thin = { + dependencies = [ + "daemons" + "eventmachine" + "rack" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08g1yq6zzvgndj8fd98ah7pp8g2diw28p8bfjgv7rvjvp8d2am8w"; + type = "gem"; + }; + version = "1.8.2"; + }; + tilt = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; + type = "gem"; + }; + version = "2.6.0"; + }; +} diff --git a/pkgs/servers/http/showoff/default.nix b/pkgs/by-name/sh/showoff/package.nix similarity index 100% rename from pkgs/servers/http/showoff/default.nix rename to pkgs/by-name/sh/showoff/package.nix diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix index 8e800045389c..3cc0e1f47a82 100644 --- a/pkgs/by-name/sh/showtime/package.nix +++ b/pkgs/by-name/sh/showtime/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { pname = "showtime"; - version = "48.0"; + version = "48.1"; pyproject = false; src = fetchFromGitLab { @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { owner = "Incubator"; repo = "showtime"; rev = "refs/tags/${version}"; - hash = "sha256-w6ERJNBw+YgPHfm24KKYFS6T4EKEguHOeron0ofLxIg="; + hash = "sha256-uk3KgiLsYjqBhlKssnkWO6D4ufwJb/o+rQYSA7pa1lU="; }; strictDeps = true; diff --git a/pkgs/by-name/sh/shtris/package.nix b/pkgs/by-name/sh/shtris/package.nix index 36dc8a144883..ee70c6eea6ef 100644 --- a/pkgs/by-name/sh/shtris/package.nix +++ b/pkgs/by-name/sh/shtris/package.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix index d396dec60c0e..8f82bf3b6cba 100644 --- a/pkgs/by-name/si/sidplayfp/package.nix +++ b/pkgs/by-name/si/sidplayfp/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.12.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${finalAttrs.version}"; - hash = "sha256-78NlRBZ2GlZWhnZiefNIgRNv6bnJaHH94WsxEhP9rAk="; + hash = "sha256-3xNwmOPROnTPCVSdBYoI+k558WK4B2I66Tvik2mK3es="; }; strictDeps = true; diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix new file mode 100644 index 000000000000..9fdb16fe57a7 --- /dev/null +++ b/pkgs/by-name/si/sigil/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + boost, + xercesc, + python3Packages, + qt6, +}: + +stdenv.mkDerivation rec { + pname = "sigil"; + version = "2.4.2"; + + src = fetchFromGitHub { + repo = "Sigil"; + owner = "Sigil-Ebook"; + tag = version; + hash = "sha256-/lnSNamLkPLG8tn0w8F0zFyypMUXyMhgxA2WyQFegKw="; + }; + + pythonPath = with python3Packages; [ lxml ]; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + boost + xercesc + qt6.qtbase + qt6.qttools + qt6.qtwebengine + qt6.qtsvg + python3Packages.lxml + ]; + + prePatch = '' + sed -i '/^QTLIB_DIR=/ d' src/Resource_Files/bash/sigil-sh_install + ''; + + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' + runHook preInstall + + mkdir -p $out/Applications + mv bin/Sigil.app $out/Applications + # https://github.com/NixOS/nixpkgs/issues/186653 + chmod -x $out/Applications/Sigil.app/Contents/lib/*.dylib \ + $out/Applications/Sigil.app/Contents/polyfills/*.js \ + $out/Applications/Sigil.app/Contents/python3lib/*.py \ + $out/Applications/Sigil.app/Contents/hunspell_dictionaries/*.{aff,dic} + + runHook postInstall + ''; + + preFixup = '' + qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") + ''; + + meta = { + description = "Free, open source, multi-platform ebook (ePub) editor"; + homepage = "https://github.com/Sigil-Ebook/Sigil/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ prince213 ]; + platforms = with lib.platforms; linux ++ darwin; + mainProgram = "sigil"; + }; +} diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix index 0448ecb7bd32..d9204abb165e 100644 --- a/pkgs/by-name/si/signal-cli/package.nix +++ b/pkgs/by-name/si/signal-cli/package.nix @@ -1,5 +1,5 @@ { - stdenv, + stdenvNoCC, lib, fetchurl, makeWrapper, @@ -7,19 +7,20 @@ libmatthew_java, dbus, dbus_java, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "signal-cli"; - version = "0.13.13"; + version = "0.13.15"; # Building from source would be preferred, but is much more involved. src = fetchurl { - url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - hash = "sha256-nSaf8VkHxuAvedUhFAIeagOxKYNxp3hi0zH6BbomtMQ="; + url = "https://github.com/AsamK/signal-cli/releases/download/v${finalAttrs.version}/signal-cli-${finalAttrs.version}.tar.gz"; + hash = "sha256-Qe+An/AFbyN0nhKQc4Ke6ApKdZldXyw4HzbAunfb87s="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ libmatthew_java dbus dbus_java @@ -28,12 +29,13 @@ stdenv.mkDerivation rec { installPhase = '' - mkdir -p $out/bin - cp -r lib $out/lib - cp bin/signal-cli $out/bin/signal-cli + runHook preInstall + mkdir -p $out + cp -r lib $out/ + install -Dm755 bin/signal-cli -t $out/bin '' + ( - if stdenv.hostPlatform.isLinux then + if stdenvNoCC.hostPlatform.isLinux then '' makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \ --set JAVA_HOME "${openjdk21_headless}" \ @@ -47,7 +49,10 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ openjdk21_headless ]} \ --set JAVA_HOME ${openjdk21_headless} '' - ); + ) + + '' + runHook postInstall + ''; # Execution in the macOS (10.13) sandbox fails with # dyld: Library not loaded: /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa @@ -56,22 +61,19 @@ stdenv.mkDerivation rec { # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() # /nix/store/in41dz8byyyz4c0w132l7mqi43liv4yr-stdenv-darwin/setup: line 1310: 2231 Abort trap: 6 signal-cli --version - doInstallCheck = stdenv.hostPlatform.isLinux; + doInstallCheck = stdenvNoCC.hostPlatform.isLinux; - installCheckPhase = '' - export PATH=$PATH:$out/bin - # --help returns non-0 exit code even when working - signal-cli --version - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = { homepage = "https://github.com/AsamK/signal-cli"; description = "Command-line and dbus interface for communicating with the Signal messaging service"; mainProgram = "signal-cli"; - changelog = "https://github.com/AsamK/signal-cli/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/AsamK/signal-cli/blob/v${finalAttrs.version}/CHANGELOG.md"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ivan ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/si/signal-desktop/copy-noto-emoji.py b/pkgs/by-name/si/signal-desktop-bin/copy-noto-emoji.py similarity index 77% rename from pkgs/by-name/si/signal-desktop/copy-noto-emoji.py rename to pkgs/by-name/si/signal-desktop-bin/copy-noto-emoji.py index 393519e5c1f0..8acaebcb23d7 100644 --- a/pkgs/by-name/si/signal-desktop/copy-noto-emoji.py +++ b/pkgs/by-name/si/signal-desktop-bin/copy-noto-emoji.py @@ -55,21 +55,6 @@ def emoji_to_noto_name(emoji: str) -> str: ) -def emoji_to_emoji_data_name(emoji: str) -> str: - r"""Return the npm emoji-data emoji name of an emoji. - - emoji-data emoji names are hyphen‐minus‐separated Unicode scalar - values, represented in lowercase big‐endian hex padded to at least - four digits. - - >>> emoji_to_emoji_data_name("😶‍🌫️") - '1f636-200d-1f32b-fe0f' - >>> emoji_to_emoji_data_name("\U0001f636\u200d\U0001f32b\ufe0f") - '1f636-200d-1f32b-fe0f' - """ - return "-".join(f"{ord(scalar_value):04x}" for scalar_value in emoji) - - def _main() -> None: noto_png_path, asar_root = (Path(arg) for arg in sys.argv[1:]) asar_root = asar_root.absolute() @@ -77,16 +62,6 @@ def _main() -> None: out_path = asar_root / "images" / "nixpkgs-emoji" out_path.mkdir(parents=True) - emoji_data_out_path = ( - asar_root - / "node_modules" - / "emoji-datasource-apple" - / "img" - / "apple" - / "64" - ) - emoji_data_out_path.mkdir(parents=True) - jumbomoji_json_path = asar_root / "build" / "jumbomoji.json" with jumbomoji_json_path.open() as jumbomoji_json_file: jumbomoji_packs = json.load(jumbomoji_json_file) @@ -107,10 +82,6 @@ def _main() -> None: ) continue - ( - emoji_data_out_path / f"{emoji_to_emoji_data_name(emoji)}.png" - ).symlink_to(out_path / emoji) - print(out_path.relative_to(asar_root)) diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix new file mode 100644 index 000000000000..978ba0ae4dfe --- /dev/null +++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix @@ -0,0 +1,312 @@ +{ + stdenv, + lib, + fetchurl, + autoPatchelfHook, + noto-fonts-color-emoji, + dpkg, + libarchive, + asar, + rsync, + python3, + buildPackages, + nixosTests, + gtk3, + atk, + at-spi2-atk, + cairo, + pango, + pipewire, + gdk-pixbuf, + glib, + freetype, + fontconfig, + dbus, + libX11, + xorg, + libXi, + libXcursor, + libXdamage, + libXrandr, + libXcomposite, + libXext, + libXfixes, + libXrender, + libXtst, + libXScrnSaver, + nss, + nspr, + alsa-lib, + cups, + expat, + libuuid, + at-spi2-core, + libappindicator-gtk3, + libgbm, + libwebp, + # Runtime dependencies: + systemd, + libnotify, + libdbusmenu, + libpulseaudio, + xdg-utils, + wayland, +}: + +{ + pname, + libdir, + bindir, + extractPkg, + version, + hash, + url, +}: + +let + inherit (stdenv) targetPlatform; + ARCH = if targetPlatform.isAarch64 then "arm64" else "x64"; + + # Noto Color Emoji PNG files for emoji replacement; see below. + noto-fonts-color-emoji-png = noto-fonts-color-emoji.overrideAttrs (prevAttrs: { + pname = "noto-fonts-color-emoji-png"; + + # The build produces 136×128 PNGs by default for arcane font + # reasons, but we want square PNGs. + buildFlags = prevAttrs.buildFlags or [ ] ++ [ "BODY_DIMENSIONS=128x128" ]; + + makeTargets = [ "compressed" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + mv build/compressed_pngs $out/share/noto-fonts-color-emoji-png + python3 add_aliases.py --srcdir=$out/share/noto-fonts-color-emoji-png + + runHook postInstall + ''; + }); + + noto-emoji-sheet-32 = fetchurl { + url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v15.1.2/sheet_google_32.png"; + hash = "sha256-S03NCTbvB5yeQl62WpLNjNGhjNErtgaOB6tAj/X8vPc="; + }; + noto-emoji-sheet-64 = fetchurl { + url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v15.1.2/sheet_google_64.png"; + hash = "sha256-kZYStR5xAuausSpOD6wJZRJZ1K6nPpweE3aYSgWntS4="; + }; +in +stdenv.mkDerivation rec { + inherit pname version; + + # Please backport all updates to the stable channel. + # All releases have a limited lifetime and "expire" 90 days after the release. + # When releases "expire" the application becomes unusable until an update is + # applied. The expiration date for the current release can be extracted with: + # $ grep -a "^{\"buildExpiration" "${signal-desktop}/lib/${dir}/resources/app.asar" + # (Alternatively we could try to patch the asar archive, but that requires a + # few additional steps and might not be the best idea.) + + src = fetchurl { + inherit url hash; + recursiveHash = true; + downloadToTemp = true; + nativeBuildInputs = [ + (if ARCH == "x64" then dpkg else libarchive) + asar + ]; + # Signal ships the Apple emoji set without a licence via an npm + # package and upstream does not seem terribly interested in fixing + # this; see: + # + # * + # * + # + # We work around this by replacing it with the Noto Color Emoji + # set, which is available under a FOSS licence and more likely to + # be used on a NixOS machine anyway. The Apple emoji are removed + # during `fetchurl` to ensure that the build doesn’t cache the + # unlicensed emoji files, but the rest of the work is done in the + # main derivation. + postFetch = '' + ${extractPkg} + asar extract "$out/${libdir}/resources/app.asar" $out/asar-contents + rm -r \ + "$out/${libdir}/resources/app.asar"{,.unpacked} \ + $out/asar-contents/images/emoji-sheet-32.webp \ + $out/asar-contents/images/emoji-sheet-64.webp + ''; + }; + + nativeBuildInputs = [ + rsync + asar + python3 + autoPatchelfHook + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) + libwebp + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libappindicator-gtk3 + libpulseaudio + libnotify + libuuid + libgbm + nspr + nss + pango + systemd + xorg.libxcb + xorg.libxshmfence + ]; + + runtimeDependencies = [ + (lib.getLib systemd) + libappindicator-gtk3 + libnotify + libdbusmenu + pipewire + xdg-utils + wayland + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + rsync -a --chmod=+w $src/ . + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + + mv usr/share $out/share + mv "${libdir}" "$out/lib/signal-desktop" + + # Symlink to bin + mkdir -p $out/bin + ln -s "$out/lib/signal-desktop/signal-desktop" $out/bin/${meta.mainProgram} + + # Create required symlinks: + ln -s libGLESv2.so "$out/lib/signal-desktop/libGLESv2.so.2" + + # Compress the emoji sheets to webp, as signal expects webp images. The flags used are the same as those used upstream. + cwebp -progress -mt -preset icon -alpha_filter best -alpha_q 20 -pass 10 -q 75 ${noto-emoji-sheet-32} -o asar-contents/images/emoji-sheet-32.webp + cwebp -progress -mt -preset icon -alpha_filter best -alpha_q 20 -pass 10 -q 75 ${noto-emoji-sheet-64} -o asar-contents/images/emoji-sheet-64.webp + + # Copy the Noto Color Emoji PNGs into the ASAR contents. See `src` + # for the motivation, and the script for the technical details. + emojiPrefix=$( + python3 ${./copy-noto-emoji.py} \ + ${noto-fonts-color-emoji-png}/share/noto-fonts-color-emoji-png \ + asar-contents + ) + + # Replace the URL used for fetching large versions of emoji with + # the local path to our copied PNGs. + substituteInPlace asar-contents/preload.bundle.js \ + --replace-fail \ + 'emoji://jumbo?emoji=' \ + "file://$out/lib/signal-desktop/resources/app.asar/$emojiPrefix/" + + # `asar(1)` copies files from the corresponding `.unpacked` + # directory when extracting, and will put them back in the modified + # archive if you don’t specify them again when repacking. Signal + # leaves their native `.node` libraries unpacked, so we match that. + asar pack \ + --unpack '*.node' \ + asar-contents \ + "$out/lib/signal-desktop/resources/app.asar" + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + ) + + # Fix the desktop link + substituteInPlace $out/share/applications/signal-desktop.desktop \ + --replace-fail "/${bindir}/signal-desktop" ${meta.mainProgram} \ + --replace-fail "StartupWMClass=Signal" "StartupWMClass=signal" + + mv $out/share/applications/signal{-desktop,}.desktop + + # Note: The following path contains bundled libraries: + # $out/lib/signal-desktop/resources/app.asar.unpacked/node_modules/ + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/signal-desktop/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-${ARCH}.node" + ''; + + passthru = { + # Tests if the application launches and waits for "Link your phone to Signal Desktop": + tests.application-launch = nixosTests.signal-desktop; + updateScript.command = [ ./update.sh ]; + }; + + meta = { + description = "Private, simple, and secure messenger"; + longDescription = '' + Signal Desktop is an Electron application that links with your + "Signal Android" or "Signal iOS" app. + ''; + homepage = "https://signal.org/"; + changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; + license = [ + lib.licenses.agpl3Only + + # Various npm packages + lib.licenses.free + + lib.licenses.asl20 # noto-emoji + lib.licenses.mit # emoji-data + ]; + maintainers = with lib.maintainers; [ + mic92 + equirosa + urandom + bkchr + emily + Gliczy + ]; + mainProgram = "signal-desktop"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/si/signal-desktop-bin/package.nix b/pkgs/by-name/si/signal-desktop-bin/package.nix new file mode 100644 index 000000000000..f2faec1ccb35 --- /dev/null +++ b/pkgs/by-name/si/signal-desktop-bin/package.nix @@ -0,0 +1,7 @@ +{ stdenv, callPackage }: +if stdenv.hostPlatform.system == "aarch64-linux" then + callPackage ./signal-desktop-aarch64.nix { } +else if stdenv.hostPlatform.isDarwin then + callPackage ./signal-desktop-darwin.nix { } +else + callPackage ./signal-desktop.nix { } diff --git a/pkgs/by-name/si/signal-desktop/pyproject.toml b/pkgs/by-name/si/signal-desktop-bin/pyproject.toml similarity index 100% rename from pkgs/by-name/si/signal-desktop/pyproject.toml rename to pkgs/by-name/si/signal-desktop-bin/pyproject.toml diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix new file mode 100644 index 000000000000..d2e989160658 --- /dev/null +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix @@ -0,0 +1,15 @@ +{ callPackage }: +callPackage ./generic.nix { } { + pname = "signal-desktop-bin"; + version = "7.52.0"; + + libdir = "usr/lib64/signal-desktop"; + bindir = "usr/bin"; + extractPkg = '' + mkdir -p $out + bsdtar -xf $downloadedFile -C "$out" + ''; + + url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/08956500-signal-desktop/signal-desktop-7.52.0-1.fc42.aarch64.rpm"; + hash = "sha256-kQbCkswCNRnz/K6KpZKJ55bCaM2YFL9wW+erVA+3Nok="; +} diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix similarity index 91% rename from pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix rename to pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix index b0ab336efd86..9b7cc31921be 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix @@ -5,12 +5,12 @@ _7zz, }: stdenv.mkDerivation (finalAttrs: { - pname = "signal-desktop"; - version = "7.47.0"; + pname = "signal-desktop-bin"; + version = "7.52.0"; src = fetchurl { url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg"; - hash = "sha256-PP8D6D/DJiONJp0UNUSoy8zDwWGVWRRMsqfPTWQCgs8="; + hash = "sha256-GamsV4tWLEWbegUIrmZ4ZpAuRbfZzlxjnEy7FOo4q/E="; }; sourceRoot = "."; diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix new file mode 100644 index 000000000000..af5d27764c0d --- /dev/null +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix @@ -0,0 +1,12 @@ +{ callPackage }: +callPackage ./generic.nix { } rec { + pname = "signal-desktop-bin"; + version = "7.52.0"; + + libdir = "opt/Signal"; + bindir = libdir; + extractPkg = "dpkg-deb -x $downloadedFile $out"; + + url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; + hash = "sha256-SOe0BAEE5ljBb/OM3F7ejQQk8/KROFf7kfs/Gtp+bSY="; +} diff --git a/pkgs/by-name/si/signal-desktop-bin/update.sh b/pkgs/by-name/si/signal-desktop-bin/update.sh new file mode 100755 index 000000000000..cca3e29ae12c --- /dev/null +++ b/pkgs/by-name/si/signal-desktop-bin/update.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash common-updater-scripts curl coreutils jq + +set -ex + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" + +latestTag=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \ + "https://api.github.com/repos/signalapp/Signal-Desktop/releases/latest" \ + | jq -r ".tag_name") +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" + +latestBuildInfoAarch64=$(curl \ + "https://copr.fedorainfracloud.org/api_3/package/?ownername=useidel&projectname=signal-desktop&packagename=signal-desktop&with_latest_succeeded_build=true" \ + | jq '.builds.latest_succeeded') +latestBuildAarch64=$(jq '.id' <<< $latestBuildInfoAarch64) +latestVersionAarch64=$(jq -r '.source_package.version' <<< $latestBuildInfoAarch64) + +echo "Updating signal-desktop for x86_64-linux" +update-source-version signal-desktop-bin "$latestVersion" \ + --system=x86_64-linux \ + --file="$SCRIPT_DIR/signal-desktop.nix" + +echo "Updating signal-desktop for aarch64-linux" +update-source-version signal-desktop-bin "$latestVersionAarch64" "" \ + "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/$(printf "%08d" $latestBuildAarch64)-signal-desktop/signal-desktop-$latestVersionAarch64.fc42.aarch64.rpm" \ + --system=aarch64-linux \ + --file="$SCRIPT_DIR/signal-desktop-aarch64.nix" + +echo "Updating signal-desktop for darwin" +update-source-version signal-desktop-bin "$latestVersion" \ + --system=aarch64-darwin \ + --file="$SCRIPT_DIR/signal-desktop-darwin.nix" diff --git a/pkgs/by-name/si/signal-desktop-source/package.nix b/pkgs/by-name/si/signal-desktop-source/package.nix deleted file mode 100644 index 183afb777715..000000000000 --- a/pkgs/by-name/si/signal-desktop-source/package.nix +++ /dev/null @@ -1,258 +0,0 @@ -{ - stdenv, - lib, - nodejs_22, - pnpm_10, - electron_35, - python3, - makeWrapper, - callPackage, - libpulseaudio, - fetchFromGitHub, - runCommand, - fetchzip, - autoPatchelfHook, - makeDesktopItem, - copyDesktopItems, - replaceVars, - noto-fonts-color-emoji, - nixosTests, - withAppleEmojis ? false, -}: -let - nodejs = nodejs_22; - pnpm = pnpm_10; - electron = electron_35; - - electron-headers = runCommand "electron-headers" { } '' - mkdir -p $out - tar -C $out --strip-components=1 -xvf ${electron.headers} - ''; - - sqlcipher-signal-extension = callPackage ./sqlcipher-signal-extension.nix { }; - libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; }; - - ringrtc = stdenv.mkDerivation (finalAttrs: { - pname = "ringrtc-bin"; - version = "2.50.2"; - src = fetchzip { - url = "https://build-artifacts.signal.org/libraries/ringrtc-desktop-build-v${finalAttrs.version}.tar.gz"; - hash = "sha256-hNlz+gSulyJ//FdbPvY/5OHbtJ4rEUdi9/SHJDX6gZE="; - }; - - installPhase = '' - cp -r . $out - ''; - - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ libpulseaudio ]; - meta = { - homepage = "https://github.com/signalapp/ringrtc"; - license = lib.licenses.agpl3Only; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; - }); - - # Noto Color Emoji PNG files for emoji replacement; see below. - noto-fonts-color-emoji-png = noto-fonts-color-emoji.overrideAttrs (prevAttrs: { - pname = "noto-fonts-color-emoji-png"; - - # The build produces 136×128 PNGs by default for arcane font - # reasons, but we want square PNGs. - buildFlags = prevAttrs.buildFlags or [ ] ++ [ "BODY_DIMENSIONS=128x128" ]; - - makeTargets = [ "compressed" ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share - mv build/compressed_pngs $out/share/noto-fonts-color-emoji-png - python3 add_aliases.py --srcdir=$out/share/noto-fonts-color-emoji-png - - runHook postInstall - ''; - }); - - version = "7.48.0"; - - src = fetchFromGitHub { - owner = "signalapp"; - repo = "Signal-Desktop"; - tag = "v${version}"; - hash = "sha256-/jtuGsBOFsSgJZNpRilWZ0daI0iYVziZBaF/vLvQ7NU="; - }; - - stickerCreator = stdenv.mkDerivation (finalAttrs: { - pname = "signal-desktop-sticker-creator"; - inherit version; - src = src + "/sticker-creator"; - - pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pname src version; - hash = "sha256-TuPyRVNFIlR0A4YHMpQsQ6m+lm2fsp79FzQ1P5qqjIc="; - }; - - nativeBuildInputs = [ - nodejs - (pnpm.override { inherit nodejs; }).configHook - ]; - - buildPhase = '' - runHook preBuild - pnpm run build - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - cp -r dist $out - runHook postInstall - ''; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "signal-desktop-source"; - inherit src version; - - nativeBuildInputs = [ - nodejs - (pnpm.override { inherit nodejs; }).configHook - makeWrapper - copyDesktopItems - python3 - ]; - buildInputs = (lib.optional (!withAppleEmojis) noto-fonts-color-emoji-png); - - patches = lib.optional (!withAppleEmojis) ( - replaceVars ./replace-apple-emoji-with-noto-emoji.patch { - noto-emoji-pngs = "${noto-fonts-color-emoji-png}/share/noto-fonts-color-emoji-png"; - } - ); - - pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) - pname - version - src - patches - ; - hash = - if withAppleEmojis then - "sha256-xba5MfIjwnLHDKVM9+2KSpC3gcw6cM4cX3dn3/jqT3o=" - else - "sha256-I5UGY9Fz4wCa23snq0pir2uq/P+w+fAGU4Bks+CqEgk="; - }; - - env = { - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1743538878; - }; - - preBuild = '' - cp ${sqlcipher-signal-extension}/share/sqlite3.gyp node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp - - cp -r ${ringrtc} node_modules/@signalapp/ringrtc/build - - rm -fr node_modules/@signalapp/libsignal-client/prebuilds - cp -r ${libsignal-node}/lib node_modules/@signalapp/libsignal-client/prebuilds - ''; - - buildPhase = '' - runHook preBuild - - export npm_config_nodedir=${electron-headers} - cp -r ${electron.dist} electron-dist - chmod -R u+w electron-dist - cp -r ${stickerCreator} sticker-creator/dist - - pnpm run generate - pnpm exec electron-builder \ - --dir \ - --config.extraMetadata.environment=$SIGNAL_ENV \ - -c.electronDist=electron-dist \ - -c.electronVersion=${electron.version} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/ - cp -r dist/*-unpacked/resources $out/share/signal-desktop - - for icon in build/icons/png/* - do - install -Dm644 $icon $out/share/icons/hicolor/`basename ''${icon%.png}`/apps/signal-desktop.png - done - - makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \ - --add-flags "$out/share/signal-desktop/app.asar" \ - --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = finalAttrs.pname; - desktopName = "Signal"; - exec = "${finalAttrs.meta.mainProgram} %U"; - type = "Application"; - terminal = false; - icon = "signal-desktop"; - comment = "Private messaging from your desktop"; - startupWMClass = "signal"; - mimeTypes = [ - "x-scheme-handler/sgnl" - "x-scheme-handler/signalcaptcha" - ]; - categories = [ - "Network" - "InstantMessaging" - "Chat" - ]; - }) - ]; - - passthru = { - inherit sqlcipher-signal-extension libsignal-node; - tests.application-launch = nixosTests.signal-desktop; - }; - - meta = { - description = "Private, simple, and secure messenger (nixpkgs build)"; - longDescription = '' - Signal Desktop is an Electron application that links with your - "Signal Android" or "Signal iOS" app. - ''; - homepage = "https://signal.org/"; - changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${finalAttrs.version}"; - license = - with lib.licenses; - [ - agpl3Only - - # Various npm packages - free - ] - ++ lib.optional withAppleEmojis unfree; - maintainers = with lib.maintainers; [ - marcin-serwin - ]; - mainProgram = "signal-desktop"; - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; - sourceProvenance = with lib.sourceTypes; [ - fromSource - - # ringrtc - binaryNativeCode - ]; - }; -}) diff --git a/pkgs/by-name/si/signal-desktop-source/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop-source/replace-apple-emoji-with-noto-emoji.patch deleted file mode 100644 index 3779f5859b23..000000000000 --- a/pkgs/by-name/si/signal-desktop-source/replace-apple-emoji-with-noto-emoji.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md -index aed1048..e4c1f50 100644 ---- a/ACKNOWLEDGMENTS.md -+++ b/ACKNOWLEDGMENTS.md -@@ -745,30 +745,6 @@ Signal Desktop makes use of the following open source projects. - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - --## emoji-datasource-apple -- -- The MIT License (MIT) -- -- Copyright (c) 2013 Cal Henderson -- -- Permission is hereby granted, free of charge, to any person obtaining a copy -- of this software and associated documentation files (the "Software"), to deal -- in the Software without restriction, including without limitation the rights -- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -- copies of the Software, and to permit persons to whom the Software is -- furnished to do so, subject to the following conditions: -- -- The above copyright notice and this permission notice shall be included in all -- copies or substantial portions of the Software. -- -- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -- SOFTWARE. -- - ## emoji-regex - - Copyright Mathias Bynens -diff --git a/app/protocol_filter.ts b/app/protocol_filter.ts -index 68dceea..4b35bb1 100644 ---- a/app/protocol_filter.ts -+++ b/app/protocol_filter.ts -@@ -59,6 +59,7 @@ function _createFileHandler({ - const allowedRoots = [ - userDataPath, - installPath, -+ "@noto-emoji-pngs@", - getAvatarsPath(userDataPath), - getBadgesPath(userDataPath), - getDraftPath(userDataPath), -diff --git a/package.json b/package.json -index 3a6ac26..40cdb25 100644 ---- a/package.json -+++ b/package.json -@@ -130,7 +130,6 @@ - "dashdash": "2.0.0", - "direction": "1.0.4", - "emoji-datasource": "15.1.2", -- "emoji-datasource-apple": "15.1.2", - "emoji-regex": "10.4.0", - "encoding": "0.1.13", - "fabric": "4.6.0", -diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml -index ba2f205..705e454 100644 ---- a/pnpm-lock.yaml -+++ b/pnpm-lock.yaml -@@ -169,9 +169,6 @@ importers: - emoji-datasource: - specifier: 15.1.2 - version: 15.1.2 -- emoji-datasource-apple: -- specifier: 15.1.2 -- version: 15.1.2 - emoji-regex: - specifier: 10.4.0 - version: 10.4.0 -@@ -4790,9 +4787,6 @@ packages: - resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} - engines: {node: '>=12'} - -- emoji-datasource-apple@15.1.2: -- resolution: {integrity: sha512-32UZTK36x4DlvgD1smkmBlKmmJH7qUr5Qut4U/on2uQLGqNXGbZiheq6/LEA8xRQEUrmNrGEy25wpEI6wvYmTg==} -- - emoji-datasource@15.1.2: - resolution: {integrity: sha512-tXAqGsrDVhgCRpFePtaD9P4Z8Ro2SUQSL/4MIJBG0SxqQJaMslEbin8J53OaFwEBu6e7JxFaIF6s4mw9+8acAQ==} - -@@ -14929,8 +14923,6 @@ snapshots: - - emittery@0.13.1: {} - -- emoji-datasource-apple@15.1.2: {} -- - emoji-datasource@15.1.2: {} - - emoji-regex@10.4.0: {} -diff --git a/ts/components/conversation/Emojify.tsx b/ts/components/conversation/Emojify.tsx -index f0b1115..7613230 100644 ---- a/ts/components/conversation/Emojify.tsx -+++ b/ts/components/conversation/Emojify.tsx -@@ -35,8 +35,15 @@ function getImageTag({ - } - - let srcSet: string | undefined; -+ const emojiToNotoName = (emoji: string): string => -+ `emoji_u${ -+ [...emoji] -+ .filter(c => c != "\ufe0f") -+ .map(c => c.codePointAt(0)?.toString(16).padStart(4, "0")) -+ .join("_") -+ }.png`; - if (sizeClass != null && JUMBO_SIZES.has(sizeClass)) { -- srcSet = `emoji://jumbo?emoji=${encodeURIComponent(match)} 2x, ${img}`; -+ srcSet = `file://@noto-emoji-pngs@/${emojiToNotoName(match)} 2x, ${img}`; - } - - return ( -diff --git a/ts/components/emoji/lib.ts b/ts/components/emoji/lib.ts -index 9753017..cf51d3d 100644 ---- a/ts/components/emoji/lib.ts -+++ b/ts/components/emoji/lib.ts -@@ -102,7 +102,10 @@ const ROOT_PATH = get( - ); - - const makeImagePath = (src: string) => { -- return `${ROOT_PATH}node_modules/emoji-datasource-apple/img/apple/64/${src}`; -+ const datasourceToNoto = (name: string): string => -+ `emoji_u${name.slice(0,-4).split("-").filter(c => c != "fe0f").join("_")}.png`; -+ -+ return `@noto-emoji-pngs@/${datasourceToNoto(src)}`; - }; - - const imageQueue = new PQueue({ diff --git a/pkgs/by-name/si/signal-desktop-source/sqlcipher-signal-extension.nix b/pkgs/by-name/si/signal-desktop-source/sqlcipher-signal-extension.nix deleted file mode 100644 index e53a3e63eb0a..000000000000 --- a/pkgs/by-name/si/signal-desktop-source/sqlcipher-signal-extension.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ - rustPlatform, - lib, - fetchFromGitHub, - sqlcipher, - fetchpatch, - stdenv, - openssl, - tcl, - buildEnv, - rust-cbindgen, -}: -let - signal-sqlcipher-extension = rustPlatform.buildRustPackage (finalAttrs: { - pname = "signal-sqlcipher-extension"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "signalapp"; - repo = "Signal-Sqlcipher-Extension"; - tag = "v${finalAttrs.version}"; - hash = "sha256-INSkm7ZuetPASuIqezzzG/bXoEHClUb9XpxWbxLVXRc="; - }; - useFetchCargoVendor = true; - cargoHash = "sha256-qT4HM/FRL8qugKKNlMYM/0zgUsC6cDOa9fgd1d4VIrc="; - - meta = { - description = "SQLite extension used by Signal Desktop"; - homepage = "https://github.com/signalapp/Signal-Sqlcipher-Extension"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ marcin-serwin ]; - platforms = lib.platforms.all; - }; - }); - - sqlcipher-amalgamation = stdenv.mkDerivation { - pname = "sqlcipher-with-signal-extension"; - - inherit (sqlcipher) version src meta; - - patches = [ - (fetchpatch { - # https://github.com/sqlcipher/sqlcipher/pull/529 - name = "custom-crypto-provider.patch"; - url = "https://github.com/sqlcipher/sqlcipher/commit/0e3b20c155df8a2943b62a9f3cc0f4d3dba9e152.patch"; - hash = "sha256-OKh6qCGHBQWZyzXfyEveAs71wrNwlWLuG9jNqDeKNG4="; - }) - ]; - - nativeBuildInputs = [ tcl ]; - - buildInputs = [ openssl ]; - - CFLAGS = [ "-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1" ]; - - makeFlags = [ "sqlite3.c" ]; - - installPhase = '' - install -Dm644 sqlite3.c $out/src/sqlite3.c - install -Dm644 sqlite3.h $out/include/sqlite3.h - install -Dm644 sqlite3ext.h $out/include/sqlite3ext.h - ''; - }; - - signal-tokenizer-headers = rustPlatform.buildRustPackage (finalAttrs: { - pname = "Signal-FTS5-Extension"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "signalapp"; - repo = "Signal-FTS5-Extension"; - tag = "v${finalAttrs.version}"; - hash = "sha256-MzgdRuRsfL3yhlVU0RAAUtAaOukMpqSSa42nRYhpmh0="; - }; - useFetchCargoVendor = true; - cargoHash = "sha256-0DDX3ciXk5/3MqsHzxV8s4qEhqYmrwGg7cSbrkFRZbw="; - - nativeBuildInputs = [ rust-cbindgen ]; - - buildPhase = '' - cbindgen --profile release . -o signal-tokenizer.h - ''; - installPhase = '' - install -Dm644 signal-tokenizer.h $out/include/signal-tokenizer.h - ''; - doCheck = false; - }); - -in -buildEnv { - name = "sqlcipher-signal"; - - paths = [ - sqlcipher-amalgamation - signal-tokenizer-headers - signal-sqlcipher-extension - ]; - - postBuild = '' - install -Dm644 ${./sqlite3.gyp} $out/share/sqlite3.gyp - substituteInPlace $out/share/sqlite3.gyp \ - --replace-fail "@extension@" "$out" \ - --replace-fail "@static_lib_ext@" "${stdenv.hostPlatform.extensions.staticLibrary}" - ''; -} diff --git a/pkgs/by-name/si/signal-desktop-source/sqlite3.gyp b/pkgs/by-name/si/signal-desktop-source/sqlite3.gyp deleted file mode 100644 index 2c73ab250b61..000000000000 --- a/pkgs/by-name/si/signal-desktop-source/sqlite3.gyp +++ /dev/null @@ -1,40 +0,0 @@ -{ - 'includes': ['common.gypi'], - 'targets': [ - { - 'target_name': 'locate_sqlite3', - 'type': 'none', - 'copies': [{ - 'files': [ - '@extension@/src/sqlite3.c', - ], - 'destination': '<(SHARED_INTERMEDIATE_DIR)/sqlite3', - }], - }, - { - 'target_name': 'sqlite3', - 'type': 'static_library', - 'dependencies': ['locate_sqlite3'], - 'sources': ['<(SHARED_INTERMEDIATE_DIR)/sqlite3/sqlite3.c'], - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/sqlite3/', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '@extension@/include', - ], - }, - 'cflags': ['-std=c99', '-w'], - 'xcode_settings': { - 'OTHER_CFLAGS': ['-std=c99'], - 'WARNING_CFLAGS': ['-w'], - }, - 'includes': ['defines.gypi'], - 'link_settings': { - 'libraries': [ - '@extension@/lib/libsignal_sqlcipher_extension@static_lib_ext@', - ] - } - }, - ], -} diff --git a/pkgs/by-name/si/signal-desktop/generic.nix b/pkgs/by-name/si/signal-desktop/generic.nix deleted file mode 100644 index 9478ac430f02..000000000000 --- a/pkgs/by-name/si/signal-desktop/generic.nix +++ /dev/null @@ -1,292 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - autoPatchelfHook, - noto-fonts-color-emoji, - dpkg, - libarchive, - asar, - rsync, - python3, - buildPackages, - nixosTests, - gtk3, - atk, - at-spi2-atk, - cairo, - pango, - pipewire, - gdk-pixbuf, - glib, - freetype, - fontconfig, - dbus, - libX11, - xorg, - libXi, - libXcursor, - libXdamage, - libXrandr, - libXcomposite, - libXext, - libXfixes, - libXrender, - libXtst, - libXScrnSaver, - nss, - nspr, - alsa-lib, - cups, - expat, - libuuid, - at-spi2-core, - libappindicator-gtk3, - libgbm, - # Runtime dependencies: - systemd, - libnotify, - libdbusmenu, - libpulseaudio, - xdg-utils, - wayland, -}: - -{ - pname, - libdir, - bindir, - extractPkg, - version, - hash, - url, -}: - -let - inherit (stdenv) targetPlatform; - ARCH = if targetPlatform.isAarch64 then "arm64" else "x64"; - - # Noto Color Emoji PNG files for emoji replacement; see below. - noto-fonts-color-emoji-png = noto-fonts-color-emoji.overrideAttrs (prevAttrs: { - pname = "noto-fonts-color-emoji-png"; - - # The build produces 136×128 PNGs by default for arcane font - # reasons, but we want square PNGs. - buildFlags = prevAttrs.buildFlags or [ ] ++ [ "BODY_DIMENSIONS=128x128" ]; - - makeTargets = [ "compressed" ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share - mv build/compressed_pngs $out/share/noto-fonts-color-emoji-png - python3 add_aliases.py --srcdir=$out/share/noto-fonts-color-emoji-png - - runHook postInstall - ''; - }); -in -stdenv.mkDerivation rec { - inherit pname version; - - # Please backport all updates to the stable channel. - # All releases have a limited lifetime and "expire" 90 days after the release. - # When releases "expire" the application becomes unusable until an update is - # applied. The expiration date for the current release can be extracted with: - # $ grep -a "^{\"buildExpiration" "${signal-desktop}/lib/${dir}/resources/app.asar" - # (Alternatively we could try to patch the asar archive, but that requires a - # few additional steps and might not be the best idea.) - - src = fetchurl { - inherit url hash; - recursiveHash = true; - downloadToTemp = true; - nativeBuildInputs = [ - (if ARCH == "x64" then dpkg else libarchive) - asar - ]; - # Signal ships the Apple emoji set without a licence via an npm - # package and upstream does not seem terribly interested in fixing - # this; see: - # - # * - # * - # - # We work around this by replacing it with the Noto Color Emoji - # set, which is available under a FOSS licence and more likely to - # be used on a NixOS machine anyway. The Apple emoji are removed - # during `fetchurl` to ensure that the build doesn’t cache the - # unlicensed emoji files, but the rest of the work is done in the - # main derivation. - postFetch = '' - ${extractPkg} - asar extract "$out/${libdir}/resources/app.asar" $out/asar-contents - rm -r \ - "$out/${libdir}/resources/app.asar"{,.unpacked} \ - $out/asar-contents/node_modules/emoji-datasource-apple - ''; - }; - - nativeBuildInputs = [ - rsync - asar - python3 - autoPatchelfHook - # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 - # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. - (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) - ]; - - buildInputs = [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libappindicator-gtk3 - libpulseaudio - libnotify - libuuid - libgbm - nspr - nss - pango - systemd - xorg.libxcb - xorg.libxshmfence - ]; - - runtimeDependencies = [ - (lib.getLib systemd) - libappindicator-gtk3 - libnotify - libdbusmenu - pipewire - xdg-utils - wayland - ]; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - rsync -a --chmod=+w $src/ . - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - - mv usr/share $out/share - mv "${libdir}" "$out/lib/signal-desktop" - - # Symlink to bin - mkdir -p $out/bin - ln -s "$out/lib/signal-desktop/signal-desktop" $out/bin/${meta.mainProgram} - - # Create required symlinks: - ln -s libGLESv2.so "$out/lib/signal-desktop/libGLESv2.so.2" - - # Copy the Noto Color Emoji PNGs into the ASAR contents. See `src` - # for the motivation, and the script for the technical details. - emojiPrefix=$( - python3 ${./copy-noto-emoji.py} \ - ${noto-fonts-color-emoji-png}/share/noto-fonts-color-emoji-png \ - asar-contents - ) - - # Replace the URL used for fetching large versions of emoji with - # the local path to our copied PNGs. - substituteInPlace asar-contents/preload.bundle.js \ - --replace-fail \ - 'emoji://jumbo?emoji=' \ - "file://$out/lib/signal-desktop/resources/app.asar/$emojiPrefix/" - - # `asar(1)` copies files from the corresponding `.unpacked` - # directory when extracting, and will put them back in the modified - # archive if you don’t specify them again when repacking. Signal - # leaves their native `.node` libraries unpacked, so we match that. - asar pack \ - --unpack '*.node' \ - asar-contents \ - "$out/lib/signal-desktop/resources/app.asar" - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - ) - - # Fix the desktop link - substituteInPlace $out/share/applications/signal-desktop.desktop \ - --replace-fail "/${bindir}/signal-desktop" ${meta.mainProgram} \ - --replace-fail "StartupWMClass=Signal" "StartupWMClass=signal" - - # Note: The following path contains bundled libraries: - # $out/lib/signal-desktop/resources/app.asar.unpacked/node_modules/ - patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/signal-desktop/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-${ARCH}.node" - ''; - - passthru = { - # Tests if the application launches and waits for "Link your phone to Signal Desktop": - tests.application-launch = nixosTests.signal-desktop; - updateScript.command = [ ./update.sh ]; - }; - - meta = { - description = "Private, simple, and secure messenger"; - longDescription = '' - Signal Desktop is an Electron application that links with your - "Signal Android" or "Signal iOS" app. - ''; - homepage = "https://signal.org/"; - changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; - license = [ - lib.licenses.agpl3Only - - # Various npm packages - lib.licenses.free - ]; - maintainers = with lib.maintainers; [ - mic92 - equirosa - urandom - bkchr - teutat3s - emily - Gliczy - ]; - mainProgram = pname; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/si/signal-desktop-source/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix similarity index 89% rename from pkgs/by-name/si/signal-desktop-source/libsignal-node.nix rename to pkgs/by-name/si/signal-desktop/libsignal-node.nix index a0e60c798137..00bfe375f805 100644 --- a/pkgs/by-name/si/signal-desktop-source/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -12,7 +12,6 @@ fetchFromGitHub, python3, nodejs, - }: let # boring-sys expects the static libraries in build/ instead of lib/ @@ -25,23 +24,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.67.3"; + version = "0.70.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-kZZS3IpmxFFuHMH4O1H+JLyf2zBTSr1RnuV0wrwZeXk="; + hash = "sha256-6CBhLvD0UflLzJHAMB21wSH8MWTUNx0uPdqOUo/Eq44="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ozroDfxDdBtyBEE0d7nf63wUqilBhakT/lxwYV/7V5I="; + cargoHash = "sha256-4bSPPf16nUQTl6INa3mLhPIe8iiFfpPw1E5fpNvnKqs="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-TpjpRDsKT/RCPxzV7mzfmZHI9QhH+OColGuEMSdVwBA="; + hash = "sha256-djk+YGZ/eUq6MXjUEE47bgKnQlUSuaoUPx8hUMtjvyQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index f2faec1ccb35..8cbe760f89e5 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -1,7 +1,272 @@ -{ stdenv, callPackage }: -if stdenv.hostPlatform.system == "aarch64-linux" then - callPackage ./signal-desktop-aarch64.nix { } -else if stdenv.hostPlatform.isDarwin then - callPackage ./signal-desktop-darwin.nix { } -else - callPackage ./signal-desktop.nix { } +{ + stdenv, + lib, + nodejs_22, + pnpm_10, + electron_35, + python3, + makeWrapper, + callPackage, + fetchFromGitHub, + jq, + makeDesktopItem, + copyDesktopItems, + replaceVars, + noto-fonts-color-emoji, + nixosTests, + withAppleEmojis ? false, +}: +let + nodejs = nodejs_22; + pnpm = pnpm_10.override { inherit nodejs; }; + electron = electron_35; + + libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; }; + signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; }; + + webrtc = callPackage ./webrtc.nix { }; + ringrtc = callPackage ./ringrtc.nix { inherit webrtc; }; + + # Noto Color Emoji PNG files for emoji replacement; see below. + noto-fonts-color-emoji-png = noto-fonts-color-emoji.overrideAttrs (prevAttrs: { + pname = "noto-fonts-color-emoji-png"; + + # The build produces 136×128 PNGs by default for arcane font + # reasons, but we want square PNGs. + buildFlags = prevAttrs.buildFlags or [ ] ++ [ "BODY_DIMENSIONS=128x128" ]; + + makeTargets = [ "compressed" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + mv build/compressed_pngs $out/share/noto-fonts-color-emoji-png + python3 add_aliases.py --srcdir=$out/share/noto-fonts-color-emoji-png + + runHook postInstall + ''; + }); + + version = "7.54.0"; + + src = fetchFromGitHub { + owner = "signalapp"; + repo = "Signal-Desktop"; + tag = "v${version}"; + hash = "sha256-dv1Yi7gSd7kY3MSrsPjcaf2hAEq6Y+XoWtlBfvd86ac="; + }; + + sticker-creator = stdenv.mkDerivation (finalAttrs: { + pname = "signal-desktop-sticker-creator"; + inherit version; + src = src + "/sticker-creator"; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname src version; + hash = "sha256-TuPyRVNFIlR0A4YHMpQsQ6m+lm2fsp79FzQ1P5qqjIc="; + }; + + strictDeps = true; + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + buildPhase = '' + runHook preBuild + pnpm run build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; + }); +in +stdenv.mkDerivation (finalAttrs: { + pname = "signal-desktop"; + inherit src version; + + strictDeps = true; + nativeBuildInputs = [ + nodejs + pnpm.configHook + makeWrapper + copyDesktopItems + python3 + jq + ]; + buildInputs = (lib.optional (!withAppleEmojis) noto-fonts-color-emoji-png); + + patches = lib.optional (!withAppleEmojis) ( + replaceVars ./replace-apple-emoji-with-noto-emoji.patch { + noto-emoji-pngs = "${noto-fonts-color-emoji-png}/share/noto-fonts-color-emoji-png"; + } + ); + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) + pname + version + src + patches + ; + hash = + if withAppleEmojis then + "sha256-Kdg0+kLEDFobWEEhJgKuaou/pYwn1dTugye7OcMYfEQ=" + else + "sha256-cit/Hn7L6qmfIJCDF2wlx/4aKygRYy+zvBQGX6Mg+og="; + }; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + SIGNAL_ENV = "production"; + SOURCE_DATE_EPOCH = 1747170390; + }; + + preBuild = '' + if [ "`jq -r '.engines.node' < package.json | cut -d. -f1`" != "${lib.versions.major nodejs.version}" ] + then + die "nodejs version mismatch" + fi + + if [ "`jq -r '.devDependencies.electron' < package.json | cut -d. -f1`" != "${lib.versions.major electron.version}" ] + then + die "electron version mismatch" + fi + + if [ "`jq -r '.dependencies."@signalapp/libsignal-client"' < package.json`" != "${libsignal-node.version}" ] + then + die "libsignal-client version mismatch" + fi + + if [ "`jq -r '.dependencies."@signalapp/sqlcipher"' < package.json`" != "${signal-sqlcipher.version}" ] + then + die "signal-sqlcipher version mismatch" + fi + + if [ "`jq -r '.dependencies."@signalapp/ringrtc"' < package.json`" != "${ringrtc.version}" ] + then + die "ringrtc version mismatch" + fi + + install -D ${ringrtc}/lib/libringrtc${stdenv.hostPlatform.extensions.library} \ + node_modules/@signalapp/ringrtc/build/libringrtc.node + + substituteInPlace package.json \ + --replace-fail '"node_modules/@signalapp/ringrtc/build/''${platform}/*''${arch}*.node",' \ + '"node_modules/@signalapp/ringrtc/build/libringrtc.node",' + + substituteInPlace node_modules/@signalapp/ringrtc/dist/ringrtc/Native.js \ + --replace-fail 'exports.default = require(`../../build/''${os.platform()}/libringrtc-''${process.arch}.node`);' \ + 'exports.default = require(`../../build/libringrtc.node`);' + + rm -r node_modules/@signalapp/libsignal-client/prebuilds + cp -r ${libsignal-node}/lib node_modules/@signalapp/libsignal-client/prebuilds + + rm -r node_modules/@signalapp/sqlcipher + cp -r ${signal-sqlcipher} node_modules/@signalapp/sqlcipher + ''; + + buildPhase = '' + runHook preBuild + + export npm_config_nodedir=${electron.headers} + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + cp -r ${sticker-creator} sticker-creator/dist + + pnpm run generate + pnpm exec electron-builder \ + --dir \ + --config.extraMetadata.environment=$SIGNAL_ENV \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/ + cp -r dist/*-unpacked/resources $out/share/signal-desktop + + for icon in build/icons/png/* + do + install -Dm644 $icon $out/share/icons/hicolor/`basename ''${icon%.png}`/apps/signal-desktop.png + done + + makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \ + --add-flags "$out/share/signal-desktop/app.asar" \ + --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "signal"; + desktopName = "Signal"; + exec = "${finalAttrs.meta.mainProgram} %U"; + type = "Application"; + terminal = false; + icon = "signal-desktop"; + comment = "Private messaging from your desktop"; + startupWMClass = "signal"; + mimeTypes = [ + "x-scheme-handler/sgnl" + "x-scheme-handler/signalcaptcha" + ]; + categories = [ + "Network" + "InstantMessaging" + "Chat" + ]; + }) + ]; + + passthru = { + inherit + libsignal-node + ringrtc + webrtc + sticker-creator + signal-sqlcipher + ; + tests.application-launch = nixosTests.signal-desktop; + updateScript.command = [ ./update.sh ]; + }; + + meta = { + description = "Private, simple, and secure messenger (nixpkgs build)"; + longDescription = '' + Signal Desktop is an Electron application that links with your + "Signal Android" or "Signal iOS" app. + ''; + homepage = "https://signal.org/"; + changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${finalAttrs.version}"; + license = + with lib.licenses; + [ + agpl3Only + + # Various npm packages + free + ] + ++ lib.optional withAppleEmojis unfree; + maintainers = with lib.maintainers; [ + marcin-serwin + teutat3s + ]; + mainProgram = "signal-desktop"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +}) diff --git a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch new file mode 100644 index 000000000000..5d235dc80041 --- /dev/null +++ b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch @@ -0,0 +1,146 @@ +diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md +index 2c963f1..96edd02 100644 +--- a/ACKNOWLEDGMENTS.md ++++ b/ACKNOWLEDGMENTS.md +@@ -1636,30 +1636,6 @@ Signal Desktop makes use of the following open source projects. + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +-## emoji-datasource-apple +- +- The MIT License (MIT) +- +- Copyright (c) 2013 Cal Henderson +- +- Permission is hereby granted, free of charge, to any person obtaining a copy +- of this software and associated documentation files (the "Software"), to deal +- in the Software without restriction, including without limitation the rights +- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- copies of the Software, and to permit persons to whom the Software is +- furnished to do so, subject to the following conditions: +- +- The above copyright notice and this permission notice shall be included in all +- copies or substantial portions of the Software. +- +- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +- SOFTWARE. +- + ## emoji-regex + + Copyright Mathias Bynens +diff --git a/app/protocol_filter.ts b/app/protocol_filter.ts +index 68dceea..4b35bb1 100644 +--- a/app/protocol_filter.ts ++++ b/app/protocol_filter.ts +@@ -59,6 +59,7 @@ function _createFileHandler({ + const allowedRoots = [ + userDataPath, + installPath, ++ "@noto-emoji-pngs@", + getAvatarsPath(userDataPath), + getBadgesPath(userDataPath), + getDraftPath(userDataPath), +diff --git a/package.json b/package.json +index 5755fec..86125ba 100644 +--- a/package.json ++++ b/package.json +@@ -137,7 +137,6 @@ + "dashdash": "2.0.0", + "direction": "1.0.4", + "emoji-datasource": "15.1.2", +- "emoji-datasource-apple": "15.1.2", + "emoji-regex": "10.4.0", + "encoding": "0.1.13", + "fabric": "4.6.0", +@@ -649,4 +648,4 @@ + "sticker-creator/dist/**" + ] + } +-} ++} +\ No newline at end of file +diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml +index f04b2b1..070fa0f 100644 +--- a/pnpm-lock.yaml ++++ b/pnpm-lock.yaml +@@ -184,9 +184,6 @@ importers: + emoji-datasource: + specifier: 15.1.2 + version: 15.1.2 +- emoji-datasource-apple: +- specifier: 15.1.2 +- version: 15.1.2 + emoji-regex: + specifier: 10.4.0 + version: 10.4.0 +@@ -4817,9 +4814,6 @@ packages: + resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} + engines: {node: '>=12'} + +- emoji-datasource-apple@15.1.2: +- resolution: {integrity: sha512-32UZTK36x4DlvgD1smkmBlKmmJH7qUr5Qut4U/on2uQLGqNXGbZiheq6/LEA8xRQEUrmNrGEy25wpEI6wvYmTg==} +- + emoji-datasource@15.1.2: + resolution: {integrity: sha512-tXAqGsrDVhgCRpFePtaD9P4Z8Ro2SUQSL/4MIJBG0SxqQJaMslEbin8J53OaFwEBu6e7JxFaIF6s4mw9+8acAQ==} + +@@ -14990,8 +14984,6 @@ snapshots: + + emittery@0.13.1: {} + +- emoji-datasource-apple@15.1.2: {} +- + emoji-datasource@15.1.2: {} + + emoji-regex@10.4.0: {} +diff --git a/stylesheets/components/fun/FunEmoji.scss b/stylesheets/components/fun/FunEmoji.scss +index 78c7563..83d196c 100644 +--- a/stylesheets/components/fun/FunEmoji.scss ++++ b/stylesheets/components/fun/FunEmoji.scss +@@ -5,19 +5,9 @@ + $emoji-sprite-sheet-grid-item-count: 62; + + @mixin emoji-sprite($sheet, $margin, $scale) { +- $size: calc($sheet * 1px * $scale); +- $margin-start: calc($margin * $scale); +- $margin-end: calc($margin * $scale); +- $size-outer: calc($size + $margin-start + $margin-end); +- $image: url('../images/emoji-sheet-#{$sheet}.webp'); +- background-image: $image; +- background-size: calc($size-outer * $emoji-sprite-sheet-grid-item-count); +- background-position-x: calc( +- var(--fun-emoji-sheet-x) * ($size-outer * -1) + ($margin-start * -1) +- ); +- background-position-y: calc( +- var(--fun-emoji-sheet-y) * ($size-outer * -1) + ($margin-start * -1) +- ); ++ background-image: var(--fun-emoji-jumbo-image); ++ background-size: contain; ++ background-position: center; + background-repeat: no-repeat; + } + +diff --git a/ts/components/fun/FunEmoji.tsx b/ts/components/fun/FunEmoji.tsx +index 08785e8..d25b868 100644 +--- a/ts/components/fun/FunEmoji.tsx ++++ b/ts/components/fun/FunEmoji.tsx +@@ -10,7 +10,14 @@ export const FUN_STATIC_EMOJI_CLASS = 'FunStaticEmoji'; + export const FUN_INLINE_EMOJI_CLASS = 'FunInlineEmoji'; + + function getEmojiJumboUrl(emoji: EmojiVariantData): string { +- return `emoji://jumbo?emoji=${encodeURIComponent(emoji.value)}`; ++ const emojiToNotoName = (emoji: string): string => ++ `emoji_u${ ++ [...emoji] ++ .filter(c => c != "\ufe0f") ++ .map(c => c.codePointAt(0)?.toString(16).padStart(4, "0")) ++ .join("_") ++ }.png`; ++ return `file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)}`; + } + + export type FunStaticEmojiSize = diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix new file mode 100644 index 000000000000..13be50c38e60 --- /dev/null +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -0,0 +1,45 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + cmake, + protobuf, + webrtc, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ringrtc"; + version = "2.51.0"; + + src = fetchFromGitHub { + owner = "signalapp"; + repo = "ringrtc"; + tag = "v${finalAttrs.version}"; + hash = "sha256-PLrGLW6pDoCNpbWASxAqockAJRoeBrkBdxNOHYrQu4s="; + }; + useFetchCargoVendor = true; + cargoHash = "sha256-u38VOV2xdNG1WFox+SWT9ejJD1TjK0yAI6lCB9r75iY="; + + cargoBuildFlags = [ + "-p" + "ringrtc" + "--features" + "electron" + ]; + doCheck = false; + + nativeBuildInputs = [ + protobuf + cmake + ]; + buildInputs = [ + webrtc + ]; + + meta = { + homepage = "https://github.com/signalapp/ringrtc"; + description = "RingRTC library used by Signal"; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix deleted file mode 100644 index 9280347b8965..000000000000 --- a/pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage }: -callPackage ./generic.nix { } { - pname = "signal-desktop"; - version = "7.47.0-1"; - - libdir = "usr/lib64/signal-desktop"; - bindir = "usr/bin"; - extractPkg = '' - mkdir -p $out - bsdtar -xf $downloadedFile -C "$out" - ''; - - url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/08795262-signal-desktop/signal-desktop-7.47.0-1.fc42.aarch64.rpm"; - hash = "sha256-CDj9OX6OfEzbP8kusqnWN+MCPPEi9u2Hj1LkpsCg3vI="; -} diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop.nix b/pkgs/by-name/si/signal-desktop/signal-desktop.nix deleted file mode 100644 index 3f64c17b254a..000000000000 --- a/pkgs/by-name/si/signal-desktop/signal-desktop.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage }: -callPackage ./generic.nix { } rec { - pname = "signal-desktop"; - version = "7.47.0"; - - libdir = "opt/Signal"; - bindir = libdir; - extractPkg = "dpkg-deb -x $downloadedFile $out"; - - url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-rH1iuyVYoUNFvj2Z9DI5MXcX+sXjN2NSW2uaKafTO9M="; -} diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix new file mode 100644 index 000000000000..225876e18e7c --- /dev/null +++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix @@ -0,0 +1,75 @@ +{ + stdenv, + lib, + fetchFromGitHub, + pnpm, + nodejs, + rustPlatform, + cargo, + dump_syms, + python3, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "node-sqlcipher"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "signalapp"; + repo = "node-sqlcipher"; + tag = "v${finalAttrs.version}"; + hash = "sha256-15t2HuEYdCxShK703/z3bb1VCgSNpziaK5+wM3TqSHg="; + }; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-regaYG+SDvIgdnHQVR1GG1A1FSBXpzFfLuyTEdMt1kQ="; + }; + + cargoRoot = "deps/extension"; + cargoDeps = rustPlatform.fetchCargoVendor { + name = "sqlcipher-signal-exentsion"; + inherit (finalAttrs) src cargoRoot; + hash = "sha256-qT4HM/FRL8qugKKNlMYM/0zgUsC6cDOa9fgd1d4VIrc="; + }; + + strictDeps = true; + nativeBuildInputs = [ + nodejs + pnpm.configHook + rustPlatform.cargoSetupHook + cargo + dump_syms + python3 + ]; + + buildPhase = '' + runHook preBuild + + export npm_config_nodedir=${nodejs} + pnpm run prebuildify + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist $out + cp -r prebuilds $out + + runHook postInstall + ''; + + meta = { + description = "Fast N-API-based Node.js addon wrapping sqlcipher and FTS5 segmenting APIs"; + homepage = "https://github.com/signalapp/node-sqlcipher/tree/main"; + license = with lib.licenses; [ + agpl3Only + + # deps/sqlcipher + bsd3 + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/si/signal-desktop/update.sh b/pkgs/by-name/si/signal-desktop/update.sh index dc2c6864cec6..d4dca6e74ef8 100755 --- a/pkgs/by-name/si/signal-desktop/update.sh +++ b/pkgs/by-name/si/signal-desktop/update.sh @@ -1,33 +1,64 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash common-updater-scripts curl coreutils jq +#!nix-shell -i bash -p bash nix-update common-updater-scripts curl coreutils jq gclient2nix set -ex SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" -latestTag=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \ - "https://api.github.com/repos/signalapp/Signal-Desktop/releases/latest" \ - | jq -r ".tag_name") -latestVersion="$(expr "$latestTag" : 'v\(.*\)')" +curl_github() { + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@" +} -latestBuildInfoAarch64=$(curl \ - "https://copr.fedorainfracloud.org/api_3/package/?ownername=useidel&projectname=signal-desktop&packagename=signal-desktop&with_latest_succeeded_build=true" \ - | jq '.builds.latest_succeeded') -latestBuildAarch64=$(jq '.id' <<< $latestBuildInfoAarch64) -latestVersionAarch64=$(jq -r '.source_package.version' <<< $latestBuildInfoAarch64) +releaseInfo="`curl_github \ + "https://api.github.com/repos/signalapp/Signal-Desktop/releases/latest"`" -echo "Updating signal-desktop for x86_64-linux" -update-source-version signal-desktop "$latestVersion" \ - --system=x86_64-linux \ - --file="$SCRIPT_DIR/signal-desktop.nix" +releaseTag="`jq -r ".tag_name" <<< $releaseInfo`" +releaseDate="`jq -r ".created_at" <<< $releaseInfo`" +releaseEpoch=`date -d $releaseDate +%s` -echo "Updating signal-desktop for aarch64-linux" -update-source-version signal-desktop "$latestVersionAarch64" "" \ - "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/$(printf "%08d" $latestBuildAarch64)-signal-desktop/signal-desktop-$latestVersionAarch64.fc42.aarch64.rpm" \ - --system=aarch64-linux \ - --file="$SCRIPT_DIR/signal-desktop-aarch64.nix" +packageJson="`curl_github "https://raw.githubusercontent.com/signalapp/Signal-Desktop/refs/tags/$releaseTag/package.json"`" -echo "Updating signal-desktop for darwin" -update-source-version signal-desktop "$latestVersion" \ - --system=aarch64-darwin \ - --file="$SCRIPT_DIR/signal-desktop-darwin.nix" +latestVersion="`jq -r '.version' <<< $packageJson`" +nodeVersion="`jq -r '.engines.node' <<< $packageJson | cut -d. -f1`" +electronVersion="`jq -r '.devDependencies.electron' <<< $packageJson | cut -d. -f1`" +libsignalClientVersion=`jq -r '.dependencies."@signalapp/libsignal-client"' <<< $packageJson` +signalSqlcipherVersion=`jq -r '.dependencies."@signalapp/sqlcipher"' <<< $packageJson` +ringrtcVersion=`jq -r '.dependencies."@signalapp/ringrtc"' <<< $packageJson` +ringrtcVersionProperties="`curl_github "https://raw.githubusercontent.com/signalapp/ringrtc/refs/tags/v$ringrtcVersion/config/version.properties"`" +webrtcVersion="`grep --only-matching "^webrtc.version=.*$" <<< $ringrtcVersionProperties | sed "s/webrtc.version=//g"`" + +sed -E -i "s/(nodejs_)../\1$nodeVersion/" $SCRIPT_DIR/package.nix +sed -E -i "s/(electron_)../\1$electronVersion/" $SCRIPT_DIR/package.nix +sed -E -i "s/(SOURCE_DATE_EPOCH = )[0-9]+/\1$releaseEpoch/" $SCRIPT_DIR/package.nix + +sed -E -i "s/(withAppleEmojis \? )false/\1true/" $SCRIPT_DIR/package.nix +nix-update signal-desktop --subpackage sticker-creator --version="$latestVersion" +sed -E -i "s/(withAppleEmojis \? )true/\1false/" $SCRIPT_DIR/package.nix +update-source-version signal-desktop \ + --ignore-same-version \ + --source-key=pnpmDeps + +update-source-version signal-desktop.libsignal-node \ + "$libsignalClientVersion" +update-source-version signal-desktop.libsignal-node \ + --ignore-same-version \ + --source-key=cargoDeps.vendorStaging +update-source-version signal-desktop.libsignal-node \ + --ignore-same-version \ + --source-key=npmDeps + +update-source-version signal-desktop.signal-sqlcipher \ + "$signalSqlcipherVersion" +update-source-version signal-desktop.signal-sqlcipher \ + --ignore-same-version \ + --source-key=cargoDeps.vendorStaging +update-source-version signal-desktop.signal-sqlcipher \ + --ignore-same-version \ + --source-key=pnpmDeps + +update-source-version signal-desktop.ringrtc "$ringrtcVersion" +update-source-version signal-desktop.ringrtc \ + --ignore-same-version \ + --source-key=cargoDeps.vendorStaging + +gclient2nix generate "https://github.com/signalapp/webrtc@$webrtcVersion" > $SCRIPT_DIR/webrtc-sources.json diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json new file mode 100644 index 000000000000..4e94f9df5248 --- /dev/null +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -0,0 +1,372 @@ +{ + "src": { + "args": { + "hash": "sha256-yomovlwRmrzsN+dvmUgOM6pzBTH41QuHQXnEJBhQglY=", + "owner": "signalapp", + "repo": "webrtc", + "tag": "6998b" + }, + "fetcher": "fetchFromGitHub" + }, + "src/base": { + "args": { + "hash": "sha256-hglQbmk4pfkzhHPXPGPrjN60VfpEbCn3mbOkM1kcjhE=", + "rev": "e0914b7606a151a3a12e994c400519f2e291c53f", + "url": "https://chromium.googlesource.com/chromium/src/base" + }, + "fetcher": "fetchFromGitiles" + }, + "src/build": { + "args": { + "hash": "sha256-f7sLdyVzuWsVMsH21tLBDPadEJPyzSWhk8f97P7Meko=", + "rev": "64e296c42a93fbd27acc9a94713e4289273409b2", + "url": "https://chromium.googlesource.com/chromium/src/build" + }, + "fetcher": "fetchFromGitiles" + }, + "src/buildtools": { + "args": { + "hash": "sha256-w6CVjFp5hkRHscXF7qUJ/Ei9Nl7lqBcGnwHXmjrehHw=", + "rev": "a660247d3c14a172b74b8e832ba1066b30183c97", + "url": "https://chromium.googlesource.com/chromium/src/buildtools" + }, + "fetcher": "fetchFromGitiles" + }, + "src/ringrtc/opus/src": { + "args": { + "hash": "sha256-Vztq+Z388Welj2cfChumimfEXtVn4zCcrGBedZFoTmM=", + "owner": "xiph", + "repo": "opus", + "rev": "0e30966b198ad28943799eaf5b3b08100b6f70c3" + }, + "fetcher": "fetchFromGitHub" + }, + "src/testing": { + "args": { + "hash": "sha256-VQJ0hqEI2QIFPKZwLCAtUtKuPkJndvndtK4lGRiX20M=", + "rev": "63412fdcdfe281e6b9531a5e1086a59c0b9e6909", + "url": "https://chromium.googlesource.com/chromium/src/testing" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party": { + "args": { + "hash": "sha256-88mIRDQvFeCcwiLPt4cyFE/xfmEJ95xB93uUcRPe670=", + "rev": "d212a71416ad7c6ceca04d6d27dfdd84fd00c04c", + "url": "https://chromium.googlesource.com/chromium/src/third_party" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/boringssl/src": { + "args": { + "hash": "sha256-Mrv/aV7RjDLPVi0QN7p1qJ3M8zHWogcq+u2F+S1LoNE=", + "rev": "d4b6eb542d4fd109baacd550935efd00c521e674", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/breakpad/breakpad": { + "args": { + "hash": "sha256-jOTRgF2WxsX5P0LgUI9zdCc0+NcqSnO310aq15msThY=", + "rev": "0dfd77492fdb0dcd06027c5842095e2e908adc90", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/catapult": { + "args": { + "hash": "sha256-XtQclu96NHJxt8kJCyp8iaJUkTI2bS+q6NRwvIgmhX8=", + "rev": "b15611f18b506cf9dbc03e9bf87dbc8df549ccce", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ced/src": { + "args": { + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/clang-format/script": { + "args": { + "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=", + "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/colorama/src": { + "args": { + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/crc32c/src": { + "args": { + "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=", + "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dav1d/libdav1d": { + "args": { + "hash": "sha256-Ft71Ubirlpi7IJcNDFIfyZqmR2Xxv68PiEOfg7JhLuU=", + "rev": "edb16889d16f5e13161b6e8f7a839cd82d7d655d", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/depot_tools": { + "args": { + "hash": "sha256-Qea35ZMbVtvdFPmge0ShrEW0p17Z1UJUGdBTaxaZ5gQ=", + "rev": "80d1969422e75e8e9eecafa46074074b289e2568", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ffmpeg": { + "args": { + "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ=", + "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/flatbuffers/src": { + "args": { + "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=", + "rev": "8db59321d9f02cdffa30126654059c7d02f70c32", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fontconfig/src": { + "args": { + "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", + "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/freetype/src": { + "args": { + "hash": "sha256-wKzsJ5SXicsLXs0M2+usPz72gy8IsmQGTD3RGKYnhgo=", + "rev": "a059b237bb01eb3e4f9f8b1618dda8c117498bab", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fuzztest/src": { + "args": { + "hash": "sha256-KjO8h5KS7/3vP8zRY2I09nIA/eJHKnmBuY8i8KU81KQ=", + "rev": "00edfa0dd94d7e00a89684e950015c30d3b7ae07", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/google_benchmark/src": { + "args": { + "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=", + "rev": "761305ec3b33abf30e08d50eb829e19a802581cc", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/googletest/src": { + "args": { + "hash": "sha256-9hPtc5kLEaetJXqtcneXFOcC2z5AdkvWGYgKMSB+vbs=", + "rev": "2b6b042a77446ff322cd7522ca068d9f2a21c1d1", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/grpc/src": { + "args": { + "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg=", + "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/gtest-parallel": { + "args": { + "hash": "sha256-VUuk5tBTh+aU2dxVWUF1FePWlKUJaWSiGSXk/J5zgHw=", + "rev": "96f4f904922f9bf66689e749c40f314845baaac8", + "url": "https://chromium.googlesource.com/external/github.com/google/gtest-parallel" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/harfbuzz-ng/src": { + "args": { + "hash": "sha256-TStJvz3Txn4cvU1tCPPZn6RLslvM+VNUqt8l8g67JN4=", + "rev": "1c249be96e27eafd15eb86d832b67fbc3751634b", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/icu": { + "args": { + "hash": "sha256-O9qrAt8lwNBg5LCVz+SfTe48uJx8onVYwn0LRXIhUvY=", + "rev": "bbccc2f6efc1b825de5f2c903c48be685cd0cf22", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/instrumented_libs": { + "args": { + "hash": "sha256-7w5wMcmPcKLS91buxyRdcgaQjbKGFdmrKClvYVO3iko=", + "rev": "3cc43119a29158bcde39d288a8def4b8ec49baf8", + "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/jsoncpp/source": { + "args": { + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libFuzzer/src": { + "args": { + "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=", + "rev": "e31b99917861f891308269c36a32363b120126bb", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libaom/source/libaom": { + "args": { + "hash": "sha256-oceORERaQDEQkssZwiWGOtAsbuI0YeOciwb9FgtFuHw=", + "rev": "d737ca3ebe92feec465876a8fc98950cecd08fd8", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libc++/src": { + "args": { + "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U=", + "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libc++abi/src": { + "args": { + "hash": "sha256-RIPejJnlQE5S8ss3WijR4uLVC+yRL9Ba0vslQeJFNiE=", + "rev": "8205ccf0f23545ebcd8846363ea1d29e77917a22", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libjpeg_turbo": { + "args": { + "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=", + "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libsrtp": { + "args": { + "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=", + "rev": "a52756acb1c5e133089c798736dd171567df11f5", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libunwind/src": { + "args": { + "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY=", + "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libvpx/source/libvpx": { + "args": { + "hash": "sha256-8/Ttkc1ZLQ9WvQf+0/BW9zlmWvlyGDujELyLDqNmQxI=", + "rev": "7a65480684b1b28bb9defae164bf0dc78b32653e", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libyuv": { + "args": { + "hash": "sha256-hHwJLMI/leUm8RjkBsSQn/GaNU8Aan1yllGnXvdfG78=", + "rev": "10592b60c0b2c33210b7752454253dc2625b4305", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/llvm-libc/src": { + "args": { + "hash": "sha256-OtNt+IRn2AFRTKvrA+c9AD+mbfBD37K2S9PXk3UI99A=", + "rev": "12809bfa855813dcef51871e2ee3155e53ed35ea", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/lss": { + "args": { + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/nasm": { + "args": { + "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", + "rev": "f477acb1049f5e043904b87b825c5915084a9a29", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/openh264/src": { + "args": { + "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE=", + "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/perfetto": { + "args": { + "hash": "sha256-ogrB+n5F4UnmL3nHJRyMFOLYVUvjirT9BClg20mTZkc=", + "rev": "a0c2bc7919f7467cf4a8287c8389c3f96a3fcbac", + "url": "https://android.googlesource.com/platform/external/perfetto.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/protobuf-javascript/src": { + "args": { + "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=", + "rev": "e34549db516f8712f678fcd4bc411613b5cc5295", + "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/re2/src": { + "args": { + "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=", + "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/tools": { + "args": { + "hash": "sha256-C3bzAAJp8OpKAHhM54P/sTBVFf3K6ffxvrpfKKxLRII=", + "rev": "6820cc03cc8a4b1fb99747f30e8249d138a70981", + "url": "https://chromium.googlesource.com/chromium/src/tools" + }, + "fetcher": "fetchFromGitiles" + } +} diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix new file mode 100644 index 000000000000..4b36523276b4 --- /dev/null +++ b/pkgs/by-name/si/signal-desktop/webrtc.nix @@ -0,0 +1,79 @@ +{ + stdenv, + lib, + ninja, + gn, + python3, + pkg-config, + glib, + alsa-lib, + pulseaudio, + writeShellScriptBin, + gclient2nix, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "signal-webrtc"; + version = finalAttrs.gclientDeps."src".path.rev; + + gclientDeps = gclient2nix.importGclientDeps ./webrtc-sources.json; + sourceRoot = "src"; + + preConfigure = '' + echo "$SOURCE_DATE_EPOCH" > build/util/LASTCHANGE.committime + echo "generate_location_tags = true" >> build/config/gclient_args.gni + substituteInPlace build/toolchain/linux/BUILD.gn \ + --replace-fail 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + patchShebangs build/mac/should_use_hermetic_xcode.py + ''; + + nativeBuildInputs = [ + gn + ninja + (writeShellScriptBin "vpython3" '' + exec python3 "$@" + '') + python3 + pkg-config + gclient2nix.gclientUnpackHook + ]; + + buildInputs = [ + glib + alsa-lib + pulseaudio + ]; + + gnFlags = [ + ''target_os="linux"'' + "use_sysroot=false" + "is_clang=false" + "treat_warnings_as_errors=false" + + # https://github.com/signalapp/ringrtc/blob/main/bin/build-electron + "rtc_build_examples=false" + "rtc_build_tools=false" + "rtc_use_x11=false" + "rtc_enable_sctp=false" + "rtc_libvpx_build_vp9=true" + "rtc_disable_metrics=true" + "rtc_disable_trace_events=true" + "is_debug=false" + "symbol_level=1" + "rtc_include_tests=false" + "rtc_enable_protobuf=false" + ]; + ninjaFlags = [ "webrtc" ]; + + installPhase = '' + install -D obj/libwebrtc${stdenv.hostPlatform.extensions.staticLibrary} $out/lib/libwebrtc${stdenv.hostPlatform.extensions.staticLibrary} + ''; + + meta = { + description = "WebRTC library used by Signal"; + homepage = "https://github.com/SignalApp/webrtc"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/si/signal-export/package.nix b/pkgs/by-name/si/signal-export/package.nix index dc09c4867b7b..fe39aff53eee 100644 --- a/pkgs/by-name/si/signal-export/package.nix +++ b/pkgs/by-name/si/signal-export/package.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "signal-export"; - version = "3.4.1"; + version = "3.5.1"; pyproject = true; src = fetchPypi { inherit version; pname = "signal_export"; - hash = "sha256-EDRPaxan/41srlD7wxKqkeWgqwHXY8p5PHJ7xD2GiuU="; + hash = "sha256-UhLWSYdJEDhZ1zI3nxhJoqeH8JfR4s9Hdp6fJ4UNROQ="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 098149418ce4..02627f9e0241 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250331-1"; + version = "20250519"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-MrpHGSuV5HhZuwCC8E1konE3DhyK/hv6m6Mt+Wx3JT4="; + hash = "sha256-4h6eYP7Lvagm0GmkwtK1CNa/FaaWj0A78Ralevjmj5I="; }; nativeBuildInputs = diff --git a/pkgs/by-name/si/signald/deps.json b/pkgs/by-name/si/signald/deps.json deleted file mode 100644 index c3ec7f1e80d0..000000000000 --- a/pkgs/by-name/si/signald/deps.json +++ /dev/null @@ -1,528 +0,0 @@ -{ - "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", - "!version": 1, - "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org": { - "signald#libsignal-client-aarch64-apple-darwin/0.21.1": { - "jar": "sha256-GZyZBUokXraIAXXRoGMFoU48FzUym80J0XU2o/fbEgE=", - "module": "sha256-Z6k9Pt5ac5il2uK2ngQn0Mc8utSRChIl+pO7UeOmbJs=", - "pom": "sha256-b2SOa4rB+2SGAohZpsv7ZNUKPrcCBIONBiflsaLJA7A=" - }, - "signald#libsignal-client-aarch64-unknown-linux-gnu/0.21.1": { - "jar": "sha256-qkF5S7OwiRTABFoAWsXn2WsRCKe+GIcDeX+ENFjbhQg=", - "module": "sha256-Y/ir3VC1oORyDy19ZOctnIcDxgm+tbZSbKKz9VcBh3E=", - "pom": "sha256-E5pDb3MphJnKuE6xfizHrJ4qWXu4Tfv1hWPzynRkx+g=" - }, - "signald#libsignal-client-x86_64-apple-darwin/0.21.1": { - "jar": "sha256-Xc+eIRMlTTReDigOlcPxD4sIm44cwKoJ63tGBxx10pk=", - "module": "sha256-g2GHQh5ThVjmHn7Fiq4j0cPQDpZWl4Lx8kNq8E754fQ=", - "pom": "sha256-AHphg71FAR4tLhOXJP0TfHtSRothQmXL9h6/Vy2fg2I=" - }, - "signald#libsignal-client-x86_64-unknown-linux-gnu/0.21.1": { - "jar": "sha256-b9C1XUATmYS+QyZZT0twxY8e5VBYPX4PGc4KwMuz3MY=", - "module": "sha256-LdJQ1bGMcVuW5gMxwXNfco0fk9EqKUR3/dcXK9/f+uI=", - "pom": "sha256-vQvRDMrMPzs26mkIGyWealXU9n+F1zUsYi+0mGmB4Pc=" - }, - "signald#signal-service-java-aarch64-apple-darwin/2.15.3_unofficial_65": { - "jar": "sha256-AWLSsBwoo2bA95cX7cUZr8djin+pzrg7uQklKB5HaX8=", - "module": "sha256-Kx4rUnEcn7UqES53q7SBDzM1SrPYRW9hLyy8bTUpGqE=", - "pom": "sha256-lIWISMl3ZO1DTH0UvwrFWsWNvTT2T/l8XMnbVu64b90=" - }, - "signald#signal-service-java-aarch64-unknown-linux-gnu/2.15.3_unofficial_65": { - "jar": "sha256-rnh3En9Apq4zZPNCWCpat3bJwjegnWmfKclyWq9WV38=", - "module": "sha256-+ul/buZ1z6UMjhTWY4wrhz9sYrOOiOvbuLg3qSpxJKI=", - "pom": "sha256-4Bt4nts4B+MZJMVAjrxB5b85TaHhEfcslDDegkCVy7Y=" - }, - "signald#signal-service-java-x86_64-apple-darwin/2.15.3_unofficial_65": { - "jar": "sha256-Hkig/2S8txhBKyyzRcloqwc5rMhDELTbRSzy4XGg7Sw=", - "module": "sha256-e/U5v2nGOG3VbIHh0GDFBdIRo+qp3SyiTcsrum9T7gk=", - "pom": "sha256-B+8twiic8oQYWENG9d9ETv4eyYfdEuT6U0aNj87rB48=" - }, - "signald#signal-service-java-x86_64-unknown-linux-gnu/2.15.3_unofficial_65": { - "jar": "sha256-+p3jm8+Bg96BUIQdGT6LHczAhMfSqQVm5OlP5g+bEEs=", - "module": "sha256-GKfQ5h9vzUQL+1pNejIPyb1yjhtVn8CkkAGyaUr5RBM=", - "pom": "sha256-MCAEHWahZHEhR7FP7tDKII+FZM41e3Sc3fVuWwN8GhI=" - } - }, - "https://plugins.gradle.org/m2": { - "com/github/gmazzo#gradle-buildconfig-plugin/3.0.3": { - "jar": "sha256-ql6AIOvktizdRYn07XFhq1wkSlIJ5eWey7lFOP312to=", - "pom": "sha256-EVUqzLXaH59nxdNJoUjwxAP6MJKT85Vcc1qOvY1XH8I=" - }, - "com/github/gmazzo/buildconfig#com.github.gmazzo.buildconfig.gradle.plugin/3.0.3": { - "pom": "sha256-U2RlL3aMVri6eXtNL2AEDerbGlzB6lvG0gfFF88d7W4=" - }, - "com/github/gundy#semver4j/0.16.4": { - "jar": "sha256-3vm0Il+jchnhj4HQHw5S1z3KElejj1R1vp3Vj4dzZRA=", - "pom": "sha256-MgAdskQ7M53SH1t5/ynRreci0boIDCFL3oGfD3LRYE0=" - }, - "com/google/code/gson#gson-parent/2.8.6": { - "pom": "sha256-NzZGOFnsGSZyleiUlAroKo9oRBMDESL+Nc58/34wp3Q=" - }, - "com/google/code/gson#gson/2.8.6": { - "jar": "sha256-yPtIOQVNKAswM/gA0fWpfeLwKOuLoutFitKH5Tbz8l8=", - "pom": "sha256-IXRBWmRzMtMP2gS9HPxwij7MhOr3UX9ZYYjYJE4QORE=" - }, - "com/squareup#javapoet/1.11.1": { - "jar": "sha256-nL8hB75JnsbpWv02tY48oSKiQWbN03VzLlEmfWQFjpA=", - "pom": "sha256-+fP8Lz85koufe74oEXW3R9O1Wgkh8wLi4g0J7o5Bw+w=" - }, - "com/squareup#kotlinpoet/1.0.1": { - "jar": "sha256-vqGIRbA8fGXPkfc5iLoBlQuuZ5nDxRgrVo/nHN2JSqE=", - "pom": "sha256-R0rbJYzTlWjOYNanxzBoFzo6BhZ25AGBBVKnXiPuxdU=" - }, - "de/undercouch#gradle-download-task/4.0.2": { - "jar": "sha256-lSy/zF8hvuzLWSXMW6ZIrwmDklhEHdRNCH1kpX006Ho=", - "pom": "sha256-YvKRaNwv+1gMRKpgIfZVBRqcsKSN/Ue8fk6MpvljrbA=" - }, - "org/antlr#antlr4-master/4.5.2-1": { - "pom": "sha256-U1i0eNglVatXr9f8cjHWA7QPl3vnyjn0DF7FTnZ+tnQ=" - }, - "org/antlr#antlr4-runtime/4.5.2-1": { - "jar": "sha256-6DFBMAS87tfZFcOhdZJ7Haq8SXS3uKb4e7zohtNVA5g=", - "pom": "sha256-k7rJtrxxTVWZBO1DJCeCqMvlQ86/AQS7PswXhqnLZh4=" - }, - "org/apache#apache/19": { - "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" - }, - "org/apache/commons#commons-lang3/3.8.1": { - "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=", - "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU=" - }, - "org/apache/commons#commons-parent/47": { - "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" - }, - "org/beryx#badass-runtime-plugin/1.12.7": { - "jar": "sha256-N3Mx2VyxIFb6U6Qt9/RfF4svqG1sWF9w74TRIz0RB0U=", - "pom": "sha256-9vIy9OpH3sXV5y4jWaQG+pMd8/M2fiVdMmkkCAPBtkk=" - }, - "org/beryx/runtime#org.beryx.runtime.gradle.plugin/1.12.7": { - "pom": "sha256-95lWpL5pLmiBvaBnA0zUDOOqFX8ti9VWS5wAKWxrK3M=" - }, - "org/jetbrains#annotations/13.0": { - "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", - "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" - }, - "org/jetbrains/intellij/deps#trove4j/1.0.20181211": { - "jar": "sha256-r/t8haPIe9z2n/HbuE3hH2PckxKTk0vAjNerGN4INgE=", - "pom": "sha256-MQpqotkFNMMrj0bx/JjNDtrpXc38oj4oR+Xvqa4MAZo=" - }, - "org/jetbrains/kotlin#kotlin-android-extensions/1.4.31": { - "jar": "sha256-SNfgjtYPscadJ/VyBaihHEcdaBM55nlEpL0L8sLht5A=", - "pom": "sha256-6ezdB6SaaAPWXoSb5064ff36iLtElaSDK1zJJbvv2BY=" - }, - "org/jetbrains/kotlin#kotlin-annotation-processing-gradle/1.4.31": { - "jar": "sha256-E11Hgji/ecK6L8FKIgRG3uj3TmiyP5ELwuTRmBorcG0=", - "pom": "sha256-GkmFH2YJ3/XRCK5UUb76mNEcNYUsz7XZiOmqeBiUw4I=" - }, - "org/jetbrains/kotlin#kotlin-build-common/1.4.31": { - "jar": "sha256-2AXnlC+1fSIUHUODV8TAIv8bIa78+yRd3SLqa3SGKrQ=", - "pom": "sha256-DIaSpl7cpUpc/Pp9s+9OLx9nafNTf4jrMwWvw4PBwhw=" - }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.4.31": { - "jar": "sha256-X0oOX3T+lrzUzRQxfISlbnsGpqwW2z2+cMOwaAdzOZ4=", - "pom": "sha256-DWc4Z/LPQirjQPVloRWgPrtcdVxVe9bZyiiGTcw4iyQ=" - }, - "org/jetbrains/kotlin#kotlin-compiler-runner/1.4.31": { - "jar": "sha256-Ybrn0tzI82KaPrIUkKmsVTU8Io+iPdfids7u3jeHisE=", - "pom": "sha256-Yhlloc7kdCcFwWEjv1oN7mTkLZohXrDEvHMj40tEWxs=" - }, - "org/jetbrains/kotlin#kotlin-daemon-client/1.4.31": { - "jar": "sha256-fQJ+9Vrx3JC8BiRn8sjBbAwMlhZ2JdtAnyEhCSjtZAk=", - "pom": "sha256-edI2i+n6TYGBCdixMynI1WMVJSzTV69R9YzgT6f0izw=" - }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.4.31": { - "jar": "sha256-l9xXBLT9JbFamx7X/9hJiqWAeHf7ar5Ni2bW0Qs5zzY=", - "pom": "sha256-L94ntYnr0Y2EFnb7sh4/pi2ZD25eqqbKq1K0vgDj5+s=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.4.31": { - "jar": "sha256-fAuO07UHXmM0/+rpg6Io9LFEUmMenUl9FhwMKiMN4mI=", - "pom": "sha256-MggUaX5sg1nwXU46eBVdL3MetImMyyXfUCKz+VT1vMc=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.4.31": { - "jar": "sha256-9ATALOZ7ahMo2s4i2TW+/cZmBdzdziaVEBvkZshZJqk=", - "pom": "sha256-6EvVpsF+h0q9cIlbQcWI9I/mmzcq6rQTTVW8V2Dzp8s=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/1.4.31": { - "jar": "sha256-/MsDW9vopXkf6e2zvUknrFByoMf9/UzFWDukRv8dfc8=", - "pom": "sha256-UQ2wwA85guaiBXihK97GuNB7d8Mdag2amJJw1Jl71kQ=" - }, - "org/jetbrains/kotlin#kotlin-reflect/1.4.31": { - "jar": "sha256-kfrQtCl0p9WBHjCmHwVwbhdrFEI1cXxt5+geOngQKPI=", - "pom": "sha256-jkm6uEPdhV8xXIfjkMUpqcojkSHYv/uFs6z6L2BgNpc=" - }, - "org/jetbrains/kotlin#kotlin-script-runtime/1.4.31": { - "jar": "sha256-t/j6k4MVJ2wTV7xr+VUDTUZ+20JCuxKjlscPNqxI0/k=", - "pom": "sha256-BnvN9hLIGnhfkdeSR4VpM6ulX9gUEAk8US6Qp+VOs4c=" - }, - "org/jetbrains/kotlin#kotlin-scripting-common/1.4.31": { - "jar": "sha256-7Gb0SktBsyUsvAkcnXwJa8i7WaIRGCt913xmlPCXfzw=", - "pom": "sha256-SZt/nSwkShmt9lDZOmOKIUYYm555w57W2jok/N1EQOU=" - }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.4.31": { - "jar": "sha256-0t+NwkUxRqwnvOwBiQxM9rBNGIZbFtnTFWYcqoc4c5I=", - "pom": "sha256-08xMx05y+9GrwJI5/eU/y2DkqAiZqokUfHIqzjN3MRY=" - }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.4.31": { - "jar": "sha256-oWYNbJIDA+MEgTI51PjKD/gB8iQl1C3454+twFe6fAY=", - "pom": "sha256-v1odNDN3icu4zbwipO9OGBnUod+yoRdRjnRc+PrrBVE=" - }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/1.4.31": { - "jar": "sha256-/A0P+l0IOsnJS8f4aUmgV+L5cRISs/xyt0X2eLPM/6o=", - "pom": "sha256-ZwY1ME+KCaH0smigpfb/klIwc7DNootBdASK6tfLHyk=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.4.31": { - "jar": "sha256-V5YvRDcadGtnghiggCqHEsYlUgbemmnt4hXjqksERwg=", - "pom": "sha256-FYKrEwto/LuJsukVVzwfmfi6O8aP3UUfazYtbFM1MYc=" - }, - "org/jetbrains/kotlin#kotlin-stdlib/1.4.31": { - "jar": "sha256-dqWZ2IsWforJCHm22qcixq00UrpxTJq6Gb0ZZUS5fxw=", - "pom": "sha256-hRnj56xe5wBSfuEEiOtDLxqhBtzN3nwGw7qyWKHdvU4=" - }, - "org/jetbrains/kotlin#kotlin-util-io/1.4.31": { - "jar": "sha256-742OP5+fXt4dcNPcIXRsiQySCi9APVaeHNW1KIE6XMA=", - "pom": "sha256-0JWe1skYAwhX/3VMyTLA44GDawd4IsoChO5uftTyItY=" - }, - "org/jetbrains/kotlin#kotlin-util-klib/1.4.31": { - "jar": "sha256-K8ihVTz6jLbeitaN50bY+thxQbF3SfCLpQcMaUxr2W0=", - "pom": "sha256-4VfHncwf0BzZaSstV21gbs9q8hGHhv6gTa/IBLpm93c=" - }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.3.8": { - "jar": "sha256-+Mi3SF1KV1445elJRVOdHU7M0yKKGZ4amqCU6MJhdO4=", - "pom": "sha256-JP+mW9+32JM0nLLnj7NxSkkN0KnAc3V0S7E26YBIB/0=" - }, - "org/ow2#ow2/1.5": { - "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" - }, - "org/ow2/asm#asm-analysis/9.1": { - "jar": "sha256-gaiAQbG4vtpaiplkYJgEbEhwlTgnDEne9oq/8lrDvjQ=", - "pom": "sha256-rFRUwRsDQxypUd9x+06GyMTIDfaXn5W3V8rtOrD0cVY=" - }, - "org/ow2/asm#asm-commons/9.1": { - "jar": "sha256-r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=", - "pom": "sha256-oPZRsnuK/pwOYS16Ambqy197HHh7xLWsgkXz16EYG38=" - }, - "org/ow2/asm#asm-tree/9.1": { - "jar": "sha256-/QCvpJ6VlddkYgWwnOy0p3ao/wugby1ZuPe/nHBLSnM=", - "pom": "sha256-tqANkgfANUYPgcfXDtQSU/DSFmUr7UX6GjBS/81QuUw=" - }, - "org/ow2/asm#asm-util/9.1": { - "jar": "sha256-OA4uzRb3zA8adrqboEkXm1dgpXsoKoekxlPK7/LNW9Y=", - "pom": "sha256-jd108aHiuTxwnZdtAgXnT7850AVwPJYmpe1cxXTK+88=" - }, - "org/ow2/asm#asm/9.1": { - "jar": "sha256-zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=", - "pom": "sha256-xoOpDdaPKxeIy9/EZH6pQF71kls3HBmfj9OdRNPO3o0=" - }, - "org/slf4j#slf4j-api/1.7.25": { - "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", - "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" - }, - "org/slf4j#slf4j-parent/1.7.25": { - "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/sonatype/oss#oss-parent/9": { - "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" - } - }, - "https://repo.maven.apache.org/maven2": { - "com/fasterxml#oss-parent/48": { - "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" - }, - "com/fasterxml/jackson#jackson-base/2.14.0": { - "pom": "sha256-tZryboho1AOOURYUvXa7t0A2NXOVGWAvEOfaCTFYKw8=" - }, - "com/fasterxml/jackson#jackson-base/2.14.1": { - "pom": "sha256-GAFdG6y6mhRiWovxlBH1v62C0AYN83snvQLngTLEZ24=" - }, - "com/fasterxml/jackson#jackson-bom/2.14.0": { - "pom": "sha256-SfD44IeIL07MwxErYBt91RKZRyOklDo3oQ7LgHMiZso=" - }, - "com/fasterxml/jackson#jackson-bom/2.14.1": { - "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" - }, - "com/fasterxml/jackson#jackson-parent/2.14": { - "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" - }, - "com/fasterxml/jackson/core#jackson-annotations/2.14.1": { - "jar": "sha256-0lW0uGP/jscUqPlvpVw0Yh1D27grgtP1dHZJakwJ4ec=", - "module": "sha256-JnpoC7csvXUsdreeuQiuDAq+sRT8scIKlnjwN4iYues=", - "pom": "sha256-id8WI4ax7eg6iATpCDlw0aYr310caenpkUdhtGf4CIM=" - }, - "com/fasterxml/jackson/core#jackson-core/2.14.1": { - "jar": "sha256-ARQYfilrNMkxwb+eWoQVK2K/q30YL1Yj85gtwto15SY=", - "module": "sha256-fIuANfkA8/HL2wa4x53CsYsR9q+hOwt0cZzuNJ/0wyk=", - "pom": "sha256-dHse68uLbe8o+u7cCSN0jxwVP8aksNjjsLyo3l/aY38=" - }, - "com/fasterxml/jackson/core#jackson-databind/2.14.1": { - "jar": "sha256-QjoMgG3ks/petKKGmDBeOjd3xzHhvPobLzo3YMe253M=", - "module": "sha256-2BeXfIprCq7aUZ+yp7jcugKzjDwnICT62jLFzOfj08s=", - "pom": "sha256-etsj1tdG7c+UbRwGKxmP+aAmwOIrMHuNXXnB4IU4xjU=" - }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-toml/2.14.0": { - "module": "sha256-CsCosk9G8UO74qeQCyh914XgMRuf7s92MG2Is1aJBl0=", - "pom": "sha256-UbvlEh00Ij7Yc8nN6DWTvDl+mCSkknNvv7wuA65QrhA=" - }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-toml/2.14.1": { - "jar": "sha256-EwRbLsSlXKVS8JF5N83Qt7rp1a5AnJVfbw0We5HIYkE=", - "module": "sha256-fYt0DCgjZAjWkDDdCewOQgy08dBIZEhM/muNxnJro8g=", - "pom": "sha256-k3qvGFoaW0g5TmkQusBVM+iPu8ICREy5aZ2D4BpNprc=" - }, - "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.0": { - "pom": "sha256-6tGzXPQ8iianI2wDCKi/w+5InCkyiOBRPqvLXnIyS4o=" - }, - "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.1": { - "pom": "sha256-+jI/nD8sJtfMzU4hNgkQRRVNRdwcFmHU+HakcfVix1k=" - }, - "com/google/code/findbugs#jsr305/3.0.2": { - "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", - "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" - }, - "com/google/protobuf#protobuf-bom/3.21.11": { - "pom": "sha256-b8t65uskGL00Pp3E4ED3nFk+9W957j0NKiEZzk/nr7Q=" - }, - "com/google/protobuf#protobuf-bom/3.21.12": { - "pom": "sha256-O72GqUBXpnHmPVX532EsZBlz1ecNba4qtFYk/xrfUcU=" - }, - "com/google/protobuf#protobuf-javalite/3.21.11": { - "jar": "sha256-2HsppVT9lD3WH0lPJjeyDeKI27EsS87oXp/k4q2JRFM=", - "pom": "sha256-RnCf68zs39yLZXU+9Bs5E7cPC2Ipu7U5XYCYXtziW/U=" - }, - "com/google/protobuf#protobuf-javalite/3.21.12": { - "jar": "sha256-z2eKs/vJkvS0ZUqGwDVXwhkE1jUgK2doj8suykQsLUA=", - "pom": "sha256-JX9QiTSYkVb912RUQ9uf4lbX06pEx93oMCfYHW6MutQ=" - }, - "com/google/protobuf#protobuf-parent/3.21.11": { - "pom": "sha256-kZpCn8dl43GYT5jpgoEcn6jMTqxgt0tEJM/NgMruCG8=" - }, - "com/google/protobuf#protobuf-parent/3.21.12": { - "pom": "sha256-fj44jW/7fyDmb/JfRbk3i0Igt7L9Jh9rO8IGs9/4u8g=" - }, - "com/googlecode/libphonenumber#libphonenumber-parent/8.12.54": { - "pom": "sha256-MzfHf0YxCWHoxuXPv4zgRDIXpDNqhqRneipt5U8mqHo=" - }, - "com/googlecode/libphonenumber#libphonenumber/8.12.54": { - "jar": "sha256-sjeB0pk7ailmUzsvWOEfM5L8FB+J6NVYNdo4Nl3guuk=", - "pom": "sha256-/SZ9HcfjYSkf+MEAbrBvTv2isfEt/jhTXZVf/sDBl/E=" - }, - "com/kohlschutter#kohlschutter-parent-multirelease/1.5.1": { - "pom": "sha256-m8IGSgNZlu+KoTo39gEtr+wrj7Ixf0gK0vYOcUu/BTM=" - }, - "com/kohlschutter#kohlschutter-parent/1.5.1": { - "pom": "sha256-QOM4M3T7g/qqpHW7scFy920D5DLYbpgsnfTO+ZQDh40=" - }, - "com/kohlschutter/junixsocket#junixsocket-common/2.6.1": { - "jar": "sha256-k9Eg4tSd31v97oJYdi/IdLJsZX8Cf41szBoFUVa/zeE=", - "pom": "sha256-RRjCFVtlyk9jbQJRRBK1kIFdbAsYKMsV8vUlXcA2Qzo=" - }, - "com/kohlschutter/junixsocket#junixsocket-native-common/2.6.1": { - "jar": "sha256-Yfu9bP0rbfZcDnsZsW/091XWyx0zO1ZvQoZAfxLxhnA=", - "pom": "sha256-t4zAQTztX2+M2jYiG5Yg0Bq4PPJMlwN2vEqH31S4jAQ=" - }, - "com/kohlschutter/junixsocket#junixsocket/2.6.1": { - "pom": "sha256-crOETfvf8/Nc6WPPHBro4cxJa/SoJMYFYb6QQvVHtfQ=" - }, - "com/squareup/okhttp3#logging-interceptor/4.10.0": { - "jar": "sha256-JzuiGGNsNPegkcBZ0VlgBUPgPqi+7yxfxWUltHOWFg4=", - "module": "sha256-/MsMrtTFnKXjEketzz+Zu9FeWn8NI8me4UbeMd0BhSI=", - "pom": "sha256-t/v3nfpIMFDEygZTdhoh0A1YWBkVUHo9nVGctmJgv98=" - }, - "com/squareup/okhttp3#okhttp/4.10.0": { - "jar": "sha256-dYDxT6FpEgbjcIGtP5IGOxYDsyjaC7MW8v7wLgVi5+w=", - "module": "sha256-bDBwggtZH17IwpSEl7Wmt0L0krcVvKz0t1EVs6j/qxU=", - "pom": "sha256-x/kgsofIOOHYHipj+Gd7svqZE3BYorEeZTWv3pyBoOU=" - }, - "com/squareup/okio#okio-jvm/3.2.0": { - "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", - "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", - "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" - }, - "com/squareup/okio#okio/3.2.0": { - "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", - "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" - }, - "info/picocli#picocli/4.7.0": { - "jar": "sha256-P2/7EM6FPvL2+TS0Z8zBPJwXCLTYOhpWZP2wfgeOjhw=", - "pom": "sha256-TeCd0zhFd9Vzo9lP85jNe4SUbEJkDzhSva2X9yl0YXQ=" - }, - "io/prometheus#parent/0.16.0": { - "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY=" - }, - "io/prometheus#simpleclient/0.16.0": { - "jar": "sha256-IsN08jf3vE/bHw7C2jecC6AOaa0v/otq3lQ9cwYtN38=", - "pom": "sha256-/sCA0HqxWHXZccSugflR2mG1z/mZHPUOUwuo/KR3CXM=" - }, - "io/prometheus#simpleclient_common/0.16.0": { - "jar": "sha256-66bsJs5+QMu4cl4F+4Mkep9PRJRbnnUi4zdd3me58Fk=", - "pom": "sha256-d/ARCc4VB710Q+InJzdnSydST6rLDcuW47jt4LarnrY=" - }, - "io/prometheus#simpleclient_hotspot/0.16.0": { - "jar": "sha256-E08VbP60TL04ZAZYBu9dtVQ8aK9XjR1+5ZKD4umFP3M=", - "pom": "sha256-0haTfecjEg+3pMiLksW+oZEa+4i6dtDUjxdprYW2dek=" - }, - "io/prometheus#simpleclient_httpserver/0.16.0": { - "jar": "sha256-yrh94QtqR0FRzO68O2NDKalz/7YCzm7+8sD9l6kDZcg=", - "pom": "sha256-PGR/1vVhohsZ7ZcdBBn9Ri2fg/k0e8ChBaHCie6qqsQ=" - }, - "io/prometheus#simpleclient_tracer/0.16.0": { - "pom": "sha256-OBK7IrlfgbTDRg6eTnXDunL6ReRDqfzlMghCqr0OmcI=" - }, - "io/prometheus#simpleclient_tracer_common/0.16.0": { - "jar": "sha256-6Ep4SsjiTxgu5i2oC2tcgUB3S3W/pL+cw9O4OQ22JfY=", - "pom": "sha256-X5AHXOz80RKB3pzLSJaNEhKyRnDWhP/IQEQaUq6HXv8=" - }, - "io/prometheus#simpleclient_tracer_otel/0.16.0": { - "jar": "sha256-oqhMWb7zeWu3+cbyrot96LkFMT7ygYCsPef/Yd1o3z8=", - "pom": "sha256-frl58dwz6L5OWtFDDlQJcYpBeDwmd5qzEFJg9rQ20EY=" - }, - "io/prometheus#simpleclient_tracer_otel_agent/0.16.0": { - "jar": "sha256-etK7QN90p3LZ9URaPQNXm0nWs3pH1ekPbPP1ns9BrQY=", - "pom": "sha256-VSj4WIQ1SulNm8BnR+f1iS0JLAtVBVrnBWZo6gyhznw=" - }, - "io/reactivex/rxjava3#rxjava/3.0.13": { - "jar": "sha256-WYq69x28lw3Qcn5tX094bcmZ31uXLL8mExajLhVbLGk=", - "module": "sha256-khiPWj8bL7xUkxB3AKetrnAsHXc8TO02auitkjj2q+g=", - "pom": "sha256-yZCmX0c2tGOe0X1nhMqUdtPClRuGUqAKVnbAKHw24OQ=" - }, - "io/sentry#sentry/6.11.0": { - "jar": "sha256-77Huk5ks2xQSGMB71siYkzkvwzzcAaqHZjOuJNc8Wa4=", - "pom": "sha256-gOTkmRGslV0gUJp3OFODNyge4TUUFCIslXFpoyfWIfc=" - }, - "org/apache#apache/24": { - "pom": "sha256-LpO7q+NBOviaDDv7nmv3Hbyej5+xTMux14vQJ13xxSU=" - }, - "org/apache/logging#logging-parent/5": { - "pom": "sha256-3HYwz4LLMfTUdiFgVCIa/9UldG7pZUEkD0UvcyNwMCI=" - }, - "org/apache/logging/log4j#log4j-api/2.19.0": { - "jar": "sha256-XMskrZ+S52jQvEVtMGGnN5USYt+APgBNLK0Ja3WojWA=", - "pom": "sha256-DKkiQ2MurHxkRF8mO+UDBLdaerv7eIXNbIH1cRJ01KU=" - }, - "org/apache/logging/log4j#log4j-bom/2.19.0": { - "pom": "sha256-jGp6wVCpGKIpBzNf1VZpFHMe14E2l3DVJfZMDQf+h+c=" - }, - "org/apache/logging/log4j#log4j-core/2.19.0": { - "jar": "sha256-tKF5b6t7/DbfAVwbQFJFkUeZfo0hWnGZ1x0F+edH5PQ=", - "pom": "sha256-c1r8+2E2GCqidn62RZdhr9MrgleR1OCJXqGpSyrbmzk=" - }, - "org/apache/logging/log4j#log4j/2.19.0": { - "pom": "sha256-FWJLoaVtv4ZGBgdFMlM2GPoytGQvcoUfy+kuE2vq7JQ=" - }, - "org/apiguardian#apiguardian-api/1.1.2": { - "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", - "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", - "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" - }, - "org/bouncycastle#bcprov-jdk15on/1.70": { - "jar": "sha256-jzwg4+LVZdJvM+jUhXo30Nf4rDm2KnAmSW/Ksb2sMNQ=", - "pom": "sha256-bfS1t22QYgF2ZK0MooXlcVSugDYHy4nJcLOcwOAWq7A=" - }, - "org/checkerframework#checker-qual/3.5.0": { - "jar": "sha256-cpmQs/GKlWBvwlc4NraVi820TLUr+9G3qpwznP81paQ=", - "pom": "sha256-KDazuKeO2zGhgDWS5g/HZ7IfLRkHZGMbpu+gg3uzVyE=" - }, - "org/flywaydb#flyway-core/9.10.2": { - "jar": "sha256-OAf+3K2+ykuLiUCW0R2+zX8qosfO2QrDmM9/fgWzhT4=", - "pom": "sha256-2xICRB2Ebg6wWLppHmJbvq4p7Dj7HgmRtdsbhrxoeSE=" - }, - "org/flywaydb#flyway-parent/9.10.2": { - "pom": "sha256-HPI2yGyMqSFnUC8Fjw/IUagPpXG5UvEWUGhAqcIbOHg=" - }, - "org/jetbrains#annotations/13.0": { - "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", - "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.20": { - "jar": "sha256-jaQKJSDTDcsQEhdv6T0k6C0Io+NGw34DQ7D7b2T2vgE=", - "pom": "sha256-PgTMk1HVzsQqRcBg+HM/bpTrx+NZExClGOBuiFB4mcg=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.10": { - "pom": "sha256-YSIR/5MPW1LHJP92NBfVqigd1+AyXDs1yNGBIKao300=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.20": { - "jar": "sha256-qi+i6BNVxNmN2X2iFpv0AfhCJhN49bHL6hqhGFXWdiA=", - "pom": "sha256-iBveiiNwhuKOA0KLTvMmj0SspfoajHb4lUdIRVyuvSE=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.10": { - "pom": "sha256-Q6ZJ+nN7+zX6SvTm3jPi8IpdGRBNdYLqQNvNK2N5Csw=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.20": { - "jar": "sha256-/asb8SDiteerbXiI6evAJOxrjKcpNhKWOV2rY0shNpU=", - "pom": "sha256-GEap+GBLC+HHGiEovb2diQJyAnlCf2ItK5pECsmjwwk=" - }, - "org/jetbrains/kotlin#kotlin-stdlib/1.6.20": { - "jar": "sha256-7rUcK2eyYjP9gdC8T4BE7ISXGIkJBXY87/2Eox4st5k=", - "pom": "sha256-oI6D3LDymFCYd94i1SZEZHbdsx6hx3Uw8sgfJNsWb5k=" - }, - "org/junit#junit-bom/5.9.0": { - "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", - "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" - }, - "org/junit#junit-bom/5.9.1": { - "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", - "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" - }, - "org/junit/jupiter#junit-jupiter-api/5.9.0": { - "jar": "sha256-PjcLy7HoV/2l8LIDckEW0CsF54j6oeslGIFKzPnPtbE=", - "module": "sha256-n5LPF5V1xN9pgpRwTRDxLozHFdaC+yDtzYrbxB/H8PQ=", - "pom": "sha256-ap2MRpjcjGkE1qwfXRMBiqf4KESbxbjO94/BQxzgghc=" - }, - "org/junit/jupiter#junit-jupiter-engine/5.9.0": { - "jar": "sha256-24bLszUnGfoKl4AO39CcIEY8fyq0oEaZJEQwvYlUWDs=", - "module": "sha256-sVnltbYmIiOP1v0oZPigEsHfbbK7JvEMqA4dIqzOLx0=", - "pom": "sha256-qLfR7QMvuStDJY140jmwGcX1g02swIT5l4PjTD7hLL8=" - }, - "org/junit/jupiter#junit-jupiter-params/5.9.0": { - "jar": "sha256-uM73mC3VPfhMlXpumsie3pZ88ubZNA70xReG4gVIxBs=", - "module": "sha256-QUkSewrR3JKJdqY4WIer3wpD9oNlRLK614OUh2kJenE=", - "pom": "sha256-DDOljPiR2vvGIfPG2cyCMnCDHrOxib3juIbMMDmQ/Ww=" - }, - "org/junit/jupiter#junit-jupiter/5.9.0": { - "jar": "sha256-LbLkqitegv78vxjQryDICVpD6UrZq50WvYdVfNqjl90=", - "module": "sha256-a1AJDfWdSZ4ycr41ULiBJdXJGojhzbSaEsLwi+p6hds=", - "pom": "sha256-Imsy40Pt4WvSls+36xXhmaFOQBxUJulUOsUDrM1E3JI=" - }, - "org/junit/platform#junit-platform-commons/1.9.0": { - "jar": "sha256-5YlLcQCUtMqvxigLiCmkOft2SQHqCuGNBu2AOIswm3o=", - "module": "sha256-SyAzP4ruVOgwRY2B0EXrjRfcBCTTEzKNtQmpzCSZsXo=", - "pom": "sha256-MJp9efG/577WChoXCKqovXGGHBKdIWhNaO305NnILCA=" - }, - "org/junit/platform#junit-platform-engine/1.9.0": { - "jar": "sha256-quxzX3REqfwFXiBlmN49gpwk6ceo7qbv3usZYgh/6BE=", - "module": "sha256-/3Xx1hE/RdWyXyUpUE3tiDmGoBLJtD0hrUI5jknXEGM=", - "pom": "sha256-G2rN+hUNaWYlIHYAAcaONlhl1o7xMNGZblK5SD7IYWE=" - }, - "org/opentest4j#opentest4j/1.2.0": { - "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", - "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" - }, - "org/postgresql#postgresql/42.5.1": { - "jar": "sha256-iei/+os3uUh5RgEsaQzwTzEDlTBRwcGT2I7ja2jTZa4=", - "pom": "sha256-R8t/RdAe0XyJ5mNlrU4v8anBR5AX35QhAPSgjLYyIRw=" - }, - "org/reactivestreams#reactive-streams/1.0.3": { - "jar": "sha256-He4EgQctGckptiPhVeFNL2CF3AEVKaCg2+/ITPVx2GU=", - "pom": "sha256-zO1GcXX0JXgz9ssHUQ/5ezx1oG4aWNiCo515hT1RxgI=" - }, - "org/slf4j#slf4j-api/2.0.5": { - "jar": "sha256-9KKXRQkpGsxJ/aSnmw1Z4V4rUkCV1kIcZjkbkjh69Mk=", - "pom": "sha256-nvLaYxSfXZ7M9608lTzfwSTrbRR79444YA9Z9gXF1G4=" - }, - "org/slf4j#slf4j-nop/2.0.5": { - "jar": "sha256-qY7YTal6RbnblFVrKH4vWW6h3qz4j4qw0ivRt+jvANk=", - "pom": "sha256-uCIqkKiTH/PY63GgELA8JGCqBWfKaWQvUCXulWd/Ga4=" - }, - "org/slf4j#slf4j-parent/2.0.5": { - "pom": "sha256-FwsRsEgVAFw7TMbfeckYQ+C5UPhbWP++jUg+0hkTuYs=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/xerial#sqlite-jdbc/3.40.0.0": { - "jar": "sha256-46G5CXh7M7s34E8lLzfkq0ekieHB1FqAmgmCw3lEXBA=", - "pom": "sha256-fI0dETimo05pNXbQe29U4h840iC4YtnhQFyy4KqIpDo=" - } - } -} diff --git a/pkgs/by-name/si/signald/package.nix b/pkgs/by-name/si/signald/package.nix deleted file mode 100644 index 7b5a2e99025d..000000000000 --- a/pkgs/by-name/si/signald/package.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - jdk17_headless, - coreutils, - findutils, - gnused, - gradle_8, - git, - makeWrapper, - jre_minimal, -}: - -let - pname = "signald"; - version = "0.23.2"; - - src = fetchFromGitLab { - owner = pname; - repo = pname; - rev = version; - hash = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; - }; - - jre' = jre_minimal.override { - jdk = jdk17_headless; - # from https://gitlab.com/signald/signald/-/blob/0.23.0/build.gradle#L173 - modules = [ - "java.base" - "java.management" - "java.naming" - "java.sql" - "java.xml" - "jdk.crypto.ec" - "jdk.httpserver" - - # for java/beans/PropertyChangeEvent - "java.desktop" - # for sun/misc/Unsafe - "jdk.unsupported" - ]; - }; - - # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." - gradle = gradle_8; - -in -stdenv.mkDerivation { - inherit pname src version; - - mitmCache = gradle.fetchDeps { - inherit pname; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - gradleFlags = [ "-Dorg.gradle.java.home=${jdk17_headless}" ]; - - gradleBuildTask = "distTar"; - - installPhase = '' - runHook preInstall - - mkdir -p $out - tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/ - wrapProgram $out/bin/signald \ - --prefix PATH : ${ - lib.makeBinPath [ - coreutils - findutils - gnused - ] - } \ - --set JAVA_HOME "${jre'}" - - runHook postInstall - ''; - - nativeBuildInputs = [ - git - gradle - makeWrapper - ]; - - doCheck = true; - - gradleUpdateScript = '' - runHook preBuild - - SIGNALD_TARGET=x86_64-unknown-linux-gnu gradle nixDownloadDeps - SIGNALD_TARGET=aarch64-unknown-linux-gnu gradle nixDownloadDeps - SIGNALD_TARGET=x86_64-apple-darwin gradle nixDownloadDeps - SIGNALD_TARGET=aarch64-apple-darwin gradle nixDownloadDeps - ''; - - meta = with lib; { - description = "Unofficial daemon for interacting with Signal"; - longDescription = '' - Signald is a daemon that facilitates communication over Signal. It is - unofficial, unapproved, and not nearly as secure as the real Signal - clients. - ''; - homepage = "https://signald.org"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # deps - ]; - license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; - }; -} diff --git a/pkgs/by-name/si/signaldctl/package.nix b/pkgs/by-name/si/signaldctl/package.nix deleted file mode 100644 index 59e1984f4d71..000000000000 --- a/pkgs/by-name/si/signaldctl/package.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitLab, - gitUpdater, -}: - -buildGoModule rec { - pname = "signaldctl"; - version = "0.6.1"; - src = fetchFromGitLab { - owner = "signald"; - repo = "signald-go"; - rev = "v${version}"; - hash = "sha256-lMJyr4BPZ8V2f//CUkr7CVQ6o8nRyeLBHMDEyLcHSgQ="; - }; - - vendorHash = "sha256-LGIWAVhDJCg6Ox7U4ZK15K8trjsvSZm4/0jNpIDmG7I="; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - # install only the binary and not any intermediate artifacts like - # `generators` which is only used during build - cp "$GOPATH/bin/signaldctl" $out/bin - - runHook postInstall - ''; - - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; - - meta = with lib; { - description = "Golang library for communicating with signald"; - mainProgram = "signaldctl"; - homepage = "https://signald.org/signaldctl/"; - license = licenses.gpl3; - maintainers = with maintainers; [ colinsane ]; - }; -} diff --git a/pkgs/by-name/si/sigtop/package.nix b/pkgs/by-name/si/sigtop/package.nix index 6fbfe532c363..b07bd8c59aac 100644 --- a/pkgs/by-name/si/sigtop/package.nix +++ b/pkgs/by-name/si/sigtop/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { name = "sigtop"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "tbvdm"; repo = "sigtop"; rev = "v${version}"; - sha256 = "sha256-wZdQq5u44AcZs2CWRQ92wih5WBzZFywt78+slVBYseg="; + sha256 = "sha256-HJYdz+vJE6CM9BH4Vx9nCfVyP5uXhhb+/1j4t01TucI="; }; vendorHash = "sha256-EWppsnZ/Ch7JjltkejOYKepZUfKNZY9+F7VbzjNCYNU="; diff --git a/pkgs/by-name/si/silc_client/package.nix b/pkgs/by-name/si/silc_client/package.nix deleted file mode 100644 index dc8405ddc89b..000000000000 --- a/pkgs/by-name/si/silc_client/package.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - perl, - pkg-config, - glib, - ncurses, - enablePlugin ? false, -}: - -# Enabling the plugin and using it with a recent irssi, segafults on join: -# http://marc.info/?l=silc-devel&m=125610477802211 - -stdenv.mkDerivation rec { - pname = "silc-client" + lib.optionalString enablePlugin "-irssi-plugin"; - version = "1.1.11"; - - src = fetchurl { - url = "mirror://sourceforge/silc/silc/client/sources/silc-client-${version}.tar.bz2"; - sha256 = "13cp3fmdnj8scjak0d2xal3bfvs2k7ssrwdhp0zl6jar5rwc7prn"; - }; - - enableParallelBuilding = true; - - dontDisableStatic = true; - - hardeningDisable = [ "format" ]; - - configureFlags = - [ - "--with-ncurses=${ncurses.dev}" - ] - ++ lib.optionals enablePlugin [ - "--with-silc-plugin=${placeholder "out"}/lib/irssi" - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - perl - glib - ncurses - ]; - - meta = { - homepage = "http://silcnet.org/"; - description = "Secure Internet Live Conferencing server"; - mainProgram = "silc"; - license = lib.licenses.gpl2; - maintainers = [ ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/by-name/si/silc_server/package.nix b/pkgs/by-name/si/silc_server/package.nix deleted file mode 100644 index 22d706ce3fa4..000000000000 --- a/pkgs/by-name/si/silc_server/package.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - lib, - stdenv, - fetchurl, -}: - -stdenv.mkDerivation rec { - pname = "silc-server"; - version = "1.1.18"; - - src = fetchurl { - url = "http://silcnet.org/download/server/sources/silc-server-${version}.tar.bz2"; - sha256 = "0nr0hrwr4kbi611qazmrify7a27nzxb5n7d97f5i9cw3avxlw38s"; - }; - - meta = { - homepage = "http://silcnet.org/"; - description = "Secure Internet Live Conferencing server"; - mainProgram = "silcd"; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index cfffab29a406..2e163cf893e4 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -29,18 +29,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "sile"; - version = "0.15.9"; + version = "0.15.12"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst"; - hash = "sha256-+9pZUDszPYJmFgHbZH0aKtZ6qLcJjh73jG2CFoRKxWc="; + hash = "sha256-oyNBEdVrsi8MuiYIlU7IjfJg60dy8FTtKXcJEgA+yKA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-FdUrivumG5R69CwZedpkBzds5PcZr4zSsA6QW/+rDBM="; + hash = "sha256-v/sqXA4aAXGcGy+/2UrtThN3jS30q35QPwpchS7oRgk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/silicon/package.nix b/pkgs/by-name/si/silicon/package.nix index 9fbf5ac29326..9d3444805172 100644 --- a/pkgs/by-name/si/silicon/package.nix +++ b/pkgs/by-name/si/silicon/package.nix @@ -10,7 +10,6 @@ libxcb, python3, libiconv, - darwin, fira-code, fontconfig, harfbuzz, @@ -39,15 +38,9 @@ rustPlatform.buildRustPackage rec { harfbuzz ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - libiconv - AppKit - CoreText - Security - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/si/silx/package.nix b/pkgs/by-name/si/silx/package.nix index a61610896abb..29d1faa9df37 100644 --- a/pkgs/by-name/si/silx/package.nix +++ b/pkgs/by-name/si/silx/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "silx"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9di3TNjhhoOT4bRwPfaM/jTbVW5+V9b8V2V6ZBwXZjo="; + hash = "sha256-XZujZ7VxXMTLkBE4jz1xIA1763Z2yRCVL9E1CjQsVx8="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 29c51230a730..9351d0c02835 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "6.2.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-nWJOqMCP75E9E0fZ63OILroDS4bUMrJPM7h2IQ0K+aU="; + hash = "sha256-2nDTARUH5gb/pP4WnCfSPzreAThMAuAuwRT7y2aumBA="; }; # Fix build on darwin diff --git a/pkgs/by-name/si/simp1e-cursors/package.nix b/pkgs/by-name/si/simp1e-cursors/package.nix index 394f362cd562..48edf52cb875 100644 --- a/pkgs/by-name/si/simp1e-cursors/package.nix +++ b/pkgs/by-name/si/simp1e-cursors/package.nix @@ -9,18 +9,18 @@ stdenvNoCC.mkDerivation rec { pname = "simp1e-cursors"; - version = "20221103.2"; + version = "20250223"; src = fetchFromGitLab { owner = "cursors"; repo = "simp1e"; - rev = version; - hash = "sha256-3DCF6TwxWwYK5pF2Ykr3OwF76H7J03vLNZch/XoZZZk="; + tag = version; + hash = "sha256-mNuGjpNZCaOlGLkHez4pFMPdCCbSoYQx1HTs7BI0DJA="; fetchSubmodules = true; }; nativeBuildInputs = [ - (python3.withPackages (ps: with ps; [ pillow ])) + (python3.withPackages (ps: [ ps.pillow ])) librsvg xcursorgen ]; @@ -39,11 +39,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Aesthetic cursor theme for Linux desktops"; homepage = "https://gitlab.com/cursors/simp1e"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ natto1784 ]; + changelog = "https://gitlab.com/cursors/simp1e/-/tags/${version}"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.natto1784 ]; }; } diff --git a/pkgs/by-name/si/simp_le/package.nix b/pkgs/by-name/si/simp_le/package.nix index a54696a445cb..5a6aa32393ad 100644 --- a/pkgs/by-name/si/simp_le/package.nix +++ b/pkgs/by-name/si/simp_le/package.nix @@ -10,7 +10,15 @@ let python = python3.override { self = python; packageOverrides = self: super: { - # acme doesn't support josepy v2 + certbot = super.certbot.overridePythonAttrs rec { + version = "3.1.0"; + src = fetchFromGitHub { + owner = "certbot"; + repo = "certbot"; + tag = "v${version}"; + hash = "sha256-lYGJgUNDzX+bE64GJ+djdKR+DXmhpcNbFJrAEnP86yQ="; + }; + }; josepy = super.josepy.overridePythonAttrs (old: rec { version = "1.15.0"; src = fetchFromGitHub { diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix index d13c5485db55..66e8bbcdc790 100644 --- a/pkgs/by-name/si/simple-http-server/package.nix +++ b/pkgs/by-name/si/simple-http-server/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,11 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ openssl ]; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/by-name/si/simple-live-app/package.nix b/pkgs/by-name/si/simple-live-app/package.nix index d309e2a06fd3..1e4d6564491e 100644 --- a/pkgs/by-name/si/simple-live-app/package.nix +++ b/pkgs/by-name/si/simple-live-app/package.nix @@ -1,22 +1,22 @@ { - autoPatchelfHook, lib, + flutter329, fetchFromGitHub, - flutter327, + autoPatchelfHook, mpv, makeDesktopItem, copyDesktopItems, }: -flutter327.buildFlutterApplication rec { +flutter329.buildFlutterApplication rec { pname = "simple-live-app"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "xiaoyaocz"; repo = "dart_simple_live"; tag = "v${version}"; - hash = "sha256-nnbGSqPyqoGNOjFx75soy+0liYv6pVwiLBGb7yV1AgI="; + hash = "sha256-NK1qIlxgSZQ1Es3KhMcUc1Je5ATq53kXcBqLBQVw5DQ="; }; sourceRoot = "${src.name}/simple_live_app"; @@ -39,9 +39,7 @@ flutter327.buildFlutterApplication rec { icon = "simple-live-app"; genericName = "Simple-Live"; desktopName = "Simple-Live"; - keywords = [ - "Simple Live" - ]; + keywords = [ "Simple Live" ]; }) ]; diff --git a/pkgs/by-name/si/simple-live-app/pubspec.lock.json b/pkgs/by-name/si/simple-live-app/pubspec.lock.json index c8c6f4f63760..c7a707fba67c 100644 --- a/pkgs/by-name/si/simple-live-app/pubspec.lock.json +++ b/pkgs/by-name/si/simple-live-app/pubspec.lock.json @@ -27,7 +27,7 @@ "version": "6.11.0" }, "archive": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "archive", "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", @@ -40,41 +40,41 @@ "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, - "auto_orientation": { + "auto_orientation_v2": { "dependency": "direct main", "description": { - "name": "auto_orientation", - "sha256": "cd56bb59b36fa54cc28ee254bc600524f022a4862f31d5ab20abd7bb1c54e678", + "name": "auto_orientation_v2", + "sha256": "96a72a00b367e1aebef4be55f4804c0369197dc65a0dffd039d4c2f72f59d955", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.6" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "brotli": { "dependency": "transitive", @@ -110,31 +110,31 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.3" + "version": "4.0.4" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.3" + "version": "2.4.4" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.14" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", @@ -160,21 +160,21 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.3" + "version": "8.9.5" }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "checked_yaml": { "dependency": "transitive", @@ -200,11 +200,11 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", @@ -220,21 +220,21 @@ "dependency": "transitive", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "connectivity_plus": { "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "8a68739d3ee113e51ad35583fdf9ab82c55d09d693d3c39da1aebab87c938412", + "sha256": "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.1.3" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -290,31 +290,31 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.7" + "version": "2.3.8" }, "dbus": { "dependency": "transitive", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "device_info_plus": { "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "sha256": "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.2" + "version": "11.3.3" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -330,21 +330,21 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.0+1" }, "dio_web_adapter": { "dependency": "transitive", "description": { "name": "dio_web_adapter", - "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.1" }, "dynamic_color": { "dependency": "direct main", @@ -360,41 +360,41 @@ "dependency": "direct main", "description": { "name": "extended_image", - "sha256": "69d4299043334ecece679996e47d0b0891cd8c29d8da0034868443506f1d9a78", + "sha256": "85199f9233e03abc2ce2e68cbb2991648666af4a527ae4e6250935be8edfddae", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.1" + "version": "9.1.0" }, "extended_image_library": { "dependency": "transitive", "description": { "name": "extended_image_library", - "sha256": "9a94ec9314aa206cfa35f16145c3cd6e2c924badcc670eaaca8a3a8063a68cd7", + "sha256": "e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.5" + "version": "4.0.6" }, "fake_async": { "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "transitive", @@ -410,11 +410,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3", + "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.7" + "version": "8.3.7" }, "fixnum": { "dependency": "transitive", @@ -430,11 +430,11 @@ "dependency": "direct main", "description": { "name": "floating", - "sha256": "04c3c96909b94dd6d2d121c69707739825e1f3dceca5ae451a9b8c0e652d246b", + "sha256": "e51ce1dbcab3ea83da0ad1b07f2091b99c0e8680184c780a000567f41234d454", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.2" + "version": "6.0.0" }, "flutter": { "dependency": "direct main", @@ -452,15 +452,95 @@ "source": "hosted", "version": "2.2.2" }, + "flutter_image_gallery_saver": { + "dependency": "direct main", + "description": { + "name": "flutter_image_gallery_saver", + "sha256": "7140dbdfa1006bf8357232bff257a73b92282906aa28126fa40d1e95bf454550", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2" + }, "flutter_inappwebview": { "dependency": "direct main", "description": { "name": "flutter_inappwebview", - "sha256": "d198297060d116b94048301ee6749cd2e7d03c1f2689783f52d210a6b7aba350", + "sha256": "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.8.0" + "version": "6.1.5" + }, + "flutter_inappwebview_android": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_android", + "sha256": "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "flutter_inappwebview_internal_annotations": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_internal_annotations", + "sha256": "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "flutter_inappwebview_ios": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_ios", + "sha256": "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "flutter_inappwebview_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_macos", + "sha256": "c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "flutter_inappwebview_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_platform_interface", + "sha256": "cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0+1" + }, + "flutter_inappwebview_web": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_web", + "sha256": "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "flutter_inappwebview_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_windows", + "sha256": "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" }, "flutter_launcher_icons": { "dependency": "direct dev", @@ -492,21 +572,21 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", + "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.24" + "version": "2.0.27" }, "flutter_smart_dialog": { "dependency": "direct main", "description": { "name": "flutter_smart_dialog", - "sha256": "d7b915461fdc9bb8111d23a709b4ce910dbc4b9bef0fbd941655f74bf7de09a6", + "sha256": "a3aaf690b2737ee6b2c7e7a983bc685e5f118e5de7e2042d2e0b7db26eb074f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.9.8+5" + "version": "4.9.8+7" }, "flutter_staggered_grid_view": { "dependency": "direct main", @@ -544,21 +624,21 @@ "dependency": "direct main", "description": { "name": "get", - "sha256": "e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e", + "sha256": "c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.6.6" + "version": "4.7.2" }, "glob": { "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "graphs": { "dependency": "transitive", @@ -614,11 +694,11 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_client_helper": { "dependency": "transitive", @@ -670,16 +750,6 @@ "source": "hosted", "version": "4.3.0" }, - "image_gallery_saver": { - "dependency": "direct main", - "description": { - "name": "image_gallery_saver", - "sha256": "0aba74216a4d9b0561510cb968015d56b701ba1bd94aace26aacdd8ae5761816", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, "intl": { "dependency": "direct main", "description": { @@ -704,11 +774,11 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.7" + "version": "0.7.2" }, "json_annotation": { "dependency": "transitive", @@ -724,21 +794,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -804,11 +874,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -824,21 +894,21 @@ "dependency": "direct main", "description": { "name": "media_kit", - "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62", + "sha256": "48c10c3785df5d88f0eef970743f8c99b2e5da2b34b9d8f9876e598f62d9e776", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11" + "version": "1.2.0" }, "media_kit_libs_android_video": { "dependency": "transitive", "description": { "name": "media_kit_libs_android_video", - "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c", + "sha256": "adff9b571b8ead0867f9f91070f8df39562078c0eb3371d88b9029a2d547d7b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.6" + "version": "1.3.7" }, "media_kit_libs_ios_video": { "dependency": "transitive", @@ -854,11 +924,11 @@ "dependency": "transitive", "description": { "name": "media_kit_libs_linux", - "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "sha256": "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.2.1" }, "media_kit_libs_macos_video": { "dependency": "transitive", @@ -874,31 +944,21 @@ "dependency": "direct main", "description": { "name": "media_kit_libs_video", - "sha256": "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288", + "sha256": "958cc55e7065d9d01f52a2842dab2a0812a92add18489f1006d864fb5e42a3ef", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.0.6" }, "media_kit_libs_windows_video": { "dependency": "transitive", "description": { "name": "media_kit_libs_windows_video", - "sha256": "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887", + "sha256": "dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.10" - }, - "media_kit_native_event_loop": { - "dependency": "transitive", - "description": { - "name": "media_kit_native_event_loop", - "sha256": "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.9" + "version": "1.0.11" }, "media_kit_video": { "dependency": "direct main", @@ -924,41 +984,41 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", "description": { "name": "mime", - "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.6" + "version": "2.0.0" }, "network_info_plus": { "dependency": "direct main", "description": { "name": "network_info_plus", - "sha256": "a0ab54a63b10ba06f5adf8b68171911ca19f607d2224e36d2c827c031cc174d7", + "sha256": "08f4166bbb77da9e407edef6322a33f87b18c0ca46483fb25606cb3d2bfcdd2a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "6.1.3" }, "network_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "network_info_plus_platform_interface", - "sha256": "881f5029c5edaf19c616c201d3d8b366c5b1384afd5c1da5a49e4345de82fb8b", + "sha256": "7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "2.0.2" }, "nm": { "dependency": "transitive", @@ -985,41 +1045,41 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.3" + "version": "8.3.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.2.0" }, "path": { "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_provider": { "dependency": "direct main", @@ -1035,11 +1095,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.16" }, "path_provider_foundation": { "dependency": "transitive", @@ -1081,45 +1141,35 @@ "source": "hosted", "version": "2.3.0" }, - "perfect_volume_control": { - "dependency": "direct main", - "description": { - "name": "perfect_volume_control", - "sha256": "9bc513e4a2b6151f7d04fc917271c40bdd44cbe67224d52a314302879d2a30f8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.5" - }, "permission_handler": { "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.1" + "version": "11.4.0" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.13" + "version": "12.1.0" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.5" + "version": "9.4.7" }, "permission_handler_html": { "dependency": "transitive", @@ -1135,11 +1185,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.3.0" }, "permission_handler_windows": { "dependency": "transitive", @@ -1155,11 +1205,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "platform": { "dependency": "transitive", @@ -1205,11 +1255,11 @@ "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", @@ -1231,15 +1281,15 @@ "source": "hosted", "version": "3.0.2" }, - "qr_code_scanner": { + "qr_code_scanner_plus": { "dependency": "direct main", "description": { - "name": "qr_code_scanner", - "sha256": "f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd", + "name": "qr_code_scanner_plus", + "sha256": "39696b50d277097ee4d90d4292de36f38c66213a4f5216a06b2bdd2b63117859", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "2.0.10+1" }, "qr_flutter": { "dependency": "direct main", @@ -1255,21 +1305,21 @@ "dependency": "direct main", "description": { "name": "remixicon", - "sha256": "6556b0487cd3d990f74e9cbcbe92a7ba60dd9132c97f2bfba252ac7e76e69ff3", + "sha256": "9a0e6a67d622a1d6ddc5e5cff4898f9711ec8880fc2ebeb720f6e0bc268ea905", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "safe_local_storage": { "dependency": "transitive", "description": { "name": "safe_local_storage", - "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", + "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.2" + "version": "2.0.1" }, "screen_brightness": { "dependency": "direct main", @@ -1345,21 +1395,21 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544", + "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.0.0" + "version": "10.1.4" }, "share_plus_platform_interface": { "dependency": "transitive", "description": { "name": "share_plus_platform_interface", - "sha256": "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4", + "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "5.0.2" }, "shelf": { "dependency": "direct main", @@ -1385,21 +1435,21 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.0" }, "signalr_netcore": { "dependency": "direct main", "description": { "name": "signalr_netcore", - "sha256": "bf42db085aee4adeafb772e436fb51a4af0baa06dee91bb193d7ca3cdfa55518", + "sha256": "f0726f7dea94ca7e08ee21366e9caf21350c9f7f48939994c51307eae16a678c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.4.3" }, "simple_live_core": { "dependency": "direct main", @@ -1440,11 +1490,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -1480,11 +1530,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "sticky_headers": { "dependency": "direct main", @@ -1500,11 +1550,11 @@ "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", @@ -1520,21 +1570,21 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "synchronized": { "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.3.1" }, "tars_dart": { "dependency": "transitive", @@ -1549,21 +1599,21 @@ "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "timing": { "dependency": "transitive", @@ -1619,11 +1669,11 @@ "dependency": "transitive", "description": { "name": "uri_parser", - "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835", + "sha256": "ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.2" + "version": "3.0.0" }, "url_launcher": { "dependency": "direct main", @@ -1639,21 +1689,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.15" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.2" + "version": "6.3.3" }, "url_launcher_linux": { "dependency": "transitive", @@ -1729,11 +1779,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "volume_controller": { "dependency": "transitive", @@ -1749,11 +1799,11 @@ "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.10" + "version": "1.2.11" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -1779,11 +1829,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", @@ -1799,31 +1849,41 @@ "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" + }, + "webdav_client": { + "dependency": "direct main", + "description": { + "name": "webdav_client", + "sha256": "682fffc50b61dc0e8f46717171db03bf9caaa17347be41c0c91e297553bf86b2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.10.0" + "version": "5.12.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.5" + "version": "2.1.0" }, "window_manager": { "dependency": "direct main", @@ -1867,7 +1927,7 @@ } }, "sdks": { - "dart": ">=3.6.0 <4.0.0", + "dart": ">=3.7.0 <4.0.0", "flutter": ">=3.27.0" } } diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index 7136a31ac404..3b1fc1c03500 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/simple-scan"; changelog = "https://gitlab.gnome.org/GNOME/simple-scan/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix index f98cc8732692..b593ec22dcc1 100644 --- a/pkgs/by-name/si/simple64/package.nix +++ b/pkgs/by-name/si/simple64/package.nix @@ -71,8 +71,6 @@ stdenv.mkDerivation (finalAttrs: { dontUseCmakeConfigure = true; - dontWrapQtApps = true; - buildPhase = '' runHook preInstall @@ -89,9 +87,10 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 ./simple64-gui/icons/simple64.svg -t $out/share/icons/hicolor/scalable/apps/ - makeWrapper $out/share/simple64/simple64-gui $out/bin/simple64-gui \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} \ - "''${qtWrapperArgs[@]}" + patchelf $out/share/simple64/simple64-gui \ + --add-needed libvulkan.so.1 --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} + + ln -s $out/share/simple64/simple64-gui $out/bin/simple64-gui runHook postInstall ''; diff --git a/pkgs/by-name/si/simpleDBus/package.nix b/pkgs/by-name/si/simpleDBus/package.nix index 6adc64739811..0fb081962d25 100644 --- a/pkgs/by-name/si/simpleDBus/package.nix +++ b/pkgs/by-name/si/simpleDBus/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simpleDBus"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "OpenBluetoothToolbox"; repo = "SimpleBLE"; rev = "v${finalAttrs.version}"; - hash = "sha256-suVaiFE60g2OlIF4DLGoHKr7ehUtThLcB/GoVCOfxJg="; + hash = "sha256-VaaDk+pLRUlVjGKFzi22QhYxk1b2bo6rX9TVeJsJdh8="; }; outputs = [ diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 05074566f071..51e32aecd6bb 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -7,11 +7,11 @@ let pname = "simplex-chat-desktop"; - version = "6.3.0"; + version = "6.3.4"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-p2NPBJyAfWkpM6Ws0Xm4Vyt3DIbfl+soYfYfqjV4cY0="; + hash = "sha256-BE0JOcl3UbYoqzihgoqfcM1yxvxodSGdm8QaBgVhHBY="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix index 3a674ae1a181..67cb01ac86c7 100644 --- a/pkgs/by-name/si/simplotask/package.nix +++ b/pkgs/by-name/si/simplotask/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "simplotask"; - version = "1.16.4"; + version = "1.17.0"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; rev = "v${version}"; - hash = "sha256-pSYYYUzChK/GNAdCybd4KMNXwkTZo/0w6CtsYOvbKj8="; + hash = "sha256-uMS2Nf5Brx4hXMGMG3vTU3V2y83gLPb8vau7GA+DGak="; }; vendorHash = null; diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index a4a065084d27..e708f141f705 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.11.6"; + version = "1.11.11"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-/RTpdbDFCDk1sq7lBIXQ3ElgYqflDumffZy1DVP0zOY="; + hash = "sha256-hdYYjKBXnTqScYTUCfMmXozDD8GtIorLXnsU2Fmwg/c="; }; - vendorHash = "sha256-+XDkza0rymQAWUCmHhKas7FFS8lRPSmGHwAV/072aeo="; + vendorHash = "sha256-/0pwsZbMbyAFXCrukbNf2RmQjQJ1E/ZUwzrC+5NEZcc="; tags = [ "with_quic" diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix index 4f1293b2f05c..c71f933edc66 100644 --- a/pkgs/by-name/si/singular/package.nix +++ b/pkgs/by-name/si/singular/package.nix @@ -182,7 +182,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CAS for polynomial computations"; - maintainers = teams.sage.members; + teams = [ teams.sage ]; # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'` # https://www.singular.uni-kl.de:8002/trac/ticket/837 platforms = subtractLists platforms.i686 platforms.unix; diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix index fc12436e786f..97e864bb51e6 100644 --- a/pkgs/by-name/si/sioyek/package.nix +++ b/pkgs/by-name/si/sioyek/package.nix @@ -4,7 +4,7 @@ installShellFiles, fetchFromGitHub, freetype, - nix-update-script, + unstableGitUpdater, gumbo, harfbuzz, jbig2dec, @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "2.0.0-unstable-2025-02-20"; + version = "2.0.0-unstable-2025-05-13"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "a64ad82b2c14e1ef821c13ddf1291ebb6aaafca6"; - hash = "sha256-aI8GqXAgyh5VkayEQbaXOK+JQKzqVqQs8RO3CdOsgX8="; + rev = "eb03410682f70fa27cbe2f9ec3bf59ac086457d7"; + hash = "sha256-iLGgiHQ5MiTvKcSgT3Kqw4lCFFkuAHoZhT+mpIdlBkQ="; }; buildInputs = @@ -74,11 +74,9 @@ stdenv.mkDerivation (finalAttrs: { installManPage resources/sioyek.1 ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "branch=development" - ]; + passthru.updateScript = unstableGitUpdater { + branch = "development"; + tagPrefix = "v"; }; meta = with lib; { diff --git a/pkgs/by-name/si/siproxd/cheaders.patch b/pkgs/by-name/si/siproxd/cheaders.patch deleted file mode 100644 index 69a3e3287371..000000000000 --- a/pkgs/by-name/si/siproxd/cheaders.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/dejitter.c b/src/dejitter.c -index 1904ab3..cb3624d 100644 ---- a/src/dejitter.c -+++ b/src/dejitter.c -@@ -22,6 +22,8 @@ - - #include - -+#include -+#include - #include - #include - #include - #include diff --git a/pkgs/by-name/si/siproxd/package.nix b/pkgs/by-name/si/siproxd/package.nix deleted file mode 100644 index 45e3ce71eee2..000000000000 --- a/pkgs/by-name/si/siproxd/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - libosip, - sqlite, -}: - -stdenv.mkDerivation rec { - pname = "siproxd"; - version = "0.8.3"; - - src = fetchurl { - url = "mirror://sourceforge/siproxd/siproxd-${version}.tar.gz"; - sha256 = "0dkpl3myxz3gvj2n2qpqrd19dip9il0vf7qybdvn5wgznrmplvcs"; - }; - - patches = [ ./cheaders.patch ]; - - buildInputs = [ - libosip - sqlite - ]; - - meta = { - homepage = "http://siproxd.sourceforge.net/"; - description = "Masquerading SIP Proxy Server"; - mainProgram = "siproxd"; - maintainers = [ ]; - platforms = with lib.platforms; linux; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix index 76ebeae80949..53bd8d93395c 100644 --- a/pkgs/by-name/si/sirikali/package.nix +++ b/pkgs/by-name/si/sirikali/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "sirikali"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "sirikali"; rev = version; - hash = "sha256-YGMmDatTKjhORTisX9kTVrpIWo6j0YkxZsDLJXga6ho="; + hash = "sha256-rfmWtbPYtkaGemeStMWwA6JllOkDiHMftSfmirtAOEQ="; }; buildInputs = diff --git a/pkgs/by-name/si/siril/package.nix b/pkgs/by-name/si/siril/package.nix index 1526d82ff48f..551ae7542570 100644 --- a/pkgs/by-name/si/siril/package.nix +++ b/pkgs/by-name/si/siril/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "free-astro"; repo = "siril"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-pSJp4Oj8x4pKuwPSaSyGbyGfpnanoWBxAdXtzGTP7uA="; }; @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix index df4a5a6af8a8..a913e2e9c864 100644 --- a/pkgs/by-name/si/sirius/package.nix +++ b/pkgs/by-name/si/sirius/package.nix @@ -6,6 +6,7 @@ pkg-config, mpi, mpiCheckPhaseHook, + ctestCheckHook, gfortran, blas, lapack, @@ -152,16 +153,14 @@ stdenv.mkDerivation rec { # Can not run parallel checks generally as it requires exactly multiples of 4 MPI ranks # Even cpu_serial tests had to be disabled as they require scalapack routines in the sandbox # and run into the same problem as MPI tests - checkPhase = '' - runHook preCheck - - ctest --output-on-failure --label-exclude integration_test - - runHook postCheck - ''; + checkFlags = [ + "--label-exclude" + "integration_test" + ]; nativeCheckInputs = [ mpiCheckPhaseHook + ctestCheckHook ]; meta = with lib; { diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix index 64ff70b09b27..93e517a19599 100644 --- a/pkgs/by-name/si/sish/package.nix +++ b/pkgs/by-name/si/sish/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sish"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "antoniomika"; repo = "sish"; tag = "v${version}"; - hash = "sha256-HsN/NQ82tHqdh295fSkJ8SW5oqKF8TJ4ck1VwmNZtk8="; + hash = "sha256-SSBGyfaG59/7SqUFnvFdkhno4pTTLHHxVWBEPTz0m1Q="; }; - vendorHash = "sha256-8QNqq/FV8/eZcDnYiRayxsoDTPU+WgDYdURM0Mgzt8s="; + vendorHash = "sha256-0dtfZp8hzoPc3oQN6E7T8ZOhDmU2JeZ3YcB3QMUoPKI="; ldflags = [ "-s" diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix index 886fe060694d..8011c9987d89 100644 --- a/pkgs/by-name/si/sitespeed-io/package.nix +++ b/pkgs/by-name/si/sitespeed-io/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, buildNpmPackage, - nodejs_18, + systemdLibs, coreutils, ffmpeg-headless, imagemagick_light, @@ -26,17 +26,15 @@ assert (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled."; buildNpmPackage rec { pname = "sitespeed-io"; - version = "34.0.1"; + version = "37.4.2"; src = fetchFromGitHub { owner = "sitespeedio"; repo = "sitespeed.io"; - rev = "v${version}"; - hash = "sha256-yC/TlAJa71hbPYYuqPV+k3syGuo/VhnNjXmmxh47ySQ="; + tag = "v${version}"; + hash = "sha256-xPinEib+72BXjVrqUP7EWE0gb0W/CHqFpn2Tk20jEpc="; }; - nodejs = nodejs_18; - postPatch = '' ln -s npm-shrinkwrap.json package-lock.json ''; @@ -46,9 +44,13 @@ buildNpmPackage rec { GECKODRIVER_SKIP_DOWNLOAD = true; EDGEDRIVER_SKIP_DOWNLOAD = true; + buildInputs = [ + systemdLibs + ]; + dontNpmBuild = true; npmInstallFlags = [ "--omit=dev" ]; - npmDepsHash = "sha256-Q0cWxV5OOaG8Z3aM2j0HtD1e9yPFVDSRcMKBf/yscv4="; + npmDepsHash = "sha256-Is6y5s4mNHveS0tl9FaRm4A0GK7rv75vt5aBH5tSvIY="; postInstall = '' mv $out/bin/sitespeed{.,-}io @@ -71,7 +73,7 @@ buildNpmPackage rec { '' wrapProgram $out/bin/sitespeed-io \ --set PATH ${ - lib.makeBinPath ([ + lib.makeBinPath [ (python3.withPackages (p: [ p.numpy p.opencv4 @@ -82,7 +84,7 @@ buildNpmPackage rec { xorg.xorgserver procps coreutils - ]) + ] } \ ${lib.optionalString withChromium "--add-flags '${chromiumArgs}'"} \ ${lib.optionalString withFirefox "--add-flags '${firefoxArgs}'"} \ @@ -94,11 +96,11 @@ buildNpmPackage rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Open source tool that helps you monitor, analyze and optimize your website speed and performance"; homepage = "https://sitespeed.io"; - license = licenses.mit; - maintainers = with maintainers; [ misterio77 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ misterio77 ]; platforms = lib.unique (geckodriver.meta.platforms ++ chromedriver.meta.platforms); mainProgram = "sitespeed-io"; }; diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 1575f64c73e1..2f731da1646f 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.1.26"; + version = "3.1.28"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-Hkvlodf2zBT/+ohmxLrinbBiluCmSsGRKnw4ZrdFcAg="; + hash = "sha256-s36rtNmVAp17Okj71NE/jgIM/pEZNS+oOYZ8rnjv6Ow="; }; kernel = buildGo123Module { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-NJPb5nJWDTiQ5H/RPDA0IHMaWvzlNNXUA2WkpG2lk8I="; + vendorHash = "sha256-i/hpP9S9vGS/jP3gKceDY00wgnBDkmsfYRZtsYQOjck="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-nmkoGsrF75k9AWFlBhIj+vO4e3eW1dJN+y2VWokKe4s="; + hash = "sha256-5KqMmpcI+4iy3Ff72D8aUvhPttW2vwTI8aTwXBJ7sqo="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix index b8e77c385d51..e26a7182db93 100644 --- a/pkgs/by-name/sk/skaffold/package.nix +++ b/pkgs/by-name/sk/skaffold/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.14.2"; + version = "2.15.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-iw9SYoepa2QjKnSaqFkIxuU5dcsLcR7S13kPh5S2Jyw="; + hash = "sha256-hZBIWiH7zxdfK8+QiaeJwz1aq9Xa0Ojy2R4LKk3ALIY="; }; vendorHash = null; diff --git a/pkgs/by-name/sk/skeditor/nuget-deps.json b/pkgs/by-name/sk/skeditor/nuget-deps.json index c8b40dc5ba61..3d66eb9d535b 100644 --- a/pkgs/by-name/sk/skeditor/nuget-deps.json +++ b/pkgs/by-name/sk/skeditor/nuget-deps.json @@ -6,8 +6,8 @@ }, { "pname": "Avalonia", - "version": "11.2.2", - "hash": "sha256-lYWqgjYOyh4pg+TdkgqeFhi8OMI1p9IOvSntVXo5zvE=" + "version": "11.3.0", + "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -16,8 +16,8 @@ }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Controls.ColorPicker", @@ -26,13 +26,13 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.0", - "hash": "sha256-x6IdcSo3e2Pq/En9/N80HpPblEXSAv51VRlBrF8wlVM=" + "version": "11.2.5", + "hash": "sha256-gWGIqXrac0fOnmGbovcFWv5Uj14hOyC+n0l45N7owMg=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.2", - "hash": "sha256-Mmp7Mjy9Y6uvkfjE8KLWoJWcVZHiJwqmhQupsxYRExo=" + "version": "11.3.0", + "hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0=" }, { "pname": "Avalonia.Controls.DataGrid", @@ -41,13 +41,8 @@ }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.0", - "hash": "sha256-pd/cD82onMZ0iMLl9TOCl35PEvAPbyX2lUj49lrBpOA=" - }, - { - "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.2", - "hash": "sha256-RbkISZEp55N9dtqvPp0Ej2/wpU/YzI4wgJjBCJnIGl4=" + "version": "11.2.5", + "hash": "sha256-eGKc+UnsO5nNiUd7+n3CQW6vIWq2qpazYvYXrVTQY7s=" }, { "pname": "Avalonia.Controls.ItemsRepeater", @@ -56,33 +51,33 @@ }, { "pname": "Avalonia.Desktop", - "version": "11.2.2", - "hash": "sha256-ucd2SH0CAjwE5TSgwhhzYZqMD1zuTlR7qLQDl3mYGvg=" + "version": "11.3.0", + "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.2", - "hash": "sha256-aOji+/TYSP0l3dpn62bvWMdce2YkYi5xzRPC3nS6ZGc=" + "version": "11.3.0", + "hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0=" }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.2.2", - "hash": "sha256-H1h+PQBW8vrvJnKQZ+vcFaxCVssBcuHGBQw1Jj8dMR0=" + "version": "11.3.0", + "hash": "sha256-/ObA3b0iPpPFcXBUiD8TmdCXFVqZKToK7YRuU3QUWtg=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.2", - "hash": "sha256-c/u6TX1Hl2h8B5xe7Zo1AJ6cR5BazI19NRnw56a36y0=" + "version": "11.3.0", + "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4=" }, { "pname": "Avalonia.Markup.Xaml.Loader", - "version": "11.2.2", - "hash": "sha256-H3Hv9BEsDuqIzVlZAtjE6/oJSFiTQffz4K1fRecfoQ4=" + "version": "11.3.0", + "hash": "sha256-qeduf1p1sacV2KmlaTcK/EPMePXytkU548TJilmnNjw=" }, { "pname": "Avalonia.Native", - "version": "11.2.2", - "hash": "sha256-2Scuc+OCtfLChDYCi4feCh9XUrgJpbVaek3xRnpOGDE=" + "version": "11.3.0", + "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs=" }, { "pname": "Avalonia.Remote.Protocol", @@ -91,13 +86,13 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.0", - "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM=" + "version": "11.2.5", + "hash": "sha256-Mpml6U6Fl8FUvENGQxpxuw0+pOPvoWbZXV4V1bLUS9w=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.2", - "hash": "sha256-lMb3VvHXQGxn0dyEGkzKXxFocvPJUaNnOpRJpHF9ORU=" + "version": "11.3.0", + "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I=" }, { "pname": "Avalonia.Skia", @@ -106,78 +101,78 @@ }, { "pname": "Avalonia.Skia", - "version": "11.2.0", - "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o=" + "version": "11.2.5", + "hash": "sha256-su1K1RmQ+syE6ufjrzpQR1yiUa6GEtY5QPlW0GOVKnU=" }, { "pname": "Avalonia.Skia", - "version": "11.2.2", - "hash": "sha256-YmOT+r4OfyOyg8epho6bVaEW2HImEfsZ5rNqhWIY5Fk=" + "version": "11.3.0", + "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc=" }, { "pname": "Avalonia.Svg.Skia", - "version": "11.2.0.2", - "hash": "sha256-76mxaTEgJ5HCIxX6P0+V5Kd+3Vk41YXLuHmc4Rr+/rE=" + "version": "11.3.0", + "hash": "sha256-4MY70GVJYZI4eGYw+++lXfpuoKJuvc9EJoU/ty4yF0E=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.2", - "hash": "sha256-+wBsbMAMDMRkZN/t94qwQgyew8eCY2RBreoTCgs3KJU=" + "version": "11.3.0", + "hash": "sha256-o5scZcwaflLKXQD6VLGZYe4vvQ322Xzgh7F3IvriMfk=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.2", - "hash": "sha256-HXkfpUuTN8hSBMXCCGW78+2GC5w3VdTUp1qm7HvUZPI=" + "version": "11.3.0", + "hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0=" }, { "pname": "Avalonia.Win32", - "version": "11.2.2", - "hash": "sha256-pouvlprL9VeEi1dG5zR6nFj+I/4CIjH1rHbV3N9/FHg=" + "version": "11.3.0", + "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE=" }, { "pname": "Avalonia.X11", - "version": "11.2.2", - "hash": "sha256-86EIfm1zEvKleliP58xAs7KGxP/n7x2m8ca8C9W1XqA=" + "version": "11.3.0", + "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU=" }, { "pname": "Avalonia.Xaml.Behaviors", - "version": "11.2.0.1", - "hash": "sha256-eGY1ib2nmeRNwCxjcY3xxCjL+hsw2f0iMl2ZH7UenpY=" + "version": "11.3.0", + "hash": "sha256-jSxMorAnKKTKhnBBCHTUjnrNGFY6RMhToQm6nUSGy80=" }, { "pname": "Avalonia.Xaml.Interactions", - "version": "11.2.0.1", - "hash": "sha256-5WLAl3gMywuGmLbrVDoZS0QxoMs5b5TaLCMk3itYROw=" + "version": "11.3.0", + "hash": "sha256-9OAjwt5G1bRzXldcdYlC3HmjjmYliVWjbHwUBeF0hZU=" }, { "pname": "Avalonia.Xaml.Interactions.Custom", - "version": "11.2.0.1", - "hash": "sha256-lfyyVJ7Hh0bKj9oaV3MB/d5zi+Epv8QXHwKG3Y1SzXs=" + "version": "11.3.0", + "hash": "sha256-IHOb3fXTMY3QLkitPcdKik85fdpRgzRbnwrlQHRszUA=" }, { "pname": "Avalonia.Xaml.Interactions.DragAndDrop", - "version": "11.2.0.1", - "hash": "sha256-h/UPHGQPESoUQII5s1wElvBUm9y/wZwBbx4hmjBVE/Y=" + "version": "11.3.0", + "hash": "sha256-Pb9+FxUD2w85AbOaZEDWJKelgINLTgs9OMVnLaGnSjc=" }, { "pname": "Avalonia.Xaml.Interactions.Draggable", - "version": "11.2.0.1", - "hash": "sha256-7jWbllNaDCauQoMDKY/WxurVSSUekF50HowYLrFveJM=" + "version": "11.3.0", + "hash": "sha256-iL1UYI3tqN0YGKXmYThxIDqEDD5MNwbt8Q64g8SVu6k=" }, { "pname": "Avalonia.Xaml.Interactions.Events", - "version": "11.2.0.1", - "hash": "sha256-RowY0nh8O9BVF5X2GV+9pkVYoMDY20MtYCuWfqe+X/k=" + "version": "11.3.0", + "hash": "sha256-LKTut33zzuomdq7FZMVFDZjnymKzNjIsZgqazj4MTi0=" }, { "pname": "Avalonia.Xaml.Interactions.Responsive", - "version": "11.2.0.1", - "hash": "sha256-N/Hd4x0lMCrEzarkbb51h74PG1uU1geXuSKlV/ZEBNY=" + "version": "11.3.0", + "hash": "sha256-RazJgeY5VYSowRrQj3ZgLTKGaEobfqdQV2nf+UY0ddw=" }, { "pname": "Avalonia.Xaml.Interactivity", - "version": "11.2.0.1", - "hash": "sha256-B6JJn52Yxu/ncUyBMqBprY6RskzB5sZes/3I9mmo1Qc=" + "version": "11.3.0", + "hash": "sha256-zXRrRt65YbJh9i7J2jqJre68LU4pWNbos/KhJzoHiy8=" }, { "pname": "CommunityToolkit.Mvvm", @@ -191,8 +186,8 @@ }, { "pname": "ExCSS", - "version": "4.2.3", - "hash": "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I=" + "version": "4.3.0", + "hash": "sha256-7QGbwOlT1EEkgUULKWSJO3H8BzvV4KP/mUZE/9/3r6M=" }, { "pname": "FluentAvaloniaUI", @@ -201,18 +196,18 @@ }, { "pname": "FluentIcons.Avalonia", - "version": "1.1.271", - "hash": "sha256-TCswtCSLAskSyxQcRglZsNN8y5ZJDJLCRPv6nWLkB3w=" + "version": "1.1.298", + "hash": "sha256-KIjHRKTevLM59Vp6Sh2LkrVKHpmI/6zAB6jKLR1CpXw=" }, { "pname": "FluentIcons.Avalonia.Fluent", - "version": "1.1.271", - "hash": "sha256-S+52KCyNhV/kLY6DJAQWrN+Wxi3xQ8ARWDCfak+y2tw=" + "version": "1.1.298", + "hash": "sha256-Hp67w2/jEfrKVda3kcIUw6AqzKQncWt0KvhdBFXHtMs=" }, { "pname": "FluentIcons.Common", - "version": "1.1.271", - "hash": "sha256-A1SufiopAAHu92eRJVamq7zcff9Nd4z4qgJV9VeZVQY=" + "version": "1.1.298", + "hash": "sha256-oNJDDQKZOcurxgOQ2B1kl8N0wU0CoR2blzFe1Bcbczo=" }, { "pname": "HarfBuzzSharp", @@ -221,24 +216,19 @@ }, { "pname": "HarfBuzzSharp", - "version": "7.3.0.2", - "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" }, { "pname": "HarfBuzzSharp", - "version": "7.3.0.3", - "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" + "version": "8.3.0.1", + "hash": "sha256-ZQwyxpI6jB804Z3d1JAhLqyHIu42fo6mpmk5GVFbEzk=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", "version": "2.8.2.3", "hash": "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg=" }, - { - "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "7.3.0.2", - "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=" - }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", "version": "7.3.0.3", @@ -251,13 +241,13 @@ }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "7.3.0.2", - "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=" + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "7.3.0.3", - "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + "version": "8.3.0.1", + "hash": "sha256-bpow26ydfzv9w6XCtZOcsGqMUVcfmvnIo5qPqtl9NQo=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", @@ -269,11 +259,6 @@ "version": "7.3.0.3", "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" }, - { - "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "7.3.0.3-preview.2.2", - "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM=" - }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", "version": "2.8.2.3", @@ -281,13 +266,13 @@ }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "7.3.0.2", - "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=" + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "7.3.0.3", - "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + "version": "8.3.0.1", + "hash": "sha256-2+FA4EfAQ68q1nJlXUuqDcETwIA+6OvD0DB/lMnbKVY=" }, { "pname": "MicroCom.CodeGenerator.MSBuild", @@ -316,94 +301,89 @@ }, { "pname": "NuGet.Common", - "version": "6.12.1", - "hash": "sha256-k6JAFqHFinTakwNuW666aXYPhR7TpI/rb+KbHm1S2TM=" + "version": "6.13.2", + "hash": "sha256-ASLa/Jigg5Eop0ZrXPl98RW2rxnJRC7pbbxhuV74hFw=" }, { "pname": "NuGet.Configuration", - "version": "6.12.1", - "hash": "sha256-e/4lvyl7o7g4aWTAtr9S2yiGgk7V0E9p6DXpsy7GgVw=" + "version": "6.13.2", + "hash": "sha256-z8VW1YdRDanyyRTDYRvRkSv/XPR3c/hMM1y8cNNjx0Y=" }, { "pname": "NuGet.Frameworks", - "version": "6.12.1", - "hash": "sha256-GGpkbas+PNLx35vvr3nyAVz5lY/aeoMx6qjmT368Lpg=" + "version": "6.13.2", + "hash": "sha256-caDyc+WgYOo43AUTjtbP0MyvYDb6JweEKDdIul61Cac=" }, { "pname": "NuGet.Packaging", - "version": "6.12.1", - "hash": "sha256-3h8Nmjpt383+dCg9GJ1BJ26UirwEQsWCPcTiT0+wGeI=" + "version": "6.13.2", + "hash": "sha256-lhO+SFwIYZ4aPHxIGm5ubkkE2a5Ve2xgtroRbNh7hpw=" }, { "pname": "NuGet.Protocol", - "version": "6.12.1", - "hash": "sha256-l+CHnAcit6Y9OjBxereRP5JzOuWbuZZQYkFOKsUkdQ8=" + "version": "6.13.2", + "hash": "sha256-5lnAHHZjy7A4vgv65AeBAs64mSNpuoUjxW3HnrMpuzY=" }, { "pname": "NuGet.Versioning", - "version": "6.12.1", - "hash": "sha256-f/ejCuzCAwKs4N4Ec6yf2RovrhBT0nj0hRDP+03/Iy4=" + "version": "6.13.2", + "hash": "sha256-gmpyBpKnt+GHqgx/2uFKp+J2csbxEAy1E7WdVT117sw=" }, { "pname": "Octokit", - "version": "13.0.1", - "hash": "sha256-uxQC+bbmWloIdwndqWUb+FY8iAUsPgxzqfw41EPWuAU=" + "version": "14.0.0", + "hash": "sha256-pTSI7Tz5VFd4Ydx1laE+VkZfhsl7Rbgw42PBqhyVvyI=" }, { "pname": "Serilog", - "version": "4.0.0", - "hash": "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw=" + "version": "4.2.0", + "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs=" }, { "pname": "Serilog.Sinks.File", - "version": "6.0.0", - "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=" + "version": "7.0.0", + "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo=" }, { "pname": "ShimSkiaSharp", - "version": "2.0.0.4", - "hash": "sha256-5XBMk4sjg2Yxr5rhoXWRsLDbZ2aTLumnFfi0Y662jTk=" + "version": "3.0.2", + "hash": "sha256-rxPdc2A9ORfqpaEqF8AByxmaeRCTr9JzDTlp3j46dKw=" }, { "pname": "SkAvaloniaEdit", - "version": "11.1.0", - "hash": "sha256-G1oQi7HC6w3WMprDzP6dDDofChLziV7Dij8IRkl/ZTY=" + "version": "11.3.1", + "hash": "sha256-YyI/VFSnX1mFsCai048PQUvZEHYeZgMf3Em/XTyiGPM=" }, { "pname": "SkFluentAvalonia", - "version": "2.1.2", - "hash": "sha256-3TG3GCMk8VW1/j6DYJO1FVSx1FylXjLDozafxa2bM2A=" + "version": "2.2.1", + "hash": "sha256-2ElW3/hSaOd81GEpRbDpSqVqnJwc7KrRqgs45DXipH8=" }, { "pname": "SkiaSharp", "version": "2.88.3", "hash": "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs=" }, - { - "pname": "SkiaSharp", - "version": "2.88.8", - "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" - }, { "pname": "SkiaSharp", "version": "2.88.9", "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" }, + { + "pname": "SkiaSharp", + "version": "3.116.1", + "hash": "sha256-EQW/zjk+GsJbpJ3zqyGARh3oHep8XgneWXcSTNnYwuk=" + }, { "pname": "SkiaSharp.HarfBuzz", - "version": "2.88.8", - "hash": "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8=" + "version": "3.116.1", + "hash": "sha256-GYu9itkxAJUmj7Z4etHGUvPLdtdNr+y0mcUauArRnhE=" }, { "pname": "SkiaSharp.NativeAssets.Linux", "version": "2.88.3", "hash": "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU=" }, - { - "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.8", - "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=" - }, { "pname": "SkiaSharp.NativeAssets.Linux", "version": "2.88.9", @@ -416,24 +396,19 @@ }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.8", - "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=" + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.9", - "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + "version": "3.116.1", + "hash": "sha256-GntlOA+Blrh43l97gHP7sZl4HY0+Hx84xId3+YTXLCE=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", "version": "2.88.3", "hash": "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA=" }, - { - "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.8", - "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=" - }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", "version": "2.88.9", @@ -446,13 +421,13 @@ }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.8", - "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=" + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.9", - "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + "version": "3.116.1", + "hash": "sha256-oraulwAja3vee2T2n9sEveSTVI8/Kvku7r09yXLENI4=" }, { "pname": "SpacedGrid-Avalonia", @@ -461,18 +436,23 @@ }, { "pname": "Svg.Custom", - "version": "2.0.0.4", - "hash": "sha256-Gp4zGWHJ2fEOmj8VNfPDukUPusxMsPhiz0jdcWT7u7Y=" + "version": "3.0.2", + "hash": "sha256-OVAL2kFLJQ2h8hDouLBVusAHUyC5ky2d5NbvJA8BYsk=" }, { "pname": "Svg.Model", - "version": "2.0.0.4", - "hash": "sha256-tMYfqm4ZYgnajWwKQIe6dc3qnoIWxbODfarIzwlWX80=" + "version": "3.0.2", + "hash": "sha256-ravea4oKkzkrY24v2u/N5m1tOugFtHQysMdAkVk5SZQ=" }, { "pname": "Svg.Skia", - "version": "2.0.0.4", - "hash": "sha256-xRB9GE2IxtV25py1S4y3R0Qk5lHYThu73O+YYu1VIoA=" + "version": "3.0.2", + "hash": "sha256-BMa0SyPs53YloLZ3G6ZgR8guvCIJ2MW9QwQ0VblPS5Q=" + }, + { + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" }, { "pname": "System.Formats.Asn1", @@ -484,11 +464,6 @@ "version": "8.0.0", "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, - { - "pname": "System.Reactive", - "version": "6.0.1", - "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" - }, { "pname": "System.Security.AccessControl", "version": "4.5.0", @@ -511,12 +486,12 @@ }, { "pname": "System.Threading.AccessControl", - "version": "9.0.0", - "hash": "sha256-+Mmlp6kmbFt1U6GgpBO+raLgByTBn6ToYI2t4S9nN/4=" + "version": "9.0.4", + "hash": "sha256-AWgbfDT0/L5aFzvUB0bOE48PlQQ5qvCsXCgNYQ7Dnjc=" }, { "pname": "Tmds.DBus.Protocol", - "version": "0.20.0", - "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" + "version": "0.21.2", + "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" } ] diff --git a/pkgs/by-name/sk/skeditor/package.nix b/pkgs/by-name/sk/skeditor/package.nix index bdf4d2eee2e3..b12babe6addf 100644 --- a/pkgs/by-name/sk/skeditor/package.nix +++ b/pkgs/by-name/sk/skeditor/package.nix @@ -9,13 +9,13 @@ }: buildDotnetModule rec { pname = "skeditor"; - version = "2.8.5"; + version = "2.8.9"; src = fetchFromGitHub { owner = "skeditorteam"; repo = "skeditor"; rev = "v${version}"; - hash = "sha256-e8mQTkTvR8RfC27VsONqf9UtkM/H8GebxrYVUdJw7PE="; + hash = "sha256-3SdE9M/2aGTVPVrFHCgHBcANyfP4zcd1svx9Jspqq0w="; }; projectFile = "SkEditor/SkEditor.csproj"; diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 044abb9c98c0..85df95d7cc10 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.16.1"; + version = "0.17.2"; outputs = [ "out" @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { owner = "skim-rs"; repo = "skim"; tag = "v${version}"; - hash = "sha256-lIVOML7UNR778RkmYvMvj4ynoOdMnb5lcsxFiO9BZAI="; + hash = "sha256-S9gHrGbEDRwMSsQWzPSIrYJaLhnCvfLtsS2eI3rPwdg="; }; postPatch = '' @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-llvVss7P9Bl9/6A4EtntXtmnFc5XbMvKms1lYNtaZaw="; + cargoHash = "sha256-IsPcVNwRx0ZDWATtbxmjuRERrhu8DpHh9v6Svj1dHzc="; nativeBuildInputs = [ installShellFiles ]; @@ -71,6 +71,7 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ dywedir getchoo + krovuxdev ]; mainProgram = "sk"; }; diff --git a/pkgs/by-name/sk/skimpdf/package.nix b/pkgs/by-name/sk/skimpdf/package.nix index 07167de4d48b..84c79a8c547b 100644 --- a/pkgs/by-name/sk/skimpdf/package.nix +++ b/pkgs/by-name/sk/skimpdf/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { pname = "Skim"; - version = "1.7.3"; + version = "1.7.9"; src = fetchurl { name = "Skim-${version}.dmg"; url = "mirror://sourceforge/project/skim-app/Skim/Skim-${version}/Skim-${version}.dmg"; - hash = "sha256-AMHEzlipL0Bv68Gnyq040t4DQhPkQcmDixZ6Oo0Vobc="; + hash = "sha256-0IfdLeH6RPxf4OZWnNltN7tvvZWbWDQaMCmazd4UUi4="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix index abb2a27d74eb..abdc1c4ebd31 100644 --- a/pkgs/by-name/sk/skopeo/package.nix +++ b/pkgs/by-name/sk/skopeo/package.nix @@ -89,13 +89,11 @@ buildGoModule rec { description = "Command line utility for various operations on container images and image repositories"; mainProgram = "skopeo"; homepage = "https://github.com/containers/skopeo"; - maintainers = - with maintainers; - [ - lewo - developer-guy - ] - ++ teams.podman.members; + maintainers = with maintainers; [ + lewo + developer-guy + ]; + teams = [ teams.podman ]; license = licenses.asl20; }; } diff --git a/pkgs/by-name/sk/skribilo/package.nix b/pkgs/by-name/sk/skribilo/package.nix index 2fe0eb835f7a..35e715b3aece 100644 --- a/pkgs/by-name/sk/skribilo/package.nix +++ b/pkgs/by-name/sk/skribilo/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.10.0"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/skribilo/skribilo-${finalAttrs.version}.tar.gz"; + url = "mirror://savannah/skribilo/skribilo-${finalAttrs.version}.tar.gz"; hash = "sha256-jP9I7hds7f1QMmSaNJpGlSvqUOwGcg+CnBzMopIS9Q4="; }; diff --git a/pkgs/by-name/sk/skyemu/package.nix b/pkgs/by-name/sk/skyemu/package.nix new file mode 100644 index 000000000000..ec3243c86d11 --- /dev/null +++ b/pkgs/by-name/sk/skyemu/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + pkg-config, + curl, + openssl, + SDL2, + alsa-lib, + libGL, + libGLU, + libX11, + libXi, + libXcursor, + lua, + makeDesktopItem, + copyDesktopItems, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "skyemu"; + version = "3-unstable-2025-02-23"; + + src = fetchFromGitHub { + owner = "skylersaleh"; + repo = "SkyEmu"; + rev = "f8573db83d15791b0cd94c29ceb46bf683963ff0"; + hash = "sha256-LI4zBKjB48zYYYVZePzefRFrw/zvg17jzh5ZOPHAWok="; + }; + + nativeBuildInputs = [ + cmake + copyDesktopItems + ninja + pkg-config + ]; + + buildInputs = + [ + alsa-lib + curl + libGL + libGLU + openssl + SDL2 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXi + libXcursor + lua + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_CURL" true) + (lib.cmakeBool "USE_SYSTEM_OPENSSL" true) + (lib.cmakeBool "USE_SYSTEM_SDL2" true) + (lib.cmakeBool "ENABLE_RETRO_ACHIEVEMENTS" true) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(CMAKE_OSX_ARCHITECTURES' '#set(CMAKE_OSX_ARCHITECTURES' + ''; + + desktopItems = [ + (makeDesktopItem { + name = "skyemu"; + exec = "SkyEmu"; + icon = "skyemu"; + comment = "GameBoy, GameBoy Color, GameBoy Advance, and DS emulator"; + desktopName = "SkyEmu"; + categories = [ + "Game" + "Emulator" + ]; + }) + ]; + + postInstall = '' + install -Dm644 $src/src/resources/icons/icon.png $out/share/pixmaps/skyemu.png + ''; + + meta = { + description = "Low level GameBoy, GameBoy Color, Game Boy Advance, and DS emulator"; + homepage = "https://github.com/skylersaleh/SkyEmu"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ liberodark ]; + mainProgram = "SkyEmu"; + platforms = with lib.platforms; unix ++ windows; + }; +}) diff --git a/pkgs/by-name/sk/skypeexport/package.nix b/pkgs/by-name/sk/skypeexport/package.nix index 430d45c731c6..5ed838986f30 100644 --- a/pkgs/by-name/sk/skypeexport/package.nix +++ b/pkgs/by-name/sk/skypeexport/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Temptin"; repo = "SkypeExport"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Uy3bmylDm/3T7T48zBkuk3lbnWW6Ps4Huqz8NjSAk8Y="; }; @@ -26,18 +26,27 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # fix build against Boost >= 1.85 + # https://github.com/Temptin/SkypeExport/pull/24 + postPatch = '' + substituteInPlace src/SkypeExport/main.cpp \ + --replace-fail \ + '.leaf()' \ + '.filename()' + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost ]; preConfigure = "cd src/SkypeExport/_gccbuild/linux"; installPhase = "install -Dt $out/bin SkypeExport"; - meta = with lib; { + meta = { description = "Export Skype history to HTML"; mainProgram = "SkypeExport"; homepage = "https://github.com/Temptin/SkypeExport"; - license = licenses.gpl2; - platforms = platforms.unix; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix deleted file mode 100644 index 59e6d6d78aba..000000000000 --- a/pkgs/by-name/sk/skypeforlinux/package.nix +++ /dev/null @@ -1,194 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - squashfsTools, - writeScript, - alsa-lib, - atk, - cairo, - cups, - curl, - dbus, - expat, - fontconfig, - freetype, - gdk-pixbuf, - glib, - glibc, - gnome-keyring, - gtk3, - libappindicator-gtk3, - libnotify, - libpulseaudio, - libsecret, - libv4l, - nspr, - nss, - pango, - systemd, - wrapGAppsHook3, - xorg, - at-spi2-atk, - libuuid, - at-spi2-core, - libdrm, - libgbm, - libxkbcommon, - libxshmfence, -}: - -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.138.0.213"; - revision = "392"; - - rpath = - lib.makeLibraryPath [ - alsa-lib - atk - at-spi2-atk - at-spi2-core - cairo - cups - curl - dbus - expat - fontconfig - freetype - glib - glibc - libsecret - libuuid - - gdk-pixbuf - gtk3 - libappindicator-gtk3 - - gnome-keyring - - libnotify - libpulseaudio - nspr - nss - pango - stdenv.cc.cc - systemd - - libv4l - libdrm - libgbm - libxkbcommon - libxshmfence - xorg.libxkbfile - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libXScrnSaver - xorg.libxcb - ] - + ":${lib.getLib stdenv.cc.cc}/lib64"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - name = "skypeforlinux-${version}-${revision}.snap"; - url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap"; - hash = "sha512-ZLqmJMkIVlBvflHAXCStEt1T3eZgw/KMBlR754sR7mljIsr0liddGxFu2fjSijEBkx1mzoB+4ErOB/Il0KCXEA=="; - } - else - throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; - -in -stdenv.mkDerivation { - pname = "skypeforlinux"; - inherit version revision; - - system = "x86_64-linux"; - - inherit src; - - nativeBuildInputs = [ - wrapGAppsHook3 - glib # For setup hook populating GSETTINGS_SCHEMA_PATH - ]; - - buildInputs = [ squashfsTools ]; - - unpackPhase = '' - runHook preUnpack - - unsquashfs "$src" '/meta/gui/*.desktop' \ - /usr/share/{doc/skypeforlinux,'icons/hicolor/*/apps/skypeforlinux.png',kservices5,pixmaps,skypeforlinux} - sourceRoot=squashfs-root - - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/bin" - mv meta/gui usr/share/applications - mv usr/share "$out" - ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin" - - runHook postInstall - ''; - - postFixup = '' - for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* -or -name \*.node\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true - done - - # Fix the desktop link - substituteInPlace "$out/share/applications/"*.desktop \ - --replace-fail 'Exec=skype ' 'Exec=skypeforlinux ' \ - --replace-fail 'Icon=''${SNAP}/meta/gui/skypeforlinux.png' 'Icon=skypeforlinux' - substituteInPlace "$out/share/kservices5/ServiceMenus/skypeforlinux.desktop" \ - --replace-fail 'Exec=/usr/bin/skypeforlinux ' 'Exec=skypeforlinux ' - ''; - - passthru.updateScript = writeScript "update-skypeforlinux" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts curl jq - - set -eu -o pipefail - - data=$(curl -H 'X-Ubuntu-Series: 16' \ - 'https://api.snapcraft.io/api/v1/snaps/details/skype?channel=stable&fields=download_sha512,revision,version') - - version=$(jq -r .version <<<"$data") - - if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$version" ]]; then - - revision=$(jq -r .revision <<<"$data") - hash=$(nix hash to-sri "sha512:$(jq -r .download_sha512 <<<"$data")") - - update-source-version "$UPDATE_NIX_ATTR_PATH" "$version" "$hash" - update-source-version --ignore-same-hash --version-key=revision "$UPDATE_NIX_ATTR_PATH" "$revision" "$hash" - - fi - ''; - - meta = { - description = "Linux client for Skype"; - homepage = "https://www.skype.com"; - changelog = "https://support.microsoft.com/en-us/skype/what-s-new-in-skype-for-windows-mac-linux-and-web-d32f674c-abb3-40a5-a0b7-ee269ca60831"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.mjoerg ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "skypeforlinux"; - }; -} diff --git a/pkgs/by-name/sk/skypilot/package.nix b/pkgs/by-name/sk/skypilot/package.nix index 7a7322bca65a..1a081673ed48 100644 --- a/pkgs/by-name/sk/skypilot/package.nix +++ b/pkgs/by-name/sk/skypilot/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "skypilot"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "skypilot-org"; repo = "skypilot"; tag = "v${version}"; - hash = "sha256-WM2glbjRFwAxyrIV5ID0bRaGb8UCQXiIgm0Praf7mU4="; + hash = "sha256-jLjYsBkb5Tba3q/mdqCWK04FLg0pEdHyZH3vuMIP6tg="; }; pyproject = true; diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix index 0c9b24b22ef2..7e951c177f4d 100644 --- a/pkgs/by-name/sl/slackdump/package.nix +++ b/pkgs/by-name/sl/slackdump/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "slackdump"; - version = "3.0.8"; + version = "3.1.1"; src = fetchFromGitHub { owner = "rusq"; repo = "slackdump"; tag = "v${version}"; - hash = "sha256-ufoksglrOPdvFb86rcc9kfOMC/koyHCRAXxaqUge6cU="; + hash = "sha256-DBIBOHoQIUp2WXj50w2ixhB9W8qBzdrBmNCKSuAJMGk="; }; nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools; @@ -32,7 +32,7 @@ buildGoModule rec { "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-qtvUhxbkElMa6qrkicNrPn9Boh65sAH/vZn/FeO9o9A="; + vendorHash = "sha256-TEeYHT2jvU0ioMb3h/xjUg1fISsi5oHY5xKEcHwhC0Y="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/sl/slang/package.nix b/pkgs/by-name/sl/slang/package.nix index aa21473271cf..a72855654ceb 100644 --- a/pkgs/by-name/sl/slang/package.nix +++ b/pkgs/by-name/sl/slang/package.nix @@ -5,7 +5,6 @@ libiconv, libpng, ncurses, - pcre, readline, zlib, writeScript, @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-pcre=${pcre.dev}" + "--without-pcre" "--with-png=${libpng.dev}" "--with-readline=${readline.dev}" "--with-z=${zlib.dev}" @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { buildInputs = [ libpng - pcre readline zlib ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ libiconv ]; diff --git a/pkgs/by-name/sl/sleek-todo/package.nix b/pkgs/by-name/sl/sleek-todo/package.nix index 84436b9a732a..9962bb5fa571 100644 --- a/pkgs/by-name/sl/sleek-todo/package.nix +++ b/pkgs/by-name/sl/sleek-todo/package.nix @@ -4,7 +4,7 @@ fetchurl, undmg, appimageTools, - + makeWrapper, }: let @@ -66,8 +66,10 @@ else src meta ; - + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' + wrapProgram $out/bin/sleek-todo \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" mkdir -p $out/share/{applications,sleek} cp -a ${appimageContents}/{locales,resources} $out/share/sleek cp -a ${appimageContents}/usr/share/icons $out/share diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix index 371cd1d15805..f4fc8afd9593 100644 --- a/pkgs/by-name/sl/slepc/package.nix +++ b/pkgs/by-name/sl/slepc/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitLab, - sowing, python3, python3Packages, arpack-mpi, @@ -17,13 +16,13 @@ assert petsc.mpiSupport; assert pythonSupport -> petsc.pythonSupport; stdenv.mkDerivation (finalAttrs: { pname = "slepc"; - version = "3.22.2"; + version = "3.23.1"; src = fetchFromGitLab { owner = "slepc"; repo = "slepc"; tag = "v${finalAttrs.version}"; - hash = "sha256-a5DmsA7NAlhrEaS43TYPk7vtDfhXLEP+5sftu2A9Yt4="; + hash = "sha256-K38/QH4AG8/SksrRLc+jIs1WO8FKFFTNkuHFbBER/tg="; }; postPatch = '' @@ -33,11 +32,6 @@ stdenv.mkDerivation (finalAttrs: { "slepc.prefixdir,'${python3.sitePackages}'" patchShebangs lib/slepc/bin - - # Use system bfort - substituteInPlace config/packages/sowing.py \ - --replace-fail "bfort = os.path.join(archdir,'bin','bfort')" \ - "bfort = '${sowing}/bin/bfort'" ''; # Usually this project is being built as part of a `petsc` build or as part of @@ -81,6 +75,8 @@ stdenv.mkDerivation (finalAttrs: { installTargets = [ (if withExamples then "install" else "install-lib") ]; + __darwinAllowLocalNetworking = true; + nativeInstallCheckInputs = [ mpiCheckPhaseHook diff --git a/pkgs/by-name/sl/slimevr-server/deps.json b/pkgs/by-name/sl/slimevr-server/deps.json index da1e488c6884..b1ba523df9b6 100644 --- a/pkgs/by-name/sl/slimevr-server/deps.json +++ b/pkgs/by-name/sl/slimevr-server/deps.json @@ -19,6 +19,75 @@ "jmdns#jmdns/0e40954468": { "jar": "sha256-At4T7JOk5Ary/jGDErygVFkglIQ37CdG98idweqySAQ=", "pom": "sha256-aEgGw0Vfw3gG0B4RCADfpb1wmQBtXY4c0jwryNaS3yY=" + }, + "loucass003#EspflashKotlin/v0.10.0": { + "jar": "sha256-ORIPUdeqSAhXBuXmPkmyZ6gS8EFnwYkvUtgXFttKIwU=", + "module": "sha256-6IMNElGmZLIg/qqVYFdFoHxZIK+YYsT4rBTzyM86FW8=", + "pom": "sha256-4ni1oElb85tIe9C0diwh20pgxVUA0c8PX1JZhgomdgo=" + } + }, + "https://oss.sonatype.org/content/repositories/snapshots": { + "com/fazecast#jSerialComm/2.11.1-20240515.234541-3/SNAPSHOT": { + "jar": "sha256-n4A3U5elHQhq9b0YVgvWCuXAHqt0RzxL5e4Fe4iGTkM=", + "module": "sha256-xeVUO5f2Imx43EgYUI5vbLXyyEmJh/jT106eLUWtUYg=", + "pom": "sha256-y+ZXr7k89vlAHOMZmlTNYl8D0Nki+6CDame/QNX/e2M=" + }, + "com/fazecast/jSerialComm/2.11.1-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.fazecast", + "lastUpdated": "20241221185706" + } + }, + "net/java/dev/jna#jna-platform/5.1.1-20181118.214522-1/SNAPSHOT": { + "pom": "sha256-STVISbMwC8BymYDxq6UJhC3ZWqO+p7iA7lRW34ZcX6g=" + }, + "net/java/dev/jna#jna/5.1.1-20181118.214402-1/SNAPSHOT": { + "pom": "sha256-ABsaEoX+E319CyWjlyv5FnEy2ppq0u0rUQpNTfmFCe4=" + }, + "net/java/dev/jna/jna-platform/5.1.1-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "net.java.dev.jna", + "lastUpdated": "20181118232423" + } + }, + "net/java/dev/jna/jna-platform/maven-metadata": { + "xml": { + "groupId": "net.java.dev.jna", + "lastUpdated": "20241017191337", + "latest": "5.1.1-SNAPSHOT", + "release": "" + } + }, + "net/java/dev/jna/jna/5.1.1-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "net.java.dev.jna", + "lastUpdated": "20181118232424" + } + }, + "net/java/dev/jna/jna/maven-metadata": { + "xml": { + "groupId": "net.java.dev.jna", + "lastUpdated": "20241028084608", + "latest": "5.1.1-SNAPSHOT", + "release": "" + } + }, + "org/java-websocket#Java-WebSocket/1.3.10-20180805.200518-2/SNAPSHOT": { + "pom": "sha256-Te1UpdvGwDYnEjQPXY1m9V61JI9+4gyW5vsXY/v5B0g=" + }, + "org/java-websocket/Java-WebSocket/1.3.10-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "org.java-websocket", + "lastUpdated": "20180806172916" + } + }, + "org/java-websocket/Java-WebSocket/maven-metadata": { + "xml": { + "groupId": "org.java-websocket", + "lastUpdated": "20240929162703", + "latest": "1.3.10-SNAPSHOT", + "release": "" + } } }, "https://plugins.gradle.org/m2": { @@ -34,28 +103,28 @@ "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" }, - "com/diffplug/durian#durian-swt.os/4.2.2": { - "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", - "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", - "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" + "com/diffplug/durian#durian-swt.os/4.3.0": { + "jar": "sha256-geK2Oafkvm3JtyRXE88G9cq1HynbLha5tXZFyW/eKIQ=", + "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=", + "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs=" }, - "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": { - "pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo=" + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/7.0.2": { + "pom": "sha256-7R3td6KWpv4hpQJ5ySbAe+FK98CMJDfTaFxw/Pa7oC0=" }, - "com/diffplug/spotless#spotless-lib-extra/2.45.0": { - "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", - "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", - "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" + "com/diffplug/spotless#spotless-lib-extra/3.0.2": { + "jar": "sha256-sOd3RtYz1EXnhImsPQitLqGzU3xNBk5KvkbMQtYjA+s=", + "module": "sha256-vSVeQkQbWRehU8U9z5fP08IEevN2zF3Yu1Z/aEAWtFk=", + "pom": "sha256-IVesGayscKzQRQH8WbvJZNsZD1tx5O1e/s6o5c9o7Os=" }, - "com/diffplug/spotless#spotless-lib/2.45.0": { - "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", - "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", - "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" + "com/diffplug/spotless#spotless-lib/3.0.2": { + "jar": "sha256-P5p/38WwOsIIlINBcJEMFcTyuE7UzjZ3iYowetWJg3w=", + "module": "sha256-E1WLrsCR6gDxYmXNNSOBePT+ejv61zXel214XUF/ss0=", + "pom": "sha256-jxtFo4m6Jeel8DvZ8KS9BKp+dHXgku6C1VUJYrLPdV8=" }, - "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { - "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", - "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", - "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" + "com/diffplug/spotless#spotless-plugin-gradle/7.0.2": { + "jar": "sha256-WaNMT4SkjUyNkp4viZBjaeZUduwEmaQ96Hw+QSeXfNU=", + "module": "sha256-rxC8mydsNqlNcRh+kVhwJ1yyRVZTntzqGYpYL30Tsws=", + "pom": "sha256-JyVoPfbvTNSIr+sgANqJIpQcqQ513D49uFIupxWKaMQ=" }, "com/fasterxml#oss-parent/38": { "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" @@ -134,18 +203,18 @@ "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" }, - "commons-codec#commons-codec/1.16.0": { - "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", - "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + "commons-codec#commons-codec/1.17.0": { + "jar": "sha256-9wDegKwnDQNE/ep0aCAdi5yAXlxkgzHDYZ8u4GfM/Fk=", + "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw=" }, "commons-io#commons-io/2.16.1": { "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" }, - "dev/equo/ide#solstice/1.7.5": { - "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", - "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", - "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" + "dev/equo/ide#solstice/1.8.1": { + "jar": "sha256-bluizOgTvh1xzNwuzz5JJxsU5pG/u7GhFM86MOdzsQ0=", + "module": "sha256-pnYDnqavCPJXtG4Hwr8VcaRqTUtbnMuGw/yY0H+v6hs=", + "pom": "sha256-arSo7K4qu9NrkZ0Lm5+yTBdxSPE+U2TJegxu4Ro/xCY=" }, "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" @@ -153,9 +222,6 @@ "jakarta/platform#jakartaee-api-parent/9.1.0": { "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" }, - "org/apache#apache/29": { - "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" - }, "org/apache#apache/31": { "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" }, @@ -173,9 +239,6 @@ "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" }, - "org/apache/commons#commons-parent/58": { - "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" - }, "org/apache/commons#commons-parent/69": { "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" }, @@ -247,16 +310,16 @@ "org/eclipse/jetty#jetty-bom/9.4.55.v20240627": { "pom": "sha256-plq2UZjcP22y/2kBBlc31UgL52e+wyDgFzqJB68LGdg=" }, - "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { - "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" + "org/eclipse/jgit#org.eclipse.jgit-parent/6.10.0.202406032230-r": { + "pom": "sha256-8tNTmgp5Iv15RwgsGQHSCQ2uB0mGsi2r2XO0OYzR6i4=" }, - "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { - "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", - "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" + "org/eclipse/jgit#org.eclipse.jgit/6.10.0.202406032230-r": { + "jar": "sha256-Q/kvOttoGl8wBrl56NNBwSqM/YAp8ofEK88KgDd1Za4=", + "pom": "sha256-BVlUQr62ogYQi2c6qcZpLIPkHfGDF33GcROxzD9Sgd0=" }, - "org/eclipse/platform#org.eclipse.osgi/3.18.300": { - "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", - "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" + "org/eclipse/platform#org.eclipse.osgi/3.18.500": { + "jar": "sha256-gLJ11YN5cjspHqZQJJzDgJyPELNPeKr5iBMs1tQ0q04=", + "pom": "sha256-4o9b4Azk7Sx+SAnsrQW5UwfzWhflhWAHhri97juk2Wg=" }, "org/jdom#jdom2/2.0.6.1": { "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", @@ -414,10 +477,6 @@ "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" }, - "org/junit#junit-bom/5.9.3": { - "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", - "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" - }, "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, @@ -501,11 +560,6 @@ "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.1": { "pom": "sha256-xLCopnocY3IgeJlhd5bYafE/UerrGsN/wHqcpxPaQjU=" }, - "com/fazecast#jSerialComm/2.11.0": { - "jar": "sha256-xh5rVnw5XV412UKAaZjkWylmWMwU0kwau0EO0Hhbps0=", - "module": "sha256-/5bM5oSOSihGIHxYz+12sMRGhSpgyjs7cn5KkJ1/eVg=", - "pom": "sha256-CIOmOwJEY1v4RtSWaC+7dLzXKe6uMmyDP9eQ1B1ZuXs=" - }, "com/github/jonpeterson#jackson-module-model-versioning/1.2.2": { "jar": "sha256-FcepndfH5cTcOLXkhn1TZw1YDYqAXvQ4A7qT8IN2Uc0=", "pom": "sha256-eN9L1tMAM6b3JUkuBewt0shfbc7EYm6wWT6KpO9f0ic=" @@ -531,15 +585,25 @@ "com/illposed/osc#javaosc-parent/0.8": { "pom": "sha256-nEUgmNlVT1AifJfkGt0/t6mvSSUGgHK/3YywUtl8x3U=" }, - "com/melloware#jintellitype/1.4.1": { - "jar": "sha256-6mQRTP+BCiat4vxz1LnB/jggDmP2dhUQ11ZrXtNOPCM=", - "pom": "sha256-wej58h+rEtprQQg+8i7wpFZBpjcmjw8pOryo9v0yoj4=" + "com/mayakapps/kache#kache-jvm/2.1.0": { + "jar": "sha256-QnYuXTmGGeE6JZj1EcXc2UuW4dD6T+t2+e+YteFh14c=", + "module": "sha256-99wJdUE6GDuSUtUmB0PcdcXOuPVCPTwOPv+X2Gvb55Y=", + "pom": "sha256-bcKY6cIqgE35qSXwt0MI2XOcaO/Y16YTdndiry99LoI=" + }, + "com/mayakapps/kache#kache/2.1.0": { + "jar": "sha256-MKRjEaZRESk51De/E/5FJAgMsYuJqrmbkqIu0GUGSUc=", + "module": "sha256-tJZEwfTNkvRk844MXEwqFJp7s+0VsyrJCO5XypCHfqg=", + "pom": "sha256-qRWJAaDp8uNB+jtHPwK7mOIC+gkY1Fxo3/n602z+X2Y=" + }, + "com/melloware#jintellitype/1.5.0": { + "jar": "sha256-jf+mMUTxKiDf70/Zm9OeyQSxS0TPR8CeGOy3G4Hze1g=", + "pom": "sha256-e1E2mFo87oyeK/FQR1K/++7WyQwTCLsrX5//sNwBvao=" }, "com/melloware/jintellitype/maven-metadata": { "xml": { "groupId": "com.melloware", - "lastUpdated": "20220814121249", - "release": "1.4.1" + "lastUpdated": "20250413134243", + "release": "1.5.0" } }, "com/typesafe#config/1.4.3": { @@ -717,26 +781,26 @@ "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=", "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4=" }, - "net/java/dev/jna#jna-platform/5.16.0": { - "jar": "sha256-5aeVI5ZFCXV1VXgrtgKD5JAmEQE/EH5GANyTKY9z84I=", - "pom": "sha256-R3eT3wLGgn3+Ab2wjwBqVXdeb6BS3ErN7aNMmTYopJY=" + "net/java/dev/jna#jna-platform/5.17.0": { + "jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=", + "pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ=" }, - "net/java/dev/jna#jna/5.16.0": { - "jar": "sha256-P1IzWJp5nrZtwpaa+jQz+1aFnT14fFi5vH3Z6G8KJQw=", - "pom": "sha256-9h/SxEqlg/Kiy8X8Z7DxmpIDyofV8OGNPVAwy+OQgIM=" + "net/java/dev/jna#jna/5.17.0": { + "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=", + "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ=" }, "net/java/dev/jna/jna-platform/maven-metadata": { "xml": { "groupId": "net.java.dev.jna", - "lastUpdated": "20241222102859", - "release": "5.16.0" + "lastUpdated": "20250316114732", + "release": "5.17.0" } }, "net/java/dev/jna/jna/maven-metadata": { "xml": { "groupId": "net.java.dev.jna", - "lastUpdated": "20241222102857", - "release": "5.16.0" + "lastUpdated": "20250316114729", + "release": "5.17.0" } }, "org/apache#apache/16": { @@ -857,9 +921,9 @@ "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" }, - "org/jetbrains/kotlin#kotlin-reflect/1.8.22": { - "jar": "sha256-ZVgl+mURIg/tDK5arU3+oqv5j9EPCud+uNr2q/zQ8Cc=", - "pom": "sha256-KeHqCKPTq0gtH9/UH76TRZEt9Gbbr6+0sS0YN8cr4yg=" + "org/jetbrains/kotlin#kotlin-reflect/2.0.20": { + "jar": "sha256-GPRR5rS3vR0fnWCEnDy/Fg4RUwL5eiAIwZDVBcQ5xnA=", + "pom": "sha256-Y+Y4sFbdRJ5vUtcenCxdxdsNFkRDI5cOFtf8DWWDk9s=" }, "org/jetbrains/kotlin#kotlin-script-runtime/2.0.20": { "jar": "sha256-/pcAKmeY9yB1ZGSJGdbuzPszi5XcBLSIhthWZVvGSk4=", @@ -892,13 +956,13 @@ "module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=", "pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.22": { - "jar": "sha256-BV9cskKH+hBhAJlae0erkhJrgegy6HX1+izwvVVpPQs=", - "pom": "sha256-T5WKqZPVmE+PXr7UFGVipfOp9pW2BJyfKHOBN5ytqzM=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.0": { + "jar": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg=", + "pom": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.22": { - "jar": "sha256-QZiw6vCQpPJbb35aWVgfQxS6jJ9s0dE+6dNI5l7Y9wc=", - "pom": "sha256-ko8hhyF0djE8uBbUgHC8dlSqO5pa6B0/xfjCecyPjZ4=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.0": { + "jar": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o=", + "pom": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I=" }, "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { "jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=", @@ -1037,6 +1101,9 @@ "org/slf4j#slf4j-api/1.7.25": { "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" }, + "org/slf4j#slf4j-api/1.7.36": { + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, "org/slf4j#slf4j-api/2.0.13": { "jar": "sha256-58KkjoUVuh9J+mN9V7Ti9ZCz9b2XQHrGmcOqXvsSBKk=", "pom": "sha256-UYBc/agMoqyCBBuQbZhl056YI+NYoO62I3nf7UdcFXE=" @@ -1055,6 +1122,9 @@ "org/slf4j#slf4j-parent/1.7.25": { "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, "org/slf4j#slf4j-parent/2.0.13": { "pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo=" }, diff --git a/pkgs/by-name/sl/slimevr/gui-no-git.patch b/pkgs/by-name/sl/slimevr/gui-no-git.patch index 6e259a4fbefb..f6d9ee12764f 100644 --- a/pkgs/by-name/sl/slimevr/gui-no-git.patch +++ b/pkgs/by-name/sl/slimevr/gui-no-git.patch @@ -1,8 +1,8 @@ diff --git a/gui/vite.config.ts b/gui/vite.config.ts -index c9eb27be..4b3757f0 100644 +index 2171bccd..b4db20b9 100644 --- a/gui/vite.config.ts +++ b/gui/vite.config.ts -@@ -4,13 +4,10 @@ import { execSync } from 'child_process'; +@@ -5,14 +5,10 @@ import { execSync } from 'child_process'; import path from 'path'; import { visualizer } from 'rollup-plugin-visualizer'; @@ -14,8 +14,9 @@ index c9eb27be..4b3757f0 100644 +const commitHash = ""; +const versionTag = "@version@"; // If not empty then it's not clean --const gitClean = execSync('git status --porcelain').toString() ? false : true; +-const gitCleanString = execSync('git status --porcelain').toString(); +-const gitClean = gitCleanString ? false : true; +const gitClean = true; + if (!gitClean) console.log('Git is dirty because of:\n' + gitCleanString); console.log(`version is ${versionTag || commitHash}${gitClean ? '' : '-dirty'}`); - diff --git a/pkgs/by-name/sl/slimevr/no-java-tool-options-warning.patch b/pkgs/by-name/sl/slimevr/no-java-tool-options-warning.patch new file mode 100644 index 000000000000..87feddb9cb88 --- /dev/null +++ b/pkgs/by-name/sl/slimevr/no-java-tool-options-warning.patch @@ -0,0 +1,13 @@ +diff --git a/gui/src-tauri/src/main.rs b/gui/src-tauri/src/main.rs +index 8191f0ed..01e764d8 100644 +--- a/gui/src-tauri/src/main.rs ++++ b/gui/src-tauri/src/main.rs +@@ -188,7 +188,7 @@ fn setup_webview2() -> Result<()> { + + fn check_environment_variables() { + use itertools::Itertools; +- const ENVS_TO_CHECK: &[&str] = &["_JAVA_OPTIONS", "JAVA_TOOL_OPTIONS"]; ++ const ENVS_TO_CHECK: &[&str] = &["_JAVA_OPTIONS"]; + let checked_envs = ENVS_TO_CHECK + .into_iter() + .filter_map(|e| { diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix index 083938fb1756..a9e94ebf6d51 100644 --- a/pkgs/by-name/sl/slimevr/package.nix +++ b/pkgs/by-name/sl/slimevr/package.nix @@ -21,26 +21,25 @@ rustPlatform.buildRustPackage rec { pname = "slimevr"; - version = "0.13.2"; + version = "0.14.1"; src = fetchFromGitHub { owner = "SlimeVR"; repo = "SlimeVR-Server"; rev = "v${version}"; - hash = "sha256-XQDbP+LO/brpl7viSxuV3H4ALN0yIkj9lwr5eS1txNs="; + hash = "sha256-7b2IlMYpOVvthOUNr63PUsZyr2JH37O2DVWH9N6M8Xg="; # solarxr fetchSubmodules = true; }; buildAndTestSubdir = "gui/src-tauri"; - useFetchCargoVendor = true; - cargoHash = "sha256-93aOM6iJguTdC5RAUDuoSr05ar+iKilmddgKBOG2fDE="; + cargoHash = "sha256-+WrBVL4/XslJSOwuxs4IzqXG9l1/lMSbKil/8OHc9Xw="; pnpmDeps = pnpm_9.fetchDeps { pname = "${pname}-pnpm-deps"; inherit version src; - hash = "sha256-5IqIUwVvufrws6/xpCAilmgRNG4mUGX8NXajZcVZypM="; + hash = "sha256-IoLY3ByDQGfbkWjxlEHHTiKiE3+tpwCrYLUDE8zPkeQ="; }; nativeBuildInputs = [ @@ -69,18 +68,10 @@ rustPlatform.buildRustPackage rec { patches = [ # Upstream code uses Git to find the program version. (replaceVars ./gui-no-git.patch { - inherit version; - }) - ]; - - cargoPatches = [ - # Fix Tauri dependencies issue. - # FIXME: Remove with next package update. - (fetchpatch { - name = "enable-rustls-feature.patch"; - url = "https://github.com/SlimeVR/SlimeVR-Server/commit/2708b5a15b7c1b8af3e86d942c5e842d83cf078f.patch"; - hash = "sha256-UDVztPGPaKp2Hld3bMDuPMAu5s1OhvKEsTiXoDRK7cU="; + version = src.rev; }) + # By default, SlimeVR will give a big warning about our `JAVA_TOOL_OPTIONS` changes. + ./no-java-tool-options-warning.patch ]; postPatch = @@ -91,22 +82,27 @@ rustPlatform.buildRustPackage rec { '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Both libappindicator-rs and SlimeVR need to know where Nix's appindicator lib is. - pushd $cargoDepsCopy/libappindicator-sys-* - oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) - substituteInPlace src/lib.rs \ + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" - # Cargo doesn't like it when vendored dependencies are edited. - substituteInPlace .cargo-checksum.json \ - --replace-warn $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) - popd substituteInPlace gui/src-tauri/src/tray.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + + # tao < version 0.31 has a GTK crash. Manually apply the fix. + pushd $cargoDepsCopy/tao-0.30.* + patch -p1 < ${ + fetchpatch { + name = "fix-gtk-crash.patch"; + url = "https://github.com/tauri-apps/tao/commit/83e35e961f4893790b913ee2efc15ae33fd16fb2.diff"; + hash = "sha256-FNXWzsg4lO6VbLsqS6NevX8kVj26YtcYdKbbFejq9hM="; + } + } + popd ''; # solarxr needs to be installed after compiling its Typescript files. This isn't # done the first time, because `pnpm_9.configHook` ignores `package.json` scripts. preBuild = '' - pnpm --filter solarxr-protocol install + pnpm --filter solarxr-protocol build ''; doCheck = false; # No tests @@ -129,8 +125,26 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = ./update.sh; meta = { - homepage = "https://docs.slimevr.dev/"; + homepage = "https://slimevr.dev"; description = "App for facilitating full-body tracking in virtual reality"; + longDescription = '' + App for SlimeVR ecosystem. It orchestrates communication between multiple sensors and integrations, like SteamVR. + + Sensors implementations: + + - [SlimeVR Tracker for ESP](https://github.com/SlimeVR/SlimeVR-Tracker-ESP) - ESP microcontrollers and multiple IMUs are supported + - [owoTrack Mobile App](https://github.com/abb128/owoTrackVRSyncMobile) - use phones as trackers (limited functionality and compatibility) + - [SlimeVR Wrangler](https://github.com/carl-anders/slimevr-wrangler) - use Nintendo Switch Joycon controllers as trackers + + Integrations: + + - Use [SlimeVR OpenVR Driver](https://github.com/SlimeVR/SlimeVR-OpenVR-Driver) as a driver for SteamVR. + - Use built-in OSC Trackers support for FBT integration with VRChat, PCVR or Standalone. + - Use built-in VMC support for sending and receiving tracking data to and from other apps such as VSeeFace. + - Export recordings as .BVH files to integrate motion capture data into 3d applications such as Blender. + + More at https://docs.slimevr.dev/tools/index.html. + ''; license = with lib.licenses; [ mit asl20 diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index 001996294a8d..d20dc3b17cb3 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -10,17 +10,20 @@ xorg, libxkbcommon, wayland, - # Darwin Frameworks - AppKit, - CoreGraphics, - CoreServices, - CoreText, - Foundation, - libiconv, - OpenGL, + versionCheckHook, + nix-update-script, }: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "slint-lsp"; + version = "1.11.0"; + + src = fetchCrate { + inherit (finalAttrs) pname version; + hash = "sha256-bFYoXIe/AFN2eNUOGoFhxjD0fWtxujrdhmLx0TZOH0U="; + }; + + cargoHash = "sha256-GYEItiyUVAAL7K/6o31U4Ss75JOUE8Mxxf0Ut6T7X04="; -let rpathLibs = [ fontconfig @@ -34,52 +37,35 @@ let libxkbcommon wayland ]; -in -rustPlatform.buildRustPackage rec { - pname = "slint-lsp"; - version = "1.10.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-5LDEjJx+PC6pOem06DKFkPcjpIkF20gbxi/PAVZT1ns="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-1/4dOlhByJDpduExu9ZOjb7JYFKehnLiLCboWUnmfp8="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; - buildInputs = - rpathLibs - ++ [ xorg.libxcb.dev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreGraphics - CoreServices - CoreText - Foundation - libiconv - OpenGL - ]; + buildInputs = finalAttrs.rpathLibs ++ [ xorg.libxcb.dev ]; # Tests requires `i_slint_backend_testing` which is only a dev dependency doCheck = false; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf --set-rpath ${lib.makeLibraryPath rpathLibs} $out/bin/slint-lsp + patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.rpathLibs} $out/bin/slint-lsp ''; dontPatchELF = true; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Language Server Protocol (LSP) for Slint UI language"; mainProgram = "slint-lsp"; homepage = "https://slint-ui.com/"; - changelog = "https://github.com/slint-ui/slint/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ xgroleau ]; + downloadPage = "https://github.com/slint-ui/slint/"; + changelog = "https://github.com/slint-ui/slint/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ xgroleau ]; }; -} +}) diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix new file mode 100644 index 000000000000..76165cd5e43c --- /dev/null +++ b/pkgs/by-name/sl/slint-viewer/package.nix @@ -0,0 +1,45 @@ +{ + lib, + rustPlatform, + fetchCrate, + qt6, + libGL, + nix-update-script, + versionCheckHook, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "slint-viewer"; + version = "1.11.0"; + + src = fetchCrate { + inherit (finalAttrs) pname version; + hash = "sha256-Yez8GbER6ylkozQP5oQ0m0u+x/T5qQVPRt0S/NRFT60="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-vWTj6cJgvg10NaLw9WfHXmiG8hg7mUIH/Gj3JVvWCuA="; + + buildInputs = [ + qt6.qtbase + qt6.qtsvg + libGL + ]; + + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + + # There are no tests + doCheck = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Viewer for .slint files from the Slint Project"; + mainProgram = "slint-viewer"; + homepage = "https://crates.io/crates/slint-viewer"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ dtomvan ]; + }; +}) diff --git a/pkgs/by-name/sl/slippy/package.nix b/pkgs/by-name/sl/slippy/package.nix index 70e757d7c1a1..c50ce43067eb 100644 --- a/pkgs/by-name/sl/slippy/package.nix +++ b/pkgs/by-name/sl/slippy/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Markdown slideshows in Rust"; diff --git a/pkgs/by-name/sl/slirp4netns/package.nix b/pkgs/by-name/sl/slirp4netns/package.nix index 91849a956cca..f7a643222a23 100644 --- a/pkgs/by-name/sl/slirp4netns/package.nix +++ b/pkgs/by-name/sl/slirp4netns/package.nix @@ -43,7 +43,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rootless-containers/slirp4netns"; description = "User-mode networking for unprivileged network namespaces"; license = licenses.gpl2Only; - maintainers = with maintainers; [ orivej ] ++ teams.podman.members; + maintainers = with maintainers; [ orivej ]; + teams = [ teams.podman ]; platforms = platforms.linux; mainProgram = "slirp4netns"; }; diff --git a/pkgs/by-name/sl/sloccount/package.nix b/pkgs/by-name/sl/sloccount/package.nix deleted file mode 100644 index 0761d0d50227..000000000000 --- a/pkgs/by-name/sl/sloccount/package.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - fetchurl, - lib, - stdenv, - perl, - makeWrapper, -}: - -stdenv.mkDerivation rec { - pname = "sloccount"; - version = "2.26"; - - src = fetchurl { - url = "https://www.dwheeler.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl ]; - - # Make sure the Flex-generated files are newer than the `.l' files, so that - # Flex isn't needed to recompile them. - patchPhase = '' - for file in * - do - if grep -q /usr/bin/perl "$file" - then - echo "patching \`$file'..." - substituteInPlace "$file" --replace \ - "/usr/bin/perl" "${perl}/bin/perl" - fi - done - - for file in *.l - do - touch "$(echo $file | sed -es'/\.l$/.c/g')" - done - ''; - - makeFlags = [ - "PREFIX=$(out)" - "CC=${stdenv.cc.targetPrefix}cc" - ]; - - doCheck = true; - checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test''; - - preInstall = '' - mkdir -p "$out/bin" - mkdir -p "$out/share/man/man1" - mkdir -p "$out/share/doc" - ''; - - postInstall = '' - for w in "$out/bin"/*; do - isScript "$w" || continue - wrapProgram "$w" --prefix PATH : "$out/bin" - done - ''; - - meta = { - description = "Set of tools for counting physical Source Lines of Code (SLOC)"; - - longDescription = '' - This is the home page of "SLOCCount", a set of tools for - counting physical Source Lines of Code (SLOC) in a large number - of languages of a potentially large set of programs. This suite - of tools was used in my papers More than a Gigabuck: Estimating - GNU/Linux's Size and Estimating Linux's Size to measure the SLOC - of entire GNU/Linux distributions, and my essay Linux Kernel - 2.6: It's Worth More! Others have measured Debian GNU/Linux and - the Perl CPAN library using this tool suite. - ''; - - license = lib.licenses.gpl2Plus; - - homepage = "https://www.dwheeler.com/sloccount/"; - - maintainers = [ ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/by-name/sl/sloth/package.nix b/pkgs/by-name/sl/sloth/package.nix index 8258994e546f..83c9dba28207 100644 --- a/pkgs/by-name/sl/sloth/package.nix +++ b/pkgs/by-name/sl/sloth/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sloth"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "slok"; repo = pname; rev = "v${version}"; - hash = "sha256-KMVD7uH3Yg9ThnwKKzo6jom0ctFywt2vu7kNdfjiMCs="; + hash = "sha256-qyDKM5Y8wRvqFE9rqnPePBvi/1UwR4vDRQRVTxPc6Ug="; }; - vendorHash = "sha256-j6qXUQ/Tu3VNQL5xBOHloRn5DH3KG/znCLi1s8RIoL8="; + vendorHash = "sha256-hXDwHKxmrpGR6cbHns9rARu87DqODqr8q25Iv1qFqrA="; subPackages = [ "cmd/sloth" ]; diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix index f42e722452f3..71b74b20e646 100644 --- a/pkgs/by-name/sl/slowlorust/package.nix +++ b/pkgs/by-name/sl/slowlorust/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, versionCheckHook, @@ -27,13 +25,11 @@ rustPlatform.buildRustPackage rec { --replace-fail 'version = "1.0"' 'version = "${version}"' ''; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "Lightweight slowloris (HTTP DoS) tool"; diff --git a/pkgs/by-name/sl/slskd/deps.json b/pkgs/by-name/sl/slskd/deps.json index d8efc40b1a43..afffb6a8d3dd 100644 --- a/pkgs/by-name/sl/slskd/deps.json +++ b/pkgs/by-name/sl/slskd/deps.json @@ -781,8 +781,8 @@ }, { "pname": "Soulseek", - "version": "6.5.0", - "hash": "sha256-QvWiuXMYYL+u3gez7MYP3uoDmQKljsU+oM2keyH7jD0=" + "version": "7.0.3", + "hash": "sha256-/GCUh4XJ4zs5etxQ0GjNJozkS2GZ/Qq1cot1+bRQack=" }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", @@ -1101,8 +1101,8 @@ }, { "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + "version": "4.6.0", + "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=" }, { "pname": "System.Net.Http", diff --git a/pkgs/by-name/sl/slskd/package.nix b/pkgs/by-name/sl/slskd/package.nix index 1192c5536dd0..a5bc3bedfc3c 100644 --- a/pkgs/by-name/sl/slskd/package.nix +++ b/pkgs/by-name/sl/slskd/package.nix @@ -6,26 +6,26 @@ fetchFromGitHub, fetchNpmDeps, mono, - nodejs_18, + nodejs_20, slskd, testers, nix-update-script, }: let - nodejs = nodejs_18; + nodejs = nodejs_20; # https://github.com/NixOS/nixpkgs/blob/d88947e91716390bdbefccdf16f7bebcc41436eb/pkgs/build-support/node/build-npm-package/default.nix#L62 npmHooks = buildPackages.npmHooks.override { inherit nodejs; }; in buildDotnetModule rec { pname = "slskd"; - version = "0.22.2"; + version = "0.22.5"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; tag = version; - hash = "sha256-Arf/QOq0wYely+CYwb4sJXsxB2BbEHZ2bUNyqeGbFdg="; + hash = "sha256-gLPWbRffoCJAdg8zP9idfnzqT1nIZrI88cYUd/DyxZA="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildDotnetModule rec { name = "${pname}-${version}-npm-deps"; inherit src; sourceRoot = "${src.name}/${npmRoot}"; - hash = "sha256-eCHYPkE8eJKg0IX7hN9Wm9HsWKUFPW5T4e+o6N0CsNc="; + hash = "sha256-GACe+ufxiSlS1aD9R+I8VqbZqi2gCHUp+Dm/XMx2WZQ="; }; projectFile = "slskd.sln"; diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 8323994dd7c8..2a30e3b05680 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -1,26 +1,22 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, }: rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; tag = "v${version}"; - hash = "sha256-7MPNs2vAzCo5TPJZFhd3xaZW0YbF724gfKNLB08IU8A="; + hash = "sha256-ilqIqw0N4Xsfw7ntLxoz4Ogn2e3NH8VnqAgowbvfZ+0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-eWox5NrvZr+mEGGwxYbAW5EgEOQ8WQUy2pughBlpXgM="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + cargoHash = "sha256-acWEinwYCCtoapFkL6XyASvFX4bqYS/HrKjlaAZabi4="; meta = with lib; { description = "Terminal-based HTTP/REST client"; diff --git a/pkgs/by-name/sl/slurm-nm/package.nix b/pkgs/by-name/sl/slurm-nm/package.nix index cee4e5ee8f75..13c617d79cd2 100644 --- a/pkgs/by-name/sl/slurm-nm/package.nix +++ b/pkgs/by-name/sl/slurm-nm/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Generic network load monitor"; homepage = "https://github.com/mattthias/slurm"; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "slurm"; }; diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix index a75e4751c22b..ee53bf310446 100644 --- a/pkgs/by-name/sl/slurm/package.nix +++ b/pkgs/by-name/sl/slurm/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "24.11.3.1"; + version = "24.11.5.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-DdGCPNmLCp1SgsYPVr7Gr4yqBrV2Ot3nJsWpcuYty5U="; + hash = "sha256-0c8b+quLeWpCyuCOcp/B8Yd0dxr90UtSV/tgeTi7tbk="; }; outputs = [ diff --git a/pkgs/by-name/sm/sm64coopdx/package.nix b/pkgs/by-name/sm/sm64coopdx/package.nix index 4727d240eed7..cc5a4cafa36a 100644 --- a/pkgs/by-name/sm/sm64coopdx/package.nix +++ b/pkgs/by-name/sm/sm64coopdx/package.nix @@ -10,6 +10,7 @@ SDL2, stdenv, zlib, + libGL, sm64baserom, enableCoopNet ? true, @@ -36,13 +37,13 @@ in # note: there is a generic builder in pkgs/games/sm64ex/generic.nix that is meant to help build sm64ex and its forks; however sm64coopdx has departed significantly enough in its build that it doesn't make sense to use that other than the baseRom derivation stdenv.mkDerivation (finalAttrs: { pname = "sm64coopdx"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "coop-deluxe"; repo = "sm64coopdx"; - rev = "v${finalAttrs.version}"; - hash = "sha256-QWxhu7wGIjOIJyqjqakUzhhF+WxQslZdX3aEWYdDZbw="; + rev = "v1.3"; # it seems coopdx has taken on some stylistic versioning... + hash = "sha256-ssbvNnBBxahzJRIX5Vhze+Nfh3ADoy+NrUIF2RZHye8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -54,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { python3 SDL2 zlib + libGL ]; enableParallelBuilding = true; @@ -114,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.shelvacu ]; mainProgram = "sm64coopdx"; homepage = "https://sm64coopdx.com/"; - changelog = "https://github.com/coop-deluxe/sm64coopdx/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/coop-deluxe/sm64coopdx/releases/tag/v1.3"; sourceProvenance = with lib.sourceTypes; [ fromSource # The lua engine, discord sdk, and coopnet library are vendored pre-built. See https://github.com/coop-deluxe/sm64coopdx/tree/v1.0.3/lib diff --git a/pkgs/by-name/sm/sm64ex/package.nix b/pkgs/by-name/sm/sm64ex/package.nix index 7a2ea046d59a..b71395284a21 100644 --- a/pkgs/by-name/sm/sm64ex/package.nix +++ b/pkgs/by-name/sm/sm64ex/package.nix @@ -7,6 +7,7 @@ pkg-config, audiofile, SDL2, + libGL, hexdump, sm64baserom, region ? "us", @@ -18,13 +19,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "sm64ex"; - version = "0-unstable-2024-07-04"; + version = "0-unstable-2024-12-17"; src = fetchFromGitHub { owner = "sm64pc"; repo = "sm64ex"; - rev = "20bb444562aa1dba79cf6adcb5da632ba580eec3"; - hash = "sha256-nw+F0upTetLqib5r5QxmcOauSJccpTydV3soXz9CHLQ="; + rev = "d7ca2c04364a6dd0dac58b47151e04e26887e6f0"; + hash = "sha256-n3ecY97UB/fdTZpy78CB4DxyHyjK+L6AAuNpvnmVoss="; }; patches = lib.optionals _60fps [ @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ audiofile SDL2 + libGL ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/sm/smartcat/package.nix b/pkgs/by-name/sm/smartcat/package.nix index a06d2d8b151a..77f38f36f665 100644 --- a/pkgs/by-name/sm/smartcat/package.nix +++ b/pkgs/by-name/sm/smartcat/package.nix @@ -3,10 +3,8 @@ fetchFromGitHub, rustPlatform, - darwin, openssl, pkg-config, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -27,15 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = { description = "Integrate large language models into the command line"; diff --git a/pkgs/by-name/sm/smartgit/package.nix b/pkgs/by-name/sm/smartgit/package.nix index a833e4d0ff05..15b19494541c 100644 --- a/pkgs/by-name/sm/smartgit/package.nix +++ b/pkgs/by-name/sm/smartgit/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "smartgit"; - version = "24.1.2"; + version = "24.1.3"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${ builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }.tar.gz"; - hash = "sha256-bPiPb/k5f9dRpwm4Wj+c2mhFhH9WOz2hzKeDfQLRLHQ="; + hash = "sha256-YhgE1Y0L8lzefJnvswKwIFnx6XIo40DszAr/cxOoOds="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; @@ -48,9 +48,7 @@ stdenv.mkDerivation (finalAttrs: { libXtst ] } \ - --prefix JRE_HOME : ${jre} \ - --prefix JAVA_HOME : ${jre} \ - --prefix SMARTGITHG_JAVA_HOME : ${jre} \ + --prefix SMARTGIT_JAVA_HOME : ${jre} \ ) # add missing shebang for start script sed -i $out/bin/smartgit \ @@ -106,9 +104,13 @@ stdenv.mkDerivation (finalAttrs: { Command line Git is required. ''; homepage = "https://www.syntevo.com/smartgit/"; - changelog = "https://www.syntevo.com/smartgit/changelog.txt"; + changelog = "https://www.syntevo.com/smartgit/changelog-${lib.versions.majorMinor finalAttrs.version}.txt"; license = lib.licenses.unfree; + mainProgram = "smartgit"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jraygauthier ]; + maintainers = with lib.maintainers; [ + jraygauthier + tmssngr + ]; }; }) diff --git a/pkgs/by-name/sm/smartmontools/package.nix b/pkgs/by-name/sm/smartmontools/package.nix new file mode 100644 index 000000000000..dbb319ff8d5c --- /dev/null +++ b/pkgs/by-name/sm/smartmontools/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + enableMail ? false, + gnused, + hostname, + mailutils, + systemdLibs, +}: + +let + dbrev = "5714"; + drivedbBranch = "RELEASE_7_5_DRIVEDB"; + driverdb = fetchurl { + url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; + sha256 = "sha256-DndzUHpZex3F9WXYq+kNDWvkLNc1OZX3KR0mby5cKbA="; + name = "smartmontools-drivedb.h"; + }; + scriptPath = lib.makeBinPath ( + [ + gnused + hostname + ] + ++ lib.optionals enableMail [ mailutils ] + ); + +in +stdenv.mkDerivation rec { + pname = "smartmontools"; + version = "7.5"; + + src = fetchurl { + url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; + hash = "sha256-aQuDyjMTeNqeoNnWEAjEsi3eOROHubutfyk4fyWV924="; + }; + + patches = [ + # fixes darwin build + ./smartmontools.patch + ]; + postPatch = '' + cp -v ${driverdb} drivedb.h + ''; + + configureFlags = [ + "--with-scriptpath=${scriptPath}" + # does not work on NixOS + "--without-update-smart-drivedb" + ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform systemdLibs) [ systemdLibs ]; + enableParallelBuilding = true; + + meta = with lib; { + description = "Tools for monitoring the health of hard drives"; + homepage = "https://www.smartmontools.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ Frostman ]; + platforms = with platforms; linux ++ darwin; + mainProgram = "smartctl"; + }; +} diff --git a/pkgs/tools/system/smartmontools/smartmontools.patch b/pkgs/by-name/sm/smartmontools/smartmontools.patch similarity index 100% rename from pkgs/tools/system/smartmontools/smartmontools.patch rename to pkgs/by-name/sm/smartmontools/smartmontools.patch diff --git a/pkgs/by-name/sm/smartsynchronize/package.nix b/pkgs/by-name/sm/smartsynchronize/package.nix new file mode 100644 index 000000000000..5dffdf8e96b8 --- /dev/null +++ b/pkgs/by-name/sm/smartsynchronize/package.nix @@ -0,0 +1,104 @@ +{ + lib, + stdenv, + fetchurl, + makeDesktopItem, + openjdk21, + gtk3, + glib, + adwaita-icon-theme, + wrapGAppsHook3, + libXtst, + which, +}: +let + jre = openjdk21; +in +stdenv.mkDerivation (finalAttrs: { + pname = "smartsynchronize"; + version = "4.6.1"; + + src = fetchurl { + url = "https://www.syntevo.com/downloads/smartsynchronize/smartsynchronize-linux-${ + builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version + }.tar.gz"; + hash = "sha256-oc1GFwiA6LPbCsCsGGENEz9ktcu0NINfQ9dsL27VIpI="; + }; + + nativeBuildInputs = [ wrapGAppsHook3 ]; + + buildInputs = [ + jre + adwaita-icon-theme + gtk3 + ]; + + preFixup = '' + gappsWrapperArgs+=( \ + --prefix PATH : ${ + lib.makeBinPath [ + jre + which + ] + } \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + gtk3 + glib + libXtst + ] + } \ + --prefix JAVA_HOME : ${jre} \ + ) + ''; + + installPhase = '' + runHook preInstall + + mkdir -pv $out/{bin,share/applications,share/icons/hicolor/scalable/apps/} + cp -av ./lib $out/ + cp -av bin/smartsynchronize.sh $out/bin/smartsynchronize + + cp -av $desktopItem/share/applications/* $out/share/applications/ + for icon_size in 32 48 64 128 256; do + path=$icon_size'x'$icon_size + icon=bin/smartsynchronize-$icon_size.png + mkdir -p $out/share/icons/hicolor/$path/apps + cp $icon $out/share/icons/hicolor/$path/apps/smartsynchronize.png + done + + cp -av bin/smartsynchronize.svg $out/share/icons/hicolor/scalable/apps/ + + runHook postInstall + ''; + + desktopItem = makeDesktopItem { + name = "smartsynchronize"; + exec = "smartsynchronize"; + comment = finalAttrs.meta.description; + icon = "smartsynchronize"; + desktopName = "SmartSynchronize"; + categories = [ "Development" ]; + startupNotify = true; + startupWMClass = "smartsynchronize"; + keywords = [ + "compare" + "file manager" + ]; + }; + + meta = { + description = "File Manager, File/Directory Compare"; + longDescription = '' + SmartSynchronize is a dual-pane, keyboard-centric, multi-platform file manager. + It also is known for its file compare, directory compare and file merge. + SmartSynchronize is free to use for active Open Source developers and users from academic institutions. + ''; + homepage = "https://www.syntevo.com/smartsynchronize/"; + changelog = "https://www.syntevo.com/smartsynchronize/changelog-${lib.versions.majorMinor finalAttrs.version}.txt"; + license = lib.licenses.unfree; + mainProgram = "smartsynchronize"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ tmssngr ]; + }; +}) diff --git a/pkgs/by-name/sm/smbclient-ng/package.nix b/pkgs/by-name/sm/smbclient-ng/package.nix index 75446d790a61..eb79e6f28a16 100644 --- a/pkgs/by-name/sm/smbclient-ng/package.nix +++ b/pkgs/by-name/sm/smbclient-ng/package.nix @@ -19,6 +19,7 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "impacket" "pefile" + "rich" ]; build-system = with python3.pkgs; [ poetry-core ]; @@ -30,6 +31,9 @@ python3.pkgs.buildPythonApplication rec { rich ]; + # Project has no unit tests + doCheck = false; + pythonImportsCheck = [ "smbclientng" ]; meta = { diff --git a/pkgs/by-name/sm/smc-fuzzer/package.nix b/pkgs/by-name/sm/smc-fuzzer/package.nix index 7d10da09bed5..255182141c8d 100644 --- a/pkgs/by-name/sm/smc-fuzzer/package.nix +++ b/pkgs/by-name/sm/smc-fuzzer/package.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { hash = "sha256-FyiFSVeO46UnBrpC8AhSuGe7alo37pT8J1qQWGPqV2U="; }; - buildInputs = [ swiftPackages.apple_sdk.frameworks.AppKit ]; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/sm/smeagol/package.nix b/pkgs/by-name/sm/smeagol/package.nix new file mode 100644 index 000000000000..52aa642aee0a --- /dev/null +++ b/pkgs/by-name/sm/smeagol/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "smeagol"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "AustinWise"; + repo = "smeagol"; + tag = finalAttrs.version; + hash = "sha256-ILZ4TRL5yRGZuyyNPIpMgnlBGQAwbtTFlTaN3UYb5ls="; + }; + + cargoHash = "sha256-5OSrxm+NpuimE8Jwl5/VScKjuYNROX50KNiyBMZqCOw="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/smeagol-wiki"; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Locally hosted wiki"; + homepage = "https://smeagol.dev/"; + changelog = "https://github.com/AustinWise/smeagol/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "smeagol-wiki"; + }; +}) diff --git a/pkgs/by-name/sm/smem/package.nix b/pkgs/by-name/sm/smem/package.nix index 70ef87692d0c..beb89c1bda6a 100644 --- a/pkgs/by-name/sm/smem/package.nix +++ b/pkgs/by-name/sm/smem/package.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m"; }; - buildInputs = [ python3 ]; + buildInputs = [ + (python3.withPackages (pp: [ pp.matplotlib ])) + ]; makeFlags = [ "smemcap" ]; diff --git a/pkgs/by-name/sm/smlfmt/package.nix b/pkgs/by-name/sm/smlfmt/package.nix index 6eed84bd0bb5..cfe0692d79ec 100644 --- a/pkgs/by-name/sm/smlfmt/package.nix +++ b/pkgs/by-name/sm/smlfmt/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "smlfmt"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "shwestrick"; repo = "smlfmt"; rev = "v${version}"; - hash = "sha256-qwhYOZrck028NliPDnqFZel3IxopQzouhHq6R7DkfPE="; + hash = "sha256-QdpEsypkCzR/OwllKFLjz3/JvzV0OlGiqXUnS7iGD5A="; }; nativeBuildInputs = [ mlton ]; diff --git a/pkgs/by-name/sm/smpeg2/package.nix b/pkgs/by-name/sm/smpeg2/package.nix index 983d28d30334..ad1912931c3e 100644 --- a/pkgs/by-name/sm/smpeg2/package.nix +++ b/pkgs/by-name/sm/smpeg2/package.nix @@ -3,7 +3,6 @@ stdenv, autoconf, automake, - darwin, fetchFromGitHub, makeWrapper, pkg-config, @@ -28,7 +27,7 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = [ SDL2 ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.libobjc; + buildInputs = [ SDL2 ]; outputs = [ "out" diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix new file mode 100644 index 000000000000..cbcc7e673820 --- /dev/null +++ b/pkgs/by-name/sm/smpmgr/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "smpmgr"; + version = "0.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "intercreate"; + repo = "smpmgr"; + tag = version; + hash = "sha256-HNL9e3D/uZwJI0d4escbhe51zKH7hBFAnCGZZuZdla4="; + }; + + build-system = with python3Packages; [ + poetry-core + poetry-dynamic-versioning + ]; + + pythonRelaxDeps = [ + "typer" + "smpclient" + ]; + + dependencies = with python3Packages; [ + readchar + smpclient + typer + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + pythonImportsCheck = [ "smpmgr" ]; + + meta = { + description = "Simple Management Protocol (SMP) Manager for remotely managing MCU firmware"; + homepage = "https://github.com/intercreate/smpmgr"; + changelog = "https://github.com/intercreate/smpmgr/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ otavio ]; + mainProgram = "smpmgr"; + }; +} diff --git a/pkgs/by-name/sm/smpq/package.nix b/pkgs/by-name/sm/smpq/package.nix index e32f27e6fd63..817b2077d04b 100644 --- a/pkgs/by-name/sm/smpq/package.nix +++ b/pkgs/by-name/sm/smpq/package.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "smpq"; maintainers = with lib.maintainers; [ aanderse - karolchmist ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/sm/smtp4dev/deps.json b/pkgs/by-name/sm/smtp4dev/deps.json index 3ef4f7e70fd6..a3e7e8fa90f8 100644 --- a/pkgs/by-name/sm/smtp4dev/deps.json +++ b/pkgs/by-name/sm/smtp4dev/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Ardalis.GuardClauses", - "version": "4.5.0", - "hash": "sha256-YqVmWM9f57Lof1e1dUWoIig7D2M9G/c2slUNicCX6Hg=" + "version": "5.0.0", + "hash": "sha256-jQOXJzEIRzPVEFTcbdCNj450hbpSTrIbYSi5m2Q5MEo=" }, { "pname": "AspNetCore.Authentication.Basic", @@ -11,8 +11,8 @@ }, { "pname": "BouncyCastle.Cryptography", - "version": "2.3.0", - "hash": "sha256-TIBOegJAEfFRyvtwuPakvKsQbqoPHj1RSTmK7SKYsf0=" + "version": "2.5.1", + "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" }, { "pname": "CommandLiners", @@ -26,13 +26,13 @@ }, { "pname": "DeepEqual", - "version": "5.0.0", - "hash": "sha256-tkmNXgjD+wS65uIqTqDQgRupq9EwW1JZwpobChwTjYM=" + "version": "5.1.0", + "hash": "sha256-AGPZXr7FJdEEVYtQ9I2BOHG/x8cU7s0euy+XvovOHpA=" }, { "pname": "dotnet-ef", - "version": "8.0.4", - "hash": "sha256-9mxOR/6SU5sqBiWYNNMM8aah81XnfahEAg24/5Skn4A=" + "version": "8.0.15", + "hash": "sha256-a/Wb9PIfyBLs0d8VOUQdEvxk73i8nlvd1kCCqOpEHs8=" }, { "pname": "DotNet.Glob", @@ -41,18 +41,23 @@ }, { "pname": "EntityFramework", - "version": "6.3.0", - "hash": "sha256-rh9cBlFA5NlFoppMMULpM0SSRQtKeDr10Caa/+GGTSY=" + "version": "6.5.0", + "hash": "sha256-WZ4AI6XjyMMIDw6y3ggz5lym4ihmFTndInt35ij9E0k=" }, { "pname": "Esprima", "version": "3.0.4", "hash": "sha256-KyZHjy7QTh3WRdY/fUrqrcaoZOa0RnUAUFLTzSOBVYA=" }, + { + "pname": "FSharp.Core", + "version": "8.0.200", + "hash": "sha256-wjYiedFiqOTKaM4mF6uT9kc/yKDJ78mqfw9qLoBFHOw=" + }, { "pname": "HtmlAgilityPack", - "version": "1.11.61", - "hash": "sha256-exRJTP7mHNt31CKaejKSSkKPm74ratfnpGl50AqZwlY=" + "version": "1.12.1", + "hash": "sha256-qravAvCdB/KjWujRk2GL/kGre/B9XVAP+jewICxiKKo=" }, { "pname": "Humanizer.Core", @@ -64,25 +69,30 @@ "version": "3.0.1", "hash": "sha256-oOq7ze1QFYHK/9zNDF7ClbWZaW4A/478M4yQ/LQnUJ8=" }, + { + "pname": "Linq.Expression.Optimizer", + "version": "1.0.29", + "hash": "sha256-F0ZvZ6hbdnjkuNuSoFzSjYUgG/hEHuG7o8wExDS1LLo=" + }, { "pname": "LinqKit", - "version": "1.2.5", - "hash": "sha256-rF1/FIR41PrwZX4N6bkhXNG2BQsXbjZmx8/qfVdKiAI=" + "version": "1.3.8", + "hash": "sha256-kX82JIKz2mNK11na8M84ChWgrdBhhB0Zd+JhL4FmR1U=" }, { "pname": "LinqKit.Core", - "version": "1.2.5", - "hash": "sha256-0z4RpAt+WvydeCN0GJu4vsMfCxzxmoi+LTE6fQ51NZY=" + "version": "1.2.8", + "hash": "sha256-7PTxzw8n3vpmNKJlumOwL5eWGM7nmdC4oomPTKlm7LE=" }, { "pname": "MailKit", - "version": "4.5.0", - "hash": "sha256-quU88XNBF+tzb1yr7+lSfx90kmvZpbX43+YJtdYgPzk=" + "version": "4.11.0", + "hash": "sha256-T41OHePMaYkd7rRP2ytMfEjaD+bpJ65yWBJJuvs7y18=" }, { "pname": "Microsoft.AspNetCore.Hosting.WindowsServices", - "version": "8.0.4", - "hash": "sha256-sK7ZOyoQv/bwmaJLK0Dk7kGDJAFlIwUxVhru8kwvea0=" + "version": "8.0.15", + "hash": "sha256-HqNCXJfBZxbtCf94EirLczAl8bsHhmIAzFIFsEjBspE=" }, { "pname": "Microsoft.AspNetCore.SpaServices.Extensions", @@ -94,11 +104,6 @@ "version": "6.0.0", "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "8.0.0", - "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" - }, { "pname": "Microsoft.Build", "version": "15.7.0-preview-000011-1378327", @@ -126,18 +131,18 @@ }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.4", - "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + "version": "3.3.3", + "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY=" }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.9.2", - "hash": "sha256-QU/nyiJWpdPQGHBdaOEVc+AghnGHcKBFBX0oyhRZ9CQ=" + "version": "4.5.0", + "hash": "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.9.2", - "hash": "sha256-j06Q4A9E65075SBXdXVCMRgeLxA63Rv1vxarydmmVAA=" + "version": "4.5.0", + "hash": "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A=" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", @@ -156,53 +161,53 @@ }, { "pname": "Microsoft.CSharp", - "version": "4.6.0", - "hash": "sha256-16OdEKbPLxh+jLYS4cOiGRX/oU6nv3KMF4h5WnZAsHs=" + "version": "4.7.0", + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" }, { "pname": "Microsoft.Data.Sqlite.Core", - "version": "8.0.4", - "hash": "sha256-bbKpSaEHKYezjxSZECmDQr0gv9zYTN042dpuYQtZKQ4=" + "version": "8.0.15", + "hash": "sha256-JWnPERvxWL+5n0dQh+s9zhkWL1gnGexq8LpBszAIaco=" }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "8.0.4", - "hash": "sha256-nkrtoqGn43RdVjSlwa/jzLaixnZ1CNDDTvvSubUmR5E=" + "version": "8.0.15", + "hash": "sha256-C5TRzSpdH11L+slXG3Gxmhtjl76DGlaKl3G9k9G6giQ=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "8.0.4", - "hash": "sha256-ywVWOje6duVcJ8gSSC5HER2UO0mAzfg6VMtqloRmQfc=" + "version": "8.0.15", + "hash": "sha256-QM0bhIyoBR8j9epa8eoFhtf/fA7u2dW3vU1tfneNsr0=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "8.0.4", - "hash": "sha256-Kqv9ZFl1nMJ1hRmT3kQbN5vSvMrRSZ5XOF9wzw5sS8A=" + "version": "8.0.15", + "hash": "sha256-SVQd3sX0TjNz1kXN4PVWdThyyWpzE8JC0ch5vKVSDKE=" }, { "pname": "Microsoft.EntityFrameworkCore.Design", - "version": "8.0.4", - "hash": "sha256-TjDkQOUSFIM5OOFcm4+yNiXmAiKgs8Q3XpJl9eTEJdo=" + "version": "8.0.15", + "hash": "sha256-G+A43Fv8cqdbg3SKewEKs2NTItBCjELdhVQCtYwEu3U=" }, { "pname": "Microsoft.EntityFrameworkCore.InMemory", - "version": "8.0.4", - "hash": "sha256-m0zvYVaD72UVHnOc7Ea0/FwoVw/FhqKVladnacHkQlc=" + "version": "8.0.15", + "hash": "sha256-iQwlHSclsftdgYnlYODBbeP1I9mWiVM8f3whPtWYrtk=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "8.0.4", - "hash": "sha256-TRP/Ior708EQjD03GGxKom2eLOxcUYN1MoFqzk3lYp8=" + "version": "8.0.15", + "hash": "sha256-U+pLbWgYmi+2JhGUkYa/ZdU89IutJewGRNA3TrP4vjk=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite", - "version": "8.0.4", - "hash": "sha256-/IOzElVUh6k2eiTiMHhsdTSsBx4j3whX1lWSMgFYMUE=" + "version": "8.0.15", + "hash": "sha256-Pc7/YnigKXfAZQE1Rb2awo1YHYz48knv7WMeaKP9QjY=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", - "version": "8.0.4", - "hash": "sha256-gC8yod0XV1/xZAk1PDqTf+QlzJAOjj6kT8mJZ9LvQF0=" + "version": "8.0.15", + "hash": "sha256-MwbVFf22PLUZvMxAm5+ooAoYP7UsPvnX6mYkU4C9RLU=" }, { "pname": "Microsoft.Extensions.ApiDescription.Server", @@ -216,8 +221,8 @@ }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "8.0.0", - "hash": "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8=" + "version": "8.0.1", + "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps=" }, { "pname": "Microsoft.Extensions.Configuration", @@ -239,10 +244,20 @@ "version": "8.0.0", "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.0", + "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" + }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "8.0.0", - "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" + "version": "8.0.2", + "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "9.0.0", + "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU=" }, { "pname": "Microsoft.Extensions.Configuration.CommandLine", @@ -256,18 +271,18 @@ }, { "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "8.0.0", - "hash": "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs=" + "version": "8.0.1", + "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA=" }, { "pname": "Microsoft.Extensions.Configuration.Json", - "version": "8.0.0", - "hash": "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg=" + "version": "8.0.1", + "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig=" }, { "pname": "Microsoft.Extensions.Configuration.UserSecrets", - "version": "8.0.0", - "hash": "sha256-/yj5QaEzeRStvOFoBpPRPXlEehGtr2E6/rJb+OEPIK8=" + "version": "8.0.1", + "hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0=" }, { "pname": "Microsoft.Extensions.DependencyInjection", @@ -279,6 +294,11 @@ "version": "8.0.0", "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "8.0.1", + "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU=" + }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "6.0.0", @@ -291,24 +311,34 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.1", - "hash": "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM=" + "version": "8.0.2", + "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" }, { "pname": "Microsoft.Extensions.DependencyModel", - "version": "8.0.0", - "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo=" + "version": "8.0.2", + "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "9.0.0", + "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94=" }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "8.0.0", - "hash": "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4=" + "version": "8.0.1", + "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", "version": "8.0.0", "hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY=" }, + { + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "8.0.1", + "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0=" + }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", "version": "2.1.0-preview1-final", @@ -361,18 +391,23 @@ }, { "pname": "Microsoft.Extensions.Hosting", - "version": "8.0.0", - "hash": "sha256-sKHa+w4/pMeQb5RRFqLtMTUJy5H6hSIGWchbH2pxSrg=" + "version": "8.0.1", + "hash": "sha256-FFLo6em0N2vaWg6//vaQhxoOgT9LLH5Y2KWkCeX5xQ4=" }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", "version": "8.0.0", "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE=" }, + { + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "8.0.1", + "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA=" + }, { "pname": "Microsoft.Extensions.Hosting.WindowsServices", - "version": "8.0.0", - "hash": "sha256-+uYKf6LT/wN7UrHSgJ3diIqVKCi214yJQgh5oXqYi/c=" + "version": "8.0.1", + "hash": "sha256-JBrZuv1RxpJf5wR81g91bE1/JQgBeOtnJDvA98rlYKE=" }, { "pname": "Microsoft.Extensions.Logging", @@ -384,6 +419,11 @@ "version": "8.0.0", "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "8.0.1", + "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" + }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "6.0.0", @@ -396,33 +436,38 @@ }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "8.0.1", - "hash": "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U=" + "version": "8.0.2", + "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.3", + "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q=" }, { "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "8.0.0", - "hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U=" + "version": "8.0.1", + "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE=" }, { "pname": "Microsoft.Extensions.Logging.Console", - "version": "8.0.0", - "hash": "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c=" + "version": "8.0.1", + "hash": "sha256-2thhF1JbDNj3Bx2fcH7O26uHGNeMd9MYah6N60lIpIU=" }, { "pname": "Microsoft.Extensions.Logging.Debug", - "version": "8.0.0", - "hash": "sha256-AJunzYBZM2wCg86hnPnMrBuWIIyW/4PnIVoDSU969cA=" + "version": "8.0.1", + "hash": "sha256-gKFqBg5lbjy5VBEcAuoQ/SsXAxvrYdBYOu9dV60eJKg=" }, { "pname": "Microsoft.Extensions.Logging.EventLog", - "version": "8.0.0", - "hash": "sha256-vXBm4yhWGP4uow0CqstuqOkxO8yeZEM15JTTenjPbhc=" + "version": "8.0.1", + "hash": "sha256-1UkEOwl3Op2b3jTvpI10hHxIe9FqeVVy+VB1tZp6Lc8=" }, { "pname": "Microsoft.Extensions.Logging.EventSource", - "version": "8.0.0", - "hash": "sha256-kaR7YOlq5s8W9nZDtH/lKtnfGbrgOuQY4DUPcA2lcj0=" + "version": "8.0.1", + "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA=" }, { "pname": "Microsoft.Extensions.Options", @@ -434,6 +479,11 @@ "version": "8.0.0", "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" }, + { + "pname": "Microsoft.Extensions.Options", + "version": "8.0.2", + "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" + }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", "version": "8.0.0", @@ -459,6 +509,11 @@ "version": "8.0.0", "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.0", + "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=" + }, { "pname": "Microsoft.NETCore.App", "version": "2.0.0", @@ -496,8 +551,8 @@ }, { "pname": "Microsoft.NETCore.Platforms", - "version": "3.0.0", - "hash": "sha256-ocB+U+mMvi/xVwII7bGsIfAqSXiKVSnEMLHCODLJaK4=" + "version": "3.1.0", + "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0=" }, { "pname": "Microsoft.NETCore.Targets", @@ -509,10 +564,25 @@ "version": "1.1.0", "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies", + "version": "1.0.3", + "hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net45", + "version": "1.0.3", + "hash": "sha256-I6n5TqPiy4jNg0GvdbgRxvtcuCUW/Glule1GICeRKOM=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net46", + "version": "1.0.3", + "hash": "sha256-3Lt5uzho2/u2TGQxFvqmPYiO6ezLoMTpZemZLtfE410=" + }, { "pname": "Microsoft.TypeScript.MSBuild", - "version": "5.4.4", - "hash": "sha256-bE1F3XgGxF0g+zX8TLx0glAVK57k8ITRe/NI4Tf8mxw=" + "version": "5.8.1", + "hash": "sha256-5x81TEhXaEEYnBeosK8zmBwPLKPifMf4JUFrGsk/IxA=" }, { "pname": "Microsoft.VisualStudio.Web.CodeGeneration.Contracts", @@ -541,23 +611,18 @@ }, { "pname": "Microsoft.Win32.Registry", - "version": "4.5.0", - "hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0=" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "4.6.0", - "hash": "sha256-Wrj0Sc9srH5+ma0lCbgRYYP6gKgnlXcL6h7j7AU6nkQ=" + "version": "4.7.0", + "hash": "sha256-+jWCwRqU/J/jLdQKDFm93WfIDrDMXMJ984UevaQMoi8=" }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "4.6.0", - "hash": "sha256-7BRoIg1Hm/OVHZBPGD+eugyyMTZHhmv0yLTV3HWOFd4=" + "version": "6.0.0", + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" }, { "pname": "MimeKit", - "version": "4.5.0", - "hash": "sha256-Nsk3Br9yLOC5wDLtRQyw04Kq205y5QCISpyiB13mwLU=" + "version": "4.11.0", + "hash": "sha256-UTP+pfP3q4X65/KNGBTkHo4KZjeHZ10dQbr58Qf42iQ=" }, { "pname": "Mono.Options", @@ -571,8 +636,8 @@ }, { "pname": "Namotion.Reflection", - "version": "3.1.1", - "hash": "sha256-WXHT/prJSLS7yRoepu5pls5xe58pCbR6S8VjuR5uJR0=" + "version": "3.3.0", + "hash": "sha256-YBYWLYmnCZrKfiJWQo7tofiz2A7ROpxFfAYdYLa5cgI=" }, { "pname": "NETStandard.Library", @@ -586,8 +651,8 @@ }, { "pname": "NETStandard.Library", - "version": "2.0.1", - "hash": "sha256-s4UiH848a+p2yWwMH+8PaYGnQL2qnY0GmixoeLvkhDQ=" + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" }, { "pname": "Newtonsoft.Json", @@ -601,64 +666,59 @@ }, { "pname": "NJsonSchema", - "version": "11.0.0", - "hash": "sha256-MK/i30Y6lXotOKNDBZA7koeOVlcI5V9AQ5ZzxjHWxwo=" + "version": "11.2.0", + "hash": "sha256-Y1FggfzRf54+ioMKvyyzMW30psrHF7hmAwnYom/Ud8s=" }, { "pname": "NJsonSchema.Annotations", - "version": "11.0.0", - "hash": "sha256-AVOWOj94Zw9DzpT07YebJa79/fCvRWa7E7zYG5e+/6w=" + "version": "11.2.0", + "hash": "sha256-uQYU/NuAbz+HlImemuv1Yi4ODKoaQ38BSrWONOR9jFs=" }, { "pname": "NJsonSchema.NewtonsoftJson", - "version": "11.0.0", - "hash": "sha256-ddnWplAPnLE9rDMm10f7FceY8bE/T8MpbOuiVPo3wsU=" + "version": "11.2.0", + "hash": "sha256-NyXB3rcdPpjaZq0CAZy5xMmvLqqzPGyddeTVtowqaBU=" }, { "pname": "NJsonSchema.Yaml", - "version": "11.0.0", - "hash": "sha256-MkUdfh/erCTFO0mgkKj1kWEKgie6rJtiwV1emsvYJzc=" + "version": "11.2.0", + "hash": "sha256-NtlUldW5D0VSj10XqfMvxDMVULdw99owTS1zGYg4aKg=" }, { "pname": "NSwag.Annotations", - "version": "14.0.7", - "hash": "sha256-fQIIREC86xdjGvjPyV/vvHnZmcgtmFSG9SilgSO78ek=" + "version": "14.3.0", + "hash": "sha256-kz+fEwUlEjsPsOiFCTcXYHAAYCJa2cepDRIY4mkye4U=" }, { "pname": "NSwag.AspNetCore", - "version": "14.0.7", - "hash": "sha256-EOJrEUq1kgx0JvmTmcR6oRWk3Ci68kYhByVrZlBLtwA=" + "version": "14.3.0", + "hash": "sha256-lGeH27yzj5fXPpBMqtoFOTRiu+gve8oSgugW2u4tMAk=" }, { "pname": "NSwag.Core", - "version": "14.0.7", - "hash": "sha256-t42U+Zl2QcfsvEWJGg6A3f+OWbenu/itjrnS8loszH4=" + "version": "14.3.0", + "hash": "sha256-FjWms/V5+j4ut1TShKWDsTr1LuBsHxRQIFs1fwD0jGw=" }, { "pname": "NSwag.Core.Yaml", - "version": "14.0.7", - "hash": "sha256-hGCff58hTcv9y4b8Dx3P7GhC5r8A5SyJaxACtS4yTK0=" + "version": "14.3.0", + "hash": "sha256-CcGXuyNUvF/e3f9K3wZY+h0RIbzoLOLLguUcj+VVFXI=" }, { "pname": "NSwag.Generation", - "version": "14.0.7", - "hash": "sha256-nmYwfjwvkkozItdoNqIuNS/9BI2i6dPpVCxu16m0T8w=" + "version": "14.3.0", + "hash": "sha256-M487C7OsnZnURcAN90DGIhZTnxlToaIskkztCKkXzQc=" }, { "pname": "NSwag.Generation.AspNetCore", - "version": "14.0.7", - "hash": "sha256-Jsa5MT9LjY7GVMIi/QTyP2de7BW+tu809dm1RPA2mdA=" + "version": "14.3.0", + "hash": "sha256-DvjSjbM2ug0AvjAE8CwVUej2hZbLWopmZMbOx4Oy2IU=" }, { "pname": "NuGet.Frameworks", "version": "4.7.0-preview1-4986", "hash": "sha256-B8Fax4r73AjdTbcV3mF9dPGAV4P++UMUh2cbItNk0JE=" }, - { - "pname": "Rnwood.LumiSoft.Net", - "version": "1.0.2", - "hash": "sha256-Ud4K6lN2QMQXUUZn157HaPd2MtHTrKNmGBZn8N2hwxo=" - }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", @@ -689,11 +749,6 @@ "version": "4.3.0", "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" - }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.3.0", @@ -776,8 +831,8 @@ }, { "pname": "runtime.native.System.Data.SqlClient.sni", - "version": "4.6.0", - "hash": "sha256-TenFWtugim8xFtilE3Z9br0FPnLCosdLQ5DV1uW3448=" + "version": "4.7.0", + "hash": "sha256-cj0+BpmoibwOWj2wNXwONJeTGosmFwhD349zPjNaBK0=" }, { "pname": "runtime.native.System.IO.Compression", @@ -941,13 +996,13 @@ }, { "pname": "Serilog", - "version": "3.1.1", - "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI=" + "version": "4.2.0", + "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs=" }, { "pname": "Serilog.AspNetCore", - "version": "8.0.1", - "hash": "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4=" + "version": "8.0.3", + "hash": "sha256-ZyBlauyG/7CLTqrbhRalmayFd99d7bimNTMw4hXDR2I=" }, { "pname": "Serilog.Extensions.Hosting", @@ -966,13 +1021,13 @@ }, { "pname": "Serilog.Settings.Configuration", - "version": "8.0.0", - "hash": "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg=" + "version": "9.0.0", + "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I=" }, { "pname": "Serilog.Sinks.Console", - "version": "5.0.1", - "hash": "sha256-aveoZM25ykc2haBHCXWD09jxZ2t2tYIGmaNTaO2V0jI=" + "version": "6.0.0", + "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro=" }, { "pname": "Serilog.Sinks.Debug", @@ -981,8 +1036,8 @@ }, { "pname": "Serilog.Sinks.EventLog", - "version": "3.1.0", - "hash": "sha256-oAzpAdcF9Hdf99JjpbWvgYa5BkN+Ec4gc7SPHFVH7As=" + "version": "4.0.0", + "hash": "sha256-ccSnzL/I4gZoL2xH5Y9Q9zoP7iV8+n95wNQ/JOP3vOg=" }, { "pname": "Serilog.Sinks.File", @@ -1009,6 +1064,11 @@ "version": "2.1.6", "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8=" }, + { + "pname": "StreamLib", + "version": "0.12.0", + "hash": "sha256-oAsRU/n575cgAms0AngignhSYPWfVvWvnThYLFz+cNU=" + }, { "pname": "System.AppContext", "version": "4.1.0", @@ -1024,11 +1084,6 @@ "version": "4.3.0", "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" - }, { "pname": "System.CodeDom", "version": "4.4.0", @@ -1036,8 +1091,8 @@ }, { "pname": "System.CodeDom", - "version": "4.6.0", - "hash": "sha256-nKJQMD3qFkNX+J+aXOjsSVloB1CbZ3QNLb96Xiz7wK0=" + "version": "6.0.0", + "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ=" }, { "pname": "System.Collections", @@ -1066,8 +1121,8 @@ }, { "pname": "System.Collections.Immutable", - "version": "8.0.0", - "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + "version": "6.0.0", + "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" }, { "pname": "System.Collections.NonGeneric", @@ -1089,11 +1144,6 @@ "version": "4.3.0", "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU=" }, - { - "pname": "System.ComponentModel.Annotations", - "version": "4.6.0", - "hash": "sha256-dn91soWaR30tghqyv3oIjc0UgMAnuErwG0oXRKFdl0w=" - }, { "pname": "System.ComponentModel.Annotations", "version": "5.0.0", @@ -1141,8 +1191,8 @@ }, { "pname": "System.Configuration.ConfigurationManager", - "version": "4.6.0", - "hash": "sha256-x54SBQYZLkU5AcCMOqx5VR6jM/43E2JFL894UtPAxE4=" + "version": "6.0.1", + "hash": "sha256-U/0HyekAZK5ya2VNfGA1HeuQyJChoaqcoIv57xLpzLQ=" }, { "pname": "System.Console", @@ -1151,8 +1201,8 @@ }, { "pname": "System.Data.SqlClient", - "version": "4.7.0", - "hash": "sha256-fckcu7RCKtndbfbIvBKnOb2xgr8bZKZ5B2mx0pBRwZw=" + "version": "4.8.6", + "hash": "sha256-Qc/yco3e0+6jP8UiMA0ERlfSEKdINv0BmHixh9Z8fJQ=" }, { "pname": "System.Diagnostics.Contracts", @@ -1186,13 +1236,13 @@ }, { "pname": "System.Diagnostics.EventLog", - "version": "4.5.0", - "hash": "sha256-tKBKgUhEM6D7XJlzmHc/F8ekqJx8rHO4QYUMjzbIs9I=" + "version": "8.0.0", + "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y=" }, { "pname": "System.Diagnostics.EventLog", - "version": "8.0.0", - "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y=" + "version": "8.0.1", + "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA=" }, { "pname": "System.Diagnostics.FileVersionInfo", @@ -1231,8 +1281,8 @@ }, { "pname": "System.Drawing.Common", - "version": "4.6.0", - "hash": "sha256-D6PMDq8M2aSrnDeBYfFftaX7hFLcxrOYFLrtxbERMAM=" + "version": "6.0.0", + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" }, { "pname": "System.Dynamic.Runtime", @@ -1246,8 +1296,8 @@ }, { "pname": "System.Formats.Asn1", - "version": "8.0.0", - "hash": "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI=" + "version": "8.0.1", + "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=" }, { "pname": "System.Globalization", @@ -1324,6 +1374,11 @@ "version": "6.0.3", "hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck=" }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.0", + "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" + }, { "pname": "System.IO.Pipes", "version": "4.0.0", @@ -1341,8 +1396,8 @@ }, { "pname": "System.Linq.Dynamic.Core", - "version": "1.3.14", - "hash": "sha256-tT9V1Y9vKfrzEmmBTYmGmzLPBfCHCXMZ8Jvluf3mliA=" + "version": "1.6.0.2", + "hash": "sha256-5qzEVm+33ATR+SQljwe/LcP5o0MNjv49nHfXIVG27dw=" }, { "pname": "System.Linq.Expressions", @@ -1364,11 +1419,6 @@ "version": "4.5.3", "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, - { - "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" - }, { "pname": "System.Net.Http", "version": "4.1.0", @@ -1394,11 +1444,6 @@ "version": "4.1.0", "hash": "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0=" }, - { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" - }, { "pname": "System.ObjectModel", "version": "4.0.12", @@ -1421,8 +1466,8 @@ }, { "pname": "System.Reactive", - "version": "6.0.0", - "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" + "version": "6.0.1", + "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" }, { "pname": "System.Reflection", @@ -1481,8 +1526,8 @@ }, { "pname": "System.Reflection.Metadata", - "version": "8.0.0", - "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" + "version": "6.0.1", + "hash": "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo=" }, { "pname": "System.Reflection.Primitives", @@ -1539,11 +1584,6 @@ "version": "4.5.0-preview1-26216-02", "hash": "sha256-xE1bUh7w/hZrknJ2kn1ZKIQO/vW2js9SJxaGXkGq3TI=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", @@ -1621,13 +1661,13 @@ }, { "pname": "System.Security.AccessControl", - "version": "4.5.0", - "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=" + "version": "4.7.0", + "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" }, { "pname": "System.Security.AccessControl", - "version": "4.6.0", - "hash": "sha256-rspJ63MbjNVDve0owXby0Pu2vHjQvR2uuhCDCJ9vgfI=" + "version": "6.0.0", + "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" }, { "pname": "System.Security.Claims", @@ -1686,8 +1726,8 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "8.0.0", - "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=" + "version": "8.0.1", + "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" }, { "pname": "System.Security.Cryptography.Primitives", @@ -1701,8 +1741,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "4.6.0", - "hash": "sha256-vmZTCnDlFMzMpsJX5SE4fVJTZh6jKN7AbHjKMftYg7s=" + "version": "6.0.0", + "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=" }, { "pname": "System.Security.Cryptography.X509Certificates", @@ -1716,13 +1756,8 @@ }, { "pname": "System.Security.Permissions", - "version": "4.5.0", - "hash": "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ=" - }, - { - "pname": "System.Security.Permissions", - "version": "4.6.0", - "hash": "sha256-AByObHSxKL0vJvhTWuv4QPN01WnXDKKbnxfzG2tWrCA=" + "version": "6.0.0", + "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" }, { "pname": "System.Security.Principal", @@ -1736,18 +1771,13 @@ }, { "pname": "System.Security.Principal.Windows", - "version": "4.5.0", - "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.6.0", - "hash": "sha256-lZeXm45RboVgqnPQVJ65y8b5b+9FSVr0MBciG777rso=" + "version": "4.7.0", + "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" }, { "pname": "System.ServiceProcess.ServiceController", - "version": "8.0.0", - "hash": "sha256-mq/Qm8JeMUvitHf32/F8uvw1YJGx4prGnEI/VzdaFAI=" + "version": "8.0.1", + "hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8=" }, { "pname": "System.Text.Encoding", @@ -1766,8 +1796,8 @@ }, { "pname": "System.Text.Encoding.CodePages", - "version": "8.0.0", - "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=" + "version": "6.0.0", + "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" }, { "pname": "System.Text.Encoding.Extensions", @@ -1781,13 +1811,13 @@ }, { "pname": "System.Text.Encodings.Web", - "version": "8.0.0", - "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" + "version": "9.0.0", + "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0=" }, { "pname": "System.Text.Json", - "version": "8.0.0", - "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow=" + "version": "9.0.0", + "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=" }, { "pname": "System.Text.RegularExpressions", @@ -1809,11 +1839,6 @@ "version": "4.3.0", "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, - { - "pname": "System.Threading.AccessControl", - "version": "4.5.0", - "hash": "sha256-x3Na5DscrtkFGnZycNeZd3vc8zDsIWKnINL/1JGzcOI=" - }, { "pname": "System.Threading.Channels", "version": "6.0.0", @@ -1849,11 +1874,6 @@ "version": "4.3.0", "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" - }, { "pname": "System.Threading.Tasks.Parallel", "version": "4.0.1", @@ -1881,8 +1901,8 @@ }, { "pname": "System.Windows.Extensions", - "version": "4.6.0", - "hash": "sha256-08W7PEiGAJJIMIKXieRgesIvtj4+/bUnBaFGypdXRcU=" + "version": "6.0.0", + "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=" }, { "pname": "System.Xml.ReaderWriter", @@ -1936,7 +1956,7 @@ }, { "pname": "YamlDotNet", - "version": "13.7.1", - "hash": "sha256-v8w1hh8FCxJQMEPq+YUh9Oi4LE/ndi+vE2igLJazVNQ=" + "version": "16.3.0", + "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q=" } ] diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix index a06d57f026de..6b646d67af72 100644 --- a/pkgs/by-name/sm/smtp4dev/package.nix +++ b/pkgs/by-name/sm/smtp4dev/package.nix @@ -7,19 +7,26 @@ npmHooks, fetchNpmDeps, dotnetCorePackages, + nix-update-script, }: let - version = "3.6.1"; + version = "3.8.6"; src = fetchFromGitHub { owner = "rnwood"; repo = "smtp4dev"; tag = version; - hash = "sha256-T6ci7+xbzpOrNr8hpDCwk5qe01L2Ho5V1oM7Hhd8bgg="; + hash = "sha256-k4nerh4cVVcFQF7a4Wvcfhefa3SstEOASk+0soN0n9k="; }; npmRoot = "Rnwood.Smtp4dev/ClientApp"; + patches = [ ./smtp4dev-npm-packages.patch ]; in buildDotnetModule { - inherit version src npmRoot; + inherit + version + src + npmRoot + patches + ; pname = "smtp4dev"; nativeBuildInputs = [ @@ -30,8 +37,9 @@ buildDotnetModule { ]; npmDeps = fetchNpmDeps { - src = "${src}/${npmRoot}"; - hash = "sha256-/Z6sBxA2ReHlEbz0zJjlpn6IwzHDQiXN5ixEV1/iCJI="; + inherit src patches; + hash = "sha256-Uj0EnnsA+QHq5KHF2B93OG8rwxYrV6sEgMTbd43ttCA="; + postPatch = "cd ${npmRoot}"; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; @@ -44,6 +52,10 @@ buildDotnetModule { mv $out/bin/Rnwood.Smtp4dev $out/bin/smtp4dev ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^(\\d+\\.\\d+\\.\\d+)$" ]; + }; + meta = { description = "Fake smtp email server for development and testing"; homepage = "https://github.com/rnwood/smtp4dev"; diff --git a/pkgs/by-name/sm/smtp4dev/smtp4dev-npm-packages.patch b/pkgs/by-name/sm/smtp4dev/smtp4dev-npm-packages.patch new file mode 100644 index 000000000000..6889e774cad2 --- /dev/null +++ b/pkgs/by-name/sm/smtp4dev/smtp4dev-npm-packages.patch @@ -0,0 +1,699 @@ +diff --git a/Rnwood.Smtp4dev/ClientApp/package-lock.json b/Rnwood.Smtp4dev/ClientApp/package-lock.json +index be143b7..6e8b0b4 100644 +--- a/Rnwood.Smtp4dev/ClientApp/package-lock.json ++++ b/Rnwood.Smtp4dev/ClientApp/package-lock.json +@@ -20,7 +20,8 @@ + "@microsoft/signalr": "^8.0.0", + "@types/jest": "^29.5.12", + "@types/sanitize-html": "^2.11.0", +- "@typescript-eslint/parser": "^8.0.0", ++ "@typescript-eslint/eslint-plugin": "^8.31.1", ++ "@typescript-eslint/parser": "^8.31.1", + "@vitejs/plugin-vue": "^5.0.4", + "@vue/eslint-config-typescript": "^13.0.0", + "@vue/vue3-jest": "^29.2.6", +@@ -2937,7 +2938,8 @@ + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", +- "dev": true ++ "dev": true, ++ "peer": true + }, + "node_modules/@types/lodash": { + "version": "4.17.0", +@@ -2993,12 +2995,6 @@ + "entities": "^4.4.0" + } + }, +- "node_modules/@types/semver": { +- "version": "7.5.8", +- "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", +- "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", +- "dev": true +- }, + "node_modules/@types/stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", +@@ -3039,84 +3035,59 @@ + "dev": true + }, + "node_modules/@typescript-eslint/eslint-plugin": { +- "version": "7.6.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.6.0.tgz", +- "integrity": "sha512-gKmTNwZnblUdnTIJu3e9kmeRRzV2j1a/LUO27KNNAnIC5zjy1aSvXSRp4rVNlmAoHlQ7HzX42NbKpcSr4jF80A==", ++ "version": "8.31.1", ++ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.31.1.tgz", ++ "integrity": "sha512-oUlH4h1ABavI4F0Xnl8/fOtML/eu8nI2A1nYd+f+55XI0BLu+RIqKoCiZKNo6DtqZBEQm5aNKA20G3Z5w3R6GQ==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.10.0", +- "@typescript-eslint/scope-manager": "7.6.0", +- "@typescript-eslint/type-utils": "7.6.0", +- "@typescript-eslint/utils": "7.6.0", +- "@typescript-eslint/visitor-keys": "7.6.0", +- "debug": "^4.3.4", ++ "@typescript-eslint/scope-manager": "8.31.1", ++ "@typescript-eslint/type-utils": "8.31.1", ++ "@typescript-eslint/utils": "8.31.1", ++ "@typescript-eslint/visitor-keys": "8.31.1", + "graphemer": "^1.4.0", + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", +- "semver": "^7.6.0", +- "ts-api-utils": "^1.3.0" ++ "ts-api-utils": "^2.0.1" + }, + "engines": { +- "node": "^18.18.0 || >=20.0.0" ++ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { +- "@typescript-eslint/parser": "^7.0.0", +- "eslint": "^8.56.0" +- }, +- "peerDependenciesMeta": { +- "typescript": { +- "optional": true +- } ++ "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", ++ "eslint": "^8.57.0 || ^9.0.0", ++ "typescript": ">=4.8.4 <5.9.0" + } + }, +- "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { +- "version": "6.0.0", +- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", +- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", ++ "node_modules/@typescript-eslint/eslint-plugin/node_modules/ts-api-utils": { ++ "version": "2.1.0", ++ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", ++ "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", + "dev": true, +- "dependencies": { +- "yallist": "^4.0.0" +- }, ++ "license": "MIT", + "engines": { +- "node": ">=10" +- } +- }, +- "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { +- "version": "7.6.0", +- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", +- "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", +- "dev": true, +- "dependencies": { +- "lru-cache": "^6.0.0" +- }, +- "bin": { +- "semver": "bin/semver.js" ++ "node": ">=18.12" + }, +- "engines": { +- "node": ">=10" ++ "peerDependencies": { ++ "typescript": ">=4.8.4" + } + }, +- "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": { +- "version": "4.0.0", +- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", +- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", +- "dev": true +- }, + "node_modules/@typescript-eslint/parser": { +- "version": "8.31.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.0.tgz", +- "integrity": "sha512-67kYYShjBR0jNI5vsf/c3WG4u+zDnCTHTPqVMQguffaWWFs7artgwKmfwdifl+r6XyM5LYLas/dInj2T0SgJyw==", ++ "version": "8.31.1", ++ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.1.tgz", ++ "integrity": "sha512-oU/OtYVydhXnumd0BobL9rkJg7wFJ9bFFPmSmB/bf/XWN85hlViji59ko6bSKBXyseT9V8l+CN1nwmlbiN0G7Q==", + "dev": true, + "license": "MIT", + "dependencies": { +- "@typescript-eslint/scope-manager": "8.31.0", +- "@typescript-eslint/types": "8.31.0", +- "@typescript-eslint/typescript-estree": "8.31.0", +- "@typescript-eslint/visitor-keys": "8.31.0", ++ "@typescript-eslint/scope-manager": "8.31.1", ++ "@typescript-eslint/types": "8.31.1", ++ "@typescript-eslint/typescript-estree": "8.31.1", ++ "@typescript-eslint/visitor-keys": "8.31.1", + "debug": "^4.3.4" + }, + "engines": { +@@ -3131,15 +3102,15 @@ + "typescript": ">=4.8.4 <5.9.0" + } + }, +- "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { +- "version": "8.31.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.0.tgz", +- "integrity": "sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==", ++ "node_modules/@typescript-eslint/scope-manager": { ++ "version": "8.31.1", ++ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.1.tgz", ++ "integrity": "sha512-BMNLOElPxrtNQMIsFHE+3P0Yf1z0dJqV9zLdDxN/xLlWMlXK/ApEsVEKzpizg9oal8bAT5Sc7+ocal7AC1HCVw==", + "dev": true, + "license": "MIT", + "dependencies": { +- "@typescript-eslint/types": "8.31.0", +- "@typescript-eslint/visitor-keys": "8.31.0" ++ "@typescript-eslint/types": "8.31.1", ++ "@typescript-eslint/visitor-keys": "8.31.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" +@@ -3149,34 +3120,16 @@ + "url": "https://opencollective.com/typescript-eslint" + } + }, +- "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { +- "version": "8.31.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.0.tgz", +- "integrity": "sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": "^18.18.0 || ^20.9.0 || >=21.1.0" +- }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" +- } +- }, +- "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { +- "version": "8.31.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.0.tgz", +- "integrity": "sha512-xLmgn4Yl46xi6aDSZ9KkyfhhtnYI15/CvHbpOy/eR5NWhK/BK8wc709KKwhAR0m4ZKRP7h07bm4BWUYOCuRpQQ==", ++ "node_modules/@typescript-eslint/type-utils": { ++ "version": "8.31.1", ++ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.31.1.tgz", ++ "integrity": "sha512-fNaT/m9n0+dpSp8G/iOQ05GoHYXbxw81x+yvr7TArTuZuCA6VVKbqWYVZrV5dVagpDTtj/O8k5HBEE/p/HM5LA==", + "dev": true, + "license": "MIT", + "dependencies": { +- "@typescript-eslint/types": "8.31.0", +- "@typescript-eslint/visitor-keys": "8.31.0", ++ "@typescript-eslint/typescript-estree": "8.31.1", ++ "@typescript-eslint/utils": "8.31.1", + "debug": "^4.3.4", +- "fast-glob": "^3.3.2", +- "is-glob": "^4.0.3", +- "minimatch": "^9.0.4", +- "semver": "^7.6.0", + "ts-api-utils": "^2.0.1" + }, + "engines": { +@@ -3187,80 +3140,11 @@ + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { ++ "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.9.0" + } + }, +- "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { +- "version": "8.31.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.0.tgz", +- "integrity": "sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "@typescript-eslint/types": "8.31.0", +- "eslint-visitor-keys": "^4.2.0" +- }, +- "engines": { +- "node": "^18.18.0 || ^20.9.0 || >=21.1.0" +- }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" +- } +- }, +- "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", +- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "balanced-match": "^1.0.0" +- } +- }, +- "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": { +- "version": "4.2.0", +- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", +- "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", +- "dev": true, +- "license": "Apache-2.0", +- "engines": { +- "node": "^18.18.0 || ^20.9.0 || >=21.1.0" +- }, +- "funding": { +- "url": "https://opencollective.com/eslint" +- } +- }, +- "node_modules/@typescript-eslint/parser/node_modules/minimatch": { +- "version": "9.0.5", +- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", +- "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", +- "dev": true, +- "license": "ISC", +- "dependencies": { +- "brace-expansion": "^2.0.1" +- }, +- "engines": { +- "node": ">=16 || 14 >=14.17" +- }, +- "funding": { +- "url": "https://github.com/sponsors/isaacs" +- } +- }, +- "node_modules/@typescript-eslint/parser/node_modules/semver": { +- "version": "7.7.1", +- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", +- "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", +- "dev": true, +- "license": "ISC", +- "bin": { +- "semver": "bin/semver.js" +- }, +- "engines": { +- "node": ">=10" +- } +- }, +- "node_modules/@typescript-eslint/parser/node_modules/ts-api-utils": { ++ "node_modules/@typescript-eslint/type-utils/node_modules/ts-api-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", +@@ -3273,57 +3157,14 @@ + "typescript": ">=4.8.4" + } + }, +- "node_modules/@typescript-eslint/scope-manager": { +- "version": "7.6.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.6.0.tgz", +- "integrity": "sha512-ngttyfExA5PsHSx0rdFgnADMYQi+Zkeiv4/ZxGYUWd0nLs63Ha0ksmp8VMxAIC0wtCFxMos7Lt3PszJssG/E6w==", +- "dev": true, +- "dependencies": { +- "@typescript-eslint/types": "7.6.0", +- "@typescript-eslint/visitor-keys": "7.6.0" +- }, +- "engines": { +- "node": "^18.18.0 || >=20.0.0" +- }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" +- } +- }, +- "node_modules/@typescript-eslint/type-utils": { +- "version": "7.6.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.6.0.tgz", +- "integrity": "sha512-NxAfqAPNLG6LTmy7uZgpK8KcuiS2NZD/HlThPXQRGwz6u7MDBWRVliEEl1Gj6U7++kVJTpehkhZzCJLMK66Scw==", +- "dev": true, +- "dependencies": { +- "@typescript-eslint/typescript-estree": "7.6.0", +- "@typescript-eslint/utils": "7.6.0", +- "debug": "^4.3.4", +- "ts-api-utils": "^1.3.0" +- }, +- "engines": { +- "node": "^18.18.0 || >=20.0.0" +- }, +- "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" +- }, +- "peerDependencies": { +- "eslint": "^8.56.0" +- }, +- "peerDependenciesMeta": { +- "typescript": { +- "optional": true +- } +- } +- }, + "node_modules/@typescript-eslint/types": { +- "version": "7.6.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.6.0.tgz", +- "integrity": "sha512-h02rYQn8J+MureCvHVVzhl69/GAfQGPQZmOMjG1KfCl7o3HtMSlPaPUAPu6lLctXI5ySRGIYk94clD/AUMCUgQ==", ++ "version": "8.31.1", ++ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.1.tgz", ++ "integrity": "sha512-SfepaEFUDQYRoA70DD9GtytljBePSj17qPxFHA/h3eg6lPTqGJ5mWOtbXCk1YrVU1cTJRd14nhaXWFu0l2troQ==", + "dev": true, ++ "license": "MIT", + "engines": { +- "node": "^18.18.0 || >=20.0.0" ++ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", +@@ -3331,31 +3172,30 @@ + } + }, + "node_modules/@typescript-eslint/typescript-estree": { +- "version": "7.6.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.6.0.tgz", +- "integrity": "sha512-+7Y/GP9VuYibecrCQWSKgl3GvUM5cILRttpWtnAu8GNL9j11e4tbuGZmZjJ8ejnKYyBRb2ddGQ3rEFCq3QjMJw==", ++ "version": "8.31.1", ++ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.1.tgz", ++ "integrity": "sha512-kaA0ueLe2v7KunYOyWYtlf/QhhZb7+qh4Yw6Ni5kgukMIG+iP773tjgBiLWIXYumWCwEq3nLW+TUywEp8uEeag==", + "dev": true, ++ "license": "MIT", + "dependencies": { +- "@typescript-eslint/types": "7.6.0", +- "@typescript-eslint/visitor-keys": "7.6.0", ++ "@typescript-eslint/types": "8.31.1", ++ "@typescript-eslint/visitor-keys": "8.31.1", + "debug": "^4.3.4", +- "globby": "^11.1.0", ++ "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", +- "ts-api-utils": "^1.3.0" ++ "ts-api-utils": "^2.0.1" + }, + "engines": { +- "node": "^18.18.0 || >=20.0.0" ++ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, +- "peerDependenciesMeta": { +- "typescript": { +- "optional": true +- } ++ "peerDependencies": { ++ "typescript": ">=4.8.4 <5.9.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { +@@ -3363,27 +3203,17 @@ + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, +- "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { +- "version": "6.0.0", +- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", +- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", +- "dev": true, +- "dependencies": { +- "yallist": "^4.0.0" +- }, +- "engines": { +- "node": ">=10" +- } +- }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { +- "version": "9.0.4", +- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", +- "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", ++ "version": "9.0.5", ++ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", ++ "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, ++ "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, +@@ -3395,13 +3225,11 @@ + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { +- "version": "7.6.0", +- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", +- "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", ++ "version": "7.7.1", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", ++ "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, +- "dependencies": { +- "lru-cache": "^6.0.0" +- }, ++ "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, +@@ -3409,85 +3237,72 @@ + "node": ">=10" + } + }, +- "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { +- "version": "4.0.0", +- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", +- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", +- "dev": true ++ "node_modules/@typescript-eslint/typescript-estree/node_modules/ts-api-utils": { ++ "version": "2.1.0", ++ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", ++ "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">=18.12" ++ }, ++ "peerDependencies": { ++ "typescript": ">=4.8.4" ++ } + }, + "node_modules/@typescript-eslint/utils": { +- "version": "7.6.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.6.0.tgz", +- "integrity": "sha512-x54gaSsRRI+Nwz59TXpCsr6harB98qjXYzsRxGqvA5Ue3kQH+FxS7FYU81g/omn22ML2pZJkisy6Q+ElK8pBCA==", ++ "version": "8.31.1", ++ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.31.1.tgz", ++ "integrity": "sha512-2DSI4SNfF5T4oRveQ4nUrSjUqjMND0nLq9rEkz0gfGr3tg0S5KB6DhwR+WZPCjzkZl3cH+4x2ce3EsL50FubjQ==", + "dev": true, ++ "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", +- "@types/json-schema": "^7.0.15", +- "@types/semver": "^7.5.8", +- "@typescript-eslint/scope-manager": "7.6.0", +- "@typescript-eslint/types": "7.6.0", +- "@typescript-eslint/typescript-estree": "7.6.0", +- "semver": "^7.6.0" ++ "@typescript-eslint/scope-manager": "8.31.1", ++ "@typescript-eslint/types": "8.31.1", ++ "@typescript-eslint/typescript-estree": "8.31.1" + }, + "engines": { +- "node": "^18.18.0 || >=20.0.0" ++ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { +- "eslint": "^8.56.0" ++ "eslint": "^8.57.0 || ^9.0.0", ++ "typescript": ">=4.8.4 <5.9.0" + } + }, +- "node_modules/@typescript-eslint/utils/node_modules/lru-cache": { +- "version": "6.0.0", +- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", +- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", ++ "node_modules/@typescript-eslint/visitor-keys": { ++ "version": "8.31.1", ++ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.1.tgz", ++ "integrity": "sha512-I+/rgqOVBn6f0o7NDTmAPWWC6NuqhV174lfYvAm9fUaWeiefLdux9/YI3/nLugEn9L8fcSi0XmpKi/r5u0nmpw==", + "dev": true, ++ "license": "MIT", + "dependencies": { +- "yallist": "^4.0.0" ++ "@typescript-eslint/types": "8.31.1", ++ "eslint-visitor-keys": "^4.2.0" + }, + "engines": { +- "node": ">=10" +- } +- }, +- "node_modules/@typescript-eslint/utils/node_modules/semver": { +- "version": "7.6.0", +- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", +- "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", +- "dev": true, +- "dependencies": { +- "lru-cache": "^6.0.0" +- }, +- "bin": { +- "semver": "bin/semver.js" ++ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, +- "engines": { +- "node": ">=10" ++ "funding": { ++ "type": "opencollective", ++ "url": "https://opencollective.com/typescript-eslint" + } + }, +- "node_modules/@typescript-eslint/utils/node_modules/yallist": { +- "version": "4.0.0", +- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", +- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", +- "dev": true +- }, +- "node_modules/@typescript-eslint/visitor-keys": { +- "version": "7.6.0", +- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.6.0.tgz", +- "integrity": "sha512-4eLB7t+LlNUmXzfOu1VAIAdkjbu5xNSerURS9X/S5TUKWFRpXRQZbmtPqgKmYx8bj3J0irtQXSiWAOY82v+cgw==", ++ "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { ++ "version": "4.2.0", ++ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", ++ "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, +- "dependencies": { +- "@typescript-eslint/types": "7.6.0", +- "eslint-visitor-keys": "^3.4.3" +- }, ++ "license": "Apache-2.0", + "engines": { +- "node": "^18.18.0 || >=20.0.0" ++ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/typescript-eslint" ++ "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@ungap/structured-clone": { +@@ -3591,6 +3406,40 @@ + } + } + }, ++ "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/eslint-plugin": { ++ "version": "7.18.0", ++ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz", ++ "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "@eslint-community/regexpp": "^4.10.0", ++ "@typescript-eslint/scope-manager": "7.18.0", ++ "@typescript-eslint/type-utils": "7.18.0", ++ "@typescript-eslint/utils": "7.18.0", ++ "@typescript-eslint/visitor-keys": "7.18.0", ++ "graphemer": "^1.4.0", ++ "ignore": "^5.3.1", ++ "natural-compare": "^1.4.0", ++ "ts-api-utils": "^1.3.0" ++ }, ++ "engines": { ++ "node": "^18.18.0 || >=20.0.0" ++ }, ++ "funding": { ++ "type": "opencollective", ++ "url": "https://opencollective.com/typescript-eslint" ++ }, ++ "peerDependencies": { ++ "@typescript-eslint/parser": "^7.0.0", ++ "eslint": "^8.56.0" ++ }, ++ "peerDependenciesMeta": { ++ "typescript": { ++ "optional": true ++ } ++ } ++ }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/parser": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz", +@@ -3638,6 +3487,34 @@ + "url": "https://opencollective.com/typescript-eslint" + } + }, ++ "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/type-utils": { ++ "version": "7.18.0", ++ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz", ++ "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "@typescript-eslint/typescript-estree": "7.18.0", ++ "@typescript-eslint/utils": "7.18.0", ++ "debug": "^4.3.4", ++ "ts-api-utils": "^1.3.0" ++ }, ++ "engines": { ++ "node": "^18.18.0 || >=20.0.0" ++ }, ++ "funding": { ++ "type": "opencollective", ++ "url": "https://opencollective.com/typescript-eslint" ++ }, ++ "peerDependencies": { ++ "eslint": "^8.56.0" ++ }, ++ "peerDependenciesMeta": { ++ "typescript": { ++ "optional": true ++ } ++ } ++ }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/types": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz", +@@ -3681,6 +3558,29 @@ + } + } + }, ++ "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/utils": { ++ "version": "7.18.0", ++ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz", ++ "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "@eslint-community/eslint-utils": "^4.4.0", ++ "@typescript-eslint/scope-manager": "7.18.0", ++ "@typescript-eslint/types": "7.18.0", ++ "@typescript-eslint/typescript-estree": "7.18.0" ++ }, ++ "engines": { ++ "node": "^18.18.0 || >=20.0.0" ++ }, ++ "funding": { ++ "type": "opencollective", ++ "url": "https://opencollective.com/typescript-eslint" ++ }, ++ "peerDependencies": { ++ "eslint": "^8.56.0" ++ } ++ }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/visitor-keys": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz", +diff --git a/Rnwood.Smtp4dev/ClientApp/package.json b/Rnwood.Smtp4dev/ClientApp/package.json +index a9e301a..619e55b 100644 +--- a/Rnwood.Smtp4dev/ClientApp/package.json ++++ b/Rnwood.Smtp4dev/ClientApp/package.json +@@ -19,7 +19,8 @@ + "@microsoft/signalr": "^8.0.0", + "@types/jest": "^29.5.12", + "@types/sanitize-html": "^2.11.0", +- "@typescript-eslint/parser": "^8.0.0", ++ "@typescript-eslint/eslint-plugin": "^8.31.1", ++ "@typescript-eslint/parser": "^8.31.1", + "@vitejs/plugin-vue": "^5.0.4", + "@vue/eslint-config-typescript": "^13.0.0", + "@vue/vue3-jest": "^29.2.6", diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix index 98e03da7a41d..60e876a69e43 100644 --- a/pkgs/by-name/sn/sn0int/package.nix +++ b/pkgs/by-name/sn/sn0int/package.nix @@ -37,9 +37,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.Security ]; # One of the dependencies (chrootable-https) tries to read "/etc/resolv.conf" diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix index 27921a048117..81caa40570f8 100644 --- a/pkgs/by-name/sn/snac2/package.nix +++ b/pkgs/by-name/sn/snac2/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "snac2"; - version = "2.74"; + version = "2.77"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = "snac2"; tag = finalAttrs.version; - hash = "sha256-jFII9MP+jmtguqE+QMQLbDQ6tSuhie0FhXeSyf42AaQ="; + hash = "sha256-QUPFD7x1ZDnDxediA+oqYC8CotmGeAr36xSZ3STOK9Y="; }; buildInputs = [ diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/by-name/sn/snagboot/package.nix similarity index 100% rename from pkgs/applications/misc/snagboot/default.nix rename to pkgs/by-name/sn/snagboot/package.nix diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index 39e607a5a941..fb5946819044 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "8.29.2"; + version = "9.3.4"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake"; tag = "v${version}"; - hash = "sha256-69NsbfHF29l92gwO8If9vp8Cdjac3BnO+hbY3b2bZ8E="; + hash = "sha256-7yU1vhPrcuZC2d15VileZJpweDhB0rEEGVHjhm6Gmgc="; }; postPatch = '' @@ -25,13 +25,13 @@ python3Packages.buildPythonApplication rec { substituteInPlace tests/common.py \ --replace-fail 'os.environ["PYTHONPATH"] = os.getcwd()' "pass" \ --replace-fail 'del os.environ["PYTHONPATH"]' "pass" - substituteInPlace snakemake/unit_tests/__init__.py \ + substituteInPlace src/snakemake/unit_tests/__init__.py \ --replace-fail '"unit_tests/templates"' '"'"$PWD"'/snakemake/unit_tests/templates"' - substituteInPlace snakemake/assets/__init__.py \ + substituteInPlace src/snakemake/assets/__init__.py \ --replace-fail "raise err" "return bytes('err','ascii')" ''; - build-system = with python3Packages; [ setuptools ]; + build-system = with python3Packages; [ setuptools-scm ]; dependencies = with python3Packages; [ appdirs @@ -55,6 +55,7 @@ python3Packages.buildPythonApplication rec { smart-open snakemake-interface-executor-plugins snakemake-interface-common + snakemake-interface-logger-plugins snakemake-interface-storage-plugins snakemake-interface-report-plugins stopit @@ -85,7 +86,7 @@ python3Packages.buildPythonApplication rec { ]) ++ [ writableTmpDirAsHomeHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; pytestFlagsArray = [ "tests/tests.py" @@ -126,6 +127,20 @@ python3Packages.buildPythonApplication rec { "test_deploy_sources" "test_output_file_cache_storage" "test_storage" + + # Tries to access internet + "test_report_after_run" + + # Needs stress-ng + "test_benchmark" + "test_benchmark_jsonl" + + # Needs unshare + "test_nodelocal" + + # Requires snakemake-storage-plugin-http + "test_keep_local" + "test_retrieve" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Unclear failure: @@ -144,6 +159,14 @@ python3Packages.buildPythonApplication rec { "test_queue_input_forceall" "test_resources_submitted_to_cluster" "test_scopes_submitted_to_cluster" + + # Issue with /dev/stderr in sandbox + "test_protected_symlink_output" + + # Unclear issue: + # pulp.apis.core.PulpSolverError: Pulp: cannot execute cbc cwd: + # but pulp solver is not default + "test_access_patterns" ]; pythonImportsCheck = [ "snakemake" ]; diff --git a/pkgs/by-name/sn/snapcraft/lxd-socket-path.patch b/pkgs/by-name/sn/snapcraft/lxd-socket-path.patch index 4219fcbfa7d4..af732c1e0fbb 100644 --- a/pkgs/by-name/sn/snapcraft/lxd-socket-path.patch +++ b/pkgs/by-name/sn/snapcraft/lxd-socket-path.patch @@ -1,7 +1,7 @@ -diff --git a/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py b/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py -index 5fa4f898..41264ebb 100644 ---- a/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py -+++ b/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py +diff --git i/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py w/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py +index 5fa4f898b..41264ebb0 100644 +--- i/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py ++++ w/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py @@ -142,7 +142,7 @@ class LXD(Provider): build_provider_flags=build_provider_flags, ) diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index ac4118158968..de6d5b213dd4 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -7,13 +7,14 @@ nix-update-script, python3Packages, squashfsTools, + cacert, stdenv, writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { pname = "snapcraft"; - version = "8.7.3"; + version = "8.8.1"; pyproject = true; @@ -21,7 +22,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "snapcraft"; tag = version; - hash = "sha256-T39hhosZTttX8jMlF5ul9oBcsh+FKusepj0k2NMZHNU="; + hash = "sha256-gn2roiwNLUFJsuen2qGPvl4DyE6gPUQibS1Cn7cj2L8="; }; patches = [ @@ -118,6 +119,11 @@ python3Packages.buildPythonApplication rec { wrapProgram $out/bin/snapcraft --prefix PATH : ${squashfsTools}/bin ''; + preCheck = '' + # _pygit2.GitError: OpenSSL error: failed to load certificates: error:00000000:lib(0)::reason(0) + export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + ''; + nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/by-name/sn/snapcraft/set-channel-for-nix.patch b/pkgs/by-name/sn/snapcraft/set-channel-for-nix.patch index b90f0b4e1df2..99dc04c2b8bc 100644 --- a/pkgs/by-name/sn/snapcraft/set-channel-for-nix.patch +++ b/pkgs/by-name/sn/snapcraft/set-channel-for-nix.patch @@ -1,20 +1,13 @@ -diff --git a/snapcraft/providers.py b/snapcraft/providers.py -index a999537a..dcd290a7 100644 ---- a/snapcraft/providers.py -+++ b/snapcraft/providers.py -@@ -21,6 +21,7 @@ import sys - from pathlib import Path - from textwrap import dedent - from typing import Dict, Optional -+import platform - - from craft_cli import emit - from craft_providers import Provider, ProviderError, bases, executor -@@ -178,14 +179,14 @@ def get_base_configuration( +diff --git i/snapcraft/providers.py w/snapcraft/providers.py +index 41ab6e8f1..ceaf7539b 100644 +--- i/snapcraft/providers.py ++++ w/snapcraft/providers.py +@@ -177,14 +177,15 @@ def get_base_configuration( # injecting a snap on a non-linux system is not supported, so default to # install snapcraft from the store's stable channel snap_channel = get_managed_environment_snap_channel() - if sys.platform != "linux" and not snap_channel: ++ import platform + if snap_channel is None and (sys.platform != "linux" or "NixOS" in platform.version()): emit.progress( - "Using snapcraft from snap store channel 'latest/stable' in instance " diff --git a/pkgs/by-name/sn/snapper/package.nix b/pkgs/by-name/sn/snapper/package.nix index 11ab0eb18e76..4288805cf4db 100644 --- a/pkgs/by-name/sn/snapper/package.nix +++ b/pkgs/by-name/sn/snapper/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "snapper"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "sha256-yVjsbWa7t+md0xdy5eFST+pkPbXhgfyJcTt+aNkQpsQ="; + sha256 = "sha256-SHwF9FMfrrf2IXrGjT/lTI8rDltVkRXkAQ9MpeNVeWw="; }; strictDeps = true; diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix index 895c16ff61d9..0bd79455bc32 100644 --- a/pkgs/by-name/sn/snapshot/package.nix +++ b/pkgs/by-name/sn/snapshot/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "47.1"; + version = "48.0.1"; src = fetchurl { url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; - hash = "sha256-5LFiZ5ryTH6W7m4itH1f8NqW4KD2FtE66xIHxgn4lIM="; + hash = "sha256-OTF2hZogt9I138MDAxuiDGhkQRBpiNyRHdkbe21m4f0="; }; patches = [ @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/snapshot"; description = "Take pictures and videos on your computer, tablet, or phone"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; mainProgram = "snapshot"; diff --git a/pkgs/by-name/sn/snarkos/package.nix b/pkgs/by-name/sn/snarkos/package.nix new file mode 100644 index 000000000000..f1c0bc66f641 --- /dev/null +++ b/pkgs/by-name/sn/snarkos/package.nix @@ -0,0 +1,64 @@ +{ + stdenv, + fetchFromGitHub, + lib, + rustPlatform, + curl, + pkg-config, + openssl, +}: +rustPlatform.buildRustPackage rec { + pname = "snarkos"; + version = "2.2.7"; + + src = fetchFromGitHub { + owner = "AleoHQ"; + repo = "snarkOS"; + rev = "v${version}"; + sha256 = "sha256-+z9dgg5HdR+Gomug03gI1zdCU6t4SBHkl1Pxoq69wrc="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-riUOxmuXDP5+BPSPu5+cLBP43bZxAqvVG/k5kvThSAs="; + + # buildAndTestSubdir = "cli"; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + rustPlatform.bindgenHook + ]; + + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; + OPENSSL_DIR = "${lib.getDev openssl}"; + + # TODO check why rust compilation fails by including the rocksdb from nixpkgs + # Used by build.rs in the rocksdb-sys crate. If we don't set these, it would + # try to build RocksDB from source. + # ROCKSDB_INCLUDE_DIR="${rocksdb}/include"; + # ROCKSDB_LIB_DIR="${rocksdb}/lib"; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + curl + ]; + + # some tests are flaky and some need network access + # TODO finish filtering the tests to enable them + doCheck = !stdenv.hostPlatform.isLinux; + # checkFlags = [ + # # tries to make a network access + # "--skip=rpc::rpc::tests::test_send_transaction_large" + # # flaky test + # "--skip=helpers::block_requests::tests::test_block_requests_case_2ca" + # ]; + + meta = with lib; { + description = "Decentralized Operating System for Zero-Knowledge Applications"; + homepage = "https://snarkos.org"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.unix; + mainProgram = "snarkos"; + }; +} diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix index 38efbbf4ec75..59e930056ffb 100644 --- a/pkgs/by-name/sn/snazy/package.nix +++ b/pkgs/by-name/sn/snazy/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "snazy"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "chmouel"; repo = pname; rev = version; - hash = "sha256-Vc3L93S7WQAcqsLIhiCrTGmmc+1q26zRpOWXyUNFNVc="; + hash = "sha256-VR4IRMmSQCF/CXgKfJ5OEFbXg9o/40lBonupOF38lFg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZieQfjRSxO5LEpQaXFIPcdejoG+6Mw4FCM/7LcbwRro="; + cargoHash = "sha256-tZYAIlQW1IsQSpMF4BmiiCo1CVYjM2GNXcEXT3gCoPA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix index 69a315d03504..650e37809148 100644 --- a/pkgs/by-name/sn/snd/package.nix +++ b/pkgs/by-name/sn/snd/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "25.2"; + version = "25.3"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - hash = "sha256-BPtovk1seGGz/hrIRP5SEjfBIi4trZoKMLJ1v8DE/Tk="; + hash = "sha256-YZcMojm68CiyEH8shmoIH9Tl27RSV20q7UId7L9rhYM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix index 970f4a48ee26..77fdf7877922 100644 --- a/pkgs/by-name/sn/snes9x/package.nix +++ b/pkgs/by-name/sn/snes9x/package.nix @@ -5,7 +5,7 @@ cmake, fetchFromGitHub, gtkmm3, - libGL, + libGLX, libX11, libXdmcp, libXext, @@ -91,11 +91,11 @@ stdenv.mkDerivation (finalAttrs: { "--enable-avx2" ]; - postPatch = '' + postPatch = lib.optionalString withGtk '' substituteInPlace external/glad/src/egl.c \ - --replace-fail libEGL.so.1 "${lib.getLib libGL}/lib/libEGL.so.1" + --replace-fail libEGL.so.1 "${lib.getLib libGLX}/lib/libEGL.so.1" substituteInPlace external/glad/src/glx.c \ - --replace-fail libGL.so.1 ${lib.getLib libGL}/lib/libGL.so.1 + --replace-fail libGL.so.1 ${lib.getLib libGLX}/lib/libGL.so.1 ''; preConfigure = '' diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index 7f64f2fe7e1a..f8d82b213b31 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -13,7 +13,6 @@ vulkan-loader, wayland, xorg, - darwin, }: rustPlatform.buildRustPackage rec { @@ -48,7 +47,6 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix index 26674a859f2d..a9ce41fbf4d9 100644 --- a/pkgs/by-name/sn/snipe-it/package.nix +++ b/pkgs/by-name/sn/snipe-it/package.nix @@ -9,16 +9,16 @@ php84.buildComposerProject2 (finalAttrs: { pname = "snipe-it"; - version = "8.0.4"; + version = "8.1.3"; src = fetchFromGitHub { - owner = "snipe"; + owner = "grokability"; repo = "snipe-it"; tag = "v${finalAttrs.version}"; - hash = "sha256-iS9PfWZlwWfxMkCJS7Lbp2+XxoGJz2yedn4nsu34YhU="; + hash = "sha256-SzL1api9hObdvhKRtBrzgvZNuJHAoeB2GCt2etCZ6Kw="; }; - vendorHash = "sha256-6lNNwktcWU5FlzSPl1G4TW8OGMzLbWeVebNOvuYx9ls="; + vendorHash = "sha256-KOzPzKN1HXFidjXWe8tNPwFJ8DmdrkCDKeChNhGcTDo="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" diff --git a/pkgs/by-name/sn/snippetpixie/package.nix b/pkgs/by-name/sn/snippetpixie/package.nix index 1e0382ff5f61..fde8bb973b85 100644 --- a/pkgs/by-name/sn/snippetpixie/package.nix +++ b/pkgs/by-name/sn/snippetpixie/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + teams = [ teams.pantheon ]; platforms = platforms.linux; mainProgram = "com.github.bytepixie.snippetpixie"; }; diff --git a/pkgs/by-name/sn/snis-unwrapped/package.nix b/pkgs/by-name/sn/snis-unwrapped/package.nix index 51ac65f3f8d2..abf3e1fe61e2 100644 --- a/pkgs/by-name/sn/snis-unwrapped/package.nix +++ b/pkgs/by-name/sn/snis-unwrapped/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snis"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "smcameron"; repo = "space-nerds-in-space"; tag = "v${finalAttrs.version}"; - hash = "sha256-QfRH/YWu2BS5Dn47DmaPqoXe0SVFaBxaBIuE6Pq2XwY="; + hash = "sha256-WxxJW0o4PtOhmloeRLqxJahJwWlGpcdpQjrjrah+Ixk="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/sn/snore/package.nix b/pkgs/by-name/sn/snore/package.nix index 5ad31a29ee35..7311f17fcfbe 100644 --- a/pkgs/by-name/sn/snore/package.nix +++ b/pkgs/by-name/sn/snore/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "clamiax"; repo = "snore"; - rev = version; + tag = version; hash = "sha256-bKPGSePzp4XEZFY0QQr37fm3R1v3hLD6FeySFd7zNJc="; }; diff --git a/pkgs/by-name/sn/snort/package.nix b/pkgs/by-name/sn/snort/package.nix index de8b5a6436d2..59761a4f73ce 100644 --- a/pkgs/by-name/sn/snort/package.nix +++ b/pkgs/by-name/sn/snort/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snort"; - version = "3.7.1.0"; + version = "3.7.2.0"; src = fetchFromGitHub { owner = "snort3"; repo = "snort3"; tag = finalAttrs.version; - hash = "sha256-ni1HOEJNi1NWkxZ90sOzBylzsAY1BB3lP76LjCTZumg="; + hash = "sha256-/ObL48Wo8OPFljBxQP5X/ASvGPcdvPKueosjJm1BRTI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sn/snort2/package.nix b/pkgs/by-name/sn/snort2/package.nix deleted file mode 100644 index cb1e8185e7e1..000000000000 --- a/pkgs/by-name/sn/snort2/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - pkg-config, - luajit, - openssl, - fetchurl, - libpcap, - pcre, - libdnet, - daq, - zlib, - flex, - bison, - makeWrapper, - libtirpc, -}: - -stdenv.mkDerivation (finalAttrs: { - version = "2.9.20"; - pname = "snort2"; - - # TODO: remove this package after 25.05 release - # https://github.com/NixOS/nixpkgs/pull/381363#issuecomment-2653483597 - src = fetchurl rec { - name = "snort-${finalAttrs.version}.tar.gz"; - url = "https://snort.org/downloads/snort/${name}"; - sha256 = "sha256-KUAOE/U7GDHguLEOwSJKHLqm3BUzpTIqIN2Au4S0mBw="; - }; - - nativeBuildInputs = [ - makeWrapper - pkg-config - ]; - buildInputs = [ - luajit - openssl - libpcap - pcre - libdnet - daq - zlib - flex - bison - libtirpc - ]; - - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; - - enableParallelBuilding = true; - - configureFlags = [ - "--disable-static-daq" - "--enable-control-socket" - "--with-daq-includes=${daq}/includes" - "--with-daq-libraries=${daq}/lib" - ]; - - postInstall = '' - wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine" - ''; - - meta = { - description = "Network intrusion prevention and detection system (IDS/IPS)"; - homepage = "https://www.snort.org"; - maintainers = with lib.maintainers; [ aycanirican ]; - license = lib.licenses.gpl2; - platforms = with lib.platforms; linux; - }; -}) diff --git a/pkgs/by-name/sn/snowcrash/package.nix b/pkgs/by-name/sn/snowcrash/package.nix index ff969164dab6..185de7972524 100644 --- a/pkgs/by-name/sn/snowcrash/package.nix +++ b/pkgs/by-name/sn/snowcrash/package.nix @@ -28,7 +28,8 @@ buildGoModule rec { description = "Polyglot payload generator"; homepage = "https://github.com/redcode-labs/SNOWCRASH"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members; + maintainers = with maintainers; [ fab ]; + teams = [ teams.redcodelabs ]; mainProgram = "SNOWCRASH"; }; } diff --git a/pkgs/by-name/sn/snowflake-cli/package.nix b/pkgs/by-name/sn/snowflake-cli/package.nix index 53f70daea505..694a094c50cd 100644 --- a/pkgs/by-name/sn/snowflake-cli/package.nix +++ b/pkgs/by-name/sn/snowflake-cli/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "snowflake-cli"; - version = "3.5.0"; + version = "3.7.2"; pyproject = true; src = fetchFromGitHub { owner = "snowflakedb"; repo = "snowflake-cli"; tag = "v${version}"; - hash = "sha256-iEvgvz6EBPzfOLe60QQi1S3FIyFWYFVn8slWEpIusAI="; + hash = "sha256-MCJl6Mkkkp9JkG+8ZNfWAYQFMJccdtKfPdcnfaY8Y3w="; }; build-system = with python3Packages; [ @@ -49,6 +49,7 @@ python3Packages.buildPythonApplication rec { pytest-randomly pytest-factoryboy pytest-xdist + pytest-httpserver ]; pytestFlagsArray = [ diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix index 05402129249b..dcd0876bba60 100644 --- a/pkgs/by-name/sn/snpguest/package.nix +++ b/pkgs/by-name/sn/snpguest/package.nix @@ -9,25 +9,23 @@ rustPlatform.buildRustPackage rec { pname = "snpguest"; - version = "0.8.3"; + version = "0.9.1"; src = fetchFromGitHub { owner = "virtee"; repo = "snpguest"; tag = "v${version}"; - hash = "sha256-Fu8A3n1vzA8y5ccyo785udOTTqumLQWCOy0RL/mQ/us="; + hash = "sha256-bUdJUWeXi+TKQVW3xSRpLhf2BfXZWPz9Rwddob1nCK0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6AXpdm4Ge8j8w74YGEQYpj6r8gKp+Bim/6xA2WLjSC0="; + cargoHash = "sha256-RGlYY6f7csrCIYxj0Nfejn0lCXEgGd/MD442H3Q3OZ0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - env = { - OPENSSL_NO_VENDOR = true; - }; + env.OPENSSL_NO_VENDOR = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 69328f7b3d05..be931652bd21 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -18,13 +18,13 @@ }: rustPlatform.buildRustPackage rec { pname = "snx-rs"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${version}"; - hash = "sha256-eWtoCU5JkpHGcOLzjzj9icDlnIW1y+fiEn5V/E5IQ4U="; + hash = "sha256-bLuIXd2pqqiyEP+lDTJYVDZkRZ0HcDkKFZd/qlpuf98="; }; passthru.updateScript = nix-update-script { }; @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-Hjc2wKkNmlVjZb5wz9fq9hzUsxXJyeFYq+4C+weUlq0="; + cargoHash = "sha256-E5OJVf9CkLn5mFtk4Yacs2OIvAuIw0idSs7QuTNvfgU="; meta = { description = "Open source Linux client for Checkpoint VPN tunnels"; diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix index df39145c5973..ad1150c4b03e 100644 --- a/pkgs/by-name/so/so/package.nix +++ b/pkgs/by-name/so/so/package.nix @@ -1,6 +1,5 @@ { lib, - darwin, fetchFromGitHub, libiconv, openssl, @@ -11,7 +10,6 @@ }: let - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; self = rustPlatform.buildRustPackage { pname = "so"; version = "0.4.10"; @@ -34,9 +32,6 @@ let [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreServices - Security - SystemConfiguration ]; strictDeps = true; diff --git a/pkgs/by-name/so/soapyairspy/package.nix b/pkgs/by-name/so/soapyairspy/package.nix new file mode 100644 index 000000000000..d6094e550b49 --- /dev/null +++ b/pkgs/by-name/so/soapyairspy/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + airspy, + soapysdr, +}: + +stdenv.mkDerivation rec { + pname = "soapyairspy"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyAirspy"; + rev = "soapy-airspy-${version}"; + sha256 = "0g23yybnmq0pg2m8m7dbhif8lw0hdsmnnjym93fdyxfk5iln7fsc"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + airspy + soapysdr + ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with lib; { + homepage = "https://github.com/pothosware/SoapyAirspy"; + description = "SoapySDR plugin for Airspy devices"; + license = licenses.mit; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/so/soapyaudio/package.nix b/pkgs/by-name/so/soapyaudio/package.nix new file mode 100644 index 000000000000..ce2be6ec8a68 --- /dev/null +++ b/pkgs/by-name/so/soapyaudio/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + hamlib, + rtaudio, + alsa-lib, + libpulseaudio, + libjack2, + libusb1, + soapysdr, +}: + +stdenv.mkDerivation rec { + pname = "soapyaudio"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyAudio"; + rev = "soapy-audio-${version}"; + sha256 = "0minlsc1lvmqm20vn5hb4im7pz8qwklfy7sbr2xr73xkrbqdahc0"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = + [ + hamlib + rtaudio + libjack2 + libusb1 + soapysdr + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libpulseaudio + ]; + + cmakeFlags = [ + "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" + "-DUSE_HAMLIB=ON" + ]; + + meta = with lib; { + homepage = "https://github.com/pothosware/SoapyAudio"; + description = "SoapySDR plugin for amateur radio and audio devices"; + license = licenses.mit; + maintainers = with maintainers; [ numinit ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/so/soapybladerf/package.nix b/pkgs/by-name/so/soapybladerf/package.nix new file mode 100644 index 000000000000..473376de9477 --- /dev/null +++ b/pkgs/by-name/so/soapybladerf/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libbladeRF, + soapysdr, +}: + +let + version = "0.4.2"; + +in +stdenv.mkDerivation { + pname = "soapybladerf"; + inherit version; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyBladeRF"; + rev = "soapy-bladerf-${version}"; + sha256 = "sha256-lhTiu+iCdlLTY5ceND+F8HzKf2K9afuTi3cme6nGEMo="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + libbladeRF + soapysdr + ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with lib; { + homepage = "https://github.com/pothosware/SoapyBladeRF"; + description = "SoapySDR plugin for BladeRF devices"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/so/soapyhackrf/package.nix b/pkgs/by-name/so/soapyhackrf/package.nix new file mode 100644 index 000000000000..7bcc40719a37 --- /dev/null +++ b/pkgs/by-name/so/soapyhackrf/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + hackrf, + soapysdr, +}: + +let + version = "0.3.4"; + +in +stdenv.mkDerivation { + pname = "soapyhackrf"; + inherit version; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyHackRF"; + rev = "soapy-hackrf-${version}"; + sha256 = "sha256-fzPYHJAPX8FkFxPXpLlUagTd/NoamRX0YnxHwkbV1nI="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + hackrf + soapysdr + ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with lib; { + homepage = "https://github.com/pothosware/SoapyHackRF"; + description = "SoapySDR plugin for HackRF devices"; + license = licenses.mit; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/so/soapyplutosdr/package.nix b/pkgs/by-name/so/soapyplutosdr/package.nix index 07e4fda8cc76..8fc1c04ec6b5 100644 --- a/pkgs/by-name/so/soapyplutosdr/package.nix +++ b/pkgs/by-name/so/soapyplutosdr/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, pkg-config, - darwin, libad9361, libiio, libusb1, @@ -26,18 +25,12 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config ]; - buildInputs = - [ - libad9361 - libiio - libusb1 - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.IOKit - darwin.libobjc - ]; + buildInputs = [ + libad9361 + libiio + libusb1 + soapysdr + ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/by-name/so/soapyremote/package.nix b/pkgs/by-name/so/soapyremote/package.nix index 7fe21410cf50..b500b85c2da2 100644 --- a/pkgs/by-name/so/soapyremote/package.nix +++ b/pkgs/by-name/so/soapyremote/package.nix @@ -8,7 +8,7 @@ }: let - version = "0.5.2"; + version = "0.5.2-unstable-2024-01-24"; in stdenv.mkDerivation { @@ -18,8 +18,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyRemote"; - rev = "soapy-remote-${version}"; - sha256 = "124sy9v08fm51ds1yzrxspychn34y0rl6y48mzariianazvzmfax"; + rev = "54caa5b2af348906607c5516a112057650d0873d"; + sha256 = "sha256-uekElbcbX2P5TEufWEoP6tgUM/4vxgSQZu8qaBCSo18="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/so/soapyrtlsdr/package.nix b/pkgs/by-name/so/soapyrtlsdr/package.nix new file mode 100644 index 000000000000..31154d62b863 --- /dev/null +++ b/pkgs/by-name/so/soapyrtlsdr/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + rtl-sdr, + soapysdr, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "soapyrtlsdr"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyRTLSDR"; + rev = "soapy-rtl-sdr-${finalAttrs.version}"; + sha256 = "sha256-IapdrBE8HhibY52Anm76/mVAoA0GghwnRCxxfGkyLTw="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + rtl-sdr + soapysdr + ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with lib; { + homepage = "https://github.com/pothosware/SoapyRTLSDR"; + description = "SoapySDR plugin for RTL-SDR devices"; + license = licenses.mit; + maintainers = with maintainers; [ + ragge + luizribeiro + ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/so/soapyuhd/package.nix b/pkgs/by-name/so/soapyuhd/package.nix new file mode 100644 index 000000000000..722d41bb37cc --- /dev/null +++ b/pkgs/by-name/so/soapyuhd/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + uhd, + boost, + soapysdr, +}: + +stdenv.mkDerivation rec { + pname = "soapyuhd"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyUHD"; + rev = "soapy-uhd-${version}"; + sha256 = "14rk9ap9ayks2ma6mygca08yfds9bgfmip8cvwl87l06hwhnlwhj"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + uhd + boost + soapysdr + ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + postPatch = '' + sed -i "s:DESTINATION .*uhd/modules:DESTINATION $out/lib/uhd/modules:" CMakeLists.txt + ''; + + meta = with lib; { + homepage = "https://github.com/pothosware/SoapyAirspy"; + description = "SoapySDR plugin for UHD devices"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/so/sobjectizer/package.nix b/pkgs/by-name/so/sobjectizer/package.nix new file mode 100644 index 000000000000..e46c47baafab --- /dev/null +++ b/pkgs/by-name/so/sobjectizer/package.nix @@ -0,0 +1,60 @@ +{ + pkgs, + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + withStatic ? stdenv.hostPlatform.isStatic, + withShared ? !withStatic, + buildExamples ? false, +}: + +# Ensure build examples with static library. +assert buildExamples -> withStatic; + +stdenv.mkDerivation (finalAttrs: { + pname = "sobjectizer"; + version = "5.8.4"; + + src = fetchFromGitHub { + owner = "Stiffstream"; + repo = "sobjectizer"; + tag = "v.${finalAttrs.version}"; + hash = "sha256-tIqWgd6TppHfqZk3XHzhG0t+Nn8BQCTP81UD7ls67UE="; + }; + + patches = [ + (fetchpatch { + name = "tests-do-not-require-static-library.patch"; + url = "https://github.com/Stiffstream/sobjectizer/commit/10eb34c65ccdaa4fea62d0c4354b83104256370d.patch"; + hash = "sha256-a2g6jDGDC/y8cmbAD0KtVQKhVS5ZAjKtMhbAUyoQIvg="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeDir = "../dev"; + + cmakeFlags = [ + (lib.cmakeBool "SOBJECTIZER_BUILD_STATIC" withStatic) + (lib.cmakeBool "SOBJECTIZER_BUILD_SHARED" withShared) + (lib.cmakeBool "BUILD_EXAMPLES" (buildExamples && withStatic)) + (lib.cmakeBool "BUILD_TESTS" (finalAttrs.doCheck && withShared)) + ]; + + # The tests require the shared library thanks to the patch. + doCheck = withShared; + + # Receive semi-automated updates. + passthru.updateScript = pkgs.nix-update-script { }; + + meta = { + homepage = "https://github.com/Stiffstream/sobjectizer/tree/master"; + changelog = "https://github.com/Stiffstream/sobjectizer/releases/tag/v.${finalAttrs.version}"; + description = "Implementation of Actor, Publish-Subscribe, and CSP models in one rather small C++ framework"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ivalery111 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/so/socalabs-sid/package.nix b/pkgs/by-name/so/socalabs-sid/package.nix index 516bf9c903aa..31cdba5fd795 100644 --- a/pkgs/by-name/so/socalabs-sid/package.nix +++ b/pkgs/by-name/so/socalabs-sid/package.nix @@ -13,7 +13,7 @@ libGL, libjack2, curl, - webkitgtk_4_0, + webkitgtk_4_1, libsysprof-capture, pcre2, util-linux, @@ -23,7 +23,6 @@ libxkbcommon, libdatrie, libepoxy, - libsoup_2_4, lerc, sqlite, ninja, @@ -89,11 +88,10 @@ stdenv.mkDerivation { libxkbcommon libdatrie libepoxy - libsoup_2_4 lerc freetype curl - webkitgtk_4_0 + webkitgtk_4_1 pcre2 util-linux sqlite diff --git a/pkgs/by-name/so/socket_wrapper/package.nix b/pkgs/by-name/so/socket_wrapper/package.nix index 8f837edcd52c..dd40fe5f4777 100644 --- a/pkgs/by-name/so/socket_wrapper/package.nix +++ b/pkgs/by-name/so/socket_wrapper/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "socket_wrapper"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz"; - sha256 = "sha256-KJAALRQ3tvt//cZ8NzTxPQ4r99Y7sJfWA6n24uBdw8g="; + sha256 = "sha256-nDQfhsEbJzjuiFy/g7Qu5L1EW6luVxUbjt4SufVP1vc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/so/sof-firmware/package.nix b/pkgs/by-name/so/sof-firmware/package.nix index e9c483c4c1bf..6b3b22cb0c7b 100644 --- a/pkgs/by-name/so/sof-firmware/package.nix +++ b/pkgs/by-name/so/sof-firmware/package.nix @@ -2,45 +2,46 @@ lib, fetchurl, stdenvNoCC, + nix-update-script, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sof-firmware"; version = "2025.01.1"; src = fetchurl { - url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-${version}.tar.gz"; - sha256 = "sha256-o2IQ2cJF6BsNlnTWsn0f1BIpaM+SWu/FW0htNlD4gyM="; + url = "https://github.com/thesofproject/sof-bin/releases/download/v${finalAttrs.version}/sof-bin-${finalAttrs.version}.tar.gz"; + hash = "sha256-o2IQ2cJF6BsNlnTWsn0f1BIpaM+SWu/FW0htNlD4gyM="; }; dontFixup = true; # binaries must not be stripped or patchelfed installPhase = '' runHook preInstall + mkdir -p $out/lib/firmware/intel - cp -av sof $out/lib/firmware/intel/sof - cp -av sof-tplg $out/lib/firmware/intel/sof-tplg - cp -av sof-ace-tplg $out/lib/firmware/intel/sof-ace-tplg - cp -av sof-ipc4 $out/lib/firmware/intel/sof-ipc4 - cp -av sof-ipc4-tplg $out/lib/firmware/intel/sof-ipc4-tplg - cp -av sof-ipc4-lib $out/lib/firmware/intel/sof-ipc4-lib + # copy sof and sof-* recursively, preserving symlinks + cp -R -d sof{,-*} $out/lib/firmware/intel/ + runHook postInstall ''; - meta = with lib; { - changelog = "https://github.com/thesofproject/sof-bin/releases/tag/v${version}"; + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/thesofproject/sof-bin/releases/tag/v${finalAttrs.version}"; description = "Sound Open Firmware"; homepage = "https://www.sofproject.org/"; - license = with licenses; [ + license = with lib.licenses; [ bsd3 isc ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ lblasc evenbrenden hmenke ]; - platforms = with platforms; linux; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = with lib.platforms; linux; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +}) diff --git a/pkgs/by-name/so/sofa/package.nix b/pkgs/by-name/so/sofa/package.nix new file mode 100644 index 000000000000..6d41ecdcb378 --- /dev/null +++ b/pkgs/by-name/so/sofa/package.nix @@ -0,0 +1,85 @@ +{ + lib, + stdenv, + + fetchFromGitHub, + fetchpatch, + + # propagatedNativeBuildInputs + cmake, + qt6Packages, + + # propagatedBuildInputs + boost, + cxxopts, + eigen, + glew, + gtest, + libGL, + metis, + tinyxml-2, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sofa"; + version = "24.12.00"; + + src = fetchFromGitHub { + owner = "sofa-framework"; + repo = "sofa"; + tag = "v${finalAttrs.version}"; + hash = "sha256-LeFIM1RJjA2ynimjE8XngOQ8gR7BgqqTZBbDp0KXxs0="; + }; + + patches = [ + # Include missing header for setw / setfill. + # ref. https://github.com/sofa-framework/sofa/pull/5279 + # This was merged upstream and can be removed in next version + (fetchpatch { + url = "https://github.com/sofa-framework/sofa/commit/700b6cdd94fe24a51b2a7014fb0fc83e6abe1fbc.patch"; + hash = "sha256-czc1u03USQt18d7cMPmXYguBhSb5JOJLplPvoixp+3w="; + }) + ]; + + propagatedNativeBuildInputs = [ + cmake + qt6Packages.wrapQtAppsHook + ]; + propagatedBuildInputs = [ + boost + cxxopts + eigen + glew + gtest + qt6Packages.libqglviewer + qt6Packages.qtbase + libGL + metis + tinyxml-2 + zlib + ]; + + cmakeFlags = [ + (lib.cmakeBool "SOFA_ALLOW_FETCH_DEPENDENCIES" false) + ]; + + doCheck = true; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -change \ + $out/lib/libSceneChecking.${finalAttrs.version}.dylib \ + $out/plugins/SceneChecking/lib/libSceneChecking.${finalAttrs.version}.dylib \ + $out/bin/.runSofa-${finalAttrs.version}-wrapped + ''; + + meta = { + description = "Real-time multi-physics simulation with an emphasis on medical simulation"; + homepage = "https://github.com/sofa-framework/sofa/"; + changelog = "https://github.com/sofa-framework/sofa/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ nim65s ]; + mainProgram = "runSofa"; + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; +}) diff --git a/pkgs/by-name/so/sofia_sip/package.nix b/pkgs/by-name/so/sofia_sip/package.nix new file mode 100644 index 000000000000..0042c50b1dce --- /dev/null +++ b/pkgs/by-name/so/sofia_sip/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch2, + glib, + openssl, + pkg-config, + autoreconfHook, +}: + +stdenv.mkDerivation rec { + pname = "sofia-sip"; + version = "1.13.17"; + + src = fetchFromGitHub { + owner = "freeswitch"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY="; + }; + + patches = [ + # Fix build with gcc 14 from https://github.com/freeswitch/sofia-sip/pull/249 + (fetchpatch2 { + name = "sofia-sip-fix-incompatible-pointer-type.patch"; + url = "https://github.com/freeswitch/sofia-sip/commit/46b02f0655af0a9594e805f09a8ee99278f84777.diff"; + hash = "sha256-4uZVtKnXG+BPW8byjd7tu4uEZo9SYq9EzTEvMwG0Bak="; + }) + ]; + + buildInputs = [ + glib + openssl + ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + meta = with lib; { + description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; + homepage = "https://github.com/freeswitch/sofia-sip"; + platforms = platforms.unix; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/by-name/so/softhsm/package.nix b/pkgs/by-name/so/softhsm/package.nix new file mode 100644 index 000000000000..48d64a0935d2 --- /dev/null +++ b/pkgs/by-name/so/softhsm/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchurl, + botan2, + sqlite, +}: + +stdenv.mkDerivation rec { + + pname = "softhsm"; + version = "2.6.1"; + + src = fetchurl { + url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz"; + hash = "sha256-YSSUcwVLzRgRUZ75qYmogKe9zDbTF8nCVFf8YU30dfI="; + }; + + configureFlags = [ + "--with-crypto-backend=botan" + "--with-botan=${lib.getDev botan2}" + "--with-objectstore-backend-db" + "--sysconfdir=$out/etc" + "--localstatedir=$out/var" + ]; + + buildInputs = [ + botan2 + sqlite + ]; + + postInstall = "rm -rf $out/var"; + + meta = with lib; { + homepage = "https://www.opendnssec.org/softhsm"; + description = "Cryptographic store accessible through a PKCS #11 interface"; + longDescription = " + SoftHSM provides a software implementation of a generic + cryptographic device with a PKCS#11 interface, which is of + course especially useful in environments where a dedicated hardware + implementation of such a device - for instance a Hardware + Security Module (HSM) or smartcard - is not available. + + SoftHSM follows the OASIS PKCS#11 standard, meaning it should be + able to work with many cryptographic products. SoftHSM is a + programme of The Commons Conservancy. + "; + license = licenses.bsd2; + maintainers = [ maintainers.leenaars ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix index 797f5ca2668b..621c504aa56a 100644 --- a/pkgs/by-name/so/sogo/package.nix +++ b/pkgs/by-name/so/sogo/package.nix @@ -25,14 +25,14 @@ clangStdenv.mkDerivation rec { pname = "sogo"; - version = "5.11.2"; + version = "5.12.1"; # always update the sope package as well, when updating sogo src = fetchFromGitHub { owner = "Alinto"; repo = "sogo"; rev = "SOGo-${version}"; - hash = "sha256-c+547x7ugYoLMgGVLcMmmb9rzquRJOv8n+Js2CuE7I0="; + hash = "sha256-BBFo8h0YnE/qHbAwu+vHX+eu9f4WXMs1gQT2nAxiPgc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/so/soil/package.nix b/pkgs/by-name/so/soil/package.nix new file mode 100644 index 000000000000..bed06c618693 --- /dev/null +++ b/pkgs/by-name/so/soil/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchzip, + libGL, + libX11, +}: + +stdenv.mkDerivation { + pname = "soil"; + version = "unstable-2020-01-04"; + + src = fetchzip { + url = "https://web.archive.org/web/20200104042737id_/http://www.lonesock.net/files/soil.zip"; + sha256 = "1c05nwbnfdgwaz8ywn7kg2xrcvrcbpdyhcfkkiiwk69zvil0pbgd"; + }; + + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libGL + libX11 + ]; + + buildPhase = '' + cd src + $CC $NIX_CFLAGS_COMPILE -c *.c + $AR rcs libSOIL.a *.o + ''; + installPhase = '' + mkdir -p $out/lib $out/include/SOIL + cp libSOIL.a $out/lib/ + cp SOIL.h $out/include/SOIL/ + ''; + + meta = with lib; { + description = "Simple OpenGL Image Library"; + longDescription = '' + SOIL is a tiny C library used primarily for uploading textures + into OpenGL. + ''; + homepage = "https://www.lonesock.net/soil.html"; + license = licenses.publicDomain; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index c1faaafceb28..cf8a4471b41b 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -3,10 +3,8 @@ fetchFromGitHub, lib, rustPlatform, - darwin, udev, protobuf, - libcxx, rocksdb_8_3, installShellFiles, pkg-config, @@ -42,14 +40,6 @@ let version = "1.18.26"; hash = "sha256-sJ0Zn5GMi64/S8zqomL/dYRVW8SOQWsP+bpcdatJC0A="; rocksdb = rocksdb_8_3; - - inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin.apple_sdk_11_0.frameworks) - System - IOKit - AppKit - Security - ; in rustPlatform.buildRustPackage rec { pname = "solana-cli"; @@ -92,20 +82,10 @@ rustPlatform.buildRustPackage rec { protobuf pkg-config ]; - buildInputs = - [ - openssl - rustPlatform.bindgenHook - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libcxx - IOKit - Security - AppKit - System - Libsystem - ]; + buildInputs = [ + openssl + rustPlatform.bindgenHook + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]; doInstallCheck = true; @@ -133,8 +113,8 @@ rustPlatform.buildRustPackage rec { # Require this on darwin otherwise the compiler starts rambling about missing # cmath functions - CPPFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; - LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-L${lib.getLib libcxx}/lib"; + CPPFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"; + LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-L${lib.getLib stdenv.cc.libcxx}/lib"; # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/so/solc/package.nix b/pkgs/by-name/so/solc/package.nix index 84086cb8cc4c..1138ebbd1e08 100644 --- a/pkgs/by-name/so/solc/package.nix +++ b/pkgs/by-name/so/solc/package.nix @@ -32,7 +32,7 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/so/solo2-cli/package.nix b/pkgs/by-name/so/solo2-cli/package.nix new file mode 100644 index 000000000000..18f5e509a71f --- /dev/null +++ b/pkgs/by-name/so/solo2-cli/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, + pkg-config, + pcsclite, + udev, +}: + +rustPlatform.buildRustPackage rec { + pname = "solo2-cli"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "solokeys"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7tpO5ir42mIKJXD0NJzEPXi/Xe6LdyEeBQWNfOdgX5I="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-qD185H6wfW9yuYImTm9hqSgQpUQcKuCESM8riZwmGY0="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = + [ ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + pcsclite + udev + ]; + + postInstall = '' + install -D 70-solo2.rules $out/lib/udev/rules.d/70-solo2.rules + installShellCompletion target/*/release/solo2.{bash,fish} + installShellCompletion --zsh target/*/release/_solo2 + ''; + + doCheck = true; + + buildFeatures = [ "cli" ]; + + meta = with lib; { + description = "CLI tool for managing SoloKeys' Solo2 USB security keys"; + homepage = "https://github.com/solokeys/solo2-cli"; + license = with licenses; [ + asl20 + mit + ]; # either at your option + maintainers = with maintainers; [ lukegb ]; + mainProgram = "solo2"; + }; +} diff --git a/pkgs/by-name/so/sonar-scanner-cli/package.nix b/pkgs/by-name/so/sonar-scanner-cli/package.nix index a67e174e6af3..84e1f3c14875 100644 --- a/pkgs/by-name/so/sonar-scanner-cli/package.nix +++ b/pkgs/by-name/so/sonar-scanner-cli/package.nix @@ -11,16 +11,16 @@ maven.buildMavenPackage rec { pname = "sonar-scanner-cli"; - version = "7.0.2.4839"; + version = "7.1.0.4889"; src = fetchFromGitHub { owner = "SonarSource"; repo = "sonar-scanner-cli"; tag = version; - hash = "sha256-2utOfJa2euo38E9PxRSzUkHYAYMdSRBkzpe6ka3hjCg="; + hash = "sha256-6TUwk9TyXzGHIEKkzELH+EQppCPLCg192a4ed1ycFrk="; }; - mvnHash = "sha256-jJgDR5JGruGYXBClmp6pg+IHLdMN5osOKKtRGQA+EAc="; + mvnHash = "sha256-uPdnXT/QuhGJ+9Y7TouR+nNm3SUyTxgecuDcMZV/Iq8="; mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index d3205fbccf88..a49568aa66bd 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -16,17 +16,17 @@ maven.buildMavenPackage rec { pname = "sonarlint-ls"; - version = "3.18.0.75982"; + version = "3.22.0.76129"; src = fetchFromGitHub { owner = "SonarSource"; repo = "sonarlint-language-server"; rev = version; - hash = "sha256-/SpooLAJutBJ/FakSUyXMtPLy3TaPxCU8KEMnnzgdBs="; + hash = "sha256-W0X22akE8hDQcuJLq4BXsAKebMb/jDvoG1i3jkA7QaM="; }; mvnJdk = jdk17; - mvnHash = "sha256-IMM3xXWTnYzD3415tMjuwiQD2NMGM2XkuxdMYpsaqfA="; + mvnHash = "sha256-7EXa/A5E8/spd4QrBMSgKyKpnA561NstpjCHbC1EBu4="; # Disables failing tests which either need network access or are flaky. mvnParameters = lib.escapeShellArgs [ diff --git a/pkgs/by-name/so/sonata/package.nix b/pkgs/by-name/so/sonata/package.nix index 2311c8d3ba13..477b04a7da6b 100644 --- a/pkgs/by-name/so/sonata/package.nix +++ b/pkgs/by-name/so/sonata/package.nix @@ -24,13 +24,13 @@ let in buildPythonApplication rec { pname = "sonata"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "multani"; repo = "sonata"; - rev = "v${version}"; - sha256 = "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x"; + tag = "v${version}"; + sha256 = "sha256-80F2dVaRawnI0E+GzaxRUudaLWWHGUjICCEbXHVGy+E="; }; disabled = !isPy3k; diff --git a/pkgs/by-name/so/sonivox/package.nix b/pkgs/by-name/so/sonivox/package.nix index 717f8eefa752..b2ddbd4deed3 100644 --- a/pkgs/by-name/so/sonivox/package.nix +++ b/pkgs/by-name/so/sonivox/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "sonivox"; - version = "3.6.15"; + version = "3.6.16"; src = fetchFromGitHub { owner = "pedrolcl"; repo = "sonivox"; rev = "v${version}"; - hash = "sha256-k+EhhLFp+ehptjDS8ZHvo5tfFxmSCA2lFTjkWFLi+cs="; + hash = "sha256-2OWlm1GZI08OeiG3AswRyvguv9MUYo1dLo6QUPr3r3s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/so/sooperlooper/package.nix b/pkgs/by-name/so/sooperlooper/package.nix index 2dd184be7ecf..c849da803959 100644 --- a/pkgs/by-name/so/sooperlooper/package.nix +++ b/pkgs/by-name/so/sooperlooper/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoreconfHook, pkg-config, which, @@ -21,25 +20,17 @@ fftw, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sooperlooper"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "v${version}"; - sha256 = "sha256-Lrsz/UDCgoac63FJ3CaPVaYwvBtzkGQQRLhUi6lUusE="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-bPu/VWTJLSIMoJSEQb+/nqtTpkPtCNVuXA17XsnFSP0="; }; - patches = [ - (fetchpatch { - name = "10-build_with_wx_32.patch"; - url = "https://sources.debian.org/data/main/s/sooperlooper/1.7.8~dfsg0-2/debian/patches/10-build_with_wx_32.patch"; - sha256 = "sha256-NF/w+zgRBNkSTqUJhfH9kQogXSYEF70pCN+loR0hjpg="; - }) - ]; - autoreconfPhase = '' patchShebangs ./autogen.sh ./autogen.sh @@ -67,9 +58,12 @@ stdenv.mkDerivation rec { fftw ]; + # see https://bugs.gentoo.org/925275 + CPPFLAGS = "-fpermissive"; + enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Live looping sampler capable of immediate loop recording, overdubbing, multiplying, reversing and more"; longDescription = '' It allows for multiple simultaneous multi-channel loops limited only by your computer's available memory. @@ -79,8 +73,9 @@ stdenv.mkDerivation rec { and the engine can be run standalone on a computer without a monitor. ''; homepage = "https://sonosaurus.com/sooperlooper/"; - license = licenses.gpl2; - maintainers = with maintainers; [ magnetophon ]; - platforms = platforms.linux; + downloadPage = "https://github.com/essej/sooperlooper"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix index e4d1d2a1a2b8..7eb5ebfbf466 100644 --- a/pkgs/by-name/so/sope/package.nix +++ b/pkgs/by-name/so/sope/package.nix @@ -14,13 +14,13 @@ clangStdenv.mkDerivation rec { pname = "sope"; - version = "5.11.2"; + version = "5.12.1"; src = fetchFromGitHub { owner = "Alinto"; repo = "sope"; rev = "SOPE-${version}"; - hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag="; + hash = "sha256-a7uOFiPnZ++ACV1Ggwh+YtP+NQYS4datQdlPtG+qlg0="; }; buildInputs = diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index 0a80ffce37f4..89492fbdf345 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -12,16 +12,16 @@ buildGoModule (final: { pname = "sops"; - version = "3.10.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "getsops"; repo = final.pname; tag = "v${final.version}"; - hash = "sha256-LdsuN243oQ/L6LYgynb7Kw60alXn5IfUfhY0WaZFVCU="; + hash = "sha256-IdQnxVBMAQpSAYB2S3D3lSULelFMBpjiBGOxeTgC10I="; }; - vendorHash = "sha256-I+iwimrNdKABZFP2etZTQJAXKigh+0g/Jhip86Cl5Rg="; + vendorHash = "sha256-7aHUIERVSxv3YGAMteGbqkAZQXXDVziV0rhUhjwch3U="; subPackages = [ "cmd/sops" ]; diff --git a/pkgs/by-name/so/sosreport/package.nix b/pkgs/by-name/so/sosreport/package.nix new file mode 100644 index 000000000000..af8f7c768f2d --- /dev/null +++ b/pkgs/by-name/so/sosreport/package.nix @@ -0,0 +1,47 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + gettext, +}: + +python3Packages.buildPythonPackage rec { + pname = "sosreport"; + version = "4.9.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sosreport"; + repo = "sos"; + tag = version; + hash = "sha256-97S8b4PfjUN8uzvp01PGCLs4J3CbwpJsgBKtY8kI0HE="; + }; + + build-system = [ python3Packages.setuptools ]; + + nativeBuildInputs = [ + gettext + ]; + + dependencies = with python3Packages; [ + packaging + pexpect + pyyaml + ]; + + # requires avocado-framework 94.0, latest version as of writing is 96.0 + doCheck = false; + + preCheck = '' + export PYTHONPATH=$PWD/tests:$PYTHONPATH + ''; + + pythonImportsCheck = [ "sos" ]; + + meta = { + description = "Unified tool for collecting system logs and other debug information"; + homepage = "https://github.com/sosreport/sos"; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + }; +} diff --git a/pkgs/by-name/so/sou/package.nix b/pkgs/by-name/so/sou/package.nix new file mode 100644 index 000000000000..56fd4f5d0e32 --- /dev/null +++ b/pkgs/by-name/so/sou/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + testers, + sou, +}: + +buildGoModule (finalAttrs: { + pname = "sou"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "knqyf263"; + repo = "sou"; + tag = "v${finalAttrs.version}"; + hash = "sha256-uGYCmW60OvEfserujQMXC9r8S8W+EN+w9EXUGjk1vtw="; + }; + + vendorHash = "sha256-6kgiZx/g1PA7R50z7noG+ql+S9wSgTuVTkY5DIqeJHY="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${finalAttrs.version}" + ]; + + # Some of the tests use localhost networking + __darwinAllowLocalNetworking = true; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + command = "HOME=$TMPDIR sou --version"; + package = sou; + }; + }; + + meta = { + description = "Tool for exploring files in container image layers"; + homepage = "https://github.com/knqyf263/sou"; + changelog = "https://github.com/knqyf263/sou/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nicolas-goudry ]; + mainProgram = "sou"; + }; +}) diff --git a/pkgs/by-name/so/souffle/package.nix b/pkgs/by-name/so/souffle/package.nix index d0f8a16c7342..8f359360ebf4 100644 --- a/pkgs/by-name/so/souffle/package.nix +++ b/pkgs/by-name/so/souffle/package.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice - copumpkin wchresta markusscherer ]; diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix index 94e1e1bd5668..108ef419e875 100644 --- a/pkgs/by-name/so/soundsource/package.nix +++ b/pkgs/by-name/so/soundsource/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "soundsource"; - version = "5.7.5"; + version = "5.8.2"; src = fetchurl { - url = "https://web.archive.org/web/20241208194405/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; - hash = "sha256-KjyhccLAAa/atSpw/H2IVt23huEY6lxC5BVAaqSG3JI="; + url = "https://web.archive.org/web/20250424131232/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; + hash = "sha256-RilL2nD0pUQKCb63uip7q9kmsKVXvEPcT+GUfZKtKNM="; }; dontUnpack = true; diff --git a/pkgs/by-name/so/soupault/package.nix b/pkgs/by-name/so/soupault/package.nix index 583ced6bbe5d..cc3506ca0fbb 100644 --- a/pkgs/by-name/so/soupault/package.nix +++ b/pkgs/by-name/so/soupault/package.nix @@ -12,7 +12,7 @@ ocamlPackages.buildDunePackage rec { pname = "soupault"; - version = "4.11.0"; + version = "5.0.0"; minimalOCamlVersion = "4.13"; @@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage rec { "https://github.com/PataphysicalSociety/soupault/archive/${version}.tar.gz" "https://codeberg.org/PataphysicalSociety/soupault/archive/${version}.tar.gz" ]; - hash = "sha256-UABbrNNcNaN9NgtAjCs4HUoNXMaK4QvCuWERuEnMG6I="; + hash = "sha256-patZn5z+ZT3dONdUojSvFgaVOmG1IpVGdehCUh2uRT8="; }; nativeBuildInputs = @@ -33,6 +33,7 @@ ocamlPackages.buildDunePackage rec { buildInputs = with ocamlPackages; [ base64 camomile + cmarkit containers csv digestif diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix new file mode 100644 index 000000000000..5760c6be9530 --- /dev/null +++ b/pkgs/by-name/so/source-meta-json-schema/package.nix @@ -0,0 +1,37 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: +let + version = "9.3.1"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "source-meta-json-schema"; + inherit version; + + src = fetchFromGitHub { + owner = "sourcemeta"; + repo = "jsonschema"; + rev = "v${version}"; + hash = "sha256-uqx2GBG4sTmFWexTr8fCP9r/o37d3vTD93giB/OEmac="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + homepage = "https://github.com/sourcemeta/jsonschema"; + description = "The CLI for working with JSON Schema. Covers formatting, linting, testing, bundling, and more for both local development and CI/CD pipelines "; + changelog = "https://github.com/sourcemeta/jsonschema/releases"; + license = with lib.licenses; [ + agpl3Plus + ]; + maintainers = with lib.maintainers; [ + amerino + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/so/sourcegit/deps.json b/pkgs/by-name/so/sourcegit/deps.json index 2093fba99bc3..b702e5011c1e 100644 --- a/pkgs/by-name/so/sourcegit/deps.json +++ b/pkgs/by-name/so/sourcegit/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Avalonia", - "version": "11.2.5", - "hash": "sha256-DGTMzInnfvJUJWu2SXiRBercxxe1/paQkSlBHMahp4g=" + "version": "11.2.8", + "hash": "sha256-GbZIXopQh6VSRLAg47TRWHvMYEl5/c7rtvNmFnlDhAo=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -11,8 +11,8 @@ }, { "pname": "Avalonia.AvaloniaEdit", - "version": "11.1.0", - "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8=" + "version": "11.2.0", + "hash": "sha256-AFe1jt9xR8XGq4tKkxOdUd7aQOGRSE+M2EQ8fOiV6xo=" }, { "pname": "Avalonia.BuildServices", @@ -21,43 +21,43 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.5", - "hash": "sha256-gWGIqXrac0fOnmGbovcFWv5Uj14hOyC+n0l45N7owMg=" + "version": "11.2.8", + "hash": "sha256-jcCErs44R9tl6zjMkRxdwU9lBxv13MOZMi9Hcm7Tals=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.5", - "hash": "sha256-eGKc+UnsO5nNiUd7+n3CQW6vIWq2qpazYvYXrVTQY7s=" + "version": "11.2.8", + "hash": "sha256-bAbHI5bKyTYksXsnOS5poBBxdhYQE/HSj52YxqGvkok=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.5", - "hash": "sha256-rDJ1NJM3tEqB7sRszj0AfplwkkvtE3Hvn7acrIsq+yw=" + "version": "11.2.8", + "hash": "sha256-Mr2x3hm3ArlQwGlWO9MuFWUelf4EVmVPAGANm1MxM1o=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.5", - "hash": "sha256-WsAMBmNfUKMB2II3AfM8A0klfJR/vgEtRUTGpgC6F3A=" + "version": "11.2.8", + "hash": "sha256-3+88G0O1LrQSCSxI6s0aFD34nhgqTH1b3rMXBaXqY0M=" }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.2.5", - "hash": "sha256-cPdNS/VWH6yZ/9Ea+U5UBx6RgC0SpkhKonBxZ6InLLU=" + "version": "11.2.8", + "hash": "sha256-NEi00PZS1sMHl94FuPIdd7PvHPk/kryszT5NHBJdiyg=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.5", - "hash": "sha256-rLzsxUQS1LLLcLWkDR8SLLwLY53vUMqgiKoDWM6PjtM=" + "version": "11.2.8", + "hash": "sha256-X9VxRmeK6Vu8c9ILtF/KyDi0B0CmjeZcTRnwouCYOWg=" }, { "pname": "Avalonia.Native", - "version": "11.2.5", - "hash": "sha256-XQQgcfbRRHPzH432M1KzkSEtLQof40yCt+KIrQREBY0=" + "version": "11.2.8", + "hash": "sha256-YVjhd2fjOamYdYEh4jGGZy06xPAq3juTH2nC7cOlGOA=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.5", - "hash": "sha256-Mpml6U6Fl8FUvENGQxpxuw0+pOPvoWbZXV4V1bLUS9w=" + "version": "11.2.8", + "hash": "sha256-v30kDbStvHAS4IOV0wEkWYXOdh4SdjaDEcKVD+6xpzc=" }, { "pname": "Avalonia.Skia", @@ -66,38 +66,38 @@ }, { "pname": "Avalonia.Skia", - "version": "11.2.5", - "hash": "sha256-su1K1RmQ+syE6ufjrzpQR1yiUa6GEtY5QPlW0GOVKnU=" + "version": "11.2.8", + "hash": "sha256-V84jNsrMNguAt9ZdSEf74F4OTC3WyXLuLrkByxfHJe4=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.5", - "hash": "sha256-Wb6H3Vb5gsL8bKzmaJgFZBEsu3MI0CCdlXfO5SLisdo=" + "version": "11.2.8", + "hash": "sha256-qHwn8BPAPHxNJ3Ya3xPUhEzItXVjNbI5YjEsNqQLJ8s=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.5", - "hash": "sha256-EjQ2XA81SS91h8oGUwVxLYewm3Lp5Sa2Lmbj0c8y8BU=" + "version": "11.2.8", + "hash": "sha256-vEFjwS+X6EkxVXDFk97b4S4AjbLVjPD3dYVADrBnoXo=" }, { "pname": "Avalonia.Win32", - "version": "11.2.5", - "hash": "sha256-ljgJgXDxmHOUQ+p8z62mtaK4FTmYAI+c+6gL2lczD/8=" + "version": "11.2.8", + "hash": "sha256-3XYJXXT9IMECwCNbrzV49x0pyJZx6Vbib53Vbe9Gfjg=" }, { "pname": "Avalonia.X11", - "version": "11.2.5", - "hash": "sha256-wHEHcEvOUyIBgBtQZOIs330KajSv8DSEsJP7w4M9i4E=" + "version": "11.2.8", + "hash": "sha256-+m8pNxda2vyFVBR+7IhkTaQ4Zm7gqkT0XgKSp+lWWmA=" }, { "pname": "AvaloniaEdit.TextMate", - "version": "11.1.0", - "hash": "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM=" + "version": "11.2.0", + "hash": "sha256-O9uQHHMwXCf6xaK+oUNRPJUQC6+p97UmZU1OsLOeroI=" }, { "pname": "Azure.AI.OpenAI", - "version": "2.2.0-beta.2", - "hash": "sha256-piF7uZK1YsrRZ3omehi6P0DI6OF2sBsGDpOp45gnp4Y=" + "version": "2.2.0-beta.4", + "hash": "sha256-aEvGCQxOBZifg5nDSDILvQhLkmcbH/iIqtUMwfclDRA=" }, { "pname": "Azure.Core", @@ -159,6 +159,11 @@ "version": "6.0.0", "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "6.0.0", + "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw=" + }, { "pname": "Onigwrap", "version": "1.0.6", @@ -166,8 +171,8 @@ }, { "pname": "OpenAI", - "version": "2.2.0-beta.2", - "hash": "sha256-YpHpgovxgfI72lQ4fIDkPxwv3YkofWOBssAphrRnOyw=" + "version": "2.2.0-beta.4", + "hash": "sha256-kkNb9Jp7djvE2060+HIGoqnkFpOzQ5l/PK5oH4FO3e4=" }, { "pname": "SkiaSharp", @@ -209,6 +214,11 @@ "version": "1.2.1", "hash": "sha256-MNFNrCAhD+vj97gVXdJIm3QmY++y25zBZtiIXrGdQ2c=" }, + { + "pname": "System.ClientModel", + "version": "1.4.0-beta.1", + "hash": "sha256-FcIblwx2HJU2zJI5tjvMqwWVe5eJcACZt12fRPNppak=" + }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "6.0.1", @@ -224,6 +234,11 @@ "version": "6.0.0", "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" }, + { + "pname": "System.Memory.Data", + "version": "6.0.1", + "hash": "sha256-RXS82gmLtIOAUaGqTc8J3bVbHTL5pnW3QFE3G+Xb5Jk=" + }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix index 7e599f8b8cf1..9bde3e8b5bc2 100644 --- a/pkgs/by-name/so/sourcegit/package.nix +++ b/pkgs/by-name/so/sourcegit/package.nix @@ -19,13 +19,13 @@ buildDotnetModule (finalAttrs: { pname = "sourcegit"; - version = "2025.08"; + version = "2025.17"; src = fetchFromGitHub { owner = "sourcegit-scm"; repo = "sourcegit"; tag = "v${finalAttrs.version}"; - hash = "sha256-dX782yQMo5MFMZKbLor5Hk6SKc11Em0qdbIClUYOe3I="; + hash = "sha256-rpgsaWpVREftEve7vhAi42mNvWWU8Bl+4fUbUwJf1M4="; }; patches = [ ./fix-darwin-git-path.patch ]; diff --git a/pkgs/by-name/so/sourcepawn-studio/package.nix b/pkgs/by-name/so/sourcepawn-studio/package.nix new file mode 100644 index 000000000000..b6208dca0514 --- /dev/null +++ b/pkgs/by-name/so/sourcepawn-studio/package.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "sourcepawn-studio"; + version = "8.1.2"; + + src = fetchFromGitHub { + owner = "Sarrus1"; + repo = "sourcepawn-studio"; + tag = "v${finalAttrs.version}"; + hash = "sha256-L/xgzWbhfRTvoRElKApb9JKXNfqJF+nfDk9Xo/qwL00="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-5Zd3Stoi8AqsZE38pnilmjuRMgTPAGB+R8QI2JFZ7s4="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + checkFlags = [ + # requires rustup and rustfmt + "--skip tests::sourcegen::generate_node_kinds" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "sourcepawn-studio"; + description = "LSP implementation for the SourcePawn programming language written in Rust"; + homepage = "https://sarrus1.github.io/sourcepawn-studio/"; + changelog = "https://github.com/Sarrus1/sourcepawn-studio/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.awwpotato ]; + }; +}) diff --git a/pkgs/applications/misc/audio/sox/0001-musl-rewind-pipe-workaround.patch b/pkgs/by-name/so/sox/0001-musl-rewind-pipe-workaround.patch similarity index 100% rename from pkgs/applications/misc/audio/sox/0001-musl-rewind-pipe-workaround.patch rename to pkgs/by-name/so/sox/0001-musl-rewind-pipe-workaround.patch diff --git a/pkgs/by-name/so/sox/package.nix b/pkgs/by-name/so/sox/package.nix new file mode 100644 index 000000000000..1a7f6081b301 --- /dev/null +++ b/pkgs/by-name/so/sox/package.nix @@ -0,0 +1,97 @@ +{ + config, + lib, + stdenv, + fetchgit, + autoreconfHook, + autoconf-archive, + pkg-config, + enableAlsa ? true, + alsa-lib, + enableLibao ? true, + libao, + enableLame ? config.sox.enableLame or false, + lame, + enableLibmad ? true, + libmad, + enableLibogg ? true, + libogg, + libvorbis, + enableOpusfile ? true, + opusfile, + enableFLAC ? true, + flac, + enablePNG ? true, + libpng, + enableLibsndfile ? true, + libsndfile, + enableWavpack ? true, + wavpack, + # amrnb and amrwb are unfree, disabled by default + enableAMR ? false, + amrnb, + amrwb, + enableLibpulseaudio ? + stdenv.hostPlatform.isLinux && lib.meta.availableOn stdenv.hostPlatform libpulseaudio, + libpulseaudio, +}: + +stdenv.mkDerivation { + pname = "sox"; + version = "unstable-2021-05-09"; + + src = fetchgit { + # not really needed, but when this src was updated from `fetchurl -> + # fetchgit`, we spared the mass rebuild by changing this `name` and + # therefor merge this to `master` and not to `staging`. + name = "source"; + url = "https://git.code.sf.net/p/sox/code"; + rev = "42b3557e13e0fe01a83465b672d89faddbe65f49"; + hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c="; + }; + + outputs = [ + "out" + "dev" + "lib" + "man" + ]; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + ]; + + patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; + + buildInputs = + lib.optional (enableAlsa && stdenv.hostPlatform.isLinux) alsa-lib + ++ lib.optional enableLibao libao + ++ lib.optional enableLame lame + ++ lib.optional enableLibmad libmad + ++ lib.optionals enableLibogg [ + libogg + libvorbis + ] + ++ lib.optional enableOpusfile opusfile + ++ lib.optional enableFLAC flac + ++ lib.optional enablePNG libpng + ++ lib.optional enableLibsndfile libsndfile + ++ lib.optional enableWavpack wavpack + ++ lib.optionals enableAMR [ + amrnb + amrwb + ] + ++ lib.optional enableLibpulseaudio libpulseaudio; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Sample Rate Converter for audio"; + homepage = "https://sox.sourceforge.net/"; + maintainers = with maintainers; [ marcweber ]; + license = if enableAMR then licenses.unfree else licenses.gpl2Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/so/soxr/package.nix b/pkgs/by-name/so/soxr/package.nix index 61121b019e5f..156650a09ef1 100644 --- a/pkgs/by-name/so/soxr/package.nix +++ b/pkgs/by-name/so/soxr/package.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + # Workaround for upstream not using GNUInstallDirs. + "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" + ]; + meta = with lib; { description = "Audio resampling library"; homepage = "https://soxr.sourceforge.net"; diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix index cd8a5bae52ca..a14e5f750236 100644 --- a/pkgs/by-name/so/sozu/package.nix +++ b/pkgs/by-name/so/sozu/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - darwin, protobuf, nix-update-script, testers, @@ -26,8 +25,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - doCheck = false; passthru = { diff --git a/pkgs/by-name/sp/space-station-14-launcher/deps.json b/pkgs/by-name/sp/space-station-14-launcher/deps.json index 97c320c9e91f..5dee9fb6ad82 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/deps.json +++ b/pkgs/by-name/sp/space-station-14-launcher/deps.json @@ -1,78 +1,83 @@ [ { "pname": "Avalonia", - "version": "11.0.5", - "hash": "sha256-BqpHqQIObTb7DHTyZAgCD9A5I0pZkHhSoPTN2g6/G9E=" + "version": "11.2.4", + "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4=" }, { "pname": "Avalonia.Angle.Windows.Natives", - "version": "2.1.0.2023020321", - "hash": "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks=" + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.0.5", - "hash": "sha256-Iob8OyWhwXhmHKCdnea7dtL9VQvcrf6/gUGHJ30CKXA=" + "version": "11.2.4", + "hash": "sha256-21Wfb4p0dCevw8Iu/Fchngt1teAnBaxEWgiUpFkerTo=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.0.5", - "hash": "sha256-2iVuMPRw7sbsYPGSG4XjQFGFky5WB5B05Jh1+I852ZI=" + "version": "11.2.4", + "hash": "sha256-fqQBKzHcL0CwuOQ90Gp+UUZZP9OQ9U6H41bvikxQJpo=" }, { "pname": "Avalonia.Desktop", - "version": "11.0.5", - "hash": "sha256-UKVibxhJoGNvEGh8J/Z0sq8J81FT8yth/yXVPSFHF/8=" + "version": "11.2.4", + "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.0.5", - "hash": "sha256-0cUxPYJP2W11wnM6j4qNB3IvHlsUp9EZlY8I/NoAmd4=" + "version": "11.2.4", + "hash": "sha256-MUSfRXeJ1bstO2rTqWWCQyVq2EpjM5b5bxe0KxVAEU4=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.0.5", - "hash": "sha256-O20fC/9YXO3/MZNlh1EgWLHFSyi/ao083MKwjetgxmo=" + "version": "11.2.4", + "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk=" + }, + { + "pname": "Avalonia.Markup.Xaml.Loader", + "version": "11.2.4", + "hash": "sha256-iSf5UmeWi6D7uVblYj3eMN9pljwKA6O0pAz1UYE38kQ=" }, { "pname": "Avalonia.Native", - "version": "11.0.5", - "hash": "sha256-KVUAXXT+f4VrtJ8widfEIzN25GBbtXWog/tpM354gdg=" + "version": "11.2.4", + "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.0.5", - "hash": "sha256-8tGLyA0PRKt1REb9YeCtEDz5oB886PRG35aO0uZm/jU=" + "version": "11.2.4", + "hash": "sha256-LqwLUDCIbJowol6BNTTsK7a7KjcLLbCM3y3KKvuHRGw=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.0.5", - "hash": "sha256-wTqdxPU3Ql7jC4JFkChbUfaRR0nqUKrYKn8oexdFyig=" + "version": "11.2.4", + "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc=" }, { "pname": "Avalonia.Skia", - "version": "11.0.5", - "hash": "sha256-rKOgkNLCwEVVcyLCimvhDUDKXnrDOguUryaGVOPFFwE=" + "version": "11.2.4", + "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.0.5", - "hash": "sha256-27evmgSrIx+EopF6E3N1cT7BvAUc/s99TVEMfmG83cQ=" + "version": "11.2.4", + "hash": "sha256-rnF2/bzN8AuOFlsuekOxlu+uLI7n1kIAmC36FFXMKak=" }, { "pname": "Avalonia.Win32", - "version": "11.0.5", - "hash": "sha256-ncZLGKhpfjuuVPz4Fs+P6L3dM0KRnwAC3xJRqyvpKw8=" + "version": "11.2.4", + "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY=" }, { "pname": "Avalonia.X11", - "version": "11.0.5", - "hash": "sha256-rvs3hwRh3F5E1j3JqcodWJTHV3BTWMKkvzq170tuPa4=" + "version": "11.2.4", + "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk=" }, { "pname": "CodeHollow.FeedReader", @@ -86,8 +91,8 @@ }, { "pname": "DynamicData", - "version": "7.13.1", - "hash": "sha256-wSMqsqAWKqVaIDVlRtycTiS0R3fQxknfEPfBaYVawkM=" + "version": "8.4.1", + "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4=" }, { "pname": "Fody", @@ -96,28 +101,38 @@ }, { "pname": "HarfBuzzSharp", - "version": "2.8.2.3", - "hash": "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ=" + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "2.8.2.3", - "hash": "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg=" + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "2.8.2.3", - "hash": "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ=" + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "2.8.2.3", - "hash": "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA=" + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "2.8.2.3", - "hash": "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI=" + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + }, + { + "pname": "HotAvalonia", + "version": "2.1.0", + "hash": "sha256-dAsVw79exJeQBCCMwJDv7SWARl3dcSIEYcjcmusLqJM=" + }, + { + "pname": "HotAvalonia.Extensions", + "version": "2.1.0", + "hash": "sha256-96H37VvKh2E42KNXtUClhvArcJeX6/diooD2HEcNbOY=" }, { "pname": "JetBrains.Annotations", @@ -149,36 +164,6 @@ "version": "0.11.0", "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" }, - { - "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.0.0", - "hash": "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0=" - }, - { - "pname": "Microsoft.CodeAnalysis.Common", - "version": "3.8.0", - "hash": "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o=" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "3.8.0", - "hash": "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4=" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp.Scripting", - "version": "3.8.0", - "hash": "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA=" - }, - { - "pname": "Microsoft.CodeAnalysis.Scripting.Common", - "version": "3.8.0", - "hash": "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I=" - }, - { - "pname": "Microsoft.CSharp", - "version": "4.3.0", - "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8=" - }, { "pname": "Microsoft.Data.Sqlite.Core", "version": "7.0.4", @@ -189,36 +174,46 @@ "version": "8.0.0", "hash": "sha256-BAbtucZQvBgbiJ51UAL/Ilx+dz96LpWmfjnnNGlcw48=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "2.1.2", - "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" - }, { "pname": "Microsoft.Toolkit.Mvvm", "version": "7.1.2", "hash": "sha256-JOxZGQGm1WPkIpIDurQnlYk+QgHxJLPguJfCQLJ8NEM=" }, { - "pname": "Microsoft.Win32.SystemEvents", - "version": "6.0.0", - "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" + "pname": "Mono.Cecil", + "version": "0.11.5", + "hash": "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA=" }, { "pname": "Mono.Posix.NETStandard", "version": "1.0.0", "hash": "sha256-/F61k7MY/fu2FcfW7CkyjuUroKwlYAXPQFVeDs1QknY=" }, + { + "pname": "MonoMod.Backports", + "version": "1.1.2", + "hash": "sha256-oXhcnMo0rDZDcpmhGVhQhax0lFeb9DT3GfSooesOo38=" + }, + { + "pname": "MonoMod.Core", + "version": "1.2.1", + "hash": "sha256-EQ4CX9OGxBPMDqMCdrudkGY/ywZUi3rtFszDcgp7MBg=" + }, + { + "pname": "MonoMod.ILHelpers", + "version": "1.1.0", + "hash": "sha256-seoET5fqsyOY8g7DfNpLQHNTdUVY3U/xCoYFC4UrOKw=" + }, + { + "pname": "MonoMod.RuntimeDetour", + "version": "25.2.1", + "hash": "sha256-ZlgzMqquKWwv8+MvOhIEdvoPShFe7nUAZ3evWhGoLsc=" + }, + { + "pname": "MonoMod.Utils", + "version": "25.0.7", + "hash": "sha256-GegA6fMRLYVeB75ypkIfTdqgGT38fcKqY/McqZE27qQ=" + }, { "pname": "NSec.Cryptography", "version": "22.4.0", @@ -226,8 +221,8 @@ }, { "pname": "ReactiveUI", - "version": "18.4.26", - "hash": "sha256-SvWTQfgwwIIwwj67J42fb+Gm8u74iawPd7JqYuYmEnY=" + "version": "20.1.1", + "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE=" }, { "pname": "ReactiveUI.Fody", @@ -274,141 +269,6 @@ "version": "0.1.2", "hash": "sha256-ANaf6S0tsocsw37RJvk9d4LcvVQ0+1yO900iG1BLwe4=" }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" - }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" - }, { "pname": "Serilog", "version": "2.12.0", @@ -431,28 +291,28 @@ }, { "pname": "SkiaSharp", - "version": "2.88.6", - "hash": "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc=" + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.6", - "hash": "sha256-VjgGoi73tVvqO/UXmQb1w9ioAbFu2dxH8oHz1l5H4zE=" + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.6", - "hash": "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo=" + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.6", - "hash": "sha256-CIb9fHVgHwIa0R1WafKJ3+GqtDHHRgDohA3ayTHvlws=" + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.6", - "hash": "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA=" + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, { "pname": "SpaceWizards.Sodium", @@ -466,8 +326,8 @@ }, { "pname": "Splat", - "version": "14.6.8", - "hash": "sha256-XHTuUKAisBU0O3keA+Ojzb8yKKJUheWbRHakzLBeQNo=" + "version": "15.1.1", + "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", @@ -489,60 +349,15 @@ "version": "2.1.4", "hash": "sha256-Zdj676VT6j6k9ZCL2hYVl4F8bi4TK/ldvQBPmW0oDi0=" }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" - }, - { - "pname": "System.Collections.Immutable", - "version": "5.0.0", - "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8=" - }, { "pname": "System.ComponentModel.Annotations", - "version": "4.5.0", - "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" - }, - { - "pname": "System.Drawing.Common", - "version": "6.0.0", - "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.3.0", - "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU=" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + "version": "5.0.0", + "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" }, { "pname": "System.IO.Pipelines", - "version": "6.0.0", - "hash": "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA=" - }, - { - "pname": "System.Linq", - "version": "4.3.0", - "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.3.0", - "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, { "pname": "System.Memory", @@ -560,119 +375,14 @@ "hash": "sha256-wSK5KtWvlDp8WLNddCmAM66uGyj9/KfJyCh8ht1PD1M=" }, { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" - }, - { - "pname": "System.ObjectModel", - "version": "4.3.0", - "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + "pname": "System.Reactive", + "version": "6.0.0", + "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" }, { "pname": "System.Reactive", - "version": "5.0.0", - "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE=" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.3.0", - "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "5.0.0", - "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.3.0", - "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.7.1", - "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "4.5.1", - "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw=" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + "version": "6.0.1", + "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" }, { "pname": "TerraFX.Interop.Windows", @@ -681,8 +391,8 @@ }, { "pname": "Tmds.DBus.Protocol", - "version": "0.15.0", - "hash": "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU=" + "version": "0.20.0", + "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" }, { "pname": "YamlDotNet", diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix index d39129c092a2..54bff729de14 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/package.nix +++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix @@ -1,42 +1,184 @@ { + lib, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, + wrapGAppsHook4, + iconConvTools, + copyDesktopItems, + makeDesktopItem, + libX11, + libICE, + libSM, + libXi, + libXcursor, + libXext, + libXrandr, + fontconfig, + glew, + SDL2, + glfw, + glibc, + libGL, + freetype, + openal, + fluidsynth, + gtk3, + pango, + atk, + cairo, + zlib, + glib, + gdk-pixbuf, soundfont-fluid, - buildFHSEnv, - runCommand, - callPackage, + + # Path to set ROBUST_SOUNDFONT_OVERRIDE to, essentially the default soundfont used. + soundfont-path ? "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2", }: - let - space-station-14-launcher = callPackage ./space-station-14-launcher.nix { }; - - # Workaround for hardcoded soundfont paths in downloaded engine assemblies. - soundfont-fluid-fixed = runCommand "soundfont-fluid-fixed" { } '' - mkdir -p "$out/share/soundfonts" - ln -sf ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 $out/share/soundfonts/FluidR3_GM.sf2 - ''; + version = "0.31.0"; + pname = "space-station-14-launcher"; in -buildFHSEnv rec { - pname = "space-station-14-launcher-wrapped"; - inherit (space-station-14-launcher) version; +buildDotnetModule rec { + inherit pname; - targetPkgs = pkgs: [ - space-station-14-launcher - soundfont-fluid-fixed + # Workaround to prevent buildDotnetModule from overriding assembly versions. + name = "${pname}-${version}"; + + # A bit redundant but I don't trust this package to be maintained by anyone else. + src = fetchFromGitHub { + owner = "space-wizards"; + repo = "SS14.Launcher"; + rev = "v${version}"; + hash = "sha256-lEgJ+GdmiSQMl/l+CTBIUevMcJi+yVvFuS3buTNCYW4="; + fetchSubmodules = true; + }; + + buildType = "Release"; + selfContainedBuild = false; + + projectFile = [ + "SS14.Loader/SS14.Loader.csproj" + "SS14.Launcher/SS14.Launcher.csproj" ]; - runScript = "SS14.Launcher"; + nugetDeps = ./deps.json; - extraInstallCommands = '' - mkdir -p $out/share/applications - ln -s ${space-station-14-launcher}/share/icons $out/share - cp ${space-station-14-launcher}/share/applications/space-station-14-launcher.desktop "$out/share/applications" - substituteInPlace "$out/share/applications/space-station-14-launcher.desktop" \ - --replace ${space-station-14-launcher.meta.mainProgram} ${meta.mainProgram} + passthru = { + inherit version; + }; + + # SDK 8.0 required for Robust.LoaderApi + dotnet-sdk = + with dotnetCorePackages; + combinePackages [ + sdk_9_0 + sdk_8_0 + ]; + dotnet-runtime = dotnetCorePackages.runtime_9_0; + + dotnetFlags = [ + "-p:FullRelease=true" + "-p:RobustILLink=true" + "-nologo" + ]; + + nativeBuildInputs = [ + wrapGAppsHook4 + iconConvTools + copyDesktopItems + ]; + + LD_LIBRARY_PATH = lib.makeLibraryPath [ + fontconfig + libX11 + libICE + libSM + libXi + libXcursor + libXext + libXrandr + + glfw + SDL2 + glibc + libGL + openal + freetype + fluidsynth + ]; + + runtimeDeps = [ + # Required by the game. + glfw + SDL2 + glibc + libGL + openal + freetype + fluidsynth + + # Needed for file dialogs. + gtk3 + pango + cairo + atk + zlib + glib + gdk-pixbuf + + # Avalonia UI dependencies. + libX11 + libICE + libSM + libXi + libXcursor + libXext + libXrandr + fontconfig + glew + + # TODO: Figure out dependencies for CEF support. + ]; + + # ${soundfont-path} is escaped here: + # https://github.com/NixOS/nixpkgs/blob/d29975d32b1dc7fe91d5cb275d20f8f8aba399ad/pkgs/build-support/setup-hooks/make-wrapper.sh#L126C35-L126C45 + # via https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html under ${parameter@operator} + makeWrapperArgs = [ ''--set ROBUST_SOUNDFONT_OVERRIDE ${soundfont-path}'' ]; + + executables = [ "SS14.Launcher" ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = meta.mainProgram; + icon = pname; + desktopName = "Space Station 14 Launcher"; + comment = meta.description; + categories = [ "Game" ]; + startupWMClass = meta.mainProgram; + }) + ]; + + postInstall = '' + mkdir -p $out/lib/space-station-14-launcher/loader + cp -r SS14.Loader/bin/${buildType}/*/*/* $out/lib/space-station-14-launcher/loader/ + + icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico space-station-14-launcher $out ''; - passthru = space-station-14-launcher.passthru // { - unwrapped = space-station-14-launcher; - }; - meta = space-station-14-launcher.meta // { - mainProgram = pname; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Launcher for Space Station 14, a multiplayer game about paranoia and disaster"; + homepage = "https://spacestation14.io"; + license = licenses.mit; + maintainers = [ ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "SS14.Launcher"; }; } diff --git a/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix deleted file mode 100644 index 12455e9dc40e..000000000000 --- a/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ - lib, - buildDotnetModule, - dotnetCorePackages, - fetchFromGitHub, - wrapGAppsHook3, - iconConvTools, - copyDesktopItems, - makeDesktopItem, - glew, - SDL2, - glfw, - glibc, - libGL, - freetype, - openal, - fluidsynth, - gtk3, - pango, - atk, - cairo, - zlib, - glib, - gdk-pixbuf, -}: -let - version = "0.29.1"; - pname = "space-station-14-launcher"; -in -buildDotnetModule rec { - inherit pname version; - - # Workaround to prevent buildDotnetModule from overriding assembly versions. - name = "${pname}-${version}"; - - src = fetchFromGitHub { - owner = "space-wizards"; - repo = "SS14.Launcher"; - rev = "v${version}"; - hash = "sha256-Gajs8zINWBJ3BvAPKYan0bCRbEVscz56pyE9WOLiOqU="; - fetchSubmodules = true; - }; - - buildType = "Release"; - selfContainedBuild = false; - - projectFile = [ - "SS14.Loader/SS14.Loader.csproj" - "SS14.Launcher/SS14.Launcher.csproj" - ]; - - nugetDeps = ./deps.json; - - passthru = { - inherit version; # Workaround so update script works. - updateScript = ./update.sh; - }; - - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; - - dotnetFlags = [ - "-p:FullRelease=true" - "-p:RobustILLink=true" - "-nologo" - ]; - - nativeBuildInputs = [ - wrapGAppsHook3 - iconConvTools - copyDesktopItems - ]; - - runtimeDeps = [ - # Required by the game. - glfw - SDL2 - glibc - libGL - openal - freetype - fluidsynth - - # Needed for file dialogs. - gtk3 - pango - cairo - atk - zlib - glib - gdk-pixbuf - - # Avalonia UI dependencies. - glew - ]; - - executables = [ "SS14.Launcher" ]; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = meta.mainProgram; - icon = pname; - desktopName = "Space Station 14 Launcher"; - comment = meta.description; - categories = [ "Game" ]; - startupWMClass = meta.mainProgram; - }) - ]; - - postInstall = '' - mkdir -p $out/lib/space-station-14-launcher/loader - cp -r SS14.Loader/bin/${buildType}/*/*/* $out/lib/space-station-14-launcher/loader/ - - icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico space-station-14-launcher $out - ''; - - dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - meta = with lib; { - description = "Launcher for Space Station 14, a multiplayer game about paranoia and disaster"; - homepage = "https://spacestation14.io"; - license = licenses.mit; - maintainers = [ ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "SS14.Launcher"; - }; -} diff --git a/pkgs/by-name/sp/space-station-14-launcher/update.sh b/pkgs/by-name/sp/space-station-14-launcher/update.sh deleted file mode 100755 index 6e8b337d3842..000000000000 --- a/pkgs/by-name/sp/space-station-14-launcher/update.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /usr/bin/env nix-shell -#! 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/space-wizards/SS14.Launcher/releases?per_page=1" | jq -r '.[0].tag_name' | sed 's/v//')" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./space-station-14-launcher.nix)" - -if [[ "$new_version" == "$old_version" ]]; then - echo "Already up to date!" - exit 0 -fi - -cd ../../.. -update-source-version space-station-14-launcher.unwrapped "$new_version" -$(nix-build -A space-station-14-launcher.fetch-deps --no-out-link) diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix index 5be2be78aa8b..570f7da08da7 100644 --- a/pkgs/by-name/sp/spacectl/package.nix +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "spacectl"; - version = "1.11.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "spacelift-io"; repo = "spacectl"; rev = "v${version}"; - hash = "sha256-3s64o4rmkbvT9rOdqYZN1No08Lh1S4oNlIal+otfhWU="; + hash = "sha256-UNucwxFafGiMimbOeYVbz1+udW8faJ+Y8/QDW7HRFtc="; }; - vendorHash = "sha256-TvniuTdw7zRS/x5aPaWtdaEdET4tHbH5gokSiWiaqDo="; + vendorHash = "sha256-L0Dm9LymnXLMj6Yv+K4x85VsH+QKfSnVsOPLXHZ/Knc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sp/spacenavd/package.nix b/pkgs/by-name/sp/spacenavd/package.nix new file mode 100644 index 000000000000..0914c8898cec --- /dev/null +++ b/pkgs/by-name/sp/spacenavd/package.nix @@ -0,0 +1,42 @@ +{ + stdenv, + lib, + fetchFromGitHub, + libXext, + libX11, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "spacenavd"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "FreeSpacenav"; + repo = "spacenavd"; + tag = "v${finalAttrs.version}"; + hash = "sha256-O6gkd+9iW6X8eMN99Ajz9Z0tqZBtbVEYDb67yI1b/Bk="; + }; + + buildInputs = [ + libX11 + libXext + ]; + + configureFlags = [ "--disable-debug" ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + postInstall = '' + install -Dm644 $src/contrib/systemd/spacenavd.service -t $out/lib/systemd/system + substituteInPlace $out/lib/systemd/system/spacenavd.service \ + --replace-fail "/usr/local/bin/spacenavd" "$out/bin/spacenavd" + ''; + + meta = with lib; { + homepage = "https://spacenav.sourceforge.net/"; + description = "Device driver and SDK for 3Dconnexion 3D input devices"; + longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ sohalt ]; + }; +}) diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix index e6c64c1c4484..1236d29e9a58 100644 --- a/pkgs/by-name/sp/spaceship-prompt/package.nix +++ b/pkgs/by-name/sp/spaceship-prompt/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "4.17.0"; + version = "4.18.0"; src = fetchFromGitHub { owner = "denysdovhan"; repo = "spaceship-prompt"; rev = "v${version}"; - sha256 = "sha256-a7z/z++dmwMqIrutOc74ljz/Tu/wuEuQaN2XRBMtOvw="; + sha256 = "sha256-ymIOv4GRwDpD3bbs81muzecsrUcKSYaPcR7mcaSYbl8="; }; strictDeps = true; diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix index c96a27fac831..43802b8c824c 100644 --- a/pkgs/by-name/sp/spacetimedb/package.nix +++ b/pkgs/by-name/sp/spacetimedb/package.nix @@ -9,28 +9,24 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "spacetimedb"; - version = "1.0.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "clockworklabs"; repo = "spacetimedb"; tag = "v${finalAttrs.version}"; - hash = "sha256-yqBKZOUDdvBcW8OzO832P75miNKUluR+fR1FSOcDoSM="; + hash = "sha256-eBbRdkJafkMXOEsnh1yoht8WJAwZToPobWnhjTWhnA4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-W3SbJE0tt391k6MscgaijCStSyzfTN2MR66a6K+Ui4s="; + cargoHash = "sha256-gs1A/gtjA941TWZw+wxMR+9TCayRa1k49/G8XnzW2ek="; nativeBuildInputs = [ pkg-config perl + git ]; - # Replace hardcoded git binary - postPatch = '' - substituteInPlace crates/cli/build.rs --replace-fail 'Command::new("git")' 'Command::new("${lib.getExe git}")' - ''; - cargoBuildFlags = [ "-p spacetimedb-standalone -p spacetimedb-cli" ]; checkFlags = [ diff --git a/pkgs/by-name/sp/sparkle/package.nix b/pkgs/by-name/sp/sparkle/package.nix new file mode 100644 index 000000000000..406b801fe134 --- /dev/null +++ b/pkgs/by-name/sp/sparkle/package.nix @@ -0,0 +1,91 @@ +{ + lib, + stdenv, + fetchurl, + dpkg, + autoPatchelfHook, + nss, + nspr, + alsa-lib, + openssl, + webkitgtk_4_0, + udev, + libayatana-appindicator, + libGL, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sparkle"; + version = "1.6.4"; + + src = + let + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + arch = selectSystem { + x86_64-linux = "amd64"; + aarch64-linux = "arm64"; + }; + in + fetchurl { + url = "https://github.com/xishang0128/sparkle/releases/download/${finalAttrs.version}/sparkle-linux-${finalAttrs.version}-${arch}.deb"; + hash = selectSystem { + x86_64-linux = "sha256-Q2TWrYNz3BAV8rBflxMuIQOogs+QJmmEidnGSOXaZgQ="; + aarch64-linux = "sha256-m/aAnAJpu9ycXECQJNrCpwFN76kWGFKvWfLXiJQbrWE="; + }; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; + + buildInputs = [ + nss + nspr + alsa-lib + openssl + webkitgtk_4_0 + (lib.getLib stdenv.cc.cc) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r opt $out/opt + cp -r usr/share $out/share + substituteInPlace $out/share/applications/sparkle.desktop \ + --replace-fail "/opt/sparkle/sparkle" "sparkle" + ln -s $out/opt/sparkle/sparkle $out/bin/sparkle + + runHook postInstall + ''; + + preFixup = '' + patchelf --add-needed libGL.so.1 \ + --add-rpath ${ + lib.makeLibraryPath [ + libGL + udev + libayatana-appindicator + ] + } $out/opt/sparkle/sparkle + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Another Mihomo GUI"; + homepage = "https://github.com/xishang0128/sparkle"; + mainProgram = "sparkle"; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + license = lib.licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ emaryn ]; + }; +}) diff --git a/pkgs/by-name/sp/sparkle/update.sh b/pkgs/by-name/sp/sparkle/update.sh new file mode 100755 index 000000000000..2aa1a555d142 --- /dev/null +++ b/pkgs/by-name/sp/sparkle/update.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix curl coreutils common-updater-scripts nix-update jq + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; sparkle.version or (lib.getVersion sparkle)" | tr -d '"') +latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/xishang0128/sparkle/releases/latest | jq --raw-output .tag_name) + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +nix-update sparkle --version $latestVersion --system x86_64-linux +hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; sparkle.src.url" --system aarch64-linux | tr -d '"'))) +update-source-version sparkle $latestVersion $hash --system=aarch64-linux --ignore-same-version diff --git a/pkgs/by-name/sp/spatialite-gui/package.nix b/pkgs/by-name/sp/spatialite-gui/package.nix index df336adc0bfa..b9c2bb58678f 100644 --- a/pkgs/by-name/sp/spatialite-gui/package.nix +++ b/pkgs/by-name/sp/spatialite-gui/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + libpq.pg_config pkg-config ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gaia-gis.it/fossil/spatialite_gui"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = teams.geospatial.members; + teams = [ teams.geospatial ]; mainProgram = "spatialite_gui"; }; } diff --git a/pkgs/by-name/sp/spatialite-tools/package.nix b/pkgs/by-name/sp/spatialite-tools/package.nix index b19c2f08a648..e7fd11efae7e 100644 --- a/pkgs/by-name/sp/spatialite-tools/package.nix +++ b/pkgs/by-name/sp/spatialite-tools/package.nix @@ -67,7 +67,8 @@ stdenv.mkDerivation rec { lgpl21Plus ]; platforms = lib.platforms.unix; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ dotlambda ]); + maintainers = with lib.maintainers; [ dotlambda ]; + teams = [ lib.teams.geospatial ]; mainProgram = "spatialite_tool"; }; } diff --git a/pkgs/by-name/sp/spdk/package.nix b/pkgs/by-name/sp/spdk/package.nix index 7a3e57071253..58cd81ccdbce 100644 --- a/pkgs/by-name/sp/spdk/package.nix +++ b/pkgs/by-name/sp/spdk/package.nix @@ -69,6 +69,10 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . + + # can be removed again with next release, check is already in master + substituteInPlace module/scheduler/dpdk_governor/dpdk_governor.c \ + --replace-fail "" " " ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index 8ed1455206c4..37e08a8dc5a2 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spdlog"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; tag = "v${finalAttrs.version}"; - hash = "sha256-4QZVCounDbtkP+58fejHGWjquWT3b03b9TNGs45dN7c="; + hash = "sha256-9RhB4GdFjZbCIfMOWWriLAUf9DE/i/+FTXczr0pD0Vg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sp/speech-tools/package.nix b/pkgs/by-name/sp/speech-tools/package.nix new file mode 100644 index 000000000000..dfdfa5ee4985 --- /dev/null +++ b/pkgs/by-name/sp/speech-tools/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchurl, + fetchpatch, + ncurses, + alsa-lib, +}: + +stdenv.mkDerivation rec { + pname = "speech_tools"; + version = "2.5.0"; + + src = fetchurl { + url = "http://www.festvox.org/packed/festival/${lib.versions.majorMinor version}/speech_tools-${version}-release.tar.gz"; + sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"; + }; + + patches = [ + # Fix build on Apple Silicon. Remove in the next release. + (fetchpatch { + url = "https://github.com/festvox/speech_tools/commit/06141f69d21bf507a9becb5405265dc362edb0df.patch"; + hash = "sha256-tRestCBuRhak+2ccsB6mvDxGm/TIYX4eZ3oppCOEP9s="; + }) + ]; + + buildInputs = + [ + ncurses + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; + + # Workaround build failure on -fno-common toolchains: + # ld: libestools.a(editline.o):(.bss+0x28): multiple definition of + # `editline_history_file'; libestools.a(siodeditline.o):(.data.rel.local+0x8): first defined here + env.NIX_CFLAGS_COMPILE = "-fcommon"; + + preConfigure = '' + sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) + sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . ) + + # c99 makes isnan valid for float and double + substituteInPlace include/EST_math.h \ + --replace '__isnanf(X)' 'isnan(X)' + ''; + + installPhase = '' + mkdir -p "$out"/{bin,lib} + for d in bin lib; do + for i in ./$d/*; do + test "$(basename "$i")" = "Makefile" || + cp -r "$(readlink -f $i)" "$out/$d" + done + done + ''; + + doCheck = true; + + checkTarget = "test"; + + meta = with lib; { + description = "Text-to-speech engine"; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; + license = licenses.free; + }; + + passthru = { + updateInfo = { + downloadPage = "http://www.festvox.org/packed/festival/"; + }; + }; +} diff --git a/pkgs/by-name/sp/speechd/fix-paths.patch b/pkgs/by-name/sp/speechd/fix-paths.patch index 7509c1842ba8..c9a4a92f1142 100644 --- a/pkgs/by-name/sp/speechd/fix-paths.patch +++ b/pkgs/by-name/sp/speechd/fix-paths.patch @@ -1,3 +1,13 @@ +diff --git a/speech-dispatcher.service.in b/speech-dispatcher.service.in +index 6280f2d9..edf6024c 100644 +--- a/speech-dispatcher.service.in ++++ b/speech-dispatcher.service.in +@@ -20,4 +20,4 @@ Requires=speech-dispatcher.socket + [Service] + Type=simple + ExecStart=@bindir@/speech-dispatcher -s -t 0 +-ExecReload=/bin/kill -HUP $MAINPID ++ExecReload=@utillinux@/bin/kill -HUP $MAINPID diff --git a/speech-dispatcherd.service.in b/speech-dispatcherd.service.in index ab14b99d..12521b1b 100644 --- a/speech-dispatcherd.service.in diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix index 2947cf31bdb7..b4725c27ba3a 100644 --- a/pkgs/by-name/sp/speechd/package.nix +++ b/pkgs/by-name/sp/speechd/package.nix @@ -9,6 +9,7 @@ itstool, libtool, texinfo, + systemdMinimal, util-linux, autoreconfHook, glib, @@ -36,13 +37,13 @@ let inherit (python3Packages) python pyxdg wrapPython; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "speech-dispatcher"; - version = "0.11.5"; + version = "0.12.1"; src = fetchurl { - url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-HOR1n/q7rxrrQzpewHOb4Gdum9+66URKezvhsq8+wSs="; + url = "https://github.com/brailcom/speechd/releases/download/${finalAttrs.version}/speech-dispatcher-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-sUpSONKH0tzOTdQrvWbKZfoijn5oNwgmf3s0A297pLQ="; }; patches = @@ -77,9 +78,14 @@ stdenv.mkDerivation rec { libsndfile libao libpulseaudio - alsa-lib python ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + systemdMinimal # libsystemd + ] + ++ lib.optionals withAlsa [ + alsa-lib + ] ++ lib.optionals withEspeak [ espeak sonic @@ -101,6 +107,7 @@ stdenv.mkDerivation rec { # Audio method falls back from left to right. "--with-default-audio-method=\"libao,pulse,alsa,oss\"" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" ] ++ lib.optionals withPulse [ "--with-pulse" @@ -121,7 +128,7 @@ stdenv.mkDerivation rec { "--with-pico" ]; - postPatch = '' + postPatch = lib.optionalString withPico '' substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang" ''; @@ -146,7 +153,8 @@ stdenv.mkDerivation rec { berce jtojnar ]; - platforms = platforms.linux; + # TODO: remove checks for `withPico` once PR #375450 is merged + platforms = if withAlsa || withPico then platforms.linux else platforms.unix; mainProgram = "speech-dispatcher"; }; -} +}) diff --git a/pkgs/by-name/sp/speed-cloudflare-cli/package.nix b/pkgs/by-name/sp/speed-cloudflare-cli/package.nix new file mode 100644 index 000000000000..a1c1e27b33df --- /dev/null +++ b/pkgs/by-name/sp/speed-cloudflare-cli/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + stdenv, + nodejs, +}: +stdenv.mkDerivation { + pname = "speed-cloudflare-cli"; + version = "2.0.3-unstable-2024-05-15"; + + src = fetchFromGitHub { + owner = "KNawm"; + repo = "speed-cloudflare-cli"; + rev = "dd301195e7def359a39cceeba16b1c0bedac8f5d"; + sha256 = "sha256-kxLeQUdJbkmApf5Af3Mgd3WvS3GhXXOIvA4gNB55TGM="; + }; + + nativeBuildInputs = [ nodejs ]; + + installPhase = '' + mkdir -p $out/bin + + install -Dm755 $src/cli.js $out/bin/speed-cloudflare-cli + install -Dm644 $src/chalk.js $out/bin/chalk.js + install -Dm644 $src/stats.js $out/bin/stats.js + + patchShebangs $out/bin/speed-cloudflare-cli + ''; + + meta = { + description = "Measure the speed and consistency of your internet connection using speed.cloudflare.com"; + homepage = "https://github.com/KNawm/speed-cloudflare-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ TheColorman ]; + mainProgram = "speed-cloudflare-cli"; + inherit (nodejs.meta) platforms; + }; +} diff --git a/pkgs/by-name/sp/speedtest-rs/package.nix b/pkgs/by-name/sp/speedtest-rs/package.nix index c28c1c8f52eb..e5d5b402b826 100644 --- a/pkgs/by-name/sp/speedtest-rs/package.nix +++ b/pkgs/by-name/sp/speedtest-rs/package.nix @@ -5,7 +5,6 @@ openssl, pkg-config, stdenv, - darwin, nix-update-script, testers, speedtest-rs, @@ -22,12 +21,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1FAFYiWDD/KG/7/UTv/EW6Nj2GnU0GZFFq6ouMc0URA="; }; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sp/spice-protocol/package.nix b/pkgs/by-name/sp/spice-protocol/package.nix index a249a4ce38d8..88d12a7ff1cb 100644 --- a/pkgs/by-name/sp/spice-protocol/package.nix +++ b/pkgs/by-name/sp/spice-protocol/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "spice-protocol"; - version = "0.14.4"; + version = "0.14.5"; src = fetchurl { url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-BP+6YQ2f1EHPxH36oTXXAJbmCxBG0hGdjbL46g0X2RI="; + sha256 = "sha256-uvWESfbonRn0dYma1fuRlv3EbAPMUyM/TjnPKXj5z/c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spice-up/package.nix b/pkgs/by-name/sp/spice-up/package.nix index 48b1bce684c3..26cc660d25ce 100644 --- a/pkgs/by-name/sp/spice-up/package.nix +++ b/pkgs/by-name/sp/spice-up/package.nix @@ -62,13 +62,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create simple and beautiful presentations"; homepage = "https://github.com/Philip-Scott/Spice-up"; - maintainers = - with maintainers; - [ - samdroid-apps - xiorcale - ] - ++ teams.pantheon.members; + maintainers = with maintainers; [ + samdroid-apps + xiorcale + ]; + teams = [ teams.pantheon ]; platforms = platforms.linux; # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ license = licenses.gpl3Plus; diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 6e5f5b142145..615ca0065927 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -3,49 +3,62 @@ buildGoModule, fetchFromGitHub, testers, + replaceVars, spicetify-cli, }: - -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "spicetify-cli"; - version = "2.39.5"; + version = "2.40.7"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; - rev = "v${version}"; - hash = "sha256-vqif3oLDm9SUrkY+qEYHUEmHN+psoK6GNUB+kA6sQ4Q="; + tag = "v${finalAttrs.version}"; + hash = "sha256-iNRjRfRrK/pLL4xZX6Q/LV45NyNG1u4CyQGZtZYb2X8="; }; - vendorHash = "sha256-3U/qV81UXS/Xh3K6OnMUyRKeMSBQUHLP64EOQl6TfMY="; + vendorHash = "sha256-901njlGcAxr12F9w6yQ+ESsptlwsZsMvKPUmlHxehmA="; ldflags = [ "-s -w" - "-X 'main.version=${version}'" + "-X 'main.version=${finalAttrs.version}'" ]; - # used at runtime, but not installed by default - postInstall = '' - mv $out/bin/cli $out/bin/spicetify - ln -s $out/bin/spicetify $out/bin/spicetify-cli - 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 - ''; + patches = [ + # Stops spicetify from attempting to fetch a newer css-map.json + (replaceVars ./version.patch { + inherit (finalAttrs) version; + }) + ]; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/spicetify --help > /dev/null - ''; + postInstall = + /* + jsHelper and css-map.json are required at runtime + and are looked for in the directory of the spicetify binary + so here we move spicetify to /share/spicetify + so that css-map.json and jsHelper don't pollute PATH + */ + '' + mkdir -p $out/share/spicetify + + cp -r $src/jsHelper $out/share/spicetify/jsHelper + cp $src/css-map.json $out/share/spicetify/css-map.json + + mv $out/bin/cli $out/share/spicetify/spicetify + + ln -s $out/share/spicetify/spicetify $out/bin/spicetify + ''; passthru.tests.version = testers.testVersion { package = spicetify-cli; }; - meta = with lib; { + meta = { description = "Command-line tool to customize Spotify client"; homepage = "https://github.com/spicetify/cli"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.mdarocha ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + mdarocha + gerg-l + ]; mainProgram = "spicetify"; }; -} +}) diff --git a/pkgs/by-name/sp/spicetify-cli/version.patch b/pkgs/by-name/sp/spicetify-cli/version.patch new file mode 100644 index 000000000000..a6e1fede5a2d --- /dev/null +++ b/pkgs/by-name/sp/spicetify-cli/version.patch @@ -0,0 +1,14 @@ +diff --git a/src/preprocess/preprocess.go b/src/preprocess/preprocess.go +index ac0f084..f38ece2 100644 +--- a/src/preprocess/preprocess.go ++++ b/src/preprocess/preprocess.go +@@ -66,7 +66,7 @@ func Start(version string, extractedAppsPath string, flags Flag) { + var cssTranslationMap = make(map[string]string) + // readSourceMapAndGenerateCSSMap(appPath) + +- if version != "Dev" { ++ if version != "@version@" { + tag, err := FetchLatestTagMatchingOrMain(version) + if err != nil { + utils.PrintWarning("Cannot fetch version tag for CSS mappings") + diff --git a/pkgs/by-name/sp/spicy-parser-generator/package.nix b/pkgs/by-name/sp/spicy-parser-generator/package.nix index 41a2d44929e1..93bba9331cf3 100644 --- a/pkgs/by-name/sp/spicy-parser-generator/package.nix +++ b/pkgs/by-name/sp/spicy-parser-generator/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "spicy"; - version = "1.12.0"; + version = "1.13.0"; strictDeps = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-MLwBklSNLqx3LgNSFvo5p/MPyt/IlYGwvTbN1PJlims="; + hash = "sha256-BMypkuBmepuLmOXUjeG5hZhOXojjFodaZzZz5S+iBoE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix index 9314b3a2a3bf..9415aff683da 100644 --- a/pkgs/by-name/sp/spider/package.nix +++ b/pkgs/by-name/sp/spider/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "spider"; - version = "2.36.2"; + version = "2.37.18"; src = fetchFromGitHub { owner = "spider-rs"; repo = "spider"; tag = "v${finalAttrs.version}"; - hash = "sha256-Os94Q8RDaKc3jzir63nZ8dWgPwPZHxnvOZg2l/4v5EE="; + hash = "sha256-aJXd8yzDEP1pYe4J8Zi6vmLN1+ki6B0tLFV/mvwkk/k="; }; useFetchCargoVendor = true; - cargoHash = "sha256-v5zz9WLj2aLRUHJScVSFzoQhyOqExkN03j3N47f3lgA="; + cargoHash = "sha256-QVh962yXXStDwLyd8LSnmxkik6wNebOfGyH0HuE13kg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sp/spiped/package.nix b/pkgs/by-name/sp/spiped/package.nix index e45caedb7c07..068e248cb56b 100644 --- a/pkgs/by-name/sp/spiped/package.nix +++ b/pkgs/by-name/sp/spiped/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "spiped"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "https://www.tarsnap.com/spiped/spiped-${version}.tgz"; - hash = "sha256-cMUwcNu7ENFEJ1Sur7AbCOyCkgPUECNkfb8aFDXuSmU="; + hash = "sha256-Qk+003adkSsE3kPSHMMnSM39MSHE8dJtVJmSpUZ44Go="; }; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix index d4563bebf85f..8bd8ea72c7ca 100644 --- a/pkgs/by-name/sp/spire/package.nix +++ b/pkgs/by-name/sp/spire/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "spire"; - version = "1.12.0"; + version = "1.12.2"; outputs = [ "out" @@ -18,10 +18,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hNa1e6h4IhD2SfhZZ5xkwQ7e7X5x3Gk4v33nw2t+cvk="; + sha256 = "sha256-+jy0hvvjkkp6vDUEkoskjgTlq+wd0eKh/i1xkOLXbrA="; }; - vendorHash = "sha256-6qtR9SF6QQKqsVpKpp6YBkB9wOLFwm8C3PF0DlN0Ud0="; + vendorHash = "sha256-1ngjcqGwUNMyR/wBCo0MYguD1gGH8rbI2j9BB+tGL9k="; subPackages = [ "cmd/spire-agent" diff --git a/pkgs/by-name/sp/spirit/package.nix b/pkgs/by-name/sp/spirit/package.nix index e4e0334c0a53..3e33990b96cd 100644 --- a/pkgs/by-name/sp/spirit/package.nix +++ b/pkgs/by-name/sp/spirit/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "spirit"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "cashapp"; repo = "spirit"; - rev = "v${version}-prerelease"; - hash = "sha256-qC27kkUWELRFEVhZT7R6ickpAfDbL/AtYx2gRkDTvrI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-bGKqiCd9dggppORouoWlAoAaYdx4vAivsP22KWm1fxU="; }; - vendorHash = "sha256-Dq7UeAH7FvY12rEYkpcKpEUzMMrGfubt0WadnZYt8dk="; + vendorHash = "sha256-87WUqUjyfprpY63kEKCAx/AU6TN73W7oMdOaKfl8xt4="; subPackages = [ "cmd/spirit" ]; @@ -31,4 +31,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "spirit"; }; -} +}) diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix index 616d48c74177..3751d3186bea 100644 --- a/pkgs/by-name/sp/spirv-cross/package.nix +++ b/pkgs/by-name/sp/spirv-cross/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.4.304.0"; + version = "1.4.313.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-cpWvGCXS6VaS0YehnGYTaXydL6S4FU9HLPh0JZ+jfd8="; + hash = "sha256-Rvb3XlTGoQKABSK/jKnbOePS4BKLDAW4L+t2SLw2RMA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix index 067e5fcb386a..ba28dbbb1efd 100644 --- a/pkgs/by-name/sp/spirv-headers/package.nix +++ b/pkgs/by-name/sp/spirv-headers/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.4.304.0"; + version = "1.4.313.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-MCQ+i9ymjnxRZP/Agk7rOGdHcB4p67jT4J4athWUlcI="; + hash = "sha256-bUgt7m3vJYoozxgrA5hVTRcbPg3OAzht0e+MgTH7q9k="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix index ab8f2b250df9..665e8f8f0cdc 100644 --- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix +++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix @@ -43,9 +43,9 @@ let } else if llvmMajor == "15" then rec { - version = "15.0.0"; + version = "15.0.11"; rev = "v${version}"; - hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; + hash = "sha256-q4WhUaBDw0cnv1eqC6wSvrApHKvyg5/4QetybDLQkEw="; } else if llvmMajor == "14" then { @@ -82,7 +82,7 @@ stdenv.mkDerivation { hash = "sha256-71sJuGqVjTcB549eIiCO0LoqAgxkdEHCoxh8Pd/Qzz8="; }) ] - ++ lib.optionals (lib.versionAtLeast llvmMajor "15" && lib.versionOlder llvmMajor "18") [ + ++ lib.optionals (lib.versionAtLeast llvmMajor "16" && lib.versionOlder llvmMajor "18") [ # Fixes build after spirv-headers breaking change (fetchpatch { url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch"; diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix index 6ebbbb6cbb09..d1edc96a6f62 100644 --- a/pkgs/by-name/sp/spirv-tools/package.nix +++ b/pkgs/by-name/sp/spirv-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.4.304.0"; + version = "1.4.313.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-alJ4X7qbTzsRTqRFdpjdsj0wERVb17czui2muEaKNyI="; + hash = "sha256-nGyEOREua/W2mdb8DhmqXW0gDThnXnIlhnURAUhCO2g="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/pkgs/by-name/sp/splash/package.nix b/pkgs/by-name/sp/splash/package.nix index 722b6f139dbb..d014f3808a2f 100644 --- a/pkgs/by-name/sp/splash/package.nix +++ b/pkgs/by-name/sp/splash/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "splash"; - version = "3.11.1"; + version = "3.11.3"; src = fetchFromGitHub { owner = "danieljprice"; repo = "splash"; rev = "v${finalAttrs.version}"; - hash = "sha256-zENMQpLsm6GlqrXsFDjEnMbtODcqwhB3jGfGHLuGcYw="; + hash = "sha256-deuQTCDSLzScd9lFxv83Y8gX7D7WZtikIUfMxbmH2m8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spoolman/common.nix b/pkgs/by-name/sp/spoolman/common.nix new file mode 100644 index 000000000000..2985fb71551b --- /dev/null +++ b/pkgs/by-name/sp/spoolman/common.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub }: +let + version = "0.22.1"; +in +{ + inherit version; + + src = fetchFromGitHub { + owner = "Donkie"; + repo = "Spoolman"; + rev = "v${version}"; + hash = "sha256-EVGpwcjEh4u8Vtgu2LypqMqArYLZe7oh1qYhGZpgjh0="; + }; + + meta = with lib; { + description = "Keep track of your inventory of 3D-printer filament spools"; + homepage = "https://github.com/Donkie/Spoolman"; + license = licenses.mit; + maintainers = with maintainers; [ + MayNiklas + pinpox + ]; + mainProgram = "spoolman"; + }; +} diff --git a/pkgs/by-name/sp/spoolman/frontend.nix b/pkgs/by-name/sp/spoolman/frontend.nix new file mode 100644 index 000000000000..9386853458e0 --- /dev/null +++ b/pkgs/by-name/sp/spoolman/frontend.nix @@ -0,0 +1,23 @@ +{ buildNpmPackage, callPackage }: +let + common = callPackage ./common.nix { }; +in + +buildNpmPackage { + pname = "spoolman-frontend"; + + inherit (common) version; + + src = "${common.src}/client"; + + npmDepsHash = "sha256-E4DvEOSHfwwM0C+vTRMDQbCNv2IDyFOFwfqszrI+uOA="; + + VITE_APIURL = "/api/v1"; + + installPhase = "cp -r dist $out"; + + meta = common.meta // { + description = "Spoolman frontend"; + mainProgram = "spoolman-frontend"; + }; +} diff --git a/pkgs/by-name/sp/spoolman/package.nix b/pkgs/by-name/sp/spoolman/package.nix new file mode 100644 index 000000000000..f31ed152bb19 --- /dev/null +++ b/pkgs/by-name/sp/spoolman/package.nix @@ -0,0 +1,79 @@ +{ + python312, + lib, + callPackage, + writeShellScript, + makeWrapper, +}: + +let + common = callPackage ./common.nix { }; + frontend = callPackage ./frontend.nix { }; + python = python312; +in + +python.pkgs.buildPythonPackage rec { + + pname = "spoolman"; + inherit (common) version src; + + pyproject = true; + + nativeBuildInputs = [ + makeWrapper + python.pkgs.pdm-backend + python.pkgs.pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ "setuptools" ]; + + postPatch = '' + substituteInPlace pyproject.toml --replace-fail psycopg2-binary psycopg2 + ''; + + propagatedBuildInputs = with python.pkgs; [ + uvloop + alembic + asyncpg + fastapi + hishel + httptools + httpx + aiosqlite + platformdirs + prometheus-client + psycopg2 + pydantic + scheduler + setuptools + sqlalchemy + sqlalchemy-cockroachdb + uvicorn + websockets + ]; + + pythonImportsCheck = [ "spoolman" ]; + + postInstall = + let + start_script = writeShellScript "start-spoolman" '' + ${lib.getExe python.pkgs.uvicorn} "$@" spoolman.main:app; + ''; + in + '' + mkdir -p $out/runpath/client/dist $out/bin + cp -r $src/* $out/runpath + cp -r ${frontend}/* $out/runpath/client/dist + + makeWrapper ${start_script} $out/bin/spoolman \ + --chdir $out/runpath \ + --prefix PYTHONPATH : "$out/${python.sitePackages}" \ + --prefix PYTHONPATH : "${python.pkgs.makePythonPath propagatedBuildInputs}" \ + --prefix PATH : "${python.pkgs.alembic}/bin" + ''; + + meta = common.meta // { + description = "Spoolman server"; + mainProgram = "spoolman"; + }; +} diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix index 7a0b64227b21..70f9abdc99ea 100644 --- a/pkgs/by-name/sp/spotify-player/package.nix +++ b/pkgs/by-name/sp/spotify-player/package.nix @@ -46,17 +46,17 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.20.4"; + version = "0.20.5"; src = fetchFromGitHub { owner = "aome510"; repo = "spotify-player"; tag = "v${version}"; - hash = "sha256-5N/zTkNgcIk/Ml11Oo+jyoO0r2Hh9SxFL+tdhD/1X/4="; + hash = "sha256-NlMQgVkMVCVrMv4IyFtPmRkAmf2k4F0dp6e8s63aBHg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0vIhAJ3u+PfujUGI07fddDs33P35Q4CSDz1sMuQwVws="; + cargoHash = "sha256-glQh6PzwJp5o35aXRW4+Pq2iSeGg9vjR5fJQomPpSOc="; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix index 7fb0949c93d1..b179de1ebf8d 100644 --- a/pkgs/by-name/sp/spotify/linux.nix +++ b/pkgs/by-name/sp/spotify/linux.nix @@ -52,14 +52,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.48.405.gf2c48e6f"; + version = "1.2.59.514.g834e17d4"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "80"; + rev = "86"; deps = [ alsa-lib @@ -126,7 +126,7 @@ stdenv.mkDerivation { src = fetchurl { name = "spotify-${version}-${rev}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-Ej9SEhZhssQiH1srcgUW5lQuUNg+htudV7mcnK6o0pW5PiBYZ6qOPEIZ/1tZzD9xkUJ8hCq08fJMB8NQ12KXMg=="; + hash = "sha512-b9VlPwZ6JJ7Kt2p0ji1qtTJQHZE9d4KBO3iqQwsYh6k+ljtV/mSdinZi+B//Yb+KXhMErd0oaVzIpCCMqft6FQ=="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spotify/update.sh b/pkgs/by-name/sp/spotify/update.sh index 9bd983755c71..d7f40c782902 100755 --- a/pkgs/by-name/sp/spotify/update.sh +++ b/pkgs/by-name/sp/spotify/update.sh @@ -20,7 +20,7 @@ channel="${1:-stable}" # stable/candidate/edge nixpkgs="$(git rev-parse --show-toplevel)" -spotify_nix="$nixpkgs/pkgs/applications/audio/spotify/linux.nix" +spotify_nix="$nixpkgs/pkgs/by-name/sp/spotify/linux.nix" # diff --git a/pkgs/by-name/sp/spr/package.nix b/pkgs/by-name/sp/spr/package.nix new file mode 100644 index 000000000000..fe450c314568 --- /dev/null +++ b/pkgs/by-name/sp/spr/package.nix @@ -0,0 +1,26 @@ +{ + lib, + rustPlatform, + fetchCrate, +}: + +rustPlatform.buildRustPackage rec { + pname = "spr"; + version = "1.3.4"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-4fYQM+GQ5yqES8HQ23ft4wfM5mwDdcWuE5Ed2LST9Gw="; + + meta = with lib; { + description = "Submit pull requests for individual, amendable, rebaseable commits to GitHub"; + mainProgram = "spr"; + homepage = "https://github.com/spacedentist/spr"; + license = licenses.mit; + maintainers = with maintainers; [ spacedentist ]; + }; +} diff --git a/pkgs/by-name/sp/spring-boot-cli/package.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix index 54cf2cec0a6a..934421885cef 100644 --- a/pkgs/by-name/sp/spring-boot-cli/package.nix +++ b/pkgs/by-name/sp/spring-boot-cli/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.4.4"; + version = "3.4.5"; src = fetchzip { url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip"; - hash = "sha256-+dhYpd8qrsYZ5a5xuOsym/Oa0vkB0z1ZWNP9eGgcQv8="; + hash = "sha256-ZGOhxeKkUF0kLPTp6oSa1s1rYs7H75uptITf3xvxXJU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix index 9125450950b3..eaa12222b0a4 100644 --- a/pkgs/by-name/sq/sql-formatter/package.nix +++ b/pkgs/by-name/sq/sql-formatter/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "sql-formatter"; - version = "15.5.2"; + version = "15.6.1"; src = fetchFromGitHub { owner = "sql-formatter-org"; repo = "sql-formatter"; rev = "v${version}"; - hash = "sha256-13S7Qagra+RxWOct7wsvK1C0QftWtLZRB58YVWw9gGU="; + hash = "sha256-Olq7DAhiopFlLnn6r78nJU6LjS2EiU93kc/iY4mLCL8="; }; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/by-name/sq/sql-migrate/package.nix b/pkgs/by-name/sq/sql-migrate/package.nix new file mode 100644 index 000000000000..3d84128bf142 --- /dev/null +++ b/pkgs/by-name/sq/sql-migrate/package.nix @@ -0,0 +1,26 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "sql-migrate"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "rubenv"; + repo = "sql-migrate"; + tag = "v${version}"; + hash = "sha256-zk1ryQSjmO1ziZvMeb3BOb5rvZWgbZm39Sz1N9dJ8dM="; + }; + + vendorHash = "sha256-p/7oKqvbCNWom9q6UaY89GZ4sv0hx1IuzCIw0CH1EwQ="; + + meta = { + description = "SQL Schema migration tool for Go. Based on gorp and goose"; + homepage = "https://github.com/rubenv/sql-migrate"; + mainProgram = "sql-migrate"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tebro ]; + }; +} diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix index 1624d07f80aa..d0e0d18282d5 100644 --- a/pkgs/by-name/sq/sql-studio/package.nix +++ b/pkgs/by-name/sq/sql-studio/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, buildNpmPackage, fetchFromGitHub, @@ -38,8 +36,6 @@ rustPlatform.buildRustPackage { cp -pr --reflink=auto -- ${ui} ui/dist ''; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - meta = { description = "SQL Database Explorer [SQLite, libSQL, PostgreSQL, MySQL/MariaDB, ClickHouse, Microsoft SQL Server]"; homepage = "https://github.com/frectonz/sql-studio"; diff --git a/pkgs/by-name/sq/sqlboiler/package.nix b/pkgs/by-name/sq/sqlboiler/package.nix index aa16c98ba795..d5a26d9c8a88 100644 --- a/pkgs/by-name/sq/sqlboiler/package.nix +++ b/pkgs/by-name/sq/sqlboiler/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sqlboiler"; - version = "4.18.0"; + version = "4.19.0"; src = fetchFromGitHub { owner = "volatiletech"; repo = "sqlboiler"; tag = "v${version}"; - hash = "sha256-gpRegyW6LrKj45MDl+eOKrTqTo1wn7JOd4zPDexOB6M="; + hash = "sha256-vsrC/i8ekjlKMVjH91XT9iizZaSD5Mi/p/4AFWBfAlQ="; }; - vendorHash = "sha256-BTrQPWThfJ7gWXi/Y1l/s2BmkW5lVYS/PP0WRwntQxA="; + vendorHash = "sha256-K1Bo2aENteZYjx7jRczqdcoYZn5G8ywtCtHkVB7Reus="; tags = [ "mysql" diff --git a/pkgs/by-name/sq/sqlc/package.nix b/pkgs/by-name/sq/sqlc/package.nix index 6500ff955674..01e8851627c3 100644 --- a/pkgs/by-name/sq/sqlc/package.nix +++ b/pkgs/by-name/sq/sqlc/package.nix @@ -4,26 +4,22 @@ buildGoModule, fetchFromGitHub, installShellFiles, - testers, - sqlc, + versionCheckHook, }: -let - version = "1.28.0"; -in -buildGoModule { +buildGoModule (finalAttrs: { pname = "sqlc"; - inherit version; + version = "1.29.0"; src = fetchFromGitHub { owner = "sqlc-dev"; repo = "sqlc"; - rev = "v${version}"; - hash = "sha256-kACZusfwEIO78OooNGMXCXQO5iPYddmsHCsbJ3wkRQs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-BaEvmvbo6OQ1T9lgIuNJMyvnvVZd/20mFEMQdFtxdZc="; }; proxyVendor = true; - vendorHash = "sha256-5KVCG92aWVx2J78whEwhEhqsRNlw4xSdIPbSqYM+1QI="; + vendorHash = "sha256-LpF94Jv7kukSa803WCmnO+y6kvHLPz0ZGEdbjwVFV40="; subPackages = [ "cmd/sqlc" ]; @@ -41,11 +37,9 @@ buildGoModule { --zsh <($out/bin/sqlc completion zsh) ''; - passthru.tests.version = testers.testVersion { - package = sqlc; - command = "sqlc version"; - version = "v${version}"; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; meta = { description = "Generate type-safe code from SQL"; @@ -54,4 +48,4 @@ buildGoModule { maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "sqlc"; }; -} +}) diff --git a/pkgs/by-name/sq/sqlcl/package.nix b/pkgs/by-name/sq/sqlcl/package.nix index 8c5fc902847a..5d4f48f280c5 100644 --- a/pkgs/by-name/sq/sqlcl/package.nix +++ b/pkgs/by-name/sq/sqlcl/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; - version = "24.4.3.070.2106"; + version = "25.1.1.113.2054"; src = fetchurl { url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; - hash = "sha256-7/8J+XY2Uk/CUWimrTf8/ikjZQT2+4/jNdhs8K1sWjI="; + hash = "sha256-/5hu/GeU1Ly+pR8y2dfNuDkM5kzKU0sTIu11wuVvzEo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/sqld/package.nix b/pkgs/by-name/sq/sqld/package.nix index f7934b44ebf8..b6812fe601a4 100644 --- a/pkgs/by-name/sq/sqld/package.nix +++ b/pkgs/by-name/sq/sqld/package.nix @@ -8,8 +8,6 @@ openssl, sqlite, zstd, - stdenv, - darwin, cmake, nix-update-script, @@ -56,7 +54,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite zstd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; env.ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix index bfcda6373cb3..d9a1cd4eda76 100644 --- a/pkgs/by-name/sq/sqldef/package.nix +++ b/pkgs/by-name/sq/sqldef/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "sqldef"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "sqldef"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-vwkvKOM8/57lzT6toLqaux3yJD6zYi+J5Ae1qhxnhEw="; + hash = "sha256-FDJeRIrx2LS6TQAlm9Kj13O4fccnRG6mYcLwTrOGrOI="; }; proxyVendor = true; - vendorHash = "sha256-+hpqhpkTPVRyr0b80NgSnHGPLO/ueVm4x4/uFrS9ATI="; + vendorHash = "sha256-SkYRt/w8/YC6LGoADVRdyYdQw/Lves1rd4tl8lYNSSs="; ldflags = [ "-s" diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index edff3337e1fc..8c5b2a38c766 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.3.1"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; tag = version; - hash = "sha256-PQSGB8723y0+cptoLHpXzXfSQFicf5tasbTEf0efA8c="; + hash = "sha256-9JitD46hMgCrUx+mtSoKm/8vKd6CfPngmVsaUb9vi+Q="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix index 5ec42ba23d1d..f4993d52c1b5 100644 --- a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix +++ b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix @@ -10,16 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.3.2"; + version = "2.4.0"; format = "pyproject"; - disabled = python3Packages.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "techouse"; repo = "sqlite3-to-mysql"; tag = "v${version}"; - hash = "sha256-2zylVnPlptPCxUFwU9j9g//T5fzPJgXc3hQc6iMoLLE="; + hash = "sha256-1XYDCHR1GitMr6wgpj+roCzf5q4tMr6eGLMWzZgzpBY="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/sq/sqlitecpp/package.nix b/pkgs/by-name/sq/sqlitecpp/package.nix index e1dcac1598de..acc141ffb42b 100644 --- a/pkgs/by-name/sq/sqlitecpp/package.nix +++ b/pkgs/by-name/sq/sqlitecpp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlitecpp"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "SRombauts"; repo = "sqlitecpp"; rev = finalAttrs.version; - sha256 = "sha256-rsVFk4FsonrwpBd3TonkxilwWeOBocH8AyeB+71OBdI="; + hash = "sha256-RSNJGfvIvNfk+/Awzh06tDi/TA5Wc35X8ya0X5mP9IE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/sqlx-cli/package.nix b/pkgs/by-name/sq/sqlx-cli/package.nix new file mode 100644 index 000000000000..bb62459a145f --- /dev/null +++ b/pkgs/by-name/sq/sqlx-cli/package.nix @@ -0,0 +1,79 @@ +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + pkg-config, + openssl, + libiconv, + testers, + sqlx-cli, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "sqlx-cli"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = "launchbadge"; + repo = "sqlx"; + rev = "v${version}"; + hash = "sha256-R6T8sXuHlunXvqxQ95EKd+fdkPUZU8nTFkg9WBJWeRA="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-ILv9sVBKhF+KDPfTsxYorRlx33tPolNE8KSNdNajzBc="; + + buildNoDefaultFeatures = true; + buildFeatures = [ + "native-tls" + "postgres" + "sqlite" + "mysql" + "completions" + ]; + + doCheck = false; + cargoBuildFlags = [ "--package sqlx-cli" ]; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/sqlx completions $shell > sqlx.$shell + installShellCompletion sqlx.$shell + done + ''; + + passthru.tests.version = testers.testVersion { + package = sqlx-cli; + command = "sqlx --version"; + }; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "SQLx's associated command-line utility for managing databases, migrations, and enabling offline mode with sqlx::query!() and friends."; + homepage = "https://github.com/launchbadge/sqlx"; + license = licenses.asl20; + maintainers = with maintainers; [ + greizgh + xrelkd + fd + ]; + mainProgram = "sqlx"; + }; +} diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix index f2f6dfdb8374..f497f538e290 100644 --- a/pkgs/by-name/sq/sqruff/package.nix +++ b/pkgs/by-name/sq/sqruff/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, rust-jemalloc-sys, nix-update-script, versionCheckHook, @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ]; # Patch the tests to find the binary postPatch = '' @@ -35,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/by-name/sq/squashfs-tools-ng/package.nix similarity index 100% rename from pkgs/tools/filesystems/squashfs-tools-ng/default.nix rename to pkgs/by-name/sq/squashfs-tools-ng/package.nix diff --git a/pkgs/by-name/sq/squashfuse/package.nix b/pkgs/by-name/sq/squashfuse/package.nix index 172979803507..a3e8bf3cbaa5 100644 --- a/pkgs/by-name/sq/squashfuse/package.nix +++ b/pkgs/by-name/sq/squashfuse/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, libtool, - fuse, + fuse3, pkg-config, lz4, xz, @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "squashfuse"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "vasi"; repo = "squashfuse"; rev = version; - sha256 = "sha256-d2mc6bIlprnVV5yCN7WxrE91ZMTSaJtpR0UVEROoYJQ="; + sha256 = "sha256-HuDVCO+hKdUKz0TMfHquI0eqFNAoNhPfY2VBM2kXupk="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { zlib lzo zstd - fuse + fuse3 ]; meta = { diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix index 66065fd74588..1496229ad9e8 100644 --- a/pkgs/by-name/sq/squawk/package.nix +++ b/pkgs/by-name/sq/squawk/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitHub, lib, libiconv, @@ -29,18 +28,10 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ - libiconv - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - ] - ); + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libiconv + openssl + ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix index b2b403461222..426e054b4752 100644 --- a/pkgs/by-name/sq/squeezelite/package.nix +++ b/pkgs/by-name/sq/squeezelite/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - darwin, fetchFromGitHub, flac, libgpiod, @@ -40,13 +39,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "2.0.0.1524"; + version = "2.0.0.1533"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "db51a7b16934f41b72437394bf8114c3a85e0a91"; - hash = "sha256-nPlIvyxhka4ANk74209RFW0Ok5eSZwKFDQw7AJO3qPs="; + rev = "bb7ae0615f6e661c217a1c77fdff70122859c3c5"; + hash = "sha256-R3yCJJMsrD3dkrfkm4q69YkqfjBdZTiB9UXIriyPawA="; }; buildInputs = @@ -59,17 +58,7 @@ stdenv.mkDerivation { ++ optional pulseSupport libpulseaudio ++ optional alsaSupport alsa-lib ++ optional portaudioSupport portaudio - ++ optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - CoreVideo - VideoDecodeAcceleration - CoreAudio - AudioToolbox - AudioUnit - Carbon - ] - ) + ++ optional faad2Support faad2 ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix index d3fabde12927..f355ea24e34d 100644 --- a/pkgs/by-name/sq/squirreldisk/package.nix +++ b/pkgs/by-name/sq/squirreldisk/package.nix @@ -38,6 +38,12 @@ let ''; distPhase = "true"; dontInstall = true; + + patches = [ + # Update field names to work with pdu versions >=0.10.0 + # https://github.com/adileo/squirreldisk/pull/47 + ./update-pdu-json-format.patch + ]; }; in rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/sq/squirreldisk/update-pdu-json-format.patch b/pkgs/by-name/sq/squirreldisk/update-pdu-json-format.patch new file mode 100644 index 000000000000..88e168d576b5 --- /dev/null +++ b/pkgs/by-name/sq/squirreldisk/update-pdu-json-format.patch @@ -0,0 +1,77 @@ +diff --git a/src/components/FileLine.tsx b/src/components/FileLine.tsx +index e55f3bd..bd722d7 100644 +--- a/src/components/FileLine.tsx ++++ b/src/components/FileLine.tsx +@@ -65,7 +65,7 @@ export const FileLine = ({ + {/* {JSON.stringify(item.data)} */} + {item && + item.data && +- (item.data.data / mul / mul / mul).toFixed(2)}{" "} ++ (item.data.size / mul / mul / mul).toFixed(2)}{" "} + GB + + +diff --git a/src/d3chart.ts b/src/d3chart.ts +index 855886b..d85c682 100644 +--- a/src/d3chart.ts ++++ b/src/d3chart.ts +@@ -191,7 +191,7 @@ const updateData = ( + isDirectory: false, + name: "Smaller Items", + value: item.value || 0, +- data: item.value || 0, ++ size: item.value || 0, + children: [], + }; + accumulator = d3.hierarchy(v) as D3HierarchyDiskItem; +@@ -248,7 +248,7 @@ const updateData = ( + .ancestors() + .map((d) => d.data.name) + .reverse() +- .join("/")}\n${((d.data.data || 0) / mul / mul / mul).toFixed( ++ .join("/")}\n${((d.data.size || 0) / mul / mul / mul).toFixed( + 2 + )} GB` + ); +diff --git a/src/index.d.ts b/src/index.d.ts +index daa7233..81b5243 100644 +--- a/src/index.d.ts ++++ b/src/index.d.ts +@@ -5,7 +5,7 @@ interface DiskItem { + id: string; + name: string; + value: number; +- data: number; ++ size: number; + isDirectory: boolean; + children: Array; + } +diff --git a/src/pruneData.ts b/src/pruneData.ts +index 37e70d8..040e227 100644 +--- a/src/pruneData.ts ++++ b/src/pruneData.ts +@@ -18,7 +18,7 @@ export const itemMap = (obj: any, parent: any = null) => { + //recursive call to scan property + if (obj["children"].length > 0) { + obj.isDirectory = true; +- obj.value = obj.data; ++ obj.value = obj.size; + obj["children"].forEach((element: any) => { + itemMap(element, obj); + }); +@@ -31,13 +31,13 @@ const partition = (data: DiskItem) => { + const hierarchy = d3 + .hierarchy(data) + .sum(function (d) { +- return !d.children || d.children.length === 0 ? d.data : 0; ++ return !d.children || d.children.length === 0 ? d.size : 0; + }) + + // .sum(d => d.value) + // .sum((d: DiskItem) => (d.children ? d.data : d.data)) + // .sum(d => d.data ? 0 : d.value) +- .sort((a: any, b: any) => (b.data || 0) - (a.data || 0)); ++ .sort((a: any, b: any) => (b.size || 0) - (a.size || 0)); + // debugger; + const partition = d3 + .partition() diff --git a/pkgs/by-name/sr/sratoolkit/package.nix b/pkgs/by-name/sr/sratoolkit/package.nix index d244acdfd0d2..fa7bd2f17c40 100644 --- a/pkgs/by-name/sr/sratoolkit/package.nix +++ b/pkgs/by-name/sr/sratoolkit/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sratoolkit"; # NOTE: When updating make sure to update ncbi-vdb as well for versions to match - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "ncbi"; repo = "sra-tools"; tag = finalAttrs.version; - hash = "sha256-WVPiAz3EFYuhBnl7BsEjJ2BTi1wAownEunVM4sdLaj8="; + hash = "sha256-OeM4syv9c1rZn2ferrhXyKJu68ywVYwnHoqnviWBZy4="; }; cmakeFlags = [ diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index 3057f97ad5ae..f80017b8c57c 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, xorg, - darwin, testers, src-cli, }: @@ -26,13 +25,9 @@ buildGoModule rec { "cmd/src" ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libX11 + ]; ldflags = [ "-s" diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index ca6f936051ca..c3d173bd7cb3 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A code surgeon for precise text and code transplantation"; license = licenses.mit; - maintainers = with maintainers; [ caralice ]; + maintainers = with maintainers; [ magistau ]; mainProgram = "srgn"; homepage = "https://github.com/${src.owner}/${src.repo}/"; downloadPage = "https://github.com/${src.owner}/${src.repo}/releases/tag/${src.rev}"; diff --git a/pkgs/by-name/sr/srht-gen-oauth-tok/fix-html-parsing.patch b/pkgs/by-name/sr/srht-gen-oauth-tok/fix-html-parsing.patch new file mode 100644 index 000000000000..f413a68d97dc --- /dev/null +++ b/pkgs/by-name/sr/srht-gen-oauth-tok/fix-html-parsing.patch @@ -0,0 +1,16 @@ +diff --git a/srht-gen-oauth-tok b/srht-gen-oauth-tok +index a05e209..f2949b5 100755 +--- a/srht-gen-oauth-tok ++++ b/srht-gen-oauth-tok +@@ -78,7 +78,10 @@ $mech->submit_form( with_fields => { comment => $tok_comment } ); + + # Parse the response as XML and find the access token via an XPath expression + my $xpc = XML::LibXML::XPathContext->new( +- XML::LibXML->load_xml(string => $mech->content()) ++ XML::LibXML->load_html( ++ string => $mech->content(), ++ recover => 1, ++ ) + ); + # The token is set as the description (
    ) of a 'Personal Access Token' term (
    ) + my $token = $xpc->find("//dt[text() = 'Personal Access Token']/following-sibling::dd/*/node()"); diff --git a/pkgs/by-name/sr/srht-gen-oauth-tok/package.nix b/pkgs/by-name/sr/srht-gen-oauth-tok/package.nix index 0c8829a96ba9..547bd4ea229c 100644 --- a/pkgs/by-name/sr/srht-gen-oauth-tok/package.nix +++ b/pkgs/by-name/sr/srht-gen-oauth-tok/package.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { hash = "sha256-GcqP3XbVw2sR5n4+aLUmA4fthNkuVAGnhV1h7suJYdI="; }; + patches = [ ./fix-html-parsing.patch ]; + buildInputs = [ perl ]; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index a699c8cceb51..2905986dba9d 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (self: { meta = { description = "Simple Rendering Manager"; homepage = "https://github.com/CuarzoSoftware/SRM"; - maintainers = [ lib.maintainers.dblsaiko ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/sr/srtp/package.nix b/pkgs/by-name/sr/srtp/package.nix index 6d3262407817..5ca74ed721c1 100644 --- a/pkgs/by-name/sr/srtp/package.nix +++ b/pkgs/by-name/sr/srtp/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libsrtp"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "cisco"; repo = "libsrtp"; rev = "v${version}"; - sha256 = "sha256-vWL5bksKT5NUoNkIRiJ2FeGODQthD8SgXjCaA7SeTe4="; + sha256 = "sha256-5AFsigie3YUrfvZYEIopjBJSNdoKoFlMBP9lv68+f6Q="; }; outputs = [ diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix index a5b388427d78..510c6044c0de 100644 --- a/pkgs/by-name/ss/sscg/package.nix +++ b/pkgs/by-name/ss/sscg/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sscg"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "sgallagher"; repo = "sscg"; tag = "sscg-${finalAttrs.version}"; - hash = "sha256-NzS9EV7DyQzPt4mvuEMs3zKRaQnyKzLNxmeheY7WHm4="; + hash = "sha256-e9/ruYBn206J0snQSo5uS9mvWmNh9AaZdZshSADEd4M="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = gitUpdater { rev-prefix = "sscg-"; }; diff --git a/pkgs/by-name/ss/ssdfs-utils/package.nix b/pkgs/by-name/ss/ssdfs-utils/package.nix index 02a8c4f7c4a9..19448ac187ea 100644 --- a/pkgs/by-name/ss/ssdfs-utils/package.nix +++ b/pkgs/by-name/ss/ssdfs-utils/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.50"; + version = "4.54"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "f816382a3cc45e2eca711b0cc0d24afb8af5c195"; - hash = "sha256-QN32h+ICwUUVd6Zs+hflRHb4QW0QWBkqyyEI/jZYRtc="; + rev = "c7627ec88515da312570166e7590e1562b32353a"; + hash = "sha256-uIX+nA9+hpGDCFAlwzLCYkF96Ou0fimeoJxMxgfgmkQ="; }; strictDeps = true; diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix b/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix index e7471ef70fb4..6755796b5d99 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix { pname = "sshd-openpgp-auth"; - version = "0.3.0"; - srcHash = "sha256-IV0Nhdqyn12HDOp1jaKz3sKTI3ktFd5b6qybCLWt27I="; - cargoHash = "sha256-WyYzDzC83iL1c8gCj+mYDq3/gsFxmxEWKwLhWLEygkI="; + version = "0.3.1"; + srcHash = "sha256-YS8/q8faWSRNciR03wwiiGGgkvZqb5Euto22pde53C8="; + cargoHash = "sha256-rBkKQAq1IAc4udS65RvprQe6knxyAFKxCWKGW5k5te4="; metaDescription = "Command-line tool for creating and managing OpenPGP based trust anchors for SSH host keys"; } diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix index 6de2efdc2821..b5a5ff2c8282 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix @@ -11,8 +11,6 @@ nettle, openssl, sqlite, - stdenv, - darwin, openssh, # Arguments not supplied by callPackage pname, @@ -60,18 +58,11 @@ rustPlatform.buildRustPackage { --zsh shell_completions/_${pname} ''; - buildInputs = - [ - nettle - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.IOKit - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.SystemConfiguration - ]; + buildInputs = [ + nettle + openssl + sqlite + ]; doCheck = true; nativeCheckInputs = [ diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/package.nix b/pkgs/by-name/ss/ssh-openpgp-auth/package.nix index 73f88ceeee1c..38c8e026ca14 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/package.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/package.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix { pname = "ssh-openpgp-auth"; - version = "0.2.2"; - srcHash = "sha256-5ew6jT6Zr54QYaWFQIGYXd8sqC3yHHZjPfoaCossm8o="; - cargoHash = "sha256-PHJiyq7zovn7EA7jDLJQxjxu2ErPHqBMwAlJpb5UVQY="; + version = "0.2.3"; + srcHash = "sha256-YS8/q8faWSRNciR03wwiiGGgkvZqb5Euto22pde53C8="; + cargoHash = "sha256-rBkKQAq1IAc4udS65RvprQe6knxyAFKxCWKGW5k5te4="; metaDescription = "Command-line tool that provides client-side functionality to transparently verify the identity of remote SSH hosts"; } diff --git a/pkgs/by-name/ss/ssh-tpm-agent/package.nix b/pkgs/by-name/ss/ssh-tpm-agent/package.nix index ca13fe9d84ba..61b24993e3b6 100644 --- a/pkgs/by-name/ss/ssh-tpm-agent/package.nix +++ b/pkgs/by-name/ss/ssh-tpm-agent/package.nix @@ -3,28 +3,40 @@ buildGoModule, fetchFromGitHub, nix-update-script, + openssh, openssl, }: buildGoModule rec { pname = "ssh-tpm-agent"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Foxboron"; repo = "ssh-tpm-agent"; - rev = "v${version}"; - hash = "sha256-yK7G+wZIn+kJazKOFOs8EYlRWZkCQuT0qZfmdqbcOnM="; + tag = "v${version}"; + hash = "sha256-CSxZctiQ/d4gzCUtfx9Oetb8s0XpHf3MPH/H0XaaVgg="; }; proxyVendor = true; - vendorHash = "sha256-njKyBfTG/QCPBBsj3Aom42cv2XqLv4YeS4DhwNQNaLA="; + vendorHash = "sha256-84ZB1B+RczJS08UToCWvvVfWrD62IQxy0XoBwn+wBkc="; buildInputs = [ openssl ]; + nativeCheckInputs = [ + openssh + ]; + + # disable broken tests, see https://github.com/NixOS/nixpkgs/pull/394097 + preCheck = '' + rm cmd/scripts_test.go + substituteInPlace internal/keyring/keyring_test.go --replace-fail ENOKEY ENOENT + substituteInPlace internal/keyring/threadkeyring_test.go --replace-fail ENOKEY ENOENT + ''; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/ss/sshguard/package.nix b/pkgs/by-name/ss/sshguard/package.nix index 7ce9c6cf5b2a..62f6f23f0505 100644 --- a/pkgs/by-name/ss/sshguard/package.nix +++ b/pkgs/by-name/ss/sshguard/package.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.4.3"; + version = "2.5.1"; pname = "sshguard"; src = fetchurl { url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz"; - sha256 = "sha256-ZAKd7/bekP3u+x9JfUFPDkBFB2aTqR2hpw63WV6X7+s="; + sha256 = "sha256-mXoeDsKyFltHV8QviUgWLrU0GDlGr1LvxAaIXZfLifw="; }; doCheck = true; diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix index 90bbce883096..73ab4de906e5 100644 --- a/pkgs/by-name/ss/sshocker/package.nix +++ b/pkgs/by-name/ss/sshocker/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sshocker"; - version = "0.3.6"; + version = "0.3.8"; src = fetchFromGitHub { owner = "lima-vm"; repo = "sshocker"; tag = "v${version}"; - hash = "sha256-ehsQ/Z1LCSpnvIvABLCIR2aLG4DK33VJ9gidoSEoeqw="; + hash = "sha256-uLotIvFpJL5keVyazG+g2TOKqcZwTDqSoAOaswqliNo="; }; - vendorHash = "sha256-9le1ETAdMZ1s7Hl2STz76/9eU0YkI4yNM/PZVXOwndQ="; + vendorHash = "sha256-uzKLAHxRRw0Bx7HjANOsX0tvfmbJhclT8SP346yFGwc="; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -28,7 +28,7 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "Tool for SSH, reverse sshfs and port forwarder"; diff --git a/pkgs/by-name/ss/sshs/package.nix b/pkgs/by-name/ss/sshs/package.nix index 3d1dff4682fb..fdec7c7040db 100644 --- a/pkgs/by-name/ss/sshs/package.nix +++ b/pkgs/by-name/ss/sshs/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "sshs"; - version = "4.5.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "quantumsheep"; repo = "sshs"; rev = version; - hash = "sha256-8tIIpGEQBXfLQ/Bok4KrpDGwoYhIQz/ylg6fUc6mBdc="; + hash = "sha256-Xr1S6KSw3a/+TIrw2hUPpUOd22+49YMuGK2TVxfwPHU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-U1E11NB+MVte31hfSAwhzXsId7U5uGy5C6Ubk6RPNvA="; + cargoHash = "sha256-Py85+zv54KHFXjhiThTPXgJQmCImXN42ePOjazjzxIQ="; passthru.tests.version = testers.testVersion { package = sshs; }; diff --git a/pkgs/by-name/ss/sslh/package.nix b/pkgs/by-name/ss/sslh/package.nix index 83a377e1be2a..0c70cbb07023 100644 --- a/pkgs/by-name/ss/sslh/package.nix +++ b/pkgs/by-name/ss/sslh/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "sslh"; - version = "2.1.3"; + version = "2.2.3"; src = fetchFromGitHub { owner = "yrutschle"; repo = "sslh"; rev = "v${version}"; - hash = "sha256-46lnQ+u+TfHrI2Yz5jd/Tl82K8mmqFY2Cqu6ktLiveA="; + hash = "sha256-SWkhTgJM6s89mgvJbqa+N75+0TYCvlEH1NQgaKjocFo="; }; postPatch = "patchShebangs *.sh"; diff --git a/pkgs/by-name/st/sta/package.nix b/pkgs/by-name/st/sta/package.nix index 64cbc1d4745a..a24b87d9ff7d 100644 --- a/pkgs/by-name/st/sta/package.nix +++ b/pkgs/by-name/st/sta/package.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, autoreconfHook, + cxxtest, }: stdenv.mkDerivation { @@ -16,8 +17,28 @@ stdenv.mkDerivation { sha256 = "sha256-AiygCfBze7J1Emy6mc27Dim34eLR7VId9wodUZapIL4="; }; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook ]; + doCheck = true; + nativeCheckInputs = [ cxxtest ]; + checkInputs = [ cxxtest ]; + + checkPhase = '' + runHook preCheck + + pushd test + + cxxtestgen --error-printer --have-std -o tests.cpp sta_test_1.h sta_test_2.h + ${stdenv.cc.targetPrefix}c++ -o tester tests.cpp + ./tester + + popd + + runHook postCheck + ''; + meta = with lib; { description = "Simple statistics from the command line interface (CLI), fast"; longDescription = '' @@ -31,7 +52,6 @@ stdenv.mkDerivation { homepage = "https://github.com/simonccarter/sta"; maintainers = [ ]; platforms = platforms.all; - badPlatforms = platforms.darwin; mainProgram = "sta"; }; } diff --git a/pkgs/by-name/st/stabber/package.nix b/pkgs/by-name/st/stabber/package.nix index a2d3a8c6587e..5c269a2e8606 100644 --- a/pkgs/by-name/st/stabber/package.nix +++ b/pkgs/by-name/st/stabber/package.nix @@ -7,7 +7,6 @@ glib, expat, libmicrohttpd, - darwin, }: stdenv.mkDerivation { pname = "stabber-unstable"; @@ -37,7 +36,7 @@ stdenv.mkDerivation { glib expat libmicrohttpd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; meta = with lib; { description = "Stubbed XMPP Server"; diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix index 9abb9da75c03..97a6cc7dfa3c 100644 --- a/pkgs/by-name/st/stac-validator/package.nix +++ b/pkgs/by-name/st/stac-validator/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { pname = "stac-validator"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; disabled = python3Packages.pythonOlder "3.8"; @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { owner = "stac-utils"; repo = "stac-validator"; tag = "v${version}"; - hash = "sha256-/MConEN+fcY3JKqP/24k0l/m2FHNhIqG7k42ldSPZ1U="; + hash = "sha256-j29Bo8n+/85fzJtif0eWYxDP86k9n4Osl9/piWmTxSs="; }; build-system = [ python3Packages.setuptools ]; @@ -35,6 +35,6 @@ python3Packages.buildPythonPackage rec { description = "Validator for the SpatioTemporal Asset Catalog (STAC) specification"; homepage = "https://github.com/stac-utils/stac-validator"; license = lib.licenses.asl20; - maintainers = lib.teams.geospatial.members; + teams = [ lib.teams.geospatial ]; }; } diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index cd678c8f98a9..165d2e86b723 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.29.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-EPjQrPt6m7yOFgYqHOaWAZN7CjlsOgl2jsEuRB8+1fE="; + hash = "sha256-y0NQXfYgaAwMCCjEdUXpVlILqFXQP4+CxaJNjHZKdr8="; }; - vendorHash = "sha256-NiaY0HKDerYqehZkYToAHazaJe0eMUuue+8h6QdQDHM="; + vendorHash = "sha256-7jsF91XudEG7mkqYcnhSI2D+uHQ4HGX+bzlm3wGR+MA="; subPackages = [ "." ]; diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix index 2c62a019283c..e0fdbb09050e 100644 --- a/pkgs/by-name/st/stalwart-cli/package.nix +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; # Prerelease reports incorrect version dontVersionCheck = true; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index c95600e836c4..16f984cb86c1 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -9,28 +9,29 @@ sqlite, foundationdb, zstd, + rust-jemalloc-sys, stdenv, - darwin, nix-update-script, nixosTests, rocksdb, callPackage, + withFoundationdb ? false, + stalwartEnterprise ? false, }: -rustPlatform.buildRustPackage { - pname = "stalwart-mail"; - version = "0.11.6-unstable-2025-02-04"; +rustPlatform.buildRustPackage rec { + pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise"); + version = "0.11.8"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "mail-server"; - # release 0.11.6 broken, see https://github.com/stalwartlabs/mail-server/issues/1150 - rev = "fa6483b6df57513582425119027bc4fce8f03d65"; - hash = "sha256-mB3Vm07b+eKDlQ95pmVk14Q7jXTBbV1jTbN+6hcFt0s="; + tag = "v${version}"; + hash = "sha256-VqGosbSQxNeOS+kGtvXAmz6vyz5mJlXvKZM57B1Xue4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-PHr73GQ/6d5ulJzntSHIilGzdF4Y8Np9jSFa6F2Nwao="; + cargoHash = "sha256-iheURWxO0cOvO+FV01l2Vmo0B+S2mXzue6mx3gapftQ="; nativeBuildInputs = [ pkg-config @@ -38,31 +39,28 @@ rustPlatform.buildRustPackage { rustPlatform.bindgenHook ]; - buildInputs = - [ - bzip2 - openssl - sqlite - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ foundationdb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + sqlite + zstd + rust-jemalloc-sys + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ]; # Issue: https://github.com/stalwartlabs/mail-server/issues/1104 buildNoDefaultFeatures = true; - buildFeatures = [ - "sqlite" - "postgres" - "mysql" - "rocks" - "elastic" - "s3" - "redis" - ]; + buildFeatures = + [ + "sqlite" + "postgres" + "mysql" + "rocks" + "elastic" + "s3" + "redis" + ] + ++ lib.optionals withFoundationdb [ "foundationdb" ] + ++ lib.optionals stalwartEnterprise [ "enterprise" ]; env = { OPENSSL_NO_VENDOR = true; @@ -103,8 +101,16 @@ rustPlatform.buildRustPackage { "--skip=smtp::inbound::data::data" # Expected "X-My-Header: true" but got Received: from foobar.net (unknown [10.0.0.123]) "--skip=smtp::inbound::scripts::sieve_scripts" + # thread 'smtp::outbound::lmtp::lmtp_delivery' panicked at tests/src/smtp/session.rs:313:13: + # Expected " (failed to lookup" but got From: "Mail Delivery Subsystem" + "--skip=smtp::outbound::lmtp::lmtp_delivery" + # thread 'smtp::outbound::extensions::extensions' panicked at tests/src/smtp/inbound/mod.rs:45:23: + # No queue event received. + "--skip=smtp::outbound::extensions::extensions" # panicked at tests/src/smtp/outbound/smtp.rs:173:5: "--skip=smtp::outbound::smtp::smtp_delivery" + # panicked at tests/src/smtp/outbound/lmtp.rs + "--skip=smtp::outbound::lmtp::lmtp_delivery" # thread 'smtp::queue::retry::queue_retry' panicked at tests/src/smtp/queue/retry.rs:119:5: # assertion `left == right` failed # left: [1, 2, 2] @@ -135,6 +141,10 @@ rustPlatform.buildRustPackage { "--skip=smtp::inbound::antispam::antispam" # Failed to read system DNS config: io error: No such file or directory (os error 2) "--skip=smtp::inbound::vrfy::vrfy_expn" + # thread 'smtp::management::queue::manage_queue' panicked at tests/src/smtp/inbound/mod.rs:45:23: + # No queue event received. + # NOTE: Test unreliable on high load systems + "--skip=smtp::management::queue::manage_queue" ]; doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); @@ -150,7 +160,17 @@ rustPlatform.buildRustPackage { description = "Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)"; homepage = "https://github.com/stalwartlabs/mail-server"; changelog = "https://github.com/stalwartlabs/mail-server/blob/main/CHANGELOG.md"; - license = lib.licenses.agpl3Only; + license = + [ lib.licenses.agpl3Only ] + ++ lib.optionals stalwartEnterprise [ + { + fullName = "Stalwart Enterprise License 1.0 (SELv1) Agreement"; + url = "https://github.com/stalwartlabs/mail-server/blob/main/LICENSES/LicenseRef-SEL.txt"; + free = false; + redistributable = false; + } + ]; + maintainers = with lib.maintainers; [ happysalada onny diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index 53c44fa5d017..5ed67c2b45c2 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { pname = "webadmin"; - version = "0.1.24"; + version = "0.1.25"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "webadmin"; tag = "v${version}"; - hash = "sha256-KtCSP7PP1LBTcP1LFdEmom/4G8or87oA6ml6MXOhATk="; + hash = "sha256-Hv7FojY/SZgbzS8XGVj0uRfynZCZPEbPiSHRuBtt/Jc="; }; npmDeps = fetchNpmDeps { @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; - cargoHash = "sha256-VXbFQLMtqypQlisirKhlfu9PYgmEryJx85GRqlRslNY="; + cargoHash = "sha256-/BoGeAF4GbM8ddWCnxAueJQYgQZvAL0pQ0pDUW0mXI0="; postPatch = '' # Using local tailwindcss for compilation diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix index 1778f16b97d7..8701b9450836 100644 --- a/pkgs/by-name/st/star-history/package.nix +++ b/pkgs/by-name/st/star-history/package.nix @@ -1,32 +1,26 @@ { lib, rustPlatform, - darwin, fetchCrate, pkg-config, openssl, - stdenv, }: rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.29"; + version = "1.0.30"; src = fetchCrate { inherit pname version; - hash = "sha256-RpGR4DlAvSuaecHPiD367rRR7H5zQs0JOgtvh/PXgpM="; + hash = "sha256-QTTBWuRXjx7UEMjnrIb4KQW+rtyKy4Q0Hu7OLt1Dph0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lVwH8NnmBl3ZakVbFYslvH39mjAOhmPRmXdshbwkx1Y="; + cargoHash = "sha256-2GwZtNbUbdzxK31Gh4U2LsFkzV1ylXkZnP5r5FQ/hvU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; meta = with lib; { description = "Command line program to generate a graph showing number of GitHub stars of a user, org or repo over time"; diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix index a69598c32c5f..a14786838b63 100644 --- a/pkgs/by-name/st/starboard/package.nix +++ b/pkgs/by-name/st/starboard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.24"; + version = "0.15.25"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-GZ+KOnQV/eXPt1QGaqWj4JAlPNhNKpVn7rlC7W4zfDo="; + hash = "sha256-mCYnJ1SFa3OuYQlPWTq9vWV9s/jtaQ6dOousV/UNR18="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-5TeiEGu5B+5uNnkxdBlPqLu/g9FZ4VWrbZFfp/JsJiA="; + vendorHash = "sha256-qujObGBxUFGxtrdlJmTOTW6HUbDCjNSElPqhQfYqId4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/st/stardust-xr-magnetar/package.nix b/pkgs/by-name/st/stardust-xr-magnetar/package.nix index a6a8584e3675..7b34b80c8a8c 100644 --- a/pkgs/by-name/st/stardust-xr-magnetar/package.nix +++ b/pkgs/by-name/st/stardust-xr-magnetar/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage { pname = "stardust-xr-magnetar"; - version = "0-unstable-2024-12-29"; + version = "0-unstable-2025-04-03"; src = fetchFromGitHub { owner = "stardustxr"; repo = "magnetar"; - rev = "d00c5ecf0bcaf2b4382ec3b4f3373ea5b761ee7b"; - hash = "sha256-2I6BRjw5t68OMc93cis4/qnyYT9OBYIr1S+ZF8LmFCc="; + rev = "63ff648bb64c23023a0047ea3ff2c0b6b1fd3caf"; + hash = "sha256-LRI3HKuOUfUb93mHB8DUpp0hvES+GbzsKAxpkLCLzKQ="; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/st/stargazer/package.nix b/pkgs/by-name/st/stargazer/package.nix index 8da7c0576d5d..d825ba5dfd83 100644 --- a/pkgs/by-name/st/stargazer/package.nix +++ b/pkgs/by-name/st/stargazer/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "stargazer"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromSourcehut { owner = "~zethra"; repo = "stargazer"; rev = version; - hash = "sha256-0vbQDHuLrgrsWiOb2hb6lYylJm5o/wOzoDIw85H8Eh0="; + hash = "sha256-Yulm0XkVaN+yBKj8LDsn8pBYXEqTOSGLqbpIKDN0G2U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-KdHYyuH1RMLRueqYbfADUktBx9aL8yTagB0KxEGQsCs="; + cargoHash = "sha256-MtpJTLKhlVF5AE3huL0JRWXtNCtc0Z5b/S28ekzirPA="; passthru = { tests.basic-functionality = nixosTests.stargazer; diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix index 5b795b307130..9a74f63c3b78 100644 --- a/pkgs/by-name/st/starlark/package.nix +++ b/pkgs/by-name/st/starlark/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "starlark"; - version = "0-unstable-2025-03-18"; + version = "0-unstable-2025-04-17"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "d9371fef63fe912333a96a4e54ff72d071cb71ad"; - hash = "sha256-gbhn9bvt5SjOvdIEyQzMitLpS3KdOvvvR73l4E6Hap8="; + rev = "f57e51f710eb2662fb0866b2bfb87c218cecdc52"; + hash = "sha256-JuWdw0+SDcnfkEp4aUIUtI86dhEbZMBWNUibLEwQBek="; }; vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo="; diff --git a/pkgs/by-name/st/starry/package.nix b/pkgs/by-name/st/starry/package.nix index 244d19a3eed8..c51dc81506e3 100644 --- a/pkgs/by-name/st/starry/package.nix +++ b/pkgs/by-name/st/starry/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Current stars history tells only half the story"; diff --git a/pkgs/by-name/st/starsector/package.nix b/pkgs/by-name/st/starsector/package.nix new file mode 100644 index 000000000000..1f3eceec9c58 --- /dev/null +++ b/pkgs/by-name/st/starsector/package.nix @@ -0,0 +1,111 @@ +{ + lib, + fetchzip, + libGL, + makeWrapper, + openal, + openjdk17, + stdenv, + xorg, + copyDesktopItems, + makeDesktopItem, + writeScript, +}: +let + openjdk = openjdk17; +in +stdenv.mkDerivation rec { + pname = "starsector"; + version = "0.98a-RC8"; + + src = fetchzip { + url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip"; + sha256 = "sha256-W/6QpgKbUJC+jWOlAOEEGStee5KJuLi020kRtPQXK3U="; + }; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + buildInputs = [ + xorg.libXxf86vm + openal + libGL + ]; + + dontBuild = true; + + desktopItems = [ + (makeDesktopItem { + name = "starsector"; + exec = "starsector"; + icon = "starsector"; + comment = meta.description; + genericName = "starsector"; + desktopName = "Starsector"; + categories = [ "Game" ]; + }) + ]; + + # need to cd into $out in order for classpath to pick up correct jar files + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/starsector + rm -r jre_linux # remove bundled jre7 + rm starfarer.api.zip + cp -r ./* $out/share/starsector + + mkdir -p $out/share/icons/hicolor/64x64/apps + ln -s $out/share/starsector/graphics/ui/s_icon64.png \ + $out/share/icons/hicolor/64x64/apps/starsector.png + + wrapProgram $out/share/starsector/starsector.sh \ + --prefix PATH : ${ + lib.makeBinPath [ + openjdk + xorg.xrandr + ] + } \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \ + --run 'mkdir -p ''${XDG_DATA_HOME:-~/.local/share}/starsector' \ + --chdir "$out/share/starsector" + ln -s $out/share/starsector/starsector.sh $out/bin/starsector + + runHook postInstall + ''; + + # it tries to run everything with relative paths, which makes it CWD dependent + # also point mod, screenshot, and save directory to $XDG_DATA_HOME + # additionally, add some GC options to improve performance of the game, + # remove flags "PermSize" and "MaxPermSize" that were removed with Java 8 and + # pass-through CLI args ($@) to the JVM. + postPatch = '' + substituteInPlace starsector.sh \ + --replace-fail "./jre_linux/bin/java" "${lib.getExe openjdk}" \ + --replace-fail "./native/linux" "$out/share/starsector/native/linux" \ + --replace-fail "./compiler_directives.txt" "$out/share/starsector/compiler_directives.txt" \ + --replace-fail "=." "=\''${XDG_DATA_HOME:-\$HOME/.local/share}/starsector" \ + --replace-fail "com.fs.starfarer.StarfarerLauncher" "\"\$@\" com.fs.starfarer.StarfarerLauncher" + ''; + + passthru.updateScript = writeScript "starsector-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + set -eou pipefail; + version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-\K.*?(?=\.zip)" | head -1) + update-source-version ${pname} "$version" --file=./pkgs/by-name/st/starsector/package.nix + ''; + + meta = with lib; { + description = "Open-world single-player space-combat, roleplaying, exploration, and economic game"; + homepage = "https://fractalsoftworks.com"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.unfree; + maintainers = with maintainers; [ + bbigras + rafaelrc + ]; + }; +} diff --git a/pkgs/by-name/st/starship/package.nix b/pkgs/by-name/st/starship/package.nix new file mode 100644 index 000000000000..404816b79a83 --- /dev/null +++ b/pkgs/by-name/st/starship/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + installShellFiles, + writableTmpDirAsHomeHook, + gitMinimal, + nixosTests, + buildPackages, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "starship"; + version = "1.23.0"; + + src = fetchFromGitHub { + owner = "starship"; + repo = "starship"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5Euhbuu1uiJ5HJNlPs9sUoGcc5QWqXqNmEH0jpfGLlc="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + writableTmpDirAsHomeHook + ]; + + postInstall = + '' + presetdir=$out/share/starship/presets/ + mkdir -p $presetdir + cp docs/public/presets/toml/*.toml $presetdir + '' + + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd starship \ + --bash <(${emulator} $out/bin/starship completions bash) \ + --fish <(${emulator} $out/bin/starship completions fish) \ + --zsh <(${emulator} $out/bin/starship completions zsh) + '' + ); + + useFetchCargoVendor = true; + cargoHash = "sha256-cxDWaPlNK7POJ3GhA21NlJ6q62bqHdA/4sru5pLkvOA="; + + nativeCheckInputs = [ + gitMinimal + writableTmpDirAsHomeHook + ]; + + passthru.tests = { + inherit (nixosTests) starship; + }; + + meta = { + description = "Minimal, blazing fast, and extremely customizable prompt for any shell"; + homepage = "https://starship.rs"; + downloadPage = "https://github.com/starship/starship"; + changelog = "https://github.com/starship/starship/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ + danth + Br1ght0ne + Frostman + awwpotato + sigmasquadron + ]; + mainProgram = "starship"; + }; +}) diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix index eeeb1cdf6c20..82989c876aef 100644 --- a/pkgs/by-name/st/staruml/package.nix +++ b/pkgs/by-name/st/staruml/package.nix @@ -60,12 +60,12 @@ let ]; in stdenv.mkDerivation (finalAttrs: { - version = "6.3.1"; + version = "6.3.2"; pname = "staruml"; src = fetchurl { url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-HJCQZr3vphxLeuHVkq6fSZai8PfJKyhuaooFeOUGxSI="; + sha256 = "sha256-hN37cDsh+wWB0hIewRn/xeLXINX7MGA+9MPfi8X91qs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix index f31a7d1ccbec..83f1cb8cb49d 100644 --- a/pkgs/by-name/st/static-web-server/package.nix +++ b/pkgs/by-name/st/static-web-server/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nixosTests, }: @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Sri2NTCN5vIf/5KVI+BtyOBAjkXoGpOJjP2iOh/M5NU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - # Some tests rely on timestamps newer than 18 Nov 1974 00:00:00 preCheck = '' find docker/public -exec touch -m {} \; diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index a1525f25c8c0..e4edb91ac049 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.36"; + version = "2.11.41"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-ESCZWWJwzkuc+51qSOVj635nADfz2lHRsfn6YQyB69U="; + hash = "sha256-iW22uCyfx9sCX3GyVmYzyJIHylxIpgJLns2oHVFBwc4="; }; sourceRoot = "."; diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix index 7828feba494e..dcb374f48437 100644 --- a/pkgs/by-name/st/steam-unwrapped/package.nix +++ b/pkgs/by-name/st/steam-unwrapped/package.nix @@ -52,7 +52,8 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://store.steampowered.com/"; license = licenses.unfreeRedistributable; - maintainers = lib.teams.steam.members ++ [ lib.maintainers.jagajaga ]; + maintainers = [ lib.maintainers.jagajaga ]; + teams = [ lib.teams.steam ]; mainProgram = "steam"; }; }) diff --git a/pkgs/by-name/st/steampipe/package.nix b/pkgs/by-name/st/steampipe/package.nix index 3c47b99cfd98..16f18ea0dad7 100644 --- a/pkgs/by-name/st/steampipe/package.nix +++ b/pkgs/by-name/st/steampipe/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { pname = "steampipe"; - version = "1.0.3"; + version = "1.1.2"; env.CGO_ENABLED = 0; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "turbot"; repo = "steampipe"; tag = "v${version}"; - hash = "sha256-GpFTMbwfTou+mKB8hn4ucXbcvSFl7SEzlz7H98ojGO4="; + hash = "sha256-rzkj8iOJpD24qFad85VEpHh3K3+5+04yEp03i9J/9jU="; }; - vendorHash = "sha256-/8MDRlPR53MTMtW/VF6XsJ2NdV4NLDF8aukx7Rm/D7A="; + vendorHash = "sha256-KlrmtI2gkhNIKX+OEvkZ3z9IYa+wA7oM669fUPP8/ww="; proxyVendor = true; postPatch = '' diff --git a/pkgs/by-name/st/steamtinkerlaunch/package.nix b/pkgs/by-name/st/steamtinkerlaunch/package.nix index fd8a6c8561f2..858a9487fac5 100644 --- a/pkgs/by-name/st/steamtinkerlaunch/package.nix +++ b/pkgs/by-name/st/steamtinkerlaunch/package.nix @@ -7,24 +7,30 @@ procps, stdenvNoCC, unixtools, + unstableGitUpdater, unzip, usbutils, + util-linux, wget, + writeShellApplication, xdotool, xorg, yad, - writeShellApplication, }: stdenvNoCC.mkDerivation { pname = "steamtinkerlaunch"; - version = "12.12-unstable-2024-05-03"; + version = "12.12-unstable-2025-02-21"; src = fetchFromGitHub { owner = "sonic2kk"; repo = "steamtinkerlaunch"; - rev = "59b421b2f3686120a076909a4a158824cd4ef05e"; - hash = "sha256-CGtSGAm+52t2zFsPJEsm76w+FEHhbOd9NYuerGa31tc="; + rev = "36e917c383a333caa43e187c06c0aed0c30c0421"; + hash = "sha256-I7Aa7bZ6WB5LfCxyZUbl7fshyr2YWlZTMZDJKCODvhY="; + }; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; }; outputs = [ @@ -61,6 +67,7 @@ stdenvNoCC.mkDerivation { unixtools.xxd unzip usbutils + util-linux wget xdotool xorg.xprop @@ -91,7 +98,7 @@ stdenvNoCC.mkDerivation { cp -a $out/bin/steamtinkerlaunch $TMPDIR/steamtinkerlaunch # yad cannot print its version without a graphical session https://github.com/v1cont/yad/issues/277 - substituteInPlace $TMPDIR/steamtinkerlaunch --replace ${yad} ${fakeYad} + substituteInPlace $TMPDIR/steamtinkerlaunch --replace-fail ${yad} ${fakeYad} HOME=$TMPDIR $TMPDIR/steamtinkerlaunch compat add cp -a $steamdir/compatibilitytools.d/SteamTinkerLaunch $steamcompattool diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix index 7b3289bfb5ed..2fe3359669a1 100644 --- a/pkgs/by-name/st/steel/package.nix +++ b/pkgs/by-name/st/steel/package.nix @@ -20,13 +20,13 @@ }: rustPlatform.buildRustPackage { pname = "steel"; - version = "0.6.0-unstable-2025-03-28"; + version = "0.6.0-unstable-2025-04-17"; src = fetchFromGitHub { owner = "mattwparas"; repo = "steel"; - rev = "2f0fba8b16a3fbab083cedcf09974514b3a29d25"; - hash = "sha256-i/bmZFoC3fRocO1KeCPGB9K/0yEAcKlLh56N+r1V7CI="; + rev = "2f28ab10523198726d343257d29d892864e897b0"; + hash = "sha256-GcbuuaevPK5EOh0/IVgoL2MPC9ukDc8VXkdgbPX4quE="; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix index 92763dd75952..6ee922e90865 100644 --- a/pkgs/by-name/st/step-ca/package.nix +++ b/pkgs/by-name/st/step-ca/package.nix @@ -8,7 +8,6 @@ pkg-config, hsmSupport ? true, nixosTests, - darwin, }: buildGoModule rec { @@ -31,9 +30,7 @@ buildGoModule rec { nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; - buildInputs = - lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ] - ++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.PCSC ]; + buildInputs = lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ]; postPatch = '' substituteInPlace authority/http_client_test.go --replace-fail 't.Run("SystemCertPool", func(t *testing.T) {' 't.Skip("SystemCertPool", func(t *testing.T) {' substituteInPlace systemd/step-ca.service --replace "/bin/kill" "${coreutils}/bin/kill" @@ -66,6 +63,7 @@ buildGoModule rec { homepage = "https://smallstep.com/certificates/"; changelog = "https://github.com/smallstep/certificates/releases/tag/v${version}"; license = licenses.asl20; + mainProgram = "step-ca"; maintainers = with maintainers; [ cmcdragonkai techknowlogick diff --git a/pkgs/by-name/st/stepmania/package.nix b/pkgs/by-name/st/stepmania/package.nix index f978d8c62bba..96c590de81bb 100644 --- a/pkgs/by-name/st/stepmania/package.nix +++ b/pkgs/by-name/st/stepmania/package.nix @@ -17,6 +17,7 @@ libvorbis, udev, xorg, + zlib, }: stdenv.mkDerivation { @@ -61,11 +62,13 @@ stdenv.mkDerivation { libvorbis udev xorg.libXtst + zlib ]; cmakeFlags = [ "-DWITH_SYSTEM_FFMPEG=1" "-DWITH_SYSTEM_PNG=on" + "-DWITH_SYSTEM_ZLIB=on" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 1dee7e58e94b..f9074dd623e0 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.15.26"; + version = "3.15.37"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-D8Ebr02/O4avw/+60o8oZYII9pGz1veb+Gox6XOdQdg="; + hash = "sha256-d254AsNQgjExXaGd9EQ5dZ1xy5nP6Zqe2INtR9IKMiQ="; }; outputs = [ diff --git a/pkgs/by-name/st/sticky-notes/package.nix b/pkgs/by-name/st/sticky-notes/package.nix index 76c32999eae7..5e01d7f0f9f8 100644 --- a/pkgs/by-name/st/sticky-notes/package.nix +++ b/pkgs/by-name/st/sticky-notes/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "sticky-notes"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "vixalien"; repo = "sticky"; rev = "v${version}"; - hash = "sha256-keSxUTil4/QO8Wn4p6LB7oERxXHKD83qIRPZ93ZygWE="; + hash = "sha256-82Yxw8NSw82rxhuAgsdN2lCiQ/hli4tQiU6jCgGyp4U="; fetchSubmodules = true; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-GThcufSAr/VYL9AWFOBY2FDXQZGY5L7TbBdadPh7CAc="; + hash = "sha256-NDGuG2rXJH0bHsD7yQMY6HAZDkMq0j63SYVz8+X3fPQ="; }; preConfigure = '' diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index d7966caec68e..bd0250accc8e 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -52,6 +52,11 @@ let cat << EOF > $out/bin/${pname} #!${stdenvNoCC.shell} + updater_xml="\$HOME/.stm32cubemx/thirdparties/db/updaterThirdParties.xml" + if [ -e "\$updater_xml" ] && [ ! -w "\$updater_xml" ]; then + echo "Warning: Unwritable \$updater_xml prevents CubeMX software packages from working correctly. Fixing that." + (set -x; chmod u+w "\$updater_xml") + fi ${jdk21}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX "\$@" EOF chmod +x $out/bin/${pname} diff --git a/pkgs/by-name/st/storeBackup/package.nix b/pkgs/by-name/st/storeBackup/package.nix index 8a58698c0cdf..35610056b2a5 100644 --- a/pkgs/by-name/st/storeBackup/package.nix +++ b/pkgs/by-name/st/storeBackup/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2"; + url = "mirror://savannah/storebackup/storeBackup-${version}.tar.bz2"; hash = "sha256-Ki1DT2zypFFiiMVd9Y8eSX7T+yr8moWMoALmAexjqWU="; }; diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix index 5865c1ff8968..30c770ea82a9 100644 --- a/pkgs/by-name/st/storj-uplink/package.nix +++ b/pkgs/by-name/st/storj-uplink/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.125.2"; + version = "1.128.4"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-O4lp6NsUpxaikjpcDfpS+FZZHKOxjOn1Lr052PlD0W4="; + hash = "sha256-7CH//aZ7DOXIP6A1gAZpiFO55LrLtBhvtZl/tVhYl8g="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-OhYxrRTVbAbpPz25g27wgM30AQmQf3Uxh03ax8znFYY="; + vendorHash = "sha256-CTcFTEKj5s43OlrIC7lOh3Lh/6k8/Igckv0zwrdGKbE="; ldflags = [ "-s" diff --git a/pkgs/by-name/st/stork/package.nix b/pkgs/by-name/st/stork/package.nix new file mode 100644 index 000000000000..de81e69aa228 --- /dev/null +++ b/pkgs/by-name/st/stork/package.nix @@ -0,0 +1,44 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + openssl, + pkg-config, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "stork"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "jameslittle230"; + repo = "stork"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw="; + }; + + cargoPatches = [ ./update-wasm-bindgen.patch ]; + + cargoHash = "sha256-d6PLrs/n9riQ9oQTWn+6Ec1E5JhJZ7akDg8/UB21GzI="; + + checkFlags = [ + # Fails for 1.6.0, but binary works fine + "--skip=pretty_print_search_results::tests::display_pretty_search_results_given_output" + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "Impossibly fast web search, made for static sites"; + homepage = "https://github.com/jameslittle230/stork"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ chuahou ]; + mainProgram = "stork"; + }; +}) diff --git a/pkgs/by-name/st/stork/update-wasm-bindgen.patch b/pkgs/by-name/st/stork/update-wasm-bindgen.patch new file mode 100644 index 000000000000..56e276302323 --- /dev/null +++ b/pkgs/by-name/st/stork/update-wasm-bindgen.patch @@ -0,0 +1,253 @@ +diff --git a/Cargo.lock b/Cargo.lock +index df6305c..ec55cb0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "aho-corasick" +@@ -292,7 +292,7 @@ dependencies = [ + "proc-macro2", + "quote", + "smallvec", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -302,7 +302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" + dependencies = [ + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -334,7 +334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" + dependencies = [ + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -347,7 +347,7 @@ dependencies = [ + "proc-macro2", + "quote", + "rustc_version", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -585,7 +585,7 @@ dependencies = [ + "markup5ever", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -911,9 +911,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + + [[package]] + name = "once_cell" +-version = "1.8.0" ++version = "1.21.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" ++checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + + [[package]] + name = "oorandom" +@@ -1036,7 +1036,7 @@ dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -1135,11 +1135,11 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + + [[package]] + name = "proc-macro2" +-version = "1.0.32" ++version = "1.0.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" ++checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" + dependencies = [ +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] +@@ -1156,9 +1156,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.9" ++version = "1.0.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" + dependencies = [ + "proc-macro2", + ] +@@ -1357,6 +1357,12 @@ dependencies = [ + "semver", + ] + ++[[package]] ++name = "rustversion" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" ++ + [[package]] + name = "ryu" + version = "1.0.5" +@@ -1464,7 +1470,7 @@ checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -1535,7 +1541,7 @@ checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -1671,6 +1677,17 @@ dependencies = [ + "unicode-xid", + ] + ++[[package]] ++name = "syn" ++version = "2.0.101" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ + [[package]] + name = "tempfile" + version = "3.3.0" +@@ -1750,7 +1767,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -1885,6 +1902,12 @@ version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" + ++[[package]] ++name = "unicode-ident" ++version = "1.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" ++ + [[package]] + name = "unicode-linebreak" + version = "0.1.2" +@@ -1992,26 +2015,27 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.78" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" ++checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" + dependencies = [ + "cfg-if", ++ "once_cell", ++ "rustversion", + "wasm-bindgen-macro", + ] + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.78" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" ++checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" + dependencies = [ + "bumpalo", +- "lazy_static", + "log", + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.101", + "wasm-bindgen-shared", + ] + +@@ -2029,9 +2053,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.78" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" ++checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -2039,22 +2063,25 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.78" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" ++checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.101", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.78" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" ++checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" ++dependencies = [ ++ "unicode-ident", ++] + + [[package]] + name = "web-sys" diff --git a/pkgs/by-name/st/stormlib/package.nix b/pkgs/by-name/st/stormlib/package.nix index f7cd1b2b55d5..cf7f4d7ebcf2 100644 --- a/pkgs/by-name/st/stormlib/package.nix +++ b/pkgs/by-name/st/stormlib/package.nix @@ -3,7 +3,6 @@ stdenv, bzip2, cmake, - darwin, fetchFromGitHub, libtomcrypt, zlib, @@ -26,15 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - bzip2 - libtomcrypt - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Carbon - ]; + buildInputs = [ + bzip2 + libtomcrypt + zlib + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) @@ -61,7 +56,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ aanderse - karolchmist ]; platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; # installation directory mismatch diff --git a/pkgs/by-name/st/stown/package.nix b/pkgs/by-name/st/stown/package.nix index 7a85908e97b0..b4a5013a10f5 100644 --- a/pkgs/by-name/st/stown/package.nix +++ b/pkgs/by-name/st/stown/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, tree, versionCheckHook, + nix-update-script, }: let version = "1.2.0"; @@ -30,6 +31,8 @@ python3Packages.buildPythonApplication { versionCheckHook ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Manage file system object mapping via symlinks. Lightweight alternative to GNU Stow"; homepage = "https://www.seichter.de/stown/"; diff --git a/pkgs/by-name/st/stract/package.nix b/pkgs/by-name/st/stract/package.nix index 59abb6c23de8..60cebaf08737 100644 --- a/pkgs/by-name/st/stract/package.nix +++ b/pkgs/by-name/st/stract/package.nix @@ -69,11 +69,9 @@ rustPlatform.buildRustPackage { ''; homepage = "https://github.com/StractOrg/stract"; license = lib.licenses.agpl3Only; - maintainers = - with lib.maintainers; - [ - ailsa-sun - ] - ++ lib.teams.ngi.members; + maintainers = with lib.maintainers; [ + ailsa-sun + ]; + teams = [ lib.teams.ngi ]; }; } diff --git a/pkgs/by-name/st/streamrip/package.nix b/pkgs/by-name/st/streamrip/package.nix index 4b84727083bd..9fa90e8b6603 100644 --- a/pkgs/by-name/st/streamrip/package.nix +++ b/pkgs/by-name/st/streamrip/package.nix @@ -52,15 +52,9 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - prePatch = '' - sed -i 's#aiofiles = ".*"#aiofiles = "*"#' pyproject.toml - sed -i 's#deezer-py = ".*"#deezer-py = "*"#' pyproject.toml - sed -i 's#m3u8 = ".*"#m3u8 = "*"#' pyproject.toml - sed -i 's#pathvalidate = ".*"#pathvalidate = "*"#' pyproject.toml - sed -i 's#Pillow = ".*"#Pillow = "*"#' pyproject.toml - sed -i 's#pytest-asyncio = ".*"#pytest-asyncio = "*"#' pyproject.toml - sed -i 's#tomlkit = ".*"#tomlkit = "*"#' pyproject.toml + pythonRelaxDeps = true; + prePatch = '' sed -i 's#"ffmpeg"#"${lib.getBin ffmpeg}/bin/ffmpeg"#g' streamrip/client/downloadable.py ''; diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix index 5ca0686fb599..26073880ed57 100644 --- a/pkgs/by-name/st/stress-ng/package.nix +++ b/pkgs/by-name/st/stress-ng/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.18.11"; + version = "0.19.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "stress-ng"; rev = "V${version}"; - hash = "sha256-2C/hOjlv9pMLOa0hPSgN+az45qOXekaCAfl++J/cV3M="; + hash = "sha256-CbGbGGWZDil7l04KNuizlAu9IACdtbHR5rrn39AAhio="; }; postPatch = '' diff --git a/pkgs/by-name/st/strip-tags/package.nix b/pkgs/by-name/st/strip-tags/package.nix index 52d90e41e1e3..8f3343bb94fe 100644 --- a/pkgs/by-name/st/strip-tags/package.nix +++ b/pkgs/by-name/st/strip-tags/package.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { pyyaml versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "CLI tool for stripping tags from HTML"; diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index 71bb01cb86e2..d319f8e903f0 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.25.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "stripe"; repo = "stripe-cli"; rev = "v${version}"; - hash = "sha256-WlLrWMDOwpSoHUixkJbCoewt/4UgnTbwIMBD5p5SI3c="; + hash = "sha256-tV76A1qnsaj3Zp9W9aMrmvVVWjxgjUUkIwNSxdLaakk="; }; - vendorHash = "sha256-dWLrJ866R+yPEYs4vc8SRADZXC1xCO7sDosHbU1G63o="; + vendorHash = "sha256-T8vrEbR240ihkLDG4vu0s+MxKJ5nOLm0aseDgK9EPPE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/st/strongswan/package.nix b/pkgs/by-name/st/strongswan/package.nix index c014a2080be4..48c8c18b5676 100644 --- a/pkgs/by-name/st/strongswan/package.nix +++ b/pkgs/by-name/st/strongswan/package.nix @@ -28,7 +28,6 @@ tpm2-tss, enableNetworkManager ? false, networkmanager, - darwin, nixosTests, }: @@ -78,9 +77,6 @@ stdenv.mkDerivation rec { pam iptables ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ SystemConfiguration ] - ) ++ lib.optionals enableNetworkManager [ networkmanager glib diff --git a/pkgs/by-name/st/stubby/package.nix b/pkgs/by-name/st/stubby/package.nix new file mode 100644 index 000000000000..585edede4df9 --- /dev/null +++ b/pkgs/by-name/st/stubby/package.nix @@ -0,0 +1,60 @@ +# Getdns and Stubby are released together, see https://getdnsapi.net/releases/ +# ../../ge/getdns/package.nix + +{ + lib, + stdenv, + cmake, + getdns, + libyaml, + openssl, + systemd, + yq, + stubby, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "stubby"; + version = "0.4.3"; + outputs = [ + "out" + "man" + "stubbyExampleJson" + ]; + + inherit (getdns) src; + sourceRoot = "${getdns.pname}-${getdns.version}/stubby"; + + nativeBuildInputs = [ + cmake + yq + ]; + + buildInputs = [ + getdns + libyaml + openssl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; + + postInstall = '' + rm -r $out/share/doc + yq \ + < $NIX_BUILD_TOP/$sourceRoot/stubby.yml.example \ + > $stubbyExampleJson + ''; + + passthru.settingsExample = builtins.fromJSON (builtins.readFile stubby.stubbyExampleJson); + + meta = getdns.meta // { + description = "Local DNS Privacy stub resolver (using DNS-over-TLS)"; + mainProgram = "stubby"; + longDescription = '' + Stubby is an application that acts as a local DNS Privacy stub + resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS + queries sent from a client machine (desktop or laptop) to a DNS + Privacy resolver increasing end user privacy. Stubby is developed by + the getdns team. + ''; + homepage = "https://dnsprivacy.org/dns_privacy_daemon_-_stubby/"; + }; +}) diff --git a/pkgs/by-name/st/stupidterm/package.nix b/pkgs/by-name/st/stupidterm/package.nix new file mode 100644 index 000000000000..7d82681b92df --- /dev/null +++ b/pkgs/by-name/st/stupidterm/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + vte, + gtk3, + pcre2, + nixosTests, +}: + +stdenv.mkDerivation { + pname = "stupidterm"; + version = "2019-03-26"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + vte + gtk3 + pcre2 + ]; + + src = fetchFromGitHub { + owner = "esmil"; + repo = "stupidterm"; + rev = "f824e41c2ca9016db73556c5d2f5a2861e235c8e"; + sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp"; + }; + + makeFlags = [ + "PKGCONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" + "binary=stupidterm" + ]; + + installPhase = '' + install -D stupidterm $out/bin/stupidterm + install -D -m 644 stupidterm.desktop $out/share/applications/stupidterm.desktop + install -D -m 644 stupidterm.ini $out/share/stupidterm/stupidterm.ini + + substituteInPlace $out/share/applications/stupidterm.desktop \ + --replace "Exec=st" "Exec=$out/bin/stupidterm" + ''; + + passthru.tests.test = nixosTests.terminal-emulators.stupidterm; + + meta = with lib; { + description = "Simple wrapper around the VTE terminal emulator widget for GTK"; + homepage = "https://github.com/esmil/stupidterm"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.etu ]; + platforms = platforms.linux; + mainProgram = "stupidterm"; + }; +} diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix index c1b378d60a69..5e44efe1b338 100644 --- a/pkgs/by-name/st/stylance-cli/package.nix +++ b/pkgs/by-name/st/stylance-cli/package.nix @@ -5,15 +5,15 @@ }: rustPlatform.buildRustPackage rec { pname = "stylance-cli"; - version = "0.5.5"; + version = "0.6.0"; src = fetchCrate { inherit pname version; - hash = "sha256-/aTda9TOwC2spODMWQIaBzJJ17/8EoWIRZ7DjJE/ta4="; + hash = "sha256-uksDnxTBuzwpMDCO3HIg05IK1emba6BjbpN0TcWSOdQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZMIbNQMZ7uCYFSIX2NTGY/31V6e0QWHjZvVaA8Vv7IQ="; + cargoHash = "sha256-iSE6SmqYXg9IAMJOb4/q80w+J2OEVd7oyxRpWcCps9U="; meta = with lib; { description = "Library and cli tool for working with scoped CSS in rust"; diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix index 1f595bdb0103..2e823ab8d35f 100644 --- a/pkgs/by-name/st/stylelint/package.nix +++ b/pkgs/by-name/st/stylelint/package.nix @@ -5,16 +5,16 @@ }: buildNpmPackage rec { pname = "stylelint"; - version = "16.17.0"; + version = "16.19.1"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; tag = version; - hash = "sha256-oCNgBS9yTOCrqI/35KWgim1cW62+91xwAMpWORUQVAQ="; + hash = "sha256-KYUNKA/KJXfRiGkhzkBKkiuEMJAwpkt4FXwx/oJQdq4="; }; - npmDepsHash = "sha256-JZT7PXbEd7jSx0WGPLh0GtUthkMfgHR17c451k515Rc="; + npmDepsHash = "sha256-5KWs4AboLHJBXJaDXAs30e0e9PAncFQzGHdNDxG8Lpo="; dontNpmBuild = true; diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix index 88ed83192f1e..8a5286d419dc 100644 --- a/pkgs/by-name/st/stylua/package.nix +++ b/pkgs/by-name/st/stylua/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = "stylua"; rev = "v${version}"; - sha256 = "sha256-sZrymo1RRfDLz8fPa7FnbutSpOCFoyQPoFVjA6BH5qQ="; + sha256 = "sha256-yVie8/aey77WbeUGM6rzuKBKLmAH1Jhhj9Y7LxbvIUw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uQCF/u1+slouHypepoPQtaYcsMD7NXhK1qcOl52txXs="; + cargoHash = "sha256-ow8lldu36qBHcXFgeBhHo2u+sSAFCEFbxUk2oZI7sj4="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/by-name/st/styx/package.nix b/pkgs/by-name/st/styx/package.nix index bc9825efdbab..19fc5f3c22f5 100644 --- a/pkgs/by-name/st/styx/package.nix +++ b/pkgs/by-name/st/styx/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Nix based static site generator"; - maintainers = with maintainers; [ ericsagnes ]; + maintainers = with maintainers; [ ]; homepage = "https://styx-static.github.io/styx-site/"; downloadPage = "https://github.com/styx-static/styx/"; platforms = platforms.all; diff --git a/pkgs/by-name/su/subberthehut/package.nix b/pkgs/by-name/su/subberthehut/package.nix deleted file mode 100644 index 3dd753b78761..000000000000 --- a/pkgs/by-name/su/subberthehut/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - xmlrpc_c, - glib, - zlib, -}: -stdenv.mkDerivation rec { - pname = "subberthehut"; - version = "20"; - - src = fetchFromGitHub { - owner = "mus65"; - repo = "subberthehut"; - rev = version; - sha256 = "19prdqbk19h0wak318g2jn1mnfm7l7f83a633bh0rhskysmqrsj1"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xmlrpc_c - glib - zlib - ]; - - installPhase = '' - install -Dm755 subberthehut $out/bin/subberthehut - install -Dm644 bash_completion $out/share/bash-completion/completions/subberthehut - ''; - - meta = with lib; { - homepage = "https://github.com/mus65/subberthehut"; - description = "OpenSubtitles.org downloader"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ jqueiroz ]; - mainProgram = "subberthehut"; - }; -} diff --git a/pkgs/by-name/su/subfinder/package.nix b/pkgs/by-name/su/subfinder/package.nix index c393bb9c13df..3d1622daf883 100644 --- a/pkgs/by-name/su/subfinder/package.nix +++ b/pkgs/by-name/su/subfinder/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "subfinder"; tag = "v${version}"; - hash = "sha256-FSEircHSOU/rBdDANrdfPtTUfDn/2A+HtVnVyz7bV0c="; + hash = "sha256-pbrW95CrRRQok6MfA0ujjLiXTr1VFUswc/gK9WhU6qI="; }; - vendorHash = "sha256-jr3fBIVLB3ubEsj2pPLy+G/ShGn2OfJQ6bDuY3bbyXY="; + vendorHash = "sha256-v+AyeQoeTTPI7C1WysCu8adX6cBk06JudPigCIWNFGQ="; modRoot = "./v2"; diff --git a/pkgs/by-name/su/subfont/package-lock.json b/pkgs/by-name/su/subfont/package-lock.json new file mode 100644 index 000000000000..f3403c5562a7 --- /dev/null +++ b/pkgs/by-name/su/subfont/package-lock.json @@ -0,0 +1,12562 @@ +{ + "name": "subfont", + "version": "7.2.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "subfont", + "version": "7.2.1", + "license": "MIT", + "dependencies": { + "@gustavnikolaj/async-main-wrap": "^3.0.1", + "@hookun/parse-animation-shorthand": "^0.1.5", + "assetgraph": "^7.8.1", + "browserslist": "^4.13.0", + "css-font-parser": "^2.0.0", + "css-font-weight-names": "^0.2.1", + "css-list-helpers": "^2.0.0", + "font-snapper": "^1.2.0", + "font-tracer": "^3.7.0", + "fontverter": "^2.0.0", + "gettemporaryfilepath": "^1.0.1", + "harfbuzzjs": "^0.3.3", + "lines-and-columns": "^1.1.6", + "lodash": "^4.17.15", + "memoizesync": "^1.1.1", + "postcss": "^8.3.11", + "postcss-value-parser": "^4.0.2", + "pretty-bytes": "^5.1.0", + "puppeteer-core": "^19.8.5", + "specificity": "^0.4.1", + "subset-font": "^2.3.0", + "urltools": "^0.4.1", + "yargs": "^15.4.0" + }, + "bin": { + "subfont": "lib/cli.js" + }, + "devDependencies": { + "combos": "^0.2.0", + "coveralls": "^3.0.9", + "css-generators": "^0.2.0", + "eslint": "^7.4.0", + "eslint-config-prettier": "^6.7.0", + "eslint-config-standard": "^14.0.0", + "eslint-plugin-import": "^2.22.0", + "eslint-plugin-mocha": "^7.0.1", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^4.0.1", + "eslint-plugin-standard": "^4.0.0", + "html-generators": "^1.0.3", + "httpception": "^3.0.0", + "magicpen-prism": "^3.0.2", + "mocha": "^8.0.1", + "nyc": "^15.1.0", + "offline-github-changelog": "^1.6.1", + "prettier": "~2.3.0", + "proxyquire": "^2.1.1", + "puppeteer": "^19.8.5", + "sinon": "^9.0.2", + "unexpected": "^11.8.1", + "unexpected-check": "^2.3.1", + "unexpected-resemble": "^5.0.1", + "unexpected-set": "^2.0.1", + "unexpected-sinon": "^10.11.2" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", + "license": "MIT", + "dependencies": { + "@babel/highlight": "^7.10.4" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", + "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", + "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.10", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.10", + "@babel/types": "^7.26.10", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/generator": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.10.tgz", + "integrity": "sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.26.10", + "@babel/types": "^7.26.10", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^3.0.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz", + "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.26.5", + "@babel/helper-validator-option": "^7.25.9", + "browserslist": "^4.24.0", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "license": "ISC" + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz", + "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.10" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.9.tgz", + "integrity": "sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz", + "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.26.10" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/runtime": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz", + "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==", + "license": "MIT", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/template": { + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", + "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/template/node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.10.tgz", + "integrity": "sha512-k8NuDrxr0WrPH5Aupqb2LCVURP/S0vBEn5mK6iH+GIYob66U5EtoZvcdudR2jQ4cmTwhEwW1DLB+Yyas9zjF6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.10", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/types": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz", + "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", + "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^13.9.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/@gustavnikolaj/async-main-wrap": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@gustavnikolaj/async-main-wrap/-/async-main-wrap-3.0.1.tgz", + "integrity": "sha512-FHh1Tz5Jk5xJphcYpFUMsxCTO+XbgQyCorlbztqBsYRnu5hmuoV/0Q+dJlcOtQCG6cJ5/EHX+VrSsoLBoaTJvQ==", + "license": "ISC" + }, + "node_modules/@hapi/address": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", + "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==", + "deprecated": "Moved to 'npm install @sideway/address'", + "license": "BSD-3-Clause" + }, + "node_modules/@hapi/bourne": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz", + "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==", + "deprecated": "This version has been deprecated and is no longer supported or maintained", + "license": "BSD-3-Clause" + }, + "node_modules/@hapi/hoek": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz", + "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==", + "deprecated": "This version has been deprecated and is no longer supported or maintained", + "license": "BSD-3-Clause" + }, + "node_modules/@hapi/joi": { + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz", + "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==", + "deprecated": "Switch to 'npm install joi'", + "license": "BSD-3-Clause", + "dependencies": { + "@hapi/address": "2.x.x", + "@hapi/bourne": "1.x.x", + "@hapi/hoek": "8.x.x", + "@hapi/topo": "3.x.x" + } + }, + "node_modules/@hapi/topo": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", + "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", + "deprecated": "This version has been deprecated and is no longer supported or maintained", + "license": "BSD-3-Clause", + "dependencies": { + "@hapi/hoek": "^8.3.0" + } + }, + "node_modules/@hookun/parse-animation-shorthand": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@hookun/parse-animation-shorthand/-/parse-animation-shorthand-0.1.5.tgz", + "integrity": "sha512-/fnwYK9Tgllhtv2EpwZZVbwhCokAoGtfEz23mZtjHMHvih4YeiAeUuVpyjGrTGf6j6ymgrCxGwUiAkAfDsmUjw==", + "license": "Apache-2.0" + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", + "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", + "license": "MIT", + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", + "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@puppeteer/browsers": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.5.0.tgz", + "integrity": "sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==", + "license": "Apache-2.0", + "dependencies": { + "debug": "4.3.4", + "extract-zip": "2.0.1", + "https-proxy-agent": "5.0.1", + "progress": "2.0.3", + "proxy-from-env": "1.1.0", + "tar-fs": "2.1.1", + "unbzip2-stream": "1.4.3", + "yargs": "17.7.1" + }, + "bin": { + "browsers": "lib/cjs/main-cli.js" + }, + "engines": { + "node": ">=14.1.0" + }, + "peerDependencies": { + "typescript": ">= 4.7.4" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@puppeteer/browsers/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@puppeteer/browsers/node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@puppeteer/browsers/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@puppeteer/browsers/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/@puppeteer/browsers/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@puppeteer/browsers/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "license": "MIT" + }, + "node_modules/@puppeteer/browsers/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@puppeteer/browsers/node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/@puppeteer/browsers/node_modules/yargs": { + "version": "17.7.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz", + "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@puppeteer/browsers/node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/@rtsao/scc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", + "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@sidvind/better-ajv-errors": { + "version": "0.6.10", + "resolved": "https://registry.npmjs.org/@sidvind/better-ajv-errors/-/better-ajv-errors-0.6.10.tgz", + "integrity": "sha512-vPv8ks6J1KQW1LPYgxmANxcHniE6LFuekxNpcoUUkotJ2srxP4qXZ+y9qpo5LAXhnLoNP0AH8cninimK68gS6A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "chalk": "^2.4.1", + "json-to-ast": "^2.0.3", + "jsonpointer": "^4.0.1", + "leven": "^3.1.0" + }, + "engines": { + "node": ">= 8.0" + }, + "peerDependencies": { + "ajv": "4.11.8 - 6" + } + }, + "node_modules/@sinonjs/commons": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", + "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz", + "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.7.0" + } + }, + "node_modules/@sinonjs/samsam": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz", + "integrity": "sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.6.0", + "lodash.get": "^4.4.2", + "type-detect": "^4.0.8" + } + }, + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", + "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", + "dev": true, + "license": "(Unlicense OR Apache-2.0)" + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/@trysound/sax": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", + "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", + "license": "ISC", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "22.13.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", + "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==", + "license": "MIT", + "optional": true, + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "node_modules/@types/normalize-package-data": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "license": "MIT" + }, + "node_modules/@types/yauzl": { + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", + "license": "MIT", + "optional": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true, + "license": "ISC" + }, + "node_modules/abab": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", + "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", + "deprecated": "Use your platform's native atob() and btoa() methods instead", + "license": "BSD-3-Clause" + }, + "node_modules/acorn": { + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "license": "MIT", + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/append-transform": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", + "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "default-require-extensions": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", + "dev": true, + "license": "MIT" + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-changes": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/array-changes/-/array-changes-3.0.1.tgz", + "integrity": "sha512-UYXV+qUaTKJO3GUBVfD6b9Mu7wUzDvpfovZKtbxNJApwRUifgrJMidvE+/rbqV3wCffly5HXcbOW3/7shmmEag==", + "dev": true, + "license": "MIT", + "dependencies": { + "arraydiff-papandreou": "0.1.1-patch1" + } + }, + "node_modules/array-changes-async": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/array-changes-async/-/array-changes-async-3.0.1.tgz", + "integrity": "sha512-WNHLhMOTzntixkBxNm/MiWCNKuC4FMYXk6DKuzZUbkWXAe0Xomwv40SEUicfOuHHtW7Ue661Mc5AJA0AOfqApg==", + "dev": true, + "license": "MIT", + "dependencies": { + "arraydiff-async": "0.2.0" + } + }, + "node_modules/array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-includes": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz", + "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "es-shim-unscopables": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", + "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/arraydiff-async": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/arraydiff-async/-/arraydiff-async-0.2.0.tgz", + "integrity": "sha512-i5QgybCLzbTyGlbdOd630AFwpradPgcbsdJ2XoXmgwaQ05lUC44Jn8Gs3EHklHVFoA6grV7ssJ9ExdHBu1C/nw==", + "dev": true + }, + "node_modules/arraydiff-papandreou": { + "version": "0.1.1-patch1", + "resolved": "https://registry.npmjs.org/arraydiff-papandreou/-/arraydiff-papandreou-0.1.1-patch1.tgz", + "integrity": "sha512-QPi68m5STvfROKohFfZb/yWH60UVdmbvCB2SJqcEiitriXRlrAU8Rhxc2PiU/x+htvdPW+jYlN1bhwhEOut9qg==", + "dev": true + }, + "node_modules/arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/asn1": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", + "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/assetgraph": { + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/assetgraph/-/assetgraph-7.12.0.tgz", + "integrity": "sha512-U6g7Y4QsYg45PwZB8t105acX9kGFR0I4QH1JZswhe36ijwg3kUK0zNRBSWOM4faeGN0prX04TL8OK16Dq7Iejg==", + "license": "BSD-3-Clause", + "dependencies": { + "acorn": "^8.0.4", + "acorn-jsx": "^5.0.1", + "bluebird": "^3.5.1", + "chalk": "^2.0.1", + "common-path-prefix": "^1.0.0", + "createerror": "^1.3.0", + "cssnano": "^5.1.4", + "data-urls": "^1.0.0", + "domspace": "^1.2.1", + "esanimate": "^1.1.0", + "escodegen": "^2.0.0", + "espurify": "^2.0.1", + "estraverse": "^5.2.0", + "estraverse-fb": "^1.3.2", + "gettemporaryfilepath": "^1.0.0", + "glob": "^7.0.5", + "html-minifier": "^4.0.0", + "imageinfo": "^1.0.4", + "jsdom": "^16.5.3", + "lines-and-columns": "^1.1.6", + "lodash": "^4.17.20", + "memoizesync": "1.1.1", + "mkdirp": "^0.5.1", + "normalizeurl": "^1.0.0", + "perfectionist-dfd": "^3.0.0", + "postcss": "^8.4.12", + "qs": "^6.5.2", + "read-pkg-up": "^6.0.0", + "repeat-string": "^1.5.4", + "schemes": "^1.0.1", + "semver": "^6.0.0", + "sift": "^7.0.1", + "source-map": "~0.6.1", + "specificity": "^0.4.0", + "teepee": "^2.31.1", + "terser": "^5.30.3", + "urltools": "^0.4.1", + "workbox-build": "^4.3.1" + } + }, + "node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/async-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", + "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz", + "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==", + "dev": true, + "license": "MIT" + }, + "node_modules/babel-extract-comments": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz", + "integrity": "sha512-qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ==", + "license": "MIT", + "dependencies": { + "babylon": "^6.18.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/babel-plugin-syntax-object-rest-spread": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", + "integrity": "sha512-C4Aq+GaAj83pRQ0EFgTvw5YO6T3Qz2KGrNRwIj9mSoNHVvdZY4KO2uA6HNtNXCw993iSZnckY1aLW8nOi8i4+w==", + "license": "MIT" + }, + "node_modules/babel-plugin-transform-object-rest-spread": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", + "integrity": "sha512-ocgA9VJvyxwt+qJB0ncxV8kb/CjfTcECUY4tQ5VT7nP6Aohzobm8CDFaQ5FHdvZQzLmf0sgDxB8iRXZXxwZcyA==", + "license": "MIT", + "dependencies": { + "babel-plugin-syntax-object-rest-spread": "^6.8.0", + "babel-runtime": "^6.26.0" + } + }, + "node_modules/babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==", + "license": "MIT", + "dependencies": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + } + }, + "node_modules/babel-runtime/node_modules/regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "license": "MIT" + }, + "node_modules/babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "license": "MIT", + "bin": { + "babylon": "bin/babylon.js" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/better-ajv-errors": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/better-ajv-errors/-/better-ajv-errors-0.6.7.tgz", + "integrity": "sha512-PYgt/sCzR4aGpyNy5+ViSQ77ognMnWq7745zM+/flYO4/Yisdtp9wDQW2IKCyVYPUxQt3E/b5GBSwfhd1LPdlg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "@babel/runtime": "^7.0.0", + "chalk": "^2.4.1", + "core-js": "^3.2.1", + "json-to-ast": "^2.0.3", + "jsonpointer": "^4.0.1", + "leven": "^3.1.0" + }, + "peerDependencies": { + "ajv": "4.11.8 - 6" + } + }, + "node_modules/better-ajv-errors/node_modules/core-js": { + "version": "3.41.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.41.0.tgz", + "integrity": "sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "license": "MIT" + }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "license": "ISC" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", + "license": "BSD-2-Clause" + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true, + "license": "ISC" + }, + "node_modules/browserslist": { + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", + "update-browserslist-db": "^1.1.1" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "license": "MIT" + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/builtins/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/caching-transform": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", + "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasha": "^5.0.0", + "make-dir": "^3.0.0", + "package-hash": "^4.0.0", + "write-file-atomic": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/call-bind": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camel-case": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", + "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==", + "license": "MIT", + "dependencies": { + "no-case": "^2.2.0", + "upper-case": "^1.1.1" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz", + "integrity": "sha512-Ej37YKYbFUI8QiYlvj9YHb6/Z60dZyPJW0Cs8sFilMbd2lP0bw3ylAq9yJkK4lcTA2dID5fG8LjmJYbO7kWb7Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase": "^4.1.0", + "map-obj": "^2.0.0", + "quick-lru": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/camelcase-keys/node_modules/camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/caniuse-api": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", + "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.0.0", + "caniuse-lite": "^1.0.0", + "lodash.memoize": "^4.1.2", + "lodash.uniq": "^4.5.0" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001705", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001705.tgz", + "integrity": "sha512-S0uyMMiYvA7CxNgomYBwwwPUnWzFD83f3B1ce5jHUfHTH//QL6hHsreI8RVC5606R4ssqravelYO5TU6t8sEyg==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/capitalize": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/capitalize/-/capitalize-2.0.4.tgz", + "integrity": "sha512-wcSyiFqXRYyCoqu0o0ekXzJAKCLMkqWS5QWGlgTJFJKwRmI6pzcN2hBl5VPq9RzLW5Uf4FF/V/lcFfjCtVak2w==", + "license": "MIT" + }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chance": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/chance/-/chance-1.0.16.tgz", + "integrity": "sha512-2bgDHH5bVfAXH05SPtjqrsASzZ7h90yCuYT2z4mkYpxxYvJXiIydBFzVieVHZx7wLH1Ag2Azaaej2/zA1XUrNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/chance-generators": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chance-generators/-/chance-generators-3.5.3.tgz", + "integrity": "sha512-8KIqKfuMevyHLp4uHI+m5AMaY1IPo4eYzX7sMV1xr7ulOYNWSTjW5ngB8kNMWHWbpuoVO1MwYonQ+HlBu5fcpQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "chance": "1.0.16" + } + }, + "node_modules/character-sets": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/character-sets/-/character-sets-1.0.8.tgz", + "integrity": "sha512-li7ydz40WtNT0vPZySSN1I0tW8BL5x37K8rcF2q/jjL4Yi6iOdrDstT2attXXLJWeKMEkyvmsYSFEex5RsfCZQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4.x.x" + } + }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true, + "license": "MIT" + }, + "node_modules/chokidar": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.1" + } + }, + "node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC" + }, + "node_modules/chromium-bidi": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.7.tgz", + "integrity": "sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==", + "license": "Apache-2.0", + "dependencies": { + "mitt": "3.0.0" + }, + "peerDependencies": { + "devtools-protocol": "*" + } + }, + "node_modules/clean-css": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", + "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", + "license": "MIT", + "dependencies": { + "source-map": "~0.6.0" + }, + "engines": { + "node": ">= 4.0" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 10" + } + }, + "node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "node_modules/code-error-fragment": { + "version": "0.0.230", + "resolved": "https://registry.npmjs.org/code-error-fragment/-/code-error-fragment-0.0.230.tgz", + "integrity": "sha512-cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-diff": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/color-diff/-/color-diff-0.1.7.tgz", + "integrity": "sha512-Tuh3W2d3LdK3E8BhKltCuESgUva+oluFYqvzHg8a3tu5XzO/a4PF4W8islodUcqtiPgPdkg42PzL2bwtOUaJeQ==", + "dev": true, + "license": "BSD" + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "license": "MIT" + }, + "node_modules/colord": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", + "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", + "license": "MIT" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/combos": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/combos/-/combos-0.2.0.tgz", + "integrity": "sha512-Z6YfvgiTCERWJTj3wQiXamFhssdvz1n4ok447rS330lw3uL72WAx8IvrLU7xiE71uyb5WF8JEP+BWB5KhOoGeg==", + "dev": true, + "license": "MIT" + }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "license": "MIT" + }, + "node_modules/common-path-prefix": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-1.0.0.tgz", + "integrity": "sha512-StWMCZw9nTO+RnxMCcapnQQqeZpaDvCD9+0Rrl8ZphFKWcJPyUGiEl64WoAkA+WJIxwKYzxldhYHU+EW1fQ2mQ==", + "license": "ISC" + }, + "node_modules/common-tags": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", + "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", + "license": "MIT", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", + "dev": true, + "license": "MIT" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true, + "license": "MIT" + }, + "node_modules/core-js": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", + "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", + "hasInstallScript": true, + "license": "MIT" + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/cosmiconfig": { + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz", + "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + } + }, + "node_modules/cosmiconfig/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/cosmiconfig/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/counteraction": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/counteraction/-/counteraction-1.3.2.tgz", + "integrity": "sha512-CtFt/FSa3At/Wm8Hwo022KBSmLlYkvpTjW4B2wqTCKvvTx6ilnteBNmqIjRzGB4EaUmisPrTPYIkJQ1L7gTIdg==", + "license": "BSD-3-Clause" + }, + "node_modules/coveralls": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.1.tgz", + "integrity": "sha512-+dxnG2NHncSD1NrqbSM3dn/lE57O6Qf/koe9+I7c+wzkqRmEvcp0kgJdxKInzYzkICKkFMZsX3Vct3++tsF9ww==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "js-yaml": "^3.13.1", + "lcov-parse": "^1.0.0", + "log-driver": "^1.2.7", + "minimist": "^1.2.5", + "request": "^2.88.2" + }, + "bin": { + "coveralls": "bin/coveralls.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/createerror": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/createerror/-/createerror-1.3.0.tgz", + "integrity": "sha512-w9UZUtkaGd8MfS7eMG7Sa0lV5vCJghqQfiOnwNVrPhbZScUp5h0jwYoAF933MKlotlG1JAJOCCT3xU6r+SDKNw==", + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/cross-fetch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", + "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", + "license": "MIT", + "dependencies": { + "node-fetch": "2.6.7" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/css-declaration-sorter": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz", + "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==", + "license": "ISC", + "engines": { + "node": "^10 || ^12 || >=14" + }, + "peerDependencies": { + "postcss": "^8.0.9" + } + }, + "node_modules/css-font-parser": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/css-font-parser/-/css-font-parser-2.0.1.tgz", + "integrity": "sha512-C4aQOpCmQL/Arl68chQatNh7/Nfyty15kbLNZezGudjcKSqHHVoHQEeb9IJcjgQ6CiurrHZoEt47yce891vjGw==", + "license": "BSD-3-Clause" + }, + "node_modules/css-font-parser-papandreou": { + "version": "0.2.3-patch1", + "resolved": "https://registry.npmjs.org/css-font-parser-papandreou/-/css-font-parser-papandreou-0.2.3-patch1.tgz", + "integrity": "sha512-yVhlQDjEppcS9a91xPs1x7u3IYNb2HPfTXxsFoNW2Kr2ilqWOqhxpfBxS42yzo1FCu0IGg1vbt8aag9fChCwmA==", + "license": "BSD" + }, + "node_modules/css-font-weight-names": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/css-font-weight-names/-/css-font-weight-names-0.2.1.tgz", + "integrity": "sha512-2dDc3aYw5yE4IvlJ2Lhz5NGSc2P4lshLd1qImXUyb62r/07/0dr7njHwWlUIoanoTnrENa9tgceUKY5nYtL4pA==", + "license": "CC0-1.0" + }, + "node_modules/css-generators": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/css-generators/-/css-generators-0.2.3.tgz", + "integrity": "sha512-OrnM55sLIyizZ+pMEc2pSAEceFPCwSJah09Qc26r/ZeiBs7aaDc533CSKi9VNl5aXK0Ln1Wb1NhX9j9uW8S+yg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "chance-generators": "^3.5.2", + "character-sets": "^1.0.8", + "css-syntax-parser": "^1.5.1", + "html-validate": "3.0.0", + "iso-639-1": "^2.1.0", + "lodash": "^4.17.15", + "mdn-data-papandreou": "2.0.10-patch1", + "pegjs": "^0.10.0", + "postcss": "^7.0.23" + } + }, + "node_modules/css-generators/node_modules/picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true, + "license": "ISC" + }, + "node_modules/css-generators/node_modules/postcss": { + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picocolors": "^0.2.1", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + } + }, + "node_modules/css-list-helpers": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/css-list-helpers/-/css-list-helpers-2.0.0.tgz", + "integrity": "sha512-9Bj8tZ0jWbAM3u/U6m/boAzAwLPwtjzFvwivr2piSvyVa3K3rChJzQy4RIHkNkKiZCHrEMWDJWtTR8UyVhdDnQ==", + "license": "MIT" + }, + "node_modules/css-select": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", + "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^6.0.1", + "domhandler": "^4.3.1", + "domutils": "^2.8.0", + "nth-check": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-syntax-parser": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/css-syntax-parser/-/css-syntax-parser-1.5.1.tgz", + "integrity": "sha512-RT1YwEEYVuWsxvMFmcJwGvBTb922OnFoZmzasSfj6vAGUqPvCdWcpUFCUsIk04OPaePZ1QxBYI3hPLDdrZ/RiA==", + "dev": true, + "license": "ISC" + }, + "node_modules/css-tree": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", + "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", + "license": "MIT", + "dependencies": { + "mdn-data": "2.0.14", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/css-unit-converter": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz", + "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==", + "license": "MIT" + }, + "node_modules/css-what": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "license": "MIT", + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/cssnano": { + "version": "5.1.15", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz", + "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==", + "license": "MIT", + "dependencies": { + "cssnano-preset-default": "^5.2.14", + "lilconfig": "^2.0.3", + "yaml": "^1.10.2" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/cssnano" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/cssnano-preset-default": { + "version": "5.2.14", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz", + "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==", + "license": "MIT", + "dependencies": { + "css-declaration-sorter": "^6.3.1", + "cssnano-utils": "^3.1.0", + "postcss-calc": "^8.2.3", + "postcss-colormin": "^5.3.1", + "postcss-convert-values": "^5.1.3", + "postcss-discard-comments": "^5.1.2", + "postcss-discard-duplicates": "^5.1.0", + "postcss-discard-empty": "^5.1.1", + "postcss-discard-overridden": "^5.1.0", + "postcss-merge-longhand": "^5.1.7", + "postcss-merge-rules": "^5.1.4", + "postcss-minify-font-values": "^5.1.0", + "postcss-minify-gradients": "^5.1.1", + "postcss-minify-params": "^5.1.4", + "postcss-minify-selectors": "^5.2.1", + "postcss-normalize-charset": "^5.1.0", + "postcss-normalize-display-values": "^5.1.0", + "postcss-normalize-positions": "^5.1.1", + "postcss-normalize-repeat-style": "^5.1.1", + "postcss-normalize-string": "^5.1.0", + "postcss-normalize-timing-functions": "^5.1.0", + "postcss-normalize-unicode": "^5.1.1", + "postcss-normalize-url": "^5.1.0", + "postcss-normalize-whitespace": "^5.1.1", + "postcss-ordered-values": "^5.1.3", + "postcss-reduce-initial": "^5.1.2", + "postcss-reduce-transforms": "^5.1.0", + "postcss-svgo": "^5.1.0", + "postcss-unique-selectors": "^5.1.1" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/cssnano-utils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", + "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/csso": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", + "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", + "license": "MIT", + "dependencies": { + "css-tree": "^1.1.2" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "license": "MIT" + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "license": "MIT", + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "license": "MIT" + }, + "node_modules/currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-find-index": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/d": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz", + "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==", + "dev": true, + "license": "ISC", + "dependencies": { + "es5-ext": "^0.10.64", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", + "dev": true, + "license": "MIT", + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/data-urls": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", + "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", + "license": "MIT", + "dependencies": { + "abab": "^2.0.0", + "whatwg-mimetype": "^2.2.0", + "whatwg-url": "^7.0.0" + } + }, + "node_modules/data-view-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/inspect-js" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decamelize-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", + "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", + "dev": true, + "license": "MIT", + "dependencies": { + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decamelize-keys/node_modules/map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decimal.js": { + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz", + "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==", + "license": "MIT" + }, + "node_modules/deep-equal": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz", + "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arguments": "^1.1.1", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.5.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "license": "MIT" + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/default-require-extensions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz", + "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==", + "dev": true, + "license": "MIT", + "dependencies": { + "strip-bom": "^4.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/defined": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", + "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/detect-indent": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz", + "integrity": "sha512-xo3WP66SNbr1Eim85s/qyH0ZL8PQUwp86HWm0S1l8WnJ/zjT6T3w1nwNA0yOZeuvOemupEYvpvF6BIdYRuERJQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-stdin": "^4.0.1", + "minimist": "^1.1.0", + "repeating": "^1.1.0" + }, + "bin": { + "detect-indent": "cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/detect-indent/node_modules/get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/devtools-protocol": { + "version": "0.0.1107588", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz", + "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==", + "license": "BSD-3-Clause" + }, + "node_modules/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dnserrors": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/dnserrors/-/dnserrors-2.1.2.tgz", + "integrity": "sha512-m2bdi1p3YWTTEAMlN8HkB+pqeykpd7+znMa/Jxr47sk4KiTImtg350BMVeY7xnYNOWFyEoDEWft5aqNt3O5g4A==", + "license": "BSD-3-Clause", + "dependencies": { + "createerror": "^1.2.0", + "httperrors": "^2.2.0", + "lodash.defaults": "^4.2.0", + "lodash.omit": "^4.5.0" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dom-serializer": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", + "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "license": "MIT", + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", + "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "BSD-2-Clause" + }, + "node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "deprecated": "Use your platform's native DOMException instead", + "license": "MIT", + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/domhandler": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.2.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domspace": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/domspace/-/domspace-1.2.2.tgz", + "integrity": "sha512-wonvpGbed9PlcvQ0xfb0ov8QoKR9Tk7GiIGrOto6ykPdAtmtQXFBUS10Ifm/1srPkrvcOB4Hsexb/Okt7CeOwg==", + "license": "BSD-3-Clause" + }, + "node_modules/domutils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "license": "BSD-2-Clause", + "dependencies": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", + "dev": true, + "license": "MIT", + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.5.119", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.119.tgz", + "integrity": "sha512-Ku4NMzUjz3e3Vweh7PhApPrZSS4fyiCIbcIrG9eKrriYVLmbMepETR/v6SU7xPm98QTqMSYiCwfO89QNjXLkbQ==", + "license": "ISC" + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/enquirer": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", + "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.1", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "license": "BSD-2-Clause", + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-abstract": { + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "data-view-buffer": "^1.0.2", + "data-view-byte-length": "^1.0.2", + "data-view-byte-offset": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.1.0", + "es-to-primitive": "^1.3.0", + "function.prototype.name": "^1.1.8", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.0", + "get-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.2", + "is-regex": "^1.2.1", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.0", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.3", + "object-keys": "^1.1.1", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.3", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.18" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-to-primitive": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es5-ext": { + "version": "0.10.64", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", + "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", + "dev": true, + "hasInstallScript": true, + "license": "ISC", + "dependencies": { + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.3", + "esniff": "^2.0.1", + "next-tick": "^1.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true, + "license": "MIT" + }, + "node_modules/es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", + "dev": true, + "license": "MIT", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "node_modules/es6-set": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz", + "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==", + "dev": true, + "license": "ISC", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "es6-iterator": "~2.0.3", + "es6-symbol": "^3.1.3", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/es6-symbol": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz", + "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "d": "^1.0.2", + "ext": "^1.7.0" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/esanimate": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/esanimate/-/esanimate-1.1.1.tgz", + "integrity": "sha512-fIrM3uC3tgv3Vz6HuSOUmB/YtEcQ7PVMCHyl+r13KirqTQhigraedKzrBzNMcz1QieZ476K0AnMHEN/Ei1LDVQ==", + "license": "BSD-3-Clause", + "dependencies": { + "escodegen": "^1.11.1", + "esprima": "^4.0.1" + } + }, + "node_modules/esanimate/node_modules/escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=4.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/esanimate/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esanimate/node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/esanimate/node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "license": "MIT", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/esanimate/node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/esanimate/node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/eslint": { + "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.3", + "@humanwhocodes/config-array": "^0.5.0", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.1", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.1.2", + "globals": "^13.6.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "progress": "^2.0.0", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^6.0.9", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-prettier": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz", + "integrity": "sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-stdin": "^6.0.0" + }, + "bin": { + "eslint-config-prettier-check": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=3.14.1" + } + }, + "node_modules/eslint-config-standard": { + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz", + "integrity": "sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "eslint": ">=6.2.2", + "eslint-plugin-import": ">=2.18.0", + "eslint-plugin-node": ">=9.1.0", + "eslint-plugin-promise": ">=4.2.1", + "eslint-plugin-standard": ">=4.0.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", + "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-es": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", + "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", + "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rtsao/scc": "^1.1.0", + "array-includes": "^3.1.8", + "array.prototype.findlastindex": "^1.2.5", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.12.0", + "hasown": "^2.0.2", + "is-core-module": "^2.15.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.8", + "object.groupby": "^1.0.3", + "object.values": "^1.2.0", + "semver": "^6.3.1", + "string.prototype.trimend": "^1.0.8", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-mocha": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-7.0.1.tgz", + "integrity": "sha512-zkQRW9UigRaayGm/pK9TD5RjccKXSgQksNtpsXbG9b6L5I+jNx7m98VUbZ4w1H1ArlNA+K7IOH+z8TscN6sOYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-utils": "^2.0.0", + "ramda": "^0.27.0" + }, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-n/node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-plugin-n/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/eslint-plugin-n/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-node": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", + "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-plugin-es": "^3.0.0", + "eslint-utils": "^2.0.0", + "ignore": "^5.1.1", + "minimatch": "^3.0.4", + "resolve": "^1.10.1", + "semver": "^6.1.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "peerDependencies": { + "eslint": ">=5.16.0" + } + }, + "node_modules/eslint-plugin-node/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz", + "integrity": "sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=6" + } + }, + "node_modules/eslint-plugin-standard": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz", + "integrity": "sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "peerDependencies": { + "eslint": ">=5.0.0" + } + }, + "node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/eslint-scope/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/eslint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/eslint/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/eslint/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/esniff": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", + "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "dev": true, + "license": "ISC", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/espree": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^7.4.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^1.3.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/espree/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/espurify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/espurify/-/espurify-2.1.1.tgz", + "integrity": "sha512-zttWvnkhcDyGOhSH4vO2qCBILpdCMv/MX8lp4cqgRkQoDRGK2oZxi2GfWhlP2dIXmk7BaKeOTuzbHhyC68o8XQ==", + "license": "MIT" + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse-fb": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/estraverse-fb/-/estraverse-fb-1.3.2.tgz", + "integrity": "sha512-wp3lfRrWy5EQD9TqesuYM1SKVP4ERT0cUatb4e8Vznf4K5IOpREhuyXZxGj3a9s9mvX5vGZKNHA4R9D4kp9Q9A==", + "license": "MIT", + "peerDependencies": { + "estraverse": "*" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, + "node_modules/ext": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", + "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", + "dev": true, + "license": "ISC", + "dependencies": { + "type": "^2.7.2" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "license": "MIT" + }, + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "license": "MIT", + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/extract-zip": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", + "license": "BSD-2-Clause", + "dependencies": { + "debug": "^4.1.1", + "get-stream": "^5.1.0", + "yauzl": "^2.10.0" + }, + "bin": { + "extract-zip": "cli.js" + }, + "engines": { + "node": ">= 10.17.0" + }, + "optionalDependencies": { + "@types/yauzl": "^2.9.1" + } + }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "license": "MIT" + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "license": "MIT" + }, + "node_modules/fast-uri": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz", + "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", + "license": "MIT", + "dependencies": { + "pend": "~1.2.0" + } + }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/fill-keys": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", + "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-object": "~1.0.1", + "merge-descriptors": "~1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "dev": true, + "license": "MIT", + "dependencies": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "license": "BSD-3-Clause", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, + "license": "ISC" + }, + "node_modules/font-family-papandreou": { + "version": "0.2.0-patch2", + "resolved": "https://registry.npmjs.org/font-family-papandreou/-/font-family-papandreou-0.2.0-patch2.tgz", + "integrity": "sha512-l/YiRdBSH/eWv6OF3sLGkwErL+n0MqCICi9mppTZBOCL5vixWGDqCYvRcuxB2h7RGCTzaTKOHT2caHvCXQPRlw==", + "license": "MIT" + }, + "node_modules/font-snapper": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/font-snapper/-/font-snapper-1.2.0.tgz", + "integrity": "sha512-TcqBpHV24iGPA2RvvMWCmwH/Zrz46OIaKOlvQoi6kZweSDtLwNCJihby10htMnSCncwFX8rQYDiaXJk2LvPHng==", + "license": "BSD-3-Clause", + "dependencies": { + "css-font-weight-names": "^0.2.1", + "font-family-papandreou": "^0.2.0-patch1" + } + }, + "node_modules/font-tracer": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/font-tracer/-/font-tracer-3.7.1.tgz", + "integrity": "sha512-+CetK78tyd5Q6lgDE7dJO9Q4fIt/oMY2dexNBU+++pSeUHNeSzhYj2ZSXZDYUvj/6zXCwTmi3YceG6QT178aMg==", + "license": "BSD-3-Clause", + "dependencies": { + "capitalize": "^2.0.3", + "counteraction": "^1.3.1", + "css-font-parser": "^2.0.0", + "css-font-parser-papandreou": "^0.2.3-patch1", + "css-font-weight-names": "^0.2.1", + "postcss-value-parser": "^4.1.0", + "reduce-css-calc": "^2.1.8", + "specificity": "^0.4.1" + } + }, + "node_modules/fontverter": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fontverter/-/fontverter-2.0.0.tgz", + "integrity": "sha512-DFVX5hvXuhi1Jven1tbpebYTCT9XYnvx6/Z+HFUPb7ZRMCW+pj2clU9VMhoTPgWKPhAs7JJDSk3CW1jNUvKCZQ==", + "license": "BSD-3-Clause", + "dependencies": { + "wawoff2": "^2.0.0", + "woff2sfnt-sfnt2woff": "^1.0.0" + } + }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "*" + } + }, + "node_modules/form-data": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz", + "integrity": "sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "mime-types": "^2.1.35" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fromentries": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz", + "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" + }, + "node_modules/fs-extra": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", + "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "node_modules/fs-extra/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "license": "MIT", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", + "dev": true, + "license": "MIT" + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gather-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz", + "integrity": "sha512-NspYMi3rN3EKmMdejUXbtluDYrcRlTEBBFhWzVRZVsOx94OPxlXp0AzyPKyLiT7iaurcoTE/KcHsHP/PowNEaA==", + "license": "ISC" + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-own-enumerable-property-symbols": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", + "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", + "license": "ISC" + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/get-stdin": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", + "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "license": "MIT", + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", + "dev": true, + "license": "MIT", + "dependencies": { + "assert-plus": "^1.0.0" + } + }, + "node_modules/gettemporaryfilepath": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gettemporaryfilepath/-/gettemporaryfilepath-1.0.1.tgz", + "integrity": "sha512-MVCSgF1blIZuIV3KYhMKOwU1OSxPF1s+ZcyqWMSGR5Fzl6fN7EjIXDFGu9PmWAAwyGjMjmkS2ruqPaj13J3SXA==", + "license": "BSD" + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "license": "MIT", + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "license": "ISC" + }, + "node_modules/grapheme-splitter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", + "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/greedy-interval-packer": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/greedy-interval-packer/-/greedy-interval-packer-1.2.0.tgz", + "integrity": "sha512-4ap45COKmRa2BdeVTY9FXIlR5UIkQX/a0pGtEvk+DnZ7THF3n1UkUKB17AFo+5TMaXnwJkHDn9VH5ATXt/YzHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4.x" + } + }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "deprecated": "this library is no longer supported", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/harfbuzzjs": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/harfbuzzjs/-/harfbuzzjs-0.3.6.tgz", + "integrity": "sha512-dzf7y6NS8fiAIvPAL/VKwY8wx2HCzUB0vUfOo6h1J5UilFEEf7iYqFsvgwjHwvM3whbjfOMadNvQekU3KuRnWQ==", + "license": "MIT" + }, + "node_modules/has-bigints": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasha": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz", + "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-stream": "^2.0.0", + "type-fest": "^0.8.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/hasha/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "license": "MIT", + "bin": { + "he": "bin/he" + } + }, + "node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "license": "ISC" + }, + "node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "license": "MIT", + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true, + "license": "MIT" + }, + "node_modules/html-generators": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/html-generators/-/html-generators-1.0.3.tgz", + "integrity": "sha512-PAL3BipC1XEW3bnfNbkU6eRsMXHjCYoB9korutBBAGpH/UL2A1euD9IdvV35wdMhVcPzHo2oSH5b6nokAcLONw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chance-generators": "^3.5.2", + "css-generators": "0.2.0", + "html-validate": "1.6.0" + } + }, + "node_modules/html-generators/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/html-generators/node_modules/ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/html-generators/node_modules/astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/html-generators/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/html-generators/node_modules/cross-spawn": { + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", + "dev": true, + "license": "MIT", + "dependencies": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "engines": { + "node": ">=4.8" + } + }, + "node_modules/html-generators/node_modules/cross-spawn/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/html-generators/node_modules/css-generators": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/css-generators/-/css-generators-0.2.0.tgz", + "integrity": "sha512-LOi+OnnP0GCc9laN1b9k3uQ41T8OvA5mSCb7ZnKQwg35X6H0hGbS4aRTH2zaB2r7GvNP6WXTH00VZo9vOvTChg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "chance-generators": "^3.5.2", + "character-sets": "^1.0.8", + "css-syntax-parser": "^1.5.1", + "html-validate": "^2.0.1", + "iso-639-1": "^2.1.0", + "lodash": "^4.17.15", + "mdn-data": "2.0.7", + "pegjs": "^0.10.0", + "postcss": "^7.0.23" + } + }, + "node_modules/html-generators/node_modules/css-generators/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/html-generators/node_modules/css-generators/node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/html-generators/node_modules/css-generators/node_modules/html-validate": { + "version": "2.23.1", + "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-2.23.1.tgz", + "integrity": "sha512-qOW7q45BZ0YvQBJMaKvttFuWGwSBRYqPE7xAnR+n4A+fKBqP+5XSGFTH+4XdbVoMQYwK3TntKC3ra7GCHApXTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "@sidvind/better-ajv-errors": "^0.6.9", + "acorn-walk": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^3.0.0", + "deepmerge": "^4.0.0", + "eslint": "^6.0.0", + "espree": "^6.0.0", + "glob": "^7.1.3", + "inquirer": "^7.0.0", + "json-merge-patch": "^1.0.0", + "minimist": "^1.2.0" + }, + "bin": { + "html-validate": "bin/html-validate.js" + }, + "engines": { + "node": ">= 8.5" + } + }, + "node_modules/html-generators/node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true, + "license": "MIT" + }, + "node_modules/html-generators/node_modules/eslint": { + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz", + "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^1.4.3", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.1.2", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^7.0.0", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.14", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.3", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^6.1.2", + "strip-ansi": "^5.2.0", + "strip-json-comments": "^3.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/html-generators/node_modules/eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-generators/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/espree": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", + "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^7.1.1", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/html-generators/node_modules/file-entry-cache": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/flatted": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", + "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", + "dev": true, + "license": "ISC" + }, + "node_modules/html-generators/node_modules/globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/html-generators/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/html-generators/node_modules/html-validate": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-1.6.0.tgz", + "integrity": "sha512-7K9IjTmLzUoQm0ZhHP+rPcHw6zJsnRmyf79awVFhgw2o1ZBklKBcqscCuCk7I08YGpSTqp61eW0TdDKkmD5MHw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "acorn-walk": "^7.0.0", + "ajv": "^6.10.0", + "better-ajv-errors": "^0.6.2", + "chalk": "^2.4.2", + "deepmerge": "^4.0.0", + "eslint": "^6.0.0", + "espree": "^6.0.0", + "glob": "^7.1.3", + "json-merge-patch": "^0.2.3", + "minimist": "^1.2.0" + }, + "bin": { + "html-validate": "bin/html-validate.js" + }, + "engines": { + "node": ">= 8.5" + } + }, + "node_modules/html-generators/node_modules/html-validate/node_modules/json-merge-patch": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-merge-patch/-/json-merge-patch-0.2.3.tgz", + "integrity": "sha512-mjd5eObNGOhWkKCztwVuF25KOzLj2T4TJaWXLBgCQPeoPRJrMxKNgjNBE8sPmXoWRT0WDlo4Itd/gTlFh29TFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-equal": "^1.0.0" + } + }, + "node_modules/html-generators/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/html-generators/node_modules/mdn-data": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.7.tgz", + "integrity": "sha512-SRtFboZtRLXYjkS6wnzITo7UPlWJYcn8T2A8XXqEt5uXH1okVBpQOzo05XM17/rhiLXk7CmAQMJ/vM1QP/kuUA==", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/html-generators/node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/html-generators/node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true, + "license": "ISC" + }, + "node_modules/html-generators/node_modules/postcss": { + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picocolors": "^0.2.1", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + } + }, + "node_modules/html-generators/node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/html-generators/node_modules/regexpp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.5.0" + } + }, + "node_modules/html-generators/node_modules/rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/html-generators/node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/html-generators/node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/html-generators/node_modules/slice-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-generators/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-generators/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-generators/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/html-generators/node_modules/table": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/html-generators/node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/html-generators/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/html-generators/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/html-minifier": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", + "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", + "license": "MIT", + "dependencies": { + "camel-case": "^3.0.0", + "clean-css": "^4.2.1", + "commander": "^2.19.0", + "he": "^1.2.0", + "param-case": "^2.1.1", + "relateurl": "^0.2.7", + "uglify-js": "^3.5.1" + }, + "bin": { + "html-minifier": "cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-validate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-3.0.0.tgz", + "integrity": "sha512-4yipnAN9O33nW7K5qncSHXuP08mqROIvJVlgjLykgRVdx2/ufTe/t/td/8+48iuQMfiu0sgTd8lHJO5o45QByQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "@sidvind/better-ajv-errors": "^0.6.9", + "acorn-walk": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "deepmerge": "^4.0.0", + "eslint": "^7.0.0", + "espree": "^7.0.0", + "glob": "^7.1.3", + "inquirer": "^7.0.0", + "json-merge-patch": "^1.0.0", + "minimist": "^1.2.0" + }, + "bin": { + "html-validate": "bin/html-validate.js" + }, + "engines": { + "node": ">= 8.5" + } + }, + "node_modules/html-validate/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/html-validate/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/html-validate/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/html-validate/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/html-validate/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/html-validate/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "license": "MIT", + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/httpception": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/httpception/-/httpception-3.0.0.tgz", + "integrity": "sha512-0N+aRwgXiU7DOWfpptBK5dWNC8EIw7oDJyC2nzFK4vFjdCJtRTyi+D/r/N68AIaCXbS2NotPGm9o9hCr+kaWjw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "unexpected": "^11.0.0", + "unexpected-mitm": "^12.0.0" + } + }, + "node_modules/httperrors": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/httperrors/-/httperrors-2.2.0.tgz", + "integrity": "sha512-bjFDd2l8pO7s/1gmxnoWf+qWsqgUdZR3kJcIZ/i8/7tJjvGG3Z2ybjEBSQoaMPGqan+2sT8ChGutRd1TiWrPZQ==", + "dependencies": { + "createerror": "1.2.0" + }, + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/httperrors/node_modules/createerror": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/createerror/-/createerror-1.2.0.tgz", + "integrity": "sha512-EVt8Ao9RolJaWCsUOJ3ZGAVqc8SQiDg+JtDFjhuaZ5ep2G1ahdm7Gj/F3zNrqfv5SD8UdLuzHp1nBgMdDh9Y9g==", + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/imageinfo": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/imageinfo/-/imageinfo-1.0.4.tgz", + "integrity": "sha512-BJml4q/QCO2187F4UcO/b6hTYIhbq4nnd1XNs65jyCED9em4m6XmeGWDxjewjfJoC7VJABhOdmqb64KA24rLZw==", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/inquirer": { + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.19", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.6.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/inquirer/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/inquirer/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/inquirer/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/inquirer/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/inquirer/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/inquirer/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/internal-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-arguments": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz", + "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "license": "MIT" + }, + "node_modules/is-async-function": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", + "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", + "license": "MIT", + "dependencies": { + "async-function": "^1.0.0", + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", + "license": "MIT", + "dependencies": { + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-boolean-object": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz", + "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-finite": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-generator-function": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-number-object": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz", + "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "license": "MIT" + }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", + "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-string": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz", + "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/iso-639-1": { + "version": "2.1.15", + "resolved": "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.15.tgz", + "integrity": "sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0" + } + }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", + "dev": true, + "license": "MIT" + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-hook": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", + "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "append-transform": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-processinfo": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz", + "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==", + "dev": true, + "license": "ISC", + "dependencies": { + "archy": "^1.0.0", + "cross-spawn": "^7.0.3", + "istanbul-lib-coverage": "^3.2.0", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report/node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/istanbul-lib-report/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==", + "dev": true, + "license": "MIT" + }, + "node_modules/jsdom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "license": "MIT", + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "license": "MIT", + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jsdom/node_modules/tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "license": "MIT", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jsdom/node_modules/whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "license": "MIT", + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jsesc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", + "dev": true, + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-merge-patch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-merge-patch/-/json-merge-patch-1.0.2.tgz", + "integrity": "sha512-M6Vp2GN9L7cfuMXiWOmHj9bEFbeC250iVtcKQbqVgEsDVYnIsrNsbU+h/Y/PkbBQCtEa4Bez+Ebv0zfbC8ObLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3" + } + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "license": "MIT" + }, + "node_modules/json-schema": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "dev": true, + "license": "(AFL-2.1 OR BSD-3-Clause)" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", + "dev": true, + "license": "ISC" + }, + "node_modules/json-to-ast": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/json-to-ast/-/json-to-ast-2.1.0.tgz", + "integrity": "sha512-W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "code-error-fragment": "0.0.230", + "grapheme-splitter": "^1.0.4" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "license": "MIT", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonpointer": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.1.0.tgz", + "integrity": "sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jsprim": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "dev": true, + "license": "MIT", + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.4.0", + "verror": "1.10.0" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/just-extend": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz", + "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", + "dev": true, + "license": "MIT" + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/lcov-parse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz", + "integrity": "sha512-aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ==", + "dev": true, + "license": "BSD-3-Clause", + "bin": { + "lcov-parse": "bin/cli.js" + } + }, + "node_modules/leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lilconfig": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", + "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "license": "MIT" + }, + "node_modules/load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/load-json-file/node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "license": "MIT", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/load-json-file/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" + }, + "node_modules/lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==", + "license": "MIT" + }, + "node_modules/lodash.assign": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", + "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==", + "license": "MIT" + }, + "node_modules/lodash.clone": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz", + "integrity": "sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==", + "deprecated": "This package is deprecated. Use structuredClone instead.", + "license": "MIT" + }, + "node_modules/lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", + "license": "MIT" + }, + "node_modules/lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", + "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "license": "MIT" + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.omit": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", + "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==", + "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.", + "license": "MIT" + }, + "node_modules/lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", + "license": "MIT" + }, + "node_modules/lodash.template": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", + "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", + "deprecated": "This package is deprecated. Use https://socket.dev/npm/package/eta instead.", + "license": "MIT", + "dependencies": { + "lodash._reinterpolate": "^3.0.0", + "lodash.templatesettings": "^4.0.0" + } + }, + "node_modules/lodash.templatesettings": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz", + "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", + "license": "MIT", + "dependencies": { + "lodash._reinterpolate": "^3.0.0" + } + }, + "node_modules/lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.uniq": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==", + "license": "MIT" + }, + "node_modules/log-driver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=0.8.6" + } + }, + "node_modules/log-symbols": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", + "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/log-symbols/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/log-symbols/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/log-symbols/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/log-symbols/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/log-symbols/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/log-symbols/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/lower-case": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", + "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==", + "license": "MIT" + }, + "node_modules/lru-cache": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz", + "integrity": "sha512-EjtmtXFUu+wXm6PW3T6RT1ekQUxobC7B5TDCU0CS0212wzpwKiXs6vLun+JI+OoWmmliWdYqnrpjrlK7W3ELdQ==", + "license": "MIT" + }, + "node_modules/magicpen": { + "version": "6.2.4", + "resolved": "https://registry.npmjs.org/magicpen/-/magicpen-6.2.4.tgz", + "integrity": "sha512-rT4JcgakSrmR9/qPY/EsDSvKH4+nQuFfSQ34Djnj0Zx9jJ+c3REOz+K3CITvRZcmAcCFM6jJO7wSiHlMEXYy3A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "2.0.0", + "color-diff": "0.1.7" + } + }, + "node_modules/magicpen-media": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/magicpen-media/-/magicpen-media-1.5.2.tgz", + "integrity": "sha512-CVg14B+MVvFUJI+Ce6XITyO6NI39oxn0EYfaZOMWC40T7jTwvMuvdHLA0o9uPdXfyUKaPjSbejxvbVSTFqMupQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "gettemporaryfilepath": "^1.0.0", + "lodash": "^4.17.11", + "mime": "^2.3.1" + } + }, + "node_modules/magicpen-prism": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/magicpen-prism/-/magicpen-prism-3.0.2.tgz", + "integrity": "sha512-qlKWjCDmmE4CjP99burmKe7r7TS3CBehY6c7W5fsppLAFI5PSKdSRiZpG3hrqxjX3yL1WbfoJjYsVCb8DTnh0A==", + "dev": true, + "dependencies": { + "prismjs": "^1.15.0" + } + }, + "node_modules/magicpen/node_modules/ansi-styles": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.0.tgz", + "integrity": "sha512-0kjBHdIQSa1iuh2rs8Md1GQNHAKrefcRSp2W5OKQU1oBZgCSqQ5aG4o+r69irBlhIPwA8wUaPdN/FWZVIHW7rA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/map-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz", + "integrity": "sha512-TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/markdown-escape": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/markdown-escape/-/markdown-escape-1.1.0.tgz", + "integrity": "sha512-f1+ARFbzLrBdC0Lj30uREn+zthrK/h1PO5UhN5IMDQvI2lSFn+8U06a5LHaxxYMhHD0mJoJ2BROJ/Sju5aw6+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/mdn-data": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", + "license": "CC0-1.0" + }, + "node_modules/mdn-data-papandreou": { + "version": "2.0.10-patch1", + "resolved": "https://registry.npmjs.org/mdn-data-papandreou/-/mdn-data-papandreou-2.0.10-patch1.tgz", + "integrity": "sha512-B9xv4Lz0xcsxLxNCq2sTjwM263UgdvhWJNtqWnbE6SDiMNDREJowAKWEP9p48Ew1wIcESQJ+JB2Po6Ru4GH6ig==", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/memoizesync": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/memoizesync/-/memoizesync-1.1.1.tgz", + "integrity": "sha512-EEVBhL1Nnjbaauc4iUvPKZtQmV3NzSQJmjbzPswG1ZMGP/pVb+GdVzHOx5a+s+71qCDn8tbhKOxkyVVBC6cvmQ==", + "license": "BSD", + "dependencies": { + "lru-cache": "=2.3.1" + } + }, + "node_modules/meow": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz", + "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase-keys": "^4.0.0", + "decamelize-keys": "^1.0.0", + "loud-rejection": "^1.0.0", + "minimist-options": "^3.0.1", + "normalize-package-data": "^2.3.4", + "read-pkg-up": "^3.0.0", + "redent": "^2.0.0", + "trim-newlines": "^2.0.0", + "yargs-parser": "^10.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/meow/node_modules/camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dev": true, + "license": "MIT", + "dependencies": { + "pify": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/read-pkg-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", + "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/yargs-parser": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", + "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^4.1.0" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/messy": { + "version": "6.17.0", + "resolved": "https://registry.npmjs.org/messy/-/messy-6.17.0.tgz", + "integrity": "sha512-Cvnu5cZLitkuzuL+0v6FC04CPPC8scad7gcNf/OoBsGwc5cUyA3rT6+o0ozTX++ZL4dtdoAgzbyG4jGjq71n5g==", + "dev": true, + "license": "BSD", + "dependencies": { + "iconv-lite": "^0.4.13", + "quoted-printable": "1.0.0", + "rfc2047": "2.0.0", + "rfc2231": "1.3.0", + "underscore": "^1.6.0" + } + }, + "node_modules/mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "dev": true, + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minimist-options": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz", + "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/mitm-papandreou": { + "version": "1.7.0-patch1", + "resolved": "https://registry.npmjs.org/mitm-papandreou/-/mitm-papandreou-1.7.0-patch1.tgz", + "integrity": "sha512-ERzvAy0N/MXyy2206C3yM0prXgn527ZYNhY5o6qgOCHhiS+2GQPOipjvTABRbiXXcv7Y4SNu0rB+i/P1h3RTZQ==", + "dev": true, + "dependencies": { + "semver": ">= 5 < 6", + "underscore": ">= 1.1.6 < 1.6" + }, + "engines": { + "node": ">= 0.10.24" + } + }, + "node_modules/mitm-papandreou/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/mitm-papandreou/node_modules/underscore": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz", + "integrity": "sha512-yejOFsRnTJs0N9CK5Apzf6maDO2djxGoLLrlZlvGs2o9ZQuhIhDL18rtFyy4FBIbOkzA6+4hDgXbgz5EvDQCXQ==", + "dev": true + }, + "node_modules/mitt": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz", + "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==", + "license": "MIT" + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "license": "MIT", + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "license": "MIT" + }, + "node_modules/mocha": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", + "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ungap/promise-all-settled": "1.1.2", + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.1", + "debug": "4.3.1", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.1.6", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "4.0.0", + "log-symbols": "4.0.0", + "minimatch": "3.0.4", + "ms": "2.1.3", + "nanoid": "3.1.20", + "serialize-javascript": "5.0.1", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "which": "2.0.2", + "wide-align": "1.1.3", + "workerpool": "6.1.0", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 10.12.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mochajs" + } + }, + "node_modules/mocha/node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/mocha/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/mocha/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/mocha/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/mocha/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/mocha/node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mocha/node_modules/glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mocha/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/mocha/node_modules/js-yaml": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", + "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/mocha/node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/mocha/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/mocha/node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/module-not-found-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", + "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==", + "dev": true, + "license": "MIT" + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true, + "license": "ISC" + }, + "node_modules/nanoid": { + "version": "3.1.20", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", + "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", + "dev": true, + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/next-tick": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/nise": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/nise/-/nise-4.1.0.tgz", + "integrity": "sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.7.0", + "@sinonjs/fake-timers": "^6.0.0", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "path-to-regexp": "^1.7.0" + } + }, + "node_modules/no-case": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", + "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "license": "MIT", + "dependencies": { + "lower-case": "^1.1.1" + } + }, + "node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/node-preload": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", + "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "process-on-spawn": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/node-releases": { + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", + "license": "MIT" + }, + "node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/normalize-package-data/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/normalizeurl": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/normalizeurl/-/normalizeurl-1.0.0.tgz", + "integrity": "sha512-GyndB0rq1FmO49Vwy88c3jzp5G3OnjEbwVlm+vst+P5ANKQVtm+2682qgRptcZeZvU1I2E5RgCeZirqLuUQQEw==", + "license": "BSD" + }, + "node_modules/nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, + "node_modules/nwsapi": { + "version": "2.2.18", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.18.tgz", + "integrity": "sha512-p1TRH/edngVEHVbwqWnxUViEmq5znDvyB+Sik5cmuLpGOIfDf/39zLiq3swPF8Vakqn+gvNiOQAZu8djYlQILA==", + "license": "MIT" + }, + "node_modules/nyc": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", + "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "caching-transform": "^4.0.0", + "convert-source-map": "^1.7.0", + "decamelize": "^1.2.0", + "find-cache-dir": "^3.2.0", + "find-up": "^4.1.0", + "foreground-child": "^2.0.0", + "get-package-type": "^0.1.0", + "glob": "^7.1.6", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-hook": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-processinfo": "^2.0.2", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "make-dir": "^3.0.0", + "node-preload": "^0.2.1", + "p-map": "^3.0.0", + "process-on-spawn": "^1.0.0", + "resolve-from": "^5.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "spawn-wrap": "^2.0.0", + "test-exclude": "^6.0.0", + "yargs": "^15.0.2" + }, + "bin": { + "nyc": "bin/nyc.js" + }, + "engines": { + "node": ">=8.9" + } + }, + "node_modules/nyc/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nyc/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "*" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-is": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", + "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.values": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/offline-github-changelog": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/offline-github-changelog/-/offline-github-changelog-1.7.0.tgz", + "integrity": "sha512-XSPCt/I6AHBbvGQITFmjxIe6JdbCneKg8MFvU9xhgvF7oKFwa5YxyhbXNqPYOqWc6QNEgb2AvFGQXjxvtA8c/Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "markdown-escape": "^1.0.2", + "meow": "^5.0.0" + }, + "bin": { + "offline-github-changelog": "bin/offline-github-changelog" + }, + "engines": { + "node": ">=6.9.1" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/package-hash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", + "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "graceful-fs": "^4.1.15", + "hasha": "^5.0.0", + "lodash.flattendeep": "^4.4.0", + "release-zalgo": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "license": "(MIT AND Zlib)" + }, + "node_modules/param-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", + "integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==", + "license": "MIT", + "dependencies": { + "no-case": "^2.2.0" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", + "license": "MIT" + }, + "node_modules/passerror": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/passerror/-/passerror-1.1.1.tgz", + "integrity": "sha512-PwrEQJBkJMxnxG+tdraz95vTstYnCRqiURNbGtg/vZHLgcAODc9hbiD5ZumGUoh3bpw0F0qKLje7Vd2Fd5Lx3g==", + "license": "BSD-3-Clause", + "engines": { + "node": "*" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" + }, + "node_modules/path-to-regexp": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz", + "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "isarray": "0.0.1" + } + }, + "node_modules/path-to-regexp/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/pegjs": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz", + "integrity": "sha512-qI5+oFNEGi3L5HAxDwN2LA4Gg7irF70Zs25edhjld9QemOgp0CbvMtbFcMvFtEo1OityPrcCzkQFB8JP/hxgow==", + "dev": true, + "license": "MIT", + "bin": { + "pegjs": "bin/pegjs" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", + "license": "MIT" + }, + "node_modules/perfectionist-dfd": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/perfectionist-dfd/-/perfectionist-dfd-3.0.3.tgz", + "integrity": "sha512-ImEojwhikE2ltOMSKrLNHx4a+tkL+4CUPenvzTyU6m5KvJpPaiSVR8Bsqutw2beV2CD0dEzKwenNoxUCAVNJbg==", + "license": "MIT", + "dependencies": { + "defined": "^1.0.0", + "minimist": "^1.2.6", + "postcss-scss": "^4.0.3", + "postcss-value-parser": "^4.2.0", + "read-file-stdin": "^0.2.1", + "semver": "^7.5.4", + "string.prototype.repeat": "^1.0.0", + "write-file-stdout": "^0.0.2" + }, + "bin": { + "perfectionist-dfd": "bin/cmd.js" + }, + "peerDependencies": { + "postcss": "^8.4.12" + } + }, + "node_modules/perfectionist-dfd/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", + "dev": true, + "license": "MIT" + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-up": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", + "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-up/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-up/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-up/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-up/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-up/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/postcss": { + "version": "8.5.3", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", + "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.8", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/postcss-calc": { + "version": "8.2.4", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz", + "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==", + "license": "MIT", + "dependencies": { + "postcss-selector-parser": "^6.0.9", + "postcss-value-parser": "^4.2.0" + }, + "peerDependencies": { + "postcss": "^8.2.2" + } + }, + "node_modules/postcss-colormin": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz", + "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "caniuse-api": "^3.0.0", + "colord": "^2.9.1", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-convert-values": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz", + "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-comments": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz", + "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-duplicates": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", + "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-empty": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", + "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-overridden": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", + "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-merge-longhand": { + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz", + "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0", + "stylehacks": "^5.1.1" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-merge-rules": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz", + "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "caniuse-api": "^3.0.0", + "cssnano-utils": "^3.1.0", + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-font-values": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz", + "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-gradients": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz", + "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==", + "license": "MIT", + "dependencies": { + "colord": "^2.9.1", + "cssnano-utils": "^3.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-params": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz", + "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "cssnano-utils": "^3.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-selectors": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz", + "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==", + "license": "MIT", + "dependencies": { + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-charset": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", + "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-display-values": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz", + "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-positions": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz", + "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-repeat-style": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz", + "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-string": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz", + "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-timing-functions": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz", + "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-unicode": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz", + "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-url": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz", + "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==", + "license": "MIT", + "dependencies": { + "normalize-url": "^6.0.1", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-whitespace": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz", + "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-ordered-values": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz", + "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==", + "license": "MIT", + "dependencies": { + "cssnano-utils": "^3.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-reduce-initial": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz", + "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "caniuse-api": "^3.0.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-reduce-transforms": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz", + "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-scss": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz", + "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss-scss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "engines": { + "node": ">=12.0" + }, + "peerDependencies": { + "postcss": "^8.4.29" + } + }, + "node_modules/postcss-selector-parser": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", + "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "license": "MIT", + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/postcss-svgo": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz", + "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0", + "svgo": "^2.7.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-unique-selectors": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz", + "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==", + "license": "MIT", + "dependencies": { + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "license": "MIT" + }, + "node_modules/postcss/node_modules/nanoid": { + "version": "3.3.10", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.10.tgz", + "integrity": "sha512-vSJJTG+t/dIKAUhUDw/dLdZ9s//5OxcHqLaDWWrW4Cdq7o6tdLIczUkMXt2MBNmk6sJRZBZRXVixs7URY1CmIg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", + "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/pretty-bytes": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", + "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/prismjs": { + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz", + "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/process-on-spawn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.1.0.tgz", + "integrity": "sha512-JOnOPQ/8TZgjs1JIH/m9ni7FfimjNa/PRx7y/Wb5qdItsnhO0jE4AT7fC0HjC28DUQWDr50dwSYZLdRMlqDq3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "fromentries": "^1.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, + "node_modules/proxyquire": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz", + "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-keys": "^1.0.2", + "module-not-found-error": "^1.0.1", + "resolve": "^1.11.1" + } + }, + "node_modules/psl": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz", + "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==", + "license": "MIT", + "dependencies": { + "punycode": "^2.3.1" + }, + "funding": { + "url": "https://github.com/sponsors/lupomontero" + } + }, + "node_modules/pump": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", + "license": "MIT", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/puppeteer": { + "version": "19.11.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.11.1.tgz", + "integrity": "sha512-39olGaX2djYUdhaQQHDZ0T0GwEp+5f9UB9HmEP0qHfdQHIq0xGQZuAZ5TLnJIc/88SrPLpEflPC+xUqOTv3c5g==", + "deprecated": "< 22.8.2 is no longer supported", + "dev": true, + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "@puppeteer/browsers": "0.5.0", + "cosmiconfig": "8.1.3", + "https-proxy-agent": "5.0.1", + "progress": "2.0.3", + "proxy-from-env": "1.1.0", + "puppeteer-core": "19.11.1" + } + }, + "node_modules/puppeteer-core": { + "version": "19.11.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.1.tgz", + "integrity": "sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==", + "license": "Apache-2.0", + "dependencies": { + "@puppeteer/browsers": "0.5.0", + "chromium-bidi": "0.4.7", + "cross-fetch": "3.1.5", + "debug": "4.3.4", + "devtools-protocol": "0.0.1107588", + "extract-zip": "2.0.1", + "https-proxy-agent": "5.0.1", + "proxy-from-env": "1.1.0", + "tar-fs": "2.1.1", + "unbzip2-stream": "1.4.3", + "ws": "8.13.0" + }, + "engines": { + "node": ">=14.14.0" + }, + "peerDependencies": { + "typescript": ">= 4.7.4" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/puppeteer-core/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/puppeteer-core/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "license": "MIT" + }, + "node_modules/puppeteer-core/node_modules/ws": { + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "license": "MIT", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/qs": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "license": "MIT" + }, + "node_modules/quick-lru": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", + "integrity": "sha512-tRS7sTgyxMXtLum8L65daJnHUhfDUgboRdcWW2bR9vBfrj2+O5HSMbQOJfJJjIVSPFqbBCF37FpwWXGitDc5tA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/quoted-printable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/quoted-printable/-/quoted-printable-1.0.0.tgz", + "integrity": "sha512-PDpa4cdrc9UfGW8UlMeaQYmY+b+dGdCjf+3rhSpv6X5U60XQ+rHgS0kMGdDriGs+TotUakgQjoPImkgTBRw9+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "utf8": "^2.0.0" + }, + "bin": { + "quoted-printable": "bin/quoted-printable" + } + }, + "node_modules/ramda": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.2.tgz", + "integrity": "sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==", + "dev": true, + "license": "MIT" + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/read-file-stdin": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/read-file-stdin/-/read-file-stdin-0.2.1.tgz", + "integrity": "sha512-dAqysQ4kfj9m5aejZOPr+aRGXZJXdLkMOLZ3BXMwMBQHiO+aylGBFJPh88AYPQrOf+D43F4Uc2oUIW9kBlItLA==", + "license": "MIT", + "dependencies": { + "gather-stream": "^1.0.0" + } + }, + "node_modules/read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "license": "MIT", + "dependencies": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-6.0.0.tgz", + "integrity": "sha512-odtTvLl+EXo1eTsMnoUHRmg/XmXdTkwXVxy4VFE9Kp6cCq7b3l7QMdBndND3eAFzrbSAXC/WCUOQQ9rLjifKZw==", + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0", + "read-pkg": "^5.1.1", + "type-fest": "^0.5.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/type-fest": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz", + "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=6" + } + }, + "node_modules/read-pkg/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/readdirp": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/redent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz", + "integrity": "sha512-XNwrTx77JQCEMXTeb8movBKuK75MgH0RZkujNuDKCezemx/voapl9i2gCSi8WWm8+ox5ycJi1gxF22fR7c0Ciw==", + "dev": true, + "license": "MIT", + "dependencies": { + "indent-string": "^3.0.0", + "strip-indent": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/redent/node_modules/indent-string": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reduce-css-calc": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz", + "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==", + "license": "MIT", + "dependencies": { + "css-unit-converter": "^1.1.1", + "postcss-value-parser": "^3.3.0" + } + }, + "node_modules/reduce-css-calc/node_modules/postcss-value-parser": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", + "license": "MIT" + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regenerator-runtime": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", + "license": "MIT" + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/release-zalgo": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", + "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==", + "dev": true, + "license": "ISC", + "dependencies": { + "es6-error": "^4.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "license": "MIT", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/repeating": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz", + "integrity": "sha512-Nh30JLeMHdoI+AsQ5eblhZ7YlTsM9wiJQe/AHIunlK3KWzvXhXb36IJ7K1IOeRjIOtzMjdUHjwXUFxKJoPTSOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-finite": "^1.0.0" + }, + "bin": { + "repeating": "cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/request/node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/request/node_modules/qs": { + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/request/node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/request/node_modules/uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "dev": true, + "license": "MIT", + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "license": "ISC" + }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "license": "MIT" + }, + "node_modules/resemblejs": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/resemblejs/-/resemblejs-4.1.0.tgz", + "integrity": "sha512-s9/+nQ7bnT+C7XBdnMCcC/QppvJcTmJ7fXZMtuTZMFJycN2kj/tacleyx9O1mURPDYNZsgKMfcamImM9+X+keQ==", + "dev": true, + "license": "MIT", + "optionalDependencies": { + "canvas": "2.9.0" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/rfc2047": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/rfc2047/-/rfc2047-2.0.0.tgz", + "integrity": "sha512-IAZLLZ7ucMF8eRWOxQ3N5TqnwdxiOApvNt56rtxF1tBHTM+M5yxvNfflfOERgTSKROIgL/AzUuHwCpi/zqSGLw==", + "dev": true, + "license": "BSD", + "dependencies": { + "iconv-lite": "0.4.5" + } + }, + "node_modules/rfc2047/node_modules/iconv-lite": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz", + "integrity": "sha512-LQ4GtDkFagYaac8u4rE73zWu7h0OUUmR0qVBOgzLyFSoJhoDG2xV9PZJWWyVVcYha/9/RZzQHUinFMbNKiOoAA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/rfc2231": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/rfc2231/-/rfc2231-1.3.0.tgz", + "integrity": "sha512-MuyZ6PPPKPmA9ifNmg7Jf/2jtyuSHC1Zwry26qMTz3pzbEDo+mvjCvot8b7BxWVZ3nCfWfeP8SHvGCO/bmbxTg==", + "dev": true, + "license": "BSD", + "dependencies": { + "iconv-lite": "0.4.5" + } + }, + "node_modules/rfc2231/node_modules/iconv-lite": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz", + "integrity": "sha512-LQ4GtDkFagYaac8u4rE73zWu7h0OUUmR0qVBOgzLyFSoJhoDG2xV9PZJWWyVVcYha/9/RZzQHUinFMbNKiOoAA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "devOptional": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "license": "ISC", + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/schemes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/schemes/-/schemes-1.4.0.tgz", + "integrity": "sha512-ImFy9FbCsQlVgnE3TCWmLPCFnVzx0lHL/l+umHplDqAKd0dzFpnS6lFZIpagBlYhKwzVmlV36ec0Y1XTu8JBAQ==", + "license": "MIT", + "dependencies": { + "extend": "^3.0.0" + } + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/serialize-javascript": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", + "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "license": "ISC" + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/sift": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz", + "integrity": "sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g==", + "license": "MIT" + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "devOptional": true, + "license": "ISC" + }, + "node_modules/sinon": { + "version": "9.2.4", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", + "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==", + "deprecated": "16.1.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.8.1", + "@sinonjs/fake-timers": "^6.0.1", + "@sinonjs/samsam": "^5.3.1", + "diff": "^4.0.2", + "nise": "^4.0.4", + "supports-color": "^7.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/sinon" + } + }, + "node_modules/sinon/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/sinon/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/sinon/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/slice-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/slice-ansi/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/slice-ansi/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/socketerrors": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/socketerrors/-/socketerrors-0.3.0.tgz", + "integrity": "sha512-N7VMAO/pIeDP5IqKcbzy5+ywWwZPnT7/fUjg6faKFxB9tVBo/J5xhIJKHJld0RWx1shlKrEy8fsoRm2Xt0GGGQ==", + "license": "BSD", + "dependencies": { + "createerror": "1.1.0", + "httperrors": "2.0.1" + } + }, + "node_modules/socketerrors/node_modules/createerror": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/createerror/-/createerror-1.1.0.tgz", + "integrity": "sha512-7zzU0CDuRVge0otam9eejW1m6qqKcSzBgR9lwoypaW7JU4bvsHhRzJlgmJfXGjKLrpjI6R7pY5DYc9b0w3DESw==", + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/socketerrors/node_modules/httperrors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/httperrors/-/httperrors-2.0.1.tgz", + "integrity": "sha512-kZRKMAMirSxgKON0qIFXrcXbfFf8TMeP7zwzJd/RS7wQHZja07c1BQmkdjaO1OCef5qrbrYdiuhrdRhkgFClKg==", + "dependencies": { + "createerror": "1.1.0" + }, + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/spawn-wrap": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", + "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^2.0.0", + "is-windows": "^1.0.2", + "make-dir": "^3.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "which": "^2.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "license": "Apache-2.0", + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "license": "CC-BY-3.0" + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "license": "MIT", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.21", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", + "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", + "license": "CC0-1.0" + }, + "node_modules/specificity": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz", + "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==", + "license": "MIT", + "bin": { + "specificity": "bin/specificity" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/sshpk": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz", + "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "bin": { + "sshpk-conv": "bin/sshpk-conv", + "sshpk-sign": "bin/sshpk-sign", + "sshpk-verify": "bin/sshpk-verify" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stable": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", + "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", + "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility", + "license": "MIT" + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "license": "MIT", + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/stringify-object": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", + "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", + "license": "BSD-2-Clause", + "dependencies": { + "get-own-enumerable-property-symbols": "^3.0.0", + "is-obj": "^1.0.1", + "is-regexp": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-comments": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz", + "integrity": "sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw==", + "license": "MIT", + "dependencies": { + "babel-extract-comments": "^1.0.0", + "babel-plugin-transform-object-rest-spread": "^6.26.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-indent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", + "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/stylehacks": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz", + "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "postcss-selector-parser": "^6.0.4" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/subset-font": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/subset-font/-/subset-font-2.4.0.tgz", + "integrity": "sha512-DA/45nIj4NiseVdfHxVdVGL7hvNo3Ol6HjEm3KSYtPyDcsr6jh8Q37vSgz+A722wMfUd6nL8kgsi7uGv9DExXQ==", + "license": "BSD-3-Clause", + "dependencies": { + "fontverter": "^2.0.0", + "harfbuzzjs": "^0.4.0", + "lodash": "^4.17.21", + "p-limit": "^3.1.0" + } + }, + "node_modules/subset-font/node_modules/harfbuzzjs": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/harfbuzzjs/-/harfbuzzjs-0.4.5.tgz", + "integrity": "sha512-dDMkI7mWWcYTJtyUZmS6A6SfzITEjJyxaFQCup8wGlli9eaWTEjoS/gDUGnv6PQlXExOXWhWY1Hq/h3J03Tfow==", + "license": "MIT" + }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/svgo": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", + "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", + "license": "MIT", + "dependencies": { + "@trysound/sax": "0.2.0", + "commander": "^7.2.0", + "css-select": "^4.1.3", + "css-tree": "^1.1.3", + "csso": "^4.2.0", + "picocolors": "^1.0.0", + "stable": "^0.1.8" + }, + "bin": { + "svgo": "bin/svgo" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/svgo/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "license": "MIT" + }, + "node_modules/table": { + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz", + "integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "ajv": "^8.0.1", + "lodash.truncate": "^4.4.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/table/node_modules/ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/table/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, + "license": "MIT" + }, + "node_modules/tar-fs": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "license": "MIT", + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/teepee": { + "version": "2.31.2", + "resolved": "https://registry.npmjs.org/teepee/-/teepee-2.31.2.tgz", + "integrity": "sha512-Er4CNK1mccfc2uvN+QkJcAU+4j6QtMA9cHrdnxF9Y8VzuTKMRnnHyVrmxfyLLCK23SyPAYkWBe7EBjmwC7sRNQ==", + "license": "BSD-3-Clause", + "dependencies": { + "bluebird": "2.9.34", + "createerror": "1.2.0", + "dnserrors": "2.1.2", + "form-data": "2.1.4", + "httperrors": "2.2.0", + "is-stream": "1.1.0", + "lodash.assign": "^4.2.0", + "lodash.clone": "^4.5.0", + "lodash.defaults": "^4.2.0", + "lodash.omit": "^4.5.0", + "lodash.uniq": "^4.5.0", + "passerror": "1.1.1", + "socketerrors": "^0.3.0" + } + }, + "node_modules/teepee/node_modules/bluebird": { + "version": "2.9.34", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz", + "integrity": "sha512-ZDzCb87X7/IP1uzQ5eJZB+WoQRGTnKL5DHWvPw6kkMbQseouiQIrEi3P1UGE0D1k0N5/+aP/5GMCyHZ1xYJyHQ==", + "license": "MIT" + }, + "node_modules/teepee/node_modules/createerror": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/createerror/-/createerror-1.2.0.tgz", + "integrity": "sha512-EVt8Ao9RolJaWCsUOJ3ZGAVqc8SQiDg+JtDFjhuaZ5ep2G1ahdm7Gj/F3zNrqfv5SD8UdLuzHp1nBgMdDh9Y9g==", + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/teepee/node_modules/form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha512-8HWGSLAPr+AG0hBpsqi5Ob8HrLStN/LWeqhpFl14d7FJgHK48TmgLoALPz69XSUR65YJzDfLUX/BM8+MLJLghQ==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.5", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/teepee/node_modules/is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/terser": { + "version": "5.39.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz", + "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==", + "license": "BSD-2-Clause", + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "license": "MIT" + }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tough-cookie": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", + "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", + "license": "BSD-3-Clause", + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==", + "license": "MIT", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/trim-newlines": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz", + "integrity": "sha512-MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "license": "0BSD" + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", + "dev": true, + "license": "Unlicense" + }, + "node_modules/type": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz", + "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", + "license": "BSD-2-Clause", + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/ukkonen": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ukkonen/-/ukkonen-1.4.0.tgz", + "integrity": "sha512-g8SLGxflI0/VNH2C8j66KcfJXrU5StJglRQBYPNiChXFlOrqqYM1icOykOAAUgTeBpktaEuCm9hjpPinQ080PA==", + "dev": true, + "license": "MIT" + }, + "node_modules/unbox-primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-bigints": "^1.0.2", + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unbzip2-stream": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "license": "MIT", + "dependencies": { + "buffer": "^5.2.1", + "through": "^2.3.8" + } + }, + "node_modules/underscore": { + "version": "1.13.7", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz", + "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==", + "license": "MIT" + }, + "node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "license": "MIT", + "optional": true + }, + "node_modules/unexpected": { + "version": "11.15.1", + "resolved": "https://registry.npmjs.org/unexpected/-/unexpected-11.15.1.tgz", + "integrity": "sha512-s3XfLMEKRPioyuC5cqOCl2oCgGEg4fLhIuFHcUf0IExkGXTafPlLrkcvWV76woFrXpdxWGShYpDDQXBA3lOUcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-changes": "3.0.1", + "array-changes-async": "3.0.1", + "detect-indent": "3.0.1", + "diff": "4.0.2", + "greedy-interval-packer": "1.2.0", + "magicpen": "^6.2.1", + "ukkonen": "^1.4.0", + "unexpected-bluebird": "2.9.34-longstack2" + } + }, + "node_modules/unexpected-bluebird": { + "version": "2.9.34-longstack2", + "resolved": "https://registry.npmjs.org/unexpected-bluebird/-/unexpected-bluebird-2.9.34-longstack2.tgz", + "integrity": "sha512-lAgr5q+ToN4cO+mCus6h9VLcnl27fCiWiCuDyx7Pcvf9IoFOaTRv0bauvikXRkg9+78c/1nDBbQxP+Wk9+uOCA==", + "dev": true, + "license": "MIT" + }, + "node_modules/unexpected-check": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/unexpected-check/-/unexpected-check-2.4.1.tgz", + "integrity": "sha512-80OaWuyDNr0K+XkAY2gKhfsT0dBsG2qQ1K+EdftiRCnxkMt7XZ6Zran+fi2CZD0q5NuXxkuXoPN29T5wcANbfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "escodegen": "^1.9.0", + "esprima": "^4.0.0", + "estraverse": "^4.2.0", + "ignore": "^5.0.3", + "pkg-up": "^3.0.1" + }, + "peerDependencies": { + "chance-generators": "^3.0.0", + "unexpected": "^10.40.0 || ^11.0.0-4" + } + }, + "node_modules/unexpected-check/node_modules/escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=4.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/unexpected-check/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/unexpected-check/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/unexpected-check/node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/unexpected-check/node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/unexpected-check/node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/unexpected-check/node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/unexpected-messy": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/unexpected-messy/-/unexpected-messy-8.2.1.tgz", + "integrity": "sha512-tARmVE2m3PyL6x5WNL46C4r7o2jqlVdjt04SJhdxPqJN42FYzWL2gy95bQ2ulCkaiGlWrogZae5yRLvZqEN0jA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "magicpen-media": "^1.5.0", + "messy": "^6.16.0", + "minimist": "^1.2.0", + "qs": "^6.5.1", + "underscore": "^1.8.3" + }, + "peerDependencies": { + "messy": "^6.16.0", + "unexpected": "^10.27.0 || ^11.0.0-3" + } + }, + "node_modules/unexpected-mitm": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/unexpected-mitm/-/unexpected-mitm-12.4.0.tgz", + "integrity": "sha512-PAfwvOcinRoNtQtqaJDIY9t99I4KKn0Oivqjl5z/+97hwq689W1LKUkQsabM9knIxrDFB4dGk4PaUX+4I6oIlA==", + "dev": true, + "dependencies": { + "callsite": "^1.0.0", + "createerror": "1.1.0", + "detect-indent": "^5.0.0", + "memoizesync": "^1.1.1", + "messy": "^6.16.0", + "mitm-papandreou": "^1.7.0-patch1", + "underscore": "^1.8.3", + "unexpected-messy": "^8.2.0" + }, + "peerDependencies": { + "unexpected": "^10.27.0 || ^11.0.0-3" + } + }, + "node_modules/unexpected-mitm/node_modules/createerror": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/createerror/-/createerror-1.1.0.tgz", + "integrity": "sha512-7zzU0CDuRVge0otam9eejW1m6qqKcSzBgR9lwoypaW7JU4bvsHhRzJlgmJfXGjKLrpjI6R7pY5DYc9b0w3DESw==", + "dev": true, + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/unexpected-mitm/node_modules/detect-indent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", + "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/unexpected-resemble": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/unexpected-resemble/-/unexpected-resemble-5.0.1.tgz", + "integrity": "sha512-9fhrQYvCrbseg8b24Mrhw4ubg/bcp0+sVOUobcg1WYxkeKz3+C/ht0qS6SW6qNBeHjBrvUwCeJQ4IhHHpZ73DA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "eslint-plugin-n": "^15.1.0", + "gettemporaryfilepath": "1.0.1", + "magicpen-media": "^3.0.0", + "object-assign": "^4.1.1", + "resemblejs": "^4.0.0" + }, + "peerDependencies": { + "unexpected": "^10.27.0 || ^11.0.0 || ^12.0.0 || ^13.0.0" + } + }, + "node_modules/unexpected-resemble/node_modules/magicpen-media": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/magicpen-media/-/magicpen-media-3.0.2.tgz", + "integrity": "sha512-FJnM4w0qUO5ZqBm60z+JaiyZmStDRomEhpDbfO/rwp2WrGj2eT0X+MPt4FS3lfDz6vNrVEFmQWuHC8EpOm/NDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "gettemporaryfilepath": "^1.0.0", + "lodash": "^4.17.11", + "mime": "^2.3.1" + } + }, + "node_modules/unexpected-set": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unexpected-set/-/unexpected-set-2.0.1.tgz", + "integrity": "sha512-SydpQwiUSAR+m2WHrK4LH4zcJosqzG3VA5XvDqLvxBgBOEZA3ftPjqF+IUj6NcvJUPAXt1NtbDehBNcX4EBJ/w==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "es6-set": "^0.1.5" + }, + "peerDependencies": { + "unexpected": "^10.37.4 || ^11.0.0-4" + } + }, + "node_modules/unexpected-sinon": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/unexpected-sinon/-/unexpected-sinon-10.11.2.tgz", + "integrity": "sha512-N2KIKPweTVs6AK8cDKQTUwu0fGWyGt+cI/UJZ/eltAyOKgsHL9eILttdGfpZjI/iMYcHcbtUwIlXoHfmh6EcBw==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "sinon": "*", + "unexpected": "^10.8.0 || ^11.0.0-4" + } + }, + "node_modules/unexpected/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "license": "MIT", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", + "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/upper-case": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==", + "license": "MIT" + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/urijs": { + "version": "1.19.11", + "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz", + "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==", + "license": "MIT" + }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "license": "MIT", + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "node_modules/urltools": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/urltools/-/urltools-0.4.2.tgz", + "integrity": "sha512-nsAASNzc1+n8MZuQ335Oa9z8KOCtDNfiQzFOAYCiu+IPZQVD0FH6n9hP/NKygKxs5nmRYnj8ftYKgyNcJKlgUw==", + "license": "BSD-2-Clause", + "dependencies": { + "glob": "^7.0.3", + "underscore": "^1.8.3", + "urijs": "^1.18.2" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/utf8": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", + "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==", + "dev": true, + "license": "MIT" + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-compile-cache": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz", + "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==", + "dev": true, + "license": "MIT" + }, + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "license": "Apache-2.0", + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "license": "MIT", + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", + "license": "MIT", + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "license": "MIT", + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/wawoff2": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wawoff2/-/wawoff2-2.0.1.tgz", + "integrity": "sha512-r0CEmvpH63r4T15ebFqeOjGqU4+EgTx4I510NtK35EMciSdcTxCw3Byy3JnBonz7iyIFZ0AbVo0bbFpEVuhCYA==", + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "woff2_compress.js": "bin/woff2_compress.js", + "woff2_decompress.js": "bin/woff2_decompress.js" + } + }, + "node_modules/wawoff2/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" + }, + "node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=10.4" + } + }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "license": "MIT", + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "license": "MIT" + }, + "node_modules/whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "license": "MIT", + "dependencies": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } + }, + "node_modules/whatwg-url/node_modules/webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", + "license": "BSD-2-Clause" + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", + "license": "MIT", + "dependencies": { + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", + "is-async-function": "^2.0.0", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", + "is-generator-function": "^1.0.10", + "is-regex": "^1.2.1", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.1.0", + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "license": "MIT", + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-module": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", + "license": "ISC" + }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "devOptional": true, + "license": "ISC", + "dependencies": { + "string-width": "^1.0.2 || 2" + } + }, + "node_modules/wide-align/node_modules/ansi-regex": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", + "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/woff2sfnt-sfnt2woff": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/woff2sfnt-sfnt2woff/-/woff2sfnt-sfnt2woff-1.0.0.tgz", + "integrity": "sha512-edK4COc1c1EpRfMqCZO1xJOvdUtM5dbVb9iz97rScvnTevqEB3GllnLWCmMVp1MfQBdF1DFg/11I0rSyAdS4qQ==", + "license": "MIT", + "dependencies": { + "pako": "^1.0.7" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/workbox-background-sync": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz", + "integrity": "sha512-1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-broadcast-update": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz", + "integrity": "sha512-MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-build": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-4.3.1.tgz", + "integrity": "sha512-UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.3.4", + "@hapi/joi": "^15.0.0", + "common-tags": "^1.8.0", + "fs-extra": "^4.0.2", + "glob": "^7.1.3", + "lodash.template": "^4.4.0", + "pretty-bytes": "^5.1.0", + "stringify-object": "^3.3.0", + "strip-comments": "^1.0.2", + "workbox-background-sync": "^4.3.1", + "workbox-broadcast-update": "^4.3.1", + "workbox-cacheable-response": "^4.3.1", + "workbox-core": "^4.3.1", + "workbox-expiration": "^4.3.1", + "workbox-google-analytics": "^4.3.1", + "workbox-navigation-preload": "^4.3.1", + "workbox-precaching": "^4.3.1", + "workbox-range-requests": "^4.3.1", + "workbox-routing": "^4.3.1", + "workbox-strategies": "^4.3.1", + "workbox-streams": "^4.3.1", + "workbox-sw": "^4.3.1", + "workbox-window": "^4.3.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/workbox-cacheable-response": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz", + "integrity": "sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-core": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-4.3.1.tgz", + "integrity": "sha512-I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg==", + "license": "MIT" + }, + "node_modules/workbox-expiration": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.3.1.tgz", + "integrity": "sha512-vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-google-analytics": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz", + "integrity": "sha512-xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg==", + "deprecated": "It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained", + "license": "MIT", + "dependencies": { + "workbox-background-sync": "^4.3.1", + "workbox-core": "^4.3.1", + "workbox-routing": "^4.3.1", + "workbox-strategies": "^4.3.1" + } + }, + "node_modules/workbox-navigation-preload": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz", + "integrity": "sha512-K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-precaching": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.3.1.tgz", + "integrity": "sha512-piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-range-requests": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz", + "integrity": "sha512-S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-routing": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.3.1.tgz", + "integrity": "sha512-FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-strategies": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.3.1.tgz", + "integrity": "sha512-F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-streams": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.3.1.tgz", + "integrity": "sha512-4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-sw": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.3.1.tgz", + "integrity": "sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w==", + "license": "MIT" + }, + "node_modules/workbox-window": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-4.3.1.tgz", + "integrity": "sha512-C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workerpool": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", + "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" + }, + "node_modules/write": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", + "dev": true, + "license": "MIT", + "dependencies": { + "mkdirp": "^0.5.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/write-file-stdout": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/write-file-stdout/-/write-file-stdout-0.0.2.tgz", + "integrity": "sha512-KofbSPeePSre3soWCMaqcWHVZy9t/rbJaEMa2h19cupODsvc4eh7390Se1TjzZEL77rS+D6dznu0TLXyCbR+sw==", + "license": "MIT" + }, + "node_modules/ws": { + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", + "license": "MIT", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "license": "Apache-2.0" + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "license": "MIT" + }, + "node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "license": "ISC" + }, + "node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, + "node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "license": "MIT", + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs-unparser/node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs-unparser/node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "license": "ISC", + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "license": "MIT", + "dependencies": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/by-name/su/subfont/package.nix b/pkgs/by-name/su/subfont/package.nix new file mode 100644 index 000000000000..58eafd3ed739 --- /dev/null +++ b/pkgs/by-name/su/subfont/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildNpmPackage, + fetchurl, + testers, +}: + +let + pname = "subfont"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/subfont/-/subfont-${version}.tgz"; + hash = "sha256-8zfMO/3zEKkLI7nZShVpaJxxueM8amdsiIEGmcebLgQ="; + }; +in +buildNpmPackage (finalAttrs: { + inherit pname version src; + + npmDepsHash = "sha256-vqsm8/1I1HFo9IZdOqGQ/qFEyLTYY5uwtsnp1PJfPIk="; + + postPatch = '' + ln -s ${./package-lock.json} package-lock.json + ''; + + dontNpmBuild = true; + + env.PUPPETEER_SKIP_DOWNLOAD = true; + + passthru.tests.version = testers.testVersion { + inherit version; + package = finalAttrs.finalPackage; + }; + + meta = { + description = "Command line tool to optimize webfont loading by aggressively subsetting based on font use, self-hosting of Google fonts and preloading"; + mainProgram = "subfont"; + homepage = "https://github.com/Munter/subfont"; + changelog = "https://github.com/Munter/subfont/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ dav-wolff ]; + }; +}) diff --git a/pkgs/by-name/su/subnetcalc/package.nix b/pkgs/by-name/su/subnetcalc/package.nix index 075e044594cb..38801ab0df7d 100644 --- a/pkgs/by-name/su/subnetcalc/package.nix +++ b/pkgs/by-name/su/subnetcalc/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "subnetcalc"; - version = "2.6.2"; + version = "2.6.4"; src = fetchFromGitHub { owner = "dreibh"; repo = "subnetcalc"; tag = "subnetcalc-${finalAttrs.version}"; - hash = "sha256-TiPnNfETb69snl/8LXaIfjAq92meahvfIWSJLSrlxcc="; + hash = "sha256-FpDbU9kqen+NsJd8bSMUkTeq441+BXTKx/xKwcEBk10="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/su/subread/package.nix b/pkgs/by-name/su/subread/package.nix index 601eb3542705..fb3ee4ecacd4 100644 --- a/pkgs/by-name/su/subread/package.nix +++ b/pkgs/by-name/su/subread/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "subread"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz"; - sha256 = "sha256-/fioTPFF7atJhAcOcVlWEsl603Qa/bjSX5Pa58hwNDM="; + sha256 = "sha256-Y5LXxmgxzddn5YJRiSp5pRtvq47QupZxrV6F/xqwHqo="; }; buildInputs = [ diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix index aff0cbda04b8..03aab4482d4d 100644 --- a/pkgs/by-name/su/subtitleedit/package.nix +++ b/pkgs/by-name/su/subtitleedit/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "subtitleedit"; - version = "4.0.11"; + version = "4.0.12"; src = fetchzip { url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${ lib.replaceStrings [ "." ] [ "" ] version }.zip"; - hash = "sha256-j024PnRie48M9vQMIduREF1W/DZhvOmmoppHN69svxk="; + hash = "sha256-UlkFTsdssrjrPA0oOXJuSckEf1uMxh+POojfDX7NUu8="; stripRoot = false; }; diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index 53969233d425..7383d2c9e095 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -1,25 +1,23 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, cmake, - darwin, }: rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.41.0"; + version = "0.42.1"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-zg2MraqKLbyhaxTi02rE4MsMuPw4diIseYNUQEoqnVA="; + hash = "sha256-wp6gxIpo5MyODB/Gf6oh62iK/VmwjVaJkuysrytHKf4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-leJp+Ccb2mij46Cx6+pv7GoHLKG5IVlNeih0L2QQp4w="; + cargoHash = "sha256-1jat45mCpivEnKCp/9BfsW4ZXi0HF9PeAvK5gw5+enw="; # Only build the command line client cargoBuildFlags = [ @@ -30,10 +28,6 @@ rustPlatform.buildRustPackage rec { # Needed by wabt-sys nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # Requires a running substrate node doCheck = false; diff --git a/pkgs/by-name/su/suckit/package.nix b/pkgs/by-name/su/suckit/package.nix new file mode 100644 index 000000000000..af8db72d3c13 --- /dev/null +++ b/pkgs/by-name/su/suckit/package.nix @@ -0,0 +1,43 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage rec { + pname = "suckit"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "skallwar"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-M4/vD1sVny7hAf4h56Z2xy7yuCqH/H3qHYod6haZOs0="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-20Fz98mAkmhk7g0359S7Gjg6i89cXtKuS/9bVzOagBs="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + # requires internet access + checkFlags = [ + "--skip=test_download_url" + "--skip=test_external_download" + ]; + + meta = with lib; { + description = "Recursively visit and download a website's content to your disk"; + homepage = "https://github.com/skallwar/suckit"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "suckit"; + }; +} diff --git a/pkgs/by-name/su/sudo-font/package.nix b/pkgs/by-name/su/sudo-font/package.nix index d4dd350cba6e..02c1b09c7757 100644 --- a/pkgs/by-name/su/sudo-font/package.nix +++ b/pkgs/by-name/su/sudo-font/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "2.2"; + version = "3.3"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-qI43FDDXcJby2EbEow0ZBzPVOQby3+WxvhJKyjrYUp8="; + hash = "sha256-Y4+bRIXzN40RIij9mQT0GqONi7aMi13rhl5zd2f+7Uk="; }; installPhase = '' diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix index 9908c3de7ecc..ed9ec2611308 100644 --- a/pkgs/by-name/su/sudo-rs/package.nix +++ b/pkgs/by-name/su/sudo-rs/package.nix @@ -8,20 +8,21 @@ pam, pandoc, rustPlatform, + tzdata, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "sudo-rs"; - version = "0.2.4"; + version = "0.2.6"; src = fetchFromGitHub { owner = "trifectatechfoundation"; repo = "sudo-rs"; - rev = "v${version}"; - hash = "sha256-jzK/AkBtS2XxxRaSYk5wsaj1IbLlcqyyMk3AqambkKs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vZv3IVSW6N0puoWJBYQPmNntgHPt9SPV07TEuWN/bHw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0NzHmpf/0YwtgVPkhMpBqxuQQAmKghZ5cZbIr5taM4o="; + cargoHash = "sha256-/CbU2ds2VQ2IXx7GKxRO3vePzLXJXabA1FcyIGPsngw="; nativeBuildInputs = [ installShellFiles @@ -33,8 +34,11 @@ rustPlatform.buildRustPackage rec { # Don't attempt to generate the docs in a (pan)Docker container postPatch = '' substituteInPlace util/generate-docs.sh \ - --replace "/usr/bin/env bash" ${lib.getExe bash} \ - --replace util/pandoc.sh pandoc + --replace-fail "/usr/bin/env bash" ${lib.getExe bash} \ + --replace-fail util/pandoc.sh pandoc + + substituteInPlace build.rs \ + --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; postInstall = '' @@ -75,15 +79,19 @@ rustPlatform.buildRustPackage rec { tests = nixosTests.sudo-rs; }; - meta = with lib; { + meta = { description = "Memory safe implementation of sudo and su"; homepage = "https://github.com/trifectatechfoundation/sudo-rs"; - changelog = "${meta.homepage}/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + changelog = "${finalAttrs.meta.homepage}/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ nicoo ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ + nicoo + rvdp + ]; + mainProgram = "sudo"; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/su/suidChroot/package.nix b/pkgs/by-name/su/suidChroot/package.nix deleted file mode 100644 index a19d0e7de06e..000000000000 --- a/pkgs/by-name/su/suidChroot/package.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - stdenv, - fetchurl, -}: - -stdenv.mkDerivation rec { - pname = "suid-chroot"; - version = "1.0.2"; - - src = fetchurl { - sha256 = "1a9xqhck0ikn8kfjk338h9v1yjn113gd83q0c50k78xa68xrnxjx"; - url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${pname}-${version}.tar.bz2"; - }; - - postPatch = '' - substituteInPlace Makefile --replace /usr $out - sed -i -e '/chmod u+s/d' Makefile - ''; - - meta = with lib; { - description = "Setuid-safe wrapper for chroot"; - license = licenses.gpl2Plus; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/by-name/su/suil/package.nix similarity index 100% rename from pkgs/development/libraries/audio/suil/default.nix rename to pkgs/by-name/su/suil/package.nix diff --git a/pkgs/by-name/su/suitesparse-graphblas/package.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix index c4a89eeb4733..780aae1eecf8 100644 --- a/pkgs/by-name/su/suitesparse-graphblas/package.nix +++ b/pkgs/by-name/su/suitesparse-graphblas/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "10.0.2"; + version = "10.0.5"; outputs = [ "out" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - hash = "sha256-5FrVVLKZ9WDa+a3Tq9WrhMfhvbVLGMKtKZH0h9h/3tk="; + hash = "sha256-BesARhxqfi4GsgdYsJd5b1+TYme891PezhSouDfZXBo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/su/summon/package.nix b/pkgs/by-name/su/summon/package.nix index 54b11f93d000..4c57b68d08c3 100644 --- a/pkgs/by-name/su/summon/package.nix +++ b/pkgs/by-name/su/summon/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "summon"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "cyberark"; repo = "summon"; rev = "v${version}"; - hash = "sha256-RCYi7nUJ+27pmH6k7jCav4Klea9JCK9Kzfu8ifYgORg="; + hash = "sha256-nAjaZh0bnGBZh2wK78M4gg8BGsM6kBQ8MNvfPI7TIOg="; }; - vendorHash = "sha256-StcJvUtMfBh7p1sD8ucvHNJ572whRfqz3id6XsFoXtk="; + vendorHash = "sha256-B6sbMKmuIQ+xoJspFCRtqe9IOLW+AFF5XQBDSLhM9cI="; subPackages = [ "cmd" ]; diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix index dd0549d90503..5f17603bd5a5 100644 --- a/pkgs/by-name/su/sumo/package.nix +++ b/pkgs/by-name/su/sumo/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "sumo"; - version = "1.22.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "eclipse"; repo = "sumo"; rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-4HL5wi6LfUe4/v7ObeiDCTyWV8ChRlRXDFb5OBRmjuI="; + hash = "sha256-yXXOCvlHAzGmNQeXyWQtmq1UdkQ6qt4L9noUii/voP4="; fetchSubmodules = true; }; @@ -93,6 +93,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/eclipse/sumo"; license = licenses.epl20; - maintainers = with maintainers; [ mtreca ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix index 9a79973dfe2f..6a0de7ef3ef2 100644 --- a/pkgs/by-name/su/sunshine/package.nix +++ b/pkgs/by-name/su/sunshine/package.nix @@ -47,6 +47,7 @@ miniupnpc, nlohmann_json, config, + coreutils, cudaSupport ? config.cudaSupport, cudaPackages ? { }, }: @@ -200,7 +201,8 @@ stdenv'.mkDerivation rec { substituteInPlace packaging/linux/sunshine.service.in \ --subst-var-by PROJECT_DESCRIPTION 'Self-hosted game stream host for Moonlight' \ - --subst-var-by SUNSHINE_EXECUTABLE_PATH $out/bin/sunshine + --subst-var-by SUNSHINE_EXECUTABLE_PATH $out/bin/sunshine \ + --replace-fail '/bin/sleep' '${lib.getExe' coreutils "sleep"}' ''; preBuild = '' diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 8e358adbd446..0fafe6d6310a 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.20.5"; + version = "2.23.1"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-350b+79Jmrk8wsVQdE3gRAP3JZbgAtL1Cw46sOCyaok="; + hash = "sha256-1k4eWXBNzmG5qP2sGaEddK+bUAwSArsJ+WbtkMe9Fv4="; }; - vendorHash = "sha256-7AilsV/TBvY/n1gR5SSc6+d68n0rhclo5hqDTC/VrkY="; + vendorHash = "sha256-ttQNief5BHbsRtmA32VFMbF2cuiIrtXVfOw5C/A9R+Q="; ldflags = [ "-s" diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 37e9c2093763..78fe7df51084 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -13,20 +13,20 @@ buildNpmPackage rec { pname = "super-productivity"; - version = "12.0.1"; + version = "12.0.5"; src = fetchFromGitHub { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-s+j9TPdyA5OBGv+fxwz9Ze4SzME9m2nusbwrEsntvQc="; + hash = "sha256-+Xw1WZXvZUOdA/ZpLdLCQAy8cmQ9QTiSDRMgj5+jeNw="; postFetch = '' ${lib.getExe npm-lockfile-fix} -r $out/package-lock.json ''; }; - npmDepsHash = "sha256-uPdfUiFEb9MLdgfLXo5g7EEs2RUJpCxwKR02kqlD7P8="; + npmDepsHash = "sha256-SAmSvdPlJFDE6TQCr932MfPzlwDtGcm4YdHesVA6j8c="; npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true; diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix new file mode 100644 index 000000000000..e6bb798f9d7b --- /dev/null +++ b/pkgs/by-name/su/superTuxKart/package.nix @@ -0,0 +1,166 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchsvn, + cmake, + pkg-config, + makeWrapper, + SDL2, + glew, + openal, + libvorbis, + libogg, + curl, + freetype, + libjpeg, + libpng, + libX11, + harfbuzz, + mcpp, + wiiuse, + angelscript, + libopenglrecorder, + sqlite, + libsamplerate, + shaderc, +}: +let + assets = fetchsvn { + url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; + rev = "18464"; + sha256 = "1a84j3psl4cxzkn5ynakpjill7i2f9ki2p729bpmbrvg8fki95aa"; + name = "stk-assets"; + }; + + # List of bundled libraries in stk-code/lib to keep + # Those are the libraries that cannot be replaced + # with system packages. + bundledLibraries = [ + # Bullet 2.87 is incompatible (bullet 2.79 needed whereas 2.87 is packaged) + # The api changed in a lot of classes, too much work to adapt + "bullet" + # Upstream Libenet doesn't yet support IPv6, + # So we will use the bundled libenet which + # has been fixed to support it. + "enet" + # Internal library of STK, nothing to do about it + "graphics_engine" + # Internal library of STK, nothing to do about it + "graphics_utils" + # Internal library. + "simd_wrapper" + # This irrlicht is bundled with cmake + # whereas upstream irrlicht still uses + # archaic Makefiles, too complicated to switch to. + "irrlicht" + # Not packaged to this date + "libsquish" + # Not packaged to this date + "sheenbidi" + # Not packaged to this date + "tinygettext" + # Not packaged to this date (needed on Darwin) + "mojoal" + ]; +in +stdenv.mkDerivation rec { + + pname = "supertuxkart"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "supertuxkart"; + repo = "stk-code"; + rev = version; + hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM="; + }; + + postPatch = '' + # Deletes all bundled libs in stk-code/lib except those + # That couldn't be replaced with system packages + find lib -maxdepth 1 -type d | egrep -v "^lib$|${(lib.concatStringsSep "|" bundledLibraries)}" | xargs -n1 -L1 -r -I{} rm -rf {} + + # Allow building with system-installed wiiuse on Darwin + substituteInPlace CMakeLists.txt \ + --replace 'NOT (APPLE OR HAIKU)) AND USE_SYSTEM_WIIUSE' 'NOT (HAIKU)) AND USE_SYSTEM_WIIUSE' + ''; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = + [ + shaderc + SDL2 + glew + libvorbis + libogg + freetype + curl + libjpeg + libpng + libX11 + harfbuzz + mcpp + wiiuse + angelscript + sqlite + ] + ++ lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) libopenglrecorder + ++ lib.optional stdenv.hostPlatform.isLinux openal + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libsamplerate + ]; + + cmakeFlags = [ + "-DBUILD_RECORDER=${ + if (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) then "ON" else "OFF" + }" + "-DUSE_SYSTEM_ANGELSCRIPT=ON" + "-DCHECK_ASSETS=OFF" + "-DUSE_SYSTEM_WIIUSE=ON" + "-DOpenGL_GL_PREFERENCE=GLVND" + ]; + + CXXFLAGS = [ + # GCC 13: error: 'snprintf' was not declared in this scope + "-include cstdio" + # GCC 13: error: 'runtime_error' is not a member of 'std' + "-include stdexcept" + ]; + + # Extract binary from built app bundle + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/bin + mv $out/{supertuxkart.app/Contents/MacOS,bin}/supertuxkart + rm -rf $out/supertuxkart.app + ''; + + # Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds + preFixup = '' + wrapProgram $out/bin/supertuxkart \ + --set-default SUPERTUXKART_ASSETS_DIR "${assets}" \ + --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart" \ + ''; + + meta = with lib; { + description = "Free 3D kart racing game"; + mainProgram = "supertuxkart"; + longDescription = '' + SuperTuxKart is a Free 3D kart racing game, with many tracks, + characters and items for you to try, similar in spirit to Mario + Kart. + ''; + homepage = "https://supertuxkart.net/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ + peterhoeg + ]; + platforms = with platforms; unix; + changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md"; + }; +} diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix index a13e18c80c5c..4836eca8ea3b 100644 --- a/pkgs/by-name/su/supercell-wx/package.nix +++ b/pkgs/by-name/su/supercell-wx/package.nix @@ -26,7 +26,7 @@ qt6, tbb_2021_11, tracy, - substituteAll, + replaceVars, python3, }: let @@ -50,12 +50,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "supercell-wx"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "dpaulat"; repo = "supercell-wx"; rev = "refs/tags/v${finalAttrs.version}-release"; - sha256 = "sha256-gKR5Mfzw5B4f4/dWintlbDHX3q+d1RmFE+MNp5uSSuc="; + sha256 = "sha256-3fVUxbGosN4Y4h8BJXUV7DNv7VZTma+IsV94+Zt8DCA="; fetchSubmodules = true; }; @@ -94,9 +94,8 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # These are for Nix compatibility {{{ ./patches/use-find-package.patch # Replace some vendored dependencies with Nix provided versions - (substituteAll { + (replaceVars ./patches/skip-git-versioning.patch { # Skip tagging build with git version, and substitute it with the src revision (still uses current year timestamp) - src = ./patches/skip-git-versioning.patch; rev = finalAttrs.src.rev; }) # Prevents using some Qt scripts that seemed to break the install step. Fixes missing link to some targets. diff --git a/pkgs/by-name/su/superlu_dist/package.nix b/pkgs/by-name/su/superlu_dist/package.nix index a2e5677ed2ef..2a92911d417f 100644 --- a/pkgs/by-name/su/superlu_dist/package.nix +++ b/pkgs/by-name/su/superlu_dist/package.nix @@ -5,6 +5,7 @@ fetchurl, llvmPackages, cmake, + pkg-config, gfortran, blas, lapack, @@ -13,7 +14,7 @@ metis, parmetis, withExamples ? false, - fortranSupport ? stdenv.hostPlatform.isLinux, + fortranSupport ? true, enableOpenMP ? true, # Todo: ask for permission of unfree parmetis withParmetis ? false, @@ -52,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + pkg-config ] ++ lib.optionals fortranSupport [ gfortran @@ -69,6 +71,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withParmetis [ metis parmetis + ] + ++ lib.optionals stdenv.cc.isClang [ + gfortran.cc.lib ]; propagatedBuildInputs = [ blas ]; @@ -80,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) (lib.cmakeBool "XSDK_ENABLE_Fortran" fortranSupport) + (lib.cmakeBool "BLA_PREFER_PKGCONFIG" true) (lib.cmakeBool "TPL_ENABLE_INTERNAL_BLASLIB" false) (lib.cmakeBool "TPL_ENABLE_LAPACKLIB" true) (lib.cmakeBool "TPL_ENABLE_PARMETISLIB" withParmetis) diff --git a/pkgs/by-name/su/supermariowar/package.nix b/pkgs/by-name/su/supermariowar/package.nix index 2a8b4dd92878..960131aeb9bb 100644 --- a/pkgs/by-name/su/supermariowar/package.nix +++ b/pkgs/by-name/su/supermariowar/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "supermariowar"; - version = "2024-unstable-2025-01-30"; + version = "2024-unstable-2025-04-03"; src = fetchFromGitHub { owner = "mmatyas"; repo = "supermariowar"; - rev = "8192bbda2eca807cfe1e2793018bd55ecdaac50a"; - hash = "sha256-i/UdKXIOUViv+FJFyss3Xa4Z8+OwW2CQjJ3hROZVaRA="; + rev = "c0ed774a2415ad45e72bd6086add2a5cbfc88898"; + hash = "sha256-vh8SSMxAOG8f9nyJmKUlA8yb+G61Bfc62dhB2eLdo20="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/su/supermodel/package.nix b/pkgs/by-name/su/supermodel/package.nix index 15702e89aad8..f78444742fe2 100644 --- a/pkgs/by-name/su/supermodel/package.nix +++ b/pkgs/by-name/su/supermodel/package.nix @@ -4,25 +4,27 @@ libGLU, SDL2, SDL2_net, + xorg, stdenv, zlib, }: stdenv.mkDerivation { pname = "supermodel"; - version = "0-unstable-2024-11-07"; + version = "0-unstable-2025-04-17"; src = fetchFromGitHub { owner = "trzy"; repo = "supermodel"; - rev = "4e7356ab2c077aa3bc3d75fb6e164a1c943fe4c1"; - hash = "sha256-ajRbgs6oMFF+dYHPsKM7FU16vuZcSovaNk2thdsUWtk="; + rev = "2272893a0511c0b3b50f6dda64addb7014717dd3"; + hash = "sha256-3FdLBGxmi4Xj7ao2nvjLleJSTXvKQrhUWvnQr8DK/RY="; }; buildInputs = [ libGLU SDL2 SDL2_net + xorg.libX11 zlib ]; diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 6fcd56c2104a..17d452b3d8a9 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -13,7 +13,6 @@ libxkbcommon, libglvnd, mpv-unwrapped, - darwin, waylandSupport ? false, }: @@ -21,16 +20,16 @@ assert waylandSupport -> stdenv.hostPlatform.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.14.0"; + version = "0.15.2"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-ua2INyKPncXDOwzmKrgnRCb7q8CFEApEaYuBbQeau98="; + hash = "sha256-grVZgsoehx32zpdKXuy78gcBb/ESZtzyizRuRKIjgwM="; }; - vendorHash = "sha256-5LxYD9kLUvKgXmDCw1SNBM6ay8Vayj+PyoZRVptSM0c="; + vendorHash = "sha256-fc86z8bvdFI3LdlyHej2G42O554hpRszqre+e3WUOKI="; nativeBuildInputs = [ @@ -64,13 +63,6 @@ buildGoModule rec { wayland wayland-protocols libxkbcommon - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.Kernel - darwin.apple_sdk_11_0.frameworks.OpenGL - darwin.apple_sdk_11_0.frameworks.UserNotifications - darwin.apple_sdk_11_0.frameworks.MediaPlayer ]; postInstall = diff --git a/pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch b/pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch deleted file mode 100644 index 70c941ddd125..000000000000 --- a/pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,5 +1,7 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+version = 3 -+ - [[package]] - name = "adler32" - version = "1.2.0" -@@ -530,13 +532,13 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - - [[package]] - name = "lexical-core" --version = "0.7.4" -+version = "0.7.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" -+checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" - dependencies = [ - "arrayvec", - "bitflags 1.2.1", -- "cfg-if 0.1.10", -+ "cfg-if 1.0.0", - "ryu", - "static_assertions", - ] diff --git a/pkgs/by-name/su/supertag/package.nix b/pkgs/by-name/su/supertag/package.nix deleted file mode 100644 index 50ef178d470e..000000000000 --- a/pkgs/by-name/su/supertag/package.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - dbus, - fuse, - sqlite, -}: - -rustPlatform.buildRustPackage rec { - pname = "supertag"; - version = "0.1.4"; - - src = fetchFromGitHub { - owner = "amoffat"; - repo = "supertag"; - rev = "v${version}"; - sha256 = "0jzm7pn38hlr96n0z8gqfsfdbw48y0nnbsgjdq7hpgwmcgvgqdam"; - }; - - # lexical-core is outdated and incompatible with newer versions of rust - # patches Cargo.lock to include a more up-to-date version of lexical-core - cargoPatches = [ ./cargo-lock-update-lexical-core.patch ]; - - useFetchCargoVendor = true; - cargoHash = "sha256-i+v2PK07GHmTaLT0Bcpitd1g3Mrol28S2a2lBwBETb8="; - - nativeBuildInputs = [ - rustPlatform.bindgenHook - pkg-config - ]; - buildInputs = [ - dbus - fuse - sqlite - ]; - - # The test are requiring extended permissions. - doCheck = false; - - meta = with lib; { - description = "Tag-based filesystem"; - longDescription = '' - Supertag is a tag-based filesystem, written in Rust, for Linux and MacOS. - It provides a tag-based view of your files by removing the hierarchy - constraints typically imposed on files and folders. In other words, it - allows you to think about your files not as objects stored in folders, but - as objects that can be filtered by folders. - ''; - homepage = "https://github.com/amoffat/supertag"; - license = licenses.agpl3Plus; - platforms = [ - "i686-linux" - "x86_64-linux" - ]; - maintainers = with maintainers; [ oxzi ]; - }; -} diff --git a/pkgs/by-name/su/surf/package.nix b/pkgs/by-name/su/surf/package.nix new file mode 100644 index 000000000000..8a38ab27a506 --- /dev/null +++ b/pkgs/by-name/su/surf/package.nix @@ -0,0 +1,92 @@ +{ + lib, + stdenv, + fetchgit, + pkg-config, + wrapGAppsHook3, + glib, + gcr, + glib-networking, + gsettings-desktop-schemas, + gtk2, + libsoup_2_4, + webkitgtk_4_0, + xorg, + dmenu, + findutils, + gnused, + coreutils, + gst_all_1, + patches ? null, +}: + +stdenv.mkDerivation rec { + pname = "surf"; + version = "2.1"; + + # tarball is missing file common.h + src = fetchgit { + url = "git://git.suckless.org/surf"; + rev = version; + sha256 = "1v926hiayddylq79n8l7dy51bm0dsa9n18nx9bkhg666cx973x4z"; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + buildInputs = + [ + glib + gcr + glib-networking + gsettings-desktop-schemas + gtk2 + libsoup_2_4 + webkitgtk_4_0 + ] + ++ (with gst_all_1; [ + # Audio & video support for webkitgtk WebView + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); + + inherit patches; + + makeFlags = [ "PREFIX=$(out)" ]; + + # Add run-time dependencies to PATH. Append them to PATH so the user can + # override the dependencies with their own PATH. + preFixup = + let + depsPath = lib.makeBinPath [ + xorg.xprop + dmenu + findutils + gnused + coreutils + ]; + in + '' + gappsWrapperArgs+=( + --suffix PATH : ${depsPath} + ) + ''; + + meta = with lib; { + description = "Simple web browser based on WebKitGTK"; + mainProgram = "surf"; + longDescription = '' + surf is a simple web browser based on WebKitGTK. It is able to display + websites and follow links. It supports the XEmbed protocol which makes it + possible to embed it in another application. Furthermore, one can point + surf to another URI by setting its XProperties. + ''; + homepage = "https://surf.suckless.org"; + license = licenses.mit; + platforms = webkitgtk_4_0.meta.platforms; + maintainers = with maintainers; [ joachifm ]; + }; +} diff --git a/pkgs/by-name/su/surface-control/package.nix b/pkgs/by-name/su/surface-control/package.nix index 865faac1f0dd..3434c126d5a1 100644 --- a/pkgs/by-name/su/surface-control/package.nix +++ b/pkgs/by-name/su/surface-control/package.nix @@ -10,41 +10,38 @@ rustPlatform.buildRustPackage rec { pname = "surface-control"; - version = "0.4.3-2"; + version = "0.4.7-1"; src = fetchFromGitHub { owner = "linux-surface"; repo = "surface-control"; - rev = "v${version}"; - sha256 = "sha256-QgkUxT5Ae0agvalZl1ie+1LwxgaTzMrKpQY3KkpWwG4="; + tag = "v${version}"; + hash = "sha256-3XTG63zjCZVuTCPvDCpl5ZNPf57r6dctEfgTu0hkznM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-BBEdX/VSTYYIusLkqUZOxmf5pTMbF4v7LjlQxy8RV3Y="; + + cargoHash = "sha256-YE20/3emZ6pveEeRgVXVrNvykpEs+wvnHSsrMLEZTdk="; nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ udev ]; postInstall = '' installShellCompletion \ $releaseDir/build/surface-*/out/surface.{bash,fish} \ --zsh $releaseDir/build/surface-*/out/_surface - install -Dm 0444 -t $out/etc/udev/rules.d \ - etc/udev/40-surface-control.rules - substituteInPlace $out/etc/udev/rules.d/40-surface-control.rules \ - --replace "/usr/bin/chmod" "${coreutils}/bin/chmod" \ - --replace "/usr/bin/chown" "${coreutils}/bin/chown" ''; - meta = with lib; { + meta = { description = "Control various aspects of Microsoft Surface devices on Linux from the Command-Line"; homepage = "https://github.com/linux-surface/surface-control"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "surface"; }; } diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix index 8cffcf7dd82d..bf145ff65ea4 100644 --- a/pkgs/by-name/su/surfer/package.nix +++ b/pkgs/by-name/su/surfer/package.nix @@ -12,7 +12,6 @@ libXcursor, libXi, stdenv, - darwin, makeWrapper, zenity, }: @@ -34,12 +33,10 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - (lib.getLib stdenv.cc.cc) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + (lib.getLib stdenv.cc.cc) + ]; # Wayland and X11 libs are required at runtime since winit uses dlopen runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/su/surgescript/package.nix b/pkgs/by-name/su/surgescript/package.nix new file mode 100644 index 000000000000..6d340cb3e347 --- /dev/null +++ b/pkgs/by-name/su/surgescript/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + versionCheckHook, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "surgescript"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "alemart"; + repo = "surgescript"; + tag = "v${finalAttrs.version}"; + hash = "sha256-m6H9cyoUY8Mgr0FDqPb98PRJTgF7DgSa+jC+EM0TDEw="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "surgescript"; + description = "Scripting language for games"; + homepage = "https://docs.opensurge2d.org/"; + downloadPage = "https://github.com/alemart/surgescript"; + changelog = "https://github.com/alemart/surgescript/blob/v${finalAttrs.version}/CHANGES.md"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ federicoschonborn ]; + }; +}) diff --git a/pkgs/by-name/su/suricata/package.nix b/pkgs/by-name/su/suricata/package.nix index e03df3fd06f8..a1862b5c3d78 100644 --- a/pkgs/by-name/su/suricata/package.nix +++ b/pkgs/by-name/su/suricata/package.nix @@ -8,7 +8,6 @@ makeWrapper, elfutils, file, - hyperscan, jansson, libbpf_0, libcap_ng, @@ -25,6 +24,7 @@ nspr, pcre2, python3, + vectorscan, zlib, redisSupport ? true, valkey, @@ -36,15 +36,14 @@ }: let libmagic = file; - hyperscanSupport = stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.9"; + version = "7.0.10"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-5XspNDx7ahhXyZG9crCzRKuimOThGVM7F56BfampnT0="; + hash = "sha256-GX+SXqcBvctKFaygJLBlRrACZ0zZWLWJWPKaW7IU11k="; }; nativeBuildInputs = @@ -83,9 +82,9 @@ stdenv.mkDerivation rec { nspr pcre2 python3 + vectorscan zlib ] - ++ lib.optional hyperscanSupport hyperscan ++ lib.optionals redisSupport [ valkey hiredis @@ -121,13 +120,11 @@ stdenv.mkDerivation rec { "--enable-unix-socket" "--localstatedir=/var" "--sysconfdir=/etc" + "--with-libhs-includes=${lib.getDev vectorscan}/include/hs" + "--with-libhs-libraries=${lib.getLib vectorscan}/lib" "--with-libnet-includes=${libnet}/include" "--with-libnet-libraries=${libnet}/lib" ] - ++ lib.optionals hyperscanSupport [ - "--with-libhs-includes=${hyperscan.dev}/include/hs" - "--with-libhs-libraries=${hyperscan}/lib" - ] ++ lib.optional redisSupport "--enable-hiredis" ++ lib.optionals rustSupport [ "--enable-rust" diff --git a/pkgs/by-name/su/surreal-engine/package.nix b/pkgs/by-name/su/surreal-engine/package.nix index 71376ed3d3eb..4a6766060d3d 100644 --- a/pkgs/by-name/su/surreal-engine/package.nix +++ b/pkgs/by-name/su/surreal-engine/package.nix @@ -9,6 +9,7 @@ openal, pkg-config, SDL2, + libX11, stdenv, vulkan-loader, wayland, @@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { libffi openal SDL2 + libX11 vulkan-loader wayland waylandpp diff --git a/pkgs/by-name/su/surrealdb-migrations/package.nix b/pkgs/by-name/su/surrealdb-migrations/package.nix new file mode 100644 index 000000000000..fe2fa0b647e9 --- /dev/null +++ b/pkgs/by-name/su/surrealdb-migrations/package.nix @@ -0,0 +1,63 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + testers, + surrealdb-migrations, + nix-update-script, +}: + +let + pname = "surrealdb-migrations"; + version = "2.2.2"; +in +rustPlatform.buildRustPackage rec { + inherit pname version; + + src = fetchFromGitHub { + owner = "Odonno"; + repo = pname; + rev = "v${version}"; + hash = "sha256-PLCnfkjmmp7Xx6sF9u15X52JB3x8135xjBr8yYkqYhQ="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-x0S9hHvHlQNelX2QR/4ApwZxgdzjGWnyDxNUrQvyTH0="; + + # Error: No such file or directory (os error 2) + # failures: + # cli::apply::apply_initial_migrations + # cli::apply::apply_initial_schema_changes + # cli::apply::apply_new_migrations + # cli::apply::apply_new_schema_changes + # cli::apply::apply_should_skip_events_if_no_events_folder + # cli::apply::apply_with_db_configuration + # cli::apply::apply_with_skipped_migrations + # cli::list::list_blog_migrations + # cli::list::list_empty_migrations + # library::list::list_blog_migrations + # library::list::list_empty_migrations + # library::up::apply_initial_migrations + # library::up::apply_initial_schema_changes + # library::up::apply_new_migrations + # library::up::apply_new_schema_changes + # library::up::apply_should_skip_events_if_no_events_folder + # library::up_to::apply_with_skipped_migrations + doCheck = false; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = surrealdb-migrations; + command = "surrealdb-migrations --version"; + }; + }; + + meta = with lib; { + description = "Awesome SurrealDB migration tool, with a user-friendly CLI and a versatile Rust library that enables seamless integration into any project"; + homepage = "https://crates.io/crates/surrealdb-migrations"; + mainProgram = "surrealdb-migrations"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index e2b719de0761..4a3a3c38b991 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -8,22 +7,21 @@ rocksdb, testers, surrealdb, - darwin, protobuf, }: rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "2.2.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; tag = "v${version}"; - hash = "sha256-MzVyzhZ9BNxavlyj3E1D9Mo2/o6Yue21FdhpT8ziXwE="; + hash = "sha256-D7eujFJiFHmWlEoVkMkUSIdJt5fx+jTTqDwZs0JJw4o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Uza2Ujg8EKGJrzitch71qIevgUv+n3YCtkMLHIAgPr4="; + cargoHash = "sha256-dXLJKwwNIv4QcbROJyWB9oGBqh6bztz37tXMzc5jYUM="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' @@ -45,7 +43,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; doCheck = false; diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix new file mode 100644 index 000000000000..20970de616f5 --- /dev/null +++ b/pkgs/by-name/su/survex/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchurl, + ffmpeg, + glib, + libGLU, + libICE, + libX11, + libgbm, + perl, + pkg-config, + proj, + gdal, + python3, + wrapGAppsHook3, + wxGTK32, +}: + +stdenv.mkDerivation rec { + pname = "survex"; + version = "1.4.17"; + + src = fetchurl { + url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-r24vcOV1pjNxnLRfy2tSG7bDG/HLChwEvlc83YMeOEc="; + }; + + nativeBuildInputs = [ + perl + pkg-config + python3 + wrapGAppsHook3 + ]; + + buildInputs = + [ + ffmpeg + glib + proj + gdal + wxGTK32 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # TODO: libGLU doesn't build for macOS because of Mesa issues + # (#233265); is it required for anything? + libGLU + libgbm + libICE + libX11 + ]; + + strictDeps = true; + + postPatch = '' + patchShebangs . + ''; + + configureFlags = [ + "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" + ]; + + enableParallelBuilding = true; + doCheck = (!stdenv.hostPlatform.isDarwin); # times out + enableParallelChecking = false; + + meta = with lib; { + description = "Free Software/Open Source software package for mapping caves"; + longDescription = '' + Survex is a Free Software/Open Source software package for mapping caves, + licensed under the GPL. It is designed to be portable and can be run on a + variety of platforms, including Linux/Unix, macOS, and Microsoft Windows. + ''; + homepage = "https://survex.com/"; + changelog = "https://github.com/ojwb/survex/raw/v${version}/NEWS"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.matthewcroughan ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix index 561c40038cb4..2857f25cba5a 100644 --- a/pkgs/by-name/su/sushi/package.nix +++ b/pkgs/by-name/su/sushi/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/GNOME/sushi/-/blob/${version}/NEWS?ref_type=tags"; description = "Quick previewer for Nautilus"; mainProgram = "sushi"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/su/suyu/fix-debugger.patch b/pkgs/by-name/su/suyu/fix-debugger.patch deleted file mode 100644 index 87d4e0cc118f..000000000000 --- a/pkgs/by-name/su/suyu/fix-debugger.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/src/core/debugger/debugger.cpp b/src/core/debugger/debugger.cpp -index e86aae8460..a4dca23770 100644 ---- a/src/core/debugger/debugger.cpp -+++ b/src/core/debugger/debugger.cpp -@@ -5,7 +5,13 @@ - #include - #include - --#include -+// Use basic asio functionality only -+#define BOOST_ASIO_STANDALONE -+#include -+#include -+#include -+#include -+ - #include - - #include "common/logging/log.h" -@@ -21,17 +27,22 @@ - - template - static void AsyncReceiveInto(Readable& r, Buffer& buffer, Callback&& c) { -- static_assert(std::is_trivial_v); -- auto boost_buffer{boost::asio::buffer(&buffer, sizeof(Buffer))}; -- r.async_read_some( -- boost_buffer, [&, c](const boost::system::error_code& error, size_t bytes_read) { -- if (!error.failed()) { -- const u8* buffer_start = reinterpret_cast(&buffer); -- std::span received_data{buffer_start, buffer_start + bytes_read}; -- c(received_data); -- AsyncReceiveInto(r, buffer, c); -- } -- }); -+ try { -+ static_assert(std::is_trivial_v); -+ auto boost_buffer{boost::asio::buffer(&buffer, sizeof(Buffer))}; -+ r.async_read_some( -+ boost_buffer, -+ [&, c](const boost::system::error_code& error, size_t bytes_read) { -+ if (!error) { -+ const u8* buffer_start = reinterpret_cast(&buffer); -+ std::span received_data{buffer_start, buffer_start + bytes_read}; -+ c(received_data); -+ AsyncReceiveInto(r, buffer, c); -+ } -+ }); -+ } catch (const std::exception& e) { -+ LOG_ERROR(Debug_GDBStub, "AsyncReceiveInto error: {}", e.what()); -+ } - } - - template diff --git a/pkgs/by-name/su/suyu/fix-udp-client.patch b/pkgs/by-name/su/suyu/fix-udp-client.patch deleted file mode 100644 index 103b1001ee2a..000000000000 --- a/pkgs/by-name/su/suyu/fix-udp-client.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp -index 60821b31a6..8f9c047218 100644 ---- a/src/input_common/drivers/udp_client.cpp -+++ b/src/input_common/drivers/udp_client.cpp -@@ -2,7 +2,15 @@ - // SPDX-License-Identifier: GPL-2.0-or-later - - #include --#include -+// Include only needed asio components -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - #include - - #include "common/logging/log.h" -@@ -113,7 +121,7 @@ private: - } - - SocketCallback callback; -- boost::asio::io_service io_service; -+ boost::asio::io_context io_service; - boost::asio::basic_waitable_timer timer; - udp::socket socket; - diff --git a/pkgs/by-name/su/suyu/fix-udp-protocol.patch b/pkgs/by-name/su/suyu/fix-udp-protocol.patch deleted file mode 100644 index 65c4862825fc..000000000000 --- a/pkgs/by-name/su/suyu/fix-udp-protocol.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/input_common/helpers/udp_protocol.h b/src/input_common/helpers/udp_protocol.h -index db08fc62c5..ea223ea937 100644 ---- a/src/input_common/helpers/udp_protocol.h -+++ b/src/input_common/helpers/udp_protocol.h -@@ -69,7 +69,7 @@ Message CreateMessage(const u32 magic, const T data, const u32 sender_id) { - }; - Message message{header, data}; - crc.process_bytes(&message, sizeof(Message)); -- message.header.crc = crc.checksum(); -+ message.header.crc = static_cast(crc.checksum()); - return message; - } - diff --git a/pkgs/by-name/su/suyu/package.nix b/pkgs/by-name/su/suyu/package.nix deleted file mode 100644 index ea19a06ecf2d..000000000000 --- a/pkgs/by-name/su/suyu/package.nix +++ /dev/null @@ -1,237 +0,0 @@ -{ - lib, - stdenv, - SDL2, - autoconf, - boost, - catch2_3, - cmake, - fetchFromGitHub, - cpp-jwt, - cubeb, - discord-rpc, - enet, - fetchgit, - fetchurl, - ffmpeg-headless, - fmt, - glslang, - libopus, - libusb1, - libva, - lz4, - unzip, - nix-update-script, - nlohmann_json, - nv-codec-headers-12, - pkg-config, - qt6, - vulkan-headers, - vulkan-loader, - yasm, - simpleini, - zlib, - vulkan-memory-allocator, - zstd, -}: - -let - inherit (qt6) - qtbase - qtmultimedia - qtwayland - wrapQtAppsHook - qttools - qtwebengine - ; - - compat-list = stdenv.mkDerivation { - pname = "yuzu-compatibility-list"; - version = "unstable-2024-02-26"; - - src = fetchFromGitHub { - owner = "flathub"; - repo = "org.yuzu_emu.yuzu"; - rev = "9c2032a3c7e64772a8112b77ed8b660242172068"; - hash = "sha256-ITh/W4vfC9w9t+TJnPeTZwWifnhTNKX54JSSdpgaoBk="; - }; - - buildCommand = '' - cp $src/compatibility_list.json $out - ''; - }; - - nx_tzdb = stdenv.mkDerivation rec { - pname = "nx_tzdb"; - version = "221202"; - - src = fetchurl { - url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${version}/${version}.zip"; - hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c="; - }; - - nativeBuildInputs = [ unzip ]; - - buildCommand = '' - unzip $src -d $out - ''; - - }; - -in - -stdenv.mkDerivation (finalAttrs: { - pname = "suyu"; - version = "0.0.4"; - - src = fetchgit { - url = "https://git.suyu.dev/suyu/suyu"; - tag = "v${finalAttrs.version}"; - hash = "sha256-GgLCbQI7u9neFxQq4borNhlg72FIYn+J5XkaK/7hpnQ="; - fetchSubmodules = true; - }; - - patches = [ - # Remove coroutines from debugger to fix boost::asio compatibility issues - ./fix-debugger.patch - # Add explicit cast for CRC checksum value - ./fix-udp-protocol.patch - # Use specific boost::asio includes and update to modern io_context - ./fix-udp-client.patch - ]; - - nativeBuildInputs = [ - cmake - glslang - pkg-config - qttools - wrapQtAppsHook - ]; - - buildInputs = [ - # vulkan-headers must come first, so the older propagated versions - # don't get picked up by accident - vulkan-headers - - boost - catch2_3 - cpp-jwt - cubeb - discord-rpc - # intentionally omitted: dynarmic - prefer vendored version for compatibility - enet - - # ffmpeg deps (also includes vendored) - # we do not use internal ffmpeg because cuda errors - autoconf - yasm - libva # for accelerated video decode on non-nvidia - nv-codec-headers-12 # for accelerated video decode on nvidia - ffmpeg-headless - # end ffmpeg deps - - fmt - # intentionally omitted: gamemode - loaded dynamically at runtime - # intentionally omitted: httplib - upstream requires an older version than what we have - libopus - libusb1 - # intentionally omitted: LLVM - heavy, only used for stack traces in the debugger - lz4 - nlohmann_json - qtbase - qtmultimedia - qtwayland - qtwebengine - # intentionally omitted: renderdoc - heavy, developer only - SDL2 - # intentionally omitted: stb - header only libraries, vendor uses git snapshot - vulkan-memory-allocator - # intentionally omitted: xbyak - prefer vendored version for compatibility - zlib - zstd - ]; - - # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt` - # making the build fail, as that path does not exist - dontFixCmake = true; - - cmakeFlags = [ - # actually has a noticeable performance impact - (lib.cmakeBool "SUYU_ENABLE_LTO" true) - - (lib.cmakeBool "ENABLE_QT6" true) - (lib.cmakeBool "ENABLE_QT_TRANSLATION" true) - - # use system libraries - # NB: "external" here means "from the externals/ directory in the source", - # so "off" means "use system" - (lib.cmakeBool "SUYU_USE_EXTERNAL_SDL2" false) - (lib.cmakeBool "SUYU_USE_EXTERNAL_VULKAN_HEADERS" true) - "-DVulkan_INCLUDE_DIRS=${vulkan-headers}/include" - - # # don't use system ffmpeg, suyu uses internal APIs - # (lib.cmakeBool "SUYU_USE_BUNDLED_FFMPEG" true) - - # don't check for missing submodules - (lib.cmakeBool "SUYU_CHECK_SUBMODULES" false) - - # enable some optional features - (lib.cmakeBool "SUYU_USE_QT_WEB_ENGINE" true) - (lib.cmakeBool "SUYU_USE_QT_MULTIMEDIA" true) - (lib.cmakeBool "USE_DISCORD_PRESENCE" true) - - # We dont want to bother upstream with potentially outdated compat reports - (lib.cmakeBool "SUYU_ENABLE_COMPATIBILITY_REPORTING" false) - (lib.cmakeBool "ENABLE_COMPATIBILITY_LIST_DOWNLOAD" false) # We provide this deterministically - ]; - - env = { - # Does some handrolled SIMD - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1"; - }; - - qtWrapperArgs = [ - # Fixes vulkan detection. - # FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate - "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" - ]; - - # Setting this through cmakeFlags does not work. - # https://github.com/NixOS/nixpkgs/issues/114044 - preConfigure = lib.concatStringsSep "\n" [ - '' - cmakeFlagsArray+=( - "-DTITLE_BAR_FORMAT_IDLE=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}" - "-DTITLE_BAR_FORMAT_RUNNING=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}" - ) - '' - # provide pre-downloaded tz data - '' - mkdir -p build/externals/nx_tzdb - ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb - '' - ]; - - postConfigure = '' - ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json - ''; - - postInstall = " - install -Dm444 $src/dist/72-suyu-input.rules $out/lib/udev/rules.d/72-suyu-input.rules - "; - - meta = { - description = "Experimental Nintendo Switch emulator written in C++"; - homepage = "https://suyu.dev"; - mainProgram = "suyu"; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ liberodark ]; - license = with lib.licenses; [ - gpl3Plus - # Icons - asl20 - mit - cc0 - ]; - }; -}) diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix index 3de3b51af508..65e51db70263 100644 --- a/pkgs/by-name/sv/sv-lang/package.nix +++ b/pkgs/by-name/sv/sv-lang/package.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-msSc6jw2xbEZfOwtqwFEDIKcwf5SDKp+j15lVbNO98g="; }; + postPatch = '' + substituteInPlace external/CMakeLists.txt \ + --replace-fail 'set(mimalloc_min_version "2.1")' 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")' + ''; + cmakeFlags = [ # fix for https://github.com/NixOS/nixpkgs/issues/144170 "-DCMAKE_INSTALL_INCLUDEDIR=include" diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix index 1dd1dda5dbd7..62d524001654 100644 --- a/pkgs/by-name/sv/svd2rust/package.nix +++ b/pkgs/by-name/sv/svd2rust/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.36.0"; + version = "0.36.1"; src = fetchCrate { inherit pname version; - hash = "sha256-HdE4XWAM1e25kRwryMzGqo2sUpzgwk2aiWsi+qXZ7bU="; + hash = "sha256-+wVcUpSlJsd6GAZgBor7eAu6IYnlfJwzZDYKqUKpa9M="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JiGTGdrudmDCNmJOtHgIBwTVCLB3m4RCqxlypa2KdDQ="; + cargoHash = "sha256-rZusngSIwdDfNe7tIA2WtIzzje6UBxyz/hfeRLqJHUY="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index 0380316c7377..86f0059cca56 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.4.5"; + version = "0.4.6"; src = fetchCrate { inherit version pname; - hash = "sha256-XwgDjSn19qbmh/yX4h5vG0C4rTRxd9tT1ZzUm1Y1ckg="; + hash = "sha256-AfRFtybGEpArLGKp4AkGlokfNFMK8Ez5VA5Fu5GUhRI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-h99NTKW1Re680GNsmKTW35OpJVlfYFj05QVZ9rHXgYY="; + cargoHash = "sha256-0GR9pbrevb0USu8de1oFHePJH1hGTvcVh3Gc9WKP0uA="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json index 10bc2c6460a9..533b617b27cb 100644 --- a/pkgs/by-name/sv/svelte-language-server/package-lock.json +++ b/pkgs/by-name/sv/svelte-language-server/package-lock.json @@ -1,12 +1,12 @@ { "name": "svelte-language-server", - "version": "0.17.11", + "version": "0.17.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "svelte-language-server", - "version": "0.17.11", + "version": "0.17.12", "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.25", @@ -253,9 +253,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "18.19.80", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.80.tgz", - "integrity": "sha512-kEWeMwMeIvxYkeg1gTc01awpwLbfMRZXdIhwRcakd/KlK53jmRC26LqcbIt7fnAQTu5GzlnWmzA3H6+l1u6xxQ==", + "version": "18.19.86", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.86.tgz", + "integrity": "sha512-fifKayi175wLyKyc5qUfyENhQ1dCNI1UNjp653d8kuYcPQN5JhX3dGuP/XmvPTg/xRBn1VTLpbmi+H/Mr7tLfQ==", "dev": true, "license": "MIT", "dependencies": { @@ -544,9 +544,9 @@ } }, "node_modules/code-red/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "license": "MIT" }, "node_modules/code-red/node_modules/estree-walker": { @@ -1010,9 +1010,9 @@ } }, "node_modules/is-reference/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "license": "MIT" }, "node_modules/is-unicode-supported": { @@ -1418,9 +1418,9 @@ } }, "node_modules/periscopic/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "license": "MIT" }, "node_modules/periscopic/node_modules/estree-walker": { @@ -1694,9 +1694,9 @@ } }, "node_modules/svelte/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "license": "MIT" }, "node_modules/svelte/node_modules/estree-walker": { @@ -1709,9 +1709,9 @@ } }, "node_modules/svelte2tsx": { - "version": "0.7.35", - "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.35.tgz", - "integrity": "sha512-z2lnOnrfb5nrlRfFQI8Qdz03xQqMHUfPj0j8l/fQuydrH89cCeN+v9jgDwK9GyMtdTRUkE7Neu9Gh+vfXJAfuQ==", + "version": "0.7.36", + "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.36.tgz", + "integrity": "sha512-nBlERuCZRwmpebC8m0vDqZ9oaKsqW8frQS2l3zwFQW1voQIkItYtHxh1F5OTZEmE0meDIH6cxU36eIOQVOxlCw==", "license": "MIT", "dependencies": { "dedent-js": "^1.0.1", @@ -1806,9 +1806,9 @@ } }, "node_modules/typescript": { - "version": "5.8.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", - "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", + "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", @@ -1842,29 +1842,41 @@ "license": "MIT" }, "node_modules/vscode-css-languageservice": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.2.tgz", - "integrity": "sha512-GEpPxrUTAeXWdZWHev1OJU9lz2Q2/PPBxQ2TIRmLGvQiH3WZbqaNoute0n0ewxlgtjzTW3AKZT+NHySk5Rf4Eg==", + "version": "6.3.4", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.4.tgz", + "integrity": "sha512-qutdhFg4hnlf6IsOynwtfsN8W0Xc7g3SZd+KK9F2moUEjHtkcZoj5p8uH7BSwHx9hSEXjwKgSRRyHTXThfwAkQ==", "license": "MIT", "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "3.17.5", - "vscode-uri": "^3.0.8" + "vscode-uri": "^3.1.0" } }, + "node_modules/vscode-css-languageservice/node_modules/vscode-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz", + "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==", + "license": "MIT" + }, "node_modules/vscode-html-languageservice": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.2.tgz", - "integrity": "sha512-3MgFQqVG+iQVNG7QI/slaoL7lJpne0nssX082kjUF1yn/YJa8BWCLeCJjM0YpTlp8A7JT1+J22mk4qSPx3NjSQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.3.tgz", + "integrity": "sha512-AK/jJM0VIWRrlfqkDBMZxNMnxYT5I2uoMVRoNJ5ePSplnSaT9mbYjqJlxxeLvUrOW7MEH0vVIDzU48u44QZE0w==", "license": "MIT", "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "^3.17.5", - "vscode-uri": "^3.0.8" + "vscode-uri": "^3.1.0" } }, + "node_modules/vscode-html-languageservice/node_modules/vscode-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz", + "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==", + "license": "MIT" + }, "node_modules/vscode-jsonrpc": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index 9b523e4dada8..30f2d9b71990 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -4,7 +4,7 @@ fetchurl, }: let - version = "0.17.11"; + version = "0.17.12"; in buildNpmPackage { pname = "svelte-language-server"; @@ -12,10 +12,10 @@ buildNpmPackage { src = fetchurl { url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz"; - hash = "sha256-rmyn0DjYa+DWQt6Qw8aIW0BnceIv5ZGi7VQXBBXRAHY="; + hash = "sha256-KNXaXjgIE0ryVkSxzsEoXE/1VjKPpEiMv+E2np8K6OU="; }; - npmDepsHash = "sha256-tc4AGUNKNUict31kDdx6LLbHZSYURZrHJK7d/wgfz54="; + npmDepsHash = "sha256-B8Ji9bsKKN7mem8W3Qg/oEQy9Emr5ilUKMYrMkAFS8Y="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index 7c3435fc1d6e..a7f80c85ee05 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -6,37 +6,30 @@ openssl, protobuf, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "svix-server"; - version = "1.62.0"; + version = "1.65.0"; src = fetchFromGitHub { owner = "svix"; repo = "svix-webhooks"; rev = "v${version}"; - hash = "sha256-ft08skfLASgfZo3lrlN+nuF2FK78kEm2geRVg8cO5hM="; + hash = "sha256-SmNiQeVoTASMW6T5mcInZLlNok32olWRr2+daq/c684="; }; sourceRoot = "${src.name}/server"; useFetchCargoVendor = true; - cargoHash = "sha256-0GuTIGWGeP7CG+CijjlRW9SPKfp7rPuZVuClLZC25dk="; + cargoHash = "sha256-vpPWEYVKEboubbWeuxyXz/M53Ura8gSpuneH/L7Qtmw="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - protobuf - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + protobuf + ]; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/by-name/sv/svt-av1-psy/package.nix b/pkgs/by-name/sv/svt-av1-psy/package.nix index 379337ee53d5..25663c9bcfdc 100644 --- a/pkgs/by-name/sv/svt-av1-psy/package.nix +++ b/pkgs/by-name/sv/svt-av1-psy/package.nix @@ -6,18 +6,19 @@ nasm, cpuinfo, libdovi, + hdr10plus, unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "svt-av1-psy"; - version = "2.3.0-B-unstable-2025-02-02"; + version = "3.0.2-unstable-2025-04-21"; src = fetchFromGitHub { owner = "psy-ex"; repo = "svt-av1-psy"; - rev = "ec65071b65ee70078229182ce6e1d0f6a4aa1a47"; - hash = "sha256-98u7J9tqrnc+MbryjWO2r9iuAy6QjJbbq0/o4xRLzhI="; + rev = "3745419c40267d294202b52f48f069aff56cdb78"; + hash = "sha256-iAw2FiEsBGB4giWqzo1EJZok26WSlq7brq9kJubnkAQ="; }; cmakeBuildType = "Release"; @@ -31,21 +32,26 @@ stdenv.mkDerivation (finalAttrs: { ) ) { - USE_EXTERNAL_CPUINFO = true; LIBDOVI_FOUND = true; - # enable when libhdr10plus is available - # LIBHDR10PLUS_RS_FOUND = true; + LIBHDR10PLUS_RS_FOUND = true; }; - nativeBuildInputs = [ - cmake - nasm - ]; + nativeBuildInputs = + [ + cmake + ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + nasm + ]; - buildInputs = [ - cpuinfo - libdovi - ]; + buildInputs = + [ + libdovi + hdr10plus + ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + cpuinfo + ]; passthru.updateScript = unstableGitUpdater { branch = "master"; @@ -68,5 +74,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ johnrtitor ]; + mainProgram = "SvtAv1EncApp"; }; }) diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix index 722579b17237..50628c70abf5 100644 --- a/pkgs/by-name/sv/svtplay-dl/package.nix +++ b/pkgs/by-name/sv/svtplay-dl/package.nix @@ -21,7 +21,7 @@ let requests-mock ; - version = "4.103"; + version = "4.109"; in @@ -34,7 +34,7 @@ buildPythonApplication { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-pSTYrDgHmx4V+Y9iGRj3fCHiyoBP9FUf/XIRJyoUvMY="; + hash = "sha256-ApoAcYaqPIurgDM+ctyyx9+OyUmhJ+1fjdGj0ln6v7w="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/sw/swagger-cli/package.nix b/pkgs/by-name/sw/swagger-cli/package.nix index f78dd09b46a4..5b72e1e8d5d4 100644 --- a/pkgs/by-name/sw/swagger-cli/package.nix +++ b/pkgs/by-name/sw/swagger-cli/package.nix @@ -21,6 +21,10 @@ buildNpmPackage rec { npm run bump ''; + postInstall = '' + find $out/lib/node_modules -xtype l -delete + ''; + meta = with lib; { description = "Swagger 2.0 and OpenAPI 3.0 command-line tool"; homepage = "https://apitools.dev/swagger-cli/"; diff --git a/pkgs/by-name/sw/swappy/package.nix b/pkgs/by-name/sw/swappy/package.nix new file mode 100644 index 000000000000..91afa5de1f1b --- /dev/null +++ b/pkgs/by-name/sw/swappy/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + wayland, + cairo, + pango, + gtk3, + pkg-config, + scdoc, + libnotify, + glib, + wrapGAppsHook3, + hicolor-icon-theme, +}: + +stdenv.mkDerivation rec { + pname = "swappy"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "jtheoof"; + repo = pname; + rev = "v${version}"; + hash = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo="; + }; + + nativeBuildInputs = [ + glib + meson + ninja + pkg-config + scdoc + wrapGAppsHook3 + ]; + + buildInputs = [ + cairo + pango + gtk3 + libnotify + wayland + glib + hicolor-icon-theme + ]; + + strictDeps = true; + + mesonFlags = [ + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + ]; + + meta = with lib; { + description = "Wayland native snapshot editing tool, inspired by Snappy on macOS"; + homepage = "https://github.com/jtheoof/swappy"; + license = licenses.mit; + mainProgram = "swappy"; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index 1420a6374fe0..0290529a4ead 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -23,7 +23,7 @@ libavif, libsixel, libraw, - openexr_3, + openexr, bash-completion, testers, nix-update-script, @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "3.9"; + version = "4.0"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; tag = "v${finalAttrs.version}"; - hash = "sha256-QPTODuVVDQCP7Ix63F0J0tOzfg5Q9B4GXaxjuTerkI0="; + hash = "sha256-2UmaU60+5NNj2CVJt4oJXyBPjVeA0zBfEqZOOSI2vvk="; }; strictDeps = true; @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { libavif libsixel libraw - openexr_3 + openexr ]; passthru = { diff --git a/pkgs/by-name/sw/swaylock-plugin/package.nix b/pkgs/by-name/sw/swaylock-plugin/package.nix index 4e4e7fa258e7..74b444e2c763 100644 --- a/pkgs/by-name/sw/swaylock-plugin/package.nix +++ b/pkgs/by-name/sw/swaylock-plugin/package.nix @@ -21,14 +21,14 @@ wayland-scanner, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "swaylock-plugin"; - version = "unstable-2025-01-28"; + version = "1.8.2"; src = fetchFromGitHub { owner = "mstoeckl"; repo = "swaylock-plugin"; - rev = "ac02c528bce8f529f33c85065d77eac1aceccbe5"; - hash = "sha256-e4iQ7yCPkkJBpgD0aE94lsID8v3kXhr7YmAszfFi7zA="; + rev = "v${finalAttrs.version}"; + hash = "sha256-Wj5//yTZQMq6ummKSVsCJjSRcVHw2VgAhVbihXBm/qQ="; }; strictDeps = true; @@ -85,4 +85,4 @@ stdenv.mkDerivation { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ picnoir ]; }; -} +}) diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix index 74f631876189..91e3b871cfa3 100644 --- a/pkgs/by-name/sw/swaynotificationcenter/package.nix +++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix @@ -26,6 +26,7 @@ python3, scdoc, vala, + wayland-scanner, xvfb-run, sassc, pantheon, @@ -33,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "SwayNotificationCenter"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "ErikReider"; repo = pname; rev = "v${version}"; - hash = "sha256-SR3FfEit50y4XSCLh3raUoigRNXpxh0mk4qLhQ/FozM="; + hash = "sha256-kRawYbBLVx0ie4t7tChkA8QJShS83fUcGrJSKkxBy8Q="; }; # build pkg-config is required to locate the native `scdoc` input @@ -77,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: rec { librsvg pantheon.granite # systemd # ends with broken permission + wayland-scanner ]; postPatch = '' diff --git a/pkgs/by-name/sw/swaytools/package.nix b/pkgs/by-name/sw/swaytools/package.nix new file mode 100644 index 000000000000..45884093a7a2 --- /dev/null +++ b/pkgs/by-name/sw/swaytools/package.nix @@ -0,0 +1,33 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + slurp, + nix-update-script, +}: +python3Packages.buildPythonApplication rec { + pname = "swaytools"; + version = "0.1.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tmccombs"; + repo = "swaytools"; + rev = version; + sha256 = "sha256-UoWK53B1DNmKwNLFwJW1ZEm9dwMOvQeO03+RoMl6M0Q="; + }; + + nativeBuildInputs = with python3Packages; [ setuptools ]; + + propagatedBuildInputs = [ slurp ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/tmccombs/swaytools"; + description = "Collection of simple tools for sway (and i3)"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ atila ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/sw/swego/package.nix b/pkgs/by-name/sw/swego/package.nix index 71e814cfb5a7..0d7b69bdf048 100644 --- a/pkgs/by-name/sw/swego/package.nix +++ b/pkgs/by-name/sw/swego/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "swego"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; tag = "v${version}"; - hash = "sha256-JILdtmTdDZzcjsDfH0rZo4HpTp26EPP8WKPbHhQeNN8="; + hash = "sha256-28PU7jAVnWfRbFmTE2pmwJO1Zi+ceyFrzY5MiRt+91Y="; }; vendorHash = "sha256-w2OhZq7vaVDVoRfnWPH0bFO85yGTFcO6KpDo5ulTifo="; diff --git a/pkgs/by-name/sw/swell-foop/package.nix b/pkgs/by-name/sw/swell-foop/package.nix index a08d951e55ed..d22ac90d4e7b 100644 --- a/pkgs/by-name/sw/swell-foop/package.nix +++ b/pkgs/by-name/sw/swell-foop/package.nix @@ -8,6 +8,7 @@ vala, glib, gtk4, + libadwaita, libgee, libgnome-games-support_2_0, pango, @@ -20,13 +21,13 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swell-foop"; - version = "46.0"; + version = "48.1"; src = fetchurl { - url = "mirror://gnome/sources/swell-foop/${lib.versions.major version}/swell-foop-${version}.tar.xz"; - hash = "sha256-BvireAfXHOyUi4aDcfR/ut7vzLXDV+E9HvPISBiR/KM="; + url = "mirror://gnome/sources/swell-foop/${lib.versions.major finalAttrs.version}/swell-foop-${finalAttrs.version}.tar.xz"; + hash = "sha256-W5Ywh4/nAa7nUe1G/3ZcK82fgVpOVYJnajwmsxGCAxs="; }; nativeBuildInputs = [ @@ -45,22 +46,25 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk4 + libadwaita libgee libgnome-games-support_2_0 pango ]; passthru = { - updateScript = gnome.updateScript { packageName = "swell-foop"; }; + updateScript = gnome.updateScript { + packageName = "swell-foop"; + }; }; meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/swell-foop"; - changelog = "https://gitlab.gnome.org/GNOME/swell-foop/-/tree/${version}?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/swell-foop/-/tree/${finalAttrs.version}?ref_type=tags"; description = "Puzzle game, previously known as Same GNOME"; mainProgram = "swell-foop"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sw/swi-prolog/package.nix b/pkgs/by-name/sw/swi-prolog/package.nix new file mode 100644 index 000000000000..36ef2245c5ba --- /dev/null +++ b/pkgs/by-name/sw/swi-prolog/package.nix @@ -0,0 +1,180 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + + libxcrypt, + zlib, + openssl, + gmp, + gperftools, + readline, + libedit, + libarchive, + + # optional dependencies + withDb ? true, + db, + + withJava ? true, + jdk, + + withOdbc ? true, + unixODBC, + + withPcre ? true, + pcre2, + + withPython ? true, + python3, + + withYaml ? true, + libyaml, + + withGui ? false, + libXpm, + libXext, + libXft, + libXinerama, + libjpeg, + libXt, + libSM, + freetype, + fontconfig, + + # gcc/g++ as runtime dependency + withNativeCompiler ? true, + + # Packs must be installed from a local directory during the build, with dependencies + # resolved manually, e.g. to install the 'julian' pack, which depends on the 'delay', 'list_util' and 'typedef' packs: + # julian = pkgs.fetchzip { + # name = "swipl-pack-julian"; + # url = "https://github.com/mndrix/julian/archive/v0.1.3.zip"; + # sha256 = "1sgql7c21p3c5m14kwa0bcmlwn9fql612krn9h36gla1j9yjdfgy"; + # }; + # delay = pkgs.fetchzip { + # name = "swipl-pack-delay"; + # url = "https://github.com/mndrix/delay/archive/v0.3.3.zip"; + # sha256 = "0ira87afxnc2dnbbmgwmrr8qvary8lhzvhqwd52dccm6yqd3nybg"; + # }; + # list_util = pkgs.fetchzip { + # name = "swipl-pack-list_util"; + # url = "https://github.com/mndrix/list_util/archive/v0.13.0.zip"; + # sha256 = "0lx7vffflak0y8l8vg8k0g8qddwwn23ksbz02hi3f8rbarh1n89q"; + # }; + # typedef = builtins.fetchTarball { + # name = "swipl-pack-typedef"; + # url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz"; + # sha256 = "056nqjn01g18fb1b2qivv9s7hb4azk24nx2d4kvkbmm1k91f44p3"; + # }; + # swi-prolog = pkgs.swi-prolog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [ + # julian delay list_util typedef + # ]; }; + extraPacks ? [ ], + extraLibraries ? [ ], # removed option - see below +}: + +let + # minorVersion is even for stable, odd for unstable + version = "9.2.9"; + + # This package provides several with* options, which replaces the old extraLibraries option. + # This error should help users that still use this option find their way to these flags. + # We can probably remove this after one NixOS version. + extraLibraries' = + if extraLibraries == [ ] then + [ ] + else + throw "option 'extraLibraries' removed - use 'with*' options (e.g., 'withJava'), or overrideAttrs to inject extra build dependencies"; + + packInstall = swiplPath: pack: '' + ${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false), git(false)])." -t "halt." + ''; + withGui' = withGui && !stdenv.hostPlatform.isDarwin; + optionalDependencies = + [ ] + ++ (lib.optional withDb db) + ++ (lib.optional withJava jdk) + ++ (lib.optional withOdbc unixODBC) + ++ (lib.optional withPcre pcre2) + ++ (lib.optional withPython python3) + ++ (lib.optional withYaml libyaml) + ++ (lib.optionals withGui' [ + libXt + libXext + libXpm + libXft + libXinerama + libjpeg + libSM + freetype + fontconfig + ]) + ++ extraLibraries'; +in +stdenv.mkDerivation { + pname = "swi-prolog"; + inherit version; + + # SWI-Prolog has two repositories: swipl and swipl-devel. + # - `swipl`, which tracks stable releases and backports + # - `swipl-devel` which tracks continuous development + src = fetchFromGitHub { + owner = "SWI-Prolog"; + repo = "swipl"; + tag = "V${version}"; + hash = "sha256-M0stUwiD3Auz5OsmgVJFWg2RAswu42UUp8bafqZOC7A="; + fetchSubmodules = true; + }; + + # Add the packInstall path to the swipl pack search path + postPatch = '' + echo "user:file_search_path(pack, '$out/lib/swipl/extra-pack')." >> boot/init.pl + ''; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + libarchive + libxcrypt + zlib + openssl + gperftools + gmp + readline + libedit + ] ++ optionalDependencies; + + hardeningDisable = [ "format" ]; + + cmakeFlags = + [ "-DSWIPL_INSTALL_IN_LIB=ON" ] + ++ lib.optionals (!withNativeCompiler) [ + # without these options, the build will embed full compiler paths + "-DSWIPL_CC=${if stdenv.hostPlatform.isDarwin then "clang" else "gcc"}" + "-DSWIPL_CXX=${if stdenv.hostPlatform.isDarwin then "clang++" else "g++"}" + ]; + + preInstall = '' + mkdir -p $out/lib/swipl/extra-pack + ''; + + postInstall = builtins.concatStringsSep "\n" (builtins.map (packInstall "$out") extraPacks); + + meta = { + homepage = "https://www.swi-prolog.org"; + description = "Prolog compiler and interpreter"; + license = lib.licenses.bsd2; + mainProgram = "swipl"; + platforms = lib.platforms.linux ++ lib.optionals (!withGui) lib.platforms.darwin; + maintainers = [ + lib.maintainers.meditans + lib.maintainers.matko + ]; + }; +} diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix index da95f8af7998..4b36bc186a77 100644 --- a/pkgs/by-name/sw/swiftformat/package.nix +++ b/pkgs/by-name/sw/swiftformat/package.nix @@ -12,13 +12,13 @@ swift.stdenv.mkDerivation rec { pname = "swiftformat"; - version = "0.55.5"; + version = "0.56.1"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; rev = version; - sha256 = "sha256-AZAQSwmGNHN6ykh9ufeQLC1dEXvTt32X24MPTDh6bI8="; + sha256 = "sha256-WxHKMMJ3CVJTuhBtpgYWT7+XyXXL/fYL9q5jeO4kLbw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix index 74193b6a7eaa..e2968a05f31d 100644 --- a/pkgs/by-name/sw/swiftlint/package.nix +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "swiftlint"; - version = "0.58.2"; + version = "0.59.0"; src = fetchurl { url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip"; - hash = "sha256-rQcdWjbX9Ddt/pLX7Z9LrvizvedbdRMdwofPNPEDU6U="; + hash = "sha256-rsGt9hy2EklZEA7eQ/Tp9eztVLVlVn9LMPTeZz9fQYA="; }; dontPatch = true; diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix index bf8d01099dab..448d972eaa9d 100644 --- a/pkgs/by-name/sw/swim/package.nix +++ b/pkgs/by-name/sw/swim/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, spade, - stdenv, - darwin, git, }: @@ -35,14 +33,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/sw/switcheroo/package.nix b/pkgs/by-name/sw/switcheroo/package.nix index 601e2c322bde..cb6199997e44 100644 --- a/pkgs/by-name/sw/switcheroo/package.nix +++ b/pkgs/by-name/sw/switcheroo/package.nix @@ -2,7 +2,6 @@ lib, blueprint-compiler, cargo, - darwin, desktop-file-utils, fetchFromGitLab, glib, @@ -48,15 +47,11 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 ]; - buildInputs = - [ - glib - gtk4 - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + gtk4 + libadwaita + ]; preFixup = '' gappsWrapperArgs+=( @@ -80,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://apps.gnome.org/Converter/"; license = lib.licenses.gpl3Plus; mainProgram = "switcheroo"; - maintainers = lib.teams.gnome-circle.members; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/sw/swtpm/package.nix b/pkgs/by-name/sw/swtpm/package.nix index 1aecaf42d476..e339361f440c 100644 --- a/pkgs/by-name/sw/swtpm/package.nix +++ b/pkgs/by-name/sw/swtpm/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "swtpm"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZEpThaLgieTTBJ9Rouklepq6Bvo/h+2sbabNOo++fc0="; + hash = "sha256-N79vuI0FhawLyQtwVF6ABIvCmEaYefq/YkyrafUfUHE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sx/sx/package.nix b/pkgs/by-name/sx/sx/package.nix index 5bbb60e52aba..0bd42715c42e 100644 --- a/pkgs/by-name/sx/sx/package.nix +++ b/pkgs/by-name/sx/sx/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, makeDesktopItem, patsh, + coreutils, xorg, nixosTests, }: @@ -24,12 +25,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ patsh ]; buildInputs = [ + coreutils # needed for cross xorg.xauth xorg.xorgserver ]; postInstall = '' - patsh -f $out/bin/sx -s ${builtins.storeDir} + patsh -f $out/bin/sx -s ${builtins.storeDir} --path "$HOST_PATH" install -Dm755 -t $out/share/xsessions ${ makeDesktopItem { diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index 69a2c5721c11..f61fdc2f85b5 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sydbox"; - version = "3.32.6"; + version = "3.34.0"; outputs = [ "out" @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Sydbox"; repo = "sydbox"; tag = "v${finalAttrs.version}"; - hash = "sha256-7tU1H8Du2O4Ay+isZwSUcx+Ws9gr0Djq5uQeRPCuQEo="; + hash = "sha256-m4iooJzc/TQguWF4qVOvuNabFmijsTtlzjz7IllNN74="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SukVs5VG7NEkwF78iliD0SZZgdT0Kz/yQV3LTBo2Nn0="; + cargoHash = "sha256-B/JSJKCLYnNjHFEDdFdGTdXuirA2zRKL+mr36a0Fqh0="; nativeBuildInputs = [ mandoc diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index f75117c4d436..ed7a4db2d4de 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.20.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-kXan8bRpZoDimTwzva9KOKG1NqL9IDTRxpnXMDTUFBs="; + hash = "sha256-7Fav9tTcPFpAQnKMXOeD9Ho5rADDwGvLD3f9VzV82NU="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-rtDJuB6xGmxtq1k1jwMf1aEGlxEHywGiJvAdaI4So9U="; + vendorHash = "sha256-+7tqC6I8zFbGVHFulIbeLBdy3br2ifrEEXM5hZZe3/8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sy/sylpheed/package.nix b/pkgs/by-name/sy/sylpheed/package.nix new file mode 100644 index 000000000000..26aeb6f93388 --- /dev/null +++ b/pkgs/by-name/sy/sylpheed/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + gtk2, + openssl ? null, + gpgme ? null, + gpgSupport ? true, + sslSupport ? true, + fetchpatch, +}: + +assert gpgSupport -> gpgme != null; +assert sslSupport -> openssl != null; + +stdenv.mkDerivation rec { + pname = "sylpheed"; + version = "3.7.0"; + + src = fetchurl { + url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${pname}-${version}.tar.xz"; + sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; + }; + + patches = [ + (fetchpatch { + # patch upstream bug https://sylpheed.sraoss.jp/redmine/issues/306 + name = "patch-libsylph_ssl_c.patch"; + extraPrefix = ""; + url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/mail/sylpheed/patches/patch-libsylph_ssl_c?rev=1.4&content-type=text/plain"; + sha256 = "sha256-+FetU5vrfvE78nYAjKK/QFZnFw+Zr2PvoUGRWCuZczs="; + }) + (fetchpatch { + name = "CVE-2021-37746.patch"; + url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=ac286a71ed78429e16c612161251b9ea90ccd431"; + sha256 = "sha256-oLmUShtvO6io3jibKT67eO0O58vEDZEeaB51QTd3UkU="; + }) + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ gtk2 ] ++ lib.optionals gpgSupport [ gpgme ] ++ lib.optionals sslSupport [ openssl ]; + + configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl"; + + # Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool" + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework Foundation"; + + meta = with lib; { + homepage = "https://sylpheed.sraoss.jp/en/"; + description = "Lightweight and user-friendly e-mail client"; + mainProgram = "sylpheed"; + maintainers = [ ]; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl2; + }; +} diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix index 5b21370e79f6..be724331796c 100644 --- a/pkgs/by-name/sy/symbolicator/package.nix +++ b/pkgs/by-name/sy/symbolicator/package.nix @@ -6,40 +6,33 @@ bzip2, openssl, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "symbolicator"; - version = "24.7.1"; + version = "25.4.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "symbolicator"; rev = version; - hash = "sha256-thc1VXKtOc+kgIMHGDBp4InaSFG9mK9WYS7g90b5Fzs="; + hash = "sha256-TMQzrwPjQnLcIveJIwHMMbglagrtH6sNqGIbUD/Q8Xs="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-wRzHFKTzS/wSX2LEB4Hj5LX1gVI9gFonbibPzCmhWtw="; + cargoHash = "sha256-Q148QzBHNOty/icF8oarEOD3p8cjSMA/IdjJaE9ncn8="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; - buildInputs = - [ - bzip2 - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + zstd + ]; env = { SYMBOLICATOR_GIT_VERSION = src.rev; diff --git a/pkgs/by-name/sy/symmetrica/package.nix b/pkgs/by-name/sy/symmetrica/package.nix index 188a794022aa..43adb5be3cb3 100644 --- a/pkgs/by-name/sy/symmetrica/package.nix +++ b/pkgs/by-name/sy/symmetrica/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Collection of routines for representation theory and combinatorics"; license = lib.licenses.isc; - maintainers = lib.teams.sage.members; + teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; homepage = "https://gitlab.com/sagemath/symmetrica"; }; diff --git a/pkgs/by-name/sy/sympow/package.nix b/pkgs/by-name/sy/sympow/package.nix index ea2ed2e83ddd..fdad80dfed73 100644 --- a/pkgs/by-name/sy/sympow/package.nix +++ b/pkgs/by-name/sy/sympow/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { fullName = "Custom, BSD-like. See COPYING file."; free = true; }; - maintainers = lib.teams.sage.members; + teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/sy/syn2mas/package.nix b/pkgs/by-name/sy/syn2mas/package.nix index 7fb4efaecba9..5e98fd15467a 100644 --- a/pkgs/by-name/sy/syn2mas/package.nix +++ b/pkgs/by-name/sy/syn2mas/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "syn2mas"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; rev = "v${version}"; - hash = "sha256-s6LVCISmbG3ubY/67DcUUE/pnTJSE0v9n8INmLMQNcw="; + hash = "sha256-RK58yfsPJirOKHyBnth42sLTkWo+AkMylEigH0w/RWc="; }; sourceRoot = "${src.name}/tools/syn2mas"; - npmDepsHash = "sha256-H3N0wm7M9GUvB32fch2TWulmmcU5Cb3SuWLkOkIZBqY="; + npmDepsHash = "sha256-RzZjTKS4d/n9mIJ+eUY7NlqWssCnJ2Yh2nAMwasY8Fk="; dontBuild = true; diff --git a/pkgs/by-name/sy/synadm/package.nix b/pkgs/by-name/sy/synadm/package.nix index da29e374d217..9abb85fb09bd 100644 --- a/pkgs/by-name/sy/synadm/package.nix +++ b/pkgs/by-name/sy/synadm/package.nix @@ -1,21 +1,26 @@ { lib, - python3, - fetchPypi, + python3Packages, + fetchFromGitea, nix-update-script, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "synadm"; - version = "0.47"; - format = "setuptools"; + version = "0.48"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-Ts/WPonVa+DUvKKa/XbmDDWx3vW17z0orVaIREJfnO0="; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "synadm"; + repo = "synadm"; + tag = "v${version}"; + hash = "sha256-6t4CXXt22/yR0gIxSsM/r+zJQeoKz5q/Ifg8PLNojLI="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = [ python3Packages.setuptools ]; + + dependencies = with python3Packages; [ click click-option-group dnspython @@ -41,8 +46,9 @@ python3.pkgs.buildPythonApplication rec { conveniently issue commands available via its admin API's (element-hq/synapse@master/docs/admin_api) ''; - changelog = "https://github.com/JOJ0/synadm/releases/tag/v${version}"; - homepage = "https://github.com/JOJ0/synadm"; + changelog = "https://codeberg.org/synadm/synadm/releases/tag/${src.tag}"; + downloadPage = "https://codeberg.org/synadm/synadm"; + homepage = "https://synadm.readthedocs.io/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix new file mode 100644 index 000000000000..4937bca343f3 --- /dev/null +++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, + nix-update-script, + writers, + baseUrl ? null, +}: + +assert lib.asserts.assertMsg ( + baseUrl == null +) "The baseUrl parameter is deprecated, please use .withConfig instead"; + +stdenv.mkDerivation (finalAttrs: { + pname = "synapse-admin-etkecc"; + version = "0.11.0-etke42"; + + src = fetchFromGitHub { + owner = "etkecc"; + repo = "synapse-admin"; + tag = "v${finalAttrs.version}"; + hash = "sha256-HWhyG/dVP9M84OOYH95RPLqiXDYOs+QOxwLM8pPl1vA="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-GO5m+7fcm/XO38XlsQq6fwKslzdZkE6WleP3GHNKuPU="; + }; + + nativeBuildInputs = [ + nodejs + yarnConfigHook + yarnBuildHook + ]; + + env = { + NODE_ENV = "production"; + SYNAPSE_ADMIN_VERSION = finalAttrs.version; + }; + + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; + + passthru = { + # https://github.com/etkecc/synapse-admin/blob/main/docs/config.md + withConfig = + config: + stdenv.mkDerivation { + inherit (finalAttrs) version meta; + pname = "synapse-admin-etkecc-with-config"; + dontUnpack = true; + configFile = writers.writeJSON "synapse-admin-config" config; + installPhase = '' + runHook preInstall + cp -r ${finalAttrs.finalPackage} $out + chmod -R +w $out + cp $configFile $out/config.json + runHook postInstall + ''; + }; + + updateScript = nix-update-script { }; + }; + + meta = { + description = "Maintained fork of the admin console for (Matrix) Synapse homeservers, including additional features"; + homepage = "https://github.com/etkecc/synapse-admin"; + changelog = "https://github.com/etkecc/synapse-admin/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ defelo ]; + }; +}) diff --git a/pkgs/by-name/sy/synapse-admin/package.json b/pkgs/by-name/sy/synapse-admin/package.json deleted file mode 100644 index 851fba613b30..000000000000 --- a/pkgs/by-name/sy/synapse-admin/package.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "name": "synapse-admin", - "version": "0.10.0", - "description": "Admin GUI for the Matrix.org server Synapse", - "type": "module", - "author": "Awesome Technologies Innovationslabor GmbH", - "license": "Apache-2.0", - "homepage": ".", - "repository": { - "type": "git", - "url": "https://github.com/Awesome-Technologies/synapse-admin" - }, - "devDependencies": { - "@babel/preset-env": "^7.24.4", - "@babel/preset-react": "^7.24.1", - "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^15.0.2", - "@testing-library/user-event": "^14.5.2", - "@vitejs/plugin-react": "^4.0.0", - "babel-jest": "^29.7.0", - "eslint": "^8.57.0", - "eslint-config-prettier": "^9.1.0", - "eslint-config-react-app": "^7.0.1", - "eslint-plugin-prettier": "^5.1.3", - "jest": "^29.7.0", - "jest-environment-jsdom": "^29.7.0", - "jest-fetch-mock": "^3.0.3", - "prettier": "^3.2.5", - "react-test-renderer": "^18.2.0", - "vite": "^5.0.0", - "vite-plugin-version-mark": "^0.0.13" - }, - "dependencies": { - "@haleos/ra-language-german": "^1.0.0", - "@haxqer/ra-language-chinese": "^4.16.2", - "@mui/icons-material": "^5.15.15", - "@mui/material": "^5.15.15", - "@mui/styles": "^5.15.15", - "papaparse": "^5.4.1", - "ra-language-farsi": "^4.2.0", - "ra-language-french": "^4.16.15", - "ra-language-italian": "^3.13.1", - "react": "^18.0.0", - "react-admin": "^4.16.15", - "react-dom": "^18.0.0" - }, - "scripts": { - "start": "vite serve", - "build": "vite build", - "fix:other": "yarn prettier --write", - "fix:code": "yarn test:lint --fix", - "fix": "yarn fix:code && yarn fix:other", - "prettier": "prettier --ignore-path .gitignore \"**/*.{js,jsx,json,md,scss,yaml,yml}\"", - "test:code": "jest", - "test:lint": "eslint --ignore-path .gitignore --ext .js,.jsx .", - "test:style": "yarn prettier --list-different", - "test": "yarn test:style && yarn test:lint && yarn test:code" - }, - "babel": { - "presets": [ - "@babel/preset-env", - [ - "@babel/preset-react", - { - "runtime": "automatic" - } - ] - ] - }, - "eslintConfig": { - "extends": "react-app" - }, - "jest": { - "testEnvironment": "jsdom", - "setupFilesAfterEnv": [ - "/src/setupTests.js" - ] - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - } -} diff --git a/pkgs/by-name/sy/synapse-admin/package.nix b/pkgs/by-name/sy/synapse-admin/package.nix index cee42efa4fbc..7543d195eec3 100644 --- a/pkgs/by-name/sy/synapse-admin/package.nix +++ b/pkgs/by-name/sy/synapse-admin/package.nix @@ -1,67 +1,145 @@ { lib, + stdenv, fetchFromGitHub, - fetchYarnDeps, - mkYarnPackage, + nodejs, + yarn-berry, + cacert, + nix-update-script, + formats, baseUrl ? null, - writeShellScriptBin, }: -mkYarnPackage rec { +let + config = lib.optionalAttrs (baseUrl != null) { restrictBaseUrl = baseUrl; }; + configFormat = formats.json { }; + configFile = configFormat.generate "synapse-admin-config" config; +in + +stdenv.mkDerivation (finalAttrs: { pname = "synapse-admin"; - version = "0.10.0"; + version = "0.10.4"; + src = fetchFromGitHub { owner = "Awesome-Technologies"; repo = "synapse-admin"; - rev = version; - sha256 = "sha256-3MC5PCEwYfZzJy9AW9nHTpvU49Lk6wbYC4Rcv9J9MEg="; + tag = finalAttrs.version; + hash = "sha256-ZFYr8Uhsg0+IeOhIcncPuBpAPFB34t98aiucEBDiqTM="; }; - packageJSON = ./package.json; + # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles + yarnOfflineCache = stdenv.mkDerivation { + pname = "yarn-deps"; + inherit (finalAttrs) version src; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-vpCwPL1B+hbIaVSHtlkGjPAteu9BFNNmCTE66CSyFkg="; + nativeBuildInputs = [ yarn-berry ]; + + dontInstall = true; + + env = { + YARN_ENABLE_TELEMETRY = 0; + NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + }; + + supportedArchitectures = builtins.toJSON { + os = [ + "darwin" + "linux" + ]; + cpu = [ + "arm" + "arm64" + "ia32" + "x64" + ]; + libc = [ + "glibc" + "musl" + ]; + }; + + configurePhase = '' + runHook preConfigure + + export HOME="$NIX_BUILD_TOP" + yarn config set enableGlobalCache false + yarn config set cacheFolder $out + yarn config set --json supportedArchitectures "$supportedArchitectures" + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + mkdir -p $out + yarn install --immutable --mode skip-build + + runHook postBuild + ''; + + outputHash = "sha256-av2FDnh55rzzX5m2/Y5d8QWqiBY5/pTW5JRJ+IRcwRA="; + outputHashMode = "recursive"; }; nativeBuildInputs = [ - (writeShellScriptBin "git" "echo ${version}") + nodejs + yarn-berry ]; - NODE_ENV = "production"; - ${if baseUrl != null then "REACT_APP_SERVER" else null} = baseUrl; + env = { + NODE_ENV = "production"; + }; - # error:0308010C:digital envelope routines::unsupported - NODE_OPTIONS = "--openssl-legacy-provider"; + postPatch = '' + substituteInPlace vite.config.ts \ + --replace-fail "git describe --tags" "echo ${finalAttrs.version}" + ''; + + configurePhase = '' + runHook preConfigure + + export HOME="$NIX_BUILD_TOP" + yarn config set enableGlobalCache false + yarn config set cacheFolder $yarnOfflineCache + + runHook postConfigure + ''; buildPhase = '' runHook preBuild - export HOME=$(mktemp -d) - yarn --offline run build + yarn install --immutable --immutable-cache + yarn build runHook postBuild ''; - distPhase = '' - runHook preDist + installPhase = '' + runHook preInstall - cp -r deps/synapse-admin/dist $out + cp -r dist $out + cp ${configFile} $out/config.json - runHook postDist + runHook postInstall ''; - dontFixup = true; - dontInstall = true; + passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Admin UI for Synapse Homeservers"; homepage = "https://github.com/Awesome-Technologies/synapse-admin"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ + changelog = "https://github.com/Awesome-Technologies/synapse-admin/releases/tag/${finalAttrs.version}"; + license = lib.licenses.asl20; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + maintainers = with lib.maintainers; [ mkg20001 ma27 ]; }; -} +}) diff --git a/pkgs/by-name/sy/synapse-bt/package.nix b/pkgs/by-name/sy/synapse-bt/package.nix new file mode 100644 index 000000000000..e99d00a8064e --- /dev/null +++ b/pkgs/by-name/sy/synapse-bt/package.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage { + pname = "synapse-bt"; + version = "unstable-2023-02-16"; + + src = fetchFromGitHub { + owner = "Luminarys"; + repo = "synapse"; + rev = "2165fe22589d7255e497d196c1d42b4c2ace1408"; + hash = "sha256-2irXNgEK9BjRuNu3DUMElmf2vIpGzwoFneAEe97GRh4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-ebqUH01h4B3Aq3apSKpae8ncaFirbrZiDxjiQM9kzg4="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + cargoBuildFlags = [ "--all" ]; + + meta = with lib; { + description = "Flexible and fast BitTorrent daemon"; + homepage = "https://synapse-bt.org/"; + license = licenses.isc; + maintainers = with maintainers; [ dywedir ]; + }; +} diff --git a/pkgs/by-name/sy/syncterm/package.nix b/pkgs/by-name/sy/syncterm/package.nix index 8a8e27fc7a28..42673516194a 100644 --- a/pkgs/by-name/sy/syncterm/package.nix +++ b/pkgs/by-name/sy/syncterm/package.nix @@ -8,6 +8,7 @@ autoPatchelfHook, ncurses, SDL2, + libX11, alsa-lib, }: @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { autoPatchelfHook pkg-config SDL2 + libX11 perl unzip ]; # SDL2 for `sdl2-config`. diff --git a/pkgs/by-name/sy/syncthing-macos/package.nix b/pkgs/by-name/sy/syncthing-macos/package.nix new file mode 100644 index 000000000000..ab2146fcf58a --- /dev/null +++ b/pkgs/by-name/sy/syncthing-macos/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchurl, + stdenv, + undmg, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "syncthing-macos"; + version = "1.29.2-2"; + + src = fetchurl { + url = "https://github.com/syncthing/syncthing-macos/releases/download/v${finalAttrs.version}/Syncthing-${finalAttrs.version}.dmg"; + hash = "sha256-KbUpc2gymxkhkpSvIpy2fF3xAKsDqHHwlfUB8BF8+Sc="; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "Syncthing.app"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications/${finalAttrs.sourceRoot} + cp -R . $out/Applications/${finalAttrs.sourceRoot} + + runHook postInstall + ''; + + meta = { + description = "Official frugal and native macOS Syncthing application bundle"; + homepage = "https://github.com/syncthing/syncthing-macos"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Enzime ]; + hydraPlatforms = [ ]; # no building required + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/sy/syncthing-tray/package.nix b/pkgs/by-name/sy/syncthing-tray/package.nix deleted file mode 100644 index 0f429fd36c24..000000000000 --- a/pkgs/by-name/sy/syncthing-tray/package.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchpatch, - buildGoModule, - pkg-config, - libappindicator-gtk3, -}: - -buildGoModule rec { - pname = "syncthing-tray"; - version = "0.7"; - - src = fetchFromGitHub { - owner = "alex2108"; - repo = "syncthing-tray"; - rev = "v${version}"; - hash = "sha256-g/seDpNdoJ1tc5CTh2EuXoeo8XNpa9CaR+s7bW2cySA="; - }; - - vendorHash = "sha256-hGV5bivDUFEbOwU9sU+Eu5Wzz/aZtj6NUkpzHlmZTtw="; - - patches = [ - # Migrate to Go modules - (fetchpatch { - url = "https://github.com/alex2108/syncthing-tray/commit/94fac974a227cd03c566f81797a21b1bcc29adf5.patch"; - hash = "sha256-uJfnI9kGIlw4OzFoML+ulgR3keOeVB3+ox/4RtYJNXY="; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libappindicator-gtk3 ]; - - meta = { - description = "Simple application tray for syncthing"; - homepage = "https://github.com/alex2108/syncthing-tray"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - luftmensch-luftmensch - nickhu - ]; - mainProgram = "syncthing-tray"; - }; -} diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix index 51df682001f9..480de7622fed 100644 --- a/pkgs/by-name/sy/syndicate-server/package.nix +++ b/pkgs/by-name/sy/syndicate-server/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "syndicate-server"; - version = "0.48.0"; + version = "0.50.1"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "syndicate-lang"; repo = "syndicate-rs"; rev = "${pname}-v${version}"; - hash = "sha256-DVgFlJCqaTmQ7eL2LQ8rkIbvaEfwx+NDeXRA8qB+/Qo="; + hash = "sha256-orQN83DE+ZNgdx2PVcYrte/rVDFFtuQuRDKzeumpsLo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-P/NYyoH/9kkyBwCGORK9bxEjyye12SP3hRDnL9c6i78="; + cargoHash = "sha256-lR36UAMedPdfvX613adxxRzJe+Ri09hiZYanyu7xbLU="; nativeBuildInputs = [ pkg-config versionCheckHook @@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; + doCheck = false; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix index c3a0ffb93ab2..ee314bdb22bb 100644 --- a/pkgs/by-name/sy/syndicate_utils/package.nix +++ b/pkgs/by-name/sy/syndicate_utils/package.nix @@ -17,7 +17,7 @@ buildNimSbom (finalAttrs: { owner = "ehmry"; repo = "syndicate_utils"; rev = finalAttrs.version; - hash = "sha256-X8sb/2mkhVp0jJpTk9uYSDhAVui4jHl355amRCnkNhA="; + hash = "sha256-zHVL2A5mAZX73Xk6Pcs02wHCAVfsOYxDO8/yKX0FvBs="; }; buildInputs = [ @@ -28,8 +28,6 @@ buildNimSbom (finalAttrs: { openssl ]; - nimFlags = [ "--define:nimPreviewHashRef" ]; - meta = finalAttrs.src.meta // { description = "Utilities for the Syndicated Actor Model"; homepage = "https://git.syndicate-lang.org/ehmry/syndicate_utils"; diff --git a/pkgs/by-name/sy/syndicate_utils/sbom.json b/pkgs/by-name/sy/syndicate_utils/sbom.json index 46a8e74877cf..c524b9cb0ec9 100644 --- a/pkgs/by-name/sy/syndicate_utils/sbom.json +++ b/pkgs/by-name/sy/syndicate_utils/sbom.json @@ -6,8 +6,8 @@ "type": "application", "bom-ref": "pkg:nim/syndicate_utils", "name": "syndicate_utils", - "description": "Utilites for Syndicated Actors and Synit", - "version": "20250110", + "description": "Utilities for Syndicated Actors and Synit", + "version": "20250422", "authors": [ { "name": "Emery Hemingway" @@ -96,7 +96,7 @@ "version": "trunk", "externalReferences": [ { - "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d.tar.gz", + "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/9c3dbbaa661dfc191ccb5be791a78cf977adec8b.tar.gz", "type": "source-distribution" }, { @@ -111,19 +111,19 @@ }, { "name": "nix:fod:path", - "value": "/nix/store/sg7dxaz3g2qgb2sp0lzyyl2iwddbxljl-source" + "value": "/nix/store/crza0j3plp9a0bw78cinyk6hwhn3llcf-source" }, { "name": "nix:fod:rev", - "value": "eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d" + "value": "9c3dbbaa661dfc191ccb5be791a78cf977adec8b" }, { "name": "nix:fod:sha256", - "value": "1gjjybfgw99dm8m5i6nm5zsgs7bavkqw6pgia8pc4n41h4ppshiw" + "value": "08pa25f7d0x1228hmrpzn7g2jd1bwip4fvihvw4mx335ssx317kw" }, { "name": "nix:fod:url", - "value": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d.tar.gz" + "value": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/9c3dbbaa661dfc191ccb5be791a78cf977adec8b.tar.gz" }, { "name": "nix:fod:ref", @@ -139,10 +139,10 @@ "type": "library", "bom-ref": "pkg:nim/preserves", "name": "preserves", - "version": "20241221", + "version": "20250214", "externalReferences": [ { - "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5.tar.gz", + "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e.tar.gz", "type": "source-distribution" }, { @@ -157,23 +157,23 @@ }, { "name": "nix:fod:path", - "value": "/nix/store/jr5la48ywfs0ghn5v5256rjqwyxzmd7a-source" + "value": "/nix/store/1d8nbd5nfqpl6l3c7c783h6r0gc47vwf-source" }, { "name": "nix:fod:rev", - "value": "c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5" + "value": "21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e" }, { "name": "nix:fod:sha256", - "value": "1fh8r9mhr3f4mf45fc1shnqfxdrdlif1nsvqd016ni16vmcvclmc" + "value": "136kr6pj5rv3184ykishbkmg86ss85nzygy5wc1lr9l0pgwx6936" }, { "name": "nix:fod:url", - "value": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5.tar.gz" + "value": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e.tar.gz" }, { "name": "nix:fod:ref", - "value": "20241221" + "value": "20250214" }, { "name": "nix:fod:srcDir", diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix index 3d5cee8a5931..c8dfde12d0c5 100644 --- a/pkgs/by-name/sy/synfigstudio/package.nix +++ b/pkgs/by-name/sy/synfigstudio/package.nix @@ -8,7 +8,6 @@ boost, cairo, - darwin, gettext, glibmm, gtk3, @@ -77,26 +76,22 @@ let gettext intltool ]; - buildInputs = - [ - ETL - boost - cairo - glibmm - mlt - libsigcxx - libxmlxx - pango - imagemagick - harfbuzz - freetype - fribidi - openexr - fftw - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + ETL + boost + cairo + glibmm + mlt + libsigcxx + libxmlxx + pango + imagemagick + harfbuzz + freetype + fribidi + openexr + fftw + ]; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/sy/synth/package.nix b/pkgs/by-name/sy/synth/package.nix new file mode 100644 index 000000000000..b6f061f4647e --- /dev/null +++ b/pkgs/by-name/sy/synth/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "synth"; + version = "0.6.9"; + + src = fetchFromGitHub { + owner = "shuttle-hq"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/z2VEfeCCuffxlMh4WOpYkMSAgmh+sbx3ajcD5d4DdE="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-sJSU85f4bLh89qo8fojWJNfJ9t7i/Hlg5pnLcxcwKt4="; + + checkFlags = [ + # https://github.com/shuttle-hq/synth/issues/309 + "--skip=docs_blog_2021_08_31_seeding_databases_tutorial_dot_md" + ]; + + # requires unstable rust features + RUSTC_BOOTSTRAP = 1; + + meta = with lib; { + description = "Tool for generating realistic data using a declarative data model"; + homepage = "https://github.com/getsynth/synth"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index c62c837acfeb..979f7616ab4a 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -1,23 +1,23 @@ { - version = "1.21.0"; + version = "1.22.1"; x86_64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/linux/amd64/sysdig-cli-scanner"; - hash = "sha256-QFI6mXrI6TXRVgjYyKhMIT4EAZzKdH4aWvRkURSHN6c="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-ogQ7NhpU0KZkcZXWSBX4VaTWwXz5WWMXhqZ9abHX6+Y="; }; aarch64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/linux/arm64/sysdig-cli-scanner"; - hash = "sha256-JsGbIZkwOSTJ3kDg3yxaHMVeH5ZCx49iAvMYkiP0iYI="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-apj4GqN7sdZSzpk+FvqcYJLgh+UlcJgPUdXhhurFENQ="; }; x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-CQVmeZK2+Ezba7v6FURh5DPCqDxXYR62O+xw4gAzj6M="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-o5AYd3/8Ot7+EtQ2SXaV72JbR/hI/5Pu7g2jdHZYepo="; }; aarch64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/darwin/arm64/sysdig-cli-scanner"; - hash = "sha256-F/FBkqsS7RCVktxwHJhiP7uS5XAW53BJjlRsLQ4DWAc="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-FDkqWstWMTtF0QLWk+iadJr7aRHRnpiatqAeoHftVDk="; }; } diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix index 5618b841d3e0..adb58f52b316 100644 --- a/pkgs/by-name/sy/syslogng/package.nix +++ b/pkgs/by-name/sy/syslogng/package.nix @@ -35,7 +35,8 @@ gperf, withGrpc ? true, grpc, - protobuf, + # see https://github.com/syslog-ng/syslog-ng/pull/5263 + protobuf_29, }: let python-deps = @@ -65,13 +66,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "syslog-ng"; - version = "4.8.1"; + version = "4.8.3"; src = fetchFromGitHub { owner = "syslog-ng"; repo = "syslog-ng"; rev = "syslog-ng-${finalAttrs.version}"; - hash = "sha256-YdGbDpGMC0DPuPSbfe9HvZshBVdv1s1+hiHDnhYbs6Q="; + hash = "sha256-eYcDdNbUYDsM4k/BDABj/8aV7tZty52XzZ4nqXRC39M="; fetchSubmodules = true; }; nativeBuildInputs = [ @@ -111,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { rdkafka ] ++ (lib.optionals withGrpc [ - protobuf + protobuf_29 grpc ]); diff --git a/pkgs/by-name/sy/system76-firmware/package.nix b/pkgs/by-name/sy/system76-firmware/package.nix index fe4efbae8ff4..9e3e8fe0251d 100644 --- a/pkgs/by-name/sy/system76-firmware/package.nix +++ b/pkgs/by-name/sy/system76-firmware/package.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.70"; + version = "1.0.71"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-firmware"; rev = version; - sha256 = "sha256-6c2OTHCTIYl/ezkWjmyb60FAdasOrV9hjd0inDc44wI="; + sha256 = "sha256-z4n1olvOSiJfHnEixUaWfz86519SntHfECOtWSeI4vk="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; useFetchCargoVendor = true; - cargoHash = "sha256-mLk4EhaRaJvZk27BmjuvNy7PWbqYjUZ9uDikWmBEaz8="; + cargoHash = "sha256-YgDWaxrEfG1xxZOqa7tk2NaPVfMIqoMNZdjejkY6Jow="; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/pkgs/by-name/sy/system76-power/package.nix b/pkgs/by-name/sy/system76-power/package.nix index 0ac266c014fd..02136a19fa32 100644 --- a/pkgs/by-name/sy/system76-power/package.nix +++ b/pkgs/by-name/sy/system76-power/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "system76-power"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-power"; tag = finalAttrs.version; - hash = "sha256-fyatAoWw/4ORojayA90er+H5weRykg+2ZzTsGThpW5g="; + hash = "sha256-SHGfs3ZokPOM2nkd/8F/5zjxh9sPXVBtHWkCbmKwEMo="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; useFetchCargoVendor = true; - cargoHash = "sha256-/dhuWgHysJ2oWgJ6jc9u4tsUOxlFt/awlK/9Jk1GHCM="; + cargoHash = "sha256-Q/6OFNbqvRDTCT1MyJ3gqd4BTXXRouvnKSM3cm1jQ1g="; postInstall = '' install -D -m 0644 data/com.system76.PowerDaemon.conf $out/etc/dbus-1/system.d/com.system76.PowerDaemon.conf diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index 67bd9d6395d5..c5cd706bcefb 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/sy/systemd-bootchart/package.nix b/pkgs/by-name/sy/systemd-bootchart/package.nix new file mode 100644 index 000000000000..5f3a88573858 --- /dev/null +++ b/pkgs/by-name/sy/systemd-bootchart/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + systemd, + libxslt, + docbook_xsl, + docbook_xml_dtd_45, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "systemd-bootchart"; + version = "235"; + + src = fetchFromGitHub { + owner = "systemd"; + repo = "systemd-bootchart"; + tag = "v${finalAttrs.version}"; + hash = "sha256-1h6/Q6ShfJbu/DXENIe5GAQiZp4jlOAg6SAR36cmg2I="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + libxslt + docbook_xsl + docbook_xml_dtd_45 + ]; + + buildInputs = [ + systemd + ]; + + configureFlags = [ + "--with-rootprefix=$(out)" + ]; + + meta = { + description = "Boot performance graphing tool from systemd"; + homepage = "https://github.com/systemd/systemd-bootchart"; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.brianmcgillion ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/sz/szyszka/package.nix b/pkgs/by-name/sz/szyszka/package.nix index 97cb882bff2c..17a9a6b342ee 100644 --- a/pkgs/by-name/sz/szyszka/package.nix +++ b/pkgs/by-name/sz/szyszka/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -11,7 +10,6 @@ gdk-pixbuf, gtk4, wrapGAppsHook4, - darwin, }: rustPlatform.buildRustPackage rec { @@ -33,21 +31,14 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook4 ]; - buildInputs = - [ - glib - cairo - pango - atk - gdk-pixbuf - gtk4 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Foundation - ] - ); + buildInputs = [ + glib + cairo + pango + atk + gdk-pixbuf + gtk4 + ]; postInstall = '' install -m 444 \ diff --git a/pkgs/by-name/t-/t-rec/package.nix b/pkgs/by-name/t-/t-rec/package.nix new file mode 100644 index 000000000000..b9b13483c7f5 --- /dev/null +++ b/pkgs/by-name/t-/t-rec/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + makeWrapper, + imagemagick, + libiconv, + ffmpeg, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "t-rec"; + version = "0.7.9"; + + src = fetchFromGitHub { + owner = "sassman"; + repo = "t-rec-rs"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-aQX+JJ2MwzzxJkA1vsE8JqvYpWtqyycvycPc2pyFU7g="; + }; + + cargoHash = "sha256-AgSYM2a9XGH2X4dcp5CSMnt0Bq/5XT8C3g1R2UX4mLY="; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = + [ imagemagick ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + postInstall = '' + wrapProgram "$out/bin/t-rec" --prefix PATH : "${ + lib.makeBinPath [ + imagemagick + ffmpeg + ] + }" + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; + homepage = "https://github.com/sassman/t-rec-rs"; + changelog = "https://github.com/sassman/t-rec-rs/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ + hoverbear + matthiasbeyer + ]; + mainProgram = "t-rec"; + }; +}) diff --git a/pkgs/by-name/t-/t-rex/package.nix b/pkgs/by-name/t-/t-rex/package.nix index 3001f15a4a94..997d56ada495 100644 --- a/pkgs/by-name/t-/t-rex/package.nix +++ b/pkgs/by-name/t-/t-rex/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, gdal, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -31,14 +29,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gdal openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; meta = with lib; { description = "Vector tile server specialized on publishing MVT tiles"; homepage = "https://t-rex.tileserver.ch/"; changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = teams.geospatial.members; + teams = [ teams.geospatial ]; mainProgram = "t_rex"; platforms = platforms.unix; broken = true; # see https://github.com/t-rex-tileserver/t-rex/issues/320 diff --git a/pkgs/by-name/t4/t4kcommon/package.nix b/pkgs/by-name/t4/t4kcommon/package.nix index d5e07eb4bbde..17ee971bc351 100644 --- a/pkgs/by-name/t4/t4kcommon/package.nix +++ b/pkgs/by-name/t4/t4kcommon/package.nix @@ -38,8 +38,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: CMakeFiles/t4k_common.dir/t4k_throttle.c.o:(.bss+0x0): multiple definition of # `wrapped_lines'; CMakeFiles/t4k_common.dir/t4k_audio.c.o:(.bss+0x0): first defined here - # TODO: revisit https://github.com/tux4kids/t4kcommon/pull/10 when merged. - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon -DGNULIB_UNISTR_U8_MBTOUC_UNSAFE -Wno-incompatible-pointer-types"; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ta/tab-rs/package.nix b/pkgs/by-name/ta/tab-rs/package.nix new file mode 100644 index 000000000000..3469d56bc7e1 --- /dev/null +++ b/pkgs/by-name/ta/tab-rs/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "tab-rs"; + version = "0.5.7"; + + src = fetchFromGitHub { + owner = "austinjones"; + repo = pname; + rev = "v${version}"; + sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr"; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-4bscAhYE3JNk4ikTH+Sw2kGDDsBWcCZZ88weg9USjC0="; + + # many tests are failing + doCheck = false; + + meta = with lib; { + description = "Intuitive, config-driven terminal multiplexer designed for software & systems engineers"; + homepage = "https://github.com/austinjones/tab-rs"; + license = licenses.mit; + maintainers = [ ]; + mainProgram = "tab"; + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # Added 2023-11-13 + }; +} diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix index 3e36a59bdece..f6960dfcca7a 100644 --- a/pkgs/by-name/ta/tabby-agent/package.nix +++ b/pkgs/by-name/ta/tabby-agent/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tabby-agent"; - version = "0.25.2"; + version = "0.28.0"; src = fetchFromGitHub { owner = "TabbyML"; repo = "tabby"; tag = "v${finalAttrs.version}"; - hash = "sha256-VuDOUhAarbl7C3ajOE2TFWIXGxRzkIJaIFa8FxdHYUQ="; + hash = "sha256-I7FHiw7009AjLA3wFKJKNvjuwesB6/DYL/t0hZEtAAY="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-e21fDdV/FPNFGOe1D0P6xOYLWSG6RE8zZntgvTWUxsQ="; + hash = "sha256-SiJJxRzmKQxqw3UESN7q+3qkU1nK+7z6K5RpIMRRces="; }; passthru.updateScript = nix-update-script { @@ -64,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Language server used to communicate with Tabby server"; mainProgram = "tabby-agent"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.khaneliman ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 38deef08262d..09202a2d8974 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -32,7 +32,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.26.0"; + version = "0.27.1"; availableAccelerations = flatten [ (optional cudaSupport "cuda") @@ -121,12 +121,12 @@ rustPlatform.buildRustPackage { owner = "TabbyML"; repo = "tabby"; tag = "v${version}"; - hash = "sha256-OIt0UtknzPikGowfYWMufBXl0Ktt6zsZKqRMx63UqR4="; + hash = "sha256-mpLy+bSKoJr3fo9bEE1dyES1ZeIHQLSvzpt23E55b4o="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-wkd2EVCyWkUEo/gqNuX+P5wDeNmx0Jrd7UhhvIZwAFU="; + cargoHash = "sha256-einG593Brv59j1F5sebUATFnfER/PmXwQJpF3VLPKjg="; # Don't need to build llama-cpp-server (included in default build) # We also don't add CUDA features here since we're using the overridden llama-cpp package @@ -141,7 +141,7 @@ rustPlatform.buildRustPackage { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; nativeBuildInputs = diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix index ea60b3371476..d34cdfa877a1 100644 --- a/pkgs/by-name/ta/tabiew/package.nix +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "tabiew"; - version = "0.8.5"; + version = "0.9.4"; src = fetchFromGitHub { owner = "shshemi"; repo = "tabiew"; - rev = "v${version}"; - hash = "sha256-mBGEw3WyjEmDPo9L+CPOtMiVA+2ndQ2pjo7bUBZZO8o="; + tag = "v${version}"; + hash = "sha256-5zeYqSWM/EbwjX7nHqMhERivk0gVra0QntYNh1dIp5Y="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tDXTiVuQMSPewD5MwDj3pSna22Jelbi3fINszMi9P20="; + cargoHash = "sha256-Yic8maNIjo4Kg6nZ29dtN2PougtOa2WCMMMUiIt9iEs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/libraries/tachyon/make-archs.patch b/pkgs/by-name/ta/tachyon/make-archs.patch similarity index 100% rename from pkgs/development/libraries/tachyon/make-archs.patch rename to pkgs/by-name/ta/tachyon/make-archs.patch diff --git a/pkgs/development/libraries/tachyon/no-absolute-paths.patch b/pkgs/by-name/ta/tachyon/no-absolute-paths.patch similarity index 100% rename from pkgs/development/libraries/tachyon/no-absolute-paths.patch rename to pkgs/by-name/ta/tachyon/no-absolute-paths.patch diff --git a/pkgs/by-name/ta/tachyon/package.nix b/pkgs/by-name/ta/tachyon/package.nix new file mode 100644 index 000000000000..0cf61be8d384 --- /dev/null +++ b/pkgs/by-name/ta/tachyon/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + fetchurl, + libjpeg, + libpng, + withJpegSupport ? true, # support jpeg output + withPngSupport ? true, # support png output +}: + +stdenv.mkDerivation rec { + pname = "tachyon"; + version = "0.99.5"; + src = fetchurl { + url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; + sha256 = "sha256-CSA8ECMRFJ9d9cw2dAn5bHJXQmZtGcJNtbqZTVqBpvU="; + }; + buildInputs = + lib.optionals withJpegSupport [ + libjpeg + ] + ++ lib.optionals withPngSupport [ + libpng + ]; + preBuild = + '' + cd unix + '' + + lib.optionalString withJpegSupport '' + export USEJPEG=" -DUSEJPEG" + export JPEGLIB=" -ljpeg" + '' + + lib.optionalString withPngSupport '' + export USEPNG=" -DUSEPNG" + export PNGLIB=" -lpng -lz" + ''; + arch = + if stdenv.hostPlatform.system == "x86_64-linux" then + "linux-64-thr" + else if stdenv.hostPlatform.system == "i686-linux" then + "linux-thr" + else + # 2021-03-29: multithread (-DTHR -D_REENTRANT) was disabled on linux-arm + # because it caused Sage's 3D plotting tests to hang indefinitely. + # see https://github.com/NixOS/nixpkgs/pull/117465 + if stdenv.hostPlatform.system == "aarch64-linux" then + "linux-arm" + else if stdenv.hostPlatform.system == "armv7l-linux" then + "linux-arm" + else if stdenv.hostPlatform.system == "aarch64-darwin" then + "macosx" + else if stdenv.hostPlatform.system == "x86_64-darwin" then + "macosx-x86-64-thr" + else if stdenv.hostPlatform.system == "i686-cygwin" then + "win32" + else if stdenv.hostPlatform.system == "x86_64-freebsd" then + "bsd" + else if stdenv.hostPlatform.system == "x686-freebsd" then + "bsd" + else + throw "Don't know what arch to select for tachyon build"; + makeFlags = [ arch ]; + + patches = [ + # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) + ./no-absolute-paths.patch + # Include new targets (like arm) + ./make-archs.patch + ]; + postPatch = '' + # Ensure looks for nix-provided Carbon, not system frameworks + substituteInPlace unix/Make-arch \ + --replace '-F/System/Library/Frameworks' "" + ''; + + installPhase = '' + cd ../compile/${arch} + mkdir -p "$out"/{bin,lib,include,share/doc/tachyon,share/tachyon} + cp tachyon "$out"/bin + cp libtachyon.* "$out/lib" + cd ../.. + cp src/*.h "$out/include/" + cp Changes Copyright README "$out/share/doc/tachyon" + cp -r scenes "$out/share/tachyon/scenes" + ''; + meta = { + description = "Parallel / Multiprocessor Ray Tracing System"; + mainProgram = "tachyon"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.raskin ]; + platforms = with lib.platforms; linux ++ cygwin ++ darwin; + homepage = "http://jedi.ks.uiuc.edu/~johns/tachyon/"; + }; +} diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix new file mode 100644 index 000000000000..f0babd818ed2 --- /dev/null +++ b/pkgs/by-name/ta/tageditor/package.nix @@ -0,0 +1,58 @@ +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + cmake, + cpp-utilities, + mp4v2, + libid3tag, + libsForQt5, + qt5, + tagparser, +}: + +stdenv.mkDerivation rec { + pname = "tageditor"; + version = "3.9.5"; + + src = fetchFromGitHub { + owner = "martchus"; + repo = "tageditor"; + tag = "v${version}"; + hash = "sha256-Sia6Y/V81WQj4oWjZAAR4o3TngfWq7sWxxiKEuFjQ2M="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + mp4v2 + libid3tag + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtwebengine + cpp-utilities + libsForQt5.qtutilities + tagparser + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/*.app $out/Applications + ln -s $out/Applications/tageditor.app/Contents/MacOS/tageditor $out/bin/tageditor + ''; + + meta = { + homepage = "https://github.com/Martchus/tageditor"; + description = "Tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska"; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.matthiasbeyer ]; + platforms = lib.platforms.unix; + mainProgram = "tageditor"; + }; +} diff --git a/pkgs/by-name/ta/tagparser/package.nix b/pkgs/by-name/ta/tagparser/package.nix index 6910a8f1900d..5bd6c959a538 100644 --- a/pkgs/by-name/ta/tagparser/package.nix +++ b/pkgs/by-name/ta/tagparser/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "12.4.0"; + version = "12.5.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-wVdE1lgSQsH4g10/lxa8bZlYT141Vd7gRhefxyz8kRM="; + hash = "sha256-Xu6pvqyBWew3xD0nD5k7QKUOEpDchF1FiuSN7oHfYME="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix index 4b502245a003..e91844da2856 100644 --- a/pkgs/by-name/ta/tail-tray/package.nix +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, davfs2, cmake, + extra-cmake-modules, stdenv, pkg-config, kdePackages, @@ -10,25 +11,32 @@ stdenv.mkDerivation rec { pname = "tail-tray"; - version = "0.2.19"; + version = "0.2.22"; src = fetchFromGitHub { owner = "SneWs"; repo = "tail-tray"; tag = "v${version}"; - sha256 = "sha256-33BJknkX4gyR8AlyTX3fQX/P/4xd0iXlzX9ld0Lbpis="; + sha256 = "sha256-1tYuZBJFIGwub3wJR/Ms1Dybhn3KMzKYrpgzZEXwqWU="; }; nativeBuildInputs = with kdePackages; [ wrapQtAppsHook qttools cmake + extra-cmake-modules pkg-config ]; buildInputs = with kdePackages; [ qtbase davfs2 + knotifyconfig + ]; + + cmakeFlags = [ + "-DKNOTIFICATIONS_ENABLED=ON" + "-DDAVFS_ENABLED=ON" ]; patches = [ @@ -39,6 +47,7 @@ stdenv.mkDerivation rec { description = "Tray icon to manage Tailscale"; homepage = "https://github.com/SneWs/tail-tray"; changelog = "https://github.com/SneWs/tail-tray/releases/tag/${version}"; + mainProgram = "tail-tray"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ Svenum ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix index 89b945f6f7e3..16af27b5ef26 100644 --- a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix +++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix @@ -32,6 +32,6 @@ buildGo124Module { description = "Allows users to use a GitOps flow for managing Tailscale ACLs"; license = licenses.bsd3; mainProgram = "gitops-pusher"; - maintainers = teams.cyberus.members; + teams = [ teams.cyberus ]; }; } diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 40d1d302c0dd..d3c6b78cc1d8 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ }: let - version = "1.82.0"; + version = "1.82.5"; in buildGoModule { pname = "tailscale"; @@ -39,7 +39,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-/8MJE1Io0MRSUXiFirYDn6FH2qkWQHE7Fl3nJLjieDw="; + hash = "sha256-BFitj8A+TfNKTyXBB1YhsEs5NvLUfgJ2IbjB2ipf4xU="; }; vendorHash = "sha256-SiUkN6BQK1IQmLfkfPetzvYqRu9ENK6+6txtGxegF5Y="; @@ -60,6 +60,7 @@ buildGoModule { "cmd/derpprobe" "cmd/tailscaled" "cmd/tsidp" + "cmd/get-authkey" ]; excludedPackages = [ @@ -134,6 +135,12 @@ buildGoModule { # test for a dev util which helps to fork golang.org/x/crypto/acme # not necessary and fails to match "TestSyncedToUpstream" # tempfork/acme + + # flaky: https://github.com/tailscale/tailscale/issues/7030 + "TestConcurrent" + + # flaky: https://github.com/tailscale/tailscale/issues/11762 + "TestTwoDevicePing" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # syscall default route interface en0 differs from netstat diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index 287908ce87fe..2a3d43c70141 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - nodejs_23, + nodejs_latest, pnpm_9, cacert, }: @@ -33,12 +33,12 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - nodejs_23 + nodejs_latest pnpm_9.configHook ]; buildInputs = [ - nodejs_23 + nodejs_latest ]; pnpmWorkspaces = [ "@tailwindcss/language-server..." ]; diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index 12b37a768b44..c7a31b4ba1a1 100644 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ b/pkgs/by-name/ta/tailwindcss_4/package.nix @@ -7,7 +7,7 @@ makeWrapper, }: let - version = "4.1.2"; + version = "4.1.7"; inherit (stdenv.hostPlatform) system; throwSystem = throw "tailwindcss has not been packaged for ${system} yet."; @@ -22,10 +22,10 @@ let hash = { - aarch64-darwin = "sha256-6kR+iOsfIeHvNRdLP72Mv8nKkCN877dcKl1FNG4ij/A="; - aarch64-linux = "sha256-m6uFYOQ4P52WhA73/ZAZxt3hAnq+xhreueDoXOOKF88="; - x86_64-darwin = "sha256-6C12gk9WnGP5nhSBBZT2q8SoCCdyOHCszHtAQi1d+0A="; - x86_64-linux = "sha256-2g+J98RrSheoUp1LJCzFa1mivMoVLFpQPSAOV8eA8Gw="; + aarch64-darwin = "sha256-CjzOBmhnEW0c+V6utNKPROhAOx1ql2vG8S4G1hT6Wdo="; + aarch64-linux = "sha256-jEGaZiGW8FcmVRrQBr2DQfR7i+344MtlFofZrjwK4GY="; + x86_64-darwin = "sha256-TN7TKW561j9qvgadL/P/cQhhum1lCrsjNglhxgz9GSw="; + x86_64-linux = "sha256-BwYpKTWpdzxsh54X0jYlMi5EkOfo96CtDmiPquTe+YE="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/ta/tailwindcss_4/update.sh b/pkgs/by-name/ta/tailwindcss_4/update.sh index 4de30bbb3bc6..dbb5912c3437 100755 --- a/pkgs/by-name/ta/tailwindcss_4/update.sh +++ b/pkgs/by-name/ta/tailwindcss_4/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused gawk nix-prefetch common-updater-scripts jq +#!nix-shell -i bash -p curl gnused gawk nix-prefetch common-updater-scripts jq ripgrep set -euo pipefail diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix index ac4dbb58a009..5e43f0426b9d 100644 --- a/pkgs/by-name/ta/taizen/package.nix +++ b/pkgs/by-name/ta/taizen/package.nix @@ -6,8 +6,6 @@ pkg-config, ncurses, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -35,14 +33,10 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - ncurses - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + ncurses + openssl + ]; meta = with lib; { description = "curses based mediawiki browser"; diff --git a/pkgs/by-name/ta/talecast/package.nix b/pkgs/by-name/ta/talecast/package.nix index 9d304d75d517..1b42df36c220 100644 --- a/pkgs/by-name/ta/talecast/package.nix +++ b/pkgs/by-name/ta/talecast/package.nix @@ -1,12 +1,10 @@ { lib, fetchCrate, - darwin, rustPlatform, pkg-config, openssl, nix-update-script, - stdenv, testers, talecast, }: @@ -27,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ta/taler-depolymerization/package.nix b/pkgs/by-name/ta/taler-depolymerization/package.nix index 5874223a44f0..544ce7aaa895 100644 --- a/pkgs/by-name/ta/taler-depolymerization/package.nix +++ b/pkgs/by-name/ta/taler-depolymerization/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchgit, - stdenv, - darwin, }: rustPlatform.buildRustPackage { pname = "taler-depolymerization"; @@ -36,19 +34,10 @@ rustPlatform.buildRustPackage { cp docs/*.conf $out/share/examples ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - SystemConfiguration - ] - ); - meta = { description = "Wire gateway for Bitcoin/Ethereum"; homepage = "https://git.taler.net/depolymerization.git/"; license = lib.licenses.agpl3Only; - maintainers = lib.teams.ngi.members; + teams = [ lib.teams.ngi ]; }; } diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix index d9be94b66252..090db22e04ca 100644 --- a/pkgs/by-name/ta/taler-exchange/package.nix +++ b/pkgs/by-name/ta/taler-exchange/package.nix @@ -18,6 +18,7 @@ jq, gettext, texinfo, + libtool, }: stdenv.mkDerivation (finalAttrs: { @@ -35,7 +36,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook + recutils # recfix pkg-config + python3.pkgs.jinja2 + texinfo # makeinfo + # jq is necessary for some tests and is checked by configure script + jq ]; buildInputs = [ @@ -44,16 +50,14 @@ stdenv.mkDerivation (finalAttrs: { jansson libsodium libpq + libtool curl - recutils gettext - texinfo # Fix 'makeinfo' is missing on your system. libunistring - python3.pkgs.jinja2 - # jq is necessary for some tests and is checked by configure script - jq ]; + strictDeps = true; + propagatedBuildInputs = [ gnunet ]; # From ./bootstrap @@ -90,6 +94,10 @@ stdenv.mkDerivation (finalAttrs: { popd ''; + configureFlags = [ + "ac_cv_path__libcurl_config=${lib.getDev curl}/bin/curl-config" + ]; + enableParallelBuilding = true; doInstallCheck = true; diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix index c144c8a607b6..4372de34d697 100644 --- a/pkgs/by-name/ta/taler-merchant/package.nix +++ b/pkgs/by-name/ta/taler-merchant/package.nix @@ -11,6 +11,9 @@ autoreconfHook, makeWrapper, jq, + libgcrypt, + texinfo, + curl, }: stdenv.mkDerivation (finalAttrs: { @@ -42,6 +45,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config autoreconfHook makeWrapper + libgcrypt # AM_PATH_LIBGCRYPT + texinfo # makeinfo ]; buildInputs = taler-exchange.buildInputs ++ [ @@ -51,6 +56,8 @@ stdenv.mkDerivation (finalAttrs: { libtool ]; + strictDeps = true; + propagatedBuildInputs = [ gnunet ]; # From ./bootstrap @@ -62,6 +69,10 @@ stdenv.mkDerivation (finalAttrs: { popd ''; + configureFlags = [ + "ac_cv_path__libcurl_config=${lib.getDev curl}/bin/curl-config" + ]; + # NOTE: The executables that need database access fail to detect the # postgresql library in `$out/lib/taler`, so we need to wrap them. postInstall = '' diff --git a/pkgs/by-name/ta/taler-twister/package.nix b/pkgs/by-name/ta/taler-twister/package.nix new file mode 100644 index 000000000000..0183ab9405cd --- /dev/null +++ b/pkgs/by-name/ta/taler-twister/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + pkg-config, + curl, + gnunet, + jansson, + libgcrypt, + libmicrohttpd, + libsodium, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "taler-twister"; + version = "1.0.0"; + + src = fetchgit { + url = "https://git.taler.net/twister.git"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ir+kU9bCWwhqR88hmNHB5cm1DXOQowI5y6GdhWpX/L0="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + curl + gnunet + jansson + libgcrypt + libmicrohttpd + libsodium + ]; + + doInstallCheck = true; + + meta = { + homepage = "https://git.taler.net/twister.git"; + description = "Fault injector for HTTP traffic"; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ ]; + license = lib.licenses.agpl3Plus; + mainProgram = "twister"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index ee0744f777c9..815f77cbae09 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -101,8 +101,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://git.taler.net/wallet-core.git/"; description = "CLI wallet for GNU Taler written in TypeScript and Anastasis Web UI"; license = lib.licenses.gpl3Plus; - maintainers = lib.teams.ngi.members; + teams = [ lib.teams.ngi ]; platforms = lib.platforms.linux; mainProgram = "taler-wallet-cli"; + # ./configure doesn't understand --build / --host + broken = stdenv.buildPlatform != stdenv.hostPlatform; }; }) diff --git a/pkgs/by-name/ta/tali/package.nix b/pkgs/by-name/ta/tali/package.nix index b84c123862fb..475b45b7c95f 100644 --- a/pkgs/by-name/ta/tali/package.nix +++ b/pkgs/by-name/ta/tali/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/GNOME/tali/-/blob/${version}/NEWS?ref_type=tags"; description = "Sort of poker with dice and less money"; mainProgram = "tali"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix index 82b2756839c5..37ce00ca4bad 100644 --- a/pkgs/by-name/ta/talosctl/package.nix +++ b/pkgs/by-name/ta/talosctl/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.9.5"; + version = "1.10.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; tag = "v${version}"; - hash = "sha256-2YKZfW62yOA8uV3bn6at/9YV3OHjiMuqA1SUupyAAx4="; + hash = "sha256-szu/tr97T9pBFmw/D9muh3KAP/yN9rk7DvyscAw3gIQ="; }; - vendorHash = "sha256-f2hOAF746nMAZe1KEopdpFHfRMEZQdy4VoVUi49CBJo="; + vendorHash = "sha256-i+lUT/+ICqojOZo08uNfP7CFZM7eeZ9s5v6qL/pZUho="; ldflags = [ "-s" @@ -41,7 +41,7 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; meta = with lib; { description = "CLI for out-of-band management of Kubernetes nodes created by Talos"; diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index 6fe5d1f00675..8fe1a292e727 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -62,7 +62,7 @@ let stdenv.cc.cc stdenv.cc.libc ]; - version = "1.0.24"; + version = "1.0.30"; in stdenv.mkDerivation { pname = "tana"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb"; - hash = "sha256-K3hJD42CWD+yQwbbzysMg2QD9RCw52h1mOV5lTO9CLc="; + hash = "sha256-GKRfiVKUrMr6d4ZA/FAfHnyCzyYnIwhrAwKS7HvJU1U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tandoor-recipes/package.nix b/pkgs/by-name/ta/tandoor-recipes/package.nix index 8e7e30985e83..19da7136ab1e 100644 --- a/pkgs/by-name/ta/tandoor-recipes/package.nix +++ b/pkgs/by-name/ta/tandoor-recipes/package.nix @@ -22,6 +22,11 @@ python.pkgs.buildPythonPackage { ]; postPatch = '' + # high parallelism let the tests easily fail with concurrent errors + if (( $NIX_BUILD_CORES > 4)); then + NIX_BUILD_CORES=4 + fi + substituteInPlace pytest.ini --subst-var NIX_BUILD_CORES ''; @@ -121,7 +126,7 @@ python.pkgs.buildPythonPackage { mock pytestCheckHook pytest-asyncio - pytest-cov + pytest-cov-stub pytest-django pytest-factoryboy pytest-html diff --git a/pkgs/by-name/ta/tangerine/package.nix b/pkgs/by-name/ta/tangerine/package.nix index 933114e62d7d..a9e249ac2a60 100644 --- a/pkgs/by-name/ta/tangerine/package.nix +++ b/pkgs/by-name/ta/tangerine/package.nix @@ -6,6 +6,8 @@ cmake, ncurses, SDL2, + libGL, + libX11, }: stdenv.mkDerivation { @@ -31,6 +33,8 @@ stdenv.mkDerivation { buildInputs = [ ncurses SDL2 + libGL + libX11 ]; meta = with lib; { diff --git a/pkgs/by-name/ta/tangram/package.nix b/pkgs/by-name/ta/tangram/package.nix index 60dfcae1a73f..07d98d5887d9 100644 --- a/pkgs/by-name/ta/tangram/package.nix +++ b/pkgs/by-name/ta/tangram/package.nix @@ -94,12 +94,10 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sonnyp/Tangram"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = - with maintainers; - [ - austinbutler - chuangzhu - ] - ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ + austinbutler + chuangzhu + ]; + teams = [ lib.teams.gnome-circle ]; }; } diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix index 2256bdffd70c..0dda8eec080c 100644 --- a/pkgs/by-name/ta/tanka/package.nix +++ b/pkgs/by-name/ta/tanka/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.31.3"; + version = "0.32.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MaWO9I2+xHA+55tUSQ91yJ7suubnWP4V7JxZTruN1A0="; + sha256 = "sha256-+875PMDATNarFhnAhpi9QxBNgV9irrjRWd/hHsqlH+c="; }; - vendorHash = "sha256-jTvKNl0L+Dl3u5qHQg0R/rtNtLljLoIvciXYKRe/zNg="; + vendorHash = "sha256-pgtkTpEnRBjao/78Zc8qVJXZGRmKbO5wIy/7G4y0DgU="; doCheck = false; # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK diff --git a/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch index 9b974186d55b..50fa59c32807 100644 --- a/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch +++ b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch @@ -1,12 +1,12 @@ diff --git a/rust/Cargo.lock b/rust/Cargo.lock new file mode 100644 -index 0000000..942397e +index 0000000..7cb3275 --- /dev/null +++ b/rust/Cargo.lock -@@ -0,0 +1,1609 @@ +@@ -0,0 +1,1762 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "adler32" @@ -23,7 +23,7 @@ index 0000000..942397e + "cfg-if", + "once_cell", + "version_check", -+ "zerocopy", ++ "zerocopy 0.7.35", +] + +[[package]] @@ -82,11 +82,12 @@ index 0000000..942397e + +[[package]] +name = "anstyle-wincon" -+version = "3.0.6" ++version = "3.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" ++checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +dependencies = [ + "anstyle", ++ "once_cell", + "windows-sys 0.59.0", +] + @@ -98,13 +99,13 @@ index 0000000..942397e + +[[package]] +name = "async-trait" -+version = "0.1.83" ++version = "0.1.88" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" ++checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", +] + +[[package]] @@ -121,9 +122,9 @@ index 0000000..942397e + +[[package]] +name = "bitflags" -+version = "2.6.0" ++version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" ++checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" + +[[package]] +name = "bitpacking" @@ -135,10 +136,29 @@ index 0000000..942397e +] + +[[package]] -+name = "bumpalo" -+version = "3.16.0" ++name = "bon" ++version = "3.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" ++checksum = "94054366e2ff97b455acdd4fdb03913f717febc57b7bbd1741b2c3b87efae030" ++dependencies = [ ++ "bon-macros", ++ "rustversion", ++] ++ ++[[package]] ++name = "bon-macros" ++version = "3.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "542a990e676ce0a0a895ae54b2d94afd012434f2228a85b186c6bc1a7056cdc6" ++dependencies = [ ++ "darling", ++ "ident_case", ++ "prettyplease", ++ "proc-macro2", ++ "quote", ++ "rustversion", ++ "syn 2.0.100", ++] + +[[package]] +name = "byteorder" @@ -148,9 +168,9 @@ index 0000000..942397e + +[[package]] +name = "cbindgen" -+version = "0.27.0" ++version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" ++checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff" +dependencies = [ + "clap", + "heck", @@ -160,16 +180,16 @@ index 0000000..942397e + "quote", + "serde", + "serde_json", -+ "syn 2.0.93", ++ "syn 2.0.100", + "tempfile", + "toml", +] + +[[package]] +name = "cc" -+version = "1.2.6" ++version = "1.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333" ++checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" +dependencies = [ + "jobserver", + "libc", @@ -199,18 +219,18 @@ index 0000000..942397e + +[[package]] +name = "clap" -+version = "4.5.23" ++version = "4.5.36" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" ++checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" -+version = "4.5.23" ++version = "4.5.36" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" ++checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" +dependencies = [ + "anstream", + "anstyle", @@ -250,9 +270,9 @@ index 0000000..942397e + +[[package]] +name = "crossbeam-channel" -+version = "0.5.14" ++version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" ++checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] @@ -289,6 +309,41 @@ index 0000000..942397e +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] ++name = "darling" ++version = "0.20.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" ++dependencies = [ ++ "darling_core", ++ "darling_macro", ++] ++ ++[[package]] ++name = "darling_core" ++version = "0.20.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" ++dependencies = [ ++ "fnv", ++ "ident_case", ++ "proc-macro2", ++ "quote", ++ "strsim", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "darling_macro" ++version = "0.20.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" ++dependencies = [ ++ "darling_core", ++ "quote", ++ "syn 2.0.100", ++] ++ ++[[package]] +name = "dary_heap" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -296,9 +351,9 @@ index 0000000..942397e + +[[package]] +name = "deranged" -+version = "0.3.11" ++version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +dependencies = [ + "powerfmt", + "serde", @@ -306,15 +361,15 @@ index 0000000..942397e + +[[package]] +name = "downcast-rs" -+version = "1.2.1" ++version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" ++checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf" + +[[package]] +name = "either" -+version = "1.13.0" ++version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" ++checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "env_filter" @@ -328,28 +383,28 @@ index 0000000..942397e + +[[package]] +name = "env_logger" -+version = "0.11.6" ++version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" ++checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", -+ "humantime", ++ "jiff", + "log", +] + +[[package]] +name = "equivalent" -+version = "1.0.1" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" ++checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" -+version = "0.3.10" ++version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" ++checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +dependencies = [ + "libc", + "windows-sys 0.59.0", @@ -375,9 +430,9 @@ index 0000000..942397e + +[[package]] +name = "foldhash" -+version = "0.1.4" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" ++checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "fs4" @@ -385,11 +440,48 @@ index 0000000..942397e +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" +dependencies = [ -+ "rustix", ++ "rustix 0.38.44", + "windows-sys 0.52.0", +] + +[[package]] ++name = "futures-core" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "futures-task" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" ++dependencies = [ ++ "futures-core", ++ "futures-macro", ++ "futures-task", ++ "pin-project-lite", ++ "pin-utils", ++ "slab", ++] ++ ++[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -406,7 +498,19 @@ index 0000000..942397e +dependencies = [ + "cfg-if", + "libc", -+ "wasi", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "r-efi", ++ "wasi 0.14.2+wasi-0.2.4", +] + +[[package]] @@ -437,22 +541,25 @@ index 0000000..942397e +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] -+name = "hermit-abi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" -+ -+[[package]] +name = "htmlescape" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" + +[[package]] -+name = "humantime" -+version = "2.1.0" ++name = "hyperloglogplus" ++version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" ++checksum = "621debdf94dcac33e50475fdd76d34d5ea9c0362a834b9db08c3024696c1fbe3" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "ident_case" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "include-flate" @@ -474,32 +581,20 @@ index 0000000..942397e + "libflate", + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", +] + +[[package]] +name = "indexmap" -+version = "2.7.0" ++version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" ++checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +dependencies = [ + "equivalent", + "hashbrown 0.15.2", +] + +[[package]] -+name = "instant" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -+dependencies = [ -+ "cfg-if", -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -507,18 +602,18 @@ index 0000000..942397e + +[[package]] +name = "itertools" -+version = "0.12.1" ++version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" ++checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" -+version = "1.0.14" ++version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" ++checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jieba-macros" @@ -531,9 +626,9 @@ index 0000000..942397e + +[[package]] +name = "jieba-rs" -+version = "0.7.1" ++version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a77d0ae8831f870c4f6ffce310f708b5273ea2e7a88e6af770a10d1b4876311" ++checksum = "6d1bcad6332969e4d48ee568d430e14ee6dea70740c2549d005d87677ebefb0c" +dependencies = [ + "cedarwood", + "fxhash", @@ -545,22 +640,37 @@ index 0000000..942397e +] + +[[package]] -+name = "jobserver" -+version = "0.1.32" ++name = "jiff" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" ++checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0" +dependencies = [ -+ "libc", ++ "jiff-static", ++ "log", ++ "portable-atomic", ++ "portable-atomic-util", ++ "serde", +] + +[[package]] -+name = "js-sys" -+version = "0.3.76" ++name = "jiff-static" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" ++checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605" +dependencies = [ -+ "once_cell", -+ "wasm-bindgen", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "jobserver" ++version = "0.1.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" ++dependencies = [ ++ "getrandom 0.3.2", ++ "libc", +] + +[[package]] @@ -577,9 +687,9 @@ index 0000000..942397e + +[[package]] +name = "libc" -+version = "0.2.169" ++version = "0.2.172" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" ++checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + +[[package]] +name = "libflate" @@ -613,15 +723,21 @@ index 0000000..942397e + +[[package]] +name = "linux-raw-sys" -+version = "0.4.14" ++version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" ++checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" ++ ++[[package]] ++name = "linux-raw-sys" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + +[[package]] +name = "log" -+version = "0.4.22" ++version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" ++checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "logcall" @@ -632,7 +748,7 @@ index 0000000..942397e + "proc-macro-error", + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", +] + +[[package]] @@ -652,11 +768,10 @@ index 0000000..942397e + +[[package]] +name = "measure_time" -+version = "0.8.3" ++version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc" ++checksum = "51c55d61e72fc3ab704396c5fa16f4c184db37978ae4e94ca8959693a235fc0e" +dependencies = [ -+ "instant", + "log", +] + @@ -714,50 +829,40 @@ index 0000000..942397e +] + +[[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.20.2" ++version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" ++checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "oneshot" -+version = "0.1.8" ++version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29" ++checksum = "b4ce411919553d3f9fa53a0880544cda985a112117a0444d5ff1e870a893d6ea" + +[[package]] +name = "ownedbytes" +version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3a059efb063b8f425b948e042e6b9bd85edfe60e913630ed727b23e2dfcc558" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "phf" -+version = "0.11.2" ++version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" ++checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ ++ "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_codegen" -+version = "0.11.2" ++version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" ++checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +dependencies = [ + "phf_generator", + "phf_shared", @@ -765,28 +870,68 @@ index 0000000..942397e + +[[package]] +name = "phf_generator" -+version = "0.11.2" ++version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" ++checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] -+name = "phf_shared" -+version = "0.11.2" ++name = "phf_macros" ++version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" ++checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" ++dependencies = [ ++ "phf_generator", ++ "phf_shared", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.11.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher", +] + +[[package]] -+name = "pkg-config" -+version = "0.3.31" ++name = "pin-project-lite" ++version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" ++checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" ++ ++[[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.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" ++ ++[[package]] ++name = "portable-atomic" ++version = "1.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" ++ ++[[package]] ++name = "portable-atomic-util" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" ++dependencies = [ ++ "portable-atomic", ++] + +[[package]] +name = "powerfmt" @@ -796,11 +941,21 @@ index 0000000..942397e + +[[package]] +name = "ppv-lite86" -+version = "0.2.20" ++version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" ++checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ -+ "zerocopy", ++ "zerocopy 0.8.24", ++] ++ ++[[package]] ++name = "prettyplease" ++version = "0.2.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" ++dependencies = [ ++ "proc-macro2", ++ "syn 2.0.100", +] + +[[package]] @@ -829,23 +984,29 @@ index 0000000..942397e + +[[package]] +name = "proc-macro2" -+version = "1.0.92" ++version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" ++checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" -+version = "1.0.38" ++version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" ++checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] ++name = "r-efi" ++version = "5.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" ++ ++[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -872,7 +1033,7 @@ index 0000000..942397e +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ -+ "getrandom", ++ "getrandom 0.2.15", +] + +[[package]] @@ -943,63 +1104,77 @@ index 0000000..942397e +[[package]] +name = "rust-stemmers" +version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" -+dependencies = [ -+ "serde", -+ "serde_derive", -+] ++source = "git+https://github.com/silver-ymz/rust-stemmers.git?rev=51696378e352688b7ffd4fface615370ff5e8768#51696378e352688b7ffd4fface615370ff5e8768" + +[[package]] +name = "rustc-hash" -+version = "1.1.0" ++version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" ++checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustix" -+version = "0.38.42" ++version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" ++checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags", + "errno", + "libc", -+ "linux-raw-sys", ++ "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] -+name = "ryu" -+version = "1.0.18" ++name = "rustix" ++version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" ++checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" ++dependencies = [ ++ "bitflags", ++ "errno", ++ "libc", ++ "linux-raw-sys 0.9.4", ++ "windows-sys 0.59.0", ++] ++ ++[[package]] ++name = "rustversion" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" ++ ++[[package]] ++name = "ryu" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "serde" -+version = "1.0.217" ++version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" ++checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.217" ++version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" ++checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", +] + +[[package]] +name = "serde_json" -+version = "1.0.134" ++version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" ++checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +dependencies = [ + "itoa", + "memchr", @@ -1024,24 +1199,33 @@ index 0000000..942397e + +[[package]] +name = "siphasher" -+version = "0.3.11" ++version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" ++checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "sketches-ddsketch" -+version = "0.2.2" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" ++checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" +dependencies = [ + "serde", +] + +[[package]] -+name = "smallvec" -+version = "1.13.2" ++name = "slab" ++version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" ++checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "smallvec" ++version = "1.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" + +[[package]] +name = "stable_deref_trait" @@ -1067,9 +1251,9 @@ index 0000000..942397e + +[[package]] +name = "syn" -+version = "2.0.93" ++version = "2.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058" ++checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +dependencies = [ + "proc-macro2", + "quote", @@ -1078,14 +1262,14 @@ index 0000000..942397e + +[[package]] +name = "tantivy" -+version = "0.22.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8d0582f186c0a6d55655d24543f15e43607299425c5ad8352c242b914b31856" ++version = "0.23.0" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "aho-corasick", + "arc-swap", + "base64", + "bitpacking", ++ "bon", + "byteorder", + "census", + "crc32fast", @@ -1095,6 +1279,7 @@ index 0000000..942397e + "fnv", + "fs4", + "htmlescape", ++ "hyperloglogplus", + "itertools", + "levenshtein_automata", + "log", @@ -1102,7 +1287,6 @@ index 0000000..942397e + "lz4_flex", + "measure_time", + "memmap2", -+ "num_cpus", + "once_cell", + "oneshot", + "rayon", @@ -1130,8 +1314,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-bitpacker" +version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "284899c2325d6832203ac6ff5891b297fc5239c3dc754c5bc1977855b23c10df" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "bitpacking", +] @@ -1139,8 +1322,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-columnar" +version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12722224ffbe346c7fec3275c699e508fd0d4710e629e933d5736ec524a1f44e" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "downcast-rs", + "fastdivide", @@ -1155,8 +1337,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-common" +version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8019e3cabcfd20a1380b491e13ff42f57bb38bf97c3d5fa5c07e50816e0621f4" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "async-trait", + "byteorder", @@ -1178,13 +1359,15 @@ index 0000000..942397e + +[[package]] +name = "tantivy-go" -+version = "0.2.0" ++version = "1.0.0" +dependencies = [ + "cbindgen", ++ "crunchy", + "env_logger", + "lazy_static", + "log", + "logcall", ++ "phf", + "serde", + "serde_json", + "tantivy", @@ -1195,8 +1378,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-jieba" +version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0f2fe65c125f0d76d06f0f2ce9fbb9287b53f0dafb51a6270d984a840e2f16c1" ++source = "git+https://github.com/anyproto/tantivy-jieba.git?rev=ca11d3153b8844cbc43cd243667e03f56f6d1e18#ca11d3153b8844cbc43cd243667e03f56f6d1e18" +dependencies = [ + "jieba-rs", + "lazy_static", @@ -1206,8 +1388,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-query-grammar" +version = "0.22.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "847434d4af57b32e309f4ab1b4f1707a6c566656264caa427ff4285c4d9d0b82" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "nom", +] @@ -1215,9 +1396,10 @@ index 0000000..942397e +[[package]] +name = "tantivy-sstable" +version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c69578242e8e9fc989119f522ba5b49a38ac20f576fc778035b96cc94f41f98e" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ ++ "futures-util", ++ "itertools", + "tantivy-bitpacker", + "tantivy-common", + "tantivy-fst", @@ -1227,8 +1409,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-stacker" +version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c56d6ff5591fc332739b3ce7035b57995a3ce29a93ffd6012660e0949c956ea8" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "murmurhash32", + "rand_distr", @@ -1238,50 +1419,49 @@ index 0000000..942397e +[[package]] +name = "tantivy-tokenizer-api" +version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a0dcade25819a89cfe6f17d932c9cedff11989936bf6dd4f336d50392053b04" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "serde", +] + +[[package]] +name = "tempfile" -+version = "3.14.0" ++version = "3.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" ++checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" +dependencies = [ -+ "cfg-if", + "fastrand", ++ "getrandom 0.3.2", + "once_cell", -+ "rustix", ++ "rustix 1.0.5", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" -+version = "1.0.69" ++version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" ++checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.69" ++version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" ++checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", +] + +[[package]] +name = "time" -+version = "0.3.37" ++version = "0.3.41" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" ++checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +dependencies = [ + "deranged", + "itoa", @@ -1294,15 +1474,15 @@ index 0000000..942397e + +[[package]] +name = "time-core" -+version = "0.1.2" ++version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" ++checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" + +[[package]] +name = "time-macros" -+version = "0.2.19" ++version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" ++checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +dependencies = [ + "num-conv", + "time-core", @@ -1310,9 +1490,9 @@ index 0000000..942397e + +[[package]] +name = "toml" -+version = "0.8.19" ++version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" ++checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +dependencies = [ + "serde", + "serde_spanned", @@ -1331,9 +1511,9 @@ index 0000000..942397e + +[[package]] +name = "toml_edit" -+version = "0.22.22" ++version = "0.22.24" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" ++checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +dependencies = [ + "indexmap", + "serde", @@ -1344,9 +1524,9 @@ index 0000000..942397e + +[[package]] +name = "unicode-ident" -+version = "1.0.14" ++version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" ++checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "unicode-segmentation" @@ -1368,11 +1548,11 @@ index 0000000..942397e + +[[package]] +name = "uuid" -+version = "1.11.0" ++version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" ++checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +dependencies = [ -+ "getrandom", ++ "getrandom 0.3.2", + "serde", +] + @@ -1389,67 +1569,12 @@ index 0000000..942397e +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] -+name = "wasm-bindgen" -+version = "0.2.99" ++name = "wasi" ++version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" ++checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ -+ "cfg-if", -+ "once_cell", -+ "wasm-bindgen-macro", -+] -+ -+[[package]] -+name = "wasm-bindgen-backend" -+version = "0.2.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" -+dependencies = [ -+ "bumpalo", -+ "log", -+ "proc-macro2", -+ "quote", -+ "syn 2.0.93", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro" -+version = "0.2.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" -+dependencies = [ -+ "quote", -+ "wasm-bindgen-macro-support", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro-support" -+version = "0.2.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.93", -+ "wasm-bindgen-backend", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-shared" -+version = "0.2.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" -+ -+[[package]] -+name = "web-sys" -+version = "0.3.76" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", ++ "wit-bindgen-rt", +] + +[[package]] @@ -1558,21 +1683,38 @@ index 0000000..942397e + +[[package]] +name = "winnow" -+version = "0.6.20" ++version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" ++checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" +dependencies = [ + "memchr", +] + +[[package]] ++name = "wit-bindgen-rt" ++version = "0.39.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ -+ "byteorder", -+ "zerocopy-derive", ++ "zerocopy-derive 0.7.35", ++] ++ ++[[package]] ++name = "zerocopy" ++version = "0.8.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" ++dependencies = [ ++ "zerocopy-derive 0.8.24", +] + +[[package]] @@ -1583,33 +1725,47 @@ index 0000000..942397e +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "zerocopy-derive" ++version = "0.8.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", +] + +[[package]] +name = "zstd" -+version = "0.13.2" ++version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" ++checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" -+version = "7.2.1" ++version = "7.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" ++checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" -+version = "2.0.13+zstd.1.5.6" ++version = "2.0.15+zstd.1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" ++checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" +dependencies = [ + "cc", + "pkg-config", +] +-- +2.48.1 + diff --git a/pkgs/by-name/ta/tantivy-go/package.nix b/pkgs/by-name/ta/tantivy-go/package.nix index 53cbb9e75085..0f839fdce3cf 100644 --- a/pkgs/by-name/ta/tantivy-go/package.nix +++ b/pkgs/by-name/ta/tantivy-go/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "tantivy-go"; - version = "0.3.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "anyproto"; repo = "tantivy-go"; tag = "v${version}"; - hash = "sha256-IlGtyTjOAvmrbgmvy4NelTOgOWopxNta3INq2QcMEqY="; + hash = "sha256-iTGIm5C7SMBZv2OcKCQCyEZS/eeMJQ5nFSpuFJbTEXU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3+HtZ7SAnvTNXtYlokX/Z9VD1lDw+nh6R/njYOZeGoE="; + cargoHash = "sha256-f8xI4g6MK4NUn0DpxD+miaCzBe8FSSqaL5rpjoqUGfY="; cargoPatches = [ ./add-Cargo.lock.patch diff --git a/pkgs/by-name/ta/taoup/package.nix b/pkgs/by-name/ta/taoup/package.nix index 3243c6a8ca76..6dd95c8ca094 100644 --- a/pkgs/by-name/ta/taoup/package.nix +++ b/pkgs/by-name/ta/taoup/package.nix @@ -11,6 +11,7 @@ let in stdenv.mkDerivation rec { pname = "taoup"; + # nixpkgs-update: no auto update version = "1.1.23"; src = fetchFromGitHub { diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index e748d95922cc..6e00d8f1c2b3 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, openssl, - stdenv, - darwin, withLsp ? true, }: @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; buildFeatures = lib.optional withLsp "lsp"; diff --git a/pkgs/by-name/ta/tar2ext4/package.nix b/pkgs/by-name/ta/tar2ext4/package.nix index c33f25412231..7ca56319f4f4 100644 --- a/pkgs/by-name/ta/tar2ext4/package.nix +++ b/pkgs/by-name/ta/tar2ext4/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.12.8"; + version = "0.13.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-20+y7wFV3HxkrS1qHNq2neIc826HU5AXzuqqS7Ll2gg="; + sha256 = "sha256-/ImyicXRBGclnUEpqygNYhknFYJmRqBqKkz/gNxVLWQ="; }; sourceRoot = "${src.name}/cmd/tar2ext4"; diff --git a/pkgs/development/tools/tarmac/default.nix b/pkgs/by-name/ta/tarmac/package.nix similarity index 100% rename from pkgs/development/tools/tarmac/default.nix rename to pkgs/by-name/ta/tarmac/package.nix diff --git a/pkgs/by-name/ta/tarts/package.nix b/pkgs/by-name/ta/tarts/package.nix new file mode 100644 index 000000000000..e6c8cbb5051b --- /dev/null +++ b/pkgs/by-name/ta/tarts/package.nix @@ -0,0 +1,26 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage { + pname = "tarts"; + version = "0.1.16-unstable-2025-05-04"; + + src = fetchFromGitHub { + owner = "oiwn"; + repo = "tarts"; + rev = "8560a63dda8e5ffd5fdd96a1f7687f8f12d36022"; + hash = "sha256-d06FL0khcI2LUMbrUo3tmQn97pNFIVefPWlxWFSUJ+E="; + }; + + cargoHash = "sha256-DLIBVl7CzhEYjAnkJmLHSlUoXCNos8YPHfSz9rs99/8="; + + meta = { + description = "Screen saves and visual effects for your terminal"; + homepage = "https://github.com/oiwn/tarts"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.awwpotato ]; + mainProgram = "tarts"; + }; +} diff --git a/pkgs/by-name/ta/taskflow/package.nix b/pkgs/by-name/ta/taskflow/package.nix index b445c0f03bc0..8cc90436fbd3 100644 --- a/pkgs/by-name/ta/taskflow/package.nix +++ b/pkgs/by-name/ta/taskflow/package.nix @@ -7,14 +7,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taskflow"; version = "3.9.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-omon02xgf4vV7JzpLFtHgf2MXxR6JowI+pDyAswXMUY="; }; @@ -35,6 +35,11 @@ stdenv.mkDerivation rec { cmake ]; + cmakeFlags = [ + # building the tests implies running them in the buildPhase + (lib.cmakeBool "TF_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + ]; + doCheck = true; meta = { @@ -42,11 +47,11 @@ stdenv.mkDerivation rec { homepage = "https://taskflow.github.io/"; changelog = let - release = lib.replaceStrings [ "." ] [ "-" ] version; + release = lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version; in "https://taskflow.github.io/taskflow/release-${release}.html"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/ta/tauon/install_mode_true.patch b/pkgs/by-name/ta/tauon/install_mode_true.patch new file mode 100644 index 000000000000..e4510e9d2ee1 --- /dev/null +++ b/pkgs/by-name/ta/tauon/install_mode_true.patch @@ -0,0 +1,15 @@ +diff --git a/src/tauon/__main__.py b/src/tauon/__main__.py +index 04691586..e48afa02 100755 +--- a/src/tauon/__main__.py ++++ b/src/tauon/__main__.py +@@ -115,8 +115,8 @@ def transfer_args_and_exit() -> None: + if "--no-start" in sys.argv: + transfer_args_and_exit() + +-# If we're installed, use home data locations +-install_mode = bool(str(install_directory).startswith(("/opt/", "/usr/", "/app/", "/snap/")) or sys.platform in ("darwin", "win32")) ++# Nixpkgs install, use home data dirs. ++install_mode = True + + # Assume that it's a classic Linux install, use standard paths + if str(install_directory).startswith("/usr/") and Path("/usr/share/TauonMusicBox").is_dir(): diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index ec9388a4435b..656a9b158a7c 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchPypi, kissfft, miniaudio, pkg-config, @@ -16,6 +17,7 @@ librsvg, libsamplerate, libvorbis, + xorg, mpg123, opusfile, pango, @@ -26,16 +28,32 @@ withDiscordRPC ? true, }: +let + # fork of pypresence, to be reverted if/when there's an upstream release + lynxpresence = python3Packages.buildPythonPackage rec { + pname = "lynxpresence"; + version = "4.4.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-y/KboyhEGs9RvyKayEIQu2+WaiQNOdsHDl1/pEoqEkQ="; + }; + + doCheck = false; # tests require internet connection + pythonImportsCheck = [ "lynxpresence" ]; + }; +in python3Packages.buildPythonApplication rec { pname = "tauon"; - version = "7.9.0"; + version = "8.0.1"; pyproject = true; src = fetchFromGitHub { owner = "Taiko2k"; repo = "Tauon"; tag = "v${version}"; - hash = "sha256-6aEUniLoE5Qtfht3OAe+zvC9yZwjH+KpskmjGowDuuU="; + hash = "sha256-m94/zdlJu/u/dchIXhqB47bkl6Uej2hVr8R6RNg8Vaw="; }; postUnpack = '' @@ -46,16 +64,16 @@ python3Packages.buildPythonApplication rec { ln -s ${miniaudio.src} source/src/phazor/miniaudio ''; - postPatch = '' - substituteInPlace src/tauon/__main__.py \ - --replace-fail 'install_mode = False' 'install_mode = True' + patches = [ + ./install_mode_true.patch + ]; + postPatch = '' substituteInPlace src/tauon/t_modules/t_phazor.py \ --replace-fail 'base_path = Path(pctl.install_directory).parent.parent / "build"' 'base_path = Path("${placeholder "out"}/${python3Packages.python.sitePackages}")' ''; pythonRemoveDeps = [ - "pysdl2-dll" "opencc" "tekore" ]; @@ -105,23 +123,26 @@ python3Packages.buildPythonApplication rec { pychromecast pylast pygobject3 - pysdl2 + pysdl3 requests send2trash setproctitle tidalapi ] - ++ lib.optional withDiscordRPC pypresence + ++ lib.optional withDiscordRPC lynxpresence ++ lib.optional stdenv.hostPlatform.isLinux pulsectl; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - game-music-emu - libopenmpt - pulseaudio - ] + lib.makeLibraryPath ( + [ + game-music-emu + libopenmpt + pulseaudio + ] + ++ lib.optional stdenv.hostPlatform.isLinux xorg.libXcursor + ) }" "--prefix PYTHONPATH : $out/share/tauon" "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH" diff --git a/pkgs/by-name/ta/taxi/package.nix b/pkgs/by-name/ta/taxi/package.nix index 4eb5e061f089..42f2c7646bc6 100644 --- a/pkgs/by-name/ta/taxi/package.nix +++ b/pkgs/by-name/ta/taxi/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, + desktop-file-utils, fetchFromGitHub, gobject-introspection, - gtk3, - libgee, - libhandy, + gtk4, + libadwaita, libsecret, - libsoup_2_4, + libsoup_3, meson, ninja, nix-update-script, @@ -15,52 +15,48 @@ pkg-config, python3, vala, - wrapGAppsHook3, + wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "taxi"; - version = "2.0.2"; + version = "2.0.2-unstable-2024-12-26"; + # Temporarily disable nixpkgs-update before we have a tagged release. + # nixpkgs-update: no auto update src = fetchFromGitHub { - owner = "Alecaddd"; + owner = "ellie-commons"; repo = "taxi"; - rev = version; - sha256 = "1a4a14b2d5vqbk56drzbbldp0nngfqhwycpyv8d3svi2nchkvpqa"; + rev = "b1c81490641f102005d9451a33d21610c0637e22"; + sha256 = "sha256-boPwRSHzFpbrzRoSmNWf/fgi3cJDEt9qjZHWQWutL+o="; }; nativeBuildInputs = [ + desktop-file-utils gobject-introspection meson ninja pkg-config python3 vala - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ - gtk3 - libgee - libhandy + gtk4 + libadwaita libsecret - libsoup_2_4 - pantheon.granite + libsoup_3 + pantheon.granite7 ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru.updateScript = nix-update-script { }; meta = with lib; { - homepage = "https://github.com/Alecaddd/taxi"; + homepage = "https://github.com/ellie-commons/taxi"; description = "FTP Client that drives you anywhere"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + teams = [ teams.pantheon ]; platforms = platforms.linux; - mainProgram = "com.github.alecaddd.taxi"; + mainProgram = "io.github.ellie_commons.taxi"; }; } diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix index c5b72112fe2d..a36cb0aad6cf 100644 --- a/pkgs/by-name/ta/taze/package.nix +++ b/pkgs/by-name/ta/taze/package.nix @@ -13,18 +13,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taze"; - version = "19.0.2"; + version = "19.1.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "taze"; tag = "v${finalAttrs.version}"; - hash = "sha256-ABmjfB0ovdi+x9Lya4RIZFlesMrY48g/ONmS+dzIn/I="; + hash = "sha256-hBXs8S8mOMV7FQIhCzJuhcbTczkwMc5B44fTacAJvyw="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-lWWf0ipzjjgx0LWx8YKvYBLZW0vEW6RnpZE+xi/bGFc="; + hash = "sha256-aUMV2REINp5LDcj1s8bgQAj/4508UEewu+ebD+JT0+M="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix index 1a94b765c7ef..c2b38588ce33 100644 --- a/pkgs/by-name/tb/tbls/package.nix +++ b/pkgs/by-name/tb/tbls/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.84.1"; + version = "1.85.3"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; tag = "v${version}"; - hash = "sha256-c4LxntQhni6dHbjs0QZLWgioU2GT101x4lDC43buiwk="; + hash = "sha256-07Xx/BoBXCQuZHveH00Wn65POnTpfDx8rfIcbqSoQLg="; }; - vendorHash = "sha256-6b5JYWjJIbZakrOkB1Xgg4HyBBBecN31iutOMZpLeHc="; + vendorHash = "sha256-Sqr5UiT4NNiFKNEqZRDbS92AYa9SKWqYTYl4Ljx/raY="; excludedPackages = [ "scripts/jsonschema" ]; diff --git a/pkgs/by-name/tb/tbox/package.nix b/pkgs/by-name/tb/tbox/package.nix index 54ee57c0b5a0..992e8d95bc72 100644 --- a/pkgs/by-name/tb/tbox/package.nix +++ b/pkgs/by-name/tb/tbox/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tbox"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "tboox"; repo = "tbox"; rev = "v${version}"; - hash = "sha256-cwpZ7F8WzT/46HrckHe0Aug2mxirCkNA68aCxg/FcsE="; + hash = "sha256-piPfPg3NAvP2zhWgtPlNvlAHoqIU77TE/kd1B/6GIuc="; }; configureFlags = [ diff --git a/pkgs/by-name/tb/tbtools/package.nix b/pkgs/by-name/tb/tbtools/package.nix index 211d59c6f58e..1ebe91f58da1 100644 --- a/pkgs/by-name/tb/tbtools/package.nix +++ b/pkgs/by-name/tb/tbtools/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "tbtools"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "intel"; repo = "tbtools"; tag = "v${version}"; - hash = "sha256-zq8q3JaoqWAQUat2gIW0Wimi/tZiC6XDphUVjH0viU4="; + hash = "sha256-xLMnB8KliwHVU5y4L7K0a43gfdhLKFxnAx4wxGL9xMc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SAHIDjELm4qr4whoQVdt3EuNA72qFqXEg3H0hYr7yLc="; + cargoHash = "sha256-QuiDI2/XzhUKF7BGnoKeJ2143keJtmi+8WG1MpulLZo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/tc/tcld/bash_autocomplete b/pkgs/by-name/tc/tcld/bash_autocomplete new file mode 100644 index 000000000000..e4483a0087f6 --- /dev/null +++ b/pkgs/by-name/tc/tcld/bash_autocomplete @@ -0,0 +1,33 @@ +#! /bin/bash +# based on https://github.com/urfave/cli/blob/v2.27.6/autocomplete/bash_autocomplete + +# Macs have bash3 for which the bash-completion package doesn't include +# _init_completion. This is a minimal version of that function. +_cli_init_completion() { + COMPREPLY=() + _get_comp_words_by_ref "$@" cur prev words cword +} + +_cli_bash_autocomplete() { + if [[ "${COMP_WORDS[0]}" != "source" ]]; then + local cur opts base words + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + if declare -F _init_completion >/dev/null 2>&1; then + _init_completion -n "=:" || return + else + _cli_init_completion -n "=:" || return + fi + words=("${words[@]:0:$cword}") + if [[ "$cur" == "-"* ]]; then + requestComp="${words[*]} ${cur} --generate-bash-completion" + else + requestComp="${words[*]} --generate-bash-completion" + fi + opts=$(eval "${requestComp}" 2>/dev/null) + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0 + fi +} + +complete -o bashdefault -o default -o nospace -F _cli_bash_autocomplete tcld diff --git a/pkgs/by-name/tc/tcld/compgen.patch b/pkgs/by-name/tc/tcld/compgen.patch new file mode 100644 index 000000000000..5c9c615dac12 --- /dev/null +++ b/pkgs/by-name/tc/tcld/compgen.patch @@ -0,0 +1,15 @@ +diff --git a/app/app.go b/app/app.go +index 57a9b36fdb..96acf94dc1 100644 +--- a/app/app.go ++++ b/app/app.go +@@ -28,6 +28,7 @@ + EnableDebugLogsFlag, + }, + Commands: params.Commands, ++ EnableBashCompletion: true, + } + + return app, nil +diff --git a/compgen.patch b/compgen.patch +new file mode 100644 +index 0000000000..e69de29bb2 diff --git a/pkgs/by-name/tc/tcld/package.nix b/pkgs/by-name/tc/tcld/package.nix new file mode 100644 index 000000000000..eb2f64dc5c39 --- /dev/null +++ b/pkgs/by-name/tc/tcld/package.nix @@ -0,0 +1,47 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + stdenvNoCC, + installShellFiles, + nix-update-script, + ... +}: + +buildGoModule (finalAttrs: { + pname = "tcld"; + version = "0.40.0"; + src = fetchFromGitHub { + owner = "temporalio"; + repo = "tcld"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-bIJSvop1T3yiLs/LTgFxIMmObfkVfvvnONyY4Bsjj8g="; + }; + vendorHash = "sha256-GOko8nboj7eN4W84dqP3yLD6jK7GA0bANV0Tj+1GpgY="; + ldFlags = [ + "-s" + "-w" + ]; + + # FIXME: Remove after https://github.com/temporalio/tcld/pull/447 lands. + patches = [ ./compgen.patch ]; + + # NOTE: Some tests appear to require (local only?) network access, which + # doesn't work in the sandbox. + __darwinAllowLocalNetworking = true; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd tcld --bash ${./bash_autocomplete} + installShellCompletion --cmd tcld --zsh ${./zsh_autocomplete} + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "The temporal cloud cli."; + homepage = "https://www.github.com/temporalio/tcld"; + license = lib.licenses.mit; + teams = [ lib.teams.mercury ]; + }; +}) diff --git a/pkgs/by-name/tc/tcld/zsh_autocomplete b/pkgs/by-name/tc/tcld/zsh_autocomplete new file mode 100644 index 000000000000..40f8a9b2c763 --- /dev/null +++ b/pkgs/by-name/tc/tcld/zsh_autocomplete @@ -0,0 +1,22 @@ +#compdef $PROG + +## based on https://github.com/urfave/cli/blob/v2.27.6/autocomplete/zsh_autocomplete + +_cli_zsh_autocomplete() { + local -a opts + local cur + cur=${words[-1]} + if [[ "$cur" == "-"* ]]; then + opts=("${(@f)$(${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}") + else + opts=("${(@f)$(${words[@]:0:#words[@]-1} --generate-bash-completion)}") + fi + + if [[ "${opts[1]}" != "" ]]; then + _describe 'values' opts + else + _files + fi +} + +compdef _cli_zsh_autocomplete tcld diff --git a/pkgs/by-name/tc/tcpreplay/package.nix b/pkgs/by-name/tc/tcpreplay/package.nix new file mode 100644 index 000000000000..00a0f7d429a0 --- /dev/null +++ b/pkgs/by-name/tc/tcpreplay/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchurl, + libpcap, + tcpdump, +}: + +stdenv.mkDerivation rec { + pname = "tcpreplay"; + version = "4.5.1"; + + src = fetchurl { + url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; + sha256 = "sha256-Leeb/Wfsksqa4v+1BFbdHVP/QPP6cbQixl6AYgE8noU="; + }; + + buildInputs = [ libpcap ]; + + configureFlags = [ + "--disable-local-libopts" + "--disable-libopts-install" + "--enable-dynamic-link" + "--enable-shared" + "--enable-tcpreplay-edit" + "--with-libpcap=${libpcap}" + "--with-tcpdump=${tcpdump}/bin/tcpdump" + ]; + + meta = with lib; { + description = "Suite of utilities for editing and replaying network traffic"; + homepage = "https://tcpreplay.appneta.com/"; + license = with licenses; [ + bsdOriginalUC + gpl3Only + ]; + maintainers = with maintainers; [ eleanor ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/tc/tcsh/package.nix b/pkgs/by-name/tc/tcsh/package.nix index f5fc4d82cd59..c5a90c61d5a6 100644 --- a/pkgs/by-name/tc/tcsh/package.nix +++ b/pkgs/by-name/tc/tcsh/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tcsh"; - version = "6.24.14"; + version = "6.24.15"; src = fetchurl { url = "mirror://tcsh/tcsh-${finalAttrs.version}.tar.gz"; - hash = "sha256-NogPJYpj/BH+cqZQmLWF68Ts3uJDiLjr7Jfmro5IUxg="; + hash = "sha256-1NCypN8yD1elGORMNZ7za7z4XWT1FG0MuP80mE4NI/0="; }; strictDeps = true; diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix index 35f3d6e88e6e..ff98690c7ed9 100644 --- a/pkgs/by-name/td/tdlib/package.nix +++ b/pkgs/by-name/td/tdlib/package.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { pname = "tdlib"; - version = "1.8.46"; + version = "1.8.47"; src = fetchFromGitHub { owner = "tdlib"; @@ -45,8 +45,8 @@ stdenv.mkDerivation { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "207f3be7b58b2a2b9f0a066b5b6ef18782b8b517"; - hash = "sha256-+cqdRp+J/W1Cyh+TqbglaerN4w3AVGp5NC5JLVK5e3k="; + rev = "a03a90470d6fca9a5a3db747ba3f3e4a465b5fe7"; + hash = "sha256-RS7N+MMie/gNtcvPT4yjE2ymhZCsByS96O9nhiJ/bNY="; }; buildInputs = [ diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index ac52e80b7891..f4e1769e8caf 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -5,26 +5,27 @@ fetchFromGitHub, alsa-utils, copyDesktopItems, - electron_34, + electron_35, makeDesktopItem, makeWrapper, nix-update-script, versionCheckHook, + vulkan-loader, which, }: buildNpmPackage rec { pname = "teams-for-linux"; - version = "1.13.1"; + version = "2.0.13"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-0u5UyhRSa4gsLVQLctWMZe/oE8l9jrwCzkPtLWv2xlo="; + hash = "sha256-xkVJ8PrW2huf3oNVSYySQnzKPadsYFXnrMgi+mFXBQU="; }; - npmDepsHash = "sha256-BHz1+pd88TDfTXtG0gl5kYiDeG/M94pYdpPtwBrBYzQ="; + npmDepsHash = "sha256-jDJH/lAbmUURMkdv49S1KeE4I/MOEzK0ZDWh1sbnzXY="; nativeBuildInputs = [ makeWrapper @@ -39,21 +40,31 @@ buildNpmPackage rec { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; }; - buildPhase = '' - runHook preBuild + makeCacheWritable = true; - cp -r ${electron_34.dist} electron-dist - chmod -R u+w electron-dist + buildPhase = + '' + runHook preBuild - npm exec electron-builder -- \ - --dir \ - -c.npmRebuild=true \ - -c.asarUnpack="**/*.node" \ - -c.electronDist=electron-dist \ - -c.electronVersion=${electron_34.version} + cp -r ${electron_35.dist} electron-dist + chmod -R u+w electron-dist + '' + # Electron builder complains about symlink in electron-dist + + lib.optionalString stdenv.hostPlatform.isLinux '' + rm electron-dist/libvulkan.so.1 + cp ${lib.getLib vulkan-loader}/lib/libvulkan.so.1 electron-dist + '' + + '' - runHook postBuild - ''; + npm exec electron-builder -- \ + --dir \ + -c.npmRebuild=true \ + -c.asarUnpack="**/*.node" \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron_35.version} + + runHook postBuild + ''; installPhase = '' @@ -72,7 +83,7 @@ buildNpmPackage rec { popd # Linux needs 'aplay' for notification sounds - makeWrapper '${lib.getExe electron_34}' "$out/bin/teams-for-linux" \ + makeWrapper '${lib.getExe electron_35}' "$out/bin/teams-for-linux" \ --prefix PATH : ${ lib.makeBinPath [ alsa-utils @@ -109,7 +120,7 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script { }; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Unofficial Microsoft Teams client for Linux"; diff --git a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json index fe51488c7066..9291a64bd73b 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json @@ -1 +1,7 @@ -[] +[ + { + "pname": "BouncyCastle.Cryptography", + "version": "2.5.1", + "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" + } +] diff --git a/pkgs/by-name/te/technitium-dns-server-library/package.nix b/pkgs/by-name/te/technitium-dns-server-library/package.nix index 5645de4321b5..5a66e52496fe 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/package.nix +++ b/pkgs/by-name/te/technitium-dns-server-library/package.nix @@ -7,13 +7,13 @@ }: buildDotnetModule rec { pname = "technitium-dns-server-library"; - version = "dns-server-v13.2"; + version = "dns-server-v13.6.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; tag = version; - hash = "sha256-stfxYe0flE1daPuXw/GAgY52ZD7pkqnBIBvmSVPWWjI="; + hash = "sha256-P1LVn//4xL/MZoy7thw+zYlAZVTfjSivyAiuhixAoHs="; name = "${pname}-${version}"; }; diff --git a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json index fe51488c7066..9291a64bd73b 100644 --- a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json @@ -1 +1,7 @@ -[] +[ + { + "pname": "BouncyCastle.Cryptography", + "version": "2.5.1", + "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" + } +] diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index 60b6090621e4..cc4e589eb38e 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -9,13 +9,13 @@ }: buildDotnetModule rec { pname = "technitium-dns-server"; - version = "13.2"; + version = "13.6.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; tag = "v${version}"; - hash = "sha256-oxLMBs+XkzvlfSst6ZD56ZIgiXwm0Px8Tn3Trdd/6H8="; + hash = "sha256-2OSuLGWdaiiPxyW0Uvq736wHKa7S3CHv79cmZZ86GRE="; name = "${pname}-${version}"; }; diff --git a/pkgs/by-name/te/teeworlds/package.nix b/pkgs/by-name/te/teeworlds/package.nix new file mode 100644 index 000000000000..22e9476f1e6d --- /dev/null +++ b/pkgs/by-name/te/teeworlds/package.nix @@ -0,0 +1,150 @@ +{ + fetchFromGitHub, + fetchpatch, + lib, + stdenv, + cmake, + pkg-config, + python3, + alsa-lib, + libX11, + libGLU, + SDL2, + lua5_3, + zlib, + freetype, + wavpack, + icoutils, + nixosTests, + buildClient ? true, +}: + +stdenv.mkDerivation rec { + pname = "teeworlds"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "teeworlds"; + repo = "teeworlds"; + rev = version; + sha256 = "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz"; + fetchSubmodules = true; + }; + + patches = [ + # Can't use fetchpatch or fetchpatch2 because of https://github.com/NixOS/nixpkgs/issues/32084 + # Using fetchurl instead is also not a good idea, see https://github.com/NixOS/nixpkgs/issues/32084#issuecomment-727223713 + ./rename-VERSION-to-VERSION.txt.patch + (fetchpatch { + name = "CVE-2021-43518.patch"; + url = "https://salsa.debian.org/games-team/teeworlds/-/raw/a6c4b23c1ce73466e6d89bccbede70e61e8c9cba/debian/patches/CVE-2021-43518.patch"; + hash = "sha256-2MmsucaaYjqLgMww1492gNmHmvBJm/NED+VV5pZDnBY="; + }) + ]; + + postPatch = '' + # set compiled-in DATA_DIR so resources can be found + substituteInPlace src/engine/shared/storage.cpp \ + --replace '#define DATA_DIR "data"' \ + '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"' + + # Quote nonsense is a workaround for https://github.com/NixOS/nix/issues/661 + substituteInPlace 'other/bundle/client/Info.plist.in' \ + --replace ${"'"}''${TARGET_CLIENT}' 'teeworlds' \ + --replace ${"'"}''${PROJECT_VERSION}' '${version}' + + # Make sure some bundled dependencies are actually unbundled. + # This will fail compilation if one of these dependencies could not + # be found, instead of falling back to the bundled version. + rm -rf 'src/engine/external/wavpack/' + rm -rf 'src/engine/external/zlib/' + # md5, pnglite and json-parser (https://github.com/udp/json-parser) + # don't seem to be packaged in Nixpkgs, so don't unbundle them. + ''; + + nativeBuildInputs = + [ + cmake + pkg-config + ] + ++ lib.optionals (buildClient && stdenv.hostPlatform.isLinux) [ + icoutils + ]; + + buildInputs = + [ + python3 + lua5_3 + zlib + wavpack + ] + ++ lib.optionals buildClient ( + [ + SDL2 + freetype + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libGLU + alsa-lib + libX11 + ] + ); + + cmakeFlags = [ + "-DCLIENT=${if buildClient then "ON" else "OFF"}" + ]; + + postInstall = lib.optionalString buildClient ( + lib.optionalString stdenv.hostPlatform.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 + + # Install menu item + install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications/teeworlds.app/Contents/MacOS" + mkdir -p "$out/Applications/teeworlds.app/Contents/Resources" + + cp '../other/icons/teeworlds.icns' "$out/Applications/teeworlds.app/Contents/Resources/" + cp '../other/bundle/client/Info.plist.in' "$out/Applications/teeworlds.app/Contents/Info.plist" + 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; + + meta = { + description = "Retro multiplayer shooter game"; + mainProgram = "teeworlds_srv"; + + longDescription = '' + Teeworlds is a free online multiplayer game, available for all + major operating systems. Battle with up to 12 players in a + variety of game modes, including Team Deathmatch and Capture The + Flag. You can even design your own maps! + ''; + + homepage = "https://teeworlds.com/"; + license = with lib.licenses; [ + # See https://github.com/teeworlds/teeworlds/blob/master/license.txt + lib.licenses.zlib # Main license + cc-by-sa-30 # All content under 'datasrc' except the fonts + ofl # datasrc/fonts/SourceHanSans.ttc + free # datasrc/fonts/DejaVuSans.ttf + bsd2 # src/engine/external/json-parser/ + bsd3 # src/engine/external/wavpack + # zlib src/engine/external/md5/ + # zlib src/engine/external/pnglite/ + # zlib src/engine/external/zlib/ + ]; + maintainers = with lib.maintainers; [ + astsmtl + Luflosi + ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch b/pkgs/by-name/te/teeworlds/rename-VERSION-to-VERSION.txt.patch similarity index 100% rename from pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch rename to pkgs/by-name/te/teeworlds/rename-VERSION-to-VERSION.txt.patch diff --git a/pkgs/by-name/te/tegola/package.nix b/pkgs/by-name/te/tegola/package.nix index 00ca64faf802..23f05d771b59 100644 --- a/pkgs/by-name/te/tegola/package.nix +++ b/pkgs/by-name/te/tegola/package.nix @@ -51,7 +51,8 @@ buildGoModule { homepage = "https://www.tegola.io/"; description = "Mapbox Vector Tile server"; mainProgram = "tegola"; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ ingenieroariel ]); + maintainers = with lib.maintainers; [ ingenieroariel ]; + teams = [ lib.teams.geospatial ]; license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/te/tektoncd-cli/package.nix b/pkgs/by-name/te/tektoncd-cli/package.nix index e3b3cbe537a3..abecece8ea43 100644 --- a/pkgs/by-name/te/tektoncd-cli/package.nix +++ b/pkgs/by-name/te/tektoncd-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-LcYd8v6+at/GqlEV2Qkj5g+WNiTBfnQuhDtpP7lmnuk="; + sha256 = "sha256-X+zFYPoHf8Q1K0bLjrsnwOZxxAeJCzgKqmr3FYK5AKA="; }; vendorHash = null; diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index 5b456eaa482e..ba11fde28911 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.34.1"; + version = "1.34.3"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-q+v4cKqBLGxsvR5e8OS6Ix/0JZ+0I/cf0M6P27ym9Go="; + hash = "sha256-uG2u1WY63vp2jZPQl1Hfv6wvl4CYm9qkIhhi5qV6oz4="; }; - vendorHash = "sha256-681a1K1wsjTgZXCx5fuz0/HZ52KucVGnqiv/EIz34Bg="; + vendorHash = "sha256-WOnFFUmXCjdaSbykXLya0TNOqgnYL33qUq5fAho17TE="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix index 740439f9a548..4b8da01c0c21 100644 --- a/pkgs/by-name/te/telegram-bot-api/package.nix +++ b/pkgs/by-name/te/telegram-bot-api/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Telegram Bot API server"; diff --git a/pkgs/by-name/te/telepathy-gabble/package.nix b/pkgs/by-name/te/telepathy-gabble/package.nix deleted file mode 100644 index 560d83c604bb..000000000000 --- a/pkgs/by-name/te/telepathy-gabble/package.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - libxslt, - telepathy-glib, - python3, - libxml2, - dbus-glib, - dbus, - sqlite, - libsoup_2_4, - libnice, - gnutls, - fetchpatch, -}: - -stdenv.mkDerivation rec { - pname = "telepathy-gabble"; - version = "0.18.4"; - - src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-${version}.tar.gz"; - sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/archlinux/svntogit-packages/raw/edcf78c831894000f2fbfd3e5818e363911c746a/trunk/telepathy-gabble-0.18.4-python3.patch"; - hash = "sha256-bvcZW6gbCNogqwPDaXHTbohe7c2GAYjXeHGyBEDVsB4="; - }) - ]; - - nativeBuildInputs = [ - pkg-config - libxslt - python3 - ]; - buildInputs = [ - libxml2 - dbus-glib - sqlite - libsoup_2_4 - libnice - telepathy-glib - gnutls - ]; - - nativeCheckInputs = [ dbus ]; - - configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; - - enableParallelBuilding = true; - doCheck = true; - - meta = with lib; { - description = "Jabber/XMPP connection manager for the Telepathy framework"; - mainProgram = "telepathy-gabble-xmpp-console"; - homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/"; - license = licenses.lgpl21Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/te/telepathy-logger/package.nix b/pkgs/by-name/te/telepathy-logger/package.nix deleted file mode 100644 index e60aca4e8bf0..000000000000 --- a/pkgs/by-name/te/telepathy-logger/package.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - dbus-glib, - libxml2, - sqlite, - telepathy-glib, - python3, - pkg-config, - dconf, - makeWrapper, - intltool, - libxslt, - gobject-introspection, - dbus, - fetchpatch, - darwin, -}: - -stdenv.mkDerivation rec { - pname = "telepathy-logger"; - version = "0.8.2"; - - src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-${version}.tar.bz2"; - sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/archlinux/svntogit-packages/raw/2b5bdbb4739d3517f5e7300edc8dab775743b96d/trunk/0001-tools-Fix-the-build-with-Python-3.patch"; - hash = "sha256-o1lfdZIIqaxn7ntQZnoOMqquc6efTHgSIxB5dpFWRgg="; - }) - ]; - - nativeBuildInputs = [ - makeWrapper - pkg-config - intltool - libxslt - gobject-introspection - python3 - ]; - buildInputs = - [ - dbus-glib - libxml2 - sqlite - telepathy-glib - dbus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Foundation - ]; - - configureFlags = [ "--enable-call" ]; - - preFixup = '' - wrapProgram "$out/libexec/telepathy-logger" \ - --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with lib; { - description = "Logger service for Telepathy framework"; - homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/teleport/0001-fix-add-nix-path-to-exec-env.patch b/pkgs/by-name/te/teleport/0001-fix-add-nix-path-to-exec-env.patch similarity index 100% rename from pkgs/servers/teleport/0001-fix-add-nix-path-to-exec-env.patch rename to pkgs/by-name/te/teleport/0001-fix-add-nix-path-to-exec-env.patch diff --git a/pkgs/by-name/te/teleport/disable-wasm-opt-for-ironrdp.patch b/pkgs/by-name/te/teleport/disable-wasm-opt-for-ironrdp.patch new file mode 100644 index 000000000000..05ecdb6f78cb --- /dev/null +++ b/pkgs/by-name/te/teleport/disable-wasm-opt-for-ironrdp.patch @@ -0,0 +1,15 @@ +# Based on https://github.com/gravitational/teleport/commit/994890fb05360b166afd981312345a4cf01bc422.patch?full_index=1 +diff --git a/web/packages/shared/libs/ironrdp/Cargo.toml b/web/packages/shared/libs/ironrdp/Cargo.toml +index 4252ba95372bdab9a1e2f74e164e303bedd5eee8..4c203290984223564f50ee775a137e86f3c2ddf0 100644 +--- a/web/packages/shared/libs/ironrdp/Cargo.toml ++++ b/web/packages/shared/libs/ironrdp/Cargo.toml +@@ -7,6 +7,9 @@ publish.workspace = true + + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + ++[package.metadata.wasm-pack.profile.release] ++wasm-opt = false ++ + [lib] + crate-type = ["cdylib"] + diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix new file mode 100644 index 000000000000..4cce72857609 --- /dev/null +++ b/pkgs/by-name/te/teleport/package.nix @@ -0,0 +1,211 @@ +{ + lib, + buildGo123Module, + rustPlatform, + fetchFromGitHub, + fetchpatch, + makeWrapper, + binaryen, + cargo, + libfido2, + nodejs, + openssl, + pkg-config, + pnpm_10, + rustc, + stdenv, + xdg-utils, + wasm-bindgen-cli_0_2_95, + wasm-pack, + nixosTests, + + withRdpClient ? true, + + version ? "17.4.8", + hash ? "sha256-BMiV4xMDy/21B2kl/vkXD14LKQ9t/qj6K8HFnU9Td7w=", + vendorHash ? "sha256-/JP0/4fFdCuDFLQ+mh7CQNMJ4n3yDNyvnLfbmRl/TBA=", + extPatches ? [ ], + cargoHash ? "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=", + pnpmHash ? "sha256-TZb1nABTbR+SPgykc/KMRkHW7oLawem6KWmdOFAbLbk=", +}: +let + # This repo has a private submodule "e" which fetchgit cannot handle without failing. + src = fetchFromGitHub { + owner = "gravitational"; + repo = "teleport"; + rev = "v${version}"; + inherit hash; + }; + pname = "teleport"; + inherit version; + + rdpClient = rustPlatform.buildRustPackage (finalAttrs: { + pname = "teleport-rdpclient"; + useFetchCargoVendor = true; + inherit cargoHash; + inherit version src; + + buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + # https://github.com/NixOS/nixpkgs/issues/161570 , + # buildRustPackage sets strictDeps = true; + nativeCheckInputs = finalAttrs.buildInputs; + + OPENSSL_NO_VENDOR = "1"; + + postInstall = '' + mkdir -p $out/include + cp ${finalAttrs.buildAndTestSubdir}/librdprs.h $out/include/ + ''; + }); + + webassets = stdenv.mkDerivation { + pname = "teleport-webassets"; + inherit src version; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + hash = cargoHash; + }; + + pnpmDeps = pnpm_10.fetchDeps { + inherit src pname version; + hash = pnpmHash; + }; + + nativeBuildInputs = [ + binaryen + cargo + nodejs + pnpm_10.configHook + rustc + rustc.llvmPackages.lld + rustPlatform.cargoSetupHook + wasm-bindgen-cli_0_2_95 + wasm-pack + ]; + + patches = [ + ./disable-wasm-opt-for-ironrdp.patch + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + + runHook postConfigure + ''; + + buildPhase = '' + PATH=$PATH:$PWD/node_modules/.bin + + pushd web/packages + pushd shared + # https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20 + RUST_MIN_STACK=16777216 wasm-pack build ./libs/ironrdp --target web --mode no-install + popd + pushd teleport + vite build + popd + popd + ''; + + installPhase = '' + mkdir -p $out + cp -R webassets/. $out + ''; + }; +in +buildGo123Module (finalAttrs: { + inherit pname src version; + inherit vendorHash; + proxyVendor = true; + + subPackages = [ + "tool/tbot" + "tool/tctl" + "tool/teleport" + "tool/tsh" + ]; + tags = [ + "libfido2" + "webassets_embed" + ] ++ lib.optional withRdpClient "desktop_access_rdp"; + + buildInputs = [ + openssl + libfido2 + ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + + patches = extPatches ++ [ + ./0001-fix-add-nix-path-to-exec-env.patch + ./rdpclient.patch + ./tsh.patch + ]; + + # Reduce closure size for client machines + outputs = [ + "out" + "client" + ]; + + preBuild = + '' + cp -r ${webassets} webassets + '' + + lib.optionalString withRdpClient '' + ln -s ${rdpClient}/lib/* lib/ + ln -s ${rdpClient}/include/* lib/srv/desktop/rdp/rdpclient/ + ''; + + # Multiple tests fail in the build sandbox + # due to trying to spawn nixbld's shell (/noshell), etc. + doCheck = false; + + postInstall = '' + mkdir -p $client/bin + mv {$out,$client}/bin/tsh + # make xdg-open overrideable at runtime + wrapProgram $client/bin/tsh --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + ln -s {$client,$out}/bin/tsh + ''; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/tsh version | grep ${version} > /dev/null + $client/bin/tsh version | grep ${version} > /dev/null + $out/bin/tbot version | grep ${version} > /dev/null + $out/bin/tctl version | grep ${version} > /dev/null + $out/bin/teleport version | grep ${version} > /dev/null + ''; + + passthru.tests = nixosTests.teleport; + + meta = { + description = "Certificate authority and access plane for SSH, Kubernetes, web applications, and databases"; + homepage = "https://goteleport.com/"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + arianvp + justinas + sigma + tomberek + freezeboy + techknowlogick + juliusfreudenberger + ]; + platforms = lib.platforms.unix; + # go-libfido2 is broken on platforms with less than 64-bit because it defines an array + # which occupies more than 31 bits of address space. + broken = stdenv.hostPlatform.parsed.cpu.bits < 64; + }; +}) diff --git a/pkgs/servers/teleport/rdpclient.patch b/pkgs/by-name/te/teleport/rdpclient.patch similarity index 100% rename from pkgs/servers/teleport/rdpclient.patch rename to pkgs/by-name/te/teleport/rdpclient.patch diff --git a/pkgs/servers/teleport/tsh.patch b/pkgs/by-name/te/teleport/tsh.patch similarity index 100% rename from pkgs/servers/teleport/tsh.patch rename to pkgs/by-name/te/teleport/tsh.patch diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix new file mode 100644 index 000000000000..9aa3b7962b95 --- /dev/null +++ b/pkgs/by-name/te/teleport_16/package.nix @@ -0,0 +1,10 @@ +{ + teleport, +}: +teleport.override { + version = "16.5.9"; + hash = "sha256-lIWJV3AQ+XWApfjtdUL8ZlHAXCyvwVAGsZjjvXul36I="; + vendorHash = "sha256-DdVBtMwz0AIGCYj/QLczG8GPP9mqKrdF+M0NqmM6J0I="; + pnpmHash = "sha256-JQca2eFxcKJDHIaheJBg93ivZU95UWMRgbcK7QE4R10="; + cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I"; +} diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix new file mode 100644 index 000000000000..9e9d580d4c33 --- /dev/null +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -0,0 +1,4 @@ +{ + teleport, +}: +teleport diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix index e5aea69a6f1a..07514f4687a3 100644 --- a/pkgs/by-name/te/telepresence2/package.nix +++ b/pkgs/by-name/te/telepresence2/package.nix @@ -8,16 +8,16 @@ let fuseftp = buildGoModule rec { pname = "go-fuseftp"; - version = "0.4.2"; + version = "0.6.6"; src = fetchFromGitHub { owner = "datawire"; repo = "go-fuseftp"; rev = "v${version}"; - hash = "sha256-bkaC+EOqFPQA4fDkVhO6EqgGhOJy31yGwVbbPoRd+70="; + hash = "sha256-70VmT8F+RNiDk6fnrzDktdfNhZk20sXF+b3TBTAkNHo="; }; - vendorHash = "sha256-Dk4wvg2lTGTw8vP42+XuvmMXeMluR0SPwlVHLEB8yCQ="; + vendorHash = "sha256-wp4jOmeVdfuRwdclCzBonNCkhgsNUBOBL6gxlrznC1A="; buildInputs = [ fuse ]; @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.22.1"; + version = "2.22.4"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-Bae77Kzc2cWxIb1yYKXctffuiC3ICPfi0qYP6fgaqvQ="; + hash = "sha256-ECuu6uMsY5vZVrMJknnd5IH0BZ2yVBTKIIC/Q8RARs8="; }; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-toqQDa3hY2EvWjYpFXWafV9yj1U5CZXZOqQAQtOMITo="; + vendorHash = "sha256-+l+Dtyq+9u+Lc6yF++KnX2DixVVfPX+oFUn3lq6B/1U="; ldflags = [ "-s" @@ -68,6 +68,7 @@ buildGoModule rec { maintainers = with maintainers; [ mausch vilsol + wrbbz ]; mainProgram = "telepresence"; }; diff --git a/pkgs/by-name/te/teleprompter/package.nix b/pkgs/by-name/te/teleprompter/package.nix new file mode 100644 index 000000000000..6ca518f821e2 --- /dev/null +++ b/pkgs/by-name/te/teleprompter/package.nix @@ -0,0 +1,62 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + gettext, + glib, + desktop-file-utils, + appstream-glib, + gobject-introspection, + libadwaita, + nix-update-script, +}: +let + version = "1.0.1"; +in +python3Packages.buildPythonApplication { + pname = "teleprompter"; + inherit version; + pyproject = false; + + src = fetchFromGitHub { + owner = "Nokse22"; + repo = "teleprompter"; + tag = "v${version}"; + hash = "sha256-KnjZJbTM5EH/0aitqCtohE3Xy4ixOsDMthUn8kWjHq8="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + gettext + glib + desktop-file-utils + appstream-glib + gobject-introspection + ]; + + pythonPath = [ python3Packages.pygobject3 ]; + + buildInputs = [ libadwaita ]; + + dontWrapGApps = true; + + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Stay on track during speeches"; + homepage = "https://github.com/Nokse22/teleprompter"; + changelog = "https://github.com/Nokse22/teleprompter/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + mainProgram = "teleprompter"; + maintainers = [ lib.maintainers.awwpotato ]; + }; +} diff --git a/pkgs/by-name/te/telescope/package.nix b/pkgs/by-name/te/telescope/package.nix index 5b1e417f0c5b..f412c0d7b28b 100644 --- a/pkgs/by-name/te/telescope/package.nix +++ b/pkgs/by-name/te/telescope/package.nix @@ -12,15 +12,15 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "telescope"; - version = "0.10.1"; + version = "0.11"; src = fetchFromGitHub { owner = "omar-polo"; repo = "telescope"; - rev = version; - hash = "sha256-MVZ/pvDAETacQiEMEXM0gYM20LXqNiHtMfFGqS1vipY="; + tag = finalAttrs.version; + hash = "sha256-GKeUXa4RKYkoywrCrpenfLt10Rdj9L0xYI3tf2hFAbk="; }; postPatch = '' @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" ]; - meta = with lib; { + meta = { description = "Telescope is a w3m-like browser for Gemini"; - homepage = "https://www.telescope-browser.org/"; - license = licenses.isc; - maintainers = with maintainers; [ heph2 ]; - platforms = platforms.unix; + homepage = "https://telescope-browser.org/"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ heph2 ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/te/televido/package.nix b/pkgs/by-name/te/televido/package.nix index 1a3e5ce4658c..fa02c90a65f3 100644 --- a/pkgs/by-name/te/televido/package.nix +++ b/pkgs/by-name/te/televido/package.nix @@ -14,7 +14,7 @@ desktop-file-utils, openssl, gst_all_1, - clapper, + clapper-unwrapped, }: stdenv.mkDerivation rec { @@ -49,10 +49,11 @@ stdenv.mkDerivation rec { buildInputs = [ libadwaita desktop-file-utils - clapper + clapper-unwrapped gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav + gst_all_1.gst-plugins-bad ]; meta = { diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index c2b2c251236d..40212e24475b 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -6,19 +6,19 @@ television, nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "television"; - version = "0.11.5"; + version = "0.11.9"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; - tag = version; - hash = "sha256-2Yt98ZtoTHqCtyqGuPL583NBe2CHI+9PIyO0fnonM4E="; + tag = finalAttrs.version; + hash = "sha256-9ug3MFBAvdOpA7Cw5eqCjS2gWK0InqlfUAOItE0o40s="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+T/WC7jq6qra9qxQ+mR929LQavETHTtAGHKWm81cwNU="; + cargoHash = "sha256-n417hrDLpBD7LhtHfqHPgr9N+gkdC9nw+iDnNRcTqQQ="; passthru = { tests.version = testers.testVersion { @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { fuzzy matching algorithm and is designed to be easily extensible. ''; homepage = "https://github.com/alexpasmantier/television"; - changelog = "https://github.com/alexpasmantier/television/releases/tag/${version}"; + changelog = "https://github.com/alexpasmantier/television/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "tv"; maintainers = with lib.maintainers; [ @@ -45,4 +45,4 @@ rustPlatform.buildRustPackage rec { getchoo ]; }; -} +}) diff --git a/pkgs/by-name/te/teller/package.nix b/pkgs/by-name/te/teller/package.nix index 1fcdbcd46ff7..f3b6564c1617 100644 --- a/pkgs/by-name/te/teller/package.nix +++ b/pkgs/by-name/te/teller/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, nix-update-script, protobuf, - stdenv, - darwin, pkg-config, openssl, }: @@ -34,7 +32,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; doCheck = false; diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index ca3d1bd37a0e..11095d3a4ec3 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "templ"; - version = "0.3.857"; + version = "0.3.865"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-c3x7v5PeMJFADRfImMyEasvlC9WSjqHQxNDg1sgPBfQ="; + hash = "sha256-ngdn5ftTunVUIOwmovYgIlGkyrYjXSJkp+0fJEHXB+s="; }; - vendorHash = "sha256-JVOsjBn1LV8p6HHelfAO1Qcqi/tPg1S3xBffo+0aplE="; + vendorHash = "sha256-q4L+r6S0eMNd5hP9UQCI+GxSJoiMGpjd0UTxA8zb6KU="; subPackages = [ "cmd/templ" ]; diff --git a/pkgs/by-name/te/template-glib/package.nix b/pkgs/by-name/te/template-glib/package.nix index 08de4d6aceeb..e4a1a4034d25 100644 --- a/pkgs/by-name/te/template-glib/package.nix +++ b/pkgs/by-name/te/template-glib/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "Library for template expansion which supports calling into GObject Introspection from templates"; homepage = "https://gitlab.gnome.org/GNOME/template-glib"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix index 645549e63b36..2281a9f7237c 100644 --- a/pkgs/by-name/te/tenacity/package.nix +++ b/pkgs/by-name/te/tenacity/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pname = "tenacity"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitea { domain = "codeberg.org"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { repo = pname; fetchSubmodules = true; rev = "v${version}"; - hash = "sha256-UU3iKfab6en4IyGlpNLUhOil3snzaZ2nI6JMqoL6DUs="; + hash = "sha256-2gndOwgEJK2zDSbjcZigbhEpGv301/ygrf+EQhKp8PI="; }; postPatch = '' @@ -70,7 +70,6 @@ stdenv.mkDerivation rec { ''; postFixup = '' - rm $out/tenacity wrapProgram "$out/bin/tenacity" \ --suffix AUDACITY_PATH : "$out/share/tenacity" \ --suffix AUDACITY_MODULES_PATH : "$out/lib/tenacity/modules" \ diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index a02d828d5da1..d1deefc5a25d 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tenv"; - version = "4.4.0"; + version = "4.6.2"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; tag = "v${version}"; - hash = "sha256-3SaS1Uk2fzYRz7sd5wKJx0crt7F1Vrmh5ZNgtu9bVDU="; + hash = "sha256-oYAl388/PBIL7LxOWUCZLHYfOKkkB/BEaTKpTN8rp5U="; }; - vendorHash = "sha256-If6de0brzOiaO81MmKlTF6V4djGxUR4k4XDBJbx7nqE="; + vendorHash = "sha256-5aWf5O25cudtIny159t3Mllp2wV0C+JxWe7RDkYOxVM="; excludedPackages = [ "tools" ]; diff --git a/pkgs/by-name/te/termbench-pro/package.nix b/pkgs/by-name/te/termbench-pro/package.nix index b5139a1af97e..31a22abc6064 100644 --- a/pkgs/by-name/te/termbench-pro/package.nix +++ b/pkgs/by-name/te/termbench-pro/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "termbench-pro"; - version = "unstable-2024-10-05"; + version = "unstable-2025-01-01"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "termbench-pro"; - rev = "22a0c42f78dc2e522eb1089bf9976a9ff0ecdcad"; - hash = "sha256-Yyvlu/yx/yGc9Ci9Pn098YfTdywLZEaowQZeLM4WGjQ"; + rev = "3a39a4ad592047dee3038d8bfcce84215ac55032"; + hash = "sha256-EvTHBPWLGm2FxEVOwMIXH4UW/15rbXPnxEnjMtSg4YM="; }; # don't fetch glaze from CMakeLists.txt diff --git a/pkgs/by-name/te/termbook/package.nix b/pkgs/by-name/te/termbook/package.nix index d6b450f6b7de..70b63b9daedd 100644 --- a/pkgs/by-name/te/termbook/package.nix +++ b/pkgs/by-name/te/termbook/package.nix @@ -6,7 +6,6 @@ pkg-config, oniguruma, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,13 +28,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + oniguruma + ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/by-name/te/terminal-stocks/package.nix b/pkgs/by-name/te/terminal-stocks/package.nix index 02aa044f47e3..238bdef27ef6 100644 --- a/pkgs/by-name/te/terminal-stocks/package.nix +++ b/pkgs/by-name/te/terminal-stocks/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "terminal-stocks"; - version = "1.0.19"; + version = "1.0.20"; src = fetchFromGitHub { owner = "shweshi"; repo = "terminal-stocks"; rev = "v${version}"; - hash = "sha256-6eDBcQfo6M+Z31ILLM4BbiOxoTD6t4LQJxawoJFEzhg="; + hash = "sha256-YrdOw5le+gR8eANS57/uSGwrBfRJiLNkTR8InrEAI7o="; }; - npmDepsHash = "sha256-0k2+vdfOUF0zV6Tl7VGXS2dNLnCHgSdI12LqvGkbv+k="; + npmDepsHash = "sha256-TAS7iPWXXLaDosM31WYpeXC2Gz01fucoFu7llwBHmxc="; dontNpmBuild = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/te/terminal-typeracer/package.nix b/pkgs/by-name/te/terminal-typeracer/package.nix new file mode 100644 index 000000000000..4e3e7e441369 --- /dev/null +++ b/pkgs/by-name/te/terminal-typeracer/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitLab, + rustPlatform, + pkg-config, + libgit2, + openssl, + sqlite, + libiconv, +}: + +rustPlatform.buildRustPackage rec { + pname = "terminal-typeracer"; + version = "2.1.3"; + + src = fetchFromGitLab { + owner = "ttyperacer"; + repo = pname; + rev = "v${version}"; + hash = "sha256-S3OW6KihRd6ReTWUXRb1OWC7+YoxehjFRBxcnJVgImU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-WYqbG0iSVvnRLCy5Qs4wr72LjQ6uPgskVWP62Af0RQ8="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ + libgit2 + openssl + sqlite + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + OPENSSL_NO_VENDOR = 1; + LIBGIT2_NO_VENDOR = 1; + + meta = with lib; { + description = "Open source terminal based version of Typeracer written in rust"; + homepage = "https://gitlab.com/ttyperacer/terminal-typeracer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ yoctocell ]; + mainProgram = "typeracer"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index 97d563d6498c..3a6ee9dd6524 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.17.1"; - revision = "218"; + version = "9.19.4"; + revision = "225"; src = fetchurl { # find the latest version with @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-KmBBE+0gNq85Kb9ouynXTkC7mcTvYOMeBaW3jjBN1IK2hoCIELrwkypFWfhpPNuo2e3GA30haql0tRZ1LU/JMg=="; + hash = "sha512-lArp7yoQrQKc84zh8/EdLv5FuKbwQka9uy1JgeZzA7kbZzV3evcpav67HNSqp+BhUxp9ViD8TK1USGViJN5Tpg=="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/te/termpaint/package.nix b/pkgs/by-name/te/termpaint/package.nix index 217d27955192..e4fe01bb4a19 100644 --- a/pkgs/by-name/te/termpaint/package.nix +++ b/pkgs/by-name/te/termpaint/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (final: { name = "termpaint"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "termpaint"; repo = "termpaint"; rev = final.version; - hash = "sha256-AsbUJjz51pedmemI0racMgWRzpbIeNJrK/walFUniR4="; + hash = "sha256-7mfGTC5vJ4806bDbrPMSVthtW05a+M3vgUlHGbtaI4Q="; }; patches = [ ./0001-meson.build-use-prefix.patch ]; diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix index 1c6409d656ea..52c62b373ce0 100644 --- a/pkgs/by-name/te/termshot/package.nix +++ b/pkgs/by-name/te/termshot/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "termshot"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "homeport"; repo = "termshot"; tag = "v${finalAttrs.version}"; - hash = "sha256-vkxOUo1RyzZBN2+wRn8yWV930HrKRJnPwpHnxza5GNE="; + hash = "sha256-fk1Xlgf6WR6dAekv7gZXPfKTEvbnk7FT+mn8UYFbQnQ="; }; - vendorHash = "sha256-Wsoy0jlwMYlN8yh7xncGrxTl0qJsPXV4IdYzU7jStzw="; + vendorHash = "sha256-RuIn4JNt4c47p2uiLtmCVYyY0/K1kJpmUboXHA5vhew="; ldflags = [ "-s" diff --git a/pkgs/development/compilers/terra/nix-cflags.patch b/pkgs/by-name/te/terra/nix-cflags.patch similarity index 100% rename from pkgs/development/compilers/terra/nix-cflags.patch rename to pkgs/by-name/te/terra/nix-cflags.patch diff --git a/pkgs/by-name/te/terra/package.nix b/pkgs/by-name/te/terra/package.nix new file mode 100644 index 000000000000..2d12834f7ce2 --- /dev/null +++ b/pkgs/by-name/te/terra/package.nix @@ -0,0 +1,130 @@ +{ + lib, + stdenv, + fetchFromGitHub, + llvmPackages_16, + ncurses, + cmake, + libxml2, + symlinkJoin, + cudaPackages, + enableCUDA ? false, + libffi, + libpfm, +}: + +let + luajitRev = "50936d784474747b4569d988767f1b5bab8bb6d0"; + luajitBase = "LuaJIT-${luajitRev}"; + luajitArchive = "${luajitBase}.tar.gz"; + luajitSrc = fetchFromGitHub { + owner = "LuaJIT"; + repo = "LuaJIT"; + rev = luajitRev; + sha256 = "1g87pl014b5v6z2nnhiwn3wf405skawszfr5wdzyfbx00j3kgxd0"; + }; + + llvmPackages = llvmPackages_16; + llvmMerged = symlinkJoin { + name = "llvmClangMerged"; + paths = with llvmPackages; [ + llvm.out + llvm.dev + llvm.lib + clang-unwrapped.out + clang-unwrapped.dev + clang-unwrapped.lib + ]; + }; + + cuda = cudaPackages.cudatoolkit_11; + + clangVersion = llvmPackages.clang-unwrapped.version; + +in +stdenv.mkDerivation rec { + pname = "terra"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "terralang"; + repo = "terra"; + rev = "release-${version}"; + sha256 = "0v9vpxcp9ybwnfljskqn41vjq7c0srdfv7qs890a6480pnk4kavd"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = + [ + llvmMerged + ncurses + libffi + libxml2 + ] + ++ lib.optionals enableCUDA [ cuda ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm; + + cmakeFlags = + let + resourceDir = + "${llvmMerged}/lib/clang/" + + (if lib.versionOlder clangVersion "16" then clangVersion else lib.versions.major clangVersion); + in + [ + "-DHAS_TERRA_VERSION=0" + "-DTERRA_VERSION=${version}" + "-DTERRA_LUA=luajit" + "-DTERRA_SKIP_LUA_DOWNLOAD=ON" + "-DCLANG_RESOURCE_DIR=${resourceDir}" + ] + ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON"; + + doCheck = true; + hardeningDisable = [ "fortify" ]; + outputs = [ + "bin" + "dev" + "out" + "static" + ]; + + patches = [ ./nix-cflags.patch ]; + + postPatch = '' + substituteInPlace src/terralib.lua \ + --subst-var-by NIX_LIBC_INCLUDE ${lib.getDev stdenv.cc.libc}/include + ''; + + preConfigure = '' + mkdir -p build + ln -s ${luajitSrc} build/${luajitBase} + tar --mode="a+rwX" -chzf build/${luajitArchive} -C build ${luajitBase} + rm build/${luajitBase} + ''; + + installPhase = '' + install -Dm755 -t $bin/bin bin/terra + install -Dm755 -t $out/lib lib/terra${stdenv.hostPlatform.extensions.sharedLibrary} + install -Dm644 -t $static/lib lib/libterra_s.a + + mkdir -pv $dev/include + cp -rv include/terra $dev/include + ''; + + meta = with lib; { + description = "Low-level counterpart to Lua"; + homepage = "https://terralang.org/"; + platforms = platforms.all; + maintainers = with maintainers; [ + jb55 + seylerius + thoughtpolice + elliottslaughter + ]; + license = licenses.mit; + # never built on aarch64-darwin since first introduction in nixpkgs + # Linux Aarch64 broken above LLVM11 + # https://github.com/terralang/terra/issues/597 + broken = stdenv.hostPlatform.isAarch64; + }; +} diff --git a/pkgs/by-name/te/terraform-docs/package.nix b/pkgs/by-name/te/terraform-docs/package.nix index 33c9620d541b..bbeb074c625d 100644 --- a/pkgs/by-name/te/terraform-docs/package.nix +++ b/pkgs/by-name/te/terraform-docs/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "terraform-docs"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "terraform-docs"; repo = pname; rev = "v${version}"; - hash = "sha256-NOI9/2zGimsHMvdi2lGwl6YLVGpOET6g9C/l0xUZ/pI="; + hash = "sha256-DiKoYAe7vcNy35ormKHYZcZrGK/MEb6VmcHWPgrbmUg="; }; - vendorHash = "sha256-/56Y3VE4h//8IlyP8ocMFiorgw/4ee32J5FQYxFCIU8="; + vendorHash = "sha256-ynyYpX41LJxGhf5kF2AULj+VKROjsvTjVPBnqG+JGSg="; excludedPackages = [ "scripts" ]; diff --git a/pkgs/by-name/te/terraform-local/package.nix b/pkgs/by-name/te/terraform-local/package.nix index 9907829421f9..649717636226 100644 --- a/pkgs/by-name/te/terraform-local/package.nix +++ b/pkgs/by-name/te/terraform-local/package.nix @@ -5,12 +5,12 @@ }: python3Packages.buildPythonApplication rec { pname = "terraform_local"; - version = "0.20.1"; + version = "0.22.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ki/9KglAmfzoHgf+wR6LteBQH696q5KE/Fi/tTEqCIg="; + hash = "sha256-lySrMYN++TDSfMV7CevORhL0MzjM8sELqVGN3kBwMZ8="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 7b9bb10ba3da..0831edfc2990 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -6,15 +6,15 @@ go-mockery, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "terragrunt"; - version = "0.76.6"; + version = "0.78.4"; src = fetchFromGitHub { owner = "gruntwork-io"; - repo = pname; - tag = "v${version}"; - hash = "sha256-xhJUkjdMkOI8E7HxazBfl05FF0XzwlFsEgW+WEv0EGg="; + repo = "terragrunt"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Xlqq1d6itQx0Y6MQJTY3tsZ8Q2S8EqRbqD1GGdIu9oA="; }; nativeBuildInputs = [ @@ -26,14 +26,14 @@ buildGoModule rec { make generate-mocks ''; - vendorHash = "sha256-sPgA1LMbYMcrlN+4no3DhJ0TVMEnGEgGhQMy+g0nrtg="; + vendorHash = "sha256-sVA2bzQoeDdYRDaAC6DZtF4izuXhlHTUMKNkOIveG7c="; doCheck = false; ldflags = [ "-s" "-w" - "-X github.com/gruntwork-io/go-commons/version.Version=v${version}" + "-X github.com/gruntwork-io/go-commons/version.Version=v${finalAttrs.version}" "-extldflags '-static'" ]; @@ -41,7 +41,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://terragrunt.gruntwork.io"; - changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}"; + changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${finalAttrs.version}"; description = "Thin wrapper for Terraform that supports locking for Terraform state and enforces best practices"; mainProgram = "terragrunt"; license = licenses.mit; @@ -51,4 +51,4 @@ buildGoModule rec { kashw2 ]; }; -} +}) diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix index 03d92bc3af40..f2a97e17c770 100644 --- a/pkgs/by-name/te/terramate/package.nix +++ b/pkgs/by-name/te/terramate/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "terramate"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-9Bv4FlQzUX/mnSlv1qZqVER/JS0gr3HHmPV+axHKgJw="; + hash = "sha256-lIYtNvluKRufV0bXi2z2/8F7221Sum20usA0j0pHU7I="; }; - vendorHash = "sha256-EdrELFQYQ5clUQJQdB/tlr9IhZz3+CF0jUKH7F6kCM8="; + vendorHash = "sha256-84xlUXCJhsZjNxdWQ/Tr/WA4/+gP8NlqQQHnA8R8nz8="; # required for version info nativeBuildInputs = [ git ]; diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix index f428dbba2df9..38e05bedd5cd 100644 --- a/pkgs/by-name/te/testkube/package.nix +++ b/pkgs/by-name/te/testkube/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "testkube"; - version = "2.1.125"; + version = "2.1.150"; src = fetchFromGitHub { owner = "kubeshop"; repo = "testkube"; rev = "v${version}"; - hash = "sha256-Coi/aPEZb1VoMCOtzl2AcURomo4uS76AZDS449B4EcU="; + hash = "sha256-n+R8HBx8KhSnQHRd0zNBW6nHH82UCjwN+TjX4XJn5B8="; }; - vendorHash = "sha256-Z8or7JvTBZQmka71I2IpGldgnyTeh4O0aIlB/wssYoM="; + vendorHash = "sha256-C+8MXX7BAbccahDAVZWmuxHb16LqcCY6/QaIkZ7J0mQ="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/te/testssl/package.nix b/pkgs/by-name/te/testssl/package.nix index b2eae1e9b66f..378201c65909 100644 --- a/pkgs/by-name/te/testssl/package.nix +++ b/pkgs/by-name/te/testssl/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0.9"; + version = "3.2.0"; src = fetchFromGitHub { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "sha256-MZNQ7oOJD/vjOwDiPOZr3k+Mn0XXVdkP7cC/0mnWLic="; + sha256 = "sha256-h/Z++Osrog8svIiUF53Cj7KYfKLnimueyp4N3/6bSiE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/te/tetrio-plus/package.nix b/pkgs/by-name/te/tetrio-plus/package.nix index c726d9cafab5..3ed2f6788dbf 100644 --- a/pkgs/by-name/te/tetrio-plus/package.nix +++ b/pkgs/by-name/te/tetrio-plus/package.nix @@ -13,14 +13,14 @@ }: let - version = "0.27.5"; + version = "0.27.7"; tag = "electron-v${version}-tetrio-v${tetrio-desktop.version}"; src = fetchFromGitLab { owner = "UniQMG"; repo = "tetrio-plus"; inherit tag; - hash = "sha256-hbHofrC2dJOh2kh3VLb/d0dHrcszyqTyID1PAaGApxY="; + hash = "sha256-AEn1TrC0hUVRgfL2QZ5TMN8pTOm36zpHr2b/LqQp5RY="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix index 58f6b21a2eca..309bb7e1af23 100644 --- a/pkgs/by-name/te/tex-fmt/package.nix +++ b/pkgs/by-name/te/tex-fmt/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "tex-fmt"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "WGUNDERWOOD"; repo = "tex-fmt"; tag = "v${version}"; - hash = "sha256-3kRtBfIT6QcdZ1+h2WwvxsAv/UJLtwSodF5zvCUDbHQ="; + hash = "sha256-CAuhIJbe483Qu+wnNfXTkQ3ERAbkt07QzZ7z7pcbl10="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4kx3co9doFYD9SjJhL17hgf6ll4niKnF57evv/eNeM0="; + cargoHash = "sha256-ZXoaQYUYut11r6zvvIihZ3myL4B4y5yKq6P1BBtky/c="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/texi2html/package.nix b/pkgs/by-name/te/texi2html/package.nix index 5d3a09642116..6efe57a9a135 100644 --- a/pkgs/by-name/te/texi2html/package.nix +++ b/pkgs/by-name/te/texi2html/package.nix @@ -4,42 +4,49 @@ fetchurl, perl, gettext, + versionCheckHook, buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "texi2html"; version = "5.0"; src = fetchurl { - url = "mirror://savannah/texi2html/${pname}-${version}.tar.bz2"; - sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8"; + url = "mirror://savannah/texi2html/texi2html-${finalAttrs.version}.tar.bz2"; + hash = "sha256-6KmLDuIMSVpquJQ5igZe9YAnLb1aFbGxnovRvInZ+fo="; }; strictDeps = true; nativeBuildInputs = [ + perl + ]; + + buildInputs = [ gettext perl ]; - buildInputs = [ perl ]; postPatch = '' - patchShebangs separated_to_hash.pl + patchShebangs --build separated_to_hash.pl ''; - postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - for f in $out/bin/*; do - substituteInPlace $f --replace "${buildPackages.perl}" "${perl}" - done + postInstall = '' + patchShebangs --host --update $out/bin/* ''; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + meta = { description = "Perl script which converts Texinfo source files to HTML output"; mainProgram = "texi2html"; homepage = "https://www.nongnu.org/texi2html/"; - license = licenses.gpl2; - maintainers = [ maintainers.marcweber ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/te/texlab/package.nix b/pkgs/by-name/te/texlab/package.nix new file mode 100644 index 000000000000..8925f8367fc6 --- /dev/null +++ b/pkgs/by-name/te/texlab/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + help2man, + installShellFiles, + libiconv, + nix-update-script, +}: + +let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; +in +rustPlatform.buildRustPackage rec { + pname = "texlab"; + version = "5.22.1"; + + src = fetchFromGitHub { + owner = "latex-lsp"; + repo = "texlab"; + tag = "v${version}"; + hash = "sha256-ldbWENQa7ZiBSx1b1JgChIgadqzHEPvUyOdHVgW6MSU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-omMisd2lY9BPIp/0yJ5Eg3pAIvwIWcEJE0ygTj2yqwo="; + + outputs = [ "out" ] ++ lib.optional (!isCross) "man"; + + nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!isCross) help2man; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + # When we cross compile we cannot run the output executable to + # generate the man page + postInstall = lib.optionalString (!isCross) '' + # TexLab builds man page separately in CI: + # https://github.com/latex-lsp/texlab/blob/v5.21.0/.github/workflows/publish.yml#L110-L114 + help2man --no-info "$out/bin/texlab" > texlab.1 + installManPage texlab.1 + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Implementation of the Language Server Protocol for LaTeX"; + homepage = "https://github.com/latex-lsp/texlab"; + changelog = "https://github.com/latex-lsp/texlab/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ + doronbehar + kira-bruneau + ]; + platforms = platforms.all; + mainProgram = "texlab"; + }; +} diff --git a/pkgs/by-name/te/texstudio/package.nix b/pkgs/by-name/te/texstudio/package.nix index 8c87594998a0..919c98116894 100644 --- a/pkgs/by-name/te/texstudio/package.nix +++ b/pkgs/by-name/te/texstudio/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.8.6"; + version = "4.8.7"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-PvxzG4VPhCmwc/Kh5g85fV/Mc7ih08pt/zUNBgldZiI="; + hash = "sha256-/0f8SIzF5OnVYfxS6Cb7VbN+IMc4VzCxfA7p93iQJ/w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/text-engine/package.nix b/pkgs/by-name/te/text-engine/package.nix index 434cdbb78326..6250ff9c88c3 100644 --- a/pkgs/by-name/te/text-engine/package.nix +++ b/pkgs/by-name/te/text-engine/package.nix @@ -1,36 +1,31 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, fetchpatch, + + gobject-introspection, + gtk4, meson, ninja, - json-glib, - gtk4, - libxml2, - gobject-introspection, pkg-config, + + json-glib, libadwaita, + libxml2, }: stdenv.mkDerivation rec { pname = "text-engine"; - version = "0.1.1"; + version = "0.1.1-unstable-2024-09-16"; + src = fetchFromGitHub { owner = "mjakeman"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-YSG4Vk3hrmtaJkK1WAlQcdgiDdgC4Un0t6UdaoIcUes="; + rev = "4c26887556fd8e28211324c4058d49508eb5f557"; + hash = "sha256-0rMBz2s3wYv7gZiJTj8rixWxBjT6Dd6SaINP8kDbTyw="; }; - patches = [ - # Fixes build with newer versions of clang - (fetchpatch { - url = "https://github.com/mjakeman/text-engine/commit/749c94d853c0b0e29e79a1b270ec61947b65c319.patch"; - hash = "sha256-vs/a8IBovArw8tc1ZLUsaDHRVyA71KMB1NGENOKNOdk="; - }) - ]; - nativeBuildInputs = [ gobject-introspection gtk4 @@ -41,18 +36,23 @@ stdenv.mkDerivation rec { buildInputs = [ libadwaita - json-glib libxml2 ]; - meta = with lib; { + postPatch = '' + # See https://github.com/mjakeman/text-engine/pull/42 + substituteInPlace src/meson.build \ + --replace-fail "dependency('json-glib-1.0')," "" + ''; + + meta = { description = "Rich text framework for GTK"; mainProgram = "text-engine-demo"; homepage = "https://github.com/mjakeman/text-engine"; - license = with licenses; [ + license = with lib.licenses; [ mpl20 lgpl21Plus ]; - maintainers = with maintainers; [ foo-dogsquared ]; + maintainers = with lib.maintainers; [ foo-dogsquared ]; }; } diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/by-name/te/textadept/deps.nix similarity index 100% rename from pkgs/applications/editors/textadept/deps.nix rename to pkgs/by-name/te/textadept/deps.nix diff --git a/pkgs/by-name/te/textadept/package.nix b/pkgs/by-name/te/textadept/package.nix new file mode 100644 index 000000000000..44632c5797dd --- /dev/null +++ b/pkgs/by-name/te/textadept/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + cmake, + withQt ? true, + libsForQt5, + withCurses ? false, + ncurses, +}: +stdenv.mkDerivation (finalAttrs: { + version = "12.4"; + pname = "textadept"; + + src = fetchFromGitHub { + name = "textadept11"; + owner = "orbitalquark"; + repo = "textadept"; + tag = "textadept_${finalAttrs.version}"; + hash = "sha256-nPgpQeBq5Stv2o0Ke4W2Ltnx6qLe5TIC5a8HSYVkmfI="; + }; + + nativeBuildInputs = [ cmake ] ++ lib.optionals withQt [ libsForQt5.wrapQtAppsHook ]; + + buildInputs = lib.optionals withQt [ libsForQt5.qtbase ] ++ lib.optionals withCurses ncurses; + + cmakeFlags = + lib.optional withQt [ "-DQT=ON" ] + ++ lib.optional withCurses [ + "-DCURSES=ON" + "-DQT=OFF" + ]; + + preConfigure = + '' + mkdir -p $PWD/build/_deps + + '' + + lib.concatStringsSep "\n" ( + lib.mapAttrsToList ( + name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}" + ) (import ./deps.nix) + ); + + meta = { + description = "Extensible text editor based on Scintilla with Lua scripting"; + homepage = "http://foicica.com/textadept"; + downloadPage = "https://github.com/orbitalquark/textadept"; + changelog = "https://github.com/orbitalquark/textadept/releases/tag/textadept_${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + raskin + mirrexagon + arcuru + ]; + platforms = lib.platforms.linux; + mainProgram = "textadept"; + }; +}) diff --git a/pkgs/by-name/te/textcompare/package.nix b/pkgs/by-name/te/textcompare/package.nix new file mode 100644 index 000000000000..25aa8e2432db --- /dev/null +++ b/pkgs/by-name/te/textcompare/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + desktop-file-utils, + gjs, + gobject-introspection, + gtksourceview5, + gtk4, + libadwaita, + meson, + ninja, + wrapGAppsHook4, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "textcompare"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "josephmawa"; + repo = "TextCompare"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RYuWgziur4ADu99SCLh8kvzGLUzX7xqL0+Us4AsfY2g="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + desktop-file-utils + gjs + gobject-introspection + gtk4 + meson + ninja + wrapGAppsHook4 + ]; + + buildInputs = [ + gjs + gtksourceview5 + libadwaita + ]; + + preFixup = '' + sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'io.github.josephmawa.TextCompare';" $out/bin/io.github.josephmawa.TextCompare + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple desktop app to compare old and new text"; + homepage = "https://github.com/josephmawa/TextCompare"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ iamanaws ]; + mainProgram = "io.github.josephmawa.TextCompare"; + platforms = lib.lists.intersectLists lib.platforms.linux gjs.meta.platforms; + }; +}) diff --git a/pkgs/by-name/te/textlsp/package.nix b/pkgs/by-name/te/textlsp/package.nix index 24abaca86ef8..2b6ad6f59bf8 100644 --- a/pkgs/by-name/te/textlsp/package.nix +++ b/pkgs/by-name/te/textlsp/package.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pygls lsprotocol language-tool-python - tree-sitter_0_21 + tree-sitter gitpython appdirs openai diff --git a/pkgs/by-name/te/textpieces/package.nix b/pkgs/by-name/te/textpieces/package.nix index 2dfb547531ce..10593a11195e 100644 --- a/pkgs/by-name/te/textpieces/package.nix +++ b/pkgs/by-name/te/textpieces/package.nix @@ -20,18 +20,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "textpieces"; - version = "4.1.1-1"; + version = "4.2.0"; src = fetchFromGitLab { owner = "liferooter"; repo = "textpieces"; - rev = "v${finalAttrs.version}"; - hash = "sha256-+CmlJrND61w1qXSUgIsacBoJcmmf9eLI2GSvDJbXv44="; + tag = "v${finalAttrs.version}"; + hash = "sha256-JFHDPzVRD3HZI9+TBCe92xTcuIPAF/iD8hIiYPgetLc="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - hash = "sha256-fpnXMzQFne/TnRgjWy47nVlcwXFZJG4S+VD+D6bz5iQ="; + inherit (finalAttrs) pname version src; + hash = "sha256-SMNyPo0y8376wjuZVyu3jMjfPgddEMrqCPvUzsYa0xc="; }; nativeBuildInputs = [ @@ -71,11 +71,9 @@ stdenv.mkDerivation (finalAttrs: { cc0 ]; platforms = lib.platforms.linux; - maintainers = - with lib.maintainers; - [ - zendo - ] - ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ + zendo + ]; + teams = [ lib.teams.gnome-circle ]; }; }) diff --git a/pkgs/by-name/te/texturepacker/package.nix b/pkgs/by-name/te/texturepacker/package.nix index e178b5b5e866..61dc23ea5ee6 100644 --- a/pkgs/by-name/te/texturepacker/package.nix +++ b/pkgs/by-name/te/texturepacker/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "texturepacker"; - version = "7.6.1"; + version = "7.6.3"; src = fetchurl { url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb"; - hash = "sha256-e824tHi9vTxhGbIxg5BPWgb3nBt5ZA2XgtkM7g3Y5Rw="; + hash = "sha256-A1YNy6Y5EdOnV0dY0VN/k7nX26L/uaHqDHmdC5N1Otk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix index 03c992b9d9c8..120a480387e7 100644 --- a/pkgs/by-name/tf/tflint/package.nix +++ b/pkgs/by-name/tf/tflint/package.nix @@ -11,7 +11,7 @@ let pname = "tflint"; - version = "0.56.0"; + version = "0.57.0"; in buildGoModule { inherit pname version; @@ -20,10 +20,10 @@ buildGoModule { owner = "terraform-linters"; repo = pname; tag = "v${version}"; - hash = "sha256-Ku58lO3EHTFdWSd6xMdvjRlCuhEEXZc89GBFdGxhRBo="; + hash = "sha256-mmrXP81CVyFObmzLveqZNwHbRTnDyKfoTPFlq1WyxxE="; }; - vendorHash = "sha256-Ht+MK1WwiM12swR99zle6V2rcuEXpx5B9Kj6um1g2t8="; + vendorHash = "sha256-ljJnMAD+cvlq7NxrbrbE53+uPWknRqN5KD8SYqqjZ9w="; doCheck = false; diff --git a/pkgs/by-name/tf/tfmigrate/package.nix b/pkgs/by-name/tf/tfmigrate/package.nix new file mode 100644 index 000000000000..a03840702747 --- /dev/null +++ b/pkgs/by-name/tf/tfmigrate/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "tfmigrate"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "minamijoyo"; + repo = "tfmigrate"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+5nw+EgFTor8XL4cibxkpJL4fdEQ6UuEj5wyOjpaANA="; + }; + + vendorHash = "sha256-mm34U4nLow4lCz/AgfqYZJRb71GpQjR14+tm0hfmdDc="; + + checkFlags = [ + "-skip TestExecutorDir" # assumes /usr/bin to be present + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A Terraform / OpenTofu state migration tool for GitOps "; + homepage = "https://github.com/minamijoyo/tfmigrate"; + changelog = "https://github.com/minamijoyo/tfmigrate/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lykos153 ]; + mainProgram = "tfmigrate"; + }; +}) diff --git a/pkgs/by-name/tf/tfsec/package.nix b/pkgs/by-name/tf/tfsec/package.nix index a189d3b75b41..a57e58563f83 100644 --- a/pkgs/by-name/tf/tfsec/package.nix +++ b/pkgs/by-name/tf/tfsec/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.28.13"; + version = "1.28.14"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "tfsec"; tag = "v${version}"; - hash = "sha256-4auh0MPLSAkygbVZC2PbEcA21PNmBNkr4fA1m1H9kyU="; + hash = "sha256-8nZU7CjeKfpx1Fl3YtuQepW0LAG9/ng+8bMkoT1xmCQ="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorHash = "sha256-cGVHDq4exa1dZxEemCWNLA5H201SXwW0madYCWHwtxM="; + vendorHash = "sha256-SuXrZNjr+x4uIA8fIae/9kypH/GDDKaiymD12xJvIFw="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix index c62723fe880b..2b72188f298b 100644 --- a/pkgs/by-name/tf/tfswitch/package.nix +++ b/pkgs/by-name/tf/tfswitch/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "tfswitch"; - version = "1.4.2"; + version = "1.4.5"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = "v${version}"; - sha256 = "sha256-y9MoDtF0104HRjDqpRuMfBbsNqseynq2azKnXNdRhso="; + sha256 = "sha256-hwAVnTvOXxLUCtCKNMvdS4MfscpMACIZHgJsJNqAJBE="; }; - vendorHash = "sha256-m3QzNSAcUrI4Pg7LMDZftlBbk4Uhjirc6eNSrQxxwLA="; + vendorHash = "sha256-inMUSw75tLPAhJrcralzeib2Mo1H37CI7629Xopu/mA="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/by-name/tf/tftui/package.nix b/pkgs/by-name/tf/tftui/package.nix new file mode 100644 index 000000000000..be3d08a35b3e --- /dev/null +++ b/pkgs/by-name/tf/tftui/package.nix @@ -0,0 +1,57 @@ +{ + lib, + fetchFromGitHub, + makeWrapper, + python3Packages, + enableUsageTracking ? false, +}: + +python3Packages.buildPythonApplication rec { + pname = "tftui"; + version = "0.13.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "idoavrah"; + repo = "terraform-tui"; + tag = "v${version}"; + hash = "sha256-xOlPuPVwfVT7jfBJPqZ5FbOs80HE0k2ZqcA+Jcxh9p4="; + }; + + pythonRelaxDeps = [ + "posthog" + "textual" + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + build-system = [ python3Packages.poetry-core ]; + + dependencies = with python3Packages; [ + posthog + pyperclip + requests + rich + textual + ]; + + pythonImportsCheck = [ + "tftui" + ]; + + postInstall = lib.optionalString (!enableUsageTracking) '' + wrapProgram $out/bin/tftui \ + --add-flags "--disable-usage-tracking" + ''; + + meta = with lib; { + description = "Textual UI to view and interact with Terraform state"; + homepage = "https://github.com/idoavrah/terraform-tui"; + changelog = "https://github.com/idoavrah/terraform-tui/releases/tag/v${version}"; + license = licenses.asl20; + teams = [ teams.bitnomial ]; + mainProgram = "tftui"; + }; +} diff --git a/pkgs/by-name/tf/tfupdate/package.nix b/pkgs/by-name/tf/tfupdate/package.nix index 098510b344fe..494debf78537 100644 --- a/pkgs/by-name/tf/tfupdate/package.nix +++ b/pkgs/by-name/tf/tfupdate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tfupdate"; - version = "0.8.5"; + version = "0.9.1"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfupdate"; rev = "v${version}"; - sha256 = "sha256-iWiY1IuNZCqHpnAoib0SkWwAg1Mnuqr2QjKI3KZGYs0="; + sha256 = "sha256-hxg/hAfUjygBgkfql2ZpiskKPqwVmo2MZ4n9eod5Kn4="; }; - vendorHash = "sha256-/ZNWVuGInZY/t0s317FQstEPeJpTKWMXUVo8cE44GkI="; + vendorHash = "sha256-dWp9onewCiemk3AUTgiaVwnLuVVMMTk/6hCWDS5NS88="; # Tests start http servers which need to bind to local addresses: # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted diff --git a/pkgs/by-name/tg/tg-archive/package.nix b/pkgs/by-name/tg/tg-archive/package.nix index 2cde3f0a85bd..dfe236ce2ce2 100644 --- a/pkgs/by-name/tg/tg-archive/package.nix +++ b/pkgs/by-name/tg/tg-archive/package.nix @@ -6,7 +6,7 @@ let pname = "tg-archive"; - version = "1.2.2"; + version = "1.3.0"; in python3.pkgs.buildPythonApplication { @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication { owner = "knadh"; repo = "tg-archive"; tag = "v${version}"; - hash = "sha256-baosQnA67+v0XxGrXEYjGGsKCBj1uRcYgfKkqO2GST4="; + hash = "sha256-/b9LmHOyFqaKiQ5FHemLmg6DZU+3zzh1jLBEI7RTu4Q="; }; pyproject = true; diff --git a/pkgs/by-name/tg/tgpt/package.nix b/pkgs/by-name/tg/tgpt/package.nix index f9f9576b98ad..b009bb76ed5a 100644 --- a/pkgs/by-name/tg/tgpt/package.nix +++ b/pkgs/by-name/tg/tgpt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tgpt"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "tgpt"; tag = "v${version}"; - hash = "sha256-6gUHTQfvGD1hIKrPWQrSr7kWL7GeuJXY7BY1gaAxHUw="; + hash = "sha256-FCc1D/q+8i/ZFZDgtBoMpF+GEnHne4M5bazJWnF5GbE="; }; vendorHash = "sha256-hPbvzhYHOxytQs3NkSVaZhFH0TbOlr4U/QiH+vemTrc="; diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index de8f9c4ffd72..c988e11e50b5 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "thanos"; - version = "0.37.2"; + version = "0.38.0"; src = fetchFromGitHub { owner = "thanos-io"; repo = "thanos"; tag = "v${version}"; - hash = "sha256-IbQsUanLCDZ1Ku2Xu6ValR4iGM+cxxyEGxDFjJzsEcg="; + hash = "sha256-3rNtiVTrA+MoCVuTSLIzh65U0kjA86EF+bQCyfVa6rA="; }; - vendorHash = "sha256-+YjzHDVEVVwx4qApfNppuTYQJcwpQxRTxAkrkdBt/iY="; + vendorHash = "sha256-Z/S4mVg+VbP8hNVB1xz1uGWR6N/1aTA0DqTHbntGMLg="; subPackages = "cmd/thanos"; diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix index f65c0428f7c5..5d974aa26ddf 100644 --- a/pkgs/by-name/th/thc-hydra/package.nix +++ b/pkgs/by-name/th/thc-hydra/package.nix @@ -6,7 +6,7 @@ openssl, ncurses, libidn, - pcre, + pcre2, libssh, libmysqlclient, libpq, @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { openssl ncurses libidn - pcre + pcre2 libssh libmysqlclient libpq diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix index b0791b66ccb5..4f05c970dfcb 100644 --- a/pkgs/by-name/th/the-powder-toy/package.nix +++ b/pkgs/by-name/th/the-powder-toy/package.nix @@ -1,6 +1,5 @@ { bzip2, - Cocoa, copyDesktopItems, curl, fetchFromGitHub, @@ -8,6 +7,7 @@ jsoncpp, lib, libpng, + libX11, lua, luajit, meson, @@ -42,11 +42,12 @@ stdenv.mkDerivation rec { fftwFloat jsoncpp libpng + libX11 lua luajit SDL2 zlib - ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ]; mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; diff --git a/pkgs/by-name/th/the-unarchiver/info.json b/pkgs/by-name/th/the-unarchiver/info.json index 068fe7a3f44b..46fed984db83 100644 --- a/pkgs/by-name/th/the-unarchiver/info.json +++ b/pkgs/by-name/th/the-unarchiver/info.json @@ -1,5 +1,5 @@ { - "version": "4.3.8", - "url": "https://dl.devmate.com/com.macpaw.site.theunarchiver/146/1715865652/TheUnarchiver-146.zip", - "hash": "sha256-VcgNT7z7KtdAZxya8DS4Kuk323AAh3Mv/2L7LpUS2NU=" + "version": "4.3.9", + "url": "https://dl.devmate.com/com.macpaw.site.theunarchiver/147/1742287964/TheUnarchiver-147.zip", + "hash": "sha256-0NjdLgKFGezl7rDwGLM5L2fhyFBTRyzLuu5k6H8XOig=" } diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix index ca41c64a18c3..5fde06c463a9 100644 --- a/pkgs/by-name/th/the-way/package.nix +++ b/pkgs/by-name/th/the-way/package.nix @@ -1,19 +1,20 @@ { lib, - rustPlatform, - fetchCrate, - installShellFiles, stdenv, - darwin, + rustPlatform, + fetchFromGitHub, + installShellFiles, }: rustPlatform.buildRustPackage rec { pname = "the-way"; version = "0.20.3"; - src = fetchCrate { - inherit pname version; - hash = "sha256-/vG5LkQiA8iPP+UV1opLeJwbYfmzqYwpsoMizpGT98o="; + src = fetchFromGitHub { + owner = "out-of-cheese-error"; + repo = "the-way"; + tag = "v${version}"; + hash = "sha256-zsfk5APxbnssMKud9xGc70N+57LSc+vk6sSb2XzFUyA="; }; useFetchCargoVendor = true; @@ -21,13 +22,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - + doCheck = !stdenv.hostPlatform.isDarwin; useNextest = true; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/the-way config default tmp.toml for shell in bash fish zsh; do THE_WAY_CONFIG=tmp.toml $out/bin/the-way complete $shell > the-way.$shell @@ -41,6 +39,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/out-of-cheese-error/the-way"; changelog = "https://github.com/out-of-cheese-error/the-way/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; + platforms = lib.platforms.unix; maintainers = with maintainers; [ figsoda numkem diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix index 001b277ffc2a..27ae223d3616 100644 --- a/pkgs/by-name/th/theforceengine/package.nix +++ b/pkgs/by-name/th/theforceengine/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, SDL2, SDL2_image, + libX11, rtaudio, rtmidi, glew, @@ -14,21 +15,15 @@ zenity, withEditor ? true, }: -let - # package depends on SDL2main static library - SDL2' = SDL2.override { - withStatic = true; - }; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "theforceengine"; - version = "1.22.200"; + version = "1.22.300"; src = fetchFromGitHub { owner = "luciusDXL"; repo = "TheForceEngine"; - rev = "v${version}"; - hash = "sha256-Mvp9VrPk36wNTUwNQT83JPOEO72Xhqmhkn3/KfZhQX4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-m/VNlcuvpJkcfTpL97gCUTQtdAWqimVrhU0qLj0Erck="; }; nativeBuildInputs = [ @@ -37,13 +32,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL2' + SDL2 SDL2_image + libX11 rtaudio rtmidi glew alsa-lib angelscript + zenity ]; hardeningDisable = [ "format" ]; @@ -63,12 +60,12 @@ stdenv.mkDerivation rec { --replace-fail "flags(flag::has_zenity) ? \"zenity\"" "flags(flag::has_zenity) ? \"${lib.getExe zenity}\"" ''; - meta = with lib; { + meta = { description = "Modern \"Jedi Engine\" replacement supporting Dark Forces, mods, and in the future, Outlaws"; mainProgram = "theforceengine"; homepage = "https://theforceengine.github.io"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ devusb ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ devusb ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/th/theft/package.nix b/pkgs/by-name/th/theft/package.nix index 97c56847006a..37ffd27e8391 100644 --- a/pkgs/by-name/th/theft/package.nix +++ b/pkgs/by-name/th/theft/package.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { sha256 = "1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd"; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "ar -rcs" "${stdenv.cc.targetPrefix}ar -rcs" + ''; + preConfigure = "patchShebangs ./scripts/mk_bits_lut"; doCheck = true; diff --git a/pkgs/by-name/th/theharvester/package.nix b/pkgs/by-name/th/theharvester/package.nix index d9b97aa13db3..e0a2265c7f9f 100644 --- a/pkgs/by-name/th/theharvester/package.nix +++ b/pkgs/by-name/th/theharvester/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "theharvester"; - version = "4.7.0"; + version = "4.7.1"; pyproject = true; src = fetchFromGitHub { owner = "laramies"; repo = "theharvester"; tag = version; - hash = "sha256-eO4jRyzMZQT4Fy1i1OHIf5UDqX8o1gmj6yHrIAxc0Mw="; + hash = "sha256-IBisnQGdhPCoVPPH/GHLJg5qoh08KfMuMxbsqF3jjpE="; }; postPatch = '' diff --git a/pkgs/by-name/th/thepeg/package.nix b/pkgs/by-name/th/thepeg/package.nix index 32d72e288e87..d61c932aa036 100644 --- a/pkgs/by-name/th/thepeg/package.nix +++ b/pkgs/by-name/th/thepeg/package.nix @@ -51,11 +51,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Toolkit for High Energy Physics Event Generation"; homepage = "https://herwig.hepforge.org/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ veprbl ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + badPlatforms = [ + # ../include/ThePEG/Config/std.h:101:12: error: no member named 'mem_fun' in namespace 'std'; did you mean 'mem_fn'? + lib.systems.inspect.patterns.isDarwin + ]; }; } diff --git a/pkgs/by-name/th/therion/package.nix b/pkgs/by-name/th/therion/package.nix index ac2a0d722673..2f9bd7a583ec 100644 --- a/pkgs/by-name/th/therion/package.nix +++ b/pkgs/by-name/th/therion/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "therion"; - version = "6.3.3"; + version = "6.3.4"; src = fetchFromGitHub { owner = "therion"; repo = "therion"; tag = "v${version}"; - hash = "sha256-yxY4rYaDmDK0mJH60FS12ILjntsjxhFNeijTFrNKSzU="; + hash = "sha256-kus5MoiUrLadpzq0wPB+J85F0RVva7NAYM6E6HX4eJ8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/th/thrift-ls/package.nix b/pkgs/by-name/th/thrift-ls/package.nix index 3b97e030594d..4db75983afa6 100644 --- a/pkgs/by-name/th/thrift-ls/package.nix +++ b/pkgs/by-name/th/thrift-ls/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "thrift-ls"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "joyme123"; repo = "thrift-ls"; rev = "v${version}"; - hash = "sha256-BkkXvmJ1XmDamU2Mt0BjbSnNVwlBxphW1FvE4x32ja0="; + hash = "sha256-QX4ChPjHIY0GtjqmZH5Q4veC+VnMntYIQvwwSds8UUo="; }; - vendorHash = "sha256-YoZ2dku84065Ygh9XU6dOwmCkuwX0r8a0Oo8c1HPsS4="; + vendorHash = "sha256-SGCJ12BxjFUQ7bnaNY0bvrrtm2qNNrwYKKfNEi1lPco="; postInstall = '' mv $out/bin/thrift-ls $out/bin/thriftls diff --git a/pkgs/by-name/ti/ticker/package.nix b/pkgs/by-name/ti/ticker/package.nix index 3258aba4bd4f..8e544c4c2de3 100644 --- a/pkgs/by-name/ti/ticker/package.nix +++ b/pkgs/by-name/ti/ticker/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.8.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; tag = "v${version}"; - hash = "sha256-2qg7/gzogvK8eIj9NzFELoeXrtJGC5pS4LvR2msOuHY="; + hash = "sha256-fRmW9Cs0Rxp+St4BUswHt/JxHgVy1Go4OR9oarkAufw="; }; - vendorHash = "sha256-o3hVRHyrJpmYgephoZ2JlVLGSqZtRQAp48OzoIMY3do="; + vendorHash = "sha256-4e3TB4EHJTFxBcjAepEU8u4gurhss2seihw3VRiVoqQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/ti/tickrs/package.nix b/pkgs/by-name/ti/tickrs/package.nix index 76af2e026e12..d9b682eb2160 100644 --- a/pkgs/by-name/ti/tickrs/package.nix +++ b/pkgs/by-name/ti/tickrs/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/ti/tidal-hifi/electron.nix b/pkgs/by-name/ti/tidal-hifi/electron.nix new file mode 100644 index 000000000000..1d617662f512 --- /dev/null +++ b/pkgs/by-name/ti/tidal-hifi/electron.nix @@ -0,0 +1,31 @@ +{ + fetchzip, + lib, +}: +let + /* + see: + https://github.com/Mastermindzh/tidal-hifi/blob/master/build/electron-builder.base.yml + for the expected version + */ + version = "35.1.1"; +in +(fetchzip { + url = "https://github.com/castlabs/electron-releases/releases/download/v${version}+wvcus/electron-v${version}+wvcus-linux-x64.zip"; + hash = "sha256-AkPKeG7MrCBlk41qXZxFPRukUPRcIUanq6fJPx5d3RU="; + stripRoot = false; + +}).overrideAttrs + ( + final: _: { + name = "castlabs-electron-${version}"; + inherit version; + pname = "castlabs-electron"; + passthru.dist = final.finalPackage.outPath; + + meta = { + license = lib.licenses.unfreeRedistributable; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; + } + ) diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index ec86e406ba92..c7314ecfa706 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -1,137 +1,204 @@ { lib, + buildNpmPackage, + fetchFromGitHub, + callPackage, + makeShellWrapper, + copyDesktopItems, + makeDesktopItem, stdenv, - fetchurl, - autoPatchelfHook, - dpkg, - makeWrapper, wrapGAppsHook3, - alsa-lib, + glib, + gtk3, + gtk4, at-spi2-atk, - at-spi2-core, - atk, + libdrm, + libgbm, + libxkbcommon, + libxshmfence, + libGL, + vulkan-loader, + alsa-lib, cairo, cups, dbus, expat, - ffmpeg, - fontconfig, - freetype, gdk-pixbuf, - glib, - gtk3, - libappindicator-gtk3, - libdbusmenu, - libdrm, - libnotify, - libpulseaudio, - libsecret, - libuuid, - libxkbcommon, - libgbm, nss, + nspr, + libX11, + libxcb, + libXcomposite, + libXdamage, + libXext, + libXfixes, + libXrandr, + libxkbfile, pango, systemd, - xdg-utils, - xorg, - libGL, + pciutils, + libnotify, + pipewire, + libsecret, + libpulseaudio, + speechd-minimal, + + castlabs-electron ? callPackage ./electron.nix { }, }: -stdenv.mkDerivation (finalAttrs: { - pname = "tidal-hifi"; - version = "5.18.0"; +let + version = "5.19.0"; - src = fetchurl { - url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-R5Xw9uIptVPYEZ73TtdWarQNtn8nhAUN+zA5tnzTaCU="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - wrapGAppsHook3 - ]; - - buildInputs = [ + electronLibPath = lib.makeLibraryPath [ alsa-lib at-spi2-atk - at-spi2-core - atk cairo cups dbus expat - ffmpeg - fontconfig - freetype gdk-pixbuf glib gtk3 - pango - systemd - libgbm + gtk4 nss - libuuid - libdrm + nspr + libX11 + libxcb + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + libxkbfile + pango + pciutils + stdenv.cc.cc + systemd libnotify + pipewire libsecret libpulseaudio + speechd-minimal + libdrm + libgbm libxkbcommon - libappindicator-gtk3 - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libxshmfence - xorg.libXtst + libxshmfence libGL + vulkan-loader + ]; +in +buildNpmPackage { + pname = "tidal-hifi"; + inherit version; + + src = fetchFromGitHub { + owner = "Mastermindzh"; + repo = "tidal-hifi"; + tag = version; + hash = "sha256-/pPmfgKwrtOrEu7YVJTuQF/FIMa+W6uSnFbMFuyURFQ="; + }; + + nativeBuildInputs = [ + makeShellWrapper + wrapGAppsHook3 + copyDesktopItems ]; - runtimeDependencies = [ - (lib.getLib systemd) - libnotify - libdbusmenu - xdg-utils + npmDepsHash = "sha256-TNhD/ZkqJtsidAEIOL/WmJZw09BuFgd4ECnzbieNhVY="; + forceGitDeps = true; + makeCacheWritable = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + buildPhase = '' + runHook preBuild + + npm run compile + npm exec electron-builder -- \ + --dir \ + --config build/electron-builder.base.yml \ + -c.electronDist=${castlabs-electron.dist} \ + -c.electronVersion=${castlabs-electron.version} + + runHook postBuild + ''; + + desktopItems = [ + (makeDesktopItem { + exec = "tidal-hifi"; + name = "TIDAL Hi-Fi"; + desktopName = "tidal-hifi"; + genericName = "TIDAL Hi-Fi"; + comment = "The web version of listen.tidal.com running in electron with hifi support thanks to widevine."; + icon = "tidal-hifi"; + startupNotify = true; + terminal = false; + type = "Application"; + categories = [ + "Network" + "Application" + "AudioVideo" + "Audio" + "Video" + ]; + startupWMClass = "tidal-hifi"; + mimeTypes = [ "x-scheme-handler/tidal" ]; + extraConfig.X-PulseAudio-Properties = "media.role=music"; + }) ]; + dontWrapGApps = true; + installPhase = '' runHook preInstall - mkdir -p "$out/bin" - cp -R "opt" "$out" - cp -R "usr/share" "$out/share" - chmod -R g-w "$out" + for i in 16 22 24 32 48 64 128 256 384; do + install -Dm644 "assets/icons/$i"x"$i.png" "$out/share/icons/hicolor/$i"x"$i/apps/tidal-hifi.png" + done + + mv dist/linux-unpacked "$out/share/tidal-hifi" runHook postInstall ''; + # see: pkgs/development/tools/electron/binary/generic.nix postFixup = '' - makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${electronLibPath}:$out/share/tidal-hifi" \ + $out/share/tidal-hifi/tidal-hifi \ + $out/share/tidal-hifi/chrome_crashpad_handler + + # patch libANGLE + patchelf \ + --set-rpath "${ + lib.makeLibraryPath [ + libGL + pciutils + vulkan-loader + ] + }" \ + $out/share/tidal-hifi/lib*GL* + + # replace bundled vulkan-loader + ln -sf -t "$out/share/tidal-hifi" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" + + makeShellWrapper "$out/share/tidal-hifi/tidal-hifi" "$out/bin/tidal-hifi" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ "''${gappsWrapperArgs[@]}" - substituteInPlace $out/share/applications/tidal-hifi.desktop \ - --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" ''; meta = { - changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}"; description = "Web version of Tidal running in electron with hifi support thanks to widevine"; homepage = "https://github.com/Mastermindzh/tidal-hifi"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + gerg-l qbit spikespaz ]; platforms = lib.platforms.linux; mainProgram = "tidal-hifi"; }; -}) +} diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix index a262e0db8343..e937f5a2fe02 100644 --- a/pkgs/by-name/ti/tideways-cli/package.nix +++ b/pkgs/by-name/ti/tideways-cli/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-cli"; - version = "1.2.8"; + version = "1.2.10"; nativeBuildInputs = [ installShellFiles ]; @@ -38,19 +38,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-eIgCUgyjGDJ1cPVJb3tuN45VrQGXegbcxUGYj4BRQ/k="; + hash = "sha256-dUWwX+0rDQce/AklrBU4ALRSmHbBnbQQGlUtfK+Foeg="; }; "aarch64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-4g7zXmz5e9PjmWV5WHc3zmDkJQyn6lYvDHqqhGsTZeg="; + hash = "sha256-a/0H64NSJZG2ixJCeCAp1SD/2l6HGCT1oECTSsgfu2E="; }; "x86_64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-++B5ut7a4kIEJS5cRlG2q7QQzNH9VQh6K1JdFWAJ6Ns="; + hash = "sha256-B5K7CvBVdSpgRfPXxYraPIZwkwW/kxlkPmaDEy1cOuE="; }; "aarch64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-ot3MQhOYHow7gh92CmEw5nw7OLuBTHMnXP/4GPAo0k4="; + hash = "sha256-xstTc8y03uWmN33Oi8h7zmoMm4XtY8kl3taLlaJCYmk="; }; }; diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix index a7842e63dd2a..0fdf077aa2fe 100644 --- a/pkgs/by-name/ti/tideways-daemon/package.nix +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-daemon"; - version = "1.9.36"; + version = "1.9.40"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-+EnXHjFAD23jmG8IucnppjWeGNKX6yzWJypICECy3do="; + hash = "sha256-6U6Vq908tJmR4JzZlbK/qjlfCl/iWrCIOJNvUh0Xvag="; }; "aarch64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; - hash = "sha256-p5/wzvr7EyvELADfA1X/mo8VdAT47SbAXZlIWdGZVb4="; + hash = "sha256-2Yq2HvQoBPPDvEyZPjwyTjjc/bb4+zOrwknqHUnZsjc="; }; "aarch64-darwin" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-uI7qOO7nj32BXrNFMmQlX32omT4Kxruf/J7A63QQ62w="; + hash = "sha256-ab7ZAUYH4Em6KuE/VlVLItf3N0yMvIRuJnf7vOGDGsY="; }; }; updateScript = "${ diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index f39396bdf824..f66badc70448 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-HTKfTNdGBUWX5QTHdSvflwPX0ytmsb5AEbb1XcJz1/k="; - "x86_64-linux" = "sha256-cIfia5bdwqGURd9JocZYssxQwhonFFNEJbS+gcaPdTk="; - "aarch64-linux" = "sha256-mTkaMP9Xo/U/oveuZBT4kXU7P/6zg7RUnKof/5VpxoQ="; + "universal-macos" = "sha256-fpAVZK0NauxseFFpQChNW1o/oE8Go29Ie/xImW1AbiY="; + "x86_64-linux" = "sha256-tosXTaJ4FTJuL3CvGbQPtpFKXRvp7tWvoyHQjehK+Ak="; + "aarch64-linux" = "sha256-7XjSlWu75az73W2A5dEAPd35G+GEAE0t1tZhrqnbqPE="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.16.33"; + version = "0.16.39"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix index 617d901ed547..92853c15b8ed 100644 --- a/pkgs/by-name/ti/tigervnc/package.nix +++ b/pkgs/by-name/ti/tigervnc/package.nix @@ -22,6 +22,7 @@ perl, makeWrapper, nixosTests, + ffmpeg, }: stdenv.mkDerivation rec { @@ -138,6 +139,7 @@ stdenv.mkDerivation rec { libjpeg_turbo pixman gawk + ffmpeg ] ++ lib.optionals stdenv.hostPlatform.isLinux ( with xorg; diff --git a/pkgs/by-name/ti/tika/package.nix b/pkgs/by-name/ti/tika/package.nix index e137b2e2e95f..cbd1309bfbba 100644 --- a/pkgs/by-name/ti/tika/package.nix +++ b/pkgs/by-name/ti/tika/package.nix @@ -2,26 +2,41 @@ lib, stdenv, maven, - jdk8, + jdk17, + jre17_minimal, fetchFromGitHub, makeWrapper, mvnDepsHash ? null, + enableGui ? true, enableOcr ? true, + runCommand, tesseract, nixosTests, }: let mvnDepsHashes = { - "x86_64-linux" = "sha256-a2EIxok7Ov2QQntu3fpagzvMAQcBjKwcd1whDNdCm2E="; - "aarch64-linux" = "sha256-TUJmlnFJeYY4Pzrmd+9uKb07Tq7HYd4EnAXkbgGCFDk="; - "x86_64-darwin" = "sha256-OTctUd4lsH6Z6H7rDYbyAcrBmzpSzFELjPBRN8zUyhY="; - "aarch64-darwin" = "sha256-0tNFHEaxAEqrZTTrGCIX53K9MczkqIuDABD/bB6R1KU="; + "x86_64-linux" = "sha256-OTd51n6SSlFziqvvHmfyMAyQRwIzsHxFGuJ62zlX1Ec="; + "aarch64-linux" = "sha256-tPaGLqm0jgEoz0BD/C6AG9xupovQvib/v0kB/jjqwB8="; + "x86_64-darwin" = "sha256-Rs7nTiGazUW8oJJr6fbJKelzFqd2n278sJYoMy2/0N4="; + "aarch64-darwin" = "sha256-gnP+G33LPRMQ6HRzeZ8cEV9oSohrlPcMwlBB4rvH7+E="; }; knownMvnDepsHash = mvnDepsHashes.${stdenv.system} or (lib.warn "This platform doesn't have a default mvnDepsHash value, you'll need to specify it manually" lib.fakeHash); + + jdk = jre17_minimal.override { + modules = [ + "java.base" + "java.desktop" + "java.logging" + "java.management" + "java.naming" + "java.sql" + ]; + jdk = jdk17; + }; in maven.buildMavenPackage rec { pname = "tika"; @@ -43,30 +58,53 @@ maven.buildMavenPackage rec { "org.junit.platform:junit-platform-launcher:1.10.0" ]; - mvnJdk = jdk8; + mvnJdk = jdk17; mvnHash = if mvnDepsHash != null then mvnDepsHash else knownMvnDepsHash; - mvnParameters = toString [ - "-DskipTests=true" # skip tests (out of memory exceptions) - "-Dossindex.skip" # skip dependency with vulnerability (recommended by upstream) - ]; + mvnParameters = toString ( + [ + "-DskipTests=true" # skip tests (out of memory exceptions) + "-Dossindex.skip" # skip dependency with vulnerability (recommended by upstream) + ] + ++ lib.optionals (!enableGui) [ + "-am -pl :tika-server-standard" + ] + ); nativeBuildInputs = [ makeWrapper ]; installPhase = let - binPath = lib.makeBinPath ([ jdk8.jre ] ++ lib.optionals enableOcr [ tesseract ]); + flags = "--add-opens java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED"; + + binPath = lib.makeBinPath ( + [ + (runCommand "jdk-tika" + { + nativeBuildInputs = [ makeWrapper ]; + } + '' + makeWrapper ${jdk}/bin/java $out/bin/java \ + --add-flags "${flags}" + '' + ) + ] + ++ lib.optionals enableOcr [ tesseract ] + ); in '' runHook preInstall # Note: using * instead of version would match multiple files + '' + + lib.optionalString enableGui '' install -Dm644 tika-app/target/tika-app-${version}.jar $out/share/tika/tika-app.jar + makeWrapper ${jdk}/bin/java $out/bin/tika-app \ + --add-flags "${flags} -jar $out/share/tika/tika-app.jar" + '' + + '' install -Dm644 tika-server/tika-server-standard/target/tika-server-standard-${version}.jar $out/share/tika/tika-server.jar - - makeWrapper ${jdk8.jre}/bin/java $out/bin/tika-app \ - --add-flags "-jar $out/share/tika/tika-app.jar" - makeWrapper ${jdk8.jre}/bin/java $out/bin/tika-server \ + makeWrapper ${jdk}/bin/java $out/bin/tika-server \ --prefix PATH : ${binPath} \ --add-flags "-jar $out/share/tika/tika-server.jar" diff --git a/pkgs/by-name/ti/tilda/package.nix b/pkgs/by-name/ti/tilda/package.nix index ac9ad26a3a83..5a8e141290e2 100644 --- a/pkgs/by-name/ti/tilda/package.nix +++ b/pkgs/by-name/ti/tilda/package.nix @@ -42,6 +42,12 @@ stdenv.mkDerivation (finalAttrs: { # ugly hack for xgettext to work during build env.LD_LIBRARY_PATH = "${lib.getLib expat}/lib"; + # with -std=c99, the build fails due to implicit function declaration errors + # for the popen() and pclose() calls in src/tilda-lock-files.c + postPatch = '' + substituteInPlace configure.ac --replace-fail -std=c99 -std=gnu99 + ''; + # The config locking scheme relies on the binary being called "tilda" # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice: postInstall = '' diff --git a/pkgs/by-name/ti/tile-downloader/package.nix b/pkgs/by-name/ti/tile-downloader/package.nix new file mode 100644 index 000000000000..6bd03ea45222 --- /dev/null +++ b/pkgs/by-name/ti/tile-downloader/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + nix-update-script, + openssl, + pkg-config, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "tile-downloader"; + version = "0.1.0"; + + src = fetchFromGitLab { + domain = "gitlab.scd31.com"; + owner = "stephen"; + repo = "tile-downloader"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+FnLGMUGyuaN7uPRvuounDKwF6pV9NKv3r/ajdKtdCE="; + }; + + cargoHash = "sha256-jKNp+YJKZ3qpaDzwi3DvFaZAipRhm1+sTtKBtQEj7qI="; + + passthru = { + updateScript = nix-update-script { }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + openssl + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "Multi-threaded raster tile downloader, primarily designed for downloading OSM tiles for usage offline"; + mainProgram = "tile-downloader"; + homepage = "https://gitlab.scd31.com/stephen/tile-downloader"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ scd31 ]; + }; +}) diff --git a/pkgs/by-name/ti/tile38/package.nix b/pkgs/by-name/ti/tile38/package.nix index 292199c15153..dabf52b762f4 100644 --- a/pkgs/by-name/ti/tile38/package.nix +++ b/pkgs/by-name/ti/tile38/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tile38"; - version = "1.34.2"; + version = "1.34.4"; src = fetchFromGitHub { owner = "tidwall"; repo = "tile38"; tag = version; - hash = "sha256-F6mSIKivRkqbuixWyl9EmUskHsiQyzNrEt1ONvDVKrg="; + hash = "sha256-TLVFFgT5lxOLhv1RBS09DCcZAozkcHzIBlJSWt1ztB4="; }; - vendorHash = "sha256-SJ80FSoG8RhsReDmSX120bxzcgZ3cD3vNvWt/HiV3/w="; + vendorHash = "sha256-geXYLeJf/u+8RD7Slr2x+J6zABkWSIfhxKLxZVF/icU="; subPackages = [ "cmd/tile38-cli" @@ -36,6 +36,6 @@ buildGoModule rec { ''; homepage = "https://tile38.com/"; license = lib.licenses.mit; - maintainers = lib.teams.geospatial.members; + teams = [ lib.teams.geospatial ]; }; } diff --git a/pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch b/pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch deleted file mode 100644 index 7a5a01c54588..000000000000 --- a/pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/FindMagic_EP.cmake b/FindMagic_EP.cmake ---- a/cmake/Modules/FindMagic_EP.cmake -+++ b/cmake/Modules/FindMagic_EP.cmake -@@ -126,9 +126,7 @@ if(NOT TILEDB_LIBMAGIC_EP_BUILT) - # that was modified by tiledb to also build with cmake for nix - ExternalProject_Add(ep_magic - PREFIX "externals" -- GIT_REPOSITORY "https://github.com/TileDB-Inc/file-windows.git" -- GIT_TAG "5.38.2.tiledb" -- GIT_SUBMODULES_RECURSE TRUE -+ DOWNLOAD_COMMAND true - UPDATE_COMMAND "" - CMAKE_ARGS - -DCMAKE_INSTALL_PREFIX=${TILEDB_EP_INSTALL_PREFIX} diff --git a/pkgs/by-name/ti/tiledb/generate_embedded_data_header.patch b/pkgs/by-name/ti/tiledb/generate_embedded_data_header.patch new file mode 100644 index 000000000000..e24756d8ce72 --- /dev/null +++ b/pkgs/by-name/ti/tiledb/generate_embedded_data_header.patch @@ -0,0 +1,14 @@ +--- a/tiledb/sm/misc/generate_embedded_data_header.script.cmake ++++ b/tiledb/sm/misc/generate_embedded_data_header.script.cmake +@@ -40,11 +40,7 @@ + string(MAKE_C_IDENTIFIER ${INPUT_FILENAME} INPUT_VARIABLE) + + message(DEBUG "Compressing ${INPUT_FILE} to ${compressed_file}") +-file(ARCHIVE_CREATE OUTPUT "${compressed_file}" PATHS ${INPUT_FILE} FORMAT raw COMPRESSION Zstd +- # Level 12 was found to have the best balance between compression ratio and speed +- # but is available in CMake 3.26+. +- COMPRESSION_LEVEL 9 +-) ++execute_process(COMMAND zstd -9 -c "${INPUT_FILE}" OUTPUT_FILE "${compressed_file}") + file(SIZE ${compressed_file} COMPRESSED_SIZE) + message(DEBUG "Compressed size: ${COMPRESSED_SIZE} bytes") diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix index ca15cf16221e..5454d074713a 100644 --- a/pkgs/by-name/ti/tiledb/package.nix +++ b/pkgs/by-name/ti/tiledb/package.nix @@ -2,95 +2,79 @@ lib, stdenv, fetchFromGitHub, - cmake, zlib, lz4, bzip2, zstd, spdlog, - tbb, + tbb_2022_0, openssl, boost, libpqxx, clang-tools, catch2_3, python3, - gtest, doxygen, fixDarwinDylibNames, + gtest, + rapidcheck, + libpng, + file, + runCommand, useAVX2 ? stdenv.hostPlatform.avx2Support, }: let - # pre-fetch ExternalProject from cmake/Modules/FindMagic_EP.cmake - ep-file-windows = fetchFromGitHub { - owner = "TileDB-Inc"; - repo = "file-windows"; - rev = "5.38.2.tiledb"; - hash = "sha256-TFn30VCuWZr252VN1T5NNCZe2VEN3xQSomS7XxxKGF8="; - fetchSubmodules = true; - }; - + rapidcheck' = runCommand "rapidcheck" { } '' + cp -r ${rapidcheck.out} $out + chmod -R +w $out + cp -r ${rapidcheck.dev}/* $out + ''; + catch2 = catch2_3; + tbb = tbb_2022_0; in stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.18.2"; + version = "2.27.2"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; - rev = version; - hash = "sha256-uLiXhigYz3v7NgY38twot3sBHxZS5QCrOiPfME4wWzE="; + tag = version; + hash = "sha256-zk4jkXJMh6wpuEKaCvuKUDod+F8B/6W5Lw8gwelcPEM="; }; - patches = [ - ./FindMagic_EP.cmake.patch - ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ]; - postPatch = - '' - # copy pre-fetched external project to directory where it is expected to be - mkdir -p build/externals/src - cp -a ${ep-file-windows} build/externals/src/ep_magic - chmod -R u+w build/externals/src/ep_magic + # libcxx (as of llvm-19) does not yet support `stop_token` and `jthread` + # without the -fexperimental-library flag. Tiledb adds its own + # implementations in the std namespace which conflict with libcxx. This + # test can be re-enabled once libcxx supports stop_token and jthread. + postPatch = lib.optionalString (stdenv.cc.libcxx != null) '' + truncate -s0 tiledb/stdx/test/CMakeLists.txt + ''; - # add openssl on path - sed -i '49i list(APPEND OPENSSL_PATHS "${openssl.dev}" "${openssl.out}")' \ - cmake/Modules/FindOpenSSL_EP.cmake - '' - # libcxx (as of llvm-19) does not yet support `stop_token` and `jthread` - # without the -fexperimental-library flag. Tiledb adds its own - # implementations in the std namespace which conflict with libcxx. This - # test can be re-enabled once libcxx supports stop_token and jthread. - + lib.optionalString (stdenv.cc.libcxx != null) '' - truncate -s0 tiledb/stdx/test/CMakeLists.txt - ''; - - # upstream will hopefully fix this in some newer release - env.CXXFLAGS = "-include random"; + env.TILEDB_DISABLE_AUTO_VCPKG = "1"; # (bundled) blosc headers have a warning on some archs that it will be using # unaccelerated routines. cmakeFlags = [ - "-DTILEDB_VCPKG=OFF" "-DTILEDB_WEBP=OFF" "-DTILEDB_WERROR=OFF" + # https://github.com/NixOS/nixpkgs/issues/144170 + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ] ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE"; nativeBuildInputs = [ - ep-file-windows - catch2_3 + catch2 clang-tools cmake python3 doxygen ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - nativeCheckInputs = [ - gtest - ]; - buildInputs = [ zlib lz4 @@ -101,20 +85,31 @@ stdenv.mkDerivation rec { openssl boost libpqxx + libpng + file + rapidcheck' + catch2 + ]; + + nativeCheckInputs = [ + gtest + catch2 ]; # test commands taken from # https://github.com/TileDB-Inc/TileDB/blob/dev/.github/workflows/unit-test-runs.yml checkPhase = '' runHook preCheck - make -C tiledb tests -j$NIX_BUILD_CORES - make -C tiledb test ARGS="-R '^unit_'" -R "test_assert" - make -C tiledb test ARGS="-R 'test_ci_asserts'" + + pushd .. + cmake --build build --target tests + ctest --test-dir build -R '(^unit_|test_assert)' --no-tests=error + ctest --test-dir build -R 'test_ci_asserts' + popd + runHook postCheck ''; - doCheck = true; - installTargets = [ "install-tiledb" "doc" @@ -124,11 +119,11 @@ stdenv.mkDerivation rec { install_name_tool -add_rpath ${tbb}/lib $out/lib/libtiledb.dylib ''; - meta = with lib; { + meta = { description = "TileDB allows you to manage the massive dense and sparse multi-dimensional array data"; homepage = "https://github.com/TileDB-Inc/TileDB"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ rakesh4g ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ rakesh4g ]; }; } diff --git a/pkgs/by-name/ti/tilem/gcc14-fix.patch b/pkgs/by-name/ti/tilem/gcc14-fix.patch new file mode 100644 index 000000000000..f1ef81e57cd6 --- /dev/null +++ b/pkgs/by-name/ti/tilem/gcc14-fix.patch @@ -0,0 +1,13 @@ +diff --git a/gui/macro.c b/gui/macro.c +index ae8db8b..226d48f 100644 +--- a/gui/macro.c ++++ b/gui/macro.c +@@ -86,7 +86,7 @@ void tilem_macro_add_action(TilemMacro* macro, int type, char * value) { + macro->actions = tilem_macro_actions_new(macro, n + 1); + + /* Then we need to save the action */ +- macro->actions[n] = g_new(char, strlen(value)); /* FIXME : gcc says : "assignment from incompatible pointer type" ??? */ ++ macro->actions[n] = g_new(TilemMacroAtom, 1); /* FIXME : gcc says : "assignment from incompatible pointer type" ??? */ + macro->actions[n]->value = g_strdup(value); + macro->actions[n]->type = type; + macro->n++; diff --git a/pkgs/by-name/ti/tilem/package.nix b/pkgs/by-name/ti/tilem/package.nix index 400bcd36923e..a5caea4922cc 100644 --- a/pkgs/by-name/ti/tilem/package.nix +++ b/pkgs/by-name/ti/tilem/package.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { libticables2 libticalcs2 ]; + patches = [ ./gcc14-fix.patch ]; env.NIX_CFLAGS_COMPILE = toString [ "-lm" ]; meta = with lib; { homepage = "http://lpg.ticalc.org/prj_tilem/"; diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/by-name/ti/timeloop/package.nix similarity index 100% rename from pkgs/applications/science/computer-architecture/timeloop/default.nix rename to pkgs/by-name/ti/timeloop/package.nix diff --git a/pkgs/applications/office/timetrap/Gemfile b/pkgs/by-name/ti/timetrap/Gemfile similarity index 100% rename from pkgs/applications/office/timetrap/Gemfile rename to pkgs/by-name/ti/timetrap/Gemfile diff --git a/pkgs/by-name/ti/timetrap/Gemfile.lock b/pkgs/by-name/ti/timetrap/Gemfile.lock new file mode 100644 index 000000000000..15e399079253 --- /dev/null +++ b/pkgs/by-name/ti/timetrap/Gemfile.lock @@ -0,0 +1,23 @@ +GEM + remote: https://rubygems.org/ + specs: + bigdecimal (3.1.9) + chronic (0.10.2) + mini_portile2 (2.8.8) + sequel (5.90.0) + bigdecimal + sqlite3 (1.7.3) + mini_portile2 (~> 2.8.0) + timetrap (1.15.5) + chronic (~> 0.10.2) + sequel (~> 5.90.0) + sqlite3 (~> 1.4) + +PLATFORMS + ruby + +DEPENDENCIES + timetrap + +BUNDLED WITH + 2.6.6 diff --git a/pkgs/by-name/ti/timetrap/gemset.nix b/pkgs/by-name/ti/timetrap/gemset.nix new file mode 100644 index 000000000000..81c9b13ae61c --- /dev/null +++ b/pkgs/by-name/ti/timetrap/gemset.nix @@ -0,0 +1,69 @@ +{ + bigdecimal = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; + type = "gem"; + }; + version = "3.1.9"; + }; + chronic = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; + type = "gem"; + }; + version = "0.10.2"; + }; + mini_portile2 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; + type = "gem"; + }; + version = "2.8.8"; + }; + sequel = { + dependencies = [ "bigdecimal" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1s5qhylirrmfbjhdjdfqaiksjlaqmgixl25sxd8znq8dqwqlrydz"; + type = "gem"; + }; + version = "5.90.0"; + }; + sqlite3 = { + dependencies = [ "mini_portile2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs"; + type = "gem"; + }; + version = "1.7.3"; + }; + timetrap = { + dependencies = [ + "chronic" + "sequel" + "sqlite3" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gcs9vyg1i3nsiiwrkqza14qj7h3chlg6w5icbf0ggjzswz3rwd2"; + type = "gem"; + }; + version = "1.15.5"; + }; +} diff --git a/pkgs/by-name/ti/timetrap/package.nix b/pkgs/by-name/ti/timetrap/package.nix new file mode 100644 index 000000000000..9e172d7e1866 --- /dev/null +++ b/pkgs/by-name/ti/timetrap/package.nix @@ -0,0 +1,66 @@ +{ + stdenv, + lib, + bundlerEnv, + bundlerApp, + bundlerUpdateScript, + installShellFiles, +}: + +let + ttBundlerApp = bundlerApp { + pname = "timetrap"; + gemdir = ./.; + exes = [ + "t" + "timetrap" + ]; + + passthru.updateScript = bundlerUpdateScript "timetrap"; + }; + + ttGem = bundlerEnv { + pname = "timetrap"; + gemdir = ./.; + }; + +in + +stdenv.mkDerivation { + name = "timetrap"; + + dontUnpack = true; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + mkdir $out + cd $out + + mkdir bin; pushd bin + ln -vs ${ttBundlerApp}/bin/t + ln -vs ${ttBundlerApp}/bin/timetrap + popd + + for c in t timetrap; do + installShellCompletion --cmd $c --bash ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/bash/* + installShellCompletion --cmd $c --zsh ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/zsh/* + done + ''; + + meta = with lib; { + description = "Simple command line time tracker written in ruby"; + homepage = "https://github.com/samg/timetrap"; + license = licenses.mit; + maintainers = with maintainers; [ + jerith666 + manveru + nicknovitski + ]; + platforms = platforms.unix; + }; + + passthru = { + updateScript = ttBundlerApp.passthru.updateScript; + }; +} diff --git a/pkgs/by-name/ti/timewall/package.nix b/pkgs/by-name/ti/timewall/package.nix index 6e735cd46c6f..9df87522e09b 100644 --- a/pkgs/by-name/ti/timewall/package.nix +++ b/pkgs/by-name/ti/timewall/package.nix @@ -3,25 +3,29 @@ fetchFromGitHub, rustPlatform, installShellFiles, + pkg-config, libheif, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "timewall"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bcyran"; repo = "timewall"; rev = version; - hash = "sha256-ohJDaN29FG/WqkcvpbukWS37RiX2pXdkKMzNh+3NqAU="; + hash = "sha256-KUPy/mv6cV0BmvBcom+cCXk0s4Erz0hf5dg1i5QB0OE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Wg9bxzm5EJUazRUvFuPboQhZlqwWPuJ8UB9plgWUOO4="; + cargoHash = "sha256-JOsCGHHbHx2yoFYdFWIYPHfgCfQjEtZA869+2OQ4jKA="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; buildInputs = [ libheif ]; diff --git a/pkgs/by-name/ti/timewarrior/package.nix b/pkgs/by-name/ti/timewarrior/package.nix index 054a32860248..a525b591c614 100644 --- a/pkgs/by-name/ti/timewarrior/package.nix +++ b/pkgs/by-name/ti/timewarrior/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "timewarrior"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - hash = "sha256-sc4AfdXLuA9evoGU6Z97+Hq7zj9nx093+nPALRkhziQ="; + hash = "sha256-6WZ5k9cxWe+eS9me700ITq0rKEiIuDhTtmuzhOnUM4k="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ti/timg/package.nix b/pkgs/by-name/ti/timg/package.nix index 70d9c4557a54..bc9206b1af25 100644 --- a/pkgs/by-name/ti/timg/package.nix +++ b/pkgs/by-name/ti/timg/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "timg"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; - rev = "v${finalAttrs.version}"; - hash = "sha256-D5pQozxy5eSKVaV5qhoneG/b2yKcPQWD8OHs8MsGL1w="; + tag = "v${finalAttrs.version}"; + hash = "sha256-UiQ8CW0mxjjQM6XLN0FL2v7ccYq2EmIy/3pm+yKQh8w="; }; buildInputs = [ diff --git a/pkgs/by-name/ti/timidity/.editorconfig b/pkgs/by-name/ti/timidity/.editorconfig new file mode 100644 index 000000000000..000113a94410 --- /dev/null +++ b/pkgs/by-name/ti/timidity/.editorconfig @@ -0,0 +1,2 @@ +[timidity.cfg] +trim_trailing_whitespace = unset diff --git a/pkgs/tools/misc/timidity/configure-compat.patch b/pkgs/by-name/ti/timidity/configure-compat.patch similarity index 100% rename from pkgs/tools/misc/timidity/configure-compat.patch rename to pkgs/by-name/ti/timidity/configure-compat.patch diff --git a/pkgs/by-name/ti/timidity/package.nix b/pkgs/by-name/ti/timidity/package.nix new file mode 100644 index 000000000000..68d5a23b3474 --- /dev/null +++ b/pkgs/by-name/ti/timidity/package.nix @@ -0,0 +1,126 @@ +{ + lib, + stdenv, + fetchurl, + nixosTests, + pkg-config, + libjack2, + ncurses, + alsa-lib, + buildPackages, + + ## Additional optional output modes + enableVorbis ? false, + libvorbis, +}: + +stdenv.mkDerivation rec { + pname = "timidity"; + version = "2.15.0"; + + src = fetchurl { + url = "mirror://sourceforge/timidity/TiMidity++-${version}.tar.bz2"; + sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn"; + }; + + patches = [ + ./timidity-iA-Oj.patch + # Fixes misdetection of features by clang 16. The configure script itself is patched because + # it is old and does not work nicely with autoreconfHook. + ./configure-compat.patch + ]; + + postPatch = '' + substituteInPlace configure \ + --replace-fail "\$(pkg-config" "\$(\$PKG_CONFIG" + ''; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = + [ + libjack2 + ncurses + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ] + ++ lib.optionals enableVorbis [ + libvorbis + ]; + + enabledOutputModes = + [ + "jack" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "oss" + "alsa" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "darwin" + ] + ++ lib.optionals enableVorbis [ + "vorbis" + ]; + + configureFlags = + [ + "--enable-ncurses" + ("--enable-audio=" + builtins.concatStringsSep "," enabledOutputModes) + "lib_cv_va_copy=yes" + "lib_cv___va_copy=yes" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "--enable-alsaseq" + "--with-default-output=alsa" + "lib_cv_va_val_copy=yes" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "lib_cv_va_val_copy=no" + "timidity_cv_ccoption_rdynamic=yes" + # These configure tests fail because of incompatible function pointer conversions. + "ac_cv_func_vprintf=yes" + "ac_cv_func_popen=yes" + "ac_cv_func_vsnprintf=yes" + "ac_cv_func_snprintf=yes" + "ac_cv_func_open_memstream=yes" + ]; + + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; + + instruments = fetchurl { + url = "https://courses.cs.umbc.edu/pub/midia/instruments.tar.gz"; + sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67"; + }; + + preBuild = '' + # calcnewt has to be built with the host compiler. + ${buildPackages.stdenv.cc}/bin/cc -o timidity/calcnewt -lm timidity/calcnewt.c + # Remove dependencies of calcnewt so it doesn't try to remake it. + sed -i 's/^\(calcnewt\$(EXEEXT):\).*/\1/g' timidity/Makefile + ''; + + # the instruments could be compressed (?) + postInstall = '' + mkdir -p $out/share/timidity/; + cp ${./timidity.cfg} $out/share/timidity/timidity.cfg + substituteAllInPlace $out/share/timidity/timidity.cfg + tar --strip-components=1 -xf $instruments -C $out/share/timidity/ + # All but one of the symlinks in the instruments tarball have their permissions set to 0000. + # This causes problems on systems like Darwin that actually use symlink permissions. + chmod -Rh u+rwX $out/share/timidity/ + ''; + + passthru.tests = nixosTests.timidity; + + meta = with lib; { + homepage = "https://sourceforge.net/projects/timidity/"; + license = licenses.gpl2Plus; + description = "Software MIDI renderer"; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.unix; + mainProgram = "timidity"; + }; +} diff --git a/pkgs/tools/misc/timidity/timidity-iA-Oj.patch b/pkgs/by-name/ti/timidity/timidity-iA-Oj.patch similarity index 100% rename from pkgs/tools/misc/timidity/timidity-iA-Oj.patch rename to pkgs/by-name/ti/timidity/timidity-iA-Oj.patch diff --git a/pkgs/tools/misc/timidity/timidity.cfg b/pkgs/by-name/ti/timidity/timidity.cfg similarity index 100% rename from pkgs/tools/misc/timidity/timidity.cfg rename to pkgs/by-name/ti/timidity/timidity.cfg diff --git a/pkgs/by-name/ti/tinfoil-cli/package.nix b/pkgs/by-name/ti/tinfoil-cli/package.nix new file mode 100644 index 000000000000..de001a2d83e9 --- /dev/null +++ b/pkgs/by-name/ti/tinfoil-cli/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "tinfoil-cli"; + version = "0.0.13"; + + src = fetchFromGitHub { + owner = "tinfoilsh"; + repo = "tinfoil-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/VjhInen6f+PYQENhGZ31q51r5J/lyG4rzXI3ZEPUAg="; + }; + + vendorHash = "sha256-EN6IYOSYuSlKpQKcdKvPjFa9A51uwqSzHNuwlrzYsfI="; + + # The attestation test requires internet access + checkFlags = [ "-skip=TestAttestationVerifySEV" ]; + + postInstall = '' + mv $out/bin/tinfoil-cli $out/bin/tinfoil + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command-line interface for making verified HTTP requests to Tinfoil enclaves and validating attestation documents"; + homepage = "https://github.com/tinfoilsh/tinfoil-cli"; + changelog = "https://github.com/tinfoilsh/tinfoil-cli/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.haylin ]; + mainProgram = "tinfoil"; + }; +}) diff --git a/pkgs/by-name/ti/tiny-cuda-nn/package.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix index 25b43707dde6..924d691e52bd 100644 --- a/pkgs/by-name/ti/tiny-cuda-nn/package.nix +++ b/pkgs/by-name/ti/tiny-cuda-nn/package.nix @@ -1,4 +1,5 @@ { + config, cmake, cudaPackages, fetchFromGitHub, @@ -12,7 +13,7 @@ }: let inherit (lib) lists strings; - inherit (cudaPackages) backendStdenv cudaVersion flags; + inherit (cudaPackages) backendStdenv cudaAtLeast flags; cuda-common-redist = with cudaPackages; [ (lib.getDev cuda_cudart) # cuda_runtime.h @@ -61,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { # Remove this once a release is made with # https://github.com/NVlabs/tiny-cuda-nn/commit/78a14fe8c292a69f54e6d0d47a09f52b777127e1 - postPatch = lib.optionals (strings.versionAtLeast cudaVersion "11.0") '' + postPatch = lib.optionals (cudaAtLeast "11.0") '' substituteInPlace bindings/torch/setup.py --replace-fail \ "-std=c++14" "-std=c++17" ''; @@ -176,7 +177,11 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ connorbaker ]; platforms = platforms.linux; - # g++: error: unrecognized command-line option '-mf16c' - broken = stdenv.hostPlatform.isAarch64; + badPlatforms = [ + # g++: error: unrecognized command-line option '-mf16c' + lib.systems.inspect.patterns.isAarch64 + ]; + # Requires torch.cuda._is_compiled() == True to build + broken = !config.cudaSupport; }; }) diff --git a/pkgs/by-name/ti/tiny-rdm/package.nix b/pkgs/by-name/ti/tiny-rdm/package.nix new file mode 100644 index 000000000000..17b95f7dbdeb --- /dev/null +++ b/pkgs/by-name/ti/tiny-rdm/package.nix @@ -0,0 +1,101 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + fetchNpmDeps, + npmHooks, + nodejs, + wails, + webkitgtk_4_0, + pkg-config, + libsoup_3, + copyDesktopItems, + makeDesktopItem, + autoPatchelfHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "tiny-rdm"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "tiny-craft"; + repo = "tiny-rdm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-7e+thMIEYmPHJAePJdEQo1q/Zzf+iKPhlkqrrr2O9iE="; + }; + + postPatch = '' + substituteInPlace frontend/src/App.vue \ + --replace-fail "prefStore.autoCheckUpdate" "false" + ''; + + vendorHash = "sha256-LWa0eZibFc7bXYMWgm+/awOaerd6kBrFpk/dDSGoKlE="; + + env = { + CGO_ENABLED = 1; + npmDeps = fetchNpmDeps { + src = "${finalAttrs.src}/frontend"; + hash = "sha256-/kkLabtYXcipyiBpY2UFYBbbbNYHaFqYSNgLYiwErGc="; + }; + npmRoot = "frontend"; + }; + + nativeBuildInputs = [ + wails + pkg-config + autoPatchelfHook + nodejs + npmHooks.npmConfigHook + copyDesktopItems + ]; + + buildInputs = [ + webkitgtk_4_0 + libsoup_3 + ]; + + buildPhase = '' + runHook preBuild + + wails build -m -trimpath -devtools -tags webkit2_40 -o tiny-rdm + + runHook postBuild + ''; + + desktopItems = [ + (makeDesktopItem { + name = "tiny-rdm"; + exec = "tiny-rdm %U"; + icon = "tiny-rdm"; + type = "Application"; + terminal = false; + desktopName = "Tiny RDM"; + startupWMClass = "tinyrdm"; + categories = [ "Office" ]; + mimeTypes = [ "x-scheme-handler/tinyrdm" ]; + comment = "Tiny Redis Desktop Manager"; + }) + ]; + + installPhase = '' + runHook preInstall + + install -Dm 0755 build/bin/tiny-rdm $out/bin/tiny-rdm + install -Dm 0644 frontend/src/assets/images/icon.png $out/share/pixmaps/tiny-rdm.png + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Modern, colorful, super lightweight Redis GUI client"; + homepage = "https://github.com/tiny-craft/tiny-rdm"; + mainProgram = "tiny-rdm"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ emaryn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ti/tiny/package.nix b/pkgs/by-name/ti/tiny/package.nix new file mode 100644 index 000000000000..3003e119d279 --- /dev/null +++ b/pkgs/by-name/ti/tiny/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + dbusSupport ? stdenv.hostPlatform.isLinux, + dbus, + # rustls will be used for TLS if useOpenSSL=false + useOpenSSL ? stdenv.hostPlatform.isLinux, + openssl, + notificationSupport ? stdenv.hostPlatform.isLinux, +}: + +rustPlatform.buildRustPackage rec { + pname = "tiny"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "osa1"; + repo = "tiny"; + rev = "v${version}"; + hash = "sha256-phjEae2SS3zkSpuhhE4iscUM8ij8DT47YLIMATMG/+Q="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-lyjTl0kbtfQdqSqxti1181+oDVYP4U++v2JEOYvI7aM="; + + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config; + buildInputs = lib.optionals dbusSupport [ dbus ] ++ lib.optionals useOpenSSL [ openssl ]; + + buildFeatures = lib.optional notificationSupport "desktop-notifications"; + + meta = with lib; { + description = "Console IRC client"; + homepage = "https://github.com/osa1/tiny"; + changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ + Br1ght0ne + vyp + ]; + mainProgram = "tiny"; + }; +} diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/by-name/ti/tinycc/package.nix similarity index 100% rename from pkgs/development/compilers/tinycc/default.nix rename to pkgs/by-name/ti/tinycc/package.nix diff --git a/pkgs/by-name/ti/tinymembench/package.nix b/pkgs/by-name/ti/tinymembench/package.nix index 0dc6f5a7fd10..2273809280d0 100644 --- a/pkgs/by-name/ti/tinymembench/package.nix +++ b/pkgs/by-name/ti/tinymembench/package.nix @@ -4,15 +4,15 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tinymembench"; - version = "0.4"; + version = "0.4.9-unstable-2017-02-15"; src = fetchFromGitHub { owner = "ssvb"; repo = "tinymembench"; - rev = "v${version}"; - hash = "sha256-N6jHRLqVSNe+Mk3WNfIEBGtVC7Y6/sERVaeAD68LQJc="; + rev = "a2cf6d7e382e3aea1eb39173174d9fa28cad15f3"; + hash = "sha256-INgvyu7jAA+07vkO9DsIDMcEy713jcnaEx3CI6GTMDA="; }; installPhase = '' diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index bd1e241f3c65..ebcae270462e 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -5,9 +5,6 @@ fetchFromGitHub, installShellFiles, pkg-config, - libgit2, - openssl, - zlib, buildPackages, versionCheckHook, nix-update-script, @@ -18,29 +15,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.13.10"; + version = "0.13.12"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${finalAttrs.version}"; - hash = "sha256-/mlocw9AYoaR3meGYbSJ/qCrusxIIC3Gtmz+doXTDXI="; + hash = "sha256-5uokMl+ZgDKVoxnQ/her/Aq6c69Gv0ngZuTDH0jcyoE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-L1Krw6dbH3M1SU1ei4GYEJVMkuv2OOk2QrAJpoSHeP4="; + cargoHash = "sha256-GJJXTVm7hLmMaRJnpmslrpKNHnyhgo/6ZWXU//xl1Vc="; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ - libgit2 - openssl - zlib - ]; - checkFlags = [ "--skip=e2e" diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index 0727406f509f..2024fbf72c38 100644 --- a/pkgs/by-name/ti/tinysparql/package.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -15,8 +15,6 @@ && stdenv.hostPlatform.emulatorAvailable buildPackages, vala, python3, - gi-docgen, - graphviz, libxml2, glib, wrapGAppsNoGuiHook, @@ -37,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinysparql"; - version = "3.8.2"; + version = "3.9.2"; outputs = [ "out" @@ -49,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz"; - hash = "sha256-u4ZDOGyO3FkaAyBdSg7aZh3N0glEc7/7m725TpNYnLI="; + hash = "sha256-FM4DkCQTXhgQIrzOSxqtLgA3fdnH2BK5g5HM/HVtrY4="; }; strictDeps = true; @@ -67,8 +65,6 @@ stdenv.mkDerivation (finalAttrs: { gettext glib wrapGAppsNoGuiHook - gi-docgen - graphviz (python3.pythonOnBuildForHost.withPackages (p: [ p.pygobject3 ])) ] ++ lib.optionals withIntrospection [ @@ -126,13 +122,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; postPatch = '' - chmod +x \ - docs/reference/libtracker-sparql/embed-files.py \ - docs/reference/libtracker-sparql/generate-svgs.sh patchShebangs \ - utils/data-generators/cc/generate \ - docs/reference/libtracker-sparql/embed-files.py \ - docs/reference/libtracker-sparql/generate-svgs.sh + utils/data-generators/cc/generate # File "/build/tinysparql-3.8.0/tests/functional-tests/test_cli.py", line 233, in test_help # self.assertIn("TINYSPARQL-IMPORT(1)", output, "Manpage not found") @@ -155,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { # though, so we need to replace the absolute path with a local one during build. # We are using a symlink that will be overridden during installation. mkdir -p $out/lib - ln -s $PWD/src/libtracker-sparql/libtinysparql-3.0${darwinDot0}${extension} $out/lib/libtinysparql-3.0${darwinDot0}${extension}${linuxDot0} + ln -s $PWD/src/libtinysparql/libtinysparql-3.0${darwinDot0}${extension} $out/lib/libtinysparql-3.0${darwinDot0}${extension}${linuxDot0} ''; checkPhase = '' @@ -192,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://tracker.gnome.org/"; description = "Desktop-neutral user information store, search tool and indexer"; mainProgram = "tinysparql"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.unix; pkgConfigModules = [ diff --git a/pkgs/by-name/ti/tio/package.nix b/pkgs/by-name/ti/tio/package.nix index af2329ed8799..4fdf3dc622da 100644 --- a/pkgs/by-name/ti/tio/package.nix +++ b/pkgs/by-name/ti/tio/package.nix @@ -9,18 +9,17 @@ inih, lua, bash-completion, - darwin, }: stdenv.mkDerivation (finalAttrs: { pname = "tio"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "tio"; repo = "tio"; rev = "v${finalAttrs.version}"; - hash = "sha256-8BeTC3rlDK6xmfguNlKQg48L03knU7sb1t8F1oLIi8s="; + hash = "sha256-92+F41kDGKgzV0e7Z6xly1NRDm8Ayg9eqeKN+05B4ok="; }; strictDeps = true; @@ -29,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { inih lua glib - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.IOKit ]; + ]; nativeBuildInputs = [ meson diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index e298a641dc70..c14d07caa3fc 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.75.1"; + version = "2.78.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; tag = finalAttrs.version; - hash = "sha256-rBuk34lOrp9aW7yK0LOTRqFJg3J8IogR01kcFhgK12Y="; + hash = "sha256-RSth1mFiVHtiZkGVvaIRxNQ3nYtV/GAL64D7fFB1NYs="; }; buildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Build vector tilesets from large collections of GeoJSON features"; homepage = "https://github.com/felt/tippecanoe"; license = lib.licenses.bsd2; - maintainers = lib.teams.geospatial.members; + teams = [ lib.teams.geospatial ]; platforms = lib.platforms.unix; mainProgram = "tippecanoe"; }; diff --git a/pkgs/by-name/ti/titanion/package.nix b/pkgs/by-name/ti/titanion/package.nix index 2235d32c5148..93a7a9269a1f 100644 --- a/pkgs/by-name/ti/titanion/package.nix +++ b/pkgs/by-name/ti/titanion/package.nix @@ -5,6 +5,8 @@ fetchurl, unzip, gdc, + libGL, + libGLU, SDL, SDL_mixer, bulletml, @@ -16,7 +18,7 @@ let fetchpatch { name = "${patchname}.patch"; url = "https://sources.debian.org/data/main/t/titanion/0.3.dfsg1-7/debian/patches/${patchname}"; - sha256 = hash; + inherit hash; }; in @@ -28,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { url = "http://abagames.sakura.ne.jp/windows/ttn${ lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version }.zip"; - sha256 = "sha256-fR0cufi6dU898wP8KGl/vxbfQJzMmMxlYZ3QNGLajfM="; + hash = "sha256-fR0cufi6dU898wP8KGl/vxbfQJzMmMxlYZ3QNGLajfM="; }; patches = [ @@ -58,23 +60,27 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libGL + libGLU SDL SDL_mixer bulletml ]; installPhase = '' + runHook preInstall install -Dm755 titanion $out/bin/titanion mkdir -p $out/share/games/titanion cp -r sounds images $out/share/games/titanion/ + runHook postInstall ''; - meta = with lib; { + meta = { homepage = "http://www.asahi-net.or.jp/~cs8k-cyu/windows/ttn_e.html"; description = "Strike down super high-velocity swooping insects"; mainProgram = "titanion"; - license = licenses.bsd2; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/tl/tla/fix-gcc14.patch b/pkgs/by-name/tl/tla/fix-gcc14.patch new file mode 100644 index 000000000000..9519498bda26 --- /dev/null +++ b/pkgs/by-name/tl/tla/fix-gcc14.patch @@ -0,0 +1,388 @@ +diff --git a/src/hackerlab/machine/endian.sh b/src/hackerlab/machine/endian.sh +index 2a1c562..92bc81e 100644 +--- a/src/hackerlab/machine/endian.sh ++++ b/src/hackerlab/machine/endian.sh +@@ -5,8 +5,9 @@ + CC="$1" + + cat > endian-test.c << EOF +- +-main() ++#include ++ ++int main() + { + unsigned int x = 1; + +diff --git a/src/hackerlab/tests/rx-posix-tests/test-dbug.c b/src/hackerlab/tests/rx-posix-tests/test-dbug.c +index 4620c31..3b7d35c 100644 +--- a/src/hackerlab/tests/rx-posix-tests/test-dbug.c ++++ b/src/hackerlab/tests/rx-posix-tests/test-dbug.c +@@ -124,7 +124,7 @@ main (int argc, char * argv[]) + { + subexps = 0; + nsub = 1; +- rx_analyze_rexp (&subexps, &nsub, exp); ++ rx_analyze_rexp (&subexps, (size_t *)&nsub, exp); + rx_print_rexp (1, 256, 0, exp); + if (nfa) + { +diff --git a/src/hackerlab/vu/vu-pathcompress.c b/src/hackerlab/vu/vu-pathcompress.c +index 711acbe..3ea10d5 100644 +--- a/src/hackerlab/vu/vu-pathcompress.c ++++ b/src/hackerlab/vu/vu-pathcompress.c +@@ -86,7 +86,7 @@ void pathcompress_free_closure(void * closure) + vu_sys_free_closure(closure); + } + +-int pathcompress_access(int* errn, char* path, int mode, void* closure) ++int pathcompress_access(int* errn, const char* path, int mode, void* closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -97,7 +97,7 @@ int pathcompress_access(int* errn, char* path, int mode, void* closure) + return rvl; + } + +-int pathcompress_chdir(int * errn, char * path, void * closure) ++int pathcompress_chdir(int * errn, const char * path, void * closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -108,7 +108,7 @@ int pathcompress_chdir(int * errn, char * path, void * closure) + return rvl; + } + +-int pathcompress_chmod(int * errn, char * path, int mode, void * closure) ++int pathcompress_chmod(int * errn, const char * path, int mode, void * closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -119,7 +119,7 @@ int pathcompress_chmod(int * errn, char * path, int mode, void * closure) + return rvl; + } + +-int pathcompress_chown(int * errn, char * path, int owner, int group, void * closure) ++int pathcompress_chown(int * errn, const char * path, int owner, int group, void * closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -130,7 +130,7 @@ int pathcompress_chown(int * errn, char * path, int owner, int group, void * clo + return rvl; + } + +-int pathcompress_chroot(int * errn, char * path, void * closure) ++int pathcompress_chroot(int * errn, const char * path, void * closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -254,7 +254,7 @@ int pathcompress_getcwd(char* cwd, size_t size) + return rvl; + } + +-int pathcompress_link(int * errn, char * from, char * to, void * closure) ++int pathcompress_link(int * errn, const char * from, const char * to, void * closure) + { + int rvl; + char compressed_from[PATH_LEN]=""; +@@ -276,7 +276,7 @@ off_t pathcompress_lseek(int * errn, int fd, off_t offset, int whence, void * cl + return rvl; + } + +-int pathcompress_lstat(int * errn, char * path, struct stat * buf, void * closure) ++int pathcompress_lstat(int * errn, const char * path, struct stat * buf, void * closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -293,7 +293,7 @@ int pathcompress_lstat(int * errn, char * path, struct stat * buf, void * closur + return rvl; + } + +-int pathcompress_mkdir(int * errn, char * path, int mode, void * closure) ++int pathcompress_mkdir(int * errn, const char * path, int mode, void * closure) + { + int rvl; + char abspath[PATH_LEN]=""; +@@ -315,7 +315,7 @@ int pathcompress_mkdir(int * errn, char * path, int mode, void * closure) + return rvl; + } + +-int pathcompress_open(int * errn, char * path, int flags, int mode, void * closure) ++int pathcompress_open(int * errn, const char * path, int flags, int mode, void * closure) + { + int rvl; + char* p; +@@ -368,7 +368,7 @@ int pathcompress_open(int * errn, char * path, int flags, int mode, void * closu + return 0; + } + +-int pathcompress_opendir(int * errn, DIR ** retv, char * path, void * closure) ++int pathcompress_opendir(int * errn, DIR ** retv, const char * path, void * closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -453,7 +453,7 @@ int pathcompress_readdir(int * errn, struct alloc_limits * limits, char ** file_ + return rvl; + } + +-int pathcompress_readlink(int * errn, char * path, char * buf, int bufsize, void * closure) ++int pathcompress_readlink(int * errn, const char * path, char * buf, int bufsize, void * closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -467,7 +467,7 @@ int pathcompress_readlink(int * errn, char * path, char * buf, int bufsize, void + return rvl; + } + +-int pathcompress_rename(int * errn, char * from, char * to, void * closure) ++int pathcompress_rename(int * errn, const char * from, const char * to, void * closure) + { + struct stat stat; + int err; +@@ -502,7 +502,7 @@ int pathcompress_rename(int * errn, char * from, char * to, void * closure) + return rvl; + } + +-int pathcompress_rmdir(int * errn, char * path, void * closure) ++int pathcompress_rmdir(int * errn, const char * path, void * closure) + { + int rvl; + char dirnames[PATH_LEN]=""; +@@ -517,7 +517,7 @@ int pathcompress_rmdir(int * errn, char * path, void * closure) + return rvl; + } + +-int pathcompress_stat(int * errn, char * path, struct stat * buf, void * closure) ++int pathcompress_stat(int * errn, const char * path, struct stat * buf, void * closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -537,7 +537,7 @@ int pathcompress_stat(int * errn, char * path, struct stat * buf, void * closure + return rvl; + } + +-int pathcompress_symlink(int * errn, char * from, char * to, void * closure) ++int pathcompress_symlink(int * errn, const char * from, const char * to, void * closure) + { + int rvl; + char compressed_from[PATH_LEN]=""; +@@ -553,7 +553,7 @@ int pathcompress_symlink(int * errn, char * from, char * to, void * closure) + return rvl; + } + +-int pathcompress_truncate(int * errn, char * path, off_t where, void * closure) ++int pathcompress_truncate(int * errn, const char * path, off_t where, void * closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -566,7 +566,7 @@ int pathcompress_truncate(int * errn, char * path, off_t where, void * closure) + return rvl; + } + +-int pathcompress_unlink(int * errn, char * path, void * closure) ++int pathcompress_unlink(int * errn, const char * path, void * closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -578,7 +578,7 @@ int pathcompress_unlink(int * errn, char * path, void * closure) + return rvl; + } + +-int pathcompress_utime(int * errn, char * path, struct utimbuf * times, void * closure) ++int pathcompress_utime(int * errn, const char * path, struct utimbuf * times, void * closure) + { + int rvl; + char compressed_path[PATH_LEN]=""; +@@ -590,7 +590,7 @@ int pathcompress_utime(int * errn, char * path, struct utimbuf * times, void * c + return rvl; + } + +-ssize_t pathcompress_write(int * errn, int fd, char * buf, size_t count, void * closure) ++ssize_t pathcompress_write(int * errn, int fd, const char * buf, size_t count, void * closure) + { + int rvl; + Dprintf("pathcompress_write(%d,%p,%d)", fd, buf, count); +diff --git a/src/tla/libarch/changeset-report.c b/src/tla/libarch/changeset-report.c +index d3539b3..1672c2f 100644 +--- a/src/tla/libarch/changeset-report.c ++++ b/src/tla/libarch/changeset-report.c +@@ -630,7 +630,7 @@ print_custom_diffs (int out_fd, struct arch_changeset_report * report, t_uchar * + orig_path = file_name_in_vicinity(0, orig_dir, orig_part_path); + mod_path = file_name_in_vicinity(0, mod_dir, id2 /*report->patched_regular_files[x][0]*/); + +- arch_really_invoke_diff ( out_fd, orig_path, orig_part_path, mod_path, id2 /*report->patched_regular_files[x][0]*/, (char **)opts); ++ arch_really_invoke_diff ( out_fd, orig_path, orig_part_path, mod_path, id2 /*report->patched_regular_files[x][0]*/, (const char **)opts); + + rel_field_unref(key); + lim_free(0, mod_path); +@@ -650,7 +650,7 @@ print_custom_diffs (int out_fd, struct arch_changeset_report * report, t_uchar * + { + t_uchar *id = str_save(0, rel_peek_str(report->added_files, x, 2)); + t_uchar *id2 = str_save(0, rel_peek_str(report->added_files, x, 0)); +- arch_really_invoke_diff ( out_fd, "/dev/null", NULL, id /*report->added_files[x][2]*/, id2 /*report->added_files[x][0]*/, (char**)opts); ++ arch_really_invoke_diff ( out_fd, "/dev/null", NULL, id /*report->added_files[x][2]*/, id2 /*report->added_files[x][0]*/, (const char**)opts); + lim_free(0, id); + lim_free(0, id2); + } +@@ -680,7 +680,7 @@ print_removed_file_diffs (int out_fd, struct arch_changeset_report * report, t_u + { + t_uchar *id = str_save(0, rel_peek_str(report->removed_files, x, 2)); + t_uchar *id2 = str_save(0, rel_peek_str(report->removed_files, x, 0)); +- arch_really_invoke_diff ( out_fd, id /*report->removed_files[x][2]*/, id2 /*report->removed_files[x][0]*/, "/dev/null", NULL, (char**)opts); ++ arch_really_invoke_diff ( out_fd, id /*report->removed_files[x][2]*/, id2 /*report->removed_files[x][0]*/, "/dev/null", NULL, (const char**)opts); + lim_free(0, id); + lim_free(0, id2); + } +diff --git a/src/tla/libarch/cmd-apply-delta.c b/src/tla/libarch/cmd-apply-delta.c +index 8aebd8b..5a8615e 100644 +--- a/src/tla/libarch/cmd-apply-delta.c ++++ b/src/tla/libarch/cmd-apply-delta.c +@@ -31,6 +31,8 @@ + #include "tla/libarch/cmd-get.h" + #include "tla/libarch/cmd-delta.h" + #include "tla/libarch/cmd-apply-delta.h" ++#include "tla/libarch/cmdutils.h" ++#include "tla/libarch/star-merge.h" + + + /* __STDC__ prototypes for static functions */ +diff --git a/src/tla/libarch/cmd-branch.c b/src/tla/libarch/cmd-branch.c +index 6308fef..d63c75c 100644 +--- a/src/tla/libarch/cmd-branch.c ++++ b/src/tla/libarch/cmd-branch.c +@@ -26,6 +26,7 @@ + #include "tla/libarch/cmd-switch.h" + #include "tla/libarch/cmdutils.h" + #include "tla/libarch/archive-setup.h" ++#include "tla/libarch/cmd.h" + + + +diff --git a/src/tla/libarch/cmd-diff.c b/src/tla/libarch/cmd-diff.c +index 98dbe19..4b678b0 100644 +--- a/src/tla/libarch/cmd-diff.c ++++ b/src/tla/libarch/cmd-diff.c +@@ -30,6 +30,7 @@ + #include "tla/libarch/cmd-diff.h" + #include "tla/libarch/cmd-versions.h" + #include "tla/libarch/invent.h" ++#include "tla/libarch/make-changeset-files.h" + + + /* gettext support not yet incorporated into tla, reserve the gettext notation for later */ +@@ -38,7 +39,7 @@ + + + /* __STDC__ prototypes for static functions */ +-static void make_changeset_callback (void * ign, char * fmt, va_list ap); ++static void make_changeset_callback (void * ign, const char * fmt, va_list ap); + + + +@@ -527,7 +528,7 @@ arch_cmd_diff (t_uchar * program_name, int argc, char * argv[]) + + + static void +-make_changeset_callback (void * ign, char * fmt, va_list ap) ++make_changeset_callback (void * ign, const char * fmt, va_list ap) + { + safe_printfmt_va_list (1, fmt, ap); + safe_flush (1); +diff --git a/src/tla/libarch/cmd-export.c b/src/tla/libarch/cmd-export.c +index bfed694..24e5d6a 100644 +--- a/src/tla/libarch/cmd-export.c ++++ b/src/tla/libarch/cmd-export.c +@@ -35,6 +35,7 @@ + #include "tla/libarch/cmd.h" + #include "tla/libarch/cmdutils.h" + #include "tla/libarch/cmd-export.h" ++#include "tla/libarch/chatter.h" + + + +diff --git a/src/tla/libarch/cmdutils.c b/src/tla/libarch/cmdutils.c +index 3aafd13..195d636 100644 +--- a/src/tla/libarch/cmdutils.c ++++ b/src/tla/libarch/cmdutils.c +@@ -20,6 +20,7 @@ + #include "tla/libarch/patch-logs.h" + #include "tla/libarch/pfs.h" + #include "tla/libfsutils/dir-as-cwd.h" ++#include "tla/libarch/local-cache.h" + + + /* __STDC__ prototypes for static functions */ +diff --git a/src/tla/libarch/diffs.c b/src/tla/libarch/diffs.c +index dcae932..5f935ae 100644 +--- a/src/tla/libarch/diffs.c ++++ b/src/tla/libarch/diffs.c +@@ -230,7 +230,7 @@ arch_really_invoke_diff (int output_fd, + if (extraopts != NULL) + { + t_uchar ** opt; +- for (opt = extraopts; *opt != NULL; ++opt) ++ for (opt = (t_uchar**)extraopts; *opt != NULL; ++opt) + { + *(t_uchar **) ar_push ((void*) &argv, 0, sizeof(t_uchar*)) = *opt; + +diff --git a/src/tla/libarch/invent.c b/src/tla/libarch/invent.c +index 077d776..defd2da 100644 +--- a/src/tla/libarch/invent.c ++++ b/src/tla/libarch/invent.c +@@ -19,6 +19,7 @@ + #include "tla/libarch/inode-sig.h" + #include "tla/libarch/inv-ids.h" + #include "tla/libarch/invent.h" ++#include "cmdutils.h" + + + +diff --git a/src/tla/libarch/local-cache.c b/src/tla/libarch/local-cache.c +index 0cade1b..945cd8b 100644 +--- a/src/tla/libarch/local-cache.c ++++ b/src/tla/libarch/local-cache.c +@@ -24,6 +24,7 @@ + #include "tla/libarch/library-txn.h" + #include "tla/libarch/local-cache.h" + #include "tla/libarch/namespace.h" ++#include "project-tree.h" + + + +diff --git a/src/tla/libarch/pfs-ftp.c b/src/tla/libarch/pfs-ftp.c +index 546c702..c457837 100644 +--- a/src/tla/libarch/pfs-ftp.c ++++ b/src/tla/libarch/pfs-ftp.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include "config-options.h" + #include "hackerlab/bugs/panic.h" + #include "hackerlab/os/errno-to-string.h" +diff --git a/src/tla/libarch/undo.c b/src/tla/libarch/undo.c +index abc40e9..dc8e6ed 100644 +--- a/src/tla/libarch/undo.c ++++ b/src/tla/libarch/undo.c +@@ -19,6 +19,7 @@ + #include "tla/libarch/apply-changeset.h" + #include "tla/libarch/chatter.h" + #include "tla/libarch/undo.h" ++#include "tla/libarch/make-changeset-files.h" + + + /* __STDC__ prototypes for static functions */ +diff --git a/src/tla/libfsutils/tmp-files.c b/src/tla/libfsutils/tmp-files.c +index 164acdb..1188627 100644 +--- a/src/tla/libfsutils/tmp-files.c ++++ b/src/tla/libfsutils/tmp-files.c +@@ -18,6 +18,8 @@ + #include "hackerlab/fs/file-names.h" + #include "hackerlab/vu/safe.h" + #include "tla/libfsutils/tmp-files.h" ++#include "hackerlab/fs/tmp-files.h" ++#include "tla/libarch/cmdutils.h" + + + diff --git a/pkgs/by-name/tl/tla/package.nix b/pkgs/by-name/tl/tla/package.nix index d7d9185cd747..9554be300e46 100644 --- a/pkgs/by-name/tl/tla/package.nix +++ b/pkgs/by-name/tl/tla/package.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0"; }; - patches = [ ./configure-tmpdir.patch ]; + patches = [ + ./configure-tmpdir.patch + ./fix-gcc14.patch + ]; buildInputs = [ which ]; diff --git a/pkgs/by-name/tl/tlafmt/package.nix b/pkgs/by-name/tl/tlafmt/package.nix index 9eb4952f8aec..05366eb1b1ce 100644 --- a/pkgs/by-name/tl/tlafmt/package.nix +++ b/pkgs/by-name/tl/tlafmt/package.nix @@ -5,18 +5,18 @@ }: rustPlatform.buildRustPackage rec { pname = "tlafmt"; - version = "0.3.2"; + version = "0.4.1"; src = fetchFromGitHub { owner = "domodwyer"; repo = "tlafmt"; tag = "v${version}"; - hash = "sha256-V7KTzjCLOdt31UO01iTHVk2zpPc+GdSpsrEfwwbjZrk="; + hash = "sha256-79tCH4O7VFqiYloCAGVw7JJ5WvsFnjjKdBNmMPar+sk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-KUN7Et3wW5oLu+FK7ySWKSqpo1IL0ggww74IpFX0aSQ="; + cargoHash = "sha256-79eI2POpYr7nUThsWohetEzG17JAxMOVul5soJxYYms="; meta = { description = "Formatter for TLA+ specs"; diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index a1ff5926d464..fd8c7f19b16f 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -1,32 +1,26 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { pname = "tlrc"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tlrc"; rev = "v${version}"; - hash = "sha256-LXuURq+MSSkd8+VzhltX2VqKsU3PWcQLMQTqqS5oLMg="; + hash = "sha256-SPYLQ7o3sbrjy3MmBAB0YoVJI1rSmePbrZY0yb2SnFE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nA24qjxo1C0t4twTv2/Uu05ELiSzYLrnsRgAIFKsIxg="; + cargoHash = "sha256-i2nSwsQnwhiMhG8QJb0z0zPuNxTLwuO1dgJxI4e4FqY="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - postInstall = '' installManPage tldr.1 installShellCompletion completions/{tldr.bash,_tldr,tldr.fish} diff --git a/pkgs/by-name/tl/tlsinfo/package.nix b/pkgs/by-name/tl/tlsinfo/package.nix index 6c5a56257a89..f977279e9451 100644 --- a/pkgs/by-name/tl/tlsinfo/package.nix +++ b/pkgs/by-name/tl/tlsinfo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tlsinfo"; - version = "0.1.45"; + version = "0.1.47"; src = fetchFromGitHub { owner = "paepckehh"; repo = "tlsinfo"; tag = "v${version}"; - hash = "sha256-gVKB03Tv00c+vO9IgwESWCU1Vqh3iwkVuQLk3BEHlUk="; + hash = "sha256-9YOFsUDNxZi1C59ZSQ31QXE9comFa6DGEzvRah0bruY="; }; - vendorHash = "sha256-FFefmnXPCyTEOUkM8A0UCz0nZ0Ors8scxZIwVPnSiac="; + vendorHash = "sha256-f7Rkpz6qGiJNhxlYPJo2G3ykItj+55PvGnNPNOU1ftI="; ldflags = [ "-s" diff --git a/pkgs/by-name/tl/tlspool/package.nix b/pkgs/by-name/tl/tlspool/package.nix new file mode 100644 index 000000000000..b56f864c9ef1 --- /dev/null +++ b/pkgs/by-name/tl/tlspool/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitLab, + cmake, + pkg-config, + arpa2cm, + arpa2common, + db, + gnutls, + ldns, + libkrb5, + libtasn1, + openldap, + p11-kit, + quickder, + unbound, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tlspool"; + version = "0.9.7"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "tlspool"; + tag = "v${finalAttrs.version}"; + hash = "sha256-nODnRoFlgCTtBjPief9SkVlLgD3g+2zbwM0V9pt3Crk="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + libkrb5 + ]; + + buildInputs = [ + arpa2cm + arpa2common + db + gnutls + ldns + libkrb5 + libtasn1 + openldap + p11-kit + quickder + unbound + ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "TLS daemon with PKCS #11 backend"; + homepage = "https://gitlab.com/arpa2/tlspool"; + changelog = "https://gitlab.com/arpa2/tlspool/-/blob/v${finalAttrs.version}/CHANGES"; + license = with lib.licenses; [ + gpl3Plus # daemon + cc-by-sa-40 # docs + bsd2 # userspace + ]; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + platforms = lib.platforms.linux; + mainProgram = "tlsserver"; + }; +}) diff --git a/pkgs/by-name/tm/tm/missing-string-header.patch b/pkgs/by-name/tm/tm/missing-string-header.patch new file mode 100644 index 000000000000..134102400a6d --- /dev/null +++ b/pkgs/by-name/tm/tm/missing-string-header.patch @@ -0,0 +1,24 @@ +diff --git a/unix_client.c b/unix_client.c +index 920910a..6d608fd 100644 +--- a/unix_client.c ++++ b/unix_client.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #include "main.h" + #include "handlers.h" +diff --git a/unix_server.c b/unix_server.c +index 5cf93ed..d3c51c9 100644 +--- a/unix_server.c ++++ b/unix_server.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/pkgs/by-name/tm/tm/package.nix b/pkgs/by-name/tm/tm/package.nix index 45208fa35399..c181cddd6f81 100644 --- a/pkgs/by-name/tm/tm/package.nix +++ b/pkgs/by-name/tm/tm/package.nix @@ -4,27 +4,32 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAtts: { pname = "tm"; version = "0.4.1"; src = fetchurl { - url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${version}.tar.gz"; - sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; + url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${finalAtts.version}.tar.gz"; + hash = "sha256-OzibwDtpZK1f+lejRLiR/bz3ybJgSt2nI6hj+DZXxKA="; }; makeFlags = [ "PREFIX=$(out)" ]; + patches = [ + # fix using strncpy and strlen without including string.h + ./missing-string-header.patch + ]; + postPatch = '' sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile ''; - meta = with lib; { + meta = { description = "Terminal mixer - multiplexer for the i/o of terminal applications"; homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = platforms.all; + platforms = lib.platforms.all; mainProgram = "tm"; }; -} +}) diff --git a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix index 53fdc8e1be0f..9de391ab6e8c 100644 --- a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix +++ b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tmux-mem-cpu-load"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "thewtex"; repo = "tmux-mem-cpu-load"; rev = "v${version}"; - sha256 = "sha256-8QUcEbgk3DSsWt9TRHHtDhQ7a1hkK8RZEX+0d3h/c0w="; + sha256 = "sha256-g++6n6OD9FAw8CtXArKBgNwFf+3v+SBCHmbma7RpMBA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/tm/tmux-sessionizer/package.nix b/pkgs/by-name/tm/tmux-sessionizer/package.nix new file mode 100644 index 000000000000..d95e7d74c1f9 --- /dev/null +++ b/pkgs/by-name/tm/tmux-sessionizer/package.nix @@ -0,0 +1,63 @@ +{ + lib, + fetchFromGitHub, + stdenv, + rustPlatform, + openssl, + pkg-config, + testers, + tmux-sessionizer, + installShellFiles, +}: +let + + name = "tmux-sessionizer"; + version = "0.4.5"; + +in +rustPlatform.buildRustPackage { + pname = name; + inherit version; + + src = fetchFromGitHub { + owner = "jrmoulton"; + repo = name; + rev = "v${version}"; + hash = "sha256-uoSm9oWZSiqwsg7dVVMay9COL5MEK3a5Pd+D66RzzPM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-fd0IEORqnqxKN9zisXTT0G8CwRNVsGd3HZmCVY5DKsM="; + + passthru.tests.version = testers.testVersion { + package = tmux-sessionizer; + version = version; + }; + + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + buildInputs = [ openssl ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd tms \ + --bash <(COMPLETE=bash $out/bin/tms) \ + --fish <(COMPLETE=fish $out/bin/tms) \ + --zsh <(COMPLETE=zsh $out/bin/tms) + ''; + + meta = with lib; { + description = "Fastest way to manage projects as tmux sessions"; + homepage = "https://github.com/jrmoulton/tmux-sessionizer"; + license = licenses.mit; + maintainers = with maintainers; [ + vinnymeller + mrcjkb + ]; + mainProgram = "tms"; + }; +} diff --git a/pkgs/by-name/tm/tmuxinator/package.nix b/pkgs/by-name/tm/tmuxinator/package.nix index e473e6afd3b2..4dbfe6f6b08d 100644 --- a/pkgs/by-name/tm/tmuxinator/package.nix +++ b/pkgs/by-name/tm/tmuxinator/package.nix @@ -58,7 +58,6 @@ buildRubyGem rec { license = licenses.mit; maintainers = with maintainers; [ auntie - ericsagnes ]; platforms = platforms.unix; mainProgram = "tmuxinator"; diff --git a/pkgs/by-name/tm/tmuxp/package.nix b/pkgs/by-name/tm/tmuxp/package.nix index f91ea26b971f..399cd8560c4b 100644 --- a/pkgs/by-name/tm/tmuxp/package.nix +++ b/pkgs/by-name/tm/tmuxp/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "tmuxp"; - version = "1.50.1"; + version = "1.55.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-v7k0S0dMmpmwZkCJhPKiE+sEtVkOL+tE4Io66EIEXP0="; + hash = "sha256-reC609nY1kdmQInAphAfmSTZQQqitTD88EBv/4mU3h0="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/tn/tntdb/package.nix b/pkgs/by-name/tn/tntdb/package.nix index 16e7857ace28..19602b64fa58 100644 --- a/pkgs/by-name/tn/tntdb/package.nix +++ b/pkgs/by-name/tn/tntdb/package.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook + libpq.pg_config ]; buildInputs = [ diff --git a/pkgs/by-name/to/toastify/package.nix b/pkgs/by-name/to/toastify/package.nix new file mode 100644 index 000000000000..7271aa6834c9 --- /dev/null +++ b/pkgs/by-name/to/toastify/package.nix @@ -0,0 +1,34 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, +}: + +rustPlatform.buildRustPackage rec { + pname = "toastify"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "hoodie"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hSBh1LTfe3rQDPUryo2Swdf/yLYrOQ/Fg3Dz7ZqV3gw="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-xnmns0YXsKuoNxxax3St5pLiFwu6BD0iIYHNi9N9mO0="; + + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "Commandline tool that shows desktop notifications using notify-rust"; + homepage = "https://github.com/hoodie/toastify"; + changelog = "https://github.com/hoodie/toastify/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ colemickens ]; + mainProgram = "toastify"; + }; +} diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix new file mode 100644 index 000000000000..42e0ba450c75 --- /dev/null +++ b/pkgs/by-name/to/tokei/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + libiconv, + zlib, +}: + +rustPlatform.buildRustPackage rec { + pname = "tokei"; + version = "13.0.0-alpha.8"; + + src = fetchFromGitHub { + owner = "XAMPPRocky"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-LzlyrKaRjUo6JnVLQnHidtI4OWa+GrhAc4D8RkL+nmQ="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zlib ]; + + # enable all output formats + buildFeatures = [ "all" ]; + + meta = with lib; { + description = "Program that allows you to count your code, quickly"; + longDescription = '' + Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language. + ''; + homepage = "https://github.com/XAMPPRocky/tokei"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ ]; + mainProgram = "tokei"; + }; +} diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix index 346b4d69a03d..424272aaab36 100644 --- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix +++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix @@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-11-06"; + version = "0-unstable-2025-04-24"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Tokyonight-GTK-Theme"; - rev = "4dc45d60bf35f50ebd9ee41f16ab63783f80dd64"; - hash = "sha256-AKZA+WCcfxDeNrNrq3XYw+SFoWd1VV2T9+CwK2y6+jA="; + rev = "006154c78dde52b5851347a7e91f924af62f1b8f"; + hash = "sha256-h5k9p++zjzxGFkTK/6o/ISl/Litgf6fzy8Jf6Ikt5V8="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/by-name/to/tombl/package.nix b/pkgs/by-name/to/tombl/package.nix new file mode 100644 index 000000000000..d4dba7abdf4f --- /dev/null +++ b/pkgs/by-name/to/tombl/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, + versionCheckHook, +}: +rustPlatform.buildRustPackage rec { + pname = "tombl"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "snyball"; + repo = "tombl"; + tag = "v${version}"; + hash = "sha256-XHvAgJ8/+ZkBxwZpMgaDchr0hBa1FXAd/j1+HH9N6qw="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-A3zdDzmwX2gdTLLWnUGeiqY1R5PBKZRmEHdIi1Uveaw="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Easily query TOML files from bash"; + homepage = "https://github.com/snyball/tombl"; + changelog = "https://github.com/snyball/tombl/releases/tag/v${version}"; + mainProgram = "tombl"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ oskardotglobal ]; + }; +} diff --git a/pkgs/by-name/to/tome2/package.nix b/pkgs/by-name/to/tome2/package.nix index 7d054543c26b..59f032905827 100644 --- a/pkgs/by-name/to/tome2/package.nix +++ b/pkgs/by-name/to/tome2/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation { inherit pname; - version = "2.4"; + version = "2.4-unstable-2025-02-17"; src = fetchFromGitHub { owner = "tome2"; repo = "tome2"; - rev = "4e6a906c80ff07b75a6acf4ff585b47303805e46"; - sha256 = "06bddj55y673d7bnzblk8n01z32l6k2rad3bpzr8dmw464hx4wwf"; + rev = "3892fbcb1c2446afcb0c34f59e2a24f78ae672c4"; + hash = "sha256-E6T5ZnsAzZ4cy2S8WvB0k3W4XGFsiA3TKTCSBqje+tw="; }; buildInputs = [ diff --git a/pkgs/by-name/to/ton/package.nix b/pkgs/by-name/to/ton/package.nix deleted file mode 100644 index 4423a274ddff..000000000000 --- a/pkgs/by-name/to/ton/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - git, - pkg-config, - gperf, - libmicrohttpd, - libsodium, - lz4, - openssl, - readline, - secp256k1, - zlib, - nix-update-script, -}: - -stdenv.mkDerivation rec { - pname = "ton"; - version = "2024.10"; - - src = fetchFromGitHub { - owner = "ton-blockchain"; - repo = "ton"; - rev = "v${version}"; - hash = "sha256-Eab5tXP5gv9v/hu/Eh2WC/SeJ/bG1u6FKbREKB/ry9c="; - fetchSubmodules = true; - }; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - cmake - git - pkg-config - ]; - - buildInputs = [ - gperf - libmicrohttpd - libsodium - lz4 - openssl - readline - secp256k1 - zlib - ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Fully decentralized layer-1 blockchain designed by Telegram"; - homepage = "https://ton.org/"; - changelog = "https://github.com/ton-blockchain/ton/blob/v${version}/Changelog.md"; - license = licenses.lgpl2Only; - platforms = platforms.all; - maintainers = with maintainers; [ misuzu ]; - }; -} diff --git a/pkgs/by-name/to/tone/deps.json b/pkgs/by-name/to/tone/deps.json index 586dfac16f49..7930cc6e6152 100644 --- a/pkgs/by-name/to/tone/deps.json +++ b/pkgs/by-name/to/tone/deps.json @@ -6,8 +6,8 @@ }, { "pname": "CliWrap", - "version": "3.7.0", - "hash": "sha256-hXClLGuhscCrcBaymrp57Prh4m8Qe0vdE4S2ErIM13w=" + "version": "3.7.1", + "hash": "sha256-e0snh/9Ai6/Gw5ycQox2H5nGrPhKfT2sH9dQNjbrrCI=" }, { "pname": "CSharp.OperationResult", @@ -21,8 +21,8 @@ }, { "pname": "HtmlAgilityPack", - "version": "1.11.71", - "hash": "sha256-ddNrIXTfiu8gwrUs/5xYDjpD0sOth90kut6qCgxGUSE=" + "version": "1.11.72", + "hash": "sha256-MRt7yj6+/ORmr2WBERpQ+1gMRzIaPFKddHoB4zZmv2k=" }, { "pname": "Jint", @@ -31,44 +31,59 @@ }, { "pname": "Microsoft.Extensions.Configuration", - "version": "9.0.0", - "hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM=" + "version": "9.0.1", + "hash": "sha256-QKWRIGi8RaZjheuW9gMouXa3oaL/nMwlmg28/xxEvgs=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "9.0.0", "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.1", + "hash": "sha256-r3iWP+kwKo4Aib8SGo91kKWR5WusLrbFHUAw5uKQeNA=" + }, { "pname": "Microsoft.Extensions.Configuration.Binder", "version": "9.0.0", "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU=" }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "9.0.1", + "hash": "sha256-uq6i0gTobSTqaNm/0XZuv8GGjFpnvgwXnCCPWl9FP9g=" + }, { "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", - "version": "9.0.0", - "hash": "sha256-tDJx2prYZpr0RKSwmJfsK9FlUGwaDmyuSz2kqQxsWoI=" + "version": "9.0.1", + "hash": "sha256-NS38eSGrEMQf1CgwwcLtmjMNmcLB6ssOWwU4EZw2zBk=" }, { "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "9.0.0", - "hash": "sha256-PsLo6mrLGYfbi96rfCG8YS1APXkUXBG4hLstpT60I4s=" + "version": "9.0.1", + "hash": "sha256-xEgobzCPSB+8NbAcjOjES1oYKBdwk5hVdfENL2XPWbk=" }, { "pname": "Microsoft.Extensions.Configuration.Json", - "version": "9.0.0", - "hash": "sha256-qQn7Ol0CvPYuyecYWYBkPpTMdocO7I6n+jXQI2udzLI=" + "version": "9.0.1", + "hash": "sha256-8mqWcbJk8FOonELQPaxmAQAkVEz8OrHqn/4sl8SDigM=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "9.0.0", - "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k=" + "version": "9.0.1", + "hash": "sha256-Kt9fczXVeOIlvwuxXdQDKRfIZKClay0ESGUIAJpYiOw=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "9.0.0", "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=" }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.1", + "hash": "sha256-2tWVTPHsw1NG2zO0zsxvi1GybryqeE1V00ZRE66YZB4=" + }, { "pname": "Microsoft.Extensions.DependencyModel", "version": "9.0.0", @@ -76,59 +91,79 @@ }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "9.0.0", - "hash": "sha256-JMbhtjdcWRlrcrbgPlowfj26+pM+MYhnPIaYKnv9byU=" + "version": "9.0.1", + "hash": "sha256-WOuWbkV9IxXnIN2xpqeoovoD3rbMpwAXSJlYKSI4dUI=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "9.0.0", - "hash": "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY=" + "version": "9.0.1", + "hash": "sha256-/JkeyAQ//lfuHrWbq8ZFrHZiLvIXSnBj0MG0rU8eggQ=" }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "9.0.0", - "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc=" + "version": "9.0.1", + "hash": "sha256-ZVnTUbr2eIVFHdtTG9H1kR4DzgpDiMFzRcNx0brHf3o=" }, { "pname": "Microsoft.Extensions.FileProviders.Physical", - "version": "9.0.0", - "hash": "sha256-IzFpjKHmF1L3eVbFLUZa2N5aH3oJkJ7KE1duGIS7DP8=" + "version": "9.0.1", + "hash": "sha256-GKyzSDYPl5Y0AAHufaULu8BLKWQU1ofAUJt4YENVaXU=" }, { "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "9.0.0", - "hash": "sha256-eBLa8pW/y/hRj+JbEr340zbHRABIeFlcdqE0jf5/Uhc=" + "version": "9.0.1", + "hash": "sha256-eoJViA7yWsT9gD/oY5WJHaEWHDibek6uClj8woyteHM=" }, { "pname": "Microsoft.Extensions.Http", - "version": "9.0.0", - "hash": "sha256-MsStH3oUfyBbcSEoxm+rfxFBKI/rtB5PZrSGvtDjVe0=" + "version": "9.0.1", + "hash": "sha256-MvQon3jJ/wIhXCLFuI2s0tW4+bh0jUAu6H5I5R8WjaQ=" }, { "pname": "Microsoft.Extensions.Logging", "version": "9.0.0", "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM=" }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "9.0.1", + "hash": "sha256-IjszwetJ/r1NvwVyh+/SlavabNt9UXf3ZSGP9gGwnkk=" + }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "9.0.0", "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "9.0.1", + "hash": "sha256-aFZeUno9yLLbvtrj53gA7oD41vxZZYkrJhlOghpMEjo=" + }, { "pname": "Microsoft.Extensions.Options", "version": "9.0.0", "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=" }, + { + "pname": "Microsoft.Extensions.Options", + "version": "9.0.1", + "hash": "sha256-wOKd/0+kRK3WrGA2HmS/KNYUTUwXHmTAD5IsClTFA10=" + }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "9.0.0", - "hash": "sha256-r1Z3sEVSIjeH2UKj+KMj86har68g/zybSqoSjESBcoA=" + "version": "9.0.1", + "hash": "sha256-pzc49CPyBlSoyflWvW6J+xqk2RXEVfPczcDiR0Aj9xA=" }, { "pname": "Microsoft.Extensions.Primitives", "version": "9.0.0", "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=" }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.1", + "hash": "sha256-tdbtoC7eQGW5yh66FWCJQqmFJkNJD+9e6DDKTs7YAjs=" + }, { "pname": "Newtonsoft.Json", "version": "13.0.3", @@ -141,8 +176,8 @@ }, { "pname": "Sandreas.AudioMetadata", - "version": "0.2.7", - "hash": "sha256-GYD+nAURuU99/3JH/4QTthhzAVsau/qpcvih4eiJxtk=" + "version": "0.2.8", + "hash": "sha256-fxzUNFUC/HesKbucrFkOcfqzZfvGqSe3Kr3ZrUzJEic=" }, { "pname": "Sandreas.Files", @@ -189,16 +224,16 @@ "version": "0.49.1", "hash": "sha256-sar9rhft1ivDMj1kU683+4KxUPUZL+Fb++ewMA6RD4Q=" }, - { - "pname": "System.CodeDom", - "version": "9.0.0", - "hash": "sha256-578lcBgswW0eM16r0EnJzfGodPx86RxxFoZHc2PSzsw=" - }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "9.0.0", "hash": "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE=" }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "9.0.1", + "hash": "sha256-nIIvVK+5uyOhAuU2sERNADK4N/A/x0MilBH/EAr1gOA=" + }, { "pname": "System.IO.Abstractions", "version": "19.0.1", @@ -210,20 +245,30 @@ "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" }, { - "pname": "System.Management", - "version": "9.0.0", - "hash": "sha256-UyLO5dgNVC7rBT1S6o/Ix6EQGlVTSWUQtVC+/cyTkfQ=" + "pname": "System.IO.Pipelines", + "version": "9.0.1", + "hash": "sha256-CnmDanknCGbNnoDjgZw62M/Grg8IMTJDa8x3P07UR2A=" }, { "pname": "System.Text.Encodings.Web", "version": "9.0.0", "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0=" }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.1", + "hash": "sha256-iuAVcTiiZQLCZjDfDqdLLPHqZdZqvFabwLFHiVYdRJo=" + }, { "pname": "System.Text.Json", "version": "9.0.0", "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=" }, + { + "pname": "System.Text.Json", + "version": "9.0.1", + "hash": "sha256-2dqE+Mx5eJZ8db74ofUiUXHOSxDCmXw5n9VC9w4fUr0=" + }, { "pname": "TestableIO.System.IO.Abstractions", "version": "19.0.1", @@ -241,7 +286,7 @@ }, { "pname": "z440.atl.core", - "version": "6.11.0", - "hash": "sha256-V1r1ftZ/Ud0pw/qwnqpJodRaGi9FyG3uIy3ykJUvxjg=" + "version": "6.14.0", + "hash": "sha256-H9Z9a+Vfn1P3u5ClwRB3x1ooXvUQbayyPrRvIiop9aU=" } ] diff --git a/pkgs/by-name/to/tone/package.nix b/pkgs/by-name/to/tone/package.nix index 03fb6388f1f6..4ac8a62707a2 100644 --- a/pkgs/by-name/to/tone/package.nix +++ b/pkgs/by-name/to/tone/package.nix @@ -10,15 +10,20 @@ buildDotnetModule rec { pname = "tone"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "sandreas"; repo = "tone"; tag = "v${version}"; - hash = "sha256-DX54NSlqAZzVQObm9qjUsYatjxjHKGcSLHH1kVD4Row="; + hash = "sha256-yqcxqwlCfVDTv5jkcneimlS5EgnDlB7ZvxPt53t9jbQ="; }; + patchPhase = '' + substituteInPlace tone/Program.cs \ + --replace-fail "@package_version@" ${version} + ''; + projectFile = "tone/tone.csproj"; executables = [ "tone" ]; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/to/tooling-language-server/package.nix b/pkgs/by-name/to/tooling-language-server/package.nix index 1feca73499a3..dc7d529230f3 100644 --- a/pkgs/by-name/to/tooling-language-server/package.nix +++ b/pkgs/by-name/to/tooling-language-server/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-DxQMAnlE8oWtigU1gUEdTdBIvEtbL8xhaPLx6kt8T2c="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index b5e9747b2db0..39a61e46b5ff 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "tootik"; - version = "0.15.5"; + version = "0.16.0"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; tag = version; - hash = "sha256-L37m8RFJZPKDg+lhn3Hr6V3JBWBTOziybv5+Uxxihos="; + hash = "sha256-C6FPVWrQb3+tG3nwmH8XaVrnui9SfzFbazWfFj36PEg="; }; - vendorHash = "sha256-l5u4ImpMASri+3ph/Q5gs0oWPAk81ZmFkNfiMnIHxuU="; + vendorHash = "sha256-asL0W5ohrXbyTAXRJBP2UdJqGa0w4mX0x/x6B3qt7Gg="; nativeBuildInputs = [ openssl ]; diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix new file mode 100644 index 000000000000..099046b2001f --- /dev/null +++ b/pkgs/by-name/to/topgrade/package.nix @@ -0,0 +1,55 @@ +{ + stdenv, + lib, + fetchFromGitHub, + rustPlatform, + installShellFiles, +}: + +rustPlatform.buildRustPackage rec { + pname = "topgrade"; + version = "16.0.3"; + + src = fetchFromGitHub { + owner = "topgrade-rs"; + repo = "topgrade"; + rev = "v${version}"; + hash = "sha256-TLeShvDdVqFBIStdRlgF1Zmi8FwS9pmeQ9qOu63nq/E="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Tu4exuUhsk9hGDreQWkPrYvokZh0z6DQSQnREO40Qwc="; + + nativeBuildInputs = [ + installShellFiles + ]; + + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.hostPlatform.isDarwin [ + "-framework" + "AppKit" + ] + ); + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd topgrade \ + --bash <($out/bin/topgrade --gen-completion bash) \ + --fish <($out/bin/topgrade --gen-completion fish) \ + --zsh <($out/bin/topgrade --gen-completion zsh) + + $out/bin/topgrade --gen-manpage > topgrade.8 + installManPage topgrade.8 + ''; + + meta = with lib; { + description = "Upgrade all the things"; + homepage = "https://github.com/topgrade-rs/topgrade"; + changelog = "https://github.com/topgrade-rs/topgrade/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ + SuperSandro2000 + xyenon + ]; + mainProgram = "topgrade"; + }; +} diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix index 5ffdd1076f0b..d5052e580659 100644 --- a/pkgs/by-name/to/topiary/package.nix +++ b/pkgs/by-name/to/topiary/package.nix @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { ''; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index afc326de05f6..90ae73bf531e 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.0.9"; + version = "14.5.2"; sources = { x86_64-linux = fetchurl { @@ -119,7 +119,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-oTOTTB5tuAhzaQY3nlSUD4lZNHAGmURIf5XCzFB2xeg="; + hash = "sha256-ZvNje6LtrjS8gURyp38eLzPD7ji2DlOkkphW4KBmus0="; }; i686-linux = fetchurl { @@ -129,7 +129,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-Z/CDaO5eEPVwBnm3SJxBYvInyB7Oy6Ve8hNJunTJET0="; + hash = "sha256-+Dt1uDZeUV65jbJ5pYv8v/P8UxTy37cHjIqmPd8SuGg="; }; }; @@ -291,7 +291,7 @@ lib.warnIf (useHardenedMalloc != null) # FONTCONFIG_FILE is required to make fontconfig read the TBB # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 # indicates the system fonts.conf being used instead. - FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf + FONTCONFIG_FILE=$TBB_IN_STORE/fonts/fonts.conf substituteInPlace "$FONTCONFIG_FILE" \ --replace-fail 'fonts' "$TBB_IN_STORE/fonts" diff --git a/pkgs/by-name/to/torrential/package.nix b/pkgs/by-name/to/torrential/package.nix index 913e1b5c34e8..f10ee282beae 100644 --- a/pkgs/by-name/to/torrential/package.nix +++ b/pkgs/by-name/to/torrential/package.nix @@ -77,7 +77,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS"; homepage = "https://github.com/davidmhewitt/torrential"; - maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; + maintainers = with maintainers; [ xiorcale ]; + teams = [ teams.pantheon ]; platforms = platforms.linux; license = licenses.gpl2Plus; mainProgram = "com.github.davidmhewitt.torrential"; diff --git a/pkgs/by-name/to/torus-trooper/package.nix b/pkgs/by-name/to/torus-trooper/package.nix index f3a98d48e04f..7043ce8e51b5 100644 --- a/pkgs/by-name/to/torus-trooper/package.nix +++ b/pkgs/by-name/to/torus-trooper/package.nix @@ -5,6 +5,8 @@ fetchurl, unzip, gdc, + libGL, + libGLU, SDL, SDL_mixer, bulletml, @@ -61,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libGL + libGLU SDL SDL_mixer bulletml diff --git a/pkgs/by-name/to/torzu/fix-aarch64-linux-build.patch b/pkgs/by-name/to/torzu/fix-aarch64-linux-build.patch deleted file mode 100644 index 11d4a0a4ea2d..000000000000 --- a/pkgs/by-name/to/torzu/fix-aarch64-linux-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/video_core/host1x/vic.cpp b/src/video_core/host1x/vic.cpp -index 3ad56bb80..57e6adbf8 100644 ---- a/src/video_core/host1x/vic.cpp -+++ b/src/video_core/host1x/vic.cpp -@@ -13,7 +13,8 @@ - #endif - #elif defined(ARCHITECTURE_arm64) - #pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Wimplicit-int-conversion" -+#pragma GCC diagnostic ignored "-Wconversion" -+#pragma GCC diagnostic ignored "-Wshadow" - #include - #pragma GCC diagnostic pop - #endif diff --git a/pkgs/by-name/to/torzu/fix-debugger.patch b/pkgs/by-name/to/torzu/fix-debugger.patch deleted file mode 100644 index 87d4e0cc118f..000000000000 --- a/pkgs/by-name/to/torzu/fix-debugger.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/src/core/debugger/debugger.cpp b/src/core/debugger/debugger.cpp -index e86aae8460..a4dca23770 100644 ---- a/src/core/debugger/debugger.cpp -+++ b/src/core/debugger/debugger.cpp -@@ -5,7 +5,13 @@ - #include - #include - --#include -+// Use basic asio functionality only -+#define BOOST_ASIO_STANDALONE -+#include -+#include -+#include -+#include -+ - #include - - #include "common/logging/log.h" -@@ -21,17 +27,22 @@ - - template - static void AsyncReceiveInto(Readable& r, Buffer& buffer, Callback&& c) { -- static_assert(std::is_trivial_v); -- auto boost_buffer{boost::asio::buffer(&buffer, sizeof(Buffer))}; -- r.async_read_some( -- boost_buffer, [&, c](const boost::system::error_code& error, size_t bytes_read) { -- if (!error.failed()) { -- const u8* buffer_start = reinterpret_cast(&buffer); -- std::span received_data{buffer_start, buffer_start + bytes_read}; -- c(received_data); -- AsyncReceiveInto(r, buffer, c); -- } -- }); -+ try { -+ static_assert(std::is_trivial_v); -+ auto boost_buffer{boost::asio::buffer(&buffer, sizeof(Buffer))}; -+ r.async_read_some( -+ boost_buffer, -+ [&, c](const boost::system::error_code& error, size_t bytes_read) { -+ if (!error) { -+ const u8* buffer_start = reinterpret_cast(&buffer); -+ std::span received_data{buffer_start, buffer_start + bytes_read}; -+ c(received_data); -+ AsyncReceiveInto(r, buffer, c); -+ } -+ }); -+ } catch (const std::exception& e) { -+ LOG_ERROR(Debug_GDBStub, "AsyncReceiveInto error: {}", e.what()); -+ } - } - - template diff --git a/pkgs/by-name/to/torzu/fix-udp-client.patch b/pkgs/by-name/to/torzu/fix-udp-client.patch deleted file mode 100644 index 103b1001ee2a..000000000000 --- a/pkgs/by-name/to/torzu/fix-udp-client.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp -index 60821b31a6..8f9c047218 100644 ---- a/src/input_common/drivers/udp_client.cpp -+++ b/src/input_common/drivers/udp_client.cpp -@@ -2,7 +2,15 @@ - // SPDX-License-Identifier: GPL-2.0-or-later - - #include --#include -+// Include only needed asio components -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - #include - - #include "common/logging/log.h" -@@ -113,7 +121,7 @@ private: - } - - SocketCallback callback; -- boost::asio::io_service io_service; -+ boost::asio::io_context io_service; - boost::asio::basic_waitable_timer timer; - udp::socket socket; - diff --git a/pkgs/by-name/to/torzu/fix-udp-protocol.patch b/pkgs/by-name/to/torzu/fix-udp-protocol.patch deleted file mode 100644 index 65c4862825fc..000000000000 --- a/pkgs/by-name/to/torzu/fix-udp-protocol.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/input_common/helpers/udp_protocol.h b/src/input_common/helpers/udp_protocol.h -index db08fc62c5..ea223ea937 100644 ---- a/src/input_common/helpers/udp_protocol.h -+++ b/src/input_common/helpers/udp_protocol.h -@@ -69,7 +69,7 @@ Message CreateMessage(const u32 magic, const T data, const u32 sender_id) { - }; - Message message{header, data}; - crc.process_bytes(&message, sizeof(Message)); -- message.header.crc = crc.checksum(); -+ message.header.crc = static_cast(crc.checksum()); - return message; - } - diff --git a/pkgs/by-name/to/torzu/package.nix b/pkgs/by-name/to/torzu/package.nix deleted file mode 100644 index 8545b55189fe..000000000000 --- a/pkgs/by-name/to/torzu/package.nix +++ /dev/null @@ -1,229 +0,0 @@ -{ - lib, - stdenv, - SDL2, - boost, - catch2_3, - cmake, - fetchFromGitHub, - cpp-jwt, - cubeb, - discord-rpc, - enet, - fetchgit, - fetchurl, - ffmpeg-headless, - fmt, - glslang, - libopus, - libusb1, - lz4, - python3, - unzip, - nix-update-script, - nlohmann_json, - pkg-config, - qt6, - spirv-tools, - spirv-headers, - vulkan-utility-libraries, - vulkan-headers, - vulkan-loader, - simpleini, - zlib, - vulkan-memory-allocator, - zstd, -}: - -let - inherit (qt6) - qtbase - qtmultimedia - qtwayland - wrapQtAppsHook - qttools - qtwebengine - ; - - compat-list = stdenv.mkDerivation { - pname = "yuzu-compatibility-list"; - version = "unstable-2024-02-26"; - - src = fetchFromGitHub { - owner = "flathub"; - repo = "org.yuzu_emu.yuzu"; - rev = "9c2032a3c7e64772a8112b77ed8b660242172068"; - hash = "sha256-ITh/W4vfC9w9t+TJnPeTZwWifnhTNKX54JSSdpgaoBk="; - }; - - buildCommand = '' - cp $src/compatibility_list.json $out - ''; - }; - - nx_tzdb = stdenv.mkDerivation rec { - pname = "nx_tzdb"; - version = "221202"; - - src = fetchurl { - url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${version}/${version}.zip"; - hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c="; - }; - - nativeBuildInputs = [ unzip ]; - - buildCommand = '' - unzip $src -d $out - ''; - - }; - -in - -stdenv.mkDerivation (finalAttrs: { - pname = "torzu"; - version = "unstable-2025-02-22"; - - src = fetchgit { - url = "https://git.ynh.ovh/liberodark/torzu.git"; - rev = "eaa9c9e3a46eb5099193b11d620ddfe96b6aec83"; - hash = "sha256-KxLRXM8Y+sIW5L9oYMSeK95HRb30zGRRSfil9DO+utU="; - fetchSubmodules = true; - }; - - patches = [ - # Remove coroutines from debugger to fix boost::asio compatibility issues - ./fix-debugger.patch - # Add explicit cast for CRC checksum value - ./fix-udp-protocol.patch - # Use specific boost::asio includes and update to modern io_context - ./fix-udp-client.patch - # Updates suppressed diagnostics - ./fix-aarch64-linux-build.patch - ]; - - nativeBuildInputs = [ - cmake - glslang - pkg-config - python3 - qttools - wrapQtAppsHook - ]; - - buildInputs = [ - # vulkan-headers must come first, so the older propagated versions - # don't get picked up by accident - vulkan-headers - - boost - catch2_3 - cpp-jwt - cubeb - discord-rpc - # intentionally omitted: dynarmic - prefer vendored version for compatibility - enet - - ffmpeg-headless - fmt - # intentionally omitted: gamemode - loaded dynamically at runtime - # intentionally omitted: httplib - upstream requires an older version than what we have - libopus - libusb1 - # intentionally omitted: LLVM - heavy, only used for stack traces in the debugger - lz4 - nlohmann_json - qtbase - qtmultimedia - qtwayland - qtwebengine - # intentionally omitted: renderdoc - heavy, developer only - SDL2 - # intentionally omitted: stb - header only libraries, vendor uses git snapshot - simpleini - spirv-tools - spirv-headers - vulkan-memory-allocator - vulkan-utility-libraries - # intentionally omitted: xbyak - prefer vendored version for compatibility - zlib - zstd - ]; - - # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt` - # making the build fail, as that path does not exist - dontFixCmake = true; - - __structuredAttrs = true; - cmakeFlags = [ - # actually has a noticeable performance impact - (lib.cmakeBool "YUZU_ENABLE_LTO" true) - (lib.cmakeBool "YUZU_TESTS" false) - - (lib.cmakeBool "ENABLE_QT6" true) - (lib.cmakeBool "ENABLE_QT_TRANSLATION" true) - - # use system libraries - # NB: "external" here means "from the externals/ directory in the source", - # so "false" means "use system" - (lib.cmakeBool "YUZU_USE_EXTERNAL_SDL2" false) - (lib.cmakeBool "YUZU_USE_EXTERNAL_VULKAN_HEADERS" false) - (lib.cmakeBool "YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES" false) - (lib.cmakeBool "YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS" false) - - # don't check for missing submodules - (lib.cmakeBool "YUZU_CHECK_SUBMODULES" false) - - # enable some optional features - (lib.cmakeBool "YUZU_USE_QT_WEB_ENGINE" true) - (lib.cmakeBool "YUZU_USE_QT_MULTIMEDIA" true) - (lib.cmakeBool "USE_DISCORD_PRESENCE" true) - - # We dont want to bother upstream with potentially outdated compat reports - (lib.cmakeBool "YUZU_ENABLE_COMPATIBILITY_REPORTING" false) - (lib.cmakeBool "ENABLE_COMPATIBILITY_LIST_DOWNLOAD" false) # We provide this deterministically - - (lib.cmakeFeature "TITLE_BAR_FORMAT_IDLE" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}") - (lib.cmakeFeature "TITLE_BAR_FORMAT_RUNNING" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}") - ]; - - env = { - # Does some handrolled SIMD - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1"; - }; - - qtWrapperArgs = [ - # Fixes vulkan detection. - # FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate - "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" - ]; - - preConfigure = '' - # provide pre-downloaded tz data - mkdir -p build/externals/nx_tzdb - ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb - ''; - - postConfigure = '' - ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json - ''; - - postInstall = " - install -Dm444 $src/dist/72-yuzu-input.rules $out/lib/udev/rules.d/72-yuzu-input.rules - "; - - meta = { - description = "Fork of yuzu, an open-source Nintendo Switch emulator"; - homepage = "https://notabug.org/litucks/torzu"; - mainProgram = "yuzu"; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ liberodark ]; - license = with lib.licenses; [ - gpl3Plus - # Icons - asl20 - mit - cc0 - ]; - }; -}) diff --git a/pkgs/by-name/to/totem-pl-parser/package.nix b/pkgs/by-name/to/totem-pl-parser/package.nix index bb565d494e89..547ca6d58ecd 100644 --- a/pkgs/by-name/to/totem-pl-parser/package.nix +++ b/pkgs/by-name/to/totem-pl-parser/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/totem-pl-parser"; description = "Simple GObject-based library to parse and save a host of playlist formats"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.lgpl2; platforms = platforms.unix; }; diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix index 07df3bffe60b..5ad36ced402f 100644 --- a/pkgs/by-name/to/totem/package.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/Totem/"; changelog = "https://gitlab.gnome.org/GNOME/totem/-/blob/${version}/NEWS?ref_type=tags"; description = "Movie player for the GNOME desktop based on GStreamer"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins platforms = platforms.linux; # gst-inspect-1.0 is not smart enough for cross compiling diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix index aebc2e3f1028..9612a91f01c5 100644 --- a/pkgs/by-name/to/touchegg/package.nix +++ b/pkgs/by-name/to/touchegg/package.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { mainProgram = "touchegg"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; }; } diff --git a/pkgs/by-name/to/touchosc/package.nix b/pkgs/by-name/to/touchosc/package.nix index e34506ff001e..2ccad4bc7d82 100644 --- a/pkgs/by-name/to/touchosc/package.nix +++ b/pkgs/by-name/to/touchosc/package.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.3.9.226"; + version = "1.4.0.230"; suffix = { @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-LMTOahmA61uSMgs0wBNMzDjT7SWUL5Bd5r1fgcSDWZo="; - armv7l-linux = "sha256-0zF+Pn4Yj3vCGUMNY5+TY3iUAu4yN/dpL926oZjWfoQ="; - x86_64-linux = "sha256-myyb7VixEg+99r5H6G0GRusm8ulBw2l1/vgpFI+8vAQ="; + aarch64-linux = "sha256-RXv5j542pLApvp5y9EG6I/WWywoCFZx/F71mKusBSv4="; + armv7l-linux = "sha256-5ySPBbB51tQjrhLpHzoEb5EPDv4nDGJL/hKQOSl3/YI="; + x86_64-linux = "sha256-v7ePfkKxM/yu3KVQfDaK3dMij2TNfLY34ox5/dHJgGI="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/by-name/to/toybox/package.nix similarity index 100% rename from pkgs/tools/misc/toybox/default.nix rename to pkgs/by-name/to/toybox/package.nix diff --git a/pkgs/by-name/tp/tpm2-pkcs11-esapi/package.nix b/pkgs/by-name/tp/tpm2-pkcs11-esapi/package.nix new file mode 100644 index 000000000000..140f12bba80f --- /dev/null +++ b/pkgs/by-name/tp/tpm2-pkcs11-esapi/package.nix @@ -0,0 +1,12 @@ +{ + tpm2-pkcs11, + ... +}@args: + +tpm2-pkcs11.override ( + args + // { + fapiSupport = false; + extraDescription = "Disables FAPI support, as if TPM2_PKCS11_BACKEND were always set to 'esysdb'."; + } +) diff --git a/pkgs/by-name/tp/tpm2-pkcs11-fapi/package.nix b/pkgs/by-name/tp/tpm2-pkcs11-fapi/package.nix new file mode 100644 index 000000000000..7fe3b48b961b --- /dev/null +++ b/pkgs/by-name/tp/tpm2-pkcs11-fapi/package.nix @@ -0,0 +1,13 @@ +{ + tpm2-pkcs11, + ... +}@args: + +tpm2-pkcs11.override ( + args + // { + fapiSupport = true; + defaultToFapi = true; + extraDescription = "Enables fapi by default, as if TPM2_PKCS11_BACKEND defaulted to 'fapi'."; + } +) diff --git a/pkgs/by-name/tp/tpm2-pkcs11/default-to-fapi.patch b/pkgs/by-name/tp/tpm2-pkcs11/default-to-fapi.patch new file mode 100644 index 000000000000..74a091660707 --- /dev/null +++ b/pkgs/by-name/tp/tpm2-pkcs11/default-to-fapi.patch @@ -0,0 +1,33 @@ +From 648f0d08953152185e13feaca4feda02f8665341 Mon Sep 17 00:00:00 2001 +From: Morgan Jones +Date: Wed, 9 Apr 2025 00:12:47 -0700 +Subject: [PATCH] backend: default to fapi + +--- + src/lib/backend.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/lib/backend.c b/src/lib/backend.c +index 128f58b..8404afe 100644 +--- a/src/lib/backend.c ++++ b/src/lib/backend.c +@@ -15,12 +15,12 @@ static enum backend get_backend(void) { + + const char *env = getenv("TPM2_PKCS11_BACKEND"); + +- if (!env || !strcasecmp(env, "esysdb")) { +- return backend_esysdb; ++ if (!env || !strcasecmp(env, "fapi")) { ++ return backend_fapi; + } + +- if (!strcasecmp(env, "fapi")) { +- return backend_fapi; ++ if (!strcasecmp(env, "esysdb")) { ++ return backend_esysdb; + } + + return backend_error; +-- +2.47.0 + diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix index 33effd81306e..17d53d293bbf 100644 --- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix +++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix @@ -26,14 +26,18 @@ swtpm, tpm2-abrmd, tpm2-openssl, - tpm2-pkcs11, # for passthru abrmd tests + tpm2-pkcs11, # for passthru tests + tpm2-pkcs11-esapi, + tpm2-pkcs11-fapi, tpm2-tools, tpm2-tss, which, xxd, abrmdSupport ? false, fapiSupport ? true, + defaultToFapi ? false, enableFuzzing ? false, + extraDescription ? null, }: let @@ -51,7 +55,9 @@ chosenStdenv.mkDerivation (finalAttrs: { }; # Disable Java‐based tests because of missing dependencies - patches = [ ./disable-java-integration.patch ]; + patches = + lib.singleton ./disable-java-integration.patch + ++ lib.optional defaultToFapi ./default-to-fapi.patch; postPatch = '' echo ${lib.escapeShellArg finalAttrs.version} >VERSION @@ -80,12 +86,14 @@ chosenStdenv.mkDerivation (finalAttrs: { [ (lib.enableFeature finalAttrs.doCheck "unit") (lib.enableFeature finalAttrs.doCheck "integration") + + # Strangely, it uses --with-fapi=yes|no instead of a normal configure flag. + "--with-fapi=${if fapiSupport then "yes" else "no"}" ] ++ lib.optionals enableFuzzing [ "--enable-fuzzing" "--disable-hardening" - ] - ++ lib.optional fapiSupport "--with-fapi"; + ]; strictDeps = true; @@ -178,6 +186,10 @@ chosenStdenv.mkDerivation (finalAttrs: { # Enable tests to load TPM2 OpenSSL module export OPENSSL_MODULES="${openssl-modules}/lib/ossl-modules" + '' + + lib.optionalString defaultToFapi '' + # Need to change the default since the tests expect the other way. + export TPM2_PKCS11_BACKEND=esysdb ''; postInstall = '' @@ -210,14 +222,33 @@ chosenStdenv.mkDerivation (finalAttrs: { $out/lib/libtpm2_pkcs11.so.0.0.0 ''; - passthru = { - tests.tpm2-pkcs11-abrmd = tpm2-pkcs11.override { + passthru = rec { + esapi = tpm2-pkcs11-esapi; + fapi = tpm2-pkcs11-fapi; + abrmd = tpm2-pkcs11.override { abrmdSupport = true; }; + esapi-abrmd = tpm2-pkcs11-esapi.override { + abrmdSupport = true; + }; + fapi-abrmd = tpm2-pkcs11-fapi.override { + abrmdSupport = true; + }; + tests = { + inherit + esapi + fapi + abrmd + esapi-abrmd + fapi-abrmd + ; + }; }; meta = { - description = "PKCS#11 interface for TPM2 hardware"; + description = + "PKCS#11 interface for TPM2 hardware." + + lib.optionalString (extraDescription != null) " ${extraDescription}"; homepage = "https://github.com/tpm2-software/tpm2-pkcs11"; license = lib.licenses.bsd2; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/tp/tpm2-tools/package.nix b/pkgs/by-name/tp/tpm2-tools/package.nix index 88a20e99b1d2..363ba53c7b00 100644 --- a/pkgs/by-name/tp/tpm2-tools/package.nix +++ b/pkgs/by-name/tp/tpm2-tools/package.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tpm2-software/tpm2-tools"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 30ed1b44393a..73d1be81f878 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, oniguruma, - darwin, installShellFiles, tpnote, testers, @@ -14,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "tpnote"; - version = "1.25.6"; + version = "1.25.9"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; tag = "v${version}"; - hash = "sha256-9mj88mUCpMPBIUrwAL61/XAtn3OQ3EtdP8ZlQBHE4/I="; + hash = "sha256-+JpV9gJsnK/YFOl+9rS0V0kFtmwkZNmVRzKUypeSvuQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-K/vtA6Gr015xwuJBge+QDW3MQMJNyKyfxtkV6fs/zmE="; + cargoHash = "sha256-1nFtcjJLuAfBQDtBT20E7Fr5Yrl93tsE4J/CSGbLo+M="; nativeBuildInputs = [ cmake @@ -32,18 +30,9 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + oniguruma + ]; postInstall = '' installManPage docs/build/man/man1/tpnote.1 diff --git a/pkgs/by-name/tp/tproxy/package.nix b/pkgs/by-name/tp/tproxy/package.nix index 0164664ace17..451fb3d0a35f 100644 --- a/pkgs/by-name/tp/tproxy/package.nix +++ b/pkgs/by-name/tp/tproxy/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tproxy"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "kevwan"; repo = "tproxy"; tag = "v${version}"; - hash = "sha256-LX3ciC3cMYuQPm6ekEkJPrSdTXH+WZ4flXyrsvJZgn8="; + hash = "sha256-LiYZ9S7Jga4dQWHmqsPvlGDAAw5reO16LAYaNJZFnhE="; }; - vendorHash = "sha256-7s2gnd9UR/R7H5pcA8NcoenaabSVpMh3qzzkOr5RWnU="; + vendorHash = "sha256-YjkYb5copw0SM2lago+DyVgHIrqLDSBnO+4zLMq+YJ8="; ldflags = [ "-w" diff --git a/pkgs/by-name/tq/tqsl/package.nix b/pkgs/by-name/tq/tqsl/package.nix index 61ea5efac068..7ba2db907b0f 100644 --- a/pkgs/by-name/tq/tqsl/package.nix +++ b/pkgs/by-name/tq/tqsl/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "tqsl"; - version = "2.7.5"; + version = "2.8"; src = fetchurl { url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz"; - sha256 = "sha256-recq2FTyvmt5tDTjZRjQKWf5HgdkmTsMmRTWTfTPGbQ="; + sha256 = "sha256-zcC6T6FevoPsr9r/EKDCJhkzWImKxghVNo0eX9P7oNg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix index 66df7b1c66ee..77f12a8e20bc 100644 --- a/pkgs/by-name/tr/tracexec/package.nix +++ b/pkgs/by-name/tr/tracexec/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "tracexec"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "kxxt"; repo = "tracexec"; tag = "v${version}"; - hash = "sha256-cqDGntubHbv6TJ0CSouTyCcDGpheLazbavYglHQRd10="; + hash = "sha256-j1zgHDO5bmJAXi9KvkHqenm/QfM9DmD9yNqF6TxJ9sY="; }; # remove if updating to rust 1.85 @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { env.RUSTC_BOOTSTRAP = 1; useFetchCargoVendor = true; - cargoHash = "sha256-EY44uwf1b61UlulNwtN8JIG2CaEjxSnfuqE29/zdxBM="; + cargoHash = "sha256-XuuLuIeD/S60by/hg1fR+ML3PtIyX9JNrEvgGzI3UiM="; hardeningDisable = [ "zerocallusedregs" ]; diff --git a/pkgs/by-name/tr/trackballs/package.nix b/pkgs/by-name/tr/trackballs/package.nix index 1b21058149a1..fa1f14d7d06c 100644 --- a/pkgs/by-name/tr/trackballs/package.nix +++ b/pkgs/by-name/tr/trackballs/package.nix @@ -14,17 +14,21 @@ libGL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trackballs"; version = "1.3.4"; src = fetchFromGitHub { owner = "trackballs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8="; + repo = "trackballs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8="; }; + postPatch = '' + substituteInPlace src/glHelp.h --replace-fail _TTF_Font TTF_Font + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib @@ -38,12 +42,12 @@ stdenv.mkDerivation rec { libGL ]; - meta = with lib; { + meta = { homepage = "https://trackballs.github.io/"; description = "3D Marble Madness clone"; mainProgram = "trackballs"; - platforms = platforms.linux; + platforms = lib.platforms.linux; # Music is licensed under Ethymonics Free Music License. - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/tr/trackma/package.nix b/pkgs/by-name/tr/trackma/package.nix index 69f91e5af2eb..0b9f8973f0f3 100644 --- a/pkgs/by-name/tr/trackma/package.nix +++ b/pkgs/by-name/tr/trackma/package.nix @@ -32,14 +32,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "trackma"; - version = "0.8.6"; + version = "0.9"; format = "pyproject"; src = fetchFromGitHub { owner = "z411"; repo = "trackma"; rev = "v${version}"; - sha256 = "qlkFQSJFjxkGd5WkNGfyAo64ys8VJLep/ZOL6icXQ4c="; + sha256 = "Hov9qdVabu1k3SIoUmvcRtSK8TcETqGPXI2RqN/bei4="; fetchSubmodules = true; # for anime-relations submodule }; diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index 5916ac4cca4f..2fcf417165a0 100644 --- a/pkgs/by-name/tr/tracy/package.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -9,7 +9,6 @@ wayland-scanner, capstone, - darwin, dbus, freetype, glfw, @@ -68,11 +67,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && !withWayland)) [ glfw - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ] - ++ lib.optionals ( - stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" - ) [ darwin.apple_sdk.frameworks.UniformTypeIdentifiers ]; + ]; cmakeFlags = [ diff --git a/pkgs/by-name/tr/traderepublic-portfolio-downloader/package.nix b/pkgs/by-name/tr/traderepublic-portfolio-downloader/package.nix index 414b1d0e8c05..44349b36d388 100644 --- a/pkgs/by-name/tr/traderepublic-portfolio-downloader/package.nix +++ b/pkgs/by-name/tr/traderepublic-portfolio-downloader/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "traderepublic-portfolio-downloader"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "dhojayev"; repo = "traderepublic-portfolio-downloader"; tag = "v${version}"; - hash = "sha256-U3cyQ449e7whFE5DnOlYL6qdOQgkpLPnd5ZxAG+WkRc="; + hash = "sha256-z+8VIN3rN1s8VFIGIJ6mwKbcajIcfN0TnB0Vfq5VXYM="; }; - vendorHash = "sha256-VzBBY1mNbT6qHnsy1GE+jWXHZcUo3TNefQixVFF+HYA="; + vendorHash = "sha256-MapulF+ppRW3ClI9RlVV5TEp/nNQz3LD5WdwN5AL8sw="; postInstall = '' mv $out/bin/public $out/bin/traderepublic-portfolio-downloader diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix index 99b9858999da..238d77561386 100644 --- a/pkgs/by-name/tr/traefik/package.nix +++ b/pkgs/by-name/tr/traefik/package.nix @@ -1,22 +1,23 @@ { lib, fetchzip, - buildGo123Module, + buildGo124Module, nixosTests, + nix-update-script, }: -buildGo123Module rec { +buildGo124Module (finalAttrs: { pname = "traefik"; - version = "3.3.4"; + version = "3.3.6"; # Archive with static assets for webui src = fetchzip { - url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-KXFpdk1VMYzGldFp/b5Ss6aJvL9yG4kSbM4LOIBUL5A="; + url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz"; + hash = "sha256-HA/JSwcss5ytGPqe2dqsKTZxuhWeC/yi8Mva4YVFeDs="; stripRoot = false; }; - vendorHash = "sha256-wtZFViVNvNuhHvI1YR2ome1rs2DIAd3Iurmpi9Y6F2w="; + vendorHash = "sha256-23BkkfJ6XLAygeeKipJk4puV5sGILb8rXEEA4qJWZS4="; subPackages = [ "cmd/traefik" ]; @@ -29,8 +30,8 @@ buildGo123Module rec { ldflags="-s" ldflags+=" -w" - ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Version=${version}" - ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Codename=$CODENAME" + ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major finalAttrs.version}/pkg/version.Version=${finalAttrs.version}" + ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major finalAttrs.version}/pkg/version.Codename=$CODENAME" ''; doCheck = false; @@ -39,15 +40,17 @@ buildGo123Module rec { inherit (nixosTests) traefik; }; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://traefik.io"; description = "Modern reverse proxy"; - changelog = "https://github.com/traefik/traefik/raw/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + changelog = "https://github.com/traefik/traefik/raw/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ djds vdemeester ]; mainProgram = "traefik"; }; -} +}) diff --git a/pkgs/by-name/tr/trafficserver/package.nix b/pkgs/by-name/tr/trafficserver/package.nix index d6cacf5434cf..d484013d18e7 100644 --- a/pkgs/by-name/tr/trafficserver/package.nix +++ b/pkgs/by-name/tr/trafficserver/package.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.2.7"; + version = "9.2.10"; src = fetchzip { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - hash = "sha256-i3UTqOO3gQezL2HmQllJa+hwy03tJViyOOflW2iXBAM="; + hash = "sha256-SS/xug6YwjGKjlZzuH/oqolrtYG03BER/52fCgBj/dw="; }; # NOTE: The upstream README indicates that flex is needed for some features, diff --git a/pkgs/by-name/tr/transgui/package.nix b/pkgs/by-name/tr/transgui/package.nix index 23286a131448..fb78b119b537 100644 --- a/pkgs/by-name/tr/transgui/package.nix +++ b/pkgs/by-name/tr/transgui/package.nix @@ -55,6 +55,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace restranslator.pas --replace /usr/ $out/ + + # Fix build with lazarus 4.0, https://github.com/transmission-remote-gui/transgui/issues/1486 + substituteInPlace main.pas --replace-warn "h <> INVALID_HANDLE_VALUE" "h >= 0" ''; preBuild = '' diff --git a/pkgs/by-name/tr/transmission-rss/package.nix b/pkgs/by-name/tr/transmission-rss/package.nix index 1fceafe35b86..e87517d42903 100644 --- a/pkgs/by-name/tr/transmission-rss/package.nix +++ b/pkgs/by-name/tr/transmission-rss/package.nix @@ -1,11 +1,9 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, - darwin, }: rustPlatform.buildRustPackage { @@ -25,15 +23,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-ETbWV5OjRzQuq/rVyu22YRFjeQcuNA1REyzg46s3q5A="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/tr/trayscale/package.nix b/pkgs/by-name/tr/trayscale/package.nix index fc3844d274c1..6e3cf5691830 100644 --- a/pkgs/by-name/tr/trayscale/package.nix +++ b/pkgs/by-name/tr/trayscale/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.14.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; - rev = "v${version}"; - hash = "sha256-Ct52IcRm44aDibiZfA1YySC7/jocHC4rB418DQvrp1s="; + tag = "v${version}"; + hash = "sha256-Fvp75DaU/ZB4VZsUIgiSAg9eWU2JO6aGGwEYaC+VzIE="; }; - vendorHash = "sha256-GA3jmj1/OruiaDT+q5ZQyZfhehRIMrc9+K9CCoQ1fsE="; + vendorHash = "sha256-KC2eWO3pS8Xbq9FwWfT3bAodhxdTOzpvkBxzxPa9pUY="; subPackages = [ "cmd/trayscale" ]; @@ -60,6 +60,6 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sikmir ]; mainProgram = "trayscale"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/tr/trdl-client/package.nix b/pkgs/by-name/tr/trdl-client/package.nix index 121c792fbc58..693b47cb2250 100644 --- a/pkgs/by-name/tr/trdl-client/package.nix +++ b/pkgs/by-name/tr/trdl-client/package.nix @@ -2,33 +2,29 @@ lib, buildGoModule, fetchFromGitHub, - testers, - trdl-client, + versionCheckHook, }: - -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "trdl-client"; - version = "0.8.7"; + version = "0.11.0"; src = fetchFromGitHub { owner = "werf"; repo = "trdl"; - rev = "v${version}"; - hash = "sha256-4RN2vrTP4horjDvuuFJbQhToL/4boIuaG+efoTbmebI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-QqAVcATpxfjKEaluurVN9EylEGKNKWlBkE8KepIpjfo="; }; - sourceRoot = "${src.name}/client"; + sourceRoot = "${finalAttrs.src.name}/client"; - vendorHash = "sha256-f7FPeR+us3WvwqzcSQLbkKv905CCIAAm+HNV2FFF8OY="; + vendorHash = "sha256-veSgWyk1ytHRNHuuZJBV+1rqGDsdEb01CImm+EexFCk="; subPackages = [ "cmd/trdl" ]; - env.CGO_ENABLED = 0; - ldflags = [ "-s" "-w" - "-X github.com/werf/trdl/client/pkg/trdl.Version=${src.rev}" + "-X github.com/werf/trdl/client/pkg/trdl.Version=${finalAttrs.src.rev}" ]; tags = [ @@ -36,20 +32,13 @@ buildGoModule rec { "dfssh" ]; - # There are no tests for cmd/trdl. - doCheck = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/trdl"; + versionCheckProgramArg = "version"; - passthru.tests.version = testers.testVersion { - package = trdl-client; - command = "trdl version"; - version = "v${version}"; - }; - - meta = with lib; { - description = '' - The universal solution for delivering your software updates securely from - a trusted The Update Framework (TUF) repository - ''; + meta = { + description = "Universal solution for delivering your software updates"; longDescription = '' trdl is an Open Source solution providing a secure channel for delivering updates from the Git repository to the end user. @@ -63,9 +52,9 @@ buildGoModule rec { software version from the TUF repository, and uses it. ''; homepage = "https://trdl.dev"; - changelog = "https://github.com/werf/trdl/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ azahi ]; + changelog = "https://github.com/werf/trdl/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.azahi ]; mainProgram = "trdl"; }; -} +}) diff --git a/pkgs/by-name/tr/tre/package.nix b/pkgs/by-name/tr/tre/package.nix index ccfb9d4937c9..268f561fbaf5 100644 --- a/pkgs/by-name/tr/tre/package.nix +++ b/pkgs/by-name/tr/tre/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, autoconf, automake, - darwin, gettext, libiconv, libtool, diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index bd389490f5b1..619f9aaa31a7 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.66.2"; + version = "2.71.2"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-E91w1mQtbnmnGB047UqvdFEg1y9PX7yU2IrXQdN1PYw="; + hash = "sha256-lMzqeqf7VOe3vqiC481OpwY2c8WwewBbiwfut7TE1S8="; }; postPatch = '' diff --git a/pkgs/by-name/tr/treefmt/build-config.nix b/pkgs/by-name/tr/treefmt/build-config.nix deleted file mode 100644 index 65fe7ca8f089..000000000000 --- a/pkgs/by-name/tr/treefmt/build-config.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - formats, -}: -module: -let - settingsFormat = formats.toml { }; - configuration = lib.evalModules { - modules = [ - { - _file = ./build-config.nix; - freeformType = settingsFormat.type; - } - { - # Wrap user's modules with a default file location - _file = ""; - imports = lib.toList module; - } - ]; - }; - settingsFile = settingsFormat.generate "treefmt.toml" configuration.config; -in -settingsFile.overrideAttrs { - passthru = { - format = settingsFormat; - settings = configuration.config; - inherit (configuration) _module options type; - }; -} diff --git a/pkgs/by-name/tr/treefmt/functions-doc.nix b/pkgs/by-name/tr/treefmt/functions-doc.nix new file mode 100644 index 000000000000..86dc23b226ea --- /dev/null +++ b/pkgs/by-name/tr/treefmt/functions-doc.nix @@ -0,0 +1,57 @@ +{ + lib, + writers, + nixdoc, + runCommand, + treefmt, +}: +let + root = toString ./.; + revision = lib.trivial.revisionWithDefault "master"; + removeRoot = file: lib.removePrefix "/" (lib.removePrefix root file); + + # Import and apply `./lib.nix`, which contains treefmt's public functions + # + # NOTE: we cannot access them via `treefmt.passthru` or `callPackages ./lib.nix { }`, + # because that would be opaque to `unsafeGetAttrPos`. + attrs = + let + fn = import ./lib.nix; + args = builtins.mapAttrs (_: _: null) (builtins.functionArgs fn); + in + fn args; +in +{ + locations = lib.pipe attrs [ + builtins.attrNames + (builtins.map ( + name: + let + pos = builtins.unsafeGetAttrPos name attrs; + file = removeRoot pos.file; + line = toString pos.line; + subpath = "pkgs/by-name/tr/treefmt/${file}"; + url = "https://github.com/NixOS/nixpkgs/blob/${revision}/${subpath}#L${line}"; + in + assert lib.hasPrefix root pos.file; + lib.nameValuePair "pkgs.treefmt.${name}" "[${subpath}:${line}](${url}) in ``" + )) + builtins.listToAttrs + (writers.writeJSON "treefmt-function-locations") + ]; + + markdown = + runCommand "treefmt-functions-doc" + { + nativeBuildInputs = [ nixdoc ]; + } + '' + nixdoc --file ${./lib.nix} \ + --locs ${treefmt.functionsDoc.locations} \ + --description "Functions Reference" \ + --prefix "pkgs" \ + --category "treefmt" \ + --anchor-prefix "" \ + > $out + ''; +} diff --git a/pkgs/by-name/tr/treefmt/lib.nix b/pkgs/by-name/tr/treefmt/lib.nix new file mode 100644 index 000000000000..a38fb5354bca --- /dev/null +++ b/pkgs/by-name/tr/treefmt/lib.nix @@ -0,0 +1,93 @@ +{ + lib, + pkgs, + treefmt, +}: +{ + /** + Evaluate a treefmt configuration. + + # Type + + ``` + Module -> Configuration + ``` + + # Inputs + + `module` + : A treefmt module. See [options reference](#sec-treefmt-options-reference). + */ + evalConfig = + module: + lib.evalModules { + class = "treefmtConfig"; + specialArgs.modulesPath = ./modules; + modules = [ + { + _file = "treefmt.evalConfig"; + _module.args.pkgs = lib.mkOptionDefault pkgs; + package = lib.mkOptionDefault treefmt; + } + { + _file = ""; + imports = lib.toList module; + } + ./modules/default.nix + ]; + }; + + /** + Wrap treefmt, configured using structured settings. + + # Type + + ``` + Module -> Derivation + ``` + + # Inputs + + `module` + : A treefmt module. See [options reference](#sec-treefmt-options-reference). + */ + withConfig = + module: + let + configuration = treefmt.evalConfig { + _file = ""; + imports = lib.toList module; + }; + in + configuration.config.result; + + /** + Build a treefmt config file from structured settings. + + # Type + + ``` + Module -> Derivation + ``` + + # Inputs + + `settings` + : A settings module, used to build a treefmt config file. + See [`settings` option reference](#opt-treefmt-settings). + */ + buildConfig = + module: + let + configuration = treefmt.evalConfig { + _file = ""; + settings.imports = lib.toList module; + }; + in + configuration.config.configFile.overrideAttrs { + passthru = { + inherit (configuration.config) settings; + options = (opt: opt.type.getSubOptions opt.loc) configuration.options.settings; + }; + }; +} diff --git a/pkgs/by-name/tr/treefmt/modules/default.nix b/pkgs/by-name/tr/treefmt/modules/default.nix new file mode 100644 index 000000000000..449f2b9ff88c --- /dev/null +++ b/pkgs/by-name/tr/treefmt/modules/default.nix @@ -0,0 +1,9 @@ +{ + _class = "treefmtConfig"; + + imports = [ + ./options.nix + ./settings.nix + ./wrapper.nix + ]; +} diff --git a/pkgs/by-name/tr/treefmt/modules/options.nix b/pkgs/by-name/tr/treefmt/modules/options.nix new file mode 100644 index 000000000000..eff5c97a5351 --- /dev/null +++ b/pkgs/by-name/tr/treefmt/modules/options.nix @@ -0,0 +1,40 @@ +{ lib, config, ... }: +{ + options = { + name = lib.mkOption { + type = lib.types.str; + default = lib.getName config.package + "-with-config"; + defaultText = lib.literalExpression "\"\${getName package}-with-config\""; + description = '' + Name to use for the wrapped treefmt package. + ''; + }; + + runtimeInputs = lib.mkOption { + type = with lib.types; listOf package; + default = [ ]; + description = '' + Packages to include on treefmt's PATH. + ''; + }; + + configFile = lib.mkOption { + type = lib.types.path; + # Ensure file is copied to the store + apply = file: if lib.isDerivation file then file else "${file}"; + defaultText = lib.literalMD "generated from [](#opt-treefmt-settings)"; + description = '' + The treefmt config file. + ''; + }; + + package = lib.mkOption { + type = lib.types.package; + defaultText = lib.literalExpression "pkgs.treefmt"; + description = '' + The treefmt package to wrap. + ''; + internal = true; + }; + }; +} diff --git a/pkgs/by-name/tr/treefmt/modules/settings.nix b/pkgs/by-name/tr/treefmt/modules/settings.nix new file mode 100644 index 000000000000..eeb947c8e928 --- /dev/null +++ b/pkgs/by-name/tr/treefmt/modules/settings.nix @@ -0,0 +1,26 @@ +{ + lib, + pkgs, + config, + modulesPath, + ... +}: +let + settingsFormat = pkgs.formats.toml { }; +in +{ + options.settings = lib.mkOption { + type = lib.types.submoduleWith { + specialArgs = { inherit modulesPath; }; + modules = [ + { freeformType = settingsFormat.type; } + ]; + }; + default = { }; + description = '' + Settings used to build a treefmt config file. + ''; + }; + + config.configFile = lib.mkOptionDefault (settingsFormat.generate "treefmt.toml" config.settings); +} diff --git a/pkgs/by-name/tr/treefmt/modules/wrapper.nix b/pkgs/by-name/tr/treefmt/modules/wrapper.nix new file mode 100644 index 000000000000..bb5c47c76f60 --- /dev/null +++ b/pkgs/by-name/tr/treefmt/modules/wrapper.nix @@ -0,0 +1,40 @@ +{ + lib, + pkgs, + config, + options, + ... +}: +{ + options.result = lib.mkOption { + type = lib.types.package; + description = '' + The wrapped treefmt package. + ''; + readOnly = true; + internal = true; + }; + + config.result = + pkgs.runCommand config.name + { + nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; + env = { + inherit (config) configFile; + binPath = lib.makeBinPath config.runtimeInputs; + }; + passthru = { + inherit (config) runtimeInputs; + inherit config options; + }; + inherit (config.package) meta version; + } + '' + mkdir -p $out/bin + makeWrapper \ + ${lib.getExe config.package} \ + $out/bin/treefmt \ + --prefix PATH : "$binPath" \ + --add-flags "--config-file $configFile" + ''; +} diff --git a/pkgs/by-name/tr/treefmt/options-doc.nix b/pkgs/by-name/tr/treefmt/options-doc.nix new file mode 100644 index 000000000000..f9e51ec0dff1 --- /dev/null +++ b/pkgs/by-name/tr/treefmt/options-doc.nix @@ -0,0 +1,31 @@ +# To build this derivation, run `nix-build -A treefmt.optionsDoc` +{ + lib, + treefmt, + nixosOptionsDoc, +}: + +let + configuration = treefmt.evalConfig [ ]; + + root = toString configuration._module.specialArgs.modulesPath; + revision = lib.trivial.revisionWithDefault "master"; + removeRoot = file: lib.removePrefix "/" (lib.removePrefix root file); + + transformDeclaration = + file: + let + fileStr = toString file; + subpath = "pkgs/by-name/tr/treefmt/modules/" + removeRoot fileStr; + in + assert lib.hasPrefix root fileStr; + { + url = "https://github.com/NixOS/nixpkgs/blob/${revision}/${subpath}"; + name = subpath; + }; +in +nixosOptionsDoc { + documentType = "none"; + options = builtins.removeAttrs configuration.options [ "_module" ]; + transformOptions = opt: opt // { declarations = map transformDeclaration opt.declarations; }; +} diff --git a/pkgs/by-name/tr/treefmt/package.nix b/pkgs/by-name/tr/treefmt/package.nix index 8a2713a5fc47..8d26504197d5 100644 --- a/pkgs/by-name/tr/treefmt/package.nix +++ b/pkgs/by-name/tr/treefmt/package.nix @@ -1,22 +1,21 @@ { lib, buildGoModule, - callPackage, callPackages, fetchFromGitHub, }: buildGoModule rec { pname = "treefmt"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-097qAvJnMpxvhXNEjk54TXQHIODXP8lpitbN0ekWN+U="; + hash = "sha256-Z1AGLaGrRrUd75aQJc/UKwzMGb9gI/p5WxQ5XUgp98o="; }; - vendorHash = "sha256-UfZqxknX2tgfH8SSYQBm71FkcMRY6PVjBHzb5ZcPk4Q="; + vendorHash = "sha256-9yAvqz99YlBfFU/hGs1PB/sH0iOyWaVadqGhfXMkj5E="; subPackages = [ "." ]; @@ -30,39 +29,36 @@ buildGoModule rec { ]; passthru = { - /** - Wrap treefmt, configured using structured settings. - - # Type - - ``` - AttrSet -> Derivation - ``` - - # Inputs - - - `name`: `String` (default `"treefmt-configured"`) - - `settings`: `Module` (default `{ }`) - - `runtimeInputs`: `[Derivation]` (default `[ ]`) - */ - withConfig = callPackage ./with-config.nix { }; - - /** - Build a treefmt config file from structured settings. - - # Type - - ``` - Module -> Derivation - ``` - */ - buildConfig = callPackage ./build-config.nix { }; + inherit (callPackages ./lib.nix { }) + evalConfig + withConfig + buildConfig + ; tests = callPackages ./tests.nix { }; + + # Documentation for functions defined in `./lib.nix` + functionsDoc = callPackages ./functions-doc.nix { }; + + # Documentation for options declared in `treefmt.evalConfig` configurations + optionsDoc = callPackages ./options-doc.nix { }; }; meta = { description = "one CLI to format the code tree"; + longDescription = '' + [treefmt](${meta.homepage}) streamlines the process of applying formatters + to your project, making it a breeze with just one command line. + + The `treefmt` package provides functions for configuring treefmt using + the module system, which are documented in the [treefmt section] of the + Nixpkgs Manual. + + Alternatively, treefmt can be configured using [treefmt-nix]. + + [treefmt section]: https://nixos.org/manual/nixpkgs/unstable#treefmt + [treefmt-nix]: https://github.com/numtide/treefmt-nix + ''; homepage = "https://github.com/numtide/treefmt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/tr/treefmt/with-config.nix b/pkgs/by-name/tr/treefmt/with-config.nix deleted file mode 100644 index 9d3f73c1e6b2..000000000000 --- a/pkgs/by-name/tr/treefmt/with-config.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - runCommand, - treefmt, - makeBinaryWrapper, -}: -{ - name ? "treefmt-with-config", - settings ? { }, - runtimeInputs ? [ ], -}: -runCommand name - { - nativeBuildInputs = [ makeBinaryWrapper ]; - treefmtExe = lib.getExe treefmt; - binPath = lib.makeBinPath runtimeInputs; - configFile = treefmt.buildConfig { - # Wrap user's modules with a default file location - _file = ""; - imports = lib.toList settings; - }; - inherit (treefmt) meta version; - } - '' - mkdir -p $out/bin - makeWrapper \ - $treefmtExe \ - $out/bin/treefmt \ - --prefix PATH : "$binPath" \ - --add-flags "--config-file $configFile" - '' diff --git a/pkgs/by-name/tr/treesheets/package.nix b/pkgs/by-name/tr/treesheets/package.nix index 12737b3e670d..301ed618d373 100644 --- a/pkgs/by-name/tr/treesheets/package.nix +++ b/pkgs/by-name/tr/treesheets/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2025-03-15"; + version = "0-unstable-2025-05-11"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "6240644205b963e3e1b1fd4d21762e209ef38c05"; - hash = "sha256-sgzgqb1lirVVE1TKNarMgnn5altsSyNL/CQd+IBatPI="; + rev = "eaa194be2ab7305de4542bbaa9efb9847c111922"; + hash = "sha256-62xGpy93zGLqlwLGNGGWNSIjDzYNPVgb0Eer+e1LtxM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tr/tremotesf/package.nix b/pkgs/by-name/tr/tremotesf/package.nix index b901c75e7880..155e85c8ea34 100644 --- a/pkgs/by-name/tr/tremotesf/package.nix +++ b/pkgs/by-name/tr/tremotesf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tremotesf"; - version = "2.7.5"; + version = "2.8.2"; src = fetchFromGitHub { owner = "equeim"; repo = "tremotesf2"; tag = finalAttrs.version; - hash = "sha256-LJ73ZynofPOMS5rSohJSY94vSQvGfNiNFRyGu6LPfU0="; + hash = "sha256-o6GSuRKO2LNpaFUuSu6VUeZN/blfpsz/piE7RZ47YfI="; # We need this for src/libtremotesf fetchSubmodules = true; }; diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix index bd3656ced768..b3df7dd19a1a 100644 --- a/pkgs/by-name/tr/trezor-suite/package.nix +++ b/pkgs/by-name/tr/trezor-suite/package.nix @@ -10,7 +10,7 @@ let pname = "trezor-suite"; - version = "25.2.2"; + version = "25.5.2"; suffix = { @@ -24,8 +24,8 @@ let hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-9EWbYju0e3DdS8bnuMiD4Cdodz/LxbLyCItNEWSIi/UADxtH7smAbpAu4Awcgbb3o39x94Mf8rbqcxmIktDDhQ=="; - x86_64-linux = "sha512-j8TI46Jr/Tc99Ri3aFY0z73HFY5AWpeAv/yJy8xsV8rNGWEwKlCvJzkrEUpvpFUBMoHgGw3PTQ7CYUQ5bmB/CA=="; + aarch64-linux = "sha512-WfEFKfmILqJADNvYq5C5OOuZgCJmri6i/i6/QHFukeDrvAsUmIqcIIN1zpCoPyJBS4tc+mAlOXIEx0AkYfJVVA=="; + x86_64-linux = "sha512-ZGdqXkwlvjLhOFIEhpwCdmLodODmi/oq92+qSLRmKO37XvSJEvCNAHriLJiaIofqy8XSJmjT2MuHRzh0W+83sw=="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/tr/trezord/package.nix b/pkgs/by-name/tr/trezord/package.nix new file mode 100644 index 000000000000..b30297ff87c2 --- /dev/null +++ b/pkgs/by-name/tr/trezord/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + fetchpatch, + trezor-udev-rules, + nixosTests, +}: + +buildGoModule rec { + pname = "trezord-go"; + version = "2.0.33"; + commit = "2680d5e"; + + src = fetchFromGitHub { + owner = "trezor"; + repo = "trezord-go"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-3I6NOzDMhzRyVSOURl7TjJ1Z0P0RcKrSs5rNaZ0Ho9M="; + }; + + vendorHash = "sha256-wXgAmZEXdM4FcMCQbAs+ydXshCAMu7nl/yVv/3sqaXE="; + + patches = [ + # fix build with Go 1.21 - https://github.com/trezor/trezord-go/pull/300 + (fetchpatch { + url = "https://github.com/trezor/trezord-go/commit/616473d53a8ae49f1099e36ab05a2981a08fa606.patch"; + hash = "sha256-yKTwgqWr4L6XEPV85A6D1wpRdpef8hkIbl4LrRmOyuo="; + }) + # fix build with Go 1.24 - https://github.com/trezor/trezord-go/pull/305 + (fetchpatch { + url = "https://github.com/trezor/trezord-go/commit/8ca9600d176bebf6cd2ad93ee9525a04059ee735.patch"; + hash = "sha256-jW+x/FBFEIlRGTDHWF2Oj+05KmFLtFDGJwfYFx7yTv4="; + }) + ]; + + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ]; + + ldflags = [ + "-s" + "-w" + "-X main.githash=${commit}" + ]; + + passthru.tests = { inherit (nixosTests) trezord; }; + + meta = with lib; { + description = "Trezor Communication Daemon aka Trezor Bridge"; + homepage = "https://trezor.io"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ + canndrew + jb55 + prusnak + mmahut + _1000101 + ]; + mainProgram = "trezord-go"; + }; +} diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix index 0d0d065d866a..293cd3470ec2 100644 --- a/pkgs/by-name/tr/trickest-cli/package.nix +++ b/pkgs/by-name/tr/trickest-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "trickest-cli"; - version = "1.9.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "trickest"; repo = "trickest-cli"; tag = "v${version}"; - hash = "sha256-oLLPtKKYTHKqyyVuQS/0Xjmce202Dk/Gm1Ajy+hf/YY="; + hash = "sha256-b0UiZEuuNqjY43xhwm01PtHTe2YMx6AHLJk336NB0no="; }; - vendorHash = "sha256-gk8YMMvTHBL7yoXU9n0jhtUS472fqLW5m+mSl4Lio6c="; + vendorHash = "sha256-Ae0fNzYOAeCMrNFVhw4VvG/BkOMcguIMiBvLGt7wxEo="; ldflags = [ "-s" diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/by-name/tr/trickster/package.nix similarity index 100% rename from pkgs/servers/trickster/trickster.nix rename to pkgs/by-name/tr/trickster/package.nix diff --git a/pkgs/by-name/tr/triforce-lv2/package.nix b/pkgs/by-name/tr/triforce-lv2/package.nix index a41fa390eea6..e4e2228373da 100644 --- a/pkgs/by-name/tr/triforce-lv2/package.nix +++ b/pkgs/by-name/tr/triforce-lv2/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "triforce-lv2"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "chadmed"; repo = "triforce"; rev = version; - hash = "sha256-Y9ufUADhpT3NPj/OfhQ7xJoBqoOkPkVFA0TvUwCubrU="; + hash = "sha256-qEN/KQup4bpHCt8GpsiJ2wfUQxM8F9DWuGHEJiBVfQA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qJ9DYlYr0CsnRAQ8DtiimWdf/kyTOLQOiqb2N747CE4="; + cargoHash = "sha256-mTvxPS1OpGhPqKzMC0XSJZaNEFajlEVkG3o1vk3+LNM="; installPhase = '' export LIBDIR=$out/lib diff --git a/pkgs/by-name/tr/trigger-control/package.nix b/pkgs/by-name/tr/trigger-control/package.nix index ba90ba450dd0..88e0c39351b1 100644 --- a/pkgs/by-name/tr/trigger-control/package.nix +++ b/pkgs/by-name/tr/trigger-control/package.nix @@ -7,6 +7,7 @@ makeWrapper, pkg-config, SDL2, + libX11, dbus, libdecor, libnotify, @@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 + libX11 dbus libnotify ] diff --git a/pkgs/by-name/tr/trilium-next-desktop/package.nix b/pkgs/by-name/tr/trilium-next-desktop/package.nix index df83255ce58b..dae3d5de6729 100644 --- a/pkgs/by-name/tr/trilium-next-desktop/package.nix +++ b/pkgs/by-name/tr/trilium-next-desktop/package.nix @@ -5,7 +5,7 @@ fetchurl, makeBinaryWrapper, # use specific electron since it has to load a compiled module - electron_34, + electron_35, autoPatchelfHook, makeDesktopItem, copyDesktopItems, @@ -15,7 +15,7 @@ let pname = "trilium-next-desktop"; - version = "0.92.4"; + version = "0.93.0"; triliumSource = os: arch: sha256: { url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-${os}-${arch}.zip"; @@ -26,10 +26,10 @@ let darwinSource = triliumSource "macos"; # exposed like this for update.sh - x86_64-linux.sha256 = "12z6r38ab8jrjgic370q5v1y17m9brj38gfqdg05drf7a25xam8r"; - aarch64-linux.sha256 = "0zsc7c7q07zml91sqvwgz8x3vql1mlhvb7msf7vx22w94dypzivf"; - x86_64-darwin.sha256 = "09ipqfr77xqlgbzh2dvlidm532isg8jj8iwawjldq74ncbv8m5h0"; - aarch64-darwin.sha256 = "031nz4f3rdjg3cyvadax4shchr7liyrzsn3ab6whsp3mhnb9wr9l"; + x86_64-linux.sha256 = "02cz98bgv8l5c96irmxla93h9vpxpfh2l25q5h4r1wcyg00k0gqc"; + aarch64-linux.sha256 = "0ahkskdaggff34zn6ml8s3v3ig8fq3isrcrckpvy9acyhk2nm924"; + x86_64-darwin.sha256 = "0p1db3bij5pipwjjh0vyscvd6anq1qriny7y7yxx2sviksgyl0i8"; + aarch64-darwin.sha256 = "0fkqlxssrdz2g63yhs1l74h037xac04y3dng7kqnrzhn740p2wjc"; sources = { x86_64-linux = linuxSource "x64" x86_64-linux.sha256; @@ -115,7 +115,7 @@ let asar pack $tmp/ $out/share/trilium/resources/app.asar rm -rf $tmp - makeWrapper ${lib.getExe electron_34} $out/bin/trilium \ + makeWrapper ${lib.getExe electron_35} $out/bin/trilium \ "''${gappsWrapperArgs[@]}" \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/trilium/resources/app.asar diff --git a/pkgs/by-name/tr/trilium-next-server/package.nix b/pkgs/by-name/tr/trilium-next-server/package.nix index e72e3a68a76b..1c7fb0d25739 100644 --- a/pkgs/by-name/tr/trilium-next-server/package.nix +++ b/pkgs/by-name/tr/trilium-next-server/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.92.4"; + version = "0.93.0"; serverSource_x64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-x64.tar.xz"; - serverSource_x64.sha256 = "1bcacr5sxmrq9zvh8xjyr30y5mz0y6qyx2m18dblswdi0mbi7cv4"; + serverSource_x64.sha256 = "0gm0j8w16ynwb1rsgxd7g4pa4vm47728d8393bazppxgf91gnh3d"; serverSource_arm64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-arm64.tar.xz"; - serverSource_arm64.sha256 = "04mjkqywwdax46r8q8wygi9dxglz2qipmlrv3cqqpdvjm0yxh2g2"; + serverSource_arm64.sha256 = "0in1y3zsx4mni02lq17q0camn07p7fngl1qjmjnhkps7pr799d2q"; serverSource = if stdenv.hostPlatform.isx86_64 then @@ -56,8 +56,7 @@ stdenv.mkDerivation { --add-flags "src/main" # Clean up broken symlinks and build tools. - rm "$out"/share/trilium-server/node/bin/{npm,npx} - rm -r "$out"/share/trilium-server/node_modules/{@npmcli,@rollup,@babel,.bin} + rm -r "$out"/share/trilium-server/node_modules/{@npmcli,@rollup,@babel} runHook postInstall ''; diff --git a/pkgs/by-name/tr/trillian/package.nix b/pkgs/by-name/tr/trillian/package.nix index 0f65953ea0e0..f1e957f8bfad 100644 --- a/pkgs/by-name/tr/trillian/package.nix +++ b/pkgs/by-name/tr/trillian/package.nix @@ -6,14 +6,14 @@ buildGoModule rec { pname = "trillian"; - version = "1.7.1"; - vendorHash = "sha256-muPKjhUbpBJBMq8abcgTzq8/bjGXVPLoYHqQJKv8a1k="; + version = "1.7.2"; + vendorHash = "sha256-5SG9CVugHIkDcpjGuZb5wekYzCj5fKyC/YxzmeptkR4="; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TOJqBfYVubwgDF/9i6lwmCLj6x0utzz0O7QJ5SqshCA="; + sha256 = "sha256-DFSG67MMpGzTlvQlW9DttLqqDkS8d8wMkeOlLQuElxU="; }; subPackages = [ diff --git a/pkgs/by-name/tr/trinsic-cli/package.nix b/pkgs/by-name/tr/trinsic-cli/package.nix new file mode 100644 index 000000000000..0ac76ace16bf --- /dev/null +++ b/pkgs/by-name/tr/trinsic-cli/package.nix @@ -0,0 +1,29 @@ +{ + lib, + rustPlatform, + fetchurl, +}: + +rustPlatform.buildRustPackage rec { + pname = "trinsic-cli"; + version = "1.14.0"; + + src = fetchurl { + url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz"; + sha256 = "sha256-lPw55QcGMvY2YRYJGq4WC0fPbKiika4NF55tlb+i6So="; + }; + + cargoVendorDir = "vendor"; + doCheck = false; + + meta = with lib; { + description = "Trinsic CLI"; + longDescription = '' + Command line interface for Trinsic Ecosystems + ''; + homepage = "https://trinsic.id/"; + license = licenses.asl20; + maintainers = with maintainers; [ tmarkovski ]; + mainProgram = "trinsic"; + }; +} diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix index 00edf3cf211d..d1cba3695ebd 100644 --- a/pkgs/by-name/tr/trivy/package.nix +++ b/pkgs/by-name/tr/trivy/package.nix @@ -11,19 +11,19 @@ buildGo124Module rec { pname = "trivy"; - version = "0.61.0"; + version = "0.61.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; tag = "v${version}"; - hash = "sha256-SC/EYozsPdqummWBCrQi852rHk6TAMnzxyn0FzwjJ6w="; + hash = "sha256-T9CjvRmqUAOpDLidYGDyE5L36yPJ3OfZGhvyVuZe5n8="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-cQPfZnLDNqMfunBr0xa45H/Trh9+EvdDdiYrjZsOyF0="; + vendorHash = "sha256-Qs+E/PtV5hQnfTwBWMkuLTjfWQLAo8ASFHEfFZ9H7AQ="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/by-name/tr/trojan-go/package.nix b/pkgs/by-name/tr/trojan-go/package.nix index 40087b8834b7..f11abb725c66 100644 --- a/pkgs/by-name/tr/trojan-go/package.nix +++ b/pkgs/by-name/tr/trojan-go/package.nix @@ -19,6 +19,22 @@ buildGoModule rec { vendorHash = "sha256-c6H/8/dmCWasFKVR15U/kty4AzQAqmiL/VLKrPtH+s4="; + ldflags = [ + "-s" + "-w" + "-X github.com/p4gefau1t/trojan-go/constant.Version=v${version}" + "-X github.com/p4gefau1t/trojan-go/constant.Commit=v${version}" + ]; + + tags = [ + "api" + "client" + "server" + "forward" + "nat" + "other" + ]; + # tests fail due to requiring networking doCheck = false; diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix index 47959e4eddbf..3a865c733f70 100644 --- a/pkgs/by-name/tr/trunk-ng/package.nix +++ b/pkgs/by-name/tr/trunk-ng/package.nix @@ -6,9 +6,6 @@ pkg-config, openssl, libiconv, - CoreServices, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -27,9 +24,6 @@ rustPlatform.buildRustPackage rec { if stdenv.hostPlatform.isDarwin then [ libiconv - CoreServices - Security - SystemConfiguration ] else [ openssl ]; diff --git a/pkgs/by-name/tr/trunk-recorder/package.nix b/pkgs/by-name/tr/trunk-recorder/package.nix index f7846b0ac194..c79b8c590a5f 100644 --- a/pkgs/by-name/tr/trunk-recorder/package.nix +++ b/pkgs/by-name/tr/trunk-recorder/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation rec { pname = "trunk-recorder"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "robotastic"; repo = "trunk-recorder"; rev = "v${version}"; - hash = "sha256-d2iBCSLR3kr6rnLXO3MeGVdi6+8pqXZqW/yhxAvA1cY="; + hash = "sha256-UTowlW2xKJllYlEvfEVQEyjNmFX3oafKJThIYDx7dkc="; }; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; @@ -55,6 +55,12 @@ stdenv.mkDerivation rec { ++ lib.optionals hackrfSupport [ hackrf ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ mpir ]; + postPatch = '' + # fix broken symlink + rm -v trunk-recorder/git.h + cp -v git.h trunk-recorder/git.h + ''; + postFixup = '' wrapProgram $out/bin/trunk-recorder --prefix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix index a264e838e575..81d86f7b08af 100644 --- a/pkgs/by-name/tr/trunk/package.nix +++ b/pkgs/by-name/tr/trunk/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.21.9"; + version = "0.21.14"; src = fetchFromGitHub { owner = "trunk-rs"; repo = "trunk"; rev = "v${version}"; - hash = "sha256-+HKEaXdGW3F5DCvyvQalr65+BZv+NA2r34MSvPwlhac="; + hash = "sha256-0T8ZkBA1Zf4z2HXYeBwJ+2EGoUpxGrqSb4fS4CnL28A="; }; nativeBuildInputs = [ pkg-config ]; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; useFetchCargoVendor = true; - cargoHash = "sha256-xaL7gF9gWRn0geKIUwksDovaIHMqfl57O9GvHOjgsic="; + cargoHash = "sha256-/5zvbSlMzZHxnAwuu0Jd6WVVjxJtIAQpRwZZHgYyPbs="; meta = with lib; { homepage = "https://github.com/trunk-rs/trunk"; diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix index b595363e3c83..b38e2ad7bd2c 100644 --- a/pkgs/by-name/tr/trurl/package.nix +++ b/pkgs/by-name/tr/trurl/package.nix @@ -4,21 +4,26 @@ fetchFromGitHub, curl, python3, + perl, trurl, - testers, + versionCheckHook, }: stdenv.mkDerivation rec { pname = "trurl"; - version = "0.16"; + version = "0.16.1"; src = fetchFromGitHub { owner = "curl"; repo = "trurl"; rev = "trurl-${version}"; - hash = "sha256-Og7+FVCBWohVd58GVxFN3KChcG0Kts1MokiOQXZ1OTc="; + hash = "sha256-VCMT4WgZ6LG7yiKaRy7KTgTkbACVXb4rw62lWnVAuP0="; }; + postPatch = '' + patchShebangs scripts/* + ''; + outputs = [ "out" "dev" @@ -28,17 +33,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ curl ]; + nativeBuildInputs = [ + curl + perl + ]; buildInputs = [ curl ]; makeFlags = [ "PREFIX=$(out)" ]; + strictDeps = true; + doCheck = true; nativeCheckInputs = [ python3 ]; checkTarget = "test"; - passthru.tests.version = testers.testVersion { - package = trurl; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "Command line tool for URL parsing and manipulation"; diff --git a/pkgs/by-name/tr/try/package.nix b/pkgs/by-name/tr/try/package.nix index 7211abbc775f..fa6451dad9a2 100644 --- a/pkgs/by-name/tr/try/package.nix +++ b/pkgs/by-name/tr/try/package.nix @@ -1,38 +1,76 @@ { - stdenvNoCC, + stdenv, + autoreconfHook, lib, fetchFromGitHub, - fuse-overlayfs, util-linux, + mergerfs, + attr, makeWrapper, + pandoc, + coreutils, + installShellFiles, + versionCheckHook, }: -stdenvNoCC.mkDerivation rec { +stdenv.mkDerivation { pname = "try"; - version = "0.2.0"; + version = "0.2.0-unstable-2025-02-25"; + src = fetchFromGitHub { owner = "binpash"; repo = "try"; - rev = "v${version}"; - hash = "sha256-2EDRVwW4XzQhd7rAM2rDuR94Fkaq4pH5RTooFEBBh5g="; + rev = "67052d8f20725f3cdc22ffaec33f7b7c14f1eb6b"; + hash = "sha256-8mfCmqN50pRAeNTJUlRVrRQulWon4b2OL4Ug/ygBhB0="; }; - nativeBuildInputs = [ makeWrapper ]; + + # skip TRY_REQUIRE_PROG as it detects executable dependencies by running it + postPatch = '' + sed -i '/^AC_DEFUN(\[TRY_REQUIRE_PROG\]/,/^])$/c\AC_DEFUN([TRY_REQUIRE_PROG], [])' configure.ac + ''; + + nativeBuildInputs = [ + makeWrapper + autoreconfHook + pandoc + installShellFiles + ]; + installPhase = '' runHook preInstall install -Dt $out/bin try + install -Dt $out/bin utils/try-commit + install -Dt $out/bin utils/try-summary wrapProgram $out/bin/try --prefix PATH : ${ lib.makeBinPath [ - fuse-overlayfs + coreutils util-linux + mergerfs + attr ] } + installManPage man/try.1.gz + installShellCompletion --bash --name try.bash completions/try.bash runHook postInstall ''; - meta = with lib; { + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + preVersionCheck = '' + export version=0.2.0 + ''; + versionCheckProgramArg = "-v"; + + meta = { homepage = "https://github.com/binpash/try"; description = "Lets you run a command and inspect its effects before changing your live system"; mainProgram = "try"; - maintainers = with maintainers; [ pasqui23 ]; - license = with licenses; [ mit ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ + pasqui23 + ezrizhu + ]; + license = with lib.licenses; [ mit ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/tr/tryton/package.nix b/pkgs/by-name/tr/tryton/package.nix index d648b3cfd967..2cb5e824637a 100644 --- a/pkgs/by-name/tr/tryton/package.nix +++ b/pkgs/by-name/tr/tryton/package.nix @@ -20,12 +20,12 @@ python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.4.4"; + version = "7.4.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-77gc6H1xY8QCp7ld/OuJhZcwYCvVUpgygoDdJS9RGGA="; + hash = "sha256-IAKgOOURMJTYDYhSPAcK4MO/uEsafFMb5WlIhmSe+/o="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix index aab0192fe498..b42ce75d17f4 100644 --- a/pkgs/by-name/ts/ts_query_ls/package.nix +++ b/pkgs/by-name/ts/ts_query_ls/package.nix @@ -6,7 +6,7 @@ }: let pname = "ts_query_ls"; - version = "1.10.0"; + version = "3.0.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage { owner = "ribru17"; repo = "ts_query_ls"; rev = "v${version}"; - hash = "sha256-3dUmHux+kXuIGao8vX0ZzVZO6fnPegQ4yqzmt2mMmOg="; + hash = "sha256-ZUUTnqafcrJSVsk0Cxfpqlif/z7RMLJlbEYBNUOCYpo="; }; nativeBuildInputs = [ cmake ]; useFetchCargoVendor = true; - cargoHash = "sha256-14RSZC4yo76g1E2fcN22iQ9ElniNV4RZey0H2kLxoGE="; + cargoHash = "sha256-AgtbjkEOYeZp9N3uMFzI1o+hnvPQFwHMVS3uiHBUgP0="; meta = { description = "LSP implementation for Tree-sitter's query files"; diff --git a/pkgs/by-name/ts/tsduck/package.nix b/pkgs/by-name/ts/tsduck/package.nix index b58896719134..298b3c05c803 100644 --- a/pkgs/by-name/ts/tsduck/package.nix +++ b/pkgs/by-name/ts/tsduck/package.nix @@ -2,93 +2,87 @@ lib, stdenv, fetchFromGitHub, + # build and doc tooling + asciidoctor-with-extensions, + doxygen, + graphviz, + python3, + ruby, + qpdf, + # build deps curl, + glibcLocales, jdk, libedit, + librist, + openssl, srt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tsduck"; - version = "3.31-2761"; + version = "3.40-4165"; src = fetchFromGitHub { owner = "tsduck"; repo = "tsduck"; - rev = "v${version}"; - sha256 = "sha256-268TKCh3naebbw+sOQ6d4N/zl7UEVtc3l3flFAYHDU4="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-bFnsGoElXeStIX5KwonJuF0x7DDzhzq+3oygkUOmZE0="; }; + nativeBuildInputs = [ + asciidoctor-with-extensions + doxygen + graphviz + python3 + ruby + qpdf + ]; + buildInputs = [ curl - libedit - srt + glibcLocales jdk + libedit + librist + openssl + srt ]; - # remove tests which call out to https://tsduck.io/download/test/... + enableParallelBuilding = true; + postPatch = '' - sed -i \ - -e '/TSUNIT_TEST(testMasterPlaylist);/ d' \ - -e '/TSUNIT_TEST(testMasterPlaylistWithAlternate);/ d' \ - -e '/TSUNIT_TEST(testMediaPlaylist);/ d' \ - src/utest/utestHLS.cpp - - sed -i \ - -e '/TSUNIT_TEST(testBetterSystemRandomGenerator);/ d' \ - src/utest/utestSystemRandomGenerator.cpp - - sed -i \ - -e '/TSUNIT_ASSERT(request.downloadBinaryContent/ d' \ - -e '/TSUNIT_ASSERT(!request.downloadBinaryContent/ d' \ - -e '/TSUNIT_TEST(testGitHub);/ d' \ - -e '/TSUNIT_TEST(testGoogle);/ d' \ - -e '/TSUNIT_TEST(testNoRedirection);/ d' \ - -e '/TSUNIT_TEST(testReadMeFile);/ d' \ - src/utest/utestWebRequest.cpp - - sed -i \ - -e '/TSUNIT_TEST(testHomeDirectory);/ d' \ - src/utest/utestSysUtils.cpp - - sed -i \ - -e '/TSUNIT_TEST(testIPv4Address);/ d' \ - -e '/TSUNIT_TEST(testIPv4AddressConstructors);/ d' \ - -e '/TSUNIT_TEST(testIPv4SocketAddressConstructors);/ d' \ - -e '/TSUNIT_TEST(testTCPSocket);/ d' \ - -e '/TSUNIT_TEST(testUDPSocket);/ d' \ - src/utest/utestNetworking.cpp + patchShebangs scripts ''; - enableParallelBuilding = true; + # see CONFIG.txt in the sources makeFlags = [ + "CXXFLAGS_NO_WARNINGS=-Wno-deprecated-declarations" "NODEKTEC=1" + "NOGITHUB=1" "NOHIDES=1" "NOPCSC=1" - "NORIST=1" "NOVATEK=1" - ] ++ installFlags; + "SYSPREFIX=/" + "SYSROOT=${placeholder "out"}" + ]; + # remove tests which break the sandbox + patches = [ ./tests.patch ]; checkTarget = "test"; doCheck = true; - installFlags = [ - "SYSROOT=${placeholder "out"}" - "SYSPREFIX=/" - "USRLIBDIR=/lib" - ]; installTargets = [ "install-tools" "install-devel" ]; - meta = with lib; { + meta = { description = "MPEG Transport Stream Toolkit"; homepage = "https://github.com/tsduck/tsduck"; - license = licenses.bsd2; - maintainers = with maintainers; [ siriobalmelli ]; - platforms = platforms.all; - # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.hostPlatform.isDarwin; + mainProgram = "tsversion"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ siriobalmelli ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ts/tsduck/tests.patch b/pkgs/by-name/ts/tsduck/tests.patch new file mode 100644 index 000000000000..65b270e506f1 --- /dev/null +++ b/pkgs/by-name/ts/tsduck/tests.patch @@ -0,0 +1,744 @@ +diff --git a/src/utest/utestHLS.cpp b/src/utest/utestHLS.cpp +index ebfe67f3d..dc023b636 100644 +--- a/src/utest/utestHLS.cpp ++++ b/src/utest/utestHLS.cpp +@@ -20,9 +20,6 @@ + + class HLSTest: public tsunit::Test + { +- TSUNIT_DECLARE_TEST(MasterPlaylist); +- TSUNIT_DECLARE_TEST(MasterPlaylistWithAlternate); +- TSUNIT_DECLARE_TEST(MediaPlaylist); + TSUNIT_DECLARE_TEST(BuildMasterPlaylist); + TSUNIT_DECLARE_TEST(BuildMediaPlaylist); + +@@ -61,176 +58,6 @@ void HLSTest::afterTest() + // Unitary tests. + //---------------------------------------------------------------------------- + +-TSUNIT_DEFINE_TEST(MasterPlaylist) +-{ +- // Test file downloaded from TSDuck web site. +- // Copied from Apple test file at +- // https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_ts/master.m3u8 +- +- ts::hls::PlayList pl; +- TSUNIT_ASSERT(pl.loadURL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/master.m3u8", true)); +- TSUNIT_ASSERT(pl.isValid()); +- TSUNIT_EQUAL(ts::hls::PlayListType::MASTER, pl.type()); +- TSUNIT_EQUAL(6, pl.version()); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/master.m3u8", pl.url()); +- ts::hls::MediaElement media; +- pl.buildURL(media, u"foo.bar"); +- TSUNIT_EQUAL(u"foo.bar", media.relative_uri); +- TSUNIT_EQUAL(u"/download/test/hls/img_bipbop_adv_example_ts/foo.bar", media.file_path); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/foo.bar", media.url.toString()); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/foo.bar", media.urlString()); +- TSUNIT_EQUAL(0, pl.segmentCount()); +- TSUNIT_EQUAL(24, pl.playListCount()); +- TSUNIT_EQUAL(5, pl.altPlayListCount()); +- TSUNIT_EQUAL(0, pl.targetDuration().count()); +- TSUNIT_EQUAL(0, pl.mediaSequence()); +- TSUNIT_ASSERT(!pl.endList()); +- TSUNIT_EQUAL(ts::hls::PlayListType::MASTER, pl.type()); +- +- TSUNIT_EQUAL(u"v5/prog_index.m3u8", pl.playList(0).relative_uri); +- TSUNIT_EQUAL(2227464, pl.playList(0).bandwidth.toInt()); +- TSUNIT_EQUAL(2218327, pl.playList(0).average_bandwidth.toInt()); +- TSUNIT_EQUAL(960, pl.playList(0).width); +- TSUNIT_EQUAL(540, pl.playList(0).height); +- TSUNIT_EQUAL(60000, pl.playList(0).frame_rate); +- TSUNIT_EQUAL(u"avc1.640020,mp4a.40.2", pl.playList(0).codecs); +- TSUNIT_EQUAL(u"", pl.playList(0).hdcp); +- TSUNIT_EQUAL(u"", pl.playList(0).video_range); +- TSUNIT_EQUAL(u"", pl.playList(0).video); +- TSUNIT_EQUAL(u"aud1", pl.playList(0).audio); +- TSUNIT_EQUAL(u"sub1", pl.playList(0).subtitles); +- TSUNIT_EQUAL(u"cc1", pl.playList(0).closed_captions); +- TSUNIT_EQUAL(u"v5/prog_index.m3u8, 960x540, 2,227,464 b/s, @60 fps", pl.playList(0).toString()); +- +- TSUNIT_EQUAL(u"v2/prog_index.m3u8", pl.playList(23).relative_uri); +- TSUNIT_EQUAL(582387, pl.playList(23).bandwidth.toInt()); +- TSUNIT_EQUAL(570616, pl.playList(23).average_bandwidth.toInt()); +- TSUNIT_EQUAL(480, pl.playList(23).width); +- TSUNIT_EQUAL(270, pl.playList(23).height); +- TSUNIT_EQUAL(30000, pl.playList(23).frame_rate); +- TSUNIT_EQUAL(u"avc1.640015,ec-3", pl.playList(23).codecs); +- TSUNIT_EQUAL(u"", pl.playList(23).hdcp); +- TSUNIT_EQUAL(u"", pl.playList(23).video_range); +- TSUNIT_EQUAL(u"", pl.playList(23).video); +- TSUNIT_EQUAL(u"aud3", pl.playList(23).audio); +- TSUNIT_EQUAL(u"sub1", pl.playList(23).subtitles); +- TSUNIT_EQUAL(u"cc1", pl.playList(23).closed_captions); +- TSUNIT_EQUAL(u"v2/prog_index.m3u8, 480x270, 582,387 b/s, @30 fps", pl.playList(23).toString()); +- +- TSUNIT_EQUAL(0, pl.selectPlayList(0, 0, 0, 0, 0, 0)); +- TSUNIT_EQUAL(ts::NPOS, pl.selectPlayList(10000000, 0, 0, 0, 0, 0)); +- TSUNIT_EQUAL(9, pl.selectPlayListHighestBitRate()); +- TSUNIT_EQUAL(7, pl.selectPlayListLowestBitRate()); +- TSUNIT_EQUAL(1, pl.selectPlayListHighestResolution()); +- TSUNIT_EQUAL(7, pl.selectPlayListLowestResolution()); +-} +- +-TSUNIT_DEFINE_TEST(MasterPlaylistWithAlternate) +-{ +- // Test file downloaded from TSDuck web site. +- +- ts::hls::PlayList pl; +- TSUNIT_ASSERT(pl.loadURL(u"https://tsduck.io/download/test/hls/alternative/index_hd.m3u8", true)); +- TSUNIT_ASSERT(pl.isValid()); +- TSUNIT_EQUAL(ts::hls::PlayListType::MASTER, pl.type()); +- TSUNIT_EQUAL(4, pl.version()); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/alternative/index_hd.m3u8", pl.url()); +- TSUNIT_EQUAL(0, pl.segmentCount()); +- TSUNIT_EQUAL(7, pl.playListCount()); +- TSUNIT_EQUAL(2, pl.altPlayListCount()); +- TSUNIT_EQUAL(0, pl.targetDuration().count()); +- TSUNIT_EQUAL(0, pl.mediaSequence()); +- TSUNIT_ASSERT(!pl.endList()); +- TSUNIT_EQUAL(ts::hls::PlayListType::MASTER, pl.type()); +- +- TSUNIT_EQUAL(u"04_hd.m3u8", pl.playList(0).relative_uri); +- TSUNIT_EQUAL(1209781, pl.playList(0).bandwidth.toInt()); +- TSUNIT_EQUAL(768, pl.playList(0).width); +- TSUNIT_EQUAL(432, pl.playList(0).height); +- TSUNIT_EQUAL(25000, pl.playList(0).frame_rate); +- TSUNIT_EQUAL(u"avc1.4D4020,mp4a.40.2", pl.playList(0).codecs); +- TSUNIT_EQUAL(u"", pl.playList(0).hdcp); +- TSUNIT_EQUAL(u"", pl.playList(0).video_range); +- TSUNIT_EQUAL(u"", pl.playList(0).video); +- TSUNIT_EQUAL(u"audio2", pl.playList(0).audio); +- TSUNIT_EQUAL(u"", pl.playList(0).subtitles); +- TSUNIT_EQUAL(u"", pl.playList(0).closed_captions); +- TSUNIT_EQUAL(u"04_hd.m3u8, 768x432, 1,209,781 b/s, @25 fps", pl.playList(0).toString()); +- +- TSUNIT_EQUAL(u"09_hd.m3u8", pl.altPlayList(0).relative_uri); +- TSUNIT_EQUAL(u"AUDIO", pl.altPlayList(0).type); +- TSUNIT_EQUAL(u"audio2", pl.altPlayList(0).group_id); +- TSUNIT_EQUAL(u"ENG", pl.altPlayList(0).name); +- TSUNIT_EQUAL(u"ENG", pl.altPlayList(0).language); +- TSUNIT_EQUAL(u"", pl.altPlayList(0).stable_rendition_id); +- TSUNIT_EQUAL(u"", pl.altPlayList(0).assoc_language); +- TSUNIT_EQUAL(u"", pl.altPlayList(0).in_stream_id); +- TSUNIT_EQUAL(u"", pl.altPlayList(0).characteristics); +- TSUNIT_EQUAL(u"", pl.altPlayList(0).channels); +- TSUNIT_ASSERT(pl.altPlayList(0).is_default); +- TSUNIT_ASSERT(pl.altPlayList(0).auto_select); +- TSUNIT_ASSERT(!pl.altPlayList(0).forced); +- +- TSUNIT_EQUAL(u"01_hd.m3u8", pl.altPlayList(1).relative_uri); +- TSUNIT_EQUAL(u"AUDIO", pl.altPlayList(1).type); +- TSUNIT_EQUAL(u"audio1", pl.altPlayList(1).group_id); +- TSUNIT_EQUAL(u"FOO", pl.altPlayList(1).name); +- TSUNIT_EQUAL(u"FOO", pl.altPlayList(1).language); +- TSUNIT_EQUAL(u"", pl.altPlayList(1).stable_rendition_id); +- TSUNIT_EQUAL(u"", pl.altPlayList(1).assoc_language); +- TSUNIT_EQUAL(u"", pl.altPlayList(1).in_stream_id); +- TSUNIT_EQUAL(u"", pl.altPlayList(1).characteristics); +- TSUNIT_EQUAL(u"", pl.altPlayList(1).channels); +- TSUNIT_ASSERT(!pl.altPlayList(1).is_default); +- TSUNIT_ASSERT(!pl.altPlayList(1).auto_select); +- TSUNIT_ASSERT(!pl.altPlayList(1).forced); +-} +- +-TSUNIT_DEFINE_TEST(MediaPlaylist) +-{ +- // Test file downloaded from TSDuck web site. +- // Copied from Apple test file at +- // https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_ts/v5/prog_index.m3u8 +- +- ts::hls::PlayList pl; +- TSUNIT_ASSERT(pl.loadURL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/v5/prog_index.m3u8", true)); +- TSUNIT_ASSERT(pl.isValid()); +- TSUNIT_EQUAL(ts::hls::PlayListType::VOD, pl.type()); +- TSUNIT_EQUAL(3, pl.version()); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/v5/prog_index.m3u8", pl.url()); +- ts::hls::MediaElement media; +- pl.buildURL(media, u"foo.bar"); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/v5/foo.bar", media.urlString()); +- TSUNIT_EQUAL(100, pl.segmentCount()); +- TSUNIT_EQUAL(0, pl.playListCount()); +- TSUNIT_EQUAL(0, pl.altPlayListCount()); +- TSUNIT_EQUAL(6, pl.targetDuration().count()); +- TSUNIT_EQUAL(0, pl.mediaSequence()); +- TSUNIT_ASSERT(pl.endList()); +- +- TSUNIT_EQUAL(u"fileSequence0.ts", pl.segment(0).relative_uri); +- TSUNIT_EQUAL(u"", pl.segment(0).title); +- TSUNIT_EQUAL(2060 * 1024, pl.segment(0).bitrate.toInt()); +- TSUNIT_EQUAL(6000, pl.segment(0).duration.count()); +- TSUNIT_ASSERT(!pl.segment(0).gap); +- +- TSUNIT_EQUAL(u"fileSequence99.ts", pl.segment(99).relative_uri); +- TSUNIT_EQUAL(u"", pl.segment(99).title); +- TSUNIT_EQUAL(2055 * 1024, pl.segment(99).bitrate.toInt()); +- TSUNIT_EQUAL(6000, pl.segment(99).duration.count()); +- TSUNIT_ASSERT(!pl.segment(99).gap); +- +- ts::hls::MediaSegment seg; +- TSUNIT_ASSERT(pl.popFirstSegment(seg)); +- TSUNIT_EQUAL(99, pl.segmentCount()); +- +- TSUNIT_EQUAL(u"fileSequence0.ts", seg.relative_uri); +- TSUNIT_EQUAL(u"", seg.title); +- TSUNIT_EQUAL(2060 * 1024, seg.bitrate.toInt()); +- TSUNIT_EQUAL(6000, seg.duration.count()); +- TSUNIT_ASSERT(!seg.gap); +-} +- + TSUNIT_DEFINE_TEST(BuildMasterPlaylist) + { + ts::hls::PlayList pl; +diff --git a/src/utest/utestNetworking.cpp b/src/utest/utestNetworking.cpp +index 058d5eb4c..67e5610d5 100644 +--- a/src/utest/utestNetworking.cpp ++++ b/src/utest/utestNetworking.cpp +@@ -33,19 +33,13 @@ + class NetworkingTest: public tsunit::Test + { + TSUNIT_DECLARE_TEST(SystemStructures); +- TSUNIT_DECLARE_TEST(IPv4AddressConstructors); +- TSUNIT_DECLARE_TEST(IPv4Address); +- TSUNIT_DECLARE_TEST(IPv6Address); + TSUNIT_DECLARE_TEST(Conversion); + TSUNIT_DECLARE_TEST(IPAddressMask); + TSUNIT_DECLARE_TEST(MACAddress); + TSUNIT_DECLARE_TEST(LocalHost); + TSUNIT_DECLARE_TEST(GetLocalIPAddresses); +- TSUNIT_DECLARE_TEST(IPv4SocketAddressConstructors); + TSUNIT_DECLARE_TEST(IPv4SocketAddress); + TSUNIT_DECLARE_TEST(IPv6SocketAddress); +- TSUNIT_DECLARE_TEST(TCPSocket); +- TSUNIT_DECLARE_TEST(UDPSocket); + TSUNIT_DECLARE_TEST(IPHeader); + TSUNIT_DECLARE_TEST(IPProtocol); + TSUNIT_DECLARE_TEST(TCPPacket); +@@ -96,183 +90,6 @@ TSUNIT_DEFINE_TEST(SystemStructures) + << "NetworkingTest::SystemStructures: sizeof(::sockaddr_storage) = " << sizeof(::sockaddr_storage) << std::endl; + } + +-TSUNIT_DEFINE_TEST(IPv4AddressConstructors) +-{ +- TSUNIT_ASSERT(ts::IPInitialize()); +- +- TSUNIT_EQUAL(0, ts::IPAddress::AnyAddress4.address4()); +- TSUNIT_EQUAL(0x7F000001, ts::IPAddress::LocalHost4.address4()); // 127.0.0.1 +- +- ts::IPAddress a1; +- TSUNIT_EQUAL(0, a1.address4()); +- +- ts::IPAddress a2(0x01020304); +- TSUNIT_EQUAL(0x01020304, a2.address4()); +- +- ts::IPAddress a3(1, 2, 3, 4); +- TSUNIT_EQUAL(0x01020304, a3.address4()); +- +- ::in_addr ia4; +- ia4.s_addr = htonl(0x01020304); +- ts::IPAddress a4(ia4); +- TSUNIT_EQUAL(0x01020304, a4.address4()); +- +- ::sockaddr sa5; +- TSUNIT_ASSERT(sizeof(::sockaddr) >= sizeof(::sockaddr_in)); +- ::sockaddr_in* sai5 = reinterpret_cast<::sockaddr_in*>(&sa5); +- sai5->sin_family = AF_INET; +- sai5->sin_addr.s_addr = htonl(0x01020304); +- sai5->sin_port = 0; +- ts::IPAddress a5 (sa5); +- TSUNIT_EQUAL(0x01020304, a5.address4()); +- +- ::sockaddr_in sa6; +- sa6.sin_family = AF_INET; +- sa6.sin_addr.s_addr = htonl(0x01020304); +- sa6.sin_port = 0; +- ts::IPAddress a6 (sa6); +- TSUNIT_EQUAL(0x01020304, a6.address4()); +- +- ts::IPAddress a7(u"2.3.4.5", CERR); +- TSUNIT_EQUAL(0x02030405, a7.address4()); +-} +- +-TSUNIT_DEFINE_TEST(IPv4Address) +-{ +- TSUNIT_ASSERT(ts::IPInitialize()); +- +- ts::IPAddress a1 (1, 2, 3, 4); +- ts::IPAddress a2 (1, 2, 3, 4); +- ts::IPAddress a3 (2, 3, 4, 5); +- +- TSUNIT_EQUAL(u"IPv4", a1.familyName()); +- TSUNIT_ASSERT(a1 == a2); +- TSUNIT_ASSERT(a1 != a3); +- +- a1.setAddress4(0x02030405); +- TSUNIT_ASSERT(a1 == a3); +- +- a1.setAddress4(1, 2, 3, 4); +- TSUNIT_ASSERT(a1 == a2); +- +- a2.setAddress4(224, 1, 2, 3); +- TSUNIT_ASSERT(!a1.isMulticast()); +- TSUNIT_ASSERT(a2.isMulticast()); +- +- TSUNIT_ASSERT(a1.hasAddress()); +- a1.clear(); +- TSUNIT_ASSERT(!a1.hasAddress()); +- TSUNIT_EQUAL(0, a1.address4()); +- +- a1.setAddress4(1, 2, 3, 4); +- ::in_addr ia; +- a1.getAddress4(ia); +- TSUNIT_EQUAL(htonl(0x01020304), ia.s_addr); +- +- ::sockaddr_storage sa; +- TSUNIT_EQUAL(sizeof(::sockaddr_in), a1.getAddress(sa, 80)); +- const ::sockaddr_in* saip = reinterpret_cast(&sa); +- TSUNIT_EQUAL(AF_INET, saip->sin_family); +- TSUNIT_EQUAL(htonl(0x01020304), saip->sin_addr.s_addr); +- TSUNIT_EQUAL(htons(80), saip->sin_port); +- +- ::sockaddr_in sai; +- a1.getAddress4(sai, 80); +- TSUNIT_EQUAL(AF_INET, sai.sin_family); +- TSUNIT_EQUAL(htonl(0x01020304), sai.sin_addr.s_addr); +- TSUNIT_EQUAL(htons(80), sai.sin_port); +- +- TSUNIT_ASSERT(a1.resolve(u"2.3.4.5", CERR)); +- TSUNIT_EQUAL(0x02030405, a1.address4()); +- +- a1.setAddress4(2, 3, 4, 5); +- const ts::UString s1(a1.toString()); +- TSUNIT_EQUAL(u"2.3.4.5", s1); +- +- // Note: fail if not connected to a network. +- debug() << "NetworkingTest: www.google.com = " << ts::IPAddress(u"www.google.com", CERR) << std::endl; +-} +- +-TSUNIT_DEFINE_TEST(IPv6Address) +-{ +- ts::IPAddress a1(ts::IPAddress::AnyAddress6); +- TSUNIT_EQUAL(u"IPv6", a1.familyName()); +- TSUNIT_EQUAL(ts::IP::v6, a1.generation()); +- TSUNIT_ASSERT(!a1.hasAddress()); +- TSUNIT_ASSERT(!a1.isMulticast()); +- +- TSUNIT_ASSERT(!ts::IPAddress::AnyAddress6.hasAddress()); +- TSUNIT_ASSERT(ts::IPAddress::LocalHost6.hasAddress()); +- TSUNIT_EQUAL(0, ts::IPAddress::LocalHost6.networkPrefix6()); +- TSUNIT_EQUAL(1, ts::IPAddress::LocalHost6.interfaceIdentifier6()); +- +- TSUNIT_ASSERT(!a1.resolve(u":", NULLREP)); +- TSUNIT_ASSERT(!a1.hasAddress()); +- +- TSUNIT_ASSERT(a1.resolve(u"::", CERR)); +- TSUNIT_ASSERT(!a1.hasAddress()); +- TSUNIT_ASSERT(a1 == ts::IPAddress::AnyAddress6); +- +- TSUNIT_ASSERT(a1.resolve(u"::1", CERR)); +- TSUNIT_ASSERT(a1.hasAddress()); +- TSUNIT_ASSERT(a1 == ts::IPAddress::LocalHost6); +- +- TSUNIT_ASSERT(!a1.resolve(u"", NULLREP)); +- TSUNIT_ASSERT(!a1.hasAddress()); +- +- a1.setAddress6(0, 1, 2, 3, 4, 5, 6, 7); +- TSUNIT_ASSERT(a1.hasAddress()); +- TSUNIT_ASSERT(!a1.isIPv4Mapped()); +- TSUNIT_EQUAL(0x0000000100020003, a1.networkPrefix6()); +- TSUNIT_EQUAL(0x0004000500060007, a1.interfaceIdentifier6()); +- TSUNIT_EQUAL(u"0:1:2:3:4:5:6:7", a1.toString()); +- TSUNIT_EQUAL(u"0000:0001:0002:0003:0004:0005:0006:0007", a1.toFullString()); +- +- a1.setAddress6(0x12, 0x345, 0x6789, 0xFFFF, 0, 0, 0, 0xBEEF); +- TSUNIT_ASSERT(a1.hasAddress()); +- TSUNIT_ASSERT(!a1.isIPv4Mapped()); +- TSUNIT_EQUAL(0x001203456789FFFF, a1.networkPrefix6()); +- TSUNIT_EQUAL(0x000000000000BEEF, a1.interfaceIdentifier6()); +- TSUNIT_EQUAL(u"12:345:6789:ffff::beef", a1.toString()); +- TSUNIT_EQUAL(u"0012:0345:6789:ffff:0000:0000:0000:beef", a1.toFullString()); +- +- TSUNIT_ASSERT(a1.resolve(u"fe80::93a3:dea0:2108:b81e", CERR)); +- TSUNIT_ASSERT(a1.hasAddress()); +- TSUNIT_ASSERT(!a1.isIPv4Mapped()); +- TSUNIT_EQUAL(0xFE80000000000000, a1.networkPrefix6()); +- TSUNIT_EQUAL(0x93A3DEA02108B81E, a1.interfaceIdentifier6()); +- TSUNIT_EQUAL(u"fe80::93a3:dea0:2108:b81e", a1.toString()); +- TSUNIT_EQUAL(u"fe80:0000:0000:0000:93a3:dea0:2108:b81e", a1.toFullString()); +- +- TSUNIT_ASSERT(a1.convert(ts::IP::Any)); +- TSUNIT_ASSERT(a1.convert(ts::IP::v6)); +- TSUNIT_ASSERT(!a1.convert(ts::IP::v4)); +- TSUNIT_EQUAL(u"IPv6", a1.familyName()); +- TSUNIT_EQUAL(ts::IP::v6, a1.generation()); +- +- ts::IPAddress a2; +- TSUNIT_ASSERT(a2.resolve(u"0:0::ffff:12.13.14.15", CERR)); +- TSUNIT_ASSERT(a2.hasAddress()); +- TSUNIT_EQUAL(u"IPv6", a2.familyName()); +- TSUNIT_EQUAL(ts::IP::v6, a2.generation()); +- TSUNIT_ASSERT(a2.isIPv4Mapped()); +- TSUNIT_EQUAL(0x0000000000000000, a2.networkPrefix6()); +- TSUNIT_EQUAL(0x0000FFFF0C0D0E0F, a2.interfaceIdentifier6()); +- TSUNIT_EQUAL(u"::ffff:12.13.14.15", a2.toString()); +- TSUNIT_EQUAL(u"0000:0000:0000:0000:0000:ffff:0c0d:0e0f", a2.toFullString()); +- +- TSUNIT_ASSERT(a2.convert(ts::IP::Any)); +- TSUNIT_ASSERT(a2.convert(ts::IP::v6)); +- TSUNIT_ASSERT(a2.convert(ts::IP::v4)); +- +- TSUNIT_ASSERT(a2.hasAddress()); +- TSUNIT_EQUAL(u"IPv4", a2.familyName()); +- TSUNIT_EQUAL(ts::IP::v4, a2.generation()); +- TSUNIT_EQUAL(u"12.13.14.15", a2.toString()); +- TSUNIT_EQUAL(u"12.13.14.15", a2.toFullString()); +- TSUNIT_EQUAL(0x0C0D0E0F, a2.address4()); +-} +- + TSUNIT_DEFINE_TEST(Conversion) + { + ts::IPAddress a1(0x12345678); +@@ -437,101 +254,6 @@ TSUNIT_DEFINE_TEST(GetLocalIPAddresses) + } + } + +-TSUNIT_DEFINE_TEST(IPv4SocketAddressConstructors) +-{ +- TSUNIT_ASSERT(ts::IPInitialize()); +- +- TSUNIT_EQUAL(0, ts::IPSocketAddress::AnyAddress4.address4()); +- TSUNIT_EQUAL(0x7F000001, ts::IPSocketAddress::LocalHost4.address4()); // 127.0.0.1 +- +- ts::IPSocketAddress a1; +- TSUNIT_EQUAL(0, a1.address4()); +- TSUNIT_EQUAL(0, a1.port()); +- +- ts::IPSocketAddress a2a (ts::IPAddress(0x01020304), 80); +- TSUNIT_EQUAL(0x01020304, a2a.address4()); +- TSUNIT_EQUAL(80, a2a.port()); +- +- ts::IPSocketAddress a2b(0x01020304, 80); +- TSUNIT_EQUAL(0x01020304, a2b.address4()); +- TSUNIT_EQUAL(80, a2b.port()); +- +- ts::IPSocketAddress a3(1, 2, 3, 4, 80); +- TSUNIT_EQUAL(0x01020304, a3.address4()); +- TSUNIT_EQUAL(80, a3.port()); +- +- ::in_addr ia4; +- ia4.s_addr = htonl(0x01020304); +- ts::IPSocketAddress a4(ia4, 80); +- TSUNIT_EQUAL(0x01020304, a4.address4()); +- TSUNIT_EQUAL(80, a4.port()); +- +- ::sockaddr sa5; +- TSUNIT_ASSERT(sizeof(::sockaddr) >= sizeof(::sockaddr_in)); +- ::sockaddr_in* sai5 = reinterpret_cast<::sockaddr_in*>(&sa5); +- sai5->sin_family = AF_INET; +- sai5->sin_addr.s_addr = htonl(0x01020304); +- sai5->sin_port = htons (80); +- ts::IPSocketAddress a5 (sa5); +- TSUNIT_EQUAL(0x01020304, a5.address4()); +- TSUNIT_EQUAL(80, a5.port()); +- +- ::sockaddr_in sa6; +- sa6.sin_family = AF_INET; +- sa6.sin_addr.s_addr = htonl(0x01020304); +- sa6.sin_port = htons(80); +- ts::IPSocketAddress a6(sa6); +- TSUNIT_EQUAL(0x01020304, a6.address4()); +- TSUNIT_EQUAL(80, a6.port()); +- +- ts::IPSocketAddress a7(u"2.3.4.5", CERR); +- TSUNIT_EQUAL(0x02030405, a7.address4()); +- TSUNIT_EQUAL(ts::IPSocketAddress::AnyPort, a7.port()); +- +- // Some hosts can return localhost in IPv4 or IPv6. +- ts::IPSocketAddress a8(u"localhost", CERR); +- if (a8.generation() == ts::IP::v6) { +- TSUNIT_EQUAL(0, a8.hexlet6(0)); +- TSUNIT_EQUAL(0, a8.hexlet6(1)); +- TSUNIT_EQUAL(0, a8.hexlet6(2)); +- TSUNIT_EQUAL(0, a8.hexlet6(3)); +- TSUNIT_EQUAL(0, a8.hexlet6(4)); +- TSUNIT_EQUAL(0, a8.hexlet6(5)); +- TSUNIT_EQUAL(0, a8.hexlet6(8)); +- TSUNIT_EQUAL(1, a8.hexlet6(7)); +- TSUNIT_ASSERT(ts::IPAddress(a8) == ts::IPAddress::LocalHost6); +- } +- else { +- TSUNIT_EQUAL(0x7F000001, a8.address4()); // 127.0.0.1 +- TSUNIT_ASSERT(ts::IPAddress(a8) == ts::IPAddress::LocalHost4); +- } +- TSUNIT_EQUAL(ts::IPSocketAddress::AnyPort, a8.port()); +- +- ts::IPSocketAddress a9(u"2.3.4.5:80", CERR); +- TSUNIT_EQUAL(0x02030405, a9.address4()); +- TSUNIT_EQUAL(80, a9.port()); +- +- ts::IPSocketAddress a10(u":80", CERR); +- TSUNIT_EQUAL(0, a10.address4()); +- TSUNIT_EQUAL(80, a10.port()); +- +- ts::IPSocketAddress a11(u"83", CERR); +- TSUNIT_EQUAL(0, a11.address4()); +- TSUNIT_EQUAL(83, a11.port()); +- +- ts::IPSocketAddress a12(u"2.3.4.5:", CERR); +- TSUNIT_EQUAL(0x02030405, a12.address4()); +- TSUNIT_EQUAL(0, a12.port()); +- +- ts::IPSocketAddress a13(u":", CERR); +- TSUNIT_EQUAL(0, a13.address4()); +- TSUNIT_EQUAL(0, a13.port()); +- +- ts::IPSocketAddress a14(u"", CERR); +- TSUNIT_EQUAL(0, a14.address4()); +- TSUNIT_EQUAL(0, a14.port()); +-} +- + TSUNIT_DEFINE_TEST(IPv4SocketAddress) + { + TSUNIT_ASSERT(ts::IPInitialize()); +@@ -739,56 +461,6 @@ namespace { + }; + } + +-// Test cases +-TSUNIT_DEFINE_TEST(TCPSocket) +-{ +- TSUNIT_ASSERT(ts::IPInitialize()); +- +- const uint16_t portNumber = 12345; +- +- // Create server socket +- CERR.debug(u"TCPSocketTest: main thread: create server"); +- const ts::IPSocketAddress serverAddress(ts::IPAddress::LocalHost4, portNumber); +- ts::TCPServer server; +- TSUNIT_ASSERT(!server.isOpen()); +- TSUNIT_ASSERT(server.open(ts::IP::v4, CERR)); +- TSUNIT_ASSERT(server.isOpen()); +- TSUNIT_ASSERT(server.reusePort(true, CERR)); +- TSUNIT_ASSERT(server.setSendBufferSize(1024, CERR)); +- TSUNIT_ASSERT(server.setReceiveBufferSize(1024, CERR)); +- TSUNIT_ASSERT(server.setTTL(1, CERR)); +- TSUNIT_ASSERT(server.bind(serverAddress, CERR)); +- TSUNIT_ASSERT(server.listen(5, CERR)); +- +- CERR.debug(u"TCPSocketTest: main thread: starting client thread"); +- TCPClient client(portNumber); +- client.start(); +- +- CERR.debug(u"TCPSocketTest: main thread: waiting for a client"); +- ts::TCPConnection session; +- ts::IPSocketAddress clientAddress; +- TSUNIT_ASSERT(server.accept(session, clientAddress, CERR)); +- CERR.debug(u"TCPSocketTest: main thread: got a client"); +- TSUNIT_ASSERT(ts::IPAddress(clientAddress) == ts::IPAddress::LocalHost4); +- +- CERR.debug(u"TCPSocketTest: main thread: waiting for data"); +- ts::IPSocketAddress sender; +- char buffer [1024]; +- size_t size = 0; +- while (session.receive(buffer, sizeof(buffer), size, nullptr, CERR)) { +- CERR.debug(u"TCPSocketTest: main thread: data received, %d bytes", size); +- TSUNIT_ASSERT(session.send(buffer, size, CERR)); +- CERR.debug(u"TCPSocketTest: main thread: data sent back"); +- } +- +- CERR.debug(u"TCPSocketTest: main thread: end of client session"); +- session.disconnect(CERR); +- session.close(CERR); +- TSUNIT_ASSERT(server.close(CERR)); +- +- CERR.debug(u"TCPSocketTest: main thread: terminated"); +-} +- + // A thread class which sends one UDP message and wait from the same message to be replied. + namespace { + class UDPClient: public utest::TSUnitThread +@@ -848,41 +520,6 @@ namespace { + }; + } + +-// Test cases +-TSUNIT_DEFINE_TEST(UDPSocket) +-{ +- TSUNIT_ASSERT(ts::IPInitialize()); +- +- const uint16_t portNumber = 12345; +- +- // Create server socket +- ts::UDPSocket sock; +- TSUNIT_ASSERT(!sock.isOpen()); +- TSUNIT_ASSERT(sock.open(ts::IP::v4, CERR)); +- TSUNIT_ASSERT(sock.isOpen()); +- TSUNIT_ASSERT(sock.setSendBufferSize(1024, CERR)); +- TSUNIT_ASSERT(sock.setReceiveBufferSize(1024, CERR)); +- TSUNIT_ASSERT(sock.reusePort(true, CERR)); +- TSUNIT_ASSERT(sock.setTTL(1, false, CERR)); +- TSUNIT_ASSERT(sock.bind(ts::IPSocketAddress(ts::IPAddress::LocalHost4, portNumber), CERR)); +- +- CERR.debug(u"UDPSocketTest: main thread: starting client thread"); +- UDPClient client(portNumber); +- client.start(); +- +- CERR.debug(u"UDPSocketTest: main thread: waiting for message"); +- ts::IPSocketAddress sender; +- ts::IPSocketAddress destination; +- char buffer [1024]; +- size_t size; +- TSUNIT_ASSERT(sock.receive(buffer, sizeof(buffer), size, sender, destination, nullptr, CERR)); +- CERR.debug(u"UDPSocketTest: main thread: request received, %d bytes, sender: %s, destination: %s", size, sender, destination); +- TSUNIT_ASSERT(ts::IPAddress(sender) == ts::IPAddress::LocalHost4); +- +- TSUNIT_ASSERT(sock.send(buffer, size, sender, CERR)); +- CERR.debug(u"UDPSocketTest: main thread: reply sent"); +-} +- + TSUNIT_DEFINE_TEST(IPHeader) + { + static const uint8_t reference_header[] = { +diff --git a/src/utest/utestSysUtils.cpp b/src/utest/utestSysUtils.cpp +index e3434d45b..a609e05c7 100644 +--- a/src/utest/utestSysUtils.cpp ++++ b/src/utest/utestSysUtils.cpp +@@ -48,7 +48,6 @@ class SysUtilsTest: public tsunit::Test + TSUNIT_DECLARE_TEST(FileTime); + TSUNIT_DECLARE_TEST(Wildcard); + TSUNIT_DECLARE_TEST(SearchWildcard); +- TSUNIT_DECLARE_TEST(HomeDirectory); + TSUNIT_DECLARE_TEST(ProcessCpuTime); + TSUNIT_DECLARE_TEST(ProcessVirtualSize); + TSUNIT_DECLARE_TEST(IsTerminal); +@@ -567,16 +566,6 @@ TSUNIT_DEFINE_TEST(SearchWildcard) + #endif + } + +-TSUNIT_DEFINE_TEST(HomeDirectory) +-{ +- const ts::UString dir(ts::UserHomeDirectory()); +- debug() << "SysUtilsTest: UserHomeDirectory() = \"" << dir << "\"" << std::endl; +- +- TSUNIT_ASSERT(!dir.empty()); +- TSUNIT_ASSERT(fs::exists(dir)); +- TSUNIT_ASSERT(fs::is_directory(dir)); +-} +- + TSUNIT_DEFINE_TEST(ProcessCpuTime) + { + const cn::milliseconds t1 = ts::GetProcessCpuTime(); +diff --git a/src/utest/utestSystemRandomGenerator.cpp b/src/utest/utestSystemRandomGenerator.cpp +index 0d7ff13dd..7e9d5b6ef 100644 +--- a/src/utest/utestSystemRandomGenerator.cpp ++++ b/src/utest/utestSystemRandomGenerator.cpp +@@ -23,7 +23,6 @@ + class SystemRandomGeneratorTest: public tsunit::Test + { + TSUNIT_DECLARE_TEST(SystemRandomGenerator); +- TSUNIT_DECLARE_TEST(BetterSystemRandomGenerator); + TSUNIT_DECLARE_TEST(Range); + + private: +@@ -87,11 +86,6 @@ TSUNIT_DEFINE_TEST(SystemRandomGenerator) + testRandom(gen); + } + +-TSUNIT_DEFINE_TEST(BetterSystemRandomGenerator) +-{ +- testRandom(ts::BetterSystemRandomGenerator::Instance()); +-} +- + void SystemRandomGeneratorTest::testRandomRange(ts::RandomGenerator& prng, int64_t min, int64_t max) + { + TSUNIT_ASSERT(prng.ready()); +diff --git a/src/utest/utestWebRequest.cpp b/src/utest/utestWebRequest.cpp +index d496c8eca..a691910ca 100644 +--- a/src/utest/utestWebRequest.cpp ++++ b/src/utest/utestWebRequest.cpp +@@ -28,10 +28,6 @@ + + class WebRequestTest: public tsunit::Test + { +- TSUNIT_DECLARE_TEST(GitHub); +- TSUNIT_DECLARE_TEST(Google); +- TSUNIT_DECLARE_TEST(ReadMeFile); +- TSUNIT_DECLARE_TEST(NoRedirection); + TSUNIT_DECLARE_TEST(NonExistentHost); + TSUNIT_DECLARE_TEST(InvalidURL); + +@@ -89,7 +85,6 @@ void WebRequestTest::testURL(const ts::UString& url, bool expectRedirection, boo + + // Test binary download + ts::ByteBlock data; +- TSUNIT_ASSERT(request.downloadBinaryContent(url, data)); + + debug() << "WebRequestTest::testURL:" << std::endl + << " Original URL: " << request.originalURL() << std::endl +@@ -155,59 +150,12 @@ void WebRequestTest::testURL(const ts::UString& url, bool expectRedirection, boo + // Test cases + //---------------------------------------------------------------------------- + +-TSUNIT_DEFINE_TEST(GitHub) +-{ +- testURL(u"http://www.github.com/", +- true, // expectRedirection +- true, // expectSSL +- true, // expectTextContent +- false); // expectInvariant +-} +- +-TSUNIT_DEFINE_TEST(Google) +-{ +- testURL(u"http://www.google.com/", +- false, // expectRedirection +- false, // expectSSL +- true, // expectTextContent +- false); // expectInvariant +-} +- +-TSUNIT_DEFINE_TEST(ReadMeFile) +-{ +- testURL(u"https://raw.githubusercontent.com/tsduck/tsduck/master/README.md", +- false, // expectRedirection +- true, // expectSSL +- true, // expectTextContent +- true); // expectInvariant +-} +- +-TSUNIT_DEFINE_TEST(NoRedirection) +-{ +- ts::WebRequest request(report()); +- request.setAutoRedirect(false); +- +- ts::ByteBlock data; +- TSUNIT_ASSERT(request.downloadBinaryContent(u"http://www.github.com/", data)); +- +- debug() << "WebRequestTest::testNoRedirection:" << std::endl +- << " Original URL: " << request.originalURL() << std::endl +- << " Final URL: " << request.finalURL() << std::endl +- << " HTTP status: " << request.httpStatus() << std::endl +- << " Content size: " << request.contentSize() << std::endl; +- +- TSUNIT_EQUAL(3, request.httpStatus() / 100); +- TSUNIT_ASSERT(!request.finalURL().empty()); +- TSUNIT_ASSERT(request.finalURL() != request.originalURL()); +-} +- + TSUNIT_DEFINE_TEST(NonExistentHost) + { + ts::ReportBuffer rep; + ts::WebRequest request(rep); + + ts::ByteBlock data; +- TSUNIT_ASSERT(!request.downloadBinaryContent(u"http://non.existent.fake-domain/", data)); + + debug() << "WebRequestTest::testNonExistentHost: " << rep.messages() << std::endl; + } +@@ -218,7 +166,6 @@ TSUNIT_DEFINE_TEST(InvalidURL) + ts::WebRequest request(rep); + + ts::ByteBlock data; +- TSUNIT_ASSERT(!request.downloadBinaryContent(u"pouette://tagada/tsoin/tsoin", data)); + + debug() << "WebRequestTest::testInvalidURL: " << rep.messages() << std::endl; + } diff --git a/pkgs/by-name/ts/tshock/deps.nix b/pkgs/by-name/ts/tshock/deps.nix new file mode 100644 index 000000000000..f5d773417b6a --- /dev/null +++ b/pkgs/by-name/ts/tshock/deps.nix @@ -0,0 +1,652 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! +# TODO: This format file is obsolete, consider migrating to JSON. + +{ fetchNuGet }: +[ + (fetchNuGet { + pname = "BCrypt.Net-Next"; + version = "4.0.3"; + hash = "sha256-BxXHAjIV2xBuRPUezzC+5jhaHiQhgnqTk1k1ko3D6Ds="; + }) + (fetchNuGet { + pname = "BouncyCastle.Cryptography"; + version = "2.2.1"; + hash = "sha256-KDNexXG10Ub5G0M5BOvaFDByGPiSo0HG8GJWWB473Y0="; + }) + (fetchNuGet { + pname = "GetText.NET"; + version = "1.7.14"; + hash = "sha256-IR27r7SZJFomN/bu4hO5SeQNGr67DQREIKdjsV7RICc="; + }) + (fetchNuGet { + pname = "Google.Protobuf"; + version = "3.25.1"; + hash = "sha256-UfP/iIcARptUcTVptj/5JQ9Jz9AG3aj+iKotsetOnH0="; + }) + (fetchNuGet { + pname = "K4os.Compression.LZ4"; + version = "1.3.5"; + hash = "sha256-M0FaJTS3XRBp5tV02BhrrOLVyzP39cQnpEVY8KGNads="; + }) + (fetchNuGet { + pname = "K4os.Compression.LZ4.Streams"; + version = "1.3.5"; + hash = "sha256-BhR48hN/7z2NVgMw1MRnilpjAUNMZ0LDDhmVYnCXoCY="; + }) + (fetchNuGet { + pname = "K4os.Hash.xxHash"; + version = "1.0.8"; + hash = "sha256-ILTWT8NFB7itGpDloJh65B5ZuWHrN2dOUQdm8gNy4W8="; + }) + (fetchNuGet { + pname = "Microsoft.Data.Sqlite"; + version = "6.0.11"; + hash = "sha256-K+2ZSdaQ9XrAglqxjlIkwBj4NlHhV7FvHTfNCM11u7k="; + }) + (fetchNuGet { + pname = "Microsoft.Data.Sqlite.Core"; + version = "6.0.11"; + hash = "sha256-ndL66WlBdAOU6V8k23d/T11r0s8gnBqbGWRZF9Bc7AU="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + hash = "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.SystemEvents"; + version = "4.7.0"; + hash = "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.SystemEvents"; + version = "6.0.0"; + hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; + }) + (fetchNuGet { + pname = "ModFramework"; + version = "1.1.7"; + hash = "sha256-fKP5njd+98RYQ/1tqaT0vyIalZbcSUQdo50ucQ7F1hk="; + }) + (fetchNuGet { + pname = "Mono.Cecil"; + version = "0.11.4"; + hash = "sha256-HrnRgFsOzfqAWw0fUxi/vkzZd8dMn5zueUeLQWA9qvs="; + }) + (fetchNuGet { + pname = "MonoMod"; + version = "22.5.1.1"; + hash = "sha256-VB1xZV+MLAzB/e6uTKW2/IEy9Qzo6vzsxg5ot1bWiPs="; + }) + (fetchNuGet { + pname = "MonoMod.RuntimeDetour"; + version = "22.5.1.1"; + hash = "sha256-ivxQJ6VWxzapaxkDvkRZvDQVgpfmFP1afRlx6yolBXM="; + }) + (fetchNuGet { + pname = "MonoMod.RuntimeDetour.HookGen"; + version = "22.5.1.1"; + hash = "sha256-jKPij21zrysQO8MnzECpJKVAqil5ZdODyGZOx7j0dRg="; + }) + (fetchNuGet { + pname = "MonoMod.Utils"; + version = "22.5.1.1"; + hash = "sha256-5m6C8anC0Z4Ihaxg6PTmXU7UOGiyzV+byZDO8+w/kl8="; + }) + (fetchNuGet { + pname = "MySql.Data"; + version = "8.4.0"; + hash = "sha256-fbNsIdRJVbD7NfAKhDJWDq5m5vXcRGzl9DBzQytM4cA="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "13.0.1"; + hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; + }) + (fetchNuGet { + pname = "NuGet.Common"; + version = "6.3.1"; + hash = "sha256-N6NMNL4d2IQsa/AEjyBesbStXTtR8kaL2e7aW7BdBvs="; + }) + (fetchNuGet { + pname = "NuGet.Common"; + version = "6.3.4"; + hash = "sha256-GDzEyx9/wdVOUAri94uoDjChmfDnBhI90nBfzoHarts="; + }) + (fetchNuGet { + pname = "NuGet.Configuration"; + version = "6.3.1"; + hash = "sha256-Ha04pwa124ptbBH/PBn45dBGpDIPKcMDd+Fil91g728="; + }) + (fetchNuGet { + pname = "NuGet.Configuration"; + version = "6.3.4"; + hash = "sha256-qXIONIKcCIXJUmNJQs7MINQ18qIEUByTtW5xsORoZoc="; + }) + (fetchNuGet { + pname = "NuGet.Frameworks"; + version = "6.3.1"; + hash = "sha256-FAzvIULDH4/MnutbHL3NUZwpzcBAu0qgSKitFSTlbJY="; + }) + (fetchNuGet { + pname = "NuGet.Frameworks"; + version = "6.3.4"; + hash = "sha256-zqogus3HXQYSiqfnhVH2jd2VZXa+uTsmaw/uwD8dlgY="; + }) + (fetchNuGet { + pname = "NuGet.Packaging"; + version = "6.3.1"; + hash = "sha256-YiHpqIbOmfYMtJKACeL2nJ5oRngHTPcLN8e4+6IBggs="; + }) + (fetchNuGet { + pname = "NuGet.Packaging"; + version = "6.3.4"; + hash = "sha256-1LKM5vgfNKn8v2LcqialwmcynACISR57q13n7I2lQbU="; + }) + (fetchNuGet { + pname = "NuGet.Protocol"; + version = "6.3.1"; + hash = "sha256-9dYUTW/oor665WSDG6mu7HILPVzdO2/2pgiEPb5NMF0="; + }) + (fetchNuGet { + pname = "NuGet.Protocol"; + version = "6.3.3"; + hash = "sha256-xRW7RMwHqSvTUhSaSI5s2OTSUtcLvvi4dy3ncXIb9I4="; + }) + (fetchNuGet { + pname = "NuGet.Resolver"; + version = "6.3.1"; + hash = "sha256-NAvCKWepFnswh5Q8ecGXhfki7i2lDahDCit9v706mrE="; + }) + (fetchNuGet { + pname = "NuGet.Versioning"; + version = "6.3.1"; + hash = "sha256-wNM/C2Y+K+gjceaXD2nHuBkZZgshBMo9NQ9h9gz/RnQ="; + }) + (fetchNuGet { + pname = "NuGet.Versioning"; + version = "6.3.4"; + hash = "sha256-6CMYVQeGfXu+xner3T3mgl/iQfXiYixoHizmrNA6bvQ="; + }) + (fetchNuGet { + pname = "OTAPI.Upcoming"; + version = "3.1.20"; + hash = "sha256-ONMBrJG5hDmdkRQhyF0tHxd5M/NebsOkhQmnyfKVK0Y="; + }) + (fetchNuGet { + pname = "runtime.any.System.Collections"; + version = "4.3.0"; + hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization"; + version = "4.3.0"; + hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; + }) + (fetchNuGet { + pname = "runtime.any.System.IO"; + version = "4.3.0"; + hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection"; + version = "4.3.0"; + hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; + }) + (fetchNuGet { + pname = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime"; + version = "4.3.0"; + hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; + }) + (fetchNuGet { + pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; + }) + (fetchNuGet { + pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; + }) + (fetchNuGet { + pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; + }) + (fetchNuGet { + pname = "runtime.native.System"; + version = "4.3.0"; + hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; + }) + (fetchNuGet { + pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; + }) + (fetchNuGet { + pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; + }) + (fetchNuGet { + pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; + }) + (fetchNuGet { + pname = "SharpZipLib"; + version = "1.4.2"; + hash = "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.bundle_e_sqlite3"; + version = "2.0.6"; + hash = "sha256-o6uXTtcxjb7H33I8UL4XLgx9y/f/iNeXx6z0NopR4MY="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.core"; + version = "2.0.6"; + hash = "sha256-MXi9UEga37dJyFuMg0AVt8enKdr54KlOFT/ssMHzkfA="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.lib.e_sqlite3"; + version = "2.0.6"; + hash = "sha256-o68At523MDwLEuRxjM+4EiydK4ITSFyc9R0zGmBGZ5g="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.provider.e_sqlite3"; + version = "2.0.6"; + hash = "sha256-308v2h3rvcPSsR9F+yFdJC1QEHgOQtuVxTMs5j3ODzI="; + }) + (fetchNuGet { + pname = "Steamworks.NET"; + version = "20.1.0"; + hash = "sha256-vt1UVbH4mHGPm7hTW2wKRrSzaFaHz9ZSuiaYeOhs6Ws="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.5.1"; + hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; + }) + (fetchNuGet { + pname = "System.Collections"; + version = "4.3.0"; + hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "6.0.0"; + hash = "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="; + }) + (fetchNuGet { + pname = "System.Collections.NonGeneric"; + version = "4.3.0"; + hash = "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="; + }) + (fetchNuGet { + pname = "System.Collections.Specialized"; + version = "4.3.0"; + hash = "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="; + }) + (fetchNuGet { + pname = "System.CommandLine"; + version = "2.0.0-beta4.22272.1"; + hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; + }) + (fetchNuGet { + pname = "System.ComponentModel"; + version = "4.3.0"; + hash = "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="; + }) + (fetchNuGet { + pname = "System.ComponentModel.Primitives"; + version = "4.3.0"; + hash = "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="; + }) + (fetchNuGet { + pname = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + hash = "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="; + }) + (fetchNuGet { + pname = "System.Configuration.ConfigurationManager"; + version = "4.4.1"; + hash = "sha256-4i8PUO1XTLfdUzeFxfHtR6xOP7mM3DD+ST9FviQl7zc="; + }) + (fetchNuGet { + pname = "System.Configuration.ConfigurationManager"; + version = "6.0.0"; + hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "7.0.2"; + hash = "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E="; + }) + (fetchNuGet { + pname = "System.Diagnostics.PerformanceCounter"; + version = "6.0.1"; + hash = "sha256-53t07yyRBb6sC4e3IjTp5fj44+p6JpX2zpr5/Bbf5Z4="; + }) + (fetchNuGet { + pname = "System.Drawing.Common"; + version = "4.7.0"; + hash = "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="; + }) + (fetchNuGet { + pname = "System.Drawing.Common"; + version = "6.0.0"; + hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; + }) + (fetchNuGet { + pname = "System.Formats.Asn1"; + version = "5.0.0"; + hash = "sha256-9nL3dN4w/dZ49W1pCkTjRqZm6Dh0mMVExNungcBHrKs="; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.3.0"; + hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; + }) + (fetchNuGet { + pname = "System.Globalization.Extensions"; + version = "4.3.0"; + hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.3.0"; + hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; + }) + (fetchNuGet { + pname = "System.IO.Pipelines"; + version = "6.0.3"; + hash = "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.3.0"; + hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.3"; + hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; + }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.3.0"; + hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.7.0"; + hash = "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.Lightweight"; + version = "4.7.0"; + hash = "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="; + }) + (fetchNuGet { + pname = "System.Reflection.Extensions"; + version = "4.3.0"; + hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; + }) + (fetchNuGet { + pname = "System.Reflection.Metadata"; + version = "6.0.0"; + hash = "sha256-VJHXPjP05w6RE/Swu8wa2hilEWuji3g9bl/6lBMSC/Q="; + }) + (fetchNuGet { + pname = "System.Reflection.MetadataLoadContext"; + version = "6.0.0"; + hash = "sha256-82aeU8c4rnYPLL3ba1ho1fxfpYQt5qrSK5e6ES+OTsY="; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; + }) + (fetchNuGet { + pname = "System.Reflection.TypeExtensions"; + version = "4.7.0"; + hash = "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM="; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.3.0"; + hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "6.0.0"; + hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; + }) + (fetchNuGet { + pname = "System.Runtime.Loader"; + version = "4.3.0"; + hash = "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="; + }) + (fetchNuGet { + pname = "System.Security.AccessControl"; + version = "4.7.0"; + hash = "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="; + }) + (fetchNuGet { + pname = "System.Security.AccessControl"; + version = "6.0.0"; + hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "5.0.0"; + hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Pkcs"; + version = "5.0.0"; + hash = "sha256-kq/tvYQSa24mKSvikFK2fKUAnexSL4PO4LkPppqtYkE="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.ProtectedData"; + version = "4.4.0"; + hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.ProtectedData"; + version = "6.0.0"; + hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; + }) + (fetchNuGet { + pname = "System.Security.Permissions"; + version = "4.7.0"; + hash = "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="; + }) + (fetchNuGet { + pname = "System.Security.Permissions"; + version = "6.0.0"; + hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; + }) + (fetchNuGet { + pname = "System.Security.Principal.Windows"; + version = "4.7.0"; + hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "4.4.0"; + hash = "sha256-zD24blG8xhAcL9gC4UTGKetd8c3LO0nv22nKTp2Vfx0="; + }) + (fetchNuGet { + pname = "System.Text.Encodings.Web"; + version = "7.0.0"; + hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; + }) + (fetchNuGet { + pname = "System.Text.Json"; + version = "7.0.1"; + hash = "sha256-wtk7fK3c/zAsaPB5oCmD86OfpPEJlGK3npr0mbM1ENM="; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.3.0"; + hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.5.4"; + hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; + }) + (fetchNuGet { + pname = "System.Windows.Extensions"; + version = "4.7.0"; + hash = "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="; + }) + (fetchNuGet { + pname = "System.Windows.Extensions"; + version = "6.0.0"; + hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; + }) + (fetchNuGet { + pname = "ZstdSharp.Port"; + version = "0.7.1"; + hash = "sha256-VzvKkpVjR7yKQyXhf6Ljf9ikMAQkbPWUiGFOeluanS4="; + }) +] diff --git a/pkgs/by-name/ts/tshock/package.nix b/pkgs/by-name/ts/tshock/package.nix new file mode 100644 index 000000000000..5e4379c8d954 --- /dev/null +++ b/pkgs/by-name/ts/tshock/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + buildDotnetModule, + dotnet-sdk_6, + dotnet-runtime_6, +}: +buildDotnetModule rec { + pname = "tshock"; + version = "5.2.3"; + + src = fetchFromGitHub { + owner = "Pryaxis"; + repo = "TShock"; + rev = "v${version}"; + sha256 = "sha256-1EtHpBZ7bbwVbl+tMfwpjgPuxu98XKvxlZ2+SbUlWV4="; + fetchSubmodules = true; + }; + + dotnet-sdk = dotnet-sdk_6; + dotnet-runtime = dotnet-runtime_6; + executables = [ "TShock.Server" ]; + + projectFile = [ + "TShockAPI/TShockAPI.csproj" + "TerrariaServerAPI/TerrariaServerAPI/TerrariaServerAPI.csproj" + "TShockLauncher/TShockLauncher.csproj" + "TShockInstaller/TShockInstaller.csproj" + "TShockPluginManager/TShockPluginManager.csproj" + ]; # Excluding tests because they can't build for some reason + + doCheck = false; # The same. + + nugetSource = "https://api.nuget.org/v3/index.json"; + nugetDeps = ./deps.nix; + + meta = with lib; { + homepage = "https://github.com/Pryaxis/TShock"; + description = "Modded server software for Terraria, providing a plugin system and inbuilt tools such as anti-cheat, server-side characters, groups, permissions, and item bans."; + license = licenses.gpl3Only; + maintainers = [ maintainers.proggerx ]; + mainProgram = "TShock.Server"; + }; +} diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix index 999cd1eb5ae9..d55847f6bab5 100644 --- a/pkgs/by-name/ts/tsukimi/package.nix +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -22,18 +22,18 @@ }: stdenv.mkDerivation rec { pname = "tsukimi"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "tsukinaha"; repo = "tsukimi"; tag = "v${version}"; - hash = "sha256-OxRxl/+JP3eqxc5b0pb6QbAAHrZgHrq1cawas2UrUro="; + hash = "sha256-FmxNOMYHoQK//v4ZGvJ6vIHKYgMfQm7LTwQV9iEFo0A="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-kt3otu5N3KAzJT992v80Mbgr0sOoPnonc1+pu5ANIxE="; + hash = "sha256-iH7vCZhCN2/gu2EC+YG/LUL9N/HMMnj7qHqXUdrlAh8="; }; nativeBuildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ]); nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix b/pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix index c3d7f206e5b3..713fd3978416 100644 --- a/pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix +++ b/pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix @@ -1,5 +1,6 @@ { lib, + nixosTests, stdenv, fetchFromGitHub, }: @@ -19,6 +20,10 @@ stdenv.mkDerivation { install -D plugins/auth_ldap/init.php $out/auth_ldap/init.php ''; + passthru = { + tests = { inherit (nixosTests) tt-rss; }; + }; + meta = with lib; { description = "Plugin for TT-RSS to authenticate users via ldap"; license = licenses.asl20; diff --git a/pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix b/pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix index 8cbfb42618bf..0593d8c80f1f 100644 --- a/pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix +++ b/pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation { ''; meta = with lib; { + broken = true; # Plugin code does not conform to plugin API changes. See https://github.com/wltb/ff_instagram/issues/13 description = "Plugin for Tiny Tiny RSS that allows to fetch posts from Instagram user sites"; longDescription = '' Plugin for Tiny Tiny RSS that allows to fetch posts from Instagram user sites. diff --git a/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix index 18e14aae380d..b211d25c17a5 100644 --- a/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix +++ b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix @@ -1,5 +1,6 @@ { lib, + nixosTests, stdenv, fetchFromGitHub, }: @@ -23,6 +24,10 @@ stdenv.mkDerivation rec { cp -ra feedly *.css $out ''; + passthru = { + tests = { inherit (nixosTests) tt-rss; }; + }; + meta = with lib; { description = "Feedly theme for Tiny Tiny RSS"; license = licenses.mit; diff --git a/pkgs/by-name/tt/tt-rss/package.nix b/pkgs/by-name/tt/tt-rss/package.nix index 105812d93537..e23cc622f76a 100644 --- a/pkgs/by-name/tt/tt-rss/package.nix +++ b/pkgs/by-name/tt/tt-rss/package.nix @@ -1,3 +1,4 @@ +# nixpkgs-update: no auto update { lib, stdenv, @@ -8,12 +9,12 @@ stdenv.mkDerivation rec { pname = "tt-rss"; - version = "0-unstable-2025-03-14"; + version = "0-unstable-2025-04-17"; src = fetchgit { url = "https://git.tt-rss.org/fox/tt-rss.git"; - rev = "28cb97ddc5834ce8cfe24602a293b90348851495"; - hash = "sha256-l4aGTxL9d+go9R7cn14XOoOr8JTrJSScgDIIHGvaB9Q="; + rev = "be82663ac9b59de8a135178a519efe9f7ebae213"; + hash = "sha256-bZrmOOFB5HhiWsV6wWfqv3/wW4rf/05AX7qU+v1IBFE="; }; installPhase = '' @@ -30,13 +31,13 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit (nixosTests) tt-rss; + tests = { inherit (nixosTests) tt-rss; }; updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; }; meta = with lib; { description = "Web-based news feed (RSS/Atom) aggregator"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; homepage = "https://tt-rss.org"; maintainers = with maintainers; [ gileri diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index 4d577365b809..a2d37d182987 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.10.0"; + version = "4.11.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-cCz2wxYvYAoI+Hmyll+Fn56NUCuWlIiJycmYvGyhkR4="; + sha256 = "sha256-REfk8m5ZYfms5hjzbYdqe27z3/qGzC0CLWQ/Cj3418Q="; }; useFetchCargoVendor = true; - cargoHash = "sha256-207Tmfs3LrZkwsAF/9qD5PN/zHwzCf0lq+87bFIP7y8="; + cargoHash = "sha256-dr/hT8mVUlO0pX/OGqIqPDevflNVPD88epLZsW772Os="; meta = with lib; { description = "CLI tool to manage todo lists in todo.txt format"; diff --git a/pkgs/by-name/tt/ttf2pt1/package.nix b/pkgs/by-name/tt/ttf2pt1/package.nix index 75b32dc70a2c..67f27ccb9bd3 100644 --- a/pkgs/by-name/tt/ttf2pt1/package.nix +++ b/pkgs/by-name/tt/ttf2pt1/package.nix @@ -4,14 +4,15 @@ fetchurl, perl, freetype, + fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ttf2pt1"; version = "3.4.4"; src = fetchurl { - url = "mirror://sourceforge/ttf2pt1/ttf2pt1-${version}.tgz"; + url = "mirror://sourceforge/ttf2pt1/ttf2pt1-${finalAttrs.version}.tgz"; sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"; }; @@ -28,7 +29,20 @@ stdenv.mkDerivation rec { buildInputs = [ freetype ]; nativeBuildInputs = [ perl ]; - patches = ./gentoo-makefile.patch; # also contains the freetype patch + patches = [ + ./gentoo-makefile.patch # also contains the freetype patch + + # fix build with c99 + # https://src.fedoraproject.org/rpms/ttf2pt1/c/070de5269475785d27ae7996513bee12cb9a0f53 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/ttf2pt1/raw/070de5269475785d27ae7996513bee12cb9a0f53/f/ttf2pt1-c99.patch"; + hash = "sha256-7+RnExqxED+fUJSj3opfYi0eQ5zqswOZnKjQMvlF020="; + }) + + # fix build with gcc14 + # https://src.fedoraproject.org/rpms/ttf2pt1/c/1ebb612acb7088095c6bd7242209f0ce848895fb + ./ttf2pt1-gcc14.patch + ]; meta = { description = "True Type to Postscript Type 3 converter, fpdf"; @@ -36,4 +50,4 @@ stdenv.mkDerivation rec { license = "ttf2pt1"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/tt/ttf2pt1/ttf2pt1-gcc14.patch b/pkgs/by-name/tt/ttf2pt1/ttf2pt1-gcc14.patch new file mode 100644 index 000000000000..22503463c87a --- /dev/null +++ b/pkgs/by-name/tt/ttf2pt1/ttf2pt1-gcc14.patch @@ -0,0 +1,47 @@ +diff --git a/ft.c b/ft.c +index 4ca1ca6..3ae9ac9 100644 +--- a/ft.c ++++ b/ft.c +@@ -457,7 +457,7 @@ static double lastx, lasty; + + static int + outl_moveto( +- FT_Vector *to, ++ const FT_Vector *to, + void *unused + ) + { +@@ -477,7 +477,7 @@ outl_moveto( + + static int + outl_lineto( +- FT_Vector *to, ++ const FT_Vector *to, + void *unused + ) + { +@@ -493,8 +493,8 @@ outl_lineto( + + static int + outl_conicto( +- FT_Vector *control1, +- FT_Vector *to, ++ const FT_Vector *control1, ++ const FT_Vector *to, + void *unused + ) + { +@@ -514,9 +514,9 @@ outl_conicto( + + static int + outl_cubicto( +- FT_Vector *control1, +- FT_Vector *control2, +- FT_Vector *to, ++ const FT_Vector *control1, ++ const FT_Vector *control2, ++ const FT_Vector *to, + void *unused + ) + { + diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix index 61414492cff0..31d4e2bc9212 100644 --- a/pkgs/by-name/tt/ttfb/package.nix +++ b/pkgs/by-name/tt/ttfb/package.nix @@ -1,9 +1,7 @@ { - darwin, fetchCrate, lib, rustPlatform, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -15,10 +13,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OOVqCWeF5cHMweEGWYIiWWWsw1QlNDFgnia05Qxo7uo="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-4Nsg5/66enMgAfPrUQHuhOTTwG2OWyyvKMHIhPnlHko="; diff --git a/pkgs/by-name/tt/tts/package.nix b/pkgs/by-name/tt/tts/package.nix index 89ffb9f86f99..00ed8d40f599 100644 --- a/pkgs/by-name/tt/tts/package.nix +++ b/pkgs/by-name/tt/tts/package.nix @@ -8,32 +8,23 @@ writableTmpDirAsHomeHook, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - torch = super.torch-bin; - torchvision = super.torchvision-bin; - tensorflow = super.tensorflow-bin; - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "coqui-tts"; - version = "0.25.1"; + version = "0.26.0"; pyproject = true; src = fetchFromGitHub { owner = "idiap"; repo = "coqui-ai-TTS"; tag = "v${version}"; - hash = "sha256-5w1Y9wdoJ+EV/WBwK3nqyY60NEsMjQsfE4g+sJB7VwQ="; + hash = "sha256-tLTurOwSzKvejb31yijmH3LFZGJHYp0OW0ckS7Ds5ig="; }; postPatch = let relaxedConstraints = [ "bnunicodenormalizer" + "coqpit-config" "cython" "gruut" "inflect" @@ -55,7 +46,7 @@ python.pkgs.buildPythonApplication rec { pyproject.toml ''; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ cython numpy packaging @@ -63,7 +54,7 @@ python.pkgs.buildPythonApplication rec { hatchling ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ anyascii bangla bnnumerizer @@ -92,8 +83,8 @@ python.pkgs.buildPythonApplication rec { scipy soundfile tensorflow - torch-bin - torchaudio-bin + torch + torchaudio tqdm trainer transformers @@ -104,7 +95,7 @@ python.pkgs.buildPythonApplication rec { ]; postInstall = '' - cp -r TTS/server/templates/ $out/${python.sitePackages}/TTS/server + cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server ''; # tests get stuck when run in nixpkgs-review, tested in passthru @@ -114,7 +105,7 @@ python.pkgs.buildPythonApplication rec { }); nativeCheckInputs = - with python.pkgs; + with python3.pkgs; [ espeak-ng pytestCheckHook @@ -130,7 +121,7 @@ python.pkgs.buildPythonApplication rec { for file in $(grep -rl 'python TTS/bin' tests); do substituteInPlace "$file" \ - --replace "python TTS/bin" "${python.interpreter} $out/${python.sitePackages}/TTS/bin" + --replace "python TTS/bin" "${python3.interpreter} $out/${python3.sitePackages}/TTS/bin" done ''; @@ -189,7 +180,7 @@ python.pkgs.buildPythonApplication rec { ]; passthru = { - inherit python; + inherit python3; }; meta = with lib; { @@ -197,7 +188,6 @@ python.pkgs.buildPythonApplication rec { changelog = "https://github.com/idiap/coqui-ai-TTS/releases/tag/v${version}"; description = "Deep learning toolkit for Text-to-Speech, battle-tested in research and production"; license = licenses.mpl20; - maintainers = teams.tts.members; - broken = false; + teams = [ teams.tts ]; }; } diff --git a/pkgs/by-name/tt/ttysvr/package.nix b/pkgs/by-name/tt/ttysvr/package.nix index a95bd22e2b23..cbd0fdb61949 100644 --- a/pkgs/by-name/tt/ttysvr/package.nix +++ b/pkgs/by-name/tt/ttysvr/package.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tu/tuba/package.nix b/pkgs/by-name/tu/tuba/package.nix index 93ff59a89383..84604716659e 100644 --- a/pkgs/by-name/tu/tuba/package.nix +++ b/pkgs/by-name/tu/tuba/package.nix @@ -27,7 +27,7 @@ webp-pixbuf-loader, icu, gst_all_1, - clapper, + clapper-unwrapped, # clapper support is still experimental and has bugs. # See https://github.com/GeopJr/Tuba/pull/931 clapperSupport ? false, @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { gst-plugins-bad ]) ++ lib.optionals clapperSupport [ - clapper + clapper-unwrapped ]; mesonFlags = [ @@ -112,12 +112,10 @@ stdenv.mkDerivation rec { mainProgram = "dev.geopjr.Tuba"; license = lib.licenses.gpl3Only; changelog = "https://github.com/GeopJr/Tuba/releases/tag/v${version}"; - maintainers = - with lib.maintainers; - [ - chuangzhu - donovanglover - ] - ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ + chuangzhu + donovanglover + ]; + teams = [ lib.teams.gnome-circle ]; }; } diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix index 283259994be1..3251db7cc3a1 100644 --- a/pkgs/by-name/tu/tuckr/package.nix +++ b/pkgs/by-name/tu/tuckr/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "tuckr"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "RaphGL"; repo = "Tuckr"; rev = version; - hash = "sha256-0ZPBJ2MNeoGCvYW6HswVZ5SyjZpdR21lp9ebceIhsfw="; + hash = "sha256-EGoxM/dAKlIE/oYRH17VcGJNNaPJPDUW4tB6CG+eyFQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vgwO1N7FuqZaY+ShkQHmCEYwiKZRkkqDNAU7SnTg1rw="; + cargoHash = "sha256-ltlJhlvDP1cJqPG7US9h7qx+KA/5gudZUqULsxTVJbU="; doCheck = false; # test result: FAILED. 5 passed; 3 failed; diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index cf11de57e07f..079e09d45ec9 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,16 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; meta = with lib; { description = "Your journal app if you live in a terminal"; diff --git a/pkgs/by-name/tu/tuicam/package.nix b/pkgs/by-name/tu/tuicam/package.nix index 338519fbeea1..344478d30ab1 100644 --- a/pkgs/by-name/tu/tuicam/package.nix +++ b/pkgs/by-name/tu/tuicam/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/hlsxx/tuicam"; changelog = "https://github.com/hlsxx/tuicam/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ linuxmobile ]; + maintainers = with lib.maintainers; [ FKouhai ]; platforms = lib.platforms.linux; mainProgram = "tuicam"; }; diff --git a/pkgs/by-name/tu/tuifeed/package.nix b/pkgs/by-name/tu/tuifeed/package.nix new file mode 100644 index 000000000000..ef4915dc524f --- /dev/null +++ b/pkgs/by-name/tu/tuifeed/package.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchCrate, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "tuifeed"; + version = "0.4.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-CL6cd9OfvnA5N4W3rGl7XLcnlSrh3kcqA7idxexkjA4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-A7kD46gfXWK/OlFVMULlMa7Z9Q1it9/rhGo6pjFa38k="; + + doCheck = false; + + meta = with lib; { + description = "Terminal feed reader with a fancy UI"; + mainProgram = "tuifeed"; + homepage = "https://github.com/veeso/tuifeed"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix index 52ff6e9e41da..67103615d4db 100644 --- a/pkgs/by-name/tu/tuisky/package.nix +++ b/pkgs/by-name/tu/tuisky/package.nix @@ -8,19 +8,19 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tuisky"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "sugyan"; repo = "tuisky"; - tag = "v${version}"; - hash = "sha256-s0eKWP4cga82Fj7KGIG6yLk67yOqGoAqfhvJINzytTw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7SkY2n5nfqGDxbaSYmWwwmksA8eNY9SjRLLfCUP3qtc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-F/gEBEpcgNT0Q55zUTf8254yYIZI6RmiW9heCuljAEY="; + cargoHash = "sha256-rkIc/dRvuuOUq2v3bHLAL//DmiEBbBAhTxR0MHxAL/U="; nativeBuildInputs = [ pkg-config @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { @@ -43,9 +43,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "TUI client for bluesky"; homepage = "https://github.com/sugyan/tuisky"; - changelog = "https://github.com/sugyan/tuisky/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/sugyan/tuisky/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "tuisky"; }; -} +}) diff --git a/pkgs/by-name/tu/tuistash/package.nix b/pkgs/by-name/tu/tuistash/package.nix new file mode 100644 index 000000000000..09115ee5d523 --- /dev/null +++ b/pkgs/by-name/tu/tuistash/package.nix @@ -0,0 +1,35 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + rustPlatform, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "tuistash"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "edmocosta"; + repo = "tuistash"; + tag = "v${finalAttrs.version}"; + hash = "sha256-LWmH/xHvdiY6lC7gsRh2gX31b9Fh4fWekrVdQ++8moQ="; + }; + + cargoHash = "sha256-mLtzdWHC7HN+hju71WQQZ4nJDMzybEfjzckbfeu32Qo="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal User Interface for Logstash"; + homepage = "https://github.com/edmocosta/tuistash"; + changelog = "https://github.com/edmocosta/tuistash/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = [ lib.licenses.asl20 ]; + maintainers = [ lib.maintainers.kpbaks ]; + mainProgram = "tuistash"; + }; +}) diff --git a/pkgs/by-name/tu/tumiki-fighters/package.nix b/pkgs/by-name/tu/tumiki-fighters/package.nix index f89c6f5275b8..85bf974bcaf4 100644 --- a/pkgs/by-name/tu/tumiki-fighters/package.nix +++ b/pkgs/by-name/tu/tumiki-fighters/package.nix @@ -5,6 +5,7 @@ fetchurl, unzip, gdc, + libGL, SDL, SDL_mixer, bulletml, @@ -64,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libGL SDL SDL_mixer bulletml diff --git a/pkgs/by-name/tu/tunefish/package.nix b/pkgs/by-name/tu/tunefish/package.nix new file mode 100644 index 000000000000..9f5772e5d8e1 --- /dev/null +++ b/pkgs/by-name/tu/tunefish/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + python3, + alsa-lib, + curl, + freetype, + gtk3, + libGL, + libX11, + libXext, + libXinerama, + webkitgtk_4_0, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tunefish"; + version = "0-unstable-2021-12-19"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = "tunefish"; + rev = "c801c6cab63bb9e78e38ed69bd92024f2c667f00"; + hash = "sha256-ZH2VD0IydEFdbB3Ht5D6/lbcWLQHBuu9GyasVP7VefI="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkg-config + python3 + ]; + + buildInputs = [ + alsa-lib + curl + freetype + gtk3 + libGL + libX11 + libXext + libXinerama + webkitgtk_4_0 + ]; + + makeFlags = [ + "-C" + "src/tunefish4/Builds/LinuxMakefile" + "CONFIG=Release" + ]; + + # silences build warnings + HOME = "/build"; + + postPatch = '' + patchShebangs src/tunefish4/generate-lv2-ttl.py + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/{lv2,vst,vst3/Tunefish4.vst3} + + pushd src/tunefish4/Builds/LinuxMakefile/build + cp -r "Tunefish4.lv2" $out/lib/lv2 + cp -r "Tunefish4.vst3/Contents/x86_64-linux"/* $out/lib/vst3/Tunefish4.vst3 + cp "Tunefish4.so" $out/lib/vst + popd + + runHook postInstall + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "https://tunefish-synth.com/"; + description = "Virtual analog synthesizer LV2 plugin"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ orivej ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/tu/tuner/package.nix b/pkgs/by-name/tu/tuner/package.nix index ce4dc34a82e2..5c3be6074447 100644 --- a/pkgs/by-name/tu/tuner/package.nix +++ b/pkgs/by-name/tu/tuner/package.nix @@ -12,8 +12,6 @@ desktop-file-utils, libsoup_3, json-glib, - geoclue2, - geocode-glib, libgee, gtk3, pantheon, @@ -45,8 +43,6 @@ stdenv.mkDerivation rec { buildInputs = [ libsoup_3 json-glib - geoclue2 - geocode-glib libgee glib gtk3 diff --git a/pkgs/by-name/tu/tunnelto/package.nix b/pkgs/by-name/tu/tunnelto/package.nix new file mode 100644 index 000000000000..4d6b2eccebac --- /dev/null +++ b/pkgs/by-name/tu/tunnelto/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "tunnelto"; + version = "unstable-2022-09-25"; + + src = fetchFromGitHub { + owner = "agrinman"; + repo = pname; + rev = "06428f13c638180dd349a4c42a17b569ab51a25f"; + sha256 = "sha256-84jGcR/E1QoqIlbGu67muYUtZU66ZJtj4tdZvmYbII4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-QXkKqEEbNEDcypErDIFarJLuIoYWOZj/9jCbslxrOXs="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; + + meta = with lib; { + description = "Expose your local web server to the internet with a public URL"; + homepage = "https://tunnelto.dev"; + license = licenses.mit; + maintainers = with maintainers; [ Br1ght0ne ]; + }; +} diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index f01de7e53a1d..c5695c873460 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "turbo-unwrapped"; - version = "2.4.5-canary.4"; + version = "2.5.3"; src = fetchFromGitHub { owner = "vercel"; repo = "turborepo"; tag = "v${finalAttrs.version}"; - hash = "sha256-tQ/Xocpk48eRhCyfRZx2rkAVqNn115rO3MRYF5fC2nI="; + hash = "sha256-QcyRuLd+nMoCyrtX1j+8vFtsgVKC2KsQBAUjsvfG+rM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pngzlmkntTCv5/aw1UNbDGNQOVtMgFZHc2woj6R0vys="; + cargoHash = "sha256-zEkpWu/L5plFCnvliAtfu19ljB4pnrEesVQZOycOKRk="; nativeBuildInputs = [ diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index fe76e4aad375..f0da4ddd91ae 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/turn-server"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix index 3a582fd21167..fab0e00976b3 100644 --- a/pkgs/by-name/tu/turnon/package.nix +++ b/pkgs/by-name/tu/turnon/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "turnon"; - version = "2.3.4"; + version = "2.6.3"; src = fetchFromGitHub { owner = "swsnr"; repo = "turnon"; rev = "v${version}"; - hash = "sha256-eKJRyQMZOa/QRUW0VQ0EkXbJSMcYHfCC9wTs0YEB1yo="; + hash = "sha256-fRDyfgS+jLGFJTYIEXJ27cCM9knfbIjlGpYNU4OyoJ0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SjENjQjdg5Vrpd911QOcH9lmW7+BACaN4a/oGb2miI4="; + cargoHash = "sha256-Bg3+PX5/BlqeN3EEFzBX42Dw4BbyKHlN1dnQSHnEz+c="; doCheck = true; diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix index 1e13fe0a3505..c55b3fbb9032 100644 --- a/pkgs/by-name/tu/turso-cli/package.nix +++ b/pkgs/by-name/tu/turso-cli/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "1.0.3"; + version = "1.0.10"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-94av3EW96qApCYWpo08QjrxoneuqGrE98aE7YXQEaT4="; + hash = "sha256-aXFMsY8bxj+NJizeThlebcv8nNvjqF7q+AN6sQ4/5PQ="; }; vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU="; diff --git a/pkgs/by-name/tu/tusd/package.nix b/pkgs/by-name/tu/tusd/package.nix new file mode 100644 index 000000000000..2e0febe8adaf --- /dev/null +++ b/pkgs/by-name/tu/tusd/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, +}: + +buildGoModule rec { + pname = "tusd"; + version = "2.8.0"; + + src = fetchFromGitHub { + owner = "tus"; + repo = "tusd"; + tag = "v${version}"; + hash = "sha256-OzXBeLDjaJk4NVgsauR/NUATh7qHbuEfWNdhytZmd0A="; + }; + + vendorHash = "sha256-YununGyB72zE0tmqO3BREJeMTjCuy/1fhPHC5r8OLjg="; + + ldflags = [ + "-X github.com/tus/tusd/v2/cmd/tusd/cli.VersionName=v${version}" + ]; + + # Tests need the path to the binary: + # https://github.com/tus/tusd/blob/0e52ad650abed02ec961353bb0c3c8bc36650d2c/internal/e2e/e2e_test.go#L37 + preCheck = '' + export TUSD_BINARY=$PWD/../go/bin/tusd + ''; + + passthru.tests.tusd = nixosTests.tusd; + + meta = { + description = "Reference server implementation in Go of tus: the open protocol for resumable file uploads"; + license = lib.licenses.mit; + homepage = "https://tus.io/"; + maintainers = with lib.maintainers; [ + nh2 + kalbasit + kvz + Acconut + ]; + }; +} diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 2e5179dea11e..370e2240c221 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "274.250312.0"; + version = "277.250414.1"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-30+ZKqbIEUvmWhQ3ZrDZkZMBUc7lKkv02Vbraq9vPrU="; + hash = "sha256-Ke9c9kugI+Cym24Nf4juW1oFiCCTNURZy7C1+TFF0rc="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/by-name/tw/twilio-cli/package.nix b/pkgs/by-name/tw/twilio-cli/package.nix index a3d89e551d8b..780a73fbd8f6 100644 --- a/pkgs/by-name/tw/twilio-cli/package.nix +++ b/pkgs/by-name/tw/twilio-cli/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.23.0"; + version = "5.23.1"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-LTaQFRoXRBLPLWvyqwMbQc0OOC+wT+taLm78GL2mWBQ="; + hash = "sha256-GPOISOR3N8CTS7eNtDYQkzX1bjZYfOMz4zj//K32Dsw="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/by-name/tw/twingate/package.nix b/pkgs/by-name/tw/twingate/package.nix index 02003ad40937..60756975e8e4 100644 --- a/pkgs/by-name/tw/twingate/package.nix +++ b/pkgs/by-name/tw/twingate/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "2025.72.142645"; + version = "2025.114.149850"; src = fetchurl { url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; - hash = "sha256-8NIaPj6q2wPq908ZQt4Dihb0ffcc/pccrQD6lonsehc="; + hash = "sha256-rsV05HuGPrY6sNWP8JRaniwaj8Bn2V2Dk7yXX7gibFs="; }; buildInputs = [ diff --git a/pkgs/by-name/tw/twitch-cli/package.nix b/pkgs/by-name/tw/twitch-cli/package.nix index 64b0ee6fd247..6d97656a1ffd 100644 --- a/pkgs/by-name/tw/twitch-cli/package.nix +++ b/pkgs/by-name/tw/twitch-cli/package.nix @@ -8,20 +8,20 @@ buildGoModule rec { pname = "twitch-cli"; - version = "1.1.24"; + version = "1.1.25"; src = fetchFromGitHub { owner = "twitchdev"; repo = pname; rev = "v${version}"; - hash = "sha256-kRyJl2SxppVGCO/6wrsb8cO+wpBT1nBsyI/JsPRYzMc="; + hash = "sha256-+6/o2vhj1iaT0hkyQRedn7ga1dhNZOupX4lOadnTDU0="; }; patches = [ ./application-name.patch ]; - vendorHash = "sha256-Z5bWS4oqjkEfOsvBzupKKnF6rJPU0TLVdwxDkIKcBQY="; + vendorHash = "sha256-LPpUnielSeGE0k68z+M565IqXQUIkAh5xloOqcbfh20="; ldflags = [ "-s" diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix index 3bb334df819a..c73f9924ff82 100644 --- a/pkgs/by-name/tw/twitch-dl/package.nix +++ b/pkgs/by-name/tw/twitch-dl/package.nix @@ -5,24 +5,21 @@ installShellFiles, scdoc, ffmpeg, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { pname = "twitch-dl"; - version = "2.11.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ihabunek"; repo = "twitch-dl"; tag = version; - hash = "sha256-L+IbcSUaxhTg2slNc5x1VJPnA5e2qrPEeWjspK2COAI="; + hash = "sha256-Nn/Nwd1KvrkR+uGp8HmRGeBC7E0/Y1EVMpJAp7UDj7Q="; }; - pythonRelaxDeps = [ - "m3u8" - ]; - nativeBuildInputs = [ python3Packages.setuptools python3Packages.setuptools-scm @@ -38,6 +35,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ python3Packages.pytestCheckHook + writableTmpDirAsHomeHook ]; disabledTestPaths = [ @@ -72,10 +70,6 @@ python3Packages.buildPythonApplication rec { installManPage twitch-dl.1 ''; - preInstallCheck = '' - export HOME="$(mktemp -d)" - ''; - meta = with lib; { description = "CLI tool for downloading videos from Twitch"; homepage = "https://github.com/ihabunek/twitch-dl"; diff --git a/pkgs/by-name/tw/twitch-hls-client/package.nix b/pkgs/by-name/tw/twitch-hls-client/package.nix index 190a8e94b5b7..214939e8ade5 100644 --- a/pkgs/by-name/tw/twitch-hls-client/package.nix +++ b/pkgs/by-name/tw/twitch-hls-client/package.nix @@ -2,27 +2,21 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "twitch-hls-client"; - version = "1.3.13"; + version = "1.4.1"; src = fetchFromGitHub { owner = "2bc4"; repo = "twitch-hls-client"; rev = version; - hash = "sha256-H446qXFwRGippLMZemkW8sVhTV3YGpKmAvD8QBamAlo="; + hash = "sha256-m6ci7jKmWGsvJZt9CxfU0OCk5GA7I87c5HHdPP+4O94="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sqhB2Lj3RK1OyXy87Be9aOkfcksqz+5VfRTlKuswerU="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + cargoHash = "sha256-4/a94VFlOvw3TR+LYkq3qghhUudt0S9HF85fy4mYbQM="; meta = with lib; { description = "Minimal CLI client for watching/recording Twitch streams"; diff --git a/pkgs/by-name/tw/twitch-tui/package.nix b/pkgs/by-name/tw/twitch-tui/package.nix new file mode 100644 index 000000000000..1d7f03d60ecc --- /dev/null +++ b/pkgs/by-name/tw/twitch-tui/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "twitch-tui"; + version = "2.6.19"; + + src = fetchFromGitHub { + owner = "Xithrius"; + repo = "twitch-tui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-hA66YcxbQem9ymOu3tGA4biKUCoJ2jKnUSK+9+0P2Eg="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-DMUE3sTJEz2AxUctnjm0CkvOqMeAw5urLPZkkHvf9A8="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + meta = { + description = "Twitch chat in the terminal"; + homepage = "https://github.com/Xithrius/twitch-tui"; + changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lordmzte ]; + mainProgram = "twt"; + }; +}) diff --git a/pkgs/by-name/tw/twitterBootstrap/package.nix b/pkgs/by-name/tw/twitterBootstrap/package.nix index 78f4c77e4617..6838bc102c9a 100644 --- a/pkgs/by-name/tw/twitterBootstrap/package.nix +++ b/pkgs/by-name/tw/twitterBootstrap/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bootstrap"; - version = "5.3.3"; + version = "5.3.5"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${finalAttrs.version}/bootstrap-${finalAttrs.version}-dist.zip"; - hash = "sha256-WwokWrhFiVFmjSn9FJ/GyOY8Z2l378I4IqIjwIJF3ho="; + hash = "sha256-0dKtiLr8Y55I2V4yYL8qQzUCqPjFnzleKVscLLdHG8g="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/by-name/tw/twtxt/package.nix similarity index 100% rename from pkgs/applications/networking/twtxt/default.nix rename to pkgs/by-name/tw/twtxt/package.nix diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix new file mode 100644 index 000000000000..79ab77df9ab4 --- /dev/null +++ b/pkgs/by-name/ty/ty/package.nix @@ -0,0 +1,91 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + + # nativeBuildInputs + installShellFiles, + + buildPackages, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ty"; + version = "0.0.1-alpha.6"; + + src = fetchFromGitHub { + owner = "astral-sh"; + repo = "ty"; + tag = finalAttrs.version; + fetchSubmodules = true; + hash = "sha256-0/Vzc5N4w23dcRLSWMn/hcgtx3dOpJagPBCiNjCT3mI="; + }; + + # For Darwin platforms, remove the integration test for file notifications, + # as these tests fail in its sandboxes. + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + rm ${finalAttrs.cargoRoot}/crates/ty/tests/file_watching.rs + ''; + + cargoRoot = "ruff"; + buildAndTestSubdir = finalAttrs.cargoRoot; + + cargoBuildFlags = [ "--package=ty" ]; + + cargoHash = "sha256-p3D2sHMyeQY6hZsX17REidyofuQsIkunGLP8IrO1+8A="; + + nativeBuildInputs = [ installShellFiles ]; + + # `ty`'s tests use `insta-cmd`, which depends on the structure of the `target/` directory, + # and also fails to find the environment variable `$CARGO_BIN_EXE_ty`, which leads to tests failing. + # Instead, we specify the path ourselves and forgo the lookup. + # As the patches occur solely in test code, they have no effect on the packaged `ty` binary itself. + # + # `stdenv.hostPlatform.rust.cargoShortTarget` is taken from `cargoSetupHook`'s `installPhase`, + # which constructs a path as below to reference the built binary. + preCheck = '' + export CARGO_BIN_EXE_ty="$PWD"/target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/ty + ''; + + # All the packages referenced in `crates/ty/README.md`, plus `crates/ty` itself. + cargoTestFlags = [ + "--package=ty" # CLI tests; file-watching tests only on Linux platforms + "--package=ty_python_semantic" # core type checking tests + "--package=ty_test" # test framework tests + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd ty \ + --bash <(${emulator} $out/bin/ty generate-shell-completion bash) \ + --fish <(${emulator} $out/bin/ty generate-shell-completion fish) \ + --zsh <(${emulator} $out/bin/ty generate-shell-completion zsh) + '' + ); + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; }; + }; + + meta = { + description = "Extremely fast Python type checker and language server, written in Rust"; + homepage = "https://github.com/astral-sh/ty"; + changelog = "https://github.com/astral-sh/ty/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + mainProgram = "ty"; + maintainers = with lib.maintainers; [ + bengsparks + GaetanLepage + ]; + }; +}) diff --git a/pkgs/by-name/ty/typewriter/package.nix b/pkgs/by-name/ty/typewriter/package.nix new file mode 100644 index 000000000000..f45935c8b31f --- /dev/null +++ b/pkgs/by-name/ty/typewriter/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitLab, + rustPlatform, + meson, + ninja, + pkg-config, + rustc, + cargo, + wrapGAppsHook4, + blueprint-compiler, + desktop-file-utils, + appstream-glib, + openssl, + libadwaita, + libpanel, + gtksourceview5, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "typewriter"; + version = "0.1.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "JanGernert"; + repo = "typewriter"; + tag = "v.${finalAttrs.version}"; + hash = "sha256-c4wh59RNYMyK1rwoxzjhDCtnGnAxGABAu5cugV3P0zU="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-YvzVpSAPORxjvbGQqRK1V8DKcF12NUOGOgmegJSODQc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + cargo + wrapGAppsHook4 + blueprint-compiler + desktop-file-utils + appstream-glib + ]; + + buildInputs = [ + openssl + libadwaita + libpanel + gtksourceview5 + ]; + + meta = { + mainProgram = "typewriter"; + description = "Create documents with typst"; + homepage = "https://gitlab.gnome.org/JanGernert/typewriter"; + changelog = "https://gitlab.gnome.org/JanGernert/typewriter/-/releases/v.${finalAttrs.version}"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.awwpotato ]; + }; +}) diff --git a/pkgs/by-name/ty/typical/lifetime.patch b/pkgs/by-name/ty/typical/lifetime.patch new file mode 100644 index 000000000000..24f7353ae1f4 --- /dev/null +++ b/pkgs/by-name/ty/typical/lifetime.patch @@ -0,0 +1,13 @@ +diff --git a/src/error.rs b/src/error.rs +index 4563e1e..050610d 100644 +--- a/src/error.rs ++++ b/src/error.rs +@@ -34,7 +34,7 @@ impl fmt::Display for Error { + } + + impl error::Error for Error { +- fn source<'a>(&'a self) -> Option<&(dyn error::Error + 'static)> { ++ fn source(&self) -> Option<&(dyn error::Error + 'static)> { + self.reason.as_deref() + } + } diff --git a/pkgs/by-name/ty/typical/package.nix b/pkgs/by-name/ty/typical/package.nix index 7b3e508af9de..91c9d00d4db6 100644 --- a/pkgs/by-name/ty/typical/package.nix +++ b/pkgs/by-name/ty/typical/package.nix @@ -28,6 +28,12 @@ rustPlatform.buildRustPackage rec { export NO_COLOR=true ''; + patches = [ + # Related to https://github.com/stepchowfun/typical/pull/501 + # Commiting a slightly different patch because the upstream one doesn't apply cleanly + ./lifetime.patch + ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd typical \ --bash <($out/bin/typical shell-completion bash) \ diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index 0268881d1da7..3aaf61196e42 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.36"; + version = "0.1.37"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; tag = "v${version}"; - hash = "sha256-TA0mWhHhTFBleybdpv3ypQmwYhqt1EKmWoDeKUiF9VI="; + hash = "sha256-+G4jOoC8AdCE5tEb7qN8cord/pe8Qsa/U1YpL0fWSeo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5G2hV1c063WKfc2Y8oW3OQdO2v0b8M6kfxf2NV+jMlA="; + cargoHash = "sha256-D3XmCPQYBbr5OwY62xigtYnHATSePZQnkGoUZWqGMR8="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 6e9c6b4faa2e..3502de2b9748 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -8,23 +8,23 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.30.3"; + version = "1.32.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = "typos"; tag = "v${version}"; - hash = "sha256-Yzt5O24+Nkxvoim6BlaPzVQ3gSKrmPO/725dxzQ9XXk="; + hash = "sha256-1IILk52HyeGMZC+oD2tIUApEgV8RAojmAlVP/uQIng0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-9+LFyrKy8Hv13Tu8Ko5PpdcSPh3sgGHWvixYT0km1Rs="; + cargoHash = "sha256-HKJ9ndh23ho3PtWUpGPaGOaECQC2dEfKp0D1N2PY9Ew="; passthru.updateScript = nix-update-script { }; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Source code spell checker"; diff --git a/pkgs/by-name/ty/typship/package.nix b/pkgs/by-name/ty/typship/package.nix new file mode 100644 index 000000000000..5b26a4343122 --- /dev/null +++ b/pkgs/by-name/ty/typship/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "typship"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "sjfhsjfh"; + repo = "typship"; + tag = "v${finalAttrs.version}"; + hash = "sha256-LDiKAQmzEgzFJH2NAR3FYsO4SmH5uAEOa6I4A0FnwJk="; + }; + + cargoHash = "sha256-t4Vnww49CnkBSRsAWKxSpJffuUuqFAxqUN0GtoxnKLY="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + env = { + OPENSSL_NO_VENDOR = true; # From the typst package + }; + + meta = { + description = "A Typst package CLI tool"; + homepage = "https://github.com/sjfhsjfh/typship"; + license = lib.licenses.mit; + changelog = "https://github.com/sjfhsjfh/typship/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ heijligen ]; + }; +}) diff --git a/pkgs/by-name/ty/typst-live/package.nix b/pkgs/by-name/ty/typst-live/package.nix index 1dbb2ea22744..830ceb928b9d 100644 --- a/pkgs/by-name/ty/typst-live/package.nix +++ b/pkgs/by-name/ty/typst-live/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, makeWrapper, typst, }: @@ -24,10 +22,6 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - postInstall = '' wrapProgram $out/bin/typst-live \ --suffix PATH : ${lib.makeBinPath [ typst ]} diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index ed04a3ee1547..7efdd3424d2d 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -5,9 +5,9 @@ installShellFiles, pkg-config, openssl, - xz, nix-update-script, versionCheckHook, + callPackage, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl - xz ]; env = { @@ -58,7 +57,11 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + packages = callPackage ./typst-packages.nix { }; + withPackages = callPackage ./with-packages.nix { }; + }; meta = { changelog = "https://github.com/typst/typst/releases/tag/v${finalAttrs.version}"; @@ -70,6 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: { drupol figsoda kanashimia + RossSmyth ]; }; }) diff --git a/pkgs/by-name/ty/typst/typst-packages-from-universe.toml b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml new file mode 100644 index 000000000000..46d7c4dba3e0 --- /dev/null +++ b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml @@ -0,0 +1,21196 @@ +[a2c-nums."0.0.1"] +url = "https://packages.typst.org/preview/a2c-nums-0.0.1.tar.gz" +hash = "sha256-pVziMcz9ubNuUaTm+s4nMb0d8dzwB+hb/DgnQKeKeWw=" +typstDeps = [] +description = "Convert a number to Chinese" +license = [ + "MIT", +] +homepage = "https://github.com/soarowl/a2c-nums.git" + +[abbr."0.2.3"] +url = "https://packages.typst.org/preview/abbr-0.2.3.tar.gz" +hash = "sha256-H4zgbFvX14uHH5o2WtCGMtOXxejzTUPgeaObwhy6eak=" +typstDeps = [] +description = "An Abbreviations package" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~slowjo/typst-abbr" + +[abbr."0.2.2"] +url = "https://packages.typst.org/preview/abbr-0.2.2.tar.gz" +hash = "sha256-fPVIInoFZ4NKyVJojIAH02NAit0CLyubzJh+iOiaPXc=" +typstDeps = [] +description = "An Abbreviations package" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~slowjo/typst-abbr" + +[abbr."0.2.1"] +url = "https://packages.typst.org/preview/abbr-0.2.1.tar.gz" +hash = "sha256-MrnZfinOhFIo8fbnkf481WkNStmncTeeosn1NAc9Wu0=" +typstDeps = [] +description = "An Abbreviations package" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~slowjo/typst-abbr" + +[abbr."0.1.1"] +url = "https://packages.typst.org/preview/abbr-0.1.1.tar.gz" +hash = "sha256-LzJlLKFEBA3p9dpy2UwiHD9n52+9iJ/hRWRs5nmsVtA=" +typstDeps = [] +description = "An Abbreviations package" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~slowjo/typst-abbr" + +[abbr."0.1.0"] +url = "https://packages.typst.org/preview/abbr-0.1.0.tar.gz" +hash = "sha256-WKJEK4TcSIuqPkHcPWB+zmiSZsinfJAy9IGdbXta0GQ=" +typstDeps = [] +description = "An Abbreviations package" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~slowjo/typst-abbr" + +[abiding-ifacconf."0.1.0"] +url = "https://packages.typst.org/preview/abiding-ifacconf-0.1.0.tar.gz" +hash = "sha256-Vmx78w1m78eX0tIoHZsyR/Kh61cP/l5YqlhSeWjwG28=" +typstDeps = [ + "ctheorems_1_1_0", +] +description = "An IFAC-style paper template to publish at conferences for International Federation of Automatic Control" +license = [ + "MIT-0", +] +homepage = "https://github.com/avonmoll/ifacconf-typst" + +[academic-conf-pre."0.1.0"] +url = "https://packages.typst.org/preview/academic-conf-pre-0.1.0.tar.gz" +hash = "sha256-12BrUly7fU/7c0ZB+OMY3UaV7ZpYUSWQUywc042ciL8=" +typstDeps = [ + "cuti_0_2_1", + "touying_0_4_2", + "unify_0_6_0", +] +description = "Slide Theme for Acadmic Presentations in Australia" +license = [ + "MIT", +] +homepage = "https://github.com/JL-ghcoder/Typst-Pre-Template" + +[academicv."1.1.0"] +url = "https://packages.typst.org/preview/academicv-1.1.0.tar.gz" +hash = "sha256-OzuK3FlqGPgFEoBz3J8zTJXfxG5qbO0oZFGVPofXqA0=" +typstDeps = [ + "academicv_1_0_0", +] +description = "A clean, flexible curriculum vitae (CV) template using Typst and YAML" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/roaldarbol/academicv" + +[academicv."1.0.0"] +url = "https://packages.typst.org/preview/academicv-1.0.0.tar.gz" +hash = "sha256-GHXDKGpD9JZIZbCmziNORHx4n6VjwY4R4nh8bUyGYQ4=" +typstDeps = [] +description = "A clean, flexible curriculum vitae (CV) template using Typst and YAML" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/roaldarbol/academicv" + +[accelerated-jacow."0.1.3"] +url = "https://packages.typst.org/preview/accelerated-jacow-0.1.3.tar.gz" +hash = "sha256-rdamQ3duwAyaQNJqdZ7QdOJ22fTs5l0aSVu5Ykv78bQ=" +typstDeps = [ + "glossy_0_7_0", + "lilaq_0_1_0", + "physica_0_9_5", + "unify_0_7_1", +] +description = "Paper template for conference proceedings in accelerator physics" +license = [ + "GPL-3.0-only", + "MIT-0", +] +homepage = "https://github.com/eltos/accelerated-jacow/" + +[accelerated-jacow."0.1.2"] +url = "https://packages.typst.org/preview/accelerated-jacow-0.1.2.tar.gz" +hash = "sha256-juQdPIDbJ6goVgn4HqgHp8gw+Ztx6QBjTo24jh6P3iw=" +typstDeps = [ + "glossy_0_4_0", + "unify_0_6_0", +] +description = "Paper template for conference proceedings in accelerator physics" +license = [ + "GPL-3.0-only", + "MIT-0", +] +homepage = "https://github.com/eltos/accelerated-jacow/" + +[accelerated-jacow."0.1.1"] +url = "https://packages.typst.org/preview/accelerated-jacow-0.1.1.tar.gz" +hash = "sha256-JzoBrYHlfZJiPGL6CRfskmyP0DL/qmb2q4anWD9ZhOc=" +typstDeps = [ + "unify_0_6_0", +] +description = "Paper template for conference proceedings in accelerator physics" +license = [ + "GPL-3.0-only", + "MIT-0", +] +homepage = "https://github.com/eltos/accelerated-jacow/" + +[accelerated-jacow."0.1.0"] +url = "https://packages.typst.org/preview/accelerated-jacow-0.1.0.tar.gz" +hash = "sha256-C64cbdHGiCJjMvmSuT+o7z2/+qGNXtjc+sAia7Uq5S8=" +typstDeps = [ + "unify_0_6_0", +] +description = "Paper template for conference proceedings in accelerator physics" +license = [ + "GPL-3.0-only", + "MIT-0", +] +homepage = "https://github.com/eltos/accelerated-jacow/" + +[acrostiche."0.5.1"] +url = "https://packages.typst.org/preview/acrostiche-0.5.1.tar.gz" +hash = "sha256-Zh/Q9tMunWN6X4jU47r/c7WPafIHA/9lBtuGJSumGO8=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.5.0"] +url = "https://packages.typst.org/preview/acrostiche-0.5.0.tar.gz" +hash = "sha256-mZouqJU14WXv39afAqIjnqIehyke+h9nm0qfomBIluI=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.4.1"] +url = "https://packages.typst.org/preview/acrostiche-0.4.1.tar.gz" +hash = "sha256-g1IEOVKr/Lvd4kuG1h8uKSY0oZXN98mJFZ9bXKDbV7E=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.4.0"] +url = "https://packages.typst.org/preview/acrostiche-0.4.0.tar.gz" +hash = "sha256-c8m7W3YoD66+BcUkEDRvyOBlLarAoFGwc/Ut07raXwE=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.5"] +url = "https://packages.typst.org/preview/acrostiche-0.3.5.tar.gz" +hash = "sha256-8pKpRPaNLts5s53vVKGb4M8HEhvLMcP85i4+9uAtu4Y=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.4"] +url = "https://packages.typst.org/preview/acrostiche-0.3.4.tar.gz" +hash = "sha256-qqq69YomURNJZiP17I/N64QR5wGmRyZpNEMfA8gyE5I=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.3"] +url = "https://packages.typst.org/preview/acrostiche-0.3.3.tar.gz" +hash = "sha256-h9TG1q+ms+sZ+h4yLdYebwy2llVqy0m4h4KagXCx3eE=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.2"] +url = "https://packages.typst.org/preview/acrostiche-0.3.2.tar.gz" +hash = "sha256-ovSxtKCuN5Y2DCMPxZeYngOw+c4YwGcES5gLYog6Q0E=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.1"] +url = "https://packages.typst.org/preview/acrostiche-0.3.1.tar.gz" +hash = "sha256-OkUgSNg/NZwoAdqAVNjeLT6NGgPTnEcJorfMsX2U83A=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.0"] +url = "https://packages.typst.org/preview/acrostiche-0.3.0.tar.gz" +hash = "sha256-pRMAUavDeMDD7VIp14ACHOksMBRy1dofIk9MmJxXhcI=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.2.0"] +url = "https://packages.typst.org/preview/acrostiche-0.2.0.tar.gz" +hash = "sha256-ZMtEfY96MiyL0lnpVwqSDgSmudSpx/+ouBcFt5fboVs=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] + +[acrostiche."0.1.0"] +url = "https://packages.typst.org/preview/acrostiche-0.1.0.tar.gz" +hash = "sha256-Os6fdu9kkF3sDObR7kdNYGeegG/BT40twOd+JIMXx6Q=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] + +[acrotastic."0.1.1"] +url = "https://packages.typst.org/preview/acrotastic-0.1.1.tar.gz" +hash = "sha256-UNkf8v0Po0DQGiCzQGUzB/CrS7f8Jt8aG0EsmpwvYRU=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Julian702/typst-packages" + +[acrotastic."0.1.0"] +url = "https://packages.typst.org/preview/acrotastic-0.1.0.tar.gz" +hash = "sha256-eINTyj03/hnXWAIjClpR0tCaWkDSrW3XSOv+Un61W98=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Julian702/typst-packages" + +[adaptable-pset."0.1.1"] +url = "https://packages.typst.org/preview/adaptable-pset-0.1.1.tar.gz" +hash = "sha256-DAb7eSgVZe5gW92GB5byfOn4qUuzMOTmMotJtWjxR/c=" +typstDeps = [ + "showybox_2_0_2", +] +description = "A flexible problem set template, perfect for technical courses" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/adaptable-pset" + +[adaptable-pset."0.1.0"] +url = "https://packages.typst.org/preview/adaptable-pset-0.1.0.tar.gz" +hash = "sha256-VXFpXVc+W2Di6usqM8LZ1zlnFsDXudUEnsZ3bNiDrHg=" +typstDeps = [ + "showybox_2_0_2", +] +description = "A flexible problem set template, perfect for technical courses" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/adaptable-pset" + +[aero-check."0.1.1"] +url = "https://packages.typst.org/preview/aero-check-0.1.1.tar.gz" +hash = "sha256-rf9pPBnsXdxLW9r7iePL7VU61JP05g1m9L1Q6rsdmZQ=" +typstDeps = [] +description = "A simple template to create checklists with an aviation inspired style" +license = [ + "MIT", +] +homepage = "https://github.com/TomVer99/Typst-checklist-template" + +[aero-check."0.1.0"] +url = "https://packages.typst.org/preview/aero-check-0.1.0.tar.gz" +hash = "sha256-sdeWSE+jgnGK1hAe3EMC7iKlryzTrp4keVWtVTlQYtc=" +typstDeps = [] +description = "A simple template to create checklists with an aviation inspired style" +license = [ + "MIT", +] +homepage = "https://github.com/TomVer99/Typst-checklist-template" + +[ailab-isetbz."0.1.0"] +url = "https://packages.typst.org/preview/ailab-isetbz-0.1.0.tar.gz" +hash = "sha256-1VmymGotEYdX/RuIncMg7c61E3uC/KTgUNzFr0TWo7Q=" +typstDeps = [ + "octique_0_1_0", +] +description = "Typst template for lab reports tailored for engineering students at ISET Bizerte" +license = [ + "MIT", +] +homepage = "https://github.com/a-mhamdi/ailab-isetbz" + +[aio-studi-and-thesis."0.1.1"] +url = "https://packages.typst.org/preview/aio-studi-and-thesis-0.1.1.tar.gz" +hash = "sha256-k3w4PQ0GBP5g3WQ4mtv+M7L/S4wtcXrGEUPj7OiuZt4=" +typstDeps = [ + "codly_1_3_0", + "glossarium_0_5_4", + "linguify_0_4_2", +] +description = "All-in-one template for students and theses" +license = [ + "MIT", +] +homepage = "https://github.com/fuchs-fabian/typst-template-aio-studi-and-thesis" + +[aio-studi-and-thesis."0.1.0"] +url = "https://packages.typst.org/preview/aio-studi-and-thesis-0.1.0.tar.gz" +hash = "sha256-j7FkVDolCi+jb3y5mRKRzT3VshMs1aVV3fYVBbuNrRs=" +typstDeps = [ + "codly_1_0_0", + "glossarium_0_4_1", + "linguify_0_4_1", +] +description = "All-in-one template for students and theses" +license = [ + "MIT", +] +homepage = "https://github.com/fuchs-fabian/typst-template-aio-studi-and-thesis" + +[alchemist."0.1.5"] +url = "https://packages.typst.org/preview/alchemist-0.1.5.tar.gz" +hash = "sha256-2gwsoRkHkcKr6Skvi41yq5y53kD8vRMAyvzBS1NRWZY=" +typstDeps = [ + "cetz_0_3_4", +] +description = "A package to render skeletal formulas using CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/Typsium/alchemist" + +[alchemist."0.1.4"] +url = "https://packages.typst.org/preview/alchemist-0.1.4.tar.gz" +hash = "sha256-ZMcKmnCoVCgK3QM4UDz88RL8ng9f1boUq7Y6GbWSQqA=" +typstDeps = [ + "cetz_0_3_1", + "cetz_0_3_2", +] +description = "A package to render skeletal formulas using cetz" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/alchemist" + +[alchemist."0.1.3"] +url = "https://packages.typst.org/preview/alchemist-0.1.3.tar.gz" +hash = "sha256-5ISo43sBQUij+drAhp4SBb4KO4CDmnAVLtUf8X4ndgw=" +typstDeps = [ + "cetz_0_3_1", +] +description = "A package to render skeletal formulas using cetz" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/alchemist" + +[alchemist."0.1.2"] +url = "https://packages.typst.org/preview/alchemist-0.1.2.tar.gz" +hash = "sha256-ilt3DRxnIrl1Sa9/3HKpVmot0cWkbAgRfgRa6xrl+Uc=" +typstDeps = [ + "cetz_0_3_1", +] +description = "A package to render skeletal formulas using cetz" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/alchemist" + +[alchemist."0.1.1"] +url = "https://packages.typst.org/preview/alchemist-0.1.1.tar.gz" +hash = "sha256-/2mB7c8xBWY8qF9AX90980Gm+g370BhmwJ7zbtRniy0=" +typstDeps = [ + "cetz_0_2_2", +] +description = "A package to render skeletal formulas using cetz" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/alchemist" + +[alchemist."0.1.0"] +url = "https://packages.typst.org/preview/alchemist-0.1.0.tar.gz" +hash = "sha256-bst3ivSrzStuje2NqL7aVkKRZ8wrRTSqv0tIO4KnQb8=" +typstDeps = [ + "cetz_0_2_2", +] +description = "A package to render skeletal formulas using cetz" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/alchemist" + +[alexandria."0.2.0"] +url = "https://packages.typst.org/preview/alexandria-0.2.0.tar.gz" +hash = "sha256-N8O9v1tD6CemqbJjX8yTMK2ZGFFASLchZSEie1v2Y3w=" +typstDeps = [] +description = "Use multiple bibliographies in a single Typst document " +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-alexandria" + +[alexandria."0.1.3"] +url = "https://packages.typst.org/preview/alexandria-0.1.3.tar.gz" +hash = "sha256-gYQFCxmSzEyhAFM70sKuTJIbS81IAS6g/Qy/DSR0irs=" +typstDeps = [] +description = "Use multiple bibliographies in a single Typst document " +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-alexandria" + +[alexandria."0.1.2"] +url = "https://packages.typst.org/preview/alexandria-0.1.2.tar.gz" +hash = "sha256-5nblagG8KIJw8qL/bgW2/4Ltedv3NK6eORUqR6UQ268=" +typstDeps = [] +description = "Use multiple bibliographies in a single Typst document " +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-alexandria" + +[alexandria."0.1.1"] +url = "https://packages.typst.org/preview/alexandria-0.1.1.tar.gz" +hash = "sha256-hZtp81RmNnP1SiVue81LJsV+XHvPZxBD0Av9JmVPpnE=" +typstDeps = [] +description = "Use multiple bibliographies in a single Typst document " +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-alexandria" + +[alexandria."0.1.0"] +url = "https://packages.typst.org/preview/alexandria-0.1.0.tar.gz" +hash = "sha256-kwwZzoRvG54tLFKA7RAK7IYJYfo3qGmUYREHWds7k1g=" +typstDeps = [] +description = "Use multiple bibliographies in a single Typst document " +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-alexandria" + +[algo."0.3.6"] +url = "https://packages.typst.org/preview/algo-0.3.6.tar.gz" +hash = "sha256-n3qtUwnUdv5Xcm1FwlRRorKkhDKPFT5t3p8NMMLmb7k=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.5"] +url = "https://packages.typst.org/preview/algo-0.3.5.tar.gz" +hash = "sha256-rNhxgkz7Wh4R5BfHaLmRpLIkxIZAmIViNPD5wh5E3Kg=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.4"] +url = "https://packages.typst.org/preview/algo-0.3.4.tar.gz" +hash = "sha256-FAUfCdgE7wORCS+V7IvsUfsIzvhJxqqed4SrIyLK0uY=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.3"] +url = "https://packages.typst.org/preview/algo-0.3.3.tar.gz" +hash = "sha256-3VUCgUg/a9iMQn+Qf8lUYgAQzeTr1kUka419hoGk4sQ=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.2"] +url = "https://packages.typst.org/preview/algo-0.3.2.tar.gz" +hash = "sha256-TlGOK/i8l6loDziVoU/V00/OBvzvNQQN2Omiaodesh0=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.1"] +url = "https://packages.typst.org/preview/algo-0.3.1.tar.gz" +hash = "sha256-53EvArSUnCKZPTxBC0iOC3s+O55r5hTO24hqwwGwOUM=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.0"] +url = "https://packages.typst.org/preview/algo-0.3.0.tar.gz" +hash = "sha256-v7iLmW4LHnalEgBC7p3bguclj9kXLZoEwZ3U2efXb3Y=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algorithmic."0.1.0"] +url = "https://packages.typst.org/preview/algorithmic-0.1.0.tar.gz" +hash = "sha256-oN5Yl0cWJ5QgzdNIePdQd2hD+uFL+DWcAdPilQ+oM6U=" +typstDeps = [] +description = "Algorithm pseudocode typesetting for Typst, inspired by algorithmicx in LaTeX" +license = [ + "MIT", +] +homepage = "https://github.com/lf-/typst-algorithmic" + +[aloecius-aip."0.0.1"] +url = "https://packages.typst.org/preview/aloecius-aip-0.0.1.tar.gz" +hash = "sha256-Z2+ibMjXWOoyNgZyoBRd0KsObc0IVwZezhMz2lHg97M=" +typstDeps = [ + "cetz_0_2_2", + "physica_0_9_3", + "whalogen_0_2_0", +] +description = "Typst template for reproducing AIP - Journal of Chemical Physics paper (draft" +license = [ + "MIT", +] +homepage = "https://github.com/Raunak12775/aloecius-aip" + +[amlos."0.2.1"] +url = "https://packages.typst.org/preview/amlos-0.2.1.tar.gz" +hash = "sha256-8fo8mYIedny52OXlJ5M2ops8fTBRXOJ9auT27CWFPME=" +typstDeps = [] +description = "Amlos makes list of symbols" +license = [ + "MPL-2.0", +] +homepage = "https://github.com/uwni/Amlos" + +[amlos."0.2.0"] +url = "https://packages.typst.org/preview/amlos-0.2.0.tar.gz" +hash = "sha256-/d38oaKwHyI8iPaMFNKR8DtrlkOlYmpSASkUfh5rYnw=" +typstDeps = [] +description = "Amlos makes list of symbols" +license = [ + "MPL-2.0", +] +homepage = "https://github.com/uwni/Amlos" + +[amlos."0.1.0"] +url = "https://packages.typst.org/preview/amlos-0.1.0.tar.gz" +hash = "sha256-3VbQ6MFPCLhEwaRMSRQQxRyrSplZiH4zycHPL8cO57I=" +typstDeps = [] +description = "Amlos makes list of symbols" +license = [ + "MPL-2.0", +] + +[amsterdammetje-article."0.1.1"] +url = "https://packages.typst.org/preview/amsterdammetje-article-0.1.1.tar.gz" +hash = "sha256-q+shUXY1t9GuJOd6UaDWgqN4eDEQUZgVfpwixTWKxlg=" +typstDeps = [ + "cetz_0_3_4", + "wordometer_0_1_4", +] +description = "University of Amsterdam Computer Science article template" +license = [ + "MPL-2.0", +] +homepage = "https://github.com/qu1ncyk/amsterdammetje-article-typst" + +[amsterdammetje-article."0.1.0"] +url = "https://packages.typst.org/preview/amsterdammetje-article-0.1.0.tar.gz" +hash = "sha256-yuWd9g4lgXuIiaI4VedPdNPyzQZhav85Lul05x0KWqQ=" +typstDeps = [ + "cetz_0_3_4", + "wordometer_0_1_4", +] +description = "University of Amsterdam Computer Science article template" +license = [ + "MPL-2.0", +] +homepage = "https://github.com/qu1ncyk/amsterdammetje-article-typst" + +[anatomy."0.1.1"] +url = "https://packages.typst.org/preview/anatomy-0.1.1.tar.gz" +hash = "sha256-s9Efy1fAoZOfE+BTMe/bE8Z6J7e1+wQTwxASs7yV8cc=" +typstDeps = [] +description = "Anatomy of a Font. Visualise metrics" +license = [ + "MIT", +] + +[anatomy."0.1.0"] +url = "https://packages.typst.org/preview/anatomy-0.1.0.tar.gz" +hash = "sha256-Oz1kh1s6ozZ6OHBMiqkcBoXx8NHaMFX4hBF5bTQfjQk=" +typstDeps = [] +description = "Anatomy of a Font. Visualise metrics" +license = [ + "MIT", +] + +[ansi-render."0.8.0"] +url = "https://packages.typst.org/preview/ansi-render-0.8.0.tar.gz" +hash = "sha256-JAtWsp1lvhY+J9OIf5x+4ihEN2kcCoXg2R5HFI9r0nY=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.7.0"] +url = "https://packages.typst.org/preview/ansi-render-0.7.0.tar.gz" +hash = "sha256-TloscU5zmdvK1Mr91ZENQKtBKqBsO1OjtO+iTl0vkFw=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.6.1"] +url = "https://packages.typst.org/preview/ansi-render-0.6.1.tar.gz" +hash = "sha256-gQ4nrQfb492cN10LtfIFpRsYo+SBKLb8Uk2G5wApT0Y=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.6.0"] +url = "https://packages.typst.org/preview/ansi-render-0.6.0.tar.gz" +hash = "sha256-fLHm/ZP8uCrnmzUTrP/EipRuC71YH391pu3kpRDMEjM=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.5.1"] +url = "https://packages.typst.org/preview/ansi-render-0.5.1.tar.gz" +hash = "sha256-0SYxjhvXfOyHjRE5sWMG8uWt1DMbs+DFDY67EvEsd9o=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.5.0"] +url = "https://packages.typst.org/preview/ansi-render-0.5.0.tar.gz" +hash = "sha256-mLJ/jyCc2DTUGRc+YUpiI3/xU4Qx4GF3QpzOCNcP0Ps=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.4.2"] +url = "https://packages.typst.org/preview/ansi-render-0.4.2.tar.gz" +hash = "sha256-OYL675sQnr6PrhvOPj8Z1Fm8/FPzRBBACDcBonTlmjg=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.4.1"] +url = "https://packages.typst.org/preview/ansi-render-0.4.1.tar.gz" +hash = "sha256-4HdBgr9ao+nEzvAEmScFFdoWsTiHqutkEr6thzY0k80=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.4.0"] +url = "https://packages.typst.org/preview/ansi-render-0.4.0.tar.gz" +hash = "sha256-JyoQ2akR+CNKey0KQIHfqiwxG/5fP3LCrv66wOm6AZ8=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.3.0"] +url = "https://packages.typst.org/preview/ansi-render-0.3.0.tar.gz" +hash = "sha256-FVs/KtkDQ/zy7C9lWI4vd8FrtKPW6bY1hTt0n9X3kaM=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.2.0"] +url = "https://packages.typst.org/preview/ansi-render-0.2.0.tar.gz" +hash = "sha256-OAgUDNqXVFBiRgVMIZiTxPPaSyOYXWfkru30q5C0MqA=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.1.0"] +url = "https://packages.typst.org/preview/ansi-render-0.1.0.tar.gz" +hash = "sha256-foAzhIQPs64y+HQpuJRA5a87mXFyCrs+jMq+G/45Xtw=" +typstDeps = [] +description = "A simple way to render text with ANSI escape sequences in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi_render" + +[anti-matter."0.1.1"] +url = "https://packages.typst.org/preview/anti-matter-0.1.1.tar.gz" +hash = "sha256-VtBqori+QENdbj3irQP7nhA7dUHJDS0v6k04z0hNH3w=" +typstDeps = [ + "hydra_0_2_0", + "oxifmt_0_2_0", + "tidy_0_1_0", +] +description = "Simple page numbering of front and back matter" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/anti-matter" + +[anti-matter."0.1.0"] +url = "https://packages.typst.org/preview/anti-matter-0.1.0.tar.gz" +hash = "sha256-1xQ14oJjYdcu6J2KqD/Id/WEn4Lnccw6XpROdviBBuw=" +typstDeps = [ + "hydra_0_2_0", + "oxifmt_0_2_0", + "tidy_0_1_0", +] +description = "Simple page numbering of front and back matter" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/anti-matter" + +[anti-matter."0.0.2"] +url = "https://packages.typst.org/preview/anti-matter-0.0.2.tar.gz" +hash = "sha256-mUUXp4h1iRo2jV/KnnD/QXLzFKcnLbaJ3CzfWhpBTZA=" +typstDeps = [] +description = "Simple page numbering of front and back matter" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/typst-anti-matter" + +[anti-matter."0.0.1"] +url = "https://packages.typst.org/preview/anti-matter-0.0.1.tar.gz" +hash = "sha256-eW9yS9bi6NO+vUKL9DXAfrpGIbNJGmmq18HKTxNEwMU=" +typstDeps = [] +description = "Simple page numbering of front and back matter" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/typst-anti-matter" + +[apa7-ish."0.2.0"] +url = "https://packages.typst.org/preview/apa7-ish-0.2.0.tar.gz" +hash = "sha256-v9wA1y7hwjfF3yxwaSETM7ifymTT/HasN02vE+0dMFo=" +typstDeps = [] +description = "Typst Template that (mostly) complies with APA7 Style (Work in Progress" +license = [ + "MIT", +] +homepage = "https://github.com/mrwunderbar666/typst-apa7ish" + +[apa7-ish."0.1.0"] +url = "https://packages.typst.org/preview/apa7-ish-0.1.0.tar.gz" +hash = "sha256-5YNCD7VkJ69/3idnZsw/GAFLoxrjzU2mFkcoGa7dQ4w=" +typstDeps = [] +description = "Typst Template that (mostly) complies with APA7 Style (Work in Progress" +license = [ + "MIT", +] +homepage = "https://github.com/mrwunderbar666/typst-apa7ish" + +[ape."0.3.2"] +url = "https://packages.typst.org/preview/ape-0.3.2.tar.gz" +hash = "sha256-XY+eBfWembY260n2YHH6xS+Nv/O2Z/XQNNafOXkinmg=" +typstDeps = [ + "cetz_0_3_2", + "cetz-plot_0_1_1", +] +description = "Stop monkeying around with your layouts! Get sophisticated with Ape for Typst" +license = [ + "MIT", +] + +[ape."0.3.1"] +url = "https://packages.typst.org/preview/ape-0.3.1.tar.gz" +hash = "sha256-0xi7RR0JrATYGKnShguD4dXzStGGg6dkrxRhuwUCerE=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", +] +description = "Stop monkeying around with your layouts! Get sophisticated with Ape for Typst" +license = [ + "MIT", +] + +[ape."0.3.0"] +url = "https://packages.typst.org/preview/ape-0.3.0.tar.gz" +hash = "sha256-al4N3HPbHfAEFvLKfCYJanhsm+rzFBK7HCfN8jjcfD8=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", +] +description = "Stop monkeying around with your layouts! Get sophisticated with Ape for Typst" +license = [ + "MIT", +] + +[ape."0.2.0"] +url = "https://packages.typst.org/preview/ape-0.2.0.tar.gz" +hash = "sha256-86xONC374bMptXF8tbobMs42yWsKStD7RCIRRVbCV5Y=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", +] +description = "Stop monkeying around with your layouts! Get sophisticated with Ape for Typst" +license = [ + "MIT", +] + +[ape."0.1.0"] +url = "https://packages.typst.org/preview/ape-0.1.0.tar.gz" +hash = "sha256-9/Rdz1iL4Vw26e3JvaW6BTnyvArxZFttlsVB3deijmg=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", +] +description = "Stop monkeying around with your layouts! Get sophisticated with Ape for Typst" +license = [ + "MIT", +] + +[appreciated-letter."0.1.0"] +url = "https://packages.typst.org/preview/appreciated-letter-0.1.0.tar.gz" +hash = "sha256-iDU0x6Hvs/S21MyOTtZf0IlUXo19Kkm4ry1M48F1yUY=" +typstDeps = [] +description = "Correspond with business associates and your friends via mail" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[arborly."0.3.0"] +url = "https://packages.typst.org/preview/arborly-0.3.0.tar.gz" +hash = "sha256-/5uZL6VbHbNkof5ffFuqnzl1EALCaZ4wdxrYn+IjdSU=" +typstDeps = [ + "mantys_1_0_1", +] +description = "A library for producing beautiful syntax tree graphs" +license = [ + "MIT", +] +homepage = "https://github.com/pearcebasmanm/arborly" + +[arborly."0.2.0"] +url = "https://packages.typst.org/preview/arborly-0.2.0.tar.gz" +hash = "sha256-PotA4XfhbE8qPcPUgq4dtbwrGPnP1dT7i4bRqgj4SY4=" +typstDeps = [ + "mantys_1_0_0", +] +description = "A library for producing beautiful syntax tree graphs" +license = [ + "MIT", +] +homepage = "https://github.com/pearcebasmanm/arborly" + +[arborly."0.1.1"] +url = "https://packages.typst.org/preview/arborly-0.1.1.tar.gz" +hash = "sha256-KlOYYCAwJDxh/tL4DuhcZj+WIMI/yRggYFM01IA+Oik=" +typstDeps = [ + "mantys_1_0_0", +] +description = "A library for producing beautiful syntax tree graphs" +license = [ + "MIT", +] +homepage = "https://github.com/pearcebasmanm/arborly" + +[arborly."0.1.0"] +url = "https://packages.typst.org/preview/arborly-0.1.0.tar.gz" +hash = "sha256-RjjMMlT4bwmpUYOmMlct4R0PKgCcS/vxmNa4G0os2fw=" +typstDeps = [ + "mantys_1_0_0", +] +description = "A library for producing beautiful syntax tree graphs" +license = [ + "MIT", +] +homepage = "https://github.com/pearcebasmanm/arborly" + +[arkheion."0.1.0"] +url = "https://packages.typst.org/preview/arkheion-0.1.0.tar.gz" +hash = "sha256-6GxMbR4HDMCWsQDYWZnlcjcb5gpWtyMxReJ9BfGoCbM=" +typstDeps = [] +description = "A simple template reproducing popular arXiv templates" +license = [ + "MIT", +] +homepage = "https://github.com/mgoulao/arkheion" + +[ascii-ipa."2.0.0"] +url = "https://packages.typst.org/preview/ascii-ipa-2.0.0.tar.gz" +hash = "sha256-E/ookDGdRJh0Ac29xnNV+AJVALUW/uM7MyztcFJlKdg=" +typstDeps = [] +description = "Converter for ASCII representations of the International Phonetic Alphabet (IPA" +license = [ + "MIT", +] +homepage = "https://github.com/imatpot/typst-ascii-ipa" + +[ascii-ipa."1.1.1"] +url = "https://packages.typst.org/preview/ascii-ipa-1.1.1.tar.gz" +hash = "sha256-vrL1t4gc4Yw7smxqGmONzs7icjtduUOhbJn2pQEd1IE=" +typstDeps = [] +description = "Converter for ASCII representations of the International Phonetic Alphabet (IPA" +license = [ + "MIT", +] +homepage = "https://github.com/imatpot/typst-ascii-ipa" + +[ascii-ipa."1.1.0"] +url = "https://packages.typst.org/preview/ascii-ipa-1.1.0.tar.gz" +hash = "sha256-ME7AdjI+75c5LVATeYTXgULpQJmOx60tJXR8jypPwRw=" +typstDeps = [] +description = "Converter for ASCII representations of the International Phonetic Alphabet (IPA" +license = [ + "MIT", +] +homepage = "https://github.com/imatpot/typst-ascii-ipa" + +[ascii-ipa."1.0.0"] +url = "https://packages.typst.org/preview/ascii-ipa-1.0.0.tar.gz" +hash = "sha256-f88ysIeQS82G4849aBlbpS5MI2O1+q+JXYHgS4mCpVU=" +typstDeps = [] +description = "Converter for ASCII representations of the International Phonetic Alphabet (IPA" +license = [ + "MIT", +] +homepage = "https://github.com/imatpot/typst-ascii-ipa" + +[athena-tu-darmstadt-exercise."0.1.0"] +url = "https://packages.typst.org/preview/athena-tu-darmstadt-exercise-0.1.0.tar.gz" +hash = "sha256-xZafuXAwXLTvpJvzjeFwSCla1rJZGsBSJjNkZgIJzQY=" +typstDeps = [] +description = "Exercise template for TU Darmstadt (Technische Universität Darmstadt" +license = [ + "MIT", +] +homepage = "https://github.com/JeyRunner/tuda-typst-templates" + +[athena-tu-darmstadt-thesis."0.1.0"] +url = "https://packages.typst.org/preview/athena-tu-darmstadt-thesis-0.1.0.tar.gz" +hash = "sha256-xp2+xdOvfp4W49CAx7FAASLUMmwJ8YBx01m/zmdicO8=" +typstDeps = [ + "i-figured_0_2_3", +] +description = "Thesis template for TU Darmstadt (Technische Universität Darmstadt" +license = [ + "MIT", +] +homepage = "https://github.com/JeyRunner/tuda-typst-templates" + +[atomic."1.0.0"] +url = "https://packages.typst.org/preview/atomic-1.0.0.tar.gz" +hash = "sha256-HCigoT3cX1iZkC/2+WZl+1vIx9KKz7Uxm8k9LP121j4=" +typstDeps = [ + "cetz_0_3_2", +] +description = "Draw Atoms, their electron configurations, shells and orbitals in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/aargar1/atomic" + +[autofletcher."0.1.1"] +url = "https://packages.typst.org/preview/autofletcher-0.1.1.tar.gz" +hash = "sha256-ELyFlfYqV8unjzWmNs9FfDOifSAUYBOgt4R7ZzCQRdg=" +typstDeps = [ + "autofletcher_0_1_0", + "fletcher_0_4_3", + "fletcher_0_4_5", + "tidy_0_2_0", +] +description = "Easier diagrams with fletcher" +license = [ + "MIT", +] +homepage = "https://github.com/3akev/autofletcher" + +[autofletcher."0.1.0"] +url = "https://packages.typst.org/preview/autofletcher-0.1.0.tar.gz" +hash = "sha256-Sit9pzyCSJnZ858GorkIU3ji3bQb/RoGwb6xlMxJW7k=" +typstDeps = [ + "fletcher_0_4_3", + "tidy_0_2_0", +] +description = "Easier diagrams with fletcher" +license = [ + "MIT", +] +homepage = "https://github.com/3akev/autofletcher" + +[babble-bubbles."0.1.0"] +url = "https://packages.typst.org/preview/babble-bubbles-0.1.0.tar.gz" +hash = "sha256-orOm67ydNPmIangnUNiiHiPU6Y5ivQ4KEmCWkFdwdw0=" +typstDeps = [] +description = "A package to create callouts" +license = [ + "MIT", +] +homepage = "https://github.com/ShadowMitia/typst-babble-bubbles" + +[babel."0.1.1"] +url = "https://packages.typst.org/preview/babel-0.1.1.tar.gz" +hash = "sha256-quGTOatlxmnn5mzjvX+AcMBvYc4z4Rc/1IXjhURBJq8=" +typstDeps = [ + "fontawesome_0_4_0", + "mantys_0_1_4", + "metalogo_1_0_2", + "suiji_0_3_0", + "wrap-it_0_1_0", +] +description = "Redact text by replacing it with random characters" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/afiaith/babel" + +[backtrack."1.0.0"] +url = "https://packages.typst.org/preview/backtrack-1.0.0.tar.gz" +hash = "sha256-1r7+26JZm3w47iqKH25jfIPe4J8hqP5PLDmZzoaMm+k=" +typstDeps = [] +description = "A version-agnostic library for checking the compiler version" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/TheLukeGuy/backtrack" + +[badformer."0.1.0"] +url = "https://packages.typst.org/preview/badformer-0.1.0.tar.gz" +hash = "sha256-8UBr9Puw+5+/zyLyPZQG5Tqph5takTynIro1UT8jB6Y=" +typstDeps = [ + "cetz_0_1_2", +] +description = "Retro-gaming in Typst. Reach the goal and complete the mission" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[badgery."0.1.1"] +url = "https://packages.typst.org/preview/badgery-0.1.1.tar.gz" +hash = "sha256-JFTQJnp2uAng8rSAN7zERqj+kYze0j5YjxRYPalyDec=" +typstDeps = [] +description = "Adds styled badges, boxes and menu actions" +license = [ + "MIT", +] +homepage = "https://github.com/dogezen/badgery" + +[badgery."0.1.0"] +url = "https://packages.typst.org/preview/badgery-0.1.0.tar.gz" +hash = "sha256-efIgFA4s3Gdh8wLc9ovcmjufxSj2lRX2vszvnr1KdW0=" +typstDeps = [] +description = "Adds styled badges, boxes and menu actions" +license = [ + "MIT", +] +homepage = "https://github.com/dogezen/badgery" + +[bamdone-aiaa."0.1.2"] +url = "https://packages.typst.org/preview/bamdone-aiaa-0.1.2.tar.gz" +hash = "sha256-xamtt+nwE9up9i9I2R3ObIgdSq/HiCPfCYVM19rmq4Q=" +typstDeps = [ + "droplet_0_3_1", +] +description = "An American Institute of Aeronautics and Astronautics (AIAA) template for conferences" +license = [ + "MIT-0", +] +homepage = "https://github.com/isaacew/aiaa-typst" + +[bamdone-aiaa."0.1.1"] +url = "https://packages.typst.org/preview/bamdone-aiaa-0.1.1.tar.gz" +hash = "sha256-M7P3peIFeZcKTQmh6grRAVt4rdj8eNZfx7TOptJmvsU=" +typstDeps = [ + "bamdone-aiaa_0_1_0", + "droplet_0_2_0", +] +description = "An American Institute of Aeronautics and Astronautics (AIAA) template for conferences" +license = [ + "MIT-0", +] +homepage = "https://github.com/isaacew/aiaa-typst" + +[bamdone-aiaa."0.1.0"] +url = "https://packages.typst.org/preview/bamdone-aiaa-0.1.0.tar.gz" +hash = "sha256-U8pX27DywfWhIoqtFBzO2atEJF6b1dUyEt2aXiAIAFQ=" +typstDeps = [ + "droplet_0_2_0", +] +description = "An American Institute of Aeronautics and Astronautics (AIAA) template for conferences" +license = [ + "MIT-0", +] +homepage = "https://github.com/isaacew/aiaa-typst" + +[bamdone-ieeeconf."0.1.1"] +url = "https://packages.typst.org/preview/bamdone-ieeeconf-0.1.1.tar.gz" +hash = "sha256-X+LDenUMKXHY1F+cTomrprPA2HmP5YsD96XoApNG3uU=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[bamdone-ieeeconf."0.1.0"] +url = "https://packages.typst.org/preview/bamdone-ieeeconf-0.1.0.tar.gz" +hash = "sha256-1pMnfSDHiRONxtUiJwXTpGJwMAyeXyMoGtaArb0bFnQ=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/isaacew/bamdone-ieeeconf" + +[bamdone-rebuttal."0.1.1"] +url = "https://packages.typst.org/preview/bamdone-rebuttal-0.1.1.tar.gz" +hash = "sha256-0bLWbhrVzFBC95gE6eNeRbMjh3mYHQyXQSBE+5gecIM=" +typstDeps = [] +description = "Rebuttal/response letter template that allows authors to respond to feedback given by reviewers in a peer-review process on a point-by-point basis" +license = [ + "MIT-0", +] +homepage = "https://github.com/avonmoll/bamdone-rebuttal" + +[bamdone-rebuttal."0.1.0"] +url = "https://packages.typst.org/preview/bamdone-rebuttal-0.1.0.tar.gz" +hash = "sha256-2Y5T94C/sSWWcn+WMQfASeDLgfpkKGceRhpd+CO9f+I=" +typstDeps = [] +description = "Rebuttal/response letter template that allows authors to respond to feedback given by reviewers in a peer-review process on a point-by-point basis" +license = [ + "MIT-0", +] +homepage = "https://github.com/avonmoll/bamdone-rebuttal" + +[barcala."0.1.1"] +url = "https://packages.typst.org/preview/barcala-0.1.1.tar.gz" +hash = "sha256-CrtqR7G1X0Uert3ZILtxBn50feB6VtgyR3DoJFvDkok=" +typstDeps = [ + "fancy-units_0_1_1", + "lilaq_0_2_0", + "physica_0_9_5", + "valkyrie_0_2_2", +] +description = "A report template for UNLP students, specially for engineering" +license = [ + "MIT", +] +homepage = "https://github.com/JuanM04/barcala" + +[barcala."0.1.0"] +url = "https://packages.typst.org/preview/barcala-0.1.0.tar.gz" +hash = "sha256-DcG8bHqYciFELaKKXqS4/wOT9EwlWh/sihySjwBKV8I=" +typstDeps = [ + "valkyrie_0_2_2", +] +description = "A report template for UNLP students, specially for engineering" +license = [ + "MIT", +] +homepage = "https://github.com/JuanM04/barcala" + +[basalt-backlinks."0.1.1"] +url = "https://packages.typst.org/preview/basalt-backlinks-0.1.1.tar.gz" +hash = "sha256-ynoLsV664bY6MyJF5BXM3/tBXO28g3ZxW567MKg1SgY=" +typstDeps = [] +description = "Generate and get backlinks" +license = [ + "MIT", +] +homepage = "https://github.com/GabrielDTB/basalt-backlinks" + +[basalt-backlinks."0.1.0"] +url = "https://packages.typst.org/preview/basalt-backlinks-0.1.0.tar.gz" +hash = "sha256-Zj2opKg06Dq+PUn4B89Q3FVVL+JEIUE8G6fTEAGax70=" +typstDeps = [] +description = "Generate and get backlinks" +license = [ + "MIT", +] +homepage = "https://github.com/GabrielDTB/basalt-backlinks" + +[basalt-lib."1.0.0"] +url = "https://packages.typst.org/preview/basalt-lib-1.0.0.tar.gz" +hash = "sha256-zZg+aIQ+7lEVlRfa8Twi+lOzkgaDJ4lwUl+IY+1UyIg=" +typstDeps = [] +description = "Note taking utilities / Zettelkasten framework" +license = [ + "AGPL-3.0-only", +] +homepage = "https://github.com/GabrielDTB/basalt-lib" + +[based."0.2.0"] +url = "https://packages.typst.org/preview/based-0.2.0.tar.gz" +hash = "sha256-UNk8tieGvuGY8Ue9T7r2eCb8Sb1lEe7s4fyV6iX4KYo=" +typstDeps = [] +description = "Encoder and decoder for base64, base32, and base16" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-based" + +[based."0.1.0"] +url = "https://packages.typst.org/preview/based-0.1.0.tar.gz" +hash = "sha256-5ojwPRdiFM/5r7MN05a1rWh8NRWR7zYh+liM2wNTTS4=" +typstDeps = [] +description = "Encoder and decoder for base64, base32, and base16" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-based" + +[basic-document-props."0.1.0"] +url = "https://packages.typst.org/preview/basic-document-props-0.1.0.tar.gz" +hash = "sha256-7gHvmsHDUtFNELBPzr2bqGYh+FTk2aI98i2f6n9+SZM=" +typstDeps = [] +description = "Simple document with header, footer, page numbering and mail-adress" +license = [ + "MIT", +] +homepage = "https://github.com/Notme112/typst-packages/" + +[basic-polylux."0.1.0"] +url = "https://packages.typst.org/preview/basic-polylux-0.1.0.tar.gz" +hash = "sha256-7ZhOZgiktjdN536BmRqx5QUtZvImXHkBUNP/lvVaLwM=" +typstDeps = [ + "polylux_0_4_0", +] +description = "Starter template for Polylux" +license = [ + "Unlicense", +] +homepage = "https://github.com/polylux-typ/basic" + +[basic-report."0.2.0"] +url = "https://packages.typst.org/preview/basic-report-0.2.0.tar.gz" +hash = "sha256-WXemvfXuIw/fBgJ9adUjcbovK797F1lPXvcKLELrs00=" +typstDeps = [ + "hydra_0_6_0", +] +description = "A simple template for reports" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/basic-report-typst-template" + +[basic-report."0.1.2"] +url = "https://packages.typst.org/preview/basic-report-0.1.2.tar.gz" +hash = "sha256-1gyKqdnYu/T7bJahuonb/f8N3tc+w8k3eVLAWo4SmFs=" +typstDeps = [ + "hydra_0_6_0", +] +description = "A simple template for reports" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/basic-report-typst-template" + +[basic-report."0.1.1"] +url = "https://packages.typst.org/preview/basic-report-0.1.1.tar.gz" +hash = "sha256-kybjfPOj9fgI31fME8v36jsUYYD5deZxZUG9/MBL1sc=" +typstDeps = [ + "hydra_0_5_1", +] +description = "A simple template for reports" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/basic-report-typst-template" + +[basic-report."0.1.0"] +url = "https://packages.typst.org/preview/basic-report-0.1.0.tar.gz" +hash = "sha256-1+pvstMEer6OjfiJN0D7u4hH6w6pZS+bHcmFykNgrDA=" +typstDeps = [ + "hydra_0_5_1", +] +description = "A simple template for reports" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/basic-report-typst-template" + +[basic-resume."0.2.7"] +url = "https://packages.typst.org/preview/basic-resume-0.2.7.tar.gz" +hash = "sha256-qKv8c853nKkPEzW04MEoa4wK0/6dm0lDG6rKU+f6OpI=" +typstDeps = [ + "scienceicons_0_1_0", +] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.2.4"] +url = "https://packages.typst.org/preview/basic-resume-0.2.4.tar.gz" +hash = "sha256-5j37vf3Xa3Js6uf4z8/KldWbnxfzMz6kBlQ3gWxcw/o=" +typstDeps = [ + "scienceicons_0_0_6", +] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.2.3"] +url = "https://packages.typst.org/preview/basic-resume-0.2.3.tar.gz" +hash = "sha256-hiviO4tvUzChP+7PcGbswL5EKQ5USWCs2hdQbRIygog=" +typstDeps = [ + "scienceicons_0_0_6", +] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.2.2"] +url = "https://packages.typst.org/preview/basic-resume-0.2.2.tar.gz" +hash = "sha256-rH5FUHNt4HF+PCRkcavapTpmf+P3D5b8BnTsocswQwY=" +typstDeps = [ + "scienceicons_0_0_6", +] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.2.1"] +url = "https://packages.typst.org/preview/basic-resume-0.2.1.tar.gz" +hash = "sha256-mr/U5o2XsWwJx1/iMqDSqpgs3tv4Nci3bsDJbkNX5MY=" +typstDeps = [ + "scienceicons_0_0_6", +] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.2.0"] +url = "https://packages.typst.org/preview/basic-resume-0.2.0.tar.gz" +hash = "sha256-Wc8SSm0D4qf4s/UxSNYczdG8pyrVAmRyviYUXlakeug=" +typstDeps = [] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.1.4"] +url = "https://packages.typst.org/preview/basic-resume-0.1.4.tar.gz" +hash = "sha256-AgKKQ9hmyQGbTC6HyE8y5A0O4QFezibOLRgpXxQHbfY=" +typstDeps = [] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.1.3"] +url = "https://packages.typst.org/preview/basic-resume-0.1.3.tar.gz" +hash = "sha256-0+XSchadFrSRcFKlmQrlUVX3h/esIdsPoWkUkwIuAkM=" +typstDeps = [] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.1.2"] +url = "https://packages.typst.org/preview/basic-resume-0.1.2.tar.gz" +hash = "sha256-670UlPwj8JuCp0/DOCK/dgkTBfyzuf6dqs4phCIOK8Y=" +typstDeps = [ + "basic-resume_0_1_0", +] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.1.0"] +url = "https://packages.typst.org/preview/basic-resume-0.1.0.tar.gz" +hash = "sha256-O/a7vafRcwzB2wJCU0m69OlkU1KyS7DNLeEzLx2VEHw=" +typstDeps = [] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[biceps."0.0.1"] +url = "https://packages.typst.org/preview/biceps-0.0.1.tar.gz" +hash = "sha256-w72oSOKuw72q7hK5mF78nwRsWVnI/mAXQvFWtdp89KM=" +typstDeps = [] +description = "Layout algorithm for CSS-style flex-wrap behavior. 💪" +license = [ + "MIT", +] +homepage = "https://github.com/pikaju/typst-biceps" + +[big-rati."0.1.0"] +url = "https://packages.typst.org/preview/big-rati-0.1.0.tar.gz" +hash = "sha256-g5YmNTI6FpHbGIOkexiBXVkZOWiw2ylvhmFyNhkVE+I=" +typstDeps = [] +description = "Utilities to work with big rational numbers in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/DanikVitek/typst-plugin-bigrational" + +[big-todo."0.2.0"] +url = "https://packages.typst.org/preview/big-todo-0.2.0.tar.gz" +hash = "sha256-0EFS2Uxzvcklih6cfaw9PNl0TfvEy/wHcbQm7ruqf3g=" +typstDeps = [] +description = "Package to insert clear TODOs, optionally with an outline" +license = [ + "Unlicense", +] + +[big-todo."0.1.0"] +url = "https://packages.typst.org/preview/big-todo-0.1.0.tar.gz" +hash = "sha256-7cw1KllbTWb2OUAIFl42p8rmrHbxRAB5+qEXck6qud8=" +typstDeps = [] +description = "Package to insert clear TODOs. Optionallay with an outline" +license = [ + "Unlicense", +] + +[blind-cvpr."0.5.0"] +url = "https://packages.typst.org/preview/blind-cvpr-0.5.0.tar.gz" +hash = "sha256-TQT7Zj0n7OJVfI9btjb/IRzS/1kXzETm6QGM0B5ldwI=" +typstDeps = [] +description = "CVPR-style paper template to publish at the Computer Vision and Pattern\nRecognition (CVPR) conferences" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[blindex."0.1.0"] +url = "https://packages.typst.org/preview/blindex-0.1.0.tar.gz" +hash = "sha256-/yYkghkgeF6yTm6fVK2Qj5HEf/XDeJ2oQ7M1jIW6TDU=" +typstDeps = [] +description = "Index-making of Biblical literature citations in Typst" +license = [ + "MIT", +] + +[blinky."0.2.0"] +url = "https://packages.typst.org/preview/blinky-0.2.0.tar.gz" +hash = "sha256-R00jeUxy1y/OwiDbknFbjxnxbD0JT1MnTIkkeeQTpa0=" +typstDeps = [] +description = "Typesets paper titles in bibliographies as hyperlinks" +license = [ + "MIT", +] +homepage = "https://github.com/alexanderkoller/typst-blinky" + +[blinky."0.1.1"] +url = "https://packages.typst.org/preview/blinky-0.1.1.tar.gz" +hash = "sha256-k3tKYhqvwH2Q85Wj+S8Pb6UHSKe8FqCbnlNjuAHPG78=" +typstDeps = [] +description = "Typesets paper titles in bibliographies as hyperlinks" +license = [ + "MIT", +] +homepage = "https://github.com/alexanderkoller/typst-blinky" + +[blinky."0.1.0"] +url = "https://packages.typst.org/preview/blinky-0.1.0.tar.gz" +hash = "sha256-2sSEMYDQuvdiTyXGM9wL5oda9h+fMFUvrhMAuUCSNU0=" +typstDeps = [] +description = "Typesets paper titles in bibliographies as hyperlinks" +license = [ + "MIT", +] +homepage = "https://github.com/alexanderkoller/typst-blinky" + +[bloated-neurips."0.7.0"] +url = "https://packages.typst.org/preview/bloated-neurips-0.7.0.tar.gz" +hash = "sha256-9keS/3dURmiljmkXje5HEnrGRclAPsclMFry8IEEA54=" +typstDeps = [] +description = "NeurIPS-style paper template to publish at the Conference and Workshop on\nNeural Information Processing Systems" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[bloated-neurips."0.5.1"] +url = "https://packages.typst.org/preview/bloated-neurips-0.5.1.tar.gz" +hash = "sha256-pTfWQlVy1bs1rYDpFKxSH2ZqMGJbg4yKUUAIHv2j/+0=" +typstDeps = [] +description = "NeurIPS-style paper template to publish at the Conference and Workshop on\nNeural Information Processing Systems" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[bloated-neurips."0.5.0"] +url = "https://packages.typst.org/preview/bloated-neurips-0.5.0.tar.gz" +hash = "sha256-Q9LFcl0BDic8LFxPAU1BOrBkifPjR/ssEMb5EFMmMwE=" +typstDeps = [] +description = "NeurIPS-style paper template to publish at the Conference and Workshop on\nNeural Information Processing Systems" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[bloated-neurips."0.2.1"] +url = "https://packages.typst.org/preview/bloated-neurips-0.2.1.tar.gz" +hash = "sha256-F140Gsyh0fqzEJMKo0+au1d19bwWxHmer5LvWA9M3fI=" +typstDeps = [ + "tablex_0_0_8", +] +description = "NeurIPS-style paper template to publish at the Conference and Workshop on Neural Information Processing Systems" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[board-n-pieces."0.6.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.6.0.tar.gz" +hash = "sha256-x2qB8ydJQeyLWmbaC+GGc8+OmLqzAXTS/jI7BVTp3AE=" +typstDeps = [] +description = "Display chessboards" +license = [ + "MIT", + "GPL-2.0-only", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[board-n-pieces."0.5.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.5.0.tar.gz" +hash = "sha256-hAEH1xhOd5JIJNbxaBm6t07LCMTv7chkfCUArJCPD1I=" +typstDeps = [] +description = "Display chessboards" +license = [ + "MIT", + "GPL-2.0-only", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[board-n-pieces."0.4.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.4.0.tar.gz" +hash = "sha256-ecnWsR8245TByY861tfNFIYqWl2ZZaMpcgOIOIKdtDw=" +typstDeps = [] +description = "Display chessboards" +license = [ + "MIT", + "GPL-2.0-only", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[board-n-pieces."0.3.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.3.0.tar.gz" +hash = "sha256-A7xnWwYU9SBCC0YusEYeloMg1+LvKTGj4S2Im2CFUT4=" +typstDeps = [] +description = "Display chessboards in Typst" +license = [ + "MIT", + "GPL-2.0-only", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[board-n-pieces."0.2.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.2.0.tar.gz" +hash = "sha256-Mpck3H4PG+xaWQRKThRXzNvIUKJJsCRJbn8+nSXLjYs=" +typstDeps = [] +description = "Display chessboards in Typst" +license = [ + "MIT", + "GPL-2.0-only", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[board-n-pieces."0.1.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.1.0.tar.gz" +hash = "sha256-s9qRve872no4iYUQf7sqISZ9F5MeARHf90YBWApnCH0=" +typstDeps = [] +description = "Display chessboards in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[bob-draw."0.1.0"] +url = "https://packages.typst.org/preview/bob-draw-0.1.0.tar.gz" +hash = "sha256-cIMRYn4olOWSMeG7Y7YuF28jx0J1HJv8ZocJ8GJiygc=" +typstDeps = [] +description = "svgbob for typst, powered by wasm" +license = [ + "MIT", +] +homepage = "https://github.com/LucaCiucci/bob-typ" + +[bone-resume."0.3.0"] +url = "https://packages.typst.org/preview/bone-resume-0.3.0.tar.gz" +hash = "sha256-K7aEUrw64QqZrxgjWhpEk/bf0lpC0BJ+0uVBhfduxkk=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "A colorful resume template for chinese" +license = [ + "Apache-2.0", +] + +[bone-resume."0.2.0"] +url = "https://packages.typst.org/preview/bone-resume-0.2.0.tar.gz" +hash = "sha256-QFKP+J3kdewBeevrlGmVnY5yPcvdclCeM9zcNqYnZB8=" +typstDeps = [] +description = "A colorful resume template for chinese" +license = [ + "Apache-2.0", +] + +[bone-resume."0.1.0"] +url = "https://packages.typst.org/preview/bone-resume-0.1.0.tar.gz" +hash = "sha256-7KEayyZt2MgFKDL9uUnqyNS7IeAqfYrBsRec4bD8RSQ=" +typstDeps = [] +description = "A colorful resume template for chinese" +license = [ + "Apache-2.0", +] + +[bookletic."0.3.0"] +url = "https://packages.typst.org/preview/bookletic-0.3.0.tar.gz" +hash = "sha256-U6mNxN+NdcUFcfF+b//TTFaOotLj9xM8KpCsI4snAlw=" +typstDeps = [] +description = "Create beautiful booklets with ease" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/harrellbm/Bookletic.git" + +[bookletic."0.2.0"] +url = "https://packages.typst.org/preview/bookletic-0.2.0.tar.gz" +hash = "sha256-HeDucS52jnzXuh4e8e7JiJoHBT4sVc4L+pmViEE9mgA=" +typstDeps = [] +description = "Create beautiful booklets with ease" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/harrellbm/Bookletic.git" + +[bookletic."0.1.0"] +url = "https://packages.typst.org/preview/bookletic-0.1.0.tar.gz" +hash = "sha256-aq4JGmoZFnAIxy9+l/WC1piuPfacLiCJhFO9Hj/V2ps=" +typstDeps = [] +description = "Create beautiful booklets with ease" +license = [ + "Apache-2.0", +] + +[boxr."0.1.0"] +url = "https://packages.typst.org/preview/boxr-0.1.0.tar.gz" +hash = "sha256-7/BI8so0a2VnjP99d7FR9SiMKN2MXrcH8gPX8UvV6Gg=" +typstDeps = [] +description = "A modular, and easy to use, package for creating cardboard cutouts in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Lypsilonx/boxr" + +[brain-transplant."0.1.0"] +url = "https://packages.typst.org/preview/brain-transplant-0.1.0.tar.gz" +hash = "sha256-8kPaIV5h/xOrwMuLSyO0uFEw8mk89+GZDB8zMMZKgJg=" +typstDeps = [] +description = "Transpile Brainfuck code to Typst" +license = [ + "MIT-0", +] +homepage = "https://app.radicle.xyz/nodes/seed.radicle.garden/rad:z3bYXx6FurPtAURke7sUV8ktrtFNt" + +[brilliant-cv."2.0.5"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.5.tar.gz" +hash = "sha256-55ldsGnrsDowYYz1mxIlcLXIna8gRteDikv6K56aXDo=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/yunanwg/brilliant-CV" + +[brilliant-cv."2.0.4"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.4.tar.gz" +hash = "sha256-Pbsw/lH5VDsCbFRrlG6Yqxyp0yIkfDHr+NsPf7Df8ms=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mintyfrankie/brilliant-CV" + +[brilliant-cv."2.0.3"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.3.tar.gz" +hash = "sha256-t7jvJ5itN0YZDdP7Qpd5/vYsKxgDZsfbXlGqL8G5HDw=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mintyfrankie/brilliant-CV" + +[brilliant-cv."2.0.2"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.2.tar.gz" +hash = "sha256-bkP17C9TRbpHT5x6UOf8bUuP3wTBYnFrPgn5kpPKCwk=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mintyfrankie/brilliant-CV" + +[brilliant-cv."2.0.1"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.1.tar.gz" +hash = "sha256-bTF80A4Aaq+e8rch7SyzbtyhdbL9j6S4bkPqq1XbwKk=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mintyfrankie/brilliant-CV" + +[brilliant-cv."2.0.0"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.0.tar.gz" +hash = "sha256-xMA/JuuKdCcr6Nik8RebMYElOgoAOhUpu0h4FPgYilQ=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mintyfrankie/brilliant-CV" + +[bubble."0.2.2"] +url = "https://packages.typst.org/preview/bubble-0.2.2.tar.gz" +hash = "sha256-XbhNC2LTKnWwtV4wvlAMcVlqcnnwDWxTawI1Wr9vsTQ=" +typstDeps = [] +description = "Simple and colorful template for Typst" +license = [ + "MIT-0", +] +homepage = "https://github.com/hzkonor/bubble-template" + +[bubble."0.2.1"] +url = "https://packages.typst.org/preview/bubble-0.2.1.tar.gz" +hash = "sha256-Andpw7TqPSbX606dVtKfhCN+6D1qlSsjFyJGc26nfpw=" +typstDeps = [ + "codelst_2_0_1", +] +description = "Simple and colorful template for Typst" +license = [ + "MIT-0", +] +homepage = "https://github.com/hzkonor/bubble-template" + +[bubble."0.2.0"] +url = "https://packages.typst.org/preview/bubble-0.2.0.tar.gz" +hash = "sha256-QfQFGzNvh6EDJ02El/c2iTj745uIFdpUpQwEkNz5/UU=" +typstDeps = [ + "codelst_2_0_0", +] +description = "Simple and colorful template for Typst" +license = [ + "MIT-0", +] +homepage = "https://github.com/hzkonor/bubble-template" + +[bubble."0.1.0"] +url = "https://packages.typst.org/preview/bubble-0.1.0.tar.gz" +hash = "sha256-/LgM9GSbbRPYjuTRFN/DpucMKgit2rfWP9/5NzvnGKY=" +typstDeps = [ + "codelst_2_0_0", +] +description = "Simple and colorful template for Typst" +license = [ + "MIT-0", +] +homepage = "https://github.com/hzkonor/bubble-template" + +[bytefield."0.0.7"] +url = "https://packages.typst.org/preview/bytefield-0.0.7.tar.gz" +hash = "sha256-9DfhrwSRR/W/YC5N0IdYyh/ILP+2n+C88tWdCekWnt0=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "A package to create network protocol headers, memory map, register definitions and more" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.6"] +url = "https://packages.typst.org/preview/bytefield-0.0.6.tar.gz" +hash = "sha256-GlyGBt5J6Dtzku/0/9yN+3uvmJNpCaylDO0AF1+2B5U=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "A package to create network protocol headers, memory map, register definitions and more" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.5"] +url = "https://packages.typst.org/preview/bytefield-0.0.5.tar.gz" +hash = "sha256-f/6NwbSO/fCV2MnKFJxR5ezdrC82MVcvqXYIOz5V1Aw=" +typstDeps = [ + "oxifmt_0_2_0", + "tablex_0_0_8", +] +description = "A package to create network protocol headers, memory map, register definitions and more" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.4"] +url = "https://packages.typst.org/preview/bytefield-0.0.4.tar.gz" +hash = "sha256-09kDW0seiKYi0Na18ehhURhinpE61NaSBVQMvex0R3A=" +typstDeps = [ + "oxifmt_0_2_0", + "tablex_0_0_8", +] +description = "A package to create network protocol headers, memory map, register definitions and more" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.3"] +url = "https://packages.typst.org/preview/bytefield-0.0.3.tar.gz" +hash = "sha256-zf06BmYkdSVUQqONPwXj6mJOjcPSX9Lszr5KtkIcZhw=" +typstDeps = [ + "tablex_0_0_6", +] +description = "A package to create network protocol headers" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.2"] +url = "https://packages.typst.org/preview/bytefield-0.0.2.tar.gz" +hash = "sha256-QOlQaJ3k4fUkHKW1dN8E2npBchHbC7IPkljxKou5GzQ=" +typstDeps = [ + "tablex_0_0_4", +] +description = "A package to create network protocol headers" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.1"] +url = "https://packages.typst.org/preview/bytefield-0.0.1.tar.gz" +hash = "sha256-OOLcy7PwmB4E903HoQ27FPaGYFpIsAwnyF6jC03vREo=" +typstDeps = [ + "tablex_0_0_4", +] +description = "A package to create network protocol headers" +license = [ + "MIT", +] + +[cades."0.3.0"] +url = "https://packages.typst.org/preview/cades-0.3.0.tar.gz" +hash = "sha256-zoBTB6qqLMwGqmSGb4TalcWpUwyt1ZG/GOHy8V/pmDA=" +typstDeps = [ + "jogs_0_2_0", +] +description = "Generate QR codes in typst" +license = [ + "MIT", +] +homepage = "https://github.com/Midbin/cades" + +[cades."0.2.0"] +url = "https://packages.typst.org/preview/cades-0.2.0.tar.gz" +hash = "sha256-JdW95eiWCeydfmg4nGY5BDYFB4CSef9HMyvY2BhdiIQ=" +typstDeps = [ + "jogs_0_2_0", +] +description = "Generate QR codes in typst" +license = [ + "MIT", +] +homepage = "https://github.com/Midbin/cades" + +[caidan."0.1.0"] +url = "https://packages.typst.org/preview/caidan-0.1.0.tar.gz" +hash = "sha256-W20oZOScx7dewZw4ee854jfhabq2cn1K3+sjS1JCvnI=" +typstDeps = [] +description = "A clean and minimal food menu template" +license = [ + "MIT", +] +homepage = "https://github.com/cu1ch3n/caidan" + +[callisto."0.2.2"] +url = "https://packages.typst.org/preview/callisto-0.2.2.tar.gz" +hash = "sha256-uX1REI/dk8FlXAE7mGGOI6IuJQh73gWNd5ZOhjrd/gw=" +typstDeps = [ + "based_0_2_0", + "cmarker_0_1_3", + "mitex_0_2_5", +] +description = "Import Jupyter notebooks" +license = [ + "MIT", +] +homepage = "https://github.com/knuesel/callisto" + +[callisto."0.1.0"] +url = "https://packages.typst.org/preview/callisto-0.1.0.tar.gz" +hash = "sha256-NFM3r0abms6sKHF5YEAm2DaxaN+Wo6UcclZviMAFTdc=" +typstDeps = [ + "based_0_2_0", + "cmarker_0_1_3", + "mitex_0_2_5", +] +description = "Import Jupyter notebooks" +license = [ + "MIT", +] +homepage = "https://github.com/knuesel/callisto" + +[canonical-nthu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/canonical-nthu-thesis-0.2.0.tar.gz" +hash = "sha256-W58iv2XIWSUmMSjNzrW8fV0ZwDvaGZ4StHM3kEmMUW4=" +typstDeps = [] +description = "A template for master theses and doctoral dissertations for NTHU (National Tsing Hua University" +license = [ + "MIT", +] +homepage = "https://codeberg.org/kotatsuyaki/canonical-nthu-thesis" + +[canonical-nthu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/canonical-nthu-thesis-0.1.0.tar.gz" +hash = "sha256-R08S8+CTNOlQuRPeDhWf9wmbMiScDAi3zTwF0VhE7oA=" +typstDeps = [] +description = "A template for master theses and doctoral dissertations for NTHU (National Tsing Hua University" +license = [ + "MIT", +] +homepage = "https://codeberg.org/kotatsuyaki/canonical-nthu-thesis" + +[cartao."0.1.0"] +url = "https://packages.typst.org/preview/cartao-0.1.0.tar.gz" +hash = "sha256-x1KHuXZo1e1OX3ZjGSVwnQmjSUGeOsaq37gywsUP0wY=" +typstDeps = [] +description = "Dead simple flashcards with Typst" +license = [ + "MIT", +] + +[casson-uom-thesis."0.1.0"] +url = "https://packages.typst.org/preview/casson-uom-thesis-0.1.0.tar.gz" +hash = "sha256-MskcdQvh8V3WhwTvKkm9rRKJ5fsvn8JoJwbCjLgMaVQ=" +typstDeps = [ + "wordometer_0_1_4", +] +description = "Typst template based upon The University of Manchester Presentation of Theses Policy. Responsibility for ensuring compliance with the presentation policy remains with the candidate" +license = [ + "MIT-0", +] +homepage = "https://github.com/ALEX-CASSON-LAB/uom_phd_thesis_typst_template" + +[casual-szu-report."0.1.0"] +url = "https://packages.typst.org/preview/casual-szu-report-0.1.0.tar.gz" +hash = "sha256-LCjN8DrVfS6Gvp+RciJ4Mlf9f1udc93OFBByFf0bDQU=" +typstDeps = [] +description = "A template for SZU course reports" +license = [ + "MIT", +] +homepage = "https://github.com/jiang131072/casual-szu-report" + +[ccicons."1.0.1"] +url = "https://packages.typst.org/preview/ccicons-1.0.1.tar.gz" +hash = "sha256-A0ANuek+bbtQKOlW39RVvTonfum33Cl3KEhhlWwRwmw=" +typstDeps = [] +description = "A port of the ccicon LaTeX package for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-ccicons" + +[ccicons."1.0.0"] +url = "https://packages.typst.org/preview/ccicons-1.0.0.tar.gz" +hash = "sha256-qQBHl8+XLP4YzU3d1HL31oykP7G6F0ADX1FBlatLcck=" +typstDeps = [] +description = "A port of the ccicon LaTeX package for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-ccicons" + +[cereal-words."0.1.0"] +url = "https://packages.typst.org/preview/cereal-words-0.1.0.tar.gz" +hash = "sha256-nfAUTurQid40lvLFmAZzEbVOaCLYVzcH32nEidrMTpU=" +typstDeps = [] +description = "Time to kill? Search for words in a box of letters" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[cetz."0.3.4"] +url = "https://packages.typst.org/preview/cetz-0.3.4.tar.gz" +hash = "sha256-UvHEY4klR5Wi0Pk8DYVcfUmLsOnxEGOcjNu6B9/Nr9s=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz" + +[cetz."0.3.3"] +url = "https://packages.typst.org/preview/cetz-0.3.3.tar.gz" +hash = "sha256-F3Uyklc8haiSBHQfk9Xiq0L0NuoO8aEy7/xxoSypfuo=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz" + +[cetz."0.3.2"] +url = "https://packages.typst.org/preview/cetz-0.3.2.tar.gz" +hash = "sha256-coMtQPXnloQ7PgxEhPSmRoiUUKl55mcjgioCu0UUgnQ=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz" + +[cetz."0.3.1"] +url = "https://packages.typst.org/preview/cetz-0.3.1.tar.gz" +hash = "sha256-B2tDHVweLoNo6Iv6fX6NgVXc0upxI95RRd0DUp2/PaE=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz" + +[cetz."0.3.0"] +url = "https://packages.typst.org/preview/cetz-0.3.0.tar.gz" +hash = "sha256-7fB7i4h/869yrpFVz9JSrPBpFPFXHY9Ez7+tNeiU6rM=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz" + +[cetz."0.2.2"] +url = "https://packages.typst.org/preview/cetz-0.2.2.tar.gz" +hash = "sha256-4hjOUG21gKZ4rwJ49OJ/NlT8/2eG+EQpMe+Vb9tYbdA=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz" + +[cetz."0.2.1"] +url = "https://packages.typst.org/preview/cetz-0.2.1.tar.gz" +hash = "sha256-zwbUwa3e/ZofblYKvqy4em0B1DW3I5VeTPNQ4WywgI4=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz" + +[cetz."0.2.0"] +url = "https://packages.typst.org/preview/cetz-0.2.0.tar.gz" +hash = "sha256-BV1KgRCHSAdoTzpQc6utPMUoNr1VHBFHFoqEkUZ7KUw=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz" + +[cetz."0.1.2"] +url = "https://packages.typst.org/preview/cetz-0.1.2.tar.gz" +hash = "sha256-fDTg4Lq+uMNkPW9B8iSBALnFL4XTH62Wti3SAz0QnM8=" +typstDeps = [] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz" + +[cetz."0.1.1"] +url = "https://packages.typst.org/preview/cetz-0.1.1.tar.gz" +hash = "sha256-EFjojMkHmJXX5MpSS0jU+6kuoyRdM7q0b1J3Rn3MqAo=" +typstDeps = [ + "cetz_0_1_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/typst-canvas" + +[cetz."0.1.0"] +url = "https://packages.typst.org/preview/cetz-0.1.0.tar.gz" +hash = "sha256-HMoYoty4VR+MUmU9jQPgQg9v3CGdLttC4d56zfhzxBI=" +typstDeps = [] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/typst-canvas" + +[cetz."0.0.2"] +url = "https://packages.typst.org/preview/cetz-0.0.2.tar.gz" +hash = "sha256-W+Sa+Go1rxTFKOMmYRzv37E2jnO7evHYLS4BEKu7iBE=" +typstDeps = [] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/typst-canvas" + +[cetz."0.0.1"] +url = "https://packages.typst.org/preview/cetz-0.0.1.tar.gz" +hash = "sha256-lktrteyeK5/87rzF2B+AhgTTmDI4fNZS+pHtg0VNTxw=" +typstDeps = [] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/typst-canvas" + +[cetz-plot."0.1.1"] +url = "https://packages.typst.org/preview/cetz-plot-0.1.1.tar.gz" +hash = "sha256-Avs6kQAhaxY2OfnJgBx1Ywyo26Y+MUiE6/7aVd/12Ic=" +typstDeps = [ + "cetz_0_3_2", +] +description = "Plotting module for CeTZ" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz-plot" + +[cetz-plot."0.1.0"] +url = "https://packages.typst.org/preview/cetz-plot-0.1.0.tar.gz" +hash = "sha256-Y6oLpLh8/MDbaDNyADpJ1zT1rE68RGQ0+E1UYioYVYg=" +typstDeps = [ + "cetz_0_3_1", +] +description = "Plotting module for CeTZ" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz-plot" + +[cetz-venn."0.1.3"] +url = "https://packages.typst.org/preview/cetz-venn-0.1.3.tar.gz" +hash = "sha256-eoVVTVaKLn3qiRngQ4RYIE0yrDLawVr7KMx3NPqdfv4=" +typstDeps = [ + "cetz_0_3_2", +] +description = "CeTZ library for drawing venn diagrams for two or three sets" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz-venn" + +[cetz-venn."0.1.2"] +url = "https://packages.typst.org/preview/cetz-venn-0.1.2.tar.gz" +hash = "sha256-o9rkI/qTcRPIayNZ6X0UDTQxgPqc8s9qtRc4PAYWCqI=" +typstDeps = [ + "cetz_0_3_1", +] +description = "CeTZ library for drawing venn diagrams for two or three sets" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz-venn" + +[cetz-venn."0.1.1"] +url = "https://packages.typst.org/preview/cetz-venn-0.1.1.tar.gz" +hash = "sha256-AdStBAZrnPyea+/VNpUEmHqH0l4Sh9oVjk/omQkF9QA=" +typstDeps = [ + "cetz_0_2_2", +] +description = "CeTZ library for drawing venn diagrams for two or three sets" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz-venn" + +[cetz-venn."0.1.0"] +url = "https://packages.typst.org/preview/cetz-venn-0.1.0.tar.gz" +hash = "sha256-7qVLFa82pFHNygxo3DtUC9DKgQtp1hyvvKlefo6UQn0=" +typstDeps = [ + "cetz_0_2_1", +] +description = "CeTZ library for drawing venn diagrams for two or three sets" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz-venn" + +[charged-ieee."0.1.3"] +url = "https://packages.typst.org/preview/charged-ieee-0.1.3.tar.gz" +hash = "sha256-Ry2Xnw6YpWS9I3PzE+dj9ZRdZhtXDBLnVJKDAJY4au8=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[charged-ieee."0.1.2"] +url = "https://packages.typst.org/preview/charged-ieee-0.1.2.tar.gz" +hash = "sha256-mCaM0nH3ly/cbKGFb9rdqttV1XBij+wdAXd14QwUWjU=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[charged-ieee."0.1.1"] +url = "https://packages.typst.org/preview/charged-ieee-0.1.1.tar.gz" +hash = "sha256-bh0BxAHbb8p8MiASRRb+DJJJ+9/iRphHm9S4I12FJqg=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[charged-ieee."0.1.0"] +url = "https://packages.typst.org/preview/charged-ieee-0.1.0.tar.gz" +hash = "sha256-5omVDYmvuC7rZ20YVZUFIRTVnmLz0XHpseqbp5qqLNg=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[chatter."0.1.0"] +url = "https://packages.typst.org/preview/chatter-0.1.0.tar.gz" +hash = "sha256-WIVKpYwXsjAMF5Lc0pyPsLzo1IScpoJVV0qRr8WZNHA=" +typstDeps = [] +description = "Write dialog between any number of characters quickly and cleanly. Great for translations or short assignments" +license = [ + "MIT-0", +] +homepage = "https://github.com/sylvanfranklin/chatter" + +[cheda-seu-thesis."0.3.3"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.3.3.tar.gz" +hash = "sha256-AkY3KcLDVSODiFyCFCFbC7PiUTYyqL2j8PBvvKTFj0U=" +typstDeps = [ + "a2c-nums_0_0_1", + "codelst_2_0_2", + "cuti_0_3_0", + "i-figured_0_2_4", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.3.2"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.3.2.tar.gz" +hash = "sha256-LvDjUjYyVWiFZjjlA/TemBiHf6F86tq+euBGAGlhkrc=" +typstDeps = [ + "a2c-nums_0_0_1", + "codelst_2_0_2", + "cuti_0_3_0", + "i-figured_0_2_4", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.3.1"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.3.1.tar.gz" +hash = "sha256-vbpbI1lu87MemMucjf1tSBsMjZ8SeobIjZDSwXUD7ZQ=" +typstDeps = [ + "a2c-nums_0_0_1", + "codelst_2_0_2", + "cuti_0_3_0", + "i-figured_0_2_4", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.3.0"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.3.0.tar.gz" +hash = "sha256-mpPCAhjTcYPXEiu6UN6ALLujZZST9oLI5j4q8mwy77A=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_2_1", + "i-figured_0_2_4", + "sourcerer_0_2_1", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.2.2"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.2.2.tar.gz" +hash = "sha256-DwoLvvVlUaH6uuHfGzpDSmB+jCaQvLVlkpSlN7rOviU=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_2_1", + "sourcerer_0_2_1", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.2.1"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.2.1.tar.gz" +hash = "sha256-rrAJ4jHZh08M22nKw4bV1MFy1eJWg3KQXdGBNMNjFYM=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_2_1", + "sourcerer_0_2_1", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.2.0.tar.gz" +hash = "sha256-jX+Hf3e64ZuH4Ke3FzDDRa/9aACdZoOND8afI8Dh+XI=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_2_1", + "i-figured_0_2_4", + "sourcerer_0_2_1", + "tablex_0_0_8", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[chem-par."0.0.1"] +url = "https://packages.typst.org/preview/chem-par-0.0.1.tar.gz" +hash = "sha256-wcoZAnaDvGbhPjXFd/8kHVbHwWvMPv/YFjwc8Y7fpXI=" +typstDeps = [] +description = "Display chemical formulae and IUPAC nomenclature with ease" +license = [ + "MIT", +] +homepage = "https://github.com/JamesxX/typst-chem-par" + +[chemicoms-paper."0.1.0"] +url = "https://packages.typst.org/preview/chemicoms-paper-0.1.0.tar.gz" +hash = "sha256-7wdGjTwZm+6Sf4WyHS6Nyht519sgao6mPE8rTuta9vw=" +typstDeps = [ + "chic-hdr_0_4_0", + "fontawesome_0_1_0", + "valkyrie_0_2_0", +] +description = "An RSC-style paper template to publish at conferences and journals" +license = [ + "MIT-0", +] +homepage = "https://github.com/JamesxX/chemicoms-paper" + +[cheq."0.2.2"] +url = "https://packages.typst.org/preview/cheq-0.2.2.tar.gz" +hash = "sha256-YtoXDJaC3CdggMpuT8WeWmo+adyOag9SMrQ6P20XypI=" +typstDeps = [] +description = "Write markdown-like checklist easily" +license = [ + "MIT", +] +homepage = "https://github.com/OrangeX4/typst-cheq" + +[cheq."0.2.1"] +url = "https://packages.typst.org/preview/cheq-0.2.1.tar.gz" +hash = "sha256-ItxPDfZX0idr1tqaE7aITKvTrHktY3zNHD8McA6UYkQ=" +typstDeps = [] +description = "Write markdown-like checklist easily" +license = [ + "MIT", +] +homepage = "https://github.com/OrangeX4/typst-cheq" + +[cheq."0.2.0"] +url = "https://packages.typst.org/preview/cheq-0.2.0.tar.gz" +hash = "sha256-C7cGzmO1dOgInRqlaKdCY/AAojFHewWz/gIz3cy2ZEM=" +typstDeps = [] +description = "Write markdown-like checklist easily" +license = [ + "MIT", +] +homepage = "https://github.com/OrangeX4/typst-cheq" + +[cheq."0.1.0"] +url = "https://packages.typst.org/preview/cheq-0.1.0.tar.gz" +hash = "sha256-WyJoZEEgjukKD5I6KNjUWFBtGVs5RWUYkTR/PtZgCsE=" +typstDeps = [] +description = "Write markdown-like checklist easily" +license = [ + "MIT", +] +homepage = "https://github.com/OrangeX4/typst-cheq" + +[chic-hdr."0.5.0"] +url = "https://packages.typst.org/preview/chic-hdr-0.5.0.tar.gz" +hash = "sha256-tS5Cnu+1Lmkgzq9jklvui5vLFvlYuQg6pfEre0pf7gE=" +typstDeps = [] +description = "Typst package for creating elegant headers and footers" +license = [ + "MIT", +] +homepage = "https://github.com/Pablo-Gonzalez-Calderon/chic-header-package" + +[chic-hdr."0.4.0"] +url = "https://packages.typst.org/preview/chic-hdr-0.4.0.tar.gz" +hash = "sha256-rhdAS81nkPwQTWnmp5niPja7S9EJ6zXdPyhEsCmRMGQ=" +typstDeps = [ + "codelst_1_0_0", + "showybox_2_0_1", +] +description = "Typst package for creating elegant headers and footers" +license = [ + "MIT", +] +homepage = "https://github.com/Pablo-Gonzalez-Calderon/chic-header-package" + +[chic-hdr."0.3.0"] +url = "https://packages.typst.org/preview/chic-hdr-0.3.0.tar.gz" +hash = "sha256-zppJQ2wHID0BTZQGUhrT2er0bc4TjD8VIj9PSdmokDY=" +typstDeps = [] +description = "Typst package for creating elegant headers and footers" +license = [ + "MIT", +] +homepage = "https://github.com/Pablo-Gonzalez-Calderon/chic-header-package" + +[chic-hdr."0.2.0"] +url = "https://packages.typst.org/preview/chic-hdr-0.2.0.tar.gz" +hash = "sha256-0un0K/bOrw6h82eaeCN7MLoYrm136dnDb50DlchP44g=" +typstDeps = [] +description = "Typst package for creating elegant headers and footers" +license = [ + "MIT", +] +homepage = "https://github.com/Pablo-Gonzalez-Calderon/chic-header-package" + +[chic-hdr."0.1.0"] +url = "https://packages.typst.org/preview/chic-hdr-0.1.0.tar.gz" +hash = "sha256-jymXx4/eCazAOcc1qeXDjqJ0wC54petaXtTz2KIHIXI=" +typstDeps = [] +description = "Typst package for creating elegant headers and footers" +license = [ + "MIT", +] +homepage = "https://github.com/Pablo-Gonzalez-Calderon/chic-header-package" + +[chicv."0.1.0"] +url = "https://packages.typst.org/preview/chicv-0.1.0.tar.gz" +hash = "sha256-vBav/o7zVRFWADuw3mUXjhkQclQfwzrU6hA/92Qwp68=" +typstDeps = [] +description = "A minimal and fully-customizable CV template" +license = [ + "MIT", +] +homepage = "https://github.com/skyzh/chicv" + +[chordish."0.2.0"] +url = "https://packages.typst.org/preview/chordish-0.2.0.tar.gz" +hash = "sha256-s9uPjFDe86t68jLqTD6eXvzjmq3mAPDDkCosxVF1TPs=" +typstDeps = [ + "conchord_0_3_0", +] +description = "A simple template for creating guitar and ukulele chord sheets" +license = [ + "MIT", +] +homepage = "https://github.com/soxfox42/chordish" + +[chordish."0.1.0"] +url = "https://packages.typst.org/preview/chordish-0.1.0.tar.gz" +hash = "sha256-cFVTV04jyU5vCjwlrvskI3nbclYZWv3ctjNvyQBDeJ8=" +typstDeps = [ + "conchord_0_2_0", +] +description = "A simple template for creating guitar and ukulele chord sheets" +license = [ + "MIT", +] +homepage = "https://github.com/soxfox42/chordish" + +[chordx."0.6.0"] +url = "https://packages.typst.org/preview/chordx-0.6.0.tar.gz" +hash = "sha256-O65TggkpQmS4GkoO/SYMDSfwdF5J/NnMAGcPUoKZm2c=" +typstDeps = [] +description = "A package to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chordx."0.5.0"] +url = "https://packages.typst.org/preview/chordx-0.5.0.tar.gz" +hash = "sha256-RkCVGlJafPrr6IKbpKL73yZOtdfJNva4afwdoFvrKZM=" +typstDeps = [] +description = "A package to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chordx."0.4.0"] +url = "https://packages.typst.org/preview/chordx-0.4.0.tar.gz" +hash = "sha256-NYpCu9rRjIK7941kYHJnux444MmJjyEt9w21AOSlv0Q=" +typstDeps = [] +description = "A package to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chordx."0.3.0"] +url = "https://packages.typst.org/preview/chordx-0.3.0.tar.gz" +hash = "sha256-uQbOVMsa6dGl2iQDi3DkdxEFATgx+vCNuh0cBDwzqJ4=" +typstDeps = [] +description = "A package to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chordx."0.2.0"] +url = "https://packages.typst.org/preview/chordx-0.2.0.tar.gz" +hash = "sha256-LDe/W4RAqiW9zTfQcWVDePGNSIN9LGNN1NcIX6KxX10=" +typstDeps = [] +description = "A package to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chordx."0.1.0"] +url = "https://packages.typst.org/preview/chordx-0.1.0.tar.gz" +hash = "sha256-no3xDZiroQghV591FPQnRrCFYa5h9EG803xmVdqB/nQ=" +typstDeps = [ + "cetz_0_0_1", +] +description = "A library to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chromo."0.1.0"] +url = "https://packages.typst.org/preview/chromo-0.1.0.tar.gz" +hash = "sha256-oNDEPTHeTtnnfkhL2C0ewNLnBJJWqpWp7wyG4A+xrVM=" +typstDeps = [] +description = "Generate printer tests (likely CMYK) in typst" +license = [ + "MIT", +] +homepage = "https://github.com/julien-cpsn/typst-chromo" + +[chronos."0.2.1"] +url = "https://packages.typst.org/preview/chronos-0.2.1.tar.gz" +hash = "sha256-84RpRKxW2Vtnsrw90TR4IlQmXIf3ICnVsF3CaMLujZk=" +typstDeps = [ + "cetz_0_3_4", + "codly_1_2_0", + "codly-languages_0_1_8", + "tidy_0_4_2", +] +description = "A package to draw sequence diagrams with CeTZ" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/chronos" + +[chronos."0.2.0"] +url = "https://packages.typst.org/preview/chronos-0.2.0.tar.gz" +hash = "sha256-Mo40pqiXbuYU0TM1BaLgdC8XRK1nCctv6DQ+7x+uqJw=" +typstDeps = [ + "cetz_0_3_1", + "chronos_0_1_0", + "tidy_0_3_0", +] +description = "A package to draw sequence diagrams with CeTZ" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/chronos" + +[chronos."0.1.0"] +url = "https://packages.typst.org/preview/chronos-0.1.0.tar.gz" +hash = "sha256-qWrSOedzxmCGo9SWbl+a3mcJq6MvAIgxWVtJy/X+H/w=" +typstDeps = [ + "cetz_0_2_2", +] +description = "A package to draw sequence diagrams with CeTZ" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/chronos" + +[chuli-cv."0.1.0"] +url = "https://packages.typst.org/preview/chuli-cv-0.1.0.tar.gz" +hash = "sha256-DsawPi/T7MQbGqPXOAqyagn3Sswtqiic6mjMBpb/7CQ=" +typstDeps = [ + "cetz_0_2_2", + "fontawesome_0_1_0", +] +description = "Minimalistic and modern CV and cover letter templates" +license = [ + "MIT", +] +homepage = "https://github.com/npujol/chuli-cv" + +[cineca."0.5.0"] +url = "https://packages.typst.org/preview/cineca-0.5.0.tar.gz" +hash = "sha256-BFfN80r+0rn9HhJUTqP8ytcQxby12GHeSvtxZ8Xd5jE=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[cineca."0.4.0"] +url = "https://packages.typst.org/preview/cineca-0.4.0.tar.gz" +hash = "sha256-3jInINMVewI9RoyfrvGzTZV2rWytsvtOYkl8hR+WHJw=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[cineca."0.3.0"] +url = "https://packages.typst.org/preview/cineca-0.3.0.tar.gz" +hash = "sha256-mpuiSe3qfb/7d4kpL4M5uUUK2GunfKOa1h6jYtpqhcw=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[cineca."0.2.1"] +url = "https://packages.typst.org/preview/cineca-0.2.1.tar.gz" +hash = "sha256-kmogrKoLDMT0E65Kxo8iTjsGtJ20zu4+P0YYEYgpRpc=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[cineca."0.2.0"] +url = "https://packages.typst.org/preview/cineca-0.2.0.tar.gz" +hash = "sha256-BDIiMsATDgyrHum7ItGgH0xi5OG3fw0jZ+NNJco0NNk=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[cineca."0.1.0"] +url = "https://packages.typst.org/preview/cineca-0.1.0.tar.gz" +hash = "sha256-hfpXIeyRahvCLSNcynnerVMK4CgLuIxquABXpKrCyYU=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[circuiteria."0.2.0"] +url = "https://packages.typst.org/preview/circuiteria-0.2.0.tar.gz" +hash = "sha256-Ql3l9XV6sf94x2O6OJaedRusptFRINuNnCPF9DQDC84=" +typstDeps = [ + "cetz_0_3_2", + "tidy_0_3_0", + "tidy_0_4_1", +] +description = "Drawing block circuits with Typst made easy, using CeTZ" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/circuiteria" + +[circuiteria."0.1.0"] +url = "https://packages.typst.org/preview/circuiteria-0.1.0.tar.gz" +hash = "sha256-sMjfqvesHdjEhnC0qnuZKRiBhrk3X3j3ZENTlq+rIcM=" +typstDeps = [ + "cetz_0_2_2", + "tidy_0_3_0", +] +description = "Drawing block circuits with Typst made easy, using CeTZ" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/circuiteria" + +[citegeist."0.1.0"] +url = "https://packages.typst.org/preview/citegeist-0.1.0.tar.gz" +hash = "sha256-3tESfy/IyQSo2ubvAvm2BHwWPZQJVlJULndLjlVeSZo=" +typstDeps = [] +description = "Makes a Bibtex bibliography available as a Typst dictionary" +license = [ + "MIT", +] +homepage = "https://github.com/alexanderkoller/typst-citegeist" + +[cjk-unbreak."0.1.0"] +url = "https://packages.typst.org/preview/cjk-unbreak-0.1.0.tar.gz" +hash = "sha256-i4Rql1otEyJZW1ib987ZACP9u8fx7S8wvMlrZFvLLrI=" +typstDeps = [ + "touying_0_6_1", +] +description = "Remove spaces caused by line breaks around CJK" +license = [ + "MIT", +] +homepage = "https://github.com/KZNS/cjk-unbreak" + +[classic-aau-report."0.3.0"] +url = "https://packages.typst.org/preview/classic-aau-report-0.3.0.tar.gz" +hash = "sha256-SqWI3LPyvv5nGWeLfrMD3rLOMXer2UT2djt/iA9NlSE=" +typstDeps = [ + "glossy_0_7_0", + "headcount_0_1_0", + "hydra_0_6_0", + "subpar_0_2_1", +] +description = "A report template for students at Aalborg University (AAU" +license = [ + "MIT", +] +homepage = "https://github.com/Tinggaard/classic-aau-report" + +[classic-aau-report."0.2.1"] +url = "https://packages.typst.org/preview/classic-aau-report-0.2.1.tar.gz" +hash = "sha256-aYw7r6pzMjS0jD1zIv+aT8Lrfp0697JFRWz5Y60B3Ow=" +typstDeps = [ + "glossy_0_5_2", + "headcount_0_1_0", + "hydra_0_5_2", + "subpar_0_2_0", + "subpar_0_2_1", + "t4t_0_4_1", +] +description = "A report template for students at Aalborg University (AAU" +license = [ + "MIT", +] +homepage = "https://github.com/Tinggaard/classic-aau-report" + +[classic-aau-report."0.2.0"] +url = "https://packages.typst.org/preview/classic-aau-report-0.2.0.tar.gz" +hash = "sha256-5M8qOlbGcCh0C+EUrp9SrkT3l9vhVYW+lTVqRDzbpz0=" +typstDeps = [ + "glossy_0_5_2", + "headcount_0_1_0", + "hydra_0_5_2", + "subpar_0_2_0", + "t4t_0_4_1", +] +description = "A report template for students at Aalborg University (AAU" +license = [ + "MIT", +] +homepage = "https://github.com/Tinggaard/classic-aau-report" + +[classic-aau-report."0.1.1"] +url = "https://packages.typst.org/preview/classic-aau-report-0.1.1.tar.gz" +hash = "sha256-2snVjrAOgKP+vkwSv7HlGh7WzRw1JkJrYNawt2zBpBg=" +typstDeps = [ + "hydra_0_5_1", + "t4t_0_3_2", +] +description = "A report template for students at Aalborg University (AAU" +license = [ + "MIT", +] +homepage = "https://github.com/Tinggaard/classic-aau-report" + +[classic-aau-report."0.1.0"] +url = "https://packages.typst.org/preview/classic-aau-report-0.1.0.tar.gz" +hash = "sha256-A27tEt6573poCF92/7MqrAWvzEiNAhds6h+4v4WhJsk=" +typstDeps = [ + "hydra_0_5_1", + "t4t_0_3_2", +] +description = "An example package" +license = [ + "MIT", +] +homepage = "https://github.com/Tinggaard/classic-aau-report" + +[classic-jmlr."0.4.0"] +url = "https://packages.typst.org/preview/classic-jmlr-0.4.0.tar.gz" +hash = "sha256-ataZOhYJA0GGAzZkY4jtLt0y0X5LoziBLPMLz9UodMM=" +typstDeps = [] +description = "Paper template for submission to Journal of Machine Learning Research (JMLR" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[classy-german-invoice."0.3.1"] +url = "https://packages.typst.org/preview/classy-german-invoice-0.3.1.tar.gz" +hash = "sha256-y7DUXmWHEjlRK3YxECtgaGGVidaA88piuLNDcJg96Mo=" +typstDeps = [ + "cades_0_3_0", + "ibanator_0_1_0", +] +description = "Minimalistic invoice for germany based freelancers" +license = [ + "MIT-0", +] +homepage = "https://github.com/erictapen/typst-invoice" + +[classy-german-invoice."0.3.0"] +url = "https://packages.typst.org/preview/classy-german-invoice-0.3.0.tar.gz" +hash = "sha256-TEmN13L7pfEjeWTvyqClJgeAx38VBLV+aoUw/WLY2eQ=" +typstDeps = [ + "cades_0_3_0", + "ibanator_0_1_0", + "tablex_0_0_8", +] +description = "Minimalistic invoice for germany based freelancers" +license = [ + "MIT-0", +] +homepage = "https://github.com/erictapen/typst-invoice" + +[classy-german-invoice."0.2.0"] +url = "https://packages.typst.org/preview/classy-german-invoice-0.2.0.tar.gz" +hash = "sha256-d+6LsAHRRYGvfbH7iAARBIPueaswI6uqufrME4xaa1Y=" +typstDeps = [ + "cades_0_3_0", + "ibanator_0_1_0", + "tablex_0_0_8", +] +description = "Minimalistic invoice for germany based freelancers" +license = [ + "MIT-0", +] +homepage = "https://github.com/erictapen/typst-invoice" + +[clatter."0.1.0"] +url = "https://packages.typst.org/preview/clatter-0.1.0.tar.gz" +hash = "sha256-us5EekkEvGF6K0VS71EtjcCTGFAi+ilqM+iQJ5Icg1g=" +typstDeps = [] +description = "Just the PDF417 generator from rxing" +license = [ + "MIT", +] +homepage = "https://github.com/Gowee/typst-clatter" + +[clean-acmart."0.0.1"] +url = "https://packages.typst.org/preview/clean-acmart-0.0.1.tar.gz" +hash = "sha256-2xb7rRpMwA0FEIgZwzTUia1DoOQDU3Otc48Qc9YZe3U=" +typstDeps = [] +description = "Simple and clean Typst paper template for ACM conferences following the original acmart style" +license = [ + "MIT", +] +homepage = "https://github.com/vtta/clean-acmart" + +[clean-agh-thesis."0.1.0"] +url = "https://packages.typst.org/preview/clean-agh-thesis-0.1.0.tar.gz" +hash = "sha256-dFhLL2pFSYtizKGoKpegQppBdFsai9TQUPJWVdFOmtQ=" +typstDeps = [] +description = "AGH-compliant thesis template" +license = [ + "MIT-0", +] +homepage = "https://github.com/matisiekpl/agh-typst" + +[clean-dhbw."0.2.1"] +url = "https://packages.typst.org/preview/clean-dhbw-0.2.1.tar.gz" +hash = "sha256-JAF0qUnqAlKzVU2g8XYrRJRDX2whTeS5rq8Jfo/upk4=" +typstDeps = [ + "codelst_2_0_2", + "hydra_0_6_0", +] +description = "A Typst Template for DHBW" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/clean-dhbw-typst-template" + +[clean-dhbw."0.1.1"] +url = "https://packages.typst.org/preview/clean-dhbw-0.1.1.tar.gz" +hash = "sha256-8m19RwBBzX+WW8THNa1BCJWSF8t3B24Rv53UNlTwTBI=" +typstDeps = [ + "codelst_2_0_2", + "hydra_0_5_1", +] +description = "A Typst Template for DHBW" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/clean-dhbw-typst-template" + +[clean-dhbw."0.1.0"] +url = "https://packages.typst.org/preview/clean-dhbw-0.1.0.tar.gz" +hash = "sha256-kBcdm964UAOC/YZqVyK32vx15/vDiReHSPpg/Ceq2+c=" +typstDeps = [ + "codelst_2_0_2", + "hydra_0_5_1", +] +description = "A Typst Template for DHBW" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/clean-dhbw-typst-template" + +[clean-math-paper."0.2.0"] +url = "https://packages.typst.org/preview/clean-math-paper-0.2.0.tar.gz" +hash = "sha256-c3pc80WKoTPUmavlZ8BLg/iU89wvuwiI4d0ousSY7oM=" +typstDeps = [ + "great-theorems_0_1_2", + "i-figured_0_2_4", + "rich-counters_0_2_2", +] +description = "A simple and good looking template for mathematical papers" +license = [ + "MIT", +] +homepage = "https://github.com/JoshuaLampert/clean-math-paper" + +[clean-math-paper."0.1.1"] +url = "https://packages.typst.org/preview/clean-math-paper-0.1.1.tar.gz" +hash = "sha256-6Uur+X4J9p0vFV9OR5NTB+po0tiEg7YaNVgdcf/xQw8=" +typstDeps = [ + "great-theorems_0_1_2", + "i-figured_0_2_4", + "rich-counters_0_2_2", +] +description = "A simple and good looking template for mathematical papers" +license = [ + "MIT", +] +homepage = "https://github.com/JoshuaLampert/clean-math-paper" + +[clean-math-paper."0.1.0"] +url = "https://packages.typst.org/preview/clean-math-paper-0.1.0.tar.gz" +hash = "sha256-J4EbmU5j/TuR+IK/bXUEEIFmrwQfgYYB06q4ayT8+dI=" +typstDeps = [ + "great-theorems_0_1_1", + "i-figured_0_2_4", + "rich-counters_0_2_2", +] +description = "A simple and good looking template for mathematical papers" +license = [ + "MIT", +] +homepage = "https://github.com/JoshuaLampert/clean-math-paper" + +[clean-math-presentation."0.1.1"] +url = "https://packages.typst.org/preview/clean-math-presentation-0.1.1.tar.gz" +hash = "sha256-IW0HQxjCrEseAIkgQPD0lrwzzeoFU62rh13BIzESxH8=" +typstDeps = [ + "great-theorems_0_1_1", + "touying_0_5_5", +] +description = "A simple and good looking template for mathematical presentations" +license = [ + "MIT", +] +homepage = "https://github.com/JoshuaLampert/clean-math-presentation" + +[clean-math-presentation."0.1.0"] +url = "https://packages.typst.org/preview/clean-math-presentation-0.1.0.tar.gz" +hash = "sha256-0axOzXVqeWsS7IlQrMyHewFA1z3W+kytX77YY7DuDsk=" +typstDeps = [ + "great-theorems_0_1_1", + "touying_0_5_3", +] +description = "A simple and good looking template for mathematical presentations" +license = [ + "MIT", +] +homepage = "https://github.com/JoshuaLampert/clean-math-presentation" + +[clean-math-thesis."0.3.0"] +url = "https://packages.typst.org/preview/clean-math-thesis-0.3.0.tar.gz" +hash = "sha256-67E7/gEnO9z7lnDLqcsEysCtVtbw5VA4BXVmG/QmpvQ=" +typstDeps = [ + "equate_0_3_1", + "great-theorems_0_1_2", + "hydra_0_5_2", + "i-figured_0_2_4", + "lovelace_0_3_0", + "rich-counters_0_2_2", +] +description = "A simple and good looking template for mathematical theses" +license = [ + "MIT", +] +homepage = "https://github.com/sebaseb98/clean-math-thesis" + +[clean-math-thesis."0.2.0"] +url = "https://packages.typst.org/preview/clean-math-thesis-0.2.0.tar.gz" +hash = "sha256-so0jiG9PYQ3LY66w+C4sT33OFL2tzK1VysIePk28OMo=" +typstDeps = [ + "equate_0_2_1", + "great-theorems_0_1_1", + "hydra_0_5_1", + "i-figured_0_2_4", + "lovelace_0_3_0", + "rich-counters_0_2_2", +] +description = "A simple and good looking template for mathematical theses" +license = [ + "MIT", +] +homepage = "https://github.com/sebaseb98/clean-math-thesis" + +[clean-math-thesis."0.1.0"] +url = "https://packages.typst.org/preview/clean-math-thesis-0.1.0.tar.gz" +hash = "sha256-MgFd4jY23ypujTnuOYLuxqCZFQj4L9YWbV/WH0vtcmY=" +typstDeps = [ + "great-theorems_0_1_1", + "headcount_0_1_0", + "hydra_0_5_1", + "lovelace_0_3_0", +] +description = "A simple and good looking template for mathematical theses" +license = [ + "MIT", +] +homepage = "https://github.com/sebaseb98/clean-math-thesis" + +[clear-iclr."0.7.0"] +url = "https://packages.typst.org/preview/clear-iclr-0.7.0.tar.gz" +hash = "sha256-d5Jv1xtNJllFK6nC56jU6xmfMZa2tp2GvNwspDLxW6c=" +typstDeps = [] +description = "Paper template for submission to International Conference on Learning\nRepresentations (ICLR" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[clear-iclr."0.4.0"] +url = "https://packages.typst.org/preview/clear-iclr-0.4.0.tar.gz" +hash = "sha256-hpHIcxCB5ZE8ZJITOzUYuiFEuV/Fs2UiSVhrX86r6MQ=" +typstDeps = [] +description = "Paper template for submission to International Conference on Learning Representations (ICLR" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[cmarker."0.1.5"] +url = "https://packages.typst.org/preview/cmarker-0.1.5.tar.gz" +hash = "sha256-5Y9ucv5QfjvrHG8ZxypW88XjjjB8XWqxm5Y2pwFgQDA=" +typstDeps = [] +description = "Transpile CommonMark Markdown to Typst, from within Typst" +license = [ + "MIT", +] +homepage = "https://github.com/SabrinaJewson/cmarker.typ" + +[cmarker."0.1.4"] +url = "https://packages.typst.org/preview/cmarker-0.1.4.tar.gz" +hash = "sha256-TVbvfBOivVXn9sFMswRptRhNXasTKLy3GtDFGDOhE1A=" +typstDeps = [] +description = "Transpile CommonMark Markdown to Typst, from within Typst" +license = [ + "MIT", +] +homepage = "https://github.com/SabrinaJewson/cmarker.typ" + +[cmarker."0.1.3"] +url = "https://packages.typst.org/preview/cmarker-0.1.3.tar.gz" +hash = "sha256-0DdRW8WuX4kLZrPyWZOe7yhm77oX8IwrqrhOkbSjyKc=" +typstDeps = [] +description = "Transpile CommonMark Markdown to Typst, from within Typst" +license = [ + "MIT", +] +homepage = "https://github.com/SabrinaJewson/cmarker.typ" + +[cmarker."0.1.2"] +url = "https://packages.typst.org/preview/cmarker-0.1.2.tar.gz" +hash = "sha256-fSKjCjOr8Nr62CYu6osgimjdWVUc/9w6UULicNhElDs=" +typstDeps = [] +description = "Transpile CommonMark Markdown to Typst, from within Typst" +license = [ + "MIT", +] +homepage = "https://github.com/SabrinaJewson/cmarker.typ" + +[cmarker."0.1.1"] +url = "https://packages.typst.org/preview/cmarker-0.1.1.tar.gz" +hash = "sha256-snvSN81IPOQ7/x5Ju3l5x4oJZ08b6c/uSE9yJhijkqY=" +typstDeps = [ + "mitex_0_2_4", +] +description = "Transpile CommonMark Markdown to Typst, from within Typst" +license = [ + "MIT", +] +homepage = "https://github.com/SabrinaJewson/cmarker.typ" + +[cmarker."0.1.0"] +url = "https://packages.typst.org/preview/cmarker-0.1.0.tar.gz" +hash = "sha256-CI6suOtBN0klUN5/MUlLnmOq0gTHfOrIMTwfhXxIJHE=" +typstDeps = [] +description = "Transpile CommonMark Markdown to Typst, from within Typst" +license = [ + "MIT", +] +homepage = "https://github.com/SabrinaJewson/cmarker.typ" + +[codedis."0.1.0"] +url = "https://packages.typst.org/preview/codedis-0.1.0.tar.gz" +hash = "sha256-SWQUciVv3d7LY65zCYMq88JVnWWJsWV0WhW5wIf+UGw=" +typstDeps = [] +description = "A simple package for displaying code" +license = [ + "MIT", +] +homepage = "https://github.com/AugustinWinther/codedis" + +[codelst."2.0.2"] +url = "https://packages.typst.org/preview/codelst-2.0.2.tar.gz" +hash = "sha256-nroAmdKRY2YqxCC+/E+Ql/FxxFugPjjbOW3BwPBZLVU=" +typstDeps = [ + "showybox_2_0_1", +] +description = "A typst package to render sourcecode" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codelst" + +[codelst."2.0.1"] +url = "https://packages.typst.org/preview/codelst-2.0.1.tar.gz" +hash = "sha256-It8DLusbRfujjaOigBMGc9NAqhe4Px+xuIVgmvF7ijo=" +typstDeps = [] +description = "A typst package to render sourcecode" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codelst" + +[codelst."2.0.0"] +url = "https://packages.typst.org/preview/codelst-2.0.0.tar.gz" +hash = "sha256-TOT4hnyNWet0l8S3ndLevT8jpkz3aIxsJaWilO4c358=" +typstDeps = [] +description = "A typst package to render sourcecode" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codelst" + +[codelst."1.0.0"] +url = "https://packages.typst.org/preview/codelst-1.0.0.tar.gz" +hash = "sha256-yG817BzNcQ1FAWPInAVWXLUY6WlNTLbW+4fStUmtrHI=" +typstDeps = [] +description = "A typst package to render sourcecode" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codelst" + +[codelst."0.0.3"] +url = "https://packages.typst.org/preview/codelst-0.0.3.tar.gz" +hash = "sha256-6h5AbxkzcAWPVFqoMkJsDqNcYjVJUAw5IXMJCW3Z4uY=" +typstDeps = [] +description = "A typst package to render sourcecode" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codelst" + +[codetastic."0.2.2"] +url = "https://packages.typst.org/preview/codetastic-0.2.2.tar.gz" +hash = "sha256-I5UEcPe76Ud5gYVfaTkZBpKYgZFFnIEvyv3Qn8wqe7s=" +typstDeps = [] +description = "Generate all sorts of codes in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codetastic" + +[codetastic."0.2.0"] +url = "https://packages.typst.org/preview/codetastic-0.2.0.tar.gz" +hash = "sha256-FmY6+ZiSIzrxJWQuZa4D0dgO4KSFtBjIcJohubBwG6A=" +typstDeps = [] +description = "Generate all sorts of codes in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codetastic" + +[codetastic."0.1.0"] +url = "https://packages.typst.org/preview/codetastic-0.1.0.tar.gz" +hash = "sha256-f6yhTgLtOfY9zRgP8Gwa+LZpMU4DFTAJDlmquTAt/JA=" +typstDeps = [ + "cetz_0_1_1", +] +description = "Generate all sorts of codes in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codetastic" + +[codex-woltiensis."0.1.0"] +url = "https://packages.typst.org/preview/codex-woltiensis-0.1.0.tar.gz" +hash = "sha256-lNBYW8K+UDCKtLTkjg/WZ0AqGJEB+CKZiZpJVRJGvTE=" +typstDeps = [] +description = "Create student song books like the Codex Woltiensis. Full layout of classical songbook" +license = [ + "MIT", +] + +[codly."1.3.0"] +url = "https://packages.typst.org/preview/codly-1.3.0.tar.gz" +hash = "sha256-rbwurMz3kfF4+MJmpyjLHeW88RPclvqnGRfiTJVm5us=" +typstDeps = [ + "codly_1_2_0", +] +description = "Codly is a beautiful code presentation template with many features like smart indentation, line numbering, highlighting, etc" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."1.2.0"] +url = "https://packages.typst.org/preview/codly-1.2.0.tar.gz" +hash = "sha256-OCuNt4TV/wfZgt+7LZs3liC5KlpYO//il8yzlX3/Pqs=" +typstDeps = [] +description = "Codly is a beautiful code presentation template with many features like smart indentation, line numbering, highlighting, etc" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."1.1.1"] +url = "https://packages.typst.org/preview/codly-1.1.1.tar.gz" +hash = "sha256-GhTtNAHOqrJ6supZldy8qfygoGD/XSzl5LlQY03XCn4=" +typstDeps = [] +description = "Codly is a beautiful code presentation template with many features like smart indentation, line numbering, highlighting, etc" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."1.1.0"] +url = "https://packages.typst.org/preview/codly-1.1.0.tar.gz" +hash = "sha256-R90vm9NZ+iIDljHuSwm8kl9/sw7cZ8FjG8fsbj/aGcs=" +typstDeps = [] +description = "Codly is a beautiful code presentation template with many features like smart indentation, line numbering, highlighting, etc" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."1.0.0"] +url = "https://packages.typst.org/preview/codly-1.0.0.tar.gz" +hash = "sha256-MVNLsvkMZNKBaJol3WEjmFTK6HXKUarAimdwIkCdrqU=" +typstDeps = [] +description = "Codly is a beautiful code presentation template with many features like smart indentation, line numbering, highlighting, etc" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."0.2.1"] +url = "https://packages.typst.org/preview/codly-0.2.1.tar.gz" +hash = "sha256-6V3A8MmMzTcClGfHWgEwTIIJ5OY2ZjKXncDMZmAJZFQ=" +typstDeps = [] +description = "Codly is a beautiful code presentation template" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."0.2.0"] +url = "https://packages.typst.org/preview/codly-0.2.0.tar.gz" +hash = "sha256-AGEE/CuUnHnG0Jqr0YpkpI9cXKbGjn5FBH9Me4xyDSA=" +typstDeps = [] +description = "Codly is a beautiful code presentation template" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."0.1.0"] +url = "https://packages.typst.org/preview/codly-0.1.0.tar.gz" +hash = "sha256-qbJTEQu2fF/aUR/uNLb7H2vnfdoucPGteNY+i1OTddE=" +typstDeps = [] +description = "Codly is a beautiful code presentation template" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly-languages."0.1.8"] +url = "https://packages.typst.org/preview/codly-languages-0.1.8.tar.gz" +hash = "sha256-v+EqrNkSqqqajdKhmO1i8n+UFmgJaZ8d0a1MCxGX5Qk=" +typstDeps = [ + "codly_1_2_0", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.7"] +url = "https://packages.typst.org/preview/codly-languages-0.1.7.tar.gz" +hash = "sha256-7xtZ8q93vIvMD7ph8xhnvECgMyG+t2aSRVdZIUIGWMo=" +typstDeps = [ + "codly_1_2_0", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.6"] +url = "https://packages.typst.org/preview/codly-languages-0.1.6.tar.gz" +hash = "sha256-F0TK2Dl1YoYQFRz4rHLVSKRw+jFXkIMXeznPaGF4azU=" +typstDeps = [ + "codly_1_2_0", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.5"] +url = "https://packages.typst.org/preview/codly-languages-0.1.5.tar.gz" +hash = "sha256-idDeHyyVXJfucLoCngYBkRbrTit6dNYB4MxFCuFAmbg=" +typstDeps = [ + "codly_1_1_1", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.4"] +url = "https://packages.typst.org/preview/codly-languages-0.1.4.tar.gz" +hash = "sha256-gMChs/bl30VSTwCbq85/PvSO+z4iadZS7DiCgfjv030=" +typstDeps = [ + "codly_1_1_1", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.3"] +url = "https://packages.typst.org/preview/codly-languages-0.1.3.tar.gz" +hash = "sha256-Oj9VpvBMQ3EdnJeG0JUyAoxOr9zkDBlXAwnh/SIS/08=" +typstDeps = [ + "codly_1_1_0", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.2"] +url = "https://packages.typst.org/preview/codly-languages-0.1.2.tar.gz" +hash = "sha256-uSZq8oOtTZAHAb7ddib8p2z0JtIIqhtNXMphgUFaBBA=" +typstDeps = [ + "codly_1_0_0", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.1"] +url = "https://packages.typst.org/preview/codly-languages-0.1.1.tar.gz" +hash = "sha256-f5d+mf4m+WXDtnGlWU8cSv0e/loJdVf46pIbhzCKUHA=" +typstDeps = [] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.0"] +url = "https://packages.typst.org/preview/codly-languages-0.1.0.tar.gz" +hash = "sha256-uLEXaWv2McD3ZReaohg1DzjPEqBY3R7pWPHFtlV/1KQ=" +typstDeps = [] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[color-my-agda."0.1.0"] +url = "https://packages.typst.org/preview/color-my-agda-0.1.0.tar.gz" +hash = "sha256-szSNzxC9ffgDOPKC7t/1Ry6+8NnPkhCzGw7gOvncfKA=" +typstDeps = [] +description = "Syntax highlight for Agda on Typst" +license = [ + "AGPL-3.0-or-later", +] +homepage = "https://codeberg.org/foxy/color-my-agda" + +[colorful-boxes."1.4.2"] +url = "https://packages.typst.org/preview/colorful-boxes-1.4.2.tar.gz" +hash = "sha256-vX93MQBxkyIzL+lkR+GEEiVQqT7Bxd0RsY66KfRRnHM=" +typstDeps = [ + "showybox_2_0_3", +] +description = "Predefined colorful boxes to spice up your document" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.4.1"] +url = "https://packages.typst.org/preview/colorful-boxes-1.4.1.tar.gz" +hash = "sha256-XyNK4/et6ZTYMVK7+E/PSspw6csHW9+EQL2piAnjEAo=" +typstDeps = [ + "showybox_2_0_3", +] +description = "Predefined colorful boxes to spice up your document" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.4.0"] +url = "https://packages.typst.org/preview/colorful-boxes-1.4.0.tar.gz" +hash = "sha256-Zxl0BNtHsNgfiqMjH1SptDtklVSY4Lee6gv0Z1SBSpk=" +typstDeps = [ + "showybox_2_0_3", +] +description = "Predefined colorful boxes to spice up your document" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.3.1"] +url = "https://packages.typst.org/preview/colorful-boxes-1.3.1.tar.gz" +hash = "sha256-3MM5jphAEjcPmQm0lV86FCcEgd6l6IpdGtqLtPwiDno=" +typstDeps = [] +description = "Predefined colorful boxes to spice up your document" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.2.0"] +url = "https://packages.typst.org/preview/colorful-boxes-1.2.0.tar.gz" +hash = "sha256-b4WV6MoyAm/X+DP8I0ffqMrZmXUOUKJD96wNL7TOGYI=" +typstDeps = [ + "codetastic_0_1_0", +] +description = "Predefined colorful boxes" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.1.0"] +url = "https://packages.typst.org/preview/colorful-boxes-1.1.0.tar.gz" +hash = "sha256-nO3b//yLPuuUn1YD+BlJj8yiQ1bAjQGVoOUUJhwwrSU=" +typstDeps = [] +description = "Predefined colorful boxes" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.0.0"] +url = "https://packages.typst.org/preview/colorful-boxes-1.0.0.tar.gz" +hash = "sha256-WPdM81631SHwbrmnB55TIJgObvMDpBROXMxThID27Zs=" +typstDeps = [] +description = "Predefined colorful boxes" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[commute."0.3.0"] +url = "https://packages.typst.org/preview/commute-0.3.0.tar.gz" +hash = "sha256-HmdNs0aGWjv76Fa6HvSc6xijfKIyQx/75TT9Ui5Uo04=" +typstDeps = [] +description = "A proof of concept library for commutative diagrams" +license = [ + "MIT", +] +homepage = "https://gitlab.com/giacomogallina/commute" + +[commute."0.2.0"] +url = "https://packages.typst.org/preview/commute-0.2.0.tar.gz" +hash = "sha256-TpwdsVsig+65Z9KGMzAdcVxRZVmBNNTZug25l30hsQQ=" +typstDeps = [] +description = "A proof of concept library for commutative diagrams" +license = [ + "MIT", +] +homepage = "https://gitlab.com/giacomogallina/commute" + +[commute."0.1.0"] +url = "https://packages.typst.org/preview/commute-0.1.0.tar.gz" +hash = "sha256-jBjZ28kFBGbjXVTVlxjJM98kIwk0ws1btf4DzBSJdpc=" +typstDeps = [] +description = "A proof of concept library for commutative diagrams" +license = [ + "MIT", +] +homepage = "https://gitlab.com/giacomogallina/commute" + +[conchord."0.3.0"] +url = "https://packages.typst.org/preview/conchord-0.3.0.tar.gz" +hash = "sha256-0hBsYDHBywChgFvPj4blEYfWTEYeDIFhtOB0FW9M53c=" +typstDeps = [ + "cetz_0_3_1", + "chordx_0_5_0", +] +description = "Easily write lyrics with chords, generate chord diagrams by chord names and draw tabs" +license = [ + "MIT", +] +homepage = "https://github.com/sitandr/conchord" + +[conchord."0.2.0"] +url = "https://packages.typst.org/preview/conchord-0.2.0.tar.gz" +hash = "sha256-X/wJUqprfU6gl13lNcmJedqMcPW33bc/gGwB9ftL99s=" +typstDeps = [ + "cetz_0_2_0", + "chordx_0_2_0", +] +description = "Easily write lyrics with chords, generate chord diagrams and tabs" +license = [ + "MIT", +] +homepage = "https://github.com/sitandr/conchord" + +[conchord."0.1.1"] +url = "https://packages.typst.org/preview/conchord-0.1.1.tar.gz" +hash = "sha256-4iNh95JtAslpCLelBR1E72Iw0B2FXsDbf4p0wTY8Q2Y=" +typstDeps = [ + "cetz_0_1_1", + "chordx_0_2_0", +] +description = "Easily write lyrics with chords, generate chord diagrams and tabs" +license = [ + "MIT", +] +homepage = "https://github.com/sitandr/conchord" + +[conchord."0.1.0"] +url = "https://packages.typst.org/preview/conchord-0.1.0.tar.gz" +hash = "sha256-82ZSrqgTY9Qi6j2WrhPEVHC9prGsa5m3kDqe8Hp8HhM=" +typstDeps = [ + "cetz_0_0_1", + "chordx_0_1_0", +] +description = "Easily write lyrics with chords and generate colorful chord diagrams" +license = [ + "MIT", +] +homepage = "https://github.com/sitandr/conchord" + +[cram-snap."0.2.2"] +url = "https://packages.typst.org/preview/cram-snap-0.2.2.tar.gz" +hash = "sha256-jnIWn0RjxOFLvh0TNJ/GBDr8YJGCq7gV6RCgFw3uZJY=" +typstDeps = [] +description = "Typst template for creating cheatsheets" +license = [ + "MIT", +] +homepage = "https://github.com/kamack38/cram-snap" + +[cram-snap."0.2.1"] +url = "https://packages.typst.org/preview/cram-snap-0.2.1.tar.gz" +hash = "sha256-pBqol5HFpbX08rq/Lbq+4B0qYw/km4Lpl98nQoc+QWs=" +typstDeps = [] +description = "Typst template for creating cheatsheets" +license = [ + "MIT", +] +homepage = "https://github.com/kamack38/cram-snap" + +[cram-snap."0.2.0"] +url = "https://packages.typst.org/preview/cram-snap-0.2.0.tar.gz" +hash = "sha256-jLUE9/SFZ4MAKVnyZX7ZjCNaebFsM2+cj3ga/3qWDrI=" +typstDeps = [] +description = "Typst template for creating cheatsheets" +license = [ + "MIT", +] +homepage = "https://github.com/kamack38/cram-snap" + +[cram-snap."0.1.0"] +url = "https://packages.typst.org/preview/cram-snap-0.1.0.tar.gz" +hash = "sha256-Q02r2u92wcVl+H82ViAgvnCJ9FUxFQi6kw3y4RRTAfE=" +typstDeps = [] +description = "Typst template for creating cheatsheets" +license = [ + "MIT", +] +homepage = "https://github.com/kamack38/cram-snap" + +[crossregex."0.2.0"] +url = "https://packages.typst.org/preview/crossregex-0.2.0.tar.gz" +hash = "sha256-5kmjwcOTuNgzuPLBNIQiH8H+81zibkW4v3i7yaCMJIo=" +typstDeps = [] +description = "A crossword-like regex game written in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/QuadnucYard/crossregex-typ" + +[crossregex."0.1.0"] +url = "https://packages.typst.org/preview/crossregex-0.1.0.tar.gz" +hash = "sha256-d47bh2MHQTnTznRvnR4iTo6w8VMXMyy8HvbcJ8IrcdY=" +typstDeps = [] +description = "A crossword-like regex game written in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/QuadnucYard/crossregex-typ" + +[crudo."0.1.1"] +url = "https://packages.typst.org/preview/crudo-0.1.1.tar.gz" +hash = "sha256-9FOCJzLTJYSoQT0d0kumxQIFEMWse+aCSBi7rwI/2Ns=" +typstDeps = [] +description = "Take slices from raw blocks" +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-crudo" + +[crudo."0.1.0"] +url = "https://packages.typst.org/preview/crudo-0.1.0.tar.gz" +hash = "sha256-hXrRakGAv7tc+XKQTiwQd9bbxiyc+SOH8fjM+iftffE=" +typstDeps = [ + "codly_0_2_1", + "crudo_0_0_1", + "tidy_0_3_0", +] +description = "Take slices from raw blocks" +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-crudo" + +[ctheorems."1.1.3"] +url = "https://packages.typst.org/preview/ctheorems-1.1.3.tar.gz" +hash = "sha256-34ri4aotL6PUrtAXaPhMb3arOGVq76hijHfJMgOyeY8=" +typstDeps = [] +description = "Numbered theorem environments for typst" +license = [ + "MIT", +] +homepage = "https://github.com/sahasatvik/typst-theorems" + +[ctheorems."1.1.2"] +url = "https://packages.typst.org/preview/ctheorems-1.1.2.tar.gz" +hash = "sha256-q/v/9tZ4ak43N3AKrwYdAwlX5sFCXSFfezcMqLBwUXk=" +typstDeps = [] +description = "Numbered theorem environments for typst" +license = [ + "MIT", +] +homepage = "https://github.com/sahasatvik/typst-theorems" + +[ctheorems."1.1.1"] +url = "https://packages.typst.org/preview/ctheorems-1.1.1.tar.gz" +hash = "sha256-vejSEdNXDhIv63qxYJSFkSA5Bgsjf5ioijS9N4c6CRk=" +typstDeps = [] +description = "Numbered theorem environments for typst" +license = [ + "MIT", +] +homepage = "https://github.com/sahasatvik/typst-theorems" + +[ctheorems."1.1.0"] +url = "https://packages.typst.org/preview/ctheorems-1.1.0.tar.gz" +hash = "sha256-wr9DPKJfOSaauhgm6/+N8wtDbCVDyYx1v4zz6S7jOIY=" +typstDeps = [] +description = "Numbered theorem environments for typst" +license = [ + "MIT", +] +homepage = "https://github.com/sahasatvik/typst-theorems" + +[ctheorems."1.0.0"] +url = "https://packages.typst.org/preview/ctheorems-1.0.0.tar.gz" +hash = "sha256-O+hhyIo1YT0dsRI/vxThCP0dcxGkmiP7n9hV/FkHm2k=" +typstDeps = [] +description = "Numbered theorem environments for typst" +license = [ + "MIT", +] +homepage = "https://github.com/sahasatvik/typst-theorems" + +[ctheorems."0.1.0"] +url = "https://packages.typst.org/preview/ctheorems-0.1.0.tar.gz" +hash = "sha256-H8s5x8SHKT83w0W7fVDiajg4CY7h4AiVgZdqm6FwEFQ=" +typstDeps = [ + "ctheorems_1_0_0", +] +description = "Theorem library based on (and compatible) with the classic typst-theorem module" +license = [ + "MIT", +] +homepage = "https://github.com/DVDTSB/ctheorems" + +[ctxjs."0.3.1"] +url = "https://packages.typst.org/preview/ctxjs-0.3.1.tar.gz" +hash = "sha256-hozwjG5V7TEOouUe6JgpjEVmxSiImaTIm3M0NNVuj9E=" +typstDeps = [] +description = "Run javascript in contexts" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-ctxjs-package" + +[ctxjs."0.3.0"] +url = "https://packages.typst.org/preview/ctxjs-0.3.0.tar.gz" +hash = "sha256-6FN8Wv7ZAagTMfoMhDpYIEz/n8iMD1cerIPQ0NbG5L4=" +typstDeps = [] +description = "Run javascript in contexts" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-ctxjs-package" + +[ctxjs."0.2.0"] +url = "https://packages.typst.org/preview/ctxjs-0.2.0.tar.gz" +hash = "sha256-osHXK/USNMjEiydPi9UKCzyoFaDcB7WuJ3H9lyjsiCQ=" +typstDeps = [] +description = "Run javascript in contexts" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-ctxjs-package" + +[ctxjs."0.1.1"] +url = "https://packages.typst.org/preview/ctxjs-0.1.1.tar.gz" +hash = "sha256-ZyNpJzHRjAxHJ8kXEXQX26WbDVTdpZqAZiUokdBlfWM=" +typstDeps = [] +description = "Run javascript in contexts" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-ctxjs-package" + +[ctxjs."0.1.0"] +url = "https://packages.typst.org/preview/ctxjs-0.1.0.tar.gz" +hash = "sha256-AGljjjK3KiWiG+JG2+0cBURJncUrLIqDvGsPDqA+HwY=" +typstDeps = [] +description = "Run javascript in contexts" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-ctxjs-package" + +[cumcm-muban."0.3.0"] +url = "https://packages.typst.org/preview/cumcm-muban-0.3.0.tar.gz" +hash = "sha256-C96mN6opUM3+w4g9iQBnVCuIHROfUvTU6vt5PDSLLbQ=" +typstDeps = [ + "ctheorems_1_1_2", +] +description = "为高教社杯全国大学生数学建模竞赛设计的 Typst 模板" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/a-kkiri/CUMCM-typst-template" + +[cumcm-muban."0.2.0"] +url = "https://packages.typst.org/preview/cumcm-muban-0.2.0.tar.gz" +hash = "sha256-RVIbpT02Bj/fi3MuU7B/WrCrl1GBQWecesx+JAy8Zb4=" +typstDeps = [ + "ctheorems_1_1_2", + "cumcm-muban_0_1_0", +] +description = "为高教社杯全国大学生数学建模竞赛设计的 Typst 模板" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/a-kkiri/CUMCM-typst-template" + +[cumcm-muban."0.1.0"] +url = "https://packages.typst.org/preview/cumcm-muban-0.1.0.tar.gz" +hash = "sha256-ddvdry232tP5iSc2gZ2/HrTtSEA1dIlCi+/e2ymKACw=" +typstDeps = [ + "ctheorems_1_1_2", +] +description = "为高教社杯全国大学生数学建模竞赛设计的 Typst 模板" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/a-kkiri/CUMCM-typst-template" + +[curli."0.1.0"] +url = "https://packages.typst.org/preview/curli-0.1.0.tar.gz" +hash = "sha256-4keObGQlLWVk5gX862jIzNrUwC/ML5lKNuzsGjzcaY8=" +typstDeps = [] +description = "Cursed ligatures for everyone" +license = [ + "MIT", +] +homepage = "https://github.com/Mc-Zen/curli" + +[curriculo-acad."0.1.0"] +url = "https://packages.typst.org/preview/curriculo-acad-0.1.0.tar.gz" +hash = "sha256-P2Ab3akFYBGq+STjUdKI+hEBnU/jInjskhkKObG4c0Y=" +typstDeps = [ + "datify_0_1_3", +] +description = "Creating a CV from your LATTES entries" +license = [ + "MIT", +] +homepage = "https://github.com/philkleer/create-lattes-cv" + +[curryst."0.5.1"] +url = "https://packages.typst.org/preview/curryst-0.5.1.tar.gz" +hash = "sha256-aDSFHAGqdWYTQzUuwgVtDaprCsFsT+7zt28abBm4QDo=" +typstDeps = [] +description = "Typeset trees of inference rules" +license = [ + "MIT", +] +homepage = "https://github.com/pauladam94/curryst" + +[curryst."0.5.0"] +url = "https://packages.typst.org/preview/curryst-0.5.0.tar.gz" +hash = "sha256-WBGZ8nmCrB8iihmkjzdrA7l2U3ff3TKpvQh/XAmTE8Y=" +typstDeps = [] +description = "Typeset trees of inference rules" +license = [ + "MIT", +] +homepage = "https://github.com/pauladam94/curryst" + +[curryst."0.4.0"] +url = "https://packages.typst.org/preview/curryst-0.4.0.tar.gz" +hash = "sha256-qDh32adcbMjXJqE2s9PUtvkTXwclIuyQZcQTtkbFOKs=" +typstDeps = [] +description = "Typeset trees of inference rules" +license = [ + "MIT", +] +homepage = "https://github.com/pauladam94/curryst" + +[curryst."0.3.0"] +url = "https://packages.typst.org/preview/curryst-0.3.0.tar.gz" +hash = "sha256-jrvI1D5ZfXKyQn4vrbcNf6joMX4BSphNY0ZOUkDEClM=" +typstDeps = [] +description = "Typeset trees of inference rules" +license = [ + "MIT", +] +homepage = "https://github.com/pauladam94/curryst" + +[curryst."0.2.0"] +url = "https://packages.typst.org/preview/curryst-0.2.0.tar.gz" +hash = "sha256-l6U/J/Xud5F6QZI+iUGp0nsNtSdTT8H0KS15VwS3XgY=" +typstDeps = [] +description = "Typeset trees of inference rules" +license = [ + "MIT", +] +homepage = "https://github.com/pauladam94/curryst" + +[curryst."0.1.1"] +url = "https://packages.typst.org/preview/curryst-0.1.1.tar.gz" +hash = "sha256-shGy6b+1W497huOXAHw6eFTHbx6nSLD9b1TzsRe2rNs=" +typstDeps = [] +description = "Typesetting of trees of inference rules in Typst" +license = [ + "MIT", +] + +[curryst."0.1.0"] +url = "https://packages.typst.org/preview/curryst-0.1.0.tar.gz" +hash = "sha256-gHxYD/5KxbF7cYwQ99stjh3oWZCRIHmoyACMhyWGpv0=" +typstDeps = [] +description = "Typesetting of trees of inference rules in Typst" +license = [ + "MIT", +] + +[curvly."0.1.0"] +url = "https://packages.typst.org/preview/curvly-0.1.0.tar.gz" +hash = "sha256-jO69yZaJiTILZyKnR+iCaHzhl8CIBp2iwCC2XzIrH/g=" +typstDeps = [] +description = "Typst package for curving text on an arc or circle" +license = [ + "MIT", +] +homepage = "https://github.com/cskeeters/typst-curvly" + +[cuti."0.3.0"] +url = "https://packages.typst.org/preview/cuti-0.3.0.tar.gz" +hash = "sha256-kjQ0B3nCoPULFU7y3xcXdtry+O5utn2qszw7eiNb/QM=" +typstDeps = [] +description = "Easily simulate (fake) bold, italic and small capital characters" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/cuti" + +[cuti."0.2.1"] +url = "https://packages.typst.org/preview/cuti-0.2.1.tar.gz" +hash = "sha256-NCmPXM1eD97k/5TgVuLC7zVv/0jIQ1lXxbwnmzA2dEI=" +typstDeps = [ + "sourcerer_0_2_1", +] +description = "Easily simulate (fake) bold and italic characters" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/cuti" + +[cuti."0.2.0"] +url = "https://packages.typst.org/preview/cuti-0.2.0.tar.gz" +hash = "sha256-/2GkJVTGVy90KecQ7pkvwT6F5txgE8Ym79kxNTvvyw4=" +typstDeps = [ + "sourcerer_0_2_1", +] +description = "Easily simulate (fake) bold and italic characters" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/cuti" + +[cuti."0.1.0"] +url = "https://packages.typst.org/preview/cuti-0.1.0.tar.gz" +hash = "sha256-FZpGfKuM2cHulPheE2Ubi+u+jKAHNmKRb9bvByM60TA=" +typstDeps = [ + "sourcerer_0_2_1", +] +description = "Easily simulate (fake) bold characters" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/cuti" + +[cvssc."0.1.1"] +url = "https://packages.typst.org/preview/cvssc-0.1.1.tar.gz" +hash = "sha256-COZzBQ2MqLGKlUlXweYpkERIzC3OE4OUeKNKntQhPpg=" +typstDeps = [ + "codly_0_1_0", + "tidy_0_3_0", +] +description = "Common Vulnerability Scoring System Calculator" +license = [ + "MIT", +] + +[cvssc."0.1.0"] +url = "https://packages.typst.org/preview/cvssc-0.1.0.tar.gz" +hash = "sha256-pCeczpz4B70NefSn79TL/zFjwZG5A+W2QsYedUjvg5o=" +typstDeps = [ + "codly_0_1_0", + "tidy_0_3_0", +] +description = "Common Vulnerability Scoring System Calculator" +license = [ + "MIT", +] + +[cyberschool-errorteaplate."0.1.4"] +url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.4.tar.gz" +hash = "sha256-BHJNjdvj53BHDhvqjkSRk0bLBUzlbYazd+ZXzgj0FSo=" +typstDeps = [ + "codly_1_3_0", + "codly-languages_0_1_8", +] +description = "This is a template originaly made for the Cyberschool of Rennes, a Cybersecurity school" +license = [ + "MIT", +] +homepage = "https://github.com/ErrorTeaPot/Cyberschool_template" + +[cyberschool-errorteaplate."0.1.3"] +url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.3.tar.gz" +hash = "sha256-k/zpxcsIv47M6YPy5eNl2YVh/RicIVJH595xbzSicqY=" +typstDeps = [ + "codly_1_2_0", + "codly-languages_0_1_1", +] +description = "This is a template originaly made for the Cyberschool of Rennes, a Cybersecurity school" +license = [ + "MIT", +] +homepage = "https://github.com/ErrorTeaPot/Cyberschool_template" + +[dashing-dept-news."0.1.1"] +url = "https://packages.typst.org/preview/dashing-dept-news-0.1.1.tar.gz" +hash = "sha256-lV1llDhUz5VkUppRdrVqWHKxjcaX4BP0dtGKCDQ5hfQ=" +typstDeps = [] +description = "Share the news with bold graphic design and a modern layout" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[dashing-dept-news."0.1.0"] +url = "https://packages.typst.org/preview/dashing-dept-news-0.1.0.tar.gz" +hash = "sha256-MYvPfCYTQ6YNqbVuS5VAcnHHIk5WlucZDEWPgUy7gn0=" +typstDeps = [] +description = "Share the news with bold graphic design and a modern layout" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[dashy-todo."0.0.3"] +url = "https://packages.typst.org/preview/dashy-todo-0.0.3.tar.gz" +hash = "sha256-PijpOpLWjVAvoabzsxNk9gZVMbgLPVgFUJ2LncJqrHA=" +typstDeps = [] +description = "A method to display TODOs at the side of the page" +license = [ + "MIT-0", +] +homepage = "https://github.com/Otto-AA/dashy-todo" + +[dashy-todo."0.0.2"] +url = "https://packages.typst.org/preview/dashy-todo-0.0.2.tar.gz" +hash = "sha256-asHQ/VkGl1whCYh+QhVN1PNtzvgxoj2iUaL0JJmkmNA=" +typstDeps = [] +description = "A method to display TODOs at the side of the page" +license = [ + "MIT-0", +] +homepage = "https://github.com/Otto-AA/dashy-todo" + +[dashy-todo."0.0.1"] +url = "https://packages.typst.org/preview/dashy-todo-0.0.1.tar.gz" +hash = "sha256-AnuEVa8LWu5YnuueGtrzobNfoy5uywMpNcpq6IhXfaU=" +typstDeps = [] +description = "A method to display TODOs at the side of the page" +license = [ + "MIT-0", +] +homepage = "https://github.com/Otto-AA/dashy-todo" + +[datify."0.1.3"] +url = "https://packages.typst.org/preview/datify-0.1.3.tar.gz" +hash = "sha256-mKkhBH3GiqoQ39/LcWOCrzPqZlaT1JUbXbmCST7f9N4=" +typstDeps = [] +description = "Datify is a simple date package that allows users to format dates in new ways and addresses the issue of lacking date formats in different languages" +license = [ + "MIT", +] +homepage = "https://github.com/Jeomhps/datify" + +[datify."0.1.2"] +url = "https://packages.typst.org/preview/datify-0.1.2.tar.gz" +hash = "sha256-V2Bx0riDDMf4oWE3TbpwH6g95E/7ZeeiZB2ijVlVoWo=" +typstDeps = [] +description = "Datify is a simple date package that allows users to format dates in new ways and addresses the issue of lacking date formats in different languages" +license = [ + "MIT", +] +homepage = "https://github.com/Jeomhps/datify" + +[datify."0.1.1"] +url = "https://packages.typst.org/preview/datify-0.1.1.tar.gz" +hash = "sha256-UXiZ9Rkwx5K3byK23KRkqN1sTx9V0Cutwz6ZeaO3D/A=" +typstDeps = [] +description = "Datify is a simple date package that allows users to format dates in new ways and addresses the issue of lacking date formats in different languages" +license = [ + "MIT", +] +homepage = "https://github.com/Jeomhps/datify" + +[decasify."0.10.1"] +url = "https://packages.typst.org/preview/decasify-0.10.1.tar.gz" +hash = "sha256-qW5gjrNSaK8xU9JIs1NxE2Bj1yB7g1WyHTR1bc3FlR0=" +typstDeps = [] +description = "Locale and style-guide aware text casing functions for natural language prose" +license = [ + "LGPL-3.0-only", +] +homepage = "https://github.com/alerque/decasify" + +[decasify."0.9.1"] +url = "https://packages.typst.org/preview/decasify-0.9.1.tar.gz" +hash = "sha256-mBbWqrusIThZ5aQdoPeftUyoIJYD2ygZz8Y1kk3nNX0=" +typstDeps = [] +description = "Locale and style-guide aware text casing functions for natural language prose" +license = [ + "LGPL-3.0-only", +] +homepage = "https://github.com/alerque/decasify" + +[decasify."0.9.0"] +url = "https://packages.typst.org/preview/decasify-0.9.0.tar.gz" +hash = "sha256-Kyv7YP2PSIrvmHE8aOiYsvF611806ijVQ4Iw9yteOfQ=" +typstDeps = [] +description = "Locale and style-guide aware text casing functions for natural language prose" +license = [ + "LGPL-3.0-only", +] +homepage = "https://github.com/alerque/decasify" + +[defined."0.1.0"] +url = "https://packages.typst.org/preview/defined-0.1.0.tar.gz" +hash = "sha256-4ON8im4nwdi8cydBmnwYRY7d8Qovu+X2+63G+Z8aEH4=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "typst package to make conditional compilation easily" +license = [ + "Unlicense", +] +homepage = "https://github.com/profetia/defined" + +[definitely-not-isec-thesis."2.0.1"] +url = "https://packages.typst.org/preview/definitely-not-isec-thesis-2.0.1.tar.gz" +hash = "sha256-5mxFjH8gF1biPwEclEdRpMgth8FHBcrJWauc3PCYmIo=" +typstDeps = [ + "definitely-not-isec-thesis_2_0_0", +] +description = "An unofficial ISEC TUGraz Master's Thesis template" +license = [ + "MIT", +] +homepage = "https://github.com/ecomaikgolf/typst-isec-master-thesis-template/" + +[definitely-not-isec-thesis."2.0.0"] +url = "https://packages.typst.org/preview/definitely-not-isec-thesis-2.0.0.tar.gz" +hash = "sha256-VTdCWyOS5RCXQ0hQq+QPsn8T9vzDGv8dWLajNz89UT8=" +typstDeps = [] +description = "An unofficial ISEC TUGraz Master's Thesis template" +license = [ + "MIT", +] +homepage = "https://github.com/ecomaikgolf/typst-isec-master-thesis-template/" + +[definitely-not-isec-thesis."1.0.0"] +url = "https://packages.typst.org/preview/definitely-not-isec-thesis-1.0.0.tar.gz" +hash = "sha256-aLaXo2JxW+fNLh3cGXZeGADf4Sw4rNslGn9FphVcDE8=" +typstDeps = [] +description = "An unofficial ISEC TUGraz Master's Thesis template" +license = [ + "MIT", +] +homepage = "https://github.com/ecomaikgolf/typst-isec-master-thesis-template/" + +[definitely-not-tuw-thesis."0.1.0"] +url = "https://packages.typst.org/preview/definitely-not-tuw-thesis-0.1.0.tar.gz" +hash = "sha256-cVvHDgg9H95Npk91WMyWNKoXKO+zydRDKQkyx4nSmtM=" +typstDeps = [ + "linguify_0_4_1", +] +description = "An unofficial template for a thesis at the TU Wien informatics institute" +license = [ + "MIT-0", +] +homepage = "https://github.com/Otto-AA/definitely-not-tuw-thesis" + +[delegis."0.3.0"] +url = "https://packages.typst.org/preview/delegis-0.3.0.tar.gz" +hash = "sha256-NoMAAYxznL32LJ8dBsfSnCeM/huXx9HiL50DP7zoVbY=" +typstDeps = [] +description = "A package and template for drafting legislative content in a German-style structuring, such as for bylaws, etc" +license = [ + "MIT", +] +homepage = "https://github.com/wuespace/delegis" + +[delegis."0.2.0"] +url = "https://packages.typst.org/preview/delegis-0.2.0.tar.gz" +hash = "sha256-s2GQ6y5IJj9GG1UktRIH94Q3r5XnLIdxNbUXBgsNqTo=" +typstDeps = [] +description = "A package and template for drafting legislative content in a German-style structuring, such as for bylaws, etc" +license = [ + "MIT", +] +homepage = "https://github.com/wuespace/delegis" + +[delegis."0.1.0"] +url = "https://packages.typst.org/preview/delegis-0.1.0.tar.gz" +hash = "sha256-X1XB0CMtKRNS6jaQDgi9fORxunu9FMcQU4D5Ae4Zu4g=" +typstDeps = [] +description = "A package and template for drafting legislative content in a German-style structuring, such as for bylaws, etc" +license = [ + "MIT", +] +homepage = "https://github.com/wuespace/delegis" + +[delimitizer."0.1.0"] +url = "https://packages.typst.org/preview/delimitizer-0.1.0.tar.gz" +hash = "sha256-E5NK6h/dfel5QAtoyaXVD4SCN8+xzfQ2MOxFZQcgl6M=" +typstDeps = [] +description = "Customize the size of delimiters. Like \\big, \\Big, \\bigg, \\Bigg in LaTeX" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/delimitizer" + +[derive-it."0.1.3"] +url = "https://packages.typst.org/preview/derive-it-0.1.3.tar.gz" +hash = "sha256-HLNiQYeh55Kh1Kz5H/+/8LTAEG24zkI6XdAT/41Pw18=" +typstDeps = [] +description = "Simple functions for creating fitch-style natural deduction proofs and derivations" +license = [ + "MIT", +] +homepage = "https://github.com/0rphee/derive-it" + +[derive-it."0.1.2"] +url = "https://packages.typst.org/preview/derive-it-0.1.2.tar.gz" +hash = "sha256-S6S+PX4pUmSITXgfxaTkew1OivfWB9gGAIchkLxqyaw=" +typstDeps = [] +description = "Simple functions for creating fitch-style natural deduction proofs and derivations" +license = [ + "MIT", +] +homepage = "https://github.com/0rphee/derive-it" + +[derive-it."0.1.1"] +url = "https://packages.typst.org/preview/derive-it-0.1.1.tar.gz" +hash = "sha256-JkXZ5QLNR6+8pYyg9jSZiSJU9wC0Ia1x7pnAa/CohcM=" +typstDeps = [] +description = "Simple functions for creating fitch-style natural deduction proofs and derivations" +license = [ + "MIT", +] +homepage = "https://github.com/0rphee/derive-it" + +[derive-it."0.1.0"] +url = "https://packages.typst.org/preview/derive-it-0.1.0.tar.gz" +hash = "sha256-dw9BYHBb0mMx9WFzxiKHEWI2omaPs2Jxdye/1pIMc10=" +typstDeps = [] +description = "Simple functions for creating fitch-style natural deduction proofs and derivations" +license = [ + "MIT", +] +homepage = "https://github.com/0rphee/derive-it" + +[diagraph."0.3.3"] +url = "https://packages.typst.org/preview/diagraph-0.3.3.tar.gz" +hash = "sha256-RwNjmzaTCjMmBMeSd8WPRIQu44IkN+cYW27P18tqN+4=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.3.2"] +url = "https://packages.typst.org/preview/diagraph-0.3.2.tar.gz" +hash = "sha256-mr8/KrrmEZ0Yk53iqs6Y4UwEhkdExx1KptN8gMldf/Q=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.3.1"] +url = "https://packages.typst.org/preview/diagraph-0.3.1.tar.gz" +hash = "sha256-H693ABKs58NxzEIkf7rTzf4UImTyXxVpk8EeJe8V4yw=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.3.0"] +url = "https://packages.typst.org/preview/diagraph-0.3.0.tar.gz" +hash = "sha256-2qQ0yItPQnKFmR/x3FMadQIsPJD4MyLpdb1XQIJvrE4=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.5"] +url = "https://packages.typst.org/preview/diagraph-0.2.5.tar.gz" +hash = "sha256-UTmOsFHJDsgqbcKKez5OFI4P8MQ7OWDwCrhRK1zRO4Y=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.4"] +url = "https://packages.typst.org/preview/diagraph-0.2.4.tar.gz" +hash = "sha256-2yhWqdq8pw9nBaVMm+yzMjY2JY2iNwdAllrElDQvCig=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.3"] +url = "https://packages.typst.org/preview/diagraph-0.2.3.tar.gz" +hash = "sha256-ESNyD7o2QfhgYwNITd0Gvc+Zhm88jANPSCgUVQTKzy0=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.2"] +url = "https://packages.typst.org/preview/diagraph-0.2.2.tar.gz" +hash = "sha256-4kGjMzj8lPG7GLVgKZiKH9lSMWfRwg9bJFxMDstw7r8=" +typstDeps = [] +description = "Graphviz bindings for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.1"] +url = "https://packages.typst.org/preview/diagraph-0.2.1.tar.gz" +hash = "sha256-FdoNdv3k/EmVCafUtzJAWeJffV5Usab/8gMj0CcLhRg=" +typstDeps = [] +description = "Graphviz bindings for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.0"] +url = "https://packages.typst.org/preview/diagraph-0.2.0.tar.gz" +hash = "sha256-p/rTvdqrAHwbLpfhMsPkehWINO0FUk2kJFGJJTvRQjQ=" +typstDeps = [] +description = "Graphviz bindings for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.1.2"] +url = "https://packages.typst.org/preview/diagraph-0.1.2.tar.gz" +hash = "sha256-p+aiPsnfo+lK1R+K8wpASCGffseqI662B4ACv03oco0=" +typstDeps = [] +description = "Graphviz bindings for typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.1.1"] +url = "https://packages.typst.org/preview/diagraph-0.1.1.tar.gz" +hash = "sha256-ngeZ+sxcJA/bYiHwzH0VAcm+27xNV4ig5kUIRlCESSc=" +typstDeps = [] +description = "Graphviz bindings for typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.1.0"] +url = "https://packages.typst.org/preview/diagraph-0.1.0.tar.gz" +hash = "sha256-rAxw3J4azB+uFIrwXSkU8Skqw0rAOdxRFMdn+lg3Dx4=" +typstDeps = [] +description = "Graphviz bindings for typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diatypst."0.5.0"] +url = "https://packages.typst.org/preview/diatypst-0.5.0.tar.gz" +hash = "sha256-OVbxSP8JMJAZXlVi+Sky5S7o66nImHPXW7/lDn0qVwk=" +typstDeps = [ + "diatypst_0_2_0", +] +description = "easy slides in typst - sensible defaults, easy syntax, well styled" +license = [ + "MIT-0", +] +homepage = "https://github.com/skriptum/Diatypst" + +[diatypst."0.4.0"] +url = "https://packages.typst.org/preview/diatypst-0.4.0.tar.gz" +hash = "sha256-EpSSFapDSHOZsAqNSpZCpRtwpGtaaSIcSfhuM2lh55M=" +typstDeps = [ + "diatypst_0_2_0", +] +description = "easy slides in typst - sensible defaults, easy syntax, well styled" +license = [ + "MIT-0", +] +homepage = "https://github.com/skriptum/Diatypst" + +[diatypst."0.3.0"] +url = "https://packages.typst.org/preview/diatypst-0.3.0.tar.gz" +hash = "sha256-HWGTqgOg/A3I+1VdiEfVJXXwIFsp2/bgy4zcHzqInAc=" +typstDeps = [ + "diatypst_0_2_0", +] +description = "easy slides in typst - sensible defaults, easy syntax, well styled" +license = [ + "MIT-0", +] +homepage = "https://github.com/skriptum/Diatypst" + +[diatypst."0.2.0"] +url = "https://packages.typst.org/preview/diatypst-0.2.0.tar.gz" +hash = "sha256-I1I+RSLNukq51EA8T9vVA73cOiwUNWSxaa/3/D+meck=" +typstDeps = [ + "diatypst_0_1_0", +] +description = "easy slides in typst - sensible defaults, easy syntax, well styled" +license = [ + "MIT-0", +] +homepage = "https://github.com/skriptum/Diatypst" + +[diatypst."0.1.0"] +url = "https://packages.typst.org/preview/diatypst-0.1.0.tar.gz" +hash = "sha256-//ZuvgYUMJ2h1F3Ho1eF5+Wi2UkJL1mq42QZOnaXKZ8=" +typstDeps = [] +description = "easy slides in typst - sensible defaults, easy syntax, well styled" +license = [ + "MIT-0", +] +homepage = "https://github.com/skriptum/Diatypst" + +[dining-table."0.1.0"] +url = "https://packages.typst.org/preview/dining-table-0.1.0.tar.gz" +hash = "sha256-JoZd2QGPf0JK6pPiaMTB88JEoBR/JUvgsXclq0gvhxE=" +typstDeps = [] +description = "Column-wise table definitions for big data" +license = [ + "Unlicense", +] +homepage = "https://github.com/JamesxX/dining-table" + +[diverential."0.2.0"] +url = "https://packages.typst.org/preview/diverential-0.2.0.tar.gz" +hash = "sha256-llW9ALoGx7qiILMIundWdv+YSkUpzlXQg1ctSMntuXA=" +typstDeps = [] +description = "Format differentials conveniently" +license = [ + "MIT", +] + +[divine-words."0.1.0"] +url = "https://packages.typst.org/preview/divine-words-0.1.0.tar.gz" +hash = "sha256-SZ4TbK1Ig2tmIq25r7jEurSOpcJBPMKmrrn+5FF/TN0=" +typstDeps = [] +description = "Just a template for a lab report" +license = [ + "MIT", +] +homepage = "https://github.com/tedius-git/divine-words" + +[down."0.1.0"] +url = "https://packages.typst.org/preview/down-0.1.0.tar.gz" +hash = "sha256-GA9mB7xmY68E8058uZ1RsNv1qJ+fhm6zaULfcAfd76A=" +typstDeps = [] +description = "Pass down arguments of `sum`, `integral`, etc. to the next line, which can generate shorthand to present reusable segments" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~toto/down" + +[drafting."0.2.2"] +url = "https://packages.typst.org/preview/drafting-0.2.2.tar.gz" +hash = "sha256-xJ3FdEiM1qPEhzZ4QkNdsysmMQ0GbY5l+EoWo2sbFdk=" +typstDeps = [] +description = "Helpful functions for content positioning and margin comments/notes" +license = [ + "Unlicense", +] +homepage = "https://github.com/ntjess/typst-drafting" + +[drafting."0.2.1"] +url = "https://packages.typst.org/preview/drafting-0.2.1.tar.gz" +hash = "sha256-PfpwLtjQSXtJBpjOF8I889Yz5fgM+22wyS9a4Rgdlzk=" +typstDeps = [] +description = "Helpful functions for content positioning and margin comments/notes" +license = [ + "Unlicense", +] +homepage = "https://github.com/ntjess/typst-drafting" + +[drafting."0.2.0"] +url = "https://packages.typst.org/preview/drafting-0.2.0.tar.gz" +hash = "sha256-pLBtMjCfRN3L9a53RKKkt5NCVVEmz8V4ROHvMlTTK6A=" +typstDeps = [] +description = "Helpful functions for content positioning and margin comments/notes" +license = [ + "Unlicense", +] +homepage = "https://github.com/ntjess/typst-drafting" + +[drafting."0.1.2"] +url = "https://packages.typst.org/preview/drafting-0.1.2.tar.gz" +hash = "sha256-xPz41aJVtJaCV7yq8cHtMC10uLh/UObEdpaMStrv9n4=" +typstDeps = [] +description = "Helpful functions for content positioning and margin comments/notes" +license = [ + "Unlicense", +] +homepage = "https://github.com/ntjess/typst-drafting" + +[drafting."0.1.1"] +url = "https://packages.typst.org/preview/drafting-0.1.1.tar.gz" +hash = "sha256-tdAybXIglAvYpALC2z0oYBgFt4XMytYvWzqW5RLWOgk=" +typstDeps = [] +description = "Helpful functions for content positioning and margin comments/notes" +license = [ + "Unlicense", +] +homepage = "https://github.com/ntjess/typst-drafting" + +[drafting."0.1.0"] +url = "https://packages.typst.org/preview/drafting-0.1.0.tar.gz" +hash = "sha256-iyUt4rjG4O61A3MR9FqTgy+F/Zge1msIuNvAMrfIwK4=" +typstDeps = [] +description = "Helpful functions during document drafting" +license = [ + "Unlicense", +] + +[droplet."0.3.1"] +url = "https://packages.typst.org/preview/droplet-0.3.1.tar.gz" +hash = "sha256-ngKk23tUePES0KJ8ywikO1xSDmYkJyr1VANLxV3ILVY=" +typstDeps = [] +description = "Customizable dropped capitals" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-droplet" + +[droplet."0.3.0"] +url = "https://packages.typst.org/preview/droplet-0.3.0.tar.gz" +hash = "sha256-ZRu5kk17aFhWF/TcfAeV/v2CwfyZiHSW1tLe7gvTeqI=" +typstDeps = [] +description = "Customizable dropped capitals" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-droplet" + +[droplet."0.2.0"] +url = "https://packages.typst.org/preview/droplet-0.2.0.tar.gz" +hash = "sha256-3K/8SK9My1Q4YKSnDbf+A3+9/i0FWCL9UORkYoYuE3Q=" +typstDeps = [] +description = "Customizable dropped capitals" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-droplet" + +[droplet."0.1.0"] +url = "https://packages.typst.org/preview/droplet-0.1.0.tar.gz" +hash = "sha256-zonpMX6mDSWOOIuBoy2G/nM7f+wdZfFCAopUJ4FuJwY=" +typstDeps = [] +description = "Customizable dropped capitals" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-droplet" + +[dvdtyp."1.0.1"] +url = "https://packages.typst.org/preview/dvdtyp-1.0.1.tar.gz" +hash = "sha256-vXA3xTFLRB6LVLKCjK6nt/tQS4Cl0btWrAhmVJpiJMQ=" +typstDeps = [ + "ctheorems_1_1_3", + "showybox_2_0_4", +] +description = "a colorful template for writting handouts or notes" +license = [ + "MIT-0", +] +homepage = "https://github.com/DVDTSB/dvdtyp" + +[dvdtyp."1.0.0"] +url = "https://packages.typst.org/preview/dvdtyp-1.0.0.tar.gz" +hash = "sha256-gNsKq88p6G7oRCzImZTsd/w8lP007pd8Hqyj0VioWAE=" +typstDeps = [ + "ctheorems_1_1_2", + "showybox_2_0_1", +] +description = "a colorful template for writting handouts or notes" +license = [ + "MIT-0", +] +homepage = "https://github.com/DVDTSB/dvdtyp" + +[easy-pinyin."0.1.0"] +url = "https://packages.typst.org/preview/easy-pinyin-0.1.0.tar.gz" +hash = "sha256-25XJa5ovmFzwwzmBrdF24okyajCWdduT9sHf5c/krDw=" +typstDeps = [] +description = "Write Chinese pinyin easily" +license = [ + "MIT", +] +homepage = "https://github.com/7sDream/typst-easy-pinyin" + +[easy-typography."0.1.0"] +url = "https://packages.typst.org/preview/easy-typography-0.1.0.tar.gz" +hash = "sha256-yj2teX9KuCz1cDbTFhuOkucrFlpHDaOhBq+MVeRpwoM=" +typstDeps = [ + "codly_1_2_0", + "codly-languages_0_1_1", +] +description = "Sets up sensible typography defaults" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[easytable."0.1.0"] +url = "https://packages.typst.org/preview/easytable-0.1.0.tar.gz" +hash = "sha256-W3FRYrjZ0u0Rdr8hYrwksuGwPjzF4ukX/EodJz0mSNE=" +typstDeps = [ + "tablex_0_0_8", +] +description = "Simple Table Package" +license = [ + "MIT", +] +homepage = "https://github.com/monaqa/typst-easytable" + +[echarm."0.2.1"] +url = "https://packages.typst.org/preview/echarm-0.2.1.tar.gz" +hash = "sha256-7msh2oSNLToUkDKIrDDkUs9Zj2im09EE1xcHxRgoXF4=" +typstDeps = [ + "ctxjs_0_3_1", +] +description = "Run echarts in typst with the use of CtxJS" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-echarm-package" + +[echarm."0.2.0"] +url = "https://packages.typst.org/preview/echarm-0.2.0.tar.gz" +hash = "sha256-RsI3gLmBGW+gip7974CbraCN3aIotUfYo1yGn2QKPSk=" +typstDeps = [ + "ctxjs_0_2_0", +] +description = "Run echarts in typst with the use of CtxJS" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-echarm-package" + +[echarm."0.1.1"] +url = "https://packages.typst.org/preview/echarm-0.1.1.tar.gz" +hash = "sha256-ePQrYFEkHsrT/TFQuSc6KfqHHb6D7OWjQ1Ysia1X28Q=" +typstDeps = [ + "ctxjs_0_2_0", +] +description = "Run echarts in typst with the use of CtxJS" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-echarm-package" + +[echarm."0.1.0"] +url = "https://packages.typst.org/preview/echarm-0.1.0.tar.gz" +hash = "sha256-vKTRw6QiKcIBRVaOjy0vO1eO0sQd0+bhi91J5X4UT+c=" +typstDeps = [ + "ctxjs_0_1_0", +] +description = "Run echarts in typst with the use of CtxJS" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-echarm-package" + +[edgeframe."0.1.0"] +url = "https://packages.typst.org/preview/edgeframe-0.1.0.tar.gz" +hash = "sha256-AVXSce2K+PcxHjtkm3PEChbsDIISnOqZmbA4Yl6i/J4=" +typstDeps = [] +description = "For quick paper setups" +license = [ + "MIT", +] +homepage = "https://github.com/neuralpain/edgeframe" + +[efilrst."0.3.1"] +url = "https://packages.typst.org/preview/efilrst-0.3.1.tar.gz" +hash = "sha256-Xrt6aikAZeV0KodY6qNELZ5STxZuVwflA6J+2ES4jz8=" +typstDeps = [] +description = "A simple referenceable list library for typst" +license = [ + "MIT", +] +homepage = "https://github.com/jmigual/typst-efilrst" + +[efilrst."0.3.0"] +url = "https://packages.typst.org/preview/efilrst-0.3.0.tar.gz" +hash = "sha256-YQK/52bwOabt2ZQeZNK+gHC6hKN0eEXd4Jxv8iWxuKM=" +typstDeps = [] +description = "A simple referenceable list library for typst" +license = [ + "MIT", +] +homepage = "https://github.com/jmigual/typst-efilrst" + +[efilrst."0.2.0"] +url = "https://packages.typst.org/preview/efilrst-0.2.0.tar.gz" +hash = "sha256-pBk8BZ7Bfjwy2xWUG75n0OMsq9CBFohJpqvRccSTZwE=" +typstDeps = [] +description = "A simple referenceable list library for typst" +license = [ + "MIT", +] +homepage = "https://github.com/jmigual/typst-efilrst" + +[efilrst."0.1.0"] +url = "https://packages.typst.org/preview/efilrst-0.1.0.tar.gz" +hash = "sha256-h9Nf0hdK/8pNsQSAOq/xF69vnX5GCTp26T/AXhXTHbY=" +typstDeps = [] +description = "A simple referenceable list library for typst" +license = [ + "MIT", +] +homepage = "https://github.com/jmigual/typst-efilrst" + +[electify."0.1.1"] +url = "https://packages.typst.org/preview/electify-0.1.1.tar.gz" +hash = "sha256-THxg8Rvy08WCwrOBAjAgyZXsxWtwr1QNgx5mZ3HZob0=" +typstDeps = [] +description = "A German Election Ballot Paper helping visualize the dual-voting system (Erststimme & Zweitstimme" +license = [ + "MIT", +] +homepage = "https://github.com/G0STG0D/electify" + +[electify."0.1.0"] +url = "https://packages.typst.org/preview/electify-0.1.0.tar.gz" +hash = "sha256-0yS+JpekyeSV5VrNVLqCIO90wG0bHYjJpJ05YiT8drs=" +typstDeps = [] +description = "A German Election Ballot Paper helping visualize the dual-voting system (Erststimme & Zweitstimme" +license = [ + "MIT", +] +homepage = "https://github.com/G0STG0D/typst-packages" + +[elsearticle."0.4.2"] +url = "https://packages.typst.org/preview/elsearticle-0.4.2.tar.gz" +hash = "sha256-QlnOgnxC5dBlFtBVKlgbdE/QnC3yeIUpT7Kn445HrXI=" +typstDeps = [ + "cheq_0_1_0", + "equate_0_2_1", + "mantys_0_1_4", + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.4.1"] +url = "https://packages.typst.org/preview/elsearticle-0.4.1.tar.gz" +hash = "sha256-froFVx2/nqEBcXUf8NecGHk/mxG0qvU4STCmQ6epiCM=" +typstDeps = [ + "cheq_0_1_0", + "equate_0_2_1", + "mantys_0_1_4", + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.4.0"] +url = "https://packages.typst.org/preview/elsearticle-0.4.0.tar.gz" +hash = "sha256-gi4kKD1T6mwjbQyiaW5dJUJlDo7wcbJk9fdjvSvH9sE=" +typstDeps = [ + "cheq_0_1_0", + "equate_0_2_1", + "mantys_0_1_4", + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.3.0"] +url = "https://packages.typst.org/preview/elsearticle-0.3.0.tar.gz" +hash = "sha256-v0Ft+VaJEsvcTEyNJARX4x/BBWjaD0S70exdSsvbVCU=" +typstDeps = [ + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.2.1"] +url = "https://packages.typst.org/preview/elsearticle-0.2.1.tar.gz" +hash = "sha256-G0FFXGQ6IRkvOf8TdaNxJcRFJ5jYU5QUWfsXo63INt4=" +typstDeps = [ + "cheq_0_1_0", + "mantys_0_1_4", + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.2.0"] +url = "https://packages.typst.org/preview/elsearticle-0.2.0.tar.gz" +hash = "sha256-p+LmaEHTOWEp5gPKCHF2zezuABnRBWyPOkBrO5ge3xs=" +typstDeps = [ + "cheq_0_1_0", + "elsearticle_0_1_0", + "mantys_0_1_4", + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.1.0"] +url = "https://packages.typst.org/preview/elsearticle-0.1.0.tar.gz" +hash = "sha256-Y3ad9oganv2MW89AUzuexWQxuluTaWn2cENHCRlvx1U=" +typstDeps = [ + "cheq_0_1_0", + "mantys_0_1_4", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] + +[embiggen."0.0.1"] +url = "https://packages.typst.org/preview/embiggen-0.0.1.tar.gz" +hash = "sha256-6IDxLVIVGD7xVAJAjeWwuywUoxjPvVswb7GeT4bjhsg=" +typstDeps = [] +description = "LaTeX-like delimeter sizing in Typst" +license = [ + "GPL-3.0-or-later", +] + +[enja-bib."0.1.0"] +url = "https://packages.typst.org/preview/enja-bib-0.1.0.tar.gz" +hash = "sha256-JJNYAVj8FM+rf8EpjHiF3sPSjDKIjTn5UpDZ1Qqe5yI=" +typstDeps = [] +description = "A package for handling BibTeX that includes both English and Japanese" +license = [ + "MIT", +] +homepage = "https://github.com/tkrhsmt/enja-bib" + +[ennui-ur-report."0.1.0"] +url = "https://packages.typst.org/preview/ennui-ur-report-0.1.0.tar.gz" +hash = "sha256-bMxoOzSdvrO6o4i16lTdIDU9OHSyz59p6fk8CKSh/70=" +typstDeps = [] +description = "A customizable, non official template for University of Rennes" +license = [ + "GPL-3.0-or-later", +] +homepage = "https://github.com/leana8959/univ-rennes.typ" + +[enunciado-facil-fcfm."0.1.0"] +url = "https://packages.typst.org/preview/enunciado-facil-fcfm-0.1.0.tar.gz" +hash = "sha256-sJQRnJ7opLSbBWTcS9YNOCQlZ2lYiuMAGBSeeC3MChM=" +typstDeps = [] +description = "Documentos de ejercicios (controles, auxiliares, tareas, pautas) para la FCFM, UChile" +license = [ + "MIT", +] +homepage = "https://github.com/bkorecic/enunciado-facil-fcfm" + +[eqalc."0.1.3"] +url = "https://packages.typst.org/preview/eqalc-0.1.3.tar.gz" +hash = "sha256-8m31R/YQmCJTp3QC7czxIHvELcocZWLkcLgaZw5aYAk=" +typstDeps = [] +description = "Convert math equations to functions" +license = [ + "MIT", +] +homepage = "https://github.com/7ijme/eqalc" + +[eqalc."0.1.2"] +url = "https://packages.typst.org/preview/eqalc-0.1.2.tar.gz" +hash = "sha256-FIDuB1lqfK84/VMGJQbEE2Tziw2ECuPXiTqVUHOluno=" +typstDeps = [] +description = "Convert math equations to functions" +license = [ + "MIT", +] +homepage = "https://github.com/7ijme/eqalc" + +[eqalc."0.1.1"] +url = "https://packages.typst.org/preview/eqalc-0.1.1.tar.gz" +hash = "sha256-PP3qgn1zpAijsBI9QTFC+h8YxbllR975Kg6iJlOdjRY=" +typstDeps = [] +description = "Convert math equations to functions" +license = [ + "MIT", +] +homepage = "https://github.com/7ijme/eqalc" + +[eqalc."0.1.0"] +url = "https://packages.typst.org/preview/eqalc-0.1.0.tar.gz" +hash = "sha256-rcbXANJXwG57hAVYVgw6y+Aum8lKXxFEzDGVCsNuq6U=" +typstDeps = [] +description = "Convert math equations to functions" +license = [ + "MIT", +] +homepage = "https://github.com/7ijme/eqalc" + +[equate."0.3.1"] +url = "https://packages.typst.org/preview/equate-0.3.1.tar.gz" +hash = "sha256-nEUnNszy1cVaemsqdAmjvj34obYPH3fGfWHX6Rb7ajE=" +typstDeps = [] +description = "Various enhancements for mathematical expressions" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-equate" + +[equate."0.3.0"] +url = "https://packages.typst.org/preview/equate-0.3.0.tar.gz" +hash = "sha256-nlt6wgzIVMGUD88wdeYjRjOI7q04BV4sYE0xejxiv34=" +typstDeps = [] +description = "Various enhancements for mathematical expressions" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-equate" + +[equate."0.2.1"] +url = "https://packages.typst.org/preview/equate-0.2.1.tar.gz" +hash = "sha256-UD/J2c3Hs6i4SuEGSINYBTXUpcZULKFxi6HkSjtLgmQ=" +typstDeps = [] +description = "Breakable equations with improved numbering" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-equate" + +[equate."0.2.0"] +url = "https://packages.typst.org/preview/equate-0.2.0.tar.gz" +hash = "sha256-/okqIsUZO+qoelAwd6gDZ+3HdOUfXm+hnHbCXRJMppY=" +typstDeps = [] +description = "Breakable equations with improved numbering" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-equate" + +[equate."0.1.0"] +url = "https://packages.typst.org/preview/equate-0.1.0.tar.gz" +hash = "sha256-GZuUqB/bZTeg9ZdbrlSPvDdAIkx6eWsPV4L6S5qLiwY=" +typstDeps = [] +description = "Breakable equations with improved numbering" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-equate" + +[esotefy."1.0.0"] +url = "https://packages.typst.org/preview/esotefy-1.0.0.tar.gz" +hash = "sha256-Yaex2nIpddDiJoTyV0Sl7oWltnxD4MfSIHoNbQuFv+s=" +typstDeps = [] +description = "A brainfuck implementation in pure Typst" +license = [ + "MIT", +] +homepage = "git@github.com:Thumuss/brainfuck.git" + +[etykett."0.1.0"] +url = "https://packages.typst.org/preview/etykett-0.1.0.tar.gz" +hash = "sha256-V2ItL+yNg1RYTrv5NIBKGipTjwz+L33KK9/TpsQdwpw=" +typstDeps = [ + "valkyrie_0_2_2", +] +description = "a template for printing onto label sheets with rectangular grids of labels" +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-etykett" + +[examify."0.1.1"] +url = "https://packages.typst.org/preview/examify-0.1.1.tar.gz" +hash = "sha256-1dgSCLdqpxvX9/eVDAG83hkwlMpJfyrWEk2SqNFHjYQ=" +typstDeps = [] +description = "A simple typst template to create question papers for exams" +license = [ + "MIT", +] +homepage = "https://github.com/tarunjana/examify" + +[examify."0.1.0"] +url = "https://packages.typst.org/preview/examify-0.1.0.tar.gz" +hash = "sha256-RpvIZMnN1Nq0dnyHwf79aAs/4BNZsJFYkgTjRWVJOok=" +typstDeps = [] +description = "A simple typst template to create question papers for exams" +license = [ + "MIT", +] +homepage = "https://github.com/tarunjana/examify" + +[examit."0.1.1"] +url = "https://packages.typst.org/preview/examit-0.1.1.tar.gz" +hash = "sha256-vm0p0uFU943pCQqpAWZI3bIBruQr/ELNzrO5b/NRv3A=" +typstDeps = [ + "cetz_0_2_2", +] +description = "An exam template based on the MIT LaTeX exam.cls" +license = [ + "MIT", +] + +[example."0.1.0"] +url = "https://packages.typst.org/preview/example-0.1.0.tar.gz" +hash = "sha256-VH5lAZYFEGfo3FVKoKgiqvmVUjrTlX+MzQI1e/N7oEM=" +typstDeps = [] +description = "An example package" +license = [ + "Unlicense", +] + +[exmllent."0.1.0"] +url = "https://packages.typst.org/preview/exmllent-0.1.0.tar.gz" +hash = "sha256-9MCCdvY8ozy6LsYFq8dcskQydcrWE3wnsvZ8UAeLtWA=" +typstDeps = [] +description = "Pure typst implementation of converting XML Excel table to typst table" +license = [ + "MIT", +] +homepage = "https://github.com/hongjr03/typst-xml-table-parser" + +[exzellenz-tum-thesis."0.1.0"] +url = "https://packages.typst.org/preview/exzellenz-tum-thesis-0.1.0.tar.gz" +hash = "sha256-mHGSNkqvM8IzTKanFcPLybhaUn5+/bfe7nnN/Qha/4k=" +typstDeps = [ + "glossarium_0_2_6", +] +description = "Customizable template for a thesis at the TU Munich" +license = [ + "MIT-0", +] + +[ez-algo."0.1.1"] +url = "https://packages.typst.org/preview/ez-algo-0.1.1.tar.gz" +hash = "sha256-cx+xwb4cZZo8SM30c0G76KscdpGYRDqSOZXOjFQ4RJY=" +typstDeps = [] +description = "A package to set algorithms with ease" +license = [ + "MIT", +] +homepage = "https://github.com/the-mathing/ez-algo" + +[ez-algo."0.1.0"] +url = "https://packages.typst.org/preview/ez-algo-0.1.0.tar.gz" +hash = "sha256-UOA5xIEBOrNlhI+8Zgok9VVq0apD6JlUHOCjvvAEJ/Q=" +typstDeps = [] +description = "A package to set algorithms with ease" +license = [ + "MIT", +] +homepage = "https://github.com/the-mathing/ez-algo" + +[ez-today."1.1.0"] +url = "https://packages.typst.org/preview/ez-today-1.1.0.tar.gz" +hash = "sha256-voHxSdsDcXD5vDAS6/7763eFsO83d7kim8ePWWU5L+U=" +typstDeps = [] +description = "Simply displays the full current date" +license = [ + "MIT", +] +homepage = "https://github.com/CarloSchafflik12/typst-ez-today" + +[ez-today."1.0.0"] +url = "https://packages.typst.org/preview/ez-today-1.0.0.tar.gz" +hash = "sha256-nyfqJy0qzLMVXUM6DzyoexKdmxXq0ad0muDFXBMkIIQ=" +typstDeps = [] +description = "Simply displays the full current date" +license = [ + "MIT", +] +homepage = "https://github.com/CarloSchafflik12/typst-ez-today" + +[ez-today."0.3.0"] +url = "https://packages.typst.org/preview/ez-today-0.3.0.tar.gz" +hash = "sha256-C8dNy4ypI+o3H4DsOyonlWtl0Ug38qbQ4Ik24Sb1r6c=" +typstDeps = [] +description = "Simply displays the full current date" +license = [ + "MIT", +] +homepage = "https://github.com/CarloSchafflik12/typst-ez-today" + +[ez-today."0.2.0"] +url = "https://packages.typst.org/preview/ez-today-0.2.0.tar.gz" +hash = "sha256-rLtFkTN5Rl/Z0S8yRJMBkBWEeYt8eZGSb86tnZzNFMw=" +typstDeps = [] +description = "Simply displays the full current date" +license = [ + "MIT", +] +homepage = "https://github.com/CarloSchafflik12/typst-ez-today" + +[ez-today."0.1.0"] +url = "https://packages.typst.org/preview/ez-today-0.1.0.tar.gz" +hash = "sha256-BimtKMHDG45nbi2QxH+aBJjMCPqxYylM53Y4qCpU+QU=" +typstDeps = [] +description = "Simply displays the full current date" +license = [ + "MIT", +] +homepage = "https://github.com/CarloSchafflik12/typst-ez-today" + +[fancy-affil."0.1.0"] +url = "https://packages.typst.org/preview/fancy-affil-0.1.0.tar.gz" +hash = "sha256-3w4k0AfmEp+wvXIkC1koKjIQxkQm3zLBrNgNh7IfNw0=" +typstDeps = [] +description = "An auto affiliation tool" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/han190/fancy-affil" + +[fancy-units."0.1.1"] +url = "https://packages.typst.org/preview/fancy-units-0.1.1.tar.gz" +hash = "sha256-T5+jI23IzepSp4YHaPM4unZ547rvZieHmmYgjBz/ud0=" +typstDeps = [] +description = "Format numbers and units with style" +license = [ + "MIT", +] +homepage = "https://github.com/janekfleper/typst-fancy-units" + +[fancy-units."0.1.0"] +url = "https://packages.typst.org/preview/fancy-units-0.1.0.tar.gz" +hash = "sha256-nyRiVkZ2+Q/FUPSrz/EQMvHU3Jmqjr63ClB/rqKFIQ8=" +typstDeps = [ + "tidy_0_4_0", +] +description = "Format numbers and units with styling" +license = [ + "MIT", +] +homepage = "https://github.com/janekfleper/typst-fancy-units" + +[fauve-cdb."0.1.0"] +url = "https://packages.typst.org/preview/fauve-cdb-0.1.0.tar.gz" +hash = "sha256-vc61E1kMUSVpgpQDX3lfUnpFpjenTLVeWa5WuK6TEsA=" +typstDeps = [ + "cetz_0_2_2", + "suiji_0_3_0", +] +description = "The unofficial implementation of the Collège Doctoral de Bretagne thesis manuscript template" +license = [ + "MIT-0", +] + +[fauxreilly."0.1.1"] +url = "https://packages.typst.org/preview/fauxreilly-0.1.1.tar.gz" +hash = "sha256-kA25rR18MIt1BNMHRugD1vZMpqV1tFlePuz+COtrD8g=" +typstDeps = [] +description = "A package for creating O'Rly- / O'Reilly-type cover pages" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/dei-layborer/fauxreilly" + +[fauxreilly."0.1.0"] +url = "https://packages.typst.org/preview/fauxreilly-0.1.0.tar.gz" +hash = "sha256-IlLxBlAKVnBr6qzyozaT1LfZSaZpv/rdJzrmNNDAtM4=" +typstDeps = [] +description = "A package for creating O'Rly- / O'Reilly-type cover pages" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/dei-layborer/o-rly-typst" + +[fervojo."0.1.0"] +url = "https://packages.typst.org/preview/fervojo-0.1.0.tar.gz" +hash = "sha256-icOqJl4Gc0H88UBPbS5XWTzhA3XqtTdtYykJjEIDSaA=" +typstDeps = [] +description = "railroad for typst, powered by wasm" +license = [ + "MIT", +] +homepage = "https://github.com/leiserfg/fervojo" + +[fh-joanneum-iit-thesis."2.1.2"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-2.1.2.tar.gz" +hash = "sha256-BfTqeHsL04xPFI2KWwW1HuUlyv5bpPIJhKpDXLwFFgk=" +typstDeps = [ + "glossarium_0_5_3", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."2.0.5"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-2.0.5.tar.gz" +hash = "sha256-wiOzA8xHU2Q4q1B844I0Pfmx4T8AT4cAFyNqIvDb/Ts=" +typstDeps = [ + "glossarium_0_5_0", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."2.0.2"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-2.0.2.tar.gz" +hash = "sha256-7w95vjqsvDSK85Wt5c+o17t9vHw93BfVIcfUg4EGOVg=" +typstDeps = [ + "glossarium_0_5_0", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."1.2.3"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-1.2.3.tar.gz" +hash = "sha256-5nGoIbzwmqxR4dzqWd8d8V7FHTiAFkYL5dA6D4Z+euo=" +typstDeps = [ + "glossarium_0_4_1", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."1.2.2"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-1.2.2.tar.gz" +hash = "sha256-a49IpbL6x/zCQzJdK+fN7VX0EihkiNC/ET01K9ObHNE=" +typstDeps = [ + "glossarium_0_4_1", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."1.2.0"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-1.2.0.tar.gz" +hash = "sha256-ZbyGUqDj2vpDm8igZfmcj/uiiZViTKpcfitGLT5wFDI=" +typstDeps = [ + "glossarium_0_4_1", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."1.1.0"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-1.1.0.tar.gz" +hash = "sha256-JpoKUqABymBzc/djF1dDRi4rEAkTWisZJZtKFwMuVJ4=" +typstDeps = [] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] + +[finely-crafted-cv."0.3.0"] +url = "https://packages.typst.org/preview/finely-crafted-cv-0.3.0.tar.gz" +hash = "sha256-FIFb++hf4R8p+xzRfAc03wq+i4c8HG+K072KBaPP/mA=" +typstDeps = [] +description = "A modern résumé/curriculum vitæ template with high attention to detail" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[finely-crafted-cv."0.2.0"] +url = "https://packages.typst.org/preview/finely-crafted-cv-0.2.0.tar.gz" +hash = "sha256-S1gsR078vN+u7pTzJRb6+R/p54Oppf+3i8ZtKMrpv3g=" +typstDeps = [] +description = "A modern résumé/curriculum vitæ template with high attention to detail" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[finely-crafted-cv."0.1.0"] +url = "https://packages.typst.org/preview/finely-crafted-cv-0.1.0.tar.gz" +hash = "sha256-BkWI3fi7LaW1oJ1kHxvB13jQU8LxaKvq6JLaB7xWerY=" +typstDeps = [] +description = "A modern résumé/curriculum vitæ template with high attention to detail" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[finite."0.4.1"] +url = "https://packages.typst.org/preview/finite-0.4.1.tar.gz" +hash = "sha256-wQe8Rb63gPqULtmKglYzJsXKNNZlgngwhGUPgQ0MpDQ=" +typstDeps = [ + "cetz_0_3_0", + "t4t_0_3_2", +] +description = "Typst-setting finite automata with CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-finite" + +[finite."0.4.0"] +url = "https://packages.typst.org/preview/finite-0.4.0.tar.gz" +hash = "sha256-s7/MtSGbL8kJx0kI9QLMwul+PKbNj26EoM/+AMJd1Kc=" +typstDeps = [ + "cetz_0_3_0", + "t4t_0_3_2", +] +description = "Typst-setting finite automata with CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-finite" + +[finite."0.3.2"] +url = "https://packages.typst.org/preview/finite-0.3.2.tar.gz" +hash = "sha256-7dirwm+luHIVlSBR2MxSkzlkavHMHSE8OH8Ygg78Dhs=" +typstDeps = [ + "cetz_0_1_1", + "t4t_0_3_2", +] +description = "Typst-setting finite automata with CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-finite" + +[finite."0.3.0"] +url = "https://packages.typst.org/preview/finite-0.3.0.tar.gz" +hash = "sha256-8rY6KX/SxvLMdAM4izTzUdlvFolw38Rd3IPo3b8Ny3o=" +typstDeps = [ + "cetz_0_1_1", + "t4t_0_3_2", +] +description = "Typst-setting finite automata with CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-finite" + +[finite."0.1.0"] +url = "https://packages.typst.org/preview/finite-0.1.0.tar.gz" +hash = "sha256-/hFoi8e9PszDKFrH+/Pci+UyOrryCdC28ZdMRmraItw=" +typstDeps = [ + "cetz_0_0_2", + "t4t_0_3_0", +] +description = "Typst-setting finite automata with CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-finite" + +[fireside."1.0.0"] +url = "https://packages.typst.org/preview/fireside-1.0.0.tar.gz" +hash = "sha256-OD7X1OEU9OtcO0kw4bJT/WXrLJowFsuFE86JKB7Ln/k=" +typstDeps = [] +description = "A simple letter template with a touch of warmth" +license = [ + "MIT", +] + +[flagada."0.1.0"] +url = "https://packages.typst.org/preview/flagada-0.1.0.tar.gz" +hash = "sha256-tyDAcymyVhl9B+u5Abl5hU2vwB7D1uIDyZEnxwU18RQ=" +typstDeps = [] +description = "A package to generate countries flags, selecting country based on its ISO3166-1 code" +license = [ + "MIT", +] +homepage = "https://github.com/samrenault/flagada" + +[flautomat."0.1.0"] +url = "https://packages.typst.org/preview/flautomat-0.1.0.tar.gz" +hash = "sha256-9ks3JA5cO4kvl8odrVdqEvzfbdr+AjHrTzWjbuDFo+4=" +typstDeps = [ + "fletcher_0_5_3", +] +description = "Visualize abstract automata based on json input" +license = [ + "MIT", +] +homepage = "https://codeberg.org/Kuchenmampfer/flautomat" + +[fletcher."0.5.7"] +url = "https://packages.typst.org/preview/fletcher-0.5.7.tar.gz" +hash = "sha256-jsLbE6cHDTjDelrGkB2CSIqfGaeAeQ1RcQRDBx3hA9k=" +typstDeps = [ + "cetz_0_3_4", + "tidy_0_4_1", + "touying_0_5_5", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.6"] +url = "https://packages.typst.org/preview/fletcher-0.5.6.tar.gz" +hash = "sha256-cJS0PCD/LP+4EFwSO5TDlG8vCTJ+WMIxmPl9o+k7Aas=" +typstDeps = [ + "cetz_0_3_3", + "tidy_0_4_1", + "touying_0_5_5", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.5"] +url = "https://packages.typst.org/preview/fletcher-0.5.5.tar.gz" +hash = "sha256-W+peOeFKgdAjuvLCGUI/Wue0ce7p/3qBfgCrW16o4tc=" +typstDeps = [ + "cetz_0_3_2", + "tidy_0_2_0", + "tidy_0_3_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.4"] +url = "https://packages.typst.org/preview/fletcher-0.5.4.tar.gz" +hash = "sha256-U9CqdJlwoTl+SAOcTi3/ewTxliaejXVxtzpE1M1hPu4=" +typstDeps = [ + "cetz_0_3_1", + "tidy_0_2_0", + "tidy_0_3_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.3"] +url = "https://packages.typst.org/preview/fletcher-0.5.3.tar.gz" +hash = "sha256-4cP31T2qLuWE+NrWeQjCAV2QJnxTeHZW6BQHK12K7Nw=" +typstDeps = [ + "cetz_0_3_1", + "tidy_0_2_0", + "tidy_0_3_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.2"] +url = "https://packages.typst.org/preview/fletcher-0.5.2.tar.gz" +hash = "sha256-VkC9UHhubcOqnVAIL07sKm18WWMKqyzsC/hBWjP/X3Q=" +typstDeps = [ + "cetz_0_3_1", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.1"] +url = "https://packages.typst.org/preview/fletcher-0.5.1.tar.gz" +hash = "sha256-UDGKnu/L/G5ZG74tnTsHRCEpf5R5kA7UURIiNFReEv4=" +typstDeps = [ + "cetz_0_2_2", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.0"] +url = "https://packages.typst.org/preview/fletcher-0.5.0.tar.gz" +hash = "sha256-8Sjc8jwA4u4iWd+SvewEK/ccnCRlq7QvV6CSOLK04dw=" +typstDeps = [ + "cetz_0_2_2", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.5"] +url = "https://packages.typst.org/preview/fletcher-0.4.5.tar.gz" +hash = "sha256-YuxxbViY9/qskTaDL6RRaN3wiiDriMeOLCy6juRSutY=" +typstDeps = [ + "cetz_0_2_2", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.4"] +url = "https://packages.typst.org/preview/fletcher-0.4.4.tar.gz" +hash = "sha256-bXRIADvQfhoONL/GomtviPuJzKHvTQmZFIjfYLyjQpo=" +typstDeps = [ + "cetz_0_2_2", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.3"] +url = "https://packages.typst.org/preview/fletcher-0.4.3.tar.gz" +hash = "sha256-kQ8uQEXcPrZm/wNFRwFLZNIWXuDN5vvJ5DRp7emqnE4=" +typstDeps = [ + "cetz_0_2_1", + "fletcher_0_4_2", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.2"] +url = "https://packages.typst.org/preview/fletcher-0.4.2.tar.gz" +hash = "sha256-vYFUogLKIMO/R/tIQO/Knf1EJ+eorsrY+9L4AEJRufM=" +typstDeps = [ + "cetz_0_2_0", + "tidy_0_2_0", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.1"] +url = "https://packages.typst.org/preview/fletcher-0.4.1.tar.gz" +hash = "sha256-UVXEfdzSVGPjFSsTCcwbWiRFSrkLn0ajKqqdQos71JY=" +typstDeps = [ + "cetz_0_2_0", + "tidy_0_1_0", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.0"] +url = "https://packages.typst.org/preview/fletcher-0.4.0.tar.gz" +hash = "sha256-djU6wcv5GBbJzHHKdhch7fePziDyNyuJ4SQldZ1PeDQ=" +typstDeps = [ + "cetz_0_1_2", + "tidy_0_1_0", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.3.0"] +url = "https://packages.typst.org/preview/fletcher-0.3.0.tar.gz" +hash = "sha256-SdXzVIqnJtrvR/7eQ5srHDRAfhlu7Dxdke9Q1uZ8tks=" +typstDeps = [ + "cetz_0_1_2", + "tidy_0_1_0", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.2.0"] +url = "https://packages.typst.org/preview/fletcher-0.2.0.tar.gz" +hash = "sha256-W5kT8nSUFnDQ+eGEs1DeUT/TnkhgzGaBGHhoTTpL9ts=" +typstDeps = [ + "cetz_0_1_2", + "tidy_0_1_0", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.1.1"] +url = "https://packages.typst.org/preview/fletcher-0.1.1.tar.gz" +hash = "sha256-hLWIbBoIiNbXPc2XJGmNluTIseokI0Fk+oQESX2ETrs=" +typstDeps = [ + "cetz_0_1_2", + "tidy_0_1_0", +] +description = "Draw commutative diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[flow."0.3.1"] +url = "https://packages.typst.org/preview/flow-0.3.1.tar.gz" +hash = "sha256-YwXzPmBurBdyOeuspshwbLRd4XSdiSlzK28J80k2+Fw=" +typstDeps = [] +description = "A few templates and too many scattered utils" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/MultisampledNight/flow" + +[flow."0.3.0"] +url = "https://packages.typst.org/preview/flow-0.3.0.tar.gz" +hash = "sha256-iRu3SEYaX2QtcIwdsCRH1obS3eLC5CgFEIeVspPplHY=" +typstDeps = [] +description = "A few templates and too many scattered utils" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/MultisampledNight/flow" + +[flow."0.2.0"] +url = "https://packages.typst.org/preview/flow-0.2.0.tar.gz" +hash = "sha256-fa0Cpawx5mWXtpt9EYSZ89e9rxZkpclH+7MgbUJenPs=" +typstDeps = [] +description = "A few templates and too many scattered utils" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/MultisampledNight/flow" + +[flow."0.1.2"] +url = "https://packages.typst.org/preview/flow-0.1.2.tar.gz" +hash = "sha256-fr53skFBa5OyY2bhnsd9JQvaVhPEb/+Byh7/i/PESMM=" +typstDeps = [ + "polylux_0_3_1", +] +description = "A few templates and too many scattered utils" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/MultisampledNight/flow" + +[flyingcircus."3.2.1"] +url = "https://packages.typst.org/preview/flyingcircus-3.2.1.tar.gz" +hash = "sha256-dmqOomiW/j5fNEyPqUho6Xsg/5qtQlfPwmMigqK+acg=" +typstDeps = [ + "cetz_0_3_3", + "cetz-plot_0_1_1", + "cuti_0_2_1", +] +description = "For creating homebrew documents with the same fancy style as the Flying Circus book? Provides simple commands to generate a whole aircraft stat page, vehicle, or even ship" +license = [ + "MIT", +] +homepage = "https://github.com/Tetragramm/flying-circus-typst-template" + +[flyingcircus."3.2.0"] +url = "https://packages.typst.org/preview/flyingcircus-3.2.0.tar.gz" +hash = "sha256-HQgoZ87KmcMBBuHQjYiwjtWAs19HXFC2ntMI0OvG/Lo=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", + "cuti_0_2_1", +] +description = "For creating homebrew documents with the same fancy style as the Flying Circus book? Provides simple commands to generate a whole aircraft stat page, vehicle, or even ship" +license = [ + "MIT", +] +homepage = "https://github.com/Tetragramm/flying-circus-typst-template" + +[flyingcircus."3.0.0"] +url = "https://packages.typst.org/preview/flyingcircus-3.0.0.tar.gz" +hash = "sha256-YshyMVu8ph/hRaX7CNaIpJCfHFqh4omXdD6JkGR3cBg=" +typstDeps = [ + "cetz_0_2_2", + "cuti_0_2_1", + "tablex_0_0_8", +] +description = "For creating homebrew documents with the same fancy style as the Flying Circus book? Provides simple commands to generate a whole aircraft stat page, vehicle, or even ship" +license = [ + "MIT", +] +homepage = "https://github.com/Tetragramm/flying-circus-typst-template" + +[fontawesome."0.5.0"] +url = "https://packages.typst.org/preview/fontawesome-0.5.0.tar.gz" +hash = "sha256-deUJ24arS9YenlMNjUgxsq9cZ7R/TksgNDDblCcPT5Q=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.4.0"] +url = "https://packages.typst.org/preview/fontawesome-0.4.0.tar.gz" +hash = "sha256-NRzVcTQP9nxOM0jhx/aIlUqOdMhkc6XPxHiXRCF5zFw=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.3.0"] +url = "https://packages.typst.org/preview/fontawesome-0.3.0.tar.gz" +hash = "sha256-v7PUcuyzw9g74hNYUO8y5EhBYnGJcqQ6Ia2Cqsijmno=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.2.1"] +url = "https://packages.typst.org/preview/fontawesome-0.2.1.tar.gz" +hash = "sha256-AUj1F9Z0Z6ETOsT9y7qMvC+Q4WZ75STIRAODf/wmf0Q=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.2.0"] +url = "https://packages.typst.org/preview/fontawesome-0.2.0.tar.gz" +hash = "sha256-YOWFmjt6AEWaFybdOiokFYBL7GGW+PpTxlLw5ajmOaw=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.1.1"] +url = "https://packages.typst.org/preview/fontawesome-0.1.1.tar.gz" +hash = "sha256-20THl+eH3LYjUoeNwmjqx9e/L7Ug0BZ9KZDuIf/DRqc=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.1.0"] +url = "https://packages.typst.org/preview/fontawesome-0.1.0.tar.gz" +hash = "sha256-duYhendgcUntqBm/vyMDPwb4r7JFCai2Ws6V4qlf3Mw=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[formalettre."0.1.3"] +url = "https://packages.typst.org/preview/formalettre-0.1.3.tar.gz" +hash = "sha256-51SXjB7Icsb0NUPvhPhmaZxa2AJF8D0DLhm5zFzH7YI=" +typstDeps = [] +description = "French formal letter template" +license = [ + "BSD-3-Clause", +] +homepage = "https://github.com/Brndan/lettre" + +[formalettre."0.1.2"] +url = "https://packages.typst.org/preview/formalettre-0.1.2.tar.gz" +hash = "sha256-pAfyUg/DQ0a8EoRPRc9rIV+URWHP8ea32R8gevkcjJQ=" +typstDeps = [] +description = "French formal letter template" +license = [ + "BSD-3-Clause", +] +homepage = "https://github.com/Brndan/lettre" + +[formalettre."0.1.1"] +url = "https://packages.typst.org/preview/formalettre-0.1.1.tar.gz" +hash = "sha256-8j/6S6MIiLWtrl8OZXG5ytjJCUrW3vdAf0jdvpMnEzU=" +typstDeps = [] +description = "French formal letter template" +license = [ + "BSD-3-Clause", +] +homepage = "https://github.com/Brndan/lettre" + +[formalettre."0.1.0"] +url = "https://packages.typst.org/preview/formalettre-0.1.0.tar.gz" +hash = "sha256-hrPn45hqV5Z0bpFEaBmOHAUZqAoimGb0rWwz2itYleI=" +typstDeps = [] +description = "French formal letter template" +license = [ + "BSD-3-Clause", +] +homepage = "https://github.com/Brndan/lettre" + +[frackable."0.2.0"] +url = "https://packages.typst.org/preview/frackable-0.2.0.tar.gz" +hash = "sha256-IbKUPIcWNBgzLCSyiw4hF2CEL6bVj6ygs2fyy3ZZB30=" +typstDeps = [] +description = "Vulgar Fractions" +license = [ + "Unlicense", +] +homepage = "https://www.github.com/jamesrswift/frackable" + +[frackable."0.1.0"] +url = "https://packages.typst.org/preview/frackable-0.1.0.tar.gz" +hash = "sha256-IRpnEGFKoHQeD8vFhj4NBjKggUj60eiN9V3iSDrN5oo=" +typstDeps = [] +description = "Vulgar Fractions" +license = [ + "Unlicense", +] +homepage = "https://www.github.com/jamesrswift/frackable" + +[fractus."0.1.0"] +url = "https://packages.typst.org/preview/fractus-0.1.0.tar.gz" +hash = "sha256-cR35144FfUGIV9PW9ceZOOSWJ4kTIRwl2jV5Ws/NKVU=" +typstDeps = [] +description = "Operations on fractions" +license = [ + "MIT", +] +homepage = "https://github.com/ejbasas/fractus" + +[fractusist."0.3.2"] +url = "https://packages.typst.org/preview/fractusist-0.3.2.tar.gz" +hash = "sha256-MZLCEJq/4006XsJyf91k2WlF/zgQo2Nx0Ng1FsV4ojI=" +typstDeps = [ + "suiji_0_3_0", +] +description = "Create a variety of wonderful fractals and curves in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[fractusist."0.3.1"] +url = "https://packages.typst.org/preview/fractusist-0.3.1.tar.gz" +hash = "sha256-r2W2PTjgLYmBW2J8AMP6KMZC8QtJ0NfesIcEZHVNxSs=" +typstDeps = [ + "suiji_0_3_0", +] +description = "Create a variety of wonderful fractals and curves in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[fractusist."0.3.0"] +url = "https://packages.typst.org/preview/fractusist-0.3.0.tar.gz" +hash = "sha256-wwfAXz3v0fNXpfoAPwGrhnywurAbNRqteP5iXO2eNBY=" +typstDeps = [ + "suiji_0_3_0", +] +description = "Create a variety of wonderful fractals and curves in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[fractusist."0.2.1"] +url = "https://packages.typst.org/preview/fractusist-0.2.1.tar.gz" +hash = "sha256-3LjypKw7K/1b6PdQl6nx7MEit3+RWIt5ajEy3R2zoSI=" +typstDeps = [ + "suiji_0_3_0", +] +description = "Create a variety of wonderful fractals and curves in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[fractusist."0.2.0"] +url = "https://packages.typst.org/preview/fractusist-0.2.0.tar.gz" +hash = "sha256-0cO37CDCdROoMiiIMq4j5eSNfrYdV/SAzC6eSsuPWbk=" +typstDeps = [] +description = "Create a variety of wonderful fractals and curves in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[fractusist."0.1.1"] +url = "https://packages.typst.org/preview/fractusist-0.1.1.tar.gz" +hash = "sha256-5M+tYjNToqWsg/2XKCcQZQ9ch0HVJDpoHnDfbcJ8zEo=" +typstDeps = [] +description = "Create a variety of wonderful fractals in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[fractusist."0.1.0"] +url = "https://packages.typst.org/preview/fractusist-0.1.0.tar.gz" +hash = "sha256-P5SsaiLCPEW3Te6ellAeMOTNxsCrq1ju2qWmTRo2SxM=" +typstDeps = [] +description = "Create a variety of wonderful fractals in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[frame-it."1.1.2"] +url = "https://packages.typst.org/preview/frame-it-1.1.2.tar.gz" +hash = "sha256-kQ3ThqquoBUsn9WW0R93FTAGnkdyGc4dOc9XfZNOzPg=" +typstDeps = [] +description = "Beautiful, flexible, and integrated. Display custom frames for theorems, environments, and more. Attractive visuals with syntax that blends seamlessly into the source" +license = [ + "MIT", +] +homepage = "https://github.com/marc-thieme/frame-it" + +[frame-it."1.1.1"] +url = "https://packages.typst.org/preview/frame-it-1.1.1.tar.gz" +hash = "sha256-pYwsLkD2Xo26SACm7EYqjMmXOU8GfP9qJ9XLrdLxPmY=" +typstDeps = [] +description = "Beautiful, flexible, and integrated. Display custom frames for theorems, environments, and more. Attractive visuals with syntax that blends seamlessly into the source" +license = [ + "MIT", +] +homepage = "https://github.com/marc-thieme/frame-it" + +[frame-it."1.1.0"] +url = "https://packages.typst.org/preview/frame-it-1.1.0.tar.gz" +hash = "sha256-FsZmkx94QgBad48kvThhxhyqyLQMElKECWvxNUYsh7Y=" +typstDeps = [] +description = "Beautiful, flexible, and integrated. Display custom frames for theorems, environments, and more. Attractive visuals with syntax that blends seamlessly into the source" +license = [ + "MIT", +] +homepage = "https://github.com/marc-thieme/frame-it" + +[frame-it."1.0.0"] +url = "https://packages.typst.org/preview/frame-it-1.0.0.tar.gz" +hash = "sha256-dFhV0E8tYVrjyM2Acj6GtkX9YUKimFkb4wZP9gR6tss=" +typstDeps = [] +description = "Beautiful, flexible, and integrated. Display custom frames for theorems, environments, and more. Attractive visuals with syntax that blends seamlessly into the source" +license = [ + "MIT", +] +homepage = "https://github.com/marc-thieme/frame-it" + +[friendly-polylux."0.1.0"] +url = "https://packages.typst.org/preview/friendly-polylux-0.1.0.tar.gz" +hash = "sha256-mgOwl7b2nkmvW5dtDpuoZih1AAWqgCB5S1QRcevtftU=" +typstDeps = [ + "polylux_0_4_0", + "tiaoma_0_2_1", +] +description = "Friendly and playful template for Polylux" +license = [ + "MIT", +] +homepage = "https://github.com/polylux-typ/friendly" + +[fruitify."0.1.1"] +url = "https://packages.typst.org/preview/fruitify-0.1.1.tar.gz" +hash = "sha256-CEvzympelzWxXFudpn/7w1noPcfrq7RWUxcVHw+FqIs=" +typstDeps = [] +description = "Replace letters in equations with fruit emoji" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/T0mstone/typst-fruitify" + +[fruitify."0.1.0"] +url = "https://packages.typst.org/preview/fruitify-0.1.0.tar.gz" +hash = "sha256-/djCVsBkp4Guve1AweraBPE01Zc0SB9RQ2DheZlwvBw=" +typstDeps = [] +description = "Replace letters in equations with fruit emojis" +license = [ + "MIT", +] +homepage = "https://codeberg.org/T0mstone/typst-fruitify" + +[funarray."0.4.0"] +url = "https://packages.typst.org/preview/funarray-0.4.0.tar.gz" +hash = "sha256-PSl/2p8rEH7KxYuzs/gnUcUfWTQUHj9wODNwv8xmwlk=" +typstDeps = [ + "funarray_0_3_0", + "idwtet_0_3_0", +] +description = "Package providing convenient functional functions to use on arrays" +license = [ + "MIT", +] +homepage = "https://github.com/ludwig-austermann/typst-funarray" + +[funarray."0.3.0"] +url = "https://packages.typst.org/preview/funarray-0.3.0.tar.gz" +hash = "sha256-KORxcflDROjQuOepZwAuoQECk2b7vikZsCDhgQMmCu0=" +typstDeps = [ + "idwtet_0_2_0", +] +description = "Package providing convenient functional functions to use on arrays" +license = [ + "MIT", +] +homepage = "https://github.com/ludwig-austermann/typst-funarray" + +[funarray."0.2.0"] +url = "https://packages.typst.org/preview/funarray-0.2.0.tar.gz" +hash = "sha256-PL7W4WQ2Y/BhAHdpNmfNWPpAvhbeFRYhcxSRZjsUBrw=" +typstDeps = [] +description = "Package providing convenient functional functions to use on arrays" +license = [ + "MIT", +] +homepage = "https://github.com/ludwig-austermann/typst-funarray" + +[fuzzy-cnoi-statement."0.1.3"] +url = "https://packages.typst.org/preview/fuzzy-cnoi-statement-0.1.3.tar.gz" +hash = "sha256-EfMSqNURTDIh84oP0RlvJjRxYsDa48qvD/4u6wXZP/k=" +typstDeps = [ + "codelst_2_0_0", +] +description = "A template for CNOI(Olympiad in Informatics in China)-style statements for competitive programming" +license = [ + "MIT-0", +] +homepage = "https://github.com/Wallbreaker5th/fuzzy-cnoi-statement" + +[fuzzy-cnoi-statement."0.1.2"] +url = "https://packages.typst.org/preview/fuzzy-cnoi-statement-0.1.2.tar.gz" +hash = "sha256-q9aDYaOu6do+VtxFiMagUJcx93Nn5bnyAVsWZrw8ZTE=" +typstDeps = [ + "codelst_2_0_0", +] +description = "A template for CNOI(Olympiad in Informatics in China)-style statements for competitive programming" +license = [ + "MIT-0", +] +homepage = "https://github.com/Wallbreaker5th/fuzzy-cnoi-statement" + +[fuzzy-cnoi-statement."0.1.1"] +url = "https://packages.typst.org/preview/fuzzy-cnoi-statement-0.1.1.tar.gz" +hash = "sha256-rhZCGzB78R0OKDVJvMmAttUOp8pr677A/muWK1IJv48=" +typstDeps = [ + "codelst_2_0_0", +] +description = "A template for CNOI(Olympiad in Informatics in China)-style statements for competitive programming" +license = [ + "MIT-0", +] +homepage = "https://github.com/Wallbreaker5th/fuzzy-cnoi-statement" + +[fuzzy-cnoi-statement."0.1.0"] +url = "https://packages.typst.org/preview/fuzzy-cnoi-statement-0.1.0.tar.gz" +hash = "sha256-LVUIrP8yHkMxdCI1dOEVIpX8R5BYYhq58V17eXoR4Rs=" +typstDeps = [ + "codelst_2_0_0", +] +description = "A template for CNOI(Olympiad in Informatics in China)-style statements for competitive programming" +license = [ + "MIT-0", +] +homepage = "https://github.com/Wallbreaker5th/fuzzy-cnoi-statement" + +[fyrst-ru-labreport."0.1.0"] +url = "https://packages.typst.org/preview/fyrst-ru-labreport-0.1.0.tar.gz" +hash = "sha256-RC/HAKUic0fHniU1UNL4lsTmd9d+l+ZseEU7f4cVv+c=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", + "unify_0_7_0", +] +description = "Reykjavík University Lab Report Template" +license = [ + "GPL-3.0-or-later", +] + +[g-exam."0.4.2"] +url = "https://packages.typst.org/preview/g-exam-0.4.2.tar.gz" +hash = "sha256-PLlZ4+/CPccRlre8hTfe8/tNe/372pHPeX6ZuikuyCI=" +typstDeps = [ + "oxifmt_0_2_0", + "oxifmt_0_2_1", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.4.1"] +url = "https://packages.typst.org/preview/g-exam-0.4.1.tar.gz" +hash = "sha256-8LIOhBCxrmTsX8DR0pSuGV7hGULvz2HAuIutPmJ2z5U=" +typstDeps = [ + "oxifmt_0_2_0", + "oxifmt_0_2_1", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.4.0"] +url = "https://packages.typst.org/preview/g-exam-0.4.0.tar.gz" +hash = "sha256-9og+m/vp1pFckEnQvug6C3Si8MU2iP5Mo109df4K4h4=" +typstDeps = [ + "oxifmt_0_2_0", + "oxifmt_0_2_1", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.3.2"] +url = "https://packages.typst.org/preview/g-exam-0.3.2.tar.gz" +hash = "sha256-lStEam+Du2Zfb8NzVciMfsm1hruB3Y7OOV17956+cyk=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.3.1"] +url = "https://packages.typst.org/preview/g-exam-0.3.1.tar.gz" +hash = "sha256-ty9h9uZUccdyIzVoXZVJpq3cJgPyWUrIyBe5CUzrZpQ=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.3.0"] +url = "https://packages.typst.org/preview/g-exam-0.3.0.tar.gz" +hash = "sha256-vi/ICLdb3X6kR8VKQL1/jhoPoooomg24AYIhQZ5j74A=" +typstDeps = [ + "g-exam_0_2_0", + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.2.0"] +url = "https://packages.typst.org/preview/g-exam-0.2.0.tar.gz" +hash = "sha256-oRP8AVNK5rS+3oEajim/3HrcmOOw8265SOvRTbDlUMQ=" +typstDeps = [ + "cetz_0_2_1", + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.1.1"] +url = "https://packages.typst.org/preview/g-exam-0.1.1.tar.gz" +hash = "sha256-AqqkJZtn7QJkLodiCjxV612JJ4dN8/OwKl3FO8uqdlg=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.1.0"] +url = "https://packages.typst.org/preview/g-exam-0.1.0.tar.gz" +hash = "sha256-Mmwb6iyJT0FxJgVYdUY3xcJ5tTEAqMaY5ijeRM7Yz4w=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[game-theoryst."0.1.0"] +url = "https://packages.typst.org/preview/game-theoryst-0.1.0.tar.gz" +hash = "sha256-1FtNDcbP6TBXZQ9SlWzmHSrp6F8pTPEnjDKougnlCqI=" +typstDeps = [ + "pinit_0_1_4", +] +description = "A package for typesetting games in Typst" +license = [ + "AGPL-3.0-only", +] +homepage = "https://github.com/connortwiegand/game-theoryst" + +[gantty."0.2.0"] +url = "https://packages.typst.org/preview/gantty-0.2.0.tar.gz" +hash = "sha256-AFrlAvMhIeQ8yP9Oa8ID4eO9eA4jGzEGxI6BnBjHlik=" +typstDeps = [ + "cetz_0_3_1", +] +description = "Create gantt charts using datetimes" +license = [ + "LGPL-3.0-only", +] +homepage = "https://gitlab.com/john_t/typst-gantty" + +[gantty."0.1.0"] +url = "https://packages.typst.org/preview/gantty-0.1.0.tar.gz" +hash = "sha256-x2Pqz9YNFGBAPludpA8EcnQ6pizeRC2kes4gK5etqSc=" +typstDeps = [ + "cetz_0_3_1", +] +description = "Create gantt charts using datetimes" +license = [ + "LGPL-3.0-only", +] +homepage = "https://gitlab.com/john_t/typst-gantty" + +[genealotree."0.2.0"] +url = "https://packages.typst.org/preview/genealotree-0.2.0.tar.gz" +hash = "sha256-RvKMkv1h5huYkLTNdGOijBi+wBMZxud93f24WDhJ28s=" +typstDeps = [ + "cetz_0_3_1", + "t4t_0_3_2", +] +description = "A package to draw genealogical trees, based on CeTZ" +license = [ + "GPL-3.0-only", +] +homepage = "https://codeberg.org/drloiseau/genealogy" + +[genealotree."0.1.0"] +url = "https://packages.typst.org/preview/genealotree-0.1.0.tar.gz" +hash = "sha256-koLFbWm+rJPiO6Ki4g0GDu8fk3R+/+o9B3Mogn9iZ20=" +typstDeps = [ + "cetz_0_2_2", + "mantys_0_1_3", + "showman_0_1_1", + "tidy_0_2_0", +] +description = "A package to draw genealogical trees, based on CeTZ" +license = [ + "GPL-3.0-only", +] +homepage = "https://codeberg.org/drloiseau/genealogy" + +[gentle-clues."1.2.0"] +url = "https://packages.typst.org/preview/gentle-clues-1.2.0.tar.gz" +hash = "sha256-oQ/HcKJRijQPM450fNF7vF5WAQCu3bWLmy6bkmrnHfg=" +typstDeps = [ + "linguify_0_4_2", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."1.1.0"] +url = "https://packages.typst.org/preview/gentle-clues-1.1.0.tar.gz" +hash = "sha256-dNu3KMkbnbaI2gb4yeVQ4dczNaEj63D0U1INwv+Nj6M=" +typstDeps = [ + "linguify_0_4_0", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."1.0.0"] +url = "https://packages.typst.org/preview/gentle-clues-1.0.0.tar.gz" +hash = "sha256-/ht2Jxt2iGGyMJ5IlCdxTadp5cE1RXZ4x7nhcDCL4hQ=" +typstDeps = [ + "linguify_0_4_0", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.9.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.9.0.tar.gz" +hash = "sha256-LuFJvWPZBIWGMs3VDYvnU3FBUhvmW+MnF/RnH+9PTnc=" +typstDeps = [ + "linguify_0_4_0", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.8.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.8.0.tar.gz" +hash = "sha256-Ze1BkoxQNC4g+TuaOgE0liqg+fmKuxwrF+PS5HS5T80=" +typstDeps = [ + "linguify_0_4_0", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.7.1"] +url = "https://packages.typst.org/preview/gentle-clues-0.7.1.tar.gz" +hash = "sha256-wXnn1yH08/WZ8BKjbckcCeMQpEp1NmpiycdQtS+/Up0=" +typstDeps = [ + "linguify_0_3_1", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.7.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.7.0.tar.gz" +hash = "sha256-H185bbeAP4FRwjNqB1IilBrC9FjCcNYQKP9N4yiiIU4=" +typstDeps = [ + "linguify_0_3_0", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.6.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.6.0.tar.gz" +hash = "sha256-F1v2ddEE8frEbUFmQXo4U5ErAr6piy3v9JK0ueBT26Y=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.5.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.5.0.tar.gz" +hash = "sha256-nTL2Q+PmJpjMx+IONrARiEdeg1H134yg5Hs3/yHHPqQ=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-admonish" + +[gentle-clues."0.4.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.4.0.tar.gz" +hash = "sha256-FopJ9x0PwJ75FpZzJ6bWOGfKi+nEv33BG2JvKrwjWOU=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-admonish" + +[gentle-clues."0.3.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.3.0.tar.gz" +hash = "sha256-wM8+dJlt5sinHEfeukemU5GCpoSCgWLIPhlo9OgwUkM=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-admonish" + +[gentle-clues."0.2.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.2.0.tar.gz" +hash = "sha256-taOqroBAXxmLEmJ+vx8iDv8rQkxvTMOXH7QI+go2RDc=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] + +[gentle-clues."0.1.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.1.0.tar.gz" +hash = "sha256-/ZfCEqiaSbo9Vp31LSccM1XUzYOey7ZwJEggfkK4YsU=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] + +[georges-yetyp."0.2.0"] +url = "https://packages.typst.org/preview/georges-yetyp-0.2.0.tar.gz" +hash = "sha256-8D8yog9VhYEhXbOxV3aETd0MkfnM5dp3IxWXZbTa55Y=" +typstDeps = [] +description = "Unofficial template for Polytech Grenoble internship reports" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/elegaanz/georges-yetyp" + +[georges-yetyp."0.1.0"] +url = "https://packages.typst.org/preview/georges-yetyp-0.1.0.tar.gz" +hash = "sha256-FXlaaujhd4EGTEB4zxrldcVG6nveJOlJd87tBgLRwTE=" +typstDeps = [] +description = "Unofficial template for Polytech Grenoble internship reports" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/elegaanz/georges-yetyp" + +[gloss-awe."0.0.5"] +url = "https://packages.typst.org/preview/gloss-awe-0.0.5.tar.gz" +hash = "sha256-DVVxTx6TN3oZjWy1W9VZdAj0ymLpoFtEIaS0RO3KkE4=" +typstDeps = [] +description = "Awesome Glossary for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/gloss-awe" + +[gloss-awe."0.0.4"] +url = "https://packages.typst.org/preview/gloss-awe-0.0.4.tar.gz" +hash = "sha256-jPukTVrk1spgzTwzaDzWwJH7cbBdOsIHyIx53B7POJ0=" +typstDeps = [] +description = "Awesome Glossary for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/typst-glossary" + +[gloss-awe."0.0.3"] +url = "https://packages.typst.org/preview/gloss-awe-0.0.3.tar.gz" +hash = "sha256-CPgyPw5giFS1sQXgczM2Rzk5u6BPqZ4rDCsboFliC9k=" +typstDeps = [] +description = "An Awesome Glossary for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/typst-glossary" + +[glossarium."0.5.4"] +url = "https://packages.typst.org/preview/glossarium-0.5.4.tar.gz" +hash = "sha256-OXkASSsWbK2IjoRK6n8L1VLOLKqoj184+2Nl1KrAGh8=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.5.3"] +url = "https://packages.typst.org/preview/glossarium-0.5.3.tar.gz" +hash = "sha256-rStKB+t5GHdJlTW62hptnnR+jNQSfnum+EGXTJkY/4M=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.5.2"] +url = "https://packages.typst.org/preview/glossarium-0.5.2.tar.gz" +hash = "sha256-Tu2byG0g5gNYa4xfe+8wWO481+afQgKLHySyALDVgrw=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.5.1"] +url = "https://packages.typst.org/preview/glossarium-0.5.1.tar.gz" +hash = "sha256-f7BLwG+8U/YKnnNiUGACiPppa7mGEECBgOZYvLdQCrM=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.5.0"] +url = "https://packages.typst.org/preview/glossarium-0.5.0.tar.gz" +hash = "sha256-++xzXtsv4jDh6XH9cRuEJv9l37gesWYTl4uIub7hXBg=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.4.2"] +url = "https://packages.typst.org/preview/glossarium-0.4.2.tar.gz" +hash = "sha256-wT1rCzfcCwMPM6l9imA+JNzwzJsPf4SALVJ5QiaVF0k=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.4.1"] +url = "https://packages.typst.org/preview/glossarium-0.4.1.tar.gz" +hash = "sha256-zUSkga1UiInv79+3oZ0sGQ7gvwHOYm0q2fM/uJ3eFHQ=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.4.0"] +url = "https://packages.typst.org/preview/glossarium-0.4.0.tar.gz" +hash = "sha256-gfKkatI389dGlLaq6pJN0AMYs96+t3LM2sCt7Q8x7pg=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.3.0"] +url = "https://packages.typst.org/preview/glossarium-0.3.0.tar.gz" +hash = "sha256-uwgmxTeQCTxQGEJQyPGGDztE6++aA60WfUsTH9dOxJw=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.2.6"] +url = "https://packages.typst.org/preview/glossarium-0.2.6.tar.gz" +hash = "sha256-tQ2YDPcJChJK/6MJO15/G5WOX1v/T+hJvfU0G5evTeQ=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.2.5"] +url = "https://packages.typst.org/preview/glossarium-0.2.5.tar.gz" +hash = "sha256-B+4GykbLJXfDq3JRrtv39ODvg878ZdMKPmvkHRJuRH4=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.2.4"] +url = "https://packages.typst.org/preview/glossarium-0.2.4.tar.gz" +hash = "sha256-7W2pXf4VDYmpS22hF9p3crsRd7NR0edXlh8F9Bb17Ao=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.2.3"] +url = "https://packages.typst.org/preview/glossarium-0.2.3.tar.gz" +hash = "sha256-BMIZNhYt6otDeZBgxe0hqYZwu0kJ32u/XxeKh8NUtFY=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/slashformotion/glossarium" + +[glossarium."0.2.2"] +url = "https://packages.typst.org/preview/glossarium-0.2.2.tar.gz" +hash = "sha256-/cILLiIGo9MEDCYel2bgP43Jmd8pzJDxa1I87A7VKCc=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.2.1"] +url = "https://packages.typst.org/preview/glossarium-0.2.1.tar.gz" +hash = "sha256-SK0Ighj+9GNlBVzqkWM3/ljJL2zZHrG3AQNGgX+yr2Q=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/slashformotion/glossarium" + +[glossarium."0.2.0"] +url = "https://packages.typst.org/preview/glossarium-0.2.0.tar.gz" +hash = "sha256-4V5RFcDeLW70KFjJstoNic9AmRrhXwEJBqJnamhcOhk=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/slashformotion/glossarium" + +[glossarium."0.1.0"] +url = "https://packages.typst.org/preview/glossarium-0.1.0.tar.gz" +hash = "sha256-O36TdR7DxoA6k3OHo39vrWX1nrSrsQq4b9VXhQspZaM=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/slashformotion/glossarium" + +[glossy."0.8.0"] +url = "https://packages.typst.org/preview/glossy-0.8.0.tar.gz" +hash = "sha256-7vhOwDSgwHCLwZ2h2MNn7dRYlyhCdB9rxG58SDunBBs=" +typstDeps = [ + "glossarium_0_5_3", + "valkyrie_0_2_2", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.7.0"] +url = "https://packages.typst.org/preview/glossy-0.7.0.tar.gz" +hash = "sha256-Qt2XoZeSw9w2oPpVmR7DxtpYgM+HBQroTck9KkE9qeY=" +typstDeps = [ + "glossarium_0_5_3", + "valkyrie_0_2_2", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.6.0"] +url = "https://packages.typst.org/preview/glossy-0.6.0.tar.gz" +hash = "sha256-GF+UKSxd/K57frAgzxpwhByAo2uZibbhl01KLAZD2Xw=" +typstDeps = [ + "glossarium_0_5_1", + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.5.2"] +url = "https://packages.typst.org/preview/glossy-0.5.2.tar.gz" +hash = "sha256-afjFWWTSPRhUJwUPhYNkPQdaWNbGblZWXXMXIYgiMgE=" +typstDeps = [ + "glossarium_0_5_1", + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.5.1"] +url = "https://packages.typst.org/preview/glossy-0.5.1.tar.gz" +hash = "sha256-UmXBNMBLHEckKl5FBvltim9UobPkYu6zlQyx9UA/WK4=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.5.0"] +url = "https://packages.typst.org/preview/glossy-0.5.0.tar.gz" +hash = "sha256-HKy8jiheIwO6g/R5eOmy55/Rhpt2Bnm6T+C+yVkvO+E=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.4.1"] +url = "https://packages.typst.org/preview/glossy-0.4.1.tar.gz" +hash = "sha256-kMKeM24y6sJ+kUi7E97Hm54tEdorMiHbNkgsW7Bkx40=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.4.0"] +url = "https://packages.typst.org/preview/glossy-0.4.0.tar.gz" +hash = "sha256-km8u8jInFksaNqT0j81+xFSy8BNCZjz4Uz0kNxCOET4=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.3.0"] +url = "https://packages.typst.org/preview/glossy-0.3.0.tar.gz" +hash = "sha256-KLNnhsZWGqQ0oUTp1rnzB6cN4fzBmVsXboj3NdXhhm4=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.2.2"] +url = "https://packages.typst.org/preview/glossy-0.2.2.tar.gz" +hash = "sha256-qFvx4q4kzu60/gLs7Y7ebkvhSUBs4pdDQLk/1tz1sg0=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.2.1"] +url = "https://packages.typst.org/preview/glossy-0.2.1.tar.gz" +hash = "sha256-hfbprk6x57XOcMa5HEXVs73PCpLeh2CJYeTjI4/m+BA=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.2.0"] +url = "https://packages.typst.org/preview/glossy-0.2.0.tar.gz" +hash = "sha256-cThfCe0IvWLboyqbnIravumLGpNeYXxQeAfOTvKAPaU=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.1.2"] +url = "https://packages.typst.org/preview/glossy-0.1.2.tar.gz" +hash = "sha256-lYsYNmBCp6YNSyyiZhy7k3W/cPcMRc0yRKVEi9nGbbU=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.1.1"] +url = "https://packages.typst.org/preview/glossy-0.1.1.tar.gz" +hash = "sha256-DjdPzAb4iUlXSX2UWsSzi9D4Oy8Cohk8Cb+YJ7bsS9I=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.1.0"] +url = "https://packages.typst.org/preview/glossy-0.1.0.tar.gz" +hash = "sha256-9HqjdNbWVz8VBWG4UWEGFyOH//7t5mHs/WySPas5yMg=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[gqe-lemoulon-presentation."0.0.5"] +url = "https://packages.typst.org/preview/gqe-lemoulon-presentation-0.0.5.tar.gz" +hash = "sha256-EKRM2pcccly4vMbMWCTOQednyIpPBet5RBOzrsZGLs4=" +typstDeps = [ + "showybox_2_0_3", + "tablem_0_1_0", + "touying_0_5_3", +] +description = "Quickly generate slides for a GQE-Le moulon presentation" +license = [ + "GPL-3.0-only", +] + +[gqe-lemoulon-presentation."0.0.4"] +url = "https://packages.typst.org/preview/gqe-lemoulon-presentation-0.0.4.tar.gz" +hash = "sha256-590iNmmEIwSceZA5tzWE+THuEiMUFvlVhkUADoVrzT4=" +typstDeps = [ + "showybox_2_0_3", + "touying_0_5_3", +] +description = "Quickly generate slides for a GQE-Le moulon presentation" +license = [ + "GPL-3.0-only", +] + +[graceful-genetics."0.2.0"] +url = "https://packages.typst.org/preview/graceful-genetics-0.2.0.tar.gz" +hash = "sha256-Dg1bG9drD3b0nM5Kso+pp8juWTIdiIM+K8okd0vQh+M=" +typstDeps = [ + "physica_0_9_3", +] +description = "A paper template with which to publish in journals and at conferences" +license = [ + "Unlicense", +] +homepage = "https://github.com/JamesxX/graceful-genetics" + +[graceful-genetics."0.1.0"] +url = "https://packages.typst.org/preview/graceful-genetics-0.1.0.tar.gz" +hash = "sha256-BvwgKR/yqHPm4GdThGnxcO54wZ40Grt7XSoqOLnsPHU=" +typstDeps = [ + "physica_0_9_3", +] +description = "A paper template with which to publish in journals and at conferences" +license = [ + "Unlicense", +] +homepage = "https://github.com/JamesxX/graceful-genetics" + +[gradslide."0.1.0"] +url = "https://packages.typst.org/preview/gradslide-0.1.0.tar.gz" +hash = "sha256-wM8Bj1PEWrm0mVNi+PPSKMWSukXZFRtMI27xQBKEVmc=" +typstDeps = [] +description = "Simple component to show a value between 0 and 1 on a nice gradient slider" +license = [ + "MIT", +] + +[grape-suite."2.0.0"] +url = "https://packages.typst.org/preview/grape-suite-2.0.0.tar.gz" +hash = "sha256-c0LlnyarxBx8LBmAk51QDuBPbMZRiHfRb7bcrUn9Zfw=" +typstDeps = [ + "polylux_0_4_0", +] +description = "Library of templates for exams, seminar papers, homeworks, etc" +license = [ + "MIT", +] +homepage = "https://github.com/piepert/grape-suite" + +[grape-suite."1.0.0"] +url = "https://packages.typst.org/preview/grape-suite-1.0.0.tar.gz" +hash = "sha256-HIiU/wUotObdv8W+tB0f/TqmpdQPxCnkfibDa/x2KUM=" +typstDeps = [ + "polylux_0_3_1", +] +description = "Library of templates for exams, seminar papers, homeworks, etc" +license = [ + "MIT", +] +homepage = "https://github.com/piepert/grape-suite" + +[grape-suite."0.1.0"] +url = "https://packages.typst.org/preview/grape-suite-0.1.0.tar.gz" +hash = "sha256-p4bIM8yr8oIC/45OhowBy2W60GNIIHzIN+BVPHZ6PFk=" +typstDeps = [ + "polylux_0_3_1", +] +description = "Library of templates for exams, seminar papers, homeworks, etc" +license = [ + "MIT", +] +homepage = "https://github.com/piepert/grape-suite" + +[grayness."0.3.0"] +url = "https://packages.typst.org/preview/grayness-0.3.0.tar.gz" +hash = "sha256-0mZHo4t/5q/rVkaM7YqKs7ugPADWcofFvYa2eeU59K8=" +typstDeps = [] +description = "Simple image editing capabilities like converting to grayscale and cropping via a WASM plugin" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/nineff/grayness" + +[grayness."0.2.0"] +url = "https://packages.typst.org/preview/grayness-0.2.0.tar.gz" +hash = "sha256-b7nG9wEHhvN3Hhx4VnjjWmAF6ymWAkhdYEWFMAxU2js=" +typstDeps = [] +description = "Simple image editing capabilities like converting to grayscale and cropping via a WASM plugin" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/nineff/grayness" + +[grayness."0.1.0"] +url = "https://packages.typst.org/preview/grayness-0.1.0.tar.gz" +hash = "sha256-f4OhkAg+/myZX1GOjZ9x50YNAE73xWlZJEU/p8OZvSI=" +typstDeps = [] +description = "Simple image editing capabilities like converting to grayscale and cropping via a WASM plugin" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/nineff/grayness" + +[great-theorems."0.1.2"] +url = "https://packages.typst.org/preview/great-theorems-0.1.2.tar.gz" +hash = "sha256-JQAsHkekAQDOHlZag2G0JX1beDe03wzP7bhZ/d0xCkY=" +typstDeps = [] +description = "Theorem/Proof environments. Straightforward, functional, clean" +license = [ + "MIT", +] +homepage = "https://github.com/jbirnick/typst-great-theorems" + +[great-theorems."0.1.1"] +url = "https://packages.typst.org/preview/great-theorems-0.1.1.tar.gz" +hash = "sha256-pSdEW5J9nrId1JGjLe/WkjV1ALGKJgBzBtdDNJyyPaY=" +typstDeps = [] +description = "Straightforward and functional theorem/proof environments" +license = [ + "MIT", +] +homepage = "https://github.com/jbirnick/typst-great-theorems" + +[great-theorems."0.1.0"] +url = "https://packages.typst.org/preview/great-theorems-0.1.0.tar.gz" +hash = "sha256-2O2HcqIsxMSDvrDUYUWmSvw98/xUv/OinsCUZ0AoNDc=" +typstDeps = [] +description = "Straightforward and functional theorem/proof environments" +license = [ + "MIT", +] +homepage = "https://github.com/jbirnick/typst-great-theorems" + +[gridlock."0.3.0"] +url = "https://packages.typst.org/preview/gridlock-0.3.0.tar.gz" +hash = "sha256-B/o48gnSfhS01A7MjfXdIkbGlPOLQ3ag6Pq02VDHccg=" +typstDeps = [] +description = "Grid typesetting in Typst" +license = [ + "Unlicense", +] +homepage = "https://github.com/ssotoen/gridlock" + +[gridlock."0.2.0"] +url = "https://packages.typst.org/preview/gridlock-0.2.0.tar.gz" +hash = "sha256-4PK74BSP2jzqpJ1QZhc6tN7FYcDuJqjF6zN2FO3wlnQ=" +typstDeps = [] +description = "Grid typesetting in Typst" +license = [ + "Unlicense", +] +homepage = "https://github.com/ssotoen/gridlock" + +[gridlock."0.1.0"] +url = "https://packages.typst.org/preview/gridlock-0.1.0.tar.gz" +hash = "sha256-DVeyfYxtDDuPSwkVRvIBlj0nrQ9Az51lD+jxeyU7WiQ=" +typstDeps = [] +description = "Grid typesetting in Typst" +license = [ + "Unlicense", +] +homepage = "https://github.com/ssotoen/gridlock" + +[grotesk-cv."1.0.2"] +url = "https://packages.typst.org/preview/grotesk-cv-1.0.2.tar.gz" +hash = "sha256-Vo+LH70Ny+28MxE06YXmg+YuCzLkiNHXP+ytUqL/DKg=" +typstDeps = [] +description = "A clean CV and cover letter template based on Brilliant-cv and fireside templates" +license = [ + "Unlicense", +] +homepage = "https://github.com/AsiSkarp/grotesk-cv" + +[grotesk-cv."1.0.1"] +url = "https://packages.typst.org/preview/grotesk-cv-1.0.1.tar.gz" +hash = "sha256-NztTYJYA+syZg21Ce+dvNyO/MhmAJvoWWMe74X0Xc0s=" +typstDeps = [ + "fontawesome_0_4_0", +] +description = "A clean CV and cover letter template based on Brilliant-cv and fireside templates" +license = [ + "Unlicense", +] +homepage = "https://github.com/AsiSkarp/grotesk-cv" + +[grotesk-cv."1.0.0"] +url = "https://packages.typst.org/preview/grotesk-cv-1.0.0.tar.gz" +hash = "sha256-1+ASdtTEvAT+jwTNgmdSJTIePo6L/oiwyEndH6NXjsM=" +typstDeps = [ + "fontawesome_0_4_0", +] +description = "A clean CV and cover letter template based on brilliant-cv and fireside templates" +license = [ + "Unlicense", +] +homepage = "https://github.com/AsiSkarp/grotesk-cv" + +[grotesk-cv."0.1.6"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.6.tar.gz" +hash = "sha256-+3g8uDV0kXxHJoAVTNxmO35SWvFIA2eP/VRAcGvBGME=" +typstDeps = [ + "fontawesome_0_4_0", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.5"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.5.tar.gz" +hash = "sha256-25kvb0Ym3xw/kSj49Khdmnza/X+UcEkyqcHVsQWzZB8=" +typstDeps = [ + "fontawesome_0_4_0", + "grotesk-cv_0_1_4", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.4"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.4.tar.gz" +hash = "sha256-zTuOlzcxxpPf1PL/JgJqUZNFc9UrUrOrDd1iRn3Up8c=" +typstDeps = [ + "fontawesome_0_4_0", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.3"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.3.tar.gz" +hash = "sha256-55BFXAX/oZrTg8PiAlKlyWwCb4kbuNxZWxG+H5k84WY=" +typstDeps = [ + "fontawesome_0_4_0", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.2"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.2.tar.gz" +hash = "sha256-6s8z8PhAXBLmip3D/9Rlcu5/lkvLd97r/bPk9sbFi0E=" +typstDeps = [ + "fontawesome_0_2_1", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.1"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.1.tar.gz" +hash = "sha256-hvMDjoUsepnu0s5fwcBdx4Lvfa9LZU28iDuzUTQO1eM=" +typstDeps = [ + "fontawesome_0_2_1", + "grotesk-cv_0_1_0", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.0"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.0.tar.gz" +hash = "sha256-bC1lpdzWU3ZixDMiFMU2utOTv9Ayhbk4pxcFHB0Y3ho=" +typstDeps = [ + "fontawesome_0_2_1", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[gru."0.1.0"] +url = "https://packages.typst.org/preview/gru-0.1.0.tar.gz" +hash = "sha256-1inkfx6ZLSBK6vUpQxqWmekETuRQ7ba0KdsBct0RyBI=" +typstDeps = [] +description = "A despicable Typst template" +license = [ + "MIT", +] +homepage = "https://github.com/EdwinChang24/typst-gru" + +[guided-resume-starter-cgc."2.0.0"] +url = "https://packages.typst.org/preview/guided-resume-starter-cgc-2.0.0.tar.gz" +hash = "sha256-vj/U0MOVCQBsw/5EJPraeyl3ifjrvMsgpoE26NC1xqM=" +typstDeps = [] +description = "A guided starter resume for people looking to focus on highlighting their experience -- without having to worry about the hassle of formatting" +license = [ + "Unlicense", +] +homepage = "https://github.com/chaoticgoodcomputing/typst-resume-starter" + +[gviz."0.1.0"] +url = "https://packages.typst.org/preview/gviz-0.1.0.tar.gz" +hash = "sha256-Yn7PVGMfOMIZTTALXYrevbFL5rKe2MTNdgHVYBWwa6g=" +typstDeps = [] +description = "Generate graphs using the graphviz dot language" +license = [ + "Unlicense", +] +homepage = "https://codeberg.org/Sekoia/gviz-typst" + +[hagakiii."0.1.0"] +url = "https://packages.typst.org/preview/hagakiii-0.1.0.tar.gz" +hash = "sha256-cIJ562PgOM0flVEhS+7tyuMX+SH/2rxlifpqI5PBr+E=" +typstDeps = [] +description = "Print address labels on Japanese postcards" +license = [ + "MIT", +] +homepage = "https://github.com/34j/typst-hagakiii" + +[hamnosys-includer."0.1.0"] +url = "https://packages.typst.org/preview/hamnosys-includer-0.1.0.tar.gz" +hash = "sha256-kLu2ci0HW9sRpop9HZ1Hd8UcBrozLcn4LDuubXrFjKM=" +typstDeps = [] +description = "For using HamNoSys in Typst" +license = [ + "LPPL-1.3c", +] +homepage = "https://github.com/TestTimothy/Typst-HamNoSys" + +[hand-in."1.0.0"] +url = "https://packages.typst.org/preview/hand-in-1.0.0.tar.gz" +hash = "sha256-c7xX5I3AImc7cWhxtLhsHa3EOx5zNAq4Tlqtn/DV5EM=" +typstDeps = [] +description = "Clean and minimalist assignment" +license = [ + "MIT-0", +] +homepage = "https://github.com/mkorje/typst-hand-in" + +[handy-dora."0.1.0"] +url = "https://packages.typst.org/preview/handy-dora-0.1.0.tar.gz" +hash = "sha256-3cDtmhJjp2GgBMQGUyUrd8hq6SQ9ggKD7vsR9e1OUvQ=" +typstDeps = [] +description = "Handy-dora is a package visualizing mahjong tiles. It's powered by wasm and Riichi-hand-rs" +license = [ + "MIT", +] +homepage = "https://github.com/hongjr03/typst-mahjong-tiles" + +[hane."0.1.0"] +url = "https://packages.typst.org/preview/hane-0.1.0.tar.gz" +hash = "sha256-L/E/1d+kuJvi7hmfkhcbVhUE3AHsNK/kRHRG/47bpew=" +typstDeps = [] +description = "Draws go/baduk/weiqi diagrams" +license = [ + "MIT", +] + +[hanzi-calligraphy."0.1.0"] +url = "https://packages.typst.org/preview/hanzi-calligraphy-0.1.0.tar.gz" +hash = "sha256-fWpqyCuAZkmK/YY0qVGL4ohbjo2d6gn/Ot60tQj49aE=" +typstDeps = [] +description = "用于书法练习的田字格模板。A calligraphy practice template" +license = [ + "MIT", +] +homepage = "https://github.com/yuegeao/hanzi-calligraphy" + +[harvard-gsas-thesis-oat."0.1.4"] +url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.4.tar.gz" +hash = "sha256-yurD53i4zYGfYjTWd0NREli8bhRZZwvbBN8VZDBbyD4=" +typstDeps = [] +description = "PhD Thesis template for Harvard GSAS (Graduate School of Arts and Sciences" +license = [ + "MIT", +] +homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat" + +[harvard-gsas-thesis-oat."0.1.3"] +url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.3.tar.gz" +hash = "sha256-x9/euXk9ao9W0bwHcUJmCW/OjjJ2fjMT45rmIJwZ4Wg=" +typstDeps = [] +description = "PhD Thesis template for Harvard GSAS (Graduate School of Arts and Sciences" +license = [ + "MIT", +] +homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat" + +[harvard-gsas-thesis-oat."0.1.2"] +url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.2.tar.gz" +hash = "sha256-0jtA8keC7ycWdDv1nRuENUqPNG13pbb9njrruhecciI=" +typstDeps = [] +description = "PhD Thesis template for Harvard GSAS (Graduate School of Arts and Sciences" +license = [ + "MIT", +] +homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat" + +[harvard-gsas-thesis-oat."0.1.1"] +url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.1.tar.gz" +hash = "sha256-cwz9opxNmFwVPJB/uV/te87jUZP7MsbNGUj6t6jDKqc=" +typstDeps = [] +description = "PhD Thesis template for Harvard GSAS (Graduate School of Arts and Sciences" +license = [ + "MIT", +] +homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat" + +[harvard-gsas-thesis-oat."0.1.0"] +url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.0.tar.gz" +hash = "sha256-gAAGUQOGEgK2v1q3SYSEgdvvYToTIGvJNU5nowBnIzg=" +typstDeps = [] +description = "PhD Thesis template for Harvard GSAS (Graduate School of Arts and Sciences" +license = [ + "MIT", +] +homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat" + +[haw-hamburg."0.5.1"] +url = "https://packages.typst.org/preview/haw-hamburg-0.5.1.tar.gz" +hash = "sha256-B9r2CqFlw7129Ow8y9aOQXe6y2O3/GKm2YSDP5pHU6k=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.5.0"] +url = "https://packages.typst.org/preview/haw-hamburg-0.5.0.tar.gz" +hash = "sha256-l06N1tESZzZSJhy1ZFs0SuMBOhe9lFLvkckFLXF0trg=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.4.0"] +url = "https://packages.typst.org/preview/haw-hamburg-0.4.0.tar.gz" +hash = "sha256-FnjX1RCgEkIoIquY4HfyrYcPN/FQngYMzmUgp6QvTrw=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.3.3"] +url = "https://packages.typst.org/preview/haw-hamburg-0.3.3.tar.gz" +hash = "sha256-c3/cGmh0qy/uy8XMNRYJ0tScyvg+MYPreCCPo91HJl8=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.3.1"] +url = "https://packages.typst.org/preview/haw-hamburg-0.3.1.tar.gz" +hash = "sha256-WOlXmn5qf+8B/HfFkXNXa8o2JlsrMfBtorpywXNgZ9A=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.3.0"] +url = "https://packages.typst.org/preview/haw-hamburg-0.3.0.tar.gz" +hash = "sha256-XweoFyX5U3plqBsD944Wcsi1ey+NUdLi6WoD/X8/vXs=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.2.0"] +url = "https://packages.typst.org/preview/haw-hamburg-0.2.0.tar.gz" +hash = "sha256-tMP2yDPAtRC6ul7acXuhIzN/gkCqTf1Ar8eLfUs+baA=" +typstDeps = [ + "glossarium_0_4_2", + "haw-hamburg_0_1_0", +] +description = "Unofficial template for writing a report or thesis in the `HAW Hamburg` department of `Computer Science` design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.1.0"] +url = "https://packages.typst.org/preview/haw-hamburg-0.1.0.tar.gz" +hash = "sha256-7RcOokFNH6AOnR4NMzproy5T7cSC5Uafrnpgz/8rMDI=" +typstDeps = [ + "glossarium_0_4_1", +] +description = "Unofficial template for writing a report or thesis in the `HAW Hamburg` department of `Computer Science` design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.5.1"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.5.1.tar.gz" +hash = "sha256-keM157SF7OS0FT0HGgFbhhZhA7lUqDMaRDmNHU6CIzE=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_1", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.5.0"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.5.0.tar.gz" +hash = "sha256-y3RuWHrhvO7IH0cPRM9s3k0dK628Kho4uvYE7jBVJeA=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_0", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.4.0"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.4.0.tar.gz" +hash = "sha256-97iY2zDg42J8dm6PWqbGimZ/VJbB6B8JoCguJ60JSKs=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_4_0", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.3.3"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.3.3.tar.gz" +hash = "sha256-t2bom6Pqqzwp9jfGGjltz23iihDUrgE3QOjqN1c0Y9M=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_3", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.3.1"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.3.1.tar.gz" +hash = "sha256-qAhBSYsZarPB5aacSJPg7foe9bPpeeRTDgABjwS0z7g=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_1", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.3.0"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.3.0.tar.gz" +hash = "sha256-v2+vDlSa5jDqX5wpW/diwT/2xqdKYkoY9e+6wvTUqm0=" +typstDeps = [ + "glossarium_0_4_2", + "haw-hamburg_0_3_0", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.5.1"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.5.1.tar.gz" +hash = "sha256-UxzkkPmWO6frdPI57xxelpE3mqgnpZn9aobQAHBTjIQ=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_1", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.5.0"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.5.0.tar.gz" +hash = "sha256-6wa88OAo34ILx2jDNWEyR/6DVefWbpePKvcDn/v5E8M=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_0", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.4.0"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.4.0.tar.gz" +hash = "sha256-QL9McnRm2djgkCGYEewWu9Eh6Uqjk5pMCk4tVIJStX0=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_4_0", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.3.3"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.3.3.tar.gz" +hash = "sha256-P/fiBhIyjd7a3HLNVWOb9y0Tho1DlscQV1HAwpnFwbg=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_3", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.3.1"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.3.1.tar.gz" +hash = "sha256-hC4cdLTlQ3Vvq6SetKM82W6cYJMaYNSKi9FLKMrOO7Y=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_1", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.3.0"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.3.0.tar.gz" +hash = "sha256-DrocD6zk8vIdptSqng9xu6otMH/HS7Gu84itJqba8Ls=" +typstDeps = [ + "glossarium_0_4_2", + "haw-hamburg_0_3_0", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.5.1"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.5.1.tar.gz" +hash = "sha256-wKWew9SRGfaI1bvZ2HUGsIGNUWWS9Jc2DydoEs+4i9k=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_1", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.5.0"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.5.0.tar.gz" +hash = "sha256-CNG1/pXFaXwqDrtPbCkpKDtg8HfdIODNxix4W0zkS/s=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_0", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.4.0"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.4.0.tar.gz" +hash = "sha256-hHwHHg1Ql9zByfzntzZKuv4IA4uwh49BY4Qtmdd6Ek8=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_4_0", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.3.3"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.3.3.tar.gz" +hash = "sha256-PIfbdjGqfmXUmYgXVuDRn3E+UGFDI/h2vxS8TEP4DF0=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_3", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.3.1"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.3.1.tar.gz" +hash = "sha256-57hSsBYO9TQt9p8P/EfLuIi/wpoRx0y7HjsohKr9eX4=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_1", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.3.0"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.3.0.tar.gz" +hash = "sha256-w9XpicTk+LgS4H/wxBJ2OOKtEPjMmfUV/AVzFjDZbxU=" +typstDeps = [ + "glossarium_0_4_2", + "haw-hamburg_0_3_0", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[headcount."0.1.0"] +url = "https://packages.typst.org/preview/headcount-0.1.0.tar.gz" +hash = "sha256-LGvD9y3np3EI8C9hruxrSASG2/+oChvq8nShbunajS8=" +typstDeps = [] +description = "Make counters inherit from the heading counter" +license = [ + "MIT", +] +homepage = "https://github.com/jbirnick/typst-headcount" + +[hei-synd-report."0.1.1"] +url = "https://packages.typst.org/preview/hei-synd-report-0.1.1.tar.gz" +hash = "sha256-PkAWjiwXtwmJe7xC7hOTCe0E+gFQahjH+9MWcrtLZCw=" +typstDeps = [ + "codelst_2_0_2", + "fractusist_0_1_1", + "glossarium_0_5_3", + "wordometer_0_1_4", +] +description = "A report and project template tailored to the Systems Engineering (Synd) program at the HEI-Vs School of Engineering, Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/hei-templates/hei-synd-report" + +[hei-synd-report."0.1.0"] +url = "https://packages.typst.org/preview/hei-synd-report-0.1.0.tar.gz" +hash = "sha256-4L7AHddOM+84PccYazITd52vEJmdXZ0ULZTpIYwEF6k=" +typstDeps = [ + "codelst_2_0_2", + "fractusist_0_1_0", + "glossarium_0_5_1", + "wordometer_0_1_4", +] +description = "A report and project template tailored to the Systems Engineering (Synd) program at the HEI-Vs School of Engineering, Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/hei-templates/hei-synd-report" + +[hei-synd-thesis."0.1.1"] +url = "https://packages.typst.org/preview/hei-synd-thesis-0.1.1.tar.gz" +hash = "sha256-arCFWYx4S/nitZSMlrgRjXdzz1ro/eM1cEBk9gZUeUs=" +typstDeps = [ + "codelst_2_0_2", + "fractusist_0_1_1", + "glossarium_0_5_3", + "wordometer_0_1_4", +] +description = "A thesis template tailored to the Systems Engineering (Synd) program at the HEI-Vs School of Engineering, Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/hei-templates/hei-synd-thesis" + +[hei-synd-thesis."0.1.0"] +url = "https://packages.typst.org/preview/hei-synd-thesis-0.1.0.tar.gz" +hash = "sha256-Vmp4jfCmVF8nPkwv+vdakcstyPYgMOIfBTmEnt7sF4A=" +typstDeps = [ + "codelst_2_0_2", + "fractusist_0_1_0", + "glossarium_0_5_1", + "hei-synd-report_0_1_0", + "wordometer_0_1_4", +] +description = "A thesis template tailored to the Systems Engineering (Synd) program at the HEI-Vs School of Engineering, Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/hei-templates/hei-synd-thesis" + +[herodot."0.1.0"] +url = "https://packages.typst.org/preview/herodot-0.1.0.tar.gz" +hash = "sha256-hZItUzNJe3TNxMjk2JiN7+wuI5AhGwUdx8p8HOUMnUI=" +typstDeps = [ + "cetz_0_3_4", +] +description = "A package for making linear timelines, inspired by chronology" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/gnist-dev/herodot" + +[hhn-unitylab-thesis-template."0.0.1"] +url = "https://packages.typst.org/preview/hhn-unitylab-thesis-template-0.0.1.tar.gz" +hash = "sha256-nUUMm1vlguTyfcHyMZ3MwzFCwCRxtFo3VLiDYyUegYE=" +typstDeps = [ + "cetz_0_3_1", + "chronos_0_2_0", + "circuiteria_0_1_0", + "codly_1_0_0", + "codly-languages_0_1_1", + "dining-table_0_1_0", + "fletcher_0_5_2", + "glossarium_0_5_1", + "tablem_0_1_0", + "tablex_0_0_9", + "timeliney_0_1_0", + "wrap-it_0_1_1", +] +description = "The official Thesis Template from the Usability and Interaction Technology Laboratory (UniTyLab) of the Heilbronn University (HHN" +license = [ + "MIT", +] +homepage = "https://github.com/Ferrys93de/UniTyLab-Thesis-Template" + +[hidden-bib."0.1.1"] +url = "https://packages.typst.org/preview/hidden-bib-0.1.1.tar.gz" +hash = "sha256-oaWF6c4XQ8OFEnuPlWcFcK23BWKLK+dKhFcagGxDPs8=" +typstDeps = [] +description = "Create hidden bibliographies or bibliographies with unmentioned (hidden) citations" +license = [ + "MIT", +] +homepage = "https://github.com/pklaschka/typst-hidden-bib" + +[hidden-bib."0.1.0"] +url = "https://packages.typst.org/preview/hidden-bib-0.1.0.tar.gz" +hash = "sha256-+u63x5P1zxbszULG7gMS+4SpuBALVSTP31Y0rN9Oo4s=" +typstDeps = [] +description = "Create hidden bibliographies or bibliographies with unmentioned (hidden) citations" +license = [ + "MIT", +] +homepage = "https://github.com/pklaschka/typst-hidden-bib" + +[htl3r-da."2.0.0"] +url = "https://packages.typst.org/preview/htl3r-da-2.0.0.tar.gz" +hash = "sha256-QyKMVig4bHpd7zwFvofOKZWutQcuO4dKuKxcBcVLdBc=" +typstDeps = [ + "codly_1_2_0", + "codly-languages_0_1_7", +] +description = "HTL-Rennweg diploma thesis template" +license = [ + "0BSD", + "CC-BY-SA-4.0", +] +homepage = "https://github.com/HTL3R-Typst/htl3r-da" + +[htl3r-da."1.0.0"] +url = "https://packages.typst.org/preview/htl3r-da-1.0.0.tar.gz" +hash = "sha256-nisqWtSZYhbT1r4Nu2YbhKyjGdQ9MiDhMfxEdTautOY=" +typstDeps = [ + "codly_1_1_1", + "codly-languages_0_1_1", +] +description = "HTL-Rennweg diploma thesis template" +license = [ + "0BSD", + "CC-BY-SA-4.0", +] +homepage = "https://github.com/HTL3R-Typst/htl3r-da" + +[htlwienwest-da."0.3.3"] +url = "https://packages.typst.org/preview/htlwienwest-da-0.3.3.tar.gz" +hash = "sha256-MFvkmwBGhKRC1308oznAnKWAT1fKuo0l00hmHw/Vljk=" +typstDeps = [] +description = "The diploma thesis template for students of the HTL Wien West" +license = [ + "MIT", +] +homepage = "https://github.com/htlwienwest/da-vorlage-typst" + +[htlwienwest-da."0.3.2"] +url = "https://packages.typst.org/preview/htlwienwest-da-0.3.2.tar.gz" +hash = "sha256-OAVoHBYuLe9zT3wWOgNBYTX2id/Y1ap7lKDweLgkyV4=" +typstDeps = [] +description = "The diploma thesis template for students of the HTL Wien West" +license = [ + "MIT", +] +homepage = "https://github.com/htlwienwest/da-vorlage-typst" + +[htlwienwest-da."0.2.1"] +url = "https://packages.typst.org/preview/htlwienwest-da-0.2.1.tar.gz" +hash = "sha256-3nU774Aby7wrhNgCm8H4cOdc6cj1OD+2o8DMr7rqknE=" +typstDeps = [ + "tablex_0_0_8", +] +description = "The diploma thesis template for students of the HTL Wien West" +license = [ + "MIT", +] +homepage = "https://github.com/htlwienwest/da-vorlage-typst" + +[htlwienwest-da."0.1.1"] +url = "https://packages.typst.org/preview/htlwienwest-da-0.1.1.tar.gz" +hash = "sha256-qDdDCbsWPy9T5dP6YH3m/02fE/IZxjKA4OBEfhWLGIE=" +typstDeps = [ + "tablex_0_0_8", +] +description = "The diploma thesis template for students of the HTL Wien West" +license = [ + "MIT", +] +homepage = "https://github.com/htlwienwest/da-vorlage-typst" + +[htlwienwest-da."0.1.0"] +url = "https://packages.typst.org/preview/htlwienwest-da-0.1.0.tar.gz" +hash = "sha256-EoO6xtcU5K66jr+4mZE3BEUgEpypWhK1ko+YC4DHi28=" +typstDeps = [ + "tablex_0_0_8", +] +description = "The diploma thesis template for students of the HTL Wien West" +license = [ + "MIT", +] +homepage = "https://github.com/htlwienwest/da-vorlage-typst" + +[humble-dtu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/humble-dtu-thesis-0.1.0.tar.gz" +hash = "sha256-funwyW3LwcA4eCBdoyzDQ0AbAL9px3jTLsW21XocljI=" +typstDeps = [ + "acrostiche_0_5_1", +] +description = "DTU Thesis Template for Typst" +license = [ + "MIT", +] + +[hydra."0.6.1"] +url = "https://packages.typst.org/preview/hydra-0.6.1.tar.gz" +hash = "sha256-7gq7nGp7zzv4A0A1FbQWmDINEICEHps1HcbO+hi2GyA=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.6.0"] +url = "https://packages.typst.org/preview/hydra-0.6.0.tar.gz" +hash = "sha256-7zmGYza04bHwXy48Ru2IsX6kjJNlns4wDotbTgmMHqc=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.5.2"] +url = "https://packages.typst.org/preview/hydra-0.5.2.tar.gz" +hash = "sha256-WWK6EgaVXJiIg7HfQCNtgExBYVt4DaspQM/FoBo48yI=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.5.1"] +url = "https://packages.typst.org/preview/hydra-0.5.1.tar.gz" +hash = "sha256-Wbs7TB8yo8G28GWnhT0HpxXAABzOKvtIB116+2V1eJg=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.5.0"] +url = "https://packages.typst.org/preview/hydra-0.5.0.tar.gz" +hash = "sha256-UxI5XZZq9yeWIRKlQMYfAAbQEgiB0NLL68YG4h13RyU=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.4.0"] +url = "https://packages.typst.org/preview/hydra-0.4.0.tar.gz" +hash = "sha256-TXgT9MLhW1WTb+fQPr92HUYfYUTYBGbYB4lyqrsntvw=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.3.0"] +url = "https://packages.typst.org/preview/hydra-0.3.0.tar.gz" +hash = "sha256-znoyYAgFo/Gh6f0KVtVp8tsN2EQ+ANPFlXiLYQR2PXY=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Query and display headings of the currently active section" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.2.0"] +url = "https://packages.typst.org/preview/hydra-0.2.0.tar.gz" +hash = "sha256-lMSAwhFknlTsdnJF5tEGpBntQOVYfn0jTenncswx9I8=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Query and display headings of the currently active section" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.1.0"] +url = "https://packages.typst.org/preview/hydra-0.1.0.tar.gz" +hash = "sha256-GKoD535scGFwFeGMH/QaqQY1dZp9Fkq9h4NzvJ53RlU=" +typstDeps = [] +description = "Query and display headings of the currently active section" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[i-figured."0.2.4"] +url = "https://packages.typst.org/preview/i-figured-0.2.4.tar.gz" +hash = "sha256-508q3J4Sj5QnxexJndtbrvekcBpuLjyv9Bkt7QgdkPk=" +typstDeps = [] +description = "Configurable figure and equation numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[i-figured."0.2.3"] +url = "https://packages.typst.org/preview/i-figured-0.2.3.tar.gz" +hash = "sha256-PihVPsLr4rRi5quYewioKs/iYM8sd+BVXNLQkAN6xjY=" +typstDeps = [] +description = "Configurable figure and equation numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[i-figured."0.2.2"] +url = "https://packages.typst.org/preview/i-figured-0.2.2.tar.gz" +hash = "sha256-zXfi2hw5Da5Odnrrm0MOXbvsR0gjj5Wu5yv1q6rmIGc=" +typstDeps = [] +description = "Configurable figure and equation numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[i-figured."0.2.1"] +url = "https://packages.typst.org/preview/i-figured-0.2.1.tar.gz" +hash = "sha256-KQxJk0I9wM9VSpFsbuxHSXHh3SW9lpKtNA/TYy2MLxs=" +typstDeps = [] +description = "Configurable figure and equation numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[i-figured."0.2.0"] +url = "https://packages.typst.org/preview/i-figured-0.2.0.tar.gz" +hash = "sha256-hTNR57rOEQhtXIDAEqUdGIf+AlNI12uQq+IBBqqAgKg=" +typstDeps = [] +description = "Configurable figure numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[i-figured."0.1.0"] +url = "https://packages.typst.org/preview/i-figured-0.1.0.tar.gz" +hash = "sha256-0AE9bAhIB1pf+ptwMt0DvKvRxk5hj+zwU2ymOTjoqQU=" +typstDeps = [] +description = "Configurable figure numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[ibanator."0.1.0"] +url = "https://packages.typst.org/preview/ibanator-0.1.0.tar.gz" +hash = "sha256-d9H+0Cc03IzLCWHVSzqT41xYUTwN0qQryb4SAYtaQQU=" +typstDeps = [] +description = "A package for validating and formatting International Bank Account Numbers (IBANs) according to ISO 13616-1" +license = [ + "EUPL-1.2", +] +homepage = "https://github.com/mainrs/typst-iban-formatter.git" + +[ichigo."0.2.0"] +url = "https://packages.typst.org/preview/ichigo-0.2.0.tar.gz" +hash = "sha256-DPihND6Zrg6QA2wYDMQN0vNAsCrzYpKQer+hfFJAkV8=" +typstDeps = [ + "linguify_0_4_1", + "numbly_0_1_0", + "valkyrie_0_2_1", +] +description = "A customizable Typst template for homework" +license = [ + "MIT", +] +homepage = "https://github.com/PKU-Typst/ichigo" + +[ichigo."0.1.0"] +url = "https://packages.typst.org/preview/ichigo-0.1.0.tar.gz" +hash = "sha256-9w/eLi5XCps+QDkCeoyqwC6CDs0/b8csko3ubnWetzg=" +typstDeps = [ + "linguify_0_4_1", + "numbly_0_1_0", + "valkyrie_0_2_1", +] +description = "A customizable Typst template for homework" +license = [ + "MIT", +] +homepage = "https://github.com/PKU-Typst/ichigo" + +[icicle."0.1.0"] +url = "https://packages.typst.org/preview/icicle-0.1.0.tar.gz" +hash = "sha256-7AaLEdpagkOFzQnHtRBpKbUw5rA3PDQxJWG1ALJyyI4=" +typstDeps = [] +description = "Help the Typst Guys reach the helicopter pad and save Christmas" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[iconic-salmon-fa."1.0.0"] +url = "https://packages.typst.org/preview/iconic-salmon-fa-1.0.0.tar.gz" +hash = "sha256-7Pmqj+FuJXb8uercaHoW5bTGPYtYqyRdwa1ZLcZJlAY=" +typstDeps = [ + "fontawesome_0_1_0", +] +description = "A Typst library for Social Media references with icons based on Font Awesome" +license = [ + "MIT", +] +homepage = "https://github.com/Bi0T1N/typst-iconic-salmon-fa" + +[iconic-salmon-svg."3.0.0"] +url = "https://packages.typst.org/preview/iconic-salmon-svg-3.0.0.tar.gz" +hash = "sha256-/lx7rqCeKFWc9ec6pD+K6NRXAEcpxKVsyjk3VryPp14=" +typstDeps = [] +description = "A Typst library for Social Media references with scalable vector graphics icons" +license = [ + "MIT", +] +homepage = "https://github.com/Bi0T1N/typst-iconic-salmon-svg" + +[iconic-salmon-svg."2.1.0"] +url = "https://packages.typst.org/preview/iconic-salmon-svg-2.1.0.tar.gz" +hash = "sha256-lpELa+RQx1DdBZJwTiDilbae5CrMbP97+w5dJd0WQQ0=" +typstDeps = [] +description = "A Typst library for Social Media references with scalable vector graphics icons" +license = [ + "MIT", +] +homepage = "https://github.com/Bi0T1N/typst-iconic-salmon-svg" + +[iconic-salmon-svg."1.1.0"] +url = "https://packages.typst.org/preview/iconic-salmon-svg-1.1.0.tar.gz" +hash = "sha256-xalofKV3mck69Z94wkSMHNRwbJG0LBq7yJ2jF6o+VQA=" +typstDeps = [] +description = "A Typst library for Social Media references with scalable vector graphics icons" +license = [ + "MIT", +] +homepage = "https://github.com/Bi0T1N/typst-iconic-salmon-svg" + +[iconic-salmon-svg."1.0.0"] +url = "https://packages.typst.org/preview/iconic-salmon-svg-1.0.0.tar.gz" +hash = "sha256-gi+ikiE9ER2SPdfMfc4b2LU3iC4EVmrjhWWdt16fY0E=" +typstDeps = [] +description = "A Typst library for Social Media references with scalable vector graphics icons" +license = [ + "MIT", +] +homepage = "https://github.com/Bi0T1N/typst-iconic-salmon-svg" + +[icu-datetime."0.1.2"] +url = "https://packages.typst.org/preview/icu-datetime-0.1.2.tar.gz" +hash = "sha256-1dWi/4Cos6YwvR/6uUXIeXY5zREnJKWcpoS26va6jFs=" +typstDeps = [] +description = "Date and time formatting using ICU4X via WASM" +license = [ + "MIT", +] +homepage = "https://github.com/Nerixyz/icu-typ" + +[icu-datetime."0.1.1"] +url = "https://packages.typst.org/preview/icu-datetime-0.1.1.tar.gz" +hash = "sha256-6pHIy2iHE42W3S0U8q5Q1ZHJ/9nlqULO/SOrpWqciFE=" +typstDeps = [] +description = "Date and time formatting using ICU4X via WASM" +license = [ + "MIT", +] +homepage = "https://github.com/Nerixyz/icu-typ" + +[icu-datetime."0.1.0"] +url = "https://packages.typst.org/preview/icu-datetime-0.1.0.tar.gz" +hash = "sha256-4L2Jh4VJGENEiPHbl8muWNJQpINuEXB3nWVzBT4ifKE=" +typstDeps = [] +description = "Date and time formatting using ICU4X via WASM" +license = [ + "MIT", +] +homepage = "https://github.com/Nerixyz/icu-typ" + +[idwtet."0.3.0"] +url = "https://packages.typst.org/preview/idwtet-0.3.0.tar.gz" +hash = "sha256-EJpapwNV9RD50LXl0XBXsU8uF/NrR+uFCSBXb1lQ/10=" +typstDeps = [] +description = "Package for uniform, correct and simplified typst code demonstration" +license = [ + "MIT", +] +homepage = "https://github.com/ludwig-austermann/typst-idwtet" + +[idwtet."0.2.0"] +url = "https://packages.typst.org/preview/idwtet-0.2.0.tar.gz" +hash = "sha256-/IgwHz/eg8bNjfDQlDe6TQeDQIutYeE3+41YGwqaatg=" +typstDeps = [] +description = "Package for uniform, correct and simplified typst code demonstration" +license = [ + "MIT", +] +homepage = "https://github.com/ludwig-austermann/typst-idwtet" + +[ieee-monolith."0.1.0"] +url = "https://packages.typst.org/preview/ieee-monolith-0.1.0.tar.gz" +hash = "sha256-meRF2qrqs7Bx/iLX+o/TkM+DNr0nkaqQ1XuuUZiGI2w=" +typstDeps = [] +description = "Single column paper with IEEE-style references and bibliography" +license = [ + "MIT", +] +homepage = "https://github.com/Fricsion/typst-template_ieee-style-single-column" + +[ijimai."0.0.4"] +url = "https://packages.typst.org/preview/ijimai-0.0.4.tar.gz" +hash = "sha256-TMGEcCP27e0mLbDZdsOBT0kpYdL+5rnbvr38Z2cjJIg=" +typstDeps = [ + "datify_0_1_3", + "droplet_0_3_1", + "wrap-it_0_1_1", +] +description = "Template for writing articles for the International Journal of Interactive Multimedia and Artificial Intelligence (IJIMAI" +license = [ + "MIT", +] +homepage = "https://github.com/pammacdotnet/IJIMAI" + +[ijimai."0.0.3"] +url = "https://packages.typst.org/preview/ijimai-0.0.3.tar.gz" +hash = "sha256-xZmU8c/CXwHwCv2QuU83YhOiZ6nuADn5smSMhigjQPo=" +typstDeps = [ + "datify_0_1_3", + "droplet_0_3_1", + "wrap-it_0_1_1", +] +description = "Template for writing articles for the International Journal of Interactive Multimedia and Artificial Intelligence (IJIMAI" +license = [ + "MIT", +] +homepage = "https://github.com/pammacdotnet/IJIMAI" + +[ijimai."0.0.2"] +url = "https://packages.typst.org/preview/ijimai-0.0.2.tar.gz" +hash = "sha256-Uf+PQdL6RsBiKdkbWg+msGLwpkbwiBvBUnzk0MQow3M=" +typstDeps = [ + "datify_0_1_3", + "droplet_0_3_1", + "wrap-it_0_1_1", +] +description = "Template for writing articles for the International Journal of Interactive Multimedia and Artificial Intelligence (IJIMAI" +license = [ + "MIT", +] +homepage = "https://github.com/pammacdotnet/IJIMAI" + +[ijimai."0.0.1"] +url = "https://packages.typst.org/preview/ijimai-0.0.1.tar.gz" +hash = "sha256-kFxD8/Y9bNdIR9kreE6ieXAtjv5h41gH/sNTV07ljQM=" +typstDeps = [ + "datify_0_1_3", + "droplet_0_3_1", + "wrap-it_0_1_1", +] +description = "Template for writing articles for the International Journal of Interactive Multimedia and Artificial Intelligence (IJIMAI" +license = [ + "MIT", +] +homepage = "https://github.com/pammacdotnet/IJIMAI" + +[illc-mol-thesis."0.2.0"] +url = "https://packages.typst.org/preview/illc-mol-thesis-0.2.0.tar.gz" +hash = "sha256-aQisDHYRzCywWs1ayT5nRFO64F2bBPUJJgANhEGZSsk=" +typstDeps = [ + "great-theorems_0_1_2", + "rich-counters_0_2_2", +] +description = "Official Typst thesis template for Master of Logic students at the ILLC" +license = [ + "AGPL-3.0-or-later", +] +homepage = "https://codeberg.org/foxy/illc-mol-thesis" + +[illc-mol-thesis."0.1.2"] +url = "https://packages.typst.org/preview/illc-mol-thesis-0.1.2.tar.gz" +hash = "sha256-9WBdTt4Mw+XrOzJ1F1QhT8dWB/g+XwLsUf+EaSFwJUE=" +typstDeps = [ + "great-theorems_0_1_2", + "rich-counters_0_2_2", +] +description = "Official Typst thesis template for Master of Logic students at the ILLC" +license = [ + "AGPL-3.0-or-later", +] +homepage = "https://codeberg.org/foxy/illc-mol-thesis" + +[illc-mol-thesis."0.1.1"] +url = "https://packages.typst.org/preview/illc-mol-thesis-0.1.1.tar.gz" +hash = "sha256-toU02wycScUaNgoep7JM7qj3CyrgUeT1Ob7Gz6ACDOo=" +typstDeps = [ + "great-theorems_0_1_1", + "rich-counters_0_2_1", +] +description = "Official Typst thesis template for Master of Logic students at the ILLC" +license = [ + "AGPL-3.0-or-later", +] +homepage = "https://codeberg.org/foxy/illc-mol-thesis" + +[illc-mol-thesis."0.1.0"] +url = "https://packages.typst.org/preview/illc-mol-thesis-0.1.0.tar.gz" +hash = "sha256-dy+4Z+c0WI+jX0Ce6YC5s164NbJn1ljJ6JRn/G+XLHA=" +typstDeps = [ + "great-theorems_0_1_1", + "rich-counters_0_2_1", +] +description = "Official Typst thesis template for Master of Logic students at the ILLC" +license = [ + "AGPL-3.0-or-later", +] +homepage = "https://codeberg.org/foxy/illc-mol-thesis" + +[ilm."1.4.1"] +url = "https://packages.typst.org/preview/ilm-1.4.1.tar.gz" +hash = "sha256-bNGWTEcDSqh2c/ziEEv3u92CWaFjjF6pe/2zhOv8OQg=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.4.0"] +url = "https://packages.typst.org/preview/ilm-1.4.0.tar.gz" +hash = "sha256-Wu2wBZoiPXzDytJUncFJnnpN+/m9ZNcSGkaulgx4Veo=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.3.1"] +url = "https://packages.typst.org/preview/ilm-1.3.1.tar.gz" +hash = "sha256-pBLAI7HLEtj8oANzzLP+CFjePvsYen1eF/VSN/kx1jU=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.3.0"] +url = "https://packages.typst.org/preview/ilm-1.3.0.tar.gz" +hash = "sha256-3mL+9h4jIztTdaSsVm5iDSi46oF3bz2kaPHumJwEips=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.2.1"] +url = "https://packages.typst.org/preview/ilm-1.2.1.tar.gz" +hash = "sha256-zdq7GDDfqi/xn5v8gLqzsCM+BrYhvRxTRIvxfzf/MVs=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.2.0"] +url = "https://packages.typst.org/preview/ilm-1.2.0.tar.gz" +hash = "sha256-3pdgzpe+AtYzEbKncrhU7tX6jILu7F8s8xPJO5ACAMg=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.1.3"] +url = "https://packages.typst.org/preview/ilm-1.1.3.tar.gz" +hash = "sha256-MuWkhqK6C9fq6bqnFQepVeaPyuyKko9eDEh40/Xv1hw=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.1.2"] +url = "https://packages.typst.org/preview/ilm-1.1.2.tar.gz" +hash = "sha256-iETNRl8W3WqBy/Jb1jgJuaFRipIVVkRgpjwz2oV/Y1k=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.1.1"] +url = "https://packages.typst.org/preview/ilm-1.1.1.tar.gz" +hash = "sha256-29Pz8aBx8eGhZMB1PX/gmGBJlU21Yyjv5TROUBxo8Ls=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.1.0"] +url = "https://packages.typst.org/preview/ilm-1.1.0.tar.gz" +hash = "sha256-xBIOaQhabgiCERKlDIcDU5NoYr7bdOuPiD6keVdrObY=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.0.0"] +url = "https://packages.typst.org/preview/ilm-1.0.0.tar.gz" +hash = "sha256-tJh5S4ZTPJDdkkgBs2nrpevEgEppEFPZlKtsPiz3BUM=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."0.1.3"] +url = "https://packages.typst.org/preview/ilm-0.1.3.tar.gz" +hash = "sha256-sqVIgc9KsCGUDzJAIXTY7GhmpCOCMw/zJjpkqP7mJnM=" +typstDeps = [ + "ilm_0_1_2", +] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."0.1.2"] +url = "https://packages.typst.org/preview/ilm-0.1.2.tar.gz" +hash = "sha256-IpvMbQWR+I+d8KS972OcNiPepWFj+XavPLhOEX1pC/0=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."0.1.1"] +url = "https://packages.typst.org/preview/ilm-0.1.1.tar.gz" +hash = "sha256-JhExC3idGTCf69jC9cjeIm0cj0QdIT4yC7+1VS8ILjg=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."0.1.0"] +url = "https://packages.typst.org/preview/ilm-0.1.0.tar.gz" +hash = "sha256-07vyDs6QMXyeE4HlGD34X2pUHNaOPEZywBa3zY0aYEI=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[imprecv."1.0.1"] +url = "https://packages.typst.org/preview/imprecv-1.0.1.tar.gz" +hash = "sha256-q0y6QunluYMFNTJKlUqFheRDKzkQ7L7cuOKCX37/PXU=" +typstDeps = [] +description = "A no-frills curriculum vitae (CV) template using Typst and YAML to version control CV data" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/jskherman/imprecv" + +[imprecv."1.0.0"] +url = "https://packages.typst.org/preview/imprecv-1.0.0.tar.gz" +hash = "sha256-UkyMtrjje7GfR2pT9q1zHqil12KptIeghny43T98utw=" +typstDeps = [] +description = "A no-frills curriculum vitae (CV) template using Typst and YAML to version control CV data" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/jskherman/imprecv" + +[in-dexter."0.7.0"] +url = "https://packages.typst.org/preview/in-dexter-0.7.0.tar.gz" +hash = "sha256-yzRnJe14VYyYWSYAs3pEDDZLU8QfBfC2sK1OP0Bkc50=" +typstDeps = [] +description = "Create an 'hand picked' Index" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.5.3"] +url = "https://packages.typst.org/preview/in-dexter-0.5.3.tar.gz" +hash = "sha256-9uC2p04LPZpyflniWuWA15fEl+NRKLxt19QL+Xkx5i0=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.5.2"] +url = "https://packages.typst.org/preview/in-dexter-0.5.2.tar.gz" +hash = "sha256-hNnw25kWvyClJkgRKXeDZX8njD3U1qSXwLC/cemtnxg=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.4.2"] +url = "https://packages.typst.org/preview/in-dexter-0.4.2.tar.gz" +hash = "sha256-CC+5kWaQUF0qD/25hMhKiPtZi+EAEc7SsHs/7bySp0E=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.3.0"] +url = "https://packages.typst.org/preview/in-dexter-0.3.0.tar.gz" +hash = "sha256-RKRYCc36nP57S4daR5IWT7klMicoZMkjijtyyyrv9vY=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.2.0"] +url = "https://packages.typst.org/preview/in-dexter-0.2.0.tar.gz" +hash = "sha256-tS6dUnpl4/MJGt5c9q1SlvufYJn6chqwIkF5gg9shGo=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.1.0"] +url = "https://packages.typst.org/preview/in-dexter-0.1.0.tar.gz" +hash = "sha256-gQ9O89PiNvrnTvrkH22FKfAY/ZOcN9WGxqB/EqYGubs=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.0.6"] +url = "https://packages.typst.org/preview/in-dexter-0.0.6.tar.gz" +hash = "sha256-C8ZctB6P7eQ9+fhp7aW+m+vcVLnk934zZR1kWtN0eco=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.0.5"] +url = "https://packages.typst.org/preview/in-dexter-0.0.5.tar.gz" +hash = "sha256-YhCLddQ2HrI9c/DgpmkT9ePezKzZYL6rMgJvZ9zUHg4=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.0.4"] +url = "https://packages.typst.org/preview/in-dexter-0.0.4.tar.gz" +hash = "sha256-cEmqXywlCkEbLL49xnyF4ppAl/jpOhvpc1x8EWKREJU=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.0.3"] +url = "https://packages.typst.org/preview/in-dexter-0.0.3.tar.gz" +hash = "sha256-77ol5CQKXrGoVS4LD0RBnhHLss6BLfQRTXY7dGuJHzY=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[inboisu."0.1.0"] +url = "https://packages.typst.org/preview/inboisu-0.1.0.tar.gz" +hash = "sha256-0hPwa7JwI/NvbkW3O34w3kSFDIHGhfmCvrStqBYWRxo=" +typstDeps = [ + "tablex_0_0_9", +] +description = "Inboisu is a tool for creating Japanese invoices" +license = [ + "MIT-0", +] +homepage = "https://github.com/mkpoli/typst-inboisu" + +[indenta."0.0.3"] +url = "https://packages.typst.org/preview/indenta-0.0.3.tar.gz" +hash = "sha256-3xatpD/it9Q43n5Ow9X5esZBXXw5ZBMEktfhKd4AejA=" +typstDeps = [] +description = "Fix indent of first paragraph" +license = [ + "MIT", +] +homepage = "https://github.com/flaribbit/indenta" + +[indenta."0.0.2"] +url = "https://packages.typst.org/preview/indenta-0.0.2.tar.gz" +hash = "sha256-OEcO2y5xsNZqUw7o/2lUZk7u7c9uhffTyn4qJw48+/I=" +typstDeps = [] +description = "Fix indent of first paragraph" +license = [ + "MIT", +] +homepage = "https://github.com/flaribbit/indenta" + +[indenta."0.0.1"] +url = "https://packages.typst.org/preview/indenta-0.0.1.tar.gz" +hash = "sha256-UxLhZaFlp2UN/Y2kj7U2hGOF1NS5eeJVwEaF6Cv0lqU=" +typstDeps = [] +description = "Fix indent of first paragraph" +license = [ + "MIT", +] +homepage = "https://github.com/flaribbit/indenta" + +[indic-numerals."0.1.0"] +url = "https://packages.typst.org/preview/indic-numerals-0.1.0.tar.gz" +hash = "sha256-qL2C6OHjMRqVTUFYSjVus3iE9HR1CklJdwMjPQ97QHo=" +typstDeps = [] +description = "convert arabic numerals to indic numerals and vice versa" +license = [ + "MIT", +] +homepage = "https://github.com/cecoeco/indic-numerals" + +[invoice-maker."1.1.0"] +url = "https://packages.typst.org/preview/invoice-maker-1.1.0.tar.gz" +hash = "sha256-IT1P65mtzpgUUUHwOIDHoYG8x3GeP3MtSU+OzJFGFVs=" +typstDeps = [] +description = "Generate beautiful invoices from a simple data record" +license = [ + "ISC", +] +homepage = "https://github.com/ad-si/invoice-maker" + +[ionio-illustrate."0.2.0"] +url = "https://packages.typst.org/preview/ionio-illustrate-0.2.0.tar.gz" +hash = "sha256-p+Z4u91PvA2APXlk80ZikJTEk+JIhPpIn64Z6P+rLrY=" +typstDeps = [ + "cetz_0_1_2", +] +description = "Mass spectra with annotations for typst" +license = [ + "MIT", +] +homepage = "https://github.com/JamesxX/ionio-illustrate" + +[ionio-illustrate."0.1.0"] +url = "https://packages.typst.org/preview/ionio-illustrate-0.1.0.tar.gz" +hash = "sha256-Wa/tLkpXkfzBhGgeRnVip7oblihNpdXmcoIGKKqMGaw=" +typstDeps = [ + "cetz_0_1_2", +] +description = "Mass spectra with annotations for typst" +license = [ + "MIT", +] + +[iridis."0.1.0"] +url = "https://packages.typst.org/preview/iridis-0.1.0.tar.gz" +hash = "sha256-ryceOZ0JS+SN90DO7C1n5D2sqizhM9yrXgW+Oxuo8UA=" +typstDeps = [] +description = "A package to colors matching parenthesis" +license = [ + "MIT", +] + +[isc-hei-report."0.2.0"] +url = "https://packages.typst.org/preview/isc-hei-report-0.2.0.tar.gz" +hash = "sha256-z+XY4IaAOqxAZxjKDLVb/aou/RVOFSnnrTowcRVua60=" +typstDeps = [ + "acrostiche_0_5_1", + "codelst_2_0_2", + "showybox_2_0_3", +] +description = "An official report template for the 'Informatique et systèmes de communication' (ISC) bachelor degree programme at the School of Engineering (HEI) in Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/ISC-HEI/ISC-report" + +[isc-hei-report."0.1.5"] +url = "https://packages.typst.org/preview/isc-hei-report-0.1.5.tar.gz" +hash = "sha256-+z4/39eEZHqnzoQ335iCLJ2BXGuCPJMlPcXb86g48rE=" +typstDeps = [ + "acrostiche_0_3_0", + "acrostiche_0_3_1", + "codelst_2_0_1", + "showybox_2_0_1", +] +description = "An official report template for the 'Informatique et systèmes de communication' (ISC) bachelor degree programme at the School of Engineering (HEI) in Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/ISC-HEI/ISC-report" + +[isc-hei-report."0.1.3"] +url = "https://packages.typst.org/preview/isc-hei-report-0.1.3.tar.gz" +hash = "sha256-nuzvDLXZ7rfCCKui+K9w12SRFVwcde3nN+thvot6a6g=" +typstDeps = [ + "acrostiche_0_3_0", + "acrostiche_0_3_1", + "codelst_2_0_1", + "showybox_2_0_1", +] +description = "An official report template for the 'Informatique et systèmes de communication' (ISC) bachelor degree programme at the School of Engineering (HEI) in Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/ISC-HEI/ISC-report" + +[isc-hei-report."0.1.0"] +url = "https://packages.typst.org/preview/isc-hei-report-0.1.0.tar.gz" +hash = "sha256-vkDZBocPZJOPIyf2j1oZ5rvzMT0wMG/a2BURXTjv6DA=" +typstDeps = [ + "acrostiche_0_3_0", + "codelst_2_0_1", + "showybox_2_0_1", +] +description = "An official report template for the 'Informatique et systèmes de communication' (ISC) bachelor degree programme at the School of Engineering (HEI) in Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/ISC-HEI/ISC-report" + +[its-scripted."0.1.0"] +url = "https://packages.typst.org/preview/its-scripted-0.1.0.tar.gz" +hash = "sha256-Q7zPoW9hjAoirl2xb5sG2/tY3ornofX1hq6B6OIQBHo=" +typstDeps = [] +description = "A template for writing movie/tv/theater-scripts in screenplay format" +license = [ + "LGPL-3.0-only", +] +homepage = "https://github.com/danielFHcode/typst-screenplay" + +[jaconf-mscs."0.1.0"] +url = "https://packages.typst.org/preview/jaconf-mscs-0.1.0.tar.gz" +hash = "sha256-Vvp2RFqMP2/Uho0VrA4ZE3DXJuj3cy5cPRaxv280x1o=" +typstDeps = [ + "codly_1_1_1", + "ctheorems_1_1_3", +] +description = "Template for Japanese conference paper of engineering. 工学系の日本語学会論文テンプレート" +license = [ + "MIT-0", +] +homepage = "https://github.com/kimushun1101/typst-jp-conf-template" + +[jlyfish."0.1.0"] +url = "https://packages.typst.org/preview/jlyfish-0.1.0.tar.gz" +hash = "sha256-h7WTNYT4tPbAEF7B50fUP7oHVnNIDJxedS3CMZxcbQ4=" +typstDeps = [ + "based_0_1_0", +] +description = "Julia code evaluation inside your Typst document" +license = [ + "MIT", +] +homepage = "https://github.com/andreasKroepelin/TypstJlyfish.jl" + +[jogs."0.2.4"] +url = "https://packages.typst.org/preview/jogs-0.2.4.tar.gz" +hash = "sha256-WZYXL2dKMK/B2LDDt9iRMkvJO0QZXRarEECNlF1QwTQ=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[jogs."0.2.3"] +url = "https://packages.typst.org/preview/jogs-0.2.3.tar.gz" +hash = "sha256-XWXBYCki9munvKJGRrH+mN8gmba1PNN7dpR19HG9Hjk=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[jogs."0.2.2"] +url = "https://packages.typst.org/preview/jogs-0.2.2.tar.gz" +hash = "sha256-VlhWrCmqphFJfraNaENwBElyyzGPuFTNax44BtlAr3k=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[jogs."0.2.1"] +url = "https://packages.typst.org/preview/jogs-0.2.1.tar.gz" +hash = "sha256-z/MoF0l9qarxCL0dCNIRtYs05Grst1IyYAbIw/KEyxA=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[jogs."0.2.0"] +url = "https://packages.typst.org/preview/jogs-0.2.0.tar.gz" +hash = "sha256-gNOZwfjHvz6R3r/FfLSM16jKu81vYK63ZAdpJMo2+Yg=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[jogs."0.1.0"] +url = "https://packages.typst.org/preview/jogs-0.1.0.tar.gz" +hash = "sha256-nleCwdDbkqBdWElIoh5CVrszjYsicVAWFjGBb52vB5I=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[js."0.1.3"] +url = "https://packages.typst.org/preview/js-0.1.3.tar.gz" +hash = "sha256-yf7bg3vx2h8KY/VSqL6lJhbiN0Vk0s/BHt7OIpIAUMw=" +typstDeps = [] +description = "Typst template based on LaTeX jsarticle/jsbook document classes" +license = [ + "MIT-0", +] +homepage = "https://github.com/okumuralab/typst-js" + +[js."0.1.2"] +url = "https://packages.typst.org/preview/js-0.1.2.tar.gz" +hash = "sha256-MXv0VPyEzMsuVNZhJXJzjlOJ4qYYeqHqbf3pxq6vyZ4=" +typstDeps = [] +description = "Typst template based on LaTeX jsarticle/jsbook document classes" +license = [ + "MIT-0", +] +homepage = "https://github.com/okumuralab/typst-js" + +[js."0.1.1"] +url = "https://packages.typst.org/preview/js-0.1.1.tar.gz" +hash = "sha256-MDWS5b81xz1LfQw0sWBQB8NC4G8Ol2GDnmBEIj/w89o=" +typstDeps = [] +description = "Typst template based on LaTeX jsarticle/jsbook document classes" +license = [ + "MIT-0", +] +homepage = "https://github.com/okumuralab/typst-js" + +[js."0.1.0"] +url = "https://packages.typst.org/preview/js-0.1.0.tar.gz" +hash = "sha256-DrsvfvaDGVcl+QkHjhnJYPCenBKQAZe47s2abtN/20c=" +typstDeps = [] +description = "Typst template based on LaTeX jsarticle/jsbook document classes" +license = [ + "MIT-0", +] +homepage = "https://github.com/okumuralab/typst-js" + +[jumble."0.0.1"] +url = "https://packages.typst.org/preview/jumble-0.0.1.tar.gz" +hash = "sha256-GnQdiXXCTIIILynOiWgbwmmovZ+6x99IjkiGzOnzVVA=" +typstDeps = [ + "tidy_0_4_0", +] +description = "A package providing some hash functions and related stuff" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/jumble" + +[jurz."0.1.0"] +url = "https://packages.typst.org/preview/jurz-0.1.0.tar.gz" +hash = "sha256-m/Mj05WArGW5YDoKNdyt1F0YQTS1Dz5Jw9er8w2vyas=" +typstDeps = [] +description = "Randziffern in Typst" +license = [ + "MIT", +] + +[juti."0.0.2"] +url = "https://packages.typst.org/preview/juti-0.0.2.tar.gz" +hash = "sha256-BcluOxlfOmvwCMGY1tnoLMOGpGw2FK+K4O9VbmAXDIc=" +typstDeps = [] +description = "Template for writing articles for JUTI: Jurnal Ilmiah Teknologi Informasi" +license = [ + "MIT", +] + +[juti."0.0.1"] +url = "https://packages.typst.org/preview/juti-0.0.1.tar.gz" +hash = "sha256-vUaHThW8boRmGh6g8xnTJpyAJD6oDMI9HEq9vtSbzcY=" +typstDeps = [] +description = "Template for writing articles for JUTI: Jurnal Ilmiah Teknologi Informasi" +license = [ + "MIT", +] + +[k-mapper."1.2.0"] +url = "https://packages.typst.org/preview/k-mapper-1.2.0.tar.gz" +hash = "sha256-iJj/FMGu/4DAz6yqrUZ62WeFxhXVxszkVyqeS0NOnDg=" +typstDeps = [] +description = "A package to add Karnaugh maps into Typst projects" +license = [ + "MIT", +] +homepage = "https://github.com/derekchai/typst-karnaugh-map" + +[k-mapper."1.1.0"] +url = "https://packages.typst.org/preview/k-mapper-1.1.0.tar.gz" +hash = "sha256-2sqjAMkjCwcgI4OOLfrzwyUc4Rx28EoPHxFeFfYB80E=" +typstDeps = [] +description = "A package to add Karnaugh maps into Typst projects" +license = [ + "MIT", +] +homepage = "https://github.com/derekchai/typst-karnaugh-map" + +[k-mapper."1.0.0"] +url = "https://packages.typst.org/preview/k-mapper-1.0.0.tar.gz" +hash = "sha256-w8GanT6MurAkT3T6nKCWxLMIWwRxbsLSbGSCtcrOqAo=" +typstDeps = [] +description = "A package to add Karnaugh maps into Typst projects" +license = [ + "MIT", +] +homepage = "https://github.com/derekchai/typst-karnaugh-map" + +[kanjimo."0.1.0"] +url = "https://packages.typst.org/preview/kanjimo-0.1.0.tar.gz" +hash = "sha256-6caBsc8kZytwVe0XEPiX0qiw5xPe0lPWDwGJVZcRCzE=" +typstDeps = [] +description = "Create charts with selected kanji for practicing" +license = [ + "MIT", +] +homepage = "https://github.com/istudyatuni/kanjimo" + +[kdl-unofficial-template."0.1.0"] +url = "https://packages.typst.org/preview/kdl-unofficial-template-0.1.0.tar.gz" +hash = "sha256-GDTzRTc+9O/8QJ50qZZZlXUxhVYPzq2NRym6yKZ/3v4=" +typstDeps = [ + "cetz_0_3_3", + "droplet_0_3_1", + "suiji_0_3_0", +] +description = "An unofficial template for community scenarios for the TTRPG 'KULT: divinity lost" +license = [ + "MIT", +] + +[keyle."0.2.0"] +url = "https://packages.typst.org/preview/keyle-0.2.0.tar.gz" +hash = "sha256-RhC88JBzKG1muu+hoWB/Y8Q6/KUyeU72EU0OzllpUBA=" +typstDeps = [ + "codelst_2_0_0", + "mantys_0_1_4", + "showybox_2_0_1", +] +description = "This package provides a simple way to style keyboard shortcuts in your documentation" +license = [ + "MIT", +] +homepage = "https://github.com/magicwenli/keyle" + +[keyle."0.1.1"] +url = "https://packages.typst.org/preview/keyle-0.1.1.tar.gz" +hash = "sha256-GPTeNT5cFVzbMgmSZ/1U6+B+gWCkh+R1ppBMqsBtiKE=" +typstDeps = [ + "keyle_0_1_0", + "mantys_0_1_4", +] +description = "This package provides a simple way to style keyboard shortcuts in your documentation" +license = [ + "MIT", +] +homepage = "https://github.com/magicwenli/keyle" + +[keyle."0.1.0"] +url = "https://packages.typst.org/preview/keyle-0.1.0.tar.gz" +hash = "sha256-rCWePSV9alPZfuw8TBw1wYXMexBVepEgmjhbA1ehbKc=" +typstDeps = [ + "mantys_0_1_4", +] +description = "This package provides a simple way to style keyboard shortcuts in your documentation" +license = [ + "MIT", +] +homepage = "https://github.com/magicwenli/keyle" + +[kinase."0.1.0"] +url = "https://packages.typst.org/preview/kinase-0.1.0.tar.gz" +hash = "sha256-WRGyitKZga3XdXwF2MKgE81iVhAJCPJFd1Q+MWCv/6o=" +typstDeps = [ + "mantys_0_1_1", + "tidy_0_2_0", +] +description = "Easy styling for different link types like mails and urls" +license = [ + "MIT", +] + +[klaro-ifsc-sj."0.1.0"] +url = "https://packages.typst.org/preview/klaro-ifsc-sj-0.1.0.tar.gz" +hash = "sha256-ib34/i22ozy0OlhXaOTX5oQn2ITQVHVLYQqBYnDGQDA=" +typstDeps = [] +description = "Report Typst template for IFSC" +license = [ + "MIT-0", +] +homepage = "https://github.com/gabrielluizep/klaro-ifsc-sj" + +[km."0.1.0"] +url = "https://packages.typst.org/preview/km-0.1.0.tar.gz" +hash = "sha256-kWhaIc5GTBxodLNQcVP82mD7CKnuwKzLOnK8em3SLeI=" +typstDeps = [] +description = "Draw simple Karnaugh maps" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~toto/karnaugh" + +[knowledge-key."1.0.1"] +url = "https://packages.typst.org/preview/knowledge-key-1.0.1.tar.gz" +hash = "sha256-mpbfURVxssF0aVKPvvXRWpGUK9TyuXEoz8zdnJrPKP0=" +typstDeps = [ + "codelst_2_0_1", + "tablex_0_0_8", +] +description = "A compact cheat-sheet" +license = [ + "MIT-0", +] +homepage = "https://github.com/ngoetti/knowledge-key" + +[knowledge-key."1.0.0"] +url = "https://packages.typst.org/preview/knowledge-key-1.0.0.tar.gz" +hash = "sha256-L4eU2sqCSj31tMXBysjVU8i0aAoF9nVoIgqZffV6VKo=" +typstDeps = [ + "codelst_2_0_1", + "tablex_0_0_8", +] +description = "A compact cheat-sheet" +license = [ + "MIT-0", +] +homepage = "https://github.com/ngoetti/knowledge-key" + +[koma-labeling."0.2.0"] +url = "https://packages.typst.org/preview/koma-labeling-0.2.0.tar.gz" +hash = "sha256-vDy5t6MtKav29CgKA5gMyPzD0YRz/s/TIVt9oD6glGY=" +typstDeps = [] +description = "This package introduces a labeling feature to Typst, inspired by the KOMA-Script's labeling environment" +license = [ + "MIT", +] + +[koma-labeling."0.1.0"] +url = "https://packages.typst.org/preview/koma-labeling-0.1.0.tar.gz" +hash = "sha256-jAyBafmtttzpmDfz66HUdCLJ4hyOxqHtYvX7c5KTMrs=" +typstDeps = [] +description = "This package introduces a labeling feature to Typst, inspired by the KOMA-Script's labeling environment" +license = [ + "MIT", +] + +[kouhu."0.2.0"] +url = "https://packages.typst.org/preview/kouhu-0.2.0.tar.gz" +hash = "sha256-Q5qLfexfuH7oRNDiyff1/moFN7QplvzkPYdxpjgkR1A=" +typstDeps = [ + "cmarker_0_1_1", + "mantys_0_1_4", + "tidy_0_2_0", +] +description = "Chinese lipsum text generator; 中文乱数假文（Lorem Ipsum）生成器" +license = [ + "MIT", +] +homepage = "https://github.com/Harry-Chen/kouhu" + +[kouhu."0.1.1"] +url = "https://packages.typst.org/preview/kouhu-0.1.1.tar.gz" +hash = "sha256-kMnFLH3KPwmBE4jg/nFpkhshkSAuUBBcuIIF4Jn5580=" +typstDeps = [ + "mantys_0_1_4", + "tidy_0_2_0", +] +description = "Chinese lipsum text generator; 中文乱数假文（Lorem Ipsum）生成器" +license = [ + "MIT", +] +homepage = "https://github.com/Harry-Chen/kouhu" + +[kouhu."0.1.0"] +url = "https://packages.typst.org/preview/kouhu-0.1.0.tar.gz" +hash = "sha256-NQ5xPAnxc8zgM6cY9B364EU4mNDC6QQ8Z3yJDoSUpX8=" +typstDeps = [ + "mantys_0_1_4", + "tidy_0_2_0", +] +description = "Chinese lipsum text generator; 中文乱数假文（Lorem Ipsum）生成器" +license = [ + "MIT", +] +homepage = "https://github.com/Harry-Chen/kouhu" + +[kthesis."0.1.1"] +url = "https://packages.typst.org/preview/kthesis-0.1.1.tar.gz" +hash = "sha256-SEGkBuf1UtnO0/DA74gsbSH/BUkWjORsAj7UYb8EwEA=" +typstDeps = [ + "glossarium_0_5_4", + "headcount_0_1_0", + "hydra_0_6_0", + "linguify_0_4_2", +] +description = "Unofficial thesis template for KTH Royal Institute of Technology" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/RafDevX/kthesis-typst" + +[kthesis."0.1.0"] +url = "https://packages.typst.org/preview/kthesis-0.1.0.tar.gz" +hash = "sha256-ZHaFDc5SIUbEuugwbiMi1ZnQfOK/oAjhihwIKlKqwDc=" +typstDeps = [ + "glossarium_0_5_1", + "headcount_0_1_0", + "hydra_0_5_2", + "linguify_0_4_1", +] +description = "Unofficial thesis template for KTH Royal Institute of Technology" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/RafDevX/kthesis-typst" + +[kunskap."0.1.0"] +url = "https://packages.typst.org/preview/kunskap-0.1.0.tar.gz" +hash = "sha256-drCRPbJP5vdJ1/oAcEVVlt8/UO+eHVH+GYRAsvJQYlg=" +typstDeps = [] +description = "A template with generous spacing for reports, assignments, course documents, and similar (shorter) documents" +license = [ + "MIT-0", +] +homepage = "https://github.com/mbollmann/typst-kunskap" + +[lacy-ubc-math-project."0.1.1"] +url = "https://packages.typst.org/preview/lacy-ubc-math-project-0.1.1.tar.gz" +hash = "sha256-F8BESXsANR3yQ3Rjm1yb4fgVSxuNt6WhHkB6StNydPU=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", + "equate_0_2_1", + "metro_0_3_0", + "mitex_0_2_4", + "physica_0_9_3", + "physica_0_9_4", + "showman_0_1_2", +] +description = "A UBC MATH 100/101 group project template" +license = [ + "MIT", +] +homepage = "https://github.com/lace-wing/lacy-ubc-math-project" + +[lacy-ubc-math-project."0.1.0"] +url = "https://packages.typst.org/preview/lacy-ubc-math-project-0.1.0.tar.gz" +hash = "sha256-eapcN5p7yKXxYU9RNMM2DYFxVdb7ZdaLUY0r8UgBMxk=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", + "equate_0_2_1", + "metro_0_3_0", + "mitex_0_2_4", + "physica_0_9_3", + "physica_0_9_4", + "showman_0_1_2", +] +description = "A UBC MATH 100 group project template" +license = [ + "MIT", +] +homepage = "https://github.com/lace-wing/lacy-ubc-math-project" + +[lambdabus."0.1.0"] +url = "https://packages.typst.org/preview/lambdabus-0.1.0.tar.gz" +hash = "sha256-+6YRgcUR930JrAkv27NSM5fEKw4jC84wBCQXNBgSGuY=" +typstDeps = [] +description = "Easily parse, normalize and display simple λ-Calculus expressions" +license = [ + "MIT", +] +homepage = "https://github.com/luca-schlecker/typst-lambdabus" + +[lasagna."0.1.0"] +url = "https://packages.typst.org/preview/lasagna-0.1.0.tar.gz" +hash = "sha256-5wp2UXpeMAJepsYriZ8i2gSaIBtiSGpfkGVlTVzTkBc=" +typstDeps = [] +description = "Add layers, toggle them using tags easily" +license = [ + "MIT", +] +homepage = "https://github.com/IsaacTay/lasagna.git" + +[lasaveur."0.1.4"] +url = "https://packages.typst.org/preview/lasaveur-0.1.4.tar.gz" +hash = "sha256-rtbnsArQc2OnD9R62s+dCO1QKQqbW3DepOkyZ+vvjLc=" +typstDeps = [] +description = "Porting vim-latex's math shorthands to Typst. An accommendating vim syntax file is provided in the repo" +license = [ + "MIT", +] +homepage = "https://github.com/yangwenbo99/typst-lasaveur" + +[lasaveur."0.1.3"] +url = "https://packages.typst.org/preview/lasaveur-0.1.3.tar.gz" +hash = "sha256-ckpw5mZ21zDRV67vZR8yccZXwLzxNbntzZZaPpQhLIs=" +typstDeps = [] +description = "Porting vim-latex's math shorthands to Typst. An accommendating vim syntax file is provided in the repo" +license = [ + "MIT", +] +homepage = "https://github.com/yangwenbo99/typst-lasaveur" + +[latedef."0.1.0"] +url = "https://packages.typst.org/preview/latedef-0.1.0.tar.gz" +hash = "sha256-L1+lMDnYxw6IE6Gu3IOe7AmjUG0eAW/2fQ3MOJIFfo0=" +typstDeps = [] +description = "Use now, define later" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/T0mstone/typst-latedef" + +[layout-ltd."0.1.0"] +url = "https://packages.typst.org/preview/layout-ltd-0.1.0.tar.gz" +hash = "sha256-opKfAj/Ax3WWsjqUE4li6EVESgY0I3bSGjnpk4MvRqU=" +typstDeps = [] +description = "Limit layout iterations for debugging" +license = [ + "MIT", +] +homepage = "https://github.com/davystrong/layout-ltd" + +[leipzig-glossing."0.5.0"] +url = "https://packages.typst.org/preview/leipzig-glossing-0.5.0.tar.gz" +hash = "sha256-75TQDdX3XFIkPIGPfCorpM/JuHb7JNSURgJh/KxtvGE=" +typstDeps = [] +description = "Linguistic interlinear glosses according to the Leipzig Glossing rules" +license = [ + "MIT", +] +homepage = "https://code.everydayimshuflin.com/greg/typst-lepizig-glossing" + +[leipzig-glossing."0.4.0"] +url = "https://packages.typst.org/preview/leipzig-glossing-0.4.0.tar.gz" +hash = "sha256-gr6aJELM5fX4+/tbwEZCyIIwh6k1h+feOQkjjPXT2P4=" +typstDeps = [] +description = "Linguistic interlinear glosses according to the Leipzig Glossing rules" +license = [ + "MIT", +] +homepage = "https://code.everydayimshuflin.com/greg/typst-lepizig-glossing" + +[leipzig-glossing."0.3.0"] +url = "https://packages.typst.org/preview/leipzig-glossing-0.3.0.tar.gz" +hash = "sha256-oVLJXOb1cDLVsmfO2TP1RSUXfudjNxDVOdWHTZUmkCU=" +typstDeps = [] +description = "Linguistic interlinear glosses according to the Leipzig Glossing rules" +license = [ + "MIT", +] +homepage = "https://code.everydayimshuflin.com/greg/typst-lepizig-glossing" + +[leipzig-glossing."0.2.0"] +url = "https://packages.typst.org/preview/leipzig-glossing-0.2.0.tar.gz" +hash = "sha256-QaE7iQkqLKia3/11jLz0W/e3qwcSqEOyxIIaoCm6sP0=" +typstDeps = [] +description = "Linguistic interlinear glosses according to the Leipzig Glossing rules" +license = [ + "MIT", +] +homepage = "https://code.everydayimshuflin.com/greg/typst-lepizig-glossing" + +[leipzig-glossing."0.1.0"] +url = "https://packages.typst.org/preview/leipzig-glossing-0.1.0.tar.gz" +hash = "sha256-7OuUs3oTmFKhhPJ9Byiil9K3MYfk4PtqEevEq2Z+LpY=" +typstDeps = [] +description = "Linguistic interlinear glosses according to the Leipzig Glossing rules" +license = [ + "MIT", +] +homepage = "https://code.everydayimshuflin.com/greg/typst-lepizig-glossing" + +[lemmify."0.1.8"] +url = "https://packages.typst.org/preview/lemmify-0.1.8.tar.gz" +hash = "sha256-OUgZ657tLaEY0bGlN4RomRI7uh0WGXKDcAvgnxaDpNo=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.7"] +url = "https://packages.typst.org/preview/lemmify-0.1.7.tar.gz" +hash = "sha256-wOOv1/zMELqct7xR9E8NhEkZrAUZjxrNpAmHC7GWpYk=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.6"] +url = "https://packages.typst.org/preview/lemmify-0.1.6.tar.gz" +hash = "sha256-JTBSnexoFlfQtCT7l/WTpoUpea6qwSfjMwHCv48qf7k=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.5"] +url = "https://packages.typst.org/preview/lemmify-0.1.5.tar.gz" +hash = "sha256-kXsxiXK4MtYns1oUeN1izlMIVi5e9x1YSTdOHZohLWI=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.4"] +url = "https://packages.typst.org/preview/lemmify-0.1.4.tar.gz" +hash = "sha256-Yu0ZBUNt62NgWnusc1LMnvPG5im6xTGOGPrYokki73A=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.3"] +url = "https://packages.typst.org/preview/lemmify-0.1.3.tar.gz" +hash = "sha256-WSqyHg2GmReHNpEKgT0pcNPlrPZLp/zSmAMm5CkdIg4=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.2"] +url = "https://packages.typst.org/preview/lemmify-0.1.2.tar.gz" +hash = "sha256-l4ZV/LDvF50le6jfxePLNCzrwalMEhgtV1u5cKy0Klo=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.1"] +url = "https://packages.typst.org/preview/lemmify-0.1.1.tar.gz" +hash = "sha256-AjWCj40qq0jEMe39R6bZFlWB2A37Tm1dc+O2pRq392U=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.0"] +url = "https://packages.typst.org/preview/lemmify-0.1.0.tar.gz" +hash = "sha256-rC6ggMrQsfLEze25gAzZn3/wWa1o3HeVcAypw4+Yql8=" +typstDeps = [] +description = "A library for typesetting mathematical theorems" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[leonux."1.1.0"] +url = "https://packages.typst.org/preview/leonux-1.1.0.tar.gz" +hash = "sha256-+kzhNhI9CeQ297PYDQ3L+BQLxZnwc/oJafNyapBY/yU=" +typstDeps = [] +description = "Minimalistic Typst slides (similar to LaTeX beamer" +license = [ + "MIT", +] +homepage = "https://github.com/LordBlacky/leonux" + +[leonux."1.0.0"] +url = "https://packages.typst.org/preview/leonux-1.0.0.tar.gz" +hash = "sha256-r9W+jllahfpEiHMTMHQ5zMMU7LPtfdnwVnYvMWqtpaY=" +typstDeps = [] +description = "Minimalistic Typst slides (similar to LaTeX beamer" +license = [ + "MIT", +] +homepage = "https://github.com/LordBlacky/leonux" + +[letter-pro."3.0.0"] +url = "https://packages.typst.org/preview/letter-pro-3.0.0.tar.gz" +hash = "sha256-Ow22loLjb/wiiB3iSmdZirbtfDR2XIveWgFcnWctBtI=" +typstDeps = [] +description = "DIN 5008 letter template for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Sematre/typst-letter-pro" + +[letter-pro."2.1.0"] +url = "https://packages.typst.org/preview/letter-pro-2.1.0.tar.gz" +hash = "sha256-kCPmuAZ7dwY1dsbpegyNS0cOjuIpV2DfFHSKBxi0SAE=" +typstDeps = [] +description = "DIN 5008 letter template for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Sematre/typst-letter-pro" + +[light-cv."0.2.0"] +url = "https://packages.typst.org/preview/light-cv-0.2.0.tar.gz" +hash = "sha256-GYYEH6YzC+yWoItv6om5HruDMqe1DbhiCYQ65bV6VDc=" +typstDeps = [ + "fontawesome_0_5_0", +] +description = "Minimalistic CV template for your own CV. Please install the font awesome fonts on your system before using the template" +license = [ + "MIT", +] +homepage = "https://github.com/AnsgarLichter/cv-typst-template" + +[light-cv."0.1.1"] +url = "https://packages.typst.org/preview/light-cv-0.1.1.tar.gz" +hash = "sha256-Qou5K4e9AY9a8zPtTXZWvOmzdc8kpSnKhnvjSIBbSZg=" +typstDeps = [ + "fontawesome_0_1_0", + "light-cv_0_1_0", +] +description = "Minimalistic CV template for your own CV. Please install the font awesome fonts on your system before using the template" +license = [ + "MIT", +] +homepage = "https://github.com/AnsgarLichter/cv-typst-template" + +[light-cv."0.1.0"] +url = "https://packages.typst.org/preview/light-cv-0.1.0.tar.gz" +hash = "sha256-VErt6vjrvKCZ9ULxVwB8LQVfmO/gYB798nkklGXTcvA=" +typstDeps = [ + "fontawesome_0_1_0", +] +description = "Minimalistic CV template for your own CV. Please install the font awesome fonts on your system before using the template" +license = [ + "MIT", +] +homepage = "https://github.com/AnsgarLichter/cv-typst-template" + +[light-report-uia."0.1.0"] +url = "https://packages.typst.org/preview/light-report-uia-0.1.0.tar.gz" +hash = "sha256-7cu9FpnqoZZjtAkQlt0IGSdndnifRGTaPCSzf/60v7k=" +typstDeps = [ + "codly_1_0_0", +] +description = "Template for reports at the University of Agder" +license = [ + "MIT", +] +homepage = "https://github.com/sebastos1/light-report-uia" + +[lilaq."0.2.0"] +url = "https://packages.typst.org/preview/lilaq-0.2.0.tar.gz" +hash = "sha256-0wYB8LeODvJ6/ueItWAPP2D8i8ifFfpk7oR6Vp7rrWw=" +typstDeps = [ + "tiptoe_0_3_0", + "zero_0_3_3", +] +description = "Scientific data visualization" +license = [ + "MIT", +] +homepage = "https://github.com/lilaq-project/lilaq" + +[lilaq."0.1.0"] +url = "https://packages.typst.org/preview/lilaq-0.1.0.tar.gz" +hash = "sha256-y7GeVOIdEaOLEvSCJF1K028iRcR6kTmTlaWnsGx9Vw0=" +typstDeps = [ + "tiptoe_0_3_0", + "zero_0_3_3", +] +description = "Data visualization" +license = [ + "MIT", +] +homepage = "https://github.com/lilaq-project/lilaq" + +[lineal."0.1.0"] +url = "https://packages.typst.org/preview/lineal-0.1.0.tar.gz" +hash = "sha256-ZO+OooKSfnEmUKFyPykhd6Trpkn1m9CcwzSqcs0586Q=" +typstDeps = [ + "touying_0_5_3", +] +description = "Build elegent slide decks with Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ellsphillips/lineal" + +[linguify."0.4.2"] +url = "https://packages.typst.org/preview/linguify-0.4.2.tar.gz" +hash = "sha256-ZwDpQZT19wqo2nrhIHaMHZPTyHam3/BhMlsYuPLR8a0=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/linguify" + +[linguify."0.4.1"] +url = "https://packages.typst.org/preview/linguify-0.4.1.tar.gz" +hash = "sha256-OymscdQwJpTjaqyKEqJ5GyFrmSMmTwvPhnpfPE8XRWU=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linguify."0.4.0"] +url = "https://packages.typst.org/preview/linguify-0.4.0.tar.gz" +hash = "sha256-3zEqzFbcXYYhUDLxvcqtpQsO7SbCCyu5CbhqP2Ew1W0=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linguify."0.3.1"] +url = "https://packages.typst.org/preview/linguify-0.3.1.tar.gz" +hash = "sha256-7nmJn4vnG5BreqIrnWHKF9peAaSCHhuejVdXrgrdmKg=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linguify."0.3.0"] +url = "https://packages.typst.org/preview/linguify-0.3.0.tar.gz" +hash = "sha256-zz0kirV1jWXcoX1Yv4Vk+16jDo5Cqqx7xvoyUlcbwBw=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linguify."0.2.0"] +url = "https://packages.typst.org/preview/linguify-0.2.0.tar.gz" +hash = "sha256-3wf1ohs/an6QcwIDSi4qM0slu3O2cV6PuE/uxzTbI7s=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linguify."0.1.0"] +url = "https://packages.typst.org/preview/linguify-0.1.0.tar.gz" +hash = "sha256-gBO7A5cArtcj7CFHJswykXBYEN5ZnSNc5gW9MsBwpE8=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linkst."0.1.0"] +url = "https://packages.typst.org/preview/linkst-0.1.0.tar.gz" +hash = "sha256-LVklnr/CcjK5TrZUlyWN8ovLsu33Oqn9RFhsn8X+DsE=" +typstDeps = [ + "cetz_0_3_3", +] +description = "A knot drawing package for knot theory" +license = [ + "MIT-0", +] + +[lovelace."0.3.0"] +url = "https://packages.typst.org/preview/lovelace-0.3.0.tar.gz" +hash = "sha256-thSCDGxcTfykwUYjUsxBC7Xnei6dXiGybA8wyUoqKjo=" +typstDeps = [] +description = "Algorithms in pseudocode, unopinionated and flexible" +license = [ + "MIT", +] +homepage = "https://github.com/andreasKroepelin/lovelace" + +[lovelace."0.2.0"] +url = "https://packages.typst.org/preview/lovelace-0.2.0.tar.gz" +hash = "sha256-FzsdguyMAGm+wTragSODfEd+S/+7WLaXJbpZW2rlkuw=" +typstDeps = [] +description = "Algorithms in pseudocode, unopinionated and flexible" +license = [ + "MIT", +] +homepage = "https://github.com/andreasKroepelin/lovelace" + +[lovelace."0.1.0"] +url = "https://packages.typst.org/preview/lovelace-0.1.0.tar.gz" +hash = "sha256-gN5Emx9/sl/ols4tQoiBLEjpVvI6oOaJmx5ehYZqhIM=" +typstDeps = [] +description = "Algorithms in pseudocode, unopinionated and flexible" +license = [ + "MIT", +] +homepage = "https://github.com/andreasKroepelin/lovelace" + +[lucky-icml."0.7.0"] +url = "https://packages.typst.org/preview/lucky-icml-0.7.0.tar.gz" +hash = "sha256-r9+WcDaDrRc1RozrwLFWbh8m7W0lXSn7Bsh2K0RM2FI=" +typstDeps = [ + "algorithmic_0_1_0", + "lemmify_0_1_7", +] +description = "ICML-style paper template to publish at conferences for International Conference on Machine Learning" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[lucky-icml."0.2.1"] +url = "https://packages.typst.org/preview/lucky-icml-0.2.1.tar.gz" +hash = "sha256-Dts44RoNPmKnA+/ZkEgy2Snjtrq4Gy9hPLRkiFJCIN4=" +typstDeps = [ + "algorithmic_0_1_0", + "tablex_0_0_7", +] +description = "ICML-style paper template to publish at conferences for International Conference on Machine Learning" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[lyceum."0.1.0"] +url = "https://packages.typst.org/preview/lyceum-0.1.0.tar.gz" +hash = "sha256-R9YJpG9Qh3Wfrad9kSZKLOJXMScffGX7adVigIb0mKs=" +typstDeps = [] +description = "Academic book template in Typst" +license = [ + "MIT", +] + +[m-jaxon."0.1.1"] +url = "https://packages.typst.org/preview/m-jaxon-0.1.1.tar.gz" +hash = "sha256-ye2dPp64nLk+FOupkPEOwdN8u2x7C5lDsfx5NfmNtTc=" +typstDeps = [ + "jogs_0_2_2", +] +description = "Render LaTeX equation in typst using MathJax" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/m-jaxon" + +[m-jaxon."0.1.0"] +url = "https://packages.typst.org/preview/m-jaxon-0.1.0.tar.gz" +hash = "sha256-quqhnnEqvtMKhLCdyneh/iR1CLTlQdX35cB4JqcL42E=" +typstDeps = [ + "jogs_0_2_1", +] +description = "Render LaTeX equation in typst using MathJax" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/m-jaxon" + +[machiatto."0.1.0"] +url = "https://packages.typst.org/preview/machiatto-0.1.0.tar.gz" +hash = "sha256-s0fYYTMIuHrHnTqBwa132FiMi5ge0ZGezEOa6t67LCI=" +typstDeps = [ + "minitoc_0_1_0", +] +description = "A package to help develop publications under MoKa Reads Specification" +license = [ + "MIT", +] +homepage = "https://github.com/Moka-Reads/machiatto" + +[magnifying-glass."0.1.0"] +url = "https://packages.typst.org/preview/magnifying-glass-0.1.0.tar.gz" +hash = "sha256-K4NjY2JJKSijf8UVL7ujT0F2DghmV4Xu7jE9/Bzhb1s=" +typstDeps = [] +description = "Magnify part of image or content" +license = [ + "AGPL-3.0-only", +] +homepage = "https://codeberg.org/Andrew15-5/magnifying-glass" + +[mannot."0.3.0"] +url = "https://packages.typst.org/preview/mannot-0.3.0.tar.gz" +hash = "sha256-akdMPerbH8WpVQ1OACR9HOceZunKGTkj6jfh7s6ChFA=" +typstDeps = [ + "cetz_0_3_4", + "codly_1_2_0", + "tidy_0_4_0", + "tidy_0_4_2", + "tiptoe_0_3_0", +] +description = "A package for marking and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + +[mannot."0.2.3"] +url = "https://packages.typst.org/preview/mannot-0.2.3.tar.gz" +hash = "sha256-FByqhbapg8hXEr2F+LsIz9chdNXLHoiOaotB6JxT+jE=" +typstDeps = [ + "codly_1_2_0", + "tidy_0_4_0", + "tidy_0_4_2", +] +description = "A package for marking and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + +[mannot."0.2.2"] +url = "https://packages.typst.org/preview/mannot-0.2.2.tar.gz" +hash = "sha256-RyfrlOhE3KfyWYAp2PaGVRKKk/k+phT356aXP5/Tpvk=" +typstDeps = [ + "codly_1_0_0", + "tidy_0_4_0", +] +description = "A package for marking and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + +[mannot."0.2.1"] +url = "https://packages.typst.org/preview/mannot-0.2.1.tar.gz" +hash = "sha256-iVErp+ntOVBt5giK3gVhki+jEEjmaK26pPovf3J+zhM=" +typstDeps = [ + "codly_1_0_0", + "tidy_0_4_0", +] +description = "A package for marking and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + +[mannot."0.2.0"] +url = "https://packages.typst.org/preview/mannot-0.2.0.tar.gz" +hash = "sha256-haBmKWWU2Iu6YEqNwd2c4O3rBiRLtwoeEtTHFJ1zmkQ=" +typstDeps = [ + "codly_1_0_0", + "tidy_0_4_0", +] +description = "A package for marking and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + +[mannot."0.1.0"] +url = "https://packages.typst.org/preview/mannot-0.1.0.tar.gz" +hash = "sha256-Ytxmf0SPplbWpVIfCH3FTX5v5x9Fd5W4IO77Iq+FrRU=" +typstDeps = [ + "codly_1_0_0", + "tidy_0_3_0", +] +description = "A package for highlighting and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + +[mantys."1.0.1"] +url = "https://packages.typst.org/preview/mantys-1.0.1.tar.gz" +hash = "sha256-4JVg0Z8j/k4GPIPyGGmTll5CPRbwRriPu8jJyJQysYU=" +typstDeps = [ + "codly_1_2_0", + "fauxreilly_0_1_1", + "gentle-clues_1_0_0", + "hydra_0_5_2", + "marginalia_0_1_2", + "octique_0_1_0", + "showybox_2_0_4", + "swank-tex_0_1_0", + "tidy_0_4_0", + "tidy_0_4_1", + "typearea_0_2_0", + "valkyrie_0_2_2", +] +description = "Helpers to build manuals for Typst packages and templates" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-mantys" + +[mantys."1.0.0"] +url = "https://packages.typst.org/preview/mantys-1.0.0.tar.gz" +hash = "sha256-8YXZbaTJpuuemUghlSuL4qQm1D9jmdon0FW/M9Re9Rk=" +typstDeps = [ + "codly_1_2_0", + "fauxreilly_0_1_1", + "gentle-clues_1_0_0", + "hydra_0_5_2", + "marginalia_0_1_1", + "octique_0_1_0", + "showybox_2_0_3", + "swank-tex_0_1_0", + "tidy_0_4_0", + "typearea_0_2_0", + "valkyrie_0_2_1", +] +description = "Helpers to build manuals for Typst packages and templates" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-mantys" + +[mantys."0.1.4"] +url = "https://packages.typst.org/preview/mantys-0.1.4.tar.gz" +hash = "sha256-2tKfCDi0NIhJxV6YVZOU9Ur9UjDs7jPZV4IdFWcBSFQ=" +typstDeps = [ + "codelst_2_0_0", + "hydra_0_4_0", + "showybox_2_0_1", + "t4t_0_3_2", + "tidy_0_2_0", +] +description = "Helpers to build manuals for Typst packages" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-mantys" + +[mantys."0.1.3"] +url = "https://packages.typst.org/preview/mantys-0.1.3.tar.gz" +hash = "sha256-xcgod2RE4f7UrK/vd+5Eb8VktQcquXhnzJ+JpVBjaXw=" +typstDeps = [ + "codelst_2_0_0", + "hydra_0_4_0", + "showybox_2_0_1", + "t4t_0_3_2", + "tidy_0_2_0", +] +description = "Helpers to build manuals for Typst packages" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-mantys" + +[mantys."0.1.1"] +url = "https://packages.typst.org/preview/mantys-0.1.1.tar.gz" +hash = "sha256-yt2eaewS/7SO4+wxkunhwiBkcnv1MBHYaDONBashZ7w=" +typstDeps = [ + "codelst_2_0_0", + "showybox_2_0_1", + "t4t_0_3_2", + "tidy_0_2_0", +] +description = "Helpers to build manuals for Typst packages" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-mantys" + +[manuscr-ismin."0.1.0"] +url = "https://packages.typst.org/preview/manuscr-ismin-0.1.0.tar.gz" +hash = "sha256-vHCxn7msNu6AsmaozKRrzdNCh/CnQEKiqdnpZZYKCEY=" +typstDeps = [] +description = "Template used for writing reports and/or various documents at the École des Mines de Saint-Étienne" +license = [ + "MIT", +] +homepage = "https://github.com/senaalem/ISMIN_reports_template" + +[marge."0.1.0"] +url = "https://packages.typst.org/preview/marge-0.1.0.tar.gz" +hash = "sha256-Vasq7cVjsSXn4xoqTN0gly+i5bZZV6bxOAjFVqkaQ2E=" +typstDeps = [] +description = "Easy-to-use but powerful and smart margin notes" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-marge" + +[marginalia."0.1.4"] +url = "https://packages.typst.org/preview/marginalia-0.1.4.tar.gz" +hash = "sha256-Z58a+K5+mGxBaRTbI6Z+e034nfJSjW4FV2tXjHqc1gk=" +typstDeps = [] +description = "Configurable margin-notes and matching wide blocks" +license = [ + "Unlicense", +] +homepage = "https://github.com/nleanba/typst-marginalia" + +[marginalia."0.1.3"] +url = "https://packages.typst.org/preview/marginalia-0.1.3.tar.gz" +hash = "sha256-c93UkMnYriR+vakF2O2r+yy1NtH6yAQAk1x/1KQER1g=" +typstDeps = [] +description = "Configurable margin-notes and matching wide blocks" +license = [ + "Unlicense", +] +homepage = "https://github.com/nleanba/typst-marginalia" + +[marginalia."0.1.2"] +url = "https://packages.typst.org/preview/marginalia-0.1.2.tar.gz" +hash = "sha256-+8n5x7MLJlh9coSGMSszW4VfkLNtZcklqdxkX+4pfxU=" +typstDeps = [] +description = "Configurable margin-notes and matching wide blocks" +license = [ + "Unlicense", +] +homepage = "https://github.com/nleanba/typst-marginalia" + +[marginalia."0.1.1"] +url = "https://packages.typst.org/preview/marginalia-0.1.1.tar.gz" +hash = "sha256-9rQcC/u7b7VZ3kC4wjjwVeLF4/vWRmx0otWESJHwzbU=" +typstDeps = [] +description = "Configurable margin-notes and matching wide blocks" +license = [ + "Unlicense", +] +homepage = "https://github.com/nleanba/typst-marginalia" + +[marginalia."0.1.0"] +url = "https://packages.typst.org/preview/marginalia-0.1.0.tar.gz" +hash = "sha256-EsJHC3tDmx4mAtaV8ig+a2erb6avq0EPnEtog4p7Erk=" +typstDeps = [] +description = "Configurable margin-notes and matching wide blocks" +license = [ + "Unlicense", +] +homepage = "https://github.com/nleanba/typst-marginalia" + +[markly."0.3.0"] +url = "https://packages.typst.org/preview/markly-0.3.0.tar.gz" +hash = "sha256-tOTkwsozXxUaOPFWUhiMjltd6yNjMaJskdb869AJjdU=" +typstDeps = [ + "cetz_0_3_3", +] +description = "Typst package for bleed, cut and registration marks" +license = [ + "MIT", +] +homepage = "https://github.com/cskeeters/typst-markly" + +[markly."0.2.0"] +url = "https://packages.typst.org/preview/markly-0.2.0.tar.gz" +hash = "sha256-mZ3ROvJSXt5cvU9JcoHyuGoTqGfL5IE0ahqN+YD+iC8=" +typstDeps = [ + "cetz_0_3_1", +] +description = "Typst package for bleed, cut and registration marks" +license = [ + "MIT", +] +homepage = "https://github.com/cskeeters/typst-markly" + +[matset."0.1.0"] +url = "https://packages.typst.org/preview/matset-0.1.0.tar.gz" +hash = "sha256-PXzwRXLAH98V2L6TR/Y+9UZRgXxs4vKgXm1ciYZ7UCM=" +typstDeps = [] +description = "An ergonomic expression evaluator in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/OptimisticPeach/matset" + +[mcm-scaffold."0.2.0"] +url = "https://packages.typst.org/preview/mcm-scaffold-0.2.0.tar.gz" +hash = "sha256-4KSCC7XlZi9eJGm71Ui+dxDFKqkIcl1QYt0CfGXxSgg=" +typstDeps = [ + "mitex_0_2_5", +] +description = "A Typst template for COMAP's Mathematical Contest in MCM/ICM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/sxdl/MCM-Typst-template" + +[mcm-scaffold."0.1.0"] +url = "https://packages.typst.org/preview/mcm-scaffold-0.1.0.tar.gz" +hash = "sha256-9vB07x85EnOPFB1JKBiloo4MuSJxxHHdyUFdwACvifk=" +typstDeps = [ + "mitex_0_2_2", +] +description = "A Typst template for COMAP's Mathematical Contest in MCM/ICM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/sxdl/MCM-Typst-template" + +[mechanical-system-cetz-34j."0.1.0"] +url = "https://packages.typst.org/preview/mechanical-system-cetz-34j-0.1.0.tar.gz" +hash = "sha256-PPoQ0Gy6Xh19JPPnL2uyGhVomZbOHOOUCFJDp/U/cTc=" +typstDeps = [ + "cetz_0_3_0", +] +description = "CeTZ library for drawing mechanical systems" +license = [ + "MIT", +] +homepage = "https://github.com/34j/typst-cetz-mechanical-system" + +[mephistypsteles."0.3.0"] +url = "https://packages.typst.org/preview/mephistypsteles-0.3.0.tar.gz" +hash = "sha256-/XWM4SMGT+ZUAEb0QCNxNp8JkHqGInjwY3/zXWrQkls=" +typstDeps = [] +description = "The devil's reflection, using typst in typst" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/T0mstone/mephistypsteles" + +[mephistypsteles."0.2.0"] +url = "https://packages.typst.org/preview/mephistypsteles-0.2.0.tar.gz" +hash = "sha256-/hSShsjHrPIH+XqXDpAZvXXRr6bc7eBWWP9LttWzb18=" +typstDeps = [] +description = "The devil's reflection, using typst in typst" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/T0mstone/mephistypsteles" + +[mephistypsteles."0.1.0"] +url = "https://packages.typst.org/preview/mephistypsteles-0.1.0.tar.gz" +hash = "sha256-vwiyuUYAZInRyHUljVUZCZl4fTP2H/41zE3S5m5dmOM=" +typstDeps = [] +description = "The devil's reflection, using typst in typst" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/T0mstone/mephistypsteles" + +[meppp."0.2.1"] +url = "https://packages.typst.org/preview/meppp-0.2.1.tar.gz" +hash = "sha256-tvLTyqXGm9S51yXFuHglYjZc2c4CYsW5CA3qv95pnFI=" +typstDeps = [ + "cuti_0_2_1", +] +description = "Template for modern physics experiment reports at the Physics School of PKU" +license = [ + "MIT", +] +homepage = "https://github.com/pku-typst/meppp" + +[meppp."0.2.0"] +url = "https://packages.typst.org/preview/meppp-0.2.0.tar.gz" +hash = "sha256-OveaoE6hQeb/tgY9YF6yUTSREjPZ5LoEcEjrgYxKmy4=" +typstDeps = [] +description = "Template for modern physics experiment reports at the Physics School of PKU" +license = [ + "MIT", +] +homepage = "https://github.com/pku-typst/meppp" + +[meppp."0.1.0"] +url = "https://packages.typst.org/preview/meppp-0.1.0.tar.gz" +hash = "sha256-VLGPT6B5rNf6LX05TppT+ewTbRT6E6wh58LsJcrxHFY=" +typstDeps = [] +description = "Template for modern physics experiment reports at the Physics School of PKU" +license = [ + "MIT", +] +homepage = "https://github.com/CL4R3T/meppp" + +[messeji."0.3.0"] +url = "https://packages.typst.org/preview/messeji-0.3.0.tar.gz" +hash = "sha256-vqIQjUdm4KvrDNTr5SnWqzVwSkG/dRVvQy/0W6o0P/g=" +typstDeps = [ + "codly_1_3_0", + "tidy_0_4_2", +] +description = "Typeset multi-page chat histories, including from external JSON files" +license = [ + "MIT", +] +homepage = "https://github.com/Tanikai/messeji" + +[messeji."0.2.0"] +url = "https://packages.typst.org/preview/messeji-0.2.0.tar.gz" +hash = "sha256-ObsJGFyE7RTc6QBr/Vrvf4bwxfs2qGEcAceAxOpHlaM=" +typstDeps = [] +description = "Typeset multi-page chat histories, including from external JSON files" +license = [ + "MIT", +] +homepage = "https://github.com/Tanikai/messeji" + +[messeji."0.1.0"] +url = "https://packages.typst.org/preview/messeji-0.1.0.tar.gz" +hash = "sha256-Aq217WNVh5jq7qrrP6xpcu5hXrPm4zQrHhL4Xugy01o=" +typstDeps = [] +description = "Typeset multi-page chat histories, with JSON support" +license = [ + "MIT", +] +homepage = "https://github.com/Tanikai/messeji" + +[metalogo."1.2.0"] +url = "https://packages.typst.org/preview/metalogo-1.2.0.tar.gz" +hash = "sha256-BY9rUnWqGp2LvKOscA8DIYSuLuBb4zDwgd/rpe/jIFs=" +typstDeps = [] +description = "Typeset various LaTeX compiler logos" +license = [ + "MIT", +] +homepage = "https://github.com/lonkaars/typst-metalogo" + +[metalogo."1.1.0"] +url = "https://packages.typst.org/preview/metalogo-1.1.0.tar.gz" +hash = "sha256-sQgXAzowpv9VGDq9FFl9fjSESyyRnkij2d5bjSEUzoU=" +typstDeps = [] +description = "Typeset various LaTeX logos" +license = [ + "MIT", +] +homepage = "https://github.com/lonkaars/typst-metalogo.git" + +[metalogo."1.0.2"] +url = "https://packages.typst.org/preview/metalogo-1.0.2.tar.gz" +hash = "sha256-4RF3uGrWbYpZGMStKPiTMPWkhrELMdo0WZos2DEEyUI=" +typstDeps = [] +description = "Typeset various LaTeX logos" +license = [ + "MIT", +] +homepage = "https://github.com/lonkaars/typst-metalogo.git" + +[metro."0.3.0"] +url = "https://packages.typst.org/preview/metro-0.3.0.tar.gz" +hash = "sha256-95MU3Zb9EL7sebXn9ddiemKnmu9iO7J9SgX5S5inrGg=" +typstDeps = [ + "oxifmt_0_2_0", + "t4t_0_3_2", +] +description = "Typset units and numbers with options" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/fenjalien/metro" + +[metro."0.2.0"] +url = "https://packages.typst.org/preview/metro-0.2.0.tar.gz" +hash = "sha256-HA6QHYRiWnwxEu1/rb7aqq1n05uZ+axAxuZPhDEmw0w=" +typstDeps = [ + "t4t_0_3_2", +] +description = "Typset units and numbers with options" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/fenjalien/metro" + +[metro."0.1.1"] +url = "https://packages.typst.org/preview/metro-0.1.1.tar.gz" +hash = "sha256-N2e6BRt1Tql6gyosr+w25T41sj55Xp0mvBqnMoVzvSY=" +typstDeps = [ + "t4t_0_2_0", + "t4t_0_3_2", +] +description = "Typset units and numbers with options" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/fenjalien/metro" + +[metro."0.1.0"] +url = "https://packages.typst.org/preview/metro-0.1.0.tar.gz" +hash = "sha256-RHu2RMnAUARKzCgkr8jbEC7/lKiqwR2/lAYveW5CXBg=" +typstDeps = [ + "t4t_0_2_0", +] +description = "Typset units and numbers with options" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/fenjalien/metro" + +[metronic."1.1.0"] +url = "https://packages.typst.org/preview/metronic-1.1.0.tar.gz" +hash = "sha256-rgHjw+wDHWFIb0NqVfmcOO+yXDlpgjiduR4U3KTbNDw=" +typstDeps = [ + "fontawesome_0_5_0", +] +description = "A clean, colorful, and modern CV template" +license = [ + "MIT", +] +homepage = "https://github.com/patrixr/metronic-cv" + +[metronic."1.0.0"] +url = "https://packages.typst.org/preview/metronic-1.0.0.tar.gz" +hash = "sha256-MuIZr+GV9ysLA5djgHa6XYSST4XIj9wosSiwDheCSqU=" +typstDeps = [ + "fontawesome_0_5_0", +] +description = "A clean, colorful, and modern CV template" +license = [ + "MIT", +] +homepage = "https://github.com/patrixr/metronic-cv" + +[metropolis-polylux."0.1.0"] +url = "https://packages.typst.org/preview/metropolis-polylux-0.1.0.tar.gz" +hash = "sha256-2e/etvchGyyih2CsOwBBeQYxe6Ak/H3o25k6wApEMWg=" +typstDeps = [ + "polylux_0_4_0", +] +description = "Metropolis style template for Polylux" +license = [ + "MIT", +] +homepage = "https://github.com/polylux-typ/metropolis" + +[miage-rapide-tp."0.1.2"] +url = "https://packages.typst.org/preview/miage-rapide-tp-0.1.2.tar.gz" +hash = "sha256-WmlEiIIg1THwzgDk3xcXEAIBd+ZTZYpb5fWT8kgQ35Q=" +typstDeps = [] +description = "Quickly generate a report for MIAGE practical work" +license = [ + "MIT-0", +] + +[miage-rapide-tp."0.1.1"] +url = "https://packages.typst.org/preview/miage-rapide-tp-0.1.1.tar.gz" +hash = "sha256-WLk2i1xOMnk/3dUBGamesMAbbStN9hQ/y7pSfEB5YMI=" +typstDeps = [] +description = "A template to quickly generate a report for MIAGE practical work" +license = [ + "MIT-0", +] + +[miage-rapide-tp."0.1.0"] +url = "https://packages.typst.org/preview/miage-rapide-tp-0.1.0.tar.gz" +hash = "sha256-iqnNBYwHnzpSf7PotKngB8t3PPxSKol4RhZKL2X4EfY=" +typstDeps = [] +description = "A template to quickly generate a report for MIAGE practical work" +license = [ + "MIT-0", +] + +[min-article."0.1.0"] +url = "https://packages.typst.org/preview/min-article-0.1.0.tar.gz" +hash = "sha256-vjjyAb39oC44sHWT3lBVw8G+V/cEaaaxSXssBYJeQmo=" +typstDeps = [ + "linguify_0_4_0", +] +description = "Simple and easy way to write ABNT-compliant articles" +license = [ + "MIT-0", +] +homepage = "https://github.com/mayconfmelo/min-article" + +[min-book."0.1.0"] +url = "https://packages.typst.org/preview/min-book-0.1.0.tar.gz" +hash = "sha256-pBfBF7HPoSj4k0fxv4FA0tA3jRiaKnGr5Bzy+BDxcJw=" +typstDeps = [ + "numbly_0_1_0", +] +description = "Simple and complete books without introducing new syntax" +license = [ + "MIT-0", +] +homepage = "https://github.com/mayconfmelo/min-book" + +[min-manual."0.1.0"] +url = "https://packages.typst.org/preview/min-manual-0.1.0.tar.gz" +hash = "sha256-jqwfu2iOgnoHPO3zvw8b/qo4Zq+dhoWcqFl0ljLoQg8=" +typstDeps = [ + "pkg-name_0_4_2", +] +description = "Simple and sober manuals inspired by the OG Linux manpages" +license = [ + "MIT-0", +] +homepage = "https://github.com/mayconfmelo/min-manual" + +[min-resume."0.1.0"] +url = "https://packages.typst.org/preview/min-resume-0.1.0.tar.gz" +hash = "sha256-mOtLc/qkZ/FoV4sFudhOOKMBxxxROWOeLYJGyeqYIkY=" +typstDeps = [ + "linguify_0_4_2", +] +description = "Simple and professional résumé for professional people" +license = [ + "MIT-0", +] +homepage = "https://github.com/mayconfmelo/min-resume" + +[minerva-report-fcfm."0.2.2"] +url = "https://packages.typst.org/preview/minerva-report-fcfm-0.2.2.tar.gz" +hash = "sha256-HK/jzmCXp6i6+Iy/7RfCrKPWp6J1NTb59oLi11SJmfw=" +typstDeps = [] +description = "Template de artículos, informes y tareas para la Facultad de Ciencias Físicas y Matemáticas (FCFM" +license = [ + "MIT-0", +] +homepage = "https://github.com/Dav1com/minerva-report-fcfm" + +[minerva-report-fcfm."0.2.1"] +url = "https://packages.typst.org/preview/minerva-report-fcfm-0.2.1.tar.gz" +hash = "sha256-+eKKL9iQ3Gw160T7qsQh75QB8iGbE8jYCAnnGU518zQ=" +typstDeps = [] +description = "Template de artículos, informes y tareas para la Facultad de Ciencias Físicas y Matemáticas (FCFM" +license = [ + "MIT-0", +] +homepage = "https://github.com/Dav1com/minerva-report-fcfm" + +[minerva-report-fcfm."0.2.0"] +url = "https://packages.typst.org/preview/minerva-report-fcfm-0.2.0.tar.gz" +hash = "sha256-AS6L5ynVGu6DdM2uEVMJhBYeQsn5WlpEW3PAbuL859Y=" +typstDeps = [ + "minerva-report-fcfm_0_1_0", +] +description = "Template de artículos, informes y tareas para la Facultad de Ciencias Físicas y Matemáticas (FCFM" +license = [ + "MIT-0", +] +homepage = "https://github.com/Dav1com/minerva-report-fcfm" + +[minerva-report-fcfm."0.1.0"] +url = "https://packages.typst.org/preview/minerva-report-fcfm-0.1.0.tar.gz" +hash = "sha256-l0Zf7A0wIRh2VdsEsDYBZAQSjIXaTK3/vuX6H/2zfpA=" +typstDeps = [] +description = "Template para crear artículos, informes y tareas para la Facultad de Ciencias Físicas y Matemáticas (FCFM), pero puede ser personalizado para cualquier universidad" +license = [ + "MIT-0", +] +homepage = "https://github.com/Dav1com/minerva-report-fcfm" + +[minideck."0.2.1"] +url = "https://packages.typst.org/preview/minideck-0.2.1.tar.gz" +hash = "sha256-UuH/zXlYpibGZaQgpiifTmmA/8swJ+OUAlgWkBghsYk=" +typstDeps = [ + "cetz_0_2_2", + "fletcher_0_5_0", + "pinit_0_1_4", +] +description = "Simple dynamic slides" +license = [ + "MIT", +] +homepage = "https://github.com/knuesel/typst-minideck" + +[minienvs."0.1.0"] +url = "https://packages.typst.org/preview/minienvs-0.1.0.tar.gz" +hash = "sha256-LN2bZyrDUJk+cYvaYDnp2cqvePZgZ79hTpcXlTUB04g=" +typstDeps = [] +description = "Theorem environments with minimal fuss" +license = [ + "MIT", +] + +[minimal-cv."0.1.0"] +url = "https://packages.typst.org/preview/minimal-cv-0.1.0.tar.gz" +hash = "sha256-YQrVb43sOKaG3kgNma2GVYT+xA5pmPlIfbrkAu/wtSA=" +typstDeps = [] +description = "A clean and customizable CV template" +license = [ + "MIT", +] +homepage = "https://github.com/lelimacon/typst-minimal-cv" + +[minimal-presentation."0.6.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.6.0.tar.gz" +hash = "sha256-OqITcVSkhql4T3oVctyE36f5Tm3eZ6JtrVYAYjvRl7M=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-presentation."0.5.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.5.0.tar.gz" +hash = "sha256-QbsFtdy+XKqyziFAZM+vJABItdTh2YD8X2UKNtbeqqw=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-presentation."0.4.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.4.0.tar.gz" +hash = "sha256-09AsVkZKpQJOjI0QcJvCp/pb6kjWfoBgfOMRUS4ARac=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-presentation."0.3.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.3.0.tar.gz" +hash = "sha256-XJILcfNHpFKubfFj5fPYRKR/+0L479x9VJuSBCS7TVA=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-presentation."0.2.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.2.0.tar.gz" +hash = "sha256-ANO8P8da2Vw67ehN+Hh+LpKSOu+eK+S94oYbivgydmQ=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-presentation."0.1.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.1.0.tar.gz" +hash = "sha256-MD0/ukxUD65zNk4C2/RXyKqHRCSmJRxKGyx2phGnNiE=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-thesis-luebeck."0.3.0"] +url = "https://packages.typst.org/preview/minimal-thesis-luebeck-0.3.0.tar.gz" +hash = "sha256-wnkoejwmSwl2Xy+Lca3QHOL9ng6vZ7sCoQ/T/obZRw8=" +typstDeps = [ + "abbr_0_2_1", +] +description = "A minimalistic template for writing a thesis" +license = [ + "MIT", +] +homepage = "https://github.com/fhemstra/minimal-thesis-luebeck" + +[minimal-thesis-luebeck."0.2.0"] +url = "https://packages.typst.org/preview/minimal-thesis-luebeck-0.2.0.tar.gz" +hash = "sha256-/FtKpzaAFft0PJehThEVSL665p+QWgE4CxZlN0HdjjI=" +typstDeps = [ + "abbr_0_1_1", +] +description = "A minimalistic template for writing a thesis" +license = [ + "MIT", +] +homepage = "https://github.com/fhemstra/minimal-thesis-luebeck" + +[minimal-thesis-luebeck."0.1.0"] +url = "https://packages.typst.org/preview/minimal-thesis-luebeck-0.1.0.tar.gz" +hash = "sha256-8wgdLxDtP2ZeWTRAvJQehADf35vPplC2MP34o5SJ/oc=" +typstDeps = [ + "abbr_0_1_1", +] +description = "A minimalistic template for writing a thesis" +license = [ + "MIT", +] + +[minimalbc."0.0.1"] +url = "https://packages.typst.org/preview/minimalbc-0.0.1.tar.gz" +hash = "sha256-JN6jgcnII6jPACdceOqtpnb9kx43fkyLK7Z21PmwvPg=" +typstDeps = [] +description = "Sleek, minimalist design for professional business cards. Emphasizing clarity and elegance" +license = [ + "MIT", +] +homepage = "https://github.com/sevehub/minimalbc" + +[minimalistic-latex-cv."0.1.1"] +url = "https://packages.typst.org/preview/minimalistic-latex-cv-0.1.1.tar.gz" +hash = "sha256-pvfADpumtC5wx/O70rT4TfOEsEQssL/uXEOsOLdhAzU=" +typstDeps = [] +description = "A minimalistic LaTeX-style CV template for professionals" +license = [ + "MIT-0", +] + +[minimalistic-latex-cv."0.1.0"] +url = "https://packages.typst.org/preview/minimalistic-latex-cv-0.1.0.tar.gz" +hash = "sha256-q1iqeCHDLdya8h9MDxFns03LyidWL2GLoLsRvdCLyfs=" +typstDeps = [] +description = "A minimalistic LaTeX-style CV template for professionals" +license = [ + "MIT-0", +] + +[minitoc."0.1.0"] +url = "https://packages.typst.org/preview/minitoc-0.1.0.tar.gz" +hash = "sha256-4VtBpY3MKbWtGZIkKnbPVm17ChcV53/MgIj+AkZ/X6I=" +typstDeps = [] +description = "An outline function just for one section and nothing else" +license = [ + "GPL-3.0-only", +] +homepage = "https://gitlab.com/human_person/typst-local-outline" + +[mino."0.1.2"] +url = "https://packages.typst.org/preview/mino-0.1.2.tar.gz" +hash = "sha256-6RODyq64Bvkl7AXQju2pL4A3Nq/NbO8VfZs9szuJJtM=" +typstDeps = [ + "jogs_0_2_3", +] +description = "Render tetris fumen in typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/mino" + +[mino."0.1.1"] +url = "https://packages.typst.org/preview/mino-0.1.1.tar.gz" +hash = "sha256-cl4dktVerwNhAgochCpXeOmNMNI0FERrzNiTtNGWBLs=" +typstDeps = [ + "jogs_0_2_1", +] +description = "Render tetris fumen in typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/mino" + +[mino."0.1.0"] +url = "https://packages.typst.org/preview/mino-0.1.0.tar.gz" +hash = "sha256-OwlYBdaeQzDAgr82l+AiOI4Fz9HWeG+NJ4yt7fn+oxg=" +typstDeps = [ + "jogs_0_2_1", +] +description = "Render tetris fumen in typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/mino" + +[mitex."0.2.5"] +url = "https://packages.typst.org/preview/mitex-0.2.5.tar.gz" +hash = "sha256-kvVQT22lWFLxlfXwWC9wWgZXVJMJEf63Uuzri0/NnqY=" +typstDeps = [] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.2.4"] +url = "https://packages.typst.org/preview/mitex-0.2.4.tar.gz" +hash = "sha256-4NGNciNJQaMhE6AQneKqDzeh16jT2uxORCWEUuN4Lvc=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.2.3"] +url = "https://packages.typst.org/preview/mitex-0.2.3.tar.gz" +hash = "sha256-ThPfdRH6cCkoMR58JQYOANTY4axtOIWhDh+OV+xKPO4=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.2.2"] +url = "https://packages.typst.org/preview/mitex-0.2.2.tar.gz" +hash = "sha256-zCzfz3iS5Zko31QrI1Hd1qLBGETg2dgVwd4LHDq5njQ=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.2.1"] +url = "https://packages.typst.org/preview/mitex-0.2.1.tar.gz" +hash = "sha256-0YonqnjL0+kQaLdOVi+JrzHTGX61F0yCPOYqGu9ntK0=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.2.0"] +url = "https://packages.typst.org/preview/mitex-0.2.0.tar.gz" +hash = "sha256-Kh4uMywIoS7EFsQc4WQ23EmNDKD4qqErd6GjkyyO3+c=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.1.0"] +url = "https://packages.typst.org/preview/mitex-0.1.0.tar.gz" +hash = "sha256-94SandlTzLX+awqNrciJjuSbF9MVZ4hLT6dXQq+qJsM=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/OrangeX4/mitex" + +[modern-acad-cv."0.1.3"] +url = "https://packages.typst.org/preview/modern-acad-cv-0.1.3.tar.gz" +hash = "sha256-md1GRHWOxDNNy4iavFGqSmgpxMKJR8KGsT0pR2XAPso=" +typstDeps = [ + "fontawesome_0_5_0", + "use-academicons_0_1_0", +] +description = "A CV template for academics based on moderncv LaTeX package" +license = [ + "MIT", +] +homepage = "https://github.com/philkleer/typst-modern-acad-cv" + +[modern-acad-cv."0.1.2"] +url = "https://packages.typst.org/preview/modern-acad-cv-0.1.2.tar.gz" +hash = "sha256-+XAabIM+vK0hVC3+5/7jwSnH+C+vH+EfuwhYS9q2XdM=" +typstDeps = [ + "fontawesome_0_5_0", + "use-academicons_0_1_0", +] +description = "A CV template for academics based on moderncv LaTeX package" +license = [ + "MIT", +] +homepage = "https://github.com/philkleer/typst-modern-acad-cv" + +[modern-acad-cv."0.1.1"] +url = "https://packages.typst.org/preview/modern-acad-cv-0.1.1.tar.gz" +hash = "sha256-XVzghoV6ZMbN38FKZK/V5izTKcBv+vnr4UhIywM7NX4=" +typstDeps = [ + "fontawesome_0_5_0", + "modern-acad-cv_0_1_0", + "use-academicons_0_1_0", +] +description = "A CV template for academics based on moderncv LaTeX package" +license = [ + "MIT", +] +homepage = "https://github.com/bpkleer/typst-modern-acad-cv" + +[modern-acad-cv."0.1.0"] +url = "https://packages.typst.org/preview/modern-acad-cv-0.1.0.tar.gz" +hash = "sha256-3plPylFuGxUSuFvdyj/RpbtvbIIlLAf/AFsXVl/59jc=" +typstDeps = [ + "fontawesome_0_4_0", + "use-academicons_0_1_0", +] +description = "A CV template for academics based on moderncv LaTeX package" +license = [ + "MIT", +] +homepage = "https://github.com/bpkleer/typst-modern-acad-cv" + +[modern-bnu-course-paper."0.1.0"] +url = "https://packages.typst.org/preview/modern-bnu-course-paper-0.1.0.tar.gz" +hash = "sha256-HC9zUal/ffbx7O0Ynsmb9OtgS9gJH+dxYfDSFmtiN5Q=" +typstDeps = [ + "algo_0_3_4", + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "北京师范大学课程论文模板。Modern Beijing Normal University Course Paper" +license = [ + "MIT", +] +homepage = "https://github.com/EuanTop/modern-bnu-course-paper" + +[modern-bnu-thesis."0.0.2"] +url = "https://packages.typst.org/preview/modern-bnu-thesis-0.0.2.tar.gz" +hash = "sha256-pMg00ozQH/SRCyd/BR94OMd7lmg701RG5BGUTMXbvNY=" +typstDeps = [ + "algo_0_3_6", + "cuti_0_3_0", + "i-figured_0_2_4", + "pinit_0_2_2", + "tablex_0_0_9", +] +description = "北京师范大学学位论文模板。Modern Beijing Normal University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/mosrat/modern-bnu-thesis" + +[modern-bnu-thesis."0.0.1"] +url = "https://packages.typst.org/preview/modern-bnu-thesis-0.0.1.tar.gz" +hash = "sha256-Zw7INRq6oBSgl7ip/e6SlUgqrAvgwzTmbW0ODOQBFOU=" +typstDeps = [ + "algo_0_3_4", + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "北京师范大学学位论文模板。Modern Beijing Normal University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/mosrat/modern-bnu-thesis" + +[modern-cqut-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-cqut-thesis-0.1.0.tar.gz" +hash = "sha256-75yWFP5K6VmsPKff/BvzKHK15Bch6CwRXEHsTIaZJYQ=" +typstDeps = [ + "ctheorems_1_1_3", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "outrageous_0_3_0", + "pinit_0_2_2", + "showybox_2_0_3", + "tablex_0_0_8", +] +description = "重庆理工大学学位论文模板。 A Thesis Tamplate for CQUT" +license = [ + "MIT", +] +homepage = "https://github.com/aFei-CQUT/modern-cqut-thesis" + +[modern-cug-report."0.1.1"] +url = "https://packages.typst.org/preview/modern-cug-report-0.1.1.tar.gz" +hash = "sha256-tDNx5sL+we4WNxEFa+oHMNfe9nvbB717gKz87Jjobmk=" +typstDeps = [ + "cuti_0_2_1", + "mitex_0_2_4", + "physica_0_9_3", + "showybox_2_0_3", +] +description = "Chinese Technical report writing standards" +license = [ + "MIT", +] +homepage = "https://github.com/CUG-hydro/modern-cug-report.typ" + +[modern-cug-report."0.1.0"] +url = "https://packages.typst.org/preview/modern-cug-report-0.1.0.tar.gz" +hash = "sha256-j+wgh8EXdPjuWRYmfVnjhEIvYSGuAPeEclj5vD7HjVI=" +typstDeps = [ + "codly_1_0_0", + "cuti_0_2_1", + "mitex_0_2_4", + "physica_0_9_3", + "showybox_2_0_3", +] +description = "Chinese Technical report writing standards" +license = [ + "MIT", +] +homepage = "https://github.com/CUG-hydro/modern-cug-report.typ" + +[modern-cug-thesis."0.2.6"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.6.tar.gz" +hash = "sha256-HoN1j5PIQ0UxafuHgQNTRc0eaoIhTLMD+ejMyZwIcGQ=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_2_4", + "subpar_0_2_1", + "tablex_0_0_8", + "wordometer_0_1_4", +] +description = "中国地质大学（武汉）学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.2.5"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.5.tar.gz" +hash = "sha256-pTrPUNNss/RmAS+JE/F48lvpBQOg75gHhPQ8YMsxKak=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "outrageous_0_1_0", + "subpar_0_2_0", + "tablex_0_0_8", +] +description = "中国地质大学（武汉）学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.2.4"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.4.tar.gz" +hash = "sha256-3SpjKehYDxl6YPWuJq1PZs4ZEutB464wAQ42XQEbeiQ=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中国地质大学（武汉）学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.2.3"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.3.tar.gz" +hash = "sha256-3mZSi5/bcYVQWg+H9/nD2Tph3bMiEq0w491lIhD92QQ=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中国地质大学（武汉）学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.2.2"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.2.tar.gz" +hash = "sha256-F50iaDduV2nS1brJO3s9BBUwGWqnAYgj17SXbd/Nzxo=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "indenta_0_0_3", + "modern-cug-thesis_0_2_1", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中国地质大学（武汉）学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.2.1"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.1.tar.gz" +hash = "sha256-3ST8IuzSV4ZW/7y0e5C/vvjsnDnbUMHiUUXP+FxA4vc=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "indenta_0_0_3", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中国地质大学（武汉）学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.1.0.tar.gz" +hash = "sha256-2FIo2PUltG+8HVtIkxwOh1mlhvc902zlJ4qIzQvVALw=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "indenta_0_0_3", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中国地质大学（武汉）学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cv."0.8.0"] +url = "https://packages.typst.org/preview/modern-cv-0.8.0.tar.gz" +hash = "sha256-p8ZkhcYvO3vdidAYRYobapreiZSqE4Pihd0eEeLIQ24=" +typstDeps = [ + "fontawesome_0_5_0", + "linguify_0_4_1", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.7.0"] +url = "https://packages.typst.org/preview/modern-cv-0.7.0.tar.gz" +hash = "sha256-AHUyHvNmcobnCGjfInft4i/JWnTQp+o5dSznx/xl6cU=" +typstDeps = [ + "fontawesome_0_5_0", + "linguify_0_4_1", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.6.0"] +url = "https://packages.typst.org/preview/modern-cv-0.6.0.tar.gz" +hash = "sha256-3MRMAuavyQzggHtgd6g5LjfqeF1+26Y6+AUwAbGCmdk=" +typstDeps = [ + "fontawesome_0_2_1", + "linguify_0_4_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.5.0"] +url = "https://packages.typst.org/preview/modern-cv-0.5.0.tar.gz" +hash = "sha256-iT4H5axgHaNQGDJzrla917YiqxFC6uNP7X9PmM2mAhY=" +typstDeps = [ + "fontawesome_0_2_1", + "linguify_0_4_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.4.0"] +url = "https://packages.typst.org/preview/modern-cv-0.4.0.tar.gz" +hash = "sha256-o2G8VnzHVDxJ/ooJaewVfNWU6kvTAmJ+/H/Hb+pGlQc=" +typstDeps = [ + "fontawesome_0_2_1", + "linguify_0_4_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.3.1"] +url = "https://packages.typst.org/preview/modern-cv-0.3.1.tar.gz" +hash = "sha256-2zE5Wa/4XQbzudDfxnh/SJudunnvVZh94QDc51IwAmM=" +typstDeps = [ + "fontawesome_0_1_0", + "linguify_0_4_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.3.0"] +url = "https://packages.typst.org/preview/modern-cv-0.3.0.tar.gz" +hash = "sha256-0gMx15la5PddPO7gdwRZJDvMvGmJzmOZtDZ312VuDNE=" +typstDeps = [ + "fontawesome_0_1_0", + "linguify_0_4_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.2.0"] +url = "https://packages.typst.org/preview/modern-cv-0.2.0.tar.gz" +hash = "sha256-VfsX6L1N7yYiDQ838lto6FSGomcSUSzqGTle81qP7OQ=" +typstDeps = [ + "fontawesome_0_1_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.1.0"] +url = "https://packages.typst.org/preview/modern-cv-0.1.0.tar.gz" +hash = "sha256-htS0bAEgSfCnFt/BP6Hr/dY4gB0hvnxKWWOz1EEMtCI=" +typstDeps = [ + "fontawesome_0_1_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-ecnu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/modern-ecnu-thesis-0.2.0.tar.gz" +hash = "sha256-d9JuuJUbBPELbgJ0KHVX+hcYzap41sd8CD023oPu1Jk=" +typstDeps = [ + "cuti_0_2_1", + "hydra_0_5_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "kouhu_0_1_0", + "outrageous_0_3_0", + "pinit_0_1_3", + "tablex_0_0_8", + "wordometer_0_1_4", +] +description = "华东师范大学本科 / 研究生学位论文模板。Modern East China Normal University Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/jtchen2k/modern-ecnu-thesis" + +[modern-ecnu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-ecnu-thesis-0.1.0.tar.gz" +hash = "sha256-S/x3L3NdnsH3J5QbpGUVc9MA6TFcRCugOnLVowfDsqA=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "kouhu_0_1_0", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", + "wordometer_0_1_4", +] +description = "华东师范大学学位论文模板。Modern East China Normal University Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/jtchen2k/modern-ecnu-thesis" + +[modern-g7-32."0.1.0"] +url = "https://packages.typst.org/preview/modern-g7-32-0.1.0.tar.gz" +hash = "sha256-eueqW82lVMD0Ii45pLAlD4Rw7NuF9mdfuTWXgQ1Oylw=" +typstDeps = [ + "numberingx_0_0_1", +] +description = "Template for academic documents in compliance with GOST 7.32‑2017" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/typst-g7-32/modern-g7-32" + +[modern-hsh-thesis."1.1.1"] +url = "https://packages.typst.org/preview/modern-hsh-thesis-1.1.1.tar.gz" +hash = "sha256-X7gt1MdV8F+vArCrPDwMfLlA3ZndNgo0tOXJo7OV/8M=" +typstDeps = [ + "big-todo_0_2_0", + "codly_1_3_0", + "gentle-clues_1_2_0", + "gloss-awe_0_0_5", + "hydra_0_6_0", + "treet_0_1_1", + "wrap-it_0_1_1", +] +description = "Template for writing a bachelors or masters thesis at the Hochschule Hannover, Faculty 4" +license = [ + "MIT", +] +homepage = "https://github.com/MrToWy/hsh-thesis" + +[modern-hsh-thesis."1.1.0"] +url = "https://packages.typst.org/preview/modern-hsh-thesis-1.1.0.tar.gz" +hash = "sha256-A+DECSPBeSUhEXlDGCL7xBWrQ83NGD5Xy0rAaa7TNJk=" +typstDeps = [ + "big-todo_0_2_0", + "codly_1_3_0", + "gentle-clues_1_2_0", + "gloss-awe_0_0_5", + "hydra_0_6_0", + "treet_0_1_1", + "wrap-it_0_1_1", +] +description = "Template for writing a bachelors or masters thesis at the Hochschule Hannover, Faculty 4" +license = [ + "MIT", +] +homepage = "https://github.com/MrToWy/hsh-thesis" + +[modern-hsh-thesis."1.0.2"] +url = "https://packages.typst.org/preview/modern-hsh-thesis-1.0.2.tar.gz" +hash = "sha256-RXQYwYaz/mAXMuDX7DS+Wpr8Op6x6nF2G0KB88HCauM=" +typstDeps = [ + "big-todo_0_2_0", + "codly_1_2_0", + "gentle-clues_1_2_0", + "gloss-awe_0_0_5", + "hydra_0_6_0", + "treet_0_1_1", + "wrap-it_0_1_1", +] +description = "Template for writing a bachelors or masters thesis at the Hochschule Hannover, Faculty 4" +license = [ + "MIT", +] +homepage = "https://github.com/MrToWy/hsh-thesis" + +[modern-hsh-thesis."1.0.1"] +url = "https://packages.typst.org/preview/modern-hsh-thesis-1.0.1.tar.gz" +hash = "sha256-pLF1k5wwDtANkEDQ66Tqikn+Rsk6I8dPUez81DzizAY=" +typstDeps = [ + "big-todo_0_2_0", + "codly_1_0_0", + "gentle-clues_0_9_0", + "gloss-awe_0_0_5", + "hydra_0_5_1", + "treet_0_1_0", + "wrap-it_0_1_0", +] +description = "Template for writing a bachelors or masters thesis at the Hochschule Hannover, Faculty 4" +license = [ + "MIT", +] +homepage = "https://github.com/MrToWy/hsh-thesis" + +[modern-hsh-thesis."1.0.0"] +url = "https://packages.typst.org/preview/modern-hsh-thesis-1.0.0.tar.gz" +hash = "sha256-5XIOMC3hmc+5OhIOPnt4nmg2TyioSVZvxaZY8uj3j1g=" +typstDeps = [ + "big-todo_0_2_0", + "codly_1_0_0", + "gentle-clues_0_9_0", + "gloss-awe_0_0_5", + "hydra_0_3_0", + "treet_0_1_0", + "wrap-it_0_1_0", +] +description = "Template for writing a bachelors or masters thesis at the Hochschule Hannover, Faculty 4" +license = [ + "MIT", +] +homepage = "https://github.com/MrToWy/hsh-thesis" + +[modern-iu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-iu-thesis-0.1.0.tar.gz" +hash = "sha256-xda/9KVnb8I0ob1mZMChzqEBw7uBoaUGTwdhFujeV5k=" +typstDeps = [] +description = "Modern Typst thesis template for Indiana University" +license = [ + "MIT", +] +homepage = "https://github.com/bojohnson5/modern-iu-thesis" + +[modern-nju-thesis."0.4.0"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.4.0.tar.gz" +hash = "sha256-3F1HXZfxlLgbcTNfe37YHIW5M/EY5zGy4thnlVFBfzU=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "pinit_0_2_2", + "tablex_0_0_9", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/nju-lug/modern-nju-thesis" + +[modern-nju-thesis."0.3.4"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.3.4.tar.gz" +hash = "sha256-7LS1T5FEfT2wImsa4j/V3RyE0sgL7B1mskceyqw7XtM=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/nju-lug/modern-nju-thesis" + +[modern-nju-thesis."0.3.3"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.3.3.tar.gz" +hash = "sha256-/UwN2FHrMxqghpbpOvD6M70WkrINo+VMMXRqwjh5xgA=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/nju-lug/modern-nju-thesis" + +[modern-nju-thesis."0.3.2"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.3.2.tar.gz" +hash = "sha256-iOURaHUn+z7+83WGNWB+XI+d8x7m/kt69hOp2m7c8F8=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/touying-typ/touying" + +[modern-nju-thesis."0.3.1"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.3.1.tar.gz" +hash = "sha256-T/XZH/zAPYoZIo3bI6OHgx4rglyNmlD8g2Wvi08MBqc=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/touying-typ/touying" + +[modern-nju-thesis."0.3.0"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.3.0.tar.gz" +hash = "sha256-MIuxHhHVUAMsi+NWzZQtBMna4CqFwvZ2Ms9mx2PDrRs=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/nju-lug/modern-nju-thesis" + +[modern-ovgu-fma-polylux."0.1.0"] +url = "https://packages.typst.org/preview/modern-ovgu-fma-polylux-0.1.0.tar.gz" +hash = "sha256-lNkmssNGU3A+07AyaRzY1oHn253I+xRKX59IJWkgf1s=" +typstDeps = [ + "ez-today_0_3_0", + "polylux_0_4_0", +] +description = "Unofficial template for creating presentations with Polylux in the style of the Faculty of Mathematics at the Otto-von-Guericke-University Magdeburg" +license = [ + "MIT", +] + +[modern-report-umfds."0.1.2"] +url = "https://packages.typst.org/preview/modern-report-umfds-0.1.2.tar.gz" +hash = "sha256-YVoSuE6U+FJFLTe71/8vFpd3oP6bRGQ6ovBAiniVUWU=" +typstDeps = [] +description = "A template for writing reports for the Faculty of Sciences of the University of Montpellier" +license = [ + "MIT-0", +] +homepage = "https://github.com/UM-nerds/modern-report-umfds" + +[modern-report-umfds."0.1.1"] +url = "https://packages.typst.org/preview/modern-report-umfds-0.1.1.tar.gz" +hash = "sha256-Vjuk1yYOCV5kfHebHrrhWxDeLVE4dOVokQ4WhnxwHJs=" +typstDeps = [] +description = "A template for writing reports for the Faculty of Sciences of the University of Montpellier" +license = [ + "MIT-0", +] +homepage = "https://github.com/UM-nerds/modern-report-umfds" + +[modern-report-umfds."0.1.0"] +url = "https://packages.typst.org/preview/modern-report-umfds-0.1.0.tar.gz" +hash = "sha256-Fgxyw6/BmeiB+oWabdoZ/8dmJbKau0ZKTXOmryi+OPE=" +typstDeps = [] +description = "A template for writing reports for the Faculty of Sciences of the University of Montpellier" +license = [ + "MIT-0", +] +homepage = "https://github.com/UM-nerds/modern-report-umfds" + +[modern-resume."0.1.0"] +url = "https://packages.typst.org/preview/modern-resume-0.1.0.tar.gz" +hash = "sha256-J7ACHS7XS/vTX5CBZW/Z+W2y87m+MR39StgBQu/A/wE=" +typstDeps = [] +description = "A modern resume/CV template" +license = [ + "Unlicense", +] +homepage = "https://github.com/peterpf/modern-typst-resume" + +[modern-russian-dissertation."0.0.1"] +url = "https://packages.typst.org/preview/modern-russian-dissertation-0.0.1.tar.gz" +hash = "sha256-dFgLnAx1rwcVmwu6vogKMmR8i+7wBntylDsZZcgXQ+U=" +typstDeps = [ + "codly_0_2_0", + "physica_0_9_3", + "tablex_0_0_8", + "unify_0_5_0", +] +description = "A russian phd thesis template" +license = [ + "MIT", +] +homepage = "https://github.com/SergeyGorchakov/russian-phd-thesis-template-typst" + +[modern-shu-thesis."0.3.3"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.3.3.tar.gz" +hash = "sha256-DgolzfJo0xU5W9dofKZt2wjOJJgke8CsIsa0/74Iv/s=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "lovelace_0_2_0", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-shu-thesis."0.3.2"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.3.2.tar.gz" +hash = "sha256-BSo6yklzgBm5DuJtrhaSbnVKRKO8lVUviSA1oB6rAs8=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "lovelace_0_2_0", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-shu-thesis."0.3.1"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.3.1.tar.gz" +hash = "sha256-25P4yWiDyB1aKjaYjfSeZzJZr7RUuDacp87HQ0zQU/Y=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "lovelace_0_2_0", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-shu-thesis."0.3.0"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.3.0.tar.gz" +hash = "sha256-O2lL3iMeNhkev+ak2zz0KZs2Hjw0xXbRKd1TE6UxPqQ=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "lovelace_0_2_0", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "MIT", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-shu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.2.0.tar.gz" +hash = "sha256-Bz9MLdymirQRwOSSu0+70eCJObRld4zdTnBXo+k9GV8=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "lovelace_0_2_0", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "MIT", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-shu-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.1.1.tar.gz" +hash = "sha256-RY73DkkPyJJuXnCgVYC8SDUW9YRMcWgifZjtDOlKTRw=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "MIT", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-shu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.1.0.tar.gz" +hash = "sha256-aae7Sx1ZM9AZHDV5nlEV8LT7m8A+4s5hrRJY1/l/kZg=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "MIT", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-sjtu-thesis."0.2.2"] +url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.2.2.tar.gz" +hash = "sha256-B3FDybHWM5G2cKeBQefMExVcYf4b2yc/gff5GfcWc6M=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", +] +description = "上海交通大学学位论文 Typst 模板。Shanghai Jiao Tong University Thesis Typst Template" +license = [ + "MIT", +] +homepage = "https://github.com/tzhTaylor/modern-sjtu-thesis" + +[modern-sjtu-thesis."0.2.1"] +url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.2.1.tar.gz" +hash = "sha256-OTr8YH7Z3ORoj8tsDgk/+0n76lromICUkY1RklChWTk=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", +] +description = "上海交通大学学位论文 Typst 模板。Shanghai Jiao Tong University Thesis Typst Template" +license = [ + "MIT", +] +homepage = "https://github.com/tzhTaylor/modern-sjtu-thesis" + +[modern-sjtu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.2.0.tar.gz" +hash = "sha256-dfcBB5kKYE/5GyX/QA+f+rwMVBHooOOcyEvzFAdC7RY=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", +] +description = "上海交通大学学位论文 Typst 模板。Shanghai Jiao Tong University Thesis Typst Template" +license = [ + "MIT", +] +homepage = "https://github.com/tzhTaylor/modern-sjtu-thesis" + +[modern-sjtu-thesis."0.1.2"] +url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.1.2.tar.gz" +hash = "sha256-ftyfROArD2TG5cZI0dcJ3ebfqdWnMNpWNDPRlbXlspc=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", +] +description = "上海交通大学研究生学位论文 Typst 模板。Shanghai Jiao Tong University Graduate Thesis Typst Template" +license = [ + "MIT", +] +homepage = "https://github.com/tzhTaylor/typst-sjtu-thesis-master" + +[modern-sjtu-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.1.1.tar.gz" +hash = "sha256-7NsuJtSawUWVu9cO848umWtMu27EXkfJ8v8Hz4boMhs=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", + "outrageous_0_3_0", +] +description = "上海交通大学硕士学位论文 Typst 模板。Shanghai Jiao Tong University Graduate Thesis Typst Template" +license = [ + "MIT", +] +homepage = "https://github.com/tzhTaylor/typst-sjtu-thesis-master" + +[modern-sjtu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.1.0.tar.gz" +hash = "sha256-2tj8RkbzC52W6VegrE+YavUYVfFBXfqTMO2WztefPtg=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_2_4", + "numbly_0_1_0", + "outrageous_0_1_0", +] +description = "上海交通大学硕士学位论文 Typst 模板。Shanghai Jiao Tong University Master Thesis Typst Template" +license = [ + "MIT", +] +homepage = "https://github.com/tzhTaylor/typst-sjtu-thesis-master" + +[modern-sustech-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-sustech-thesis-0.1.1.tar.gz" +hash = "sha256-QDo0ILNewya1ecyfMX1lcqzG5OvUkPOOZuTcEb2vfNQ=" +typstDeps = [] +description = "南方科技大学本科毕业设计（论文）模板. SUSTech Bachelor Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/Duolei-Wang/sustech-thesis-typst" + +[modern-sustech-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-sustech-thesis-0.1.0.tar.gz" +hash = "sha256-dp2wyxgYMX2DJA1odakPKZusJ/4GeoOe9HT+YkKo2F0=" +typstDeps = [] +description = "南方科技大学本科毕业设计（论文）模板. SUSTech Bachelor Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/Duolei-Wang/sustech-thesis-typst" + +[modern-sysu-thesis."0.4.0"] +url = "https://packages.typst.org/preview/modern-sysu-thesis-0.4.0.tar.gz" +hash = "sha256-bC2JvIBViitWFsBsswq6cyQ9tRQvRb+lKe6dgObmlIY=" +typstDeps = [ + "anti-matter_0_0_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "numblex_0_1_1", + "numbly_0_1_0", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中山大学学位论文 Typst 模板，A Typst template for SYSU thesis" +license = [ + "MIT", +] +homepage = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis" + +[modern-sysu-thesis."0.3.0"] +url = "https://packages.typst.org/preview/modern-sysu-thesis-0.3.0.tar.gz" +hash = "sha256-P1ay33X2fzmnK+FIO7/C7znU10QKKuGbQZctSysfJQw=" +typstDeps = [ + "anti-matter_0_0_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "numblex_0_1_1", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中山大学学位论文 Typst 模板，A Typst template for SYSU thesis" +license = [ + "MIT", +] +homepage = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis" + +[modern-sysu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/modern-sysu-thesis-0.2.0.tar.gz" +hash = "sha256-FTvHq6q+Z7aDzFZknbB/ZEnp8gId44/6NOxnIYvyh0Q=" +typstDeps = [ + "anti-matter_0_0_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "numblex_0_1_1", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中山大学学位论文 Typst 模板，A Typst template for SYSU thesis" +license = [ + "MIT", +] +homepage = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis" + +[modern-sysu-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-sysu-thesis-0.1.1.tar.gz" +hash = "sha256-exx84YlSALjILLaJ5MAR0elZXhuQuRqgJb6a1xDluqk=" +typstDeps = [ + "anti-matter_0_0_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中山大学学位论文 Typst 模板，A Typst template for SYSU thesis" +license = [ + "MIT", +] +homepage = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis" + +[modern-sysu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-sysu-thesis-0.1.0.tar.gz" +hash = "sha256-/dJWKfvvPOA6m1+Oe6snpaVvfNPzWaQH34HKlN5wrBw=" +typstDeps = [ + "anti-matter_0_0_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中山大学学位论文 Typst 模板，A Typst template for SYSU thesis" +license = [ + "MIT", +] +homepage = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis" + +[modern-szu-thesis."0.4.0"] +url = "https://packages.typst.org/preview/modern-szu-thesis-0.4.0.tar.gz" +hash = "sha256-Tz3zDaCYNfLGuzSSdTnrkV+pX/uo/MPGSGwfFiPlKEg=" +typstDeps = [ + "cuti_0_3_0", + "hydra_0_6_0", + "i-figured_0_2_4", + "numbly_0_1_0", + "pinit_0_2_2", + "tablex_0_0_9", +] +description = "深圳大学学位论文模板由南京大学学位论文模板修改而成。Modern Shenzhen University Thesis is modified from modern-nju-thesis" +license = [ + "MIT", +] +homepage = "https://gitee.com/yjdyamv/modern-szu-thesis" + +[modern-szu-thesis."0.3.0"] +url = "https://packages.typst.org/preview/modern-szu-thesis-0.3.0.tar.gz" +hash = "sha256-PAnKU0ccuZITAL+anqSACkYMzNqXKHmGS0kg5skjSgA=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "tablex_0_0_9", +] +description = "深圳大学学位论文模板由南京大学学位论文模板修改而成。Modern Shenzhen University Thesis is modified from modern-nju-thesis" +license = [ + "MIT", +] +homepage = "https://gitee.com/yjdyamv/modern-szu-thesis" + +[modern-szu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/modern-szu-thesis-0.2.0.tar.gz" +hash = "sha256-BBQp5FizcgQgd4hfKfzXby+PG3TuhtmkoV2IiCgbZpo=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "outrageous_0_3_0", + "tablex_0_0_9", +] +description = "深圳大学学位论文模板由南京大学学位论文模板修改而成。Modern Shenzhen University Thesis is modified from modern-nju-thesis" +license = [ + "MIT", +] +homepage = "https://gitee.com/yjdyamv/modern-szu-thesis" + +[modern-szu-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-szu-thesis-0.1.1.tar.gz" +hash = "sha256-EHCewSw0xT1cRPi6CH72IA0Hk7Kef6RoB5bdU4LGpws=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_9", +] +description = "深圳大学学位论文模板由南京大学学位论文模板修改而成。Modern Shenzhen University Thesis is modified from modern-nju-thesis" +license = [ + "MIT", +] +homepage = "https://gitee.com/yjdyamv/modern-szu-thesis" + +[modern-szu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-szu-thesis-0.1.0.tar.gz" +hash = "sha256-PbQVGaWqUM1KRVZnjK5a5PO/M1rSt2mdxpOgtSwO9F4=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_9", +] +description = "深圳大学学位论文模板由南京大学学位论文模板修改而成。Modern Shenzhen University Thesis is modified from modern-nju-thesis" +license = [ + "MIT", +] + +[modern-technique-report."0.1.0"] +url = "https://packages.typst.org/preview/modern-technique-report-0.1.0.tar.gz" +hash = "sha256-QCgSPrgnKpvKPwzpbaAVO+at2MIlbGA58g2tgTFboqw=" +typstDeps = [] +description = "A template for creating modern-style technique report in Typst" +license = [ + "MIT", +] + +[modern-uit-thesis."0.1.4"] +url = "https://packages.typst.org/preview/modern-uit-thesis-0.1.4.tar.gz" +hash = "sha256-dmsNjOD9kf4PHggxX0r1Dzfra9h9T7EmzuIYG1T3ggM=" +typstDeps = [ + "codly_1_2_0", + "ctheorems_1_1_3", + "glossarium_0_5_4", + "physica_0_9_5", + "subpar_0_2_1", +] +description = "A Modern Thesis Template in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/mrtz-j/typst-thesis-template" + +[modern-uit-thesis."0.1.3"] +url = "https://packages.typst.org/preview/modern-uit-thesis-0.1.3.tar.gz" +hash = "sha256-xaxqLTU1F4kRzhUABdnb2E2A1xnNwNlRhaFhm5aJnQw=" +typstDeps = [ + "codly_1_2_0", + "ctheorems_1_1_3", + "glossarium_0_5_0", + "glossarium_0_5_1", + "outrageous_0_3_0", + "physica_0_9_4", + "subpar_0_2_0", +] +description = "A Modern Thesis Template in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/mrtz-j/typst-thesis-template" + +[modern-uit-thesis."0.1.2"] +url = "https://packages.typst.org/preview/modern-uit-thesis-0.1.2.tar.gz" +hash = "sha256-469FTTHCVdRKp8oxray2RAVsLTnvi0LneBc2z/I2nzk=" +typstDeps = [ + "codly_1_0_0", + "glossarium_0_5_0", + "outrageous_0_3_0", + "physica_0_9_3", + "subpar_0_1_1", +] +description = "A Modern Thesis Template in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/mrtz-j/typst-thesis-template" + +[modern-uit-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-uit-thesis-0.1.1.tar.gz" +hash = "sha256-ZgQ3L4yHMKrl6EPvXqNUfdSm1fjAxXLyHAPzslPU5CQ=" +typstDeps = [ + "codly_1_0_0", + "outrageous_0_2_0", + "physica_0_9_3", + "subpar_0_1_1", +] +description = "A Modern Thesis Template in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/mrtz-j/typst-thesis-template" + +[modern-uit-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-uit-thesis-0.1.0.tar.gz" +hash = "sha256-JWDY8UufvD27QFu4haDyDvZAdnOKAheal+/YuSFHdRs=" +typstDeps = [ + "codly_1_0_0", + "outrageous_0_1_0", + "physica_0_9_3", + "subpar_0_1_1", +] +description = "A Modern Thesis Template in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/mrtz-j/typst-thesis-template" + +[modern-unimib-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-unimib-thesis-0.1.1.tar.gz" +hash = "sha256-JhW++7nk8wbg5Zvtr49OCH93p4y0aJCkEIQSPwtK+Mk=" +typstDeps = [] +description = "A thesis template of the University of Milano-Bicocca" +license = [ + "MIT", +] +homepage = "https://github.com/michelebanfi/unimib-typst-template" + +[modern-unimib-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-unimib-thesis-0.1.0.tar.gz" +hash = "sha256-C1OcVKF1Bz9MDgg84Dack+35PUgYgEuy77m2+zFdfBY=" +typstDeps = [] +description = "A thesis template of the University of Milano-Bicocca heavily inspired by cudaPackages != null; stdenv.mkDerivation rec { pname = "umpire"; - version = "2024.07.0"; + version = "2025.03.0"; src = fetchFromGitHub { owner = "LLNL"; repo = "umpire"; rev = "v${version}"; - hash = "sha256-JbYaJe4bqlB272aZxB3Amw8fX/pmZr/4/7kaukAiK8c="; + hash = "sha256-IL8jfG0qTDjp80E8bniNYUiH77PTtL4QIwMCEkqdwSE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index 6bae7389f623..47a22f5b1761 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -1,10 +1,14 @@ { lib, + libiconv, python3, fetchFromGitHub, gitUpdater, makeWrapper, + rustPlatform, + stdenvNoCC, e2fsprogs, + erofs-utils, jefferson, lz4, lziprecover, @@ -23,6 +27,7 @@ let # These dependencies are only added to PATH runtimeDeps = [ e2fsprogs + erofs-utils jefferson lziprecover lzop @@ -38,7 +43,7 @@ let in python3.pkgs.buildPythonApplication rec { pname = "unblob"; - version = "25.1.8"; + version = "25.4.14"; pyproject = true; disabled = python3.pkgs.pythonOlder "3.9"; @@ -46,15 +51,22 @@ python3.pkgs.buildPythonApplication rec { owner = "onekey-sec"; repo = "unblob"; tag = version; - hash = "sha256-PGpJPAo9q52gQ3EGusYtDA2e0MG5kFClqCYPB2DvuMs="; + hash = "sha256-kWZGQX8uSKdFW+uauunHcruXhJ5XpBfyDY7gPyWGK90="; forceFetchGit = true; fetchLFS = true; }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-lGsDax7+CUACeYChDqdPsVbKE/hH94CPek6UBVz1eqs="; + }; + strictDeps = true; build-system = with python3.pkgs; [ poetry-core ]; + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ libiconv ]; + dependencies = with python3.pkgs; [ arpy attrs @@ -69,15 +81,17 @@ python3.pkgs.buildPythonApplication rec { pyfatfs pyperscan python-magic + pyzstd rarfile rich structlog treelib - unblob-native ]; - nativeBuildInputs = [ + nativeBuildInputs = with rustPlatform; [ makeWrapper + maturinBuildHook + cargoSetupHook ]; # These are runtime-only CLI dependencies, which are used through @@ -87,6 +101,8 @@ python3.pkgs.buildPythonApplication rec { "ubi-reader" ]; + pythonRelaxDeps = [ "lz4" ]; + pythonImportsCheck = [ "unblob" ]; makeWrapperArgs = [ @@ -104,12 +120,18 @@ python3.pkgs.buildPythonApplication rec { versionCheckProgramArg = "--version"; - pytestFlagsArray = [ - "--no-cov" - # `disabledTests` swallows the parameters between square brackets - # https://github.com/tytso/e2fsprogs/issues/152 - "-k 'not test_all_handlers[filesystem.extfs]'" - ]; + pytestFlagsArray = + let + # `disabledTests` swallows the parameters between square brackets + disabled = [ + # https://github.com/tytso/e2fsprogs/issues/152 + "test_all_handlers[filesystem.extfs]" + ]; + in + [ + "--no-cov" + "-k 'not ${lib.concatStringsSep " and not " disabled}'" + ]; passthru = { updateScript = gitUpdater { }; diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index a91611b20089..2a4fca39cae1 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -48,19 +48,21 @@ withMakeWrapper ? !stdenv.hostPlatform.isMinGW, libnghttp2, + # for passthru.updateScript + nix-update-script, # for passthru.tests gnutls, }: stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = "unbound"; tag = "release-${finalAttrs.version}"; - hash = "sha256-CFsd8tdFL+JbxmDZoWdStvWcs9azSaLtMG8Ih5oXE/A="; + hash = "sha256-a9WNUVDy7ORB40VFUhkUxEaBho+HVNJ105AqdGDr+tI="; }; outputs = [ @@ -203,17 +205,24 @@ stdenv.mkDerivation (finalAttrs: { ) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'" ) (builtins.filter (p: p != null) finalAttrs.buildInputs); - passthru.tests = { - inherit gnutls; - nixos-test = nixosTests.unbound; - nixos-test-exporter = nixosTests.prometheus-exporters.unbound; + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex=release-(.+)" + ]; + }; + tests = { + inherit gnutls; + nixos-test = nixosTests.unbound; + nixos-test-exporter = nixosTests.prometheus-exporters.unbound; + }; }; - meta = with lib; { + meta = { description = "Validating, recursive, and caching DNS resolver"; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://www.unbound.net"; - maintainers = [ ]; - platforms = platforms.unix ++ platforms.windows; + maintainers = with lib.maintainers; [ Scrumplex ]; + platforms = with lib.platforms; unix ++ windows; }; }) diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index 32d7e159c3bf..2ff29641356a 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -11,7 +11,7 @@ libXxf86vm, }: let - version = "4.15.16"; + version = "4.16.5"; desktopItem = makeDesktopItem { name = "unciv"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-dqnQJzA2OkIlcM7TORqnFyaA5CvQ+MmFOO5iH6My+Jo="; + hash = "sha256-CMyZlQ5zXHxUExH7aMIJ4nreEPz8Y0eeJ5nnt267SqU="; }; dontUnpack = true; diff --git a/pkgs/by-name/un/unclutter/package.nix b/pkgs/by-name/un/unclutter/package.nix index 6d2193e42d7e..d586ec94eca0 100644 --- a/pkgs/by-name/un/unclutter/package.nix +++ b/pkgs/by-name/un/unclutter/package.nix @@ -15,13 +15,24 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; - buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CFLAGS=-std=c89" + ]; - installPhase = '' - mkdir -pv "$out/bin" - mkdir -pv "$out/share/man/man1" - make DESTDIR="$out" BINDIR="$out/bin" PREFIX="" install - make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man + installFlags = [ + "DESTDIR=${placeholder "out"}" + "BINDIR=${placeholder "out"}/bin" + "MANPATH=${placeholder "out"}/share/man" + ]; + + installTargets = [ + "install" + "install.man" + ]; + + preInstall = '' + mkdir -pv "$out"/{bin,share/man/man1} ''; meta = with lib; { diff --git a/pkgs/by-name/un/unconvert/package.nix b/pkgs/by-name/un/unconvert/package.nix index 18414630ade3..e9575aa4a48f 100644 --- a/pkgs/by-name/un/unconvert/package.nix +++ b/pkgs/by-name/un/unconvert/package.nix @@ -2,26 +2,29 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: buildGoModule { pname = "unconvert"; - version = "0-unstable-2023-09-07"; + version = "0-unstable-2025-02-16"; src = fetchFromGitHub { owner = "mdempsky"; repo = "unconvert"; - rev = "415706980c061b6f71ea923bd206aec88785638f"; - hash = "sha256-MchA8uvy+MyQ/VaglBDTC7j/lNIKAtGeeECLoFfH6pI="; + rev = "4a038b3d31f56ff5ba511953b745c80a2317e4ae"; + hash = "sha256-97H5rlb4buRT6I3OUID8/UARFtCTDhIxnPCkpFF9RDs="; }; - vendorHash = "sha256-vZDk+ZNCMP5RRNrgeIowdOKPot7rqM84JhlbfvcQbB4="; + vendorHash = "sha256-Yh33ZvQoMG9YM8bdxlMYEIwH2QMTwv2HSYSmA4C9EpA="; ldflags = [ "-s" "-w" ]; + passthru.updateScript = nix-update-script { extraArgs = lib.singleton "--version=branch"; }; + meta = with lib; { description = "Remove unnecessary type conversions from Go source"; mainProgram = "unconvert"; diff --git a/pkgs/by-name/un/uncover/package.nix b/pkgs/by-name/un/uncover/package.nix index d672e02ee93f..f277cd9ca423 100644 --- a/pkgs/by-name/un/uncover/package.nix +++ b/pkgs/by-name/un/uncover/package.nix @@ -29,7 +29,7 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = [ "-version" ]; + versionCheckProgramArg = "-version"; meta = with lib; { description = "API wrapper to search for exposed hosts"; diff --git a/pkgs/by-name/un/uncrustify/package.nix b/pkgs/by-name/un/uncrustify/package.nix index 8d9c67b7c2f2..c9ab468a1809 100644 --- a/pkgs/by-name/un/uncrustify/package.nix +++ b/pkgs/by-name/un/uncrustify/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.80.1"; + version = "0.81.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "sha256-SsPuqPyv3IFjYtAqANjzK8cdTGsyGBXVLzGWEUl28dg="; + sha256 = "sha256-8KTsrXUYOfqsWSGBAl0mZpGOYr+duFrRB0ITmq2Auqg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/un/unfs3/package.nix b/pkgs/by-name/un/unfs3/package.nix index 28624ce53a26..8e250d84f935 100644 --- a/pkgs/by-name/un/unfs3/package.nix +++ b/pkgs/by-name/un/unfs3/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/unfsd"; - versionCheckProgramArg = [ "-h" ]; + versionCheckProgramArg = "-h"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/un/unibilium/package.nix b/pkgs/by-name/un/unibilium/package.nix index 597cea810c22..2932306e1a85 100644 --- a/pkgs/by-name/un/unibilium/package.nix +++ b/pkgs/by-name/un/unibilium/package.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with lib; { + homepage = "https://github.com/neovim/unibilium"; description = "Very basic terminfo library"; license = licenses.lgpl3Plus; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/by-name/un/unicap/package.nix b/pkgs/by-name/un/unicap/package.nix deleted file mode 100644 index 4f47bf22a7a8..000000000000 --- a/pkgs/by-name/un/unicap/package.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - libusb-compat-0_1, - libraw1394, - dcraw, - intltool, - perl, - v4l-utils, -}: - -stdenv.mkDerivation rec { - pname = "libunicap"; - version = "0.9.12"; - - src = fetchurl { - url = "https://www.unicap-imaging.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; - }; - - nativeBuildInputs = [ intltool ]; - buildInputs = [ - libusb-compat-0_1 - libraw1394 - dcraw - perl - v4l-utils - ]; - - patches = [ - # Debian has a patch that fixes the build. - (fetchurl { - url = "https://sources.debian.net/data/main/u/unicap/0.9.12-2/debian/patches/1009_v4l1.patch"; - sha256 = "1lgypmhdj681m7d1nmzgvh19cz8agj2f31wlnfib0ha8i3g5hg5w"; - }) - ]; - - postPatch = '' - find . -type f -exec sed -e '/linux\/types\.h/d' -i '{}' ';' - sed -e 's@/etc/udev@'"$out"'/&@' -i data/Makefile.* - ''; - - meta = with lib; { - description = "Universal video capture API"; - homepage = "https://www.unicap-imaging.org/"; - maintainers = [ maintainers.raskin ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/un/unicorn-angr/package.nix b/pkgs/by-name/un/unicorn-angr/package.nix index 18711fc7c8a4..d85ac29a12d2 100644 --- a/pkgs/by-name/un/unicorn-angr/package.nix +++ b/pkgs/by-name/un/unicorn-angr/package.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/un/unicorn/package.nix b/pkgs/by-name/un/unicorn/package.nix new file mode 100644 index 000000000000..39edf55b76e9 --- /dev/null +++ b/pkgs/by-name/un/unicorn/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + cctools, + cmake, + fetchFromGitHub, + pkg-config, +}: + +stdenv.mkDerivation rec { + pname = "unicorn"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "unicorn-engine"; + repo = "unicorn"; + tag = version; + hash = "sha256-vBggblml+lQFhyNrfIp5GKVQ09fd+ccblKHEzWteMbI="; + }; + + nativeBuildInputs = + [ + cmake + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ]; + + # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; + + cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + # Some x86 tests are interrupted by signal 10 + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;test_x86" + ]; + + doCheck = true; + + meta = with lib; { + description = "Lightweight multi-platform CPU emulator library"; + homepage = "https://www.unicorn-engine.org"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ + thoughtpolice + ]; + }; +} diff --git a/pkgs/by-name/un/unifi-protect-backup/package.nix b/pkgs/by-name/un/unifi-protect-backup/package.nix index 56005a974034..481a5887bfc8 100644 --- a/pkgs/by-name/un/unifi-protect-backup/package.nix +++ b/pkgs/by-name/un/unifi-protect-backup/package.nix @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/ep1cman/unifi-protect-backup"; changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = teams.helsinki-systems.members; + teams = [ teams.helsinki-systems ]; mainProgram = "unifi-protect-backup"; }; } diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix index 4561fe4f17ff..e197b8ad35f3 100644 --- a/pkgs/by-name/un/unifi/package.nix +++ b/pkgs/by-name/un/unifi/package.nix @@ -1,59 +1,55 @@ { lib, - stdenv, + stdenvNoCC, dpkg, fetchurl, nixosTests, systemd, + autoPatchelfHook, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "unifi-controller"; - version = "9.0.114"; + version = "9.1.120"; # see https://community.ui.com/releases / https://www.ui.com/download/unifi src = fetchurl { - url = "https://dl.ui.com/unifi/${version}/unifi_sysvinit_all.deb"; - hash = "sha256-3xumIIzr+tx60kPhPfSs2Kz2iJ39Kt5934Vca/MpUu4="; + url = "https://dl.ui.com/unifi/${finalAttrs.version}/unifi_sysvinit_all.deb"; + hash = "sha256-lf1D8lXCG3+cqBCI8zJvpr6EwsQSzj8GgSQ9AP3xJVk="; }; - nativeBuildInputs = [ dpkg ]; + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; + + buildInputs = [ + systemd + ]; installPhase = '' runHook preInstall mkdir -p $out - cd ./usr/lib/unifi - cp -ar dl lib webapps $out + cp -ar usr/lib/unifi/{dl,lib,webapps} $out runHook postInstall ''; - postInstall = - if stdenv.hostPlatform.system == "x86_64-linux" then - '' - patchelf --add-needed "${systemd}/lib/libsystemd.so.0" "$out/lib/native/Linux/x86_64/libubnt_sdnotify_jni.so" - '' - else if stdenv.hostPlatform.system == "aarch64-linux" then - '' - patchelf --add-needed "${systemd}/lib/libsystemd.so.0" "$out/lib/native/Linux/aarch64/libubnt_sdnotify_jni.so" - '' - else - null; - - passthru.tests = { - unifi = nixosTests.unifi; - }; + passthru.tests = { inherit (nixosTests) unifi; }; meta = with lib; { - homepage = "http://www.ubnt.com/"; + homepage = "https://www.ui.com"; description = "Controller for Ubiquiti UniFi access points"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - platforms = platforms.unix; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; maintainers = with maintainers; [ globin patryk27 ]; }; -} +}) diff --git a/pkgs/by-name/un/unifont-csur/package.nix b/pkgs/by-name/un/unifont-csur/package.nix index 576f48bd0d22..f2bbc5946036 100644 --- a/pkgs/by-name/un/unifont-csur/package.nix +++ b/pkgs/by-name/un/unifont-csur/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "unifont-csur"; - version = "16.0.02"; + version = "16.0.03"; src = fetchurl { url = "https://unifoundry.com/pub/unifont/unifont-${finalAttrs.version}/font-builds/unifont_csur-${finalAttrs.version}.otf"; - hash = "sha256-orLV0a0dQUAnzWnSTD1ALfbAsqWtFscH3rMCDyaXNfo="; + hash = "sha256-41MXxHHohZFm42LMePmLSZp3bytsxMJmWh/0psIgWt4="; }; dontUnpack = true; diff --git a/pkgs/by-name/un/unifont/package.nix b/pkgs/by-name/un/unifont/package.nix index ba12316c0a2c..5c14b45ca3c5 100644 --- a/pkgs/by-name/un/unifont/package.nix +++ b/pkgs/by-name/un/unifont/package.nix @@ -8,21 +8,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "unifont"; - version = "16.0.02"; + version = "16.0.03"; otf = fetchurl { url = "mirror://gnu/unifont/unifont-${finalAttrs.version}/unifont-${finalAttrs.version}.otf"; - hash = "sha256-3oI6EOZeIkOt56mK+CuC68a71c89CqPjjtTMzTa8qzM="; + hash = "sha256-9TnyHLrjkWoJP4GdNsR3EtVwGshtrO2KaOzPe9nTPAw="; }; pcf = fetchurl { url = "mirror://gnu/unifont/unifont-${finalAttrs.version}/unifont-${finalAttrs.version}.pcf.gz"; - hash = "sha256-AqP+EZlNPNrx1L1dK2tglzXmgj4BdkroO3BOAuwvZA0="; + hash = "sha256-ysKULOBusx4n7NfYRAzEoRfqaTNn5JtjigTVmb7wozY="; }; bdf = fetchurl { url = "mirror://gnu/unifont/unifont-${finalAttrs.version}/unifont-${finalAttrs.version}.bdf.gz"; - hash = "sha256-Uh8rkui2vU6hkM6gSaA53eNZpuLK6UWORdaWAI+mmX8="; + hash = "sha256-fz0WZKwcBR9ZoaE2DdZU942CwkamiMNC6GPOx/a6ldQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/un/unifont_upper/package.nix b/pkgs/by-name/un/unifont_upper/package.nix index e7e8b8663c1a..bb7453f5d53c 100644 --- a/pkgs/by-name/un/unifont_upper/package.nix +++ b/pkgs/by-name/un/unifont_upper/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "unifont_upper"; - version = "16.0.02"; + version = "16.0.03"; src = fetchurl { url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf"; - hash = "sha256-QBc6oiQ6aTiWrqMwyY/YesG+s1JPMggsLT9mZzJsud4="; + hash = "sha256-ACW+6xiQAd9QMidqJ2MQGTkYbW9fvateIR2FyoM7rIs="; }; dontUnpack = true; diff --git a/pkgs/by-name/un/unihan-database/package.nix b/pkgs/by-name/un/unihan-database/package.nix index 1cabda4b99dd..e3b2d493c644 100644 --- a/pkgs/by-name/un/unihan-database/package.nix +++ b/pkgs/by-name/un/unihan-database/package.nix @@ -18,7 +18,13 @@ stdenv.mkDerivation rec { unzip ]; - sourceRoot = "."; + sourceRoot = "source"; + + unpackPhase = '' + runHook preUnpack + unzip $src -d $sourceRoot + runHook postUnpack + ''; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix index 72b90b28d193..7067ec63756f 100644 --- a/pkgs/by-name/un/unison-ucm/package.nix +++ b/pkgs/by-name/un/unison-ucm/package.nix @@ -14,21 +14,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.36"; + version = "0.5.40"; src = { aarch64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz"; - hash = "sha256-GH0qZtb29qDxL39nArYSzCQ50/ssPOiN9CXnAvb9uVQ="; + hash = "sha256-KsypPKHyscOiPXy4ZeCZcUFGIV97lsnLREJp5KAGFcM="; }; x86_64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz"; - hash = "sha256-seL8Ey20KYVsOLugGvfVXXIIVdv7q04PYXh3c6MoZDk="; + hash = "sha256-TpD2W+j7F83E+YPQRNe1K7fnNfpJEwt25ldB+nqQw7I="; }; x86_64-linux = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz"; - hash = "sha256-Zb91ixXd3ueQj6+YjC9Wgq3PnfcKBKZZdCJfS0nQOV4="; + hash = "sha256-o1Zx9Vmovl0b/QMVT9XGaRM6FphsIsZQZamYlJ6b6y0="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix index 5324043fb5d1..1ac3eac42581 100644 --- a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix +++ b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix @@ -16,12 +16,13 @@ curl, libcpr, rapidjson, + libX11, + libGL, writeShellScriptBin, makeDesktopItem, lib, copyDesktopItems, }: - stdenv.mkDerivation (finalAttrs: { pname = "unnamed-sdvx-clone"; version = "0.6.0"; @@ -54,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { curl libcpr rapidjson + libX11 + libGL ]; cmakeFlags = [ diff --git a/pkgs/by-name/un/unpackerr/package.nix b/pkgs/by-name/un/unpackerr/package.nix new file mode 100644 index 000000000000..7211058f3146 --- /dev/null +++ b/pkgs/by-name/un/unpackerr/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: + +buildGoModule rec { + pname = "unpackerr"; + version = "0.14.5"; + + src = fetchFromGitHub { + owner = "davidnewhall"; + repo = "unpackerr"; + rev = "v${version}"; + sha256 = "sha256-uQwpdgV6ksouW9JTuiiuQjxBGOE/ypDW769kNJgWrHw="; + }; + + vendorHash = "sha256-wWIw0gNn5tqRq0udzPy/n2OkiIVESpSotOSn2YlBNS4="; + + ldflags = [ + "-s" + "-w" + "-X golift.io/version.Version=${version}" + ]; + + meta = with lib; { + description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import"; + homepage = "https://github.com/davidnewhall/unpackerr"; + maintainers = [ ]; + license = licenses.mit; + mainProgram = "unpackerr"; + }; +} diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix index d4d38fca860e..a8800efb688c 100644 --- a/pkgs/by-name/un/unpoller/package.nix +++ b/pkgs/by-name/un/unpoller/package.nix @@ -7,24 +7,21 @@ buildGoModule rec { pname = "unpoller"; - version = "2.14.1"; + version = "2.15.3"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-x3Uboa6bs59LafEF9/aYmudo9JIh3KIMNdLJRimcmxY="; + hash = "sha256-MqL+V5NVRE/jzOnj1yFVlT1HPjeiUWsNkJyMetWIaj0="; }; - vendorHash = "sha256-ZylkCictJNJ/QrWEbBIXDEKElpZRw2Yrj/IHMx0lqg0="; + vendorHash = "sha256-w6rU+BV7T8trCd6JBqyXkEgv3qkGTEQpBEq2WsTCo04="; ldflags = [ "-w" "-s" - "-X github.com/prometheus/common/version.Branch=master" - "-X github.com/prometheus/common/version.BuildDate=unknown" - "-X github.com/prometheus/common/version.Revision=${src.rev}" - "-X github.com/prometheus/common/version.Version=${version}-0" + "-X golift.io/version.Version=${version}" ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) unpoller; }; diff --git a/pkgs/by-name/un/unshield/package.nix b/pkgs/by-name/un/unshield/package.nix index e3f2ff9be845..cbcfe71b52d0 100644 --- a/pkgs/by-name/un/unshield/package.nix +++ b/pkgs/by-name/un/unshield/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "unshield"; - version = "1.5.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "twogood"; repo = "unshield"; rev = version; - sha256 = "1p2inn93svm83kr5p0j1al0rx47f1zykmagxsblgy04gi942iza3"; + sha256 = "sha256-CYlrPwNPneJIwvQCnzyfi6MZiXoflMDfUDCRL79+yBk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/un/unshieldv3/package.nix b/pkgs/by-name/un/unshieldv3/package.nix new file mode 100644 index 000000000000..d16290f29a20 --- /dev/null +++ b/pkgs/by-name/un/unshieldv3/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "unshieldv3"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "wfr"; + repo = "unshieldv3"; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-ScUlKuvkq4UglEVJL8NreAGDZFLVrEpEBQCZvu7XOrg="; + }; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + postCheck = '' + for i in $src/test-data/*.Z; do + mkdir -p test + ./unshieldv3 extract $i test + done + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool to extract .Z files from InstallShield V3 (Z) installers"; + homepage = "https://github.com/wfr/unshieldv3"; + changelog = "https://github.com/wfr/unshieldv3/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "unshieldv3"; + maintainers = [ lib.maintainers.jchw ]; + }; +}) diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix index 96a5a15584d8..adf9fa83dd96 100644 --- a/pkgs/by-name/un/unstructured-api/package.nix +++ b/pkgs/by-name/un/unstructured-api/package.nix @@ -152,7 +152,7 @@ let paths = [ nltk-data.punkt - nltk-data.averaged_perceptron_tagger + nltk-data.averaged-perceptron-tagger ]; }; in diff --git a/pkgs/by-name/un/unsure/package.nix b/pkgs/by-name/un/unsure/package.nix new file mode 100644 index 000000000000..9dfac7acd784 --- /dev/null +++ b/pkgs/by-name/un/unsure/package.nix @@ -0,0 +1,48 @@ +{ + buildDartApplication, + dart, + fetchFromGitHub, + lib, + runCommand, + testers, + unsure, + writeText, +}: + +buildDartApplication rec { + pname = "unsure"; + version = "0.4.0-unstable-2025-04-15"; + + src = fetchFromGitHub { + owner = "filiph"; + repo = "unsure"; + rev = "123712482b7053974cbef9ffa7ba46c1cdfb765f"; + hash = "sha256-rn10vy6l12ToiqO4vGVT4N7WNlj6PY/r+xVzjmYqILw="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + [[ "$("$out/bin/unsure" "4~6 * 1~2" | head --lines=2)" == "$(printf '\n\t%s' '5~11')" ]] + + runHook postInstallCheck + ''; + + passthru.updateScript = ./update.sh; + + meta = { + changelog = "https://github.com/filiph/unsure/blob/${src.rev}/CHANGELOG.md"; + description = "Calculate with numbers you’re not sure about"; + downloadPage = "https://github.com/filiph/unsure"; + homepage = "https://filiph.github.io/unsure"; + license = lib.licenses.mit; + mainProgram = "unsure"; + maintainers = [ + lib.maintainers.l0b0 + lib.maintainers.rksm + ]; + }; +} diff --git a/pkgs/by-name/un/unsure/pubspec.lock.json b/pkgs/by-name/un/unsure/pubspec.lock.json new file mode 100644 index 000000000000..b47dc596e018 --- /dev/null +++ b/pkgs/by-name/un/unsure/pubspec.lock.json @@ -0,0 +1,527 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "82.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "f4c21c94eb4623b183c1014a470196b3910701bea9b926e6c91270d756e6fc60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.4.1" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "9086475ef2da7102a0c0a4e37e1e30707e7fb7b6d28c209f559a9c5f8ce42016", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.0" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "lints": { + "dependency": "direct dev", + "description": { + "name": "lints", + "sha256": "a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.16.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "petitparser": { + "dependency": "direct main", + "description": { + "name": "petitparser", + "sha256": "cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.0" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "t_stats": { + "dependency": "direct main", + "description": { + "name": "t_stats", + "sha256": "ebe4babf8fba8140d4a66465707a5f3db43cf31c9159df225fee823973d467c6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.15" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.4" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.8" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.0" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + } + }, + "sdks": { + "dart": ">=3.7.0-0 <4.0.0" + } +} diff --git a/pkgs/by-name/un/unsure/update.sh b/pkgs/by-name/un/unsure/update.sh new file mode 100755 index 000000000000..e0620d22e354 --- /dev/null +++ b/pkgs/by-name/un/unsure/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p yq jq common-updater-scripts dart + +set -o errexit -o nounset -o pipefail + +# TODO: Expand to get new version automatically once implemented upstream + +package_dir="$(dirname "${BASH_SOURCE[0]}")" + +# Create new pubspec.lock.json +cleanup() { + rm --force --recursive "${tmpdir}" +} +trap cleanup EXIT +tmpdir="$(mktemp -d)" + +src="$(nix-build --no-link --attr unsure.src)" +cp "${src}"/pubspec.* "${tmpdir}" + +if ! [[ -f pubspec.lock ]]; then + dart pub --directory="${tmpdir}" update +fi + +yq . "${tmpdir}/pubspec.lock" >"${package_dir}/pubspec.lock.json" diff --git a/pkgs/by-name/un/unvanquished/package.nix b/pkgs/by-name/un/unvanquished/package.nix index ef32e161cd3f..877f5d51d28c 100644 --- a/pkgs/by-name/un/unvanquished/package.nix +++ b/pkgs/by-name/un/unvanquished/package.nix @@ -20,6 +20,7 @@ libpng, libvorbis, libwebp, + libX11, lua5, makeDesktopItem, ncurses, @@ -33,7 +34,7 @@ }: let - version = "0.55.0"; + version = "0.55.3"; binary-deps-version = "10"; src = fetchFromGitHub { @@ -41,7 +42,7 @@ let repo = "Unvanquished"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-4ONge+GnrpV/FHKuA66o7uK7jIygBYizZl8JAUr8x/0="; + hash = "sha256-wOFSPPEu7AGsEcqHG7xFWzFlYZRWAIvvfTj5FLZ3HFc="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { @@ -120,7 +121,7 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256-FDDhwBvmv4EvmSh5g6Cb0HYLuY9T++k7q8egxzo04J8="; + outputHash = "sha256-6v6NO4Ad4rMFziWAO9x22CHtm/nfOuT0ptBEVhCMqZo="; outputHashMode = "recursive"; nativeBuildInputs = [ @@ -171,6 +172,7 @@ stdenv.mkDerivation rec { libvorbis libjpeg libwebp + libX11 libpng ]; diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json index 23aba8c6550c..215a5d1af933 100644 --- a/pkgs/by-name/up/upbound/sources-main.json +++ b/pkgs/by-name/up/upbound/sources-main.json @@ -8,38 +8,38 @@ "fetchurlAttrSet": { "docker-credential-up": { "aarch64-darwin": { - "hash": "sha256-AYOZmdNaiGZLwvbyl6DaubWyXDqZcSbWP1/jJ3Idx6Q=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/darwin_arm64.tar.gz" + "hash": "sha256-8VKSDsmuYu/GaKo4JybWEnd+gbW9ZSjEoNlZ7SEans0=", + "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-r4chc5wMENvoEHtSIGw1fSys6ixZmg1WqfR+0ovdCDg=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/linux_arm64.tar.gz" + "hash": "sha256-WPllvTQJr5S6g2h9fe3qXKL/CH7XzADbNRoy+6rex6A=", + "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-x4b3j1fyS3P5ouJTDovgJcZVaNzxvqiZn++p5d6WDRI=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/darwin_amd64.tar.gz" + "hash": "sha256-bdKjFgJuKbFQDX1dgz6y2Ue6cFnu4Dec+I7FX+fo/pA=", + "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-uZPfsXNz3Z0cdBV9hJ4x7HPSXFVDiXqDf/NA1CMBa/M=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/linux_amd64.tar.gz" + "hash": "sha256-ieP9uiRcgcYqYClB7vGdHF1IpjH61dXD8bqpPPy2Uik=", + "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/linux_amd64.tar.gz" } }, "up": { "aarch64-darwin": { - "hash": "sha256-CcJi11DZivlcelg6nKYUyWstTUqQ6r9EIt6dhWI3fbQ=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/darwin_arm64.tar.gz" + "hash": "sha256-YYsgNpNVnTp2bPIp9DD1l0YwHcEpMknu7RrIUQ5scCo=", + "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-QKdkDzoVzxbO677nl8tMoJA4/oqV4V8/h72HikOzxTc=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/linux_arm64.tar.gz" + "hash": "sha256-wone2UA+Z0wCISQ/PsfYdQqNkX5txVVEyx4a8JnLHXo=", + "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-xfvMty4OkVFG+UkIfOgD6ZOOXILbPGTjApKH0oJKsKY=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/darwin_amd64.tar.gz" + "hash": "sha256-hxLZGWq94eHro4G9VJY+FLoz6AHuhm1quP/bhTzBXhE=", + "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-/5/+dPh6V/69RrqPj/0D4bECX2/2pqQJjo/dNgi/EgE=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/linux_amd64.tar.gz" + "hash": "sha256-GwAu6z6A4HUhc6vO6xiKZlITm5xiLas8zffuWnesji8=", + "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/linux_amd64.tar.gz" } } }, @@ -49,5 +49,5 @@ "x86_64-darwin", "x86_64-linux" ], - "version": "0.39.0-0.rc.0.249.g7b07f31c" + "version": "0.39.0-8.gfb176095" } diff --git a/pkgs/by-name/up/upbound/sources-stable.json b/pkgs/by-name/up/upbound/sources-stable.json index 8e56dc7c535f..94d300dd1421 100644 --- a/pkgs/by-name/up/upbound/sources-stable.json +++ b/pkgs/by-name/up/upbound/sources-stable.json @@ -8,38 +8,38 @@ "fetchurlAttrSet": { "docker-credential-up": { "aarch64-darwin": { - "hash": "sha256-hQpZdqE27jCXIGp+Y7fdVocBPM6PJ50Z9/ly0QvFsok=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/docker-credential-up/darwin_arm64.tar.gz" + "hash": "sha256-mBL2ytAXOtGwkitBzk1VB4SHS1oZ/9wcyZbCbfxyFko=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/docker-credential-up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-SHjYjf4wC8G6KpF+W86ULI1CwVH93bgKLTof5M9wvZ4=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/docker-credential-up/linux_arm64.tar.gz" + "hash": "sha256-7BZ9MuszhhWfK6OaDhij8Q6qPXBm58sWLcPN/XjF/QY=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/docker-credential-up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-XiiyEMVb8bhjmJrofE2T/Vgg+pNBNxUv0yKKm9rIx+4=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/docker-credential-up/darwin_amd64.tar.gz" + "hash": "sha256-wH3KGhRcdDj3bAwTbRZDiKSNyKgsxzfFRtmZKmFCc8A=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/docker-credential-up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-R3pgYboerb8gVc1sDmZVHY541yO0A3hIYeIiZ1wrTzg=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/docker-credential-up/linux_amd64.tar.gz" + "hash": "sha256-VChdnWUJgS2meK0POrF3HoPFVskgHTQgUkJaj/yAIFA=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/docker-credential-up/linux_amd64.tar.gz" } }, "up": { "aarch64-darwin": { - "hash": "sha256-6DTIUGeT4LGRVyfUl463y9b2zGJawWzXp/Y0aNWoYPI=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/up/darwin_arm64.tar.gz" + "hash": "sha256-NL0erDPBa35mQoxGscLEYOZEf4QPWIrtEi20v0kkjD4=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-bgR9OSHRWFQG50TWt7b8r9Gdb/xE0ps5yu33C58k31I=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/up/linux_arm64.tar.gz" + "hash": "sha256-kZeD9NyUpXJCjEP+KdCy9JnyEBEMNvUJ0DxkKtL/5HI=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-zMpYwYncghWCr+sNbXvjcwWcimv4ouc8EsKmK50i9zU=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/up/darwin_amd64.tar.gz" + "hash": "sha256-0bIC7h4Eor9wFCzxiJaSv3OlDONmiDxLM7aApCcG7bY=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-f6ggEUV9CRWVcG/RkYzmwaOUljxnJeoVshwkOZL3Toc=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/up/linux_amd64.tar.gz" + "hash": "sha256-ihjjtkhfXsUPnkeEfCaMTjkX4J+hbyrfpjnMY4kGuSQ=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/up/linux_amd64.tar.gz" } } }, @@ -49,5 +49,5 @@ "x86_64-darwin", "x86_64-linux" ], - "version": "0.38.4" + "version": "0.39.0" } diff --git a/pkgs/by-name/up/upcloud-cli/package.nix b/pkgs/by-name/up/upcloud-cli/package.nix index 307fc2f981eb..7985098dc9c8 100644 --- a/pkgs/by-name/up/upcloud-cli/package.nix +++ b/pkgs/by-name/up/upcloud-cli/package.nix @@ -32,7 +32,7 @@ buildGoModule rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/upctl"; - versionCheckProgramArg = [ "version" ]; + versionCheckProgramArg = "version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/up/update-python-libraries/package.nix b/pkgs/by-name/up/update-python-libraries/package.nix index 46e0e3b7f772..0bf7b9b697ee 100644 --- a/pkgs/by-name/up/update-python-libraries/package.nix +++ b/pkgs/by-name/up/update-python-libraries/package.nix @@ -1,4 +1,5 @@ { + lib, python3, runCommand, git, @@ -9,8 +10,6 @@ runCommand "update-python-libraries" { buildInputs = [ - nix - nix-prefetch-git (python3.withPackages ( ps: with ps; [ packaging @@ -18,11 +17,14 @@ runCommand "update-python-libraries" toolz ] )) - git ]; } '' cp ${./update-python-libraries.py} $out patchShebangs $out - substituteInPlace $out --replace 'GIT = "git"' 'GIT = "${git}/bin/git"' + substituteInPlace $out \ + --replace-fail 'NIX = "nix"' 'NIX = "${lib.getExe nix}"' \ + --replace-fail 'NIX_PREFETCH_URL = "nix-prefetch-url"' 'NIX_PREFETCH_URL = "${lib.getExe' nix "nix-prefetch-url"}"' \ + --replace-fail 'NIX_PREFETCH_GIT = "nix-prefetch-git"' 'NIX_PREFETCH_GIT = "${lib.getExe nix-prefetch-git}"' \ + --replace-fail 'GIT = "git"' 'GIT = "${lib.getExe git}"' '' diff --git a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py index d10f9c51a595..0c8f81c763f6 100755 --- a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py +++ b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py @@ -36,10 +36,13 @@ PRERELEASES = False BULK_UPDATE = False +NIX = "nix" +NIX_PREFETCH_URL = "nix-prefetch-url" +NIX_PREFETCH_GIT = "nix-prefetch-git" GIT = "git" NIXPKGS_ROOT = ( - subprocess.check_output(["git", "rev-parse", "--show-toplevel"]) + subprocess.check_output([GIT, "rev-parse", "--show-toplevel"]) .decode("utf-8") .strip() ) @@ -79,7 +82,7 @@ def _get_attr_value(attr_path: str) -> Optional[Any]: try: response = subprocess.check_output( [ - "nix", + NIX, "--extra-experimental-features", "nix-command", "eval", @@ -164,7 +167,7 @@ def _hash_to_sri(algorithm, value): return ( subprocess.check_output( [ - "nix", + NIX, "--extra-experimental-features", "nix-command", "hash", @@ -260,7 +263,7 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t try: homepage = subprocess.check_output( [ - "nix", + NIX, "--extra-experimental-features", "nix-command", "eval", @@ -301,7 +304,7 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t algorithm = "sha256" cmd = [ - "nix-prefetch-git", + NIX_PREFETCH_GIT, f"https://github.com/{owner}/{repo}.git", "--hash", algorithm, @@ -317,7 +320,7 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t hash = ( subprocess.check_output( [ - "nix-prefetch-url", + NIX_PREFETCH_URL, "--type", "sha256", "--unpack", @@ -336,7 +339,7 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t try: hash = ( subprocess.check_output( - ["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], + [NIX_PREFETCH_URL, "--type", "sha256", "--unpack", tag_url], stderr=subprocess.DEVNULL, ) .decode("utf-8") @@ -557,6 +560,8 @@ def _commit(path, pname, old_version, new_version, pkgs_prefix="python: ", **kwa if changelog := _get_attr_value(f"{pkgs_prefix}{pname}.meta.changelog"): msg += f"\n\n{changelog}" + msg += "\n\nThis commit was automatically generated using update-python-libraries." + try: subprocess.check_call([GIT, "add", path]) subprocess.check_call([GIT, "commit", "-m", msg]) diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 66ef766b6532..1bfc3207f032 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.96.0"; + version = "0.100.0"; src = fetchFromGitHub { owner = "updatecli"; repo = "updatecli"; rev = "v${version}"; - hash = "sha256-znl0yUqnN9eQHY18wPfcYiUnsGw349tLSkZNa/Wz2KA="; + hash = "sha256-gzHNUFhctfMSoXEVlnYJW4qD6MmV/NMMoTFSp550FTQ="; }; - vendorHash = "sha256-jUVoNTA1wVHNjxkLBgERo8650dxpzmuVBGiAw5sUql0="; + vendorHash = "sha256-b4mIRfiFqOqRiyZJSrASCDpcE65j45SbgE7E8yFXrCE="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/up/upgrade-assistant/package.nix b/pkgs/by-name/up/upgrade-assistant/package.nix index 06e361d74267..d24ed84845d9 100644 --- a/pkgs/by-name/up/upgrade-assistant/package.nix +++ b/pkgs/by-name/up/upgrade-assistant/package.nix @@ -1,9 +1,9 @@ { lib, buildDotnetGlobalTool }: buildDotnetGlobalTool { pname = "upgrade-assistant"; - version = "0.5.829"; + version = "0.5.1084"; - nugetHash = "sha256-N0xEmPQ88jfirGPLJykeAJQYGwELFzKwUWdFxIgiwhY="; + nugetHash = "sha256-O+HHLqou6hRAQ8vUzq+VfX0vRM+nZGPnfCg8niYX2gE="; meta = { homepage = "https://github.com/dotnet/upgrade-assistant"; diff --git a/pkgs/by-name/up/uplosi/package.nix b/pkgs/by-name/up/uplosi/package.nix index 14da37539a1f..11f3d8d52e3c 100644 --- a/pkgs/by-name/up/uplosi/package.nix +++ b/pkgs/by-name/up/uplosi/package.nix @@ -6,14 +6,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "uplosi"; version = "0.4.0"; src = fetchFromGitHub { owner = "edgelesssys"; - repo = pname; - rev = "v${version}"; + repo = "uplosi"; + tag = "v${finalAttrs.version}"; hash = "sha256-5I916T70sH4UAq5EGRjR7lnRBbPqMJIxaXwUCJQ4DcM="; }; @@ -22,7 +22,7 @@ buildGoModule rec { env.CGO_ENABLED = "0"; ldflags = [ "-s" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -39,7 +39,7 @@ buildGoModule rec { meta = { description = "Upload OS images to cloud provider"; homepage = "https://github.com/edgelesssys/uplosi"; - changelog = "https://github.com/edgelesssys/uplosi/releases/tag/v${version}"; + changelog = "https://github.com/edgelesssys/uplosi/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; mainProgram = "uplosi"; maintainers = with lib.maintainers; [ @@ -48,4 +48,4 @@ buildGoModule rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/up/upower/package.nix b/pkgs/by-name/up/upower/package.nix index 723f129d1aab..b0c0c09573d3 100644 --- a/pkgs/by-name/up/upower/package.nix +++ b/pkgs/by-name/up/upower/package.nix @@ -71,6 +71,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.freedesktop.org/upower/upower/-/commit/9ee76826bd41a5d3a377dfd6f5835f42ec50be9a.patch"; hash = "sha256-E56iz/iHn+VM7Opo0a13A5nhnB9nf6C7Y1kyWzk4ZnU="; }) + # Fix style issues in the udev rules file + (fetchpatch { + url = "https://gitlab.freedesktop.org/upower/upower/-/commit/6f9d84694da56b317989b8c34250b60d833a4b29.patch"; + hash = "sha256-xBUbf4qz9Llmw7CuKKMp/uPk7JqwjB4+p7z9kMOVRuE="; + }) ]; strictDeps = true; @@ -163,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs src/linux/unittest_inspector.py substituteInPlace src/linux/integration-test.py \ - --replace "/usr/share/dbus-1" "$out/share/dbus-1" + --replace-fail "/usr/share/dbus-1" "$out/share/dbus-1" ''; preCheck = '' @@ -250,7 +255,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.freedesktop.org/upower/upower/-/blob/v${finalAttrs.version}/NEWS"; description = "D-Bus service for power management"; mainProgram = "upower"; - maintainers = teams.freedesktop.members; + teams = [ teams.freedesktop ]; platforms = platforms.linux; license = licenses.gpl2Plus; }; diff --git a/pkgs/by-name/up/upscaler/package.nix b/pkgs/by-name/up/upscaler/package.nix index 8fc336d9b205..9d25e57aef0a 100644 --- a/pkgs/by-name/up/upscaler/package.nix +++ b/pkgs/by-name/up/upscaler/package.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { pname = "upscaler"; - version = "1.4.1"; + version = "1.5.2"; pyproject = false; # meson instead of pyproject @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "Upscaler"; rev = version; - hash = "sha256-WjhefFyd1hnngD/uIvgjAI4i6AyoldDJKWocvotGw9g="; + hash = "sha256-QpKeu4k31BKcpPFLvb4iuFMdE3IwQARCDXTqWhWhBM0="; }; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json index 5d0a450a0728..82b10f1f7e80 100644 --- a/pkgs/by-name/up/upsun/versions.json +++ b/pkgs/by-name/up/upsun/versions.json @@ -1,19 +1,19 @@ { - "version": "5.0.23", + "version": "5.1.1", "darwin-amd64": { - "hash": "sha256-6bnna+8cDuZ593FTbEG6IGAxpuH/hVCjCDZJgkB3qRw=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.23/upsun_5.0.23_darwin_all.tar.gz" + "hash": "sha256-oOM+CP4wWjfWBEejhmDM1hjyWistigPfIqotyOJJU/o=", + "url": "https://github.com/platformsh/cli/releases/download/5.1.1/upsun_5.1.1_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-6bnna+8cDuZ593FTbEG6IGAxpuH/hVCjCDZJgkB3qRw=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.23/upsun_5.0.23_darwin_all.tar.gz" + "hash": "sha256-oOM+CP4wWjfWBEejhmDM1hjyWistigPfIqotyOJJU/o=", + "url": "https://github.com/platformsh/cli/releases/download/5.1.1/upsun_5.1.1_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-yxn9r98mUEBCfnd0gkmEKbhPfnHiRxNEsDi3kTJBo6k=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.23/upsun_5.0.23_linux_amd64.tar.gz" + "hash": "sha256-aozHXVnWGGIsOi5AopGbTLzah8AunaUrUoWnakM1+vs=", + "url": "https://github.com/platformsh/cli/releases/download/5.1.1/upsun_5.1.1_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-hr4XXEt/mK4HsV1Wp5oqieQs3gQcAy7AFNACaKA6wmA=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.23/upsun_5.0.23_linux_arm64.tar.gz" + "hash": "sha256-MHb++8FXYo7YRq2HO5IypnyxxCQ7jZ5qysiuqmm0YJg=", + "url": "https://github.com/platformsh/cli/releases/download/5.1.1/upsun_5.1.1_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/up/upx/package.nix b/pkgs/by-name/up/upx/package.nix index 744681d9184f..46ef8a7de201 100644 --- a/pkgs/by-name/up/upx/package.nix +++ b/pkgs/by-name/up/upx/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "upx"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "upx"; repo = "upx"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-LWir7Quf53G3Q9Lyw+sokn7Rtes2DxeZD8UsYviy3aA="; + hash = "sha256-Tkyhr9iuyD2EnVZgo2X/NF0Am12JEZ3vQ9ojOjqsZ2E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ur/urbit/package.nix b/pkgs/by-name/ur/urbit/package.nix index e0758ddba61c..9d9034aa04c2 100644 --- a/pkgs/by-name/ur/urbit/package.nix +++ b/pkgs/by-name/ur/urbit/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation rec { pname = "urbit"; - version = "3.1"; + version = "3.3"; src = fetchzip { url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; sha256 = { - x86_64-linux = "sha256-51Zgv9QANQVMk/dc7/heYmCNfeu4k7mrYNke1/oz/94="; - aarch64-linux = "sha256-Tdn/ve9iCjsY/b39TZ7ErHV14mIAHdtmycgUPIzRihQ="; - x86_64-darwin = "sha256-y/FQIVcEn6dLWXPztC34+7+5eDMO7Xcx25D2+0p7Mxk="; - aarch64-darwin = "sha256-YJGRZlpTdm1x4P+GnZiKC1411tcEX+Jdnm+iyxUlsU0="; + x86_64-linux = "sha256-8LU94uDiul1bmVRYVFBZ217z0HxELZIvF4Rs4owqqv0="; + aarch64-linux = "sha256-GNx/8jhgRMlsg/JDp9Cmb1vs9Lai2XRrNf++cqzjT8U="; + x86_64-darwin = "sha256-DCm7MYUnpdgPnu+0hXgolAPfWHwSrAr8PMGFF6OFSLU="; + aarch64-darwin = "sha256-7bJpR0wJlrt5Z/xFMjveBgOpSbGQt09ISRkUA91c0YA="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/ur/urbit/update-bin.sh b/pkgs/by-name/ur/urbit/update-bin.sh index b7ee514e10a7..b7c4af1028e1 100755 --- a/pkgs/by-name/ur/urbit/update-bin.sh +++ b/pkgs/by-name/ur/urbit/update-bin.sh @@ -4,7 +4,7 @@ set -euo pipefail ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/default.nix" +NIX_DRV="$ROOT/package.nix" if [ ! -f "$NIX_DRV" ]; then echo "ERROR: cannot find urbit in $ROOT" exit 1 diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix index 5dcd620579e3..5b51ff56362b 100644 --- a/pkgs/by-name/ur/url-parser/package.nix +++ b/pkgs/by-name/ur/url-parser/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "url-parser"; - version = "2.1.4"; + version = "2.1.6"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; tag = "v${version}"; - hash = "sha256-GIJj4t6xDXfXMWfSpUR1iI1Ju/W/2REedgtyEFgbylE="; + hash = "sha256-pmsF2wYEjJ8//sUvkW0psj4ULOjwp8s3hzxVKXCM0Ok="; }; - vendorHash = "sha256-gYkuSBgkDdAaJArsvTyZXkvYCKXkhic5XzLqPbbGVOw="; + vendorHash = "sha256-873EOiS57LKZDehtDZyc3ACEXhUFOtIX6v+D2LUarwE="; ldflags = [ "-s" diff --git a/pkgs/by-name/ur/urn-timer/package.nix b/pkgs/by-name/ur/urn-timer/package.nix index 53f4526ce2e7..8222cac03c2b 100644 --- a/pkgs/by-name/ur/urn-timer/package.nix +++ b/pkgs/by-name/ur/urn-timer/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "urn-timer"; - version = "0-unstable-2025-02-07"; + version = "0-unstable-2025-04-17"; src = fetchFromGitHub { owner = "paoloose"; repo = "urn"; - rev = "0486ff9af0a404e73d66ea3d8ad7f9107efff35f"; - hash = "sha256-3fgKs0cWr972pYLTfIy6HLDP+GUdNog4FEQ70ACKYKI="; + rev = "5eea3f9efb03758bfafcd029406797d34e4c875b"; + hash = "sha256-rlUFZiA2fMa5QkKqKBRkiM8o2nioD0MPn6eJTJSJq3M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix index 670c3f1e8b66..2badd8c0e9af 100644 --- a/pkgs/by-name/us/usacloud/package.nix +++ b/pkgs/by-name/us/usacloud/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "usacloud"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "sacloud"; repo = "usacloud"; tag = "v${version}"; - hash = "sha256-bIVC0pa+54a/OpGKOM3LH7IMZnuYDvfGOMxcIwhHI7U="; + hash = "sha256-HrcUoRqjbP6E/C9PfFYw73XaA5ysNLYqsiifXVnlhe0="; }; - vendorHash = "sha256-m89iw5nk34KkCh8vlnKcwoPQXprUKzETYQNzi2CtX4c="; + vendorHash = "sha256-OIS0QV0t4Y06/B8L48IlftWjzahptaa0PAcxEcRdDPo="; ldflags = [ "-s" @@ -27,7 +27,7 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/us/usb-modeswitch/data.nix b/pkgs/by-name/us/usb-modeswitch/data.nix index 2317c825e530..d767935592cd 100644 --- a/pkgs/by-name/us/usb-modeswitch/data.nix +++ b/pkgs/by-name/us/usb-modeswitch/data.nix @@ -20,9 +20,15 @@ stdenv.mkDerivation rec { "DESTDIR=$(out)" ]; - prePatch = '' - sed -i 's@usb_modeswitch@${usb-modeswitch}/lib/udev/usb_modeswitch@g' 40-usb_modeswitch.rules - ''; + postPatch = + # bash + '' + substituteInPlace 40-usb_modeswitch.rules \ + --replace-fail "usb_modeswitch" "${usb-modeswitch}/lib/udev/usb_modeswitch" + + # Fix issue reported by udevadm verify + sed -i 's/,,/,/g' 40-usb_modeswitch.rules + ''; # we add tcl here so we can patch in support for new devices by dropping config into # the usb_modeswitch.d directory diff --git a/pkgs/by-name/us/usbfluxd/package.nix b/pkgs/by-name/us/usbfluxd/package.nix new file mode 100644 index 000000000000..db2d9490f68c --- /dev/null +++ b/pkgs/by-name/us/usbfluxd/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + libimobiledevice, + libusb1, + libusbmuxd, + usbmuxd, + libplist, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "usbfluxd"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "corellium"; + repo = "usbfluxd"; + tag = "v${finalAttrs.version}"; + hash = "sha256-tfAy3e2UssPlRB/8uReLS5f8N/xUUzbjs8sKNlr40T0="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libimobiledevice + libusb1 + libusbmuxd + usbmuxd + libplist + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail 'with_static_libplist=yes' 'with_static_libplist=no' + substituteInPlace usbfluxd/utils.h \ + --replace-fail PLIST_FORMAT_BINARY //PLIST_FORMAT_BINARY \ + --replace-fail PLIST_FORMAT_XML, NOT_PLIST_FORMAT_XML + ''; + + meta = { + homepage = "https://github.com/corellium/usbfluxd"; + description = "Redirects the standard usbmuxd socket to allow connections to local and remote usbmuxd instances so remote devices appear connected locally"; + license = lib.licenses.gpl2Plus; + mainProgram = "usbfluxctl"; + maintainers = with lib.maintainers; [ x807x ]; + }; +}) diff --git a/pkgs/by-name/us/usbguard/package.nix b/pkgs/by-name/us/usbguard/package.nix index 9c2c6a2a495b..bdcd016cf0e3 100644 --- a/pkgs/by-name/us/usbguard/package.nix +++ b/pkgs/by-name/us/usbguard/package.nix @@ -16,11 +16,14 @@ libqb, libseccomp, polkit, - protobuf, + protobuf_29, audit, libsodium, }: +let + protobuf = protobuf_29; +in stdenv.mkDerivation rec { version = "1.1.3"; pname = "usbguard"; diff --git a/pkgs/by-name/us/usbip-ssh/package.nix b/pkgs/by-name/us/usbip-ssh/package.nix new file mode 100644 index 000000000000..9a7009c062d2 --- /dev/null +++ b/pkgs/by-name/us/usbip-ssh/package.nix @@ -0,0 +1,54 @@ +{ + stdenv, + lib, + fetchFromGitHub, + perl, + openssh, + kmod, + makeWrapper, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "usbip-ssh"; + version = "0-unstable-2024-10-09"; + + src = fetchFromGitHub { + owner = "turistu"; + repo = "usbip-ssh"; + rev = "1b38f2d7854048bf6129ffe992f3c9caa630e377"; + hash = "sha256-3kGGMlIMTXnBVLgsZijc0yLbyaZZSDf7lr46mg0viWw="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + perl + ]; + + installPhase = '' + runHook preInstall + install -Dm755 usbip-ssh -t $out/bin + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/usbip-ssh --prefix PATH : ${ + lib.makeBinPath [ + perl + openssh + kmod + ] + } + ''; + + meta = { + homepage = "https://github.com/turistu/usbip-ssh"; + description = "Import usb devices from another linux machine with ssh's connection forwarding mechanism"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ kagehisa ]; + mainProgram = "usbip-ssh"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 4679440cf830..34ffa9971475 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "usql"; - version = "0.19.19"; + version = "0.19.21"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; tag = "v${version}"; - hash = "sha256-IDCF/etK9mNjdcgQWEDj9tXP12c2CcEA2RamKlCXgRE="; + hash = "sha256-Ix1+uq5TpYp6JyT2KML8Ts/ElPeQCKz9qAW9DqQahbE="; }; buildInputs = [ @@ -25,7 +25,7 @@ buildGoModule rec { icu ]; - vendorHash = "sha256-Z1Mjc+sI+8VHO9TTXUzF4yRvCtDs4sr/dGtjacXWCfE="; + vendorHash = "sha256-YXpmzIPs6gvEspC9JrGHw4Yzs8wdtBTsGU9kTOT6c+0="; proxyVendor = true; # Exclude drivers from the bad group diff --git a/pkgs/by-name/ut/ut/package.nix b/pkgs/by-name/ut/ut/package.nix index 7e60398430d5..b1972404c58d 100644 --- a/pkgs/by-name/ut/ut/package.nix +++ b/pkgs/by-name/ut/ut/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ut"; - version = "2.3.0"; + version = "2.3.1"; cmakeFlags = [ "-DBOOST_UT_ALLOW_CPM_USE=OFF" @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "boost-ext"; repo = "ut"; rev = "v${finalAttrs.version}"; - hash = "sha256-3H3kyf58gy+VdNfj4gmIe+D1+douMwZQU7+iphO+utU="; + hash = "sha256-VCTrs0CMr4pUrJ2zEsO8s7j16zOkyDNhBc5zw0rAAZI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index c71abfeeca7d..eef5a90698c7 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -3,6 +3,8 @@ stdenv, fetchurl, pkg-config, + autoconf, + automake116x, zlib, shadow, capabilitiesSupport ? stdenv.hostPlatform.isLinux, @@ -34,18 +36,26 @@ let in stdenv.mkDerivation rec { pname = "util-linux" + lib.optionalString isMinimal "-minimal"; - version = "2.40.4"; + version = "2.41"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; - hash = "sha256-XB2vczsE6YWa/cO9h8xIEYDuD4i1wJRrFv3skxl1+3k="; + hash = "sha256-ge6Ts8/f6318QJDO3rode7zpFB/QtQG2hrP+R13cpMY="; }; - patches = [ - ./rtcwake-search-PATH-for-shutdown.patch - # https://github.com/util-linux/util-linux/pull/3013 - ./fix-darwin-build.patch - ]; + patches = + [ + ./rtcwake-search-PATH-for-shutdown.patch + # https://github.com/util-linux/util-linux/pull/3013 + ./fix-darwin-build.patch + ] + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ + (fetchurl { + name = "bits-only-build-when-cpu_set_t-is-available.patch"; + url = "https://lore.kernel.org/util-linux/20250501075806.88759-1-hi@alyssa.is/raw"; + hash = "sha256-G7Cdv8636wJEjgt9am7PaDI8bpSF8sO9bFWEIiAL25A="; + }) + ]; # We separate some of the utilities into their own outputs. This # allows putting together smaller systems depending on only part of @@ -67,7 +77,7 @@ stdenv.mkDerivation rec { postPatch = '' - patchShebangs tests/run.sh tools/all_syscalls + patchShebangs tests/run.sh tools/all_syscalls tools/all_errnos substituteInPlace sys-utils/eject.c \ --replace "/bin/umount" "$bin/bin/umount" @@ -107,6 +117,7 @@ stdenv.mkDerivation rec { (lib.withFeature systemdSupport "systemd") (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/") (lib.withFeatureAs systemdSupport "tmpfilesdir" "${placeholder "out"}/lib/tmpfiles.d") + (lib.withFeatureAs systemdSupport "sysusersdir" "${placeholder "out"}/lib/sysusers.d") (lib.enableFeature translateManpages "poman") "SYSCONFSTATICDIR=${placeholder "lib"}/lib" ] @@ -137,6 +148,10 @@ stdenv.mkDerivation rec { pkg-config installShellFiles ] + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ + autoconf + automake116x + ] ++ lib.optionals translateManpages [ po4a ] ++ lib.optionals (cryptsetupSupport == "dlopen") [ cryptsetup ]; diff --git a/pkgs/by-name/ut/util-macros/package.nix b/pkgs/by-name/ut/util-macros/package.nix new file mode 100644 index 000000000000..a6ff12c619b1 --- /dev/null +++ b/pkgs/by-name/ut/util-macros/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + automake, + autoconf, + libtool, + testers, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "util-macros"; + version = "1.20.2"; + + src = fetchurl { + url = "mirror://xorg/individual/util/util-macros-${finalAttrs.version}.tar.xz"; + hash = "sha256-msJp66JPZy19ezV05L5fMz0T8Ep3EjA7GCGypRrILo4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + # not needed for releases, we propagate the needed tools + propagatedNativeBuildInputs = [ + automake + autoconf + libtool + ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/util/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "GNU autoconf macros shared across X.Org projects"; + homepage = "https://gitlab.freedesktop.org/xorg/util/macros"; + license = with lib.licenses; [ + hpndSellVariant + mit + ]; + maintainers = [ ]; + pkgConfigModules = [ "xorg-macros" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ut/utm/package.nix b/pkgs/by-name/ut/utm/package.nix index 498c10387cfc..4e6c40ed5b2d 100644 --- a/pkgs/by-name/ut/utm/package.nix +++ b/pkgs/by-name/ut/utm/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.6.4"; + version = "4.6.5"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-qthnJhUrFaPpY893igsN/Y6Bhzazga7SaZ2XShiEVCc="; + hash = "sha256-CzVgfgHi76BPRfF22HW0o4YTh4Bx7lU20qnMO2Sjwo0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/uu/uucp/package.nix b/pkgs/by-name/uu/uucp/package.nix index f94b84b646d6..c32f40589ad9 100644 --- a/pkgs/by-name/uu/uucp/package.nix +++ b/pkgs/by-name/uu/uucp/package.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '(void) exit (0)' '(void) (0)' ''; + patches = [ + ./socklen_t.patch + ]; + # Regenerate `configure`; the checked in version was generated in 2002 and # contains snippets like `main(){return(0);}` that modern compilers dislike. nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/uu/uucp/socklen_t.patch b/pkgs/by-name/uu/uucp/socklen_t.patch new file mode 100644 index 000000000000..3c8f1c0f6fa4 --- /dev/null +++ b/pkgs/by-name/uu/uucp/socklen_t.patch @@ -0,0 +1,26 @@ +diff --git a/unix/portnm.c b/unix/portnm.c +index 9eda4ab..019337c 100644 +--- a/unix/portnm.c ++++ b/unix/portnm.c +@@ -32,7 +32,7 @@ zsysdep_port_name (ftcp_port) + + #if HAVE_TCP + { +- size_t clen; ++ socklen_t clen; + struct sockaddr s; + + clen = sizeof (struct sockaddr); +diff --git a/unix/tcp.c b/unix/tcp.c +index 1bbcec7..af52cab 100644 +--- a/unix/tcp.c ++++ b/unix/tcp.c +@@ -395,7 +395,7 @@ ftcp_open (qconn, ibaud, fwait, fuser) + while (! FGOT_SIGNAL ()) + { + sockaddr_storage speer; +- size_t clen; ++ socklen_t clen; + int onew; + pid_t ipid; + diff --git a/pkgs/by-name/uu/uutils-findutils/package.nix b/pkgs/by-name/uu/uutils-findutils/package.nix index d7af8dafed54..37d5c90713a7 100644 --- a/pkgs/by-name/uu/uutils-findutils/package.nix +++ b/pkgs/by-name/uu/uutils-findutils/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-findutils"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "uutils"; repo = "findutils"; tag = finalAttrs.version; - hash = "sha256-EEyrXG9jybtYoBvjiXTCNg6/1WPchEGJcldB6Gqgmdc="; + hash = "sha256-i+ryTF2hlZFbyFft/769c800FkzL26E4snUsxU79sKY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nZOa7O0S9ykFM9sH6aqlAPtv3hWKF/vAXZYNRnjcOj4="; + cargoHash = "sha256-gtaD2jqnGhoJGw9FAJefnU9BSGIODi/RrhTeB3MC69U="; postInstall = '' rm $out/bin/testing-commandline diff --git a/pkgs/by-name/uu/uuu/package.nix b/pkgs/by-name/uu/uuu/package.nix index 5f6bdfe368bf..295063456c63 100644 --- a/pkgs/by-name/uu/uuu/package.nix +++ b/pkgs/by-name/uu/uuu/package.nix @@ -18,19 +18,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "uuu"; - version = "1.5.191"; + version = "1.5.201"; src = fetchFromGitHub { owner = "nxp-imx"; repo = "mfgtools"; rev = "uuu_${finalAttrs.version}"; - hash = "sha256-t9SvQrOpcJ646WyUqX//4Rv7M8Ix2NbjgAAlrR0e31E="; + hash = "sha256-G1Let5cJVzxKLs+4umnGfcSEvTeotqsgpZ0CDycBNEo="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "uuu_\\([0-9.]+\\)" + "uuu_([0-9.]+)" ]; }; diff --git a/pkgs/by-name/uv/uv-sort/package.nix b/pkgs/by-name/uv/uv-sort/package.nix index 5ef3a21e9d7d..52ce3dd9471d 100644 --- a/pkgs/by-name/uv/uv-sort/package.nix +++ b/pkgs/by-name/uv/uv-sort/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { pname = "uv-sort"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; # Build from GitHub does not work. Use fetchPypi instead of fetchFromGitHub. @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { pname = "uv_sort"; inherit version; - hash = "sha256-qCShDuKBFS4omcsntZ1wzRtAKTbp8CfTw0IIAgxBvcE="; + hash = "sha256-d0mI3BQQaoG5pPnqBqyAI2LQffkS9fxX+itD9UEL050="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 78f402585aea..cad2c65c315d 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -8,9 +8,7 @@ rust-jemalloc-sys, # nativeBuildInputs - cmake, installShellFiles, - pkg-config, buildPackages, versionCheckHook, @@ -20,29 +18,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.6.12"; + version = "0.7.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-I7SRCw36xXkNnOe1+qDik3p9IeNo70DKMbJpqaoRhhQ="; + hash = "sha256-zFVVvPPb1UM71u9QFphp9YFWgmvYemAHouCttNnQWMk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZCdwyjGM9z3GBlwF6TunmNT7IKyn9pssUaBMyZJxLhE="; + cargoHash = "sha256-aeOT6HO12J700CF7o2LiqUy6pl0Fzb0OLxHt+G4HW/k="; buildInputs = [ rust-jemalloc-sys ]; - nativeBuildInputs = [ - cmake - installShellFiles - pkg-config - ]; - - dontUseCmakeConfigure = true; + nativeBuildInputs = [ installShellFiles ]; cargoBuildFlags = [ "--package" @@ -64,9 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: { '' ); - nativeInstallCheckInputs = [ - versionCheckHook - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; doInstallCheck = true; @@ -83,7 +73,11 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 mit ]; - maintainers = with lib.maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ + bengsparks + GaetanLepage + prince213 + ]; mainProgram = "uv"; }; }) diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix index 2d8b2ab1a07b..6c1aeda8e297 100644 --- a/pkgs/by-name/uw/uwsgi/package.nix +++ b/pkgs/by-name/uw/uwsgi/package.nix @@ -80,13 +80,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "uwsgi"; - version = "2.0.28"; + version = "2.0.29"; src = fetchFromGitHub { owner = "unbit"; repo = "uwsgi"; tag = finalAttrs.version; - hash = "sha256-/7Z9lq7JiGBrTpmtbIEqpMg7nw9SVm8ypmzd1/p6xgU="; + hash = "sha256-WlbvvAu+A0anPItnG8RnWrXm450/xbOloPzUd2L9TuU="; }; patches = [ diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index f1f79e2d699b..89e3d31baa28 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uwsm"; - version = "0.21.3"; + version = "0.21.4"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "uwsm"; tag = "v${finalAttrs.version}"; - hash = "sha256-jOwzz65W9rd61U6r4mThe38oMR2f47pxMMSlO/AWQEU="; + hash = "sha256-/URa5/NK4AowYx933HwKE01191HMRSvuxtDKFKiMQr8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/uw/uwu-colors/package.nix b/pkgs/by-name/uw/uwu-colors/package.nix new file mode 100644 index 000000000000..4ee85a766f2d --- /dev/null +++ b/pkgs/by-name/uw/uwu-colors/package.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitea, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "uwu-colors"; + version = "0.4.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "q60"; + repo = "uwu_colors"; + tag = finalAttrs.version; + hash = "sha256-qzqfLTww0m1rv/7oJZrHMk63CtOk4RzY+Owx0oqlVzI="; + }; + + cargoHash = "sha256-R/IZUFr8Cir34c+C7Kq6FTFEERiInGMF8yFcC0uQ7Us="; + + meta = { + description = "Simple LSP server made to display colors via textDocument/documentColor"; + mainProgram = "uwu_colors"; + homepage = "https://codeberg.org/q60/uwu_colors"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ vel ]; + }; +}) diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index f721ece73b08..afc1ca510c44 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2025-03-14"; + version = "1.0-unstable-2025-05-08"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "7bdf99afc4748ed5c1f1b356fdff488164111d1e"; - hash = "sha256-OZo7e7M7MVkkT+SW13IOmQp6PyN6/LDqQ8fe+oc71i0="; + rev = "bc17707cc81a6d0ce4f9ce8d844ab4197e89f818"; + hash = "sha256-AQrfyHgsWA6SwCaSPkZI3jni+b5doS3/IormX6AFrPI="; }; outputs = [ diff --git a/pkgs/by-name/ux/uxplay/package.nix b/pkgs/by-name/ux/uxplay/package.nix index 01b229669b30..a00a0875fa26 100644 --- a/pkgs/by-name/ux/uxplay/package.nix +++ b/pkgs/by-name/ux/uxplay/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxplay"; - version = "1.71.1"; + version = "1.72"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${finalAttrs.version}"; - hash = "sha256-qb/oYTScbHypwyo+znhDw8Mz5u+uhM8Jn6Gff3JK+Bc="; + hash = "sha256-pS9TgGymQwSDBrhHMQYasJfDchMap49fhHTgxYzq+L4="; }; postPatch = '' diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index 2989d934eb78..6eb81089aaac 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20250326132209"; + version = "20250508005311"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-oxL9XgaTdMISdCQ37gAz4LtgV1bk09GirTtVbSOm8Z4="; + hash = "sha256-RVI+FmNjAaBurodGTqO+/UiEd0NxPdcmlYA1ag2TvNM="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix index ba2b1bdd1538..6b1f0d5ff578 100644 --- a/pkgs/by-name/v2/v2ray/package.nix +++ b/pkgs/by-name/v2/v2ray/package.nix @@ -16,18 +16,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.29.3"; + version = "5.31.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-HCXfyWpwjryFcmk/7uUByqeJzdhJgb1zv1LDREc0k10="; + hash = "sha256-neX3r4Lc1f8N/nSOzc62CArXjQrDRnLaTZPOzf66OCw="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-D8xOFgnlMSUFeUgRsVWyRbCtKnCLgRJ4e+FlHbaOZKA="; + vendorHash = "sha256-hYWGtp52XEvG4K5eplqsbRS0EweEydVfpA6hypB6SVA="; ldflags = [ "-s" diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json index bfb4fe2f56f2..6b28dfc1eb88 100644 --- a/pkgs/by-name/v2/v2rayn/deps.json +++ b/pkgs/by-name/v2/v2rayn/deps.json @@ -11,8 +11,8 @@ }, { "pname": "Avalonia", - "version": "11.2.5", - "hash": "sha256-DGTMzInnfvJUJWu2SXiRBercxxe1/paQkSlBHMahp4g=" + "version": "11.2.6", + "hash": "sha256-f+fuElhlc2dCUt/GD/Noh07JqPIA8ZtpFxdmetdPVVI=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -31,38 +31,38 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.5", - "hash": "sha256-gWGIqXrac0fOnmGbovcFWv5Uj14hOyC+n0l45N7owMg=" + "version": "11.2.6", + "hash": "sha256-TeUwMcNIvXw/gMuApUODZ7nuymM6OF9cNUGSajlyfoQ=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.5", - "hash": "sha256-eGKc+UnsO5nNiUd7+n3CQW6vIWq2qpazYvYXrVTQY7s=" + "version": "11.2.6", + "hash": "sha256-69ZtybLdpGG28M6p1Cenz6PZEfdf1VKxA4wIrw5FJnI=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.5", - "hash": "sha256-rDJ1NJM3tEqB7sRszj0AfplwkkvtE3Hvn7acrIsq+yw=" + "version": "11.2.6", + "hash": "sha256-PANuvQlAhDWjnv7VUzxOjz6XRmt4l/YKhVLSIP7YL24=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.5", - "hash": "sha256-WsAMBmNfUKMB2II3AfM8A0klfJR/vgEtRUTGpgC6F3A=" + "version": "11.2.6", + "hash": "sha256-Lc9qLIywzD06I9sPXQRjLLLijDoFOVmuO5qNh301gYQ=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.5", - "hash": "sha256-rLzsxUQS1LLLcLWkDR8SLLwLY53vUMqgiKoDWM6PjtM=" + "version": "11.2.6", + "hash": "sha256-816li4Nj8+oNkfeMjOAtFSFS+DSo9e2S3K45xqyHJAQ=" }, { "pname": "Avalonia.Native", - "version": "11.2.5", - "hash": "sha256-XQQgcfbRRHPzH432M1KzkSEtLQof40yCt+KIrQREBY0=" + "version": "11.2.6", + "hash": "sha256-by589X1UIjeQNK0lJMLfNzF2dK+qTNT6CBJNLgG86Aw=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.2.5", - "hash": "sha256-p3ELTiH4kYdcrUF87zZzRMsOU41Q3XBCBKRmQYWdLBs=" + "version": "11.2.6", + "hash": "sha256-DsUxdEQMgpmzgRS5zkf3rqk32YL3xFN7KoQkn1Xl6WU=" }, { "pname": "Avalonia.Remote.Protocol", @@ -76,28 +76,28 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.5", - "hash": "sha256-Mpml6U6Fl8FUvENGQxpxuw0+pOPvoWbZXV4V1bLUS9w=" + "version": "11.2.6", + "hash": "sha256-Q2uPnR6tPFWExohhMJKnJGTet8IVpQn/HIcRurUPAHQ=" }, { "pname": "Avalonia.Skia", - "version": "11.2.5", - "hash": "sha256-su1K1RmQ+syE6ufjrzpQR1yiUa6GEtY5QPlW0GOVKnU=" + "version": "11.2.6", + "hash": "sha256-6CfDcJT707iSB9XUQRvSvr5YWMavhiYPnHwVudUl74c=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.5", - "hash": "sha256-EjQ2XA81SS91h8oGUwVxLYewm3Lp5Sa2Lmbj0c8y8BU=" + "version": "11.2.6", + "hash": "sha256-kE31/1tchMJ6XmEbjLr5Idc7uKBAbuhsroUMg0LQauA=" }, { "pname": "Avalonia.Win32", - "version": "11.2.5", - "hash": "sha256-ljgJgXDxmHOUQ+p8z62mtaK4FTmYAI+c+6gL2lczD/8=" + "version": "11.2.6", + "hash": "sha256-e+DNtKz4UDNqOP1vvVRqbD67n5IG9PxmGkMz7B6b7AY=" }, { "pname": "Avalonia.X11", - "version": "11.2.5", - "hash": "sha256-wHEHcEvOUyIBgBtQZOIs330KajSv8DSEsJP7w4M9i4E=" + "version": "11.2.6", + "hash": "sha256-atnfxY6vspMzvMFc9PzwWb/uPNkPx5tF3zDGKeqlGIw=" }, { "pname": "CliWrap", @@ -116,8 +116,8 @@ }, { "pname": "DynamicData", - "version": "9.0.4", - "hash": "sha256-3pyiJeWRwfaT7p1ArsoR13aI78Jo13aHOEw3BelTS9g=" + "version": "9.1.2", + "hash": "sha256-rDbtd7Fw/rhq6s9G4p/rltZ3EIR5r1RcMXsAEe7nZjw=" }, { "pname": "Fody", @@ -186,8 +186,8 @@ }, { "pname": "ReactiveUI", - "version": "20.1.63", - "hash": "sha256-fcLBYRz5WFlPYtIiLA1k/6xxxWhlclVMj7li8z04g68=" + "version": "20.2.45", + "hash": "sha256-7JzWD40/iNnp7+wuG/qEJoVXQz0T7qipq5NWJFxJ6VM=" }, { "pname": "ReactiveUI.Fody", @@ -196,13 +196,13 @@ }, { "pname": "Semi.Avalonia", - "version": "11.2.1.5", - "hash": "sha256-xomim/K3C6F0/105KCVc054AG80Z4cQw1bycHF9MD/U=" + "version": "11.2.1.6", + "hash": "sha256-E7FKQe3oQlzaza/ofmSvtrLXWo+ht7QutZKGylGW8QE=" }, { "pname": "Semi.Avalonia.DataGrid", - "version": "11.2.1.5", - "hash": "sha256-xebEht0T5hPSYhyuqbZEzHw3D7/9K920SZhnIXDrM3s=" + "version": "11.2.1.6", + "hash": "sha256-uXy8eqoENQXNpfskJgJsKW1HaThMKfMNpiJpzDc5oRo=" }, { "pname": "SkiaSharp", @@ -244,11 +244,6 @@ "version": "2.88.9", "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, - { - "pname": "Splat", - "version": "15.1.1", - "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" - }, { "pname": "Splat", "version": "15.3.1", @@ -299,6 +294,11 @@ "version": "8.0.0", "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.2", + "hash": "sha256-uxM7J0Q/dzEsD0NGcVBsOmdHiOEawZ5GNUKBwpdiPyE=" + }, { "pname": "System.Memory", "version": "4.5.3", @@ -319,6 +319,16 @@ "version": "5.0.0", "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.2", + "hash": "sha256-tZhc/Xe+SF9bCplthph2QmQakWxKVjMfQJZzD1Xbpg8=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.2", + "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8=" + }, { "pname": "TaskScheduler", "version": "2.12.1", @@ -331,8 +341,8 @@ }, { "pname": "WebDav.Client", - "version": "2.8.0", - "hash": "sha256-hINrSLAqy20lC0AtHgc/qfMA6iPrhZ265vpwdr6lkEY=" + "version": "2.9.0", + "hash": "sha256-/ffcn87aItoi7K3Pdjh6Ktn6/72uGhUnQGi+yqHryJI=" }, { "pname": "YamlDotNet", diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index e15b100c337b..81c3828b9792 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -21,13 +21,13 @@ buildDotnetModule rec { pname = "v2rayn"; - version = "7.10.5"; + version = "7.11.1"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = version; - hash = "sha256-5tLO7KVHj0DXQdJg02Jxs6fgRLJSfFWPbARg9dqKcSI="; + hash = "sha256-oDjZwVBgTmBQQEl9A0eWZEFq1in82ercSLtoQeVS3k0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index c5da16a18cfd..7f7bba7e1eac 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -3,46 +3,45 @@ buildGoModule, fetchFromGitHub, testers, - vacuum-go, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "vacuum-go"; - version = "0.16.5"; + version = "0.16.10"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error - tag = "v${version}"; - hash = "sha256-r42bmY7wmEjA2Q/k8czyyNpU59a4z6vxeCnIfMkMScg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-8ECq5WgNK8XvExpdN2Jb6HUOCmzJBXN9XROEBaPGhDg="; }; - vendorHash = "sha256-1lr1VQU4JHg0PZbjAUmALFZJiYc+HTwrk0E/t/1qXqE="; + vendorHash = "sha256-R34e1RDFj3/5jwqoXiXF4whS0BsrkHP2g0+CZDs8rjw="; env.CGO_ENABLED = 0; ldflags = [ "-s" "-w" - "-X main.version=v${version}" + "-X main.version=v${finalAttrs.version}" ]; subPackages = [ "./vacuum.go" ]; passthru = { tests.version = testers.testVersion { - package = vacuum-go; + package = finalAttrs.finalPackage; command = "vacuum version"; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; }; meta = { description = "The world's fastest OpenAPI & Swagger linter"; homepage = "https://quobix.com/vacuum"; - changelog = "https://github.com/daveshanley/vacuum/releases/tag/v${version}"; + changelog = "https://github.com/daveshanley/vacuum/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "vacuum"; maintainers = with lib.maintainers; [ konradmalik ]; }; -} +}) diff --git a/pkgs/by-name/va/vala-lint/package.nix b/pkgs/by-name/va/vala-lint/package.nix index f4ff005875ba..38fe25d0611f 100644 --- a/pkgs/by-name/va/vala-lint/package.nix +++ b/pkgs/by-name/va/vala-lint/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; mainProgram = "io.elementary.vala-lint"; }; } diff --git a/pkgs/by-name/va/vale-ls/package.nix b/pkgs/by-name/va/vale-ls/package.nix index 056008249f69..1643a90ce1b5 100644 --- a/pkgs/by-name/va/vale-ls/package.nix +++ b/pkgs/by-name/va/vale-ls/package.nix @@ -6,7 +6,6 @@ rustPlatform, pkg-config, openssl, - darwin, vale, }: @@ -27,16 +26,9 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); + buildInputs = [ + openssl + ]; checkFlags = [ diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix index b75fe852fb43..67abc5317743 100644 --- a/pkgs/by-name/va/vale/package.nix +++ b/pkgs/by-name/va/vale/package.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "vale"; - version = "3.11.0"; + version = "3.11.2"; subPackages = [ "cmd/vale" ]; src = fetchFromGitHub { owner = "errata-ai"; repo = "vale"; - rev = "v${version}"; - hash = "sha256-NJ8QmF2ZGlbkHhc0OQSVl11pQDHO88KL/MLr+8ABLYs="; + tag = "v${version}"; + hash = "sha256-7wBMdATN2kAXUG6fWwq/8JifLrhxDjjPWlZSA47yrxM="; }; vendorHash = "sha256-Zhhp/qbwGTQEZ28S+p7GJodwQcnkFNqNU7WCZKdeoz0="; diff --git a/pkgs/by-name/va/vale/styles.nix b/pkgs/by-name/va/vale/styles.nix index c910014fbca0..72c9306f1bc1 100644 --- a/pkgs/by-name/va/vale/styles.nix +++ b/pkgs/by-name/va/vale/styles.nix @@ -61,12 +61,12 @@ in google = buildStyle rec { name = "Google"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "errata-ai"; repo = "Google"; rev = "v${version}"; - hash = "sha256-ldwK9tMA04H/jTd3dQeRX/sZOwZcyPb+I56cDg0vZDg="; + hash = "sha256-1aN7wCdShhMsBN83u7l+5Ffm2WKC8ltZyT3hPZCNWYo="; }; meta = { description = "Vale-compatible implementation of the Google Developer Documentation Style Guide"; @@ -93,12 +93,12 @@ in microsoft = buildStyle rec { name = "Microsoft"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "errata-ai"; repo = "Microsoft"; rev = "v${version}"; - hash = "sha256-4j05bIGAVEy6untUqtrUxdLKlhyOcJsbcsow8OxRp1A="; + hash = "sha256-Sie4bBeKPOFOJhgd+mLbiz4vG+xpKL0LnwnRQHzOw+Q="; }; meta = { description = "Vale-compatible implementation of the Microsoft Writing Style Guide"; diff --git a/pkgs/by-name/va/valgrind/package.nix b/pkgs/by-name/va/valgrind/package.nix new file mode 100644 index 000000000000..c180de124d6b --- /dev/null +++ b/pkgs/by-name/va/valgrind/package.nix @@ -0,0 +1,129 @@ +{ + lib, + stdenv, + fetchurl, + fetchpatch, + autoreconfHook, + perl, + gdb, + writeScript, +}: + +stdenv.mkDerivation rec { + pname = "valgrind"; + version = "3.24.0"; + + src = fetchurl { + url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2"; + hash = "sha256-ca7iAr3vGuc4mMz36cMVE0+n22wkYGOvxQOu9wLsA70="; + }; + + patches = [ + # Fix build on ELFv2 powerpc64 + # https://bugs.kde.org/show_bug.cgi?id=398883 + (fetchurl { + url = "https://github.com/void-linux/void-packages/raw/3e16b4606235885463fc9ab45b4c120f1a51aa28/srcpkgs/valgrind/patches/elfv2-ppc64-be.patch"; + sha256 = "NV/F+5aqFZz7+OF5oN5MUTpThv4H5PEY9sBgnnWohQY="; + }) + # Fix checks on Musl. + # https://bugs.kde.org/show_bug.cgi?id=453929 + (fetchpatch { + url = "https://bugsfiles.kde.org/attachment.cgi?id=148912"; + sha256 = "Za+7K93pgnuEUQ+jDItEzWlN0izhbynX2crSOXBBY/I="; + }) + # Fix build on armv7l. + # see also https://bugs.kde.org/show_bug.cgi?id=454346 + (fetchpatch { + url = "https://git.yoctoproject.org/poky/plain/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch?id=b7a9250590a16f1bdc8c7b563da428df814d4292"; + sha256 = "sha256-sBZzn98Sf/ETFv8ubivgA6Y6fBNcyR8beB3ICDAyAH0="; + }) + ]; + + outputs = [ + "out" + "dev" + "man" + "doc" + ]; + + hardeningDisable = [ + "pie" + "stackprotector" + ]; + + # GDB is needed to provide a sane default for `--db-command'. + # Perl is needed for `callgrind_{annotate,control}'. + buildInputs = [ + gdb + perl + ]; + + # Perl is also a native build input. + nativeBuildInputs = [ + autoreconfHook + perl + ]; + + enableParallelBuilding = true; + separateDebugInfo = stdenv.hostPlatform.isLinux; + + preConfigure = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + substituteInPlace configure --replace-fail '`uname -r`' ${stdenv.cc.libc.version}- + ''; + + configureFlags = lib.optional stdenv.hostPlatform.isx86_64 "--enable-only64bit"; + + doCheck = true; + + postInstall = '' + for i in $out/libexec/valgrind/*.supp; do + substituteInPlace $i \ + --replace 'obj:/lib' 'obj:*/lib' \ + --replace 'obj:/usr/X11R6/lib' 'obj:*/lib' \ + --replace 'obj:/usr/lib' 'obj:*/lib' + done + ''; + + passthru = { + updateScript = writeScript "update-valgrind" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of: + # 'Current release: valgrind-3.19.0' + new_version="$(curl -s https://valgrind.org/ | + pcregrep -o1 'Current release: .*>valgrind-([0-9.]+)')" + update-source-version ${pname} "$new_version" + ''; + }; + + meta = { + homepage = "https://valgrind.org/"; + description = "Debugging and profiling tool suite"; + + longDescription = '' + Valgrind is an award-winning instrumentation framework for + building dynamic analysis tools. There are Valgrind tools that + can automatically detect many memory management and threading + bugs, and profile your programs in detail. You can also use + Valgrind to build new tools. + ''; + + license = lib.licenses.gpl2Plus; + + maintainers = [ lib.maintainers.eelco ]; + platforms = + with lib.platforms; + lib.intersectLists (x86 ++ power ++ s390x ++ armv7 ++ aarch64 ++ mips) ( + darwin ++ freebsd ++ illumos ++ linux + ); + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; + # See: + # + # Darwin‐specific derivation logic has been removed, check the + # history if you want to fix this. + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/by-name/va/valijson/package.nix b/pkgs/by-name/va/valijson/package.nix index a558e5c410f6..56080eb000f2 100644 --- a/pkgs/by-name/va/valijson/package.nix +++ b/pkgs/by-name/va/valijson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "valijson"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "tristanpenman"; repo = "valijson"; rev = "v${version}"; - hash = "sha256-nIXcS8PMKoo8D616uUZ+GdIbkGb3VGSlCvg7QqZtz20="; + hash = "sha256-f/pYJTvtSXtAmVbKWQfcz/jGSdj7Yt2HNvlCFHx871Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix index bca8fa9c5302..381aeaf25cf4 100644 --- a/pkgs/by-name/va/valkey/package.nix +++ b/pkgs/by-name/va/valkey/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "valkey"; - version = "8.0.2"; + version = "8.0.3"; src = fetchFromGitHub { owner = "valkey-io"; repo = "valkey"; rev = finalAttrs.version; - hash = "sha256-05EuPjVokzfJxhrnvFHD7prwt5y7gPxemeDIkLML7lw="; + hash = "sha256-IzerctJUc478dJu2AH20s/A3psiAZWDjQG3USQWqpos="; }; patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch; @@ -85,12 +85,14 @@ stdenv.mkDerivation (finalAttrs: { sed -i '/^proc wait_load_handlers_disconnected/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \ tests/support/util.tcl + # skip some more flaky tests ./runtest \ --no-latency \ --timeout 2000 \ --clients $NIX_BUILD_CORES \ --tags -leaks \ - --skipunit integration/failover # flaky and slow + --skipunit integration/failover \ + --skipunit integration/aof-multi-part runHook postCheck ''; diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix index 04f0fe27fb39..20f8e4ca0395 100644 --- a/pkgs/by-name/va/vals/package.nix +++ b/pkgs/by-name/va/vals/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "vals"; - version = "0.40.1"; + version = "0.41.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-1mN8JbFgzHjzuuSoagDo9f4zFrrZc2iNk8AoSrBsyBs="; + sha256 = "sha256-548gr+piqZsFy+DoKtNaAxWaa/gBS7yYTPucj0aFWhw="; }; - vendorHash = "sha256-LI0NEjkE22ljSWd3qbZX7fTdwEriQJBSuKyX3hv1yFk="; + vendorHash = "sha256-/E9yT/cgYc3SkwfebJ6HwMWRaG+7LI+z26RcHenDgHk="; proxyVendor = true; diff --git a/pkgs/by-name/va/valuta/package.nix b/pkgs/by-name/va/valuta/package.nix index 05a2a0ff7ba8..8e7c473742b1 100644 --- a/pkgs/by-name/va/valuta/package.nix +++ b/pkgs/by-name/va/valuta/package.nix @@ -65,7 +65,8 @@ python3Packages.buildPythonApplication rec { description = "Simple application for converting currencies, with support for various APIs"; homepage = "https://github.com/ideveCore/Valuta"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ arthsmn ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ arthsmn ]; + teams = [ teams.gnome-circle ]; mainProgram = "currencyconverter"; platforms = platforms.linux; }; diff --git a/pkgs/by-name/va/vapoursynth/package.nix b/pkgs/by-name/va/vapoursynth/package.nix index f2b57cddf493..294481fae046 100644 --- a/pkgs/by-name/va/vapoursynth/package.nix +++ b/pkgs/by-name/va/vapoursynth/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "70"; + version = "71"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - hash = "sha256-jkRjFKHNTekXluSKQ33QqsGRy7LKnkmG97U5WIjI6EM="; + hash = "sha256-gFfkZaYIpQnDckYk6a8hGJCjBQxjjMIgzPZ4k2sVab4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/va/varia/package.nix b/pkgs/by-name/va/varia/package.nix index 394c866b2e0c..f3bca6c67f59 100644 --- a/pkgs/by-name/va/varia/package.nix +++ b/pkgs/by-name/va/varia/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "varia"; - version = "2025.1.24-1"; + version = "2025.4.22"; pyproject = false; src = fetchFromGitHub { owner = "giantpinkrobots"; repo = "varia"; tag = "v${version}"; - hash = "sha256-ZTsp2nVqNe+7uEk6HH95AtJMbdKHmKMy3l6q1Xpx4FY="; + hash = "sha256-y14I/K1fw7Skiuq+CglTRsotqafpP9yabuHhywB2WXE="; }; postPatch = '' diff --git a/pkgs/by-name/va/variety/package.nix b/pkgs/by-name/va/variety/package.nix index 1b98091f108d..6e48e01d7e2d 100644 --- a/pkgs/by-name/va/variety/package.nix +++ b/pkgs/by-name/va/variety/package.nix @@ -1,5 +1,6 @@ { lib, + python3Packages, fetchFromGitHub, gexiv2, gobject-introspection, @@ -8,7 +9,6 @@ intltool, libnotify, librsvg, - python3, runtimeShell, wrapGAppsHook3, fehSupport ? false, @@ -17,9 +17,10 @@ imagemagick, appindicatorSupport ? true, libayatana-appindicator, + bash, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "variety"; version = "0.8.13"; @@ -44,8 +45,8 @@ python3.pkgs.buildPythonApplication rec { librsvg ] ++ lib.optional appindicatorSupport libayatana-appindicator; - propagatedBuildInputs = - with python3.pkgs; + dependencies = + with python3Packages; [ beautifulsoup4 configobj @@ -73,14 +74,17 @@ python3.pkgs.buildPythonApplication rec { prePatch = '' substituteInPlace variety_lib/varietyconfig.py \ - --replace "__variety_data_directory__ = \"../data\"" \ + --replace-fail "__variety_data_directory__ = \"../data\"" \ "__variety_data_directory__ = \"$out/share/variety\"" substituteInPlace variety/VarietyWindow.py \ - --replace '[script,' '["${runtimeShell}", script,' \ - --replace 'check_output(script)' 'check_output(["${runtimeShell}", script])' + --replace-fail '[script,' '["${runtimeShell}", script,' \ + --replace-fail 'check_output(script)' 'check_output(["${runtimeShell}", script])' + substituteInPlace data/variety-autostart.desktop.template \ + --replace-fail "/bin/bash" "${lib.getExe bash}" \ + --replace-fail "{VARIETY_PATH}" "variety" ''; - meta = with lib; { + meta = { homepage = "https://github.com/varietywalls/variety"; description = "Wallpaper manager for Linux systems"; mainProgram = "variety"; @@ -96,8 +100,8 @@ python3.pkgs.buildPythonApplication rec { Variety also includes a range of image effects, such as oil painting and blur, as well as options to layer quotes and a clock onto the background. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ p3psi zfnmxt ]; diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix index fc362fb3f874..aa409fef0f06 100644 --- a/pkgs/by-name/va/vassal/package.nix +++ b/pkgs/by-name/va/vassal/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.15"; + version = "3.7.16"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-eFFzUssElsLkCLgbojF6VQ8hzn15NYljBH/I7k98LMk="; + sha256 = "sha256-Qg5GqfKXAdCK2LqhkFxAHA5TkTOunvHDwZsNKAEVexc="; }; buildInputs = [ diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix index d8c28727e81f..f92e5d2b4908 100644 --- a/pkgs/by-name/va/vault-bin/package.nix +++ b/pkgs/by-name/va/vault-bin/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.18.4"; + version = "1.19.3"; src = let @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-rQXtyxaM1OOF54kIeIWHEwaXYbJyHhuruH+kOSZ/6zc="; - aarch64-linux = "sha256-Bqg3UE8CXplJiYK9YKwAy88unZWmWus5IgQS4Bh0ODA="; - i686-linux = "sha256-qVEueQ00gqAEbOI4ThcU7vZu8TL4oeBDarOtOkSaGvY="; - x86_64-darwin = "sha256-tCTnOHmLaa2uTOr9ju0QHN/LexAoBlCUMrEXPLc2LJ4="; - aarch64-darwin = "sha256-sbwVOxMNCq1wcAT4PcDlu9HEsrPphLE2L87zZqfAg8M="; + x86_64-linux = "sha256-tdDMyvZHH9Lh4ZP0umGeWOQ01F4O7eq0n+8zz18/zlQ="; + aarch64-linux = "sha256-WXRElEsmEQsk2CEno1oHk+e6UPcbE15uHrAgZkLS8Oc="; + i686-linux = "sha256-+XDdrhHVLsaVqqYedp99uIKgfNiw7wHjZg6BTuiWAGw="; + x86_64-darwin = "sha256-rXqAR/bnuwNjmt+KmbixV4RFC04ZRF9BNwM9uYYLGTI="; + aarch64-darwin = "sha256-roHDJmgv8GfebhQnYeNrBc/pvwS2yoSB0YJwy/6eHVk="; }; in fetchzip { @@ -61,15 +61,13 @@ stdenv.mkDerivation rec { homepage = "https://www.vaultproject.io"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsl11; - maintainers = - with maintainers; - teams.serokell.members - ++ [ - offline - psyanticy - Chili-Man - techknowlogick - ]; + maintainers = with maintainers; [ + offline + psyanticy + Chili-Man + techknowlogick + ]; + teams = [ teams.serokell ]; mainProgram = "vault"; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/va/vault-ssh-plus/package.nix b/pkgs/by-name/va/vault-ssh-plus/package.nix index 56d8a92197f4..f624f915bb76 100644 --- a/pkgs/by-name/va/vault-ssh-plus/package.nix +++ b/pkgs/by-name/va/vault-ssh-plus/package.nix @@ -9,16 +9,16 @@ }: buildGoModule rec { pname = "vault-ssh-plus"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "isometry"; repo = pname; rev = "v${version}"; - hash = "sha256-l2Gr4AxikPWbSGeZqmkZa1wTRXNZ0l6fTSAcjl+6P8s="; + hash = "sha256-5rajB4pSRp7Pw4yx0u6MoOLxfkWWjhB7T2JGGb8ICRU="; }; - vendorHash = "sha256-AYScvuhsK6GUzOhONBl1C89yvu85SntoW7CxCr7wWmo="; + vendorHash = "sha256-IfT8F8zqWSfGh/XlISDTTZju8i3dEHG33lrZqJz1nX8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix index 6c816272dade..423adab5fe02 100644 --- a/pkgs/by-name/va/vault-tasks/package.nix +++ b/pkgs/by-name/va/vault-tasks/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "0.9.0"; + version = "0.11.0"; in rustPlatform.buildRustPackage { pname = "vault-tasks"; @@ -14,10 +14,10 @@ rustPlatform.buildRustPackage { owner = "louis-thevenet"; repo = "vault-tasks"; rev = "v${version}"; - hash = "sha256-IjpmvoibxDwbdq4SyPXWxhsUTzaRKH1qUXwskCWOqm4="; + hash = "sha256-3hRn3x86XLVMBtDlMsuqeEWgsgSeapri9MYNLqDxGF4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VgLGpyjbRL2W1oCqTjl0+thi+HYdcB8g/mwkeYA/85E="; + cargoHash = "sha256-mh6LUb1gS/cICyVWCYvmCSeqxaIWI6PyLeQx13dZ0CA="; postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications"; diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix index 52fd0905aa97..6b946cdde4bf 100644 --- a/pkgs/by-name/va/vault/package.nix +++ b/pkgs/by-name/va/vault/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "vault"; - version = "1.18.5"; + version = "1.19.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-ZpfUQJdwt7byRUs8sJRdVQABLYGqZVFPfaXwCdK2rR4="; + hash = "sha256-Mh9cRSLvx//ePSI1RMcSA7s56MAw+XuAJvbP7BFNZZw="; }; - vendorHash = "sha256-B3NsCykCBWpWSvWULyf7/3TNToYSciLI/CEVgVF2TKM="; + vendorHash = "sha256-F86lDf9AYvVL/sNNstRINe5+O/kGA0SuRjkXM4C99TU="; proxyVendor = true; diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix new file mode 100644 index 000000000000..0eba9e6e26c6 --- /dev/null +++ b/pkgs/by-name/va/vaultwarden/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + callPackage, + rustPlatform, + fetchFromGitHub, + nixosTests, + pkg-config, + openssl, + libiconv, + dbBackend ? "sqlite", + libmysqlclient, + libpq, +}: + +let + webvault = callPackage ./webvault.nix { }; +in + +rustPlatform.buildRustPackage rec { + pname = "vaultwarden"; + version = "1.33.2"; + + src = fetchFromGitHub { + owner = "dani-garcia"; + repo = "vaultwarden"; + rev = version; + hash = "sha256-Lu3/qVTi5Eedcm+3XlHAAJ1nPHm9hW4HZncQKmzDdoo="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-T/ehLSPJmEuQYhotK12iqXQSe5Ke8+dkr9PVDe4Kmis="; + + # used for "Server Installed" version in admin panel + env.VW_VERSION = version; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ] + ++ lib.optional (dbBackend == "mysql") libmysqlclient + ++ lib.optional (dbBackend == "postgresql") libpq; + + buildFeatures = dbBackend; + + passthru = { + inherit webvault; + tests = nixosTests.vaultwarden; + updateScript = callPackage ./update.nix { }; + }; + + meta = with lib; { + description = "Unofficial Bitwarden compatible server written in Rust"; + homepage = "https://github.com/dani-garcia/vaultwarden"; + changelog = "https://github.com/dani-garcia/vaultwarden/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ + dotlambda + SuperSandro2000 + ]; + mainProgram = "vaultwarden"; + }; +} diff --git a/pkgs/tools/security/vaultwarden/update.nix b/pkgs/by-name/va/vaultwarden/update.nix similarity index 100% rename from pkgs/tools/security/vaultwarden/update.nix rename to pkgs/by-name/va/vaultwarden/update.nix diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/by-name/va/vaultwarden/webvault.nix similarity index 100% rename from pkgs/tools/security/vaultwarden/webvault.nix rename to pkgs/by-name/va/vaultwarden/webvault.nix diff --git a/pkgs/by-name/vc/vcdimager/package.nix b/pkgs/by-name/vc/vcdimager/package.nix index af77f7532c30..22cc7d2101df 100644 --- a/pkgs/by-name/vc/vcdimager/package.nix +++ b/pkgs/by-name/vc/vcdimager/package.nix @@ -7,7 +7,6 @@ libxml2, popt, libiconv, - darwin, }: stdenv.mkDerivation rec { @@ -21,19 +20,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libxml2 - popt - libiconv - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - IOKit - DiskArbitration - ] - ); + buildInputs = [ + libxml2 + popt + libiconv + ]; propagatedBuildInputs = [ libcdio ]; diff --git a/pkgs/by-name/vc/vcftools/package.nix b/pkgs/by-name/vc/vcftools/package.nix index 41924c9db0e6..edd1fa4e5a7f 100644 --- a/pkgs/by-name/vc/vcftools/package.nix +++ b/pkgs/by-name/vc/vcftools/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "vcftools"; - version = "0.1.16"; + version = "0.1.17"; src = fetchFromGitHub { repo = "vcftools"; owner = "vcftools"; rev = "v${version}"; - sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; + sha256 = "sha256-IiePgDpaL/6XOpQsOn90clB6ST7F/37sztmHrC7Ysbw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vc/vcluster/package.nix b/pkgs/by-name/vc/vcluster/package.nix index 719c3194906f..c120eaf0b4d3 100644 --- a/pkgs/by-name/vc/vcluster/package.nix +++ b/pkgs/by-name/vc/vcluster/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "loft-sh"; repo = "vcluster"; tag = "v${version}"; - hash = "sha256-m9pXPn18H4HPK7m47uKpNc0BgXV2u5TU5CFgw31AnTw="; + hash = "sha256-6aEdNfskeN4pdeg7lDprTZ5ZbjZzDLo5JyLcIHnVpmY="; }; vendorHash = null; diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index 0cdd12ae13d9..b497e3d30fad 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vcpkg-tool"; - version = "2025-03-13"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg-tool"; rev = finalAttrs.version; - hash = "sha256-tu6mN9y2lYsf71LUmRPMdZHE6VIWODOOQFs8+v0KIt8="; + hash = "sha256-4XqpYEbE7TJyfdDPomcghII3iqcoX99I2GDuSHX5q2g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index ee751ff49052..6af97a9cbf73 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2025.02.14"; + version = "2025.04.09"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-HmaP1WKl8s5eKAC32nTALFd4gbqKnzWnJn6L0/fFmqk="; + hash = "sha256-ZJu3dFsKc7L2THgGXNtBszXUbEEoM3bnLxtf5x5UPTM="; leaveDotGit = true; postFetch = '' cd "$out" diff --git a/pkgs/by-name/vc/vcsi/package.nix b/pkgs/by-name/vc/vcsi/package.nix index 3d679991385b..3717bc3d5c7c 100644 --- a/pkgs/by-name/vc/vcsi/package.nix +++ b/pkgs/by-name/vc/vcsi/package.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { ++ (with python3Packages; [ pytestCheckHook ]); - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { description = "Create video contact sheets"; diff --git a/pkgs/by-name/vd/vdrift/package.nix b/pkgs/by-name/vd/vdrift/package.nix index 0d976def8333..b4fe9e3022e4 100644 --- a/pkgs/by-name/vd/vdrift/package.nix +++ b/pkgs/by-name/vd/vdrift/package.nix @@ -10,6 +10,7 @@ SDL2, SDL2_image, libvorbis, + libX11, bullet, curl, gettext, @@ -49,6 +50,7 @@ let SDL2 SDL2_image libvorbis + libX11 bullet curl gettext diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix index 6e1e29e8e1d7..3dccadda95dd 100644 --- a/pkgs/by-name/ve/vector/package.nix +++ b/pkgs/by-name/ve/vector/package.nix @@ -25,7 +25,7 @@ let pname = "vector"; - version = "0.45.0"; + version = "0.47.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -34,11 +34,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-ixBB0rMHeeEAGbazRAXiWMZOOf4nFC8iY0qZ4fmARWk="; + hash = "sha256-09CjhSckptXbbTzBneo5aQ76YwLPSacRlsMpexsw54c="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-qEo8GYGwUWtfMT6m9TaQzneV+tglUnapjFtuxL5yudw="; + cargoHash = "sha256-9cCqdi65C4JCMP743nhrNmBlJsIFiNPGguyVEEJpGww="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix index 1a3636d3e707..2a422966a661 100644 --- a/pkgs/by-name/ve/vectorcode/package.nix +++ b/pkgs/by-name/ve/vectorcode/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + installShellFiles, versionCheckHook, lspSupport ? true, @@ -9,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "vectorcode"; - version = "0.5.3"; + version = "0.6.7"; pyproject = true; src = fetchFromGitHub { owner = "Davidyz"; repo = "VectorCode"; tag = version; - hash = "sha256-Vfo+wY51b3triiDhURlMl1iKNlYDy7eqEtT9/RVNZCM="; + hash = "sha256-BDDvALeQSBVld2gEmcnlpf3GDpdEs64nFyE6cNKpeww="; }; build-system = with python3Packages; [ @@ -27,7 +28,9 @@ python3Packages.buildPythonApplication rec { with python3Packages; [ chromadb + colorlog httpx + json5 numpy pathspec psutil @@ -61,10 +64,17 @@ python3Packages.buildPythonApplication rec { ]; }; + postInstall = '' + $out/bin/vectorcode --print-completion=bash >vectorcode.bash + $out/bin/vectorcode --print-completion=zsh >vectorcode.zsh + installShellCompletion vectorcode.{bash,zsh} + ''; + pythonImportsCheck = [ "vectorcode" ]; nativeCheckInputs = [ + installShellFiles versionCheckHook ] ++ (with python3Packages; [ @@ -78,6 +88,8 @@ python3Packages.buildPythonApplication rec { # Require internet access "test_get_embedding_function" "test_get_embedding_function_fallback" + "test_get_reranker" + "test_supported_rerankers_initialization" ]; meta = { diff --git a/pkgs/by-name/ve/vegur/package.nix b/pkgs/by-name/ve/vegur/package.nix index 316a7c4ee01c..850d274f707d 100644 --- a/pkgs/by-name/ve/vegur/package.nix +++ b/pkgs/by-name/ve/vegur/package.nix @@ -4,16 +4,14 @@ fetchzip, }: -let +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "vegur"; + version = "${finalAttrs.majorVersion}.${finalAttrs.minorVersion}"; majorVersion = "0"; minorVersion = "701"; -in -stdenvNoCC.mkDerivation { - pname = "vegur"; - version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/vegur_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/files/fonts/vegur_${finalAttrs.majorVersion}${finalAttrs.minorVersion}.zip"; hash = "sha256-sGb3mEb3g15ZiVCxEfAanly8zMUopLOOjw8W4qbXLPA="; stripRoot = false; }; @@ -27,10 +25,13 @@ stdenvNoCC.mkDerivation { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/vegur/"; + homepage = "http://dotcolon.net/fonts/vegur/"; description = "Humanist sans serif font"; platforms = platforms.all; - maintainers = with maintainers; [ minijackson ]; + maintainers = with maintainers; [ + djacu + minijackson + ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix new file mode 100644 index 000000000000..bde4286180b5 --- /dev/null +++ b/pkgs/by-name/ve/veilid/package.nix @@ -0,0 +1,70 @@ +{ + lib, + fetchFromGitLab, + rustPlatform, + protobuf, + capnproto, + cmake, + testers, + veilid, + gitUpdater, +}: + +rustPlatform.buildRustPackage rec { + pname = "veilid"; + version = "0.4.6"; + + src = fetchFromGitLab { + owner = "veilid"; + repo = pname; + rev = "v${version}"; + hash = "sha256-bKll7VB6LjkmmhN5lmjcSeP2zZbyWnl4XiZbZe3tKgg="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-505gf4P/Hlo8KFynhAQdBagzEqGXhydhTTknat/jWmk="; + + nativeBuildInputs = [ + capnproto + cmake + protobuf + ]; + + cargoBuildFlags = [ + "--workspace" + ]; + + RUSTFLAGS = "--cfg tokio_unstable"; + + doCheck = false; + + outputs = [ + "out" + "lib" + "dev" + ]; + + postInstall = '' + moveToOutput "lib" "$lib" + ''; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + veilid-version = testers.testVersion { + package = veilid; + }; + }; + }; + + meta = with lib; { + description = "Open-source, peer-to-peer, mobile-first, networked application framework"; + mainProgram = "veilid-server"; + homepage = "https://veilid.com"; + license = licenses.mpl20; + maintainers = with maintainers; [ + bbigras + qbit + ]; + }; +} diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix index f4ddd73c10a7..d84af64e7fbf 100644 --- a/pkgs/by-name/ve/velero/package.nix +++ b/pkgs/by-name/ve/velero/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "velero"; - version = "1.15.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - hash = "sha256-WClNupUW1Nd5Xnx58KYDRLz1/2kNCOR4AoAsUv78yPE="; + hash = "sha256-+gEu323/Y6BZiN22yX1oj9WmejoVSOLjBCKL0YTXI6A="; }; ldflags = [ @@ -26,7 +26,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-Q3h39o78V5Lqzols3RmSDL9d5WevMnTt4bv4qBscnGs="; + vendorHash = "sha256-+gmHQoAIfvKT3g4q7YsOVwKS/LMkmwpq9OTtCuqEd/Y="; excludedPackages = [ "issue-template-gen" diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json index c0acf0a46367..23e52dd73467 100644 --- a/pkgs/by-name/ve/velocity/deps.json +++ b/pkgs/by-name/ve/velocity/deps.json @@ -598,72 +598,102 @@ "io/netty#netty-bom/4.1.104.Final": { "pom": "sha256-WmXgahWdINO0gAYkpXDGRtvucQsrU5s0SaJoVYwonpw=" }, - "io/netty#netty-buffer/4.1.119.Final": { - "jar": "sha256-MiJiGNhUwuUdSTWn6+RmO3Lsua9NqIG4a/UY5hrtSNM=", - "pom": "sha256-ZxrAlb6wlY6qKsRVFJKWSVO3ZDD3VBbGa93g8++Qb0k=" + "io/netty#netty-buffer/4.2.0.Final": { + "jar": "sha256-wBkmAXvg2WcRhFhSomRt5L8AqSVCsC7ZFfW+5Ugi/g0=", + "pom": "sha256-bBjzQVX17TipgvzKvnFjpPtKyIJT+mXMUO2UW5wqihA=" }, - "io/netty#netty-codec-haproxy/4.1.119.Final": { - "jar": "sha256-37y7TkXFgwaVU57Z6L3+EHQKorLM0Df3xsJXny5wq/4=", - "pom": "sha256-igsZt4CSwJwqUaAhzhIyeBTtF/L77u1WjeprreJlelo=" + "io/netty#netty-codec-base/4.2.0.Final": { + "jar": "sha256-RrVqvXE66yfG9H1zo+SF6iHZbFUFQWJq0PYsoMrhGPQ=", + "pom": "sha256-NiGpDs4IdW0xajveLg3IBxhIc/j/CC92+klZeguCNbU=" }, - "io/netty#netty-codec-http/4.1.119.Final": { - "jar": "sha256-/0jbY+ROJz5neDLlLMKhziZw2nlvIq8SmovUw3hqLTQ=", - "pom": "sha256-vOiQ0Qr5A4IpExJ+naVAK73GZuDCUEOKeMkcwS4nKNA=" + "io/netty#netty-codec-compression/4.2.0.Final": { + "jar": "sha256-tl3evCEZwECx5W+bZkfs3vjc29zSAOkdY63atOsauRw=", + "pom": "sha256-cuWm+0uQbKqiQxZebFNiyuAU4OAIE+11Hb5Y0B3p+eA=" }, - "io/netty#netty-codec/4.1.119.Final": { - "jar": "sha256-xJeTSgV0RLEmqG4G8rUJGI5IymxaXhTBgqAvHoyNX9s=", - "pom": "sha256-ZJYD0FaxmxgvbbDAyUVlNHgLtLpXV8/lRAYsIiTBb44=" + "io/netty#netty-codec-haproxy/4.2.0.Final": { + "jar": "sha256-Cyah1KJ7DmzZGp6w21n71bBBmukrZdaSBGbIynWzSFo=", + "pom": "sha256-xlckSFjKcaOrz5xXjNN5eIl23x82aemjlo3U+TCggOg=" }, - "io/netty#netty-common/4.1.119.Final": { - "jar": "sha256-mRppsVlNytmSbiaOfpRTDP2qif7vQq8mkiowLT4ukhI=", - "pom": "sha256-PMa/2IxM0XguEknOg8O1TyruD8YVy32HoFU3i66XUyM=" + "io/netty#netty-codec-http/4.2.0.Final": { + "jar": "sha256-iG0GBiC164CipVNL5wpH/FFsYKvQVVcPDvNMr28dYeI=", + "pom": "sha256-rI0zA731xoXJfFQQEzLGEqbrIc2KYI3mhtjfz1TFoJs=" }, - "io/netty#netty-handler/4.1.119.Final": { - "jar": "sha256-m0m+mONrt5ogJf+1FZrsh9onIM+lRfVt45w7wQhYexs=", - "pom": "sha256-thDmZTNdjjhqUojfU4o1bv+tZCNR4ZoVgzXqDSoASUs=" + "io/netty#netty-codec-marshalling/4.2.0.Final": { + "jar": "sha256-vdBfpYoNkN4YJfHLFtUYuYNXGS3TA/f2u1QUFdCSi60=", + "pom": "sha256-7q2vroWVahx6stgVkzy22BudMpyo6O9u1ANne3Dt7hY=" }, - "io/netty#netty-parent/4.1.119.Final": { - "pom": "sha256-/zqMSVFYZZvdITF/YSVIv1jXFNswT87Gm4BJake2hgM=" + "io/netty#netty-codec-protobuf/4.2.0.Final": { + "jar": "sha256-1hkWVKT52MRAv4VqAQxb1RhuwQAMEB03dUNSAESHjmU=", + "pom": "sha256-KUWxLJErMIvF3X7Sdeaol/hsaMuDoi9adJ2HN04NKlo=" }, - "io/netty#netty-resolver/4.1.119.Final": { - "jar": "sha256-O2yfn282B0chPRVJcd7B/IhSgg3BqY0FX/CdCWdviDY=", - "pom": "sha256-NmDAaSSYZKymorltz1va46qqJv8G7zHGgy8fRbPcfXc=" + "io/netty#netty-codec/4.2.0.Final": { + "jar": "sha256-fbLwyPRKH7ZoZPPvqG0DqZigfNOB1s0Oh0YR9GSKkM0=", + "pom": "sha256-WhGKGtrJLpPpS63SMdxvMS0k2RkWEOo5O3X+1FDaYd8=" }, - "io/netty#netty-transport-classes-epoll/4.1.119.Final": { - "jar": "sha256-OO28600PPByHvI25+BLTFzQsnI6VpKBS+3lqL3itCY4=", - "pom": "sha256-b+EBjyF42dyvIbm0LVNPHT/2eLUS7Km+wORqr9KEGdU=" + "io/netty#netty-common/4.2.0.Final": { + "jar": "sha256-UjcLbBMfU2tgybHmQ+mptuf/7PeH1dNFOxaJr72JSIY=", + "pom": "sha256-PPsQLAvAFyLCB/prp3iMnGkxbssK7NpZneT/rEw1nnM=" }, - "io/netty#netty-transport-classes-kqueue/4.1.119.Final": { - "jar": "sha256-r4T3GgvN6eTKLY8ct79qbU0kmSOnms4UqG/qgYqPkPc=", - "pom": "sha256-UD3mbIm3UTYOnfZkk8ME617x8T3IdwhZZrHV4mqnMHw=" + "io/netty#netty-handler/4.2.0.Final": { + "jar": "sha256-ZBJAh4MnA68MxjSeCj442TkkrQj9X6RzB+r5qug5YdA=", + "pom": "sha256-VX4ITPkgVg6ZtVUKb8Vcy74jpTmtCURFdhVsAHmtSa8=" }, - "io/netty#netty-transport-native-epoll/4.1.119.Final": { - "jar": "sha256-lgYKW1oKODfqQmHpfPpCi9HXZFqIMsGFievNhokLXRg=", - "pom": "sha256-irxRuVvO8pFNK/HU9PpWny7DWG3qRT5wjJw0HtVe4ek=" + "io/netty#netty-parent/4.2.0.Final": { + "pom": "sha256-r7Or46M80QKlWTbO40FwE4txcozZWEY78FDKE375qxw=" }, - "io/netty#netty-transport-native-epoll/4.1.119.Final/linux-aarch_64": { - "jar": "sha256-IlrvlWIYlmLgPJK9Xls+uFGlSZ2H75ArJky5JJiLGH0=" + "io/netty#netty-resolver/4.2.0.Final": { + "jar": "sha256-ySpDpbHanOEWv3PvuyNkT+acHNM9037ZDcxXnvWt0Sg=", + "pom": "sha256-cGaHuj0B5olAF0hwSJ1Nt6R0Rj6UAv7p6QqySgnccK0=" }, - "io/netty#netty-transport-native-epoll/4.1.119.Final/linux-x86_64": { - "jar": "sha256-ElV5I6UGnnNqkwXHOoezA7qeibMto+yV3qaoVvP9Y5c=" + "io/netty#netty-transport-classes-epoll/4.2.0.Final": { + "jar": "sha256-tyKjARA3ByL1AljVtKIZcMKvHO+zgQCAwe+zFhJ8ZCg=", + "pom": "sha256-TiF2aSsdI1maf2xsSAf7tBpHbGClxldxccW9WLxvftk=" }, - "io/netty#netty-transport-native-kqueue/4.1.119.Final": { - "jar": "sha256-F0Q4piU+ddPbVQ69CGJxq5bBHU5+jaPWpyr5xrSjhac=", - "pom": "sha256-sRoWwXL4F9pvCSo64FJjKP7oNU7GH9kdmQsEqsaPlA4=" + "io/netty#netty-transport-classes-io_uring/4.2.0.Final": { + "jar": "sha256-Y1RIRQCPj9/wW4JcUOoiCWJQNMLPZfiFl/dvPKvH2O0=", + "pom": "sha256-tjAC7xoEeJ9zHMIF7voNJM5z4bZ9kX34wxvbSj4xkkM=" }, - "io/netty#netty-transport-native-kqueue/4.1.119.Final/osx-aarch_64": { - "jar": "sha256-UtgGg6dkTO9ClKcZ0oXNaJeagkMZCB4kDRScsuZcx1E=" + "io/netty#netty-transport-classes-kqueue/4.2.0.Final": { + "jar": "sha256-4PX/BxGBO+ynWQ9ST9J3oe8WXy7pxRlrq41y10LdbCE=", + "pom": "sha256-KpL37GnxRY82aAnD1M99dRR23CxIuAZxdH0JWPk4sG0=" }, - "io/netty#netty-transport-native-kqueue/4.1.119.Final/osx-x86_64": { - "jar": "sha256-vDl3sM1Wo99hxhF6jfQd/Trv7oYuPFHKDUo4wzP/SqA=" + "io/netty#netty-transport-native-epoll/4.2.0.Final": { + "jar": "sha256-VHWlUTe9NaqZ8iA6nzjqX2N08BS4jfcp7bmZ9KgYo80=", + "pom": "sha256-I0HScHWe5FI3f+gvtxRoHet1Wta4XdPnTrPSMi+HfB0=" }, - "io/netty#netty-transport-native-unix-common/4.1.119.Final": { - "jar": "sha256-iuVhj2kybm0Xt3sBQPnSdxGNvSOQbKB2OLwBNlcoxlA=", - "pom": "sha256-SqiNTykFV76vUGtoXKVeZH7LM0d2IYCID+Qiypddgko=" + "io/netty#netty-transport-native-epoll/4.2.0.Final/linux-aarch_64": { + "jar": "sha256-o9xKVsE5jbEifUQcr0Ii2xaKXT9449X7tGu6lkmkOLU=" }, - "io/netty#netty-transport/4.1.119.Final": { - "jar": "sha256-wJIeoOecO5Ntqr4Iom6SZkKkrSSVHWEV+0M2LCHf6xA=", - "pom": "sha256-emUG02VfdKWneuAMaq/ZB70qt+0gAMNesqiObuTdA70=" + "io/netty#netty-transport-native-epoll/4.2.0.Final/linux-x86_64": { + "jar": "sha256-EQc20zqQ7V3p/HSEpDuopaJ+YRz57Bzl83f6Fu3wk6I=" + }, + "io/netty#netty-transport-native-io_uring/4.2.0.Final": { + "jar": "sha256-oTzFZIYRhC4iEavTzG7QwHNqlF2OxgHE3Pa9kkPboGw=", + "pom": "sha256-f45+F28dIA4O6ojEIu8fOPIbh1kmSsTNLsY2oLVCHDk=" + }, + "io/netty#netty-transport-native-io_uring/4.2.0.Final/linux-aarch_64": { + "jar": "sha256-YavxiRa4SKO7bAO0UnUyRxVeVb4YNWtdcTtaE0TInvs=" + }, + "io/netty#netty-transport-native-io_uring/4.2.0.Final/linux-x86_64": { + "jar": "sha256-VjWAqkvFfpxORqWG90gz8LNKLL9M8z6CCIMgqodqtxY=" + }, + "io/netty#netty-transport-native-kqueue/4.2.0.Final": { + "jar": "sha256-izT+uqOG2dFXVzP28oJDgaJcslyFhpUY98VvriN1AJg=", + "pom": "sha256-sVEZGtkMTI/ScxJcB/2Z2nkYxIsW1TJ4EbeXhYd9Fr4=" + }, + "io/netty#netty-transport-native-kqueue/4.2.0.Final/osx-aarch_64": { + "jar": "sha256-B7vau9N0Ngx7tGDqF4iaNlvC9q+yKUO6u6/fdv+nSA8=" + }, + "io/netty#netty-transport-native-kqueue/4.2.0.Final/osx-x86_64": { + "jar": "sha256-sCYa4U6hX5dz4ayf8uu3oNlyF9HauW0HWVnFYEVMQw4=" + }, + "io/netty#netty-transport-native-unix-common/4.2.0.Final": { + "jar": "sha256-7qfwGHxAlNWTQbFQ1K0fxEyWOuZHcn1fM6hkR00g9VI=", + "pom": "sha256-kT7odeA5R97x91lJLS+ZNgKWAfE+6EET/zlCSd4NiSk=" + }, + "io/netty#netty-transport/4.2.0.Final": { + "jar": "sha256-LAurKGrjmt+MKikn2C5v2WTcGbPtH729TG9OIg8FKP8=", + "pom": "sha256-YNXY8UcYoSxfjYkUPjo2/7tWE72VAJLHyaol4sy+Urc=" }, "it/unimi/dsi#fastutil/8.5.15": { "jar": "sha256-z/62ZzvfHm5Dd9aE3y9VrDWc9c9t9hPgXmLe7qUAk2o=", @@ -694,24 +724,24 @@ "jar": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM=", "pom": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo=" }, - "net/kyori#adventure-api/4.19.0": { - "jar": "sha256-WYIOnHz1S59nitY/VDta9kUltZPClxu2ujw7C1nd9v8=", - "module": "sha256-8JZ+QQNS2qP8qQWTX3g8VOpwG13hGAcVVOEwiBzXfb8=", - "pom": "sha256-lV69XjpLUNJ3cR2S3LdROCb8GRBn6u7l6ctDsr/1Sws=" + "net/kyori#adventure-api/4.21.0": { + "jar": "sha256-ZKdldgQB541DOofb1M2lcBazA4U8b9Hclwh7WjqmgTM=", + "module": "sha256-+lKIKqUdj68bqml6drFHBnQUmNTKOkGg2MSrkTr6mV8=", + "pom": "sha256-dRFiV0Q3x90YtMgLxL5lBOtRCVVTL6YGhO8xU5LhQCc=" }, - "net/kyori#adventure-bom/4.19.0": { - "module": "sha256-VbTxTZkdxIaGX8zClEu4dASgS63yfUUjvvMDFcBMKrE=", - "pom": "sha256-ZUAHrgk+ph5coMKWnY2y7byiBIRCiIJqWndTrNbW4Ao=" + "net/kyori#adventure-bom/4.21.0": { + "module": "sha256-6oUg3iIrlad0iW1bqJtFbKHQs7+RZbPsyOwvLXZhKPM=", + "pom": "sha256-fpuPxF10yGMnby42w0azTt+R2UJGxGgjRxv4w1hlenQ=" }, - "net/kyori#adventure-key/4.19.0": { - "jar": "sha256-GsZBwbobRBxJZSYyjpJ2jITS13Je3ZxFFFKfL/E7DPc=", - "module": "sha256-28bDKTs1bt81Tz8eX7ZVWObG6tF1hYXaw8veopN2ph4=", - "pom": "sha256-4o2gejddhOAtTeEbFbp7TFx2KAt2zjE2e5mDsO7kP1Q=" + "net/kyori#adventure-key/4.21.0": { + "jar": "sha256-apOYydQCCJ+doGCla0XK59WMvxmTcabY7Bom2PlMxrs=", + "module": "sha256-aepciDIN/bFf/lUqRKf0G8gBQqu6Kuds6nG3g4uF4Ho=", + "pom": "sha256-BERAvYv/A9TmYDNK3F5V8/bPlLf/ddBzS4DEHjqCgJc=" }, - "net/kyori#adventure-nbt/4.19.0": { - "jar": "sha256-uB/+eVyjSBrKwMQProzG/NPjW9Viy6AeMJIL0/9hO8k=", - "module": "sha256-SvJGrxsR/JnjDOAOgF4QPmDPG5s3/7BP8Ke5prHHCuU=", - "pom": "sha256-4UQRdGf45nwVyZ4pfksjLTQEUqAOU3dasu1skQ1IcUo=" + "net/kyori#adventure-nbt/4.21.0": { + "jar": "sha256-r27AXxaClKLmiLs8UhGxI70NTXh5HiS7fxE5rZi16zU=", + "module": "sha256-AGs77o7gGbcDYQ2MfBgzRW5OQ7nhEJO5yFF6Ck0M+B0=", + "pom": "sha256-0DAw5LnLm+QZSU42YB/opYAbt0nfH4pY8Xhn4SBwRzE=" }, "net/kyori#adventure-platform-api/4.3.4": { "jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=", @@ -723,45 +753,50 @@ "module": "sha256-VYXzbUzK6MaYbW4tmAjZs5ywl28CLK8sANPP5v1HTQQ=", "pom": "sha256-wP6w6syf5B8iL5iXsS4lrDw0Ub3VYWwUhclppgBO2eE=" }, - "net/kyori#adventure-text-logger-slf4j/4.19.0": { - "jar": "sha256-rPVYdaGXso8VqtF49fD+cj92I6D+GYob0Lyp0Ri7kEM=", - "module": "sha256-h9kOx6lt2kSbwAJvw0ns9OsoeuZI5UtKwpnXV7owtZ4=", - "pom": "sha256-8Dt8W/AgOtlrs+Fik7WK41How3oJD1Bv2nIyhw+FkOc=" + "net/kyori#adventure-text-logger-slf4j/4.21.0": { + "jar": "sha256-RyStz+/740AsjoMhhGkGArN0uxZuvRfm7ACMRFxTeTU=", + "module": "sha256-5WCx5qig2rD9wE+mseKirWZ3EkMJiyolz7A76DFNxtU=", + "pom": "sha256-7V/qFBbC6VjJcntV4fEaRoDmyM52WLE8FVt7UrEKPso=" }, - "net/kyori#adventure-text-minimessage/4.19.0": { - "jar": "sha256-Ur8zHlzz4/FiPReXl3mDS2UJ/u0C9HE2fFlPK40EkAM=", - "module": "sha256-H61A67t3+hPhBu6iFgGfe7qTysos4wpNZO65pc/IB5s=", - "pom": "sha256-7XBjLxNp3dwUai1jpgvn/zmMb4WP6hJKTeQJ8flfCg8=" + "net/kyori#adventure-text-minimessage/4.21.0": { + "jar": "sha256-UctIeIUbcmM76h0bWyTo3jRhS8koroodupa2OOmk6MQ=", + "module": "sha256-c/i/PZOmL76h8kLHmSq0qLNhuml92HWZCku22tY3qCs=", + "pom": "sha256-zwtZrXXi99pqoHZ0wlrwAKD4UNXmceXSs8aKgtTeVxA=" }, - "net/kyori#adventure-text-serializer-ansi/4.19.0": { - "jar": "sha256-4FADDha8o98IqSdTKW9ZTM0DxhSoKpxVN3GzJYJc+lw=", - "module": "sha256-wz3JY/1s6c/JuSv5WqNFxkx5oooGtIZa8BNWWrHtlSc=", - "pom": "sha256-/iuvsoLfqeqW6VuGy+k7lReG3VaNBm03inrGu2JBXwQ=" + "net/kyori#adventure-text-serializer-ansi/4.21.0": { + "jar": "sha256-LwrIh56+RgbvZhviUgAzqVEo6TDK0wr1vAxpy1kSmcU=", + "module": "sha256-V+Qm8xoIWTqA1aZvxnr/Y1y9Cqh8x8RWicmTpqoGwU0=", + "pom": "sha256-+cXbfm4x6DLrME+ZtgqP8AbTZ39XZOSqH1muT0KgDUU=" }, - "net/kyori#adventure-text-serializer-gson/4.19.0": { - "jar": "sha256-Z6mZgHH1A/gWHTfXchIBND0Y6FvMHpw4cvIVSAYjMak=", - "module": "sha256-K8DaajmTCvil6OUCKtTcolbM9ONEPb6NmZudKfFscqM=", - "pom": "sha256-hl1NmguHwh7eh4rhCfebKGTVJqx+XNUqGYLhX8UA9Fs=" + "net/kyori#adventure-text-serializer-commons/4.21.0": { + "jar": "sha256-LusmYFxyOlfltj0kwt1kGCFToUhsqOnzC8ukLSB/LCo=", + "module": "sha256-2SyvdO7dl496C1Q9dH4bNGD2+incUK9KAJEXKyyYJqM=", + "pom": "sha256-iSySW39EOPgDnk93KciCbI84LICMDDTIhoOtNqEN3PI=" }, - "net/kyori#adventure-text-serializer-json-legacy-impl/4.19.0": { - "jar": "sha256-jCc+wSoy1KJPfvcutsoXgnI20HN3/Sw00a2YruGk1JY=", - "module": "sha256-iN90DyLxs420gv/D2AZvFxsef7OKwPkDaZKQpCORvEU=", - "pom": "sha256-OVVdX3z4aEOKTs49HY4RNbokZbt0G7Fsik9HSN0NLJ0=" + "net/kyori#adventure-text-serializer-gson/4.21.0": { + "jar": "sha256-ObUc+poE324dL0MdJqaX7WGWI2ls3rHAChr9NHxc4IQ=", + "module": "sha256-xSvs+73VcbpmWXy7iHfbGxeBYfCNA44zYIv9P54aD28=", + "pom": "sha256-aEx9Da6SK8h5u+4lweWm/L6vCdnbDhijb9IuUZlqWsM=" }, - "net/kyori#adventure-text-serializer-json/4.19.0": { - "jar": "sha256-Na/GB6tPCsEEcGCGWpXYDxmVDQJoztodmQrI08kLMOE=", - "module": "sha256-yFSFbtKZciyb1p/BTzDQPdkaO/XflLFz+X0VtQl9jVQ=", - "pom": "sha256-HbcQwOOhGoS4L9d00bKSIFSYK+sNHFUBFLoIB6crENk=" + "net/kyori#adventure-text-serializer-json-legacy-impl/4.21.0": { + "jar": "sha256-zMCsXIBSo1C/yrpnyk03xyFL5aH42Syq44wcrWz4v1U=", + "module": "sha256-b4OuzShhdN3x79WpDiGuHB2uI3dxU71gx5C0BM8mgAQ=", + "pom": "sha256-ix6svUQKhS+N0V5SekEvDIU+uAaJc72krT+6K+Eq/QQ=" }, - "net/kyori#adventure-text-serializer-legacy/4.19.0": { - "jar": "sha256-hCkvU4/pyPeIXBQSXzq4vAFHt5SvazT84rCMBr3xmHg=", - "module": "sha256-pLhTnhajp6wXCcolTZgc5dhYNIe88PzcFgX1S6PiksE=", - "pom": "sha256-QdzUZVpfEFN8S+rVQ6QxQM105i+Bf5q3IvTKj/dqDxo=" + "net/kyori#adventure-text-serializer-json/4.21.0": { + "jar": "sha256-kocXstx2RathZhfAvVXoCpwDWHYrWQoNPAu+MCsuVIE=", + "module": "sha256-wTimiDaAyLv+TCvGCGU/AKxhu/QGqbXYHSityPXo3Q0=", + "pom": "sha256-XAMhaDcf2h9er2XKH0YsCV/ci8qGlyxL15T9CsaVLtg=" }, - "net/kyori#adventure-text-serializer-plain/4.19.0": { - "jar": "sha256-AbCOQiGv7zyNN3NO7axhnA5k4T3Mu6uknPxkmR2WihQ=", - "module": "sha256-yP6RIud0PDNL2hziel3DKLOtOsTtPBoBu2sRORDeemw=", - "pom": "sha256-9LPEmbFsK4SEQckhiC8+qOq0h5V6u88wHWntn8YJbxc=" + "net/kyori#adventure-text-serializer-legacy/4.21.0": { + "jar": "sha256-msG5n4KEWOGQCPZ1eBoOjIUXzfoiofxbuHp79pVUw1w=", + "module": "sha256-mJvCjUI2jqtsZERpc3oocvgf+BTCp+wWGwUqHRgkQQg=", + "pom": "sha256-KpOkDYdQEqmRPf4z6W5LXIUlRwDqVDSndkjHNLDFAhk=" + }, + "net/kyori#adventure-text-serializer-plain/4.21.0": { + "jar": "sha256-Ep1piIu5P+lvUS8eWBodNvAog2G4Xo7IBP1u7LzvMS4=", + "module": "sha256-qtwvfOI85wiFn3c/Bti6y6r1fWsGfG1vtSwx40gCrt4=", + "pom": "sha256-kqv+DaajY+E0gwjXNMuwTfyZkzjKq5zqVV4/JN9WLD0=" }, "net/kyori#ansi/1.1.1": { "jar": "sha256-tsVp4aCSW57rNJ4S2zXiI3VWEH4zNmV+Cy694mHYr9c=", @@ -778,10 +813,10 @@ "module": "sha256-qfpHivwqQ0b4pb4JH14UZmhgGS3YZbHj2FkilmRsdP4=", "pom": "sha256-XuAEEIIvNukBnZR2LOAbzWA5VpdlNRvvBmCUXNT5pW4=" }, - "net/kyori#option/1.0.0": { - "jar": "sha256-K95aei1z+hFmoPFmOiLDr30naP/E/qMxd0w8D2IiXRE=", - "module": "sha256-YXzjwBN6oKMvvZDUWRTGL+OGpeFGM6PKQSmXH9fVcq8=", - "pom": "sha256-2YZ98Ipo4JPUCc9aTuHeAWJPSZJJ0Yh2SwbKQaOQ6Sk=" + "net/kyori#option/1.1.0": { + "jar": "sha256-l7abSxff4CIXyRMa00JWTLya69BMdetoljm194/UsRw=", + "module": "sha256-Ntn51ZofzGCTZ6rMqiSTGWA+Ukf2qP4RK3O6uSGscNg=", + "pom": "sha256-HzMYoc7mPoCFCWJCzwYZpEuFdva1bCORoAzF4SdYR7Y=" }, "net/minecrell#terminalconsoleappender/1.3.0": { "jar": "sha256-Gv6hvKCVBo9/RIPwYf7tlHU740Iz3bDfnsOA/BTVqYU=", @@ -1204,10 +1239,14 @@ "pom": "sha256-hHjnmqIupq95eWRD+O0w//pdxkfrPS0YYLrC4j800pc=" }, "org/jspecify#jspecify/0.3.0": { - "jar": "sha256-4cfhgytglfz8vldIVwDHMw1T1OV+LFu/nHGBmwLpeL4=", "module": "sha256-M7jCLyQkwpAyQaf+olj8QasMTWiJd2V2xRkEdWLuQ6U=", "pom": "sha256-9LGyrWHKF/KNBjxWEJ0+g5g5oQswG8lzSVQ+zu5X8xY=" }, + "org/jspecify#jspecify/1.0.0": { + "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", + "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", + "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" + }, "org/junit#junit-bom/5.10.1": { "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix index 15b0c13e0593..0440719e89f0 100644 --- a/pkgs/by-name/ve/velocity/package.nix +++ b/pkgs/by-name/ve/velocity/package.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "velocity"; - version = "3.4.0-unstable-2025-03-27"; + version = "3.4.0-unstable-2025-05-09"; src = fetchFromGitHub { owner = "PaperMC"; repo = "Velocity"; - rev = "d2cd79185b56bab1adbd45acb1caf0ea7f24d84e"; - hash = "sha256-WnXDBofr2zkkNvuFYG/6AijgzuDR/8CISafmGDXazgc="; + rev = "e13c8c340f242d270b16ec6931d1ba94a9e8f1f3"; + hash = "sha256-CJVUEwYnpXDaYgXoi1Qk0uyB/CHM3UDQzQfhtDxDKdE="; }; nativeBuildInputs = @@ -122,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { rm -rf "$tmpdir" update-source-version "$UPDATE_NIX_ATTR_PATH" "$main_version-unstable-$commit_date" --rev="$commit_hash" + $(nix-build -A velocity.mitmCache.updateScript) ''; tests.velocity = nixosTests.velocity; }; diff --git a/pkgs/by-name/ve/veloren/Cargo.lock b/pkgs/by-name/ve/veloren/Cargo.lock deleted file mode 100644 index f9c58f456565..000000000000 --- a/pkgs/by-name/ve/veloren/Cargo.lock +++ /dev/null @@ -1,8947 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ab_glyph" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" - -[[package]] -name = "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 = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "ahash" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if 1.0.0", - "getrandom 0.2.12", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "alsa" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" -dependencies = [ - "alsa-sys", - "bitflags 1.3.2", - "libc", - "nix 0.23.2", -] - -[[package]] -name = "alsa-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "ambient-authority" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b" - -[[package]] -name = "android-activity" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" -dependencies = [ - "android-properties", - "bitflags 1.3.2", - "cc", - "jni-sys", - "libc", - "log", - "ndk 0.7.0", - "ndk-context", - "ndk-sys 0.4.1+23.1.7779620", - "num_enum 0.6.1", -] - -[[package]] -name = "android-properties" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" - -[[package]] -name = "anymap2" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" - -[[package]] -name = "app_dirs2" -version = "2.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e7b35733e3a8c1ccb90385088dd5b6eaa61325cb4d1ad56e683b5224ff352e" -dependencies = [ - "jni 0.21.1", - "ndk-context", - "winapi", - "xdg", -] - -[[package]] -name = "approx" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" -dependencies = [ - "num-traits", -] - -[[package]] -name = "approx" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" -dependencies = [ - "num-traits", -] - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" - -[[package]] -name = "arr_macro" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c49336e062fa2ae8aca17a2f99c34d9c1a5d30827e8aff1cb4c294f253afe992" -dependencies = [ - "arr_macro_impl", - "proc-macro-hack", - "proc-macro-nested", -] - -[[package]] -name = "arr_macro_impl" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6368f9ae5c6ec403ca910327ae0c9437b0a85255b6950c90d497e6177f6e5e" -dependencies = [ - "proc-macro-hack", - "quote 1.0.35", - "syn 1.0.109", -] - -[[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" -dependencies = [ - "serde", -] - -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - -[[package]] -name = "ascii" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" - -[[package]] -name = "ash" -version = "0.37.3+1.3.251" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" -dependencies = [ - "libloading 0.7.4", -] - -[[package]] -name = "assets_manager" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05532e9c9a4c837c7eb0f8f1a1f9d357a168fb06dbf501d0bdfbe2fc5b0f1971" -dependencies = [ - "ab_glyph", - "ahash 0.8.11", - "bincode", - "crossbeam-channel", - "log", - "notify", - "ron", - "serde", - "serde_json", - "sync_file", - "tar", -] - -[[package]] -name = "async-channel" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" -dependencies = [ - "concurrent-queue", - "event-listener", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-trait" -version = "0.1.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", -] - -[[package]] -name = "atomic_refcell" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" - -[[package]] -name = "atomicwrites" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7b2dbe9169059af0f821e811180fddc971fc210c776c133c7819ccd6e478db" -dependencies = [ - "rustix", - "tempfile", - "windows-sys 0.52.0", -] - -[[package]] -name = "auth-common" -version = "0.1.0" -source = "git+https://gitlab.com/veloren/auth.git?rev=abb1a705827984e11706d7bb97fb7a459e1e6533#abb1a705827984e11706d7bb97fb7a459e1e6533" -dependencies = [ - "rand 0.8.5", - "serde", - "uuid", -] - -[[package]] -name = "authc" -version = "1.0.0" -source = "git+https://gitlab.com/veloren/auth.git?rev=abb1a705827984e11706d7bb97fb7a459e1e6533#abb1a705827984e11706d7bb97fb7a459e1e6533" -dependencies = [ - "auth-common", - "fxhash", - "hex", - "http", - "hyper", - "hyper-rustls", - "rust-argon2", - "serde", - "serde_json", - "uuid", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.5.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "proc-macro2 1.0.79", - "quote 1.0.35", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.53", -] - -[[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.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" -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 = "blake2b_simd" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-sys" -version = "0.1.0-beta.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" -dependencies = [ - "objc-sys", -] - -[[package]] -name = "block2" -version = "0.2.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" -dependencies = [ - "block-sys", - "objc2-encode", -] - -[[package]] -name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[package]] -name = "bytemuck" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "calloop" -version = "0.10.6" -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", -] - -[[package]] -name = "cansi" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bdcae87153686017415ce77e48c53e6818a0a058f0e21b56640d1e944967ef8" - -[[package]] -name = "cap-fs-ext" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e341d15ac1029aadce600be764a1a1edafe40e03cde23285bc1d261b3a4866" -dependencies = [ - "cap-primitives", - "cap-std", - "io-lifetimes", - "windows-sys 0.52.0", -] - -[[package]] -name = "cap-net-ext" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434168fe6533055f0f4204039abe3ff6d7db338ef46872a5fa39e9d5ad5ab7a9" -dependencies = [ - "cap-primitives", - "cap-std", - "rustix", - "smallvec", -] - -[[package]] -name = "cap-primitives" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe16767ed8eee6d3f1f00d6a7576b81c226ab917eb54b96e5f77a5216ef67abb" -dependencies = [ - "ambient-authority", - "fs-set-times", - "io-extras", - "io-lifetimes", - "ipnet", - "maybe-owned", - "rustix", - "windows-sys 0.52.0", - "winx", -] - -[[package]] -name = "cap-rand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20e5695565f0cd7106bc3c7170323597540e772bb73e0be2cd2c662a0f8fa4ca" -dependencies = [ - "ambient-authority", - "rand 0.8.5", -] - -[[package]] -name = "cap-std" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "593db20e4c51f62d3284bae7ee718849c3214f93a3b94ea1899ad85ba119d330" -dependencies = [ - "cap-primitives", - "io-extras", - "io-lifetimes", - "rustix", -] - -[[package]] -name = "cap-time-ext" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03261630f291f425430a36f38c847828265bc928f517cdd2004c56f4b02f002b" -dependencies = [ - "ambient-authority", - "cap-primitives", - "iana-time-zone", - "once_cell", - "rustix", - "winx", -] - -[[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "castaway" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" -dependencies = [ - "rustversion", -] - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "censor" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41e3b9fdbb9b3edc10dc66a06dc255822f699c432e19403fb966e6d60e0dec4" -dependencies = [ - "once_cell", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "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 = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "chrono" -version = "0.4.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.4", -] - -[[package]] -name = "chrono-tz" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" -dependencies = [ - "chrono", - "chrono-tz-build", - "phf", - "serde", -] - -[[package]] -name = "chrono-tz-build" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" -dependencies = [ - "parse-zoneinfo", - "phf", - "phf_codegen", -] - -[[package]] -name = "chumsky" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" -dependencies = [ - "hashbrown 0.14.3", - "stacker", -] - -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob", - "libc", - "libloading 0.8.3", -] - -[[package]] -name = "clap" -version = "4.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.0", -] - -[[package]] -name = "clap_derive" -version = "4.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" -dependencies = [ - "heck 0.5.0", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "clipboard-win" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342" -dependencies = [ - "lazy-bytes-cast", - "winapi", -] - -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code 2.3.1", - "str-buf", - "winapi", -] - -[[package]] -name = "clipboard-win" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" -dependencies = [ - "error-code 3.2.0", -] - -[[package]] -name = "clipboard_macos" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" -dependencies = [ - "objc", - "objc-foundation", - "objc_id", -] - -[[package]] -name = "clipboard_wayland" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747" -dependencies = [ - "smithay-clipboard", -] - -[[package]] -name = "clipboard_x11" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4274ea815e013e0f9f04a2633423e14194e408a0576c943ce3d14ca56c50031c" -dependencies = [ - "thiserror", - "x11rb 0.13.0", -] - -[[package]] -name = "cmake" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" -dependencies = [ - "cc", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "com-rs" -version = "0.2.1" -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 = "compact_str" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" -dependencies = [ - "castaway", - "cfg-if 1.0.0", - "itoa", - "ryu", - "static_assertions", -] - -[[package]] -name = "concurrent-queue" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" -dependencies = [ - "crossbeam-utils 0.8.19", -] - -[[package]] -name = "conrod_core" -version = "0.63.0" -source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#59fddc617696e68d28a75c2137a08c2572efb986" -dependencies = [ - "conrod_derive", - "copypasta", - "daggy", - "fnv", - "instant", - "num 0.2.1", - "pistoncore-input", - "rusttype 0.7.9", -] - -[[package]] -name = "conrod_derive" -version = "0.63.0" -source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#59fddc617696e68d28a75c2137a08c2572efb986" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "conrod_winit" -version = "0.63.0" -source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#59fddc617696e68d28a75c2137a08c2572efb986" - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.52.0", -] - -[[package]] -name = "constant_time_eq" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - -[[package]] -name = "copypasta" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133fc8675ee3a4ec9aa513584deda9aa0faeda3586b87f7f0f2ba082c66fb172" -dependencies = [ - "clipboard-win 3.1.1", - "objc", - "objc-foundation", - "objc_id", - "smithay-clipboard", - "x11-clipboard", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "coreaudio-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" -dependencies = [ - "bitflags 1.3.2", - "coreaudio-sys", -] - -[[package]] -name = "coreaudio-sys" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" -dependencies = [ - "bindgen", -] - -[[package]] -name = "cpal" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" -dependencies = [ - "alsa", - "core-foundation-sys", - "coreaudio-rs", - "jni 0.19.0", - "js-sys", - "lazy_static", - "libc", - "mach", - "ndk 0.6.0", - "ndk-glue", - "nix 0.23.2", - "oboe", - "parking_lot 0.11.2", - "stdweb", - "thiserror", - "web-sys", - "winapi", -] - -[[package]] -name = "cpp_demangle" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "cranelift-bforest" -version = "0.104.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ffa62b81e6d1b987933240ed7de5d4d85ae2e07153e3f9b74fc27ecfd81d2c" -dependencies = [ - "cranelift-entity", -] - -[[package]] -name = "cranelift-codegen" -version = "0.104.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af519738eb5d96c0d48b04845c88d0412a40167b5c42884e090fe9e015842ff" -dependencies = [ - "bumpalo", - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-control", - "cranelift-entity", - "cranelift-isle", - "gimli", - "hashbrown 0.14.3", - "log", - "regalloc2", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-codegen-meta" -version = "0.104.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba2da643fa5ccaf53cbb8db6acf3372321e2e13507d62c7c565529dd6f2d0ea0" -dependencies = [ - "cranelift-codegen-shared", -] - -[[package]] -name = "cranelift-codegen-shared" -version = "0.104.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3745d6c656649940d3f42d263b8ba00805e9bf1203205a0d98a7517a2fe5a35" - -[[package]] -name = "cranelift-control" -version = "0.104.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a521e2d0b427fe026457b70ba1896d9d560af72a47982db19fef11aa0ee789" -dependencies = [ - "arbitrary", -] - -[[package]] -name = "cranelift-entity" -version = "0.104.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a6b8d80c6235fd73c0e9218d89f498b398fb0c52d4b30abd9a388da613f71f" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "cranelift-frontend" -version = "0.104.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d555819f3a49c01826ce5bf0f3e52a4e17be9c4ee09381d6a1d88549793f3c" -dependencies = [ - "cranelift-codegen", - "log", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-isle" -version = "0.104.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53aeebed3b78faea701062d4e384bffe91aef33e47d949bad10e5c540a00916d" - -[[package]] -name = "cranelift-native" -version = "0.104.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc99479323e678deac40abffec0ca7a52cc6c549c0fa351b2d3a76655202a5a7" -dependencies = [ - "cranelift-codegen", - "libc", - "target-lexicon", -] - -[[package]] -name = "cranelift-wasm" -version = "0.104.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab055df5f977a3fee2837cd447b899d98a5e72374341461535b758608f25175" -dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "itertools 0.10.5", - "log", - "smallvec", - "wasmparser 0.118.2", - "wasmtime-types", -] - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot", - "futures", - "is-terminal", - "itertools 0.10.5", - "num-traits", - "once_cell", - "oorandom", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "tokio", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[package]] -name = "critical-section" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils 0.8.19", -] - -[[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", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch 0.9.18", - "crossbeam-utils 0.8.19", -] - -[[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", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils 0.8.19", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils 0.8.19", -] - -[[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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.5.0", - "crossterm_winapi", - "libc", - "mio", - "parking_lot 0.12.1", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] -name = "culpa" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae0bfe9317b1cb4ff5a56d766ee4b157b3e1f47f11979253570e88d10fd1fd3" -dependencies = [ - "culpa-macros", -] - -[[package]] -name = "culpa-macros" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "d3d12" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" -dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", - "winapi", -] - -[[package]] -name = "daggy" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2" -dependencies = [ - "petgraph 0.4.13", -] - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - -[[package]] -name = "darling" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" -dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.79", - "quote 1.0.35", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[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 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" -dependencies = [ - "darling_core 0.20.8", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "uuid", -] - -[[package]] -name = "deflate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" -dependencies = [ - "adler32", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "deunicode" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "directories-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -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" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "discord-sdk" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc3d7a4f9bc39006b732a01d63b34ff1518313313d707cb18cf6187d2124f7f4" -dependencies = [ - "anyhow", - "app_dirs2", - "async-trait", - "bitflags 2.5.0", - "crossbeam-channel", - "data-encoding", - "num-traits", - "parking_lot 0.12.1", - "serde", - "serde_json", - "serde_repr", - "thiserror", - "time", - "tokio", - "tracing", - "url", - "winreg 0.52.0", -] - -[[package]] -name = "dispatch" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e93ca78226c51902d7aa8c12c988338aadd9e85ed9c6be8aaac39192ff3605" - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.3", -] - -[[package]] -name = "dot_vox" -version = "5.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd05cab02d6074145c6f92ddf1b57357e4bc1424f87c790c044de62bdc94c13a" -dependencies = [ - "ahash 0.8.11", - "lazy_static", - "log", - "nom", -] - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "drop_guard" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4a817d8b683f6e649aed359aab0c47a875377516bb5791d0f7e46d9066d209" - -[[package]] -name = "ecolor" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "egui" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" -dependencies = [ - "ahash 0.8.11", - "epaint", - "nohash-hasher", -] - -[[package]] -name = "egui_plot" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f33a00fe8eb1ba56535b3dbacdecc7a1365a328908a97c5f3c81bb466be72b" -dependencies = [ - "egui", -] - -[[package]] -name = "egui_wgpu_backend" -version = "0.26.0" -source = "git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=34691d4e9149deb9cd0bb8cbb5a56bffebf47588#34691d4e9149deb9cd0bb8cbb5a56bffebf47588" -dependencies = [ - "bytemuck", - "egui", - "wgpu", -] - -[[package]] -name = "egui_winit_platform" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff2b0729f7c0ae1d7fb4a95aa4c3432d1a1d03476b22b2946247504a012cea4" -dependencies = [ - "egui", - "winit", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "emath" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "enum-as-inner" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" -dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "enum-map" -version = "2.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" -dependencies = [ - "enum-map-derive", - "serde", -] - -[[package]] -name = "enum-map-derive" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "enumset" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" -dependencies = [ - "enumset_derive", -] - -[[package]] -name = "enumset_derive" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" -dependencies = [ - "darling 0.20.8", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "epaint" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" -dependencies = [ - "ab_glyph", - "ahash 0.8.11", - "bytemuck", - "ecolor", - "emath", - "nohash-hasher", - "parking_lot 0.12.1", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "error-code" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "euc" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0947d06646d28a4ac2862ac5eadc1062704d61ee398b3baba8b4a21e2f1ef5ed" -dependencies = [ - "vek 0.14.1", -] - -[[package]] -name = "euclid" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" -dependencies = [ - "num-traits", -] - -[[package]] -name = "event-listener" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" -dependencies = [ - "event-listener", - "pin-project-lite", -] - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "fd-lock" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" -dependencies = [ - "cfg-if 1.0.0", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "find_folder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b" - -[[package]] -name = "fixedbitset" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "fluent" -version = "0.16.0" -source = "git+https://github.com/juliancoffee/fluent-rs.git?branch=patched#929cf9512de121cce9b4cbf1cb860cd3294a1cd9" -dependencies = [ - "fluent-bundle", - "unic-langid", -] - -[[package]] -name = "fluent-bundle" -version = "0.15.2" -source = "git+https://github.com/juliancoffee/fluent-rs.git?branch=patched#929cf9512de121cce9b4cbf1cb860cd3294a1cd9" -dependencies = [ - "fluent-langneg", - "fluent-syntax", - "intl-memoizer", - "intl_pluralrules", - "rustc-hash", - "self_cell 0.10.3", - "smallvec", - "unic-langid", -] - -[[package]] -name = "fluent-langneg" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" -dependencies = [ - "unic-langid", -] - -[[package]] -name = "fluent-syntax" -version = "0.11.0" -source = "git+https://github.com/juliancoffee/fluent-rs.git?branch=patched#929cf9512de121cce9b4cbf1cb860cd3294a1cd9" -dependencies = [ - "thiserror", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -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 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs-set-times" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb" -dependencies = [ - "io-lifetimes", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", - "num_cpus", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "fxprof-processed-profile" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" -dependencies = [ - "bitflags 2.5.0", - "debugid", - "fxhash", - "serde", - "serde_json", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gilrs" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "499067aa54af19f88732dc418f61f23d5912de1518665bb0eca034ca0d07574c" -dependencies = [ - "fnv", - "gilrs-core", - "log", - "serde", - "uuid", - "vec_map", -] - -[[package]] -name = "gilrs-core" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c132270a155f2548e67d66e731075c336c39098afc555752f3df8f882c720e" -dependencies = [ - "core-foundation", - "inotify 0.10.2", - "io-kit-sys", - "js-sys", - "libc", - "libudev-sys", - "log", - "nix 0.28.0", - "serde", - "uuid", - "vec_map", - "wasm-bindgen", - "web-sys", - "windows 0.54.0", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -dependencies = [ - "fallible-iterator", - "indexmap", - "stable_deref_trait", -] - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "glam" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579160312273c954cc51bd440f059dde741029ac8daf8c84fece76cb77f62c15" -dependencies = [ - "version_check", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "glow" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "glyph_brush" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3676f482c536a985fca36ce320a5e5b8fafd7b260806742af1963b71c5dc38c" -dependencies = [ - "glyph_brush_draw_cache", - "glyph_brush_layout", - "ordered-float 4.2.0", - "rustc-hash", - "twox-hash", -] - -[[package]] -name = "glyph_brush_draw_cache" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610" -dependencies = [ - "ab_glyph", - "crossbeam-channel", - "crossbeam-deque 0.8.5", - "linked-hash-map", - "rayon", - "rustc-hash", -] - -[[package]] -name = "glyph_brush_layout" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38" -dependencies = [ - "ab_glyph", - "approx 0.5.1", - "xi-unicode", -] - -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.5.0", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "gpu-allocator" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" -dependencies = [ - "backtrace", - "log", - "presser", - "thiserror", - "winapi", - "windows 0.51.1", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" -dependencies = [ - "bitflags 2.5.0", - "gpu-descriptor-types", - "hashbrown 0.14.3", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "guillotiere" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[package]] -name = "h2" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" -dependencies = [ - "cfg-if 1.0.0", - "crunchy", -] - -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -dependencies = [ - "ahash 0.4.8", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.11", - "rayon", - "serde", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash 0.8.11", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.3", -] - -[[package]] -name = "hassle-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" -dependencies = [ - "bitflags 1.3.2", - "com-rs", - "libc", - "libloading 0.7.4", - "thiserror", - "widestring", - "winapi", -] - -[[package]] -name = "heapless" -version = "0.7.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version 0.4.0", - "spin 0.9.8", - "stable_deref_trait", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "hibitset" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ede5cfa60c958e60330d65163adbc4211e15a2653ad80eb0cce878de120121" -dependencies = [ - "rayon", -] - -[[package]] -name = "hickory-proto" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" -dependencies = [ - "async-trait", - "cfg-if 1.0.0", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand 0.8.5", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "hickory-resolver" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" -dependencies = [ - "cfg-if 1.0.0", - "futures-util", - "hickory-proto", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot 0.12.1", - "rand 0.8.5", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http", - "hyper", - "log", - "rustls", - "rustls-native-certs", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[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 = "iced_core" -version = "0.4.0" -source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa" - -[[package]] -name = "iced_futures" -version = "0.3.0" -source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa" -dependencies = [ - "futures", - "log", - "wasm-bindgen-futures", -] - -[[package]] -name = "iced_graphics" -version = "0.2.0" -source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa" -dependencies = [ - "bytemuck", - "glam", - "iced_native", - "iced_style", - "raw-window-handle 0.5.2", - "thiserror", -] - -[[package]] -name = "iced_native" -version = "0.4.0" -source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa" -dependencies = [ - "iced_core", - "iced_futures", - "num-traits", - "twox-hash", - "unicode-segmentation", -] - -[[package]] -name = "iced_style" -version = "0.3.0" -source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa" -dependencies = [ - "iced_core", -] - -[[package]] -name = "iced_winit" -version = "0.3.0" -source = "git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28#47243c257c8b8dd6c506b060804cb00b618aa0aa" -dependencies = [ - "iced_futures", - "iced_graphics", - "iced_native", - "log", - "thiserror", - "winapi", - "window_clipboard", - "winit", -] - -[[package]] -name = "id-arena" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "jpeg-decoder", - "num-traits", - "png", -] - -[[package]] -name = "indexmap" -version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", - "rayon", - "serde", -] - -[[package]] -name = "indicatif" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "indoc" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" - -[[package]] -name = "inline_tweak" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6acddbefae08bfba73e27f55513f491f35c365d84bf3002bf85ba9b916c5e5f" -dependencies = [ - "lazy_static", - "rustc-hash", -] - -[[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" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" -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 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "intl-memoizer" -version = "0.5.1" -source = "git+https://github.com/juliancoffee/fluent-rs.git?branch=patched#929cf9512de121cce9b4cbf1cb860cd3294a1cd9" -dependencies = [ - "type-map", - "unic-langid", -] - -[[package]] -name = "intl_pluralrules" -version = "7.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" -dependencies = [ - "unic-langid", -] - -[[package]] -name = "io-extras" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c301e73fb90e8a29e600a9f402d095765f74310d582916a952f618836a1bd1ed" -dependencies = [ - "io-lifetimes", - "windows-sys 0.52.0", -] - -[[package]] -name = "io-kit-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" -dependencies = [ - "core-foundation-sys", - "mach2", -] - -[[package]] -name = "io-lifetimes" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" - -[[package]] -name = "ipconfig" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" -dependencies = [ - "socket2", - "widestring", - "windows-sys 0.48.0", - "winreg 0.50.0", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "ittapi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b996fe614c41395cdaedf3cf408a9534851090959d90d54a535f675550b64b1" -dependencies = [ - "anyhow", - "ittapi-sys", - "log", -] - -[[package]] -name = "ittapi-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc" -dependencies = [ - "cc", -] - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if 1.0.0", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "keyboard-keynames" -version = "0.1.2" -source = "git+https://gitlab.com/Imbris/keyboard-keynames.git?tag=veloren-winit-0.28#fca4bbdfa51bf054b155a455935b3792975c989d" -dependencies = [ - "wayland-client", - "winapi", - "winit", - "xcb", - "xkbcommon", -] - -[[package]] -name = "khronos-egl" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" -dependencies = [ - "libc", - "libloading 0.8.3", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "kiddo" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ced2e69cfc5f22f86ccc9ce4ecff9f19917f3083a4bac0f402bdab034d73f1" -dependencies = [ - "num-traits", -] - -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "lazy-bytes-cast" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - -[[package]] -name = "levenshtein" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" - -[[package]] -name = "lewton" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" -dependencies = [ - "byteorder", - "ogg", - "tinyvec", -] - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if 1.0.0", - "windows-targets 0.52.4", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.5.0", - "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.5.0", - "libc", - "redox_syscall 0.4.1", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if 1.0.0", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "lru" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown 0.14.3", -] - -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "lz-fear" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a280471e5ff9dda51cf34863c338ffde7df78139210f9c819943b29cdb091d" -dependencies = [ - "bitflags 2.5.0", - "byteorder", - "culpa", - "thiserror", - "twox-hash", -] - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - -[[package]] -name = "macro_rules_attribute" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0c9b980bf4f3a37fd7b1c066941dd1b1d0152ce6ee6e8fe8c49b9f6810d862" -dependencies = [ - "macro_rules_attribute-proc_macro", - "paste", -] - -[[package]] -name = "macro_rules_attribute-proc_macro" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58093314a45e00c77d5c508f76e77c3396afbbc0d01506e7fae47b018bac2b1d" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "maybe-owned" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" - -[[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.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memfd" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" -dependencies = [ - "rustix", -] - -[[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.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" -dependencies = [ - "libc", -] - -[[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" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" -dependencies = [ - "bitflags 2.5.0", - "block", - "core-graphics-types", - "foreign-types 0.5.0", - "log", - "objc", - "paste", -] - -[[package]] -name = "mimalloc" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minifb" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05eddefadb505d3dcb66a89fa77dd0936e72ec84e891cc8fc36e3c05bfe61103" -dependencies = [ - "cc", - "dlib", - "futures", - "instant", - "js-sys", - "lazy_static", - "libc", - "orbclient", - "raw-window-handle 0.4.3", - "serde", - "serde_derive", - "tempfile", - "wasm-bindgen-futures", - "wayland-client", - "wayland-cursor", - "wayland-protocols", - "winapi", - "x11-dl", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "mumble-link" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f4c53745d4e7afd0faaf6ee46c0c3114d4b7d0db63bef96917751906453285" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "naga" -version = "0.14.2" -source = "git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1#df527ef82e2eba827eda9278caa583506a06aa87" -dependencies = [ - "bit-set", - "bitflags 2.5.0", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "petgraph 0.6.4", - "pp-rs", - "rustc-hash", - "serde", - "spirv", - "termcolor", - "thiserror", - "unicode-xid 0.2.4", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom 0.2.12", -] - -[[package]] -name = "native-dialog" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bbf55edb2747e4e4b3a9cd3989194b88aae32274b4422635dcf98aa6e84197b" -dependencies = [ - "ascii", - "block", - "cocoa", - "dirs-next", - "objc", - "objc-foundation", - "objc_id", - "once_cell", - "raw-window-handle 0.4.3", - "thiserror", - "wfd", - "which", - "winapi", -] - -[[package]] -name = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys 0.3.0", - "num_enum 0.5.11", - "thiserror", -] - -[[package]] -name = "ndk" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys 0.4.1+23.1.7779620", - "num_enum 0.5.11", - "raw-window-handle 0.5.2", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-glue" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk 0.6.0", - "ndk-context", - "ndk-macro", - "ndk-sys 0.3.0", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling 0.13.4", - "proc-macro-crate", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "ndk-sys" -version = "0.4.1+23.1.7779620" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.5.0", - "cfg-if 1.0.0", - "cfg_aliases", - "libc", -] - -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - -[[package]] -name = "noise" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82051dd6745d5184c6efb7bc8be14892a7f6d4f3ad6dbf754d1c7d7d5fe24b43" -dependencies = [ - "rand 0.7.3", - "rand_xorshift", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.5.0", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify 0.9.6", - "kqueue", - "libc", - "log", - "mio", - "walkdir", - "windows-sys 0.48.0", -] - -[[package]] -name = "nougat" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b57b9ced431322f054fc673f1d3c7fa52d80efd9df74ad2fc759f044742510" -dependencies = [ - "macro_rules_attribute", - "nougat-proc_macros", -] - -[[package]] -name = "nougat-proc_macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84f77a45e99a2f9b492695d99e1c23844619caa5f3e57647cffacad773ca257" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" -dependencies = [ - "num-bigint 0.2.6", - "num-complex 0.2.4", - "num-integer", - "num-iter", - "num-rational 0.2.4", - "num-traits", -] - -[[package]] -name = "num" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" -dependencies = [ - "num-bigint 0.4.4", - "num-complex 0.4.5", - "num-integer", - "num-iter", - "num-rational 0.4.1", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-bigint 0.2.6", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint 0.4.4", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc-sys" -version = "0.2.0-beta.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" - -[[package]] -name = "objc2" -version = "0.3.0-beta.3.patch-leaks.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" -dependencies = [ - "block2", - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2-encode" -version = "2.0.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" -dependencies = [ - "objc-sys", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "crc32fast", - "hashbrown 0.14.3", - "indexmap", - "memchr", -] - -[[package]] -name = "oboe" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" -dependencies = [ - "jni 0.19.0", - "ndk 0.6.0", - "ndk-context", - "num-derive 0.3.3", - "num-traits", - "oboe-sys", -] - -[[package]] -name = "oboe-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" -dependencies = [ - "cc", -] - -[[package]] -name = "ogg" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" -dependencies = [ - "byteorder", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "orbclient" -version = "0.3.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" -dependencies = [ - "libc", - "libredox 0.0.2", - "sdl2", - "sdl2-sys", -] - -[[package]] -name = "ordered-float" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ordered-float" -version = "3.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ordered-float" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" -dependencies = [ - "num-traits", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "owned_ttf_parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" -dependencies = [ - "ttf-parser", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "parse-zoneinfo" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" -dependencies = [ - "regex", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pem" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" -dependencies = [ - "base64", - "serde", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" -dependencies = [ - "fixedbitset 0.1.9", -] - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset 0.4.2", - "indexmap", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand 0.8.5", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[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 = "piston-float" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199" - -[[package]] -name = "piston-viewport" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d96dd995f7dabe6d57cda668ec0fda39d6fe6e1e0b23f772582f383f2013611" -dependencies = [ - "piston-float", -] - -[[package]] -name = "pistoncore-input" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c612ce242c7bac8e96426a0ca34275fd980af440f0cca7c6c0e840ef8a4052f" -dependencies = [ - "bitflags 1.3.2", - "piston-viewport", - "serde", - "serde_derive", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[package]] -name = "portpicker" -version = "0.1.0" -source = "git+https://github.com/xMAC94x/portpicker-rs?rev=df6b37872f3586ac3b21d08b56c8ec7cd92fb172#df6b37872f3586ac3b21d08b56c8ec7cd92fb172" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "pp-rs" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" -dependencies = [ - "unicode-xid 0.2.4", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" -dependencies = [ - "profiling-procmacros", - "tracy-client", -] - -[[package]] -name = "profiling-procmacros" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" -dependencies = [ - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "prometheus" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" -dependencies = [ - "cfg-if 1.0.0", - "fnv", - "lazy_static", - "memchr", - "parking_lot 0.12.1", - "thiserror", -] - -[[package]] -name = "prometheus-hyper" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fc98d5705a20b11f8b240c0857167b79852ba469f9faec6df0027e576e676e" -dependencies = [ - "hyper", - "prometheus", - "tokio", - "tracing", -] - -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", -] - -[[package]] -name = "quinn" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring 0.16.20", - "rustc-hash", - "rustls", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" -dependencies = [ - "bytes", - "libc", - "socket2", - "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2 1.0.79", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.12", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_xorshift" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - -[[package]] -name = "ratatui" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb12f8fbf6c62614b0d56eb352af54f6a22410c3b079eb53ee93c7b97dd31d8" -dependencies = [ - "bitflags 2.5.0", - "cassowary", - "compact_str", - "crossterm", - "indoc", - "itertools 0.12.1", - "lru", - "paste", - "stability", - "strum 0.26.2", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "rayon" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque 0.8.5", - "crossbeam-utils 0.8.19", -] - -[[package]] -name = "rcgen" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1" -dependencies = [ - "pem", - "ring 0.17.8", - "time", - "yasna", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom 0.2.12", - "libredox 0.0.1", - "thiserror", -] - -[[package]] -name = "refinery" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2783724569d96af53464d0711dff635cab7a4934df5e22e9fbc9e181523b83e" -dependencies = [ - "refinery-core", - "refinery-macros", -] - -[[package]] -name = "refinery-core" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d6c80329c0455510a8d42fce286ecb4b6bcd8c57e1816d9f2d6bd7379c2cc8" -dependencies = [ - "async-trait", - "cfg-if 1.0.0", - "log", - "regex", - "rusqlite", - "serde", - "siphasher 1.0.1", - "thiserror", - "time", - "toml 0.8.12", - "url", - "walkdir", -] - -[[package]] -name = "refinery-macros" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab6e31e166a49d55cb09b62639e5ab9ba2e73f2f124336b06f6c321dc602779" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "refinery-core", - "regex", - "syn 2.0.53", -] - -[[package]] -name = "regalloc2" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" -dependencies = [ - "hashbrown 0.13.2", - "log", - "rustc-hash", - "slice-group-by", - "smallvec", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "renderdoc-sys" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" - -[[package]] -name = "resolv-conf" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" -dependencies = [ - "hostname", - "quick-error", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if 1.0.0", - "getrandom 0.2.12", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.52.0", -] - -[[package]] -name = "rmp" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "rodio" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e" -dependencies = [ - "cpal", - "lewton", -] - -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64", - "bitflags 2.5.0", - "serde", - "serde_derive", -] - -[[package]] -name = "roots" -version = "0.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "082f11ffa03bbef6c2c6ea6bea1acafaade2fd9050ae0234ab44a2153742b058" - -[[package]] -name = "roxmltree" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b" -dependencies = [ - "xmlparser", -] - -[[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 = "rusqlite" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" -dependencies = [ - "bitflags 2.5.0", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rust-argon2" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", -] - -[[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.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.22", -] - -[[package]] -name = "rustix" -version = "0.38.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" -dependencies = [ - "bitflags 2.5.0", - "errno", - "itoa", - "libc", - "linux-raw-sys", - "once_cell", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "rusttype" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5" -dependencies = [ - "rusttype 0.8.3", -] - -[[package]] -name = "rusttype" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0" -dependencies = [ - "approx 0.3.2", - "crossbeam-deque 0.7.4", - "crossbeam-utils 0.7.2", - "linked-hash-map", - "num_cpus", - "ordered-float 1.1.1", - "rustc-hash", - "stb_truetype", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rustyline" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" -dependencies = [ - "bitflags 2.5.0", - "cfg-if 1.0.0", - "clipboard-win 5.3.0", - "fd-lock", - "home", - "libc", - "log", - "memchr", - "nix 0.28.0", - "radix_trie", - "unicode-segmentation", - "unicode-width", - "utf8parse", - "windows-sys 0.52.0", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "schnellru" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" -dependencies = [ - "ahash 0.8.11", - "cfg-if 1.0.0", - "hashbrown 0.13.2", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "sctk-adwaita" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09" -dependencies = [ - "ab_glyph", - "log", - "memmap2 0.5.10", - "smithay-client-toolkit", - "tiny-skia", -] - -[[package]] -name = "sdl2" -version = "0.35.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7959277b623f1fb9e04aea73686c3ca52f01b2145f8ea16f4ff30d8b7623b1a" -dependencies = [ - "bitflags 1.3.2", - "lazy_static", - "libc", - "sdl2-sys", -] - -[[package]] -name = "sdl2-sys" -version = "0.35.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3586be2cf6c0a8099a79a12b4084357aa9b3e0b0d7980e3b67aaf7a9d55f9f0" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "version-compare", -] - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "self_cell" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" -dependencies = [ - "self_cell 1.0.3", -] - -[[package]] -name = "self_cell" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" - -[[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" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "serde_json" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "shaderc" -version = "0.8.0" -source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9" -dependencies = [ - "libc", - "shaderc-sys", -] - -[[package]] -name = "shaderc-sys" -version = "0.8.0" -source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9" -dependencies = [ - "cmake", - "libc", - "roxmltree", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "shellexpand" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" -dependencies = [ - "dirs 4.0.0", -] - -[[package]] -name = "shellexpand" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" -dependencies = [ - "dirs 5.0.1", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "shred" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "656294f5bdcf6d33f0cf89e88a72b58595e3fca0e77e4a4b9e9026179757fb1e" -dependencies = [ - "ahash 0.8.11", - "arrayvec", - "atomic_refcell", - "rayon", - "shred-derive", - "smallvec", - "tynm", -] - -[[package]] -name = "shred-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69760b786f8b40361c10663eb63c81fa7d828008527d26aa7595b99c53ab3a8d" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "shrev" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ea33232fdcf1bf691ca33450e5a94dde13e1a8cbb8caabc5e4f9d761e10b1a" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slice-group-by" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" - -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "serde", - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "smithay-client-toolkit" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" -dependencies = [ - "bitflags 1.3.2", - "calloop", - "dlib", - "lazy_static", - "log", - "memmap2 0.5.10", - "nix 0.24.3", - "pkg-config", - "wayland-client", - "wayland-cursor", - "wayland-protocols", -] - -[[package]] -name = "smithay-clipboard" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" -dependencies = [ - "smithay-client-toolkit", - "wayland-client", -] - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "specs" -version = "0.20.0" -source = "git+https://github.com/amethyst/specs.git?rev=4e2da1df29ee840baa9b936593c45592b7c9ae27#4e2da1df29ee840baa9b936593c45592b7c9ae27" -dependencies = [ - "ahash 0.8.11", - "crossbeam-queue", - "hibitset", - "log", - "nougat", - "rayon", - "serde", - "shred", - "shrev", - "specs-derive", - "tuple_utils", -] - -[[package]] -name = "specs-derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e23e09360f3d2190fec4222cd9e19d3158d5da948c0d1ea362df617dd103511" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spin_sleep" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a978649eaf70006b082e79c832bd72556ac1393eaf564d686e919dca2347f" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "spirv" -version = "0.2.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" -dependencies = [ - "bitflags 1.3.2", - "num-traits", -] - -[[package]] -name = "sptr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" - -[[package]] -name = "stability" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" -dependencies = [ - "quote 1.0.35", - "syn 1.0.109", -] - -[[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 1.0.0", - "libc", - "psm", - "winapi", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stb_truetype" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51" -dependencies = [ - "byteorder", -] - -[[package]] -name = "stdweb" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strsim" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros 0.24.3", -] - -[[package]] -name = "strum" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" -dependencies = [ - "strum_macros 0.26.2", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.79", - "quote 1.0.35", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "strum_macros" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" -dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.79", - "quote 1.0.35", - "rustversion", - "syn 2.0.53", -] - -[[package]] -name = "sum_type" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15" - -[[package]] -name = "svg_fmt" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "unicode-ident", -] - -[[package]] -name = "sync_file" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a49b72df45d9c2d5fbb13b02c97437a3175d8c9860297297597d3ed715e0f046" -dependencies = [ - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "system-interface" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0682e006dd35771e392a6623ac180999a9a854b1d4a6c12fb2e804941c2b1f58" -dependencies = [ - "bitflags 2.5.0", - "cap-fs-ext", - "cap-std", - "fd-lock", - "io-lifetimes", - "rustix", - "windows-sys 0.52.0", - "winx", -] - -[[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 = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef89ece63debf11bc32d1ed8d078ac870cbeb44da02afb02a9ff135ae7ca0582" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "timer-queue" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13756c29c43d836ff576221498bf4916b0d2f7ea24cd47d3531b70dc4341f038" -dependencies = [ - "slab", -] - -[[package]] -name = "tiny-skia" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if 1.0.0", - "png", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tinystr" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" -dependencies = [ - "displaydoc", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.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.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.8", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.5", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-appender" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" -dependencies = [ - "crossbeam-channel", - "thiserror", - "time", - "tracing-subscriber", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "time", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tracing-tracy" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e" -dependencies = [ - "tracing-core", - "tracing-subscriber", - "tracy-client", -] - -[[package]] -name = "tracy-client" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608" -dependencies = [ - "loom", - "once_cell", - "tracy-client-sys", -] - -[[package]] -name = "tracy-client-sys" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb915ea3af048554640d76dd6f1492589a6401a41a30d789b983c1ec280455a" -dependencies = [ - "cc", -] - -[[package]] -name = "treeculler" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82449b48a3494420dd1b11081f198c542f795a036246da4a9c5845b7d7427226" -dependencies = [ - "num-traits", - "vek 0.14.1", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ttf-parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "tuple_utils" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cffaaf9392ef73cd30828797152476aaa2fa37a17856934fa63d4843f34290e9" - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if 1.0.0", - "rand 0.8.5", - "static_assertions", -] - -[[package]] -name = "tynm" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd30d05e69d1478e13fe3e7a853409cfec82cebc2cf9b8d613b3c6b0081781ed" -dependencies = [ - "nom", -] - -[[package]] -name = "type-map" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" -dependencies = [ - "rustc-hash", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unic-langid" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" -dependencies = [ - "unic-langid-impl", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" -dependencies = [ - "tinystr", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna 0.5.0", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" -dependencies = [ - "getrandom 0.2.12", - "serde", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "vek" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d6626f32b226e2c5b35f23ea87eaf683f3d93eaeb16b4084d0683479616f0f" -dependencies = [ - "approx 0.4.0", - "num-integer", - "num-traits", - "rustc_version 0.2.3", - "serde", - "static_assertions", -] - -[[package]] -name = "vek" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb40015035f83ba23d647e647f8be060d0f6f99b7c7687989fbca3e3d65e7234" -dependencies = [ - "approx 0.5.1", - "num-integer", - "num-traits", - "rustc_version 0.4.0", - "serde", -] - -[[package]] -name = "veloren-client" -version = "0.16.0" -dependencies = [ - "async-channel", - "authc", - "byteorder", - "clap", - "hashbrown 0.13.2", - "hickory-resolver", - "image", - "num 0.4.1", - "quinn", - "rayon", - "ron", - "rustls", - "rustyline", - "serde", - "specs", - "tokio", - "tracing", - "vek 0.17.0", - "veloren-client-i18n", - "veloren-common", - "veloren-common-base", - "veloren-common-frontend", - "veloren-common-net", - "veloren-common-state", - "veloren-common-systems", - "veloren-network", - "veloren-voxygen-i18n-helpers", -] - -[[package]] -name = "veloren-client-i18n" -version = "0.13.0" -dependencies = [ - "clap", - "deunicode", - "fluent", - "fluent-bundle", - "fluent-syntax", - "hashbrown 0.13.2", - "intl-memoizer", - "serde", - "tracing", - "unic-langid", - "veloren-common-assets", - "veloren-common-i18n", -] - -[[package]] -name = "veloren-common" -version = "0.10.0" -dependencies = [ - "approx 0.5.1", - "bitflags 2.5.0", - "chrono", - "chrono-tz", - "clap", - "criterion", - "crossbeam-utils 0.8.19", - "csv", - "dot_vox", - "enum-map", - "fxhash", - "hashbrown 0.13.2", - "indexmap", - "itertools 0.10.5", - "kiddo", - "lazy_static", - "num-derive 0.4.2", - "num-traits", - "ordered-float 3.9.2", - "petgraph 0.6.4", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "ron", - "roots", - "serde", - "serde_json", - "serde_repr", - "sha2", - "slab", - "slotmap", - "specs", - "spin_sleep", - "strum 0.24.1", - "tracing", - "tracing-subscriber", - "uuid", - "vek 0.17.0", - "veloren-common-assets", - "veloren-common-base", - "veloren-common-i18n", -] - -[[package]] -name = "veloren-common-assets" -version = "0.10.0" -dependencies = [ - "assets_manager", - "dot_vox", - "hashbrown 0.13.2", - "image", - "lazy_static", - "ron", - "serde", - "tracing", - "walkdir", - "wavefront", -] - -[[package]] -name = "veloren-common-base" -version = "0.10.0" -dependencies = [ - "directories-next", - "profiling", - "tracing", -] - -[[package]] -name = "veloren-common-dynlib" -version = "0.1.0" -dependencies = [ - "find_folder", - "libloading 0.8.3", - "notify", - "tracing", -] - -[[package]] -name = "veloren-common-ecs" -version = "0.10.0" -dependencies = [ - "float-cmp", - "specs", - "tracing", - "veloren-common-base", -] - -[[package]] -name = "veloren-common-frontend" -version = "0.10.0" -dependencies = [ - "termcolor", - "tracing", - "tracing-appender", - "tracing-subscriber", - "tracing-tracy", - "veloren-common-base", -] - -[[package]] -name = "veloren-common-i18n" -version = "0.1.0" -dependencies = [ - "hashbrown 0.13.2", - "rand 0.8.5", - "serde", -] - -[[package]] -name = "veloren-common-net" -version = "0.10.0" -dependencies = [ - "bincode", - "flate2", - "hashbrown 0.13.2", - "image", - "num-traits", - "serde", - "specs", - "sum_type", - "tracing", - "vek 0.17.0", - "veloren-common", -] - -[[package]] -name = "veloren-common-state" -version = "0.10.0" -dependencies = [ - "async-trait", - "bincode", - "bytes", - "futures", - "hashbrown 0.13.2", - "hex", - "num_cpus", - "rayon", - "scopeguard", - "serde", - "sha2", - "specs", - "tar", - "timer-queue", - "toml 0.8.12", - "tracing", - "vek 0.17.0", - "veloren-common", - "veloren-common-assets", - "veloren-common-base", - "veloren-common-ecs", - "veloren-common-net", - "wasmtime", - "wasmtime-wasi", -] - -[[package]] -name = "veloren-common-systems" -version = "0.10.0" -dependencies = [ - "itertools 0.10.5", - "ordered-float 3.9.2", - "rand 0.8.5", - "rayon", - "specs", - "tracing", - "vek 0.17.0", - "veloren-common", - "veloren-common-base", - "veloren-common-ecs", - "veloren-common-net", - "veloren-common-state", -] - -[[package]] -name = "veloren-network" -version = "0.3.0" -dependencies = [ - "async-channel", - "async-trait", - "bincode", - "bytes", - "clap", - "criterion", - "crossbeam-channel", - "futures-util", - "hashbrown 0.13.2", - "lazy_static", - "lz-fear", - "prometheus", - "prometheus-hyper", - "quinn", - "rand 0.8.5", - "rcgen", - "rustls", - "serde", - "shellexpand 3.1.0", - "socket2", - "tokio", - "tokio-stream", - "tracing", - "tracing-subscriber", - "veloren-network-protocol", -] - -[[package]] -name = "veloren-network-protocol" -version = "0.6.1" -dependencies = [ - "async-channel", - "async-trait", - "bitflags 2.5.0", - "bytes", - "criterion", - "hashbrown 0.13.2", - "prometheus", - "rand 0.8.5", - "tokio", - "tracing", -] - -[[package]] -name = "veloren-rtsim" -version = "0.10.0" -dependencies = [ - "anymap2", - "atomic_refcell", - "enum-map", - "fxhash", - "hashbrown 0.13.2", - "itertools 0.10.5", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "rmp-serde", - "serde", - "slotmap", - "tracing", - "vek 0.17.0", - "veloren-common", - "veloren-world", -] - -[[package]] -name = "veloren-server" -version = "0.16.0" -dependencies = [ - "atomicwrites", - "authc", - "bincode", - "censor", - "chrono", - "chrono-tz", - "crossbeam-channel", - "drop_guard", - "enum-map", - "futures-util", - "hashbrown 0.13.2", - "humantime", - "itertools 0.10.5", - "lazy_static", - "noise", - "num_cpus", - "parking_lot 0.12.1", - "portpicker", - "prometheus", - "quinn", - "rand 0.8.5", - "rayon", - "refinery", - "ron", - "rusqlite", - "rustls", - "rustls-pemfile", - "schnellru", - "serde", - "serde_json", - "specs", - "strum 0.24.1", - "tokio", - "tracing", - "vek 0.17.0", - "veloren-common", - "veloren-common-base", - "veloren-common-ecs", - "veloren-common-net", - "veloren-common-state", - "veloren-common-systems", - "veloren-network", - "veloren-rtsim", - "veloren-server-agent", - "veloren-world", -] - -[[package]] -name = "veloren-server-agent" -version = "0.1.0" -dependencies = [ - "itertools 0.10.5", - "lazy_static", - "rand 0.8.5", - "specs", - "vek 0.17.0", - "veloren-common", - "veloren-common-dynlib", - "veloren-rtsim", -] - -[[package]] -name = "veloren-server-cli" -version = "0.16.0" -dependencies = [ - "axum", - "cansi", - "chrono", - "clap", - "crossterm", - "hyper", - "lazy_static", - "mimalloc", - "num_cpus", - "prometheus", - "rand 0.8.5", - "ratatui", - "ron", - "serde", - "shell-words", - "signal-hook", - "specs", - "tokio", - "tracing", - "veloren-common", - "veloren-common-base", - "veloren-common-frontend", - "veloren-common-net", - "veloren-server", - "veloren-server-agent", - "veloren-world", -] - -[[package]] -name = "veloren-voxygen" -version = "0.16.0" -dependencies = [ - "assets_manager", - "backtrace", - "bitflags 2.5.0", - "bytemuck", - "chrono", - "chumsky", - "clap", - "cmake", - "conrod_core", - "conrod_winit", - "criterion", - "crossbeam-channel", - "crossbeam-utils 0.8.19", - "directories-next", - "discord-sdk", - "dispatch 0.1.4", - "dot_vox", - "egui", - "egui_wgpu_backend", - "egui_winit_platform", - "enum-map", - "euc", - "gilrs", - "glyph_brush", - "guillotiere", - "hashbrown 0.13.2", - "iced_native", - "iced_winit", - "image", - "inline_tweak", - "itertools 0.10.5", - "keyboard-keynames", - "lazy_static", - "levenshtein", - "mimalloc", - "mumble-link", - "native-dialog", - "num 0.4.1", - "num_cpus", - "ordered-float 3.9.2", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "rodio", - "ron", - "serde", - "sha2", - "shaderc", - "slab", - "specs", - "strum 0.24.1", - "tokio", - "tracing", - "treeculler", - "vek 0.17.0", - "veloren-client", - "veloren-client-i18n", - "veloren-common", - "veloren-common-assets", - "veloren-common-base", - "veloren-common-ecs", - "veloren-common-frontend", - "veloren-common-net", - "veloren-common-state", - "veloren-common-systems", - "veloren-server", - "veloren-voxygen-anim", - "veloren-voxygen-egui", - "veloren-voxygen-i18n-helpers", - "veloren-world", - "wgpu", - "wgpu-profiler", - "winit", - "winres", -] - -[[package]] -name = "veloren-voxygen-anim" -version = "0.10.0" -dependencies = [ - "bytemuck", - "lazy_static", - "vek 0.17.0", - "veloren-common", - "veloren-common-dynlib", -] - -[[package]] -name = "veloren-voxygen-egui" -version = "0.9.0" -dependencies = [ - "egui", - "egui_plot", - "egui_winit_platform", - "lazy_static", - "veloren-client", - "veloren-common", - "veloren-common-dynlib", -] - -[[package]] -name = "veloren-voxygen-i18n-helpers" -version = "0.10.0" -dependencies = [ - "tracing", - "veloren-client-i18n", - "veloren-common", - "veloren-common-net", -] - -[[package]] -name = "veloren-world" -version = "0.10.0" -dependencies = [ - "arr_macro", - "bincode", - "bitvec", - "clap", - "criterion", - "csv", - "deflate", - "enum-map", - "enumset", - "fallible-iterator", - "flate2", - "fxhash", - "hashbrown 0.13.2", - "image", - "indicatif", - "itertools 0.10.5", - "kiddo", - "lazy_static", - "lz-fear", - "minifb", - "noise", - "num 0.4.1", - "num-traits", - "ordered-float 3.9.2", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "ron", - "rstar", - "rusqlite", - "serde", - "signal-hook", - "strum 0.24.1", - "svg_fmt", - "tracing", - "tracing-subscriber", - "vek 0.17.0", - "veloren-common", - "veloren-common-base", - "veloren-common-dynlib", - "veloren-common-frontend", - "veloren-common-net", -] - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasi-cap-std-sync" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a518b394ec5808ad2221646898eb1564f0db47a8f6d6dcf95059f5089d6d8f28" -dependencies = [ - "anyhow", - "async-trait", - "cap-fs-ext", - "cap-rand", - "cap-std", - "cap-time-ext", - "fs-set-times", - "io-extras", - "io-lifetimes", - "once_cell", - "rustix", - "system-interface", - "tracing", - "wasi-common", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasi-common" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec11da24eed0ca98c3e071cf9186051b51b6436db21a7613498a9191d6f35a" -dependencies = [ - "anyhow", - "bitflags 2.5.0", - "cap-rand", - "cap-std", - "io-extras", - "log", - "rustix", - "thiserror", - "tracing", - "wasmtime", - "wiggle", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote 1.0.35", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "wasm-encoder" -version = "0.38.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasm-encoder" -version = "0.201.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasmparser" -version = "0.118.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f1154f1ab868e2a01d9834a805faca7bf8b50d041b4ca714d005d0dab1c50c" -dependencies = [ - "indexmap", - "semver 1.0.22", -] - -[[package]] -name = "wasmparser" -version = "0.121.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" -dependencies = [ - "bitflags 2.5.0", - "indexmap", - "semver 1.0.22", -] - -[[package]] -name = "wasmprinter" -version = "0.2.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7" -dependencies = [ - "anyhow", - "wasmparser 0.121.2", -] - -[[package]] -name = "wasmtime" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d9aebf4be5afc2b9d3b8aff8ce5a107440ae3174090a8720a31538e88464156" -dependencies = [ - "anyhow", - "async-trait", - "bincode", - "bumpalo", - "cfg-if 1.0.0", - "encoding_rs", - "fxprof-processed-profile", - "indexmap", - "libc", - "log", - "object", - "once_cell", - "paste", - "rayon", - "serde", - "serde_derive", - "serde_json", - "target-lexicon", - "wasm-encoder 0.38.1", - "wasmparser 0.118.2", - "wasmtime-cache", - "wasmtime-component-macro", - "wasmtime-component-util", - "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-fiber", - "wasmtime-jit", - "wasmtime-runtime", - "wasmtime-winch", - "wat", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasmtime-asm-macros" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3ed1bdfec9cca409d6562fe51abc75440c85fde2dc4c5b5ad65bc0405f31475" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "wasmtime-cache" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8222c4317b8bc3d8566b0e605fcf9c56d14947d86fb18e83128badd5cb90f237" -dependencies = [ - "anyhow", - "base64", - "bincode", - "directories-next", - "log", - "rustix", - "serde", - "serde_derive", - "sha2", - "toml 0.5.11", - "windows-sys 0.52.0", - "zstd", -] - -[[package]] -name = "wasmtime-component-macro" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d185b5a280ec07edaaf8e353e83a3c7f99381ada711a2b35173e0961d32c1b6" -dependencies = [ - "anyhow", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", - "wasmtime-component-util", - "wasmtime-wit-bindgen", - "wit-parser", -] - -[[package]] -name = "wasmtime-component-util" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0981617835bf3e8c3f29762faedd7ade0ca0e796b51e3355a3861f0a78b5688e" - -[[package]] -name = "wasmtime-cranelift" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1f2e04e2a08c1f73fc36a8a6d0da38fbe3ff396e42c47826435239a26bf187a" -dependencies = [ - "anyhow", - "cfg-if 1.0.0", - "cranelift-codegen", - "cranelift-control", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", - "gimli", - "log", - "object", - "target-lexicon", - "thiserror", - "wasmparser 0.118.2", - "wasmtime-cranelift-shared", - "wasmtime-environ", - "wasmtime-versioned-export-macros", -] - -[[package]] -name = "wasmtime-cranelift-shared" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e3cef89d8ed4cdf08618c303afc512305399fbfb23810a681a5a007a65feba" -dependencies = [ - "anyhow", - "cranelift-codegen", - "cranelift-control", - "cranelift-native", - "gimli", - "object", - "target-lexicon", - "wasmtime-environ", -] - -[[package]] -name = "wasmtime-environ" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099836c3583b85d16e8d1801fe793fa017e9256c5d08bd032cdab0754425be64" -dependencies = [ - "anyhow", - "cranelift-entity", - "gimli", - "indexmap", - "log", - "object", - "serde", - "serde_derive", - "target-lexicon", - "thiserror", - "wasm-encoder 0.38.1", - "wasmparser 0.118.2", - "wasmprinter", - "wasmtime-component-util", - "wasmtime-types", -] - -[[package]] -name = "wasmtime-fiber" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19865170650ca6cdb3b1924e42e628d29d03a1766e6de71f57d879b108ee46a" -dependencies = [ - "anyhow", - "cc", - "cfg-if 1.0.0", - "rustix", - "wasmtime-asm-macros", - "wasmtime-versioned-export-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasmtime-jit" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdae2c6da571b051c3c1520c9c4206a49939e855cb64c4119ab06ff08a3fc460" -dependencies = [ - "addr2line", - "anyhow", - "bincode", - "cfg-if 1.0.0", - "cpp_demangle", - "gimli", - "ittapi", - "log", - "object", - "rustc-demangle", - "rustix", - "serde", - "serde_derive", - "target-lexicon", - "wasmtime-environ", - "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasmtime-jit-debug" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793787308417b7ad72cfa22e54d97324d1d9810c2ecf47b8fd8263d5b122e30c" -dependencies = [ - "object", - "once_cell", - "rustix", - "wasmtime-versioned-export-macros", -] - -[[package]] -name = "wasmtime-jit-icache-coherence" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6d01b771888f8cc32fc491247095715c6971d70903f9a82803d707836998815" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasmtime-runtime" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f0f306436812a253a934444bd25230eaf33a007218a6fe92f67d3646f8dd19" -dependencies = [ - "anyhow", - "cc", - "cfg-if 1.0.0", - "encoding_rs", - "indexmap", - "libc", - "log", - "mach", - "memfd", - "memoffset 0.9.0", - "paste", - "psm", - "rustix", - "sptr", - "wasm-encoder 0.38.1", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-fiber", - "wasmtime-jit-debug", - "wasmtime-versioned-export-macros", - "wasmtime-wmemcheck", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasmtime-types" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158b87374f29ff040e865537674d610d970ccff28383853d1dc09b439eee7a87" -dependencies = [ - "cranelift-entity", - "serde", - "serde_derive", - "thiserror", - "wasmparser 0.118.2", -] - -[[package]] -name = "wasmtime-versioned-export-macros" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78ba3989894471c172329d42d1fc03edf2efe883fcc05a5d42f7bd5030de0ff" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "wasmtime-wasi" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e666a7340688aa3a7ee2d4ceb4fee4c175e331ecaeb5ac5b4d45231af718cfc2" -dependencies = [ - "anyhow", - "async-trait", - "bitflags 2.5.0", - "bytes", - "cap-fs-ext", - "cap-net-ext", - "cap-rand", - "cap-std", - "cap-time-ext", - "fs-set-times", - "futures", - "io-extras", - "io-lifetimes", - "libc", - "log", - "once_cell", - "rustix", - "system-interface", - "thiserror", - "tokio", - "tracing", - "url", - "wasi-cap-std-sync", - "wasi-common", - "wasmtime", - "wiggle", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasmtime-winch" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131924cb850fd2c96e87868e101490f738e607fe0eba5ec8dc7c3b43115d8223" -dependencies = [ - "anyhow", - "cranelift-codegen", - "gimli", - "object", - "target-lexicon", - "wasmparser 0.118.2", - "wasmtime-cranelift-shared", - "wasmtime-environ", - "winch-codegen", -] - -[[package]] -name = "wasmtime-wit-bindgen" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b149b61bd1402bcd5d456c616302812f8bebd65c56f720cefd86ab6cf5c8d8" -dependencies = [ - "anyhow", - "heck 0.4.1", - "indexmap", - "wit-parser", -] - -[[package]] -name = "wasmtime-wmemcheck" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b9a897e713f3d78ac66c751e4d34ec3a1cd100b85083a6dcf054940accde05" - -[[package]] -name = "wast" -version = "35.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68" -dependencies = [ - "leb128", -] - -[[package]] -name = "wast" -version = "201.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef6e1ef34d7da3e2b374fd2b1a9c0227aff6cad596e1b24df9b58d0f6222faa" -dependencies = [ - "bumpalo", - "leb128", - "memchr", - "unicode-width", - "wasm-encoder 0.201.0", -] - -[[package]] -name = "wat" -version = "1.201.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453d5b37a45b98dee4f4cb68015fc73634d7883bbef1c65e6e9c78d454cf3f32" -dependencies = [ - "wast 201.0.0", -] - -[[package]] -name = "wavefront" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162190f32ea78b07b7bc02b57a1c2a7c0874bc3da34f36eba41c86c4b03c4fb" -dependencies = [ - "hashbrown 0.9.1", -] - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix 0.24.3", - "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-cursor" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" -dependencies = [ - "nix 0.24.3", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags 1.3.2", - "wayland-client", - "wayland-commons", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "xml-rs", -] - -[[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 = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "wfd" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "wgpu" -version = "0.18.0" -source = "git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1#df527ef82e2eba827eda9278caa583506a06aa87" -dependencies = [ - "arrayvec", - "cfg-if 1.0.0", - "flume", - "js-sys", - "log", - "naga", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle 0.5.2", - "serde", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-core" -version = "0.18.1" -source = "git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1#df527ef82e2eba827eda9278caa583506a06aa87" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.5.0", - "codespan-reporting", - "log", - "naga", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle 0.5.2", - "ron", - "rustc-hash", - "serde", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.18.1" -source = "git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1#df527ef82e2eba827eda9278caa583506a06aa87" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 2.5.0", - "block", - "core-graphics-types", - "d3d12", - "glow", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.8.3", - "log", - "metal", - "naga", - "objc", - "once_cell", - "parking_lot 0.12.1", - "profiling", - "range-alloc", - "raw-window-handle 0.5.2", - "renderdoc-sys", - "rustc-hash", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-profiler" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdc78911971a06b86a57a9a8e1c861fbc90c62dcbc96bff0b2831c1e853b7bd" -dependencies = [ - "thiserror", - "wgpu", -] - -[[package]] -name = "wgpu-types" -version = "0.18.0" -source = "git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1#df527ef82e2eba827eda9278caa583506a06aa87" -dependencies = [ - "bitflags 2.5.0", - "js-sys", - "serde", - "web-sys", -] - -[[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 = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "wiggle" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5530d063ee9ccb1d503fed91e3d509419f43733a05fcc99c9f7aa3482703189" -dependencies = [ - "anyhow", - "async-trait", - "bitflags 2.5.0", - "thiserror", - "tracing", - "wasmtime", - "wiggle-macro", -] - -[[package]] -name = "wiggle-generate" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea274a806c3eeef5008d32881a999065591c646f0f889ca07fd1223f54378e8b" -dependencies = [ - "anyhow", - "heck 0.4.1", - "proc-macro2 1.0.79", - "quote 1.0.35", - "shellexpand 2.1.2", - "syn 2.0.53", - "witx", -] - -[[package]] -name = "wiggle-macro" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505e4f6b7b46e693e0027f650956b662de0fcedfc3a2506ce6a4f9f08281791c" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", - "wiggle-generate", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "winch-codegen" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f114f3f980c00f13ee164e431e3abac9cd20b10853849fa6b030d3e4d6be307a" -dependencies = [ - "anyhow", - "cranelift-codegen", - "gimli", - "regalloc2", - "smallvec", - "target-lexicon", - "wasmparser 0.118.2", - "wasmtime-environ", -] - -[[package]] -name = "window_clipboard" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d" -dependencies = [ - "clipboard-win 4.5.0", - "clipboard_macos", - "clipboard_wayland", - "clipboard_x11", - "raw-window-handle 0.5.2", - "thiserror", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" -dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-core" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" -dependencies = [ - "windows-result", - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-result" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "winit" -version = "0.28.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" -dependencies = [ - "android-activity", - "bitflags 1.3.2", - "cfg_aliases", - "core-foundation", - "core-graphics", - "dispatch 0.2.0", - "instant", - "libc", - "log", - "mio", - "ndk 0.7.0", - "objc2", - "once_cell", - "orbclient", - "percent-encoding", - "raw-window-handle 0.5.2", - "redox_syscall 0.3.5", - "sctk-adwaita", - "serde", - "smithay-client-toolkit", - "wasm-bindgen", - "wayland-client", - "wayland-commons", - "wayland-protocols", - "wayland-scanner", - "web-sys", - "windows-sys 0.45.0", - "x11-dl", -] - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml 0.5.11", -] - -[[package]] -name = "winx" -version = "0.36.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9643b83820c0cd246ecabe5fa454dd04ba4fa67996369466d0747472d337346" -dependencies = [ - "bitflags 2.5.0", - "windows-sys 0.52.0", -] - -[[package]] -name = "wit-parser" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver 1.0.22", - "serde", - "serde_derive", - "serde_json", - "unicode-xid 0.2.4", -] - -[[package]] -name = "witx" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b" -dependencies = [ - "anyhow", - "log", - "thiserror", - "wast 35.0.2", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "x11-clipboard" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464" -dependencies = [ - "x11rb 0.10.1", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" -dependencies = [ - "gethostname 0.2.3", - "nix 0.24.3", - "winapi", - "winapi-wsapoll", - "x11rb-protocol 0.10.0", -] - -[[package]] -name = "x11rb" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" -dependencies = [ - "gethostname 0.4.3", - "rustix", - "x11rb-protocol 0.13.0", -] - -[[package]] -name = "x11rb-protocol" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" -dependencies = [ - "nix 0.24.3", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xcb" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d27b37e69b8c05bfadcd968eb1a4fe27c9c52565b727f88512f43b89567e262" -dependencies = [ - "as-raw-xcb-connection", - "bitflags 1.3.2", - "libc", - "quick-xml", -] - -[[package]] -name = "xcursor" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" - -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - -[[package]] -name = "xkbcommon" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88" -dependencies = [ - "as-raw-xcb-connection", - "libc", - "memmap2 0.7.1", -] - -[[package]] -name = "xml-rs" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" - -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[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.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix index 689abae0bc70..6af10dc7ac16 100644 --- a/pkgs/by-name/ve/veloren/package.nix +++ b/pkgs/by-name/ve/veloren/package.nix @@ -30,29 +30,15 @@ rustPlatform.buildRustPackage { hash = "sha256-h2hLO227aeK2oEFfdGMgmtMkA9cn9AgQ9w6myb+8W8c="; }; - cargoLock.lockFile = ./Cargo.lock; - cargoLock.outputHashes = { - # Hashes of dependencies pinned to a git commit - "auth-common-0.1.0" = "sha256-6tUutHLY309xSBT2D7YueAmsAWyVn410XNKFT8yuTgA="; - "conrod_core-0.63.0" = "sha256-GxakbJBVTFgbtUsa2QB105xgd+aULuWLBlv719MIzQY="; - "egui_wgpu_backend-0.26.0" = "sha256-47XZoE7bFRv/TG4EmM2qit5L21qsKT6Nt/t1y/NMneQ="; - "fluent-0.16.0" = "sha256-xN+DwObqoToqprLDy3yvTiqclIIOsuUtpAQ6W1mdf0I="; - "iced_core-0.4.0" = "sha256-5s6IXcitoGcHS0FUx/cujx9KLBpaUuMnugmBged1cLA="; - "keyboard-keynames-0.1.2" = "sha256-5I70zT+Lwt0JXJgTAy/VygHdxIBuE/u3pq8LP8NkRdE="; - "naga-0.14.2" = "sha256-yyLrJNhbu/RIVr0hM7D7Rwd7vH3xX8Dns+u6m8NEU2M="; - "portpicker-0.1.0" = "sha256-or1907XdrDIyFzHNmW6me2EIyEQ8sjVIowfGsypa4jU="; - "shaderc-0.8.0" = "sha256-BU736g075i3GqlyyB9oyoVlQqNcWbZEGa8cdge1aMq0="; - "specs-0.20.0" = "sha256-OHnlag6SJ1rlAYnlmVD+uqY+kFNsbQ42W21RrEa8Xn0="; - }; cargoPatches = [ ./fix-on-rust-stable.patch ./fix-assets-path.patch ]; - postPatch = '' - # Use our Cargo.lock - cp ${./Cargo.lock} Cargo.lock + useFetchCargoVendor = true; + cargoHash = "sha256-3XHuAgue0Id1oxCJ8NLZ4wYjMfND+C1iIW+AnMKXd54="; + postPatch = '' # Force vek to build in unstable mode cat <<'EOF' | tee "$cargoDepsCopy"/vek-*/build.rs fn main() { diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 48c98890d081..5d5ecefbee0d 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -15,18 +15,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.11.7"; + version = "1.12.2"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-WzmRz0wf/Ss90FmXXp6gaylC0k/k/QkFaFddlnLo+Xk="; + hash = "sha256-a4lbeuXEHDMDko8wte7jUdJ0yUcjfq3UPQAuSiz1UQU="; }; pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname src; - hash = "sha256-g9BSVUKpn74D9eIDj/lS1Y6w/+AnhCw++st4s4REn+A="; + hash = "sha256-hO6QKRr4jTfesRDAEGcpFeJmGTGLGMw6EgIvD23DNzw="; }; nativeBuildInputs = [ @@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: { ESBUILD_BINARY_PATH = lib.getExe ( esbuild.overrideAttrs ( final: _: { - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${final.version}"; - hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA="; + hash = "sha256-vrhtdrvrcC3dQoJM6hWq6wrGJLSiVww/CNPlL1N5kQ8="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; } @@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall cp -r dist/${lib.optionalString buildWebExtension "chromium-unpacked/"} $out + cp package.json $out # Presence is checked by Vesktop. runHook postInstall ''; diff --git a/pkgs/by-name/ve/vendir/package.nix b/pkgs/by-name/ve/vendir/package.nix index 5ee4df9747da..f83b2cd16777 100644 --- a/pkgs/by-name/ve/vendir/package.nix +++ b/pkgs/by-name/ve/vendir/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.43.1"; + version = "0.44.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-VIP1NkSZMoTZfvl6xAAbs0sL9rBc6FDaZHgOmRViStY="; + sha256 = "sha256-J+i0AdNw35Ccb/QtvKk4U5eA9uAZUv47GrqJMii/cTg="; }; vendorHash = null; diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix index 9ea7fc575135..6bb715a9110d 100644 --- a/pkgs/by-name/ve/venera/package.nix +++ b/pkgs/by-name/ve/venera/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - flutter327, + flutter329, webkitgtk_4_1, copyDesktopItems, makeDesktopItem, @@ -12,37 +12,45 @@ gitUpdater, }: -flutter327.buildFlutterApplication rec { +flutter329.buildFlutterApplication rec { pname = "venera"; - version = "1.2.4"; + version = "1.4.3"; src = fetchFromGitHub { owner = "venera-app"; repo = "venera"; tag = "v${version}"; - hash = "sha256-QmEjPTpiN74srRyNL9eZFxntV2F7CJuVgewe2tqA9pc="; + hash = "sha256-hhKfHJRZyNsQcGhbgBdBvy2KjKOxg4+0yi+ynX3qMw4="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes = { - desktop_webview_window = "sha256-15tw3gLN9e886QjBFuYP34KLD1lN8AmQYXVza5Bvs40="; - flutter_qjs = "sha256-nbXKfiCvG6JT570RNVq3gec+JFw3H7XG4g/QSNkDw18="; - flutter_7zip = "sha256-KHDq4XG3l+dq1NPW84wOK5kKbXJ8qCK8voGeTnX/Krw="; - lodepng_flutter = "sha256-bGc9uXD1EQ/19OIZmR7a/YL9w93fNWdQF5S19LSwxZw="; - photo_view = "sha256-Z+9xgvk8YS+bgCbBW7BBY72tV6JUq2kCX5OwKFK4YPE="; - scrollable_positioned_list = "sha256-6XmBlNxE7DEqY2LsEFtVrshn2Xt55XnmaiTq+tiPInA="; - webdav_client = "sha256-Dz/4qW+cYGyNtK8S/abFslwQNroidgrHl7oJw3uXIqM="; - flutter_saf = "sha256-haY4eabTwUUBTpwenK0ILKpLggrtjVQszcmlpirEeTU="; - }; + gitHashes = + let + flutter_inappwebview-hash = "sha256-Vh5bZP/tkSAlstbT3souy/iLmpw3CENrA/rCUOcJb2o="; + in + { + desktop_webview_window = "sha256-c2f1CjfZJ8M9SJz65WQVG+0uuKaFMjQFFAGSNH9osjg="; + flutter_qjs = "sha256-Mp9swQ4JEIyIEBQGlR7i+37Jp2sFGwL0uGrSTwE/n88="; + flutter_7zip = "sha256-KHDq4XG3l+dq1NPW84wOK5kKbXJ8qCK8voGeTnX/Krw="; + lodepng_flutter = "sha256-fOOhjoo3dzNNZI04Ie7GHLTfVlD5X+5IONpg8+RlmsE="; + photo_view = "sha256-zRc/WCbVybWkF52KDZZXgvKA8bbXASI7Yj2RFzLhXUk="; + scrollable_positioned_list = "sha256-6XmBlNxE7DEqY2LsEFtVrshn2Xt55XnmaiTq+tiPInA="; + webdav_client = "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE="; + flutter_saf = "sha256-zmRZ82aJPYX/N/lOUcOoT8UAHEDoUk0FTFSqB4gKR+U="; + flutter_inappwebview = flutter_inappwebview-hash; + flutter_inappwebview_android = flutter_inappwebview-hash; + flutter_inappwebview_ios = flutter_inappwebview-hash; + flutter_inappwebview_macos = flutter_inappwebview-hash; + flutter_inappwebview_web = flutter_inappwebview-hash; + flutter_inappwebview_windows = flutter_inappwebview-hash; + flutter_inappwebview_platform_interface = flutter_inappwebview-hash; + rhttp = "sha256-odYLLj9Vd0+UQVXtYgGzMDKLD7SbTqrqHI1jAXVr5XU="; + }; - nativeBuildInputs = [ - copyDesktopItems - ]; + nativeBuildInputs = [ copyDesktopItems ]; - buildInputs = [ - webkitgtk_4_1 - ]; + buildInputs = [ webkitgtk_4_1 ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json index 675d4e4541e3..5451f4281526 100644 --- a/pkgs/by-name/ve/venera/pubspec.lock.json +++ b/pkgs/by-name/ve/venera/pubspec.lock.json @@ -4,11 +4,11 @@ "dependency": "direct main", "description": { "name": "app_links", - "sha256": "433df2e61b10519407475d7f69e470789d23d593f28224c38ba1068597be7950", + "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.3" + "version": "6.4.0" }, "app_links_linux": { "dependency": "transitive", @@ -54,11 +54,11 @@ "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "battery_plus": { "dependency": "direct main", @@ -84,11 +84,11 @@ "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "build_cli_annotations": { "dependency": "transitive", @@ -104,31 +104,31 @@ "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "clock": { "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "collection": { "dependency": "transitive", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "convert": { "dependency": "transitive", @@ -174,18 +174,18 @@ "dependency": "transitive", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "desktop_webview_window": { "dependency": "direct main", "description": { "path": "packages/desktop_webview_window", - "ref": "HEAD", - "resolved-ref": "b8f7e94c576acf4ca3dce5b9f8fb8076e5eaca5e", + "ref": "7801fc582ecf5a7351632887891ecf309a7b2583", + "resolved-ref": "7801fc582ecf5a7351632887891ecf309a7b2583", "url": "https://github.com/wgh136/flutter_desktop_webview" }, "source": "git", @@ -195,21 +195,21 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.0+1" }, "dio_web_adapter": { "dependency": "transitive", "description": { "name": "dio_web_adapter", - "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "sha256": "e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" }, "dynamic_color": { "dependency": "direct main", @@ -221,25 +221,35 @@ "source": "hosted", "version": "1.7.0" }, + "enough_convert": { + "dependency": "direct main", + "description": { + "name": "enough_convert", + "sha256": "c67d85ca21aaa0648f155907362430701db41f7ec8e6501a58ad9cd9d8569d01", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, "fake_async": { "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "transitive", @@ -325,11 +335,11 @@ "dependency": "transitive", "description": { "name": "file_selector_windows", - "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4", + "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+3" + "version": "0.9.3+4" }, "fixnum": { "dependency": "transitive", @@ -381,22 +391,24 @@ "flutter_inappwebview": { "dependency": "direct main", "description": { - "name": "flutter_inappwebview", - "sha256": "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5", - "url": "https://pub.dev" + "path": "flutter_inappwebview", + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, - "source": "hosted", - "version": "6.1.5" + "source": "git", + "version": "6.2.0-beta.3" }, "flutter_inappwebview_android": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_android", - "sha256": "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba", - "url": "https://pub.dev" + "path": "flutter_inappwebview_android", + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, - "source": "hosted", - "version": "1.1.3" + "source": "git", + "version": "1.2.0-beta.3" }, "flutter_inappwebview_internal_annotations": { "dependency": "transitive", @@ -411,52 +423,57 @@ "flutter_inappwebview_ios": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_ios", - "sha256": "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d", - "url": "https://pub.dev" + "path": "flutter_inappwebview_ios", + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, - "source": "hosted", - "version": "1.1.2" + "source": "git", + "version": "1.2.0-beta.3" }, "flutter_inappwebview_macos": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_macos", - "sha256": "c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1", - "url": "https://pub.dev" + "path": "flutter_inappwebview_macos", + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, - "source": "hosted", - "version": "1.1.2" + "source": "git", + "version": "1.2.0-beta.3" }, "flutter_inappwebview_platform_interface": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_platform_interface", - "sha256": "cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500", - "url": "https://pub.dev" + "path": "flutter_inappwebview_platform_interface", + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, - "source": "hosted", - "version": "1.3.0+1" + "source": "git", + "version": "1.4.0-beta.3" }, "flutter_inappwebview_web": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_web", - "sha256": "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598", - "url": "https://pub.dev" + "path": "flutter_inappwebview_web", + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, - "source": "hosted", - "version": "1.1.2" + "source": "git", + "version": "1.2.0-beta.3" }, "flutter_inappwebview_windows": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_windows", - "sha256": "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055", - "url": "https://pub.dev" + "path": "flutter_inappwebview_windows", + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, - "source": "hosted", - "version": "0.6.0" + "source": "git", + "version": "0.7.0-beta.3" }, "flutter_lints": { "dependency": "direct dev", @@ -488,18 +505,18 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398", + "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.23" + "version": "2.0.24" }, "flutter_qjs": { "dependency": "direct main", "description": { "path": ".", - "ref": "5978d0c7784fbbefcacc573547f0ab01ba59b7b3", - "resolved-ref": "5978d0c7784fbbefcacc573547f0ab01ba59b7b3", + "ref": "8feae95df7fb00455df129ad7a0dfec1d0e8d8e4", + "resolved-ref": "8feae95df7fb00455df129ad7a0dfec1d0e8d8e4", "url": "https://github.com/wgh136/flutter_qjs" }, "source": "git", @@ -509,29 +526,29 @@ "dependency": "direct main", "description": { "name": "flutter_reorderable_grid_view", - "sha256": "732bcb1b29d5130c11a70e6acec512941fafe241f0e80bffd93ca6e415819915", + "sha256": "a7e0f9d5ba12fd232eb07fbb7f570ae35491045a6bba1858f6eb50c675526dfe", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.4.0" + "version": "5.4.1" }, "flutter_rust_bridge": { "dependency": "transitive", "description": { "name": "flutter_rust_bridge", - "sha256": "35c257fc7f98e34c1314d6c145e5ed54e7c94e8a9f469947e31c9298177d546f", + "sha256": "5a5c7a5deeef2cc2ffe6076a33b0429f4a20ceac22a397297aed2b1eb067e611", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.0" + "version": "2.9.0" }, "flutter_saf": { "dependency": "direct main", "description": { "path": ".", - "ref": "7637b8b67d0a831f3cd7e702b8173e300880d32e", - "resolved-ref": "7637b8b67d0a831f3cd7e702b8173e300880d32e", - "url": "https://github.com/pkuislm/flutter_saf.git" + "ref": "fe182cdf40e5fa6230f451bc1d643b860f610d13", + "resolved-ref": "fe182cdf40e5fa6230f451bc1d643b860f610d13", + "url": "https://github.com/venera-app/flutter_saf" }, "source": "git", "version": "0.0.1" @@ -602,21 +619,21 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.1" + "version": "4.1.2" }, "http_profile": { "dependency": "transitive", @@ -648,16 +665,6 @@ "source": "hosted", "version": "1.0.5" }, - "js": { - "dependency": "transitive", - "description": { - "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.1" - }, "json_annotation": { "dependency": "transitive", "description": { @@ -672,21 +679,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -702,11 +709,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "4a16b3f03741e1252fda5de3ce712666d010ba2122f8e912c94f9f7b90e1a4c3", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.1.0" + "version": "5.1.1" }, "local_auth": { "dependency": "direct main", @@ -722,21 +729,21 @@ "dependency": "transitive", "description": { "name": "local_auth_android", - "sha256": "6763aaf8965f21822624cb2fd3c03d2a8b3791037b5efb0fe4b13e110f5afc92", + "sha256": "0abe4e72f55c785b28900de52a2522c86baba0988838b5dc22241b072ecccd74", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.46" + "version": "1.0.48" }, "local_auth_darwin": { "dependency": "transitive", "description": { "name": "local_auth_darwin", - "sha256": "6d2950da311d26d492a89aeb247c72b4653ddc93601ea36a84924a396806d49c", + "sha256": "630996cd7b7f28f5ab92432c4b35d055dd03a747bc319e5ffbb3c4806a3e50d2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.3" }, "local_auth_platform_interface": { "dependency": "transitive", @@ -762,8 +769,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "9a784b193af5d55b2a35e58fa390bda3e4f35d00", - "resolved-ref": "9a784b193af5d55b2a35e58fa390bda3e4f35d00", + "ref": "ac7d05dde32e8d728102a9ff66e6b55f05d94ba1", + "resolved-ref": "ac7d05dde32e8d728102a9ff66e6b55f05d94ba1", "url": "https://github.com/venera-app/lodepng_flutter" }, "source": "git", @@ -773,11 +780,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -793,11 +800,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "direct main", @@ -823,11 +830,11 @@ "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_provider": { "dependency": "direct main", @@ -893,18 +900,18 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "photo_view": { "dependency": "direct main", "description": { "path": ".", - "ref": "94724a0b", - "resolved-ref": "94724a0b7f94167fd1ae061f84e14ae04cae5c39", + "ref": "a1255d1b5945aad4b7323303ec2ecdf0c90ffc4c", + "resolved-ref": "a1255d1b5945aad4b7323303ec2ecdf0c90ffc4c", "url": "https://github.com/wgh136/photo_view" }, "source": "git", @@ -934,21 +941,22 @@ "dependency": "direct main", "description": { "name": "pointycastle", - "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "sha256": "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.9.1" + "version": "4.0.0" }, "rhttp": { "dependency": "direct main", "description": { - "name": "rhttp", - "sha256": "8212cbc816cc3e761eecb8d4dbbaa1eca95de715428320a198a4e7a89acdcd2e", - "url": "https://pub.dev" + "path": "rhttp", + "ref": "e7dca15ca543b5df49f3ada06016e874b79bce36", + "resolved-ref": "e7dca15ca543b5df49f3ada06016e874b79bce36", + "url": "https://github.com/wgh136/rhttp" }, - "source": "hosted", - "version": "0.9.8" + "source": "git", + "version": "0.11.0" }, "screen_retriever": { "dependency": "transitive", @@ -1015,11 +1023,11 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400", + "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.3" + "version": "10.1.4" }, "share_plus_platform_interface": { "dependency": "transitive", @@ -1061,11 +1069,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -1081,51 +1089,51 @@ "dependency": "direct main", "description": { "name": "sqlite3", - "sha256": "cb7f4e9dc1b52b1fa350f7b3d41c662e75fc3d399555fa4e5efcf267e9a4fbb5", + "sha256": "32b632dda27d664f85520093ed6f735ae5c49b5b75345afb8b19411bc59bb53d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.7.4" }, "sqlite3_flutter_libs": { "dependency": "direct main", "description": { "name": "sqlite3_flutter_libs", - "sha256": "73016db8419f019e807b7a5e5fbf2a7bd45c165fed403b8e7681230f3a102785", + "sha256": "57fafacd815c981735406215966ff7caaa8eab984b094f52e692accefcbd9233", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.28" + "version": "0.5.30" }, "stack_trace": { "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "syntax_highlight": { "dependency": "direct main", @@ -1141,21 +1149,21 @@ "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "typed_data": { "dependency": "transitive", @@ -1241,21 +1249,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.4.0" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.4" }, "uuid": { "dependency": "direct main", @@ -1281,11 +1289,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "web": { "dependency": "transitive", @@ -1301,8 +1309,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "285f87f15bccd2d5d5ff443761348c6ee47b98d1", - "resolved-ref": "285f87f15bccd2d5d5ff443761348c6ee47b98d1", + "ref": "2f669c98fb81cff1c64fee93466a1475c77e4273", + "resolved-ref": "2f669c98fb81cff1c64fee93466a1475c77e4273", "url": "https://github.com/wgh136/webdav_client" }, "source": "git", @@ -1312,11 +1320,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69", + "sha256": "b89e6e24d1454e149ab20fbb225af58660f0c0bf4475544650700d8e2da54aef", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.0" + "version": "5.11.0" }, "window_manager": { "dependency": "direct main", @@ -1362,15 +1370,15 @@ "dependency": "direct main", "description": { "name": "zip_flutter", - "sha256": "bbf3160062610a43901b7ebbc6f6dd46519540f03a84027dc7b1fff399dda1ac", + "sha256": "c4d5a34c5803def866bc550926bb16fe89717c9b7304695d5b2ede30964eb8a8", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.10" + "version": "0.0.12" } }, "sdks": { - "dart": ">=3.6.0 <4.0.0", - "flutter": ">=3.27.4" + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.29.3" } } diff --git a/pkgs/by-name/ve/vengi-tools/package.nix b/pkgs/by-name/ve/vengi-tools/package.nix new file mode 100644 index 000000000000..8a89332df21c --- /dev/null +++ b/pkgs/by-name/ve/vengi-tools/package.nix @@ -0,0 +1,137 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + cmake, + pkg-config, + ninja, + python3, + makeWrapper, + + backward-cpp, + curl, + enet, + freetype, + glm, + gtest, + libbfd, + libdwarf, + libjpeg, + libuuid, + libuv, + libX11, + lua5_4, + lzfse, + opencl-headers, + SDL2, + SDL2_mixer, + wayland-protocols, + + callPackage, + nixosTests, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vengi-tools"; + version = "0.0.36"; + + src = fetchFromGitHub { + owner = "vengi-voxel"; + repo = "vengi"; + rev = "v${finalAttrs.version}"; + hash = "sha256-6MJw8BaHvd9cZNCMIFwAtk8UzxP+RSfnuv9py8sUgnY="; + }; + + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Disable code signing on macOS + substituteInPlace cmake/macros.cmake --replace-fail "codesign" "true" + substituteInPlace cmake/system/apple.cmake --replace-fail "if(APPLE)" "if(false)" + + # calls otool -L on /usr/lib/libSystem.B.dylib and fails because it doesn't exist + substituteInPlace cmake/applebundle.cmake --replace-fail 'fixup_bundle("''${TARGET_BUNDLE_DIR}" "" "")' "" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ninja + python3 + makeWrapper + ]; + + buildInputs = + [ + libbfd + libdwarf + backward-cpp + curl + enet + freetype + glm + libjpeg + libuuid + libuv + lua5_4 + lzfse + SDL2 + libX11 + SDL2_mixer + ] + ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols + ++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers; + + # error: "The plain signature for target_link_libraries has already been used" + doCheck = false; + + checkInputs = [ + gtest + ]; + + postInstall = + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/Applications + mv $out/*.app $out/Applications/ + + mkdir -p $out/bin + ln -s $out/Applications/vengi-voxconvert.app/Contents/MacOS/vengi-voxconvert $out/bin/vengi-voxconvert + '' + else + # Set the data directory for each executable. We cannot set it at build time + # with the PKGDATADIR cmake variable because each executable needs a specific + # one. + # This is not needed on darwin, since on that platform data files are saved + # in *.app/Contents/Resources/ too, and are picked up automatically. + '' + for prog in $out/bin/*; do + wrapProgram "$prog" \ + --set CORE_PATH $out/share/$(basename "$prog")/ + done + ''; + + passthru.tests = { + voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix { }; + voxconvert-all-formats = callPackage ./test-voxconvert-all-formats.nix { }; + run-voxedit = nixosTests.vengi-tools; + }; + + meta = with lib; { + description = "Tools from the vengi voxel engine, including a thumbnailer, a converter, and the VoxEdit voxel editor"; + longDescription = '' + Tools from the vengi C++ voxel game engine. It includes a voxel editor + with character animation support and loading/saving into a lot of voxel + volume formats. There are other tools like e.g. a thumbnailer for your + filemanager and a command line tool to convert between several voxel + formats. + ''; + homepage = "https://vengi-voxel.github.io/vengi/"; + downloadPage = "https://github.com/vengi-voxel/vengi/releases"; + license = [ + licenses.mit + licenses.cc-by-sa-30 + ]; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix b/pkgs/by-name/ve/vengi-tools/test-voxconvert-all-formats.nix similarity index 100% rename from pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix rename to pkgs/by-name/ve/vengi-tools/test-voxconvert-all-formats.nix diff --git a/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix b/pkgs/by-name/ve/vengi-tools/test-voxconvert-roundtrip.nix similarity index 100% rename from pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix rename to pkgs/by-name/ve/vengi-tools/test-voxconvert-roundtrip.nix diff --git a/pkgs/by-name/ve/ventoy/package.nix b/pkgs/by-name/ve/ventoy/package.nix index af5c8f3f95c6..e6e97b1cddde 100644 --- a/pkgs/by-name/ve/ventoy/package.nix +++ b/pkgs/by-name/ve/ventoy/package.nix @@ -213,7 +213,16 @@ stdenv.mkDerivation (finalAttrs: { 800+ image files are tested. 90%+ distros in DistroWatch supported. ''; changelog = "https://www.ventoy.net/doc_news.html"; - license = lib.licenses.gpl3Plus; + knownVulnerabilities = [ + '' + Ventoy uses binary blobs which can't be trusted to be free of malware or compliant to their licenses. + https://github.com/NixOS/nixpkgs/issues/404663 + See the following Issues for context: + https://github.com/ventoy/Ventoy/issues/2795 + https://github.com/ventoy/Ventoy/issues/3224 + '' + ]; + license = lib.licenses.unfree; mainProgram = "ventoy"; maintainers = with lib.maintainers; [ johnrtitor diff --git a/pkgs/by-name/ve/verible/package.nix b/pkgs/by-name/ve/verible/package.nix index 981acdaaf235..57046395f5f1 100644 --- a/pkgs/by-name/ve/verible/package.nix +++ b/pkgs/by-name/ve/verible/package.nix @@ -16,8 +16,8 @@ let registry = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-central-registry"; - rev = "6ca6e91cb9fa2d224f61b8a4a2a7fd6b1211e388"; - hash = "sha256-LRD8sGbISp2LXjpg4cpbUHG2a1JbKLA7z3vSvqqXMGo="; + rev = "bac7a5dc8b5535d7b36d0405f76badfba77c84c2"; + hash = "sha256-TXooqzqfvf1twldfrs0m8QR3AJkUCIyBS36TFTwN4Eg="; }; in buildBazelPackage rec { @@ -26,8 +26,8 @@ buildBazelPackage rec { # These environment variables are read in bazel/build-version.py to create # a build string shown in the tools --version output. # If env variables not set, it would attempt to extract it from .git/. - GIT_DATE = "2025-01-02"; - GIT_VERSION = "v0.0-3894-g0a842c85"; + GIT_DATE = "2025-03-30"; + GIT_VERSION = "v0.0-3956-ge12a194d"; # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" version = builtins.concatStringsSep "." ( @@ -38,7 +38,7 @@ buildBazelPackage rec { owner = "chipsalliance"; repo = "verible"; rev = "${GIT_VERSION}"; - hash = "sha256-FWeEIWvrjE8ESGFUWDPtd9gLkhMDtgkw6WbXViDxQQA="; + hash = "sha256-/RZqBNmyBZI6CO2ffS6p8T4wse1MKytNMphXFdkTOWQ="; }; bazel = bazel_6; @@ -51,9 +51,9 @@ buildBazelPackage rec { fetchAttrs = { hash = { - aarch64-linux = "sha256-HPpRxYhS6CIhinhHNvnPij4+cJxqf073nGpNG1ItPmo="; - x86_64-linux = "sha256-gM4hsuHMF4V1PgykjQ0yO652luoRJvNdB2xF6P8uxRc="; - aarch64-darwin = "sha256-OwkPUK8cEpBKB0uZOVExz6T14Pzol4aG8/MmGPV5X1o="; + aarch64-linux = "sha256-ErhBpmXhtiZbBWy506rLp4TQh5oXJQ44lw25jlVkjUM="; + x86_64-linux = "sha256-d8CYiqpL7rM3VvEqHSBvtgF2WLyH23jSvK7w4ChTtgU="; + aarch64-darwin = "sha256-lHMbziDzQpmXvsW25SgjQUkPRIRYv6TJIPTAEvhSfuA="; } .${system} or (throw "No hash for system: ${system}"); }; diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index a1aa47f9bda0..c8f9a5f986a8 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "versatiles"; - version = "0.15.3"; # When updating: Replace with current version + version = "0.15.6"; # When updating: Replace with current version src = fetchFromGitHub { owner = "versatiles-org"; repo = "versatiles-rs"; tag = "v${version}"; # When updating: Replace with long commit hash of new version - hash = "sha256-xIZ/9l/wvl2Gh7vmxTGUxhZ9KIPSPLoqqC8DRN3PiQs="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. + hash = "sha256-JWMoXsMRdllYrTpUdKYEi7i5AI5957qwrr8agvyKeT8="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. }; useFetchCargoVendor = true; - cargoHash = "sha256-UkPKwXPQW/M7AgNTMx4OqTLQCc9+c+RkzcCPyEHJayw="; # When updating: Same as above + cargoHash = "sha256-8DtkeWo+lxv/9JzknpWnGYCA9v2HA4jFN4ZvseFpOGU="; # When updating: Same as above __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix index 6420508bb7a7..6c2647111389 100644 --- a/pkgs/by-name/ve/versitygw/package.nix +++ b/pkgs/by-name/ve/versitygw/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "versitygw"; - version = "1.0.12"; + version = "1.0.13"; src = fetchFromGitHub { owner = "versity"; repo = "versitygw"; tag = "v${version}"; - hash = "sha256-wKD06yyXxV41Lbr2scvTR+fhd4uy6EIlArAVoNxMbzU="; + hash = "sha256-BsosWFzaN7P/QXPf86t+fJ6PkBGuykUCTmFEGCgclOE="; }; - vendorHash = "sha256-rgZJn3WvsoV4QfLpceAxVWuBncQGdH5oKnR12FqhyCE="; + vendorHash = "sha256-yDHuNqrCfrvKz4spofdw9EH7J9JZvpCYejlz893nwBk="; doCheck = false; # Require access to online S3 services diff --git a/pkgs/by-name/ve/veryfasttree/package.nix b/pkgs/by-name/ve/veryfasttree/package.nix index 3f493f01dcbb..89487a913eae 100644 --- a/pkgs/by-name/ve/veryfasttree/package.nix +++ b/pkgs/by-name/ve/veryfasttree/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "veryfasttree"; - version = "4.0.4"; + version = "4.0.5"; src = fetchFromGitHub { owner = "citiususc"; repo = "veryfasttree"; rev = "v${finalAttrs.version}"; - hash = "sha256-S4FW91VEdTPOIwRamz62arLSN9inxoKXpKsen2ISXMo="; + hash = "sha256-xoz2mK72gvNRpA4kGInAb3WHa/D8HvXprUQiJClLwh8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix index 8c3340b508a9..6c66cecf8284 100644 --- a/pkgs/by-name/ve/veryl/package.nix +++ b/pkgs/by-name/ve/veryl/package.nix @@ -6,39 +6,31 @@ installShellFiles, dbus, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "veryl"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "veryl-lang"; repo = "veryl"; rev = "v${version}"; - hash = "sha256-PeRz44agIKDPsgUhjPgm1Pn1oJb7Epyw0oj3xPCkj4k="; + hash = "sha256-KlW5GC5fgUnS6YAb01VEaKv48+yu8VqgAe/5QsilYjs="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-PD1S9h4cGGgfRBB0iZzY7GRTeclRhwWLrxvNVEs8OJY="; + cargoHash = "sha256-HKDkV2eDjhfuky2ORdKwbyBa/kt1gEqK55AibKg5VYE="; nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = - [ - dbus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + dbus + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd veryl \ @@ -68,6 +60,14 @@ rustPlatform.buildRustPackage rec { "--skip=path::directory_target" "--skip=path::source_directory" "--skip=path::source_target" + "--skip=path::rootdir_directory_directory" + "--skip=path::rootdir_directory_target" + "--skip=path::rootdir_source_directory" + "--skip=path::rootdir_source_target" + "--skip=path::subdir_directory_directory" + "--skip=path::subdir_directory_target" + "--skip=path::subdir_source_directory" + "--skip=path::subdir_source_target" ]; meta = { diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 9ceee9d8fff6..48c57c269c81 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -13,7 +13,7 @@ pipewire, libpulseaudio, autoPatchelfHook, - pnpm_9, + pnpm_10, nodejs, nix-update-script, withTTS ? true, @@ -24,29 +24,29 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-z2MKnCWDWUczoz39zzBYRB6wiSU1SRRHLpeUZeJqbLc="; + hash = "sha256-hY707k3kpfbDaRsLisVQFUeWgsxkYJ29GTdQtdeC0X4="; }; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src patches ; - hash = "sha256-xn3yE2S6hfCijV+Edx3PYgGro8eF76/GqarOIRj9Tbg="; + hash = "sha256-pL4pxIB+tF9Lv5eQdLilvg/T4knjzPqBMbTxoZ3RqbI="; }; nativeBuildInputs = [ nodejs - pnpm_9.configHook + pnpm_10.configHook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # vesktop uses venmic, which is a shipped as a prebuilt node module @@ -139,7 +139,10 @@ stdenv.mkDerivation (finalAttrs: { lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --add-flags $out/opt/Vesktop/resources/app.asar \ - ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + ${lib.strings.optionalString withTTS '' + --run 'if [[ "''${NIXOS_SPEECH:-default}" != "False" ]]; then NIXOS_SPEECH=True; else unset NIXOS_SPEECH; fi' \ + --add-flags "\''${NIXOS_SPEECH:+--enable-speech-dispatcher}" \ + ''} \ ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" '' diff --git a/pkgs/by-name/vg/vgmplay-libvgm/package.nix b/pkgs/by-name/vg/vgmplay-libvgm/package.nix index 1a8dbf8c9de8..9e46d9ebe389 100644 --- a/pkgs/by-name/vg/vgmplay-libvgm/package.nix +++ b/pkgs/by-name/vg/vgmplay-libvgm/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { pname = "vgmplay-libvgm"; - version = "0.51.1-unstable-2024-01-03"; + version = "0.51.1-unstable-2025-04-05"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "vgmplay-libvgm"; - rev = "7db1c63c056d79a8f9f533aa7eb82b7fdf7d456c"; - hash = "sha256-GjBwu8Y/lOI8SLO4SrAWcntQIwKe/hXuh9tKbOPHQiA="; + rev = "7aa3f749468e15ea6dcb94edce51315c19ee448e"; + hash = "sha256-g+nG+OdZjeHaLADQts0PcKbs3dXoBvL9qLgds+ozyRw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix index d322f6371f30..f6901368baae 100644 --- a/pkgs/by-name/vg/vgmstream/package.nix +++ b/pkgs/by-name/vg/vgmstream/package.nix @@ -1,6 +1,7 @@ { stdenv, lib, + fetchzip, fetchFromGitHub, cmake, pkg-config, @@ -10,12 +11,30 @@ ffmpeg, libvorbis, libao, - jansson, speex, nix-update-script, - buildAudaciousPlugin ? false, # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support }: +let + # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake + atrac9-src = fetchFromGitHub { + owner = "Thealexbarney"; + repo = "LibAtrac9"; + rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049"; + hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc="; + }; + + # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake + celt-0_6_1-src = fetchzip { + url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz"; + hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw="; + }; + celt-0_11_0-src = fetchzip { + url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz"; + hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E="; + }; +in + stdenv.mkDerivation rec { pname = "vgmstream"; version = "1980"; @@ -35,35 +54,62 @@ stdenv.mkDerivation rec { ]; }; + outputs = [ + "out" + "audacious" + ]; + nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optional buildAudaciousPlugin gtk3; + gtk3 + ]; buildInputs = [ mpg123 ffmpeg libvorbis libao - jansson speex - ] ++ lib.optional buildAudaciousPlugin audacious-bare; + audacious-bare + ]; - preConfigure = '' - substituteInPlace cmake/dependencies/audacious.cmake \ - --replace "pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir)" "set(AUDACIOUS_PLUGIN_DIR \"$out/lib/audacious\")" - ''; + preConfigure = + '' + substituteInPlace cmake/dependencies/audacious.cmake \ + --replace-fail "pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir)" "set(AUDACIOUS_PLUGIN_DIR \"$audacious/lib/audacious\")" + '' + + + # cmake/dependencies/celt.cmake uses configure_file to modify ${CELT_0110_PATH}/libcelt/ecintrin.h. + # Therefore, CELT_0110_PATH needs to point to a mutable directory. + lib.optionalString (stdenv.system == "x86_64-linux") '' + mkdir -p dependencies/celt-0.11.0/ + cp -r ${celt-0_11_0-src}/* dependencies/celt-0.11.0/ + chmod -R +w dependencies/celt-0.11.0/ + ''; - cmakeFlags = [ - # It always tries to download it, no option to use the system one - "-DUSE_CELT=OFF" - ] ++ lib.optional (!buildAudaciousPlugin) "-DBUILD_AUDACIOUS=OFF"; + cmakeFlags = + [ + "-DATRAC9_PATH=${atrac9-src}" + ] + # Only supported on x86_64-linux + ++ lib.optionals (stdenv.system == "x86_64-linux") [ + "-DCELT_0061_PATH=${celt-0_6_1-src}" + "-DCELT_0110_PATH=../dependencies/celt-0.11.0" + # libg719_decode omitted because it doesn't have a free software license + ]; meta = with lib; { description = "Library for playback of various streamed audio formats used in video games"; homepage = "https://vgmstream.org"; maintainers = with maintainers; [ zane ]; - license = with licenses; isc; + license = + with licenses; + [ + isc # vgmstream itself + mit # atrac9 + ] + ++ optional (stdenv.system == "x86_64-linux") bsd2; platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/vg/vgmtools/package.nix b/pkgs/by-name/vg/vgmtools/package.nix index aa2f4c961389..787a17f71af9 100644 --- a/pkgs/by-name/vg/vgmtools/package.nix +++ b/pkgs/by-name/vg/vgmtools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "vgmtools"; - version = "0.1-unstable-2023-08-27"; + version = "0.1-unstable-2025-04-05"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "7b7f2041e346f0d4fff8c834a763edc4f4d88896"; - hash = "sha256-L52h94uohLMnj29lZj+i9hM8n9hIYo20nRS8RCW8npY="; + rev = "cd9fb6c0693b28ea2c18511aa6416637bc5c91f6"; + hash = "sha256-mdHGK2hru7F66lHQtEMpvys8ZzMQMGyzxvPj625bvn8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vh/vhdl-ls/package.nix b/pkgs/by-name/vh/vhdl-ls/package.nix index 6c427cf3ad7c..258ce3584c4c 100644 --- a/pkgs/by-name/vh/vhdl-ls/package.nix +++ b/pkgs/by-name/vh/vhdl-ls/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.84.0"; + version = "0.85.0"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-MzlsZoV09QeerpbE/Nmu5tMIvgscu84fk2bYlWn7bjg="; + hash = "sha256-uqJiPJ86zX9r44F8D6tabw7Cp24WQoQTen3VqnjlYu0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nKA38HbFFYRGd48VGqd7SHMY8fvTLE8to3iturKgWqM="; + cargoHash = "sha256-ZC9HwMwrK3xWKr+gnf3SGMUcSRkvV3HL5h9R2lmfW9Q="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/pkgs/by-name/vi/vi-mongo/package.nix b/pkgs/by-name/vi/vi-mongo/package.nix index 66c152015a0e..e949c68dfa51 100644 --- a/pkgs/by-name/vi/vi-mongo/package.nix +++ b/pkgs/by-name/vi/vi-mongo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "vi-mongo"; - version = "0.1.22"; + version = "0.1.27"; src = fetchFromGitHub { owner = "kopecmaciej"; repo = "vi-mongo"; tag = "v${version}"; - hash = "sha256-OKeflsr823Z9KBgymJG2Z9C4OFxdbW8LzVCWLahMJ0s="; + hash = "sha256-/hj2JMjBKl3HLd6Mfuz4UnaWbPKPYHYfqKPj3kjxLZg="; }; - vendorHash = "sha256-rKXrmK0ns3FB6EGyCJ2nYrCUsQ7yPm8dmzJioiVzHIc="; + vendorHash = "sha256-OVd2wIssVJHamWpNrK+piQFl9Lz0xgYnnz/4D5yl1D4="; ldflags = [ "-s" @@ -26,7 +26,7 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/vi/vial/package.nix b/pkgs/by-name/vi/vial/package.nix index 327da518da95..035be0c5c03f 100644 --- a/pkgs/by-name/vi/vial/package.nix +++ b/pkgs/by-name/vi/vial/package.nix @@ -4,12 +4,12 @@ appimageTools, }: let - version = "0.7.1"; + version = "0.7.3"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - hash = "sha256-pOcrxZ6vbnbdE/H4Kxufxm/ZovaYBXjFpVpKZYV7f3c="; + hash = "sha256-tdSJjmf1IUQ1S7V90dTVgWJDOAuBsiUTUz0QV6LPlqo="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/vi/vice/package.nix b/pkgs/by-name/vi/vice/package.nix index 9321531ae43b..d4f68c8569d4 100644 --- a/pkgs/by-name/vi/vice/package.nix +++ b/pkgs/by-name/vi/vice/package.nix @@ -24,6 +24,7 @@ wrapGAppsHook3, xdg-utils, libevdev, + pulseaudio, }: stdenv.mkDerivation rec { @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { xa xdg-utils libevdev + pulseaudio ]; dontDisableStatic = true; configureFlags = [ diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix new file mode 100644 index 000000000000..19ff19753ec3 --- /dev/null +++ b/pkgs/by-name/vi/viceroy/package.nix @@ -0,0 +1,36 @@ +{ + rustPlatform, + fetchFromGitHub, + lib, +}: + +rustPlatform.buildRustPackage rec { + pname = "viceroy"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "fastly"; + repo = pname; + rev = "v${version}"; + hash = "sha256-DeViAqL+7mta/wH7rLyltOCtHCTFXZczn2vAL1k+R2Y="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-LBJD1w8/jLw5xYdHxR+EM2Cb4eVFpRw+M/K7K4Z0OUw="; + + cargoTestFlags = [ + "--package viceroy-lib" + ]; + + meta = with lib; { + description = "Viceroy provides local testing for developers working with Compute@Edge"; + mainProgram = "viceroy"; + homepage = "https://github.com/fastly/Viceroy"; + license = licenses.asl20; + maintainers = with maintainers; [ + ereslibre + shyim + ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index c88c54232bc1..2cb333913c17 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.113.0"; + version = "1.117.1"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-yjK81kT2EW8Vqykl2xelCQg54ancVfSHriG08z7tXWU="; + hash = "sha256-Y3Ai5e9bJnGlWfxOMWMhesJ/eHrklSbR+YmR1EgzFS0="; }; vendorHash = null; diff --git a/pkgs/by-name/vi/video-compare/package.nix b/pkgs/by-name/vi/video-compare/package.nix index fb50c72099ef..5db6f0777e1a 100644 --- a/pkgs/by-name/vi/video-compare/package.nix +++ b/pkgs/by-name/vi/video-compare/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "video-compare"; - version = "20250223"; + version = "20250420"; src = fetchFromGitHub { owner = "pixop"; repo = "video-compare"; tag = version; - hash = "sha256-h74TWXPcbIjfejGfHnjKZqKzpV0DIkC5llSD1jmiDDY="; + hash = "sha256-q61ZT2a2AkYWk4v2oZqCLHVu5eZQQrDLgD8vxitGyA4="; }; postPatch = '' diff --git a/pkgs/by-name/vi/video-downloader/package.nix b/pkgs/by-name/vi/video-downloader/package.nix index dfc4d49dfc96..2673c702526d 100644 --- a/pkgs/by-name/vi/video-downloader/package.nix +++ b/pkgs/by-name/vi/video-downloader/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "video-downloader"; - version = "0.12.24"; + version = "0.12.25"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Unrud"; repo = "video-downloader"; tag = "v${version}"; - hash = "sha256-lgHAO4/dqwwp/PiIFHCBRfDNUw0GfomMvfaobakxFdA="; + hash = "sha256-1riIOYXtiC06n2M/eFjsydqrkCvBtrGkHKEJWiTJ8/8="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/vi/video-trimmer/package.nix b/pkgs/by-name/vi/video-trimmer/package.nix index 6e7b14b75474..5f7ef32cac21 100644 --- a/pkgs/by-name/vi/video-trimmer/package.nix +++ b/pkgs/by-name/vi/video-trimmer/package.nix @@ -20,19 +20,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "video-trimmer"; - version = "0.9.0"; + version = "25.03"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "YaLTeR"; repo = "video-trimmer"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-4B3NNGww+UjI/VbsKL62vWlKye7NYXYPzlJ4TfywJDw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-pJCXL0voOoc8KpYECYRWGefYMrsApNPST4wv8SQlH34="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-H7KB4O3Wyp2YdMLFwvQuYLhk7Ei7SecnMN9wg60FIm8="; + hash = "sha256-3ycc4jXneGsz9Jp9Arzf224JPAKM+PxUkitWcIXre8Y="; }; nativeBuildInputs = [ @@ -77,12 +77,11 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://gitlab.gnome.org/YaLTeR/video-trimmer"; description = "Trim videos quickly"; - maintainers = - with lib.maintainers; - [ - doronbehar - ] - ++ lib.teams.gnome-circle.members; + changelog = "https://gitlab.gnome.org/YaLTeR/video-trimmer/-/releases/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ + doronbehar + ]; + teams = [ lib.teams.gnome-circle ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "video-trimmer"; diff --git a/pkgs/by-name/vi/video2x/package.nix b/pkgs/by-name/vi/video2x/package.nix index 244187e99578..6cbbe53ca5b0 100644 --- a/pkgs/by-name/vi/video2x/package.nix +++ b/pkgs/by-name/vi/video2x/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix index af64d403dcb6..ab4feb991bb2 100644 --- a/pkgs/by-name/vi/vieb/package.nix +++ b/pkgs/by-name/vi/vieb/package.nix @@ -11,20 +11,20 @@ buildNpmPackage rec { pname = "vieb"; - version = "12.2.0"; + version = "12.3.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - hash = "sha256-5LbVSwU+G3mu5MWxmnscoqfQw3ZA9xFXNJGYx3L+aUQ="; + hash = "sha256-g3L+bzsDP3vfTaroqCWzRDymFTZE+6nLytRWzPMBoX8="; }; postPatch = '' sed -i '/"electron"/d' package.json ''; - npmDepsHash = "sha256-RgMPFxjXEvEb8Jz9f6kWiBFqgVYIsyOsUDWkkyaw4IM="; + npmDepsHash = "sha256-0V2fKdfqO64DLqLGz1OK9BZEbwGDqPFUdxu9F6v6Ms4="; makeCacheWritable = true; dontNpmBuild = true; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix index 2110a038fd3d..cc76b1097b16 100644 --- a/pkgs/by-name/vi/vifm/package.nix +++ b/pkgs/by-name/vi/vifm/package.nix @@ -23,11 +23,11 @@ let in stdenv.mkDerivation rec { pname = if isFullPackage then "vifm-full" else "vifm"; - version = "0.14"; + version = "0.14.2"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - hash = "sha256-JxTdTO9OU+eomAroRF6IJ5EE+BXUf0F/oLit/i89G+0="; + hash = "sha256-zRsF0lQ832gp1gsjvCJcb94T0+98EAj4IbkgmDfx4rA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/vimb-unwrapped/package.nix b/pkgs/by-name/vi/vimb-unwrapped/package.nix index 269e78b8c05b..d01cb36edc07 100644 --- a/pkgs/by-name/vi/vimb-unwrapped/package.nix +++ b/pkgs/by-name/vi/vimb-unwrapped/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, pkg-config, - libsoup_2_4, + libsoup_3, webkitgtk_4_1, gtk3, glib-networking, @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - libsoup_2_4 + libsoup_3 webkitgtk_4_1 glib-networking gsettings-desktop-schemas diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix index b57e51867316..bfec5d72a56f 100644 --- a/pkgs/by-name/vi/vimcats/package.nix +++ b/pkgs/by-name/vi/vimcats/package.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "vimcats"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "vimcats"; rev = "v${version}"; - hash = "sha256-QV/eIy6yd6Lnmo8XV+E37/oCZCC3jlPu31emH0MgiO4="; + hash = "sha256-BW1pU7NnW8yWePV0IQOUmcNa13NvV9lOZhfnEdQFBQQ="; }; buildFeatures = [ "cli" ]; useFetchCargoVendor = true; - cargoHash = "sha256-qxAxMAeeqiHNQ5jJ+Mxtkw9y0xeUFUzhClUc1k8I4HM="; + cargoHash = "sha256-OGU7jwXOUf+tVECsyKwJQ9vRqTDoV8m/WOlAqTFdfUM="; passthru.tests.version = testers.testVersion { package = vimcats; }; diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index 8a6bb7daf1fc..286e054be3c9 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -51,16 +51,20 @@ let hash = "sha256-89wnr2rIbyw490hHwckB9g1GKCXm6BERnplfwEUlNOg="; }) ]; + + postInstall = '' + cp $out/bin/wine $out/bin/wine64 + ''; }); in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "vinegar"; version = "1.8.1"; src = fetchFromGitHub { owner = "vinegarhq"; repo = "vinegar"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7rc6LKZx0OOZDedtTpHIQT4grx1FejRiVnJnVDUddy4="; }; @@ -133,7 +137,7 @@ buildGoModule rec { winetricks ] } \ - --prefix PUREGOTK_LIB_FOLDER : ${passthru.libraryPath}/lib + --set-default PUREGOTK_LIB_FOLDER ${finalAttrs.passthru.libraryPath}/lib ''; passthru = { @@ -155,7 +159,7 @@ buildGoModule rec { }; meta = { - changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; + changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${finalAttrs.version}"; description = "Open-source, minimal, configurable, fast bootstrapper for running Roblox Studio on Linux"; homepage = "https://github.com/vinegarhq/vinegar"; license = lib.licenses.gpl3Only; @@ -164,4 +168,4 @@ buildGoModule rec { platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.fromSource ]; }; -} +}) diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index 17ba8a23d8ad..9babd3729e7f 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.20.6"; + version = "1.20.9"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-/4ITVd/vdQaM9uWgpp1//XF2W+HgEBKkZlGvW2csECk="; + hash = "sha256-pia2Dv0FY28nkATOk60GqiAEnZmxgZvZfvkM8U/bZzU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index c76857b0a371..b93504cd8443 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -13,9 +13,7 @@ buildPackages, # Build inputs - ApplicationServices, expat, - Foundation, glib, libxml2, python3, @@ -38,7 +36,7 @@ libtiff, libwebp, matio, - openexr_3, + openexr, openjpeg, openslide, pango, @@ -54,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.16.0"; + version = "8.16.1"; outputs = [ "bin" @@ -67,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libvips"; repo = "libvips"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cx657BEZecPeB9rCeVym3C/d+/u+YLJn9vwxfe8b0dM="; + hash = "sha256-F2ymfvqwuCtNtFIOLgXvqRWATSMaeV7EQKYyQalCNfc="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -87,41 +85,36 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc ]; - buildInputs = - [ - glib - libxml2 - expat - (python3.withPackages (p: [ p.pycairo ])) + buildInputs = [ + glib + libxml2 + expat + (python3.withPackages (p: [ p.pycairo ])) - # Optional dependencies - cfitsio - cgif - fftw - imagemagick - lcms2 - libarchive - libexif - libheif - libhwy - libimagequant - libjpeg - libjxl - librsvg - libspng - libtiff - libwebp - matio - openexr_3 - openjpeg - openslide - pango - poppler - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Foundation - ]; + # Optional dependencies + cfitsio + cgif + fftw + imagemagick + lcms2 + libarchive + libexif + libheif + libhwy + libimagequant + libjpeg + libjxl + librsvg + libspng + libtiff + libwebp + matio + openexr + openjpeg + openslide + pango + poppler + ]; # Required by .pc file propagatedBuildInputs = [ diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix index f949538cff57..69e81b43b03d 100644 --- a/pkgs/by-name/vi/virglrenderer/package.nix +++ b/pkgs/by-name/vi/virglrenderer/package.nix @@ -5,7 +5,7 @@ meson, ninja, pkg-config, - python3, + buildPackages, libGLU, libepoxy, libX11, @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/${version}/virglrenderer-${version}.tar.bz2"; - hash = "sha256-XGgKst7ENLKCUv0jU/HiEtTYe+7b9sHnSufj0PZVsb0="; + hash = "sha256-D+SJqBL76z1nGBmcJ7Dzb41RvFxU2Ak6rVOwDRB94rM="; }; separateDebugInfo = true; @@ -51,7 +51,9 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 + (buildPackages.python3.withPackages (ps: [ + ps.pyyaml + ])) ]; mesonFlags = diff --git a/pkgs/by-name/vi/virt-v2v/package.nix b/pkgs/by-name/vi/virt-v2v/package.nix index 4d6ce4e63f54..3129e5561b4b 100644 --- a/pkgs/by-name/vi/virt-v2v/package.nix +++ b/pkgs/by-name/vi/virt-v2v/package.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH : "$out/bin:${ lib.makeBinPath [ nbdkit + ocamlPackages.nbd qemu ] }" diff --git a/pkgs/by-name/vi/virtio-win/package.nix b/pkgs/by-name/vi/virtio-win/package.nix index 8e81a5c611e0..a9d2b641e014 100644 --- a/pkgs/by-name/vi/virtio-win/package.nix +++ b/pkgs/by-name/vi/virtio-win/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "virtio-win"; - version = "0.1.266-1"; + version = "0.1.271-1"; src = fetchurl { url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; - hash = "sha256-V7D23I3JLcKuhiH4sb+9ioc96b7ceIxMSzBeoorMd80="; + hash = "sha256-u+YWathqSQyu+tQ4/viqSUkmywobN/oSEpJc/YFlZCk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix index eaa8005a224e..1794c8d6e3a7 100644 --- a/pkgs/by-name/vi/virtnbdbackup/package.nix +++ b/pkgs/by-name/vi/virtnbdbackup/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "virtnbdbackup"; - version = "2.23"; + version = "2.28"; src = fetchFromGitHub { owner = "abbbi"; repo = "virtnbdbackup"; tag = "v${version}"; - hash = "sha256-lek2UND7Qmg2ar8YvCDSOVO/TqmiMff/mRLgfyVkAvg="; + hash = "sha256-oGvsqGraJs0UkmtRN8/2eSIKc0lDD/qxyTakrj3Sqno="; }; build-system = with python3Packages; [ @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = [ "-V" ]; + versionCheckProgramArg = "-V"; meta = { description = "Backup utility for Libvirt/qemu/kvm"; diff --git a/pkgs/by-name/vi/virtualpg/package.nix b/pkgs/by-name/vi/virtualpg/package.nix index 3174eb547e81..094d74e3f5d2 100644 --- a/pkgs/by-name/vi/virtualpg/package.nix +++ b/pkgs/by-name/vi/virtualpg/package.nix @@ -5,7 +5,6 @@ validatePkgConfig, libpq, sqlite, - darwin, }: stdenv.mkDerivation rec { @@ -19,13 +18,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ validatePkgConfig - libpq # for pg_config + libpq.pg_config ]; buildInputs = [ libpq sqlite - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ]; + ]; meta = with lib; { description = "Loadable dynamic extension to both SQLite and SpatiaLite"; diff --git a/pkgs/by-name/vi/visp/package.nix b/pkgs/by-name/vi/visp/package.nix index 35ffac76f144..099aedfb91a1 100644 --- a/pkgs/by-name/vi/visp/package.nix +++ b/pkgs/by-name/vi/visp/package.nix @@ -1,7 +1,6 @@ { cmake, coin3d, - darwin, doxygen, eigen, fetchFromGitHub, @@ -55,6 +54,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/lagadic/visp/pull/1310/commits/9ed0300507e13dddd83fd62a799f5039025ea44e.patch"; hash = "sha256-xrJ7B/8mEfi9dM/ToMr6vCAwX/FMw+GA/W0zFYgT32s="; }) + + # fix error: unsupported option '-mfpu=' on darwin + # this was merged upstream, and can be removed on next release + (fetchpatch { + url = "https://github.com/lagadic/visp/commit/8c1461661f99a5db31c89ede9946d2b0244f8123.patch"; + hash = "sha256-MER5KDrFxKs+Y5G9UcEIAh95Zilmv1Vp4xq+isRMM/U="; + }) ]; nativeBuildInputs = [ @@ -88,13 +94,14 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ coin3d v4l-utils - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.IOKit ]; + ]; doCheck = true; meta = { description = "Open Source Visual Servoing Platform"; + # ref. https://github.com/lagadic/visp/pull/1658 + broken = stdenv.hostPlatform.system == "x86_64-darwin"; homepage = "https://visp.inria.fr"; changelog = "https://github.com/lagadic/visp/blob/v${finalAttrs.version}/ChangeLog.txt"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/vi/visualvm/package.nix b/pkgs/by-name/vi/visualvm/package.nix index 4f9be9a5654f..2faa90cbf9b6 100644 --- a/pkgs/by-name/vi/visualvm/package.nix +++ b/pkgs/by-name/vi/visualvm/package.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "2.1.10"; + version = "2.2"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${ builtins.replaceStrings [ "." ] [ "" ] version }.zip"; - sha256 = "sha256-CmbAYJzhzPIgUfo1M0JuwhNz6Bmymb0Fr1ERdmgQ95I="; + sha256 = "sha256-xEqzSNM5Mkt9SQ+23Edb2NMN/o8koBjhQWTGuyZ/0m4="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/vi/vitess/package.nix b/pkgs/by-name/vi/vitess/package.nix index b7366739f6f7..2d3a3c0d57c1 100644 --- a/pkgs/by-name/vi/vitess/package.nix +++ b/pkgs/by-name/vi/vitess/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "vitess"; - version = "21.0.3"; + version = "22.0.0"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-ZSxshQF84DjMQsurYhcMObPzzfT63oj8c5Pt9f9N+5Q="; + hash = "sha256-YfFGKOYlsCy9mSjtRB+ajmXnXIB8Awjm54DGGhTnu5U="; }; - vendorHash = "sha256-S8hYoP8SU4bKkYLTAcF5Al74gSw+b1oxnuaV1dZSyXA="; + vendorHash = "sha256-0rgosDZn/DZcEK8f1JE2ICiOQX1GU2H93EEAlvesNE8="; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/package.nix b/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/package.nix new file mode 100644 index 000000000000..896adad9f151 --- /dev/null +++ b/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/package.nix @@ -0,0 +1,62 @@ +{ + fetchurl, + lib, + squashfsTools, + stdenv, +}: + +# This derivation roughly follows the update-ffmpeg script that ships with the official Vivaldi +# downloads at https://vivaldi.com/download/ + +let + sources = { + x86_64-linux = fetchurl { + url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_73.snap"; + hash = "sha256-YsAYQ/fKlrvu7IbIxLO0oVhWOtZZzUmA00lrU+z/0+s="; + }; + aarch64-linux = fetchurl { + url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_74.snap"; + hash = "sha256-zwCbaFeVmeHQLEp7nmD8VlEjSY9PqSVt6CdW4wPtw9o="; + }; + }; +in +stdenv.mkDerivation rec { + + pname = "chromium-codecs-ffmpeg-extra"; + + version = "119293"; + + src = sources."${stdenv.hostPlatform.system}"; + + buildInputs = [ squashfsTools ]; + + unpackPhase = '' + unsquashfs -dest . $src + ''; + + installPhase = '' + install -vD chromium-ffmpeg-${version}/chromium-ffmpeg/libffmpeg.so $out/lib/libffmpeg.so + ''; + + passthru = { + inherit sources; + updateScript = ./update.sh; + }; + + meta = with lib; { + description = "Additional support for proprietary codecs for Vivaldi and other chromium based tools"; + homepage = "https://ffmpeg.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.lgpl21; + maintainers = with maintainers; [ + betaboon + cawilliamson + fptje + sarahec + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +} diff --git a/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/update.sh b/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/update.sh new file mode 100755 index 000000000000..fb6f3d47daf7 --- /dev/null +++ b/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts coreutils grep jq squashfsTools + +set -eu -o pipefail + +RELEASES=$(curl -H 'Snap-Device-Series: 16' http://api.snapcraft.io/v2/snaps/info/chromium-ffmpeg) +STABLE_RELEASES=$(echo $RELEASES | jq '."channel-map" | .[] | select(.channel.risk=="stable")') + +function max_version() { + local versions=$(echo $1 | jq -r '.version') + echo "$(echo $versions | grep -E -o '^[0-9]+')" +} + +function update_source() { + local platform=$1 + local selectedRelease=$2 + local version=$3 + local url=$(echo $selectedRelease | jq -r '.download.url') + source="$(nix-prefetch-url "$url")" + hash=$(nix-hash --to-sri --type sha256 "$source") + update-source-version vivaldi-ffmpeg-codecs "$version" "$hash" "$url" --ignore-same-version --system=$platform --source-key="sources.$platform" +} + +x86Release="$(echo $STABLE_RELEASES | jq 'select(.channel.architecture=="amd64")')" +x86CodecVersion=$(max_version "$x86Release") +arm64Release="$(echo $STABLE_RELEASES | jq -r 'select(.channel.architecture=="arm64")')" +arm64CodecVersion=$(max_version "$arm64Release") + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; vivaldi-ffmpeg-codecs.version or (lib.getVersion vivaldi-ffmpeg-codecs)" | tr -d '"') + +if [[ "$currentVersion" == "$x86CodecVersion" ]]; then + exit 0 +fi + +# If this fails too often, consider finding the max common version between the two architectures +if [[ "$x86CodecVersion" != "$arm64CodecVersion" ]]; then + >&2 echo "Multiple chromium versions found: $x86CodecVersion (intel) and $arm64CodecVersion (arm); no update" + exit 1 +fi + + + +update_source "x86_64-linux" "$x86Release" "$x86CodecVersion" +update_source "aarch64-linux" "$arm64Release" "$arm64CodecVersion" diff --git a/pkgs/by-name/vi/vivictpp/package.nix b/pkgs/by-name/vi/vivictpp/package.nix index 97bba1a68e7a..9d18dee80066 100644 --- a/pkgs/by-name/vi/vivictpp/package.nix +++ b/pkgs/by-name/vi/vivictpp/package.nix @@ -10,6 +10,7 @@ git, SDL2, SDL2_ttf, + libX11, freetype, harfbuzz, ffmpeg, @@ -65,6 +66,7 @@ stdenv.mkDerivation { buildInputs = [ SDL2 + libX11 SDL2_ttf freetype harfbuzz diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix index 2b3cdbaf80a0..8f5ca40616ce 100644 --- a/pkgs/by-name/vl/vlang/package.nix +++ b/pkgs/by-name/vl/vlang/package.nix @@ -10,7 +10,6 @@ boehmgc, xorg, binaryen, - darwin, }: let @@ -76,9 +75,6 @@ stdenv.mkDerivation { [ binaryen ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 xorg.libXau diff --git a/pkgs/by-name/vl/vlc/deterministic-plugin-cache.diff b/pkgs/by-name/vl/vlc/deterministic-plugin-cache.diff new file mode 100644 index 000000000000..becb547c1c39 --- /dev/null +++ b/pkgs/by-name/vl/vlc/deterministic-plugin-cache.diff @@ -0,0 +1,28 @@ +diff --git a/src/modules/bank.c b/src/modules/bank.c +index 52037d5b59..c94e71fef9 100644 +--- a/src/modules/bank.c ++++ b/src/modules/bank.c +@@ -461,6 +461,11 @@ static void AllocatePluginDir (module_bank_t *bank, unsigned maxdepth, + closedir (dh); + } + ++static int plugin_cmp(const void *first, const void *second) ++{ ++ return strcmp((*(vlc_plugin_t **) first)->path, (*(vlc_plugin_t **) second)->path); ++} ++ + /** + * Scans for plug-ins within a file system hierarchy. + * \param path base directory to browse +@@ -500,8 +505,10 @@ static void AllocatePluginPath(vlc_object_t *obj, const char *path, + vlc_plugin_store(plugin); + } + +- if (mode & CACHE_WRITE_FILE) ++ if (mode & CACHE_WRITE_FILE) { ++ qsort(bank.plugins, bank.size, sizeof(vlc_plugin_t *), plugin_cmp); + CacheSave(obj, path, bank.plugins, bank.size); ++ } + + free(bank.plugins); + } diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 38bb14b8b89c..97e688c1f2e7 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -4,6 +4,7 @@ alsa-lib, autoreconfHook, avahi, + cairo, curl, dbus, faad2, @@ -13,17 +14,18 @@ ffmpeg_6, flac, fluidsynth, + fontconfig, freefont_ttf, freetype, fribidi, genericUpdater, gnutls, + harfbuzz, + libGL, libSM, libXext, libXinerama, libXpm, - libXv, - libXvMC, libarchive, libass, libbluray, @@ -36,17 +38,19 @@ libgcrypt, libgpg-error, libjack2, + libjpeg, libkate, libmad, libmatroska, libmicrodns, libmodplug, + libmpeg2, libmtp, - liboggz, + libogg, libopus, libplacebo_5, + libpng, libpulseaudio, - libraw1394, librsvg, libsForQt5, libsamplerate, @@ -57,12 +61,10 @@ libupnp, libv4l, libva, - libvdpau, libvorbis, libxml2, live555, lua5, - mpeg2dec, ncurses, perl, pkg-config, @@ -74,7 +76,7 @@ speex, srt, stdenv, - systemd, + systemdLibs, taglib_1, unzip, wayland, @@ -109,6 +111,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-JNu+HX367qCZTV3vC73iABdzRxNtv+Vz9bakzuJa+7A="; }; + depsBuildBuild = optionals waylandSupport [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook @@ -133,17 +137,19 @@ stdenv.mkDerivation (finalAttrs: { a52dec alsa-lib avahi + cairo dbus faad2 ffmpeg_6 flac fluidsynth + fontconfig + freetype fribidi gnutls + harfbuzz + libGL libSM - libXpm - libXv - libXvMC libarchive libass libbluray @@ -156,16 +162,18 @@ stdenv.mkDerivation (finalAttrs: { libebml libgcrypt libgpg-error + libjpeg libkate libmad libmatroska libmodplug + libmpeg2 libmtp - liboggz + libogg libopus libplacebo_5 + libpng libpulseaudio - libraw1394 librsvg libsamplerate libspatialaudio @@ -175,30 +183,26 @@ stdenv.mkDerivation (finalAttrs: { libupnp libv4l libva - libvdpau libvorbis libxml2 lua5 - mpeg2dec ncurses samba schroedinger speex srt - systemd + systemdLibs taglib_1 xcbutilkeysyms - wayland-scanner # only required for configure script zlib ] - ++ optionals (!stdenv.hostPlatform.isAarch && !onlyLibVLC) [ live555 ] + ++ optionals (!onlyLibVLC) [ live555 ] ++ optionals jackSupport [ libjack2 ] ++ optionals chromecastSupport [ libmicrodns protobuf ] ++ optionals skins2Support [ - freetype libXext libXinerama libXpm @@ -220,16 +224,12 @@ stdenv.mkDerivation (finalAttrs: { env = { - # vlc depends on a c11-gcc wrapper script which we don't have so we need to - # set the path to the compiler + # vlc searches for c11-gcc, c11, c99-gcc, c99, which don't exist and would be wrong for cross compilation anyway. BUILDCC = "${pkgsBuildBuild.stdenv.cc}/bin/gcc"; - PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = "wayland-scanner"; + LIVE555_PREFIX = live555; } // lib.optionalAttrs stdenv.cc.isGNU { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - } - // lib.optionalAttrs (!stdenv.hostPlatform.isAarch) { - LIVE555_PREFIX = live555; }; patches = [ @@ -245,6 +245,9 @@ stdenv.mkDerivation (finalAttrs: { url = "https://code.videolan.org/videolan/vlc/-/commit/ba5dc03aecc1d96f81b76838f845ebde7348cf62.diff"; hash = "sha256-s6AI9O0V3AKOyw9LbQ9CgjaCi5m5+nLacKNLl5ZLC6Q="; }) + # make the plugins.dat file generation reproducible + # upstream merge request: https://code.videolan.org/videolan/vlc/-/merge_requests/7149 + ./deterministic-plugin-cache.diff ]; postPatch = @@ -269,10 +272,7 @@ stdenv.mkDerivation (finalAttrs: { # Most of the libraries are auto-detected so we don't need to set a bunch of # "--enable-foo" flags here configureFlags = - [ - "--enable-srt" # Explicit enable srt to ensure the patch is applied. - "--with-kde-solid=$out/share/apps/solid/actions" - ] + [ "--with-kde-solid=$out/share/apps/solid/actions" ] ++ optionals onlyLibVLC [ "--disable-vlc" ] ++ optionals skins2Support [ "--enable-skins2" ] ++ optionals waylandSupport [ "--enable-wayland" ] @@ -287,11 +287,6 @@ stdenv.mkDerivation (finalAttrs: { sed -i 's|^#define CONFIGURE_LINE.*$|#define CONFIGURE_LINE ""|g' config.h ''; - # fails on high core machines - # ld: cannot find -lvlc_vdpau: No such file or directory - # https://code.videolan.org/videolan/vlc/-/issues/27338 - enableParallelInstalling = false; - # Add missing SOFA files # Given in EXTRA_DIST, but not in install-data target postInstall = '' @@ -311,6 +306,7 @@ stdenv.mkDerivation (finalAttrs: { # should be the same as pkgsBuildBuild.qt5.qttranslations. postFixup = '' + patchelf --add-rpath ${libv4l}/lib "$out/lib/vlc/plugins/access/libv4l2_plugin.so" find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' ${ if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else pkgsBuildBuild.libvlc diff --git a/pkgs/development/libraries/vmmlib/disable-cpack.patch b/pkgs/by-name/vm/vmmlib/disable-cpack.patch similarity index 100% rename from pkgs/development/libraries/vmmlib/disable-cpack.patch rename to pkgs/by-name/vm/vmmlib/disable-cpack.patch diff --git a/pkgs/by-name/vm/vmmlib/package.nix b/pkgs/by-name/vm/vmmlib/package.nix new file mode 100644 index 000000000000..3a15b69d453a --- /dev/null +++ b/pkgs/by-name/vm/vmmlib/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + boost, + lapack, +}: + +stdenv.mkDerivation rec { + version = "1.6.2"; + pname = "vmmlib"; + + src = fetchFromGitHub { + owner = "VMML"; + repo = "vmmlib"; + rev = "release-${version}"; + sha256 = "0sn6jl1r5k6ka0vkjsdnn14hb95dqq8158dapby6jk72wqj9kdml"; + }; + + patches = [ + ./disable-cpack.patch # disable the need of cpack/rpm + ]; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + buildInputs = [ + boost + lapack + ]; + + doCheck = !stdenv.hostPlatform.isDarwin; + + checkTarget = "test"; + + meta = with lib; { + broken = stdenv.hostPlatform.isDarwin; + description = "Vector and matrix math library implemented using C++ templates"; + + longDescription = '' + vmmlib is a vector and matrix math library implemented + using C++ templates. Its basic functionality includes a vector + and a matrix class, with additional functionality for the + often-used 3d and 4d vectors and 3x3 and 4x4 matrices. + More advanced functionality include solvers, frustum + computations and frustum culling classes, and spatial data structures + ''; + + license = licenses.bsd2; + homepage = "https://github.com/VMML/vmmlib/"; + maintainers = [ maintainers.adev ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/vm/vmware-workstation/package.nix b/pkgs/by-name/vm/vmware-workstation/package.nix index 4285c201cd17..71ee44c92531 100644 --- a/pkgs/by-name/vm/vmware-workstation/package.nix +++ b/pkgs/by-name/vm/vmware-workstation/package.nix @@ -1,7 +1,7 @@ { stdenv, buildFHSEnv, - fetchzip, + requireFile, lib, zlib, gdbm, @@ -33,29 +33,44 @@ unzip, }: -let - # base - versions - version = "17.6.1"; - build = "24319023"; - baseUrl = "https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${version}/${build}/linux"; +stdenv.mkDerivation (finalAttrs: { + pname = "vmware-workstation"; + version = "17.6.3"; + build = "24583834"; - # macOS - versions - unlockerVersion = "3.0.5"; - - # macOS - Unlocker - unlockerSrc = fetchFromGitHub { - owner = "paolo-projects"; - repo = "unlocker"; - rev = "${unlockerVersion}"; - sha256 = "sha256-JSEW1gqQuLGRkathlwZU/TnG6dL/xWKW4//SfE+kO0A="; + src = requireFile { + name = "VMware-Workstation-Full-${finalAttrs.version}-${finalAttrs.build}.x86_64.bundle"; + url = "https://support.broadcom.com/group/ecx/productdownloads?subfamily=VMware%20Workstation%20Pro&freeDownloads=true"; + hash = "sha256-eVdZF3KN7UxtC4n0q2qBvpp3PADuto0dEqwNsSVHjuA="; }; vmware-unpack-env = buildFHSEnv { pname = "vmware-unpack-env"; - inherit version; + inherit (finalAttrs) version; targetPkgs = pkgs: [ zlib ]; }; + unpackPhase = '' + ${finalAttrs.vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${finalAttrs.src} --extract unpacked" + ''; + + macOSUnlockerSrc = fetchFromGitHub { + owner = "paolo-projects"; + repo = "unlocker"; + tag = "3.0.5"; + hash = "sha256-JSEW1gqQuLGRkathlwZU/TnG6dL/xWKW4//SfE+kO0A="; + }; + + postPatch = lib.optionalString enableMacOSGuests '' + cp -R "${finalAttrs.macOSUnlockerSrc}" unlocker/ + + substituteInPlace unlocker/unlocker.py --replace \ + "/usr/lib/vmware/bin/" "$out/lib/vmware/bin" + + substituteInPlace unlocker/unlocker.py --replace \ + "/usr/lib/vmware/lib/libvmwarebase.so/libvmwarebase.so" "$out/lib/vmware/lib/libvmwarebase.so/libvmwarebase.so" + ''; + readline70_compat63 = symlinkJoin { name = "readline70_compat63"; paths = [ readline70 ]; @@ -63,10 +78,20 @@ let ln -s $out/lib/libreadline.so $out/lib/libreadline.so.6 ''; }; -in -stdenv.mkDerivation rec { - pname = "vmware-workstation"; - inherit version build; + + nativeBuildInputs = + [ + python3 + finalAttrs.vmware-unpack-env + autoPatchelfHook + makeWrapper + ] + ++ lib.optionals enableInstaller [ + bzip2 + sqlite + finalAttrs.readline70_compat63 + ] + ++ lib.optionals enableMacOSGuests [ unzip ]; buildInputs = [ libxslt @@ -100,42 +125,6 @@ stdenv.mkDerivation rec { xorg.libXtst ]; - nativeBuildInputs = - [ - python3 - vmware-unpack-env - autoPatchelfHook - makeWrapper - ] - ++ lib.optionals enableInstaller [ - bzip2 - sqlite - readline70_compat63 - ] - ++ lib.optionals enableMacOSGuests [ unzip ]; - - src = - fetchzip { - url = "${baseUrl}/core/VMware-Workstation-${version}-${build}.x86_64.bundle.tar"; - sha256 = "sha256-VzfiIawBDz0f1w3eynivW41Pn4SqvYf/8o9q14hln4s="; - stripRoot = false; - } - + "/VMware-Workstation-${version}-${build}.x86_64.bundle"; - - unpackPhase = '' - ${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked" - ''; - - postPatch = lib.optionalString enableMacOSGuests '' - cp -R "${unlockerSrc}" unlocker/ - - substituteInPlace unlocker/unlocker.py --replace \ - "/usr/lib/vmware/bin/" "$out/lib/vmware/bin" - - substituteInPlace unlocker/unlocker.py --replace \ - "/usr/lib/vmware/lib/libvmwarebase.so/libvmwarebase.so" "$out/lib/vmware/lib/libvmwarebase.so/libvmwarebase.so" - ''; - installPhase = '' runHook preInstall @@ -170,7 +159,7 @@ stdenv.mkDerivation rec { cp ${./vmware-installer-bootstrap} $out/etc/vmware-installer/bootstrap sed -i -e "s,@@INSTALLERDIR@@,$dest," $out/etc/vmware-installer/bootstrap sed -i -e "s,@@IVERSION@@,$vmware_installer_version," $out/etc/vmware-installer/bootstrap - sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware-installer/bootstrap + sed -i -e "s,@@BUILD@@,${finalAttrs.build}," $out/etc/vmware-installer/bootstrap # create database of vmware guest tools (avoids vmware fetching them later) mkdir -p $out/etc/vmware-installer/components @@ -184,7 +173,7 @@ stdenv.mkDerivation rec { component_version=$(cat unpacked/$component/manifest.xml | grep -oPm1 "(?<=)[^<]+") component_core_id=$([ "$component" == "vmware-installer" ] && echo "-1" || echo "1") type=$([ "$component" == "vmware-workstation" ] && echo "0" || echo "1") - sqlite3 "$database_filename" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES('$component','$component_version',${build},$component_core_id,'$component','$component',$type);" + sqlite3 "$database_filename" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES('$component','$component_version',${finalAttrs.build},$component_core_id,'$component','$component',$type);" mkdir -p $out/etc/vmware-installer/components/$component cp -r $folder/* $out/etc/vmware-installer/components/$component done @@ -198,8 +187,8 @@ stdenv.mkDerivation rec { ## VMware Config echo "Installing VMware Config" cp ${./vmware-config} $out/etc/vmware/config - sed -i -e "s,@@VERSION@@,${version}," $out/etc/vmware/config - sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware/config + sed -i -e "s,@@VERSION@@,${finalAttrs.version}," $out/etc/vmware/config + sed -i -e "s,@@BUILD@@,${finalAttrs.build}," $out/etc/vmware/config sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/config ## VMware VMX @@ -381,16 +370,17 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Industry standard desktop hypervisor for x86-64 architecture"; - homepage = "https://www.vmware.com/products/workstation-pro.html"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + homepage = "https://www.vmware.com/products/desktop-hypervisor/workstation-and-fusion"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ + mainProgram = "vmware"; + maintainers = with lib.maintainers; [ cawilliamson deinferno vifino ]; }; -} +}) diff --git a/pkgs/by-name/vn/vnote/package.nix b/pkgs/by-name/vn/vnote/package.nix index 48d675880deb..00a519f1087b 100644 --- a/pkgs/by-name/vn/vnote/package.nix +++ b/pkgs/by-name/vn/vnote/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vnote"; - version = "3.18.2"; + version = "3.19.2"; src = fetchFromGitHub { owner = "vnotex"; repo = "vnote"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-2yNhWDExxg5A6DgGtKAtql3HsJuYG1YM/NjUJ718jRw="; + hash = "sha256-40k0wSqRdwlUqrbb9mDK0dqsSEqCfbNLt+cUKeky+do="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vo/vocal/package.nix b/pkgs/by-name/vo/vocal/package.nix deleted file mode 100644 index dd43e0263909..000000000000 --- a/pkgs/by-name/vo/vocal/package.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - nix-update-script, - cmake, - ninja, - vala, - pkg-config, - pantheon, - gtk3, - glib, - glib-networking, - libxml2, - webkitgtk_4_0, - clutter-gtk, - clutter-gst, - libunity, - libnotify, - sqlite, - gst_all_1, - json-glib, - libgee, - wrapGAppsHook3, -}: - -stdenv.mkDerivation rec { - pname = "vocal"; - version = "2.4.2"; - - src = fetchFromGitHub { - owner = "needle-and-thread"; - repo = pname; - rev = version; - sha256 = "1c4n89rdl9r13kmmh2qymmy9sa6shjwai7df48k2kfn0pnzq5mad"; - }; - - nativeBuildInputs = [ - cmake - libxml2 - ninja - vala - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = with gst_all_1; [ - clutter-gst - clutter-gtk - glib - gst-plugins-base - gst-plugins-good - gstreamer - gtk3 - json-glib - libgee - libnotify - libunity - pantheon.granite - sqlite - webkitgtk_4_0 - glib-networking - ]; - - patches = [ - # granite 6.0.0 removed about dialogs - # see: https://github.com/needle-and-thread/vocal/issues/483 - (fetchpatch { - name = "remove-about.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/03543ffdb6cd52ce1a8293f3303225b3afac2431/trunk/remove-about.patch"; - sha256 = "sha256-yGD7BYOTmqs4h+Odh/mB3fI1HM7GDO6F+QaHpRUD5p4="; - }) - ]; - - postPatch = '' - # Fix build with vala 0.56 - # https://github.com/needle-and-thread/vocal/pull/503 - substituteInPlace src/Vocal.vala \ - --replace "public const OptionEntry[] app_options" "private const OptionEntry[] app_options" - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Podcast client for the modern free desktop"; - longDescription = '' - Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that independent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals. - ''; - homepage = "https://github.com/needle-and-thread/vocal"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ] ++ teams.pantheon.members; - platforms = platforms.linux; - mainProgram = "com.github.needleandthread.vocal"; - }; -} diff --git a/pkgs/by-name/vo/volanta/package.nix b/pkgs/by-name/vo/volanta/package.nix index b0bef0f92861..389b78429b2a 100644 --- a/pkgs/by-name/vo/volanta/package.nix +++ b/pkgs/by-name/vo/volanta/package.nix @@ -6,10 +6,10 @@ }: let pname = "volanta"; - version = "1.10.11"; + version = "1.11.3"; src = fetchurl { - url = "https://cdn.volanta.app/software/volanta-app/${version}-5495eec5/volanta-${version}.AppImage"; - hash = "sha256-DvAtgLe8eWG9sqxPaZGsk0CZWZci124bu2IFDU5Y1BQ="; + url = "https://cdn.volanta.app/software/volanta-app/${version}-622dc10d/volanta-${version}.AppImage"; + hash = "sha256-vplJEE+D2Yzr4fD//CdLRAYAKQp6a1RR0jZ1N46Q8xU="; }; appImageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/vo/volatility3/package.nix b/pkgs/by-name/vo/volatility3/package.nix index db747b0fc29f..aa64c2923a3a 100644 --- a/pkgs/by-name/vo/volatility3/package.nix +++ b/pkgs/by-name/vo/volatility3/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "volatility3"; - version = "2.11.0"; + version = "2.26.0"; pyproject = true; src = fetchFromGitHub { owner = "volatilityfoundation"; repo = "volatility3"; tag = "v${version}"; - hash = "sha256-X2cTZaEUQm7bE0k2ve4vKj0k1N6zeLXfDzhWm32diVY="; + hash = "sha256-O12w1NM2Hdp3UeeHpvibYfqLlXdQ+baqWX1qrr6SxSE="; }; build-system = with python3.pkgs; [ @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Volatile memory extraction frameworks"; homepage = "https://www.volatilityfoundation.org/"; - changelog = "https://github.com/volatilityfoundation/volatility3/releases/tag/v${version}"; + changelog = "https://github.com/volatilityfoundation/volatility3/releases/tag/${src.tag}"; license = { # Volatility Software License 1.0 free = false; diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix index baf2030aa164..83ad131e8d22 100644 --- a/pkgs/by-name/vo/volta/package.nix +++ b/pkgs/by-name/vo/volta/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; # Tries to create /var/empty/.volta as $HOME is not writable doInstallCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/vo/voms/package.nix b/pkgs/by-name/vo/voms/package.nix index b878e0b9d13b..2ecf704387a2 100644 --- a/pkgs/by-name/vo/voms/package.nix +++ b/pkgs/by-name/vo/voms/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "voms"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "italiangrid"; repo = "voms"; rev = "v${finalAttrs.version}"; - hash = "sha256-Xz9+NYaSZsVuoIbyuejVWmwEmsPmMVtBAD94/SXP8ag="; + hash = "sha256-ipNgx87M/NNvAaeUf30nUDmf4Q9k5zakkgMk4/1N6VM="; }; passthru = { diff --git a/pkgs/by-name/vo/vors/package.nix b/pkgs/by-name/vo/vors/package.nix new file mode 100644 index 000000000000..b8c6dc90f9e5 --- /dev/null +++ b/pkgs/by-name/vo/vors/package.nix @@ -0,0 +1,108 @@ +{ + curl, + fetchurl, + lib, + genericUpdater, + go, + perl, + stdenv, + writeShellScript, + zstd, + pkg-config, + opusfile, + sox, + makeWrapper, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vors"; + version = "3.1.0"; + + src = fetchurl { + url = "http://www.vors.stargrave.org/download/vors-${finalAttrs.version}.tar.zst"; + hash = "sha256-ZRQI96j0n00eh1qxO8NgJeOQPU9bfzHoHa45xQNuzv8="; + }; + + buildInputs = [ + go + opusfile + sox + ]; + + nativeBuildInputs = [ + zstd + pkg-config + perl + makeWrapper + ]; + + preConfigure = "export GOCACHE=$NIX_BUILD_TOP/gocache"; + + buildPhase = '' + runHook preBuild + ./mk-non-static + mkdir -p ./local/lib # Required to prevent building libopusfile + ./build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p "$out"/bin + cp -f bin/* "$out"/bin + chmod 755 "$out"/bin/* + runHook postInstall + ''; + + postInstall = '' + wrapProgram "$out"/bin/vors-client \ + --prefix PATH : ${lib.makeBinPath [ sox ]} + ''; + + enableParallelBuilding = true; + + passthru.updateScript = genericUpdater { + versionLister = writeShellScript "vors-versionLister" '' + ${curl}/bin/curl -s ${finalAttrs.meta.downloadPage} | ${perl}/bin/perl -lne 'print $1 if /td.*>([0-9.]+) str: + logger.debug("Executing command: {} (shell={})", command, shell) + return subprocess.run( + command, + check=True, + capture_output=True, + text=True, + env=env, + shell=shell, + ).stdout.strip() + + def _get_extension_list(self) -> list[str]: + # Get extension list from nix-search-tv output + command = "nix-search-tv print | grep '^nixpkgs/ vscode-extensions\\.' | cut -d' ' -f2-" + output = self.execute_command(command, shell=True) + extension_list = output.splitlines() + logger.info("Found {} extensions: {}", len(extension_list), extension_list) + return extension_list + + def _has_update_script(self, extension: str) -> bool: + try: + result = self._get_nix_attribute(f"{extension}.updateScript") + return "not found" not in result + except subprocess.CalledProcessError: + return False + + def _get_nix_attribute(self, attribute: str) -> str: + return self.execute_command(["nix", "eval", "--raw", "-f", ".", attribute]) + + def _get_extension_filename(self, extension: str) -> str | None: + return self._extension_file_map.get(extension) + + def _update_extension(self, extension: str) -> None: + logger.info("Updating extension: {}", extension) + if extension in self._excluded_extensions: + return + try: + if self._has_update_script(extension): + return + update_command = ["vscode-extension-update", extension, "--commit"] + filename = self._get_extension_filename(extension) + if filename: + update_command.extend(["--override-filename", filename]) + self.execute_command(update_command) + logger.info("Updated extension: {}", extension) + except subprocess.CalledProcessError: + logger.error("Failed to update extension: {}", extension) + self.execute_command(["git", "restore", "."]) + + def run(self) -> None: + for extension in self._get_extension_list(): + self._update_extension(extension) + + +if __name__ == "__main__": + updater = VSCodeExtensionBatchUpdater() + updater.run() diff --git a/pkgs/by-name/vs/vscode-extension-update/vscode_extension_update.py b/pkgs/by-name/vs/vscode-extension-update/vscode_extension_update.py new file mode 100755 index 000000000000..979e44a3bcee --- /dev/null +++ b/pkgs/by-name/vs/vscode-extension-update/vscode_extension_update.py @@ -0,0 +1,438 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p nix python3 python3Packages.loguru nodePackages.semver vsce nix-update gitMinimal coreutils common-updater-scripts + +import argparse +import json +import os +import re +import subprocess +import sys + +from loguru import logger + + +class VSCodeExtensionUpdater: + """ + A class to update VSCode extension version. + """ + + def __init__(self): + self.parser = argparse.ArgumentParser( + description="Update VSCode extension version." + ) + self.parser.add_argument( + "attribute", + nargs="?", + default=os.getenv("UPDATE_NIX_ATTR_PATH"), + help="nix attribute path of the extension", + ) + self.parser.add_argument( + "--override-filename", help="override-filename for nix-update" + ) + self.parser.add_argument( + "--pre-release", + action="store_true", + help="allow check pre-release versions", + ) + self.parser.add_argument( + "--commit", action="store_true", help="commit the updated package" + ) + self.args = self.parser.parse_args() + self.attribute_path = self.args.attribute + if not self.attribute_path: + logger.error("Error: Attribute path is required.") + sys.exit(1) + self.target_vscode_version = self._get_nix_vscode_version() + self.current_version = self._get_nix_vscode_extension_version() + self.override_filename = self.args.override_filename + self.allow_pre_release = self.args.pre_release + self.commit = self.args.commit + self.extension_publisher = self._get_nix_vscode_extension_publisher() + self.extension_name = self._get_nix_vscode_extension_name() + self.extension_marketplace_id = ( + f"{self.extension_publisher}.{self.extension_name}" + ) + self.nix_system = self.get_nix_system() + nix_vscode_extension_platforms = self._get_nix_vscode_extension_platforms() + if not nix_vscode_extension_platforms and self._has_platform_source(): + logger.error("Error: not found meta.platforms.") + sys.exit(1) + self.nix_vscode_extension_platforms = nix_vscode_extension_platforms or [ + self.nix_system + ] + if self.nix_system in self.nix_vscode_extension_platforms: + self.nix_vscode_extension_platforms.remove(self.nix_system) + self.nix_vscode_extension_platforms.insert(0, self.nix_system) + self.supported_nix_systems = self.get_supported_nix_systems() + logger.info(f"VSCode version: {self.target_vscode_version}") + logger.info(f"Extension Marketplace ID: {self.extension_marketplace_id}") + logger.info(f"Extension Current Version: {self.current_version}") + + def execute_command( + self, commandline: list[str], env: dict[str, str] = None + ) -> str: + """ + Executes a shell command and returns its output. + """ + logger.debug("Executing command: {}", commandline) + return subprocess.run( + commandline, + check=True, + capture_output=True, + text=True, + env=env, + ).stdout.strip() + + def _get_nix_attribute(self, attribute_path: str) -> str: + """ + Retrieves a raw Nix attribute value. + """ + return self.execute_command(["nix", "eval", "--raw", "-f", ".", attribute_path]) + + def get_nix_system(self) -> str: + """ + Retrieves system from Nix. + """ + return self._get_nix_attribute("system") + + def get_supported_nix_systems(self) -> list[str]: + nix_config = self.execute_command(["nix", "config", "show"]) + system = None + extra_platforms = [] + for line in nix_config.splitlines(): + if "=" not in line: + continue + key, value = line.split("=", 1) + key = key.strip() + value = value.strip() + if key == "system": + system = value + elif key == "extra-platforms": + extra_platforms = value.strip("[]").replace('"', "").split() + return ([system] if system is not None else []) + extra_platforms + + def _has_platform_source(self) -> bool: + source_url = self._get_nix_attribute(f"{self.attribute_path}.src.url") + return "targetPlatform=" in source_url + + def _get_nix_vscode_extension_src_hash(self, system: str) -> str: + url = self.execute_command( + [ + "nix", + "eval", + "--raw", + "-f", + ".", + f"{self.attribute_path}.src.url", + "--system", + system, + ] + ) + if "warning" not in url: + sha256 = self.execute_command(["nix-prefetch-url", url]) + hash = self.execute_command( + [ + "nix", + "hash", + "convert", + "--to", + "sri", + "--hash-algo", + "sha256", + sha256, + ] + ) + return hash + + def get_target_platform(self, nix_system: str) -> str: + """ + Retrieves the VS Code targetPlatform variable based on the Nix system. + """ + platform_mapping = { + "x86_64-linux": "linux-x64", + "aarch64-linux": "linux-arm64", + "armv7l-linux": "linux-armhf", + "x86_64-darwin": "darwin-x64", + "aarch64-darwin": "darwin-arm64", + "x86_64-windows": "win32-x64", + "aarch64-windows": "win32-arm64", + } + try: + return platform_mapping[nix_system] + except KeyError: + logger.error( + f"Error: Unknown Nix system '{nix_system}'. Cannot determine targetPlatform." + ) + sys.exit(1) + + def _get_nix_vscode_version(self) -> str: + """ + Retrieves the current VSCode version from Nix. + """ + return self._get_nix_attribute("vscode.version") + + def _get_nix_vscode_extension_version(self) -> str: + """ + Retrieves the extension current version from Nix. + """ + return os.getenv("UPDATE_NIX_OLD_VERSION") or self._get_nix_attribute( + f"{self.attribute_path}.version" + ) + + def _get_nix_vscode_extension_platforms(self) -> list[str]: + """ + Retrieves the extension meta.platforms from Nix. + """ + try: + return json.loads( + self.execute_command( + [ + "nix", + "eval", + "--json", + "-f", + ".", + f"{self.attribute_path}.meta.platforms", + ] + ) + ) + except subprocess.CalledProcessError: + return [] + + def _get_nix_vscode_extension_publisher(self) -> str: + """ + Retrieves the extension publisher from Nix. + """ + return self._get_nix_attribute(f"{self.attribute_path}.vscodeExtPublisher") + + def _get_nix_vscode_extension_name(self) -> str: + """ + Retrieves the extension name from Nix. + """ + return self._get_nix_attribute(f"{self.attribute_path}.vscodeExtName") + + def get_marketplace_extension_data(self, extension_id: str) -> dict: + """ + Retrieves extension data from the VSCode Marketplace using vsce. + """ + command = ["vsce", "show", extension_id, "--json"] + try: + output = self.execute_command(command) + return json.loads(output) + except (json.JSONDecodeError, subprocess.CalledProcessError) as e: + logger.exception(e) + sys.exit(1) + + def find_compatible_extension_version( + self, extension_versions: list, target_platform: str + ) -> str: + """ + Finds the first compatible extension version based on Target Platform and VSCode compatibility. + """ + for version_info in extension_versions: + candidate_platform = version_info.get("targetPlatform", None) + if candidate_platform is not None and candidate_platform != target_platform: + continue + candidate_version = version_info.get("version") + candidate_pre_release = next( + ( + prop.get("value") + for prop in version_info.get("properties", []) + if prop.get("key") == "Microsoft.VisualStudio.Code.PreRelease" + ), + None, + ) + if candidate_pre_release and not self.allow_pre_release: + logger.debug(f"Skipping PreRelease version {candidate_version}") + continue + engine_version_constraint = next( + ( + prop.get("value") + for prop in version_info.get("properties", []) + if prop.get("key") == "Microsoft.VisualStudio.Code.Engine" + ), + None, + ) + if engine_version_constraint: + logger.debug( + f"Testing extension version: {candidate_version} with VSCode {self.target_vscode_version} (constraint: {engine_version_constraint})" + ) + engine_version_constraint = self.replace_version_symbol( + engine_version_constraint + ) + try: + self.execute_command( + [ + "semver", + self.target_vscode_version, + "-r", + engine_version_constraint, + ] + ) + logger.info(f"Compatible version found: {candidate_version}") + return candidate_version + except (ValueError, subprocess.CalledProcessError): + logger.debug( + f"Version {candidate_version} is not compatible with VSCode {self.target_vscode_version} (constraint: {engine_version_constraint})." + ) + continue + return candidate_version + else: + logger.error("Error: not found compatible version.") + sys.exit(1) + + def replace_version_symbol(self, version: str) -> str: + version = re.sub(r"^\^", ">=", version) + return version + + def update_version_for_default_nix(self, content: str, new_version: str): + target_name = self.attribute_path.removeprefix("vscode-extensions.") + pattern = re.compile( + rf"{re.escape(target_name)}\s*=\s*buildVscodeMarketplaceExtension\s*\{{", + re.MULTILINE, + ) + match = pattern.search(content) + if not match: + raise ValueError("Target block not found.") + brace_start = content.find("{", match.end() - 1) + if brace_start == -1: + raise ValueError("Opening brace not found.") + count = 0 + pos = brace_start + text_len = len(content) + while pos < text_len: + if content[pos] == "{": + count += 1 + elif content[pos] == "}": + count -= 1 + if count == 0: + break + pos += 1 + if count != 0: + raise ValueError("Braces mismatch.") + block_end = pos + block_text = content[brace_start : block_end + 1] + version_pattern = re.compile(r'(version\s*=\s*")([^"]+)(";)') + + def repl(m): + match_version = m.group(2) + if self.current_version == match_version: + return f"{m.group(1)}{new_version}{m.group(3)}" + return m.group(0) + + new_block_text, count_sub = version_pattern.subn(repl, block_text) + if count_sub == 0: + raise ValueError("No version field updated.") + updated_content = ( + content[:brace_start] + new_block_text + content[block_end + 1 :] + ) + with open( + self.override_filename, + "w", + encoding="utf-8", + ) as f: + f.write(updated_content) + + def run_nix_update(self, new_version: str, system: str) -> None: + """ + Builds and executes the nix-update command. + """ + if not self.override_filename: + self.override_filename = self.execute_command( + [ + "nix", + "edit", + "--extra-experimental-features", + "nix-command", + "-f", + ".", + self.attribute_path, + ], + env={**os.environ, "EDITOR": "echo"}, + ) + if ( + "pkgs/applications/editors/vscode/extensions/vscode-utils.nix" + in self.override_filename + ) and os.path.exists( + "pkgs/applications/editors/vscode/extensions/default.nix" + ): + self.override_filename = ( + "pkgs/applications/editors/vscode/extensions/default.nix" + ) + if ( + new_version != "skip" + and "pkgs/applications/editors/vscode/extensions/default.nix" + in self.override_filename + ): + with logger.catch(exception=(IOError, ValueError)): + with open( + self.override_filename, + "r", + encoding="utf-8", + ) as f: + content = f.read() + if content.count(self.current_version) > 1: + self.update_version_for_default_nix(content, new_version) + new_version = "skip" + if system not in self.supported_nix_systems: + hash = self._get_nix_vscode_extension_src_hash(system) + update_command = [ + "update-source-version", + self.attribute_path, + self.new_version, + hash, + f"--system={system}", + "--ignore-same-version", + "--ignore-same-hash", + f"--file={self.override_filename}", + ] + else: + update_command = [ + "nix-update", + self.attribute_path, + "--version", + new_version, + "--override-filename", + self.override_filename, + "--system", + system, + ] + self.execute_command(update_command) + + def run(self): + marketplace_data = self.get_marketplace_extension_data( + self.extension_marketplace_id + ) + available_versions = marketplace_data.get("versions", []) + logger.info( + f"Total versions found for {self.extension_marketplace_id}: {len(available_versions)}" + ) + self.new_version = self.find_compatible_extension_version( + available_versions, + self.get_target_platform(self.nix_vscode_extension_platforms[0]), + ) + try: + self.execute_command( + ["semver", self.current_version, "-r", f"<{self.new_version}"] + ) + except subprocess.CalledProcessError: + logger.info("Already up to date or new version is older!") + sys.exit(0) + for i, system in enumerate(self.nix_vscode_extension_platforms): + version = self.new_version if i == 0 else "skip" + self.run_nix_update(version, system) + if self.commit: + self.execute_command(["git", "add", self.override_filename]) + self.execute_command( + [ + "git", + "commit", + "-m", + f"{self.attribute_path}: {self.current_version} -> {self.new_version}", + ] + ) + + +if __name__ == "__main__": + updater = VSCodeExtensionUpdater() + updater.run() diff --git a/pkgs/by-name/vs/vscode-extensions-update/package.nix b/pkgs/by-name/vs/vscode-extensions-update/package.nix deleted file mode 100644 index 80c333ddf23d..000000000000 --- a/pkgs/by-name/vs/vscode-extensions-update/package.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - writeScriptBin, -}: - -writeScriptBin "vscode-extensions-update" (builtins.readFile ./vscode_extensions_update.py) diff --git a/pkgs/by-name/vs/vscode-extensions-update/vscode-extensions-update-script.nix b/pkgs/by-name/vs/vscode-extensions-update/vscode-extensions-update-script.nix deleted file mode 100644 index af432feb58e4..000000000000 --- a/pkgs/by-name/vs/vscode-extensions-update/vscode-extensions-update-script.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - lib, - vscode-extensions-update, -}: - -{ - attrPath ? null, - extraArgs ? [ ], -}: - -[ "${lib.getExe vscode-extensions-update}" ] -++ lib.optionals (attrPath != null) [ attrPath ] -++ extraArgs diff --git a/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_batch_update.py b/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_batch_update.py deleted file mode 100755 index 057065ace59f..000000000000 --- a/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_batch_update.py +++ /dev/null @@ -1,117 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p nix python3 python3Packages.loguru nix-search-tv vscode-extensions-update gitMinimal - -import argparse -import subprocess - -from loguru import logger - - -class VSCodeExtensionBatchUpdater: - # Extensions to be skipped - _excluded_extensions = [ - # wrong upstream constraint: 0.10.x - "vscode-extensions.ms-vscode.theme-tomorrowkit", - "vscode-extensions.richie5um2.snake-trail", - # not supported - "vscode-extensions.ms-ceintl.vscode-language-pack-cs", - "vscode-extensions.ms-ceintl.vscode-language-pack-de", - "vscode-extensions.ms-ceintl.vscode-language-pack-es", - "vscode-extensions.ms-ceintl.vscode-language-pack-fr", - "vscode-extensions.ms-ceintl.vscode-language-pack-it", - "vscode-extensions.ms-ceintl.vscode-language-pack-ja", - "vscode-extensions.ms-ceintl.vscode-language-pack-ko", - "vscode-extensions.ms-ceintl.vscode-language-pack-pt-br", - "vscode-extensions.ms-ceintl.vscode-language-pack-qps-ploc", - "vscode-extensions.ms-ceintl.vscode-language-pack-ru", - "vscode-extensions.ms-ceintl.vscode-language-pack-tr", - "vscode-extensions.ms-ceintl.vscode-language-pack-zh-hans", - "vscode-extensions.ms-ceintl.vscode-language-pack-zh-hant", - ] - - # Unable to determine the correct file location - _extension_file_map = { - "vscode-extensions.hashicorp.terraform": "pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix", - "vscode-extensions.betterthantomorrow.calva": "pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix", - } - - def __init__(self): - self.parser = argparse.ArgumentParser( - description="Batch update VSCode extensions" - ) - # By default, update command skips extensions with updateScript or need '--platforms' - self.parser.add_argument( - "--platforms", - action="store_true", - help="add '--platforms' to update command from some extensions", - ) - self.platforms = self.parser.parse_args().platforms - - def execute_command( - self, command, env: dict[str, str] = None, shell: bool = False - ) -> str: - logger.debug("Executing command: {} (shell={})", command, shell) - return subprocess.run( - command, - check=True, - capture_output=True, - text=True, - env=env, - shell=shell, - ).stdout.strip() - - def _get_extension_list(self) -> list[str]: - # Get extension list from nix-search-tv output - command = "nix-search-tv print | grep '^nixpkgs/ vscode-extensions\\.' | cut -d' ' -f2-" - output = self.execute_command(command, shell=True) - extension_list = output.splitlines() - logger.info("Found {} extensions: {}", len(extension_list), extension_list) - return extension_list - - def _has_update_script(self, extension: str) -> bool: - try: - result = self._get_nix_attribute(f"{extension}.updateScript") - return "not found" not in result - except subprocess.CalledProcessError: - return False - - def _has_platform_source(self, extension: str) -> bool: - source_url = self._get_nix_attribute(f"{extension}.src.url") - return "targetPlatform=" in source_url - - def _get_nix_attribute(self, attribute: str) -> str: - return self.execute_command(["nix", "eval", "--raw", "-f", ".", attribute]) - - def _get_extension_filename(self, extension: str) -> str | None: - return self._extension_file_map.get(extension) - - def _update_extension(self, extension: str) -> None: - logger.info("Updating extension: {}", extension) - if extension in self._excluded_extensions: - return - try: - if self._has_update_script(extension): - return - update_command = ["vscode-extensions-update", extension, "--commit"] - if self._has_platform_source(extension): - if self.platforms: - update_command.append("--platforms") - else: - return - filename = self._get_extension_filename(extension) - if filename: - update_command.extend(["--override-filename", filename]) - self.execute_command(update_command) - logger.info("Updated extension: {}", extension) - except subprocess.CalledProcessError: - logger.error("Failed to update extension: {}", extension) - self.execute_command(["git", "restore", "."]) - - def run(self) -> None: - for extension in self._get_extension_list(): - self._update_extension(extension) - - -if __name__ == "__main__": - updater = VSCodeExtensionBatchUpdater() - updater.run() diff --git a/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_update.py b/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_update.py deleted file mode 100755 index a8d8cbf17e2c..000000000000 --- a/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_update.py +++ /dev/null @@ -1,440 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p nix python3 python3Packages.loguru nodePackages.semver vsce nix-update gitMinimal coreutils common-updater-scripts - -import argparse -import json -import os -import re -import subprocess -import sys - -from loguru import logger - - -class VSCodeExtensionUpdater: - """ - A class to update VSCode extension version. - """ - - def __init__(self): - self.parser = argparse.ArgumentParser( - description="Update VSCode extension version." - ) - self.parser.add_argument( - "attribute", - nargs="?", - default=os.getenv("UPDATE_NIX_ATTR_PATH"), - help="nix attribute path of the extension", - ) - self.parser.add_argument( - "--override-filename", help="override-filename for nix-update" - ) - self.parser.add_argument( - "--pre-release", - action="store_true", - help="allow check pre-release versions", - ) - self.parser.add_argument( - "--platforms", - action="store_true", - help="set system according to meta.platforms for nix-update", - ) - self.parser.add_argument( - "--commit", action="store_true", help="commit the updated package" - ) - self.args = self.parser.parse_args() - self.attribute_path = self.args.attribute - if not self.attribute_path: - logger.error("Error: Attribute path is required.") - sys.exit(1) - self.target_vscode_version = self._get_nix_vscode_version() - self.current_version = self._get_nix_vscode_extension_version() - self.override_filename = self.args.override_filename - self.allow_pre_release = self.args.pre_release - self.commit = self.args.commit - self.extension_publisher = self._get_nix_vscode_extension_publisher() - self.extension_name = self._get_nix_vscode_extension_name() - self.extension_marketplace_id = ( - f"{self.extension_publisher}.{self.extension_name}" - ) - self.nix_system = self.get_nix_system() - self.nix_systems = self._get_nix_vscode_extension_platforms() or [ - self.nix_system - ] - if not self.args.platforms: - self.nix_systems = ( - [self.nix_system] - if self.nix_system in self.nix_systems - else self.nix_systems[:1] - ) - if self.nix_system in self.nix_systems: - self.nix_systems.remove(self.nix_system) - self.nix_systems.insert(0, self.nix_system) - self.supported_nix_systems = self.get_supported_nix_systems() - logger.info(f"VSCode version: {self.target_vscode_version}") - logger.info(f"Extension Marketplace ID: {self.extension_marketplace_id}") - logger.info(f"Extension Current Version: {self.current_version}") - - def execute_command( - self, commandline: list[str], env: dict[str, str] = None - ) -> str: - """ - Executes a shell command and returns its output. - """ - logger.debug("Executing command: {}", commandline) - return subprocess.run( - commandline, - check=True, - capture_output=True, - text=True, - env=env, - ).stdout.strip() - - def _get_nix_attribute(self, attribute_path: str) -> str: - """ - Retrieves a raw Nix attribute value. - """ - return self.execute_command(["nix", "eval", "--raw", "-f", ".", attribute_path]) - - def get_nix_system(self) -> str: - """ - Retrieves system from Nix. - """ - return self._get_nix_attribute("system") - - def get_supported_nix_systems(self) -> list[str]: - nix_config = self.execute_command(["nix", "config", "show"]) - system = None - extra_platforms = [] - for line in nix_config.splitlines(): - if "=" not in line: - continue - key, value = line.split("=", 1) - key = key.strip() - value = value.strip() - if key == "system": - system = value - elif key == "extra-platforms": - extra_platforms = value.strip("[]").replace('"', "").split() - return ([system] if system is not None else []) + extra_platforms - - def _get_nix_vscode_extension_src_hash(self, system: str) -> str: - url = self.execute_command( - [ - "nix", - "eval", - "--raw", - "-f", - ".", - f"{self.attribute_path}.src.url", - "--system", - system, - ] - ) - if "warning" not in url: - sha256 = self.execute_command(["nix-prefetch-url", url]) - hash = self.execute_command( - [ - "nix", - "hash", - "convert", - "--to", - "sri", - "--hash-algo", - "sha256", - sha256, - ] - ) - return hash - - def get_target_platform(self, nix_system: str) -> str: - """ - Retrieves the VS Code targetPlatform variable based on the Nix system. - """ - platform_mapping = { - "x86_64-linux": "linux-x64", - "aarch64-linux": "linux-arm64", - "armv7l-linux": "linux-armhf", - "x86_64-darwin": "darwin-x64", - "aarch64-darwin": "darwin-arm64", - "x86_64-windows": "win32-x64", - "aarch64-windows": "win32-arm64", - } - try: - return platform_mapping[nix_system] - except KeyError: - logger.error( - f"Error: Unknown Nix system '{nix_system}'. Cannot determine targetPlatform." - ) - sys.exit(1) - - def _get_nix_vscode_version(self) -> str: - """ - Retrieves the current VSCode version from Nix. - """ - return self._get_nix_attribute("vscode.version") - - def _get_nix_vscode_extension_version(self) -> str: - """ - Retrieves the extension current version from Nix. - """ - return os.getenv("UPDATE_NIX_OLD_VERSION") or self._get_nix_attribute( - f"{self.attribute_path}.version" - ) - - def _get_nix_vscode_extension_platforms(self) -> list[str]: - """ - Retrieves the extension meta.platforms from Nix. - """ - try: - return json.loads( - self.execute_command( - [ - "nix", - "eval", - "--json", - "-f", - ".", - f"{self.attribute_path}.meta.platforms", - ] - ) - ) - except subprocess.CalledProcessError: - return [] - - def _get_nix_vscode_extension_publisher(self) -> str: - """ - Retrieves the extension publisher from Nix. - """ - return self._get_nix_attribute(f"{self.attribute_path}.vscodeExtPublisher") - - def _get_nix_vscode_extension_name(self) -> str: - """ - Retrieves the extension name from Nix. - """ - return self._get_nix_attribute(f"{self.attribute_path}.vscodeExtName") - - def get_marketplace_extension_data(self, extension_id: str) -> dict: - """ - Retrieves extension data from the VSCode Marketplace using vsce. - """ - command = ["vsce", "show", extension_id, "--json"] - try: - output = self.execute_command(command) - return json.loads(output) - except (json.JSONDecodeError, subprocess.CalledProcessError) as e: - logger.exception(e) - sys.exit(1) - - def find_compatible_extension_version( - self, extension_versions: list, target_platform: str - ) -> str: - """ - Finds the first compatible extension version based on Target Platform and VSCode compatibility. - """ - for version_info in extension_versions: - candidate_platform = version_info.get("targetPlatform", None) - if candidate_platform is not None and candidate_platform != target_platform: - continue - candidate_version = version_info.get("version") - candidate_pre_release = next( - ( - prop.get("value") - for prop in version_info.get("properties", []) - if prop.get("key") == "Microsoft.VisualStudio.Code.PreRelease" - ), - None, - ) - if candidate_pre_release and not self.allow_pre_release: - logger.debug(f"Skipping PreRelease version {candidate_version}") - continue - engine_version_constraint = next( - ( - prop.get("value") - for prop in version_info.get("properties", []) - if prop.get("key") == "Microsoft.VisualStudio.Code.Engine" - ), - None, - ) - if engine_version_constraint: - logger.debug( - f"Testing extension version: {candidate_version} with VSCode {self.target_vscode_version} (constraint: {engine_version_constraint})" - ) - engine_version_constraint = self.replace_version_symbol( - engine_version_constraint - ) - try: - self.execute_command( - [ - "semver", - self.target_vscode_version, - "-r", - engine_version_constraint, - ] - ) - logger.info(f"Compatible version found: {candidate_version}") - return candidate_version - except (ValueError, subprocess.CalledProcessError): - logger.debug( - f"Version {candidate_version} is not compatible with VSCode {self.target_vscode_version} (constraint: {engine_version_constraint})." - ) - continue - return candidate_version - else: - logger.error("Error: not found compatible version.") - sys.exit(1) - - def replace_version_symbol(self, version: str) -> str: - version = re.sub(r"^\^", ">=", version) - return version - - def update_version_for_default_nix(self, content: str, new_version: str): - target_name = self.attribute_path.removeprefix("vscode-extensions.") - pattern = re.compile( - rf"{re.escape(target_name)}\s*=\s*buildVscodeMarketplaceExtension\s*\{{", - re.MULTILINE, - ) - match = pattern.search(content) - if not match: - raise ValueError("Target block not found.") - brace_start = content.find("{", match.end() - 1) - if brace_start == -1: - raise ValueError("Opening brace not found.") - count = 0 - pos = brace_start - text_len = len(content) - while pos < text_len: - if content[pos] == "{": - count += 1 - elif content[pos] == "}": - count -= 1 - if count == 0: - break - pos += 1 - if count != 0: - raise ValueError("Braces mismatch.") - block_end = pos - block_text = content[brace_start : block_end + 1] - version_pattern = re.compile(r'(version\s*=\s*")([^"]+)(";)') - - def repl(m): - match_version = m.group(2) - if self.current_version == match_version: - return f"{m.group(1)}{new_version}{m.group(3)}" - return m.group(0) - - new_block_text, count_sub = version_pattern.subn(repl, block_text) - if count_sub == 0: - raise ValueError("No version field updated.") - updated_content = ( - content[:brace_start] + new_block_text + content[block_end + 1 :] - ) - with open( - self.override_filename, - "w", - encoding="utf-8", - ) as f: - f.write(updated_content) - - def run_nix_update(self, new_version: str, system: str) -> None: - """ - Builds and executes the nix-update command. - """ - if not self.override_filename: - self.override_filename = self.execute_command( - [ - "nix", - "edit", - "--extra-experimental-features", - "nix-command", - "-f", - ".", - self.attribute_path, - ], - env={**os.environ, "EDITOR": "echo"}, - ) - if ( - "pkgs/applications/editors/vscode/extensions/vscode-utils.nix" - in self.override_filename - ) and os.path.exists( - "pkgs/applications/editors/vscode/extensions/default.nix" - ): - self.override_filename = ( - "pkgs/applications/editors/vscode/extensions/default.nix" - ) - if ( - new_version != "skip" - and "pkgs/applications/editors/vscode/extensions/default.nix" - in self.override_filename - ): - with logger.catch(exception=(IOError, ValueError)): - with open( - self.override_filename, - "r", - encoding="utf-8", - ) as f: - content = f.read() - if content.count(self.current_version) > 1: - self.update_version_for_default_nix(content, new_version) - new_version = "skip" - if system not in self.supported_nix_systems: - hash = self._get_nix_vscode_extension_src_hash(system) - update_command = [ - "update-source-version", - self.attribute_path, - self.new_version, - hash, - f"--system={system}", - "--ignore-same-version", - "--ignore-same-hash", - f"--file={self.override_filename}", - ] - else: - update_command = [ - "nix-update", - self.attribute_path, - "--version", - new_version, - "--override-filename", - self.override_filename, - "--system", - system, - ] - self.execute_command(update_command) - - def run(self): - marketplace_data = self.get_marketplace_extension_data( - self.extension_marketplace_id - ) - available_versions = marketplace_data.get("versions", []) - logger.info( - f"Total versions found for {self.extension_marketplace_id}: {len(available_versions)}" - ) - self.new_version = self.find_compatible_extension_version( - available_versions, self.get_target_platform(self.nix_systems[0]) - ) - try: - self.execute_command( - ["semver", self.current_version, "-r", f"<{self.new_version}"] - ) - except subprocess.CalledProcessError: - logger.info("Already up to date or new version is older!") - sys.exit(0) - for i, system in enumerate(self.nix_systems): - version = self.new_version if i == 0 else "skip" - self.run_nix_update(version, system) - if self.commit: - self.execute_command(["git", "add", self.override_filename]) - self.execute_command( - [ - "git", - "commit", - "-m", - f"{self.attribute_path}: {self.current_version} -> {self.new_version}", - ] - ) - - -if __name__ == "__main__": - updater = VSCodeExtensionUpdater() - updater.run() diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index 63e42bb73b67..1dd8afc27caa 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -6,8 +6,6 @@ buildPackages, libsecret, xcbuild, - Security, - AppKit, pkg-config, node-gyp, runCommand, @@ -33,12 +31,7 @@ buildNpmPackage rec { node-gyp ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - AppKit - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ]; postPatch = '' ${lib.getExe buildPackages.jq} ' diff --git a/pkgs/by-name/vs/vscode-runner/package.nix b/pkgs/by-name/vs/vscode-runner/package.nix index 24a3a23826f2..07f682e9161d 100644 --- a/pkgs/by-name/vs/vscode-runner/package.nix +++ b/pkgs/by-name/vs/vscode-runner/package.nix @@ -3,17 +3,16 @@ fetchFromGitHub, buildDartApplication, kdePackages, - nix-update-script, }: let - version = "1.6.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "Merrit"; repo = "vscode-runner"; rev = "v${version}"; - hash = "sha256-mDhwydAFlDcpbpmh+I2zjjuC+/5hmygFkpHSZGEpuLs="; + hash = "sha256-lhrUPlTBKMiWL3+zhjFBoUvjfjbM9t55Z4Anhj3sPuk="; }; in buildDartApplication { @@ -40,7 +39,7 @@ buildDartApplication { $out/share/krunner/dbusplugins/plasma-runner-vscode_runner.desktop ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = ./update.sh; meta = { description = "KRunner plugin for quickly opening recent VSCode workspaces"; diff --git a/pkgs/by-name/vs/vscode-runner/pubspec.lock.json b/pkgs/by-name/vs/vscode-runner/pubspec.lock.json index e2d6592c0ae9..11c9a3229f24 100644 --- a/pkgs/by-name/vs/vscode-runner/pubspec.lock.json +++ b/pkgs/by-name/vs/vscode-runner/pubspec.lock.json @@ -4,121 +4,121 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57", "url": "https://pub.dev" }, "source": "hosted", - "version": "67.0.0" + "version": "80.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "7.3.0" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.6.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.13.0" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "collection": { - "dependency": "transitive", - "description": { - "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.18.0" - }, - "convert": { - "dependency": "transitive", - "description": { - "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, - "coverage": { - "dependency": "transitive", - "description": { - "name": "coverage", - "sha256": "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.7.2" - }, - "crypto": { - "dependency": "transitive", - "description": { - "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "dbus": { - "dependency": "transitive", - "description": { - "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.10" - }, - "ffi": { - "dependency": "transitive", - "description": { - "name": "ffi", - "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", "version": "2.1.2" }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.11" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, "file": { "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "frontend_server_client": { "dependency": "transitive", @@ -134,121 +134,121 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "http_multi_server": { "dependency": "transitive", "description": { "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.2" }, "io": { "dependency": "transitive", "description": { "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "js": { "dependency": "transitive", "description": { "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.7" + "version": "0.7.2" }, "krunner": { "dependency": "direct main", "description": { "name": "krunner", - "sha256": "b027c8405c45d3f16b35037e0209665b0bdc9b975537f1216640ee8e1f839d31", + "sha256": "3ed3bb599505ceb62dccc7c60dc69de85c9439aaadf42c8bccdb01edee1f474c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "1.0.2" }, "lints": { "dependency": "direct dev", "description": { "name": "lints", - "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "5.1.1" }, "logger": { "dependency": "direct main", "description": { "name": "logger", - "sha256": "8c94b8c219e7e50194efc8771cd0e9f10807d8d3e219af473d89b06cc2ee4e04", + "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.5.0" }, "logging": { "dependency": "transitive", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "matcher": { "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "meta": { "dependency": "transitive", "description": { "name": "meta", - "sha256": "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.14.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", "description": { "name": "mime", - "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "2.0.0" }, "node_preamble": { "dependency": "transitive", @@ -264,31 +264,31 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "path": { "dependency": "transitive", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "petitparser": { "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "pool": { "dependency": "transitive", @@ -304,21 +304,21 @@ "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.1.5" }, "shelf": { "dependency": "transitive", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_packages_handler": { "dependency": "transitive", @@ -334,181 +334,191 @@ "dependency": "transitive", "description": { "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "shelf_web_socket": { "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "3.0.0" }, "source_map_stack_trace": { "dependency": "transitive", "description": { "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "source_maps": { - "dependency": "transitive", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "transitive", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "sqlite3": { - "dependency": "direct main", - "description": { - "name": "sqlite3", - "sha256": "281b672749af2edf259fc801f0fcba092257425bcd32a0ce1c8237130bc934c7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.2" - }, - "stack_trace": { - "dependency": "transitive", - "description": { - "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.1" - }, - "stream_channel": { - "dependency": "transitive", - "description": { - "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", "url": "https://pub.dev" }, "source": "hosted", "version": "2.1.2" }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "sqlite3": { + "dependency": "direct main", + "description": { + "name": "sqlite3", + "sha256": "32b632dda27d664f85520093ed6f735ae5c49b5b75345afb8b19411bc59bb53d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.4" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.4.1" }, "term_glyph": { "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test": { "dependency": "direct dev", "description": { "name": "test", - "sha256": "d87214d19fb311997d8128ec501a980f77cb240ac4e7e219accf452813ff473c", + "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.3" + "version": "1.25.15" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.4" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "2236f70be1e5ab405c675e88c36935a87dad9e05a506b57dd5c0f617f5aebcb2", + "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.1" + "version": "0.6.8" }, "typed_data": { "dependency": "transitive", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "vm_service": { "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "a75f83f14ad81d5fe4b3319710b90dec37da0e22612326b696c9e1b8f34bbf48", + "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.0" + "version": "15.0.0" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web": { "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "3.0.2" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -520,15 +530,25 @@ "source": "hosted", "version": "1.2.1" }, + "xdg_desktop_portal": { + "dependency": "direct main", + "description": { + "name": "xdg_desktop_portal", + "sha256": "10d56d2212bfa33a676d209b312a82fe5862fed5a91d2cfcb39143da75d084c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.13" + }, "xdg_directories": { "dependency": "direct main", "description": { "name": "xdg_directories", - "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.1.0" }, "xml": { "dependency": "transitive", @@ -544,14 +564,14 @@ "dependency": "transitive", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" } }, "sdks": { - "dart": ">=3.3.0 <4.0.0" + "dart": ">=3.7.0 <4.0.0" } } diff --git a/pkgs/by-name/vs/vscode-runner/update.sh b/pkgs/by-name/vs/vscode-runner/update.sh new file mode 100755 index 000000000000..faef7c5b66e6 --- /dev/null +++ b/pkgs/by-name/vs/vscode-runner/update.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p yq jq common-updater-scripts dart + +set -xeu -o pipefail + +PACKAGE_DIR="$(realpath "$(dirname "$0")")" +cd "$PACKAGE_DIR/.." +while ! test -f flake.nix; do cd ..; done +NIXPKGS_DIR="$PWD" + +# Get latest version number from GitHub +version="$( + curl --silent https://api.github.com/repos/Merrit/vscode-runner/releases/latest | + jq '.tag_name | ltrimstr("v")' --raw-output +)" + +# Update to latest version +cd "$NIXPKGS_DIR" +update-source-version vscode-runner "$version" + +# Create new pubspec.lock.json +TMPDIR="$(mktemp -d)" +cd "$TMPDIR" + +src=$(nix-build --no-link "$NIXPKGS_DIR" -A vscode-runner.src) +cp $src/pubspec.* . + +if ! test -f pubspec.lock; then + dart pub update +fi + +yq . pubspec.lock > "$PACKAGE_DIR/pubspec.lock.json" + +rm -rf "$TMPDIR" diff --git a/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix b/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix index 390eb579b0bf..db046be77a24 100644 --- a/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix +++ b/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix @@ -10,7 +10,6 @@ help2man, gengetopt, vsmartcard-vpcd, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -27,24 +26,20 @@ stdenv.mkDerivation (finalAttrs: { help2man ]; - buildInputs = - [ - pcsclite - libnfc - gengetopt - (python3.withPackages ( - pp: with pp; [ - pyscard - pycrypto - pbkdf2 - pillow - gnureadline - ] - )) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.PCSC - ]; + buildInputs = [ + pcsclite + libnfc + gengetopt + (python3.withPackages ( + pp: with pp; [ + pyscard + pycrypto + pbkdf2 + pillow + gnureadline + ] + )) + ]; meta = { description = "Relays a smart card using an contact-less interface"; diff --git a/pkgs/by-name/vs/vsmartcard-vpcd/package.nix b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix index 490115a6ce8b..a3f78c82d9ab 100644 --- a/pkgs/by-name/vs/vsmartcard-vpcd/package.nix +++ b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix @@ -9,7 +9,6 @@ qrencode, python3, help2man, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -32,23 +31,19 @@ stdenv.mkDerivation (finalAttrs: { help2man ]; - buildInputs = - [ - pcsclite - qrencode - (python3.withPackages ( - pp: with pp; [ - pyscard - pycrypto - pbkdf2 - pillow - gnureadline - ] - )) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.PCSC - ]; + buildInputs = [ + pcsclite + qrencode + (python3.withPackages ( + pp: with pp; [ + pyscard + pycrypto + pbkdf2 + pillow + gnureadline + ] + )) + ]; configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--enable-infoplist"; diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index 89658769e592..d8a5c60284ca 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -3,6 +3,7 @@ lib, fetchurl, fetchpatch, + desktop-file-utils, gettext, pkg-config, meson, @@ -34,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.78.4"; + version = "0.80.1"; outputs = [ "out" @@ -43,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-LepOQSJmWStkYKP+RIj149UHEvE5gVeQwOy0RxD34X4="; + hash = "sha256-DNvQ6YOv2dIuBl4yOnQxYAcr9ktFPgCxXtvm8tzdpGw="; }; patches = [ @@ -55,26 +56,10 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) - # build: Add fast_float dependency - # https://gitlab.gnome.org/GNOME/vte/-/issues/2823 - (fetchpatch { - name = "0003-build-Add-fast_float-dependency.patch"; - url = "https://gitlab.gnome.org/GNOME/vte/-/commit/f6095fca4d1baf950817e7010e6f1e7c313b9e2e.patch"; - hash = "sha256-EL9PPiI5pDJOXf4Ck4nkRte/jHx/QWbxkjDFRSsp+so="; - }) - (fetchpatch { - name = "0003-widget-termprops-Use-fast_float.patch"; - url = "https://gitlab.gnome.org/GNOME/vte/-/commit/6c2761f51a0400772f443f12ea23a75576e195d3.patch"; - hash = "sha256-jjM9bhl8EhtylUIQ2nMSNX3ugnkZQP/2POvSUDW0LM0="; - }) - (fetchpatch { - name = "0003-build-Use-correct-path-to-include-fast_float.h.patch"; - url = "https://gitlab.gnome.org/GNOME/vte/-/commit/d09330585e648b5c9991dffab4a06d1f127bf916.patch"; - hash = "sha256-YGVXt2VojljYgTcmahQ2YEZGEysyUSwk+snQfoipJ+E="; - }) ]; nativeBuildInputs = [ + desktop-file-utils # for desktop-file-validate gettext gobject-introspection gperf @@ -134,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs perf/* + patchShebangs src/app/meson_desktopfile.py patchShebangs src/parser-seq.py patchShebangs src/minifont-coverage.py patchShebangs src/modes.py @@ -177,13 +163,11 @@ stdenv.mkDerivation (finalAttrs: { the system's terminfo database. ''; license = licenses.lgpl3Plus; - maintainers = - with maintainers; - [ - astsmtl - antono - ] - ++ teams.gnome.members; + maintainers = with maintainers; [ + astsmtl + antono + ]; + teams = [ teams.gnome ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/vt/vtsls/package.nix b/pkgs/by-name/vt/vtsls/package.nix index a86289d68745..c35f81ce69f1 100644 --- a/pkgs/by-name/vt/vtsls/package.nix +++ b/pkgs/by-name/vt/vtsls/package.nix @@ -4,19 +4,20 @@ fetchFromGitHub, nodejs_22, gitMinimal, + gitSetupHook, pnpm_8, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "vtsls"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "yioneko"; repo = "vtsls"; - rev = "server-v${finalAttrs.version}"; - hash = "sha256-Ng+aOBnxFRbMjoUy6+DvIk2yVpvJT+AMsbvDb+IlYpY="; + tag = "server-v${finalAttrs.version}"; + hash = "sha256-vlw84nigvQqRB9OQBxOmrR9CClU9M4dNgF/nrvGN+sk="; fetchSubmodules = true; }; @@ -24,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs_22 # patches are applied with git during build gitMinimal + gitSetupHook pnpm_8.configHook ]; @@ -38,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src version ; - hash = "sha256-xenPpKsIjEIyVeZDjwjLaBbpWLqWQDBaLLfyzxtrsTI="; + hash = "sha256-SdqeTYRH60CyU522+nBo0uCDnzxDP48eWBAtGTL/pqg="; }; # Patches to get submodule sha from file instead of 'git submodule status' @@ -50,10 +52,6 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - # During build vtsls needs a working git installation. - git config --global user.name nixbld - git config --global user.email nixbld@example.com - # during build this sha is used as a marker to skip applying patches and # copying files, which doesn't matter in this case echo "dummysha" > ./packages/service/HEAD diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix index bcbc66e0898f..46664f0d26c5 100644 --- a/pkgs/by-name/vu/vuetorrent/package.nix +++ b/pkgs/by-name/vu/vuetorrent/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "vuetorrent"; - version = "2.23.0"; + version = "2.24.2"; src = fetchFromGitHub { owner = "VueTorrent"; repo = "VueTorrent"; tag = "v${version}"; - hash = "sha256-0OAfe0Kwjc8Shsz5isPMFlO4E9vKvmsKabsYC8rXY6c="; + hash = "sha256-+BTnFQxg+8vJdfwER6lM7dszRxBiX20K/vYv+nuH/1Y="; }; - npmDepsHash = "sha256-65MEBowimZrDs3EFzu2REB5wf2oHlydsztucd0cfn20="; + npmDepsHash = "sha256-4lIxaNqXO5jDmXgPfoxRuSe8p6jV7momSbpl9Nns0VI="; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/vu/vulkan-cts/package.nix b/pkgs/by-name/vu/vulkan-cts/package.nix index 3312042202be..d5e752a47358 100644 --- a/pkgs/by-name/vu/vulkan-cts/package.nix +++ b/pkgs/by-name/vu/vulkan-cts/package.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.10.0"; + version = "1.4.2.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "vulkan-cts-${finalAttrs.version}"; - hash = "sha256-owa4Z/gu9+plPxeSfduS3gUk9WTOHSDoXLTBju6tTGc="; + hash = "sha256-+ydv67uQkoofU3GrSJWosb99DrGDGs80z+hq9MpFIpA="; }; prePatch = '' @@ -107,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: { # For vulkan-validation-layers "-DGLSLANG_INSTALL_DIR=${glslang}" "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" + "-DSELECTED_BUILD_TARGETS=deqp-vk" ]; postInstall = '' @@ -114,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { ! test -e $out mkdir -p $out/bin $out/archive-dir - cp -a external/vulkancts/modules/vulkan/deqp-vk external/vulkancts/modules/vulkan/deqp-vksc $out/bin/ + cp -a external/vulkancts/modules/vulkan/deqp-vk $out/bin/ cp -a external/vulkancts/modules/vulkan/vulkan $out/archive-dir/ cp -a external/vulkancts/modules/vulkan/vk-default $out/ diff --git a/pkgs/by-name/vu/vulkan-cts/sources.nix b/pkgs/by-name/vu/vulkan-cts/sources.nix index e220164a5039..34a9ab4effbe 100644 --- a/pkgs/by-name/vu/vulkan-cts/sources.nix +++ b/pkgs/by-name/vu/vulkan-cts/sources.nix @@ -4,15 +4,15 @@ rec { amber = fetchFromGitHub { owner = "google"; repo = "amber"; - rev = "67fea651b886460d7b72295e680528c059bbbe40"; - hash = "sha256-oDN7UdyfNMG4r36nnRJmYdbd0wyd1titGQQNa9e/3tU="; + rev = "6fa5ac1fb3b01c93eef3caa2aeb8841565e38d90"; + hash = "sha256-JUrOz+hpGk8rgxMLzrCrfbM60HsLyRnf6cG4j2BqMq0="; }; glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "c5b76b78c9dec95251e9c1840a671e19bf61abe3"; - hash = "sha256-N7vGPqQieWnr+mbrmdbvzz7n9q3bbRKLxkYt6OiaJvU="; + rev = "1b65bd602b23d401d1c4c86dfa90a36a52c66294"; + hash = "sha256-W1a6qeW4W4eNMl2UXEl0HpuLngtUjVsJI/MaiZ5wcWQ="; }; jsoncpp = fetchFromGitHub { @@ -25,40 +25,54 @@ rec { nvidia-video-samples = fetchFromGitHub { owner = "Igalia"; repo = "vk_video_samples"; - rev = "6821adf11eb4f84a2168264b954c170d03237699"; - hash = "sha256-prshOzxUHLYi64Pbyytsp+XvmtIIyhx/3n5IVimYH64="; + rev = "45fe88b456c683120138f052ea81f0a958ff3ec4"; + hash = "sha256-U5IoiRKXsdletVlnHVz8rgMEwDOZFAuld5Bzs0rvcR4="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801"; - hash = "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ="; + rev = "767e901c986e9755a17e7939b3046fc2911a4bbd"; + hash = "sha256-mXj6HDIEEjvGLO3nJEIRxdJN28/xUA2W+r9SRnh71LU="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "44936c4a9d42f1c67e34babb5792adf5bce7f76b"; - hash = "sha256-kSiP94hMlblFod2mQhlAQDAENGOvBh7v8bCxxaiYWq4="; + rev = "3364b982713a0440d1d342dd5eec65b122a61b71"; + hash = "sha256-zVo1i/AgwPBXVXgKpdubX0TTu7gqoX88BzZfhRZ4Z2o="; + }; + + video_generator = fetchFromGitHub { + owner = "Igalia"; + repo = "video_generator"; + rev = "426300e12a5cc5d4676807039a1be237a2b68187"; + hash = "sha256-zdYYpX3hed7i5onY7c60LnM/e6PLa3VdrhXTV9oSlvg="; }; vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "486e4b289053a7d64784e7ce791711843c60c235"; - hash = "sha256-LGAHUeWF9X6Li1HcdD14pgnBUquWxA+bQpAL09JmwLQ="; + rev = "645c59c70e826d9738b6bb103316c03d887dfed3"; + hash = "sha256-r3JqAt0+JUwQS9JuWbKDx9L3ceDPQfYaAtnRz3l07ig="; }; vulkan-validationlayers = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; - rev = "9a46ae006fa5c92e2d2af7944187f7794210844b"; - hash = "sha256-qVQy3kKkZRWHjtj2YxJTZqKg1kwnmLa3bgVathisfOc="; + rev = "6cf616f131e9870c499a50441bca2d07ccda9733"; + hash = "sha256-nKamcLF17IA56tcxQLc8zUbkB9yQCW+Nag+Wn8pUqUg="; + }; + + vulkan-video-samples = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Video-Samples"; + rev = "0e87744edbb84c9c56c3fc8de9ea5150af5ee4ea"; + hash = "sha256-CZ1zoX9gI+Ac/jf2IxWk59NXPiW6qcMhj9laoZnQfd8="; }; prePatch = '' - mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs external/vulkan-validationlayers + mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/video_generator external/vulkan-docs external/vulkan-validationlayers external/vulkan-video-samples cp -r ${amber} external/amber/src cp -r ${glslang} external/glslang/src @@ -66,7 +80,9 @@ rec { cp -r ${nvidia-video-samples} external/nvidia-video-samples/src cp -r ${spirv-headers} external/spirv-headers/src cp -r ${spirv-tools} external/spirv-tools/src + cp -r ${video_generator} external/video_generator/src cp -r ${vulkan-docs} external/vulkan-docs/src cp -r ${vulkan-validationlayers} external/vulkan-validationlayers/src + cp -r ${vulkan-video-samples} external/vulkan-video-samples/src ''; } diff --git a/pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py b/pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py index f3e42bd82e7a..c987b7b6467d 100755 --- a/pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py +++ b/pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py @@ -74,7 +74,7 @@ def main(): f.write(f" hash = \"{hash}\";\n"); f.write(f" }};\n"); - f.write("\n\n prePatch = ''\n"); + f.write("\n prePatch = ''\n"); f.write(" mkdir -p"); for pkg in pkgs: if isinstance(pkg, fetch_sources.GitRepo): diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix index 2a65766295dd..8fecc2e233e4 100644 --- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix +++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.4.304.0"; + version = "1.4.313.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${version}"; - hash = "sha256-HdRbnXb9/YghxRJEg7Xx2q+YyiLAUBZ7lm0ibxVpbdA="; + hash = "sha256-WYlme5vEHpJHImfkGB+kmUY96fYia93WlfyutBfdxzk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix index 724e68737b93..73f95bb30fcd 100644 --- a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix +++ b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { pname = "vulkan-hdr-layer-kwin6"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-04-16"; depsBuildBuild = [ pkg-config ]; @@ -40,8 +40,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "Zamundaaa"; repo = "VK_hdr_layer"; - rev = "7c0553d88b38e62eb7fd83f3d25f50733309c866"; - hash = "sha256-arJJWel6WooZ4SHwl0NXK44xOMgHMo1n++eJSVrone4="; + rev = "3b276e68136eb10825aa7cabd06abb324897f0e8"; + hash = "sha256-c3OLT2qMKAQnQYrTVhrs3BEVS55HoaeBijgzygz6zgs="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/vu/vulkan-headers/package.nix b/pkgs/by-name/vu/vulkan-headers/package.nix index 047a8e9d4475..8510c2fb43af 100644 --- a/pkgs/by-name/vu/vulkan-headers/package.nix +++ b/pkgs/by-name/vu/vulkan-headers/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.4.304.0"; + version = "1.4.313.0"; # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or # later the build fails as: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-X6HqcZDZ4ZQGBG3PlSxi0mhmYyrjmJYwk/pJ/XBqEZU="; + hash = "sha256-cbt0QHifjRCak+3V9J5PjNXDIEBvnwVYFa7rcmNv1VU="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix index d61f4caffefa..712d91733b52 100644 --- a/pkgs/by-name/vu/vulkan-loader/package.nix +++ b/pkgs/by-name/vu/vulkan-loader/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; - version = "1.4.304.0"; + version = "1.4.313.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-qPknv8BvfJoewFfORXsFZlUnae36czHfOPXmtGccrOk="; + hash = "sha256-CeIjyW90Ri0MvhyFfYgss5Rjh5fHKhQf7CgBEcB/nPk="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix index 728187a2aadc..fc8d6086c86a 100644 --- a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix +++ b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vulkan-memory-allocator"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "VulkanMemoryAllocator"; tag = "v${finalAttrs.version}"; - hash = "sha256-PnrzYZfTZU02odvmUrD9he1T6O09vhfOfhkvgEBnDHk="; + hash = "sha256-TPEqV8uHbnyphLG0A+b2tgLDQ6K7a2dOuDHlaFPzTeE="; }; # A compiler is only required for the samples. This lets us use stdenvNoCC. diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix index f36d96b07b77..88791c0cd774 100644 --- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix +++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.4.304.0"; + version = "1.4.313.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-nudyg5YF2j4kv0fCx3vV/jGsYrEaTMf0xydvdHF6XCU="; + hash = "sha256-VJxomhzHEIbQ8CUzlUN2fvBF+M9854FlIR0fE2RgppM="; }; nativeBuildInputs = [ @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { # Include absolute paths to layer libraries in their associated # layer definition json files. preFixup = '' - for f in "$out"/etc/vulkan/explicit_layer.d/*.json "$out"/etc/vulkan/implicit_layer.d/*.json; do + for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path" mv tmp.json "$f" done diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix new file mode 100644 index 000000000000..b95c207125ac --- /dev/null +++ b/pkgs/by-name/vu/vulkan-tools/package.nix @@ -0,0 +1,101 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildPackages, + cmake, + pkg-config, + python3, + glslang, + libffi, + libX11, + libXau, + libxcb, + libXdmcp, + libXrandr, + vulkan-headers, + vulkan-loader, + vulkan-volk, + wayland, + wayland-protocols, + wayland-scanner, + moltenvk, +}: + +stdenv.mkDerivation rec { + pname = "vulkan-tools"; + version = "1.4.313.0"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Tools"; + rev = "vulkan-sdk-${version}"; + hash = "sha256-47RVuhK9NDtOazG4awTjwbZSnG+thGw6GpyKmcCgWpQ="; + }; + + patches = [ ./wayland-scanner.patch ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + wayland-scanner + ]; + + buildInputs = + [ + glslang + vulkan-headers + vulkan-loader + vulkan-volk + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libffi + libX11 + libXau + libxcb + libXdmcp + libXrandr + wayland + wayland-protocols + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + moltenvk + moltenvk.dev + ]; + + libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; + + dontPatchELF = true; + + env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = lib.getExe buildPackages.wayland-scanner; + + cmakeFlags = + [ + # Don't build the mock ICD as it may get used instead of other drivers, if installed + "-DBUILD_ICD=OFF" + # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH + "-DCMAKE_INSTALL_RPATH=${libraryPath}" + "-DGLSLANG_INSTALL_DIR=${glslang}" + # Hide dev warnings that are useless for packaging + "-Wno-dev" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DMOLTENVK_REPO_ROOT=${moltenvk}/share/vulkan/icd.d" + # Don’t build the cube demo because it requires `ibtool`, which is not available in nixpkgs. + "-DBUILD_CUBE=OFF" + ]; + + meta = with lib; { + description = "Khronos official Vulkan Tools and Utilities"; + longDescription = '' + This project provides Vulkan tools and utilities that can assist + development by enabling developers to verify their applications correct + use of the Vulkan API. + ''; + homepage = "https://github.com/KhronosGroup/Vulkan-Tools"; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch b/pkgs/by-name/vu/vulkan-tools/wayland-scanner.patch similarity index 100% rename from pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch rename to pkgs/by-name/vu/vulkan-tools/wayland-scanner.patch diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix index dc8643d0b3d6..59ea1f8ca1fa 100644 --- a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix +++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.4.304.0"; + version = "1.4.313.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-d20PRTCCNWezwhTD3axiQeWvY9lqD/8XLGBlOFgNzFE="; + hash = "sha256-MmC4UVa9P/0h7r8IBp1LhP9EztwyZv/ASWKKj8Gk1T8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix index a9811def0f7b..422250e5e9ca 100644 --- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix +++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.4.304.0"; + version = "1.4.313.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-n7fbhi5NCQRsj/sAjLfaW6EBFBqGutN5Cnl/CtnnVPY="; + hash = "sha256-FavJ9QIv9J/QlY8bBSQ4C+8ZeNzge3Rov97GPOjltuA="; }; strictDeps = true; diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix index 71c1beabd447..cbbfde507c78 100644 --- a/pkgs/by-name/vu/vulkan-volk/package.nix +++ b/pkgs/by-name/vu/vulkan-volk/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "1.4.304.0"; + version = "1.4.313.0"; src = fetchFromGitHub { owner = "zeux"; repo = "volk"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-+SLGRvCUKFntz60/xL/NjoFjvvATWMImR4CGnCHUj2o="; + hash = "sha256-MXJjHfrSZiDHnCJMaKYgy2480DxNv86pbHx2ebWU2ug="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 7291d49cfad4..b40a86a96d16 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,15 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.31.0"; + version = "0.32.0"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; tag = "v${version}"; - hash = "sha256-3o4ap8BElDxxg3pohzXz38AQlQbzOPeSc5/OYZg8VFM="; + hash = "sha256-5zO1/lfB5ULJqSt14by9OYFT/0H9ZGSkA90wmf7dB5U="; + leaveDotGit = true; }; pythonRelaxDeps = [ @@ -27,32 +28,37 @@ python3.pkgs.buildPythonApplication rec { ]; build-system = with python3.pkgs; [ - poetry-core - poetry-dynamic-versioning + hatchling + uv-dynamic-versioning ]; - dependencies = with python3.pkgs; [ - click - colorlog - cvss - defusedxml - ijson - importlib-metadata - iso8601 - lxml - mashumaro - mergedeep - orjson - packageurl-python - pytest-snapshot - python-dateutil - pyyaml - requests - sqlalchemy - xsdata - xxhash - zstandard - ]; + dependencies = + with python3.pkgs; + [ + click + colorlog + cvss + defusedxml + ijson + importlib-metadata + iso8601 + lxml + mashumaro + mergedeep + orjson + packageurl-python + pytest-snapshot + python-dateutil + pyyaml + requests + sqlalchemy + xsdata + xxhash + zstandard + ] + ++ xsdata.optional-dependencies.cli + ++ xsdata.optional-dependencies.lxml + ++ xsdata.optional-dependencies.soap; nativeCheckInputs = [ git ] diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix index 94d1fcb6d377..e2519a1e5845 100644 --- a/pkgs/by-name/vv/vvvvvv/package.nix +++ b/pkgs/by-name/vv/vvvvvv/package.nix @@ -11,8 +11,6 @@ physfs, SDL2, tinyxml-2, - Foundation, - IOKit, makeAndPlay ? false, }: @@ -41,17 +39,12 @@ stdenv.mkDerivation rec { copyDesktopItems ]; - buildInputs = - [ - faudio - physfs - SDL2 - tinyxml-2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - IOKit - ]; + buildInputs = [ + faudio + physfs + SDL2 + tinyxml-2 + ]; cmakeDir = "../desktop_version"; diff --git a/pkgs/by-name/vw/vwm/package.nix b/pkgs/by-name/vw/vwm/package.nix deleted file mode 100644 index 3bd8bedd8087..000000000000 --- a/pkgs/by-name/vw/vwm/package.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses, - pkg-config, - glib, - libviper, - libpseudo, - gpm, - libvterm, -}: - -stdenv.mkDerivation rec { - pname = "vwm"; - version = "2.1.3"; - - src = fetchurl { - url = "mirror://sourceforge/vwm/vwm-${version}.tar.gz"; - sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf"; - }; - - postPatch = '' - sed -i -e s@/usr/local@$out@ \ - -e s@/usr/lib@$out/lib@ \ - -e 's@tic vwmterm@tic -o '$out/lib/terminfo' vwmterm@' \ - -e /ldconfig/d Makefile modules/*/Makefile vwm.h - - # Fix ncurses-6.3 support: - substituteInPlace vwm_bkgd.c --replace \ - 'mvwprintw(window,height-1,width-(strlen(version_str)),version_str);' \ - 'mvwprintw(window,height-1,width-(strlen(version_str)),"%s", version_str);' - ''; - - preInstall = '' - mkdir -p $out/bin $out/include - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - ncurses - glib - libviper - libpseudo - gpm - libvterm - ]; - - meta = with lib; { - homepage = "https://vwm.sourceforge.net/"; - description = "Dynamic window manager for the console"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.linux; - mainProgram = "vwm"; - }; -} diff --git a/pkgs/by-name/w_/w_scan2/package.nix b/pkgs/by-name/w_/w_scan2/package.nix index 0554e20d92b3..663a9d2a1722 100644 --- a/pkgs/by-name/w_/w_scan2/package.nix +++ b/pkgs/by-name/w_/w_scan2/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "w_scan2"; - version = "1.0.16"; + version = "1.0.17"; src = fetchFromGitHub { owner = "stefantalpalaru"; repo = "w_scan2"; rev = version; - hash = "sha256-8yFK2BnlrRBnQhsuy3Dh+oBH8Ainr6mLdRTqOSqY2FA="; + hash = "sha256-2wtH7mb6XfgLHr0vDVTZwoYxpSTM5N8Y/vi0YWN6MUE="; }; meta = { diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix index dab0a9cc2384..67d87e8125c2 100644 --- a/pkgs/by-name/wa/waagent/package.nix +++ b/pkgs/by-name/wa/waagent/package.nix @@ -14,12 +14,12 @@ let in python.pkgs.buildPythonApplication rec { pname = "waagent"; - version = "2.12.0.4"; + version = "2.13.1.1"; src = fetchFromGitHub { owner = "Azure"; repo = "WALinuxAgent"; tag = "v${version}"; - hash = "sha256-L8W/ijBHkNukM2G9HBRVx2wFXzgkR8gbFBljNVPs6xA="; + hash = "sha256-W2NXxQOxRhJD/D/w58xknA9X8YYnQxwIhhjXzlCVVWA="; }; patches = [ # Suppress the following error when waagent tries to configure sshd: diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index 27fcf035d509..e4a3262a8d12 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -5,6 +5,7 @@ callPackage, ensureNewerSourcesForZipFilesHook, python3, + makeWrapper, # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` extraTools ? [ ], }: @@ -23,6 +24,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook python3 + makeWrapper ]; buildInputs = [ @@ -51,14 +53,20 @@ stdenv.mkDerivation (finalAttrs: { python waf-light build ${extraToolsList} + substituteInPlace waf \ + --replace "w = test(i + '/lib/' + dirname)" \ + "w = test('$out/${python3.sitePackages}')" + runHook postBuild ''; installPhase = '' runHook preInstall - install -D waf $out/bin/waf - + install -D waf "$out"/bin/waf + wrapProgram "$out"/bin/waf --set PYTHONPATH "$out"/${python3.sitePackages} + mkdir -p "$out"/${python3.sitePackages}/ + cp -r waflib "$out"/${python3.sitePackages}/ runHook postInstall ''; diff --git a/pkgs/by-name/wa/waf/setup-hook.sh b/pkgs/by-name/wa/waf/setup-hook.sh index 692341fb5a04..7ce4f8e4abd1 100644 --- a/pkgs/by-name/wa/waf/setup-hook.sh +++ b/pkgs/by-name/wa/waf/setup-hook.sh @@ -3,9 +3,10 @@ wafConfigurePhase() { runHook preConfigure - if ! [ -f "${wafPath:=./waf}" ]; then - echo "copying waf to $wafPath..." - cp @waf@/bin/waf "$wafPath" + if [ -f "${wafPath:=./waf}" ]; then + patchShebangs --build "${wafPath}" + else + wafPath="@waf@/bin/waf" fi if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then @@ -20,7 +21,7 @@ wafConfigurePhase() { concatTo flagsArray wafConfigureFlags wafConfigureFlagsArray wafConfigureTargets=configure echoCmd 'waf configure flags' "${flagsArray[@]}" - python "$wafPath" "${flagsArray[@]}" + "$wafPath" "${flagsArray[@]}" if ! [[ -v enableParallelBuilding ]]; then enableParallelBuilding=1 @@ -42,7 +43,7 @@ wafBuildPhase () { concatTo flagsArray wafFlags wafFlagsArray wafBuildFlags wafBuildFlagsArray wafBuildTargets=build echoCmd 'waf build flags' "${flagsArray[@]}" - python "$wafPath" "${flagsArray[@]}" + "$wafPath" "${flagsArray[@]}" runHook postBuild } @@ -58,7 +59,7 @@ wafInstallPhase() { concatTo flagsArray wafFlags wafFlagsArray wafInstallFlags wafInstallFlagsArray wafInstallTargets=install echoCmd 'waf install flags' "${flagsArray[@]}" - python "$wafPath" "${flagsArray[@]}" + "$wafPath" "${flagsArray[@]}" runHook postInstall } diff --git a/pkgs/tools/misc/wagyu/fix-rustc-serialize-version.patch b/pkgs/by-name/wa/wagyu/fix-rustc-serialize-version.patch similarity index 100% rename from pkgs/tools/misc/wagyu/fix-rustc-serialize-version.patch rename to pkgs/by-name/wa/wagyu/fix-rustc-serialize-version.patch diff --git a/pkgs/by-name/wa/wagyu/package.nix b/pkgs/by-name/wa/wagyu/package.nix new file mode 100644 index 000000000000..c40d2add083c --- /dev/null +++ b/pkgs/by-name/wa/wagyu/package.nix @@ -0,0 +1,33 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "wagyu"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "AleoHQ"; + repo = pname; + rev = "v${version}"; + hash = "sha256-5n8BmETv5jUvgu0rskAPYaBgYyNL2QU2t/iUb3hNMMw="; + }; + + cargoPatches = [ ./fix-rustc-serialize-version.patch ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-vtNxRW/b8kvy21YQezCUiZNtLnlMSkdTRr/OkGy6UAw="; + + meta = with lib; { + description = "Rust library for generating cryptocurrency wallets"; + homepage = "https://github.com/AleoHQ/wagyu"; + license = with licenses; [ + mit + asl20 + ]; + maintainers = [ maintainers.offline ]; + mainProgram = "wagyu"; + }; +} diff --git a/pkgs/by-name/wa/waifu2x-converter-cpp/package.nix b/pkgs/by-name/wa/waifu2x-converter-cpp/package.nix new file mode 100644 index 000000000000..51f5552c970b --- /dev/null +++ b/pkgs/by-name/wa/waifu2x-converter-cpp/package.nix @@ -0,0 +1,63 @@ +{ + cmake, + fetchFromGitHub, + makeWrapper, + opencv4, + lib, + stdenv, + ocl-icd, + opencl-headers, + config, + cudaSupport ? config.cudaSupport, + cudatoolkit ? null, +}: + +stdenv.mkDerivation rec { + pname = "waifu2x-converter-cpp"; + version = "5.3.4"; + + src = fetchFromGitHub { + owner = "DeadSix27"; + repo = pname; + rev = "v${version}"; + sha256 = "0rv8bnyxz89za6gwk9gmdbaf3j7c1j52mip7h81rir288j35m84x"; + }; + + patches = [ + # Remove the hard-coded compiler on Darwin and use the one in stdenv. + ./waifu2x_darwin_build.diff + ]; + + buildInputs = + [ + opencv4 + ] + ++ lib.optional cudaSupport cudatoolkit + ++ lib.optionals stdenv.hostPlatform.isLinux [ + ocl-icd + opencl-headers + ]; + + nativeBuildInputs = [ + cmake + makeWrapper + ]; + + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib" + ''; + + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + + meta = { + description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV"; + homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.xzfc ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "waifu2x-converter-cpp"; + }; +} diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/waifu2x_darwin_build.diff b/pkgs/by-name/wa/waifu2x-converter-cpp/waifu2x_darwin_build.diff similarity index 100% rename from pkgs/tools/graphics/waifu2x-converter-cpp/waifu2x_darwin_build.diff rename to pkgs/by-name/wa/waifu2x-converter-cpp/waifu2x_darwin_build.diff diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix index 7b531ed4fd84..45a720138c15 100644 --- a/pkgs/by-name/wa/wait4x/package.nix +++ b/pkgs/by-name/wa/wait4x/package.nix @@ -5,7 +5,7 @@ }: let pname = "wait4x"; - version = "3.2.0"; + version = "3.3.1"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "wait4x"; repo = pname; rev = "v${version}"; - hash = "sha256-UVs8tCOgPU/IwM3Z3/ehFnAbHTSOHGAO9VpcB/NItGM="; + hash = "sha256-3s+ug4KqFv1P55eqNfAB2jbSPVzySxlHmkDMuuVlJcQ="; }; - vendorHash = "sha256-lwNRRWpo2Fkpoc42URrqSLFKSGN7IfuD4759KB0uEgM="; + vendorHash = "sha256-dN7R2d7roA6H9wIz2sBaWctD8K6M8nbQbwPc3t/7rlk="; # Tests make network access doCheck = false; diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix index af0f7680fe4d..0936daefb33d 100644 --- a/pkgs/by-name/wa/wakapi/package.nix +++ b/pkgs/by-name/wa/wakapi/package.nix @@ -6,7 +6,7 @@ nix-update-script, }: let - version = "2.13.1"; + version = "2.13.4"; in buildGoModule { pname = "wakapi"; @@ -16,10 +16,10 @@ buildGoModule { owner = "muety"; repo = "wakapi"; tag = version; - hash = "sha256-zasMqEvSqylJWKjS5TKYKmGJnGfCUEOq2UvsVUeizBw="; + hash = "sha256-r4bk82+c2f2VZ8ObpeoIbIClJRhPPb5OyollMq3iS4I="; }; - vendorHash = "sha256-b2FOdCXmSgFzdXLnxt/V7+cuESWXVXVRmT53DgLwZYI="; + vendorHash = "sha256-8SjBRagqdzJvW8eCKLeHBOQL4qX83USMIDDyS+8Mpvo="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index 9126211e5d30..0d3bc03d7bbb 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/pkgs/by-name/wa/wakatime-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "wakatime-cli"; - version = "1.112.1"; + version = "1.115.2"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; tag = "v${version}"; - hash = "sha256-J8hEQkTCaJhYYnuO8J2Tvgm/lWuPKHubKESb7WPzzkk="; + hash = "sha256-8Vgbm7yOb33hVwPNyl1x8egAJKiWvBo4ldp8bkUbd9A="; }; - vendorHash = "sha256-Zy54fGyTvLfrFEiPIcNtx25EqaIaYq46DYBpbZXfOFQ="; + vendorHash = "sha256-1yqpz3DqWHXw3ihh7YAKtl5Co91VAbBMRu68S/igrMc="; ldflags = [ "-s" diff --git a/pkgs/by-name/wa/wal-g/package.nix b/pkgs/by-name/wa/wal-g/package.nix index 94798ae0ba75..ab32ee07909c 100644 --- a/pkgs/by-name/wa/wal-g/package.nix +++ b/pkgs/by-name/wa/wal-g/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "wal-g"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "wal-g"; repo = "wal-g"; rev = "v${version}"; - sha256 = "sha256-wVr0L2ZXMuEo6tc2ajNzPinVQ8ZVzNOSoaHZ4oFsA+U="; + sha256 = "sha256-kUn1pJEdGec+WIZivqVAhELoBTKOF4E07Ovn795DgIY="; }; - vendorHash = "sha256-YDLAmRfDl9TgbabXj/1rxVQ052NZDg3IagXVTe5i9dw="; + vendorHash = "sha256-TwYl3B/VS24clUv1ge/RroULIY/04xTxc11qPNGhnfs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix index c8f596c4e730..d16a6e6e5459 100644 --- a/pkgs/by-name/wa/walker/package.nix +++ b/pkgs/by-name/wa/walker/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "walker"; - version = "0.12.19"; + version = "0.12.21"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-XOOYalJ+6V/O/fhC5gEDk2m1yZ2e5DofRRIi8ETHgoQ="; + hash = "sha256-wONW5CaPkLiVR5roGFx2SOcvcVDr9E9eCtojGBy3ErE="; }; vendorHash = "sha256-6PPNVnsH1eU4fLcZpxiBoHCzN/TUUxfTfmxDsBDPDKQ="; diff --git a/pkgs/by-name/wa/wallabag/package.nix b/pkgs/by-name/wa/wallabag/package.nix index 796fe689798b..8507debfb3f9 100644 --- a/pkgs/by-name/wa/wallabag/package.nix +++ b/pkgs/by-name/wa/wallabag/package.nix @@ -16,7 +16,7 @@ let pname = "wallabag"; - version = "2.6.10"; + version = "2.6.12"; in stdenv.mkDerivation { inherit pname version; @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Release tarball includes vendored files src = fetchurl { url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz"; - hash = "sha256-a0j3tFQD7JcUV4kDcHWifodeu8KvoHn5gvVbxo86MP4="; + hash = "sha256-o6IbFhDac6BUNjYqhRQXWoNVwkqkRLSYyhYoOz+IG80="; }; patches = [ diff --git a/pkgs/by-name/wa/wally/Cargo.lock.patch b/pkgs/by-name/wa/wally/Cargo.lock.patch new file mode 100644 index 000000000000..f438e262230e --- /dev/null +++ b/pkgs/by-name/wa/wally/Cargo.lock.patch @@ -0,0 +1,235 @@ +diff --git a/Cargo.lock b/Cargo.lock +index e29ff77..6d94916 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "adler32" +@@ -89,7 +89,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.43", + ] + + [[package]] +@@ -435,7 +435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" + dependencies = [ + "percent-encoding", +- "time 0.3.21", ++ "time 0.3.41", + "version_check", + ] + +@@ -627,6 +627,15 @@ dependencies = [ + "syn 1.0.67", + ] + ++[[package]] ++name = "deranged" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" ++dependencies = [ ++ "powerfmt", ++] ++ + [[package]] + name = "devise" + version = "0.4.1" +@@ -657,7 +666,7 @@ dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", +- "syn 2.0.18", ++ "syn 2.0.43", + ] + + [[package]] +@@ -1716,6 +1725,12 @@ dependencies = [ + "num-traits", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.44" +@@ -1895,7 +1910,7 @@ dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", +- "syn 2.0.18", ++ "syn 2.0.43", + ] + + [[package]] +@@ -1948,6 +1963,12 @@ version = "1.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" + ++[[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.10" +@@ -1992,9 +2013,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" + + [[package]] + name = "proc-macro2" +-version = "1.0.59" ++version = "1.0.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" ++checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" + dependencies = [ + "unicode-ident", + ] +@@ -2007,7 +2028,7 @@ checksum = "606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.43", + "version_check", + "yansi", + ] +@@ -2349,7 +2370,7 @@ dependencies = [ + "serde_json", + "state", + "tempfile", +- "time 0.3.21", ++ "time 0.3.41", + "tokio", + "tokio-stream", + "tokio-util", +@@ -2369,7 +2390,7 @@ dependencies = [ + "proc-macro2", + "quote", + "rocket_http", +- "syn 2.0.18", ++ "syn 2.0.43", + "unicode-xid", + ] + +@@ -2394,7 +2415,7 @@ dependencies = [ + "smallvec", + "stable-pattern", + "state", +- "time 0.3.21", ++ "time 0.3.41", + "tokio", + "uncased", + ] +@@ -2682,22 +2703,22 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.163" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" ++checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.163" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" ++checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.43", + ] + + [[package]] +@@ -2977,9 +2998,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.18" ++version = "2.0.43" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" ++checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" + dependencies = [ + "proc-macro2", + "quote", +@@ -3160,11 +3181,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.21" ++version = "0.3.41" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" ++checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" + dependencies = [ ++ "deranged", + "itoa 1.0.6", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -3172,16 +3196,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" + + [[package]] + name = "time-macros" +-version = "0.2.9" ++version = "0.2.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" ++checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -3226,7 +3251,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.43", + ] + + [[package]] +@@ -3354,7 +3379,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.43", + ] + + [[package]] diff --git a/pkgs/by-name/wa/wally/package.nix b/pkgs/by-name/wa/wally/package.nix new file mode 100644 index 000000000000..dc993d9cf812 --- /dev/null +++ b/pkgs/by-name/wa/wally/package.nix @@ -0,0 +1,44 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "wally"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "UpliftGames"; + repo = "wally"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lbEUj6iWwm3KtfUwNkJf8cSjXMQ4Mki/jAqQavDajUA="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + # https://github.com/UpliftGames/wally/issues/223 + cargoPatches = [ ./Cargo.lock.patch ]; + cargoHash = "sha256-5Lfs5GlOPxvltFpbgPBhStWxPGqv8nYpY/WC2ABtea0="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Modern package manager for Roblox projects inspired by Cargo"; + homepage = "https://github.com/UpliftGames/wally"; + downloadPage = "https://github.com/UpliftGames/wally/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/UpliftGames/wally/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ anninzy ]; + mainProgram = "wally"; + badPlatforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/development/interpreters/wamr/default.nix b/pkgs/by-name/wa/wamr/package.nix similarity index 100% rename from pkgs/development/interpreters/wamr/default.nix rename to pkgs/by-name/wa/wamr/package.nix diff --git a/pkgs/by-name/wa/wander/package.nix b/pkgs/by-name/wa/wander/package.nix index db55f3ce2c27..b838a623b78f 100644 --- a/pkgs/by-name/wa/wander/package.nix +++ b/pkgs/by-name/wa/wander/package.nix @@ -36,7 +36,7 @@ buildGoModule rec { description = "Terminal app/TUI for HashiCorp Nomad"; license = licenses.mit; homepage = "https://github.com/robinovitch61/wander"; - maintainers = teams.c3d2.members; + teams = [ teams.c3d2 ]; mainProgram = "wander"; }; } diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index fbf0705e3cef..adb10abf9f32 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2025.02.10.00"; + version = "2025.04.21.00"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "wangle"; tag = "v${finalAttrs.version}"; - hash = "sha256-IlMdYOQH0iqxObyFM1F4cZqOgSbCs4cOFtcsPWG8cWk="; + hash = "sha256-t3b+R2tb4VTsjDL9Jzjcaehs5k+BLNLilm3+nXxyjj0="; }; patches = [ diff --git a/pkgs/by-name/wa/wapiti/package.nix b/pkgs/by-name/wa/wapiti/package.nix index 9955e422423d..c17e22420581 100644 --- a/pkgs/by-name/wa/wapiti/package.nix +++ b/pkgs/by-name/wa/wapiti/package.nix @@ -1,67 +1,83 @@ { lib, + stdenv, fetchFromGitHub, - python3, + python3Packages, + fetchpatch, + versionCheckHook, + writableTmpDirAsHomeHook, + nix-update-script, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "wapiti"; - version = "3.2.2"; + version = "3.2.4"; pyproject = true; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = "wapiti"; tag = version; - hash = "sha256-sa4bXZiY5yd0wynUjdLnuuX7Ee0w4APd1G/oGy5AUDk="; + hash = "sha256-97RYJKCk3oY715mgkFNstrrhWc1Q7jZqktqt7l8uzGs="; }; + patches = [ + # Fixes: + # TypeError: AsyncClient.__init__() got an unexpected keyword argument 'proxies' + (fetchpatch { + name = "fix-wappalyzer-warnings"; + url = "https://github.com/wapiti-scanner/wapiti/commit/77fe140f8ad4d2fb266f1b49285479f6af25d6b7.patch"; + hash = "sha256-Htkpr+67V0bp4u8HbMP+yTZ4rlIWDadLZxLDSruDbZY="; + }) + ]; + pythonRelaxDeps = true; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; - dependencies = - with python3.pkgs; - [ - aiocache - aiohttp - aiosqlite - arsenic - beautifulsoup4 - browser-cookie3 - dnspython - h11 - httpcore - httpx - httpx-ntlm - humanize - loguru - mako - markupsafe - mitmproxy - prance - pyasn1 - six - sqlalchemy - tld - yaswfp - ] - ++ httpx.optional-dependencies.brotli - ++ httpx.optional-dependencies.socks - ++ prance.optional-dependencies.osv; + dependencies = with python3Packages; [ + aiocache + aiohttp + aiosqlite + beautifulsoup4 + browser-cookie3 + dnspython + h11 + httpcore + httpx + httpx-ntlm + humanize + loguru + mako + markupsafe + mitmproxy + msgpack + packaging + pyasn1 + sqlalchemy + tld + typing-extensions + urwid + yaswfp + wapiti-arsenic + wapiti-swagger + ]; __darwinAllowLocalNetworking = true; - nativeCheckInputs = with python3.pkgs; [ - respx - pytest-asyncio - pytest-cov-stub - pytestCheckHook - ]; - - preCheck = '' - export HOME=$(mktemp -d); - ''; + nativeCheckInputs = + with python3Packages; + [ + respx + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ] + ++ [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "--version"; disabledTests = [ # Tests requires network access @@ -133,14 +149,23 @@ python3.pkgs.buildPythonApplication rec { "test_attack_unifi" ]; - disabledTestPaths = [ - # Requires sslyze which is obsolete and was removed - "tests/attack/test_mod_ssl.py" - ]; + disabledTestPaths = + [ + # Requires sslyze which is obsolete and was removed + "tests/attack/test_mod_ssl.py" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # PermissionError: [Errno 13] Permission denied: '/tmp/crawl.db' + "tests/web/test_persister.py" + ]; pythonImportsCheck = [ "wapitiCore" ]; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Web application vulnerability scanner"; longDescription = '' Wapiti allows you to audit the security of your websites or web applications. @@ -152,7 +177,8 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://wapiti-scanner.github.io/"; changelog = "https://github.com/wapiti-scanner/wapiti/blob/${version}/doc/ChangeLog_Wapiti"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "wapiti"; }; } diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix index d70166275e6b..385e9af0a2b1 100644 --- a/pkgs/by-name/wa/wapm/package.nix +++ b/pkgs/by-name/wa/wapm/package.nix @@ -5,8 +5,6 @@ libiconv, openssl, rustPlatform, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,18 +23,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl ]; - buildInputs = - [ - libiconv - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ + libiconv + openssl + ]; doCheck = false; diff --git a/pkgs/by-name/wa/warehouse/package.nix b/pkgs/by-name/wa/warehouse/package.nix new file mode 100644 index 000000000000..7fd50af13e08 --- /dev/null +++ b/pkgs/by-name/wa/warehouse/package.nix @@ -0,0 +1,72 @@ +{ + lib, + blueprint-compiler, + desktop-file-utils, + fetchFromGitHub, + flatpak, + flatpak-xdg-utils, + glib, + gobject-introspection, + gtk4, + libadwaita, + meson, + ninja, + nix-update-script, + pkg-config, + python3, + stdenv, + wrapGAppsHook4, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "warehouse"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "flattool"; + repo = "warehouse"; + tag = finalAttrs.version; + hash = "sha256-EcpHFS0EczUDFs0A/7IuNs1082hsuuS0J6wxSq47vaQ="; + }; + + nativeBuildInputs = [ + blueprint-compiler + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook4 + gobject-introspection + ]; + + buildInputs = [ + flatpak + flatpak-xdg-utils + glib + gtk4 + libadwaita + (python3.withPackages ( + ps: with ps; [ + pygobject3 + ] + )) + ]; + + preFixup = '' + gappsWrapperArgs+=( + --suffix PATH : "${lib.makeBinPath [ flatpak-xdg-utils ]}" + ) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/flattool/warehouse/releases/tag/${finalAttrs.version}"; + description = "Manage all things Flatpak"; + homepage = "https://github.com/flattool/warehouse"; + license = lib.licenses.gpl3Plus; + mainProgram = "warehouse"; + maintainers = with lib.maintainers; [ michaelgrahamevans ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/wa/wargus/stratagus.nix b/pkgs/by-name/wa/wargus/stratagus.nix index 69baa283fa04..3284797b3027 100644 --- a/pkgs/by-name/wa/wargus/stratagus.nix +++ b/pkgs/by-name/wa/wargus/stratagus.nix @@ -4,10 +4,10 @@ fetchFromGitHub, cmake, pkg-config, - makeWrapper, zlib, bzip2, libpng, + libX11, lua5_1, toluapp, SDL2, @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { SDL2_image SDL2_mixer libGL + libX11 ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-Wno-error=format-overflow" diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index dd9b5f720314..ba80b7978426 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-tPb4Vax6dJFrX5VV1BEq70K4OvQPfMfNjPJZ22IeKW4=", - "version": "0.2025.03.26.08.10.stable_02" + "hash": "sha256-AxPUNdZbvc6T4sFFTkQnOAg26vmzf86oaGbtzapybFc=", + "version": "0.2025.05.14.08.11.stable_03" }, "linux_x86_64": { - "hash": "sha256-R3Z71iNpvEQ1KIh62XbuRelHIWwXzovOLuMpzAs+55Q=", - "version": "0.2025.03.26.08.10.stable_02" + "hash": "sha256-vdBTwn3ElyOIIyPXNbScvymq6P5d15b41NKAg7QSigk=", + "version": "0.2025.05.14.08.11.stable_03" }, "linux_aarch64": { - "hash": "sha256-sKfMab7iNsb0W+4jDPLeG3g7b2rnL6Py//kCjFltutI=", - "version": "0.2025.03.26.08.10.stable_02" + "hash": "sha256-jpTVEvZUmLlsiYTJtECT2G899PyFTXZz5qa9+RPWzaI=", + "version": "0.2025.05.14.08.11.stable_03" } } diff --git a/pkgs/by-name/wa/warp/package.nix b/pkgs/by-name/wa/warp/package.nix index 7fbe017161a5..9f2bb741c436 100644 --- a/pkgs/by-name/wa/warp/package.nix +++ b/pkgs/by-name/wa/warp/package.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.8.1"; + version = "0.9.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "warp"; - rev = "v${version}"; - hash = "sha256-RmihaFv+U11CAa5ax53WzpwYJ2PFOrhYt4w2iboW4m8="; + tag = "v${version}"; + hash = "sha256-60FhXIO1etcMhZJuSQjO2UWrkwV+AJOFmaAIi3uLpzY="; }; postPatch = '' @@ -38,9 +38,8 @@ stdenv.mkDerivation rec { ''; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-w3gQhyRpma+aJY7IC9Vb3FdIECHZBJoSjiPmKpJ2nM8="; + inherit pname version src; + hash = "sha256-sQFJ+eR/Ywl3KPN50P2RVHKAjxtOUb6YRoThRb5aMe8="; }; nativeBuildInputs = [ @@ -78,13 +77,11 @@ stdenv.mkDerivation rec { description = "Fast and secure file transfer"; homepage = "https://apps.gnome.org/Warp/"; license = lib.licenses.gpl3Only; - maintainers = - with lib.maintainers; - [ - dotlambda - foo-dogsquared - ] - ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ + dotlambda + foo-dogsquared + ]; + teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.all; mainProgram = "warp"; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/wa/warpinator/package.nix b/pkgs/by-name/wa/warpinator/package.nix index 790470389940..dac1fee1046f 100644 --- a/pkgs/by-name/wa/warpinator/package.nix +++ b/pkgs/by-name/wa/warpinator/package.nix @@ -95,6 +95,6 @@ stdenv.mkDerivation rec { description = "Share files across the LAN"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/wa/wasabiwallet/package.nix b/pkgs/by-name/wa/wasabiwallet/package.nix index bb3d0ea440ff..cf8d0db7d115 100644 --- a/pkgs/by-name/wa/wasabiwallet/package.nix +++ b/pkgs/by-name/wa/wasabiwallet/package.nix @@ -27,18 +27,18 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.8.1"; + version = "2.5.1"; src = fetchurl { - url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-9q93C8Q4MKrpvAs6cb4sgo3PDVhk9ZExeHIZ9Qm8P2w="; + url = "https://github.com/WalletWasabi/WalletWasabi/releases/download/v${version}/Wasabi-${version}-linux-x64.tar.gz"; + sha256 = "sha256-DTgxLg8NwjHX085Ai6zxXgjL3x8ZHqVIpvxk/KRl+7w="; }; dontBuild = true; desktopItem = makeDesktopItem { name = "wasabi"; - exec = "wasabiwallet"; + exec = "wasabiwallet-desktop"; desktopName = "Wasabi"; genericName = "Bitcoin wallet"; comment = meta.description; @@ -58,13 +58,15 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/opt/${pname} $out/bin $out/share/applications - cp -Rv . $out/opt/${pname} - makeWrapper "$out/opt/${pname}/wassabee" "$out/bin/${pname}" \ - --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + # The weird path is an upstream packaging error and could be fixed in the upcoming release + cp -Rv ./runner/work/WalletWasabi/WalletWasabi/build/linux-x64/* $out/opt/${pname} - makeWrapper "$out/opt/${pname}/wassabeed" "$out/bin/${pname}d" \ - --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + for nameMap in "wassabee:desktop" "wassabeed:daemon" "wcoordinator:coordinator" "wbackend:backend"; do + IFS=":" read -r filename wrappedname <<< "$nameMap" + makeWrapper "$out/opt/${pname}/$filename" "$out/bin/${pname}-$wrappedname" \ + --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + done cp -v $desktopItem/share/applications/* $out/share/applications ''; diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix index b01b2396a4bd..06d743e2b33c 100644 --- a/pkgs/by-name/wa/wash-cli/package.nix +++ b/pkgs/by-name/wa/wash-cli/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchCrate, rustPlatform, pkg-config, openssl, - darwin, fetchurl, }: @@ -22,24 +20,19 @@ let in rustPlatform.buildRustPackage rec { pname = "wash-cli"; - version = "0.29.2"; + version = "0.39.0"; src = fetchCrate { inherit version pname; - hash = "sha256-A66KSDYFbByguhnlzzU5nf8pE3lhnYQjI3h73SKB2Zo="; + hash = "sha256-qOxYBhwkcn4g1cUBHuF0AoecpxN4ukgTjBnzVhWtw7A="; }; useFetchCargoVendor = true; - cargoHash = "sha256-m8NkYqfWRNJn+1Qym1C5ZwKhvXrwFd01TSpVigYwsJ8="; + cargoHash = "sha256-dPHzRZh5jBxbPt+1a9wVbsBclAkfrcAXhpZgTw7e4Qo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ openssl ]; preBuild = " export WASI_PREVIEW1_COMMAND_COMPONENT_ADAPTER=${wasiPreviewCommandComponentAdapter} diff --git a/pkgs/by-name/wa/wasistlos/package.nix b/pkgs/by-name/wa/wasistlos/package.nix index ff96d89d7d92..3b5ae22e2e00 100644 --- a/pkgs/by-name/wa/wasistlos/package.nix +++ b/pkgs/by-name/wa/wasistlos/package.nix @@ -21,7 +21,7 @@ pcre, pcre2, pkg-config, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, xorg, }: @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { pcre pcre2 sqlite - webkitgtk_4_0 + webkitgtk_4_1 xorg.libXdmcp xorg.libXtst ]; diff --git a/pkgs/by-name/wa/wasm-language-tools/package.nix b/pkgs/by-name/wa/wasm-language-tools/package.nix index 3767fa61114c..57c2cd14625d 100644 --- a/pkgs/by-name/wa/wasm-language-tools/package.nix +++ b/pkgs/by-name/wa/wasm-language-tools/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "wasm-language-tools"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "g-plane"; repo = "wasm-language-tools"; tag = "v${version}"; - hash = "sha256-LkBeMZ4WEc8sZ6Gx31jdfdkEkjNfE3LFsz4B3hngT8U="; + hash = "sha256-ynbAIM6KSzCCfAG+G51yn2F9OpCJQj8yIWh0T4l0RD0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-PwyWqaJCfSh7l0OCalNfHIe9dA1BMOI8F7m4szOgVrs="; + cargoHash = "sha256-0gbf+n43zpq4p3hQ5u2nBdVQGK5y9C+9AzlQVGB6lo4="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/wat_server"; diff --git a/pkgs/by-name/wa/wasm-pack/package.nix b/pkgs/by-name/wa/wasm-pack/package.nix index 7810cc4a08d2..24a86a73edef 100644 --- a/pkgs/by-name/wa/wasm-pack/package.nix +++ b/pkgs/by-name/wa/wasm-pack/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, cmake, pkg-config, zstd, @@ -28,9 +26,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security ++ [ - zstd - ]; + buildInputs = [ zstd ]; # Most tests rely on external resources and build artifacts. # Disabling check here to work with build sandboxing. diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index f76ee2bb3183..028613edbf86 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.228.0"; + version = "1.230.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-tools"; rev = "v${version}"; - hash = "sha256-lVrZCjLhSCyD3aEr6IyRZejqwdiT89w0/ppmQE8Thto="; + hash = "sha256-xtGPZXb/tgReshmpW5zzG0EOVYPMoXU+avnO5uLKJnI="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; useFetchCargoVendor = true; - cargoHash = "sha256-yUOgQRdducguVinceeIs9PGk8Pq9Y24I3KbsRcCWpAY="; + cargoHash = "sha256-P+5g1ynZVFIU2bgait+2rwJoVYClF7lyq4j2roV/w2o="; cargoBuildFlags = [ "--package" "wasm-tools" diff --git a/pkgs/by-name/wa/wasmer-pack/package.nix b/pkgs/by-name/wa/wasmer-pack/package.nix index 0536ed30e8f2..273be1c20296 100644 --- a/pkgs/by-name/wa/wasmer-pack/package.nix +++ b/pkgs/by-name/wa/wasmer-pack/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-PZudXmdPz6fG7NDC/yN7qG+RQFSzNynXo6SpYJEku9A="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - cargoBuildFlags = [ "-p=wasmer-pack-cli" ]; # requires internet access diff --git a/pkgs/by-name/wa/wasmi/package.nix b/pkgs/by-name/wa/wasmi/package.nix index bb35f4dfb282..9afcafba9ce6 100644 --- a/pkgs/by-name/wa/wasmi/package.nix +++ b/pkgs/by-name/wa/wasmi/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wasmi"; - version = "0.42.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "wasmi"; tag = "v${version}"; - hash = "sha256-i8i0kd3Zmx7hIaJy8zSAgu0++1kRfLB/MkKpy0ImUrM="; + hash = "sha256-H/nuV4OMj2xCVej1u8zh9c9sp+XH+Zdpb080ZoA3xvc="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-dlMYChYUB2141+sOSHsZuM8QaaRM/rs9FNagCJeopao="; + cargoHash = "sha256-IDoZ6A5c/ayCusdb9flR3S/CBxJIWHQlEYP8ILRWXFw="; passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix new file mode 100644 index 000000000000..28c49736e450 --- /dev/null +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -0,0 +1,99 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + cmake, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "wasmtime"; + version = "32.0.0"; + + src = fetchFromGitHub { + owner = "bytecodealliance"; + repo = "wasmtime"; + tag = "v${finalAttrs.version}"; + hash = "sha256-MGeLnxUmhhuW1FInBCc1xzppgvf3W8J0sy9v9QjgBIA="; + fetchSubmodules = true; + }; + + # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. + auditable = false; + useFetchCargoVendor = true; + cargoHash = "sha256-m9TsTTx/ExqE9/W3xVkYxtgKh8AlGUJTlGPMIDK2xog="; + cargoBuildFlags = [ + "--package" + "wasmtime-cli" + "--package" + "wasmtime-c-api" + ]; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ cmake ]; + + doCheck = + with stdenv.buildPlatform; + # SIMD tests are only executed on platforms that support all + # required processor features (e.g. SSE3, SSSE3 and SSE4.1 on x86_64): + # https://github.com/bytecodealliance/wasmtime/blob/v9.0.0/cranelift/codegen/src/isa/x64/mod.rs#L220 + (isx86_64 -> sse3Support && ssse3Support && sse4_1Support) + && + # The dependency `wasi-preview1-component-adapter` fails to build because of: + # error: linker `rust-lld` not found + !isAarch64; + + postInstall = + let + inherit (stdenv.targetPlatform.rust) cargoShortTarget; + in + '' + # move libs from out to dev + install -d -m 0755 $dev/lib + install -m 0644 ''${!outputLib}/lib/* $dev/lib + rm -r ''${!outputLib}/lib + + # copy the build.rs generated c-api headers + install -d -m0755 $dev/include/wasmtime + # https://github.com/rust-lang/cargo/issues/9661 + install -m0644 \ + target/${cargoShortTarget}/release/build/wasmtime-c-api-impl-*/out/include/*.h \ + $dev/include + install -m0644 \ + target/${cargoShortTarget}/release/build/wasmtime-c-api-impl-*/out/include/wasmtime/*.h \ + $dev/include/wasmtime + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -id \ + $dev/lib/libwasmtime.dylib \ + $dev/lib/libwasmtime.dylib + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; + homepage = "https://wasmtime.dev/"; + license = lib.licenses.asl20; + mainProgram = "wasmtime"; + maintainers = with lib.maintainers; [ + ereslibre + matthewbauer + ]; + platforms = lib.platforms.unix; + changelog = "https://github.com/bytecodealliance/wasmtime/blob/v${finalAttrs.version}/RELEASES.md"; + }; +}) diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index 3b8e300d2696..74cbee859222 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -5,37 +5,31 @@ pkg-config, sqlite, zstd, - stdenv, - darwin, nixosTests, }: rustPlatform.buildRustPackage rec { pname = "wastebin"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "matze"; repo = "wastebin"; rev = version; - hash = "sha256-DuIT4jIxk+L7c+rWIzrNjNEs2Lv5mYqLeCAaBMsBCBg="; + hash = "sha256-7+Ufin68gMQtKv8SC8Gmn0Ra2qpumsKYgpURTkVqzt8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Ui4Bns5A25VrNer6wpD0agYJQwxuIYWSOO26u1K8Vmc="; + cargoHash = "sha256-j9Wpo3N1kwCvjDEqmn87rGSYFVw1ZGkSps72zVpXNls="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - sqlite - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + sqlite + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix new file mode 100644 index 000000000000..93ca9ba9e438 --- /dev/null +++ b/pkgs/by-name/wa/watchexec/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, +}: + +rustPlatform.buildRustPackage rec { + pname = "watchexec"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-ldxB1/WgOe1uGfKXkMEtGHIlWiKJgnZz6j/7eCOGD8s="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-LdjJlf4HPN+kZOQKPNSdbYApGBD4Z6tKV9Y0FFKpAf0="; + + nativeBuildInputs = [ installShellFiles ]; + + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; + + checkFlags = [ + "--skip=help" + "--skip=help_short" + ]; + + postPatch = '' + rm .cargo/config.toml + ''; + + postInstall = '' + installManPage doc/watchexec.1 + installShellCompletion --zsh --name _watchexec completions/zsh + ''; + + meta = with lib; { + description = "Executes commands in response to file modifications"; + homepage = "https://watchexec.github.io/"; + license = with licenses; [ asl20 ]; + maintainers = [ maintainers.michalrus ]; + mainProgram = "watchexec"; + }; +} diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix index 4942c18cfd96..b892e4ae7194 100644 --- a/pkgs/by-name/wa/watchlog/package.nix +++ b/pkgs/by-name/wa/watchlog/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "watchlog"; - version = "1.244.0"; + version = "1.246.0"; src = fetchFromGitLab { owner = "kevincox"; repo = "watchlog"; rev = "v${version}"; - hash = "sha256-RQggLV4ROV9j5FxiJ2pRh/jlTFhgKUiBO/Gh/jLJ3tg="; + hash = "sha256-1AcA2Ar2XVLMfBxG2GtsXe9zNF/8pJBZ2NzihhMm3Vk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hdNEEbpsasAc8thQ6fKP4DQ+6jQiA2CO781Zz8CEiHU="; + cargoHash = "sha256-83vDlH/S8rZqLwBux3WoTIkGFf01Powyz9sZpsVY+AQ="; meta = { description = "Easier monitoring of live logs"; diff --git a/pkgs/by-name/wa/watchman/Cargo.lock b/pkgs/by-name/wa/watchman/Cargo.lock index 720cbbfaa865..9568411779ad 100644 --- a/pkgs/by-name/wa/watchman/Cargo.lock +++ b/pkgs/by-name/wa/watchman/Cargo.lock @@ -41,9 +41,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "atty" @@ -85,9 +85,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" [[package]] name = "byteorder" @@ -97,9 +97,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" dependencies = [ "serde", ] @@ -152,9 +152,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] @@ -207,9 +207,9 @@ dependencies = [ [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "futures" @@ -273,7 +273,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -309,9 +309,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", @@ -344,9 +344,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jwalk" @@ -366,9 +366,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.169" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "lock_api" @@ -382,9 +382,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.25" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "maplit" @@ -409,9 +409,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.3" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", ] @@ -433,7 +433,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", "cfg-if", "cfg_aliases", "libc", @@ -460,9 +460,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.3" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "os_pipe" @@ -535,18 +535,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.93" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -573,11 +573,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", ] [[package]] @@ -588,9 +588,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "ryu" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "scopeguard" @@ -600,9 +600,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.217" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -621,29 +621,29 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.15" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "serde_json" -version = "1.0.138" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -663,9 +663,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] @@ -681,15 +681,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "socket2" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" dependencies = [ "libc", "windows-sys 0.52.0", @@ -738,9 +738,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.98" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -797,14 +797,14 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "tokio" -version = "1.43.0" +version = "1.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" dependencies = [ "backtrace", "bytes", @@ -827,7 +827,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -867,9 +867,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-segmentation" @@ -1075,5 +1075,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index a46cc591d87f..06c45602b492 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "watchman"; - version = "2025.02.10.00"; + version = "2025.04.21.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; tag = "v${finalAttrs.version}"; - hash = "sha256-X9cUiMrUeuuJT+0gJa9cL2mpeSEWS/DkTx7eQu8u7oY="; + hash = "sha256-eZRrG7bgmh7hW7ihQISQP5pnWAVGhDLL93rCP7ZtUnA="; }; patches = [ diff --git a/pkgs/by-name/wa/watchyourlan/package.nix b/pkgs/by-name/wa/watchyourlan/package.nix index 5cf2e91c4d53..2432d6e3c3f4 100644 --- a/pkgs/by-name/wa/watchyourlan/package.nix +++ b/pkgs/by-name/wa/watchyourlan/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "watchyourlan"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "aceberg"; repo = "WatchYourLAN"; tag = version; - hash = "sha256-xiwDcqEfuNuqNQO2wtJ2XK0mPf91C1bapEqKKmKxw4c="; + hash = "sha256-BI/Ydp7YswgdhwaptmqohwCw1gvRefFF9cz3Bjc2cnA="; }; vendorHash = "sha256-NUv90wq3nFHDtfk3BitwJ3ZfciPESUIDzS5S/6zafEQ="; diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix index 121d60090bed..3152399e1b39 100644 --- a/pkgs/by-name/wa/wavebox/package.nix +++ b/pkgs/by-name/wa/wavebox/package.nix @@ -156,11 +156,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wavebox"; - version = "10.134.18-2"; + version = "10.135.21-2"; src = fetchurl { url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb"; - hash = "sha256-L2EXQuDHpHzqIeWeDl3rYzwrF/1sMtRIQSuGaVUEW5o="; + hash = "sha256-NnJ+pP6JrMiMmoXS/yYm5qMLmv5oyguhmYF/M0Pv4/g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix index c58471bed6d1..f4b8cc30f0ca 100644 --- a/pkgs/by-name/wa/wavelog/package.nix +++ b/pkgs/by-name/wa/wavelog/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wavelog"; - version = "2.0.2"; + version = "2.0.4"; src = fetchFromGitHub { owner = "wavelog"; repo = "wavelog"; tag = finalAttrs.version; - hash = "sha256-2cIUWrDOfKiTubS8l904dd5lJsNY9+MGtV2KBTa6fFM="; + hash = "sha256-P4Rwrm9S6nI7TqFlEpX2MVm5k8l0vnvXWdshgr+7wiQ="; }; installPhase = '' diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index e750a8f29ca6..9cdc708575b4 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -24,16 +24,14 @@ nss, nspr, vips, - wrapGAppsHook3, udev, libGL, unzip, - makeWrapper, }: let selectSystem = attrs: attrs.${stdenv.hostPlatform.system}; pname = "waveterm"; - version = "0.11.1"; + version = "0.11.3"; passthru.updateScript = ./update.sh; @@ -64,16 +62,14 @@ let fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb"; hash = selectSystem { - x86_64-linux = "sha256-At6mNL1M0/zcDb+IbQi0+eUAGMcCmgLYk6XAlU1+8cw="; - aarch64-linux = "sha256-N6tTCfB9MqDX+OnFmuYbWs0XKEmQH7PSGuCadjM8Rmg="; + x86_64-linux = "sha256-pcYJHj8Jt5RazHZNAgXuSL6mu0MnUVqM9lmAUVJvGfg="; + aarch64-linux = "sha256-HAnlEHhbl15W/ynRWTG7TLtGkC7EPPpJzWQfMK52loA="; }; }; nativeBuildInputs = [ dpkg autoPatchelfHook - wrapGAppsHook3 - makeWrapper ]; buildInputs = [ @@ -99,29 +95,27 @@ let vips ]; - runtimeDependencies = map lib.getLib [ - udev - ]; - installPhase = '' runHook preInstall - cp -r opt $out + mkdir -p $out/bin $out/app + cp -r opt/Wave $out/app/waveterm cp -r usr/share $out/share substituteInPlace $out/share/applications/waveterm.desktop \ --replace-fail "/opt/Wave/" "" + ln -s $out/app/waveterm/waveterm $out/bin/waveterm runHook postInstall ''; preFixup = '' - mkdir $out/bin - makeWrapper $out/Wave/waveterm $out/bin/waveterm \ - --prefix LD_LIBRARY_PATH : "${ + patchelf --add-needed libGL.so.1 \ + --add-rpath ${ lib.makeLibraryPath [ libGL + udev ] - }" + } $out/app/waveterm/waveterm ''; meta = metaCommon // { @@ -142,14 +136,12 @@ let fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip"; hash = selectSystem { - x86_64-darwin = "sha256-QkSsoMW0Ry4aLF9XtRpC7pIY84WAhtCbZGBZ1RCeMN8="; - aarch64-darwin = "sha256-mVVThER1h0EB0ONNTxaBrSvAU9PP35MSPc0eW4mfJXo="; + x86_64-darwin = "sha256-KmH5az2p2dRC1UCXCt7SBVfomj6dDaAtevIai1YIYO0="; + aarch64-darwin = "sha256-SdZY5MPi+oP3+ywW3BASMzYr16QiYS3MXyPs9jCqD+Y="; }; }; - nativeBuildInputs = [ - unzip - ]; + nativeBuildInputs = [ unzip ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/wa/way-displays/package.nix b/pkgs/by-name/wa/way-displays/package.nix index d0ff6d5c5418..a83567663e95 100644 --- a/pkgs/by-name/wa/way-displays/package.nix +++ b/pkgs/by-name/wa/way-displays/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "way-displays"; - version = "1.12.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "alex-courtis"; repo = "way-displays"; rev = version; - sha256 = "sha256-Og0SQOA5sny1N0llOiScmfqvRuplCE89z38YWNRtPho="; + sha256 = "sha256-HIm5cHi9yX9IHDrxqYzxwefuZtOCu5TJzf3j0aiSC5g="; }; strictDeps = true; diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index 9b61bae8837d..d2b27b317029 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -193,7 +193,7 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/wa/wayclip/package.nix b/pkgs/by-name/wa/wayclip/package.nix index 43e75ad16b87..d5279ddce99b 100644 --- a/pkgs/by-name/wa/wayclip/package.nix +++ b/pkgs/by-name/wa/wayclip/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromSourcehut, - nix-update-script, + gitUpdater, wayland, wayland-scanner, }: @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" ]; passthru = { - updateScript = nix-update-script { }; + updateScript = gitUpdater { }; }; meta = { diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix index d97feb4bd87d..3f968e65745c 100644 --- a/pkgs/by-name/wa/waydroid/package.nix +++ b/pkgs/by-name/wa/waydroid/package.nix @@ -21,14 +21,14 @@ python3Packages.buildPythonApplication rec { pname = "waydroid"; - version = "1.4.3"; + version = "1.5.1"; format = "other"; src = fetchFromGitHub { owner = "waydroid"; repo = "waydroid"; tag = version; - hash = "sha256-LejyuGYgW46++95XROuWc13Q+w0l+AzGAl9ekfmAIEk="; + hash = "sha256-G/JQR1C4osbZDUQSqLu48C468W6f2SeNkogVEiGhnmA="; }; patches = [ diff --git a/pkgs/by-name/wa/wayfarer/package.nix b/pkgs/by-name/wa/wayfarer/package.nix index d9d03e709e6d..21d90646be7e 100644 --- a/pkgs/by-name/wa/wayfarer/package.nix +++ b/pkgs/by-name/wa/wayfarer/package.nix @@ -17,13 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayfarer"; - version = "1.2.4"; + version = "1.2.4-unstable-2025-04-12"; src = fetchFromGitHub { owner = "stronnag"; repo = "wayfarer"; - rev = finalAttrs.version; - hash = "sha256-Vuiy2SjpK2T1ekbwa/KyIFa1V4BJsnJRIj4b+Yx0VEw="; + # branch development - has new gtk4 code + rev = "2517004bb3c48653100f0c6a6da16fde7927755e"; + hash = "sha256-ULmkjyBuqVwsFbLOdvqxvsAH1EF7zXFEBhU//nsV5sU="; }; postPatch = '' diff --git a/pkgs/by-name/wa/wayidle/package.nix b/pkgs/by-name/wa/wayidle/package.nix index 8a0dae1133e4..6e3b7cdae297 100644 --- a/pkgs/by-name/wa/wayidle/package.nix +++ b/pkgs/by-name/wa/wayidle/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { description = "Execute a program when a Wayland compositor reports being N seconds idle"; homepage = "https://git.sr.ht/~whynothugo/wayidle"; license = licenses.isc; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = [ ]; mainProgram = "wayidle"; platforms = platforms.linux; }; diff --git a/pkgs/by-name/wa/waylyrics/package.nix b/pkgs/by-name/wa/waylyrics/package.nix index 5cb339592e66..4b1f4ba03ffa 100644 --- a/pkgs/by-name/wa/waylyrics/package.nix +++ b/pkgs/by-name/wa/waylyrics/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.3.20"; + version = "0.3.21"; src = fetchFromGitHub { owner = "waylyrics"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-NDdZH33tkY+TgDLkT7r+M9uHCeE9/NRQgVZhJ7EuxEc="; + hash = "sha256-uXAcoy5fnnkqtmGmaEC6Ceu+dwmZKDPOFzxC4COuDbk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dTyUPLwDcT2b3Kw4Q7/DyX6YfFcaOeDq6CCUpG9QUQQ="; + cargoHash = "sha256-moB2G/QxN3oAfCoTHXjFpIOSB2wRogEUjzup+MTfR6E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index 01d18f7fc169..d163798486f6 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -19,21 +19,22 @@ autoPatchelfHook, wayland-scanner, rust-bindgen, + nix-update-script, }: -llvmPackages.stdenv.mkDerivation rec { +llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "waypipe"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; - tag = "v${version}"; - hash = "sha256-E0NJTOK8wf42dXgBtsOmCKlfSLC/zEuUxLKVxwcb9Ig="; + tag = "v${finalAttrs.version}"; + hash = "sha256-O47b1CHCEwUSigjk0Ml3uLhRRxcPC6Phj2cnIlX1Hkg="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - hash = "sha256-T2/su0DQt8KZ8diHTNz3jzeMZaW3cGcAFA6MYs1Qn3k="; + inherit (finalAttrs) pname version src; + hash = "sha256-c561GpU2XENILSzk0Zka0qrtXZm7xaq/hiJA4Iv++QI="; }; strictDeps = true; @@ -69,7 +70,9 @@ llvmPackages.stdenv.mkDerivation rec { vulkan-loader ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Network proxy for Wayland clients (applications)"; longDescription = '' waypipe is a proxy for Wayland clients. It forwards Wayland messages and @@ -77,10 +80,10 @@ llvmPackages.stdenv.mkDerivation rec { makes application forwarding similar to ssh -X feasible. ''; homepage = "https://mstoeckl.com/notes/gsoc/blog.html"; - changelog = "https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases#v${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ mic92 ]; + changelog = "https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases#v${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ mic92 ]; mainProgram = "waypipe"; }; -} +}) diff --git a/pkgs/by-name/wc/wcc/package.nix b/pkgs/by-name/wc/wcc/package.nix index 72c61d940942..e753f7f3fd73 100644 --- a/pkgs/by-name/wc/wcc/package.nix +++ b/pkgs/by-name/wc/wcc/package.nix @@ -10,14 +10,15 @@ }: stdenv.mkDerivation { - pname = "wcc-unstable"; - version = "0.0.7-unstable-2025-01-13"; + pname = "wcc"; + version = "0.0.7-unstable-2025-04-30"; src = fetchFromGitHub { owner = "endrazine"; repo = "wcc"; - rev = "fe1f71d7f6c756e196b82a884dc38bb8f8aef4d3"; - sha256 = "sha256-Kb9QIL+W0JFdfweqZL05OajXGGqXn6e6Jv3IVCr3BwQ="; + rev = "8cbb49345d9596dfd37bd1b681753aacaab96475"; + hash = "sha256-TYYtnMlrp/wbrTmwd3n90Uni7WE54gK6zKSBg4X9ZfA="; + deepClone = true; fetchSubmodules = true; }; @@ -34,8 +35,12 @@ stdenv.mkDerivation { -e "s#/usr/share/wcc#$out/share/wcc#" sed -i -e '/stropts.h>/d' src/wsh/include/libwitch/wsh.h + + sed -i '/wsh-`uname -m`.*-static/d' src/wsh/Makefile ''; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + installFlags = [ "DESTDIR=$(out)" ]; preInstall = '' @@ -60,7 +65,13 @@ stdenv.mkDerivation { homepage = "https://github.com/endrazine/wcc"; description = "Witchcraft compiler collection: tools to convert and script ELF files"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ orivej ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + maintainers = with maintainers; [ + orivej + DieracDelta + ]; }; } diff --git a/pkgs/by-name/wc/wcurl/package.nix b/pkgs/by-name/wc/wcurl/package.nix index eedc047ade79..55615ea97964 100644 --- a/pkgs/by-name/wc/wcurl/package.nix +++ b/pkgs/by-name/wc/wcurl/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wcurl"; - version = "2025.02.24"; + version = "2025.04.20"; src = fetchFromGitHub { owner = "curl"; repo = "wcurl"; tag = "v${finalAttrs.version}"; - hash = "sha256-BP69x5ck2Fd8xLijb9G4ccvYfh1S7luMwmYhc40W9ak="; + hash = "sha256-6ZW1VTtggp72vDgOAnieWK68ITU+E5x0gV2N2IJ5JDQ="; }; strictDeps = true; diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index c7ce95234a5a..4f8b7ac07faf 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -18,18 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "wealthfolio"; - version = "1.0.24"; + version = "1.1.2"; src = fetchFromGitHub { owner = "afadil"; repo = "wealthfolio"; rev = "v${finalAttrs.version}"; - hash = "sha256-3EuZXP4CTUcc9tlIdfAQfvwK5RZXcBe/8YkyjL/ZOVg="; + hash = "sha256-lN7P8FPcMU9COTyKs1hswvmHIKFqrL3Svp77q4pI6+I="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) src pname version; - hash = "sha256-0mjflUoqVJzshgpmyk32+Br61nkvcSjmjN7nf+7ZXJE="; + hash = "sha256-wKj1jy/TDi8Cckx9et2XzX3yPnmfXMDrqv9c4+Yyhu4="; }; cargoRoot = "src-tauri"; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-QFIDiuoT4J4pv1VrU5twrcb9Eqo77bgsWQl1DURpghE="; + hash = "sha256-MmdvEutdkX98DgX1aVuxs4gabuMX5aM8yC4eqgvd8Q4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix index c1c4410e5263..cd2a81853fe9 100644 --- a/pkgs/by-name/we/weasis/package.nix +++ b/pkgs/by-name/we/weasis/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchzip, - jre, + jdk23, copyDesktopItems, makeDesktopItem, }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ./build/script/package-weasis.sh --no-installer --jdk ${jre} + ./build/script/package-weasis.sh --no-installer --jdk ${jdk23} runHook postBuild ''; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/{applications,pixmaps} - mv weasis-${platform}-jdk${lib.versions.major jre.version}-${version}/Weasis/* $out/ + mv weasis-${platform}-jdk${lib.versions.major jdk23.version}-${version}/Weasis/* $out/ mv $out/lib/*.png $out/share/pixmaps/ runHook postInstall diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index 80e838b23272..1c50d46d1154 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -6,19 +6,19 @@ weaver, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "weaver"; - version = "0.13.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "weaver"; - rev = "v${version}"; - hash = "sha256-kfBWI+1f39oSSKYflXfXnBTc96OZch7o5HWfOgOfuxs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-aAxVSk12bPaWbvCWd+ntPeozd/rtQxdu53APWXI6fTg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-KK6Cp6viQPp9cSxs1dP1tf/bIMgkKiaKPE6VytyHyZA="; + cargoHash = "sha256-Sc5tSK/0C8iqwb4yM6Ra2/PcdOdn1UkpUQjgmWmfVBE="; checkFlags = [ # Skip tests requiring network @@ -36,4 +36,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "weaver"; }; -} +}) diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix index ef0e55faacb4..8fc968c5f9f1 100644 --- a/pkgs/by-name/we/weaviate/package.nix +++ b/pkgs/by-name/we/weaviate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.29.1"; + version = "1.30.3"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-Akg0iY5M3X6ztKxhNEkhi03VnbNpNW7/Vcbv2KB6X54="; + hash = "sha256-kZxXpC2pnfKT2uVPDbrH3hG8zCtUcsPszr5BFrcDlYc="; }; - vendorHash = "sha256-U2ean49ESKmcQ3fTtd6y9MwfWPr6tolvgioyKbQsBmU="; + vendorHash = "sha256-TOmY7Caxi+TGguHFK9Blylf6AhhYVHDD23KS9EoE8vw="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/pkgs/by-name/we/web-ext/package.nix b/pkgs/by-name/we/web-ext/package.nix index 401aff4d5867..4be574c68057 100644 --- a/pkgs/by-name/we/web-ext/package.nix +++ b/pkgs/by-name/we/web-ext/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "web-ext"; - version = "8.5.0"; + version = "8.6.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "web-ext"; rev = version; - hash = "sha256-RT/K/fYMys1RAvnusAMuHtfZ7gndYf3FPuHBYCklBpw="; + hash = "sha256-y+aaAsAW1e+k5dnkYbq6JyRlKiC9wdXvyykUiKfQXis="; }; - npmDepsHash = "sha256-O8DmeT0wRNpuPU1K6kH97D9+mxOxCchAUrvOVPq4VPc="; + npmDepsHash = "sha256-5YLTb8nwmHgl29ZO7UVh0IGD/Pl4lxWoDH9o8H/Cp/I="; npmBuildFlags = [ "--production" ]; diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index f7cf9d28ac9f..8891077bdd5a 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "webcord"; - version = "4.10.4"; + version = "4.10.5"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; tag = "v${version}"; - hash = "sha256-rBOQutAPmNiw9bJ3nYSddbAwSqYHAlSNHpkMvxzmUnA="; + hash = "sha256-PSDPziby0KYo7KU656NgTJq7TUn4blNcW9/ontWhEKE="; }; - npmDepsHash = "sha256-CjXEwFRGVjJv+kuyq9IZHdiYKJ6lbSDZnIxBer3qnOI="; + npmDepsHash = "sha256-xaGt/Y9LovSKNFur0wv2rF+EtYAL5Kn/lYpcY3Gd4zk="; makeCacheWritable = true; diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index 7fe300b4e3c5..1079a147df69 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "webdav"; - version = "5.7.4"; + version = "5.7.5"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${version}"; - hash = "sha256-f4Z5DiwrcF18ZSfDeSf1kwQIRmVNK4K5WrkQJYfquIs="; + hash = "sha256-iXU3ePALas/Z4caB1uhc5yW88zV/4iqv7qpOw4ZgZ3g="; }; - vendorHash = "sha256-8M25/Pfu175CYsO+bvLN5wxT7OciUUt7iQV0BkezTVw="; + vendorHash = "sha256-B78O13FPpkcuE808c2hLiIDPQdS5qlaw1dWLc9T7hvM="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/we/webfontkitgenerator/package.nix b/pkgs/by-name/we/webfontkitgenerator/package.nix index 9359c11fdcda..2fc73d65dac5 100644 --- a/pkgs/by-name/we/webfontkitgenerator/package.nix +++ b/pkgs/by-name/we/webfontkitgenerator/package.nix @@ -73,7 +73,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "webfontkitgenerator"; homepage = "https://apps.gnome.org/app/com.rafaelmardojai.WebfontKitGenerator"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ benediktbroich ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ benediktbroich ]; + teams = [ teams.gnome-circle ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 6eceade528b3..1b670e1fd39d 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -17,7 +17,6 @@ let python = python3.override { packageOverrides = final: prev: { django = prev.django_5; - sentry-sdk = prev.sentry-sdk_2; djangorestframework = prev.djangorestframework.overridePythonAttrs (old: { # https://github.com/encode/django-rest-framework/discussions/9342 disabledTests = (old.disabledTests or [ ]) ++ [ "test_invalid_inputs" ]; @@ -27,7 +26,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.10.4"; + version = "5.11.4"; pyproject = true; @@ -40,7 +39,7 @@ python.pkgs.buildPythonApplication rec { owner = "WeblateOrg"; repo = "weblate"; tag = "weblate-${version}"; - hash = "sha256-ReODTMaKMkvbaR8JETSeOrXxQIsL1Vy1pjKYWo5mw+A="; + hash = "sha256-0/PYl8A95r0xulaSawnSyrSqB7SiEBgd9TVP7OIla00="; }; patches = [ @@ -89,6 +88,7 @@ python.pkgs.buildPythonApplication rec { cyrtranslit dateparser diff-match-patch + disposable-email-domains django-appconf django-celery-beat django-compressor @@ -148,6 +148,8 @@ python.pkgs.buildPythonApplication rec { ++ drf-spectacular.optional-dependencies.sidecar ++ drf-standardized-errors.optional-dependencies.openapi; + pythonRelaxDeps = [ "django-otp-webauthn" ]; + optional-dependencies = { postgres = with python.pkgs; [ psycopg ]; }; @@ -171,14 +173,15 @@ python.pkgs.buildPythonApplication rec { }; }; - meta = with lib; { + meta = { description = "Web based translation tool with tight version control integration"; homepage = "https://weblate.org/"; - license = with licenses; [ + changelog = "https://github.com/WeblateOrg/weblate/releases/tag/${src.tag}"; + license = with lib.licenses; [ gpl3Plus mit ]; - platforms = platforms.linux; - maintainers = with maintainers; [ erictapen ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ erictapen ]; }; } diff --git a/pkgs/by-name/we/webp-pixbuf-loader/package.nix b/pkgs/by-name/we/webp-pixbuf-loader/package.nix index 9448088c08c6..514e4341fa14 100644 --- a/pkgs/by-name/we/webp-pixbuf-loader/package.nix +++ b/pkgs/by-name/we/webp-pixbuf-loader/package.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aruiz/webp-pixbuf-loader"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = teams.gnome.members ++ [ maintainers.cwyc ]; + maintainers = [ maintainers.cwyc ]; + teams = [ teams.gnome ]; }; } diff --git a/pkgs/by-name/we/websocat/package.nix b/pkgs/by-name/we/websocat/package.nix index 5e9b3602181e..f00d2aef05f3 100644 --- a/pkgs/by-name/we/websocat/package.nix +++ b/pkgs/by-name/we/websocat/package.nix @@ -2,7 +2,6 @@ lib, stdenv, bash, - darwin, fetchFromGitHub, libiconv, makeWrapper, @@ -35,7 +34,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix index 5c76c9d13462..b01fd801baf3 100644 --- a/pkgs/by-name/we/websurfx/package.nix +++ b/pkgs/by-name/we/websurfx/package.nix @@ -6,7 +6,7 @@ pkg-config, }: let - version = "1.23.6"; + version = "1.24.6"; in rustPlatform.buildRustPackage { pname = "websurfx"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { owner = "neon-mmd"; repo = "websurfx"; tag = "v${version}"; - hash = "sha256-tTwY+cmGUmqaTBHjZl/MA8wVBH/2CpoTcZZitZEKxJo="; + hash = "sha256-T5ghMAR5fIFwbzBBl4wO+RIPkzbOK+ZAFnw5Id+aVlc="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; - cargoHash = "sha256-/cfpj1/PvJ6lkVyfdzrMXiG1d3Fg5p6eui3QuRlrnNw="; + cargoHash = "sha256-vjvSOhyEQPW8sw1SjVWGvtnpzHGbyah1ufhLBUq7Qcw="; postPatch = '' substituteInPlace src/handler/mod.rs \ diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 31fb7254e5b9..cc144e717e26 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -8,21 +8,19 @@ installShellFiles, versionCheckHook, }: - -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "werf"; - version = "2.31.1"; + version = "2.35.8"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; - tag = "v${version}"; - hash = "sha256-eEdhAY3vN6hsgggakYpGFiVjR2BBGrg1UF18gFXc8g8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-akrhVRjoWrBdSrYWe4MZnCAMdT2KfXxAI4oBvrHBwC8="; }; - vendorHash = "sha256-g+QZI0mfXSIU+iBnKzMeTGuF5UB1cwOixvRhcrBGrpE="; - proxyVendor = true; + vendorHash = "sha256-9caBSJ/eMEdVQ55eebjibtsZJOMZk4OcP1D/NckWxCQ="; subPackages = [ "cmd/werf" ]; @@ -41,9 +39,9 @@ buildGoModule rec { [ "-s" "-w" - "-X github.com/werf/werf/v2/pkg/werf.Version=v${version}" + "-X github.com/werf/werf/v2/pkg/werf.Version=v${finalAttrs.version}" ] - ++ lib.optionals (env.CGO_ENABLED == 1) [ + ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [ "-extldflags=-static" "-linkmode external" ]; @@ -56,7 +54,7 @@ buildGoModule rec { "dfrunsecurity" "dfssh" ] - ++ lib.optionals (env.CGO_ENABLED == 1) [ + ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [ "cni" "exclude_graphdriver_devicemapper" "netgo" @@ -72,13 +70,14 @@ buildGoModule rec { # Test all packages. unset subPackages - # Remove tests that require external services, usually a Docker daemon. + # Remove tests that fail or require external services. rm -rf \ integration/suites \ pkg/true_git/*_test.go \ + pkg/werf/exec/*_test.go \ test/e2e '' - + lib.optionalString (env.CGO_ENABLED == 0) '' + + lib.optionalString (finalAttrs.env.CGO_ENABLED == 0) '' # A workaround for osusergo. export USER=nixbld ''; @@ -104,9 +103,9 @@ buildGoModule rec { Buildah. ''; homepage = "https://werf.io"; - changelog = "https://github.com/werf/werf/releases/tag/${src.rev}"; + changelog = "https://github.com/werf/werf/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.azahi ]; mainProgram = "werf"; }; -} +}) diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix new file mode 100644 index 000000000000..24a6ba2067e4 --- /dev/null +++ b/pkgs/by-name/we/weylus/package.nix @@ -0,0 +1,110 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + makeWrapper, + dbus, + ffmpeg, + x264, + libva, + gst_all_1, + xorg, + libdrm, + pkg-config, + pango, + pipewire, + cmake, + git, + autoconf, + libtool, + typescript, + wayland, + libxkbcommon, +}: + +rustPlatform.buildRustPackage rec { + pname = "weylus"; + version = "unstable-2025-02-24"; + + src = fetchFromGitHub { + owner = "H-M-H"; + repo = pname; + rev = "5202806798ccca67c24da52ba51ee50b973b7089"; + sha256 = "sha256-lx1ZVp5DkQiL9/vw6PAZ34Lge+K8dfEVh6vLnCUNf7M="; + }; + + buildInputs = + [ + ffmpeg + x264 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus + libva + gst_all_1.gst-plugins-base + xorg.libXext + xorg.libXft + xorg.libXinerama + xorg.libXcursor + xorg.libXrender + xorg.libXfixes + xorg.libXtst + xorg.libXrandr + xorg.libXcomposite + xorg.libXi + xorg.libXv + pango + libdrm + wayland + libxkbcommon + ]; + + nativeBuildInputs = + [ + cmake + git + typescript + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + autoconf + libtool + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-dLhlYOrLjoBSRGDJB0qTEIb+oGnp9X+ADHddpYITdl8="; + + cargoBuildFlags = [ "--features=ffmpeg-system" ]; + cargoTestFlags = [ "--features=ffmpeg-system" ]; + + postFixup = + let + GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ + gst_all_1.gst-plugins-base + pipewire + ]; + in + lib.optionalString stdenv.hostPlatform.isLinux '' + wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH} + ''; + + postInstall = '' + install -vDm755 weylus.desktop $out/share/applications/weylus.desktop + ''; + + env = { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-incompatible-pointer-types" + ]; + }; + + meta = with lib; { + description = "Use your tablet as graphic tablet/touch screen on your computer"; + mainProgram = "weylus"; + homepage = "https://github.com/H-M-H/Weylus"; + license = with licenses; [ agpl3Only ]; + maintainers = with maintainers; [ lom ]; + }; +} diff --git a/pkgs/by-name/wf/wfview/package.nix b/pkgs/by-name/wf/wfview/package.nix new file mode 100644 index 000000000000..c9c284c261c5 --- /dev/null +++ b/pkgs/by-name/wf/wfview/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchFromGitLab, + eigen, + hidapi, + libopus, + libpulseaudio, + portaudio, + qt6, + qt6Packages, + rtaudio, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wfview"; + version = "2.10"; + + src = fetchFromGitLab { + owner = "eliggett"; + repo = "wfview"; + rev = "v${finalAttrs.version}"; + hash = "sha256-bFTblsDtFAakbSJfSfKgvoxd1DTSv++rxU6R3/uWo+4="; + }; + + patches = [ + # Remove syscalls during build to make it reproducible + # We also need to adjust some header paths for darwin + ./remove-hard-encodings.patch + ]; + + buildInputs = + [ + eigen + hidapi + libopus + portaudio + rtaudio + qt6.qtbase + qt6.qtserialport + qt6.qtmultimedia + qt6.qtwebsockets + qt6Packages.qcustomplot + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libpulseaudio + ]; + + nativeBuildInputs = with qt6; [ + wrapQtAppsHook + qmake + ]; + + env.LANG = "C.UTF-8"; + + qmakeFlags = [ "wfview.pro" ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -pv $out/Applications + mv -v "$out/bin/wfview.app" $out/Applications + + # wrap executable to $out/bin + makeWrapper "$out/Applications/wfview.app/Contents/MacOS/wfview" "$out/bin/wfview" + ''; + + meta = { + description = "Open-source software for the control of modern Icom radios"; + homepage = "https://wfview.org/"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + mainProgram = "wfview"; + maintainers = with lib.maintainers; [ Cryolitia ]; + }; +}) diff --git a/pkgs/by-name/wf/wfview/remove-hard-encodings.patch b/pkgs/by-name/wf/wfview/remove-hard-encodings.patch new file mode 100644 index 000000000000..088ab998dfe4 --- /dev/null +++ b/pkgs/by-name/wf/wfview/remove-hard-encodings.patch @@ -0,0 +1,171 @@ +diff --git a/audioconverter.h b/audioconverter.h +index d3cf510..308725d 100644 +--- a/audioconverter.h ++++ b/audioconverter.h +@@ -20,13 +20,8 @@ + #endif + + /* Opus and Eigen */ +-#ifndef Q_OS_LINUX +-#include "opus.h" +-#include +-#else + #include "opus/opus.h" + #include +-#endif + + #include "wfviewtypes.h" + +diff --git a/audiodevices.h b/audiodevices.h +index 3521eb5..0569e49 100644 +--- a/audiodevices.h ++++ b/audiodevices.h +@@ -13,11 +13,7 @@ + #include + + #include +-#ifndef Q_OS_LINUX +-#include "RtAudio.h" +-#else + #include "rtaudio/RtAudio.h" +-#endif + + #include "wfviewtypes.h" + +diff --git a/rthandler.h b/rthandler.h +index b422cc2..02b1117 100644 +--- a/rthandler.h ++++ b/rthandler.h +@@ -6,11 +6,7 @@ + #include + #include + +-#ifndef Q_OS_LINUX +-#include "RtAudio.h" +-#else + #include "rtaudio/RtAudio.h" +-#endif + + + #include +diff --git a/tciserver.h b/tciserver.h +index 9b38886..af56763 100644 +--- a/tciserver.h ++++ b/tciserver.h +@@ -9,13 +9,8 @@ + #include "cachingqueue.h" + + /* Opus and Eigen */ +-#ifndef Q_OS_LINUX +-#include "opus.h" +-#include +-#else + #include "opus/opus.h" + #include +-#endif + + #define TCI_AUDIO_LENGTH 4096 + struct tciCommandStruct +diff --git a/wfmain.h b/wfmain.h +index 0404fda..e400a74 100644 +--- a/wfmain.h ++++ b/wfmain.h +@@ -68,11 +68,7 @@ + #include + + #include +-#ifndef Q_OS_LINUX +-#include "RtAudio.h" +-#else + #include "rtaudio/RtAudio.h" +-#endif + + #ifdef USB_CONTROLLER + #ifdef Q_OS_WIN +diff --git a/wfview.pro b/wfview.pro +index a0943bd..e8f97e1 100644 +--- a/wfview.pro ++++ b/wfview.pro +@@ -62,10 +62,8 @@ win32:DEFINES += __WINDOWS_WASAPI__ + #linux:DEFINES += __LINUX_OSS__ + linux:DEFINES += __LINUX_PULSE__ + macx:DEFINES += __MACOSX_CORE__ +-!linux:SOURCES += ../rtaudio/RTAudio.cpp +-!linux:HEADERS += ../rtaudio/RTAUdio.h +-!linux:INCLUDEPATH += ../rtaudio + ++macx:LIBS += -lrtaudio + linux:LIBS += -lpulse -lpulse-simple -lrtaudio -lpthread -ludev + + win32:INCLUDEPATH += ../portaudio/include +@@ -107,8 +105,6 @@ win32:RC_ICONS = "resources/icons/Windows/wfview 512x512.ico" + + macx{ + ICON = resources/wfview.icns +- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15 +- QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64 + MY_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS + MY_ENTITLEMENTS.value = resources/wfview.entitlements + QMAKE_MAC_XCODE_SETTINGS += MY_ENTITLEMENTS +@@ -120,8 +116,7 @@ macx{ + + QMAKE_TARGET_BUNDLE_PREFIX = org.wfview + +-!win32:DEFINES += HOST=\\\"`hostname`\\\" UNAME=\\\"`whoami`\\\" +-!win32:DEFINES += GITSHORT="\\\"$(shell git -C \"$$PWD\" rev-parse --short HEAD)\\\"" ++!win32:DEFINES += HOST=\\\"nixos\\\" UNAME=\\\"nix\\\" GITSHORT=\\\"0.0\\\" + + win32:DEFINES += GITSHORT=\\\"$$system(git -C $$PWD rev-parse --short HEAD)\\\" + win32:DEFINES += HOST=\\\"$$system(hostname)\\\" +@@ -169,19 +164,8 @@ macx:LIBS += -framework CoreAudio -framework CoreFoundation -lpthread -lopus + + CONFIG(debug, release|debug) { + +- macos:LIBS += -L ../qcustomplot/qcustomplot-sharedlib/build -lqcustomplotd +- +- lessThan(QT_MAJOR_VERSION, 6) { +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libQCustomPlotd.so/ {print \"-lQCustomPlotd\"}'") +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotd2.so/ {print \"-lqcustomplotd2\"}'") +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotd.so/ {print \"-lqcustomplotd\"}'") +- +- } else { +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libQCustomPlotdQt6.so/ {print \"-lQCustomPlotdQt6\"}'") +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotd2qt6.so/ {print \"-lqcustomplotd2qt6\"}'") +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotdqt6.so/ {print \"-lqcustomplotdqt6\"}'") +- } +- ++ macos:LIBS += -lqcustomplotd ++ linux:LIBS += -lqcustomplotd + win32 { + contains(QMAKE_TARGET.arch, x86_64) { + LIBS += -L../opus/win32/VS2015/x64/DebugDLL/ +@@ -211,17 +195,8 @@ CONFIG(debug, release|debug) { + } + } else { + +- macos:LIBS += -L ../qcustomplot/qcustomplot-sharedlib/build -lqcustomplot +- +- lessThan(QT_MAJOR_VERSION, 6) { +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libQCustomPlot.so/ {print \"-lQCustomPlot\"}'") +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplot2.so/ {print \"-lqcustomplot2\"}'") +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplot.so/ {print \"-lqcustomplot\"}'") +- } else { +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libQCustomPlotQt6.so/ {print \"-lQCustomPlotQt6\"}'") +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplot2qt6.so/ {print \"-lqcustomplot2qt6\"}'") +- linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotqt6.so/ {print \"-lqcustomplotqt6\"}'") +- } ++ macos:LIBS += -lqcustomplot ++ linux:LIBS += -lqcustomplot + win32 { + contains(QMAKE_TARGET.arch, x86_64) { + LIBS += -L../opus/win32/VS2015/x64/ReleaseDLL/ +@@ -264,9 +239,6 @@ win32:LIBS += -lopus -lole32 -luser32 + #macx:HEADERS += ../qcustomplot/qcustomplot.h + + win32:INCLUDEPATH += ../qcustomplot +-!linux:INCLUDEPATH += ../opus/include +-!linux:INCLUDEPATH += ../eigen +-!linux:INCLUDEPATH += ../r8brain-free-src + + INCLUDEPATH += resampler + diff --git a/pkgs/by-name/wg/wg-netmanager/package.nix b/pkgs/by-name/wg/wg-netmanager/package.nix new file mode 100644 index 000000000000..bd5f76c3591e --- /dev/null +++ b/pkgs/by-name/wg/wg-netmanager/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "wg-netmanager"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "gin66"; + repo = "wg_netmanager"; + rev = "wg_netmanager-v${version}"; + sha256 = "sha256-Mr4+TW1yOePEHa7puz6mTRJ514LGQeiEwPW3NKupV/M="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-LtZTfmVVUqxc9GAM6mLLmlJXBhLqnfrvBZWh0RWrR/0="; + + # Test 01 tries to create a wireguard interface, which requires sudo. + doCheck = true; + checkFlags = [ + "--skip" + "device" + ]; + + meta = with lib; { + description = "Wireguard network manager"; + longDescription = '' + Wireguard network manager, written in rust, simplifies the setup of wireguard nodes, + identifies short connections between nodes residing in the same subnet, + identifies unreachable aka dead nodes and maintains the routes between all nodes automatically. + To achieve this, wireguard network manager needs to be running on each node. + ''; + homepage = "https://github.com/gin66/wg_netmanager"; + license = with licenses; [ + mit + asl20 + bsd3 + mpl20 + ]; + maintainers = with maintainers; [ gin66 ]; + platforms = platforms.linux; + mainProgram = "wg_netmanager"; + }; +} diff --git a/pkgs/by-name/wg/wgcf/package.nix b/pkgs/by-name/wg/wgcf/package.nix index 812630e6576f..8545eb51c80d 100644 --- a/pkgs/by-name/wg/wgcf/package.nix +++ b/pkgs/by-name/wg/wgcf/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "wgcf"; - version = "2.2.25"; + version = "2.2.26"; src = fetchFromGitHub { owner = "ViRb3"; repo = pname; tag = "v${version}"; - hash = "sha256-XlQ75sjMjwi7gBWHlKyYjfdtBhEw86cSH2bSHVP/qKo="; + hash = "sha256-5bVGW17zNc4sS/vwtXXWP8F4QuM+ldA00GD/z3llpCA="; }; subPackages = "."; - vendorHash = "sha256-lUC6m8nFXYUD1DJ3ODOCJ31ww0sdv2CDm6K/RAJWdWQ="; + vendorHash = "sha256-p58RrROMzkgGPDkxsfJJX3gbuglnArgqNiqXz4Y0yF8="; meta = with lib; { description = "Cross-platform, unofficial CLI for Cloudflare Warp"; diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index 07f3a999ee6c..f0c1c3eef7eb 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -11,7 +11,6 @@ # libraries brotli, bzip2, - darwin, gpgme, libhsts, libidn2, @@ -24,11 +23,12 @@ xz, zlib, zstd, + versionCheckHook, }: stdenv.mkDerivation rec { pname = "wget2"; - version = "2.1.0"; + version = "2.2.0"; outputs = [ "out" @@ -39,14 +39,14 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "gnuwget"; repo = pname; - rev = "v${version}"; - hash = "sha256-+xw1nQMBs0m9RlunyrAYaSDPnLY1yRX8zt8hKOMXQT8="; + tag = "v${version}"; + hash = "sha256-0tOoStZHr5opehFmuQdFRPYvOv8IMrDTBNFtoweY3VM="; }; # wget2_noinstall contains forbidden reference to /build/ postPatch = '' substituteInPlace src/Makefile.am \ - --replace "bin_PROGRAMS = wget2 wget2_noinstall" "bin_PROGRAMS = wget2" + --replace-fail "bin_PROGRAMS = wget2 wget2_noinstall" "bin_PROGRAMS = wget2" ''; strictDeps = true; @@ -75,9 +75,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals sslSupport [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices ]; # TODO: include translation files @@ -97,6 +94,13 @@ stdenv.mkDerivation rec { (lib.withFeatureAs sslSupport "ssl" "openssl") ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = "--version"; + meta = with lib; { description = "Successor of GNU Wget, a file and recursive website downloader"; longDescription = '' diff --git a/pkgs/by-name/wg/wgo/package.nix b/pkgs/by-name/wg/wgo/package.nix index 491a74627125..e4609ce7351c 100644 --- a/pkgs/by-name/wg/wgo/package.nix +++ b/pkgs/by-name/wg/wgo/package.nix @@ -6,7 +6,7 @@ let pname = "wgo"; - version = "0.5.11"; + version = "0.5.13"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "bokwoon95"; repo = "wgo"; rev = "v${version}"; - hash = "sha256-iTUZTeruP21pfd/28fdIhhS5GiSn6DC9Oe2w6VTaxFE="; + hash = "sha256-CAHaIq4gxl5o3PMdnyQXKKCJGuHpoBuXv2/bETm1LZs="; }; vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU="; diff --git a/pkgs/by-name/wg/wgpu-utils/package.nix b/pkgs/by-name/wg/wgpu-utils/package.nix index 05adb6c51a5b..0a1141b6319c 100644 --- a/pkgs/by-name/wg/wgpu-utils/package.nix +++ b/pkgs/by-name/wg/wgpu-utils/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -9,7 +8,6 @@ vulkan-loader, freetype, fontconfig, - darwin, }: rustPlatform.buildRustPackage rec { @@ -32,19 +30,10 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = - [ - freetype - fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - QuartzCore - AppKit - ] - ); + buildInputs = [ + freetype + fontconfig + ]; # Tests fail, as the Nix sandbox doesn't provide an appropriate adapter (e.g. Vulkan). doCheck = false; diff --git a/pkgs/by-name/wg/wgsl-analyzer/package.nix b/pkgs/by-name/wg/wgsl-analyzer/package.nix index 9829631855d3..60d047ee4d31 100644 --- a/pkgs/by-name/wg/wgsl-analyzer/package.nix +++ b/pkgs/by-name/wg/wgsl-analyzer/package.nix @@ -2,21 +2,22 @@ lib, fetchFromGitHub, rustPlatform, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wgsl-analyzer"; - version = "0.9.8"; + version = "2025-04-04"; src = fetchFromGitHub { owner = "wgsl-analyzer"; repo = "wgsl-analyzer"; - tag = "v${version}"; - hash = "sha256-UizD6cTRs6M5GaOX3wvacMr5JWwyHrQS6L19fRnw6Xo="; + tag = finalAttrs.version; + hash = "sha256-t+Gpm+p2EaobuzUppkhCsaj3q/v+YjMSlau4GVoLgJo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-W1WQ00SFpYOm4J1C65Jg1Yb3pujdcDQFdrpIgqKRLk4="; + cargoHash = "sha256-QjR0O/GFOsYi0+r3rYBdR9rw/4Qa5pNjWSbn6CsshqU="; checkFlags = [ # Imports failures @@ -26,10 +27,12 @@ rustPlatform.buildRustPackage rec { "--skip=tests::struct_recover_3" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Language server implementation for the WGSL shading language"; homepage = "https://github.com/wgsl-analyzer/wgsl-analyzer"; - changelog = "https://github.com/wgsl-analyzer/wgsl-analyzer/releases/tag/v${version}"; + changelog = "https://github.com/wgsl-analyzer/wgsl-analyzer/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ asl20 mit @@ -37,4 +40,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ genga898 ]; mainProgram = "wgsl-analyzer"; }; -} +}) diff --git a/pkgs/by-name/wh/whatfiles/package.nix b/pkgs/by-name/wh/whatfiles/package.nix index ff4b74ad4835..2c6a81d505ea 100644 --- a/pkgs/by-name/wh/whatfiles/package.nix +++ b/pkgs/by-name/wh/whatfiles/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Log what files are accessed by any Linux process"; homepage = "https://github.com/spieglt/whatfiles"; license = licenses.gpl3Only; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "whatfiles"; }; diff --git a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix index 38ea43b16e06..d83050188c99 100644 --- a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix +++ b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "whatsapp-emoji-linux"; - version = "2.24.8.85-1"; + version = "2.25.9.78-1"; src = fetchFromGitHub { tag = version; owner = "dmlls"; repo = "whatsapp-emoji-linux"; - hash = "sha256-6bei+kR+5UF4GQ140sUXy8TDXZKNFmM+XgvMKf+8s2Y="; + hash = "sha256-QopJUT6HAgvrRNQw6adHNOSZUoJO1qiFATXsDQOUf7w="; }; makeFlags = [ diff --git a/pkgs/by-name/wh/whipper/package.nix b/pkgs/by-name/wh/whipper/package.nix index 1d9019d97773..441cee30fe16 100644 --- a/pkgs/by-name/wh/whipper/package.nix +++ b/pkgs/by-name/wh/whipper/package.nix @@ -123,5 +123,6 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ emily ]; license = licenses.gpl3Plus; platforms = platforms.unix; + mainProgram = "whipper"; }; } diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix index 46f5c7f8f9f4..157ae52dede6 100644 --- a/pkgs/by-name/wh/whisparr/package.nix +++ b/pkgs/by-name/wh/whisparr/package.nix @@ -29,16 +29,16 @@ let ."${system}" or (throw "Unsupported system: ${system}"); hash = { - arm64-linux-hash = "sha256-GQSDButJqPmWbxhDIYqIZxhL2Bn4IpFP8Vinv6OsI9Q="; - arm64-osx-hash = "sha256-6e2Pqb/V02I+9ZTxR2er+zMLEBE4ZnJcwkVEgqO04eU="; - x64-linux-hash = "sha256-KZ24XPz1WwL4dK1wFT7x6jH2WU3NgFYLiSx2QfmstkA="; - x64-osx-hash = "sha256-p749/sc7aAzuvwwlCOx+pNh4J7DIJIZlvsFRa/mIlMk="; + arm64-linux-hash = "sha256-sMhZ2QPIkuomUdgKYMoPwyQH5k0ziqdJSoCvV51tVNQ="; + arm64-osx-hash = "sha256-uubRkA6ER/kQeUXys9Jcf4Aii7FFkrKPgh/niK/3jO0="; + x64-linux-hash = "sha256-S2Ow+5AdvFZ10lA0xnvT5egdi1QbFTy97XzvSI5FtRk="; + x64-osx-hash = "sha256-7PvYkhJ9Tlulk0t/s8qAJUAHguUeilAQsQ0qU+DBVQM="; } ."${arch}-${os}-hash"; in stdenv.mkDerivation rec { pname = "whisparr"; - version = "2.0.0.891"; + version = "2.0.0.987"; src = fetchurl { name = "${pname}-${arch}-${os}-${version}.tar.gz"; diff --git a/pkgs/by-name/wh/whisper-cpp/download-models.patch b/pkgs/by-name/wh/whisper-cpp/download-models.patch index 7589c2ef36f8..2633be324ed6 100644 --- a/pkgs/by-name/wh/whisper-cpp/download-models.patch +++ b/pkgs/by-name/wh/whisper-cpp/download-models.patch @@ -1,8 +1,8 @@ diff --git a/models/download-ggml-model.sh b/models/download-ggml-model.sh -index 1f1075b..7476c8e 100755 +index ef9c90da..a7e2a17c 100755 --- a/models/download-ggml-model.sh +++ b/models/download-ggml-model.sh -@@ -12,18 +12,6 @@ pfx="resolve/main/ggml" +@@ -12,15 +12,6 @@ pfx="resolve/main/ggml" BOLD="\033[1m" RESET='\033[0m' @@ -15,39 +15,43 @@ index 1f1075b..7476c8e 100755 - echo "$_ret" - fi -} -- --models_path="${2:-$(get_script_path)}" -- + + script_path="$(get_script_path)" + +@@ -30,7 +21,6 @@ case "$script_path" in + *) default_download_path="$script_path" ;; # Otherwise, use script directory + esac + +-models_path="${2:-$default_download_path}" + # Whisper models models="tiny - tiny.en -@@ -64,8 +52,8 @@ list_models() { +@@ -80,8 +70,8 @@ list_models() { printf "\n\n" } -if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then - printf "Usage: %s [models_path]\n" "$0" -+if [ "$#" -ne 1 ]; then ++if [ "$#" -lt 1 ]; then + printf "Usage: %s \n" "$0" list_models printf "___________________________________________________________\n" printf "${BOLD}.en${RESET} = english-only ${BOLD}-q5_[01]${RESET} = quantized ${BOLD}-tdrz${RESET} = tinydiarize\n" -@@ -94,8 +82,6 @@ echo "$model" | grep -q '^"tdrz"*$' +@@ -110,7 +100,6 @@ echo "$model" | grep -q '^"tdrz"*$' printf "Downloading ggml model %s from '%s' ...\n" "$model" "$src" -cd "$models_path" || exit -- + if [ -f "ggml-$model.bin" ]; then printf "Model %s already exists. Skipping download.\n" "$model" - exit 0 -@@ -116,7 +102,7 @@ if [ $? -ne 0 ]; then - exit 1 +@@ -143,7 +132,7 @@ else + whisper_cmd="./build/bin/whisper-cli" fi -printf "Done! Model '%s' saved in '%s/ggml-%s.bin'\n" "$model" "$models_path" "$model" +printf "Done! Model '%s' saved in 'ggml-%s.bin'\n" "$model" "$model" printf "You can now use it like this:\n\n" --printf " $ ./main -m %s/ggml-%s.bin -f samples/jfk.wav\n" "$models_path" "$model" -+printf " $ whisper-cpp -m ggml-%s.bin -f samples/jfk.wav\n" "$model" +-printf " $ %s -m %s/ggml-%s.bin -f samples/jfk.wav\n" "$whisper_cmd" "$models_path" "$model" ++printf " $ %s -m /ggml-%s.bin -f samples/jfk.wav\n" "$whisper_cmd" "$model" printf "\n" diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix index e8ddeb672a19..55c0d357e5d8 100644 --- a/pkgs/by-name/wh/whisper-cpp/package.nix +++ b/pkgs/by-name/wh/whisper-cpp/package.nix @@ -2,6 +2,7 @@ lib, stdenv, cmake, + git, apple-sdk_11, ninja, fetchFromGitHub, @@ -43,8 +44,6 @@ let cmakeFeature optional optionals - optionalString - forEach ; darwinBuildInputs = [ apple-sdk_11 ]; @@ -73,13 +72,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "whisper-cpp"; - version = "1.7.2"; + version = "1.7.5"; src = fetchFromGitHub { - owner = "ggerganov"; + owner = "ggml-org"; repo = "whisper.cpp"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-y30ZccpF3SCdRGa+P3ddF1tT1KnvlI4Fexx81wZxfTk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tvCT0QRdmRGsjtQZcEZMgSe2/47tSkfdaPqS/2MuQTs="; }; # The upstream download script tries to download the models to the @@ -89,7 +88,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { patches = [ ./download-models.patch ]; postPatch = '' - for target in examples/{bench,command,main,quantize,server,stream,talk}/CMakeLists.txt; do + for target in examples/{bench,command,cli,quantize,server,stream,talk-llama}/CMakeLists.txt; do if ! grep -q -F 'install('; then echo 'install(TARGETS ''${TARGET} RUNTIME)' >> $target fi @@ -99,6 +98,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + git ninja which makeWrapper @@ -154,17 +154,11 @@ effectiveStdenv.mkDerivation (finalAttrs: { postInstall = '' # Add "whisper-cpp" prefix before every command - mv -v $out/bin/{main,whisper-cpp} + mv -v "$out/bin/"{quantize,whisper-quantize} - for file in $out/bin/*; do - if [[ -x "$file" && -f "$file" && "$(basename $file)" != "whisper-cpp" ]]; then - mv -v "$file" "$out/bin/whisper-cpp-$(basename $file)" - fi - done + install -v -D -m755 "$src/models/download-ggml-model.sh" "$out/bin/whisper-cpp-download-ggml-model" - install -v -D -m755 $src/models/download-ggml-model.sh $out/bin/whisper-cpp-download-ggml-model - - wrapProgram $out/bin/whisper-cpp-download-ggml-model \ + wrapProgram "$out/bin/whisper-cpp-download-ggml-model" \ --prefix PATH : ${lib.makeBinPath [ wget ]} ''; @@ -174,7 +168,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { installCheckPhase = '' runHook preInstallCheck - $out/bin/whisper-cpp --help >/dev/null + "$out/bin/whisper-cli" --help >/dev/null runHook postInstallCheck ''; @@ -186,7 +180,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/ggerganov/whisper.cpp"; license = lib.licenses.mit; - mainProgram = "whisper-cpp"; + mainProgram = "whisper-cli"; platforms = lib.platforms.all; broken = coreMLSupport; badPlatforms = optionals cudaSupport lib.platforms.darwin; diff --git a/pkgs/by-name/wh/whisperx/package.nix b/pkgs/by-name/wh/whisperx/package.nix new file mode 100644 index 000000000000..c5b60fb97af6 --- /dev/null +++ b/pkgs/by-name/wh/whisperx/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication whisperx diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index b2c9f09a3b2f..a2d0af536486 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.94"; + version = "2.9.98"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-hSpXCF+SS2kVYB/lPQSs8dZPp6yKlQEjAl1tjzcNu3g="; + hash = "sha256-G19vNz9tn21HETkExiYR77CjwMkBdvRPWLPwc422M7E="; }; - npmDepsHash = "sha256-23CIMNXsbDOkrSDszZOueNUSu5dywRDs6WRAeQJVL1o="; + npmDepsHash = "sha256-c5WNiUza6r++j+JhCkTOfGE/cUAYpYVDVsJhPu1Jpy8="; dontNpmBuild = true; diff --git a/pkgs/by-name/wh/whitebox-tools/package.nix b/pkgs/by-name/wh/whitebox-tools/package.nix new file mode 100644 index 000000000000..b8b432ef0b40 --- /dev/null +++ b/pkgs/by-name/wh/whitebox-tools/package.nix @@ -0,0 +1,51 @@ +{ + lib, + cmake, + rustPlatform, + pkg-config, + fetchFromGitHub, + atk, + gtk3, + glib, + openssl, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "whitebox_tools"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "jblindsay"; + repo = "whitebox-tools"; + rev = "v${version}"; + hash = "sha256-kvtfEEydwonoDux1VbAxqrF/Hf8Qh8mhprYnROGOC6g="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-yQFGuhEGgkaa5N4uUIZ/0GFzP9CsPtiFet0hUppIQzQ="; + + buildInputs = [ + atk + glib + gtk3 + openssl + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html"; + description = "Advanced geospatial data analysis platform"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mpickering ]; + teams = [ lib.teams.geospatial ]; + }; +} diff --git a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix index a79e58a143c5..0fdb72fd553e 100644 --- a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix +++ b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix @@ -94,13 +94,13 @@ lib.checkListOfEnum "${pname}: window control buttons variants" [ "normal" "alt" stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2024-11-18"; + version = "2025-04-03"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-SSGb7EdJN8E4N8b98VO7oFTeOmhKEo/0qhso9410ihg="; + hash = "sha256-XSghDBpxAjdQMB9tyV2NIM6j/AzmzsnybGGDYi7u3BQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wh/whoami/package.nix b/pkgs/by-name/wh/whoami/package.nix index 61cb8708fdcf..d3a7006aceaa 100644 --- a/pkgs/by-name/wh/whoami/package.nix +++ b/pkgs/by-name/wh/whoami/package.nix @@ -2,16 +2,18 @@ lib, buildGoModule, fetchFromGitHub, + nixosTests, + nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "whoami"; version = "1.11.0"; src = fetchFromGitHub { owner = "traefik"; repo = "whoami"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3jzLdCmmts/7S1Oxig9Dg3kRGh/H5l5UD7ztev0yvXY="; }; @@ -21,14 +23,29 @@ buildGoModule rec { env.CGO_ENABLED = 0; - doCheck = false; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/whoami --help 2> /dev/null + + runHook postInstallCheck + ''; + + passthru = { + tests = { inherit (nixosTests) whoami; }; + updateScript = nix-update-script { }; + }; meta = { description = "Tiny Go server that prints os information and HTTP request to output"; mainProgram = "whoami"; homepage = "https://github.com/traefik/whoami"; - changelog = "https://github.com/traefik/whoami/releases/tag/v${version}"; + changelog = "https://github.com/traefik/whoami/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dvcorreia ]; + maintainers = with lib.maintainers; [ + dvcorreia + defelo + ]; }; -} +}) diff --git a/pkgs/by-name/wh/whois/package.nix b/pkgs/by-name/wh/whois/package.nix index 7b12b26ecf9e..249f3bea1b63 100644 --- a/pkgs/by-name/wh/whois/package.nix +++ b/pkgs/by-name/wh/whois/package.nix @@ -11,14 +11,14 @@ }: stdenv.mkDerivation rec { - version = "5.5.23"; + version = "5.6.0"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - hash = "sha256-c/Mx2HXAj6mHH8rElG7+F94sSrVSL1N9HZBvaMWUjlw="; + hash = "sha256-NzOJMciqSY8ivvj6fBV1+w009F1zf47U1FQACSfsbUM="; }; patches = [ diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix index 917c1f2d4370..e91f348c20f9 100644 --- a/pkgs/by-name/wi/widelands/package.nix +++ b/pkgs/by-name/wi/widelands/package.nix @@ -25,7 +25,6 @@ libSM, libICE, libXext, - darwin, }: stdenv.mkDerivation rec { @@ -62,32 +61,24 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = - [ - SDL2 - SDL2_image - SDL2_mixer - SDL2_net - SDL2_ttf - curl - glew - icu - libpng - lua - python3 - zlib - minizip - asio - libSM # XXX: these should be propagated by SDL2? - libICE - ] - ++ lib.optional stdenv.hostPlatform.isLinux libXext - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - ] - ); + buildInputs = [ + SDL2 + SDL2_image + SDL2_mixer + SDL2_net + SDL2_ttf + curl + glew + icu + libpng + lua + python3 + zlib + minizip + asio + libSM # XXX: these should be propagated by SDL2? + libICE + ] ++ lib.optional stdenv.hostPlatform.isLinux libXext; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix b/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix index 07432c73527f..00c1b625c32d 100644 --- a/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix +++ b/pkgs/by-name/wi/widevine-cdm/x86_64-linux.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "widevine-cdm"; - version = "4.10.2830.0"; + version = "4.10.2891.0"; src = fetchzip { url = "https://dl.google.com/widevine-cdm/${finalAttrs.version}-linux-x64.zip"; - hash = "sha256-XDnsan1ulnIK87Owedb2s9XWLzk1K2viGGQe9LN/kcE="; + hash = "sha256-ZO6FmqJUnB9VEJ7caJt58ym8eB3/fDATri3iOWCULRI="; stripRoot = false; }; diff --git a/pkgs/by-name/wi/wifi-qr/package.nix b/pkgs/by-name/wi/wifi-qr/package.nix index acae6659f6af..8871d0113e74 100644 --- a/pkgs/by-name/wi/wifi-qr/package.nix +++ b/pkgs/by-name/wi/wifi-qr/package.nix @@ -12,6 +12,10 @@ stdenvNoCC, xdg-utils, zbar, + coreutils, + gnused, + gnugrep, + file, }: stdenvNoCC.mkDerivation (finalAttr: { pname = "wifi-qr"; @@ -37,6 +41,12 @@ stdenvNoCC.mkDerivation (finalAttr: { qrencode xdg-utils zbar + # needed for cross + # TODO: somehow splice the packages in stdenvNoCC.initialPath and use that + coreutils + gnugrep + gnused + file ]; nativeBuildInputs = [ @@ -74,7 +84,7 @@ stdenvNoCC.mkDerivation (finalAttr: { runHook preFixup patchShebangs $out/bin/wifi-qr - patsh -f $out/bin/wifi-qr -s ${builtins.storeDir} + patsh -f $out/bin/wifi-qr -s ${builtins.storeDir} --path "$HOST_PATH" runHook postFixup ''; diff --git a/pkgs/by-name/wi/wiiuse/package.nix b/pkgs/by-name/wi/wiiuse/package.nix new file mode 100644 index 000000000000..bdc91158d28e --- /dev/null +++ b/pkgs/by-name/wi/wiiuse/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + bluez, +}: +stdenv.mkDerivation rec { + + pname = "WiiUse"; + version = "0.15.6"; + + src = fetchFromGitHub { + owner = "wiiuse"; + repo = "wiiuse"; + rev = version; + sha256 = "sha256-l2CS//7rx5J3kI32yTSp0BDtP0T5+riLowtnxnfAotc="; + }; + + outputs = [ + "out" + "dev" + "doc" + "lib" + ]; + + patches = [ + # Fix `.pc` files's double prefixes: + # https://github.com/wiiuse/wiiuse/pull/153 + (fetchpatch { + name = "pc-prefix.patch"; + url = "https://github.com/wiiuse/wiiuse/commit/9c774ec0b71fa5119eabed823c35e4c745f3277c.patch"; + hash = "sha256-WEHumCiNzsWfyMl7qu9xrlsNhgNcawdi+EFXf5w8jiE="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; + + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; + + cmakeFlags = [ + "-DBUILD_EXAMPLE_SDL=OFF" + ] ++ [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) ]; + + meta = with lib; { + description = "Feature complete cross-platform Wii Remote access library"; + mainProgram = "wiiuseexample"; + license = licenses.gpl3Plus; + homepage = "https://github.com/wiiuse/wiiuse"; + maintainers = with maintainers; [ shamilton ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/by-name/wi/wike/package.nix b/pkgs/by-name/wi/wike/package.nix index 90cfb897ffbf..130c0bd46ebb 100644 --- a/pkgs/by-name/wi/wike/package.nix +++ b/pkgs/by-name/wi/wike/package.nix @@ -73,7 +73,8 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/hugolabe/Wike"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ samalws ] ++ lib.teams.gnome-circle.members; + maintainers = with maintainers; [ samalws ]; + teams = [ teams.gnome-circle ]; mainProgram = "wike"; }; } diff --git a/pkgs/by-name/wi/wiki-tui/package.nix b/pkgs/by-name/wi/wiki-tui/package.nix new file mode 100644 index 000000000000..7257c65b558e --- /dev/null +++ b/pkgs/by-name/wi/wiki-tui/package.nix @@ -0,0 +1,42 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + ncurses, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "wiki-tui"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "Builditluc"; + repo = "wiki-tui"; + tag = "v${version}"; + hash = "sha256-eTDxRrTP9vX7F1lmDCuF6g1pfaZChqB8Pv1kfrd7I9w="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + ncurses + openssl + ]; + useFetchCargoVendor = true; + cargoHash = "sha256-Pe6mNbn4GFjhpFZeWMlaRt7Bj5BLiIy789hXWkII2ps="; + + meta = with lib; { + description = "Simple and easy to use Wikipedia Text User Interface"; + homepage = "https://github.com/builditluc/wiki-tui"; + changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ + lom + builditluc + matthiasbeyer + ]; + mainProgram = "wiki-tui"; + }; +} diff --git a/pkgs/by-name/wi/wikiman/fix-paths.patch b/pkgs/by-name/wi/wikiman/fix-paths.patch index d5923accce7d..d4e291d2b9a3 100644 --- a/pkgs/by-name/wi/wikiman/fix-paths.patch +++ b/pkgs/by-name/wi/wikiman/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/wikiman.sh b/wikiman.sh -index 89a436e..adc6510 100755 +index 994c0b7..49bfc4b 100755 --- a/wikiman.sh +++ b/wikiman.sh -@@ -46,38 +46,7 @@ if printenv WIKIMAN_TUI_PREVIEW >/dev/null; then +@@ -50,38 +50,7 @@ if printenv WIKIMAN_TUI_PREVIEW >/dev/null; then fi init() { @@ -22,23 +22,23 @@ index 89a436e..adc6510 100755 - *) - case "$(dirname "$(command -v wikiman)")" in - "$HOME/bin"|"$HOME/.local/bin") -- echo 'warning: unsupported installation path, using fallback for user install' 1>&2; +- >&2 echo 'warning: unsupported installation path, using fallback for user install' ; - conf_sys_usr="$HOME/.local/share"; - conf_sys_etc="${XDG_CONFIG_HOME:-"$HOME/.config"}/wikiman";; - '/bin'|'/sbin'|'/usr/bin'|'/usr/sbin') -- echo 'warning: unsupported installation path, using fallback for Linux' 1>&2; +- >&2 echo 'warning: unsupported installation path, using fallback for Linux' ; - conf_sys_usr='/usr'; - conf_sys_etc='/etc';; - '/usr/local/bin'|'/usr/local/sbin') -- echo 'warning: unsupported installation path, using fallback for BSD' 1>&2; +- >&2 echo 'warning: unsupported installation path, using fallback for BSD' ; - conf_sys_usr='/usr/local'; - conf_sys_etc='/usr/local/etc';; - *) -- echo 'error: unsupported installation path - failed to establish fallback' 1>&2; +- >&2 echo 'error: unsupported installation path - failed to establish fallback' ; - exit 5;; - esac;; - esac -+ conf_sys_etc="/etc/xdg/wikiman/wikiman.conf" ++ conf_sys_etc="/etc" export conf_sys_usr export conf_sys_etc diff --git a/pkgs/by-name/wi/wikiman/package.nix b/pkgs/by-name/wi/wikiman/package.nix index 4d93ca8ee1c0..2c4a8daeea9b 100644 --- a/pkgs/by-name/wi/wikiman/package.nix +++ b/pkgs/by-name/wi/wikiman/package.nix @@ -15,13 +15,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "wikiman"; - version = "2.13.2"; + version = "2.14.1"; src = fetchFromGitHub { owner = "filiparag"; repo = "wikiman"; tag = finalAttrs.version; - hash = "sha256-gk/9PVIRw9OQrdCSS+LcniXDYNcHUQUxZ2XGQCwpHaI="; + hash = "sha256-EvYMUHKFJhSFyoW85EEzI7q5OMGGe9c+A2JlkAoxt3o="; }; patches = [ ./fix-paths.patch ]; diff --git a/pkgs/by-name/wi/wildmidi/package.nix b/pkgs/by-name/wi/wildmidi/package.nix new file mode 100644 index 000000000000..4f5c7f90bcf4 --- /dev/null +++ b/pkgs/by-name/wi/wildmidi/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + writeTextFile, + cmake, + alsa-lib, + freepats, +}: + +let + defaultCfgPath = "${placeholder "out"}/etc/wildmidi/wildmidi.cfg"; +in +stdenv.mkDerivation rec { + pname = "wildmidi"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "Mindwerks"; + repo = "wildmidi"; + rev = "${pname}-${version}"; + sha256 = "sha256-syjs8y75M2ul7whiZxnWMSskRJd0ixFqnep7qsTbiDE="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = lib.optionals stdenv.buildPlatform.isLinux [ + alsa-lib + stdenv.cc.libc # couldn't find libm + ]; + + preConfigure = '' + # https://github.com/Mindwerks/wildmidi/issues/236 + substituteInPlace src/wildmidi.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + + cmakeFlags = [ + "-DWILDMIDI_CFG=${defaultCfgPath}" + ]; + + postInstall = + let + defaultCfg = writeTextFile { + name = "wildmidi.cfg"; + text = '' + dir ${freepats} + source ${freepats}/freepats.cfg + ''; + }; + in + '' + mkdir -p "$(dirname ${defaultCfgPath})" + ln -s ${defaultCfg} ${defaultCfgPath} + ''; + + meta = with lib; { + description = "Software MIDI player and library"; + mainProgram = "wildmidi"; + longDescription = '' + WildMIDI is a simple software midi player which has a core softsynth + library that can be use with other applications. + ''; + homepage = "https://wildmidi.sourceforge.net/"; + # The library is LGPLv3, the wildmidi executable is GPLv3 + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/by-name/wi/wimboot/package.nix b/pkgs/by-name/wi/wimboot/package.nix index 1dc0a55cbdfb..0ec82daf6354 100644 --- a/pkgs/by-name/wi/wimboot/package.nix +++ b/pkgs/by-name/wi/wimboot/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://ipxe.org/wimboot"; description = "Windows Imaging Format bootloader"; license = licenses.gpl2Plus; - maintainers = teams.helsinki-systems.members; + teams = [ teams.helsinki-systems ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/wi/winbox4/build-from-dmg.nix b/pkgs/by-name/wi/winbox4/build-from-dmg.nix new file mode 100644 index 000000000000..cccdbacca1b2 --- /dev/null +++ b/pkgs/by-name/wi/winbox4/build-from-dmg.nix @@ -0,0 +1,37 @@ +{ + pname, + version, + hash, + fetchurl, + stdenvNoCC, + undmg, + metaCommon ? { }, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + inherit pname version; + + src = fetchurl { + name = "WinBox-${finalAttrs.version}.dmg"; + url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/WinBox.dmg"; + inherit hash; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,Applications} + cp -R "WinBox.app" "$out/Applications/WinBox.app" + ln -s "$out/Applications/WinBox.app/Contents/MacOS/WinBox" "$out/bin/WinBox" + + runHook postInstall + ''; + + meta = metaCommon // { + platforms = [ "aarch64-darwin" ]; + }; +}) diff --git a/pkgs/by-name/wi/winbox4/build-from-zip.nix b/pkgs/by-name/wi/winbox4/build-from-zip.nix new file mode 100644 index 000000000000..2511666ef38f --- /dev/null +++ b/pkgs/by-name/wi/winbox4/build-from-zip.nix @@ -0,0 +1,119 @@ +{ + pname, + version, + hash, + autoPatchelfHook, + copyDesktopItems, + fetchurl, + fontconfig, + freetype, + lib, + libGL, + libxkbcommon, + makeDesktopItem, + makeWrapper, + stdenvNoCC, + unzip, + writeShellApplication, + xorg, + zlib, + metaCommon ? { }, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + inherit pname version; + + src = fetchurl { + name = "WinBox_Linux-${finalAttrs.version}.zip"; + url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/WinBox_Linux.zip"; + inherit hash; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + # makeBinaryWrapper does not support --run + makeWrapper + unzip + ]; + + buildInputs = [ + fontconfig + freetype + libGL + libxkbcommon + xorg.libxcb + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + zlib + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 "assets/img/winbox.png" "$out/share/pixmaps/winbox.png" + install -Dm755 "WinBox" "$out/bin/WinBox" + + wrapProgram "$out/bin/WinBox" --run "${lib.getExe finalAttrs.migrationScript}" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "winbox"; + desktopName = "WinBox"; + comment = "GUI administration for Mikrotik RouterOS"; + exec = "WinBox"; + icon = "winbox"; + categories = [ "Utility" ]; + }) + ]; + + migrationScript = writeShellApplication { + name = "winbox-migrate"; + text = '' + XDG_DATA_HOME=''${XDG_DATA_HOME:-$HOME/.local/share} + targetFile="$XDG_DATA_HOME/MikroTik/WinBox/Addresses.cdb" + + if [ -f "$targetFile" ]; then + echo "NixOS: WinBox 4 data already present at $(dirname "$targetFile"). Skipping automatic migration." + exit 0 + fi + + # cover both wine prefix variants + # latter was used until https://github.com/NixOS/nixpkgs/pull/329626 was merged on 2024/07/24 + winePrefixes=( + "''${WINEPREFIX:-$HOME/.wine}" + "''${WINBOX_HOME:-$XDG_DATA_HOME/winbox}/wine" + ) + sourceFilePathSuffix="drive_c/users/$USER/AppData/Roaming/Mikrotik/Winbox/Addresses.cdb" + selectedSourceFile="" + + for prefix in "''${winePrefixes[@]}" + do + echo "NixOS: Probing WinBox 3 data path at $prefix..." + if [ -f "$prefix/$sourceFilePathSuffix" ]; then + selectedSourceFile="$prefix/$sourceFilePathSuffix" + break + fi + done + + if [ -z "$selectedSourceFile" ]; then + echo "NixOS: WinBox 3 data not found. Skipping automatic migration." + exit 0 + fi + + echo "NixOS: Automatically migrating WinBox 3 data..." + install -Dvm644 "$selectedSourceFile" "$targetFile" + ''; + }; + + meta = metaCommon // { + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix index 8c2a74aa6af7..e8208d4b3d8d 100644 --- a/pkgs/by-name/wi/winbox4/package.nix +++ b/pkgs/by-name/wi/winbox4/package.nix @@ -1,123 +1,18 @@ { - autoPatchelfHook, - copyDesktopItems, - fetchurl, - fontconfig, - freetype, lib, - libGL, - libxkbcommon, - makeDesktopItem, - makeWrapper, + callPackage, stdenvNoCC, - unzip, - writeShellApplication, - xorg, - zlib, }: - -stdenvNoCC.mkDerivation (finalAttrs: { +let pname = "winbox"; - version = "4.0beta16"; + version = "4.0beta20"; - src = fetchurl { - name = "WinBox_Linux-${finalAttrs.version}.zip"; - url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/WinBox_Linux.zip"; - hash = "sha256-RZpsKew3BaId6+tcwUV6fniUpCH4wIP9ab6P5oE7OAk="; - }; - - sourceRoot = "."; - - nativeBuildInputs = [ - autoPatchelfHook - copyDesktopItems - # makeBinaryWrapper does not support --run - makeWrapper - unzip - ]; - - buildInputs = [ - fontconfig - freetype - libGL - libxkbcommon - xorg.libxcb - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - zlib - ]; - - installPhase = '' - runHook preInstall - - install -Dm644 "assets/img/winbox.png" "$out/share/pixmaps/winbox.png" - install -Dm755 "WinBox" "$out/bin/WinBox" - - wrapProgram "$out/bin/WinBox" --run "${lib.getExe finalAttrs.migrationScript}" - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "winbox"; - desktopName = "Winbox"; - comment = "GUI administration for Mikrotik RouterOS"; - exec = "WinBox"; - icon = "winbox"; - categories = [ "Utility" ]; - }) - ]; - - migrationScript = writeShellApplication { - name = "winbox-migrate"; - text = '' - XDG_DATA_HOME=''${XDG_DATA_HOME:-$HOME/.local/share} - targetFile="$XDG_DATA_HOME/MikroTik/WinBox/Addresses.cdb" - - if [ -f "$targetFile" ]; then - echo "NixOS: WinBox 4 data already present at $(dirname "$targetFile"). Skipping automatic migration." - exit 0 - fi - - # cover both wine prefix variants - # latter was used until https://github.com/NixOS/nixpkgs/pull/329626 was merged on 2024/07/24 - winePrefixes=( - "''${WINEPREFIX:-$HOME/.wine}" - "''${WINBOX_HOME:-$XDG_DATA_HOME/winbox}/wine" - ) - sourceFilePathSuffix="drive_c/users/$USER/AppData/Roaming/Mikrotik/Winbox/Addresses.cdb" - selectedSourceFile="" - - for prefix in "''${winePrefixes[@]}" - do - echo "NixOS: Probing WinBox 3 data path at $prefix..." - if [ -f "$prefix/$sourceFilePathSuffix" ]; then - selectedSourceFile="$prefix/$sourceFilePathSuffix" - break - fi - done - - if [ -z "$selectedSourceFile" ]; then - echo "NixOS: WinBox 3 data not found. Skipping automatic migration." - exit 0 - fi - - echo "NixOS: Automatically migrating WinBox 3 data..." - install -Dvm644 "$selectedSourceFile" "$targetFile" - ''; - }; - - meta = { + metaCommon = { description = "Graphical configuration utility for RouterOS-based devices"; homepage = "https://mikrotik.com"; downloadPage = "https://mikrotik.com/download"; - changelog = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/CHANGELOG"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - platforms = [ "x86_64-linux" ]; mainProgram = "WinBox"; maintainers = with lib.maintainers; [ Scrumplex @@ -125,4 +20,22 @@ stdenvNoCC.mkDerivation (finalAttrs: { savalet ]; }; + x86_64-zip = callPackage ./build-from-zip.nix { + inherit pname version metaCommon; + + hash = "sha256-mU+z7yRYKXnGAXHB5LS5SVUgIzRlR9nV2FzXispntF0="; + }; + + x86_64-dmg = callPackage ./build-from-dmg.nix { + inherit pname version metaCommon; + + hash = "sha256-tLsreK6YsqsbMaY4dil34eiHxAG7GrZYyll6BX9dsx8="; + }; +in +(if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { + platforms = x86_64-zip.meta.platforms ++ x86_64-dmg.meta.platforms; + mainProgram = "WinBox"; + changelog = "https://download.mikrotik.com/routeros/winbox/${oldAttrs.version}/CHANGELOG"; + }; }) diff --git a/pkgs/by-name/wi/windsend-rs/package.nix b/pkgs/by-name/wi/windsend-rs/package.nix index 3b2f90726473..74211afd0413 100644 --- a/pkgs/by-name/wi/windsend-rs/package.nix +++ b/pkgs/by-name/wi/windsend-rs/package.nix @@ -16,18 +16,18 @@ rustPlatform.buildRustPackage rec { pname = "windsend-rs"; - version = "1.4.9"; + version = "1.5.4"; src = fetchFromGitHub { owner = "doraemonkeys"; repo = "WindSend"; tag = "v${version}"; - hash = "sha256-jmFhYCUE37yH+TTHq8Q0bO1Lp/p07PnSJDMAOGbhwOM="; + hash = "sha256-A0cmjllyhKkYsMyjeuuMCax0uVnaDp9OwJPY7peDjPM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RmtKspTNTd3ZaucuzJk6yfDFRH7wZsOlEyJd2lNApBU="; + cargoHash = "sha256-9zuD3korJGIcarBV0bSSV/g/Q0niWAMqgRfwpPXCuBU="; sourceRoot = "${src.name}/windSend-rs"; diff --git a/pkgs/by-name/wi/windsend/package.nix b/pkgs/by-name/wi/windsend/package.nix new file mode 100644 index 000000000000..35da5be07d58 --- /dev/null +++ b/pkgs/by-name/wi/windsend/package.nix @@ -0,0 +1,55 @@ +{ + lib, + fetchFromGitHub, + flutter329, + copyDesktopItems, + makeDesktopItem, +}: + +flutter329.buildFlutterApplication rec { + pname = "windsend"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "doraemonkeys"; + repo = "WindSend"; + tag = "v${version}"; + hash = "sha256-A0cmjllyhKkYsMyjeuuMCax0uVnaDp9OwJPY7peDjPM="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes = { + open_filex = "sha256-dKLOmk+C9Rzw0wq18I5hkR2T4VcdmT4coimmgF+GzV8="; + media_scanner = "sha256-vlHsSmw0/bVDSwB/jwdj/flfcizDjYKHOItOb/jWQGM="; + receive_sharing_intent = "sha256-CmE15epEWlnClAPjM73J74EKUJ/TvwUF90VnAPZBWwc="; + }; + + sourceRoot = "${src.name}/flutter/wind_send"; + + nativeBuildInputs = [ copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + name = "windsend"; + exec = "WindSend"; + icon = "windsend"; + desktopName = "WindSend"; + }) + ]; + + postInstall = '' + install -Dm644 ../../app_icon/web/icon-512.png $out/share/pixmaps/windsend.png + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Quickly and securely sync clipboard, transfer files and directories between devices"; + homepage = "https://github.com/doraemonkeys/WindSend"; + mainProgram = "WindSend"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ emaryn ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/wi/windsend/pubspec.lock.json b/pkgs/by-name/wi/windsend/pubspec.lock.json new file mode 100644 index 000000000000..c3a68aeffe4c --- /dev/null +++ b/pkgs/by-name/wi/windsend/pubspec.lock.json @@ -0,0 +1,1351 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "82.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.4.5" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.12.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "direct main", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "cookie_jar": { + "dependency": "direct main", + "description": { + "name": "cookie_jar", + "sha256": "a6ac027d3ed6ed756bfce8f3ff60cb479e266f3b0fdabd6242b804b6765e52de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.8" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.13.1" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "cryptography_flutter_plus": { + "dependency": "direct main", + "description": { + "name": "cryptography_flutter_plus", + "sha256": "35a8c270aae0abaac7125a6b6b33c2b3daa0ea90d85320aa7d588b6dd6c2edc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.4" + }, + "cryptography_plus": { + "dependency": "direct main", + "description": { + "name": "cryptography_plus", + "sha256": "34db787df4f4740a39474b6fb0a610aa6dc13a5b5b68754b4787a79939ac0454", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.1" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "custom_refresh_indicator": { + "dependency": "direct main", + "description": { + "name": "custom_refresh_indicator", + "sha256": "c34dd1dfb1f6b9ee2db9c5972586dba5e4445d79f8431f6ab098a6e963ccd39c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.1" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.11" + }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.2" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.2" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.8.0+1" + }, + "dio_cookie_manager": { + "dependency": "direct main", + "description": { + "name": "dio_cookie_manager", + "sha256": "47cacbf6a783c263bfa7cd7d08101e93127d87760ddb003ba289162f7be0f679", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "dd51fd20fdc45e073529c102376d54deba3e120603fe711c848ce44575b838e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.8" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "flutter_localization": { + "dependency": "direct main", + "description": { + "name": "flutter_localization", + "sha256": "972eb337dcc27480e575accf9eadcdd80f52755ba05efcfdb585b869f29ad3d6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.3" + }, + "flutter_localizations": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.28" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "fluttertoast": { + "dependency": "direct main", + "description": { + "name": "fluttertoast", + "sha256": "25e51620424d92d3db3832464774a6143b5053f15e382d8ffbfd40b6e795dcf1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.2.12" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "irondash_engine_context": { + "dependency": "transitive", + "description": { + "name": "irondash_engine_context", + "sha256": "cd7b769db11a2b5243b037c8a9b1ecaef02e1ae27a2d909ffa78c1dad747bb10", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.4" + }, + "irondash_message_channel": { + "dependency": "transitive", + "description": { + "name": "irondash_message_channel", + "sha256": "b4101669776509c76133b8917ab8cfc704d3ad92a8c450b92934dd8884a2f060", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.8" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.9" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "line_icons": { + "dependency": "direct main", + "description": { + "name": "line_icons", + "sha256": "249d781d922f5437ac763d9c8f5a02cf5b499a6dc3f85e4b92e074cff0a932ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "logger": { + "dependency": "direct main", + "description": { + "name": "logger", + "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "media_scanner": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "master", + "resolved-ref": "1b34bda70b6620c3195e58ce9d4e88bbc92784cf", + "url": "https://github.com/Lzyct/media_scanner" + }, + "source": "git", + "version": "2.2.0" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.16.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "network_info_plus": { + "dependency": "direct main", + "description": { + "name": "network_info_plus", + "sha256": "f926b2ba86aa0086a0dfbb9e5072089bc213d854135c1712f1d29fc89ba3c877", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.4" + }, + "network_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "network_info_plus_platform_interface", + "sha256": "7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "open_filex": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "master", + "resolved-ref": "b4277d266207ef17b141d740cdfa59982a008c0f", + "url": "https://github.com/mufassalhussain/open_filex" + }, + "source": "git", + "version": "4.7.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.17" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "permission_handler": { + "dependency": "direct main", + "description": { + "name": "permission_handler", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.4.0" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.1.0" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.7" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3+5" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "permission_handler_windows": { + "dependency": "transitive", + "description": { + "name": "permission_handler_windows", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "pixel_snap": { + "dependency": "transitive", + "description": { + "name": "pixel_snap", + "sha256": "677410ea37b07cd37ecb6d5e6c0d8d7615a7cf3bd92ba406fd1ac57e937d1fb0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.5" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pointycastle": { + "dependency": "direct main", + "description": { + "name": "pointycastle", + "sha256": "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "receive_sharing_intent": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "7880e3e28bcf1ec50c100f1d19b349fc9506768e", + "resolved-ref": "7880e3e28bcf1ec50c100f1d19b349fc9506768e", + "url": "https://github.com/Strime/receive_sharing_intent" + }, + "source": "git", + "version": "1.8.1" + }, + "settings_ui": { + "dependency": "direct main", + "description": { + "name": "settings_ui", + "sha256": "d9838037cb554b24b4218b2d07666fbada3478882edefae375ee892b6c820ef3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.0.0" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.3" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.10" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "super_clipboard": { + "dependency": "direct main", + "description": { + "name": "super_clipboard", + "sha256": "4a6ae6dfaa282ec1f2bff750976f535517ed8ca842d5deae13985eb11c00ac1f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.24" + }, + "super_native_extensions": { + "dependency": "transitive", + "description": { + "name": "super_native_extensions", + "sha256": "a433bba8186cd6b707560c42535bf284804665231c00bca86faf1aa4968b7637", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.24" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.15" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.4" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.8" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "universal_io": { + "dependency": "transitive", + "description": { + "name": "universal_io", + "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.16" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.3" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.3.1" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.13.0" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.5" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + } + }, + "sdks": { + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.27.0" + } +} diff --git a/pkgs/by-name/wi/windsend/update.sh b/pkgs/by-name/wi/windsend/update.sh new file mode 100755 index 000000000000..5ef0416d5c32 --- /dev/null +++ b/pkgs/by-name/wi/windsend/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p yq nix bash coreutils nix-update common-updater-scripts ripgrep flutter + +set -eou pipefail + +PACKAGE_DIR="$(realpath "$(dirname "$0")")" +cd "$PACKAGE_DIR"/.. +while ! test -f flake.nix; do cd ..; done +NIXPKGS_DIR="$PWD" + +latestVersion=$( + list-git-tags --url=https://github.com/doraemonkeys/WindSend | + rg '^v(.*)' -r '$1' | + sort --version-sort | + tail -n1 +) + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; windsend.version or (lib.getVersion windsend)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +nix-update --version=$latestVersion windsend + +export HOME="$(mktemp -d)" +src="$(nix-build --no-link "$NIXPKGS_DIR" -A windsend.src)" +tmp="$(mktemp -d)" +cp --recursive --no-preserve=mode "$src"/* $tmp +pushd "$tmp"/flutter/wind_send +flutter pub get +yq . pubspec.lock >"$PACKAGE_DIR"/pubspec.lock.json +popd +rm -rf $tmp diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index e18df78ee660..a765700b327c 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.5.6", - "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-darwin-arm64-1.5.6.zip", - "sha256": "174fcd06dc73a760edf06105678af9b427303c8091cbe0f1454207107383076a" + "version": "1.9.0", + "vscodeVersion": "1.99.1", + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/fbebfca390b10f7a152fd231f94606109d576e12/Windsurf-darwin-arm64-1.9.0.zip", + "sha256": "44706f90321bdc4c2a2320a03c79fdd01c911236daa4cc675c597851974a268c" }, "x86_64-darwin": { - "version": "1.5.6", - "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-darwin-x64-1.5.6.zip", - "sha256": "a3891e831ab43452f791a6856f0fd3c63535348583ae673bfcdae4466f36f8df" + "version": "1.9.0", + "vscodeVersion": "1.99.1", + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/fbebfca390b10f7a152fd231f94606109d576e12/Windsurf-darwin-x64-1.9.0.zip", + "sha256": "ae398d597cd143144c2bdc8bf0a853a1c57b6de2c86c95087a4be5db78252e75" }, "x86_64-linux": { - "version": "1.5.6", - "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-linux-x64-1.5.6.tar.gz", - "sha256": "5b01ce09139d7d8932be5c297a1c71a891a299825b2d5304f3fed22367188ecb" + "version": "1.9.0", + "vscodeVersion": "1.99.1", + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/fbebfca390b10f7a152fd231f94606109d576e12/Windsurf-linux-x64-1.9.0.tar.gz", + "sha256": "941640e3514a5ee524943135b439219243adb288fec484712ebc2935173aa938" } } diff --git a/pkgs/by-name/wi/windsurf/update/update.mts b/pkgs/by-name/wi/windsurf/update/update.mts index 5db74e3b5346..64fad0bbd59f 100755 --- a/pkgs/by-name/wi/windsurf/update/update.mts +++ b/pkgs/by-name/wi/windsurf/update/update.mts @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell /* -#!nix-shell -i node --pure --packages cacert nodejs_23 +#!nix-shell -i node --pure --packages cacert nodejs_latest */ import * as assert from "node:assert/strict"; import * as fsPromises from "node:fs/promises"; diff --git a/pkgs/by-name/wi/wingpanel-indicator-ayatana/package.nix b/pkgs/by-name/wi/wingpanel-indicator-ayatana/package.nix index f50da741c1d3..7e771b85670b 100644 --- a/pkgs/by-name/wi/wingpanel-indicator-ayatana/package.nix +++ b/pkgs/by-name/wi/wingpanel-indicator-ayatana/package.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Lafydev/wingpanel-indicator-ayatana"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; }; } diff --git a/pkgs/by-name/wi/wingpanel-indicator-namarupa/package.nix b/pkgs/by-name/wi/wingpanel-indicator-namarupa/package.nix index 2b824ecd8816..83528bd53035 100644 --- a/pkgs/by-name/wi/wingpanel-indicator-namarupa/package.nix +++ b/pkgs/by-name/wi/wingpanel-indicator-namarupa/package.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lenemter/wingpanel-indicator-namarupa"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; }; } diff --git a/pkgs/by-name/wi/wipeout-rewrite/package.nix b/pkgs/by-name/wi/wipeout-rewrite/package.nix index 17f70e0ac692..61c3285e0316 100644 --- a/pkgs/by-name/wi/wipeout-rewrite/package.nix +++ b/pkgs/by-name/wi/wipeout-rewrite/package.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wipeout-rewrite"; - version = "0-unstable-2024-11-09"; + version = "0-unstable-2025-04-26"; src = fetchFromGitHub { owner = "phoboslab"; repo = "wipeout-rewrite"; - rev = "05e9c2d3a1272e631e256a76b89aca235b92e4a9"; - hash = "sha256-rzwh4JZNea5Wu/BEWGWpfxyPjY0GLrUPynPTbUC9Mak="; + rev = "38159b447c53fe9d0e3a02c82f2c20eb21138afb"; + hash = "sha256-dB90khtdj2386SYiHxE3OYt8iJjy640/4VRXGjqh1ww="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/wi/wiper/package.nix b/pkgs/by-name/wi/wiper/package.nix index bbf4eb8f3541..40772f3986bd 100644 --- a/pkgs/by-name/wi/wiper/package.nix +++ b/pkgs/by-name/wi/wiper/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, }: @@ -22,8 +20,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-p2bUiRLI0vfOAAi4Cb8B9E8kMVS6aX4ksbF+H9gMsDs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - meta = { description = "Disk analyser and cleanup tool"; changelog = "https://github.com/ikebastuz/wiper/releases/tag/v${version}"; diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix new file mode 100644 index 000000000000..b77c1ea2f827 --- /dev/null +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -0,0 +1,74 @@ +{ + lib, + buildGoModule, + fetchzip, + testers, + wireguard-go, +}: + +buildGoModule ( + finalAttrs: + let + rev = "12269c2761734b15625017d8565745096325392f"; + shortVer = "${finalAttrs.version} (${lib.substring 0 7 rev})"; + in + { + pname = "wireguard-go"; + version = "0-unstable-2023-12-11"; + + src = fetchzip { + url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${rev}.tar.xz"; + hash = "sha256-br7/dwr/e4HvBGJXh+6lWqxBUezt5iZNy9BFqEA1bLk="; + }; + + postPatch = '' + # Skip formatting tests + rm -f format_test.go + + # Inject version + printf 'package main\n\nconst Version = "${shortVer}"' > version.go + ''; + + vendorHash = "sha256-RqZ/3+Xus5N1raiUTUpiKVBs/lrJQcSwr1dJib2ytwc="; + + subPackages = [ "." ]; + + ldflags = [ "-s" ]; + + # No tests besides the formatting one are in root. + # We can't override subPackages per-phase (and we don't + # want to needlessly build packages that have build + # constraints), so just use the upstream Makefile (that + # runs `go test ./...`) to actually run the tests. + checkPhase = '' + runHook preCheck + export GOFLAGS=''${GOFLAGS//-trimpath/} + make test + runHook postCheck + ''; + + # Tests require networking. + __darwinAllowLocalNetworking = finalAttrs.doCheck; + + postInstall = '' + mv $out/bin/wireguard $out/bin/wireguard-go + ''; + + passthru.tests.version = testers.testVersion { + package = wireguard-go; + version = "v${shortVer}"; + }; + + meta = with lib; { + description = "Userspace Go implementation of WireGuard"; + homepage = "https://git.zx2c4.com/wireguard-go/about/"; + license = licenses.mit; + maintainers = with maintainers; [ + kirelagin + winter + zx2c4 + ]; + mainProgram = "wireguard-go"; + }; + } +) diff --git a/pkgs/by-name/wi/wireguard-tools/package.nix b/pkgs/by-name/wi/wireguard-tools/package.nix index 0c85c9154be5..b8bad89199da 100644 --- a/pkgs/by-name/wi/wireguard-tools/package.nix +++ b/pkgs/by-name/wi/wireguard-tools/package.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://www.wireguard.com/"; license = licenses.gpl2Only; maintainers = with maintainers; [ - ericsagnes zx2c4 globin ma27 diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix index b796e66c4164..c2d61c32f735 100644 --- a/pkgs/by-name/wi/wiremock/package.nix +++ b/pkgs/by-name/wi/wiremock/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wiremock"; - version = "3.12.1"; + version = "3.13.0"; src = fetchurl { url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar"; - hash = "sha256-OoyH8wqvMQvLHPi4bTRodINMpqzZAdsvixm5qmqAZuI="; + hash = "sha256-3Qqxrv6sf1Ch2JmSpaal1qtaJgtmD5UTcxWBblOAv5w="; }; dontUnpack = true; diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index 43f88744ce42..08c6e77e3327 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.41.0"; + version = "0.42.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${version}"; - hash = "sha256-ePrtWOCta9UtoEtSJ1NZb6iJricfsc2YtRF8hi///3c="; + hash = "sha256-zj+O8Rp/KXvDYCew0k5veBUokR91CGEIan398/mPY8w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vhhonclq6UGkygHoNIRkB4BIjMAdkSbu2qPXNb2y8pI="; + cargoHash = "sha256-epvE6qSKVUudqHXPJG5mP2X7xlR5XSm3UWDzZK0gHyA="; # 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/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix index 7bcf5d3369f3..39e7cb72aae3 100644 --- a/pkgs/by-name/wi/witness/package.nix +++ b/pkgs/by-name/wi/witness/package.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "witness"; - version = "0.8.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "in-toto"; repo = "witness"; rev = "v${version}"; - sha256 = "sha256-ylCUy44sX1KPfQqEldixmLcXkk+Uwca4q1gZRgxHdeg="; + sha256 = "sha256-0Q+6nG5N3Xp5asmRMPZccLxw6dWiZVX6fuIUf1rT+mI="; }; - vendorHash = "sha256-CR95CsGthdjq/dtxmIjmZlQeyKimumCP9mWr6tNrBJI="; + vendorHash = "sha256-oH/aWt8Hl/BIN+IYLcuVYWDpQZaYABAOGxXyLssjQg0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/wi/wivrn/force-enable-steamvr_lh.patch b/pkgs/by-name/wi/wivrn/force-enable-steamvr_lh.patch deleted file mode 100644 index 7ea67c738506..000000000000 --- a/pkgs/by-name/wi/wivrn/force-enable-steamvr_lh.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6c7956b4c..633fb6f72 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -205,6 +205,7 @@ option(BUILD_TESTING "Enable building of the test suite?" ON) - if(EXISTS "$ENV{HOME}/.steam/root") - set(XRT_HAVE_STEAM YES) - endif() -+set(XRT_HAVE_STEAM YES) - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(XRT_HAVE_INTERNAL_HID ON) - diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix index a55ee1dc5cf4..6be3a80dbc25 100644 --- a/pkgs/by-name/wi/wivrn/package.nix +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -1,5 +1,4 @@ { - # Commented packages are not currently in nixpkgs. They don't appear to cause a problem when not present. config, lib, stdenv, @@ -8,82 +7,57 @@ applyPatches, autoAddDriverRunpath, avahi, - bluez, boost, - cjson, cli11, cmake, cudaPackages ? { }, cudaSupport ? config.cudaSupport, - dbus, - # depthai - doxygen, eigen, - elfutils, ffmpeg, freetype, git, glib, glm, glslang, - gst_all_1, harfbuzz, - hidapi, kdePackages, - # leapsdk - # leapv2 - libGL, - libX11, - libXrandr, - libbsd, libdrm, - libjpeg, - libmd, + libGL, libnotify, libpulseaudio, - librealsense, librsvg, - libsurvive, - libunwind, - libusb1, - libuvc, libva, + libX11, + libXrandr, makeDesktopItem, nix-update-script, nlohmann_json, onnxruntime, opencomposite, - opencv4, - openhmd, - openvr, openxr-loader, - orc, - # percetto + ovrCompatSearchPaths ? "${opencomposite}/lib/opencomposite:${xrizer}/lib/xrizer", pipewire, pkg-config, python3, qt6, - SDL2, shaderc, spdlog, systemd, udev, vulkan-headers, vulkan-loader, - wayland, - wayland-protocols, - wayland-scanner, x264, + xrizer, }: stdenv.mkDerivation (finalAttrs: { pname = "wivrn"; - version = "0.23.2"; + version = "0.25"; src = fetchFromGitHub { owner = "wivrn"; repo = "wivrn"; rev = "v${finalAttrs.version}"; - hash = "sha256-KpsS0XssSnE2Fj5rrXq1h+yNHhF7BzfPxwRUhZUZEaw="; + hash = "sha256-dDf+BW0AZMWRlWl0ye5s3Muurz+CiM3U5+bYgaFIT7M="; }; monado = applyPatches { @@ -91,14 +65,10 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "848a24aa106758fd6c7afcab6d95880c57dbe450"; - hash = "sha256-+rax9/CG/3y8rLYwGqoWJa4FxH+Z3eREiwhuxDOUzLs="; + rev = "2a6932d46dad9aa957205e8a47ec2baa33041076"; + hash = "sha256-Bus9GTNC4+nOSwN8pUsMaFsiXjlpHYioQfBLxbQEF+0="; }; - patches = [ - ./force-enable-steamvr_lh.patch - ]; - postPatch = '' ${finalAttrs.src}/patches/apply.sh ${finalAttrs.src}/patches/monado/* ''; @@ -106,8 +76,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + # Let's make sure our monado source revision matches what is used by WiVRn upstream postUnpack = '' - # Let's make sure our monado source revision matches what is used by WiVRn upstream ourMonadoRev="${finalAttrs.monado.src.rev}" theirMonadoRev=$(sed -n '/FetchContent_Declare(monado/,/)/p' ${finalAttrs.src.name}/CMakeLists.txt | grep "GIT_TAG" | awk '{print $2}') if [ ! "$theirMonadoRev" == "$ourMonadoRev" ]; then @@ -121,7 +91,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - doxygen git glib glslang @@ -138,62 +107,38 @@ stdenv.mkDerivation (finalAttrs: { [ avahi boost - bluez - cjson cli11 - dbus eigen - elfutils ffmpeg freetype - glib glm - gst_all_1.gst-plugins-base - gst_all_1.gstreamer harfbuzz - hidapi kdePackages.kcoreaddons kdePackages.ki18n kdePackages.kiconthemes kdePackages.kirigami kdePackages.qcoro kdePackages.qqc2-desktop-style - libbsd libdrm libGL - libjpeg - libmd libnotify - librealsense - libsurvive - libunwind - libusb1 - libuvc + libpulseaudio libva libX11 libXrandr - libpulseaudio nlohmann_json - opencv4 - openhmd - openvr openxr-loader onnxruntime - orc pipewire qt6.qtbase qt6.qtsvg qt6.qttools - SDL2 shaderc spdlog systemd udev vulkan-headers vulkan-loader - wayland - wayland-protocols - wayland-scanner x264 ] ++ lib.optionals cudaSupport [ @@ -214,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false) (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute") - (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${opencomposite}/lib/opencomposite") + (lib.cmakeFeature "OVR_COMPAT_SEARCH_PATH" ovrCompatSearchPaths) (lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}") ] @@ -242,14 +187,17 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "An OpenXR streaming application to a standalone headset"; homepage = "https://github.com/WiVRn/WiVRn/"; - changelog = "https://github.com/WiVRn/WiVRn/releases/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ passivelemon ]; - platforms = platforms.linux; + changelog = "https://github.com/WiVRn/WiVRn/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + ImSapphire + passivelemon + ]; + platforms = lib.platforms.linux; mainProgram = "wivrn-server"; - sourceProvenance = with sourceTypes; [ fromSource ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; }; }) diff --git a/pkgs/by-name/wk/wkhtmltopdf/package.nix b/pkgs/by-name/wk/wkhtmltopdf/package.nix index 030f6610cbad..67c5d26ef8ef 100644 --- a/pkgs/by-name/wk/wkhtmltopdf/package.nix +++ b/pkgs/by-name/wk/wkhtmltopdf/package.nix @@ -90,7 +90,7 @@ let in stdenv.mkDerivation ( { - pname = "wkhtmltopdf"; + name = "wkhtmltopdf"; dontStrip = true; diff --git a/pkgs/by-name/wl/wl-kbptr/package.nix b/pkgs/by-name/wl/wl-kbptr/package.nix index 10c1719b1c3e..72c82c5b78c6 100644 --- a/pkgs/by-name/wl/wl-kbptr/package.nix +++ b/pkgs/by-name/wl/wl-kbptr/package.nix @@ -6,6 +6,8 @@ libxkbcommon, meson, ninja, + opencv, + pixman, pkg-config, stdenv, wayland, @@ -14,7 +16,7 @@ }: let pname = "wl-kbptr"; - version = "0.2.3"; + version = "0.3.0"; in stdenv.mkDerivation { inherit pname version; @@ -22,7 +24,7 @@ stdenv.mkDerivation { owner = "moverest"; repo = "wl-kbptr"; tag = "v${version}"; - hash = "sha256-4OWy5Q+NSKgzDn12aflZ+YAfacLeOTIhOojiJ2WiqQg="; + hash = "sha256-T7vxD5FW6Hjqc6io7Hypr6iJRM32KggQVMOGsy2Lg4Q="; }; depsBuildBuild = [ pkg-config ]; @@ -37,10 +39,14 @@ stdenv.mkDerivation { buildInputs = [ gtk3 libxkbcommon + opencv + pixman wayland wayland-protocols ]; + mesonFlags = [ "-Dopencv=enabled" ]; + strictDeps = true; passthru = { @@ -53,7 +59,10 @@ stdenv.mkDerivation { changelog = "https://github.com/moverest/wl-kbptr/releases/tag/v${version}"; license = lib.licenses.gpl3; mainProgram = "wl-kbptr"; - maintainers = [ lib.maintainers.luftmensch-luftmensch ]; + maintainers = [ + lib.maintainers.luftmensch-luftmensch + lib.maintainers.clementpoiret + ]; inherit (wayland.meta) platforms; }; } diff --git a/pkgs/by-name/wl/wl-mirror/package.nix b/pkgs/by-name/wl/wl-mirror/package.nix index 2f6f15f5badb..24dc422ec12f 100644 --- a/pkgs/by-name/wl/wl-mirror/package.nix +++ b/pkgs/by-name/wl/wl-mirror/package.nix @@ -9,9 +9,11 @@ wayland-scanner, wlr-protocols, libGL, + libgbm, bash, installExampleScripts ? true, makeWrapper, + installShellFiles, pipectl, slurp, rofi, @@ -29,13 +31,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.17.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-E8mbCMfmN3key1W3m8YbH1wKa56yESiXujACfKFS/+s="; + hash = "sha256-1R8jMDPprTeLt98iALC5l1mdW1U2yKGVtncXGatM8Vg="; }; strictDeps = true; @@ -46,9 +48,11 @@ stdenv.mkDerivation rec { wayland-scanner scdoc makeWrapper + installShellFiles ]; buildInputs = [ libGL + libgbm wayland wayland-protocols wlr-protocols @@ -65,11 +69,22 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DINSTALL_EXAMPLE_SCRIPTS=${if installExampleScripts then "ON" else "OFF"}" "-DINSTALL_DOCUMENTATION=ON" + "-DWITH_GBM=ON" ]; - postInstall = lib.optionalString installExampleScripts '' - wrapProgram $out/bin/wl-present --prefix PATH ":" ${wl-present-binpath} - ''; + postInstall = + '' + installShellCompletion --cmd wl-mirror \ + --bash ../scripts/completions/bash-completions/_wl-mirror \ + --zsh ../scripts/completions/zsh-completions/_wl-mirror + + installShellCompletion --cmd wl-present \ + --bash ../scripts/completions/bash-completions/_wl-present \ + --zsh ../scripts/completions/zsh-completions/_wl-present + '' + + lib.optionalString installExampleScripts '' + wrapProgram $out/bin/wl-present --prefix PATH ":" ${wl-present-binpath} + ''; meta = with lib; { homepage = "https://github.com/Ferdi265/wl-mirror"; diff --git a/pkgs/by-name/wl/wla-dx/package.nix b/pkgs/by-name/wl/wla-dx/package.nix index c0e871b853b0..317bd36b00dc 100644 --- a/pkgs/by-name/wl/wla-dx/package.nix +++ b/pkgs/by-name/wl/wla-dx/package.nix @@ -7,27 +7,31 @@ stdenv.mkDerivation rec { pname = "wla-dx"; - version = "9.11"; + version = "10.6"; src = fetchFromGitHub { owner = "vhelin"; repo = "wla-dx"; - rev = "v${version}-fix"; - sha256 = "0sz1vqafl7ii3z1710sk0ilvczv8pb4b6lkmg9pr7hqj3kaxndii"; + tag = "v${version}"; + hash = "sha256-t+X1Y1NhAGi4NOPik2fuLZAR3A7NQMAkSgWvqAFaIik="; }; installPhase = '' + runHook preInstall + mkdir -p $out/bin install binaries/* $out/bin + + runHook postInstall ''; nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { homepage = "https://www.villehelin.com/wla.html"; description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package"; - license = licenses.gpl2; - maintainers = with maintainers; [ matthewbauer ]; - platforms = platforms.all; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/wl/wlay/package.nix b/pkgs/by-name/wl/wlay/package.nix index 44d20fccb996..4e05f5b4f7f0 100644 --- a/pkgs/by-name/wl/wlay/package.nix +++ b/pkgs/by-name/wl/wlay/package.nix @@ -30,12 +30,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake + extra-cmake-modules pkg-config wayland-scanner ]; buildInputs = [ - extra-cmake-modules glfw3 libX11 libXau diff --git a/pkgs/by-name/wl/wlinhibit/package.nix b/pkgs/by-name/wl/wlinhibit/package.nix index 4117d51dde8f..1dbe6800a15d 100644 --- a/pkgs/by-name/wl/wlinhibit/package.nix +++ b/pkgs/by-name/wl/wlinhibit/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation { pname = "wlinhibit"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "0x5a4"; repo = "wlinhibit"; - rev = "v0.1.1"; - hash = "sha256-YQHJ9sLHSV8GJP7IpRzmtDbeB86y/a48mLcYy4iDciw="; + rev = "v0.1.2"; + hash = "sha256-mAEBnlIfW1R5+3CMH4ZumQ39Ss2K7PfW28I4/O9saWE="; }; buildInputs = [ diff --git a/pkgs/by-name/wl/wlx-overlay-s/package.nix b/pkgs/by-name/wl/wlx-overlay-s/package.nix index 5010e6bce075..f34c70f0d683 100644 --- a/pkgs/by-name/wl/wlx-overlay-s/package.nix +++ b/pkgs/by-name/wl/wlx-overlay-s/package.nix @@ -26,17 +26,17 @@ rustPlatform.buildRustPackage rec { pname = "wlx-overlay-s"; - version = "25.3.0"; + version = "25.4.2"; src = fetchFromGitHub { owner = "galister"; repo = "wlx-overlay-s"; rev = "v${version}"; - hash = "sha256-m2YVXF9bEjovZOWa+X1CYHAUaAsUI4dBMG2ni3jP9L4="; + hash = "sha256-lWUfhiHRxu72p9ZG2f2fZH6WZECm/fOKcK05MLZV+MI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-y4pWUQFPR0jOTdukQZe4d1v0DFDfQtAg0Bi4V4ue5+Y="; + cargoHash = "sha256-em5sWSty2/pZp2jTwBnLUIBgPOcoMpwELwj984XYf+k="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/wo/woke/package.nix b/pkgs/by-name/wo/woke/package.nix index 51d95f981f0e..0d13c7ff25c8 100644 --- a/pkgs/by-name/wo/woke/package.nix +++ b/pkgs/by-name/wo/woke/package.nix @@ -34,7 +34,7 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/woke"; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/get-woke/woke/releases/tag/${src.tag}"; diff --git a/pkgs/by-name/wo/wolfssl/package.nix b/pkgs/by-name/wo/wolfssl/package.nix new file mode 100644 index 000000000000..bccd65d015f9 --- /dev/null +++ b/pkgs/by-name/wo/wolfssl/package.nix @@ -0,0 +1,122 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + util-linux, + openssl, + cacert, + # The primary --enable-XXX variant. 'all' enables most features, but causes build-errors for some software, + # requiring to build a special variant for that software. Example: 'haproxy' + variant ? "all", + extraConfigureFlags ? [ ], + enableARMCryptoExtensions ? + stdenv.hostPlatform.isAarch64 + && ((builtins.match "^.*\\+crypto.*$" stdenv.hostPlatform.gcc.arch) != null), + enableLto ? !(stdenv.hostPlatform.isStatic || stdenv.cc.isClang), +}: +stdenv.mkDerivation (finalAttrs: { + pname = "wolfssl-${variant}"; + version = "5.7.4"; + + src = fetchFromGitHub { + owner = "wolfSSL"; + repo = "wolfssl"; + tag = "v${finalAttrs.version}-stable"; + hash = "sha256-/dtW1E1wYfQEuotclUEOK5+Vg4S7vt1xWhr1lEtu60w="; + }; + + postPatch = '' + patchShebangs ./scripts + # ensure test detects musl-based systems too + substituteInPlace scripts/ocsp-stapling2.test \ + --replace '"linux-gnu"' '"linux-"' + ''; + + configureFlags = + [ + "--enable-${variant}" + "--enable-reproducible-build" + ] + ++ lib.optionals (variant == "all") [ + # Extra feature flags to add while building the 'all' variant. + # Since they conflict while building other variants, only specify them for this one. + "--enable-pkcs11" + "--enable-writedup" + "--enable-base64encode" + ] + ++ [ + # We're not on tiny embedded machines. + # Increase TLS session cache from 33 sessions to 20k. + "--enable-bigcache" + + # Use WolfSSL's Single Precision Math with timing-resistant cryptography. + "--enable-sp=yes${ + lib.optionalString (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch) ",asm" + }" + "--enable-sp-math-all" + "--enable-harden" + ] + ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ + # Enable AVX/AVX2/AES-NI instructions, gated by runtime detection via CPUID. + "--enable-intelasm" + "--enable-aesni" + ] + ++ lib.optionals (stdenv.hostPlatform.isAarch64) [ + # No runtime detection under ARM and no platform function checks like for X86. + (if enableARMCryptoExtensions then "--enable-armasm=inline" else "--disable-armasm") + ] + ++ extraConfigureFlags; + + # Breaks tls13 tests on aarch64-darwin. + hardeningDisable = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + "zerocallusedregs" + ]; + + # LTO should help with the C implementations. + env.NIX_CFLAGS_COMPILE = lib.optionalString enableLto "-flto"; + env.NIX_LDFLAGS_COMPILE = lib.optionalString enableLto "-flto"; + + # Don't attempt connections to external services in the test suite. + env.WOLFSSL_EXTERNAL_TEST = "0"; + + outputs = [ + "dev" + "doc" + "lib" + "out" + ]; + + nativeBuildInputs = [ + autoreconfHook + util-linux + ]; + + doCheck = true; + + nativeCheckInputs = [ + openssl + cacert + ]; + + postInstall = '' + # fix recursive cycle: + # wolfssl-config points to dev, dev propagates bin + moveToOutput bin/wolfssl-config "$dev" + # moveToOutput also removes "$out" so recreate it + mkdir -p "$out" + ''; + + meta = with lib; { + description = "Small, fast, portable implementation of TLS/SSL for embedded devices"; + mainProgram = "wolfssl-config"; + homepage = "https://www.wolfssl.com/"; + changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${finalAttrs.version}-stable"; + platforms = platforms.all; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ + fab + vifino + ]; + }; +}) diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index 120627d4b6f8..4d05628ec553 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -7,10 +7,10 @@ let pname = "wootility"; - version = "5.0.3"; + version = "5.0.6"; src = fetchurl { url = "https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/Wootility-${version}.AppImage"; - sha256 = "sha256-uDjxA8o/ZvWJzpwJFs2b6jXcaRBeNy04hkeZ3DGoXVs="; + sha256 = "sha256-9DFt8Hx39B7hgIQn22TPDva1mpxBYFtddNG+WNeqgF8="; }; in diff --git a/pkgs/by-name/wo/wordnet/package.nix b/pkgs/by-name/wo/wordnet/package.nix new file mode 100644 index 000000000000..95c92c7c8e18 --- /dev/null +++ b/pkgs/by-name/wo/wordnet/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchurl, + tcl, + tk, + makeWrapper, +}: + +stdenv.mkDerivation rec { + version = "3.0"; + pname = "wordnet"; + src = fetchurl { + url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2"; + sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + tcl + tk + ]; + + hardeningDisable = [ "format" ]; + + patchPhase = '' + sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c + ''; + + # Fails the build on clang-16 and on upcoming gcc-14. + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; + + # Needs the path to `tclConfig.sh' and `tkConfig.sh'. + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + ]; + + postInstall = '' + wrapProgram $out/bin/wnb --prefix PATH : "$out/bin" + ''; + + meta = { + description = "Lexical database for the English language"; + + longDescription = '' + WordNet® is a large lexical database of English. Nouns, verbs, + adjectives and adverbs are grouped into sets of cognitive synonyms + (synsets), each expressing a distinct concept. Synsets are + interlinked by means of conceptual-semantic and lexical relations. + The resulting network of meaningfully related words and concepts can + be navigated with the browser. WordNet is also freely and publicly + available for download. WordNet's structure makes it a useful tool + for computational linguistics and natural language processing. + ''; + + homepage = "https://wordnet.princeton.edu/"; + license = { + fullName = "WordNet 3.0 license"; + url = "https://wordnet.princeton.edu/license-and-commercial-use"; + }; + maintainers = [ ]; + platforms = with lib.platforms; linux ++ darwin; + mainProgram = "wn"; + }; +} diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index 6e4cbf3b58d6..58daf946004a 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -9,19 +9,19 @@ }: let pname = "workout-tracker"; - version = "2.2.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; tag = "v${version}"; - hash = "sha256-6t+p/P8gAHTOMiWJ1lDcpHRPptO+lk0jl/llKy8fNrg="; + hash = "sha256-TSRHsVpl/qfu4Dwttj1pYhD+4zzxCt48y9FF4zP1drY="; }; assets = buildNpmPackage { pname = "${pname}-assets"; inherit version src; - npmDepsHash = "sha256-LB9YPhz+1FLqf7G4LRdm6OMyIsEQCd23frl5wb5pG/Q="; + npmDepsHash = "sha256-rUW7wdJg5AhcDxIaH74YXzQS3Pav2fOraw8Rhb+IgCc="; dontNpmBuild = true; makeCacheWritable = true; postPatch = '' diff --git a/pkgs/by-name/wo/workrave/package.nix b/pkgs/by-name/wo/workrave/package.nix index 8f1322c323e9..1a84f57c656f 100644 --- a/pkgs/by-name/wo/workrave/package.nix +++ b/pkgs/by-name/wo/workrave/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "workrave"; - version = "1.10.52"; + version = "1.10.53"; src = fetchFromGitHub { repo = "workrave"; owner = "rcaelers"; rev = "v" + lib.concatStringsSep "_" (lib.splitVersion version); - sha256 = "sha256-U39zr8XGIDbyY480bla2yTaRQLP3wMrL8RLWjlTa5uY="; + sha256 = "sha256-Dt0KY6nchcGZLyiUGGS4pnVagreIhuQpSq2DdvWqtn8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wo/worldpainter/package.nix b/pkgs/by-name/wo/worldpainter/package.nix index d37b99ce782f..22c13cf57525 100644 --- a/pkgs/by-name/wo/worldpainter/package.nix +++ b/pkgs/by-name/wo/worldpainter/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "worldpainter"; - version = "2.23.2"; + version = "2.24.1"; src = fetchurl { url = "https://www.worldpainter.net/files/${pname}_${version}.tar.gz"; - hash = "sha256-FhrfI2/mBeIZAg26Q8x8T2YU2ANwAkoC3h9Tgw6ggoY="; + hash = "sha256-I7bf+BKaHSsR08stLtJu+wY5ek8cj+SjRVwu+RwqEq0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wo/wownero/package.nix b/pkgs/by-name/wo/wownero/package.nix index 5933810851dd..a35b9147e956 100644 --- a/pkgs/by-name/wo/wownero/package.nix +++ b/pkgs/by-name/wo/wownero/package.nix @@ -12,7 +12,6 @@ readline, unbound, zeromq, - darwin, }: let @@ -60,19 +59,15 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = - [ - boost186 - libsodium - openssl - rapidjson - readline - unbound - zeromq - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; + buildInputs = [ + boost186 + libsodium + openssl + rapidjson + readline + unbound + zeromq + ]; postUnpack = '' rm -r $sourceRoot/external/miniupnp diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix index c2e80fb7cd95..03dc478adc34 100644 --- a/pkgs/by-name/wo/wox/package.nix +++ b/pkgs/by-name/wo/wox/package.nix @@ -22,13 +22,13 @@ }: let - version = "2.0.0-beta.1"; + version = "2.0.0-beta.2"; src = fetchFromGitHub { owner = "Wox-launcher"; repo = "Wox"; tag = "v${version}"; - hash = "sha256-ghrvBOTR2v7i50OrwfwbwwFFF4uBQuEPxhXimdcFUJI="; + hash = "sha256-PPB9eRXit89lwkLCN86+Un/msMqnFAulJxEGi+7Fa/c="; }; metaCommon = { @@ -46,8 +46,6 @@ let pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes.window_manager = "sha256-OGVrby09QsCvXnkLdEcCoZBO2z/LXY4xFBVdRHnvKEQ="; - nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ keybinder3 ]; @@ -155,7 +153,7 @@ buildGoModule { --replace-fail "Exec=%s" "Exec=wox" ''; - vendorHash = "sha256-n3lTx1od4EvWdTSe3sIsUStp2qcuSWMqztJZoNLrzQg="; + vendorHash = "sha256-MKxMHABeKotErM+PEhWxeQmPcHH4jJSGWa8wzj42hoE="; proxyVendor = true; diff --git a/pkgs/by-name/wo/wox/pubspec.lock.json b/pkgs/by-name/wo/wox/pubspec.lock.json index de1d048e0ff6..4c973a9c2a0f 100644 --- a/pkgs/by-name/wo/wox/pubspec.lock.json +++ b/pkgs/by-name/wo/wox/pubspec.lock.json @@ -844,16 +844,6 @@ "source": "hosted", "version": "4.1.0" }, - "screen_retriever": { - "dependency": "transitive", - "description": { - "name": "screen_retriever", - "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.9" - }, "scroll_pos": { "dependency": "transitive", "description": { @@ -1250,17 +1240,6 @@ "source": "hosted", "version": "1.1.5" }, - "window_manager": { - "dependency": "direct main", - "description": { - "path": ".", - "ref": "db8b4c7f348311dbd5ce4cec8635f0c2cf048775", - "resolved-ref": "db8b4c7f348311dbd5ce4cec8635f0c2cf048775", - "url": "https://github.com/qianlifeng/window_manager.git" - }, - "source": "git", - "version": "0.3.7" - }, "xdg_directories": { "dependency": "transitive", "description": { diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix index 5e7ad8d457bf..f2cf041a677b 100644 --- a/pkgs/by-name/wp/wpaperd/package.nix +++ b/pkgs/by-name/wp/wpaperd/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "wpaperd"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "danyspin97"; repo = "wpaperd"; rev = version; - hash = "sha256-L3xoEhVjbJoPsGgie95SIxpRDCV5ZZcrfL01TPAffZc="; + hash = "sha256-mBdrOmS+e+Npei5+RmtbTkBCGR8L5O83hulNU1z0Akk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-F4u+d0HZBC5JWS25EGyWoeLV7wkmI0n4/pVjp61qSu0="; + cargoHash = "sha256-d8jzoNCn9J36SE4tQZ1orgOfFGbhVtHaaO940b3JxmQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix new file mode 100644 index 000000000000..611f802f9b11 --- /dev/null +++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix @@ -0,0 +1,180 @@ +{ + lib, + stdenv, + dpkg, + autoPatchelfHook, + alsa-lib, + at-spi2-core, + libtool, + libxkbcommon, + nspr, + mesa, + libtiff, + udev, + gtk3, + libsForQt5, + xorg, + cups, + pango, + libjpeg, + gtk2, + gdk-pixbuf, + libpulseaudio, + libbsd, + libusb1, + libmysqlclient, + llvmPackages, + dbus, + gcc-unwrapped, + freetype, + curl, + makeWrapper, + runCommandLocal, + cacert, + coreutils, +}: +let + pkgVersion = "12.1.0.17900"; + url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}_amd64.deb"; + hash = "sha256-i2EVCmDLE2gx7l2aAo+fW8onP/z+xlPIbQYwKhQ46+o="; + uri = builtins.replaceStrings [ "https://wps-linux-personal.wpscdn.cn" ] [ "" ] url; + securityKey = "7f8faaaa468174dc1c9cd62e5f218a5b"; +in +stdenv.mkDerivation rec { + pname = "wpsoffice-cn"; + version = pkgVersion; + + src = + runCommandLocal "wps-office_${version}_amd64.deb" + { + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = hash; + + nativeBuildInputs = [ + curl + coreutils + ]; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + } + '' + timestamp10=$(date '+%s') + md5hash=($(echo -n "${securityKey}${uri}$timestamp10" | md5sum)) + curl \ + --retry 3 --retry-delay 3 \ + "${url}?t=$timestamp10&k=$md5hash" \ + > $out + ''; + + unpackCmd = "dpkg -x $src ."; + sourceRoot = "."; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + alsa-lib + at-spi2-core + libtool + libjpeg + libxkbcommon + nspr + mesa + libtiff + udev + gtk3 + libsForQt5.qt5.qtbase + xorg.libXdamage + xorg.libXtst + xorg.libXv + gtk2 + gdk-pixbuf + libpulseaudio + xorg.libXScrnSaver + xorg.libXxf86vm + libbsd + libusb1 + libmysqlclient + llvmPackages.openmp + dbus + libsForQt5.fcitx5-qt + ]; + + dontWrapQtApps = true; + + runtimeDependencies = map lib.getLib [ + cups + pango + freetype + gcc-unwrapped.lib + ]; + + autoPatchelfIgnoreMissingDeps = [ + # distribution is missing libkappessframework.so + "libkappessframework.so" + # qt4 support is deprecated + "libQtCore.so.4" + "libQtNetwork.so.4" + "libQtXml.so.4" + # file manager integration. Not needed + "libnautilus-extension.so.1" + "libcaja-extension.so.1" + "libpeony.so.3" + # libuof.so is a exclusive library in WPS. No need to repatch it + "libuof.so" + ]; + + installPhase = '' + runHook preInstall + prefix=$out/opt/kingsoft/wps-office + mkdir -p $out + cp -r opt $out + cp -r usr/* $out + for i in wps wpp et wpspdf; do + substituteInPlace $out/bin/$i \ + --replace /opt/kingsoft/wps-office $prefix + done + for i in $out/share/applications/*;do + substituteInPlace $i \ + --replace /usr/bin $out/bin + done + # need system freetype and gcc lib to run properly + for i in wps wpp et wpspdf wpsoffice; do + wrapProgram $out/opt/kingsoft/wps-office/office6/$i \ + --set LD_PRELOAD "${freetype}/lib/libfreetype.so" \ + --set LD_LIBRARY_PATH "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" + done + runHook postInstall + ''; + + preFixup = '' + # The following libraries need libtiff.so.5, but nixpkgs provides libtiff.so.6 + patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/{libpdfmain.so,libqpdfpaint.so,qt/plugins/imageformats/libqtiff.so,addons/pdfbatchcompression/libpdfbatchcompressionapp.so} + patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/addons/ksplitmerge/libksplitmergeapp.so + patchelf --add-needed libtiff.so $out/opt/kingsoft/wps-office/office6/libwpsmain.so + # Fix: Wrong JPEG library version: library is 62, caller expects 80 + patchelf --add-needed libjpeg.so $out/opt/kingsoft/wps-office/office6/libwpsmain.so + # dlopen dependency + patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so + ''; + + meta = with lib; { + description = "Office suite, formerly Kingsoft Office"; + homepage = "https://www.wps.com"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + hydraPlatforms = [ ]; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ + mlatus + th0rgal + rewine + pokon548 + ]; + }; +} diff --git a/pkgs/by-name/wp/wpsoffice/package.nix b/pkgs/by-name/wp/wpsoffice/package.nix new file mode 100644 index 000000000000..d6d96127ee03 --- /dev/null +++ b/pkgs/by-name/wp/wpsoffice/package.nix @@ -0,0 +1,138 @@ +{ + lib, + stdenv, + dpkg, + autoPatchelfHook, + alsa-lib, + at-spi2-core, + libtool, + libxkbcommon, + nspr, + libgbm, + libtiff, + udev, + gtk3, + xorg, + cups, + pango, + runCommandLocal, + curl, + libsForQt5, + coreutils, + cacert, + libjpeg, +}: +let + pkgVersion = "11.1.0.11723"; + url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}.XA_amd64.deb"; + hash = "sha256-o8njvwE/UsQpPuLyChxGAZ4euvwfuaHxs5pfUvcM7kI="; +in +stdenv.mkDerivation rec { + pname = "wpsoffice"; + version = pkgVersion; + + src = + runCommandLocal "wps-office_${version}.XA_amd64.deb" + { + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = hash; + + nativeBuildInputs = [ + curl + coreutils + ]; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + } + '' + curl \ + --retry 3 --retry-delay 3 \ + "${url}" \ + > $out + ''; + + unpackCmd = "dpkg -x $src ."; + sourceRoot = "."; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; + + buildInputs = [ + alsa-lib + at-spi2-core + libtool + libjpeg + libxkbcommon + nspr + libgbm + libtiff + udev + gtk3 + libsForQt5.qt5.qtbase + xorg.libXdamage + xorg.libXtst + xorg.libXv + ]; + + dontWrapQtApps = true; + + runtimeDependencies = map lib.getLib [ + cups + pango + ]; + + autoPatchelfIgnoreMissingDeps = [ + # distribution is missing libkappessframework.so + "libkappessframework.so" + # qt4 support is deprecated + "libQtCore.so.4" + "libQtNetwork.so.4" + "libQtXml.so.4" + ]; + + installPhase = '' + runHook preInstall + prefix=$out/opt/kingsoft/wps-office + mkdir -p $out + cp -r opt $out + cp -r usr/* $out + for i in wps wpp et wpspdf; do + substituteInPlace $out/bin/$i \ + --replace /opt/kingsoft/wps-office $prefix + done + for i in $out/share/applications/*;do + substituteInPlace $i \ + --replace /usr/bin $out/bin + done + runHook postInstall + ''; + + preFixup = '' + # The following libraries need libtiff.so.5, but nixpkgs provides libtiff.so.6 + patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/{libpdfmain.so,libqpdfpaint.so,qt/plugins/imageformats/libqtiff.so,addons/pdfbatchcompression/libpdfbatchcompressionapp.so} + patchelf --add-needed libtiff.so $out/opt/kingsoft/wps-office/office6/libwpsmain.so + # Fix: Wrong JPEG library version: library is 62, caller expects 80 + patchelf --add-needed libjpeg.so $out/opt/kingsoft/wps-office/office6/libwpsmain.so + # dlopen dependency + patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so + ''; + + meta = with lib; { + description = "Office suite, formerly Kingsoft Office"; + homepage = "https://www.wps.com"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + hydraPlatforms = [ ]; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ + mlatus + th0rgal + rewine + pokon548 + ]; + }; +} diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 6654ee0f063d..17dc8f28a85e 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -10,23 +10,35 @@ llvmPackages, musl, xorg, + jq, + moreutils, gitUpdater, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "3.80.1"; + version = "4.16.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-9ClosoDIT+yP2dvNenHW2RSxLimOT3znXD+Pq+N6cQA="; + hash = "sha256-H/ds5NfOjyTZ4AcsCAP0wbalgOljOUtLSjkjEn+atVk="; }; pnpmDeps = pnpm_9.fetchDeps { - inherit (finalAttrs) pname version src; - hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ="; + inherit (finalAttrs) + pname + version + src + postPatch + ; + hash = "sha256-msIXeN8t8Dm3RUkw4woZIMn7wXxw/0jVl8oFmkPJbrA="; }; + # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs + postPatch = '' + jq 'del(.packageManager)' package.json | sponge package.json + ''; passthru.updateScript = gitUpdater { rev-prefix = "wrangler@"; }; @@ -45,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper nodejs pnpm_9.configHook + jq + moreutils ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ autoPatchelfHook @@ -53,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { # @cloudflare/vitest-pool-workers wanted to run a server as part of the build process # so I simply removed it postBuild = '' - rm -fr packages/vitest-pool-workers + mv packages/vitest-pool-workers packages/~vitest-pool-workers NODE_ENV="production" pnpm --filter workers-shared run build NODE_ENV="production" pnpm --filter miniflare run build NODE_ENV="production" pnpm --filter wrangler run build @@ -65,19 +79,17 @@ stdenv.mkDerivation (finalAttrs: { # - the build process builds a version of miniflare which is used by wrangler; for this reason, the miniflare package is copied also # - pnpm stores all content in the top-level node_modules directory, but it is linked to from a node_modules directory inside wrangler # - as they are linked via symlinks, the relative location of them on the filesystem should be maintained + # - Update: Now we're copying everything over due to broken symlink errors installPhase = '' runHook preInstall mkdir -p $out/bin $out/lib $out/lib/packages/wrangler - rm -rf node_modules/typescript node_modules/eslint node_modules/prettier node_modules/bin node_modules/.bin node_modules/**/bin node_modules/**/.bin + mv packages/~vitest-pool-workers packages/vitest-pool-workers + cp -r fixtures $out/lib + cp -r packages $out/lib cp -r node_modules $out/lib - cp -r packages/miniflare $out/lib/packages - cp -r packages/workers-tsconfig $out/lib/packages - cp -r packages/workers-shared $out/lib/packages - cp -r packages/wrangler/node_modules $out/lib/packages/wrangler - cp -r packages/wrangler/templates $out/lib/packages/wrangler - cp -r packages/wrangler/wrangler-dist $out/lib/packages/wrangler + cp -r tools $out/lib/tools + rm -rf node_modules/typescript node_modules/eslint node_modules/prettier node_modules/bin node_modules/.bin node_modules/**/bin node_modules/**/.bin rm -rf $out/lib/**/bin $out/lib/**/.bin - cp -r packages/wrangler/bin $out/lib/packages/wrangler NODE_PATH_ARRAY=( "$out/lib/node_modules" "$out/lib/packages/wrangler/node_modules" ) makeWrapper ${lib.getExe nodejs} $out/bin/wrangler \ --inherit-argv0 \ @@ -86,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: { --set-default SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" # https://github.com/cloudflare/workers-sdk/issues/3264 runHook postInstall ''; - + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; meta = { description = "Command-line interface for all things Cloudflare Workers"; homepage = "https://github.com/cloudflare/workers-sdk#readme"; @@ -98,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: { seanrmurphy dezren39 ryand56 + ezrizhu ]; mainProgram = "wrangler"; # Tunneling and other parts of wrangler, which require workerd won't run on diff --git a/pkgs/by-name/wr/wrangler_1/package.nix b/pkgs/by-name/wr/wrangler_1/package.nix new file mode 100644 index 000000000000..042832ea99ef --- /dev/null +++ b/pkgs/by-name/wr/wrangler_1/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + curl, + libiconv, +}: + +rustPlatform.buildRustPackage rec { + pname = "wrangler"; + version = "1.21.0"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = "wrangler"; + rev = "v${version}"; + sha256 = "sha256-GfuU+g4tPU3TorzymEa9q8n4uKYsG0ZTz8rJirGOLfQ="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-MJFXcmRzvzDJ8cd0WdcNiHr3Wxgp/hKO1xKRfmbxRLA="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + libiconv + ]; + + OPENSSL_NO_VENDOR = 1; + + # tries to use "/homeless-shelter" and fails + doCheck = false; + + meta = with lib; { + description = "CLI tool designed for folks who are interested in using Cloudflare Workers"; + mainProgram = "wrangler"; + homepage = "https://github.com/cloudflare/wrangler"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ Br1ght0ne ]; + }; +} diff --git a/pkgs/by-name/wr/wrkflw/package.nix b/pkgs/by-name/wr/wrkflw/package.nix new file mode 100644 index 000000000000..c9171d2137ae --- /dev/null +++ b/pkgs/by-name/wr/wrkflw/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + docker, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "wrkflw"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "bahdotsh"; + repo = "wrkflw"; + rev = "v${finalAttrs.version}"; + hash = "sha256-b2g6sY+YBZfD5D+fmbpz+hKZvKKwjCCuygxk2pyYaR8="; + }; + + cargoHash = "sha256-iCagvOIc1Gsox6yQDfOrSTXaM30Q93CwHZdDZOi4kK0="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + docker + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Validate and execute GitHub Actions workflows locally"; + homepage = "https://github.com/bahdotsh/wrkflw"; + changelog = "https://github.com/bahdotsh/wrkflw/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + awwpotato + FKouhai + ]; + mainProgram = "wrkflw"; + }; +}) diff --git a/pkgs/by-name/ws/wsrepl/package.nix b/pkgs/by-name/ws/wsrepl/package.nix index 7ceb84628f59..3c4c12988942 100644 --- a/pkgs/by-name/ws/wsrepl/package.nix +++ b/pkgs/by-name/ws/wsrepl/package.nix @@ -1,10 +1,11 @@ { lib, + python3Packages, fetchFromGitHub, - python3, + nix-update-script, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "wsrepl"; version = "0.2.0"; pyproject = true; @@ -17,14 +18,15 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "rich" "textual" ]; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ poetry-core ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ pygments pyperclip rich @@ -39,12 +41,16 @@ python3.pkgs.buildPythonApplication rec { "wsrepl" ]; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "WebSocket REPL"; homepage = "https://github.com/doyensec/wsrepl"; changelog = "https://github.com/doyensec/wsrepl/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "wsrepl"; }; } diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index cde6e4aa5548..46232d50cd7f 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -8,7 +8,7 @@ }: let - version = "10.1.10"; + version = "10.3.0"; in rustPlatform.buildRustPackage { @@ -19,11 +19,11 @@ rustPlatform.buildRustPackage { owner = "erebe"; repo = "wstunnel"; tag = "v${version}"; - hash = "sha256-7HW2AtMTNE05qSBhltj+ZxJhoMJmaMynko8+wIgpqCc="; + hash = "sha256-Eq5d80hLg0ZkXtnObDQXmC+weUq9eN5SIQ6teVxB3a4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NujasFigZ+BETg3J8fOKu5QAm68ZzP7uIXwv7bI+2uM="; + cargoHash = "sha256-V5ohlS+dTrmhsvxpXW9JA7YpH/LWiyepUwEdBRrHiYE="; cargoBuildFlags = [ "--package wstunnel-cli" ]; diff --git a/pkgs/by-name/wt/wtf/package.nix b/pkgs/by-name/wt/wtf/package.nix new file mode 100644 index 000000000000..d21063247072 --- /dev/null +++ b/pkgs/by-name/wt/wtf/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + stdenv, + cmake, + ninja, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wtf"; + version = "0.5.7"; + + src = fetchFromGitHub { + owner = "0vercl0k"; + repo = "wtf"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lfPx9RQEW457VQkDbvu/D9EFZrdNLz2ToQ9dfa7+tzY="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + sourceRoot = "source/src"; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 wtf $out/bin/wtf + + runHook postInstall + ''; + + meta = { + description = "Cross-platform snapshot-based fuzzer"; + homepage = "https://github.com/0vercl0k/wtf"; + changelog = "https://github.com/0vercl0k/wtf/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = with lib.platforms; [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ mikehorn ]; + mainProgram = "wtf"; + }; +}) diff --git a/pkgs/by-name/wt/wtfis/package.nix b/pkgs/by-name/wt/wtfis/package.nix index d12b44ed2792..2ac897360aaa 100644 --- a/pkgs/by-name/wt/wtfis/package.nix +++ b/pkgs/by-name/wt/wtfis/package.nix @@ -6,12 +6,12 @@ let pname = "wtfis"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "pirxthepilot"; repo = "wtfis"; tag = "v${version}"; - hash = "sha256-+BJmAFjmj3z/sKJ/L/y6hTClesulpQTpDL9cUNRi6e8="; + hash = "sha256-2p5xFNr08WCgCQY8socmZ5UsyGCMId3zXQhXTX909PE="; }; in python3.pkgs.buildPythonApplication { diff --git a/pkgs/by-name/wt/wthrr/package.nix b/pkgs/by-name/wt/wthrr/package.nix index be0b4608788e..622e19bf5ce4 100644 --- a/pkgs/by-name/wt/wthrr/package.nix +++ b/pkgs/by-name/wt/wthrr/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,15 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; checkFlags = [ # requires internet access diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index b5bc96f793eb..6d334268964a 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, nix-update-script, }: @@ -18,14 +16,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+M0s6v9ULf+D2pPOE8KlHoyV+jBMbPsAXpYxGjms5DY="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Security - SystemConfiguration - ] - ); - useFetchCargoVendor = true; cargoHash = "sha256-sv9hSTmq5J6s0PPBMJgaMUWBaRk0/NJV41nNDIj6MoY="; diff --git a/pkgs/by-name/wt/wtwitch/package.nix b/pkgs/by-name/wt/wtwitch/package.nix index cf9d19877857..569f32735d2d 100644 --- a/pkgs/by-name/wt/wtwitch/package.nix +++ b/pkgs/by-name/wt/wtwitch/package.nix @@ -13,19 +13,23 @@ mpv, procps, scdoc, - stdenv, + stdenvNoCC, streamlink, vlc, + fzf, + withMpv ? true, + withVlc ? false, + withMplayer ? false, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "wtwitch"; version = "2.6.3"; src = fetchFromGitHub { owner = "krathalan"; - repo = pname; - rev = version; + repo = "wtwitch"; + tag = finalAttrs.version; hash = "sha256-2YLBuxGwGkav3zB2qMqM6yRXf7ZLqgULoJV4s5p+hSw="; }; @@ -35,7 +39,11 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + runHook preBuild + scdoc < src/wtwitch.1.scd > wtwitch.1 + + runHook postBuild ''; nativeBuildInputs = [ @@ -45,6 +53,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + installManPage wtwitch.1 installShellCompletion --cmd wtwitch \ --bash src/wtwitch-completion.bash \ @@ -54,29 +64,32 @@ stdenv.mkDerivation rec { --set-default LANG en_US.UTF-8 \ --prefix PATH : ${ lib.makeBinPath ( - lib.optionals stdenv.hostPlatform.isLinux [ vlc ] - ++ [ + [ bash coreutils-prefixed curl gnused gnugrep jq - mplayer - mpv procps streamlink + fzf ] + ++ lib.optional withMpv mpv + ++ lib.optional withVlc vlc + ++ lib.optional withMplayer mplayer ) } + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Terminal user interface for Twitch"; homepage = "https://github.com/krathalan/wtwitch"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ urandom ]; - platforms = platforms.all; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.urandom ]; + platforms = lib.platforms.all; mainProgram = "wtwitch"; }; -} +}) diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix index a1e2ca6b7a5d..32d7c9489df9 100644 --- a/pkgs/by-name/wx/wxGTK32/package.nix +++ b/pkgs/by-name/wx/wxGTK32/package.nix @@ -4,6 +4,7 @@ curl, expat, fetchFromGitHub, + gspell, gst_all_1, gtk3, libGL, @@ -12,9 +13,12 @@ libXinerama, libXtst, libXxf86vm, + libnotify, libpng, + libsecret, libtiff, libjpeg_turbo, + libxkbcommon, zlib, pcre2, pkg-config, @@ -24,7 +28,7 @@ unicode ? true, withMesa ? !stdenv.hostPlatform.isDarwin, withWebKit ? true, - webkitgtk_4_0, + webkitgtk_4_1, }: let catch = fetchFromGitHub { @@ -43,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.6"; + version = "3.2.7.1"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-7dc7NGiKSonFFaWp3UxLYqDc1Cc6no1Eba0QmtzX5mM="; + hash = "sha256-CKU0Aa78YrtGKLE9/MF9VNc2fmzPZ1j4lviX1aAv9cQ="; }; nativeBuildInputs = [ pkg-config ]; @@ -66,15 +70,19 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ curl + gspell # wxTextCtrl spell checking gtk3 libSM libXinerama libXtst libXxf86vm + libnotify # wxNotificationMessage backend + libsecret # wxSecretStore backend + libxkbcommon # proper key codes in key events xorgproto ] ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0 + ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_1 ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat ]; @@ -142,7 +150,10 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ tfmoraes ]; + maintainers = with maintainers; [ + tfmoraes + fliegendewurst + ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/wx/wxformbuilder/package.nix b/pkgs/by-name/wx/wxformbuilder/package.nix index 3a90c0d8e22d..b04d229c6667 100644 --- a/pkgs/by-name/wx/wxformbuilder/package.nix +++ b/pkgs/by-name/wx/wxformbuilder/package.nix @@ -48,14 +48,10 @@ stdenv.mkDerivation (finalAttrs: { shared-mime-info ]; - buildInputs = - [ - boost - wxGTK32 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = [ + boost + wxGTK32 + ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} diff --git a/pkgs/by-name/wx/wxhexeditor/package.nix b/pkgs/by-name/wx/wxhexeditor/package.nix index e581b8c50ba8..22a01f1d7bef 100644 --- a/pkgs/by-name/wx/wxhexeditor/package.nix +++ b/pkgs/by-name/wx/wxhexeditor/package.nix @@ -9,6 +9,7 @@ libtool, python3, wxGTK32, + wrapGAppsHook3, llvmPackages, }: @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { libtool python3 wxGTK32 + wrapGAppsHook3 ]; buildInputs = lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix index 94595ff510e8..b5b8ccffe420 100644 --- a/pkgs/by-name/wx/wxsqlite3/package.nix +++ b/pkgs/by-name/wx/wxsqlite3/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.10.5"; + version = "4.10.6"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-aDEVT3R948P+N1fFC9Q7LNf8FpPuxlKs+dQurewtaFA="; + hash = "sha256-31gdhLZxthVUpSWG3PMfYiCb9xVXkXrJ1U0OI3dw5hs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wy/wyoming-piper/package.nix b/pkgs/by-name/wy/wyoming-piper/package.nix index 37118de9d98b..1a91f7380b32 100644 --- a/pkgs/by-name/wy/wyoming-piper/package.nix +++ b/pkgs/by-name/wy/wyoming-piper/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "wyoming-piper"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-piper"; tag = "v${version}"; - hash = "sha256-HxLs2NH5muYzVfOtfLlV09BQ3waIfZKBCTiK/Tha6r4="; + hash = "sha256-yPGiOF9RXhW7zjvFMi1UCXLyrWiqhJTvvIAtkYb9kBg="; }; build-system = with python3Packages; [ @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - changelog = "https://github.com/rhasspy/wyoming-piper/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/wyoming-piper/blob/${src.tag}/CHANGELOG.md"; description = "Wyoming Server for Piper"; mainProgram = "wyoming-piper"; homepage = "https://github.com/rhasspy/wyoming-piper"; diff --git a/pkgs/by-name/x1/x11vnc/package.nix b/pkgs/by-name/x1/x11vnc/package.nix index 5331f43e37d9..23dd1e4743b6 100644 --- a/pkgs/by-name/x1/x11vnc/package.nix +++ b/pkgs/by-name/x1/x11vnc/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, openssl, zlib, libjpeg, @@ -13,33 +12,17 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "x11vnc"; - version = "0.9.16"; + version = "0.9.17"; src = fetchFromGitHub { owner = "LibVNC"; repo = "x11vnc"; - rev = version; - sha256 = "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1"; + tag = finalAttrs.version; + hash = "sha256-Uc5AzEmfU5kcgfJz4qnry2w6qk/Wzzb/ohho9MnSieM="; }; - patches = [ - (fetchpatch { - name = "CVE-2020-29074.patch"; - url = "https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a.patch"; - sha256 = "0hdhp32g2i5m0ihmaxkxhsn3d5f2qasadvwpgxify4xnzabmyb2d"; - }) - - # Pull upstream fix for -fno-common toolchains: - # https://github.com/LibVNC/x11vnc/pull/121 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/LibVNC/x11vnc/commit/a48b0b1cd887d7f3ae67f525d7d334bd2feffe60.patch"; - sha256 = "046gjsmg0vm0m4y9ny17y2jayc4ba7vib2whw71l5x1hjp6pksjs"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -64,21 +47,22 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/unixpw.c \ - --replace '"/bin/su"' '"/run/wrappers/bin/su"' \ - --replace '"/bin/true"' '"${coreutils}/bin/true"' + --replace-fail '"/bin/su"' '"/run/wrappers/bin/su"' \ + --replace-fail '"/bin/true"' '"${coreutils}/bin/true"' sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h # Xdummy script is currently broken, so we avoid building it. This removes everything Xdummy-related from the affected Makefile - sed -i -e '/^\tXdummy.c\ \\$/,$d' -e 's/\tx11vnc_loop\ \\/\tx11vnc_loop/' misc/Makefile.am + sed -i '/if HAVE_X11/,/endif/d' misc/Makefile.am ''; meta = with lib; { description = "VNC server connected to a real X11 screen"; homepage = "https://github.com/LibVNC/x11vnc/"; + changelog = "https://github.com/LibVNC/x11vnc/releases/tag/${finalAttrs.version}"; platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ OPNA2608 ]; mainProgram = "x11vnc"; }; -} +}) diff --git a/pkgs/by-name/x1/x16/package.nix b/pkgs/by-name/x1/x16/package.nix index a5433fa475f6..27cc806728b0 100644 --- a/pkgs/by-name/x1/x16/package.nix +++ b/pkgs/by-name/x1/x16/package.nix @@ -2,9 +2,11 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, SDL2, callPackage, zlib, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -14,10 +16,19 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "X16Community"; repo = "x16-emulator"; - rev = "r${finalAttrs.version}"; + tag = "r${finalAttrs.version}"; hash = "sha256-E4TosRoORCWLotOIXROP9oqwqo1IRSa6X13GnmuxE9A="; }; + # Fix build on GCC 14 + # TODO: Remove for next release as it should already be included in upstream + patches = [ + (fetchpatch2 { + url = "https://github.com/X16Community/x16-emulator/commit/3da83c93d46a99635cf73a6f9fdcf1bd4a4ae04f.patch"; + hash = "sha256-DZItqq7B1lXZ6VFsQUdQKn0wt1HaX4ymq2pI2DamY3w="; + }) + ]; + postPatch = '' substituteInPlace Makefile \ --replace-fail '/bin/echo' 'echo' @@ -48,14 +59,16 @@ stdenv.mkDerivation (finalAttrs: { run = (callPackage ./run.nix { }) { inherit (finalAttrs.finalPackage) emulator rom; }; + + updateScript = nix-update-script { }; }; meta = { homepage = "https://cx16forum.com/"; description = "Official emulator of CommanderX16 8-bit computer"; - changelog = "https://github.com/X16Community/x16-emulator/blob/r${finalAttrs.version}/RELEASES.md"; + changelog = "https://github.com/X16Community/x16-emulator/blob/${finalAttrs.src.rev}/RELEASES.md"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "x16emu"; inherit (SDL2.meta) platforms; broken = stdenv.hostPlatform.isAarch64; # ofborg fails to compile it diff --git a/pkgs/by-name/x1/x16/rom.nix b/pkgs/by-name/x1/x16/rom.nix index 7102b3199687..2738c0378e4b 100644 --- a/pkgs/by-name/x1/x16/rom.nix +++ b/pkgs/by-name/x1/x16/rom.nix @@ -5,6 +5,7 @@ cc65, lzsa, python3, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs findsymbols scripts/ substituteInPlace Makefile \ - --replace-fail '/bin/echo' 'echo' + --replace-fail '/bin/echo' 'echo' ''; dontConfigure = true; @@ -47,13 +48,14 @@ stdenv.mkDerivation (finalAttrs: { # upstream project recommends emulator and rom to be synchronized; passing # through the version is useful to ensure this inherit (finalAttrs) version; + updateScript = nix-update-script { }; }; meta = { homepage = "https://github.com/X16Community/x16-rom"; description = "ROM file for CommanderX16 8-bit computer"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ pluiedev ]; inherit (cc65.meta) platforms; broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; diff --git a/pkgs/by-name/x1/x16/run.nix b/pkgs/by-name/x1/x16/run.nix index db5d531fc2e3..72c746533ac2 100644 --- a/pkgs/by-name/x1/x16/run.nix +++ b/pkgs/by-name/x1/x16/run.nix @@ -1,7 +1,7 @@ { runtimeShell, symlinkJoin, - writeTextFile, + writeShellScriptBin, }: { emulator, rom }: @@ -9,18 +9,10 @@ assert emulator.version == rom.version; let - runScript = writeTextFile { - name = "run-x16"; - text = '' - #!${runtimeShell} - - defaultRom="${rom}/share/x16-rom/rom.bin" - - exec "${emulator}/bin/x16emu" -rom $defaultRom "$@" - ''; - executable = true; - destination = "/bin/run-x16"; - }; + runScript = writeShellScriptBin "run-x16" '' + defaultRom="${rom}/share/x16-rom/rom.bin" + exec "${emulator}/bin/x16emu" -rom $defaultRom "$@" + ''; in symlinkJoin { pname = "run-x16"; diff --git a/pkgs/by-name/x2/x264/package.nix b/pkgs/by-name/x2/x264/package.nix index 48852d9215b0..7e209794f89b 100644 --- a/pkgs/by-name/x2/x264/package.nix +++ b/pkgs/by-name/x2/x264/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { # `AS' is set to the binutils assembler, but we need nasm unset AS '' - + lib.optionalString stdenv.hostPlatform.isAarch '' + + lib.optionalString (stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isLoongArch64) '' export AS=$CC ''; diff --git a/pkgs/by-name/x2/x265/package.nix b/pkgs/by-name/x2/x265/package.nix index eec407eeaf1b..1f7f8cdff97c 100644 --- a/pkgs/by-name/x2/x265/package.nix +++ b/pkgs/by-name/x2/x265/package.nix @@ -5,6 +5,7 @@ fetchurl, cmake, nasm, + fetchpatch2, # NUMA support enabled by default on NUMA platforms: numaSupport ? ( @@ -25,6 +26,9 @@ unittestsSupport ? stdenv.hostPlatform.isx86_64, # Unit tests - only testing x64 assembly vtuneSupport ? false, # Vtune profiling instrumentation werrorSupport ? false, # Warnings as errors + # NEON support is always enabled for aarch64 + # this flag is only needed for armv7. + neonSupport ? false, # force enable the NEON fpu support for arm v7 CPUs }: let @@ -49,9 +53,18 @@ stdenv.mkDerivation rec { hash = "sha256-oxaZxqiYBrdLAVHl5qffZd5LSQUEgv5ev4pDedevjyk="; }; - patches = [ - ./darwin-__rdtsc.patch - ]; + patches = + [ + ./darwin-__rdtsc.patch + ] + # TODO: remove after update to version 4.2 + ++ lib.optionals (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isLinux) [ + (fetchpatch2 { + url = "https://bitbucket.org/multicoreware/x265_git/commits/ddb1933598736394b646cb0f78da4a4201ffc656/raw"; + hash = "sha256-ZH+jbVtfNJ+CwRUEgsnzyPVzajR/+4nDnUDz5RONO6c="; + stripLen = 1; + }) + ]; sourceRoot = "x265_${version}/source"; @@ -88,7 +101,13 @@ stdenv.mkDerivation rec { # Clang does not support the endfunc directive so use GCC. ++ lib.optional ( stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isFreeBSD - ) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"; + ) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc" + # Neon support + ++ lib.optionals (neonSupport && stdenv.hostPlatform.isAarch32) [ + "-DENABLE_NEON=ON" + "-DCPU_HAS_NEON=ON" + "-DENABLE_ASSEMBLY=ON" + ]; cmakeStaticLibFlags = [ diff --git a/pkgs/by-name/x3/x3270/package.nix b/pkgs/by-name/x3/x3270/package.nix index f1e182b28817..da3519ae0fd4 100644 --- a/pkgs/by-name/x3/x3270/package.nix +++ b/pkgs/by-name/x3/x3270/package.nix @@ -1,6 +1,5 @@ { stdenv, - darwin, lib, libiconv, fetchurl, @@ -74,7 +73,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; meta = with lib; { diff --git a/pkgs/by-name/x4/x4/package.nix b/pkgs/by-name/x4/x4/package.nix index 26815dd7a0c7..c7a7e4108e5c 100644 --- a/pkgs/by-name/x4/x4/package.nix +++ b/pkgs/by-name/x4/x4/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/xa/xalanc/0001-clang19-gcc15-compat.patch b/pkgs/by-name/xa/xalanc/0001-clang19-gcc15-compat.patch new file mode 100644 index 000000000000..ab6270d8f148 --- /dev/null +++ b/pkgs/by-name/xa/xalanc/0001-clang19-gcc15-compat.patch @@ -0,0 +1,48 @@ +diff --git a/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp b/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp +index 8741cea49..075b1ad4f 100644 +--- a/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp ++++ b/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp +@@ -301,43 +301,6 @@ public: + return write(chars, start, length, m_charRefFunctor); + } + +- void +- writeSafe( +- const XalanDOMChar* theChars, +- size_type theLength) +- { +- for(size_type i = 0; i < theLength; ++i) +- { +- const XalanDOMChar ch = theChars[i]; +- +- if (isUTF16HighSurrogate(ch) == true) +- { +- if (i + 1 >= theLength) +- { +- throwInvalidUTF16SurrogateException(ch, 0, getMemoryManager()); +- } +- else +- { +- XalanUnicodeChar value = decodeUTF16SurrogatePair(ch, theChars[i+1], getMemoryManager()); +- +- if (this->m_isPresentable(value)) +- { +- write(value); +- } +- else +- { +- this->writeNumberedEntityReference(value); +- } +- +- ++i; +- } +- } +- else +- { +- write(static_cast(ch)); +- } +- } +- } + + void + write(const XalanDOMChar* theChars) diff --git a/pkgs/by-name/xa/xalanc/package.nix b/pkgs/by-name/xa/xalanc/package.nix index d8e898ab47da..06bd0ba59abf 100644 --- a/pkgs/by-name/xa/xalanc/package.nix +++ b/pkgs/by-name/xa/xalanc/package.nix @@ -18,6 +18,16 @@ stdenv.mkDerivation { sha256 = "sha256:0q1204qk97i9h14vxxq7phcfpyiin0i1zzk74ixvg4wqy87b62s8"; }; + patches = [ + # See https://github.com/llvm/llvm-project/issues/96859 + # xalan-c contains a templated code path that tries to access non-existent methods, + # but before Clang 19 and GCC 15 this was no error as the template was never instantiated. + # Note that the suggested fix of adding "-fdelayed-template-parsing" + # to CXX_FLAGS would be sufficient for Clang 19, but as it would break again + # once we upgrade to GCC 15, we remove the dead code entirely. + ./0001-clang19-gcc15-compat.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ xercesc diff --git a/pkgs/by-name/xa/xan/package.nix b/pkgs/by-name/xa/xan/package.nix index f2587510a527..4e643c5d6f12 100644 --- a/pkgs/by-name/xa/xan/package.nix +++ b/pkgs/by-name/xa/xan/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "xan"; - version = "0.48.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "medialab"; repo = "xan"; tag = version; - hash = "sha256-TBrPe4kmxLiyFfP6s4lAV3PjzXihqdBZ+emisd2Yjbs="; + hash = "sha256-wPzseazDTxsQ9zki4oDiAYT7sRRcIln3b9f5FC2t2Ko="; }; - cargoHash = "sha256-XKiYF619IEQEU7P5mRjnCEJSxr2G3t3cV4MpvBlWcNw="; + cargoHash = "sha256-BagQNDWOhyz2x2TvwYvlE07rU9RuHQHGAVAZu0JbfgE="; useFetchCargoVendor = true; # FIXME: tests fail and I do not have the time to investigate. Temporarily disable diff --git a/pkgs/by-name/xa/xaos/package.nix b/pkgs/by-name/xa/xaos/package.nix index 6dd1c768b85b..ce4c27c92a7b 100644 --- a/pkgs/by-name/xa/xaos/package.nix +++ b/pkgs/by-name/xa/xaos/package.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { pname = "xaos"; - version = "4.3.3"; + version = "4.3.4"; outputs = [ "out" "man" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "xaos-project"; repo = "XaoS"; tag = "release-${version}"; - hash = "sha256-EUhh1j0OVpCggpKcUJTRJOMKKy3ZF5Fdrk9yuXc2uEY="; + hash = "sha256-vOFwZbdbcrcJLHUa1QzxzadPcx5GF5uNPg+MZ7NbAPc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix index 7b47143d9661..491f01c601e3 100644 --- a/pkgs/by-name/xa/xapp/package.nix +++ b/pkgs/by-name/xa/xapp/package.nix @@ -101,6 +101,6 @@ stdenv.mkDerivation rec { description = "Cross-desktop libraries and common resources"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix index a89b8104b8f8..68267014c683 100644 --- a/pkgs/by-name/xa/xar/package.nix +++ b/pkgs/by-name/xa/xar/package.nix @@ -183,9 +183,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/apple-oss-distributions/xar"; description = "An easily extensible archive format"; license = lib.licenses.bsd3; - maintainers = - lib.teams.darwin.members - ++ lib.attrValues { inherit (lib.maintainers) copumpkin tie; }; + maintainers = lib.attrValues { inherit (lib.maintainers) tie; }; + teams = [ lib.teams.darwin ]; platforms = lib.platforms.unix; mainProgram = "xar"; }; diff --git a/pkgs/by-name/xa/xastir/package.nix b/pkgs/by-name/xa/xastir/package.nix index 94e2681afe10..a9050f519a85 100644 --- a/pkgs/by-name/xa/xastir/package.nix +++ b/pkgs/by-name/xa/xastir/package.nix @@ -4,12 +4,15 @@ fetchFromGitHub, autoreconfHook, pkg-config, + bashNonInteractive, curl, db, + gnused, libgeotiff, + libtiff, xorg, motif, - pcre, + pcre2, perl, proj, graphicsmagick, @@ -24,23 +27,26 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "xastir"; repo = "xastir"; - rev = "Release-${version}"; + tag = "Release-${version}"; hash = "sha256-EQXSfH4b5vMiprFcMXCUDNl+R1cHSj9CyhZnUPAMoCw="; }; nativeBuildInputs = [ autoreconfHook pkg-config + perl ]; buildInputs = [ + bashNonInteractive curl db libgeotiff + libtiff xorg.libXpm xorg.libXt motif - pcre + pcre2 perl proj graphicsmagick @@ -48,15 +54,41 @@ stdenv.mkDerivation rec { libax25 ]; - configureFlags = [ "--with-motif-includes=${motif}/include" ]; + strictDeps = true; - postPatch = "patchShebangs ."; + configureFlags = [ + "--with-motif-includes=${lib.getDev motif}/include" + "ac_cv_path_gm=${lib.getExe' graphicsmagick "gm"}" + "ac_cv_path_convert=${lib.getExe' graphicsmagick "convert"}" + "ac_cv_header_xtiffio_h=yes" + "ac_cv_path_GMAGIC_BIN=${lib.getExe' (lib.getDev graphicsmagick) "GraphicsMagick-config"}" + ]; - meta = with lib; { + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; + + postPatch = '' + patchShebangs --build scripts/lang*.pl + + # checks for files in /usr/bin/ + substituteInPlace acinclude.m4 \ + --replace-fail "AC_CHECK_FILE" "# AC_CHECK_FILE" + # would pick up builder sed from $PATH + substituteInPlace configure.ac \ + --replace-fail 'AC_DEFINE_UNQUOTED(SED_PATH, "''${sed}", [Path to sed])' \ + 'AC_DEFINE_UNQUOTED(SED_PATH, "${lib.getExe gnused}", [Path to sed])' + ''; + + preInstall = '' + patchShebangs --host --update . + ''; + + meta = { description = "Graphical APRS client"; - homepage = "https://xastir.org"; - license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; - platforms = platforms.linux; + homepage = "https://github.com/xastir/xastir"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.ehmry ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/xb/xbitmaps/package.nix b/pkgs/by-name/xb/xbitmaps/package.nix new file mode 100644 index 000000000000..5d60e45dfdd9 --- /dev/null +++ b/pkgs/by-name/xb/xbitmaps/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + testers, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xbitmaps"; + version = "1.1.3"; + + src = fetchurl { + url = "mirror://xorg/individual/data/xbitmaps-${finalAttrs.version}.tar.xz"; + hash = "sha256-rWytVIh4MqF9hsLM/F5Sod+rCQ+DB7FSx4sOFSnND3o="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/data/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + homepage = "https://gitlab.freedesktop.org/xorg/data/bitmaps"; + description = "X BitMap (XBM) format bitmaps commonly used in X.Org applications"; + license = with lib.licenses; [ + icu + smlnj + ]; + maintainers = [ ]; + pkgConfigModules = [ "xbitmaps" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xc/xcb-imdkit/package.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix index 538b84c1c4bf..9d92138bd5d1 100644 --- a/pkgs/by-name/xc/xcb-imdkit/package.nix +++ b/pkgs/by-name/xc/xcb-imdkit/package.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + extra-cmake-modules xorgproto uthash ]; buildInputs = [ - extra-cmake-modules xcbutil xcbutilkeysyms ]; diff --git a/pkgs/by-name/xc/xcb-proto/package.nix b/pkgs/by-name/xc/xcb-proto/package.nix new file mode 100644 index 000000000000..d5fd73e2f42c --- /dev/null +++ b/pkgs/by-name/xc/xcb-proto/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + python3, + testers, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xcb-proto"; + version = "1.17.0"; + + src = fetchurl { + url = "mirror://xorg/individual/proto/xcb-proto-${finalAttrs.version}.tar.xz"; + hash = "sha256-LBus0hEPR5n3TebrtxS5TPb4D7ESMWsSGUgP0iViFIw="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + python3 + ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/proto/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions"; + homepage = "https://gitlab.freedesktop.org/xorg/proto/xcbproto"; + license = lib.licenses.x11; + maintainers = [ ]; + pkgConfigModules = [ "xcb-proto" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xc/xcbuild/package.nix b/pkgs/by-name/xc/xcbuild/package.nix index 84383093528c..b488c3ffbf78 100644 --- a/pkgs/by-name/xc/xcbuild/package.nix +++ b/pkgs/by-name/xc/xcbuild/package.nix @@ -10,11 +10,6 @@ stdenv, zlib, - # These arguments are obsolete but required to avoid evaluation errors (for now). - CoreGraphics ? null, - CoreServices ? null, - ImageIO ? null, - # These are deprecated and do nothing. They’re needed for compatibility and will # warn eventually once in-tree uses are cleaned up. xcodePlatform ? null, @@ -95,7 +90,11 @@ stdenv.mkDerivation (finalAttrs: { ''; postPatch = - lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + '' + substituteInPlace Libraries/pbxbuild/Sources/Tool/TouchResolver.cpp \ + --replace-fail "/usr/bin/touch" "touch" + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Fix build on gcc-13 due to missing includes sed -e '1i #include ' -i \ Libraries/libutil/Headers/libutil/Permissions.h \ @@ -159,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { bsd2 bsd3 ]; - maintainers = lib.teams.darwin.members; + teams = [ lib.teams.darwin ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/xc/xcodegen/package.nix b/pkgs/by-name/xc/xcodegen/package.nix index b898315b471a..f97bd7ce704f 100644 --- a/pkgs/by-name/xc/xcodegen/package.nix +++ b/pkgs/by-name/xc/xcodegen/package.nix @@ -58,7 +58,7 @@ swiftPackages.stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index 2165afeda87d..be16eedd941b 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "xcp"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "tarka"; repo = "xcp"; rev = "v${version}"; - hash = "sha256-tAECD3gNx6RDzEJhGt2nrykxHfh4S1qJKt9yNdZpuGs="; + hash = "sha256-TI9lveFJsb/OgGQRiPW5iuatB8dsc7yxBs1rb148nEY="; }; # no such file or directory errors doCheck = false; useFetchCargoVendor = true; - cargoHash = "sha256-plWq+p6NqOjonkdsGAL7hHBwVzFtkkgTNWNKEOBNZeU="; + cargoHash = "sha256-9cNu0cgoo0/41daJwy/uWIXa2wFhYkcPhJfA/69DVx0="; meta = with lib; { description = "Extended cp(1)"; diff --git a/pkgs/by-name/xc/xcrawl3r/package.nix b/pkgs/by-name/xc/xcrawl3r/package.nix index 27b652b41bd6..90dabee0168c 100644 --- a/pkgs/by-name/xc/xcrawl3r/package.nix +++ b/pkgs/by-name/xc/xcrawl3r/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "xcrawl3r"; - version = "0.2.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "hueristiq"; repo = "xcrawl3r"; tag = version; - hash = "sha256-W1cvSvRnDGFp4br8s/nL+owIGWTJ1bVX6kvmeTLUuuI="; + hash = "sha256-Ojm5cBeXRtDGQfbDweLlD1V12PYJHxVbO2g1X1Wt/B8="; }; - vendorHash = "sha256-fHdtqjFmT+8cmy2SxjjBvw5Rct7lA2ksGVmm/9ncbRI="; + vendorHash = "sha256-rBKpYB7t9zdduqZA1VwCBp+kXpB8nABhTo+IaoOE8bE="; ldflags = [ "-s" diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index abe32972b3b6..50b6e472e6d8 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -3,35 +3,37 @@ stdenv, rustPlatform, fetchFromGitHub, - fetchpatch, libcosmicAppHook, pkg-config, util-linux, libgbm, pipewire, gst_all_1, + cosmic-wallpapers, coreutils, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "xdg-desktop-portal-cosmic"; - version = "1.0.0-alpha.6"; + version = "1.0.0-alpha.7"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-ymBmnSEXGCNbLTIVzHP3tjKAG0bgvEFU1C8gnxiow98="; + hash = "sha256-7yfrjKHuYOWPMMkHdGZ+g0hynh2TtSf4h8zW13tTus4="; }; env = { - VERGEN_GIT_COMMIT_DATE = "2025-02-20"; - VERGEN_GIT_SHA = finalAttrs.src.rev; + VERGEN_GIT_COMMIT_DATE = "2025-04-08"; + VERGEN_GIT_SHA = finalAttrs.src.tag; }; useFetchCargoVendor = true; - cargoHash = "sha256-FO/GIzv9XVu8SSV+JbOf98UX/XriRgqTthtzvRIWNjo="; + cargoHash = "sha256-fOaLeWtrjgBDSShC5OmBZKODNQn4bp/+iPZX5ZMQFqk="; separateDebugInfo = true; @@ -49,17 +51,22 @@ rustPlatform.buildRustPackage (finalAttrs: { checkInputs = [ gst_all_1.gstreamer ]; - # TODO: Remove this when updating to the next version - patches = [ - (fetchpatch { - name = "cosmic-portal-fix-examples-after-ashpd-api-update.patch"; - url = "https://github.com/pop-os/xdg-desktop-portal-cosmic/commit/df831ce7a48728aa9094fa1f30aed61cf1cc6ac3.diff?full_index=1"; - hash = "sha256-yRrB3ds9TtN1OBZEZbnE6h2fkPyP4PP2IJ17n+0ugEo="; - }) - ]; - - # Also modifies the functionality by replacing 'false' with 'true' to enable the portal to start properly. postPatch = '' + # While the `kate-hazen-COSMIC-desktop-wallpaper.png` image is present + # in the `pop-wallpapers` package, we're using the Orion Nebula image + # from NASA available in the `cosmic-wallpapers` package. Mainly because + # the previous image was used in the GNOME shell extension and the + # Orion Nebula image is widely used in the Rust-based COSMIC DE's + # marketing materials. Another reason to use the Orion Nebula image + # is that it's actually the default wallpaper as configured by the + # `cosmic-bg` package's configuration in upstream [1] [2]. + # + # [1]: https://github.com/pop-os/cosmic-bg/blob/epoch-1.0.0-alpha.6/config/src/lib.rs#L142 + # [2]: https://github.com/pop-os/cosmic-bg/blob/epoch-1.0.0-alpha.6/data/v1/all#L3 + substituteInPlace src/screenshot.rs src/widget/screenshot.rs \ + --replace-fail '/usr/share/backgrounds/pop/kate-hazen-COSMIC-desktop-wallpaper.png' '${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg' + + # Also modifies the functionality by replacing 'false' with 'true' to enable the portal to start properly. substituteInPlace data/org.freedesktop.impl.portal.desktop.cosmic.service \ --replace-fail 'Exec=/bin/false' 'Exec=${lib.getExe' coreutils "true"}' ''; @@ -71,23 +78,30 @@ rustPlatform.buildRustPackage (finalAttrs: { "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { homepage = "https://github.com/pop-os/xdg-desktop-portal-cosmic"; description = "XDG Desktop Portal for the COSMIC Desktop Environment"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - nyabinary - HeitorAugustoLN - ]; + teams = [ lib.teams.cosmic ]; mainProgram = "xdg-desktop-portal-cosmic"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix index 93b8347e5ccc..9fa4feeef447 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-gnome"; - version = "47.3"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz"; - hash = "sha256-n25LFLWDNnyRXpSUdk8ny4SSf6o/nm4Bi5O7vPM2HkQ="; + hash = "sha256-zRWsouE2TaMI6zeWu4rkpXfmDKT+EgBrMVIyz9GciGE="; }; nativeBuildInputs = [ @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Backend implementation for xdg-desktop-portal for the GNOME desktop environment"; homepage = "https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"; - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; platforms = platforms.linux; license = licenses.lgpl21Plus; }; diff --git a/pkgs/by-name/xd/xdg-desktop-portal-luminous/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-luminous/package.nix new file mode 100644 index 000000000000..94555e6178e4 --- /dev/null +++ b/pkgs/by-name/xd/xdg-desktop-portal-luminous/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + meson, + ninja, + rustc, + cargo, + rustPlatform, + xdg-desktop-portal, + slurp, + cairo, + pango, + libxkbcommon, + glib, + pipewire, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xdg-desktop-portal-luminous"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "waycrate"; + repo = "xdg-desktop-portal-luminous"; + tag = "v${finalAttrs.version}"; + hash = "sha256-7i6+arKWubziDmy07FocDDiJdOWAszhO7yOOI1iPfds="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-fatlvc+MoAJZGW/5alnDu1PQyK6mnE0aNQAhrMg7Hio="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + rustc + cargo + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + ]; + + buildInputs = [ + xdg-desktop-portal + slurp + cairo + pango + glib + pipewire + libxkbcommon + ]; + + meta = { + description = "xdg-desktop-portal backend for wlroots based compositors, providing screenshot and screencast"; + homepage = "https://github.com/waycrate/xdg-desktop-portal-luminous"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ Rishik-Y ]; + }; +}) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix index 0fe1a24e1f09..c443f407d5cd 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix @@ -1,25 +1,36 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, meson, + rustc, + cargo, ninja, xdg-desktop-portal, }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-shana"; version = "0.3.14"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "xdg-desktop-portal-shana"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-9uie6VFyi7sO8DbthUTgpEc68MvvLA+bUwyV/DSpKkE="; }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-f9kfCoH0YHVzzZC4rChJgz0yQqVVAYR7Gpa6HuXhQZY="; + }; + nativeBuildInputs = [ meson + rustc + rustPlatform.cargoSetupHook + cargo ninja ]; @@ -27,20 +38,14 @@ rustPlatform.buildRustPackage rec { xdg-desktop-portal ]; - # Needed for letting meson run. rustPackage will overwrite it otherwise. - configurePhase = ""; - - mesonBuildType = "release"; - - useFetchCargoVendor = true; - cargoHash = "sha256-f9kfCoH0YHVzzZC4rChJgz0yQqVVAYR7Gpa6HuXhQZY="; - - meta = with lib; { + meta = { description = "Filechooser portal backend for any desktop environment"; homepage = "https://github.com/Decodetalkers/xdg-desktop-portal-shana"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.samuelefacenda ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + samuelefacenda + Rishik-Y + ]; }; - -} +}) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix index c68627a2cf37..533b5d89bf41 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix @@ -9,16 +9,17 @@ inih, systemd, scdoc, + nix-update-script, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-termfilechooser"; - version = "0.4.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hunkyburrito"; repo = "xdg-desktop-portal-termfilechooser"; - rev = "c35af27e323a492cbb3b19bdd135657ae523caef"; - hash = "sha256-9bxhKkk5YFBhR2ylcDzlvt4ltYuF174w00EJK5r3aY0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-o2FBPSJrcyAz6bJKQukj6Y5ikGpFuH1Un1qwX4w73os="; }; nativeBuildInputs = [ @@ -36,12 +37,17 @@ stdenv.mkDerivation { mesonFlags = [ "-Dsd-bus-provider=libsystemd" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "xdg-desktop-portal backend for choosing files with your favorite file chooser"; homepage = "https://github.com/hunkyburrito/xdg-desktop-portal-termfilechooser"; license = licenses.mit; platforms = platforms.linux; - maintainers = with lib.maintainers; [ body20002 ]; + maintainers = with lib.maintainers; [ + body20002 + ltrump + ]; mainProgram = "xdg-desktop-portal-termfilechooser"; }; -} +}) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix index 36d80571c5ea..268752a2a98c 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Backend implementation for xdg-desktop-portal for Cinnamon, MATE, Xfce"; homepage = "https://github.com/linuxmint/xdg-desktop-portal-xapp"; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; platforms = platforms.linux; license = licenses.lgpl21Plus; }; diff --git a/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix b/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix index 0e0b7669919a..383b36d71b90 100644 --- a/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk"; description = "Companion to xdg-user-dirs that integrates it into the GNOME desktop and GTK applications"; license = lib.licenses.gpl2Plus; - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; mainProgram = "xdg-user-dirs-gtk-update"; }; diff --git a/pkgs/by-name/xd/xdg-utils/package.nix b/pkgs/by-name/xd/xdg-utils/package.nix index 1363d081c2d4..60ab18c0e4a7 100644 --- a/pkgs/by-name/xd/xdg-utils/package.nix +++ b/pkgs/by-name/xd/xdg-utils/package.nix @@ -23,7 +23,6 @@ gnused, jq, nettools, - procmail, procps, which, xdg-user-dirs, @@ -206,28 +205,21 @@ let { scripts = [ "bin/xdg-screensaver" ]; interpreter = "${bash}/bin/bash"; - inputs = - commonDeps - ++ [ - nettools - perl - procps - ] - # procmail's funky build system is currently broken in cross-build. - # xdg-screensaver will gracefully degrade if it's not available. - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) procmail; + inputs = commonDeps ++ [ + nettools + perl + procps + ]; # These are desktop-specific, so we don't want xdg-utils to be able to # call them when in a different setup. - fake.external = - commonFakes - ++ [ - "dcop" # KDE3 - "mate-screensaver-command" # MATE - "xautolock" # Xautolock - "xscreensaver-command" # Xscreensaver - "xset" # generic-ish X - ] - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "lockfile"; # procmail + fake.external = commonFakes ++ [ + "dcop" # KDE3 + "lockfile" + "mate-screensaver-command" # MATE + "xautolock" # Xautolock + "xscreensaver-command" # Xscreensaver + "xset" # generic-ish X + ]; keep = { "$MV" = true; "$XPROP" = true; diff --git a/pkgs/by-name/xd/xdvdfs-cli/package.nix b/pkgs/by-name/xd/xdvdfs-cli/package.nix new file mode 100644 index 000000000000..8dcc9dbdf6c7 --- /dev/null +++ b/pkgs/by-name/xd/xdvdfs-cli/package.nix @@ -0,0 +1,40 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "xdvdfs-cli"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "antangelo"; + repo = "xdvdfs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-58f9eznPKeUVnUvslcm0CQPC+1xU3Zto+R56IXPBKT4="; + }; + + cargoHash = "sha256-vNCqfXsPjb3mph28YuYKpWTs9VHbIcXs6GVn4XgQKtQ="; + + cargoBuildFlags = [ "--package xdvdfs-cli" ]; + cargoTestFlags = [ "--package xdvdfs-cli" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/xdvdfs"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "xdvdfs"; + description = "Original Xbox DVD Filesystem library and management tool"; + homepage = "https://github.com/antangelo/xdvdfs"; + changelog = "https://github.com/antangelo/xdvdfs/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ federicoschonborn ]; + }; +}) diff --git a/pkgs/by-name/xe/xen-guest-agent/package.nix b/pkgs/by-name/xe/xen-guest-agent/package.nix index 0f598ac2ed0d..c9687d18a83d 100644 --- a/pkgs/by-name/xe/xen-guest-agent/package.nix +++ b/pkgs/by-name/xe/xen-guest-agent/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { homepage = "https://gitlab.com/xen-project/xen-guest-agent"; license = lib.licenses.agpl3Only; platforms = lib.platforms.unix; - maintainers = lib.teams.xen.members; + teams = [ lib.teams.xen ]; mainProgram = "xen-guest-agent"; }; } diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix index 8383d175ad1a..e5fffebe293b 100644 --- a/pkgs/by-name/xe/xen/package.nix +++ b/pkgs/by-name/xe/xen/package.nix @@ -16,6 +16,34 @@ buildXenPackage.override { inherit python3Packages; } { url = "https://xenbits.xenproject.org/xsa/xsa467.patch"; hash = "sha256-O2IwfRo6BnXAO04xjKmOyrV6J6Q1mAVLHWNCxqIEQGU="; }) + (fetchpatch { + url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-01.patch"; + hash = "sha256-YUcp9QI49RM/7WCxYzpzppv+vKtyl/NvLy6rIX5hVMw="; + }) + (fetchpatch { + url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-02.patch"; + hash = "sha256-FTtEGAPFYxsun38hLhVMKJ1TFJOsTMK3WWPkO0R/OHg="; + }) + (fetchpatch { + url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-03.patch"; + hash = "sha256-UkYMSpUgFvr4GJPXLgQsCyppGkNbeiFMyCZORK5tfmA="; + }) + (fetchpatch { + url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-04.patch"; + hash = "sha256-lpiDPSHi+v2VfaWE9kp4+hveZKTzojD1F+RHsOtKE3A="; + }) + (fetchpatch { + url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-05.patch"; + hash = "sha256-EKo9a5STX0mTRopoThe3+6gCWat+3XbguLr9QgMheZs="; + }) + (fetchpatch { + url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-06.patch"; + hash = "sha256-HU+4apyTZNIFZ9cySOEtNh0JBJDG3LjDLwMvQYq0src="; + }) + (fetchpatch { + url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-07.patch"; + hash = "sha256-9S85nkQ9Nn0cMzyRe4KGrFUaLggVxXBeKhoFF4R0y78="; + }) ]; rev = "ccf400846780289ae779c62ef0c94757ff43bb60"; hash = "sha256-s0eCBCd6ybl+kLtXCC6E1sk++w7txXn/B/Cg5acQFfY="; diff --git a/pkgs/by-name/xe/xeus/package.nix b/pkgs/by-name/xe/xeus/package.nix index b0229d7b8f00..cafcbac3a7ae 100644 --- a/pkgs/by-name/xe/xeus/package.nix +++ b/pkgs/by-name/xe/xeus/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xeus"; - version = "5.2.0"; + version = "5.2.2"; src = fetchFromGitHub { owner = "jupyter-xeus"; repo = finalAttrs.pname; tag = finalAttrs.version; - hash = "sha256-/4SVrfPU5pkO3PNrhgdCcNUts++Or7AeMqO/PorsBdw="; + hash = "sha256-nR247SGnc3TSj6PCrJmY6ccACvYKeSYFMgoawyYLBNs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/by-name/xf/xfe/package.nix similarity index 100% rename from pkgs/applications/file-managers/xfe/default.nix rename to pkgs/by-name/xf/xfe/package.nix diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix index 6489f3d4fdcf..158bddae2e63 100644 --- a/pkgs/by-name/xg/xgboost/package.nix +++ b/pkgs/by-name/xg/xgboost/package.nix @@ -48,14 +48,14 @@ effectiveStdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ xgb ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "2.1.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "dmlc"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-k1k6K11cWpG6PtzTt99q/rrkN3FyxCVEzfPI9fCTAjM="; + hash = "sha256-OwsZ1RzVi6ba+XJqFbIW1Rmqu5OVttBfcpDe84gmQxI="; }; nativeBuildInputs = @@ -88,6 +88,9 @@ effectiveStdenv.mkDerivation rec { ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ] ++ lib.optionals rLibrary [ "-DR_LIB=ON" ]; + # on Darwin, cmake uses find_library to locate R instead of using the PATH + env.NIX_LDFLAGS = "-L${R}/lib/R/lib"; + preConfigure = lib.optionals rLibrary '' substituteInPlace cmake/RPackageInstall.cmake.in --replace "CMD INSTALL" "CMD INSTALL -l $out/library" export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library" @@ -124,12 +127,14 @@ effectiveStdenv.mkDerivation rec { "Approx.PartitionerColumnSplit" "BroadcastTest.Basic" "CPUHistogram.BuildHistColSplit" + "CPUHistogram.BuildHistColumnSplit" "CPUPredictor.CategoricalPredictLeafColumnSplit" "CPUPredictor.CategoricalPredictionColumnSplit" "ColumnSplit/ColumnSplitTrainingTest*" "ColumnSplit/TestApproxColumnSplit*" "ColumnSplit/TestHistColumnSplit*" "ColumnSplitObjective/TestColumnSplit*" + "Cpu/ColumnSplitTrainingTest*" "CommGroupTest.Basic" "CommTest.Channel" "CpuPredictor.BasicColumnSplit" @@ -150,6 +155,8 @@ effectiveStdenv.mkDerivation rec { "Quantile.SortedDistributedBasic" "QuantileHist.MultiPartitionerColumnSplit" "QuantileHist.PartitionerColumnSplit" + "Stats.SampleMean" + "Stats.WeightedSampleMean" "SimpleDMatrix.ColumnSplit" "TrackerAPITest.CAPI" "TrackerTest.AfterShutdown" @@ -174,7 +181,6 @@ effectiveStdenv.mkDerivation rec { '' + '' cmake --install . - cp -r ../rabit/include/rabit $out/include runHook postInstall ''; diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index a91cba99b26e..0e00d6618b05 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - hash = "sha256-5Eq/rJ917zjlTnuxdIWhBNr8LA/ag+fyECYYX5k2S7I="; + hash = "sha256-2c96O5SL6tcPSbxx8NYxG8LDX3ZgyxEMmEeJnKDwb38="; }; useFetchCargoVendor = true; - cargoHash = "sha256-jeEhlpOl4ZiR1kQxCI3e6jacszVogzROpFC2w43BjZ0="; + cargoHash = "sha256-oncf3Hd85LgKn8KSDIBHXLJ3INzfp0X/Ng9OjAltLB4="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/pkgs/by-name/xh/xhyve/package.nix b/pkgs/by-name/xh/xhyve/package.nix new file mode 100644 index 000000000000..5d705eb3a20d --- /dev/null +++ b/pkgs/by-name/xh/xhyve/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + lib, + fetchFromGitHub, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "xhyve"; + version = "20210203"; + + src = fetchFromGitHub { + owner = "machyve"; + repo = "xhyve"; + rev = "83516a009c692ea5d2993d1071e68d05d359b11e"; + sha256 = "1pjdg4ppy6qh3vr1ls5zyw3jzcvwny9wydnmfpadwij1hvns7lj3"; + }; + + buildInputs = [ + zlib + ]; + + # Don't use git to determine version + prePatch = '' + substituteInPlace Makefile \ + --replace 'shell git describe --abbrev=6 --dirty --always --tags' "$version" + ''; + + makeFlags = [ + "CFLAGS+=-Wno-shift-sign-overflow" + ''CFLAGS+=-DVERSION=\"${version}\"'' + ]; + + installPhase = '' + mkdir -p $out/bin + cp build/xhyve $out/bin + ''; + + meta = with lib; { + description = "Lightweight Virtualization on macOS Based on bhyve"; + homepage = "https://github.com/mist64/xhyve"; + maintainers = [ maintainers.lnl7 ]; + license = licenses.bsd2; + platforms = platforms.darwin; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; + }; +} diff --git a/pkgs/by-name/xi/xidlehook/package.nix b/pkgs/by-name/xi/xidlehook/package.nix new file mode 100644 index 000000000000..9dfe095de200 --- /dev/null +++ b/pkgs/by-name/xi/xidlehook/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitLab, + python3, + xorg, + libpulseaudio, + pkg-config, + patchelf, +}: + +rustPlatform.buildRustPackage rec { + pname = "xidlehook"; + version = "0.10.0"; + + doCheck = false; + + src = fetchFromGitLab { + owner = "jD91mZM2"; + repo = "xidlehook"; + rev = version; + + sha256 = "1pl7f8fhxfcy0c6c08vkagp0x1ak96vc5wgamigrk1nkd6l371lb"; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-U1kjOWrFEp1pZnbawW2MCtC4UN7ELD/kcYWfEmn94Pg="; + + buildInputs = [ + xorg.libX11 + xorg.libXScrnSaver + libpulseaudio + ]; + nativeBuildInputs = [ + pkg-config + patchelf + python3 + ]; + + buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux; + buildFeatures = lib.optional (!stdenv.hostPlatform.isLinux) "pulse"; + + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + RPATH="$(patchelf --print-rpath $out/bin/xidlehook)" + patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook + ''; + + meta = with lib; { + description = "xautolock rewrite in Rust, with a few extra features"; + homepage = "https://github.com/jD91mZM2/xidlehook"; + license = licenses.mit; + maintainers = [ ]; + platforms = platforms.unix; + badPlatforms = platforms.darwin; + mainProgram = "xidlehook"; + }; +} diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix index 7d9433cc4221..73e497710209 100644 --- a/pkgs/by-name/xi/xiu/package.nix +++ b/pkgs/by-name/xi/xiu/package.nix @@ -1,7 +1,6 @@ { lib, cmake, - darwin, fetchFromGitHub, libopus, openssl, @@ -35,9 +34,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/xi/xivlauncher/package.nix b/pkgs/by-name/xi/xivlauncher/package.nix index f56b6fbd68c3..55b48ef9f862 100644 --- a/pkgs/by-name/xi/xivlauncher/package.nix +++ b/pkgs/by-name/xi/xivlauncher/package.nix @@ -116,7 +116,7 @@ buildDotnetModule rec { homepage = "https://github.com/goatcorp/XIVLauncher.Core"; license = licenses.gpl3; maintainers = with maintainers; [ - sersorrel + keysmashes witchof0x20 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix index d257b6ade9c6..19ea1a1e4499 100644 --- a/pkgs/by-name/xk/xk6/package.nix +++ b/pkgs/by-name/xk/xk6/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "xk6"; - version = "0.15.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "grafana"; repo = "xk6"; tag = "v${version}"; - hash = "sha256-sRrzsxMm6e4qIcW4+Ok/Dlccbzd0xmRskXPJ+frmXjA="; + hash = "sha256-RVuHGvoXQ9tAUEYTGK03Qjkgl3WCbFqbqt2rkPP6MYs="; }; vendorHash = null; diff --git a/pkgs/by-name/xl/xl2tpd/package.nix b/pkgs/by-name/xl/xl2tpd/package.nix index 9921812ed5cc..f6b9abecb94b 100644 --- a/pkgs/by-name/xl/xl2tpd/package.nix +++ b/pkgs/by-name/xl/xl2tpd/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "xl2tpd"; - version = "1.3.18"; + version = "1.3.19"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "sha256-Uc3PeTf/ow9p8noPcMLdT6S5dks9igDU6CC9koy+ff4="; + sha256 = "sha256-Oyy64b5xrKOYSkiCtWksh0vKGDXHsmUNlNgVTRXftOw="; }; buildInputs = [ libpcap ]; diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index 7ce354eb2e93..c7251e5f3843 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2025.04"; + version = "2025.05"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-YpFOQs+fDHTTWOkkw8dqKoFOVO998/nq2PUOjjA303A="; + hash = "sha256-uutiM/kLsvNdDi08e5DyyTYGYwUe4UZMyTS1P0ijUP0="; }; meta = { diff --git a/pkgs/by-name/xl/xlockmore/package.nix b/pkgs/by-name/xl/xlockmore/package.nix index f41eb013d93a..857e200f4bac 100644 --- a/pkgs/by-name/xl/xlockmore/package.nix +++ b/pkgs/by-name/xl/xlockmore/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.81"; + version = "5.82"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-BTAYEyinxmi217JMDPoyqpO0u64jwMTwnx07NH7Jipc="; + sha256 = "sha256-1pB43ywLfflQLg2PooSTKwWSepcrYo16tnyJwG/mt7I="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/by-name/xl/xlog/package.nix b/pkgs/by-name/xl/xlog/package.nix index 5b3d66411233..a424c48df43f 100644 --- a/pkgs/by-name/xl/xlog/package.nix +++ b/pkgs/by-name/xl/xlog/package.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { version = "2.0.25"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz"; - sha256 = "sha256-NYC3LgoLXnJQURcZTc2xHOzOleotrWtOETMBgadf2qU="; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-NYC3LgoLXnJQURcZTc2xHOzOleotrWtOETMBgadf2qU="; }; # glib-2.62 deprecations diff --git a/pkgs/by-name/xl/xlsxsql/package.nix b/pkgs/by-name/xl/xlsxsql/package.nix index 21b98b2ade6e..55de4d353cd5 100644 --- a/pkgs/by-name/xl/xlsxsql/package.nix +++ b/pkgs/by-name/xl/xlsxsql/package.nix @@ -45,7 +45,7 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xm/xmage/package.nix b/pkgs/by-name/xm/xmage/package.nix index 31b4b0aa883c..5dfb04c6b195 100644 --- a/pkgs/by-name/xm/xmage/package.nix +++ b/pkgs/by-name/xm/xmage/package.nix @@ -8,25 +8,28 @@ stdenv.mkDerivation (finalAttrs: { pname = "xmage"; - version = "1.4.51-dev_2024-01-30_19-35"; + version = "1.4.57-dev_2025-04-19_14-28"; src = fetchurl { url = "http://xmage.today/files/mage-full_${finalAttrs.version}.zip"; - sha256 = "sha256-ogi0hd2FoulTnc3gg5cpLwr4Jln71YA0WBBZFOT6apg="; + sha256 = "sha256-EeaUd81fqiPDqHiMP86E9gtdFi545PIBfCgb1i5Z5i0="; }; preferLocalBuild = true; + nativeBuildInputs = [ unzrip ]; + + sourceRoot = "source"; + unpackPhase = '' - ${unzrip}/bin/unzrip $src + runHook preUnpack + unzrip $src -d "$sourceRoot" + runHook postUnpack ''; installPhase = let - # upstream maintainers forgot to update version, so manual override for now - # strVersion = lib.substring 0 6 finalAttrs.version; - strVersion = "1.4.50"; - + strVersion = lib.substring 0 6 finalAttrs.version; in '' mkdir -p $out/bin diff --git a/pkgs/by-name/xm/xmake/package.nix b/pkgs/by-name/xm/xmake/package.nix new file mode 100644 index 000000000000..f641be01c91f --- /dev/null +++ b/pkgs/by-name/xm/xmake/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + fetchurl, + nix-update-script, +}: +stdenv.mkDerivation rec { + pname = "xmake"; + version = "2.9.9"; + src = fetchurl { + url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; + hash = "sha256-6SUFuDvJd2KG6ucZ1YvOp/8ld6/hLLXMsnnIHn28cC0="; + }; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Cross-platform build utility based on Lua"; + homepage = "https://xmake.io"; + license = licenses.asl20; + maintainers = with maintainers; [ + rewine + rennsax + ]; + }; +} diff --git a/pkgs/by-name/xm/xmcp/package.nix b/pkgs/by-name/xm/xmcp/package.nix index 26f4dcf7a5db..c2373f423f02 100644 --- a/pkgs/by-name/xm/xmcp/package.nix +++ b/pkgs/by-name/xm/xmcp/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "Tiny color picker for X11"; homepage = "https://github.com/blblapco/xmcp"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "xmcp"; }; diff --git a/pkgs/by-name/xm/xmedcon/package.nix b/pkgs/by-name/xm/xmedcon/package.nix index 73fef5dbaea2..18cc7aa471fe 100644 --- a/pkgs/by-name/xm/xmedcon/package.nix +++ b/pkgs/by-name/xm/xmedcon/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmedcon"; - version = "0.25.1"; + version = "0.25.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-WKyX65LQe/UbaE6jQi36kTgi4IXjgY1ZkE1aPQ+o0Tk="; + sha256 = "sha256-vg14IRLukAOBtAE32AIyXTRzLzwKCGsvIFYRas/hyNs="; }; buildInputs = [ diff --git a/pkgs/by-name/xm/xmind/java-env-config-fixes.patch b/pkgs/by-name/xm/xmind/java-env-config-fixes.patch deleted file mode 100644 index f359a9c2ba46..000000000000 --- a/pkgs/by-name/xm/xmind/java-env-config-fixes.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/XMind_amd64/XMind.ini b/XMind_amd64/XMind.ini -index bdd8a37..5f35daf 100644 ---- a/XMind_amd64/XMind.ini -+++ b/XMind_amd64/XMind.ini -@@ -1,11 +1,11 @@ - -configuration --./configuration -+@user.home/.xmind/configuration-cathy_linux_64 - -data --../workspace -+@user.home/.xmind/workspace-cathy - -startup --../plugins/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar -+plugins/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar - --launcher.library --../plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.400.v20160518-1444 -+plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.400.v20160518-1444 - --launcher.defaultAction - openFile - --launcher.GTK_version -diff --git a/XMind_i386/XMind.ini b/XMind_i386/XMind.ini -index 4ed3225..1d74258 100644 ---- a/XMind_i386/XMind.ini -+++ b/XMind_i386/XMind.ini -@@ -1,11 +1,11 @@ - -configuration --./configuration -+@user.home/.xmind/configuration-cathy_linux_64 - -data --../workspace -+@user.home/.xmind/workspace-cathy - -startup --../plugins/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar -+plugins/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar - --launcher.library --../plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.400.v20160518-1444 -+plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.400.v20160518-1444 - --launcher.defaultAction - openFile - --launcher.GTK_version diff --git a/pkgs/by-name/xm/xmind/package.nix b/pkgs/by-name/xm/xmind/package.nix index d40709c05ea0..52d03207c56a 100644 --- a/pkgs/by-name/xm/xmind/package.nix +++ b/pkgs/by-name/xm/xmind/package.nix @@ -1,114 +1,101 @@ { - stdenv, lib, - fetchzip, + stdenv, fetchurl, + dpkg, + autoPatchelfHook, + glib, + at-spi2-atk, + cairo, + pango, gtk3, - jre8, - libXtst, - makeWrapper, - makeDesktopItem, - runtimeShell, + nss, + nspr, + cups, + dbus, + libdrm, + libxkbcommon, + alsa-lib, + expat, + xorg, + libgbm, + systemd, + libGL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xmind"; - version = "8-update9"; + version = "25.01.01061-202501070800"; - src = fetchzip { - url = "https://www.xmind.app/xmind/downloads/${pname}-${version}-linux.zip"; - stripRoot = false; - sha256 = "9769c4a9d42d3370ed2c2d1bed5a5d78f1fc3dc5bd604b064b56101fc7f90bb4"; + src = fetchurl { + url = "https://dl3.xmind.app/Xmind-for-Linux-amd64bit-${finalAttrs.version}.deb"; + hash = "sha256-Mp2aC/yHoB29t9QY4Tnbgn//J8Gordt5S1JrJn0BvXg="; }; - srcIcon = fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/xmind.png?h=xmind&id=41936c866b244b34d7dfbee373cbb835eed7860b"; - sha256 = "0jxq2fiq69q9ly0m6hx2qfybqad22sl42ciw636071khpqgc885f"; - }; - - preferLocalBuild = true; - - patches = [ ./java-env-config-fixes.patch ]; - - nativeBuildInputs = [ makeWrapper ]; - - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - libPath = lib.makeLibraryPath [ - gtk3 - libXtst + nativeBuildInputs = [ + dpkg + autoPatchelfHook ]; - desktopItem = makeDesktopItem { - name = "XMind"; - exec = "XMind"; - icon = "xmind"; - desktopName = "XMind"; - comment = meta.description; - categories = [ "Office" ]; - mimeTypes = [ - "application/xmind" - "x-scheme-handler/xmind" - ]; + buildInputs = [ + (lib.getLib stdenv.cc.cc) + xorg.libX11 + xorg.libXext + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXfixes + xorg.libXrandr + xorg.libxkbfile + glib + at-spi2-atk + cairo + pango + gtk3 + nss + nspr + cups + dbus + libdrm + libxkbcommon + alsa-lib + expat + libgbm + ]; + + runtimeDependencies = map lib.getLib [ + systemd + ]; + + installPhase = '' + runHook preInstall + + cp -r usr $out + substituteInPlace $out/share/applications/xmind.desktop \ + --replace-fail "/opt/Xmind/xmind" "/opt/Xmind/" + mkdir -p $out/opt $out/bin + cp -r opt/Xmind $out/opt/xmind + ln -s $out/opt/xmind/xmind $out/bin/xmind + + runHook postInstall + ''; + + preFixup = '' + patchelf --add-needed libGL.so.1 \ + --add-rpath ${ + lib.makeLibraryPath [ + libGL + ] + } $out/opt/xmind/xmind + ''; + + meta = { + description = "All-in-one thinking tool featuring mind mapping, AI generation, and real-time collaboration"; + homepage = "https://xmind.app"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "xmind"; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ michalrus ]; }; - - installPhase = - let - targetDir = if stdenv.hostPlatform.system == "i686-linux" then "XMind_i386" else "XMind_amd64"; - in - '' - mkdir -p $out/{bin,libexec/configuration/,share/{applications/,fonts/,icons/hicolor/scalable/apps/}} - cp -r ${targetDir}/{configuration,p2,XMind{,.ini}} $out/libexec - cp -r {plugins,features} $out/libexec/ - cp -r fonts $out/share/fonts/ - cp "${desktopItem}/share/applications/XMind.desktop" $out/share/applications/XMind.desktop - cp ${srcIcon} $out/share/icons/hicolor/scalable/apps/xmind.png - - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - $out/libexec/XMind - - wrapProgram $out/libexec/XMind \ - --prefix LD_LIBRARY_PATH : "${libPath}" - - # Inspired by https://aur.archlinux.org/cgit/aur.git/tree/?h=xmind - cat >$out/bin/XMind </doc/COPYING also lists "Expat license", - # "ABYSS Web Server License" and "Python 1.5.2 License" + # /doc/COPYING also lists "ABYSS Web Server License" and "Python 1.5.2 License" license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/by-name/xm/xmlsec/package.nix b/pkgs/by-name/xm/xmlsec/package.nix index 80a6ed8b6ea7..f1b8f9b472e3 100644 --- a/pkgs/by-name/xm/xmlsec/package.nix +++ b/pkgs/by-name/xm/xmlsec/package.nix @@ -21,8 +21,13 @@ lib.fix ( version = "1.3.7"; src = fetchurl { - url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "sha256-2C6TtpuKogWmFrYpF6JpMiv2Oj6q+zd1AU5hdSsgE+o="; + urls = [ + "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz" + + # for when the ${version} gets older than the last two + "https://www.aleksey.com/xmlsec/download/older-releases/xmlsec1-${version}.tar.gz" + ]; + hash = "sha256-2C6TtpuKogWmFrYpF6JpMiv2Oj6q+zd1AU5hdSsgE+o="; }; patches = [ diff --git a/pkgs/by-name/xm/xmp/package.nix b/pkgs/by-name/xm/xmp/package.nix new file mode 100644 index 000000000000..f0b88dea3bed --- /dev/null +++ b/pkgs/by-name/xm/xmp/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + alsa-lib, + libxmp, +}: + +stdenv.mkDerivation rec { + pname = "xmp"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "libxmp"; + repo = "xmp-cli"; + rev = "${pname}-${version}"; + hash = "sha256-037k1rFjGR6XFtr08bzs4zVz+GyUGuuutuWFlNEuATA="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ libxmp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; + + meta = with lib; { + description = "Extended module player"; + homepage = "https://xmp.sourceforge.net/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + mainProgram = "xmp"; + }; +} diff --git a/pkgs/by-name/xn/xnotify/package.nix b/pkgs/by-name/xn/xnotify/package.nix index 5dcbfb56024b..969a76eacd7b 100644 --- a/pkgs/by-name/xn/xnotify/package.nix +++ b/pkgs/by-name/xn/xnotify/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/phillbush/xnotify"; license = licenses.mit; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "xnotify"; }; diff --git a/pkgs/by-name/xn/xnviewmp/package.nix b/pkgs/by-name/xn/xnviewmp/package.nix new file mode 100644 index 000000000000..d696aa854a81 --- /dev/null +++ b/pkgs/by-name/xn/xnviewmp/package.nix @@ -0,0 +1,67 @@ +{ + appimageTools, + fetchurl, + runCommand, + lib, + makeDesktopItem, + copyDesktopItems, + imagemagick, +}: +let + icon = + runCommand "xnviewmp-icon.png" + { + nativeBuildInputs = [ imagemagick ]; + src = fetchurl { + url = "https://www.xnview.com/img/app-xnsoft-360.webp"; + hash = "sha256-wIzF/WOsPcrYFYC/kGZi6FSJFuErci5EMONjrx1VCdQ="; + }; + } + '' + convert $src $out + ''; +in +appimageTools.wrapType2 rec { + pname = "xnviewmp"; + version = "1.8.8"; + + src = fetchurl { + url = "https://download.xnview.com/old_versions/XnView_MP/XnView_MP-${version}.glibc2.17-x86_64.AppImage"; + hash = "sha256-zPlb2r+oKNq1iv8dAWE/wbXtKAf3A+XOsSOkciHM6OA="; + }; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = "xnviewmp"; + desktopName = "XnView MP"; + exec = "xnviewmp %F"; + icon = "xnviewmp"; + comment = "An efficient multimedia viewer, browser and converter"; + categories = [ "Graphics" ]; + }) + ]; + + extraPkgs = pkgs: [ + pkgs.qt5.qtbase + ]; + + extraInstallCommands = '' + install -m 444 -D ${icon} $out/share/icons/hicolor/512x512/apps/xnviewmp.png + ''; + + meta = { + description = "Efficient multimedia viewer, browser and converter"; + changelog = "https://www.xnview.com/mantisbt/changelog_page.php"; + homepage = "https://www.xnview.com/en/xnviewmp/"; + downloadPage = "https://download.xnview.com/old_versions/XnView_MP/"; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + license = lib.licenses.unfree; + mainProgram = "xnviewmp"; + maintainers = with lib.maintainers; [ oddlama ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/xo/xo/package.nix b/pkgs/by-name/xo/xo/package.nix index c0cf53f2651c..8b48b7af165e 100644 --- a/pkgs/by-name/xo/xo/package.nix +++ b/pkgs/by-name/xo/xo/package.nix @@ -44,7 +44,7 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xp/xpad/package.nix b/pkgs/by-name/xp/xpad/package.nix index 42eb4fc6ccf8..1430aa34d13f 100644 --- a/pkgs/by-name/xp/xpad/package.nix +++ b/pkgs/by-name/xp/xpad/package.nix @@ -8,16 +8,16 @@ glib, intltool, gtk3, - gtksourceview, + gtksourceview4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xpad"; - version = "5.4.0"; + version = "5.8.0"; src = fetchurl { - url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2"; - sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; + url = "https://launchpad.net/xpad/trunk/${finalAttrs.version}/+download/xpad-${finalAttrs.version}.tar.bz2"; + hash = "sha256-8mBSMIhQxAaxWtuNhqzTli7xCvIrQnuxpc/07slvguk="; }; nativeBuildInputs = [ @@ -30,15 +30,15 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - gtksourceview + gtksourceview4 ]; - meta = with lib; { + meta = { description = "Sticky note application for jotting down things to remember"; mainProgram = "xpad"; homepage = "https://launchpad.net/xpad"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ michalrus ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ michalrus ]; }; -} +}) diff --git a/pkgs/by-name/xp/xplorer/Cargo.lock b/pkgs/by-name/xp/xplorer/Cargo.lock deleted file mode 100644 index d0ca3bf679f5..000000000000 --- a/pkgs/by-name/xp/xplorer/Cargo.lock +++ /dev/null @@ -1,4672 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "aho-corasick" -version = "0.7.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" - -[[package]] -name = "app" -version = "0.1.0" -dependencies = [ - "bincode", - "clap", - "font-loader", - "glob", - "lazy_static", - "normpath", - "notify", - "open 2.1.3", - "parselnk", - "path-absolutize", - "reqwest", - "serde", - "serde_json", - "sysinfo", - "tauri", - "tauri-build", - "tauri-plugin-window-state", - "tokio", - "trash", - "url", - "window-shadows", - "window-vibrancy", - "zip", -] - -[[package]] -name = "atk" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" -dependencies = [ - "atk-sys", - "bitflags", - "glib", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.2", -] - -[[package]] -name = "attohttpc" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" -dependencies = [ - "flate2", - "http", - "log", - "native-tls", - "serde", - "serde_json", - "serde_urlencoded", - "url", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "base64ct" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -dependencies = [ - "generic-array", -] - -[[package]] -name = "brotli" -version = "3.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "memchr", -] - -[[package]] -name = "bumpalo" -version = "3.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" - -[[package]] -name = "bytemuck" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" - -[[package]] -name = "bzip2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "cairo-rs" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" -dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.0.2", -] - -[[package]] -name = "cargo_toml" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72c3ff59e3b7d24630206bb63a73af65da4ed5df1f76ee84dfafb9fee2ba60e" -dependencies = [ - "serde", - "serde_derive", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfb" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" -dependencies = [ - "byteorder", - "uuid 0.8.2", -] - -[[package]] -name = "cfg-expr" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-expr" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db" -dependencies = [ - "smallvec", -] - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time 0.1.44", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" -dependencies = [ - "atty", - "bitflags", - "clap_lex", - "indexmap", - "strsim", - "termcolor", - "textwrap", -] - -[[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 = "cmake" -version = "0.1.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" -dependencies = [ - "cc", -] - -[[package]] -name = "cocoa" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" -dependencies = [ - "bitflags", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" -dependencies = [ - "bitflags", - "core-foundation", - "foreign-types", - "libc", -] - -[[package]] -name = "core-text" -version = "19.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" -dependencies = [ - "core-foundation", - "core-graphics", - "foreign-types", - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "ctor" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "dbus" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8bcdd56d2e5c4ed26a529c5a9029f5db8290d433497506f958eae3be148eb6" -dependencies = [ - "libc", - "libdbus-sys", - "winapi 0.3.9", -] - -[[package]] -name = "deflate" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn", -] - -[[package]] -name = "digest" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "dtoa-short" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" -dependencies = [ - "dtoa", -] - -[[package]] -name = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] -name = "embed_plist" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" - -[[package]] -name = "encoding_rs" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "field-offset" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" -dependencies = [ - "memoffset", - "rustc_version 0.3.3", -] - -[[package]] -name = "filetime" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "windows-sys 0.36.1", -] - -[[package]] -name = "flate2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "font-loader" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c49d6b4c11dca1a1dd931a34a9f397e2da91abe3de4110505f3530a80e560b52" -dependencies = [ - "core-foundation", - "core-text", - "libc", - "servo-fontconfig", - "winapi 0.3.9", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "freetype-sys" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", -] - -[[package]] -name = "fsevent" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" -dependencies = [ - "bitflags", - "fsevent-sys", -] - -[[package]] -name = "fsevent-sys" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" -dependencies = [ - "libc", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures-channel" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" - -[[package]] -name = "futures-executor" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" - -[[package]] -name = "futures-macro" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" - -[[package]] -name = "futures-task" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" - -[[package]] -name = "futures-util" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" -dependencies = [ - "futures-core", - "futures-macro", - "futures-task", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" -dependencies = [ - "bitflags", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.2", -] - -[[package]] -name = "gdk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps 6.0.2", -] - -[[package]] -name = "gdkx11-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" -dependencies = [ - "gdk-sys", - "glib-sys", - "libc", - "system-deps 6.0.2", - "x11", -] - -[[package]] -name = "generator" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc184cace1cea8335047a471cc1da80f18acf8a76f3bab2028d499e328948ec7" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.32.0", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gio" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.2", - "winapi 0.3.9", -] - -[[package]] -name = "glib" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" -dependencies = [ - "anyhow", - "heck 0.4.0", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "glib-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" -dependencies = [ - "libc", - "system-deps 6.0.2", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "globset" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "gobject-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.0.2", -] - -[[package]] -name = "gtk" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" -dependencies = [ - "atk", - "bitflags", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps 6.0.2", -] - -[[package]] -name = "gtk3-macros" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "h2" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[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 = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "html5ever" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.4", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http-range" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "hyper" -version = "0.14.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa 1.0.4", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd911b35d940d2bd0bea0f9100068e5b97b51a1cbe13d13382f132e0365257a0" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[package]] -name = "ico" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804" -dependencies = [ - "byteorder", - "png 0.11.0", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" -dependencies = [ - "crossbeam-utils", - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-rational", - "num-traits", -] - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "infer" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" -dependencies = [ - "cfb", -] - -[[package]] -name = "inflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4" -dependencies = [ - "adler32", -] - -[[package]] -name = "inotify" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" -dependencies = [ - "bitflags", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "ipnet" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "javascriptcore-rs" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" -dependencies = [ - "bitflags", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json-patch" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f995a3c8f2bc3dd52a18a583e90f9ec109c047fa1603a853e46bcda14d2e279d" -dependencies = [ - "serde", - "serde_json", - "treediff", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "kuchiki" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" -dependencies = [ - "cssparser", - "html5ever", - "matches", - "selectors", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.134" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" - -[[package]] -name = "libdbus-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if 1.0.0", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "mac-notification-sys" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" -dependencies = [ - "cc", - "dirs-next", - "objc-foundation", - "objc_id", - "time 0.3.15", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log", - "phf 0.8.0", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "minisign-verify" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" - -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "mio" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.36.1", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio 0.6.23", - "slab", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "native-tls" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags", - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "net2" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "normpath" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04aaf5e9cb0fbf883cc0423159eacdf96a9878022084b35c462c428cab73bcaf" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "notify" -version = "4.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" -dependencies = [ - "bitflags", - "filetime", - "fsevent", - "fsevent-sys", - "inotify", - "libc", - "mio 0.6.23", - "mio-extras", - "walkdir", - "winapi 0.3.9", -] - -[[package]] -name = "notify-rust" -version = "4.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368e89ea58df747ce88be669ae44e79783c1d30bfd540ad0fc520b3f41f0b3b0" -dependencies = [ - "dbus", - "mac-notification-sys", - "tauri-winrt-notification", -] - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi 0.3.9", -] - -[[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 = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "once_cell" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "open" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2423ffbf445b82e58c3b1543655968923dd06f85432f10be2bb4f1b7122f98c" -dependencies = [ - "pathdiff", - "windows-sys 0.36.1", -] - -[[package]] -name = "open" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a3100141f1733ea40b53381b0ae3117330735ef22309a190ac57b9576ea716" -dependencies = [ - "pathdiff", - "windows-sys 0.36.1", -] - -[[package]] -name = "openssl" -version = "0.10.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "os_info" -version = "3.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" -dependencies = [ - "log", - "serde", - "winapi 0.3.9", -] - -[[package]] -name = "os_pipe" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dceb7e43f59c35ee1548045b2c72945a5a3bb6ce6d6f07cdc13dc8f6bc4930a" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "os_str_bytes" -version = "6.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pango" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" -dependencies = [ - "bitflags", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.2", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.36.1", -] - -[[package]] -name = "parselnk" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0088616e6efe53ab79907b9313f4743eb3f8a16eb1e0014af810164808906dc3" -dependencies = [ - "bitflags", - "byteorder", - "chrono", - "thiserror", - "widestring", -] - -[[package]] -name = "password-hash" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" - -[[package]] -name = "path-absolutize" -version = "3.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3de4b40bd9736640f14c438304c09538159802388febb02c8abaae0846c1f13" -dependencies = [ - "path-dedot", -] - -[[package]] -name = "path-dedot" -version = "3.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d611d5291372b3738a34ebf0d1f849e58b1dcc1101032f76a346eaa1f8ddbb5b" -dependencies = [ - "once_cell", -] - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pbkdf2" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pest" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_macros 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_macros 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "phf_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - -[[package]] -name = "plist" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" -dependencies = [ - "base64", - "indexmap", - "line-wrap", - "serde", - "time 0.3.15", - "xml-rs", -] - -[[package]] -name = "png" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925" -dependencies = [ - "bitflags", - "deflate", - "inflate", - "num-iter", -] - -[[package]] -name = "png" -version = "0.17.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c" -dependencies = [ - "bitflags", - "crc32fast", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-crate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" -dependencies = [ - "once_cell", - "thiserror", - "toml", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro2" -version = "1.0.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-xml" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.7", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" -dependencies = [ - "cty", -] - -[[package]] -name = "rayon" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.7", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "reqwest" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" -dependencies = [ - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "rfd" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" -dependencies = [ - "block", - "dispatch", - "glib-sys", - "gobject-sys", - "gtk-sys", - "js-sys", - "lazy_static", - "log", - "objc", - "objc-foundation", - "objc_id", - "raw-window-handle", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows 0.37.0", -] - -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.14", -] - -[[package]] -name = "rustversion" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -dependencies = [ - "lazy_static", - "windows-sys 0.36.1", -] - -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags", - "cssparser", - "derive_more", - "fxhash", - "log", - "matches", - "phf 0.8.0", - "phf_codegen", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" -dependencies = [ - "serde", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] -name = "serde" -version = "1.0.145" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.145" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" -dependencies = [ - "itoa 1.0.4", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.4", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" -dependencies = [ - "serde", - "serde_with_macros", -] - -[[package]] -name = "serde_with_macros" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serialize-to-javascript" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" -dependencies = [ - "serde", - "serde_json", - "serialize-to-javascript-impl", -] - -[[package]] -name = "serialize-to-javascript-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "servo-fontconfig" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shared_child" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "slab" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "soup2" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" -dependencies = [ - "bitflags", - "gio", - "glib", - "libc", - "once_cell", - "soup2-sys", -] - -[[package]] -name = "soup2-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" -dependencies = [ - "bitflags", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "state" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" -dependencies = [ - "loom", -] - -[[package]] -name = "string_cache" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sysinfo" -version = "0.23.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3977ec2e0520829be45c8a2df70db2bf364714d8a748316a10c3c35d4d2b01c9" -dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "winapi 0.3.9", -] - -[[package]] -name = "system-deps" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" -dependencies = [ - "cfg-expr 0.9.1", - "heck 0.3.3", - "pkg-config", - "toml", - "version-compare 0.0.11", -] - -[[package]] -name = "system-deps" -version = "6.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" -dependencies = [ - "cfg-expr 0.10.3", - "heck 0.4.0", - "pkg-config", - "toml", - "version-compare 0.1.0", -] - -[[package]] -name = "tao" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43336f5d1793543ba96e2a1e75f3a5c7dcd592743be06a0ab3a190f4fcb4b934" -dependencies = [ - "bitflags", - "cairo-rs", - "cc", - "cocoa", - "core-foundation", - "core-graphics", - "crossbeam-channel", - "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", - "gdkx11-sys", - "gio", - "glib", - "glib-sys", - "gtk", - "image", - "instant", - "jni", - "lazy_static", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "paste", - "png 0.17.6", - "raw-window-handle", - "scopeguard", - "serde", - "unicode-segmentation", - "uuid 1.1.2", - "windows 0.39.0", - "windows-implement", - "x11-dl", -] - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tauri" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbf22abd61d95ca9b2becd77f9db4c093892f73e8a07d21d8b0b2bf71a7bcea" -dependencies = [ - "anyhow", - "attohttpc", - "base64", - "cocoa", - "dirs-next", - "embed_plist", - "encoding_rs", - "flate2", - "futures-util", - "glib", - "glob", - "gtk", - "heck 0.4.0", - "http", - "ignore", - "minisign-verify", - "notify-rust", - "objc", - "once_cell", - "open 3.0.3", - "os_info", - "os_pipe", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "regex", - "rfd", - "semver 1.0.14", - "serde", - "serde_json", - "serde_repr", - "serialize-to-javascript", - "shared_child", - "state", - "tar", - "tauri-macros", - "tauri-runtime", - "tauri-runtime-wry", - "tauri-utils", - "tempfile", - "thiserror", - "time 0.3.15", - "tokio", - "url", - "uuid 1.1.2", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "zip", -] - -[[package]] -name = "tauri-build" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0991fb306849897439dbd4a72e4cbed2413e2eb26cb4b3ba220b94edba8b4b88" -dependencies = [ - "anyhow", - "cargo_toml", - "heck 0.4.0", - "json-patch", - "semver 1.0.14", - "serde_json", - "tauri-utils", - "winres", -] - -[[package]] -name = "tauri-codegen" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356fa253e40ae4d6ff02075011f2f2bb4066f5c9d8c1e16ca6912d7b75903ba6" -dependencies = [ - "base64", - "brotli", - "ico", - "json-patch", - "plist", - "png 0.17.6", - "proc-macro2", - "quote", - "regex", - "semver 1.0.14", - "serde", - "serde_json", - "sha2", - "tauri-utils", - "thiserror", - "time 0.3.15", - "uuid 1.1.2", - "walkdir", -] - -[[package]] -name = "tauri-macros" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6051fd6940ddb22af452340d03c66a3e2f5d72e0788d4081d91e31528ccdc4d" -dependencies = [ - "heck 0.4.0", - "proc-macro2", - "quote", - "syn", - "tauri-codegen", - "tauri-utils", -] - -[[package]] -name = "tauri-plugin-window-state" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/tauri-plugin-window-state#ccb9436ba7bc8d5c1ee6a3287f947b6e0264af36" -dependencies = [ - "bincode", - "serde", - "tauri", - "thiserror", -] - -[[package]] -name = "tauri-runtime" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49439a5ea47f474572b854972f42eda2e02a470be5ca9609cc83bb66945abe2" -dependencies = [ - "gtk", - "http", - "http-range", - "infer", - "rand 0.8.5", - "raw-window-handle", - "serde", - "serde_json", - "tauri-utils", - "thiserror", - "uuid 1.1.2", - "webview2-com", - "windows 0.39.0", -] - -[[package]] -name = "tauri-runtime-wry" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dce920995fd49907aa9bea7249ed1771454f11f7611924c920a1f75fb614d4" -dependencies = [ - "cocoa", - "gtk", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "tauri-runtime", - "tauri-utils", - "uuid 1.1.2", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "wry", -] - -[[package]] -name = "tauri-utils" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8fdae6f29cef959809a3c3afef510c5b715a446a597ab8b791497585363f39" -dependencies = [ - "brotli", - "ctor", - "glob", - "heck 0.4.0", - "html5ever", - "json-patch", - "kuchiki", - "memchr", - "phf 0.10.1", - "proc-macro2", - "quote", - "semver 1.0.14", - "serde", - "serde_json", - "serde_with", - "thiserror", - "url", - "walkdir", - "windows 0.39.0", -] - -[[package]] -name = "tauri-winrt-notification" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b" -dependencies = [ - "quick-xml", - "strum", - "windows 0.39.0", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] -name = "thiserror" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" -dependencies = [ - "itoa 1.0.4", - "libc", - "num_threads", - "time-macros", -] - -[[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio 0.8.4", - "num_cpus", - "parking_lot", - "pin-project-lite", - "socket2", - "tokio-macros", - "winapi 0.3.9", -] - -[[package]] -name = "tokio-macros" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if 1.0.0", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "trash" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe090367848cd40c4230ff3ce4e2ff6a2fd511c1e14ae047a4a4c37ef7965236" -dependencies = [ - "chrono", - "libc", - "log", - "objc", - "once_cell", - "scopeguard", - "url", - "windows 0.37.0", -] - -[[package]] -name = "treediff" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff" -dependencies = [ - "serde_json", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" - -[[package]] -name = "uuid" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" -dependencies = [ - "getrandom 0.2.7", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-compare" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" - -[[package]] -name = "version-compare" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "web-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webkit2gtk" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29952969fb5e10fe834a52eb29ad0814ccdfd8387159b0933edf1344a1c9cdcc" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup2", - "webkit2gtk-sys", -] - -[[package]] -name = "webkit2gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" -dependencies = [ - "atk-sys", - "bitflags", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pango-sys", - "pkg-config", - "soup2-sys", - "system-deps 6.0.2", -] - -[[package]] -name = "webview2-com" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "webview2-com-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "webview2-com-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" -dependencies = [ - "regex", - "serde", - "serde_json", - "thiserror", - "windows 0.39.0", - "windows-bindgen", - "windows-metadata", -] - -[[package]] -name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "window-shadows" -version = "0.2.0" -source = "git+https://github.com/tauri-apps/window-shadows#8a3defc797f3a5b83eb68a0f9cd86ab6fe59ae7f" -dependencies = [ - "cocoa", - "objc", - "raw-window-handle", - "windows-sys 0.42.0", -] - -[[package]] -name = "window-vibrancy" -version = "0.3.0" -source = "git+https://github.com/tauri-apps/window-vibrancy#2eccb51ef7643edf5e15088693cb0b85aef5096e" -dependencies = [ - "cocoa", - "objc", - "raw-window-handle", - "windows-sys 0.42.0", -] - -[[package]] -name = "windows" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec" -dependencies = [ - "windows_aarch64_msvc 0.32.0", - "windows_i686_gnu 0.32.0", - "windows_i686_msvc 0.32.0", - "windows_x86_64_gnu 0.32.0", - "windows_x86_64_msvc 0.32.0", -] - -[[package]] -name = "windows" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" -dependencies = [ - "windows_aarch64_msvc 0.37.0", - "windows_i686_gnu 0.37.0", - "windows_i686_msvc 0.37.0", - "windows_x86_64_gnu 0.37.0", - "windows_x86_64_msvc 0.37.0", -] - -[[package]] -name = "windows" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" -dependencies = [ - "windows-implement", - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", -] - -[[package]] -name = "windows-bindgen" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" -dependencies = [ - "windows-metadata", - "windows-tokens", -] - -[[package]] -name = "windows-implement" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" -dependencies = [ - "syn", - "windows-tokens", -] - -[[package]] -name = "windows-metadata" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", -] - -[[package]] -name = "windows-tokens" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" - -[[package]] -name = "windows_i686_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" - -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" - -[[package]] -name = "windows_i686_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" - -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" - -[[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_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml", -] - -[[package]] -name = "wry" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff5c1352b4266fdf92c63479d2f58ab4cd29dc4e78fbc1b62011ed1227926945" -dependencies = [ - "base64", - "block", - "cocoa", - "core-graphics", - "crossbeam-channel", - "gdk", - "gio", - "glib", - "gtk", - "html5ever", - "http", - "kuchiki", - "libc", - "log", - "objc", - "objc_id", - "once_cell", - "serde", - "serde_json", - "sha2", - "tao", - "thiserror", - "url", - "webkit2gtk", - "webkit2gtk-sys", - "webview2-com", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "x11" -version = "2.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ae97874a928d821b061fce3d1fc52f08071dd53c89a6102bc06efcac3b2908" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-dl" -version = "2.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6" -dependencies = [ - "lazy_static", - "libc", - "pkg-config", -] - -[[package]] -name = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" - -[[package]] -name = "zip" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf225bcf73bb52cbb496e70475c7bd7a3f769df699c0020f6c7bd9a96dcf0b8d" -dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time 0.3.15", - "zstd", -] - -[[package]] -name = "zstd" -version = "0.10.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "4.1.6+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "1.6.3+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" -dependencies = [ - "cc", - "libc", -] diff --git a/pkgs/by-name/xp/xplorer/package.nix b/pkgs/by-name/xp/xplorer/package.nix index 72502300e456..59e50baec034 100644 --- a/pkgs/by-name/xp/xplorer/package.nix +++ b/pkgs/by-name/xp/xplorer/package.nix @@ -54,20 +54,12 @@ rustPlatform.buildRustPackage { sourceRoot = "${src.name}/src-tauri"; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "tauri-plugin-window-state-0.1.0" = "sha256-DkKiwBwc9jrxMaKWOyvl9nsBJW0jBe8qjtqIdKJmsnc="; - "window-shadows-0.2.0" = "sha256-e1afzVjVUHtckMNQjcbtEQM0md+wPWj0YecbFvD0LKE="; - "window-vibrancy-0.3.0" = "sha256-0psa9ZtdI0T6sC1RJ4GeI3w01FdO2Zjypuk9idI5pBY="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-D7qgmxDYQEgOkEYKDSLA875bXeTKDvAntF7kB4esn24="; # copy the frontend static resources to final build directory # Also modify tauri.conf.json so that it expects the resources at the new location postPatch = '' - cp ${./Cargo.lock} Cargo.lock - mkdir -p frontend-build cp -R ${frontend-build}/src frontend-build diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix index 7ea709aadb76..b099994eaae1 100644 --- a/pkgs/by-name/xp/xplr/package.nix +++ b/pkgs/by-name/xp/xplr/package.nix @@ -4,20 +4,19 @@ rustPlatform, fetchFromGitHub, }: - rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.21.9"; + version = "1.0.0"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - hash = "sha256-0c2QJUEQwKEzzDBDP5XdX7xe1rivazsoZtepB4Dxp/c="; + hash = "sha256-QeR7KXwRGfAU31ueI6v26pKnoQdj2C7bXlcMP4qKvZg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-D8BYJtf6joAXyqLDdAeP4GGAA9W5dvA16ia4/ZeZWaE="; + cargoHash = "sha256-UkyRl2eY520JPxtcOl7hvkY3MCH2bi2jL9zCJEdkQmU="; # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin env = lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) { @@ -26,7 +25,7 @@ rustPlatform.buildRustPackage rec { # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' - rm .cargo/config + rm .cargo/config.toml ''; postInstall = '' diff --git a/pkgs/tools/X11/xpra/0002-Constant-DPI.patch b/pkgs/by-name/xp/xpra/0002-Constant-DPI.patch similarity index 100% rename from pkgs/tools/X11/xpra/0002-Constant-DPI.patch rename to pkgs/by-name/xp/xpra/0002-Constant-DPI.patch diff --git a/pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch b/pkgs/by-name/xp/xpra/0003-fix-pointer-limits.patch similarity index 100% rename from pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch rename to pkgs/by-name/xp/xpra/0003-fix-pointer-limits.patch diff --git a/pkgs/tools/X11/xpra/fix-122159.patch b/pkgs/by-name/xp/xpra/fix-122159.patch similarity index 100% rename from pkgs/tools/X11/xpra/fix-122159.patch rename to pkgs/by-name/xp/xpra/fix-122159.patch diff --git a/pkgs/tools/X11/xpra/fix-41106.patch b/pkgs/by-name/xp/xpra/fix-41106.patch similarity index 100% rename from pkgs/tools/X11/xpra/fix-41106.patch rename to pkgs/by-name/xp/xpra/fix-41106.patch diff --git a/pkgs/tools/X11/xpra/nvenc.pc b/pkgs/by-name/xp/xpra/nvenc.pc similarity index 100% rename from pkgs/tools/X11/xpra/nvenc.pc rename to pkgs/by-name/xp/xpra/nvenc.pc diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix new file mode 100644 index 000000000000..3d10311d40c4 --- /dev/null +++ b/pkgs/by-name/xp/xpra/package.nix @@ -0,0 +1,299 @@ +{ + lib, + fetchFromGitHub, + pkg-config, + runCommand, + writeText, + wrapGAppsHook3, + withNvenc ? false, + atk, + cairo, + cudatoolkit, + cudaPackages, + ffmpeg, + gdk-pixbuf, + getopt, + glib, + gobject-introspection, + gst_all_1, + gtk3, + libappindicator, + libfakeXinerama, + librsvg, + libvpx, + libwebp, + systemd, + lz4, + nv-codec-headers-10, + nvidia_x11 ? null, + pam, + pandoc, + pango, + pulseaudioFull, + python3, + stdenv, + util-linux, + which, + x264, + x265, + libavif, + libspng, + openh264, + libyuv, + xauth, + xdg-utils, + xorg, + xorgserver, + xxHash, + clang, + withHtml ? true, + xpra-html5, +}@args: + +let + inherit (python3.pkgs) cython buildPythonApplication; + + xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: { + patches = [ + # patch provided by Xpra upstream + ./0002-Constant-DPI.patch + # https://github.com/Xpra-org/xpra/issues/349 + ./0003-fix-pointer-limits.patch + ]; + }); + + xorgModulePaths = writeText "module-paths" '' + Section "Files" + ModulePath "${xorgserver}/lib/xorg/modules" + ModulePath "${xorgserver}/lib/xorg/modules/extensions" + ModulePath "${xorgserver}/lib/xorg/modules/drivers" + ModulePath "${xf86videodummy}/lib/xorg/modules/drivers" + EndSection + ''; + + nvencHeaders = + runCommand "nvenc-headers" + { + inherit nvidia_x11; + } + '' + mkdir -p $out/include $out/lib/pkgconfig + cp ${nv-codec-headers-10}/include/ffnvcodec/nvEncodeAPI.h $out/include + substituteAll ${./nvenc.pc} $out/lib/pkgconfig/nvenc.pc + ''; + + nvjpegHeaders = runCommand "nvjpeg-headers" { } '' + mkdir -p $out/include $out/lib/pkgconfig + substituteAll ${cudaPackages.libnvjpeg.dev}/share/pkgconfig/nvjpeg.pc $out/lib/pkgconfig/nvjpeg.pc + ''; +in +buildPythonApplication rec { + pname = "xpra"; + version = "6.3"; + + stdenv = if withNvenc then cudaPackages.backendStdenv else args.stdenv; + + src = fetchFromGitHub { + owner = "Xpra-org"; + repo = "xpra"; + tag = "v${version}"; + hash = "sha256-m0GafyzblXwLBBn/eoSmcsLz1r4nzFIQzCOXVXvQB8Q="; + }; + + patches = [ + ./fix-41106.patch # https://github.com/NixOS/nixpkgs/issues/41106 + ./fix-122159.patch # https://github.com/NixOS/nixpkgs/issues/122159 + ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace xpra/platform/posix/features.py \ + --replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" + + patchShebangs --build fs/bin/build_cuda_kernels.py + ''; + + INCLUDE_DIRS = "${pam}/include"; + + nativeBuildInputs = [ + clang + gobject-introspection + pkg-config + wrapGAppsHook3 + pandoc + ] ++ lib.optional withNvenc cudatoolkit; + + buildInputs = + with xorg; + [ + libX11 + libXcomposite + libXdamage + libXfixes + libXi + libxkbfile + libXrandr + libXrender + libXres + libXtst + xorgproto + ] + ++ (with gst_all_1; [ + gst-libav + gst-vaapi + gst-plugins-ugly + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gstreamer + ]) + ++ [ + atk.out + cairo + cython + ffmpeg + gdk-pixbuf + glib + gtk3 + libappindicator + librsvg + libvpx + libwebp + lz4 + pam + pango + x264 + x265 + libavif + libspng + openh264 + libyuv + xxHash + systemd + ] + ++ lib.optional withNvenc [ + nvencHeaders + nvjpegHeaders + ]; + + propagatedBuildInputs = + with python3.pkgs; + ( + [ + cryptography + dbus-python + gst-python + idna + lz4 + netifaces + numpy + opencv4 + pam + paramiko + pillow + pycairo + pycrypto + pycups + pygobject3 + pyinotify + pyopengl + pyopengl-accelerate + python-uinput + pyxdg + rencode + invoke + aioquic + uvloop + pyopenssl + ] + ++ lib.optionals withNvenc [ + pycuda + pynvml + ] + ); + + # error: 'import_cairo' defined but not used + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; + + setupPyBuildFlags = + [ + "--with-Xdummy" + "--without-Xdummy_wrapper" + "--without-strict" + "--with-gtk3" + # Override these, setup.py checks for headers in /usr/* paths + "--with-pam" + "--with-vsock" + ] + ++ lib.optional withNvenc [ + "--with-nvenc" + "--with-nvjpeg_encoder" + ]; + + dontWrapGApps = true; + + preFixup = + '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --set XPRA_INSTALL_PREFIX "$out" + --set XPRA_COMMAND "$out/bin/xpra" + --set XPRA_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" + --set XORG_CONFIG_PREFIX "" + --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib + --prefix PATH : ${ + lib.makeBinPath [ + getopt + xorgserver + xauth + which + util-linux + pulseaudioFull + ] + } + '' + + lib.optionalString withNvenc '' + --prefix LD_LIBRARY_PATH : ${nvidia_x11}/lib + '' + + '' + ) + ''; + + postInstall = + '' + # append module paths to xorg.conf + cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf + cat ${xorgModulePaths} >> $out/etc/xpra/xorg-uinput.conf + + # make application icon visible to desktop environemnts + icon_dir="$out/share/icons/hicolor/64x64/apps" + mkdir -p "$icon_dir" + ln -sr "$out/share/icons/xpra.png" "$icon_dir" + '' + + lib.optionalString withHtml '' + ln -s ${xpra-html5}/share/xpra/www $out/share/xpra/www; + ''; + + doCheck = false; + + enableParallelBuilding = true; + + passthru = { + inherit xf86videodummy; + updateScript = ./update.sh; + }; + + meta = { + homepage = "https://xpra.org/"; + downloadPage = "https://xpra.org/src/"; + description = "Persistent remote applications for X"; + changelog = "https://github.com/Xpra-org/xpra/releases/tag/v${version}"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ + offline + numinit + mvnetbiz + lucasew + ]; + }; +} diff --git a/pkgs/tools/X11/xpra/update.sh b/pkgs/by-name/xp/xpra/update.sh similarity index 100% rename from pkgs/tools/X11/xpra/update.sh rename to pkgs/by-name/xp/xpra/update.sh diff --git a/pkgs/by-name/xp/xpraWithNvenc/package.nix b/pkgs/by-name/xp/xpraWithNvenc/package.nix new file mode 100644 index 000000000000..169c3a657a19 --- /dev/null +++ b/pkgs/by-name/xp/xpraWithNvenc/package.nix @@ -0,0 +1,8 @@ +{ + xpra, + linuxPackages, +}: +xpra.override { + withNvenc = true; + nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; +} diff --git a/pkgs/by-name/xp/xprompt/package.nix b/pkgs/by-name/xp/xprompt/package.nix index 1d787c2df31b..bc10c7b44b66 100644 --- a/pkgs/by-name/xp/xprompt/package.nix +++ b/pkgs/by-name/xp/xprompt/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/phillbush/xprompt"; license = licenses.mit; - maintainers = with maintainers; [ azahi ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "xprompt"; }; diff --git a/pkgs/by-name/xp/xpwn/package.nix b/pkgs/by-name/xp/xpwn/package.nix index 16d78b2c2f3f..24f2e9eb1e52 100644 --- a/pkgs/by-name/xp/xpwn/package.nix +++ b/pkgs/by-name/xp/xpwn/package.nix @@ -12,19 +12,25 @@ stdenv.mkDerivation { pname = "xpwn"; - version = "0.5.8git"; + version = "0.5.8-unstable-2024-04-01"; src = fetchFromGitHub { owner = "planetbeing"; repo = "xpwn"; - rev = "ac362d4ffe4d0489a26144a1483ebf3b431da899"; - sha256 = "1qw9vbk463fpnvvvfgzxmn9add2p30k832s09mlycr7z1hrh3wyf"; + rev = "20c32e5c12d1b22a9d55a59a0ff6267f539b77f4"; + hash = "sha256-wOSIaeNjZOKoeL4padP6UWY1O75qqHuFuSMrdCOLI2s="; }; - # Workaround build failure on -fno-common toolchains: - # ld: ../ipsw-patch/libxpwn.a(libxpwn.c.o):(.bss+0x4): multiple definition of - # `endianness'; CMakeFiles/xpwn-bin.dir/src/xpwn.cpp.o:(.bss+0x0): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = toString [ + # Workaround build failure on -fno-common toolchains: + # ld: ../ipsw-patch/libxpwn.a(libxpwn.c.o):(.bss+0x4): multiple definition of + # `endianness'; CMakeFiles/xpwn-bin.dir/src/xpwn.cpp.o:(.bss+0x0): first defined here + "-fcommon" + + # Fix build on GCC 14 + "-Wno-implicit-int" + "-Wno-incompatible-pointer-types" + ]; preConfigure = '' rm BUILD # otherwise `mkdir build` fails on case insensitive file systems diff --git a/pkgs/by-name/xq/xqilla/package.nix b/pkgs/by-name/xq/xqilla/package.nix index 1287f301f26f..626cfe2d705c 100644 --- a/pkgs/by-name/xq/xqilla/package.nix +++ b/pkgs/by-name/xq/xqilla/package.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, fetchpatch, - darwin, xercesc, }: @@ -30,17 +29,9 @@ stdenv.mkDerivation rec { "CXXFLAGS=-std=c++14" ]; - buildInputs = - [ - xercesc - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + xercesc + ]; meta = with lib; { description = "XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix index d39cdd541b85..bd3bdfacf302 100644 --- a/pkgs/by-name/xr/xreader/package.nix +++ b/pkgs/by-name/xr/xreader/package.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "4.2.3"; + version = "4.2.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-qBnnxygkAn1wF3gtqR0At1e1e+sx1/2MoSWqmshW5Qg="; + hash = "sha256-ELqO8pYMWgU6DUS5vg+F+xFp3w3H6u0Jzms3xaNlTqE="; }; nativeBuildInputs = [ @@ -82,6 +82,6 @@ document formats like PDF and Postscript"; homepage = "https://github.com/linuxmint/xreader"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = teams.cinnamon.members; + teams = [ teams.cinnamon ]; }; } diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix new file mode 100644 index 000000000000..d82bb0925350 --- /dev/null +++ b/pkgs/by-name/xr/xremap/package.nix @@ -0,0 +1,87 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, +}: +let + pname = "xremap"; + version = "0.10.12"; + + src = fetchFromGitHub { + owner = "xremap"; + repo = pname; + tag = "v${version}"; + hash = "sha256-ZOiQffTHXw+anFckKO0jyd+LPw2zTqtqk87niCC38Q8="; + }; + + cargoHash = "sha256-PqGY/fVW5jkTicKs0cONzdVrRFVOaHyVrFip4QADWck="; + + buildXremap = + { + suffix ? "", + features ? [ ], + descriptionSuffix ? "", + }: + assert descriptionSuffix != "" && features != [ ]; + rustPlatform.buildRustPackage { + pname = "${pname}${suffix}"; + inherit version src cargoHash; + + nativeBuildInputs = [ pkg-config ]; + + buildNoDefaultFeatures = true; + buildFeatures = features; + + useFetchCargoVendor = true; + + meta = { + description = + "Key remapper for X11 and Wayland" + + lib.optionalString (descriptionSuffix != "") " (${descriptionSuffix} support)"; + homepage = "https://github.com/xremap/xremap"; + changelog = "https://github.com/xremap/xremap/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + mainProgram = "xremap"; + maintainers = [ lib.maintainers.hakan-demirli ]; + platforms = lib.platforms.linux; + }; + }; + + variants = { + x11 = buildXremap { + features = [ "x11" ]; + descriptionSuffix = "X11"; + }; + gnome = buildXremap { + suffix = "-gnome"; + features = [ "gnome" ]; + descriptionSuffix = "Gnome"; + }; + kde = buildXremap { + suffix = "-kde"; + features = [ "kde" ]; + descriptionSuffix = "KDE"; + }; + wlroots = buildXremap { + suffix = "-wlroots"; + features = [ "wlroots" ]; + descriptionSuffix = "wlroots"; + }; + hyprland = buildXremap { + suffix = "-hyprland"; + features = [ "hypr" ]; + descriptionSuffix = "Hyprland"; + }; + }; + +in +variants.wlroots.overrideAttrs (finalAttrs: { + passthru = { + gnome = variants.gnome; + kde = variants.kde; + wlroots = variants.wlroots; + hyprland = variants.hyprland; + x11 = variants.x11; + }; +}) diff --git a/pkgs/by-name/xr/xrootd/package.nix b/pkgs/by-name/xr/xrootd/package.nix index b36594aac04e..8773875099d4 100644 --- a/pkgs/by-name/xr/xrootd/package.nix +++ b/pkgs/by-name/xr/xrootd/package.nix @@ -30,14 +30,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "xrootd"; - version = "5.7.1"; + version = "5.8.1"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-ZU31nsQgs+Gz9mV8LVv4utJ7g8TXN5OxHjNDfQlt38M="; + hash = "sha256-zeyg/VdzcWbMXuCE1RELiyGg9mytfpNfIa911BwqqIA="; }; postPatch = diff --git a/pkgs/by-name/xr/xrsh/package.nix b/pkgs/by-name/xr/xrsh/package.nix index 35c75d034557..c514e25ccfe8 100644 --- a/pkgs/by-name/xr/xrsh/package.nix +++ b/pkgs/by-name/xr/xrsh/package.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation { pname = "xrsh"; - version = "0-unstable-2025-02-28"; + version = "0-unstable-2025-04-18"; src = fetchFromGitea { fetchSubmodules = true; domain = "codeberg.org"; owner = "xrsh"; repo = "xrsh"; - rev = "5d6e9f4615e57f01ba0859000d90f4f162a06653"; - hash = "sha256-9I6c1GkO7XQZ242ZBCxPiPxkZaYYi/UDLoUvS6nE+M0="; + rev = "f9ca00efb864447ceac94d3e8134a7ed4c41a590"; + hash = "sha256-2nGG6B+uW2QEdIjg8NXQjtbIQu+1hhOSKeHFQenc6eI="; }; dontBuild = true; diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix index 1e30270b3e51..37e373319725 100644 --- a/pkgs/by-name/xs/xscreensaver/package.nix +++ b/pkgs/by-name/xs/xscreensaver/package.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xscreensaver"; - version = "6.09"; + version = "6.10.1"; src = fetchurl { url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz"; - hash = "sha256-9GZ3Ba24zEP9LzlzqIobVLFvIBkK/pOyHiIfL1cyCwU="; + hash = "sha256-/+WZ+c93r6Ru+427e1YejaDDFW3qZLY14Lfiwg9Ls+0="; }; outputs = [ diff --git a/pkgs/by-name/xs/xsnow/package.nix b/pkgs/by-name/xs/xsnow/package.nix index bddb05b73a52..067bf1a0a100 100644 --- a/pkgs/by-name/xs/xsnow/package.nix +++ b/pkgs/by-name/xs/xsnow/package.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation rec { pname = "xsnow"; - version = "3.8.4"; + version = "3.8.5"; src = fetchurl { url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; - sha256 = "sha256-ixfX/EGdwMOYu6nzcRUp7gjii0+T14CcqHCHIWmR2f8="; + sha256 = "sha256-NkoD/oMxdJwnx9QCBM8dwFOTPg7YzOZLnNiEOQt36cU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xs/xsokoban/package.nix b/pkgs/by-name/xs/xsokoban/package.nix index e0ff0a30f15c..cf36c5d16418 100644 --- a/pkgs/by-name/xs/xsokoban/package.nix +++ b/pkgs/by-name/xs/xsokoban/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libXt ]; - env.NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11"; + env.NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11 -Wno-error=implicit-int -Wno-error=implicit-function-declaration"; hardeningDisable = [ "format" ]; @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's/getline/my_getline/' -i score.c + sed -e 's/getpass/my_getpass/' -i externs.h display.c chmod a+rw config.h cat >>config.h < trilinos.withMPI; + +let + version = "7.9.0"; + + # using fetchurl or fetchFromGitHub doesn't include the manuals + # due to .gitattributes files + xyce_src = fetchgit { + url = "https://github.com/Xyce/Xyce.git"; + rev = "Release-${version}"; + sha256 = "sha256-m8tHQYBs0hjepTDswrDJFRCPY941Ew98gYRPuQMdKZA="; + }; + + regression_src = fetchFromGitHub { + owner = "Xyce"; + repo = "Xyce_Regression"; + rev = "Release-${version}"; + sha256 = "sha256-7Jvt2LUw2C201pMp9CHnhOwMzxU7imfrRKCb3wu3Okk="; + }; +in + +stdenv.mkDerivation rec { + pname = "xyce"; + inherit version; + + srcs = [ + xyce_src + regression_src + ]; + + sourceRoot = xyce_src.name; + + preConfigure = "./bootstrap"; + + configureFlags = + [ + "CXXFLAGS=-O3" + "--enable-xyce-shareable" + "--enable-shared" + "--enable-stokhos" + "--enable-amesos2" + ] + ++ lib.optionals withMPI [ + "--enable-mpi" + "CXX=mpicxx" + "CC=mpicc" + "F77=mpif77" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = + [ + autoconf + automake + gfortran + libtool_2 + ] + ++ lib.optionals enableDocs [ + (texliveMedium.withPackages ( + ps: with ps; [ + enumitem + koma-script + optional + framed + enumitem + multirow + newtx + preprint + ] + )) + ]; + + buildInputs = [ + bison + blas + flex + fftw + lapack + suitesparse + trilinos + ] ++ lib.optionals withMPI [ mpi ]; + + doCheck = enableTests; + + postPatch = '' + pushd ../${regression_src.name} + find Netlists -type f -regex ".*\.sh\|.*\.pl" -exec chmod ugo+x {} \; + # some tests generate new files, some overwrite netlists + find . -type d -exec chmod u+w {} \; + find . -type f -name "*.cir" -exec chmod u+w {} \; + patchShebangs Netlists/ TestScripts/ + # patch script generating functions + sed -i -E 's|/usr/bin/env perl|${lib.escapeRegex perl.outPath}/bin/perl|' \ + TestScripts/XyceRegression/Testing/Netlists/RunOptions/runOptions.cir.sh + sed -i -E 's|/bin/sh|${lib.escapeRegex bash.outPath}/bin/sh|' \ + TestScripts/XyceRegression/Testing/Netlists/RunOptions/runOptions.cir.sh + popd + ''; + + nativeCheckInputs = + [ + bc + perl + (python3.withPackages ( + ps: with ps; [ + numpy + scipy + ] + )) + ] + ++ lib.optionals withMPI [ + mpi + openssh + ]; + + checkPhase = '' + XYCE_BINARY="$(pwd)/src/Xyce" + EXECSTRING="${lib.optionalString withMPI "mpirun -np 2 "}$XYCE_BINARY" + TEST_ROOT="$(pwd)/../${regression_src.name}" + + # Honor the TMP variable + sed -i -E 's|/tmp|\$TMP|' $TEST_ROOT/TestScripts/suggestXyceTagList.sh + + EXCLUDE_TESTS_FILE=$TMP/exclude_tests.$$ + # Gold standard has additional ":R" suffix in result column label + echo "Output/HB/hb-step-tecplot.cir" >> $EXCLUDE_TESTS_FILE + # This test makes Xyce access /sys/class/net when run with MPI + ${lib.optionalString withMPI "echo \"CommandLine/command_line.cir\" >> $EXCLUDE_TESTS_FILE"} + + $TEST_ROOT/TestScripts/run_xyce_regression \ + --output="$(pwd)/Xyce_Test" \ + --xyce_test="''${TEST_ROOT}" \ + --taglist="$($TEST_ROOT/TestScripts/suggestXyceTagList.sh "$XYCE_BINARY" | sed -E -e 's/TAGLIST=([^ ]+).*/\1/' -e '2,$d')" \ + --resultfile="$(pwd)/test_results" \ + --excludelist="$EXCLUDE_TESTS_FILE" \ + "''${EXECSTRING}" + ''; + + outputs = [ + "out" + "doc" + ]; + + postInstall = lib.optionalString enableDocs '' + local docFiles=("doc/Users_Guide/Xyce_UG" + "doc/Reference_Guide/Xyce_RG" + "doc/Release_Notes/Release_Notes_${lib.versions.majorMinor version}/Release_Notes_${lib.versions.majorMinor version}") + + # SANDIA LaTeX class and some organization logos are not publicly available see + # https://groups.google.com/g/xyce-users/c/MxeViRo8CT4/m/ppCY7ePLEAAJ + for img in "snllineblubrd" "snllineblk" "DOEbwlogo" "NNSA_logo"; do + sed -i -E "s/\\includegraphics\[height=(0.[1-9]in)\]\{$img\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/" ''${docFiles[2]}.tex + done + + install -d $doc/share/doc/${pname}-${version}/ + for d in ''${docFiles[@]}; do + # Use a public document class + sed -i -E 's/\\documentclass\[11pt,report\]\{SANDreport\}/\\documentclass\[11pt,letterpaper\]\{scrreprt\}/' $d.tex + sed -i -E 's/\\usepackage\[sand\]\{optional\}/\\usepackage\[report\]\{optional\}/' $d.tex + sed -i -E 's/\\SANDauthor/\\author/' $d.tex + pushd $(dirname $d) + make + install -t $doc/share/doc/${pname}-${version}/ $(basename $d.pdf) + popd + done + ''; + + meta = with lib; { + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; + description = "High-performance analog circuit simulator"; + longDescription = '' + Xyce is a SPICE-compatible, high-performance analog circuit simulator, + capable of solving extremely large circuit problems by supporting + large-scale parallel computing platforms. + ''; + homepage = "https://xyce.sandia.gov"; + license = licenses.gpl3; + maintainers = with maintainers; [ fbeffa ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/ya/yaak/package.nix b/pkgs/by-name/ya/yaak/package.nix index 5ac65e3922ae..a9e64db116a2 100644 --- a/pkgs/by-name/ya/yaak/package.nix +++ b/pkgs/by-name/ya/yaak/package.nix @@ -11,7 +11,6 @@ webkitgtk_4_1, glib, gtk3, - libsoup_2_4, openssl, pango, cairo, @@ -59,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: { glib gtk3 openssl - libsoup_2_4 webkitgtk_4_1 pango cairo diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 34b189174fb5..15d7c787e713 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.13"; + version = "7.1.15"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-1/fPBLbC6wcgQAX/soCCVeIUXXm124RnxTJJc/7ayzo="; + hash = "sha256-QDGt/v5t7g6+y6ijpLRF7YkqF8bISfxk684m7uUg4eM="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-6yCMd7+RBqRj3OjnAwm3Ex4CVKVFPWyWdeMqXFaHZlM="; + hash = "sha256-HvaMPmXNlFVOezqWxqXaAUq8E8O2ZkXMQPwkKXCAOcY="; }; }; diff --git a/pkgs/by-name/ya/yabasic/package.nix b/pkgs/by-name/ya/yabasic/package.nix index 6068c3cd43d8..09146db7c828 100644 --- a/pkgs/by-name/ya/yabasic/package.nix +++ b/pkgs/by-name/ya/yabasic/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "yabasic"; - version = "2.91.1"; + version = "2.91.2"; src = fetchurl { url = "http://www.yabasic.de/download/yabasic-${finalAttrs.version}.tar.gz"; - hash = "sha256-bZJbY4Cuycs5778XTGEhMKpv4y0HIYiJlaUPC9qdc2s="; + hash = "sha256-fcYJwHj+gbtudyioeHPXAQoh9SCk1RMxOqEWA3H3cdU="; }; buildInputs = [ diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix index 164cd559b1e4..0e527992cf76 100644 --- a/pkgs/by-name/ya/yafc-ce/package.nix +++ b/pkgs/by-name/ya/yafc-ce/package.nix @@ -12,13 +12,13 @@ let in buildDotnetModule (finalAttrs: { pname = "yafc-ce"; - version = "2.10.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "shpaass"; repo = "yafc-ce"; rev = finalAttrs.version; - hash = "sha256-AFFu4yqnBq0OD3XY1V97zxAIfZuXswT9KOJzU8GqQuU"; + hash = "sha256-n6twiCIQ1nMSidfmdl2py5wHvx4kk6skK0f8chXTCjQ="; }; projectFile = [ "Yafc/Yafc.csproj" ]; diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix index 5004a4b6f130..03d0655b1fd5 100644 --- a/pkgs/by-name/ya/yaml-language-server/package.nix +++ b/pkgs/by-name/ya/yaml-language-server/package.nix @@ -5,24 +5,25 @@ fixup-yarn-lock, makeWrapper, nodejs, + writableTmpDirAsHomeHook, stdenv, yarn, }: stdenv.mkDerivation rec { pname = "yaml-language-server"; - version = "1.15.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "yaml-language-server"; - rev = version; - hash = "sha256-Y3Q/y9UIiy7US8Jl4vxT0Pfw8h3hiXK+Cu9TEQHyAaA="; + tag = version; + hash = "sha256-YGPktMZxYi6eihCDc8JIfN/Ht2uu3wGKoKPJWlDKu+g="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-zHcxZ4VU6CGux72Nsy0foU4gFshK1wO/LTfnwOoirmg="; + hash = "sha256-2OVxvvijnfB8Bytgoaybyx4p66nD/aahtyjxLf8womE="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { fixup-yarn-lock yarn nodejs + writableTmpDirAsHomeHook ]; # NodeJS is also needed here so that script interpreter get patched @@ -40,7 +42,6 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror "$offlineCache" fixup-yarn-lock yarn.lock yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 828a7d8f2a20..bc8a22a94442 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -6,11 +6,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.95"; + version = "0.1.96"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-8GmKMRMQ5YaCK0jJkLVlWHTngr5DJSN/Vm+0nMYBkr8="; + hash = "sha256-nwqZhGOtNEJ0qzOTFdHFWBSyt4hmLhn6nhdCz2jyUbg="; }; executable = "ys"; diff --git a/pkgs/by-name/ya/yams/package.nix b/pkgs/by-name/ya/yams/package.nix index 713d8a96b762..99a964ed6bf4 100644 --- a/pkgs/by-name/ya/yams/package.nix +++ b/pkgs/by-name/ya/yams/package.nix @@ -6,6 +6,7 @@ python3Packages.buildPythonPackage rec { pname = "yams"; + # nixpkgs-update: no auto update version = "0.7.3"; src = fetchFromGitHub { diff --git a/pkgs/by-name/ya/yandex-browser/package.nix b/pkgs/by-name/ya/yandex-browser/package.nix deleted file mode 100644 index 5c534dfd3f78..000000000000 --- a/pkgs/by-name/ya/yandex-browser/package.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - autoPatchelfHook, - wrapGAppsHook3, - flac, - gnome2, - harfbuzzFull, - nss, - snappy, - xdg-utils, - xorg, - alsa-lib, - atk, - cairo, - cups, - curl, - dbus, - expat, - fontconfig, - freetype, - gdk-pixbuf, - glib, - gtk3, - libX11, - libxcb, - libXScrnSaver, - libXcomposite, - libXcursor, - libXdamage, - libXext, - libXfixes, - libXi, - libXrandr, - libXrender, - libXtst, - libdrm, - libnotify, - libopus, - libpulseaudio, - libuuid, - libxshmfence, - libgbm, - nspr, - pango, - systemd, - at-spi2-atk, - at-spi2-core, - libsForQt5, - qt6, - vivaldi-ffmpeg-codecs, - edition ? "stable", -}: - -let - version = - { - corporate = "24.7.1.1195-1"; - beta = "24.7.1.1124-1"; - stable = "24.7.1.1120-1"; - } - .${edition}; - - hash = - { - corporate = "sha256-HPEUeIZl9nRhMzrMv4MzIOnbF8mJ789vCtTWf9TcCH4="; - beta = "sha256-vcX/9MWqeUd/YlczHivcL6+TignE8Nk6rO5DaCjf2SQ="; - stable = "sha256-wrYPQ8WrttF/tlafA0+e3eDZMq9SFmLk5NOIeHQr14U="; - } - .${edition}; - - app = - { - corporate = ""; - beta = "-beta"; - stable = ""; - } - .${edition}; - -in -stdenv.mkDerivation rec { - pname = "yandex-browser-${edition}"; - inherit version; - - src = fetchurl { - url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}/${pname}_${version}_amd64.deb"; - inherit hash; - }; - - nativeBuildInputs = [ - autoPatchelfHook - qt6.wrapQtAppsHook - wrapGAppsHook3 - ]; - - buildInputs = [ - flac - harfbuzzFull - nss - snappy - xdg-utils - xorg.libxkbfile - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - curl - dbus - expat - fontconfig.lib - freetype - gdk-pixbuf - glib - gnome2.GConf - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libdrm - libnotify - libopus - libuuid - libxcb - libxshmfence - libgbm - nspr - nss - pango - (lib.getLib stdenv.cc.cc) - libsForQt5.libqtpas - qt6.qtbase - ]; - - unpackPhase = '' - mkdir $TMP/ya/ $out/bin/ -p - ar vx $src - tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/ya/ - ''; - - installPhase = '' - cp $TMP/ya/{usr/share,opt} $out/ -R - cp $out/share/applications/yandex-browser${app}.desktop $out/share/applications/${pname}.desktop || true - rm -f $out/share/applications/yandex-browser.desktop - substituteInPlace $out/share/applications/${pname}.desktop --replace /usr/ $out/ - substituteInPlace $out/share/menu/yandex-browser${app}.menu --replace /opt/ $out/opt/ - substituteInPlace $out/share/gnome-control-center/default-apps/yandex-browser${app}.xml --replace /opt/ $out/opt/ - ln -sf ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so $out/opt/yandex/browser${app}/libffmpeg.so - ln -sf $out/opt/yandex/browser${app}/yandex-browser${app} $out/bin/${pname} - ''; - - runtimeDependencies = - map lib.getLib [ - libpulseaudio - curl - systemd - vivaldi-ffmpeg-codecs - ] - ++ buildInputs; - - meta = with lib; { - description = "Yandex Web Browser"; - homepage = "https://browser.yandex.ru/"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ - dan4ik605743 - ionutnechita - ]; - platforms = [ "x86_64-linux" ]; - - knownVulnerabilities = [ - '' - Trusts a Russian government issued CA certificate for some websites. - See https://habr.com/en/company/yandex/blog/655185/ (Russian) for details. - '' - ]; - }; -} diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json index 186f39fab5c9..1a6cb940358b 100644 --- a/pkgs/by-name/ya/yandex-cloud/sources.json +++ b/pkgs/by-name/ya/yandex-cloud/sources.json @@ -1,25 +1,25 @@ { - "version": "0.145.0", + "version": "0.148.0", "binaries": { "aarch64-darwin": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.145.0/darwin/arm64/yc", - "hash": "sha256-TYceYoir13NUvvxwhAdLrVpiJ1DgYCq5bE/GS9eNJTo=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.148.0/darwin/arm64/yc", + "hash": "sha256-wFc3/ikLFO8JEE5lTEU4z+KR8aKSs9qjuDVAGQefoFA=" }, "aarch64-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.145.0/linux/arm64/yc", - "hash": "sha256-7Y//gt9vLAubd/LPgbMafSEC/Qz9vXK6m3NSMysF1/Q=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.148.0/linux/arm64/yc", + "hash": "sha256-8yt8BHGg52kXdwLMYtnwNqeozvkwKFJnLAnkvhaocFk=" }, "i686-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.145.0/linux/386/yc", - "hash": "sha256-ykLtSuAdMpR+c5gu3L5iO9AZlw4NrsV8TPGdkHsDQ/4=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.148.0/linux/386/yc", + "hash": "sha256-A+BM2evI7FN0IxUMh9KOUlaAyCSFBOg9n++GcHBq1aU=" }, "x86_64-darwin": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.145.0/darwin/amd64/yc", - "hash": "sha256-TlgK5RK6u94N/IsMEsL1+57cMx9d/MokLJrfXPpMEPk=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.148.0/darwin/amd64/yc", + "hash": "sha256-3vmbRJm/L9LVjle5gfRG/uLEfvDhhz3gXN/NaOxSKD8=" }, "x86_64-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.145.0/linux/amd64/yc", - "hash": "sha256-bOY5908sOHjZN0L6aF/YXVHoS8r/W82nRg/2FFtjibI=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.148.0/linux/amd64/yc", + "hash": "sha256-XlKnb0RtSu/f5UUnepHfp9UnQhCfI+SaJePQ6pOFeJg=" } } } diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix index fa83fc56171a..524b64a7dfc0 100644 --- a/pkgs/by-name/ya/yandex-music/package.nix +++ b/pkgs/by-name/ya/yandex-music/package.nix @@ -10,17 +10,32 @@ electron, fetchFromGitHub, electronArguments ? "", + + # Whether to enable tray menu by default trayEnabled ? true, + # Style of tray: 1 - default style, 2 - mono black, 3 - mono white + trayStyle ? 1, + # Whether to leave application in tray disregarding of its play state + trayAlways ? false, + # Whether to enable developers tools + devTools ? false, + # Vibe animation FPS can be from 0 (black screen) to any reasonable number. + # Recommended 25 - 144. Default 25. + vibeAnimationMaxFps ? 25, + # Yandex Music's custom Windows-styled titlebar. Also makes the window frameless. + customTitleBar ? false, }: +assert lib.assertMsg (trayStyle >= 1 && trayStyle <= 3) "Tray style must be withing 1 and 3"; +assert lib.assertMsg (vibeAnimationMaxFps >= 0) "Vibe animation max FPS must be greater then 0"; stdenvNoCC.mkDerivation rec { pname = "yandex-music"; - version = "5.39.0"; + version = "5.50.0"; src = fetchFromGitHub { owner = "cucumber-sp"; repo = "yandex-music-linux"; rev = "v${version}"; - hash = "sha256-oEbbQRqvnK521N3Kerv18h1frVLbioFeHfb/FCkHC6Y="; + hash = "sha256-xn/9LjRLm6CNLrnrLiYr9deeo09iRMEKCRFuM3SELjw="; }; nativeBuildInputs = [ @@ -48,6 +63,27 @@ stdenvNoCC.mkDerivation rec { runHook postBuild ''; + config = + let + inherit (lib) optionalString; + in + '' + ELECTRON_ARGS="${electronArguments}" + VIBE_ANIMATION_MAX_FPS=${toString vibeAnimationMaxFps} + '' + + optionalString trayEnabled '' + TRAY_ENABLED=${toString trayStyle} + '' + + optionalString trayAlways '' + ALWAYS_LEAVE_TO_TRAY=1 + '' + + optionalString devTools '' + DEV_TOOLS=1 + '' + + optionalString customTitleBar '' + CUSTOM_TITLE_BAR=1 + ''; + installPhase = '' runHook preInstall @@ -55,9 +91,7 @@ stdenvNoCC.mkDerivation rec { mv app/yandex-music.asar "$out/share/nodejs" CONFIG_FILE="$out/share/yandex-music.conf" - echo "TRAY_ENABLED=${if trayEnabled then "1" else "0"}" >> "$CONFIG_FILE" - echo "ELECTRON_ARGS=\"${electronArguments}\"" >> "$CONFIG_FILE" - + echo "$config" >> "$CONFIG_FILE" install -Dm755 "$src/templates/yandex-music.sh" "$out/bin/yandex-music" substituteInPlace "$out/bin/yandex-music" \ diff --git a/pkgs/by-name/ya/yandex-music/ym_info.json b/pkgs/by-name/ya/yandex-music/ym_info.json index b5eeac27441b..53080379232f 100644 --- a/pkgs/by-name/ya/yandex-music/ym_info.json +++ b/pkgs/by-name/ya/yandex-music/ym_info.json @@ -1,6 +1,6 @@ { - "version": "5.39.0", - "exe_name": "Yandex_Music_x64_5.39.0.exe", - "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.39.0.exe", - "exe_hash": "sha256-jOaxKDOkabsNQTXH5+UGwfdL+Srjm5gjQgHe/YuGiaQ=" + "version": "5.50.0", + "exe_name": "Yandex_Music_x64_5.50.0.exe", + "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.50.0.exe", + "exe_hash": "sha256-l0QyY8iJkBO0hPUZ1gA0wyJgppO46nURa3L7JzxRBG0=" } diff --git a/pkgs/by-name/ya/yaneuraou/package.nix b/pkgs/by-name/ya/yaneuraou/package.nix new file mode 100644 index 000000000000..f0f8280db1be --- /dev/null +++ b/pkgs/by-name/ya/yaneuraou/package.nix @@ -0,0 +1,124 @@ +{ + lib, + stdenv, + clangStdenv, + lld, + # Available labels: https://github.com/yaneurao/YaneuraOu/blob/59f6265cebbd4f03138091098059a881a021eefa/source/Makefile#L53-L92 + targetLabel ? + with stdenv.hostPlatform; + if isDarwin then + if isAarch64 then + "APPLEM1" + else if avx2Support then + "APPLEAVX2" + else + "APPLESSE42" + else if isx86_64 then + if avx512Support then + "AVX512" + else if avx2Support then + "AVX2" + else if sse4_2Support then + "SSE42" + else if sse4_1Support then + "SSE41" + else if ssse3Support then + "SSSE3" + else + "SSE2" + else if isx86_32 then + "NO_SSE" + else + "OTHER", + fetchFromGitHub, + fetchurl, + _7zz, + nix-update-script, +}: + +# Use clangStdenv instead of the default stdenv because: +# - The upstream author treats clang++ as the primary compiler in the docs +# and Makefile, even though the code also builds with g++. +# - With just stdenv the build fails on macOS, while it works out of the box +# with clangStdenv. +clangStdenv.mkDerivation (finalAttrs: { + pname = "yaneuraou"; + version = "8.60"; + + src = fetchFromGitHub { + owner = "yaneurao"; + repo = "YaneuraOu"; + tag = "v${finalAttrs.version}git"; + hash = "sha256-1awnGCGIdeMAqAd0TWgoJr5spJo2mFBWdR3iMc2i4OM="; + }; + + sourceRoot = "${finalAttrs.src.name}/source"; + + nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + lld + ]; + + buildInputs = [ + stdenv.cc.cc # For libstdc++.so.6 + ]; + + buildFlags = [ + "TARGET_CPU=${targetLabel}" + "YANEURAOU_EDITION=YANEURAOU_ENGINE_NNUE" + "COMPILER=clang++" + "OBJDIR=$NIX_BUILD_TOP/obj" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + mv ./YaneuraOu-by-* "$out/bin/YaneuraOu" + + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + _7zz + ]; + installCheckPhase = + let + nnue = fetchurl { + url = "https://github.com/yaneurao/YaneuraOu/releases/download/suisho5/Suisho5.7z"; + hash = "sha256-ZzTjo9KOZ7kgbDRC9tEPFhSBODJ9/4Ecre389YH3mAk="; + }; + in + '' + runHook preInstallCheck + + 7zz x '${nnue}' + usi_command="setoption name EvalDir value $PWD + isready + go byoyomi 1000 + wait" + usi_output="$("$out/bin/YaneuraOu" <<< "$usi_command")" + [[ "$usi_output" == *'bestmove'* ]] + + runHook postInstallCheck + ''; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex=^v([\\d.]+)git$" + ]; + }; + }; + + meta = { + description = "USI compliant shogi engine"; + homepage = "https://github.com/yaneurao/YaneuraOu"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "YaneuraOu"; + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; +}) diff --git a/pkgs/by-name/ya/yanic/package.nix b/pkgs/by-name/ya/yanic/package.nix index 5ac0ff685481..ba627d664adc 100644 --- a/pkgs/by-name/ya/yanic/package.nix +++ b/pkgs/by-name/ya/yanic/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "yanic"; - version = "1.6.2"; + version = "1.7.1"; src = fetchFromGitHub { owner = "FreifunkBremen"; repo = "yanic"; rev = "v${version}"; - hash = "sha256-z2vr1QmRCo8y4hopWP14xSV7lsWKkCzK9OehlVLFdIg="; + hash = "sha256-uqmojpwGFs6inhmKIztYlGFvUS8AjQIYTHSkZcGyEUo="; }; - vendorHash = "sha256-6UiiajKLzW5e7y0F6GMYDZP6xTyOiccLIKlwvOY7LRo="; + vendorHash = "sha256-UYrQwOyWlKxDH5hHKAZCxQbO+eA6JsPuG0SbkWMF/HQ="; ldflags = [ "-X github.com/FreifunkBremen/yanic/cmd.VERSION=${version}" diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 2e9960fe6554..ec042170ae7a 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "yara-x"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; tag = "v${finalAttrs.version}"; - hash = "sha256-C8wBGmilouNcNN3HkwvSTWcZY1fe0jVc2TeWDN4w5xA="; + hash = "sha256-fbuh/SMfOygnuvG9zTZqem4oLaS+5uXScXPhU3aVDjM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-afCBuWr12trjEIDvE0qnGFxTXU7LKZCzZB8RqgqperY="; + cargoHash = "sha256-+dPIujaxDJ7JrtNvX4VjGHFmgtCb1BJpFQL4c3E1/GY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ya/yara/package.nix b/pkgs/by-name/ya/yara/package.nix index bd6108e8da5d..34574c744c14 100644 --- a/pkgs/by-name/ya/yara/package.nix +++ b/pkgs/by-name/ya/yara/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, autoreconfHook, - pcre, pkg-config, protobufc, withCrypto ? true, @@ -36,7 +35,6 @@ stdenv.mkDerivation rec { buildInputs = [ - pcre protobufc ] ++ lib.optionals withCrypto [ openssl ] diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/berry-3-offline.patch b/pkgs/by-name/ya/yarn-berry/fetcher/berry-3-offline.patch new file mode 100644 index 000000000000..52e99f2fb408 --- /dev/null +++ b/pkgs/by-name/ya/yarn-berry/fetcher/berry-3-offline.patch @@ -0,0 +1,118 @@ +diff --git a/packages/plugin-essentials/sources/commands/install.ts b/packages/plugin-essentials/sources/commands/install.ts +index 9dcd02d12..cf1765a20 100644 +--- a/packages/plugin-essentials/sources/commands/install.ts ++++ b/packages/plugin-essentials/sources/commands/install.ts +@@ -254,6 +254,7 @@ export default class YarnCommand extends BaseCommand { + // If migrating from a v1 install, we automatically enable the node-modules linker, + // since that's likely what the author intended to do. + if (content?.includes(`yarn lockfile v1`)) { ++ throw new Error("Tried to use yarn-berry_3.yarnConfigHook (nixpkgs), but found a yarn v1 lockfile"); + const nmReport = await StreamReport.start({ + configuration, + json: this.json, +diff --git a/packages/plugin-git/sources/GitFetcher.ts b/packages/plugin-git/sources/GitFetcher.ts +index fe2a4fce8..bfa82728e 100644 +--- a/packages/plugin-git/sources/GitFetcher.ts ++++ b/packages/plugin-git/sources/GitFetcher.ts +@@ -50,9 +50,14 @@ export class GitFetcher implements Fetcher { + } + + async cloneFromRemote(locator: Locator, opts: FetchOptions) { +- const cloneTarget = await gitUtils.clone(locator.reference, opts.project.configuration); +- + const repoUrlParts = gitUtils.splitRepoUrl(locator.reference); ++ ++ if (repoUrlParts.treeish.protocol !== "commit") { ++ throw new Error(`Missing source for git dependency ${locator.reference}`); ++ }; ++ ++ const cloneTarget = opts.cache.checkoutPath(repoUrlParts.treeish.request); ++ + const packagePath = ppath.join(cloneTarget, `package.tgz` as PortablePath); + + await scriptUtils.prepareExternalProject(cloneTarget, packagePath, { +diff --git a/packages/plugin-npm/sources/NpmSemverFetcher.ts b/packages/plugin-npm/sources/NpmSemverFetcher.ts +index 0f69423c7..5b21462a5 100644 +--- a/packages/plugin-npm/sources/NpmSemverFetcher.ts ++++ b/packages/plugin-npm/sources/NpmSemverFetcher.ts +@@ -47,6 +47,7 @@ export class NpmSemverFetcher implements Fetcher { + } + + private async fetchFromNetwork(locator: Locator, opts: FetchOptions) { ++ throw new Error(`Missing sources for ${structUtils.prettyLocator(opts.project.configuration, locator)}`); + let sourceBuffer; + try { + sourceBuffer = await npmHttpUtils.get(NpmSemverFetcher.getLocatorUrl(locator), { +diff --git a/packages/yarnpkg-core/sources/Cache.ts b/packages/yarnpkg-core/sources/Cache.ts +index d5e686420..374b5d67f 100644 +--- a/packages/yarnpkg-core/sources/Cache.ts ++++ b/packages/yarnpkg-core/sources/Cache.ts +@@ -158,6 +158,10 @@ export class Cache { + } + } + ++ checkoutPath(commit: string): string { ++ return ppath.join(ppath.join(this.cwd, "../checkouts"), commit); ++ } ++ + async fetchPackageFromCache(locator: Locator, expectedChecksum: string | null, {onHit, onMiss, loader, ...opts}: {onHit?: () => void, onMiss?: () => void, loader?: () => Promise } & CacheOptions): Promise<[FakeFS, () => void, string | null]> { + const mirrorPath = this.getLocatorMirrorPath(locator); + +diff --git a/packages/yarnpkg-core/sources/scriptUtils.ts b/packages/yarnpkg-core/sources/scriptUtils.ts +index b3c2c5903..641687745 100644 +--- a/packages/yarnpkg-core/sources/scriptUtils.ts ++++ b/packages/yarnpkg-core/sources/scriptUtils.ts +@@ -262,20 +262,6 @@ export async function prepareExternalProject(cwd: PortablePath, outputPath: Port + ? [`workspace`, workspace] + : []; + +- // `set version` will update the Manifest to contain a `packageManager` field with the latest +- // Yarn version which causes the results to change depending on when this command was run, +- // therefore we revert any change made to it. +- const manifestPath = ppath.join(cwd, Filename.manifest); +- const manifestBuffer = await xfs.readFilePromise(manifestPath); +- +- // Makes sure that we'll be using Yarn 1.x +- const version = await execUtils.pipevp(process.execPath, [process.argv[1], `set`, `version`, `classic`, `--only-if-needed`], {cwd, env, stdin, stdout, stderr, end: execUtils.EndStrategy.ErrorCode}); +- if (version.code !== 0) +- return version.code; +- +- // Revert any changes made to the Manifest by `set version`. +- await xfs.writeFilePromise(manifestPath, manifestBuffer); +- + // Otherwise Yarn 1 will pack the .yarn directory :( + await xfs.appendFilePromise(ppath.join(cwd, `.npmignore` as PortablePath), `/.yarn\n`); + +@@ -284,16 +270,8 @@ export async function prepareExternalProject(cwd: PortablePath, outputPath: Port + // Remove environment variables that limit the install to just production dependencies + delete env.NODE_ENV; + +- // Run an install; we can't avoid it unless we inspect the +- // package.json, which I don't want to do to keep the codebase +- // clean (even if it has a slight perf cost when cloning v1 repos) +- const install = await execUtils.pipevp(`yarn`, [`install`], {cwd, env, stdin, stdout, stderr, end: execUtils.EndStrategy.ErrorCode}); +- if (install.code !== 0) +- return install.code; +- +- stdout.write(`\n`); +- +- const pack = await execUtils.pipevp(`yarn`, [...workspaceCli, `pack`, `--filename`, npath.fromPortablePath(outputPath)], {cwd, env, stdin, stdout, stderr}); ++ env["SKIP_YARN_COREPACK_CHECK"] = "1"; ++ const pack = await execUtils.pipevp(`@yarnv1@`, [...workspaceCli, `--offline`, `pack`, `--filename`, npath.fromPortablePath(outputPath)], {cwd, env, stdin, stdout, stderr}); + if (pack.code !== 0) + return pack.code; + +@@ -372,13 +350,6 @@ export async function prepareExternalProject(cwd: PortablePath, outputPath: Port + delete env.NPM_CONFIG_PRODUCTION; + delete env.NODE_ENV; + +- // We can't use `npm ci` because some projects don't have npm +- // lockfiles that are up-to-date. Hopefully npm won't decide +- // to change the versions randomly. +- const install = await execUtils.pipevp(`npm`, [`install`], {cwd, env, stdin, stdout, stderr, end: execUtils.EndStrategy.ErrorCode}); +- if (install.code !== 0) +- return install.code; +- + const packStream = new PassThrough(); + const packPromise = miscUtils.bufferStream(packStream); + diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/berry-4-offline.patch b/pkgs/by-name/ya/yarn-berry/fetcher/berry-4-offline.patch new file mode 100644 index 000000000000..7ebf48b64233 --- /dev/null +++ b/pkgs/by-name/ya/yarn-berry/fetcher/berry-4-offline.patch @@ -0,0 +1,114 @@ +diff --git a/packages/plugin-essentials/sources/commands/install.ts b/packages/plugin-essentials/sources/commands/install.ts +index 90ba55349..ef5368c1b 100644 +--- a/packages/plugin-essentials/sources/commands/install.ts ++++ b/packages/plugin-essentials/sources/commands/install.ts +@@ -302,6 +302,7 @@ export default class YarnCommand extends BaseCommand { + + for (const rule of LOCKFILE_MIGRATION_RULES) { + if (rule.selector(lockfileLastVersion) && typeof configuration.sources.get(rule.name) === `undefined`) { ++ throw new Error(`Tried to use yarn-berry_4.yarnConfigHook (nixpkgs) which expects lockfile version 8, but found lockfile version ${lockfileLastVersion}`); + configuration.use(``, {[rule.name]: rule.value}, project.cwd, {overwrite: true}); + newSettings[rule.name] = rule.value; + } +diff --git a/packages/plugin-git/sources/GitFetcher.ts b/packages/plugin-git/sources/GitFetcher.ts +index d9f8d85c7..4db9f9008 100644 +--- a/packages/plugin-git/sources/GitFetcher.ts ++++ b/packages/plugin-git/sources/GitFetcher.ts +@@ -50,7 +50,11 @@ export class GitFetcher implements Fetcher { + async cloneFromRemote(locator: Locator, opts: FetchOptions) { + const repoUrlParts = gitUtils.splitRepoUrl(locator.reference); + +- const cloneTarget = await gitUtils.clone(locator.reference, opts.project.configuration); ++ if (repoUrlParts.treeish.protocol !== "commit") { ++ throw new Error(`Missing source for git dependency ${locator.reference}`); ++ }; ++ ++ const cloneTarget = opts.cache.checkoutPath(repoUrlParts.treeish.request); + const projectPath = ppath.resolve(cloneTarget, repoUrlParts.extra.cwd ?? PortablePath.dot); + + const packagePath = ppath.join(projectPath, `package.tgz`); +diff --git a/packages/plugin-npm/sources/NpmSemverFetcher.ts b/packages/plugin-npm/sources/NpmSemverFetcher.ts +index 7347859aa..ea5767f88 100644 +--- a/packages/plugin-npm/sources/NpmSemverFetcher.ts ++++ b/packages/plugin-npm/sources/NpmSemverFetcher.ts +@@ -45,6 +45,7 @@ export class NpmSemverFetcher implements Fetcher { + } + + private async fetchFromNetwork(locator: Locator, opts: FetchOptions) { ++ throw new Error(`Missing sources for ${structUtils.prettyLocator(opts.project.configuration, locator)}`); + let sourceBuffer; + try { + sourceBuffer = await npmHttpUtils.get(NpmSemverFetcher.getLocatorUrl(locator), { +diff --git a/packages/yarnpkg-core/sources/Cache.ts b/packages/yarnpkg-core/sources/Cache.ts +index b712ecf11..c7effbc61 100644 +--- a/packages/yarnpkg-core/sources/Cache.ts ++++ b/packages/yarnpkg-core/sources/Cache.ts +@@ -225,6 +225,10 @@ export class Cache { + } + } + ++ checkoutPath(commit: string): string { ++ return ppath.join(ppath.join(this.cwd, "../checkouts"), commit); ++ } ++ + async fetchPackageFromCache(locator: Locator, expectedChecksum: string | null, {onHit, onMiss, loader, ...opts}: {onHit?: () => void, onMiss?: () => void, loader?: () => Promise} & CacheOptions): Promise<[FakeFS, () => void, string | null]> { + const mirrorPath = this.getLocatorMirrorPath(locator); + +diff --git a/packages/yarnpkg-core/sources/scriptUtils.ts b/packages/yarnpkg-core/sources/scriptUtils.ts +index 2dcd7e59e..a2a7f9791 100644 +--- a/packages/yarnpkg-core/sources/scriptUtils.ts ++++ b/packages/yarnpkg-core/sources/scriptUtils.ts +@@ -262,20 +262,6 @@ export async function prepareExternalProject(cwd: PortablePath, outputPath: Port + ? [`workspace`, workspace] + : []; + +- // `set version` will update the Manifest to contain a `packageManager` field with the latest +- // Yarn version which causes the results to change depending on when this command was run, +- // therefore we revert any change made to it. +- const manifestPath = ppath.join(cwd, Filename.manifest); +- const manifestBuffer = await xfs.readFilePromise(manifestPath); +- +- // Makes sure that we'll be using Yarn 1.x +- const version = await execUtils.pipevp(process.execPath, [process.argv[1], `set`, `version`, `classic`, `--only-if-needed`, `--yarn-path`], {cwd, env, stdin, stdout, stderr, end: execUtils.EndStrategy.ErrorCode}); +- if (version.code !== 0) +- return version.code; +- +- // Revert any changes made to the Manifest by `set version`. +- await xfs.writeFilePromise(manifestPath, manifestBuffer); +- + // Otherwise Yarn 1 will pack the .yarn directory :( + await xfs.appendFilePromise(ppath.join(cwd, `.npmignore`), `/.yarn\n`); + +@@ -284,16 +270,8 @@ export async function prepareExternalProject(cwd: PortablePath, outputPath: Port + // Remove environment variables that limit the install to just production dependencies + delete env.NODE_ENV; + +- // Run an install; we can't avoid it unless we inspect the +- // package.json, which I don't want to do to keep the codebase +- // clean (even if it has a slight perf cost when cloning v1 repos) +- const install = await execUtils.pipevp(`yarn`, [`install`], {cwd, env, stdin, stdout, stderr, end: execUtils.EndStrategy.ErrorCode}); +- if (install.code !== 0) +- return install.code; +- +- stdout.write(`\n`); +- +- const pack = await execUtils.pipevp(`yarn`, [...workspaceCli, `pack`, `--filename`, npath.fromPortablePath(outputPath)], {cwd, env, stdin, stdout, stderr}); ++ env["SKIP_YARN_COREPACK_CHECK"] = "1"; ++ const pack = await execUtils.pipevp(`@yarnv1@`, [...workspaceCli, `--offline`, `pack`, `--filename`, npath.fromPortablePath(outputPath)], {cwd, env, stdin, stdout, stderr}); + if (pack.code !== 0) + return pack.code; + +@@ -372,13 +350,6 @@ export async function prepareExternalProject(cwd: PortablePath, outputPath: Port + delete env.NPM_CONFIG_PRODUCTION; + delete env.NODE_ENV; + +- // We can't use `npm ci` because some projects don't have npm +- // lockfiles that are up-to-date. Hopefully npm won't decide +- // to change the versions randomly. +- const install = await execUtils.pipevp(`npm`, [`install`, `--legacy-peer-deps`], {cwd, env, stdin, stdout, stderr, end: execUtils.EndStrategy.ErrorCode}); +- if (install.code !== 0) +- return install.code; +- + const packStream = new PassThrough(); + const packPromise = miscUtils.bufferStream(packStream); + diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/default.nix b/pkgs/by-name/ya/yarn-berry/fetcher/default.nix new file mode 100644 index 000000000000..00925e28b195 --- /dev/null +++ b/pkgs/by-name/ya/yarn-berry/fetcher/default.nix @@ -0,0 +1,87 @@ +{ + lib, + newScope, + yarn-berry, + yarn, + replaceVars, + libzip, + zlib, + zlib-ng, +}: + +let + variantOverlays = { + "3" = final: { + berryCacheVersion = "8"; + + berryOfflinePatches = [ + (replaceVars ./berry-3-offline.patch { + yarnv1 = lib.getExe yarn; + }) + ]; + + # Known good version: 1.11.3 + libzip = + (libzip.override { + # Known good version: 1.3.1 + zlib = zlib; + }).overrideAttrs + (oA: { + patches = (oA.patches or [ ]) ++ [ + (final.yarn-berry-fetcher.src + "/libzip-revert-to-old-versionneeded-behavior.patch") + ]; + }); + }; + "4" = final: { + berryCacheVersion = "10"; + + berryOfflinePatches = [ + (replaceVars ./berry-4-offline.patch { + yarnv1 = lib.getExe yarn; + }) + ]; + + # Known good version: 1.11.3 + libzip = + (libzip.override { + # Known good version: 2.2.4 + zlib = zlib-ng.override { + withZlibCompat = true; + }; + }).overrideAttrs + (oA: { + patches = (oA.patches or [ ]) ++ [ + (final.yarn-berry-fetcher.src + "/libzip-revert-to-old-versionneeded-behavior.patch") + ]; + }); + }; + }; +in + +lib.makeScope newScope ( + final: + let + berryVersion = lib.versions.major yarn-berry.version; + + err = throw '' + Berry version ${toString berryVersion} not supported by yarn-berry-fetcher. + Supported versions: ${lib.concatStringsSep ", " (lib.attrNames variantOverlays)} + ''; + variantOverlay = (variantOverlays.${berryVersion} or err) final; + in + ( + { + inherit yarn-berry berryVersion; + + yarn-berry-offline = final.yarn-berry.overrideAttrs (old: { + pname = old.pname + "-offline"; + patches = (old.patches or [ ]) ++ final.berryOfflinePatches; + }); + + yarn-berry-fetcher = final.callPackage ./yarn-berry-fetcher.nix { }; + fetchYarnBerryDeps = final.callPackage ./fetch-yarn-berry-deps.nix { }; + yarnBerryConfigHook = final.callPackage ./yarn-berry-config-hook.nix { }; + } + // variantOverlay + ) +) diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/fetch-yarn-berry-deps.nix b/pkgs/by-name/ya/yarn-berry/fetcher/fetch-yarn-berry-deps.nix new file mode 100644 index 000000000000..f54ba6291c82 --- /dev/null +++ b/pkgs/by-name/ya/yarn-berry/fetcher/fetch-yarn-berry-deps.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + yarn-berry-fetcher, + nix-prefetch-git, + cacert, + berryVersion, +}: + +{ + src ? null, + hash ? "", + sha256 ? "", + ... +}@args: + +let + hash_ = + if hash != "" then + { + outputHashAlgo = null; + outputHash = hash; + } + else if sha256 != "" then + { + outputHashAlgo = "sha256"; + outputHash = sha256; + } + else + { + outputHashAlgo = "sha256"; + outputHash = lib.fakeSha256; + }; +in + +stdenv.mkDerivation ( + { + # The name is fixed as to not produce multiple store paths with the same content + name = "offline"; + + dontUnpack = src == null; + dontInstall = true; + + nativeBuildInputs = [ + yarn-berry-fetcher + nix-prefetch-git + cacert + ]; + + buildPhase = '' + runHook preBuild + + yarnLock=''${yarnLock:=$PWD/yarn.lock} + yarn-berry-fetcher fetch $yarnLock $missingHashes + + runHook postBuild + ''; + + outputHashMode = "recursive"; + + dontFixup = true; # fixup phase does the patching of the shebangs, and FODs must never contain nix store paths. + + passthru = { + inherit berryVersion; + }; + } + // hash_ + // (removeAttrs args ( + [ + "name" + "pname" + "version" + "hash" + "sha256" + ] + ++ (lib.optional (src == null) "src") + )) +) diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.nix b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.nix new file mode 100644 index 000000000000..f7999975258c --- /dev/null +++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.nix @@ -0,0 +1,24 @@ +{ + makeSetupHook, + yarn-berry-offline, + srcOnly, + nodejs, + diffutils, +}: + +makeSetupHook { + name = "yarn-berry-config-hook"; + substitutions = { + # Specify `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong binaries. + diff = "${diffutils}/bin/diff"; + + yarn_offline = "${yarn-berry-offline}/bin/yarn"; + + nodeSrc = srcOnly nodejs; + nodeGyp = "${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"; + }; + meta = { + description = "Install nodejs dependencies from an offline yarn cache produced by fetchYarnDeps"; + }; +} ./yarn-berry-config-hook.sh diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh new file mode 100644 index 000000000000..6c6cde8d0bd0 --- /dev/null +++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh @@ -0,0 +1,92 @@ +yarnBerryConfigHook() { + echo "Executing yarnBerryConfigHook" + + # Use a constant HOME directory + export HOME=$(mktemp -d) + if [[ -n "$yarnOfflineCache" ]]; then + offlineCache="$yarnOfflineCache" + fi + if [[ -z "$offlineCache" ]]; then + echo yarnBerryConfigHook: No yarnOfflineCache or offlineCache were defined\! >&2 + exit 2 + fi + + local -r cacheLockfile="$offlineCache/yarn.lock" + local -r srcLockfile="$PWD/yarn.lock" + + echo "Validating consistency between $srcLockfile and $cacheLockfile" + + if ! @diff@ "$srcLockfile" "$cacheLockfile"; then + # If the diff failed, first double-check that the file exists, so we can + # give a friendlier error msg. + if ! [ -e "$srcLockfile" ]; then + echo + echo "ERROR: Missing yarn.lock from src. Expected to find it at: $srcLockfile" + echo "Hint: You can copy a vendored yarn.lock file via postPatch." + echo + + exit 1 + fi + + if ! [ -e "$cacheLockfile" ]; then + echo + echo "ERROR: Missing lockfile from cache. Expected to find it at: $cacheLockfile" + echo + + exit 1 + fi + + echo + echo "ERROR: fetchYarnDeps hash is out of date" + echo + echo "The yarn.lock in src is not the same as the in $offlineCache." + echo + echo "To fix the issue:" + echo '1. Use `lib.fakeHash` as the fetchYarnBerryDeps hash value' + echo "2. Build the derivation and wait for it to fail with a hash mismatch" + echo "3. Copy the 'got: sha256-' value back into the fetchYarnBerryDeps hash field" + echo + + exit 1 + fi + + if [[ -n "$missingHashes" ]] || [[ -f "$offlineCache/missing-hashes.json" ]]; then + echo "Validating consistency of missing-hashes.json" + if [[ -z "$missingHashes" ]]; then + echo "You must specify missingHashes in your derivation" + exit 1 + fi + if ! @diff@ "$missingHashes" "$offlineCache/missing-hashes.json"; then + exit 1 + fi + fi + + YARN_IGNORE_PATH=1 @yarn_offline@ config set enableTelemetry false + YARN_IGNORE_PATH=1 @yarn_offline@ config set enableGlobalCache false + + # The cache needs to be writable in case yarn needs to re-pack any patch: or git dependencies + rm -rf ./.yarn/cache + mkdir -p ./.yarn + cp -r --reflink=auto $offlineCache/cache ./.yarn/cache + chmod u+w -R ./.yarn/cache + [ -d $offlineCache/checkouts ] && cp -r --reflink=auto $offlineCache/checkouts ./.yarn/checkouts + [ -d $offlineCache/checkouts ] && chmod u+w -R ./.yarn/checkouts + + export npm_config_nodedir="@nodeSrc@" + export npm_config_node_gyp="@nodeGyp@" + + YARN_IGNORE_PATH=1 @yarn_offline@ install --mode=skip-build --inline-builds + if [[ -z "${dontYarnBerryPatchShebangs-}" ]]; then + echo "Running patchShebangs in between the Link and the Build step..." + patchShebangs node_modules + fi + if ! [[ "$YARN_ENABLE_SCRIPTS" == "0" || "$YARN_ENABLE_SCRIPTS" == "false" ]]; then + YARN_IGNORE_PATH=1 @yarn_offline@ install --inline-builds + fi + + echo "finished yarnBerryConfigHook" +} + +if [[ -z "${dontYarnBerryInstallDeps-}" ]]; then + postConfigureHooks+=(yarnBerryConfigHook) +fi diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix new file mode 100644 index 000000000000..dad0e1fbfed2 --- /dev/null +++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix @@ -0,0 +1,50 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + + libzip, + openssl, + pkg-config, + + berryVersion, + berryCacheVersion, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "yarn-berry-${toString berryVersion}-fetcher"; + version = "1.2.3"; + + src = fetchFromGitLab { + domain = "cyberchaos.dev"; + owner = "yuka"; + repo = "yarn-berry-fetcher"; + tag = finalAttrs.version; + hash = "sha256-Qfhx1lwd050GabP2Xj0kRi4nIlOHUE4xbZO0kO0IJ8A="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-tOu1x8kmVCXKvthV0xyzisTb7BwOtfWTyu/cv4HRbpc="; + + env.YARN_ZIP_SUPPORTED_CACHE_VERSION = berryCacheVersion; + env.LIBZIP_SYS_USE_PKG_CONFIG = 1; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + pkg-config + ]; + buildInputs = [ + libzip + openssl + ]; + + meta = { + homepage = "https://cyberchaos.dev/yuka/yarn-berry-fetcher"; + license = lib.licenses.mit; + mainProgram = "yarn-berry-fetcher"; + maintainers = with lib.maintainers; [ + yuka + flokli + ]; + }; +}) diff --git a/pkgs/by-name/ya/yarn-berry/package.nix b/pkgs/by-name/ya/yarn-berry/package.nix index 641cba8f6e81..3f71afbb4cee 100644 --- a/pkgs/by-name/ya/yarn-berry/package.nix +++ b/pkgs/by-name/ya/yarn-berry/package.nix @@ -5,17 +5,26 @@ stdenv, testers, yarn, + callPackage, + berryVersion ? 4, }: +let + version_4 = "4.9.1"; + version_3 = "3.8.7"; + hash_4 = "sha256-znxB827TFLAEfCeHrwBsmRlkZz1LVWsBFhjZANiIW/4="; + hash_3 = "sha256-vRrk+Fs/7dZha3h7yI5NpMfd1xezesnigpFgTRCACZo="; +in + stdenv.mkDerivation (finalAttrs: { pname = "yarn-berry"; - version = "4.8.0"; + version = if berryVersion == 4 then version_4 else version_3; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; - rev = "@yarnpkg/cli/${finalAttrs.version}"; - hash = "sha256-cNgR0t780/LJA+IIwycro/7AQjWa1tn00bh4ucPjVEc="; + tag = "@yarnpkg/cli/${finalAttrs.version}"; + hash = if berryVersion == 4 then hash_4 else hash_3; }; buildInputs = [ @@ -23,9 +32,12 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + nodejs yarn ]; + strictDeps = true; + dontConfigure = true; buildPhase = '' @@ -40,16 +52,19 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; - passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; }; - }; + } // (callPackage ./fetcher { yarn-berry = finalAttrs; }); meta = with lib; { homepage = "https://yarnpkg.com/"; + changelog = "https://github.com/yarnpkg/berry/releases/tag/${finalAttrs.src.tag}"; description = "Fast, reliable, and secure dependency management"; license = licenses.bsd2; maintainers = with maintainers; [ diff --git a/pkgs/by-name/ya/yarn-berry/update.sh b/pkgs/by-name/ya/yarn-berry/update.sh index 5ce8bc02c957..60c73bc0d3f3 100755 --- a/pkgs/by-name/ya/yarn-berry/update.sh +++ b/pkgs/by-name/ya/yarn-berry/update.sh @@ -17,5 +17,7 @@ EOF ) version=$(jq -r "[.data.repository.tag.nodes[].name | select(contains(\"-\")|not)] | max_by(split(\".\") | map(tonumber))" <<< "$payload") +version3=$(jq -r "[.data.repository.tag.nodes[].name | select(contains(\"-\")|not)] | map(select(. < \"4.0.0\")) | sort | last" <<< "$payload") -update-source-version yarn-berry "$version" +update-source-version yarn-berry_4 "$version" --version-key="version_4" +update-source-version yarn-berry_3 "$version3" --version-key="version_3" diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix index e8f39fb3cc1a..cc3a5581b56a 100644 --- a/pkgs/by-name/ya/yarr/package.nix +++ b/pkgs/by-name/ya/yarr/package.nix @@ -1,26 +1,26 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, - testers, - yarr, + versionCheckHook, + nix-update-script, + nixosTests, }: buildGoModule rec { pname = "yarr"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "nkanaev"; repo = "yarr"; rev = "v${version}"; - hash = "sha256-ZMQ+IX8dZuxyxQhD/eWAe4bGGCVcaCeVgF+Wqs79G+k="; + hash = "sha256-yII0KV4AKIS1Tfhvj588O631JDArnr0/30rNynTSwzk="; }; vendorHash = null; - subPackages = [ "src" ]; - ldflags = [ "-s" "-w" @@ -30,16 +30,16 @@ buildGoModule rec { tags = [ "sqlite_foreign_keys" - "release" + "sqlite_json" ]; - postInstall = '' - mv $out/bin/{src,yarr} - ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; - passthru.tests.version = testers.testVersion { - package = yarr; - version = "v${version}"; + passthru = { + updateScript = nix-update-script { }; + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux nixosTests.yarr; }; meta = with lib; { @@ -48,6 +48,9 @@ buildGoModule rec { homepage = "https://github.com/nkanaev/yarr"; changelog = "https://github.com/nkanaev/yarr/blob/v${version}/doc/changelog.txt"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = with maintainers; [ + sikmir + christoph-heiss + ]; }; } diff --git a/pkgs/by-name/ya/yaru-theme/package.nix b/pkgs/by-name/ya/yaru-theme/package.nix index 8f19ee0b55b0..bac296204983 100644 --- a/pkgs/by-name/ya/yaru-theme/package.nix +++ b/pkgs/by-name/ya/yaru-theme/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "24.10.4"; + version = "25.04.1"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - hash = "sha256-ioBni/prc2HzrXd6zBgZQQsfQDWxlfWOphtY0o/8uM0="; + hash = "sha256-axaUQ2E0FpWI66yWpQS+zsk7ee5ysllgUbqCZePzcD8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yash/package.nix b/pkgs/by-name/ya/yash/package.nix index a9904fc053f8..b7b5531233cc 100644 --- a/pkgs/by-name/ya/yash/package.nix +++ b/pkgs/by-name/ya/yash/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "yash"; - version = "2.58.1"; + version = "2.59"; src = fetchFromGitHub { owner = "magicant"; repo = "yash"; rev = version; - hash = "sha256-024/Nj4i5fxXMAqVEjlcrSf62a9CZv3W+imAAEdR+xo="; + hash = "sha256-HTKodWcP7K2DLggELSi4TkFezjb3bhMRXiLenBEZoaQ="; }; strictDeps = true; diff --git a/pkgs/by-name/ya/yay/package.nix b/pkgs/by-name/ya/yay/package.nix index 27e454f6bc6d..10064e91ccf0 100644 --- a/pkgs/by-name/ya/yay/package.nix +++ b/pkgs/by-name/ya/yay/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "yay"; - version = "12.4.2"; + version = "12.5.0"; src = fetchFromGitHub { owner = "Jguer"; repo = "yay"; tag = "v${finalAttrs.version}"; - hash = "sha256-QLkqpeHVdR9dxhSGl2wQ7WL1mX6JJm3z6pLeI37z3oM="; + hash = "sha256-qcNjEy8W+6hjTqzkYk8MqHN8owrSONZPB4sXSOstGSE="; }; - vendorHash = "sha256-BKxhRa2y/liBDtMLg0Rlf/ysjQOgIaFjXbPWYBw53Po="; + vendorHash = "sha256-8auZMcfaC0nI0vj1VRz8g/4ijFd57oALYaszGUb0K9A="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ya/yaydl/package.nix b/pkgs/by-name/ya/yaydl/package.nix new file mode 100644 index 000000000000..8ad5b99c893f --- /dev/null +++ b/pkgs/by-name/ya/yaydl/package.nix @@ -0,0 +1,44 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + makeWrapper, + openssl, + ffmpeg, +}: + +rustPlatform.buildRustPackage rec { + pname = "yaydl"; + version = "0.17.2"; + + src = fetchFromGitHub { + owner = "dertuxmalwieder"; + repo = pname; + rev = "release-${version}"; + sha256 = "sha256-r+UkwEtuGL6los9ohv86KA/3qsaEkpnI4yV/UnYelgk="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-pljSw8iQFV6ymg2GKwI+P7R4jvysyFFC1EM25Wi8Los="; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ openssl ]; + + postInstall = '' + wrapProgram $out/bin/yaydl \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + ''; + + meta = with lib; { + homepage = "https://code.rosaelefanten.org/yaydl"; + description = "Yet another youtube down loader"; + license = licenses.cddl; + maintainers = [ ]; + mainProgram = "yaydl"; + }; +} diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 1d6bca02300e..6b5a3a724f28 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -4,27 +4,25 @@ lib, installShellFiles, - stdenv, - Foundation, rust-jemalloc-sys, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "yazi"; - version = "25.3.2"; + version = "25.4.8"; srcs = builtins.attrValues finalAttrs.passthru.srcs; sourceRoot = finalAttrs.passthru.srcs.code_src.name; useFetchCargoVendor = true; - cargoHash = "sha256-3uQ+DDEzi4mo8yTv21ftoSjjFqjQfWMzjUczP6dasO4="; + cargoHash = "sha256-RqAolwIQqJQo9cVZ1uA0D+6yAmQKN2a7Uk3f4b/FjHU="; env.YAZI_GEN_COMPLETIONS = true; env.VERGEN_GIT_SHA = "Nixpkgs"; - env.VERGEN_BUILD_DATE = "2025-03-02"; + env.VERGEN_BUILD_DATE = "2025-04-08"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + buildInputs = [ rust-jemalloc-sys ]; postInstall = '' installShellCompletion --cmd yazi \ @@ -44,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "sxyazi"; repo = "yazi"; tag = "v${finalAttrs.version}"; - hash = "sha256-xx/SGINyvbXZh0J8LgG2/jjFT1l6krNOzM5JAsRtxGE="; + hash = "sha256-oxO7nT4AZJilxA2DliYk57NETHu78xQ8nFdV+UwyKHE="; }; man_src = fetchFromGitHub { diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix index de7be8884cc6..7b45631d0b2d 100644 --- a/pkgs/by-name/ya/yazi/package.nix +++ b/pkgs/by-name/ya/yazi/package.nix @@ -16,6 +16,7 @@ zoxide imagemagick chafa + resvg ], # deps @@ -33,6 +34,7 @@ zoxide, imagemagick, chafa, + resvg, settings ? { }, plugins ? { }, diff --git a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix new file mode 100644 index 000000000000..98e4b0c3f158 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "bypass.yazi"; + version = "25.3.2-unstable-2025-05-11"; + + src = fetchFromGitHub { + owner = "Rolv-Apneseth"; + repo = "bypass.yazi"; + rev = "85b5e9624a9eaa14c70b17b873209a2054f4062a"; + hash = "sha256-2fblXb2uE6tq9goZKzMFgiEUVsx+uaRLyIq9BzTM8KA="; + }; + + meta = { + description = "Yazi plugin for skipping directories with only a single sub-directory."; + homepage = "https://github.com/Rolv-Apneseth/bypass.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/chmod/default.nix b/pkgs/by-name/ya/yazi/plugins/chmod/default.nix new file mode 100644 index 000000000000..925e7d5cc1c8 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/chmod/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "chmod.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + meta = { + description = "Execute chmod on the selected files to change their mode"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/default.nix b/pkgs/by-name/ya/yazi/plugins/default.nix new file mode 100644 index 000000000000..95a96de7c653 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/default.nix @@ -0,0 +1,81 @@ +{ + lib, + callPackage, + stdenvNoCC, + writeShellScript, +}: +let + root = ./.; + updateScript = ./update.py; + + mkYaziPlugin = + args@{ + pname, + src, + meta ? { }, + installPhase ? null, + ... + }: + let + # Extract the plugin name from pname (removing .yazi suffix if present) + pluginName = lib.removeSuffix ".yazi" pname; + in + stdenvNoCC.mkDerivation ( + args + // { + installPhase = + if installPhase != null then + installPhase + else if (src ? owner && src.owner == "yazi-rs") then + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + '' + runHook preInstall + + cp -r ${pname} $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + '' + else + # Normal plugins don't require special installation other than to copy their contents. + '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + meta = meta // { + description = meta.description or ""; + platforms = meta.platforms or lib.platforms.all; + homepage = + if (src ? owner && src.owner == "yazi-rs") then + "https://github.com/yazi-rs/plugins/tree/main/${pname}" + else + meta.homepage or null; + }; + passthru = (args.passthru or { }) // { + updateScript = { + command = writeShellScript "update-${pluginName}" '' + export PLUGIN_NAME="${pluginName}" + export PLUGIN_PNAME="${pname}" + exec ${updateScript} + ''; + supportedFeatures = [ "commit" ]; + }; + }; + } + ); + + call = name: callPackage (root + "/${name}") { inherit mkYaziPlugin; }; +in +lib.pipe root [ + builtins.readDir + (lib.filterAttrs (_: type: type == "directory")) + (builtins.mapAttrs (name: _: call name)) +] +// { + inherit mkYaziPlugin; +} diff --git a/pkgs/by-name/ya/yazi/plugins/diff/default.nix b/pkgs/by-name/ya/yazi/plugins/diff/default.nix new file mode 100644 index 000000000000..a4a0f8c904ab --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/diff/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "diff.yazi"; + version = "25.2.7-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + meta = { + description = "Diff the selected file with the hovered file, create a living patch, and copy it to the clipboard"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix new file mode 100644 index 000000000000..a6bf89025d60 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "duckdb.yazi"; + version = "25.4.8-unstable-2025-04-28"; + + src = fetchFromGitHub { + owner = "wylie102"; + repo = "duckdb.yazi"; + rev = "02f902dfaf22f20c121da49bfcf5500f4fb11d7d"; + hash = "sha256-fESxJDU7befG2aDxm79M9Eq71RH1UwA4hi0OgK9vPbM="; + }; + + meta = { + description = "Yazi plugin that uses duckdb to preview data files"; + homepage = "https://github.com/wylie102/duckdb.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/full-border/default.nix b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix new file mode 100644 index 000000000000..858e0a8a8cc6 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "full-border.yazi"; + version = "25.2.26-unstable-2025-03-11"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "92f78dc6d0a42569fd0e9df8f70670648b8afb78"; + hash = "sha256-mqo71VLZsHmgTybxgqKNo9F2QeMuCSvZ89uen1VbWb4="; + }; + + meta = { + description = "Add a full border to Yazi to make it look fancier"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/git/default.nix b/pkgs/by-name/ya/yazi/plugins/git/default.nix new file mode 100644 index 000000000000..a0fad2d1a1e9 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/git/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "git.yazi"; + version = "25.4.4-unstable-2025-04-04"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9"; + hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q="; + }; + + meta = { + description = "Show the status of Git file changes as linemode in the file list"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/glow/default.nix b/pkgs/by-name/ya/yazi/plugins/glow/default.nix new file mode 100644 index 000000000000..6a5dc9df47af --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/glow/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "glow.yazi"; + version = "0-unstable-2025-04-15"; + + src = fetchFromGitHub { + owner = "Reledia"; + repo = "glow.yazi"; + rev = "2da96e3ffd9cd9d4dd53e0b2636f83ff69fe9af0"; + hash = "sha256-4krck4U/KWmnl32HWRsblYW/biuqzDPysrEn76buRck="; + }; + + meta = { + description = "Glow preview plugin for yazi"; + homepage = "https://github.com/Reledia/glow.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix new file mode 100644 index 000000000000..c40755193b8b --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "jump-to-char.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + meta = { + description = "Switch the preview pane between hidden and shown"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix b/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix new file mode 100644 index 000000000000..69dab6a2bab7 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "lazygit.yazi"; + version = "0-unstable-2025-03-31"; + + src = fetchFromGitHub { + owner = "Lil-Dank"; + repo = "lazygit.yazi"; + rev = "7a08a0988c2b7481d3f267f3bdc58080e6047e7d"; + hash = "sha256-OJJPgpSaUHYz8a9opVLCds+VZsK1B6T+pSRJyVgYNy8="; + }; + + meta = { + description = "Lazygit plugin for yazi"; + homepage = "https://github.com/Lil-Dank/lazygit.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/lsar/default.nix b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix new file mode 100644 index 000000000000..b9a2c7f7d1cc --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "lsar.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + meta = { + description = "Previewing archive contents with lsar"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix new file mode 100644 index 000000000000..61e0b326fa6c --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "mactag.yazi"; + version = "25.4.4-unstable-2025-04-04"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9"; + hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q="; + }; + + meta = { + description = "Previewing archive contents with mactag"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + platforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix new file mode 100644 index 000000000000..21f78d2b4d16 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "mediainfo.yazi"; + version = "25.4.8-unstable-2025-05-19"; + + src = fetchFromGitHub { + owner = "boydaihungst"; + repo = "mediainfo.yazi"; + rev = "70ed2287159b17bf2b9c1598252c5c33ba52b8a3"; + hash = "sha256-MMsKb9+zeOtWrpE3SalWhGIqeOwHrLdwf8xWYvWXjbo="; + }; + + meta = { + description = "Yazi plugin for previewing media files"; + homepage = "https://github.com/boydaihungst/mediainfo.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/miller/default.nix b/pkgs/by-name/ya/yazi/plugins/miller/default.nix new file mode 100644 index 000000000000..9f2ff752c3df --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/miller/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "miller.yazi"; + version = "0-unstable-2024-08-28"; + + src = fetchFromGitHub { + owner = "Reledia"; + repo = "miller.yazi"; + rev = "40e02654725a9902b689114537626207cbf23436"; + hash = "sha256-GXZZ/vI52rSw573hoMmspnuzFoBXDLcA0fqjF76CdnY="; + }; + + meta = { + description = "Miller, now in yazi"; + homepage = "https://github.com/Reledia/miller.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix new file mode 100644 index 000000000000..bf82462f36c5 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "mime-ext.yazi"; + version = "25.4.4-unstable-2025-04-04"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9"; + hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q="; + }; + + meta = { + description = "Previewing archive contents with mime-ext"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix new file mode 100644 index 000000000000..8f11fe0b381c --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "mount.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + meta = { + description = "Previewing archive contents with mount"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/no-status/default.nix b/pkgs/by-name/ya/yazi/plugins/no-status/default.nix new file mode 100644 index 000000000000..03b4fab01188 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/no-status/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "no-status.yazi"; + version = "25.2.7-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + meta = { + description = "Previewing archive contents with no-status"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/nord/default.nix b/pkgs/by-name/ya/yazi/plugins/nord/default.nix new file mode 100644 index 000000000000..5bb867500c5e --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/nord/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "nord.yazi"; + version = "0-unstable-2025-05-14"; + + src = fetchFromGitHub { + owner = "stepbrobd"; + repo = "nord.yazi"; + rev = "0f8eff4367021be1b741391d98853fbd1a34baf9"; + hash = "sha256-bcYIbKFU1bvGRS6lgEBMe2jT13bECYgQATuh3QKmhQE="; + }; + + meta = { + description = "nordic yazi"; + homepage = "https://github.com/stepbrobd/nord.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ stepbrobd ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix new file mode 100644 index 000000000000..aec407f88dad --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "ouch.yazi"; + version = "0-unstable-2025-04-12"; + + src = fetchFromGitHub { + owner = "ndtoan96"; + repo = "ouch.yazi"; + rev = "2496cd9ac2d1fb52597b22ae84f3af06c826a86d"; + hash = "sha256-OsNfR7rtnq+ceBTiFjbz+NFMSV/6cQ1THxEFzI4oPJk="; + }; + + meta = { + description = "Yazi plugin to preview archives"; + homepage = "https://github.com/ndtoan96/ouch.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/piper/default.nix b/pkgs/by-name/ya/yazi/plugins/piper/default.nix new file mode 100644 index 000000000000..e2955f4ba695 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/piper/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "piper.yazi"; + version = "25.4.8-unstable-2025-04-21"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "71f925e4b7d6d2fa3e1e7822422d755ea709eb69"; + hash = "sha256-4XhVQ72JIfkT9A2hcE+3ch/xLEBe+HeFmjupy266OJo="; + }; + + meta = { + description = "Pipe any shell command as a previewer"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/projects/default.nix b/pkgs/by-name/ya/yazi/plugins/projects/default.nix new file mode 100644 index 000000000000..0246c5cb5fc4 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/projects/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "projects.yazi"; + version = "0-unstable-2025-05-17"; + + src = fetchFromGitHub { + owner = "MasouShizuka"; + repo = "projects.yazi"; + rev = "df44165610faa66f623a3e2085e05085cba23d66"; + hash = "sha256-XVN605TujmA4f1gCjJRnBBrCjmfoTdtNwhRBEqTBnLM="; + }; + + meta = { + description = "Yazi plugin that adds the functionality to save and load projects"; + homepage = "https://github.com/MasouShizuka/projects.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix b/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix new file mode 100644 index 000000000000..c899450c6974 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "relative-motions.yazi"; + version = "25.4.8-unstable-2025-04-16"; + + src = fetchFromGitHub { + owner = "dedukun"; + repo = "relative-motions.yazi"; + rev = "ce2e890227269cc15cdc71d23b35a58fae6d2c27"; + hash = "sha256-Ijz1wYt+L+24Fb/rzHcDR8JBv84z2UxdCIPqTdzbD14="; + }; + + meta = { + description = "Yazi plugin based about vim motions"; + homepage = "https://github.com/dedukun/relative-motions.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix new file mode 100644 index 000000000000..47800a8ac54d --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/restore/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "restore.yazi"; + version = "25.2.7-unstable-2025-04-24"; + + src = fetchFromGitHub { + owner = "boydaihungst"; + repo = "restore.yazi"; + rev = "539aad5077dc8b342a580036e416f2b949b6590e"; + hash = "sha256-ngwbweKF7pSEpzy1TNzbKz8cFIWaDison5vCiGxkHFk="; + }; + + meta = { + description = "Undo/Recover trashed files/folders"; + homepage = "https://github.com/boydaihungst/restore.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix new file mode 100644 index 000000000000..ddc7f3dd9264 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "rich-preview.yazi"; + version = "0-unstable-2025-04-22"; + + src = fetchFromGitHub { + owner = "AnirudhG07"; + repo = "rich-preview.yazi"; + rev = "fdcf37320e35f7c12e8087900eebffcdafaee8cb"; + hash = "sha256-HO9hTCfgGTDERClZaLnUEWDvsV9GMK1kwFpWNM1wq8I="; + }; + + meta = { + description = "Preview file types using rich in Yazi"; + homepage = "https://github.com/AnirudhG07/rich-preview.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix new file mode 100644 index 000000000000..349d06f38b9a --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "rsync.yazi"; + version = "0-unstable-2025-04-12"; + src = fetchFromGitHub { + owner = "GianniBYoung"; + repo = "rsync.yazi"; + rev = "ed7b7f9de971ecd8376d7ccb7a6d0d6f979c1dcb"; + hash = "sha256-xAhkDTNi0MjHqESKk8j60WABYvaF7NElO2W/rsL2w2Y="; + }; + + meta = { + description = "Simple rsync plugin for yazi file manager"; + homepage = "https://github.com/GianniBYoung/rsync.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ teto ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix new file mode 100644 index 000000000000..5bd33f0d676d --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "smart-enter.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + meta = { + description = "Previewing archive contents with smart-enter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix new file mode 100644 index 000000000000..95becd9e7181 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "smart-filter.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + meta = { + description = "Previewing archive contents with smart-filter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix new file mode 100644 index 000000000000..07d525f22814 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/smart-paste/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "smart-paste.yazi"; + version = "0-unstable-2025-04-27"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "864a0210d9ba1e8eb925160c2e2a25342031d8d3"; + hash = "sha256-m3709h7/AHJAtoJ3ebDA40c77D+5dCycpecprjVqj/k="; + }; + + meta = { + description = "Previewing archive contents with smart-filter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix new file mode 100644 index 000000000000..27ec12b801b3 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "starship.yazi"; + version = "25.4.8-unstable-2025-04-20"; + + src = fetchFromGitHub { + owner = "Rolv-Apneseth"; + repo = "starship.yazi"; + rev = "6fde3b2d9dc9a12c14588eb85cf4964e619842e6"; + hash = "sha256-+CSdghcIl50z0MXmFwbJ0koIkWIksm3XxYvTAwoRlDY="; + }; + + meta = { + description = "Starship prompt plugin for yazi"; + homepage = "https://github.com/Rolv-Apneseth/starship.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/sudo/default.nix b/pkgs/by-name/ya/yazi/plugins/sudo/default.nix new file mode 100644 index 000000000000..cdcfaa332cbd --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/sudo/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "sudo.yazi"; + version = "0-unstable-2025-02-08"; + + src = fetchFromGitHub { + owner = "TD-Sky"; + repo = "sudo.yazi"; + rev = "af70636fbcf30ef17f77c5ffcfcbf1342c554be1"; + hash = "sha256-IvTBAhZrbrNJ5nsLxr35V0ntQw89yXUdoU9ashbflYY="; + }; + + meta = { + description = "Call `sudo` in yazi"; + homepage = "https://github.com/TD-Sky/sudo.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/time-travel/default.nix b/pkgs/by-name/ya/yazi/plugins/time-travel/default.nix new file mode 100644 index 000000000000..da12b23cccaf --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/time-travel/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "time-travel.yazi"; + version = "0-unstable-2025-02-14"; + + src = fetchFromGitHub { + owner = "iynaix"; + repo = "time-travel.yazi"; + rev = "7e0179e15a41a4a42b6d0b5fa6dd240c9b4cf0d2"; + hash = "sha256-ZZgn5rsBzvZcnDWZfjMBPRg9QUz4FTq5UIPWfnwXHQs="; + }; + + meta = { + description = "Yazi plugin for browsing backwards and forwards in time via BTRFS / ZFS snapshots"; + homepage = "https://github.com/iynaix/time-travel.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix new file mode 100644 index 000000000000..ec3503c71f20 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "toggle-pane.yazi"; + version = "25.2.26-unstable-2025-04-21"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "4b027c79371af963d4ae3a8b69e42177aa3fa6ee"; + hash = "sha256-auGNSn6tX72go7kYaH16hxRng+iZWw99dKTTUN91Cow="; + }; + + meta = { + description = "Previewing archive contents with toggle-pane"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/update.py b/pkgs/by-name/ya/yazi/plugins/update.py new file mode 100755 index 000000000000..4ad6135906c7 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/update.py @@ -0,0 +1,273 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p python3 python3Packages.requests python3Packages.packaging nix curl git + +import os +import re +import subprocess +import sys +from pathlib import Path +from typing import Dict, Tuple + +import requests +from packaging import version + + +def run_command(cmd: str, capture_output: bool = True) -> str: + """Run a shell command and return its output""" + result = subprocess.run(cmd, shell=True, text=True, capture_output=capture_output) + if result.returncode != 0: + if capture_output: + print(f"Error running command: {cmd}") + print(f"stderr: {result.stderr}") + sys.exit(1) + return result.stdout.strip() if capture_output else "" + + +def get_plugin_info(nixpkgs_dir: str, plugin_name: str) -> Dict[str, str]: + """Get plugin repository information from Nix""" + owner = run_command(f"nix eval --raw -f {nixpkgs_dir} yaziPlugins.\"{plugin_name}\".src.owner") + repo = run_command(f"nix eval --raw -f {nixpkgs_dir} yaziPlugins.\"{plugin_name}\".src.repo") + + return { + "owner": owner, + "repo": repo + } + + +def get_yazi_version(nixpkgs_dir: str) -> str: + """Get the current Yazi version from Nix""" + return run_command(f"nix eval --raw -f {nixpkgs_dir} yazi-unwrapped.version") + + + +def get_github_headers() -> Dict[str, str]: + """Create headers for GitHub API requests""" + headers = {"Accept": "application/vnd.github.v3+json"} + github_token = os.environ.get("GITHUB_TOKEN") + if github_token: + headers["Authorization"] = f"token {github_token}" + return headers + + +def get_default_branch(owner: str, repo: str, headers: Dict[str, str]) -> str: + """Get the default branch name for a GitHub repository""" + api_url = f"https://api.github.com/repos/{owner}/{repo}" + + try: + response = requests.get(api_url, headers=headers) + response.raise_for_status() + repo_data = response.json() + return repo_data["default_branch"] + except requests.RequestException as e: + print(f"Error fetching repository data: {e}") + print("Falling back to 'main' as default branch") + return "main" + +def fetch_plugin_content(owner: str, repo: str, plugin_pname: str, headers: Dict[str, str]) -> str: + """Fetch the plugin's main.lua content from GitHub""" + default_branch = get_default_branch(owner, repo, headers) + plugin_path = f"{plugin_pname}/" if owner == "yazi-rs" else "" + main_lua_url = f"https://raw.githubusercontent.com/{owner}/{repo}/{default_branch}/{plugin_path}main.lua" + + try: + response = requests.get(main_lua_url, headers=headers) + response.raise_for_status() + return response.text + except requests.RequestException as e: + print(f"Error fetching plugin content: {e}") + sys.exit(1) + + +def check_version_compatibility(plugin_content: str, plugin_name: str, yazi_version: str) -> str: + """Check if the plugin is compatible with the current Yazi version""" + required_version_match = re.search(r"since ([0-9.]+)", plugin_content.split("\n")[0]) + required_version = required_version_match.group(1) if required_version_match else "0" + + if required_version == "0": + print(f"No version requirement found for {plugin_name}, assuming compatible with any Yazi version") + else: + # Check if the plugin is compatible with current Yazi version + if version.parse(required_version) > version.parse(yazi_version): + print(f"{plugin_name} plugin requires Yazi {required_version}, but we have {yazi_version}") + sys.exit(0) + + return required_version + + +def get_latest_commit(owner: str, repo: str, plugin_pname: str, headers: Dict[str, str]) -> Tuple[str, str]: + """Get the latest commit hash and date for the plugin""" + default_branch = get_default_branch(owner, repo, headers) + + if owner == "yazi-rs": + # For official plugins, get commit info for the specific plugin file + api_url = f"https://api.github.com/repos/{owner}/{repo}/commits?path={plugin_pname}/main.lua&per_page=1" + else: + # For third-party plugins, get latest commit on default branch + api_url = f"https://api.github.com/repos/{owner}/{repo}/commits/{default_branch}" + + try: + response = requests.get(api_url, headers=headers) + response.raise_for_status() + commit_data = response.json() + except requests.RequestException as e: + print(f"Error fetching commit data: {e}") + sys.exit(1) + + if owner == "yazi-rs": + latest_commit = commit_data[0]["sha"] + commit_date = commit_data[0]["commit"]["committer"]["date"].split("T")[0] + else: + latest_commit = commit_data["sha"] + commit_date = commit_data["commit"]["committer"]["date"].split("T")[0] + + if not latest_commit: + print("Error: Could not get latest commit hash") + sys.exit(1) + + return latest_commit, commit_date + + +def calculate_sri_hash(owner: str, repo: str, latest_commit: str) -> str: + """Calculate the SRI hash for the plugin source""" + prefetch_url = f"https://github.com/{owner}/{repo}/archive/{latest_commit}.tar.gz" + + try: + new_hash = run_command(f"nix-prefetch-url --unpack --type sha256 {prefetch_url} 2>/dev/null") + + # If the hash is not in SRI format, convert it + if not new_hash.startswith("sha256-"): + # Try to convert the hash to SRI format + new_hash = run_command(f"nix hash to-sri --type sha256 {new_hash} 2>/dev/null") + + # If that fails, try another approach + if not new_hash.startswith("sha256-"): + print("Warning: Failed to get SRI hash directly, trying alternative method...") + raw_hash = run_command(f"nix-prefetch-url --type sha256 {prefetch_url} 2>/dev/null") + new_hash = run_command(f"nix hash to-sri --type sha256 {raw_hash} 2>/dev/null") + except Exception as e: + print(f"Error calculating hash: {e}") + sys.exit(1) + + # Verify we got a valid SRI hash + if not new_hash.startswith("sha256-"): + print(f"Error: Failed to generate valid SRI hash. Output was: {new_hash}") + sys.exit(1) + + return new_hash + + +def read_nix_file(file_path: str) -> str: + """Read the content of a Nix file""" + try: + with open(file_path, 'r') as f: + return f.read() + except IOError as e: + print(f"Error reading file {file_path}: {e}") + sys.exit(1) + + +def write_nix_file(file_path: str, content: str) -> None: + """Write content to a Nix file""" + try: + with open(file_path, 'w') as f: + f.write(content) + except IOError as e: + print(f"Error writing to file {file_path}: {e}") + sys.exit(1) + + +def update_nix_file(default_nix_path: str, latest_commit: str, new_version: str, new_hash: str) -> None: + """Update the default.nix file with new version, revision and hash""" + default_nix_content = read_nix_file(default_nix_path) + + # Update the revision in default.nix + default_nix_content = re.sub(r'rev = "[^"]*"', f'rev = "{latest_commit}"', default_nix_content) + + # Update the version in default.nix + if 'version = "' in default_nix_content: + default_nix_content = re.sub(r'version = "[^"]*"', f'version = "{new_version}"', default_nix_content) + else: + # Add version attribute after pname if it doesn't exist + default_nix_content = re.sub(r'(pname = "[^"]*";)', f'\\1\n version = "{new_version}";', default_nix_content) + + # Update hash in default.nix + if 'hash = "' in default_nix_content: + default_nix_content = re.sub(r'hash = "[^"]*"', f'hash = "{new_hash}"', default_nix_content) + elif 'fetchFromGitHub' in default_nix_content: + default_nix_content = re.sub(r'sha256 = "[^"]*"', f'sha256 = "{new_hash}"', default_nix_content) + else: + print(f"Error: Could not find hash attribute in {default_nix_path}") + sys.exit(1) + + # Write the updated content back to the file + write_nix_file(default_nix_path, default_nix_content) + + # Verify the hash was updated + updated_content = read_nix_file(default_nix_path) + if f'hash = "{new_hash}"' in updated_content or f'sha256 = "{new_hash}"' in updated_content: + print(f"Successfully updated hash to: {new_hash}") + else: + print(f"Error: Failed to update hash in {default_nix_path}") + sys.exit(1) + + +def validate_environment() -> Tuple[str, str, str]: + """Validate environment variables and paths""" + nixpkgs_dir = os.getcwd() + + plugin_name = os.environ.get("PLUGIN_NAME") + plugin_pname = os.environ.get("PLUGIN_PNAME") + + if not plugin_name or not plugin_pname: + print("Error: PLUGIN_NAME and PLUGIN_PNAME environment variables must be set") + sys.exit(1) + + plugin_dir = f"{nixpkgs_dir}/pkgs/by-name/ya/yazi/plugins/{plugin_name}" + if not Path(f"{plugin_dir}/default.nix").exists(): + print(f"Error: Could not find default.nix for plugin {plugin_name} at {plugin_dir}") + sys.exit(1) + + return nixpkgs_dir, plugin_name, plugin_pname + + +def main(): + """Main function to update a Yazi plugin""" + # Basic setup and validation + nixpkgs_dir, plugin_name, plugin_pname = validate_environment() + plugin_dir = f"{nixpkgs_dir}/pkgs/by-name/ya/yazi/plugins/{plugin_name}" + default_nix_path = f"{plugin_dir}/default.nix" + + # Get repository info + plugin_info = get_plugin_info(nixpkgs_dir, plugin_name) + owner = plugin_info["owner"] + repo = plugin_info["repo"] + + # Get Yazi version separately + yazi_version = get_yazi_version(nixpkgs_dir) + + # Setup GitHub API headers + headers = get_github_headers() + + # Check plugin compatibility with current Yazi version + plugin_content = fetch_plugin_content(owner, repo, plugin_pname, headers) + required_version = check_version_compatibility(plugin_content, plugin_name, yazi_version) + + # Get latest commit info + latest_commit, commit_date = get_latest_commit(owner, repo, plugin_pname, headers) + print(f"Updating {plugin_name} to commit {latest_commit} ({commit_date})") + + # Generate new version string + new_version = f"{required_version}-unstable-{commit_date}" + + # Calculate hash for the plugin + new_hash = calculate_sri_hash(owner, repo, latest_commit) + print(f"Generated SRI hash: {new_hash}") + + # Update the default.nix file + update_nix_file(default_nix_path, latest_commit, new_version, new_hash) + + print(f"Successfully updated {plugin_name} to version {new_version} (commit {latest_commit})") + + +if __name__ == "__main__": + main() diff --git a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix new file mode 100644 index 000000000000..e02b886c0f37 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "vcs-files.yazi"; + version = "25.4.8-unstable-2025-04-08"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "a1738e8088366ba73b33da5f45010796fb33221e"; + hash = "sha256-eiLkIWviGzG9R0XP1Cik3Bg0s6lgk3nibN6bZvo8e9o="; + }; + + meta = { + description = "Previewing archive contents with vcs-files"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/yatline-catppuccin/default.nix b/pkgs/by-name/ya/yazi/plugins/yatline-catppuccin/default.nix new file mode 100644 index 000000000000..e1de72b64bf7 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/yatline-catppuccin/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "yatline-catppuccin.yazi"; + version = "0-unstable-2025-03-05"; + + src = fetchFromGitHub { + owner = "imsi32"; + repo = "yatline-catppuccin.yazi"; + rev = "8cc4773ecab8ee8995485d53897e1c46991a7fea"; + hash = "sha256-Wz53zjwFyflnxCIMjAv+nzcgDriJwVYBX81pFXJUzc4="; + }; + + meta = { + description = "Soothing pastel theme for Yatline"; + homepage = "https://github.com/imsi32/yatline-catppuccin.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/yatline/default.nix b/pkgs/by-name/ya/yazi/plugins/yatline/default.nix new file mode 100644 index 000000000000..372e58d51d73 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/yatline/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "yatline.yazi"; + version = "0-unstable-2025-04-22"; + + src = fetchFromGitHub { + owner = "imsi32"; + repo = "yatline.yazi"; + rev = "2ecf715d33866e5f8a63af25f6a242821746ddb7"; + hash = "sha256-l4IrdALlgKd1USxE2+bD0Lkw3DgBoQDBxgxevrFhytU="; + }; + + meta = { + description = "Yazi plugin for customizing both header-line and status-line"; + homepage = "https://github.com/imsi32/yatline.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index f6e958b02d20..0626f3d2d196 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, ninja, - python, + python3, withGodef ? true, godef, withGopls ? true, @@ -17,13 +17,12 @@ boost, llvmPackages, fixDarwinDylibNames, - Cocoa, }: stdenv.mkDerivation { pname = "ycmd"; version = "unstable-2023-11-06"; - disabled = !python.isPy3k; + disabled = !python3.isPy3k; # required for third_party directory creation src = fetchFromGitHub { @@ -39,7 +38,7 @@ stdenv.mkDerivation { ninja ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = - with python.pkgs; + with python3.pkgs; with llvmPackages; [ abseil-cpp @@ -51,12 +50,11 @@ stdenv.mkDerivation { jedi jedi-language-server pybind11 - ] - ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ]; buildPhase = '' export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true" - ${python.pythonOnBuildForHost.interpreter} build.py --system-libclang --clang-completer --ninja + ${python3.pythonOnBuildForHost.interpreter} build.py --system-libclang --clang-completer --ninja ''; dontConfigure = true; @@ -77,7 +75,7 @@ stdenv.mkDerivation { find third_party -type d -name "test" -exec rm -rf {} + chmod +x ycmd/__main__.py - sed -i "1i #!${python.interpreter}\ + sed -i "1i #!${python3.interpreter}\ " ycmd/__main__.py mkdir -p $out/lib/ycmd diff --git a/pkgs/by-name/ye/yeahconsole/package.nix b/pkgs/by-name/ye/yeahconsole/package.nix index f0e665b8e125..31fb1d9da27f 100644 --- a/pkgs/by-name/ye/yeahconsole/package.nix +++ b/pkgs/by-name/ye/yeahconsole/package.nix @@ -6,14 +6,14 @@ libXrandr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yeahconsole"; version = "0.1.3"; src = fetchFromGitHub { owner = "jceb"; repo = "yeahconsole"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ea6erNF9hEhDHlWLctu1SHFVoXXXsPeWUbvCBSZwn4s="; }; @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ jceb ]; platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ye/yelp-tools/package.nix b/pkgs/by-name/ye/yelp-tools/package.nix index 3d94ad56622d..f71510c4ff5a 100644 --- a/pkgs/by-name/ye/yelp-tools/package.nix +++ b/pkgs/by-name/ye/yelp-tools/package.nix @@ -56,7 +56,8 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/yelp-tools"; description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = teams.gnome.members ++ (with maintainers; [ domenkozar ]); + maintainers = with maintainers; [ domenkozar ]; + teams = [ teams.gnome ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch b/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch new file mode 100644 index 000000000000..36886d7c4a2a --- /dev/null +++ b/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch @@ -0,0 +1,79 @@ +diff --git a/xslt/common/html.xsl b/xslt/common/html.xsl +index 77aed075..82832fb4 100644 +--- a/xslt/common/html.xsl ++++ b/xslt/common/html.xsl +@@ -266,6 +266,16 @@ certain tokens, and you can add your own with {html.sidebar.mode}. See + --> + + ++ ++ + + +-